Merge new-ui-branch to the trunk.

svn path=/trunk/; revision=22964
author: Ettore Perazzoli <ettore@src.gnome.org> 2003-10-22 02:28:34 +0800
committer: Ettore Perazzoli <ettore@src.gnome.org> 2003-10-22 02:28:34 +0800
commit: 0fb08f3ff81575a4749d851404233f34252dd2f2 (patch)
tree: 7e03befedc3a76fd104921dbbc616810d87333be
parent: 0e19f2c16de592607a341eb9974d31e4e47e02b5 (diff)
download: gsoc2013-evolution-0fb08f3ff81575a4749d851404233f34252dd2f2.tar.gz
gsoc2013-evolution-0fb08f3ff81575a4749d851404233f34252dd2f2.tar.zst
gsoc2013-evolution-0fb08f3ff81575a4749d851404233f34252dd2f2.zip
166 files changed, 116953 insertions, 104111 deletions
diff --git a/libical/src/Net-ICal-Libical/netical_wrap.c b/libical/src/Net-ICal-Libical/netical_wrap.c
index 233c2dc7f7..32eee6f80b 100644
--- a/libical/src/Net-ICal-Libical/netical_wrap.c
+++ b/libical/src/Net-ICal-Libical/netical_wrap.c
@@ -96,6 +96,12 @@ extern "C" {
  * SWIGSTATIC.
  *
  * $Log$
+ * Revision 1.2  2003/10/21 18:28:33  ettore
+ * Merge new-ui-branch to the trunk.
+ *
+ * Revision 1.1.2.1  2003/09/23 19:43:57  ettore
+ * Sync with trunk, and fixicate a bit so it still works.
+ *
  * Revision 1.1  2003/09/11 22:04:08  hansp
  * Import new libical from mainline HEAD and make appropriate changes to
  * Evolution.
diff --git a/libical/src/libical/Makefile.am b/libical/src/libical/Makefile.am
index 4416f28289..302c32a6a0 100644
--- a/libical/src/libical/Makefile.am
+++ b/libical/src/libical/Makefile.am
@@ -2,7 +2,7 @@
 #  FILE: Makefile.am
 #  CREATOR: eric 
 #  
-#  $Id: Makefile.am,v 1.40 2003/10/09 21:02:23 fejj Exp $
+#  $Id: Makefile.am,v 1.41 2003/10/21 18:28:29 ettore Exp $
 #
 #
 # (C) COPYRIGHT 2000, Eric Busboom, http://www.softwarestudio.org
diff --git a/libical/src/libical/icalderivedparameter.c.in b/libical/src/libical/icalderivedparameter.c.in
index b41587e0de..250cf188ee 100644
--- a/libical/src/libical/icalderivedparameter.c.in
+++ b/libical/src/libical/icalderivedparameter.c.in
@@ -3,7 +3,7 @@
   FILE: icalderivedparameters.{c,h}
   CREATOR: eric 09 May 1999
   
-  $Id: icalderivedparameter.c.in,v 1.2 2003/09/11 22:04:19 hansp Exp $
+  $Id: icalderivedparameter.c.in,v 1.3 2003/10/21 18:28:29 ettore Exp $
   $Locker:  $
     
 
diff --git a/libical/src/libical/icalderivedparameter.h.in b/libical/src/libical/icalderivedparameter.h.in
index a8f3a36085..0e7c29fa65 100644
--- a/libical/src/libical/icalderivedparameter.h.in
+++ b/libical/src/libical/icalderivedparameter.h.in
@@ -4,7 +4,7 @@
   CREATOR: eric 20 March 1999
 
 
-  $Id: icalderivedparameter.h.in,v 1.2 2003/09/11 22:04:19 hansp Exp $
+  $Id: icalderivedparameter.h.in,v 1.3 2003/10/21 18:28:29 ettore Exp $
   $Locker:  $
 
   
diff --git a/libical/src/libical/icalderivedproperty.c.in b/libical/src/libical/icalderivedproperty.c.in
index 36ddc846ae..30b86b0f8c 100644
--- a/libical/src/libical/icalderivedproperty.c.in
+++ b/libical/src/libical/icalderivedproperty.c.in
@@ -4,7 +4,7 @@
   FILE: icalderivedproperty.c
   CREATOR: eric 15 Feb 2001
   
-  $Id: icalderivedproperty.c.in,v 1.2 2003/09/11 22:04:19 hansp Exp $
+  $Id: icalderivedproperty.c.in,v 1.3 2003/10/21 18:28:29 ettore Exp $
 
 
  (C) COPYRIGHT 2000, Eric Busboom, http://www.softwarestudio.org
diff --git a/libical/src/libical/icalderivedproperty.h.in b/libical/src/libical/icalderivedproperty.h.in
index eda95ee031..515034742d 100644
--- a/libical/src/libical/icalderivedproperty.h.in
+++ b/libical/src/libical/icalderivedproperty.h.in
@@ -3,7 +3,7 @@
   FILE: icalderivedproperties.{c,h}
   CREATOR: eric 09 May 1999
   
-  $Id: icalderivedproperty.h.in,v 1.2 2003/09/11 22:04:19 hansp Exp $
+  $Id: icalderivedproperty.h.in,v 1.3 2003/10/21 18:28:29 ettore Exp $
     
  (C) COPYRIGHT 2000, Eric Busboom, http://www.softwarestudio.org
  ======================================================================*/
diff --git a/libical/src/libical/icalderivedvalue.c.in b/libical/src/libical/icalderivedvalue.c.in
index d96461e2b7..33f5083589 100644
--- a/libical/src/libical/icalderivedvalue.c.in
+++ b/libical/src/libical/icalderivedvalue.c.in
@@ -3,7 +3,7 @@
   FILE: icalvalue.c
   CREATOR: eric 02 May 1999
   
-  $Id: icalderivedvalue.c.in,v 1.4 2003/09/11 22:04:19 hansp Exp $
+  $Id: icalderivedvalue.c.in,v 1.5 2003/10/21 18:28:29 ettore Exp $
 
 
  (C) COPYRIGHT 2000, Eric Busboom, http://www.softwarestudio.org
diff --git a/libical/src/libical/icalderivedvalue.h.in b/libical/src/libical/icalderivedvalue.h.in
index 1df5e5126e..ab52499aa8 100644
--- a/libical/src/libical/icalderivedvalue.h.in
+++ b/libical/src/libical/icalderivedvalue.h.in
@@ -4,7 +4,7 @@
   CREATOR: eric 20 March 1999
 
 
-  $Id: icalderivedvalue.h.in,v 1.3 2003/09/11 22:04:19 hansp Exp $
+  $Id: icalderivedvalue.h.in,v 1.4 2003/10/21 18:28:29 ettore Exp $
   $Locker:  $
 
   
diff --git a/libical/src/libical/icallexer.l b/libical/src/libical/icallexer.l
new file mode 100644
index 0000000000..fe292c8b6d
--- /dev/null
+++ b/libical/src/libical/icallexer.l
@@ -0,0 +1,161 @@
+%{
+/* -*- Mode: C -*-
+  ======================================================================
+  FILE: icallexer.l
+  CREATOR: eric 10 June 1999
+  
+  DESCRIPTION:
+  
+  $Id: icallexer.l,v 1.10 2003/10/21 18:28:28 ettore Exp $
+  $Locker:  $
+
+  (C) COPYRIGHT 1999 Eric Busboom 
+  http://www.softwarestudio.org
+
+  The contents of this file are subject to the Mozilla Public License
+  Version 1.0 (the "License"); you may not use this file except in
+  compliance with the License. You may obtain a copy of the License at
+  http://www.mozilla.org/MPL/
+ 
+  Software distributed under the License is distributed on an "AS IS"
+  basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
+  the License for the specific language governing rights and
+  limitations under the License.
+
+  The original author is Eric Busboom
+  The original code is icalitip.y
+
+
+
+  ======================================================================*/
+#include "icalparser.h"
+#include "icalenums.h"
+#include "icalmemory.h"
+#include "assert.h"
+#include "icalyacc.h"
+
+#include <string.h> /* For strdup() */
+
+int icalparser_flex_input(char* buf, int max_size);
+void icalparser_clear_flex_input(void);
+
+
+#define ICAL_MAX_STR_CONST 1024
+
+#undef YY_INPUT
+#define YY_INPUT(b,r,ms) ( r= icalparser_flex_input(b,ms))
+#undef yywrap
+
+#undef YY_FATAL_ERROR
+#define YY_FATAL_ERROR(msg) ical_yyerror(msg)
+
+icalvalue_kind value_kind=ICAL_NO_VALUE;
+void set_parser_value_state(icalvalue_kind kind);
+extern int yydebug; 
+
+void ical_yyerror(char *s);
+
+void init_str_buf(void);
+
+int last_state;
+
+char *str_buf;
+char *str_buf_p;
+size_t buf_sz; /* = ICAL_MAX_STR_CONST;*/
+
+%}
+
+crlf		\x0D?\x0A
+space		[ ]
+qsafechar	[^\x00-\x1F\"]
+safechar	[^\x00-\x1F\"\:\;\,]
+tsafechar	[\x20-\x21\x23-\x2B\x2D-\x39\x3C-\x5B\x5D-\x7E]
+valuechar	[^\x00-\x08\x10-\x1F]
+xname		X-[a-zA-Z0-9\-]+
+xname2          [a-zA-Z0-9\-\ ]
+paramtext	{safechar}+
+value		{valuechar}+
+quotedstring	\"{qsafechar}+\"
+digit		[0-9]
+
+%array /* Make yytext an array. Slow, but handy. HACK */
+
+%option caseless
+
+%s quoted_string
+%s binary_value boolean_value uri_value time_value duration_value number_value period_value recur_value text_value utcoffset_value
+%s enum_param_value string_param_value stringlist_param_value keyword line_start component seperator parameter end_of_value paramtext
+
+
+
+%%
+
+%{
+%}
+
+
+<time_value>{
+{digit}+		 { ical_yylval.v_string =icalmemory_tmp_copy(yytext) ;
+                           return DIGITS; }
+T			 { return TIME_CHAR; }
+Z			 { return UTC_CHAR; }
+[\/\+\-PWHMSD]		 { return yytext[0]; }
+{crlf}                   { return EOL;}
+
+}
+
+<utcoffset_value>{
+{crlf}                   { return EOL;}
+\-|\+			 { return yytext[0]; }
+{digit}{digit}		 { ical_yylval.v_int=atoi(yytext); return INTNUMBER; }
+
+}
+
+<enum_param_value>{
+.			 { return CHARACTER; }
+{crlf}                   { return EOL;}
+
+}
+
+<seperator>{
+,       { BEGIN(last_state); return COMMA; } 
+}
+
+
+%% 
+
+int yywrap()
+{
+     return 1;
+}
+
+
+void set_parser_value_state(icalvalue_kind kind)
+{
+
+    switch (kind){
+
+	case ICAL_UTCOFFSET_VALUE:
+	    {BEGIN(utcoffset_value);break;}
+
+	case ICAL_DATETIMEPERIOD_VALUE:
+	case ICAL_DURATION_VALUE:
+	case ICAL_PERIOD_VALUE:
+	    {BEGIN(time_value);break;}
+
+	default:
+	{
+	   assert(1==0);
+	}
+    }
+}
+
+void init_str_buf(void)
+{
+   str_buf = icalmemory_tmp_buffer(ICAL_MAX_STR_CONST);
+   str_buf_p = str_buf;
+   buf_sz = ICAL_MAX_STR_CONST;
+
+
+}
+
diff --git a/libical/src/libical/icalyacc.y b/libical/src/libical/icalyacc.y
new file mode 100644
index 0000000000..65f0041ec4
--- /dev/null
+++ b/libical/src/libical/icalyacc.y
@@ -0,0 +1,417 @@
+%{
+/* -*- Mode: C -*-
+  ======================================================================
+  FILE: icalitip.y
+  CREATOR: eric 10 June 1999
+  
+  DESCRIPTION:
+  
+  $Id: icalyacc.y,v 1.16 2003/10/21 18:28:27 ettore Exp $
+  $Locker:  $
+
+  (C) COPYRIGHT 1999 Eric Busboom 
+  http://www.softwarestudio.org
+
+  The contents of this file are subject to the Mozilla Public License
+  Version 1.0 (the "License"); you may not use this file except in
+  compliance with the License. You may obtain a copy of the License at
+  http://www.mozilla.org/MPL/
+ 
+  Software distributed under the License is distributed on an "AS IS"
+  basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
+  the License for the specific language governing rights and
+  limitations under the License.
+
+  The original author is Eric Busboom
+  The original code is icalitip.y
+
+
+
+  =======================================================================*/
+
+#include <stdlib.h>
+#include <string.h> /* for strdup() */
+#include "icalparser.h"
+#include "pvl.h"
+
+icalvalue *icalparser_yy_value; /* Current Value */
+
+void ical_yyerror(char* s);
+void icalparser_clear_flex_input();  
+int ical_yy_lex(void);
+
+/* Globals for UTCOFFSET values */
+int utc; 
+int utc_b; 
+int utcsign;
+
+/* Globals for DURATION values */
+struct icaldurationtype duration;
+
+/* Globals for TRIGGER values */
+struct icaltriggertype trigger;
+
+void copy_list(short* array, size_t size);
+void add_prop(icalproperty_kind);
+void icalparser_fill_date(struct tm* t, char* dstr);
+void icalparser_fill_time(struct tm* t, char* tstr);
+void set_value_type(icalvalue_kind kind);
+void set_parser_value_state();
+struct icaltimetype fill_datetime(char* d, char* t);
+void ical_yy_error(char *s); /* Don't know why I need this.... */
+int yylex(void); /* Or this. */
+
+
+
+/* Set the state of the lexer so it will interpret values ( iCAL
+   VALUEs, that is, ) correctly. */
+
+%}
+
+%union {
+	float v_float;
+	int   v_int;
+	char* v_string;
+}
+
+
+  /* Renaming hack */
+
+/*
+#define    yymaxdepth ical_yy_maxdepth
+#define    yyparse ical_yy_parse
+#define    yyerror ical_yy_error
+#define    yylval  ical_yy_lval
+#define    yychar  ical_yy_char
+#define    yydebug ical_yy_debug
+#define    yypact  ical_yy_pact
+#define    yyr1    ical_yy_r1
+#define    yyr2    ical_yy_r2
+#define    yydef   ical_yy_def
+#define    yychk   ical_yy_chk
+#define    yypgo   ical_yy_pgo
+#define    yyact   ical_yy_act
+#define    yyexca  ical_yy_exca
+#define yyerrflag ical_yy_errflag
+#define yynerrs    ical_yy_nerrs
+#define    yyps    ical_yy_ps
+#define    yypv    ical_yy_pv
+#define    yys     ical_yy_s
+#define    yy_yys  ical_yy_yys
+#define    yystate ical_yy_state
+#define    yytmp   ical_yy_tmp
+#define    yyv     ical_yy_v
+#define    yy_yyv  ical_yy_yyv
+#define    yyval   ical_yy_val
+#define    yylloc  ical_yy_lloc
+#define yyreds     ical_yy_reds
+#define yytoks     ical_yy_toks
+#define yylhs      ical_yy_yylhs
+#define yylen      ical_yy_yylen
+#define yydefred ical_yy_yydefred
+#define yydgoto    ical_yy_yydgoto
+#define yydefred ical_yy_yydefred
+#define yydgoto    ical_yy_yydgoto
+#define yysindex ical_yy_yysindex
+#define yyrindex ical_yy_yyrindex
+#define yygindex ical_yy_yygindex
+#define yytable     ical_yy_yytable
+#define yycheck     ical_yy_yycheck
+#define yyname   ical_yy_yyname
+#define yyrule   ical_yy_yyrule
+#define yy_scan_bytes ical_yy_scan_bytes
+#define yy_scan_string ical_yy_scan_string
+#define yy_scan_buffer ical_yy_scan_buffer
+*/
+
+/* These are redefined with the -P option to flex */
+/*
+#define yy_create_buffer  ical_yy_create_buffer 
+#define yy_delete_buffer ical_yy_delete_buffer
+#define yy_flex_debug ical_yy_flex_debug
+#define yy_init_buffer ical_yy_init_buffer
+#define yy_flush_buffer ical_yy_flush_buffer
+#define yy_load_buffer_state ical_yy_load_buffer_state
+#define yy_switch_to_buffer ical_yy_switch_to_buffer
+#define yyin ical_yyin
+#define yyleng ical_yyleng
+#define yylex ical_yylex
+#define yylineno ical_yylineno
+#define yyout ical_yyout
+#define yyrestart ical_yyrestart
+#define yytext ical_yytext
+#define yywrap ical_yywrap             
+*/
+
+
+%token <v_string> DIGITS
+%token <v_int> INTNUMBER
+%token <v_float> FLOATNUMBER
+%token <v_string> STRING   
+%token EOL EQUALS CHARACTER COLON COMMA SEMICOLON MINUS TIMESEPERATOR 
+
+%token TRUE FALSE
+
+%token FREQ BYDAY BYHOUR BYMINUTE BYMONTH BYMONTHDAY BYSECOND BYSETPOS BYWEEKNO
+%token BYYEARDAY DAILY MINUTELY MONTHLY SECONDLY WEEKLY HOURLY YEARLY
+%token INTERVAL COUNT UNTIL WKST MO SA SU TU WE TH FR 
+
+%token BIT8 ACCEPTED ADD AUDIO BASE64 BINARY BOOLEAN BUSY BUSYTENTATIVE
+%token BUSYUNAVAILABLE CALADDRESS CANCEL CANCELLED CHAIR CHILD COMPLETED
+%token CONFIDENTIAL CONFIRMED COUNTER DATE DATETIME DECLINECOUNTER DECLINED
+%token DELEGATED DISPLAY DRAFT DURATION EMAIL END FINAL FLOAT FREE GREGORIAN
+%token GROUP INDIVIDUAL INPROCESS INTEGER NEEDSACTION NONPARTICIPANT
+%token OPAQUE OPTPARTICIPANT PARENT PERIOD PRIVATE PROCEDURE PUBLIC PUBLISH
+%token RECUR REFRESH REPLY REQPARTICIPANT REQUEST RESOURCE ROOM SIBLING
+%token START TENTATIVE TEXT THISANDFUTURE THISANDPRIOR TIME TRANSPAENT
+%token UNKNOWN UTCOFFSET XNAME
+
+%token ALTREP CN CUTYPE DAYLIGHT DIR ENCODING EVENT FBTYPE FMTTYPE LANGUAGE 
+%token MEMBER PARTSTAT RANGE RELATED RELTYPE ROLE RSVP SENTBY STANDARD URI
+
+%token TIME_CHAR UTC_CHAR
+
+
+%%
+
+value:
+	date_value
+	| datetime_value
+	| duration_value
+	| period_value
+        | utcoffset_value
+        | error { 
+                  icalparser_yy_value = 0;
+		  icalparser_clear_flex_input();
+                  yyclearin;
+                  }
+;
+
+
+date_value: DIGITS
+        {
+	    struct icaltimetype stm;
+
+	    stm = fill_datetime($1,0);
+
+	    stm.hour = -1;
+	    stm.minute = -1;
+	    stm.second = -1;
+	    stm.is_utc = 0;
+	    stm.is_date = 1;
+
+	    icalparser_yy_value = icalvalue_new_date(stm);
+	}
+;
+
+utc_char: 
+	/*empty*/  {utc = 0;}
+	| UTC_CHAR {utc = 1;}
+;
+
+/* This is used in the period_value, where there may be two utc characters per rule. */
+utc_char_b: 
+	/*empty*/  {utc_b = 0;}
+	| UTC_CHAR {utc_b = 1;}
+;
+
+datetime_value: 
+	DIGITS TIME_CHAR DIGITS utc_char
+        {
+	    struct  icaltimetype stm;
+	    stm = fill_datetime($1, $3);
+	    stm.is_utc = utc;
+	    stm.is_date = 0;
+
+	    icalparser_yy_value = 
+		icalvalue_new_datetime(stm);
+	}
+;
+
+
+/* Duration */
+
+
+dur_date: dur_day
+	| dur_day dur_time
+;
+
+dur_week: DIGITS 'W'
+	{
+	    duration.weeks = atoi($1);
+	}
+;
+
+dur_time: TIME_CHAR dur_hour 
+	{
+	}
+	| TIME_CHAR dur_minute
+	{
+	}
+	| TIME_CHAR dur_second
+	{
+	}
+;
+
+dur_hour: DIGITS 'H'
+	{
+	    duration.hours = atoi($1);
+	}
+	| DIGITS 'H' dur_minute
+	{
+	    duration.hours = atoi($1);
+	}
+;
+
+dur_minute: DIGITS 'M'
+	{
+	    duration.minutes = atoi($1);
+	}
+	| DIGITS 'M' dur_second
+	{
+	    duration.minutes = atoi($1);
+	}
+;
+
+dur_second: DIGITS 'S'
+	{
+	    duration.seconds = atoi($1);
+	}
+;
+
+dur_day: DIGITS 'D'
+	{
+	    duration.days = atoi($1);
+	}
+;
+
+dur_prefix: /* empty */
+	{
+	    duration.is_neg = 0;
+	} 
+	| '+'
+	{
+	    duration.is_neg = 0;
+	}
+	| '-'
+	{ 
+	    duration.is_neg = 1;
+	}
+;
+
+duration_value: dur_prefix 'P' dur_date
+	{ 
+	    icalparser_yy_value = icalvalue_new_duration(duration); 
+	    memset(&duration,0, sizeof(duration));
+	}
+	| dur_prefix 'P' dur_time
+	{ 
+	    icalparser_yy_value = icalvalue_new_duration(duration); 
+	    memset(&duration,0, sizeof(duration));
+	}
+	| dur_prefix 'P' dur_week
+	{ 
+	    icalparser_yy_value = icalvalue_new_duration(duration); 
+	    memset(&duration,0, sizeof(duration));
+	}
+;
+
+
+/* Period */
+
+period_value:  DIGITS TIME_CHAR DIGITS utc_char '/'  DIGITS TIME_CHAR DIGITS utc_char_b
+	{
+            struct icalperiodtype p;
+        
+	    p.start = fill_datetime($1,$3);
+	    p.start.is_utc = utc;
+	    p.start.is_date = 0;
+
+
+	    p.end = fill_datetime($6,$8);
+	    p.end.is_utc = utc_b;
+	    p.end.is_date = 0;
+		
+	    p.duration.days = -1;
+	    p.duration.weeks = -1;
+	    p.duration.hours = -1;
+	    p.duration.minutes = -1;
+	    p.duration.seconds = -1;
+
+	    icalparser_yy_value = icalvalue_new_period(p);
+	}
+	| DIGITS TIME_CHAR DIGITS utc_char '/'  duration_value
+	{
+            struct icalperiodtype p;
+	    
+	    p.start = fill_datetime($1,$3);
+	    p.start.is_utc = utc;
+	    p.start.is_date = 0;
+
+	    p.end.year = -1;
+	    p.end.month = -1;
+	    p.end.day = -1;
+	    p.end.hour = -1;
+	    p.end.minute = -1;
+	    p.end.second = -1;
+		   
+	    /* The duration_value rule setes the global 'duration'
+               variable, but it also creates a new value in
+               icalparser_yy_value. So, free that, then copy
+               'duration' into the icalperiodtype struct. */
+
+	    p.duration = icalvalue_get_duration(icalparser_yy_value);
+	    icalvalue_free(icalparser_yy_value);
+	    icalparser_yy_value = 0;
+
+	    icalparser_yy_value = icalvalue_new_period(p);
+
+	}
+;
+
+
+/* UTC Offset */
+
+plusminus: '+' { utcsign = 1; }
+	| '-' { utcsign = -1; }
+;
+
+utcoffset_value: 
+	plusminus INTNUMBER INTNUMBER
+	{
+	    icalparser_yy_value = icalvalue_new_utcoffset( utcsign * (($2*3600) + ($3*60)) );
+  	}
+
+	| plusminus INTNUMBER INTNUMBER INTNUMBER
+	{
+	    icalparser_yy_value = icalvalue_new_utcoffset(utcsign * (($2*3600) + ($3*60) +($4)));
+  	}
+;
+
+%%
+
+struct icaltimetype fill_datetime(char* datestr, char* timestr)
+{
+	    struct icaltimetype stm;
+
+	    memset(&stm,0,sizeof(stm));
+
+	    if (datestr != 0){
+		sscanf(datestr,"%4d%2d%2d",&(stm.year), &(stm.month), 
+		       &(stm.day));
+	    }
+
+	    if (timestr != 0){
+		sscanf(timestr,"%2d%2d%2d", &(stm.hour), &(stm.minute), 
+		       &(stm.second));
+	    }
+
+	    return stm;
+
+}
+
+void ical_yyerror(char* s)
+{
+    /*fprintf(stderr,"Parse error \'%s\'\n", s);*/
+}
+
diff --git a/libical/src/libicalcap/Makefile.am b/libical/src/libicalcap/Makefile.am
index 519c126905..f6112b7c05 100644
--- a/libical/src/libicalcap/Makefile.am
+++ b/libical/src/libicalcap/Makefile.am
@@ -2,7 +2,7 @@
 #  FILE: Makefile.am
 #  CREATOR: acampi 
 #  
-#  $Id: Makefile.am,v 1.4 2003/10/07 14:28:18 danw Exp $
+#  $Id: Makefile.am,v 1.5 2003/10/21 18:28:26 ettore Exp $
 #
 #
 # (C) COPYRIGHT 2003, Andrea Campi, mailto:a.campi@inet.it
diff --git a/libical/src/libicalss/Makefile.am b/libical/src/libicalss/Makefile.am
index c714e8ca5a..1b72cd03c9 100644
--- a/libical/src/libicalss/Makefile.am
+++ b/libical/src/libicalss/Makefile.am
@@ -2,7 +2,7 @@
 #  FILE: Makefile.am
 #  CREATOR: eric 
 #  
-#  $Id: Makefile.am,v 1.21 2003/10/09 21:02:25 fejj Exp $
+#  $Id: Makefile.am,v 1.22 2003/10/21 18:28:20 ettore Exp $
 #
 #
 # (C) COPYRIGHT 2000, Eric Busboom, http://www.softwarestudio.org
diff --git a/libical/src/libicalss/icalgauge.h b/libical/src/libicalss/icalgauge.h
index c35b4f7508..1064b5f41f 100644
--- a/libical/src/libicalss/icalgauge.h
+++ b/libical/src/libicalss/icalgauge.h
@@ -29,6 +29,8 @@
 #ifndef ICALGAUGE_H
 #define ICALGAUGE_H
 
+#include <libical/icalcomponent.h>
+
 /** @file icalgauge.h
  *  @brief Routines implementing a filter for ical components
  */
diff --git a/libical/src/libicalss/icalsslexer.c b/libical/src/libicalss/icalsslexer.c
deleted file mode 100644
index e5afa81f61..0000000000
--- a/libical/src/libicalss/icalsslexer.c
+++ /dev/null
@@ -1,1746 +0,0 @@
-#define yy_create_buffer ss_create_buffer
-#define yy_delete_buffer ss_delete_buffer
-#define yy_scan_buffer ss_scan_buffer
-#define yy_scan_string ss_scan_string
-#define yy_scan_bytes ss_scan_bytes
-#define yy_flex_debug ss_flex_debug
-#define yy_init_buffer ss_init_buffer
-#define yy_flush_buffer ss_flush_buffer
-#define yy_load_buffer_state ss_load_buffer_state
-#define yy_switch_to_buffer ss_switch_to_buffer
-#define yyin ssin
-#define yyleng ssleng
-#define yylex sslex
-#define yyout ssout
-#define yyrestart ssrestart
-#define yytext sstext
-#define yywrap sswrap
-
-/* A lexical scanner generated by flex */
-
-/* Scanner skeleton version:
- * $Header$
- */
-
-#define FLEX_SCANNER
-#define YY_FLEX_MAJOR_VERSION 2
-#define YY_FLEX_MINOR_VERSION 5
-
-#include <stdio.h>
-#include <unistd.h>
-
-
-/* cfront 1.2 defines "c_plusplus" instead of "__cplusplus" */
-#ifdef c_plusplus
-#ifndef __cplusplus
-#define __cplusplus
-#endif
-#endif
-
-
-#ifdef __cplusplus
-
-#include <stdlib.h>
-
-/* Use prototypes in function declarations. */
-#define YY_USE_PROTOS
-
-/* The "const" storage-class-modifier is valid. */
-#define YY_USE_CONST
-
-#else	/* ! __cplusplus */
-
-#if __STDC__
-
-#define YY_USE_PROTOS
-#define YY_USE_CONST
-
-#endif	/* __STDC__ */
-#endif	/* ! __cplusplus */
-
-#ifdef __TURBOC__
- #pragma warn -rch
- #pragma warn -use
-#include <io.h>
-#include <stdlib.h>
-#define YY_USE_CONST
-#define YY_USE_PROTOS
-#endif
-
-#ifdef YY_USE_CONST
-#define yyconst const
-#else
-#define yyconst
-#endif
-
-
-#ifdef YY_USE_PROTOS
-#define YY_PROTO(proto) proto
-#else
-#define YY_PROTO(proto) ()
-#endif
-
-/* Returned upon end-of-file. */
-#define YY_NULL 0
-
-/* Promotes a possibly negative, possibly signed char to an unsigned
- * integer for use as an array index.  If the signed char is negative,
- * we want to instead treat it as an 8-bit unsigned char, hence the
- * double cast.
- */
-#define YY_SC_TO_UI(c) ((unsigned int) (unsigned char) c)
-
-/* Enter a start condition.  This macro really ought to take a parameter,
- * but we do it the disgusting crufty way forced on us by the ()-less
- * definition of BEGIN.
- */
-#define BEGIN yy_start = 1 + 2 *
-
-/* Translate the current start state into a value that can be later handed
- * to BEGIN to return to the state.  The YYSTATE alias is for lex
- * compatibility.
- */
-#define YY_START ((yy_start - 1) / 2)
-#define YYSTATE YY_START
-
-/* Action number for EOF rule of a given start state. */
-#define YY_STATE_EOF(state) (YY_END_OF_BUFFER + state + 1)
-
-/* Special action meaning "start processing a new file". */
-#define YY_NEW_FILE yyrestart( yyin )
-
-#define YY_END_OF_BUFFER_CHAR 0
-
-/* Size of default input buffer. */
-#define YY_BUF_SIZE 16384
-
-typedef struct yy_buffer_state *YY_BUFFER_STATE;
-
-extern int yyleng;
-extern FILE *yyin, *yyout;
-
-#define EOB_ACT_CONTINUE_SCAN 0
-#define EOB_ACT_END_OF_FILE 1
-#define EOB_ACT_LAST_MATCH 2
-
-/* The funky do-while in the following #define is used to turn the definition
- * int a single C statement (which needs a semi-colon terminator).  This
- * avoids problems with code like:
- *
- * 	if ( condition_holds )
- *		yyless( 5 );
- *	else
- *		do_something_else();
- *
- * Prior to using the do-while the compiler would get upset at the
- * "else" because it interpreted the "if" statement as being all
- * done when it reached the ';' after the yyless() call.
- */
-
-/* Return all but the first 'n' matched characters back to the input stream. */
-
-#define yyless(n) \
-	do \
-		{ \
-		/* Undo effects of setting up yytext. */ \
-		*yy_cp = yy_hold_char; \
-		YY_RESTORE_YY_MORE_OFFSET \
-		yy_c_buf_p = yy_cp = yy_bp + n - YY_MORE_ADJ; \
-		YY_DO_BEFORE_ACTION; /* set up yytext again */ \
-		} \
-	while ( 0 )
-
-#define unput(c) yyunput( c, yytext_ptr )
-
-/* The following is because we cannot portably get our hands on size_t
- * (without autoconf's help, which isn't available because we want
- * flex-generated scanners to compile on their own).
- */
-typedef unsigned int yy_size_t;
-
-
-struct yy_buffer_state
-	{
-	FILE *yy_input_file;
-
-	char *yy_ch_buf;		/* input buffer */
-	char *yy_buf_pos;		/* current position in input buffer */
-
-	/* Size of input buffer in bytes, not including room for EOB
-	 * characters.
-	 */
-	yy_size_t yy_buf_size;
-
-	/* Number of characters read into yy_ch_buf, not including EOB
-	 * characters.
-	 */
-	int yy_n_chars;
-
-	/* Whether we "own" the buffer - i.e., we know we created it,
-	 * and can realloc() it to grow it, and should free() it to
-	 * delete it.
-	 */
-	int yy_is_our_buffer;
-
-	/* Whether this is an "interactive" input source; if so, and
-	 * if we're using stdio for input, then we want to use getc()
-	 * instead of fread(), to make sure we stop fetching input after
-	 * each newline.
-	 */
-	int yy_is_interactive;
-
-	/* Whether we're considered to be at the beginning of a line.
-	 * If so, '^' rules will be active on the next match, otherwise
-	 * not.
-	 */
-	int yy_at_bol;
-
-	/* Whether to try to fill the input buffer when we reach the
-	 * end of it.
-	 */
-	int yy_fill_buffer;
-
-	int yy_buffer_status;
-#define YY_BUFFER_NEW 0
-#define YY_BUFFER_NORMAL 1
-	/* When an EOF's been seen but there's still some text to process
-	 * then we mark the buffer as YY_EOF_PENDING, to indicate that we
-	 * shouldn't try reading from the input source any more.  We might
-	 * still have a bunch of tokens to match, though, because of
-	 * possible backing-up.
-	 *
-	 * When we actually see the EOF, we change the status to "new"
-	 * (via yyrestart()), so that the user can continue scanning by
-	 * just pointing yyin at a new input file.
-	 */
-#define YY_BUFFER_EOF_PENDING 2
-	};
-
-static YY_BUFFER_STATE yy_current_buffer = 0;
-
-/* We provide macros for accessing buffer states in case in the
- * future we want to put the buffer states in a more general
- * "scanner state".
- */
-#define YY_CURRENT_BUFFER yy_current_buffer
-
-
-/* yy_hold_char holds the character lost when yytext is formed. */
-static char yy_hold_char;
-
-static int yy_n_chars;		/* number of characters read into yy_ch_buf */
-
-
-int yyleng;
-
-/* Points to current character in buffer. */
-static char *yy_c_buf_p = (char *) 0;
-static int yy_init = 1;		/* whether we need to initialize */
-static int yy_start = 0;	/* start state number */
-
-/* Flag which is used to allow yywrap()'s to do buffer switches
- * instead of setting up a fresh yyin.  A bit of a hack ...
- */
-static int yy_did_buffer_switch_on_eof;
-
-void yyrestart YY_PROTO(( FILE *input_file ));
-
-void yy_switch_to_buffer YY_PROTO(( YY_BUFFER_STATE new_buffer ));
-void yy_load_buffer_state YY_PROTO(( void ));
-YY_BUFFER_STATE yy_create_buffer YY_PROTO(( FILE *file, int size ));
-void yy_delete_buffer YY_PROTO(( YY_BUFFER_STATE b ));
-void yy_init_buffer YY_PROTO(( YY_BUFFER_STATE b, FILE *file ));
-void yy_flush_buffer YY_PROTO(( YY_BUFFER_STATE b ));
-#define YY_FLUSH_BUFFER yy_flush_buffer( yy_current_buffer )
-
-YY_BUFFER_STATE yy_scan_buffer YY_PROTO(( char *base, yy_size_t size ));
-YY_BUFFER_STATE yy_scan_string YY_PROTO(( yyconst char *yy_str ));
-YY_BUFFER_STATE yy_scan_bytes YY_PROTO(( yyconst char *bytes, int len ));
-
-static void *yy_flex_alloc YY_PROTO(( yy_size_t ));
-static void *yy_flex_realloc YY_PROTO(( void *, yy_size_t ));
-static void yy_flex_free YY_PROTO(( void * ));
-
-#define yy_new_buffer yy_create_buffer
-
-#define yy_set_interactive(is_interactive) \
-	{ \
-	if ( ! yy_current_buffer ) \
-		yy_current_buffer = yy_create_buffer( yyin, YY_BUF_SIZE ); \
-	yy_current_buffer->yy_is_interactive = is_interactive; \
-	}
-
-#define yy_set_bol(at_bol) \
-	{ \
-	if ( ! yy_current_buffer ) \
-		yy_current_buffer = yy_create_buffer( yyin, YY_BUF_SIZE ); \
-	yy_current_buffer->yy_at_bol = at_bol; \
-	}
-
-#define YY_AT_BOL() (yy_current_buffer->yy_at_bol)
-
-typedef unsigned char YY_CHAR;
-FILE *yyin = (FILE *) 0, *yyout = (FILE *) 0;
-typedef int yy_state_type;
-extern char yytext[];
-
-
-static yy_state_type yy_get_previous_state YY_PROTO(( void ));
-static yy_state_type yy_try_NUL_trans YY_PROTO(( yy_state_type current_state ));
-static int yy_get_next_buffer YY_PROTO(( void ));
-static void yy_fatal_error YY_PROTO(( yyconst char msg[] ));
-
-/* Done after the current pattern has been matched and before the
- * corresponding action - sets up yytext.
- */
-#define YY_DO_BEFORE_ACTION \
-	yytext_ptr = yy_bp; \
-	yyleng = (int) (yy_cp - yy_bp); \
-	yy_hold_char = *yy_cp; \
-	*yy_cp = '\0'; \
-	if ( yyleng >= YYLMAX ) \
-		YY_FATAL_ERROR( "token too large, exceeds YYLMAX" ); \
-	yy_flex_strncpy( yytext, yytext_ptr, yyleng + 1 ); \
-	yy_c_buf_p = yy_cp;
-
-#define YY_NUM_RULES 23
-#define YY_END_OF_BUFFER 24
-static yyconst short int yy_accept[56] =
-    {   0,
-        0,    0,    0,    0,    0,    0,   24,   22,   18,   18,
-       22,   17,   21,    4,   19,    8,    5,    9,   21,   21,
-       21,   21,   21,   21,   21,   18,    7,    0,   21,   10,
-        6,   11,   21,   21,   14,   21,   21,   13,   21,   21,
-       20,   12,   21,   15,   21,   21,   21,    2,   16,   21,
-       21,   21,    3,    1,    0
-    } ;
-
-static yyconst int yy_ec[256] =
-    {   0,
-        1,    1,    1,    1,    1,    1,    1,    1,    2,    3,
-        1,    1,    2,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    4,    5,    1,    1,    1,    1,    1,    6,    1,
-        1,    7,    1,    8,    7,    7,    1,    7,    7,    7,
-        7,    7,    7,    7,    7,    7,    7,    9,   10,   11,
-       12,   13,    1,    7,   14,    7,   15,   16,   17,   18,
-        7,   19,   20,    7,    7,   21,   22,   23,   24,    7,
-        7,   25,   26,   27,   28,    7,   29,    7,    7,    7,
-        1,    1,    1,    1,    1,    1,   14,    7,   15,   16,
-
-       17,   18,    7,   19,   20,    7,    7,   21,   22,   23,
-       24,    7,    7,   25,   26,   27,   28,    7,   29,    7,
-        7,    7,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1
-    } ;
-
-static yyconst int yy_meta[30] =
-    {   0,
-        1,    1,    1,    2,    1,    1,    3,    1,    2,    1,
-        1,    1,    1,    3,    3,    3,    3,    3,    3,    3,
-        3,    3,    3,    3,    3,    3,    3,    3,    3
-    } ;
-
-static yyconst short int yy_base[58] =
-    {   0,
-        0,    0,    0,    0,    0,    0,   68,   69,   28,   31,
-       55,    0,    0,   69,   69,   54,   53,   52,   40,   37,
-       35,   12,   35,   42,   39,   35,   69,   51,    0,   69,
-       69,   69,   40,   31,    0,   27,   32,    0,   31,   34,
-       69,    0,   28,    0,   28,   31,   22,    0,    0,   31,
-       28,   17,    0,    0,   69,   39,   40
-    } ;
-
-static yyconst short int yy_def[58] =
-    {   0,
-       55,    1,    1,    1,    1,    1,   55,   55,   55,   55,
-       55,   56,   57,   55,   55,   55,   55,   55,   57,   57,
-       57,   57,   57,   57,   57,   55,   55,   56,   57,   55,
-       55,   55,   57,   57,   57,   57,   57,   57,   57,   57,
-       55,   57,   57,   57,   57,   57,   57,   57,   57,   57,
-       57,   57,   57,   57,    0,   55,   55
-    } ;
-
-static yyconst short int yy_nxt[99] =
-    {   0,
-        8,    9,   10,    9,   11,   12,   13,   14,    8,   15,
-       16,   17,   18,   19,   13,   13,   13,   20,   13,   21,
-       13,   13,   22,   23,   13,   24,   13,   13,   25,   26,
-       26,   26,   26,   26,   26,   36,   26,   26,   26,   37,
-       28,   28,   29,   54,   53,   52,   51,   50,   49,   48,
-       47,   46,   45,   44,   43,   42,   41,   40,   39,   38,
-       35,   34,   33,   32,   31,   30,   27,   55,    7,   55,
-       55,   55,   55,   55,   55,   55,   55,   55,   55,   55,
-       55,   55,   55,   55,   55,   55,   55,   55,   55,   55,
-       55,   55,   55,   55,   55,   55,   55,   55
-
-    } ;
-
-static yyconst short int yy_chk[99] =
-    {   0,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    9,
-        9,    9,   10,   10,   10,   22,   26,   26,   26,   22,
-       56,   56,   57,   52,   51,   50,   47,   46,   45,   43,
-       40,   39,   37,   36,   34,   33,   28,   25,   24,   23,
-       21,   20,   19,   18,   17,   16,   11,    7,   55,   55,
-       55,   55,   55,   55,   55,   55,   55,   55,   55,   55,
-       55,   55,   55,   55,   55,   55,   55,   55,   55,   55,
-       55,   55,   55,   55,   55,   55,   55,   55
-
-    } ;
-
-static yy_state_type yy_last_accepting_state;
-static char *yy_last_accepting_cpos;
-
-/* The intent behind this definition is that it'll catch
- * any uses of REJECT which flex missed.
- */
-#define REJECT reject_used_but_not_detected
-#define yymore() yymore_used_but_not_detected
-#define YY_MORE_ADJ 0
-#define YY_RESTORE_YY_MORE_OFFSET
-#ifndef YYLMAX
-#define YYLMAX 8192
-#endif
-
-char yytext[YYLMAX];
-char *yytext_ptr;
-#line 1 "icalsslexer.l"
-#define INITIAL 0
-#line 2 "icalsslexer.l"
-/* -*- Mode: C -*-
-  ======================================================================
-  FILE: icalsslexer.l
-  CREATOR: eric 8 Aug 2000
-  
-  DESCRIPTION:
-  
-  $Id$
-  $Locker$
-
-(C) COPYRIGHT 2000, Eric Busboom, http://www.softwarestudio.org
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of either: 
-
-    The LGPL as published by the Free Software Foundation, version
-    2.1, available at: http://www.fsf.org/copyleft/lesser.html
-
-  Or:
-
-    The Mozilla Public License Version 1.0. You may obtain a copy of
-    the License at http://www.mozilla.org/MPL/
-
- The Original Code is eric. The Initial Developer of the Original
- Code is Eric Busboom
-
-  ======================================================================*/
-
-#include "icalssyacc.h"
-#include "icalgaugeimpl.h"
-#include "assert.h"
-
-#include <string.h> /* For strdup() */
-
-const char* input_buffer;
-const char* input_buffer_p;
-
-#define min(a,b) ((a) < (b) ? (a) : (b))   
-
-int icalss_input(char* buf, int max_size)
-{
-    int n = min(max_size,strlen(input_buffer_p));
-
-    if (n > 0){
-	memcpy(buf, input_buffer_p, n);
-	input_buffer_p += n;
-	return n;
-    } else {
-	return 0;
-    }
-}
-
-#undef YY_INPUT
-#define YY_INPUT(b,r,ms) ( r= icalss_input(b,ms))
-
-#undef SS_FATAL_ERROR
-#define SS_FATAL_ERROR(msg) sserror(msg)
-
-#define sql 1
-#define string_value 2
-
-#line 488 "icalsslexer.c"
-
-/* Macros after this point can all be overridden by user definitions in
- * section 1.
- */
-
-#ifndef YY_SKIP_YYWRAP
-#ifdef __cplusplus
-extern "C" int yywrap YY_PROTO(( void ));
-#else
-extern int yywrap YY_PROTO(( void ));
-#endif
-#endif
-
-#ifndef YY_NO_UNPUT
-static void yyunput YY_PROTO(( int c, char *buf_ptr ));
-#endif
-
-#ifndef yytext_ptr
-static void yy_flex_strncpy YY_PROTO(( char *, yyconst char *, int ));
-#endif
-
-#ifdef YY_NEED_STRLEN
-static int yy_flex_strlen YY_PROTO(( yyconst char * ));
-#endif
-
-#ifndef YY_NO_INPUT
-#ifdef __cplusplus
-static int yyinput YY_PROTO(( void ));
-#else
-static int input YY_PROTO(( void ));
-#endif
-#endif
-
-#if YY_STACK_USED
-static int yy_start_stack_ptr = 0;
-static int yy_start_stack_depth = 0;
-static int *yy_start_stack = 0;
-#ifndef YY_NO_PUSH_STATE
-static void yy_push_state YY_PROTO(( int new_state ));
-#endif
-#ifndef YY_NO_POP_STATE
-static void yy_pop_state YY_PROTO(( void ));
-#endif
-#ifndef YY_NO_TOP_STATE
-static int yy_top_state YY_PROTO(( void ));
-#endif
-
-#else
-#define YY_NO_PUSH_STATE 1
-#define YY_NO_POP_STATE 1
-#define YY_NO_TOP_STATE 1
-#endif
-
-#ifdef YY_MALLOC_DECL
-YY_MALLOC_DECL
-#else
-#if __STDC__
-#ifndef __cplusplus
-#include <stdlib.h>
-#endif
-#else
-/* Just try to get by without declaring the routines.  This will fail
- * miserably on non-ANSI systems for which sizeof(size_t) != sizeof(int)
- * or sizeof(void*) != sizeof(int).
- */
-#endif
-#endif
-
-/* Amount of stuff to slurp up with each read. */
-#ifndef YY_READ_BUF_SIZE
-#define YY_READ_BUF_SIZE 8192
-#endif
-
-/* Copy whatever the last rule matched to the standard output. */
-
-#ifndef ECHO
-/* This used to be an fputs(), but since the string might contain NUL's,
- * we now use fwrite().
- */
-#define ECHO (void) fwrite( yytext, yyleng, 1, yyout )
-#endif
-
-/* Gets input and stuffs it into "buf".  number of characters read, or YY_NULL,
- * is returned in "result".
- */
-#ifndef YY_INPUT
-#define YY_INPUT(buf,result,max_size) \
-	if ( yy_current_buffer->yy_is_interactive ) \
-		{ \
-		int c = '*', n; \
-		for ( n = 0; n < max_size && \
-			     (c = getc( yyin )) != EOF && c != '\n'; ++n ) \
-			buf[n] = (char) c; \
-		if ( c == '\n' ) \
-			buf[n++] = (char) c; \
-		if ( c == EOF && ferror( yyin ) ) \
-			YY_FATAL_ERROR( "input in flex scanner failed" ); \
-		result = n; \
-		} \
-	else if ( ((result = fread( buf, 1, max_size, yyin )) == 0) \
-		  && ferror( yyin ) ) \
-		YY_FATAL_ERROR( "input in flex scanner failed" );
-#endif
-
-/* No semi-colon after return; correct usage is to write "yyterminate();" -
- * we don't want an extra ';' after the "return" because that will cause
- * some compilers to complain about unreachable statements.
- */
-#ifndef yyterminate
-#define yyterminate() return YY_NULL
-#endif
-
-/* Number of entries by which start-condition stack grows. */
-#ifndef YY_START_STACK_INCR
-#define YY_START_STACK_INCR 25
-#endif
-
-/* Report a fatal error. */
-#ifndef YY_FATAL_ERROR
-#define YY_FATAL_ERROR(msg) yy_fatal_error( msg )
-#endif
-
-/* Default declaration of generated scanner - a define so the user can
- * easily add parameters.
- */
-#ifndef YY_DECL
-#define YY_DECL int yylex YY_PROTO(( void ))
-#endif
-
-/* Code executed at the beginning of each rule, after yytext and yyleng
- * have been set up.
- */
-#ifndef YY_USER_ACTION
-#define YY_USER_ACTION
-#endif
-
-/* Code executed at the end of each rule. */
-#ifndef YY_BREAK
-#define YY_BREAK break;
-#endif
-
-#define YY_RULE_SETUP \
-	YY_USER_ACTION
-
-YY_DECL
-	{
-	register yy_state_type yy_current_state;
-	register char *yy_cp = NULL, *yy_bp = NULL;
-	register int yy_act;
-
-#line 83 "icalsslexer.l"
-
-
-
-
-
-
-#line 646 "icalsslexer.c"
-
-	if ( yy_init )
-		{
-		yy_init = 0;
-
-#ifdef YY_USER_INIT
-		YY_USER_INIT;
-#endif
-
-		if ( ! yy_start )
-			yy_start = 1;	/* first start state */
-
-		if ( ! yyin )
-			yyin = stdin;
-
-		if ( ! yyout )
-			yyout = stdout;
-
-		if ( ! yy_current_buffer )
-			yy_current_buffer =
-				yy_create_buffer( yyin, YY_BUF_SIZE );
-
-		yy_load_buffer_state();
-		}
-
-	while ( 1 )		/* loops until end-of-file is reached */
-		{
-		yy_cp = yy_c_buf_p;
-
-		/* Support of yytext. */
-		*yy_cp = yy_hold_char;
-
-		/* yy_bp points to the position in yy_ch_buf of the start of
-		 * the current run.
-		 */
-		yy_bp = yy_cp;
-
-		yy_current_state = yy_start;
-yy_match:
-		do
-			{
-			register YY_CHAR yy_c = yy_ec[YY_SC_TO_UI(*yy_cp)];
-			if ( yy_accept[yy_current_state] )
-				{
-				yy_last_accepting_state = yy_current_state;
-				yy_last_accepting_cpos = yy_cp;
-				}
-			while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
-				{
-				yy_current_state = (int) yy_def[yy_current_state];
-				if ( yy_current_state >= 56 )
-					yy_c = yy_meta[(unsigned int) yy_c];
-				}
-			yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
-			++yy_cp;
-			}
-		while ( yy_base[yy_current_state] != 69 );
-
-yy_find_action:
-		yy_act = yy_accept[yy_current_state];
-		if ( yy_act == 0 )
-			{ /* have to back up */
-			yy_cp = yy_last_accepting_cpos;
-			yy_current_state = yy_last_accepting_state;
-			yy_act = yy_accept[yy_current_state];
-			}
-
-		YY_DO_BEFORE_ACTION;
-
-
-do_action:	/* This label is used only to access EOF actions. */
-
-
-		switch ( yy_act )
-	{ /* beginning of action switch */
-			case 0: /* must back up */
-			/* undo the effects of YY_DO_BEFORE_ACTION */
-			*yy_cp = yy_hold_char;
-			yy_cp = yy_last_accepting_cpos;
-			yy_current_state = yy_last_accepting_state;
-			goto yy_find_action;
-
-case 1:
-YY_RULE_SETUP
-#line 89 "icalsslexer.l"
-{ return SELECT; }
-	YY_BREAK
-case 2:
-YY_RULE_SETUP
-#line 90 "icalsslexer.l"
-{ return FROM; }
-	YY_BREAK
-case 3:
-YY_RULE_SETUP
-#line 91 "icalsslexer.l"
-{ return WHERE; }
-	YY_BREAK
-case 4:
-YY_RULE_SETUP
-#line 92 "icalsslexer.l"
-{ return COMMA; }
-	YY_BREAK
-case 5:
-YY_RULE_SETUP
-#line 93 "icalsslexer.l"
-{ return EQUALS; }
-	YY_BREAK
-case 6:
-YY_RULE_SETUP
-#line 94 "icalsslexer.l"
-{ return EQUALS; }
-	YY_BREAK
-case 7:
-YY_RULE_SETUP
-#line 95 "icalsslexer.l"
-{ return NOTEQUALS; }
-	YY_BREAK
-case 8:
-YY_RULE_SETUP
-#line 96 "icalsslexer.l"
-{ return LESS; }
-	YY_BREAK
-case 9:
-YY_RULE_SETUP
-#line 97 "icalsslexer.l"
-{ return GREATER; }
-	YY_BREAK
-case 10:
-YY_RULE_SETUP
-#line 98 "icalsslexer.l"
-{ return LESSEQUALS; }
-	YY_BREAK
-case 11:
-YY_RULE_SETUP
-#line 99 "icalsslexer.l"
-{ return GREATEREQUALS; }
-	YY_BREAK
-case 12:
-YY_RULE_SETUP
-#line 100 "icalsslexer.l"
-{ return AND; }
-	YY_BREAK
-case 13:
-YY_RULE_SETUP
-#line 101 "icalsslexer.l"
-{ return OR; }
-	YY_BREAK
-case 14:
-YY_RULE_SETUP
-#line 102 "icalsslexer.l"
-{ return IS; }
-	YY_BREAK
-case 15:
-YY_RULE_SETUP
-#line 103 "icalsslexer.l"
-{ return NOT; }
-	YY_BREAK
-case 16:
-YY_RULE_SETUP
-#line 104 "icalsslexer.l"
-{ return SQLNULL; }
-	YY_BREAK
-case 17:
-YY_RULE_SETUP
-#line 105 "icalsslexer.l"
-{ return QUOTE; }
-	YY_BREAK
-case 18:
-YY_RULE_SETUP
-#line 106 "icalsslexer.l"
-;			
-	YY_BREAK
-case 19:
-YY_RULE_SETUP
-#line 107 "icalsslexer.l"
-{ return EOL; }
-	YY_BREAK
-case 20:
-YY_RULE_SETUP
-#line 109 "icalsslexer.l"
-{
-	int c = input();
-	unput(c);
-	if(c!='\''){
-		sslval.v_string= icalmemory_tmp_copy(yytext);
-		return STRING;
-	} else {
-		/*ssmore();*/
-	}
-}
-	YY_BREAK
-case 21:
-YY_RULE_SETUP
-#line 120 "icalsslexer.l"
-{
-        sslval.v_string= icalmemory_tmp_copy(yytext);
-	return STRING; 
-}
-	YY_BREAK
-case 22:
-YY_RULE_SETUP
-#line 126 "icalsslexer.l"
-{ return yytext[0]; }
-	YY_BREAK
-case 23:
-YY_RULE_SETUP
-#line 128 "icalsslexer.l"
-ECHO;
-	YY_BREAK
-#line 856 "icalsslexer.c"
-case YY_STATE_EOF(INITIAL):
-case YY_STATE_EOF(sql):
-case YY_STATE_EOF(string_value):
-	yyterminate();
-
-	case YY_END_OF_BUFFER:
-		{
-		/* Amount of text matched not including the EOB char. */
-		int yy_amount_of_matched_text = (int) (yy_cp - yytext_ptr) - 1;
-
-		/* Undo the effects of YY_DO_BEFORE_ACTION. */
-		*yy_cp = yy_hold_char;
-		YY_RESTORE_YY_MORE_OFFSET
-
-		if ( yy_current_buffer->yy_buffer_status == YY_BUFFER_NEW )
-			{
-			/* We're scanning a new file or input source.  It's
-			 * possible that this happened because the user
-			 * just pointed yyin at a new source and called
-			 * yylex().  If so, then we have to assure
-			 * consistency between yy_current_buffer and our
-			 * globals.  Here is the right place to do so, because
-			 * this is the first action (other than possibly a
-			 * back-up) that will match for the new input source.
-			 */
-			yy_n_chars = yy_current_buffer->yy_n_chars;
-			yy_current_buffer->yy_input_file = yyin;
-			yy_current_buffer->yy_buffer_status = YY_BUFFER_NORMAL;
-			}
-
-		/* Note that here we test for yy_c_buf_p "<=" to the position
-		 * of the first EOB in the buffer, since yy_c_buf_p will
-		 * already have been incremented past the NUL character
-		 * (since all states make transitions on EOB to the
-		 * end-of-buffer state).  Contrast this with the test
-		 * in input().
-		 */
-		if ( yy_c_buf_p <= &yy_current_buffer->yy_ch_buf[yy_n_chars] )
-			{ /* This was really a NUL. */
-			yy_state_type yy_next_state;
-
-			yy_c_buf_p = yytext_ptr + yy_amount_of_matched_text;
-
-			yy_current_state = yy_get_previous_state();
-
-			/* Okay, we're now positioned to make the NUL
-			 * transition.  We couldn't have
-			 * yy_get_previous_state() go ahead and do it
-			 * for us because it doesn't know how to deal
-			 * with the possibility of jamming (and we don't
-			 * want to build jamming into it because then it
-			 * will run more slowly).
-			 */
-
-			yy_next_state = yy_try_NUL_trans( yy_current_state );
-
-			yy_bp = yytext_ptr + YY_MORE_ADJ;
-
-			if ( yy_next_state )
-				{
-				/* Consume the NUL. */
-				yy_cp = ++yy_c_buf_p;
-				yy_current_state = yy_next_state;
-				goto yy_match;
-				}
-
-			else
-				{
-				yy_cp = yy_c_buf_p;
-				goto yy_find_action;
-				}
-			}
-
-		else switch ( yy_get_next_buffer() )
-			{
-			case EOB_ACT_END_OF_FILE:
-				{
-				yy_did_buffer_switch_on_eof = 0;
-
-				if ( yywrap() )
-					{
-					/* Note: because we've taken care in
-					 * yy_get_next_buffer() to have set up
-					 * yytext, we can now set up
-					 * yy_c_buf_p so that if some total
-					 * hoser (like flex itself) wants to
-					 * call the scanner after we return the
-					 * YY_NULL, it'll still work - another
-					 * YY_NULL will get returned.
-					 */
-					yy_c_buf_p = yytext_ptr + YY_MORE_ADJ;
-
-					yy_act = YY_STATE_EOF(YY_START);
-					goto do_action;
-					}
-
-				else
-					{
-					if ( ! yy_did_buffer_switch_on_eof )
-						YY_NEW_FILE;
-					}
-				break;
-				}
-
-			case EOB_ACT_CONTINUE_SCAN:
-				yy_c_buf_p =
-					yytext_ptr + yy_amount_of_matched_text;
-
-				yy_current_state = yy_get_previous_state();
-
-				yy_cp = yy_c_buf_p;
-				yy_bp = yytext_ptr + YY_MORE_ADJ;
-				goto yy_match;
-
-			case EOB_ACT_LAST_MATCH:
-				yy_c_buf_p =
-				&yy_current_buffer->yy_ch_buf[yy_n_chars];
-
-				yy_current_state = yy_get_previous_state();
-
-				yy_cp = yy_c_buf_p;
-				yy_bp = yytext_ptr + YY_MORE_ADJ;
-				goto yy_find_action;
-			}
-		break;
-		}
-
-	default:
-		YY_FATAL_ERROR(
-			"fatal flex scanner internal error--no action found" );
-	} /* end of action switch */
-		} /* end of scanning one token */
-	} /* end of yylex */
-
-
-/* yy_get_next_buffer - try to read in a new buffer
- *
- * Returns a code representing an action:
- *	EOB_ACT_LAST_MATCH -
- *	EOB_ACT_CONTINUE_SCAN - continue scanning from current position
- *	EOB_ACT_END_OF_FILE - end of file
- */
-
-static int yy_get_next_buffer()
-	{
-	register char *dest = yy_current_buffer->yy_ch_buf;
-	register char *source = yytext_ptr;
-	register int number_to_move, i;
-	int ret_val;
-
-	if ( yy_c_buf_p > &yy_current_buffer->yy_ch_buf[yy_n_chars + 1] )
-		YY_FATAL_ERROR(
-		"fatal flex scanner internal error--end of buffer missed" );
-
-	if ( yy_current_buffer->yy_fill_buffer == 0 )
-		{ /* Don't try to fill the buffer, so this is an EOF. */
-		if ( yy_c_buf_p - yytext_ptr - YY_MORE_ADJ == 1 )
-			{
-			/* We matched a single character, the EOB, so
-			 * treat this as a final EOF.
-			 */
-			return EOB_ACT_END_OF_FILE;
-			}
-
-		else
-			{
-			/* We matched some text prior to the EOB, first
-			 * process it.
-			 */
-			return EOB_ACT_LAST_MATCH;
-			}
-		}
-
-	/* Try to read more data. */
-
-	/* First move last chars to start of buffer. */
-	number_to_move = (int) (yy_c_buf_p - yytext_ptr) - 1;
-
-	for ( i = 0; i < number_to_move; ++i )
-		*(dest++) = *(source++);
-
-	if ( yy_current_buffer->yy_buffer_status == YY_BUFFER_EOF_PENDING )
-		/* don't do the read, it's not guaranteed to return an EOF,
-		 * just force an EOF
-		 */
-		yy_current_buffer->yy_n_chars = yy_n_chars = 0;
-
-	else
-		{
-		int num_to_read =
-			yy_current_buffer->yy_buf_size - number_to_move - 1;
-
-		while ( num_to_read <= 0 )
-			{ /* Not enough room in the buffer - grow it. */
-#ifdef YY_USES_REJECT
-			YY_FATAL_ERROR(
-"input buffer overflow, can't enlarge buffer because scanner uses REJECT" );
-#else
-
-			/* just a shorter name for the current buffer */
-			YY_BUFFER_STATE b = yy_current_buffer;
-
-			int yy_c_buf_p_offset =
-				(int) (yy_c_buf_p - b->yy_ch_buf);
-
-			if ( b->yy_is_our_buffer )
-				{
-				int new_size = b->yy_buf_size * 2;
-
-				if ( new_size <= 0 )
-					b->yy_buf_size += b->yy_buf_size / 8;
-				else
-					b->yy_buf_size *= 2;
-
-				b->yy_ch_buf = (char *)
-					/* Include room in for 2 EOB chars. */
-					yy_flex_realloc( (void *) b->yy_ch_buf,
-							 b->yy_buf_size + 2 );
-				}
-			else
-				/* Can't grow it, we don't own it. */
-				b->yy_ch_buf = 0;
-
-			if ( ! b->yy_ch_buf )
-				YY_FATAL_ERROR(
-				"fatal error - scanner input buffer overflow" );
-
-			yy_c_buf_p = &b->yy_ch_buf[yy_c_buf_p_offset];
-
-			num_to_read = yy_current_buffer->yy_buf_size -
-						number_to_move - 1;
-#endif
-			}
-
-		if ( num_to_read > YY_READ_BUF_SIZE )
-			num_to_read = YY_READ_BUF_SIZE;
-
-		/* Read in more data. */
-		YY_INPUT( (&yy_current_buffer->yy_ch_buf[number_to_move]),
-			yy_n_chars, num_to_read );
-
-		yy_current_buffer->yy_n_chars = yy_n_chars;
-		}
-
-	if ( yy_n_chars == 0 )
-		{
-		if ( number_to_move == YY_MORE_ADJ )
-			{
-			ret_val = EOB_ACT_END_OF_FILE;
-			yyrestart( yyin );
-			}
-
-		else
-			{
-			ret_val = EOB_ACT_LAST_MATCH;
-			yy_current_buffer->yy_buffer_status =
-				YY_BUFFER_EOF_PENDING;
-			}
-		}
-
-	else
-		ret_val = EOB_ACT_CONTINUE_SCAN;
-
-	yy_n_chars += number_to_move;
-	yy_current_buffer->yy_ch_buf[yy_n_chars] = YY_END_OF_BUFFER_CHAR;
-	yy_current_buffer->yy_ch_buf[yy_n_chars + 1] = YY_END_OF_BUFFER_CHAR;
-
-	yytext_ptr = &yy_current_buffer->yy_ch_buf[0];
-
-	return ret_val;
-	}
-
-
-/* yy_get_previous_state - get the state just before the EOB char was reached */
-
-static yy_state_type yy_get_previous_state()
-	{
-	register yy_state_type yy_current_state;
-	register char *yy_cp;
-
-	yy_current_state = yy_start;
-
-	for ( yy_cp = yytext_ptr + YY_MORE_ADJ; yy_cp < yy_c_buf_p; ++yy_cp )
-		{
-		register YY_CHAR yy_c = (*yy_cp ? yy_ec[YY_SC_TO_UI(*yy_cp)] : 1);
-		if ( yy_accept[yy_current_state] )
-			{
-			yy_last_accepting_state = yy_current_state;
-			yy_last_accepting_cpos = yy_cp;
-			}
-		while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
-			{
-			yy_current_state = (int) yy_def[yy_current_state];
-			if ( yy_current_state >= 56 )
-				yy_c = yy_meta[(unsigned int) yy_c];
-			}
-		yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
-		}
-
-	return yy_current_state;
-	}
-
-
-/* yy_try_NUL_trans - try to make a transition on the NUL character
- *
- * synopsis
- *	next_state = yy_try_NUL_trans( current_state );
- */
-
-#ifdef YY_USE_PROTOS
-static yy_state_type yy_try_NUL_trans( yy_state_type yy_current_state )
-#else
-static yy_state_type yy_try_NUL_trans( yy_current_state )
-yy_state_type yy_current_state;
-#endif
-	{
-	register int yy_is_jam;
-	register char *yy_cp = yy_c_buf_p;
-
-	register YY_CHAR yy_c = 1;
-	if ( yy_accept[yy_current_state] )
-		{
-		yy_last_accepting_state = yy_current_state;
-		yy_last_accepting_cpos = yy_cp;
-		}
-	while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
-		{
-		yy_current_state = (int) yy_def[yy_current_state];
-		if ( yy_current_state >= 56 )
-			yy_c = yy_meta[(unsigned int) yy_c];
-		}
-	yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
-	yy_is_jam = (yy_current_state == 55);
-
-	return yy_is_jam ? 0 : yy_current_state;
-	}
-
-
-#ifndef YY_NO_UNPUT
-#ifdef YY_USE_PROTOS
-static void yyunput( int c, register char *yy_bp )
-#else
-static void yyunput( c, yy_bp )
-int c;
-register char *yy_bp;
-#endif
-	{
-	register char *yy_cp = yy_c_buf_p;
-
-	/* undo effects of setting up yytext */
-	*yy_cp = yy_hold_char;
-
-	if ( yy_cp < yy_current_buffer->yy_ch_buf + 2 )
-		{ /* need to shift things up to make room */
-		/* +2 for EOB chars. */
-		register int number_to_move = yy_n_chars + 2;
-		register char *dest = &yy_current_buffer->yy_ch_buf[
-					yy_current_buffer->yy_buf_size + 2];
-		register char *source =
-				&yy_current_buffer->yy_ch_buf[number_to_move];
-
-		while ( source > yy_current_buffer->yy_ch_buf )
-			*--dest = *--source;
-
-		yy_cp += (int) (dest - source);
-		yy_bp += (int) (dest - source);
-		yy_current_buffer->yy_n_chars =
-			yy_n_chars = yy_current_buffer->yy_buf_size;
-
-		if ( yy_cp < yy_current_buffer->yy_ch_buf + 2 )
-			YY_FATAL_ERROR( "flex scanner push-back overflow" );
-		}
-
-	*--yy_cp = (char) c;
-
-
-	yytext_ptr = yy_bp;
-	yy_hold_char = *yy_cp;
-	yy_c_buf_p = yy_cp;
-	}
-#endif	/* ifndef YY_NO_UNPUT */
-
-
-#ifndef YY_NO_INPUT
-#ifdef __cplusplus
-static int yyinput()
-#else
-static int input()
-#endif
-	{
-	int c;
-
-	*yy_c_buf_p = yy_hold_char;
-
-	if ( *yy_c_buf_p == YY_END_OF_BUFFER_CHAR )
-		{
-		/* yy_c_buf_p now points to the character we want to return.
-		 * If this occurs *before* the EOB characters, then it's a
-		 * valid NUL; if not, then we've hit the end of the buffer.
-		 */
-		if ( yy_c_buf_p < &yy_current_buffer->yy_ch_buf[yy_n_chars] )
-			/* This was really a NUL. */
-			*yy_c_buf_p = '\0';
-
-		else
-			{ /* need more input */
-			int offset = yy_c_buf_p - yytext_ptr;
-			++yy_c_buf_p;
-
-			switch ( yy_get_next_buffer() )
-				{
-				case EOB_ACT_LAST_MATCH:
-					/* This happens because yy_g_n_b()
-					 * sees that we've accumulated a
-					 * token and flags that we need to
-					 * try matching the token before
-					 * proceeding.  But for input(),
-					 * there's no matching to consider.
-					 * So convert the EOB_ACT_LAST_MATCH
-					 * to EOB_ACT_END_OF_FILE.
-					 */
-
-					/* Reset buffer status. */
-					yyrestart( yyin );
-
-					/* fall through */
-
-				case EOB_ACT_END_OF_FILE:
-					{
-					if ( yywrap() )
-						return EOF;
-
-					if ( ! yy_did_buffer_switch_on_eof )
-						YY_NEW_FILE;
-#ifdef __cplusplus
-					return yyinput();
-#else
-					return input();
-#endif
-					}
-
-				case EOB_ACT_CONTINUE_SCAN:
-					yy_c_buf_p = yytext_ptr + offset;
-					break;
-				}
-			}
-		}
-
-	c = *(unsigned char *) yy_c_buf_p;	/* cast for 8-bit char's */
-	*yy_c_buf_p = '\0';	/* preserve yytext */
-	yy_hold_char = *++yy_c_buf_p;
-
-
-	return c;
-	}
-#endif /* YY_NO_INPUT */
-
-#ifdef YY_USE_PROTOS
-void yyrestart( FILE *input_file )
-#else
-void yyrestart( input_file )
-FILE *input_file;
-#endif
-	{
-	if ( ! yy_current_buffer )
-		yy_current_buffer = yy_create_buffer( yyin, YY_BUF_SIZE );
-
-	yy_init_buffer( yy_current_buffer, input_file );
-	yy_load_buffer_state();
-	}
-
-
-#ifdef YY_USE_PROTOS
-void yy_switch_to_buffer( YY_BUFFER_STATE new_buffer )
-#else
-void yy_switch_to_buffer( new_buffer )
-YY_BUFFER_STATE new_buffer;
-#endif
-	{
-	if ( yy_current_buffer == new_buffer )
-		return;
-
-	if ( yy_current_buffer )
-		{
-		/* Flush out information for old buffer. */
-		*yy_c_buf_p = yy_hold_char;
-		yy_current_buffer->yy_buf_pos = yy_c_buf_p;
-		yy_current_buffer->yy_n_chars = yy_n_chars;
-		}
-
-	yy_current_buffer = new_buffer;
-	yy_load_buffer_state();
-
-	/* We don't actually know whether we did this switch during
-	 * EOF (yywrap()) processing, but the only time this flag
-	 * is looked at is after yywrap() is called, so it's safe
-	 * to go ahead and always set it.
-	 */
-	yy_did_buffer_switch_on_eof = 1;
-	}
-
-
-#ifdef YY_USE_PROTOS
-void yy_load_buffer_state( void )
-#else
-void yy_load_buffer_state()
-#endif
-	{
-	yy_n_chars = yy_current_buffer->yy_n_chars;
-	yytext_ptr = yy_c_buf_p = yy_current_buffer->yy_buf_pos;
-	yyin = yy_current_buffer->yy_input_file;
-	yy_hold_char = *yy_c_buf_p;
-	}
-
-
-#ifdef YY_USE_PROTOS
-YY_BUFFER_STATE yy_create_buffer( FILE *file, int size )
-#else
-YY_BUFFER_STATE yy_create_buffer( file, size )
-FILE *file;
-int size;
-#endif
-	{
-	YY_BUFFER_STATE b;
-
-	b = (YY_BUFFER_STATE) yy_flex_alloc( sizeof( struct yy_buffer_state ) );
-	if ( ! b )
-		YY_FATAL_ERROR( "out of dynamic memory in yy_create_buffer()" );
-
-	b->yy_buf_size = size;
-
-	/* yy_ch_buf has to be 2 characters longer than the size given because
-	 * we need to put in 2 end-of-buffer characters.
-	 */
-	b->yy_ch_buf = (char *) yy_flex_alloc( b->yy_buf_size + 2 );
-	if ( ! b->yy_ch_buf )
-		YY_FATAL_ERROR( "out of dynamic memory in yy_create_buffer()" );
-
-	b->yy_is_our_buffer = 1;
-
-	yy_init_buffer( b, file );
-
-	return b;
-	}
-
-
-#ifdef YY_USE_PROTOS
-void yy_delete_buffer( YY_BUFFER_STATE b )
-#else
-void yy_delete_buffer( b )
-YY_BUFFER_STATE b;
-#endif
-	{
-	if ( ! b )
-		return;
-
-	if ( b == yy_current_buffer )
-		yy_current_buffer = (YY_BUFFER_STATE) 0;
-
-	if ( b->yy_is_our_buffer )
-		yy_flex_free( (void *) b->yy_ch_buf );
-
-	yy_flex_free( (void *) b );
-	}
-
-
-
-#ifdef YY_USE_PROTOS
-void yy_init_buffer( YY_BUFFER_STATE b, FILE *file )
-#else
-void yy_init_buffer( b, file )
-YY_BUFFER_STATE b;
-FILE *file;
-#endif
-
-
-	{
-	yy_flush_buffer( b );
-
-	b->yy_input_file = file;
-	b->yy_fill_buffer = 1;
-
-#if YY_ALWAYS_INTERACTIVE
-	b->yy_is_interactive = 1;
-#else
-#if YY_NEVER_INTERACTIVE
-	b->yy_is_interactive = 0;
-#else
-	b->yy_is_interactive = file ? (isatty( fileno(file) ) > 0) : 0;
-#endif
-#endif
-	}
-
-
-#ifdef YY_USE_PROTOS
-void yy_flush_buffer( YY_BUFFER_STATE b )
-#else
-void yy_flush_buffer( b )
-YY_BUFFER_STATE b;
-#endif
-
-	{
-	if ( ! b )
-		return;
-
-	b->yy_n_chars = 0;
-
-	/* We always need two end-of-buffer characters.  The first causes
-	 * a transition to the end-of-buffer state.  The second causes
-	 * a jam in that state.
-	 */
-	b->yy_ch_buf[0] = YY_END_OF_BUFFER_CHAR;
-	b->yy_ch_buf[1] = YY_END_OF_BUFFER_CHAR;
-
-	b->yy_buf_pos = &b->yy_ch_buf[0];
-
-	b->yy_at_bol = 1;
-	b->yy_buffer_status = YY_BUFFER_NEW;
-
-	if ( b == yy_current_buffer )
-		yy_load_buffer_state();
-	}
-
-
-#ifndef YY_NO_SCAN_BUFFER
-#ifdef YY_USE_PROTOS
-YY_BUFFER_STATE yy_scan_buffer( char *base, yy_size_t size )
-#else
-YY_BUFFER_STATE yy_scan_buffer( base, size )
-char *base;
-yy_size_t size;
-#endif
-	{
-	YY_BUFFER_STATE b;
-
-	if ( size < 2 ||
-	     base[size-2] != YY_END_OF_BUFFER_CHAR ||
-	     base[size-1] != YY_END_OF_BUFFER_CHAR )
-		/* They forgot to leave room for the EOB's. */
-		return 0;
-
-	b = (YY_BUFFER_STATE) yy_flex_alloc( sizeof( struct yy_buffer_state ) );
-	if ( ! b )
-		YY_FATAL_ERROR( "out of dynamic memory in yy_scan_buffer()" );
-
-	b->yy_buf_size = size - 2;	/* "- 2" to take care of EOB's */
-	b->yy_buf_pos = b->yy_ch_buf = base;
-	b->yy_is_our_buffer = 0;
-	b->yy_input_file = 0;
-	b->yy_n_chars = b->yy_buf_size;
-	b->yy_is_interactive = 0;
-	b->yy_at_bol = 1;
-	b->yy_fill_buffer = 0;
-	b->yy_buffer_status = YY_BUFFER_NEW;
-
-	yy_switch_to_buffer( b );
-
-	return b;
-	}
-#endif
-
-
-#ifndef YY_NO_SCAN_STRING
-#ifdef YY_USE_PROTOS
-YY_BUFFER_STATE yy_scan_string( yyconst char *yy_str )
-#else
-YY_BUFFER_STATE yy_scan_string( yy_str )
-yyconst char *yy_str;
-#endif
-	{
-	int len;
-	for ( len = 0; yy_str[len]; ++len )
-		;
-
-	return yy_scan_bytes( yy_str, len );
-	}
-#endif
-
-
-#ifndef YY_NO_SCAN_BYTES
-#ifdef YY_USE_PROTOS
-YY_BUFFER_STATE yy_scan_bytes( yyconst char *bytes, int len )
-#else
-YY_BUFFER_STATE yy_scan_bytes( bytes, len )
-yyconst char *bytes;
-int len;
-#endif
-	{
-	YY_BUFFER_STATE b;
-	char *buf;
-	yy_size_t n;
-	int i;
-
-	/* Get memory for full buffer, including space for trailing EOB's. */
-	n = len + 2;
-	buf = (char *) yy_flex_alloc( n );
-	if ( ! buf )
-		YY_FATAL_ERROR( "out of dynamic memory in yy_scan_bytes()" );
-
-	for ( i = 0; i < len; ++i )
-		buf[i] = bytes[i];
-
-	buf[len] = buf[len+1] = YY_END_OF_BUFFER_CHAR;
-
-	b = yy_scan_buffer( buf, n );
-	if ( ! b )
-		YY_FATAL_ERROR( "bad buffer in yy_scan_bytes()" );
-
-	/* It's okay to grow etc. this buffer, and we should throw it
-	 * away when we're done.
-	 */
-	b->yy_is_our_buffer = 1;
-
-	return b;
-	}
-#endif
-
-
-#ifndef YY_NO_PUSH_STATE
-#ifdef YY_USE_PROTOS
-static void yy_push_state( int new_state )
-#else
-static void yy_push_state( new_state )
-int new_state;
-#endif
-	{
-	if ( yy_start_stack_ptr >= yy_start_stack_depth )
-		{
-		yy_size_t new_size;
-
-		yy_start_stack_depth += YY_START_STACK_INCR;
-		new_size = yy_start_stack_depth * sizeof( int );
-
-		if ( ! yy_start_stack )
-			yy_start_stack = (int *) yy_flex_alloc( new_size );
-
-		else
-			yy_start_stack = (int *) yy_flex_realloc(
-					(void *) yy_start_stack, new_size );
-
-		if ( ! yy_start_stack )
-			YY_FATAL_ERROR(
-			"out of memory expanding start-condition stack" );
-		}
-
-	yy_start_stack[yy_start_stack_ptr++] = YY_START;
-
-	BEGIN(new_state);
-	}
-#endif
-
-
-#ifndef YY_NO_POP_STATE
-static void yy_pop_state()
-	{
-	if ( --yy_start_stack_ptr < 0 )
-		YY_FATAL_ERROR( "start-condition stack underflow" );
-
-	BEGIN(yy_start_stack[yy_start_stack_ptr]);
-	}
-#endif
-
-
-#ifndef YY_NO_TOP_STATE
-static int yy_top_state()
-	{
-	return yy_start_stack[yy_start_stack_ptr - 1];
-	}
-#endif
-
-#ifndef YY_EXIT_FAILURE
-#define YY_EXIT_FAILURE 2
-#endif
-
-#ifdef YY_USE_PROTOS
-static void yy_fatal_error( yyconst char msg[] )
-#else
-static void yy_fatal_error( msg )
-char msg[];
-#endif
-	{
-	(void) fprintf( stderr, "%s\n", msg );
-	exit( YY_EXIT_FAILURE );
-	}
-
-
-
-/* Redefine yyless() so it works in section 3 code. */
-
-#undef yyless
-#define yyless(n) \
-	do \
-		{ \
-		/* Undo effects of setting up yytext. */ \
-		yytext[yyleng] = yy_hold_char; \
-		yy_c_buf_p = yytext + n; \
-		yy_hold_char = *yy_c_buf_p; \
-		*yy_c_buf_p = '\0'; \
-		yyleng = n; \
-		} \
-	while ( 0 )
-
-
-/* Internal utility routines. */
-
-#ifndef yytext_ptr
-#ifdef YY_USE_PROTOS
-static void yy_flex_strncpy( char *s1, yyconst char *s2, int n )
-#else
-static void yy_flex_strncpy( s1, s2, n )
-char *s1;
-yyconst char *s2;
-int n;
-#endif
-	{
-	register int i;
-	for ( i = 0; i < n; ++i )
-		s1[i] = s2[i];
-	}
-#endif
-
-#ifdef YY_NEED_STRLEN
-#ifdef YY_USE_PROTOS
-static int yy_flex_strlen( yyconst char *s )
-#else
-static int yy_flex_strlen( s )
-yyconst char *s;
-#endif
-	{
-	register int n;
-	for ( n = 0; s[n]; ++n )
-		;
-
-	return n;
-	}
-#endif
-
-
-#ifdef YY_USE_PROTOS
-static void *yy_flex_alloc( yy_size_t size )
-#else
-static void *yy_flex_alloc( size )
-yy_size_t size;
-#endif
-	{
-	return (void *) malloc( size );
-	}
-
-#ifdef YY_USE_PROTOS
-static void *yy_flex_realloc( void *ptr, yy_size_t size )
-#else
-static void *yy_flex_realloc( ptr, size )
-void *ptr;
-yy_size_t size;
-#endif
-	{
-	/* The cast to (char *) in the following accommodates both
-	 * implementations that use char* generic pointers, and those
-	 * that use void* generic pointers.  It works with the latter
-	 * because both ANSI C and C++ allow castless assignment from
-	 * any pointer type to void*, and deal with argument conversions
-	 * as though doing an assignment.
-	 */
-	return (void *) realloc( (char *) ptr, size );
-	}
-
-#ifdef YY_USE_PROTOS
-static void yy_flex_free( void *ptr )
-#else
-static void yy_flex_free( ptr )
-void *ptr;
-#endif
-	{
-	free( ptr );
-	}
-
-#if YY_MAIN
-int main()
-	{
-	yylex();
-	return 0;
-	}
-#endif
-#line 128 "icalsslexer.l"
-
-
-int yywrap()
-{
-     return 1;
-}
-
diff --git a/libical/src/libicalss/icalsslexer.l b/libical/src/libicalss/icalsslexer.l
index fe89bfde99..b6bc4dee05 100644
--- a/libical/src/libicalss/icalsslexer.l
+++ b/libical/src/libicalss/icalsslexer.l
@@ -6,7 +6,7 @@
   
   DESCRIPTION:
   
-  $Id: icalsslexer.l,v 1.4 2003/09/24 02:06:52 hansp Exp $
+  $Id: icalsslexer.l,v 1.5 2003/10/21 18:28:18 ettore Exp $
   $Locker:  $
 
 (C) COPYRIGHT 2000, Eric Busboom, http://www.softwarestudio.org
diff --git a/libical/src/libicalss/icalssyacc.c b/libical/src/libicalss/icalssyacc.c
deleted file mode 100644
index 8e27cd75ed..0000000000
--- a/libical/src/libicalss/icalssyacc.c
+++ /dev/null
@@ -1,1397 +0,0 @@
-/* A Bison parser, made from /home/hpj/work/cvs/cvs.gnome.org/evolution-trunk/libical/src/libicalss/icalssyacc.y
-   by GNU bison 1.35.  */
-
-#define YYBISON 1  /* Identify Bison output.  */
-
-#define yyparse ssparse
-#define yylex sslex
-#define yyerror sserror
-#define yylval sslval
-#define yychar sschar
-#define yydebug ssdebug
-#define yynerrs ssnerrs
-# define	STRING	257
-# define	SELECT	258
-# define	FROM	259
-# define	WHERE	260
-# define	COMMA	261
-# define	QUOTE	262
-# define	EQUALS	263
-# define	NOTEQUALS	264
-# define	LESS	265
-# define	GREATER	266
-# define	LESSEQUALS	267
-# define	GREATEREQUALS	268
-# define	AND	269
-# define	OR	270
-# define	EOL	271
-# define	END	272
-# define	IS	273
-# define	NOT	274
-# define	SQLNULL	275
-
-#line 1 "icalssyacc.y"
-
-/* -*- Mode: C -*-
-  ======================================================================
-  FILE: icalssyacc.y
-  CREATOR: eric 08 Aug 2000
-  
-  DESCRIPTION:
-  
-  $Id$
-  $Locker$
-
-(C) COPYRIGHT 2000, Eric Busboom, http://www.softwarestudio.org
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of either: 
-
-    The LGPL as published by the Free Software Foundation, version
-    2.1, available at: http://www.fsf.org/copyleft/lesser.html
-
-  Or:
-
-    The Mozilla Public License Version 1.0. You may obtain a copy of
-    the License at http://www.mozilla.org/MPL/
-
- The Original Code is eric. The Initial Developer of the Original
- Code is Eric Busboom
-
-  ======================================================================*/
-/*#define YYDEBUG 1*/
-#include <stdlib.h>
-#include <string.h> /* for strdup() */
-#include <limits.h> /* for SHRT_MAX*/
-#include <libical/ical.h>
-#include <libicalss/icalgauge.h>
-#include "icalgaugeimpl.h"
-
-extern struct icalgauge_impl *icalss_yy_gauge;
-
-#define YYPARSE_PARAM yy_globals
-#define YYLEX_PARAM yy_globals
-#define YY_EXTRA_TYPE  icalgauge_impl*
-
-
-static void ssyacc_add_where(struct icalgauge_impl* impl, char* prop, 
-			icalgaugecompare compare , char* value);
-static void ssyacc_add_select(struct icalgauge_impl* impl, char* str1);
-static void ssyacc_add_from(struct icalgauge_impl* impl, char* str1);
-static void set_logic(struct icalgauge_impl* impl,icalgaugelogic l);
-void sserror(char *s); /* Don't know why I need this.... */
-
-
-#line 53 "icalssyacc.y"
-#ifndef YYSTYPE
-typedef union {
-	char* v_string;
-} yystype;
-# define YYSTYPE yystype
-# define YYSTYPE_IS_TRIVIAL 1
-#endif
-#ifndef YYDEBUG
-# define YYDEBUG 0
-#endif
-
-
-
-#define	YYFINAL		38
-#define	YYFLAG		-32768
-#define	YYNTBASE	22
-
-/* YYTRANSLATE(YYLEX) -- Bison token number corresponding to YYLEX. */
-#define YYTRANSLATE(x) ((unsigned)(x) <= 275 ? yytranslate[x] : 27)
-
-/* YYTRANSLATE[YYLEX] -- Bison token number corresponding to YYLEX. */
-static const char yytranslate[] =
-{
-       0,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     1,     3,     4,     5,
-       6,     7,     8,     9,    10,    11,    12,    13,    14,    15,
-      16,    17,    18,    19,    20,    21
-};
-
-#if YYDEBUG
-static const short yyprhs[] =
-{
-       0,     0,     7,    12,    14,    16,    20,    22,    26,    27,
-      31,    35,    40,    44,    48,    52,    56,    60,    62,    66
-};
-static const short yyrhs[] =
-{
-       4,    23,     5,    24,     6,    26,     0,     4,    23,     5,
-      24,     0,     1,     0,     3,     0,    23,     7,     3,     0,
-       3,     0,    24,     7,     3,     0,     0,     3,     9,     3,
-       0,     3,    19,    21,     0,     3,    19,    20,    21,     0,
-       3,    10,     3,     0,     3,    11,     3,     0,     3,    12,
-       3,     0,     3,    13,     3,     0,     3,    14,     3,     0,
-      25,     0,    26,    15,    25,     0,    26,    16,    25,     0
-};
-
-#endif
-
-#if YYDEBUG
-/* YYRLINE[YYN] -- source line where rule number YYN was defined. */
-static const short yyrline[] =
-{
-       0,    64,    65,    66,    72,    74,    78,    80,    83,    85,
-      86,    87,    88,    89,    90,    91,    92,    95,    97,    98
-};
-#endif
-
-
-#if (YYDEBUG) || defined YYERROR_VERBOSE
-
-/* YYTNAME[TOKEN_NUM] -- String name of the token TOKEN_NUM. */
-static const char *const yytname[] =
-{
-  "$", "error", "$undefined.", "STRING", "SELECT", "FROM", "WHERE", "COMMA", 
-  "QUOTE", "EQUALS", "NOTEQUALS", "LESS", "GREATER", "LESSEQUALS", 
-  "GREATEREQUALS", "AND", "OR", "EOL", "END", "IS", "NOT", "SQLNULL", 
-  "query_min", "select_list", "from_list", "where_clause", "where_list", 0
-};
-#endif
-
-/* YYR1[YYN] -- Symbol number of symbol that rule YYN derives. */
-static const short yyr1[] =
-{
-       0,    22,    22,    22,    23,    23,    24,    24,    25,    25,
-      25,    25,    25,    25,    25,    25,    25,    26,    26,    26
-};
-
-/* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN. */
-static const short yyr2[] =
-{
-       0,     6,     4,     1,     1,     3,     1,     3,     0,     3,
-       3,     4,     3,     3,     3,     3,     3,     1,     3,     3
-};
-
-/* YYDEFACT[S] -- default rule to reduce with in state S when YYTABLE
-   doesn't specify something else to do.  Zero means the default is an
-   error. */
-static const short yydefact[] =
-{
-       0,     3,     0,     4,     0,     0,     0,     6,     2,     5,
-       8,     0,     0,    17,     1,     7,     0,     0,     0,     0,
-       0,     0,     0,     8,     8,     9,    12,    13,    14,    15,
-      16,     0,    10,    18,    19,    11,     0,     0,     0
-};
-
-static const short yydefgoto[] =
-{
-      36,     4,     8,    13,    14
-};
-
-static const short yypact[] =
-{
-       5,-32768,     9,-32768,     6,    17,    18,-32768,     1,-32768,
-      19,    20,    -9,-32768,    -1,-32768,    21,    22,    23,    24,
-      25,    26,    -4,    19,    19,-32768,-32768,-32768,-32768,-32768,
-  -32768,    10,-32768,-32768,-32768,-32768,    30,    32,-32768
-};
-
-static const short yypgoto[] =
-{
-  -32768,-32768,-32768,    -5,-32768
-};
-
-
-#define	YYLAST		32
-
-
-static const short yytable[] =
-{
-      16,    17,    18,    19,    20,    21,     1,    10,    11,     2,
-      22,     5,     3,     6,    23,    24,    31,    32,    33,    34,
-       7,     9,    12,    15,    25,    26,    27,    28,    29,    30,
-      37,    35,    38
-};
-
-static const short yycheck[] =
-{
-       9,    10,    11,    12,    13,    14,     1,     6,     7,     4,
-      19,     5,     3,     7,    15,    16,    20,    21,    23,    24,
-       3,     3,     3,     3,     3,     3,     3,     3,     3,     3,
-       0,    21,     0
-};
-/* -*-C-*-  Note some compilers choke on comments on `#line' lines.  */
-#line 3 "/usr/share/bison/bison.simple"
-
-/* Skeleton output parser for bison,
-
-   Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002 Free Software
-   Foundation, Inc.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, 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, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
-
-/* As a special exception, when this file is copied by Bison into a
-   Bison output file, you may use that output file without restriction.
-   This special exception was added by the Free Software Foundation
-   in version 1.24 of Bison.  */
-
-/* This is the parser code that is written into each bison parser when
-   the %semantic_parser declaration is not specified in the grammar.
-   It was written by Richard Stallman by simplifying the hairy parser
-   used when %semantic_parser is specified.  */
-
-/* All symbols defined below should begin with yy or YY, to avoid
-   infringing on user name space.  This should be done even for local
-   variables, as they might otherwise be expanded by user macros.
-   There are some unavoidable exceptions within include files to
-   define necessary library symbols; they are noted "INFRINGES ON
-   USER NAME SPACE" below.  */
-
-#if ! defined (yyoverflow) || defined (YYERROR_VERBOSE)
-
-/* The parser invokes alloca or malloc; define the necessary symbols.  */
-
-# if YYSTACK_USE_ALLOCA
-#  define YYSTACK_ALLOC alloca
-# else
-#  ifndef YYSTACK_USE_ALLOCA
-#   if defined (alloca) || defined (_ALLOCA_H)
-#    define YYSTACK_ALLOC alloca
-#   else
-#    ifdef __GNUC__
-#     define YYSTACK_ALLOC __builtin_alloca
-#    endif
-#   endif
-#  endif
-# endif
-
-# ifdef YYSTACK_ALLOC
-   /* Pacify GCC's `empty if-body' warning. */
-#  define YYSTACK_FREE(Ptr) do { /* empty */; } while (0)
-# else
-#  if defined (__STDC__) || defined (__cplusplus)
-#   include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
-#   define YYSIZE_T size_t
-#  endif
-#  define YYSTACK_ALLOC malloc
-#  define YYSTACK_FREE free
-# endif
-#endif /* ! defined (yyoverflow) || defined (YYERROR_VERBOSE) */
-
-
-#if (! defined (yyoverflow) \
-     && (! defined (__cplusplus) \
-	 || (YYLTYPE_IS_TRIVIAL && YYSTYPE_IS_TRIVIAL)))
-
-/* A type that is properly aligned for any stack member.  */
-union yyalloc
-{
-  short yyss;
-  YYSTYPE yyvs;
-# if YYLSP_NEEDED
-  YYLTYPE yyls;
-# endif
-};
-
-/* The size of the maximum gap between one aligned stack and the next.  */
-# define YYSTACK_GAP_MAX (sizeof (union yyalloc) - 1)
-
-/* The size of an array large to enough to hold all stacks, each with
-   N elements.  */
-# if YYLSP_NEEDED
-#  define YYSTACK_BYTES(N) \
-     ((N) * (sizeof (short) + sizeof (YYSTYPE) + sizeof (YYLTYPE))	\
-      + 2 * YYSTACK_GAP_MAX)
-# else
-#  define YYSTACK_BYTES(N) \
-     ((N) * (sizeof (short) + sizeof (YYSTYPE))				\
-      + YYSTACK_GAP_MAX)
-# endif
-
-/* Copy COUNT objects from FROM to TO.  The source and destination do
-   not overlap.  */
-# ifndef YYCOPY
-#  if 1 < __GNUC__
-#   define YYCOPY(To, From, Count) \
-      __builtin_memcpy (To, From, (Count) * sizeof (*(From)))
-#  else
-#   define YYCOPY(To, From, Count)		\
-      do					\
-	{					\
-	  register YYSIZE_T yyi;		\
-	  for (yyi = 0; yyi < (Count); yyi++)	\
-	    (To)[yyi] = (From)[yyi];		\
-	}					\
-      while (0)
-#  endif
-# endif
-
-/* Relocate STACK from its old location to the new one.  The
-   local variables YYSIZE and YYSTACKSIZE give the old and new number of
-   elements in the stack, and YYPTR gives the new location of the
-   stack.  Advance YYPTR to a properly aligned location for the next
-   stack.  */
-# define YYSTACK_RELOCATE(Stack)					\
-    do									\
-      {									\
-	YYSIZE_T yynewbytes;						\
-	YYCOPY (&yyptr->Stack, Stack, yysize);				\
-	Stack = &yyptr->Stack;						\
-	yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAX;	\
-	yyptr += yynewbytes / sizeof (*yyptr);				\
-      }									\
-    while (0)
-
-#endif
-
-
-#if ! defined (YYSIZE_T) && defined (__SIZE_TYPE__)
-# define YYSIZE_T __SIZE_TYPE__
-#endif
-#if ! defined (YYSIZE_T) && defined (size_t)
-# define YYSIZE_T size_t
-#endif
-#if ! defined (YYSIZE_T)
-# if defined (__STDC__) || defined (__cplusplus)
-#  include <stddef.h> /* INFRINGES ON USER NAME SPACE */
-#  define YYSIZE_T size_t
-# endif
-#endif
-#if ! defined (YYSIZE_T)
-# define YYSIZE_T unsigned int
-#endif
-
-#define yyerrok		(yyerrstatus = 0)
-#define yyclearin	(yychar = YYEMPTY)
-#define YYEMPTY		-2
-#define YYEOF		0
-#define YYACCEPT	goto yyacceptlab
-#define YYABORT 	goto yyabortlab
-#define YYERROR		goto yyerrlab1
-/* Like YYERROR except do call yyerror.  This remains here temporarily
-   to ease the transition to the new meaning of YYERROR, for GCC.
-   Once GCC version 2 has supplanted version 1, this can go.  */
-#define YYFAIL		goto yyerrlab
-#define YYRECOVERING()  (!!yyerrstatus)
-#define YYBACKUP(Token, Value)					\
-do								\
-  if (yychar == YYEMPTY && yylen == 1)				\
-    {								\
-      yychar = (Token);						\
-      yylval = (Value);						\
-      yychar1 = YYTRANSLATE (yychar);				\
-      YYPOPSTACK;						\
-      goto yybackup;						\
-    }								\
-  else								\
-    { 								\
-      yyerror ("syntax error: cannot back up");			\
-      YYERROR;							\
-    }								\
-while (0)
-
-#define YYTERROR	1
-#define YYERRCODE	256
-
-
-/* YYLLOC_DEFAULT -- Compute the default location (before the actions
-   are run).
-
-   When YYLLOC_DEFAULT is run, CURRENT is set the location of the
-   first token.  By default, to implement support for ranges, extend
-   its range to the last symbol.  */
-
-#ifndef YYLLOC_DEFAULT
-# define YYLLOC_DEFAULT(Current, Rhs, N)       	\
-   Current.last_line   = Rhs[N].last_line;	\
-   Current.last_column = Rhs[N].last_column;
-#endif
-
-
-/* YYLEX -- calling `yylex' with the right arguments.  */
-
-#if YYPURE
-# if YYLSP_NEEDED
-#  ifdef YYLEX_PARAM
-#   define YYLEX		yylex (&yylval, &yylloc, YYLEX_PARAM)
-#  else
-#   define YYLEX		yylex (&yylval, &yylloc)
-#  endif
-# else /* !YYLSP_NEEDED */
-#  ifdef YYLEX_PARAM
-#   define YYLEX		yylex (&yylval, YYLEX_PARAM)
-#  else
-#   define YYLEX		yylex (&yylval)
-#  endif
-# endif /* !YYLSP_NEEDED */
-#else /* !YYPURE */
-# define YYLEX			yylex ()
-#endif /* !YYPURE */
-
-
-/* Enable debugging if requested.  */
-#if YYDEBUG
-
-# ifndef YYFPRINTF
-#  include <stdio.h> /* INFRINGES ON USER NAME SPACE */
-#  define YYFPRINTF fprintf
-# endif
-
-# define YYDPRINTF(Args)			\
-do {						\
-  if (yydebug)					\
-    YYFPRINTF Args;				\
-} while (0)
-/* Nonzero means print parse trace.  It is left uninitialized so that
-   multiple parsers can coexist.  */
-int yydebug;
-#else /* !YYDEBUG */
-# define YYDPRINTF(Args)
-#endif /* !YYDEBUG */
-
-/* YYINITDEPTH -- initial size of the parser's stacks.  */
-#ifndef	YYINITDEPTH
-# define YYINITDEPTH 200
-#endif
-
-/* YYMAXDEPTH -- maximum size the stacks can grow to (effective only
-   if the built-in stack extension method is used).
-
-   Do not make this value too large; the results are undefined if
-   SIZE_MAX < YYSTACK_BYTES (YYMAXDEPTH)
-   evaluated with infinite-precision integer arithmetic.  */
-
-#if YYMAXDEPTH == 0
-# undef YYMAXDEPTH
-#endif
-
-#ifndef YYMAXDEPTH
-# define YYMAXDEPTH 10000
-#endif
-
-#ifdef YYERROR_VERBOSE
-
-# ifndef yystrlen
-#  if defined (__GLIBC__) && defined (_STRING_H)
-#   define yystrlen strlen
-#  else
-/* Return the length of YYSTR.  */
-static YYSIZE_T
-#   if defined (__STDC__) || defined (__cplusplus)
-yystrlen (const char *yystr)
-#   else
-yystrlen (yystr)
-     const char *yystr;
-#   endif
-{
-  register const char *yys = yystr;
-
-  while (*yys++ != '\0')
-    continue;
-
-  return yys - yystr - 1;
-}
-#  endif
-# endif
-
-# ifndef yystpcpy
-#  if defined (__GLIBC__) && defined (_STRING_H) && defined (_GNU_SOURCE)
-#   define yystpcpy stpcpy
-#  else
-/* Copy YYSRC to YYDEST, returning the address of the terminating '\0' in
-   YYDEST.  */
-static char *
-#   if defined (__STDC__) || defined (__cplusplus)
-yystpcpy (char *yydest, const char *yysrc)
-#   else
-yystpcpy (yydest, yysrc)
-     char *yydest;
-     const char *yysrc;
-#   endif
-{
-  register char *yyd = yydest;
-  register const char *yys = yysrc;
-
-  while ((*yyd++ = *yys++) != '\0')
-    continue;
-
-  return yyd - 1;
-}
-#  endif
-# endif
-#endif
-
-#line 315 "/usr/share/bison/bison.simple"
-
-
-/* The user can define YYPARSE_PARAM as the name of an argument to be passed
-   into yyparse.  The argument should have type void *.
-   It should actually point to an object.
-   Grammar actions can access the variable by casting it
-   to the proper pointer type.  */
-
-#ifdef YYPARSE_PARAM
-# if defined (__STDC__) || defined (__cplusplus)
-#  define YYPARSE_PARAM_ARG void *YYPARSE_PARAM
-#  define YYPARSE_PARAM_DECL
-# else
-#  define YYPARSE_PARAM_ARG YYPARSE_PARAM
-#  define YYPARSE_PARAM_DECL void *YYPARSE_PARAM;
-# endif
-#else /* !YYPARSE_PARAM */
-# define YYPARSE_PARAM_ARG
-# define YYPARSE_PARAM_DECL
-#endif /* !YYPARSE_PARAM */
-
-/* Prevent warning if -Wstrict-prototypes.  */
-#ifdef __GNUC__
-# ifdef YYPARSE_PARAM
-int yyparse (void *);
-# else
-int yyparse (void);
-# endif
-#endif
-
-/* YY_DECL_VARIABLES -- depending whether we use a pure parser,
-   variables are global, or local to YYPARSE.  */
-
-#define YY_DECL_NON_LSP_VARIABLES			\
-/* The lookahead symbol.  */				\
-int yychar;						\
-							\
-/* The semantic value of the lookahead symbol. */	\
-YYSTYPE yylval;						\
-							\
-/* Number of parse errors so far.  */			\
-int yynerrs;
-
-#if YYLSP_NEEDED
-# define YY_DECL_VARIABLES			\
-YY_DECL_NON_LSP_VARIABLES			\
-						\
-/* Location data for the lookahead symbol.  */	\
-YYLTYPE yylloc;
-#else
-# define YY_DECL_VARIABLES			\
-YY_DECL_NON_LSP_VARIABLES
-#endif
-
-
-/* If nonreentrant, generate the variables here. */
-
-#if !YYPURE
-YY_DECL_VARIABLES
-#endif  /* !YYPURE */
-
-int
-yyparse (YYPARSE_PARAM_ARG)
-     YYPARSE_PARAM_DECL
-{
-  /* If reentrant, generate the variables here. */
-#if YYPURE
-  YY_DECL_VARIABLES
-#endif  /* !YYPURE */
-
-  register int yystate;
-  register int yyn;
-  int yyresult;
-  /* Number of tokens to shift before error messages enabled.  */
-  int yyerrstatus;
-  /* Lookahead token as an internal (translated) token number.  */
-  int yychar1 = 0;
-
-  /* Three stacks and their tools:
-     `yyss': related to states,
-     `yyvs': related to semantic values,
-     `yyls': related to locations.
-
-     Refer to the stacks thru separate pointers, to allow yyoverflow
-     to reallocate them elsewhere.  */
-
-  /* The state stack. */
-  short	yyssa[YYINITDEPTH];
-  short *yyss = yyssa;
-  register short *yyssp;
-
-  /* The semantic value stack.  */
-  YYSTYPE yyvsa[YYINITDEPTH];
-  YYSTYPE *yyvs = yyvsa;
-  register YYSTYPE *yyvsp;
-
-#if YYLSP_NEEDED
-  /* The location stack.  */
-  YYLTYPE yylsa[YYINITDEPTH];
-  YYLTYPE *yyls = yylsa;
-  YYLTYPE *yylsp;
-#endif
-
-#if YYLSP_NEEDED
-# define YYPOPSTACK   (yyvsp--, yyssp--, yylsp--)
-#else
-# define YYPOPSTACK   (yyvsp--, yyssp--)
-#endif
-
-  YYSIZE_T yystacksize = YYINITDEPTH;
-
-
-  /* The variables used to return semantic value and location from the
-     action routines.  */
-  YYSTYPE yyval;
-#if YYLSP_NEEDED
-  YYLTYPE yyloc;
-#endif
-
-  /* When reducing, the number of symbols on the RHS of the reduced
-     rule. */
-  int yylen;
-
-  YYDPRINTF ((stderr, "Starting parse\n"));
-
-  yystate = 0;
-  yyerrstatus = 0;
-  yynerrs = 0;
-  yychar = YYEMPTY;		/* Cause a token to be read.  */
-
-  /* Initialize stack pointers.
-     Waste one element of value and location stack
-     so that they stay on the same level as the state stack.
-     The wasted elements are never initialized.  */
-
-  yyssp = yyss;
-  yyvsp = yyvs;
-#if YYLSP_NEEDED
-  yylsp = yyls;
-#endif
-  goto yysetstate;
-
-/*------------------------------------------------------------.
-| yynewstate -- Push a new state, which is found in yystate.  |
-`------------------------------------------------------------*/
- yynewstate:
-  /* In all cases, when you get here, the value and location stacks
-     have just been pushed. so pushing a state here evens the stacks.
-     */
-  yyssp++;
-
- yysetstate:
-  *yyssp = yystate;
-
-  if (yyssp >= yyss + yystacksize - 1)
-    {
-      /* Get the current used size of the three stacks, in elements.  */
-      YYSIZE_T yysize = yyssp - yyss + 1;
-
-#ifdef yyoverflow
-      {
-	/* Give user a chance to reallocate the stack. Use copies of
-	   these so that the &'s don't force the real ones into
-	   memory.  */
-	YYSTYPE *yyvs1 = yyvs;
-	short *yyss1 = yyss;
-
-	/* Each stack pointer address is followed by the size of the
-	   data in use in that stack, in bytes.  */
-# if YYLSP_NEEDED
-	YYLTYPE *yyls1 = yyls;
-	/* This used to be a conditional around just the two extra args,
-	   but that might be undefined if yyoverflow is a macro.  */
-	yyoverflow ("parser stack overflow",
-		    &yyss1, yysize * sizeof (*yyssp),
-		    &yyvs1, yysize * sizeof (*yyvsp),
-		    &yyls1, yysize * sizeof (*yylsp),
-		    &yystacksize);
-	yyls = yyls1;
-# else
-	yyoverflow ("parser stack overflow",
-		    &yyss1, yysize * sizeof (*yyssp),
-		    &yyvs1, yysize * sizeof (*yyvsp),
-		    &yystacksize);
-# endif
-	yyss = yyss1;
-	yyvs = yyvs1;
-      }
-#else /* no yyoverflow */
-# ifndef YYSTACK_RELOCATE
-      goto yyoverflowlab;
-# else
-      /* Extend the stack our own way.  */
-      if (yystacksize >= YYMAXDEPTH)
-	goto yyoverflowlab;
-      yystacksize *= 2;
-      if (yystacksize > YYMAXDEPTH)
-	yystacksize = YYMAXDEPTH;
-
-      {
-	short *yyss1 = yyss;
-	union yyalloc *yyptr =
-	  (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize));
-	if (! yyptr)
-	  goto yyoverflowlab;
-	YYSTACK_RELOCATE (yyss);
-	YYSTACK_RELOCATE (yyvs);
-# if YYLSP_NEEDED
-	YYSTACK_RELOCATE (yyls);
-# endif
-# undef YYSTACK_RELOCATE
-	if (yyss1 != yyssa)
-	  YYSTACK_FREE (yyss1);
-      }
-# endif
-#endif /* no yyoverflow */
-
-      yyssp = yyss + yysize - 1;
-      yyvsp = yyvs + yysize - 1;
-#if YYLSP_NEEDED
-      yylsp = yyls + yysize - 1;
-#endif
-
-      YYDPRINTF ((stderr, "Stack size increased to %lu\n",
-		  (unsigned long int) yystacksize));
-
-      if (yyssp >= yyss + yystacksize - 1)
-	YYABORT;
-    }
-
-  YYDPRINTF ((stderr, "Entering state %d\n", yystate));
-
-  goto yybackup;
-
-
-/*-----------.
-| yybackup.  |
-`-----------*/
-yybackup:
-
-/* Do appropriate processing given the current state.  */
-/* Read a lookahead token if we need one and don't already have one.  */
-/* yyresume: */
-
-  /* First try to decide what to do without reference to lookahead token.  */
-
-  yyn = yypact[yystate];
-  if (yyn == YYFLAG)
-    goto yydefault;
-
-  /* Not known => get a lookahead token if don't already have one.  */
-
-  /* yychar is either YYEMPTY or YYEOF
-     or a valid token in external form.  */
-
-  if (yychar == YYEMPTY)
-    {
-      YYDPRINTF ((stderr, "Reading a token: "));
-      yychar = YYLEX;
-    }
-
-  /* Convert token to internal form (in yychar1) for indexing tables with */
-
-  if (yychar <= 0)		/* This means end of input. */
-    {
-      yychar1 = 0;
-      yychar = YYEOF;		/* Don't call YYLEX any more */
-
-      YYDPRINTF ((stderr, "Now at end of input.\n"));
-    }
-  else
-    {
-      yychar1 = YYTRANSLATE (yychar);
-
-#if YYDEBUG
-     /* We have to keep this `#if YYDEBUG', since we use variables
-	which are defined only if `YYDEBUG' is set.  */
-      if (yydebug)
-	{
-	  YYFPRINTF (stderr, "Next token is %d (%s",
-		     yychar, yytname[yychar1]);
-	  /* Give the individual parser a way to print the precise
-	     meaning of a token, for further debugging info.  */
-# ifdef YYPRINT
-	  YYPRINT (stderr, yychar, yylval);
-# endif
-	  YYFPRINTF (stderr, ")\n");
-	}
-#endif
-    }
-
-  yyn += yychar1;
-  if (yyn < 0 || yyn > YYLAST || yycheck[yyn] != yychar1)
-    goto yydefault;
-
-  yyn = yytable[yyn];
-
-  /* yyn is what to do for this token type in this state.
-     Negative => reduce, -yyn is rule number.
-     Positive => shift, yyn is new state.
-       New state is final state => don't bother to shift,
-       just return success.
-     0, or most negative number => error.  */
-
-  if (yyn < 0)
-    {
-      if (yyn == YYFLAG)
-	goto yyerrlab;
-      yyn = -yyn;
-      goto yyreduce;
-    }
-  else if (yyn == 0)
-    goto yyerrlab;
-
-  if (yyn == YYFINAL)
-    YYACCEPT;
-
-  /* Shift the lookahead token.  */
-  YYDPRINTF ((stderr, "Shifting token %d (%s), ",
-	      yychar, yytname[yychar1]));
-
-  /* Discard the token being shifted unless it is eof.  */
-  if (yychar != YYEOF)
-    yychar = YYEMPTY;
-
-  *++yyvsp = yylval;
-#if YYLSP_NEEDED
-  *++yylsp = yylloc;
-#endif
-
-  /* Count tokens shifted since error; after three, turn off error
-     status.  */
-  if (yyerrstatus)
-    yyerrstatus--;
-
-  yystate = yyn;
-  goto yynewstate;
-
-
-/*-----------------------------------------------------------.
-| yydefault -- do the default action for the current state.  |
-`-----------------------------------------------------------*/
-yydefault:
-  yyn = yydefact[yystate];
-  if (yyn == 0)
-    goto yyerrlab;
-  goto yyreduce;
-
-
-/*-----------------------------.
-| yyreduce -- Do a reduction.  |
-`-----------------------------*/
-yyreduce:
-  /* yyn is the number of a rule to reduce with.  */
-  yylen = yyr2[yyn];
-
-  /* If YYLEN is nonzero, implement the default value of the action:
-     `$$ = $1'.
-
-     Otherwise, the following line sets YYVAL to the semantic value of
-     the lookahead token.  This behavior is undocumented and Bison
-     users should not rely upon it.  Assigning to YYVAL
-     unconditionally makes the parser a bit smaller, and it avoids a
-     GCC warning that YYVAL may be used uninitialized.  */
-  yyval = yyvsp[1-yylen];
-
-#if YYLSP_NEEDED
-  /* Similarly for the default location.  Let the user run additional
-     commands if for instance locations are ranges.  */
-  yyloc = yylsp[1-yylen];
-  YYLLOC_DEFAULT (yyloc, (yylsp - yylen), yylen);
-#endif
-
-#if YYDEBUG
-  /* We have to keep this `#if YYDEBUG', since we use variables which
-     are defined only if `YYDEBUG' is set.  */
-  if (yydebug)
-    {
-      int yyi;
-
-      YYFPRINTF (stderr, "Reducing via rule %d (line %d), ",
-		 yyn, yyrline[yyn]);
-
-      /* Print the symbols being reduced, and their result.  */
-      for (yyi = yyprhs[yyn]; yyrhs[yyi] > 0; yyi++)
-	YYFPRINTF (stderr, "%s ", yytname[yyrhs[yyi]]);
-      YYFPRINTF (stderr, " -> %s\n", yytname[yyr1[yyn]]);
-    }
-#endif
-
-  switch (yyn) {
-
-case 3:
-#line 66 "icalssyacc.y"
-{ 
-                 yyclearin;
-		 YYABORT;
-           }
-    break;
-case 4:
-#line 73 "icalssyacc.y"
-{ssyacc_add_select(icalss_yy_gauge,yyvsp[0].v_string);}
-    break;
-case 5:
-#line 74 "icalssyacc.y"
-{ssyacc_add_select(icalss_yy_gauge,yyvsp[0].v_string);}
-    break;
-case 6:
-#line 79 "icalssyacc.y"
-{ssyacc_add_from(icalss_yy_gauge,yyvsp[0].v_string);}
-    break;
-case 7:
-#line 80 "icalssyacc.y"
-{ssyacc_add_from(icalss_yy_gauge,yyvsp[0].v_string);}
-    break;
-case 9:
-#line 85 "icalssyacc.y"
-{ssyacc_add_where(icalss_yy_gauge,yyvsp[-2].v_string,ICALGAUGECOMPARE_EQUAL,yyvsp[0].v_string); }
-    break;
-case 10:
-#line 86 "icalssyacc.y"
-{ssyacc_add_where(icalss_yy_gauge,yyvsp[-2].v_string,ICALGAUGECOMPARE_ISNULL,""); }
-    break;
-case 11:
-#line 87 "icalssyacc.y"
-{ssyacc_add_where(icalss_yy_gauge,yyvsp[-3].v_string,ICALGAUGECOMPARE_ISNOTNULL,""); }
-    break;
-case 12:
-#line 88 "icalssyacc.y"
-{ssyacc_add_where(icalss_yy_gauge,yyvsp[-2].v_string,ICALGAUGECOMPARE_NOTEQUAL,yyvsp[0].v_string); }
-    break;
-case 13:
-#line 89 "icalssyacc.y"
-{ssyacc_add_where(icalss_yy_gauge,yyvsp[-2].v_string,ICALGAUGECOMPARE_LESS,yyvsp[0].v_string); }
-    break;
-case 14:
-#line 90 "icalssyacc.y"
-{ssyacc_add_where(icalss_yy_gauge,yyvsp[-2].v_string,ICALGAUGECOMPARE_GREATER,yyvsp[0].v_string); }
-    break;
-case 15:
-#line 91 "icalssyacc.y"
-{ssyacc_add_where(icalss_yy_gauge,yyvsp[-2].v_string,ICALGAUGECOMPARE_LESSEQUAL,yyvsp[0].v_string); }
-    break;
-case 16:
-#line 92 "icalssyacc.y"
-{ssyacc_add_where(icalss_yy_gauge,yyvsp[-2].v_string,ICALGAUGECOMPARE_GREATEREQUAL,yyvsp[0].v_string); }
-    break;
-case 17:
-#line 96 "icalssyacc.y"
-{set_logic(icalss_yy_gauge,ICALGAUGELOGIC_NONE);}
-    break;
-case 18:
-#line 97 "icalssyacc.y"
-{set_logic(icalss_yy_gauge,ICALGAUGELOGIC_AND);}
-    break;
-case 19:
-#line 98 "icalssyacc.y"
-{set_logic(icalss_yy_gauge,ICALGAUGELOGIC_OR);}
-    break;
-}
-
-#line 705 "/usr/share/bison/bison.simple"
-
-
-  yyvsp -= yylen;
-  yyssp -= yylen;
-#if YYLSP_NEEDED
-  yylsp -= yylen;
-#endif
-
-#if YYDEBUG
-  if (yydebug)
-    {
-      short *yyssp1 = yyss - 1;
-      YYFPRINTF (stderr, "state stack now");
-      while (yyssp1 != yyssp)
-	YYFPRINTF (stderr, " %d", *++yyssp1);
-      YYFPRINTF (stderr, "\n");
-    }
-#endif
-
-  *++yyvsp = yyval;
-#if YYLSP_NEEDED
-  *++yylsp = yyloc;
-#endif
-
-  /* Now `shift' the result of the reduction.  Determine what state
-     that goes to, based on the state we popped back to and the rule
-     number reduced by.  */
-
-  yyn = yyr1[yyn];
-
-  yystate = yypgoto[yyn - YYNTBASE] + *yyssp;
-  if (yystate >= 0 && yystate <= YYLAST && yycheck[yystate] == *yyssp)
-    yystate = yytable[yystate];
-  else
-    yystate = yydefgoto[yyn - YYNTBASE];
-
-  goto yynewstate;
-
-
-/*------------------------------------.
-| yyerrlab -- here on detecting error |
-`------------------------------------*/
-yyerrlab:
-  /* If not already recovering from an error, report this error.  */
-  if (!yyerrstatus)
-    {
-      ++yynerrs;
-
-#ifdef YYERROR_VERBOSE
-      yyn = yypact[yystate];
-
-      if (yyn > YYFLAG && yyn < YYLAST)
-	{
-	  YYSIZE_T yysize = 0;
-	  char *yymsg;
-	  int yyx, yycount;
-
-	  yycount = 0;
-	  /* Start YYX at -YYN if negative to avoid negative indexes in
-	     YYCHECK.  */
-	  for (yyx = yyn < 0 ? -yyn : 0;
-	       yyx < (int) (sizeof (yytname) / sizeof (char *)); yyx++)
-	    if (yycheck[yyx + yyn] == yyx)
-	      yysize += yystrlen (yytname[yyx]) + 15, yycount++;
-	  yysize += yystrlen ("parse error, unexpected ") + 1;
-	  yysize += yystrlen (yytname[YYTRANSLATE (yychar)]);
-	  yymsg = (char *) YYSTACK_ALLOC (yysize);
-	  if (yymsg != 0)
-	    {
-	      char *yyp = yystpcpy (yymsg, "parse error, unexpected ");
-	      yyp = yystpcpy (yyp, yytname[YYTRANSLATE (yychar)]);
-
-	      if (yycount < 5)
-		{
-		  yycount = 0;
-		  for (yyx = yyn < 0 ? -yyn : 0;
-		       yyx < (int) (sizeof (yytname) / sizeof (char *));
-		       yyx++)
-		    if (yycheck[yyx + yyn] == yyx)
-		      {
-			const char *yyq = ! yycount ? ", expecting " : " or ";
-			yyp = yystpcpy (yyp, yyq);
-			yyp = yystpcpy (yyp, yytname[yyx]);
-			yycount++;
-		      }
-		}
-	      yyerror (yymsg);
-	      YYSTACK_FREE (yymsg);
-	    }
-	  else
-	    yyerror ("parse error; also virtual memory exhausted");
-	}
-      else
-#endif /* defined (YYERROR_VERBOSE) */
-	yyerror ("parse error");
-    }
-  goto yyerrlab1;
-
-
-/*--------------------------------------------------.
-| yyerrlab1 -- error raised explicitly by an action |
-`--------------------------------------------------*/
-yyerrlab1:
-  if (yyerrstatus == 3)
-    {
-      /* If just tried and failed to reuse lookahead token after an
-	 error, discard it.  */
-
-      /* return failure if at end of input */
-      if (yychar == YYEOF)
-	YYABORT;
-      YYDPRINTF ((stderr, "Discarding token %d (%s).\n",
-		  yychar, yytname[yychar1]));
-      yychar = YYEMPTY;
-    }
-
-  /* Else will try to reuse lookahead token after shifting the error
-     token.  */
-
-  yyerrstatus = 3;		/* Each real token shifted decrements this */
-
-  goto yyerrhandle;
-
-
-/*-------------------------------------------------------------------.
-| yyerrdefault -- current state does not do anything special for the |
-| error token.                                                       |
-`-------------------------------------------------------------------*/
-yyerrdefault:
-#if 0
-  /* This is wrong; only states that explicitly want error tokens
-     should shift them.  */
-
-  /* If its default is to accept any token, ok.  Otherwise pop it.  */
-  yyn = yydefact[yystate];
-  if (yyn)
-    goto yydefault;
-#endif
-
-
-/*---------------------------------------------------------------.
-| yyerrpop -- pop the current state because it cannot handle the |
-| error token                                                    |
-`---------------------------------------------------------------*/
-yyerrpop:
-  if (yyssp == yyss)
-    YYABORT;
-  yyvsp--;
-  yystate = *--yyssp;
-#if YYLSP_NEEDED
-  yylsp--;
-#endif
-
-#if YYDEBUG
-  if (yydebug)
-    {
-      short *yyssp1 = yyss - 1;
-      YYFPRINTF (stderr, "Error: state stack now");
-      while (yyssp1 != yyssp)
-	YYFPRINTF (stderr, " %d", *++yyssp1);
-      YYFPRINTF (stderr, "\n");
-    }
-#endif
-
-/*--------------.
-| yyerrhandle.  |
-`--------------*/
-yyerrhandle:
-  yyn = yypact[yystate];
-  if (yyn == YYFLAG)
-    goto yyerrdefault;
-
-  yyn += YYTERROR;
-  if (yyn < 0 || yyn > YYLAST || yycheck[yyn] != YYTERROR)
-    goto yyerrdefault;
-
-  yyn = yytable[yyn];
-  if (yyn < 0)
-    {
-      if (yyn == YYFLAG)
-	goto yyerrpop;
-      yyn = -yyn;
-      goto yyreduce;
-    }
-  else if (yyn == 0)
-    goto yyerrpop;
-
-  if (yyn == YYFINAL)
-    YYACCEPT;
-
-  YYDPRINTF ((stderr, "Shifting error token, "));
-
-  *++yyvsp = yylval;
-#if YYLSP_NEEDED
-  *++yylsp = yylloc;
-#endif
-
-  yystate = yyn;
-  goto yynewstate;
-
-
-/*-------------------------------------.
-| yyacceptlab -- YYACCEPT comes here.  |
-`-------------------------------------*/
-yyacceptlab:
-  yyresult = 0;
-  goto yyreturn;
-
-/*-----------------------------------.
-| yyabortlab -- YYABORT comes here.  |
-`-----------------------------------*/
-yyabortlab:
-  yyresult = 1;
-  goto yyreturn;
-
-/*---------------------------------------------.
-| yyoverflowab -- parser overflow comes here.  |
-`---------------------------------------------*/
-yyoverflowlab:
-  yyerror ("parser stack overflow");
-  yyresult = 2;
-  /* Fall through.  */
-
-yyreturn:
-#ifndef yyoverflow
-  if (yyss != yyssa)
-    YYSTACK_FREE (yyss);
-#endif
-  return yyresult;
-}
-#line 102 "icalssyacc.y"
-
-
-static void ssyacc_add_where(struct icalgauge_impl* impl, char* str1, 
-	icalgaugecompare compare , char* value_str)
-{
-
-    struct icalgauge_where *where;
-    char *compstr, *propstr, *c, *s,*l;
-    
-    if ( (where = malloc(sizeof(struct icalgauge_where))) ==0){
-	icalerror_set_errno(ICAL_NEWFAILED_ERROR);
-	return;
-    }
-
-    memset(where,0,sizeof(struct icalgauge_where));
-    where->logic = ICALGAUGELOGIC_NONE;
-    where->compare = ICALGAUGECOMPARE_NONE;
-    where->comp = ICAL_NO_COMPONENT;
-    where->prop = ICAL_NO_PROPERTY;
-
-    /* remove enclosing quotes */
-    s = value_str;
-    if(*s == '\''){
-	s++;
-    }
-    l = s+strlen(s)-1;
-    if(*l == '\''){
-	*l=0;
-    }
-	
-    where->value = strdup(s);
-
-    /* Is there a period in str1 ? If so, the string specified both a
-       component and a property*/
-    if( (c = strrchr(str1,'.')) != 0){
-	compstr = str1;
-	propstr = c+1;
-	*c = '\0';
-    } else {
-	compstr = 0;
-	propstr = str1;
-    }
-
-
-    /* Handle the case where a component was specified */
-    if(compstr != 0){
-	where->comp = icalenum_string_to_component_kind(compstr);
-    } else {
-	where->comp = ICAL_NO_COMPONENT;
-    }
-
-    where->prop = icalenum_string_to_property_kind(propstr);    
-
-    where->compare = compare;
-
-    if(where->value == 0){
-	icalerror_set_errno(ICAL_NEWFAILED_ERROR);
-	free(where->value);
-	return;
-    }
-
-    pvl_push(impl->where,where);
-}
-
-static void set_logic(struct icalgauge_impl* impl,icalgaugelogic l)
-{
-    pvl_elem e = pvl_tail(impl->where);
-    struct icalgauge_where *where = pvl_data(e);
-
-    where->logic = l;
-   
-}
-
-
-
-static void ssyacc_add_select(struct icalgauge_impl* impl, char* str1)
-{
-    char *c, *compstr, *propstr;
-    struct icalgauge_where *where;
-    
-    /* Uses only the prop and comp fields of the where structure */
-    if ( (where = malloc(sizeof(struct icalgauge_where))) ==0){
-	icalerror_set_errno(ICAL_NEWFAILED_ERROR);
-	return;
-    }
-
-    memset(where,0,sizeof(struct icalgauge_where));
-    where->logic = ICALGAUGELOGIC_NONE;
-    where->compare = ICALGAUGECOMPARE_NONE;
-    where->comp = ICAL_NO_COMPONENT;
-    where->prop = ICAL_NO_PROPERTY;
-
-    /* Is there a period in str1 ? If so, the string specified both a
-       component and a property*/
-    if( (c = strrchr(str1,'.')) != 0){
-	compstr = str1;
-	propstr = c+1;
-	*c = '\0';
-    } else {
-	compstr = 0;
-	propstr = str1;
-    }
-
-
-    /* Handle the case where a component was specified */
-    if(compstr != 0){
-	where->comp = icalenum_string_to_component_kind(compstr);
-    } else {
-	where->comp = ICAL_NO_COMPONENT;
-    }
-
-
-    /* If the property was '*', then accept all properties */
-    if(strcmp("*",propstr) == 0) {
-	where->prop = ICAL_ANY_PROPERTY; 	    
-    } else {
-	where->prop = icalenum_string_to_property_kind(propstr);    
-    }
-    
-
-    if(where->prop == ICAL_NO_PROPERTY){
-      free(where);
-      icalerror_set_errno(ICAL_BADARG_ERROR);
-      return;
-    }
-
-    pvl_push(impl->select,where);
-}
-
-static void ssyacc_add_from(struct icalgauge_impl* impl, char* str1)
-{
-    icalcomponent_kind ckind;
-
-    ckind = icalenum_string_to_component_kind(str1);
-
-    if(ckind == ICAL_NO_COMPONENT){
-	assert(0);
-    }
-
-    pvl_push(impl->from,(void*)ckind);
-
-}
-
-
-void sserror(char *s){
-  fprintf(stderr,"Parse error \'%s\'\n", s);
-  icalerror_set_errno(ICAL_MALFORMEDDATA_ERROR);
-}
diff --git a/libical/src/libicalss/icalssyacc.y b/libical/src/libicalss/icalssyacc.y
index 85ee6c64c5..101adc8383 100644
--- a/libical/src/libicalss/icalssyacc.y
+++ b/libical/src/libicalss/icalssyacc.y
@@ -6,7 +6,7 @@
   
   DESCRIPTION:
   
-  $Id: icalssyacc.y,v 1.3 2003/09/24 02:06:52 hansp Exp $
+  $Id: icalssyacc.y,v 1.4 2003/10/21 18:28:18 ettore Exp $
   $Locker:  $
 
 (C) COPYRIGHT 2000, Eric Busboom, http://www.softwarestudio.org
@@ -30,7 +30,7 @@
 #include <stdlib.h>
 #include <string.h> /* for strdup() */
 #include <limits.h> /* for SHRT_MAX*/
-#include "ical.h"
+#include <libical/ical.h>
 #include "icalgauge.h"
 #include "icalgaugeimpl.h"
 
diff --git a/mail/ChangeLog b/mail/ChangeLog
index 1ca3dae2d2..a5548f1232 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,85 @@
+2003-10-21  Not Zed  <NotZed@Ximian.com>
+
+	* mail-component.c (emc_popup_properties): implement.
+	(emc_popup_properties_got_folder): builds dynamic
+	folder-properties dialogue.
+	(emc_popup_properties_response): set the properties on the folder
+	on an ok response.
+	(emc_popup_properties_free): free the properties working data.
+
+	* mail-folder-cache.c (unset_folder_info): unhook from the right
+	function for message_changed.
+
+2003-10-20  Not Zed  <NotZed@Ximian.com>
+
+	* mail-component.c (emc_popup_new_folder): pass the right object
+	to set_selected().  Fixes a new real bug.  Undid reformatting.
+
+2003-10-17  Jeffrey Stedfast  <fejj@ximian.com>
+
+	* mail-component.c: General compile fixes.
+	(emc_popup_new_folder): Fixed to not shadow a parameter. Fixes a
+	real bug.
+
+	* mail-component.h: Added some prototypes.
+
+2003-10-13  Not Zed  <NotZed@Ximian.com>
+
+	* em-popup.c (em_popup_create_menu_once): only hookup target free
+	if we have a target set.
+
+	* mail-component.c (load_accounts): removed debug i accidentally
+	left in.
+	(emc_tree_right_click): handle right-click context menu, using an
+	EMPopup table.
+	(emc_popup_*): setup empty popup handlers.
+
+2003-10-13  Not Zed  <NotZed@Ximian.com>
+
+	* em-folder-selection.c (em_select_folder): asynchornous folder
+	selection call.
+	(emfs_folder_selected): callback for folder selected.
+
+	* em-folder-view.c (emfv_popup_move): implement.
+	(emfv_popup_copy): "
+	(emfv_popup_move_cb): async folder select callback to run it.
+
+2003-10-10  Not Zed  <NotZed@Ximian.com>
+
+	* mail-account-gui.c
+	(mail_account_gui_folder_selector_button_new): use
+	em_folder_selection_button.
+	(mail_account_gui_new): "
+	(folder_selected): "
+
+	* em-folder-selection-button.c: Make this use camel uri's rather
+	than camelfolders.
+	(set_selection): removed, redundant.
+	(impl_dispose): removed, not needed.
+
+	* em-folder-selection-button.h: change the selected signal not to
+	actually return the selection, which must get retrieved later.
+
+	* mail-component.c (em_uri_from_camel): create an evo mail uri
+	from a camel one.
+	(em_uri_to_camel): the reverse.
+
+	* mail-signature-editor.c (mail_signature_editor): up the version
+	of the gtkhtml editor.
+
+2003-10-09  Not Zed  <NotZed@Ximian.com>
+
+	* em-folder-selection-button.c (set_selection): always set
+	selected_folder, otherwise we don't unset it properly.
+
+	* em-folder-selection.c (em_folder_selection_run_dialog): fix a
+	small memleak.
+	(em_folder_selection_run_dialog_uri): do the same as run_dialog
+	but take, and return physical uri's.
+
+	* mail-component-factory.c (factory): removed some fixme's, and
+	re-hookedup the composer.
+
 2003-10-09  Frederic Crozat  <fcrozat@mandrakesoft.com>
 
 	* em-icon-stream.c: (emis_sync_close):
@@ -10,6 +92,38 @@
 	create-rule-from-message bars so that we don't segfault when we
 	right click with a multi-selection.
 
+2003-10-08  Chris Toshok  <toshok@ximian.com>
+
+	* em-utils.c (em_utils_camel_address_to_destination): EDestination
+	=> EABDestination, and e_destination => eab_destination.
+	(reply_get_composer): same.
+	(post_reply_to_message): same.
+
+	* em-composer-utils.c (ask_confirm_for_unwanted_html_mail)
+	EDestination => EABDestination, and e_destination =>
+	eab_destination.
+	(composer_get_message):same.
+
+2003-10-08  Not Zed  <NotZed@Ximian.com>
+
+	* mail-component.c (mail_component_peek): setup vfolders once we
+	hve the component, since its setup will call mail_component_peek,
+	fun recursion.
+
+2003-10-08  Not Zed  <NotZed@Ximian.com>
+
+	* mail-component.c (setup_local_folder): removed.
+	(setup_local_store): setup various needed globals properly.
+	(setup_account_storages): renamed to load_accounts.
+	(go_online): turn on interactivity as well as onlinedness.
+
+	* GNOME_Evolution_Mail.server.in.in: point the preferences pages
+	to the right factory.
+
+2003-10-07  Not Zed  <NotZed@Ximian.com>
+
+	* mail-component.[ch]: Fix copyrights.
+
 2003-10-06  Jeffrey Stedfast  <fejj@ximian.com>
 
 	* mail-config-druid.c (identity_prepare): Fixed.
@@ -28,6 +142,22 @@
 	the first unread message for now. This is actually annoying the
 	fuck out of me, Radek, and a few other people.
 
+2003-10-02  Not Zed  <NotZed@Ximian.com>
+
+	* mail-component.c (add_storage): Add the storage to the hash
+	after we've initialised it.
+	(mail_component_evomail_uri_from_folder): hardcode "local" account
+	pseudo-id for local folders.
+	(mail_component_get_folder_from_evomail_uri): handle the "local"
+	account case.
+
+2003-10-02  Not Zed  <NotZed@Ximian.com>
+
+	* mail-component.c (setup_local_store): use mbox:/path rather than
+	mbox:///path - the mbox code is 'wrong', but this is easier to
+	fix.  fixes local unread counts.  maybe the provider url-compare
+	should address this too.
+
 2003-10-02  Suresh Chandrasekharan <suresh.chandrasekharan@sun.com>
 
 	* mail-config-druid.c: Fix for 40917 "Backspace shouldn't
@@ -101,6 +231,27 @@
 
 	* em-format.c (emf_init): Oops, put the arguments in the right order.
 
+2003-09-29  Ettore Perazzoli  <ettore@ximian.com>
+
+	* mail-component.c: New member local_store in
+	MailComponentPrivate.
+	(impl_dispose): Unref.
+	(mail_component_load_storage_by_uri): Return the CamelStore.
+	(setup_local_folder): New.
+	(setup_local_store): New.
+	(mail_component_init): Call it.
+	(mail_component_peek_storage_set): New.
+	(mail_component_get_folder_from_evomail_uri): New.
+	(mail_component_evomail_uri_from_folder): New.
+
+	* em-folder-selection-button.c: New.
+	* em-folder-selection-button.h: New.
+
+	* em-folder-selection.c: New.
+	* em-folder-selection.h: New.
+
+	* em-marshal.list: Add NONE:POINTER.
+
 2003-09-25  Jeffrey Stedfast  <fejj@ximian.com>
 
 	* mail-account-gui.c (mail_account_gui_save): Allow any file: uri
@@ -120,6 +271,33 @@
 	charset string is empty, default the charset to the user's locale
 	charset. Partial fix for bug #47638.
 
+2003-09-23  Ettore Perazzoli  <ettore@ximian.com>
+
+	* mail-component.c (add_storage): Remove unused arg "uri".
+	(mail_component_add_store): Likewise.
+	(add_storage): Don't set the "Connecting..." node.
+	(mail_component_init): Set up local store at
+	~/.evolution/mail/local.
+
+	* evolution-mbox-upgrade.c (get_local_store): Remove a double
+	xmlFree() that was causing it to crash.
+
+
+2003-09-23  Ettore Perazzoli  <ettore@ximian.com>
+
+	* mail-component.c (add_storage): Note the new store.
+
+	* mail-component-factory.c: Don't include "mail-callbacks.h"
+	anymore.
+
+	* em-format-html.c (em_format_html_get_type): Get the base
+	directory with mail_component_peek_base_directory().
+	* em-utils.c (filter_editor_response): Likewise.
+	(em_utils_edit_filters): Likewise.
+
+	* em-folder-browser.c (emfb_init): Get the search context through
+	mail_component_peek_search_context().
+
 2003-09-23  Jeffrey Stedfast  <fejj@ximian.com>
 
 	* evolution-mbox-upgrade.c (get_local_store): Don't xmlFree (name)
@@ -273,6 +451,14 @@
 	* evolution-mbox-upgrade.c: New source file to migrate from the
 	old mbox structure to the new mbox structure.
 
+2003-09-08  Ettore Perazzoli  <ettore@ximian.com>
+
+	* mail-folder-cache.c (mail_note_store): Allow NULL storage in
+	precondition.
+
+	* mail-component.c (mail_component_init): Remove debugging
+	message.
+
 2003-08-22  Not Zed  <NotZed@Ximian.com>
 
 	* mail-format.c (write_date): translate the local time format.
@@ -284,14 +470,13 @@
 	day names, and the autoconf magic which made Not Zed dislike the
 	inclusion of the timezone name.
 
-2003-08-14  Jeffrey Stedfast  <fejj@ximian.com>
+2003-08-18  Ettore Perazzoli  <ettore@ximian.com>
 
-	* mail-ops.c (mail_send_message): Don't abort at the first failure
-	after sending (filtering, appending to Sent, syncing). Instead,
-	keep a running tab of exceptions and then set a culmulative
-	exception at the end to report to our caller. Also, if we fail to
-	append to the account Sent folder, try again with the local Sent
-	folder. Fixes bug #46512.
+	* GNOME_Evolution_Mail.server.in.in: Rename
+	GNOME_Evolution_Mail_Component2 to
+	GNOME_Evolution_Mail_Component_2 and GNOME_Evolution_Mail_Factory2
+	to GNOME_Evolution_Mail_Factory_2.
+	* mail-component-factory.c: Update accordingly.
 
 2003-08-18  Jeffrey Stedfast  <fejj@ximian.com>
 
@@ -336,6 +521,15 @@
 	* mail-display.c (mail_display_render): Change "%P" to "%p" so 
 	that strftime() can work under solaris.
 
+2003-08-14  Jeffrey Stedfast  <fejj@ximian.com>
+
+	* mail-ops.c (mail_send_message): Don't abort at the first failure
+	after sending (filtering, appending to Sent, syncing). Instead,
+	keep a running tab of exceptions and then set a culmulative
+	exception at the end to report to our caller. Also, if we fail to
+	append to the account Sent folder, try again with the local Sent
+	folder. Fixes bug #46512.
+
 2003-08-13  Suresh Chandrasekharan <suresh.chandrasekharan@sun.com>
 	
 	* e-searching-tokenizer.c (searcher_next_token): Fix for 45818 (
@@ -353,6 +547,12 @@
 	* mail-session.c (remove_timeout): Removed.
 	(register_timeout): Removed.
 
+2003-08-09  Ettore Perazzoli  <ettore@ximian.com>
+
+	* mail-component.c (storage_go_online): Pass NULL for the
+	operation pointer to mail_note_store(), to sync with Michael's
+	changes.
+
 2003-08-05  Jeffrey Stedfast  <fejj@ximian.com>
 
 	* mail-format.c (handle_multipart_encrypted): Updated for
@@ -1308,6 +1508,154 @@
 	* message-browser.c (message_browser_new): Handle our own Delete
 	key presses. Fixes bug #45597.
 
+2003-07-25  Ettore Perazzoli  <ettore@ximian.com>
+
+	* mail-callbacks.c (do_view_message): No need to pass a shell
+	argument to message_browser_new() anymore.
+
+	* message-browser.c (message_browser_new): Removed arg shell.  No
+	need to pass it to folder_browser_new() either.
+
+	* mail-component.c (create_view_callback): No need to pass a shell
+	arg to folder_browser_factory_new_control() anymore.
+
+	* folder-browser-factory.c (folder_browser_factory_new_control):
+	Removed arg shell; folder_browser_browser_new() doesn't need it
+	anymore.
+
+	* folder-browser.c (folder_browser_destroy): No need to unref
+	->shell anymore.
+	(folder_browser_new): Removed shell arg.
+	(folder_browser_gui_init): Removed a const qualifier that was not
+	supposed to be there.
+
+	* folder-browser.h: Removed member shell from struct
+	FolderBrowser.
+
+2003-07-25  Ettore Perazzoli  <ettore@ximian.com>
+
+	* folder-browser.c (folder_browser_gui_init): Get the search
+	context through mail_component_peek_search_context(), since it's
+	no longer a global variable.
+	(folder_browser_gui_init): Cleaned up an extra unneeded if()
+	statement.
+
+	* mail-component.c: New member search_context in struct
+	MailComponentPrivate.
+	(mail_component_peek_search_context): New.
+	(setup_search_context): New function to initialize the
+	search_context, based on the old code in component-factory.c.
+	(mail_component_init): Call it here.
+	(impl_dispose): Unref the rule_context.
+
+	* mail-component-factory.c: Removed global variable
+	search_context.
+
+2003-07-25  Ettore Perazzoli  <ettore@ximian.com>
+
+	* mail-component.c (browser_page_switched_callback): New callback
+	for the "page_switched" signal on EStorageBrowser; deactivate the
+	previous page, activate the new one.
+	(impl_createControls): Connect.
+
+2003-07-24  Ettore Perazzoli  <ettore@ximian.com>
+
+	* mail-mt.c (do_op_status): Pass "evolution-mail" as the ID to
+	evolution_activity_client_new().  [This is just a temporary thing
+	to avoid the fact that we don't have component-factory.h anymore.
+	Eventually we'll just get rid of the activity client stuff.]
+
+	* mail-component-factory.c: Added to the build.  Also, finished
+	implementing and moving the factory over from component-factory.c.
+
+	* component-factory.c: Removed from the build.
+	* component-factory.h: Removed from the build.
+
+	* mail-component.c: Removed some debugging messages.
+
+2003-07-23  Ettore Perazzoli  <ettore@ximian.com>
+
+	* subscribe-dialog.c: Converted to use EStorages instead of
+	EvolutionStorages and the new MailComponent object.
+
+	* mail.h: Nuked a bunch of stuff.  This will go away when I am
+	done refactoring.
+
+	* mail-offline-handler.c: Use the new MailComponent object.
+
+	* mail-folder-cache.c, mail-folder-cache.h: Converted to use
+	EStorages instead of EvolutionStorages.
+
+	* mail-display.c: Use g_timeout and g_source functions instead of
+	gtk_timeout functions.
+
+	* mail-send-recv.c: Use g_timeout and g_source functions instead
+	of gtk_timeout functions.
+	(receive_update_got_store): Updated for the new mail_note_store().
+
+	* mail-session.c: Use g_timeout and g_source functions instead of
+	gtk_timeout functions.
+
+	* mail-config-factory.c (factory): Removed.
+
+	* folder-browser.c (folder_browser_destroy): Use GLib
+	timeout/source functions instead of the deprecated GTK ones.
+	(done_message_selected): Likewise.
+	(folder_browser_gui_init): Protect against fb->search being NULL.
+
+	* mail-account-gui.c (add_new_store): Use new MailComponent object
+	and EStorages instead of EvolutionStorages.
+	(mail_account_gui_save): Likewise.
+
+	* mail-accounts.c (account_delete_clicked): Use new MailComponent
+	object and EStorages instead of EvolutionStorages.
+	(account_able_clicked): Likewise.
+	(account_able_toggled): Likewise.
+
+	* mail-autofilter.c: Use mail_component_peek_base_directory()
+	instead of the evolution_dir global.
+	* mail-callbacks.c: Likewise.
+	* mail-config.c (uri_to_evname): Likewise.
+	(mail_config_get_signature_list): Likewise.
+	(delete_unused_signature_file): Likewise.
+	* mail-display.c (mail_display_class_init): Likewise.
+	* mail-importer.c (mail_importer_make_local_folder): Likewise.
+	* mail-local.c (mlf_getv): Likewise.
+	* mail-ops.c (uid_cachename_hack): Likewise.
+	* mail-summary.c (generate_folder_summaries): Likewise.
+	* mail-tools.c (mail_tool_get_local_inbox): Likewise.
+	(mail_tools_folder_to_url): Likewise.
+	* mail-vfolder.c (mail_vfolder_delete_uri): Likewise.
+	(mail_vfolder_rename_uri): Likewise.
+	(context_rule_removed): Likewise.
+	(store_folder_deleted): Likewise.
+	(store_folder_renamed): Likewise.
+	(vfolder_load_storage): Likewise.
+	(vfolder_editor_response): Likewise.
+	(edit_rule_response): Likewise.
+	(new_rule_clicked): Likewise.
+	(vfolder_gui_add_rule): Likewise.
+	* mail-session.c (main_get_filter_driver): Likewise.
+	(mail_session_forget_password): Likewise.
+	(mail_session_init): Get a base_directory arg.
+
+	* component-factory.c, component-factory.h: Disabled a bunch of
+	stuff to get it to compile in the new configuration.  These files
+	will eventually go away when I am done refactoring this.
+
+	* Makefile.am: Do not build importers, compile generate
+	skels/stubs for Evolution.
+
+	* GNOME_Evolution_Mail.server.in.in: Rename control factory to
+	OAFIID:GNOME_Evolution_Mail_Factory2.  Add new component
+	GNOME_Evolution_Mail_Component2.
+
+	* mail-component-factory.c: New file implementing the Bonobo
+	factory.
+
+	* mail-component.c, mail-component.h: New files implementing the
+	new mail component, using the new Evolution::Component IDL.
+
 2003-07-23  Jeffrey Stedfast  <fejj@ximian.com>
 
 	* mail-format.c (mail_format_data_wrapper_write_to_stream): Revert
diff --git a/mail/GNOME_Evolution_Mail.server.in.in b/mail/GNOME_Evolution_Mail.server.in.in
index 9d0391d0be..30fcd5b070 100644
--- a/mail/GNOME_Evolution_Mail.server.in.in
+++ b/mail/GNOME_Evolution_Mail.server.in.in
@@ -3,7 +3,7 @@
   <!-- Folder display control -->
 
   <!-- (factory) -->
-  <oaf_server iid="OAFIID:GNOME_Evolution_Mail_ControlFactory"
+  <oaf_server iid="OAFIID:GNOME_Evolution_Mail_Factory_2"
 	      type="shlib"
 	      location="@COMPONENTDIR@/libevolution-mail.so">
 
@@ -29,6 +29,22 @@
 		   _value="Evolution Mail folder viewer"/>
   </oaf_server>
 
+  <!-- Component Interface -->
+
+  <oaf_server iid="OAFIID:GNOME_Evolution_Mail_Component_2"
+	      type="factory"
+	      location="OAFIID:GNOME_Evolution_Mail_Factory_2">
+
+    <oaf_attribute name="repo_ids" type="stringv">
+      <item value="IDL:GNOME/Evolution/Component:1.0"/>
+    </oaf_attribute>
+
+    <oaf_attribute name="name" type="string" _value="Evolution Mail component"/>
+
+    <oaf_attribute name="evolution:component_icon" type="string" value="evolution-inbox.png"/>
+    <oaf_attribute name="evolution:component_display_order" type="number" value="1"/>
+  </oaf_server>
+
   <!-- Shell Component -->
 
   <oaf_server iid="OAFIID:GNOME_Evolution_Mail_ShellComponent"
@@ -53,7 +69,7 @@
   <!-- (composer) -->
   <oaf_server iid="OAFIID:GNOME_Evolution_Mail_Composer"
 	      type="factory"
-	      location="OAFIID:GNOME_Evolution_Mail_ControlFactory">
+	      location="OAFIID:GNOME_Evolution_Mail_Factory_2">
 
     <oaf_attribute name="repo_ids" type="stringv">
       <item value="IDL:GNOME/Evolution:Composer:1.0"/>
@@ -109,7 +125,7 @@
   <!-- Account Editor -->
   <oaf_server iid="OAFIID:GNOME_Evolution_Mail_Accounts_ConfigControl"
 	      type="factory"
-	      location="OAFIID:GNOME_Evolution_Mail_ControlFactory">
+	      location="OAFIID:GNOME_Evolution_Mail_Factory_2">
 
     <oaf_attribute name="repo_ids" type="stringv">
       <item value="IDL:GNOME/Evolution/ConfigControl:1.0"/>
@@ -138,7 +154,7 @@
   <!-- Mail Preferences -->
   <oaf_server iid="OAFIID:GNOME_Evolution_Mail_Preferences_ConfigControl"
 	      type="factory"
-	      location="OAFIID:GNOME_Evolution_Mail_ControlFactory">
+	      location="OAFIID:GNOME_Evolution_Mail_Factory_2">
 
     <oaf_attribute name="repo_ids" type="stringv">
       <item value="IDL:GNOME/Evolution/ConfigControl:1.0"/>
@@ -163,7 +179,7 @@
   <!-- Composer Preferences -->
   <oaf_server iid="OAFIID:GNOME_Evolution_Mail_ComposerPrefs_ConfigControl"
 	      type="factory"
-	      location="OAFIID:GNOME_Evolution_Mail_ControlFactory">
+	      location="OAFIID:GNOME_Evolution_Mail_Factory_2">
 
     <oaf_attribute name="repo_ids" type="stringv">
       <item value="IDL:GNOME/Evolution/ConfigControl:1.0"/>
diff --git a/mail/Makefile.am b/mail/Makefile.am
index 75802f396e..ac0b6827bd 100644
--- a/mail/Makefile.am
+++ b/mail/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = importers
+SUBDIRS = # importers FIXME
 
 libexec_PROGRAMS =				\
 	evolution-mbox-upgrade
@@ -39,128 +39,153 @@ INCLUDES =						\
 
 component_LTLIBRARIES = libevolution-mail.la
 
-EVOLUTION_MAIL_CORBA_GENERATED_H =		\
+
+# Code generation for Mailer.idl
+
+MAILER_IDL = Mailer.idl
+
+MAILER_IDL_GENERATED_H =		\
 	Mailer.h
-EVOLUTION_MAIL_CORBA_GENERATED_C =		\
+MAILER_IDL_GENERATED_C =		\
 	Mailer-common.c				\
 	Mailer-skels.c				\
 	Mailer-stubs.c
-EVOLUTION_MAIL_CORBA_GENERATED = $(EVOLUTION_MAIL_CORBA_GENERATED_C) $(EVOLUTION_MAIL_CORBA_GENERATED_H)
+MAILER_IDL_GENERATED = $(MAILER_IDL_GENERATED_C) $(MAILER_IDL_GENERATED_H)
+
+$(MAILER_IDL_GENERATED_H): Mailer.idl 
+	$(ORBIT_IDL) -I $(srcdir) -I $(datadir)/idl $(IDL_INCLUDES) $(srcdir)/Mailer.idl
+$(MAILER_IDL_GENERATED_C): $(MAILER_IDL_GENERATED_H)
+
+
+# Code generation for Spell.idl
 
 SPELL_IDL = Spell.idl
 
-IDL_GENERATED_H = 		\
+SPELL_IDL_GENERATED_H = 		\
 	Spell.h
-IDL_GENERATED_C = 		\
+SPELL_IDL_GENERATED_C = 		\
 	Spell-common.c		\
 	Spell-skels.c		\
 	Spell-stubs.c
-IDL_GENERATED = $(IDL_GENERATED_C) $(IDL_GENERATED_H)
+SPELL_IDL_GENERATED = $(SPELL_IDL_GENERATED_C) $(SPELL_IDL_GENERATED_H)
 
-$(IDL_GENERATED_H): $(SPELL_IDL)
+$(SPELL_IDL_GENERATED_H): $(SPELL_IDL)
 	$(ORBIT_IDL) -I $(srcdir) -I $(datadir)/idl $(IDL_INCLUDES) $(srcdir)/Spell.idl
-$(IDL_GENERATED_C): $(IDL_GENERATED_H)
+$(SPELL_IDL_GENERATED_C): $(SPELL_IDL_GENERATED_H)
 
 Spell-impl.o: Spell.h
 
-libevolution_mail_la_SOURCES =		\
-	$(EVOLUTION_MAIL_CORBA_GENERATED)	\
-	$(IDL_GENERATED)		\
-	component-factory.c		\
-	component-factory.h		\
-	e-searching-tokenizer.c		\
-	e-searching-tokenizer.h		\
-	em-inline-filter.c		\
-	em-inline-filter.h		\
-	em-folder-view.c		\
-	em-folder-view.h		\
-	em-folder-browser.c		\
-	em-folder-browser.h		\
-	em-format.c			\
-	em-format.h			\
-	em-format-html.c		\
-	em-format-html.h		\
-	em-format-html-display.c	\
-	em-format-html-display.h	\
-	em-format-html-print.c		\
-	em-format-html-print.h		\
-	em-format-html-quote.c		\
-	em-format-html-quote.h		\
-	em-format-quote.c		\
-	em-format-quote.h		\
-	em-marshal.c			\
-	em-marshal.h			\
-	em-message-browser.c		\
-	em-message-browser.h		\
-	em-composer-utils.c		\
-	em-composer-utils.h		\
-	em-popup.c			\
-	em-popup.h			\
-	em-utils.c			\
-	em-utils.h			\
-	em-subscribe-editor.c		\
-	em-subscribe-editor.h		\
-	em-sync-stream.c		\
-	em-sync-stream.h		\
-	em-icon-stream.c		\
-	em-icon-stream.h		\
-	em-html-stream.c		\
-	em-html-stream.h		\
-	folder-browser-factory.c	\
-	folder-browser-factory.h	\
-	folder-info.c			\
-	folder-info.h			\
-	mail-account-editor.c		\
-	mail-account-editor.h		\
-	mail-account-gui.c		\
-	mail-account-gui.h		\
-	mail-accounts.c			\
-	mail-accounts.h			\
-	mail-autofilter.c		\
-	mail-autofilter.h		\
-	mail-composer-prefs.c		\
-	mail-composer-prefs.h		\
-	mail-config.c			\
-	mail-config.h			\
-	mail-config-druid.c		\
-	mail-config-druid.h		\
-	mail-crypto.c			\
-	mail-crypto.h			\
-	mail-config-factory.c		\
-	mail-config-factory.h		\
-	mail-preferences.c		\
-	mail-preferences.h		\
-	mail-folder-cache.c		\
-	mail-folder-cache.h		\
-	mail-importer.c			\
-	mail-importer.h			\
-	mail-local.c			\
-	mail-local.h			\
-	mail-mt.c			\
-	mail-mt.h			\
-	mail-offline-handler.c		\
-	mail-offline-handler.h		\
-	mail-ops.c			\
-	mail-ops.h			\
-	mail-send-recv.c		\
-	mail-send-recv.h		\
-	mail-session.c			\
-	mail-session.h			\
-	mail-signature-editor.c		\
-	mail-signature-editor.h		\
-	mail-tools.c			\
-	mail-tools.h			\
-	mail-types.h			\
-	mail-vfolder.c			\
-	mail-vfolder.h			\
-	message-list.c			\
-	message-list.h			\
-	message-tag-editor.c		\
-	message-tag-editor.h		\
-	message-tag-followup.c		\
-	message-tag-followup.h		\
+
+# libevolution-mail
+
+libevolution_mail_la_SOURCES =			\
+	$(SPELL_IDL_GENERATED)			\
+	$(MAILER_IDL_GENERATED)			\
+	e-searching-tokenizer.c			\
+	e-searching-tokenizer.h			\
+	em-inline-filter.c			\
+	em-inline-filter.h			\
+	em-folder-selection.c			\
+	em-folder-selection.h			\
+	em-folder-selection-button.c		\
+	em-folder-selection-button.h		\
+	em-folder-selector.c			\
+	em-folder-selector.h			\
+	em-folder-view.c			\
+	em-folder-view.h			\
+	em-folder-browser.c			\
+	em-folder-browser.h			\
+	em-format.c				\
+	em-format.h				\
+	em-format-html.c			\
+	em-format-html.h			\
+	em-format-html-display.c		\
+	em-format-html-display.h		\
+	em-format-html-print.c			\
+	em-format-html-print.h			\
+	em-format-html-quote.c			\
+	em-format-html-quote.h			\
+	em-format-quote.c			\
+	em-format-quote.h			\
+	em-marshal.c				\
+	em-marshal.h				\
+	em-message-browser.c			\
+	em-message-browser.h			\
+	em-composer-utils.c			\
+	em-composer-utils.h			\
+	em-popup.c				\
+	em-popup.h				\
+	em-utils.c				\
+	em-utils.h				\
+	em-subscribe-editor.c			\
+	em-subscribe-editor.h			\
+	em-sync-stream.c			\
+	em-sync-stream.h			\
+	em-icon-stream.c			\
+	em-icon-stream.h			\
+	em-html-stream.c			\
+	em-html-stream.h			\
+	folder-browser-factory.c		\
+	folder-browser-factory.h		\
+	folder-info.c				\
+	folder-info.h				\
+	mail-account-editor.c			\
+	mail-account-editor.h			\
+	mail-account-gui.c			\
+	mail-account-gui.h			\
+	mail-accounts.c				\
+	mail-accounts.h				\
+	mail-autofilter.c			\
+	mail-autofilter.h			\
+	mail-component-factory.c		\
+	mail-component.c			\
+	mail-component.h			\
+	mail-composer-prefs.c			\
+	mail-composer-prefs.h			\
+	mail-config.c				\
+	mail-config.h				\
+	mail-config-druid.c			\
+	mail-config-druid.h			\
+	mail-crypto.c				\
+	mail-crypto.h				\
+	mail-config-factory.c			\
+	mail-config-factory.h			\
+	mail-preferences.c			\
+	mail-preferences.h			\
+	mail-folder-cache.c			\
+	mail-folder-cache.h			\
+	mail-importer.c				\
+	mail-importer.h				\
+	mail-mt.c				\
+	mail-mt.h				\
+	mail-offline-handler.c			\
+	mail-offline-handler.h			\
+	mail-ops.c				\
+	mail-ops.h				\
+	mail-send-recv.c			\
+	mail-send-recv.h			\
+	mail-session.c				\
+	mail-session.h				\
+	mail-signature-editor.c			\
+	mail-signature-editor.h			\
+	mail-tools.c				\
+	mail-tools.h				\
+	mail-types.h				\
+	mail-vfolder.c				\
+	mail-vfolder.h				\
+	message-list.c				\
+	message-list.h				\
+	message-tag-editor.c			\
+	message-tag-editor.h			\
+	message-tag-followup.c			\
+	message-tag-followup.h			\
 	mail.h
 
+# EPFIXME: Functionality to be brought back to life.
+#
+#	mail-local.c
+#	mail-local.h
+
 libevolution_mail_la_LIBADD =					\
 	$(top_builddir)/shell/importer/libevolution-importer.la	\
 	$(top_builddir)/camel/libcamel.la			\
@@ -177,6 +202,9 @@ libevolution_mail_la_LIBADD =					\
 libevolution_mail_la_LDFLAGS =				\
 	-avoid-version -module
 
+
+# .server files
+
 evolution_mbox_upgrade_SOURCES = evolution-mbox-upgrade.c
 evolution_mbox_upgrade_LDADD = 				\
 	$(top_builddir)/camel/libcamel.la 		\
@@ -190,21 +218,16 @@ server_DATA = $(server_in_files:.server.in.in=.server)
 	sed -e "s|\@COMPONENTDIR\@|$(componentdir)|" $< > $@
 @INTLTOOL_SERVER_RULE@
 
-MARSHAL_GENERATED = em-marshal.c em-marshal.h
-@EVO_MARSHAL_RULE@
-
-glade_DATA = mail-config.glade local-config.glade subscribe-dialog.glade message-tags.glade mail-search.glade
 
-etspec_DATA = message-list.etspec
+# Misc data to install
 
-schemadir   = $(GCONF_SCHEMA_FILE_DIR)
-schema_DATA = evolution-mail.schemas
+glade_DATA = mail-config.glade local-config.glade subscribe-dialog.glade message-tags.glade mail-search.glade
+MARSHAL_GENERATED = em-marshal.c em-marshal.h
+@EVO_MARSHAL_RULE@
 
-idl_DATA = Mailer.idl
+etspec_DATA = mail-accounts.etspec message-list.etspec subscribe-dialog.etspec
 
-$(EVOLUTION_MAIL_CORBA_GENERATED_H): Mailer.idl 
-	$(ORBIT_IDL) -I $(srcdir) -I $(datadir)/idl $(IDL_INCLUDES) $(srcdir)/Mailer.idl
-$(EVOLUTION_MAIL_CORBA_GENERATED_C): $(EVOLUTION_MAIL_CORBA_GENERATED_H)
+idl_DATA = $(MAILER_IDL)
 
 EXTRA_DIST = 				\
 	ChangeLog.pre-1-4		\
@@ -217,6 +240,9 @@ EXTRA_DIST = 				\
 	$(server_DATA)			\
 	$(etspec_DATA)
 
+
+# Purify support
+
 if ENABLE_PURIFY
 PLINK = $(LIBTOOL) --mode=link $(PURIFY) $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
 
@@ -228,6 +254,12 @@ evolution-mail.pure: evolution-mail
 
 endif
 
+
+# GConf
+
+schemadir   = $(GCONF_SCHEMA_FILE_DIR)
+schema_DATA = evolution-mail.schemas
+
 install-data-local:
 	if test -z "$(DESTDIR)" ; then \
 		for p in $(schema_DATA) ; do \
@@ -235,8 +267,11 @@ install-data-local:
 		done \
 	fi
 
+
+# Prologue
+
 dist-hook:
 	cd $(distdir); rm -f $(BUILT_SOURCES)
 
-BUILT_SOURCES = $(EVOLUTION_MAIL_CORBA_GENERATED) $(IDL_GENERATED) $(MARSHAL_GENERATED) $(server_DATA)
+BUILT_SOURCES = $(MAILER_IDL_GENERATED) $(SPELL_IDL_GENERATED) $(MARSHAL_GENERATED) $(server_DATA)
 CLEANFILES = $(BUILT_SOURCES)
diff --git a/mail/component-factory.c b/mail/component-factory.c
index a1d0c322eb..9f361ec5fc 100644
--- a/mail/component-factory.c
+++ b/mail/component-factory.c
@@ -20,6 +20,8 @@
  * Boston, MA 02111-1307, USA.
  */
 
+/* EPFIXME: This file should go away.  */
+
 
 #ifdef HAVE_CONFIG_H
 #include <config.h>
@@ -54,6 +56,7 @@
 #include "mail-config.h"
 #include "mail-config-factory.h"
 #include "mail-preferences.h"
+#include "mail-component.h"
 #include "mail-composer-prefs.h"
 #include "mail-tools.h"
 #include "mail-ops.h"
@@ -79,7 +82,6 @@ char *default_sent_folder_uri;
 CamelFolder *sent_folder = NULL;
 char *default_outbox_folder_uri;
 CamelFolder *outbox_folder = NULL;
-char *evolution_dir;
 
 EvolutionShellClient *global_shell_client = NULL;
 
@@ -136,6 +138,14 @@ type_is_vtrash (const char *type)
 	return !strcmp (type, "vtrash");
 }
 
+
+/* Forward decls just to get it to compile without warnings.  EPFIXME: This is
+   all junk at this point in the refactoring anyways, so it will all die.  */
+static void mail_load_storage_by_uri (GNOME_Evolution_Shell shell, const char *uri, const char *name);
+static void mail_load_storages (GNOME_Evolution_Shell shell, EAccountList *accounts);
+static void mail_hash_storage (CamelService *store, EvolutionStorage *storage);
+
+
 /* EvolutionShellComponent methods and signals.  */
 
 static BonoboControl *
@@ -766,6 +776,7 @@ owner_set_cb (EvolutionShellComponent *shell_component,
 	      const char *evolution_homedir,
 	      gpointer user_data)
 {
+#if 0
 	GNOME_Evolution_Shell corba_shell;
 	EAccountList *accounts;
 	int i;
@@ -774,7 +785,6 @@ owner_set_cb (EvolutionShellComponent *shell_component,
 	global_shell_client = shell_client;
 	g_object_weak_ref ((GObject *) shell_client, (GWeakNotify) shell_client_destroy, NULL);
 	
-	evolution_dir = g_strdup (evolution_homedir);
 	mail_session_init ();
 	
 	async_event = mail_async_event_new();
@@ -831,6 +841,7 @@ owner_set_cb (EvolutionShellComponent *shell_component,
 	
 	/* Everything should be ready now */
 	evolution_folder_info_notify_ready ();
+#endif
 }
 
 static void
@@ -1037,7 +1048,7 @@ request_quit (EvolutionShellComponent *shell_component,
 }
 
 static BonoboObject *
-create_component (void)
+create_shell_component (void)
 {
 	EvolutionShellComponentDndDestinationFolder *destination_interface;
 	MailOfflineHandler *offline_handler;
@@ -1336,12 +1347,14 @@ storage_xfer_folder (EvolutionStorage *storage,
 	camel_exception_clear (&ex);
 }
 
+#if 0				/* EPFIXME */
 static void
 storage_connected (CamelStore *store, CamelFolderInfo *info, void *listener)
 {
 	notify_listener (listener, (info ? GNOME_Evolution_Storage_OK :
 				    GNOME_Evolution_Storage_GENERIC_ERROR));
 }
+#endif
 
 static void
 storage_connect (EvolutionStorage *storage,
@@ -1349,8 +1362,10 @@ storage_connect (EvolutionStorage *storage,
 		 const char *path,
 		 CamelStore *store)
 {
+#if 0				/* EPFIXME */
 	mail_note_store (CAMEL_STORE (store), NULL, storage, CORBA_OBJECT_NIL,
 			 storage_connected, listener);
+#endif
 }
 
 static void
@@ -1373,7 +1388,7 @@ add_storage (const char *name, const char *uri, CamelService *store,
 		evolution_storage_has_subfolders (storage, "/", _("Connecting..."));
 		mail_hash_storage (store, storage);
 		/*if (auto_connect)*/
-		mail_note_store ((CamelStore *) store, NULL, storage, CORBA_OBJECT_NIL, NULL, NULL);
+		/* EPFIXME mail_note_store ((CamelStore *) store, NULL, storage, CORBA_OBJECT_NIL, NULL, NULL); */
 		/* falllll */
 	case EVOLUTION_STORAGE_ERROR_ALREADYREGISTERED:
 	case EVOLUTION_STORAGE_ERROR_EXISTS:
@@ -1386,34 +1401,7 @@ add_storage (const char *name, const char *uri, CamelService *store,
 	}
 }
 
-void
-mail_add_storage (CamelStore *store, const char *name, const char *uri)
-{
-	EvolutionShellClient *shell_client;
-	GNOME_Evolution_Shell shell;
-	CamelException ex;
-	
-	g_return_if_fail (CAMEL_IS_STORE (store));
-	
-	shell_client = evolution_shell_component_get_owner (shell_component);
-	shell = evolution_shell_client_corba_objref (shell_client);
-	
-	camel_exception_init (&ex);
-	
-	if (name == NULL) {
-		char *service_name;
-		
-		service_name = camel_service_get_name ((CamelService *) store, TRUE);
-		add_storage (service_name, uri, (CamelService *) store, shell, &ex);
-		g_free (service_name);
-	} else {
-		add_storage (name, uri, (CamelService *) store, shell, &ex);
-	}
-	
-	camel_exception_clear (&ex);
-}
-
-void
+static void
 mail_load_storage_by_uri (GNOME_Evolution_Shell shell, const char *uri, const char *name)
 {
 	CamelException ex;
@@ -1468,7 +1456,7 @@ mail_load_storage_by_uri (GNOME_Evolution_Shell shell, const char *uri, const ch
 	camel_object_unref (CAMEL_OBJECT (store));
 }
 
-void
+static void
 mail_load_storages (GNOME_Evolution_Shell shell, EAccountList *accounts)
 {
 	CamelException ex;
@@ -1500,103 +1488,23 @@ mail_load_storages (GNOME_Evolution_Shell shell, EAccountList *accounts)
 	g_object_unref (iter);
 }
 
-void
+static void
 mail_hash_storage (CamelService *store, EvolutionStorage *storage)
 {
 	camel_object_ref (CAMEL_OBJECT (store));
 	g_hash_table_insert (storages_hash, store, storage);
 }
 
-EvolutionStorage *
-mail_lookup_storage (CamelStore *store)
-{
-	EvolutionStorage *storage;
-	
-	/* Because the storages_hash holds a reference to each store
-	 * used as a key in it, none of them will ever be gc'ed, meaning
-	 * any call to camel_session_get_{service,store} with the same
-	 * URL will always return the same object. So this works.
-	 */
-	
-	storage = g_hash_table_lookup (storages_hash, store);
-	if (storage)
-		bonobo_object_ref (BONOBO_OBJECT (storage));
-	
-	return storage;
-}
-
+#if 0
 static void
 store_disconnect(CamelStore *store, void *event_data, void *data)
 {
 	camel_service_disconnect (CAMEL_SERVICE (store), TRUE, NULL);
 	camel_object_unref (CAMEL_OBJECT (store));
 }
+#endif
 
-void
-mail_remove_storage (CamelStore *store)
-{
-	EvolutionStorage *storage;
-	EvolutionShellClient *shell_client;
-	GNOME_Evolution_Shell corba_shell;
-	
-	/* Because the storages_hash holds a reference to each store
-	 * used as a key in it, none of them will ever be gc'ed, meaning
-	 * any call to camel_session_get_{service,store} with the same
-	 * URL will always return the same object. So this works.
-	 */
-	
-	storage = g_hash_table_lookup (storages_hash, store);
-	if (!storage)
-		return;
-	
-	g_hash_table_remove (storages_hash, store);
-	
-	/* so i guess potentially we could have a race, add a store while one
-	   being removed.  ?? */
-	mail_note_store_remove(store);
-	
-	shell_client = evolution_shell_component_get_owner (shell_component);
-	corba_shell = evolution_shell_client_corba_objref(shell_client);
-	
-	evolution_storage_deregister_on_shell (storage, corba_shell);
-	
-	mail_async_event_emit(async_event, MAIL_ASYNC_THREAD, (MailAsyncFunc)store_disconnect, store, NULL, NULL);
-}
-
-void
-mail_remove_storage_by_uri (const char *uri)
-{
-	CamelProvider *prov;
-	CamelService *store;
-
-	prov = camel_session_get_provider (session, uri, NULL);
-	if (!prov)
-		return;
-	if (!(prov->flags & CAMEL_PROVIDER_IS_STORAGE) ||
-	    (prov->flags & CAMEL_PROVIDER_IS_EXTERNAL))
-		return;
-
-	store = camel_session_get_service (session, uri, CAMEL_PROVIDER_STORE, NULL);
-	if (store != NULL) {
-		mail_remove_storage (CAMEL_STORE (store));
-		camel_object_unref (CAMEL_OBJECT (store));
-	}
-}
-
-int
-mail_storages_count (void)
-{
-	return g_hash_table_size (storages_hash);
-}
-
-void
-mail_storages_foreach (GHFunc func, gpointer data)
-{
-	g_hash_table_foreach (storages_hash, func, data);
-}
-
-
-#define FACTORY_ID "OAFIID:GNOME_Evolution_Mail_ControlFactory"
+#define FACTORY_ID "OAFIID:GNOME_Evolution_Mail_Factory_2"
 
 #define MAIL_CONFIG_IID "OAFIID:GNOME_Evolution_MailConfig"
 #define WIZARD_IID "OAFIID:GNOME_Evolution_Mail_Wizard"
@@ -1608,9 +1516,14 @@ factory (BonoboGenericFactory *factory,
 	 const char *component_id,
 	 void *closure)
 {
-	if (strcmp (component_id, COMPONENT_ID) == 0)
-		return create_component();
-	else if (strcmp(component_id, MAIL_CONFIG_IID) == 0)
+	if (strcmp (component_id, SHELL_COMPONENT_ID) == 0)
+		return create_shell_component();
+	else if (strcmp (component_id, COMPONENT_ID) == 0) {
+		MailComponent *component = mail_component_peek ();
+
+		bonobo_object_ref (BONOBO_OBJECT (component));
+		return BONOBO_OBJECT (component);
+	} else if (strcmp(component_id, MAIL_CONFIG_IID) == 0)
 		return (BonoboObject *)g_object_new (evolution_mail_config_get_type (), NULL);
 	else if (strcmp(component_id, FOLDER_INFO_IID) == 0)
 		return evolution_folder_info_new();
diff --git a/mail/component-factory.h b/mail/component-factory.h
index 3abd058556..fdc7c4056f 100644
--- a/mail/component-factory.h
+++ b/mail/component-factory.h
@@ -23,7 +23,8 @@
 #ifndef COMPONENT_FACTORY_H
 #define COMPONENT_FACTORY_H
 
-#define COMPONENT_ID 		"OAFIID:GNOME_Evolution_Mail_ShellComponent"
+#define COMPONENT_ID 		"OAFIID:GNOME_Evolution_Mail_Component2"
+#define SHELL_COMPONENT_ID	"OAFIID:GNOME_Evolution_Mail_ShellComponent"
 #define SUMMARY_FACTORY_ID	"OAFIID:GNOME_Evolution_Mail_ExecutiveSummaryComponentFactory"
 
 #endif
diff --git a/mail/em-composer-utils.c b/mail/em-composer-utils.c
index e181c2cb33..75166a19b4 100644
--- a/mail/em-composer-utils.c
+++ b/mail/em-composer-utils.c
@@ -101,7 +101,7 @@ composer_destroy_cb (gpointer user_data, GObject *deadbeef)
 }
 
 static gboolean
-ask_confirm_for_unwanted_html_mail (EMsgComposer *composer, EDestination **recipients)
+ask_confirm_for_unwanted_html_mail (EMsgComposer *composer, EABDestination **recipients)
 {
 	gboolean show_again, res;
 	GConfClient *gconf;
@@ -117,10 +117,10 @@ ask_confirm_for_unwanted_html_mail (EMsgComposer *composer, EDestination **recip
 	str = g_string_new (_("You are sending an HTML-formatted message. Please make sure that\n"
 			      "the following recipients are willing and able to receive HTML mail:\n"));
 	for (i = 0; recipients[i] != NULL; ++i) {
-		if (!e_destination_get_html_mail_pref (recipients[i])) {
+		if (!eab_destination_get_html_mail_pref (recipients[i])) {
 			const char *name;
 			
-			name = e_destination_get_textrep (recipients[i], FALSE);
+			name = eab_destination_get_textrep (recipients[i], FALSE);
 			
 			g_string_append_printf (str, "     %s\n", name);
 		}
@@ -262,7 +262,7 @@ static CamelMimeMessage *
 composer_get_message (EMsgComposer *composer, gboolean post, gboolean save_html_object_data)
 {
 	CamelMimeMessage *message = NULL;
-	EDestination **recipients, **recipients_bcc;
+	EABDestination **recipients, **recipients_bcc;
 	gboolean send_html, confirm_html;
 	CamelInternetAddress *cia;
 	int hidden = 0, shown = 0;
@@ -286,15 +286,15 @@ composer_get_message (EMsgComposer *composer, gboolean post, gboolean save_html_
 	/* see which ones are visible/present, etc */
 	if (recipients) {
 		for (i = 0; recipients[i] != NULL; i++) {
-			const char *addr = e_destination_get_address (recipients[i]);
+			const char *addr = eab_destination_get_address (recipients[i]);
 			
 			if (addr && addr[0]) {
 				camel_address_decode ((CamelAddress *) cia, addr);
 				if (camel_address_length ((CamelAddress *) cia) > 0) {
 					camel_address_remove ((CamelAddress *) cia, -1);
 					num++;
-					if (e_destination_is_evolution_list (recipients[i])
-					    && !e_destination_list_show_addresses (recipients[i])) {
+					if (eab_destination_is_evolution_list (recipients[i])
+					    && !eab_destination_list_show_addresses (recipients[i])) {
 						hidden++;
 					} else {
 						shown++;
@@ -307,7 +307,7 @@ composer_get_message (EMsgComposer *composer, gboolean post, gboolean save_html_
 	recipients_bcc = e_msg_composer_get_bcc (composer);
 	if (recipients_bcc) {
 		for (i = 0; recipients_bcc[i] != NULL; i++) {
-			const char *addr = e_destination_get_address (recipients_bcc[i]);
+			const char *addr = eab_destination_get_address (recipients_bcc[i]);
 			
 			if (addr && addr[0]) {
 				camel_address_decode ((CamelAddress *) cia, addr);
@@ -318,7 +318,7 @@ composer_get_message (EMsgComposer *composer, gboolean post, gboolean save_html_
 			}
 		}
 		
-		e_destination_freev (recipients_bcc);
+		eab_destination_freev (recipients_bcc);
 	}
 	
 	camel_object_unref (cia);
@@ -347,7 +347,7 @@ composer_get_message (EMsgComposer *composer, gboolean post, gboolean save_html_
 		
 		if (recipients) {
 			for (i = 0; recipients[i] != NULL && !html_problem; i++) {
-				if (!e_destination_get_html_mail_pref (recipients[i]))
+				if (!eab_destination_get_html_mail_pref (recipients[i]))
 					html_problem = TRUE;
 			}
 		}
@@ -384,12 +384,12 @@ composer_get_message (EMsgComposer *composer, gboolean post, gboolean save_html_
 	
 	/* Get the message recipients and 'touch' them, boosting their use scores */
 	if (recipients)
-		e_destination_touchv (recipients);
+		eab_destination_touchv (recipients);
 	
  finished:
 	
 	if (recipients)
-		e_destination_freev (recipients);
+		eab_destination_freev (recipients);
 	
 	return message;
 }
diff --git a/mail/em-folder-browser.c b/mail/em-folder-browser.c
index 243ea449eb..03ab55800f 100644
--- a/mail/em-folder-browser.c
+++ b/mail/em-folder-browser.c
@@ -156,9 +156,8 @@ static void
 emfb_init(GObject *o)
 {
 	EMFolderBrowser *emfb = (EMFolderBrowser *)o;
+	RuleContext *search_context = mail_component_peek_search_context (mail_component_peek ());
 	struct _EMFolderBrowserPrivate *p;
-	/* FIXME ... */
-	extern RuleContext *search_context;
 
 	p = emfb->priv = g_malloc0(sizeof(struct _EMFolderBrowserPrivate));
 
diff --git a/mail/em-folder-selection-button.c b/mail/em-folder-selection-button.c
new file mode 100644
index 0000000000..ac5a6e1d06
--- /dev/null
+++ b/mail/em-folder-selection-button.c
@@ -0,0 +1,242 @@
+/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
+/* em-folder-selection-button.c
+ *
+ * Copyright (C) 2003  Ximian, Inc.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of version 2 of the GNU General Public
+ * License as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public
+ * License along with this program; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ *
+ * Author: Ettore Perazzoli <ettore@ximian.com>
+ */
+
+#include <config.h>
+
+#include <string.h>
+
+#include "em-folder-selection-button.h"
+
+#include "mail-component.h"
+#include "em-folder-selector.h"
+
+#include <gal/util/e-util.h>
+
+#include <gtk/gtkimage.h>
+#include <gtk/gtklabel.h>
+#include <gtk/gtkhbox.h>
+
+
+#define PARENT_TYPE gtk_button_get_type ()
+static GtkButtonClass *parent_class = NULL;
+
+
+struct _EMFolderSelectionButtonPrivate {
+	GtkWidget *icon;
+	GtkWidget *label;
+
+	char *uri;
+
+	char *title;
+	char *caption;
+};
+
+enum {
+	SELECTED,
+	LAST_SIGNAL
+};
+static guint signals[LAST_SIGNAL] = { 0 };
+
+
+/* Utility functions.  */
+
+static void
+set_contents_unselected (EMFolderSelectionButton *button)
+{	
+	gtk_image_set_from_pixbuf (GTK_IMAGE (button->priv->icon), NULL);
+	gtk_label_set_text (GTK_LABEL (button->priv->label), _("<click here to select a folder>"));
+}
+
+static void
+set_contents (EMFolderSelectionButton *button)
+{
+	EMFolderSelectionButtonPrivate *priv = button->priv;
+	char *path, *tmp, *label;
+
+	if (priv->uri == NULL)
+		goto unset;
+
+	/* We set the button name directly from the storage set path, which is /accountname/path/foldername */
+	path = e_storage_set_get_path_for_physical_uri(mail_component_peek_storage_set(mail_component_peek()), priv->uri);
+
+	if (path == NULL)
+		goto unknown;
+
+	tmp = strchr(path+1, '/');
+	if (tmp == NULL)
+		goto unknown;
+	*tmp++ = 0;
+
+	label = g_strdup_printf(_("\"%s\" in \"%s\""), tmp, path+1);
+	gtk_label_set_text (GTK_LABEL (priv->label), label);
+	g_free (label);
+
+	g_free(path);
+	return;
+
+unknown:
+	g_free(path);
+unset:
+	set_contents_unselected(button);
+}
+
+static void
+impl_finalize (GObject *object)
+{
+	EMFolderSelectionButtonPrivate *priv = EM_FOLDER_SELECTION_BUTTON (object)->priv;
+
+	g_free (priv->title);
+	g_free (priv->caption);
+	g_free(priv->uri);
+	g_free (priv);
+
+	(* G_OBJECT_CLASS (parent_class)->finalize) (object);
+}
+
+static void
+emfsb_selector_response(EMFolderSelector *emfs, int response, EMFolderSelectionButton *button)
+{
+	if (response == GTK_RESPONSE_OK) {
+		const char *uri = em_folder_selector_get_selected_uri(emfs);
+
+		em_folder_selection_button_set_selection(button, uri);
+		g_signal_emit(button, signals[SELECTED], 0);
+	}
+
+	gtk_widget_destroy((GtkWidget *)emfs);
+}
+
+static void
+impl_clicked (GtkButton *button)
+{
+	EMFolderSelectionButtonPrivate *priv = EM_FOLDER_SELECTION_BUTTON (button)->priv;
+	EStorageSet *ess;
+	GtkWidget *w;
+	GtkWidget *toplevel;
+
+	if (GTK_BUTTON_CLASS (parent_class)->clicked != NULL)
+		(* GTK_BUTTON_CLASS (parent_class)->clicked) (button);
+
+	toplevel = gtk_widget_get_toplevel (GTK_WIDGET (button));
+	ess = mail_component_peek_storage_set(mail_component_peek());
+	w = em_folder_selector_new(ess, EM_FOLDER_SELECTOR_CAN_CREATE, priv->title, priv->caption);
+	em_folder_selector_set_selected_uri((EMFolderSelector *)w, priv->uri);
+	g_signal_connect(w, "response", G_CALLBACK(emfsb_selector_response), button);
+	gtk_widget_show(w);
+}
+#if 0
+{
+	uri = em_folder_selection_run_dialog_uri((GtkWindow *)toplevel,
+						 priv->title,
+						 priv->caption,
+						 priv->uri);
+
+	em_folder_selection_button_set_selection (EM_FOLDER_SELECTION_BUTTON (button), uri);
+	g_free(uri);
+
+	g_signal_emit (button, signals[SELECTED], 0);
+}
+#endif
+
+static void
+class_init (EMFolderSelectionButtonClass *class)
+{
+	GObjectClass *object_class = G_OBJECT_CLASS (class);
+	GtkButtonClass *button_class = GTK_BUTTON_CLASS (class);
+
+	object_class->finalize = impl_finalize;
+
+	button_class->clicked = impl_clicked;
+
+	parent_class = g_type_class_peek_parent (class);
+
+	signals[SELECTED] = g_signal_new ("selected",
+					  G_OBJECT_CLASS_TYPE (object_class),
+					  G_SIGNAL_RUN_FIRST,
+					  G_STRUCT_OFFSET (EMFolderSelectionButtonClass, selected),
+					  NULL, NULL,
+					  g_cclosure_marshal_VOID__VOID,
+					  G_TYPE_NONE, 0);
+}
+
+static void
+init (EMFolderSelectionButton *folder_selection_button)
+{
+	EMFolderSelectionButtonPrivate *priv;
+	GtkWidget *box;
+
+	priv = g_new0 (EMFolderSelectionButtonPrivate, 1);
+	folder_selection_button->priv = priv;
+
+	box = gtk_hbox_new (FALSE, 4);
+
+	priv->icon = gtk_image_new ();
+	gtk_box_pack_start (GTK_BOX (box), priv->icon, FALSE, TRUE, 0);
+
+	priv->label = gtk_label_new ("");
+	gtk_label_set_justify (GTK_LABEL (priv->label), GTK_JUSTIFY_LEFT);
+	gtk_misc_set_alignment (GTK_MISC (priv->label), 0.0, 0.0);
+	gtk_box_pack_start (GTK_BOX (box), priv->label, TRUE, TRUE, 0);
+
+	gtk_widget_show_all (box);
+	gtk_container_add (GTK_CONTAINER (folder_selection_button), box);
+
+	set_contents (folder_selection_button);
+}
+
+GtkWidget *
+em_folder_selection_button_new(const char *title, const char *caption)
+{
+	EMFolderSelectionButton *button = g_object_new (EM_TYPE_FOLDER_SELECTION_BUTTON, NULL);
+
+	button->priv->title = g_strdup (title);
+	button->priv->caption = g_strdup (caption);
+
+	return GTK_WIDGET (button);
+}
+
+
+void
+em_folder_selection_button_set_selection(EMFolderSelectionButton *button, const char *uri)
+{
+	EMFolderSelectionButtonPrivate *p = button->priv;
+
+	g_return_if_fail(EM_IS_FOLDER_SELECTION_BUTTON(button));
+
+	if (p->uri != uri) {
+		g_free(p->uri);
+		p->uri = g_strdup(uri);
+	}
+
+	set_contents(button);
+}
+
+
+const char *
+em_folder_selection_button_get_selection(EMFolderSelectionButton *button)
+{
+	g_return_val_if_fail (EM_IS_FOLDER_SELECTION_BUTTON (button), NULL);
+
+	return button->priv->uri;
+}
+
+E_MAKE_TYPE (em_folder_selection_button, "EMFolderSelectionButton", EMFolderSelectionButton, class_init, init, PARENT_TYPE)
diff --git a/mail/em-folder-selection-button.h b/mail/em-folder-selection-button.h
new file mode 100644
index 0000000000..1ab4eb461c
--- /dev/null
+++ b/mail/em-folder-selection-button.h
@@ -0,0 +1,59 @@
+/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
+/* em-folder-selection-button.h
+ *
+ * Copyright (C) 2003  Ximian, Inc.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of version 2 of the GNU General Public
+ * License as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public
+ * License along with this program; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ *
+ * Author: Ettore Perazzoli <ettore@ximian.com>
+ */
+
+#ifndef _EM_FOLDER_SELECTION_BUTTON_H_
+#define _EM_FOLDER_SELECTION_BUTTON_H_
+
+#include <gtk/gtkbutton.h>
+
+#define EM_TYPE_FOLDER_SELECTION_BUTTON			(em_folder_selection_button_get_type ())
+#define EM_FOLDER_SELECTION_BUTTON(obj)			(G_TYPE_CHECK_INSTANCE_CAST ((obj), EM_TYPE_FOLDER_SELECTION_BUTTON, EMFolderSelectionButton))
+#define EM_FOLDER_SELECTION_BUTTON_CLASS(klass)		(G_TYPE_CHECK_CLASS_CAST ((klass), EM_TYPE_FOLDER_SELECTION_BUTTON, EMFolderSelectionButtonClass))
+#define EM_IS_FOLDER_SELECTION_BUTTON(obj)			(G_TYPE_CHECK_INSTANCE_TYPE ((obj), EM_TYPE_FOLDER_SELECTION_BUTTON))
+#define EM_IS_FOLDER_SELECTION_BUTTON_CLASS(klass)		(G_TYPE_CHECK_CLASS_TYPE ((obj), EM_TYPE_FOLDER_SELECTION_BUTTON))
+
+typedef struct _EMFolderSelectionButton        EMFolderSelectionButton;
+typedef struct _EMFolderSelectionButtonPrivate EMFolderSelectionButtonPrivate;
+typedef struct _EMFolderSelectionButtonClass   EMFolderSelectionButtonClass;
+
+struct _EMFolderSelectionButton {
+	GtkButton parent;
+
+	EMFolderSelectionButtonPrivate *priv;
+};
+
+struct _EMFolderSelectionButtonClass {
+	GtkButtonClass parent_class;
+
+	/* Signals.  */
+
+	void  (* selected)  (EMFolderSelectionButton *button);
+};
+
+GType    em_folder_selection_button_get_type (void);
+
+GtkWidget *em_folder_selection_button_new(const char *title, const char *caption);
+
+void        em_folder_selection_button_set_selection(EMFolderSelectionButton *button, const char *uri);
+const char *em_folder_selection_button_get_selection(EMFolderSelectionButton *button);
+
+#endif /* _EM_FOLDER_SELECTION_BUTTON_H_ */
diff --git a/mail/em-folder-selection.c b/mail/em-folder-selection.c
new file mode 100644
index 0000000000..c65ad80fc7
--- /dev/null
+++ b/mail/em-folder-selection.c
@@ -0,0 +1,170 @@
+/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
+/* em-folder-selection.c - UI for selecting folders.
+ *
+ * Copyright (C) 2002 Ximian, Inc.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of version 2 of the GNU General Public
+ * License as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public
+ * License along with this program; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ *
+ * Author: Ettore Perazzoli <ettore@ximian.com>
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include "em-folder-selection.h"
+
+#include "mail-component.h"
+#include "mail-tools.h"
+
+#include "shell/e-folder-selection-dialog.h"
+
+
+CamelFolder *
+em_folder_selection_run_dialog (GtkWindow *parent_window,
+				const char *title,
+				const char *caption,
+				CamelFolder *default_folder)
+{
+	EStorageSet *storage_set = mail_component_peek_storage_set (mail_component_peek ());
+	char *default_path = NULL;
+	CamelStore *default_store;
+	GtkWidget *dialog;
+	EFolder *selected_e_folder;
+	CamelFolder *selected_camel_folder;
+	int response;
+
+	default_store = camel_folder_get_parent_store (default_folder);
+	if (default_store != NULL) {
+		EStorage *storage = mail_component_lookup_storage (mail_component_peek (), default_store);
+
+		if (storage != NULL) {
+			default_path = g_strconcat ("/",
+						    e_storage_get_name (storage),
+						    "/",
+						    camel_folder_get_full_name (default_folder),
+						    NULL);
+		}
+	}
+
+	/* EPFIXME: Allowed types?  */
+	dialog = e_folder_selection_dialog_new (storage_set, title, caption, default_path, NULL, FALSE);
+	g_free(default_path);
+	response = gtk_dialog_run (GTK_DIALOG (dialog));
+
+	if (response != GTK_RESPONSE_OK) {
+		gtk_widget_destroy (dialog);
+		return NULL;
+	}
+
+	selected_e_folder = e_storage_set_get_folder (storage_set,
+						      e_folder_selection_dialog_get_selected_path (E_FOLDER_SELECTION_DIALOG (dialog)));
+	if (selected_e_folder == NULL) {
+		gtk_widget_destroy (dialog);
+		return NULL;
+	}
+
+	selected_camel_folder = mail_tool_uri_to_folder (e_folder_get_physical_uri (selected_e_folder), 0, NULL);
+	gtk_widget_destroy (dialog);
+
+	return selected_camel_folder;
+}
+
+/* FIXME: This isn't the way to do it, but then neither is the above, really ... */
+char *
+em_folder_selection_run_dialog_uri(GtkWindow *parent_window,
+				   const char *title,
+				   const char *caption,
+				   const char *default_folder_uri)
+{
+	EStorageSet *storage_set = mail_component_peek_storage_set (mail_component_peek ());
+	char *default_path;
+	GtkWidget *dialog;
+	EFolder *selected_e_folder;
+	int response;
+
+	default_path = e_storage_set_get_path_for_physical_uri(storage_set, default_folder_uri);
+	dialog = e_folder_selection_dialog_new (storage_set, title, caption, default_path, NULL, FALSE);
+	g_free(default_path);
+	response = gtk_dialog_run (GTK_DIALOG (dialog));
+
+	if (response != GTK_RESPONSE_OK) {
+		gtk_widget_destroy (dialog);
+		return NULL;
+	}
+
+	selected_e_folder = e_storage_set_get_folder (storage_set,
+						      e_folder_selection_dialog_get_selected_path (E_FOLDER_SELECTION_DIALOG (dialog)));
+	gtk_widget_destroy (dialog);
+	if (selected_e_folder == NULL)
+		return NULL;
+
+	return g_strdup(e_folder_get_physical_uri(selected_e_folder));
+}
+
+
+struct _select_folder_data {
+	void (*done)(const char *uri, void *data);
+	void *data;
+};
+
+static void
+emfs_folder_selected(GtkWidget *w, const char *path, struct _select_folder_data *d)
+{
+	const char *uri = NULL;
+	EStorageSet *storage_set = mail_component_peek_storage_set (mail_component_peek ());
+	EFolder *folder;
+	
+	folder = e_storage_set_get_folder(storage_set, path);
+	if (folder)
+		uri = e_folder_get_physical_uri(folder);
+
+	gtk_widget_hide(w);
+
+	d->done(uri, d->data);
+
+	gtk_widget_destroy(w);
+}
+
+static void
+emfs_folder_cancelled(GtkWidget *w, struct _select_folder_data *d)
+{
+	gtk_widget_destroy(w);
+}
+
+void
+em_select_folder(GtkWindow *parent_window, const char *title, const char *text, const char *default_folder_uri, void (*done)(const char *uri, void *data), void *data)
+{
+	EStorageSet *storage_set = mail_component_peek_storage_set (mail_component_peek ());
+	char *path;
+	GtkWidget *dialog;
+	struct _select_folder_data *d;
+
+	d = g_malloc0(sizeof(*d));
+	d->data = data;
+	d->done = done;
+
+	if (default_folder_uri)
+		path = e_storage_set_get_path_for_physical_uri(storage_set, default_folder_uri);
+	else
+		path = NULL;
+	dialog = e_folder_selection_dialog_new(storage_set, title, text, path, NULL, TRUE);
+	g_free(path);
+	/* ugh, painful api ... */
+	g_signal_connect(dialog, "folder_selected", G_CALLBACK(emfs_folder_selected), d);
+	g_signal_connect(dialog, "cancelled", G_CALLBACK(emfs_folder_cancelled), d);
+	g_object_set_data_full((GObject *)dialog, "emfs_data", d, g_free);
+	gtk_widget_show(dialog);
+}
diff --git a/mail/em-folder-selection.h b/mail/em-folder-selection.h
new file mode 100644
index 0000000000..374e1eec3f
--- /dev/null
+++ b/mail/em-folder-selection.h
@@ -0,0 +1,41 @@
+/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
+/* em-folder-selection.h - UI for selecting folders.
+ *
+ * Copyright (C) 2002 Ximian, Inc.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of version 2 of the GNU General Public
+ * License as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public
+ * License along with this program; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ *
+ * Author: Ettore Perazzoli <ettore@ximian.com>
+ */
+
+#ifndef EM_FOLDER_SELECTION_H
+#define EM_FOLDER_SELECTION_H
+
+#include <camel/camel-folder.h>
+
+#include <gtk/gtkwindow.h>
+
+CamelFolder *em_folder_selection_run_dialog (GtkWindow *parent_window,
+					     const char *title,
+					     const char *caption,
+					     CamelFolder *default_folder);
+char *em_folder_selection_run_dialog_uri(GtkWindow *parent_window,
+					 const char *title,
+					 const char *caption,
+					 const char *default_folder_uri);
+
+void em_select_folder(GtkWindow *parent_window, const char *title, const char *text, const char *default_folder_uri, void (*done)(const char *uri, void *data), void *data);
+
+#endif /* EM_FOLDER_SELECTION_H */
diff --git a/mail/em-folder-selector.c b/mail/em-folder-selector.c
new file mode 100644
index 0000000000..3ccf00e497
--- /dev/null
+++ b/mail/em-folder-selector.c
@@ -0,0 +1,349 @@
+/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*-
+ *
+ * Copyright(C) 2000, 2001, 2002, 2003 Ximian, Inc.
+ *
+ * Authors: Ettore Perazzoli
+ *	    Michael Zucchi
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of version 2 of the GNU General Public
+ * License as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public
+ * License along with this program; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include "em-folder-selector.h"
+
+#include "shell/e-storage-set-view.h"
+#include "shell/e-storage-set.h"
+
+#include <libgnome/gnome-i18n.h>
+
+#include <gal/util/e-util.h>
+#include <gal/widgets/e-gui-utils.h>
+
+#include <gtk/gtkentry.h>
+#include <gtk/gtkbox.h>
+#include <gtk/gtkhbox.h>
+#include <gtk/gtklabel.h>
+#include <gtk/gtkscrolledwindow.h>
+#include <gtk/gtksignal.h>
+#include <gtk/gtkstock.h>
+
+#include <camel/camel-url.h>
+
+#include <string.h>
+
+#define PARENT_TYPE (gtk_dialog_get_type())
+static GtkDialogClass *parent_class = NULL;
+
+static gboolean
+check_folder_type_valid(EMFolderSelector *emfs)
+{
+	const char *selected;
+	EFolder *folder;
+
+	selected = e_storage_set_view_get_current_folder(emfs->essv);
+	if (selected == NULL)
+		return FALSE;
+
+	folder = e_storage_set_get_folder(emfs->ess, selected);
+	if (folder == NULL)
+		return FALSE;
+
+	return TRUE;
+}
+
+#if 0				/* EPFIXME */
+static void
+folder_creation_dialog_result_cb(EShell *shell,
+				  EShellFolderCreationDialogResult result,
+				  const char *path,
+				  void *data)
+{
+	EMFolderSelector *dialog;
+
+	dialog = EM_FOLDER_SELECTOR(data);
+
+	if (result == E_SHELL_FOLDER_CREATION_DIALOG_RESULT_SUCCESS)
+		e_storage_set_view_set_current_folder(E_STORAGE_SET_VIEW(priv->storage_set_view),
+						       path);
+}
+#endif
+
+static void
+emfs_dispose(GObject *object)
+{
+	EMFolderSelector *emfs = (EMFolderSelector *)object;
+
+	if (emfs->ess != NULL) {
+		g_object_unref(emfs->ess);
+		emfs->ess = NULL;
+		emfs->essv = NULL;
+	}
+
+	(* G_OBJECT_CLASS(parent_class)->dispose)(object);
+}
+
+static void
+emfs_finalize(GObject *object)
+{
+	/*EMFolderSelector *emfs = (EMFolderSelector *)object;*/
+
+	(* G_OBJECT_CLASS(parent_class)->finalize)(object);
+}
+
+static void
+emfs_response(GtkDialog *dialog, int response)
+{
+	EMFolderSelector *emfs = (EMFolderSelector *)dialog;
+	const char *path;
+
+	switch (response) {
+	case EM_FOLDER_SELECTOR_RESPONSE_NEW:
+		path = e_storage_set_view_get_current_folder(emfs->essv);
+
+		printf("create new folder, default parent '%s'\n", path);
+		break;
+	}
+}
+
+static void
+emfs_class_init(EMFolderSelectorClass *klass)
+{
+	GObjectClass *object_class;
+	GtkDialogClass *dialog_class;
+
+	parent_class = g_type_class_ref(PARENT_TYPE);
+	object_class = G_OBJECT_CLASS(klass);
+	dialog_class = GTK_DIALOG_CLASS(klass);
+
+	object_class->dispose  = emfs_dispose;
+	object_class->finalize = emfs_finalize;
+
+	dialog_class->response = emfs_response;
+}
+
+static void
+emfs_init(EMFolderSelector *emfs)
+{
+	emfs->flags = 0;
+}
+
+static void
+folder_selected_cb(EStorageSetView *essv, const char *path, EMFolderSelector *emfs)
+{
+	if (check_folder_type_valid(emfs))
+		gtk_dialog_set_response_sensitive(GTK_DIALOG(emfs), GTK_RESPONSE_OK, TRUE);
+	else
+		gtk_dialog_set_response_sensitive(GTK_DIALOG(emfs), GTK_RESPONSE_OK, FALSE);
+}
+
+static void
+double_click_cb(EStorageSetView *essv, int row, ETreePath path, int col, GdkEvent *event, EMFolderSelector *emfs)
+{
+	if (check_folder_type_valid(emfs)) {
+		/*g_signal_emit(emfs, signals[FOLDER_SELECTED], 0,
+		  em_folder_selector_get_selected(emfs));*/
+		printf("double clicked!\n");
+	}
+}
+
+void
+em_folder_selector_construct(EMFolderSelector *emfs, EStorageSet *ess, guint32 flags, const char *title, const char *text)
+{
+	GtkWidget *scrolled_window;
+	GtkWidget *text_label;
+
+	gtk_window_set_default_size(GTK_WINDOW(emfs), 350, 300);
+	gtk_window_set_modal(GTK_WINDOW(emfs), TRUE);
+	gtk_window_set_title(GTK_WINDOW(emfs), title);
+	gtk_container_set_border_width(GTK_CONTAINER(emfs), 6);
+
+	emfs->flags = flags;
+	if (flags & EM_FOLDER_SELECTOR_CAN_CREATE)
+		gtk_dialog_add_buttons(GTK_DIALOG(emfs), GTK_STOCK_NEW, EM_FOLDER_SELECTOR_RESPONSE_NEW, NULL);
+
+	gtk_dialog_add_buttons(GTK_DIALOG(emfs),
+			       GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+			       GTK_STOCK_OK, GTK_RESPONSE_OK,
+			       NULL);
+
+	gtk_dialog_set_response_sensitive(GTK_DIALOG(emfs), GTK_RESPONSE_OK, FALSE);
+	gtk_dialog_set_default_response(GTK_DIALOG(emfs), GTK_RESPONSE_OK);
+
+	emfs->ess = ess;
+	g_object_ref(ess);
+
+	emfs->essv = (EStorageSetView *)e_storage_set_create_new_view(ess, NULL);
+	e_storage_set_view_set_allow_dnd(emfs->essv, FALSE);
+	e_storage_set_view_enable_search(emfs->essv, TRUE);
+
+	g_signal_connect(emfs->essv, "double_click", G_CALLBACK(double_click_cb), emfs);
+	g_signal_connect(emfs->essv, "folder_selected", G_CALLBACK(folder_selected_cb), emfs);
+
+	scrolled_window = gtk_scrolled_window_new(NULL, NULL);
+	gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(scrolled_window), GTK_SHADOW_IN);
+	gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolled_window),
+					GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
+
+	gtk_container_add(GTK_CONTAINER(scrolled_window), (GtkWidget *)emfs->essv);
+        
+	gtk_box_pack_end(GTK_BOX(GTK_DIALOG(emfs)->vbox), scrolled_window, TRUE, TRUE, 6);
+	gtk_box_set_spacing(GTK_BOX(GTK_DIALOG(emfs)->vbox), 6); 
+	
+	gtk_container_set_border_width(GTK_CONTAINER(GTK_DIALOG(emfs)->vbox), 6);
+	
+	gtk_widget_show((GtkWidget *)emfs->essv);
+	gtk_widget_show(scrolled_window);
+
+	if (text != NULL) {
+		text_label = gtk_label_new(text);
+		gtk_label_set_justify(GTK_LABEL(text_label), GTK_JUSTIFY_LEFT); 
+		gtk_widget_show(text_label);
+
+		gtk_box_pack_end(GTK_BOX(GTK_DIALOG(emfs)->vbox), text_label, FALSE, TRUE, 6);
+		gtk_box_set_spacing(GTK_BOX(GTK_DIALOG(emfs)->vbox), 6);
+	}
+
+	GTK_WIDGET_SET_FLAGS((GtkWidget *)emfs->essv, GTK_CAN_FOCUS);
+	gtk_widget_grab_focus((GtkWidget *)emfs->essv);
+}
+
+GtkWidget *
+em_folder_selector_new(EStorageSet *ess, guint32 flags, const char *title, const char *text)
+{
+	EMFolderSelector *emfs;
+
+	g_return_val_if_fail(E_IS_STORAGE_SET(ess), NULL);
+
+	emfs = g_object_new(em_folder_selector_get_type(), NULL);
+	em_folder_selector_construct(emfs, ess, flags, title, text);
+
+	return GTK_WIDGET(emfs);
+}
+
+static void
+emfs_create_name_changed(GtkEntry *entry, EMFolderSelector *emfs)
+{
+	int active;
+
+	active =  e_storage_set_view_get_current_folder(emfs->essv) != NULL
+		&& emfs->name_entry->text_length > 0;
+
+	gtk_dialog_set_response_sensitive((GtkDialog *)emfs, GTK_RESPONSE_OK, active);
+}
+
+static void
+emfs_create_name_activate(GtkEntry *entry, EMFolderSelector *emfs)
+{
+	printf("entry activated, woop\n");
+}
+
+GtkWidget *
+em_folder_selector_create_new(EStorageSet *ess, guint32 flags, const char *title, const char *text)
+{
+	EMFolderSelector *emfs;
+	GtkWidget *hbox, *w;
+
+	g_return_val_if_fail(E_IS_STORAGE_SET(ess), NULL);
+
+	emfs = g_object_new(em_folder_selector_get_type(), NULL);
+	em_folder_selector_construct(emfs, ess, flags, title, text);
+
+	hbox = gtk_hbox_new(FALSE, 0);
+	w = gtk_label_new_with_mnemonic(_("Folder _name"));
+	gtk_box_pack_start((GtkBox *)hbox, w, FALSE, FALSE, 6);
+	emfs->name_entry = (GtkEntry *)gtk_entry_new();
+	g_signal_connect(emfs->name_entry, "changed", G_CALLBACK(emfs_create_name_changed), emfs);
+	g_signal_connect(emfs->name_entry, "activate", G_CALLBACK(emfs_create_name_activate), emfs);
+	gtk_box_pack_start((GtkBox *)hbox, (GtkWidget *)emfs->name_entry, TRUE, FALSE, 6);
+	gtk_widget_show_all(hbox);
+
+	gtk_box_pack_start((GtkBox *)((GtkDialog *)emfs)->vbox, hbox, FALSE, TRUE, 0);
+
+	return GTK_WIDGET(emfs);
+}
+
+void
+em_folder_selector_set_selected(EMFolderSelector *emfs, const char *path)
+{
+	e_storage_set_view_set_current_folder(emfs->essv, path);
+}
+
+void
+em_folder_selector_set_selected_uri(EMFolderSelector *emfs, const char *uri)
+{
+	const char *path;
+
+	path = e_storage_set_get_path_for_physical_uri(emfs->ess, uri);
+	if (path)
+		e_storage_set_view_set_current_folder(emfs->essv, path);
+}
+
+const char *
+em_folder_selector_get_selected(EMFolderSelector *emfs)
+{
+	const char *path;
+
+	path = e_storage_set_view_get_current_folder(emfs->essv);
+	if (emfs->name_entry) {
+		g_free(emfs->selected);
+		emfs->selected = g_strdup_printf("%s/%s", path, gtk_entry_get_text(emfs->name_entry));
+		path = emfs->selected;
+	}
+
+	return path;
+}
+
+const char *
+em_folder_selector_get_selected_uri(EMFolderSelector *emfs)
+{
+	const char *path;
+	EFolder *folder;
+
+	path = e_storage_set_view_get_current_folder(emfs->essv);
+	if (path == NULL) {
+		printf("current folder is null?\n");
+		return NULL;
+	}
+
+	folder = e_storage_set_get_folder(emfs->ess, path);
+	if (folder == NULL) {
+		printf("path ok, but can't get folder?\n");
+		return NULL;
+	}
+
+	path = e_folder_get_physical_uri(folder);
+	if (path && emfs->name_entry) {
+		CamelURL *url;
+		char *newpath;
+
+		url = camel_url_new(path, NULL);
+		newpath = g_strdup_printf("%s/%s", url->fragment?url->fragment:url->path, gtk_entry_get_text(emfs->name_entry));
+		if (url->fragment)
+			camel_url_set_fragment(url, newpath);
+		else
+			camel_url_set_path(url, newpath);
+		g_free(emfs->selected_uri);
+		emfs->selected_uri = camel_url_to_string(url, 0);
+		camel_url_free(url);
+		path = emfs->selected_uri;
+	}
+
+	return path;
+}
+
+E_MAKE_TYPE(em_folder_selector, "EMFolderSelector", EMFolderSelector, emfs_class_init, emfs_init, PARENT_TYPE)
diff --git a/mail/em-folder-selector.h b/mail/em-folder-selector.h
new file mode 100644
index 0000000000..48fc6758b5
--- /dev/null
+++ b/mail/em-folder-selector.h
@@ -0,0 +1,96 @@
+/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
+/* e-folder-selection-dialog.h
+ *
+ * Copyright (C) 2000, 2001, 2002, 2003 Ximian, Inc.
+ *
+ * Authors: Ettore Perazzoli
+ *	    Michael Zucchi
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of version 2 of the GNU General Public
+ * License as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public
+ * License along with this program; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ *
+ */
+
+#ifndef EM_FOLDER_SELECTOR_H
+#define EM_FOLDER_SELECTOR_H
+
+#include <gtk/gtkdialog.h>
+
+#ifdef cplusplus
+extern "C" {
+#pragma }
+#endif /* cplusplus */
+
+#define EM_TYPE_FOLDER_SELECTOR			(em_folder_selector_get_type ())
+#define EM_FOLDER_SELECTOR(obj)			(GTK_CHECK_CAST ((obj), E_TYPEM_FOLDER_SELECTOR, EMFolderSelector))
+#define EM_FOLDER_SELECTOR_CLASS(klass)		(GTK_CHECK_CLASS_CAST ((klass), E_TYPEM_FOLDER_SELECTOR, EMFolderSelectorClass))
+#define EM_IS_FOLDER_SELECTOR(obj)		(GTK_CHECK_TYPE ((obj), E_TYPEM_FOLDER_SELECTOR))
+#define EM_IS_FOLDER_SELECTOR_CLASS(klass)	(GTK_CHECK_CLASS_TYPE ((obj), E_TYPEM_FOLDER_SELECTOR))
+
+typedef struct _EMFolderSelector        EMFolderSelector;
+typedef struct _EMFolderSelectorPrivate EMFolderSelectorPrivate;
+typedef struct _EMFolderSelectorClass   EMFolderSelectorClass;
+
+struct _EStorageSet;
+struct _EStorageSetView;
+
+struct _EMFolderSelector {
+	GtkDialog parent;
+
+	guint32 flags;
+	struct _EStorageSet *ess;
+	struct _EStorageSetView *essv;
+
+	struct _GtkEntry *name_entry;
+	char *selected;
+	char *selected_uri;
+};
+
+struct _EMFolderSelectorClass {
+	GtkDialogClass parent_class;
+
+#if 0
+	void (* folder_selected) (EMFolderSelector *folder_selection_dialog,
+				  const char *path);
+	void (* cancelled)       (EMFolderSelector *folder_selection_dialog);
+#endif
+};
+
+enum {
+	EM_FOLDER_SELECTOR_CAN_CREATE = 1,
+};
+
+enum {
+	EM_FOLDER_SELECTOR_RESPONSE_NEW = 1,
+};
+
+GtkType    em_folder_selector_get_type (void);
+void       em_folder_selector_construct(EMFolderSelector *, struct _EStorageSet *, guint32, const char *, const char *);
+/* for selecting folders */
+GtkWidget *em_folder_selector_new      (struct _EStorageSet *, guint32, const char *, const char *);
+
+/* for creating folders */
+GtkWidget *em_folder_selector_create_new(struct _EStorageSet *ess, guint32 flags, const char *title, const char *text);
+
+void em_folder_selector_set_selected    (EMFolderSelector *emfs, const char *path);
+void em_folder_selector_set_selected_uri(EMFolderSelector *emfs, const char *uri);
+
+const char *em_folder_selector_get_selected    (EMFolderSelector *emfs);
+const char *em_folder_selector_get_selected_uri(EMFolderSelector *emfs);
+
+#ifdef cplusplus
+}
+#endif /* cplusplus */
+
+#endif /* EM_FOLDER_SELECTOR_H */
diff --git a/mail/em-folder-view.c b/mail/em-folder-view.c
index 8099191b01..fac7d155d3 100644
--- a/mail/em-folder-view.c
+++ b/mail/em-folder-view.c
@@ -542,16 +542,52 @@ emfv_popup_undelete(GtkWidget *w, EMFolderView *emfv)
 	em_folder_view_mark_selected(emfv, CAMEL_MESSAGE_DELETED, 0);
 }
 
+struct _move_data {
+	EMFolderView *emfv;
+	GPtrArray *uids;
+	int delete;
+};
+
+static void
+emfv_popup_move_cb(const char *uri, void *data)
+{
+	struct _move_data *d = data;
+
+	if (uri)
+		mail_transfer_messages(d->emfv->folder, d->uids, d->delete, uri, 0, NULL, NULL);
+	else
+		em_utils_uids_free(d->uids);
+
+	g_object_unref(d->emfv);
+	g_free(d);
+}
+
 static void
 emfv_popup_move(GtkWidget *w, EMFolderView *emfv)
 {
-	/* FIXME */
+	struct _move_data *d;
+
+	d = g_malloc(sizeof(*d));
+	d->emfv = emfv;
+	g_object_ref(emfv);
+	d->uids = message_list_get_selected(emfv->list);
+	d->delete = TRUE;
+
+	em_select_folder((GtkWidget *)emfv, _("Select folder"), NULL, NULL, emfv_popup_move_cb, d);
 }
 
 static void
 emfv_popup_copy(GtkWidget *w, EMFolderView *emfv)
 {
-	/* FIXME */
+	struct _move_data *d;
+
+	d = g_malloc(sizeof(*d));
+	d->emfv = emfv;
+	g_object_ref(emfv);
+	d->uids = message_list_get_selected(emfv->list);
+	d->delete = FALSE;
+
+	em_select_folder((GtkWidget *)emfv, _("Select folder"), NULL, NULL, emfv_popup_move_cb, d);
 }
 
 static void
diff --git a/mail/em-format-html.c b/mail/em-format-html.c
index 6d38eda3f5..f95624e655 100644
--- a/mail/em-format-html.c
+++ b/mail/em-format-html.c
@@ -62,6 +62,8 @@
 #include <camel/camel-file-utils.h>
 
 #include <e-util/e-msgport.h>
+
+#include "mail-component.h"
 #include "mail-mt.h"
 
 #include "em-format-html.h"
@@ -214,15 +216,15 @@ em_format_html_get_type(void)
 			sizeof(EMFormatHTML), 0,
 			(GInstanceInitFunc)efh_init
 		};
-		extern char *evolution_dir;
+		const char *base_directory = mail_component_peek_base_directory (mail_component_peek ());
 		char *path;
 
 		efh_parent = g_type_class_ref(em_format_get_type());
 		type = g_type_register_static(em_format_get_type(), "EMFormatHTML", &info, 0);
 
 		/* cache expiry - 2 hour access, 1 day max */
-		path = alloca(strlen(evolution_dir)+16);
-		sprintf(path, "%s/cache", evolution_dir);
+		path = alloca(strlen(base_directory)+16);
+		sprintf(path, "%s/cache", base_directory);
 		emfh_http_cache = camel_data_cache_new(path, 0, NULL);
 		camel_data_cache_set_expire_age(emfh_http_cache, 24*60*60);
 		camel_data_cache_set_expire_access(emfh_http_cache, 2*60*60);
diff --git a/mail/em-marshal.list b/mail/em-marshal.list
index 910bfb1b3d..0c8bfbbbfb 100644
--- a/mail/em-marshal.list
+++ b/mail/em-marshal.list
@@ -1 +1,2 @@
 BOOLEAN:BOXED,POINTER,POINTER
+NONE:POINTER
diff --git a/mail/em-popup.c b/mail/em-popup.c
index 69fd1d0b6d..74ba86c33b 100644
--- a/mail/em-popup.c
+++ b/mail/em-popup.c
@@ -353,7 +353,8 @@ em_popup_create_menu_once(EMPopup *emp, EMPopupTarget *target, guint32 hide_mask
 
 	menu = em_popup_create_menu(emp, hide_mask, disable_mask);
 
-	g_signal_connect_swapped(menu, "selection_done", G_CALLBACK(em_popup_target_free), target);
+	if (target)
+		g_signal_connect_swapped(menu, "selection_done", G_CALLBACK(em_popup_target_free), target);
 	g_signal_connect(menu, "selection_done", G_CALLBACK(emp_popup_done), emp);
 
 	return menu;
diff --git a/mail/em-popup.h b/mail/em-popup.h
index 877b28fc28..0ad1d0015c 100644
--- a/mail/em-popup.h
+++ b/mail/em-popup.h
@@ -69,6 +69,7 @@ enum _em_popup_target_t {
 	EM_POPUP_TARGET_SELECT,
 	EM_POPUP_TARGET_URI,
 	EM_POPUP_TARGET_PART,
+	EM_POPUP_TARGET_FOLDER,
 };
 
 /* Flags that describe a TARGET_SELECT */
@@ -103,6 +104,13 @@ enum {
 	EM_POPUP_PART_IMAGE = 1<<1,
 };
 
+/* Flags that describe TARGET_FOLDER */
+enum {
+	EM_POPUP_FOLDER_LOCAL = 1<<0,
+	EM_POPUP_FOLDER_REMOTE = 1<<1,
+	EM_POPUP_FOLDER_VFOLDER = 1<<2,
+};
+
 struct _EMPopupTarget {
 	enum _em_popup_target_t type;
 	guint32 mask;		/* depends on type, see above */
@@ -118,6 +126,9 @@ struct _EMPopupTarget {
 			char *mime_type;
 			struct _CamelMimePart *part;
 		} part;
+		struct {
+			char *folder_uri;
+		} folder;
 	} data;
 };
 
diff --git a/mail/em-utils.c b/mail/em-utils.c
index 49ef9af792..5b16d0cd7b 100644
--- a/mail/em-utils.c
+++ b/mail/em-utils.c
@@ -36,6 +36,7 @@
 
 #include <filter/filter-editor.h>
 
+#include "mail-component.h"
 #include "mail-mt.h"
 #include "mail-ops.h"
 #include "mail-tools.h"
@@ -215,14 +216,14 @@ static GtkWidget *filter_editor = NULL;
 static void
 filter_editor_response (GtkWidget *dialog, int button, gpointer user_data)
 {
-	extern char *evolution_dir;
 	FilterContext *fc;
 	
 	if (button == GTK_RESPONSE_ACCEPT) {
 		char *user;
 		
 		fc = g_object_get_data ((GObject *) dialog, "context");
-		user = g_strdup_printf ("%s/filters.xml", evolution_dir);
+		user = g_strdup_printf ("%s/filters.xml",
+					mail_component_peek_base_directory (mail_component_peek ()));
 		rule_context_save ((RuleContext *) fc, user);
 		g_free (user);
 	}
@@ -249,7 +250,7 @@ static const char *filter_source_names[] = {
 void
 em_utils_edit_filters (GtkWidget *parent)
 {
-	extern char *evolution_dir;
+	const char *base_directory = mail_component_peek_base_directory (mail_component_peek ());
 	char *user, *system;
 	FilterContext *fc;
 	
@@ -259,7 +260,7 @@ em_utils_edit_filters (GtkWidget *parent)
 	}
 	
 	fc = filter_context_new ();
-	user = g_strdup_printf ("%s/filters.xml", evolution_dir);
+	user = g_strdup_printf ("%s/filters.xml", base_directory);
 	system = EVOLUTION_PRIVDATADIR "/filtertypes.xml";
 	rule_context_load ((RuleContext *) fc, system, user);
 	g_free (user);
@@ -773,10 +774,10 @@ generate_account_hash (void)
 	return account_hash;
 }
 
-static EDestination **
+static EABDestination **
 em_utils_camel_address_to_destination (CamelInternetAddress *iaddr)
 {
-	EDestination *dest, **destv;
+	EABDestination *dest, **destv;
 	int n, i, j;
 	
 	if (iaddr == NULL)
@@ -785,14 +786,14 @@ em_utils_camel_address_to_destination (CamelInternetAddress *iaddr)
 	if ((n = camel_address_length ((CamelAddress *) iaddr)) == 0)
 		return NULL;
 	
-	destv = g_malloc (sizeof (EDestination *) * (n + 1));
+	destv = g_malloc (sizeof (EABDestination *) * (n + 1));
 	for (i = 0, j = 0; i < n; i++) {
 		const char *name, *addr;
 		
 		if (camel_internet_address_get (iaddr, i, &name, &addr)) {
-			dest = e_destination_new ();
-			e_destination_set_name (dest, name);
-			e_destination_set_email (dest, addr);
+			dest = eab_destination_new ();
+			eab_destination_set_name (dest, name);
+			eab_destination_set_email (dest, addr);
 			
 			destv[j++] = dest;
 		}
@@ -813,7 +814,7 @@ reply_get_composer (GtkWidget *parent, CamelMimeMessage *message, EAccount *acco
 		    CamelInternetAddress *to, CamelInternetAddress *cc)
 {
 	const char *message_id, *references;
-	EDestination **tov, **ccv;
+	EABDestination **tov, **ccv;
 	EMsgComposer *composer;
 	char *subject;
 	
@@ -1211,7 +1212,7 @@ post_reply_to_message (CamelFolder *folder, const char *uid, CamelMimeMessage *m
 	const char *message_id, *references;
 	CamelInternetAddress *to = NULL;
 	GtkWidget *parent = user_data;
-	EDestination **tov = NULL;
+	EABDestination **tov = NULL;
 	EMsgComposer *composer;
 	char *subject, *url;
 	EAccount *account;
diff --git a/mail/em-utils.h b/mail/em-utils.h
index 0114c86ae2..a30c9109fb 100644
--- a/mail/em-utils.h
+++ b/mail/em-utils.h
@@ -36,6 +36,7 @@ struct _GtkWindow;
 struct _CamelFolder;
 struct _CamelStream;
 struct _CamelMimeMessage;
+struct _CamelMimePart;
 struct _GtkSelectionData;
 struct _GtkAdjustment;
 struct _EMsgComposer;
diff --git a/mail/folder-browser-factory.c b/mail/folder-browser-factory.c
index f0157bac9a..194396b062 100644
--- a/mail/folder-browser-factory.c
+++ b/mail/folder-browser-factory.c
@@ -118,14 +118,13 @@ control_destroy_cb (GtkObject *fb, GObject *control)
 }
 
 BonoboControl *
-folder_browser_factory_new_control (const char *uri,
-				    const GNOME_Evolution_Shell shell)
+folder_browser_factory_new_control (const char *uri)
 {
 	BonoboControl *control;
 	GtkWidget *fb;
 
 #if 0	
-	if (!(fb = folder_browser_new (shell, uri)))
+	if (!(fb = folder_browser_new (uri)))
 		return NULL;
 	
 	FOLDER_BROWSER (fb)->pref_master = TRUE; /* save UI settings changed in this FB */
diff --git a/mail/folder-browser-factory.h b/mail/folder-browser-factory.h
index 2c858c9c56..109938c27e 100644
--- a/mail/folder-browser-factory.h
+++ b/mail/folder-browser-factory.h
@@ -15,8 +15,7 @@
 #include "Evolution.h"
 #include "e-util/e-list.h"
 
-BonoboControl *folder_browser_factory_new_control       (const char            *uri,
-							 const GNOME_Evolution_Shell  shell);
+BonoboControl *folder_browser_factory_new_control       (const char *uri);
 EList         *folder_browser_factory_get_control_list  (void);
 
 struct _EMFolderBrowser *folder_browser_factory_get_browser(const char *uri);
diff --git a/mail/folder-browser-ui.c b/mail/folder-browser-ui.c
new file mode 100644
index 0000000000..9ccdb2db79
--- /dev/null
+++ b/mail/folder-browser-ui.c
@@ -0,0 +1,816 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
+/*
+ *  Authors: Peter Williams <peterw@ximian.com>
+ *           Jeffrey Stedfast <fejj@ximian.com>
+ *
+ *  Copyright 2002 Ximian, Inc. (www.ximian.com)
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 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, write to the Free Software
+ *  Foundation, Inc., 59 Temple Street #330, Boston, MA 02111-1307, USA.
+ *
+ */
+
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <string.h>
+
+#include <gconf/gconf.h>
+#include <gconf/gconf-client.h>
+
+#include <libgnome/gnome-util.h> /* gnome_util_prepend_user_home */
+
+#include <bonobo/bonobo-exception.h>
+#include <bonobo/bonobo-ui-component.h>
+#include <bonobo/bonobo-ui-util.h>
+
+#include "widgets/misc/e-charset-picker.h"
+#include "widgets/menus/gal-view-menus.h" /* GalView stuff */
+#include <gal/menus/gal-view-factory-etable.h>
+#include <gal/menus/gal-view-etable.h>
+
+#include "e-util/e-meta.h"
+
+#include "mail-config.h"
+#include "mail-callbacks.h" /* almost all the verbs */
+#include "mail-session.h" /* mail_session_forget_passwords */
+
+#include "folder-browser-ui.h"
+
+#include "evolution-shell-component-utils.h" /* Pixmap stuff */
+
+
+/*
+ * Add with 'folder_browser'
+ */
+
+static BonoboUIVerb message_verbs [] = {
+	BONOBO_UI_UNSAFE_VERB ("MailNext", next_msg),
+	BONOBO_UI_UNSAFE_VERB ("MailNextFlagged", next_flagged_msg),
+	BONOBO_UI_UNSAFE_VERB ("MailNextUnread", next_unread_msg),
+	BONOBO_UI_UNSAFE_VERB ("MailNextThread", next_thread),
+	BONOBO_UI_UNSAFE_VERB ("MailPrevious", previous_msg),
+	BONOBO_UI_UNSAFE_VERB ("MailPreviousFlagged", previous_flagged_msg),
+	BONOBO_UI_UNSAFE_VERB ("MailPreviousUnread", previous_unread_msg),
+	BONOBO_UI_UNSAFE_VERB ("AddSenderToAddressbook", add_sender_to_addrbook),
+	BONOBO_UI_UNSAFE_VERB ("MessageApplyFilters", apply_filters),
+	BONOBO_UI_UNSAFE_VERB ("MessageCopy", copy_msg),
+	BONOBO_UI_UNSAFE_VERB ("MessageDelete", delete_msg),
+	BONOBO_UI_UNSAFE_VERB ("MessageForward", forward),
+	BONOBO_UI_UNSAFE_VERB ("MessageForwardAttached", forward_attached),
+	BONOBO_UI_UNSAFE_VERB ("MessageForwardInline", forward_inline),
+	BONOBO_UI_UNSAFE_VERB ("MessageForwardQuoted", forward_quoted),
+	BONOBO_UI_UNSAFE_VERB ("MessageRedirect", redirect),
+	BONOBO_UI_UNSAFE_VERB ("MessageMarkAsRead", mark_as_seen),
+	BONOBO_UI_UNSAFE_VERB ("MessageMarkAsUnRead", mark_as_unseen),
+	BONOBO_UI_UNSAFE_VERB ("MessageMarkAsImportant", mark_as_important),
+	BONOBO_UI_UNSAFE_VERB ("MessageMarkAsUnimportant", mark_as_unimportant),
+	BONOBO_UI_UNSAFE_VERB ("MessageFollowUpFlag", flag_for_followup),
+	BONOBO_UI_UNSAFE_VERB ("MessageMove", move_msg),
+	BONOBO_UI_UNSAFE_VERB ("MessageOpen", open_message),
+	BONOBO_UI_UNSAFE_VERB ("MessagePostReply", post_reply),
+	BONOBO_UI_UNSAFE_VERB ("MessageReplyAll", reply_to_all),
+	BONOBO_UI_UNSAFE_VERB ("MessageReplyList", reply_to_list),
+	BONOBO_UI_UNSAFE_VERB ("MessageReplySender", reply_to_sender),
+	BONOBO_UI_UNSAFE_VERB ("MessageResend", resend_msg),
+	BONOBO_UI_UNSAFE_VERB ("MessageSaveAs", save_msg),
+	BONOBO_UI_UNSAFE_VERB ("MessageSearch", search_msg),
+	BONOBO_UI_UNSAFE_VERB ("MessageUndelete", undelete_msg),
+	BONOBO_UI_UNSAFE_VERB ("PrintMessage", print_msg),
+	BONOBO_UI_UNSAFE_VERB ("TextZoomIn", zoom_in),
+	BONOBO_UI_UNSAFE_VERB ("TextZoomOut", zoom_out),
+	BONOBO_UI_UNSAFE_VERB ("TextZoomReset", zoom_reset),
+	BONOBO_UI_UNSAFE_VERB ("PrintPreviewMessage", print_preview_msg),
+	BONOBO_UI_UNSAFE_VERB ("ToolsFilterMailingList", filter_mlist),
+	BONOBO_UI_UNSAFE_VERB ("ToolsFilterRecipient", filter_recipient),
+	BONOBO_UI_UNSAFE_VERB ("ToolsFilterSender", filter_sender),
+	BONOBO_UI_UNSAFE_VERB ("ToolsFilterSubject", filter_subject),
+	BONOBO_UI_UNSAFE_VERB ("ToolsVFolderMailingList", vfolder_mlist),
+	BONOBO_UI_UNSAFE_VERB ("ToolsVFolderRecipient", vfolder_recipient),
+	BONOBO_UI_UNSAFE_VERB ("ToolsVFolderSender", vfolder_sender),
+	BONOBO_UI_UNSAFE_VERB ("ToolsVFolderSubject", vfolder_subject),
+	BONOBO_UI_UNSAFE_VERB ("ViewLoadImages", load_images),
+	/* ViewHeaders stuff is a radio */
+	/* CaretMode is a toggle */
+
+	BONOBO_UI_VERB_END
+};
+
+static BonoboUIVerb list_verbs [] = {
+	BONOBO_UI_UNSAFE_VERB ("EditCut", folder_browser_cut),
+	BONOBO_UI_UNSAFE_VERB ("EditCopy", folder_browser_copy),
+	BONOBO_UI_UNSAFE_VERB ("EditPaste", folder_browser_paste),
+	BONOBO_UI_UNSAFE_VERB ("EditInvertSelection", invert_selection),
+	BONOBO_UI_UNSAFE_VERB ("EditSelectAll", select_all),
+        BONOBO_UI_UNSAFE_VERB ("EditSelectThread", select_thread),
+	BONOBO_UI_UNSAFE_VERB ("ChangeFolderProperties", configure_folder),
+	BONOBO_UI_UNSAFE_VERB ("FolderExpunge", expunge_folder),
+	/* HideDeleted is a toggle */
+	BONOBO_UI_UNSAFE_VERB ("MessageMarkAllAsRead", mark_all_as_seen),
+	BONOBO_UI_UNSAFE_VERB ("ViewHideRead", hide_read),
+	BONOBO_UI_UNSAFE_VERB ("ViewHideSelected", hide_selected),
+	BONOBO_UI_UNSAFE_VERB ("ViewShowAll", hide_none),
+	/* ViewThreaded is a toggle */
+
+	BONOBO_UI_VERB_END
+};
+
+static BonoboUIVerb global_verbs [] = {
+	BONOBO_UI_UNSAFE_VERB ("EmptyTrash", empty_trash),
+	BONOBO_UI_UNSAFE_VERB ("ForgetPasswords", mail_session_forget_passwords),
+	BONOBO_UI_UNSAFE_VERB ("MailCompose", compose_msg),
+	BONOBO_UI_UNSAFE_VERB ("MailPost", post_message),
+	BONOBO_UI_UNSAFE_VERB ("MailStop", stop_threads),
+	BONOBO_UI_UNSAFE_VERB ("ToolsFilters", filter_edit),
+	BONOBO_UI_UNSAFE_VERB ("ToolsSubscriptions", manage_subscriptions),
+	BONOBO_UI_UNSAFE_VERB ("ToolsVFolders", vfolder_edit_vfolders),
+	/* ViewPreview is a toggle */
+
+	BONOBO_UI_VERB_END
+};
+
+static EPixmap message_pixcache [] = {
+	E_PIXMAP ("/commands/PrintMessage", "print.xpm"),
+	E_PIXMAP ("/commands/PrintPreviewMessage", "print-preview.xpm"),
+	E_PIXMAP ("/commands/MessageDelete", "evolution-trash-mini.png"),
+	E_PIXMAP ("/commands/MessageUndelete", "undelete_message-16.png"),
+	E_PIXMAP ("/commands/MessageCopy", "copy_16_message.xpm"),
+	E_PIXMAP ("/commands/MessageMove", "move_message.xpm"),
+	E_PIXMAP ("/commands/MessageReplyAll", "reply_to_all.xpm"),
+	E_PIXMAP ("/commands/MessageReplySender", "reply.xpm"),
+	E_PIXMAP ("/commands/MessageForward", "forward.xpm"),
+	E_PIXMAP ("/commands/MessageApplyFilters", "apply-filters-16.xpm"),
+	E_PIXMAP ("/commands/MessageSearch", "search-16.png"),
+	E_PIXMAP ("/commands/MessageSaveAs", "save-as-16.png"),
+	E_PIXMAP ("/commands/MessageMarkAsRead", "mail-read.xpm"),
+	E_PIXMAP ("/commands/MessageMarkAsUnRead", "mail-new.xpm"),
+	E_PIXMAP ("/commands/MessageMarkAsImportant", "priority-high.xpm"),
+	E_PIXMAP ("/commands/MessageFollowUpFlag", "flag-for-followup-16.png"),
+	
+	E_PIXMAP ("/Toolbar/MailMessageToolbar/MessageReplySender", "buttons/reply.png"),
+	E_PIXMAP ("/Toolbar/MailMessageToolbar/MessageReplyAll", "buttons/reply-to-all.png"),
+	E_PIXMAP ("/Toolbar/MailMessageToolbar/MessageForward", "buttons/forward.png"),
+	E_PIXMAP ("/Toolbar/MailMessageToolbar/PrintMessage", "buttons/print.png"),
+	E_PIXMAP ("/Toolbar/MailMessageToolbar/MessageMove", "buttons/move-message.png"),
+	E_PIXMAP ("/Toolbar/MailMessageToolbar/MessageCopy", "buttons/copy-message.png"),
+	E_PIXMAP ("/Toolbar/MailMessageToolbar/MessageDelete", "buttons/delete-message.png"),
+	
+	E_PIXMAP ("/Toolbar/MailNextButtons/MailNext", "buttons/next-message.png"),
+	E_PIXMAP ("/Toolbar/MailNextButtons/MailPrevious", "buttons/previous-message.png"),
+
+	E_PIXMAP_END
+};
+
+static EPixmap list_pixcache [] = {
+	E_PIXMAP ("/commands/ChangeFolderProperties", "configure_16_folder.xpm"),
+	E_PIXMAP ("/commands/ViewHideRead", "hide_read_messages.xpm"),
+	E_PIXMAP ("/commands/ViewHideSelected", "hide_selected_messages.xpm"),
+	E_PIXMAP ("/commands/ViewShowAll", "show_all_messages.xpm"),
+	
+	E_PIXMAP ("/commands/EditCut", "16_cut.png"),
+	E_PIXMAP ("/commands/EditCopy", "16_copy.png"),
+	E_PIXMAP ("/commands/EditPaste", "16_paste.png"),
+
+	E_PIXMAP_END
+};
+
+static EPixmap global_pixcache [] = {
+	E_PIXMAP ("/commands/MailCompose", "new-message.xpm"),
+	
+	E_PIXMAP_END
+};
+
+enum {
+	IS_DRAFTS_FOLDER          = (1 << 0),
+	IS_OUTBOX_FOLDER          = (1 << 1),
+	IS_SENT_FOLDER            = (1 << 2),
+	
+	IS_OUTGOING_FOLDER        = (IS_DRAFTS_FOLDER | IS_OUTBOX_FOLDER | IS_SENT_FOLDER),
+	IS_INCOMING_FOLDER        = (1 << 3),
+	
+	IS_ANY_FOLDER             = (IS_OUTGOING_FOLDER | IS_INCOMING_FOLDER),
+
+	SELECTION_NONE            = (1 << 4),
+	SELECTION_SINGLE          = (1 << 5),
+	SELECTION_MULTIPLE        = (1 << 6),
+	
+	SELECTION_ANYTHING        = (SELECTION_SINGLE | SELECTION_MULTIPLE),
+
+	IS_THREADED		  = (1 << 7),
+	NOT_THREADED		  = (1<<8),
+	ANY_THREADED		  = (IS_THREADED|NOT_THREADED),
+
+	HAS_UNDELETED             = (1 << 9),
+	HAS_DELETED               = (1 << 10),
+	HAS_UNREAD                = (1 << 11),
+	HAS_READ                  = (1 << 12),
+	HAS_UNIMPORTANT           = (1 << 13),
+	HAS_IMPORTANT             = (1 << 14)
+};
+
+#define HAS_FLAGS (HAS_UNDELETED | HAS_DELETED |  \
+		   HAS_UNREAD | HAS_READ | \
+		   HAS_UNIMPORTANT | HAS_IMPORTANT)
+
+#define IS_1MESSAGE (IS_ANY_FOLDER | SELECTION_SINGLE | ANY_THREADED | HAS_FLAGS)
+#define IS_0MESSAGE (IS_ANY_FOLDER | SELECTION_ANYTHING | SELECTION_NONE | ANY_THREADED | HAS_FLAGS)
+#define IS_NMESSAGE (IS_ANY_FOLDER | SELECTION_ANYTHING | ANY_THREADED | HAS_FLAGS)
+
+struct _UINode {
+	const char *name;
+	guint32 enable_mask;
+};
+
+struct _UINode default_ui_nodes[] = {
+	{ "ViewLoadImages",  IS_1MESSAGE },
+	{ "ViewFullHeaders", IS_0MESSAGE },
+	{ "ViewNormal",      IS_0MESSAGE },
+	{ "ViewSource",      IS_0MESSAGE },
+	{ "CaretMode",       IS_0MESSAGE },
+	
+	{ "AddSenderToAddressbook",   IS_INCOMING_FOLDER | SELECTION_SINGLE | ANY_THREADED | HAS_FLAGS },
+	
+	{ "MessageResend",            IS_SENT_FOLDER | SELECTION_SINGLE | ANY_THREADED | HAS_FLAGS },
+	
+	/* actions that work on exactly 1 message */
+	{ "MessagePostReply",         IS_1MESSAGE },
+	{ "MessageReplyAll",          IS_1MESSAGE },
+	{ "MessageReplyList",         IS_1MESSAGE },
+	{ "MessageReplySender",       IS_1MESSAGE },
+	{ "MessageForwardInline",     IS_1MESSAGE },
+	{ "MessageForwardQuoted",     IS_1MESSAGE },
+	{ "MessageRedirect",          IS_1MESSAGE },
+	{ "MessageSearch",            IS_1MESSAGE },
+	
+	{ "PrintMessage",             IS_1MESSAGE },
+	{ "PrintPreviewMessage",      IS_1MESSAGE },
+	
+	{ "ToolsFilterMailingList",   IS_1MESSAGE },
+	{ "ToolsFilterRecipient",     IS_1MESSAGE },
+	{ "ToolsFilterSender",        IS_1MESSAGE },
+	{ "ToolsFilterSubject",       IS_1MESSAGE },
+	
+	{ "ToolsVFolderMailingList",  IS_1MESSAGE },
+	{ "ToolsVFolderRecipient",    IS_1MESSAGE },
+	{ "ToolsVFolderSender",       IS_1MESSAGE },
+	{ "ToolsVFolderSubject",      IS_1MESSAGE },
+	
+	/* actions that work on >= 1 message */
+	{ "MessageApplyFilters",      IS_NMESSAGE },
+	{ "MessageCopy",              IS_NMESSAGE },
+	{ "MessageMove",              IS_NMESSAGE },
+	{ "MessageDelete",            IS_NMESSAGE },
+	{ "MessageUndelete",          IS_NMESSAGE & ~HAS_DELETED },
+	{ "MessageMarkAsRead",        IS_NMESSAGE & ~HAS_UNREAD },
+	{ "MessageMarkAsUnRead",      IS_NMESSAGE & ~HAS_READ },
+	{ "MessageMarkAsImportant",   IS_NMESSAGE & ~HAS_UNIMPORTANT },
+	{ "MessageMarkAsUnimportant", IS_NMESSAGE & ~HAS_IMPORTANT },
+	{ "MessageFollowUpFlag",      IS_NMESSAGE },
+	{ "MessageOpen",              IS_NMESSAGE },
+	{ "MessageSaveAs",            IS_NMESSAGE },
+	{ "MessageForward",           IS_NMESSAGE },
+	{ "MessageForwardAttached",   IS_NMESSAGE },
+	
+	{ "EditCut",                  IS_NMESSAGE },
+	{ "EditCopy",                 IS_NMESSAGE },
+	{ "EditPaste",                IS_0MESSAGE },
+	{ "EditSelectThread",	      IS_ANY_FOLDER | SELECTION_ANYTHING | IS_THREADED | HAS_FLAGS},
+
+	{ "ViewHideSelected",         IS_NMESSAGE },
+	
+	/* FIXME: should these be single-selection? */
+	{ "MailNext",                 IS_NMESSAGE },
+	{ "MailNextFlagged",          IS_NMESSAGE },
+	{ "MailNextUnread",           IS_NMESSAGE },
+	{ "MailNextThread",           IS_NMESSAGE },
+	{ "MailPrevious",             IS_NMESSAGE },
+	{ "MailPreviousFlagged",      IS_NMESSAGE },
+	{ "MailPreviousUnread",       IS_NMESSAGE },
+};
+
+static int num_default_ui_nodes = sizeof (default_ui_nodes) / sizeof (default_ui_nodes[0]);
+
+
+static void
+ui_add (FolderBrowser *fb, const char *name, BonoboUIVerb verb[], EPixmap pixcache[])
+{
+	BonoboUIComponent *uic = fb->uicomp;
+	char *file;
+	
+	bonobo_ui_component_add_verb_list_with_data (uic, verb, fb);
+	
+	/*bonobo_ui_component_freeze (uic, NULL);*/
+	
+	file = g_strconcat (EVOLUTION_UIDIR "/evolution-mail-", name, ".xml", NULL);
+	bonobo_ui_util_set_ui (uic, PREFIX, file, "evolution-mail", NULL);
+	g_free (file);
+	
+	e_pixmaps_update (uic, pixcache);
+	
+	/*bonobo_ui_component_thaw (uic, NULL);*/
+}
+
+/* more complex stuff */
+
+static void
+display_view (GalViewInstance *instance, GalView *view, gpointer data)
+{
+	FolderBrowser *fb = data;
+	
+	if (GAL_IS_VIEW_ETABLE (view)) {
+		gal_view_etable_attach_tree (GAL_VIEW_ETABLE (view), fb->message_list->tree);
+	}
+}
+
+void
+folder_browser_ui_setup_view_menus (FolderBrowser *fb)
+{
+	static GalViewCollection *collection = NULL;
+	char *id;
+	gboolean outgoing;
+	
+	if (fb->uicomp == NULL || fb->folder == NULL)
+		return;
+	
+	g_assert (fb->view_instance == NULL);
+	g_assert (fb->view_menus == NULL);
+	
+	outgoing = folder_browser_is_drafts (fb) ||
+		folder_browser_is_sent (fb) ||
+		folder_browser_is_outbox (fb);
+	
+	if (collection == NULL) {
+		ETableSpecification *spec;
+		char *local_dir;
+		GalViewFactory *factory;
+		
+		collection = gal_view_collection_new ();
+		
+		gal_view_collection_set_title (collection, _("Mail"));
+		
+		local_dir = gnome_util_prepend_user_home ("/evolution/views/mail/");
+		gal_view_collection_set_storage_directories (collection,
+							     EVOLUTION_GALVIEWSDIR "/mail/",
+							     local_dir);
+		g_free (local_dir);
+		
+		spec = e_table_specification_new ();
+		e_table_specification_load_from_file (spec, EVOLUTION_ETSPECDIR "/message-list.etspec");
+		
+		factory = gal_view_factory_etable_new (spec);
+		g_object_unref (spec);
+		gal_view_collection_add_factory (collection, factory);
+		g_object_unref (factory);
+		
+		gal_view_collection_load (collection);
+	}
+	
+	id = mail_config_folder_to_safe_url (fb->folder);
+	fb->view_instance = gal_view_instance_new (collection, id);
+	g_free (id);
+	
+	if (outgoing)
+		gal_view_instance_set_default_view (fb->view_instance, "As_Sent_Folder");
+	
+	if (!gal_view_instance_exists (fb->view_instance)) {
+		char *path;
+		struct stat st;
+		
+		gal_view_instance_load (fb->view_instance);
+		
+		path = mail_config_folder_to_cachename (fb->folder, "et-header-");
+		if (path && stat (path, &st) == 0 && st.st_size > 0 && S_ISREG (st.st_mode)) {
+			ETableSpecification *spec;
+			ETableState *state;
+			GalView *view;
+			
+			spec = e_table_specification_new();
+			e_table_specification_load_from_file (spec, EVOLUTION_ETSPECDIR "/message-list.etspec");
+			view = gal_view_etable_new (spec, "");
+			g_object_unref (spec);
+			
+			state = e_table_state_new ();
+			e_table_state_load_from_file (state, path);
+			gal_view_etable_set_state (GAL_VIEW_ETABLE (view), state);
+			g_object_unref (state);
+			
+			gal_view_instance_set_custom_view (fb->view_instance, view);
+			g_object_unref (view);
+		}
+		g_free (path);
+	}
+	
+	fb->view_menus = gal_view_menus_new (fb->view_instance);
+	gal_view_menus_apply (fb->view_menus, fb->uicomp, NULL);
+	
+	/* Due to CORBA reentrancy, the view could be gone now. */
+	if (fb->view_instance == NULL)
+		return;
+	
+	g_signal_connect (fb->view_instance, "display_view", G_CALLBACK (display_view), fb);
+	
+	display_view (fb->view_instance, gal_view_instance_get_current_view (fb->view_instance), fb);
+}
+
+/* Gets rid of the view instance and view menus objects */
+void
+folder_browser_ui_discard_view_menus (FolderBrowser *fb)
+{
+	g_assert (fb->view_instance != NULL);
+	g_assert (fb->view_menus != NULL);
+	
+	g_object_unref (fb->view_instance);
+	fb->view_instance = NULL;
+	
+	g_object_unref (fb->view_menus);
+	fb->view_menus = NULL;
+}
+
+void
+folder_browser_ui_message_list_focus (FolderBrowser *fb)
+{
+	g_assert (fb->uicomp != NULL);
+	
+	bonobo_ui_component_set_prop (fb->uicomp, "/commands/EditInvertSelection",
+				      "sensitive", "1", NULL);
+/*	bonobo_ui_component_set_prop (fb->uicomp, "/commands/EditSelectThread",
+	"sensitive", "1", NULL);*/
+}
+
+void
+folder_browser_ui_message_list_unfocus (FolderBrowser *fb)
+{
+	g_assert (fb->uicomp != NULL);
+	
+	bonobo_ui_component_set_prop (fb->uicomp, "/commands/EditInvertSelection",
+				      "sensitive", "0", NULL);
+	/*bonobo_ui_component_set_prop (fb->uicomp, "/commands/EditSelectThread",
+	  "sensitive", "0", NULL);*/
+}
+
+static void
+folder_browser_setup_property_menu (FolderBrowser *fb, BonoboUIComponent *uic)
+{
+	char *name, *base = NULL;
+	CamelURL *url;
+	
+	url = camel_url_new (fb->uri, NULL);
+	if (url)
+		base = g_path_get_basename(url->fragment?url->fragment:url->path);
+	
+	if (base && base[0] != '\0')
+		name = g_strdup_printf (_("Properties for \"%s\""), base);
+	else
+		name = g_strdup (_("Properties"));
+	
+	bonobo_ui_component_set_prop (
+		uic, "/menu/File/Folder/ComponentPlaceholder/ChangeFolderProperties",
+		"label", name, NULL);
+	g_free (name);
+	g_free(base);
+
+	if (url)
+		camel_url_free (url);
+	
+	fbui_sensitise_item (fb, "ChangeFolderProperties",
+			     (strncmp (fb->uri, "vfolder:", 8) == 0 || strncmp (fb->uri, "file:", 5) == 0));
+}
+
+/* Must be in the same order as MailConfigDisplayStyle */
+/* used in folder-browser.c as well (therefore not static) */
+char *message_display_styles[] = {
+	"/commands/ViewNormal",
+	"/commands/ViewFullHeaders",
+	"/commands/ViewSource"
+};
+
+/* public */
+
+void 
+folder_browser_ui_add_message (FolderBrowser *fb)
+{
+	BonoboUIComponent *uic = fb->uicomp;
+	FolderBrowserSelectionState prev_state;
+	GConfClient *gconf;
+	int style;
+	gboolean caret_mode;
+	
+	gconf = mail_config_get_gconf_client ();
+	
+	if (fb->sensitise_state) {
+		g_hash_table_destroy(fb->sensitise_state);
+		fb->sensitise_state = NULL;
+	}
+	
+	ui_add (fb, "message", message_verbs, message_pixcache);
+	
+	caret_mode = gconf_client_get_bool (gconf, "/apps/evolution/mail/display/caret_mode", NULL);
+	bonobo_ui_component_set_prop(uic, "/commands/CaretMode", "state", caret_mode?"1":"0", NULL);
+	bonobo_ui_component_add_listener (uic, "CaretMode", folder_browser_toggle_caret_mode, fb);
+
+	/* Display Style */
+	style = gconf_client_get_int (gconf, "/apps/evolution/mail/display/message_style", NULL);
+	style = style >= 0 && style < MAIL_CONFIG_DISPLAY_MAX ? style : 0;
+	bonobo_ui_component_set_prop (uic, message_display_styles[style], "state", "1", NULL);
+	bonobo_ui_component_add_listener (uic, "ViewNormal", folder_browser_set_message_display_style, fb);
+	bonobo_ui_component_add_listener (uic, "ViewFullHeaders", folder_browser_set_message_display_style, fb);
+	bonobo_ui_component_add_listener (uic, "ViewSource", folder_browser_set_message_display_style, fb);
+	if (fb->mail_display->display_style != style) {
+		fb->mail_display->display_style = style;
+		mail_display_redisplay (fb->mail_display, TRUE);
+	}
+	
+	/* Resend Message */
+	if (fb->folder && !folder_browser_is_sent (fb)) 
+		fbui_sensitise_item (fb, "MessageResend", FALSE);
+	
+	/* sensitivity of message-specific commands */
+	prev_state = fb->selection_state;
+	fb->selection_state = FB_SELSTATE_UNDEFINED;
+	folder_browser_ui_set_selection_state (fb, prev_state);
+	
+	/* Charset picker */
+	e_charset_picker_bonobo_ui_populate (uic, "/menu/View", FB_DEFAULT_CHARSET,
+					     folder_browser_charset_changed, fb);
+}
+
+void 
+folder_browser_ui_add_list (FolderBrowser *fb)
+{
+	BonoboUIComponent *uic = fb->uicomp;
+	GConfClient *gconf;
+	int state;
+	
+	gconf = mail_config_get_gconf_client ();
+	
+	if (fb->sensitise_state) {
+		g_hash_table_destroy (fb->sensitise_state);
+		fb->sensitise_state = NULL;
+	}
+	
+	ui_add (fb, "list", list_verbs, list_pixcache);
+	
+	/* Hide Deleted */
+	state = !gconf_client_get_bool (gconf, "/apps/evolution/mail/display/show_deleted", NULL);
+	bonobo_ui_component_set_prop (uic, "/commands/HideDeleted", "state", state ? "1" : "0", NULL);
+	bonobo_ui_component_add_listener (uic, "HideDeleted", folder_browser_toggle_hide_deleted, fb);
+	if (!(fb->folder && (fb->folder->folder_flags & CAMEL_FOLDER_IS_TRASH)))
+		message_list_set_hidedeleted (fb->message_list, state);
+	else
+		fbui_sensitise_item (fb, "HideDeleted", FALSE);
+	
+	/* Threaded toggle */
+	state = gconf_client_get_bool (gconf, "/apps/evolution/mail/display/thread_list", NULL);
+	if (fb->meta)
+		state = e_meta_get_bool(fb->meta, "thread_list", state);
+
+	bonobo_ui_component_set_prop (uic, "/commands/ViewThreaded", "state", state ? "1" : "0", NULL);
+	bonobo_ui_component_add_listener (uic, "ViewThreaded", folder_browser_toggle_threads, fb);
+	message_list_set_threaded (fb->message_list, state);
+	state = fb->selection_state;
+	fb->selection_state = FB_SELSTATE_UNDEFINED;
+	folder_browser_ui_set_selection_state (fb, state);
+	
+	/* Property menu */
+	folder_browser_setup_property_menu (fb, fb->uicomp);
+	
+	/* View menu */
+	if (fb->view_instance == NULL)
+		folder_browser_ui_setup_view_menus (fb);
+}
+
+void 
+folder_browser_ui_rm_list (FolderBrowser *fb)
+{
+	/* View menu */
+	if (fb->view_instance != NULL)
+		folder_browser_ui_discard_view_menus (fb);
+}
+
+void 
+folder_browser_ui_add_global (FolderBrowser *fb)
+{
+	BonoboUIComponent *uic = fb->uicomp;
+	gboolean show_preview;
+	GConfClient *gconf;
+	int paned_size;
+	
+	gconf = mail_config_get_gconf_client ();
+	
+	if (fb->sensitise_state) {
+		g_hash_table_destroy (fb->sensitise_state);
+		fb->sensitise_state = NULL;
+	}
+	
+	ui_add (fb, "global", global_verbs, global_pixcache);
+	
+	/* (Pre)view pane size (do this first because it affects the
+           preview settings - see folder_browser_set_message_preview()
+           internals for details) */
+	paned_size = gconf_client_get_int (gconf, "/apps/evolution/mail/display/paned_size", NULL);
+	g_signal_handler_block (fb->vpaned, fb->paned_resize_id);
+	gtk_paned_set_position (GTK_PANED (fb->vpaned), paned_size);
+	g_signal_handler_unblock (fb->vpaned, fb->paned_resize_id);
+	
+	/* (Pre)view toggle */
+	show_preview = gconf_client_get_bool (gconf, "/apps/evolution/mail/display/show_preview", NULL);
+	if (fb->meta)
+		show_preview = e_meta_get_bool(fb->meta, "show_preview", show_preview);
+	bonobo_ui_component_set_prop (uic, "/commands/ViewPreview", "state", show_preview ? "1" : "0", NULL);
+	folder_browser_set_message_preview (fb, show_preview);
+	
+	/* listen for user-changes */
+	bonobo_ui_component_add_listener (uic, "ViewPreview", folder_browser_toggle_preview, fb);
+	
+	/* Stop button */
+	/* TODO: Go through cache, but we can't becaus eof mail-mt.c:set_stop at the moment */
+	bonobo_ui_component_set_prop (uic, "/commands/MailStop", "sensitive", "0", NULL);
+}
+
+void 
+folder_browser_ui_rm_all (FolderBrowser *fb)
+{
+	BonoboUIComponent *uic = fb->uicomp;
+
+	if (bonobo_ui_component_get_container (uic) != NULL) {
+		bonobo_ui_component_rm (uic, "/", NULL);
+		bonobo_ui_component_unset_container (uic, NULL);
+	}
+
+	if (fb->sensitise_state) {
+		g_hash_table_destroy (fb->sensitise_state);
+		fb->sensitise_state = NULL;
+	}
+}
+
+void
+fbui_sensitise_item (FolderBrowser *fb, const char *item, int state)
+{
+	char *name, *key;
+	gpointer val_ptr;
+	int val;
+	
+	/* If this whole caching idea doesn't work, remove it here */
+	if (fb->sensitise_state == NULL)
+		fb->sensitise_state = g_hash_table_new (g_str_hash, g_str_equal);
+	
+	if (g_hash_table_lookup_extended (fb->sensitise_state, item, (void **)&key, &val_ptr)) {
+		val = GPOINTER_TO_INT(val_ptr);
+		if (val == state)
+			return;
+	}
+	
+	if (fb->uicomp) {
+		name = g_alloca (strlen (item) + strlen ("/commands/") + 1);
+		sprintf (name, "/commands/%s", item);
+		bonobo_ui_component_set_prop (fb->uicomp, name, "sensitive", state ? "1" : "0", NULL);
+		g_hash_table_insert (fb->sensitise_state, (char *) item, GINT_TO_POINTER(state));
+	}
+}
+
+static void
+fbui_sensitize_items (FolderBrowser *fb, guint32 enable_mask)
+{
+	gboolean enable;
+	int i;
+	
+	for (i = 0; i < num_default_ui_nodes; i++) {
+		enable = (default_ui_nodes[i].enable_mask & enable_mask) == enable_mask;
+		fbui_sensitise_item (fb, default_ui_nodes[i].name, enable);
+	}
+}
+
+void 
+folder_browser_ui_scan_selection (FolderBrowser *fb)
+{
+	gboolean outgoing = FALSE;
+	guint32 enable_mask = 0;
+	
+	if (fb->selection_state == FB_SELSTATE_SINGLE || 
+	    fb->selection_state == FB_SELSTATE_MULTIPLE) {
+		GPtrArray *uids;
+		CamelMessageInfo *info;
+		guint32 temp_mask = 0;
+		int i;
+		
+		uids = g_ptr_array_new ();
+		message_list_foreach (fb->message_list, enumerate_msg, uids);
+
+		for (i = 0; i < uids->len; i++) {
+			info = camel_folder_get_message_info (fb->folder, uids->pdata[i]);
+			if (info == NULL)
+				continue;
+			
+			if (info->flags & CAMEL_MESSAGE_DELETED)
+				temp_mask |= HAS_DELETED;
+			else
+				temp_mask |= HAS_UNDELETED;
+			
+			if (info->flags & CAMEL_MESSAGE_SEEN)
+				temp_mask |= HAS_READ;
+			else
+				temp_mask |= HAS_UNREAD;
+
+			if (info->flags & CAMEL_MESSAGE_FLAGGED)
+				temp_mask |= HAS_IMPORTANT;
+			else
+				temp_mask |= HAS_UNIMPORTANT;
+			
+			camel_folder_free_message_info (fb->folder, info);
+			g_free (uids->pdata[i]);
+		}
+		
+		g_ptr_array_free (uids, TRUE);
+		
+		/* yeah, the naming is a bit backwards, but we need to support
+		 * the case when, say, both a deleted and an undeleted message
+		 * are selected. Both the Delete and Undelete menu items should
+		 * be sensitized, but the only good way to set the flags is as
+		 * above. Anyway, the naming is a bit of a lie but it works out
+		 * so that it's sensible both above and in the definition of
+		 * the UI items, so deal with it.
+		 */
+		
+		enable_mask |= (~temp_mask & HAS_FLAGS);
+	}
+	
+	if (folder_browser_is_drafts (fb)) {
+		enable_mask |= IS_DRAFTS_FOLDER;
+		outgoing = TRUE;
+	}
+	
+	if (folder_browser_is_outbox (fb)) {
+		enable_mask |= IS_OUTBOX_FOLDER;
+		outgoing = TRUE;
+	}
+	
+	if (folder_browser_is_sent (fb)) {
+		enable_mask |= IS_SENT_FOLDER;
+		outgoing = TRUE;
+	}
+	
+	if (fb->message_list && fb->message_list->threaded)
+		enable_mask |= IS_THREADED;
+	else
+		enable_mask |= NOT_THREADED;
+	
+	if (outgoing == FALSE)
+		enable_mask |= IS_INCOMING_FOLDER;
+	
+	switch (fb->selection_state) {
+	case FB_SELSTATE_SINGLE:
+		enable_mask |= SELECTION_SINGLE;
+		break;
+	case FB_SELSTATE_MULTIPLE:
+		enable_mask |= SELECTION_MULTIPLE;
+		break;
+	case FB_SELSTATE_NONE:
+	default:
+		enable_mask |= SELECTION_NONE;
+		break;
+	}
+	
+	fbui_sensitize_items (fb, enable_mask);
+}
+
+void 
+folder_browser_ui_set_selection_state (FolderBrowser *fb, FolderBrowserSelectionState state)
+{
+	/* the state may be the same but with
+	 * different messages selected, necessitating
+	 * a recheck of the flags of the selected
+	 * messages.
+	 */
+	
+	if (state == fb->selection_state && 
+	    state != FB_SELSTATE_SINGLE &&
+	    state != FB_SELSTATE_MULTIPLE)
+		return;
+	
+	fb->selection_state = state;
+	folder_browser_ui_scan_selection (fb);
+}
+
+void
+folder_browser_ui_message_loaded (FolderBrowser *fb)
+{
+	BonoboUIComponent *uic = fb->uicomp;
+	
+	if (uic) {
+		fb->selection_state = FB_SELSTATE_NONE;
+		folder_browser_ui_set_selection_state (fb, FB_SELSTATE_SINGLE);
+	}
+}
diff --git a/mail/folder-browser-ui.h b/mail/folder-browser-ui.h
new file mode 100644
index 0000000000..5c2bc1fa28
--- /dev/null
+++ b/mail/folder-browser-ui.h
@@ -0,0 +1,36 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
+/*
+ * folder-browser-ui.c: Sets up the Bonobo UI for FolderBrowsers
+ *
+ * Author:
+ *   Peter Williams <peterw@ximian.com>
+ *
+ * (C) 2001 Ximian, Inc.
+ */
+
+#ifndef _FOLDER_BROWSER_UI_H
+#define _FOLDER_BROWSER_UI_H
+
+#include "folder-browser.h"
+
+void folder_browser_ui_add_message (FolderBrowser *fb);
+void folder_browser_ui_add_list (FolderBrowser *fb);
+void folder_browser_ui_add_global (FolderBrowser *fb);
+
+void folder_browser_ui_rm_list (FolderBrowser *fb);
+void folder_browser_ui_rm_all (FolderBrowser *fb);
+
+/* these affect the sensitivity of UI elements */
+void folder_browser_ui_scan_selection (FolderBrowser *fb);
+void folder_browser_ui_set_selection_state (FolderBrowser *fb, FolderBrowserSelectionState state);
+void folder_browser_ui_message_loaded (FolderBrowser *fb);
+
+void folder_browser_ui_discard_view_menus (FolderBrowser *fb);
+void folder_browser_ui_setup_view_menus (FolderBrowser *fb);
+/* Set the sensitivity of a single item */
+void fbui_sensitise_item(FolderBrowser *fb, const char *item, int state);
+
+void folder_browser_ui_message_list_focus (FolderBrowser *fb);
+void folder_browser_ui_message_list_unfocus (FolderBrowser *fb);
+
+#endif /* _FOLDER_BROWSER_UI_H */
diff --git a/mail/folder-browser.c b/mail/folder-browser.c
new file mode 100644
index 0000000000..6d7deb2bdb
--- /dev/null
+++ b/mail/folder-browser.c
@@ -0,0 +1,2679 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
+/*
+ *  Authors: Miguel De Icaza <miguel@ximian.com>
+ *           Jeffrey Stedfast <fejj@ximian.com>
+ *
+ *  Copyright 2000-2003 Ximian, Inc. (www.ximian.com)
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of version 2 of the GNU General Public
+ * License as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public
+ * License along with this program; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ *
+ */
+
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <string.h>
+#include <ctype.h>
+#include <errno.h>
+
+#include <gdk/gdkkeysyms.h>
+#include <gtk/gtkinvisible.h>
+#include <gal/e-table/e-table.h>
+#include <gal/util/e-util.h>
+#include <gal/widgets/e-gui-utils.h>
+#include <gal/widgets/e-popup-menu.h>
+
+#include <gconf/gconf.h>
+#include <gconf/gconf-client.h>
+
+#include <libgnomeui/gnome-dialog-util.h>
+#include <libgnomeui/gnome-pixmap.h>
+
+#include <gtkhtml/htmlengine.h>
+#include <gtkhtml/htmlobject.h>
+#include <gtkhtml/htmlinterval.h>
+#include <gtkhtml/htmlengine-edit-cut-and-paste.h>
+
+#include "filter/vfolder-rule.h"
+#include "filter/vfolder-context.h"
+#include "filter/filter-option.h"
+#include "filter/filter-input.h"
+#include "filter/filter-label.h"
+
+#include "e-util/e-sexp.h"
+#include "e-util/e-mktemp.h"
+#include "e-util/e-meta.h"
+#include "folder-browser.h"
+#include "e-searching-tokenizer.h"
+#include "mail.h"
+#include "mail-callbacks.h"
+#include "mail-component.h"
+#include "mail-tools.h"
+#include "mail-ops.h"
+#include "mail-vfolder.h"
+#include "mail-autofilter.h"
+#include "mail-mt.h"
+#include "mail-folder-cache.h"
+#include "folder-browser-ui.h"
+
+#include "mail-local.h"
+#include "mail-config.h"
+
+#include <camel/camel-mime-message.h>
+#include <camel/camel-stream-mem.h>
+
+/* maybe this shooudlnt be private ... */
+#include "camel/camel-search-private.h"
+
+#define d(x) 
+
+#define PARENT_TYPE (gtk_table_get_type ())
+
+static void folder_changed(CamelObject *o, void *event_data, void *data);
+static void main_folder_changed(CamelObject *o, void *event_data, void *data);
+
+#define X_EVOLUTION_MESSAGE_TYPE "x-evolution-message"
+#define MESSAGE_RFC822_TYPE      "message/rfc822"
+#define TEXT_URI_LIST_TYPE       "text/uri-list"
+#define TEXT_PLAIN_TYPE          "text/plain"
+
+/* Drag & Drop types */
+enum DndTargetType {
+	DND_TARGET_TYPE_X_EVOLUTION_MESSAGE,
+	DND_TARGET_TYPE_MESSAGE_RFC822,
+	DND_TARGET_TYPE_TEXT_URI_LIST,
+};
+
+static GtkTargetEntry drag_types[] = {
+	{ X_EVOLUTION_MESSAGE_TYPE, 0, DND_TARGET_TYPE_X_EVOLUTION_MESSAGE },
+	{ MESSAGE_RFC822_TYPE, 0, DND_TARGET_TYPE_MESSAGE_RFC822 },
+	{ TEXT_URI_LIST_TYPE, 0, DND_TARGET_TYPE_TEXT_URI_LIST },
+};
+
+static const int num_drag_types = sizeof (drag_types) / sizeof (drag_types[0]);
+
+enum PasteTargetType {
+	PASTE_TARGET_TYPE_X_EVOLUTION_MESSAGE,
+	PASTE_TARGET_TYPE_TEXT_PLAIN,
+};
+
+static GtkTargetPair paste_types[] = {
+	{ 0, 0, PASTE_TARGET_TYPE_X_EVOLUTION_MESSAGE },
+	{ GDK_SELECTION_TYPE_STRING, 0, PASTE_TARGET_TYPE_TEXT_PLAIN },
+};
+
+static const int num_paste_types = sizeof (paste_types) / sizeof (paste_types[0]);
+
+static GdkAtom clipboard_atom = GDK_NONE;
+
+static GtkTableClass *parent_class = NULL;
+
+enum {
+	FOLDER_LOADED,
+	MESSAGE_LOADED,
+	LAST_SIGNAL
+};
+
+static guint folder_browser_signals [LAST_SIGNAL] = {0, };
+
+static void
+folder_browser_finalise (GObject *object)
+{
+	FolderBrowser *folder_browser;
+	
+	folder_browser = FOLDER_BROWSER (object);
+		
+	g_free (folder_browser->loading_uid);
+	g_free (folder_browser->pending_uid);
+	g_free (folder_browser->new_uid);
+	g_free (folder_browser->loaded_uid);
+	
+	g_free (folder_browser->uri);
+	folder_browser->uri = NULL;
+		
+	if (folder_browser->clipboard_selection)
+		g_byte_array_free (folder_browser->clipboard_selection, TRUE);
+	
+	if (folder_browser->sensitise_state) {
+		g_hash_table_destroy (folder_browser->sensitise_state);
+		folder_browser->sensitise_state = NULL;
+	}
+	
+	G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+static void
+folder_browser_destroy (GtkObject *object)
+{
+	FolderBrowser *folder_browser;
+	CORBA_Environment ev;
+	
+	folder_browser = FOLDER_BROWSER (object);
+		
+	CORBA_exception_init (&ev);
+	
+	if (folder_browser->seen_id != 0) {
+		g_source_remove (folder_browser->seen_id);
+		folder_browser->seen_id = 0;
+	}
+	
+	if (folder_browser->loading_id != 0) {
+		g_source_remove(folder_browser->loading_id);
+		folder_browser->loading_id = 0;
+	}
+	
+	if (folder_browser->message_list) {
+		gtk_widget_destroy (GTK_WIDGET (folder_browser->message_list));
+		folder_browser->message_list = NULL;
+	}
+	
+	if (folder_browser->mail_display) {
+		gtk_widget_destroy (GTK_WIDGET (folder_browser->mail_display));
+		folder_browser->mail_display = NULL;
+	}
+
+	if (folder_browser->view_instance) {
+		g_object_unref (folder_browser->view_instance);
+		folder_browser->view_instance = NULL;
+	}
+	
+	if (folder_browser->view_menus) {
+		g_object_unref (folder_browser->view_menus);
+		folder_browser->view_menus = NULL;
+	}
+	
+	/* wait for all outstanding async events against us */
+	if (folder_browser->async_event) {
+		mail_async_event_destroy (folder_browser->async_event);
+		folder_browser->async_event = NULL;
+	}
+	
+	if (folder_browser->search_full) {
+		g_object_unref (folder_browser->search_full);
+		folder_browser->search_full = NULL;
+	}
+	
+	if (folder_browser->sensitize_timeout_id) {
+		g_source_remove (folder_browser->sensitize_timeout_id);
+		folder_browser->sensitize_timeout_id = 0;
+	}
+	
+	if (folder_browser->shell_view != CORBA_OBJECT_NIL) {
+		CORBA_Object_release (folder_browser->shell_view, &ev);
+		folder_browser->shell_view = CORBA_OBJECT_NIL;
+	}
+	
+	if (folder_browser->uicomp) {
+		bonobo_object_unref (BONOBO_OBJECT (folder_browser->uicomp));
+		folder_browser->uicomp = NULL;
+	}
+	
+	if (folder_browser->invisible) {
+		g_object_unref (folder_browser->invisible);
+		folder_browser->invisible = NULL;
+	}
+		
+	if (folder_browser->get_id != -1) {
+		mail_msg_cancel (folder_browser->get_id);
+		folder_browser->get_id = -1;
+	}
+	
+	if (folder_browser->folder) {
+		camel_object_unhook_event (CAMEL_OBJECT (folder_browser->folder), "folder_changed",
+					   folder_changed, folder_browser);
+		camel_object_unhook_event (CAMEL_OBJECT (folder_browser->folder), "message_changed",
+					   folder_changed, folder_browser);
+		mail_sync_folder (folder_browser->folder, NULL, NULL);
+		camel_object_unref (folder_browser->folder);
+		folder_browser->folder = NULL;
+	}
+
+	CORBA_exception_free (&ev);
+	
+	GTK_OBJECT_CLASS (parent_class)->destroy (object);
+}
+
+static void
+folder_browser_class_init (FolderBrowserClass *klass)
+{
+	GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
+	GtkObjectClass *object_class = GTK_OBJECT_CLASS (klass);
+	
+	parent_class = g_type_class_ref(PARENT_TYPE);
+	
+	object_class->destroy = folder_browser_destroy;
+	gobject_class->finalize = folder_browser_finalise;
+	
+	folder_browser_signals[FOLDER_LOADED] =
+		g_signal_new ("folder_loaded",
+			      FOLDER_BROWSER_TYPE,
+			      G_SIGNAL_RUN_LAST,
+			      G_STRUCT_OFFSET (FolderBrowserClass, folder_loaded),
+			      NULL,
+			      NULL,
+			      g_cclosure_marshal_VOID__STRING,
+			      G_TYPE_NONE, 1, G_TYPE_STRING);
+	
+	folder_browser_signals[MESSAGE_LOADED] =
+		g_signal_new ("message_loaded",
+			      FOLDER_BROWSER_TYPE,
+			      G_SIGNAL_RUN_LAST,
+			      G_STRUCT_OFFSET (FolderBrowserClass, message_loaded),
+			      NULL,
+			      NULL,
+			      g_cclosure_marshal_VOID__STRING,
+			      G_TYPE_NONE, 1, G_TYPE_STRING);
+	
+	/* clipboard atom */
+	if (!clipboard_atom)
+		clipboard_atom = gdk_atom_intern ("CLIPBOARD", FALSE);
+	
+	if (!paste_types[0].target)
+		paste_types[0].target = gdk_atom_intern (X_EVOLUTION_MESSAGE_TYPE, FALSE);
+}
+
+static void
+add_uid (MessageList *ml, const char *uid, gpointer data)
+{
+	g_ptr_array_add ((GPtrArray *) data, g_strdup (uid));
+}
+
+static void
+message_list_drag_data_get (ETree *tree, int row, ETreePath path, int col,
+			    GdkDragContext *context, GtkSelectionData *selection_data,
+			    guint info, guint time, gpointer user_data)
+{
+	FolderBrowser *fb = FOLDER_BROWSER (user_data);
+	GPtrArray *uids = NULL;
+	int i;
+	
+	uids = g_ptr_array_new ();
+	message_list_foreach (fb->message_list, add_uid, uids);
+	if (uids->len == 0) {
+		g_ptr_array_free (uids, TRUE);
+		return;
+	}
+	
+	switch (info) {
+	case DND_TARGET_TYPE_TEXT_URI_LIST:
+	{
+		const char *filename, *tmpdir;
+		CamelMimeMessage *message;
+		CamelMimeFilter *filter;
+		CamelStream *fstream;
+		CamelStreamFilter *stream;
+		char *uri_list;
+		int fd;
+		
+		tmpdir = e_mkdtemp ("drag-n-drop-XXXXXX");
+		
+		if (!tmpdir) {
+			char *msg = g_strdup_printf (_("Could not create temporary "
+						       "directory: %s"),
+						     g_strerror (errno));
+			gnome_error_dialog (msg);
+			/* cleanup and abort */
+			for (i = 0; i < uids->len; i++)
+				g_free (uids->pdata[i]);
+			g_ptr_array_free (uids, TRUE);
+			g_free (msg);
+			return;
+		}
+		
+		message = camel_folder_get_message (fb->folder, uids->pdata[0], NULL);
+		g_free (uids->pdata[0]);
+		
+		if (uids->len == 1) {
+			filename = camel_mime_message_get_subject (message);
+			if (!filename)
+				filename = _("Unknown");
+		} else
+			filename = "mbox";
+		
+		uri_list = g_strdup_printf ("file://%s/%s", tmpdir, filename);
+		
+		fd = open (uri_list + 7, O_WRONLY | O_CREAT | O_EXCL, 0600);
+		if (fd == -1) {
+			/* cleanup and abort */
+			camel_object_unref (message);
+			for (i = 1; i < uids->len; i++)
+				g_free (uids->pdata[i]);
+			g_ptr_array_free (uids, TRUE);
+			g_free (uri_list);
+			return;
+		}
+		
+		fstream = camel_stream_fs_new_with_fd (fd);
+		
+		stream = camel_stream_filter_new_with_stream (fstream);
+		filter = camel_mime_filter_from_new ();
+		camel_stream_filter_add (stream, filter);
+		camel_object_unref (filter);
+		
+		camel_stream_write (fstream, "From - \n", 8);
+		camel_data_wrapper_write_to_stream (CAMEL_DATA_WRAPPER (message), CAMEL_STREAM (stream));
+		camel_object_unref (message);
+		camel_stream_flush (CAMEL_STREAM (stream));
+		
+		for (i = 1; i < uids->len; i++) {
+			message = camel_folder_get_message (fb->folder, uids->pdata[i], NULL);
+			camel_stream_write (fstream, "From - \n", 8);
+			camel_data_wrapper_write_to_stream (CAMEL_DATA_WRAPPER (message), CAMEL_STREAM (stream));
+			camel_object_unref (message);
+			camel_stream_flush (CAMEL_STREAM (stream));
+			g_free (uids->pdata[i]);
+		}
+		
+		g_ptr_array_free (uids, TRUE);
+		
+		camel_object_unref (stream);
+		camel_object_unref (fstream);
+		
+		gtk_selection_data_set (selection_data, selection_data->target, 8,
+					uri_list, strlen (uri_list));
+		g_free (uri_list);
+	}
+	break;
+	case DND_TARGET_TYPE_MESSAGE_RFC822:
+	{
+		CamelMimeFilter *filter;
+		CamelStream *stream;
+		CamelStream *mem;
+		
+		mem = camel_stream_mem_new ();
+		
+		stream = camel_stream_filter_new_with_stream (mem);
+		filter = camel_mime_filter_from_new ();
+		camel_stream_filter_add (CAMEL_STREAM_FILTER (stream), filter);
+		camel_object_unref (filter);
+		
+		for (i = 0; i < uids->len; i++) {
+			CamelMimeMessage *message;
+			
+			message = camel_folder_get_message (fb->folder, uids->pdata[i], NULL);
+			g_free (uids->pdata[i]);
+			
+			if (message) {			
+				camel_stream_write (mem, "From - \n", 8);
+				camel_data_wrapper_write_to_stream (CAMEL_DATA_WRAPPER (message), stream);
+				camel_object_unref (message);
+				camel_stream_flush (stream);
+			}
+		}
+		
+		g_ptr_array_free (uids, TRUE);
+		camel_object_unref (stream);
+		
+		gtk_selection_data_set (selection_data, selection_data->target, 8,
+					CAMEL_STREAM_MEM (mem)->buffer->data,
+					CAMEL_STREAM_MEM (mem)->buffer->len);
+		
+		camel_object_unref (mem);
+	}
+	break;
+	case DND_TARGET_TYPE_X_EVOLUTION_MESSAGE:
+	{
+		GByteArray *array;
+		
+		/* format: "uri\0uid1\0uid2\0uid3\0...\0uidn" */
+		
+		/* write the uri portion */
+		array = g_byte_array_new ();
+		g_byte_array_append (array, fb->uri, strlen (fb->uri));
+		g_byte_array_append (array, "", 1);
+		
+		/* write the uids */
+		for (i = 0; i < uids->len; i++) {
+			g_byte_array_append (array, uids->pdata[i], strlen (uids->pdata[i]));
+			g_free (uids->pdata[i]);
+			
+			if (i + 1 < uids->len)
+				g_byte_array_append (array, "", 1);
+		}
+		
+		g_ptr_array_free (uids, TRUE);
+		
+		gtk_selection_data_set (selection_data, selection_data->target, 8,
+					array->data, array->len);
+		
+		g_byte_array_free (array, TRUE);
+	}
+	break;
+	default:
+		for (i = 0; i < uids->len; i++)
+			g_free (uids->pdata[i]);
+		
+		g_ptr_array_free (uids, TRUE);
+		break;
+	}
+}
+
+static void
+message_rfc822_dnd (CamelFolder *dest, CamelStream *stream, CamelException *ex)
+{
+	CamelMimeParser *mp;
+	
+	mp = camel_mime_parser_new ();
+	camel_mime_parser_scan_from (mp, TRUE);
+	camel_mime_parser_init_with_stream (mp, stream);
+	
+	while (camel_mime_parser_step (mp, 0, 0) == HSCAN_FROM) {
+		CamelMessageInfo *info;
+		CamelMimeMessage *msg;
+		
+		msg = camel_mime_message_new ();
+		if (camel_mime_part_construct_from_parser (CAMEL_MIME_PART (msg), mp) == -1) {
+			camel_object_unref (CAMEL_OBJECT (msg));
+			break;
+		}
+		
+		/* append the message to the folder... */
+		info = g_new0 (CamelMessageInfo, 1);
+		camel_folder_append_message (dest, msg, info, NULL, ex);
+		camel_object_unref (CAMEL_OBJECT (msg));
+		
+		if (camel_exception_is_set (ex))
+			break;
+		
+		/* skip over the FROM_END state */
+		camel_mime_parser_step (mp, 0, 0);
+	}
+	
+	camel_object_unref (CAMEL_OBJECT (mp));
+}
+
+static void
+message_list_drag_data_received (ETree *tree, int row, ETreePath path, int col,
+				 GdkDragContext *context, gint x, gint y,
+				 GtkSelectionData *selection_data, guint info,
+				 guint time, gpointer user_data)
+{
+	FolderBrowser *fb = FOLDER_BROWSER (user_data);
+	CamelFolder *folder = NULL;
+	char *tmp, *url, **urls;
+	GPtrArray *uids = NULL;
+	CamelStream *stream;
+	CamelException ex;
+	CamelURL *uri;
+	int i, fd;
+	
+	/* this means we are receiving no data */
+	if (!selection_data->data || selection_data->length == -1)
+		return;
+	
+	camel_exception_init (&ex);
+	
+	switch (info) {
+	case DND_TARGET_TYPE_TEXT_URI_LIST:
+		tmp = g_strndup (selection_data->data, selection_data->length);
+		urls = g_strsplit (tmp, "\n", 0);
+		g_free (tmp);
+		
+		for (i = 0; urls[i] != NULL; i++) {
+			/* get the path component */
+			url = g_strstrip (urls[i]);
+			
+			uri = camel_url_new (url, NULL);
+			g_free (url);
+
+			if (!uri)
+				continue;
+
+			url = uri->path;
+			uri->path = NULL;
+			camel_url_free (uri);
+			
+			fd = open (url, O_RDONLY);
+			if (fd == -1) {
+				g_free (url);
+				/* FIXME: okay, what do we do in this case? */
+				continue;
+			}
+			
+			stream = camel_stream_fs_new_with_fd (fd);
+			message_rfc822_dnd (fb->folder, stream, &ex);
+			camel_object_unref (CAMEL_OBJECT (stream));
+			
+			if (context->action == GDK_ACTION_MOVE && !camel_exception_is_set (&ex))
+				unlink (url);
+			
+			g_free (url);
+		}
+		
+		g_free (urls);
+		break;
+	case DND_TARGET_TYPE_MESSAGE_RFC822:
+		/* write the message(s) out to a CamelStream so we can use it */
+		stream = camel_stream_mem_new ();
+		camel_stream_write (stream, selection_data->data, selection_data->length);
+		camel_stream_reset (stream);
+		
+		message_rfc822_dnd (fb->folder, stream, &ex);
+		camel_object_unref (CAMEL_OBJECT (stream));
+		break;
+	case DND_TARGET_TYPE_X_EVOLUTION_MESSAGE:
+		folder = mail_tools_x_evolution_message_parse (selection_data->data, selection_data->length, &uids);
+		if (folder == NULL)
+			goto fail;
+		
+		if (uids == NULL) {
+			camel_object_unref (CAMEL_OBJECT (folder));
+			goto fail;
+		}
+		
+		mail_transfer_messages (folder, uids, context->action == GDK_ACTION_MOVE,
+					fb->uri, 0, NULL, NULL);
+		
+		camel_object_unref (CAMEL_OBJECT (folder));
+		break;
+	}
+	
+	camel_exception_clear (&ex);
+	
+	gtk_drag_finish (context, TRUE, TRUE, GDK_CURRENT_TIME);
+	
+ fail:
+	camel_exception_clear (&ex);
+	
+	gtk_drag_finish (context, FALSE, TRUE, GDK_CURRENT_TIME);
+}
+
+static void
+selection_get (GtkWidget *widget, GtkSelectionData *selection_data,
+	       guint info, guint time_stamp, FolderBrowser *fb)
+{
+	if (fb->clipboard_selection == NULL)
+		return;
+	
+	switch (info) {
+	default:
+	case PASTE_TARGET_TYPE_TEXT_PLAIN:
+	{
+		/* FIXME: this'll be fucking slow for the user... pthread this? */
+		CamelFolder *source;
+		CamelStream *stream;
+		GByteArray *bytes;
+		GPtrArray *uids;
+		int i;
+		
+		bytes = fb->clipboard_selection;
+		
+		/* Note: source should == fb->folder, but we might as well use `source' instead of fb->folder */
+		source = mail_tools_x_evolution_message_parse (bytes->data, bytes->len, &uids);
+		if (source == NULL)
+			return;
+		
+		if (uids == NULL) {
+			camel_object_unref (CAMEL_OBJECT (source));
+			return;
+		}
+		
+		bytes = g_byte_array_new ();
+		stream = camel_stream_mem_new ();
+		camel_stream_mem_set_byte_array (CAMEL_STREAM_MEM (stream), bytes);
+		
+		for (i = 0; i < uids->len; i++) {
+			CamelMimeMessage *message;
+			
+			message = camel_folder_get_message (source, uids->pdata[i], NULL);
+			g_free (uids->pdata[i]);
+			
+			if (message) {
+				camel_stream_write (stream, "From - \n", 8);
+				camel_data_wrapper_write_to_stream (CAMEL_DATA_WRAPPER (message), stream);
+				camel_object_unref (CAMEL_OBJECT (message));
+			}
+		}
+		
+		g_ptr_array_free (uids, TRUE);
+		camel_object_unref (CAMEL_OBJECT (stream));
+		camel_object_unref (CAMEL_OBJECT (source));
+		
+		gtk_selection_data_set (selection_data, selection_data->target, 8,
+					bytes->data, bytes->len);
+		
+		g_byte_array_free (bytes, FALSE);
+	}
+	break;
+	case PASTE_TARGET_TYPE_X_EVOLUTION_MESSAGE:
+		/* we already have our data in the correct form */
+		gtk_selection_data_set (selection_data,
+					selection_data->target, 8,
+					fb->clipboard_selection->data,
+					fb->clipboard_selection->len);
+		break;
+	}
+}
+
+static void
+selection_clear_event (GtkWidget *widget, GdkEventSelection *event, FolderBrowser *fb)
+{
+	if (fb->clipboard_selection != NULL) {
+		g_byte_array_free (fb->clipboard_selection, TRUE);
+		fb->clipboard_selection = NULL;
+	}
+}
+
+static void
+selection_received (GtkWidget *widget, GtkSelectionData *selection_data,
+		    guint time, FolderBrowser *fb)
+{
+	CamelFolder *source = NULL;
+	GPtrArray *uids = NULL;
+	
+	if (selection_data == NULL || selection_data->length == -1)
+		return;
+	
+	source = mail_tools_x_evolution_message_parse (selection_data->data, selection_data->length, &uids);
+	if (source == NULL)
+		return;
+	
+	if (uids == NULL) {
+		camel_object_unref (CAMEL_OBJECT (source));
+		return;
+	}
+	
+	mail_transfer_messages (source, uids, FALSE, fb->uri, 0, NULL, NULL);
+	
+	camel_object_unref (CAMEL_OBJECT (source));
+}
+
+void
+folder_browser_copy (GtkWidget *menuitem, FolderBrowser *fb)
+{
+	GPtrArray *uids = NULL;
+	GByteArray *bytes;
+	gboolean cut;
+	int i;
+	
+	if (fb->message_list == NULL)
+		return;
+	
+	cut = menuitem == NULL;
+	
+	if (GTK_WIDGET_HAS_FOCUS (fb->mail_display->html)) {
+		gtk_html_copy (fb->mail_display->html);
+		return;
+	}
+	
+	if (fb->clipboard_selection) {
+		g_byte_array_free (fb->clipboard_selection, TRUE);
+		fb->clipboard_selection = NULL;
+	}
+	
+	uids = g_ptr_array_new ();
+	message_list_foreach (fb->message_list, add_uid, uids);
+	
+	/* format: "uri\0uid1\0uid2\0uid3\0...\0uidn" */
+	
+	/* write the uri portion */
+	bytes = g_byte_array_new ();
+	g_byte_array_append (bytes, fb->uri, strlen (fb->uri));
+	g_byte_array_append (bytes, "", 1);
+	
+	/* write the uids */
+	camel_folder_freeze (fb->folder);
+	for (i = 0; i < uids->len; i++) {
+		if (cut) {
+			camel_folder_set_message_flags (fb->folder, uids->pdata[i],
+							CAMEL_MESSAGE_SEEN | CAMEL_MESSAGE_DELETED,
+							CAMEL_MESSAGE_SEEN | CAMEL_MESSAGE_DELETED);
+		}
+		g_byte_array_append (bytes, uids->pdata[i], strlen (uids->pdata[i]));
+		g_free (uids->pdata[i]);
+		
+		if (i + 1 < uids->len)
+			g_byte_array_append (bytes, "", 1);
+	}
+	camel_folder_thaw (fb->folder);
+	
+	g_ptr_array_free (uids, TRUE);
+	
+	fb->clipboard_selection = bytes;
+	
+	gtk_selection_owner_set (fb->invisible, clipboard_atom, GDK_CURRENT_TIME);
+}
+
+void
+folder_browser_cut (GtkWidget *menuitem, FolderBrowser *fb)
+{
+	folder_browser_copy (NULL, fb);
+}
+
+void
+folder_browser_paste (GtkWidget *menuitem, FolderBrowser *fb)
+{
+	gtk_selection_convert (fb->invisible, clipboard_atom,
+			       paste_types[0].target,
+			       GDK_CURRENT_TIME);
+}
+
+/* all this crap so we can give the user a whoopee doo status bar */
+static void
+update_status_bar (FolderBrowser *fb)
+{
+	extern CamelFolder *outbox_folder, *sent_folder;
+	CORBA_Environment ev;
+	int tmp, total;
+	GString *work;
+	
+	if (fb->folder == NULL
+	    || fb->message_list == NULL
+	    || fb->shell_view == CORBA_OBJECT_NIL)
+		return;
+	
+	if (!fb->message_list->hidedeleted || !camel_folder_has_summary_capability (fb->folder)) {
+		total = camel_folder_get_message_count (fb->folder);
+	} else {
+		GPtrArray *sum = camel_folder_get_summary (fb->folder);
+		int i;
+		
+		if (sum) {
+			total = 0;
+			for (i = 0; i < sum->len; i++) {
+				CamelMessageInfo *info = sum->pdata[i];
+				
+				if ((info->flags & CAMEL_MESSAGE_DELETED) == 0)
+					total++;
+			}
+			camel_folder_free_summary (fb->folder, sum);
+		} else {
+			total = camel_folder_get_message_count (fb->folder);
+		}
+	}
+	
+	work = g_string_new ("");
+	g_string_append_printf (work, _("%d new"), camel_folder_get_unread_message_count (fb->folder));
+	tmp = message_list_hidden (fb->message_list);
+	if (0 < tmp && tmp < total) {
+		g_string_append (work, _(", "));
+		if (tmp < total / 2)
+			g_string_append_printf (work, _("%d hidden"), tmp);
+		else  
+			g_string_append_printf (work, _("%d visible"), total - tmp);
+	}
+	tmp = e_selection_model_selected_count (e_tree_get_selection_model (fb->message_list->tree));
+	if (tmp) {
+		g_string_append (work, _(", "));
+		g_string_append_printf (work, _("%d selected"), tmp);
+	}
+	g_string_append (work, _(", "));
+	
+	if (fb->folder == outbox_folder)
+		g_string_append_printf (work, _("%d unsent"), total);
+	else if (fb->folder == sent_folder)
+		g_string_append_printf (work, _("%d sent"), total);
+	else
+		g_string_append_printf (work, _("%d total"), total);
+	
+	CORBA_exception_init (&ev);
+	GNOME_Evolution_ShellView_setFolderBarLabel (fb->shell_view, work->str, &ev);
+	CORBA_exception_free (&ev);
+	
+	if (fb->update_status_bar_idle_id != 0) {
+		g_source_remove (fb->update_status_bar_idle_id);
+		fb->update_status_bar_idle_id = 0;
+	}
+	
+	g_string_free (work, TRUE);
+}
+
+static gboolean
+update_status_bar_idle_cb(gpointer data)
+{
+	FolderBrowser *fb = data;
+
+#if 0	
+	if (!GTK_OBJECT_DESTROYED (fb))
+#endif
+		update_status_bar (fb);
+	
+	fb->update_status_bar_idle_id = 0;
+	g_object_unref (fb);
+	
+	return FALSE;
+}
+
+static void
+update_status_bar_idle(FolderBrowser *fb)
+{
+	if (fb->update_status_bar_idle_id == 0) {
+		g_object_ref (fb);
+		fb->update_status_bar_idle_id = g_idle_add (update_status_bar_idle_cb, fb);
+	}
+}
+
+static void main_folder_changed(CamelObject *o, void *event_data, void *data)
+{
+	FolderBrowser *fb = data;
+	
+	if (fb->message_list == NULL)
+		return;
+	
+	/* so some corba unref doesnt blow us away while we're busy */
+	g_object_ref (fb);
+	update_status_bar (fb);
+	folder_browser_ui_scan_selection (fb);
+	g_object_unref (fb);
+}
+
+static void folder_changed (CamelObject *obj, void *event_data, void *user_data)
+{
+	FolderBrowser *fb = user_data;
+
+	mail_async_event_emit (fb->async_event, MAIL_ASYNC_GUI,
+			       (MailAsyncFunc) main_folder_changed,
+			       obj, NULL, user_data);
+}
+
+static void
+got_folder (char *uri, CamelFolder *folder, void *user_data)
+{
+	FolderBrowser *fb = user_data;
+	EMeta *meta;
+
+	fb->get_id = -1;
+	
+	d(printf ("got folder '%s' = %p, previous folder was %p\n", uri, folder, fb->folder));
+	
+	if (fb->message_list == NULL)
+		goto done;
+
+	if (fb->folder) {
+		camel_object_unhook_event (fb->folder, "folder_changed", folder_changed, fb);
+		camel_object_unhook_event (fb->folder, "message_changed", folder_changed, fb);
+		camel_object_unref (fb->folder);
+	}
+
+	if (folder) {
+		fb->folder = folder;
+		camel_object_ref (folder);
+		meta = mail_tool_get_meta_data(fb->uri);
+		if (meta != fb->meta) {
+			g_object_unref(fb->meta);
+			fb->meta = meta;
+		} else {
+			g_object_unref(meta);
+		}
+	} else {
+		fb->folder = NULL;
+		if (fb->meta) {
+			g_object_unref(fb->meta);
+			fb->meta = NULL;
+		}
+		goto done;
+	}
+
+	
+	gtk_widget_set_sensitive (GTK_WIDGET (fb->search), camel_folder_has_search_capability (folder));
+	message_list_set_folder (fb->message_list, folder,
+				 folder_browser_is_drafts (fb) ||
+				 folder_browser_is_sent (fb) ||
+				 folder_browser_is_outbox (fb));
+	
+	camel_object_hook_event (CAMEL_OBJECT (fb->folder), "folder_changed",
+				 folder_changed, fb);
+	camel_object_hook_event (CAMEL_OBJECT (fb->folder), "message_changed",
+				 folder_changed, fb);
+	
+	if (fb->view_instance != NULL && fb->view_menus != NULL)
+		folder_browser_ui_discard_view_menus (fb);
+	
+	folder_browser_ui_setup_view_menus (fb);
+	
+	/* when loading a new folder, nothing is selected initially */
+	
+	if (fb->uicomp)
+		folder_browser_ui_set_selection_state (fb, FB_SELSTATE_NONE);
+	
+ done:	
+	g_signal_emit (fb, folder_browser_signals[FOLDER_LOADED], 0, fb->uri);
+	g_object_unref (fb);
+}
+
+
+void
+folder_browser_reload (FolderBrowser *fb)
+{
+	g_return_if_fail (IS_FOLDER_BROWSER (fb));
+	
+	if (fb->folder) {
+		mail_refresh_folder (fb->folder, NULL, NULL);
+	} else if (fb->uri && fb->get_id == -1) {
+		g_object_ref (fb);
+		fb->get_id = mail_get_folder (fb->uri, 0, got_folder, fb, mail_thread_new);
+	}
+}
+
+void
+folder_browser_set_folder (FolderBrowser *fb, CamelFolder *folder, const char *uri)
+{
+	g_return_if_fail (IS_FOLDER_BROWSER (fb));
+	g_return_if_fail (CAMEL_IS_FOLDER (folder));
+	
+	if (fb->get_id != -1) {
+		/* FIXME: cancel the get_folder request? */
+	}
+	
+	g_free (fb->uri);
+	fb->uri = g_strdup (uri);
+	
+	g_object_ref (fb);
+	got_folder (NULL, folder, fb);
+}
+
+void
+folder_browser_set_ui_component (FolderBrowser *fb, BonoboUIComponent *uicomp)
+{
+	g_return_if_fail (IS_FOLDER_BROWSER (fb));
+	
+	if (fb->sensitize_timeout_id) {
+		g_source_remove (fb->sensitize_timeout_id);
+		fb->sensitize_timeout_id = 0;
+	}
+	
+	if (fb->sensitise_state) {
+		g_hash_table_destroy (fb->sensitise_state);
+		fb->sensitise_state = NULL;
+	}
+	
+	if (fb->uicomp)
+		bonobo_object_unref (BONOBO_OBJECT (fb->uicomp));
+	
+	if (uicomp)
+		bonobo_object_ref (BONOBO_OBJECT (uicomp));
+	
+	fb->uicomp = uicomp;
+}
+
+void
+folder_browser_set_shell_view(FolderBrowser *fb, GNOME_Evolution_ShellView shell_view)
+{
+	CORBA_Environment ev;
+	
+	CORBA_exception_init(&ev);
+	if (fb->shell_view != CORBA_OBJECT_NIL)
+		CORBA_Object_release (fb->shell_view, &ev);
+	CORBA_exception_free (&ev);
+	
+	fb->shell_view = CORBA_Object_duplicate (shell_view, &ev);
+	CORBA_exception_free (&ev);
+	
+	/* small hack, at this point we've just been activated */
+	if (fb->shell_view != CORBA_OBJECT_NIL)
+		update_status_bar (fb);
+}
+
+extern CamelFolder *drafts_folder, *sent_folder, *outbox_folder;
+
+/**
+ * folder_browser_is_drafts:
+ * @fb: a FolderBrowser
+ *
+ * Return value: %TRUE if @fb refers to /local/Drafts or any other
+ * configured Drafts folder.
+ **/
+gboolean
+folder_browser_is_drafts (FolderBrowser *fb)
+{
+	gboolean is_drafts = FALSE;
+	EAccountList *accounts;
+	EAccount *account;
+	EIterator *iter;
+	
+	g_return_val_if_fail (IS_FOLDER_BROWSER (fb), FALSE);
+	
+	if (fb->uri == NULL || fb->folder == NULL)
+		return FALSE;
+	
+	if (fb->folder == drafts_folder)
+		return TRUE;
+	
+	accounts = mail_config_get_accounts ();
+	iter = e_list_get_iterator ((EList *) accounts);
+	while (e_iterator_is_valid (iter)) {
+		account = (EAccount *) e_iterator_get (iter);
+		if (account->drafts_folder_uri &&
+		    camel_store_uri_cmp (fb->folder->parent_store, account->drafts_folder_uri, fb->uri)) {
+			is_drafts = TRUE;
+			break;
+		}
+		
+		e_iterator_next (iter);
+	}
+	
+	g_object_unref (iter);
+	
+	return is_drafts;
+}
+
+/**
+ * folder_browser_is_sent:
+ * @fb: a FolderBrowser
+ *
+ * Return value: %TRUE if @fb refers to /local/Sent or any other
+ * configured Sent folder.
+ **/
+gboolean
+folder_browser_is_sent (FolderBrowser *fb)
+{
+	gboolean is_sent = FALSE;
+	EAccountList *accounts;
+	EAccount *account;
+	EIterator *iter;
+	
+	g_return_val_if_fail (IS_FOLDER_BROWSER (fb), FALSE);
+	
+	if (fb->uri == NULL || fb->folder == NULL)
+		return FALSE;
+	
+	if (fb->folder == sent_folder)
+		return TRUE;
+	
+	accounts = mail_config_get_accounts ();
+	iter = e_list_get_iterator ((EList *) accounts);
+	while (e_iterator_is_valid (iter)) {
+		account = (EAccount *) e_iterator_get (iter);
+		if (account->sent_folder_uri &&
+		    camel_store_uri_cmp (fb->folder->parent_store, account->sent_folder_uri, fb->uri)) {
+			is_sent = TRUE;
+			break;
+		}
+		
+		e_iterator_next (iter);
+	}
+	
+	g_object_unref (iter);
+	
+	return is_sent;
+}
+
+/**
+ * folder_browser_is_outbox:
+ * @fb: a FolderBrowser
+ *
+ * Return value: %TRUE if @fb refers to /local/Outbox or any other
+ * configured Outbox folder.
+ **/
+gboolean
+folder_browser_is_outbox (FolderBrowser *fb)
+{
+	/* There can be only one. */
+	return fb->folder == outbox_folder;
+}
+
+static int
+save_cursor_pos (FolderBrowser *fb)
+{
+	ETreePath node;
+	GtkAdjustment *adj;
+	int row, y, height, paned_size;
+	GConfClient *gconf;
+	
+	node = e_tree_get_cursor (fb->message_list->tree);
+	if (!node)
+		return -1;
+	
+	row = e_tree_row_of_node (fb->message_list->tree, node);
+	
+	if (row == -1)
+		return 0;
+	
+	e_tree_get_cell_geometry (fb->message_list->tree, row, 0,
+				  NULL, &y, NULL, &height);
+	
+	gconf = mail_config_get_gconf_client ();
+	paned_size = gconf_client_get_int (gconf, "/apps/evolution/mail/display/paned_size", NULL);
+	
+	adj = gtk_scrolled_window_get_vadjustment (GTK_SCROLLED_WINDOW (fb->message_list));
+	y += adj->value - ((paned_size - height) / 2);
+	
+	return y;
+}
+
+static void
+set_cursor_pos (FolderBrowser *fb, int y)
+{
+	GtkAdjustment *adj;
+	
+	if (y == -1)
+		return;
+	
+	adj = gtk_scrolled_window_get_vadjustment (GTK_SCROLLED_WINDOW (fb->message_list));
+	gtk_adjustment_set_value (adj, (gfloat)y);
+}
+
+static gboolean do_message_selected(FolderBrowser *fb);
+
+void
+folder_browser_set_message_preview (FolderBrowser *folder_browser, gboolean show_preview)
+{
+	GConfClient *gconf;
+	int paned_size, y;
+	
+	if (folder_browser->preview_shown == show_preview
+	    || folder_browser->message_list == NULL)
+		return;
+	
+	folder_browser->preview_shown = show_preview;
+	
+	gconf = mail_config_get_gconf_client ();
+	paned_size = gconf_client_get_int (gconf, "/apps/evolution/mail/display/paned_size", NULL);
+
+	if (show_preview) {
+		y = save_cursor_pos (folder_browser);
+		gtk_paned_set_position (GTK_PANED (folder_browser->vpaned), paned_size);
+		gtk_widget_show (GTK_WIDGET (folder_browser->mail_display));
+		do_message_selected (folder_browser);
+		set_cursor_pos (folder_browser, y);
+	} else {
+		gtk_widget_hide (GTK_WIDGET (folder_browser->mail_display));
+		mail_display_set_message (folder_browser->mail_display, NULL, NULL, NULL);
+		folder_browser_ui_message_loaded (folder_browser);
+	}
+}
+
+enum {
+	ESB_SAVE,
+};
+
+static ESearchBarItem folder_browser_search_menu_items[] = {
+	E_FILTERBAR_ADVANCED,
+	{ NULL, 0, NULL },
+	E_FILTERBAR_SAVE,
+	E_FILTERBAR_EDIT,
+	{ NULL, 0, NULL },
+	{ N_("Create _Virtual Folder From Search..."), ESB_SAVE, NULL  },
+	{ NULL, -1, NULL }
+};
+
+static void
+folder_browser_search_menu_activated (ESearchBar *esb, int id, FolderBrowser *fb)
+{
+	EFilterBar *efb = (EFilterBar *)esb;
+	
+	d(printf("menu activated\n"));
+	
+	switch (id) {
+	case ESB_SAVE:
+		d(printf("Save vfolder\n"));
+		if (efb->current_query) {
+			FilterRule *rule = vfolder_clone_rule(efb->current_query);			
+			char *name, *text;
+			
+			text = e_search_bar_get_text(esb);
+			name = g_strdup_printf("%s %s", rule->name, (text&&text[0])?text:"''");
+			g_free (text);
+			filter_rule_set_name(rule, name);
+			g_free (name);
+			
+			filter_rule_set_source(rule, FILTER_SOURCE_INCOMING);
+			vfolder_rule_add_source((VfolderRule *)rule, fb->uri);
+			vfolder_gui_add_rule((VfolderRule *)rule);
+		}
+		break;
+	}
+}
+
+static void
+folder_browser_config_search (EFilterBar *efb, FilterRule *rule, int id, const char *query, void *data)
+{
+	FolderBrowser *fb = FOLDER_BROWSER (data);
+	ESearchingTokenizer *st;
+	GList *partl;
+	struct _camel_search_words *words;
+	int i;
+	
+	st = E_SEARCHING_TOKENIZER (fb->mail_display->html->engine->ht); 
+	
+	e_searching_tokenizer_set_secondary_search_string (st, NULL);
+	
+	/* we scan the parts of a rule, and set all the types we know about to the query string */
+	partl = rule->parts;
+	while (partl) {
+		FilterPart *part = partl->data;
+		
+		if (!strcmp(part->name, "subject")) {
+			FilterInput *input = (FilterInput *)filter_part_find_element(part, "subject");
+			if (input)
+				filter_input_set_value(input, query);
+		} else if (!strcmp(part->name, "body")) {
+			FilterInput *input = (FilterInput *)filter_part_find_element(part, "word");
+			if (input)
+				filter_input_set_value(input, query);
+			
+			words = camel_search_words_split(query);
+			for (i=0;i<words->len;i++)
+				e_searching_tokenizer_add_secondary_search_string (st, words->words[i]->word);
+			camel_search_words_free (words);
+		} else if(!strcmp(part->name, "sender")) {
+			FilterInput *input = (FilterInput *)filter_part_find_element(part, "sender");
+			if (input)
+				filter_input_set_value(input, query);
+		} else if(!strcmp(part->name, "to")) {
+			FilterInput *input = (FilterInput *)filter_part_find_element(part, "recipient");
+			if (input)
+				filter_input_set_value(input, query);
+		}
+		
+		partl = partl->next;
+	}
+	
+	d(printf("configuring search for search string '%s', rule is '%s'\n", query, rule->name));
+	
+	mail_display_redisplay (fb->mail_display, FALSE);
+}
+
+static void
+folder_browser_search_do_search (ESearchBar *esb, FolderBrowser *fb)
+{
+	char *search_word;
+	
+	if (fb->message_list == NULL)
+		return;
+	
+	d(printf("do search\n"));
+	
+	g_object_get (esb, "query", &search_word, NULL);
+	
+	message_list_set_search (fb->message_list, search_word);
+	
+	d(printf("query is %s\n", search_word));
+	g_free (search_word);
+}
+
+static void
+folder_browser_query_changed (ESearchBar *esb, FolderBrowser *fb)
+{
+	int id;
+	
+	id = e_search_bar_get_item_id (esb);
+	if (id == E_FILTERBAR_ADVANCED_ID)
+		folder_browser_search_do_search (esb, fb);
+}
+
+void
+folder_browser_toggle_preview (BonoboUIComponent           *component,
+			       const char                  *path,
+			       Bonobo_UIComponent_EventType type,
+			       const char                  *state,
+			       gpointer                     user_data)
+{
+	FolderBrowser *fb = user_data;
+	gboolean bstate;
+	GConfClient *gconf;
+
+	if (type != Bonobo_UIComponent_STATE_CHANGED || fb->message_list == NULL)
+		return;
+	
+	bstate = atoi(state);
+	e_meta_set_bool(fb->meta, "show_preview", bstate);
+	
+	gconf = mail_config_get_gconf_client ();
+	gconf_client_set_bool (gconf, "/apps/evolution/mail/display/show_preview", bstate, NULL);
+	
+	folder_browser_set_message_preview (fb, bstate);
+}
+
+void
+folder_browser_toggle_threads (BonoboUIComponent           *component,
+			       const char                  *path,
+			       Bonobo_UIComponent_EventType type,
+			       const char                  *state,
+			       gpointer                     user_data)
+{
+	FolderBrowser *fb = user_data;
+	int prev_state;
+	gboolean bstate;
+	GConfClient *gconf;
+	
+	if (type != Bonobo_UIComponent_STATE_CHANGED || fb->message_list == NULL)
+		return;
+
+	bstate = atoi(state);
+	e_meta_set_bool(fb->meta, "thread_list", bstate);
+	
+	gconf = mail_config_get_gconf_client ();
+	gconf_client_set_bool (gconf, "/apps/evolution/mail/display/thread_list", bstate, NULL);
+	
+	message_list_set_threaded (fb->message_list, bstate);
+	
+	prev_state = fb->selection_state;
+	fb->selection_state = FB_SELSTATE_UNDEFINED;
+	folder_browser_ui_set_selection_state (fb, prev_state);
+}
+
+void
+folder_browser_toggle_hide_deleted (BonoboUIComponent           *component,
+				    const char                  *path,
+				    Bonobo_UIComponent_EventType type,
+				    const char                  *state,
+				    gpointer                     user_data)
+{
+	FolderBrowser *fb = user_data;
+	GConfClient *gconf;
+	
+	if (type != Bonobo_UIComponent_STATE_CHANGED || fb->message_list == NULL)
+		return;
+	
+	gconf = mail_config_get_gconf_client ();
+	gconf_client_set_bool (gconf, "/apps/evolution/mail/display/show_deleted",
+			       !atoi (state), NULL);
+	
+	if (!(fb->folder && (fb->folder->folder_flags & CAMEL_FOLDER_IS_TRASH)))
+		message_list_set_hidedeleted (fb->message_list, atoi (state));
+}
+
+void
+folder_browser_toggle_caret_mode(BonoboUIComponent	*component,
+				   const char		* path,
+				   Bonobo_UIComponent_EventType type,
+				   const char		* state,
+				   gpointer		user_data)
+{
+	GConfClient *gconf;
+	
+        if (type != Bonobo_UIComponent_STATE_CHANGED)
+		return;
+
+	gconf = mail_config_get_gconf_client ();
+	gconf_client_set_bool (gconf, "/apps/evolution/mail/display/caret_mode",
+			       atoi(state), NULL);
+}
+
+void
+folder_browser_set_message_display_style (BonoboUIComponent           *component,
+					  const char                  *path,
+					  Bonobo_UIComponent_EventType type,
+					  const char                  *state,
+					  gpointer                     user_data)
+{
+	extern char *message_display_styles[];
+	FolderBrowser *fb = user_data;
+	GConfClient *gconf;
+	int i;
+	
+	if (type != Bonobo_UIComponent_STATE_CHANGED
+	    || atoi (state) == 0
+	    || fb->message_list == NULL)
+		return;
+	
+	gconf = mail_config_get_gconf_client ();
+	
+	for (i = 0; i < MAIL_CONFIG_DISPLAY_MAX; i++) {
+		if (strstr (message_display_styles[i], path)) {
+			fb->mail_display->display_style = i;
+			mail_display_redisplay (fb->mail_display, TRUE);
+			
+			if (fb->pref_master)
+				gconf_client_set_int (gconf, "/apps/evolution/mail/display/message_style", i, NULL);
+			
+			return;
+		}
+	}
+}
+
+void
+folder_browser_charset_changed (BonoboUIComponent           *component,
+				const char                  *path,
+				Bonobo_UIComponent_EventType type,
+				const char                  *state,
+				gpointer                     user_data)
+{
+	FolderBrowser *fb = FOLDER_BROWSER (user_data);
+	const char *charset;
+	
+	if (type != Bonobo_UIComponent_STATE_CHANGED
+	    || fb->message_list == NULL)
+		return;
+	
+	if (atoi (state)) {
+		/* Charset menu names are "Charset-%s" where %s is the charset name */
+		charset = path + strlen ("Charset-");
+		if (!strcmp (charset, FB_DEFAULT_CHARSET))
+			charset = NULL;
+		
+		mail_display_set_charset (fb->mail_display, charset);
+	}
+}
+
+static void vfolder_type_uid(CamelFolder *folder, const char *uid, const char *uri, int type);
+
+static void
+vfolder_type_current(FolderBrowser *fb, int type)
+{
+	GPtrArray *uids;
+	int i;
+	
+	/* get uid */
+	uids = g_ptr_array_new ();
+	message_list_foreach (fb->message_list, enumerate_msg, uids);
+	
+	if (uids->len == 1)
+		vfolder_type_uid (fb->folder, (char *)uids->pdata[0], fb->uri, type);
+	
+	for (i = 0; i < uids->len; i++)
+		g_free (uids->pdata[i]);
+	g_ptr_array_free (uids, TRUE);
+}
+
+/* external api to vfolder/filter on X, based on current message */
+void vfolder_subject (GtkWidget *w, FolderBrowser *fb) { vfolder_type_current(fb, AUTO_SUBJECT); }
+void vfolder_sender (GtkWidget *w, FolderBrowser *fb) { vfolder_type_current(fb, AUTO_FROM); }
+void vfolder_recipient (GtkWidget *w, FolderBrowser *fb) { vfolder_type_current(fb, AUTO_TO); }
+void vfolder_mlist (GtkWidget *w, FolderBrowser *fb) { vfolder_type_current(fb, AUTO_MLIST); }
+
+static void filter_type_uid (CamelFolder *folder, const char *uid, const char *source, int type);
+
+static void
+filter_type_current (FolderBrowser *fb, int type)
+{
+	GPtrArray *uids;
+	int i;
+	const char *source;
+	
+	if (folder_browser_is_sent (fb) || folder_browser_is_outbox (fb))
+		source = FILTER_SOURCE_OUTGOING;
+	else
+		source = FILTER_SOURCE_INCOMING;
+	
+	/* get uid */
+	uids = g_ptr_array_new ();
+	message_list_foreach (fb->message_list, enumerate_msg, uids);
+	
+	if (uids->len == 1)
+		filter_type_uid (fb->folder, (char *)uids->pdata[0], source, type);
+	
+	for (i = 0; i < uids->len; i++)
+		g_free (uids->pdata[i]);
+	g_ptr_array_free (uids, TRUE);
+}
+
+void filter_subject (GtkWidget *w, FolderBrowser *fb) { filter_type_current (fb, AUTO_SUBJECT); }
+void filter_sender (GtkWidget *w, FolderBrowser *fb) { filter_type_current (fb, AUTO_FROM); }
+void filter_recipient (GtkWidget *w, FolderBrowser *fb) { filter_type_current (fb, AUTO_TO); }
+void filter_mlist (GtkWidget *w, FolderBrowser *fb) { filter_type_current (fb, AUTO_MLIST); }
+
+/* ************************************************************ */
+
+/* popup api to vfolder/filter on X, based on current selection */
+struct _filter_data {
+	CamelFolder *folder;
+	const char *source;
+	char *uid;
+	int type;
+	char *uri;
+	char *mlist;
+};
+
+static void
+filter_data_free (struct _filter_data *fdata)
+{
+	g_free (fdata->uid);
+	g_free (fdata->uri);
+	if (fdata->folder)
+		camel_object_unref (fdata->folder);
+	g_free (fdata->mlist);
+	g_free (fdata);
+}
+
+static void
+vfolder_type_got_message(CamelFolder *folder, const char *uid, CamelMimeMessage *msg, void *d)
+{
+	struct _filter_data *data = d;
+	
+	if (msg)
+		vfolder_gui_add_from_message(msg, data->type, data->uri);
+	
+	filter_data_free (data);
+}
+
+static void
+vfolder_type_uid(CamelFolder *folder, const char *uid, const char *uri, int type)
+{
+	struct _filter_data *data;
+	
+	data = g_malloc0(sizeof(*data));
+	data->type = type;
+	data->uri = g_strdup(uri);
+	mail_get_message(folder, uid, vfolder_type_got_message, data, mail_thread_new);
+}
+
+static void vfolder_subject_uid (GtkWidget *w, struct _filter_data *fdata)	{ vfolder_type_uid(fdata->folder, fdata->uid, fdata->uri, AUTO_SUBJECT); }
+static void vfolder_sender_uid(GtkWidget *w, struct _filter_data *fdata)	{ vfolder_type_uid(fdata->folder, fdata->uid, fdata->uri, AUTO_FROM); }
+static void vfolder_recipient_uid(GtkWidget *w, struct _filter_data *fdata)	{ vfolder_type_uid(fdata->folder, fdata->uid, fdata->uri, AUTO_TO); }
+static void vfolder_mlist_uid(GtkWidget *w, struct _filter_data *fdata)		{ vfolder_type_uid(fdata->folder, fdata->uid, fdata->uri, AUTO_MLIST); }
+
+static void
+filter_type_got_message(CamelFolder *folder, const char *uid, CamelMimeMessage *msg, void *d)
+{
+	struct _filter_data *data = d;
+	
+	if (msg)
+		filter_gui_add_from_message(msg, data->source, data->type);
+	
+	filter_data_free (data);
+}
+
+static void
+filter_type_uid(CamelFolder *folder, const char *uid, const char *source, int type)
+{
+	struct _filter_data *data;
+	
+	data = g_malloc0(sizeof(*data));
+	data->type = type;
+	data->source = source;
+	mail_get_message(folder, uid, filter_type_got_message, data, mail_thread_new);
+}
+
+static void filter_subject_uid (GtkWidget *w, struct _filter_data *fdata)	{ filter_type_uid(fdata->folder, fdata->uid, fdata->source, AUTO_SUBJECT); }
+static void filter_sender_uid(GtkWidget *w, struct _filter_data *fdata)		{ filter_type_uid(fdata->folder, fdata->uid, fdata->source, AUTO_FROM); }
+static void filter_recipient_uid(GtkWidget *w, struct _filter_data *fdata)	{ filter_type_uid(fdata->folder, fdata->uid, fdata->source, AUTO_TO); }
+static void filter_mlist_uid(GtkWidget *w, struct _filter_data *fdata)		{ filter_type_uid(fdata->folder, fdata->uid, fdata->source, AUTO_MLIST); }
+
+void
+hide_none(GtkWidget *w, FolderBrowser *fb)
+{
+	message_list_hide_clear (fb->message_list);
+}
+
+void
+hide_selected(GtkWidget *w, FolderBrowser *fb)
+{
+	GPtrArray *uids;
+	int i;
+
+	uids = g_ptr_array_new ();
+	message_list_foreach (fb->message_list, enumerate_msg, uids);
+	message_list_hide_uids (fb->message_list, uids);
+	for (i = 0; i < uids->len; i++)
+		g_free (uids->pdata[i]);
+	g_ptr_array_free (uids, TRUE);
+}
+
+void
+hide_deleted(GtkWidget *w, FolderBrowser *fb)
+{
+	MessageList *ml = fb->message_list;
+	
+	message_list_hide_add(ml, "(match-all (system-flag \"deleted\"))", ML_HIDE_SAME, ML_HIDE_SAME);
+}
+
+void
+hide_read(GtkWidget *w, FolderBrowser *fb)
+{
+	MessageList *ml = fb->message_list;
+	
+	message_list_hide_add(ml, "(match-all (system-flag \"seen\"))", ML_HIDE_SAME, ML_HIDE_SAME);
+}
+
+/* dum de dum, about the 3rd copy of this function throughout the mailer/camel */
+static const char *
+strip_re(const char *subject)
+{
+	const unsigned char *s, *p;
+	
+	s = (unsigned char *) subject;
+	
+	while (*s) {
+		while(isspace (*s))
+			s++;
+		if (s[0] == 0)
+			break;
+		if ((s[0] == 'r' || s[0] == 'R')
+		    && (s[1] == 'e' || s[1] == 'E')) {
+			p = s+2;
+			while (isdigit(*p) || (ispunct(*p) && (*p != ':')))
+				p++;
+			if (*p == ':') {
+				s = p + 1;
+			} else
+				break;
+		} else
+			break;
+	}
+	return (char *) s;
+}
+
+void
+hide_subject(GtkWidget *w, FolderBrowser *fb)
+{
+	const char *subject;
+	GString *expr;
+	
+	if (fb->mail_display->current_message) {
+		subject = camel_mime_message_get_subject(fb->mail_display->current_message);
+		if (subject) {
+			subject = strip_re(subject);
+			if (subject && subject[0]) {
+				expr = g_string_new ("(match-all (header-contains \"subject\" ");
+				e_sexp_encode_string (expr, subject);
+				g_string_append (expr, "))");
+				message_list_hide_add (fb->message_list, expr->str, ML_HIDE_SAME, ML_HIDE_SAME);
+				g_string_free (expr, TRUE);
+				return;
+			}
+		}
+	}
+}
+
+void
+hide_sender (GtkWidget *w, FolderBrowser *fb)
+{
+	const CamelInternetAddress *from;
+	const char *real, *addr;
+	GString *expr;
+	
+	if (fb->mail_display->current_message) {
+		from = camel_mime_message_get_from (fb->mail_display->current_message);
+		if (camel_internet_address_get (from, 0, &real, &addr)) {
+			expr = g_string_new ("(match-all (header-contains \"from\" ");
+			e_sexp_encode_string (expr, addr);
+			g_string_append (expr, "))");
+			message_list_hide_add (fb->message_list, expr->str, ML_HIDE_SAME, ML_HIDE_SAME);
+			g_string_free (expr, TRUE);
+			return;
+		}
+	}
+}
+
+struct _label_data {
+	FolderBrowser *fb;
+	const char *label;
+};
+
+static void
+set_msg_label (GtkWidget *widget, gpointer user_data)
+{
+	struct _label_data *data = user_data;
+	GPtrArray *uids;
+	int i;
+	
+	uids = g_ptr_array_new ();
+	message_list_foreach (data->fb->message_list, enumerate_msg, uids);
+	for (i = 0; i < uids->len; i++)
+		camel_folder_set_message_user_tag (data->fb->folder, uids->pdata[i], "label", data->label);
+	g_ptr_array_free (uids, TRUE);
+}
+
+static void
+label_closures_free (GPtrArray *closures)
+{
+	struct _label_data *data;
+	int i;
+	
+	for (i = 0; i < closures->len; i++) {
+		data = closures->pdata[i];
+		g_object_unref (data->fb);
+		g_free (data);
+	}
+	g_ptr_array_free (closures, TRUE);
+}
+
+static void
+mark_as_seen_cb (GtkWidget *widget, void *user_data)
+{
+	mark_as_seen (NULL, user_data, NULL);
+}
+
+static void
+mark_as_unseen_cb (GtkWidget *widget, void *user_data)
+{
+	mark_as_unseen (NULL, user_data, NULL);
+}
+
+static void
+mark_as_important_cb (GtkWidget *widget, void *user_data)
+{
+	mark_as_important (NULL, user_data, NULL);
+}
+
+static void
+mark_as_unimportant_cb (GtkWidget *widget, void *user_data)
+{
+	mark_as_unimportant (NULL, user_data, NULL);
+}
+
+enum {
+	SELECTION_SET              = 1<<1,
+	CAN_MARK_READ              = 1<<2,
+	CAN_MARK_UNREAD            = 1<<3,
+	CAN_DELETE                 = 1<<4,
+	CAN_UNDELETE               = 1<<5,
+	IS_MAILING_LIST            = 1<<6,
+	CAN_RESEND                 = 1<<7,
+	CAN_MARK_IMPORTANT         = 1<<8,
+	CAN_MARK_UNIMPORTANT       = 1<<9,
+	CAN_FLAG_FOR_FOLLOWUP      = 1<<10,
+	CAN_FLAG_COMPLETED         = 1<<11,
+	CAN_CLEAR_FLAG             = 1<<12,
+	CAN_ADD_SENDER             = 1<<13
+};
+
+#define MLIST_VFOLDER (3)
+#define MLIST_FILTER (8)
+
+static EPopupMenu filter_menu[] = {
+	E_POPUP_ITEM_CC (N_("VFolder on _Subject"),        G_CALLBACK (vfolder_subject_uid),   NULL, SELECTION_SET),
+	E_POPUP_ITEM_CC (N_("VFolder on Se_nder"),         G_CALLBACK (vfolder_sender_uid),    NULL, SELECTION_SET),
+	E_POPUP_ITEM_CC (N_("VFolder on _Recipients"),     G_CALLBACK (vfolder_recipient_uid), NULL, SELECTION_SET),
+	E_POPUP_ITEM_CC (N_("VFolder on Mailing _List"),   G_CALLBACK (vfolder_mlist_uid),     NULL, SELECTION_SET | IS_MAILING_LIST),
+	
+	E_POPUP_SEPARATOR,
+	
+	E_POPUP_ITEM_CC (N_("Filter on Sub_ject"),         G_CALLBACK (filter_subject_uid),    NULL, SELECTION_SET),
+	E_POPUP_ITEM_CC (N_("Filter on Sen_der"),          G_CALLBACK (filter_sender_uid),     NULL, SELECTION_SET),
+	E_POPUP_ITEM_CC (N_("Filter on Re_cipients"),      G_CALLBACK (filter_recipient_uid),  NULL, SELECTION_SET),
+	E_POPUP_ITEM_CC (N_("Filter on _Mailing List"),    G_CALLBACK (filter_mlist_uid),      NULL, SELECTION_SET | IS_MAILING_LIST),
+	
+	E_POPUP_TERMINATOR
+};
+
+static EPopupMenu label_menu[] = {
+	E_POPUP_PIXMAP_WIDGET_ITEM_CC (N_("None"), NULL, G_CALLBACK (set_msg_label), NULL, 0),
+	E_POPUP_SEPARATOR,
+	E_POPUP_PIXMAP_WIDGET_ITEM_CC (NULL, NULL, G_CALLBACK (set_msg_label), NULL, 0),
+	E_POPUP_PIXMAP_WIDGET_ITEM_CC (NULL, NULL, G_CALLBACK (set_msg_label), NULL, 0),
+	E_POPUP_PIXMAP_WIDGET_ITEM_CC (NULL, NULL, G_CALLBACK (set_msg_label), NULL, 0),
+	E_POPUP_PIXMAP_WIDGET_ITEM_CC (NULL, NULL, G_CALLBACK (set_msg_label), NULL, 0),
+	E_POPUP_PIXMAP_WIDGET_ITEM_CC (NULL, NULL, G_CALLBACK (set_msg_label), NULL, 0),
+	E_POPUP_TERMINATOR
+};
+
+static EPopupMenu context_menu[] = {
+	E_POPUP_ITEM (N_("_Open"),                    G_CALLBACK (open_msg),          0),
+	E_POPUP_ITEM (N_("_Edit as New Message..."),  G_CALLBACK (resend_msg),        CAN_RESEND),
+	E_POPUP_ITEM (N_("_Save As..."),              G_CALLBACK (save_msg),          0),
+	E_POPUP_ITEM (N_("_Print"),                   G_CALLBACK (print_msg),         0),
+	
+	E_POPUP_SEPARATOR,
+	
+	E_POPUP_ITEM (N_("_Reply to Sender"),         G_CALLBACK (reply_to_sender),   0),
+	E_POPUP_ITEM (N_("Reply to _List"),           G_CALLBACK (reply_to_list),     0),
+	E_POPUP_ITEM (N_("Reply to _All"),            G_CALLBACK (reply_to_all),      0),
+	E_POPUP_ITEM (N_("_Forward"),                 G_CALLBACK (forward),           0),
+	
+	E_POPUP_SEPARATOR,
+	
+	E_POPUP_ITEM (N_("Follo_w Up..."),            G_CALLBACK (flag_for_followup),       CAN_FLAG_FOR_FOLLOWUP),
+	E_POPUP_ITEM (N_("Fla_g Completed"),          G_CALLBACK (flag_followup_completed), CAN_FLAG_COMPLETED),
+	E_POPUP_ITEM (N_("Cl_ear Flag"),              G_CALLBACK (flag_followup_clear),     CAN_CLEAR_FLAG),
+	
+	/* separator here? */
+	
+	E_POPUP_ITEM (N_("Mar_k as Read"),            G_CALLBACK (mark_as_seen_cb),        CAN_MARK_READ),
+	E_POPUP_ITEM (N_("Mark as _Unread"),          G_CALLBACK (mark_as_unseen_cb),      CAN_MARK_UNREAD),
+	E_POPUP_ITEM (N_("Mark as _Important"),       G_CALLBACK (mark_as_important_cb),   CAN_MARK_IMPORTANT),
+	E_POPUP_ITEM (N_("_Mark as Unimportant"),     G_CALLBACK (mark_as_unimportant_cb), CAN_MARK_UNIMPORTANT),
+	
+	E_POPUP_SEPARATOR,
+	
+	E_POPUP_ITEM (N_("_Delete"),                  G_CALLBACK (delete_msg),          CAN_DELETE),
+	E_POPUP_ITEM (N_("U_ndelete"),                G_CALLBACK (undelete_msg),        CAN_UNDELETE),
+	
+	E_POPUP_SEPARATOR,
+	
+	E_POPUP_ITEM (N_("Mo_ve to Folder..."),       G_CALLBACK (move_msg_cb),          0),
+	E_POPUP_ITEM (N_("_Copy to Folder..."),       G_CALLBACK (copy_msg_cb),          0),
+	
+	E_POPUP_SEPARATOR,
+	
+	E_POPUP_SUBMENU (N_("Label"),                 label_menu,                             0),
+	
+	E_POPUP_SEPARATOR,
+	
+	E_POPUP_ITEM (N_("Add Sender to Address_book"), G_CALLBACK (addrbook_sender), SELECTION_SET | CAN_ADD_SENDER),
+	
+	E_POPUP_SEPARATOR,
+	
+	E_POPUP_ITEM (N_("Appl_y Filters"),             G_CALLBACK (apply_filters),      0),
+	
+	E_POPUP_SEPARATOR,
+	
+	E_POPUP_SUBMENU (N_("Crea_te Rule From Message"), filter_menu,                        SELECTION_SET),
+	
+	E_POPUP_TERMINATOR
+};
+
+/* Note: this must be kept in sync with the context_menu!!! */
+static char *context_pixmaps[] = {
+	NULL, /* Open */
+	NULL, /* Edit */
+	"save-as-16.png",
+	"print.xpm",
+	NULL,
+	"reply.xpm",
+	NULL, /* Reply to List */
+	"reply_to_all.xpm",
+	"forward.xpm",
+	NULL,
+	"flag-for-followup-16.png",
+	NULL, /* Flag */
+	NULL, /* Clear */
+	"mail-read.xpm",
+	"mail-new.xpm",
+	"priority-high.xpm",
+	NULL, /* Mark as Unimportant */
+	NULL,
+	"evolution-trash-mini.png",
+	"undelete_message-16.png",
+	NULL,
+	"move_message.xpm",
+	"copy_16_message.xpm",
+	NULL,
+	NULL, /* Label */
+	NULL,
+	NULL, /* Add Sender to Addressbook */
+	NULL,
+	NULL, /* Apply Filters */
+	NULL,
+	NULL, /* Create Rule from Message */
+};
+
+struct cmpf_data {
+	ETree *tree;
+	int row, col;
+};
+
+static void
+context_menu_position_func (GtkMenu *menu, gint *x, gint *y,
+			    gboolean *push_in, gpointer user_data)
+{
+	int tx, ty, tw, th;
+	struct cmpf_data *closure = user_data;
+	
+	gdk_window_get_origin (GTK_WIDGET (closure->tree)->window, x, y);
+	e_tree_get_cell_geometry (closure->tree, closure->row, closure->col,
+				  &tx, &ty, &tw, &th);
+	*x += tx + tw / 2;
+	*y += ty + th / 2;
+}
+
+static void
+setup_popup_icons (void)
+{
+	int i;
+	
+	for (i = 0; context_menu[i].name; i++) {
+		if (context_pixmaps[i]) {
+			char *filename;
+			
+			filename = g_strdup_printf ("%s/%s", EVOLUTION_IMAGES, context_pixmaps[i]);
+			context_menu[i].pixmap_widget = gtk_image_new_from_file (filename);
+			g_free (filename);
+		}
+	}
+}
+
+/* handle context menu over message-list */
+static int
+on_right_click (ETree *tree, gint row, ETreePath path, gint col, GdkEvent *event, FolderBrowser *fb)
+{
+	struct _filter_data *fdata = NULL;
+	GPtrArray *uids, *closures;
+	CamelMessageInfo *info;
+	GSList *labels;
+	int enable_mask = 0;
+	int hide_mask = 0;
+	char *mlist = NULL;
+	GtkMenu *menu;
+	int i;
+	
+	if (!folder_browser_is_sent (fb)) {
+		enable_mask |= CAN_RESEND;
+		hide_mask |= CAN_RESEND;
+	} else {
+		enable_mask |= CAN_ADD_SENDER;
+		hide_mask |= CAN_ADD_SENDER;
+	}
+	
+	if (folder_browser_is_drafts (fb)) {
+		enable_mask |= CAN_ADD_SENDER;
+		hide_mask |= CAN_ADD_SENDER;
+	}
+	
+	if (fb->folder == outbox_folder) {
+		enable_mask |= CAN_ADD_SENDER;
+		hide_mask |= CAN_ADD_SENDER;
+	}
+	
+	enable_mask |= SELECTION_SET;
+	
+	/* get a list of uids */
+	uids = g_ptr_array_new ();
+	message_list_foreach (fb->message_list, enumerate_msg, uids);
+	if (uids->len >= 1) {
+		/* gray-out any items we don't need */
+		gboolean have_deleted = FALSE;
+		gboolean have_undeleted = FALSE;
+		gboolean have_seen = FALSE;
+		gboolean have_unseen = FALSE;
+		gboolean have_important = FALSE;
+		gboolean have_unimportant = FALSE;
+		gboolean have_flag_for_followup = FALSE;
+		gboolean have_flag_completed = FALSE;
+		gboolean have_flag_incomplete = FALSE;
+		gboolean have_unflagged = FALSE;
+		const char *tag;
+		
+		for (i = 0; i < uids->len; i++) {
+			info = camel_folder_get_message_info (fb->folder, uids->pdata[i]);
+			if (info == NULL)
+				continue;
+			
+			if (i == 0 && uids->len == 1) {
+				const char *mname, *p;
+				char c, *o;
+				
+				/* used by filter/vfolder from X callbacks */
+				fdata = g_malloc0(sizeof(*fdata));
+				fdata->uid = g_strdup(uids->pdata[i]);
+				fdata->uri = g_strdup(fb->uri);
+				fdata->folder = fb->folder;
+				camel_object_ref((CamelObject *)fdata->folder);
+				if (folder_browser_is_sent (fb) || folder_browser_is_outbox (fb))
+					fdata->source = FILTER_SOURCE_OUTGOING;
+				else
+					fdata->source = FILTER_SOURCE_INCOMING;
+				
+				enable_mask &= ~SELECTION_SET;
+				mname = camel_message_info_mlist(info);
+				if (mname && mname[0]) {
+					fdata->mlist = g_strdup(mname);
+					
+					/* Escape the mailing list name before showing it */
+					mlist = g_alloca ((strlen (mname) * 2) + 1);
+					p = mname;
+					o = mlist;
+					while ((c = *p++)) {
+						if (c == '_')
+							*o++ = '_';
+						*o++ = c;
+					}
+					*o = 0;
+				}
+			}
+			
+			if (info->flags & CAMEL_MESSAGE_SEEN)
+				have_seen = TRUE;
+			else
+				have_unseen = TRUE;
+			
+			if (info->flags & CAMEL_MESSAGE_DELETED)
+				have_deleted = TRUE;
+			else
+				have_undeleted = TRUE;
+			
+			if (info->flags & CAMEL_MESSAGE_FLAGGED)
+				have_important = TRUE;
+			else
+				have_unimportant = TRUE;
+			
+			tag = camel_tag_get (&info->user_tags, "follow-up");
+			if (tag && *tag) {
+				have_flag_for_followup = TRUE;
+				tag = camel_tag_get (&info->user_tags, "completed-on");
+				if (tag && *tag)
+					have_flag_completed = TRUE;
+				else
+					have_flag_incomplete = TRUE;
+			} else
+				have_unflagged = TRUE;
+			
+			camel_folder_free_message_info (fb->folder, info);
+			
+			if (have_seen && have_unseen && have_deleted && have_undeleted)
+				break;
+		}
+		
+		if (!have_unseen)
+			enable_mask |= CAN_MARK_READ;
+		if (!have_seen)
+			enable_mask |= CAN_MARK_UNREAD;
+		
+		if (!have_undeleted)
+			enable_mask |= CAN_DELETE;
+		if (!have_deleted)
+			enable_mask |= CAN_UNDELETE;
+		
+		if (!have_unimportant)
+			enable_mask |= CAN_MARK_IMPORTANT;
+		if (!have_important)
+			enable_mask |= CAN_MARK_UNIMPORTANT;
+		
+		if (!have_flag_for_followup)
+			enable_mask |= CAN_CLEAR_FLAG;
+		if (!have_unflagged)
+			enable_mask |= CAN_FLAG_FOR_FOLLOWUP;
+		if (!have_flag_incomplete)
+			enable_mask |= CAN_FLAG_COMPLETED;
+		
+		/*
+		 * Hide items that wont get used.
+		 */
+		if (!(have_unseen && have_seen)) {
+			if (have_seen)
+				hide_mask |= CAN_MARK_READ;
+			else
+				hide_mask |= CAN_MARK_UNREAD;
+		}
+		
+		if (!(have_undeleted && have_deleted)) {
+			if (have_deleted)
+				hide_mask |= CAN_DELETE;
+			else
+				hide_mask |= CAN_UNDELETE;
+		}
+		
+		if (!(have_important && have_unimportant)) {
+			if (have_important)
+				hide_mask |= CAN_MARK_IMPORTANT;
+			else
+				hide_mask |= CAN_MARK_UNIMPORTANT;
+		}
+		
+		if (!have_flag_for_followup)
+			hide_mask |= CAN_CLEAR_FLAG;
+		if (!have_unflagged)
+			hide_mask |= CAN_FLAG_FOR_FOLLOWUP;
+		if (!have_flag_incomplete)
+			hide_mask |= CAN_FLAG_COMPLETED;
+	}
+	
+	/* free uids */
+	for (i = 0; i < uids->len; i++)
+		g_free (uids->pdata[i]);
+	g_ptr_array_free (uids, TRUE);
+	
+	/* generate the "Filter on Mailing List" menu item name */
+	if (mlist == NULL) {
+		enable_mask |= IS_MAILING_LIST;
+		filter_menu[MLIST_FILTER].name = g_strdup (_("Filter on _Mailing List"));
+		filter_menu[MLIST_VFOLDER].name = g_strdup (_("VFolder on M_ailing List"));
+	} else {
+		filter_menu[MLIST_FILTER].name = g_strdup_printf (_("Filter on _Mailing List (%s)"), mlist);
+		filter_menu[MLIST_VFOLDER].name = g_strdup_printf (_("VFolder on M_ailing List (%s)"), mlist);
+	}
+	
+	/* create the label/colour menu */
+	closures = g_ptr_array_new ();
+	label_menu[0].closure = g_new (struct _label_data, 1);
+	g_ptr_array_add (closures, label_menu[0].closure);
+	g_object_ref (fb);
+	((struct _label_data *) label_menu[0].closure)->fb = fb;
+	((struct _label_data *) label_menu[0].closure)->label = NULL;
+	
+	i = 0;
+	labels = mail_config_get_labels ();
+	while (labels != NULL && i < 5) {
+		struct _label_data *closure;
+		MailConfigLabel *label;
+		GdkPixmap *pixmap;
+		GdkColormap *map;
+		GdkColor colour;
+		GdkGC *gc;
+		
+		label = labels->data;
+		gdk_color_parse (label->colour, &colour);
+		map = gdk_colormap_get_system ();
+		gdk_color_alloc (map, &colour);
+		
+		pixmap = gdk_pixmap_new (GTK_WIDGET (fb)->window, 16, 16, -1);
+		gc = gdk_gc_new (GTK_WIDGET (fb)->window);
+		gdk_gc_set_foreground (gc, &colour);
+		gdk_draw_rectangle (pixmap, gc, TRUE, 0, 0, 16, 16);
+		gdk_gc_unref (gc);
+		
+		closure = g_new (struct _label_data, 1);
+		g_object_ref (fb);
+		closure->fb = fb;
+		closure->label = label->tag;
+		
+		g_ptr_array_add (closures, closure);
+		
+		label_menu[i + 2].name = label->name;
+		label_menu[i + 2].pixmap_widget = gtk_image_new_from_pixmap (pixmap, NULL);
+		label_menu[i + 2].closure = closure;
+		
+		i++;
+		labels = labels->next;
+	}
+	
+	setup_popup_icons ();
+	
+	for (i = 0; i < sizeof (filter_menu) / sizeof (filter_menu[0]); i++)
+		filter_menu[i].closure = fdata;
+	
+	menu = e_popup_menu_create (context_menu, enable_mask, hide_mask, fb);
+	e_auto_kill_popup_menu_on_selection_done (menu);
+	
+	g_object_set_data_full ((GObject *) menu, "label_closures", closures, (GtkDestroyNotify) label_closures_free);
+	
+	if (fdata)
+		g_object_set_data_full ((GObject *) menu, "filter_data", fdata, (GtkDestroyNotify) filter_data_free);
+	
+	if (event->type == GDK_KEY_PRESS) {
+		struct cmpf_data closure;
+		
+		closure.tree = tree;
+		closure.row = row;
+		closure.col = col;
+		gtk_menu_popup (menu, NULL, NULL, context_menu_position_func,
+				&closure, 0, event->key.time);
+	} else {
+		gtk_menu_popup (menu, NULL, NULL, NULL, NULL,
+				event->button.button, event->button.time);
+	}
+	
+	g_free (filter_menu[MLIST_FILTER].name);
+	g_free (filter_menu[MLIST_VFOLDER].name);
+	
+	return TRUE;
+}
+
+static int
+html_button_press_event (GtkWidget *widget, GdkEventButton *event, gpointer data)
+{
+	FolderBrowser *fb = data;
+	HTMLEngine *engine;
+	HTMLPoint *point;
+	ETreePath *path;
+	int row;
+	
+	if (event->type != GDK_BUTTON_PRESS || event->button != 3)
+		return FALSE;
+	
+	engine = GTK_HTML (widget)->engine;
+	point = html_engine_get_point_at (engine, event->x, event->y, FALSE);
+	
+	if (point) {
+		/* don't popup a menu if the mouse is hovering over a
+                   url or a source image because those situations are
+                   handled in mail-display.c's button_press_event
+                   callback */
+		const char *src, *url;
+		
+		url = html_object_get_url (point->object);
+		src = html_object_get_src (point->object);
+		
+		if (url || src) {
+			html_point_destroy (point);
+			return FALSE;
+		}
+		
+		html_point_destroy (point);
+	}	
+	
+	path = e_tree_get_cursor (fb->message_list->tree);
+	row = e_tree_row_of_node (fb->message_list->tree, path);
+	
+	on_right_click (fb->message_list->tree, row, path, 2,
+			(GdkEvent *) event, fb);
+	
+	return TRUE;
+}
+
+static int
+on_key_press (GtkWidget *widget, GdkEventKey *key, gpointer data)
+{
+	FolderBrowser *fb = data;
+	ETreePath *path;
+	int row;
+	
+	if (key->state & GDK_CONTROL_MASK)
+		return FALSE;
+	
+	path = e_tree_get_cursor (fb->message_list->tree);
+	row = e_tree_row_of_node (fb->message_list->tree, path);
+	
+	switch (key->keyval) {
+	case GDK_Delete:
+	case GDK_KP_Delete:
+		delete_msg (NULL, fb);
+		return TRUE;
+		
+	case GDK_Menu:
+		on_right_click (fb->message_list->tree, row, path, 2,
+				(GdkEvent *)key, fb);
+		return TRUE;
+	case '!':
+		toggle_as_important (NULL, fb, NULL);
+		return TRUE;
+	}
+	
+	return FALSE;
+}
+
+static int
+etree_key (ETree *tree, int row, ETreePath path, int col, GdkEvent *ev, FolderBrowser *fb)
+{
+	GtkAdjustment *vadj;
+	gfloat page_size;
+	
+	if ((ev->key.state & GDK_CONTROL_MASK) != 0)
+		return FALSE;
+	
+	vadj = gtk_scrolled_window_get_vadjustment (fb->mail_display->scroll);
+	page_size = vadj->page_size - vadj->step_increment;
+	
+	switch (ev->key.keyval) {
+	case GDK_space:
+		/* Work around Ximian 4939 */
+		if (vadj->upper < vadj->page_size)
+			break;
+		if (vadj->value < vadj->upper - vadj->page_size - page_size)
+			vadj->value += page_size;
+		else
+			vadj->value = vadj->upper - vadj->page_size;
+		gtk_adjustment_value_changed (vadj);
+		break;
+	case GDK_BackSpace:
+		if (vadj->value > vadj->lower + page_size)
+			vadj->value -= page_size;
+		else
+			vadj->value = vadj->lower;
+		gtk_adjustment_value_changed (vadj);
+		break;
+	case GDK_Return:
+	case GDK_KP_Enter:
+	case GDK_ISO_Enter:
+       		open_msg (NULL, fb);
+		break;
+	default:
+		return on_key_press ((GtkWidget *)tree, (GdkEventKey *)ev, fb);
+	}
+	
+	return TRUE;
+}
+
+static void
+on_double_click (ETree *tree, gint row, ETreePath path, gint col, GdkEvent *event, FolderBrowser *fb)
+{
+	/* Ignore double-clicks on columns where single-click doesn't
+	 * just select.
+	 */
+	if (MESSAGE_LIST_COLUMN_IS_ACTIVE (col))
+		return;
+	
+	open_msg (NULL, fb);
+}
+
+static void
+on_selection_changed (GtkObject *obj, gpointer user_data)
+{
+	FolderBrowser *fb = FOLDER_BROWSER (user_data);
+	FolderBrowserSelectionState state;
+	
+	/* we can get this signal at strange times...
+	 * if no uicomp, don't even bother */
+	
+	if (fb->uicomp == NULL)
+		return;
+	
+	switch (e_selection_model_selected_count (E_SELECTION_MODEL (obj))) {
+	case 0:
+		state = FB_SELSTATE_NONE;
+		break;
+	case 1:
+		state = FB_SELSTATE_SINGLE;
+		break;
+	default:
+		state = FB_SELSTATE_MULTIPLE;
+		break;
+	}
+	
+	folder_browser_ui_set_selection_state (fb, state);
+	
+	update_status_bar_idle (fb);
+}
+
+
+static void
+on_cursor_activated (ETree *tree, int row, ETreePath path, gpointer user_data)
+{
+	on_selection_changed ((GtkObject *)tree, user_data);
+}
+
+static gboolean
+fb_resize_cb (GtkWidget *w, GdkEventButton *e, FolderBrowser *fb)
+{
+	GConfClient *gconf;
+	
+	if (GTK_WIDGET_REALIZED (w) && fb->preview_shown) {
+		gconf = mail_config_get_gconf_client ();
+		gconf_client_set_int (gconf, "/apps/evolution/mail/display/paned_size", gtk_paned_get_position (GTK_PANED (w)), NULL);
+	}
+	
+	return FALSE;
+}
+
+/* hack to get around the fact setting the paned size doesn't work */
+static void
+paned_realised(GtkWidget *w, FolderBrowser *fb)
+{
+	GConfClient *gconf;
+	int size;
+	
+	gconf = mail_config_get_gconf_client ();
+	size = gconf_client_get_int (gconf, "/apps/evolution/mail/display/paned_size", NULL);
+	gtk_paned_set_position (GTK_PANED (fb->vpaned), size);
+}
+
+static void
+folder_browser_gui_init (FolderBrowser *fb)
+{
+	RuleContext *search_context = mail_component_peek_search_context (mail_component_peek ());
+	ESelectionModel *esm;
+	
+	/* The panned container */
+	fb->vpaned = gtk_vpaned_new ();
+	g_signal_connect(fb->vpaned, "realize", G_CALLBACK(paned_realised), fb);
+	gtk_widget_show (fb->vpaned);
+	
+	gtk_table_attach (GTK_TABLE (fb), fb->vpaned,
+			  0, 1, 1, 3,
+			  GTK_FILL | GTK_EXPAND,
+			  GTK_FILL | GTK_EXPAND,
+			  0, 0);
+	
+	/* quick-search bar */
+	if (search_context) {
+		const char *systemrules = g_object_get_data (G_OBJECT (search_context), "system");
+		const char *userrules = g_object_get_data (G_OBJECT (search_context), "user");
+		
+		fb->search = e_filter_bar_new (search_context, systemrules, userrules,
+					       folder_browser_config_search, fb);
+		e_search_bar_set_menu ((ESearchBar *)fb->search, folder_browser_search_menu_items);
+		gtk_widget_show (GTK_WIDGET (fb->search));
+	
+		g_signal_connect (fb->search, "menu_activated",
+				  G_CALLBACK (folder_browser_search_menu_activated), fb);
+		g_signal_connect (fb->search, "search_activated",
+				  G_CALLBACK (folder_browser_search_do_search), fb);
+		g_signal_connect (fb->search, "query_changed",
+				  G_CALLBACK (folder_browser_query_changed), fb);
+	
+		gtk_table_attach (GTK_TABLE (fb), GTK_WIDGET (fb->search),
+				  0, 1, 0, 1,
+				  GTK_FILL | GTK_EXPAND,
+				  0,
+				  0, 0);
+	}
+
+	esm = e_tree_get_selection_model (E_TREE (fb->message_list->tree));
+	g_signal_connect (esm, "selection_changed", G_CALLBACK (on_selection_changed), fb);
+	g_signal_connect (esm, "cursor_activated", G_CALLBACK (on_cursor_activated), fb);
+	fb->selection_state = FB_SELSTATE_NONE; /* default to none */
+
+	gtk_paned_add1 (GTK_PANED (fb->vpaned), GTK_WIDGET (fb->message_list));
+	gtk_widget_show (GTK_WIDGET (fb->message_list));
+	
+	fb->paned_resize_id = g_signal_connect (fb->vpaned, "button_release_event",
+						G_CALLBACK (fb_resize_cb), fb);
+
+	gtk_paned_add2 (GTK_PANED (fb->vpaned), GTK_WIDGET (fb->mail_display));
+	gtk_widget_show (GTK_WIDGET (fb->mail_display));
+	gtk_widget_show (GTK_WIDGET (fb));
+}
+
+/* mark the message seen if the current message still matches */
+static gint 
+do_mark_seen (gpointer data)
+{
+	FolderBrowser *fb = FOLDER_BROWSER (data);
+	
+	if (fb->new_uid && fb->loaded_uid && !strcmp (fb->new_uid, fb->loaded_uid)) {
+		camel_folder_set_message_flags (fb->folder, fb->new_uid,
+						CAMEL_MESSAGE_SEEN, CAMEL_MESSAGE_SEEN);
+	}
+	
+	return FALSE;
+}
+
+/* callback when we have the message to display, after async loading it (see below) */
+/* if we have pending uid's, it means another was selected before we finished displaying
+   the last one - so we cycle through and start loading the pending one immediately now */
+static void
+done_message_selected (CamelFolder *folder, const char *uid, CamelMimeMessage *msg, void *data)
+{
+	FolderBrowser *fb = data;
+	CamelMessageInfo *info;
+	GConfClient *gconf;
+	int timeout;
+	
+	if (folder != fb->folder || fb->mail_display == NULL)
+		return;
+	
+	gconf = mail_config_get_gconf_client ();
+	timeout = gconf_client_get_int (gconf, "/apps/evolution/mail/display/mark_seen_timeout", NULL);
+	
+	info = camel_folder_get_message_info (fb->folder, uid);
+	mail_display_set_message (fb->mail_display, (CamelMedium *) msg, fb->folder, info);
+	if (info)
+		camel_folder_free_message_info (fb->folder, info);
+	
+	/* FIXME: should this signal be emitted here?? */
+	g_signal_emit (fb, folder_browser_signals[MESSAGE_LOADED], 0, uid);
+	
+	/* pain, if we have pending stuff, re-run */
+	if (fb->pending_uid) {
+		g_free (fb->loading_uid);
+		fb->loading_uid = fb->pending_uid;
+		fb->pending_uid = NULL;
+		
+		mail_get_message (fb->folder, fb->loading_uid, done_message_selected, fb, mail_thread_new);
+		return;
+	}
+	
+	g_free (fb->loaded_uid);
+	fb->loaded_uid = fb->loading_uid;
+	fb->loading_uid = NULL;
+	
+	folder_browser_ui_message_loaded (fb);
+	
+	/* if we are still on the same message, do the 'idle read' thing */
+	if (fb->seen_id)
+		g_source_remove (fb->seen_id);
+	
+	if (msg && gconf_client_get_bool (gconf, "/apps/evolution/mail/display/mark_seen", NULL)) {
+		if (timeout > 0)
+			fb->seen_id = g_timeout_add (timeout, do_mark_seen, fb);
+		else
+			do_mark_seen (fb);
+	}
+}
+
+/* ok we waited enough, display it anyway (see below) */
+static gboolean
+do_message_selected (FolderBrowser *fb)
+{
+	d(printf ("%p: selecting uid %s (delayed)\n", fb, fb->new_uid ? fb->new_uid : "NONE"));
+	
+	fb->loading_id = 0;
+	
+	/* if we are loading, then set a pending, but leave the loading, coudl cancel here (?) */
+	if (fb->loading_uid) {
+		if (fb->new_uid == NULL || fb->pending_uid == NULL || strcmp(fb->pending_uid, fb->new_uid) != 0) {
+			g_free (fb->pending_uid);
+			fb->pending_uid = g_strdup (fb->new_uid);
+		}
+	} else {
+		if (fb->new_uid) {
+			if (fb->loaded_uid == NULL || strcmp(fb->new_uid, fb->loaded_uid) != 0) {
+				fb->loading_uid = g_strdup (fb->new_uid);
+				mail_get_message (fb->folder, fb->loading_uid, done_message_selected, fb, mail_thread_new);
+			}
+		} else {
+			mail_display_set_message (fb->mail_display, NULL, NULL, NULL);
+		}
+	}
+	
+	return FALSE;
+}
+
+/* when a message is selected, wait a while before trying to display it */
+static void
+on_message_selected (MessageList *ml, const char *uid, FolderBrowser *fb)
+{
+	d(printf ("%p: selecting uid %s (direct)\n", fb, uid ? uid : "NONE"));
+	
+	if (fb->loading_id != 0)
+		g_source_remove (fb->loading_id);
+	
+	g_free (fb->new_uid);
+	fb->new_uid = g_strdup (uid);
+	
+	if (fb->preview_shown)
+		fb->loading_id = g_timeout_add (100, (GtkFunction)do_message_selected, fb);
+}
+
+static gboolean
+on_message_list_focus_in (GtkWidget *widget, GdkEventFocus *event, gpointer user_data)
+{
+	FolderBrowser *fb = (FolderBrowser *) user_data;
+	
+	d(printf ("got focus!\n"));
+	folder_browser_ui_message_list_focus (fb);
+	
+	return FALSE;
+}
+
+static gboolean
+on_message_list_focus_out (GtkWidget *widget, GdkEventFocus *event, gpointer user_data)
+{
+	FolderBrowser *fb = (FolderBrowser *) user_data;
+	
+	d(printf ("got unfocus!\n"));
+	folder_browser_ui_message_list_unfocus (fb);
+	
+	return FALSE;
+}
+
+static void
+folder_browser_init (FolderBrowser *fb)
+{
+	fb->async_event = mail_async_event_new ();
+	fb->get_id = -1;
+}
+
+static void
+my_folder_browser_init (FolderBrowser *fb)
+{
+	int i;
+	
+	fb->view_instance = NULL;
+	fb->view_menus = NULL;
+	
+	fb->pref_master = FALSE;
+	
+	/*
+	 * Setup parent class fields.
+	 */ 
+	GTK_TABLE (fb)->homogeneous = FALSE;
+	gtk_table_resize (GTK_TABLE (fb), 1, 2);
+	
+	/*
+	 * Our instance data
+	 */
+	fb->message_list = (MessageList *)message_list_new ();
+	fb->mail_display = (MailDisplay *)mail_display_new ();
+	
+	fb->preview_shown = TRUE;
+	
+	g_signal_connect (fb->mail_display->html, "key_press_event",
+			  G_CALLBACK (on_key_press), fb);
+	g_signal_connect (fb->mail_display->html, "button_press_event",
+			  G_CALLBACK (html_button_press_event), fb);
+	
+	g_signal_connect (fb->message_list->tree, "key_press",
+			  G_CALLBACK (etree_key), fb);
+	
+	g_signal_connect (fb->message_list->tree, "right_click",
+			  G_CALLBACK (on_right_click), fb);
+	
+	g_signal_connect (fb->message_list->tree, "double_click",
+			  G_CALLBACK (on_double_click), fb);
+	
+	g_signal_connect (fb->message_list, "focus_in_event",
+			  G_CALLBACK (on_message_list_focus_in), fb);
+	
+	g_signal_connect (fb->message_list, "focus_out_event",
+			  G_CALLBACK (on_message_list_focus_out), fb);
+	
+	g_signal_connect (fb->message_list, "message_selected",
+			  G_CALLBACK (on_message_selected), fb);
+	
+	/* drag & drop */
+	e_tree_drag_source_set (fb->message_list->tree, GDK_BUTTON1_MASK,
+				drag_types, num_drag_types, GDK_ACTION_MOVE | GDK_ACTION_COPY);
+	
+	g_signal_connect (fb->message_list->tree, "tree_drag_data_get",
+			  G_CALLBACK (message_list_drag_data_get), fb);
+	
+	e_tree_drag_dest_set (fb->message_list->tree, GTK_DEST_DEFAULT_ALL,
+			      drag_types, num_drag_types, GDK_ACTION_MOVE | GDK_ACTION_COPY);
+	
+	g_signal_connect (fb->message_list->tree, "tree_drag_data_received",
+			  G_CALLBACK (message_list_drag_data_received), fb);
+	
+	/* cut, copy & paste */
+	fb->invisible = gtk_invisible_new ();
+	g_object_ref (fb->invisible);
+	gtk_object_sink ((GtkObject *) fb->invisible);
+	
+	for (i = 0; i < num_paste_types; i++)
+		gtk_selection_add_target (fb->invisible, clipboard_atom,
+					  paste_types[i].target,
+					  paste_types[i].info);
+	
+	g_signal_connect (fb->invisible, "selection_get",
+			  G_CALLBACK (selection_get), fb);
+	g_signal_connect (fb->invisible, "selection_clear_event",
+			  G_CALLBACK (selection_clear_event), fb);
+	g_signal_connect (fb->invisible, "selection_received",
+			  G_CALLBACK (selection_received), fb);
+	
+	folder_browser_gui_init (fb);
+}
+
+GtkWidget *
+folder_browser_new (const char *uri)
+{
+	CORBA_Environment ev;
+	FolderBrowser *folder_browser;
+	
+	CORBA_exception_init (&ev);
+	
+	folder_browser = g_object_new (folder_browser_get_type (), NULL);
+	
+	my_folder_browser_init (folder_browser);
+	
+	CORBA_exception_free (&ev);
+	
+	if (uri) {
+		folder_browser->uri = g_strdup (uri);
+		folder_browser->meta = mail_tool_get_meta_data(uri);
+		g_object_ref (folder_browser);
+		folder_browser->get_id = mail_get_folder (folder_browser->uri, 0, got_folder,
+							  folder_browser, mail_thread_new);
+	}
+	
+	return GTK_WIDGET (folder_browser);
+}
+
+
+E_MAKE_TYPE (folder_browser, "FolderBrowser", FolderBrowser, folder_browser_class_init, folder_browser_init, PARENT_TYPE);
diff --git a/mail/folder-browser.h b/mail/folder-browser.h
new file mode 100644
index 0000000000..1b03ec9efb
--- /dev/null
+++ b/mail/folder-browser.h
@@ -0,0 +1,192 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
+
+
+#ifndef _FOLDER_BROWSER_H_
+#define _FOLDER_BROWSER_H_
+
+#include <gtk/gtktable.h>
+#include "camel/camel-stream.h"
+#include <bonobo/bonobo-property-bag.h>
+#include <bonobo/bonobo-ui-component.h>
+#include <widgets/misc/e-filter-bar.h>
+#include "widgets/menus/gal-view-menus.h"
+#include "filter/filter-rule.h"
+#include "filter/filter-context.h" /*eek*/
+#include "message-list.h"
+#include "mail-display.h"
+#include "mail-types.h"
+#include "shell/Evolution.h"
+
+#define FOLDER_BROWSER_TYPE        (folder_browser_get_type ())
+#define FOLDER_BROWSER(o)          (G_TYPE_CHECK_INSTANCE_CAST ((o), FOLDER_BROWSER_TYPE, FolderBrowser))
+#define FOLDER_BROWSER_CLASS(k)    (G_TYPE_CHECK_CLASS_CAST ((k), FOLDER_BROWSER_TYPE, FolderBrowserClass))
+#define IS_FOLDER_BROWSER(o)       (G_TYPE_CHECK_INSTANCE_TYPE ((o), FOLDER_BROWSER_TYPE))
+#define IS_FOLDER_BROWSER_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), FOLDER_BROWSER_TYPE))
+
+#define FB_DEFAULT_CHARSET _("Default")
+
+#define FOLDER_BROWSER_IS_DESTROYED(fb) (!fb || !fb->message_list || !fb->mail_display || !fb->folder)
+
+typedef enum _FolderBrowserSelectionState {
+	FB_SELSTATE_NONE,
+	FB_SELSTATE_SINGLE,
+	FB_SELSTATE_MULTIPLE,
+	FB_SELSTATE_UNDEFINED
+} FolderBrowserSelectionState;
+
+struct  _FolderBrowser {
+	GtkTable parent;
+	
+	BonoboPropertyBag *properties;
+	
+	GNOME_Evolution_ShellView shell_view;
+	
+	BonoboUIComponent *uicomp;
+	
+	/*
+	 * The current URI being displayed by the FolderBrowser
+	 */
+	char        *uri;
+	CamelFolder *folder;
+	int          unread_count; /* last known unread message count */
+	
+	/* async loading stuff */
+	char	    *loading_uid;  /* what uid am i loading now */
+	char	    *pending_uid;  /* what uid should i load next */
+	char	    *new_uid;      /* place to save the next uid during idle timeout */
+	char	    *loaded_uid;   /* what we have loaded */
+	guint	     loading_id;
+	guint        seen_id;
+	
+	gulong       paned_resize_id;
+	
+	/* a folder we are expunging, dont use other than to compare the pointer value */
+	CamelFolder *expunging;
+	int expunge_mlfocussed;	/* true if the ml was focussed before we expunged */
+
+	MessageList *message_list;
+	MailDisplay *mail_display;
+	GtkWidget   *vpaned;
+	
+	EFilterBar  *search;
+	FilterRule  *search_full; /* if we have a full search active */
+
+	struct _EMeta *meta;	/* various per-folder meta-data */
+	
+	guint32 preview_shown  : 1;
+	guint32 threaded       : 1;
+	guint32 pref_master    : 1;
+	
+	FolderBrowserSelectionState selection_state;
+	GSList *sensitize_changes;
+	GHashTable *sensitise_state; /* the last sent sensitise state, to avoid much bonobo overhead */
+	int sensitize_timeout_id;
+	int update_status_bar_idle_id;
+	
+	/* View instance and the menu handler object */
+	GalViewInstance *view_instance;
+	GalViewMenus *view_menus;
+	
+	GtkWidget *invisible;
+	GByteArray *clipboard_selection;
+	
+	/* for async events */
+	struct _MailAsyncEvent *async_event;
+	
+	int get_id;		/* for getting folder op */
+	
+	/* info used by popup for filter/vfolder */
+	struct _popup_filter_data *popup;
+};
+
+typedef struct {
+	GtkTableClass parent_class;
+	
+	/* signals */
+	void (*folder_loaded)  (FolderBrowser *fb, const char *uri);
+	void (*message_loaded) (FolderBrowser *fb, const char *uid);
+} FolderBrowserClass;
+
+struct fb_ondemand_closure {
+	FilterRule *rule;
+	FolderBrowser *fb;
+	gchar *path;
+};
+
+GtkType    folder_browser_get_type             (void);
+GtkWidget *folder_browser_new                  (const char *uri);
+
+void       folder_browser_set_folder           (FolderBrowser *fb, CamelFolder *folder, const char *uri);
+
+void       folder_browser_set_ui_component     (FolderBrowser *fb, BonoboUIComponent *uicomp);
+void       folder_browser_set_shell_view       (FolderBrowser *fb, GNOME_Evolution_ShellView shell_view);
+
+void       folder_browser_set_message_preview  (FolderBrowser         *folder_browser,
+						gboolean               show_message_preview);
+void       folder_browser_clear_search         (FolderBrowser         *fb);
+
+void       folder_browser_cut                  (GtkWidget *widget, FolderBrowser *fb);
+void       folder_browser_copy                 (GtkWidget *widget, FolderBrowser *fb);
+void       folder_browser_paste                (GtkWidget *widget, FolderBrowser *fb);
+
+void       folder_browser_reload               (FolderBrowser *fb);
+
+/* callbacks for functions on the folder-browser */
+void vfolder_subject   (GtkWidget *w, FolderBrowser *fb);
+void vfolder_sender    (GtkWidget *w, FolderBrowser *fb);
+void vfolder_recipient (GtkWidget *w, FolderBrowser *fb);
+void vfolder_mlist     (GtkWidget *w, FolderBrowser *fb);
+
+void filter_subject    (GtkWidget *w, FolderBrowser *fb);
+void filter_sender     (GtkWidget *w, FolderBrowser *fb);
+void filter_recipient  (GtkWidget *w, FolderBrowser *fb);
+void filter_mlist      (GtkWidget *w, FolderBrowser *fb);
+
+void hide_read(GtkWidget *w, FolderBrowser *fb);
+void hide_deleted(GtkWidget *w, FolderBrowser *fb);
+void hide_selected(GtkWidget *w, FolderBrowser *fb);
+void hide_none(GtkWidget *w, FolderBrowser *fb);
+void hide_subject(GtkWidget *w, FolderBrowser *fb);
+void hide_sender(GtkWidget *w, FolderBrowser *fb);
+
+void folder_browser_toggle_preview (BonoboUIComponent           *component,
+				    const char                  *path,
+				    Bonobo_UIComponent_EventType type,
+				    const char                  *state,
+				    gpointer                     user_data);
+
+void folder_browser_toggle_threads (BonoboUIComponent           *component,
+				    const char                  *path,
+				    Bonobo_UIComponent_EventType type,
+				    const char                  *state,
+				    gpointer                     user_data);
+
+void folder_browser_toggle_hide_deleted (BonoboUIComponent           *component,
+					 const char                  *path,
+					 Bonobo_UIComponent_EventType type,
+					 const char                  *state,
+					 gpointer                     user_data);
+
+void folder_browser_toggle_caret_mode (BonoboUIComponent           *component,
+				       const char                  *path,
+				       Bonobo_UIComponent_EventType type,
+				       const char                  *state,
+				       gpointer                     user_data);
+
+void folder_browser_set_message_display_style (BonoboUIComponent           *component,
+					       const char                  *path,
+					       Bonobo_UIComponent_EventType type,
+					       const char                  *state,
+					       gpointer                     user_data);
+
+void folder_browser_charset_changed (BonoboUIComponent *component,
+				     const char *path,
+				     Bonobo_UIComponent_EventType type,
+				     const char *state,
+				     gpointer user_data);
+
+gboolean folder_browser_is_drafts (FolderBrowser *fb);
+gboolean folder_browser_is_sent   (FolderBrowser *fb);
+gboolean folder_browser_is_outbox (FolderBrowser *fb);
+
+#endif /* _FOLDER_BROWSER_H_ */
diff --git a/mail/mail-account-gui.c b/mail/mail-account-gui.c
index 62ddfc4d06..6e6ce85d2c 100644
--- a/mail/mail-account-gui.c
+++ b/mail/mail-account-gui.c
@@ -36,17 +36,21 @@
 #include <e-util/e-account-list.h>
 #include <e-util/e-dialog-utils.h>
 
-#include "evolution-folder-selector-button.h"
+#include "em-folder-selection-button.h"
 #include "mail-account-gui.h"
 #include "mail-session.h"
 #include "mail-send-recv.h"
 #include "mail-signature-editor.h"
+#include "mail-component.h"
 #include "mail-composer-prefs.h"
 #include "mail-config.h"
 #include "mail-ops.h"
 #include "mail-mt.h"
 #include "mail.h"
 
+#include "e-storage.h"
+
+
 #define d(x)
 
 extern char *default_drafts_folder_uri, *default_sent_folder_uri;
@@ -1060,16 +1064,13 @@ extract_values (MailAccountGuiService *source, GHashTable *extra_config, CamelUR
 	}
 }
 
-
 static void
-folder_selected (EvolutionFolderSelectorButton *button,
-		 GNOME_Evolution_Folder *corba_folder,
-		 gpointer user_data)
+folder_selected (EMFolderSelectionButton *button, gpointer user_data)
 {
 	char **folder_name = user_data;
 	
 	g_free (*folder_name);
-	*folder_name = g_strdup (corba_folder->physicalUri);
+	*folder_name = g_strdup(em_folder_selection_button_get_selection(button));
 }
 
 static void
@@ -1080,14 +1081,12 @@ default_folders_clicked (GtkButton *button, gpointer user_data)
 	/* Drafts folder */
 	g_free (gui->drafts_folder_uri);
 	gui->drafts_folder_uri = g_strdup (default_drafts_folder_uri);
-	evolution_folder_selector_button_set_uri (EVOLUTION_FOLDER_SELECTOR_BUTTON (gui->drafts_folder_button),
-						  gui->drafts_folder_uri);
+	em_folder_selection_button_set_selection((EMFolderSelectionButton *)gui->drafts_folder_button, gui->drafts_folder_uri);
 	
 	/* Sent folder */
 	g_free (gui->sent_folder_uri);
 	gui->sent_folder_uri = g_strdup (default_sent_folder_uri);
-	evolution_folder_selector_button_set_uri (EVOLUTION_FOLDER_SELECTOR_BUTTON (gui->sent_folder_button),
-						  gui->sent_folder_uri);
+	em_folder_selection_button_set_selection((EMFolderSelectionButton *)gui->sent_folder_button, gui->sent_folder_uri);
 }
 
 GtkWidget *mail_account_gui_folder_selector_button_new (char *widget_name, char *string1, char *string2, int int1, int int2);
@@ -1097,7 +1096,7 @@ mail_account_gui_folder_selector_button_new (char *widget_name,
 					     char *string1, char *string2,
 					     int int1, int int2)
 {
-	return (GtkWidget *)g_object_new (EVOLUTION_TYPE_FOLDER_SELECTOR_BUTTON, NULL);
+	return (GtkWidget *)em_folder_selection_button_new(_("Select Folder"), NULL);
 }
 
 static gboolean
@@ -1410,7 +1409,6 @@ prepare_signatures (MailAccountGui *gui)
 MailAccountGui *
 mail_account_gui_new (EAccount *account, MailAccountsTab *dialog)
 {
-	const char *allowed_types[] = { "mail/*", NULL };
 	MailAccountGui *gui;
 	GtkWidget *button;
 	
@@ -1499,31 +1497,21 @@ mail_account_gui_new (EAccount *account, MailAccountsTab *dialog)
 	
 	/* Drafts folder */
 	gui->drafts_folder_button = GTK_BUTTON (glade_xml_get_widget (gui->xml, "drafts_button"));
-	g_signal_connect (gui->drafts_folder_button, "selected",
-			  G_CALLBACK (folder_selected), &gui->drafts_folder_uri);
+	g_signal_connect (gui->drafts_folder_button, "selected", G_CALLBACK (folder_selected), &gui->drafts_folder_uri);
 	if (account->drafts_folder_uri)
 		gui->drafts_folder_uri = g_strdup (account->drafts_folder_uri);
 	else
 		gui->drafts_folder_uri = g_strdup (default_drafts_folder_uri);
-	evolution_folder_selector_button_construct (EVOLUTION_FOLDER_SELECTOR_BUTTON (gui->drafts_folder_button),
-						    global_shell_client,
-						    _("Select Folder"),
-						    gui->drafts_folder_uri,
-						    allowed_types);
+	em_folder_selection_button_set_selection((EMFolderSelectionButton *)gui->drafts_folder_button, gui->drafts_folder_uri);
 	
 	/* Sent folder */
 	gui->sent_folder_button = GTK_BUTTON (glade_xml_get_widget (gui->xml, "sent_button"));
-	g_signal_connect (gui->sent_folder_button, "selected",
-			  G_CALLBACK (folder_selected), &gui->sent_folder_uri);
+	g_signal_connect (gui->sent_folder_button, "selected", G_CALLBACK (folder_selected), &gui->sent_folder_uri);
 	if (account->sent_folder_uri)
 		gui->sent_folder_uri = g_strdup (account->sent_folder_uri);
 	else
 		gui->sent_folder_uri = g_strdup (default_sent_folder_uri);
-	evolution_folder_selector_button_construct (EVOLUTION_FOLDER_SELECTOR_BUTTON (gui->sent_folder_button),
-						    global_shell_client,
-						    _("Select Folder"),
-						    gui->sent_folder_uri,
-						    allowed_types);
+	em_folder_selection_button_set_selection((EMFolderSelectionButton *)gui->sent_folder_button, gui->sent_folder_uri);
 	
 	/* Special Folders "Reset Defaults" button */
 	button = glade_xml_get_widget (gui->xml, "default_folders_button");
@@ -1842,18 +1830,21 @@ static void
 add_new_store (char *uri, CamelStore *store, void *user_data)
 {
 	EAccount *account = user_data;
-	EvolutionStorage *storage;
+	MailComponent *component = mail_component_peek ();
+	EStorage *storage;
 	
 	if (store == NULL)
 		return;
+
+	/* EPFIXME: Strange refcounting semantics here?!  */
 	
-	storage = mail_lookup_storage (store);
+	storage = mail_component_lookup_storage (component, store);
 	if (storage) {
 		/* store is already in the folder tree, so do nothing */
-		bonobo_object_unref (BONOBO_OBJECT (storage));
+		g_object_unref (storage);
 	} else {
 		/* store is *not* in the folder tree, so lets add it. */
-		mail_add_storage (store, account->name, account->source->url);
+		mail_component_add_store (component, store, account->name);
 	}
 }
 
@@ -1968,7 +1959,7 @@ mail_account_gui_save (MailAccountGui *gui)
 #define sources_equal(old,new) (new->url && !strcmp (old->url, new->url))
 		if (!sources_equal (account->source, new->source)) {
 			/* Remove the old storage from the folder-tree */
-			mail_remove_storage_by_uri (account->source->url);
+			mail_component_remove_storage_by_uri (mail_component_peek (), account->source->url);
 		}
 	}
 	
diff --git a/mail/mail-accounts.c b/mail/mail-accounts.c
index fb06efd6ba..b17652bb66 100644
--- a/mail/mail-accounts.c
+++ b/mail/mail-accounts.c
@@ -33,9 +33,11 @@
 #include <gtk/gtktreeselection.h>
 
 #include "mail.h"
+#include "mail-component.h"
 #include "mail-config.h"
 #include "mail-config-druid.h"
 #include "mail-account-editor.h"
+#include "mail-ops.h"
 #include "mail-send-recv.h"
 
 #include "art/mark.xpm"
@@ -248,8 +250,8 @@ account_delete_clicked (GtkButton *button, gpointer user_data)
 		
 		/* remove it from the folder-tree in the shell */
 		if (account->enabled && account->source && account->source->url)
-			mail_remove_storage_by_uri (account->source->url);
-		
+			mail_component_remove_storage_by_uri (mail_component_peek (), account->source->url);
+
 		/* remove it from the config file */
 		mail_config_remove_account (account);
 		accounts = mail_config_get_accounts ();
@@ -297,6 +299,7 @@ account_default_clicked (GtkButton *button, gpointer user_data)
 static void
 account_able_clicked (GtkButton *button, gpointer user_data)
 {
+	MailComponent *component = mail_component_peek ();
 	MailAccountsTab *prefs = user_data;
 	GtkTreeSelection *selection;
 	EAccount *account = NULL;
@@ -317,9 +320,11 @@ account_able_clicked (GtkButton *button, gpointer user_data)
 		   folder-tree, otherwise add it to the folder-tree */
 		if (account->source->url) {
 			if (account->enabled)
-				mail_load_storage_by_uri (prefs->shell, account->source->url, account->name);
+				mail_component_load_storage_by_uri (component,
+								    account->source->url,
+								    account->name);
 			else
-				mail_remove_storage_by_uri (account->source->url);
+				mail_component_remove_storage_by_uri (component, account->source->url);
 		}
 		
 		mail_autoreceive_setup ();
@@ -354,17 +359,18 @@ account_able_toggled (GtkCellRendererToggle *renderer, char *arg1, gpointer user
 	gtk_tree_path_free (path);
 	
 	if (account) {
+		MailComponent *component = mail_component_peek ();
+
 		/* if the account got disabled, remove it from the
 		   folder-tree, otherwise add it to the folder-tree */
 		if (account->source->url) {
 			if (account->enabled)
-				mail_load_storage_by_uri (prefs->shell, account->source->url, account->name);
+				mail_component_load_storage_by_uri (component, account->source->url, account->name);
 			else
-				mail_remove_storage_by_uri (account->source->url);
+				mail_component_remove_storage_by_uri (component, account->source->url);
 		}
 		
 		mail_autoreceive_setup ();
-		
 		mail_config_write ();
 	}
 }
diff --git a/mail/mail-accounts.etspec b/mail/mail-accounts.etspec
new file mode 100644
index 0000000000..22c09370b1
--- /dev/null
+++ b/mail/mail-accounts.etspec
@@ -0,0 +1,12 @@
+<ETableSpecification cursor-mode="line" draw-grid="false" draw-focus="true" selection-mode="single">
+  <ETableColumn model_col= "0" _title="Enabled" pixbuf="enabled" expansion="0.0" minimum_width="18" resizable="false" cell="render_message_status" compare="integer" sortable="false"/>
+
+  <ETableColumn model_col= "1" _title="Account name" expansion="1.6" minimum_width="32" resizable="true" cell="render_text" compare="string"/>
+
+  <ETableColumn model_col= "2" _title="Protocol" expansion="0.8" minimum_width="32" resizable="true" cell="render_text" compare="string"/>
+
+  <ETableState>
+    <column source="0"/> <column source="1"/> <column source="2"/>
+    <grouping> </grouping>
+  </ETableState>
+</ETableSpecification>
diff --git a/mail/mail-autofilter.c b/mail/mail-autofilter.c
index ac116aea7d..9e98758700 100644
--- a/mail/mail-autofilter.c
+++ b/mail/mail-autofilter.c
@@ -51,7 +51,6 @@
 #include "filter/filter-editor.h"
 #include "filter/filter-option.h"
 
-extern char *evolution_dir;
 
 static void
 rule_match_recipients (RuleContext *context, FilterRule *rule, CamelInternetAddress *iaddr)
@@ -313,7 +312,8 @@ filter_gui_add_from_message (CamelMimeMessage *msg, const char *source, int flag
 	g_return_if_fail (msg != NULL);
 	
 	fc = filter_context_new ();
-	user = g_strdup_printf ("%s/filters.xml", evolution_dir);
+	user = g_strdup_printf ("%s/filters.xml",
+				mail_component_peek_base_directory (mail_component_peek ()));
 	system = EVOLUTION_PRIVDATADIR "/filtertypes.xml";
 	rule_context_load ((RuleContext *)fc, system, user);
 	rule = filter_rule_from_message (fc, msg, flags);
@@ -334,7 +334,7 @@ mail_filter_rename_uri(CamelStore *store, const char *olduri, const char *newuri
 	GList *changed;
 	
 	fc = filter_context_new ();
-	user = g_strdup_printf ("%s/filters.xml", evolution_dir);
+	user = g_strdup_printf ("%s/filters.xml", mail_component_peek_base_directory (mail_component_peek ()));
 	system = EVOLUTION_PRIVDATADIR "/filtertypes.xml";
 	rule_context_load ((RuleContext *)fc, system, user);
 	
@@ -359,7 +359,7 @@ mail_filter_delete_uri(CamelStore *store, const char *uri)
 	GList *deleted;
 	
 	fc = filter_context_new ();
-	user = g_strdup_printf ("%s/filters.xml", evolution_dir);
+	user = g_strdup_printf ("%s/filters.xml", mail_component_peek_base_directory (mail_component_peek ()));
 	system = EVOLUTION_PRIVDATADIR "/filtertypes.xml";
 	rule_context_load ((RuleContext *)fc, system, user);
 	
diff --git a/mail/mail-callbacks.c b/mail/mail-callbacks.c
new file mode 100644
index 0000000000..cfb657b542
--- /dev/null
+++ b/mail/mail-callbacks.c
@@ -0,0 +1,3228 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
+/* mail-ops.c: callbacks for the mail toolbar/menus */
+
+/* 
+ * Authors: 
+ *  Dan Winship <danw@ximian.com>
+ *  Peter Williams <peterw@ximian.com>
+ *  Jeffrey Stedfast <fejj@ximian.com>
+ *
+ * Copyright 2000 Ximian, Inc. (www.ximian.com)
+ *
+ * This program is free software; you can redistribute it and/or 
+ * modify it under the terms of version 2 of the GNU General Public 
+ * License as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+ * USA
+ */
+
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <time.h>
+#include <errno.h>
+
+#include <gtkhtml/gtkhtml.h>
+
+#include <gconf/gconf.h>
+#include <gconf/gconf-client.h>
+
+#include <gtk/gtkmessagedialog.h>
+
+#include <libgnomeprint/gnome-print-job.h>
+#include <libgnomeprintui/gnome-print-dialog.h>
+#include <libgnomeprintui/gnome-print-job-preview.h>
+
+#include <bonobo/bonobo-widget.h>
+#include <bonobo/bonobo-socket.h>
+#include <gal/e-table/e-table.h>
+#include <e-util/e-dialog-utils.h>
+#include <filter/filter-editor.h>
+
+#include "mail.h"
+#include "message-browser.h"
+#include "mail-callbacks.h"
+#include "mail-component.h"
+#include "mail-config.h"
+#include "mail-accounts.h"
+#include "mail-config-druid.h"
+#include "mail-mt.h"
+#include "mail-tools.h"
+#include "mail-ops.h"
+#include "mail-local.h"
+#include "mail-search.h"
+#include "mail-send-recv.h"
+#include "mail-vfolder.h"
+#include "mail-folder-cache.h"
+#include "folder-browser.h"
+#include "subscribe-dialog.h"
+#include "message-tag-editor.h"
+#include "message-tag-followup.h"
+
+#include "Evolution.h"
+#include "evolution-storage.h"
+
+#include "evolution-shell-client.h"
+
+#define d(x) x
+
+#define FB_WINDOW(fb) GTK_WINDOW (gtk_widget_get_ancestor (GTK_WIDGET (fb), GTK_TYPE_WINDOW))
+
+
+/* default is default gtk response
+   if again is != NULL, a checkbox "dont show this again" will appear, and the result stored in *again
+*/
+static gboolean
+e_question (GtkWindow *parent, int def, gboolean *again, const char *fmt, ...)
+{
+	GtkWidget *mbox, *check = NULL;
+	va_list ap;
+	int button;
+	char *str;
+	
+	va_start (ap, fmt);
+	str = g_strdup_vprintf (fmt, ap);
+	va_end (ap);
+	mbox = gtk_message_dialog_new (parent, GTK_DIALOG_DESTROY_WITH_PARENT,
+				       GTK_MESSAGE_QUESTION, GTK_BUTTONS_YES_NO,
+				       "%s", str);
+	g_free (str);
+	gtk_dialog_set_default_response ((GtkDialog *) mbox, def);
+	if (again) {
+		check = gtk_check_button_new_with_label (_("Don't show this message again."));
+		gtk_box_pack_start ((GtkBox *)((GtkDialog *) mbox)->vbox, check, TRUE, TRUE, 10);
+		gtk_widget_show (check);
+	}
+	
+	button = gtk_dialog_run ((GtkDialog *) mbox);
+	if (again)
+		*again = !gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (check));
+	gtk_widget_destroy (mbox);
+	
+	return button == GTK_RESPONSE_YES;
+}
+
+
+struct _composer_callback_data {
+	unsigned int ref_count;
+	
+	CamelFolder *drafts_folder;
+	char *drafts_uid;
+	
+	CamelFolder *folder;
+	guint32 flags, set;
+	char *uid;
+};
+
+static struct _composer_callback_data *
+ccd_new (void)
+{
+	struct _composer_callback_data *ccd;
+	
+	ccd = g_new (struct _composer_callback_data, 1);
+	ccd->ref_count = 1;
+	ccd->drafts_folder = NULL;
+	ccd->drafts_uid = NULL;
+	ccd->folder = NULL;
+	ccd->flags = 0;
+	ccd->set = 0;
+	ccd->uid = NULL;
+	
+	return ccd;
+}
+
+static void
+free_ccd (struct _composer_callback_data *ccd)
+{
+	if (ccd->drafts_folder)
+		camel_object_unref (ccd->drafts_folder);
+	g_free (ccd->drafts_uid);
+	
+	if (ccd->folder)
+		camel_object_unref (ccd->folder);
+	g_free (ccd->uid);
+	g_free (ccd);
+}
+
+static void
+ccd_ref (struct _composer_callback_data *ccd)
+{
+	ccd->ref_count++;
+}
+
+static void
+ccd_unref (struct _composer_callback_data *ccd)
+{
+	ccd->ref_count--;
+	if (ccd->ref_count == 0)
+		free_ccd (ccd);
+}
+
+
+static void
+composer_destroy_cb (gpointer user_data, GObject *deadbeef)
+{
+	ccd_unref (user_data);
+}
+
+
+static void
+druid_destroy_cb (gpointer user_data, GObject *deadbeef)
+{
+	gtk_main_quit ();
+}
+
+static gboolean
+configure_mail (FolderBrowser *fb)
+{
+	MailConfigDruid *druid;
+	
+	if (e_question (FB_WINDOW (fb), GTK_RESPONSE_YES, NULL,
+			_("You have not configured the mail client.\n"
+			  "You need to do this before you can send,\n"
+			  "receive or compose mail.\n"
+			  "Would you like to configure it now?"))) {
+		druid = mail_config_druid_new ();
+		g_object_weak_ref ((GObject *) druid, (GWeakNotify) druid_destroy_cb, NULL);
+		gtk_widget_show ((GtkWidget *) druid);
+		gtk_grab_add ((GtkWidget *) druid);
+		gtk_main ();
+	}
+	
+	return mail_config_is_configured ();
+}
+
+static gboolean
+check_send_configuration (FolderBrowser *fb)
+{
+	EAccount *account;
+	
+	if (!mail_config_is_configured ()) {
+		if (fb == NULL) {
+			e_notice (NULL, GTK_MESSAGE_WARNING,
+				  _("You need to configure an account\nbefore you can compose mail."));
+			return FALSE;
+		}
+		
+		if (!configure_mail (fb))
+			return FALSE;
+	}
+	
+	/* Get the default account */
+	account = mail_config_get_default_account ();
+	
+	/* Check for an identity */
+	if (!account) {
+		e_notice (FB_WINDOW (fb), GTK_MESSAGE_WARNING,
+			  _("You need to configure an identity\nbefore you can compose mail."));
+		return FALSE;
+	}
+	
+	/* Check for a transport */
+	if (!account->transport->url) {
+		e_notice (FB_WINDOW (fb), GTK_MESSAGE_WARNING,
+			  _("You need to configure a mail transport\n"
+			    "before you can compose mail."));
+		return FALSE;
+	}
+	
+	return TRUE;
+}
+
+static gboolean
+ask_confirm_for_unwanted_html_mail (EMsgComposer *composer, EDestination **recipients)
+{
+	gboolean show_again, res;
+	GConfClient *gconf;
+	GString *str;
+	int i;
+	
+	gconf = mail_config_get_gconf_client ();
+	
+	if (!gconf_client_get_bool (gconf, "/apps/evolution/mail/prompts/unwanted_html", NULL))
+		return TRUE;
+	
+	/* FIXME: this wording sucks */
+	str = g_string_new (_("You are sending an HTML-formatted message. Please make sure that\n"
+			      "the following recipients are willing and able to receive HTML mail:\n"));
+	for (i = 0; recipients[i] != NULL; ++i) {
+		if (!e_destination_get_html_mail_pref (recipients[i])) {
+			const char *name;
+			
+			name = e_destination_get_textrep (recipients[i], FALSE);
+			
+			g_string_append_printf (str, "     %s\n", name);
+		}
+	}
+	
+	g_string_append (str, _("Send anyway?"));
+	res = e_question ((GtkWindow *) composer, GTK_RESPONSE_YES, &show_again, "%s", str->str);
+	g_string_free (str, TRUE);
+	
+	gconf_client_set_bool (gconf, "/apps/evolution/mail/prompts/unwanted_html", show_again, NULL);
+	
+	return res;
+}
+
+static gboolean
+ask_confirm_for_empty_subject (EMsgComposer *composer)
+{
+	gboolean show_again, res;
+	GConfClient *gconf;
+	
+	gconf = mail_config_get_gconf_client ();
+	
+	if (!gconf_client_get_bool (gconf, "/apps/evolution/mail/prompts/empty_subject", NULL))
+		return TRUE;
+	
+	res = e_question ((GtkWindow *) composer, GTK_RESPONSE_YES, &show_again,
+			  _("This message has no subject.\nReally send?"));
+	
+	gconf_client_set_bool (gconf, "/apps/evolution/mail/prompts/empty_subject", show_again, NULL);
+	
+	return res;
+}
+
+static gboolean
+ask_confirm_for_only_bcc (EMsgComposer *composer, gboolean hidden_list_case)
+{
+	gboolean show_again, res;
+	const char *first_text;
+	GConfClient *gconf;
+	
+	gconf = mail_config_get_gconf_client ();
+	
+	if (!gconf_client_get_bool (gconf, "/apps/evolution/mail/prompts/only_bcc", NULL))
+		return TRUE;
+	
+	/* If the user is mailing a hidden contact list, it is possible for
+	   them to create a message with only Bcc recipients without really
+	   realizing it.  To try to avoid being totally confusing, I've changed
+	   this dialog to provide slightly different text in that case, to
+	   better explain what the hell is going on. */
+	
+	if (hidden_list_case) {
+		first_text =  _("Since the contact list you are sending to "
+				"is configured to hide the list's addresses, "
+				"this message will contain only Bcc recipients.");
+	} else {
+		first_text = _("This message contains only Bcc recipients.");
+	}
+	
+	res = e_question ((GtkWindow *) composer, GTK_RESPONSE_YES, &show_again,
+			  "%s\n%s", first_text,
+			  _("It is possible that the mail server may reveal the recipients "
+			    "by adding an Apparently-To header.\nSend anyway?"));
+	
+	gconf_client_set_bool (gconf, "/apps/evolution/mail/prompts/only_bcc", show_again, NULL);
+	
+	return res;
+}
+
+
+struct _send_data {
+	struct _composer_callback_data *ccd;
+	EMsgComposer *composer;
+	gboolean send;
+};
+
+static void
+composer_send_queued_cb (CamelFolder *folder, CamelMimeMessage *msg, CamelMessageInfo *info,
+			 int queued, const char *appended_uid, void *data)
+{
+	struct _composer_callback_data *ccd;
+	struct _send_data *send = data;
+	
+	ccd = send->ccd;
+	
+	if (queued) {
+		if (ccd && ccd->drafts_folder) {
+			/* delete the old draft message */
+			camel_folder_set_message_flags (ccd->drafts_folder, ccd->drafts_uid,
+							CAMEL_MESSAGE_DELETED | CAMEL_MESSAGE_SEEN,
+							CAMEL_MESSAGE_DELETED | CAMEL_MESSAGE_SEEN);
+			camel_object_unref (ccd->drafts_folder);
+			ccd->drafts_folder = NULL;
+			g_free (ccd->drafts_uid);
+			ccd->drafts_uid = NULL;
+		}
+		
+		if (ccd && ccd->folder) {
+			/* set any replied flags etc */
+			camel_folder_set_message_flags (ccd->folder, ccd->uid, ccd->flags, ccd->set);
+			camel_object_unref (ccd->folder);
+			ccd->folder = NULL;
+			g_free (ccd->uid);
+			ccd->uid = NULL;
+		}
+
+		gtk_widget_destroy (GTK_WIDGET (send->composer));
+		
+		if (send->send && camel_session_is_online (session)) {
+			/* queue a message send */
+			mail_send ();
+		}
+	} else {
+		if (!ccd) {
+			ccd = ccd_new ();
+			
+			/* disconnect the previous signal handlers */
+			g_signal_handlers_disconnect_matched(send->composer, G_SIGNAL_MATCH_FUNC, 0,
+							     0, NULL, composer_send_cb, NULL);
+			g_signal_handlers_disconnect_matched(send->composer, G_SIGNAL_MATCH_FUNC, 0,
+							     0, NULL, composer_save_draft_cb, NULL);
+			
+			/* reconnect to the signals using a non-NULL ccd for the callback data */
+			g_signal_connect (send->composer, "send", G_CALLBACK (composer_send_cb), ccd);
+			g_signal_connect (send->composer, "save-draft", G_CALLBACK (composer_save_draft_cb), ccd);
+			
+			g_object_weak_ref ((GObject *) send->composer, (GWeakNotify) composer_destroy_cb, ccd);
+		}
+		
+		e_msg_composer_set_enable_autosave (send->composer, TRUE);
+		gtk_widget_show (GTK_WIDGET (send->composer));
+	}
+	
+	camel_message_info_free (info);
+	
+	if (send->ccd)
+		ccd_unref (send->ccd);
+	
+	g_object_unref(send->composer);
+	g_free (send);
+}
+
+static CamelMimeMessage *
+composer_get_message (EMsgComposer *composer, gboolean post, gboolean save_html_object_data)
+{
+	CamelMimeMessage *message = NULL;
+	EDestination **recipients, **recipients_bcc;
+	gboolean send_html, confirm_html;
+	CamelInternetAddress *cia;
+	int hidden = 0, shown = 0;
+	int num = 0, num_bcc = 0;
+	const char *subject;
+	GConfClient *gconf;
+	EAccount *account;
+	int i;
+	
+	gconf = mail_config_get_gconf_client ();
+	
+	/* We should do all of the validity checks based on the composer, and not on
+	   the created message, as extra interaction may occur when we get the message
+	   (e.g. to get a passphrase to sign a message) */
+	
+	/* get the message recipients */
+	recipients = e_msg_composer_get_recipients (composer);
+	
+	cia = camel_internet_address_new ();
+	
+	/* see which ones are visible/present, etc */
+	if (recipients) {
+		for (i = 0; recipients[i] != NULL; i++) {
+			const char *addr = e_destination_get_address (recipients[i]);
+			
+			if (addr && addr[0]) {
+				camel_address_decode ((CamelAddress *) cia, addr);
+				if (camel_address_length ((CamelAddress *) cia) > 0) {
+					camel_address_remove ((CamelAddress *) cia, -1);
+					num++;
+					if (e_destination_is_evolution_list (recipients[i])
+					    && !e_destination_list_show_addresses (recipients[i])) {
+						hidden++;
+					} else {
+						shown++;
+					}
+				}
+			}
+		}
+	}
+	
+	recipients_bcc = e_msg_composer_get_bcc (composer);
+	if (recipients_bcc) {
+		for (i = 0; recipients_bcc[i] != NULL; i++) {
+			const char *addr = e_destination_get_address (recipients_bcc[i]);
+			
+			if (addr && addr[0]) {
+				camel_address_decode ((CamelAddress *) cia, addr);
+				if (camel_address_length ((CamelAddress *) cia) > 0) {
+					camel_address_remove ((CamelAddress *) cia, -1);
+					num_bcc++;
+				}
+			}
+		}
+		
+		e_destination_freev (recipients_bcc);
+	}
+	
+	camel_object_unref (cia);
+	
+	/* I'm sensing a lack of love, er, I mean recipients. */
+	if (num == 0 && !post) {
+		e_notice ((GtkWindow *) composer, GTK_MESSAGE_WARNING,
+			  _("You must specify recipients in order to send this message."));
+		goto finished;
+	}
+	
+	if (num > 0 && (num == num_bcc || shown == 0)) {
+		/* this means that the only recipients are Bcc's */		
+		if (!ask_confirm_for_only_bcc (composer, shown == 0))
+			goto finished;
+	}
+	
+	send_html = gconf_client_get_bool (gconf, "/apps/evolution/mail/composer/send_html", NULL);
+	confirm_html = gconf_client_get_bool (gconf, "/apps/evolution/mail/prompts/unwanted_html", NULL);
+	
+	/* Only show this warning if our default is to send html.  If it isn't, we've
+	   manually switched into html mode in the composer and (presumably) had a good
+	   reason for doing this. */
+	if (e_msg_composer_get_send_html (composer) && send_html && confirm_html) {
+		gboolean html_problem = FALSE;
+		
+		if (recipients) {
+			for (i = 0; recipients[i] != NULL && !html_problem; i++) {
+				if (!e_destination_get_html_mail_pref (recipients[i]))
+					html_problem = TRUE;
+			}
+		}
+		
+		if (html_problem) {
+			html_problem = !ask_confirm_for_unwanted_html_mail (composer, recipients);
+			if (html_problem)
+				goto finished;
+		}
+	}
+	
+	/* Check for no subject */
+	subject = e_msg_composer_get_subject (composer);
+	if (subject == NULL || subject[0] == '\0') {
+		if (!ask_confirm_for_empty_subject (composer))
+			goto finished;
+	}
+	
+	/* actually get the message now, this will sign/encrypt etc */
+	message = e_msg_composer_get_message (composer, save_html_object_data);
+	if (message == NULL)
+		goto finished;
+	
+	/* Add info about the sending account */
+	account = e_msg_composer_get_preferred_account (composer);
+	
+	if (account) {
+		camel_medium_set_header (CAMEL_MEDIUM (message), "X-Evolution-Account", account->name);
+		camel_medium_set_header (CAMEL_MEDIUM (message), "X-Evolution-Transport", account->transport->url);
+		camel_medium_set_header (CAMEL_MEDIUM (message), "X-Evolution-Fcc", account->sent_folder_uri);
+		if (account->id->organization && *account->id->organization)
+			camel_medium_set_header (CAMEL_MEDIUM (message), "Organization", account->id->organization);
+	}
+	
+	/* Get the message recipients and 'touch' them, boosting their use scores */
+	if (recipients)
+		e_destination_touchv (recipients);
+	
+ finished:
+	
+	if (recipients)
+		e_destination_freev (recipients);
+	
+	return message;
+}
+
+static void
+got_post_folder (char *uri, CamelFolder *folder, void *data)
+{
+	CamelFolder **fp = data;
+	
+	*fp = folder;
+	
+	if (folder)
+		camel_object_ref (folder);
+}
+
+void
+composer_send_cb (EMsgComposer *composer, gpointer user_data)
+{
+	extern CamelFolder *outbox_folder;
+	CamelMimeMessage *message;
+	CamelMessageInfo *info;
+	struct _send_data *send;
+	gboolean post = FALSE;
+	CamelFolder *folder;
+	XEvolution *xev;
+	char *url;
+	
+	url = e_msg_composer_hdrs_get_post_to ((EMsgComposerHdrs *) composer->hdrs);
+	if (url && *url) {
+		post = TRUE;
+		
+		mail_msg_wait (mail_get_folder (url, 0, got_post_folder, &folder, mail_thread_new));
+		
+		if (!folder) {
+			g_free (url);
+			return;
+		}
+	} else {
+		folder = outbox_folder;
+		camel_object_ref (folder);
+	}
+	
+	g_free (url);
+	
+	message = composer_get_message (composer, post, FALSE);
+	if (!message)
+		return;
+	
+	if (post) {
+		/* Remove the X-Evolution* headers if we are in Post-To mode */
+		xev = mail_tool_remove_xevolution_headers (message);
+		mail_tool_destroy_xevolution (xev);
+	}
+	
+	info = camel_message_info_new ();
+	info->flags = CAMEL_MESSAGE_SEEN;
+	
+	send = g_malloc (sizeof (*send));
+	send->ccd = user_data;
+	if (send->ccd)
+		ccd_ref (send->ccd);
+	send->send = !post;
+	send->composer = composer;
+	g_object_ref (composer);
+	gtk_widget_hide (GTK_WIDGET (composer));
+	
+	e_msg_composer_set_enable_autosave (composer, FALSE);
+	
+	mail_append_mail (folder, message, info, composer_send_queued_cb, send);
+	camel_object_unref (message);
+	camel_object_unref (folder);
+}
+
+struct _save_draft_info {
+	struct _composer_callback_data *ccd;
+	EMsgComposer *composer;
+	int quit;
+};
+
+static void
+save_draft_done (CamelFolder *folder, CamelMimeMessage *msg, CamelMessageInfo *info, int ok,
+		 const char *appended_uid, void *user_data)
+{
+	struct _save_draft_info *sdi = user_data;
+	struct _composer_callback_data *ccd;
+	CORBA_Environment ev;
+	
+	if (!ok)
+		goto done;
+	CORBA_exception_init (&ev);
+	GNOME_GtkHTML_Editor_Engine_runCommand (sdi->composer->editor_engine, "saved", &ev);
+	CORBA_exception_free (&ev);
+	
+	if ((ccd = sdi->ccd) == NULL) {
+		ccd = ccd_new ();
+		
+		/* disconnect the previous signal handlers */
+		g_signal_handlers_disconnect_by_func (sdi->composer, G_CALLBACK (composer_send_cb), NULL);
+		g_signal_handlers_disconnect_by_func (sdi->composer, G_CALLBACK (composer_save_draft_cb), NULL);
+		
+		/* reconnect to the signals using a non-NULL ccd for the callback data */
+		g_signal_connect (sdi->composer, "send", G_CALLBACK (composer_send_cb), ccd);
+		g_signal_connect (sdi->composer, "save-draft", G_CALLBACK (composer_save_draft_cb), ccd);
+		
+		g_object_weak_ref ((GObject *) sdi->composer, (GWeakNotify) composer_destroy_cb, ccd);
+	}
+	
+	if (ccd->drafts_folder) {
+		/* delete the original draft message */
+		camel_folder_set_message_flags (ccd->drafts_folder, ccd->drafts_uid,
+						CAMEL_MESSAGE_DELETED | CAMEL_MESSAGE_SEEN,
+						CAMEL_MESSAGE_DELETED | CAMEL_MESSAGE_SEEN);
+		camel_object_unref (ccd->drafts_folder);
+		ccd->drafts_folder = NULL;
+		g_free (ccd->drafts_uid);
+		ccd->drafts_uid = NULL;
+	}
+	
+	if (ccd->folder) {
+		/* set the replied flags etc */
+		camel_folder_set_message_flags (ccd->folder, ccd->uid, ccd->flags, ccd->set);
+		camel_object_unref (ccd->folder);
+		ccd->folder = NULL;
+		g_free (ccd->uid);
+		ccd->uid = NULL;
+	}
+	
+	if (appended_uid) {
+		camel_object_ref (folder);
+		ccd->drafts_folder = folder;
+		ccd->drafts_uid = g_strdup (appended_uid);
+	}
+	
+	if (sdi->quit)
+		gtk_widget_destroy (GTK_WIDGET (sdi->composer));
+	
+ done:
+	g_object_unref (sdi->composer);
+	if (sdi->ccd)
+		ccd_unref (sdi->ccd);
+	g_free (info);
+	g_free (sdi);
+}
+
+static void
+save_draft_folder (char *uri, CamelFolder *folder, gpointer data)
+{
+	CamelFolder **save = data;
+	
+	if (folder) {
+		*save = folder;
+		camel_object_ref (folder);
+	}
+}
+
+void
+composer_save_draft_cb (EMsgComposer *composer, int quit, gpointer user_data)
+{
+	extern char *default_drafts_folder_uri;
+	extern CamelFolder *drafts_folder;
+	struct _save_draft_info *sdi;
+	CamelFolder *folder = NULL;
+	CamelMimeMessage *msg;
+	CamelMessageInfo *info;
+	EAccount *account;
+	
+	account = e_msg_composer_get_preferred_account (composer);
+	if (account && account->drafts_folder_uri &&
+	    strcmp (account->drafts_folder_uri, default_drafts_folder_uri) != 0) {
+		int id;
+		
+		id = mail_get_folder (account->drafts_folder_uri, 0, save_draft_folder, &folder, mail_thread_new);
+		mail_msg_wait (id);
+		
+		if (!folder) {
+			if (!e_question ((GtkWindow *) composer, GTK_RESPONSE_YES, NULL,
+					 _("Unable to open the drafts folder for this account.\n"
+					   "Would you like to use the default drafts folder?")))
+				return;
+			
+			folder = drafts_folder;
+			camel_object_ref (drafts_folder);
+		}
+	} else {
+		folder = drafts_folder;
+		camel_object_ref (folder);
+	}
+	
+	msg = e_msg_composer_get_message_draft (composer);
+	
+	info = g_new0 (CamelMessageInfo, 1);
+	info->flags = CAMEL_MESSAGE_DRAFT | CAMEL_MESSAGE_SEEN;
+	
+	sdi = g_malloc (sizeof (struct _save_draft_info));
+	sdi->composer = composer;
+	g_object_ref (composer);
+	sdi->ccd = user_data;
+	if (sdi->ccd)
+		ccd_ref (sdi->ccd);
+	sdi->quit = quit;
+	
+	mail_append_mail (folder, msg, info, save_draft_done, sdi);
+	camel_object_unref (folder);
+	camel_object_unref (msg);
+}
+
+static GtkWidget *
+create_msg_composer (EAccount *account, gboolean post, const char *url)
+{
+	EMsgComposer *composer;
+	GConfClient *gconf;
+	gboolean send_html;
+	
+	/* Make sure that we've actually been passed in an account. If one has
+	 * not been passed in, grab the default account.
+	 */
+	if (account == NULL)
+		account = mail_config_get_default_account ();
+	
+	gconf = mail_config_get_gconf_client ();
+	send_html = gconf_client_get_bool (gconf, "/apps/evolution/mail/composer/send_html", NULL);
+	
+	if (post)
+		composer = e_msg_composer_new_post ();
+	else if (url)
+		composer = e_msg_composer_new_from_url (url);
+	else
+		composer = e_msg_composer_new ();
+	
+	if (composer) {
+		e_msg_composer_hdrs_set_from_account (E_MSG_COMPOSER_HDRS (composer->hdrs), account->name);
+		e_msg_composer_set_send_html (composer, send_html);
+		e_msg_composer_unset_changed (composer);
+		e_msg_composer_drop_editor_undo (composer);
+		return GTK_WIDGET (composer);
+	} else
+		return NULL;
+}
+
+void
+compose_msg (GtkWidget *widget, gpointer user_data)
+{
+	FolderBrowser *fb = FOLDER_BROWSER (user_data);
+	struct _composer_callback_data *ccd;
+	GtkWidget *composer;
+	EAccount *account;
+	
+	if (FOLDER_BROWSER_IS_DESTROYED (fb) || !check_send_configuration (fb))
+		return;
+	
+	/* Figure out which account we want to initially compose from */
+	account = mail_config_get_account_by_source_url (fb->uri);
+	
+	composer = create_msg_composer (account, FALSE, NULL);
+	if (!composer)
+		return;
+	
+	ccd = ccd_new ();
+	
+	g_signal_connect (composer, "send", G_CALLBACK (composer_send_cb), ccd);
+	g_signal_connect (composer, "save-draft", G_CALLBACK (composer_save_draft_cb), ccd);
+	
+	g_object_weak_ref ((GObject *) composer, (GWeakNotify) composer_destroy_cb, ccd);
+	
+	gtk_widget_show (composer);
+}
+
+/* Send according to a mailto (RFC 2368) URL. */
+void
+send_to_url (const char *url, const char *parent_uri)
+{
+	struct _composer_callback_data *ccd;
+	GtkWidget *composer;
+	EAccount *account = NULL;
+	
+	/* FIXME: no way to get folder browser? Not without
+	 * big pain in the ass, as far as I can tell */
+	if (!check_send_configuration (NULL))
+		return;
+	
+	if (parent_uri)
+		account = mail_config_get_account_by_source_url (parent_uri);
+	
+	composer = create_msg_composer (account, FALSE, url);
+	
+	if (!composer)
+		return;
+	
+	ccd = ccd_new ();
+	
+	g_signal_connect (composer, "send", G_CALLBACK (composer_send_cb), ccd);
+	g_signal_connect (composer, "save-draft", G_CALLBACK (composer_save_draft_cb), ccd);
+	
+	g_object_weak_ref ((GObject *) composer, (GWeakNotify) composer_destroy_cb, ccd);
+	
+	gtk_widget_show (composer);
+}	
+
+static GList *
+list_add_addresses (GList *list, const CamelInternetAddress *cia, GHashTable *account_hash,
+		    GHashTable *rcpt_hash, EAccount **me)
+{
+	const char *name, *addr;
+	EAccount *account;
+	int i;
+	
+	for (i = 0; camel_internet_address_get (cia, i, &name, &addr); i++) {
+		/* Here I'll check to see if the cc:'d address is the address
+		   of the sender, and if so, don't add it to the cc: list; this
+		   is to fix Bugzilla bug #455. */
+		account = g_hash_table_lookup (account_hash, addr);
+		if (account && me && !*me)
+			*me = account;
+		
+		if (!account && !g_hash_table_lookup (rcpt_hash, addr)) {
+			EDestination *dest;
+			
+			dest = e_destination_new ();
+			e_destination_set_name (dest, name);
+			e_destination_set_email (dest, addr);
+			
+			list = g_list_append (list, dest);
+			g_hash_table_insert (rcpt_hash, (char *) addr, GINT_TO_POINTER (1));
+		}
+	}
+	
+	return list;
+}
+
+static EAccount *
+guess_me (const CamelInternetAddress *to, const CamelInternetAddress *cc, GHashTable *account_hash)
+{
+	EAccount *account = NULL;
+	const char *addr;
+	int i;
+	
+	/* "optimization" */
+	if (!to && !cc)
+		return NULL;
+	
+	if (to) {
+		for (i = 0; camel_internet_address_get (to, i, NULL, &addr); i++) {
+			account = g_hash_table_lookup (account_hash, addr);
+			if (account)
+				goto found;
+		}
+	}
+	
+	if (cc) {
+		for (i = 0; camel_internet_address_get (cc, i, NULL, &addr); i++) {
+			account = g_hash_table_lookup (account_hash, addr);
+			if (account)
+				goto found;
+		}
+	}
+	
+ found:
+	
+	return account;
+}
+
+static EAccount *
+guess_me_from_accounts (const CamelInternetAddress *to, const CamelInternetAddress *cc, EAccountList *accounts)
+{
+	EAccount *account, *def;
+	GHashTable *account_hash;
+	EIterator *iter;
+	
+	account_hash = g_hash_table_new (camel_strcase_hash, camel_strcase_equal);
+	
+	/* add the default account to the hash first */
+	if ((def = mail_config_get_default_account ())) {
+		if (def->id->address)
+			g_hash_table_insert (account_hash, (char *) def->id->address, (void *) def);
+	}
+	
+	iter = e_list_get_iterator ((EList *) accounts);
+	while (e_iterator_is_valid (iter)) {
+		account = (EAccount *) e_iterator_get (iter);
+		
+		if (account->id->address) {
+			EAccount *acnt;
+			
+			/* Accounts with identical email addresses that are enabled
+			 * take precedence over the accounts that aren't. If all
+			 * accounts with matching email addresses are disabled, then
+			 * the first one in the list takes precedence. The default
+			 * account always takes precedence no matter what.
+			 */
+			acnt = g_hash_table_lookup (account_hash, account->id->address);
+			if (acnt && acnt != def && !acnt->enabled && account->enabled) {
+				g_hash_table_remove (account_hash, acnt->id->address);
+				acnt = NULL;
+			}
+			
+			if (!acnt)
+				g_hash_table_insert (account_hash, (char *) account->id->address, (void *) account);
+		}
+		
+		e_iterator_next (iter);
+	}
+	
+	g_object_unref (iter);
+	
+	account = guess_me (to, cc, account_hash);
+	
+	g_hash_table_destroy (account_hash);
+	
+	return account;
+}
+
+inline static void
+mail_ignore (EMsgComposer *composer, const char *name, const char *address)
+{
+	e_msg_composer_ignore (composer, name && *name ? name : address);
+}
+
+static void
+mail_ignore_address (EMsgComposer *composer, const CamelInternetAddress *addr)
+{
+	const char *name, *address;
+	int i, max;
+	
+	max = camel_address_length (CAMEL_ADDRESS (addr));
+	for (i = 0; i < max; i++) {
+		camel_internet_address_get (addr, i, &name, &address);
+		mail_ignore (composer, name, address);
+	}
+}
+
+#define MAX_SUBJECT_LEN  1024
+
+static EMsgComposer *
+mail_generate_reply (CamelFolder *folder, CamelMimeMessage *message, const char *uid, int mode)
+{
+	const CamelInternetAddress *reply_to, *sender, *to_addrs, *cc_addrs;
+	const char *name = NULL, *address = NULL, *source = NULL;
+	const char *message_id, *references, *mlist = NULL;
+	char *text = NULL, *subject, format[256];
+	EAccount *def, *account, *me = NULL;
+	EAccountList *accounts = NULL;
+	GHashTable *account_hash = NULL;
+	CamelMessageInfo *info = NULL;
+	GList *to = NULL, *cc = NULL;
+	EDestination **tov, **ccv;
+	EMsgComposer *composer;
+	CamelMimePart *part;
+	GConfClient *gconf;
+	EIterator *iter;
+	time_t date;
+	int date_ofs;
+	char *url;
+	
+	gconf = mail_config_get_gconf_client ();
+	
+	if (mode == REPLY_POST) {
+		composer = e_msg_composer_new_post ();
+		if (composer != NULL) {
+			url = mail_tools_folder_to_url (folder);
+			e_msg_composer_hdrs_set_post_to ((EMsgComposerHdrs *) composer->hdrs, url);
+			g_free (url);
+		}
+	} else
+		composer = e_msg_composer_new ();
+	
+	if (!composer)
+		return NULL;
+	
+	e_msg_composer_add_message_attachments (composer, message, TRUE);
+	
+	/* Set the recipients */
+	accounts = mail_config_get_accounts ();
+	account_hash = g_hash_table_new (camel_strcase_hash, camel_strcase_equal);
+	
+	/* add the default account to the hash first */
+	if ((def = mail_config_get_default_account ())) {
+		if (def->id->address)
+			g_hash_table_insert (account_hash, (char *) def->id->address, (void *) def);
+	}
+	
+	iter = e_list_get_iterator ((EList *) accounts);
+	while (e_iterator_is_valid (iter)) {
+		account = (EAccount *) e_iterator_get (iter);
+		
+		if (account->id->address) {
+			EAccount *acnt;
+			
+			/* Accounts with identical email addresses that are enabled
+			 * take precedence over the accounts that aren't. If all
+			 * accounts with matching email addresses are disabled, then
+			 * the first one in the list takes precedence. The default
+			 * account always takes precedence no matter what.
+			 */
+			acnt = g_hash_table_lookup (account_hash, account->id->address);
+			if (acnt && acnt != def && !acnt->enabled && account->enabled) {
+				g_hash_table_remove (account_hash, acnt->id->address);
+				acnt = NULL;
+			}
+			
+			if (!acnt)
+				g_hash_table_insert (account_hash, (char *) account->id->address, (void *) account);
+		}
+		
+		e_iterator_next (iter);
+	}
+	
+	g_object_unref (iter);
+	
+	to_addrs = camel_mime_message_get_recipients (message, CAMEL_RECIPIENT_TYPE_TO);
+	cc_addrs = camel_mime_message_get_recipients (message, CAMEL_RECIPIENT_TYPE_CC);
+	mail_ignore_address (composer, to_addrs);
+	mail_ignore_address (composer, cc_addrs);
+	
+	if (mode == REPLY_LIST) {
+		/* make sure we can reply to an mlist */
+		info = camel_folder_get_message_info (folder, uid);
+		if (!(mlist = camel_message_info_mlist (info)) || *mlist == '\0') {
+			camel_folder_free_message_info (folder, info);
+			mode = REPLY_ALL;
+			info = NULL;
+		}
+	}
+	
+ determine_recipients:
+	if (mode == REPLY_LIST) {
+		EDestination *dest;
+		int i, max;
+		
+		/* look through the recipients to find the *real* mailing list address */
+		d(printf ("we are looking for the mailing list called: %s\n", mlist));
+		
+		max = camel_address_length (CAMEL_ADDRESS (to_addrs));
+		for (i = 0; i < max; i++) {
+			camel_internet_address_get (to_addrs, i, &name, &address);
+			if (!strcasecmp (address, mlist))
+				break;
+		}
+		
+		if (i == max) {
+			max = camel_address_length (CAMEL_ADDRESS (cc_addrs));
+			for (i = 0; i < max; i++) {
+				camel_internet_address_get (cc_addrs, i, &name, &address);
+				if (!strcasecmp (address, mlist))
+					break;
+			}
+		}
+		
+		if (address && i != max) {
+			dest = e_destination_new ();
+			e_destination_set_name (dest, name);
+			e_destination_set_email (dest, address);
+			
+			to = g_list_append (to, dest);
+		} else {
+			/* mailing list address wasn't found */
+			if (strchr (mlist, '@')) {
+				/* mlist string has an @, maybe it's valid? */
+				dest = e_destination_new ();
+				e_destination_set_email (dest, mlist);
+				
+				to = g_list_append (to, dest);
+			} else {
+				/* give up and just reply to all recipients? */
+				mode = REPLY_ALL;
+				camel_folder_free_message_info (folder, info);
+				goto determine_recipients;
+			}
+		}
+		
+		me = guess_me (to_addrs, cc_addrs, account_hash);
+		camel_folder_free_message_info (folder, info);
+	} else {
+		GHashTable *rcpt_hash;
+		EDestination *dest;
+		
+		rcpt_hash = g_hash_table_new (camel_strcase_hash, camel_strcase_equal);
+		
+		reply_to = camel_mime_message_get_reply_to (message);
+		if (!reply_to)
+			reply_to = camel_mime_message_get_from (message);
+		
+		if (reply_to) {
+			int i;
+			
+			for (i = 0; camel_internet_address_get (reply_to, i, &name, &address); i++) {
+				/* ignore references to the Reply-To address in the To and Cc lists */
+				if (address && !(mode == REPLY_ALL && g_hash_table_lookup (account_hash, address))) {
+					/* In the case that we are doing a Reply-To-All, we do not want
+					   to include the user's email address because replying to oneself
+					   is kinda silly. */
+					dest = e_destination_new ();
+					e_destination_set_name (dest, name);
+					e_destination_set_email (dest, address);
+					to = g_list_append (to, dest);
+					g_hash_table_insert (rcpt_hash, (char *) address, GINT_TO_POINTER (1));
+					mail_ignore (composer, name, address);
+				}
+			}
+		}
+		
+		if (mode == REPLY_ALL) {
+			cc = list_add_addresses (cc, to_addrs, account_hash, rcpt_hash, me ? NULL : &me);
+			cc = list_add_addresses (cc, cc_addrs, account_hash, rcpt_hash, me ? NULL : &me);
+			
+			/* promote the first Cc: address to To: if To: is empty */
+			if (to == NULL && cc != NULL) {
+				to = cc;
+				cc = g_list_remove_link (cc, to);
+			}
+		} else {
+			me = guess_me (to_addrs, cc_addrs, account_hash);
+		}
+		
+		g_hash_table_destroy (rcpt_hash);
+	}
+	
+	g_hash_table_destroy (account_hash);
+	
+	if (!me) {
+		/* default 'me' to the source account... */
+		if ((source = camel_mime_message_get_source (message)))
+			me = mail_config_get_account_by_source_url (source);
+	}
+	
+	/* set body text here as we want all ignored words to take effect */
+	switch (gconf_client_get_int (gconf, "/apps/evolution/mail/format/reply_style", NULL)) {
+	case MAIL_CONFIG_REPLY_DO_NOT_QUOTE:
+		/* do nothing */
+		break;
+	case MAIL_CONFIG_REPLY_ATTACH:
+		/* attach the original message as an attachment */
+		part = mail_tool_make_message_attachment (message);
+		e_msg_composer_attach (composer, part);
+		camel_object_unref (part);
+		break;
+	case MAIL_CONFIG_REPLY_QUOTED:
+	default:
+		/* do what any sane user would want when replying... */
+		sender = camel_mime_message_get_from (message);
+		if (sender != NULL && camel_address_length (CAMEL_ADDRESS (sender)) > 0) {
+			camel_internet_address_get (sender, 0, &name, &address);
+		} else {
+			name = _("an unknown sender");
+		}
+		
+		date = camel_mime_message_get_date (message, &date_ofs);
+		/* Convert to UTC */
+		date += (date_ofs / 100) * 60 * 60;
+		date += (date_ofs % 100) * 60;
+
+		/* translators: attribution string used when quoting messages */
+		e_utf8_strftime (format, sizeof (format), _("On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"), gmtime (&date));
+		text = mail_tool_quote_message (message, format, date_ofs, name && *name ? name : address);
+		mail_ignore (composer, name, address);
+		if (text) {
+			e_msg_composer_set_body_text (composer, text);
+			g_free (text);
+		}
+		break;
+	}
+	
+	/* Set the subject of the new message. */
+	subject = (char *) camel_mime_message_get_subject (message);
+	if (!subject)
+		subject = g_strdup ("");
+	else {
+		if (!strncasecmp (subject, "Re: ", 4))
+			subject = g_strndup (subject, MAX_SUBJECT_LEN);
+		else {
+			if (strlen (subject) < MAX_SUBJECT_LEN) {
+				subject = g_strdup_printf ("Re: %s", subject);
+			} else {
+				/* We can't use %.*s because it depends on the locale being C/POSIX
+                                   or UTF-8 to work correctly in glibc */
+				char *sub;
+				
+				/*subject = g_strdup_printf ("Re: %.*s...", MAX_SUBJECT_LEN, subject);*/
+				sub = g_malloc (MAX_SUBJECT_LEN + 8);
+				memcpy (sub, "Re: ", 4);
+				memcpy (sub + 4, subject, MAX_SUBJECT_LEN);
+				memcpy (sub + 4 + MAX_SUBJECT_LEN, "...", 4);
+				subject = sub;
+			}
+		}
+	}
+	
+	tov = e_destination_list_to_vector (to);
+	ccv = e_destination_list_to_vector (cc);
+	
+	g_list_free (to);
+	g_list_free (cc);
+	
+	e_msg_composer_set_headers (composer, me ? me->name : NULL, tov, ccv, NULL, subject);
+	
+	e_destination_freev (tov);
+	e_destination_freev (ccv);
+	
+	g_free (subject);
+	
+	/* Add In-Reply-To and References. */
+	message_id = camel_medium_get_header (CAMEL_MEDIUM (message), "Message-Id");
+	references = camel_medium_get_header (CAMEL_MEDIUM (message), "References");
+	if (message_id) {
+		char *reply_refs;
+		
+		e_msg_composer_add_header (composer, "In-Reply-To", message_id);
+		
+		if (references)
+			reply_refs = g_strdup_printf ("%s %s", references, message_id);
+		else
+			reply_refs = g_strdup (message_id);
+		
+		e_msg_composer_add_header (composer, "References", reply_refs);
+		g_free (reply_refs);
+	} else if (references) {
+		e_msg_composer_add_header (composer, "References", references);
+	}
+	
+	e_msg_composer_drop_editor_undo (composer);
+	
+	return composer;
+}
+
+static void
+requeue_mail_reply (CamelFolder *folder, const char *uid, CamelMimeMessage *msg, void *data)
+{
+	int mode = GPOINTER_TO_INT (data);
+	
+	if (msg != NULL)
+		mail_reply (folder, msg, uid, mode);
+}
+
+void
+mail_reply (CamelFolder *folder, CamelMimeMessage *msg, const char *uid, int mode)
+{
+	struct _composer_callback_data *ccd;
+	EMsgComposer *composer;
+	
+	g_return_if_fail (CAMEL_IS_FOLDER (folder));
+	g_return_if_fail (uid != NULL);
+	
+	if (!msg) {
+		mail_get_message (folder, uid, requeue_mail_reply,
+				  GINT_TO_POINTER (mode), mail_thread_new);
+		return;
+	}
+	
+	composer = mail_generate_reply (folder, msg, uid, mode);
+	if (!composer)
+		return;
+	
+	ccd = ccd_new ();
+	
+	camel_object_ref (folder);
+	ccd->folder = folder;
+	ccd->uid = g_strdup (uid);
+	ccd->flags = CAMEL_MESSAGE_ANSWERED | CAMEL_MESSAGE_SEEN;
+	if (mode == REPLY_LIST || mode == REPLY_ALL)
+		ccd->flags |= CAMEL_MESSAGE_ANSWERED_ALL;
+	ccd->set = ccd->flags;
+	
+	g_signal_connect (composer, "send", G_CALLBACK (composer_send_cb), ccd);
+	g_signal_connect (composer, "save-draft", G_CALLBACK (composer_save_draft_cb), ccd);
+	
+	g_object_weak_ref ((GObject *) composer, (GWeakNotify) composer_destroy_cb, ccd);
+	
+	gtk_widget_show (GTK_WIDGET (composer));	
+	e_msg_composer_unset_changed (composer);
+}
+
+void
+reply_to_sender (GtkWidget *widget, gpointer user_data)
+{
+	FolderBrowser *fb = FOLDER_BROWSER (user_data);
+	
+	if (FOLDER_BROWSER_IS_DESTROYED (fb) || !check_send_configuration (fb))
+		return;
+	
+	mail_reply (fb->folder, NULL, fb->message_list->cursor_uid, REPLY_SENDER);
+}
+
+void
+reply_to_list (GtkWidget *widget, gpointer user_data)
+{
+	FolderBrowser *fb = FOLDER_BROWSER (user_data);
+	
+	if (FOLDER_BROWSER_IS_DESTROYED (fb) || !check_send_configuration (fb))
+		return;
+	
+	mail_reply (fb->folder, NULL, fb->message_list->cursor_uid, REPLY_LIST);
+}
+
+void
+reply_to_all (GtkWidget *widget, gpointer user_data)
+{
+	FolderBrowser *fb = FOLDER_BROWSER (user_data);
+	
+	if (FOLDER_BROWSER_IS_DESTROYED (fb) || !check_send_configuration (fb))
+		return;
+	
+	mail_reply(fb->folder, NULL, fb->message_list->cursor_uid, REPLY_ALL);
+}
+
+void
+enumerate_msg (MessageList *ml, const char *uid, gpointer data)
+{
+	g_return_if_fail (ml != NULL);
+	
+	g_ptr_array_add ((GPtrArray *) data, g_strdup (uid));
+}
+
+
+static EMsgComposer *
+forward_get_composer (CamelMimeMessage *message, const char *subject)
+{
+	struct _composer_callback_data *ccd;
+	EAccount *account = NULL;
+	EMsgComposer *composer;
+	
+	if (message) {
+		const CamelInternetAddress *to_addrs, *cc_addrs;
+		EAccountList *accounts;
+		
+		accounts = mail_config_get_accounts ();
+		to_addrs = camel_mime_message_get_recipients (message, CAMEL_RECIPIENT_TYPE_TO);
+		cc_addrs = camel_mime_message_get_recipients (message, CAMEL_RECIPIENT_TYPE_CC);
+		
+		account = guess_me_from_accounts (to_addrs, cc_addrs, accounts);
+		
+		if (!account) {
+			const char *source;
+			
+			source = camel_mime_message_get_source (message);
+			account = mail_config_get_account_by_source_url (source);
+		}
+	}
+	
+	if (!account)
+		account = mail_config_get_default_account ();
+	
+	composer = e_msg_composer_new ();
+	if (composer) {
+		ccd = ccd_new ();
+		
+		g_signal_connect (composer, "send", G_CALLBACK (composer_send_cb), ccd);
+		g_signal_connect (composer, "save-draft", G_CALLBACK (composer_save_draft_cb), ccd);
+		
+		g_object_weak_ref ((GObject *) composer, (GWeakNotify) composer_destroy_cb, ccd);
+		
+		e_msg_composer_set_headers (composer, account->name, NULL, NULL, NULL, subject);
+	} else {
+		g_warning ("Could not create composer");
+	}
+	
+	return composer;
+}
+
+static void
+do_forward_non_attached (CamelFolder *folder, GPtrArray *uids, GPtrArray *messages, void *data)
+{
+	MailConfigForwardStyle style = GPOINTER_TO_INT (data);
+	CamelMimeMessage *message;
+	char *subject, *text;
+	int i;
+	
+	if (messages->len == 0)
+		return;
+	
+	for (i = 0; i < messages->len; i++) {
+		message = messages->pdata[i];
+		subject = mail_tool_generate_forward_subject (message);
+		text = mail_tool_forward_message (message, style == MAIL_CONFIG_FORWARD_QUOTED);
+		
+		if (text) {
+			EMsgComposer *composer = forward_get_composer (message, subject);
+			if (composer) {
+				CamelDataWrapper *wrapper;
+				
+				e_msg_composer_set_body_text (composer, text);
+				
+				wrapper = camel_medium_get_content_object (CAMEL_MEDIUM (message));
+				if (CAMEL_IS_MULTIPART (wrapper))
+					e_msg_composer_add_message_attachments (composer, message, FALSE);
+				
+				gtk_widget_show (GTK_WIDGET (composer));
+				e_msg_composer_unset_changed (composer);
+				e_msg_composer_drop_editor_undo (composer);
+			}
+			g_free (text);
+		}
+		
+		g_free (subject);
+	}
+}
+
+static void
+forward_message (FolderBrowser *fb, MailConfigForwardStyle style)
+{
+	GPtrArray *uids;
+	
+	if (FOLDER_BROWSER_IS_DESTROYED (fb))
+		return;
+	
+	if (!check_send_configuration (fb))
+		return;
+	
+	uids = g_ptr_array_new ();
+	message_list_foreach (fb->message_list, enumerate_msg, uids);
+	
+	mail_get_messages (fb->folder, uids, do_forward_non_attached, GINT_TO_POINTER (style));
+}
+
+void
+forward_inline (GtkWidget *widget, gpointer user_data)
+{
+	forward_message (user_data, MAIL_CONFIG_FORWARD_INLINE);
+}
+
+void
+forward_quoted (GtkWidget *widget, gpointer user_data)
+{
+	forward_message (user_data, MAIL_CONFIG_FORWARD_QUOTED);
+}
+
+static void
+do_forward_attach (CamelFolder *folder, GPtrArray *messages, CamelMimePart *part, char *subject, void *data)
+{
+	CamelMimeMessage *message = data;
+	
+	if (part) {
+		EMsgComposer *composer = forward_get_composer (message, subject);
+		if (composer) {
+			e_msg_composer_attach (composer, part);
+			gtk_widget_show (GTK_WIDGET (composer));
+			e_msg_composer_unset_changed (composer);
+			e_msg_composer_drop_editor_undo (composer);
+		}
+	}
+}
+
+void
+forward_attached (GtkWidget *widget, gpointer user_data)
+{
+	FolderBrowser *fb = (FolderBrowser *) user_data;
+	GPtrArray *uids;
+	
+	if (FOLDER_BROWSER_IS_DESTROYED (fb) || !check_send_configuration (fb))
+		return;
+	
+	uids = g_ptr_array_new ();
+	message_list_foreach (fb->message_list, enumerate_msg, uids);
+	mail_build_attachment (fb->folder, uids, do_forward_attach,
+			       uids->len == 1 ? fb->mail_display->current_message : NULL);
+}
+
+void
+forward (GtkWidget *widget, gpointer user_data)
+{
+	MailConfigForwardStyle style;
+	GConfClient *gconf;
+	
+	gconf = mail_config_get_gconf_client ();
+	style = gconf_client_get_int (gconf, "/apps/evolution/mail/format/forward_style", NULL);
+	
+	if (style == MAIL_CONFIG_FORWARD_ATTACHED)
+		forward_attached (widget, user_data);
+	else
+		forward_message (user_data, style);
+}
+
+
+void
+post_to_url (const char *url)
+{
+	struct _composer_callback_data *ccd;
+	GtkWidget *composer;
+	EAccount *account = NULL;
+	
+	/* FIXME: no way to get folder browser? Not without
+	 * big pain in the ass, as far as I can tell */
+	if (!check_send_configuration (NULL))
+		return;
+	
+	if (url)
+		account = mail_config_get_account_by_source_url (url);
+	
+	composer = create_msg_composer (account, TRUE, NULL);
+	if (!composer)
+		return;
+	
+	e_msg_composer_hdrs_set_post_to ((EMsgComposerHdrs *) ((EMsgComposer *) composer)->hdrs, url);
+	
+	ccd = ccd_new ();
+	
+	g_signal_connect (composer, "send", G_CALLBACK (composer_send_cb), ccd);
+	g_signal_connect (composer, "save-draft", G_CALLBACK (composer_save_draft_cb), ccd);
+	
+	g_object_weak_ref ((GObject *) composer, (GWeakNotify) composer_destroy_cb, ccd);
+	
+	gtk_widget_show (composer);
+}
+
+void
+post_message (GtkWidget *widget, gpointer user_data)
+{
+	FolderBrowser *fb = FOLDER_BROWSER (user_data);
+	char *url;
+	
+	if (FOLDER_BROWSER_IS_DESTROYED (fb) || !check_send_configuration (fb))
+		return;
+	
+	url = mail_tools_folder_to_url (fb->folder);
+	post_to_url (url);
+	g_free (url);
+}
+
+void
+post_reply (GtkWidget *widget, gpointer user_data)
+{
+	FolderBrowser *fb = FOLDER_BROWSER (user_data);
+	
+	if (FOLDER_BROWSER_IS_DESTROYED (fb) || !check_send_configuration (fb))
+		return;
+	
+	mail_reply (fb->folder, NULL, fb->message_list->cursor_uid, REPLY_POST);
+}
+
+
+static EMsgComposer *
+redirect_get_composer (CamelMimeMessage *message)
+{
+	const CamelInternetAddress *to_addrs, *cc_addrs;
+	struct _composer_callback_data *ccd;
+	EAccountList *accounts = NULL;
+	EAccount *account = NULL;
+	EMsgComposer *composer;
+	
+	g_return_val_if_fail (CAMEL_IS_MIME_MESSAGE (message), NULL);
+	
+	accounts = mail_config_get_accounts ();
+	to_addrs = camel_mime_message_get_recipients (message, CAMEL_RECIPIENT_TYPE_TO);
+	cc_addrs = camel_mime_message_get_recipients (message, CAMEL_RECIPIENT_TYPE_CC);
+	
+	account = guess_me_from_accounts (to_addrs, cc_addrs, accounts);
+	
+	if (!account) {
+		const char *source;
+		
+		source = camel_mime_message_get_source (message);
+		account = mail_config_get_account_by_source_url (source);
+	}
+	
+	if (!account)
+		account = mail_config_get_default_account ();
+	
+	/* QMail will refuse to send a message if it finds one of
+           it's Delivered-To headers in the message, so remove all
+           Delivered-To headers. Fixes bug #23635. */
+	while (camel_medium_get_header (CAMEL_MEDIUM (message), "Delivered-To"))
+		camel_medium_remove_header (CAMEL_MEDIUM (message), "Delivered-To");
+	
+	composer = e_msg_composer_new_redirect (message, account->name);
+	if (composer) {
+		ccd = ccd_new ();
+		
+		g_signal_connect (composer, "send", G_CALLBACK (composer_send_cb), ccd);
+		g_signal_connect (composer, "save-draft", G_CALLBACK (composer_save_draft_cb), ccd);
+		
+		g_object_weak_ref ((GObject *) composer, (GWeakNotify) composer_destroy_cb, ccd);
+	} else {
+		g_warning ("Could not create composer");
+	}
+	
+	return composer;
+}
+
+static void
+do_redirect (CamelFolder *folder, const char *uid, CamelMimeMessage *message, void *data)
+{
+	EMsgComposer *composer;
+	
+	if (!message)
+		return;
+	
+	composer = redirect_get_composer (message);
+	if (composer) {
+		CamelDataWrapper *wrapper;
+		
+		wrapper = camel_medium_get_content_object (CAMEL_MEDIUM (message));
+		if (CAMEL_IS_MULTIPART (wrapper))
+			e_msg_composer_add_message_attachments (composer, message, FALSE);
+		
+		gtk_widget_show (GTK_WIDGET (composer));
+		e_msg_composer_unset_changed (composer);
+		e_msg_composer_drop_editor_undo (composer);
+	}
+}
+
+void
+redirect (GtkWidget *widget, gpointer user_data)
+{
+	FolderBrowser *fb = (FolderBrowser *) user_data;
+	
+	if (FOLDER_BROWSER_IS_DESTROYED (fb))
+		return;
+	
+	if (!check_send_configuration (fb))
+		return;
+	
+	mail_get_message (fb->folder, fb->message_list->cursor_uid,
+			  do_redirect, NULL, mail_thread_new);
+}
+
+static void
+transfer_msg_done (gboolean ok, void *data)
+{
+	FolderBrowser *fb = data;
+	gboolean hide_deleted;
+	GConfClient *gconf;
+	int row;
+	
+	if (ok && !FOLDER_BROWSER_IS_DESTROYED (fb)) {
+		gconf = mail_config_get_gconf_client ();
+		hide_deleted = !gconf_client_get_bool (gconf, "/apps/evolution/mail/display/show_deleted", NULL);
+		
+		row = e_tree_row_of_node (fb->message_list->tree,
+					  e_tree_get_cursor (fb->message_list->tree));
+		
+		/* If this is the last message and deleted messages
+                   are hidden, select the previous */
+		if ((row + 1 == e_tree_row_count (fb->message_list->tree)) && hide_deleted)
+			message_list_select (fb->message_list, MESSAGE_LIST_SELECT_PREVIOUS,
+					     0, CAMEL_MESSAGE_DELETED, FALSE);
+		else
+			message_list_select (fb->message_list, MESSAGE_LIST_SELECT_NEXT,
+					     0, 0, FALSE);
+	}
+	
+	g_object_unref (fb);
+}
+
+static void
+transfer_msg (FolderBrowser *fb, gboolean delete_from_source)
+{
+	static const char *allowed_types[] = { "mail/*", "vtrash", NULL };
+	extern EvolutionShellClient *global_shell_client;
+	GNOME_Evolution_Folder *folder;
+	static char *last_uri = NULL;
+	GPtrArray *uids;
+	char *desc;
+	
+	if (FOLDER_BROWSER_IS_DESTROYED (fb))
+		return;
+	
+	if (last_uri == NULL)
+		last_uri = g_strdup (fb->uri);
+	
+	if (delete_from_source)
+		desc = _("Move message(s) to");
+	else
+		desc = _("Copy message(s) to");
+	
+	evolution_shell_client_user_select_folder (global_shell_client,
+						   GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (fb))),
+						   desc, last_uri, allowed_types,
+						   &folder);
+	if (!folder)
+		return;
+	
+	if (strcmp (last_uri, folder->evolutionUri) != 0) {
+		g_free (last_uri);
+		last_uri = g_strdup (folder->evolutionUri);
+	}
+	
+	uids = g_ptr_array_new ();
+	message_list_foreach (fb->message_list, enumerate_msg, uids);
+	
+	if (delete_from_source) {
+		g_object_ref (fb);
+		mail_transfer_messages (fb->folder, uids, delete_from_source,
+					folder->physicalUri, 0,
+					transfer_msg_done, fb);
+	} else {
+		mail_transfer_messages (fb->folder, uids, delete_from_source,
+					folder->physicalUri, 0, NULL, NULL);
+	}
+	
+	CORBA_free (folder);
+}
+
+void
+move_msg_cb (GtkWidget *widget, gpointer user_data)
+{
+	transfer_msg (user_data, TRUE);
+}
+
+void
+move_msg (BonoboUIComponent *uih, void *user_data, const char *path)
+{
+	transfer_msg (user_data, TRUE);
+}
+
+void
+copy_msg_cb (GtkWidget *widget, gpointer user_data)
+{
+	transfer_msg (user_data, FALSE);
+}
+
+void
+copy_msg (BonoboUIComponent *uih, void *user_data, const char *path)
+{
+	transfer_msg (user_data, FALSE);
+}
+
+/* Copied from e-shell-view.c */
+static GtkWidget *
+find_socket (GtkContainer *container)
+{
+        GList *children, *tmp;
+	
+        children = gtk_container_get_children (container);
+        while (children) {
+                if (BONOBO_IS_SOCKET (children->data))
+                        return children->data;
+                else if (GTK_IS_CONTAINER (children->data)) {
+                        GtkWidget *socket = find_socket (children->data);
+                        if (socket)
+                                return socket;
+                }
+                tmp = children->next;
+                g_list_free_1 (children);
+                children = tmp;
+        }
+	
+	return NULL;
+}
+
+static void
+popup_listener_cb (BonoboListener *listener,
+		   const char *event_name,
+		   const CORBA_any *any,
+		   CORBA_Environment *ev,
+		   gpointer user_data)
+{
+	char *type = bonobo_event_subtype (event_name);
+	
+	if (!strcmp (type, "Destroy")) {
+		gtk_widget_destroy (GTK_WIDGET (user_data));
+	}
+	
+	g_free (type);
+}
+
+void
+addrbook_sender (GtkWidget *widget, gpointer user_data)
+{
+	FolderBrowser *fb = FOLDER_BROWSER (user_data);
+	const char *addr_str;
+	CamelMessageInfo *info;
+	GtkWidget *win;
+	GtkWidget *control;
+	GtkWidget *socket;
+	GPtrArray *uids;
+	int i;
+	
+	if (FOLDER_BROWSER_IS_DESTROYED (fb))
+		return;
+	
+	uids = g_ptr_array_new ();
+	message_list_foreach (fb->message_list, enumerate_msg, uids);
+	if (uids->len != 1)
+		goto done;
+	
+	info = camel_folder_get_message_info (fb->folder, uids->pdata[0]);
+	if (info == NULL || (addr_str = camel_message_info_from (info)) == NULL)
+		goto done;
+	
+	win = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+	gtk_window_set_title (GTK_WINDOW (win), _("Sender"));
+	
+	control = bonobo_widget_new_control ("OAFIID:GNOME_Evolution_Addressbook_AddressPopup",
+					     CORBA_OBJECT_NIL);
+	bonobo_widget_set_property (BONOBO_WIDGET (control),
+				    "email", TC_CORBA_string, addr_str,
+				    NULL);
+	
+	bonobo_event_source_client_add_listener (bonobo_widget_get_objref (BONOBO_WIDGET (control)),
+						 popup_listener_cb, NULL, NULL, win);
+	
+	socket = find_socket (GTK_CONTAINER (control));
+	
+	g_object_weak_ref ((GObject *) socket, (GWeakNotify) gtk_widget_destroy, win);
+	
+	gtk_container_add (GTK_CONTAINER (win), control);
+	gtk_widget_show_all (win);
+
+done:
+	for (i = 0; i < uids->len; i++)
+		g_free (uids->pdata[i]);
+	g_ptr_array_free (uids, TRUE);
+}
+
+void
+add_sender_to_addrbook (BonoboUIComponent *uih, void *user_data, const char *path)
+{
+	addrbook_sender (NULL, user_data);
+}
+
+void
+apply_filters (GtkWidget *widget, gpointer user_data)
+{
+	FolderBrowser *fb = FOLDER_BROWSER (user_data);
+	GPtrArray *uids;
+	
+	if (FOLDER_BROWSER_IS_DESTROYED (fb))
+		return;
+	
+	uids = g_ptr_array_new ();
+	message_list_foreach (fb->message_list, enumerate_msg, uids);
+	
+	mail_filter_on_demand (fb->folder, uids);
+}
+
+void
+select_all (BonoboUIComponent *uih, void *user_data, const char *path)
+{
+	FolderBrowser *fb = FOLDER_BROWSER (user_data);
+	ESelectionModel *etsm;
+	
+	if (FOLDER_BROWSER_IS_DESTROYED (fb))
+		return;
+	
+	if (GTK_WIDGET_HAS_FOCUS (fb->mail_display->html)) {
+		gtk_html_select_all (fb->mail_display->html);
+	} else {
+		etsm = e_tree_get_selection_model (fb->message_list->tree);
+		
+		e_selection_model_select_all (etsm);
+	}
+}
+
+/* Thread selection */
+
+typedef struct thread_select_info {
+	MessageList *ml;
+	GPtrArray *paths;
+} thread_select_info_t;
+
+static gboolean
+select_node (ETreeModel *tm, ETreePath path, gpointer user_data)
+{
+	thread_select_info_t *tsi = (thread_select_info_t *) user_data;
+	
+	g_ptr_array_add (tsi->paths, path);
+	return FALSE; /*not done yet*/
+}
+
+static void
+thread_select_foreach (ETreePath path, gpointer user_data)
+{
+	thread_select_info_t *tsi = (thread_select_info_t *) user_data;
+	ETreeModel *tm = tsi->ml->model;
+	ETreePath node;
+	
+	/* @path part of the initial selection. If it has children,
+	 * we select them as well. If it doesn't, we select its siblings and
+	 * their children (ie, the current node must be inside the thread
+	 * that the user wants to mark.
+	 */
+	
+	if (e_tree_model_node_get_first_child (tm, path)) 
+		node = path;
+	else {
+		node = e_tree_model_node_get_parent (tm, path);
+		
+		/* Let's make an exception: if no parent, then we're about
+		 * to mark the whole tree. No. */
+		if (e_tree_model_node_is_root (tm, node)) 
+			node = path;
+	}
+	
+	e_tree_model_node_traverse (tm, node, select_node, tsi);
+}
+
+void
+select_thread (BonoboUIComponent *uih, void *user_data, const char *path)
+{
+	FolderBrowser *fb = FOLDER_BROWSER (user_data);
+	ETreeSelectionModel *selection_model;
+	thread_select_info_t tsi;
+	int i;
+	
+	if (FOLDER_BROWSER_IS_DESTROYED (fb))
+		return;
+	
+	/* For every selected item, select the thread containing it.
+	 * We can't alter the selection while iterating through it,
+	 * so build up a list of paths.
+	 */
+	
+	tsi.ml = fb->message_list;
+	tsi.paths = g_ptr_array_new ();
+	
+	e_tree_selected_path_foreach (fb->message_list->tree, thread_select_foreach, &tsi);
+	
+	selection_model = E_TREE_SELECTION_MODEL (e_tree_get_selection_model (fb->message_list->tree));
+	
+	for (i = 0; i < tsi.paths->len; i++)
+		e_tree_selection_model_add_to_selection (selection_model,
+							 tsi.paths->pdata[i]);
+	g_ptr_array_free (tsi.paths, TRUE);
+}
+
+void
+invert_selection (BonoboUIComponent *uih, void *user_data, const char *path)
+{
+	FolderBrowser *fb = FOLDER_BROWSER (user_data);
+	ESelectionModel *etsm;
+	
+	if (FOLDER_BROWSER_IS_DESTROYED (fb))
+		return;
+	
+	etsm = e_tree_get_selection_model (fb->message_list->tree);
+	
+	e_selection_model_invert_selection (etsm);
+}
+
+/* flag all selected messages. Return number flagged */
+static int
+flag_messages (FolderBrowser *fb, guint32 mask, guint32 set)
+{
+	GPtrArray *uids;
+	int i;
+	
+	if (FOLDER_BROWSER_IS_DESTROYED (fb))
+		return 0;
+	
+	/* could just use specific callback but i'm lazy */
+	uids = g_ptr_array_new ();
+	message_list_foreach (fb->message_list, enumerate_msg, uids);
+	camel_folder_freeze (fb->folder);
+	for (i = 0; i < uids->len; i++) {
+		camel_folder_set_message_flags (fb->folder, uids->pdata[i], mask, set);
+		g_free (uids->pdata[i]);
+	}
+	
+	camel_folder_thaw (fb->folder);
+	
+	g_ptr_array_free (uids, TRUE);
+	
+	return i;
+}
+
+static int
+toggle_flags (FolderBrowser *fb, guint32 mask)
+{
+	GPtrArray *uids;
+	int i;
+	
+	if (FOLDER_BROWSER_IS_DESTROYED (fb))
+		return 0;
+	
+	/* could just use specific callback but i'm lazy */
+	uids = g_ptr_array_new ();
+	message_list_foreach (fb->message_list, enumerate_msg, uids);
+	camel_folder_freeze (fb->folder);
+	for (i = 0; i < uids->len; i++) {
+		guint32 flags;
+		
+		flags = ~(camel_folder_get_message_flags (fb->folder, uids->pdata[i]));
+		
+		/* if we're flagging a message important, always undelete it too */
+		if (mask & flags & CAMEL_MESSAGE_FLAGGED) {
+			flags &= ~CAMEL_MESSAGE_DELETED;
+			mask |= CAMEL_MESSAGE_DELETED;
+		}
+		
+		/* if we're flagging a message deleted, mark it seen. If 
+		 * we're undeleting it, we also want it to be seen, so always do this.
+		 */
+		if (mask & CAMEL_MESSAGE_DELETED) {
+			flags |= CAMEL_MESSAGE_SEEN;
+			mask |= CAMEL_MESSAGE_SEEN;
+		}
+		
+		camel_folder_set_message_flags (fb->folder, uids->pdata[i], mask, flags);
+		
+		g_free (uids->pdata[i]);
+	}
+	camel_folder_thaw (fb->folder);
+	
+	g_ptr_array_free (uids, TRUE);
+	
+	return i;
+}
+
+void
+mark_as_seen (BonoboUIComponent *uih, void *user_data, const char *path)
+{
+	flag_messages (FOLDER_BROWSER (user_data), CAMEL_MESSAGE_SEEN, CAMEL_MESSAGE_SEEN);
+}
+
+void
+mark_as_unseen (BonoboUIComponent *uih, void *user_data, const char *path)
+{
+	FolderBrowser *fb = FOLDER_BROWSER (user_data);
+	
+	if (FOLDER_BROWSER_IS_DESTROYED (fb))
+		return;
+	
+	/* Remove the automatic mark-as-read timer first */
+	if (fb->seen_id) {
+		g_source_remove (fb->seen_id);
+		fb->seen_id = 0;
+	}
+	
+	flag_messages (fb, CAMEL_MESSAGE_SEEN | CAMEL_MESSAGE_DELETED, 0);
+}
+
+void
+mark_all_as_seen (BonoboUIComponent *uih, void *user_data, const char *path)
+{
+	FolderBrowser *fb = FOLDER_BROWSER (user_data);
+	GPtrArray *uids;
+	int i;
+	
+	if (FOLDER_BROWSER_IS_DESTROYED (fb))
+		return;
+	
+	uids = camel_folder_get_uids (fb->folder);
+	camel_folder_freeze (fb->folder);
+	for (i = 0; i < uids->len; i++)
+		camel_folder_set_message_flags (fb->folder, uids->pdata[i], CAMEL_MESSAGE_SEEN, ~0);
+	camel_folder_free_uids (fb->folder, uids);
+	camel_folder_thaw (fb->folder);
+}
+
+void
+mark_as_important (BonoboUIComponent *uih, void *user_data, const char *path)
+{
+	flag_messages (FOLDER_BROWSER (user_data), CAMEL_MESSAGE_FLAGGED|CAMEL_MESSAGE_DELETED, CAMEL_MESSAGE_FLAGGED);
+}
+
+void
+mark_as_unimportant (BonoboUIComponent *uih, void *user_data, const char *path)
+{
+	flag_messages (FOLDER_BROWSER (user_data), CAMEL_MESSAGE_FLAGGED, 0);
+}
+
+void
+toggle_as_important (BonoboUIComponent *uih, void *user_data, const char *path)
+{
+	toggle_flags (FOLDER_BROWSER (user_data), CAMEL_MESSAGE_FLAGGED);
+}
+
+
+struct _tag_editor_data {
+	MessageTagEditor *editor;
+	FolderBrowser *fb;
+	GPtrArray *uids;
+};
+
+static void
+tag_editor_response(GtkWidget *gd, int button, struct _tag_editor_data *data)
+{
+	CamelFolder *folder;
+	CamelTag *tags, *t;
+	GPtrArray *uids;
+	int i;
+
+	/*if (FOLDER_BROWSER_IS_DESTROYED (data->fb))
+	  goto done;*/
+
+	if (button == GTK_RESPONSE_OK
+	    && (tags = message_tag_editor_get_tag_list (data->editor))) {
+		folder = data->fb->folder;
+		uids = data->uids;
+	
+		camel_folder_freeze (folder);
+		for (i = 0; i < uids->len; i++) {
+			for (t = tags; t; t = t->next)
+				camel_folder_set_message_user_tag (folder, uids->pdata[i], t->name, t->value);
+		}
+		camel_folder_thaw (folder);
+		camel_tag_list_free (&tags);
+	}
+
+	gtk_widget_destroy(gd);
+
+	g_object_unref (data->fb);
+	g_ptr_array_free (data->uids, TRUE);
+	g_free (data);
+}
+
+void
+flag_for_followup (BonoboUIComponent *uih, void *user_data, const char *path)
+{
+	FolderBrowser *fb = FOLDER_BROWSER (user_data);
+	struct _tag_editor_data *data;
+	GtkWidget *editor;
+	GPtrArray *uids;
+	int i;
+	
+	if (FOLDER_BROWSER_IS_DESTROYED (fb))
+		return;
+	
+	uids = g_ptr_array_new ();
+	message_list_foreach (fb->message_list, enumerate_msg, uids);
+	
+	editor = (GtkWidget *) message_tag_followup_new ();
+	
+	data = g_new (struct _tag_editor_data, 1);
+	data->editor = MESSAGE_TAG_EDITOR (editor);
+	gtk_widget_ref (GTK_WIDGET (fb));
+	data->fb = fb;
+	data->uids = uids;
+	
+	for (i = 0; i < uids->len; i++) {
+		CamelMessageInfo *info;
+		
+		info = camel_folder_get_message_info (fb->folder, uids->pdata[i]);
+		message_tag_followup_append_message (MESSAGE_TAG_FOLLOWUP (editor),
+						     camel_message_info_from (info),
+						     camel_message_info_subject (info));
+	}
+
+	g_signal_connect(editor, "response", G_CALLBACK(tag_editor_response), data);
+	
+	/* special-case... */
+	if (uids->len == 1) {
+		CamelMessageInfo *info;
+		
+		info = camel_folder_get_message_info (fb->folder, uids->pdata[0]);
+		if (info) {
+			if (info->user_tags)
+				message_tag_editor_set_tag_list (MESSAGE_TAG_EDITOR (editor), info->user_tags);
+			camel_folder_free_message_info (fb->folder, info);
+		}
+	}
+	
+	gtk_widget_show (editor);
+}
+
+void
+flag_followup_completed (BonoboUIComponent *uih, void *user_data, const char *path)
+{
+	FolderBrowser *fb = FOLDER_BROWSER (user_data);
+	GPtrArray *uids;
+	char *now;
+	int i;
+	
+	if (FOLDER_BROWSER_IS_DESTROYED (fb))
+		return;
+	
+	uids = g_ptr_array_new ();
+	message_list_foreach (fb->message_list, enumerate_msg, uids);
+	
+	now = header_format_date (time (NULL), 0);
+	
+	camel_folder_freeze (fb->folder);
+	for (i = 0; i < uids->len; i++) {
+		const char *tag;
+		
+		tag = camel_folder_get_message_user_tag (fb->folder, uids->pdata[i], "follow-up");
+		if (tag == NULL || *tag == '\0')
+			continue;
+		
+		camel_folder_set_message_user_tag (fb->folder, uids->pdata[i], "completed-on", now);
+	}
+	camel_folder_thaw (fb->folder);
+	
+	g_free (now);
+	
+	g_ptr_array_free (uids, TRUE);
+}
+
+void
+flag_followup_clear (BonoboUIComponent *uih, void *user_data, const char *path)
+{
+	FolderBrowser *fb = FOLDER_BROWSER (user_data);
+	GPtrArray *uids;
+	int i;
+	
+	if (FOLDER_BROWSER_IS_DESTROYED (fb))
+		return;
+	
+	uids = g_ptr_array_new ();
+	message_list_foreach (fb->message_list, enumerate_msg, uids);
+	
+	camel_folder_freeze (fb->folder);
+	for (i = 0; i < uids->len; i++) {
+		camel_folder_set_message_user_tag (fb->folder, uids->pdata[i], "follow-up", "");
+		camel_folder_set_message_user_tag (fb->folder, uids->pdata[i], "due-by", "");
+		camel_folder_set_message_user_tag (fb->folder, uids->pdata[i], "completed-on", "");
+	}
+	camel_folder_thaw (fb->folder);
+	
+	g_ptr_array_free (uids, TRUE);
+}
+
+void
+zoom_in (BonoboUIComponent *uih, void *user_data, const char *path)
+{
+	FolderBrowser *fb = FOLDER_BROWSER (user_data);
+	
+	if (FOLDER_BROWSER_IS_DESTROYED (fb))
+		return;
+	
+	gtk_html_zoom_in (fb->mail_display->html);
+}
+
+void
+zoom_out (BonoboUIComponent *uih, void *user_data, const char *path)
+{
+	FolderBrowser *fb = FOLDER_BROWSER (user_data);
+	
+	if (FOLDER_BROWSER_IS_DESTROYED (fb))
+		return;
+	
+	gtk_html_zoom_out (fb->mail_display->html);
+}
+
+void
+zoom_reset (BonoboUIComponent *uih, void *user_data, const char *path)
+{
+	FolderBrowser *fb = FOLDER_BROWSER (user_data);
+	
+	if (FOLDER_BROWSER_IS_DESTROYED (fb))
+		return;
+	
+	gtk_html_zoom_reset (fb->mail_display->html);
+}
+
+static void
+do_edit_messages (CamelFolder *folder, GPtrArray *uids, GPtrArray *messages, void *data)
+{
+	FolderBrowser *fb = (FolderBrowser *) data;
+	int i;
+	
+	if (messages == NULL)
+		return;
+	
+	for (i = 0; i < messages->len; i++) {
+		struct _composer_callback_data *ccd;
+		EMsgComposer *composer;
+		
+		camel_medium_remove_header (CAMEL_MEDIUM (messages->pdata[i]), "X-Mailer");
+		
+		composer = e_msg_composer_new_with_message (messages->pdata[i]);
+		e_msg_composer_unset_changed (composer);
+		e_msg_composer_drop_editor_undo (composer);
+		
+		if (composer) {
+			ccd = ccd_new ();
+			if (folder_browser_is_drafts (fb)) {
+				camel_object_ref (folder);
+				ccd->drafts_folder = folder;
+				ccd->drafts_uid = g_strdup (uids->pdata[i]);
+			}
+			
+			g_signal_connect (composer, "send", G_CALLBACK (composer_send_cb), ccd);
+			g_signal_connect (composer, "save-draft", G_CALLBACK (composer_save_draft_cb), ccd);
+			
+			g_object_weak_ref ((GObject *) composer, (GWeakNotify) composer_destroy_cb, ccd);
+			
+			gtk_widget_show (GTK_WIDGET (composer));
+		}
+	}
+}
+
+static gboolean
+are_you_sure (const char *msg, GPtrArray *uids, FolderBrowser *fb)
+{
+	GtkWidget *dialog;
+	int button, i;
+
+	dialog = gtk_message_dialog_new (FB_WINDOW (fb), GTK_DIALOG_MODAL|GTK_DIALOG_DESTROY_WITH_PARENT,
+					 GTK_MESSAGE_QUESTION, GTK_BUTTONS_OK_CANCEL,
+					 msg, uids->len);
+	button = gtk_dialog_run ((GtkDialog *) dialog);
+	gtk_widget_destroy (dialog);
+	
+	if (button != GTK_RESPONSE_OK) {
+		for (i = 0; i < uids->len; i++)
+			g_free (uids->pdata[i]);
+		g_ptr_array_free (uids, TRUE);
+	}
+	
+	return button == GTK_RESPONSE_OK;
+}
+
+static void
+edit_msg_internal (FolderBrowser *fb)
+{
+	GPtrArray *uids;
+	
+	if (!check_send_configuration (fb))
+		return;
+	
+	uids = g_ptr_array_new ();
+	message_list_foreach (fb->message_list, enumerate_msg, uids);
+	
+	if (uids->len > 10 && !are_you_sure (_("Are you sure you want to edit all %d messages?"), uids, fb))
+		return;
+	
+	mail_get_messages (fb->folder, uids, do_edit_messages, fb);
+}
+
+void
+edit_msg (GtkWidget *widget, gpointer user_data)
+{
+	FolderBrowser *fb = FOLDER_BROWSER (user_data);
+	
+	if (FOLDER_BROWSER_IS_DESTROYED (fb))
+		return;
+	
+	if (!folder_browser_is_drafts (fb)) {
+		e_notice(FB_WINDOW(fb), GTK_MESSAGE_ERROR,
+			 _("You may only edit messages saved\nin the Drafts folder."));
+		return;
+	}
+	
+	edit_msg_internal (fb);
+}
+
+static void
+do_resend_messages (CamelFolder *folder, GPtrArray *uids, GPtrArray *messages, void *data)
+{
+	int i;
+	
+	for (i = 0; i < messages->len; i++) {
+		/* generate a new Message-Id because they need to be unique */
+		camel_mime_message_set_message_id (messages->pdata[i], NULL);
+	}
+	
+	/* "Resend" should open up the composer to let the user edit the message */
+	do_edit_messages (folder, uids, messages, data);
+}
+
+
+void
+resend_msg (GtkWidget *widget, gpointer user_data)
+{
+	FolderBrowser *fb = FOLDER_BROWSER (user_data);
+	GPtrArray *uids;
+	
+	if (FOLDER_BROWSER_IS_DESTROYED (fb))
+		return;
+	
+	if (!folder_browser_is_sent (fb)) {
+		e_notice (FB_WINDOW (fb), GTK_MESSAGE_ERROR,
+			  _("You may only resend messages\nin the Sent folder."));
+		return;
+	}
+	
+	if (!check_send_configuration (fb))
+		return;
+	
+	uids = g_ptr_array_new ();
+	message_list_foreach (fb->message_list, enumerate_msg, uids);
+	
+	if (uids->len > 10 && !are_you_sure (_("Are you sure you want to resend all %d messages?"), uids, fb))
+		return;
+	
+	mail_get_messages (fb->folder, uids, do_resend_messages, fb);
+}
+
+
+void
+search_msg (GtkWidget *widget, gpointer user_data)
+{
+	FolderBrowser *fb = FOLDER_BROWSER (user_data);
+	GtkWidget *w;
+	
+	if (FOLDER_BROWSER_IS_DESTROYED (fb))
+		return;
+	
+	if (fb->mail_display->current_message == NULL) {
+		GtkWidget *dialog;
+		
+		dialog = gtk_message_dialog_new (FB_WINDOW(fb), GTK_DIALOG_DESTROY_WITH_PARENT,
+						 GTK_MESSAGE_WARNING, GTK_BUTTONS_CLOSE,
+						 _("No Message Selected"));
+		g_signal_connect_swapped (dialog, "response", G_CALLBACK (gtk_widget_destroy), dialog);
+		gtk_widget_show (dialog);
+		return;
+	}
+	
+	w = mail_search_new (fb->mail_display);
+	gtk_widget_show_all (w);
+}
+
+void
+load_images (GtkWidget *widget, gpointer user_data)
+{
+	FolderBrowser *fb = FOLDER_BROWSER (user_data);
+	
+	if (FOLDER_BROWSER_IS_DESTROYED (fb))
+		return;
+	
+	mail_display_load_images (fb->mail_display);
+}
+
+static void
+save_msg_ok (GtkWidget *widget, gpointer user_data)
+{
+	CamelFolder *folder;
+	GPtrArray *uids;
+	const char *path;
+	struct stat st;
+	gboolean ret = TRUE;
+	
+	path = gtk_file_selection_get_filename (GTK_FILE_SELECTION (user_data));
+	if (path[0] == '\0')
+		return;
+	
+	/* make sure we can actually save to it... */
+	if (stat (path, &st) != -1 && !S_ISREG (st.st_mode))
+		return;
+
+	if (access(path, F_OK) == 0) {
+		if (access(path, W_OK) != 0) {
+			e_notice(GTK_WINDOW(user_data), GTK_MESSAGE_ERROR,
+				 _("Cannot save to `%s'\n %s"), path, g_strerror(errno));
+			return;
+		}
+
+		ret = e_question(GTK_WINDOW(user_data), GTK_RESPONSE_NO, NULL,
+				 _("`%s' already exists.\nOverwrite it?"), path);
+	}
+	
+	if (ret) {
+		folder = g_object_get_data ((GObject *) user_data, "folder");
+		uids = g_object_steal_data (G_OBJECT (user_data), "uids");
+		mail_save_messages (folder, uids, path, NULL, NULL);
+		gtk_widget_destroy (GTK_WIDGET (user_data));
+	}
+}
+
+static void
+save_msg_destroy (gpointer user_data)
+{
+	GPtrArray *uids = user_data;
+	
+	if (uids) {
+		int i;
+		
+		for (i = 0; i < uids->len; i++)
+			g_free (uids->pdata[i]);
+		
+		g_ptr_array_free (uids, TRUE);
+	}
+}
+
+void
+save_msg (GtkWidget *widget, gpointer user_data)
+{
+	FolderBrowser *fb = FOLDER_BROWSER (user_data);
+	GtkFileSelection *filesel;
+	GPtrArray *uids;
+	char *title, *path;
+	
+	if (FOLDER_BROWSER_IS_DESTROYED (fb))
+		return;
+	
+	uids = g_ptr_array_new ();
+	message_list_foreach (fb->message_list, enumerate_msg, uids);
+	
+	if (uids->len == 1)
+		title = _("Save Message As...");
+	else
+		title = _("Save Messages As...");
+	
+	filesel = GTK_FILE_SELECTION (gtk_file_selection_new (title));
+	path = g_strdup_printf ("%s/", g_get_home_dir ());
+	gtk_file_selection_set_filename (filesel, path);
+	g_free (path);
+	
+	g_object_set_data_full ((GObject *) filesel, "uids", uids, save_msg_destroy);
+	g_object_set_data ((GObject *) filesel, "folder", fb->folder);
+	
+	g_signal_connect (filesel->ok_button, "clicked", G_CALLBACK (save_msg_ok), filesel);
+	g_signal_connect_swapped (filesel->cancel_button, "clicked",
+				  G_CALLBACK (gtk_widget_destroy), filesel);
+	
+	gtk_widget_show (GTK_WIDGET (filesel));
+}
+
+void
+colour_msg (GtkWidget *widget, gpointer user_data)
+{
+	/* FIXME: implement me? */
+}
+
+void
+delete_msg (GtkWidget *button, gpointer user_data)
+{
+	FolderBrowser *fb = FOLDER_BROWSER (user_data);
+	gboolean hide_deleted;
+	GConfClient *gconf;
+	int deleted, row;
+	
+	if (FOLDER_BROWSER_IS_DESTROYED (fb))
+		return;
+	
+	deleted = flag_messages (fb, CAMEL_MESSAGE_DELETED | CAMEL_MESSAGE_SEEN,
+				 CAMEL_MESSAGE_DELETED | CAMEL_MESSAGE_SEEN);
+	
+	/* Select the next message if we are only deleting one message */
+	if (deleted == 1) {
+		row = e_tree_row_of_node (fb->message_list->tree,
+					  e_tree_get_cursor (fb->message_list->tree));
+		
+		gconf = mail_config_get_gconf_client ();
+		hide_deleted = !gconf_client_get_bool (gconf, "/apps/evolution/mail/display/show_deleted", NULL);
+		
+		/* If this is the last message and deleted messages
+                   are hidden, select the previous */
+		if ((row + 1 == e_tree_row_count (fb->message_list->tree)) && hide_deleted)
+			message_list_select (fb->message_list, MESSAGE_LIST_SELECT_PREVIOUS,
+					     0, CAMEL_MESSAGE_DELETED, FALSE);
+		else
+			message_list_select (fb->message_list, MESSAGE_LIST_SELECT_NEXT,
+					     0, 0, FALSE);
+	}
+}
+
+void
+undelete_msg (GtkWidget *button, gpointer user_data)
+{
+	flag_messages (FOLDER_BROWSER (user_data), CAMEL_MESSAGE_DELETED, 0);
+}
+
+void
+next_msg (GtkWidget *button, gpointer user_data)
+{
+	FolderBrowser *fb = FOLDER_BROWSER (user_data);
+	
+	if (FOLDER_BROWSER_IS_DESTROYED (fb))
+		return;
+	
+	message_list_select (fb->message_list, MESSAGE_LIST_SELECT_NEXT, 0, 0, FALSE);
+}
+
+void
+next_unread_msg (GtkWidget *button, gpointer user_data)
+{
+	FolderBrowser *fb = FOLDER_BROWSER (user_data);
+	
+	if (FOLDER_BROWSER_IS_DESTROYED (fb))
+		return;
+	
+	message_list_select (fb->message_list, MESSAGE_LIST_SELECT_NEXT, 0, CAMEL_MESSAGE_SEEN, TRUE);
+}
+
+void
+next_flagged_msg (GtkWidget *button, gpointer user_data)
+{
+	FolderBrowser *fb = FOLDER_BROWSER (user_data);
+	
+	if (FOLDER_BROWSER_IS_DESTROYED (fb))
+		return;
+	
+	message_list_select (fb->message_list, MESSAGE_LIST_SELECT_NEXT,
+			     CAMEL_MESSAGE_FLAGGED, CAMEL_MESSAGE_FLAGGED, FALSE);
+}
+
+void
+next_thread (GtkWidget *button, gpointer user_data)
+{
+	FolderBrowser *fb = FOLDER_BROWSER (user_data);
+	
+	if (FOLDER_BROWSER_IS_DESTROYED (fb))
+		return;
+	
+	message_list_select_next_thread (fb->message_list);
+}
+
+void
+previous_msg (GtkWidget *button, gpointer user_data)
+{
+	FolderBrowser *fb = FOLDER_BROWSER (user_data);
+	
+	if (FOLDER_BROWSER_IS_DESTROYED (fb))
+		return;
+	
+	message_list_select (fb->message_list, MESSAGE_LIST_SELECT_PREVIOUS,
+			     0, 0, FALSE);
+}
+
+void
+previous_unread_msg (GtkWidget *button, gpointer user_data)
+{
+	FolderBrowser *fb = FOLDER_BROWSER (user_data);
+	
+	if (FOLDER_BROWSER_IS_DESTROYED (fb))
+		return;
+	
+	message_list_select (fb->message_list, MESSAGE_LIST_SELECT_PREVIOUS,
+			     0, CAMEL_MESSAGE_SEEN, TRUE);
+}
+
+void
+previous_flagged_msg (GtkWidget *button, gpointer user_data)
+{
+	FolderBrowser *fb = FOLDER_BROWSER (user_data);
+	
+	if (FOLDER_BROWSER_IS_DESTROYED (fb))
+		return;
+	
+	message_list_select (fb->message_list, MESSAGE_LIST_SELECT_PREVIOUS,
+			     CAMEL_MESSAGE_FLAGGED, CAMEL_MESSAGE_FLAGGED, TRUE);
+}
+
+static void
+expunged_folder (CamelFolder *f, void *data)
+{
+	FolderBrowser *fb = data;
+	
+	if (FOLDER_BROWSER_IS_DESTROYED (fb))
+		return;
+	
+	fb->expunging = NULL;
+	gtk_widget_set_sensitive (GTK_WIDGET (fb->message_list), TRUE);
+
+	/* FIXME: we should check that the focus hasn't changed in the
+	 * mean time, otherwise we steal the focus unecessarily.
+	 * Check :get_toplevel()->focus_widget? */
+	if (fb->expunge_mlfocussed)
+		gtk_widget_grab_focus((GtkWidget *)fb->message_list);
+}
+
+static gboolean
+confirm_expunge (FolderBrowser *fb)
+{
+	gboolean res, show_again;
+	GConfClient *gconf;
+	
+	gconf = mail_config_get_gconf_client ();
+	
+	if (!gconf_client_get_bool (gconf, "/apps/evolution/mail/prompts/expunge", NULL))
+		return TRUE;
+	
+	res = e_question (FB_WINDOW (fb), GTK_RESPONSE_NO, &show_again,
+			  _("This operation will permanently erase all messages marked as\n"
+			    "deleted. If you continue, you will not be able to recover these messages.\n"
+			    "\nReally erase these messages?"));
+	
+	gconf_client_set_bool (gconf, "/apps/evolution/mail/prompts/expunge", show_again, NULL);
+	
+	return res;
+}
+
+void
+expunge_folder (BonoboUIComponent *uih, void *user_data, const char *path)
+{
+	FolderBrowser *fb = FOLDER_BROWSER (user_data);
+	
+	if (FOLDER_BROWSER_IS_DESTROYED (fb))
+		return;
+	
+	if (fb->folder && (fb->expunging == NULL || fb->folder != fb->expunging) && confirm_expunge (fb)) {
+		CamelMessageInfo *info;
+		GtkWindow *top;
+		GtkWidget *focus;
+
+		/* disable the message list so user can't click on them while we expunge */
+
+		/* nasty hack to find out if some widget inside the message list is focussed ... */
+		top = GTK_WINDOW (gtk_widget_get_toplevel((GtkWidget *)fb->message_list));
+		focus = top?top->focus_widget:NULL;
+		while (focus && focus != (GtkWidget *)fb->message_list)
+			focus = focus->parent;
+		fb->expunge_mlfocussed = focus == (GtkWidget *)fb->message_list;
+		gtk_widget_set_sensitive (GTK_WIDGET (fb->message_list), FALSE);
+		
+		/* Only blank the mail display if the message being
+                   viewed is one of those to be expunged */
+		if (fb->loaded_uid) {
+			info = camel_folder_get_message_info (fb->folder, fb->loaded_uid);
+			
+			if (!info || info->flags & CAMEL_MESSAGE_DELETED)
+				mail_display_set_message (fb->mail_display, NULL, NULL, NULL);
+		}
+		
+		fb->expunging = fb->folder;
+		mail_expunge_folder (fb->folder, expunged_folder, fb);
+	}
+}
+
+/********************** Begin Filter Editor ********************/
+
+static GtkWidget *filter_editor = NULL;
+
+static void
+filter_editor_response (GtkWidget *dialog, int button, FolderBrowser *fb)
+{
+	FilterContext *fc;
+	
+	if (button == GTK_RESPONSE_ACCEPT) {
+		char *user;
+		
+		fc = g_object_get_data(G_OBJECT(dialog), "context");
+		user = g_strdup_printf ("%s/filters.xml", mail_component_peek_base_directory (mail_component_peek ()));
+		rule_context_save ((RuleContext *)fc, user);
+		g_free (user);
+	}
+
+	gtk_widget_destroy(dialog);
+
+	filter_editor = NULL;
+}
+
+static const char *filter_source_names[] = {
+	"incoming",
+	"outgoing",
+	NULL,
+};
+
+void
+filter_edit (BonoboUIComponent *uih, void *user_data, const char *path)
+{
+	FolderBrowser *fb = FOLDER_BROWSER (user_data);
+	FilterContext *fc;
+	char *user, *system;
+	
+	if (filter_editor) {
+		gdk_window_raise (GTK_WIDGET (filter_editor)->window);
+		return;
+	}
+	
+	fc = filter_context_new ();
+	user = g_strdup_printf ("%s/filters.xml", mail_component_peek_base_directory (mail_component_peek ()));
+	system = EVOLUTION_PRIVDATADIR "/filtertypes.xml";
+	rule_context_load ((RuleContext *)fc, system, user);
+	g_free (user);
+	
+	if (((RuleContext *)fc)->error) {
+		e_notice(FB_WINDOW (fb), GTK_MESSAGE_ERROR,
+			 _("Error loading filter information:\n%s"),
+			 ((RuleContext *)fc)->error);
+		return;
+	}
+	
+	filter_editor = (GtkWidget *)filter_editor_new (fc, filter_source_names);
+	/* FIXME: maybe this needs destroy func? */
+	gtk_window_set_transient_for ((GtkWindow *) filter_editor, FB_WINDOW (fb));
+	gtk_window_set_title (GTK_WINDOW (filter_editor), _("Filters"));
+	g_object_set_data_full ((GObject *) filter_editor, "context", fc, (GtkDestroyNotify) g_object_unref);
+	g_signal_connect (filter_editor, "response", G_CALLBACK (filter_editor_response), fb);
+	gtk_widget_show (GTK_WIDGET (filter_editor));
+}
+
+/********************** End Filter Editor ********************/
+
+void
+vfolder_edit_vfolders (BonoboUIComponent *uih, void *user_data, const char *path)
+{
+	vfolder_edit ();
+}
+
+
+/* static void
+header_print_cb (GtkHTML *html, GnomePrintContext *print_context,
+		 double x, double y, double width, double height, gpointer user_data)
+{
+	printf ("header_print_cb %f,%f x %f,%f\n", x, y, width, height);
+
+	gnome_print_newpath (print_context);
+	gnome_print_setlinewidth (print_context, 12.0);
+	gnome_print_setrgbcolor (print_context, 1.0, 0.0, 0.0);
+	gnome_print_moveto (print_context, x, y);
+	gnome_print_lineto (print_context, x+width, y-height);
+	gnome_print_strokepath (print_context);
+} */
+
+struct footer_info {
+	GnomeFont *local_font;
+	gint page_num, pages;
+};
+
+static void
+footer_print_cb (GtkHTML *html, GnomePrintContext *print_context,
+		 double x, double y, double width, double height, gpointer user_data)
+{
+	struct footer_info *info = (struct footer_info *) user_data;
+	
+	if (info->local_font) {
+		char *text = g_strdup_printf (_("Page %d of %d"), info->page_num, info->pages);
+		/*gdouble tw = gnome_font_get_width_string (info->local_font, text);*/
+		/* FIXME: work out how to measure this */
+		gdouble tw = strlen (text) * 8;
+		
+		gnome_print_gsave       (print_context);
+		gnome_print_newpath     (print_context);
+		gnome_print_setrgbcolor (print_context, .0, .0, .0);
+		gnome_print_moveto      (print_context, x + width - tw, y - gnome_font_get_ascender (info->local_font));
+		gnome_print_setfont     (print_context, info->local_font);
+		gnome_print_show        (print_context, text);
+		gnome_print_grestore    (print_context);
+		
+		g_free (text);
+		info->page_num++;
+	}
+}
+
+static void
+footer_info_free (struct footer_info *info)
+{
+	if (info->local_font)
+		gnome_font_unref (info->local_font);
+	g_free (info);
+}
+
+static struct footer_info *
+footer_info_new (GtkHTML *html, GnomePrintContext *pc, gdouble *line)
+{
+	struct footer_info *info;
+	
+	info = g_new (struct footer_info, 1);
+	info->local_font = gnome_font_find_closest ("Helvetica", 10.0);
+	
+	if (info->local_font)
+		*line = gnome_font_get_ascender (info->local_font) - gnome_font_get_descender (info->local_font);
+	
+	info->page_num = 1;
+	info->pages = gtk_html_print_get_pages_num (html, pc, 0.0, *line);
+	
+	return info;
+}
+
+static void
+do_mail_print (FolderBrowser *fb, gboolean preview)
+{
+	GtkHTML *html;
+	GtkWidget *w = NULL;
+	GnomePrintContext *print_context;
+	GnomePrintJob *print_master;
+	GnomePrintConfig *config = NULL;
+	GtkDialog *dialog;
+	gdouble line = 0.0;
+	struct footer_info *info;
+	
+	if (!preview) {
+		dialog = (GtkDialog *) gnome_print_dialog_new (NULL, _("Print Message"), GNOME_PRINT_DIALOG_COPIES);
+		gtk_dialog_set_default_response (dialog, GNOME_PRINT_DIALOG_RESPONSE_PRINT);
+		gtk_window_set_transient_for ((GtkWindow *) dialog, (GtkWindow *) gtk_widget_get_toplevel ((GtkWidget *) fb));
+		
+		switch (gtk_dialog_run (dialog)) {
+		case GNOME_PRINT_DIALOG_RESPONSE_PRINT:
+			break;
+		case GNOME_PRINT_DIALOG_RESPONSE_PREVIEW:
+			preview = TRUE;
+			break;
+		default:
+			gtk_widget_destroy ((GtkWidget *) dialog);
+			return;
+		}
+		
+		config = gnome_print_dialog_get_config ((GnomePrintDialog *) dialog);
+		gtk_widget_destroy ((GtkWidget *)dialog);
+	}
+	
+	if (config) {
+		print_master = gnome_print_job_new (config);
+		gnome_print_config_unref (config);
+	} else
+		print_master = gnome_print_job_new (NULL);
+	
+	/* paper size settings? */
+	/*gnome_print_master_set_paper (print_master, paper);*/
+	print_context = gnome_print_job_get_context (print_master);
+	
+	html = GTK_HTML (gtk_html_new ());
+	gtk_widget_set_name (GTK_WIDGET (html), "EvolutionMailPrintHTMLWidget");
+	mail_display_initialize_gtkhtml (fb->mail_display, html);
+	
+	/* Set our 'printing' flag to true and render.  This causes us
+	   to ignoring any adjustments we made to accomodate the
+	   user's theme. */
+	fb->mail_display->printing = TRUE;
+	
+	if (!GTK_WIDGET_REALIZED (GTK_WIDGET (html))) {
+		/* gtk widgets don't like to be realized outside top level widget
+		   so we put new html widget into gtk window */
+		w = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+		gtk_container_add (GTK_CONTAINER (w), GTK_WIDGET (html));
+		gtk_widget_realize (GTK_WIDGET (html));
+	}
+	mail_display_render (fb->mail_display, html, TRUE);
+	gtk_html_print_set_master (html, print_master);
+	
+	info = footer_info_new (html, print_context, &line);
+	gtk_html_print_with_header_footer (html, print_context, 0.0, line, NULL, footer_print_cb, info);
+	footer_info_free (info);
+	
+	fb->mail_display->printing = FALSE;
+	
+	gnome_print_job_close (print_master);
+	gtk_widget_destroy (GTK_WIDGET (html));
+	if (w)
+		gtk_widget_destroy (w);
+	
+	if (preview){
+		GtkWidget *pw;
+		
+		pw = gnome_print_job_preview_new (print_master, _("Print Preview"));
+		gtk_widget_show (pw);
+	} else {
+		int result = gnome_print_job_print (print_master);
+		
+		if (result == -1)
+			e_notice (FB_WINDOW (fb), GTK_MESSAGE_ERROR, _("Printing of message failed"));
+	}
+
+        g_object_unref (print_master);
+}
+
+/* This is pretty evil.  FolderBrowser's API should be extended to allow these sorts of
+   things to be done in a more natural way. */
+
+/* <evil_code> */
+
+struct blarg_this_sucks {
+	FolderBrowser *fb;
+	gboolean preview;
+};
+
+static void
+done_message_selected (CamelFolder *folder, const char *uid, CamelMimeMessage *msg, void *data)
+{
+	struct blarg_this_sucks *blarg = data;
+	FolderBrowser *fb = blarg->fb;
+	gboolean preview = blarg->preview;
+	CamelMessageInfo *info;
+	
+	g_free (blarg);
+	
+	info = camel_folder_get_message_info (fb->folder, uid);
+	mail_display_set_message (fb->mail_display, (CamelMedium *) msg, fb->folder, info);
+	if (info)
+		camel_folder_free_message_info (fb->folder, info);
+	
+	g_free (fb->loaded_uid);
+	fb->loaded_uid = fb->loading_uid;
+	fb->loading_uid = NULL;
+	
+	if (msg)
+		do_mail_print (fb, preview);
+}
+
+/* Ack!  Most of this is copied from folder-browser.c */
+static void
+do_mail_fetch_and_print (FolderBrowser *fb, gboolean preview)
+{
+	if (!fb->preview_shown || fb->mail_display->current_message == NULL) {
+		/* If the preview pane is closed, we have to do some
+		   extra magic to load the message. */
+		struct blarg_this_sucks *blarg = g_new (struct blarg_this_sucks, 1);
+		
+		blarg->fb = fb;
+		blarg->preview = preview;
+		
+		fb->loading_id = 0;
+		
+		/* if we are loading, then set a pending, but leave the loading, coudl cancel here (?) */
+		if (fb->loading_uid) {
+			g_free (fb->pending_uid);
+			fb->pending_uid = g_strdup (fb->new_uid);
+		} else {
+			if (fb->new_uid) {
+				fb->loading_uid = g_strdup (fb->new_uid);
+				mail_get_message (fb->folder, fb->loading_uid, done_message_selected, blarg, mail_thread_new);
+			} else {
+				mail_display_set_message (fb->mail_display, NULL, NULL, NULL);
+				g_free (blarg);
+			}
+		}
+	} else {
+		do_mail_print (fb, preview);
+	}
+}
+
+/* </evil_code> */
+
+
+void
+print_msg (GtkWidget *button, gpointer user_data)
+{
+	FolderBrowser *fb = FOLDER_BROWSER (user_data);
+	
+	if (FOLDER_BROWSER_IS_DESTROYED (fb))
+		return;
+	
+	do_mail_fetch_and_print (fb, FALSE);
+}
+
+void
+print_preview_msg (GtkWidget *button, gpointer user_data)
+{
+	FolderBrowser *fb = FOLDER_BROWSER (user_data);
+	
+	if (FOLDER_BROWSER_IS_DESTROYED (fb))
+		return;
+	
+	do_mail_fetch_and_print (fb, TRUE);
+}
+
+/******************** Begin Subscription Dialog ***************************/
+
+static GtkObject *subscribe_dialog = NULL;
+
+static void
+subscribe_dialog_destroy (GtkObject *dialog, GObject *deadbeef)
+{
+	if (subscribe_dialog) {
+		g_object_unref (subscribe_dialog);
+		subscribe_dialog = NULL;
+	}
+}
+
+void
+manage_subscriptions (BonoboUIComponent *uih, void *user_data, const char *path)
+{
+	if (!subscribe_dialog) {
+		subscribe_dialog = subscribe_dialog_new ();
+		
+		g_object_weak_ref ((GObject *) SUBSCRIBE_DIALOG (subscribe_dialog)->app,
+				   (GWeakNotify) subscribe_dialog_destroy, subscribe_dialog);
+		g_object_ref(subscribe_dialog);
+		gtk_object_sink((GtkObject *)subscribe_dialog);
+		subscribe_dialog_show (subscribe_dialog);
+	} else {
+		gdk_window_raise (SUBSCRIBE_DIALOG (subscribe_dialog)->app->window);
+	}
+}
+
+/******************** End Subscription Dialog ***************************/
+
+static void
+local_configure_done(const char *uri, CamelFolder *folder, void *data)
+{
+	FolderBrowser *fb = data;
+
+	if (FOLDER_BROWSER_IS_DESTROYED (fb)) {
+		g_object_unref(fb);
+		return;
+	}
+
+	if (folder == NULL)
+		folder = fb->folder;
+
+	message_list_set_folder(fb->message_list, folder, FALSE);
+	g_object_unref(fb);
+}
+
+void
+configure_folder (BonoboUIComponent *uih, void *user_data, const char *path)
+{
+	FolderBrowser *fb = FOLDER_BROWSER (user_data);
+	
+	if (FOLDER_BROWSER_IS_DESTROYED (fb))
+		return;
+	
+	if (fb->uri) {
+		if (strncmp (fb->uri, "vfolder:", 8) == 0) {
+			vfolder_edit_rule (fb->uri);
+		} else {
+			message_list_set_folder(fb->message_list, NULL, FALSE);
+			g_object_ref((GtkObject *)fb);
+			mail_local_reconfigure_folder(fb->uri, local_configure_done, fb);
+		}
+	}
+}
+
+static void
+do_view_messages(CamelFolder *folder, GPtrArray *uids, GPtrArray *msgs, void *data)
+{
+	FolderBrowser *fb = data;
+	int i;
+
+	if (FOLDER_BROWSER_IS_DESTROYED (fb))
+		return;
+
+	for (i = 0; i < uids->len && i < msgs->len; i++) {
+		char *uid = uids->pdata[i];
+		CamelMimeMessage *msg = msgs->pdata[i];
+		GtkWidget *mb;
+		
+		camel_folder_set_message_flags (folder, uid, CAMEL_MESSAGE_SEEN, CAMEL_MESSAGE_SEEN);
+		mb = message_browser_new (fb->uri, uid);
+		gtk_widget_show (mb);
+	}
+}
+
+void
+view_msg (GtkWidget *widget, gpointer user_data)
+{
+	FolderBrowser *fb = FOLDER_BROWSER (user_data);
+	GPtrArray *uids;
+	
+	if (FOLDER_BROWSER_IS_DESTROYED (fb))
+		return;
+	
+	uids = g_ptr_array_new ();
+	message_list_foreach (fb->message_list, enumerate_msg, uids);
+
+	if (uids->len > 10 && !are_you_sure (_("Are you sure you want to open all %d messages in separate windows?"), uids, fb))
+		return;
+	
+	mail_get_messages(fb->folder, uids, do_view_messages, fb);
+}
+
+void
+open_msg (GtkWidget *widget, gpointer user_data)
+{
+	FolderBrowser *fb = FOLDER_BROWSER (user_data);
+	extern CamelFolder *outbox_folder;
+	
+	if (FOLDER_BROWSER_IS_DESTROYED (fb))
+		return;
+	
+	if (folder_browser_is_drafts (fb) || fb->folder == outbox_folder)
+		edit_msg_internal (fb);
+	else
+		view_msg (NULL, user_data);
+}
+
+void
+open_message (BonoboUIComponent *uih, void *user_data, const char *path)
+{
+	open_msg (NULL, user_data);
+}
+
+void
+edit_message (BonoboUIComponent *uih, void *user_data, const char *path)
+{
+        edit_msg (NULL, user_data);
+}
+
+void
+stop_threads (BonoboUIComponent *uih, void *user_data, const char *path)
+{
+	camel_operation_cancel (NULL);
+}
+
+void
+empty_trash (BonoboUIComponent *uih, void *user_data, const char *path)
+{
+	CamelProvider *provider;
+	EAccountList *accounts;
+	FolderBrowser *fb;
+	CamelException ex;
+	EAccount *account;
+	EIterator *iter;
+	
+	fb = user_data ? FOLDER_BROWSER (user_data) : NULL;
+	
+	if (fb && !confirm_expunge (fb))
+		return;
+	
+	camel_exception_init (&ex);
+	
+	/* expunge all remote stores */
+	accounts = mail_config_get_accounts ();
+	iter = e_list_get_iterator ((EList *) accounts);
+	while (e_iterator_is_valid (iter)) {
+		account = (EAccount *) e_iterator_get (iter);
+		
+		/* make sure this is a valid source */
+		if (account->enabled && account->source->url) {
+			provider = camel_session_get_provider (session, account->source->url, &ex);
+			if (provider) {
+				/* make sure this store is a remote store */
+				if (provider->flags & CAMEL_PROVIDER_IS_STORAGE &&
+				    provider->flags & CAMEL_PROVIDER_IS_REMOTE) {
+					mail_empty_trash (account, NULL, NULL);
+				}
+			}
+			
+			/* clear the exception for the next round */
+			camel_exception_clear (&ex);
+		}
+		
+		e_iterator_next (iter);
+	}
+	
+	g_object_unref (iter);
+	
+	/* Now empty the local trash folder */
+	mail_empty_trash (NULL, NULL, NULL);
+}
diff --git a/mail/mail-callbacks.h b/mail/mail-callbacks.h
new file mode 100644
index 0000000000..6b2c4573c9
--- /dev/null
+++ b/mail/mail-callbacks.h
@@ -0,0 +1,144 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
+/*
+ *  Authors: Jeffrey Stedfast <fejj@ximian.com>
+ *
+ *  Copyright 2000 Ximian, Inc. (www.ximian.com)
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of version 2 of the GNU General Public
+ * License as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public
+ * License along with this program; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ *
+ */
+
+#ifndef MAIL_CALLBACKS_H
+#define MAIL_CALLBACKS_H
+
+#include <camel/camel.h>
+#include "composer/e-msg-composer.h"
+#include <mail/mail-types.h>
+#include "evolution-storage.h"
+
+#ifdef __cplusplus
+extern "C" {
+#pragma }
+#endif /* __cplusplus */
+
+/* these are the possible modes for replying */
+enum {
+	REPLY_SENDER,
+	REPLY_LIST,
+	REPLY_ALL,
+	REPLY_POST,
+	REPLY_NO_QUOTE = 0x80	/* dont quote reply */
+};
+
+void enumerate_msg (MessageList *ml, const char *uid, gpointer data);
+
+void fetch_mail            (GtkWidget *widget, gpointer user_data);
+void send_queued_mail      (GtkWidget *widget, gpointer user_data);
+
+void compose_msg           (GtkWidget *widget, gpointer user_data);
+void send_to_url           (const char *url, const char *parent_uri);
+
+void forward_inline        (GtkWidget *widget, gpointer user_data);
+void forward_quoted        (GtkWidget *widget, gpointer user_data);
+void forward_attached      (GtkWidget *widget, gpointer user_data);
+void forward               (GtkWidget *widget, gpointer user_data);
+
+void post_to_url           (const char *url);
+void post_message          (GtkWidget *widget, gpointer user_data);
+void post_reply            (GtkWidget *widget, gpointer user_data);
+
+void redirect              (GtkWidget *widget, gpointer user_data);
+
+void reply_to_sender       (GtkWidget *widget, gpointer user_data);
+void reply_to_list         (GtkWidget *widget, gpointer user_data);
+void reply_to_all          (GtkWidget *widget, gpointer user_data);
+
+void colour_msg            (GtkWidget *widget, gpointer user_data);
+void delete_msg            (GtkWidget *widget, gpointer user_data);
+void undelete_msg          (GtkWidget *widget, gpointer user_data);
+void move_msg_cb           (GtkWidget *widget, gpointer user_data);
+void copy_msg_cb           (GtkWidget *widget, gpointer user_data);
+void addrbook_sender       (GtkWidget *widget, gpointer user_data);
+void apply_filters         (GtkWidget *widget, gpointer user_data);
+void print_msg             (GtkWidget *widget, gpointer user_data);
+void print_preview_msg     (GtkWidget *widget, gpointer user_data);
+void edit_msg              (GtkWidget *widget, gpointer user_data);
+void open_msg              (GtkWidget *widget, gpointer user_data);
+void save_msg              (GtkWidget *widget, gpointer user_data);
+void view_msg              (GtkWidget *widget, gpointer user_data);
+void view_digest           (GtkWidget *widget, gpointer user_data);
+void view_source           (GtkWidget *widget, gpointer user_data);
+void next_msg              (GtkWidget *widget, gpointer user_data);
+void next_unread_msg       (GtkWidget *widget, gpointer user_data);
+void next_flagged_msg      (GtkWidget *widget, gpointer user_data);
+void next_thread           (GtkWidget *widget, gpointer user_data);
+void previous_msg          (GtkWidget *widget, gpointer user_data);
+void previous_unread_msg   (GtkWidget *widget, gpointer user_data);
+void previous_flagged_msg  (GtkWidget *widget, gpointer user_data);
+void resend_msg            (GtkWidget *widget, gpointer user_data);
+void search_msg            (GtkWidget *widget, gpointer user_data);
+void load_images           (GtkWidget *widget, gpointer user_data);
+
+void add_sender_to_addrbook    (BonoboUIComponent *uih, void *user_data, const char *path);
+void move_msg                  (BonoboUIComponent *uih, void *user_data, const char *path);
+void copy_msg                  (BonoboUIComponent *uih, void *user_data, const char *path);
+void select_all                (BonoboUIComponent *uih, void *user_data, const char *path);
+void select_thread             (BonoboUIComponent *uih, void *user_data, const char *path);
+void invert_selection          (BonoboUIComponent *uih, void *user_data, const char *path);
+void mark_as_seen              (BonoboUIComponent *uih, void *user_data, const char *path);
+void mark_all_as_seen          (BonoboUIComponent *uih, void *user_data, const char *path);
+void mark_as_unseen            (BonoboUIComponent *uih, void *user_data, const char *path);
+void mark_as_important         (BonoboUIComponent *uih, void *user_data, const char *path);
+void mark_as_unimportant       (BonoboUIComponent *uih, void *user_data, const char *path);
+void toggle_as_important       (BonoboUIComponent *uih, void *user_data, const char *path);
+void flag_for_followup         (BonoboUIComponent *uih, void *user_data, const char *path);
+void flag_followup_completed   (BonoboUIComponent *uih, void *user_data, const char *path);
+void flag_followup_clear       (BonoboUIComponent *uih, void *user_data, const char *path);
+
+void zoom_in               (BonoboUIComponent *uih, void *user_data, const char *path);
+void zoom_out              (BonoboUIComponent *uih, void *user_data, const char *path);
+void zoom_reset            (BonoboUIComponent *uih, void *user_data, const char *path);
+
+void edit_message          (BonoboUIComponent *uih, void *user_data, const char *path);
+void open_message          (BonoboUIComponent *uih, void *user_data, const char *path);
+void expunge_folder        (BonoboUIComponent *uih, void *user_data, const char *path);
+void filter_edit           (BonoboUIComponent *uih, void *user_data, const char *path);
+void vfolder_edit_vfolders (BonoboUIComponent *uih, void *user_data, const char *path);
+void manage_subscriptions  (BonoboUIComponent *uih, void *user_data, const char *path);
+
+void configure_folder      (BonoboUIComponent *uih, void *user_data, const char *path);
+
+void stop_threads          (BonoboUIComponent *uih, void *user_data, const char *path);
+
+void empty_trash           (BonoboUIComponent *uih, void *user_data, const char *path);
+
+void mail_reply            (CamelFolder *folder, CamelMimeMessage *msg, const char *uid, int mode);
+
+void composer_send_cb      (EMsgComposer *composer, gpointer data);
+void composer_save_draft_cb (EMsgComposer *composer, int quit, gpointer data);
+
+void forward_messages	   (CamelFolder *folder, GPtrArray *uids, gboolean inline);
+
+/* CamelStore callbacks */
+void folder_created (CamelStore *store, const char *prefix, CamelFolderInfo *fi);
+void folder_deleted (CamelStore *store, CamelFolderInfo *fi);
+
+void mail_storage_create_folder (EvolutionStorage *storage, CamelStore *store, CamelFolderInfo *fi);
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
+#endif /* ! MAIL_CALLBACKS_H */
diff --git a/mail/mail-component-factory.c b/mail/mail-component-factory.c
new file mode 100644
index 0000000000..00087b7439
--- /dev/null
+++ b/mail/mail-component-factory.c
@@ -0,0 +1,104 @@
+/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
+/* mail-component-factory.c
+ *
+ * Authors: Ettore Perazzoli <ettore@ximian.com>
+ *
+ * Copyright (C) 2003  Ximian, Inc.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of version 2 of the GNU General Public
+ * License as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public
+ * License along with this program; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+#include "em-utils.h"
+#include "evolution-composer.h"
+#include "mail-accounts.h"
+#include "mail-component.h"
+#include "mail-composer-prefs.h"
+#include "mail-config-druid.h"
+#include "mail-config-factory.h"
+#include "mail-config.h"
+#include "mail-mt.h"
+#include "mail-preferences.h"
+
+#include <bonobo-activation/bonobo-activation.h>
+#include <bonobo/bonobo-shlib-factory.h>
+
+#include <string.h>
+
+
+#define FACTORY_ID	"OAFIID:GNOME_Evolution_Mail_Factory_2"
+
+#define COMPONENT_ID	"OAFIID:GNOME_Evolution_Mail_Component_2"
+#define COMPOSER_ID	"OAFIID:GNOME_Evolution_Mail_Composer"
+#define FOLDER_INFO_ID	"OAFIID:GNOME_Evolution_FolderInfo"
+#define MAIL_CONFIG_ID	"OAFIID:GNOME_Evolution_MailConfig"
+#define WIZARD_ID	"OAFIID:GNOME_Evolution_Mail_Wizard"
+
+
+/* EPFIXME: This stuff is here just to get it to compile, it should be moved
+   out of the way (was originally in component-factory.c).  */
+EvolutionShellClient *global_shell_client = NULL;
+
+static BonoboObject *
+factory (BonoboGenericFactory *factory,
+	 const char *component_id,
+	 void *closure)
+{
+	/* EPFIXME this is messy.  The IDs are defined all over the place
+	   without a logic... */
+
+	if (strcmp (component_id, COMPONENT_ID) == 0) {
+		MailComponent *component = mail_component_peek ();
+
+		bonobo_object_ref (BONOBO_OBJECT (component));
+		return BONOBO_OBJECT (component);
+	} else if (strcmp(component_id, MAIL_CONFIG_ID) == 0) {
+		return (BonoboObject *)g_object_new (evolution_mail_config_get_type (), NULL);
+	} else if (strcmp(component_id, WIZARD_ID) == 0) {
+		return evolution_mail_config_wizard_new();
+	} else if (strcmp (component_id, MAIL_ACCOUNTS_CONTROL_ID) == 0
+		   || strcmp (component_id, MAIL_PREFERENCES_CONTROL_ID) == 0
+		   || strcmp (component_id, MAIL_COMPOSER_PREFS_CONTROL_ID) == 0) {
+		return mail_config_control_factory_cb (factory, component_id, CORBA_OBJECT_NIL);
+	} else if (strcmp(component_id, COMPOSER_ID) == 0) {
+		/* FIXME: how to remove need for callbacks, probably make the composer more tightly integrated with mail */
+		return (BonoboObject *) evolution_composer_new (em_utils_composer_send_cb, em_utils_composer_save_draft_cb);
+	}
+
+	g_warning (FACTORY_ID ": Don't know what to do with %s", component_id);
+	return NULL;
+}
+
+static Bonobo_Unknown
+make_factory (PortableServer_POA poa, const char *iid, gpointer impl_ptr, CORBA_Environment *ev)
+{
+	static int init = 0;
+
+	if (!init) {
+		mail_config_init ();
+		mail_msg_init ();
+		init = 1;
+	}
+
+	return bonobo_shlib_factory_std (FACTORY_ID, poa, impl_ptr, factory, NULL, ev);
+}
+
+static BonoboActivationPluginObject plugin_list[] = {
+	{ FACTORY_ID, make_factory},
+	{ NULL }
+};
+
+const  BonoboActivationPlugin Bonobo_Plugin_info = {
+	plugin_list, "Evolution Mail component factory"
+};
diff --git a/mail/mail-component.c b/mail/mail-component.c
new file mode 100644
index 0000000000..e4289eda19
--- /dev/null
+++ b/mail/mail-component.c
@@ -0,0 +1,1625 @@
+/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
+/* mail-component.c
+ *
+ * Copyright (C) 2003  Ximian Inc.
+ *
+ * This  program is free  software; you  can redistribute  it and/or
+ * modify it under the terms of version 2  of the GNU General Public
+ * License as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public
+ * License along with this program; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ *
+ * Author: Ettore Perazzoli <ettore@ximian.com>
+ */
+
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <string.h>
+
+#include "e-storage.h"
+#include "e-storage-set.h"
+#include "e-storage-browser.h"
+#include "e-storage-set-view.h"
+#include "em-folder-selector.h"
+#include "em-folder-selection.h"
+
+#include "folder-browser-factory.h"
+#include "mail-config.h"
+#include "mail-component.h"
+#include "mail-folder-cache.h"
+#include "mail-vfolder.h"
+#include "mail-mt.h"
+#include "mail-ops.h"
+#include "mail-send-recv.h"
+#include "mail-session.h"
+
+#include "em-popup.h"
+
+#include <gtk/gtklabel.h>
+
+#include <gal/e-table/e-tree.h>
+#include <gal/e-table/e-tree-memory.h>
+
+#include <camel/camel.h>
+
+#include <bonobo/bonobo-control.h>
+#include <bonobo/bonobo-widget.h>
+
+
+#define PARENT_TYPE bonobo_object_get_type ()
+static BonoboObjectClass *parent_class = NULL;
+
+struct _MailComponentPrivate {
+	char *base_directory;
+
+	MailAsyncEvent *async_event;
+	GHashTable *storages_hash; /* storage by store */
+
+	EFolderTypeRegistry *folder_type_registry;
+	EStorageSet *storage_set;
+
+	RuleContext *search_context;
+
+	char *context_path;	/* current path for right-click menu */
+
+	CamelStore *local_store;
+};
+
+static int emc_tree_right_click(ETree *tree, gint row, ETreePath path, gint col, GdkEvent *event, MailComponent *component);
+
+/* Utility functions.  */
+
+/* EPFIXME: Eeek, this totally sucks.  See comment in e-storage.h,
+   async_open_folder() should NOT be a signal.  */
+
+struct _StorageConnectedData {
+	EStorage *storage;
+	char *path;
+	EStorageDiscoveryCallback callback;
+	void *callback_data;
+};
+typedef struct _StorageConnectedData StorageConnectedData;
+
+static void
+storage_connected_callback (CamelStore *store,
+			    CamelFolderInfo *info,
+			    StorageConnectedData *data)
+{
+	EStorageResult result;
+
+	if (info != NULL)
+		result = E_STORAGE_OK;
+	else
+		result = E_STORAGE_GENERICERROR;
+
+	(* data->callback) (data->storage, result, data->path, data->callback_data);
+
+	g_object_unref (data->storage);
+	g_free (data->path);
+	g_free (data);
+}
+
+static void
+storage_async_open_folder_callback (EStorage *storage,
+				    const char *path,
+				    EStorageDiscoveryCallback callback,
+				    void *callback_data,
+				    CamelStore *store)
+{
+	StorageConnectedData *storage_connected_data = g_new0 (StorageConnectedData, 1);
+
+	g_object_ref (storage);
+
+	storage_connected_data->storage = storage;
+	storage_connected_data->path = g_strdup (path);
+	storage_connected_data->callback = callback;
+	storage_connected_data->callback_data = callback_data;
+
+	mail_note_store (store, NULL, storage,
+			 (void *) storage_connected_callback, storage_connected_data);
+}
+
+static void
+add_storage (MailComponent *component,
+	     const char *name,
+	     CamelService *store,
+	     CamelException *ex)
+{
+	EStorage *storage;
+	EFolder *root_folder;
+
+	root_folder = e_folder_new (name, "noselect", "");
+	storage = e_storage_new (name, root_folder);
+	e_storage_declare_has_subfolders(storage, "/", _("Connecting..."));
+
+	camel_object_ref(store);
+
+	g_object_set_data((GObject *)storage, "em-store", store);
+	g_hash_table_insert (component->priv->storages_hash, store, storage);
+
+	g_signal_connect(storage, "async_open_folder",
+			 G_CALLBACK (storage_async_open_folder_callback), store);
+
+#if 0
+	/* EPFIXME these are not needed anymore.  */
+	g_signal_connect(storage, "create_folder", G_CALLBACK(storage_create_folder), store);
+	g_signal_connect(storage, "remove_folder", G_CALLBACK(storage_remove_folder), store);
+	g_signal_connect(storage, "xfer_folder", G_CALLBACK(storage_xfer_folder), store);
+#endif
+
+	e_storage_set_add_storage (component->priv->storage_set, storage);
+
+	mail_note_store ((CamelStore *) store, NULL, storage, NULL, NULL);
+
+	g_object_unref (storage);
+}
+
+static void
+load_accounts(MailComponent *component, EAccountList *accounts)
+{
+	EIterator *iter;
+	
+	/* Load each service (don't connect!). Check its provider and
+	 * see if this belongs in the shell's folder list. If so, add
+	 * it.
+	 */
+	
+	iter = e_list_get_iterator ((EList *) accounts);
+	while (e_iterator_is_valid (iter)) {
+		EAccountService *service;
+		EAccount *account;
+		const char *name;
+		
+		account = (EAccount *) e_iterator_get (iter);
+		service = account->source;
+		name = account->name;
+
+		if (account->enabled && service->url != NULL)
+			mail_component_load_storage_by_uri (component, service->url, name);
+		
+		e_iterator_next (iter);
+	}
+	
+	g_object_unref (iter);
+}
+
+static inline gboolean
+type_is_mail (const char *type)
+{
+	return !strcmp (type, "mail") || !strcmp (type, "mail/public");
+}
+
+static inline gboolean
+type_is_vtrash (const char *type)
+{
+	return !strcmp (type, "vtrash");
+}
+
+static void
+storage_go_online (gpointer key, gpointer value, gpointer data)
+{
+	CamelStore *store = key;
+	CamelService *service = CAMEL_SERVICE (store);
+
+	if (! (service->provider->flags & CAMEL_PROVIDER_IS_REMOTE)
+	    || (service->provider->flags & CAMEL_PROVIDER_IS_EXTERNAL))
+		return;
+
+	if ((CAMEL_IS_DISCO_STORE (service)
+	     && camel_disco_store_status (CAMEL_DISCO_STORE (service)) == CAMEL_DISCO_STORE_OFFLINE)
+	    || service->status != CAMEL_SERVICE_DISCONNECTED) {
+		mail_store_set_offline (store, FALSE, NULL, NULL);
+		mail_note_store (store, NULL, NULL, NULL, NULL);
+	}
+}
+
+static void
+go_online (MailComponent *component)
+{
+	camel_session_set_online(session, TRUE);
+	mail_session_set_interactive(TRUE);
+	mail_component_storages_foreach(component, storage_go_online, NULL);
+}
+
+static void
+setup_search_context (MailComponent *component)
+{
+	MailComponentPrivate *priv = component->priv;
+	char *user = g_strdup_printf ("%s/evolution/searches.xml", g_get_home_dir ()); /* EPFIXME should be somewhere else. */
+	char *system = g_strdup (EVOLUTION_PRIVDATADIR "/vfoldertypes.xml");
+	
+	priv->search_context = rule_context_new ();
+	g_object_set_data_full (G_OBJECT (priv->search_context), "user", user, g_free);
+	g_object_set_data_full (G_OBJECT (priv->search_context), "system", system, g_free);
+	
+	rule_context_add_part_set (priv->search_context, "partset", filter_part_get_type (),
+				   rule_context_add_part, rule_context_next_part);
+	
+	rule_context_add_rule_set (priv->search_context, "ruleset", filter_rule_get_type (),
+				   rule_context_add_rule, rule_context_next_rule);
+	
+	rule_context_load (priv->search_context, system, user);
+}
+
+/* Local store setup.  */
+char *default_drafts_folder_uri;
+CamelFolder *drafts_folder = NULL;
+char *default_sent_folder_uri;
+CamelFolder *sent_folder = NULL;
+char *default_outbox_folder_uri;
+CamelFolder *outbox_folder = NULL;
+char *default_inbox_folder_uri;
+CamelFolder *inbox_folder = NULL;
+
+static struct {
+	char *base;
+	char **uri;
+	CamelFolder **folder;
+} default_folders[] = {
+	{ "Inbox", &default_inbox_folder_uri, &inbox_folder },
+	{ "Drafts", &default_drafts_folder_uri, &drafts_folder },
+	{ "Outbox", &default_outbox_folder_uri, &outbox_folder },
+	{ "Sent", &default_sent_folder_uri, &sent_folder },
+};
+
+static void
+setup_local_store(MailComponent *component)
+{
+	MailComponentPrivate *p = component->priv;
+	CamelException ex;
+	char *store_uri;
+	int i;
+
+	g_assert(p->local_store == NULL);
+
+	/* EPFIXME It should use base_directory once we have moved it.  */
+	store_uri = g_strconcat("mbox:", g_get_home_dir(), "/.evolution/mail/local", NULL);
+	p->local_store = mail_component_load_storage_by_uri(component, store_uri, _("On this Computer"));
+	camel_object_ref(p->local_store);
+	
+	camel_exception_init (&ex);
+	for (i=0;i<sizeof(default_folders)/sizeof(default_folders[0]);i++) {
+		/* FIXME: should this uri be account relative? */
+		*default_folders[i].uri = g_strdup_printf("%s#%s", store_uri, default_folders[i].base);
+		*default_folders[i].folder = camel_store_get_folder(p->local_store, default_folders[i].base,
+								    CAMEL_STORE_FOLDER_CREATE, &ex);
+		camel_exception_clear(&ex);
+	}
+
+	g_free(store_uri);
+}
+
+/* EStorageBrowser callbacks.  */
+
+static BonoboControl *
+create_noselect_control (void)
+{
+	GtkWidget *label;
+
+	label = gtk_label_new (_("This folder cannot contain messages."));
+	gtk_widget_show (label);
+	return bonobo_control_new (label);
+}
+
+static GtkWidget *
+create_view_callback (EStorageBrowser *browser,
+		      const char *path,
+		      void *unused_data)
+{
+	BonoboControl *control;
+	EFolder *folder;
+	const char *folder_type;
+	const char *physical_uri;
+
+	folder = e_storage_set_get_folder (e_storage_browser_peek_storage_set (browser), path);
+	if (folder == NULL) {
+		g_warning ("No folder at %s", path);
+		return gtk_label_new ("(You should not be seeing this label)");
+	}
+
+	folder_type  = e_folder_get_type_string (folder);
+	physical_uri = e_folder_get_physical_uri (folder);
+
+	if (type_is_mail (folder_type)) {
+		const char *noselect;
+		CamelURL *url;
+		
+		url = camel_url_new (physical_uri, NULL);
+		noselect = url ? camel_url_get_param (url, "noselect") : NULL;
+		if (noselect && !strcasecmp (noselect, "yes"))
+			control = create_noselect_control ();
+		else
+			control = folder_browser_factory_new_control (physical_uri);
+		camel_url_free (url);
+	} else if (type_is_vtrash (folder_type)) {
+		if (!strncasecmp (physical_uri, "file:", 5))
+			control = folder_browser_factory_new_control ("vtrash:file:/");
+		else
+			control = folder_browser_factory_new_control (physical_uri);
+	} else
+		return NULL;
+	
+	if (!control)
+		return NULL;
+
+	/* EPFIXME: This leaks the control.  */
+	return bonobo_widget_new_control_from_objref (BONOBO_OBJREF (control), CORBA_OBJECT_NIL);
+}
+
+static void
+browser_page_switched_callback (EStorageBrowser *browser,
+				GtkWidget *old_page,
+				GtkWidget *new_page,
+				BonoboControl *parent_control)
+{
+	if (BONOBO_IS_WIDGET (old_page)) {
+		BonoboControlFrame *control_frame = bonobo_widget_get_control_frame (BONOBO_WIDGET (old_page));
+
+		bonobo_control_frame_control_deactivate (control_frame);
+	}
+
+	if (BONOBO_IS_WIDGET (new_page)) {
+		BonoboControlFrame *control_frame = bonobo_widget_get_control_frame (BONOBO_WIDGET (new_page));
+		Bonobo_UIContainer ui_container = bonobo_control_get_remote_ui_container (parent_control, NULL);
+
+		/* This is necessary because we are not embedding the folder browser control
+		   directly; we are putting the folder browser control into a notebook which
+		   is then exported to the shell as a control.  So we need to forward the
+		   notebook's UIContainer to the folder browser.  */
+		bonobo_control_frame_set_ui_container (control_frame, ui_container, NULL);
+
+		bonobo_control_frame_control_activate (control_frame);
+	}
+}
+
+/* GObject methods.  */
+
+static void
+impl_dispose (GObject *object)
+{
+	MailComponentPrivate *priv = MAIL_COMPONENT (object)->priv;
+
+	if (priv->storage_set != NULL) {
+		g_object_unref (priv->storage_set);
+		priv->storage_set = NULL;
+	}
+
+	if (priv->folder_type_registry != NULL) {
+		g_object_unref (priv->folder_type_registry);
+		priv->folder_type_registry = NULL;
+	}
+
+	if (priv->search_context != NULL) {
+		g_object_unref (priv->search_context);
+		priv->search_context = NULL;
+	}
+
+	if (priv->local_store != NULL) {
+		camel_object_unref (CAMEL_OBJECT (priv->local_store));
+		priv->local_store = NULL;
+	}
+
+	(* G_OBJECT_CLASS (parent_class)->dispose) (object);
+}
+
+static void
+impl_finalize (GObject *object)
+{
+	MailComponentPrivate *priv = MAIL_COMPONENT (object)->priv;
+
+	g_free (priv->base_directory);
+
+	mail_async_event_destroy (priv->async_event);
+
+	g_hash_table_destroy (priv->storages_hash); /* EPFIXME free the data within? */
+
+	if (mail_async_event_destroy (priv->async_event) == -1) {
+		g_warning("Cannot destroy async event: would deadlock");
+		g_warning(" system may be unstable at exit");
+	}
+
+	g_free(priv->context_path);
+	g_free (priv);
+
+	(* G_OBJECT_CLASS (parent_class)->finalize) (object);
+}
+
+
+/* Evolution::Component CORBA methods.  */
+
+static void
+impl_createControls (PortableServer_Servant servant,
+		     Bonobo_Control *corba_sidebar_control,
+		     Bonobo_Control *corba_view_control,
+		     CORBA_Environment *ev)
+{
+	MailComponent *mail_component = MAIL_COMPONENT (bonobo_object_from_servant (servant));
+	MailComponentPrivate *priv = mail_component->priv;
+	EStorageBrowser *browser;
+	GtkWidget *tree_widget;
+	GtkWidget *view_widget;
+	BonoboControl *sidebar_control;
+	BonoboControl *view_control;
+
+	browser = e_storage_browser_new (priv->storage_set, "/", create_view_callback, NULL);
+
+	tree_widget = e_storage_browser_peek_tree_widget (browser);
+	view_widget = e_storage_browser_peek_view_widget (browser);
+	
+	gtk_widget_show (tree_widget);
+	gtk_widget_show (view_widget);
+
+	sidebar_control = bonobo_control_new (tree_widget);
+	view_control = bonobo_control_new (view_widget);
+
+	*corba_sidebar_control = CORBA_Object_duplicate (BONOBO_OBJREF (sidebar_control), ev);
+	*corba_view_control = CORBA_Object_duplicate (BONOBO_OBJREF (view_control), ev);
+
+	g_signal_connect_object (browser, "page_switched",
+				 G_CALLBACK (browser_page_switched_callback), view_control, 0);
+
+	g_signal_connect(tree_widget, "right_click", G_CALLBACK(emc_tree_right_click), mail_component);
+}
+
+
+/* Initialization.  */
+
+static void
+mail_component_class_init (MailComponentClass *class)
+{
+	POA_GNOME_Evolution_Component__epv *epv = &class->epv;
+	GObjectClass *object_class = G_OBJECT_CLASS (class);
+
+	parent_class = g_type_class_peek_parent (class);
+
+	object_class->dispose  = impl_dispose;
+	object_class->finalize = impl_finalize;
+
+	epv->createControls = impl_createControls;
+}
+
+static void
+mail_component_init (MailComponent *component)
+{
+	MailComponentPrivate *priv;
+	EAccountList *accounts;
+
+	priv = g_new0 (MailComponentPrivate, 1);
+	component->priv = priv;
+
+	/* EPFIXME: Move to a private directory.  */
+	/* EPFIXME: Create the directory.  */
+	priv->base_directory = g_build_filename (g_get_home_dir (), "evolution", NULL);
+
+	/* EPFIXME: Turn into an object?  */
+	mail_session_init (priv->base_directory);
+
+	priv->async_event = mail_async_event_new();
+	priv->storages_hash = g_hash_table_new (NULL, NULL);
+
+	priv->folder_type_registry = e_folder_type_registry_new ();
+	priv->storage_set = e_storage_set_new (priv->folder_type_registry);
+
+#if 0				/* EPFIXME TODO somehow */
+	for (i = 0; i < sizeof (standard_folders) / sizeof (standard_folders[0]); i++)
+		*standard_folders[i].uri = g_strdup_printf ("file://%s/local/%s", evolution_dir, standard_folders[i].name);
+#endif
+	setup_local_store (component);
+
+	accounts = mail_config_get_accounts ();
+	load_accounts(component, accounts);
+
+#if 0
+	/* EPFIXME?  */
+	mail_local_storage_startup (shell_client, evolution_dir);
+	mail_importer_init (shell_client);
+
+	for (i = 0; i < sizeof (standard_folders) / sizeof (standard_folders[0]); i++) {
+		mail_msg_wait (mail_get_folder (*standard_folders[i].uri, CAMEL_STORE_FOLDER_CREATE,
+						got_folder, standard_folders[i].folder, mail_thread_new));
+	}
+#endif
+	
+	/* mail_autoreceive_setup (); EPFIXME keep it off for testing */
+
+	setup_search_context (component);
+
+#if 0
+	/* EPFIXME this shouldn't be here.  */
+	if (mail_config_is_corrupt ()) {
+		GtkWidget *dialog;
+		
+		dialog = gtk_message_dialog_new (NULL, GTK_DIALOG_MODAL, GTK_MESSAGE_WARNING, GTK_BUTTONS_CLOSE,
+						 _("Some of your mail settings seem corrupt, "
+						   "please check that everything is in order."));
+		g_signal_connect (dialog, "response", G_CALLBACK (gtk_widget_destroy), dialog);
+		gtk_widget_show (dialog);
+	}
+#endif
+
+#if 0
+	/* EPFIXME if we nuke the summary this is not necessary anymore.  */
+
+	/* Everything should be ready now */
+	evolution_folder_info_notify_ready ();
+#endif
+
+	/* EPFIXME not sure about this.  */
+	go_online (component);
+}
+
+
+/* Public API.  */
+
+MailComponent *
+mail_component_peek (void)
+{
+	static MailComponent *component = NULL;
+
+	if (component == NULL) {
+		component = g_object_new (mail_component_get_type (), NULL);
+
+		/* FIXME: this should all be initialised in a starutp routine, not from the peek function,
+		   this covers much of the ::init method's content too */
+		vfolder_load_storage();
+	}
+
+	return component;
+}
+
+
+const char *
+mail_component_peek_base_directory (MailComponent *component)
+{
+	return component->priv->base_directory;
+}
+
+RuleContext *
+mail_component_peek_search_context (MailComponent *component)
+{
+	return component->priv->search_context;
+}
+
+
+void
+mail_component_add_store (MailComponent *component,
+			  CamelStore *store,
+			  const char *name)
+{
+	CamelException ex;
+
+	camel_exception_init (&ex);
+	
+	if (name == NULL) {
+		char *service_name;
+		
+		service_name = camel_service_get_name ((CamelService *) store, TRUE);
+		add_storage (component, service_name, (CamelService *) store, &ex);
+		g_free (service_name);
+	} else {
+		add_storage (component, name, (CamelService *) store, &ex);
+	}
+	
+	camel_exception_clear (&ex);
+}
+
+
+/**
+ * mail_component_load_storage_by_uri:
+ * @component: 
+ * @uri: 
+ * @name: 
+ * 
+ * 
+ * 
+ * Return value: Pointer to the newly added CamelStore.  The caller is supposed
+ * to ref the object if it wants to store it.
+ **/
+CamelStore *
+mail_component_load_storage_by_uri (MailComponent *component,
+				    const char *uri,
+				    const char *name)
+{
+	CamelException ex;
+	CamelService *store;
+	CamelProvider *prov;
+	
+	camel_exception_init (&ex);
+	
+	/* Load the service (don't connect!). Check its provider and
+	 * see if this belongs in the shell's folder list. If so, add
+	 * it.
+	 */
+	
+	prov = camel_session_get_provider (session, uri, &ex);
+	if (prov == NULL) {
+		/* EPFIXME: real error dialog */
+		g_warning ("couldn't get service %s: %s\n", uri,
+			   camel_exception_get_description (&ex));
+		camel_exception_clear (&ex);
+		return NULL;
+	}
+	
+	if (!(prov->flags & CAMEL_PROVIDER_IS_STORAGE) ||
+	    (prov->flags & CAMEL_PROVIDER_IS_EXTERNAL))
+		return NULL;
+	
+	store = camel_session_get_service (session, uri, CAMEL_PROVIDER_STORE, &ex);
+	if (store == NULL) {
+		/* EPFIXME: real error dialog */
+		g_warning ("couldn't get service %s: %s\n", uri,
+			   camel_exception_get_description (&ex));
+		camel_exception_clear (&ex);
+		return NULL;
+	}
+	
+	if (name != NULL) {
+		add_storage (component, name, store, &ex);
+	} else {
+		char *service_name;
+		
+		service_name = camel_service_get_name (store, TRUE);
+		add_storage (component, service_name, store, &ex);
+		g_free (service_name);
+	}
+	
+	if (camel_exception_is_set (&ex)) {
+		/* EPFIXME: real error dialog */
+		g_warning ("Cannot load storage: %s",
+			   camel_exception_get_description (&ex));
+		camel_exception_clear (&ex);
+	}
+	
+	camel_object_unref (CAMEL_OBJECT (store));
+	return CAMEL_STORE (store);		/* (Still has one ref in the hash.)  */
+}
+
+
+static void
+store_disconnect (CamelStore *store,
+		  void *event_data,
+		  void *data)
+{
+	camel_service_disconnect (CAMEL_SERVICE (store), TRUE, NULL);
+	camel_object_unref (CAMEL_OBJECT (store));
+}
+
+void
+mail_component_remove_storage (MailComponent *component,
+			       CamelStore *store)
+{
+	MailComponentPrivate *priv = component->priv;
+	EStorage *storage;
+	
+	/* Because the storages_hash holds a reference to each store
+	 * used as a key in it, none of them will ever be gc'ed, meaning
+	 * any call to camel_session_get_{service,store} with the same
+	 * URL will always return the same object. So this works.
+	 */
+	
+	storage = g_hash_table_lookup (priv->storages_hash, store);
+	if (!storage)
+		return;
+	
+	g_hash_table_remove (priv->storages_hash, store);
+	
+	/* so i guess potentially we could have a race, add a store while one
+	   being removed.  ?? */
+	mail_note_store_remove (store);
+
+	e_storage_set_remove_storage (priv->storage_set, storage);
+	
+	mail_async_event_emit(priv->async_event, MAIL_ASYNC_THREAD, (MailAsyncFunc) store_disconnect, store, NULL, NULL);
+}
+
+
+void
+mail_component_remove_storage_by_uri (MailComponent *component,
+				      const char *uri)
+{
+	CamelProvider *prov;
+	CamelService *store;
+
+	prov = camel_session_get_provider (session, uri, NULL);
+	if (!prov)
+		return;
+	if (!(prov->flags & CAMEL_PROVIDER_IS_STORAGE) ||
+	    (prov->flags & CAMEL_PROVIDER_IS_EXTERNAL))
+		return;
+
+	store = camel_session_get_service (session, uri, CAMEL_PROVIDER_STORE, NULL);
+	if (store != NULL) {
+		mail_component_remove_storage (component, CAMEL_STORE (store));
+		camel_object_unref (CAMEL_OBJECT (store));
+	}
+}
+
+
+EStorage *
+mail_component_lookup_storage (MailComponent *component,
+			       CamelStore *store)
+{
+	EStorage *storage;
+	
+	/* Because the storages_hash holds a reference to each store
+	 * used as a key in it, none of them will ever be gc'ed, meaning
+	 * any call to camel_session_get_{service,store} with the same
+	 * URL will always return the same object. So this works.
+	 */
+	
+	storage = g_hash_table_lookup (component->priv->storages_hash, store);
+	if (storage)
+		g_object_ref (storage);
+	
+	return storage;
+}
+
+
+int
+mail_component_get_storage_count (MailComponent *component)
+{
+	return g_hash_table_size (component->priv->storages_hash);
+}
+
+
+EStorageSet *
+mail_component_peek_storage_set (MailComponent *component)
+{
+	return component->priv->storage_set;
+}
+
+
+void
+mail_component_storages_foreach (MailComponent *component,
+				 GHFunc func,
+				 void *data)
+{
+	g_hash_table_foreach (component->priv->storages_hash, func, data);
+}
+
+extern struct _CamelSession *session;
+
+char *em_uri_from_camel(const char *curi)
+{
+	CamelURL *curl;
+	EAccount *account;
+	const char *uid, *path;
+	char *euri;
+	CamelProvider *provider;
+
+	provider = camel_session_get_provider(session, curi, NULL);
+	if (provider == NULL)
+		return g_strdup(curi);
+
+	curl = camel_url_new(curi, NULL);
+	if (curl == NULL)
+		return g_strdup(curi);
+
+	account = mail_config_get_account_by_source_url(curi);
+	uid = (account == NULL)?"local@local":account->uid;
+	path = (provider->url_flags & CAMEL_URL_FRAGMENT_IS_PATH)?curl->fragment:curl->path;
+	if (path[0] == '/')
+		path++;
+	euri = g_strdup_printf("email://%s/%s", uid, path);
+	printf("em uri from camel '%s' -> '%s'\n", curi, euri);
+
+	return euri;
+}
+
+char *em_uri_to_camel(const char *euri)
+{
+	EAccountList *accounts;
+	const EAccount *account;
+	EAccountService *service;
+	CamelProvider *provider;
+	CamelURL *eurl, *curl;
+	char *uid, *curi;
+
+	eurl = camel_url_new(euri, NULL);
+	if (eurl == NULL)
+		return g_strdup(euri);
+
+	if (strcmp(eurl->protocol, "email") != 0) {
+		camel_url_free(eurl);
+		return g_strdup(euri);
+	}
+
+	g_assert(eurl->user != NULL);
+	g_assert(eurl->host != NULL);
+
+	if (strcmp(eurl->user, "local") == 0 && strcmp(eurl->host, "local") == 0) {
+		/* FIXME: needs to track real local store location */
+		curi = g_strdup_printf("mbox:%s/.evolution/mail/local#%s", g_get_home_dir(), eurl->path);
+		camel_url_free(eurl);
+		return curi;
+	}
+
+	uid = g_strdup_printf("%s@%s", eurl->user, eurl->host);
+
+	accounts = mail_config_get_accounts();
+	account = e_account_list_find(accounts, E_ACCOUNT_FIND_UID, uid);
+	g_free(uid);
+
+	if (account == NULL) {
+		camel_url_free(eurl);
+		return g_strdup(euri);
+	}
+
+	service = account->source;
+	provider = camel_session_get_provider(session, service->url, NULL);
+
+	curl = camel_url_new(service->url, NULL);
+	if (provider->url_flags & CAMEL_URL_FRAGMENT_IS_PATH)
+		camel_url_set_fragment(curl, eurl->path);
+	else
+		camel_url_set_path(curl, eurl->path);
+
+	curi = camel_url_to_string(curl, 0);
+
+	camel_url_free(eurl);
+	camel_url_free(curl);
+
+	printf("em uri to camel '%s' -> '%s'\n", euri, curi);
+
+	return curi;
+}
+
+
+CamelFolder *
+mail_component_get_folder_from_evomail_uri (MailComponent *component,
+					    guint32 flags,
+					    const char *evomail_uri,
+					    CamelException *ex)
+{
+	CamelException local_ex;
+	EAccountList *accounts;
+	EIterator *iter;
+	const char *p;
+	const char *q;
+	const char *folder_name;
+	char *uid;
+
+	camel_exception_init (&local_ex);
+
+	if (strncmp (evomail_uri, "evomail:", 8) != 0)
+		return NULL;
+
+	p = evomail_uri + 8;
+	while (*p == '/')
+		p ++;
+
+	q = strchr (p, '/');
+	if (q == NULL)
+		return NULL;
+
+	uid = g_strndup (p, q - p);
+	folder_name = q + 1;
+
+	/* since we have no explicit account for 'local' folders, make one up */
+	if (strcmp(uid, "local") == 0) {
+		g_free(uid);
+		return camel_store_get_folder(component->priv->local_store, folder_name, flags, ex);
+	}
+
+	accounts = mail_config_get_accounts ();
+	iter = e_list_get_iterator ((EList *) accounts);
+	while (e_iterator_is_valid (iter)) {
+		EAccount *account = (EAccount *) e_iterator_get (iter);
+		EAccountService *service = account->source;
+		CamelProvider *provider;
+		CamelStore *store;
+
+		if (strcmp (account->uid, uid) != 0)
+			continue;
+
+		provider = camel_session_get_provider (session, service->url, &local_ex);
+		if (provider == NULL)
+			goto fail;
+
+		store = (CamelStore *) camel_session_get_service (session, service->url, CAMEL_PROVIDER_STORE, &local_ex);
+		if (store == NULL)
+			goto fail;
+
+		g_free (uid);
+		return camel_store_get_folder (store, folder_name, flags, ex);
+	}
+
+ fail:
+	camel_exception_clear (&local_ex);
+	g_free (uid);
+	return NULL;
+}
+
+
+char *
+mail_component_evomail_uri_from_folder (MailComponent *component,
+					CamelFolder *folder)
+{
+	CamelStore *store = camel_folder_get_parent_store (folder);
+	EAccount *account;
+	char *service_url;
+	char *evomail_uri;
+	const char *uid;
+
+	if (store == NULL)
+		return NULL;
+
+	service_url = camel_service_get_url (CAMEL_SERVICE (store));
+	account = mail_config_get_account_by_source_url (service_url);
+
+	if (account == NULL) {
+		/* since we have no explicit account for 'local' folders, make one up */
+		/* TODO: check the folder is really a local one, folder->parent_store == local_store? */
+		uid = "local";
+		/*g_free (service_url);
+		return NULL;*/
+	} else {
+		uid = account->uid;
+	}
+
+	evomail_uri = g_strconcat ("evomail:///", uid, "/", camel_folder_get_full_name (folder), NULL);
+	g_free (service_url);
+
+	return evomail_uri;
+}
+
+
+BONOBO_TYPE_FUNC_FULL (MailComponent, GNOME_Evolution_Component, PARENT_TYPE, mail_component)
+
+
+/* ********************************************************************** */
+#if 0
+static void
+emc_popup_view(GtkWidget *w, MailComponent *mc)
+{
+
+}
+
+static void
+emc_popup_open_new(GtkWidget *w, MailComponent *mc)
+{
+}
+#endif
+
+static void
+em_copy_folders(CamelStore *tostore, const char *tobase, CamelStore *fromstore, const char *frombase, int delete)
+{
+	GString *toname, *fromname;
+	CamelFolderInfo *fi;
+	GList *pending = NULL;
+	guint32 flags = CAMEL_STORE_FOLDER_INFO_RECURSIVE;
+	CamelException *ex = camel_exception_new();
+	int fromlen;
+	const char *tmp;
+
+	if (camel_store_supports_subscriptions(fromstore))
+		flags |= CAMEL_STORE_FOLDER_INFO_SUBSCRIBED;
+
+	fi = camel_store_get_folder_info(fromstore, frombase, flags, ex);
+	if (camel_exception_is_set(ex))
+		goto done;
+
+	pending = g_list_append(pending, fi);
+
+	toname = g_string_new("");
+	fromname = g_string_new("");
+
+	tmp = strrchr(frombase, '/');
+	if (tmp == NULL)
+		fromlen = 0;
+	else
+		fromlen = tmp-frombase;
+
+	printf("top name is '%s'\n", fi->full_name);
+
+	while (pending) {
+		CamelFolderInfo *info = pending->data;
+
+		pending = g_list_remove_link(pending, pending);
+		while (info) {
+			CamelFolder *fromfolder, *tofolder;
+			GPtrArray *uids;
+
+			if (info->child)
+				pending = g_list_append(pending, info->child);
+			g_string_printf(toname, "%s/%s", tobase, info->full_name + fromlen);
+
+			printf("Copying from '%s' to '%s'\n", info->full_name, toname->str);
+
+			/* This makes sure we create the same tree, e.g. from a nonselectable source */
+			/* Not sure if this is really the 'right thing', e.g. for spool stores, but it makes the ui work */
+			fromfolder = camel_store_get_folder(fromstore, info->full_name, 0, ex);
+			tofolder = camel_store_get_folder(tostore, toname->str, CAMEL_STORE_FOLDER_CREATE, ex);
+			if (tofolder == NULL) {
+				if (fromfolder)
+					camel_object_unref(fromfolder);
+				goto exception;
+			}
+
+			if (fromfolder) {
+				uids = camel_folder_get_uids(fromfolder);
+				camel_folder_transfer_messages_to(fromfolder, uids, tofolder, NULL, FALSE, ex);
+				camel_folder_free_uids(fromfolder, uids);
+
+				camel_object_unref(fromfolder);
+			}
+			camel_object_unref(tofolder);
+			if (camel_exception_is_set(ex))
+				goto exception;
+			info = info->sibling;
+		}
+	}
+
+	camel_store_free_folder_info(fromstore, fi);
+
+exception:
+	g_string_free(toname, TRUE);
+	g_string_free(fromname, TRUE);
+done:
+	printf("exception: %s\n", ex->desc?ex->desc:"<none>");
+	camel_exception_free(ex);
+}
+
+struct _copy_folder_data {
+	MailComponent *mc;
+	int delete;
+};
+
+static void
+emc_popup_copy_folder_selected(const char *uri, void *data)
+{
+	struct _copy_folder_data *d = data;
+
+	if (uri == NULL) {
+		g_free(d);
+		return;
+	}
+
+	if (uri) {
+		EFolder *folder = e_storage_set_get_folder(d->mc->priv->storage_set, d->mc->priv->context_path);
+		CamelException *ex = camel_exception_new();
+		CamelStore *fromstore, *tostore;
+		char *tobase, *frombase;
+		CamelURL *url;
+
+		printf("copying folder '%s' to '%s'\n", d->mc->priv->context_path, uri);
+
+		fromstore = camel_session_get_store(session, e_folder_get_physical_uri(folder), ex);
+		frombase = strchr(d->mc->priv->context_path+1, '/')+1;
+
+		tostore = camel_session_get_store(session, uri, ex);
+		url = camel_url_new(uri, NULL);
+		if (url->fragment)
+			tobase = url->fragment;
+		else
+			tobase = url->path;
+
+		em_copy_folders(tostore, tobase, fromstore, frombase, d->delete);
+
+		camel_url_free(url);
+		camel_exception_free(ex);
+	}
+	g_free(d);
+}
+
+static void
+emc_popup_copy(GtkWidget *w, MailComponent *mc)
+{
+	struct _copy_folder_data *d;
+
+	d = g_malloc(sizeof(*d));
+	d->mc = mc;
+	d->delete = 0;
+	em_select_folder(NULL, _("Select folder"), _("Select destination to copy folder into"), NULL, emc_popup_copy_folder_selected, d);
+}
+
+static void
+emc_popup_move(GtkWidget *w, MailComponent *mc)
+{
+	struct _copy_folder_data *d;
+
+	d = g_malloc(sizeof(*d));
+	d->mc = mc;
+	d->delete = 1;
+	em_select_folder(NULL, _("Select folder"), _("Select destination to move folder into"), NULL, emc_popup_copy_folder_selected, d);
+}
+static void
+emc_popup_new_folder_create(EStorageSet *ess, EStorageResult result, void *data)
+{
+	printf("folder created %s\n", result == E_STORAGE_OK?"ok":"failed");
+}
+
+static void
+emc_popup_new_folder_response(EMFolderSelector *emfs, guint response, MailComponent *mc)
+{
+	if (response == GTK_RESPONSE_OK) {
+		char *path, *tmp, *name, *full;
+		EStorage *storage;
+		CamelStore *store;
+		CamelException *ex;
+
+		printf("Creating folder: %s (%s)\n", em_folder_selector_get_selected(emfs),
+		       em_folder_selector_get_selected_uri(emfs));
+
+		path = g_strdup(em_folder_selector_get_selected(emfs));
+		tmp = strchr(path+1, '/');
+		*tmp++ = 0;
+		/* FIXME: camel_store_create_folder should just take full path names */
+		full = g_strdup(tmp);
+		name = strrchr(tmp, '/');
+		if (name == NULL) {
+			name = tmp;
+			tmp = "";
+		} else
+			*name++  = 0;
+
+		storage = e_storage_set_get_storage(mc->priv->storage_set, path+1);
+		store = g_object_get_data((GObject *)storage, "em-store");
+
+		printf("creating folder '%s' / '%s' on '%s'\n", tmp, name, path+1);
+
+		ex = camel_exception_new();
+		camel_store_create_folder(store, tmp, name, ex);
+		if (camel_exception_is_set(ex)) {
+			printf("Create failed: %s\n", ex->desc);
+		} else if (camel_store_supports_subscriptions(store)) {
+			camel_store_subscribe_folder(store, full, ex);
+			if (camel_exception_is_set(ex)) {
+				printf("Subscribe failed: %s\n", ex->desc);
+			}
+		}
+
+		camel_exception_free(ex);
+
+		g_free(full);
+		g_free(path);
+
+		/* Blah, this should just use camel, we get better error reporting if we do too */
+		/*e_storage_set_async_create_folder(mc->priv->storage_set, path, "mail", "", emc_popup_new_folder_create, mc);*/
+	}
+	gtk_widget_destroy((GtkWidget *)emfs);
+}
+
+static void
+emc_popup_new_folder (GtkWidget *w, MailComponent *mc)
+{
+	GtkWidget *dialog;
+
+	dialog = em_folder_selector_create_new(mc->priv->storage_set, 0, _("Create folder"), _("Specify where to create the folder:"));
+	em_folder_selector_set_selected((EMFolderSelector *)dialog, mc->priv->context_path);
+	g_signal_connect(dialog, "response", G_CALLBACK(emc_popup_new_folder_response), mc);
+	gtk_widget_show(dialog);
+}
+
+static void
+em_delete_rec(CamelStore *store, CamelFolderInfo *fi, CamelException *ex)
+{
+	while (fi) {
+		CamelFolder *folder;
+
+		if (fi->child)
+			em_delete_rec(store, fi->child, ex);
+		if (camel_exception_is_set(ex))
+			return;
+
+		printf("deleting folder '%s'\n", fi->full_name);
+
+		if (camel_store_supports_subscriptions(store))
+			camel_store_unsubscribe_folder(store, fi->full_name, NULL);
+
+		folder = camel_store_get_folder(store, fi->full_name, 0, NULL);
+		if (folder) {
+			GPtrArray *uids = camel_folder_get_uids(folder);
+			int i;
+
+			camel_folder_freeze(folder);
+			for (i = 0; i < uids->len; i++)
+				camel_folder_delete_message(folder, uids->pdata[i]);
+			camel_folder_sync(folder, TRUE, NULL);
+			camel_folder_thaw(folder);
+			camel_folder_free_uids(folder, uids);
+		}
+
+		camel_store_delete_folder(store, fi->full_name, ex);
+		if (camel_exception_is_set(ex))
+			return;
+		fi = fi->sibling;
+	}
+}
+
+static void
+em_delete_folders(CamelStore *store, const char *base, CamelException *ex)
+{
+	CamelFolderInfo *fi;
+	guint32 flags = CAMEL_STORE_FOLDER_INFO_RECURSIVE;
+ 
+	if (camel_store_supports_subscriptions(store))
+		flags |= CAMEL_STORE_FOLDER_INFO_SUBSCRIBED;
+
+	fi = camel_store_get_folder_info(store, base, flags, ex);
+	if (camel_exception_is_set(ex))
+		return;
+
+	em_delete_rec(store, fi, ex);
+	camel_store_free_folder_info(store, fi);
+}
+
+static void
+emc_popup_delete_response(GtkWidget *w, guint response, MailComponent *mc)
+{
+	gtk_widget_destroy(w);
+
+	if (response == GTK_RESPONSE_OK) {
+		const char *path = strchr(mc->priv->context_path+1, '/')+1;
+		EFolder *folder = e_storage_set_get_folder(mc->priv->storage_set, mc->priv->context_path);
+		CamelException *ex = camel_exception_new();
+		CamelStore *store;
+
+		/* FIXME: need to hook onto store changed event and delete view as well, somewhere else tho */
+		store = camel_session_get_store(session, e_folder_get_physical_uri(folder), ex);
+		if (camel_exception_is_set(ex))
+			goto exception;
+
+		em_delete_folders(store, path, ex);
+		if (!camel_exception_is_set(ex))
+			goto noexception;
+	exception:
+		e_notice(NULL, GTK_MESSAGE_ERROR,
+			 _("Could not delete folder: %s"), ex->desc);
+	noexception:
+		camel_exception_free(ex);
+		if (store)
+			camel_object_unref(store);
+	}
+}
+
+static void
+emc_popup_delete_folder(GtkWidget *w, MailComponent *mc)
+{
+	GtkWidget *dialog;
+	char *title;
+	const char *path = strchr(mc->priv->context_path+1, '/')+1;
+	EFolder *folder;
+
+	folder = e_storage_set_get_folder(mc->priv->storage_set, mc->priv->context_path);
+	if (folder == NULL)
+		return;
+
+	dialog = gtk_message_dialog_new(NULL,
+					GTK_DIALOG_DESTROY_WITH_PARENT | GTK_DIALOG_MODAL,
+					GTK_MESSAGE_QUESTION,
+					GTK_BUTTONS_NONE,
+					_("Really delete folder \"%s\" and all of its subfolders?"), path);
+
+	gtk_dialog_add_button((GtkDialog *)dialog, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL);
+	gtk_dialog_add_button((GtkDialog *)dialog, GTK_STOCK_DELETE, GTK_RESPONSE_OK);
+
+	gtk_dialog_set_default_response((GtkDialog *)dialog, GTK_RESPONSE_OK);
+	gtk_container_set_border_width((GtkContainer *)dialog, 6); 
+	gtk_box_set_spacing((GtkBox *)((GtkDialog *)dialog)->vbox, 6);
+
+	title = g_strdup_printf(_("Delete \"%s\""), path);
+	gtk_window_set_title((GtkWindow *)dialog, title);
+	g_free(title);
+
+	g_signal_connect(dialog, "response", G_CALLBACK(emc_popup_delete_response), mc);
+	gtk_widget_show(dialog);
+}
+
+static void
+emc_popup_rename_folder(GtkWidget *w, MailComponent *mc)
+{
+	char *prompt, *new;
+	EFolder *folder;
+	const char *old, *why;
+	int done = 0;
+
+	folder = e_storage_set_get_folder(mc->priv->storage_set, mc->priv->context_path);
+	if (folder == NULL)
+		return;
+
+	old = e_folder_get_name(folder);
+	prompt = g_strdup_printf (_("Rename the \"%s\" folder to:"), e_folder_get_name(folder));
+	while (!done) {
+		new = e_request_string(NULL, _("Rename Folder"), prompt, old);
+		if (new == NULL || strcmp(old, new) == 0)
+			done = 1;
+#if 0
+		else if (!e_shell_folder_name_is_valid(new, &why))
+			e_notice(NULL, GTK_MESSAGE_ERROR, _("The specified folder name is not valid: %s"), why);
+#endif
+		else {
+			char *base, *path;
+
+			/* FIXME: we can't use the os independent path crap here, since we want to control the format */
+			base = g_path_get_dirname(mc->priv->context_path);
+			path = g_build_filename(base, new, NULL);
+
+			if (e_storage_set_get_folder(mc->priv->storage_set, path) != NULL) {
+				e_notice(NULL, GTK_MESSAGE_ERROR,
+					 _("A folder named \"%s\" already exists.  Please use a different name."), new);
+			} else {
+				CamelStore *store;
+				CamelException *ex = camel_exception_new();
+				const char *oldpath, *newpath;
+
+				oldpath = strchr(mc->priv->context_path+1, '/');
+				g_assert(oldpath);
+				newpath = strchr(path+1, '/');
+				g_assert(newpath);
+				oldpath++;
+				newpath++;
+
+				printf("renaming %s to %s\n", oldpath, newpath);
+
+				store = camel_session_get_store(session, e_folder_get_physical_uri(folder), ex);
+				if (camel_exception_is_set(ex))
+					goto exception;
+
+				camel_store_rename_folder(store, oldpath, newpath, ex);
+				if (!camel_exception_is_set(ex))
+					goto noexception;
+
+			exception:
+				e_notice(NULL, GTK_MESSAGE_ERROR,
+					 _("Could not rename folder: %s"), ex->desc);
+			noexception:
+				if (store)
+					camel_object_unref(store);
+				camel_exception_free(ex);
+
+				done = 1;
+			}
+			g_free(path);
+			g_free(base);
+		}
+		g_free(new);
+	}
+}
+
+struct _prop_data {
+	void *object;
+	CamelArgV *argv;
+	GtkWidget **widgets;
+};
+
+static void
+emc_popup_properties_response(GtkWidget *dialog, int response, struct _prop_data *prop_data)
+{
+	int i;
+	CamelArgV *argv = prop_data->argv;
+
+	if (response != GTK_RESPONSE_OK) {
+		gtk_widget_destroy(dialog);
+		return;
+	}
+
+	for (i=0;i<argv->argc;i++) {
+		CamelArg *arg = &argv->argv[i];
+
+		switch (arg->tag & CAMEL_ARG_TYPE) {
+		case CAMEL_ARG_BOO:
+			arg->ca_int = gtk_toggle_button_get_active(prop_data->widgets[i]);
+			break;
+		case CAMEL_ARG_STR:
+			g_free(arg->ca_str);
+			arg->ca_str = gtk_entry_get_text(prop_data->widgets[i]);
+			break;
+		default:
+			printf("unknown property type set\n");
+		}
+	}
+
+	camel_object_setv(prop_data->object, NULL, argv);
+	gtk_widget_destroy(dialog);
+}
+
+static void
+emc_popup_properties_free(void *data)
+{
+	struct _prop_data *prop_data = data;
+	int i;
+
+	for (i=0; i<prop_data->argv->argc; i++) {
+		if ((prop_data->argv->argv[i].tag & CAMEL_ARG_TYPE) == CAMEL_ARG_STR)
+			g_free(prop_data->argv->argv[i].ca_str);
+	}
+	camel_object_unref(prop_data->object);
+	g_free(prop_data->argv);
+	g_free(prop_data);
+}
+
+static void
+emc_popup_properties_got_folder(const char *uri, CamelFolder *folder, void *data)
+{
+	MailComponent *mc = data;
+
+	if (folder) {
+		GtkWidget *dialog, *w, *table, *label;
+		GSList *list, *l;
+		char *name, *txt;
+		int row = 1;
+		gint32 count, i;
+		struct _prop_data *prop_data;
+		CamelArgV *argv;
+		CamelArgGetV *arggetv;
+
+		camel_object_get(folder, NULL, CAMEL_FOLDER_PROPERTIES, &list, CAMEL_FOLDER_NAME, &name, NULL);
+
+		dialog = gtk_dialog_new_with_buttons(_("Folder properties"),
+						     NULL,
+						     GTK_DIALOG_DESTROY_WITH_PARENT,
+						     GTK_STOCK_OK,
+						     GTK_RESPONSE_OK,
+						     NULL);
+
+		/* TODO: maybe we want some basic properties here, like message counts/approximate size/etc */
+		w = gtk_frame_new(_("Properties"));
+		gtk_box_pack_start(((GtkDialog *)dialog)->vbox, w, TRUE, TRUE, 6);
+		table = gtk_table_new(g_slist_length(list)+1, 2, FALSE);
+		gtk_container_add((GtkContainer *)w, table);
+		label = gtk_label_new(_("Folder Name"));
+		gtk_misc_set_alignment(label, 1.0, 0.5);
+		gtk_table_attach(table, label, 0, 1, 0, 1, GTK_FILL|GTK_EXPAND, 0, 3, 0);
+		label = gtk_label_new(name);
+		gtk_misc_set_alignment(label, 0.0, 0.5);
+		gtk_table_attach(table, label, 1, 2, 0, 1, GTK_FILL|GTK_EXPAND, 0, 3, 0);
+
+		/* build an arggetv/argv to retrieve/store the results */
+		count = g_slist_length(list);
+		arggetv = g_malloc0(sizeof(*arggetv) + (count - CAMEL_ARGV_MAX) * sizeof(arggetv->argv[0]));
+		arggetv->argc = count;
+		argv = g_malloc0(sizeof(*argv) + (count - CAMEL_ARGV_MAX) * sizeof(argv->argv[0]));
+		argv->argc = count;
+		i = 0;
+		l = list;
+		while (l) {
+			CamelProperty *prop = l->data;
+
+			argv->argv[i].tag = prop->tag;
+			arggetv->argv[i].tag = prop->tag;
+			arggetv->argv[i].ca_ptr = &argv->argv[i].ca_ptr;
+
+			l = l->next;
+			i++;
+		}
+		camel_object_getv(folder, NULL, arggetv);
+		g_free(arggetv);
+
+		prop_data = g_malloc0(sizeof(*prop_data));
+		prop_data->widgets = g_malloc0(sizeof(prop_data->widgets[0]) * count);
+		prop_data->argv = argv;
+
+		/* setup the ui with the values retrieved */
+		l = list;
+		i = 0;
+		while (l) {
+			CamelProperty *prop = l->data;
+
+			switch (prop->tag & CAMEL_ARG_TYPE) {
+			case CAMEL_ARG_BOO:
+				w = gtk_check_button_new_with_label(prop->description);
+				gtk_toggle_button_set_active((GtkToggleButton *)w, argv->argv[i].ca_int != 0);
+				gtk_table_attach(table, w, 0, 2, row, row+1, 0, 0, 3, 3);
+				prop_data->widgets[i] = w;
+				break;
+			case CAMEL_ARG_STR:
+				label = gtk_label_new(prop->description);
+				gtk_misc_set_alignment(label, 1.0, 0.5);
+				gtk_table_attach(table, label, 0, 1, row, row+1, GTK_FILL|GTK_EXPAND, 0, 3, 3);
+
+				w = gtk_entry_new();
+				if (argv->argv[i].ca_str) {
+					gtk_entry_set_text((GtkEntry *)w, txt);
+					camel_object_free(folder, argv->argv[i].tag, argv->argv[i].ca_str);
+					argv->argv[i].ca_str = NULL;
+				}
+				gtk_table_attach(table, w, 1, 2, row, row+1, GTK_FILL, 0, 3, 3);
+				prop_data->widgets[i] = w;
+				break;
+			default:
+				w = gtk_label_new("CamelFolder error: unsupported propery type");
+				gtk_table_attach(table, w, 0, 2, row, row+1, 0, 0, 3, 3);
+				break;
+			}
+
+			row++;
+			l = l->next;
+		}
+
+		prop_data->object = folder;
+		camel_object_ref(folder);
+
+		camel_object_free(folder, CAMEL_FOLDER_PROPERTIES, list);
+		camel_object_free(folder, CAMEL_FOLDER_NAME, name);
+
+		/* we do 'apply on ok' ... since instant apply may apply some very long running tasks */
+
+		g_signal_connect(dialog, "response", G_CALLBACK(emc_popup_properties_response), prop_data);
+		g_object_set_data_full((GObject *)dialog, "e-prop-data", prop_data, emc_popup_properties_free);
+		gtk_widget_show_all(dialog);
+	}
+}
+
+static void
+emc_popup_properties(GtkWidget *w, MailComponent *mc)
+{
+	EFolder *efolder;
+
+	/* TODO: Make sure we only have one dialog open for any given folder */
+
+	efolder = e_storage_set_get_folder(mc->priv->storage_set, mc->priv->context_path);
+	if (efolder == NULL)
+		return;
+
+	mail_get_folder(e_folder_get_physical_uri(efolder), 0, emc_popup_properties_got_folder, mc, mail_thread_new);
+}
+
+static EMPopupItem emc_popup_menu[] = {
+#if 0
+	{ EM_POPUP_ITEM, "00.emc.00", N_("_View"), G_CALLBACK(emc_popup_view), NULL, NULL, 0 },
+	{ EM_POPUP_ITEM, "00.emc.01", N_("Open in _New Window"), G_CALLBACK(emc_popup_open_new), NULL, NULL, 0 },
+
+	{ EM_POPUP_BAR, "10.emc" },
+#endif
+	{ EM_POPUP_ITEM, "10.emc.00", N_("_Copy"), G_CALLBACK(emc_popup_copy), NULL, "folder-copy-16.png", 0 },
+	{ EM_POPUP_ITEM, "10.emc.01", N_("_Move"), G_CALLBACK(emc_popup_move), NULL, "folder-move-16.png", 0 },
+
+	{ EM_POPUP_BAR, "20.emc" },
+	{ EM_POPUP_ITEM, "20.emc.00", N_("_New Folder..."), G_CALLBACK(emc_popup_new_folder), NULL, "folder-mini.png", 0 },
+	{ EM_POPUP_ITEM, "20.emc.01", N_("_Delete"), G_CALLBACK(emc_popup_delete_folder), NULL, "evolution-trash-mini.png", 0 },
+	{ EM_POPUP_ITEM, "20.emc.01", N_("_Rename"), G_CALLBACK(emc_popup_rename_folder), NULL, NULL, 0 },
+
+	{ EM_POPUP_BAR, "80.emc" },
+	{ EM_POPUP_ITEM, "80.emc.00", N_("_Properties..."), G_CALLBACK(emc_popup_properties), NULL, "configure_16_folder.xpm", 0 },
+};
+
+
+static int
+emc_tree_right_click(ETree *tree, gint row, ETreePath path, gint col, GdkEvent *event, MailComponent *component)
+{
+	char *name;
+	ETreeModel *model = e_tree_get_model(tree);
+	EMPopup *emp;
+	int i;
+	GSList *menus = NULL;
+	struct _GtkMenu *menu;
+
+	name = e_tree_memory_node_get_data((ETreeMemory *)model, path);
+	g_free(component->priv->context_path);
+	component->priv->context_path = g_strdup(name);
+	printf("right click, path = '%s'\n", name);
+
+	emp = em_popup_new("com.ximian.mail.storageset.popup.select");
+
+	for (i=0;i<sizeof(emc_popup_menu)/sizeof(emc_popup_menu[0]);i++) {
+		EMPopupItem *item = &emc_popup_menu[i];
+
+		item->activate_data = component;
+		menus = g_slist_prepend(menus, item);
+	}
+
+	em_popup_add_items(emp, menus, (GDestroyNotify)g_slist_free);
+
+	menu = em_popup_create_menu_once(emp, NULL, 0, 0);
+
+	if (event == NULL || event->type == GDK_KEY_PRESS) {
+		/* FIXME: menu pos function */
+		gtk_menu_popup(menu, NULL, NULL, NULL, NULL, 0, event->key.time);
+	} else {
+		gtk_menu_popup(menu, NULL, NULL, NULL, NULL, event->button.button, event->button.time);
+	}
+
+	return TRUE;
+}
diff --git a/mail/mail-component.h b/mail/mail-component.h
new file mode 100644
index 0000000000..3e832752df
--- /dev/null
+++ b/mail/mail-component.h
@@ -0,0 +1,99 @@
+/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
+/* mail-component.h
+ *
+ * Copyright (C) 2003  Ximian Inc.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of version 2 of the GNU General Public
+ * License as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public
+ * License along with this program; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ *
+ * Authors:
+ *   Michael Zucchi <notzed@ximian.com>
+ *   Jeffrey Stedfast <fejj@ximian.com>
+ *   Ettore Perazzoli <ettore@ximian.com>
+ */
+
+#ifndef _MAIL_COMPONENT_H_
+#define _MAIL_COMPONENT_H_
+
+#include <bonobo/bonobo-object.h>
+
+#include <camel/camel-store.h>
+
+#include "e-storage-set.h"
+#include "Evolution.h"
+
+#include "filter/rule-context.h"
+
+
+#define MAIL_TYPE_COMPONENT			(mail_component_get_type ())
+#define MAIL_COMPONENT(obj)			(G_TYPE_CHECK_INSTANCE_CAST ((obj), MAIL_TYPE_COMPONENT, MailComponent))
+#define MAIL_COMPONENT_CLASS(klass)		(G_TYPE_CHECK_CLASS_CAST ((klass), MAIL_TYPE_COMPONENT, MailComponentClass))
+#define MAIL_IS_COMPONENT(obj)			(G_TYPE_CHECK_INSTANCE_TYPE ((obj), MAIL_TYPE_COMPONENT))
+#define MAIL_IS_COMPONENT_CLASS(klass)		(G_TYPE_CHECK_CLASS_TYPE ((obj), MAIL_TYPE_COMPONENT))
+
+
+typedef struct _MailComponent        MailComponent;
+typedef struct _MailComponentPrivate MailComponentPrivate;
+typedef struct _MailComponentClass   MailComponentClass;
+
+struct _MailComponent {
+	BonoboObject parent;
+
+	MailComponentPrivate *priv;
+};
+
+struct _MailComponentClass {
+	BonoboObjectClass parent_class;
+
+	POA_GNOME_Evolution_Component__epv epv;
+};
+
+
+GType  mail_component_get_type  (void);
+
+MailComponent *mail_component_peek  (void);
+
+const char  *mail_component_peek_base_directory  (MailComponent *component);
+RuleContext *mail_component_peek_search_context  (MailComponent *component);
+
+void        mail_component_add_store              (MailComponent *component,
+						   CamelStore    *store,
+						   const char    *name);
+CamelStore *mail_component_load_storage_by_uri    (MailComponent *component,
+						   const char    *uri,
+						   const char    *name);
+void        mail_component_remove_storage         (MailComponent *component,
+						   CamelStore    *store);
+void        mail_component_remove_storage_by_uri  (MailComponent *component,
+						   const char    *uri);
+EStorage   *mail_component_lookup_storage         (MailComponent *component,
+						   CamelStore    *store);
+
+int          mail_component_get_storage_count  (MailComponent *component);
+EStorageSet *mail_component_peek_storage_set   (MailComponent *component);
+void         mail_component_storages_foreach   (MailComponent *component,
+						GHFunc         func,
+						void          *data);
+
+char *em_uri_from_camel (const char *curi);
+char *em_uri_to_camel (const char *euri);
+
+CamelFolder *mail_component_get_folder_from_evomail_uri  (MailComponent  *component,
+							  guint32         flags,
+							  const char     *evomail_uri,
+							  CamelException *ex);
+char        *mail_component_evomail_uri_from_folder      (MailComponent  *component,
+							  CamelFolder    *folder);
+
+#endif /* _MAIL_COMPONENT_H_ */
diff --git a/mail/mail-config-factory.c b/mail/mail-config-factory.c
index 5a6db2cb47..50fddb9be9 100644
--- a/mail/mail-config-factory.c
+++ b/mail/mail-config-factory.c
@@ -34,8 +34,6 @@
 
 #define CONFIG_CONTROL_FACTORY_ID "OAFIID:GNOME_Evolution_Mail_ConfigControlFactory"
 
-static BonoboGenericFactory *factory = NULL;
-
 
 typedef void (*ApplyFunc) (GtkWidget *prefs);
 
diff --git a/mail/mail-config.c b/mail/mail-config.c
index a357f74498..f75babcf36 100644
--- a/mail/mail-config.c
+++ b/mail/mail-config.c
@@ -53,7 +53,9 @@
 #include <gal/widgets/e-gui-utils.h>
 #include <e-util/e-url.h>
 #include <e-util/e-passwords.h>
+
 #include "mail.h"
+#include "mail-component.h"
 #include "mail-config.h"
 #include "mail-mt.h"
 #include "mail-tools.h"
@@ -448,6 +450,8 @@ config_write_style (void)
 	 * may not have been set yet
 	 *
 	 * filename = g_build_filename (evolution_dir, MAIL_CONFIG_RC, NULL);
+	 *
+	 * EPFIXME this kludge needs to go away.
 	 */
 	filename = g_build_filename (g_get_home_dir (), "evolution", MAIL_CONFIG_RC, NULL);
 
@@ -528,6 +532,7 @@ mail_config_init (void)
 	mail_config_clear ();
 
 	/*
+	  EPFIXME: This kludge needs to go away.
 	  filename = g_build_filename (evolution_dir, MAIL_CONFIG_RC, NULL);
 	*/
 	filename = g_build_filename (g_get_home_dir (), "evolution", MAIL_CONFIG_RC, NULL);
@@ -933,6 +938,7 @@ mail_config_get_default_transport (void)
 static char *
 uri_to_evname (const char *uri, const char *prefix)
 {
+	const char *base_directory = mail_component_peek_base_directory (mail_component_peek ());
 	char *safe;
 	char *tmp;
 
@@ -940,9 +946,9 @@ uri_to_evname (const char *uri, const char *prefix)
 	e_filename_make_safe (safe);
 	/* blah, easiest thing to do */
 	if (prefix[0] == '*')
-		tmp = g_strdup_printf ("%s/%s%s.xml", evolution_dir, prefix + 1, safe);
+		tmp = g_strdup_printf ("%s/%s%s.xml", base_directory, prefix + 1, safe);
 	else
-		tmp = g_strdup_printf ("%s/%s%s", evolution_dir, prefix, safe);
+		tmp = g_strdup_printf ("%s/%s%s", base_directory, prefix, safe);
 	g_free (safe);
 	return tmp;
 }
@@ -1057,7 +1063,10 @@ mail_config_folder_to_cachename (CamelFolder *folder, const char *prefix)
 	char *url, *filename;
 	
 	url = mail_config_folder_to_safe_url (folder);
-	filename = g_strdup_printf ("%s/config/%s%s", evolution_dir, prefix, url);
+	filename = g_strdup_printf ("%s/config/%s%s",
+				    mail_component_peek_base_directory (mail_component_peek ()),
+				    prefix,
+				    url);
 	g_free (url);
 	
 	return filename;
@@ -1328,22 +1337,24 @@ mail_config_get_signature_list (void)
 static char *
 get_new_signature_filename (void)
 {
+	const char *base_directory;
 	char *filename, *id;
 	struct stat st;
 	int i;
-	
-	filename = g_build_filename (evolution_dir, "/signatures", NULL);
+
+	base_directory = mail_component_peek_base_directory (mail_component_peek ());
+	filename = g_build_filename (base_directory, "signatures", NULL);
 	if (lstat (filename, &st)) {
 		if (errno == ENOENT) {
 			if (mkdir (filename, 0700))
-				g_warning ("Fatal problem creating %s/signatures directory.", evolution_dir);
+				g_warning ("Fatal problem creating %s directory.", filename);
 		} else
-			g_warning ("Fatal problem with %s/signatures directory.", evolution_dir);
+			g_warning ("Fatal problem with %s directory.", filename);
 	}
 	g_free (filename);
 	
-	filename = g_malloc (strlen (evolution_dir) + sizeof ("/signatures/signature-") + 12);
-	id = g_stpcpy (filename, evolution_dir);
+	filename = g_malloc (strlen (base_directory) + sizeof ("/signatures/signature-") + 12);
+	id = g_stpcpy (filename, base_directory);
 	id = g_stpcpy (id, "/signatures/signature-");
 	
 	for (i = 0; i < (INT_MAX - 1); i++) {
@@ -1400,7 +1411,8 @@ delete_unused_signature_file (const char *filename)
 	char *signatures_dir;
 	int len;
 	
-	signatures_dir = g_strconcat (evolution_dir, "/signatures", NULL);
+	signatures_dir = g_strconcat (mail_component_peek_base_directory (mail_component_peek ()),
+				      "/signatures", NULL);
 	
 	/* remove signature file if it's in evolution dir and no other signature uses it */
 	len = strlen (signatures_dir);
diff --git a/mail/mail-display-stream.c b/mail/mail-display-stream.c
new file mode 100644
index 0000000000..ae81401680
--- /dev/null
+++ b/mail/mail-display-stream.c
@@ -0,0 +1,104 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
+/*
+ *  Authors: Jeffrey Stedfast <fejj@ximian.com>
+ *
+ *  Copyright 2001 Ximian, Inc. (www.ximian.com)
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of version 2 of the GNU General Public
+ * License as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public
+ * License along with this program; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ *
+ */
+
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include "mail-display-stream.h"
+
+
+static void mail_display_stream_class_init (MailDisplayStreamClass *klass);
+static void mail_display_stream_init (CamelObject *object);
+static void mail_display_stream_finalize (CamelObject *object);
+
+static ssize_t stream_write (CamelStream *stream, const char *buffer, size_t n);
+
+
+static CamelStreamClass *parent_class = NULL;
+
+
+CamelType
+mail_display_stream_get_type (void)
+{
+	static CamelType type = CAMEL_INVALID_TYPE;
+	
+	if (type == CAMEL_INVALID_TYPE) {
+		type = camel_type_register (CAMEL_STREAM_TYPE,
+					    "MailDisplayStream",
+					    sizeof (MailDisplayStream),
+					    sizeof (MailDisplayStreamClass),
+					    (CamelObjectClassInitFunc) mail_display_stream_class_init,
+					    NULL,
+					    (CamelObjectInitFunc) mail_display_stream_init,
+					    (CamelObjectFinalizeFunc) mail_display_stream_finalize);
+	}
+	
+	return type;
+}
+
+static void
+mail_display_stream_class_init (MailDisplayStreamClass *klass)
+{
+	CamelStreamClass *stream_class = CAMEL_STREAM_CLASS (klass);
+	
+	parent_class = (CamelStreamClass *) CAMEL_STREAM_TYPE;
+	
+	/* virtual method overload */
+	stream_class->write = stream_write;
+}
+
+static void
+mail_display_stream_init (CamelObject *object)
+{
+	;
+}
+
+static void
+mail_display_stream_finalize (CamelObject *object)
+{
+	;
+}
+
+static ssize_t
+stream_write (CamelStream *stream, const char *buffer, size_t n)
+{
+	MailDisplayStream *dstream = MAIL_DISPLAY_STREAM (stream);
+	
+	gtk_html_write (dstream->html, dstream->html_stream, buffer, n);
+	
+	return (ssize_t) n;
+}
+
+
+CamelStream *
+mail_display_stream_new (GtkHTML *html, GtkHTMLStream *html_stream)
+{
+	MailDisplayStream *new;
+	
+	new = MAIL_DISPLAY_STREAM (camel_object_new (MAIL_DISPLAY_STREAM_TYPE));
+	new->html = html;
+	new->html_stream = html_stream;
+	
+	return CAMEL_STREAM (new);
+}
diff --git a/mail/mail-display-stream.h b/mail/mail-display-stream.h
new file mode 100644
index 0000000000..943398c49a
--- /dev/null
+++ b/mail/mail-display-stream.h
@@ -0,0 +1,62 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
+/*
+ *  Authors: Jeffrey Stedfast <fejj@ximian.com>
+ *
+ *  Copyright 2001 Ximian, Inc. (www.ximian.com)
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of version 2 of the GNU General Public
+ * License as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public
+ * License along with this program; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ *
+ */
+
+
+#ifndef MAIL_DISPLAY_STREAM_H
+#define MAIL_DISPLAY_STREAM_H
+
+#ifdef __cplusplus
+extern "C" {
+#pragma }
+#endif /* __cplusplus */
+
+#include <camel/camel-stream.h>
+#include <gtkhtml/gtkhtml.h>
+
+#define MAIL_DISPLAY_STREAM_TYPE     (mail_display_stream_get_type ())
+#define MAIL_DISPLAY_STREAM(obj)     (CAMEL_CHECK_CAST((obj), MAIL_DISPLAY_STREAM_TYPE, MailDisplayStream))
+#define MAIL_DISPLAY_STREAM_CLASS(k) (CAMEL_CHECK_CLASS_CAST ((k), MAIL_DISPLAY_STREAM_TYPE, MailDisplayStreamClass))
+#define MAIL_IS_DISPLAY_STREAM(o)    (CAMEL_CHECK_TYPE((o), MAIL_DISPLAY_STREAM_TYPE))
+
+typedef struct _MailDisplayStream {
+	CamelStream parent_stream;
+	
+	GtkHTML *html;
+	GtkHTMLStream *html_stream;
+} MailDisplayStream;
+
+typedef struct {
+	CamelStreamClass parent_class;
+	
+} MailDisplayStreamClass;
+
+
+CamelType    mail_display_stream_get_type (void);
+
+/* Note: stream does not ref these objects! */
+CamelStream *mail_display_stream_new (GtkHTML *html, GtkHTMLStream *html_stream);
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
+#endif /* MAIL_DISPLAY_STREAM_H */
diff --git a/mail/mail-display.c b/mail/mail-display.c
new file mode 100644
index 0000000000..6c6d9aaf2a
--- /dev/null
+++ b/mail/mail-display.c
@@ -0,0 +1,2995 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
+/*
+ *  Authors: Dan Winship <danw@ximian.com>
+ *           Jeffrey Stedfast <fejj@ximian.com>
+ *           Michael Zucchi <notzed@ximian.com>
+ *           Miguel de Icaza <miguel@ximian.com>
+ *           Larry Ewing <lewing@ximian.com>
+ *
+ *  Copyright 2002 Ximian, Inc. (www.ximian.com)
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 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, write to the Free Software
+ *  Foundation, Inc., 59 Temple Street #330, Boston, MA 02111-1307, USA.
+ *
+ */
+
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <string.h>
+#include <sys/stat.h>
+#include <ctype.h>
+#include <fcntl.h>
+#include <errno.h>
+
+#include <gtk/gtkinvisible.h>
+#include <libgnome/gnome-program.h>
+
+#include <gconf/gconf.h>
+#include <gconf/gconf-client.h>
+
+#include <libgnomevfs/gnome-vfs.h>
+#include <libgnome/gnome-url.h>
+#include <bonobo/bonobo-exception.h>
+#include <bonobo/bonobo-control-frame.h>
+#include <bonobo/bonobo-stream-memory.h>
+#include <bonobo/bonobo-widget.h>
+#include <bonobo/bonobo-socket.h>
+
+#include <gdk/gdkkeysyms.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <gdk-pixbuf/gdk-pixbuf-loader.h>
+#include <gal/util/e-util.h>
+#include <gal/widgets/e-gui-utils.h>
+#include <gal/widgets/e-popup-menu.h>
+
+#include <gtkhtml/gtkhtml.h>
+#include <gtkhtml/gtkhtml-embedded.h>
+#include <gtkhtml/htmlengine.h>
+#include <gtkhtml/htmlobject.h>
+#include <gtkhtml/htmltext.h>
+#include <gtkhtml/htmlinterval.h>
+#include <gtkhtml/gtkhtml-stream.h>
+
+#include <libsoup/soup-message.h>
+
+#include "e-util/e-gui-utils.h"
+#include "e-util/e-mktemp.h"
+#include "addressbook/backend/ebook/e-book-util.h"
+
+#include "e-searching-tokenizer.h"
+#include "folder-browser-factory.h"
+#include "mail-display-stream.h"
+#include "folder-browser.h"
+#include "mail-component.h"
+#include "mail-config.h"
+#include "mail-display.h"
+#include "mail-format.h"
+#include "mail-ops.h"
+#include "mail-mt.h"
+#include "mail.h"
+
+#include "camel/camel-data-cache.h"
+
+#define d(x)
+
+struct _MailDisplayPrivate {
+
+	/* because we want to control resource usage, we need our own queues, etc */
+	EDList fetch_active;
+	EDList fetch_queue;
+
+	/* used to try and make some sense with progress reporting */
+	int fetch_total;
+	int fetch_total_done;
+
+	/* bit hackish, 'fake' an async message and processing,
+	   so we can use that to get cancel and report progress */
+	struct _mail_msg *fetch_msg ;
+	GIOChannel *fetch_cancel_channel;
+	guint fetch_cancel_watch;
+
+	guint display_notify_id;
+};
+
+/* max number of connections to download images */
+#define FETCH_MAX_CONNECTIONS (4)
+
+/* path to http cache in fetch_cache */
+#define FETCH_HTTP_CACHE "http"
+
+/* for asynchronously downloading remote content */
+struct _remote_data {
+	struct _remote_data *next;
+	struct _remote_data *prev;
+
+	MailDisplay *md;	/* not ref'd */
+
+	SoupMessage *msg;
+	char *uri;
+	GtkHTML *html;
+	GtkHTMLStream *stream;
+	CamelStream *cstream;	/* cache stream */
+	size_t length;
+	size_t total;
+};
+
+static void fetch_remote(MailDisplay *md, const char *uri, GtkHTML *html, GtkHTMLStream *stream);
+static void fetch_cancel(MailDisplay *md);
+static void fetch_next(MailDisplay *md);
+static void fetch_data(SoupMessage *req, void *data);
+static void fetch_free(struct _remote_data *rd);
+static void fetch_done(SoupMessage *req, void *data);
+
+/* global http cache, relies on external evolution_dir as well */
+static CamelDataCache *fetch_cache;
+
+#define PARENT_TYPE (gtk_vbox_get_type ())
+
+static GtkObjectClass *mail_display_parent_class;
+
+struct _PixbufLoader {
+	CamelDataWrapper *wrapper; /* The data */
+	CamelStream *mstream;
+	GdkPixbufLoader *loader; 
+	GtkHTMLEmbedded *eb;
+	char *type; /* Type of data, in case the conversion fails */
+	char *cid; /* Strdupped on creation, but not freed until 
+		      the hashtable is destroyed */
+	GtkWidget *pixmap;
+	guint32 destroy_id;
+};
+static GHashTable *thumbnail_cache = NULL;
+
+/* Drag & Drop types */
+#define TEXT_URI_LIST_TYPE       "text/uri-list"
+
+enum DndTargetType {
+	DND_TARGET_TYPE_TEXT_URI_LIST,
+	DND_TARGET_TYPE_PART_MIME_TYPE
+};
+
+static GtkTargetEntry drag_types[] = {
+	{ TEXT_URI_LIST_TYPE, 0, DND_TARGET_TYPE_TEXT_URI_LIST },
+	{ NULL, 0, DND_TARGET_TYPE_PART_MIME_TYPE }
+};
+
+static const int num_drag_types = sizeof (drag_types) / sizeof (drag_types[0]);
+
+/*----------------------------------------------------------------------*
+ *                        Callbacks
+ *----------------------------------------------------------------------*/
+
+static void
+write_data_written(CamelMimePart *part, char *name, int done, void *data)
+{
+	int *ret = data;
+	
+	/* should we popup a dialogue to say its done too? */
+	*ret = done;
+}
+
+static gboolean
+write_data_to_file (CamelMimePart *part, const char *name, gboolean unique)
+{
+	int fd, ret = FALSE;
+	
+	g_return_val_if_fail (CAMEL_IS_MIME_PART (part), FALSE);
+	
+	fd = open (name, O_WRONLY | O_CREAT | O_EXCL, 0666);
+	if (fd == -1 && errno == EEXIST && !unique) {
+		GtkWidget *dialog;
+		int button;
+		
+		dialog = gtk_message_dialog_new (NULL, 0, GTK_MESSAGE_QUESTION, GTK_BUTTONS_YES_NO,
+						 _("File `%s' already exists.\nOverwrite it?"),
+						 name);
+		
+		g_object_set (dialog, "title", _("Overwrite file?"), "allow_grow", TRUE, NULL);
+		button = gtk_dialog_run ((GtkDialog *) dialog);
+		gtk_widget_destroy (dialog);
+		
+		if (button != GTK_RESPONSE_YES)
+			return FALSE;
+	}
+	
+	if (fd != -1)
+		close (fd);
+	
+	/* should this have progress of what its doing? */
+	mail_msg_wait (mail_save_part (part, name, write_data_written, &ret));
+	
+	return ret;
+}
+
+static char *
+make_safe_filename (const char *prefix, CamelMimePart *part)
+{
+	const char *name;
+	char *safe, *p;
+	
+	name = part ? camel_mime_part_get_filename (part) : NULL;
+	
+	if (!name) {
+		/* This is a filename. Translators take note. */
+		name = _("attachment");
+	}
+	
+	p = strrchr (name, '/');
+	if (p)
+		safe = g_strdup_printf ("%s%s", prefix, p);
+	else
+		safe = g_strdup_printf ("%s/%s", prefix, name);
+	
+	p = strrchr (safe, '/');
+	if (p)
+		e_filename_make_safe (p + 1);
+	
+	return safe;
+}
+
+static void
+save_data_cb (GtkWidget *widget, gpointer user_data)
+{
+	GtkFileSelection *file_select;
+	GConfClient *gconf;
+	char *dir;
+	
+	file_select = (GtkFileSelection *) gtk_widget_get_ancestor (widget, GTK_TYPE_FILE_SELECTION);
+	
+	/* uh, this doesn't really feel right, but i dont know what to do better */
+	gtk_widget_hide (GTK_WIDGET (file_select));
+	write_data_to_file (user_data, gtk_file_selection_get_filename (file_select), FALSE);
+	
+	/* preserve the pathname */
+	dir = g_path_get_dirname (gtk_file_selection_get_filename (file_select));
+	gconf = mail_config_get_gconf_client ();
+	gconf_client_set_string (gconf, "/apps/evolution/mail/save_dir", dir, NULL);
+	g_free (dir);
+	
+	gtk_widget_destroy (GTK_WIDGET (file_select));
+}
+
+static void
+save_destroy_cb (CamelMimePart *part, GObject *deadbeef) 
+{
+	camel_object_unref (part);
+}
+
+static gboolean
+idle_redisplay (gpointer data)
+{
+	MailDisplay *md = data;
+	
+	md->idle_id = 0;
+	mail_display_redisplay (md, FALSE);
+	
+	return FALSE;
+}
+
+void
+mail_display_queue_redisplay (MailDisplay *md)
+{
+	if (!md->idle_id) {
+		md->idle_id = g_idle_add_full (G_PRIORITY_LOW, idle_redisplay,
+					       md, NULL);
+	}
+}
+
+static void
+mail_display_jump_to_anchor (MailDisplay *md, const char *url)
+{
+	char *anchor = strstr (url, "#");
+	
+	g_return_if_fail (anchor != NULL);
+	
+	if (anchor)
+		gtk_html_jump_to_anchor (md->html, anchor + 1);
+}
+
+static void
+on_link_clicked (GtkHTML *html, const char *url, MailDisplay *md)
+{
+	if (!strncasecmp (url, "mailto:", 7)) {
+		send_to_url (url, NULL);
+	} else if (*url == '#') {
+		mail_display_jump_to_anchor (md, url);
+	} else {
+		GError *err = NULL;
+		
+		gnome_url_show (url, &err);
+		
+		if (err) {
+			g_warning ("gnome_url_show: %s", err->message);
+			g_error_free (err);
+		}
+	}
+}
+
+static void 
+save_part (CamelMimePart *part)
+{
+	char *filename, *dir, *home, *base;
+	GtkFileSelection *file_select;
+	GConfClient *gconf;
+	
+	camel_object_ref (part);
+	
+	home = getenv ("HOME");
+	gconf = mail_config_get_gconf_client ();
+	dir = gconf_client_get_string (gconf, "/apps/evolution/mail/save_dir", NULL);
+	filename = make_safe_filename (dir ? dir : (home ? home : ""), part);
+	g_free (dir);
+	
+	file_select = GTK_FILE_SELECTION (gtk_file_selection_new (_("Save Attachment")));
+	gtk_file_selection_set_filename (file_select, filename);
+	/* set the GtkEntry with the locale filename by breaking abstraction */
+	base = g_path_get_basename (filename);
+	gtk_entry_set_text (GTK_ENTRY (file_select->selection_entry), base);
+	g_free (filename);
+	g_free (base);
+	
+	g_signal_connect (file_select->ok_button, "clicked", 
+			  G_CALLBACK (save_data_cb), part);
+	
+	g_signal_connect_swapped (file_select->cancel_button, "clicked",
+				  G_CALLBACK (gtk_widget_destroy), file_select);
+	
+	g_object_weak_ref ((GObject *) file_select, (GWeakNotify) save_destroy_cb, part);
+	
+	gtk_widget_show (GTK_WIDGET (file_select));
+}
+
+static void
+save_cb (GtkWidget *widget, gpointer user_data)
+{
+	CamelMimePart *part = g_object_get_data ((GObject *) user_data, "CamelMimePart");
+	
+	save_part (part);
+}
+
+static void
+launch_cb (GtkWidget *widget, gpointer user_data)
+{
+	CamelMimePart *part = g_object_get_data(user_data, "CamelMimePart");
+	MailMimeHandler *handler;
+	GList *apps, *children, *c;
+	GnomeVFSMimeApplication *app;
+	char *command, *filename;
+	const char *tmpdir;
+	
+	handler = mail_lookup_handler (g_object_get_data(user_data, "mime_type"));
+	g_return_if_fail (handler != NULL && handler->applications != NULL);
+	
+	/* Yum. Too bad EPopupMenu doesn't allow per-item closures. */
+	children = gtk_container_get_children (GTK_CONTAINER (widget->parent));
+	/* We need to bypass the first 2 menu items */
+	g_return_if_fail (children != NULL && children->next != NULL 
+		&& children->next->next != NULL && children->next->next->next != NULL);
+
+	for (c = children->next->next->next, apps = handler->applications; c && apps; c = c->next, apps = apps->next) {
+		if (c->data == widget)
+			break;
+	}
+	g_list_free (children);
+	g_return_if_fail (c != NULL && apps != NULL);
+	app = apps->data;
+	
+	tmpdir = e_mkdtemp ("app-launcher-XXXXXX");
+	
+	if (!tmpdir) {
+		GtkWidget *dialog;
+		
+		dialog = gtk_message_dialog_new (NULL, 0, GTK_MESSAGE_ERROR, GTK_RESPONSE_CLOSE,
+						 _("Could not create temporary directory: %s"),
+						 g_strerror (errno));
+		
+		/* FIXME: this should be async */
+		gtk_dialog_run ((GtkDialog *) dialog);
+		gtk_widget_destroy (dialog);
+		return;
+	}
+	
+	filename = make_safe_filename (tmpdir, part);
+	
+	if (!write_data_to_file (part, filename, TRUE)) {
+		GtkWidget *dialog;
+		
+		dialog = gtk_message_dialog_new (NULL, 0, GTK_MESSAGE_ERROR, GTK_RESPONSE_CLOSE,
+						 _("Could not create temporary file '%s': %s"),
+						 filename, g_strerror (errno));
+		
+		/* FIXME: this should be async */
+		gtk_dialog_run ((GtkDialog *) dialog);
+		gtk_widget_destroy (dialog);
+		g_free (filename);
+		return;
+	}
+	
+	command = g_strdup_printf ("%s %s%s &", app->command,
+				   app->expects_uris == GNOME_VFS_MIME_APPLICATION_ARGUMENT_TYPE_URIS ?
+				   "file://" : "", filename);
+	g_free (filename);
+	
+	system (command);
+	g_free (command);
+}
+
+static void
+inline_cb (GtkWidget *widget, gpointer user_data)
+{
+	MailDisplay *md = g_object_get_data (user_data, "MailDisplay");
+	CamelMimePart *part = g_object_get_data (user_data, "CamelMimePart");
+	
+	mail_part_toggle_displayed (part, md);
+	mail_display_queue_redisplay (md);
+}
+
+static void
+save_all_parts_cb (GtkWidget *widget, gpointer user_data)
+{
+	GtkFileSelection *dir_select = (GtkFileSelection *) 
+		gtk_widget_get_ancestor (widget, GTK_TYPE_FILE_SELECTION);
+	const char *filename;
+	char *save_filename, *dir;
+	struct stat st;
+	int i;
+	GPtrArray *attachment_array;
+	CamelMimePart *part;
+	GConfClient *gconf;
+
+	gtk_widget_hide (GTK_WIDGET (dir_select));
+
+	/* Get the selected directory name */
+	filename = gtk_file_selection_get_filename (dir_select);
+	if (stat (filename, &st) == -1 || !S_ISDIR (st.st_mode)) {
+		GtkWidget *dialog;
+
+		dialog = gtk_message_dialog_new (NULL, 0, GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE,
+			_("%s is not a valid directory name."), filename);
+
+		/* FIXME: this should be async */
+		gtk_dialog_run ((GtkDialog *) dialog);
+		gtk_widget_destroy (dialog);
+		gtk_widget_destroy (GTK_WIDGET (dir_select));
+		return;
+	} else {
+		dir = g_strdup (filename);
+	}
+						
+	/* Now save the attachment one by one */
+	attachment_array = (GPtrArray *)user_data;
+	for (i = 0; i < attachment_array->len; i++) {
+		part = g_ptr_array_index (attachment_array, i);
+		save_filename = make_safe_filename (dir, part);
+		write_data_to_file (part, save_filename, FALSE);
+		g_free (save_filename);
+	}
+							
+	/* preserve the pathname */
+	gconf = mail_config_get_gconf_client ();
+	gconf_client_set_string (gconf, "/apps/evolution/mail/save_dir", dir, NULL);
+	g_free (dir);
+							
+	gtk_widget_destroy (GTK_WIDGET (dir_select));
+}
+
+static void 
+save_all_parts (GPtrArray *attachment_array)
+{
+	GtkFileSelection *dir_select;
+	char *dir, *home, *dir2;
+	GConfClient *gconf;
+
+	g_return_if_fail (attachment_array !=  NULL);
+
+	home = getenv ("HOME");
+	gconf = mail_config_get_gconf_client ();
+	dir = gconf_client_get_string (gconf, "/apps/evolution/mail/save_dir", NULL);
+	dir = dir ? dir : (home ? g_strdup (home) : g_strdup (""));
+
+	/* Make sure dir2 has a '/' as its tail */
+	dir2 = g_strdup_printf ("%s/", dir);
+	g_free (dir);
+
+	dir_select = GTK_FILE_SELECTION (
+		gtk_file_selection_new (_("Select Directory for Attachments")));
+	gtk_file_selection_set_filename (dir_select, dir2);
+	gtk_widget_set_sensitive (dir_select->file_list, FALSE);
+	gtk_widget_hide (dir_select->selection_entry);
+	g_free (dir2);
+
+	g_signal_connect (dir_select->ok_button, "clicked", 
+		G_CALLBACK (save_all_parts_cb), attachment_array);
+	g_signal_connect_swapped (dir_select->cancel_button,
+		"clicked",
+		G_CALLBACK (gtk_widget_destroy),
+		dir_select);
+
+	gtk_widget_show (GTK_WIDGET (dir_select));
+}
+		
+static void
+save_all_cb (GtkWidget *widget, gpointer user_data)
+{
+	MailDisplay *md = g_object_get_data (user_data, "MailDisplay");
+	GPtrArray *attachment_array;
+			
+	if (md == NULL) {
+		g_warning ("No MailDisplay!");
+		return;
+	}
+
+	attachment_array = g_datalist_get_data (md->data, "attachment_array");
+	save_all_parts (attachment_array);
+}
+
+static void
+inline_toggle(MailDisplay *md, CamelMimePart *part)
+{
+	g_return_if_fail(md != NULL);
+
+	mail_part_toggle_displayed (part, md);
+	mail_display_queue_redisplay (md);
+}
+
+static void
+inline_button_clicked(GtkWidget *widget, CamelMimePart *part)
+{
+	inline_toggle((MailDisplay *)g_object_get_data((GObject *)widget, "MailDisplay"), part);
+}
+
+static gboolean
+inline_button_press(GtkWidget *widget, GdkEventKey *event, CamelMimePart *part)
+{
+	if (event->keyval != GDK_Return)
+		return FALSE;
+
+	inline_toggle((MailDisplay *)g_object_get_data((GObject *)widget, "MailDisplay"), part);
+
+	return TRUE;
+}
+
+static void
+popup_menu_placement_callback(GtkMenu *menu, gint *x, gint *y, gboolean *push_in, gpointer user_data)
+{
+	GtkWidget *widget = (GtkWidget*) user_data;
+
+	gdk_window_get_origin (gtk_widget_get_parent_window (widget), x, y);
+	*x += widget->allocation.x + widget->allocation.width;
+	*y += widget->allocation.y;
+
+	return;
+}
+
+static gboolean
+pixmap_press (GtkWidget *widget, GdkEvent *event, gpointer user_data)
+{
+	EPopupMenu *menu;
+	GtkMenu *gtk_menu;
+	EPopupMenu save_item = E_POPUP_ITEM (N_("Save Attachment..."), G_CALLBACK (save_cb), 0);
+	EPopupMenu save_all_item = E_POPUP_ITEM (N_("Save all attachments..."), G_CALLBACK (save_all_cb), 0);
+	EPopupMenu view_item = E_POPUP_ITEM (N_("View Inline"), G_CALLBACK (inline_cb), 2);
+	EPopupMenu open_item = E_POPUP_ITEM (N_("Open in %s..."), G_CALLBACK (launch_cb), 1);
+	MailDisplay *md;
+	CamelMimePart *part;
+	MailMimeHandler *handler;
+	int mask = 0, i, nitems;
+	int current_item = 0;
+	
+	if (event->type == GDK_BUTTON_PRESS) {
+#ifdef USE_OLD_DISPLAY_STYLE
+		if (event->button.button != 3) {
+			gtk_propagate_event (GTK_WIDGET (user_data),
+					     (GdkEvent *)event);
+			return TRUE;
+		}
+#endif
+		
+		if (event->button.button != 1 && event->button.button != 3) {
+			gtk_propagate_event (GTK_WIDGET (user_data),
+					     (GdkEvent *)event);
+			return TRUE;
+		}
+		/* Stop the signal, since we don't want the button's class method to
+		   mess up our popup. */
+		g_signal_stop_emission_by_name (widget, "button_press_event");
+	} else {
+		if (event->key.keyval != GDK_Return)
+			return FALSE;
+	}
+	
+	part = g_object_get_data ((GObject *) widget, "CamelMimePart");
+	handler = mail_lookup_handler (g_object_get_data ((GObject *) widget, "mime_type"));
+	
+	if (handler && handler->applications)
+		nitems = g_list_length (handler->applications) + 3;
+	else
+		nitems = 4;
+	menu = g_new0 (EPopupMenu, nitems + 1);
+	
+	/* Save item */
+	memcpy (&menu[current_item], &save_item, sizeof (menu[current_item]));
+	menu[current_item].name = g_strdup (_(menu[current_item].name));
+	current_item++;
+
+	/* Save All item */
+	memcpy (&menu[current_item], &save_all_item, sizeof (menu[current_item]));
+	menu[current_item].name = g_strdup (_(menu[current_item].name));
+	current_item++;
+	 
+	/* Inline view item */
+	memcpy (&menu[current_item], &view_item, sizeof (menu[current_item]));
+	if (handler && handler->builtin) {
+		md = g_object_get_data ((GObject *) widget, "MailDisplay");
+		
+		if (!mail_part_is_displayed_inline (part, md)) {
+			if (handler->component) {
+				Bonobo_ActivationProperty *prop;
+				char *name;
+				
+				prop = bonobo_server_info_prop_find (handler->component, "name");
+				if (!prop) {
+					prop = bonobo_server_info_prop_find (handler->component,
+									     "description");
+				}
+				if (prop && prop->v._d == Bonobo_ACTIVATION_P_STRING)
+					name = prop->v._u.value_string;
+				else
+					name = "bonobo";
+				menu[current_item].name = g_strdup_printf (_("View Inline (via %s)"), name);
+			} else
+				menu[current_item].name = g_strdup (_(menu[current_item].name));
+		} else
+			menu[current_item].name = g_strdup (_("Hide"));
+	} else {
+		menu[current_item].name = g_strdup (_(menu[current_item].name));
+		mask |= 2;
+	}
+	current_item++;
+	
+	/* External views */
+	if (handler && handler->applications) {
+		GnomeVFSMimeApplication *app;
+		GList *apps;
+		int i;
+		
+		apps = handler->applications;
+		for (i = current_item; i < nitems; i++, apps = apps->next) {
+			app = apps->data;
+			memcpy (&menu[i], &open_item, sizeof (menu[i]));
+			menu[i].name = g_strdup_printf (_(menu[i].name), app->name);
+			current_item++;
+		}
+	} else {
+		memcpy (&menu[current_item], &open_item, sizeof (menu[current_item]));
+		menu[current_item].name = g_strdup_printf (_(menu[current_item].name), _("External Viewer"));
+		mask |= 1;
+	}
+	
+	gtk_menu = e_popup_menu_create (menu, mask, 0, widget);
+	e_auto_kill_popup_menu_on_selection_done (gtk_menu);
+
+	if (event->type == GDK_BUTTON_PRESS)
+		gtk_menu_popup (gtk_menu, NULL, NULL, NULL, (gpointer)widget, event->button.button, event->button.time);
+	else
+		gtk_menu_popup (gtk_menu, NULL, NULL, popup_menu_placement_callback, (gpointer)widget, 0, event->key.time);
+	
+	for (i = 1; i < nitems; i++)
+		g_free (menu[i].name);
+	g_free (menu);
+	
+	return TRUE;
+}	
+
+static gboolean
+pixbuf_uncache (gpointer key)
+{
+	GdkPixbuf *pixbuf;
+	
+	pixbuf = g_hash_table_lookup (thumbnail_cache, key);
+	g_object_unref (pixbuf);
+	g_hash_table_remove (thumbnail_cache, key);
+	g_free (key);
+	return FALSE;
+}
+
+static gint
+pixbuf_gen_idle (struct _PixbufLoader *pbl)
+{
+	GdkPixbuf *pixbuf, *mini;
+	gboolean error = FALSE;
+	char tmp[4096];
+	int len, width, height, ratio;
+	gpointer orig_key;
+	
+	/* Get the pixbuf from the cache */
+	if (g_hash_table_lookup_extended (thumbnail_cache, pbl->cid,
+					  &orig_key, (gpointer *)&mini)) {
+		width = gdk_pixbuf_get_width (mini);
+		height = gdk_pixbuf_get_height (mini);
+		
+		gtk_image_set_from_pixbuf ((GtkImage *) pbl->pixmap, mini);
+		gtk_widget_set_size_request (pbl->pixmap, width, height);
+		
+		/* Restart the cache-cleaning timer */
+		g_source_remove_by_user_data (orig_key);
+		g_timeout_add (5 * 60 * 1000, pixbuf_uncache, orig_key);
+		
+		if (pbl->loader) {
+			gdk_pixbuf_loader_close (pbl->loader, NULL);
+			g_object_unref (pbl->loader);
+			camel_object_unref (pbl->mstream);
+		}
+		
+		g_signal_handler_disconnect (pbl->eb, pbl->destroy_id);
+		g_free (pbl->type);
+		g_free (pbl->cid);
+		g_free (pbl);
+		
+		return FALSE;
+	}
+	
+	/* Not in cache, so get a pixbuf from the wrapper */
+	
+	if (!GTK_IS_WIDGET (pbl->pixmap)) {
+		/* Widget has died */
+		if (pbl->mstream)
+			camel_object_unref (pbl->mstream);
+		
+		if (pbl->loader) {
+			gdk_pixbuf_loader_close (pbl->loader, NULL);
+			g_object_unref (pbl->loader);
+		}
+		
+		g_signal_handler_disconnect (pbl->eb, pbl->destroy_id);
+		g_free (pbl->type);
+		g_free (pbl->cid);
+		g_free (pbl);
+		
+		return FALSE;
+	}
+	
+	if (pbl->mstream) {
+		if (pbl->loader == NULL)
+			pbl->loader = gdk_pixbuf_loader_new ();
+		
+		len = camel_stream_read (pbl->mstream, tmp, 4096);
+		if (len > 0) {
+			error = !gdk_pixbuf_loader_write (pbl->loader, tmp, len, NULL);
+			if (!error)
+				return TRUE;
+		} else if (!camel_stream_eos (pbl->mstream))
+			error = TRUE;
+	}
+	
+	if (error || !pbl->mstream) {
+		if (pbl->type)
+			pixbuf = e_icon_for_mime_type (pbl->type, 24);
+		else
+			pixbuf = gdk_pixbuf_new_from_file (EVOLUTION_ICONSDIR "/pgp-signature-nokey.png", NULL);
+	} else
+		pixbuf = gdk_pixbuf_loader_get_pixbuf (pbl->loader);
+	
+	if (pixbuf == NULL) {
+		/* pixbuf is non-existant */
+		if (pbl->mstream)
+			camel_object_unref (pbl->mstream);
+		
+		if (pbl->loader) {
+			gdk_pixbuf_loader_close (pbl->loader, NULL);
+			g_object_unref (pbl->loader);
+		}
+		
+		g_signal_handler_disconnect (pbl->eb, pbl->destroy_id);
+		g_free (pbl->type);
+		g_free (pbl->cid);
+		g_free (pbl);
+		
+		return FALSE;
+	}
+	
+	width = gdk_pixbuf_get_width (pixbuf);
+	height = gdk_pixbuf_get_height (pixbuf);
+	
+	if (width >= height) {
+		if (width > 24) {
+			ratio = width / 24;
+			width = 24;
+			height /= ratio;
+		}
+	} else {
+		if (height > 24) {
+			ratio = height / 24;
+			height = 24;
+			width /= ratio;
+		}
+	}
+	
+	mini = gdk_pixbuf_scale_simple (pixbuf, width, height, GDK_INTERP_BILINEAR);
+	if (error || !pbl->mstream)
+		g_object_unref (pixbuf);
+	
+	gtk_image_set_from_pixbuf ((GtkImage *) pbl->pixmap, mini);
+	
+	/* Add the pixbuf to the cache */
+	g_hash_table_insert (thumbnail_cache, pbl->cid, mini);
+	g_timeout_add (5 * 60 * 1000, pixbuf_uncache, pbl->cid);
+	
+	g_signal_handler_disconnect (pbl->eb, pbl->destroy_id);
+	if (pbl->loader) {
+		gdk_pixbuf_loader_close (pbl->loader, NULL);
+		g_object_unref (pbl->loader);
+		camel_object_unref (pbl->mstream);
+	}
+	
+	g_free (pbl->type);
+	g_free (pbl);
+	
+	return FALSE;
+}
+
+/* Stop the idle function and free the pbl structure
+   as the widget that the pixbuf was to be rendered to
+   has died on us. */
+static void
+embeddable_destroy_cb (GtkObject *embeddable, struct _PixbufLoader *pbl)
+{
+	g_idle_remove_by_data (pbl);
+	if (pbl->mstream)
+		camel_object_unref (pbl->mstream);
+	
+	if (pbl->loader) {
+		gdk_pixbuf_loader_close (pbl->loader, NULL);
+		g_object_unref (pbl->loader);
+	}
+	
+	g_free (pbl->type);
+	g_free (pbl->cid);
+	g_free (pbl);
+};
+
+static GtkWidget *
+get_embedded_for_component (const char *iid, MailDisplay *md)
+{
+	GtkWidget *embedded;
+	BonoboControlFrame *control_frame;
+	Bonobo_PropertyBag prop_bag;
+	
+	/*
+	 * First try a control.
+	 */
+	embedded = bonobo_widget_new_control (iid, NULL);
+	if (embedded == NULL) {
+#warning "what about bonobo_widget_new_subdoc?"
+#if 0
+		/*
+		 * No control, try an embeddable instead.
+		 */
+		embedded = bonobo_widget_new_subdoc (iid, NULL);
+		if (embedded != NULL) {
+			/* FIXME: as of bonobo 0.18, there's an extra
+			 * client_site dereference in the BonoboWidget
+			 * destruction path that we have to balance out to
+			 * prevent problems.
+			 */
+			bonobo_object_ref (BONOBO_OBJECT (bonobo_widget_get_client_site (
+				BONOBO_WIDGET (embedded))));
+			
+			return embedded;
+		}
+#endif
+	}
+	
+	if (embedded == NULL)
+		return NULL;
+	
+	control_frame = bonobo_widget_get_control_frame (BONOBO_WIDGET (embedded));
+	
+	prop_bag = bonobo_control_frame_get_control_property_bag (control_frame, NULL);
+	
+	if (prop_bag != CORBA_OBJECT_NIL) {
+		CORBA_Environment ev;
+		/*
+		 * Now we can take care of business. Currently, the only control
+		 * that needs something passed to it through a property bag is
+		 * the iTip control, and it needs only the From email address,
+		 * but perhaps in the future we can generalize this section of code
+		 * to pass a bunch of useful things to all embedded controls.
+		 */
+		const CamelInternetAddress *from;
+		char *from_address;
+		
+		CORBA_exception_init (&ev);
+		
+		from = camel_mime_message_get_from (md->current_message);
+		from_address = camel_address_encode ((CamelAddress *) from);
+		bonobo_property_bag_client_set_value_string (
+			prop_bag, "from_address", 
+			from_address, &ev);
+		g_free (from_address);
+		
+		Bonobo_Unknown_unref (prop_bag, &ev);
+		CORBA_exception_free (&ev);
+	}
+	
+	return embedded;
+}
+
+static void *
+save_url (MailDisplay *md, const char *url)
+{
+	GHashTable *urls;
+	CamelMimePart *part;
+	
+	urls = g_datalist_get_data (md->data, "part_urls");
+	g_return_val_if_fail (url != NULL, NULL);
+	g_return_val_if_fail (urls != NULL, NULL);
+	
+	part = g_hash_table_lookup (urls, url);
+	if (part == NULL) {
+		CamelDataWrapper *wrapper;
+		CamelStream *stream = NULL;
+		const char *name;
+		
+		/* See if it's some piece of cached data if it is then pretend it
+		 * is a mime part so that we can use the mime part saving routines.
+		 * It is gross but it keeps duplicated code to a minimum and helps
+		 * out with ref counting and the like.
+		 */
+		name = strrchr (url, '/');
+		name = name ? name : url;
+		
+		if (fetch_cache) {
+			/* look in the soup cache */
+			stream = camel_data_cache_get(fetch_cache, FETCH_HTTP_CACHE, url, NULL);
+		} else {
+			GByteArray *ba = NULL;			
+
+			urls = g_datalist_get_data (md->data, "data_urls");
+			g_return_val_if_fail (urls != NULL, NULL);
+		
+			ba = g_hash_table_lookup (urls, url);
+			if (ba) {
+				/* we have to copy the data here since the ba may be long gone
+				 * by the time the user actually saves the file
+				 */
+				stream = camel_stream_mem_new_with_buffer (ba->data, ba->len);			
+			}
+		}
+
+		if (stream) {
+			wrapper = camel_data_wrapper_new ();
+			camel_data_wrapper_construct_from_stream (wrapper, stream);			
+			camel_object_unref (stream);
+			part = camel_mime_part_new ();
+			camel_medium_set_content_object (CAMEL_MEDIUM (part), wrapper);
+			camel_object_unref (wrapper);
+			camel_mime_part_set_filename (part, name);
+		}
+	} else {
+		camel_object_ref (part);
+	}
+	
+	if (part) {
+		CamelDataWrapper *data;
+		
+		g_return_val_if_fail (CAMEL_IS_MIME_PART (part), NULL);
+		
+		data = camel_medium_get_content_object ((CamelMedium *)part);
+		if (!mail_content_loaded (data, md, TRUE, NULL, NULL, NULL)) {
+			return NULL;
+		}
+		
+		save_part (part);
+		camel_object_unref (part);
+		return NULL;
+	}
+	
+	g_warning ("Data for url: \"%s\" not found", url);
+	
+	return NULL;
+}
+
+static void
+drag_data_get_cb (GtkWidget *widget,
+		  GdkDragContext *drag_context,
+		  GtkSelectionData *selection_data,
+		  guint info,
+		  guint time,
+		  gpointer user_data)
+{
+	CamelMimePart *part = user_data;
+	const char *filename, *tmpdir;
+	char *uri_list;
+	
+	switch (info) {
+	case DND_TARGET_TYPE_TEXT_URI_LIST:
+		/* Kludge around Nautilus requesting the same data many times */
+		uri_list = g_object_get_data ((GObject *) widget, "uri-list");
+		if (uri_list) {
+			gtk_selection_data_set (selection_data, selection_data->target, 8,
+						uri_list, strlen (uri_list));
+			return;
+		}
+		
+		tmpdir = e_mkdtemp ("drag-n-drop-XXXXXX");
+		if (!tmpdir) {
+			GtkWidget *dialog;
+			
+			dialog = gtk_message_dialog_new (NULL, 0, GTK_MESSAGE_ERROR, GTK_RESPONSE_CLOSE,
+							 _("Could not create temporary directory: %s"),
+							 g_strerror (errno));
+			
+			/* FIXME: this should be async */
+			gtk_dialog_run ((GtkDialog *) dialog);
+			gtk_widget_destroy (dialog);
+		}
+		
+		filename = camel_mime_part_get_filename (part);
+		/* This is the default filename used for dnd temporary target of attachment */
+		if (!filename)
+			filename = _("Unknown");
+		
+		uri_list = g_strdup_printf ("file://%s/%s", tmpdir, filename);
+		
+		if (!write_data_to_file (part, uri_list + 7, TRUE)) {
+			g_free (uri_list);
+			return;
+		}
+		
+		gtk_selection_data_set (selection_data, selection_data->target, 8,
+					uri_list, strlen (uri_list));
+		
+		g_object_set_data_full ((GObject *) widget, "uri-list", uri_list, g_free);		
+		break;
+	case DND_TARGET_TYPE_PART_MIME_TYPE:
+		if (header_content_type_is (((CamelDataWrapper *) part)->mime_type, "text", "*")) {
+		        GByteArray *ba;
+			
+			ba = mail_format_get_data_wrapper_text ((CamelDataWrapper *) part, NULL);
+			if (ba) {
+				gtk_selection_data_set (selection_data, selection_data->target, 8,
+							ba->data, ba->len);
+				g_byte_array_free (ba, TRUE);
+			}
+		} else {
+			CamelDataWrapper *wrapper;
+			CamelStreamMem *mem;
+			
+			mem = (CamelStreamMem *) camel_stream_mem_new ();
+			wrapper = camel_medium_get_content_object (CAMEL_MEDIUM (part));
+			camel_data_wrapper_decode_to_stream (wrapper, (CamelStream *) mem);
+			
+			gtk_selection_data_set (selection_data, selection_data->target, 8,
+						mem->buffer->data, mem->buffer->len);
+			
+			camel_object_unref (mem);
+		}
+		break;
+	default:
+		g_assert_not_reached ();
+	}
+}
+
+static void
+drag_data_delete_cb (GtkWidget *widget,
+		     GdkDragContext *drag_context,
+		     gpointer user_data)
+{
+	char *uri_list;
+	
+	uri_list = g_object_get_data ((GObject *) widget, "uri-list");
+	if (uri_list) {
+		unlink (uri_list + 7);
+		g_object_set_data ((GObject *) widget, "uri-list", NULL);
+	}
+}
+
+/* This is a wrapper function */
+void ptr_array_free_notify (gpointer array)
+{
+	g_ptr_array_free ((GPtrArray *) array, TRUE);
+}
+
+static gboolean
+do_attachment_header (GtkHTML *html, GtkHTMLEmbedded *eb,
+		      CamelMimePart *part, MailDisplay *md)
+{
+	GtkWidget *button, *mainbox, *hbox, *arrow, *popup;
+	MailMimeHandler *handler;
+	struct _PixbufLoader *pbl;
+	GPtrArray *attachment_array;
+	
+	pbl = g_new0 (struct _PixbufLoader, 1);
+	if (strncasecmp (eb->type, "image/", 6) == 0) {
+		CamelDataWrapper *content;
+		
+		content = camel_medium_get_content_object (CAMEL_MEDIUM (part));
+		if (!camel_data_wrapper_is_offline (content)) {
+			pbl->mstream = camel_stream_mem_new ();
+			camel_data_wrapper_decode_to_stream (content, pbl->mstream);
+			camel_stream_reset (pbl->mstream);
+		}
+	}
+	
+	pbl->type = g_strdup (eb->type);
+	pbl->cid = g_strdup (eb->classid + 6);
+	pbl->pixmap = gtk_image_new();
+  	gtk_widget_set_size_request (pbl->pixmap, 24, 24);
+	pbl->eb = eb;
+	pbl->destroy_id = g_signal_connect (eb, "destroy", G_CALLBACK (embeddable_destroy_cb), pbl);
+	
+	g_idle_add_full (G_PRIORITY_LOW, (GSourceFunc) pixbuf_gen_idle, pbl, NULL);
+	
+	mainbox = gtk_hbox_new (FALSE, 0);
+	
+	button = gtk_button_new ();
+	g_object_set_data ((GObject *) button, "MailDisplay", md);
+	
+	handler = mail_lookup_handler (eb->type);
+	if (handler && handler->builtin) {
+		g_signal_connect (button, "clicked", G_CALLBACK (inline_button_clicked), part);
+		g_signal_connect (button, "key_press_event", G_CALLBACK (inline_button_press), part);
+	} else {
+		gtk_widget_set_sensitive (button, FALSE);
+		GTK_WIDGET_UNSET_FLAGS (button, GTK_CAN_FOCUS);
+	}
+	
+	/* Drag & Drop */
+	drag_types[DND_TARGET_TYPE_PART_MIME_TYPE].target = header_content_type_simple (((CamelDataWrapper *) part)->mime_type);
+	camel_strdown (drag_types[DND_TARGET_TYPE_PART_MIME_TYPE].target);
+	
+	gtk_drag_source_set (button, GDK_BUTTON1_MASK,
+			     drag_types, num_drag_types,
+			     GDK_ACTION_COPY);
+	g_signal_connect (button, "drag-data-get", G_CALLBACK (drag_data_get_cb), part);
+	g_signal_connect (button, "drag-data-delete", G_CALLBACK (drag_data_delete_cb), part);
+	
+	g_free (drag_types[DND_TARGET_TYPE_PART_MIME_TYPE].target);
+	drag_types[DND_TARGET_TYPE_PART_MIME_TYPE].target = NULL;
+	
+	hbox = gtk_hbox_new (FALSE, 2);
+	gtk_container_set_border_width (GTK_CONTAINER (hbox), 2);
+	
+	/* should this be a gtk_arrow? */
+	if (handler && mail_part_is_displayed_inline (part, md))
+		arrow = gtk_image_new_from_stock (GTK_STOCK_GO_DOWN, GTK_ICON_SIZE_BUTTON);
+	else
+		arrow = gtk_image_new_from_stock (GTK_STOCK_GO_FORWARD, GTK_ICON_SIZE_BUTTON);
+	gtk_box_pack_start (GTK_BOX (hbox), arrow, TRUE, TRUE, 0);
+	gtk_box_pack_start (GTK_BOX (hbox), pbl->pixmap, TRUE, TRUE, 0);
+	gtk_container_add (GTK_CONTAINER (button), hbox);
+	
+	popup = gtk_button_new ();
+	gtk_container_add (GTK_CONTAINER (popup),
+			   gtk_arrow_new (GTK_ARROW_DOWN,
+					  GTK_SHADOW_ETCHED_IN));
+	
+	g_object_set_data ((GObject *) popup, "MailDisplay", md);
+	g_object_set_data ((GObject *) popup, "CamelMimePart", part);
+	g_object_set_data_full ((GObject *) popup, "mime_type", g_strdup (eb->type), (GDestroyNotify) g_free);
+
+	/* Save attachment pointer in an array for "save all attachment" use */	
+	attachment_array = g_datalist_get_data (md->data, "attachment_array");
+	if (!attachment_array) {
+		attachment_array = g_ptr_array_new ();
+		g_datalist_set_data_full (md->data, "attachment_array", 
+			attachment_array, (GDestroyNotify) ptr_array_free_notify);
+	}
+	/* Since the attachment pointer might have been added to the array before,
+	remove it first anyway to avoide duplication */
+	g_ptr_array_remove (attachment_array, part);
+	g_ptr_array_add (attachment_array, part);
+		 
+	
+	g_signal_connect (popup, "button_press_event", G_CALLBACK (pixmap_press), md->scroll);
+	g_signal_connect (popup, "key_press_event", G_CALLBACK (pixmap_press), md->scroll);
+	
+	gtk_box_pack_start (GTK_BOX (mainbox), button, TRUE, TRUE, 0);
+	gtk_box_pack_start (GTK_BOX (mainbox), popup, TRUE, TRUE, 0);
+	gtk_widget_show_all (mainbox);
+	
+	gtk_container_add (GTK_CONTAINER (eb), mainbox);
+	
+	return TRUE;
+}
+
+static gboolean
+do_external_viewer (GtkHTML *html, GtkHTMLEmbedded *eb,
+		    CamelMimePart *part, MailDisplay *md)
+{
+	CamelDataWrapper *wrapper;
+	Bonobo_ServerInfo *component;
+	GtkWidget *embedded;
+	Bonobo_PersistStream persist;	
+	CORBA_Environment ev;
+	CamelStreamMem *cstream;
+	BonoboStream *bstream;
+	MailMimeHandler *handler;
+	
+	handler = mail_lookup_handler (eb->type);
+	if (!handler || !handler->is_bonobo)
+		return FALSE;
+	
+	component = gnome_vfs_mime_get_default_component (eb->type);
+	if (!component)
+		return FALSE;
+	
+	embedded = get_embedded_for_component (component->iid, md);
+	CORBA_free (component);
+	if (!embedded)
+		return FALSE;
+	
+	persist = (Bonobo_PersistStream) Bonobo_Unknown_queryInterface (
+		bonobo_widget_get_objref (BONOBO_WIDGET (embedded)),
+		"IDL:Bonobo/PersistStream:1.0", NULL);
+	
+	if (persist == CORBA_OBJECT_NIL) {
+		gtk_object_sink (GTK_OBJECT (embedded));
+		return FALSE;
+	}
+	
+	/* Write the data to a CamelStreamMem... */
+	cstream = (CamelStreamMem *) camel_stream_mem_new ();
+	wrapper = camel_medium_get_content_object (CAMEL_MEDIUM (part));
+ 	camel_data_wrapper_decode_to_stream (wrapper, (CamelStream *)cstream);
+	
+	/* ...convert the CamelStreamMem to a BonoboStreamMem... */
+	bstream = bonobo_stream_mem_create (cstream->buffer->data, cstream->buffer->len, TRUE, FALSE);
+	camel_object_unref (cstream);
+	
+	/* ...and hydrate the PersistStream from the BonoboStream. */
+	CORBA_exception_init (&ev);
+	Bonobo_PersistStream_load (persist,
+				   bonobo_object_corba_objref (BONOBO_OBJECT (bstream)),
+				   eb->type, &ev);
+	bonobo_object_unref (BONOBO_OBJECT (bstream));
+	Bonobo_Unknown_unref (persist, &ev);
+	CORBA_Object_release (persist, &ev);
+	
+	if (ev._major != CORBA_NO_EXCEPTION) {
+		gtk_object_sink (GTK_OBJECT (embedded));
+		CORBA_exception_free (&ev);				
+		return FALSE;
+	}
+	CORBA_exception_free (&ev);
+	
+	gtk_widget_show (embedded);
+	gtk_container_add (GTK_CONTAINER (eb), embedded);
+	
+	return TRUE;
+}
+
+static gboolean
+do_signature (GtkHTML *html, GtkHTMLEmbedded *eb,
+	      CamelMimePart *part, MailDisplay *md)
+{
+	GtkWidget *button;
+	struct _PixbufLoader *pbl;
+	
+	pbl = g_new0 (struct _PixbufLoader, 1);
+	pbl->type = NULL;
+	pbl->cid = g_strdup (eb->classid);
+	pbl->pixmap = gtk_image_new ();
+  	gtk_widget_set_size_request (pbl->pixmap, 24, 24);
+	pbl->eb = eb;
+	pbl->destroy_id = g_signal_connect (eb, "destroy", G_CALLBACK (embeddable_destroy_cb), pbl);
+	
+	g_idle_add_full (G_PRIORITY_LOW, (GSourceFunc) pixbuf_gen_idle, pbl, NULL);
+	
+	button = gtk_button_new ();
+	g_object_set_data ((GObject *) button, "MailDisplay", md);
+	g_signal_connect (button, "clicked", G_CALLBACK (inline_button_clicked), part);
+	g_signal_connect (button, "key_press_event", G_CALLBACK (inline_button_press), part);
+
+	gtk_container_add (GTK_CONTAINER (button), pbl->pixmap);
+	gtk_widget_show_all (button);
+	gtk_container_add (GTK_CONTAINER (eb), button);
+	
+	return TRUE;
+}
+
+static gboolean
+on_object_requested (GtkHTML *html, GtkHTMLEmbedded *eb, gpointer data)
+{
+	MailDisplay *md = data;
+	GHashTable *urls;
+	CamelMimePart *part;
+	
+	if (!eb->classid)
+		return FALSE;
+	
+	urls = g_datalist_get_data (md->data, "part_urls");
+	if (!urls)
+		return FALSE;
+	
+	if (!strncmp (eb->classid, "popup:", 6) && eb->type) {
+		part = g_hash_table_lookup (urls, eb->classid + 6);
+		if (!CAMEL_IS_MIME_PART (part))
+			return FALSE;
+		return do_attachment_header (html, eb, part, md);
+	} else if (!strncmp (eb->classid, "signature:", 10)) {
+		part = g_hash_table_lookup (urls, eb->classid);
+		if (!CAMEL_IS_MIME_PART (part))
+			return FALSE;
+		return do_signature (html, eb, part, md);
+	} else if (!strncmp (eb->classid, "cid:", 4) && eb->type) {
+		part = g_hash_table_lookup (urls, eb->classid);
+		if (!CAMEL_IS_MIME_PART (part))
+			return FALSE;
+		return do_external_viewer (html, eb, part, md);
+	}
+	
+	return FALSE;
+}
+
+static void
+ebook_callback (EBook *book, const gchar *addr, ECard *card, gpointer data)
+{
+	MailDisplay *md = data;
+	
+	if (card && md->current_message) {
+		const CamelInternetAddress *from = camel_mime_message_get_from (md->current_message);
+		const char *md_name = NULL, *md_addr = NULL;
+		
+		/* We are extra anal, in case we are dealing with some sort of pathological message
+		   w/o a From: header. */
+		if (from != NULL && camel_internet_address_get (from, 0, &md_name, &md_addr)) {
+			if (md_addr != NULL && !strcmp (addr, md_addr))
+				mail_display_load_images (md);
+		}
+	}
+}
+
+static void
+on_url_requested (GtkHTML *html, const char *url, GtkHTMLStream *handle,
+		  gpointer user_data)
+{
+	MailDisplay *md = user_data;
+	GConfClient *gconf;
+	GHashTable *urls;
+	CamelMedium *medium;
+	GByteArray *ba;
+	
+	gconf = mail_config_get_gconf_client ();
+	
+	urls = g_datalist_get_data (md->data, "part_urls");
+	g_return_if_fail (urls != NULL);
+	
+	/* See if it refers to a MIME part (cid: or http:) */
+	medium = g_hash_table_lookup (urls, url);
+	if (medium) {
+		CamelContentType *content_type;
+		CamelDataWrapper *wrapper;
+		CamelStream *html_stream;
+		
+		g_return_if_fail (CAMEL_IS_MEDIUM (medium));
+		
+		if (md->related)
+			g_hash_table_remove (md->related, medium);
+		
+		wrapper = camel_medium_get_content_object (medium);
+		if (!mail_content_loaded (wrapper, md, FALSE, url, html, handle))
+			return;
+		
+		content_type = camel_data_wrapper_get_mime_type_field (wrapper);
+		
+		html_stream = mail_display_stream_new (html, handle);
+		
+		if (header_content_type_is (content_type, "text", "*")) {
+			mail_format_data_wrapper_write_to_stream (wrapper, TRUE, md, html_stream);
+		} else {
+			camel_data_wrapper_decode_to_stream (wrapper, html_stream);
+		}
+		
+		camel_object_unref (html_stream);
+		
+		gtk_html_end (html, handle, GTK_HTML_STREAM_OK);
+		return;
+	}
+	
+	urls = g_datalist_get_data (md->data, "data_urls");
+	g_return_if_fail (urls != NULL);
+	
+	/* See if it's some piece of cached data */
+	ba = g_hash_table_lookup (urls, url);
+	if (ba) {
+		if (ba->len) {
+			gtk_html_write (html, handle, ba->data, ba->len);
+			/* printf ("-- begin --\n");
+			   printf (ba->data);
+			   printf ("-- end --\n"); */
+		}
+		gtk_html_end (html, handle, GTK_HTML_STREAM_OK);
+		return;
+	}
+	
+	/* See if it's something we can load. */
+	if (strncmp (url, "http:", 5) == 0 || strncmp (url, "https:", 6) == 0) {
+		int http_mode;
+		
+		http_mode = gconf_client_get_int (gconf, "/apps/evolution/mail/display/load_http_images", NULL);
+		if (http_mode == MAIL_CONFIG_HTTP_ALWAYS ||
+		    g_datalist_get_data (md->data, "load_images")) {
+			fetch_remote (md, url, html, handle);
+		} else if (http_mode == MAIL_CONFIG_HTTP_SOMETIMES &&
+			   !g_datalist_get_data (md->data, "checking_from")) {
+			const CamelInternetAddress *from;
+			const char *name, *addr;
+			
+			from = camel_mime_message_get_from (md->current_message);
+			g_datalist_set_data (md->data, "checking_from", GINT_TO_POINTER (1));
+			
+			/* Make sure we aren't deal w/ some sort of a
+			   pathological message w/o a From: header */
+			if (from != NULL && camel_internet_address_get (from, 0, &name, &addr))
+				e_book_query_address_default (addr, ebook_callback, md);
+			else
+				gtk_html_end (html, handle, GTK_HTML_STREAM_ERROR);
+		}
+	}
+}
+
+/* for processing asynchronous url fetch cancels */
+static struct _mail_msg_op fetch_fake_op = {
+	NULL, NULL, NULL, NULL,
+};
+
+static gboolean
+fetch_cancelled (GIOChannel *source, GIOCondition cond, void *user_data)
+{
+	fetch_cancel ((MailDisplay *) user_data);
+	
+	return FALSE;
+}
+
+static void
+fetch_next (MailDisplay *md)
+{
+	struct _remote_data *rd;
+	struct _MailDisplayPrivate *p = md->priv;
+	SoupMessage *msg;
+	SoupContext *ctx;
+	
+	/* if we're called and no more work to do, clean up, otherwise, setup */
+	if (e_dlist_empty(&p->fetch_active) && e_dlist_empty(&p->fetch_queue)) {
+		if (p->fetch_msg) {
+			p->fetch_total = 0;
+			mail_disable_stop();
+			camel_operation_end(p->fetch_msg->cancel);
+			camel_operation_unregister(p->fetch_msg->cancel);
+			mail_msg_free(p->fetch_msg);
+			p->fetch_msg = NULL;
+			g_source_remove(p->fetch_cancel_watch);
+			g_io_channel_unref(p->fetch_cancel_channel);
+		}
+	} else {
+		if (p->fetch_msg == NULL) {
+			p->fetch_total_done = 0;
+			p->fetch_msg = mail_msg_new(&fetch_fake_op, NULL, sizeof(*p->fetch_msg));
+			camel_operation_register(p->fetch_msg->cancel);
+			camel_operation_start(p->fetch_msg->cancel, _("Downloading images"));
+			p->fetch_cancel_channel = g_io_channel_unix_new(camel_operation_cancel_fd(p->fetch_msg->cancel));
+			p->fetch_cancel_watch = g_io_add_watch(p->fetch_cancel_channel, G_IO_IN, fetch_cancelled, md);
+			mail_enable_stop();
+		}
+	}	
+
+	while (e_dlist_length(&p->fetch_active) < FETCH_MAX_CONNECTIONS
+	       && (rd = (struct _remote_data *)e_dlist_remhead(&p->fetch_queue))) {
+
+		ctx = soup_context_get(rd->uri);
+		rd->msg = msg =  soup_message_new(ctx, SOUP_METHOD_GET);
+
+		if (ctx)
+			soup_context_unref(ctx);
+
+		soup_message_set_flags(msg, SOUP_MESSAGE_OVERWRITE_CHUNKS);
+		soup_message_add_handler(msg, SOUP_HANDLER_BODY_CHUNK, fetch_data, rd);
+		e_dlist_addtail(&p->fetch_active, (EDListNode *)rd);
+		soup_message_queue(msg, fetch_done, rd);
+	}
+}
+
+static void fetch_remote(MailDisplay *md, const char *uri, GtkHTML *html, GtkHTMLStream *stream)
+{
+	struct _remote_data *rd;
+	CamelStream *cstream = NULL;
+
+	if (fetch_cache) {
+		cstream = camel_data_cache_get(fetch_cache, FETCH_HTTP_CACHE, uri, NULL);
+		if (cstream) {
+			char buf[1024];
+			ssize_t len;
+
+			/* need to verify header? */
+
+			while (!camel_stream_eos(cstream)) {
+				len = camel_stream_read(cstream, buf, 1024);
+				if (len > 0) {
+					gtk_html_write(html, stream, buf, len);
+				} else if (len < 0) {
+					gtk_html_end(html, stream, GTK_HTML_STREAM_ERROR);
+					camel_object_unref(cstream);
+					return;
+				}
+			}
+			gtk_html_end(html, stream, GTK_HTML_STREAM_OK);
+			camel_object_unref(cstream);
+			return;
+		}
+		cstream = camel_data_cache_add(fetch_cache, FETCH_HTTP_CACHE, uri, NULL);
+	}
+
+	rd = g_malloc0(sizeof(*rd));
+	rd->md = md;		/* dont ref */
+	rd->uri = g_strdup(uri);
+	rd->html = html;
+	g_object_ref(html);
+	rd->stream = stream;
+	rd->cstream = cstream;
+
+	md->priv->fetch_total++;
+	e_dlist_addtail(&md->priv->fetch_queue, (EDListNode *)rd);
+
+	fetch_next(md);
+}
+
+static void fetch_data(SoupMessage *req, void *data)
+{
+	struct _remote_data *rd = data, *wd;
+	struct _MailDisplayPrivate *p = rd->md->priv;
+	int count;
+	double complete;
+
+	/* we could just hook into the header function for this, but i'm lazy today */
+	if (rd->total == 0) {
+		const char *cl = soup_message_get_header(req->response_headers, "content-length");
+		if (cl)
+			rd->total = strtoul(cl, 0, 10);
+		else
+			rd->total = 0;
+	}
+	rd->length += req->response.length;
+
+	gtk_html_write(rd->html, rd->stream, req->response.body, req->response.length);
+
+	/* copy to cache, clear cache if we get a cache failure */
+	if (rd->cstream) {
+		if (camel_stream_write(rd->cstream, req->response.body, req->response.length) == -1) {
+			camel_data_cache_remove(fetch_cache, FETCH_HTTP_CACHE, rd->uri, NULL);
+			camel_object_unref(rd->cstream);
+			rd->cstream = NULL;
+		}
+	}
+
+	/* update based on total active + finished totals */
+	complete = 0.0;
+	wd = (struct _remote_data *)p->fetch_active.head;
+	count = e_dlist_length(&p->fetch_active);
+	while (wd->next) {
+		if (wd->total)
+			complete += (double)wd->length / wd->total / count;
+		wd = wd->next;
+	}
+
+	d(printf("%s: %f total %f (%d,%d)\n", rd->uri, complete, (p->fetch_total_done + complete ) * 100.0 / p->fetch_total, p->fetch_total, p->fetch_total_done));
+
+	camel_operation_progress(p->fetch_msg->cancel, (p->fetch_total_done + complete ) * 100.0 / p->fetch_total);
+}
+
+static void fetch_free(struct _remote_data *rd)
+{
+	g_object_unref(rd->html);
+	if (rd->cstream)
+		camel_object_unref(rd->cstream);
+	g_free(rd->uri);
+	g_free(rd);
+}
+
+static void fetch_done(SoupMessage *req, void *data)
+{
+	struct _remote_data *rd = data;
+	MailDisplay *md = rd->md;
+
+	if (SOUP_MESSAGE_IS_ERROR(req)) {
+		d(printf("Loading '%s' failed!\n", rd->uri));
+		gtk_html_end(rd->html, rd->stream, GTK_HTML_STREAM_ERROR);
+		if (fetch_cache)
+			camel_data_cache_remove(fetch_cache, FETCH_HTTP_CACHE, rd->uri, NULL);
+	} else {
+		d(printf("Loading '%s' complete!\n", rd->uri));
+		gtk_html_end(rd->html, rd->stream, GTK_HTML_STREAM_OK);
+	}
+
+	e_dlist_remove((EDListNode *)rd);
+	fetch_free(rd);
+	md->priv->fetch_total_done++;
+
+	fetch_next(md);
+}
+
+static void fetch_cancel(MailDisplay *md)
+{
+	struct _remote_data *rd;
+
+	/* first, clean up all the ones we haven't finished yet */
+	while ((rd = (struct _remote_data *)e_dlist_remhead(&md->priv->fetch_queue))) {
+		gtk_html_end(rd->html, rd->stream, GTK_HTML_STREAM_ERROR);
+		if (fetch_cache)
+			camel_data_cache_remove(fetch_cache, FETCH_HTTP_CACHE, rd->uri, NULL);
+		fetch_free(rd);
+	}
+
+	/* cancel the rest, cancellation will free it/etc */
+	while (!e_dlist_empty(&md->priv->fetch_active)) {
+		rd = (struct _remote_data *)md->priv->fetch_active.head;
+		soup_message_cancel(rd->msg);
+	}
+}
+
+struct _load_content_msg {
+	struct _mail_msg msg;
+	
+	MailDisplay *display;
+	GtkHTML *html;
+	
+	GtkHTMLStream *handle;
+	int redisplay_counter;
+	char *url;
+	CamelMimeMessage *message;
+	void (*callback)(MailDisplay *, gpointer);
+	gpointer data;
+};
+
+static char *
+load_content_desc (struct _mail_msg *mm, int done)
+{
+	return g_strdup (_("Loading message content"));
+}
+
+static void
+load_content_load (struct _mail_msg *mm)
+{
+	struct _load_content_msg *m = (struct _load_content_msg *)mm;
+
+	m->callback (m->display, m->data);
+}
+
+static gboolean
+try_part_urls (struct _load_content_msg *m)
+{
+	GHashTable *urls;
+	CamelMedium *medium;
+	
+	urls = g_datalist_get_data (m->display->data, "part_urls");
+	g_return_val_if_fail (urls != NULL, FALSE);
+	
+	/* See if it refers to a MIME part (cid: or http:) */
+	medium = g_hash_table_lookup (urls, m->url);
+	if (medium) {
+		CamelDataWrapper *data;
+		CamelStream *html_stream;
+		
+		g_return_val_if_fail (CAMEL_IS_MEDIUM (medium), FALSE);
+		
+		data = camel_medium_get_content_object (medium);
+		if (!mail_content_loaded (data, m->display, FALSE, m->url, m->html, m->handle)) {
+			g_warning ("This code should not be reached\n");
+			return TRUE;
+		}
+		
+		html_stream = mail_display_stream_new (m->html, m->handle);
+		camel_data_wrapper_decode_to_stream (data, html_stream);
+		camel_object_unref (html_stream);
+		
+		gtk_html_end (m->html, m->handle, GTK_HTML_STREAM_OK);
+		return TRUE;
+	}
+	
+	return FALSE;
+}
+
+static gboolean
+try_data_urls (struct _load_content_msg *m)
+{
+	GHashTable *urls;
+	GByteArray *ba;
+	
+	urls = g_datalist_get_data (m->display->data, "data_urls");
+	ba   = g_hash_table_lookup (urls, m->url);
+	
+	if (ba) {
+		if (ba->len)
+			gtk_html_write (m->html, m->handle, ba->data, ba->len);
+		gtk_html_end (m->html, m->handle, GTK_HTML_STREAM_OK);
+		return TRUE;
+	}
+	
+	return FALSE;
+}
+
+static void
+load_content_loaded (struct _mail_msg *mm)
+{
+	struct _load_content_msg *m = (struct _load_content_msg *)mm;
+	
+	if (m->display->destroyed)
+		return;
+	
+	if (m->display->current_message == m->message) {
+		if (m->handle) {
+			if (m->redisplay_counter == m->display->redisplay_counter) {
+				if (!try_part_urls (m) && !try_data_urls (m))
+					gtk_html_end (m->html, m->handle, GTK_HTML_STREAM_ERROR);
+			}
+		} else {
+			mail_display_redisplay (m->display, FALSE);
+		}
+	}
+}
+
+static void
+load_content_free (struct _mail_msg *mm)
+{
+	struct _load_content_msg *m = (struct _load_content_msg *)mm;
+	
+	g_free (m->url);
+	g_object_unref (m->html);
+	g_object_unref (m->display);
+	camel_object_unref (m->message);
+}
+
+static struct _mail_msg_op load_content_op = {
+	load_content_desc,
+	load_content_load,
+	load_content_loaded,
+	load_content_free,
+};
+
+static void
+stream_write_or_redisplay_when_loaded (MailDisplay *md,
+				       GtkHTML *html,
+				       gconstpointer key,
+				       const gchar *url,
+				       void (*callback)(MailDisplay *, gpointer),
+				       GtkHTMLStream *handle,
+				       gpointer data)
+{
+	struct _load_content_msg *m;
+	GHashTable *loading;
+	
+	if (md->destroyed)
+		return;
+	
+	loading = g_datalist_get_data (md->data, "loading");
+	if (loading) {
+		if (g_hash_table_lookup (loading, key))
+			return;
+	} else {
+		loading = g_hash_table_new (NULL, NULL);
+		g_datalist_set_data_full (md->data, "loading", loading,
+					  (GDestroyNotify) g_hash_table_destroy);
+	}
+	g_hash_table_insert (loading, (gpointer) key, GINT_TO_POINTER (1));
+	
+	m = mail_msg_new (&load_content_op, NULL, sizeof (*m));
+	m->display = md;
+	g_object_ref((m->display));
+	m->html = html;
+	g_object_ref((html));
+	m->handle = handle;
+	m->url = g_strdup (url);
+	m->redisplay_counter = md->redisplay_counter;
+	m->message = md->current_message;
+	camel_object_ref (m->message);
+	m->callback = callback;
+	m->data = data;
+	
+	e_thread_put (mail_thread_queued, (EMsg *)m);
+	return;
+}
+
+void
+mail_display_stream_write_when_loaded (MailDisplay *md,
+				       gconstpointer key,
+				       const char *url,
+				       void (*callback)(MailDisplay *, gpointer),
+				       GtkHTML *html,
+				       GtkHTMLStream *handle,
+				       gpointer data)
+{
+	stream_write_or_redisplay_when_loaded (md, html, key, url, callback, handle, data);
+}
+
+void
+mail_display_redisplay_when_loaded (MailDisplay *md,
+				    gconstpointer key,
+				    void (*callback)(MailDisplay *, gpointer),
+				    GtkHTML *html,
+				    gpointer data)
+{
+	stream_write_or_redisplay_when_loaded (md, html, key, NULL, callback, NULL, data);
+}
+
+void
+mail_text_write (MailDisplayStream *stream, MailDisplay *md, CamelMimePart *part,
+		 int idx, gboolean printing, const char *text)
+{
+	CamelStreamFilter *filtered_stream;
+	CamelMimeFilter *html_filter;
+	GConfClient *gconf;
+	guint32 flags, rgb;
+	GdkColor colour;
+	char *buf;
+	
+	gconf = mail_config_get_gconf_client ();
+	
+	flags = CAMEL_MIME_FILTER_TOHTML_CONVERT_NL | CAMEL_MIME_FILTER_TOHTML_CONVERT_SPACES;
+	
+	if (!printing)
+		flags |= CAMEL_MIME_FILTER_TOHTML_CONVERT_URLS | CAMEL_MIME_FILTER_TOHTML_CONVERT_ADDRESSES;
+	
+	if (!printing && gconf_client_get_bool (gconf, "/apps/evolution/mail/display/mark_citations", NULL))
+		flags |= CAMEL_MIME_FILTER_TOHTML_MARK_CITATION;
+	
+	buf = gconf_client_get_string (gconf, "/apps/evolution/mail/display/citation_colour", NULL);
+	gdk_color_parse (buf ? buf : "#737373", &colour);
+	g_free (buf);
+	
+	rgb = ((colour.red & 0xff00) << 8) | (colour.green & 0xff00) | ((colour.blue & 0xff00) >> 8);
+	html_filter = camel_mime_filter_tohtml_new (flags, rgb);
+	filtered_stream = camel_stream_filter_new_with_stream ((CamelStream *) stream);
+	camel_stream_filter_add (filtered_stream, html_filter);
+	camel_object_unref (html_filter);
+	
+	camel_stream_write ((CamelStream *) stream, "<tt>\n", 5);
+	camel_stream_write ((CamelStream *) filtered_stream, text, strlen (text));
+	camel_stream_flush ((CamelStream *) filtered_stream);
+	camel_stream_write ((CamelStream *) stream, "</tt>\n", 6);
+	camel_object_unref (filtered_stream);
+	
+#if 0
+	/* this was the old way of doing it, I don't understand why we need iframes... */
+	GByteArray *ba;
+	char *xed, *iframe;
+	char *btt = "<tt>\n";
+	char *ett = "</tt>\n";
+	char *htmltext;
+	guint32 flags;
+	
+	flags = CAMEL_MIME_FILTER_TOHTML_CONVERT_NL | CAMEL_MIME_FILTER_TOHTML_CONVERT_SPACES;
+	
+	if (!printing)
+		flags |= CAMEL_MIME_FILTER_TOHTML_CONVERT_URLS | CAMEL_MIME_FILTER_TOHTML_CONVERT_ADDRESSES;
+	
+	if (!printing && mail_config_get_citation_highlight ())
+		flags |= CAMEL_MIME_FILTER_TOHTML_MARK_CITATION;
+	
+	htmltext = camel_text_to_html (text, flags, mail_config_get_citation_color ());
+	
+	ba = g_byte_array_new ();
+	g_byte_array_append (ba, (const guint8 *) btt, strlen (btt) + 1);
+	g_byte_array_append (ba, (const guint8 *) htmltext, strlen (htmltext) + 1);
+	g_byte_array_append (ba, (const guint8 *) ett, strlen (ett) + 1);
+	g_free (htmltext);
+	
+	xed = g_strdup_printf ("x-evolution-data:%p-%d", part, idx);
+	iframe = g_strdup_printf ("<iframe src=\"%s\" frameborder=0 scrolling=no>could not get %s</iframe>", xed, xed);
+	mail_display_add_url (md, "data_urls", xed, ba);
+	camel_stream_write ((CamelStream *) stream, iframe, strlen (iframe));
+	g_free (iframe);
+#endif
+}
+
+void
+mail_error_printf (MailDisplayStream *stream, const char *format, ...)
+{
+	/* FIXME: it'd be nice if camel-stream had a vprintf method... */
+	char *buf, *htmltext;
+	va_list ap;
+	
+	va_start (ap, format);
+	buf = g_strdup_vprintf (format, ap);
+	va_end (ap);
+	
+	htmltext = camel_text_to_html (buf, CAMEL_MIME_FILTER_TOHTML_CONVERT_NL |
+				       CAMEL_MIME_FILTER_TOHTML_CONVERT_URLS, 0);
+	g_free (buf);
+	
+	camel_stream_printf ((CamelStream *) stream, "<em><font color=red>");
+	camel_stream_write ((CamelStream *) stream, htmltext, strlen (htmltext));
+	camel_stream_printf ((CamelStream *) stream, "</font></em>");
+	
+	g_free (htmltext);
+}
+
+
+#define COLOR_IS_LIGHT(r, g, b)  ((r + g + b) > (128 * 3))
+
+#define HTML_HEADER "<!doctype html public \"-//W3C//DTD HTML 4.0 TRANSITIONAL//EN\">\n<html>\n"  \
+                    "<head>\n<meta name=\"generator\" content=\"Evolution Mail Component\">\n</head>\n"
+
+void
+mail_display_render (MailDisplay *md, GtkHTML *html, gboolean reset_scroll)
+{
+	const char *flag, *completed;
+	GtkHTMLStream *html_stream;
+	MailDisplayStream *stream;
+
+	g_return_if_fail (IS_MAIL_DISPLAY (md));
+	g_return_if_fail (GTK_IS_HTML (html));
+	
+	if (!md->html) {
+		/* we've been destroyed */
+		return;
+	}
+	
+	html_stream = gtk_html_begin (html);
+	if (!reset_scroll) {
+		/* This is a hack until there's a clean way to do this. */
+		GTK_HTML (md->html)->engine->newPage = FALSE;
+	}
+
+	gtk_html_stream_write (html_stream, HTML_HEADER, sizeof (HTML_HEADER) - 1);
+	
+	if (md->current_message && md->display_style == MAIL_CONFIG_DISPLAY_SOURCE)
+		gtk_html_stream_write (html_stream, "<body>\n", 7);
+	else
+		gtk_html_stream_write (html_stream, "<body marginwidth=0 marginheight=0>\n", 36);
+	
+	flag = md->info ? camel_tag_get (&md->info->user_tags, "follow-up") : NULL;
+	completed = md->info ? camel_tag_get (&md->info->user_tags, "completed-on") : NULL;
+	if ((flag && *flag) && !(completed && *completed)) {
+		const char *due_by, *overdue = "";
+		char bgcolor[7], fontcolor[7];
+		time_t target_date, now;
+		GtkStyle *style = NULL;
+		char due_date[256];
+		struct tm due;
+		int offset;
+		
+		/* my favorite thing to do... muck around with colors so we respect people's stupid themes. */
+		/* FIXME: this is also in mail-format.c */
+		style = gtk_widget_get_style (GTK_WIDGET (html));
+		if (style && !md->printing) {
+			int state = GTK_WIDGET_STATE (GTK_WIDGET (html));
+			gushort r, g, b;
+			
+			r = style->base[state].red / 256;
+			g = style->base[state].green / 256;
+			b = style->base[state].blue / 256;
+			
+			if (COLOR_IS_LIGHT (r, g, b)) {
+				r *= 1.0;
+				g *= 0.97;
+				b *= 0.75;
+			} else {
+				r = 255 - (1.0 * (255 - r));
+				g = 255 - (0.97 * (255 - g));
+				b = 255 - (0.75 * (255 - b));
+			}
+			
+			sprintf (bgcolor, "%.2X%.2X%.2X", r, g, b);
+			
+			r = style->text[state].red / 256;
+			g = style->text[state].green / 256;
+			b = style->text[state].blue / 256;
+			
+			sprintf (fontcolor, "%.2X%.2X%.2X", r, g, b);
+		} else {
+			strcpy (bgcolor, "EEEEEE");
+			strcpy (fontcolor, "000000");
+		}
+		
+		due_by = camel_tag_get (&md->info->user_tags, "due-by");
+		if (due_by && *due_by) {
+			target_date = header_decode_date (due_by, &offset);
+			now = time (NULL);
+			if (now >= target_date)
+				overdue = _("Overdue:");
+			
+			localtime_r (&target_date, &due);
+			
+			e_utf8_strftime_fix_am_pm (due_date, sizeof (due_date), _("by %B %d, %Y, %l:%M %p"), &due);
+		} else {
+			due_date[0] = '\0';
+		}
+		
+		gtk_html_stream_printf (html_stream, "<font color=\"#%s\">"
+					"<table width=\"100%%\" cellpadding=0 cellspacing=0><tr><td colspan=3 height=10></td></tr>"
+					"<tr><td width=10></td><td>"
+					"<table cellspacing=1 cellpadding=1 bgcolor=\"#000000\" width=\"100%%\"><tr><td>"
+					"<table cellspacing=0 bgcolor=\"#%s\" cellpadding=2 cellspacing=2 width=\"100%%\">"
+					"<tr><td align=\"left\" width=20><img src=\"%s\" align=\"middle\"></td>"
+					"<td>%s%s%s%s %s</td></table></td></tr></table>"
+					"</td><td width=10></td></tr></table></font>", fontcolor, bgcolor,
+					mail_display_get_url_for_icon (md, EVOLUTION_IMAGES "/flag-for-followup-16.png"),
+					overdue ? "<b>" : "", overdue, overdue ? "</b>&nbsp;" : "",
+					flag, due_date);
+	}
+	
+	if (md->current_message) {
+		stream = (MailDisplayStream *) mail_display_stream_new (html, html_stream);
+		
+		if (md->display_style == MAIL_CONFIG_DISPLAY_SOURCE)
+			mail_format_raw_message (md->current_message, md, stream);
+		else
+			mail_format_mime_message (md->current_message, md, stream);
+		
+		camel_object_unref (stream);
+	}
+	
+	gtk_html_stream_write (html_stream, "</body></html>\n", 15);
+	gtk_html_end (html, html_stream, GTK_HTML_STREAM_OK);
+}
+
+/**
+ * mail_display_redisplay:
+ * @mail_display: the mail display object
+ * @reset_scroll: specifies whether or not to reset current scroll
+ *
+ * Force a redraw of the message display.
+ **/
+void
+mail_display_redisplay (MailDisplay *md, gboolean reset_scroll)
+{
+	if (md->destroyed)
+		return;
+
+	/* we're in effect stealing the queued redisplay */
+	if (md->idle_id) {
+		g_source_remove(md->idle_id);
+		md->idle_id = 0;
+	}
+	
+	fetch_cancel(md);
+	
+	md->last_active = NULL;
+	md->redisplay_counter++;
+	/* printf ("md %p redisplay %d\n", md, md->redisplay_counter); */
+	
+	mail_display_render (md, md->html, reset_scroll);
+}
+
+
+/**
+ * mail_display_set_message:
+ * @mail_display: the mail display object
+ * @medium: the input camel medium, or %NULL
+ * @folder: CamelFolder
+ * @info: message info
+ *
+ * Makes the mail_display object show the contents of the medium
+ * param.
+ **/
+void 
+mail_display_set_message (MailDisplay *md, CamelMedium *medium, CamelFolder *folder, CamelMessageInfo *info)
+{
+	/* For the moment, we deal only with CamelMimeMessage, but in
+	 * the future, we should be able to deal with any medium.
+	 */
+	if (md->destroyed
+	    || (medium && !CAMEL_IS_MIME_MESSAGE (medium)))
+		return;
+	
+	/* Clean up from previous message. */
+	if (md->current_message) {
+		fetch_cancel (md);
+		camel_object_unref (md->current_message);
+		g_datalist_clear (md->data);
+	}
+	
+	if (medium) {
+		camel_object_ref (medium);
+		md->current_message = (CamelMimeMessage *) medium;
+	} else
+		md->current_message = NULL;
+	
+	if (md->folder && md->info) {
+		camel_folder_free_message_info (md->folder, md->info);
+		camel_object_unref (md->folder);
+	}
+	
+	if (folder && info) {
+		md->info = info;
+		md->folder = folder;
+		camel_object_ref (folder);
+		camel_folder_ref_message_info (folder, info);
+	} else {
+		md->info = NULL;
+		md->folder = NULL;
+	}
+	
+	g_datalist_init (md->data);
+	mail_display_redisplay (md, TRUE);
+}
+
+/**
+ * mail_display_set_charset:
+ * @mail_display: the mail display object
+ * @charset: charset or %NULL
+ *
+ * Makes the mail_display object show the contents of the medium
+ * param.
+ **/
+void
+mail_display_set_charset (MailDisplay *mail_display, const char *charset)
+{
+	g_free (mail_display->charset);
+	mail_display->charset = g_strdup (charset);
+
+	mail_display_queue_redisplay (mail_display);
+}
+
+/**
+ * mail_display_load_images:
+ * @md: the mail display object
+ *
+ * Load all HTTP images in the current message
+ **/
+void
+mail_display_load_images (MailDisplay *md)
+{
+	g_datalist_set_data (md->data, "load_images", GINT_TO_POINTER (1));
+	mail_display_redisplay (md, FALSE);
+}
+
+/*----------------------------------------------------------------------*
+ *                     Standard Gtk+ Class functions
+ *----------------------------------------------------------------------*/
+
+static void
+mail_display_init (GObject *object)
+{
+	MailDisplay *mail_display = MAIL_DISPLAY (object);
+	GConfClient *gconf;
+	int style;
+	
+	mail_display->scroll            = NULL;
+	mail_display->html              = NULL;
+	mail_display->redisplay_counter = 0;
+	mail_display->last_active       = NULL;
+	mail_display->idle_id           = 0;
+	mail_display->selection         = NULL;
+	mail_display->charset           = NULL;
+	mail_display->current_message   = NULL;
+	mail_display->folder            = NULL;
+	mail_display->info              = NULL;
+	mail_display->data              = NULL;
+	
+	mail_display->invisible         = gtk_invisible_new ();
+	g_object_ref (mail_display->invisible);
+	gtk_object_sink ((GtkObject *) mail_display->invisible);
+	
+	gconf = mail_config_get_gconf_client ();
+	style = gconf_client_get_int (gconf, "/apps/evolution/mail/format/message_display_style", NULL);
+	mail_display->display_style     = style;
+	
+	mail_display->printing          = FALSE;
+	
+	mail_display->priv = g_malloc0(sizeof(*mail_display->priv));
+	e_dlist_init(&mail_display->priv->fetch_active);
+	e_dlist_init(&mail_display->priv->fetch_queue);
+}
+
+static void
+mail_display_destroy (GtkObject *object)
+{
+	MailDisplay *mail_display = MAIL_DISPLAY (object);
+	
+	if (mail_display->html) {
+		g_object_unref (mail_display->html);
+		mail_display->html = NULL;
+	}
+	
+	if (mail_display->current_message) {
+		camel_object_unref (mail_display->current_message);
+		g_datalist_clear (mail_display->data);
+		fetch_cancel(mail_display);
+		mail_display->current_message = NULL;
+	}
+	
+	g_free (mail_display->charset);
+	mail_display->charset = NULL;
+	g_free (mail_display->selection);
+	mail_display->selection = NULL;
+	
+	if (mail_display->folder) {
+		if (mail_display->info)
+			camel_folder_free_message_info (mail_display->folder, mail_display->info);
+		camel_object_unref (mail_display->folder);
+		mail_display->folder = NULL;
+	}
+	
+	g_free (mail_display->data);
+	mail_display->data = NULL;
+	
+	if (mail_display->idle_id) {
+		g_source_remove (mail_display->idle_id);
+		mail_display->idle_id = 0;
+	}
+	
+	if (mail_display->invisible) {
+		g_object_unref (mail_display->invisible);
+		mail_display->invisible = NULL;
+	}
+	
+	if (mail_display->priv && mail_display->priv->display_notify_id) {
+		GConfClient *gconf = mail_config_get_gconf_client ();
+		gconf_client_notify_remove (gconf, mail_display->priv->display_notify_id);
+		mail_display->priv->display_notify_id = 0;
+	}
+	
+	g_free (mail_display->priv);
+	mail_display->priv = NULL;
+	
+	mail_display->destroyed = TRUE;
+	
+	mail_display_parent_class->destroy (object);
+}
+
+static void
+invisible_selection_get_callback (GtkWidget *widget,
+				  GtkSelectionData *selection_data,
+				  guint info,
+				  guint time,
+				  void *data)
+{
+	MailDisplay *display;
+	
+	display = MAIL_DISPLAY (data);
+	
+	if (!display->selection)
+		return;
+	
+	g_assert (info == 1);
+	
+	gtk_selection_data_set (selection_data, GDK_SELECTION_TYPE_STRING, 8,
+				display->selection, strlen (display->selection));
+}
+
+static gint
+invisible_selection_clear_event_callback (GtkWidget *widget,
+					  GdkEventSelection *event,
+					  void *data)
+{
+	MailDisplay *display;
+	
+	display = MAIL_DISPLAY (data);
+	
+	g_free (display->selection);
+	display->selection = NULL;
+	
+	return TRUE;
+}
+
+static void
+mail_display_class_init (GtkObjectClass *object_class)
+{
+	object_class->destroy = mail_display_destroy;
+	
+	if (mail_display_parent_class == NULL) {
+		const char *base_directory = mail_component_peek_base_directory (mail_component_peek ());
+		char *path;
+		
+		path = g_alloca (strlen (base_directory) + 16);
+		sprintf (path, "%s/cache", base_directory);
+		
+		/* cache expiry - 2 hour access, 1 day max */
+		fetch_cache = camel_data_cache_new(path, 0, NULL);
+		camel_data_cache_set_expire_age(fetch_cache, 24*60*60);
+		camel_data_cache_set_expire_access(fetch_cache, 2*60*60);
+		
+		mail_display_parent_class = g_type_class_ref (PARENT_TYPE);
+		thumbnail_cache = g_hash_table_new (g_str_hash, g_str_equal);
+	}
+}
+
+static void
+link_open_in_browser (GtkWidget *w, MailDisplay *mail_display)
+{
+	if (!mail_display->html->pointer_url)
+		return;
+	
+	on_link_clicked (mail_display->html, mail_display->html->pointer_url,
+			 mail_display);
+}
+
+#if 0
+static void
+link_save_as (GtkWidget *w, MailDisplay *mail_display)
+{
+	g_print ("FIXME save %s\n", mail_display->html->pointer_url);
+}
+#endif
+
+static void
+link_copy_location (GtkWidget *w, MailDisplay *mail_display)
+{
+	GdkAtom clipboard_atom;
+	
+	g_free (mail_display->selection);
+	mail_display->selection = g_strdup (mail_display->html->pointer_url);
+	
+	clipboard_atom = gdk_atom_intern ("CLIPBOARD", FALSE);
+	if (clipboard_atom == GDK_NONE)
+		return; /* failed */
+	
+	/* We don't check the return values of the following since there is not
+	 * much we can do if we cannot assert the selection.
+	 */
+	
+	gtk_selection_owner_set (GTK_WIDGET (mail_display->invisible),
+				 GDK_SELECTION_PRIMARY,
+				 GDK_CURRENT_TIME);
+	gtk_selection_owner_set (GTK_WIDGET (mail_display->invisible),
+				 clipboard_atom,
+				 GDK_CURRENT_TIME);
+}
+
+static void
+image_save_as (GtkWidget *w, MailDisplay *mail_display)
+{
+	const char *src;
+	
+	src = g_object_get_data ((GObject *) mail_display, "current_src_uri");
+	
+	save_url (mail_display, src);
+}
+
+enum {
+	/* 
+	 * This is used to mask the link specific menu items.
+	 */
+	MASK_URL = 1,
+
+	/*
+	 * This is used to mask src specific menu items.
+	 */
+	MASK_SRC = 2
+};
+
+#define SEPARATOR  { "", NULL, (NULL), NULL,  0 }
+#define TERMINATOR { NULL, NULL, (NULL), NULL,  0 }
+
+static EPopupMenu link_menu [] = {
+	E_POPUP_ITEM (N_("Open Link in Browser"), G_CALLBACK (link_open_in_browser),   MASK_URL),
+	E_POPUP_ITEM (N_("Copy Link Location"), G_CALLBACK (link_copy_location),  MASK_URL),
+#if 0
+	E_POPUP_ITEM (N_("Save Link as (FIXME)"), G_CALLBACK (link_save_as),  MASK_URL),
+#endif
+	E_POPUP_ITEM (N_("Save Image as..."), G_CALLBACK (image_save_as), MASK_SRC), 
+	
+	TERMINATOR
+};
+
+
+/*
+ *  Create a window and popup our widget, with reasonable semantics for the popup
+ *  disappearing, etc.
+ */
+
+typedef struct _PopupInfo PopupInfo;
+struct _PopupInfo {
+	GtkWidget *w;
+	GtkWidget *win;
+	guint destroy_timeout;
+	guint widget_destroy_handle;
+	Bonobo_Listener listener;
+	gboolean hidden;
+};
+
+/* Aiieee!  Global Data! */
+static GtkWidget *the_popup = NULL;
+
+static void
+popup_window_destroy_cb (PopupInfo *pop, GObject *deadbeef)
+{
+	the_popup = NULL;
+
+	if (pop->destroy_timeout != 0)
+		g_source_remove(pop->destroy_timeout);
+
+	bonobo_event_source_client_remove_listener (bonobo_widget_get_objref (BONOBO_WIDGET (pop->w)),
+						    pop->listener,
+						    NULL);
+	CORBA_Object_release (pop->listener, NULL);
+	g_object_unref(pop->w);
+	g_free (pop);
+}
+
+static int
+popup_timeout_cb (gpointer user_data)
+{
+	PopupInfo *pop = (PopupInfo *) user_data;
+
+	pop->destroy_timeout = 0;
+	gtk_widget_destroy (pop->win);
+	
+	return 0;
+}
+
+static int
+popup_enter_cb (GtkWidget *w, GdkEventCrossing *ev, gpointer user_data)
+{
+	PopupInfo *pop = (PopupInfo *) user_data;
+	
+	if (pop->destroy_timeout)
+		g_source_remove (pop->destroy_timeout);
+	pop->destroy_timeout = 0;
+	
+	return 0;
+}
+
+static int
+popup_leave_cb (GtkWidget *w, GdkEventCrossing *ev, gpointer user_data)
+{
+	PopupInfo *pop = (PopupInfo *) user_data;
+	
+	if (pop->destroy_timeout)
+		g_source_remove (pop->destroy_timeout);
+	
+	if (!pop->hidden)
+		pop->destroy_timeout = g_timeout_add (500, popup_timeout_cb, pop);
+	
+	return 0;
+}
+
+static void
+popup_realize_cb (GtkWidget *widget, gpointer user_data)
+{
+	PopupInfo *pop = (PopupInfo *) user_data;
+	
+	gtk_widget_add_events (pop->win, GDK_ENTER_NOTIFY_MASK | GDK_LEAVE_NOTIFY_MASK);
+	
+	if (pop->destroy_timeout == 0) {
+		if (!pop->hidden) {
+			pop->destroy_timeout = g_timeout_add (5000, popup_timeout_cb, pop);
+		} else {
+			pop->destroy_timeout = 0;
+		}
+	}
+}
+
+static void
+popup_size_allocate_cb (GtkWidget *widget, GtkAllocation *alloc, gpointer user_data)
+{
+	gtk_window_set_position (GTK_WINDOW (widget), GTK_WIN_POS_MOUSE);
+}
+
+static PopupInfo *
+make_popup_window (GtkWidget *w)
+{
+	PopupInfo *pop = g_new0 (PopupInfo, 1);
+	GtkWidget *fr;
+	
+	/* Only allow for one popup at a time.  Ugly. */
+	if (the_popup)
+		gtk_widget_destroy (the_popup);
+	
+	pop->w = w;
+	g_object_ref(w);
+	the_popup = pop->win = gtk_window_new (GTK_WINDOW_POPUP);
+	fr = gtk_frame_new (NULL);
+	
+	gtk_container_add (GTK_CONTAINER (pop->win), fr);
+	gtk_container_add (GTK_CONTAINER (fr), w);
+	
+	gtk_window_set_resizable (GTK_WINDOW (pop->win), FALSE);
+	
+	g_signal_connect (pop->win, "enter_notify_event", G_CALLBACK (popup_enter_cb), pop);
+	g_signal_connect (pop->win, "leave_notify_event", G_CALLBACK (popup_leave_cb), pop);
+	g_signal_connect_after (pop->win, "realize", G_CALLBACK (popup_realize_cb), pop);
+	g_signal_connect (pop->win, "size_allocate", G_CALLBACK (popup_size_allocate_cb), pop);
+	
+	g_object_weak_ref ((GObject *) pop->win, (GWeakNotify) popup_window_destroy_cb, pop);
+	
+	gtk_widget_show (w);
+	gtk_widget_show (fr);
+	gtk_widget_show (pop->win);
+	
+	return pop;
+}
+
+static void
+listener_cb (BonoboListener    *listener,
+	     char              *event_name,
+	     CORBA_any         *any,
+	     CORBA_Environment *ev,
+	     gpointer           user_data)
+{
+	PopupInfo *pop;
+	char *type;
+	
+	pop = user_data;
+	
+	if (pop->destroy_timeout)
+		g_source_remove (pop->destroy_timeout);
+	pop->destroy_timeout = 0;
+	
+	type = bonobo_event_subtype (event_name);
+	
+	if (!strcmp (type, "Destroy")) {
+		gtk_widget_destroy (GTK_WIDGET (pop->win));
+	} else if (!strcmp (type, "Hide")) {
+		pop->hidden = TRUE;
+		gtk_widget_hide (GTK_WIDGET (pop->win));
+	}
+	
+	g_free (type);
+}
+
+static int
+html_button_press_event (GtkWidget *widget, GdkEventButton *event, MailDisplay *mail_display)
+{
+	g_return_val_if_fail (widget != NULL, FALSE);
+	g_return_val_if_fail (event != NULL, FALSE);
+	
+	if (event->type == GDK_BUTTON_PRESS) {
+		if (event->button == 3) {
+			HTMLEngine *e;
+			HTMLPoint *point;
+			GtkWidget *popup_thing;
+			
+			e     = GTK_HTML (widget)->engine;
+			point = html_engine_get_point_at (e, event->x, event->y, FALSE);
+			
+			if (point) {
+				const char *url, *src;
+				
+				url = html_object_get_url (point->object);
+				src = html_object_get_src (point->object);
+				
+				if (url && !strncasecmp (url, "mailto:", 7)) {
+					PopupInfo *pop;
+					char *url_decoded;
+					
+					url_decoded = gtk_html_get_url_object_relative (GTK_HTML (widget),
+											point->object,
+											url);
+					camel_url_decode (url_decoded);
+					
+					popup_thing = bonobo_widget_new_control ("OAFIID:GNOME_Evolution_Addressbook_AddressPopup",
+										 CORBA_OBJECT_NIL);
+					
+					bonobo_widget_set_property (BONOBO_WIDGET (popup_thing),
+								    "email", TC_CORBA_string, url_decoded+7,
+								    NULL);
+					g_free (url_decoded);
+					
+					pop = make_popup_window (popup_thing);
+					
+					pop->listener = bonobo_event_source_client_add_listener_full(
+						bonobo_widget_get_objref (BONOBO_WIDGET (popup_thing)),
+						g_cclosure_new (G_CALLBACK (listener_cb), pop, NULL),
+						NULL, NULL);
+				} else if (url || src) {
+				        int hide_mask = 0;
+					
+					if (!url)
+						hide_mask |= MASK_URL;
+					
+					if (!src)
+						hide_mask |= MASK_SRC;
+					
+					g_free (g_object_get_data ((GObject *) mail_display, "current_src_uri"));
+					g_object_set_data ((GObject *) mail_display, "current_src_uri", 
+							  gtk_html_get_url_object_relative (GTK_HTML (widget),
+											    point->object,
+											    src));
+					
+					e_popup_menu_run (link_menu, (GdkEvent *) event, 0, hide_mask, mail_display);
+				}
+				
+				html_point_destroy (point);
+				return TRUE;
+			}			
+		}
+	}
+	
+	return FALSE;
+}
+
+static inline void
+set_underline (HTMLEngine *e, HTMLObject *o, gboolean underline)
+{
+	HTMLText *text = HTML_TEXT (o);
+	
+	html_text_set_font_style (text, e, underline
+				  ? html_text_get_font_style (text) | GTK_HTML_FONT_STYLE_UNDERLINE
+				  : html_text_get_font_style (text) & ~GTK_HTML_FONT_STYLE_UNDERLINE);
+	html_engine_queue_draw (e, o);
+}
+
+static void
+update_active (GtkWidget *widget, gint x, gint y, MailDisplay *mail_display)
+{
+	HTMLEngine *e;
+	HTMLPoint *point;
+	const gchar *email;
+	
+	e = GTK_HTML (widget)->engine;
+	
+	point = html_engine_get_point_at (e, x, y, FALSE);
+	if (mail_display->last_active && (!point || mail_display->last_active != point->object)) {
+		set_underline (e, HTML_OBJECT (mail_display->last_active), FALSE);
+		mail_display->last_active = NULL;
+	}
+	if (point) {
+		email = (const gchar *) html_object_get_data (point->object, "email");
+		if (email && html_object_is_text (point->object)) {
+			set_underline (e, point->object, TRUE);
+			mail_display->last_active = point->object;
+		}
+		html_point_destroy (point);
+	}
+}
+
+static int
+html_enter_notify_event (GtkWidget *widget, GdkEventCrossing *event, MailDisplay *mail_display)
+{
+	update_active (widget, event->x, event->y, mail_display);
+	
+	return FALSE;
+}
+
+static int
+html_motion_notify_event (GtkWidget *widget, GdkEventMotion *event, MailDisplay *mail_display)
+{
+	int x, y;
+	
+	g_return_val_if_fail (widget != NULL, 0);
+	g_return_val_if_fail (GTK_IS_HTML (widget), 0);
+	g_return_val_if_fail (event != NULL, 0);
+	
+	if (event->is_hint)
+		gdk_window_get_pointer (GTK_LAYOUT (widget)->bin_window, &x, &y, NULL);
+	else {
+		x = event->x;
+		y = event->y;
+	}
+	
+	update_active (widget, x, y, mail_display);
+	
+	return FALSE;
+}
+
+static void
+html_iframe_created (GtkWidget *w, GtkHTML *iframe, MailDisplay *mail_display)
+{
+	g_signal_connect (iframe, "button_press_event",
+			  G_CALLBACK (html_button_press_event), mail_display);
+	g_signal_connect (iframe, "motion_notify_event",
+			  G_CALLBACK (html_motion_notify_event), mail_display);
+	g_signal_connect (iframe, "enter_notify_event",
+			  G_CALLBACK (html_enter_notify_event), mail_display);
+}
+
+static GNOME_Evolution_ShellView
+retrieve_shell_view_interface_from_control (BonoboControl *control)
+{
+	Bonobo_ControlFrame control_frame;
+	GNOME_Evolution_ShellView shell_view_interface;
+	CORBA_Environment ev;
+	
+	control_frame = bonobo_control_get_control_frame (control, NULL);
+	
+	if (control_frame == NULL)
+		return CORBA_OBJECT_NIL;
+	
+	CORBA_exception_init (&ev);
+	shell_view_interface = Bonobo_Unknown_queryInterface (control_frame,
+							      "IDL:GNOME/Evolution/ShellView:1.0",
+							      &ev);
+
+	if (BONOBO_EX (&ev))
+		shell_view_interface = CORBA_OBJECT_NIL;
+	
+	CORBA_exception_free (&ev);
+	
+	return shell_view_interface;
+}
+
+static void
+set_status_message (const char *message, int busy)
+{
+	EList *controls;
+	EIterator *it;
+	
+	controls = folder_browser_factory_get_control_list ();
+	for (it = e_list_get_iterator (controls); e_iterator_is_valid (it); e_iterator_next (it)) {
+		BonoboControl *control;
+		GNOME_Evolution_ShellView shell_view_interface;
+		CORBA_Environment ev;
+		
+		control = BONOBO_CONTROL (e_iterator_get (it));
+		
+		shell_view_interface = retrieve_shell_view_interface_from_control (control);
+		
+		CORBA_exception_init (&ev);
+		
+		if (shell_view_interface != CORBA_OBJECT_NIL) {
+			if (message != NULL)
+				GNOME_Evolution_ShellView_setMessage (shell_view_interface,
+								      message[0] ? message: "",
+								      busy,
+								      &ev);
+		}
+		
+		CORBA_exception_free (&ev);
+
+		bonobo_object_release_unref (shell_view_interface, NULL);
+		
+		/* yeah we only set the first one.  Why?  Because it seems to leave
+		   random ones lying around otherwise.  Shrug. */
+		break;
+	}
+	
+	g_object_unref (it);
+}
+
+/* For now show every url but possibly limit it to showing only http:
+   or ftp: urls */
+static void
+html_on_url (GtkHTML *html, const char *url, MailDisplay *mail_display)
+{
+	static char *previous_url = NULL;
+	
+	/* This all looks silly but yes, this is the proper way to mix
+           GtkHTML's on_url with BonoboUIComponent statusbar */
+	if (!url || (previous_url && (strcmp (url, previous_url) != 0)))
+		set_status_message ("", FALSE);
+	if (url) {
+		set_status_message (url, FALSE);
+		g_free (previous_url);
+		previous_url = g_strdup (url);
+	}
+}
+
+/* If if a gconf setting for the mail display has changed redisplay to pick up the changes */
+static void
+display_notify (GConfClient *gconf, guint cnxn_id, GConfEntry *entry, gpointer data)
+{
+	MailDisplay *md = data;
+	gchar *tkey;
+
+	g_return_if_fail (entry != NULL);
+	g_return_if_fail (gconf_entry_get_key (entry) != NULL);
+	g_return_if_fail (gconf_entry_get_value (entry) != NULL);
+	
+	tkey = strrchr (entry->key, '/');
+	
+	g_return_if_fail (tkey != NULL);
+
+	if (!strcmp (tkey, "/animate_images")) {
+		gtk_html_set_animate (md->html, gconf_value_get_bool (gconf_entry_get_value(entry)));
+	} else if (!strcmp (tkey, "/citation_color") 
+		   || !strcmp (tkey, "/mark_citations")) {
+		mail_display_queue_redisplay (md);
+	} else if (!strcmp (tkey, "/caret_mode")) {
+		gtk_html_set_caret_mode(md->html, gconf_value_get_bool (gconf_entry_get_value(entry)));
+	}
+}
+
+GtkWidget *
+mail_display_new (void)
+{
+	MailDisplay *mail_display = g_object_new (mail_display_get_type (), NULL);
+	GtkWidget *scroll, *html;
+	GdkAtom clipboard_atom;
+	HTMLTokenizer *tok;
+	GConfClient *gconf;
+
+	gtk_box_set_homogeneous (GTK_BOX (mail_display), FALSE);
+	gtk_widget_show (GTK_WIDGET (mail_display));
+	
+	scroll = gtk_scrolled_window_new (NULL, NULL);
+	gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scroll), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
+	gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (scroll), GTK_SHADOW_IN);
+	gtk_box_pack_start_defaults (GTK_BOX (mail_display), scroll);
+	gtk_widget_show (scroll);
+	
+	html = gtk_html_new ();
+	tok = e_searching_tokenizer_new ();
+	html_engine_set_tokenizer (GTK_HTML (html)->engine, tok);
+	g_object_unref (tok);
+	
+	mail_display_initialize_gtkhtml (mail_display, GTK_HTML (html));
+	
+	gtk_container_add (GTK_CONTAINER (scroll), html);
+	gtk_widget_show (GTK_WIDGET (html));
+	
+	g_signal_connect (mail_display->invisible, "selection_get",
+			  G_CALLBACK (invisible_selection_get_callback), mail_display);
+	g_signal_connect (mail_display->invisible, "selection_clear_event",
+			  G_CALLBACK (invisible_selection_clear_event_callback), mail_display);
+	
+	gtk_selection_add_target (mail_display->invisible,
+				  GDK_SELECTION_PRIMARY, GDK_SELECTION_TYPE_STRING, 1);
+	
+	clipboard_atom = gdk_atom_intern ("CLIPBOARD", FALSE);
+	if (clipboard_atom != GDK_NONE)
+		gtk_selection_add_target (mail_display->invisible,
+					  clipboard_atom, GDK_SELECTION_TYPE_STRING, 1);
+	
+	gconf = mail_config_get_gconf_client ();
+	gtk_html_set_animate (GTK_HTML (html), gconf_client_get_bool (gconf, "/apps/evolution/mail/display/animate_images", NULL));
+	gtk_html_set_caret_mode (GTK_HTML (html), gconf_client_get_bool (gconf, "/apps/evolution/mail/display/caret_mode", NULL));
+	
+	gconf_client_add_dir (gconf, "/apps/evolution/mail/display",GCONF_CLIENT_PRELOAD_NONE, NULL);
+	mail_display->priv->display_notify_id = gconf_client_notify_add (gconf, "/apps/evolution/mail/display",
+									 display_notify, mail_display, NULL, NULL);
+	
+	mail_display->scroll = GTK_SCROLLED_WINDOW (scroll);
+	mail_display->html = GTK_HTML (html);
+	g_object_ref (mail_display->html);
+	mail_display->last_active = NULL;
+	mail_display->data = g_new0 (GData *, 1);
+	g_datalist_init (mail_display->data);
+	
+	return GTK_WIDGET (mail_display);
+}
+
+void
+mail_display_initialize_gtkhtml (MailDisplay *mail_display, GtkHTML *html)
+{
+	gtk_html_set_default_content_type (GTK_HTML (html), "text/html; charset=utf-8");
+	
+	gtk_html_set_editable (GTK_HTML (html), FALSE);
+	
+	g_signal_connect (html, "url_requested",
+			  G_CALLBACK (on_url_requested),
+			  mail_display);
+	g_signal_connect (html, "object_requested",
+			  G_CALLBACK (on_object_requested),
+			  mail_display);
+	g_signal_connect (html, "link_clicked",
+			  G_CALLBACK (on_link_clicked),
+			  mail_display);
+	g_signal_connect (html, "button_press_event",
+			  G_CALLBACK (html_button_press_event), mail_display);
+	g_signal_connect (html, "motion_notify_event",
+			  G_CALLBACK (html_motion_notify_event), mail_display);
+	g_signal_connect (html, "enter_notify_event",
+			  G_CALLBACK (html_enter_notify_event), mail_display);
+	g_signal_connect (html, "iframe_created",
+			  G_CALLBACK (html_iframe_created), mail_display);
+	g_signal_connect (html, "on_url",
+			  G_CALLBACK (html_on_url), mail_display);
+}
+
+static void
+free_url (gpointer key, gpointer value, gpointer data)
+{
+	g_free (key);
+	if (data)
+		g_byte_array_free (value, TRUE);
+}
+
+static void
+free_data_urls (gpointer urls)
+{
+	g_hash_table_foreach (urls, free_url, GINT_TO_POINTER (1));
+	g_hash_table_destroy (urls);
+}
+
+char *
+mail_display_add_url (MailDisplay *md, const char *kind, char *url, gpointer data)
+{
+	GHashTable *urls;
+	gpointer old_key, old_value;
+	
+	urls = g_datalist_get_data (md->data, kind);
+	if (!urls) {
+		urls =  g_hash_table_new (g_str_hash, g_str_equal);
+		g_datalist_set_data_full (md->data, "data_urls", urls,
+					  free_data_urls);
+	}
+	
+	if (g_hash_table_lookup_extended (urls, url, &old_key, &old_value)) {
+		g_free (url);
+		url = old_key;
+	}
+	
+	g_hash_table_insert (urls, url, data);
+	
+	return url;
+}
+
+const char *
+mail_display_get_url_for_icon (MailDisplay *md, const char *icon_name)
+{
+	char *icon_path, buf[1024], *url;
+	int fd, nread;
+	GByteArray *ba;
+	
+	/* FIXME: cache */
+	
+	if (*icon_name == '/')
+		icon_path = g_strdup (icon_name);
+	else {
+		icon_path = gnome_program_locate_file (NULL, GNOME_FILE_DOMAIN_PIXMAP,
+						       icon_name, TRUE, NULL);
+		if (!icon_path)
+			return "file:///dev/null";
+	}
+	
+	fd = open (icon_path, O_RDONLY);
+	g_free (icon_path);
+	if (fd == -1)
+		return "file:///dev/null";
+	
+	ba = g_byte_array_new ();
+	while (1) {
+		nread = read (fd, buf, sizeof (buf));
+		if (nread < 1)
+			break;
+		g_byte_array_append (ba, buf, nread);
+	}
+	close (fd);
+	
+	url = g_strdup_printf ("x-evolution-data:%p", ba);
+	
+	return mail_display_add_url (md, "data_urls", url, ba);
+}
+
+
+struct _location_url_stack {
+	struct _location_url_stack *parent;
+	CamelURL *url;
+};
+
+void
+mail_display_push_content_location (MailDisplay *md, const char *location)
+{
+	struct _location_url_stack *node;
+	CamelURL *url;
+	
+	url = camel_url_new (location, NULL);
+	node = g_new (struct _location_url_stack, 1);
+	node->parent = md->urls;
+	node->url = url;
+	md->urls = node;
+}
+
+CamelURL *
+mail_display_get_content_location (MailDisplay *md)
+{
+	return md->urls ? md->urls->url : NULL;
+}
+
+void
+mail_display_pop_content_location (MailDisplay *md)
+{
+	struct _location_url_stack *node;
+	
+	if (!md->urls) {
+		g_warning ("content-location stack underflow!");
+		return;
+	}
+	
+	node = md->urls;
+	md->urls = node->parent;
+	
+	if (node->url)
+		camel_url_free (node->url);
+	
+	g_free (node);
+}
+
+E_MAKE_TYPE (mail_display, "MailDisplay", MailDisplay, mail_display_class_init, mail_display_init, PARENT_TYPE);
diff --git a/mail/mail-display.h b/mail/mail-display.h
new file mode 100644
index 0000000000..fe95c95490
--- /dev/null
+++ b/mail/mail-display.h
@@ -0,0 +1,137 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
+/*
+ *  Authors: Jeffrey Stedfast <fejj@ximian.com>
+ *
+ *  Copyright 2002 Ximian, Inc. (www.ximian.com)
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 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, write to the Free Software
+ *  Foundation, Inc., 59 Temple Street #330, Boston, MA 02111-1307, USA.
+ *
+ */
+
+
+#ifndef _MAIL_DISPLAY_H_
+#define _MAIL_DISPLAY_H_
+
+#include <gtk/gtkvbox.h>
+#include <gtk/gtkscrolledwindow.h>
+#include <gtkhtml/gtkhtml.h>
+#include <gtkhtml/gtkhtml-stream.h>
+
+#include <camel/camel-stream.h>
+#include <camel/camel-mime-message.h>
+#include <camel/camel-medium.h>
+#include <camel/camel-folder.h>
+
+#include "mail-types.h"
+#include "mail-config.h" /*display_style*/
+#include "mail-display-stream.h"
+
+#define MAIL_DISPLAY_TYPE        (mail_display_get_type ())
+#define MAIL_DISPLAY(o)          (G_TYPE_CHECK_INSTANCE_CAST ((o), MAIL_DISPLAY_TYPE, MailDisplay))
+#define MAIL_DISPLAY_CLASS(k)    (G_TYPE_CHECK_CLASS_CAST ((k), MAIL_DISPLAY_TYPE, MailDisplayClass))
+#define IS_MAIL_DISPLAY(o)       (G_TYPE_CHECK_INSTANCE_TYPE ((o), MAIL_DISPLAY_TYPE))
+#define IS_MAIL_DISPLAY_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), MAIL_DISPLAY_TYPE))
+
+struct _MailDisplay {
+	GtkVBox parent;
+	
+	struct _MailDisplayPrivate *priv;
+	
+	GtkScrolledWindow *scroll;
+	GtkHTML *html;
+	/* GtkHTMLStream *stream; */
+	gint redisplay_counter;
+	gpointer last_active;
+	guint idle_id;
+	
+	char *charset;
+	
+	char *selection;
+	
+	CamelMimeMessage *current_message;
+	CamelMessageInfo *info;
+	CamelFolder *folder;
+	GData **data;
+	
+	/* stack of Content-Location URLs used for combining with a
+           relative URL Content-Location on a leaf part in order to
+           construct the full URL */
+	struct _location_url_stack *urls;
+	
+	GHashTable *related;	/* related parts not displayed yet */
+	
+	/* Sigh.  This shouldn't be needed.  I haven't figured out why it is
+	   though.  */
+	GtkWidget *invisible;
+	
+	MailConfigDisplayStyle display_style;
+	
+	guint printing : 1;
+	guint destroyed: 1;
+};
+
+typedef struct {
+	GtkVBoxClass parent_class;
+} MailDisplayClass;
+
+GtkType        mail_display_get_type    (void);
+GtkWidget *    mail_display_new         (void);
+
+void           mail_display_initialize_gtkhtml (MailDisplay *mail_display, GtkHTML *html);
+
+void           mail_display_queue_redisplay (MailDisplay *mail_display);
+void           mail_display_render (MailDisplay *mail_display, GtkHTML *html, gboolean reset_scroll);
+void           mail_display_redisplay (MailDisplay *mail_display, gboolean reset_scroll);
+void           mail_display_redisplay_when_loaded (MailDisplay *md,
+						   gconstpointer key,
+						   void (*callback)(MailDisplay *, gpointer),
+						   GtkHTML *html,
+						   gpointer data);
+void           mail_display_stream_write_when_loaded (MailDisplay *md,
+						      gconstpointer key,
+						      const gchar *url,
+						      void (*callback)(MailDisplay *, gpointer),
+						      GtkHTML *html,
+						      GtkHTMLStream *handle,
+						      gpointer data);
+
+void           mail_display_set_message (MailDisplay *mail_display, 
+					 CamelMedium *medium,
+					 CamelFolder *folder,
+					 CamelMessageInfo *info);
+
+void           mail_display_set_charset (MailDisplay *mail_display,
+					 const char *charset);
+
+void           mail_display_load_images (MailDisplay *mail_display);
+
+void           mail_text_write          (MailDisplayStream *stream,
+					 MailDisplay *md,
+					 CamelMimePart *part,
+					 gint idx,
+					 gboolean printing,
+					 const char *text);
+void           mail_error_printf        (MailDisplayStream *stream,
+					 const char *format, ...);
+
+char *mail_display_add_url (MailDisplay *md, const char *kind, char *url, gpointer data);
+
+const char *mail_display_get_url_for_icon (MailDisplay *md, const char *icon_name);
+
+void mail_display_push_content_location (MailDisplay *md, const char *location);
+CamelURL *mail_display_get_content_location (MailDisplay *md);
+void mail_display_pop_content_location (MailDisplay *md);
+
+#endif /* _MAIL_DISPLAY_H_ */
diff --git a/mail/mail-folder-cache.c b/mail/mail-folder-cache.c
index c22d3011b0..3d4eb96d53 100644
--- a/mail/mail-folder-cache.c
+++ b/mail/mail-folder-cache.c
@@ -98,9 +98,7 @@ struct _store_info {
 
 	CamelStore *store;	/* the store for these folders */
 
-	/* only 1 should be set */
-	EvolutionStorage *storage;
-	GNOME_Evolution_Storage corba_storage;
+	EStorage *storage;
 
 	/* Outstanding folderinfo requests */
 	EDList folderinfo_updates;
@@ -109,7 +107,7 @@ struct _store_info {
 static void folder_changed(CamelObject *o, gpointer event_data, gpointer user_data);
 static void folder_renamed(CamelObject *o, gpointer event_data, gpointer user_data);
 static void folder_finalised(CamelObject *o, gpointer event_data, gpointer user_data);
-
+static void message_changed (CamelObject *o, gpointer event_data, gpointer user_data);
 
 static guint ping_id = 0;
 static gboolean ping_cb (gpointer user_data);
@@ -188,9 +186,7 @@ real_flush_updates(void *o, void *event_data, void *data)
 {
 	struct _folder_update *up;
 	struct _store_info *si;
-	EvolutionStorage *storage;
-	GNOME_Evolution_Storage corba_storage;
-	CORBA_Environment ev;
+	EStorage *storage;
 	time_t now;
 
 	LOCK(info_lock);
@@ -199,11 +195,9 @@ real_flush_updates(void *o, void *event_data, void *data)
 		if (si) {
 			storage = si->storage;
 			if (storage)
-				bonobo_object_ref((BonoboObject *)storage);
-			corba_storage = si->corba_storage;
+				g_object_ref (storage);
 		} else {
 			storage = NULL;
-			corba_storage = CORBA_OBJECT_NIL;
 		}
 
 		UNLOCK(info_lock);
@@ -214,7 +208,7 @@ real_flush_updates(void *o, void *event_data, void *data)
 				mail_filter_delete_uri(up->store, up->uri);
 				mail_config_uri_deleted(CAMEL_STORE_CLASS(CAMEL_OBJECT_GET_CLASS(up->store))->compare_folder_name, up->uri);
 				if (up->unsub)
-					evolution_storage_removed_folder (storage, up->path);
+					e_storage_removed_folder (storage, up->path);
 			} else
 				mail_vfolder_add_uri(up->store, up->uri, TRUE);
 		} else {
@@ -222,7 +216,7 @@ real_flush_updates(void *o, void *event_data, void *data)
 			if (up->oldpath) {
 				if (storage != NULL) {
 					d(printf("Removing old folder (rename?) '%s'\n", up->oldpath));
-					evolution_storage_removed_folder(storage, up->oldpath);
+					e_storage_removed_folder(storage, up->oldpath);
 				}
 				/* ELSE? Shell supposed to handle the local snot case */
 			}
@@ -237,24 +231,28 @@ real_flush_updates(void *o, void *event_data, void *data)
 			}
 				
 			if (up->name == NULL) {
-				if (storage != NULL) {
-					d(printf("Updating existing folder: %s (%d unread)\n", up->path, up->unread));
-					evolution_storage_update_folder(storage, up->path, up->unread);
-				} else if (corba_storage != CORBA_OBJECT_NIL) {
-					d(printf("Updating existing (local) folder: %s (%d unread)\n", up->path, up->unread));
-					CORBA_exception_init(&ev);
-					GNOME_Evolution_Storage_updateFolder(corba_storage, up->path, up->unread, &ev);
-					CORBA_exception_free(&ev);
+				EFolder *folder = e_storage_get_folder (storage, up->path);
+
+				if (folder != NULL) {
+					d(printf("updating unread count to '%s' to %d\n", up->path, up->unread));
+					e_folder_set_unread_count (folder, up->unread);
+				} else {
+					g_warning ("No folder at %s ?!", up->path);
 				}
 			} else if (storage != NULL) {
 				char *type = (strncmp(up->uri, "vtrash:", 7)==0)?"vtrash":"mail";
-			
+				EFolder *new_folder = e_folder_new (up->name, type, NULL);
+
 				d(printf("Adding new folder: %s\n", up->path));
-				evolution_storage_new_folder(storage,
-							     up->path, up->name, type, up->uri, up->name, NULL,
-							     up->unread,
-							     CAMEL_IS_DISCO_STORE(up->store)
-							     && camel_disco_store_can_work_offline((CamelDiscoStore *)up->store), 0);
+
+				e_folder_set_physical_uri (new_folder, up->uri);
+				e_folder_set_unread_count (new_folder, up->unread);
+				if (CAMEL_IS_DISCO_STORE(up->store) && camel_disco_store_can_work_offline((CamelDiscoStore *)up->store))
+				    e_folder_set_can_sync_offline (new_folder, TRUE);
+				else
+				    e_folder_set_can_sync_offline (new_folder, FALSE);
+
+				e_storage_new_folder(storage, up->path, new_folder);
 			}
 
 			if (!up->olduri && up->add)
@@ -279,9 +277,9 @@ real_flush_updates(void *o, void *event_data, void *data)
 			notify_idle_id = g_idle_add_full (G_PRIORITY_LOW, notify_idle_cb, NULL, NULL);
 		
 		free_update(up);
-		
-		if (storage)
-			bonobo_object_unref((BonoboObject *)storage);
+
+		if (storage != NULL)
+			g_object_unref (storage);
 		
 		LOCK(info_lock);
 	}
@@ -307,7 +305,7 @@ unset_folder_info(struct _folder_info *mfi, int delete, int unsub)
 		CamelFolder *folder = mfi->folder;
 
 		camel_object_unhook_event(folder, "folder_changed", folder_changed, mfi);
-		camel_object_unhook_event(folder, "message_changed", folder_changed, mfi);
+		camel_object_unhook_event(folder, "message_changed", message_changed, mfi);
 		camel_object_unhook_event(folder, "renamed", folder_renamed, mfi);
 		camel_object_unhook_event(folder, "finalize", folder_finalised, mfi);
 	}
@@ -907,17 +905,18 @@ store_online_cb (CamelStore *store, void *data)
 }
 
 void
-mail_note_store(CamelStore *store, CamelOperation *op, EvolutionStorage *storage, GNOME_Evolution_Storage corba_storage,
+mail_note_store(CamelStore *store, CamelOperation *op, EStorage *storage,
 		void (*done)(CamelStore *store, CamelFolderInfo *info, void *data), void *data)
 {
 	struct _store_info *si;
 	struct _update_data *ud;
 	const char *buf;
 	guint timeout;
+
+	g_return_if_fail (storage == NULL || E_IS_STORAGE (storage));
 	
 	g_assert(CAMEL_IS_STORE(store));
 	g_assert(pthread_self() == mail_gui_thread);
-	g_assert(storage == NULL || corba_storage == CORBA_OBJECT_NIL);
 
 	LOCK(info_lock);
 
@@ -942,8 +941,7 @@ mail_note_store(CamelStore *store, CamelOperation *op, EvolutionStorage *storage
 						   CAMEL_STORE_CLASS(CAMEL_OBJECT_GET_CLASS(store))->compare_folder_name);
 		si->storage = storage;
 		if (storage != NULL)
-			bonobo_object_ref((BonoboObject *)storage);
-		si->corba_storage = corba_storage;
+			g_object_ref (storage);
 		si->store = store;
 		camel_object_ref((CamelObject *)store);
 		g_hash_table_insert(stores, store, si);
diff --git a/mail/mail-folder-cache.h b/mail/mail-folder-cache.h
index 3d612d7d6b..b9f8f44dfb 100644
--- a/mail/mail-folder-cache.h
+++ b/mail/mail-folder-cache.h
@@ -25,14 +25,15 @@
 #ifndef _MAIL_FOLDER_CACHE_H
 #define _MAIL_FOLDER_CACHE_H
 
-#include <shell/evolution-storage.h>
+#include "e-storage.h"
 
 /* Add a store whose folders should appear in the shell
    The folders are scanned from the store, and/or added at
    runtime via the folder_created event */
 void
-mail_note_store(CamelStore *store, CamelOperation *op, EvolutionStorage *storage, GNOME_Evolution_Storage corba_storage,
-		void (*done)(CamelStore *store, CamelFolderInfo *info, void *data), void *data);
+mail_note_store(CamelStore *store, CamelOperation *op, EStorage *storage,
+		void (*done) (CamelStore *store, CamelFolderInfo *info, void *data),
+		void *data);
 
 /* de-note a store */
 void mail_note_store_remove(CamelStore *store);
@@ -41,7 +42,7 @@ void mail_note_store_remove(CamelStore *store);
    The folder must have already been created on the store (which has already been noted)
    before the folder can be opened
  */
-void mail_note_folder(struct _CamelFolder *folder);
+void mail_note_folder(CamelFolder *folder);
 
 /* Returns true if a folder is available (yet), and also sets *folderp (if supplied)
    to a (referenced) copy of the folder if it has already been opened */
diff --git a/mail/mail-font-prefs.c b/mail/mail-font-prefs.c
new file mode 100644
index 0000000000..0d26f1ccbd
--- /dev/null
+++ b/mail/mail-font-prefs.c
@@ -0,0 +1,130 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
+/*
+ *  Authors: Larry Ewing <lewing@ximian.com>
+ *
+ *  Copyright 2002 Ximian, Inc. (www.ximian.com)
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 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, write to the Free Software
+ *  Foundation, Inc., 59 Temple Street #330, Boston, MA 02111-1307, USA.
+ *
+ */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <gtk/gtk.h>
+#include <gtkhtml/gtkhtml-propmanager.h>
+
+#include "mail-font-prefs.h"
+
+static GtkVBoxClass *parent_class = NULL;
+
+GtkWidget *
+mail_font_prefs_new (void)
+{
+	MailFontPrefs *new;
+	
+	new = MAIL_FONT_PREFS (g_object_new (mail_font_prefs_get_type ()), NULL);
+	
+	return GTK_WIDGET (new);
+}
+
+void
+mail_font_prefs_apply (MailFontPrefs *prefs)
+{
+	gtk_html_propmanager_apply (prefs->pman);
+}
+
+static void
+font_prefs_changed (GtkHTMLPropmanager *pman, MailFontPrefs *prefs)
+{
+	if (prefs->control)
+		evolution_config_control_changed (prefs->control);
+}
+
+static void
+mail_font_prefs_destroy (GtkObject *object)
+{
+	MailFontPrefs *prefs = (MailFontPrefs *) object;
+
+	if (prefs->pman) {
+		g_object_unref(prefs->pman);
+		g_object_unref(prefs->gui);
+		prefs->pman = NULL;
+	}
+
+	if (GTK_OBJECT_CLASS (parent_class)->finalize)
+		(* GTK_OBJECT_CLASS (parent_class)->finalize) (object);
+}
+
+static void
+mail_font_prefs_init (MailFontPrefs *prefs)
+{
+	GtkWidget *toplevel;
+	GladeXML *gui;
+
+	gui = glade_xml_new (EVOLUTION_GLADEDIR "/mail-config.glade", "font_tab", NULL);
+	prefs->gui = gui;
+
+	prefs->pman = GTK_HTML_PROPMANAGER (gtk_html_propmanager_new (NULL));
+	gtk_html_propmanager_set_gui (prefs->pman, gui, NULL);
+	g_object_ref(prefs->pman);
+	gtk_object_sink (GTK_OBJECT (prefs->pman));
+
+	g_signal_connect(prefs->pman, "changed", font_prefs_changed, prefs);
+
+	/* get our toplevel widget */
+	toplevel = glade_xml_get_widget (gui, "toplevel");
+	
+	/* reparent */
+	g_object_ref (toplevel);
+	gtk_container_remove (GTK_CONTAINER (toplevel->parent), toplevel);
+	gtk_container_add (GTK_CONTAINER (prefs), toplevel);
+	g_object_unref (toplevel);
+}
+
+static void
+mail_font_prefs_class_init (MailFontPrefsClass *klass)
+{
+	GtkObjectClass *object_class;
+
+	object_class = (GtkObjectClass *) klass;
+	parent_class = g_type_class_ref(gtk_vbox_get_type ());
+
+	object_class->destroy = mail_font_prefs_destroy;
+}
+
+GtkType
+mail_font_prefs_get_type (void)
+{
+	static GType type = 0;
+	
+	if (!type) {
+		GTypeInfo type_info = {
+			sizeof (MailFontPrefsClass),
+			NULL, NULL,
+			(GClassInitFunc) mail_font_prefs_class_init,
+			NULL, NULL,
+			sizeof (MailFontPrefs),
+			0,
+			(GInstanceInitFunc) mail_font_prefs_init,
+		};
+		
+		type = g_type_register_static (gtk_vbox_get_type (), "MailFontPrefs", &type_info, 0);
+	}
+
+	return type;
+}
+
+
diff --git a/mail/mail-font-prefs.h b/mail/mail-font-prefs.h
new file mode 100644
index 0000000000..14a1d20b40
--- /dev/null
+++ b/mail/mail-font-prefs.h
@@ -0,0 +1,66 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
+/*
+ *  Authors: Jeffrey Stedfast <fejj@ximian.com>
+ *
+ *  Copyright 2002 Ximian, Inc. (www.ximian.com)
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 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, write to the Free Software
+ *  Foundation, Inc., 59 Temple Street #330, Boston, MA 02111-1307, USA.
+ *
+ */
+#ifndef __MAIL_FONT_PREFS_H__
+#define __MAIL_FONT_PREFS_H__
+
+#ifdef __cplusplus
+extern "C" {
+#pragma }
+#endif
+
+#include <gtk/gtk.h>
+#include <gtkhtml/gtkhtml-propmanager.h>
+
+#include <shell/Evolution.h>
+#include "evolution-config-control.h"
+
+#define MAIL_FONT_PREFS_TYPE          (mail_font_prefs_get_type())
+#define MAIL_FONT_PREFS(o)            (G_TYPE_CHECK_INSTANCE_CAST ((o), MAIL_FONT_PREFS_TYPE, MailFontPrefs))
+#define MAIL_FONT_PREFS_CLASS(k)      (G_TYPE_CHECK_CLASS_CAST ((k), MAIL_FONT_PREFS_TYPE, MailFontPrefsClass))
+#define IS_MAIL_FONT_PREFS(o)         (G_TYPE_CHECK_INSTANCE_TYPE ((o), MAIL_FONT_PREFS_TYPE))
+#define IS_MAIL_FONT_PREFS_CLASS(k)   (G_TYPE_CHECK_CLASS_TYPE ((k), MAIL_FONT_PREFS_TYPE))
+
+typedef struct _MailFontPrefs MailFontPrefs;
+typedef struct _MailFontPrefsClass MailFontPrefsClass;
+
+struct _MailFontPrefs {
+	GtkVBox parent_object;
+
+	GtkHTMLPropmanager *pman;
+	GladeXML *gui;
+	EvolutionConfigControl *control;
+};
+	
+struct _MailFontPrefsClass {
+	GtkVBoxClass parent_object;
+};
+
+GtkType      mail_font_prefs_get_type (void);
+GtkWidget *  mail_font_prefs_new (void);
+void         mail_font_prefs_apply (MailFontPrefs *prefs);
+
+#define MAIL_FONT_PREFS_CONTROL_ID "OAFIID:GNOME_Evolution_Mail_FontPrefs_ConfigControl"
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+#endif /* __MAIL_FONT_PREFS_H__ */
diff --git a/mail/mail-format.c b/mail/mail-format.c
new file mode 100644
index 0000000000..92428af592
--- /dev/null
+++ b/mail/mail-format.c
@@ -0,0 +1,2131 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
+/*
+ * Authors: Dan Winship <danw@ximian.com>
+ *          Jeffrey Stedfast <fejj@ximian.com>
+ *
+ *  Copyright 2000-2003 Ximian, Inc. (www.ximian.com)
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of version 2 of the GNU General Public
+ * License as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public
+ * License along with this program; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ *
+ */
+
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <string.h>   /* for strstr  */
+#include <ctype.h>
+#include <fcntl.h>
+
+#include <gconf/gconf.h>
+#include <gconf/gconf-client.h>
+
+#include <libgnome/gnome-util.h>
+#include <libgnomevfs/gnome-vfs-mime-handlers.h>
+#include <shell/e-setup.h>
+
+#include <gal/util/e-iconv.h>
+
+#include <camel/camel-mime-utils.h>
+#include <camel/camel-stream-null.h>
+#include <camel/camel-stream-filter.h>
+#include <camel/camel-multipart-signed.h>
+#include <camel/camel-mime-filter-enriched.h>
+#include <camel/camel-mime-filter-tohtml.h>
+#include <camel/camel-mime-filter-windows.h>
+
+#include <e-util/e-trie.h>
+#include <e-util/e-time-utils.h>
+
+#include "mail.h"
+#include "mail-tools.h"
+#include "mail-display.h"
+#include "mail-format.h"
+#include "mail-mt.h"
+#include "mail-crypto.h"
+
+
+#define STANDARD_ISSUE_TABLE_OPEN "<table cellspacing=0 cellpadding=10 width=\"100%\">"
+
+
+static gboolean handle_text_plain            (CamelMimePart *part, const char *mime_type,
+					      MailDisplay *md, MailDisplayStream *stream);
+static gboolean handle_text_enriched         (CamelMimePart *part, const char *mime_type,
+					      MailDisplay *md, MailDisplayStream *stream);
+static gboolean handle_text_html             (CamelMimePart *part, const char *mime_type,
+					      MailDisplay *md, MailDisplayStream *stream);
+static gboolean handle_image                 (CamelMimePart *part, const char *mime_type,
+					      MailDisplay *md, MailDisplayStream *stream);
+static gboolean handle_multipart_mixed       (CamelMimePart *part, const char *mime_type,
+					      MailDisplay *md, MailDisplayStream *stream);
+static gboolean handle_multipart_related     (CamelMimePart *part, const char *mime_type,
+					      MailDisplay *md, MailDisplayStream *stream);
+static gboolean handle_multipart_alternative (CamelMimePart *part, const char *mime_type,
+					      MailDisplay *md, MailDisplayStream *stream);
+static gboolean handle_multipart_appledouble (CamelMimePart *part, const char *mime_type,
+					      MailDisplay *md, MailDisplayStream *stream);
+static gboolean handle_multipart_encrypted   (CamelMimePart *part, const char *mime_type,
+					      MailDisplay *md, MailDisplayStream *stream);
+static gboolean handle_multipart_signed      (CamelMimePart *part, const char *mime_type,
+					      MailDisplay *md, MailDisplayStream *stream);
+static gboolean handle_message_rfc822        (CamelMimePart *part, const char *mime_type,
+					      MailDisplay *md, MailDisplayStream *stream);
+static gboolean handle_message_external_body (CamelMimePart *part, const char *mime_type,
+					      MailDisplay *md, MailDisplayStream *stream);
+
+static gboolean handle_via_bonobo            (CamelMimePart *part, const char *mime_type,
+					      MailDisplay *md, MailDisplayStream *stream);
+
+/* writes the header info for a mime message into an html stream */
+static void write_headers (MailDisplayStream *stream, MailDisplay *md, CamelMimeMessage *message);
+
+/* dispatch html printing via mimetype */
+static gboolean format_mime_part (CamelMimePart *part, MailDisplay *md, MailDisplayStream *stream);
+
+static void
+free_url (gpointer key, gpointer value, gpointer data)
+{
+	g_free (key);
+	if (data)
+		g_byte_array_free (value, TRUE);
+}
+
+static void
+free_part_urls (gpointer urls)
+{
+	g_hash_table_foreach (urls, free_url, NULL);
+	g_hash_table_destroy (urls);
+}
+
+static void
+free_data_urls (gpointer urls)
+{
+	g_hash_table_foreach (urls, free_url, GINT_TO_POINTER (1));
+	g_hash_table_destroy (urls);
+}
+
+/**
+ * mail_format_mime_message: 
+ * @mime_message: the input mime message
+ * @md: the MailDisplay to render into
+ *
+ * Writes a CamelMimeMessage out into a MailDisplay
+ **/
+void
+mail_format_mime_message (CamelMimeMessage *mime_message, MailDisplay *md,
+			  MailDisplayStream *stream)
+{
+	GHashTable *hash;
+	
+	g_return_if_fail (CAMEL_IS_MIME_MESSAGE (mime_message));
+	
+	hash = g_datalist_get_data (md->data, "part_urls");
+	if (!hash) {
+		hash = g_hash_table_new (g_str_hash, g_str_equal);
+		g_datalist_set_data_full (md->data, "part_urls", hash,
+					  free_part_urls);
+	}
+	hash = g_datalist_get_data (md->data, "data_urls");
+	if (!hash) {
+		hash = g_hash_table_new (g_str_hash, g_str_equal);
+		g_datalist_set_data_full (md->data, "data_urls", hash,
+					  free_data_urls);
+	}
+	
+	hash = g_datalist_get_data (md->data, "attachment_states");
+	if (!hash) {
+		hash = g_hash_table_new (NULL, NULL);
+		g_datalist_set_data_full (md->data, "attachment_states", hash,
+					  (GDestroyNotify) g_hash_table_destroy);
+	}
+	hash = g_datalist_get_data (md->data, "fake_parts");
+	if (!hash) {
+		hash = g_hash_table_new (NULL, NULL);
+		g_datalist_set_data_full (md->data, "fake_parts", hash,
+					  (GDestroyNotify) g_hash_table_destroy);
+	}
+	
+	write_headers (stream, md, mime_message);
+	format_mime_part (CAMEL_MIME_PART (mime_message), md, stream);
+}
+
+
+/**
+ * mail_format_raw_message: 
+ * @mime_message: the input mime message
+ * @md: the MailDisplay to render into
+ *
+ * Writes a CamelMimeMessage source out into a MailDisplay
+ **/
+void
+mail_format_raw_message (CamelMimeMessage *mime_message, MailDisplay *md,
+			 MailDisplayStream *stream)
+{
+	CamelStreamFilter *filtered_stream;
+	CamelMimeFilter *html_filter;
+	CamelDataWrapper *wrapper;
+	guint32 flags;
+	
+	g_return_if_fail (CAMEL_IS_MIME_MESSAGE (mime_message));
+	
+	wrapper = CAMEL_DATA_WRAPPER (mime_message);
+	if (!mail_content_loaded (wrapper, md, TRUE, NULL, md->html, NULL))
+		return;
+	
+	filtered_stream = camel_stream_filter_new_with_stream ((CamelStream *) stream);
+	
+	flags = CAMEL_MIME_FILTER_TOHTML_CONVERT_NL | CAMEL_MIME_FILTER_TOHTML_CONVERT_SPACES |
+		CAMEL_MIME_FILTER_TOHTML_ESCAPE_8BIT;
+	html_filter = camel_mime_filter_tohtml_new (flags, 0);
+	camel_stream_filter_add (filtered_stream, html_filter);
+	camel_object_unref (html_filter);
+	
+	camel_stream_write_string ((CamelStream *) stream, STANDARD_ISSUE_TABLE_OPEN "<tr><td><tt>");
+	
+	mail_format_data_wrapper_write_to_stream (wrapper, FALSE, md, (CamelStream *) filtered_stream);
+	camel_object_unref (filtered_stream);
+	
+	camel_stream_write_string ((CamelStream *) stream, "</tt></td></tr></table>");
+}
+
+static const char *
+get_cid (CamelMimePart *part, MailDisplay *md)
+{
+	static int fake_cid_counter = 0;
+	char *cid;
+	
+	/* If we have a real Content-ID, use it. If we don't,
+	 * make a (syntactically invalid, unique) fake one.
+	 */
+	if (camel_mime_part_get_content_id (part)) {
+		cid = g_strdup_printf ("cid:%s", camel_mime_part_get_content_id (part));
+	} else
+		cid = g_strdup_printf ("cid:@@@%d", fake_cid_counter++);
+	
+	return mail_display_add_url (md, "part_urls", cid, part);
+}
+
+static const char *
+get_location (CamelMimePart *part, MailDisplay *md)
+{
+	CamelURL *base;
+	const char *loc;
+	char *location;
+	
+	base = mail_display_get_content_location (md);
+	
+	loc = camel_mime_part_get_content_location (part);
+	if (!loc) {
+		if (!base)
+			return NULL;
+		
+		location = camel_url_to_string (base, 0);
+		return mail_display_add_url (md, "part_urls", location, part);
+	}
+	
+	/* kludge: If the multipart/related does not have a
+           Content-Location header and the HTML part doesn't contain a
+           Content-Location header either, then we will end up
+           generating a invalid unique identifier in the form of
+           "cid:@@@%d" for use in GtkHTML's iframe src url. This means
+           that when GtkHTML requests a relative URL, it will request
+           "cid:/%s" */
+	mail_display_add_url (md, "part_urls", g_strdup_printf ("cid:/%s", loc), part);
+	
+	if (!strchr (loc, ':') && base) {
+		CamelURL *url;
+		
+		mail_display_add_url (md, "part_urls", g_strdup (loc), part);
+		
+		url = camel_url_new_with_base (base, loc);
+		location = camel_url_to_string (url, 0);
+		camel_url_free (url);
+	} else {
+		location = g_strdup (loc);
+	}
+	
+	return mail_display_add_url (md, "part_urls", location, part);
+}
+
+
+static GHashTable *mime_handler_table, *mime_function_table;
+
+static void
+setup_mime_tables (void)
+{
+	mime_handler_table = g_hash_table_new (g_str_hash, g_str_equal);
+	mime_function_table = g_hash_table_new (g_str_hash, g_str_equal);
+	
+	g_hash_table_insert (mime_function_table, "text/plain",
+			     handle_text_plain);
+	g_hash_table_insert (mime_function_table, "text/richtext",
+			     handle_text_enriched);
+	g_hash_table_insert (mime_function_table, "text/enriched",
+			     handle_text_enriched);
+	g_hash_table_insert (mime_function_table, "text/html",
+			     handle_text_html);
+	
+	g_hash_table_insert (mime_function_table, "image/gif",
+			     handle_image);
+	g_hash_table_insert (mime_function_table, "image/jpeg",
+			     handle_image);
+	g_hash_table_insert (mime_function_table, "image/png",
+			     handle_image);
+	g_hash_table_insert (mime_function_table, "image/x-png",
+			     handle_image);
+	g_hash_table_insert (mime_function_table, "image/tiff",
+			     handle_image);
+	g_hash_table_insert (mime_function_table, "image/x-bmp",
+			     handle_image);
+	g_hash_table_insert (mime_function_table, "image/bmp",
+			     handle_image);
+	g_hash_table_insert (mime_function_table, "image/x-cmu-raster",
+			     handle_image);
+	g_hash_table_insert (mime_function_table, "image/x-ico",
+			     handle_image);
+	g_hash_table_insert (mime_function_table, "image/x-portable-anymap",
+			     handle_image);
+	g_hash_table_insert (mime_function_table, "image/x-portable-bitmap",
+			     handle_image);
+	g_hash_table_insert (mime_function_table, "image/x-portable-graymap",
+			     handle_image);
+	g_hash_table_insert (mime_function_table, "image/x-portable-pixmap",
+			     handle_image);
+	g_hash_table_insert (mime_function_table, "image/x-xpixmap",
+			     handle_image);
+	
+	g_hash_table_insert (mime_function_table, "message/rfc822",
+			     handle_message_rfc822);
+	g_hash_table_insert (mime_function_table, "message/news",
+			     handle_message_rfc822);
+	g_hash_table_insert (mime_function_table, "message/external-body",
+			     handle_message_external_body);
+	
+	g_hash_table_insert (mime_function_table, "multipart/alternative",
+			     handle_multipart_alternative);
+	g_hash_table_insert (mime_function_table, "multipart/related",
+			     handle_multipart_related);
+	g_hash_table_insert (mime_function_table, "multipart/mixed",
+			     handle_multipart_mixed);
+	g_hash_table_insert (mime_function_table, "multipart/appledouble",
+			     handle_multipart_appledouble);
+	g_hash_table_insert (mime_function_table, "multipart/encrypted",
+			     handle_multipart_encrypted);
+	g_hash_table_insert (mime_function_table, "multipart/signed",
+			     handle_multipart_signed);
+	
+	/* RFC 2046 says unrecognized text subtypes can be treated
+	 * as text/plain (as long as you recognize the character set),
+	 * and unrecognized multipart subtypes as multipart/mixed.  */
+	g_hash_table_insert (mime_function_table, "text/*",
+			     handle_text_plain);
+	g_hash_table_insert (mime_function_table, "multipart/*",
+			     handle_multipart_mixed);
+}
+
+static gboolean
+component_supports (Bonobo_ServerInfo *component, const char *mime_type)
+{
+	Bonobo_ActivationProperty *prop;
+	CORBA_sequence_CORBA_string stringv;
+	int i;
+	
+	prop = bonobo_server_info_prop_find (component, "repo_ids");
+	if (!prop || prop->v._d != Bonobo_ACTIVATION_P_STRINGV)
+		return FALSE;
+	
+	stringv = prop->v._u.value_stringv;
+	for (i = 0; i < stringv._length; i++) {
+		if (!strcasecmp ("IDL:Bonobo/PersistStream:1.0", stringv._buffer[i]))
+			break;
+	}
+	
+	/* got to end of list with no persist stream? */
+	
+	if (i >= stringv._length)
+		return FALSE;
+	
+	prop = bonobo_server_info_prop_find (component,
+					     "bonobo:supported_mime_types");
+	if (!prop || prop->v._d != Bonobo_ACTIVATION_P_STRINGV)
+		return FALSE;
+	
+	stringv = prop->v._u.value_stringv;
+	for (i = 0; i < stringv._length; i++) {
+		if (!strcasecmp (mime_type, stringv._buffer[i]))
+			return TRUE;
+	}
+	
+	return FALSE;
+}
+
+static gboolean
+mime_type_uses_evolution_component (const char *mime_type)
+{
+	return (!strcmp (mime_type, "text/x-vcard") || !strcmp (mime_type, "text/calendar"));
+}
+
+static gboolean
+mime_type_can_use_component (const char *mime_type)
+{
+	const char **mime_types;
+	int i;
+	
+	mime_types = mail_config_get_allowable_mime_types ();
+	for (i = 0; mime_types[i]; i++) {
+		if (!strcmp (mime_types[i], mime_type))
+			return TRUE;
+	}
+	
+	return FALSE;
+}
+
+/**
+ * mail_lookup_handler:
+ * @mime_type: a MIME type
+ *
+ * Looks up the MIME type in its own tables and GNOME-VFS's and returns
+ * a MailMimeHandler structure detailing the component, application,
+ * and built-in handlers (if any) for that MIME type. (If the component
+ * is non-%NULL, the built-in handler will always be handle_via_bonobo().)
+ * The MailMimeHandler's @generic field is set if the match was for the
+ * MIME supertype rather than the exact type.
+ *
+ * Return value: a MailMimeHandler (which should not be freed), or %NULL
+ * if no handlers are available.
+ **/
+MailMimeHandler *
+mail_lookup_handler (const char *mime_type)
+{
+	MailMimeHandler *handler;
+	char *mime_type_main;
+	const char *p;
+	GList *components, *iter;
+	
+	if (mime_handler_table == NULL)
+		setup_mime_tables ();
+	
+	/* See if we've already found it. */
+	handler = g_hash_table_lookup (mime_handler_table, mime_type);
+	if (handler)
+		return handler;
+	
+	/* Special case MIME type: application/octet-stream
+	 * The point of this type is that there isn't a handler. 
+	 */
+	if (strcmp (mime_type, "application/octet-stream") == 0)
+		return NULL;
+	
+	/* No. Create a new one and look up application and full type
+	 * handler. If we find a builtin, create the handler and
+	 * register it.
+	 */
+	handler = g_new0 (MailMimeHandler, 1);
+	handler->applications =
+		gnome_vfs_mime_get_short_list_applications (mime_type);
+	handler->builtin =
+		g_hash_table_lookup (mime_function_table, mime_type);
+	
+	if (handler->builtin) {
+		handler->generic = FALSE;
+		handler->is_bonobo = FALSE;
+		goto reg;
+	}
+	
+	/* only allow using a bonobo component if it is an evo-component or the user has
+	 * specified that we can use a bonobo-component by setting the gconf key */
+	if (mime_type_uses_evolution_component (mime_type) || mime_type_can_use_component (mime_type)) {
+		/* Try for the first matching component. (we don't use get_short_list_comps
+		 * as that will return NULL if the oaf files don't have the short_list properties
+		 * defined). */
+		components = gnome_vfs_mime_get_all_components (mime_type);
+		for (iter = components; iter; iter = iter->next) {
+			if (component_supports (iter->data, mime_type)) {
+				handler->generic = FALSE;
+				handler->is_bonobo = TRUE;
+				handler->builtin = handle_via_bonobo;
+				handler->component = Bonobo_ServerInfo_duplicate (iter->data);
+				gnome_vfs_mime_component_list_free (components);
+				goto reg;
+			}
+		}
+		
+		gnome_vfs_mime_component_list_free (components);
+	}
+	
+	/* Try for a generic builtin match. */
+	p = strchr (mime_type, '/');
+	if (p == NULL)
+		p = mime_type + strlen (mime_type);
+	mime_type_main = g_alloca ((p - mime_type) + 3);
+	memcpy (mime_type_main, mime_type, p - mime_type);
+	memcpy (mime_type_main + (p - mime_type), "/*", 3);
+	
+	handler->builtin = g_hash_table_lookup (mime_function_table,
+						mime_type_main);
+	
+	if (handler->builtin) {
+		handler->generic = TRUE;
+		handler->is_bonobo = FALSE;
+		if (handler->component) {
+			CORBA_free (handler->component);
+			handler->component = NULL;
+		}
+		goto reg;
+	}
+	
+	/* Try for a generic component match. */
+	if (handler->component) {
+		handler->generic = TRUE;
+		handler->is_bonobo = TRUE;
+		handler->builtin = handle_via_bonobo;
+		goto reg;
+	}
+	
+	/* If we at least got an application list, use that. */
+	if (handler->applications) {
+		handler->generic = TRUE;
+		handler->is_bonobo = FALSE;
+		goto reg;
+	}
+	
+	/* Nada. */
+	g_free (handler);
+	return NULL;
+	
+ reg:
+	g_hash_table_insert (mime_handler_table, g_strdup (mime_type), handler);
+	
+	return handler;
+}
+
+/* An "anonymous" MIME part is one that we shouldn't call attention
+ * to the existence of, but simply display.
+ */
+static gboolean
+is_anonymous (CamelMimePart *part, const char *mime_type)
+{
+	/* FIXME: should use CamelContentType stuff */
+	if (!strncasecmp (mime_type, "multipart/", 10) ||
+	    !strncasecmp (mime_type, "message/", 8))
+		return TRUE;
+	
+	if (!strncasecmp (mime_type, "text/", 5) &&
+	    !camel_mime_part_get_filename (part))
+		return TRUE;
+	
+	return FALSE;
+}
+
+/**
+ * mail_part_is_inline:
+ * @part: a CamelMimePart
+ *
+ * Return value: whether or not the part should/will be displayed inline.
+ **/
+gboolean
+mail_part_is_inline (CamelMimePart *part)
+{
+	const char *disposition;
+	CamelContentType *content_type;
+	gboolean anon;
+	char *type;
+	
+	/* If it has an explicit disposition, return that. */
+	disposition = camel_mime_part_get_disposition (part);
+	if (disposition)
+		return strcasecmp (disposition, "inline") == 0;
+	
+	/* Certain types should default to inline. FIXME: this should
+	 * be customizable.
+	 */
+	content_type = camel_mime_part_get_content_type (part);
+	if (!header_content_type_is (content_type, "message", "*"))
+		return TRUE;
+	
+	/* Otherwise, display it inline if it's "anonymous", and
+	 * as an attachment otherwise.
+	 */
+	type = header_content_type_simple (content_type);
+	anon = is_anonymous (part, type);
+	g_free (type);
+	
+	return anon;
+}
+
+enum inline_states {
+	I_VALID     = (1 << 0),
+	I_ACTUALLY  = (1 << 1),
+	I_DISPLAYED = (1 << 2)
+};
+
+static int
+get_inline_flags (CamelMimePart *part, MailDisplay *md)
+{
+	GHashTable *asht;
+	int val;
+	
+	/* check if we already know. */
+	
+	asht = g_datalist_get_data (md->data, "attachment_states");
+	val = GPOINTER_TO_INT (g_hash_table_lookup (asht, part));
+	if (val)
+		return val;
+	
+	/* ok, we don't know. Figure it out. */
+	
+	if (mail_part_is_inline (part))
+		val = (I_VALID | I_ACTUALLY | I_DISPLAYED);
+	else
+		val = (I_VALID);
+	
+	g_hash_table_insert (asht, part, GINT_TO_POINTER (val));
+	
+	return val;
+}
+
+gboolean
+mail_part_is_displayed_inline (CamelMimePart *part, MailDisplay *md)
+{
+	return (gboolean) (get_inline_flags (part, md) & I_DISPLAYED);
+}
+
+void
+mail_part_toggle_displayed (CamelMimePart *part, MailDisplay *md)
+{
+	GHashTable *asht = g_datalist_get_data (md->data, "attachment_states");
+	gpointer ostate, opart;
+	int state;
+	
+	if (g_hash_table_lookup_extended (asht, part, &opart, &ostate)) {
+		g_hash_table_remove (asht, part);
+		
+		state = GPOINTER_TO_INT (ostate);
+		
+		if (state & I_DISPLAYED)
+			state &= ~I_DISPLAYED;
+		else
+			state |= I_DISPLAYED;
+	} else {
+		state = I_VALID | I_DISPLAYED;
+	}
+	
+	g_hash_table_insert (asht, part, GINT_TO_POINTER (state));
+}
+
+static void
+mail_part_set_default_displayed_inline (CamelMimePart *part, MailDisplay *md,
+					gboolean displayed)
+{
+	GHashTable *asht = g_datalist_get_data (md->data, "attachment_states");
+	int state;
+	
+	if (g_hash_table_lookup (asht, part))
+		return;
+	
+	state = I_VALID | (displayed ? I_DISPLAYED : 0);
+	g_hash_table_insert (asht, part, GINT_TO_POINTER (state));
+}
+
+static void
+attachment_header (CamelMimePart *part, const char *mime_type, MailDisplay *md,
+		   MailDisplayStream *stream)
+{
+	char *htmlinfo;
+	const char *info;
+	
+	/* Start the table, create the pop-up object. */
+	camel_stream_write_string ((CamelStream *) stream, "<table cellspacing=0 cellpadding=0><tr><td>"
+				   "<table width=10 cellspacing=0 cellpadding=0>"
+				   "<tr><td></td></tr></table></td>");
+	
+	if (!md->printing) {
+		camel_stream_printf ((CamelStream *) stream, "<td><object classid=\"popup:%s\""
+				     "type=\"%s\"></object></td>", get_cid (part, md), mime_type);
+	}
+	
+	camel_stream_write_string ((CamelStream *) stream, "<td><table width=3 cellspacing=0 cellpadding=0>"
+				  "<tr><td></td></tr></table></td><td><font size=-1>");
+	
+	/* Write the MIME type */
+	info = gnome_vfs_mime_get_description (mime_type);
+	htmlinfo = camel_text_to_html (info ? info : mime_type, 0, 0);
+	camel_stream_printf ((CamelStream *) stream, _("%s attachment"), htmlinfo);
+	g_free (htmlinfo);
+	
+	/* Write the name, if we have it. */
+	info = camel_mime_part_get_filename (part);
+	if (info) {
+		htmlinfo = camel_text_to_html (info, 0, 0);
+		camel_stream_printf ((CamelStream *) stream, " (%s)", htmlinfo);
+		g_free (htmlinfo);
+	}
+	
+	/* Write a description, if we have one. */
+	info = camel_mime_part_get_description (part);
+	if (info) {
+		htmlinfo = camel_text_to_html (info, md->printing ? 0 : CAMEL_MIME_FILTER_TOHTML_CONVERT_URLS, 0);
+		camel_stream_printf ((CamelStream *) stream, ", \"%s\"", htmlinfo);
+		g_free (htmlinfo);
+	}
+	
+	camel_stream_write_string ((CamelStream *) stream, "</font></td></tr><tr><td height=10>"
+				   "<table cellspacing=0 cellpadding=0><tr><td height=10>"
+				   "<a name=\"glue\"></td></tr></table></td></tr></table>\n");
+}
+
+static gboolean
+format_mime_part (CamelMimePart *part, MailDisplay *md,
+		  MailDisplayStream *stream)
+{
+	CamelDataWrapper *wrapper;
+	MailMimeHandler *handler;
+	gboolean output;
+	int inline_flags;
+	char *mime_type;
+	
+	/* Record URLs associated with this part */
+	get_cid (part, md);
+	get_location (part, md);
+	
+	wrapper = camel_medium_get_content_object (CAMEL_MEDIUM (part));
+	
+	if (CAMEL_IS_MULTIPART (wrapper) &&
+	    camel_multipart_get_number (CAMEL_MULTIPART (wrapper)) == 0) {
+		mail_error_printf (stream, "\n%s\n", _("Could not parse MIME message. Displaying as source."));
+		if (mail_content_loaded (wrapper, md, TRUE, NULL, md->html, NULL))
+			handle_text_plain (part, "text/plain", md, stream);
+		return TRUE;
+	}
+	
+	mime_type = camel_data_wrapper_get_mime_type (wrapper);
+	camel_strdown (mime_type);
+	
+	handler = mail_lookup_handler (mime_type);
+	if (!handler) {
+		char *id_type;
+		
+		/* Special case MIME types that we know that we can't
+		 * display but are some kind of plain text to prevent
+		 * evil infinite recursion.
+		 */
+		
+		if (!strcmp (mime_type, "application/mac-binhex40")) {
+			handler = NULL;
+		} else if (!strcmp (mime_type, "application/octet-stream")) {
+			/* only sniff application/octet-stream parts */
+			id_type = mail_identify_mime_part (part, md);
+			if (id_type) {
+				g_free (mime_type);
+				mime_type = id_type;
+				handler = mail_lookup_handler (id_type);
+			}
+		}
+	}
+	
+	inline_flags = get_inline_flags (part, md);
+	
+	/* No header for anonymous inline parts. */
+	if (!((inline_flags & I_ACTUALLY) && is_anonymous (part, mime_type)))
+		attachment_header (part, mime_type, md, stream);
+	
+	if (handler && handler->builtin && inline_flags & I_DISPLAYED &&
+	    mail_content_loaded (wrapper, md, TRUE, NULL, md->html, NULL))
+		output = (*handler->builtin) (part, mime_type, md, stream);
+	else
+		output = TRUE;
+	
+	g_free (mime_type);
+	return output;
+}
+
+/* flags for write_field_to_stream */
+enum {
+	WRITE_BOLD=1,
+	WRITE_NOCOLUMNS=2,
+};
+
+static void
+write_field_row_begin (MailDisplayStream *stream, const char *name, int flags)
+{
+	gboolean bold = (flags & WRITE_BOLD);
+	gboolean nocolumns = (flags & WRITE_NOCOLUMNS);
+	
+	if (nocolumns) {
+		camel_stream_printf ((CamelStream *) stream, "<tr><td>%s%s:%s ",
+				     bold ? "<b>" : "", name, bold ? "</b>" : "");
+	} else {
+		camel_stream_printf ((CamelStream *) stream,
+				     "<tr><%s align=\"right\" valign=\"top\">%s:"
+				     "<b>&nbsp;</%s><td>", bold ? "th" : "td",
+				     name, bold ? "th" : "td");
+	}
+}
+
+static void
+write_date (MailDisplayStream *stream, CamelMimeMessage *message, int flags)
+{
+	const char *datestr;
+	
+	datestr = camel_medium_get_header (CAMEL_MEDIUM (message), "Date");
+	
+	if (datestr) {
+		int msg_offset;
+		time_t msg_date;
+		struct tm local;
+		int local_tz;
+
+		msg_date = header_decode_date(datestr, &msg_offset);
+		e_localtime_with_offset(msg_date, &local, &local_tz);
+
+		write_field_row_begin(stream, _("Date"), flags);
+		camel_stream_printf((CamelStream *)stream, "%s", datestr);
+
+		/* Convert message offset to minutes (e.g. -0400 --> -240) */
+		msg_offset = ((msg_offset / 100) * 60) + (msg_offset % 100);
+		/* Turn into offset from localtime, not UTC */
+		msg_offset -= local_tz / 60;
+
+		if (msg_offset) {
+			/* Message timezone different from local. Show both */
+			char buf[30];
+
+			msg_offset += (local.tm_hour * 60) + local.tm_min;
+
+			if (msg_offset >= (24 * 60) || msg_offset < 0) {
+				/* Timezone conversion crossed midnight. Show day */
+				/* translators: strftime format for local time equivalent in Date header display */
+				e_utf8_strftime(buf, 29, _("<I> (%a, %R %Z)</I>"), &local);
+			} else {
+				e_utf8_strftime(buf, 29, _("<I> (%R %Z)</I>"), &local);
+			}
+
+			/* I doubt any locales put '%' in time representation
+			   but just in case... */
+			camel_stream_printf((CamelStream *)stream,  "%s", buf);
+		}
+					     
+		camel_stream_printf ((CamelStream *) stream, "</td> </tr>");
+	}
+}
+
+static void
+write_text_header (MailDisplayStream *stream, const char *name, const char *value, int flags)
+{
+	char *encoded;
+	
+	if (value && *value)
+		encoded = camel_text_to_html (value, CAMEL_MIME_FILTER_TOHTML_CONVERT_NL |
+					      CAMEL_MIME_FILTER_TOHTML_CONVERT_SPACES |
+					      CAMEL_MIME_FILTER_TOHTML_CONVERT_URLS, 0);
+	else
+		encoded = "";
+	
+	write_field_row_begin (stream, name, flags);
+	
+	camel_stream_printf ((CamelStream *) stream, "%s</td></tr>", encoded);
+	
+	if (value && *value)
+		g_free (encoded);
+}
+
+static void
+write_address (MailDisplay *md, MailDisplayStream *stream,
+	       const CamelInternetAddress *addr, const char *field_name, int flags)
+{
+	const char *name, *email;
+	int i;
+	
+	if (addr == NULL || !camel_internet_address_get (addr, 0, NULL, NULL))
+		return;
+	
+	write_field_row_begin (stream, field_name, flags);
+	
+	i = 0;
+	while (camel_internet_address_get (addr, i, &name, &email)) {
+		CamelInternetAddress *subaddr;
+		char *addr_txt, *addr_url;
+		gboolean have_name = name && *name;
+		gboolean have_email = email && *email;
+		char *name_disp = NULL;
+		char *email_disp = NULL;
+		
+		subaddr = camel_internet_address_new ();
+		camel_internet_address_add (subaddr, name, email);
+		addr_txt = camel_address_format (CAMEL_ADDRESS (subaddr));
+		addr_url = camel_url_encode (addr_txt, NULL);
+		camel_object_unref (subaddr);
+		
+		if (have_name) {
+			name_disp = camel_text_to_html (name, 0, 0);
+		}
+		
+		if (have_email) {
+			email_disp = camel_text_to_html (email, 0, 0);
+		}
+		
+		if (i)
+			camel_stream_write_string ((CamelStream *) stream, ", ");
+		
+		if (have_email || have_name) {
+			if (!have_email)
+				email_disp = g_strdup ("???");
+			
+			if (have_name) {
+				if (md->printing) {
+					camel_stream_printf ((CamelStream *) stream,
+							     "%s &lt;%s&gt;", name_disp, email_disp);
+				} else {
+					camel_stream_printf ((CamelStream *) stream,
+							     "%s &lt;<a href=\"mailto:%s\">%s</a>&gt;",
+							     name_disp, addr_url, email_disp);
+				}
+			} else {
+				if (md->printing) {
+					camel_stream_write_string ((CamelStream *) stream, email_disp);
+				} else {
+					camel_stream_printf ((CamelStream *) stream,
+							     "<a href=\"mailto:%s\">%s</a>",
+							     addr_url, email_disp);
+				}
+			}
+		} else {
+			camel_stream_printf ((CamelStream *) stream, "<i>%s</i>", _("Bad Address"));
+		}
+		
+		g_free (name_disp);
+		g_free (email_disp);
+		g_free (addr_txt);
+		g_free (addr_url);
+		
+		i++;
+	}
+	
+	camel_stream_write_string ((CamelStream *) stream, "</td></tr>");
+}
+
+/* order of these must match write_header code */
+static char *default_headers[] = {
+	"From", "Reply-To", "To", "Cc", "Bcc", "Subject", "Date",
+};
+
+/* return index of header in default_headers array */
+static int
+default_header_index (const char *name)
+{
+	int i;
+	
+	for (i = 0; i < sizeof (default_headers) / sizeof (default_headers[0]); i++)
+		if (!strcasecmp (name, default_headers[i]))
+			return i;
+	
+	return -1;
+}
+
+/* index is index of header in default_headers array */
+static void
+write_default_header (CamelMimeMessage *message, MailDisplay *md, 
+		      MailDisplayStream *stream,
+		      int index, int flags)
+{
+	switch (index) {
+	case 0:
+		write_address (md, stream,
+			       camel_mime_message_get_from (message), _("From"), flags | WRITE_BOLD);
+		break;
+	case 1:
+		write_address (md, stream, 
+			       camel_mime_message_get_reply_to (message), _("Reply-To"), flags | WRITE_BOLD);
+		break;
+	case 2:
+		write_address (md, stream,
+			       camel_mime_message_get_recipients (message, CAMEL_RECIPIENT_TYPE_TO),
+			      _("To"), flags | WRITE_BOLD);
+		break;
+	case 3:
+		write_address (md, stream,
+			       camel_mime_message_get_recipients (message, CAMEL_RECIPIENT_TYPE_CC),
+			       _("Cc"), flags | WRITE_BOLD);
+		break;
+	case 4:
+		write_address (md, stream,
+			       camel_mime_message_get_recipients (message, CAMEL_RECIPIENT_TYPE_BCC),
+			       _("Bcc"), flags | WRITE_BOLD);
+		break;
+	case 5:
+		write_text_header (stream, _("Subject"), camel_mime_message_get_subject (message),
+				   flags | WRITE_BOLD);
+		break;
+	case 6:
+		write_date (stream, message, flags | WRITE_BOLD);
+		break;
+	default:
+		g_assert_not_reached ();
+	}
+}
+
+static gboolean
+write_xmailer_header (CamelMimeMessage *message, MailDisplay *md,
+		      MailDisplayStream *stream, int xmask)
+{
+	const char *xmailer, *evolution;
+	
+	xmailer = camel_medium_get_header (CAMEL_MEDIUM (message), "X-Mailer");
+	if (!xmailer) {
+		xmailer = camel_medium_get_header (CAMEL_MEDIUM (message), "User-Agent");
+		if (!xmailer)
+			return FALSE;
+	}
+	while (isspace ((unsigned char)*xmailer))
+		xmailer++;
+	
+	evolution = strstr (xmailer, "Evolution");
+	if ((xmask & MAIL_CONFIG_XMAILER_OTHER) ||
+	    (evolution && (xmask & MAIL_CONFIG_XMAILER_EVO)))
+		write_text_header (stream, _("Mailer"), xmailer, WRITE_BOLD);
+	
+	return evolution != NULL && (xmask & MAIL_CONFIG_XMAILER_RUPERT_APPROVED);
+}
+
+#define COLOR_IS_LIGHT(r, g, b)  ((r + g + b) > (128 * 3))
+
+static void
+write_headers (MailDisplayStream *stream, MailDisplay *md, CamelMimeMessage *message)
+{
+	gboolean full = (md->display_style == MAIL_CONFIG_DISPLAY_FULL_HEADERS);
+	char bgcolor[7], fontcolor[7];
+	GtkStyle *style = NULL;
+	gboolean evo_icon = FALSE;
+	GConfClient *gconf;
+	int xmask, i;
+	
+	gconf = mail_config_get_gconf_client ();
+	xmask = gconf_client_get_int (gconf, "/apps/evolution/mail/display/xmailer_mask", NULL);
+	
+	/* My favorite thing to do... muck around with colors so we respect people's stupid themes.
+	   However, we only do this if we are rendering to the screen -- we ignore the theme
+	   when we are printing. */
+	style = gtk_widget_get_style (GTK_WIDGET (md->html));
+	if (style && !md->printing) {
+		int state = GTK_WIDGET_STATE (GTK_WIDGET (md->html));
+		gushort r, g, b;
+		
+		r = style->base[state].red / 256;
+		g = style->base[state].green / 256;
+		b = style->base[state].blue / 256;
+		
+		if (COLOR_IS_LIGHT (r, g, b)) {
+			r *= 0.92;
+			g *= 0.92;
+			b *= 0.92;
+		} else {
+			r = 255 - (0.92 * (255 - r));
+			g = 255 - (0.92 * (255 - g));
+			b = 255 - (0.92 * (255 - b));
+		}
+		
+		sprintf (bgcolor, "%.2X%.2X%.2X", r, g, b);
+		
+		r = style->text[state].red / 256;
+		g = style->text[state].green / 256;
+		b = style->text[state].blue / 256;
+		
+		sprintf (fontcolor, "%.2X%.2X%.2X", r, g, b);
+	} else {
+		strcpy (bgcolor, "EEEEEE");
+		strcpy (fontcolor, "000000");
+	}
+	
+	camel_stream_write_string ((CamelStream *) stream,
+				   "<table width=\"100%\" cellpadding=0 cellspacing=0>");
+	
+	/* Top margin */
+	camel_stream_write_string ((CamelStream *) stream, "<tr><td colspan=3 height=10>"
+				   "<table cellpadding=0 cellspacing=0><tr><td height=10>"
+				   "<a name=\"glue\"></td></tr></table></td></tr>");
+	
+	/* Left margin */
+	camel_stream_write_string ((CamelStream *) stream, "<tr><td><table width=10 "
+				   "cellpadding=0 cellspacing=0><tr><td></td></tr></table></td>");
+	
+	/* Black border */
+	camel_stream_write_string ((CamelStream *) stream, "<td width=\"100%\"><table bgcolor=\"#000000\" "
+				   "width=\"100%\" cellspacing=0 cellpadding=1>");
+	
+	/* Main header box */
+	camel_stream_printf ((CamelStream *) stream, "<tr><td><table bgcolor=\"#%s\" width=\"100%%\" "
+			     "cellpadding=0 cellspacing=0>"
+			     /* Internal header table */
+			     "<tr valign=top><td><table><font color=\"#%s\">\n",
+			     bgcolor, fontcolor);
+	
+	if (full) {
+		struct _header_raw *header;
+		const char *charset;
+		CamelContentType *ct;
+		char *value;
+		
+		ct = camel_mime_part_get_content_type (CAMEL_MIME_PART (message));
+		charset = header_content_type_param (ct, "charset");
+		charset = e_iconv_charset_name (charset);
+		
+		header = CAMEL_MIME_PART (message)->headers;
+		while (header) {
+			i = default_header_index (header->name);
+			if (i == -1) {
+				value = header_decode_string (header->value, charset);
+				write_text_header (stream, header->name, value, WRITE_NOCOLUMNS);
+				g_free (value);
+			} else
+				write_default_header (message, md, stream, i, WRITE_NOCOLUMNS);
+			header = header->next;
+		}
+	} else {
+		for (i = 0; i < sizeof (default_headers) / sizeof (default_headers[0]); i++)
+			write_default_header (message, md, stream, i, 0);
+		if (xmask != MAIL_CONFIG_XMAILER_NONE)
+			evo_icon = write_xmailer_header (message, md, stream, xmask);
+	}
+	
+	/* Close off the internal header table */
+	camel_stream_write_string ((CamelStream *) stream, "</font></table></td>");
+	
+	if (!md->printing && evo_icon) {
+		camel_stream_printf ((CamelStream *) stream, "<td align=right><table><tr><td width=16>"
+				     "<img src=\"%s\"></td></tr></table></td>",
+				     mail_display_get_url_for_icon (md, EVOLUTION_ICONSDIR "/monkey-16.png"));
+	}
+	
+	camel_stream_write_string ((CamelStream *) stream,
+				   /* Main header box */
+				   "</tr></table>"
+				   /* Black border */
+				   "</td></tr></table></td>"
+				   /* Right margin */
+				   "<td><table width=10 cellpadding=0 cellspacing=0>"
+				   "<tr><td></td></tr></table></td>"
+				   "</tr></table>\n");
+}
+
+static void
+load_offline_content (MailDisplay *md, gpointer data)
+{
+	CamelDataWrapper *wrapper = data;
+	CamelStream *stream;
+	
+	stream = camel_stream_null_new ();
+	camel_data_wrapper_write_to_stream (wrapper, stream);
+	camel_object_unref (stream);
+	camel_object_unref (wrapper);
+}
+
+gboolean
+mail_content_loaded (CamelDataWrapper *wrapper, MailDisplay *md, gboolean redisplay, const char *url,
+		     GtkHTML *html, GtkHTMLStream *stream)
+{
+	if (!camel_data_wrapper_is_offline (wrapper))
+		return TRUE;
+	
+	camel_object_ref (wrapper);
+	if (redisplay) {
+		mail_display_redisplay_when_loaded (md, wrapper, load_offline_content,
+						    html, wrapper);
+	} else {
+		mail_display_stream_write_when_loaded (md, wrapper, url, load_offline_content,
+						       html, stream, wrapper);
+	}
+	
+	return FALSE;
+}
+
+
+ssize_t
+mail_format_data_wrapper_write_to_stream (CamelDataWrapper *wrapper, gboolean decode, MailDisplay *mail_display, CamelStream *stream)
+{
+	CamelStreamFilter *filter_stream;
+	CamelMimeFilterCharset *filter;
+	CamelContentType *content_type;
+	GConfClient *gconf;
+	ssize_t nwritten;
+	char *charset;
+	
+	gconf = mail_config_get_gconf_client ();
+	
+	content_type = camel_data_wrapper_get_mime_type_field (wrapper);
+	
+	/* find out the charset the user wants to override to */
+	if (mail_display && mail_display->charset) {
+		/* user override charset */
+		charset = g_strdup (mail_display->charset);
+	} else if (content_type && (charset = (char *) header_content_type_param (content_type, "charset"))) {
+		/* try to use the charset declared in the Content-Type header */
+		if (!strncasecmp (charset, "iso-8859-", 9)) {
+			/* Since a few Windows mailers like to claim they sent
+			 * out iso-8859-# encoded text when they really sent
+			 * out windows-cp125#, do some simple sanity checking
+			 * before we move on... */
+			CamelMimeFilterWindows *windows;
+			CamelStream *null;
+			
+			null = camel_stream_null_new ();
+			filter_stream = camel_stream_filter_new_with_stream (null);
+			camel_object_unref (null);
+			
+			windows = (CamelMimeFilterWindows *) camel_mime_filter_windows_new (charset);
+			camel_stream_filter_add (filter_stream, (CamelMimeFilter *) windows);
+			
+			if (decode)
+				camel_data_wrapper_decode_to_stream (wrapper, (CamelStream *) filter_stream);
+			else
+				camel_data_wrapper_write_to_stream (wrapper, (CamelStream *) filter_stream);
+			camel_stream_flush ((CamelStream *) filter_stream);
+			camel_object_unref (filter_stream);
+			
+			charset = g_strdup (camel_mime_filter_windows_real_charset (windows));
+			camel_object_unref (windows);
+		} else {
+			charset = g_strdup (charset);
+		}
+	} else {
+		/* default to user's locale charset? */
+		charset = gconf_client_get_string (gconf, "/apps/evolution/mail/format/charset", NULL);
+	}
+	
+	filter_stream = camel_stream_filter_new_with_stream (stream);
+	
+	if ((filter = camel_mime_filter_charset_new_convert (charset, "UTF-8"))) {
+		camel_stream_filter_add (filter_stream, (CamelMimeFilter *) filter);
+		camel_object_unref (filter);
+	}
+	
+	g_free (charset);
+	
+	if (decode)
+		nwritten = camel_data_wrapper_decode_to_stream (wrapper, (CamelStream *) filter_stream);
+	else
+		nwritten = camel_data_wrapper_write_to_stream (wrapper, (CamelStream *) filter_stream);
+	camel_stream_flush ((CamelStream *) filter_stream);
+	camel_object_unref (filter_stream);
+	
+	return nwritten;
+}
+
+/* Return the contents of a data wrapper, or %NULL if it contains only
+ * whitespace.
+ */
+GByteArray *
+mail_format_get_data_wrapper_text (CamelDataWrapper *wrapper, MailDisplay *mail_display)
+{
+	CamelStream *memstream;
+	GByteArray *ba;
+	char *text, *end;
+	
+	memstream = camel_stream_mem_new ();
+	ba = g_byte_array_new ();
+	camel_stream_mem_set_byte_array (CAMEL_STREAM_MEM (memstream), ba);
+	
+	mail_format_data_wrapper_write_to_stream (wrapper, TRUE, mail_display, memstream);
+	camel_object_unref (memstream);
+	
+	for (text = ba->data, end = text + ba->len; text < end; text++) {
+		if (!isspace ((unsigned char) *text))
+			break;
+	}
+	
+	if (text >= end) {
+		g_byte_array_free (ba, TRUE);
+		return NULL;
+	}
+	
+	return ba;
+}
+
+static void
+write_hr (MailDisplayStream *stream)
+{
+	camel_stream_write_string ((CamelStream *) stream, STANDARD_ISSUE_TABLE_OPEN
+				   "<tr><td width=\"100%\"><hr noshadow size=1>"
+				   "</td></tr></table>\n");
+}
+
+/*----------------------------------------------------------------------*
+ *                     Mime handling functions
+ *----------------------------------------------------------------------*/
+
+static gboolean
+handle_text_plain (CamelMimePart *part, const char *mime_type,
+		   MailDisplay *md, MailDisplayStream *stream)
+{
+	CamelStreamFilter *filtered_stream;
+	CamelMimeFilter *html_filter;
+	CamelDataWrapper *wrapper;
+	CamelContentType *type;
+	const char *format;
+	GConfClient *gconf;
+	guint32 flags, rgb = 0;
+	GdkColor colour;
+	char *buf;
+	
+	gconf = mail_config_get_gconf_client ();
+	
+	flags = CAMEL_MIME_FILTER_TOHTML_CONVERT_NL | CAMEL_MIME_FILTER_TOHTML_CONVERT_SPACES;
+	if (!md->printing) {
+		flags |= CAMEL_MIME_FILTER_TOHTML_CONVERT_URLS | CAMEL_MIME_FILTER_TOHTML_CONVERT_ADDRESSES;
+		if (gconf_client_get_bool (gconf, "/apps/evolution/mail/display/mark_citations", NULL)) {
+			flags |= CAMEL_MIME_FILTER_TOHTML_MARK_CITATION;
+			
+			buf = gconf_client_get_string (gconf, "/apps/evolution/mail/display/citation_colour", NULL);
+			gdk_color_parse (buf ? buf : "#737373", &colour);
+			g_free (buf);
+			
+			rgb = ((colour.red & 0xff00) << 8) | (colour.green & 0xff00) | ((colour.blue & 0xff00) >> 8);
+		}
+	}
+	
+	/* Check for RFC 2646 flowed text. */
+	type = camel_mime_part_get_content_type (part);
+	if (header_content_type_is (type, "text", "plain")) {
+		format = header_content_type_param (type, "format");
+		
+		if (format && !strcasecmp (format, "flowed"))
+			flags |= CAMEL_MIME_FILTER_TOHTML_FORMAT_FLOWED;
+	}
+	
+	html_filter = camel_mime_filter_tohtml_new (flags, rgb);
+	filtered_stream = camel_stream_filter_new_with_stream ((CamelStream *) stream);
+	camel_stream_filter_add (filtered_stream, html_filter);
+	camel_object_unref (html_filter);
+	
+	camel_stream_write_string ((CamelStream *) stream, STANDARD_ISSUE_TABLE_OPEN "<tr><td><tt>\n");
+	
+	wrapper = camel_medium_get_content_object (CAMEL_MEDIUM (part));
+	mail_format_data_wrapper_write_to_stream (wrapper, TRUE, md, (CamelStream *) filtered_stream);
+	
+	camel_stream_write_string ((CamelStream *) stream, "</tt></td></tr></table>\n");
+	
+	camel_object_unref (filtered_stream);
+	
+	return TRUE;
+}
+
+/* text/enriched (RFC 1896) or text/richtext (included in RFC 1341) */
+static gboolean
+handle_text_enriched (CamelMimePart *part, const char *mime_type,
+		      MailDisplay *md, MailDisplayStream *stream)
+{
+	CamelStreamFilter *filtered_stream;
+	CamelMimeFilter *enriched;
+	CamelDataWrapper *wrapper;
+	guint32 flags = 0;
+	
+	wrapper = camel_medium_get_content_object (CAMEL_MEDIUM (part));
+	
+	if (!strcasecmp (mime_type, "text/richtext")) {
+		flags = CAMEL_MIME_FILTER_ENRICHED_IS_RICHTEXT;
+		camel_stream_write_string ((CamelStream *) stream, "\n<!-- text/richtext -->\n");
+	} else {
+		camel_stream_write_string ((CamelStream *) stream, "\n<!-- text/enriched -->\n");
+	}
+	
+	enriched = camel_mime_filter_enriched_new (flags);
+	filtered_stream = camel_stream_filter_new_with_stream ((CamelStream *) stream);
+	camel_stream_filter_add (filtered_stream, enriched);
+	camel_object_unref (enriched);
+	
+	camel_stream_write_string ((CamelStream *) stream, STANDARD_ISSUE_TABLE_OPEN "<tr><td><tt>\n");	
+	wrapper = camel_medium_get_content_object (CAMEL_MEDIUM (part));
+	mail_format_data_wrapper_write_to_stream (wrapper, TRUE, md, (CamelStream *) filtered_stream);
+	
+	camel_stream_write_string ((CamelStream *) stream, "</tt></td></tr></table>\n");
+	camel_object_unref (filtered_stream);
+	
+	return TRUE;
+}
+
+static gboolean
+handle_text_html (CamelMimePart *part, const char *mime_type,
+		  MailDisplay *md, MailDisplayStream *stream)
+{
+	const char *location, *base;
+	
+	camel_stream_write_string ((CamelStream *) stream, "\n<!-- text/html -->\n");
+	
+	if ((base = camel_medium_get_header (CAMEL_MEDIUM (part), "Content-Base"))) {
+		char *base_url;
+		size_t len;
+		
+		len = strlen (base);
+		
+		if (*base == '"' && *(base + len - 1) == '"') {
+			len -= 2;
+			base_url = g_alloca (len + 1);
+			memcpy (base_url, base + 1, len);
+			base_url[len] = '\0';
+			base = base_url;
+		}
+		
+		gtk_html_set_base (md->html, base);
+	}
+	
+	location = get_location (part, md);
+	if (!location)
+		location = get_cid (part, md);
+	
+	camel_stream_printf ((CamelStream *) stream, "<iframe src=\"%s\" frameborder=0 "
+			     "scrolling=no>could not get %s</iframe>", location, location);
+	
+	return TRUE;
+}
+
+static gboolean
+handle_image (CamelMimePart *part, const char *mime_type, MailDisplay *md, MailDisplayStream *stream)
+{
+	camel_stream_printf ((CamelStream *) stream, "<img hspace=10 vspace=10 src=\"%s\">",
+			     get_cid (part, md));
+	return TRUE;
+}
+
+static gboolean
+handle_multipart_mixed (CamelMimePart *part, const char *mime_type,
+			MailDisplay *md, MailDisplayStream *stream)
+{
+	CamelDataWrapper *wrapper =
+		camel_medium_get_content_object (CAMEL_MEDIUM (part));
+	CamelMultipart *mp;
+	int i, nparts;
+	gboolean output = FALSE;
+	
+	if (!CAMEL_IS_MULTIPART (wrapper)) {
+		mail_error_printf (stream, "\n%s\n", _("Could not parse MIME message. Displaying as source."));
+		if (mail_content_loaded (wrapper, md, TRUE, NULL, md->html, NULL))
+			handle_text_plain (part, "text/plain", md, stream);
+		return TRUE;
+	}
+	
+	mp = CAMEL_MULTIPART (wrapper);
+	
+	nparts = camel_multipart_get_number (mp);	
+	for (i = 0; i < nparts; i++) {
+		if (i != 0 && output)
+			write_hr (stream);
+		
+		part = camel_multipart_get_part (mp, i);
+		
+		output = format_mime_part (part, md, stream);
+	}
+	
+	return TRUE;
+}
+
+static gboolean
+handle_multipart_encrypted (CamelMimePart *part, const char *mime_type,
+			    MailDisplay *md, MailDisplayStream *stream)
+{
+	CamelMultipartEncrypted *mpe;
+	CamelMimePart *mime_part;
+	CamelCipherContext *cipher;
+	CamelDataWrapper *wrapper;
+	const char *protocol;
+	CamelException ex;
+	gboolean handled;
+	
+	/* Currently we only handle RFC2015-style PGP encryption. */
+	protocol = header_content_type_param (((CamelDataWrapper *) part)->mime_type, "protocol");
+	if (!protocol || strcmp (protocol, "application/pgp-encrypted") != 0)
+		return handle_multipart_mixed (part, mime_type, md, stream);
+	
+	wrapper = camel_medium_get_content_object (CAMEL_MEDIUM (part));
+	
+	mpe = CAMEL_MULTIPART_ENCRYPTED (wrapper);
+	
+	camel_exception_init (&ex);
+	cipher = camel_gpg_context_new (session);
+	mime_part = camel_multipart_encrypted_decrypt (mpe, cipher, &ex);
+	camel_object_unref (cipher);
+	
+	if (camel_exception_is_set (&ex)) {
+		mail_error_printf (stream, "\n%s\n", camel_exception_get_description (&ex));
+		camel_exception_clear (&ex);
+		return TRUE;
+	}
+	
+	handled = format_mime_part (mime_part, md, stream);
+	camel_object_unref (mime_part);
+	
+	return handled;
+}
+
+static gboolean
+handle_multipart_signed (CamelMimePart *part, const char *mime_type,
+			 MailDisplay *md, MailDisplayStream *stream)
+{
+	CamelMimePart *subpart;
+	CamelDataWrapper *wrapper;
+	CamelMultipartSigned *mps;
+	gboolean output = FALSE;
+	
+	wrapper = camel_medium_get_content_object (CAMEL_MEDIUM (part));
+	
+	if (!CAMEL_IS_MULTIPART_SIGNED (wrapper)) {
+		mail_error_printf (stream, "\n%s\n", _("Could not parse MIME message. Displaying as source."));
+		if (mail_content_loaded (wrapper, md, TRUE, NULL, md->html, NULL))
+			handle_text_plain (part, "text/plain", md, stream);
+		return TRUE;
+	}
+	
+	mps = CAMEL_MULTIPART_SIGNED (wrapper);
+	
+	/* if subpart & signature is null, what do we do?  just write it out raw?
+	   multipart_signed will, if it cannot parse properly, put everything in the first part
+	   this includes: more or less than 2 parts */
+	
+	/* output the content */
+	subpart = camel_multipart_get_part ((CamelMultipart *) mps, CAMEL_MULTIPART_SIGNED_CONTENT);
+	if (subpart == NULL)
+		return FALSE;
+	
+	output = format_mime_part (subpart, md, stream);
+	
+	/* now handle the signature */
+	subpart = camel_multipart_get_part ((CamelMultipart *) mps, CAMEL_MULTIPART_SIGNED_SIGNATURE);
+	if (subpart == NULL)
+		return FALSE;
+	
+	mail_part_set_default_displayed_inline (subpart, md, FALSE);
+	
+	if (!mail_part_is_displayed_inline (subpart, md) && !md->printing) {
+		char *url;
+		
+		/* Write out the click-for-info object */
+		url = g_strdup_printf ("signature:%p/%lu", subpart,
+				       (unsigned long)time (NULL));
+		camel_stream_printf ((CamelStream *) stream,
+				     "<br><table cellspacing=0 cellpadding=0>"
+				     "<tr><td><table width=10 cellspacing=0 cellpadding=0>"
+				     "<tr><td></td></tr></table></td>"
+				     "<td><object classid=\"%s\"></object></td>"
+				     "<td><table width=3 cellspacing=0 cellpadding=0>"
+				     "<tr><td></td></tr></table></td>"
+				     "<td><font size=-1>", url);
+		mail_display_add_url (md, "part_urls", url, subpart);
+		
+		camel_stream_write_string ((CamelStream *) stream,
+					   _("This message is digitally signed. "
+					     "Click the lock icon for more information."));
+		
+		camel_stream_write_string ((CamelStream *) stream, "</font></td></tr><tr><td height=10>"
+					   "<table cellspacing=0 cellpadding=0><tr>"
+					   "<td height=10><a name=\"glue\"></td></tr>"
+					   "</table></td></tr></table>\n");
+	} else {
+		CamelCipherValidity *valid = NULL;
+		CamelException ex;
+		const char *message = NULL;
+		gboolean good = FALSE;
+		CamelCipherContext *cipher;
+		
+		/* Write out the verification results */
+		/* TODO: use the right context for the right message ... */
+		camel_exception_init (&ex);
+		cipher = camel_gpg_context_new (session);
+		if (cipher) {
+			valid = camel_multipart_signed_verify (mps, cipher, &ex);
+			camel_object_unref (cipher);
+			if (valid) {
+				good = camel_cipher_validity_get_valid (valid);
+				message = camel_cipher_validity_get_description (valid);
+			} else {
+				message = camel_exception_get_description (&ex);
+			}
+		} else {
+			message = _("Could not create a PGP verfication context");
+		}
+		
+		if (good) {
+			camel_stream_printf ((CamelStream *) stream, "<table><tr valign=top><td>"
+					     "<img src=\"%s\"></td><td>%s<br><br>",
+					     mail_display_get_url_for_icon (md, EVOLUTION_ICONSDIR
+									    "/pgp-signature-ok.png"),
+					     _("This message is digitally signed and "
+					       "has been found to be authentic."));
+		} else {
+			camel_stream_printf ((CamelStream *) stream, "<table><tr valign=top><td>"
+					     "<img src=\"%s\"></td><td>%s<br><br>",
+					     mail_display_get_url_for_icon (md, EVOLUTION_ICONSDIR
+									    "/pgp-signature-bad.png"),
+					     _("This message is digitally signed but can "
+					       "not be proven to be authentic."));
+		}
+		
+		if (message) {
+			camel_stream_printf ((CamelStream *) stream, "<font size=-1%s>", good ||
+					     md->printing ? "" : " color=red");
+			mail_text_write (stream, md, part, 0, md->printing, message);
+			camel_stream_write_string ((CamelStream *) stream, "</font>");
+		}
+		
+		camel_stream_write_string ((CamelStream *) stream, "</td></tr></table>");
+		camel_exception_clear (&ex);
+		camel_cipher_validity_free (valid);
+	}
+	
+	return TRUE;
+}
+
+/* As seen in RFC 2387! */
+static gboolean
+handle_multipart_related (CamelMimePart *part, const char *mime_type,
+			  MailDisplay *md, MailDisplayStream *stream)
+{
+	CamelDataWrapper *wrapper = camel_medium_get_content_object (CAMEL_MEDIUM (part));
+	CamelMultipart *mp;
+	CamelMimePart *body_part, *display_part = NULL;
+	CamelContentType *content_type;
+	const char *location, *start;
+	int i, nparts;
+	GHashTable *related_save;
+	int ret;
+	
+	if (!CAMEL_IS_MULTIPART (wrapper)) {
+		mail_error_printf (stream, "\n%s\n", _("Could not parse MIME message. Displaying as source."));
+		if (mail_content_loaded (wrapper, md, TRUE, NULL, md->html, NULL))
+			handle_text_plain (part, "text/plain", md, stream);
+		return TRUE;
+	}
+	
+	mp = CAMEL_MULTIPART (wrapper);
+	nparts = camel_multipart_get_number (mp);	
+	
+	content_type = camel_mime_part_get_content_type (part);
+	start = header_content_type_param (content_type, "start");
+	if (start) {
+		int len;
+		
+		/* The "start" parameter includes <>s, which Content-Id
+		 * does not.
+		 */
+		len = strlen (start) - 2;
+		
+		for (i = 0; i < nparts; i++) {
+			const char *cid;
+			
+			body_part = camel_multipart_get_part (mp, i);
+			cid = camel_mime_part_get_content_id (body_part);
+			
+			if (cid && !strncmp (cid, start + 1, len) && strlen (cid) == len) {
+				display_part = body_part;
+				break;
+			}
+		}
+	} else {
+		/* No start parameter, so it defaults to the first part. */
+		display_part = camel_multipart_get_part (mp, 0);
+	}
+	
+	if (!display_part) {
+		/* Oops. Hrmph. */
+		return handle_multipart_mixed (part, mime_type, md, stream);
+	}
+	
+	/* setup a 'stack' of related parts */
+	related_save = md->related;
+	md->related = g_hash_table_new(NULL, NULL);
+	
+	location = camel_mime_part_get_content_location (part);
+	if (location)
+		mail_display_push_content_location (md, location);
+	
+	/* Record the Content-ID/Content-Location of any non-displayed parts. */
+	for (i = 0; i < nparts; i++) {
+		body_part = camel_multipart_get_part (mp, i);
+		if (body_part == display_part)
+			continue;
+		
+		get_cid (body_part, md);
+		get_location (body_part, md);
+		g_hash_table_insert (md->related, body_part, body_part);
+	}
+	
+	/* Now, display the displayed part. */
+	ret = format_mime_part (display_part, md, stream);
+	
+	/* FIXME: flush html stream via gtkhtml_stream_flush which doens't exist yet ... */
+	while (gtk_events_pending ())
+		gtk_main_iteration ();
+	
+	/* Now check for related parts which didn't display, display them as attachments */
+	for (i = 0; i < nparts; i++) {
+		body_part = camel_multipart_get_part (mp, i);
+		if (body_part == display_part)
+			continue;
+		
+		if (g_hash_table_lookup (md->related, body_part)) {
+			if (ret)
+				write_hr (stream);
+			ret |= format_mime_part (body_part, md, stream);
+		}
+	}
+	
+	g_hash_table_destroy (md->related);
+	md->related = related_save;
+	
+	if (location)
+		mail_display_pop_content_location (md);
+	
+	return ret;
+}
+
+/* RFC 2046 says "display the last part that you are able to display". */
+static CamelMimePart *
+find_preferred_alternative (CamelMultipart *multipart, gboolean want_plain)
+{
+	int i, nparts;
+	CamelMimePart *preferred_part = NULL;
+	MailMimeHandler *handler;
+	
+	nparts = camel_multipart_get_number (multipart);
+	for (i = 0; i < nparts; i++) {
+		CamelMimePart *part = camel_multipart_get_part (multipart, i);
+		CamelContentType *type = camel_mime_part_get_content_type (part);
+		char *mime_type = header_content_type_simple (type);
+		
+		camel_strdown (mime_type);
+		if (want_plain && !strcmp (mime_type, "text/plain"))
+			return part;
+		handler = mail_lookup_handler (mime_type);
+		if (handler && (!preferred_part || !handler->generic))
+			preferred_part = part;
+		g_free (mime_type);
+	}
+	
+	return preferred_part;
+}
+
+static gboolean
+handle_multipart_alternative (CamelMimePart *part, const char *mime_type,
+			      MailDisplay *md, MailDisplayStream *stream)
+{
+	CamelDataWrapper *wrapper =
+		camel_medium_get_content_object (CAMEL_MEDIUM (part));
+	CamelMultipart *multipart;
+	CamelMimePart *mime_part;
+	
+	if (!CAMEL_IS_MULTIPART (wrapper)) {
+		mail_error_printf (stream, "\n%s\n", _("Could not parse MIME message. Displaying as source."));
+		if (mail_content_loaded (wrapper, md, TRUE, NULL, md->html, NULL))
+			handle_text_plain (part, "text/plain", md, stream);
+		return TRUE;
+	}
+	
+	multipart = CAMEL_MULTIPART (wrapper);
+	
+	mime_part = find_preferred_alternative (multipart, FALSE);
+	if (mime_part)
+		return format_mime_part (mime_part, md, stream);
+	else
+		return handle_multipart_mixed (part, mime_type, md, stream);
+}
+
+/* RFC 1740 */
+static gboolean
+handle_multipart_appledouble (CamelMimePart *part, const char *mime_type,
+			      MailDisplay *md, MailDisplayStream *stream)
+{
+	CamelDataWrapper *wrapper =
+		camel_medium_get_content_object (CAMEL_MEDIUM (part));
+	CamelMultipart *multipart;
+	
+	if (!CAMEL_IS_MULTIPART (wrapper)) {
+		mail_error_printf (stream, "\n%s\n", _("Could not parse MIME message. Displaying as source."));
+		if (mail_content_loaded (wrapper, md, TRUE, NULL, md->html, NULL))
+			handle_text_plain (part, "text/plain", md, stream);
+		return TRUE;
+	}
+	
+	multipart = CAMEL_MULTIPART (wrapper);
+	
+	/* The first part is application/applefile and is not useful
+	 * to us. The second part _may_ be displayable data. Most
+	 * likely it's application/octet-stream though.
+	 */
+	part = camel_multipart_get_part (multipart, 1);
+	return format_mime_part (part, md, stream);
+}
+
+static gboolean
+handle_message_rfc822 (CamelMimePart *part, const char *mime_type,
+		       MailDisplay *md, MailDisplayStream *stream)
+{
+	CamelDataWrapper *wrapper =
+		camel_medium_get_content_object (CAMEL_MEDIUM (part));
+	
+	g_return_val_if_fail (CAMEL_IS_MIME_MESSAGE (wrapper), FALSE);
+	
+	camel_stream_write_string ((CamelStream *) stream, "<blockquote>");
+	mail_format_mime_message (CAMEL_MIME_MESSAGE (wrapper), md, stream);
+	camel_stream_write_string ((CamelStream *) stream, "</blockquote>");
+	
+	return TRUE;
+}
+
+static gboolean
+handle_message_external_body (CamelMimePart *part, const char *mime_type,
+			      MailDisplay *md, MailDisplayStream *stream)
+{
+	CamelContentType *type;
+	const char *access_type;
+	char *url = NULL, *desc = NULL;
+	
+	type = camel_mime_part_get_content_type (part);
+	access_type = header_content_type_param (type, "access-type");
+	if (!access_type)
+		goto fallback;
+	
+	if (!strcasecmp (access_type, "ftp") ||
+	    !strcasecmp (access_type, "anon-ftp")) {
+		const char *name, *site, *dir, *mode, *ftype;
+		char *path;
+		
+		name = header_content_type_param (type, "name");
+		site = header_content_type_param (type, "site");
+		if (name == NULL || site == NULL)
+			goto fallback;
+		dir = header_content_type_param (type, "directory");
+		mode = header_content_type_param (type, "mode");
+		
+		/* Generate the path. */
+		if (dir) {
+			const char *p = dir + strlen (dir);
+			
+			path = g_strdup_printf ("%s%s%s%s",
+						*dir == '/' ? "" : "/",
+						dir,
+						*p == '/' ? "" : "/",
+						name);
+		} else {
+			path = g_strdup_printf ("%s%s",
+						*name == '/' ? "" : "/",
+						name);
+		}
+		
+		if (mode && *mode == 'A')
+			ftype = ";type=A";
+		else if (mode && *mode == 'I')
+			ftype = ";type=I";
+		else
+			ftype = "";
+		
+		url = g_strdup_printf ("ftp://%s%s%s", site, path, ftype);
+		g_free (path);
+		desc = g_strdup_printf (_("Pointer to FTP site (%s)"), url);
+	} else if (!g_ascii_strcasecmp (access_type, "local-file")) {
+		const char *name, *site;
+		
+		name = header_content_type_param (type, "name");
+		if (name == NULL)
+			goto fallback;
+		site = header_content_type_param (type, "site");
+		
+		url = g_strdup_printf ("file://%s%s", *name == '/' ? "" : "/", name);
+		if (site) {
+			desc = g_strdup_printf(_("Pointer to local file (%s) "
+						 "valid at site \"%s\""), name, site);
+		} else {
+			desc = g_strdup_printf(_("Pointer to local file (%s)"), name);
+		}
+	} else if (!strcasecmp (access_type, "URL")) {
+		const char *urlparam;
+		char *s, *d;
+		
+		/* RFC 2017 */
+		
+		urlparam = header_content_type_param (type, "url");
+		if (urlparam == NULL)
+			goto fallback;
+		
+		/* For obscure MIMEy reasons, the URL may be split into
+		 * multiple words, and needs to be rejoined. (The URL
+		 * must have any real whitespace %-encoded, so we just
+		 * get rid of all of it.
+		 */
+		url = g_strdup (urlparam);
+		s = d = url;
+		
+		while (*s) {
+			if (!isspace ((unsigned char)*s))
+				*d++ = *s;
+			s++;
+		}
+		*d = *s;
+		
+		desc = g_strdup_printf (_("Pointer to remote data (%s)"), url);
+	}
+	
+ fallback:
+	if (!desc) {
+		if (access_type)
+			desc = g_strdup_printf (_("Pointer to unknown external data (\"%s\" type)"), access_type);
+		else
+			desc = g_strdup (_("Malformed external-body part."));
+	}
+	
+#if 0 /* FIXME */
+	handle_mystery (part, md, url, "gnome-globe.png", desc,
+			url ? "open it in a browser" : NULL);
+#endif
+	
+	g_free (desc);
+	g_free (url);
+	
+	return TRUE;
+}
+
+static gboolean
+handle_via_bonobo (CamelMimePart *part, const char *mime_type,
+		   MailDisplay *md, MailDisplayStream *stream)
+{
+	if (!md->printing) {
+		camel_stream_printf ((CamelStream *) stream,
+				     "<object classid=\"%s\" type=\"%s\"></object>",
+				     get_cid (part, md), mime_type);
+	}
+	
+	return TRUE;
+}
+
+/**
+ * mail_get_message_rfc822:
+ * @message: the message
+ * @want_plain: whether the caller prefers plain to html
+ * @cite: whether or not to cite the message text
+ *
+ * See mail_get_message_body() below for more details.
+ *
+ * Return value: an HTML string representing the text parts of @message.
+ **/
+static char *
+mail_get_message_rfc822 (CamelMimeMessage *message, gboolean want_plain, gboolean cite)
+{
+	CamelDataWrapper *contents;
+	GString *retval;
+	const CamelInternetAddress *cia;
+	char *text, *citation, *buf, *html;
+	time_t date_val;
+	int offset;
+	
+	contents = camel_medium_get_content_object (CAMEL_MEDIUM (message));
+	text = mail_get_message_body (contents, want_plain, cite);
+	if (!text)
+		text = g_strdup ("");
+	citation = cite ? "&gt; " : "";
+	retval = g_string_new (NULL);
+	
+	/* Kludge: if text starts with "<PRE>", wrap it around the
+	 * headers too so we won't get a blank line between them for the
+	 * <P> to <PRE> switch.
+	 */
+	if (!strncasecmp (text, "<pre>", 5))
+		g_string_append_printf (retval, "<PRE>");
+	
+	/* create credits */
+	cia = camel_mime_message_get_from (message);
+	buf = camel_address_format (CAMEL_ADDRESS (cia));
+	if (buf) {
+		html = camel_text_to_html (buf, CAMEL_MIME_FILTER_TOHTML_CONVERT_NL, 0);
+		g_string_append_printf (retval, "%s<b>From:</b> %s<br>",
+					citation, html);
+		g_free (html);
+		g_free (buf);
+	}
+	
+	cia = camel_mime_message_get_recipients (message, CAMEL_RECIPIENT_TYPE_TO);
+	buf = camel_address_format (CAMEL_ADDRESS (cia));
+	if (buf) {
+		html = camel_text_to_html (buf, CAMEL_MIME_FILTER_TOHTML_CONVERT_NL, 0);
+		g_string_append_printf (retval, "%s<b>To:</b> %s<br>",
+					citation, html);
+		g_free (html);
+		g_free (buf);
+	}
+	
+	cia = camel_mime_message_get_recipients (message, CAMEL_RECIPIENT_TYPE_CC);
+	buf = camel_address_format (CAMEL_ADDRESS (cia));
+	if (buf) {
+		html = camel_text_to_html (buf, CAMEL_MIME_FILTER_TOHTML_CONVERT_NL, 0);
+		g_string_append_printf (retval, "%s<b>Cc:</b> %s<br>",
+					citation, html);
+		g_free (html);
+		g_free (buf);
+	}
+	
+	buf = (char *) camel_mime_message_get_subject (message);
+	if (buf) {
+		html = camel_text_to_html (buf, CAMEL_MIME_FILTER_TOHTML_CONVERT_NL |
+					   CAMEL_MIME_FILTER_TOHTML_CONVERT_URLS, 0);
+		g_string_append_printf (retval, "%s<b>Subject:</b> %s<br>",
+					citation, html);
+		g_free (html);
+	}
+	
+	date_val = camel_mime_message_get_date (message, &offset);
+	buf = header_format_date (date_val, offset);
+	html = camel_text_to_html (buf, CAMEL_MIME_FILTER_TOHTML_CONVERT_NL, 0);
+	g_string_append_printf (retval, "%s<b>Date:</b> %s<br>", citation, html);
+	g_free (html);
+	g_free (buf);
+	
+	if (!strncasecmp (text, "<pre>", 5))
+		g_string_append_printf (retval, "%s<br>%s", citation, text + 5);
+	else
+		g_string_append_printf (retval, "%s<br>%s", citation, text);
+	g_free (text);
+	
+	buf = retval->str;
+	g_string_free (retval, FALSE);
+	
+	return buf;
+}
+
+/**
+ * mail_get_message_body:
+ * @data: the message or mime part content
+ * @want_plain: whether the caller prefers plain to html
+ * @cite: whether or not to cite the message text
+ *
+ * This creates an HTML string representing @data. If @want_plain is %TRUE,
+ * it will be an HTML string that looks like a text/plain representation
+ * of @data (but it will still be HTML).
+ *
+ * If @cite is %TRUE, the message will be cited as a reply, using "> "s.
+ *
+ * Return value: the HTML string, which the caller must free, or
+ * %NULL if @data doesn't include any data which should be forwarded or
+ * replied to.
+ **/
+char *
+mail_get_message_body (CamelDataWrapper *data, gboolean want_plain, gboolean cite)
+{
+	char *subtext, *old, *div, *text = NULL;
+	CamelContentType *mime_type;
+	CamelCipherContext *cipher;
+	GByteArray *bytes = NULL;
+	CamelMimePart *subpart;
+	CamelMultipart *mp;
+	int i, nparts;
+	
+	mime_type = camel_data_wrapper_get_mime_type_field (data);
+	
+	/* If it is message/rfc822 or message/news, extract the
+	 * important headers and recursively process the body.
+	 */
+	if (header_content_type_is (mime_type, "message", "rfc822") ||
+	    header_content_type_is (mime_type, "message", "news"))
+		return mail_get_message_rfc822 (CAMEL_MIME_MESSAGE (data), want_plain, cite);
+	
+	/* If it's a vcard or icalendar, ignore it. */
+	if (header_content_type_is (mime_type, "text", "x-vcard") ||
+	    header_content_type_is (mime_type, "text", "calendar"))
+		return NULL;
+	
+	/* Get the body data for other text/ or message/ types */
+	if (header_content_type_is (mime_type, "text", "*") ||
+	    header_content_type_is (mime_type, "message", "*")) {
+		bytes = mail_format_get_data_wrapper_text (data, NULL);
+		
+		if (bytes) {
+			g_byte_array_append (bytes, "", 1);
+			text = bytes->data;
+			g_byte_array_free (bytes, FALSE);
+		}
+		
+		if (text && !header_content_type_is(mime_type, "text", "html")) {
+			char *html;
+			
+			if (header_content_type_is(mime_type, "text", "richtext"))
+				html = camel_enriched_to_html(text, CAMEL_MIME_FILTER_ENRICHED_IS_RICHTEXT);
+			else if (header_content_type_is(mime_type, "text", "enriched"))
+				html = camel_enriched_to_html(text, 0);
+			else
+				html = camel_text_to_html (text, CAMEL_MIME_FILTER_TOHTML_PRE |
+							   CAMEL_MIME_FILTER_TOHTML_CONVERT_URLS |
+							   (cite ? CAMEL_MIME_FILTER_TOHTML_CITE : 0), 0);
+			g_free(text);
+			text = html;
+		}
+		return text;
+	}
+	
+	/* If it's not message and it's not text, and it's not
+	 * multipart, we don't want to deal with it.
+	 */
+	if (!header_content_type_is (mime_type, "multipart", "*"))
+		return NULL;
+	
+	mp = CAMEL_MULTIPART (data);
+	
+	if (CAMEL_IS_MULTIPART_ENCRYPTED (mp)) {
+		cipher = camel_gpg_context_new (session);
+		subpart = camel_multipart_encrypted_decrypt (CAMEL_MULTIPART_ENCRYPTED (mp),
+							     cipher, NULL);
+		if (!subpart)
+			return NULL;
+		
+		data = camel_medium_get_content_object (CAMEL_MEDIUM (subpart));
+		return mail_get_message_body (data, want_plain, cite);
+	} else if (header_content_type_is (mime_type, "multipart", "alternative")) {
+		/* Pick our favorite alternative and reply to it. */
+		
+		subpart = find_preferred_alternative (mp, want_plain);
+		if (!subpart)
+			return NULL;
+		
+		data = camel_medium_get_content_object (CAMEL_MEDIUM (subpart));
+		return mail_get_message_body (data, want_plain, cite);
+	}
+	
+	/* Otherwise, concatenate all the parts that we can. */
+	if (want_plain) {
+		if (cite)
+			div = "<br>\n&gt; ----<br>\n&gt; <br>\n";
+		else
+			div = "<br>\n----<br>\n<br>\n";
+	} else
+		div = "<br><hr><br>";
+	
+	nparts = camel_multipart_get_number (mp);
+	for (i = 0; i < nparts; i++) {
+		subpart = camel_multipart_get_part (mp, i);
+		
+		/* only add to the body contents if it is marked as "inline" */
+		if (!mail_part_is_inline (subpart))
+			continue;
+		
+		data = camel_medium_get_content_object (CAMEL_MEDIUM (subpart));
+		subtext = mail_get_message_body (data, want_plain, cite);
+		if (!subtext)
+			continue;
+		
+		if (text) {
+			old = text;
+			text = g_strdup_printf ("%s%s%s", old, div, subtext);
+			g_free (subtext);
+			g_free (old);
+		} else
+			text = subtext;
+	}
+	
+	return text;
+}
diff --git a/mail/mail-format.h b/mail/mail-format.h
new file mode 100644
index 0000000000..e39148ca83
--- /dev/null
+++ b/mail/mail-format.h
@@ -0,0 +1,71 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
+/*
+ *  Authors: Jeffrey Stedfast <fejj@ximian.com>
+ *
+ *  Copyright 2003 Ximian, Inc. (www.ximian.com)
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 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, write to the Free Software
+ *  Foundation, Inc., 59 Temple Street #330, Boston, MA 02111-1307, USA.
+ *
+ */
+
+
+#ifndef __MAIL_FORMAT_H__
+#define __MAIL_FORMAT_H__
+
+#include <camel/camel.h>
+#include <gtkhtml/gtkhtml.h>
+
+#include "mail-display.h"
+#include "mail-display-stream.h"
+
+GByteArray *mail_format_get_data_wrapper_text (CamelDataWrapper *data,
+					       MailDisplay *mail_display);
+
+ssize_t mail_format_data_wrapper_write_to_stream (CamelDataWrapper *wrapper,
+						  gboolean decode,
+						  MailDisplay *mail_display,
+						  CamelStream *stream);
+
+void mail_format_mime_message (CamelMimeMessage *mime_message,
+			       MailDisplay *md, MailDisplayStream *stream);
+void mail_format_raw_message (CamelMimeMessage *mime_message,
+			      MailDisplay *md, MailDisplayStream *stream);
+
+gboolean mail_content_loaded (CamelDataWrapper *wrapper,
+			      MailDisplay *display,
+			      gboolean redisplay,
+			      const char *url,
+			      GtkHTML *html,
+			      GtkHTMLStream *handle);
+
+typedef gboolean (*MailMimeHandlerFn) (CamelMimePart *part, const char *mime_type,
+				       MailDisplay *md, MailDisplayStream *stream);
+typedef struct {
+	Bonobo_ServerInfo *component;
+	GList *applications;
+	MailMimeHandlerFn builtin;
+	guint generic : 1;
+	guint is_bonobo : 1;
+} MailMimeHandler;
+
+MailMimeHandler *mail_lookup_handler (const char *mime_type);
+
+gboolean mail_part_is_inline (CamelMimePart *part);
+gboolean mail_part_is_displayed_inline (CamelMimePart *part, MailDisplay *md);
+void     mail_part_toggle_displayed (CamelMimePart *part, MailDisplay *md);
+
+char *mail_get_message_body (CamelDataWrapper *data, gboolean want_plain, gboolean cite);
+
+#endif /* __MAIL_FORMAT_H__ */
diff --git a/mail/mail-identify.c b/mail/mail-identify.c
new file mode 100644
index 0000000000..2e3f517145
--- /dev/null
+++ b/mail/mail-identify.c
@@ -0,0 +1,130 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
+
+/*
+ * Author :
+ *  Dan Winship <danw@ximian.com>
+ *
+ *  Copyright 2000, Ximian, Inc. (www.ximian.com)
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of version 2 of the GNU General Public
+ * License as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public
+ * License along with this program; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ *
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <stdlib.h>
+#include <string.h>
+
+#include <glib.h>
+#include <libgnomevfs/gnome-vfs-utils.h>
+#include <libgnomevfs/gnome-vfs-mime.h>
+#include <libgnomevfs/gnome-vfs-mime-utils.h>
+#include "mail.h"
+
+static const char *identify_by_magic (CamelDataWrapper *data, MailDisplay *md);
+
+/**
+ * mail_identify_mime_part:
+ * @part: a CamelMimePart
+ * @md: the MailDisplay @part is being shown in
+ *
+ * Try to identify the MIME type of the data in @part (which presumably
+ * doesn't have a useful Content-Type).
+ *
+ * Return value: the MIME type, which the caller must free, or %NULL
+ * if it could not be identified.
+ **/
+char *
+mail_identify_mime_part (CamelMimePart *part, MailDisplay *md)
+{
+	const char *filename, *name_type = NULL, *magic_type = NULL;
+	CamelDataWrapper *data;
+	
+	filename = camel_mime_part_get_filename (part);
+	if (filename) {
+		/* GNOME-VFS will misidentify TNEF attachments as MPEG */
+		if (!strcmp (filename, "winmail.dat"))
+			return g_strdup ("application/vnd.ms-tnef");
+		
+		name_type = gnome_vfs_mime_type_from_name (filename);
+	}
+	
+	data = camel_medium_get_content_object (CAMEL_MEDIUM (part));
+	if (!camel_data_wrapper_is_offline (data))
+		magic_type = identify_by_magic (data, md);
+	
+	if (magic_type && name_type) {
+		/* If GNOME-VFS doesn't recognize the data by magic, but it
+		 * contains English words, it will call it text/plain. If the
+		 * filename-based check came up with something different, use
+		 * that instead.
+		 */
+		if (!strcmp (magic_type, "text/plain"))
+			return g_strdup (name_type);
+		
+		/* If if returns "application/octet-stream" try to
+		 * do better with the filename check.
+		 */
+		if (!strcmp (magic_type, "application/octet-stream"))
+			return g_strdup (name_type);
+	}
+	
+	/* If the MIME part data was online, and the magic check
+	 * returned something, use that, since it's more reliable.
+	 */
+	if (magic_type)
+		return g_strdup (magic_type);
+	
+	/* Otherwise try guessing based on the filename */
+	if (name_type)
+		return g_strdup (name_type);
+	
+	/* Another possibility to try is the x-mac-type / x-mac-creator
+	 * parameter to Content-Type used by some Mac email clients. That
+	 * would require a Mac type to mime type conversion table.
+	 */
+	
+#if 0
+	/* If the data part is offline, then we didn't try magic
+	 * before, so force it to be loaded so we can try again later.
+	 * FIXME: In a perfect world, we would not load the content
+	 * just to identify the MIME type.
+	 */
+	/* This is disabled as it just frustrates users more than it helps,
+	   see discussion in bug #11778 */
+	if (camel_data_wrapper_is_offline (data))
+		mail_content_loaded (data, md, TRUE, NULL, NULL, NULL);
+#endif
+	
+	return NULL;
+}
+
+static const char *
+identify_by_magic (CamelDataWrapper *data, MailDisplay *md)
+{
+	CamelStreamMem *memstream;
+	const char *type;
+
+	memstream = (CamelStreamMem *)camel_stream_mem_new();
+	if (camel_data_wrapper_write_to_stream (data, (CamelStream *)memstream) > 0)
+		type = gnome_vfs_get_mime_type_for_data(memstream->buffer->data, memstream->buffer->len);
+	else
+		type = NULL;
+	camel_object_unref(memstream);
+
+	return type;
+}
diff --git a/mail/mail-importer.c b/mail/mail-importer.c
index 193726aa1e..a915c04668 100644
--- a/mail/mail-importer.c
+++ b/mail/mail-importer.c
@@ -36,12 +36,12 @@
 #include <camel/camel-exception.h>
 #include <e-util/e-path.h>
 
+#include "mail-component.h"
 #include "mail-importer.h"
 #include "mail-local.h"
 #include "mail.h"
 
 static GList *importer_modules = NULL;
-extern char *evolution_dir;
 static GNOME_Evolution_Storage local_storage = NULL;
 
 void mail_importer_uninit (void);
@@ -95,7 +95,8 @@ mail_importer_make_local_folder(const char *folderpath)
 	} else {
 		struct _create_data data = { GNOME_Evolution_Storage_GENERIC_ERROR, FALSE };
 
-		tmp = g_strdup_printf("file://%s/local", evolution_dir);
+		tmp = g_strdup_printf("file://%s/local",
+				      mail_component_peek_base_directory (mail_component_peek ()));
 		uri = e_path_to_physical(tmp, folderpath);
 		g_free(tmp);
 		tmp = strrchr(uri, '/');
diff --git a/mail/mail-local.c b/mail/mail-local.c
index 0ec4f5a8e9..565e028432 100644
--- a/mail/mail-local.c
+++ b/mail/mail-local.c
@@ -533,10 +533,11 @@ mlf_getv(CamelObject *object, CamelException *ex, CamelArgGetV *args)
 			/* CamelObject args */
 		case CAMEL_OBJECT_ARG_DESCRIPTION:
 			if (mlf->description == NULL) {
+				const char *base_directory = mail_component_peek_base_directory (mail_component_peek ());
 				int pathlen;
 
 				/* string to describe a local folder as the location of a message */
-				pathlen = strlen(evolution_dir) + strlen("local") + 1;
+				pathlen = strlen(base_directory) + strlen("local") + 1;
 				if (strlen(folder->full_name) > pathlen)
 					mlf->description = g_strdup_printf(_("Local folders/%s"), folder->full_name+pathlen);
 				else
diff --git a/mail/mail-mt.c b/mail/mail-mt.c
index 603e55dd50..cb75fe93bf 100644
--- a/mail/mail-mt.c
+++ b/mail/mail-mt.c
@@ -28,8 +28,6 @@
 #include "mail-session.h"
 #include "mail-mt.h"
 
-#include "component-factory.h"
-
 /*#define MALLOC_CHECK*/
 #define LOG_OPS
 #define LOG_LOCKS
@@ -911,10 +909,11 @@ static void do_op_status(struct _mail_msg *mm)
 				what = msg->ops->describe_msg (msg, FALSE);
 			else
 				what = _("Working");
-			
+
+			/* EPFIXME: redo activity client stuff.  */
 			if (global_shell_client) {
 				activity = evolution_activity_client_new (global_shell_client,
-									  COMPONENT_ID,
+									  "evolution-mail",
 									  progress_icon, what, TRUE,
 									  &display);
 			} else {
diff --git a/mail/mail-offline-handler.c b/mail/mail-offline-handler.c
index ccaff703f5..ce0bcf729f 100644
--- a/mail/mail-offline-handler.c
+++ b/mail/mail-offline-handler.c
@@ -27,9 +27,10 @@
 #endif
 
 #include "mail-offline-handler.h"
-#include "mail.h"
+#include "mail-component.h"
 #include "mail-ops.h"
 #include "mail-folder-cache.h"
+#include "mail.h"
 
 #include <gtk/gtkmain.h>
 
@@ -77,10 +78,10 @@ create_connection_list (void)
 
 	list = GNOME_Evolution_ConnectionList__alloc ();
 	list->_length = 0;
-	list->_maximum = mail_storages_count ();
+	list->_maximum = mail_component_get_storage_count (mail_component_peek ());
 	list->_buffer = CORBA_sequence_GNOME_Evolution_Connection_allocbuf (list->_maximum);
 
-	mail_storages_foreach (add_connection, list);
+	mail_component_storages_foreach (mail_component_peek (), add_connection, list);
 
 	return list;
 }
@@ -260,7 +261,7 @@ impl_goOffline (PortableServer_Servant servant,
 
 	/* FIXME: If send/receive active, wait for it to finish */
 
-	mail_storages_foreach (storage_go_offline, progress_listener);
+	mail_component_storages_foreach (mail_component_peek (), storage_go_offline, progress_listener);
 }
 
 static void
@@ -270,8 +271,7 @@ storage_go_online (gpointer key, gpointer value, gpointer data)
 
 	if (service_is_relevant (CAMEL_SERVICE (store), FALSE)) {
 		mail_store_set_offline (store, FALSE, NULL, NULL);
-		mail_note_store (store, NULL, NULL, CORBA_OBJECT_NIL,
-				 NULL, NULL);
+		mail_note_store (store, NULL, NULL, NULL, NULL);
 	}
 }
 
@@ -288,7 +288,7 @@ impl_goOnline (PortableServer_Servant servant,
 	/* Enable auto-mail-checking */
 	camel_session_set_online (session, TRUE);
 
-	mail_storages_foreach (storage_go_online, NULL);
+	mail_component_storages_foreach (mail_component_peek (), storage_go_online, NULL);
 }
 
 /* GObject methods.  */
diff --git a/mail/mail-ops.c b/mail/mail-ops.c
index 65cc8676c1..8d3711ff4e 100644
--- a/mail/mail-ops.c
+++ b/mail/mail-ops.c
@@ -38,6 +38,7 @@
 #include <camel/camel-vtrash-folder.h>
 #include <camel/camel-vee-store.h>
 #include "mail.h"
+#include "mail-component.h"
 #include "mail-tools.h"
 #include "mail-ops.h"
 #include "mail-vfolder.h"
@@ -229,7 +230,8 @@ uid_cachename_hack (CamelStore *store)
 				       url->host);
 	e_filename_make_safe (encoded_url);
 	
-	filename = g_strdup_printf ("%s/mail/pop3/cache-%s", evolution_dir, encoded_url);
+	filename = g_strdup_printf ("%s/mail/pop3/cache-%s",
+				    mail_component_peek_base_directory (mail_component_peek ()), encoded_url);
 	
 	/* lame hack, but we can't expect user's to actually migrate
            their cache files - brain power requirements are too
@@ -238,7 +240,9 @@ uid_cachename_hack (CamelStore *store)
 		/* This is either the first time the user has checked
                    mail with this POP provider or else their cache
                    file is in the old location... */
-		old_location = g_strdup_printf ("%s/config/cache-%s", evolution_dir, encoded_url);
+		old_location = g_strdup_printf ("%s/config/cache-%s",
+						mail_component_peek_base_directory (mail_component_peek ()),
+						encoded_url);
 		if (stat (old_location, &st) == -1) {
 			/* old location doesn't exist either so use the new location */
 			g_free (old_location);
diff --git a/mail/mail-search.c b/mail/mail-search.c
new file mode 100644
index 0000000000..424ccee991
--- /dev/null
+++ b/mail/mail-search.c
@@ -0,0 +1,403 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
+/*
+ *  Authors: Jon Trowbridge <trow@ximian.com>
+ *
+ *  Copyright 2001-2003 Ximian, Inc. (www.ximian.com)
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 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, write to the Free Software
+ *  Foundation, Inc., 59 Temple Street #330, Boston, MA 02111-1307, USA.
+ *
+ */
+
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <string.h>
+
+#include "mail-search.h"
+#include "e-searching-tokenizer.h"
+#include <gtkhtml/gtkhtml-search.h>
+#include <gtkhtml/htmlengine.h>
+#include <libgnomeui/gnome-window-icon.h>
+#include <gdk/gdkkeysyms.h>
+
+
+static ESearchingTokenizer *mail_search_tokenizer (MailSearch *ms);
+static void mail_search_redisplay_message (MailSearch *ms);
+
+
+static GtkObjectClass *parent_class = NULL;
+
+
+static void
+mail_search_finalise (GObject *obj)
+{
+	MailSearch *ms = MAIL_SEARCH (obj);
+
+	g_free (ms->last_search);
+	g_object_weak_unref ((GObject *) ms->mail, (GWeakNotify) gtk_widget_destroy, ms);
+	g_object_unref (ms->mail);
+	
+	G_OBJECT_CLASS (parent_class)->finalize (obj);
+}
+
+static void
+mail_search_destroy (GtkObject *obj)
+{
+	MailSearch *ms = (MailSearch *) obj;
+	ESearchingTokenizer *st = mail_search_tokenizer (ms);
+	
+	if (ms->begin_handler) {
+		g_signal_handler_disconnect (ms->mail->html->engine->ht, ms->begin_handler);
+		ms->begin_handler = 0;
+		g_signal_handler_disconnect (ms->mail->html->engine->ht, ms->match_handler);
+		ms->match_handler = 0;
+		
+		e_searching_tokenizer_set_primary_search_string (st, NULL);
+		mail_search_redisplay_message (ms);
+	}
+	
+	GTK_OBJECT_CLASS (parent_class)->destroy (obj);
+}
+
+static void
+mail_search_class_init (MailSearchClass *klass)
+{
+	GObjectClass *object_class = (GObjectClass *) klass;
+	GtkObjectClass *gtk_object_class = (GtkObjectClass *) klass;
+	
+	parent_class = (GtkObjectClass *) g_type_class_ref (GTK_TYPE_DIALOG);
+	
+	object_class->finalize = mail_search_finalise;
+	
+	gtk_object_class->destroy = mail_search_destroy;
+}
+
+static void
+mail_search_init (MailSearch *ms)
+{
+	
+}
+
+GtkType
+mail_search_get_type (void)
+{
+	static GType type = 0;
+
+	if (!type) {
+		static const GTypeInfo info = {
+			sizeof (MailSearchClass),
+			NULL, NULL,
+			(GClassInitFunc) mail_search_class_init,
+			NULL, NULL,
+			sizeof (MailSearch),
+			0,
+			(GInstanceInitFunc) mail_search_init,
+		};
+		
+		type = g_type_register_static (GTK_TYPE_DIALOG, "MailSearch", &info, 0);
+	}
+	
+	return type;
+}
+
+/*
+ *  Convenience
+ */
+
+static ESearchingTokenizer *
+mail_search_tokenizer (MailSearch *ms)
+{
+	return E_SEARCHING_TOKENIZER (ms->mail->html->engine->ht);
+}
+
+static void
+mail_search_redisplay_message (MailSearch *ms)
+{
+	mail_display_redisplay (ms->mail, FALSE);
+}
+
+static void
+mail_search_set_subject (MailSearch *ms, const char *subject)
+{
+	char *utf8_subject = NULL;
+	
+	if (subject && *subject) {
+		utf8_subject = g_strdup (subject);
+		
+		if (g_utf8_validate (utf8_subject, -1, NULL)) {
+#define ARBITRARY_CUTOFF 40
+			if (g_utf8_strlen (utf8_subject, -1) > ARBITRARY_CUTOFF + 3) {
+				char *p = g_utf8_offset_to_pointer (utf8_subject, ARBITRARY_CUTOFF);
+				
+				strcpy (p, "...");
+			}
+		} else {
+			/* If the subject contains bad utf8, don't show anything in the frame label. */
+			g_free (utf8_subject);
+			utf8_subject = NULL;
+		}
+	} else {
+		utf8_subject = g_strdup (_("(Untitled Message)"));
+	}
+	
+	gtk_frame_set_label (GTK_FRAME (ms->msg_frame), utf8_subject);
+	
+	g_free (utf8_subject);
+}
+
+/*
+ *  Construct Objects
+ */
+
+static void
+toggled_case_cb (GtkToggleButton *b, MailSearch *ms)
+{
+	ms->case_sensitive = gtk_toggle_button_get_active (b);
+	
+	e_searching_tokenizer_set_primary_case_sensitivity (mail_search_tokenizer (ms),
+							    ms->case_sensitive);
+	mail_search_redisplay_message (ms);
+	
+}
+
+#if 0
+static void
+toggled_fwd_cb (GtkToggleButton *b, MailSearch *ms)
+{
+	ms->search_forward = gtk_toggle_button_get_active (b);
+	gtk_html_engine_search_set_forward (ms->mail->html, ms->search_forward);
+}
+#endif
+
+static void
+dialog_response_cb (GtkWidget *widget, int button, MailSearch *ms)
+{
+	ESearchingTokenizer *st = mail_search_tokenizer (ms);
+	
+	if (button == GTK_RESPONSE_ACCEPT) {
+		char *search_text;
+		
+		search_text = gtk_editable_get_chars (GTK_EDITABLE (ms->entry), 0, -1);
+		g_strstrip (search_text);
+		
+		if (search_text && *search_text) {
+			if (ms->last_search && !strcmp (ms->last_search, search_text)) {
+				
+				if (!gtk_html_engine_search_next (ms->mail->html)) {
+					g_free (ms->last_search);
+					ms->last_search = NULL;
+				}
+			} else {
+				g_free (ms->last_search);
+				ms->last_search = NULL;
+				
+				e_searching_tokenizer_set_primary_search_string (st, search_text);
+				e_searching_tokenizer_set_primary_case_sensitivity (st, ms->case_sensitive);
+				
+				mail_search_redisplay_message (ms);
+				
+				if (gtk_html_engine_search (ms->mail->html, search_text,
+							    ms->case_sensitive, ms->search_forward,
+							    FALSE)) {
+					ms->last_search = g_strdup (search_text);
+				}
+			}
+		}
+		
+		g_free (search_text);
+	} else if (button == GTK_RESPONSE_CLOSE) {
+		gtk_widget_destroy (widget);
+	}
+}
+
+static void
+begin_cb (ESearchingTokenizer *st, char *foo, MailSearch *ms)
+{
+	const char *subject;
+	
+	if (ms && ms->mail && ms->mail->current_message) {
+		subject = ms->mail->current_message->subject;
+		
+		if (subject == NULL)
+			subject = _("Untitled Message");
+	} else {
+		subject = _("Empty Message");
+	}
+	
+	gtk_label_set_text (GTK_LABEL (ms->count_label), "0");
+	mail_search_set_subject (ms, subject);
+}
+
+static void
+match_cb (ESearchingTokenizer *st, MailSearch *ms)
+{
+	char buf[16];
+	
+	g_snprintf (buf, 16, "%d", e_searching_tokenizer_match_count (st));
+	gtk_label_set_text (GTK_LABEL (ms->count_label), buf);
+}
+
+static void
+entry_run_search (GtkWidget *w, MailSearch *ms)
+{
+	/* run search when enter pressed on widget */
+	gtk_dialog_response ((GtkDialog *) ms, GTK_RESPONSE_ACCEPT);
+}
+
+void
+mail_search_construct (MailSearch *ms, MailDisplay *mail)
+{
+	GtkWidget *find_hbox;
+	GtkWidget *matches_hbox;
+	GtkWidget *toggles_hbox;
+	GtkWidget *frame_vbox;
+	GtkWidget *entry;
+	GtkWidget *count_label;
+	GtkWidget *case_check;
+#if 0
+	GtkWidget *fwd_check;
+#endif
+	GtkWidget *button;
+	GtkWidget *msg_hbox;
+	GtkWidget *msg_frame;
+	GtkAccelGroup *accel_group;
+	
+	g_return_if_fail (ms != NULL && IS_MAIL_SEARCH (ms));
+	g_return_if_fail (mail != NULL && IS_MAIL_DISPLAY (mail));
+	
+	/* Basic set-up */
+	
+	ms->mail = mail;
+	g_object_ref (mail);
+	
+	gtk_window_set_title ((GtkWindow *) ms, _("Find in Message"));
+	
+	button = gtk_dialog_add_button ((GtkDialog *) ms, GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE);
+	gtk_dialog_set_default_response ((GtkDialog *) ms, GTK_RESPONSE_ACCEPT);
+	accel_group = gtk_accel_group_new ();
+	gtk_window_add_accel_group (GTK_WINDOW (ms), accel_group);
+	gtk_widget_add_accelerator (button, "activate", accel_group, GDK_Escape, 0, GTK_ACCEL_LOCKED);
+
+	gtk_dialog_add_button ((GtkDialog *) ms, GTK_STOCK_FIND, GTK_RESPONSE_ACCEPT);
+
+	ms->search_forward = TRUE;
+	ms->case_sensitive = FALSE;
+	
+	ms->begin_handler = g_signal_connect (ms->mail->html->engine->ht, "begin",
+					      G_CALLBACK (begin_cb), ms);
+	ms->match_handler = g_signal_connect (ms->mail->html->engine->ht, "match",
+					      G_CALLBACK (match_cb), ms);
+	
+	/* Construct the dialog contents. */
+	
+	msg_hbox     = gtk_hbox_new (FALSE, 3);
+	find_hbox    = gtk_hbox_new (FALSE, 3);
+	matches_hbox = gtk_hbox_new (FALSE, 3);
+	toggles_hbox = gtk_hbox_new (FALSE, 3);
+	frame_vbox   = gtk_vbox_new (FALSE, 3);
+	gtk_container_set_border_width ((GtkContainer *) frame_vbox, 3);
+	
+	entry       = gtk_entry_new ();
+	count_label = gtk_label_new ("0");
+	
+	msg_frame   = gtk_frame_new (NULL);
+	gtk_container_set_border_width ((GtkContainer *) msg_frame, 6);
+	
+	case_check  = gtk_check_button_new_with_label (_("Case Sensitive"));
+#if 0
+	fwd_check   = gtk_check_button_new_with_label (_("Search Forward"));
+#endif
+	
+	ms->entry       = entry;
+	ms->count_label = count_label;
+	
+	ms->msg_frame   = msg_frame;
+	
+	if (mail->current_message->subject && *mail->current_message->subject)
+		mail_search_set_subject (ms, mail->current_message->subject);
+	else
+		mail_search_set_subject (ms, NULL);
+	
+#if 0
+	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (fwd_check),  ms->search_forward);
+#endif
+	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (case_check), ms->case_sensitive);
+	
+  	gtk_box_pack_start (GTK_BOX (msg_hbox), GTK_WIDGET (msg_frame), TRUE, TRUE, 0);
+	
+	gtk_box_pack_start (GTK_BOX (find_hbox), gtk_label_new (_("Find:")), FALSE, FALSE, 3);
+	gtk_box_pack_start (GTK_BOX (find_hbox), entry, TRUE, TRUE, 3);
+	
+	gtk_box_pack_start (GTK_BOX (matches_hbox), gtk_hbox_new (FALSE, 0), TRUE, TRUE, 0);
+	gtk_box_pack_start (GTK_BOX (matches_hbox), gtk_label_new (_("Matches:")), FALSE, FALSE, 3);
+	gtk_box_pack_start (GTK_BOX (matches_hbox), count_label, FALSE, FALSE, 3);
+	gtk_box_pack_start (GTK_BOX (matches_hbox), gtk_hbox_new (FALSE, 0), TRUE, TRUE, 0);
+	
+	gtk_box_pack_start (GTK_BOX (toggles_hbox), case_check, FALSE, FALSE, 3);
+	
+	/*
+	 * Disabling the forward/backward search button because there are problems with it
+	 * (related to how gtkhtml handles searches), the GUI freeze is upon us, and I
+	 * don't know if they'll get resolved for 1.0.  Hopefully getting this fixed can
+	 * be a 1.1 item.
+	 */
+	
+#if 0
+	gtk_box_pack_start (GTK_BOX (toggles_hbox), fwd_check,  FALSE, FALSE, 3);
+#endif
+	
+	gtk_box_pack_start (GTK_BOX (frame_vbox), find_hbox, FALSE, FALSE, 3);
+  	gtk_box_pack_start (GTK_BOX (frame_vbox), matches_hbox, FALSE, FALSE, 3); 
+  	gtk_box_pack_start (GTK_BOX (frame_vbox), toggles_hbox, FALSE, FALSE, 3);
+	
+	gtk_container_add (GTK_CONTAINER (msg_frame), GTK_WIDGET (frame_vbox));
+	
+	gtk_box_pack_start (GTK_BOX (GTK_DIALOG (ms)->vbox), msg_hbox, TRUE, TRUE, 0); 	
+	
+	gtk_widget_grab_focus (entry); /* Give focus to entry by default */ 
+	g_signal_connect (entry, "activate", G_CALLBACK (entry_run_search), ms);
+	gnome_window_icon_set_from_file (GTK_WINDOW (ms), EVOLUTION_ICONSDIR "/find-message.xpm");
+	
+	gtk_widget_show_all (msg_hbox);
+	gtk_widget_show_all (find_hbox);
+	gtk_widget_show_all (matches_hbox);
+	gtk_widget_show_all (toggles_hbox);
+	
+	/* Hook up signals */
+	
+	g_signal_connect (case_check, "toggled", G_CALLBACK (toggled_case_cb), ms);
+#if 0
+	g_signal_connect (fwd_check, "toggled", G_CALLBACK (toggled_fwd_cb), ms);
+#endif
+	g_signal_connect (ms, "response", G_CALLBACK (dialog_response_cb), ms);
+	
+	g_object_weak_ref ((GObject *) ms->mail, (GWeakNotify) gtk_widget_destroy, ms);
+}
+
+GtkWidget *
+mail_search_new (MailDisplay *mail)
+{
+	GtkWidget *widget;
+	
+	g_return_val_if_fail (IS_MAIL_DISPLAY (mail), NULL);
+	
+	widget = g_object_new (mail_search_get_type (), NULL);
+	mail_search_construct (MAIL_SEARCH (widget), mail);
+	
+	return widget;
+}
+
diff --git a/mail/mail-search.h b/mail/mail-search.h
new file mode 100644
index 0000000000..cbcf563636
--- /dev/null
+++ b/mail/mail-search.h
@@ -0,0 +1,75 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
+/*
+ *  Authors: Jon Trowbridge <trow@ximian.com>
+ *
+ *  Copyright 2001-2003 Ximian, Inc. (www.ximian.com)
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 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, write to the Free Software
+ *  Foundation, Inc., 59 Temple Street #330, Boston, MA 02111-1307, USA.
+ *
+ */
+
+
+#ifndef _MAIL_SEARCH_H_
+#define _MAIL_SEARCH_H_
+
+#ifdef _cplusplus
+extern "C" {
+#pragma }
+#endif /* _cplusplus */
+
+#include <gtk/gtkdialog.h>
+#include "mail-display.h"
+
+#define MAIL_SEARCH_TYPE        (mail_search_get_type ())
+#define MAIL_SEARCH(o)          (G_TYPE_CHECK_INSTANCE_CAST ((o), MAIL_SEARCH_TYPE, MailSearch))
+#define MAIL_SEARCH_CLASS(k)    (G_TYPE_CHECK_CLASS_CAST ((k), MAIL_SEARCH_TYPE, MailSearch))
+#define IS_MAIL_SEARCH(o)       (G_TYPE_CHECK_INSTANCE_TYPE ((o), MAIL_SEARCH_TYPE))
+#define IS_MAIL_SEARCH_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), MAIL_SEARCH_TYPE))
+
+typedef struct _MailSearch      MailSearch;
+typedef struct _MailSearchClass MailSearchClass;
+
+struct _MailSearch {
+	GtkDialog parent;
+	
+	MailDisplay *mail;
+	
+	GtkWidget *entry;
+	GtkWidget *msg_frame;
+	GtkWidget *count_label;
+	
+	gboolean search_forward, case_sensitive;
+	char *last_search;
+	
+	guint begin_handler;
+	guint match_handler;
+};
+
+struct _MailSearchClass {
+	GtkDialogClass parent_class;
+	
+};
+
+GtkType    mail_search_get_type (void);
+
+void       mail_search_construct (MailSearch *, MailDisplay *);
+GtkWidget *mail_search_new       (MailDisplay *);
+
+
+#ifdef _cplusplus
+}
+#endif /* _cplusplus */
+
+#endif /* _MAIL_SEARCH_H_ */
diff --git a/mail/mail-send-recv.c b/mail/mail-send-recv.c
index 0ba9ae3179..6d70fe5047 100644
--- a/mail/mail-send-recv.c
+++ b/mail/mail-send-recv.c
@@ -46,6 +46,7 @@
 
 #include "mail.h"
 #include "mail-mt.h"
+#include "mail-component.h"
 #include "mail-config.h"
 #include "mail-session.h"
 #include "mail-tools.h"
@@ -167,7 +168,7 @@ static void free_send_info(void *key, struct _send_info *info, void *data)
 	g_free(info->uri);
 	camel_operation_unref(info->cancel);
 	if (info->timeout_id != 0)
-		gtk_timeout_remove(info->timeout_id);
+		g_source_remove(info->timeout_id);
 	g_free(info->what);
 	g_free(info);
 }
@@ -207,7 +208,7 @@ static void hide_send_info(void *key, struct _send_info *info, void *data)
 	info->status = NULL;
 
 	if (info->timeout_id != 0) {
-		gtk_timeout_remove (info->timeout_id);
+		g_source_remove (info->timeout_id);
 		info->timeout_id = 0;
 	}
 }
@@ -366,7 +367,7 @@ build_dialogue (EAccountList *accounts, CamelFolder *outbox, const char *destina
 			info->keep = source->keep_on_server;
 			info->cancel = camel_operation_new (operation_status, info);
 			info->state = SEND_ACTIVE;
-			info->timeout_id = gtk_timeout_add (STATUS_TIMEOUT, operation_status_timeout, info);
+			info->timeout_id = g_timeout_add (STATUS_TIMEOUT, operation_status_timeout, info);
 			
 			g_hash_table_insert (data->active, info->uri, info);
 			list = g_list_prepend (list, info);
@@ -375,7 +376,7 @@ build_dialogue (EAccountList *accounts, CamelFolder *outbox, const char *destina
 			e_iterator_next (iter);
 			continue;
 		} else if (info->timeout_id == 0)
-			info->timeout_id = gtk_timeout_add (STATUS_TIMEOUT, operation_status_timeout, info);
+			info->timeout_id = g_timeout_add (STATUS_TIMEOUT, operation_status_timeout, info);
 		
 		recv_icon = gtk_image_new_from_file (EVOLUTION_BUTTONSDIR "/receive-24.png");
 		
@@ -423,12 +424,12 @@ build_dialogue (EAccountList *accounts, CamelFolder *outbox, const char *destina
 			info->keep = FALSE;
 			info->cancel = camel_operation_new (operation_status, info);
 			info->state = SEND_ACTIVE;
-			info->timeout_id = gtk_timeout_add (STATUS_TIMEOUT, operation_status_timeout, info);
+			info->timeout_id = g_timeout_add (STATUS_TIMEOUT, operation_status_timeout, info);
 			
 			g_hash_table_insert (data->active, SEND_URI_KEY, info);
 			list = g_list_prepend (list, info);
 		} else if (info->timeout_id == 0)
-			info->timeout_id = gtk_timeout_add (STATUS_TIMEOUT, operation_status_timeout, info);
+			info->timeout_id = g_timeout_add (STATUS_TIMEOUT, operation_status_timeout, info);
 		
 		send_icon  = gtk_image_new_from_file (EVOLUTION_BUTTONSDIR "/send-24.png");
 		
@@ -663,10 +664,10 @@ receive_update_got_store (char *uri, CamelStore *store, void *data)
 	struct _send_info *info = data;
 	
 	if (store) {
-		EvolutionStorage *storage = mail_lookup_storage (store);
+		EStorage *storage = mail_component_lookup_storage (mail_component_peek (), store);
 		
 		if (storage) {
-			mail_note_store(store, info->cancel, storage, CORBA_OBJECT_NIL, receive_update_done, info);
+			mail_note_store(store, info->cancel, storage, receive_update_done, info);
 			/*bonobo_object_unref (BONOBO_OBJECT (storage));*/
 		} else {
 			/* If we get here, store must be an external
@@ -770,7 +771,7 @@ static void auto_clean_set(void *key, struct _auto_data *info, GHashTable *set)
 {
 	d(printf("removing auto-check for %s %p\n", info->uri, info));
 	g_hash_table_remove(set, info->uri);
-	gtk_timeout_remove(info->timeout_id);
+	g_source_remove(info->timeout_id);
 	g_free(info->uri);
 	g_free(info);
 }
@@ -811,15 +812,15 @@ mail_autoreceive_setup (void)
 				info->keep = source->keep_on_server;
 				if (info->period != source->auto_check_time*60) {
 					info->period = source->auto_check_time*60;
-					gtk_timeout_remove(info->timeout_id);
-					info->timeout_id = gtk_timeout_add(info->period*1000, auto_timeout, info);
+					g_source_remove(info->timeout_id);
+					info->timeout_id = g_timeout_add(info->period*1000, auto_timeout, info);
 				}
 			} else {
 				info = g_malloc0(sizeof(*info));
 				info->uri = g_strdup(source->url);
 				info->keep = source->keep_on_server;
 				info->period = source->auto_check_time*60;
-				info->timeout_id = gtk_timeout_add(info->period*1000, auto_timeout, info);
+				info->timeout_id = g_timeout_add(info->period*1000, auto_timeout, info);
 				g_hash_table_insert(auto_active, info->uri, info);
 				/* If we do this at startup, it can cause the logon dialogue to be hidden,
 				   so lets not */
diff --git a/mail/mail-session.c b/mail/mail-session.c
index 65b537246b..1c41007c53 100644
--- a/mail/mail-session.c
+++ b/mail/mail-session.c
@@ -40,6 +40,7 @@
 #include "filter/filter-context.h"
 #include "filter/filter-filter.h"
 #include "mail.h"
+#include "mail-component.h"
 #include "mail-config.h"
 #include "mail-session.h"
 #include "mail-tools.h"
@@ -593,7 +594,7 @@ main_get_filter_driver (CamelSession *session, const char *type, CamelException
 	
 	gconf = mail_config_get_gconf_client ();
 	
-	user = g_strdup_printf ("%s/filters.xml", evolution_dir);
+	user = g_strdup_printf ("%s/filters.xml", mail_component_peek_base_directory (mail_component_peek ()));
 	system = EVOLUTION_PRIVDATADIR "/filtertypes.xml";
 	fc = (RuleContext *) filter_context_new ();
 	rule_context_load (fc, system, user);
@@ -743,16 +744,16 @@ mail_session_forget_password (const char *key)
 }
 
 void
-mail_session_init (void)
+mail_session_init (const char *base_directory)
 {
 	char *camel_dir;
-	
-	if (camel_init (evolution_dir, TRUE) != 0)
+
+	if (camel_init (base_directory, TRUE) != 0)
 		exit (0);
 	
 	session = CAMEL_SESSION (camel_object_new (MAIL_SESSION_TYPE));
 	
-	camel_dir = g_strdup_printf ("%s/mail", evolution_dir);
+	camel_dir = g_strdup_printf ("%s/mail", base_directory);
 	camel_session_construct (session, camel_dir);
 	
 	/* The shell will tell us to go online. */
diff --git a/mail/mail-session.h b/mail/mail-session.h
index 72a2757fc4..2a7559964c 100644
--- a/mail/mail-session.h
+++ b/mail/mail-session.h
@@ -32,7 +32,7 @@ extern "C" {
 #pragma }
 #endif /* __cplusplus */
 
-void mail_session_init (void);
+void mail_session_init (const char *base_directory);
 gboolean mail_session_get_interactive (void);
 void mail_session_set_interactive (gboolean interactive);
 char *mail_session_request_dialog (const char *prompt, gboolean secret,
diff --git a/mail/mail-signature-editor.c b/mail/mail-signature-editor.c
index 0c1907b3bb..570a0157c4 100644
--- a/mail/mail-signature-editor.c
+++ b/mail/mail-signature-editor.c
@@ -395,11 +395,11 @@ mail_signature_editor (MailConfigSignature *sig, GtkWindow *parent, gboolean is_
 			       EVOLUTION_UIDIR "/evolution-signature-editor.xml",
 			       "evolution-signature-editor", NULL);
 	
-	editor->control = bonobo_widget_new_control ("OAFIID:GNOME_GtkHTML_Editor:3.0",
+	editor->control = bonobo_widget_new_control ("OAFIID:GNOME_GtkHTML_Editor:3.1",
 						     bonobo_ui_component_get_container (component));
 	
 	if (editor->control == NULL) {
-		g_warning ("Cannot get 'OAFIID:GNOME_GtkHTML_Editor:3.0'.");
+		g_warning ("Cannot get 'OAFIID:GNOME_GtkHTML_Editor:3.1'.");
 		
 		destroy_editor (editor);
 		return;
diff --git a/mail/mail-summary.c b/mail/mail-summary.c
index 978347bb43..903c03ea4e 100644
--- a/mail/mail-summary.c
+++ b/mail/mail-summary.c
@@ -72,7 +72,6 @@ typedef struct {
 
 static int queue_len = 0;
 
-extern char *evolution_dir;
 extern EvolutionStorage *vfolder_storage;
 
 #define MAIN_READER main_compipe[0]
@@ -295,7 +294,7 @@ generate_folder_summaries (MailSummary *summary)
 	CamelException *ex;
 	int i;
 
-	user = g_strdup_printf ("%s/vfolders.xml", evolution_dir);
+	user = g_strdup_printf ("%s/vfolders.xml", mail_component_peek_base_directory (mail_component_peek ()));
 	system = EVOLUTION_PRIVDATADIR "/vfoldertypes.xml";
 
 	context = vfolder_context_new ();
diff --git a/mail/mail-tools.c b/mail/mail-tools.c
index 99fd749d78..e5fbeed05f 100644
--- a/mail/mail-tools.c
+++ b/mail/mail-tools.c
@@ -46,6 +46,7 @@
 #include "e-util/e-meta.h"
 
 #include "mail.h" /*session*/
+#include "mail-component.h"
 #include "mail-config.h"
 #include "mail-vfolder.h"
 #include "mail-tools.h"
@@ -62,7 +63,8 @@ mail_tool_get_local_inbox (CamelException *ex)
 	CamelFolder *folder;
 	char *url;
 	
-	url = g_strdup_printf("file://%s/local/Inbox", evolution_dir);
+	url = g_strdup_printf("file://%s/local/Inbox",
+			      mail_component_peek_base_directory (mail_component_peek ()));
 	folder = mail_tool_uri_to_folder (url, 0, ex);
 	g_free (url);
 	
@@ -120,7 +122,9 @@ mail_tool_get_local_movemail_path (const unsigned char *uri)
 		if (strchr ("/:;=|%&#!*^()\\, ", *c) || !isprint ((int) *c))
 			*c = '_';
 	
-	path = g_strdup_printf ("%s/local/Inbox/movemail.%s", evolution_dir, safe_uri);
+	path = g_strdup_printf ("%s/local/Inbox/movemail.%s",
+				mail_component_peek_base_directory (mail_component_peek ()),
+				safe_uri);
 	g_free (safe_uri);
 	
 	return path;
@@ -318,7 +322,7 @@ mail_tool_uri_to_folder (const char *uri, guint32 flags, CamelException *ex)
 	store = camel_session_get_store (session, uri + offset, ex);
 	if (store) {
 		const char *name;
-		
+
 		/* if we have a fragment, then the path is actually used by the store,
 		   so the fragment is the path to the folder instead */
 		if (url->fragment) {
@@ -412,6 +416,7 @@ mail_tools_folder_to_url (CamelFolder *folder)
 
 static char *meta_data_key(const char *uri, char **pathp)
 {
+	const char *base_directory = mail_component_peek_base_directory (mail_component_peek ());
 	CamelURL *url;
 	GString *path;
 	const char *key;
@@ -421,12 +426,12 @@ static char *meta_data_key(const char *uri, char **pathp)
 
 	if (url == NULL) {
 		g_warning("Trying to retrieve meta-data for unparsable uri: %s", uri);
-		*pathp = g_build_path(evolution_dir, "meta/unknown", NULL);
+		*pathp = g_build_path(base_directory, "meta/unknown", NULL);
 
 		return g_strdup("folder");
 	}
 
-	path = g_string_new(evolution_dir);
+	path = g_string_new(base_directory);
 	g_string_append_printf(path, "/meta/%s/", url->protocol);
 
 	if (url->host && url->host[0]) {
diff --git a/mail/mail-vfolder.c b/mail/mail-vfolder.c
index 001a0ae57e..b27aea30f7 100644
--- a/mail/mail-vfolder.c
+++ b/mail/mail-vfolder.c
@@ -32,6 +32,8 @@
 #include "evolution-storage.h"
 
 #include "evolution-shell-component.h"
+#include "folder-browser.h"
+#include "mail-component.h"
 #include "mail-vfolder.h"
 #include "mail-tools.h"
 #include "mail-autofilter.h"
@@ -64,7 +66,6 @@ static GHashTable *vfolder_hash;
 extern EvolutionShellClient *global_shell_client;
 
 /* more globals ... */
-extern char *evolution_dir;
 extern CamelSession *session;
 
 static void rule_changed(FilterRule *rule, CamelFolder *folder);
@@ -471,7 +472,8 @@ mail_vfolder_delete_uri(CamelStore *store, const char *uri)
 		g_signal_connect_swapped (dialog, "response", G_CALLBACK (gtk_widget_destroy), dialog);
 		gtk_widget_show (dialog);
 		
-		user = g_strdup_printf ("%s/vfolders.xml", evolution_dir);
+		user = g_strdup_printf ("%s/vfolders.xml",
+					mail_component_peek_base_directory (mail_component_peek ()));
 		rule_context_save ((RuleContext *) context, user);
 		g_free (user);
 	}
@@ -526,7 +528,7 @@ mail_vfolder_rename_uri(CamelStore *store, const char *from, const char *to)
 		char *user;
 
 		d(printf("Vfolders updated from renamed folder\n"));
-		user = g_strdup_printf("%s/vfolders.xml", evolution_dir);
+		user = g_strdup_printf("%s/vfolders.xml", mail_component_peek_base_directory (mail_component_peek ()));
 		rule_context_save((RuleContext *)context, user);
 		g_free(user);
 	}
@@ -646,7 +648,10 @@ static void context_rule_removed(RuleContext *ctx, FilterRule *rule)
 	/* TODO: remove from folder info cache? */
 
 	path = g_strdup_printf("/%s", rule->name);
-	evolution_storage_removed_folder(mail_lookup_storage(vfolder_store), path);
+
+	/* EPFIXME This leaks, the original code was broken too.  */
+	e_storage_removed_folder (mail_component_lookup_storage (mail_component_peek (), vfolder_store), path);
+
 	g_free(path);
 
 	LOCK();
@@ -697,7 +702,7 @@ store_folder_deleted(CamelObject *o, void *event_data, void *data)
 		g_object_unref(rule);
 		g_signal_connect(context, "rule_removed", G_CALLBACK(context_rule_removed), context);
 
-		user = g_strdup_printf("%s/vfolders.xml", evolution_dir);
+		user = g_strdup_printf("%s/vfolders.xml", mail_component_peek_base_directory (mail_component_peek ()));
 		rule_context_save((RuleContext *)context, user);
 		g_free(user);
 	} else {
@@ -738,7 +743,7 @@ store_folder_renamed(CamelObject *o, void *event_data, void *data)
 		filter_rule_set_name(rule, info->new->full_name);
 		g_signal_connect(rule, "changed", G_CALLBACK(rule_changed), folder);
 
-		user = g_strdup_printf("%s/vfolders.xml", evolution_dir);
+		user = g_strdup_printf("%s/vfolders.xml", mail_component_peek_base_directory (mail_component_peek ()));
 		rule_context_save((RuleContext *)context, user);
 		g_free(user);
 
@@ -750,7 +755,7 @@ store_folder_renamed(CamelObject *o, void *event_data, void *data)
 }
 
 void
-vfolder_load_storage(GNOME_Evolution_Shell shell)
+vfolder_load_storage(void)
 {
 	char *user, *storeuri;
 	FilterRule *rule;
@@ -758,7 +763,7 @@ vfolder_load_storage(GNOME_Evolution_Shell shell)
 	vfolder_hash = g_hash_table_new(g_str_hash, g_str_equal);
 
 	/* first, create the vfolder store, and set it up */
-	storeuri = g_strdup_printf("vfolder:%s/vfolder", evolution_dir);
+	storeuri = g_strdup_printf("vfolder:%s/vfolder", mail_component_peek_base_directory (mail_component_peek ()));
 	vfolder_store = camel_session_get_store(session, storeuri, NULL);
 	if (vfolder_store == NULL) {
 		g_warning("Cannot open vfolder store - no vfolders available");
@@ -773,10 +778,10 @@ vfolder_load_storage(GNOME_Evolution_Shell shell)
 				(CamelObjectEventHookFunc)store_folder_renamed, NULL);
 
 	d(printf("got store '%s' = %p\n", storeuri, vfolder_store));
-	mail_load_storage_by_uri(shell, storeuri, _("VFolders"));
+	mail_component_load_storage_by_uri(mail_component_peek (), storeuri, _("VFolders"));
 
 	/* load our rules */
-	user = g_strdup_printf ("%s/vfolders.xml", evolution_dir);
+	user = g_strdup_printf ("%s/vfolders.xml", mail_component_peek_base_directory (mail_component_peek ()));
 	context = vfolder_context_new ();
 	if (rule_context_load ((RuleContext *)context,
 			       EVOLUTION_PRIVDATADIR "/vfoldertypes.xml", user) != 0) {
@@ -806,8 +811,7 @@ vfolder_editor_response (GtkWidget *dialog, int button, void *data)
 {
 	char *user;
 
-	user = alloca(strlen(evolution_dir)+16);
-	sprintf(user, "%s/vfolders.xml", evolution_dir);
+	user = g_strdup_printf ("%s/vfolders.xml", mail_component_peek_base_directory (mail_component_peek ()));
 
 	switch(button) {
 	case GTK_RESPONSE_ACCEPT:
@@ -820,6 +824,8 @@ vfolder_editor_response (GtkWidget *dialog, int button, void *data)
 	vfolder_editor = NULL;
 
 	gtk_widget_destroy(dialog);
+
+	g_free (user);
 }
 
 void
@@ -846,7 +852,7 @@ edit_rule_response(GtkWidget *w, int button, void *data)
 		FilterRule *orig = g_object_get_data (G_OBJECT (w), "orig");
 
 		filter_rule_copy(orig, rule);
-		user = g_strdup_printf("%s/vfolders.xml", evolution_dir);
+		user = g_strdup_printf("%s/vfolders.xml", mail_component_peek_base_directory (mail_component_peek ()));
 		rule_context_save((RuleContext *)context, user);
 		g_free(user);
 	}
@@ -877,7 +883,7 @@ vfolder_edit_rule(const char *uri)
 							      GTK_STOCK_OK,
 							      GTK_RESPONSE_OK,
 							      NULL);
-		gtk_container_set_border_width ((GtkContainer *) gd, 6);
+		gtk_container_set_border_width (GTK_CONTAINER (gd), 6);
 		gtk_box_set_spacing ((GtkBox *) gd->vbox, 6);
 		gtk_dialog_set_default_response(gd, GTK_RESPONSE_OK);
 		g_object_set(gd, "allow_shrink", FALSE, "allow_grow", TRUE, NULL);
@@ -925,7 +931,7 @@ new_rule_clicked(GtkWidget *w, int button, void *data)
 
 		g_object_ref(rule);
 		rule_context_add_rule((RuleContext *)context, rule);
-		user = g_strdup_printf("%s/vfolders.xml", evolution_dir);
+		user = g_strdup_printf("%s/vfolders.xml", mail_component_peek_base_directory (mail_component_peek ()));
 		rule_context_save((RuleContext *)context, user);
 		g_free(user);
 	}
@@ -971,7 +977,7 @@ vfolder_gui_add_rule(VfolderRule *rule)
 						      GTK_RESPONSE_OK,
 						      NULL);
 	gtk_dialog_set_default_response(gd, GTK_RESPONSE_OK);
-	gtk_container_set_border_width ((GtkContainer *) gd, 6);
+	gtk_container_set_border_width (GTK_CONTAINER (gd), 6);
 	gtk_box_set_spacing ((GtkBox *) gd->vbox, 6);
 	g_object_set(gd, "allow_shrink", FALSE, "allow_grow", TRUE, NULL);
 	gtk_window_set_default_size (GTK_WINDOW (gd), 500, 500);
diff --git a/mail/mail-vfolder.h b/mail/mail-vfolder.h
index 955b358c30..50c0dc5d93 100644
--- a/mail/mail-vfolder.h
+++ b/mail/mail-vfolder.h
@@ -11,7 +11,7 @@
 #include "filter/vfolder-rule.h"
 #include "filter/filter-part.h"
 
-void vfolder_load_storage(GNOME_Evolution_Shell shell);
+void vfolder_load_storage(void);
 
 void vfolder_edit (void);
 void vfolder_edit_rule(const char *name);
diff --git a/mail/mail.h b/mail/mail.h
index 81832cd2a5..86ca868f5f 100644
--- a/mail/mail.h
+++ b/mail/mail.h
@@ -31,23 +31,7 @@
 #include "mail-session.h"
 #include "mail-types.h"
 
-extern char *evolution_dir;
-
 /* mail-identify */
 char *mail_identify_mime_part (CamelMimePart *part, MailDisplay *md);
-
-/* component factory for lack of a better place */
-void mail_add_storage (CamelStore *store, const char *name, const char *uri);
-void mail_load_storage_by_uri (GNOME_Evolution_Shell shell, const char *uri, const char *name);
-/*takes a GSList of MailConfigServices */
-void mail_load_storages (GNOME_Evolution_Shell shell, EAccountList *sources);
-
-void mail_hash_storage (CamelService *store, EvolutionStorage *storage);
-EvolutionStorage *mail_lookup_storage (CamelStore *store);
-void mail_remove_storage_by_uri (const char *uri);
-void mail_remove_storage (CamelStore *store);
-void mail_storages_foreach (GHFunc func, gpointer data);
-int  mail_storages_count (void);
-
 gboolean evolution_folder_info_factory_init (void);
 
diff --git a/mail/main.c b/mail/main.c
deleted file mode 100644
index b5192a9f5c..0000000000
--- a/mail/main.c
+++ /dev/null
@@ -1,161 +0,0 @@
-/*
- * main.c: The core of the mail component
- *
- * Author:
- *   Miguel de Icaza (miguel@ximian.com)
- *
- * (C) 2000 Ximian, Inc.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <signal.h>
-
-#include <libgnome/gnome-sound.h>
-#include <bonobo/bonobo-main.h>
-#include <bonobo-activation/bonobo-activation-init.h>
-#include <glade/glade.h>
-#include <libgnomevfs/gnome-vfs.h>
-
-#include <gconf/gconf.h>
-
-#include <gal/widgets/e-gui-utils.h>
-#include <gal/widgets/e-cursors.h>
-
-#include "e-util/e-passwords.h"
-#include "e-util/e-proxy.h"
-
-#include "component-factory.h"
-#include "composer/evolution-composer.h"
-#include "mail.h"
-#include "mail-mt.h"
-
-/*#define DO_MCHECK*/
-
-#ifdef DO_MCHECK
-static int blowup(int status)
-{
-	switch(status) {
-	case 1:
-		printf("Double free failure\n");
-		break;
-	case 2:
-		printf("Memory clobbered before block\n");
-		break;
-	case 3:
-		printf("Memory clobbered after block\n");
-		break;
-	}
-	abort();
-	return status;
-}
-#endif
-
-/* The GNOME SEGV handler will lose if it's not run from the main Gtk
- * thread. So if we crash in another thread, redirect the signal.
- */
-static void (*gnome_segv_handler) (int);
-
-static GStaticMutex segv_mutex = G_STATIC_MUTEX_INIT;
-
-static void
-segv_redirect (int sig)
-{
-	if (pthread_self () == mail_gui_thread)
-		gnome_segv_handler (sig);
-	else {
-		pthread_kill (mail_gui_thread, sig);
-		/* We can't return from the signal handler or the
-		 * thread may SEGV again. But we can't pthread_exit,
-		 * because then the thread may get cleaned up before
-		 * bug-buddy can get a stack trace. So we block by
-		 * trying to lock a mutex we know is already locked.
-		 */
-		g_static_mutex_lock (&segv_mutex);
-	}
-}
-
-int
-main (int argc, char *argv [])
-{
-	CORBA_ORB orb;
-	struct sigaction sa, osa;
-
-        /* used to make elfence work */                                         
-	free(malloc (10));
-#ifdef DO_MCHECK                                                                
-        /*mtrace();*/                                                           
-        mcheck(blowup);                                                         
-#endif                                                                          
-	bindtextdomain (GETTEXT_PACKAGE, EVOLUTION_LOCALEDIR);
-	textdomain (GETTEXT_PACKAGE);
-
-	g_thread_init (NULL);
-
-	gnome_init_with_popt_table ("evolution-mail-component", VERSION,
-				    argc, argv, bonobo_activation_popt_options, 0, NULL);
-	
-	sigaction (SIGSEGV, NULL, &osa);
-	if (osa.sa_handler != SIG_DFL) {
-		sa.sa_flags = 0;
-		sigemptyset (&sa.sa_mask);
-		sa.sa_handler = segv_redirect;
-		sigaction (SIGSEGV, &sa, NULL);
-		sigaction (SIGBUS, &sa, NULL);
-		sigaction (SIGFPE, &sa, NULL);
-		
-		sa.sa_handler = SIG_IGN;
-		sigaction (SIGXFSZ, &sa, NULL);
-		gnome_segv_handler = osa.sa_handler;
-		g_static_mutex_lock (&segv_mutex);
-	}
-	
-	if (!bonobo_init (&argc, argv)) {
-		g_error ("Mail component could not initialize Bonobo.\n"
-			 "If there was a warning message about the "
-			 "RootPOA, it probably means\nyou compiled "
-			 "Bonobo against GOAD instead of Bonobo Activation.");
-	}
-	
-	gconf_init (argc, argv, NULL);
-	
-	glade_init ();
-	
-	gnome_vfs_init ();
-	
-	e_cursors_init ();
-	
-	e_proxy_init ();
-	
-	mail_config_init ();
-	mail_msg_init ();
-	
-	gnome_sound_init ("localhost");
-	
-	component_factory_init ();
-	evolution_composer_factory_init (composer_send_cb, composer_save_draft_cb);
-	
-	if (gdk_threads_mutex) {
-		g_mutex_free (gdk_threads_mutex);
-		gdk_threads_mutex = NULL;
-	}
-	
-	g_print ("Evolution Mail ready and running.\n");
-	
-	GDK_THREADS_ENTER ();
-	bonobo_main ();
-	
-	mail_msg_cleanup();
-	
-	GDK_THREADS_LEAVE ();
-	
-	mail_config_write_on_exit ();
-	
-	e_passwords_shutdown ();
-	
-	gnome_sound_shutdown ();
-	
-	return 0;
-}
diff --git a/mail/message-browser.c b/mail/message-browser.c
new file mode 100644
index 0000000000..e8e6ee0ef2
--- /dev/null
+++ b/mail/message-browser.c
@@ -0,0 +1,402 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
+/*
+ *  Authors: Jeffrey Stedfast <fejj@ximian.com>
+ *
+ *  Copyright 2001 Ximian, Inc. (www.ximian.com)
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of version 2 of the GNU General Public
+ * License as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public
+ * License along with this program; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ *
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <gconf/gconf.h>
+#include <gconf/gconf-client.h>
+
+#include <gal/util/e-util.h>
+
+#include <bonobo/bonobo-exception.h>
+#include <bonobo/bonobo-ui-component.h>
+#include <bonobo/bonobo-ui-container.h>
+#include <bonobo/bonobo-ui-util.h>
+
+#include "message-browser.h"
+
+#include "mail.h"
+#include "mail-callbacks.h"
+#include "mail-tools.h"
+#include "message-list.h"
+#include "mail-ops.h"
+#include "mail-vfolder.h"
+#include "mail-autofilter.h"
+#include "mail-mt.h"
+
+#include "mail-local.h"
+#include "mail-config.h"
+
+#include "folder-browser-ui.h"
+
+#define d(x) 
+
+#define MINIMUM_WIDTH  600
+#define MINIMUM_HEIGHT 400
+
+#define PARENT_TYPE BONOBO_TYPE_WINDOW
+
+/* Size of the window last time it was changed.  */
+static GtkAllocation last_allocation = { 0, 0 };
+
+static BonoboWindowClass *message_browser_parent_class;
+
+static void
+message_browser_destroy (GtkObject *object)
+{
+	MessageBrowser *message_browser;
+	
+	message_browser = MESSAGE_BROWSER (object);
+	
+	if (message_browser->ml_built_id) {
+		g_signal_handler_disconnect (message_browser->fb->message_list, message_browser->ml_built_id);
+		message_browser->ml_built_id = 0;
+	}
+	
+	if (message_browser->loaded_id) {
+		g_signal_handler_disconnect (message_browser->fb, message_browser->loaded_id);
+		message_browser->loaded_id = 0;
+	}
+	
+	if (message_browser->fb) {
+		g_object_unref (message_browser->fb);
+		message_browser->fb = NULL;
+	}
+	
+	if (GTK_OBJECT_CLASS (message_browser_parent_class)->destroy)
+		(GTK_OBJECT_CLASS (message_browser_parent_class)->destroy) (object);
+}
+
+static void
+message_browser_class_init (GObjectClass *object_class)
+{
+	((GtkObjectClass *)object_class)->destroy = message_browser_destroy;
+	
+	message_browser_parent_class = g_type_class_ref (PARENT_TYPE);
+}
+
+static void
+message_browser_init (GtkObject *object)
+{
+	
+}
+
+static void
+transfer_msg_done (gboolean ok, void *data)
+{
+	MessageBrowser *mb = data;
+	
+	gtk_widget_destroy ((GtkWidget *) mb);
+	
+	g_object_unref (mb);
+}
+
+static void
+transfer_msg (MessageBrowser *mb, int del)
+{
+	const char *allowed_types[] = { "mail/*", "vtrash", NULL };
+	extern EvolutionShellClient *global_shell_client;
+	GNOME_Evolution_Folder *folder;
+	static char *last_uri = NULL;
+	GPtrArray *uids;
+	char *desc;
+	
+/*	if (GTK_OBJECT_DESTROYED(mb))
+	return;*/
+	
+	if (last_uri == NULL)
+		last_uri = g_strdup ("");
+	
+	if (del)
+		desc = _("Move message(s) to");
+	else
+		desc = _("Copy message(s) to");
+	
+	evolution_shell_client_user_select_folder (global_shell_client,
+						   GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (mb))),
+						   desc, last_uri, allowed_types, &folder);
+	if (!folder)
+		return;
+	
+	if (strcmp (last_uri, folder->evolutionUri) != 0) {
+		g_free (last_uri);
+		last_uri = g_strdup (folder->evolutionUri);
+	}
+	
+	uids = g_ptr_array_new ();
+	message_list_foreach (mb->fb->message_list, enumerate_msg, uids);
+	
+	if (del) {
+		g_object_ref (mb);
+		mail_transfer_messages (mb->fb->folder, uids, del,
+					folder->physicalUri, 0, transfer_msg_done, mb);
+	} else {
+		mail_transfer_messages (mb->fb->folder, uids, del,
+					folder->physicalUri, 0, NULL, NULL);
+	}
+	
+	CORBA_free (folder);
+}
+
+
+/* UI callbacks */
+
+static void
+message_browser_close (BonoboUIComponent *uih, void *user_data, const char *path)
+{
+	gtk_widget_destroy (GTK_WIDGET (user_data));
+}
+
+static void
+message_browser_move (BonoboUIComponent *uih, void *user_data, const char *path)
+{
+	transfer_msg (user_data, TRUE);
+}
+
+static void
+message_browser_copy (BonoboUIComponent *uih, void *user_data, const char *path)
+{
+	transfer_msg (user_data, FALSE);
+}
+
+static void
+message_browser_delete (BonoboUIComponent *uih, void *user_data, const char *path)
+{
+	MessageBrowser *mb = user_data;
+	GPtrArray *uids;
+	int i;
+	
+	uids = g_ptr_array_new ();
+	message_list_foreach (mb->fb->message_list, enumerate_msg, uids);
+	camel_folder_freeze (mb->fb->folder);
+	for (i = 0; i < uids->len; i++) {
+		camel_folder_set_message_flags (mb->fb->folder, uids->pdata[i],
+						CAMEL_MESSAGE_DELETED | CAMEL_MESSAGE_SEEN,
+						CAMEL_MESSAGE_DELETED | CAMEL_MESSAGE_SEEN);
+		g_free (uids->pdata[i]);
+	}
+	
+	camel_folder_thaw (mb->fb->folder);
+	
+	g_ptr_array_free (uids, TRUE);
+	
+	gtk_widget_destroy ((GtkWidget *) mb);
+}
+
+static BonoboUIVerb 
+browser_verbs [] = {
+	BONOBO_UI_UNSAFE_VERB ("MessageBrowserClose", message_browser_close),
+	BONOBO_UI_UNSAFE_VERB ("MessageMove", message_browser_move),
+	BONOBO_UI_UNSAFE_VERB ("MessageCopy", message_browser_copy),
+	BONOBO_UI_UNSAFE_VERB ("MessageDelete", message_browser_delete),
+	BONOBO_UI_VERB_END
+};
+
+/* FB message loading hookups */
+
+static void
+message_browser_message_loaded (FolderBrowser *fb, const char *uid, MessageBrowser *mb)
+{
+	CamelMimeMessage *message;
+	char *subject = NULL;
+	char *title;
+	
+	folder_browser_ui_message_loaded(fb);
+	
+	message = fb->mail_display->current_message;
+	
+	if (message)
+		subject = (char *) camel_mime_message_get_subject (message);
+	
+	if (subject == NULL)
+		subject = _("(No subject)");
+	
+	title = g_strdup_printf (_("%s - Message"), subject);
+	
+	gtk_window_set_title (GTK_WINDOW (mb), title);
+	
+	g_free (title);
+}
+
+static void
+message_browser_message_list_built (MessageList *ml, MessageBrowser *mb)
+{
+	const char *uid = g_object_get_data (G_OBJECT (mb), "uid");
+	
+	g_signal_handler_disconnect (ml, mb->ml_built_id);
+	mb->ml_built_id = 0;
+	
+	message_list_select_uid (ml, uid);
+}
+
+static void
+message_browser_folder_loaded (FolderBrowser *fb, const char *uri, MessageBrowser *mb)
+{
+	g_signal_handler_disconnect (fb, mb->loaded_id);
+	mb->loaded_id = 0;
+	
+	mb->ml_built_id = g_signal_connect (fb->message_list, "message_list_built",
+					    G_CALLBACK (message_browser_message_list_built), mb);
+}
+
+static void
+message_browser_size_allocate_cb (GtkWidget *widget,
+				  GtkAllocation *allocation)
+{
+	last_allocation = *allocation;
+}
+
+/* Construction */
+
+static void
+set_default_size (GtkWidget *widget)
+{
+	int width, height;
+	
+	width  = MAX (MINIMUM_WIDTH, last_allocation.width);
+	height = MAX (MINIMUM_HEIGHT, last_allocation.height);
+	
+	gtk_window_set_default_size (GTK_WINDOW (widget), width, height);
+}
+
+static void 
+set_bonobo_ui (GtkWidget *widget, FolderBrowser *fb)
+{
+	BonoboUIContainer *uicont;
+	BonoboUIComponent *uic;
+	CORBA_Environment ev;
+	
+	uicont = bonobo_window_get_ui_container (BONOBO_WINDOW (widget));
+	
+	uic = bonobo_ui_component_new_default ();
+	bonobo_ui_component_set_container (uic, BONOBO_OBJREF (uicont), NULL);
+	folder_browser_set_ui_component (fb, uic);
+	
+	/* Load our UI */
+	
+	/*bonobo_ui_component_freeze (uic, NULL);*/
+	bonobo_ui_util_set_ui (uic, PREFIX,
+			       EVOLUTION_UIDIR "/evolution-mail-messagedisplay.xml",
+			       "evolution-mail", NULL);
+	
+	/* Load the appropriate UI stuff from the folder browser */
+	
+	folder_browser_ui_add_message (fb);
+	
+	/* We just opened the message! We don't need to open it again. */
+	
+	CORBA_exception_init (&ev);
+	/* remove the broken menus and toolbar items */
+	bonobo_ui_component_rm (uic, "/menu/File/FileOps/MessageOpen", &ev);
+	bonobo_ui_component_rm (uic, "/menu/Actions/ComponentActionsPlaceholder/MailMessageActions/GoTo", &ev);
+	bonobo_ui_component_rm (uic, "/menu/Tools", &ev);
+	bonobo_ui_component_rm (uic, "/Toolbar/MailNextButtons", &ev);
+	CORBA_exception_free (&ev);
+	
+	/* Hack around the move/copy/delete commands api's */
+	bonobo_ui_component_remove_listener (uic, "MessageCopy");
+	bonobo_ui_component_remove_listener (uic, "MessageMove");
+	bonobo_ui_component_remove_listener (uic, "MessageDelete");
+	
+	/* Add the Close & Move/Copy/Delete items */
+	
+	bonobo_ui_component_add_verb_list_with_data (uic, browser_verbs, widget);
+	
+	/* Done */
+	
+	/*bonobo_ui_component_thaw (uic, NULL);*/
+}
+
+static int
+on_key_press (GtkWidget *widget, GdkEventKey *key, gpointer data)
+{
+	MessageBrowser *mb = data;
+	
+	if (key->state & GDK_CONTROL_MASK)
+		return FALSE;
+	
+	switch (key->keyval) {
+	case GDK_Delete:
+	case GDK_KP_Delete:
+		message_browser_delete (NULL, mb, NULL);
+		return TRUE;
+	case GDK_Escape:
+		message_browser_close (NULL, mb, NULL);
+		return TRUE;	
+	default:
+	}
+	
+	return FALSE;
+}
+
+GtkWidget *
+message_browser_new (const char *uri, const char *uid)
+{
+	GtkWidget *vbox;
+	MessageBrowser *new;
+	FolderBrowser *fb;
+	
+	new = g_object_new (MESSAGE_BROWSER_TYPE, "title", "Ximian Evolution", NULL);
+	
+	g_object_set_data_full (G_OBJECT (new), "uid", g_strdup (uid), g_free);
+	
+	fb = FOLDER_BROWSER (folder_browser_new (uri));
+	g_object_ref (fb);
+	gtk_object_sink ((GtkObject *) fb);
+	
+	new->fb = fb;
+	
+	set_bonobo_ui (GTK_WIDGET (new), fb);
+	
+	/* some evil hackery action... */
+	vbox = gtk_vbox_new (TRUE, 0);
+	gtk_widget_ref (GTK_WIDGET (fb->mail_display));
+	gtk_widget_reparent (GTK_WIDGET (fb->mail_display), vbox);
+	/* Note: normally we'd unref the fb->mail_display now, except
+           that if we do then our refcounts will not be in
+           harmony... both the fb *and* the message-browser need to
+           own a ref on the mail_display. */
+	gtk_widget_show (GTK_WIDGET (fb->mail_display));
+	gtk_widget_show (vbox);
+	
+	g_signal_connect (new, "size-allocate", G_CALLBACK (message_browser_size_allocate_cb), NULL);
+	
+	bonobo_window_set_contents (BONOBO_WINDOW (new), vbox);
+	gtk_widget_grab_focus (GTK_WIDGET (MAIL_DISPLAY (fb->mail_display)->html));
+	
+	set_default_size (GTK_WIDGET (new));
+	
+	/* more evil hackery... */
+	new->loaded_id = g_signal_connect (fb, "folder_loaded", G_CALLBACK (message_browser_folder_loaded), new);
+	g_signal_connect (fb, "message_loaded", G_CALLBACK (message_browser_message_loaded), new);
+	
+	g_signal_connect (new, "key_press_event", G_CALLBACK (on_key_press), new);
+	
+	return GTK_WIDGET (new);
+}
+
+/* Fin */
+
+E_MAKE_TYPE (message_browser, "MessageBrowser", MessageBrowser, message_browser_class_init,
+	     message_browser_init, PARENT_TYPE);
diff --git a/mail/message-browser.h b/mail/message-browser.h
new file mode 100644
index 0000000000..a02b13ef06
--- /dev/null
+++ b/mail/message-browser.h
@@ -0,0 +1,63 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
+/*
+ *  Authors: Jeffrey Stedfast <fejj@ximian.com>
+ *
+ *  Copyright 2001 Ximian, Inc. (www.ximian.com)
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of version 2 of the GNU General Public
+ * License as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public
+ * License along with this program; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ *
+ */
+
+#ifndef _MESSAGE_BROWSER_H_
+#define _MESSAGE_BROWSER_H_
+
+#include <gnome.h>
+#include <bonobo/bonobo-window.h>
+
+#include <camel/camel-folder.h>
+#include "folder-browser.h"
+#include "mail-display.h"
+#include "mail-types.h"
+
+#define MESSAGE_BROWSER_TYPE        (message_browser_get_type ())
+#define MESSAGE_BROWSER(o)          (G_TYPE_CHECK_INSTANCE_CAST ((o), MESSAGE_BROWSER_TYPE, MessageBrowser))
+#define MESSAGE_BROWSER_CLASS(k)    (G_TYPE_CHECK_CLASS_CAST ((k), MESSAGE_BROWSER_TYPE, MessageBrowserClass))
+#define IS_MESSAGE_BROWSER(o)       (G_TYPE_CHECK_INSTANCE_TYPE ((o), MESSAGE_BROWSER_TYPE))
+#define IS_MESSAGE_BROWSER_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), MESSAGE_BROWSER_TYPE))
+
+struct _MessageBrowser {
+	BonoboWindow parent;
+	
+	/*
+	 * The current URI being displayed by the MessageBrowser
+	 */
+	FolderBrowser *fb;
+	gulong ml_built_id;
+	gulong loaded_id;
+};
+
+
+typedef struct {
+	BonoboWindowClass parent_class;
+	
+} MessageBrowserClass;
+
+GtkType  message_browser_get_type  (void);
+
+GtkWidget *message_browser_new  (const char *uri,
+				 const char *uid);
+
+#endif /* _MESSAGE_BROWSER_H_ */
+
diff --git a/mail/subscribe-dialog.c b/mail/subscribe-dialog.c
new file mode 100644
index 0000000000..a1c18ff870
--- /dev/null
+++ b/mail/subscribe-dialog.c
@@ -0,0 +1,1669 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
+/* subscribe-dialog.c: Subscribe dialog */
+/*
+ *  Authors: Chris Toshok <toshok@ximian.com>
+ *           Peter Williams <peterw@ximian.com>
+ *
+ *  Copyright 2000 Ximian, Inc. (www.ximian.com)
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of version 2 of the GNU General Public
+ * License as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public
+ * License along with this program; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ *
+ */
+
+/* This doens't do what it's supposed to do ...
+   I think etree changed so it just fills out the whole tree always anyway */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <string.h>
+
+#include <gal/util/e-util.h>
+
+#include <gal/e-table/e-cell-toggle.h>
+#include <gal/e-table/e-cell-text.h>
+#include <gal/e-table/e-cell-tree.h>
+
+#include <gal/e-table/e-tree-scrolled.h>
+#include <gal/e-table/e-tree-memory-callbacks.h>
+#include <gal/e-table/e-tree.h>
+
+#include <pthread.h>
+
+#include "evolution-shell-component-utils.h"
+#include "mail.h"
+#include "mail-component.h"
+#include "mail-tools.h"
+#include "mail-ops.h"
+#include "mail-mt.h"
+#include "mail-folder-cache.h"
+#include "camel/camel-exception.h"
+#include "camel/camel-store.h"
+#include "camel/camel-session.h"
+#include "subscribe-dialog.h"
+
+#include "art/empty.xpm"
+#include "art/mark.xpm"
+
+#define d(x) 
+
+/* Things to test.
+ * - Feature
+ *   + How to check that it works.
+ *
+ * - Proper stores displayed
+ *   + Skip stores that don't support subscriptions
+ *   + Skip disabled stores
+ * - Changing subscription status
+ *   + Select single folder, double-click row -> toggled
+ *   + Select multiple folders, press subscribe -> all selected folders end up subscribed
+ * - (un)Subscribing from/to already (un)subscribed folder
+ *   + Check that no IMAP command is sent
+ * - Switching views between stores
+ *   + Proper tree shown
+ * - No crashes when buttons are pressed with "No store" screen
+ *   + obvious
+ * - Restoring filter settings when view switched
+ *   + Enter search, change view, change back -> filter checked and search entry set
+ *   + Clear search, change view, change back -> "all" checked
+ * - Cancelling in middle of get_store 
+ *   + Enter invalid hostname, open dialog, click Close
+ * - Cancelling in middle if listing 
+ *   + Open large directory, click Close
+ * - Cancelling in middle of subscription op
+ *   + How to test?
+ * - Test with both IMAP and NNTP
+ *   + obvious
+ * - Verify that refresh view works
+ *   + obvious
+ * - No unnecessary tree rebuilds
+ *   + Show All folders, change filter with empty search -> no tree rebuild
+ *   + Converse
+ * - No out of date tree
+ *   + Show All Folders, change to filter with a search -> tree rebuild
+ * - Tree construction logic (mostly IMAP-specific terminology)
+ *   + Tree is created progressively
+ *   + No wasted LIST responses
+ *   + No extraneous LIST commands
+ *   + Specifying "folder names begin with" works
+ *   + Always show folders below IMAP namespace (no escaping the namespace)
+ *   + Don't allow subscription to NoSelect folders
+ *   + IMAP accounts always show INBOX
+ * - Shell interactions
+ *   + Folders are properly created / delete from folder tree when subscribed / unsubscribed
+ *   + Folders with spaces in names / 8bit chars
+ *   + Toplevel as well as subfolders
+ *   + Mail Folder Cache doesn't complain
+ * - No ETable wackiness
+ *   + Verify columns cannot be DnD'd
+ *   + Alphabetical order always
+ * - UI cleanliness
+ *   + Keybindings work
+ *   + Some widget has focus by default
+ *   + Escape / enter work
+ *   + Close button works
+ */
+
+/* FIXME: we should disable/enable the subscribe/unsubscribe buttons as
+ * appropriate when only a single folder is selected. We need a
+ * mechanism to learn when the selected folder's subscription status
+ * changes, so when the user double-clicks it (eg) the buttons can
+ * (de)sensitize appropriately. See Ximian bug #7673.
+ */
+
+/*#define NEED_TOGGLE_SELECTION*/
+
+typedef struct _FolderETree              FolderETree;
+typedef struct _FolderETreeClass         FolderETreeClass;
+
+typedef void (*FolderETreeActivityCallback) (int level, gpointer user_data);
+
+struct _FolderETree {
+	ETreeMemory parent;
+	ETreePath root;
+
+	GHashTable *scan_ops;
+	GHashTable *subscribe_ops;
+
+	GHashTable *node_full_name;
+
+	CamelStore *store;
+	EStorage *e_storage;
+	char *service_name;
+	
+	FolderETreeActivityCallback activity_cb;
+	gpointer activity_data;
+	int activity_level;
+};
+
+struct _FolderETreeClass {
+	ETreeMemoryClass parent;
+};
+
+static GtkObjectClass *folder_etree_parent_class = NULL;
+
+typedef struct _FolderETreeExtras      FolderETreeExtras;
+typedef struct _FolderETreeExtrasClass FolderETreeExtrasClass;
+
+enum {
+	FOLDER_COL_SUBSCRIBED,
+	FOLDER_COL_NAME,
+	FOLDER_COL_LAST
+};
+
+struct _FolderETreeExtras {
+	ETableExtras parent;
+	GdkPixbuf *toggles[2];
+};
+
+struct _FolderETreeExtrasClass {
+	ETableExtrasClass parent;
+};
+
+static GtkObjectClass *ftree_extras_parent_class = NULL;
+
+/* util */
+
+static void
+recursive_add_folder (EStorage *storage, const char *path, const char *name, const char *url)
+{
+	EFolder *folder;
+	char *parent, *pname, *p;
+
+	p = strrchr (path, '/');
+	if (p && p != path) {
+		parent = g_strndup (path, p - path);
+		if (! e_storage_get_folder (storage, parent)) {
+			p = strrchr (parent, '/');
+			if (p)
+				pname = g_strdup (p + 1);
+			else
+				pname = g_strdup ("");
+			recursive_add_folder (storage, parent, pname, "");
+			g_free (pname);
+		}
+		g_free (parent);
+	}
+
+	folder = e_folder_new (name, "mail", NULL);
+	e_folder_set_physical_uri (folder, url);
+	e_folder_set_can_sync_offline (folder, TRUE);
+
+	e_storage_new_folder (storage, path, folder);
+}
+
+/* ** Get one level of folderinfo ****************************************** */
+
+typedef void (*SubscribeShortFolderinfoFunc) (CamelStore *store, char *prefix, CamelFolderInfo *info, gpointer data);
+
+int subscribe_get_short_folderinfo (FolderETree *ftree, const char *prefix,
+				    SubscribeShortFolderinfoFunc func, gpointer user_data);
+
+struct _get_short_folderinfo_msg {
+	struct _mail_msg msg;
+
+	char *prefix;
+
+	FolderETree *ftree;
+	CamelFolderInfo *info;
+
+	SubscribeShortFolderinfoFunc func;
+	gpointer user_data;
+};
+
+static char *
+get_short_folderinfo_desc (struct _mail_msg *mm, int done)
+{
+	struct _get_short_folderinfo_msg *m = (struct _get_short_folderinfo_msg *) mm;
+	char *ret, *name;
+
+	name = camel_service_get_name (CAMEL_SERVICE (m->ftree->store), TRUE);
+
+	if (m->prefix)
+		ret = g_strdup_printf (_("Scanning folders under %s on \"%s\""), m->prefix, name);
+	else
+		ret = g_strdup_printf (_("Scanning root-level folders on \"%s\""), name);
+
+	g_free (name);
+	return ret;
+}
+
+static void
+get_short_folderinfo_get (struct _mail_msg *mm)
+{
+	struct _get_short_folderinfo_msg *m = (struct _get_short_folderinfo_msg *) mm;
+
+	m->info = camel_store_get_folder_info (m->ftree->store, m->prefix, CAMEL_STORE_FOLDER_INFO_FAST, &mm->ex);
+
+	d(printf("%d: getted folderinfo '%s'\n", mm->seq, m->prefix));
+}
+
+static void
+get_short_folderinfo_got (struct _mail_msg *mm)
+{
+	struct _get_short_folderinfo_msg *m = (struct _get_short_folderinfo_msg *) mm;
+
+	d(printf("%d: got folderinfo '%s'\n", mm->seq, m->prefix));
+
+	if (camel_exception_is_set (&mm->ex) && camel_exception_get_id(&mm->ex) != CAMEL_EXCEPTION_USER_CANCEL) {
+		g_warning ("Error getting folder info from store at %s: %s",
+			   camel_service_get_url (CAMEL_SERVICE (m->ftree->store)),
+			   camel_exception_get_description (&mm->ex));
+	}
+
+	if (m->func)
+		m->func (m->ftree->store, m->prefix, m->info, m->user_data);
+}
+
+static void
+get_short_folderinfo_free (struct _mail_msg *mm)
+{
+	struct _get_short_folderinfo_msg *m = (struct _get_short_folderinfo_msg *) mm;
+
+	camel_store_free_folder_info (m->ftree->store, m->info);
+	g_object_unref((m->ftree));
+
+	g_free (m->prefix); /* may be NULL but that's ok */
+}
+
+static struct _mail_msg_op get_short_folderinfo_op = {
+	get_short_folderinfo_desc,
+	get_short_folderinfo_get,
+	get_short_folderinfo_got,
+	get_short_folderinfo_free,
+};
+
+int
+subscribe_get_short_folderinfo (FolderETree *ftree, 
+				const char *prefix,
+				SubscribeShortFolderinfoFunc func, 
+				gpointer user_data)
+{
+	struct _get_short_folderinfo_msg *m;
+	int id;
+
+	m = mail_msg_new (&get_short_folderinfo_op, NULL, sizeof(*m));
+
+	m->ftree = ftree;
+	g_object_ref((ftree));
+	m->prefix = g_strdup (prefix);
+	m->func = func;
+	m->user_data = user_data;
+
+	d(printf("%d: get folderinfo '%s'\n", m->msg.seq, m->prefix));
+
+	id = m->msg.seq;
+	e_thread_put (mail_thread_queued, (EMsg *)m);
+	return id;
+}
+
+/* ** Subscribe folder operation **************************************** */
+
+typedef void (*SubscribeFolderCallback) (const char *, const char *, gboolean, gboolean, gpointer);
+
+struct _subscribe_msg {
+	struct _mail_msg         msg;
+
+	CamelStore              *store;
+	gboolean                 subscribe;
+	char                    *full_name;
+	char                    *name;
+
+	SubscribeFolderCallback  cb;
+	gpointer                 cb_data;
+};
+
+static char *
+subscribe_folder_desc (struct _mail_msg *mm, int done)
+{
+	struct _subscribe_msg *m = (struct _subscribe_msg *) mm;
+
+	if (m->subscribe)
+		return g_strdup_printf (_("Subscribing to folder \"%s\""), m->name);
+	else
+		return g_strdup_printf (_("Unsubscribing to folder \"%s\""), m->name);
+}
+
+static void 
+subscribe_folder_subscribe (struct _mail_msg *mm)
+{
+	struct _subscribe_msg *m = (struct _subscribe_msg *) mm;
+	
+	if (m->subscribe)
+		camel_store_subscribe_folder (m->store, m->full_name, &mm->ex);
+	else
+		camel_store_unsubscribe_folder (m->store, m->full_name, &mm->ex);
+}
+
+static void 
+subscribe_folder_subscribed (struct _mail_msg *mm)
+{
+	struct _subscribe_msg *m = (struct _subscribe_msg *) mm;
+	
+	if (m->cb)
+		(m->cb) (m->full_name, m->name, m->subscribe, 
+			 !camel_exception_is_set (&mm->ex), m->cb_data);
+}
+
+static void 
+subscribe_folder_free (struct _mail_msg *mm)
+{
+	struct _subscribe_msg *m = (struct _subscribe_msg *) mm;
+
+	g_free (m->name);
+	g_free (m->full_name);
+	
+	camel_object_unref (m->store);
+}
+
+static struct _mail_msg_op subscribe_folder_op = {
+	subscribe_folder_desc,
+	subscribe_folder_subscribe,
+	subscribe_folder_subscribed,
+	subscribe_folder_free,
+};
+
+static int
+subscribe_do_subscribe_folder (CamelStore *store, const char *full_name, const char *name,
+			       gboolean subscribe, SubscribeFolderCallback cb, gpointer cb_data)
+{
+	struct _subscribe_msg *m;
+	int id;
+
+	g_return_val_if_fail (CAMEL_IS_STORE (store), 0);
+	g_return_val_if_fail (full_name, 0);
+
+	m            = mail_msg_new (&subscribe_folder_op, NULL, sizeof(*m));
+	m->store     = store;
+	m->subscribe = subscribe;
+	m->name      = g_strdup (name);
+	m->full_name = g_strdup (full_name);
+	m->cb        = cb;
+	m->cb_data   = cb_data;
+
+	camel_object_ref(store);
+
+	id = m->msg.seq;
+	e_thread_put (mail_thread_queued, (EMsg *)m);
+	return id;
+}
+
+/* ** FolderETree Extras *************************************************** */
+
+static void
+fete_finalise (GObject *object)
+{
+	FolderETreeExtras *extras = (FolderETreeExtras *) object;
+
+	g_object_unref (extras->toggles[0]);
+	g_object_unref (extras->toggles[1]);
+
+	((GObjectClass *)ftree_extras_parent_class)->finalize (object);
+}
+
+static void
+fete_class_init (GObjectClass *object_class)
+{
+	object_class->finalize = fete_finalise;
+
+	ftree_extras_parent_class = g_type_class_ref (E_TABLE_EXTRAS_TYPE);
+}
+
+static void
+fete_init (GtkObject *object)
+{
+	FolderETreeExtras *extras = (FolderETreeExtras *) object;
+	ECell             *cell;
+	ECell             *text_cell;
+
+	/* text column */
+
+	cell = e_cell_text_new (NULL, GTK_JUSTIFY_LEFT);
+	text_cell = cell;
+	g_object_set (G_OBJECT (cell),
+		      "bold_column", FOLDER_COL_SUBSCRIBED,
+		      NULL);
+	e_table_extras_add_cell (E_TABLE_EXTRAS (extras), "cell_text", cell);
+
+	/* toggle column */
+
+	extras->toggles[0] = gdk_pixbuf_new_from_xpm_data ((const char **)empty_xpm);
+	extras->toggles[1] = gdk_pixbuf_new_from_xpm_data ((const char **)mark_xpm);
+	cell = e_cell_toggle_new (0, 2, extras->toggles);
+	e_table_extras_add_cell (E_TABLE_EXTRAS (extras), "cell_toggle", cell);
+
+	/* tree cell */
+
+	cell = e_cell_tree_new (NULL, NULL, TRUE, text_cell);
+	e_table_extras_add_cell (E_TABLE_EXTRAS (extras), "cell_tree", cell);
+
+	/* misc */
+
+	e_table_extras_add_pixbuf (E_TABLE_EXTRAS (extras), "subscribed-image", extras->toggles[1]);
+}
+
+/* naughty! */
+static
+E_MAKE_TYPE (fete, "FolderETreeExtras", FolderETreeExtras, fete_class_init, fete_init, E_TABLE_EXTRAS_TYPE);
+
+/* ** Global Extras ******************************************************** */
+
+static FolderETreeExtras *global_extras = NULL;
+
+static void
+global_extras_destroyed (void *user_data, GObject *obj)
+{
+	global_extras = NULL;
+}
+
+static ETableExtras *
+subscribe_get_global_extras (void)
+{
+	if (global_extras == NULL) {
+		global_extras = g_object_new (fete_get_type(), NULL);
+		/*g_object_ref(global_extras);
+		  gtk_object_sink((GtkObject *)global_extras);*/
+		g_object_weak_ref(G_OBJECT(global_extras), global_extras_destroyed, NULL);
+	} else {
+		g_object_ref(global_extras);
+	}
+
+	return E_TABLE_EXTRAS (global_extras);
+}
+
+/* ** Folder Tree Node ***************************************************** */
+
+typedef struct _ftree_node ftree_node;
+
+struct _ftree_node {
+	guint8 flags;
+	char *cache;
+	int uri_offset;
+	int full_name_offset;
+
+	/* format: {name}{\0}{uri}{\0}{full_name}{\0}
+	 * (No braces). */
+	char data[1];
+};
+
+#define FTREE_NODE_GOT_CHILDREN (1 << 0)
+#define FTREE_NODE_SUBSCRIBABLE (1 << 1)
+#define FTREE_NODE_SUBSCRIBED   (1 << 2)
+#define FTREE_NODE_ROOT         (1 << 3)
+
+static ftree_node *
+ftree_node_new_root (void)
+{
+	ftree_node *node;
+	
+	node = g_malloc (sizeof (ftree_node));
+	node->flags = FTREE_NODE_ROOT;
+	node->uri_offset = 0;
+	node->full_name_offset = 0;
+	node->data[0] = '\0';
+	
+	return node;
+}
+
+static ftree_node *
+ftree_node_new (CamelStore *store, CamelFolderInfo *fi)
+{
+	ftree_node *node;
+	int         uri_offset, full_name_offset;
+	size_t      size;
+	
+	uri_offset       = strlen (fi->name) + 1;
+	full_name_offset = uri_offset + strlen (fi->url) + 1;
+	size             = full_name_offset + strlen (fi->full_name);
+  
+	/* - 1 for sizeof(node.data) but +1 for terminating \0 */
+	node = g_malloc (sizeof (*node) + size);
+
+	node->cache = NULL;
+	
+	node->flags = FTREE_NODE_SUBSCRIBABLE;
+	
+	/* subscribed? */
+
+	if (camel_store_folder_subscribed (store, fi->full_name))
+		node->flags |= FTREE_NODE_SUBSCRIBED;
+
+	/* Copy strings */
+
+	node->uri_offset       = uri_offset;
+	node->full_name_offset = full_name_offset;
+
+	strcpy (node->data, fi->name);
+	strcpy (node->data + uri_offset, fi->url);
+	strcpy (node->data + full_name_offset, fi->full_name);
+
+	/* Done */
+
+	return node;
+}
+
+#define ftree_node_subscribable(node)  ( ((ftree_node *) (node))->flags & FTREE_NODE_SUBSCRIBABLE )
+#define ftree_node_subscribed(node)    ( ((ftree_node *) (node))->flags & FTREE_NODE_SUBSCRIBED )
+#define ftree_node_get_name(node)      ( ((ftree_node *) (node))->data )
+#define ftree_node_get_full_name(node) ( ((ftree_node *) (node))->data + ((ftree_node *) (node))->full_name_offset )
+#define ftree_node_get_uri(node)       ( ((ftree_node *) (node))->data + ((ftree_node *) (node))->uri_offset )
+
+/* ** Folder Tree Model **************************************************** */
+
+/* A subscribe or scan operation */
+
+typedef struct _ftree_op_data ftree_op_data;
+
+struct _ftree_op_data {
+	FolderETree *ftree;
+	ETreePath path;
+	ftree_node *data;
+	int handle;
+};
+
+
+/* ETreeModel functions */
+
+static int
+fe_column_count (ETreeModel *etm)
+{
+	return FOLDER_COL_LAST;
+}
+
+static void *
+fe_duplicate_value (ETreeModel *etm, int col, const void *val)
+{
+	return g_strdup (val);
+}
+
+static void
+fe_free_value (ETreeModel *etm, int col, void *val)
+{
+	g_free (val);
+}
+
+static void*
+fe_init_value (ETreeModel *etm, int col)
+{
+	return g_strdup ("");
+}
+
+static gboolean
+fe_value_is_empty (ETreeModel *etm, int col, const void *val)
+{
+	return !(val && *(char *)val);
+}
+
+static char *
+fe_value_to_string (ETreeModel *etm, int col, const void *val)
+{
+	return g_strdup (val);
+}
+
+static GdkPixbuf *
+fe_icon_at (ETreeModel *etree, ETreePath path)
+{
+	return NULL; /* XXX no icons for now */
+}
+
+static gpointer
+fe_root_value_at (FolderETree *ftree, int col)
+{
+	switch (col) {
+	case FOLDER_COL_NAME:
+		return ftree->service_name;
+	case FOLDER_COL_SUBSCRIBED:
+		return GINT_TO_POINTER (0);
+	default:
+		printf ("Oh no, unimplemented column %d in subscribe dialog\n", col);
+	}
+
+	return NULL;
+}
+
+static gpointer
+fe_real_value_at (FolderETree *ftree, int col, gpointer data)
+{
+	switch (col) {
+	case FOLDER_COL_NAME:
+		return ftree_node_get_name (data);
+	case FOLDER_COL_SUBSCRIBED:
+		if (ftree_node_subscribed (data))
+			return GINT_TO_POINTER (1);
+		return GINT_TO_POINTER (0);
+	default:
+		printf ("Oh no, unimplemented column %d in subscribe dialog\n", col);
+	}
+	
+	return NULL;
+}
+
+static void *
+fe_value_at (ETreeModel *etree, ETreePath path, int col)
+{
+	FolderETree *ftree = (FolderETree *) etree;
+	gpointer node_data;
+	
+	if (path == ftree->root)
+		return fe_root_value_at (ftree, col);
+
+	node_data = e_tree_memory_node_get_data (E_TREE_MEMORY (etree), path);
+	return fe_real_value_at (ftree, col, node_data);
+}
+
+static void
+fe_set_value_at (ETreeModel *etree, ETreePath path, int col, const void *val)
+{
+	/* nothing */
+}
+
+static gboolean
+fe_return_false (void)
+{
+	return FALSE;
+}
+
+static gint
+fe_sort_folder (ETreeMemory *etmm, ETreePath left, ETreePath right, gpointer user_data)
+{
+	ftree_node *n_left, *n_right;
+
+	n_left = e_tree_memory_node_get_data (etmm, left);
+	n_right = e_tree_memory_node_get_data (etmm, right);
+
+	/* if in utf8 locale ? */
+	return strcasecmp (ftree_node_get_name (n_left), ftree_node_get_name (n_right));
+}
+
+
+static void fe_check_for_children (FolderETree *ftree, ETreePath path);
+
+/* scanning */
+static void
+fe_got_children (CamelStore *store, char *prefix, CamelFolderInfo *info, gpointer data)
+{
+	ftree_op_data *closure = (ftree_op_data *) data;
+
+	if (!info) /* cancelled */
+		goto done;
+
+	/* also cancelled, but camel returned data, might leak */
+	if (closure->handle == -1)
+		goto done;
+
+	if (!prefix)
+		prefix = "";
+
+	for ( ; info; info = info->sibling) {
+		ETreePath child_path;
+		ftree_node *node;
+		
+		if (g_hash_table_lookup(closure->ftree->node_full_name, info->full_name))
+			continue;
+		
+		node = ftree_node_new (store, info);
+		child_path = e_tree_memory_node_insert (E_TREE_MEMORY (closure->ftree),
+							closure->path,
+							0,
+							node);
+		g_hash_table_insert(closure->ftree->node_full_name, ftree_node_get_full_name(node), child_path);
+		
+		if (!(info->flags & CAMEL_FOLDER_NOINFERIORS))
+			fe_check_for_children (closure->ftree, child_path);
+	}
+
+	/* FIXME: this needs to be added back to sort the tree */
+	e_tree_memory_sort_node (E_TREE_MEMORY (closure->ftree), 
+				 closure->path,
+				 fe_sort_folder,
+				 NULL);
+
+	if (closure->data)
+		closure->data->flags |= FTREE_NODE_GOT_CHILDREN;
+
+	g_hash_table_remove (closure->ftree->scan_ops, closure->path);
+
+done:
+	/* finish off the activity of this task */
+	/* hack, we know activity_data is an object */
+	closure->ftree->activity_level--;
+	(closure->ftree->activity_cb) (closure->ftree->activity_level, closure->ftree->activity_data);
+	g_object_unref(closure->ftree->activity_data);
+
+	g_free (closure);
+}
+
+static void
+fe_check_for_children (FolderETree *ftree, ETreePath path)
+{
+	ftree_op_data *closure;
+	ftree_node *node;
+	char *prefix;
+
+	node = e_tree_memory_node_get_data (E_TREE_MEMORY (ftree), path);
+
+	/* have we already gotten these children? */
+	if (node->flags & FTREE_NODE_GOT_CHILDREN)
+		return;
+
+	/* or we're loading them right now? */
+	if (g_hash_table_lookup (ftree->scan_ops, path))
+		return;
+
+	/* figure out our search prefix */
+	if (path == ftree->root)
+		prefix = "";
+	else
+		prefix = ftree_node_get_full_name (node);
+
+	closure = g_new (ftree_op_data, 1);
+	closure->ftree = ftree;
+	closure->path = path;
+	closure->data = node;
+	closure->handle = -1;
+
+	g_hash_table_insert (ftree->scan_ops, path, closure);
+
+	/* hack, we know this is an object ... infact the subscribe dialog */
+	g_object_ref(ftree->activity_data);
+	ftree->activity_level++;
+	(ftree->activity_cb) (ftree->activity_level, ftree->activity_data);
+
+	/* FIXME. Tiny race possiblity I guess. */
+	closure->handle = subscribe_get_short_folderinfo (ftree, prefix, fe_got_children, closure);
+}
+
+static void
+fe_create_root_node (FolderETree *ftree)
+{
+	ftree_node *node;
+
+	node = ftree_node_new_root ();
+	ftree->root = e_tree_memory_node_insert (E_TREE_MEMORY(ftree), NULL, 0, node);
+	fe_check_for_children (ftree, ftree->root);
+}
+
+static ETreePath
+fe_get_first_child (ETreeModel *model, ETreePath path)
+{
+	ETreePath child_path;
+
+	child_path = E_TREE_MODEL_CLASS (folder_etree_parent_class)->get_first_child (model, path);
+	if (child_path)
+		fe_check_for_children ((FolderETree *) model, child_path);
+	else
+		fe_check_for_children ((FolderETree *) model, path);
+	return child_path;
+}
+
+/* subscribing */
+static void
+fe_done_subscribing (const char *full_name, const char *name, gboolean subscribe, gboolean success, gpointer user_data)
+{
+	ftree_op_data *closure = (ftree_op_data *) user_data;
+
+	if (success && closure->handle != -1) {
+		char *path;
+		
+		path = g_strdup_printf ("/%s", full_name);
+		
+		if (subscribe) {
+			closure->data->flags |= FTREE_NODE_SUBSCRIBED;
+			recursive_add_folder (closure->ftree->e_storage,
+					      path, name,
+					      ftree_node_get_uri (closure->data));
+		} else {
+			closure->data->flags &= ~FTREE_NODE_SUBSCRIBED;
+
+			/* FIXME: recursively remove folder as well? Possible? */
+		}
+
+		g_free (path);
+		e_tree_model_node_data_changed (E_TREE_MODEL (closure->ftree), closure->path);
+	}
+
+	if (closure->handle != -1)
+		g_hash_table_remove (closure->ftree->subscribe_ops, closure->path);
+
+	g_free (closure);
+}
+
+/* cleanup */
+
+static gboolean
+fe_cancel_op_foreach (gpointer key, gpointer value, gpointer user_data)
+{
+	/*FolderETree   *ftree = (FolderETree *) user_data;*/
+	ftree_op_data *closure = (ftree_op_data *) value;
+
+	if (closure->handle != -1) {
+		d(printf("%d: cancel get messageinfo\n", closure->handle));
+		mail_msg_cancel (closure->handle);
+	}
+
+	closure->handle = -1;
+
+	return TRUE;
+}
+
+static void
+fe_kill_current_tree (FolderETree *ftree)
+{
+	g_hash_table_foreach_remove (ftree->scan_ops, fe_cancel_op_foreach, ftree);
+	g_assert (g_hash_table_size (ftree->scan_ops) == 0);
+}
+
+static void
+fe_finalise (GObject *obj)
+{
+	FolderETree *ftree = (FolderETree *) (obj);
+
+	d(printf("fe finalise!?\n"));
+
+	fe_kill_current_tree (ftree);
+
+	g_hash_table_foreach_remove (ftree->subscribe_ops, fe_cancel_op_foreach, ftree);
+	
+	g_hash_table_destroy (ftree->scan_ops);
+	g_hash_table_destroy (ftree->subscribe_ops);
+	g_hash_table_destroy(ftree->node_full_name);
+
+	camel_object_unref (ftree->store);
+	g_object_unref (ftree->e_storage);
+	
+	g_free (ftree->service_name);
+
+	((GObjectClass *)folder_etree_parent_class)->finalize(obj);
+}
+
+typedef gboolean (*bool_func_1) (ETreeModel *, ETreePath, int);
+typedef gboolean (*bool_func_2) (ETreeModel *);
+
+static void
+folder_etree_class_init (GObjectClass *klass)
+{
+	ETreeModelClass  *etree_model_class = E_TREE_MODEL_CLASS (klass);
+
+	folder_etree_parent_class = g_type_class_ref (E_TREE_MEMORY_TYPE);
+
+	klass->finalize                         = fe_finalise;
+
+	etree_model_class->value_at             = fe_value_at;
+	etree_model_class->set_value_at         = fe_set_value_at;
+	etree_model_class->column_count         = fe_column_count;
+	etree_model_class->duplicate_value      = fe_duplicate_value;
+	etree_model_class->free_value           = fe_free_value;
+	etree_model_class->initialize_value     = fe_init_value;
+	etree_model_class->value_is_empty       = fe_value_is_empty;
+	etree_model_class->value_to_string      = fe_value_to_string;
+	etree_model_class->icon_at              = fe_icon_at;
+	etree_model_class->is_editable          = (bool_func_1) fe_return_false;
+	etree_model_class->has_save_id          = (bool_func_2) fe_return_false;
+	etree_model_class->has_get_node_by_id   = (bool_func_2) fe_return_false;
+	etree_model_class->get_first_child      = fe_get_first_child;
+}
+
+static void
+folder_etree_init (GtkObject *object)
+{
+	FolderETree *ftree = (FolderETree *) object;
+
+	e_tree_memory_set_node_destroy_func (E_TREE_MEMORY (ftree), (GFunc) g_free, ftree);
+
+	ftree->scan_ops = g_hash_table_new (g_direct_hash, g_direct_equal);
+	ftree->subscribe_ops = g_hash_table_new (g_direct_hash, g_direct_equal);
+	
+	ftree->activity_level = 0;
+	ftree->node_full_name = g_hash_table_new(g_str_hash, g_str_equal);
+}
+
+static FolderETree *
+folder_etree_construct (FolderETree *ftree,
+			CamelStore  *store,
+			FolderETreeActivityCallback activity_cb,
+			gpointer                    activity_data)
+{
+	e_tree_memory_construct (E_TREE_MEMORY (ftree));
+	
+	ftree->store = store;
+	camel_object_ref (store);
+	
+	ftree->service_name = camel_service_get_name (CAMEL_SERVICE (store), FALSE);
+	
+	ftree->e_storage = mail_component_lookup_storage (mail_component_peek (), store); /* this gives us a ref */
+
+	ftree->activity_cb = activity_cb;
+	ftree->activity_data = activity_data;
+
+	fe_create_root_node (ftree);
+
+	return ftree;
+}
+
+static
+E_MAKE_TYPE (folder_etree, "FolderETree", FolderETree, folder_etree_class_init, folder_etree_init, E_TREE_MEMORY_TYPE);
+
+/* public */
+
+static FolderETree *
+folder_etree_new (CamelStore *store,
+		  FolderETreeActivityCallback activity_cb,
+		  gpointer                    activity_data)
+{
+	FolderETree *ftree;
+
+	ftree = g_object_new (folder_etree_get_type(), NULL);
+	ftree = folder_etree_construct (ftree, store, activity_cb, activity_data);
+	return ftree;
+}
+
+static void
+folder_etree_clear_tree (FolderETree *ftree)
+{
+	e_tree_memory_freeze (E_TREE_MEMORY (ftree));
+	e_tree_memory_node_remove (E_TREE_MEMORY (ftree), ftree->root);
+	fe_create_root_node (ftree);
+	g_hash_table_destroy(ftree->node_full_name);
+	ftree->node_full_name = g_hash_table_new(g_str_hash, g_str_equal);
+	e_tree_memory_thaw (E_TREE_MEMORY (ftree));
+}
+
+static int
+folder_etree_path_set_subscription (FolderETree *ftree, ETreePath path, gboolean subscribe)
+{
+	ftree_op_data *closure;
+	ftree_node    *node;
+
+	/* already in progress? */
+
+	if (g_hash_table_lookup (ftree->subscribe_ops, path))
+		return 0;
+
+	/* noselect? */
+
+	node = e_tree_memory_node_get_data (E_TREE_MEMORY (ftree), path);
+
+	if (!ftree_node_subscribable (node))
+		return -1;
+
+	/* noop? */
+
+	/* uh, this should be a not XOR or something */
+	if ((ftree_node_subscribed (node) && subscribe) ||
+	    (!ftree_node_subscribed (node) && !subscribe))
+		return 0;
+
+	closure         = g_new (ftree_op_data, 1);
+	closure->ftree  = ftree;
+	closure->path   = path;
+	closure->data   = node;
+	closure->handle = -1;
+
+	g_hash_table_insert (ftree->subscribe_ops, path, closure);
+
+	closure->handle = subscribe_do_subscribe_folder (ftree->store,
+							 ftree_node_get_full_name (node),
+							 ftree_node_get_name (node),
+							 subscribe,
+							 fe_done_subscribing,
+							 closure);
+	return 0;
+}
+
+static int
+folder_etree_path_toggle_subscription (FolderETree *ftree, ETreePath path)
+{
+	ftree_node *node = e_tree_memory_node_get_data (E_TREE_MEMORY (ftree), path);
+
+	if (ftree_node_subscribed (node))
+		return folder_etree_path_set_subscription (ftree, path, FALSE);
+	else
+		return folder_etree_path_set_subscription (ftree, path, TRUE);
+}
+
+static void
+folder_etree_cancel_all(FolderETree *ftree)
+{
+	g_hash_table_foreach_remove (ftree->scan_ops, fe_cancel_op_foreach, ftree);
+	g_hash_table_foreach_remove (ftree->subscribe_ops, fe_cancel_op_foreach, ftree);
+}
+
+/* ** StoreData ************************************************************ */
+
+typedef struct _StoreData StoreData;
+
+typedef void (*StoreDataStoreFunc) (StoreData *, CamelStore *, gpointer);
+
+struct _StoreData {
+	int refcount;
+	char *uri;
+
+	FolderETree *ftree;
+	CamelStore *store;
+	
+	int request_id;
+	
+	GtkWidget *widget;
+	StoreDataStoreFunc store_func;
+	gpointer store_data;
+};
+
+static StoreData *
+store_data_new (const char *uri)
+{
+	StoreData *sd;
+	
+	sd = g_new0 (StoreData, 1);
+	sd->refcount = 1;
+	sd->uri = g_strdup (uri);
+
+	return sd;
+}
+
+static void
+store_data_free (StoreData *sd)
+{
+	d(printf("store data free?\n"));
+
+	if (sd->request_id)
+		mail_msg_cancel (sd->request_id);
+
+	if (sd->ftree) {
+		folder_etree_cancel_all(sd->ftree);
+		g_object_unref(sd->ftree);
+	}
+	
+	if (sd->store)
+		camel_object_unref (sd->store);
+	
+	g_free (sd->uri);
+	g_free (sd);
+}
+
+static void
+store_data_ref (StoreData *sd)
+{
+	sd->refcount++;
+}
+
+static void
+store_data_unref (StoreData *sd)
+{
+	if (sd->refcount <= 1) {
+		store_data_free (sd);
+	} else {
+		sd->refcount--;
+	}
+}
+
+static void
+sd_got_store (char *uri, CamelStore *store, gpointer user_data)
+{
+	StoreData *sd = (StoreData *) user_data;
+	
+	sd->store = store;
+	
+	if (store) /* we can have exceptions getting the store... server is down, eg */
+		camel_object_ref (sd->store);
+	
+	/* uh, so we might have a problem if this operation is cancelled. Unsure. */
+	sd->request_id = 0;
+	
+	if (sd->store_func)
+		(sd->store_func) (sd, sd->store, sd->store_data);
+	
+	store_data_unref (sd);
+}
+
+static void
+store_data_async_get_store (StoreData *sd, StoreDataStoreFunc func, gpointer user_data)
+{
+	if (sd->request_id) {
+		d(printf ("Already loading store, nooping\n"));
+		return;
+	}
+	
+	if (sd->store) {
+		/* um, is this the best behavior? */
+		func (sd, sd->store, user_data);
+		return;
+	}
+	
+	sd->store_func = func;
+	sd->store_data = user_data;
+	store_data_ref (sd);
+	sd->request_id = mail_get_store (sd->uri, NULL, sd_got_store, sd);
+}
+
+static void
+store_data_cancel_get_store (StoreData *sd)
+{
+	g_return_if_fail (sd->request_id);
+
+	mail_msg_cancel (sd->request_id);
+	sd->request_id = 0;
+}
+
+static void
+sd_toggle_cb (ETree *tree, int row, ETreePath path, int col, GdkEvent *event, gpointer user_data)
+{
+	StoreData *sd = (StoreData *) user_data;
+
+	folder_etree_path_toggle_subscription (sd->ftree, path);
+}
+
+static GtkWidget *
+store_data_get_widget (StoreData *sd, 
+		       FolderETreeActivityCallback activity_cb,
+		       gpointer                    activity_data)
+{
+	GtkWidget *tree;
+
+	if (!sd->store) {
+		d(printf ("store data can't get widget before getting store.\n"));
+		return NULL;
+	}
+
+	if (sd->widget)
+		return sd->widget;
+
+	sd->ftree = folder_etree_new (sd->store, activity_cb, activity_data);
+
+	/* You annoy me, etree! */
+	tree = gtk_widget_new (E_TREE_SCROLLED_TYPE,
+			       "hadjustment", NULL,
+			       "vadjustment", NULL,
+			       NULL);
+
+	tree = (GtkWidget *) e_tree_scrolled_construct_from_spec_file (E_TREE_SCROLLED (tree),
+								       E_TREE_MODEL (sd->ftree),
+								       subscribe_get_global_extras (),
+								       EVOLUTION_ETSPECDIR "/subscribe-dialog.etspec",
+								       NULL);
+	e_tree_root_node_set_visible (e_tree_scrolled_get_tree(E_TREE_SCROLLED(tree)), TRUE);
+	g_signal_connect(e_tree_scrolled_get_tree(E_TREE_SCROLLED (tree)),
+			 "double_click", G_CALLBACK (sd_toggle_cb), sd);
+
+	g_object_unref(global_extras);
+
+	sd->widget = tree;
+
+	return sd->widget;
+}
+
+typedef struct _selection_closure {
+	StoreData *sd;
+	enum { SET, CLEAR, TOGGLE } mode;
+} selection_closure;
+
+static void
+sd_subscribe_folder_foreach (int model_row, gpointer closure)
+{
+	selection_closure *sc   = (selection_closure *) closure;
+	StoreData         *sd   = sc->sd;
+	ETree             *tree = e_tree_scrolled_get_tree(E_TREE_SCROLLED(sd->widget));
+	ETreePath          path = e_tree_node_at_row (tree, model_row);
+
+	/* ignore results */
+	switch (sc->mode) {
+	case SET:
+		folder_etree_path_set_subscription (sd->ftree, path, TRUE);
+		break;
+	case CLEAR:
+		folder_etree_path_set_subscription (sd->ftree, path, FALSE);
+		break;
+	case TOGGLE:
+		folder_etree_path_toggle_subscription (sd->ftree, path);
+		break;
+	}
+}
+
+static void
+store_data_selection_set_subscription (StoreData *sd, gboolean subscribe)
+{
+	selection_closure sc;
+	ETree *tree;
+	
+	sc.sd = sd;
+	if (subscribe)
+		sc.mode = SET;
+	else
+		sc.mode = CLEAR;
+
+	tree = e_tree_scrolled_get_tree (E_TREE_SCROLLED (sd->widget));
+	e_tree_selected_row_foreach (tree, sd_subscribe_folder_foreach, &sc);
+}
+
+#ifdef NEED_TOGGLE_SELECTION
+static void
+store_data_selection_toggle_subscription (StoreData *sd)
+{
+	selection_closure  sc;
+	ETree             *tree;
+	
+	sc.sd   = sd;
+	sc.mode = TOGGLE;
+
+	tree = e_tree_scrolled_get_tree (E_TREE_SCROLLED (sd->widget));
+	e_tree_selected_row_foreach (tree, sd_subscribe_folder_foreach, &sc);
+}
+#endif
+
+static gboolean
+store_data_mid_request (StoreData *sd)
+{
+	return (gboolean) sd->request_id;
+}
+
+/* ** yaay, SubscribeDialog ******************************************************* */
+
+#define PARENT_TYPE (gtk_object_get_type ())
+
+#ifdef JUST_FOR_TRANSLATORS
+static char *str = N_("Folder");
+#endif
+
+#define STORE_DATA_KEY   "store-data"
+
+struct _SubscribeDialogPrivate {
+	GladeXML  *xml;
+	GList     *store_list;
+
+	StoreData *current_store;
+	GtkWidget *current_widget;
+
+	GtkWidget *default_widget;
+	GtkWidget *none_item;
+	GtkWidget *search_entry;
+	GtkWidget *hbox;
+	GtkWidget *filter_radio, *all_radio;
+	GtkWidget *sub_button, *unsub_button, *refresh_button, *close_button;
+	GtkWidget *progress;
+
+	int cancel;		/* have we been cancelled? */
+	guint activity_timeout_id;
+};
+
+static GtkObjectClass *subscribe_dialog_parent_class;
+
+static void
+sc_refresh_pressed (GtkWidget *widget, gpointer user_data)
+{
+	SubscribeDialog *sc = SUBSCRIBE_DIALOG (user_data);
+
+	if (sc->priv->current_store)
+		folder_etree_clear_tree (sc->priv->current_store->ftree);
+}
+
+static void
+sc_close_pressed (GtkWidget *widget, gpointer user_data)
+{
+	SubscribeDialog *sc = SUBSCRIBE_DIALOG (user_data);
+
+	/* order important here */
+	gtk_object_destroy (GTK_OBJECT (sc));
+	gtk_widget_destroy (GTK_WIDGET (sc->app));
+}
+
+static void
+sc_subscribe_pressed (GtkWidget *widget, gpointer user_data)
+{
+	SubscribeDialog *sc = SUBSCRIBE_DIALOG (user_data);
+	StoreData       *store = sc->priv->current_store;
+
+	if (!store)
+		return;
+
+	store_data_selection_set_subscription (store, TRUE);
+}
+
+static void
+sc_unsubscribe_pressed (GtkWidget *widget, gpointer user_data)
+{
+	SubscribeDialog *sc = SUBSCRIBE_DIALOG (user_data);
+	StoreData *store = sc->priv->current_store;
+
+	if (!store)
+		return;
+
+	store_data_selection_set_subscription (store, FALSE);
+}
+
+static void
+kill_default_view (SubscribeDialog *sc)
+{
+	gtk_widget_hide (sc->priv->none_item);
+	
+	gtk_widget_set_sensitive (sc->priv->sub_button, TRUE);
+	gtk_widget_set_sensitive (sc->priv->unsub_button, TRUE);
+	gtk_widget_set_sensitive (sc->priv->refresh_button, TRUE);
+}
+
+static void
+sc_selection_changed (GtkObject *obj, gpointer user_data)
+{
+	SubscribeDialog *sc = SUBSCRIBE_DIALOG (user_data);
+	gboolean sensitive;
+
+	if (e_selection_model_selected_count (E_SELECTION_MODEL (obj)))
+		sensitive = TRUE;
+	else
+		sensitive = FALSE;
+
+	gtk_widget_set_sensitive (sc->priv->sub_button, sensitive);
+	gtk_widget_set_sensitive (sc->priv->unsub_button, sensitive);
+}
+
+static gboolean
+sc_activity_timeout (SubscribeDialog *sc)
+{
+	gtk_progress_bar_pulse(GTK_PROGRESS_BAR(sc->priv->progress));
+
+	return TRUE;
+}
+
+static void
+sc_activity_cb (int level, SubscribeDialog *sc)
+{
+	g_assert (pthread_self() == mail_gui_thread);
+
+	if (sc->priv->cancel)
+		return;
+
+	if (level) {
+		if (sc->priv->activity_timeout_id)
+			return;
+
+		sc->priv->activity_timeout_id = g_timeout_add(50, (GSourceFunc)sc_activity_timeout, sc);
+		gtk_widget_show(sc->priv->progress);
+	} else {
+		if (sc->priv->activity_timeout_id) {
+			g_source_remove (sc->priv->activity_timeout_id);
+			sc->priv->activity_timeout_id = 0;
+		}
+
+		gtk_widget_hide(sc->priv->progress);
+	}
+}
+
+static void
+menu_item_selected (GtkMenuItem *item, gpointer user_data)
+{
+	SubscribeDialog *sc = SUBSCRIBE_DIALOG (user_data);
+	StoreData       *sd = g_object_get_data (G_OBJECT (item), STORE_DATA_KEY);
+
+	g_return_if_fail (sd);
+
+	if (sd->widget == NULL) {
+		GtkWidget *widget;
+		ESelectionModel *esm;
+		ETree *tree;
+
+		widget = store_data_get_widget (sd, (FolderETreeActivityCallback) sc_activity_cb, sc);
+		gtk_box_pack_start (GTK_BOX (sc->priv->hbox), widget, TRUE, TRUE, 0);
+
+		tree = e_tree_scrolled_get_tree (E_TREE_SCROLLED (widget));
+		esm = e_tree_get_selection_model (tree);
+		g_signal_connect(esm, "selection_changed", G_CALLBACK(sc_selection_changed), sc);
+		sc_selection_changed ((GtkObject *)esm, sc);
+	}
+
+	if (sc->priv->current_widget == sc->priv->default_widget)
+		kill_default_view (sc);
+
+	gtk_widget_hide (sc->priv->current_widget);
+	gtk_widget_show (sd->widget);
+	sc->priv->current_widget = sd->widget;
+	sc->priv->current_store  = sd;
+}
+
+static void
+dummy_item_selected (GtkMenuItem *item, gpointer user_data)
+{
+	SubscribeDialog *sc = SUBSCRIBE_DIALOG (user_data);
+
+	gtk_widget_hide (sc->priv->current_widget);
+	gtk_widget_show (sc->priv->default_widget);
+	sc->priv->current_widget = sc->priv->default_widget;
+	sc->priv->current_store  = NULL;
+
+	gtk_entry_set_text (GTK_ENTRY (sc->priv->search_entry), "");
+}
+
+/* wonderful */
+
+static void
+got_sd_store (StoreData *sd, CamelStore *store, gpointer data)
+{
+	if (store && camel_store_supports_subscriptions (store))
+		gtk_widget_show (GTK_WIDGET (data));
+}
+
+/* FIXME: if there aren't any stores that are subscribable, the option
+ * menu will only have the "No server selected" item and the user will
+ * be confused. */
+
+static void
+populate_store_list (SubscribeDialog *sc)
+{
+	EAccountList *accounts;
+	EAccount *account;
+	EIterator *iter;
+	GtkWidget *menu;
+	GtkWidget *omenu;
+	GList *l;
+	
+	accounts = mail_config_get_accounts ();
+	iter = e_list_get_iterator ((EList *) accounts);
+	while (e_iterator_is_valid (iter)) {
+		StoreData *sd;
+		
+		account = (EAccount *) e_iterator_get (iter);
+		
+		if (account->enabled && account->source->url) {
+			sd = store_data_new (account->source->url);
+			sc->priv->store_list = g_list_prepend (sc->priv->store_list, sd);
+		}
+		
+		e_iterator_next (iter);
+	}
+	
+	g_object_unref (iter);
+	
+	menu = gtk_menu_new ();
+	
+	for (l = sc->priv->store_list; l; l = l->next) {
+		GtkWidget *item;
+		CamelURL *url;
+		char *string;
+		
+		url = camel_url_new (((StoreData *) l->data)->uri, NULL);
+		string = camel_url_to_string (url, CAMEL_URL_HIDE_ALL);
+		camel_url_free (url);
+		item = gtk_menu_item_new_with_label (string);
+		store_data_async_get_store (l->data, got_sd_store, item);
+		g_object_set_data (G_OBJECT (item), STORE_DATA_KEY, l->data);
+		g_signal_connect (item, "activate", G_CALLBACK (menu_item_selected), sc);
+		g_free (string);
+		
+		gtk_menu_shell_prepend (GTK_MENU_SHELL (menu), item);
+	}
+	
+	sc->priv->none_item = gtk_menu_item_new_with_label (_("No server has been selected"));
+	g_signal_connect (sc->priv->none_item, "activate", G_CALLBACK (dummy_item_selected), sc);
+	gtk_widget_show (sc->priv->none_item);
+	gtk_menu_shell_prepend (GTK_MENU_SHELL (menu), sc->priv->none_item);
+	
+	gtk_widget_show (menu);
+	
+	omenu = glade_xml_get_widget (sc->priv->xml, "store_menu");
+	gtk_option_menu_set_menu (GTK_OPTION_MENU (omenu), menu);
+}
+
+static void
+subscribe_dialog_finalise (GObject *object)
+{
+	SubscribeDialog *sc;
+	GList *iter;
+
+	sc = SUBSCRIBE_DIALOG (object);
+
+	if (sc->priv->store_list) {
+		for (iter = sc->priv->store_list; iter; iter = iter->next) {
+			StoreData *data = iter->data;
+			store_data_unref (data);
+		}
+		
+		g_list_free (sc->priv->store_list);
+		sc->priv->store_list = NULL;
+	}
+
+	g_free (sc->priv);
+	sc->priv = NULL;
+
+	((GObjectClass *)subscribe_dialog_parent_class)->finalize (object);
+}
+
+static void
+subscribe_dialog_destroy (GtkObject *object)
+{
+	SubscribeDialog *sc;
+	GList *iter;
+
+	sc = SUBSCRIBE_DIALOG (object);
+
+	d(printf("subscribe_dialog_destroy\n"));
+
+	if (!sc->priv->cancel) {
+		sc->priv->cancel = 1;
+
+		if (sc->priv->activity_timeout_id) {
+			g_source_remove (sc->priv->activity_timeout_id);
+			sc->priv->activity_timeout_id = 0;
+		}
+
+		if (sc->priv->store_list) {
+			for (iter = sc->priv->store_list; iter; iter = iter->next) {
+				StoreData *data = iter->data;
+		
+				if (store_data_mid_request (data))
+					store_data_cancel_get_store (data);
+
+				if (data->ftree)
+					folder_etree_cancel_all(data->ftree);
+				
+				data->store_func = NULL;
+			}
+		}
+
+		if (sc->priv->xml) {
+			g_object_unref(sc->priv->xml);
+			sc->priv->xml = NULL;
+		}
+	}
+
+	subscribe_dialog_parent_class->destroy (object);
+}
+
+static void
+subscribe_dialog_class_init (GtkObjectClass *object_class)
+{
+	object_class->destroy = subscribe_dialog_destroy;
+	((GObjectClass *)object_class)->finalize = subscribe_dialog_finalise;
+
+	subscribe_dialog_parent_class = g_type_class_ref (PARENT_TYPE);
+}
+
+static void
+subscribe_dialog_init (GtkObject *object)
+{
+	SubscribeDialog *sc = SUBSCRIBE_DIALOG (object);
+
+	sc->priv = g_new0 (SubscribeDialogPrivate, 1);
+}
+
+static GtkWidget *
+sc_create_default_widget (void)
+{
+	GtkWidget *label;
+	GtkWidget *viewport;
+
+	label = gtk_label_new (_("Please select a server."));
+	gtk_widget_show (label);
+
+	viewport = gtk_viewport_new (NULL, NULL);
+	gtk_viewport_set_shadow_type (GTK_VIEWPORT (viewport), GTK_SHADOW_IN);
+	gtk_container_add (GTK_CONTAINER (viewport), label);
+
+	return viewport;
+}
+
+static void
+subscribe_dialog_construct (GtkObject *object)
+{
+	SubscribeDialog *sc = SUBSCRIBE_DIALOG (object);
+	
+	/* Load the XML */
+	/* "app2" */
+	sc->priv->xml            = glade_xml_new (EVOLUTION_GLADEDIR "/subscribe-dialog.glade", "subscribe_dialog", NULL);
+
+	sc->app                  = glade_xml_get_widget (sc->priv->xml, "subscribe_dialog");
+	sc->priv->hbox           = glade_xml_get_widget (sc->priv->xml, "tree_box");
+	sc->priv->close_button   = glade_xml_get_widget (sc->priv->xml, "close_button");
+	sc->priv->sub_button     = glade_xml_get_widget (sc->priv->xml, "subscribe_button");
+	sc->priv->unsub_button   = glade_xml_get_widget (sc->priv->xml, "unsubscribe_button");
+	sc->priv->refresh_button = glade_xml_get_widget (sc->priv->xml, "refresh_button");
+	sc->priv->progress       = glade_xml_get_widget(sc->priv->xml, "progress_bar");
+
+	/* create default view */
+	sc->priv->default_widget = sc_create_default_widget();
+	sc->priv->current_widget = sc->priv->default_widget;
+	gtk_box_pack_start (GTK_BOX (sc->priv->hbox), sc->priv->default_widget, TRUE, TRUE, 0);
+	gtk_widget_show (sc->priv->default_widget);
+	
+	gtk_widget_set_sensitive (sc->priv->sub_button, FALSE);
+	gtk_widget_set_sensitive (sc->priv->unsub_button, FALSE);
+	gtk_widget_set_sensitive (sc->priv->refresh_button, FALSE);
+	
+	/* hook up some signals */
+	g_signal_connect(sc->priv->close_button, "clicked", G_CALLBACK(sc_close_pressed), sc);
+	g_signal_connect(sc->priv->sub_button, "clicked", G_CALLBACK(sc_subscribe_pressed), sc);
+	g_signal_connect(sc->priv->unsub_button, "clicked", G_CALLBACK(sc_unsubscribe_pressed), sc);
+	g_signal_connect(sc->priv->refresh_button, "clicked", G_CALLBACK(sc_refresh_pressed), sc);
+	
+	/* progress */
+	gtk_progress_bar_set_pulse_step(GTK_PROGRESS_BAR(sc->priv->progress), 0.1);
+	gtk_widget_hide(sc->priv->progress);
+
+	/* reasonable starting point */
+	gtk_window_set_default_size((GtkWindow *)sc->app, 350, 400);
+
+	/* Get the list of stores */
+	populate_store_list (sc);
+}
+
+GtkObject *
+subscribe_dialog_new (void)
+{
+	SubscribeDialog *subscribe_dialog;
+	
+	subscribe_dialog = g_object_new (SUBSCRIBE_DIALOG_TYPE, NULL);
+	subscribe_dialog_construct (GTK_OBJECT (subscribe_dialog));
+	
+	return GTK_OBJECT (subscribe_dialog);
+}
+
+E_MAKE_TYPE (subscribe_dialog, "SubscribeDialog", SubscribeDialog, subscribe_dialog_class_init, subscribe_dialog_init, PARENT_TYPE);
diff --git a/mail/subscribe-dialog.etspec b/mail/subscribe-dialog.etspec
new file mode 100644
index 0000000000..1f5decbb36
--- /dev/null
+++ b/mail/subscribe-dialog.etspec
@@ -0,0 +1,9 @@
+<ETableSpecification cursor-mode="line" no-headers="true">
+        <ETableColumn model_col="0" pixbuf="subscribed-image" expansion="0.0" minimum_width="16" resizable="false" cell="cell_toggle" compare="integer"/>
+        <ETableColumn model_col="1" _title="Folder" expansion="1.0" minimum_width="20" resizable="true" cell="cell_tree" compare="string"/>
+	<ETableState>
+		<column source="0"/>
+		<column source="1"/>
+	        <grouping></grouping>
+	</ETableState>
+</ETableSpecification>
diff --git a/mail/subscribe-dialog.h b/mail/subscribe-dialog.h
new file mode 100644
index 0000000000..c2e6b3d46f
--- /dev/null
+++ b/mail/subscribe-dialog.h
@@ -0,0 +1,62 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
+/*
+ *  Authors: Chris Toshok <toshok@ximian.com>
+ *           Peter Williams <peterw@ximian.com>
+ *
+ *  Copyright 2000 Ximian, Inc. (www.ximian.com)
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of version 2 of the GNU General Public
+ * License as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public
+ * License along with this program; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ *
+ */
+
+
+#ifndef _SUBSCRIBE_DIALOG_H_
+#define _SUBSCRIBE_DIALOG_H_
+
+#include <gtk/gtktable.h>
+#include <bonobo/bonobo-control.h>
+#include <bonobo/bonobo-property-bag.h>
+#include <gal/e-table/e-tree-model.h>
+#include <gal/e-table/e-table-model.h>
+#include "shell/evolution-storage.h"
+#include "mail-types.h"
+#include "camel/camel-store.h"
+
+#define SUBSCRIBE_DIALOG_TYPE        (subscribe_dialog_get_type ())
+#define SUBSCRIBE_DIALOG(o)          (G_TYPE_CHECK_INSTANCE_CAST ((o), SUBSCRIBE_DIALOG_TYPE, SubscribeDialog))
+#define SUBSCRIBE_DIALOG_CLASS(k)    (G_TYPE_CHECK_CLASS_CAST ((k), SUBSCRIBE_DIALOG_TYPE, SubscribeDialogClass))
+#define IS_SUBSCRIBE_DIALOG(o)       (G_TYPE_CHECK_INSTANCE_TYPE ((o), SUBSCRIBE_DIALOG_TYPE))
+#define IS_SUBSCRIBE_DIALOG_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), SUBSCRIBE_DIALOG_TYPE))
+
+typedef struct _SubscribeDialogPrivate SubscribeDialogPrivate;
+
+struct _SubscribeDialog {
+	GtkObject parent;
+
+	GtkWidget *app;
+	SubscribeDialogPrivate *priv;
+};
+
+typedef struct {
+	GtkObjectClass parent_class;
+} SubscribeDialogClass;
+
+GtkType    subscribe_dialog_get_type         (void);
+GtkObject *subscribe_dialog_new              (void);
+
+/* helper macro */
+#define subscribe_dialog_show(dialog) gtk_widget_show (SUBSCRIBE_DIALOG (dialog)->app)
+
+#endif /* _SUBSCRIBE_DIALOG_H_ */
diff --git a/mail/upgrade-mailer.c b/mail/upgrade-mailer.c
new file mode 100644
index 0000000000..130194ca6a
--- /dev/null
+++ b/mail/upgrade-mailer.c
@@ -0,0 +1,1169 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
+/*
+ *  Authors: Jeffrey Stedfast <fejj@ximian.com>
+ *
+ *  Copyright 2002 Ximian, Inc. (www.ximian.com)
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 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, write to the Free Software
+ *  Foundation, Inc., 59 Temple Street #330, Boston, MA 02111-1307, USA.
+ *
+ */
+
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <glib.h>
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <unistd.h>
+#include <fcntl.h>
+#include <dirent.h>
+#include <errno.h>
+#include <ctype.h>
+
+#include <bonobo.h>
+#include <bonobo-conf/bonobo-config-database.h>
+#include <gal/util/e-xml-utils.h>
+#include <libxml/xmlmemory.h>
+#include <libxml/parser.h>
+#include <libxml/tree.h>
+
+#include <camel/camel-file-utils.h>
+
+struct _storeinfo {
+	char *base_url;
+	char *namespace;
+	char *encoded_namespace;
+	char dir_sep;
+	GPtrArray *folders;
+};
+
+
+
+static char
+find_dir_sep (const char *lsub_response)
+{
+	register const unsigned char *inptr;
+	const unsigned char *inend;
+	
+	inptr = (const unsigned char *) lsub_response;
+	inend = inptr + strlen (inptr);
+	
+	if (strncmp (inptr, "* LSUB (", 8))
+		return '\0';
+	
+	inptr += 8;
+	while (inptr < inend && *inptr != ')')
+		inptr++;
+	
+	if (inptr >= inend)
+		return '\0';
+	
+	inptr++;
+	while (inptr < inend && isspace ((int) *inptr))
+		inptr++;
+	
+	if (inptr >= inend)
+		return '\0';
+	
+	if (*inptr == '\"')
+		inptr++;
+	
+	return inptr < inend ? *inptr : '\0';
+}
+
+static void
+si_free (struct _storeinfo *si)
+{
+	int i;
+	
+	g_free (si->base_url);
+	g_free (si->namespace);
+	g_free (si->encoded_namespace);
+	if (si->folders) {
+		for (i = 0; i < si->folders->len; i++)
+			g_free (si->folders->pdata[i]);
+		g_ptr_array_free (si->folders, TRUE);
+	}
+	g_free (si);
+}
+
+static unsigned char tohex[16] = {
+	'0', '1', '2', '3', '4', '5', '6', '7',
+	'8', '9', 'A', 'B', 'C', 'D', 'E', 'F'
+};
+
+static char *
+hex_encode (const char *in, size_t len)
+{
+	const unsigned char *inend = in + len;
+	unsigned char *inptr, *outptr;
+	char *outbuf;
+	
+	outptr = outbuf = g_malloc ((len * 3) + 1);
+	
+	inptr = (unsigned char *) in;
+	while (inptr < inend) {
+		if (*inptr > 127 || isspace ((int) *inptr)) {
+			*outptr++ = '%';
+			*outptr++ = tohex[(*inptr >> 4) & 0xf];
+			*outptr++ = tohex[*inptr & 0xf];
+			inptr++;
+		} else
+			*outptr++ = *inptr++;
+	}
+	
+	*outptr = '\0';
+	
+	return outbuf;
+}
+
+#define HEXVAL(c) (isdigit (c) ? (c) - '0' : tolower (c) - 'a' + 10)
+
+static char *
+hex_decode (const char *in, size_t len)
+{
+	const unsigned char *inend = in + len;
+	unsigned char *inptr, *outptr;
+	char *outbuf;
+	
+	outptr = outbuf = g_malloc (len + 1);
+	
+	inptr = (unsigned char *) in;
+	while (inptr < inend) {
+		if (*inptr == '%') {
+			if (isxdigit ((int) inptr[1]) && isxdigit ((int) inptr[2])) {
+				*outptr++ = HEXVAL (inptr[1]) * 16 + HEXVAL (inptr[2]);
+				inptr += 3;
+			} else
+				*outptr++ = *inptr++;
+		} else
+			*outptr++ = *inptr++;
+	}
+	
+	*outptr = '\0';
+	
+	return outbuf;
+}
+
+static char *
+parse_lsub (const char *lsub, char *dir_sep)
+{
+	const unsigned char *inptr = (const unsigned char *) lsub;
+	const unsigned char *inend;
+	int inlen, quoted = 0;
+	
+	inend = inptr + strlen (inptr);
+	if (strncmp (inptr, "* LSUB (", 8))
+		return NULL;
+	
+	inptr += 8;
+	while (inptr < inend && *inptr != ')')
+		inptr++;
+	
+	if (inptr >= inend)
+		return NULL;
+	
+	inptr++;
+	while (inptr < inend && isspace ((int) *inptr))
+		inptr++;
+	
+	if (inptr >= inend)
+		return NULL;
+	
+	/* skip over the dir sep */
+	if (*inptr == '\"')
+		inptr++;
+	
+	*dir_sep = (char) *inptr++;
+	if (*inptr == '\"')
+		inptr++;
+	
+	if (inptr >= inend)
+		return NULL;
+	
+	while (inptr < inend && isspace ((int) *inptr))
+		inptr++;
+	
+	if (inptr >= inend)
+		return NULL;
+	
+	if (*inptr == '\"') {
+		inptr++;
+		quoted = 1;
+	} else
+		quoted = 0;
+	
+	inlen = strlen (inptr) - quoted;
+	
+	return g_strndup (inptr, inlen);
+}
+
+static void
+cache_upgrade (struct _storeinfo *si, const char *folder_name)
+{
+	const char *old_folder_name = folder_name;
+	char *oldpath, *newpath, *p;
+	struct dirent *dent;
+	DIR *dir = NULL;
+	
+	if (si->namespace && strcmp ("INBOX", folder_name)) {
+		if (!strncmp (old_folder_name, si->namespace, strlen (si->namespace))) {
+			old_folder_name += strlen (si->namespace);
+			if (*old_folder_name == si->dir_sep)
+				old_folder_name++;
+		}
+	}
+	
+	oldpath = g_strdup_printf ("%s/evolution/mail/imap/%s/%s", getenv ("HOME"),
+				   si->base_url + 7, old_folder_name);
+	
+	newpath = g_strdup_printf ("%s/evolution/mail/imap/%s/folders/%s",
+				   getenv ("HOME"), si->base_url + 7, folder_name);
+	
+	if (!strcmp (folder_name, "folders"))
+		goto special_case_folders;
+	
+	if (si->dir_sep != '/') {
+		p = newpath + strlen (newpath) - strlen (folder_name) - 1;
+		while (*p) {
+			if (*p == si->dir_sep)
+				*p = '/';
+			p++;
+		}
+	}
+	
+	/* make sure all parent directories exist */
+	if ((p = strrchr (newpath, '/'))) {
+		*p = '\0';
+		camel_mkdir (newpath, 0755);
+		*p = '/';
+	}
+	
+	if (rename (oldpath, newpath) == -1) {
+		fprintf (stderr, "Failed to upgrade cache for imap folder %s/%s: %s\n",
+			 si->base_url, folder_name, g_strerror (errno));
+	}
+	
+	g_free (oldpath);
+	g_free (newpath);
+	
+	return;
+	
+ special_case_folders:
+	
+	/* the user had a toplevel folder named "folders" */
+	if (camel_mkdir (newpath, 0755) == -1) {
+		/* we don't bother to check EEXIST because well, if
+                   folders/folders exists then we're pretty much
+                   fucked */
+		goto exception;
+	}
+	
+	if (!(dir = opendir (oldpath)))
+		goto exception;
+	
+	while ((dent = readdir (dir))) {
+		char *old_path, *new_path;
+		
+		if (!strcmp (dent->d_name, ".") || !strcmp (dent->d_name, ".."))
+			continue;
+		
+		old_path = g_strdup_printf ("%s/%s", oldpath, dent->d_name);
+		new_path = g_strdup_printf ("%s/%s", newpath, dent->d_name);
+		
+		/* make sure all parent directories exist */
+		if ((p = strrchr (new_path, '/'))) {
+			*p = '\0';
+			camel_mkdir (new_path, 0755);
+			*p = '/';
+		}
+		
+		if (rename (old_path, new_path) == -1) {
+			g_free (old_path);
+			g_free (new_path);
+			goto exception;
+		}
+		
+		g_free (old_path);
+		g_free (new_path);
+	}
+	
+	closedir (dir);
+	
+	g_free (oldpath);
+	g_free (newpath);
+	
+	return;
+	
+ exception:
+	
+	fprintf (stderr, "Failed to upgrade cache for imap folder %s/%s: %s\n",
+		 si->base_url, folder_name, g_strerror (errno));
+	
+	if (dir)
+		closedir (dir);
+	
+	g_free (oldpath);
+	g_free (newpath);
+}
+
+static int
+foldercmp (const void *f1, const void *f2)
+{
+	const char **folder1 = (const char **) f1;
+	const char **folder2 = (const char **) f2;
+	
+	return strcmp (*folder1, *folder2);
+}
+
+static void
+cache_upgrade_and_free (gpointer key, gpointer val, gpointer user_data)
+{
+	struct _storeinfo *si = val;
+	GPtrArray *folders;
+	char *path = NULL;
+	char dir_sep;
+	int i;
+	
+	if (si->folders) {
+		path = g_strdup_printf ("%s/evolution/mail/imap/%s/folders",
+					getenv ("HOME"), si->base_url + 7);
+		
+		if (mkdir (path, 0755) == -1 && errno != EEXIST) {
+			fprintf (stderr, "Failed to create directory %s: %s", path, g_strerror (errno));
+			goto exception;
+		}
+		
+		g_free (path);
+		folders = g_ptr_array_new ();
+		for (i = 0; i < si->folders->len; i++) {
+			if ((path = parse_lsub (si->folders->pdata[i], &dir_sep))) {
+				g_ptr_array_add (folders, path);
+			}
+		}
+		
+		/* sort the folders so that parents get created before
+                   their children */
+		qsort (folders->pdata, folders->len, sizeof (void *), foldercmp);
+		
+		for (i = 0; i < folders->len; i++) {
+			cache_upgrade (si, folders->pdata[i]);
+			g_free (folders->pdata[i]);
+		}
+	}
+	
+	si_free (si);
+	
+	return;
+	
+ exception:
+	
+	fprintf (stderr, "Could not upgrade imap cache for %s: %s\n",
+		 si->base_url + 7, g_strerror (errno));
+	
+	g_free (path);
+	
+	si_free (si);
+}
+
+static char *
+get_base_url (const char *protocol, const char *uri)
+{
+	unsigned char *base_url, *p;
+	
+	p = (unsigned char *) uri + strlen (protocol) + 1;
+	if (!strncmp (p, "//", 2))
+		p += 2;
+	
+	base_url = p;
+	p = strchr (p, '/');
+	base_url = g_strdup_printf ("%s://%.*s", protocol, p ? (int) (p - base_url) : (int) strlen (base_url), base_url);
+	
+	return base_url;
+}
+
+static char *
+imap_namespace (const char *uri)
+{
+	unsigned char *name, *p;
+	
+	if ((name = strstr (uri, ";namespace=\"")) == NULL)
+		return NULL;
+	
+	name += strlen (";namespace=\"");
+	p = name;
+	while (*p && *p != '\"')
+		p++;
+	
+	return g_strndup (name, p - name);
+}
+
+static char *
+find_folder (GPtrArray *folders, const char *folder, char *dir_sep)
+{
+	const unsigned char *inptr, *inend;
+	int inlen, len, diff, i;
+	int quoted;
+	
+	len = strlen (folder);
+	
+	for (i = 0; i < folders->len; i++) {
+		inptr = folders->pdata[i];
+		inend = inptr + strlen (inptr);
+		if (strncmp (inptr, "* LSUB (", 8))
+			continue;
+		
+		inptr += 8;
+		while (inptr < inend && *inptr != ')')
+			inptr++;
+		
+		if (inptr >= inend)
+			continue;
+		
+		inptr++;
+		while (inptr < inend && isspace ((int) *inptr))
+			inptr++;
+		
+		if (inptr >= inend)
+			continue;
+		
+		/* skip over the dir sep */
+		if (*inptr == '\"')
+			inptr++;
+		
+		*dir_sep = *inptr++;
+		if (*inptr == '\"')
+			inptr++;
+		
+		if (inptr >= inend)
+			continue;
+		
+		while (inptr < inend && isspace ((int) *inptr))
+			inptr++;
+		
+		if (inptr >= inend)
+			continue;
+		
+		if (*inptr == '\"') {
+			inptr++;
+			quoted = 1;
+		} else
+			quoted = 0;
+		
+		inlen = strlen (inptr) - quoted;
+		if (len > inlen)
+			continue;
+		
+		diff = inlen - len;
+		if (!strncmp (inptr + diff, folder, len))
+			return hex_encode (inptr, inlen);
+	}
+	
+	*dir_sep = '\0';
+	
+	return NULL;
+}
+
+static char *
+imap_url_upgrade (GHashTable *imap_sources, const char *uri)
+{
+	struct _storeinfo *si;
+	unsigned char *base_url, *folder, *p, *new = NULL;
+	char dir_sep;
+	
+	base_url = get_base_url ("imap", uri);
+	
+	fprintf (stderr, "checking for %s... ", base_url);
+	if (!(si = g_hash_table_lookup (imap_sources, base_url))) {
+		fprintf (stderr, "not found.\n");
+		g_warning ("Unknown imap account: %s", base_url);
+		g_free (base_url);
+		return NULL;
+	}
+	
+	fprintf (stderr, "found.\n");
+	p = (unsigned char *) uri + strlen (base_url) + 1;
+	if (!strcmp (p, "INBOX")) {
+		new = g_strdup_printf ("%s/INBOX", base_url);
+		g_free (base_url);
+		return new;
+	}
+	
+	p = hex_decode (p, strlen (p));
+	
+	fprintf (stderr, "checking for folder %s on %s... ", p, base_url);
+	folder = si->folders ? find_folder (si->folders, p, &dir_sep) : NULL;
+	if (folder == NULL) {
+		fprintf (stderr, "not found.\n");
+		folder = p;
+		if (si->namespace) {
+			if (!si->dir_sep) {
+				fprintf (stderr, "checking for directory separator in namespace param... ");
+				if (*si->namespace == '/') {
+					dir_sep = '/';
+				} else {
+					p = si->namespace;
+					while (*p && !ispunct ((int) *p))
+						p++;
+					
+					dir_sep = (char) *p;
+				}
+			} else {
+				dir_sep = si->dir_sep;
+			}
+			
+			if (dir_sep) {
+				fprintf (stderr, "found: '%c'\n", dir_sep);
+				p = folder;
+				folder = hex_encode (folder, strlen (folder));
+				new = g_strdup_printf ("%s/%s%c%s", base_url, si->encoded_namespace, dir_sep, folder);
+				g_free (folder);
+				folder = p;
+				
+				p = new + strlen (base_url) + 1;
+				while (*p) {
+					if (*p == dir_sep)
+						*p = '/';
+					p++;
+				}
+			} else {
+				fprintf (stderr, "not found.");
+				g_warning ("Cannot update settings for imap folder %s: unknown directory separator", uri);
+			}
+		} else {
+			g_warning ("Cannot update settings for imap folder %s: unknown namespace", uri);
+		}
+		
+		g_free (base_url);
+		g_free (folder);
+		
+		return new;
+	} else
+		g_free (p);
+	
+	fprintf (stderr, "found.\n");
+	new = g_strdup_printf ("%s/%s", base_url, folder);
+	g_free (folder);
+	
+	if (!si->dir_sep)
+		si->dir_sep = dir_sep;
+	
+	if (dir_sep) {
+		p = new + strlen (base_url) + 1;
+		while (*p) {
+			if (*p == dir_sep)
+				*p = '/';
+			p++;
+		}
+	}
+	
+	g_free (base_url);
+	
+	return new;
+}
+
+static char *
+exchange_url_upgrade (const char *uri)
+{
+	unsigned char *base_url, *folder;
+	char *url;
+	
+	base_url = get_base_url ("exchange", uri);
+	folder = (unsigned char *) uri + strlen (base_url) + 1;
+	
+	if (strncmp (folder, "exchange/", 9))
+		return g_strdup (uri);
+	
+	folder += 9;
+	while (*folder && *folder != '/')
+		folder++;
+	if (*folder == '/')
+		folder++;
+	
+	folder = hex_decode (folder, strlen (folder));
+	url = g_strdup_printf ("%s/personal/%s", base_url, folder);
+	g_free (base_url);
+	g_free (folder);
+	
+	return url;
+}
+
+static int
+mailer_upgrade_account_info (Bonobo_ConfigDatabase db, const char *key, int num, GHashTable *imap_sources)
+{
+	char *path, *uri, *new;
+	int i;
+	
+	for (i = 0;  i < num; i++) {
+		path = g_strdup_printf ("/Mail/Accounts/account_%s_folder_uri_%d", key, i);
+		uri = bonobo_config_get_string (db, path, NULL);
+		if (uri) {
+			if (!strncmp (uri, "imap:", 5)) {
+				new = imap_url_upgrade (imap_sources, uri);
+				if (new) {
+					bonobo_config_set_string (db, path, new, NULL);
+					g_free (new);
+				}
+			} else if (!strncmp (uri, "exchange:", 9)) {
+				new = exchange_url_upgrade (uri);
+				bonobo_config_set_string (db, path, new, NULL);
+				g_free (new);
+			}
+		}
+		
+		g_free (uri);
+		g_free (path);
+	}
+	
+	return 0;
+}
+
+static int
+mailer_upgrade_xml_file (GHashTable *imap_sources, const char *filename)
+{
+	unsigned char *buffer, *inptr, *start, *uri, *new;
+	ssize_t nread = 0, nwritten, n;
+	gboolean url_need_upgrade;
+	struct stat st;
+	size_t len;
+	char *bak;
+	int fd;
+	
+	bak = g_strdup_printf ("%s.bak-1.0", filename);
+	if (stat (bak, &st) != -1) {
+		/* seems we have already converted this file? */
+		fprintf (stderr, "\n%s already exists, assuming %s has already been upgraded\n", bak, filename);
+		g_free (bak);
+		return 0;
+	}
+	
+	if (stat (filename, &st) == -1 || (fd = open (filename, O_RDONLY)) == -1) {
+		/* file doesn't exist? I guess nothing to upgrade here */
+		fprintf (stderr, "\nCould not open %s: %s\n", filename, strerror (errno));
+		g_free (bak);
+		return 0;
+	}
+	
+	start = buffer = g_malloc (st.st_size + 1);
+	do {
+		do {
+			n = read (fd, buffer + nread, st.st_size - nread);
+		} while (n == -1 && errno == EINTR);
+		
+		if (n > 0)
+			nread += n;
+	} while (n != -1 && nread < st.st_size);
+	buffer[nread] = '\0';
+	
+	if (nread < st.st_size) {
+		/* failed to load the entire file? */
+		fprintf (stderr, "\nFailed to load %s: %s\n", filename, strerror (errno));
+		g_free (buffer);
+		g_free (bak);
+		close (fd);
+		return -1;
+	}
+	
+	close (fd);
+	
+	inptr = buffer;
+	url_need_upgrade = FALSE;
+	do {
+		inptr = strstr (inptr, "uri=\"");
+		if (inptr) {
+			inptr += 5;
+			url_need_upgrade = !strncmp (inptr, "imap:", 5) || !strncmp (inptr, "exchange:", 9);
+		}
+	} while (inptr && !url_need_upgrade);
+	
+	if (inptr == NULL) {
+		/* no imap urls in this xml file, so no need to "upgrade" it */
+		fprintf (stdout, "\nNo updates required for %s\n", filename);
+		g_free (buffer);
+		g_free (bak);
+		return 0;
+	}
+	
+	if (rename (filename, bak) == -1) {
+		/* failed to backup xml file */
+		fprintf (stderr, "\nFailed to create backup file %s: %s\n", bak, strerror (errno));
+		g_free (buffer);
+		g_free (bak);
+		return -1;
+	}
+	
+	if ((fd = open (filename, O_WRONLY | O_CREAT | O_TRUNC, 0644)) == -1) {
+		/* failed to create new xml file */
+		fprintf (stderr, "\nFailed to create new %s: %s\n", filename, strerror (errno));
+		rename (bak, filename);
+		g_free (buffer);
+		g_free (bak);
+		return -1;
+	}
+	
+	while (inptr != NULL) {
+		len = inptr - start;
+		nwritten = 0;
+		do {
+			do {
+				n = write (fd, start + nwritten, len - nwritten);
+			} while (n == -1 && errno == EINTR);
+			
+			if (n > 0)
+				nwritten += n;
+		} while (n != -1 && nwritten < len);
+		
+		if (nwritten < len)
+			goto exception;
+		
+		start = inptr;
+		while (*start && *start != '"')
+			start++;
+		
+		uri = g_strndup (inptr, start - inptr);
+		if (!strncmp (uri, "imap:", 5)) {
+			if ((new = imap_url_upgrade (imap_sources, uri)) == NULL) {
+				new = uri;
+				uri = NULL;
+			}
+		} else if (!strncmp (uri, "exchange:", 9)) {
+			new = exchange_url_upgrade (uri);
+		} else {
+			new = uri;
+			uri = NULL;
+		}
+		g_free (uri);
+		
+		nwritten = 0;
+		len = strlen (new);
+		do {
+			do {
+				n = write (fd, new + nwritten, len - nwritten);
+			} while (n == -1 && errno == EINTR);
+			
+			if (n > 0)
+				nwritten += n;
+		} while (n != -1 && nwritten < len);
+		
+		g_free (new);
+		
+		if (nwritten < len)
+			goto exception;
+		
+		inptr = start;
+		url_need_upgrade = FALSE;
+		do {
+			inptr = strstr (inptr, "uri=\"");
+			if (inptr) {
+				inptr += 5;
+				url_need_upgrade = !strncmp (inptr, "imap:", 5) || !strncmp (inptr, "exchange:", 9);
+			}
+		} while (inptr && !url_need_upgrade);
+	}
+	
+	nwritten = 0;
+	len = strlen (start);
+	do {
+		do {
+			n = write (fd, start + nwritten, len - nwritten);
+		} while (n == -1 && errno == EINTR);
+		
+		if (n > 0)
+			nwritten += n;
+	} while (n != -1 && nwritten < len);
+	
+	if (nwritten < len)
+		goto exception;
+	
+	if (fsync (fd) == -1)
+		goto exception;
+	
+	close (fd);
+	g_free (buffer);
+	
+	fprintf (stdout, "\nSuccessfully upgraded %s\nPrevious settings saved in %s\n\n", filename, bak);
+	
+	g_free (bak);
+	
+	return 0;
+	
+ exception:
+	
+	fprintf (stderr, "\nFailed to save updated settings to %s: %s\n\n", filename, strerror (errno));
+	
+	close (fd);
+	g_free (buffer);
+	unlink (filename);
+	rename (bak, filename);
+	g_free (bak);
+	
+	return -1;
+}
+
+static char *
+shortcuts_upgrade_uri (GHashTable *accounts, GHashTable *imap_sources, const char *account, const char *folder)
+{
+	char *url, *name, *decoded, *new = NULL;
+	struct _storeinfo *si;
+	int type;
+	
+	type = GPOINTER_TO_INT ((si = g_hash_table_lookup (accounts, account)));
+	if (type == 1) {
+		/* exchange */
+		decoded = hex_decode (folder, strlen (folder));
+		name = g_strdup_printf ("personal/%s", decoded);
+		g_free (decoded);
+		
+		return name;
+	} else {
+		/* imap */
+		url = g_strdup_printf ("%s/%s", si->base_url, folder);
+		new = imap_url_upgrade (imap_sources, url);
+		g_free (url);
+		
+		if (new) {
+			name = new + strlen (si->base_url) + 1;
+			name = hex_decode (name, strlen (name));
+			g_free (new);
+			
+			return name;
+		}
+	}
+	
+	return NULL;
+}
+
+static int
+shortcuts_upgrade_xml_file (GHashTable *accounts, GHashTable *imap_sources, const char *filename)
+{
+	char *bak, *uri, *account, *folder, *new, *new_uri, *type;
+	struct stat st;
+	xmlDoc *doc;
+	xmlNode *group, *item;
+	int account_len;
+	gboolean changed = FALSE;
+	
+	bak = g_strdup_printf ("%s.bak-1.0", filename);
+	if (stat (bak, &st) != -1) {
+		/* seems we have already converted this file? */
+		fprintf (stderr, "\n%s already exists, assuming %s has already been upgraded\n", bak, filename);
+		g_free (bak);
+		return 0;
+	}
+	
+	if (stat (filename, &st) == -1) {
+		/* file doesn't exist? I guess nothing to upgrade here */
+		fprintf (stderr, "\nCould not open %s: %s\n", filename, strerror (errno));
+		g_free (bak);
+		return 0;
+	}
+	
+	doc = xmlParseFile (filename);
+	if (!doc || !doc->xmlRootNode) {
+		/* failed to load/parse the file? */
+		fprintf (stderr, "\nFailed to load %s\n", filename);
+		g_free (bak);
+		return -1;
+	}
+	
+	for (group = doc->xmlRootNode->xmlChildrenNode; group; group = group->next) {
+		for (item = group->xmlChildrenNode; item; item = item->next) {
+			/* Fix IMAP/Exchange URIs */
+			uri = xmlNodeGetContent (item);
+			if (!strncmp (uri, "evolution:/", 11)) {
+				if (!strcmp (uri, "evolution:/local/Inbox")) {
+					xmlNodeSetContent (item, "default:mail");
+					changed = TRUE;
+				} else if (!strcmp (uri, "evolution:/local/Calendar")) {
+					xmlNodeSetContent (item, "default:calendar");
+					changed = TRUE;
+				} else if (!strcmp (uri, "evolution:/local/Contacts")) {
+					xmlNodeSetContent (item, "default:contacts");
+					changed = TRUE;
+				} else if (!strcmp (uri, "evolution:/local/Tasks")) {
+					xmlNodeSetContent (item, "default:tasks");
+					changed = TRUE;
+				} else {
+					account_len = strcspn (uri + 11, "/");
+					account = g_strndup (uri + 11, account_len);
+					if (g_hash_table_lookup (accounts, account)) {
+						folder = uri + 11 + account_len;
+						if (*folder)
+							folder++;
+						new = shortcuts_upgrade_uri (accounts, imap_sources, account, folder);
+						new_uri = g_strdup_printf ("evolution:/%s/%s", account, new);
+						xmlNodeSetContent (item, new_uri);
+						changed = TRUE;
+						g_free (new_uri);
+					}
+					g_free (account);
+				}
+			}
+			xmlFree (uri);
+			
+			/* Fix LDAP shortcuts */
+			type = xmlGetProp (item, "type");
+			if (type) {
+				if (!strcmp (type, "ldap-contacts")) {
+					xmlSetProp (item, "type", "contacts/ldap");
+					changed = TRUE;
+				}
+				xmlFree (type);
+			}
+		}
+	}
+	
+	if (!changed) {
+		fprintf (stdout, "\nNo updates required for %s\n", filename);
+		xmlFreeDoc (doc);
+		g_free (bak);
+		return 0;
+ 	}
+	
+	if (rename (filename, bak) == -1) {
+		/* failed to backup xml file */
+		fprintf (stderr, "\nFailed to create backup file %s: %s\n", bak, strerror (errno));
+		xmlFreeDoc (doc);
+		g_free (bak);
+		return -1;
+	}
+	
+	if (e_xml_save_file (filename, doc) == -1) {
+		fprintf (stderr, "\nFailed to save updated settings to %s: %s\n\n", filename, strerror (errno));
+		xmlFreeDoc (doc);
+		unlink (filename);
+		rename (bak, filename);
+		g_free (bak);
+		return -1;
+	}
+	
+	fprintf (stdout, "\nSuccessfully upgraded %s\nPrevious settings saved in %s\n\n", filename, bak);
+	
+	xmlFreeDoc (doc);
+	g_free (bak);
+	
+	return 0;
+}
+
+
+static int
+mailer_upgrade (Bonobo_ConfigDatabase db)
+{
+	GHashTable *imap_sources, *accounts;
+	char *path, *uri;
+	char *account, *transport;
+	int num, i;
+	
+	if ((num = bonobo_config_get_long_with_default (db, "/Mail/Accounts/num", 0, NULL)) == 0) {
+		/* nothing to upgrade */
+		return 0;
+	}
+	
+	accounts = g_hash_table_new (g_str_hash, g_str_equal);
+	imap_sources = g_hash_table_new (g_str_hash, g_str_equal);
+	for (i = 0; i < num; i++) {
+		struct _storeinfo *si;
+		struct stat st;
+		char *string;
+		guint32 tmp;
+		FILE *fp;
+		int j;
+		
+		path = g_strdup_printf ("/Mail/Accounts/source_url_%d", i);
+		uri = bonobo_config_get_string (db, path, NULL);
+		g_free (path);
+		if (uri && !strncmp (uri, "imap:", 5)) {
+			path = g_strdup_printf ("/Mail/Accounts/account_name_%d", i);
+			account = bonobo_config_get_string (db, path, NULL);
+			g_free (path);
+			
+			si = g_new (struct _storeinfo, 1);
+			si->base_url = get_base_url ("imap", uri);
+			si->namespace = imap_namespace (uri);
+			si->encoded_namespace = NULL;
+			si->dir_sep = '\0';
+			si->folders = NULL;
+			
+			path = si->base_url + 7;
+			
+			path = g_strdup_printf ("%s/evolution/mail/imap/%s/storeinfo", getenv ("HOME"), path);
+			if (stat (path, &st) != -1 && (fp = fopen (path, "r")) != NULL) {
+				camel_file_util_decode_uint32 (fp, &tmp);
+				camel_file_util_decode_uint32 (fp, &tmp);
+				
+				j = 0;
+				si->folders = g_ptr_array_new ();
+				while (camel_file_util_decode_string (fp, &string) != -1) {
+					if (j++ > 0) {
+						g_ptr_array_add (si->folders, string);
+					} else {
+						if (!si->namespace)
+							si->namespace = string;
+						else
+							g_free (string);
+						
+						camel_file_util_decode_uint32 (fp, &tmp);
+						si->dir_sep = (char) tmp & 0xff;
+					}
+				}
+				
+				fclose (fp);
+			}
+			g_free (path);
+			
+			if (si->folders && si->folders->len > 0)
+				si->dir_sep = find_dir_sep (si->folders->pdata[0]);
+			
+			if (si->namespace) {
+				/* strip trailing dir_sep from namespace if it's there */
+				j = strlen (si->namespace) - 1;
+				if (si->namespace[j] == si->dir_sep)
+					si->namespace[j] = '\0';
+				
+				/* set the encoded version of the namespace */
+				si->encoded_namespace = g_strdup (si->namespace);
+				for (j = 0; j < strlen (si->encoded_namespace); j++) {
+					if (si->encoded_namespace[j] == '/')
+						si->encoded_namespace[j] = '.';
+				}
+			}
+			
+			g_hash_table_insert (imap_sources, si->base_url, si);
+			
+			if (account)
+				g_hash_table_insert (accounts, account, si);
+		} else if (uri && !strncmp (uri, "exchange:", 9)) {
+			/* Upgrade transport uri */
+			path = g_strdup_printf ("/Mail/Accounts/transport_url_%d", i);
+			transport = bonobo_config_get_string (db, path, NULL);
+			if (transport && !strncmp (transport, "exchanget:", 10))
+				bonobo_config_set_string (db, path, uri, NULL);
+			g_free (transport);
+			g_free (path);
+			
+			path = g_strdup_printf ("/Mail/Accounts/account_name_%d", i);
+			account = bonobo_config_get_string (db, path, NULL);
+			g_free (path);
+			
+			if (account)
+				g_hash_table_insert (accounts, account, GINT_TO_POINTER (1));
+		}
+		
+		g_free (uri);
+	}
+	
+	if (g_hash_table_size (accounts) == 0) {
+		/* user doesn't have any imap/exchange accounts - nothing to upgrade */
+		g_hash_table_destroy (imap_sources);
+		return 0;
+	}
+	
+	/* upgrade user's account info (bug #29135) */
+	mailer_upgrade_account_info (db, "drafts", num, imap_sources);
+	mailer_upgrade_account_info (db, "sent", num, imap_sources);
+	
+	/* upgrade user's filters/vfolders (bug #24451) */
+	path = g_strdup_printf ("%s/evolution/filters.xml", getenv ("HOME"));
+	mailer_upgrade_xml_file (imap_sources, path);
+	g_free (path);
+	
+	path = g_strdup_printf ("%s/evolution/vfolders.xml", getenv ("HOME"));
+	mailer_upgrade_xml_file (imap_sources, path);
+	g_free (path);
+	
+	/* upgrade user's shortcuts (there's no bug # for this one) */
+	path = g_strdup_printf ("%s/evolution/shortcuts.xml", getenv ("HOME"));
+	shortcuts_upgrade_xml_file (accounts, imap_sources, path);
+	g_free (path);
+	
+	g_hash_table_foreach (imap_sources, cache_upgrade_and_free, NULL);
+	g_hash_table_destroy (imap_sources);
+#if 0
+	path = g_strdup_printf ("%s/evolution/mail/imap", getenv ("HOME"));
+	bak = g_strdup_printf ("%s.bak-1.0", path);
+	
+	if (rename (path, bak) == -1)
+		fprintf (stderr, "\nFailed to backup Evolution 1.0's IMAP cache: %s\n", strerror (errno));
+	
+	g_free (path);
+	g_free (bak);
+#endif
+	
+	return 0;
+}
+
+static Bonobo_ConfigDatabase
+get_config_db (void)
+{
+	Bonobo_ConfigDatabase db;
+	CORBA_Environment ev;
+	
+	CORBA_exception_init (&ev);
+	
+	db = bonobo_get_object ("wombat:", "Bonobo/ConfigDatabase", &ev);
+	if (BONOBO_EX (&ev) || db == CORBA_OBJECT_NIL) {
+		fprintf (stderr, "get_config_db(): Could not get the config database object '%s'",
+			 bonobo_exception_get_text (&ev));
+		db = CORBA_OBJECT_NIL;
+	}
+	
+	CORBA_exception_free (&ev);
+	
+	return db;
+}
+
+static int
+upgrade (void)
+{
+	Bonobo_ConfigDatabase db;
+	CORBA_Environment ev;
+	
+	if ((db = get_config_db ()) == CORBA_OBJECT_NIL)
+		g_error ("Could not get config db");
+	
+	mailer_upgrade (db);
+	
+	CORBA_exception_init (&ev);
+	Bonobo_ConfigDatabase_sync (db, &ev);
+	
+	gtk_main_quit ();
+	
+	return FALSE;
+}
+
+int main (int argc, char **argv)
+{
+	CORBA_ORB orb;
+	
+	gnome_init ("evolution-upgrade", "1.0", argc, argv);
+	
+	if ((orb = oaf_init (argc, argv)) == NULL)
+		g_error ("Cannot init oaf");
+	
+	if (bonobo_init (orb, CORBA_OBJECT_NIL, CORBA_OBJECT_NIL) == FALSE)
+		g_error ("Cannot init bonobo");
+	
+	gtk_idle_add ((GtkFunction) upgrade, NULL);
+	
+	bonobo_main ();
+	
+	return 0;
+}
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 9a4b6048ef..0df0336bbe 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -92,6 +92,7 @@ calendar/gui/dialogs/event-editor.c
 calendar/gui/dialogs/event-page.c
 calendar/gui/dialogs/event-page.glade
 calendar/gui/dialogs/meeting-page.c
+calendar/gui/dialogs/meeting-page.etspec
 calendar/gui/dialogs/meeting-page.glade
 calendar/gui/dialogs/recur-comp.c
 calendar/gui/dialogs/recurrence-page.c
@@ -118,6 +119,7 @@ calendar/gui/e-day-view-time-item.c
 calendar/gui/e-day-view-top-item.c
 calendar/gui/e-itip-control.c
 calendar/gui/e-itip-control.glade
+calendar/gui/e-meeting-model.c
 calendar/gui/e-meeting-time-sel.c
 calendar/gui/e-meeting-time-sel.etspec
 calendar/gui/e-meeting-time-sel-item.c
@@ -260,7 +262,10 @@ importers/evolution-gnomecard-importer.c
 importers/netscape-importer.c
 importers/pine-importer.c
 mail/component-factory.c
+mail/folder-browser.c
 mail/folder-browser-factory.c
+mail/folder-browser.h
+mail/folder-browser-ui.c
 mail/folder-info.c
 mail/GNOME_Evolution_Mail.server.in.in
 mail/importers/elm-importer.c
@@ -275,27 +280,35 @@ mail/local-config.glade
 mail/mail-account-editor.c
 mail/mail-account-gui.c
 mail/mail-accounts.c
+mail/mail-accounts.etspec
 mail/mail-autofilter.c
+mail/mail-callbacks.c
 mail/mail-composer-prefs.c
 mail/mail-config.c
 mail/mail-config-druid.c
 mail/mail-config.glade
 mail/mail-crypto.c
+mail/mail-display.c
 mail/mail-folder-cache.c
+mail/mail-format.c
 mail/mail-local.c
 mail/mail-mt.c
 mail/mail-ops.c
 mail/mail-preferences.c
+mail/mail-search.c
 mail/mail-send-recv.c
 mail/mail-session.c
 mail/mail-signature-editor.c
 mail/mail-tools.c
 mail/mail-vfolder.c
+mail/message-browser.c
 mail/message-list.c
 mail/message-list.etspec
 mail/message-tag-editor.c
 mail/message-tag-followup.c
 mail/message-tags.glade
+mail/subscribe-dialog.c
+mail/subscribe-dialog.etspec
 mail/subscribe-dialog.glade
 my-evolution/component-factory.c
 my-evolution/e-summary.c
diff --git a/po/POTFILES.skip b/po/POTFILES.skip
index 886ae0f72c..d645236d05 100644
--- a/po/POTFILES.skip
+++ b/po/POTFILES.skip
@@ -3,6 +3,7 @@ addressbook/gui/widgets/test-minicard-view.c
 addressbook/tools/evolution-addressbook-export-list-cards.c
 addressbook/tools/evolution-addressbook-export-list-folders.c
 addressbook/tools/evolution-addressbook-export.c
+camel/camel-pkcs7-context.c
 camel/providers/nntp/camel-nntp-auth.c
 camel/providers/nntp/camel-nntp-folder.c
 camel/providers/nntp/camel-nntp-grouplist.c
diff --git a/po/am.po b/po/am.po
index 1d1bae1758..3c360a5599 100644
--- a/po/am.po
+++ b/po/am.po
@@ -7,201 +7,72 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 1.0\n"
-"POT-Creation-Date: 2003-10-15 23:45+0200\n"
+"POT-Creation-Date: 2003-06-25 13:24-0400\n"
 "PO-Revision-Date: 2003-02-07 17:46+EDT\n"
 "Last-Translator: Ge'ez Frontier Foundation <locales@geez.org>\n"
 "Language-Team: Amharic <locales@geez.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Report-Msgid-Bugs-To: \n"
 
-#: addressbook/backend/ebook/e-card.c:1306
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in.h:1
+msgid "Evolution LDIF importer"
+msgstr ""
+
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in.h:2
+msgid "LDAP Data Interchange Format (.ldif)"
+msgstr ""
+
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:1
+msgid "Evolution VCard Importer"
+msgstr ""
+
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:2
+msgid "Evolution VCard importer"
+msgstr ""
+
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:3
+msgid "VCard (.vcf, .gcrd)"
+msgstr ""
+
 #: addressbook/backend/ebook/e-card-simple.c:60
+#: addressbook/backend/ebook/e-card.c:1306
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:15
 msgid "File As"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:1313
-#: addressbook/gui/contact-editor/fullname.glade.h:4
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:17
-msgid "Full Name"
-msgstr "ሙሉ ስም"
-
-#: addressbook/backend/ebook/e-card.c:1320
 #: addressbook/backend/ebook/e-card-simple.c:61
-#: addressbook/gui/component/select-names/e-select-names.etspec.h:1
+#: addressbook/backend/ebook/e-card.c:1320
 #: addressbook/gui/component/select-names/e-select-names-section.etspec.h:1
+#: addressbook/gui/component/select-names/e-select-names.etspec.h:1
 #: addressbook/gui/contact-editor/e-contact-editor-fullname.c:89
 #: my-evolution/e-summary-table.c:59
 msgid "Name"
 msgstr "ስም"
 
-#: addressbook/backend/ebook/e-card.c:1326
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:96
-msgid "Address"
-msgstr "አድራሻ"
-
-#: addressbook/backend/ebook/e-card.c:1333
-msgid "Address Label"
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:1340
-msgid "Phone"
-msgstr "ስልክ"
-
-#: addressbook/backend/ebook/e-card.c:1347
 #: addressbook/backend/ebook/e-card-simple.c:62
+#: addressbook/backend/ebook/e-card.c:1347
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
 msgid "Email"
 msgstr "ኢሜይል"
 
-#: addressbook/backend/ebook/e-card.c:1354
-msgid "Birth date"
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:1360
-#: calendar/gui/e-calendar-table.etspec.h:18
-msgid "URL"
-msgstr "URL"
-
-#: addressbook/backend/ebook/e-card.c:1367
-#: addressbook/backend/ebook/e-card-simple.c:69
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
-msgid "Organization"
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:1374
-msgid "Organizational Unit"
+#: addressbook/backend/ebook/e-card-simple.c:63
+#: addressbook/gui/contact-editor/e-contact-editor.c:1752
+msgid "Primary"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:1381
-#: addressbook/backend/ebook/e-card-simple.c:90
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
-msgid "Office"
-msgstr "ቢሮ"
-
-#: addressbook/backend/ebook/e-card.c:1388
-#: addressbook/backend/ebook/e-card-simple.c:91
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:39
-msgid "Title"
-msgstr "አርእስት"
-
-#: addressbook/backend/ebook/e-card.c:1395
-#: calendar/gui/e-meeting-time-sel.etspec.h:9
-msgid "Role"
+#: addressbook/backend/ebook/e-card-simple.c:63
+msgid "Prim"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:1402
-#: addressbook/backend/ebook/e-card-simple.c:93
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
-msgid "Manager"
-msgstr "መቆጣጠሪያ"
-
-#: addressbook/backend/ebook/e-card.c:1409
 #: addressbook/backend/ebook/e-card-simple.c:64
 #: addressbook/backend/ebook/e-card-simple.c:94
+#: addressbook/backend/ebook/e-card.c:1409
 #: addressbook/gui/contact-editor/e-contact-editor.c:1737
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:2
 msgid "Assistant"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:1416
-#: addressbook/backend/ebook/e-card-simple.c:95
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-msgid "Nickname"
-msgstr "ቅጽል ስም"
-
-#: addressbook/backend/ebook/e-card.c:1423
-#: addressbook/backend/ebook/e-card-simple.c:96
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:36
-msgid "Spouse"
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:1430
-#: addressbook/backend/ebook/e-card-simple.c:101
-msgid "Anniversary"
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:1436
-msgid "Mailer"
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:1443
-#: addressbook/backend/ebook/e-card-simple.c:98
-msgid "Calendar URI"
-msgstr "የቀን መቁጠሪያ URI"
-
-#: addressbook/backend/ebook/e-card.c:1450
-msgid "Free/Busy URL"
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:1457
-#, fuzzy
-msgid "ICS Calendar"
-msgstr "ቀን መቁጠሪያ"
-
-#: addressbook/backend/ebook/e-card.c:1464
-#: addressbook/backend/ebook/e-card-simple.c:97
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
-msgid "Note"
-msgstr "ማስታወሻ"
-
-#: addressbook/backend/ebook/e-card.c:1471
-msgid "Related Contacts"
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:1478
-#: addressbook/backend/ebook/e-card-simple.c:105
-#: calendar/gui/e-calendar-table.etspec.h:4
-msgid "Categories"
-msgstr "ምድቦች"
-
-#: addressbook/backend/ebook/e-card.c:1485
-msgid "Category List"
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:1492
-msgid "Wants HTML"
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:1499
-msgid "Wants HTML set"
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:1506 ui/evolution-calendar.xml.h:16
-msgid "List"
-msgstr "ዝርዝር"
-
-#: addressbook/backend/ebook/e-card.c:1513
-msgid "List Show Addresses"
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:1520
-msgid "Arbitrary"
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:1527
-msgid "ID"
-msgstr "ID"
-
-#: addressbook/backend/ebook/e-card.c:1534
-msgid "Last Use"
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:1545
-msgid "Use Score"
-msgstr ""
-
-#: addressbook/backend/ebook/e-card-simple.c:63
-#: addressbook/gui/contact-editor/e-contact-editor.c:1752
-msgid "Primary"
-msgstr ""
-
-#: addressbook/backend/ebook/e-card-simple.c:63
-msgid "Prim"
-msgstr ""
-
 #: addressbook/backend/ebook/e-card-simple.c:65
 #: addressbook/backend/ebook/e-card-simple.c:70
 #: addressbook/gui/contact-editor/e-contact-editor.c:1738
@@ -236,6 +107,12 @@ msgid "Home"
 msgstr "መጀመሪያ"
 
 #: addressbook/backend/ebook/e-card-simple.c:69
+#: addressbook/backend/ebook/e-card.c:1367
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
+msgid "Organization"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card-simple.c:69
 msgid "Org"
 msgstr ""
 
@@ -354,9 +231,21 @@ msgid "Dep"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:90
+#: addressbook/backend/ebook/e-card.c:1381
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
+msgid "Office"
+msgstr "ቢሮ"
+
+#: addressbook/backend/ebook/e-card-simple.c:90
 msgid "Off"
 msgstr "አጥፋ"
 
+#: addressbook/backend/ebook/e-card-simple.c:91
+#: addressbook/backend/ebook/e-card.c:1388
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:39
+msgid "Title"
+msgstr "አርእስት"
+
 #: addressbook/backend/ebook/e-card-simple.c:92
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:34
 msgid "Profession"
@@ -367,6 +256,12 @@ msgid "Prof"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:93
+#: addressbook/backend/ebook/e-card.c:1402
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
+msgid "Manager"
+msgstr "መቆጣጠሪያ"
+
+#: addressbook/backend/ebook/e-card-simple.c:93
 msgid "Man"
 msgstr ""
 
@@ -375,9 +270,32 @@ msgid "Ass"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:95
+#: addressbook/backend/ebook/e-card.c:1416
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
+msgid "Nickname"
+msgstr "ቅጽል ስም"
+
+#: addressbook/backend/ebook/e-card-simple.c:95
 msgid "Nick"
 msgstr "ቅጽል"
 
+#: addressbook/backend/ebook/e-card-simple.c:96
+#: addressbook/backend/ebook/e-card.c:1423
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:36
+msgid "Spouse"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card-simple.c:97
+#: addressbook/backend/ebook/e-card.c:1464
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
+msgid "Note"
+msgstr "ማስታወሻ"
+
+#: addressbook/backend/ebook/e-card-simple.c:98
+#: addressbook/backend/ebook/e-card.c:1443
+msgid "Calendar URI"
+msgstr "የቀን መቁጠሪያ URI"
+
 #: addressbook/backend/ebook/e-card-simple.c:98
 msgid "CALUri"
 msgstr ""
@@ -401,6 +319,11 @@ msgid "icsCalendar"
 msgstr "ቀን መቁጠሪያ"
 
 #: addressbook/backend/ebook/e-card-simple.c:101
+#: addressbook/backend/ebook/e-card.c:1430
+msgid "Anniversary"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card-simple.c:101
 msgid "Anniv"
 msgstr ""
 
@@ -408,6 +331,12 @@ msgstr ""
 msgid "Birth Date"
 msgstr ""
 
+#: addressbook/backend/ebook/e-card-simple.c:105
+#: addressbook/backend/ebook/e-card.c:1478
+#: calendar/gui/e-calendar-table.etspec.h:4
+msgid "Categories"
+msgstr "ምድቦች"
+
 #: addressbook/backend/ebook/e-card-simple.c:106
 msgid "Family Name"
 msgstr "የቤተሰብ ስም"
@@ -422,30 +351,107 @@ msgid "%x"
 msgstr "%x"
 
 #: addressbook/backend/ebook/e-card-simple.c:912
-#: addressbook/backend/ebook/e-destination.c:709
+#: addressbook/backend/ebook/e-destination.c:706
 msgid "Unnamed List"
 msgstr ""
 
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in.h:1
-msgid "Evolution LDIF importer"
+#: addressbook/backend/ebook/e-card.c:1313
+#: addressbook/gui/contact-editor/fullname.glade.h:4
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:17
+msgid "Full Name"
+msgstr "ሙሉ ስም"
+
+#: addressbook/backend/ebook/e-card.c:1326
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:96
+msgid "Address"
+msgstr "አድራሻ"
+
+#: addressbook/backend/ebook/e-card.c:1333
+msgid "Address Label"
 msgstr ""
 
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in.h:2
-msgid "LDAP Data Interchange Format (.ldif)"
+#: addressbook/backend/ebook/e-card.c:1340
+msgid "Phone"
+msgstr "ስልክ"
+
+#: addressbook/backend/ebook/e-card.c:1354
+msgid "Birth date"
 msgstr ""
 
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:1
-msgid "Evolution VCard Importer"
+#: addressbook/backend/ebook/e-card.c:1360
+#: calendar/gui/e-calendar-table.etspec.h:19
+msgid "URL"
+msgstr "URL"
+
+#: addressbook/backend/ebook/e-card.c:1374
+msgid "Organizational Unit"
 msgstr ""
 
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:2
-msgid "Evolution VCard importer"
+#: addressbook/backend/ebook/e-card.c:1395
+#: calendar/gui/dialogs/meeting-page.etspec.h:9
+#: calendar/gui/e-meeting-time-sel.etspec.h:9
+msgid "Role"
 msgstr ""
 
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:3
-msgid "VCard (.vcf, .gcrd)"
+#: addressbook/backend/ebook/e-card.c:1436 mail/mail-format.c:963
+msgid "Mailer"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:1450
+msgid "Free/Busy URL"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:1457
+#, fuzzy
+msgid "ICS Calendar"
+msgstr "ቀን መቁጠሪያ"
+
+#: addressbook/backend/ebook/e-card.c:1471
+msgid "Related Contacts"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:1485
+msgid "Category List"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:1492
+msgid "Wants HTML"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:1499
+msgid "Wants HTML set"
 msgstr ""
 
+#: addressbook/backend/ebook/e-card.c:1506
+msgid "List"
+msgstr "ዝርዝር"
+
+#: addressbook/backend/ebook/e-card.c:1513
+msgid "List Show Addresses"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:1520
+msgid "Arbitrary"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:1527
+msgid "ID"
+msgstr "ID"
+
+#: addressbook/backend/ebook/e-card.c:1534
+msgid "Last Use"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:1545
+msgid "Use Score"
+msgstr ""
+
+#: addressbook/backend/ebook/test-client-list.c:15
+#: addressbook/backend/ebook/test-client.c:33
+#: calendar/gui/alarm-notify/notify-main.c:171
+msgid "Could not initialize Bonobo"
+msgstr "bonobo ማስጀመር አልቻልኩም!"
+
 #: addressbook/backend/pas/pas-backend-file.c:464
 #: addressbook/backend/pas/pas-backend-ldap.c:3050
 msgid "Searching..."
@@ -501,14 +507,14 @@ msgid "EBook not loaded\n"
 msgstr ""
 
 #: addressbook/conduit/address-conduit.c:1376
-#: calendar/conduits/calendar/calendar-conduit.c:1351
-#: calendar/conduits/todo/todo-conduit.c:893
+#: calendar/conduits/calendar/calendar-conduit.c:1342
+#: calendar/conduits/todo/todo-conduit.c:884
 msgid "Could not start wombat server"
 msgstr ""
 
 #: addressbook/conduit/address-conduit.c:1377
-#: calendar/conduits/calendar/calendar-conduit.c:1352
-#: calendar/conduits/todo/todo-conduit.c:894
+#: calendar/conduits/calendar/calendar-conduit.c:1343
+#: calendar/conduits/todo/todo-conduit.c:885
 msgid "Could not start wombat"
 msgstr ""
 
@@ -517,6 +523,137 @@ msgstr ""
 msgid "Could not read pilot's Address application block"
 msgstr ""
 
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
+msgid "Configure access to LDAP directory servers here"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
+msgid "Directory Servers"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
+msgid "Evolution Addressbook"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
+msgid "Evolution Addressbook LDAP Configuration Control"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
+msgid "Evolution Addressbook address pop-up"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
+msgid "Evolution Addressbook address viewer"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
+msgid "Evolution Addressbook card viewer"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
+msgid "Evolution Addressbook component"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
+msgid "Evolution Addressbook folder viewer"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-component.c:76
+#: addressbook/gui/component/addressbook-component.c:620
+#: importers/netscape-importer.c:1874 mail/importers/netscape-importer.c:1844
+#: shell/e-local-storage.c:178 shell/e-shortcuts.c:1087
+msgid "Contacts"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-component.c:76
+msgid "Folder containing contact information"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-component.c:78
+msgid "LDAP Server"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-component.c:78
+msgid "LDAP server containing contact information"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-component.c:80
+msgid "Public Contacts"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-component.c:80
+msgid "Public folder containing contact information"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-component.c:574
+msgid "New Contact"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-component.c:574
+msgid "_Contact"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-component.c:575
+msgid "Create a new contact"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-component.c:578
+msgid "New Contact List"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-component.c:578
+msgid "Contact _List"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-component.c:579
+msgid "Create a new contact list"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:206
+msgid "Failed to connect to LDAP server"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:231
+msgid "Failed to authenticate with LDAP server"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:259
+msgid "Could not perform query on Root DSE"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:682
+msgid "The server responded with no supported search bases"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:1193
+msgid "This server does not support LDAPv3 schema information"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:1215
+msgid "Error retrieving schema information"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:1223
+msgid "Server did not respond with valid schema information"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:1637
+msgid "Account Name"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:1639
+msgid "Server Name"
+msgstr "የሰርቨር ስም"
+
+#: addressbook/gui/component/addressbook-config.c:1676
+msgid "LDAP was not enabled in this build of Evolution"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-storage.c:178
+msgid "Other Contacts"
+msgstr ""
+
 #: addressbook/gui/component/addressbook.c:502
 msgid ""
 "We were unable to open this addressbook.  Please check that the\n"
@@ -624,101 +761,6 @@ msgstr ""
 msgid "The URI that the Folder Browser will display"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-component.c:76
-#: addressbook/gui/component/addressbook-component.c:628
-#: importers/netscape-importer.c:1874 mail/importers/netscape-importer.c:1844
-#: shell/e-local-storage.c:178 shell/e-shortcuts.c:1087
-msgid "Contacts"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-component.c:76
-msgid "Folder containing contact information"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-component.c:78
-msgid "LDAP Server"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-component.c:78
-msgid "LDAP server containing contact information"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-component.c:80
-msgid "Public Contacts"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-component.c:80
-msgid "Public folder containing contact information"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-component.c:582
-msgid "New Contact"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-component.c:582
-msgid "_Contact"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-component.c:583
-msgid "Create a new contact"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-component.c:586
-msgid "New Contact List"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-component.c:586
-msgid "Contact _List"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-component.c:587
-msgid "Create a new contact list"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:206
-msgid "Failed to connect to LDAP server"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:231
-msgid "Failed to authenticate with LDAP server"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:259
-msgid "Could not perform query on Root DSE"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:682
-msgid "The server responded with no supported search bases"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:1193
-msgid "This server does not support LDAPv3 schema information"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:1215
-msgid "Error retrieving schema information"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:1223
-msgid "Server did not respond with valid schema information"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:1637
-msgid "Account Name"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:1639
-msgid "Server Name"
-msgstr "የሰርቨር ስም"
-
-#: addressbook/gui/component/addressbook-config.c:1676
-msgid "LDAP was not enabled in this build of Evolution"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-storage.c:178
-msgid "Other Contacts"
-msgstr ""
-
 #.
 #. * This is the code for the UI thingie that lets you manipulate the e-mail
 #. * addresses (and *only* the e-mail addresses) associated with an existing
@@ -747,69 +789,33 @@ msgstr ""
 msgid "Add address to existing contact \"%s\""
 msgstr ""
 
-#: addressbook/gui/component/e-address-popup.c:917
+#: addressbook/gui/component/e-address-popup.c:914
 msgid "Querying Addressbook..."
 msgstr ""
 
-#: addressbook/gui/component/e-address-popup.c:1001
-#: addressbook/gui/component/e-address-widget.c:401
+#: addressbook/gui/component/e-address-popup.c:998
+#: addressbook/gui/component/e-address-widget.c:392
 msgid "Edit Contact Info"
 msgstr ""
 
-#: addressbook/gui/component/e-address-popup.c:1031
-#: addressbook/gui/component/e-address-widget.c:437
+#: addressbook/gui/component/e-address-popup.c:1028
+#: addressbook/gui/component/e-address-widget.c:428
 #: addressbook/gui/component/select-names/e-select-names-popup.c:324
 msgid "Add to Contacts"
 msgstr ""
 
-#: addressbook/gui/component/e-address-popup.c:1056
+#: addressbook/gui/component/e-address-popup.c:1053
 msgid "Merge E-Mail Address"
 msgstr ""
 
-#: addressbook/gui/component/e-address-widget.c:378
+#: addressbook/gui/component/e-address-widget.c:369
 msgid "Disable Queries"
 msgstr ""
 
-#: addressbook/gui/component/e-address-widget.c:378
+#: addressbook/gui/component/e-address-widget.c:369
 msgid "Enable Queries (Dangerous!)"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
-msgid "Configure access to LDAP directory servers here"
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
-msgid "Directory Servers"
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
-msgid "Evolution Addressbook"
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
-msgid "Evolution Addressbook LDAP Configuration Control"
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-msgid "Evolution Addressbook address pop-up"
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
-msgid "Evolution Addressbook address viewer"
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
-msgid "Evolution Addressbook card viewer"
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
-msgid "Evolution Addressbook component"
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
-msgid "Evolution Addressbook folder viewer"
-msgstr ""
-
 #: addressbook/gui/component/ldap-config.glade.h:1
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:1
 #: mail/mail-config.glade.h:1
@@ -949,9 +955,10 @@ msgstr "አንድ"
 msgid "S_earch scope: "
 msgstr ""
 
+#. No time range is set, so don't start a query
 #: addressbook/gui/component/ldap-config.glade.h:34
-#: calendar/gui/e-cal-view.c:541 calendar/gui/e-day-view.c:3261
-#: calendar/gui/e-week-view.c:1181 calendar/gui/gnome-cal.c:625
+#: calendar/gui/calendar-model.c:1983 calendar/gui/e-day-view.c:1712
+#: calendar/gui/e-week-view.c:1256
 msgid "Searching"
 msgstr ""
 
@@ -1134,11 +1141,11 @@ msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:85 filter/filter.glade.h:14
 #: mail/mail-config.glade.h:143 ui/evolution-addressbook.xml.h:33
-#: ui/evolution-calendar.xml.h:35 ui/evolution-composer-entries.xml.h:8
-#: ui/evolution-mail-list.xml.h:24 ui/evolution-mail-messagedisplay.xml.h:6
+#: ui/evolution-calendar.xml.h:31 ui/evolution-composer-entries.xml.h:8
+#: ui/evolution-mail-list.xml.h:25 ui/evolution-mail-messagedisplay.xml.h:6
 #: ui/evolution-message-composer.xml.h:41
-#: ui/evolution-signature-editor.xml.h:12 ui/evolution-subscribe.xml.h:10
-#: ui/evolution-tasks.xml.h:19
+#: ui/evolution-signature-editor.xml.h:11 ui/evolution-subscribe.xml.h:10
+#: ui/evolution-tasks.xml.h:17
 msgid "_Edit"
 msgstr "አስተካክል"
 
@@ -1178,24 +1185,20 @@ msgstr ""
 msgid "searching-tab"
 msgstr ""
 
-#: addressbook/gui/component/select-names/e-select-names.c:509
-msgid "Select Contacts from Addressbook"
+#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:1
+msgid "Evolution Addressbook name selection interface"
 msgstr ""
 
-#: addressbook/gui/component/select-names/e-select-names.c:650
-msgid "Find contact in"
-msgstr ""
+#: addressbook/gui/component/select-names/e-select-names-popup.c:204
+msgid "Remove All"
+msgstr "ሁሉንም አስወግድ"
 
-#: addressbook/gui/component/select-names/e-select-names.c:694
 #: addressbook/gui/component/select-names/e-select-names-popup.c:211
-#: composer/e-msg-composer-attachment-bar.c:444
+#: addressbook/gui/component/select-names/e-select-names.c:694
+#: composer/e-msg-composer-attachment-bar.c:507
 msgid "Remove"
 msgstr "አስወግድ"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:204
-msgid "Remove All"
-msgstr "ሁሉንም አስወግድ"
-
 #: addressbook/gui/component/select-names/e-select-names-popup.c:218
 msgid "View Contact List"
 msgstr ""
@@ -1218,8 +1221,12 @@ msgstr ""
 msgid "Source"
 msgstr "ምንጭ"
 
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:1
-msgid "Evolution Addressbook name selection interface"
+#: addressbook/gui/component/select-names/e-select-names.c:509
+msgid "Select Contacts from Addressbook"
+msgstr ""
+
+#: addressbook/gui/component/select-names/e-select-names.c:650
+msgid "Find contact in"
 msgstr ""
 
 #: addressbook/gui/component/select-names/select-names.glade.h:2
@@ -1292,7 +1299,7 @@ msgid "D_epartment:"
 msgstr ""
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:11
-#: calendar/gui/dialogs/task-editor.c:200
+#: calendar/gui/dialogs/task-editor.c:197
 msgid "Details"
 msgstr "ዝርዝሮች"
 
@@ -1358,13 +1365,11 @@ msgid "_Categories..."
 msgstr "ምድብ... (_T)"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:28
-#: calendar/gui/dialogs/meeting-page.c:634
-#: calendar/gui/e-calendar-table.c:1008 calendar/gui/e-calendar-table.c:1026
-#: calendar/gui/e-cal-view.c:1144 calendar/gui/e-cal-view.c:1176
-#: ui/evolution-addressbook.xml.h:32 ui/evolution-calendar.xml.h:34
-#: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:14
-#: ui/evolution-mail-message.xml.h:104 ui/evolution-tasks.xml.h:18
-#: ui/evolution.xml.h:45
+#: calendar/gui/dialogs/meeting-page.c:717 calendar/gui/e-calendar-table.c:977
+#: calendar/gui/e-day-view.c:3755 calendar/gui/e-week-view.c:3631
+#: mail/folder-browser.c:1790 ui/evolution-addressbook.xml.h:32
+#: ui/evolution-calendar.xml.h:30 ui/evolution-mail-message.xml.h:97
+#: ui/evolution-tasks.xml.h:16 ui/evolution.xml.h:45
 msgid "_Delete"
 msgstr "አጥፉ"
 
@@ -1408,15 +1413,15 @@ msgid "_Web page address:"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:102
-#: addressbook/gui/contact-editor/e-contact-editor.c:184
 #: addressbook/gui/contact-editor/e-contact-editor-fullname.c:95
+#: addressbook/gui/contact-editor/e-contact-editor.c:184
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.c:163
 #: addressbook/gui/widgets/e-addressbook-model.c:318
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:408
-#: addressbook/gui/widgets/e-minicard.c:183
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:393
 #: addressbook/gui/widgets/e-minicard-label.c:164
-#: addressbook/gui/widgets/e-minicard-view.c:478
 #: addressbook/gui/widgets/e-minicard-view-widget.c:120
+#: addressbook/gui/widgets/e-minicard-view.c:478
+#: addressbook/gui/widgets/e-minicard.c:183
 msgid "Editable"
 msgstr ""
 
@@ -2444,17 +2449,17 @@ msgstr "ዚምቧቤ"
 #: addressbook/gui/contact-editor/e-contact-editor.c:156
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.c:142
 #: addressbook/gui/widgets/e-addressbook-model.c:304
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:394
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:379
 #: addressbook/gui/widgets/e-addressbook-view.c:180
-#: addressbook/gui/widgets/e-minicard-view.c:464
 #: addressbook/gui/widgets/e-minicard-view-widget.c:106
+#: addressbook/gui/widgets/e-minicard-view.c:464
 msgid "Book"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor.c:163
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.c:149
-#: addressbook/gui/widgets/e-minicard.c:190
 #: addressbook/gui/widgets/e-minicard-widget.c:93
+#: addressbook/gui/widgets/e-minicard.c:190
 msgid "Card"
 msgstr ""
 
@@ -2675,7 +2680,7 @@ msgstr ""
 msgid "Contact List Editor"
 msgstr ""
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:457
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:456
 msgid "Save List as VCard"
 msgstr ""
 
@@ -2717,7 +2722,7 @@ msgid ""
 msgstr ""
 
 #. FIXME: get the toplevel window...
-#: addressbook/gui/search/e-addressbook-search-dialog.c:116
+#: addressbook/gui/search/e-addressbook-search-dialog.c:117
 #: widgets/misc/e-filter-bar.c:148
 msgid "Advanced Search"
 msgstr ""
@@ -2736,10 +2741,10 @@ msgid "%d cards"
 msgstr ""
 
 #: addressbook/gui/widgets/e-addressbook-model.c:311
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:401
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:386
 #: addressbook/gui/widgets/e-addressbook-view.c:187
-#: addressbook/gui/widgets/e-minicard-view.c:471
 #: addressbook/gui/widgets/e-minicard-view-widget.c:113
+#: addressbook/gui/widgets/e-minicard-view.c:471
 msgid "Query"
 msgstr ""
 
@@ -2747,244 +2752,245 @@ msgstr ""
 msgid "Error getting book view"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:415
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:400
 msgid "Model"
 msgstr "ሞዴል"
 
-#: addressbook/gui/widgets/e-addressbook-table-adapter.c:148
-#: addressbook/gui/widgets/e-addressbook-util.c:106
+#: addressbook/gui/widgets/e-addressbook-table-adapter.c:145
+#: addressbook/gui/widgets/e-addressbook-util.c:105
 #: addressbook/gui/widgets/e-minicard.c:531
 msgid "Error modifying card"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:37
-#: shell/evolution-shell-component.c:1183
+#: addressbook/gui/widgets/e-addressbook-util.c:36
+#: shell/evolution-shell-component.c:1180
 msgid "Success"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:38
+#: addressbook/gui/widgets/e-addressbook-util.c:37
 #: camel/providers/imap/camel-imap-command.c:306
 #: camel/providers/imap/camel-imap-command.c:403
 #: camel/providers/pop3/camel-pop3-store.c:526
 #: camel/providers/pop3/camel-pop3-store.c:533 shell/e-shell.c:2077
-#: shell/e-storage.c:598 shell/evolution-shell-component.c:1222
+#: shell/e-storage.c:598 shell/evolution-shell-component.c:1219
 msgid "Unknown error"
 msgstr "ያልታወቀ ስህተት"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:39
+#: addressbook/gui/widgets/e-addressbook-util.c:38
 msgid "Repository offline"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:40 shell/e-storage.c:584
-#: shell/evolution-shell-component.c:1213
+#: addressbook/gui/widgets/e-addressbook-util.c:39 shell/e-storage.c:584
+#: shell/evolution-shell-component.c:1210
 msgid "Permission denied"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:41
+#: addressbook/gui/widgets/e-addressbook-util.c:40
 msgid "Card not found"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:42
+#: addressbook/gui/widgets/e-addressbook-util.c:41
 msgid "Card ID already exists"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:43
+#: addressbook/gui/widgets/e-addressbook-util.c:42
 msgid "Protocol not supported"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:44
+#: addressbook/gui/widgets/e-addressbook-util.c:43
+#: calendar/gui/calendar-model.c:759 calendar/gui/calendar-model.c:1184
 #: calendar/gui/dialogs/task-details-page.glade.h:3
-#: calendar/gui/e-calendar-table.c:479 calendar/gui/e-cal-model-tasks.c:325
-#: calendar/gui/e-cal-model-tasks.c:604 calendar/gui/e-tasks.c:253
-#: calendar/gui/print.c:2314 camel/camel-service.c:733
-#: camel/camel-service.c:771 camel/camel-service.c:855
-#: camel/camel-service.c:895 camel/providers/pop3/camel-pop3-store.c:443
+#: calendar/gui/e-calendar-table.c:477 calendar/gui/print.c:2307
+#: camel/camel-service.c:745 camel/camel-service.c:785
+#: camel/camel-service.c:875 camel/camel-service.c:917
+#: camel/providers/pop3/camel-pop3-store.c:443
 #: camel/providers/pop3/camel-pop3-store.c:520
 msgid "Cancelled"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:45
+#: addressbook/gui/widgets/e-addressbook-util.c:44
 msgid "Authentication Failed"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:46
+#: addressbook/gui/widgets/e-addressbook-util.c:45
 msgid "Authentication Required"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:47
+#: addressbook/gui/widgets/e-addressbook-util.c:46
 msgid "TLS not Available"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:48
+#: addressbook/gui/widgets/e-addressbook-util.c:47
 msgid "Addressbook does not exist"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:49
+#: addressbook/gui/widgets/e-addressbook-util.c:48
 msgid "Other error"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:76
+#: addressbook/gui/widgets/e-addressbook-util.c:75
 msgid "Do you want to save changes?"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:78
+#: addressbook/gui/widgets/e-addressbook-util.c:77
 msgid "_Discard"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:97
+#: addressbook/gui/widgets/e-addressbook-util.c:96
 msgid "Error adding list"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:97
-#: addressbook/gui/widgets/e-addressbook-util.c:273
+#: addressbook/gui/widgets/e-addressbook-util.c:96
+#: addressbook/gui/widgets/e-addressbook-util.c:272
 msgid "Error adding card"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:106
+#: addressbook/gui/widgets/e-addressbook-util.c:105
 msgid "Error modifying list"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:116
+#: addressbook/gui/widgets/e-addressbook-util.c:115
 msgid "Error removing list"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:116
-#: addressbook/gui/widgets/e-addressbook-util.c:231
+#: addressbook/gui/widgets/e-addressbook-util.c:115
+#: addressbook/gui/widgets/e-addressbook-util.c:230
 msgid "Error removing card"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:198
+#: addressbook/gui/widgets/e-addressbook-util.c:197
 #, c-format
 msgid ""
 "Opening %d cards will open %d new windows as well.\n"
 "Do you really want to display all of these cards?"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:329
+#: addressbook/gui/widgets/e-addressbook-util.c:328
 msgid "Move card to"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:331
+#: addressbook/gui/widgets/e-addressbook-util.c:330
 msgid "Copy card to"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:334
+#: addressbook/gui/widgets/e-addressbook-util.c:333
 msgid "Move cards to"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:336
+#: addressbook/gui/widgets/e-addressbook-util.c:335
 msgid "Copy cards to"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:518
+#: addressbook/gui/widgets/e-addressbook-util.c:517
 msgid "Multiple VCards"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:526
+#: addressbook/gui/widgets/e-addressbook-util.c:525
 #, c-format
 msgid "VCard for %s"
 msgstr ""
 
 #: addressbook/gui/widgets/e-addressbook-view.c:194
-#: calendar/gui/e-calendar-table.etspec.h:17
+#: calendar/gui/dialogs/meeting-page.etspec.h:11
+#: calendar/gui/e-calendar-table.etspec.h:18
 #: calendar/gui/e-meeting-time-sel.etspec.h:11
 msgid "Type"
 msgstr "ዓይነት"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:398
+#: addressbook/gui/widgets/e-addressbook-view.c:394
 #: importers/evolution-gnomecard-importer.c:228 importers/pine-importer.c:642
 #: mail/importers/pine-importer.c:577
 msgid "Addressbook"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:680
-#: addressbook/gui/widgets/e-addressbook-view.c:899
-#: addressbook/gui/widgets/e-addressbook-view.c:1883
+#: addressbook/gui/widgets/e-addressbook-view.c:676
+#: addressbook/gui/widgets/e-addressbook-view.c:895
+#: addressbook/gui/widgets/e-addressbook-view.c:1879
 #: ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:886
+#: addressbook/gui/widgets/e-addressbook-view.c:882
 msgid "New Contact..."
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:887
+#: addressbook/gui/widgets/e-addressbook-view.c:883
 msgid "New Contact List..."
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:890
+#: addressbook/gui/widgets/e-addressbook-view.c:886
 msgid "Go to Folder..."
 msgstr "ወደ ዶሴን ሂዱ..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:891
+#: addressbook/gui/widgets/e-addressbook-view.c:887
 msgid "Import..."
 msgstr "ከውጭ አስገባ"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:893
+#: addressbook/gui/widgets/e-addressbook-view.c:889
 msgid "Search for Contacts..."
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:894
+#: addressbook/gui/widgets/e-addressbook-view.c:890
 msgid "Addressbook Sources..."
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:896
+#: addressbook/gui/widgets/e-addressbook-view.c:892
 msgid "Pilot Settings..."
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:900
+#: addressbook/gui/widgets/e-addressbook-view.c:896
 #: ui/evolution-addressbook.xml.h:10
 msgid "Forward Contact"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:901
+#: addressbook/gui/widgets/e-addressbook-view.c:897
 msgid "Send Message to Contact"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:902 calendar/gui/print.c:2446
+#: addressbook/gui/widgets/e-addressbook-view.c:898 calendar/gui/print.c:2439
 #: ui/evolution-addressbook.xml.h:16 ui/evolution-comp-editor.xml.h:8
-#: ui/evolution-contact-editor.xml.h:5 ui/evolution-mail-message.xml.h:72
+#: ui/evolution-contact-editor.xml.h:4 ui/evolution-mail-message.xml.h:67
 #: ui/my-evolution.xml.h:1
 msgid "Print"
 msgstr "አትም"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:904
+#: addressbook/gui/widgets/e-addressbook-view.c:900
 msgid "Print Envelope"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:908
+#: addressbook/gui/widgets/e-addressbook-view.c:904
 msgid "Copy to folder..."
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:909
+#: addressbook/gui/widgets/e-addressbook-view.c:905
 msgid "Move to folder..."
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:912
+#: addressbook/gui/widgets/e-addressbook-view.c:908
 #: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "ቁረጥ"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:913
-#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:9
+#: addressbook/gui/widgets/e-addressbook-view.c:909
+#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:8
 #: ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr "ቅጂ"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:914
-#: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:10
+#: addressbook/gui/widgets/e-addressbook-view.c:910
+#: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:9
 msgid "Paste"
 msgstr "ለጥፍ"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:915 filter/libfilter-i18n.h:10
+#: addressbook/gui/widgets/e-addressbook-view.c:911 filter/libfilter-i18n.h:11
 #: mail/mail-accounts.c:234 ui/evolution-addressbook.xml.h:8
-#: ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:3
-#: ui/evolution-contact-list-editor.xml.h:3 ui/evolution-mail-message.xml.h:24
+#: ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:2
+#: ui/evolution-contact-list-editor.xml.h:2 ui/evolution-mail-message.xml.h:20
 msgid "Delete"
 msgstr "አጥፉ"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:919
-#: calendar/gui/e-cal-view.c:1109
+#: addressbook/gui/widgets/e-addressbook-view.c:915
+#: calendar/gui/e-day-view.c:3715 calendar/gui/e-week-view.c:3596
 msgid "Current View"
 msgstr "የአሁኑ ዕይታ"
 
@@ -2992,7 +2998,7 @@ msgstr "የአሁኑ ዕይታ"
 #. Translators: put here a list of labels you want to see on buttons in
 #. addressbook. You may use any character to separate labels but it must
 #. also be placed at the begining ot the string
-#: addressbook/gui/widgets/e-addressbook-view.c:953
+#: addressbook/gui/widgets/e-addressbook-view.c:949
 msgid ",123,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
 msgstr ""
 
@@ -3000,11 +3006,11 @@ msgstr ""
 #. in addressbook. You may use any character to separate labels but it
 #. must also be placed at the begining ot the string.
 #. Use lower case letters if possible.
-#: addressbook/gui/widgets/e-addressbook-view.c:958
+#: addressbook/gui/widgets/e-addressbook-view.c:954
 msgid ",0,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1356
+#: addressbook/gui/widgets/e-addressbook-view.c:1352
 #, c-format
 msgid ""
 "The addressbook backend for\n"
@@ -3072,29 +3078,6 @@ msgstr ""
 msgid "Primary Phone"
 msgstr ""
 
-#: addressbook/gui/widgets/e-minicard.c:146
-#: addressbook/gui/widgets/e-minicard-label.c:115
-msgid "Width"
-msgstr "ስፋት"
-
-#: addressbook/gui/widgets/e-minicard.c:153
-#: addressbook/gui/widgets/e-minicard-label.c:122
-msgid "Height"
-msgstr "እርዝማኔ"
-
-#: addressbook/gui/widgets/e-minicard.c:161
-#: addressbook/gui/widgets/e-minicard-label.c:129
-msgid "Has Focus"
-msgstr ""
-
-#: addressbook/gui/widgets/e-minicard.c:169
-msgid "Selected"
-msgstr "ተመርጠዋል"
-
-#: addressbook/gui/widgets/e-minicard.c:176
-msgid "Has Cursor"
-msgstr ""
-
 #: addressbook/gui/widgets/e-minicard-control.c:204
 #, c-format
 msgid "and %d other cards."
@@ -3108,6 +3091,21 @@ msgstr ""
 msgid "Save in addressbook"
 msgstr ""
 
+#: addressbook/gui/widgets/e-minicard-label.c:115
+#: addressbook/gui/widgets/e-minicard.c:146
+msgid "Width"
+msgstr "ስፋት"
+
+#: addressbook/gui/widgets/e-minicard-label.c:122
+#: addressbook/gui/widgets/e-minicard.c:153
+msgid "Height"
+msgstr "እርዝማኔ"
+
+#: addressbook/gui/widgets/e-minicard-label.c:129
+#: addressbook/gui/widgets/e-minicard.c:161
+msgid "Has Focus"
+msgstr ""
+
 #: addressbook/gui/widgets/e-minicard-label.c:136
 msgid "Field"
 msgstr "መጻፊያ ሳጥን"
@@ -3124,6 +3122,10 @@ msgstr ""
 msgid "Max field name length"
 msgstr ""
 
+#: addressbook/gui/widgets/e-minicard-view-widget.c:127
+msgid "Column Width"
+msgstr ""
+
 #: addressbook/gui/widgets/e-minicard-view.c:141
 msgid ""
 "\n"
@@ -3144,8 +3146,12 @@ msgstr ""
 msgid "Adapter"
 msgstr ""
 
-#: addressbook/gui/widgets/e-minicard-view-widget.c:127
-msgid "Column Width"
+#: addressbook/gui/widgets/e-minicard.c:169
+msgid "Selected"
+msgstr "ተመርጠዋል"
+
+#: addressbook/gui/widgets/e-minicard.c:176
+msgid "Has Cursor"
 msgstr ""
 
 #: addressbook/gui/widgets/gal-view-factory-minicard.c:24
@@ -3156,18 +3162,18 @@ msgstr ""
 msgid "GTK Tree View"
 msgstr "የGTK ዛፍ ዕይታ"
 
-#: addressbook/printing/e-contact-print.c:1158
-msgid "Print cards"
+#: addressbook/printing/e-contact-print-envelope.c:217
+#: addressbook/printing/e-contact-print-envelope.c:238
+msgid "Print envelope"
 msgstr ""
 
-#: addressbook/printing/e-contact-print.c:1224
-#: addressbook/printing/e-contact-print.c:1250
-msgid "Print card"
+#: addressbook/printing/e-contact-print.c:1139
+msgid "Print cards"
 msgstr ""
 
-#: addressbook/printing/e-contact-print-envelope.c:217
-#: addressbook/printing/e-contact-print-envelope.c:238
-msgid "Print envelope"
+#: addressbook/printing/e-contact-print.c:1204
+#: addressbook/printing/e-contact-print.c:1226
+msgid "Print card"
 msgstr ""
 
 #: addressbook/printing/e-contact-print.glade.h:1
@@ -3339,61 +3345,6 @@ msgstr "ስፋት"
 msgid "_Font..."
 msgstr "የፊደል ቅርጽ"
 
-#: addressbook/tools/evolution-addressbook-export.c:56
-msgid "Specify the output file instead of standard output"
-msgstr ""
-
-#: addressbook/tools/evolution-addressbook-export.c:57
-msgid "OUTPUTFILE"
-msgstr ""
-
-#: addressbook/tools/evolution-addressbook-export.c:58
-msgid "List local addressbook folders"
-msgstr ""
-
-#: addressbook/tools/evolution-addressbook-export.c:60
-msgid "Show cards as vcard or csv file"
-msgstr ""
-
-#: addressbook/tools/evolution-addressbook-export.c:60
-msgid "[vcard|csv]"
-msgstr ""
-
-#: addressbook/tools/evolution-addressbook-export.c:61
-msgid "Export in asynchronous mode "
-msgstr ""
-
-#: addressbook/tools/evolution-addressbook-export.c:63
-msgid ""
-"The number of cards in one output file in asychronous mode,default size 100."
-msgstr ""
-
-#: addressbook/tools/evolution-addressbook-export.c:63
-msgid "NUMBER"
-msgstr ""
-
-#: addressbook/tools/evolution-addressbook-export.c:91
-msgid ""
-"Command line arguments error, please use --help option to see the usage."
-msgstr ""
-
-#: addressbook/tools/evolution-addressbook-export.c:105
-msgid "Only support csv or vcard format."
-msgstr ""
-
-#: addressbook/tools/evolution-addressbook-export.c:114
-msgid "In async mode, output must be file."
-msgstr ""
-
-#: addressbook/tools/evolution-addressbook-export.c:122
-msgid "In normal mode, there should not need size option."
-msgstr ""
-
-#: addressbook/tools/evolution-addressbook-export.c:153
-#, fuzzy
-msgid "Impossible internal error."
-msgstr "የውስጥ ብልሽት"
-
 #: calendar/cal-util/cal-component.c:1218
 msgid "Untitled appointment"
 msgstr ""
@@ -3523,30 +3474,28 @@ msgid "31st"
 msgstr "31ኛ"
 
 #: calendar/cal-util/cal-util.c:550 calendar/cal-util/cal-util.c:572
-#: calendar/gui/dialogs/task-details-page.glade.h:5
-#: calendar/gui/e-calendar-table.c:403 calendar/gui/e-tasks.c:271
-#: mail/message-list.c:912
+#: calendar/gui/dialogs/task-details-page.glade.h:6
+#: calendar/gui/e-calendar-table.c:401 mail/message-list.c:753
 msgid "High"
 msgstr "ከፍ ያለ"
 
 #: calendar/cal-util/cal-util.c:552 calendar/cal-util/cal-util.c:574
-#: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-calendar-table.c:404 calendar/gui/e-cal-model.c:826
-#: calendar/gui/e-tasks.c:273 mail/message-list.c:911
+#: calendar/gui/calendar-model.c:1709
+#: calendar/gui/dialogs/task-details-page.glade.h:9
+#: calendar/gui/e-calendar-table.c:402 mail/message-list.c:752
 msgid "Normal"
 msgstr "የተለመደ"
 
 #: calendar/cal-util/cal-util.c:554 calendar/cal-util/cal-util.c:576
-#: calendar/gui/dialogs/task-details-page.glade.h:7
-#: calendar/gui/e-calendar-table.c:405 calendar/gui/e-tasks.c:275
-#: mail/message-list.c:910
+#: calendar/gui/dialogs/task-details-page.glade.h:8
+#: calendar/gui/e-calendar-table.c:403 mail/message-list.c:751
 msgid "Low"
 msgstr "ዝቅ ያለ"
 
 #. An empty string is the same as 'None'.
 #: calendar/cal-util/cal-util.c:570
-#: calendar/gui/dialogs/task-details-page.glade.h:11
-#: calendar/gui/e-calendar-table.c:406
+#: calendar/gui/dialogs/task-details-page.glade.h:13
+#: calendar/gui/e-calendar-table.c:404
 msgid "Undefined"
 msgstr ""
 
@@ -3554,13 +3503,13 @@ msgstr ""
 msgid "Split Multi-Day Events:"
 msgstr ""
 
-#: calendar/conduits/calendar/calendar-conduit.c:1297
-#: calendar/conduits/todo/todo-conduit.c:838
+#: calendar/conduits/calendar/calendar-conduit.c:1289
+#: calendar/conduits/todo/todo-conduit.c:830
 msgid "Error while communicating with calendar server"
 msgstr ""
 
-#: calendar/conduits/calendar/calendar-conduit.c:1456
-#: calendar/conduits/calendar/calendar-conduit.c:1459
+#: calendar/conduits/calendar/calendar-conduit.c:1440
+#: calendar/conduits/calendar/calendar-conduit.c:1443
 msgid "Could not read pilot's Calendar application block"
 msgstr ""
 
@@ -3568,32 +3517,74 @@ msgstr ""
 msgid "Default Priority:"
 msgstr ""
 
-#: calendar/conduits/todo/todo-conduit.c:970
-#: calendar/conduits/todo/todo-conduit.c:973
+#: calendar/conduits/todo/todo-conduit.c:954
+#: calendar/conduits/todo/todo-conduit.c:957
 msgid "Could not read pilot's ToDo application block"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:213
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
+msgid "Calendar and Tasks"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
+msgid "Configure your timezone, Calendar and Task List here "
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
+msgid "Evolution Calendar and Tasks"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
+msgid "Evolution Calendar and Tasks component"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
+msgid "Evolution Calendar configuration control"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
+msgid "Evolution Calendar scheduling message viewer"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
+msgid "Evolution Calendar viewer"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
+msgid "Evolution Calendar/Task editor"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
+msgid "Evolution Tasks viewer"
+msgstr ""
+
+#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
+msgid "Evolution Calendar alarm notification service"
+msgstr ""
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:212
 msgid "Starting:"
 msgstr "እየጀመረ ነው"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:215
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:214
 msgid "Ending:"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:254
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:227
+msgid "invalid time"
+msgstr ""
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:272
 msgid "Evolution Alarm"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:347
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:365
 #, c-format
 msgid "Alarm on %s"
 msgstr ""
 
 #: calendar/gui/alarm-notify/alarm-notify.glade.h:1
-#: ui/evolution-comp-editor.xml.h:1 ui/evolution-contact-editor.xml.h:1
-#: ui/evolution-contact-list-editor.xml.h:1
-#: ui/evolution-signature-editor.xml.h:1
+#: ui/evolution-comp-editor.xml.h:1
 msgid "C_lose"
 msgstr "ዝጋ"
 
@@ -3609,25 +3600,16 @@ msgstr ""
 msgid "_Edit appointment"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:874
+#: calendar/gui/alarm-notify/alarm-queue.c:770
 msgid "No description available."
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:892
-#, c-format
-msgid ""
-"Alarm on %s\n"
-"%s\n"
-"Starting at %s\n"
-"Ending at %s"
-msgstr ""
-
-#: calendar/gui/alarm-notify/alarm-queue.c:979
-#: calendar/gui/alarm-notify/alarm-queue.c:1003
+#: calendar/gui/alarm-notify/alarm-queue.c:843
+#: calendar/gui/alarm-notify/alarm-queue.c:867 widgets/misc/e-messagebox.c:161
 msgid "Warning"
 msgstr "ማስጠንቀቂያ"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:983
+#: calendar/gui/alarm-notify/alarm-queue.c:847
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -3635,7 +3617,7 @@ msgid ""
 "a normal reminder dialog box instead."
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1009
+#: calendar/gui/alarm-notify/alarm-queue.c:873
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -3646,78 +3628,69 @@ msgid ""
 "Are you sure you want to run this program?"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1023
+#: calendar/gui/alarm-notify/alarm-queue.c:887
 msgid "Do not ask me about this program again."
 msgstr ""
 
-#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
-msgid "Evolution Calendar alarm notification service"
-msgstr ""
-
-#: calendar/gui/alarm-notify/notify-main.c:173
-msgid "Could not initialize Bonobo"
-msgstr "bonobo ማስጀመር አልቻልኩም!"
-
-#: calendar/gui/alarm-notify/notify-main.c:176
+#: calendar/gui/alarm-notify/notify-main.c:174
 msgid "Could not initialize gnome-vfs"
 msgstr ""
 
-#: calendar/gui/alarm-notify/notify-main.c:185
+#: calendar/gui/alarm-notify/notify-main.c:183
 msgid "Could not create the alarm notify service factory"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:376
-msgid ""
-"This operation will permanently erase all events older than the selected "
-"amount of time. If you continue, you will not be able to recover these "
-"events."
+#: calendar/gui/cal-search-bar.c:50
+msgid "Summary contains"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:382
-msgid "Purge events older than"
+#: calendar/gui/cal-search-bar.c:51
+msgid "Description contains"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:387
-#: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter.glade.h:17
-msgid "days"
-msgstr "ቀን"
+#: calendar/gui/cal-search-bar.c:52
+msgid "Comment contains"
+msgstr ""
 
-#: calendar/gui/calendar-commands.c:485
+#: calendar/gui/cal-search-bar.c:358 mail/mail-ops.c:1106
+msgid "Unmatched"
+msgstr ""
+
+#: calendar/gui/calendar-commands.c:419
 msgid "%A %d %B %Y"
 msgstr "%A %d %B %Y"
 
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
-#: calendar/gui/calendar-commands.c:488 calendar/gui/e-day-view.c:1364
-#: calendar/gui/e-day-view-top-item.c:266
-#: calendar/gui/e-week-view-main-item.c:325
+#: calendar/gui/calendar-commands.c:422 calendar/gui/e-day-view-top-item.c:265
+#: calendar/gui/e-day-view.c:1438 calendar/gui/e-week-view-main-item.c:325
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
-#: calendar/gui/calendar-commands.c:490 calendar/gui/calendar-commands.c:495
-#: calendar/gui/calendar-commands.c:497
+#: calendar/gui/calendar-commands.c:424 calendar/gui/calendar-commands.c:429
+#: calendar/gui/calendar-commands.c:431
 msgid "%a %d %b %Y"
 msgstr "%a %d %b %Y"
 
-#: calendar/gui/calendar-commands.c:514 calendar/gui/calendar-commands.c:520
-#: calendar/gui/calendar-commands.c:526 calendar/gui/calendar-commands.c:528
+#: calendar/gui/calendar-commands.c:442 calendar/gui/calendar-commands.c:449
+#: calendar/gui/calendar-commands.c:455 calendar/gui/calendar-commands.c:457
 msgid "%d %B %Y"
 msgstr "%d %B %Y"
 
 #. strftime format %d = day of month, %B = full
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: calendar/gui/calendar-commands.c:518
-#: calendar/gui/e-week-view-main-item.c:333 calendar/gui/print.c:1508
+#: calendar/gui/calendar-commands.c:447
+#: calendar/gui/e-week-view-main-item.c:333 calendar/gui/print.c:1509
 msgid "%d %B"
 msgstr "%d %B"
 
-#: calendar/gui/calendar-commands.c:918
+#: calendar/gui/calendar-commands.c:849
 msgid ""
 "Could not create the calendar view.  Please check your ORBit and OAF setup."
 msgstr ""
 
-#: calendar/gui/calendar-component.c:70 calendar/gui/gnome-cal.c:1569
+#: calendar/gui/calendar-component.c:70 calendar/gui/gnome-cal.c:1353
 #: importers/netscape-importer.c:1873 mail/importers/netscape-importer.c:1843
 #: my-evolution/my-evolution.glade.h:2 shell/e-local-storage.c:177
 #: shell/e-shortcuts.c:1085
@@ -3736,11 +3709,11 @@ msgstr ""
 msgid "Public folder containing appointments and events"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:80 calendar/gui/e-tasks.c:1080
-#: calendar/gui/print.c:1787 calendar/gui/tasks-control.c:487
+#: calendar/gui/calendar-component.c:80 calendar/gui/e-tasks.c:738
+#: calendar/gui/print.c:1789 calendar/gui/tasks-control.c:504
 #: calendar/importers/icalendar-importer.c:644
 #: importers/netscape-importer.c:1875 mail/importers/netscape-importer.c:1845
-#: my-evolution/e-summary-tasks.c:348 my-evolution/e-summary-tasks.c:357
+#: my-evolution/e-summary-tasks.c:329 my-evolution/e-summary-tasks.c:338
 #: shell/e-local-storage.c:183 shell/e-shortcuts.c:1086
 msgid "Tasks"
 msgstr ""
@@ -3806,6 +3779,104 @@ msgstr ""
 msgid "Create a new all-day appointment"
 msgstr ""
 
+#: calendar/gui/calendar-model.c:405 calendar/gui/calendar-model.c:964
+#: calendar/gui/e-calendar-table.c:380
+msgid "Private"
+msgstr ""
+
+#: calendar/gui/calendar-model.c:408 calendar/gui/calendar-model.c:966
+#: calendar/gui/e-calendar-table.c:381
+msgid "Confidential"
+msgstr "ሚስጢራዊ"
+
+#: calendar/gui/calendar-model.c:411 calendar/gui/e-calendar-table.c:379
+msgid "Public"
+msgstr ""
+
+#: calendar/gui/calendar-model.c:523
+msgid "N"
+msgstr "n"
+
+#: calendar/gui/calendar-model.c:523
+msgid "S"
+msgstr "s"
+
+#: calendar/gui/calendar-model.c:525
+msgid "E"
+msgstr "ምሥራቅ"
+
+#: calendar/gui/calendar-model.c:525
+msgid "W"
+msgstr "ምዕራብ"
+
+#: calendar/gui/calendar-model.c:590 calendar/gui/calendar-model.c:1134
+#: calendar/gui/e-calendar-table.c:453
+msgid "Free"
+msgstr "ነፃ"
+
+#: calendar/gui/calendar-model.c:592 calendar/gui/e-calendar-table.c:454
+#: calendar/gui/e-meeting-time-sel.c:406
+#: shell/evolution-shell-component.c:1204
+msgid "Busy"
+msgstr ""
+
+#: calendar/gui/calendar-model.c:750 calendar/gui/calendar-model.c:1178
+#: calendar/gui/dialogs/task-details-page.glade.h:10
+#: calendar/gui/e-calendar-table.c:474 calendar/gui/print.c:2298
+msgid "Not Started"
+msgstr ""
+
+#: calendar/gui/calendar-model.c:753 calendar/gui/calendar-model.c:1180
+#: calendar/gui/dialogs/task-details-page.glade.h:7
+#: calendar/gui/e-calendar-table.c:475 calendar/gui/print.c:2301
+msgid "In Progress"
+msgstr ""
+
+#: calendar/gui/calendar-model.c:756 calendar/gui/calendar-model.c:1182
+#: calendar/gui/dialogs/task-details-page.glade.h:4
+#: calendar/gui/e-calendar-table.c:476 calendar/gui/e-meeting-model.c:294
+#: calendar/gui/e-meeting-model.c:317 calendar/gui/print.c:2304
+msgid "Completed"
+msgstr ""
+
+#: calendar/gui/calendar-model.c:1036
+msgid ""
+"The geographical position must be entered in the format: \n"
+"\n"
+"45.436845,125.862501"
+msgstr ""
+
+#. An empty string is the same as 'None'.
+#: calendar/gui/calendar-model.c:1176 calendar/gui/dialogs/meeting-page.c:330
+#: calendar/gui/dialogs/meeting-page.glade.h:2 composer/e-msg-composer.c:2056
+#: mail/folder-browser.c:1752 mail/mail-account-gui.c:1260
+#: mail/mail-account-gui.c:1692 mail/mail-accounts.c:442
+#: mail/mail-config.glade.h:76
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:194
+#: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:442
+#: widgets/misc/e-dateedit.c:1458 widgets/misc/e-dateedit.c:1573
+msgid "None"
+msgstr "ምንም"
+
+#: calendar/gui/calendar-model.c:1711
+msgid "Recurring"
+msgstr ""
+
+#: calendar/gui/calendar-model.c:1713
+msgid "Assigned"
+msgstr ""
+
+#: calendar/gui/calendar-model.c:1719 calendar/gui/e-meeting-model.c:266
+#: calendar/gui/e-meeting-model.c:276 calendar/gui/e-meeting-model.c:534
+#: calendar/gui/e-meeting-model.c:784
+msgid "Yes"
+msgstr "አዎ"
+
+#: calendar/gui/calendar-model.c:1719 calendar/gui/e-meeting-model.c:278
+#: calendar/gui/e-meeting-model.c:785
+msgid "No"
+msgstr "አይ"
+
 #: calendar/gui/calendar-view-factory.c:118
 msgid "Day View"
 msgstr "የቀን ዕይታ"
@@ -3822,69 +3893,48 @@ msgstr "የሳመንት ዕይታ"
 msgid "Month View"
 msgstr "የወር ዕይታ"
 
-#: calendar/gui/calendar-view-factory.c:130
-#, fuzzy
-msgid "List View"
-msgstr "የተለመደው ዕይታ"
-
-#: calendar/gui/cal-search-bar.c:50
-msgid "Summary contains"
-msgstr ""
-
-#: calendar/gui/cal-search-bar.c:51
-msgid "Description contains"
-msgstr ""
-
-#: calendar/gui/cal-search-bar.c:52
-msgid "Comment contains"
-msgstr ""
-
-#: calendar/gui/cal-search-bar.c:358 mail/mail-ops.c:1120
-msgid "Unmatched"
-msgstr ""
-
-#: calendar/gui/comp-editor-factory.c:462
+#: calendar/gui/comp-editor-factory.c:456
 msgid "Error while opening the calendar"
 msgstr ""
 
-#: calendar/gui/comp-editor-factory.c:473
+#: calendar/gui/comp-editor-factory.c:467
 msgid "Method not supported when opening the calendar"
 msgstr ""
 
-#: calendar/gui/comp-editor-factory.c:479
+#: calendar/gui/comp-editor-factory.c:473
 msgid "Permission denied to open the calendar"
 msgstr ""
 
-#: calendar/gui/control-factory.c:125
+#: calendar/gui/control-factory.c:119
 #, c-format
 msgid "Could not open the folder in '%s'"
 msgstr ""
 
-#: calendar/gui/control-factory.c:171
+#: calendar/gui/control-factory.c:165
 msgid "The URI that the calendar will display"
 msgstr ""
 
-#: calendar/gui/control-factory.c:178
+#: calendar/gui/control-factory.c:172
 msgid "The type of view to show"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-options.c:466
+#: calendar/gui/dialogs/alarm-options.c:420
 msgid "Audio Alarm Options"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-options.c:475
+#: calendar/gui/dialogs/alarm-options.c:429
 msgid "Message Alarm Options"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-options.c:484
+#: calendar/gui/dialogs/alarm-options.c:438
 msgid "Email Alarm Options"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-options.c:493
+#: calendar/gui/dialogs/alarm-options.c:447
 msgid "Program Alarm Options"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-options.c:509
+#: calendar/gui/dialogs/alarm-options.c:456
 msgid "Unknown Alarm Options"
 msgstr ""
 
@@ -3923,6 +3973,10 @@ msgstr "ላክ"
 msgid "With these arguments:"
 msgstr ""
 
+#: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter.glade.h:17
+msgid "days"
+msgstr "ቀን"
+
 #: calendar/gui/dialogs/alarm-options.glade.h:11
 msgid "dialog1"
 msgstr ""
@@ -3935,8 +3989,7 @@ msgstr ""
 msgid "hours"
 msgstr "ሰዓትን"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:14
-#: executive-summary/test-service/rdf-summary.c:806 filter/filter.glade.h:19
+#: calendar/gui/dialogs/alarm-options.glade.h:14 filter/filter.glade.h:19
 msgid "minutes"
 msgstr "ደቂቃዎች"
 
@@ -3950,11 +4003,11 @@ msgstr ""
 msgid "Date/Time:"
 msgstr "ቀን/ሰዓት፦"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:3 calendar/gui/e-alarm-list.c:465
+#: calendar/gui/dialogs/alarm-page.glade.h:3 calendar/gui/e-alarm-list.c:461
 msgid "Display a message"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.glade.h:4 calendar/gui/e-alarm-list.c:461
+#: calendar/gui/dialogs/alarm-page.glade.h:4 calendar/gui/e-alarm-list.c:457
 msgid "Play a sound"
 msgstr "ድምፅ አጫውት"
 
@@ -3962,7 +4015,7 @@ msgstr "ድምፅ አጫውት"
 msgid "Reminders"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.glade.h:6 calendar/gui/e-alarm-list.c:473
+#: calendar/gui/dialogs/alarm-page.glade.h:6 calendar/gui/e-alarm-list.c:469
 msgid "Run a program"
 msgstr "ፕሮግራምን አስኪድ"
 
@@ -3972,8 +4025,7 @@ msgstr ""
 
 #: calendar/gui/dialogs/alarm-page.glade.h:8
 #: calendar/gui/dialogs/recurrence-page.glade.h:8
-#: calendar/gui/e-itip-control.c:1022 calendar/gui/e-itip-control.glade.h:11
-#: calendar/gui/e-tasks.c:208
+#: calendar/gui/e-itip-control.c:1052 calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "ማጠቃለያ፦"
 
@@ -4056,7 +4108,7 @@ msgstr "ቀን"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
 #: calendar/gui/dialogs/recurrence-page.c:1040
-#: calendar/gui/e-itip-control.c:647
+#: calendar/gui/e-itip-control.c:677
 msgid "Friday"
 msgstr "ዓርብ"
 
@@ -4070,7 +4122,7 @@ msgstr "ደቂቃዎች"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
 #: calendar/gui/dialogs/recurrence-page.c:1036
-#: calendar/gui/e-itip-control.c:643
+#: calendar/gui/e-itip-control.c:673
 msgid "Monday"
 msgstr "ሰኞ"
 
@@ -4080,7 +4132,7 @@ msgstr "_እሑድ"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
 #: calendar/gui/dialogs/recurrence-page.c:1041
-#: calendar/gui/e-itip-control.c:648
+#: calendar/gui/e-itip-control.c:678
 msgid "Saturday"
 msgstr "ቅዳሜ"
 
@@ -4094,7 +4146,7 @@ msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
 #: calendar/gui/dialogs/recurrence-page.c:1042
-#: calendar/gui/e-itip-control.c:642
+#: calendar/gui/e-itip-control.c:672
 msgid "Sunday"
 msgstr "እሑድ"
 
@@ -4112,7 +4164,7 @@ msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
 #: calendar/gui/dialogs/recurrence-page.c:1039
-#: calendar/gui/e-itip-control.c:646
+#: calendar/gui/e-itip-control.c:676
 msgid "Thursday"
 msgstr "ሐሙስ"
 
@@ -4130,7 +4182,7 @@ msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
 #: calendar/gui/dialogs/recurrence-page.c:1037
-#: calendar/gui/e-itip-control.c:644
+#: calendar/gui/e-itip-control.c:674
 msgid "Tuesday"
 msgstr "ማክሰኞ"
 
@@ -4140,12 +4192,12 @@ msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
 #: calendar/gui/dialogs/recurrence-page.c:1038
-#: calendar/gui/e-itip-control.c:645
+#: calendar/gui/e-itip-control.c:675
 msgid "Wednesday"
 msgstr "ረቡዕ"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-#: ui/evolution-calendar.xml.h:31
+#: ui/evolution-calendar.xml.h:27
 msgid "Work Week"
 msgstr ""
 
@@ -4252,50 +4304,75 @@ msgstr ""
 msgid "Are you sure you want to cancel and delete this journal entry?"
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:59
+#: calendar/gui/dialogs/changed-comp.c:58
 msgid "This event has been deleted."
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:63
+#: calendar/gui/dialogs/changed-comp.c:62
 msgid "This task has been deleted."
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:67
+#: calendar/gui/dialogs/changed-comp.c:66
 msgid "This journal entry has been deleted."
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:76
+#: calendar/gui/dialogs/changed-comp.c:75
 #, c-format
 msgid "%s  You have made changes. Forget those changes and close the editor?"
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:78
+#: calendar/gui/dialogs/changed-comp.c:77
 #, c-format
 msgid "%s  You have made no changes, close the editor?"
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:83
+#: calendar/gui/dialogs/changed-comp.c:82
 msgid "This event has been changed."
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:87
+#: calendar/gui/dialogs/changed-comp.c:86
 msgid "This task has been changed."
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:91
+#: calendar/gui/dialogs/changed-comp.c:90
 msgid "This journal entry has been changed."
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:100
+#: calendar/gui/dialogs/changed-comp.c:99
 #, c-format
 msgid "%s  You have made changes. Forget those changes and update the editor?"
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:102
+#: calendar/gui/dialogs/changed-comp.c:101
 #, c-format
 msgid "%s  You have made no changes, update the editor?"
 msgstr ""
 
+#: calendar/gui/dialogs/comp-editor-page.c:409
+#, c-format
+msgid "Validation error: %s"
+msgstr ""
+
+#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2216
+msgid " to "
+msgstr "ወደ"
+
+#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2220
+msgid " (Completed "
+msgstr ""
+
+#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2222
+msgid "Completed "
+msgstr ""
+
+#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2227
+msgid " (Due "
+msgstr ""
+
+#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2229
+msgid "Due "
+msgstr ""
+
 #: calendar/gui/dialogs/comp-editor.c:334
 msgid "Could not update invalid object"
 msgstr ""
@@ -4341,47 +4418,21 @@ msgid "No summary"
 msgstr ""
 
 #: calendar/gui/dialogs/comp-editor.c:1281
-#: calendar/gui/e-calendar-table.c:1138 calendar/gui/e-cal-view.c:878
-#: composer/e-msg-composer.c:1191
+#: calendar/gui/e-calendar-table.c:1068 calendar/gui/e-day-view.c:3993
+#: calendar/gui/e-week-view.c:3840 composer/e-msg-composer.c:1164
 msgid "Save as..."
 msgstr "በሌላ ስም አስቀምጥ..."
 
-#: calendar/gui/dialogs/comp-editor.c:1384
-#: calendar/gui/dialogs/comp-editor.c:1408
-#: calendar/gui/dialogs/comp-editor.c:1434
+#: calendar/gui/dialogs/comp-editor.c:1382
+#: calendar/gui/dialogs/comp-editor.c:1406
+#: calendar/gui/dialogs/comp-editor.c:1432
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:1464
-#: calendar/gui/dialogs/comp-editor.c:1473
+#: calendar/gui/dialogs/comp-editor.c:1459
 msgid "Unable to obtain current version!"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor-page.c:409
-#, c-format
-msgid "Validation error: %s"
-msgstr ""
-
-#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2223
-msgid " to "
-msgstr "ወደ"
-
-#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2227
-msgid " (Completed "
-msgstr ""
-
-#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2229
-msgid "Completed "
-msgstr ""
-
-#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2234
-msgid " (Due "
-msgstr ""
-
-#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2236
-msgid "Due "
-msgstr ""
-
 #: calendar/gui/dialogs/delete-comp.c:96
 #, c-format
 msgid "Are you sure you want to delete the appointment `%s'?"
@@ -4484,31 +4535,31 @@ msgstr ""
 msgid "Enter Delegate"
 msgstr ""
 
-#: calendar/gui/dialogs/event-editor.c:200 calendar/gui/print.c:2260
+#: calendar/gui/dialogs/event-editor.c:199 calendar/gui/print.c:2253
 msgid "Appointment"
 msgstr ""
 
-#: calendar/gui/dialogs/event-editor.c:207
+#: calendar/gui/dialogs/event-editor.c:206
 msgid "Reminder"
 msgstr ""
 
-#: calendar/gui/dialogs/event-editor.c:214
+#: calendar/gui/dialogs/event-editor.c:213
 msgid "Recurrence"
 msgstr ""
 
-#: calendar/gui/dialogs/event-editor.c:221
-#: calendar/gui/dialogs/event-editor.c:294
-#: calendar/gui/dialogs/event-editor.c:438
+#: calendar/gui/dialogs/event-editor.c:220
+#: calendar/gui/dialogs/event-editor.c:292
+#: calendar/gui/dialogs/event-editor.c:436
 msgid "Scheduling"
 msgstr ""
 
-#: calendar/gui/dialogs/event-editor.c:228
-#: calendar/gui/dialogs/event-editor.c:297
-#: calendar/gui/dialogs/event-editor.c:441 ui/evolution-event-editor.xml.h:6
+#: calendar/gui/dialogs/event-editor.c:227
+#: calendar/gui/dialogs/event-editor.c:295
+#: calendar/gui/dialogs/event-editor.c:439 ui/evolution-event-editor.xml.h:6
 msgid "Meeting"
 msgstr "ስብሰባ"
 
-#: calendar/gui/dialogs/event-page.c:603 calendar/gui/dialogs/task-page.c:509
+#: calendar/gui/dialogs/event-page.c:603 calendar/gui/dialogs/task-page.c:507
 msgid "Start date is wrong"
 msgstr ""
 
@@ -4544,8 +4595,8 @@ msgid "Classification"
 msgstr ""
 
 #: calendar/gui/dialogs/event-page.glade.h:6
-#, fuzzy
-msgid "Co_nfidential"
+#: calendar/gui/dialogs/task-page.glade.h:4
+msgid "Con_fidential"
 msgstr "ሚስጢራዊ"
 
 #: calendar/gui/dialogs/event-page.glade.h:7
@@ -4572,6 +4623,7 @@ msgid "Pu_blic"
 msgstr ""
 
 #: calendar/gui/dialogs/event-page.glade.h:12
+#: calendar/gui/e-calendar-table.etspec.h:13
 msgid "Show Time As"
 msgstr ""
 
@@ -4588,34 +4640,74 @@ msgstr ""
 msgid "_Start time:"
 msgstr ""
 
-#. an empty string is the same as 'None'
-#: calendar/gui/dialogs/meeting-page.c:311
-#: calendar/gui/dialogs/meeting-page.glade.h:2
-#: calendar/gui/e-cal-model-tasks.c:596 composer/e-msg-composer.c:2093
-#: mail/mail-account-gui.c:1260 mail/mail-account-gui.c:1692
-#: mail/mail-accounts.c:442 mail/mail-config.glade.h:76
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:194
-#: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:445
-#: widgets/misc/e-dateedit.c:1483 widgets/misc/e-dateedit.c:1598
-msgid "None"
-msgstr "ምንም"
-
-#: calendar/gui/dialogs/meeting-page.c:416
+#: calendar/gui/dialogs/meeting-page.c:437
 msgid "The organizer selected no longer has an account."
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:422
+#: calendar/gui/dialogs/meeting-page.c:443
 msgid "An organizer is required."
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:437
+#: calendar/gui/dialogs/meeting-page.c:458
 msgid "At least one attendee is required."
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:630
+#: calendar/gui/dialogs/meeting-page.c:629
+msgid "That person is already attending the meeting!"
+msgstr ""
+
+#: calendar/gui/dialogs/meeting-page.c:713
 msgid "_Delegate To..."
 msgstr ""
 
+#: calendar/gui/dialogs/meeting-page.etspec.h:1
+#: calendar/gui/e-meeting-time-sel.etspec.h:1
+msgid "Attendee"
+msgstr ""
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:2
+#: calendar/gui/e-meeting-time-sel.etspec.h:2
+msgid "Click here to add an attendee"
+msgstr ""
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:3
+#: calendar/gui/e-meeting-time-sel.etspec.h:3
+msgid "Common Name"
+msgstr ""
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:4
+#: calendar/gui/e-meeting-time-sel.etspec.h:4
+msgid "Delegated From"
+msgstr ""
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:5
+#: calendar/gui/e-meeting-time-sel.etspec.h:5
+msgid "Delegated To"
+msgstr ""
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:6
+#: calendar/gui/e-meeting-time-sel.etspec.h:6
+msgid "Language"
+msgstr "ቋንቋ"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:7
+#: calendar/gui/e-meeting-time-sel.etspec.h:7
+msgid "Member"
+msgstr ""
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:8
+#: calendar/gui/e-itip-control.c:1179
+#: calendar/gui/e-meeting-time-sel.etspec.h:8
+msgid "RSVP"
+msgstr ""
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:10
+#: calendar/gui/e-calendar-table.etspec.h:15
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:58
+#: mail/message-list.etspec.h:12
+msgid "Status"
+msgstr "ሁኔታ"
+
 #: calendar/gui/dialogs/meeting-page.glade.h:3
 #: calendar/gui/e-itip-control.glade.h:9
 msgid "Organizer:"
@@ -4626,7 +4718,7 @@ msgid "_Change Organizer"
 msgstr ""
 
 #: calendar/gui/dialogs/meeting-page.glade.h:5
-#: calendar/gui/e-meeting-time-sel.c:411
+#: calendar/gui/e-meeting-time-sel.c:424
 msgid "_Invite Others..."
 msgstr ""
 
@@ -4775,7 +4867,7 @@ msgid ""
 "Do you wish to save your changes?"
 msgstr ""
 
-#: calendar/gui/dialogs/save-comp.c:58 composer/e-msg-composer.c:1599
+#: calendar/gui/dialogs/save-comp.c:58 composer/e-msg-composer.c:1557
 msgid "_Discard Changes"
 msgstr ""
 
@@ -4800,81 +4892,52 @@ msgstr ""
 msgid "The task information has changed. Send an updated version?"
 msgstr ""
 
-#: calendar/gui/dialogs/task-details-page.c:405
+#: calendar/gui/dialogs/task-details-page.c:401
 msgid "Completed date is wrong"
 msgstr ""
 
 #: calendar/gui/dialogs/task-details-page.glade.h:2
+#: calendar/gui/e-calendar-table.etspec.h:2
 #, no-c-format
-msgid "% _Complete"
-msgstr ""
-
-#: calendar/gui/dialogs/task-details-page.glade.h:4
-#: calendar/gui/e-calendar-table.c:478 calendar/gui/e-cal-model-tasks.c:323
-#: calendar/gui/e-cal-model-tasks.c:602 calendar/gui/e-tasks.c:250
-#: calendar/gui/print.c:2311
-msgid "Completed"
-msgstr ""
-
-#: calendar/gui/dialogs/task-details-page.glade.h:6
-#: calendar/gui/e-calendar-table.c:477 calendar/gui/e-cal-model-tasks.c:321
-#: calendar/gui/e-cal-model-tasks.c:600 calendar/gui/e-cal-model-tasks.c:662
-#: calendar/gui/e-tasks.c:247 calendar/gui/print.c:2308
-msgid "In Progress"
+msgid "% Complete"
 msgstr ""
 
-#: calendar/gui/dialogs/task-details-page.glade.h:9
-#: calendar/gui/e-calendar-table.c:476 calendar/gui/e-cal-model-tasks.c:319
-#: calendar/gui/e-cal-model-tasks.c:598 calendar/gui/e-tasks.c:257
-#: calendar/gui/print.c:2305
-msgid "Not Started"
+#: calendar/gui/dialogs/task-details-page.glade.h:5
+msgid "Date Completed:"
 msgstr ""
 
-#: calendar/gui/dialogs/task-details-page.glade.h:10
+#: calendar/gui/dialogs/task-details-page.glade.h:11
 msgid "Progress"
 msgstr "ይሻሻል"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:12
-#, fuzzy
-msgid "_Date Completed:"
-msgstr "አጥፉ"
+msgid "URL:"
+msgstr "url"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:13
+#: calendar/gui/dialogs/task-details-page.glade.h:14
 msgid "_Priority:"
 msgstr "ቅድሚያ"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:14
+#: calendar/gui/dialogs/task-details-page.glade.h:15
 msgid "_Status:"
 msgstr "ሁኔታ"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:15
-msgid "_Web Page:"
-msgstr ""
-
-#: calendar/gui/dialogs/task-editor.c:193
+#: calendar/gui/dialogs/task-editor.c:190
 msgid "Basic"
 msgstr "ቀላል"
 
-#: calendar/gui/dialogs/task-editor.c:207
-#: calendar/gui/dialogs/task-editor.c:270
-#: calendar/gui/dialogs/task-editor.c:407
+#: calendar/gui/dialogs/task-editor.c:204
+#: calendar/gui/dialogs/task-editor.c:252
+#: calendar/gui/dialogs/task-editor.c:387
 msgid "Assignment"
 msgstr ""
 
-#: calendar/gui/dialogs/task-page.c:482
+#: calendar/gui/dialogs/task-page.c:480
 msgid "Due date is wrong"
 msgstr ""
 
-#: calendar/gui/dialogs/task-page.c:542
-msgid "Due date is before start date!"
-msgstr ""
-
-#: calendar/gui/dialogs/task-page.glade.h:4
-msgid "Con_fidential"
-msgstr "ሚስጢራዊ"
-
-#: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-itip-control.c:1077
-#: calendar/gui/e-itip-control.glade.h:6 calendar/gui/e-tasks.c:287
+#: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-itip-control.c:1107
+#: calendar/gui/e-itip-control.glade.h:6
 #: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:43
 msgid "Description:"
 msgstr "መግለጫ"
@@ -4887,258 +4950,223 @@ msgstr ""
 msgid "_Due Date:"
 msgstr ""
 
-#: calendar/gui/e-alarm-list.c:397
+#: calendar/gui/e-alarm-list.c:393
 #, c-format
 msgid "%d days"
 msgstr "%d ቀን"
 
-#: calendar/gui/e-alarm-list.c:400
+#: calendar/gui/e-alarm-list.c:396
 msgid "1 day"
 msgstr "1 ቀን"
 
-#: calendar/gui/e-alarm-list.c:405
+#: calendar/gui/e-alarm-list.c:401
 #, c-format
 msgid "%d weeks"
 msgstr "%d ሳመንት"
 
-#: calendar/gui/e-alarm-list.c:408
+#: calendar/gui/e-alarm-list.c:404
 msgid "1 week"
 msgstr "1 ሳመንት"
 
-#: calendar/gui/e-alarm-list.c:413
+#: calendar/gui/e-alarm-list.c:409
 #, c-format
 msgid "%d hours"
 msgstr "%d ሰዓት"
 
-#: calendar/gui/e-alarm-list.c:416
+#: calendar/gui/e-alarm-list.c:412
 msgid "1 hour"
 msgstr "1 ሰዓት"
 
-#: calendar/gui/e-alarm-list.c:421
+#: calendar/gui/e-alarm-list.c:417
 #, c-format
 msgid "%d minutes"
 msgstr "%d ደቂቃዎች"
 
-#: calendar/gui/e-alarm-list.c:424
+#: calendar/gui/e-alarm-list.c:420
 msgid "1 minute"
 msgstr "1 ደቂቃ"
 
-#: calendar/gui/e-alarm-list.c:429
+#: calendar/gui/e-alarm-list.c:425
 #, c-format
 msgid "%d seconds"
 msgstr "%d ሴኮንዶች"
 
-#: calendar/gui/e-alarm-list.c:432
+#: calendar/gui/e-alarm-list.c:428
 msgid "1 second"
 msgstr "1 ሴኮንድ"
 
-#: calendar/gui/e-alarm-list.c:469
+#: calendar/gui/e-alarm-list.c:465
 msgid "Send an email"
 msgstr ""
 
-#: calendar/gui/e-alarm-list.c:479
+#: calendar/gui/e-alarm-list.c:475
 msgid "Unknown action to be performed"
 msgstr ""
 
-#: calendar/gui/e-alarm-list.c:491
+#: calendar/gui/e-alarm-list.c:487
 #, c-format
 msgid "%s %s before the start of the appointment"
 msgstr ""
 
-#: calendar/gui/e-alarm-list.c:494
+#: calendar/gui/e-alarm-list.c:490
 #, c-format
 msgid "%s %s after the start of the appointment"
 msgstr ""
 
-#: calendar/gui/e-alarm-list.c:499
+#: calendar/gui/e-alarm-list.c:495
 #, c-format
 msgid "%s at the start of the appointment"
 msgstr ""
 
-#: calendar/gui/e-alarm-list.c:508
+#: calendar/gui/e-alarm-list.c:504
 #, c-format
 msgid "%s %s before the end of the appointment"
 msgstr ""
 
-#: calendar/gui/e-alarm-list.c:511
+#: calendar/gui/e-alarm-list.c:507
 #, c-format
 msgid "%s %s after the end of the appointment"
 msgstr ""
 
-#: calendar/gui/e-alarm-list.c:516
+#: calendar/gui/e-alarm-list.c:512
 #, c-format
 msgid "%s at the end of the appointment"
 msgstr ""
 
-#: calendar/gui/e-alarm-list.c:540
+#: calendar/gui/e-alarm-list.c:536
 #, c-format
 msgid "%s at %s"
 msgstr "%s በ %s"
 
-#: calendar/gui/e-alarm-list.c:546
+#: calendar/gui/e-alarm-list.c:542
 #, c-format
 msgid "%s for an unknown trigger type"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:381 calendar/gui/e-cal-model.c:280
-#: calendar/gui/e-cal-model.c:287
-msgid "Public"
-msgstr ""
-
-#: calendar/gui/e-calendar-table.c:382 calendar/gui/e-cal-model.c:289
-msgid "Private"
-msgstr ""
-
-#: calendar/gui/e-calendar-table.c:383 calendar/gui/e-cal-model.c:291
-msgid "Confidential"
-msgstr "ሚስጢራዊ"
-
-#: calendar/gui/e-calendar-table.c:425
+#: calendar/gui/e-calendar-table.c:423
 msgid "0%"
 msgstr "+0"
 
-#: calendar/gui/e-calendar-table.c:426
+#: calendar/gui/e-calendar-table.c:424
 msgid "10%"
 msgstr "10"
 
-#: calendar/gui/e-calendar-table.c:427
+#: calendar/gui/e-calendar-table.c:425
 msgid "20%"
 msgstr "20"
 
-#: calendar/gui/e-calendar-table.c:428
+#: calendar/gui/e-calendar-table.c:426
 msgid "30%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:429
+#: calendar/gui/e-calendar-table.c:427
 msgid "40%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:430
+#: calendar/gui/e-calendar-table.c:428
 msgid "50%"
 msgstr "50%"
 
-#: calendar/gui/e-calendar-table.c:431
+#: calendar/gui/e-calendar-table.c:429
 msgid "60%"
 msgstr "60"
 
-#: calendar/gui/e-calendar-table.c:432
+#: calendar/gui/e-calendar-table.c:430
 msgid "70%"
 msgstr "70"
 
-#: calendar/gui/e-calendar-table.c:433
+#: calendar/gui/e-calendar-table.c:431
 msgid "80%"
 msgstr "80"
 
-#: calendar/gui/e-calendar-table.c:434
+#: calendar/gui/e-calendar-table.c:432
 msgid "90%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:435
+#: calendar/gui/e-calendar-table.c:433
 msgid "100%"
 msgstr "100"
 
-#: calendar/gui/e-calendar-table.c:455 calendar/gui/e-cal-model-calendar.c:163
-msgid "Free"
-msgstr "ነፃ"
-
-#: calendar/gui/e-calendar-table.c:456 calendar/gui/e-cal-model-calendar.c:166
-#: calendar/gui/e-meeting-time-sel.c:393
-#: shell/evolution-shell-component.c:1207
-msgid "Busy"
-msgstr ""
-
-#: calendar/gui/e-calendar-table.c:724 calendar/gui/e-cal-view.c:562
+#: calendar/gui/e-calendar-table.c:726 calendar/gui/e-day-view.c:2867
+#: calendar/gui/e-week-view.c:1933
 msgid "Deleting selected objects"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:988 calendar/gui/e-calendar-table.c:1029
-#: calendar/gui/e-cal-view.c:1126 calendar/gui/e-cal-view.c:1192
+#: calendar/gui/e-calendar-table.c:958 calendar/gui/e-day-view.c:3737
+#: calendar/gui/e-week-view.c:3613 mail/folder-browser.c:1763
 #: shell/e-shortcuts-view.c:422 ui/evolution-addressbook.xml.h:36
 msgid "_Open"
 msgstr "ክፈት"
 
-#: calendar/gui/e-calendar-table.c:989
-msgid "Open _Web Page"
-msgstr ""
-
-#: calendar/gui/e-calendar-table.c:990 calendar/gui/e-calendar-table.c:1035
-#: calendar/gui/e-cal-view.c:1127 calendar/gui/e-cal-view.c:1198
-#: ui/evolution-mail-message.xml.h:120
-msgid "_Save As..."
+#: calendar/gui/e-calendar-table.c:959
+msgid "_Save as..."
 msgstr "በሌላ ስም አስቀምጥ"
 
-#: calendar/gui/e-calendar-table.c:991 calendar/gui/e-calendar-table.c:1033
-#: calendar/gui/e-cal-view.c:1101 calendar/gui/e-cal-view.c:1128
-#: calendar/gui/e-cal-view.c:1196 ui/evolution-addressbook.xml.h:38
-#: ui/evolution-calendar.xml.h:37 ui/evolution-comp-editor.xml.h:19
-#: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:116
-#: ui/evolution-tasks.xml.h:21 ui/my-evolution.xml.h:6
+#: calendar/gui/e-calendar-table.c:960 calendar/gui/e-day-view.c:3739
+#: calendar/gui/e-week-view.c:3588 calendar/gui/e-week-view.c:3615
+#: ui/evolution-addressbook.xml.h:38 ui/evolution-calendar.xml.h:33
+#: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:108
+#: ui/evolution-tasks.xml.h:20 ui/my-evolution.xml.h:6
 msgid "_Print..."
 msgstr "አትም"
 
-#: calendar/gui/e-calendar-table.c:995 calendar/gui/e-calendar-table.c:1024
-#: calendar/gui/e-cal-view.c:1133 calendar/gui/e-cal-view.c:1174
-#: ui/evolution-addressbook.xml.h:1 ui/evolution-calendar.xml.h:1
-#: ui/evolution-tasks.xml.h:1
+#: calendar/gui/e-calendar-table.c:964 calendar/gui/e-day-view.c:3744
+#: calendar/gui/e-week-view.c:3620 ui/evolution-addressbook.xml.h:1
+#: ui/evolution-calendar.xml.h:1 ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "ቁረጥ"
 
-#: calendar/gui/e-calendar-table.c:996 calendar/gui/e-calendar-table.c:1022
-#: calendar/gui/e-cal-view.c:1134 calendar/gui/e-cal-view.c:1172
-#: ui/evolution-addressbook.xml.h:30 ui/evolution-calendar.xml.h:33
-#: ui/evolution-composer-entries.xml.h:7 ui/evolution-mail-message.xml.h:101
-#: ui/evolution-tasks.xml.h:17
+#: calendar/gui/e-calendar-table.c:965 calendar/gui/e-day-view.c:3745
+#: calendar/gui/e-week-view.c:3621 ui/evolution-addressbook.xml.h:30
+#: ui/evolution-calendar.xml.h:29 ui/evolution-composer-entries.xml.h:7
+#: ui/evolution-mail-list.xml.h:24 ui/evolution-tasks.xml.h:15
 msgid "_Copy"
 msgstr "ቅጂ"
 
-#: calendar/gui/e-calendar-table.c:997 calendar/gui/e-calendar-table.c:1031
-#: calendar/gui/e-cal-view.c:1105 calendar/gui/e-cal-view.c:1135
-#: calendar/gui/e-cal-view.c:1194 ui/evolution-addressbook.xml.h:37
-#: ui/evolution-calendar.xml.h:36 ui/evolution-composer-entries.xml.h:9
-#: ui/evolution-mail-message.xml.h:114 ui/evolution-tasks.xml.h:20
+#: calendar/gui/e-calendar-table.c:966 calendar/gui/e-day-view.c:3710
+#: calendar/gui/e-day-view.c:3746 calendar/gui/e-week-view.c:3592
+#: calendar/gui/e-week-view.c:3622 ui/evolution-addressbook.xml.h:37
+#: ui/evolution-calendar.xml.h:32 ui/evolution-composer-entries.xml.h:9
+#: ui/evolution-mail-list.xml.h:29 ui/evolution-tasks.xml.h:19
 msgid "_Paste"
 msgstr "ለጥፍ"
 
-#: calendar/gui/e-calendar-table.c:1001
+#: calendar/gui/e-calendar-table.c:970
 msgid "_Assign Task"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:1002
+#: calendar/gui/e-calendar-table.c:971
 msgid "_Forward as iCalendar"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:1003
+#: calendar/gui/e-calendar-table.c:972
 msgid "_Mark as Complete"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:1004
+#: calendar/gui/e-calendar-table.c:973
 msgid "_Mark Selected Tasks as Complete"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:1009 calendar/gui/e-calendar-table.c:1027
+#: calendar/gui/e-calendar-table.c:978
 msgid "_Delete Selected Tasks"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:1341 calendar/gui/e-cal-view.c:253
+#: calendar/gui/e-calendar-table.c:1265 calendar/gui/e-day-view.c:7929
+#: calendar/gui/e-week-view.c:4335
 msgid "Updating objects"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:1424
+#: calendar/gui/e-calendar-table.c:1348
 #: calendar/gui/e-calendar-table.etspec.h:6
 msgid "Click to add a task"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.etspec.h:2
-#, no-c-format
-msgid "% Complete"
-msgstr ""
-
 #: calendar/gui/e-calendar-table.etspec.h:3
 msgid "Alarms"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:1173
-#: camel/camel-filter-driver.c:1268 mail/mail-send-recv.c:578
+#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:1156
+#: camel/camel-filter-driver.c:1251
 msgid "Complete"
 msgstr ""
 
@@ -5147,12 +5175,11 @@ msgid "Completion Date"
 msgstr ""
 
 #: calendar/gui/e-calendar-table.etspec.h:9
-#, fuzzy
-msgid "Description"
-msgstr "መግለጫ"
+msgid "Due Date"
+msgstr ""
 
 #: calendar/gui/e-calendar-table.etspec.h:10
-msgid "Due Date"
+msgid "End Date"
 msgstr ""
 
 #: calendar/gui/e-calendar-table.etspec.h:11
@@ -5163,621 +5190,574 @@ msgstr ""
 msgid "Priority"
 msgstr "ቅድሚያ"
 
-#: calendar/gui/e-calendar-table.etspec.h:13
+#: calendar/gui/e-calendar-table.etspec.h:14
 msgid "Start Date"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.etspec.h:14
-#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:36
-#: mail/message-list.etspec.h:12
-msgid "Status"
-msgstr "ሁኔታ"
-
-#: calendar/gui/e-calendar-table.etspec.h:15
+#: calendar/gui/e-calendar-table.etspec.h:16
 #: my-evolution/component-factory.c:56 shell/e-shell.c:750
 #: shell/e-shortcuts.c:1082
 msgid "Summary"
 msgstr "ማጠቃለያ"
 
-#: calendar/gui/e-calendar-table.etspec.h:16
+#: calendar/gui/e-calendar-table.etspec.h:17
 msgid "Task sort"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.etspec.h:19 mail/mail-config.glade.h:171
-msgid "color"
-msgstr "ቀለም"
-
-#: calendar/gui/e-calendar-table.etspec.h:20
-msgid "component"
+#. strftime format of a weekday, a date and a time, 24-hour.
+#: calendar/gui/e-cell-date-edit-text.c:118 e-util/e-time-utils.c:167
+#: e-util/e-time-utils.c:380
+msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr ""
 
-#: calendar/gui/e-cal-model.c:293 calendar/gui/e-cal-model.c:296
-#: calendar/gui/e-itip-control.c:1062 calendar/gui/e-itip-control.c:1278
-#: camel/camel-gpg-context.c:1574 camel/camel-gpg-context.c:1625
-#: camel/camel-tcp-stream-openssl.c:631
-#: camel/providers/smtp/camel-smtp-transport.c:172
-#: camel/providers/smtp/camel-smtp-transport.c:227
-#: widgets/misc/e-charset-picker.c:60
-msgid "Unknown"
-msgstr "ያልታወቀ"
-
-#: calendar/gui/e-cal-model.c:828
-msgid "Recurring"
+#. strftime format of a weekday, a date and a time, 12-hour.
+#: calendar/gui/e-cell-date-edit-text.c:121 e-util/e-time-utils.c:162
+#: e-util/e-time-utils.c:389
+msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr ""
 
-#: calendar/gui/e-cal-model.c:830
-msgid "Assigned"
+#: calendar/gui/e-cell-date-edit-text.c:126
+#, c-format
+msgid ""
+"The date must be entered in the format: \n"
+"\n"
+"%s"
 msgstr ""
 
-#: calendar/gui/e-cal-model.c:832 calendar/gui/e-cal-model-tasks.c:933
-msgid "Yes"
-msgstr "አዎ"
-
-#: calendar/gui/e-cal-model.c:832 calendar/gui/e-cal-model-tasks.c:933
-msgid "No"
-msgstr "አይ"
-
-#: calendar/gui/e-cal-model-tasks.c:275
-msgid "N"
-msgstr "n"
+#: calendar/gui/e-day-view-time-item.c:532
+#, c-format
+msgid "%02i minute divisions"
+msgstr ""
 
-#: calendar/gui/e-cal-model-tasks.c:275
-msgid "S"
-msgstr "s"
+#. strftime format %A = full weekday name, %d = day of month,
+#. %B = full month name. Don't use any other specifiers.
+#: calendar/gui/e-day-view-top-item.c:261 calendar/gui/e-day-view.c:1421
+#: calendar/gui/e-week-view-main-item.c:316 calendar/gui/print.c:1525
+msgid "%A %d %B"
+msgstr "%A %d %B"
 
-#: calendar/gui/e-cal-model-tasks.c:277
-msgid "E"
-msgstr "ምሥራቅ"
+#. strftime format %d = day of month, %b = abbreviated month name.
+#. Don't use any other specifiers.
+#: calendar/gui/e-day-view-top-item.c:269 calendar/gui/e-day-view.c:1454
+#: calendar/gui/e-week-view-main-item.c:339
+msgid "%d %b"
+msgstr "%d %b"
 
-#: calendar/gui/e-cal-model-tasks.c:277
-msgid "W"
-msgstr "ምዕራብ"
+#. String to use in 12-hour time format for times in the morning.
+#: calendar/gui/e-day-view.c:636 calendar/gui/e-week-view.c:350
+#: calendar/gui/print.c:809
+msgid "am"
+msgstr "ጠዋት"
 
-#: calendar/gui/e-cal-model-tasks.c:550
-msgid ""
-"The geographical position must be entered in the format: \n"
-"\n"
-"45.436845,125.862501"
-msgstr ""
+#. String to use in 12-hour time format for times in the afternoon.
+#: calendar/gui/e-day-view.c:639 calendar/gui/e-week-view.c:353
+#: calendar/gui/print.c:811
+msgid "pm"
+msgstr "ከሳዓት"
 
-#: calendar/gui/e-cal-view.c:1094 calendar/gui/e-cal-view.c:1184
-msgid "New _Appointment..."
+#: calendar/gui/e-day-view.c:3694
+msgid "New _Appointment"
 msgstr ""
 
-#: calendar/gui/e-cal-view.c:1095 calendar/gui/e-cal-view.c:1186
+#: calendar/gui/e-day-view.c:3696 calendar/gui/e-week-view.c:3582
 msgid "New All Day _Event"
 msgstr ""
 
-#: calendar/gui/e-cal-view.c:1096 calendar/gui/e-cal-view.c:1188
+#: calendar/gui/e-day-view.c:3698 calendar/gui/e-week-view.c:3583
 msgid "New Meeting"
 msgstr ""
 
-#: calendar/gui/e-cal-view.c:1097 calendar/gui/e-cal-view.c:1190
+#: calendar/gui/e-day-view.c:3700 calendar/gui/e-week-view.c:3584
 msgid "New Task"
 msgstr ""
 
-#: calendar/gui/e-cal-view.c:1111 calendar/gui/e-cal-view.c:1180
+#: calendar/gui/e-day-view.c:3705 ui/evolution-comp-editor.xml.h:11
+msgid "Print..."
+msgstr "አትም"
+
+#: calendar/gui/e-day-view.c:3717 calendar/gui/e-week-view.c:3598
 #: ui/evolution-calendar.xml.h:13
 msgid "Go to _Today"
 msgstr ""
 
-#: calendar/gui/e-cal-view.c:1112 calendar/gui/e-cal-view.c:1182
+#: calendar/gui/e-day-view.c:3719 calendar/gui/e-week-view.c:3599
 msgid "_Go to Date..."
 msgstr ""
 
-#: calendar/gui/e-cal-view.c:1116 ui/evolution-calendar.xml.h:38
+#: calendar/gui/e-day-view.c:3724 calendar/gui/e-week-view.c:3603
+#: ui/evolution-calendar.xml.h:34
 msgid "_Publish Free/Busy Information"
 msgstr ""
 
-#: calendar/gui/e-cal-view.c:1120 calendar/gui/e-cal-view.c:1200
+#: calendar/gui/e-day-view.c:3729 calendar/gui/e-week-view.c:3607
 #: ui/evolution.xml.h:60
 msgid "_Settings..."
 msgstr "ምርጫዎች"
 
-#: calendar/gui/e-cal-view.c:1139
+#: calendar/gui/e-day-view.c:3738 calendar/gui/e-week-view.c:3614
+#: mail/folder-browser.c:1765 ui/evolution-mail-message.xml.h:112
+msgid "_Save As..."
+msgstr "በሌላ ስም አስቀምጥ"
+
+#: calendar/gui/e-day-view.c:3750 calendar/gui/e-week-view.c:3626
 msgid "_Schedule Meeting..."
 msgstr ""
 
-#: calendar/gui/e-cal-view.c:1140
+#: calendar/gui/e-day-view.c:3751 calendar/gui/e-week-view.c:3627
 msgid "_Forward as iCalendar..."
 msgstr ""
 
-#: calendar/gui/e-cal-view.c:1145
+#: calendar/gui/e-day-view.c:3756 calendar/gui/e-week-view.c:3632
 msgid "Make this Occurrence _Movable"
 msgstr ""
 
-#: calendar/gui/e-cal-view.c:1146 calendar/gui/e-cal-view.c:1177
+#: calendar/gui/e-day-view.c:3757 calendar/gui/e-week-view.c:3633
 msgid "Delete this _Occurrence"
 msgstr ""
 
-#: calendar/gui/e-cal-view.c:1147 calendar/gui/e-cal-view.c:1178
+#: calendar/gui/e-day-view.c:3758 calendar/gui/e-week-view.c:3634
 msgid "Delete _All Occurrences"
 msgstr ""
 
-#. strftime format of a weekday, a date and a time, 24-hour.
-#: calendar/gui/e-cell-date-edit-text.c:118 e-util/e-time-utils.c:180
-#: e-util/e-time-utils.c:393
-msgid "%a %m/%d/%Y %H:%M:%S"
-msgstr ""
-
-#. strftime format of a weekday, a date and a time, 12-hour.
-#: calendar/gui/e-cell-date-edit-text.c:121 e-util/e-time-utils.c:175
-#: e-util/e-time-utils.c:402
-msgid "%a %m/%d/%Y %I:%M:%S %p"
-msgstr ""
-
-#: calendar/gui/e-cell-date-edit-text.c:126
-#, c-format
-msgid ""
-"The date must be entered in the format: \n"
-"\n"
-"%s"
-msgstr ""
-
-#. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:600 calendar/gui/e-week-view.c:326
-#: calendar/gui/print.c:809
-msgid "am"
-msgstr "ጠዋት"
-
-#. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:603 calendar/gui/e-week-view.c:329
-#: calendar/gui/print.c:811
-msgid "pm"
-msgstr "ከሳዓት"
-
-#. strftime format %A = full weekday name, %d = day of month,
-#. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view.c:1347 calendar/gui/e-day-view-top-item.c:262
-#: calendar/gui/e-week-view-main-item.c:316 calendar/gui/print.c:1524
-msgid "%A %d %B"
-msgstr "%A %d %B"
-
-#. strftime format %d = day of month, %b = abbreviated month name.
-#. Don't use any other specifiers.
-#: calendar/gui/e-day-view.c:1380 calendar/gui/e-day-view-top-item.c:270
-#: calendar/gui/e-week-view-main-item.c:339
-msgid "%d %b"
-msgstr "%d %b"
-
-#: calendar/gui/e-day-view-time-item.c:532
-#, c-format
-msgid "%02i minute divisions"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:676
+#: calendar/gui/e-itip-control.c:706
 msgid "Yes. (Complex Recurrence)"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:688
+#: calendar/gui/e-itip-control.c:718
 msgid "Every day"
 msgstr "በየቀን"
 
-#: calendar/gui/e-itip-control.c:690
+#: calendar/gui/e-itip-control.c:720
 #, c-format
 msgid "Every %d days"
 msgstr "በየ%d ቀን"
 
-#: calendar/gui/e-itip-control.c:696
+#: calendar/gui/e-itip-control.c:726
 msgid "Every week"
 msgstr "በየሳመንት"
 
-#: calendar/gui/e-itip-control.c:698
+#: calendar/gui/e-itip-control.c:728
 #, c-format
 msgid "Every %d weeks"
 msgstr "በየ%d ሳመንት"
 
-#: calendar/gui/e-itip-control.c:701
+#: calendar/gui/e-itip-control.c:731
 msgid "Every week on "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:703
+#: calendar/gui/e-itip-control.c:733
 #, c-format
 msgid "Every %d weeks on "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:711
+#: calendar/gui/e-itip-control.c:741
 msgid " and "
 msgstr " እና "
 
-#: calendar/gui/e-itip-control.c:718
+#: calendar/gui/e-itip-control.c:748
 #, c-format
 msgid "The %s day of "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:731
+#: calendar/gui/e-itip-control.c:761
 #, c-format
 msgid "The %s %s of "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:736
+#: calendar/gui/e-itip-control.c:766
 msgid "every month"
 msgstr "በየወር"
 
-#: calendar/gui/e-itip-control.c:741
+#: calendar/gui/e-itip-control.c:771
 #, c-format
 msgid "every %d months"
 msgstr "በየ%d ወር"
 
-#: calendar/gui/e-itip-control.c:747
+#: calendar/gui/e-itip-control.c:777
 msgid "Every year"
 msgstr "በየ ዓመት"
 
-#: calendar/gui/e-itip-control.c:749
+#: calendar/gui/e-itip-control.c:779
 #, c-format
 msgid "Every %d years"
 msgstr "በየ%d ዓመታት"
 
-#: calendar/gui/e-itip-control.c:761
+#: calendar/gui/e-itip-control.c:791
 #, c-format
 msgid " a total of %d times"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:769
+#: calendar/gui/e-itip-control.c:799
 msgid ", ending on "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:793
+#: calendar/gui/e-itip-control.c:823
 msgid "<b>Starts:</b> "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:803
+#: calendar/gui/e-itip-control.c:833
 msgid "<b>Ends:</b> "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:823
+#: calendar/gui/e-itip-control.c:853
 msgid "<b>Completed:</b> "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:833
+#: calendar/gui/e-itip-control.c:863
 msgid "<b>Due:</b> "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:870 calendar/gui/e-itip-control.c:923
+#: calendar/gui/e-itip-control.c:900 calendar/gui/e-itip-control.c:953
 msgid "iCalendar Information"
 msgstr ""
 
 #. Title
-#: calendar/gui/e-itip-control.c:885
+#: calendar/gui/e-itip-control.c:915
 msgid "iCalendar Error"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:954 calendar/gui/e-itip-control.c:970
-#: calendar/gui/e-itip-control.c:981 calendar/gui/e-itip-control.c:998
+#: calendar/gui/e-itip-control.c:984 calendar/gui/e-itip-control.c:1000
+#: calendar/gui/e-itip-control.c:1011 calendar/gui/e-itip-control.c:1028
 msgid "An unknown person"
 msgstr ""
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:1005
+#: calendar/gui/e-itip-control.c:1035
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1020
+#: calendar/gui/e-itip-control.c:1050
 msgid "<i>None</i>"
 msgstr "<i>ምንም</i>"
 
-#: calendar/gui/e-itip-control.c:1031
+#: calendar/gui/e-itip-control.c:1061
 msgid "Location:"
 msgstr "ቦታ፦"
 
-#. write status
-#: calendar/gui/e-itip-control.c:1045 calendar/gui/e-tasks.c:243
+#: calendar/gui/e-itip-control.c:1075
 msgid "Status:"
 msgstr "ሁኔታ፦"
 
-#: calendar/gui/e-itip-control.c:1050 calendar/gui/itip-utils.c:414
+#: calendar/gui/e-itip-control.c:1080 calendar/gui/e-meeting-model.c:286
+#: calendar/gui/e-meeting-model.c:309 calendar/gui/e-meeting-model.c:798
+#: calendar/gui/itip-utils.c:414
 msgid "Accepted"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1054 calendar/gui/itip-utils.c:417
+#: calendar/gui/e-itip-control.c:1084 calendar/gui/itip-utils.c:417
 msgid "Tentatively Accepted"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1058 calendar/gui/itip-utils.c:420
-#: calendar/gui/itip-utils.c:446
+#: calendar/gui/e-itip-control.c:1088 calendar/gui/e-meeting-model.c:288
+#: calendar/gui/e-meeting-model.c:311 calendar/gui/e-meeting-model.c:799
+#: calendar/gui/itip-utils.c:420 calendar/gui/itip-utils.c:446
 msgid "Declined"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1117 calendar/gui/e-itip-control.c:1145
-#: calendar/gui/e-itip-control.c:1171 calendar/gui/e-itip-control.c:1184
-#: calendar/gui/e-itip-control.c:1197 calendar/gui/e-itip-control.c:1210
+#: calendar/gui/e-itip-control.c:1092 calendar/gui/e-itip-control.c:1300
+#: calendar/gui/e-meeting-model.c:222 calendar/gui/e-meeting-model.c:257
+#: calendar/gui/e-meeting-model.c:322 calendar/gui/e-meeting-model.c:756
+#: calendar/gui/e-meeting-model.c:772 camel/camel-gpg-context.c:1574
+#: camel/camel-gpg-context.c:1625 camel/camel-tcp-stream-openssl.c:634
+#: camel/providers/smtp/camel-smtp-transport.c:173
+#: camel/providers/smtp/camel-smtp-transport.c:228 mail/folder-browser.c:345
+#: mail/mail-display.c:953 widgets/misc/e-charset-picker.c:60
+msgid "Unknown"
+msgstr "ያልታወቀ"
+
+#: calendar/gui/e-itip-control.c:1147 calendar/gui/e-itip-control.c:1175
+#: calendar/gui/e-itip-control.c:1201 calendar/gui/e-itip-control.c:1214
+#: calendar/gui/e-itip-control.c:1227 calendar/gui/e-itip-control.c:1240
 msgid "Choose an action:"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1118
+#: calendar/gui/e-itip-control.c:1148
 msgid "Update"
 msgstr "አሻሽል"
 
-#: calendar/gui/e-itip-control.c:1119 calendar/gui/e-itip-control.c:1150
-#: calendar/gui/e-itip-control.c:1173 calendar/gui/e-itip-control.c:1186
-#: calendar/gui/e-itip-control.c:1199 calendar/gui/e-itip-control.c:1212
+#: calendar/gui/e-itip-control.c:1149 calendar/gui/e-itip-control.c:1180
+#: calendar/gui/e-itip-control.c:1203 calendar/gui/e-itip-control.c:1216
+#: calendar/gui/e-itip-control.c:1229 calendar/gui/e-itip-control.c:1242
 #: shell/e-shell.c:2067 widgets/misc/e-cell-date-edit.c:265
 msgid "OK"
 msgstr "እሺ"
 
-#: calendar/gui/e-itip-control.c:1146
+#: calendar/gui/e-itip-control.c:1176
 msgid "Accept"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1147
+#: calendar/gui/e-itip-control.c:1177
 msgid "Tentatively accept"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1148
+#: calendar/gui/e-itip-control.c:1178
 msgid "Decline"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1149
-#: calendar/gui/e-meeting-time-sel.etspec.h:8
-msgid "RSVP"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:1172
+#: calendar/gui/e-itip-control.c:1202
 msgid "Send Free/Busy Information"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1185
+#: calendar/gui/e-itip-control.c:1215
 msgid "Update respondent status"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1198
+#: calendar/gui/e-itip-control.c:1228
 msgid "Send Latest Information"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1211 calendar/gui/itip-utils.c:434
-#: mail/mail-send-recv.c:388 mail/mail-send-recv.c:440
-#: shell/e-shell-startup-wizard.c:781 shell/evolution-shell-component.c:1185
-#: ui/evolution-mail-global.xml.h:1
+#: calendar/gui/e-itip-control.c:1241 calendar/gui/itip-utils.c:434
+#: mail/mail-send-recv.c:387 mail/mail-send-recv.c:444
+#: shell/evolution-shell-component.c:1182 ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "ተወው"
 
-#: calendar/gui/e-itip-control.c:1300
+#: calendar/gui/e-itip-control.c:1322
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1301
+#: calendar/gui/e-itip-control.c:1323
 msgid "Meeting Information"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1306
+#: calendar/gui/e-itip-control.c:1328
 #, c-format
 msgid "<b>%s</b> requests the presence of %s at a meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1308
+#: calendar/gui/e-itip-control.c:1330
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1309
+#: calendar/gui/e-itip-control.c:1331
 msgid "Meeting Proposal"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1313
+#: calendar/gui/e-itip-control.c:1335
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1314
+#: calendar/gui/e-itip-control.c:1336
 msgid "Meeting Update"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1318
+#: calendar/gui/e-itip-control.c:1340
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1319
+#: calendar/gui/e-itip-control.c:1341
 msgid "Meeting Update Request"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1326
+#: calendar/gui/e-itip-control.c:1348
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1327
+#: calendar/gui/e-itip-control.c:1349
 msgid "Meeting Reply"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1334
+#: calendar/gui/e-itip-control.c:1356
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1335
+#: calendar/gui/e-itip-control.c:1357
 msgid "Meeting Cancellation"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1342 calendar/gui/e-itip-control.c:1409
-#: calendar/gui/e-itip-control.c:1444
+#: calendar/gui/e-itip-control.c:1364 calendar/gui/e-itip-control.c:1431
+#: calendar/gui/e-itip-control.c:1466
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1343
+#: calendar/gui/e-itip-control.c:1365
 msgid "Bad Meeting Message"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1367
+#: calendar/gui/e-itip-control.c:1389
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1368
+#: calendar/gui/e-itip-control.c:1390
 msgid "Task Information"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1373
+#: calendar/gui/e-itip-control.c:1395
 #, c-format
 msgid "<b>%s</b> requests %s to perform a task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1375
+#: calendar/gui/e-itip-control.c:1397
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1376
+#: calendar/gui/e-itip-control.c:1398
 msgid "Task Proposal"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1380
+#: calendar/gui/e-itip-control.c:1402
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1381
+#: calendar/gui/e-itip-control.c:1403
 msgid "Task Update"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1385
+#: calendar/gui/e-itip-control.c:1407
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1386
+#: calendar/gui/e-itip-control.c:1408
 msgid "Task Update Request"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1393
+#: calendar/gui/e-itip-control.c:1415
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1394
+#: calendar/gui/e-itip-control.c:1416
 msgid "Task Reply"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1401
+#: calendar/gui/e-itip-control.c:1423
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1402
+#: calendar/gui/e-itip-control.c:1424
 msgid "Task Cancellation"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1410
+#: calendar/gui/e-itip-control.c:1432
 msgid "Bad Task Message"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1429
+#: calendar/gui/e-itip-control.c:1451
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1430
+#: calendar/gui/e-itip-control.c:1452
 msgid "Free/Busy Information"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1434
+#: calendar/gui/e-itip-control.c:1456
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1435
+#: calendar/gui/e-itip-control.c:1457
 msgid "Free/Busy Request"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1439
+#: calendar/gui/e-itip-control.c:1461
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1440
+#: calendar/gui/e-itip-control.c:1462
 msgid "Free/Busy Reply"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1445
+#: calendar/gui/e-itip-control.c:1467
 msgid "Bad Free/Busy Message"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1521
+#: calendar/gui/e-itip-control.c:1543
 msgid "The message does not appear to be properly formed"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1584
+#: calendar/gui/e-itip-control.c:1606
 msgid "The message contains only unsupported requests."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1615 calendar/gui/e-itip-control.c:1621
+#: calendar/gui/e-itip-control.c:1637 calendar/gui/e-itip-control.c:1643
 msgid "The attachment does not contain a valid calendar message"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1646
+#: calendar/gui/e-itip-control.c:1668
 msgid "The attachment has no viewable calendar items"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1887 calendar/gui/e-itip-control.c:1948
-#: calendar/gui/e-itip-control.c:1986
+#: calendar/gui/e-itip-control.c:1909 calendar/gui/e-itip-control.c:2001
 msgid "Object is invalid and cannot be updated\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1890 calendar/gui/e-itip-control.c:1989
+#: calendar/gui/e-itip-control.c:1912 calendar/gui/e-itip-control.c:2004
 msgid "There was an error on the CORBA system\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1893 calendar/gui/e-itip-control.c:1992
+#: calendar/gui/e-itip-control.c:1915 calendar/gui/e-itip-control.c:2007
 msgid "Object could not be found\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1896
+#: calendar/gui/e-itip-control.c:1918
 msgid "You do not have the right permissions to update the calendar\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1899
+#: calendar/gui/e-itip-control.c:1921
 msgid "Update complete\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1902
+#: calendar/gui/e-itip-control.c:1924
 msgid "Calendar file could not be updated!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1932 calendar/gui/e-itip-control.c:2004
+#: calendar/gui/e-itip-control.c:1953 calendar/gui/e-itip-control.c:2019
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1958
+#: calendar/gui/e-itip-control.c:1974
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1970
+#: calendar/gui/e-itip-control.c:1986
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1995
+#: calendar/gui/e-itip-control.c:2010
 msgid "You don't have the right permissions to update the calendar\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1998
+#: calendar/gui/e-itip-control.c:2013
 msgid "Attendee status updated\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:2001
+#: calendar/gui/e-itip-control.c:2016
 msgid "Attendee status could not be updated!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:2038
+#: calendar/gui/e-itip-control.c:2053
 msgid "Removal Complete"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:2070 calendar/gui/e-itip-control.c:2120
+#: calendar/gui/e-itip-control.c:2085 calendar/gui/e-itip-control.c:2135
 msgid "Item sent!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:2072 calendar/gui/e-itip-control.c:2124
+#: calendar/gui/e-itip-control.c:2087 calendar/gui/e-itip-control.c:2139
 msgid "The item could not be sent!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:2215
+#: calendar/gui/e-itip-control.c:2212
 msgid "Select Calendar Folder"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:2221
+#: calendar/gui/e-itip-control.c:2219
 msgid "Select Tasks Folder"
 msgstr ""
 
@@ -5818,271 +5798,247 @@ msgstr ""
 msgid "date-start"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:392
-msgid "Tentative"
+#: calendar/gui/e-meeting-model.c:79
+msgid "Chair Persons"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:394 designs/OOA/ooa.glade.h:11
-msgid "Out of Office"
+#: calendar/gui/e-meeting-model.c:80 calendar/gui/e-meeting-model.c:1636
+msgid "Required Participants"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:395
-msgid "No Information"
+#: calendar/gui/e-meeting-model.c:81
+msgid "Optional Participants"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:434
-msgid "_Options"
-msgstr "ምርጫዎች (_O)"
-
-#: calendar/gui/e-meeting-time-sel.c:451
-msgid "Show _Only Working Hours"
+#: calendar/gui/e-meeting-model.c:82
+msgid "Resources"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:461
-msgid "Show _Zoomed Out"
+#: calendar/gui/e-meeting-model.c:197 calendar/gui/e-meeting-model.c:214
+#: calendar/gui/e-meeting-model.c:530 calendar/gui/e-meeting-model.c:752
+msgid "Individual"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:476
-msgid "_Update Free/Busy"
+#: calendar/gui/e-meeting-model.c:199 calendar/gui/e-meeting-model.c:216
+#: calendar/gui/e-meeting-model.c:753
+msgid "Group"
+msgstr "የውይይት መድረክ"
+
+#: calendar/gui/e-meeting-model.c:201 calendar/gui/e-meeting-model.c:218
+#: calendar/gui/e-meeting-model.c:754
+msgid "Resource"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:491
-msgid "_<<"
-msgstr "_<<"
+#: calendar/gui/e-meeting-model.c:203 calendar/gui/e-meeting-model.c:220
+#: calendar/gui/e-meeting-model.c:755
+msgid "Room"
+msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:509
-msgid "_Autopick"
+#: calendar/gui/e-meeting-model.c:232 calendar/gui/e-meeting-model.c:249
+#: calendar/gui/e-meeting-model.c:768
+msgid "Chair"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:524
-msgid ">_>"
-msgstr ">_>"
+#: calendar/gui/e-meeting-model.c:234 calendar/gui/e-meeting-model.c:251
+#: calendar/gui/e-meeting-model.c:532 calendar/gui/e-meeting-model.c:769
+msgid "Required Participant"
+msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:541
-msgid "_All People and Resources"
+#: calendar/gui/e-meeting-model.c:236 calendar/gui/e-meeting-model.c:253
+#: calendar/gui/e-meeting-model.c:770
+msgid "Optional Participant"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:550
-msgid "All _People and One Resource"
+#: calendar/gui/e-meeting-model.c:238 calendar/gui/e-meeting-model.c:255
+#: calendar/gui/e-meeting-model.c:771
+msgid "Non-Participant"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:559
-msgid "_Required People"
+#: calendar/gui/e-meeting-model.c:284 calendar/gui/e-meeting-model.c:307
+#: calendar/gui/e-meeting-model.c:540 calendar/gui/e-meeting-model.c:797
+msgid "Needs Action"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:568
-msgid "Required People and _One Resource"
+#: calendar/gui/e-meeting-model.c:290 calendar/gui/e-meeting-model.c:313
+#: calendar/gui/e-meeting-model.c:800 calendar/gui/e-meeting-time-sel.c:405
+msgid "Tentative"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:587
-msgid "Meeting _start time:"
+#: calendar/gui/e-meeting-model.c:292 calendar/gui/e-meeting-model.c:315
+#: calendar/gui/e-meeting-model.c:801
+msgid "Delegated"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:607
-msgid "Meeting _end time:"
+#: calendar/gui/e-meeting-model.c:296 calendar/gui/e-meeting-model.c:319
+msgid "In Process"
 msgstr ""
 
 #. This is a strftime() format string %A = full weekday name,
 #. %B = full month name, %d = month day, %Y = full year.
-#: calendar/gui/e-meeting-time-sel.c:2054
-#: calendar/gui/e-meeting-time-sel-item.c:452
+#: calendar/gui/e-meeting-time-sel-item.c:458
+#: calendar/gui/e-meeting-time-sel.c:2098
 msgid "%A, %B %d, %Y"
 msgstr "%A, %B %d, %Y"
 
-#. This is a strftime() format string %a = abbreviated weekday name,
-#. %m = month number, %d = month day, %Y = full year.
-#: calendar/gui/e-meeting-time-sel.c:2087
-#: calendar/gui/e-meeting-time-sel-item.c:456 e-util/e-time-utils.c:203
-#: e-util/e-time-utils.c:296 e-util/e-time-utils.c:384
+#. This is a strftime() format string %a = abbreviated weekday
+#. name, %m = month number, %d = month day, %Y = full year.
+#: calendar/gui/e-meeting-time-sel-item.c:462
+#: calendar/gui/e-meeting-time-sel.c:2131 e-util/e-time-utils.c:190
+#: e-util/e-time-utils.c:283 e-util/e-time-utils.c:371
 msgid "%a %m/%d/%Y"
 msgstr "%a %m/%d/%Y"
 
-#: calendar/gui/e-meeting-time-sel.etspec.h:1
-msgid "Attendee"
+#. This is a strftime() format string %m = month number,
+#. %d = month day, %Y = full year.
+#: calendar/gui/e-meeting-time-sel-item.c:466 e-util/e-time-utils.c:225
+#: e-util/e-time-utils.c:286 widgets/misc/e-dateedit.c:1582
+msgid "%m/%d/%Y"
+msgstr "%d/%m/%Y"
+
+#: calendar/gui/e-meeting-time-sel.c:407 designs/OOA/ooa.glade.h:11
+msgid "Out of Office"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.etspec.h:2
-msgid "Click here to add an attendee"
+#: calendar/gui/e-meeting-time-sel.c:408
+msgid "No Information"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.etspec.h:3
-msgid "Common Name"
+#: calendar/gui/e-meeting-time-sel.c:447
+msgid "_Options"
+msgstr "ምርጫዎች (_O)"
+
+#: calendar/gui/e-meeting-time-sel.c:464
+msgid "Show _Only Working Hours"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.etspec.h:4
-msgid "Delegated From"
+#: calendar/gui/e-meeting-time-sel.c:474
+msgid "Show _Zoomed Out"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.etspec.h:5
-msgid "Delegated To"
+#: calendar/gui/e-meeting-time-sel.c:489
+msgid "_Update Free/Busy"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.etspec.h:6
-msgid "Language"
-msgstr "ቋንቋ"
+#: calendar/gui/e-meeting-time-sel.c:504
+msgid "_<<"
+msgstr "_<<"
 
-#: calendar/gui/e-meeting-time-sel.etspec.h:7
-msgid "Member"
+#: calendar/gui/e-meeting-time-sel.c:522
+msgid "_Autopick"
 msgstr ""
 
-#. This is a strftime() format string %m = month number,
-#. %d = month day, %Y = full year.
-#: calendar/gui/e-meeting-time-sel-item.c:460 e-util/e-time-utils.c:238
-#: e-util/e-time-utils.c:299 widgets/misc/e-dateedit.c:1607
-msgid "%m/%d/%Y"
-msgstr "%d/%m/%Y"
+#: calendar/gui/e-meeting-time-sel.c:537
+msgid ">_>"
+msgstr ">_>"
 
-#: calendar/gui/e-tasks.c:151
-msgid "invalid time"
+#: calendar/gui/e-meeting-time-sel.c:554
+msgid "_All People and Resources"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:221
-#, fuzzy
-msgid "Start Date:"
-msgstr "ቀን፦"
+#: calendar/gui/e-meeting-time-sel.c:563
+msgid "All _People and One Resource"
+msgstr ""
 
-#: calendar/gui/e-tasks.c:237
-#, fuzzy
-msgid "Due Date:"
-msgstr "ቀን፦"
+#: calendar/gui/e-meeting-time-sel.c:572
+msgid "_Required People"
+msgstr ""
 
-#. write priority
-#: calendar/gui/e-tasks.c:265
-#, fuzzy
-msgid "Priority:"
-msgstr "ቅድሚያ"
+#: calendar/gui/e-meeting-time-sel.c:581
+msgid "Required People and _One Resource"
+msgstr ""
 
-#. URL
-#: calendar/gui/e-tasks.c:321
-#, fuzzy
-msgid "Web Page:"
-msgstr "ገጽ"
+#: calendar/gui/e-meeting-time-sel.c:600
+msgid "Meeting _start time:"
+msgstr ""
+
+#: calendar/gui/e-meeting-time-sel.c:620
+msgid "Meeting _end time:"
+msgstr ""
 
-#: calendar/gui/e-tasks.c:702
+#: calendar/gui/e-tasks.c:360 calendar/gui/gnome-cal.c:2006
+#: calendar/gui/gnome-cal.c:2017
 #, c-format
 msgid "Opening tasks at %s"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:731 calendar/gui/tasks-control.c:201
+#: calendar/gui/e-tasks.c:389 calendar/gui/tasks-control.c:201
 #, c-format
 msgid "Could not load the tasks in `%s'"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:746
+#: calendar/gui/e-tasks.c:404
 #, c-format
 msgid "The method required to load `%s' is not supported"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:760 calendar/gui/gnome-cal.c:1730
+#: calendar/gui/e-tasks.c:418 calendar/gui/gnome-cal.c:1509
 #, c-format
 msgid "You don't have permission to open the folder in `%s'"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:828 calendar/gui/gnome-cal.c:1944
+#: calendar/gui/e-tasks.c:486 calendar/gui/gnome-cal.c:1728
 #, c-format
 msgid ""
 "Error on %s:\n"
 " %s"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:899
+#: calendar/gui/e-tasks.c:557
 msgid "Completing tasks..."
 msgstr ""
 
-#: calendar/gui/e-tasks.c:922
+#: calendar/gui/e-tasks.c:580
 msgid "Deleting selected objects..."
 msgstr ""
 
-#: calendar/gui/e-tasks.c:1017
+#: calendar/gui/e-tasks.c:675
 msgid "Expunging"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1702
+#: calendar/gui/e-week-view.c:3581
+msgid "New _Appointment..."
+msgstr ""
+
+#: calendar/gui/gnome-cal.c:1481
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1716
+#: calendar/gui/gnome-cal.c:1495
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1772
+#: calendar/gui/gnome-cal.c:1556
 #, c-format
 msgid "Adding alarms for %s"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1964
+#: calendar/gui/gnome-cal.c:1748
 #, c-format
 msgid ""
-"The task backend for\n"
+"The calendar backend for\n"
 "%s\n"
 " has crashed. You will have to restart Evolution in order to use it again"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1970
+#: calendar/gui/gnome-cal.c:1757
 #, c-format
 msgid ""
-"The calendar backend for\n"
+"The task backend for\n"
 "%s\n"
 " has crashed. You will have to restart Evolution in order to use it again"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:2176
+#: calendar/gui/gnome-cal.c:1988
 #, c-format
 msgid "Opening calendar at %s"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:2197
+#: calendar/gui/gnome-cal.c:2028
 msgid "Opening default tasks folder"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:3094
-#, c-format
-msgid "Purging event %s"
-msgstr ""
-
-#: calendar/gui/gnome-cal.c:3178
-#, fuzzy
-msgid "Purging"
-msgstr "አትም"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-msgid "Calendar and Tasks"
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-msgid "Configure your timezone, Calendar and Task List here "
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
-msgid "Evolution Calendar and Tasks"
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
-msgid "Evolution Calendar and Tasks component"
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
-msgid "Evolution Calendar configuration control"
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
-msgid "Evolution Calendar scheduling message viewer"
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
-msgid "Evolution Calendar viewer"
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
-msgid "Evolution Calendar/Task editor"
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
-msgid "Evolution Tasks viewer"
-msgstr ""
-
 #: calendar/gui/goto-dialog.glade.h:1
 msgid "April"
 msgstr "ኤፕረል"
@@ -6189,7 +6145,7 @@ msgstr ""
 msgid "iCalendar information"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:668
+#: calendar/gui/itip-utils.c:667
 msgid "You must be an attendee of the event."
 msgstr ""
 
@@ -6222,81 +6178,82 @@ msgid "Sa"
 msgstr "ቅ"
 
 #. Day
-#: calendar/gui/print.c:1882
+#: calendar/gui/print.c:1875
 msgid "Selected day (%a %b %d %Y)"
 msgstr ""
 
-#: calendar/gui/print.c:1907 calendar/gui/print.c:1911
+#: calendar/gui/print.c:1900 calendar/gui/print.c:1904
 msgid "%a %b %d"
 msgstr "%a %b %d"
 
-#: calendar/gui/print.c:1908
+#: calendar/gui/print.c:1901
 msgid "%a %d %Y"
 msgstr "%a %d %Y"
 
-#: calendar/gui/print.c:1912 calendar/gui/print.c:1914
-#: calendar/gui/print.c:1915
+#: calendar/gui/print.c:1905 calendar/gui/print.c:1907
+#: calendar/gui/print.c:1908
 msgid "%a %b %d %Y"
 msgstr "%a %b %d %Y"
 
-#: calendar/gui/print.c:1919
+#: calendar/gui/print.c:1912
 #, c-format
 msgid "Selected week (%s - %s)"
 msgstr ""
 
 #. Month
-#: calendar/gui/print.c:1927
+#: calendar/gui/print.c:1920
 msgid "Selected month (%b %Y)"
 msgstr ""
 
 #. Year
-#: calendar/gui/print.c:1934
+#: calendar/gui/print.c:1927
 msgid "Selected year (%Y)"
 msgstr ""
 
-#: calendar/gui/print.c:2262
+#: calendar/gui/print.c:2255
 msgid "Task"
 msgstr ""
 
-#: calendar/gui/print.c:2321
+#: calendar/gui/print.c:2314
 #, c-format
 msgid "Status: %s"
 msgstr "ሁኔታ፦ %s"
 
-#: calendar/gui/print.c:2338
+#: calendar/gui/print.c:2331
 #, c-format
 msgid "Priority: %s"
 msgstr "ቅድሚያ፦ %s"
 
-#: calendar/gui/print.c:2350
+#: calendar/gui/print.c:2343
 #, c-format
 msgid "Percent Complete: %i"
 msgstr ""
 
-#: calendar/gui/print.c:2362
+#: calendar/gui/print.c:2355
 #, c-format
 msgid "URL: %s"
 msgstr "URL፦ %s"
 
-#: calendar/gui/print.c:2376
+#: calendar/gui/print.c:2369
 #, c-format
 msgid "Categories: %s"
 msgstr "ምድቦች፦ %s"
 
-#: calendar/gui/print.c:2387
+#: calendar/gui/print.c:2380
 msgid "Contacts: "
 msgstr ""
 
-#: calendar/gui/print.c:2525 calendar/gui/print.c:2611
-#: calendar/gui/tasks-control.c:564 my-evolution/e-summary.c:649
+#: calendar/gui/print.c:2518 calendar/gui/print.c:2604
+#: calendar/gui/tasks-control.c:581 mail/mail-callbacks.c:2948
+#: my-evolution/e-summary.c:649
 msgid "Print Preview"
 msgstr "የቅድመ ህትመት ዕይታ"
 
-#: calendar/gui/print.c:2559
+#: calendar/gui/print.c:2552
 msgid "Print Item"
 msgstr ""
 
-#: calendar/gui/print.c:2632
+#: calendar/gui/print.c:2625
 msgid "Print Setup"
 msgstr "የህትመት ቅንጅት"
 
@@ -6304,7 +6261,7 @@ msgstr "የህትመት ቅንጅት"
 msgid "The URI of the tasks folder to display"
 msgstr ""
 
-#: calendar/gui/tasks-control.c:448
+#: calendar/gui/tasks-control.c:465
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
 "continue, you will not be able to recover these tasks.\n"
@@ -6312,11 +6269,11 @@ msgid ""
 "Really erase these tasks?"
 msgstr ""
 
-#: calendar/gui/tasks-control.c:451
+#: calendar/gui/tasks-control.c:468
 msgid "Do not ask me again."
 msgstr ""
 
-#: calendar/gui/tasks-control.c:593
+#: calendar/gui/tasks-control.c:610
 msgid "Print Tasks"
 msgstr ""
 
@@ -8003,27 +7960,27 @@ msgstr ""
 msgid "Pacific/Yap"
 msgstr ""
 
-#: camel/camel-cipher-context.c:167
+#: camel/camel-cipher-context.c:178
 msgid "Signing is not supported by this cipher"
 msgstr ""
 
-#: camel/camel-cipher-context.c:207
+#: camel/camel-cipher-context.c:218
 msgid "Verifying is not supported by this cipher"
 msgstr ""
 
-#: camel/camel-cipher-context.c:251
+#: camel/camel-cipher-context.c:262
 msgid "Encryption is not supported by this cipher"
 msgstr ""
 
-#: camel/camel-cipher-context.c:293
+#: camel/camel-cipher-context.c:304
 msgid "Decryption is not supported by this cipher"
 msgstr ""
 
-#: camel/camel-cipher-context.c:331
+#: camel/camel-cipher-context.c:342
 msgid "You may not import keys with this cipher"
 msgstr ""
 
-#: camel/camel-cipher-context.c:363
+#: camel/camel-cipher-context.c:374
 msgid "You may not export keys with this cipher"
 msgstr ""
 
@@ -8056,11 +8013,7 @@ msgstr ""
 msgid "Resynchronizing with server"
 msgstr ""
 
-#: camel/camel-disco-folder.c:90
-msgid "Downloading new messages for offline mode"
-msgstr ""
-
-#: camel/camel-disco-folder.c:351
+#: camel/camel-disco-folder.c:278
 #, c-format
 msgid "Preparing folder '%s' for offline"
 msgstr ""
@@ -8081,57 +8034,57 @@ msgstr ""
 msgid "Failed to create create child process '%s': %s"
 msgstr ""
 
-#: camel/camel-filter-driver.c:759
+#: camel/camel-filter-driver.c:744
 #, c-format
 msgid "Invalid message stream received from %s: %s"
 msgstr ""
 
-#: camel/camel-filter-driver.c:940 camel/camel-filter-driver.c:949
+#: camel/camel-filter-driver.c:923 camel/camel-filter-driver.c:932
 msgid "Syncing folders"
 msgstr ""
 
-#: camel/camel-filter-driver.c:1038 camel/camel-filter-driver.c:1411
+#: camel/camel-filter-driver.c:1021 camel/camel-filter-driver.c:1394
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr ""
 
-#: camel/camel-filter-driver.c:1047 camel/camel-filter-driver.c:1417
+#: camel/camel-filter-driver.c:1030 camel/camel-filter-driver.c:1400
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr ""
 
-#: camel/camel-filter-driver.c:1114
+#: camel/camel-filter-driver.c:1097
 msgid "Unable to open spool folder"
 msgstr ""
 
-#: camel/camel-filter-driver.c:1123
+#: camel/camel-filter-driver.c:1106
 msgid "Unable to process spool folder"
 msgstr ""
 
-#: camel/camel-filter-driver.c:1138
+#: camel/camel-filter-driver.c:1121
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr ""
 
-#: camel/camel-filter-driver.c:1142
+#: camel/camel-filter-driver.c:1125
 msgid "Cannot open message"
 msgstr ""
 
-#: camel/camel-filter-driver.c:1143 camel/camel-filter-driver.c:1155
+#: camel/camel-filter-driver.c:1126 camel/camel-filter-driver.c:1138
 #, c-format
 msgid "Failed on message %d"
 msgstr ""
 
-#: camel/camel-filter-driver.c:1169 camel/camel-filter-driver.c:1263
+#: camel/camel-filter-driver.c:1152 camel/camel-filter-driver.c:1246
 msgid "Syncing folder"
 msgstr ""
 
-#: camel/camel-filter-driver.c:1230
+#: camel/camel-filter-driver.c:1213
 #, c-format
 msgid "Getting message %d of %d"
 msgstr ""
 
-#: camel/camel-filter-driver.c:1245
+#: camel/camel-filter-driver.c:1228
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr ""
@@ -8153,54 +8106,50 @@ msgstr ""
 msgid "Error executing filter search: %s: %s"
 msgstr ""
 
-#: camel/camel-folder.c:585
+#: camel/camel-folder-search.c:346
 #, c-format
-msgid "Unsupported operation: append message: for %s"
-msgstr ""
-
-#: camel/camel-folder.c:1163
-#, c-format
-msgid "Unsupported operation: search by expression: for %s"
+msgid ""
+"Cannot parse search expression: %s:\n"
+"%s"
 msgstr ""
 
-#: camel/camel-folder.c:1203
+#: camel/camel-folder-search.c:356
 #, c-format
-msgid "Unsupported operation: search by uids: for %s"
+msgid ""
+"Error executing search expression: %s:\n"
+"%s"
 msgstr ""
 
-#: camel/camel-folder.c:1321
-msgid "Moving messages"
+#: camel/camel-folder-search.c:573 camel/camel-folder-search.c:601
+msgid "(match-all) requires a single bool result"
 msgstr ""
 
-#: camel/camel-folder.c:1321
-msgid "Copying messages"
+#: camel/camel-folder-search.c:653
+#, c-format
+msgid "Performing query on unknown header: %s"
 msgstr ""
 
-#: camel/camel-folder.c:1571
-msgid "Filtering new message(s)"
+#: camel/camel-folder.c:583
+#, c-format
+msgid "Unsupported operation: append message: for %s"
 msgstr ""
 
-#: camel/camel-folder-search.c:348
+#: camel/camel-folder.c:1161
 #, c-format
-msgid ""
-"Cannot parse search expression: %s:\n"
-"%s"
+msgid "Unsupported operation: search by expression: for %s"
 msgstr ""
 
-#: camel/camel-folder-search.c:358
+#: camel/camel-folder.c:1201
 #, c-format
-msgid ""
-"Error executing search expression: %s:\n"
-"%s"
+msgid "Unsupported operation: search by uids: for %s"
 msgstr ""
 
-#: camel/camel-folder-search.c:569 camel/camel-folder-search.c:598
-msgid "(match-all) requires a single bool result"
+#: camel/camel-folder.c:1319
+msgid "Moving messages"
 msgstr ""
 
-#: camel/camel-folder-search.c:650
-#, c-format
-msgid "Performing query on unknown header: %s"
+#: camel/camel-folder.c:1319
+msgid "Copying messages"
 msgstr ""
 
 #: camel/camel-gpg-context.c:762
@@ -8228,7 +8177,7 @@ msgstr ""
 
 #: camel/camel-gpg-context.c:821 camel/camel-gpg-context.c:1297
 #: camel/camel-gpg-context.c:1403 camel/camel-gpg-context.c:1473
-#: camel/camel-gpg-context.c:1529 mail/mail-send-recv.c:574
+#: camel/camel-gpg-context.c:1529 mail/mail-send-recv.c:577
 msgid "Cancelled."
 msgstr ""
 
@@ -8280,44 +8229,44 @@ msgstr ""
 msgid "Cannot verify message signature: could not create temp file: %s"
 msgstr ""
 
-#: camel/camel-lock.c:92 camel/camel-lock.c:113
+#: camel/camel-lock-client.c:111
 #, c-format
-msgid "Could not create lock file for %s: %s"
+msgid "Cannot build locking helper pipe: %s"
 msgstr ""
 
-#: camel/camel-lock.c:154
+#: camel/camel-lock-client.c:124
 #, c-format
-msgid "Timed out trying to get lock file on %s. Try again later."
+msgid "Cannot fork locking helper: %s"
 msgstr ""
 
-#: camel/camel-lock.c:209
+#: camel/camel-lock-client.c:202 camel/camel-lock-client.c:225
 #, c-format
-msgid "Failed to get lock using fcntl(2): %s"
+msgid "Could not lock '%s': protocol error with lock-helper"
 msgstr ""
 
-#: camel/camel-lock.c:272
+#: camel/camel-lock-client.c:215
 #, c-format
-msgid "Failed to get lock using flock(2): %s"
+msgid "Could not lock '%s'"
 msgstr ""
 
-#: camel/camel-lock-client.c:100
+#: camel/camel-lock.c:92 camel/camel-lock.c:113
 #, c-format
-msgid "Cannot build locking helper pipe: %s"
+msgid "Could not create lock file for %s: %s"
 msgstr ""
 
-#: camel/camel-lock-client.c:113
+#: camel/camel-lock.c:154
 #, c-format
-msgid "Cannot fork locking helper: %s"
+msgid "Timed out trying to get lock file on %s. Try again later."
 msgstr ""
 
-#: camel/camel-lock-client.c:191 camel/camel-lock-client.c:214
+#: camel/camel-lock.c:209
 #, c-format
-msgid "Could not lock '%s': protocol error with lock-helper"
+msgid "Failed to get lock using fcntl(2): %s"
 msgstr ""
 
-#: camel/camel-lock-client.c:204
+#: camel/camel-lock.c:272
 #, c-format
-msgid "Could not lock '%s'"
+msgid "Failed to get lock using flock(2): %s"
 msgstr ""
 
 #: camel/camel-movemail.c:107
@@ -8386,11 +8335,11 @@ msgstr ""
 msgid "Failed to decrypt MIME part: parse error"
 msgstr ""
 
-#: camel/camel-multipart-signed.c:646
+#: camel/camel-multipart-signed.c:644
 msgid "This is a digitally signed message part"
 msgstr ""
 
-#: camel/camel-multipart-signed.c:700
+#: camel/camel-multipart-signed.c:698
 msgid "parse error"
 msgstr ""
 
@@ -8452,11 +8401,11 @@ msgid ""
 "the server supports it."
 msgstr ""
 
-#: camel/camel-sasl-digest-md5.c:48
+#: camel/camel-sasl-digest-md5.c:46
 msgid "DIGEST-MD5"
 msgstr ""
 
-#: camel/camel-sasl-digest-md5.c:50
+#: camel/camel-sasl-digest-md5.c:48
 msgid ""
 "This option will connect to the server using a secure DIGEST-MD5 password, "
 "if the server supports it."
@@ -8547,7 +8496,7 @@ msgstr ""
 #: camel/camel-sasl-gssapi.c:189 camel/camel-sasl-gssapi.c:238
 #: camel/camel-sasl-gssapi.c:274 camel/camel-sasl-gssapi.c:289
 #: camel/camel-sasl-kerberos4.c:219
-#: camel/providers/imap/camel-imap-store.c:1207
+#: camel/providers/imap/camel-imap-store.c:1052
 msgid "Bad authentication response from server."
 msgstr ""
 
@@ -8601,23 +8550,23 @@ msgstr ""
 msgid "PLAIN"
 msgstr "ቀላል"
 
-#: camel/camel-sasl-popb4smtp.c:36
+#: camel/camel-sasl-popb4smtp.c:34
 msgid "POP before SMTP"
 msgstr ""
 
-#: camel/camel-sasl-popb4smtp.c:38
+#: camel/camel-sasl-popb4smtp.c:36
 msgid "This option will authorise a POP connection before attempting SMTP"
 msgstr ""
 
-#: camel/camel-sasl-popb4smtp.c:103
+#: camel/camel-sasl-popb4smtp.c:107
 msgid "POP Source URI"
 msgstr ""
 
-#: camel/camel-sasl-popb4smtp.c:107
+#: camel/camel-sasl-popb4smtp.c:111
 msgid "POP Before SMTP auth using an unknown transport"
 msgstr ""
 
-#: camel/camel-sasl-popb4smtp.c:112
+#: camel/camel-sasl-popb4smtp.c:116
 msgid "POP Before SMTP auth using a non-pop source"
 msgstr ""
 
@@ -8626,55 +8575,55 @@ msgstr ""
 msgid "Regular expression compilation failed: %s: %s"
 msgstr ""
 
-#: camel/camel-service.c:277
+#: camel/camel-service.c:282
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr ""
 
-#: camel/camel-service.c:285
+#: camel/camel-service.c:290
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr ""
 
-#: camel/camel-service.c:293
+#: camel/camel-service.c:298
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr ""
 
-#: camel/camel-service.c:738
+#: camel/camel-service.c:750
 #, c-format
 msgid "Resolving: %s"
 msgstr ""
 
-#: camel/camel-service.c:769 camel/camel-service.c:893
+#: camel/camel-service.c:783 camel/camel-service.c:915
 #, c-format
 msgid "Failure in name lookup: %s"
 msgstr ""
 
-#: camel/camel-service.c:790 camel/camel-service.c:914
+#: camel/camel-service.c:804
 #, c-format
 msgid "Host lookup failed: cannot create thread: %s"
 msgstr ""
 
-#: camel/camel-service.c:803
+#: camel/camel-service.c:818
 #, c-format
 msgid "Host lookup failed: %s: host not found"
 msgstr ""
 
-#: camel/camel-service.c:806
+#: camel/camel-service.c:821
 #, c-format
 msgid "Host lookup failed: %s: unknown reason"
 msgstr ""
 
-#: camel/camel-service.c:860
+#: camel/camel-service.c:880
 msgid "Resolving address"
 msgstr ""
 
-#: camel/camel-service.c:929
+#: camel/camel-service.c:949
 msgid "Host lookup failed: host not found"
 msgstr ""
 
-#: camel/camel-service.c:932
+#: camel/camel-service.c:952
 msgid "Host lookup failed: unknown reason"
 msgstr ""
 
@@ -8686,12 +8635,12 @@ msgstr ""
 msgid "For reading mail as a query of another set of folders"
 msgstr ""
 
-#: camel/camel-session.c:350 camel/camel-session.c:400
+#: camel/camel-session.c:355 camel/camel-session.c:405
 #, c-format
 msgid "No provider available for protocol `%s'"
 msgstr ""
 
-#: camel/camel-session.c:523
+#: camel/camel-session.c:528
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -8735,131 +8684,131 @@ msgstr ""
 msgid "Failed to verify certificates."
 msgstr ""
 
-#: camel/camel-store.c:212
+#: camel/camel-store.c:215
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr ""
 
-#: camel/camel-store.c:266
+#: camel/camel-store.c:269
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:568
+#: camel/camel-tcp-stream-openssl.c:571
 msgid "Unable to get issuer's certificate"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:570
+#: camel/camel-tcp-stream-openssl.c:573
 msgid "Unable to get Certificate Revocation List"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:572
+#: camel/camel-tcp-stream-openssl.c:575
 msgid "Unable to decrypt certificate signature"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:574
+#: camel/camel-tcp-stream-openssl.c:577
 msgid "Unable to decrypt Certificate Revocation List signature"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:576
+#: camel/camel-tcp-stream-openssl.c:579
 msgid "Unable to decode issuer's public key"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:578
+#: camel/camel-tcp-stream-openssl.c:581
 msgid "Certificate signature failure"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:580
+#: camel/camel-tcp-stream-openssl.c:583
 msgid "Certificate Revocation List signature failure"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:582
+#: camel/camel-tcp-stream-openssl.c:585
 msgid "Certificate not yet valid"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:584
+#: camel/camel-tcp-stream-openssl.c:587
 msgid "Certificate has expired"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:586
+#: camel/camel-tcp-stream-openssl.c:589
 msgid "CRL not yet valid"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:588
+#: camel/camel-tcp-stream-openssl.c:591
 msgid "CRL has expired"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:593
+#: camel/camel-tcp-stream-openssl.c:596
 msgid "Error in CRL"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:595
+#: camel/camel-tcp-stream-openssl.c:598
 msgid "Out of memory"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:597
+#: camel/camel-tcp-stream-openssl.c:600
 msgid "Zero-depth self-signed certificate"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:599
+#: camel/camel-tcp-stream-openssl.c:602
 msgid "Self-signed certificate in chain"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:601
+#: camel/camel-tcp-stream-openssl.c:604
 msgid "Unable to get issuer's certificate locally"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:603
+#: camel/camel-tcp-stream-openssl.c:606
 msgid "Unable to verify leaf signature"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:605
+#: camel/camel-tcp-stream-openssl.c:608
 msgid "Certificate chain too long"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:607
+#: camel/camel-tcp-stream-openssl.c:610
 msgid "Certificate Revoked"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:609
+#: camel/camel-tcp-stream-openssl.c:612
 msgid "Invalid Certificate Authority (CA)"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:611
+#: camel/camel-tcp-stream-openssl.c:614
 msgid "Path length exceeded"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:613
+#: camel/camel-tcp-stream-openssl.c:616
 msgid "Invalid purpose"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:615
+#: camel/camel-tcp-stream-openssl.c:618
 msgid "Certificate untrusted"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:617
+#: camel/camel-tcp-stream-openssl.c:620
 msgid "Certificate rejected"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:620
+#: camel/camel-tcp-stream-openssl.c:623
 msgid "Subject/Issuer mismatch"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:622
+#: camel/camel-tcp-stream-openssl.c:625
 msgid "AKID/SKID mismatch"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:624
+#: camel/camel-tcp-stream-openssl.c:627
 msgid "AKID/Issuer serial mismatch"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:626
+#: camel/camel-tcp-stream-openssl.c:629
 msgid "Key usage does not support certificate signing"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:629
+#: camel/camel-tcp-stream-openssl.c:632
 msgid "Error in application verification"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:696 camel/camel-tcp-stream-ssl.c:831
+#: camel/camel-tcp-stream-openssl.c:699 camel/camel-tcp-stream-ssl.c:823
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -8868,15 +8817,15 @@ msgid ""
 "Signature:         %s"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:837
+#: camel/camel-tcp-stream-openssl.c:705 camel/camel-tcp-stream-ssl.c:829
 msgid "GOOD"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:837
+#: camel/camel-tcp-stream-openssl.c:705 camel/camel-tcp-stream-ssl.c:829
 msgid "BAD"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:704
+#: camel/camel-tcp-stream-openssl.c:707
 #, c-format
 msgid ""
 "Bad certificate from %s:\n"
@@ -8889,7 +8838,7 @@ msgid ""
 msgstr ""
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:841
+#: camel/camel-tcp-stream-ssl.c:833
 #, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -8899,28 +8848,28 @@ msgid ""
 "Do you wish to accept?"
 msgstr ""
 
-#: camel/camel-tcp-stream-ssl.c:885
+#: camel/camel-tcp-stream-ssl.c:877
 #, c-format
 msgid ""
 "Certificate problem: %s\n"
 "Issuer: %s"
 msgstr ""
 
-#: camel/camel-tcp-stream-ssl.c:937
+#: camel/camel-tcp-stream-ssl.c:929
 #, c-format
 msgid ""
 "Bad certificate domain: %s\n"
 "Issuer: %s"
 msgstr ""
 
-#: camel/camel-tcp-stream-ssl.c:955
+#: camel/camel-tcp-stream-ssl.c:947
 #, c-format
 msgid ""
 "Certificate expired: %s\n"
 "Issuer: %s"
 msgstr ""
 
-#: camel/camel-tcp-stream-ssl.c:972
+#: camel/camel-tcp-stream-ssl.c:964
 #, c-format
 msgid ""
 "Certificate revocation list expired: %s\n"
@@ -8932,17 +8881,17 @@ msgstr ""
 msgid "Could not parse URL `%s'"
 msgstr ""
 
-#: camel/camel-vee-folder.c:611
+#: camel/camel-vee-folder.c:618
 #, c-format
 msgid "Error storing `%s': %s"
 msgstr ""
 
-#: camel/camel-vee-folder.c:649
+#: camel/camel-vee-folder.c:656
 #, c-format
 msgid "No such message %s in %s"
 msgstr ""
 
-#: camel/camel-vee-folder.c:812 camel/camel-vee-folder.c:818
+#: camel/camel-vee-folder.c:819 camel/camel-vee-folder.c:825
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr ""
 
@@ -8969,12 +8918,12 @@ msgstr ""
 #: camel/providers/imap/camel-imap-command.c:221
 #: camel/providers/imap/camel-imap-command.c:260
 #: camel/providers/imap/camel-imap-command.c:450
-#: camel/providers/imap/camel-imap-store.c:2806
+#: camel/providers/imap/camel-imap-store.c:2644
 msgid "Operation cancelled"
 msgstr ""
 
 #: camel/providers/imap/camel-imap-command.c:305
-#: camel/providers/imap/camel-imap-store.c:2809
+#: camel/providers/imap/camel-imap-store.c:2647
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr ""
@@ -9011,62 +8960,62 @@ msgstr ""
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:223
+#: camel/providers/imap/camel-imap-folder.c:222
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:242
+#: camel/providers/imap/camel-imap-folder.c:241
 #, c-format
 msgid "Could not load summary for %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:308
+#: camel/providers/imap/camel-imap-folder.c:307
 msgid "Folder was destroyed and recreated on server."
 msgstr ""
 
 #. Check UIDs and flags of all messages we already know of.
-#: camel/providers/imap/camel-imap-folder.c:550
+#: camel/providers/imap/camel-imap-folder.c:549
 msgid "Scanning for changed messages"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:1886
+#: camel/providers/imap/camel-imap-folder.c:1883
 #, c-format
 msgid "Unable to retrieve message: %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:1923
-#: camel/providers/local/camel-maildir-folder.c:211
-#: camel/providers/local/camel-maildir-folder.c:224
-#: camel/providers/local/camel-maildir-folder.c:233
-#: camel/providers/local/camel-mbox-folder.c:422
-#: camel/providers/local/camel-mh-folder.c:200
-#: camel/providers/local/camel-mh-folder.c:210
-#: camel/providers/local/camel-mh-folder.c:219
+#: camel/providers/imap/camel-imap-folder.c:1920
+#: camel/providers/local/camel-maildir-folder.c:212
+#: camel/providers/local/camel-maildir-folder.c:225
+#: camel/providers/local/camel-maildir-folder.c:234
+#: camel/providers/local/camel-mbox-folder.c:351
+#: camel/providers/local/camel-mh-folder.c:201
+#: camel/providers/local/camel-mh-folder.c:211
+#: camel/providers/local/camel-mh-folder.c:220
 #, c-format
 msgid ""
 "Cannot get message: %s\n"
 "  %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:1923
-#: camel/providers/local/camel-maildir-folder.c:211
-#: camel/providers/local/camel-mbox-folder.c:422
-#: camel/providers/local/camel-mh-folder.c:200
+#: camel/providers/imap/camel-imap-folder.c:1920
+#: camel/providers/local/camel-maildir-folder.c:212
+#: camel/providers/local/camel-mbox-folder.c:351
+#: camel/providers/local/camel-mh-folder.c:201
 msgid "No such message"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:1946
-#: camel/providers/imap/camel-imap-folder.c:2542
+#: camel/providers/imap/camel-imap-folder.c:1943
+#: camel/providers/imap/camel-imap-folder.c:2539
 msgid "This message is not currently available"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:2206
-#: camel/providers/imap/camel-imap-folder.c:2276
+#: camel/providers/imap/camel-imap-folder.c:2203
+#: camel/providers/imap/camel-imap-folder.c:2273
 msgid "Fetching summary information for new messages"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:2580
+#: camel/providers/imap/camel-imap-folder.c:2577
 msgid "Could not find message body in FETCH response."
 msgstr ""
 
@@ -9116,100 +9065,85 @@ msgstr ""
 msgid "Apply filters to new messages in INBOX on this server"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-provider.c:59
-msgid "Automatically synchronize remote mail locally"
-msgstr ""
-
-#: camel/providers/imap/camel-imap-provider.c:65
+#: camel/providers/imap/camel-imap-provider.c:63
 msgid "IMAP"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-provider.c:67
+#: camel/providers/imap/camel-imap-provider.c:65
 msgid "For reading and storing mail on IMAP servers."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-provider.c:82
-#: camel/providers/imapp/camel-imapp-provider.c:65
-#: camel/providers/nntp/camel-nntp-store.c:265
+#: camel/providers/imap/camel-imap-provider.c:80
+#: camel/providers/nntp/camel-nntp-store.c:267
 #: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:83
 msgid "Password"
 msgstr "ሚስጢራዊ ቃል"
 
-#: camel/providers/imap/camel-imap-provider.c:84
-#: camel/providers/imapp/camel-imapp-provider.c:67
+#: camel/providers/imap/camel-imap-provider.c:82
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:459
+#: camel/providers/imap/camel-imap-store.c:457
 #, c-format
 msgid "IMAP server %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:461
+#: camel/providers/imap/camel-imap-store.c:459
 #, c-format
 msgid "IMAP service for %s on %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:589
-#: camel/providers/imap/camel-imap-store.c:821
-#: camel/providers/imapp/camel-imapp-store.c:233
-#: camel/providers/nntp/camel-nntp-store.c:128
-#: camel/providers/nntp/camel-nntp-store.c:146
+#: camel/providers/imap/camel-imap-store.c:587
+#: camel/providers/nntp/camel-nntp-store.c:130
+#: camel/providers/nntp/camel-nntp-store.c:148
 #: camel/providers/pop3/camel-pop3-store.c:184
 msgid "Connection cancelled"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:592
-#: camel/providers/imapp/camel-imapp-store.c:236
-#: camel/providers/nntp/camel-nntp-store.c:131
-#: camel/providers/smtp/camel-smtp-transport.c:275
+#: camel/providers/imap/camel-imap-store.c:590
+#: camel/providers/nntp/camel-nntp-store.c:133
+#: camel/providers/smtp/camel-smtp-transport.c:276
 #, c-format
 msgid "Could not connect to %s (port %d): %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:655
-#: camel/providers/imap/camel-imap-store.c:686
+#: camel/providers/imap/camel-imap-store.c:649
+#: camel/providers/imap/camel-imap-store.c:680
 #, c-format
 msgid "Failed to connect to IMAP server %s in secure mode: %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:656
+#: camel/providers/imap/camel-imap-store.c:650
 #: camel/providers/pop3/camel-pop3-store.c:220
 msgid "SSL/TLS extension not supported."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:687
+#: camel/providers/imap/camel-imap-store.c:681
 #: camel/providers/pop3/camel-pop3-store.c:261
 msgid "SSL negotiations failed"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:824
-#, fuzzy, c-format
-msgid "Could not connect with command \"%s\": %s"
-msgstr "ፋይል sን መክፈት አልቻለም፦ %s፦ %s"
-
-#: camel/providers/imap/camel-imap-store.c:1237
+#: camel/providers/imap/camel-imap-store.c:1075
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1247
-#: camel/providers/smtp/camel-smtp-transport.c:485
+#: camel/providers/imap/camel-imap-store.c:1085
+#: camel/providers/smtp/camel-smtp-transport.c:486
 #, c-format
 msgid "No support for authentication type %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1270
-#: camel/providers/imapp/camel-imapp-store.c:349
+#: camel/providers/imap/camel-imap-store.c:1108
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1284
+#: camel/providers/imap/camel-imap-store.c:1122
 msgid "You didn't enter a password."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1313
+#: camel/providers/imap/camel-imap-store.c:1151
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -9217,68 +9151,42 @@ msgid ""
 "\n"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1660
-#: camel/providers/imap/camel-imap-store.c:1802
+#: camel/providers/imap/camel-imap-store.c:1498
+#: camel/providers/imap/camel-imap-store.c:1640
 #, c-format
 msgid "No such folder %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:2003
+#: camel/providers/imap/camel-imap-store.c:1841
 #, c-format
 msgid ""
 "The folder name \"%s\" is invalid because it containes the character \"%c\""
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:2015
+#: camel/providers/imap/camel-imap-store.c:1853
 #, c-format
 msgid "Unknown parent folder: %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:2051
+#: camel/providers/imap/camel-imap-store.c:1889
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr ""
 
-#: camel/providers/imapp/camel-imapp-provider.c:39
-#: camel/providers/pop3/camel-pop3-provider.c:38
-msgid "Message storage"
-msgstr ""
-
-#: camel/providers/imapp/camel-imapp-provider.c:47
-msgid "IMAP+"
-msgstr ""
-
-#: camel/providers/imapp/camel-imapp-provider.c:49
-msgid ""
-"Experimental IMAP 4(.1) client\n"
-"This is untested and unsupported code, you want to use plain imap instead.\n"
-"\n"
-" !!! DO NOT USE THIS FOR PRODUCTION EMAIL  !!!\n"
-msgstr ""
-
-#: camel/providers/imapp/camel-imapp-store.c:333
-#, c-format
-msgid "Could not connect to POP server on %s"
-msgstr ""
-
-#: camel/providers/local/camel-local-folder.c:179
-msgid "Index message body data"
-msgstr ""
-
 #. $HOME relative path + protocol string
-#: camel/providers/local/camel-local-folder.c:379
+#: camel/providers/local/camel-local-folder.c:354
 #, c-format
 msgid "~%s (%s)"
 msgstr "~%s (%s)"
 
 #. /var/spool/mail relative path + protocol
-#: camel/providers/local/camel-local-folder.c:383
-#: camel/providers/local/camel-local-folder.c:386
+#: camel/providers/local/camel-local-folder.c:358
+#: camel/providers/local/camel-local-folder.c:361
 #, c-format
 msgid "mailbox:%s (%s)"
 msgstr "የፖስታ ሳጥን፦%s (%s)"
 
 #. a full path + protocol
-#: camel/providers/local/camel-local-folder.c:390
+#: camel/providers/local/camel-local-folder.c:365
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
@@ -9332,54 +9240,50 @@ msgid ""
 "May also be used to read a tree of Elm, Pine, or Mutt style folders."
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:138
-#: camel/providers/local/camel-local-store.c:227
-#: camel/providers/local/camel-mbox-store.c:305
+#: camel/providers/local/camel-local-store.c:139
+#: camel/providers/local/camel-local-store.c:228
 #: camel/providers/local/camel-spool-store.c:116
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:145
+#: camel/providers/local/camel-local-store.c:146
 #, c-format
 msgid "Store root %s is not a regular directory"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:154
-#: camel/providers/local/camel-local-store.c:170
-#: camel/providers/local/camel-local-store.c:238
+#: camel/providers/local/camel-local-store.c:155
+#: camel/providers/local/camel-local-store.c:171
+#: camel/providers/local/camel-local-store.c:239
 #, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:186
+#: camel/providers/local/camel-local-store.c:187
 msgid "Local stores do not have an inbox"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:198
+#: camel/providers/local/camel-local-store.c:199
 #, c-format
 msgid "Local mail file %s"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:307 mail/mail-local.c:949
+#: camel/providers/local/camel-local-store.c:308 mail/mail-local.c:909
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:364
-#: camel/providers/local/camel-mbox-store.c:474
+#: camel/providers/local/camel-local-store.c:365
 #, c-format
 msgid "Could not rename '%s': %s"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:387
-#: camel/providers/local/camel-mbox-store.c:258
+#: camel/providers/local/camel-local-store.c:388
 #, c-format
 msgid "Could not delete folder summary file `%s': %s"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:397
-#: camel/providers/local/camel-mbox-store.c:270
+#: camel/providers/local/camel-local-store.c:398
 #, c-format
 msgid "Could not delete folder index file `%s': %s"
 msgstr ""
@@ -9393,18 +9297,18 @@ msgstr ""
 msgid "Unable to add message to summary: unknown reason"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-folder.c:183
+#: camel/providers/local/camel-maildir-folder.c:184
 msgid "Maildir append message cancelled"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-folder.c:186
+#: camel/providers/local/camel-maildir-folder.c:187
 #, c-format
 msgid "Cannot append message to maildir folder: %s: %s"
 msgstr ""
 
 #
-#: camel/providers/local/camel-maildir-folder.c:234
-#: camel/providers/local/camel-mh-folder.c:220
+#: camel/providers/local/camel-maildir-folder.c:235
+#: camel/providers/local/camel-mh-folder.c:221
 msgid "Invalid message contents"
 msgstr ""
 
@@ -9418,7 +9322,7 @@ msgid ""
 msgstr ""
 
 #: camel/providers/local/camel-maildir-store.c:110
-#: camel/providers/local/camel-mbox-store.c:157
+#: camel/providers/local/camel-mbox-store.c:101
 #: camel/providers/local/camel-mh-store.c:209
 #: camel/providers/local/camel-spool-store.c:167
 #, c-format
@@ -9481,44 +9385,44 @@ msgstr ""
 msgid "Storing folder"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-folder.c:230
-#: camel/providers/local/camel-spool-folder.c:148
+#: camel/providers/local/camel-mbox-folder.c:159
+#: camel/providers/local/camel-spool-folder.c:149
 #, c-format
 msgid "Cannot create folder lock on %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-folder.c:289
+#: camel/providers/local/camel-mbox-folder.c:218
 #, c-format
 msgid "Cannot open mailbox: %s: %s\n"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-folder.c:349
+#: camel/providers/local/camel-mbox-folder.c:278
 msgid "Mail append cancelled"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-folder.c:352
+#: camel/providers/local/camel-mbox-folder.c:281
 #, c-format
 msgid "Cannot append message to mbox file: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-folder.c:440
-#: camel/providers/local/camel-mbox-folder.c:471
-#: camel/providers/local/camel-mbox-folder.c:479
+#: camel/providers/local/camel-mbox-folder.c:369
+#: camel/providers/local/camel-mbox-folder.c:400
+#: camel/providers/local/camel-mbox-folder.c:408
 #, c-format
 msgid ""
 "Cannot get message: %s from folder %s\n"
 "  %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-folder.c:472
+#: camel/providers/local/camel-mbox-folder.c:401
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr ""
 
-#: camel/providers/local/camel-mbox-folder.c:480
+#: camel/providers/local/camel-mbox-folder.c:409
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-store.c:149
+#: camel/providers/local/camel-mbox-store.c:94
 #, c-format
 msgid ""
 "Could not open file `%s':\n"
@@ -9527,71 +9431,32 @@ msgstr ""
 "ፋይል `%s'ን መክፈት አልቻለም፦\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:166
-#, fuzzy, c-format
-msgid ""
-"Could not create directory `%s':\n"
-"%s"
-msgstr ""
-"ዶሴ `%s'ን ማስፈጠር አልተቻለም፦\n"
-"%s"
-
-#: camel/providers/local/camel-mbox-store.c:178
+#: camel/providers/local/camel-mbox-store.c:110
 #, c-format
 msgid ""
 "Could not create file `%s':\n"
 "%s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-store.c:188
-#: camel/providers/local/camel-mbox-store.c:229
+#: camel/providers/local/camel-mbox-store.c:119
+#: camel/providers/local/camel-mbox-store.c:146
 #, c-format
 msgid "`%s' is not a regular file."
 msgstr ""
 
-#: camel/providers/local/camel-mbox-store.c:210
-#: camel/providers/local/camel-mbox-store.c:221
-#: camel/providers/local/camel-mbox-store.c:244
+#: camel/providers/local/camel-mbox-store.c:138
+#: camel/providers/local/camel-mbox-store.c:161
 #, c-format
 msgid ""
 "Could not delete folder `%s':\n"
 "%s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-store.c:236
+#: camel/providers/local/camel-mbox-store.c:153
 #, c-format
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr ""
 
-#: camel/providers/local/camel-mbox-store.c:311
-msgid "Cannot create a folder by this name."
-msgstr ""
-
-#: camel/providers/local/camel-mbox-store.c:324
-#, fuzzy, c-format
-msgid "Cannot create directory `%s': %s."
-msgstr ""
-"ዶሴ `%s'ን ማስፈጠር አልተቻለም፦\n"
-"%s"
-
-#: camel/providers/local/camel-mbox-store.c:338
-#, fuzzy, c-format
-msgid "Cannot create folder: %s: %s"
-msgstr ""
-"ዶሴ `%s'ን ማስፈጠር አልተቻለም፦\n"
-"%s"
-
-#: camel/providers/local/camel-mbox-store.c:408
-#, fuzzy, c-format
-msgid "Could not rename %s to %s: %s"
-msgstr ""
-"ዶሴ `%s'ን ማስፈጠር አልተቻለም፦\n"
-"%s"
-
-#: camel/providers/local/camel-mbox-store.c:427
-msgid "The new folder name is illegal."
-msgstr ""
-
 #: camel/providers/local/camel-mbox-summary.c:343
 #, c-format
 msgid "Could not open folder: %s: %s"
@@ -9621,7 +9486,7 @@ msgid "Cannot open temporary mailbox: %s"
 msgstr ""
 
 #: camel/providers/local/camel-mbox-summary.c:540
-#: camel/providers/local/camel-mbox-summary.c:704
+#: camel/providers/local/camel-mbox-summary.c:702
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr ""
@@ -9638,39 +9503,39 @@ msgstr ""
 
 #: camel/providers/local/camel-mbox-summary.c:644
 #: camel/providers/local/camel-mbox-summary.c:652
-#: camel/providers/local/camel-mbox-summary.c:845
-#: camel/providers/local/camel-mbox-summary.c:853
+#: camel/providers/local/camel-mbox-summary.c:843
+#: camel/providers/local/camel-mbox-summary.c:851
 msgid "Summary and folder mismatch, even after a sync"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:779
+#: camel/providers/local/camel-mbox-summary.c:777
 #: camel/providers/local/camel-spool-summary.c:334
 #, c-format
 msgid "Unknown error: %s"
 msgstr "ያልታወቀ ስህተት፦ %s"
 
-#: camel/providers/local/camel-mbox-summary.c:814
+#: camel/providers/local/camel-mbox-summary.c:812
 #, c-format
 msgid "Could not store folder: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:908
-#: camel/providers/local/camel-mbox-summary.c:934
+#: camel/providers/local/camel-mbox-summary.c:906
+#: camel/providers/local/camel-mbox-summary.c:932
 #, c-format
 msgid "Error writing to temp mailbox: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:925
+#: camel/providers/local/camel-mbox-summary.c:923
 #, c-format
 msgid "Writing to tmp mailbox failed: %s: %s"
 msgstr ""
 
 #
-#: camel/providers/local/camel-mh-folder.c:174
+#: camel/providers/local/camel-mh-folder.c:175
 msgid "MH append message cancelled"
 msgstr ""
 
-#: camel/providers/local/camel-mh-folder.c:177
+#: camel/providers/local/camel-mh-folder.c:178
 #, c-format
 msgid "Cannot append message to mh folder: %s: %s"
 msgstr ""
@@ -9748,61 +9613,6 @@ msgid ""
 "Folder may be corrupt, copy saved in `%s'"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-auth.c:44
-#, c-format
-msgid "Please enter the NNTP password for %s@%s"
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-auth.c:64
-msgid "Server rejected username"
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-auth.c:70
-msgid "Failed to send username to server"
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-auth.c:79
-msgid "Server rejected username/password"
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-folder.c:114
-#, c-format
-msgid "Internal error: uid in invalid format: %s"
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-folder.c:155
-#: camel/providers/nntp/camel-nntp-folder.c:161
-#: camel/providers/pop3/camel-pop3-folder.c:433
-#: camel/providers/pop3/camel-pop3-folder.c:494
-#: camel/providers/pop3/camel-pop3-folder.c:501
-#: camel/providers/pop3/camel-pop3-folder.c:512
-#, c-format
-msgid "Cannot get message %s: %s"
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-folder.c:159
-#: camel/providers/pop3/camel-pop3-folder.c:262
-#: camel/providers/pop3/camel-pop3-folder.c:430
-#: camel/providers/pop3/camel-pop3-folder.c:491
-#: camel/providers/pop3/camel-pop3-folder.c:509
-msgid "User cancelled"
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-grouplist.c:45
-msgid "Could not get group list from server."
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-grouplist.c:98
-#: camel/providers/nntp/camel-nntp-grouplist.c:107
-#, c-format
-msgid "Unable to load grouplist file for %s: %s"
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-grouplist.c:158
-#, c-format
-msgid "Unable to save grouplist file for %s: %s"
-msgstr ""
-
 #: camel/providers/nntp/camel-nntp-provider.c:41
 msgid "USENET news"
 msgstr ""
@@ -9811,58 +9621,58 @@ msgstr ""
 msgid "This is a provider for reading from and posting toUSENET newsgroups."
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:149
+#: camel/providers/nntp/camel-nntp-store.c:151
 #, c-format
 msgid "Could not read greeting from %s: %s"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:161
+#: camel/providers/nntp/camel-nntp-store.c:163
 #, c-format
 msgid "NNTP server %s returned error code %d: %s"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:260
+#: camel/providers/nntp/camel-nntp-store.c:262
 #, c-format
 msgid "USENET News via %s"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:267
+#: camel/providers/nntp/camel-nntp-store.c:269
 msgid ""
 "This option will authenticate with the NNTP server using a plaintext "
 "password."
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-summary.c:237
+#: camel/providers/nntp/camel-nntp-summary.c:234
 #, c-format
 msgid "No such folder: %s"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-summary.c:241
+#: camel/providers/nntp/camel-nntp-summary.c:238
 #, c-format
 msgid "Could not get group: %s"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-summary.c:347
+#: camel/providers/nntp/camel-nntp-summary.c:344
 #, c-format
 msgid "NNTP Command failed: %s"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-summary.c:407
-#: camel/providers/nntp/camel-nntp-summary.c:508
+#: camel/providers/nntp/camel-nntp-summary.c:404
+#: camel/providers/nntp/camel-nntp-summary.c:505
 #, c-format
 msgid "%s: Scanning new messages"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-summary.c:523
+#: camel/providers/nntp/camel-nntp-summary.c:520
 #, c-format
 msgid "Unknown server response: %s"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-summary.c:569
+#: camel/providers/nntp/camel-nntp-summary.c:566
 msgid "Use cancel"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-summary.c:571
+#: camel/providers/nntp/camel-nntp-summary.c:568
 #, c-format
 msgid "Operation failed: %s"
 msgstr ""
@@ -9871,6 +9681,13 @@ msgstr ""
 msgid "Retrieving POP summary"
 msgstr ""
 
+#: camel/providers/pop3/camel-pop3-folder.c:262
+#: camel/providers/pop3/camel-pop3-folder.c:429
+#: camel/providers/pop3/camel-pop3-folder.c:490
+#: camel/providers/pop3/camel-pop3-folder.c:508
+msgid "User cancelled"
+msgstr ""
+
 #: camel/providers/pop3/camel-pop3-folder.c:265
 #, c-format
 msgid "Cannot get POP summary: %s"
@@ -9880,22 +9697,34 @@ msgstr ""
 msgid "Expunging deleted messages"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-folder.c:404
+#: camel/providers/pop3/camel-pop3-folder.c:403
 #, c-format
 msgid "No message with uid %s"
 msgstr ""
 
 #. Sigh, most of the crap in this function is so that the cancel button
 #. returns the proper exception code.  Sigh.
-#: camel/providers/pop3/camel-pop3-folder.c:411
+#: camel/providers/pop3/camel-pop3-folder.c:410
 #, c-format
 msgid "Retrieving POP message %d"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-folder.c:501
+#: camel/providers/pop3/camel-pop3-folder.c:432
+#: camel/providers/pop3/camel-pop3-folder.c:493
+#: camel/providers/pop3/camel-pop3-folder.c:500
+#: camel/providers/pop3/camel-pop3-folder.c:511
+#, c-format
+msgid "Cannot get message %s: %s"
+msgstr ""
+
+#: camel/providers/pop3/camel-pop3-folder.c:500
 msgid "Unknown reason"
 msgstr ""
 
+#: camel/providers/pop3/camel-pop3-provider.c:38
+msgid "Message storage"
+msgstr ""
+
 #: camel/providers/pop3/camel-pop3-provider.c:40
 msgid "Leave messages on server"
 msgstr ""
@@ -10049,140 +9878,140 @@ msgstr "SMTP"
 msgid "For delivering mail by connecting to a remote mailhub using SMTP.\n"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:174
+#: camel/providers/smtp/camel-smtp-transport.c:175
 msgid "Syntax error, command unrecognized"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:176
+#: camel/providers/smtp/camel-smtp-transport.c:177
 msgid "Syntax error in parameters or arguments"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:178
+#: camel/providers/smtp/camel-smtp-transport.c:179
 msgid "Command not implemented"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:180
+#: camel/providers/smtp/camel-smtp-transport.c:181
 msgid "Command parameter not implemented"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:182
+#: camel/providers/smtp/camel-smtp-transport.c:183
 msgid "System status, or system help reply"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:184
+#: camel/providers/smtp/camel-smtp-transport.c:185
 msgid "Help message"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:186
+#: camel/providers/smtp/camel-smtp-transport.c:187
 msgid "Service ready"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:188
+#: camel/providers/smtp/camel-smtp-transport.c:189
 msgid "Service closing transmission channel"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:190
+#: camel/providers/smtp/camel-smtp-transport.c:191
 msgid "Service not available, closing transmission channel"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:192
+#: camel/providers/smtp/camel-smtp-transport.c:193
 msgid "Requested mail action okay, completed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:194
+#: camel/providers/smtp/camel-smtp-transport.c:195
 msgid "User not local; will forward to <forward-path>"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:196
+#: camel/providers/smtp/camel-smtp-transport.c:197
 msgid "Requested mail action not taken: mailbox unavailable"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:198
+#: camel/providers/smtp/camel-smtp-transport.c:199
 msgid "Requested action not taken: mailbox unavailable"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:200
+#: camel/providers/smtp/camel-smtp-transport.c:201
 msgid "Requested action aborted: error in processing"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:202
+#: camel/providers/smtp/camel-smtp-transport.c:203
 msgid "User not local; please try <forward-path>"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:204
+#: camel/providers/smtp/camel-smtp-transport.c:205
 msgid "Requested action not taken: insufficient system storage"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:206
+#: camel/providers/smtp/camel-smtp-transport.c:207
 msgid "Requested mail action aborted: exceeded storage allocation"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:208
+#: camel/providers/smtp/camel-smtp-transport.c:209
 msgid "Requested action not taken: mailbox name not allowed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:210
+#: camel/providers/smtp/camel-smtp-transport.c:211
 msgid "Start mail input; end with <CRLF>.<CRLF>"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:212
+#: camel/providers/smtp/camel-smtp-transport.c:213
 msgid "Transaction failed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:216
+#: camel/providers/smtp/camel-smtp-transport.c:217
 msgid "A password transition is needed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:218
+#: camel/providers/smtp/camel-smtp-transport.c:219
 msgid "Authentication mechanism is too weak"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:220
+#: camel/providers/smtp/camel-smtp-transport.c:221
 msgid "Encryption required for requested authentication mechanism"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:222
+#: camel/providers/smtp/camel-smtp-transport.c:223
 msgid "Temporary authentication failure"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:224
+#: camel/providers/smtp/camel-smtp-transport.c:225
 msgid "Authentication required"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:298
+#: camel/providers/smtp/camel-smtp-transport.c:299
 msgid "Welcome response error"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:342
-#: camel/providers/smtp/camel-smtp-transport.c:381
+#: camel/providers/smtp/camel-smtp-transport.c:343
+#: camel/providers/smtp/camel-smtp-transport.c:382
 #, c-format
 msgid "Failed to connect to SMTP server %s in secure mode: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:343
+#: camel/providers/smtp/camel-smtp-transport.c:344
 msgid "server does not appear to support SSL"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:357
+#: camel/providers/smtp/camel-smtp-transport.c:358
 #, c-format
 msgid "STARTTLS request timed out: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:372
+#: camel/providers/smtp/camel-smtp-transport.c:373
 msgid "STARTTLS response error"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:475
+#: camel/providers/smtp/camel-smtp-transport.c:476
 #, c-format
 msgid "SMTP server %s does not support requested authentication type %s."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:513
+#: camel/providers/smtp/camel-smtp-transport.c:514
 #, c-format
 msgid "%sPlease enter the SMTP password for %s@%s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:532
+#: camel/providers/smtp/camel-smtp-transport.c:533
 #, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -10190,87 +10019,87 @@ msgid ""
 "\n"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:665
+#: camel/providers/smtp/camel-smtp-transport.c:666
 #, c-format
 msgid "SMTP server %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:667
+#: camel/providers/smtp/camel-smtp-transport.c:668
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:685
+#: camel/providers/smtp/camel-smtp-transport.c:686
 msgid "Cannot send message: sender address not valid."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:690 mail/mail-ops.c:631
+#: camel/providers/smtp/camel-smtp-transport.c:691 mail/mail-ops.c:613
 msgid "Sending message"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:705
+#: camel/providers/smtp/camel-smtp-transport.c:706
 msgid "Cannot send message: no recipients defined."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:714
+#: camel/providers/smtp/camel-smtp-transport.c:715
 msgid "Cannot send message: one or more invalid recipients"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:879
+#: camel/providers/smtp/camel-smtp-transport.c:880
 msgid "SMTP Greeting"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:928
+#: camel/providers/smtp/camel-smtp-transport.c:927
 #, c-format
 msgid "HELO request timed out: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:950
+#: camel/providers/smtp/camel-smtp-transport.c:949
 msgid "HELO response error"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1016
+#: camel/providers/smtp/camel-smtp-transport.c:1015
 msgid "SMTP Authentication"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1022
+#: camel/providers/smtp/camel-smtp-transport.c:1021
 msgid "Error creating SASL authentication object."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1039
-#: camel/providers/smtp/camel-smtp-transport.c:1051
+#: camel/providers/smtp/camel-smtp-transport.c:1038
+#: camel/providers/smtp/camel-smtp-transport.c:1050
 #, c-format
 msgid "AUTH request timed out: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1060
+#: camel/providers/smtp/camel-smtp-transport.c:1059
 msgid "AUTH request failed."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1121
+#: camel/providers/smtp/camel-smtp-transport.c:1120
 msgid "Bad authentication response from server.\n"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1146
+#: camel/providers/smtp/camel-smtp-transport.c:1145
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1166
+#: camel/providers/smtp/camel-smtp-transport.c:1165
 msgid "MAIL FROM response error"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1190
+#: camel/providers/smtp/camel-smtp-transport.c:1189
 #, c-format
 msgid "RCPT TO request timed out: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1212
+#: camel/providers/smtp/camel-smtp-transport.c:1211
 #, c-format
 msgid "RCPT TO <%s> failed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1251
+#: camel/providers/smtp/camel-smtp-transport.c:1250
 #, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr ""
@@ -10278,66 +10107,67 @@ msgstr ""
 #. we should have gotten instructions on how to use the DATA command:
 #. * 354 Enter mail, end with "." on a line by itself
 #.
-#: camel/providers/smtp/camel-smtp-transport.c:1271
+#: camel/providers/smtp/camel-smtp-transport.c:1270
 msgid "DATA response error"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1312
-#: camel/providers/smtp/camel-smtp-transport.c:1335
+#: camel/providers/smtp/camel-smtp-transport.c:1311
+#: camel/providers/smtp/camel-smtp-transport.c:1334
 #, c-format
 msgid "DATA send timed out: message termination: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1355
+#: camel/providers/smtp/camel-smtp-transport.c:1354
 msgid "DATA termination response error"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1378
+#: camel/providers/smtp/camel-smtp-transport.c:1377
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1398
+#: camel/providers/smtp/camel-smtp-transport.c:1397
 msgid "RSET response error"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1421
+#: camel/providers/smtp/camel-smtp-transport.c:1420
 #, c-format
 msgid "QUIT request timed out: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1441
+#: camel/providers/smtp/camel-smtp-transport.c:1440
 msgid "QUIT response error"
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:103
+#: composer/e-msg-composer-attachment-bar.c:102
 #, c-format
 msgid "%.0fK"
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:106
+#: composer/e-msg-composer-attachment-bar.c:105
 #, c-format
 msgid "%.0fM"
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:109
+#: composer/e-msg-composer-attachment-bar.c:108
 #, c-format
 msgid "%.0fG"
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:300
+#. This is a filename. Translators take note.
+#: composer/e-msg-composer-attachment-bar.c:370 mail/mail-display.c:227
 msgid "attachment"
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:445
+#: composer/e-msg-composer-attachment-bar.c:508
 msgid "Remove selected items from the attachment list"
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:475
+#: composer/e-msg-composer-attachment-bar.c:538
 msgid "Add attachment..."
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:476
+#: composer/e-msg-composer-attachment-bar.c:539
 msgid "Attach a file to the message"
 msgstr ""
 
@@ -10370,75 +10200,150 @@ msgstr "የmime ዓይነት"
 msgid "Suggest automatic display of attachment"
 msgstr ""
 
-#: composer/e-msg-composer.c:562
+#: composer/e-msg-composer-hdrs.c:290
+msgid "Hey you, dunce. You need an account to send mail doncha know."
+msgstr ""
+
+#: composer/e-msg-composer-hdrs.c:483
+msgid "Click here for the address book"
+msgstr ""
+
+#.
+#. * Reply-To:
+#. *
+#. * Create this before we call create_from_optionmenu,
+#. * because that causes from_changed to be called, which
+#. * expects the reply_to fields to be initialized.
+#.
+#: composer/e-msg-composer-hdrs.c:514
+msgid "Reply-To:"
+msgstr ""
+
+#.
+#. * From
+#.
+#: composer/e-msg-composer-hdrs.c:520
+msgid "From:"
+msgstr "ከ፦"
+
+#.
+#. * Subject
+#.
+#: composer/e-msg-composer-hdrs.c:526
+msgid "Subject:"
+msgstr "ጉዳዩ፦"
+
+#: composer/e-msg-composer-hdrs.c:535
+msgid "To:"
+msgstr "ወደ፦"
+
+#: composer/e-msg-composer-hdrs.c:536
+msgid "Enter the recipients of the message"
+msgstr ""
+
+#: composer/e-msg-composer-hdrs.c:539
+msgid "Cc:"
+msgstr "Cc፦"
+
+#: composer/e-msg-composer-hdrs.c:540
+msgid "Enter the addresses that will receive a carbon copy of the message"
+msgstr ""
+
+#: composer/e-msg-composer-hdrs.c:543
+msgid "Bcc:"
+msgstr "Bcc፦"
+
+#: composer/e-msg-composer-hdrs.c:544
+msgid ""
+"Enter the addresses that will receive a carbon copy of the message without "
+"appearing in the recipient list of the message."
+msgstr ""
+
+#.
+#. * Post-To
+#.
+#: composer/e-msg-composer-hdrs.c:551
+msgid "Post To:"
+msgstr ""
+
+#: composer/e-msg-composer-hdrs.c:553
+msgid "Posting destination"
+msgstr ""
+
+#: composer/e-msg-composer-select-file.c:102
+#: composer/e-msg-composer-select-file.c:119
+msgid "Attach file(s)"
+msgstr ""
+
+#: composer/e-msg-composer.c:535
 msgid "Could not create a PGP signature context"
 msgstr ""
 
-#: composer/e-msg-composer.c:841
+#: composer/e-msg-composer.c:814
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
 "%s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1206
+#: composer/e-msg-composer.c:1177
 msgid "File exists, overwrite?"
 msgstr ""
 
-#: composer/e-msg-composer.c:1217 composer/e-msg-composer.c:1233
+#: composer/e-msg-composer.c:1195
 #, c-format
 msgid "Error saving file: %s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1256
+#: composer/e-msg-composer.c:1218
 #, c-format
 msgid "Error loading file: %s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1294
+#: composer/e-msg-composer.c:1256
 #, c-format
 msgid "Error accessing file: %s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1302
+#: composer/e-msg-composer.c:1264
 msgid "Unable to retrieve message from editor"
 msgstr ""
 
-#: composer/e-msg-composer.c:1309
+#: composer/e-msg-composer.c:1271
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
 "%s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1316
+#: composer/e-msg-composer.c:1278
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
 "%s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1325
+#: composer/e-msg-composer.c:1287
 #, c-format
 msgid ""
 "Unable to copy file descriptor: %s\n"
 "%s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1334
+#: composer/e-msg-composer.c:1296
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
 " %s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1431
+#: composer/e-msg-composer.c:1390
 msgid ""
 "Ximian Evolution has found unsaved files from a previous session.\n"
 "Would you like to try to recover them?"
 msgstr ""
 
-#: composer/e-msg-composer.c:1594
+#: composer/e-msg-composer.c:1552
 #, c-format
 msgid ""
 "The message \"%s\" has not been sent.\n"
@@ -10446,34 +10351,34 @@ msgid ""
 "Do you wish to save your changes?"
 msgstr ""
 
-#: composer/e-msg-composer.c:1603
+#: composer/e-msg-composer.c:1561
 msgid "Warning: Modified Message"
 msgstr ""
 
-#: composer/e-msg-composer.c:1635
+#: composer/e-msg-composer.c:1593
 msgid "Open file"
 msgstr "ፋይል ክፈት"
 
-#: composer/e-msg-composer.c:2054
+#: composer/e-msg-composer.c:2017
 msgid "Signature:"
 msgstr ""
 
-#: composer/e-msg-composer.c:2094 mail/mail-account-gui.c:1261
+#: composer/e-msg-composer.c:2057 mail/mail-account-gui.c:1261
 msgid "Autogenerated"
 msgstr ""
 
-#: composer/e-msg-composer.c:2274 composer/e-msg-composer.c:2970
-#: composer/e-msg-composer.c:2971
+#: composer/e-msg-composer.c:2233 composer/e-msg-composer.c:2902
+#: composer/e-msg-composer.c:2903
 msgid "Compose a message"
 msgstr ""
 
-#: composer/e-msg-composer.c:3002
+#: composer/e-msg-composer.c:2934
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
 msgstr ""
 
-#: composer/e-msg-composer.c:3030
+#: composer/e-msg-composer.c:2962
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component.\n"
@@ -10481,92 +10386,18 @@ msgid ""
 "of gtkhtml and libgtkhtml installed.\n"
 msgstr ""
 
-#: composer/e-msg-composer.c:3100
+#: composer/e-msg-composer.c:3029
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component."
 msgstr ""
 
-#: composer/e-msg-composer.c:4110
+#: composer/e-msg-composer.c:4045
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)"
 "<b>"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:290
-msgid "You need to configure an account before you can compose mail."
-msgstr ""
-
-#: composer/e-msg-composer-hdrs.c:483
-msgid "Click here for the address book"
-msgstr ""
-
-#.
-#. * Reply-To:
-#. *
-#. * Create this before we call create_from_optionmenu,
-#. * because that causes from_changed to be called, which
-#. * expects the reply_to fields to be initialized.
-#.
-#: composer/e-msg-composer-hdrs.c:514
-msgid "Reply-To:"
-msgstr ""
-
-#.
-#. * From
-#.
-#: composer/e-msg-composer-hdrs.c:520
-msgid "From:"
-msgstr "ከ፦"
-
-#.
-#. * Subject
-#.
-#: composer/e-msg-composer-hdrs.c:526
-msgid "Subject:"
-msgstr "ጉዳዩ፦"
-
-#: composer/e-msg-composer-hdrs.c:535
-msgid "To:"
-msgstr "ወደ፦"
-
-#: composer/e-msg-composer-hdrs.c:536
-msgid "Enter the recipients of the message"
-msgstr ""
-
-#: composer/e-msg-composer-hdrs.c:539
-msgid "Cc:"
-msgstr "Cc፦"
-
-#: composer/e-msg-composer-hdrs.c:540
-msgid "Enter the addresses that will receive a carbon copy of the message"
-msgstr ""
-
-#: composer/e-msg-composer-hdrs.c:543
-msgid "Bcc:"
-msgstr "Bcc፦"
-
-#: composer/e-msg-composer-hdrs.c:544
-msgid ""
-"Enter the addresses that will receive a carbon copy of the message without "
-"appearing in the recipient list of the message."
-msgstr ""
-
-#.
-#. * Post-To
-#.
-#: composer/e-msg-composer-hdrs.c:551
-msgid "Post To:"
-msgstr ""
-
-#: composer/e-msg-composer-hdrs.c:553
-msgid "Posting destination"
-msgstr ""
-
-#: composer/e-msg-composer-select-file.c:119
-msgid "Attach file(s)"
-msgstr ""
-
 #: data/evolution.desktop.in.h:1
 msgid "The Evolution groupware suite"
 msgstr ""
@@ -10721,7 +10552,7 @@ msgid ""
 "Overwrite it?"
 msgstr ""
 
-#: e-util/e-dialog-utils.c:249
+#: e-util/e-dialog-utils.c:249 mail/mail-display.c:200
 msgid "Overwrite file?"
 msgstr ""
 
@@ -10743,209 +10574,90 @@ msgstr ""
 
 #. strptime format of a weekday, a date and a time,
 #. in 12-hour format, without seconds.
-#: e-util/e-time-utils.c:185 e-util/e-time-utils.c:398
+#: e-util/e-time-utils.c:172 e-util/e-time-utils.c:385
 msgid "%a %m/%d/%Y %I:%M %p"
 msgstr "d"
 
 #. strptime format of a weekday, a date and a time,
 #. in 24-hour format, without seconds.
-#: e-util/e-time-utils.c:190 e-util/e-time-utils.c:389
+#: e-util/e-time-utils.c:177 e-util/e-time-utils.c:376
 msgid "%a %m/%d/%Y %H:%M"
 msgstr "d"
 
 #. strptime format of a weekday, a date and a time,
 #. in 12-hour format, without minutes or seconds.
-#: e-util/e-time-utils.c:195
+#: e-util/e-time-utils.c:182
 msgid "%a %m/%d/%Y %I %p"
 msgstr "d"
 
 #. strptime format of a weekday, a date and a time,
 #. in 24-hour format, without minutes or seconds.
-#: e-util/e-time-utils.c:200
+#: e-util/e-time-utils.c:187
 msgid "%a %m/%d/%Y %H"
 msgstr "d"
 
 #. strptime format of a date and a time, in 12-hour format.
-#: e-util/e-time-utils.c:211
+#: e-util/e-time-utils.c:198
 msgid "%m/%d/%Y %I:%M:%S %p"
 msgstr ""
 
 #. strptime format of a date and a time, in 24-hour format.
-#: e-util/e-time-utils.c:215
+#: e-util/e-time-utils.c:202
 msgid "%m/%d/%Y %H:%M:%S"
 msgstr ""
 
 #. strptime format of a date and a time, in 12-hour format,
 #. without seconds.
-#: e-util/e-time-utils.c:220
+#: e-util/e-time-utils.c:207
 msgid "%m/%d/%Y %I:%M %p"
 msgstr "d"
 
 #. strptime format of a date and a time, in 24-hour format,
 #. without seconds.
-#: e-util/e-time-utils.c:225
+#: e-util/e-time-utils.c:212
 msgid "%m/%d/%Y %H:%M"
 msgstr "d"
 
 #. strptime format of a date and a time, in 12-hour format,
 #. without minutes or seconds.
-#: e-util/e-time-utils.c:230
+#: e-util/e-time-utils.c:217
 msgid "%m/%d/%Y %I %p"
 msgstr "d"
 
 #. strptime format of a date and a time, in 24-hour format,
 #. without minutes or seconds.
-#: e-util/e-time-utils.c:235
+#: e-util/e-time-utils.c:222
 msgid "%m/%d/%Y %H"
 msgstr "d"
 
 #. strptime format for a time of day, in 12-hour format.
-#: e-util/e-time-utils.c:339 e-util/e-time-utils.c:438
+#: e-util/e-time-utils.c:326 e-util/e-time-utils.c:425
 msgid "%I:%M:%S %p"
 msgstr "i p,"
 
 #. strptime format for a time of day, in 24-hour format.
-#: e-util/e-time-utils.c:343 e-util/e-time-utils.c:430
+#: e-util/e-time-utils.c:330 e-util/e-time-utils.c:417
 msgid "%H:%M:%S"
 msgstr "%H:%M:%S"
 
 #. strptime format for time of day, without seconds,
 #. in 12-hour format.
-#: e-util/e-time-utils.c:348 e-util/e-time-utils.c:435
-#: widgets/misc/e-dateedit.c:1417 widgets/misc/e-dateedit.c:1642
+#: e-util/e-time-utils.c:335 e-util/e-time-utils.c:422
+#: widgets/misc/e-dateedit.c:1404 widgets/misc/e-dateedit.c:1617
 msgid "%I:%M %p"
 msgstr "i p,"
 
 #. strptime format for time of day, without seconds 24-hour format.
-#: e-util/e-time-utils.c:352 e-util/e-time-utils.c:427
-#: widgets/misc/e-dateedit.c:1414 widgets/misc/e-dateedit.c:1639
+#: e-util/e-time-utils.c:339 e-util/e-time-utils.c:414
+#: widgets/misc/e-dateedit.c:1401 widgets/misc/e-dateedit.c:1614
 msgid "%H:%M"
 msgstr "h"
 
 #. strptime format for hour and AM/PM, 12-hour format.
-#: e-util/e-time-utils.c:356
+#: e-util/e-time-utils.c:343
 msgid "%I %p"
 msgstr "%I %p"
 
-#: executive-summary/component/component-factory.c:151
-msgid "Cannot initialize Evolution's Executive Summary component."
-msgstr ""
-
-#: executive-summary/component/e-summary.c:925
-#, fuzzy, c-format
-msgid ""
-"Cannot open the HTML file:\n"
-"%s"
-msgstr ""
-"ፋይል `%s'ን መክፈት አልቻለም፦\n"
-"%s"
-
-#: executive-summary/component/e-summary.c:939
-#, c-format
-msgid ""
-"Error reading data:\n"
-"%s"
-msgstr ""
-
-#: executive-summary/component/e-summary.c:957
-msgid "File does not have a place for the services.\n"
-msgstr ""
-
-#: executive-summary/component/e-summary-callbacks.c:125
-#, fuzzy
-msgid "Select a service"
-msgstr "ፋይል ምረጡ"
-
-#: executive-summary/component/e-summary-callbacks.c:289
-msgid ""
-"You can select a different HTML page for the background of the Executive "
-"Summary.\n"
-"\n"
-"Just leave it blank for the default"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:69
-#: executive-summary/component/e-summary-url.c:74
-#: executive-summary/component/e-summary-url.c:81
-#, c-format
-msgid "Open %s with the default GNOME application"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:70
-#, c-format
-msgid "Open %s with the default GNOME web browser"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:71
-#, c-format
-msgid "Send an email to %s"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:72
-#, c-format
-msgid "Change the view to %s"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:73
-#, fuzzy, c-format
-msgid "Run %s"
-msgstr "URL፦ %s"
-
-#: executive-summary/component/e-summary-url.c:75
-#, fuzzy, c-format
-msgid "Close %s"
-msgstr "ዝጋ"
-
-#: executive-summary/component/e-summary-url.c:76
-#, c-format
-msgid "Move %s to the left"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:77
-#, c-format
-msgid "Move %s to the right"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:78
-#, c-format
-msgid "Move %s into the previous row"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:79
-#, c-format
-msgid "Move %s into the next row"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:80
-#, fuzzy, c-format
-msgid "Configure %s"
-msgstr "ምርጫዎች"
-
-#: executive-summary/component/e-summary-url.c:553
-#, fuzzy
-msgid "page"
-msgstr "ገጽ"
-
-#: executive-summary/test-service/rdf-summary.c:512
-#: executive-summary/test-service/rdf-summary.c:549
-#: executive-summary/test-service/rdf-summary.c:594
-msgid "Error"
-msgstr "ስህተት"
-
-#: executive-summary/test-service/rdf-summary.c:775
-msgid "Update automatically"
-msgstr ""
-
-#: executive-summary/test-service/rdf-summary.c:785
-#, fuzzy
-msgid "Update now"
-msgstr "አሻሽል"
-
-#: executive-summary/test-service/rdf-summary.c:795
-#, fuzzy
-msgid "Update every "
-msgstr "አሻሽል"
-
 #: filter/filter-datespec.c:65
 #, fuzzy
 msgid "1 second ago"
@@ -11067,6 +10779,82 @@ msgstr ""
 msgid "Select Folder"
 msgstr "ዶሴ ምረጡ"
 
+#: filter/filter-input.c:191
+#, c-format
+msgid ""
+"Error in regular expression '%s':\n"
+"%s"
+msgstr ""
+
+#: filter/filter-label.c:121 filter/libfilter-i18n.h:26 mail/mail-config.c:65
+#: mail/mail-config.glade.h:62 shell/e-config-upgrade.c:1411
+msgid "Important"
+msgstr "አስፈላጊ"
+
+#. red
+#: filter/filter-label.c:122 mail/mail-config.c:66
+#: mail/mail-config.glade.h:129 shell/e-config-upgrade.c:1412
+msgid "Work"
+msgstr "መሥራት"
+
+#. orange
+#: filter/filter-label.c:123 mail/mail-config.c:67 mail/mail-config.glade.h:84
+#: shell/e-config-upgrade.c:1413
+msgid "Personal"
+msgstr "የግል"
+
+#. forest green
+#: filter/filter-label.c:124 mail/mail-config.c:68
+#: mail/mail-config.glade.h:120 shell/e-config-upgrade.c:1414
+msgid "To Do"
+msgstr ""
+
+#. blue
+#: filter/filter-label.c:125 mail/mail-config.c:69 mail/mail-config.glade.h:66
+#: shell/e-config-upgrade.c:1415
+msgid "Later"
+msgstr ""
+
+#: filter/filter-part.c:531 shell/evolution-test-component.c:63
+msgid "Test"
+msgstr "ፈተና"
+
+#: filter/filter-rule.c:219
+msgid "You must name this filter."
+msgstr ""
+
+#: filter/filter-rule.c:751
+msgid "Rule name: "
+msgstr ""
+
+#: filter/filter-rule.c:755
+msgid "Untitled"
+msgstr "ያልተሰየመ"
+
+#: filter/filter-rule.c:772
+msgid "If"
+msgstr ""
+
+#: filter/filter-rule.c:791
+msgid "Execute actions"
+msgstr ""
+
+#: filter/filter-rule.c:795
+msgid "if all criteria are met"
+msgstr ""
+
+#: filter/filter-rule.c:800
+msgid "if any criteria are met"
+msgstr ""
+
+#: filter/filter-rule.c:895
+msgid "incoming"
+msgstr ""
+
+#: filter/filter-rule.c:895
+msgid "outgoing"
+msgstr ""
+
 #: filter/filter.glade.h:1
 msgid "Compare against"
 msgstr ""
@@ -11161,82 +10949,6 @@ msgstr ""
 msgid "years"
 msgstr "ዓመታት"
 
-#: filter/filter-input.c:191
-#, c-format
-msgid ""
-"Error in regular expression '%s':\n"
-"%s"
-msgstr ""
-
-#: filter/filter-label.c:121 filter/libfilter-i18n.h:17 mail/mail-config.c:65
-#: mail/mail-config.glade.h:62 shell/e-config-upgrade.c:1454
-msgid "Important"
-msgstr "አስፈላጊ"
-
-#. red
-#: filter/filter-label.c:122 mail/mail-config.c:66
-#: mail/mail-config.glade.h:129 shell/e-config-upgrade.c:1455
-msgid "Work"
-msgstr "መሥራት"
-
-#. orange
-#: filter/filter-label.c:123 mail/mail-config.c:67 mail/mail-config.glade.h:84
-#: shell/e-config-upgrade.c:1456
-msgid "Personal"
-msgstr "የግል"
-
-#. forest green
-#: filter/filter-label.c:124 mail/mail-config.c:68
-#: mail/mail-config.glade.h:120 shell/e-config-upgrade.c:1457
-msgid "To Do"
-msgstr ""
-
-#. blue
-#: filter/filter-label.c:125 mail/mail-config.c:69 mail/mail-config.glade.h:66
-#: shell/e-config-upgrade.c:1458
-msgid "Later"
-msgstr ""
-
-#: filter/filter-part.c:531 shell/evolution-test-component.c:63
-msgid "Test"
-msgstr "ፈተና"
-
-#: filter/filter-rule.c:219
-msgid "You must name this filter."
-msgstr ""
-
-#: filter/filter-rule.c:751
-msgid "Rule name: "
-msgstr ""
-
-#: filter/filter-rule.c:755
-msgid "Untitled"
-msgstr "ያልተሰየመ"
-
-#: filter/filter-rule.c:772
-msgid "If"
-msgstr ""
-
-#: filter/filter-rule.c:791
-msgid "Execute actions"
-msgstr ""
-
-#: filter/filter-rule.c:795
-msgid "if all criteria are met"
-msgstr ""
-
-#: filter/filter-rule.c:800
-msgid "if any criteria are met"
-msgstr ""
-
-#: filter/filter-rule.c:895
-msgid "incoming"
-msgstr ""
-
-#: filter/filter-rule.c:895
-msgid "outgoing"
-msgstr ""
-
 #. Automatically generated. Do not edit.
 #: filter/libfilter-i18n.h:2
 msgid "Adjust Score"
@@ -11259,217 +10971,217 @@ msgid "Beep"
 msgstr ""
 
 #: filter/libfilter-i18n.h:7
-msgid "Copy to Folder"
+msgid "contains"
 msgstr ""
 
 #: filter/libfilter-i18n.h:8
-msgid "Date received"
+msgid "Copy to Folder"
 msgstr ""
 
 #: filter/libfilter-i18n.h:9
+msgid "Date received"
+msgstr ""
+
+#: filter/libfilter-i18n.h:10
 msgid "Date sent"
 msgstr ""
 
-#: filter/libfilter-i18n.h:11
+#: filter/libfilter-i18n.h:12
 msgid "Deleted"
 msgstr "የጠፋ"
 
-#: filter/libfilter-i18n.h:12
-msgid "Do Not Exist"
-msgstr ""
-
 #: filter/libfilter-i18n.h:13
-msgid "Draft"
-msgstr "ንድፍ"
+msgid "does not contain"
+msgstr ""
 
 #: filter/libfilter-i18n.h:14
-msgid "Exist"
+msgid "does not end with"
 msgstr ""
 
 #: filter/libfilter-i18n.h:15
-msgid "Expression"
+msgid "does not exist"
 msgstr ""
 
 #: filter/libfilter-i18n.h:16
-msgid "Follow Up"
+msgid "does not return"
+msgstr ""
+
+#: filter/libfilter-i18n.h:17
+msgid "does not sound like"
 msgstr ""
 
 #: filter/libfilter-i18n.h:18
-msgid "Label"
-msgstr "መለያ"
+msgid "does not start with"
+msgstr ""
 
 #: filter/libfilter-i18n.h:19
-msgid "Mailing list"
+msgid "Do Not Exist"
 msgstr ""
 
 #: filter/libfilter-i18n.h:20
-msgid "Message Body"
-msgstr ""
+msgid "Draft"
+msgstr "ንድፍ"
 
 #: filter/libfilter-i18n.h:21
-msgid "Message Header"
+msgid "ends with"
 msgstr ""
 
 #: filter/libfilter-i18n.h:22
-msgid "Move to Folder"
+msgid "Exist"
 msgstr ""
 
 #: filter/libfilter-i18n.h:23
-msgid "Pipe Message to Shell Command"
+msgid "exists"
 msgstr ""
 
 #: filter/libfilter-i18n.h:24
-msgid "Play Sound"
-msgstr "ድምፅ አጫውት"
-
-#: filter/libfilter-i18n.h:25 mail/message-tag-followup.c:68
-msgid "Read"
-msgstr "አንብብ"
+msgid "Expression"
+msgstr ""
 
-#: filter/libfilter-i18n.h:26
-msgid "Recipients"
+#: filter/libfilter-i18n.h:25
+msgid "Follow Up"
 msgstr ""
 
 #: filter/libfilter-i18n.h:27
-msgid "Regex Match"
-msgstr ""
+msgid "is"
+msgstr "ነው"
 
 #: filter/libfilter-i18n.h:28
-msgid "Replied to"
+msgid "is after"
 msgstr ""
 
-#: filter/libfilter-i18n.h:29 filter/score-rule.c:184 filter/score-rule.c:186
-#: mail/message-list.etspec.h:10
-msgid "Score"
-msgstr "ነጥብ"
+#: filter/libfilter-i18n.h:29
+msgid "is before"
+msgstr ""
 
 #: filter/libfilter-i18n.h:30
-msgid "Sender"
+msgid "is Flagged"
 msgstr ""
 
 #: filter/libfilter-i18n.h:31
-msgid "Set Status"
+msgid "is greater than"
 msgstr ""
 
 #: filter/libfilter-i18n.h:32
-msgid "Shell Command"
-msgstr "የሼሉን ትእዛዝ"
+msgid "is less than"
+msgstr ""
 
 #: filter/libfilter-i18n.h:33
-msgid "Size (kB)"
-msgstr "መጠን kb"
+msgid "is not"
+msgstr "አይደለም"
 
 #: filter/libfilter-i18n.h:34
-msgid "Source Account"
+msgid "is not Flagged"
 msgstr ""
 
-#: filter/libfilter-i18n.h:35
-msgid "Specific header"
+#: filter/libfilter-i18n.h:35 mail/folder-browser.c:1800
+msgid "Label"
+msgstr "መለያ"
+
+#: filter/libfilter-i18n.h:36
+msgid "Mailing list"
 msgstr ""
 
 #: filter/libfilter-i18n.h:37
-msgid "Stop Processing"
+msgid "Message Body"
 msgstr ""
 
-#: filter/libfilter-i18n.h:38 mail/message-list.etspec.h:13
-#: mail/message-tag-followup.c:305
-msgid "Subject"
-msgstr "ጉዳዩ"
+#: filter/libfilter-i18n.h:38
+msgid "Message Header"
+msgstr ""
 
 #: filter/libfilter-i18n.h:39
-msgid "Unset Status"
+msgid "Move to Folder"
 msgstr ""
 
 #: filter/libfilter-i18n.h:40
-msgid "contains"
+msgid "Pipe Message to Shell Command"
 msgstr ""
 
 #: filter/libfilter-i18n.h:41
-msgid "does not contain"
-msgstr ""
+msgid "Play Sound"
+msgstr "ድምፅ አጫውት"
 
-#: filter/libfilter-i18n.h:42
-msgid "does not end with"
-msgstr ""
+#: filter/libfilter-i18n.h:42 mail/message-tag-followup.c:68
+msgid "Read"
+msgstr "አንብብ"
 
 #: filter/libfilter-i18n.h:43
-msgid "does not exist"
+msgid "Recipients"
 msgstr ""
 
 #: filter/libfilter-i18n.h:44
-msgid "does not return"
+msgid "Regex Match"
 msgstr ""
 
 #: filter/libfilter-i18n.h:45
-msgid "does not sound like"
+msgid "Replied to"
 msgstr ""
 
 #: filter/libfilter-i18n.h:46
-msgid "does not start with"
+msgid "returns"
 msgstr ""
 
 #: filter/libfilter-i18n.h:47
-msgid "ends with"
+msgid "returns greater than"
 msgstr ""
 
 #: filter/libfilter-i18n.h:48
-msgid "exists"
+msgid "returns less than"
 msgstr ""
 
-#: filter/libfilter-i18n.h:49
-msgid "is Flagged"
-msgstr ""
+#: filter/libfilter-i18n.h:49 filter/score-rule.c:184 filter/score-rule.c:186
+#: mail/message-list.etspec.h:10
+msgid "Score"
+msgstr "ነጥብ"
 
-#: filter/libfilter-i18n.h:50
-msgid "is after"
+#: filter/libfilter-i18n.h:50 mail/mail-callbacks.c:1820
+msgid "Sender"
 msgstr ""
 
 #: filter/libfilter-i18n.h:51
-msgid "is before"
+msgid "Set Status"
 msgstr ""
 
 #: filter/libfilter-i18n.h:52
-msgid "is greater than"
-msgstr ""
+msgid "Shell Command"
+msgstr "የሼሉን ትእዛዝ"
 
 #: filter/libfilter-i18n.h:53
-msgid "is less than"
-msgstr ""
+msgid "Size (kB)"
+msgstr "መጠን kb"
 
 #: filter/libfilter-i18n.h:54
-msgid "is not Flagged"
+msgid "sounds like"
 msgstr ""
 
 #: filter/libfilter-i18n.h:55
-msgid "is not"
-msgstr "አይደለም"
+msgid "Source Account"
+msgstr ""
 
 #: filter/libfilter-i18n.h:56
-msgid "is"
-msgstr "ነው"
-
-#: filter/libfilter-i18n.h:57
-msgid "returns greater than"
+msgid "Specific header"
 msgstr ""
 
-#: filter/libfilter-i18n.h:58
-msgid "returns less than"
+#: filter/libfilter-i18n.h:57
+msgid "starts with"
 msgstr ""
 
 #: filter/libfilter-i18n.h:59
-msgid "returns"
+msgid "Stop Processing"
 msgstr ""
 
-#: filter/libfilter-i18n.h:60
-msgid "sounds like"
-msgstr ""
+#: filter/libfilter-i18n.h:60 mail/mail-format.c:934
+#: mail/message-list.etspec.h:13 mail/message-tag-followup.c:305
+msgid "Subject"
+msgstr "ጉዳዩ"
 
 #: filter/libfilter-i18n.h:61
-msgid "starts with"
+msgid "Unset Status"
 msgstr ""
 
-#: filter/rule-context.c:684 filter/rule-editor.c:241 filter/rule-editor.c:326
-#: mail/mail-vfolder.c:916
+#: filter/rule-context.c:664 filter/rule-editor.c:241 filter/rule-editor.c:326
+#: mail/mail-vfolder.c:917
 #, c-format
 msgid "Rule name '%s' is not unique, choose another."
 msgstr ""
@@ -11537,9 +11249,10 @@ msgid "Scanning %s"
 msgstr ""
 
 #: importers/elm-importer.c:525 importers/netscape-importer.c:2128
-#: importers/pine-importer.c:637 mail/component-factory.c:116
-#: mail/importers/elm-importer.c:526 mail/importers/netscape-importer.c:2085
-#: mail/importers/pine-importer.c:572 my-evolution/my-evolution.glade.h:4
+#: importers/pine-importer.c:637 mail/component-factory.c:117
+#: mail/folder-browser-ui.c:360 mail/importers/elm-importer.c:526
+#: mail/importers/netscape-importer.c:2085 mail/importers/pine-importer.c:572
+#: my-evolution/my-evolution.glade.h:4
 msgid "Mail"
 msgstr "ፖስታ"
 
@@ -11602,7 +11315,7 @@ msgstr ""
 
 #. Fill in the new fields
 #: importers/netscape-importer.c:1872 mail/importers/netscape-importer.c:1842
-#: mail/mail-ops.c:1106 shell/e-local-storage.c:184
+#: mail/mail-ops.c:1092 shell/e-local-storage.c:184
 msgid "Trash"
 msgstr "የማይፈለግ"
 
@@ -11616,7 +11329,7 @@ msgid "Scanning directory"
 msgstr ""
 
 #: importers/netscape-importer.c:2047 mail/importers/netscape-importer.c:2015
-#: shell/e-shell-startup-wizard.c:556
+#: shell/e-shell-startup-wizard.c:541
 msgid "Starting import"
 msgstr ""
 
@@ -11648,143 +11361,328 @@ msgstr ""
 msgid "Pine"
 msgstr ""
 
-#: mail/component-factory.c:116
-msgid "Folder containing mail"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:1
+msgid "Composer Preferences"
+msgstr ""
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:2
+msgid ""
+"Configure mail preferences, including security and message display, here"
+msgstr ""
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:3
+msgid "Configure spell-checking, signatures, and the message composer here"
+msgstr ""
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:4
+msgid "Configure your email accounts here"
+msgstr ""
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:5
+msgid "Evolution Mail"
+msgstr ""
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:6
+msgid "Evolution Mail accounts configuration control"
+msgstr ""
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:7
+msgid "Evolution Mail component"
+msgstr ""
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:8
+msgid "Evolution Mail composer"
+msgstr ""
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:9
+msgid "Evolution Mail composer configuration control"
+msgstr ""
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:10
+msgid "Evolution Mail configuration interface"
+msgstr ""
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:11
+msgid "Evolution Mail folder viewer"
+msgstr ""
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:12
+msgid "Evolution Mail preferences control"
+msgstr ""
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:13
+msgid "Mail Accounts"
+msgstr ""
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:69
+msgid "Mail Preferences"
 msgstr ""
 
 #: mail/component-factory.c:117
+msgid "Folder containing mail"
+msgstr ""
+
+#: mail/component-factory.c:118
 msgid "Public Mail"
 msgstr ""
 
-#: mail/component-factory.c:117
+#: mail/component-factory.c:118
 msgid "Public folder containing mail"
 msgstr ""
 
-#: mail/component-factory.c:118
+#: mail/component-factory.c:119
 msgid "Virtual Trash"
 msgstr ""
 
-#: mail/component-factory.c:118
+#: mail/component-factory.c:119
 msgid "Virtual Trash folder"
 msgstr ""
 
-#: mail/component-factory.c:146
+#: mail/component-factory.c:147
 msgid "This folder cannot contain messages."
 msgstr ""
 
-#: mail/component-factory.c:444
+#: mail/component-factory.c:441
 msgid "Properties..."
 msgstr "ምርጫዎች..."
 
-#: mail/component-factory.c:444
+#: mail/component-factory.c:441
 msgid "Change this folder's properties"
 msgstr ""
 
-#: mail/component-factory.c:826
+#: mail/component-factory.c:819
 msgid ""
 "Some of your mail settings seem corrupt, please check that everything is in "
 "order."
 msgstr ""
 
-#: mail/component-factory.c:1008
+#: mail/component-factory.c:1000
 msgid "You have not set a mail transport method"
 msgstr ""
 
-#: mail/component-factory.c:1031
+#: mail/component-factory.c:1023
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr ""
 
-#: mail/component-factory.c:1071
+#: mail/component-factory.c:1063
 msgid "New Mail Message"
 msgstr ""
 
-#: mail/component-factory.c:1071
+#: mail/component-factory.c:1063
 msgid "_Mail Message"
 msgstr ""
 
-#: mail/component-factory.c:1072
+#: mail/component-factory.c:1064
 msgid "Compose a new mail message"
 msgstr ""
 
-#: mail/component-factory.c:1080
+#: mail/component-factory.c:1072
 msgid "New Message Post"
 msgstr ""
 
-#: mail/component-factory.c:1080
+#: mail/component-factory.c:1072
 msgid "_Post Message"
 msgstr ""
 
-#: mail/component-factory.c:1081
+#: mail/component-factory.c:1073
 msgid "Post a new mail message"
 msgstr ""
 
-#: mail/component-factory.c:1373
+#: mail/component-factory.c:1365
 msgid "Connecting..."
 msgstr ""
 
-#: mail/component-factory.c:1384
+#: mail/component-factory.c:1376
 msgid "Cannot register storage with shell"
 msgstr ""
 
-#: mail/folder-info.c:70
-msgid "Getting Folder Information"
+#: mail/folder-browser-ui.c:486
+#, c-format
+msgid "Properties for \"%s\""
+msgstr "ለ \"%s\"ን ምርጫዎች"
+
+#: mail/folder-browser-ui.c:488
+msgid "Properties"
+msgstr "ምርጫዎች"
+
+#: mail/folder-browser.c:327 mail/mail-display.c:394 mail/mail-display.c:942
+#, c-format
+msgid "Could not create temporary directory: %s"
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:1
-msgid "Composer Preferences"
+#: mail/folder-browser.c:782
+#, c-format
+msgid "%d new"
+msgstr "%d አዲስ"
+
+#: mail/folder-browser.c:785 mail/folder-browser.c:793
+#: mail/folder-browser.c:796
+msgid ", "
+msgstr "፣ "
+
+#: mail/folder-browser.c:787
+#, c-format
+msgid "%d hidden"
+msgstr "%d የተደበቀ"
+
+#: mail/folder-browser.c:789
+#, c-format
+msgid "%d visible"
+msgstr "%d የሚታይ"
+
+#: mail/folder-browser.c:794
+#, c-format
+msgid "%d selected"
+msgstr "%d ተመርጠዋል"
+
+#: mail/folder-browser.c:799
+#, c-format
+msgid "%d unsent"
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:2
-msgid ""
-"Configure mail preferences, including security and message display, here"
+#: mail/folder-browser.c:801
+#, c-format
+msgid "%d sent"
+msgstr "%d ተልኳል"
+
+#: mail/folder-browser.c:803
+#, c-format
+msgid "%d total"
+msgstr "%d አጠቃላይ"
+
+#: mail/folder-browser.c:1182
+msgid "Create _Virtual Folder From Search..."
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:3
-msgid "Configure spell-checking, signatures, and the message composer here"
+#: mail/folder-browser.c:1736
+msgid "VFolder on _Subject"
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:4
-msgid "Configure your email accounts here"
+#: mail/folder-browser.c:1737
+msgid "VFolder on Se_nder"
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:5
-msgid "Evolution Mail"
+#: mail/folder-browser.c:1738
+msgid "VFolder on _Recipients"
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:6
-msgid "Evolution Mail accounts configuration control"
+#: mail/folder-browser.c:1739
+msgid "VFolder on Mailing _List"
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:7
-msgid "Evolution Mail component"
+#: mail/folder-browser.c:1743
+msgid "Filter on Sub_ject"
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:8
-msgid "Evolution Mail composer"
+#: mail/folder-browser.c:1744
+msgid "Filter on Sen_der"
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:9
-msgid "Evolution Mail composer configuration control"
+#: mail/folder-browser.c:1745
+msgid "Filter on Re_cipients"
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:10
-msgid "Evolution Mail configuration interface"
+#: mail/folder-browser.c:1746 mail/folder-browser.c:2070
+msgid "Filter on _Mailing List"
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:11
-msgid "Evolution Mail folder viewer"
+#: mail/folder-browser.c:1764
+msgid "_Edit as New Message..."
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:12
-msgid "Evolution Mail preferences control"
+#: mail/folder-browser.c:1766
+msgid "_Print"
+msgstr "አትም"
+
+#: mail/folder-browser.c:1770 ui/evolution-mail-message.xml.h:110
+msgid "_Reply to Sender"
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:13
-msgid "Mail Accounts"
+#: mail/folder-browser.c:1771 ui/evolution-mail-message.xml.h:75
+msgid "Reply to _List"
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:69
-msgid "Mail Preferences"
+#: mail/folder-browser.c:1772 ui/evolution-mail-message.xml.h:74
+msgid "Reply to _All"
+msgstr ""
+
+#: mail/folder-browser.c:1773
+msgid "_Forward"
+msgstr "ወደፊት፦"
+
+#: mail/folder-browser.c:1777
+msgid "Follo_w Up..."
+msgstr ""
+
+#: mail/folder-browser.c:1778
+msgid "Fla_g Completed"
+msgstr ""
+
+#: mail/folder-browser.c:1779
+msgid "Cl_ear Flag"
+msgstr ""
+
+#. separator here?
+#: mail/folder-browser.c:1783 ui/evolution-mail-message.xml.h:43
+msgid "Mar_k as Read"
+msgstr ""
+
+#: mail/folder-browser.c:1784
+msgid "Mark as _Unread"
+msgstr ""
+
+#: mail/folder-browser.c:1785
+msgid "Mark as _Important"
+msgstr ""
+
+#: mail/folder-browser.c:1786
+msgid "_Mark as Unimportant"
+msgstr ""
+
+#: mail/folder-browser.c:1791
+msgid "U_ndelete"
+msgstr "አታጥፋ"
+
+#: mail/folder-browser.c:1795
+msgid "Mo_ve to Folder..."
+msgstr ""
+
+#: mail/folder-browser.c:1796 ui/evolution-addressbook.xml.h:31
+msgid "_Copy to Folder..."
+msgstr ""
+
+#: mail/folder-browser.c:1804
+msgid "Add Sender to Address_book"
+msgstr ""
+
+#: mail/folder-browser.c:1808
+msgid "Appl_y Filters"
+msgstr ""
+
+#: mail/folder-browser.c:1812
+msgid "Crea_te Rule From Message"
+msgstr ""
+
+#: mail/folder-browser.c:2071
+msgid "VFolder on M_ailing List"
+msgstr ""
+
+#: mail/folder-browser.c:2073
+#, c-format
+msgid "Filter on _Mailing List (%s)"
+msgstr ""
+
+#: mail/folder-browser.c:2074
+#, c-format
+msgid "VFolder on M_ailing List (%s)"
+msgstr ""
+
+#: mail/folder-browser.h:26 mail/mail-config.glade.h:39
+msgid "Default"
+msgstr "የነበረው"
+
+#: mail/folder-info.c:70
+msgid "Getting Folder Information"
 msgstr ""
 
 #: mail/importers/GNOME_Evolution_Mail_Elm_Intelligent_Importer.server.in.in.h:1
@@ -11867,7 +11765,7 @@ msgstr "የተጠቃሚ ስም"
 msgid "_Path:"
 msgstr "መተላለፊያ"
 
-#: mail/mail-account-gui.c:1886
+#: mail/mail-account-gui.c:1887
 msgid "You may not create two accounts with the same name."
 msgstr ""
 
@@ -11898,16 +11796,16 @@ msgstr "የነበረው"
 
 #. FIXME: This routine should just be a "toggled" event handler on the checkbox cell renderer which
 #. has "activatable" set.
-#: mail/mail-accounts.c:481 mail/mail-composer-prefs.c:708
-#: mail/mail-composer-prefs.c:854
+#: mail/mail-accounts.c:481 mail/mail-accounts.etspec.h:2
+#: mail/mail-composer-prefs.c:708 mail/mail-composer-prefs.c:854
 msgid "Enabled"
 msgstr "ያስችላል"
 
-#: mail/mail-accounts.c:487
+#: mail/mail-accounts.c:487 mail/mail-accounts.etspec.h:1
 msgid "Account name"
 msgstr ""
 
-#: mail/mail-accounts.c:489
+#: mail/mail-accounts.c:489 mail/mail-accounts.etspec.h:3
 msgid "Protocol"
 msgstr ""
 
@@ -11947,6 +11845,182 @@ msgid ""
 "And have been updated."
 msgstr ""
 
+#. Add the "Don't show this message again." checkbox
+#: mail/mail-callbacks.c:101 widgets/misc/e-messagebox.c:226
+msgid "Don't show this message again."
+msgstr ""
+
+#: mail/mail-callbacks.c:190
+msgid ""
+"You have not configured the mail client.\n"
+"You need to do this before you can send,\n"
+"receive or compose mail.\n"
+"Would you like to configure it now?"
+msgstr ""
+
+#: mail/mail-callbacks.c:212
+msgid ""
+"You need to configure an account\n"
+"before you can compose mail."
+msgstr ""
+
+#: mail/mail-callbacks.c:226
+msgid ""
+"You need to configure an identity\n"
+"before you can compose mail."
+msgstr ""
+
+#: mail/mail-callbacks.c:233
+msgid ""
+"You need to configure a mail transport\n"
+"before you can compose mail."
+msgstr ""
+
+#. FIXME: this wording sucks
+#: mail/mail-callbacks.c:255
+msgid ""
+"You are sending an HTML-formatted message. Please make sure that\n"
+"the following recipients are willing and able to receive HTML mail:\n"
+msgstr ""
+
+#: mail/mail-callbacks.c:267
+msgid "Send anyway?"
+msgstr ""
+
+#: mail/mail-callbacks.c:288
+msgid ""
+"This message has no subject.\n"
+"Really send?"
+msgstr ""
+
+#: mail/mail-callbacks.c:314
+msgid ""
+"Since the contact list you are sending to is configured to hide the list's "
+"addresses, this message will contain only Bcc recipients."
+msgstr ""
+
+#: mail/mail-callbacks.c:318
+msgid "This message contains only Bcc recipients."
+msgstr ""
+
+#: mail/mail-callbacks.c:323
+msgid ""
+"It is possible that the mail server may reveal the recipients by adding an "
+"Apparently-To header.\n"
+"Send anyway?"
+msgstr ""
+
+#: mail/mail-callbacks.c:472
+msgid "You must specify recipients in order to send this message."
+msgstr ""
+
+#: mail/mail-callbacks.c:724
+msgid ""
+"Unable to open the drafts folder for this account.\n"
+"Would you like to use the default drafts folder?"
+msgstr ""
+
+#: mail/mail-callbacks.c:1189
+msgid "an unknown sender"
+msgstr ""
+
+#: mail/mail-callbacks.c:1193
+msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
+msgstr ""
+
+#: mail/mail-callbacks.c:1700 mail/message-browser.c:132
+msgid "Move message(s) to"
+msgstr ""
+
+#: mail/mail-callbacks.c:1702 mail/message-browser.c:134
+msgid "Copy message(s) to"
+msgstr ""
+
+#: mail/mail-callbacks.c:2344
+#, c-format
+msgid "Are you sure you want to edit all %d messages?"
+msgstr ""
+
+#: mail/mail-callbacks.c:2360
+msgid ""
+"You may only edit messages saved\n"
+"in the Drafts folder."
+msgstr ""
+
+#: mail/mail-callbacks.c:2393
+msgid ""
+"You may only resend messages\n"
+"in the Sent folder."
+msgstr ""
+
+#: mail/mail-callbacks.c:2403
+#, c-format
+msgid "Are you sure you want to resend all %d messages?"
+msgstr ""
+
+#: mail/mail-callbacks.c:2424
+msgid "No Message Selected"
+msgstr ""
+
+#: mail/mail-callbacks.c:2465
+#, c-format
+msgid ""
+"Cannot save to `%s'\n"
+" %s"
+msgstr ""
+
+#: mail/mail-callbacks.c:2470
+#, c-format
+msgid ""
+"`%s' already exists.\n"
+"Overwrite it?"
+msgstr ""
+
+#: mail/mail-callbacks.c:2511
+msgid "Save Message As..."
+msgstr ""
+
+#: mail/mail-callbacks.c:2513
+msgid "Save Messages As..."
+msgstr ""
+
+#: mail/mail-callbacks.c:2686
+msgid ""
+"This operation will permanently erase all messages marked as\n"
+"deleted. If you continue, you will not be able to recover these messages.\n"
+"\n"
+"Really erase these messages?"
+msgstr ""
+
+#: mail/mail-callbacks.c:2781
+#, c-format
+msgid ""
+"Error loading filter information:\n"
+"%s"
+msgstr ""
+
+#: mail/mail-callbacks.c:2789
+msgid "Filters"
+msgstr "አጣራዎች"
+
+#: mail/mail-callbacks.c:2830
+#, c-format
+msgid "Page %d of %d"
+msgstr ""
+
+#: mail/mail-callbacks.c:2886
+msgid "Print Message"
+msgstr ""
+
+#: mail/mail-callbacks.c:2954
+msgid "Printing of message failed"
+msgstr ""
+
+#: mail/mail-callbacks.c:3147
+#, c-format
+msgid "Are you sure you want to open all %d messages in separate windows?"
+msgstr ""
+
 #: mail/mail-composer-prefs.c:226 mail/mail-composer-prefs.c:349
 #: mail/mail-config.c:1376
 msgid "Unnamed"
@@ -11972,55 +12046,47 @@ msgstr ""
 msgid "Signature(s)"
 msgstr ""
 
-#: mail/mail-config.c:1080
-msgid "Checking Service"
-msgstr ""
-
-#: mail/mail-config.c:1158 mail/mail-config.c:1162
-msgid "Connecting to server..."
-msgstr ""
-
-#: mail/mail-config-druid.c:367 mail/mail-config.glade.h:61
+#: mail/mail-config-druid.c:380 mail/mail-config.glade.h:61
 msgid "Identity"
 msgstr ""
 
-#: mail/mail-config-druid.c:369
+#: mail/mail-config-druid.c:382
 msgid ""
 "Please enter your name and email address below. The \"optional\" fields "
 "below do not need to be filled in, unless you wish to include this "
 "information in email you send."
 msgstr ""
 
-#: mail/mail-config-druid.c:375 mail/mail-config-druid.c:382
+#: mail/mail-config-druid.c:388 mail/mail-config-druid.c:395
 msgid "Receiving Mail"
 msgstr ""
 
-#: mail/mail-config-druid.c:377
+#: mail/mail-config-druid.c:390
 msgid ""
 "Please enter information about your incoming mail server below. If you are "
 "not sure, ask your system administrator or Internet Service Provider."
 msgstr ""
 
-#: mail/mail-config-druid.c:384
+#: mail/mail-config-druid.c:397
 msgid "Please select among the following options"
 msgstr ""
 
-#: mail/mail-config-druid.c:387
+#: mail/mail-config-druid.c:400
 #, fuzzy
 msgid "Sending Mail"
 msgstr "ሴኔጋል"
 
-#: mail/mail-config-druid.c:389
+#: mail/mail-config-druid.c:402
 msgid ""
 "Please enter information about the way you will send mail. If you are not "
 "sure, ask your system administrator or Internet Service Provider."
 msgstr ""
 
-#: mail/mail-config-druid.c:394 mail/mail-config.glade.h:10
+#: mail/mail-config-druid.c:407 mail/mail-config.glade.h:10
 msgid "Account Management"
 msgstr ""
 
-#: mail/mail-config-druid.c:396
+#: mail/mail-config-druid.c:409
 msgid ""
 "You are almost done with the mail configuration process. The identity, "
 "incoming mail server and outgoing mail transport method which you provided "
@@ -12029,6 +12095,14 @@ msgid ""
 "purposes only."
 msgstr ""
 
+#: mail/mail-config.c:1080
+msgid "Checking Service"
+msgstr ""
+
+#: mail/mail-config.c:1158 mail/mail-config.c:1162
+msgid "Connecting to server..."
+msgstr ""
+
 #: mail/mail-config.glade.h:3
 msgid " _Check for supported types "
 msgstr ""
@@ -12143,10 +12217,6 @@ msgstr ""
 msgid "De_fault"
 msgstr "የነበረው (_F)"
 
-#: mail/mail-config.glade.h:39
-msgid "Default"
-msgstr "የነበረው"
-
 #: mail/mail-config.glade.h:40
 msgid "Default Behavior"
 msgstr ""
@@ -12581,293 +12651,495 @@ msgstr ""
 msgid "_Use the same fonts as other applications"
 msgstr ""
 
+#: mail/mail-config.glade.h:171
+msgid "color"
+msgstr "ቀለም"
+
 #: mail/mail-config.glade.h:172
 msgid "description"
 msgstr "መግለጫ"
 
-#: mail/mail-folder-cache.c:832
+#: mail/mail-crypto.c:84
+msgid "Could not create a S/MIME signature context."
+msgstr ""
+
+#: mail/mail-crypto.c:116
+msgid "Could not create a S/MIME certsonly context."
+msgstr ""
+
+#: mail/mail-crypto.c:148
+msgid "Could not create a S/MIME encryption context."
+msgstr ""
+
+#: mail/mail-crypto.c:180
+msgid "Could not create a S/MIME envelope context."
+msgstr ""
+
+#: mail/mail-crypto.c:211
+msgid "Could not create a S/MIME decode context."
+msgstr ""
+
+#: mail/mail-display.c:197
+#, c-format
+msgid ""
+"File `%s' already exists.\n"
+"Overwrite it?"
+msgstr ""
+
+#: mail/mail-display.c:336
+msgid "Save Attachment"
+msgstr ""
+
+#: mail/mail-display.c:409
+#, c-format
+msgid "Could not create temporary file '%s': %s"
+msgstr ""
+
+#: mail/mail-display.c:457
+msgid "Save Attachment..."
+msgstr ""
+
+#: mail/mail-display.c:458
+msgid "View Inline"
+msgstr ""
+
+#: mail/mail-display.c:459
+#, c-format
+msgid "Open in %s..."
+msgstr ""
+
+#: mail/mail-display.c:515
+#, c-format
+msgid "View Inline (via %s)"
+msgstr ""
+
+#: mail/mail-display.c:519
+msgid "Hide"
+msgstr "ደብቅ"
+
+#: mail/mail-display.c:539
+msgid "External Viewer"
+msgstr ""
+
+#: mail/mail-display.c:1368
+msgid "Downloading images"
+msgstr ""
+
+#: mail/mail-display.c:1545
+msgid "Loading message content"
+msgstr ""
+
+#: mail/mail-display.c:1887
+msgid "Overdue:"
+msgstr ""
+
+#: mail/mail-display.c:1891
+msgid "by %B %d, %Y, %l:%M %P"
+msgstr ""
+
+#: mail/mail-display.c:2255
+msgid "Open Link in Browser"
+msgstr ""
+
+#: mail/mail-display.c:2256
+msgid "Copy Link Location"
+msgstr "አያያዝ ቦታ ቅጂ"
+
+#: mail/mail-display.c:2258
+msgid "Save Link as (FIXME)"
+msgstr ""
+
+#: mail/mail-display.c:2260
+msgid "Save Image as..."
+msgstr "ምስሉን በሌላ ስም አስቀምጥ"
+
+#: mail/mail-folder-cache.c:745
 #, c-format
 msgid "Pinging %s"
 msgstr ""
 
+#: mail/mail-format.c:665
+#, c-format
+msgid "%s attachment"
+msgstr ""
+
+#: mail/mail-format.c:707 mail/mail-format.c:1370 mail/mail-format.c:1439
+#: mail/mail-format.c:1559 mail/mail-format.c:1683 mail/mail-format.c:1708
+msgid "Could not parse MIME message. Displaying as source."
+msgstr ""
+
+#: mail/mail-format.c:785 mail/message-list.etspec.h:2
+msgid "Date"
+msgstr "ቀን"
+
+#: mail/mail-format.c:871
+msgid "Bad Address"
+msgstr ""
+
+#: mail/mail-format.c:912 mail/message-list.etspec.h:7
+#: mail/message-tag-followup.c:301
+msgid "From"
+msgstr "ከ"
+
+#: mail/mail-format.c:916
+msgid "Reply-To"
+msgstr ""
+
+#: mail/mail-format.c:921 mail/message-list.etspec.h:14
+msgid "To"
+msgstr "ወደ"
+
+#: mail/mail-format.c:926
+msgid "Cc"
+msgstr "Cc"
+
+#: mail/mail-format.c:931
+msgid "Bcc"
+msgstr "Bcc"
+
+#: mail/mail-format.c:1482
+msgid ""
+"This message is digitally signed. Click the lock icon for more information."
+msgstr ""
+
+#: mail/mail-format.c:1510
+msgid "Could not create a PGP verfication context"
+msgstr ""
+
+#: mail/mail-format.c:1518
+msgid "This message is digitally signed and has been found to be authentic."
+msgstr ""
+
+#: mail/mail-format.c:1525
+msgid "This message is digitally signed but can not be proven to be authentic."
+msgstr ""
+
+#: mail/mail-format.c:1789
+#, c-format
+msgid "Pointer to FTP site (%s)"
+msgstr ""
+
+#: mail/mail-format.c:1800
+#, c-format
+msgid "Pointer to local file (%s) valid at site \"%s\""
+msgstr ""
+
+#: mail/mail-format.c:1803
+#, c-format
+msgid "Pointer to local file (%s)"
+msgstr ""
+
+#: mail/mail-format.c:1830
+#, c-format
+msgid "Pointer to remote data (%s)"
+msgstr ""
+
+#: mail/mail-format.c:1836
+#, c-format
+msgid "Pointer to unknown external data (\"%s\" type)"
+msgstr ""
+
+#: mail/mail-format.c:1838
+msgid "Malformed external-body part."
+msgstr ""
+
 #: mail/mail-local.c:541 mail/mail-local.c:543
 #, c-format
 msgid "Local folders/%s"
 msgstr ""
 
-#: mail/mail-local.c:711
+#: mail/mail-local.c:671
 msgid "Reconfiguring folder"
 msgstr ""
 
-#: mail/mail-local.c:792
+#: mail/mail-local.c:752
 #, c-format
 msgid ""
 "Cannot save folder metainfo; you may find you can't\n"
 "open this folder anymore: %s: %s"
 msgstr ""
 
-#: mail/mail-local.c:848
+#: mail/mail-local.c:808
 #, c-format
 msgid "Cannot save folder metainfo to %s: %s"
 msgstr ""
 
-#: mail/mail-local.c:900
+#: mail/mail-local.c:860
 #, c-format
 msgid "Cannot delete folder metadata %s: %s"
 msgstr ""
 
-#: mail/mail-local.c:1363
+#: mail/mail-local.c:1323
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr ""
 
-#: mail/mail-local.c:1388
+#: mail/mail-local.c:1348
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
 msgstr ""
 
-#: mail/mail-local.c:1488
+#: mail/mail-local.c:1448
 #, c-format
 msgid "Reconfigure /%s"
 msgstr ""
 
-#: mail/mail-local.c:1552
+#: mail/mail-local.c:1512
 msgid "You cannot change the format of a non-local folder."
 msgstr ""
 
-#: mail/mail-mt.c:259
+#: mail/mail-mt.c:257
 #, c-format
 msgid ""
 "Error while '%s':\n"
 "%s"
 msgstr ""
 
-#: mail/mail-mt.c:262
+#: mail/mail-mt.c:260
 #, c-format
 msgid ""
 "Error while performing operation:\n"
 "%s"
 msgstr ""
 
-#: mail/mail-mt.c:913
+#: mail/mail-mt.c:904
 msgid "Working"
 msgstr ""
 
-#: mail/mail-ops.c:87
+#: mail/mail-ops.c:86
 msgid "Filtering Folder"
 msgstr ""
 
-#: mail/mail-ops.c:260
+#: mail/mail-ops.c:264
 msgid "Fetching Mail"
 msgstr ""
 
-#: mail/mail-ops.c:557
-#, c-format
-msgid "Failed to apply outgoing filters: %s"
-msgstr ""
-
-#: mail/mail-ops.c:578
-#, c-format
-msgid ""
-"Failed to append to %s: %s\n"
-"Appending to local `Sent' folder instead."
+#: mail/mail-ops.c:550 mail/mail-ops.c:579
+msgid "However, the message was successfully sent."
 msgstr ""
 
-#: mail/mail-ops.c:587
-#, c-format
-msgid "Failed to append to local `Sent' folder: %s"
-msgstr ""
-
-#: mail/mail-ops.c:629
+#: mail/mail-ops.c:611
 #, c-format
 msgid "Sending \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:747
+#: mail/mail-ops.c:729
 #, c-format
 msgid "Sending message %d of %d"
 msgstr ""
 
-#: mail/mail-ops.c:766
+#: mail/mail-ops.c:748
 #, c-format
 msgid "Failed on message %d of %d"
 msgstr ""
 
-#: mail/mail-ops.c:768
+#: mail/mail-ops.c:750 mail/mail-send-recv.c:581
 msgid "Complete."
 msgstr ""
 
-#: mail/mail-ops.c:862
+#: mail/mail-ops.c:844
 msgid "Saving message to folder"
 msgstr ""
 
-#: mail/mail-ops.c:943
+#: mail/mail-ops.c:925
 #, c-format
 msgid "Moving messages to %s"
 msgstr ""
 
-#: mail/mail-ops.c:943
+#: mail/mail-ops.c:925
 #, c-format
 msgid "Copying messages to %s"
 msgstr ""
 
-#: mail/mail-ops.c:1056
+#: mail/mail-ops.c:1042
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:1244
+#: mail/mail-ops.c:1225
 msgid "Forwarded messages"
 msgstr ""
 
-#: mail/mail-ops.c:1287
+#: mail/mail-ops.c:1268
 #, c-format
 msgid "Opening folder %s"
 msgstr ""
 
-#: mail/mail-ops.c:1359
+#: mail/mail-ops.c:1340
 #, c-format
 msgid "Opening store %s"
 msgstr ""
 
-#: mail/mail-ops.c:1437
+#: mail/mail-ops.c:1413
 #, c-format
 msgid "Removing folder %s"
 msgstr ""
 
-#: mail/mail-ops.c:1531
+#: mail/mail-ops.c:1507
 #, c-format
 msgid "Storing folder '%s'"
 msgstr ""
 
-#: mail/mail-ops.c:1582
+#: mail/mail-ops.c:1558
 msgid "Refreshing folder"
 msgstr ""
 
-#: mail/mail-ops.c:1618 mail/mail-ops.c:1669
+#: mail/mail-ops.c:1594 mail/mail-ops.c:1645
 msgid "Expunging folder"
 msgstr ""
 
-#: mail/mail-ops.c:1666
+#: mail/mail-ops.c:1642
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr ""
 
-#: mail/mail-ops.c:1667 my-evolution/e-summary-mail.c:483
+#: mail/mail-ops.c:1643 my-evolution/e-summary-mail.c:483
 #: shell/e-local-storage.c:1151
 msgid "Local Folders"
 msgstr ""
 
-#: mail/mail-ops.c:1742
+#: mail/mail-ops.c:1718
 #, c-format
 msgid "Retrieving message %s"
 msgstr ""
 
-#: mail/mail-ops.c:1814
+#: mail/mail-ops.c:1790
 #, c-format
 msgid "Retrieving %d message(s)"
 msgstr ""
 
-#: mail/mail-ops.c:1898
+#: mail/mail-ops.c:1876
 #, c-format
 msgid "Saving %d messsage(s)"
 msgstr ""
 
-#: mail/mail-ops.c:1946
+#: mail/mail-ops.c:1924
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
 " %s"
 msgstr ""
 
-#: mail/mail-ops.c:1974
+#: mail/mail-ops.c:1952
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
 " %s"
 msgstr ""
 
-#: mail/mail-ops.c:2045
+#: mail/mail-ops.c:2026
 msgid "Saving attachment"
 msgstr ""
 
-#: mail/mail-ops.c:2062
+#: mail/mail-ops.c:2043
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
 " %s"
 msgstr ""
 
-#: mail/mail-ops.c:2092
+#: mail/mail-ops.c:2073
 #, c-format
 msgid "Could not write data: %s"
 msgstr ""
 
-#: mail/mail-ops.c:2240
+#: mail/mail-ops.c:2221
 #, c-format
 msgid "Disconnecting from %s"
 msgstr ""
 
-#: mail/mail-ops.c:2240
+#: mail/mail-ops.c:2221
 #, c-format
 msgid "Reconnecting to %s"
 msgstr ""
 
-#: mail/mail-send-recv.c:147
+#: mail/mail-search.c:154
+msgid "(Untitled Message)"
+msgstr ""
+
+#: mail/mail-search.c:236
+msgid "Untitled Message"
+msgstr ""
+
+#: mail/mail-search.c:238
+msgid "Empty Message"
+msgstr ""
+
+#: mail/mail-search.c:287
+msgid "Find in Message"
+msgstr ""
+
+#: mail/mail-search.c:320
+msgid "Case Sensitive"
+msgstr ""
+
+#: mail/mail-search.c:322
+msgid "Search Forward"
+msgstr ""
+
+#: mail/mail-search.c:342
+msgid "Find:"
+msgstr "ፈልግ"
+
+#: mail/mail-search.c:346
+msgid "Matches:"
+msgstr ""
+
+#: mail/mail-send-recv.c:146
 msgid "Cancelling..."
 msgstr ""
 
-#: mail/mail-send-recv.c:255
+#: mail/mail-send-recv.c:254
 #, c-format
 msgid "Server: %s, Type: %s"
 msgstr ""
 
-#: mail/mail-send-recv.c:257
+#: mail/mail-send-recv.c:256
 #, c-format
 msgid "Path: %s, Type: %s"
 msgstr ""
 
-#: mail/mail-send-recv.c:259
+#: mail/mail-send-recv.c:258
 #, c-format
 msgid "Type: %s"
 msgstr "ዓይነት፦ %s"
 
-#: mail/mail-send-recv.c:308
+#: mail/mail-send-recv.c:306
 msgid "Send & Receive Mail"
 msgstr ""
 
-#: mail/mail-send-recv.c:309
+#: mail/mail-send-recv.c:307
 #, fuzzy
 msgid "Cancel _All"
 msgstr "ተወው"
 
-#: mail/mail-send-recv.c:390
+#: mail/mail-send-recv.c:389
 msgid "Updating..."
 msgstr ""
 
-#: mail/mail-send-recv.c:390 mail/mail-send-recv.c:442
+#: mail/mail-send-recv.c:390 mail/mail-send-recv.c:446
 msgid "Waiting..."
 msgstr ""
 
-#: mail/mail-session.c:229
+#: mail/mail-session.c:226
 msgid "User canceled operation."
 msgstr ""
 
-#: mail/mail-session.c:262
+#: mail/mail-session.c:259
 #, c-format
 msgid "Enter Password for %s"
 msgstr ""
 
-#: mail/mail-session.c:264
+#: mail/mail-session.c:261
 msgid "Enter Password"
 msgstr "ሚስጢራዊ ቃል አስገቡ"
 
-#: mail/mail-session.c:287
+#: mail/mail-session.c:284
 msgid "_Remember this password"
 msgstr "ይህንን ሚስጢራዊ ቃል አስታውሱ (_R)"
 
-#: mail/mail-session.c:288
+#: mail/mail-session.c:285
 msgid "_Remember this password for the remainder of this session"
 msgstr ""
 
@@ -12912,17 +13184,21 @@ msgstr ""
 msgid "Forwarded message"
 msgstr ""
 
-#: mail/mail-vfolder.c:91
+#: mail/mail-tools.c:438
+msgid "Forwarded Message"
+msgstr ""
+
+#: mail/mail-vfolder.c:92
 #, c-format
 msgid "Setting up vfolder: %s"
 msgstr ""
 
-#: mail/mail-vfolder.c:209
+#: mail/mail-vfolder.c:210
 #, c-format
 msgid "Updating vfolders for uri: %s"
 msgstr ""
 
-#: mail/mail-vfolder.c:467
+#: mail/mail-vfolder.c:468
 #, c-format
 msgid ""
 "The following vFolder(s):\n"
@@ -12931,95 +13207,100 @@ msgid ""
 "And have been updated."
 msgstr ""
 
-#: mail/mail-vfolder.c:776
+#: mail/mail-vfolder.c:777
 msgid "VFolders"
 msgstr ""
 
-#: mail/mail-vfolder.c:834
+#: mail/mail-vfolder.c:835
 msgid "vFolders"
 msgstr ""
 
-#: mail/mail-vfolder.c:873
+#: mail/mail-vfolder.c:874
 msgid "Edit VFolder"
 msgstr ""
 
-#: mail/mail-vfolder.c:893
+#: mail/mail-vfolder.c:894
 #, c-format
 msgid "Trying to edit a vfolder '%s' which doesn't exist."
 msgstr ""
 
-#: mail/mail-vfolder.c:965
+#: mail/mail-vfolder.c:966
 msgid "New VFolder"
 msgstr ""
 
-#: mail/message-list.c:900
+#: mail/message-browser.c:233
+msgid "(No subject)"
+msgstr ""
+
+#: mail/message-browser.c:235
+#, c-format
+msgid "%s - Message"
+msgstr "%s - መልዕክት"
+
+#: mail/message-list.c:741
 msgid "Unseen"
 msgstr ""
 
-#: mail/message-list.c:901
+#: mail/message-list.c:742
 msgid "Seen"
 msgstr ""
 
-#: mail/message-list.c:902
+#: mail/message-list.c:743
 msgid "Answered"
 msgstr ""
 
-#: mail/message-list.c:903
+#: mail/message-list.c:744
 msgid "Multiple Unseen Messages"
 msgstr ""
 
-#: mail/message-list.c:904
+#: mail/message-list.c:745
 msgid "Multiple Messages"
 msgstr ""
 
-#: mail/message-list.c:908
+#: mail/message-list.c:749
 msgid "Lowest"
 msgstr ""
 
-#: mail/message-list.c:909
+#: mail/message-list.c:750
 msgid "Lower"
 msgstr "ዝቅተኛ"
 
-#: mail/message-list.c:913
+#: mail/message-list.c:754
 msgid "Higher"
 msgstr ""
 
-#: mail/message-list.c:914
+#: mail/message-list.c:755
 msgid "Highest"
 msgstr ""
 
-#: mail/message-list.c:1231
+#: mail/message-list.c:1072
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:1238
+#: mail/message-list.c:1079
 msgid "Today %l:%M %p"
 msgstr "ዛሬ %l:%M %p"
 
-#: mail/message-list.c:1247
+#: mail/message-list.c:1088
 msgid "Yesterday %l:%M %p"
 msgstr "ትናንት %l:%M %p"
 
-#: mail/message-list.c:1259
+#: mail/message-list.c:1100
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: mail/message-list.c:1267
+#: mail/message-list.c:1108
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %l:%M %p"
 
-#: mail/message-list.c:1269
+#: mail/message-list.c:1110
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
-#: mail/message-list.c:3062
+#: mail/message-list.c:2649
 msgid "Generating message list"
 msgstr ""
 
-#: mail/message-list.etspec.h:2
-msgid "Date"
-msgstr "ቀን"
-
 #: mail/message-list.etspec.h:3
 msgid "Due By"
 msgstr ""
@@ -13036,10 +13317,6 @@ msgstr ""
 msgid "Follow Up Flag"
 msgstr ""
 
-#: mail/message-list.etspec.h:7 mail/message-tag-followup.c:301
-msgid "From"
-msgstr "ከ"
-
 #: mail/message-list.etspec.h:8
 msgid "Original Location"
 msgstr ""
@@ -13052,10 +13329,6 @@ msgstr ""
 msgid "Size"
 msgstr "መጠን"
 
-#: mail/message-list.etspec.h:14
-msgid "To"
-msgstr "ወደ"
-
 #: mail/message-tag-followup.c:62
 msgid "Call"
 msgstr ""
@@ -13072,7 +13345,7 @@ msgstr ""
 msgid "For Your Information"
 msgstr ""
 
-#: mail/message-tag-followup.c:66 ui/evolution-mail-message.xml.h:40
+#: mail/message-tag-followup.c:66 ui/evolution-mail-message.xml.h:36
 msgid "Forward"
 msgstr "ወደፊት"
 
@@ -13080,11 +13353,11 @@ msgstr "ወደፊት"
 msgid "No Response Necessary"
 msgstr ""
 
-#: mail/message-tag-followup.c:69 ui/evolution-mail-message.xml.h:77
+#: mail/message-tag-followup.c:69 ui/evolution-mail-message.xml.h:72
 msgid "Reply"
 msgstr ""
 
-#: mail/message-tag-followup.c:70 ui/evolution-mail-message.xml.h:78
+#: mail/message-tag-followup.c:70 ui/evolution-mail-message.xml.h:73
 msgid "Reply to All"
 msgstr ""
 
@@ -13114,138 +13387,64 @@ msgstr ""
 msgid "_Flag:"
 msgstr "ባንዲራ"
 
-#: mail/subscribe-dialog.glade.h:1
-#, fuzzy
-msgid "Folder Subscriptions"
-msgstr "መግለጫ"
-
-#: mail/subscribe-dialog.glade.h:2
-#, fuzzy
-msgid "None Selected"
-msgstr "ተመርጠዋል"
-
-#: mail/subscribe-dialog.glade.h:3
-#, fuzzy
-msgid "S_erver:"
-msgstr "_የሰርቨር ስም፦"
-
-#: mail/subscribe-dialog.glade.h:4
-msgid "_Subscribe"
-msgstr ""
-
-#: mail/subscribe-dialog.glade.h:5
-msgid "_Unsubscribe"
+#: mail/subscribe-dialog.c:230
+#, c-format
+msgid "Scanning folders under %s on \"%s\""
 msgstr ""
 
-#: my-evolution/component-factory.c:56
-msgid "Folder containing the Evolution Summary"
+#: mail/subscribe-dialog.c:232
+#, c-format
+msgid "Scanning root-level folders on \"%s\""
 msgstr ""
 
-#: my-evolution/e-summary.c:204
-msgid "%A, %B %e %Y"
-msgstr "%A, %B %e %Y"
-
-#: my-evolution/e-summary.c:533
-msgid "Please wait..."
+#: mail/subscribe-dialog.c:329
+#, c-format
+msgid "Subscribing to folder \"%s\""
 msgstr ""
 
-#: my-evolution/e-summary.c:622 ui/my-evolution.xml.h:2
-msgid "Print Summary"
+#: mail/subscribe-dialog.c:331
+#, c-format
+msgid "Unsubscribing to folder \"%s\""
 msgstr ""
 
-#: my-evolution/e-summary.c:655
-msgid "Printing of Summary failed"
-msgstr ""
+#: mail/subscribe-dialog.c:1270 mail/subscribe-dialog.etspec.h:1
+#: shell/e-storage-set-view.etspec.h:2
+msgid "Folder"
+msgstr "ዶሴ"
 
-#: my-evolution/e-summary-calendar.c:384
-msgid "Appointments"
+#: mail/subscribe-dialog.c:1499
+msgid "No server has been selected"
 msgstr ""
 
-#: my-evolution/e-summary-calendar.c:392
-msgid "No appointments."
+#: mail/subscribe-dialog.c:1598
+msgid "Please select a server."
 msgstr ""
 
-#: my-evolution/e-summary-calendar.c:409
-msgid "%k:%M %d %B"
-msgstr "%k:%M %d %B"
-
-#: my-evolution/e-summary-calendar.c:411
+#: mail/subscribe-dialog.glade.h:1
 #, fuzzy
-msgid "%l:%M%p %d %B"
-msgstr "%l:%M %d %B"
-
-#: my-evolution/e-summary-calendar.c:429
-msgid "No description"
-msgstr "መግለጫ የለም"
-
-#: my-evolution/e-summary-mail.c:189
-msgid "Mail summary"
-msgstr ""
-
-#: my-evolution/e-summary-preferences.c:355
-msgid "Dictionary.com Word of the Day"
-msgstr ""
-
-#: my-evolution/e-summary-preferences.c:373
-msgid "Quotes of the Day"
-msgstr ""
-
-#: my-evolution/e-summary-preferences.c:565
-msgid "New News Feed"
-msgstr ""
+msgid "Folder Subscriptions"
+msgstr "መግለጫ"
 
-#: my-evolution/e-summary-preferences.c:581
+#: mail/subscribe-dialog.glade.h:2
 #, fuzzy
-msgid "_URL:"
-msgstr "url"
-
-#: my-evolution/e-summary-rdf.c:315
-msgid "Error downloading RDF"
-msgstr ""
-
-#: my-evolution/e-summary-rdf.c:453
-msgid "News Feed"
-msgstr ""
-
-#: my-evolution/e-summary-shown.c:496
-msgid "All"
-msgstr "ሁሉም"
-
-#: my-evolution/e-summary-shown.c:521 my-evolution/e-summary-table.c:58
-msgid "Shown"
-msgstr ""
-
-#: my-evolution/e-summary-tasks.c:349
-msgid "No tasks"
-msgstr ""
+msgid "None Selected"
+msgstr "ተመርጠዋል"
 
-#: my-evolution/e-summary-tasks.c:387
+#: mail/subscribe-dialog.glade.h:3
 #, fuzzy
-msgid "blue"
-msgstr "አስቻለ"
-
-#: my-evolution/e-summary-tasks.c:387
-msgid "(No Description)"
-msgstr "መግለጫ የለም"
-
-#: my-evolution/e-summary-weather.c:72
-msgid "My Weather"
-msgstr ""
+msgid "S_erver:"
+msgstr "_የሰርቨር ስም፦"
 
-#: my-evolution/e-summary-weather.c:261
-msgid "There was an error downloading data for"
+#: mail/subscribe-dialog.glade.h:4
+msgid "Scanning folders ..."
 msgstr ""
 
-#: my-evolution/e-summary-weather.c:478 my-evolution/my-evolution.glade.h:16
-msgid "Weather"
+#: mail/subscribe-dialog.glade.h:5
+msgid "_Subscribe"
 msgstr ""
 
-#. translators: Put here a list of codes for locations you want to
-#. see in My Evolution by default. You can find the list of all
-#. stations and their codes in Evolution sources
-#. (evolution/my-evolution/Locations)
-#: my-evolution/e-summary-weather.c:582
-msgid "KBOS"
+#: mail/subscribe-dialog.glade.h:6
+msgid "_Unsubscribe"
 msgstr ""
 
 #: my-evolution/GNOME_Evolution_Summary.server.in.in.h:1
@@ -23053,6 +23252,112 @@ msgstr ""
 msgid "Zurich"
 msgstr ""
 
+#: my-evolution/component-factory.c:56
+msgid "Folder containing the Evolution Summary"
+msgstr ""
+
+#: my-evolution/e-summary-calendar.c:381
+msgid "Appointments"
+msgstr ""
+
+#: my-evolution/e-summary-calendar.c:389
+msgid "No appointments."
+msgstr ""
+
+#: my-evolution/e-summary-calendar.c:406
+msgid "%k:%M %d %B"
+msgstr "%k:%M %d %B"
+
+#: my-evolution/e-summary-calendar.c:408
+#, fuzzy
+msgid "%l:%M%P %d %B"
+msgstr "%l:%M %d %B"
+
+#: my-evolution/e-summary-calendar.c:426
+msgid "No description"
+msgstr "መግለጫ የለም"
+
+#: my-evolution/e-summary-mail.c:189
+msgid "Mail summary"
+msgstr ""
+
+#: my-evolution/e-summary-preferences.c:355
+msgid "Dictionary.com Word of the Day"
+msgstr ""
+
+#: my-evolution/e-summary-preferences.c:373
+msgid "Quotes of the Day"
+msgstr ""
+
+#: my-evolution/e-summary-preferences.c:565
+msgid "New News Feed"
+msgstr ""
+
+#: my-evolution/e-summary-preferences.c:581
+#, fuzzy
+msgid "_URL:"
+msgstr "url"
+
+#: my-evolution/e-summary-rdf.c:315
+msgid "Error downloading RDF"
+msgstr ""
+
+#: my-evolution/e-summary-rdf.c:453
+msgid "News Feed"
+msgstr ""
+
+#: my-evolution/e-summary-shown.c:496
+msgid "All"
+msgstr "ሁሉም"
+
+#: my-evolution/e-summary-shown.c:521 my-evolution/e-summary-table.c:58
+msgid "Shown"
+msgstr ""
+
+#: my-evolution/e-summary-tasks.c:330
+msgid "No tasks"
+msgstr ""
+
+#: my-evolution/e-summary-tasks.c:364
+msgid "(No Description)"
+msgstr "መግለጫ የለም"
+
+#: my-evolution/e-summary-weather.c:73
+msgid "My Weather"
+msgstr ""
+
+#: my-evolution/e-summary-weather.c:262
+msgid "There was an error downloading data for"
+msgstr ""
+
+#: my-evolution/e-summary-weather.c:479 my-evolution/my-evolution.glade.h:16
+msgid "Weather"
+msgstr ""
+
+#. translators: Put here a list of codes for locations you want to
+#. see in My Evolution by default. You can find the list of all
+#. stations and their codes in Evolution sources
+#. (evolution/my-evolution/Locations)
+#: my-evolution/e-summary-weather.c:583
+msgid "KBOS"
+msgstr ""
+
+#: my-evolution/e-summary.c:204
+msgid "%A, %B %e %Y"
+msgstr "%A, %B %e %Y"
+
+#: my-evolution/e-summary.c:533
+msgid "Please wait..."
+msgstr ""
+
+#: my-evolution/e-summary.c:622 ui/my-evolution.xml.h:2
+msgid "Print Summary"
+msgstr ""
+
+#: my-evolution/e-summary.c:655
+msgid "Printing of Summary failed"
+msgstr ""
+
 #: my-evolution/metar.c:30
 msgid " F"
 msgstr " F"
@@ -24314,26 +24619,21 @@ msgstr ""
 msgid "_Show full path for folders"
 msgstr ""
 
-#: notes/component-factory.c:27
-#: shell/e-shell-user-creatable-items-handler.c:587
-#: shell/e-shell-user-creatable-items-handler.c:643
-#: widgets/misc/e-charset-picker.c:109
-msgid "New"
-msgstr "አዲስ"
+#: shell/GNOME_Evolution_Shell.server.in.in.h:1
+msgid "Configure special folders and offline folder behavior here"
+msgstr ""
 
-#: notes/component-factory.c:27
-#, fuzzy
-msgid "Create a new note"
-msgstr "አዲስ ዶሴ ፍጠር"
+#: shell/GNOME_Evolution_Shell.server.in.in.h:2
+msgid "Evolution Shell"
+msgstr ""
 
-#: notes/component-factory.c:152
-msgid "Cannot initialize Evolution's notes component."
+#: shell/GNOME_Evolution_Shell.server.in.in.h:3
+msgid "Evolution folder settings configuration control"
 msgstr ""
 
-#: notes/main.c:30
-#, fuzzy
-msgid "Notes Component: Could not initialize bonobo"
-msgstr "bonobo ማስጀመር አልቻልኩም!"
+#: shell/GNOME_Evolution_Shell.server.in.in.h:4
+msgid "Folder Settings"
+msgstr ""
 
 #: shell/e-activity-handler.c:164
 msgid "Show Details"
@@ -24415,43 +24715,6 @@ msgstr ""
 msgid "Brought to you by"
 msgstr ""
 
-#: shell/e-shell.c:175
-#, c-format
-msgid ""
-"Cannot activate component %s :\n"
-"The error from the activation system is:\n"
-"%s"
-msgstr ""
-
-#: shell/e-shell.c:741
-#, c-format
-msgid "Cannot set up local storage -- %s"
-msgstr ""
-
-#: shell/e-shell.c:1804
-#, c-format
-msgid ""
-"The Evolution component that handles folders of type \"%s\"\n"
-"has unexpectedly quit. You will need to quit Evolution and restart\n"
-"in order to access that data again."
-msgstr ""
-
-#: shell/e-shell.c:2069
-msgid "Invalid arguments"
-msgstr ""
-
-#: shell/e-shell.c:2071
-msgid "Cannot register on OAF"
-msgstr ""
-
-#: shell/e-shell.c:2073
-msgid "Configuration Database not found"
-msgstr ""
-
-#: shell/e-shell.c:2075 shell/e-storage.c:568
-msgid "Generic error"
-msgstr "አጠቃላይ ስህተት"
-
 #: shell/e-shell-config-autocompletion.c:110
 msgid "Extra Completion folders"
 msgstr ""
@@ -24538,32 +24801,27 @@ msgid ""
 "%s"
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:534
+#: shell/e-shell-folder-commands.c:538
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:541
+#: shell/e-shell-folder-commands.c:544
 #, fuzzy
 msgid "Rename Folder"
 msgstr "ዶሴን እንደገና ሰይም"
 
-#: shell/e-shell-folder-commands.c:547
+#: shell/e-shell-folder-commands.c:553
 #: shell/e-shell-folder-creation-dialog.c:180
 #, c-format
 msgid "The specified folder name is not valid: %s"
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:554
-#, c-format
-msgid "A folder named \"%s\" already exists. Please use a different name."
-msgstr ""
-
-#: shell/e-shell-folder-commands.c:584
+#: shell/e-shell-folder-commands.c:587
 msgid "Selected folder does not belong to another user"
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:587
+#: shell/e-shell-folder-commands.c:590
 #, c-format
 msgid ""
 "Cannot remove folder:\n"
@@ -24598,126 +24856,115 @@ msgid ""
 "to work it out."
 msgstr ""
 
-#: shell/e-shell-importer.c:148 shell/e-shell-startup-wizard.c:724
+#: shell/e-shell-importer.c:148 shell/e-shell-startup-wizard.c:709
 msgid "Please select the information that you would like to import:"
 msgstr ""
 
-#: shell/e-shell-importer.c:151
-msgid ""
-"Evolution checked for settings to import from the following\n"
-"applications: Pine, Netscape, Elm, iCalendar. No settings\n"
-"that could be imported where found. If you would like to\n"
-"try again, please click the \"Back\" button.\n"
-msgstr ""
-
-#: shell/e-shell-importer.c:219 shell/e-shell-importer.c:250
+#: shell/e-shell-importer.c:213 shell/e-shell-importer.c:244
 #, c-format
 msgid ""
 "Importing %s\n"
 "Importing item %d."
 msgstr ""
 
-#: shell/e-shell-importer.c:323
+#: shell/e-shell-importer.c:317
 msgid "Select importer"
 msgstr ""
 
-#: shell/e-shell-importer.c:464
+#: shell/e-shell-importer.c:458
 #, c-format
 msgid "File %s does not exist"
 msgstr ""
 
-#: shell/e-shell-importer.c:465 shell/e-shell-importer.c:482
-#: shell/e-shell-importer.c:524
+#: shell/e-shell-importer.c:459 shell/e-shell-importer.c:476
+#: shell/e-shell-importer.c:518
 msgid "Evolution Error"
 msgstr ""
 
-#: shell/e-shell-importer.c:481
+#: shell/e-shell-importer.c:475
 #, c-format
 msgid ""
 "There is no importer that is able to handle\n"
 "%s"
 msgstr ""
 
-#: shell/e-shell-importer.c:490
+#: shell/e-shell-importer.c:484
 msgid "Importing"
 msgstr ""
 
-#: shell/e-shell-importer.c:497
+#: shell/e-shell-importer.c:491
 #, c-format
 msgid ""
 "Importing %s.\n"
 "Starting %s"
 msgstr ""
 
-#: shell/e-shell-importer.c:509
+#: shell/e-shell-importer.c:503
 #, c-format
 msgid "Error starting %s"
 msgstr ""
 
-#: shell/e-shell-importer.c:523
+#: shell/e-shell-importer.c:517
 #, c-format
 msgid "Error loading %s"
 msgstr ""
 
-#: shell/e-shell-importer.c:540
+#: shell/e-shell-importer.c:534
 #, c-format
 msgid ""
 "Importing %s\n"
 "Importing item 1."
 msgstr ""
 
-#: shell/e-shell-importer.c:594
+#: shell/e-shell-importer.c:588
 msgid "Automatic"
 msgstr "አውቶማቲክ"
 
-#: shell/e-shell-importer.c:643
-#, fuzzy
-msgid "_Filename:"
+#: shell/e-shell-importer.c:637
+msgid "Filename:"
 msgstr "የፋይል ስም፦"
 
-#: shell/e-shell-importer.c:648
+#: shell/e-shell-importer.c:642
 msgid "Select a file"
 msgstr "ፋይል ምረጡ"
 
-#: shell/e-shell-importer.c:658
-#, fuzzy
-msgid "File _type:"
+#: shell/e-shell-importer.c:651
+msgid "File type:"
 msgstr "የፋይሉ ዓይነት፦"
 
-#: shell/e-shell-importer.c:684
-msgid "Import data and settings from _older programs"
+#: shell/e-shell-importer.c:676
+msgid "Import data and settings from older programs"
 msgstr ""
 
-#: shell/e-shell-importer.c:687
-msgid "Import a _single file"
+#: shell/e-shell-importer.c:680
+msgid "Import a single file"
 msgstr ""
 
-#: shell/e-shell-importer.c:755 shell/e-shell-startup-wizard.c:553
+#: shell/e-shell-importer.c:746 shell/e-shell-startup-wizard.c:538
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
 msgstr ""
 
-#: shell/e-shell-importer.c:758
+#: shell/e-shell-importer.c:749
 msgid "Starting Intelligent Importers"
 msgstr ""
 
-#: shell/e-shell-importer.c:884 shell/e-shell-startup-wizard.c:679
+#: shell/e-shell-importer.c:873 shell/e-shell-startup-wizard.c:664
 #, c-format
 msgid "From %s:"
 msgstr "ከ %s፦"
 
-#: shell/e-shell-importer.c:1061
+#: shell/e-shell-importer.c:1047
 msgid "Select folder"
 msgstr "ዶሴ ምረጡ"
 
-#: shell/e-shell-importer.c:1062
+#: shell/e-shell-importer.c:1048
 msgid "Select a destination folder for importing this data"
 msgstr ""
 
-#: shell/e-shell-importer.c:1193
-#, fuzzy
-msgid "_Import"
+#: shell/e-shell-importer.c:1178 shell/importer/intelligent.c:191
+msgid "Import"
 msgstr "ከውጭ አስገባ"
 
 #: shell/e-shell-offline-handler.c:592
@@ -24775,18 +25022,11 @@ msgstr ""
 msgid "Cannot find the specified shared folder."
 msgstr ""
 
-#: shell/e-shell-startup-wizard.c:771
-msgid ""
-"If you quit the Evolution Setup Assistant now, all of the information that "
-"you have entered will be forgotten. You will need to run this assistant "
-"again before using Evolution.\n"
-"\n"
-"Do you want to quit using the Assistant now?"
-msgstr ""
-
-#: shell/e-shell-startup-wizard.c:782
-msgid "Quit Assistant"
-msgstr ""
+#: shell/e-shell-user-creatable-items-handler.c:586
+#: shell/e-shell-user-creatable-items-handler.c:642
+#: widgets/misc/e-charset-picker.c:109
+msgid "New"
+msgstr "አዲስ"
 
 #: shell/e-shell-utils.c:116
 msgid "No folder name specified."
@@ -24808,33 +25048,6 @@ msgstr ""
 msgid "'.' and '..' are reserved folder names."
 msgstr ""
 
-#: shell/e-shell-view.c:264
-msgid "(No folder displayed)"
-msgstr ""
-
-#: shell/e-shell-view.c:2040
-#, c-format
-msgid "%s (%d)"
-msgstr "%s (%d)"
-
-#: shell/e-shell-view.c:2042
-msgid "(None)"
-msgstr "(ምንም)"
-
-#: shell/e-shell-view.c:2083
-msgid ""
-"Ximian Evolution is currently online.  Click on this button to work offline."
-msgstr ""
-
-#: shell/e-shell-view.c:2090
-msgid "Ximian Evolution is in the process of going offline."
-msgstr ""
-
-#: shell/e-shell-view.c:2096
-msgid ""
-"Ximian Evolution is currently offline.  Click on this button to work online."
-msgstr ""
-
 #: shell/e-shell-view-menu.c:89
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr ""
@@ -24884,13 +25097,69 @@ msgstr ""
 msgid "Work Offline"
 msgstr ""
 
-#: shell/e-shortcuts.c:649
-msgid "Error saving shortcuts."
+#: shell/e-shell-view.c:264
+msgid "(No folder displayed)"
 msgstr ""
 
-#: shell/e-shortcuts.c:1096
-msgid "Shortcuts"
-msgstr "አቋራጮች"
+#: shell/e-shell-view.c:2040
+#, c-format
+msgid "%s (%d)"
+msgstr "%s (%d)"
+
+#: shell/e-shell-view.c:2042
+msgid "(None)"
+msgstr "(ምንም)"
+
+#: shell/e-shell-view.c:2083
+msgid ""
+"Ximian Evolution is currently online.  Click on this button to work offline."
+msgstr ""
+
+#: shell/e-shell-view.c:2090
+msgid "Ximian Evolution is in the process of going offline."
+msgstr ""
+
+#: shell/e-shell-view.c:2096
+msgid ""
+"Ximian Evolution is currently offline.  Click on this button to work online."
+msgstr ""
+
+#: shell/e-shell.c:175
+#, c-format
+msgid ""
+"Cannot activate component %s :\n"
+"The error from the activation system is:\n"
+"%s"
+msgstr ""
+
+#: shell/e-shell.c:741
+#, c-format
+msgid "Cannot set up local storage -- %s"
+msgstr ""
+
+#: shell/e-shell.c:1804
+#, c-format
+msgid ""
+"The Evolution component that handles folders of type \"%s\"\n"
+"has unexpectedly quit. You will need to quit Evolution and restart\n"
+"in order to access that data again."
+msgstr ""
+
+#: shell/e-shell.c:2069
+msgid "Invalid arguments"
+msgstr ""
+
+#: shell/e-shell.c:2071
+msgid "Cannot register on OAF"
+msgstr ""
+
+#: shell/e-shell.c:2073
+msgid "Configuration Database not found"
+msgstr ""
+
+#: shell/e-shell.c:2075 shell/e-storage.c:568
+msgid "Generic error"
+msgstr "አጠቃላይ ስህተት"
 
 #: shell/e-shortcuts-view.c:80
 #, fuzzy
@@ -25008,6 +25277,18 @@ msgstr "አስወግድ"
 msgid "Remove this shortcut from the shortcut bar"
 msgstr ""
 
+#: shell/e-shortcuts.c:649
+msgid "Error saving shortcuts."
+msgstr ""
+
+#: shell/e-shortcuts.c:1096
+msgid "Shortcuts"
+msgstr "አቋራጮች"
+
+#: shell/e-storage-set-view.etspec.h:1
+msgid "Checkbox"
+msgstr ""
+
 #: shell/e-storage.c:566
 msgid "No error"
 msgstr "ስህተት የለም"
@@ -25064,14 +25345,6 @@ msgstr ""
 msgid "This operation cannot be performed in off-line mode"
 msgstr ""
 
-#: shell/e-storage-set-view.etspec.h:1
-msgid "Checkbox"
-msgstr ""
-
-#: shell/e-storage-set-view.etspec.h:2
-msgid "Folder"
-msgstr "ዶሴ"
-
 #: shell/e-task-widget.c:211
 #, c-format
 msgid "%s (...)"
@@ -25086,95 +25359,95 @@ msgstr ""
 msgid "<click here to select a folder>"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1187
+#: shell/evolution-shell-component-utils.c:124
+#, c-format
+msgid ""
+"%s\n"
+"\n"
+"Unknown error."
+msgstr ""
+"%s\n"
+"\n"
+"ያልታወቀ ስህተት።"
+
+#: shell/evolution-shell-component-utils.c:127
+#, c-format
+msgid ""
+"%s\n"
+"\n"
+"The error from the component system is:\n"
+"%s"
+msgstr ""
+
+#: shell/evolution-shell-component-utils.c:134
+#, c-format
+msgid ""
+"%s\n"
+"\n"
+"The error from the activation system is:\n"
+"%s"
+msgstr ""
+
+#: shell/evolution-shell-component.c:1184
 msgid "CORBA error"
 msgstr "የCORBA ብልሽት"
 
-#: shell/evolution-shell-component.c:1189
+#: shell/evolution-shell-component.c:1186
 msgid "Interrupted"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1191
+#: shell/evolution-shell-component.c:1188
 msgid "Invalid argument"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1193
+#: shell/evolution-shell-component.c:1190
 msgid "Already has an owner"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1195
+#: shell/evolution-shell-component.c:1192
 msgid "No owner"
 msgstr "ባለቤት የለም"
 
-#: shell/evolution-shell-component.c:1197
+#: shell/evolution-shell-component.c:1194
 msgid "Not found"
 msgstr "አልተገኘም"
 
-#: shell/evolution-shell-component.c:1199
+#: shell/evolution-shell-component.c:1196
 msgid "Unsupported type"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1201
+#: shell/evolution-shell-component.c:1198
 msgid "Unsupported schema"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1203
+#: shell/evolution-shell-component.c:1200
 msgid "Unsupported operation"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1205
+#: shell/evolution-shell-component.c:1202
 msgid "Internal error"
 msgstr "የውስጥ ብልሽት"
 
-#: shell/evolution-shell-component.c:1209
+#: shell/evolution-shell-component.c:1206
 msgid "Exists"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1211
+#: shell/evolution-shell-component.c:1208
 msgid "Invalid URI"
 msgstr "የማይሰራ URI"
 
-#: shell/evolution-shell-component.c:1215
+#: shell/evolution-shell-component.c:1212
 msgid "Has subfolders"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1217
+#: shell/evolution-shell-component.c:1214
 msgid "No space left"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1219
+#: shell/evolution-shell-component.c:1216
 msgid "Old owner has died"
 msgstr ""
 
-#: shell/evolution-shell-component-utils.c:124
-#, c-format
-msgid ""
-"%s\n"
-"\n"
-"Unknown error."
-msgstr ""
-"%s\n"
-"\n"
-"ያልታወቀ ስህተት።"
-
-#: shell/evolution-shell-component-utils.c:127
-#, c-format
-msgid ""
-"%s\n"
-"\n"
-"The error from the component system is:\n"
-"%s"
-msgstr ""
-
-#: shell/evolution-shell-component-utils.c:134
-#, c-format
-msgid ""
-"%s\n"
-"\n"
-"The error from the activation system is:\n"
-"%s"
-msgstr ""
-
 #: shell/evolution-test-component.c:63
 msgid "Test type"
 msgstr ""
@@ -25274,22 +25547,6 @@ msgid ""
 "Click the \"Apply\" button to save your settings. "
 msgstr ""
 
-#: shell/GNOME_Evolution_Shell.server.in.in.h:1
-msgid "Configure special folders and offline folder behavior here"
-msgstr ""
-
-#: shell/GNOME_Evolution_Shell.server.in.in.h:2
-msgid "Evolution Shell"
-msgstr ""
-
-#: shell/GNOME_Evolution_Shell.server.in.in.h:3
-msgid "Evolution folder settings configuration control"
-msgstr ""
-
-#: shell/GNOME_Evolution_Shell.server.in.in.h:4
-msgid "Folder Settings"
-msgstr ""
-
 #: shell/importer/import.glade.h:1
 msgid "Click \"Import\" to begin importing the file into Evolution. "
 msgstr ""
@@ -25325,10 +25582,6 @@ msgstr ""
 msgid "Importers"
 msgstr ""
 
-#: shell/importer/intelligent.c:191
-msgid "Import"
-msgstr "ከውጭ አስገባ"
-
 #: shell/importer/intelligent.c:195
 msgid "Don't import"
 msgstr ""
@@ -25495,7 +25748,7 @@ msgstr ""
 msgid "Move to Folder..."
 msgstr ""
 
-#: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:18
+#: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:17
 msgid "Paste the clipboard"
 msgstr "ክሊፕቦርዱን ለጥፍ"
 
@@ -25503,9 +25756,9 @@ msgstr "ክሊፕቦርዱን ለጥፍ"
 msgid "Previews the contacts to be printed"
 msgstr ""
 
-#: ui/evolution-addressbook.xml.h:17 ui/evolution-calendar.xml.h:20
-#: ui/evolution-comp-editor.xml.h:9 ui/evolution-mail-message.xml.h:73
-#: ui/evolution-tasks.xml.h:13
+#: ui/evolution-addressbook.xml.h:17 ui/evolution-calendar.xml.h:19
+#: ui/evolution-comp-editor.xml.h:9 ui/evolution-mail-message.xml.h:68
+#: ui/evolution-tasks.xml.h:12
 msgid "Print Pre_view"
 msgstr "የቅድመ ህትመት ዕይታ"
 
@@ -25549,21 +25802,17 @@ msgstr ""
 msgid "View the current contact"
 msgstr ""
 
-#: ui/evolution-addressbook.xml.h:29 ui/evolution-calendar.xml.h:32
-#: ui/evolution-comp-editor.xml.h:16 ui/evolution-contact-editor.xml.h:13
-#: ui/evolution-contact-list-editor.xml.h:11
+#: ui/evolution-addressbook.xml.h:29 ui/evolution-calendar.xml.h:28
+#: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:11
+#: ui/evolution-contact-list-editor.xml.h:10
 #: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:17
-#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-messagedisplay.xml.h:4
-#: ui/evolution-mail-message.xml.h:99 ui/evolution-task-editor.xml.h:9
-#: ui/evolution-tasks.xml.h:16 ui/evolution.xml.h:42
+#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:93
+#: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-task-editor.xml.h:9
+#: ui/evolution-tasks.xml.h:14 ui/evolution.xml.h:42
 msgid "_Actions"
 msgstr "ትግባሮች (_A)"
 
-#: ui/evolution-addressbook.xml.h:31
-msgid "_Copy to Folder..."
-msgstr ""
-
-#: ui/evolution-addressbook.xml.h:34 ui/evolution-contact-editor.xml.h:16
+#: ui/evolution-addressbook.xml.h:34 ui/evolution-contact-editor.xml.h:13
 msgid "_Forward Contact..."
 msgstr ""
 
@@ -25631,59 +25880,46 @@ msgstr ""
 msgid "Go to today"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:17
+#: ui/evolution-calendar.xml.h:16
 msgid "Month"
 msgstr "ወር"
 
-#: ui/evolution-calendar.xml.h:19
+#: ui/evolution-calendar.xml.h:18
 msgid "Previews the calendar to be printed"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:21
+#: ui/evolution-calendar.xml.h:20
 msgid "Print this calendar"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:22
+#: ui/evolution-calendar.xml.h:21
 msgid "Publish Free/Busy information for this calendar"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:23 ui/evolution-tasks.xml.h:15
-#, fuzzy
-msgid "Purg_e"
-msgstr "ገጽ"
-
-#: ui/evolution-calendar.xml.h:24
-msgid "Purge old appointments and meetings"
-msgstr ""
-
-#: ui/evolution-calendar.xml.h:25
-msgid "Show as list"
-msgstr ""
-
-#: ui/evolution-calendar.xml.h:26
+#: ui/evolution-calendar.xml.h:22
 msgid "Show one day"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:27
+#: ui/evolution-calendar.xml.h:23
 msgid "Show one month"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:28
+#: ui/evolution-calendar.xml.h:24
 msgid "Show one week"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:29
+#: ui/evolution-calendar.xml.h:25
 msgid "Show the working week"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:30
+#: ui/evolution-calendar.xml.h:26
 msgid "Week"
 msgstr "ሳመንት"
 
-#: ui/evolution-comp-editor.xml.h:2 ui/evolution-contact-editor.xml.h:2
-#: ui/evolution-contact-list-editor.xml.h:2
+#: ui/evolution-comp-editor.xml.h:2 ui/evolution-contact-editor.xml.h:1
+#: ui/evolution-contact-list-editor.xml.h:1
 #: ui/evolution-mail-messagedisplay.xml.h:1
-#: ui/evolution-message-composer.xml.h:3 ui/evolution-signature-editor.xml.h:2
+#: ui/evolution-message-composer.xml.h:3 ui/evolution-signature-editor.xml.h:1
 #: ui/evolution.xml.h:5
 msgid "Close"
 msgstr "ዝጋ"
@@ -25692,7 +25928,7 @@ msgstr "ዝጋ"
 msgid "Close this item"
 msgstr ""
 
-#: ui/evolution-comp-editor.xml.h:5 ui/evolution-contact-editor.xml.h:4
+#: ui/evolution-comp-editor.xml.h:5 ui/evolution-contact-editor.xml.h:3
 msgid "Delete this item"
 msgstr ""
 
@@ -25705,58 +25941,48 @@ msgstr "ዋናው ቱልባር"
 msgid "Preview the printed item"
 msgstr ""
 
-#: ui/evolution-comp-editor.xml.h:10 ui/evolution-contact-editor.xml.h:7
+#: ui/evolution-comp-editor.xml.h:10 ui/evolution-contact-editor.xml.h:6
 msgid "Print this item"
 msgstr ""
 
-#: ui/evolution-comp-editor.xml.h:11 ui/evolution-contact-editor.xml.h:8
-#: ui/evolution-contact-list-editor.xml.h:5
-#: ui/evolution-message-composer.xml.h:18
-msgid "Save _As..."
-msgstr "በሌላ ስም አስቀምጥ... (_A)"
+#: ui/evolution-comp-editor.xml.h:12 ui/evolution-message-composer.xml.h:16
+#: ui/evolution-signature-editor.xml.h:5
+msgid "Save"
+msgstr "አስቀምጥ"
+
+#: ui/evolution-comp-editor.xml.h:13
+msgid "Save As..."
+msgstr "በሌላ ስም አስቀምጥ..."
 
-#: ui/evolution-comp-editor.xml.h:12 ui/evolution-contact-editor.xml.h:9
+#: ui/evolution-comp-editor.xml.h:14 ui/evolution-contact-editor.xml.h:8
 #: ui/evolution-contact-list-editor.xml.h:6
-#: ui/evolution-signature-editor.xml.h:7
+#: ui/evolution-signature-editor.xml.h:6
 msgid "Save and Close"
 msgstr ""
 
-#: ui/evolution-comp-editor.xml.h:13 ui/evolution-contact-editor.xml.h:10
-#: ui/evolution-contact-list-editor.xml.h:7
-#: ui/evolution-signature-editor.xml.h:8
-msgid "Save and _Close"
-msgstr ""
-
-#: ui/evolution-comp-editor.xml.h:14
+#: ui/evolution-comp-editor.xml.h:15
 msgid "Save the item and close the dialog box"
 msgstr ""
 
-#: ui/evolution-comp-editor.xml.h:15
+#: ui/evolution-comp-editor.xml.h:16
 msgid "Save this item to disk"
 msgstr ""
 
-#: ui/evolution-comp-editor.xml.h:18 ui/evolution-contact-editor.xml.h:15
-#: ui/evolution-contact-list-editor.xml.h:13
+#: ui/evolution-comp-editor.xml.h:18 ui/evolution-contact-editor.xml.h:12
+#: ui/evolution-contact-list-editor.xml.h:11
 #: ui/evolution-mail-messagedisplay.xml.h:7
 #: ui/evolution-message-composer.xml.h:42
-#: ui/evolution-signature-editor.xml.h:13 ui/evolution-subscribe.xml.h:11
+#: ui/evolution-signature-editor.xml.h:12 ui/evolution-subscribe.xml.h:11
 #: ui/evolution.xml.h:46
 msgid "_File"
 msgstr "ፋይል (_F)"
 
-#: ui/evolution-comp-editor.xml.h:20 ui/evolution-contact-editor.xml.h:18
-#: ui/evolution-contact-list-editor.xml.h:14
-#: ui/evolution-message-composer.xml.h:47
-#: ui/evolution-signature-editor.xml.h:15
-msgid "_Save"
-msgstr "አስቀምጥ"
-
 #: ui/evolution-composer-entries.xml.h:1
 #, fuzzy
 msgid "Copy selected text to the clipboard"
 msgstr "ክሊፕቦርዱን ለጥፍ"
 
-#: ui/evolution-composer-entries.xml.h:2 ui/evolution-mail-message.xml.h:21
+#: ui/evolution-composer-entries.xml.h:2 ui/evolution-mail-list.xml.h:3
 msgid "Cu_t"
 msgstr "ቁረጥ (_T)"
 
@@ -25780,39 +26006,51 @@ msgstr "ሁሉንም ምረጡ (_A)"
 msgid "Select all text"
 msgstr "ሁሉንም ምረጡ"
 
-#: ui/evolution-contact-editor.xml.h:6
+#: ui/evolution-contact-editor.xml.h:5
 msgid "Print En_velope..."
 msgstr ""
 
-#: ui/evolution-contact-editor.xml.h:11
+#: ui/evolution-contact-editor.xml.h:7
+#: ui/evolution-contact-list-editor.xml.h:5
+#: ui/evolution-message-composer.xml.h:18
+msgid "Save _As..."
+msgstr "በሌላ ስም አስቀምጥ... (_A)"
+
+#: ui/evolution-contact-editor.xml.h:9
 msgid "Save the contact and close the dialog box"
 msgstr ""
 
-#: ui/evolution-contact-editor.xml.h:12
+#: ui/evolution-contact-editor.xml.h:10
 msgid "Send _Message to Contact..."
 msgstr ""
 
-#: ui/evolution-contact-list-editor.xml.h:4
+#: ui/evolution-contact-editor.xml.h:15
+#: ui/evolution-contact-list-editor.xml.h:12
+#: ui/evolution-message-composer.xml.h:47
+#: ui/evolution-signature-editor.xml.h:14
+msgid "_Save"
+msgstr "አስቀምጥ"
+
+#: ui/evolution-contact-list-editor.xml.h:3
 msgid "Delete this list"
 msgstr ""
 
-#: ui/evolution-contact-list-editor.xml.h:8
+#: ui/evolution-contact-list-editor.xml.h:4
+msgid "Delete..."
+msgstr "አጥፉ..."
+
+#: ui/evolution-contact-list-editor.xml.h:7
 msgid "Save the list and close the dialog box"
 msgstr ""
 
-#: ui/evolution-contact-list-editor.xml.h:9
+#: ui/evolution-contact-list-editor.xml.h:8
 msgid "Se_nd list to other..."
 msgstr ""
 
-#: ui/evolution-contact-list-editor.xml.h:10
+#: ui/evolution-contact-list-editor.xml.h:9
 msgid "Send _message to list..."
 msgstr ""
 
-#: ui/evolution-contact-list-editor.xml.h:12
-#, fuzzy
-msgid "_Delete..."
-msgstr "አጥፉ..."
-
 #: ui/evolution-event-editor.xml.h:1
 msgid "Cancel Mee_ting"
 msgstr ""
@@ -25886,9 +26124,8 @@ msgid "Permanently remove all deleted messages from all folders"
 msgstr ""
 
 #: ui/evolution-mail-global.xml.h:11
-#, fuzzy
-msgid "Post Ne_w Message"
-msgstr "%s - መልዕክት"
+msgid "Post New Message"
+msgstr ""
 
 #: ui/evolution-mail-global.xml.h:12
 msgid "Post a message to a Public folder"
@@ -25922,16 +26159,12 @@ msgstr ""
 msgid "Change the properties of this folder"
 msgstr ""
 
-#: ui/evolution-mail-list.xml.h:2 ui/evolution-mail-message.xml.h:10
+#: ui/evolution-mail-list.xml.h:2
 msgid "Copy selected message(s) to the clipboard"
 msgstr ""
 
-#: ui/evolution-mail-list.xml.h:3 ui/evolution-mail-message.xml.h:22
-msgid "Cut selected message(s) to the clipboard"
-msgstr ""
-
 #: ui/evolution-mail-list.xml.h:4
-msgid "E_xpunge"
+msgid "Cut selected message(s) to the clipboard"
 msgstr ""
 
 #: ui/evolution-mail-list.xml.h:5
@@ -25952,14 +26185,14 @@ msgid ""
 msgstr ""
 
 #: ui/evolution-mail-list.xml.h:9
-msgid "Mark All as _Read"
+msgid "Mark All as R_ead"
 msgstr ""
 
 #: ui/evolution-mail-list.xml.h:10
 msgid "Mark all visible messages as read"
 msgstr ""
 
-#: ui/evolution-mail-list.xml.h:11 ui/evolution-mail-message.xml.h:66
+#: ui/evolution-mail-list.xml.h:11
 msgid "Paste message(s) from the clipboard"
 msgstr ""
 
@@ -26003,37 +26236,26 @@ msgstr ""
 msgid "Threaded Message list"
 msgstr ""
 
-#: ui/evolution-mail-list.xml.h:25 ui/evolution.xml.h:47
+#: ui/evolution-mail-list.xml.h:26 ui/evolution-tasks.xml.h:18
+msgid "_Expunge"
+msgstr ""
+
+#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:47
 msgid "_Folder"
 msgstr "ዶሴ (_F)"
 
-#: ui/evolution-mail-list.xml.h:26 ui/evolution-subscribe.xml.h:12
+#: ui/evolution-mail-list.xml.h:28 ui/evolution-subscribe.xml.h:12
 msgid "_Invert Selection"
 msgstr ""
 
-#: ui/evolution-mail-list.xml.h:27
+#: ui/evolution-mail-list.xml.h:30
 msgid "_Properties..."
 msgstr "ምርጫዎች"
 
-#: ui/evolution-mail-list.xml.h:28
+#: ui/evolution-mail-list.xml.h:31
 msgid "_Threaded Message List"
 msgstr ""
 
-#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:6
-msgid "Close this window"
-msgstr "ይሄንን መስኮት ዝጋ"
-
-#: ui/evolution-mail-messagedisplay.xml.h:5
-#: ui/evolution-message-composer.xml.h:39 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:43
-msgid "_Close"
-msgstr "ዝጋ (_C)"
-
-#: ui/evolution-mail-messagedisplay.xml.h:8
-#: ui/evolution-message-composer.xml.h:49 ui/evolution.xml.h:64
-msgid "_View"
-msgstr "ተመልከት (_V)"
-
 #: ui/evolution-mail-message.xml.h:1
 msgid "A_dd Sender to Addressbook"
 msgstr ""
@@ -26051,409 +26273,401 @@ msgid "Apply filter rules to the selected messages"
 msgstr ""
 
 #: ui/evolution-mail-message.xml.h:5
-msgid "Caret _Mode"
-msgstr ""
-
-#: ui/evolution-mail-message.xml.h:6
 msgid "Compose a reply to all of the recipients of the selected message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:7
+#: ui/evolution-mail-message.xml.h:6
 msgid "Compose a reply to the mailing list of the selected message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:8
+#: ui/evolution-mail-message.xml.h:7
 msgid "Compose a reply to the sender of the selected message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:11
+#: ui/evolution-mail-message.xml.h:9
 msgid "Copy selected messages to another folder"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:12
+#: ui/evolution-mail-message.xml.h:10
 msgid "Create _Virtual Folder From Message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:13
+#: ui/evolution-mail-message.xml.h:11
 msgid "Create a rule to filter messages from this sender"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:14
+#: ui/evolution-mail-message.xml.h:12
 msgid "Create a rule to filter messages to these recipients"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:15
+#: ui/evolution-mail-message.xml.h:13
 msgid "Create a rule to filter messages to this mailing list"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:16
+#: ui/evolution-mail-message.xml.h:14
 msgid "Create a rule to filter messages with this subject"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:17
+#: ui/evolution-mail-message.xml.h:15
 msgid "Create a virtual folder for these recipients"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:18
+#: ui/evolution-mail-message.xml.h:16
 msgid "Create a virtual folder for this mailing list"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:19
+#: ui/evolution-mail-message.xml.h:17
 msgid "Create a virtual folder for this sender"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:20
+#: ui/evolution-mail-message.xml.h:18
 msgid "Create a virtual folder for this subject"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:23
+#: ui/evolution-mail-message.xml.h:19
 msgid "Decrease the text size"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:25
+#: ui/evolution-mail-message.xml.h:21
 msgid "Display the next important message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:26
+#: ui/evolution-mail-message.xml.h:22
 msgid "Display the next message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:27
+#: ui/evolution-mail-message.xml.h:23
 msgid "Display the next unread message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:28
+#: ui/evolution-mail-message.xml.h:24
 msgid "Display the next unread thread"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:29
+#: ui/evolution-mail-message.xml.h:25
 msgid "Display the previous important message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:30
+#: ui/evolution-mail-message.xml.h:26
 msgid "Display the previous message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:31
+#: ui/evolution-mail-message.xml.h:27
 msgid "Display the previous unread message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:32
+#: ui/evolution-mail-message.xml.h:28
 msgid "F_orward"
 msgstr "ወደፊት (_O)"
 
-#: ui/evolution-mail-message.xml.h:33
+#: ui/evolution-mail-message.xml.h:29
 msgid "Filter on Mailing _List..."
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:34
+#: ui/evolution-mail-message.xml.h:30
 msgid "Filter on Se_nder..."
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:35
+#: ui/evolution-mail-message.xml.h:31
 msgid "Filter on _Recipients..."
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:36
+#: ui/evolution-mail-message.xml.h:32
 msgid "Filter on _Subject..."
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:37
+#: ui/evolution-mail-message.xml.h:33
 msgid "Flag selected message(s) for follow-up"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:38
+#: ui/evolution-mail-message.xml.h:34
 msgid "Follow _Up..."
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:39
+#: ui/evolution-mail-message.xml.h:35
 msgid "Force images in HTML mail to be loaded"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:41
+#: ui/evolution-mail-message.xml.h:37
 msgid "Forward the selected message in the body of a new message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:42
+#: ui/evolution-mail-message.xml.h:38
 msgid "Forward the selected message quoted like a reply"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:43
+#: ui/evolution-mail-message.xml.h:39
 msgid "Forward the selected message to someone"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:44
+#: ui/evolution-mail-message.xml.h:40
 msgid "Forward the selected message to someone as an attachment"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:45
+#: ui/evolution-mail-message.xml.h:41
 msgid "Increase the text size"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:46
+#: ui/evolution-mail-message.xml.h:42
 msgid "Load _Images"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:47
-msgid "Mar_k as Read"
-msgstr ""
-
-#: ui/evolution-mail-message.xml.h:48
+#: ui/evolution-mail-message.xml.h:44
 msgid "Mark as I_mportant"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:49
+#: ui/evolution-mail-message.xml.h:45
 msgid "Mark as U_nread"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:50
+#: ui/evolution-mail-message.xml.h:46
 msgid "Mark as Unimp_ortant"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:51
+#: ui/evolution-mail-message.xml.h:47
 msgid "Mark the selected message(s) as having been read"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:52
+#: ui/evolution-mail-message.xml.h:48
 msgid "Mark the selected message(s) as important"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:53
+#: ui/evolution-mail-message.xml.h:49
 msgid "Mark the selected message(s) as not having been read"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:54
+#: ui/evolution-mail-message.xml.h:50
 msgid "Mark the selected message(s) as unimportant"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:55
+#: ui/evolution-mail-message.xml.h:51
 msgid "Mark the selected messages for deletion"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:56
+#: ui/evolution-mail-message.xml.h:52
 msgid "Move"
 msgstr "መንቀሳቅስ"
 
-#: ui/evolution-mail-message.xml.h:57
+#: ui/evolution-mail-message.xml.h:53
 msgid "Move selected message(s) to another folder"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:58
+#: ui/evolution-mail-message.xml.h:54
 msgid "Next"
 msgstr "የሚቀጥለው"
 
-#: ui/evolution-mail-message.xml.h:59
+#: ui/evolution-mail-message.xml.h:55
 msgid "Next _Important Message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:60
+#: ui/evolution-mail-message.xml.h:56
 msgid "Next _Thread"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:61
+#: ui/evolution-mail-message.xml.h:57
 msgid "Next _Unread Message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:62
+#: ui/evolution-mail-message.xml.h:58
 msgid "Open the selected message in a new window"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:63
+#: ui/evolution-mail-message.xml.h:59
 msgid "Open the selected message in the composer to re-send it"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:64
+#: ui/evolution-mail-message.xml.h:60
 msgid "Original Si_ze"
 msgstr "የመጀመሪያው መጠን (_Z)"
 
-#: ui/evolution-mail-message.xml.h:65
+#: ui/evolution-mail-message.xml.h:61
 msgid "P_revious Unread Message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:67
-msgid "Post a Repl_y"
+#: ui/evolution-mail-message.xml.h:62
+msgid "Post a Reply"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:68
+#: ui/evolution-mail-message.xml.h:63
 msgid "Post a reply to a message in a Public folder"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:69
+#: ui/evolution-mail-message.xml.h:64
 msgid "Pr_evious Important Message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:70
+#: ui/evolution-mail-message.xml.h:65
 msgid "Preview the message to be printed"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:71
+#: ui/evolution-mail-message.xml.h:66
 msgid "Previous"
 msgstr "የቀድሞው"
 
-#: ui/evolution-mail-message.xml.h:74
+#: ui/evolution-mail-message.xml.h:69
 msgid "Print this message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:75
+#: ui/evolution-mail-message.xml.h:70
 msgid "Re_direct"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:76
+#: ui/evolution-mail-message.xml.h:71
 msgid "Redirect (bounce) the selected message to someone"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:79
-msgid "Reply to _All"
-msgstr ""
-
-#: ui/evolution-mail-message.xml.h:80
-msgid "Reply to _List"
-msgstr ""
-
-#: ui/evolution-mail-message.xml.h:81
+#: ui/evolution-mail-message.xml.h:76
 msgid "Reset the text to its original size"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:82
-msgid "S_earch in Message..."
+#: ui/evolution-mail-message.xml.h:77
+msgid "S_earch Message..."
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:83
+#: ui/evolution-mail-message.xml.h:78
 msgid "S_maller"
 msgstr "አነስተኛ (_M)"
 
-#: ui/evolution-mail-message.xml.h:84
+#: ui/evolution-mail-message.xml.h:79
 msgid "Save the message as a text file"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:85
+#: ui/evolution-mail-message.xml.h:80
 msgid "Search for text in the body of the displayed message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:86
+#: ui/evolution-mail-message.xml.h:81
 msgid "Set up the page settings for your current printer"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:87
+#: ui/evolution-mail-message.xml.h:82
 msgid "Show Email _Source"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:88
+#: ui/evolution-mail-message.xml.h:83
 msgid "Show Full _Headers"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:89
-msgid "Show a blinking cursor in the body of displayed messages"
-msgstr ""
-
-#: ui/evolution-mail-message.xml.h:90
+#: ui/evolution-mail-message.xml.h:84
 msgid "Show message in the normal style"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:91
+#: ui/evolution-mail-message.xml.h:85
 msgid "Show message with all email headers"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:92
+#: ui/evolution-mail-message.xml.h:86
 msgid "Show the raw email source of the message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:93
+#: ui/evolution-mail-message.xml.h:87
 msgid "Text Si_ze"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:94
+#: ui/evolution-mail-message.xml.h:88
 msgid "Un-delete the selected messages"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:95
+#: ui/evolution-mail-message.xml.h:89
 msgid "VFolder on Mailing _List..."
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:96
+#: ui/evolution-mail-message.xml.h:90
 msgid "VFolder on Se_nder..."
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:97
+#: ui/evolution-mail-message.xml.h:91
 msgid "VFolder on _Recipients..."
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:98
+#: ui/evolution-mail-message.xml.h:92
 msgid "VFolder on _Subject..."
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:100
+#: ui/evolution-mail-message.xml.h:94
 msgid "_Attached"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:102
+#: ui/evolution-mail-message.xml.h:95
 msgid "_Copy to Folder"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:103
+#: ui/evolution-mail-message.xml.h:96
 msgid "_Create Filter From Message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:105
+#: ui/evolution-mail-message.xml.h:98
 msgid "_Forward Message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:106
+#: ui/evolution-mail-message.xml.h:99
 msgid "_Go To"
 msgstr "ሂድ ወደ (_G)"
 
-#: ui/evolution-mail-message.xml.h:107
+#: ui/evolution-mail-message.xml.h:100
 msgid "_Inline"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:108
+#: ui/evolution-mail-message.xml.h:101
 msgid "_Larger"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:109
+#: ui/evolution-mail-message.xml.h:102
 msgid "_Message Display"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:110
+#: ui/evolution-mail-message.xml.h:103
 msgid "_Move to Folder"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:111
+#: ui/evolution-mail-message.xml.h:104
 msgid "_Next Message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:112
+#: ui/evolution-mail-message.xml.h:105
 msgid "_Normal Display"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:113
+#: ui/evolution-mail-message.xml.h:106
 msgid "_Open Message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:115
+#: ui/evolution-mail-message.xml.h:107
 msgid "_Previous Message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:117
+#: ui/evolution-mail-message.xml.h:109
 msgid "_Quoted"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:118
-msgid "_Reply to Sender"
-msgstr ""
-
-#: ui/evolution-mail-message.xml.h:119
+#: ui/evolution-mail-message.xml.h:111
 msgid "_Resend..."
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:121 ui/evolution.xml.h:63
+#: ui/evolution-mail-message.xml.h:113 ui/evolution.xml.h:63
 msgid "_Tools"
 msgstr "መሣሪያዎች (_T)"
 
-#: ui/evolution-mail-message.xml.h:122
+#: ui/evolution-mail-message.xml.h:114
 msgid "_Undelete"
 msgstr "አታጥፋ (_U)"
 
+#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:6
+msgid "Close this window"
+msgstr "ይሄንን መስኮት ዝጋ"
+
+#: ui/evolution-mail-messagedisplay.xml.h:5
+#: ui/evolution-message-composer.xml.h:39
+#: ui/evolution-signature-editor.xml.h:10 ui/evolution-subscribe.xml.h:9
+#: ui/evolution.xml.h:43
+msgid "_Close"
+msgstr "ዝጋ (_C)"
+
+#: ui/evolution-mail-messagedisplay.xml.h:8
+#: ui/evolution-message-composer.xml.h:49 ui/evolution.xml.h:64
+msgid "_View"
+msgstr "ተመልከት (_V)"
+
 #: ui/evolution-message-composer.xml.h:1
 msgid "Attach"
 msgstr ""
@@ -26462,7 +26676,7 @@ msgstr ""
 msgid "Attach a file"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:4 ui/evolution-signature-editor.xml.h:3
+#: ui/evolution-message-composer.xml.h:4 ui/evolution-signature-editor.xml.h:2
 msgid "Close the current file"
 msgstr "የአሁኑን ፋይል ዝጋ"
 
@@ -26478,7 +26692,7 @@ msgstr ""
 msgid "Encrypt this message with your S/MIME Encryption Cetificate"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:8 ui/evolution-signature-editor.xml.h:4
+#: ui/evolution-message-composer.xml.h:8 ui/evolution-signature-editor.xml.h:3
 msgid "For_mat"
 msgstr "ፎርማት (_M)"
 
@@ -26510,11 +26724,6 @@ msgstr ""
 msgid "S/MIME Sign"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:16
-#: ui/evolution-signature-editor.xml.h:6
-msgid "Save"
-msgstr "አስቀምጥ"
-
 #: ui/evolution-message-composer.xml.h:17
 msgid "Save As"
 msgstr "በሌላ ስም አስቀምጥ"
@@ -26528,7 +26737,7 @@ msgid "Save in folder..."
 msgstr ""
 
 #: ui/evolution-message-composer.xml.h:21
-#: ui/evolution-signature-editor.xml.h:9
+#: ui/evolution-signature-editor.xml.h:7
 msgid "Save the current file"
 msgstr "የአሁኑን ፋይል አስቀምጥ"
 
@@ -26545,7 +26754,7 @@ msgid "Send"
 msgstr "ላክ"
 
 #: ui/evolution-message-composer.xml.h:25
-#: ui/evolution-signature-editor.xml.h:11
+#: ui/evolution-signature-editor.xml.h:9
 msgid "Send the mail in HTML format"
 msgstr ""
 
@@ -26610,7 +26819,7 @@ msgid "_From Field"
 msgstr ""
 
 #: ui/evolution-message-composer.xml.h:44
-#: ui/evolution-signature-editor.xml.h:14
+#: ui/evolution-signature-editor.xml.h:13
 msgid "_Insert"
 msgstr "አስገባ (_I)"
 
@@ -26626,11 +26835,11 @@ msgstr ""
 msgid "_Security"
 msgstr "_ደህነት"
 
-#: ui/evolution-signature-editor.xml.h:5
+#: ui/evolution-signature-editor.xml.h:4
 msgid "H_TML"
 msgstr "H_TML"
 
-#: ui/evolution-signature-editor.xml.h:10
+#: ui/evolution-signature-editor.xml.h:8
 msgid "Save the current file and close the window"
 msgstr ""
 
@@ -26706,19 +26915,15 @@ msgstr ""
 msgid "Mar_k as Complete"
 msgstr ""
 
-#: ui/evolution-tasks.xml.h:9
-msgid "Mark selected tasks as complete"
-msgstr ""
-
-#: ui/evolution-tasks.xml.h:11
+#: ui/evolution-tasks.xml.h:10
 msgid "Paste task from the clipboard"
 msgstr ""
 
-#: ui/evolution-tasks.xml.h:12
+#: ui/evolution-tasks.xml.h:11
 msgid "Previews the list of tasks to be printed"
 msgstr ""
 
-#: ui/evolution-tasks.xml.h:14
+#: ui/evolution-tasks.xml.h:13
 msgid "Print the list of tasks"
 msgstr ""
 
@@ -26968,31 +27173,27 @@ msgid "_Work Week View"
 msgstr ""
 
 #: views/mail/galview.xml.h:1
-#, fuzzy
-msgid "As _Sent Folder"
-msgstr "ዶሴ ምረጡ"
+msgid "As Sent Folder"
+msgstr ""
 
 #: views/mail/galview.xml.h:2
-#, fuzzy
-msgid "By S_tatus"
-msgstr "በሁኔታ"
+msgid "By Follow Up Flag"
+msgstr ""
 
 #: views/mail/galview.xml.h:3
-msgid "By Se_nder"
+msgid "By Sender"
 msgstr ""
 
 #: views/mail/galview.xml.h:4
-#, fuzzy
-msgid "By Su_bject"
-msgstr "በጉዳዩ"
+msgid "By Status"
+msgstr "በሁኔታ"
 
 #: views/mail/galview.xml.h:5
-msgid "By _Follow Up Flag"
-msgstr ""
+msgid "By Subject"
+msgstr "በጉዳዩ"
 
 #: views/mail/galview.xml.h:6
-#, fuzzy
-msgid "_Messages"
+msgid "Messages"
 msgstr "መልዕክቶች"
 
 #: views/tasks/galview.xml.h:1
@@ -27048,20 +27249,20 @@ msgstr ""
 
 #. Translators: These are the first characters of each day of the
 #. week, 'M' for 'Monday', 'T' for Tuesday etc.
-#: widgets/misc/e-calendar-item.c:456
+#: widgets/misc/e-calendar-item.c:427
 msgid "MTWTFSS"
 msgstr "ሳማረሐዓቅእ"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: widgets/misc/e-calendar-item.c:1174
+#: widgets/misc/e-calendar-item.c:1127
 msgid "%B %Y"
 msgstr "%B %Y"
 
-#: widgets/misc/e-cell-date-edit.c:241 widgets/misc/e-dateedit.c:431
+#: widgets/misc/e-cell-date-edit.c:241 widgets/misc/e-dateedit.c:428
 msgid "Now"
 msgstr "አሁኑኑ"
 
-#: widgets/misc/e-cell-date-edit.c:249 widgets/misc/e-dateedit.c:437
+#: widgets/misc/e-cell-date-edit.c:249 widgets/misc/e-dateedit.c:434
 msgid "Today"
 msgstr "ዛሬ"
 
@@ -27178,6 +27379,22 @@ msgstr ""
 msgid "_Advanced..."
 msgstr "ጠለቅ... (_A)"
 
+#: widgets/misc/e-messagebox.c:154
+msgid "Information"
+msgstr "መረጃ"
+
+#: widgets/misc/e-messagebox.c:168
+msgid "Error"
+msgstr "ስህተት"
+
+#: widgets/misc/e-messagebox.c:175
+msgid "Question"
+msgstr "ጥያቄ"
+
+#: widgets/misc/e-messagebox.c:182
+msgid "Message"
+msgstr "መልዕክት"
+
 #: widgets/misc/e-search-bar.c:531
 msgid "_Search"
 msgstr "ፈልግ"
@@ -27223,98 +27440,6 @@ msgstr ""
 msgid "Evolution Addressbook local file backend"
 msgstr ""
 
-#~ msgid "Group"
-#~ msgstr "የውይይት መድረክ"
-
-#~ msgid "%d new"
-#~ msgstr "%d አዲስ"
-
-#~ msgid ", "
-#~ msgstr "፣ "
-
-#~ msgid "%d hidden"
-#~ msgstr "%d የተደበቀ"
-
-#~ msgid "%d visible"
-#~ msgstr "%d የሚታይ"
-
-#~ msgid "%d selected"
-#~ msgstr "%d ተመርጠዋል"
-
-#~ msgid "%d sent"
-#~ msgstr "%d ተልኳል"
-
-#~ msgid "%d total"
-#~ msgstr "%d አጠቃላይ"
-
-#~ msgid "_Print"
-#~ msgstr "አትም"
-
-#~ msgid "_Forward"
-#~ msgstr "ወደፊት፦"
-
-#~ msgid "U_ndelete"
-#~ msgstr "አታጥፋ"
-
-#~ msgid "Properties for \"%s\""
-#~ msgstr "ለ \"%s\"ን ምርጫዎች"
-
-#~ msgid "Properties"
-#~ msgstr "ምርጫዎች"
-
-#~ msgid "Filters"
-#~ msgstr "አጣራዎች"
-
-#, fuzzy
-#~ msgid "Save all attachments..."
-#~ msgstr "ምስሉን በሌላ ስም አስቀምጥ"
-
-#~ msgid "Hide"
-#~ msgstr "ደብቅ"
-
-#, fuzzy
-#~ msgid "by %B %d, %Y, %l:%M %p"
-#~ msgstr "%b %d %l:%M %p"
-
-#~ msgid "Copy Link Location"
-#~ msgstr "አያያዝ ቦታ ቅጂ"
-
-#~ msgid "Save Image as..."
-#~ msgstr "ምስሉን በሌላ ስም አስቀምጥ"
-
-#~ msgid "Cc"
-#~ msgstr "Cc"
-
-#~ msgid "Bcc"
-#~ msgstr "Bcc"
-
-#~ msgid "Find:"
-#~ msgstr "ፈልግ"
-
-#~ msgid "%s - Message"
-#~ msgstr "%s - መልዕክት"
-
-#~ msgid "URL:"
-#~ msgstr "url"
-
-#~ msgid "_Save as..."
-#~ msgstr "በሌላ ስም አስቀምጥ"
-
-#~ msgid "Print..."
-#~ msgstr "አትም"
-
-#~ msgid "Save As..."
-#~ msgstr "በሌላ ስም አስቀምጥ..."
-
-#~ msgid "Information"
-#~ msgstr "መረጃ"
-
-#~ msgid "Question"
-#~ msgstr "ጥያቄ"
-
-#~ msgid "Message"
-#~ msgstr "መልዕክት"
-
 #~ msgid "Search"
 #~ msgstr "&ፈልግ"
 
diff --git a/po/az.po b/po/az.po
index e97597558a..8676f7589b 100644
--- a/po/az.po
+++ b/po/az.po
@@ -5,210 +5,59 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 0.99.2\n"
-"POT-Creation-Date: 2003-10-15 23:45+0200\n"
+"POT-Creation-Date: 2003-06-25 13:24-0400\n"
 "PO-Revision-Date: 2001-12-19 19:21GMT+0200\n"
 "Last-Translator: Vasif İsmayıloğlu MD <azerb_linux@hotmail.com>\n"
 "Language-Team: Azerbaijani Turkic <linuxaz@azerimail.net>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Report-Msgid-Bugs-To: \n"
 "X-Generator: KBabel 0.9.5\n"
 
-#: addressbook/backend/ebook/e-card.c:1306
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in.h:1
+#, fuzzy
+msgid "Evolution LDIF importer"
+msgstr "Evolution İdxalçı Yardımçısı"
+
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in.h:2
+msgid "LDAP Data Interchange Format (.ldif)"
+msgstr ""
+
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:1
+#, fuzzy
+msgid "Evolution VCard Importer"
+msgstr "Evolutionun ePoçt yazıçısı."
+
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:2
+#, fuzzy
+msgid "Evolution VCard importer"
+msgstr "Evolutionun ePoçt yazıçısı."
+
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:3
+msgid "VCard (.vcf, .gcrd)"
+msgstr ""
+
 #: addressbook/backend/ebook/e-card-simple.c:60
+#: addressbook/backend/ebook/e-card.c:1306
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:15
 msgid "File As"
 msgstr "Fərqli Qeyd Et"
 
-#: addressbook/backend/ebook/e-card.c:1313
-#: addressbook/gui/contact-editor/fullname.glade.h:4
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:17
-msgid "Full Name"
-msgstr "Tam Ad"
-
-#: addressbook/backend/ebook/e-card.c:1320
 #: addressbook/backend/ebook/e-card-simple.c:61
-#: addressbook/gui/component/select-names/e-select-names.etspec.h:1
+#: addressbook/backend/ebook/e-card.c:1320
 #: addressbook/gui/component/select-names/e-select-names-section.etspec.h:1
+#: addressbook/gui/component/select-names/e-select-names.etspec.h:1
 #: addressbook/gui/contact-editor/e-contact-editor-fullname.c:89
 #: my-evolution/e-summary-table.c:59
 msgid "Name"
 msgstr "Ad"
 
-#: addressbook/backend/ebook/e-card.c:1326
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:96
-#, fuzzy
-msgid "Address"
-msgstr "_Ünvan :"
-
-#: addressbook/backend/ebook/e-card.c:1333
-#, fuzzy
-msgid "Address Label"
-msgstr "Ünvan Kartları"
-
-#: addressbook/backend/ebook/e-card.c:1340
-#, fuzzy
-msgid "Phone"
-msgstr "Yoxdur"
-
-#: addressbook/backend/ebook/e-card.c:1347
 #: addressbook/backend/ebook/e-card-simple.c:62
+#: addressbook/backend/ebook/e-card.c:1347
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
 msgid "Email"
 msgstr "ePoçt"
 
-#: addressbook/backend/ebook/e-card.c:1354
-#, fuzzy
-msgid "Birth date"
-msgstr "Ad Günü"
-
-#: addressbook/backend/ebook/e-card.c:1360
-#: calendar/gui/e-calendar-table.etspec.h:18
-msgid "URL"
-msgstr "URL"
-
-#: addressbook/backend/ebook/e-card.c:1367
-#: addressbook/backend/ebook/e-card-simple.c:69
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
-msgid "Organization"
-msgstr "Quruluş"
-
-#: addressbook/backend/ebook/e-card.c:1374
-#, fuzzy
-msgid "Organizational Unit"
-msgstr "Quruluş"
-
-#: addressbook/backend/ebook/e-card.c:1381
-#: addressbook/backend/ebook/e-card-simple.c:90
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
-msgid "Office"
-msgstr "İdarə"
-
-#: addressbook/backend/ebook/e-card.c:1388
-#: addressbook/backend/ebook/e-card-simple.c:91
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:39
-msgid "Title"
-msgstr "Başlıq"
-
-#: addressbook/backend/ebook/e-card.c:1395
-#: calendar/gui/e-meeting-time-sel.etspec.h:9
-msgid "Role"
-msgstr "Rolu"
-
-#: addressbook/backend/ebook/e-card.c:1402
-#: addressbook/backend/ebook/e-card-simple.c:93
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
-msgid "Manager"
-msgstr "İdarəci"
-
-#: addressbook/backend/ebook/e-card.c:1409
-#: addressbook/backend/ebook/e-card-simple.c:64
-#: addressbook/backend/ebook/e-card-simple.c:94
-#: addressbook/gui/contact-editor/e-contact-editor.c:1737
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:2
-msgid "Assistant"
-msgstr "Köməkçi"
-
-#: addressbook/backend/ebook/e-card.c:1416
-#: addressbook/backend/ebook/e-card-simple.c:95
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-msgid "Nickname"
-msgstr "Ləqəb"
-
-#: addressbook/backend/ebook/e-card.c:1423
-#: addressbook/backend/ebook/e-card-simple.c:96
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:36
-msgid "Spouse"
-msgstr "Yoldaş"
-
-#: addressbook/backend/ebook/e-card.c:1430
-#: addressbook/backend/ebook/e-card-simple.c:101
-msgid "Anniversary"
-msgstr "İldönümü"
-
-#: addressbook/backend/ebook/e-card.c:1436
-#, fuzzy
-msgid "Mailer"
-msgstr ""
-"\n"
-"Göndərici:  "
-
-#: addressbook/backend/ebook/e-card.c:1443
-#: addressbook/backend/ebook/e-card-simple.c:98
-msgid "Calendar URI"
-msgstr "Təqvim URI"
-
-#: addressbook/backend/ebook/e-card.c:1450
-#, fuzzy
-msgid "Free/Busy URL"
-msgstr "Sə_rbəst/Məşğul URL:"
-
-#: addressbook/backend/ebook/e-card.c:1457
-#, fuzzy
-msgid "ICS Calendar"
-msgstr "Təqvim"
-
-#: addressbook/backend/ebook/e-card.c:1464
-#: addressbook/backend/ebook/e-card-simple.c:97
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
-msgid "Note"
-msgstr "Qeyd"
-
-#: addressbook/backend/ebook/e-card.c:1471
-#, fuzzy
-msgid "Related Contacts"
-msgstr "Əlaqəni Silimmi?"
-
-#: addressbook/backend/ebook/e-card.c:1478
-#: addressbook/backend/ebook/e-card-simple.c:105
-#: calendar/gui/e-calendar-table.etspec.h:4
-msgid "Categories"
-msgstr "Kateqoriyalar"
-
-#: addressbook/backend/ebook/e-card.c:1485
-#, fuzzy
-msgid "Category List"
-msgstr "Kateqoriya"
-
-#: addressbook/backend/ebook/e-card.c:1492
-msgid "Wants HTML"
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:1499
-msgid "Wants HTML set"
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:1506 ui/evolution-calendar.xml.h:16
-#, fuzzy
-msgid "List"
-msgstr "siyahı"
-
-#: addressbook/backend/ebook/e-card.c:1513
-#, fuzzy
-msgid "List Show Addresses"
-msgstr "BaşqaÜnvanlar"
-
-#: addressbook/backend/ebook/e-card.c:1520
-#, fuzzy
-msgid "Arbitrary"
-msgstr "İlk"
-
-#: addressbook/backend/ebook/e-card.c:1527
-#, fuzzy
-msgid "ID"
-msgstr "I"
-
-#: addressbook/backend/ebook/e-card.c:1534
-#, fuzzy
-msgid "Last Use"
-msgstr "Yapışdır"
-
-#: addressbook/backend/ebook/e-card.c:1545
-#, fuzzy
-msgid "Use Score"
-msgstr "Xal"
-
 #: addressbook/backend/ebook/e-card-simple.c:63
 #: addressbook/gui/contact-editor/e-contact-editor.c:1752
 msgid "Primary"
@@ -218,6 +67,14 @@ msgstr "İlk"
 msgid "Prim"
 msgstr "İlk"
 
+#: addressbook/backend/ebook/e-card-simple.c:64
+#: addressbook/backend/ebook/e-card-simple.c:94
+#: addressbook/backend/ebook/e-card.c:1409
+#: addressbook/gui/contact-editor/e-contact-editor.c:1737
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:2
+msgid "Assistant"
+msgstr "Köməkçi"
+
 #: addressbook/backend/ebook/e-card-simple.c:65
 #: addressbook/backend/ebook/e-card-simple.c:70
 #: addressbook/gui/contact-editor/e-contact-editor.c:1738
@@ -252,6 +109,12 @@ msgid "Home"
 msgstr "Ev"
 
 #: addressbook/backend/ebook/e-card-simple.c:69
+#: addressbook/backend/ebook/e-card.c:1367
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
+msgid "Organization"
+msgstr "Quruluş"
+
+#: addressbook/backend/ebook/e-card-simple.c:69
 msgid "Org"
 msgstr "Qur"
 
@@ -370,9 +233,21 @@ msgid "Dep"
 msgstr "Böl"
 
 #: addressbook/backend/ebook/e-card-simple.c:90
+#: addressbook/backend/ebook/e-card.c:1381
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
+msgid "Office"
+msgstr "İdarə"
+
+#: addressbook/backend/ebook/e-card-simple.c:90
 msgid "Off"
 msgstr "Qapalı"
 
+#: addressbook/backend/ebook/e-card-simple.c:91
+#: addressbook/backend/ebook/e-card.c:1388
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:39
+msgid "Title"
+msgstr "Başlıq"
+
 #: addressbook/backend/ebook/e-card-simple.c:92
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:34
 msgid "Profession"
@@ -383,6 +258,12 @@ msgid "Prof"
 msgstr "Məs"
 
 #: addressbook/backend/ebook/e-card-simple.c:93
+#: addressbook/backend/ebook/e-card.c:1402
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
+msgid "Manager"
+msgstr "İdarəci"
+
+#: addressbook/backend/ebook/e-card-simple.c:93
 msgid "Man"
 msgstr "İda"
 
@@ -391,9 +272,32 @@ msgid "Ass"
 msgstr "Yar"
 
 #: addressbook/backend/ebook/e-card-simple.c:95
+#: addressbook/backend/ebook/e-card.c:1416
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
+msgid "Nickname"
+msgstr "Ləqəb"
+
+#: addressbook/backend/ebook/e-card-simple.c:95
 msgid "Nick"
 msgstr "ULəqəb"
 
+#: addressbook/backend/ebook/e-card-simple.c:96
+#: addressbook/backend/ebook/e-card.c:1423
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:36
+msgid "Spouse"
+msgstr "Yoldaş"
+
+#: addressbook/backend/ebook/e-card-simple.c:97
+#: addressbook/backend/ebook/e-card.c:1464
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
+msgid "Note"
+msgstr "Qeyd"
+
+#: addressbook/backend/ebook/e-card-simple.c:98
+#: addressbook/backend/ebook/e-card.c:1443
+msgid "Calendar URI"
+msgstr "Təqvim URI"
+
 #: addressbook/backend/ebook/e-card-simple.c:98
 msgid "CALUri"
 msgstr "TƏQUri"
@@ -417,6 +321,11 @@ msgid "icsCalendar"
 msgstr "Təqvim"
 
 #: addressbook/backend/ebook/e-card-simple.c:101
+#: addressbook/backend/ebook/e-card.c:1430
+msgid "Anniversary"
+msgstr "İldönümü"
+
+#: addressbook/backend/ebook/e-card-simple.c:101
 msgid "Anniv"
 msgstr "İldö"
 
@@ -424,6 +333,12 @@ msgstr "İldö"
 msgid "Birth Date"
 msgstr "Ad Günü"
 
+#: addressbook/backend/ebook/e-card-simple.c:105
+#: addressbook/backend/ebook/e-card.c:1478
+#: calendar/gui/e-calendar-table.etspec.h:4
+msgid "Categories"
+msgstr "Kateqoriyalar"
+
 #: addressbook/backend/ebook/e-card-simple.c:106
 msgid "Family Name"
 msgstr "Soyad"
@@ -439,34 +354,125 @@ msgid "%x"
 msgstr "%x"
 
 #: addressbook/backend/ebook/e-card-simple.c:912
-#: addressbook/backend/ebook/e-destination.c:709
+#: addressbook/backend/ebook/e-destination.c:706
 #, fuzzy
 msgid "Unnamed List"
 msgstr "Adsız Əlaqələr Siyahısı"
 
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in.h:1
+#: addressbook/backend/ebook/e-card.c:1313
+#: addressbook/gui/contact-editor/fullname.glade.h:4
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:17
+msgid "Full Name"
+msgstr "Tam Ad"
+
+#: addressbook/backend/ebook/e-card.c:1326
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:96
 #, fuzzy
-msgid "Evolution LDIF importer"
-msgstr "Evolution İdxalçı Yardımçısı"
+msgid "Address"
+msgstr "_Ünvan :"
 
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in.h:2
-msgid "LDAP Data Interchange Format (.ldif)"
+#: addressbook/backend/ebook/e-card.c:1333
+#, fuzzy
+msgid "Address Label"
+msgstr "Ünvan Kartları"
+
+#: addressbook/backend/ebook/e-card.c:1340
+#, fuzzy
+msgid "Phone"
+msgstr "Yoxdur"
+
+#: addressbook/backend/ebook/e-card.c:1354
+#, fuzzy
+msgid "Birth date"
+msgstr "Ad Günü"
+
+#: addressbook/backend/ebook/e-card.c:1360
+#: calendar/gui/e-calendar-table.etspec.h:19
+msgid "URL"
+msgstr "URL"
+
+#: addressbook/backend/ebook/e-card.c:1374
+#, fuzzy
+msgid "Organizational Unit"
+msgstr "Quruluş"
+
+#: addressbook/backend/ebook/e-card.c:1395
+#: calendar/gui/dialogs/meeting-page.etspec.h:9
+#: calendar/gui/e-meeting-time-sel.etspec.h:9
+msgid "Role"
+msgstr "Rolu"
+
+#: addressbook/backend/ebook/e-card.c:1436 mail/mail-format.c:963
+#, fuzzy
+msgid "Mailer"
 msgstr ""
+"\n"
+"Göndərici:  "
 
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:1
+#: addressbook/backend/ebook/e-card.c:1450
 #, fuzzy
-msgid "Evolution VCard Importer"
-msgstr "Evolutionun ePoçt yazıçısı."
+msgid "Free/Busy URL"
+msgstr "Sə_rbəst/Məşğul URL:"
 
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:2
+#: addressbook/backend/ebook/e-card.c:1457
 #, fuzzy
-msgid "Evolution VCard importer"
-msgstr "Evolutionun ePoçt yazıçısı."
+msgid "ICS Calendar"
+msgstr "Təqvim"
 
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:3
-msgid "VCard (.vcf, .gcrd)"
+#: addressbook/backend/ebook/e-card.c:1471
+#, fuzzy
+msgid "Related Contacts"
+msgstr "Əlaqəni Silimmi?"
+
+#: addressbook/backend/ebook/e-card.c:1485
+#, fuzzy
+msgid "Category List"
+msgstr "Kateqoriya"
+
+#: addressbook/backend/ebook/e-card.c:1492
+msgid "Wants HTML"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:1499
+msgid "Wants HTML set"
 msgstr ""
 
+#: addressbook/backend/ebook/e-card.c:1506
+#, fuzzy
+msgid "List"
+msgstr "siyahı"
+
+#: addressbook/backend/ebook/e-card.c:1513
+#, fuzzy
+msgid "List Show Addresses"
+msgstr "BaşqaÜnvanlar"
+
+#: addressbook/backend/ebook/e-card.c:1520
+#, fuzzy
+msgid "Arbitrary"
+msgstr "İlk"
+
+#: addressbook/backend/ebook/e-card.c:1527
+#, fuzzy
+msgid "ID"
+msgstr "I"
+
+#: addressbook/backend/ebook/e-card.c:1534
+#, fuzzy
+msgid "Last Use"
+msgstr "Yapışdır"
+
+#: addressbook/backend/ebook/e-card.c:1545
+#, fuzzy
+msgid "Use Score"
+msgstr "Xal"
+
+#: addressbook/backend/ebook/test-client-list.c:15
+#: addressbook/backend/ebook/test-client.c:33
+#: calendar/gui/alarm-notify/notify-main.c:171
+msgid "Could not initialize Bonobo"
+msgstr "Bonoboyu başlada bilmədim"
+
 #: addressbook/backend/pas/pas-backend-file.c:464
 #: addressbook/backend/pas/pas-backend-ldap.c:3050
 msgid "Searching..."
@@ -527,14 +533,14 @@ msgid "EBook not loaded\n"
 msgstr "eKitab yüklənmədi\n"
 
 #: addressbook/conduit/address-conduit.c:1376
-#: calendar/conduits/calendar/calendar-conduit.c:1351
-#: calendar/conduits/todo/todo-conduit.c:893
+#: calendar/conduits/calendar/calendar-conduit.c:1342
+#: calendar/conduits/todo/todo-conduit.c:884
 msgid "Could not start wombat server"
 msgstr "Wombat xidməti başladıla bilmədi"
 
 #: addressbook/conduit/address-conduit.c:1377
-#: calendar/conduits/calendar/calendar-conduit.c:1352
-#: calendar/conduits/todo/todo-conduit.c:894
+#: calendar/conduits/calendar/calendar-conduit.c:1343
+#: calendar/conduits/todo/todo-conduit.c:885
 msgid "Could not start wombat"
 msgstr "Wombatı başlada bilmədim"
 
@@ -543,6 +549,160 @@ msgstr "Wombatı başlada bilmədim"
 msgid "Could not read pilot's Address application block"
 msgstr "Pilot Ünvan əlavələri bloku oxuna bilmədi"
 
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
+msgid "Configure access to LDAP directory servers here"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
+msgid "Directory Servers"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
+#, fuzzy
+msgid "Evolution Addressbook"
+msgstr "Ünvan dəftərini düzəlt"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
+#, fuzzy
+msgid "Evolution Addressbook LDAP Configuration Control"
+msgstr "Evolution Ünvan Dəftəri ad seçmə ara üzü."
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
+#, fuzzy
+msgid "Evolution Addressbook address pop-up"
+msgstr "Ünvan Dəftərində ünvan göstərici emalatxanası"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
+#, fuzzy
+msgid "Evolution Addressbook address viewer"
+msgstr "Evolution Ünvan Dəftəri kiçik kart nümaiyişi"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
+#, fuzzy
+msgid "Evolution Addressbook card viewer"
+msgstr "Evolution Ünvan Dəftəri kiçik kart nümaiyişi"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
+#, fuzzy
+msgid "Evolution Addressbook component"
+msgstr "Evolution Ünvan Dəftəri kiçik kart nümaiyişi"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
+#, fuzzy
+msgid "Evolution Addressbook folder viewer"
+msgstr "Evolution Ünvan Dəftəri kiçik kart nümaiyişi"
+
+#: addressbook/gui/component/addressbook-component.c:76
+#: addressbook/gui/component/addressbook-component.c:620
+#: importers/netscape-importer.c:1874 mail/importers/netscape-importer.c:1844
+#: shell/e-local-storage.c:178 shell/e-shortcuts.c:1087
+msgid "Contacts"
+msgstr "Əlaqələr"
+
+#: addressbook/gui/component/addressbook-component.c:76
+msgid "Folder containing contact information"
+msgstr "Əlaqələr məlumatını daxil edən qovluq."
+
+#: addressbook/gui/component/addressbook-component.c:78
+msgid "LDAP Server"
+msgstr "LDAP Vericisi"
+
+#: addressbook/gui/component/addressbook-component.c:78
+msgid "LDAP server containing contact information"
+msgstr "Əlaqələr məlumatını daxil edən LDAP verici."
+
+#: addressbook/gui/component/addressbook-component.c:80
+#, fuzzy
+msgid "Public Contacts"
+msgstr "Əlaqələr"
+
+#: addressbook/gui/component/addressbook-component.c:80
+#, fuzzy
+msgid "Public folder containing contact information"
+msgstr "Əlaqələr məlumatını daxil edən qovluq."
+
+#: addressbook/gui/component/addressbook-component.c:574
+msgid "New Contact"
+msgstr "Yeni Əlaqə"
+
+#: addressbook/gui/component/addressbook-component.c:574
+msgid "_Contact"
+msgstr "_Əlaqə"
+
+#: addressbook/gui/component/addressbook-component.c:575
+#, fuzzy
+msgid "Create a new contact"
+msgstr "Yeni bir hesab yarat"
+
+#: addressbook/gui/component/addressbook-component.c:578
+msgid "New Contact List"
+msgstr "Yeni Əlaqə Siyahısı"
+
+#: addressbook/gui/component/addressbook-component.c:578
+#, fuzzy
+msgid "Contact _List"
+msgstr "_Əlaqə Siyahısı"
+
+#: addressbook/gui/component/addressbook-component.c:579
+#, fuzzy
+msgid "Create a new contact list"
+msgstr "Yeni bir əlaqə siyahısı yarat"
+
+#: addressbook/gui/component/addressbook-config.c:206
+#, fuzzy
+msgid "Failed to connect to LDAP server"
+msgstr "LDAP vericiyə bağlanma xətası."
+
+#: addressbook/gui/component/addressbook-config.c:231
+#, fuzzy
+msgid "Failed to authenticate with LDAP server"
+msgstr ""
+"IMAP vericisinə tanıdılma xətası.\n"
+"%s\n"
+"\n"
+
+#: addressbook/gui/component/addressbook-config.c:259
+msgid "Could not perform query on Root DSE"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:682
+msgid "The server responded with no supported search bases"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:1193
+#, fuzzy
+msgid "This server does not support LDAPv3 schema information"
+msgstr "IMAP vericisi cavabı %s məlumatını daxil etmir"
+
+#: addressbook/gui/component/addressbook-config.c:1215
+#, fuzzy
+msgid "Error retrieving schema information"
+msgstr ""
+"Süzgəc məlumatını yükləmə xətası:\n"
+"%s"
+
+#: addressbook/gui/component/addressbook-config.c:1223
+#, fuzzy
+msgid "Server did not respond with valid schema information"
+msgstr "IMAP vericisi cavabı %s məlumatını daxil etmir"
+
+#: addressbook/gui/component/addressbook-config.c:1637
+msgid "Account Name"
+msgstr "Hesab Adı"
+
+#: addressbook/gui/component/addressbook-config.c:1639
+msgid "Server Name"
+msgstr "Verici Adı"
+
+#: addressbook/gui/component/addressbook-config.c:1676
+#, fuzzy
+msgid "LDAP was not enabled in this build of Evolution"
+msgstr "(Evolution proqramının bu inşasında SSL dəstəyi yoxdur)"
+
+#: addressbook/gui/component/addressbook-storage.c:178
+msgid "Other Contacts"
+msgstr "Digər Əlaqələr"
+
 #: addressbook/gui/component/addressbook.c:502
 msgid ""
 "We were unable to open this addressbook.  Please check that the\n"
@@ -668,117 +828,6 @@ msgstr "Hər Hansı Kateqoriya"
 msgid "The URI that the Folder Browser will display"
 msgstr "Qovluq Səyyahını göstərəcək olan URI"
 
-#: addressbook/gui/component/addressbook-component.c:76
-#: addressbook/gui/component/addressbook-component.c:628
-#: importers/netscape-importer.c:1874 mail/importers/netscape-importer.c:1844
-#: shell/e-local-storage.c:178 shell/e-shortcuts.c:1087
-msgid "Contacts"
-msgstr "Əlaqələr"
-
-#: addressbook/gui/component/addressbook-component.c:76
-msgid "Folder containing contact information"
-msgstr "Əlaqələr məlumatını daxil edən qovluq."
-
-#: addressbook/gui/component/addressbook-component.c:78
-msgid "LDAP Server"
-msgstr "LDAP Vericisi"
-
-#: addressbook/gui/component/addressbook-component.c:78
-msgid "LDAP server containing contact information"
-msgstr "Əlaqələr məlumatını daxil edən LDAP verici."
-
-#: addressbook/gui/component/addressbook-component.c:80
-#, fuzzy
-msgid "Public Contacts"
-msgstr "Əlaqələr"
-
-#: addressbook/gui/component/addressbook-component.c:80
-#, fuzzy
-msgid "Public folder containing contact information"
-msgstr "Əlaqələr məlumatını daxil edən qovluq."
-
-#: addressbook/gui/component/addressbook-component.c:582
-msgid "New Contact"
-msgstr "Yeni Əlaqə"
-
-#: addressbook/gui/component/addressbook-component.c:582
-msgid "_Contact"
-msgstr "_Əlaqə"
-
-#: addressbook/gui/component/addressbook-component.c:583
-#, fuzzy
-msgid "Create a new contact"
-msgstr "Yeni bir hesab yarat"
-
-#: addressbook/gui/component/addressbook-component.c:586
-msgid "New Contact List"
-msgstr "Yeni Əlaqə Siyahısı"
-
-#: addressbook/gui/component/addressbook-component.c:586
-#, fuzzy
-msgid "Contact _List"
-msgstr "_Əlaqə Siyahısı"
-
-#: addressbook/gui/component/addressbook-component.c:587
-#, fuzzy
-msgid "Create a new contact list"
-msgstr "Yeni bir əlaqə siyahısı yarat"
-
-#: addressbook/gui/component/addressbook-config.c:206
-#, fuzzy
-msgid "Failed to connect to LDAP server"
-msgstr "LDAP vericiyə bağlanma xətası."
-
-#: addressbook/gui/component/addressbook-config.c:231
-#, fuzzy
-msgid "Failed to authenticate with LDAP server"
-msgstr ""
-"IMAP vericisinə tanıdılma xətası.\n"
-"%s\n"
-"\n"
-
-#: addressbook/gui/component/addressbook-config.c:259
-msgid "Could not perform query on Root DSE"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:682
-msgid "The server responded with no supported search bases"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:1193
-#, fuzzy
-msgid "This server does not support LDAPv3 schema information"
-msgstr "IMAP vericisi cavabı %s məlumatını daxil etmir"
-
-#: addressbook/gui/component/addressbook-config.c:1215
-#, fuzzy
-msgid "Error retrieving schema information"
-msgstr ""
-"Süzgəc məlumatını yükləmə xətası:\n"
-"%s"
-
-#: addressbook/gui/component/addressbook-config.c:1223
-#, fuzzy
-msgid "Server did not respond with valid schema information"
-msgstr "IMAP vericisi cavabı %s məlumatını daxil etmir"
-
-#: addressbook/gui/component/addressbook-config.c:1637
-msgid "Account Name"
-msgstr "Hesab Adı"
-
-#: addressbook/gui/component/addressbook-config.c:1639
-msgid "Server Name"
-msgstr "Verici Adı"
-
-#: addressbook/gui/component/addressbook-config.c:1676
-#, fuzzy
-msgid "LDAP was not enabled in this build of Evolution"
-msgstr "(Evolution proqramının bu inşasında SSL dəstəyi yoxdur)"
-
-#: addressbook/gui/component/addressbook-storage.c:178
-msgid "Other Contacts"
-msgstr "Digər Əlaqələr"
-
 #.
 #. * This is the code for the UI thingie that lets you manipulate the e-mail
 #. * addresses (and *only* the e-mail addresses) associated with an existing
@@ -807,76 +856,33 @@ msgstr "Yeni \"%s\" əlaqəsi yarat"
 msgid "Add address to existing contact \"%s\""
 msgstr "Mövcud \"%s\" əlaqəsinə ünvan əlavə et"
 
-#: addressbook/gui/component/e-address-popup.c:917
+#: addressbook/gui/component/e-address-popup.c:914
 msgid "Querying Addressbook..."
 msgstr "Ünvan Dəftəri Sorğulanır..."
 
-#: addressbook/gui/component/e-address-popup.c:1001
-#: addressbook/gui/component/e-address-widget.c:401
+#: addressbook/gui/component/e-address-popup.c:998
+#: addressbook/gui/component/e-address-widget.c:392
 msgid "Edit Contact Info"
 msgstr "Əlaqə Məlumatını Düzəlt"
 
-#: addressbook/gui/component/e-address-popup.c:1031
-#: addressbook/gui/component/e-address-widget.c:437
+#: addressbook/gui/component/e-address-popup.c:1028
+#: addressbook/gui/component/e-address-widget.c:428
 #: addressbook/gui/component/select-names/e-select-names-popup.c:324
 msgid "Add to Contacts"
 msgstr "Əlaqələrə Əlavə Et"
 
-#: addressbook/gui/component/e-address-popup.c:1056
+#: addressbook/gui/component/e-address-popup.c:1053
 msgid "Merge E-Mail Address"
 msgstr "ePoçt Ünvanını Birləşdir"
 
-#: addressbook/gui/component/e-address-widget.c:378
+#: addressbook/gui/component/e-address-widget.c:369
 msgid "Disable Queries"
 msgstr "Sorğuları Bağla"
 
-#: addressbook/gui/component/e-address-widget.c:378
+#: addressbook/gui/component/e-address-widget.c:369
 msgid "Enable Queries (Dangerous!)"
 msgstr "Sorğuları Fəallaşdır (Təhlükəlidir!)"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
-msgid "Configure access to LDAP directory servers here"
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
-msgid "Directory Servers"
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
-#, fuzzy
-msgid "Evolution Addressbook"
-msgstr "Ünvan dəftərini düzəlt"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
-#, fuzzy
-msgid "Evolution Addressbook LDAP Configuration Control"
-msgstr "Evolution Ünvan Dəftəri ad seçmə ara üzü."
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-#, fuzzy
-msgid "Evolution Addressbook address pop-up"
-msgstr "Ünvan Dəftərində ünvan göstərici emalatxanası"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
-#, fuzzy
-msgid "Evolution Addressbook address viewer"
-msgstr "Evolution Ünvan Dəftəri kiçik kart nümaiyişi"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
-#, fuzzy
-msgid "Evolution Addressbook card viewer"
-msgstr "Evolution Ünvan Dəftəri kiçik kart nümaiyişi"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
-#, fuzzy
-msgid "Evolution Addressbook component"
-msgstr "Evolution Ünvan Dəftəri kiçik kart nümaiyişi"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
-#, fuzzy
-msgid "Evolution Addressbook folder viewer"
-msgstr "Evolution Ünvan Dəftəri kiçik kart nümaiyişi"
-
 #: addressbook/gui/component/ldap-config.glade.h:1
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:1
 #: mail/mail-config.glade.h:1
@@ -1029,9 +1035,10 @@ msgstr "Bir"
 msgid "S_earch scope: "
 msgstr "Axtarışın əhatə _sahəsi:"
 
+#. No time range is set, so don't start a query
 #: addressbook/gui/component/ldap-config.glade.h:34
-#: calendar/gui/e-cal-view.c:541 calendar/gui/e-day-view.c:3261
-#: calendar/gui/e-week-view.c:1181 calendar/gui/gnome-cal.c:625
+#: calendar/gui/calendar-model.c:1983 calendar/gui/e-day-view.c:1712
+#: calendar/gui/e-week-view.c:1256
 msgid "Searching"
 msgstr "Axtarılır"
 
@@ -1221,11 +1228,11 @@ msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:85 filter/filter.glade.h:14
 #: mail/mail-config.glade.h:143 ui/evolution-addressbook.xml.h:33
-#: ui/evolution-calendar.xml.h:35 ui/evolution-composer-entries.xml.h:8
-#: ui/evolution-mail-list.xml.h:24 ui/evolution-mail-messagedisplay.xml.h:6
+#: ui/evolution-calendar.xml.h:31 ui/evolution-composer-entries.xml.h:8
+#: ui/evolution-mail-list.xml.h:25 ui/evolution-mail-messagedisplay.xml.h:6
 #: ui/evolution-message-composer.xml.h:41
-#: ui/evolution-signature-editor.xml.h:12 ui/evolution-subscribe.xml.h:10
-#: ui/evolution-tasks.xml.h:19
+#: ui/evolution-signature-editor.xml.h:11 ui/evolution-subscribe.xml.h:10
+#: ui/evolution-tasks.xml.h:17
 msgid "_Edit"
 msgstr "_Düzəlt"
 
@@ -1272,25 +1279,21 @@ msgstr "Ümumi"
 msgid "searching-tab"
 msgstr "Axtarılır"
 
-#: addressbook/gui/component/select-names/e-select-names.c:509
-msgid "Select Contacts from Addressbook"
-msgstr "Ünvan Dəftərindən Əlaqələri Seçin"
-
-#: addressbook/gui/component/select-names/e-select-names.c:650
+#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:1
 #, fuzzy
-msgid "Find contact in"
-msgstr "Daxil edən yollayıcılar"
-
-#: addressbook/gui/component/select-names/e-select-names.c:694
-#: addressbook/gui/component/select-names/e-select-names-popup.c:211
-#: composer/e-msg-composer-attachment-bar.c:444
-msgid "Remove"
-msgstr "Sil"
+msgid "Evolution Addressbook name selection interface"
+msgstr "Evolution Ünvan Dəftəri ad seçmə ara üzü."
 
 #: addressbook/gui/component/select-names/e-select-names-popup.c:204
 msgid "Remove All"
 msgstr "Hamısını Sil"
 
+#: addressbook/gui/component/select-names/e-select-names-popup.c:211
+#: addressbook/gui/component/select-names/e-select-names.c:694
+#: composer/e-msg-composer-attachment-bar.c:507
+msgid "Remove"
+msgstr "Sil"
+
 #: addressbook/gui/component/select-names/e-select-names-popup.c:218
 #, fuzzy
 msgid "View Contact List"
@@ -1315,10 +1318,14 @@ msgstr "Adsız Əlaqə"
 msgid "Source"
 msgstr "Qaynaq"
 
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:1
+#: addressbook/gui/component/select-names/e-select-names.c:509
+msgid "Select Contacts from Addressbook"
+msgstr "Ünvan Dəftərindən Əlaqələri Seçin"
+
+#: addressbook/gui/component/select-names/e-select-names.c:650
 #, fuzzy
-msgid "Evolution Addressbook name selection interface"
-msgstr "Evolution Ünvan Dəftəri ad seçmə ara üzü."
+msgid "Find contact in"
+msgstr "Daxil edən yollayıcılar"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:2
 #, fuzzy
@@ -1398,7 +1405,7 @@ msgid "D_epartment:"
 msgstr "_Bölmə :"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:11
-#: calendar/gui/dialogs/task-editor.c:200
+#: calendar/gui/dialogs/task-editor.c:197
 msgid "Details"
 msgstr "Ətraflı"
 
@@ -1472,13 +1479,11 @@ msgid "_Categories..."
 msgstr "Nö_vlər..."
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:28
-#: calendar/gui/dialogs/meeting-page.c:634
-#: calendar/gui/e-calendar-table.c:1008 calendar/gui/e-calendar-table.c:1026
-#: calendar/gui/e-cal-view.c:1144 calendar/gui/e-cal-view.c:1176
-#: ui/evolution-addressbook.xml.h:32 ui/evolution-calendar.xml.h:34
-#: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:14
-#: ui/evolution-mail-message.xml.h:104 ui/evolution-tasks.xml.h:18
-#: ui/evolution.xml.h:45
+#: calendar/gui/dialogs/meeting-page.c:717 calendar/gui/e-calendar-table.c:977
+#: calendar/gui/e-day-view.c:3755 calendar/gui/e-week-view.c:3631
+#: mail/folder-browser.c:1790 ui/evolution-addressbook.xml.h:32
+#: ui/evolution-calendar.xml.h:30 ui/evolution-mail-message.xml.h:97
+#: ui/evolution-tasks.xml.h:16 ui/evolution.xml.h:45
 msgid "_Delete"
 msgstr "_Sil"
 
@@ -1523,15 +1528,15 @@ msgid "_Web page address:"
 msgstr "_Veb səhifəsi ünvanı:"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:102
-#: addressbook/gui/contact-editor/e-contact-editor.c:184
 #: addressbook/gui/contact-editor/e-contact-editor-fullname.c:95
+#: addressbook/gui/contact-editor/e-contact-editor.c:184
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.c:163
 #: addressbook/gui/widgets/e-addressbook-model.c:318
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:408
-#: addressbook/gui/widgets/e-minicard.c:183
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:393
 #: addressbook/gui/widgets/e-minicard-label.c:164
-#: addressbook/gui/widgets/e-minicard-view.c:478
 #: addressbook/gui/widgets/e-minicard-view-widget.c:120
+#: addressbook/gui/widgets/e-minicard-view.c:478
+#: addressbook/gui/widgets/e-minicard.c:183
 #, fuzzy
 msgid "Editable"
 msgstr "Fəallaşdır"
@@ -2564,18 +2569,18 @@ msgstr "Zimbabve"
 #: addressbook/gui/contact-editor/e-contact-editor.c:156
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.c:142
 #: addressbook/gui/widgets/e-addressbook-model.c:304
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:394
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:379
 #: addressbook/gui/widgets/e-addressbook-view.c:180
-#: addressbook/gui/widgets/e-minicard-view.c:464
 #: addressbook/gui/widgets/e-minicard-view-widget.c:106
+#: addressbook/gui/widgets/e-minicard-view.c:464
 #, fuzzy
 msgid "Book"
 msgstr "İçindəkilər"
 
 #: addressbook/gui/contact-editor/e-contact-editor.c:163
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.c:149
-#: addressbook/gui/widgets/e-minicard.c:190
 #: addressbook/gui/widgets/e-minicard-widget.c:93
+#: addressbook/gui/widgets/e-minicard.c:190
 #, fuzzy
 msgid "Card"
 msgstr "Maşın"
@@ -2811,7 +2816,7 @@ msgstr "Yeni Siyahı"
 msgid "Contact List Editor"
 msgstr "Əlaqə Siyahısı Editoru"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:457
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:456
 #, fuzzy
 msgid "Save List as VCard"
 msgstr "VCard olaraq qeyd et"
@@ -2859,7 +2864,7 @@ msgstr ""
 "mövcuddur. Bunu yenə də əlavə etmək istəyirsiniz?."
 
 #. FIXME: get the toplevel window...
-#: addressbook/gui/search/e-addressbook-search-dialog.c:116
+#: addressbook/gui/search/e-addressbook-search-dialog.c:117
 #: widgets/misc/e-filter-bar.c:148
 msgid "Advanced Search"
 msgstr "Ətraflı Axtarış"
@@ -2878,10 +2883,10 @@ msgid "%d cards"
 msgstr "%d kart"
 
 #: addressbook/gui/widgets/e-addressbook-model.c:311
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:401
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:386
 #: addressbook/gui/widgets/e-addressbook-view.c:187
-#: addressbook/gui/widgets/e-minicard-view.c:471
 #: addressbook/gui/widgets/e-minicard-view-widget.c:113
+#: addressbook/gui/widgets/e-minicard-view.c:471
 #, fuzzy
 msgid "Query"
 msgstr "Almanya"
@@ -2891,262 +2896,263 @@ msgstr "Almanya"
 msgid "Error getting book view"
 msgstr "%s başladırkən xəta oldu"
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:415
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:400
 #, fuzzy
 msgid "Model"
 msgstr "Əl Telefonu"
 
-#: addressbook/gui/widgets/e-addressbook-table-adapter.c:148
-#: addressbook/gui/widgets/e-addressbook-util.c:106
+#: addressbook/gui/widgets/e-addressbook-table-adapter.c:145
+#: addressbook/gui/widgets/e-addressbook-util.c:105
 #: addressbook/gui/widgets/e-minicard.c:531
 msgid "Error modifying card"
 msgstr "Kard təkmilləşdirmə xətası"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:37
-#: shell/evolution-shell-component.c:1183
+#: addressbook/gui/widgets/e-addressbook-util.c:36
+#: shell/evolution-shell-component.c:1180
 msgid "Success"
 msgstr "Müvəffəqiyyət"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:38
+#: addressbook/gui/widgets/e-addressbook-util.c:37
 #: camel/providers/imap/camel-imap-command.c:306
 #: camel/providers/imap/camel-imap-command.c:403
 #: camel/providers/pop3/camel-pop3-store.c:526
 #: camel/providers/pop3/camel-pop3-store.c:533 shell/e-shell.c:2077
-#: shell/e-storage.c:598 shell/evolution-shell-component.c:1222
+#: shell/e-storage.c:598 shell/evolution-shell-component.c:1219
 msgid "Unknown error"
 msgstr "Naməlum xəta"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:39
+#: addressbook/gui/widgets/e-addressbook-util.c:38
 msgid "Repository offline"
 msgstr "Nüsxə xətdən deyil"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:40 shell/e-storage.c:584
-#: shell/evolution-shell-component.c:1213
+#: addressbook/gui/widgets/e-addressbook-util.c:39 shell/e-storage.c:584
+#: shell/evolution-shell-component.c:1210
 msgid "Permission denied"
 msgstr "Qadağandır"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:41
+#: addressbook/gui/widgets/e-addressbook-util.c:40
 msgid "Card not found"
 msgstr "Kart tapıla bilmədi"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:42
+#: addressbook/gui/widgets/e-addressbook-util.c:41
 msgid "Card ID already exists"
 msgstr "Kard ID onsuz da mövcuddur"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:43
+#: addressbook/gui/widgets/e-addressbook-util.c:42
 msgid "Protocol not supported"
 msgstr "Protokol dəstəklənmir"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:44
+#: addressbook/gui/widgets/e-addressbook-util.c:43
+#: calendar/gui/calendar-model.c:759 calendar/gui/calendar-model.c:1184
 #: calendar/gui/dialogs/task-details-page.glade.h:3
-#: calendar/gui/e-calendar-table.c:479 calendar/gui/e-cal-model-tasks.c:325
-#: calendar/gui/e-cal-model-tasks.c:604 calendar/gui/e-tasks.c:253
-#: calendar/gui/print.c:2314 camel/camel-service.c:733
-#: camel/camel-service.c:771 camel/camel-service.c:855
-#: camel/camel-service.c:895 camel/providers/pop3/camel-pop3-store.c:443
+#: calendar/gui/e-calendar-table.c:477 calendar/gui/print.c:2307
+#: camel/camel-service.c:745 camel/camel-service.c:785
+#: camel/camel-service.c:875 camel/camel-service.c:917
+#: camel/providers/pop3/camel-pop3-store.c:443
 #: camel/providers/pop3/camel-pop3-store.c:520
 msgid "Cancelled"
 msgstr "Ləğv Edildi"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:45
+#: addressbook/gui/widgets/e-addressbook-util.c:44
 #, fuzzy
 msgid "Authentication Failed"
 msgstr "Tanıtma bacarılmadı."
 
-#: addressbook/gui/widgets/e-addressbook-util.c:46
+#: addressbook/gui/widgets/e-addressbook-util.c:45
 #, fuzzy
 msgid "Authentication Required"
 msgstr "Tanıtma lazımdır"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:47
+#: addressbook/gui/widgets/e-addressbook-util.c:46
 msgid "TLS not Available"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:48
+#: addressbook/gui/widgets/e-addressbook-util.c:47
 #, fuzzy
 msgid "Addressbook does not exist"
 msgstr "`%s' faylı yoxdur"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:49
+#: addressbook/gui/widgets/e-addressbook-util.c:48
 msgid "Other error"
 msgstr "Başqa xəta"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:76
+#: addressbook/gui/widgets/e-addressbook-util.c:75
 msgid "Do you want to save changes?"
 msgstr "Dəyişiklikləri qeyd etmək istəyirsinizimi?"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:78
+#: addressbook/gui/widgets/e-addressbook-util.c:77
 #, fuzzy
 msgid "_Discard"
 msgstr "Kartı çap et"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:97
+#: addressbook/gui/widgets/e-addressbook-util.c:96
 msgid "Error adding list"
 msgstr "Siyahıya əlavə etmə xətası"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:97
-#: addressbook/gui/widgets/e-addressbook-util.c:273
+#: addressbook/gui/widgets/e-addressbook-util.c:96
+#: addressbook/gui/widgets/e-addressbook-util.c:272
 msgid "Error adding card"
 msgstr "Kart əlavə etmə xətası"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:106
+#: addressbook/gui/widgets/e-addressbook-util.c:105
 msgid "Error modifying list"
 msgstr "Siyahı təkmilləşdirmə xətası"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:116
+#: addressbook/gui/widgets/e-addressbook-util.c:115
 msgid "Error removing list"
 msgstr "Siyahı çıxartma xətası"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:116
-#: addressbook/gui/widgets/e-addressbook-util.c:231
+#: addressbook/gui/widgets/e-addressbook-util.c:115
+#: addressbook/gui/widgets/e-addressbook-util.c:230
 msgid "Error removing card"
 msgstr "Kart çıxartma xətası"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:198
+#: addressbook/gui/widgets/e-addressbook-util.c:197
 #, c-format
 msgid ""
 "Opening %d cards will open %d new windows as well.\n"
 "Do you really want to display all of these cards?"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:329
+#: addressbook/gui/widgets/e-addressbook-util.c:328
 #, fuzzy
 msgid "Move card to"
 msgstr "Kart yoxdur"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:331
+#: addressbook/gui/widgets/e-addressbook-util.c:330
 #, fuzzy
 msgid "Copy card to"
 msgstr "Kart yoxdur"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:334
+#: addressbook/gui/widgets/e-addressbook-util.c:333
 #, fuzzy
 msgid "Move cards to"
 msgstr "Kart yoxdur"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:336
+#: addressbook/gui/widgets/e-addressbook-util.c:335
 #, fuzzy
 msgid "Copy cards to"
 msgstr "Kart yoxdur"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:518
+#: addressbook/gui/widgets/e-addressbook-util.c:517
 msgid "Multiple VCards"
 msgstr "Çoxlu VCard"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:526
+#: addressbook/gui/widgets/e-addressbook-util.c:525
 #, c-format
 msgid "VCard for %s"
 msgstr "%s üçün VCard"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:194
-#: calendar/gui/e-calendar-table.etspec.h:17
+#: calendar/gui/dialogs/meeting-page.etspec.h:11
+#: calendar/gui/e-calendar-table.etspec.h:18
 #: calendar/gui/e-meeting-time-sel.etspec.h:11
 msgid "Type"
 msgstr "Növ"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:398
+#: addressbook/gui/widgets/e-addressbook-view.c:394
 #: importers/evolution-gnomecard-importer.c:228 importers/pine-importer.c:642
 #: mail/importers/pine-importer.c:577
 msgid "Addressbook"
 msgstr "Ünvan Dəftəri"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:680
-#: addressbook/gui/widgets/e-addressbook-view.c:899
-#: addressbook/gui/widgets/e-addressbook-view.c:1883
+#: addressbook/gui/widgets/e-addressbook-view.c:676
+#: addressbook/gui/widgets/e-addressbook-view.c:895
+#: addressbook/gui/widgets/e-addressbook-view.c:1879
 #: ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard"
 msgstr "VCard olaraq qeyd et"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:886
+#: addressbook/gui/widgets/e-addressbook-view.c:882
 #, fuzzy
 msgid "New Contact..."
 msgstr "Yeni Əlaqə"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:887
+#: addressbook/gui/widgets/e-addressbook-view.c:883
 #, fuzzy
 msgid "New Contact List..."
 msgstr "Yeni Əlaqə Siyahısı"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:890
+#: addressbook/gui/widgets/e-addressbook-view.c:886
 #, fuzzy
 msgid "Go to Folder..."
 msgstr "Qovluğa _Get ..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:891
+#: addressbook/gui/widgets/e-addressbook-view.c:887
 #, fuzzy
 msgid "Import..."
 msgstr "_İdxal Et..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:893
+#: addressbook/gui/widgets/e-addressbook-view.c:889
 #, fuzzy
 msgid "Search for Contacts..."
 msgstr "Əlaqələri A_xtar"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:894
+#: addressbook/gui/widgets/e-addressbook-view.c:890
 #, fuzzy
 msgid "Addressbook Sources..."
 msgstr "_Ünvan Dəftəri Qaynağı..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:896
+#: addressbook/gui/widgets/e-addressbook-view.c:892
 #, fuzzy
 msgid "Pilot Settings..."
 msgstr "_Pilot Qurğuları..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:900
+#: addressbook/gui/widgets/e-addressbook-view.c:896
 #: ui/evolution-addressbook.xml.h:10
 msgid "Forward Contact"
 msgstr "Əlaqəni Çatdır"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:901
+#: addressbook/gui/widgets/e-addressbook-view.c:897
 msgid "Send Message to Contact"
 msgstr "Əlaqəyə İsmarış Göndər"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:902 calendar/gui/print.c:2446
+#: addressbook/gui/widgets/e-addressbook-view.c:898 calendar/gui/print.c:2439
 #: ui/evolution-addressbook.xml.h:16 ui/evolution-comp-editor.xml.h:8
-#: ui/evolution-contact-editor.xml.h:5 ui/evolution-mail-message.xml.h:72
+#: ui/evolution-contact-editor.xml.h:4 ui/evolution-mail-message.xml.h:67
 #: ui/my-evolution.xml.h:1
 msgid "Print"
 msgstr "Çap Et"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:904
+#: addressbook/gui/widgets/e-addressbook-view.c:900
 msgid "Print Envelope"
 msgstr "Zərfi Çap Et"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:908
+#: addressbook/gui/widgets/e-addressbook-view.c:904
 #, fuzzy
 msgid "Copy to folder..."
 msgstr "Qovluğa _Köçürt..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:909
+#: addressbook/gui/widgets/e-addressbook-view.c:905
 #, fuzzy
 msgid "Move to folder..."
 msgstr "Qovluğa _Daşı ..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:912
+#: addressbook/gui/widgets/e-addressbook-view.c:908
 #: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "Kəs"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:913
-#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:9
+#: addressbook/gui/widgets/e-addressbook-view.c:909
+#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:8
 #: ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr "Köçürt"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:914
-#: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:10
+#: addressbook/gui/widgets/e-addressbook-view.c:910
+#: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:9
 msgid "Paste"
 msgstr "Yapışdır"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:915 filter/libfilter-i18n.h:10
+#: addressbook/gui/widgets/e-addressbook-view.c:911 filter/libfilter-i18n.h:11
 #: mail/mail-accounts.c:234 ui/evolution-addressbook.xml.h:8
-#: ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:3
-#: ui/evolution-contact-list-editor.xml.h:3 ui/evolution-mail-message.xml.h:24
+#: ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:2
+#: ui/evolution-contact-list-editor.xml.h:2 ui/evolution-mail-message.xml.h:20
 msgid "Delete"
 msgstr "Sil"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:919
-#: calendar/gui/e-cal-view.c:1109
+#: addressbook/gui/widgets/e-addressbook-view.c:915
+#: calendar/gui/e-day-view.c:3715 calendar/gui/e-week-view.c:3596
 #, fuzzy
 msgid "Current View"
 msgstr "_Hazırkı Görünüş"
@@ -3155,7 +3161,7 @@ msgstr "_Hazırkı Görünüş"
 #. Translators: put here a list of labels you want to see on buttons in
 #. addressbook. You may use any character to separate labels but it must
 #. also be placed at the begining ot the string
-#: addressbook/gui/widgets/e-addressbook-view.c:953
+#: addressbook/gui/widgets/e-addressbook-view.c:949
 msgid ",123,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
 msgstr ",123,a,b,c,ç,d,e,ə,f,g,ğ,h,i,j,k,,l,m,n,o,ö,p,q,r,s,ş,t,u,ü,v,w,x,y,z"
 
@@ -3163,11 +3169,11 @@ msgstr ",123,a,b,c,ç,d,e,ə,f,g,ğ,h,i,j,k,,l,m,n,o,ö,p,q,r,s,ş,t,u,ü,v,w,x,
 #. in addressbook. You may use any character to separate labels but it
 #. must also be placed at the begining ot the string.
 #. Use lower case letters if possible.
-#: addressbook/gui/widgets/e-addressbook-view.c:958
+#: addressbook/gui/widgets/e-addressbook-view.c:954
 msgid ",0,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
 msgstr ",0,a,b,c,ç,d,e,ə,f,g,ğ,h,i,j,k,,l,m,n,o,ö,p,q,r,s,ş,t,u,ü,v,w,x,y,z"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1356
+#: addressbook/gui/widgets/e-addressbook-view.c:1352
 #, c-format
 msgid ""
 "The addressbook backend for\n"
@@ -3235,46 +3241,36 @@ msgstr "Digər Telefonlar"
 msgid "Primary Phone"
 msgstr "Əsas Telefon"
 
-#: addressbook/gui/widgets/e-minicard.c:146
+#: addressbook/gui/widgets/e-minicard-control.c:204
+#, c-format
+msgid "and %d other cards."
+msgstr "və %d başqa kart."
+
+#: addressbook/gui/widgets/e-minicard-control.c:206
+msgid "and one other card."
+msgstr "və bir başqa kart."
+
+#: addressbook/gui/widgets/e-minicard-control.c:318
+msgid "Save in addressbook"
+msgstr "Ünvan dəftərinə qeyd et"
+
 #: addressbook/gui/widgets/e-minicard-label.c:115
+#: addressbook/gui/widgets/e-minicard.c:146
 #, fuzzy
 msgid "Width"
 msgstr "En :"
 
-#: addressbook/gui/widgets/e-minicard.c:153
 #: addressbook/gui/widgets/e-minicard-label.c:122
+#: addressbook/gui/widgets/e-minicard.c:153
 #, fuzzy
 msgid "Height"
 msgstr "Hündürlük :"
 
-#: addressbook/gui/widgets/e-minicard.c:161
 #: addressbook/gui/widgets/e-minicard-label.c:129
+#: addressbook/gui/widgets/e-minicard.c:161
 msgid "Has Focus"
 msgstr ""
 
-#: addressbook/gui/widgets/e-minicard.c:169
-#, fuzzy
-msgid "Selected"
-msgstr "Silinən"
-
-#: addressbook/gui/widgets/e-minicard.c:176
-#, fuzzy
-msgid "Has Cursor"
-msgstr "Vəzifə nizamlanması"
-
-#: addressbook/gui/widgets/e-minicard-control.c:204
-#, c-format
-msgid "and %d other cards."
-msgstr "və %d başqa kart."
-
-#: addressbook/gui/widgets/e-minicard-control.c:206
-msgid "and one other card."
-msgstr "və bir başqa kart."
-
-#: addressbook/gui/widgets/e-minicard-control.c:318
-msgid "Save in addressbook"
-msgstr "Ünvan dəftərinə qeyd et"
-
 #: addressbook/gui/widgets/e-minicard-label.c:136
 #, fuzzy
 msgid "Field"
@@ -3294,6 +3290,11 @@ msgstr "Mətn Bö_yüklüyü"
 msgid "Max field name length"
 msgstr ""
 
+#: addressbook/gui/widgets/e-minicard-view-widget.c:127
+#, fuzzy
+msgid "Column Width"
+msgstr "Kolumbiya"
+
 #: addressbook/gui/widgets/e-minicard-view.c:141
 #, fuzzy
 msgid ""
@@ -3327,10 +3328,15 @@ msgstr ""
 msgid "Adapter"
 msgstr "Andorra"
 
-#: addressbook/gui/widgets/e-minicard-view-widget.c:127
+#: addressbook/gui/widgets/e-minicard.c:169
 #, fuzzy
-msgid "Column Width"
-msgstr "Kolumbiya"
+msgid "Selected"
+msgstr "Silinən"
+
+#: addressbook/gui/widgets/e-minicard.c:176
+#, fuzzy
+msgid "Has Cursor"
+msgstr "Vəzifə nizamlanması"
 
 #: addressbook/gui/widgets/gal-view-factory-minicard.c:24
 msgid "Card View"
@@ -3341,20 +3347,20 @@ msgstr "Kart Nümayişi "
 msgid "GTK Tree View"
 msgstr "Həftəlik Nümayiş"
 
-#: addressbook/printing/e-contact-print.c:1158
+#: addressbook/printing/e-contact-print-envelope.c:217
+#: addressbook/printing/e-contact-print-envelope.c:238
+msgid "Print envelope"
+msgstr "Zərfi çap et"
+
+#: addressbook/printing/e-contact-print.c:1139
 msgid "Print cards"
 msgstr "Kartları çap et"
 
-#: addressbook/printing/e-contact-print.c:1224
-#: addressbook/printing/e-contact-print.c:1250
+#: addressbook/printing/e-contact-print.c:1204
+#: addressbook/printing/e-contact-print.c:1226
 msgid "Print card"
 msgstr "Kartı çap et"
 
-#: addressbook/printing/e-contact-print-envelope.c:217
-#: addressbook/printing/e-contact-print-envelope.c:238
-msgid "Print envelope"
-msgstr "Zərfi çap et"
-
 #: addressbook/printing/e-contact-print.glade.h:1
 msgid "10 pt. Tahoma"
 msgstr "10 pt. Tahoma"
@@ -3524,63 +3530,6 @@ msgstr "En :"
 msgid "_Font..."
 msgstr "_Yazı növü ..."
 
-#: addressbook/tools/evolution-addressbook-export.c:56
-msgid "Specify the output file instead of standard output"
-msgstr ""
-
-#: addressbook/tools/evolution-addressbook-export.c:57
-msgid "OUTPUTFILE"
-msgstr ""
-
-#: addressbook/tools/evolution-addressbook-export.c:58
-#, fuzzy
-msgid "List local addressbook folders"
-msgstr "bütün yerli və fəal uzaq qovluqlarla"
-
-#: addressbook/tools/evolution-addressbook-export.c:60
-msgid "Show cards as vcard or csv file"
-msgstr ""
-
-#: addressbook/tools/evolution-addressbook-export.c:60
-#, fuzzy
-msgid "[vcard|csv]"
-msgstr "Kart yoxdur"
-
-#: addressbook/tools/evolution-addressbook-export.c:61
-msgid "Export in asynchronous mode "
-msgstr ""
-
-#: addressbook/tools/evolution-addressbook-export.c:63
-msgid ""
-"The number of cards in one output file in asychronous mode,default size 100."
-msgstr ""
-
-#: addressbook/tools/evolution-addressbook-export.c:63
-msgid "NUMBER"
-msgstr ""
-
-#: addressbook/tools/evolution-addressbook-export.c:91
-msgid ""
-"Command line arguments error, please use --help option to see the usage."
-msgstr ""
-
-#: addressbook/tools/evolution-addressbook-export.c:105
-msgid "Only support csv or vcard format."
-msgstr ""
-
-#: addressbook/tools/evolution-addressbook-export.c:114
-msgid "In async mode, output must be file."
-msgstr ""
-
-#: addressbook/tools/evolution-addressbook-export.c:122
-msgid "In normal mode, there should not need size option."
-msgstr ""
-
-#: addressbook/tools/evolution-addressbook-export.c:153
-#, fuzzy
-msgid "Impossible internal error."
-msgstr "Daxili xəta"
-
 #: calendar/cal-util/cal-component.c:1218
 msgid "Untitled appointment"
 msgstr "Adsız görüş"
@@ -3710,30 +3659,28 @@ msgid "31st"
 msgstr "31.nci"
 
 #: calendar/cal-util/cal-util.c:550 calendar/cal-util/cal-util.c:572
-#: calendar/gui/dialogs/task-details-page.glade.h:5
-#: calendar/gui/e-calendar-table.c:403 calendar/gui/e-tasks.c:271
-#: mail/message-list.c:912
+#: calendar/gui/dialogs/task-details-page.glade.h:6
+#: calendar/gui/e-calendar-table.c:401 mail/message-list.c:753
 msgid "High"
 msgstr "Yüksək"
 
 #: calendar/cal-util/cal-util.c:552 calendar/cal-util/cal-util.c:574
-#: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-calendar-table.c:404 calendar/gui/e-cal-model.c:826
-#: calendar/gui/e-tasks.c:273 mail/message-list.c:911
+#: calendar/gui/calendar-model.c:1709
+#: calendar/gui/dialogs/task-details-page.glade.h:9
+#: calendar/gui/e-calendar-table.c:402 mail/message-list.c:752
 msgid "Normal"
 msgstr "Normal"
 
 #: calendar/cal-util/cal-util.c:554 calendar/cal-util/cal-util.c:576
-#: calendar/gui/dialogs/task-details-page.glade.h:7
-#: calendar/gui/e-calendar-table.c:405 calendar/gui/e-tasks.c:275
-#: mail/message-list.c:910
+#: calendar/gui/dialogs/task-details-page.glade.h:8
+#: calendar/gui/e-calendar-table.c:403 mail/message-list.c:751
 msgid "Low"
 msgstr "Alçaq"
 
 #. An empty string is the same as 'None'.
 #: calendar/cal-util/cal-util.c:570
-#: calendar/gui/dialogs/task-details-page.glade.h:11
-#: calendar/gui/e-calendar-table.c:406
+#: calendar/gui/dialogs/task-details-page.glade.h:13
+#: calendar/gui/e-calendar-table.c:404
 msgid "Undefined"
 msgstr "Təsvirsiz"
 
@@ -3741,13 +3688,13 @@ msgstr "Təsvirsiz"
 msgid "Split Multi-Day Events:"
 msgstr ""
 
-#: calendar/conduits/calendar/calendar-conduit.c:1297
-#: calendar/conduits/todo/todo-conduit.c:838
+#: calendar/conduits/calendar/calendar-conduit.c:1289
+#: calendar/conduits/todo/todo-conduit.c:830
 msgid "Error while communicating with calendar server"
 msgstr "Təqvim vericisi ilə bağlantı qurulurkən xəta oldu"
 
-#: calendar/conduits/calendar/calendar-conduit.c:1456
-#: calendar/conduits/calendar/calendar-conduit.c:1459
+#: calendar/conduits/calendar/calendar-conduit.c:1440
+#: calendar/conduits/calendar/calendar-conduit.c:1443
 msgid "Could not read pilot's Calendar application block"
 msgstr "Pilot Təqvim əlavələri bloku oxuna bilmədi"
 
@@ -3756,35 +3703,86 @@ msgstr "Pilot Təqvim əlavələri bloku oxuna bilmədi"
 msgid "Default Priority:"
 msgstr "_Üstünlük:"
 
-#: calendar/conduits/todo/todo-conduit.c:970
-#: calendar/conduits/todo/todo-conduit.c:973
+#: calendar/conduits/todo/todo-conduit.c:954
+#: calendar/conduits/todo/todo-conduit.c:957
 msgid "Could not read pilot's ToDo application block"
 msgstr "Pilot Ediləcəklər əlavələri bloku oxuna bilmədi"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:213
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
+#, fuzzy
+msgid "Calendar and Tasks"
+msgstr "Təqvim və Vəzifə Qurğuları"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
+msgid "Configure your timezone, Calendar and Task List here "
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
+#, fuzzy
+msgid "Evolution Calendar and Tasks"
+msgstr "Təqvim və Vəzifə Qurğuları"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
+#, fuzzy
+msgid "Evolution Calendar and Tasks component"
+msgstr "Evolutionun İcracı mündəricat parçası."
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
+#, fuzzy
+msgid "Evolution Calendar configuration control"
+msgstr "Evolutionun Vəzifə parçası emalatxanası."
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
+#, fuzzy
+msgid "Evolution Calendar scheduling message viewer"
+msgstr "Evolution Təqvim iTip/iMip Nümayişçisi"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
+#, fuzzy
+msgid "Evolution Calendar viewer"
+msgstr "Evolution Təqvim iTip/iMip Nümayişçisi"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
+#, fuzzy
+msgid "Evolution Calendar/Task editor"
+msgstr "Evolution Xəbər Düzəldicisi"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
+#, fuzzy
+msgid "Evolution Tasks viewer"
+msgstr "Evolution Xəbər Düzəldicisi"
+
+#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
+#, fuzzy
+msgid "Evolution Calendar alarm notification service"
+msgstr "Alarm vermə xidməti emalatxanası"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:212
 #, fuzzy
 msgid "Starting:"
 msgstr "Qurğular"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:215
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:214
 #, fuzzy
 msgid "Ending:"
 msgstr "İndekslənir:"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:254
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:227
+msgid "invalid time"
+msgstr "səhv vaxt"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:272
 #, fuzzy
 msgid "Evolution Alarm"
 msgstr "Evolution"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:347
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:365
 #, c-format
 msgid "Alarm on %s"
 msgstr "%s vaxtı alarm ver"
 
 #: calendar/gui/alarm-notify/alarm-notify.glade.h:1
-#: ui/evolution-comp-editor.xml.h:1 ui/evolution-contact-editor.xml.h:1
-#: ui/evolution-contact-list-editor.xml.h:1
-#: ui/evolution-signature-editor.xml.h:1
+#: ui/evolution-comp-editor.xml.h:1
 msgid "C_lose"
 msgstr "_Qapat"
 
@@ -3800,25 +3798,16 @@ msgstr "Xəbərdarlıq vaxtı ( dəqiqə )"
 msgid "_Edit appointment"
 msgstr "Görüşü _düzəlt"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:874
+#: calendar/gui/alarm-notify/alarm-queue.c:770
 msgid "No description available."
 msgstr "İzahat yoxdur."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:892
-#, c-format
-msgid ""
-"Alarm on %s\n"
-"%s\n"
-"Starting at %s\n"
-"Ending at %s"
-msgstr ""
-
-#: calendar/gui/alarm-notify/alarm-queue.c:979
-#: calendar/gui/alarm-notify/alarm-queue.c:1003
+#: calendar/gui/alarm-notify/alarm-queue.c:843
+#: calendar/gui/alarm-notify/alarm-queue.c:867 widgets/misc/e-messagebox.c:161
 msgid "Warning"
 msgstr "Xəbərdarlıq"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:983
+#: calendar/gui/alarm-notify/alarm-queue.c:847
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -3830,7 +3819,7 @@ msgstr ""
 "üçün qurulubdur.  Evolution yerinə normal\n"
 "xatırlatma ekranı göstərəcəkdir."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1009
+#: calendar/gui/alarm-notify/alarm-queue.c:873
 #, fuzzy, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -3847,88 +3836,72 @@ msgstr ""
 "\n"
 "Həqiqətən də bu proqramı icra etmək istəyirsiniz?"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1023
+#: calendar/gui/alarm-notify/alarm-queue.c:887
 #, fuzzy
 msgid "Do not ask me about this program again."
 msgstr "Mənə bir də soruşma."
 
-#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
-#, fuzzy
-msgid "Evolution Calendar alarm notification service"
-msgstr "Alarm vermə xidməti emalatxanası"
-
-#: calendar/gui/alarm-notify/notify-main.c:173
-msgid "Could not initialize Bonobo"
-msgstr "Bonoboyu başlada bilmədim"
-
-#: calendar/gui/alarm-notify/notify-main.c:176
+#: calendar/gui/alarm-notify/notify-main.c:174
 msgid "Could not initialize gnome-vfs"
 msgstr "gnome-vfs-ni başlada bilmədim"
 
-#: calendar/gui/alarm-notify/notify-main.c:185
+#: calendar/gui/alarm-notify/notify-main.c:183
 msgid "Could not create the alarm notify service factory"
 msgstr "Alarm vermə xidməti emalatxanası yaradıla bilmir"
 
-#: calendar/gui/calendar-commands.c:376
-#, fuzzy
-msgid ""
-"This operation will permanently erase all events older than the selected "
-"amount of time. If you continue, you will not be able to recover these "
-"events."
-msgstr ""
-"Bu əməliyyat silinəcəklər deyə işarələnmiş bütün məktubları həmişəlik "
-"siləcəkdir. Davam etsəniz, bu ismarışları geri gətirə bilməyəcəksiniz.\n"
-"\n"
-"İsmarışları həqiqətən də silək?"
+#: calendar/gui/cal-search-bar.c:50
+msgid "Summary contains"
+msgstr "Daxil edən icmal"
 
-#: calendar/gui/calendar-commands.c:382
-#, fuzzy
-msgid "Purge events older than"
-msgstr "azdır"
+#: calendar/gui/cal-search-bar.c:51
+msgid "Description contains"
+msgstr "Daxil edən izah"
 
-#: calendar/gui/calendar-commands.c:387
-#: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter.glade.h:17
-msgid "days"
-msgstr "gün"
+#: calendar/gui/cal-search-bar.c:52
+msgid "Comment contains"
+msgstr "Daxil edən şərh"
 
-#: calendar/gui/calendar-commands.c:485
+#: calendar/gui/cal-search-bar.c:358 mail/mail-ops.c:1106
+msgid "Unmatched"
+msgstr "Oxşar Olmayan"
+
+#: calendar/gui/calendar-commands.c:419
 msgid "%A %d %B %Y"
 msgstr "%A %d %B %Y"
 
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
-#: calendar/gui/calendar-commands.c:488 calendar/gui/e-day-view.c:1364
-#: calendar/gui/e-day-view-top-item.c:266
-#: calendar/gui/e-week-view-main-item.c:325
+#: calendar/gui/calendar-commands.c:422 calendar/gui/e-day-view-top-item.c:265
+#: calendar/gui/e-day-view.c:1438 calendar/gui/e-week-view-main-item.c:325
 msgid "%a %d %b"
 msgstr "%a %b %d"
 
-#: calendar/gui/calendar-commands.c:490 calendar/gui/calendar-commands.c:495
-#: calendar/gui/calendar-commands.c:497
+#: calendar/gui/calendar-commands.c:424 calendar/gui/calendar-commands.c:429
+#: calendar/gui/calendar-commands.c:431
 msgid "%a %d %b %Y"
 msgstr "%a %d %b %Y"
 
-#: calendar/gui/calendar-commands.c:514 calendar/gui/calendar-commands.c:520
-#: calendar/gui/calendar-commands.c:526 calendar/gui/calendar-commands.c:528
+#: calendar/gui/calendar-commands.c:442 calendar/gui/calendar-commands.c:449
+#: calendar/gui/calendar-commands.c:455 calendar/gui/calendar-commands.c:457
 msgid "%d %B %Y"
 msgstr "%d %B %Y"
 
 #. strftime format %d = day of month, %B = full
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: calendar/gui/calendar-commands.c:518
-#: calendar/gui/e-week-view-main-item.c:333 calendar/gui/print.c:1508
+#: calendar/gui/calendar-commands.c:447
+#: calendar/gui/e-week-view-main-item.c:333 calendar/gui/print.c:1509
 msgid "%d %B"
 msgstr "%d %B"
 
-#: calendar/gui/calendar-commands.c:918
+#: calendar/gui/calendar-commands.c:849
 msgid ""
 "Could not create the calendar view.  Please check your ORBit and OAF setup."
 msgstr ""
 "Təqvimin görünüşü quraşdırıla bilmir. Lütfən ORBIT və OAF qurğularınızı "
 "yoxlayın."
 
-#: calendar/gui/calendar-component.c:70 calendar/gui/gnome-cal.c:1569
+#: calendar/gui/calendar-component.c:70 calendar/gui/gnome-cal.c:1353
 #: importers/netscape-importer.c:1873 mail/importers/netscape-importer.c:1843
 #: my-evolution/my-evolution.glade.h:2 shell/e-local-storage.c:177
 #: shell/e-shortcuts.c:1085
@@ -3949,11 +3922,11 @@ msgstr "_Ümumi Təqvim URL:"
 msgid "Public folder containing appointments and events"
 msgstr "Görüş və hadisələri daxil edən qovluq"
 
-#: calendar/gui/calendar-component.c:80 calendar/gui/e-tasks.c:1080
-#: calendar/gui/print.c:1787 calendar/gui/tasks-control.c:487
+#: calendar/gui/calendar-component.c:80 calendar/gui/e-tasks.c:738
+#: calendar/gui/print.c:1789 calendar/gui/tasks-control.c:504
 #: calendar/importers/icalendar-importer.c:644
 #: importers/netscape-importer.c:1875 mail/importers/netscape-importer.c:1845
-#: my-evolution/e-summary-tasks.c:348 my-evolution/e-summary-tasks.c:357
+#: my-evolution/e-summary-tasks.c:329 my-evolution/e-summary-tasks.c:338
 #: shell/e-local-storage.c:183 shell/e-shortcuts.c:1086
 msgid "Tasks"
 msgstr "Vəzifə"
@@ -4029,6 +4002,107 @@ msgstr "Yeni _Görüş"
 msgid "Create a new all-day appointment"
 msgstr "Yeni bir iclas yarat"
 
+#: calendar/gui/calendar-model.c:405 calendar/gui/calendar-model.c:964
+#: calendar/gui/e-calendar-table.c:380
+msgid "Private"
+msgstr "Şəxsi"
+
+#: calendar/gui/calendar-model.c:408 calendar/gui/calendar-model.c:966
+#: calendar/gui/e-calendar-table.c:381
+msgid "Confidential"
+msgstr "Gizli"
+
+#: calendar/gui/calendar-model.c:411 calendar/gui/e-calendar-table.c:379
+msgid "Public"
+msgstr "Ümumi"
+
+#: calendar/gui/calendar-model.c:523
+msgid "N"
+msgstr "N"
+
+#: calendar/gui/calendar-model.c:523
+msgid "S"
+msgstr "Baz."
+
+#: calendar/gui/calendar-model.c:525
+msgid "E"
+msgstr "E"
+
+#: calendar/gui/calendar-model.c:525
+msgid "W"
+msgstr "Çərş."
+
+#: calendar/gui/calendar-model.c:590 calendar/gui/calendar-model.c:1134
+#: calendar/gui/e-calendar-table.c:453
+msgid "Free"
+msgstr "Boş"
+
+#: calendar/gui/calendar-model.c:592 calendar/gui/e-calendar-table.c:454
+#: calendar/gui/e-meeting-time-sel.c:406
+#: shell/evolution-shell-component.c:1204
+msgid "Busy"
+msgstr "Məşğul"
+
+#: calendar/gui/calendar-model.c:750 calendar/gui/calendar-model.c:1178
+#: calendar/gui/dialogs/task-details-page.glade.h:10
+#: calendar/gui/e-calendar-table.c:474 calendar/gui/print.c:2298
+msgid "Not Started"
+msgstr "Başlamayıb"
+
+#: calendar/gui/calendar-model.c:753 calendar/gui/calendar-model.c:1180
+#: calendar/gui/dialogs/task-details-page.glade.h:7
+#: calendar/gui/e-calendar-table.c:475 calendar/gui/print.c:2301
+msgid "In Progress"
+msgstr "İşləyir"
+
+#: calendar/gui/calendar-model.c:756 calendar/gui/calendar-model.c:1182
+#: calendar/gui/dialogs/task-details-page.glade.h:4
+#: calendar/gui/e-calendar-table.c:476 calendar/gui/e-meeting-model.c:294
+#: calendar/gui/e-meeting-model.c:317 calendar/gui/print.c:2304
+msgid "Completed"
+msgstr "Bitirmə Tarixi"
+
+#: calendar/gui/calendar-model.c:1036
+msgid ""
+"The geographical position must be entered in the format: \n"
+"\n"
+"45.436845,125.862501"
+msgstr ""
+"Coğrafi yer bu şəkildə bildirilməlidir: \n"
+"\n"
+"45.436845,125.862501"
+
+#. An empty string is the same as 'None'.
+#: calendar/gui/calendar-model.c:1176 calendar/gui/dialogs/meeting-page.c:330
+#: calendar/gui/dialogs/meeting-page.glade.h:2 composer/e-msg-composer.c:2056
+#: mail/folder-browser.c:1752 mail/mail-account-gui.c:1260
+#: mail/mail-account-gui.c:1692 mail/mail-accounts.c:442
+#: mail/mail-config.glade.h:76
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:194
+#: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:442
+#: widgets/misc/e-dateedit.c:1458 widgets/misc/e-dateedit.c:1573
+msgid "None"
+msgstr "Yoxdur"
+
+#: calendar/gui/calendar-model.c:1711
+msgid "Recurring"
+msgstr "Təkrarlayan"
+
+#: calendar/gui/calendar-model.c:1713
+msgid "Assigned"
+msgstr "Vəzifələndirilmiş"
+
+#: calendar/gui/calendar-model.c:1719 calendar/gui/e-meeting-model.c:266
+#: calendar/gui/e-meeting-model.c:276 calendar/gui/e-meeting-model.c:534
+#: calendar/gui/e-meeting-model.c:784
+msgid "Yes"
+msgstr "Bəli"
+
+#: calendar/gui/calendar-model.c:1719 calendar/gui/e-meeting-model.c:278
+#: calendar/gui/e-meeting-model.c:785
+msgid "No"
+msgstr "Xeyr"
+
 #: calendar/gui/calendar-view-factory.c:118
 msgid "Day View"
 msgstr "Gündəlik Nümayiş"
@@ -4045,72 +4119,51 @@ msgstr "Həftəlik Nümayiş"
 msgid "Month View"
 msgstr "Aylıq Nümayiş"
 
-#: calendar/gui/calendar-view-factory.c:130
-#, fuzzy
-msgid "List View"
-msgstr "_Hazırkı Görünüş"
-
-#: calendar/gui/cal-search-bar.c:50
-msgid "Summary contains"
-msgstr "Daxil edən icmal"
-
-#: calendar/gui/cal-search-bar.c:51
-msgid "Description contains"
-msgstr "Daxil edən izah"
-
-#: calendar/gui/cal-search-bar.c:52
-msgid "Comment contains"
-msgstr "Daxil edən şərh"
-
-#: calendar/gui/cal-search-bar.c:358 mail/mail-ops.c:1120
-msgid "Unmatched"
-msgstr "Oxşar Olmayan"
-
-#: calendar/gui/comp-editor-factory.c:462
+#: calendar/gui/comp-editor-factory.c:456
 #, fuzzy
 msgid "Error while opening the calendar"
 msgstr "Təqvim vericisi ilə bağlantı qurulurkən xəta oldu"
 
-#: calendar/gui/comp-editor-factory.c:473
+#: calendar/gui/comp-editor-factory.c:467
 msgid "Method not supported when opening the calendar"
 msgstr ""
 
-#: calendar/gui/comp-editor-factory.c:479
+#: calendar/gui/comp-editor-factory.c:473
 #, fuzzy
 msgid "Permission denied to open the calendar"
 msgstr "Qadağandır"
 
-#: calendar/gui/control-factory.c:125
+#: calendar/gui/control-factory.c:119
 #, fuzzy, c-format
 msgid "Could not open the folder in '%s'"
 msgstr "`%s'da(də) qovluq yarada bilmədim"
 
-#: calendar/gui/control-factory.c:171
+#: calendar/gui/control-factory.c:165
 msgid "The URI that the calendar will display"
 msgstr "Təqvimin göstərəcəyi URI"
 
-#: calendar/gui/control-factory.c:178
+#: calendar/gui/control-factory.c:172
 msgid "The type of view to show"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-options.c:466
+#: calendar/gui/dialogs/alarm-options.c:420
 msgid "Audio Alarm Options"
 msgstr "Səsli Alarm Seçənəkləri"
 
-#: calendar/gui/dialogs/alarm-options.c:475
+#: calendar/gui/dialogs/alarm-options.c:429
 msgid "Message Alarm Options"
 msgstr "İsmarış Alarm Seçənəkləri"
 
-#: calendar/gui/dialogs/alarm-options.c:484
+#: calendar/gui/dialogs/alarm-options.c:438
 #, fuzzy
 msgid "Email Alarm Options"
 msgstr "Məktub Alarm Seçənəkləri"
 
-#: calendar/gui/dialogs/alarm-options.c:493
+#: calendar/gui/dialogs/alarm-options.c:447
 msgid "Program Alarm Options"
 msgstr "Proqram Alarm Seçənəkləri"
 
-#: calendar/gui/dialogs/alarm-options.c:509
+#: calendar/gui/dialogs/alarm-options.c:456
 msgid "Unknown Alarm Options"
 msgstr "Naməlum Alarm Seçənəkləri"
 
@@ -4149,6 +4202,10 @@ msgstr "Göndər"
 msgid "With these arguments:"
 msgstr "Bu arqumentlərlə:"
 
+#: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter.glade.h:17
+msgid "days"
+msgstr "gün"
+
 #: calendar/gui/dialogs/alarm-options.glade.h:11
 msgid "dialog1"
 msgstr ""
@@ -4161,8 +4218,7 @@ msgstr "hər əlavə vaxtda"
 msgid "hours"
 msgstr "saat"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:14
-#: executive-summary/test-service/rdf-summary.c:806 filter/filter.glade.h:19
+#: calendar/gui/dialogs/alarm-options.glade.h:14 filter/filter.glade.h:19
 msgid "minutes"
 msgstr "dəqiqə"
 
@@ -4176,11 +4232,11 @@ msgstr "Əsaslar"
 msgid "Date/Time:"
 msgstr "Tarix/Vaxt:"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:3 calendar/gui/e-alarm-list.c:465
+#: calendar/gui/dialogs/alarm-page.glade.h:3 calendar/gui/e-alarm-list.c:461
 msgid "Display a message"
 msgstr "İsmarış göstər"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:4 calendar/gui/e-alarm-list.c:461
+#: calendar/gui/dialogs/alarm-page.glade.h:4 calendar/gui/e-alarm-list.c:457
 msgid "Play a sound"
 msgstr "Səs çal"
 
@@ -4188,7 +4244,7 @@ msgstr "Səs çal"
 msgid "Reminders"
 msgstr "Xatırladıcılar"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:6 calendar/gui/e-alarm-list.c:473
+#: calendar/gui/dialogs/alarm-page.glade.h:6 calendar/gui/e-alarm-list.c:469
 msgid "Run a program"
 msgstr "Proqramı işə sal"
 
@@ -4199,8 +4255,7 @@ msgstr "ePoçt göndər"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:8
 #: calendar/gui/dialogs/recurrence-page.glade.h:8
-#: calendar/gui/e-itip-control.c:1022 calendar/gui/e-itip-control.glade.h:11
-#: calendar/gui/e-tasks.c:208
+#: calendar/gui/e-itip-control.c:1052 calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "Mündəricat:"
 
@@ -4284,7 +4339,7 @@ msgstr "Gün"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
 #: calendar/gui/dialogs/recurrence-page.c:1040
-#: calendar/gui/e-itip-control.c:647
+#: calendar/gui/e-itip-control.c:677
 msgid "Friday"
 msgstr "Cümə"
 
@@ -4298,7 +4353,7 @@ msgstr "Dəqiqə"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
 #: calendar/gui/dialogs/recurrence-page.c:1036
-#: calendar/gui/e-itip-control.c:643
+#: calendar/gui/e-itip-control.c:673
 msgid "Monday"
 msgstr "Bazar ertəsi"
 
@@ -4309,7 +4364,7 @@ msgstr "Ba_z"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
 #: calendar/gui/dialogs/recurrence-page.c:1041
-#: calendar/gui/e-itip-control.c:648
+#: calendar/gui/e-itip-control.c:678
 msgid "Saturday"
 msgstr "Şənbə"
 
@@ -4323,7 +4378,7 @@ msgstr "Vaxt səyyahında həftə _sayısını göstər"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
 #: calendar/gui/dialogs/recurrence-page.c:1042
-#: calendar/gui/e-itip-control.c:642
+#: calendar/gui/e-itip-control.c:672
 msgid "Sunday"
 msgstr "Bazar"
 
@@ -4343,7 +4398,7 @@ msgstr "_Vəzifə Siyahısı"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
 #: calendar/gui/dialogs/recurrence-page.c:1039
-#: calendar/gui/e-itip-control.c:646
+#: calendar/gui/e-itip-control.c:676
 msgid "Thursday"
 msgstr "Cümə Axşamı"
 
@@ -4361,7 +4416,7 @@ msgstr "Vaxt Şəkli:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
 #: calendar/gui/dialogs/recurrence-page.c:1037
-#: calendar/gui/e-itip-control.c:644
+#: calendar/gui/e-itip-control.c:674
 msgid "Tuesday"
 msgstr "Çərşənbə axşamı"
 
@@ -4371,12 +4426,12 @@ msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
 #: calendar/gui/dialogs/recurrence-page.c:1038
-#: calendar/gui/e-itip-control.c:645
+#: calendar/gui/e-itip-control.c:675
 msgid "Wednesday"
 msgstr "Çərşənbə"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-#: ui/evolution-calendar.xml.h:31
+#: ui/evolution-calendar.xml.h:27
 msgid "Work Week"
 msgstr "İş  Həftəsi"
 
@@ -4489,54 +4544,79 @@ msgstr ""
 msgid "Are you sure you want to cancel and delete this journal entry?"
 msgstr "Bu jurnal girişini həqiqətən də ləğv edib silmək istəyirsiniz?"
 
-#: calendar/gui/dialogs/changed-comp.c:59
+#: calendar/gui/dialogs/changed-comp.c:58
 msgid "This event has been deleted."
 msgstr "Bu hadisə silindi."
 
-#: calendar/gui/dialogs/changed-comp.c:63
+#: calendar/gui/dialogs/changed-comp.c:62
 msgid "This task has been deleted."
 msgstr "Bu vəzifə silindi."
 
-#: calendar/gui/dialogs/changed-comp.c:67
+#: calendar/gui/dialogs/changed-comp.c:66
 msgid "This journal entry has been deleted."
 msgstr "Bu jurnal girişi silindi."
 
-#: calendar/gui/dialogs/changed-comp.c:76
+#: calendar/gui/dialogs/changed-comp.c:75
 #, c-format
 msgid "%s  You have made changes. Forget those changes and close the editor?"
 msgstr ""
 "%s  Siz dəyişikliklər apardınız. Bu dəyişiklikləri nəzərə almayıb editoru "
 "qapadaq?"
 
-#: calendar/gui/dialogs/changed-comp.c:78
+#: calendar/gui/dialogs/changed-comp.c:77
 #, c-format
 msgid "%s  You have made no changes, close the editor?"
 msgstr "%s  Siz dəyişikliklər aparmadınız. Editoru qapadaq?"
 
-#: calendar/gui/dialogs/changed-comp.c:83
+#: calendar/gui/dialogs/changed-comp.c:82
 msgid "This event has been changed."
 msgstr "Hadisə dəyişdirildi."
 
-#: calendar/gui/dialogs/changed-comp.c:87
+#: calendar/gui/dialogs/changed-comp.c:86
 msgid "This task has been changed."
 msgstr "Bu vəzifə dəyişdirildi."
 
-#: calendar/gui/dialogs/changed-comp.c:91
+#: calendar/gui/dialogs/changed-comp.c:90
 msgid "This journal entry has been changed."
 msgstr "Bu jurnal girişi dəyişdirildi."
 
-#: calendar/gui/dialogs/changed-comp.c:100
+#: calendar/gui/dialogs/changed-comp.c:99
 #, c-format
 msgid "%s  You have made changes. Forget those changes and update the editor?"
 msgstr ""
 "%s  Siz dəyişikliklər apardınız. Bu dəyişiklikləri nəzərə almayıb editoru "
 "güncəlləyək?"
 
-#: calendar/gui/dialogs/changed-comp.c:102
+#: calendar/gui/dialogs/changed-comp.c:101
 #, c-format
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  Siz dəyişikliklər aparmadınız. editoru güncəlləşdirək?"
 
+#: calendar/gui/dialogs/comp-editor-page.c:409
+#, fuzzy, c-format
+msgid "Validation error: %s"
+msgstr "Naməlum xəta: %s"
+
+#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2216
+msgid " to "
+msgstr " buraya "
+
+#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2220
+msgid " (Completed "
+msgstr " (Qurtarılıb "
+
+#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2222
+msgid "Completed "
+msgstr "Qurtarılıb "
+
+#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2227
+msgid " (Due "
+msgstr " (Ait "
+
+#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2229
+msgid "Due "
+msgstr "Aidiyyət"
+
 #: calendar/gui/dialogs/comp-editor.c:334
 #, fuzzy
 msgid "Could not update invalid object"
@@ -4584,47 +4664,21 @@ msgid "No summary"
 msgstr "Mündəricat yoxdur"
 
 #: calendar/gui/dialogs/comp-editor.c:1281
-#: calendar/gui/e-calendar-table.c:1138 calendar/gui/e-cal-view.c:878
-#: composer/e-msg-composer.c:1191
+#: calendar/gui/e-calendar-table.c:1068 calendar/gui/e-day-view.c:3993
+#: calendar/gui/e-week-view.c:3840 composer/e-msg-composer.c:1164
 msgid "Save as..."
 msgstr "Fərqli qeyd et ..."
 
-#: calendar/gui/dialogs/comp-editor.c:1384
-#: calendar/gui/dialogs/comp-editor.c:1408
-#: calendar/gui/dialogs/comp-editor.c:1434
+#: calendar/gui/dialogs/comp-editor.c:1382
+#: calendar/gui/dialogs/comp-editor.c:1406
+#: calendar/gui/dialogs/comp-editor.c:1432
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:1464
-#: calendar/gui/dialogs/comp-editor.c:1473
+#: calendar/gui/dialogs/comp-editor.c:1459
 msgid "Unable to obtain current version!"
 msgstr "Hazırkı buraxılış öyrənilə bilmədi!"
 
-#: calendar/gui/dialogs/comp-editor-page.c:409
-#, fuzzy, c-format
-msgid "Validation error: %s"
-msgstr "Naməlum xəta: %s"
-
-#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2223
-msgid " to "
-msgstr " buraya "
-
-#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2227
-msgid " (Completed "
-msgstr " (Qurtarılıb "
-
-#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2229
-msgid "Completed "
-msgstr "Qurtarılıb "
-
-#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2234
-msgid " (Due "
-msgstr " (Ait "
-
-#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2236
-msgid "Due "
-msgstr "Aidiyyət"
-
 #: calendar/gui/dialogs/delete-comp.c:96
 #, c-format
 msgid "Are you sure you want to delete the appointment `%s'?"
@@ -4733,31 +4787,31 @@ msgstr "Nümayəndələşdir:"
 msgid "Enter Delegate"
 msgstr "Nümayəndəni Bildir"
 
-#: calendar/gui/dialogs/event-editor.c:200 calendar/gui/print.c:2260
+#: calendar/gui/dialogs/event-editor.c:199 calendar/gui/print.c:2253
 msgid "Appointment"
 msgstr "İclas"
 
-#: calendar/gui/dialogs/event-editor.c:207
+#: calendar/gui/dialogs/event-editor.c:206
 msgid "Reminder"
 msgstr "Xatırladıcı"
 
-#: calendar/gui/dialogs/event-editor.c:214
+#: calendar/gui/dialogs/event-editor.c:213
 msgid "Recurrence"
 msgstr "Təkrarlama"
 
-#: calendar/gui/dialogs/event-editor.c:221
-#: calendar/gui/dialogs/event-editor.c:294
-#: calendar/gui/dialogs/event-editor.c:438
+#: calendar/gui/dialogs/event-editor.c:220
+#: calendar/gui/dialogs/event-editor.c:292
+#: calendar/gui/dialogs/event-editor.c:436
 msgid "Scheduling"
 msgstr "Vaxtlaşdırılır"
 
-#: calendar/gui/dialogs/event-editor.c:228
-#: calendar/gui/dialogs/event-editor.c:297
-#: calendar/gui/dialogs/event-editor.c:441 ui/evolution-event-editor.xml.h:6
+#: calendar/gui/dialogs/event-editor.c:227
+#: calendar/gui/dialogs/event-editor.c:295
+#: calendar/gui/dialogs/event-editor.c:439 ui/evolution-event-editor.xml.h:6
 msgid "Meeting"
 msgstr "İclas"
 
-#: calendar/gui/dialogs/event-page.c:603 calendar/gui/dialogs/task-page.c:509
+#: calendar/gui/dialogs/event-page.c:603 calendar/gui/dialogs/task-page.c:507
 #, fuzzy
 msgid "Start date is wrong"
 msgstr "Başlama Tarixi"
@@ -4795,9 +4849,9 @@ msgid "Classification"
 msgstr "Sinifləndirmələr"
 
 #: calendar/gui/dialogs/event-page.glade.h:6
-#, fuzzy
-msgid "Co_nfidential"
-msgstr "Gizli"
+#: calendar/gui/dialogs/task-page.glade.h:4
+msgid "Con_fidential"
+msgstr "Gi_zli"
 
 #: calendar/gui/dialogs/event-page.glade.h:7
 #: calendar/gui/dialogs/task-page.glade.h:5
@@ -4826,6 +4880,7 @@ msgid "Pu_blic"
 msgstr "Üm_umi"
 
 #: calendar/gui/dialogs/event-page.glade.h:12
+#: calendar/gui/e-calendar-table.etspec.h:13
 msgid "Show Time As"
 msgstr "Vaxt Fərqli Göstər"
 
@@ -4842,34 +4897,75 @@ msgstr "_Sonlanma vaxtı:"
 msgid "_Start time:"
 msgstr "_Başlama vaxt:"
 
-#. an empty string is the same as 'None'
-#: calendar/gui/dialogs/meeting-page.c:311
-#: calendar/gui/dialogs/meeting-page.glade.h:2
-#: calendar/gui/e-cal-model-tasks.c:596 composer/e-msg-composer.c:2093
-#: mail/mail-account-gui.c:1260 mail/mail-account-gui.c:1692
-#: mail/mail-accounts.c:442 mail/mail-config.glade.h:76
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:194
-#: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:445
-#: widgets/misc/e-dateedit.c:1483 widgets/misc/e-dateedit.c:1598
-msgid "None"
-msgstr "Yoxdur"
-
-#: calendar/gui/dialogs/meeting-page.c:416
+#: calendar/gui/dialogs/meeting-page.c:437
 msgid "The organizer selected no longer has an account."
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:422
+#: calendar/gui/dialogs/meeting-page.c:443
 msgid "An organizer is required."
 msgstr "Təşkilatçı lazımdır."
 
-#: calendar/gui/dialogs/meeting-page.c:437
+#: calendar/gui/dialogs/meeting-page.c:458
 msgid "At least one attendee is required."
 msgstr "Ən az bir dinləyici lazımdır."
 
-#: calendar/gui/dialogs/meeting-page.c:630
+#: calendar/gui/dialogs/meeting-page.c:629
+msgid "That person is already attending the meeting!"
+msgstr "Bu şəxs onsuz da iclasın dinləyicisidir!"
+
+#: calendar/gui/dialogs/meeting-page.c:713
 msgid "_Delegate To..."
 msgstr "_Təmsil Et..."
 
+#: calendar/gui/dialogs/meeting-page.etspec.h:1
+#: calendar/gui/e-meeting-time-sel.etspec.h:1
+msgid "Attendee"
+msgstr "Ziyarətçilər"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:2
+#: calendar/gui/e-meeting-time-sel.etspec.h:2
+#, fuzzy
+msgid "Click here to add an attendee"
+msgstr "* Əlaqə əlavə etmək üçün buraya tıqlayın *"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:3
+#: calendar/gui/e-meeting-time-sel.etspec.h:3
+msgid "Common Name"
+msgstr "Ümumi Ad"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:4
+#: calendar/gui/e-meeting-time-sel.etspec.h:4
+msgid "Delegated From"
+msgstr "Təmsil Etdiyi Yer"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:5
+#: calendar/gui/e-meeting-time-sel.etspec.h:5
+msgid "Delegated To"
+msgstr "Təmsil Edir"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:6
+#: calendar/gui/e-meeting-time-sel.etspec.h:6
+msgid "Language"
+msgstr "Dil"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:7
+#: calendar/gui/e-meeting-time-sel.etspec.h:7
+msgid "Member"
+msgstr "Üzv"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:8
+#: calendar/gui/e-itip-control.c:1179
+#: calendar/gui/e-meeting-time-sel.etspec.h:8
+msgid "RSVP"
+msgstr "RSVP"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:10
+#: calendar/gui/e-calendar-table.etspec.h:15
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:58
+#: mail/message-list.etspec.h:12
+msgid "Status"
+msgstr "Hal"
+
 #: calendar/gui/dialogs/meeting-page.glade.h:3
 #: calendar/gui/e-itip-control.glade.h:9
 msgid "Organizer:"
@@ -4880,7 +4976,7 @@ msgid "_Change Organizer"
 msgstr "Təşkilatçını _Dəyişdir"
 
 #: calendar/gui/dialogs/meeting-page.glade.h:5
-#: calendar/gui/e-meeting-time-sel.c:411
+#: calendar/gui/e-meeting-time-sel.c:424
 msgid "_Invite Others..."
 msgstr "Başqalarını _Dəvət Et ..."
 
@@ -5039,7 +5135,7 @@ msgstr ""
 "\n"
 "Dəyişikliklərinizin qeyd edilməyini istəyirsinizmi?"
 
-#: calendar/gui/dialogs/save-comp.c:58 composer/e-msg-composer.c:1599
+#: calendar/gui/dialogs/save-comp.c:58 composer/e-msg-composer.c:1557
 msgid "_Discard Changes"
 msgstr ""
 
@@ -5066,83 +5162,53 @@ msgstr "Vəzifə məlumatı dəyişdir. Güncəllənmiş buraxılışını yolla
 msgid "The task information has changed. Send an updated version?"
 msgstr "Vəzifə məlumatı dəyişdir. Güncəllənmiş buraxılışını yollayaq?"
 
-#: calendar/gui/dialogs/task-details-page.c:405
+#: calendar/gui/dialogs/task-details-page.c:401
 #, fuzzy
 msgid "Completed date is wrong"
 msgstr "Qurtarılıb "
 
 #: calendar/gui/dialogs/task-details-page.glade.h:2
-#, fuzzy, no-c-format
-msgid "% _Complete"
+#: calendar/gui/e-calendar-table.etspec.h:2
+#, no-c-format
+msgid "% Complete"
 msgstr "% Qurtardı"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:4
-#: calendar/gui/e-calendar-table.c:478 calendar/gui/e-cal-model-tasks.c:323
-#: calendar/gui/e-cal-model-tasks.c:602 calendar/gui/e-tasks.c:250
-#: calendar/gui/print.c:2311
-msgid "Completed"
-msgstr "Bitirmə Tarixi"
-
-#: calendar/gui/dialogs/task-details-page.glade.h:6
-#: calendar/gui/e-calendar-table.c:477 calendar/gui/e-cal-model-tasks.c:321
-#: calendar/gui/e-cal-model-tasks.c:600 calendar/gui/e-cal-model-tasks.c:662
-#: calendar/gui/e-tasks.c:247 calendar/gui/print.c:2308
-msgid "In Progress"
-msgstr "İşləyir"
-
-#: calendar/gui/dialogs/task-details-page.glade.h:9
-#: calendar/gui/e-calendar-table.c:476 calendar/gui/e-cal-model-tasks.c:319
-#: calendar/gui/e-cal-model-tasks.c:598 calendar/gui/e-tasks.c:257
-#: calendar/gui/print.c:2305
-msgid "Not Started"
-msgstr "Başlamayıb"
+#: calendar/gui/dialogs/task-details-page.glade.h:5
+msgid "Date Completed:"
+msgstr "Bitirmə Tarixi:"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:10
+#: calendar/gui/dialogs/task-details-page.glade.h:11
 msgid "Progress"
 msgstr "Gedişat"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:12
-#, fuzzy
-msgid "_Date Completed:"
-msgstr "Bitirmə Tarixi:"
+msgid "URL:"
+msgstr "URL:"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:13
+#: calendar/gui/dialogs/task-details-page.glade.h:14
 msgid "_Priority:"
 msgstr "_Üstünlük:"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:14
+#: calendar/gui/dialogs/task-details-page.glade.h:15
 msgid "_Status:"
 msgstr "_Hal:"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:15
-#, fuzzy
-msgid "_Web Page:"
-msgstr "_Veb səhifəsi ünvanı:"
-
-#: calendar/gui/dialogs/task-editor.c:193
+#: calendar/gui/dialogs/task-editor.c:190
 msgid "Basic"
 msgstr "Əsas"
 
-#: calendar/gui/dialogs/task-editor.c:207
-#: calendar/gui/dialogs/task-editor.c:270
-#: calendar/gui/dialogs/task-editor.c:407
+#: calendar/gui/dialogs/task-editor.c:204
+#: calendar/gui/dialogs/task-editor.c:252
+#: calendar/gui/dialogs/task-editor.c:387
 msgid "Assignment"
 msgstr "Vəzifələndirilmiş"
 
-#: calendar/gui/dialogs/task-page.c:482
+#: calendar/gui/dialogs/task-page.c:480
 msgid "Due date is wrong"
 msgstr ""
 
-#: calendar/gui/dialogs/task-page.c:542
-msgid "Due date is before start date!"
-msgstr ""
-
-#: calendar/gui/dialogs/task-page.glade.h:4
-msgid "Con_fidential"
-msgstr "Gi_zli"
-
-#: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-itip-control.c:1077
-#: calendar/gui/e-itip-control.glade.h:6 calendar/gui/e-tasks.c:287
+#: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-itip-control.c:1107
+#: calendar/gui/e-itip-control.glade.h:6
 #: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:43
 msgid "Description:"
 msgstr "İzah :"
@@ -5155,263 +5221,228 @@ msgstr "Başla_ma Tarixi:"
 msgid "_Due Date:"
 msgstr "_Bu tarixə qədər :"
 
-#: calendar/gui/e-alarm-list.c:397
+#: calendar/gui/e-alarm-list.c:393
 #, c-format
 msgid "%d days"
 msgstr "%d gün"
 
-#: calendar/gui/e-alarm-list.c:400
+#: calendar/gui/e-alarm-list.c:396
 msgid "1 day"
 msgstr "1 gün"
 
-#: calendar/gui/e-alarm-list.c:405
+#: calendar/gui/e-alarm-list.c:401
 #, c-format
 msgid "%d weeks"
 msgstr "%d həftə"
 
-#: calendar/gui/e-alarm-list.c:408
+#: calendar/gui/e-alarm-list.c:404
 msgid "1 week"
 msgstr "1 həftə"
 
-#: calendar/gui/e-alarm-list.c:413
+#: calendar/gui/e-alarm-list.c:409
 #, c-format
 msgid "%d hours"
 msgstr "%d saat"
 
-#: calendar/gui/e-alarm-list.c:416
+#: calendar/gui/e-alarm-list.c:412
 msgid "1 hour"
 msgstr "1 saat"
 
-#: calendar/gui/e-alarm-list.c:421
+#: calendar/gui/e-alarm-list.c:417
 #, c-format
 msgid "%d minutes"
 msgstr "%d dəqiqə"
 
-#: calendar/gui/e-alarm-list.c:424
+#: calendar/gui/e-alarm-list.c:420
 msgid "1 minute"
 msgstr "1 dəqiqə"
 
-#: calendar/gui/e-alarm-list.c:429
+#: calendar/gui/e-alarm-list.c:425
 #, c-format
 msgid "%d seconds"
 msgstr "%d saniyə"
 
-#: calendar/gui/e-alarm-list.c:432
+#: calendar/gui/e-alarm-list.c:428
 msgid "1 second"
 msgstr "1 saniyə"
 
-#: calendar/gui/e-alarm-list.c:469
+#: calendar/gui/e-alarm-list.c:465
 msgid "Send an email"
 msgstr "ePoçt göndər"
 
-#: calendar/gui/e-alarm-list.c:479
+#: calendar/gui/e-alarm-list.c:475
 msgid "Unknown action to be performed"
 msgstr "Naməlum gediş aparıldı"
 
-#: calendar/gui/e-alarm-list.c:491
+#: calendar/gui/e-alarm-list.c:487
 #, c-format
 msgid "%s %s before the start of the appointment"
 msgstr "iclasın başlamasından %s %s əvvəl"
 
-#: calendar/gui/e-alarm-list.c:494
+#: calendar/gui/e-alarm-list.c:490
 #, c-format
 msgid "%s %s after the start of the appointment"
 msgstr "iclasın başlamasından %s %s sonra"
 
-#: calendar/gui/e-alarm-list.c:499
+#: calendar/gui/e-alarm-list.c:495
 #, c-format
 msgid "%s at the start of the appointment"
 msgstr "iclasın başlanğıcının %s"
 
-#: calendar/gui/e-alarm-list.c:508
+#: calendar/gui/e-alarm-list.c:504
 #, c-format
 msgid "%s %s before the end of the appointment"
 msgstr "iclasın qurtarmasından %s %s əvvəl"
 
-#: calendar/gui/e-alarm-list.c:511
+#: calendar/gui/e-alarm-list.c:507
 #, c-format
 msgid "%s %s after the end of the appointment"
 msgstr "iclas qurtarandan %s %s sonra"
 
-#: calendar/gui/e-alarm-list.c:516
+#: calendar/gui/e-alarm-list.c:512
 #, c-format
 msgid "%s at the end of the appointment"
 msgstr "iclas qurtarandan %s sonra"
 
-#: calendar/gui/e-alarm-list.c:540
+#: calendar/gui/e-alarm-list.c:536
 #, c-format
 msgid "%s at %s"
 msgstr "%s %s"
 
-#: calendar/gui/e-alarm-list.c:546
+#: calendar/gui/e-alarm-list.c:542
 #, c-format
 msgid "%s for an unknown trigger type"
 msgstr "naməlum tətik növü üçün %s"
 
-#: calendar/gui/e-calendar-table.c:381 calendar/gui/e-cal-model.c:280
-#: calendar/gui/e-cal-model.c:287
-msgid "Public"
-msgstr "Ümumi"
-
-#: calendar/gui/e-calendar-table.c:382 calendar/gui/e-cal-model.c:289
-msgid "Private"
-msgstr "Şəxsi"
-
-#: calendar/gui/e-calendar-table.c:383 calendar/gui/e-cal-model.c:291
-msgid "Confidential"
-msgstr "Gizli"
-
-#: calendar/gui/e-calendar-table.c:425
+#: calendar/gui/e-calendar-table.c:423
 msgid "0%"
 msgstr "0%"
 
-#: calendar/gui/e-calendar-table.c:426
+#: calendar/gui/e-calendar-table.c:424
 msgid "10%"
 msgstr "10%"
 
-#: calendar/gui/e-calendar-table.c:427
+#: calendar/gui/e-calendar-table.c:425
 msgid "20%"
 msgstr "20%"
 
-#: calendar/gui/e-calendar-table.c:428
+#: calendar/gui/e-calendar-table.c:426
 msgid "30%"
 msgstr "30%"
 
-#: calendar/gui/e-calendar-table.c:429
+#: calendar/gui/e-calendar-table.c:427
 msgid "40%"
 msgstr "40%"
 
-#: calendar/gui/e-calendar-table.c:430
+#: calendar/gui/e-calendar-table.c:428
 msgid "50%"
 msgstr "50%"
 
-#: calendar/gui/e-calendar-table.c:431
+#: calendar/gui/e-calendar-table.c:429
 msgid "60%"
 msgstr "60%"
 
-#: calendar/gui/e-calendar-table.c:432
+#: calendar/gui/e-calendar-table.c:430
 msgid "70%"
 msgstr "70%"
 
-#: calendar/gui/e-calendar-table.c:433
+#: calendar/gui/e-calendar-table.c:431
 msgid "80%"
 msgstr "80%"
 
-#: calendar/gui/e-calendar-table.c:434
+#: calendar/gui/e-calendar-table.c:432
 msgid "90%"
 msgstr "90%"
 
-#: calendar/gui/e-calendar-table.c:435
+#: calendar/gui/e-calendar-table.c:433
 #, fuzzy
 msgid "100%"
 msgstr "10%"
 
-#: calendar/gui/e-calendar-table.c:455 calendar/gui/e-cal-model-calendar.c:163
-msgid "Free"
-msgstr "Boş"
-
-#: calendar/gui/e-calendar-table.c:456 calendar/gui/e-cal-model-calendar.c:166
-#: calendar/gui/e-meeting-time-sel.c:393
-#: shell/evolution-shell-component.c:1207
-msgid "Busy"
-msgstr "Məşğul"
-
-#: calendar/gui/e-calendar-table.c:724 calendar/gui/e-cal-view.c:562
+#: calendar/gui/e-calendar-table.c:726 calendar/gui/e-day-view.c:2867
+#: calendar/gui/e-week-view.c:1933
 msgid "Deleting selected objects"
 msgstr "Seçili üzv silinir"
 
-#: calendar/gui/e-calendar-table.c:988 calendar/gui/e-calendar-table.c:1029
-#: calendar/gui/e-cal-view.c:1126 calendar/gui/e-cal-view.c:1192
+#: calendar/gui/e-calendar-table.c:958 calendar/gui/e-day-view.c:3737
+#: calendar/gui/e-week-view.c:3613 mail/folder-browser.c:1763
 #: shell/e-shortcuts-view.c:422 ui/evolution-addressbook.xml.h:36
 msgid "_Open"
 msgstr "_Aç"
 
-#: calendar/gui/e-calendar-table.c:989
+#: calendar/gui/e-calendar-table.c:959
 #, fuzzy
-msgid "Open _Web Page"
-msgstr "İsmarışı _Aç"
-
-#: calendar/gui/e-calendar-table.c:990 calendar/gui/e-calendar-table.c:1035
-#: calendar/gui/e-cal-view.c:1127 calendar/gui/e-cal-view.c:1198
-#: ui/evolution-mail-message.xml.h:120
-msgid "_Save As..."
-msgstr "Fərqli _Qeyd Et ..."
+msgid "_Save as..."
+msgstr "Fərqli qeyd et ..."
 
-#: calendar/gui/e-calendar-table.c:991 calendar/gui/e-calendar-table.c:1033
-#: calendar/gui/e-cal-view.c:1101 calendar/gui/e-cal-view.c:1128
-#: calendar/gui/e-cal-view.c:1196 ui/evolution-addressbook.xml.h:38
-#: ui/evolution-calendar.xml.h:37 ui/evolution-comp-editor.xml.h:19
-#: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:116
-#: ui/evolution-tasks.xml.h:21 ui/my-evolution.xml.h:6
+#: calendar/gui/e-calendar-table.c:960 calendar/gui/e-day-view.c:3739
+#: calendar/gui/e-week-view.c:3588 calendar/gui/e-week-view.c:3615
+#: ui/evolution-addressbook.xml.h:38 ui/evolution-calendar.xml.h:33
+#: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:108
+#: ui/evolution-tasks.xml.h:20 ui/my-evolution.xml.h:6
 msgid "_Print..."
 msgstr "_Çap Et ..."
 
-#: calendar/gui/e-calendar-table.c:995 calendar/gui/e-calendar-table.c:1024
-#: calendar/gui/e-cal-view.c:1133 calendar/gui/e-cal-view.c:1174
-#: ui/evolution-addressbook.xml.h:1 ui/evolution-calendar.xml.h:1
-#: ui/evolution-tasks.xml.h:1
+#: calendar/gui/e-calendar-table.c:964 calendar/gui/e-day-view.c:3744
+#: calendar/gui/e-week-view.c:3620 ui/evolution-addressbook.xml.h:1
+#: ui/evolution-calendar.xml.h:1 ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "Kə_s"
 
-#: calendar/gui/e-calendar-table.c:996 calendar/gui/e-calendar-table.c:1022
-#: calendar/gui/e-cal-view.c:1134 calendar/gui/e-cal-view.c:1172
-#: ui/evolution-addressbook.xml.h:30 ui/evolution-calendar.xml.h:33
-#: ui/evolution-composer-entries.xml.h:7 ui/evolution-mail-message.xml.h:101
-#: ui/evolution-tasks.xml.h:17
+#: calendar/gui/e-calendar-table.c:965 calendar/gui/e-day-view.c:3745
+#: calendar/gui/e-week-view.c:3621 ui/evolution-addressbook.xml.h:30
+#: ui/evolution-calendar.xml.h:29 ui/evolution-composer-entries.xml.h:7
+#: ui/evolution-mail-list.xml.h:24 ui/evolution-tasks.xml.h:15
 msgid "_Copy"
 msgstr "_Köçürt"
 
-#: calendar/gui/e-calendar-table.c:997 calendar/gui/e-calendar-table.c:1031
-#: calendar/gui/e-cal-view.c:1105 calendar/gui/e-cal-view.c:1135
-#: calendar/gui/e-cal-view.c:1194 ui/evolution-addressbook.xml.h:37
-#: ui/evolution-calendar.xml.h:36 ui/evolution-composer-entries.xml.h:9
-#: ui/evolution-mail-message.xml.h:114 ui/evolution-tasks.xml.h:20
+#: calendar/gui/e-calendar-table.c:966 calendar/gui/e-day-view.c:3710
+#: calendar/gui/e-day-view.c:3746 calendar/gui/e-week-view.c:3592
+#: calendar/gui/e-week-view.c:3622 ui/evolution-addressbook.xml.h:37
+#: ui/evolution-calendar.xml.h:32 ui/evolution-composer-entries.xml.h:9
+#: ui/evolution-mail-list.xml.h:29 ui/evolution-tasks.xml.h:19
 msgid "_Paste"
 msgstr "_Yapışdır"
 
-#: calendar/gui/e-calendar-table.c:1001
+#: calendar/gui/e-calendar-table.c:970
 #, fuzzy
 msgid "_Assign Task"
 msgstr "Vəzifə Ver"
 
-#: calendar/gui/e-calendar-table.c:1002
+#: calendar/gui/e-calendar-table.c:971
 #, fuzzy
 msgid "_Forward as iCalendar"
 msgstr "v_Calendar şəklində çatdır"
 
-#: calendar/gui/e-calendar-table.c:1003
+#: calendar/gui/e-calendar-table.c:972
 msgid "_Mark as Complete"
 msgstr "Qurtardı deyə _İşarələ"
 
-#: calendar/gui/e-calendar-table.c:1004
+#: calendar/gui/e-calendar-table.c:973
 #, fuzzy
 msgid "_Mark Selected Tasks as Complete"
 msgstr "Vəzifələri Qurtardı deyə _İşarələ"
 
-#: calendar/gui/e-calendar-table.c:1009 calendar/gui/e-calendar-table.c:1027
+#: calendar/gui/e-calendar-table.c:978
 msgid "_Delete Selected Tasks"
 msgstr "Seçili Vəzifələri _Sil"
 
-#: calendar/gui/e-calendar-table.c:1341 calendar/gui/e-cal-view.c:253
+#: calendar/gui/e-calendar-table.c:1265 calendar/gui/e-day-view.c:7929
+#: calendar/gui/e-week-view.c:4335
 msgid "Updating objects"
 msgstr "Cismlər güncəllənir"
 
-#: calendar/gui/e-calendar-table.c:1424
+#: calendar/gui/e-calendar-table.c:1348
 #: calendar/gui/e-calendar-table.etspec.h:6
 msgid "Click to add a task"
 msgstr "Vəzifə əlavə etmək üçün tıqla"
 
-#: calendar/gui/e-calendar-table.etspec.h:2
-#, no-c-format
-msgid "% Complete"
-msgstr "% Qurtardı"
-
 #: calendar/gui/e-calendar-table.etspec.h:3
 msgid "Alarms"
 msgstr "Alarm"
 
-#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:1173
-#: camel/camel-filter-driver.c:1268 mail/mail-send-recv.c:578
+#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:1156
+#: camel/camel-filter-driver.c:1251
 msgid "Complete"
 msgstr "Qurtar"
 
@@ -5420,14 +5451,13 @@ msgid "Completion Date"
 msgstr "Qurtarma Vaxtı"
 
 #: calendar/gui/e-calendar-table.etspec.h:9
-#, fuzzy
-msgid "Description"
-msgstr "İzah :"
-
-#: calendar/gui/e-calendar-table.etspec.h:10
 msgid "Due Date"
 msgstr "Uyğun Tarix"
 
+#: calendar/gui/e-calendar-table.etspec.h:10
+msgid "End Date"
+msgstr "Son Tarix"
+
 #: calendar/gui/e-calendar-table.etspec.h:11
 msgid "Geographical Position"
 msgstr "Çoğrafi Yerləşmə"
@@ -5436,312 +5466,254 @@ msgstr "Çoğrafi Yerləşmə"
 msgid "Priority"
 msgstr "Üstünlük"
 
-#: calendar/gui/e-calendar-table.etspec.h:13
+#: calendar/gui/e-calendar-table.etspec.h:14
 msgid "Start Date"
 msgstr "Başlama Tarixi"
 
-#: calendar/gui/e-calendar-table.etspec.h:14
-#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:36
-#: mail/message-list.etspec.h:12
-msgid "Status"
-msgstr "Hal"
-
-#: calendar/gui/e-calendar-table.etspec.h:15
+#: calendar/gui/e-calendar-table.etspec.h:16
 #: my-evolution/component-factory.c:56 shell/e-shell.c:750
 #: shell/e-shortcuts.c:1082
 msgid "Summary"
 msgstr "Mündəricat"
 
-#: calendar/gui/e-calendar-table.etspec.h:16
+#: calendar/gui/e-calendar-table.etspec.h:17
 msgid "Task sort"
 msgstr "Vəzifə nizamlanması"
 
-#: calendar/gui/e-calendar-table.etspec.h:19 mail/mail-config.glade.h:171
-#, fuzzy
-msgid "color"
-msgstr " rəng"
-
-#: calendar/gui/e-calendar-table.etspec.h:20
-#, fuzzy
-msgid "component"
-msgstr "İclas"
-
-#: calendar/gui/e-cal-model.c:293 calendar/gui/e-cal-model.c:296
-#: calendar/gui/e-itip-control.c:1062 calendar/gui/e-itip-control.c:1278
-#: camel/camel-gpg-context.c:1574 camel/camel-gpg-context.c:1625
-#: camel/camel-tcp-stream-openssl.c:631
-#: camel/providers/smtp/camel-smtp-transport.c:172
-#: camel/providers/smtp/camel-smtp-transport.c:227
-#: widgets/misc/e-charset-picker.c:60
-msgid "Unknown"
-msgstr "Naməlum"
-
-#: calendar/gui/e-cal-model.c:828
-msgid "Recurring"
-msgstr "Təkrarlayan"
-
-#: calendar/gui/e-cal-model.c:830
-msgid "Assigned"
-msgstr "Vəzifələndirilmiş"
+#. strftime format of a weekday, a date and a time, 24-hour.
+#: calendar/gui/e-cell-date-edit-text.c:118 e-util/e-time-utils.c:167
+#: e-util/e-time-utils.c:380
+msgid "%a %m/%d/%Y %H:%M:%S"
+msgstr "%a %m/%d/%Y %H:%M:%S"
 
-#: calendar/gui/e-cal-model.c:832 calendar/gui/e-cal-model-tasks.c:933
-msgid "Yes"
-msgstr "Bəli"
+#. strftime format of a weekday, a date and a time, 12-hour.
+#: calendar/gui/e-cell-date-edit-text.c:121 e-util/e-time-utils.c:162
+#: e-util/e-time-utils.c:389
+msgid "%a %m/%d/%Y %I:%M:%S %p"
+msgstr "%a %m/%d/%Y %I:%M:%S %p"
 
-#: calendar/gui/e-cal-model.c:832 calendar/gui/e-cal-model-tasks.c:933
-msgid "No"
-msgstr "Xeyr"
+#: calendar/gui/e-cell-date-edit-text.c:126
+#, c-format
+msgid ""
+"The date must be entered in the format: \n"
+"\n"
+"%s"
+msgstr ""
+"Tarix öz şəklində verilməlidir: \n"
+"\n"
+"%s"
 
-#: calendar/gui/e-cal-model-tasks.c:275
-msgid "N"
-msgstr "N"
+#: calendar/gui/e-day-view-time-item.c:532
+#, c-format
+msgid "%02i minute divisions"
+msgstr "%02i dəqiqə bölmələri"
 
-#: calendar/gui/e-cal-model-tasks.c:275
-msgid "S"
-msgstr "Baz."
+#. strftime format %A = full weekday name, %d = day of month,
+#. %B = full month name. Don't use any other specifiers.
+#: calendar/gui/e-day-view-top-item.c:261 calendar/gui/e-day-view.c:1421
+#: calendar/gui/e-week-view-main-item.c:316 calendar/gui/print.c:1525
+msgid "%A %d %B"
+msgstr "%A %d %B"
 
-#: calendar/gui/e-cal-model-tasks.c:277
-msgid "E"
-msgstr "E"
+#. strftime format %d = day of month, %b = abbreviated month name.
+#. Don't use any other specifiers.
+#: calendar/gui/e-day-view-top-item.c:269 calendar/gui/e-day-view.c:1454
+#: calendar/gui/e-week-view-main-item.c:339
+msgid "%d %b"
+msgstr "%d %b"
 
-#: calendar/gui/e-cal-model-tasks.c:277
-msgid "W"
-msgstr "Çərş."
+#. String to use in 12-hour time format for times in the morning.
+#: calendar/gui/e-day-view.c:636 calendar/gui/e-week-view.c:350
+#: calendar/gui/print.c:809
+msgid "am"
+msgstr "am"
 
-#: calendar/gui/e-cal-model-tasks.c:550
-msgid ""
-"The geographical position must be entered in the format: \n"
-"\n"
-"45.436845,125.862501"
-msgstr ""
-"Coğrafi yer bu şəkildə bildirilməlidir: \n"
-"\n"
-"45.436845,125.862501"
+#. String to use in 12-hour time format for times in the afternoon.
+#: calendar/gui/e-day-view.c:639 calendar/gui/e-week-view.c:353
+#: calendar/gui/print.c:811
+msgid "pm"
+msgstr "pm"
 
-#: calendar/gui/e-cal-view.c:1094 calendar/gui/e-cal-view.c:1184
-msgid "New _Appointment..."
-msgstr "Yeni _Görüş..."
+#: calendar/gui/e-day-view.c:3694
+msgid "New _Appointment"
+msgstr "Yeni _Görüş"
 
-#: calendar/gui/e-cal-view.c:1095 calendar/gui/e-cal-view.c:1186
+#: calendar/gui/e-day-view.c:3696 calendar/gui/e-week-view.c:3582
 msgid "New All Day _Event"
 msgstr "Yeni Bütün Gün _Hadisəsi"
 
-#: calendar/gui/e-cal-view.c:1096 calendar/gui/e-cal-view.c:1188
+#: calendar/gui/e-day-view.c:3698 calendar/gui/e-week-view.c:3583
 #, fuzzy
 msgid "New Meeting"
 msgstr "İclas"
 
-#: calendar/gui/e-cal-view.c:1097 calendar/gui/e-cal-view.c:1190
+#: calendar/gui/e-day-view.c:3700 calendar/gui/e-week-view.c:3584
 msgid "New Task"
 msgstr "Yeni Vəzifə"
 
-#: calendar/gui/e-cal-view.c:1111 calendar/gui/e-cal-view.c:1180
+#: calendar/gui/e-day-view.c:3705 ui/evolution-comp-editor.xml.h:11
+msgid "Print..."
+msgstr "Çap Et ..."
+
+#: calendar/gui/e-day-view.c:3717 calendar/gui/e-week-view.c:3598
 #: ui/evolution-calendar.xml.h:13
 msgid "Go to _Today"
 msgstr "_Bugünə Get"
 
-#: calendar/gui/e-cal-view.c:1112 calendar/gui/e-cal-view.c:1182
+#: calendar/gui/e-day-view.c:3719 calendar/gui/e-week-view.c:3599
 msgid "_Go to Date..."
 msgstr "Tarixə _Get..."
 
-#: calendar/gui/e-cal-view.c:1116 ui/evolution-calendar.xml.h:38
+#: calendar/gui/e-day-view.c:3724 calendar/gui/e-week-view.c:3603
+#: ui/evolution-calendar.xml.h:34
 msgid "_Publish Free/Busy Information"
 msgstr "Sərbəst/Məşğul Məlumatını _Dərc Et"
 
-#: calendar/gui/e-cal-view.c:1120 calendar/gui/e-cal-view.c:1200
+#: calendar/gui/e-day-view.c:3729 calendar/gui/e-week-view.c:3607
 #: ui/evolution.xml.h:60
 #, fuzzy
 msgid "_Settings..."
 msgstr "_Məktub Qurğuları..."
 
-#: calendar/gui/e-cal-view.c:1139
+#: calendar/gui/e-day-view.c:3738 calendar/gui/e-week-view.c:3614
+#: mail/folder-browser.c:1765 ui/evolution-mail-message.xml.h:112
+msgid "_Save As..."
+msgstr "Fərqli _Qeyd Et ..."
+
+#: calendar/gui/e-day-view.c:3750 calendar/gui/e-week-view.c:3626
 #, fuzzy
 msgid "_Schedule Meeting..."
 msgstr "_Görüşləri Planlaşdır"
 
-#: calendar/gui/e-cal-view.c:1140
+#: calendar/gui/e-day-view.c:3751 calendar/gui/e-week-view.c:3627
 #, fuzzy
 msgid "_Forward as iCalendar..."
 msgstr "v_Calendar şəklində çatdır"
 
-#: calendar/gui/e-cal-view.c:1145
+#: calendar/gui/e-day-view.c:3756 calendar/gui/e-week-view.c:3632
 msgid "Make this Occurrence _Movable"
 msgstr "Bu Vaqeənin _Daşına Bilməsinə İmkan Ver"
 
-#: calendar/gui/e-cal-view.c:1146 calendar/gui/e-cal-view.c:1177
+#: calendar/gui/e-day-view.c:3757 calendar/gui/e-week-view.c:3633
 msgid "Delete this _Occurrence"
 msgstr "Bu _Vaqeəni Sil"
 
-#: calendar/gui/e-cal-view.c:1147 calendar/gui/e-cal-view.c:1178
+#: calendar/gui/e-day-view.c:3758 calendar/gui/e-week-view.c:3634
 msgid "Delete _All Occurrences"
 msgstr "_Bütün Vaqeələri Sil"
 
-#. strftime format of a weekday, a date and a time, 24-hour.
-#: calendar/gui/e-cell-date-edit-text.c:118 e-util/e-time-utils.c:180
-#: e-util/e-time-utils.c:393
-msgid "%a %m/%d/%Y %H:%M:%S"
-msgstr "%a %m/%d/%Y %H:%M:%S"
-
-#. strftime format of a weekday, a date and a time, 12-hour.
-#: calendar/gui/e-cell-date-edit-text.c:121 e-util/e-time-utils.c:175
-#: e-util/e-time-utils.c:402
-msgid "%a %m/%d/%Y %I:%M:%S %p"
-msgstr "%a %m/%d/%Y %I:%M:%S %p"
-
-#: calendar/gui/e-cell-date-edit-text.c:126
-#, c-format
-msgid ""
-"The date must be entered in the format: \n"
-"\n"
-"%s"
-msgstr ""
-"Tarix öz şəklində verilməlidir: \n"
-"\n"
-"%s"
-
-#. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:600 calendar/gui/e-week-view.c:326
-#: calendar/gui/print.c:809
-msgid "am"
-msgstr "am"
-
-#. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:603 calendar/gui/e-week-view.c:329
-#: calendar/gui/print.c:811
-msgid "pm"
-msgstr "pm"
-
-#. strftime format %A = full weekday name, %d = day of month,
-#. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view.c:1347 calendar/gui/e-day-view-top-item.c:262
-#: calendar/gui/e-week-view-main-item.c:316 calendar/gui/print.c:1524
-msgid "%A %d %B"
-msgstr "%A %d %B"
-
-#. strftime format %d = day of month, %b = abbreviated month name.
-#. Don't use any other specifiers.
-#: calendar/gui/e-day-view.c:1380 calendar/gui/e-day-view-top-item.c:270
-#: calendar/gui/e-week-view-main-item.c:339
-msgid "%d %b"
-msgstr "%d %b"
-
-#: calendar/gui/e-day-view-time-item.c:532
-#, c-format
-msgid "%02i minute divisions"
-msgstr "%02i dəqiqə bölmələri"
-
-#: calendar/gui/e-itip-control.c:676
+#: calendar/gui/e-itip-control.c:706
 #, fuzzy
 msgid "Yes. (Complex Recurrence)"
 msgstr "_Bəsit təkrarlama"
 
-#: calendar/gui/e-itip-control.c:688
+#: calendar/gui/e-itip-control.c:718
 #, fuzzy
 msgid "Every day"
 msgstr "Hər"
 
-#: calendar/gui/e-itip-control.c:690
+#: calendar/gui/e-itip-control.c:720
 #, fuzzy, c-format
 msgid "Every %d days"
 msgstr "%d gün"
 
-#: calendar/gui/e-itip-control.c:696
+#: calendar/gui/e-itip-control.c:726
 #, fuzzy
 msgid "Every week"
 msgstr "Hər"
 
-#: calendar/gui/e-itip-control.c:698
+#: calendar/gui/e-itip-control.c:728
 #, fuzzy, c-format
 msgid "Every %d weeks"
 msgstr "%d həftə"
 
-#: calendar/gui/e-itip-control.c:701
+#: calendar/gui/e-itip-control.c:731
 msgid "Every week on "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:703
+#: calendar/gui/e-itip-control.c:733
 #, fuzzy, c-format
 msgid "Every %d weeks on "
 msgstr "%d həftə"
 
-#: calendar/gui/e-itip-control.c:711
+#: calendar/gui/e-itip-control.c:741
 #, fuzzy
 msgid " and "
 msgstr "Qum"
 
-#: calendar/gui/e-itip-control.c:718
+#: calendar/gui/e-itip-control.c:748
 #, c-format
 msgid "The %s day of "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:731
+#: calendar/gui/e-itip-control.c:761
 #, c-format
 msgid "The %s %s of "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:736
+#: calendar/gui/e-itip-control.c:766
 #, fuzzy
 msgid "every month"
 msgstr "Bir a_y"
 
-#: calendar/gui/e-itip-control.c:741
+#: calendar/gui/e-itip-control.c:771
 #, c-format
 msgid "every %d months"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:747
+#: calendar/gui/e-itip-control.c:777
 #, fuzzy
 msgid "Every year"
 msgstr "Hər"
 
-#: calendar/gui/e-itip-control.c:749
+#: calendar/gui/e-itip-control.c:779
 #, c-format
 msgid "Every %d years"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:761
+#: calendar/gui/e-itip-control.c:791
 #, c-format
 msgid " a total of %d times"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:769
+#: calendar/gui/e-itip-control.c:799
 msgid ", ending on "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:793
+#: calendar/gui/e-itip-control.c:823
 msgid "<b>Starts:</b> "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:803
+#: calendar/gui/e-itip-control.c:833
 #, fuzzy
 msgid "<b>Ends:</b> "
 msgstr "Sonlanır: <b>"
 
-#: calendar/gui/e-itip-control.c:823
+#: calendar/gui/e-itip-control.c:853
 #, fuzzy
 msgid "<b>Completed:</b> "
 msgstr "Qurtarılıb "
 
-#: calendar/gui/e-itip-control.c:833
+#: calendar/gui/e-itip-control.c:863
 msgid "<b>Due:</b> "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:870 calendar/gui/e-itip-control.c:923
+#: calendar/gui/e-itip-control.c:900 calendar/gui/e-itip-control.c:953
 msgid "iCalendar Information"
 msgstr "iCalendar Məlumatı"
 
 #. Title
-#: calendar/gui/e-itip-control.c:885
+#: calendar/gui/e-itip-control.c:915
 msgid "iCalendar Error"
 msgstr "iCalendar Xətası"
 
-#: calendar/gui/e-itip-control.c:954 calendar/gui/e-itip-control.c:970
-#: calendar/gui/e-itip-control.c:981 calendar/gui/e-itip-control.c:998
+#: calendar/gui/e-itip-control.c:984 calendar/gui/e-itip-control.c:1000
+#: calendar/gui/e-itip-control.c:1011 calendar/gui/e-itip-control.c:1028
 msgid "An unknown person"
 msgstr "Naməlum şəxs"
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:1005
+#: calendar/gui/e-itip-control.c:1035
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
@@ -5749,342 +5721,348 @@ msgstr ""
 "<br> Xahiş edirik, aşağıdakı məlumatı gözdən keçirdin və aşağıdakı menüdən "
 "gediçi seçin."
 
-#: calendar/gui/e-itip-control.c:1020
+#: calendar/gui/e-itip-control.c:1050
 msgid "<i>None</i>"
 msgstr "<i>Heç biri</i>"
 
-#: calendar/gui/e-itip-control.c:1031
+#: calendar/gui/e-itip-control.c:1061
 #, fuzzy
 msgid "Location:"
 msgstr ""
 "\n"
 "Coğrafi Yerləşmə:  "
 
-#. write status
-#: calendar/gui/e-itip-control.c:1045 calendar/gui/e-tasks.c:243
+#: calendar/gui/e-itip-control.c:1075
 #, fuzzy
 msgid "Status:"
 msgstr "_Hal:"
 
-#: calendar/gui/e-itip-control.c:1050 calendar/gui/itip-utils.c:414
+#: calendar/gui/e-itip-control.c:1080 calendar/gui/e-meeting-model.c:286
+#: calendar/gui/e-meeting-model.c:309 calendar/gui/e-meeting-model.c:798
+#: calendar/gui/itip-utils.c:414
 msgid "Accepted"
 msgstr "Qəbul Edildi"
 
-#: calendar/gui/e-itip-control.c:1054 calendar/gui/itip-utils.c:417
+#: calendar/gui/e-itip-control.c:1084 calendar/gui/itip-utils.c:417
 #, fuzzy
 msgid "Tentatively Accepted"
 msgstr "Girişimli qəbul et"
 
-#: calendar/gui/e-itip-control.c:1058 calendar/gui/itip-utils.c:420
-#: calendar/gui/itip-utils.c:446
+#: calendar/gui/e-itip-control.c:1088 calendar/gui/e-meeting-model.c:288
+#: calendar/gui/e-meeting-model.c:311 calendar/gui/e-meeting-model.c:799
+#: calendar/gui/itip-utils.c:420 calendar/gui/itip-utils.c:446
 msgid "Declined"
 msgstr "Rədd Edildi"
 
-#: calendar/gui/e-itip-control.c:1117 calendar/gui/e-itip-control.c:1145
-#: calendar/gui/e-itip-control.c:1171 calendar/gui/e-itip-control.c:1184
-#: calendar/gui/e-itip-control.c:1197 calendar/gui/e-itip-control.c:1210
+#: calendar/gui/e-itip-control.c:1092 calendar/gui/e-itip-control.c:1300
+#: calendar/gui/e-meeting-model.c:222 calendar/gui/e-meeting-model.c:257
+#: calendar/gui/e-meeting-model.c:322 calendar/gui/e-meeting-model.c:756
+#: calendar/gui/e-meeting-model.c:772 camel/camel-gpg-context.c:1574
+#: camel/camel-gpg-context.c:1625 camel/camel-tcp-stream-openssl.c:634
+#: camel/providers/smtp/camel-smtp-transport.c:173
+#: camel/providers/smtp/camel-smtp-transport.c:228 mail/folder-browser.c:345
+#: mail/mail-display.c:953 widgets/misc/e-charset-picker.c:60
+msgid "Unknown"
+msgstr "Naməlum"
+
+#: calendar/gui/e-itip-control.c:1147 calendar/gui/e-itip-control.c:1175
+#: calendar/gui/e-itip-control.c:1201 calendar/gui/e-itip-control.c:1214
+#: calendar/gui/e-itip-control.c:1227 calendar/gui/e-itip-control.c:1240
 msgid "Choose an action:"
 msgstr "Gediş seç:"
 
-#: calendar/gui/e-itip-control.c:1118
+#: calendar/gui/e-itip-control.c:1148
 msgid "Update"
 msgstr "Güncəllə"
 
-#: calendar/gui/e-itip-control.c:1119 calendar/gui/e-itip-control.c:1150
-#: calendar/gui/e-itip-control.c:1173 calendar/gui/e-itip-control.c:1186
-#: calendar/gui/e-itip-control.c:1199 calendar/gui/e-itip-control.c:1212
+#: calendar/gui/e-itip-control.c:1149 calendar/gui/e-itip-control.c:1180
+#: calendar/gui/e-itip-control.c:1203 calendar/gui/e-itip-control.c:1216
+#: calendar/gui/e-itip-control.c:1229 calendar/gui/e-itip-control.c:1242
 #: shell/e-shell.c:2067 widgets/misc/e-cell-date-edit.c:265
 msgid "OK"
 msgstr "Oldu"
 
-#: calendar/gui/e-itip-control.c:1146
+#: calendar/gui/e-itip-control.c:1176
 msgid "Accept"
 msgstr "Qəbul Et"
 
-#: calendar/gui/e-itip-control.c:1147
+#: calendar/gui/e-itip-control.c:1177
 msgid "Tentatively accept"
 msgstr "Girişimli qəbul et"
 
-#: calendar/gui/e-itip-control.c:1148
+#: calendar/gui/e-itip-control.c:1178
 msgid "Decline"
 msgstr "Rədd Et"
 
-#: calendar/gui/e-itip-control.c:1149
-#: calendar/gui/e-meeting-time-sel.etspec.h:8
-msgid "RSVP"
-msgstr "RSVP"
-
-#: calendar/gui/e-itip-control.c:1172
+#: calendar/gui/e-itip-control.c:1202
 msgid "Send Free/Busy Information"
 msgstr "Sərbəst/Məşğul Məlumatını Yolla"
 
-#: calendar/gui/e-itip-control.c:1185
+#: calendar/gui/e-itip-control.c:1215
 msgid "Update respondent status"
 msgstr "Cavablayıcı vəziyyətini güncəllə"
 
-#: calendar/gui/e-itip-control.c:1198
+#: calendar/gui/e-itip-control.c:1228
 msgid "Send Latest Information"
 msgstr "Ən Son Məlumatı Yolla"
 
-#: calendar/gui/e-itip-control.c:1211 calendar/gui/itip-utils.c:434
-#: mail/mail-send-recv.c:388 mail/mail-send-recv.c:440
-#: shell/e-shell-startup-wizard.c:781 shell/evolution-shell-component.c:1185
-#: ui/evolution-mail-global.xml.h:1
+#: calendar/gui/e-itip-control.c:1241 calendar/gui/itip-utils.c:434
+#: mail/mail-send-recv.c:387 mail/mail-send-recv.c:444
+#: shell/evolution-shell-component.c:1182 ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Ləğv Et"
 
-#: calendar/gui/e-itip-control.c:1300
+#: calendar/gui/e-itip-control.c:1322
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "<b>%s</b> görüş məlumatını dərc edib."
 
-#: calendar/gui/e-itip-control.c:1301
+#: calendar/gui/e-itip-control.c:1323
 msgid "Meeting Information"
 msgstr "Görüş Məlumatı"
 
-#: calendar/gui/e-itip-control.c:1306
+#: calendar/gui/e-itip-control.c:1328
 #, fuzzy, c-format
 msgid "<b>%s</b> requests the presence of %s at a meeting."
 msgstr "<b>%s</b> sizin görüşdə olmağınızı xahiş edir."
 
-#: calendar/gui/e-itip-control.c:1308
+#: calendar/gui/e-itip-control.c:1330
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr "<b>%s</b> sizin görüşdə olmağınızı xahiş edir."
 
-#: calendar/gui/e-itip-control.c:1309
+#: calendar/gui/e-itip-control.c:1331
 msgid "Meeting Proposal"
 msgstr "Görüş Məqsədi"
 
-#: calendar/gui/e-itip-control.c:1313
+#: calendar/gui/e-itip-control.c:1335
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr "<b>%s</b> mövcud görüşə əlavə etmək istəyir."
 
-#: calendar/gui/e-itip-control.c:1314
+#: calendar/gui/e-itip-control.c:1336
 msgid "Meeting Update"
 msgstr "Görüş Güncəllənməsi"
 
-#: calendar/gui/e-itip-control.c:1318
+#: calendar/gui/e-itip-control.c:1340
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr "<b>%s</b> ən son görüş məlumatını almaq istəyir."
 
-#: calendar/gui/e-itip-control.c:1319
+#: calendar/gui/e-itip-control.c:1341
 msgid "Meeting Update Request"
 msgstr "Görüş Güncəllənmə İstəyi"
 
-#: calendar/gui/e-itip-control.c:1326
+#: calendar/gui/e-itip-control.c:1348
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr "<b>%s</b> görüş istəyini cavabladı."
 
-#: calendar/gui/e-itip-control.c:1327
+#: calendar/gui/e-itip-control.c:1349
 msgid "Meeting Reply"
 msgstr "Görüş Cavabı"
 
-#: calendar/gui/e-itip-control.c:1334
+#: calendar/gui/e-itip-control.c:1356
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr "<b>%s</b> görüşü ləğv etdi."
 
-#: calendar/gui/e-itip-control.c:1335
+#: calendar/gui/e-itip-control.c:1357
 msgid "Meeting Cancellation"
 msgstr "Görüş Ləğvi"
 
-#: calendar/gui/e-itip-control.c:1342 calendar/gui/e-itip-control.c:1409
-#: calendar/gui/e-itip-control.c:1444
+#: calendar/gui/e-itip-control.c:1364 calendar/gui/e-itip-control.c:1431
+#: calendar/gui/e-itip-control.c:1466
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr "<b>%s</b> pozğun ismarış yolladı."
 
-#: calendar/gui/e-itip-control.c:1343
+#: calendar/gui/e-itip-control.c:1365
 msgid "Bad Meeting Message"
 msgstr "Pis Görüş İsmarışı"
 
-#: calendar/gui/e-itip-control.c:1367
+#: calendar/gui/e-itip-control.c:1389
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr "<b>%s</b> vəzifə məlumatını dərc etdi."
 
-#: calendar/gui/e-itip-control.c:1368
+#: calendar/gui/e-itip-control.c:1390
 msgid "Task Information"
 msgstr "Vəzifə Məlumatı"
 
-#: calendar/gui/e-itip-control.c:1373
+#: calendar/gui/e-itip-control.c:1395
 #, fuzzy, c-format
 msgid "<b>%s</b> requests %s to perform a task."
 msgstr "<b>%s</b> sizdən vəzifəni görməyinizi istədi."
 
-#: calendar/gui/e-itip-control.c:1375
+#: calendar/gui/e-itip-control.c:1397
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr "<b>%s</b> sizdən vəzifəni görməyinizi istədi."
 
-#: calendar/gui/e-itip-control.c:1376
+#: calendar/gui/e-itip-control.c:1398
 msgid "Task Proposal"
 msgstr "Vəzifə Təklifi"
 
-#: calendar/gui/e-itip-control.c:1380
+#: calendar/gui/e-itip-control.c:1402
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task."
 msgstr "<b>%s</b> mövcud vəzifəyə qoşulmaq istəyir."
 
-#: calendar/gui/e-itip-control.c:1381
+#: calendar/gui/e-itip-control.c:1403
 msgid "Task Update"
 msgstr "Vəzifə Gencəllənməsi"
 
-#: calendar/gui/e-itip-control.c:1385
+#: calendar/gui/e-itip-control.c:1407
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr "<b>%s</b> ən son vəzifə məlumatını almaq istəyir."
 
-#: calendar/gui/e-itip-control.c:1386
+#: calendar/gui/e-itip-control.c:1408
 msgid "Task Update Request"
 msgstr "Vəzifə Güncəllənmə İstəyi"
 
-#: calendar/gui/e-itip-control.c:1393
+#: calendar/gui/e-itip-control.c:1415
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr "<b>%s</b> vəzifə verilməsinə cavab verdi."
 
-#: calendar/gui/e-itip-control.c:1394
+#: calendar/gui/e-itip-control.c:1416
 msgid "Task Reply"
 msgstr "Vəzifə Cavabı"
 
-#: calendar/gui/e-itip-control.c:1401
+#: calendar/gui/e-itip-control.c:1423
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr "<b>%s</b> vəzifəni ləğv etdi."
 
-#: calendar/gui/e-itip-control.c:1402
+#: calendar/gui/e-itip-control.c:1424
 msgid "Task Cancellation"
 msgstr "Vəzifə Ləğvi"
 
-#: calendar/gui/e-itip-control.c:1410
+#: calendar/gui/e-itip-control.c:1432
 msgid "Bad Task Message"
 msgstr "Pis Vəzifə İsmarışı"
 
-#: calendar/gui/e-itip-control.c:1429
+#: calendar/gui/e-itip-control.c:1451
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr "<b>%s</b> sərbəst/məşğul məlumatını dərc etdi."
 
-#: calendar/gui/e-itip-control.c:1430
+#: calendar/gui/e-itip-control.c:1452
 msgid "Free/Busy Information"
 msgstr "Sərbəst/Məşğul Məlumatı"
 
-#: calendar/gui/e-itip-control.c:1434
+#: calendar/gui/e-itip-control.c:1456
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr "<b>%s</b> sizin sərbəst/məşğul məlumatınızı istəyir."
 
-#: calendar/gui/e-itip-control.c:1435
+#: calendar/gui/e-itip-control.c:1457
 msgid "Free/Busy Request"
 msgstr "Sərbəst/Məşğul İstəyi"
 
-#: calendar/gui/e-itip-control.c:1439
+#: calendar/gui/e-itip-control.c:1461
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr "<b>%s</b> sərbəst/məşğul istəyinə cavab verdi."
 
-#: calendar/gui/e-itip-control.c:1440
+#: calendar/gui/e-itip-control.c:1462
 msgid "Free/Busy Reply"
 msgstr "Sərbəst/Məşğul Cavabı"
 
-#: calendar/gui/e-itip-control.c:1445
+#: calendar/gui/e-itip-control.c:1467
 msgid "Bad Free/Busy Message"
 msgstr "Pis Sərbəst/Məşğul İsmarışı"
 
-#: calendar/gui/e-itip-control.c:1521
+#: calendar/gui/e-itip-control.c:1543
 #, fuzzy
 msgid "The message does not appear to be properly formed"
 msgstr "Qovluq geri dönülməz şəkildə xəsarət alıb."
 
-#: calendar/gui/e-itip-control.c:1584
+#: calendar/gui/e-itip-control.c:1606
 msgid "The message contains only unsupported requests."
 msgstr "Bu ismarış təkə dəstəklənməyən istəklər daxil edir."
 
-#: calendar/gui/e-itip-control.c:1615 calendar/gui/e-itip-control.c:1621
+#: calendar/gui/e-itip-control.c:1637 calendar/gui/e-itip-control.c:1643
 msgid "The attachment does not contain a valid calendar message"
 msgstr "İlişgidəki hökmlü təqvim ismarışı daxil etmir"
 
-#: calendar/gui/e-itip-control.c:1646
+#: calendar/gui/e-itip-control.c:1668
 msgid "The attachment has no viewable calendar items"
 msgstr "İlişgidəki göstəriləbilən təqvim üzvləri daxil etmir"
 
-#: calendar/gui/e-itip-control.c:1887 calendar/gui/e-itip-control.c:1948
-#: calendar/gui/e-itip-control.c:1986
+#: calendar/gui/e-itip-control.c:1909 calendar/gui/e-itip-control.c:2001
 msgid "Object is invalid and cannot be updated\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1890 calendar/gui/e-itip-control.c:1989
+#: calendar/gui/e-itip-control.c:1912 calendar/gui/e-itip-control.c:2004
 msgid "There was an error on the CORBA system\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1893 calendar/gui/e-itip-control.c:1992
+#: calendar/gui/e-itip-control.c:1915 calendar/gui/e-itip-control.c:2007
 #, fuzzy
 msgid "Object could not be found\n"
 msgstr "Üzv göndərilə bilmədi!\n"
 
-#: calendar/gui/e-itip-control.c:1896
+#: calendar/gui/e-itip-control.c:1918
 #, fuzzy
 msgid "You do not have the right permissions to update the calendar\n"
 msgstr "`%s'da(də) qovluq yarada bilmədim"
 
-#: calendar/gui/e-itip-control.c:1899
+#: calendar/gui/e-itip-control.c:1921
 msgid "Update complete\n"
 msgstr "Gübcəlləmə Qurtardı\n"
 
-#: calendar/gui/e-itip-control.c:1902
+#: calendar/gui/e-itip-control.c:1924
 msgid "Calendar file could not be updated!\n"
 msgstr "Təqvim faylı güncəllənə bilmədi!\n"
 
-#: calendar/gui/e-itip-control.c:1932 calendar/gui/e-itip-control.c:2004
+#: calendar/gui/e-itip-control.c:1953 calendar/gui/e-itip-control.c:2019
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 "İştirakçı vəziyyəti üzvün artıq mövcud olmadığından ötrü güncəllənə bilmədi"
 
-#: calendar/gui/e-itip-control.c:1958
+#: calendar/gui/e-itip-control.c:1974
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1970
+#: calendar/gui/e-itip-control.c:1986
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr "İştirakçı vəziyyəti səhv haldan ötrü güncəllənə bilmədi!\n"
 
-#: calendar/gui/e-itip-control.c:1995
+#: calendar/gui/e-itip-control.c:2010
 #, fuzzy
 msgid "You don't have the right permissions to update the calendar\n"
 msgstr "`%s'da(də) qovluq yarada bilmədim"
 
-#: calendar/gui/e-itip-control.c:1998
+#: calendar/gui/e-itip-control.c:2013
 msgid "Attendee status updated\n"
 msgstr "İştirakçı vəziyyəti güncəlləndi\n"
 
-#: calendar/gui/e-itip-control.c:2001
+#: calendar/gui/e-itip-control.c:2016
 #, fuzzy
 msgid "Attendee status could not be updated!\n"
 msgstr "İştirakçı vəziyyəti güncəllən bilmədi!\n"
 
-#: calendar/gui/e-itip-control.c:2038
+#: calendar/gui/e-itip-control.c:2053
 msgid "Removal Complete"
 msgstr "Çıxartma Qurtardı"
 
-#: calendar/gui/e-itip-control.c:2070 calendar/gui/e-itip-control.c:2120
+#: calendar/gui/e-itip-control.c:2085 calendar/gui/e-itip-control.c:2135
 msgid "Item sent!\n"
 msgstr "Üzv göndərildi!\n"
 
-#: calendar/gui/e-itip-control.c:2072 calendar/gui/e-itip-control.c:2124
+#: calendar/gui/e-itip-control.c:2087 calendar/gui/e-itip-control.c:2139
 msgid "The item could not be sent!\n"
 msgstr "Üzv göndərilə bilmədi!\n"
 
-#: calendar/gui/e-itip-control.c:2215
+#: calendar/gui/e-itip-control.c:2212
 #, fuzzy
 msgid "Select Calendar Folder"
 msgstr "Qovluq Seçin"
 
-#: calendar/gui/e-itip-control.c:2221
+#: calendar/gui/e-itip-control.c:2219
 #, fuzzy
 msgid "Select Tasks Folder"
 msgstr "Qovluq Seçin"
@@ -6126,284 +6104,252 @@ msgstr "bitiş tarixi"
 msgid "date-start"
 msgstr "başlama tarixi"
 
-#: calendar/gui/e-meeting-time-sel.c:392
+#: calendar/gui/e-meeting-model.c:79
+msgid "Chair Persons"
+msgstr "İştirakçılar"
+
+#: calendar/gui/e-meeting-model.c:80 calendar/gui/e-meeting-model.c:1636
+msgid "Required Participants"
+msgstr "Lazımi İştirakçılar"
+
+#: calendar/gui/e-meeting-model.c:81
+msgid "Optional Participants"
+msgstr "Ehtiyatdakı İştirakçılar"
+
+#: calendar/gui/e-meeting-model.c:82
+#, fuzzy
+msgid "Resources"
+msgstr "Mənbə"
+
+#: calendar/gui/e-meeting-model.c:197 calendar/gui/e-meeting-model.c:214
+#: calendar/gui/e-meeting-model.c:530 calendar/gui/e-meeting-model.c:752
+msgid "Individual"
+msgstr "Şəxsi"
+
+#: calendar/gui/e-meeting-model.c:199 calendar/gui/e-meeting-model.c:216
+#: calendar/gui/e-meeting-model.c:753
+msgid "Group"
+msgstr "Qrup"
+
+#: calendar/gui/e-meeting-model.c:201 calendar/gui/e-meeting-model.c:218
+#: calendar/gui/e-meeting-model.c:754
+msgid "Resource"
+msgstr "Mənbə"
+
+#: calendar/gui/e-meeting-model.c:203 calendar/gui/e-meeting-model.c:220
+#: calendar/gui/e-meeting-model.c:755
+msgid "Room"
+msgstr "Otaq"
+
+#: calendar/gui/e-meeting-model.c:232 calendar/gui/e-meeting-model.c:249
+#: calendar/gui/e-meeting-model.c:768
+msgid "Chair"
+msgstr "Stul"
+
+#: calendar/gui/e-meeting-model.c:234 calendar/gui/e-meeting-model.c:251
+#: calendar/gui/e-meeting-model.c:532 calendar/gui/e-meeting-model.c:769
+msgid "Required Participant"
+msgstr "Lazımi İştirakçılar"
+
+#: calendar/gui/e-meeting-model.c:236 calendar/gui/e-meeting-model.c:253
+#: calendar/gui/e-meeting-model.c:770
+msgid "Optional Participant"
+msgstr "Ehtiyatdakı İştirakçılar"
+
+#: calendar/gui/e-meeting-model.c:238 calendar/gui/e-meeting-model.c:255
+#: calendar/gui/e-meeting-model.c:771
+msgid "Non-Participant"
+msgstr "Qeyri İştirakçılar"
+
+#: calendar/gui/e-meeting-model.c:284 calendar/gui/e-meeting-model.c:307
+#: calendar/gui/e-meeting-model.c:540 calendar/gui/e-meeting-model.c:797
+msgid "Needs Action"
+msgstr "Hərəkət Lazımdır"
+
+#: calendar/gui/e-meeting-model.c:290 calendar/gui/e-meeting-model.c:313
+#: calendar/gui/e-meeting-model.c:800 calendar/gui/e-meeting-time-sel.c:405
 msgid "Tentative"
 msgstr "Girişimli"
 
-#: calendar/gui/e-meeting-time-sel.c:394 designs/OOA/ooa.glade.h:11
+#: calendar/gui/e-meeting-model.c:292 calendar/gui/e-meeting-model.c:315
+#: calendar/gui/e-meeting-model.c:801
+msgid "Delegated"
+msgstr "Temsil Edildi"
+
+#: calendar/gui/e-meeting-model.c:296 calendar/gui/e-meeting-model.c:319
+msgid "In Process"
+msgstr "İşləyir"
+
+#. This is a strftime() format string %A = full weekday name,
+#. %B = full month name, %d = month day, %Y = full year.
+#: calendar/gui/e-meeting-time-sel-item.c:458
+#: calendar/gui/e-meeting-time-sel.c:2098
+msgid "%A, %B %d, %Y"
+msgstr "%a %B %d %Y"
+
+#. This is a strftime() format string %a = abbreviated weekday
+#. name, %m = month number, %d = month day, %Y = full year.
+#: calendar/gui/e-meeting-time-sel-item.c:462
+#: calendar/gui/e-meeting-time-sel.c:2131 e-util/e-time-utils.c:190
+#: e-util/e-time-utils.c:283 e-util/e-time-utils.c:371
+msgid "%a %m/%d/%Y"
+msgstr "%a %m/%d/%Y"
+
+#. This is a strftime() format string %m = month number,
+#. %d = month day, %Y = full year.
+#: calendar/gui/e-meeting-time-sel-item.c:466 e-util/e-time-utils.c:225
+#: e-util/e-time-utils.c:286 widgets/misc/e-dateedit.c:1582
+msgid "%m/%d/%Y"
+msgstr "%m/%d/%Y"
+
+#: calendar/gui/e-meeting-time-sel.c:407 designs/OOA/ooa.glade.h:11
 msgid "Out of Office"
 msgstr "İş Yerində Deyil"
 
-#: calendar/gui/e-meeting-time-sel.c:395
+#: calendar/gui/e-meeting-time-sel.c:408
 msgid "No Information"
 msgstr "Məlumat Yoxdur"
 
-#: calendar/gui/e-meeting-time-sel.c:434
+#: calendar/gui/e-meeting-time-sel.c:447
 msgid "_Options"
 msgstr "_Seçənəklər"
 
-#: calendar/gui/e-meeting-time-sel.c:451
+#: calendar/gui/e-meeting-time-sel.c:464
 msgid "Show _Only Working Hours"
 msgstr "Sadəcə olaraq -İş Saatlarını Göstər"
 
-#: calendar/gui/e-meeting-time-sel.c:461
+#: calendar/gui/e-meeting-time-sel.c:474
 msgid "Show _Zoomed Out"
 msgstr "_Uzaqlaşdıraraq Göstər"
 
-#: calendar/gui/e-meeting-time-sel.c:476
+#: calendar/gui/e-meeting-time-sel.c:489
 msgid "_Update Free/Busy"
 msgstr "Sərbəst/Məşğulları _Təzələ"
 
-#: calendar/gui/e-meeting-time-sel.c:491
+#: calendar/gui/e-meeting-time-sel.c:504
 msgid "_<<"
 msgstr "_<<"
 
-#: calendar/gui/e-meeting-time-sel.c:509
+#: calendar/gui/e-meeting-time-sel.c:522
 msgid "_Autopick"
 msgstr "_Avtomarik Olaraq Seç"
 
-#: calendar/gui/e-meeting-time-sel.c:524
+#: calendar/gui/e-meeting-time-sel.c:537
 msgid ">_>"
 msgstr ">_>"
 
-#: calendar/gui/e-meeting-time-sel.c:541
+#: calendar/gui/e-meeting-time-sel.c:554
 msgid "_All People and Resources"
 msgstr "_Bütün Adamlar və Qaynaqlar"
 
-#: calendar/gui/e-meeting-time-sel.c:550
+#: calendar/gui/e-meeting-time-sel.c:563
 msgid "All _People and One Resource"
 msgstr "Bütün _adamlar və Bir Qaynaq"
 
-#: calendar/gui/e-meeting-time-sel.c:559
+#: calendar/gui/e-meeting-time-sel.c:572
 msgid "_Required People"
 msgstr "_Lazımi Adamlar"
 
-#: calendar/gui/e-meeting-time-sel.c:568
+#: calendar/gui/e-meeting-time-sel.c:581
 msgid "Required People and _One Resource"
 msgstr "Lazımi Adamlar və _Bir Qaynaq"
 
-#: calendar/gui/e-meeting-time-sel.c:587
+#: calendar/gui/e-meeting-time-sel.c:600
 msgid "Meeting _start time:"
 msgstr "İclas başlama saatı :"
 
-#: calendar/gui/e-meeting-time-sel.c:607
+#: calendar/gui/e-meeting-time-sel.c:620
 msgid "Meeting _end time:"
 msgstr "İclas sonlanma saatı :"
 
-#. This is a strftime() format string %A = full weekday name,
-#. %B = full month name, %d = month day, %Y = full year.
-#: calendar/gui/e-meeting-time-sel.c:2054
-#: calendar/gui/e-meeting-time-sel-item.c:452
-msgid "%A, %B %d, %Y"
-msgstr "%a %B %d %Y"
-
-#. This is a strftime() format string %a = abbreviated weekday name,
-#. %m = month number, %d = month day, %Y = full year.
-#: calendar/gui/e-meeting-time-sel.c:2087
-#: calendar/gui/e-meeting-time-sel-item.c:456 e-util/e-time-utils.c:203
-#: e-util/e-time-utils.c:296 e-util/e-time-utils.c:384
-msgid "%a %m/%d/%Y"
-msgstr "%a %m/%d/%Y"
-
-#: calendar/gui/e-meeting-time-sel.etspec.h:1
-msgid "Attendee"
-msgstr "Ziyarətçilər"
-
-#: calendar/gui/e-meeting-time-sel.etspec.h:2
-#, fuzzy
-msgid "Click here to add an attendee"
-msgstr "* Əlaqə əlavə etmək üçün buraya tıqlayın *"
-
-#: calendar/gui/e-meeting-time-sel.etspec.h:3
-msgid "Common Name"
-msgstr "Ümumi Ad"
-
-#: calendar/gui/e-meeting-time-sel.etspec.h:4
-msgid "Delegated From"
-msgstr "Təmsil Etdiyi Yer"
-
-#: calendar/gui/e-meeting-time-sel.etspec.h:5
-msgid "Delegated To"
-msgstr "Təmsil Edir"
-
-#: calendar/gui/e-meeting-time-sel.etspec.h:6
-msgid "Language"
-msgstr "Dil"
-
-#: calendar/gui/e-meeting-time-sel.etspec.h:7
-msgid "Member"
-msgstr "Üzv"
-
-#. This is a strftime() format string %m = month number,
-#. %d = month day, %Y = full year.
-#: calendar/gui/e-meeting-time-sel-item.c:460 e-util/e-time-utils.c:238
-#: e-util/e-time-utils.c:299 widgets/misc/e-dateedit.c:1607
-msgid "%m/%d/%Y"
-msgstr "%m/%d/%Y"
-
-#: calendar/gui/e-tasks.c:151
-msgid "invalid time"
-msgstr "səhv vaxt"
-
-#: calendar/gui/e-tasks.c:221
-#, fuzzy
-msgid "Start Date:"
-msgstr "Başla_ma Tarixi:"
-
-#: calendar/gui/e-tasks.c:237
-#, fuzzy
-msgid "Due Date:"
-msgstr "_Bu tarixə qədər :"
-
-#. write priority
-#: calendar/gui/e-tasks.c:265
-#, fuzzy
-msgid "Priority:"
-msgstr "_Üstünlük:"
-
-#. URL
-#: calendar/gui/e-tasks.c:321
-#, fuzzy
-msgid "Web Page:"
-msgstr "Səhifə"
-
-#: calendar/gui/e-tasks.c:702
+#: calendar/gui/e-tasks.c:360 calendar/gui/gnome-cal.c:2006
+#: calendar/gui/gnome-cal.c:2017
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Vəzifələr %s vaxtl açılır"
 
-#: calendar/gui/e-tasks.c:731 calendar/gui/tasks-control.c:201
+#: calendar/gui/e-tasks.c:389 calendar/gui/tasks-control.c:201
 #, c-format
 msgid "Could not load the tasks in `%s'"
 msgstr "`%s' dakı (dəki) vəzifələr yüklənə bilmədi"
 
-#: calendar/gui/e-tasks.c:746
+#: calendar/gui/e-tasks.c:404
 #, c-format
 msgid "The method required to load `%s' is not supported"
 msgstr "`%s' i(ı) yükləməyə yarayan yol dəstəklənmir"
 
-#: calendar/gui/e-tasks.c:760 calendar/gui/gnome-cal.c:1730
+#: calendar/gui/e-tasks.c:418 calendar/gui/gnome-cal.c:1509
 #, fuzzy, c-format
 msgid "You don't have permission to open the folder in `%s'"
 msgstr "`%s'da(də) qovluq yarada bilmədim"
 
-#: calendar/gui/e-tasks.c:828 calendar/gui/gnome-cal.c:1944
+#: calendar/gui/e-tasks.c:486 calendar/gui/gnome-cal.c:1728
 #, fuzzy, c-format
 msgid ""
 "Error on %s:\n"
 " %s"
 msgstr "%s başladırkən xəta oldu"
 
-#: calendar/gui/e-tasks.c:899
+#: calendar/gui/e-tasks.c:557
 #, fuzzy
 msgid "Completing tasks..."
 msgstr "Qurtarma Vaxtı"
 
-#: calendar/gui/e-tasks.c:922
+#: calendar/gui/e-tasks.c:580
 #, fuzzy
 msgid "Deleting selected objects..."
 msgstr "Seçili üzv silinir"
 
-#: calendar/gui/e-tasks.c:1017
+#: calendar/gui/e-tasks.c:675
 #, fuzzy
 msgid "Expunging"
 msgstr "Qovluq açılır"
 
-#: calendar/gui/gnome-cal.c:1702
+#: calendar/gui/e-week-view.c:3581
+msgid "New _Appointment..."
+msgstr "Yeni _Görüş..."
+
+#: calendar/gui/gnome-cal.c:1481
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr "`%s'da(də) qovluq yarada bilmədim"
 
-#: calendar/gui/gnome-cal.c:1716
+#: calendar/gui/gnome-cal.c:1495
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr "`%s' i(ı) açmağa yarayan yol dəstəklənmir"
 
-#: calendar/gui/gnome-cal.c:1772
+#: calendar/gui/gnome-cal.c:1556
 #, fuzzy, c-format
 msgid "Adding alarms for %s"
 msgstr "%s vaxtı alarm ver"
 
-#: calendar/gui/gnome-cal.c:1964
+#: calendar/gui/gnome-cal.c:1748
 #, c-format
 msgid ""
-"The task backend for\n"
+"The calendar backend for\n"
 "%s\n"
 " has crashed. You will have to restart Evolution in order to use it again"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1970
+#: calendar/gui/gnome-cal.c:1757
 #, c-format
 msgid ""
-"The calendar backend for\n"
+"The task backend for\n"
 "%s\n"
 " has crashed. You will have to restart Evolution in order to use it again"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:2176
+#: calendar/gui/gnome-cal.c:1988
 #, c-format
 msgid "Opening calendar at %s"
 msgstr "Təqvim %s vaxtı açılır"
 
-#: calendar/gui/gnome-cal.c:2197
+#: calendar/gui/gnome-cal.c:2028
 #, fuzzy
 msgid "Opening default tasks folder"
 msgstr "%s qovluğu açılır"
 
-#: calendar/gui/gnome-cal.c:3094
-#, fuzzy, c-format
-msgid "Purging event %s"
-msgstr "%s daranır"
-
-#: calendar/gui/gnome-cal.c:3178
-#, fuzzy
-msgid "Purging"
-msgstr "Türkçə"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-#, fuzzy
-msgid "Calendar and Tasks"
-msgstr "Təqvim və Vəzifə Qurğuları"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-msgid "Configure your timezone, Calendar and Task List here "
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
-#, fuzzy
-msgid "Evolution Calendar and Tasks"
-msgstr "Təqvim və Vəzifə Qurğuları"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
-#, fuzzy
-msgid "Evolution Calendar and Tasks component"
-msgstr "Evolutionun İcracı mündəricat parçası."
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
-#, fuzzy
-msgid "Evolution Calendar configuration control"
-msgstr "Evolutionun Vəzifə parçası emalatxanası."
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
-#, fuzzy
-msgid "Evolution Calendar scheduling message viewer"
-msgstr "Evolution Təqvim iTip/iMip Nümayişçisi"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
-#, fuzzy
-msgid "Evolution Calendar viewer"
-msgstr "Evolution Təqvim iTip/iMip Nümayişçisi"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
-#, fuzzy
-msgid "Evolution Calendar/Task editor"
-msgstr "Evolution Xəbər Düzəldicisi"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
-#, fuzzy
-msgid "Evolution Tasks viewer"
-msgstr "Evolution Xəbər Düzəldicisi"
-
 #: calendar/gui/goto-dialog.glade.h:1
 msgid "April"
 msgstr "Aprel"
@@ -6519,7 +6465,7 @@ msgstr "Sərbəst/Məşğul Məlumatı"
 msgid "iCalendar information"
 msgstr "təqvim məlumatı"
 
-#: calendar/gui/itip-utils.c:668
+#: calendar/gui/itip-utils.c:667
 msgid "You must be an attendee of the event."
 msgstr "Siz hadisənin istirakçısı olmalısınız."
 
@@ -6552,82 +6498,83 @@ msgid "Sa"
 msgstr "Şn"
 
 #. Day
-#: calendar/gui/print.c:1882
+#: calendar/gui/print.c:1875
 msgid "Selected day (%a %b %d %Y)"
 msgstr "Seçili gün ( %a %b %d %Y )"
 
-#: calendar/gui/print.c:1907 calendar/gui/print.c:1911
+#: calendar/gui/print.c:1900 calendar/gui/print.c:1904
 msgid "%a %b %d"
 msgstr "%a %b %d"
 
-#: calendar/gui/print.c:1908
+#: calendar/gui/print.c:1901
 msgid "%a %d %Y"
 msgstr "%a %b %d"
 
-#: calendar/gui/print.c:1912 calendar/gui/print.c:1914
-#: calendar/gui/print.c:1915
+#: calendar/gui/print.c:1905 calendar/gui/print.c:1907
+#: calendar/gui/print.c:1908
 msgid "%a %b %d %Y"
 msgstr "%a %b %d %Y"
 
-#: calendar/gui/print.c:1919
+#: calendar/gui/print.c:1912
 #, c-format
 msgid "Selected week (%s - %s)"
 msgstr "Seçili həftə ( %s - %s)"
 
 #. Month
-#: calendar/gui/print.c:1927
+#: calendar/gui/print.c:1920
 msgid "Selected month (%b %Y)"
 msgstr "Seçili ay ( %b %Y )"
 
 #. Year
-#: calendar/gui/print.c:1934
+#: calendar/gui/print.c:1927
 msgid "Selected year (%Y)"
 msgstr "Seçili il ( %Y )"
 
-#: calendar/gui/print.c:2262
+#: calendar/gui/print.c:2255
 #, fuzzy
 msgid "Task"
 msgstr "_Vəzifə"
 
-#: calendar/gui/print.c:2321
+#: calendar/gui/print.c:2314
 #, c-format
 msgid "Status: %s"
 msgstr "Hal: %s"
 
-#: calendar/gui/print.c:2338
+#: calendar/gui/print.c:2331
 #, fuzzy, c-format
 msgid "Priority: %s"
 msgstr "_Üstünlük:"
 
-#: calendar/gui/print.c:2350
+#: calendar/gui/print.c:2343
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "Qurtaran Nisbət: %i"
 
-#: calendar/gui/print.c:2362
+#: calendar/gui/print.c:2355
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: calendar/gui/print.c:2376
+#: calendar/gui/print.c:2369
 #, c-format
 msgid "Categories: %s"
 msgstr "Kateqoriyalar: %s"
 
-#: calendar/gui/print.c:2387
+#: calendar/gui/print.c:2380
 msgid "Contacts: "
 msgstr "Əlaqələr:"
 
-#: calendar/gui/print.c:2525 calendar/gui/print.c:2611
-#: calendar/gui/tasks-control.c:564 my-evolution/e-summary.c:649
+#: calendar/gui/print.c:2518 calendar/gui/print.c:2604
+#: calendar/gui/tasks-control.c:581 mail/mail-callbacks.c:2948
+#: my-evolution/e-summary.c:649
 msgid "Print Preview"
 msgstr "Çap Etmə nümayişi"
 
-#: calendar/gui/print.c:2559
+#: calendar/gui/print.c:2552
 msgid "Print Item"
 msgstr "Üzvü çap et"
 
-#: calendar/gui/print.c:2632
+#: calendar/gui/print.c:2625
 msgid "Print Setup"
 msgstr "Çap Qurğuları"
 
@@ -6635,7 +6582,7 @@ msgstr "Çap Qurğuları"
 msgid "The URI of the tasks folder to display"
 msgstr "Göstəriləcək vəzifələr qovluğunun URIsi"
 
-#: calendar/gui/tasks-control.c:448
+#: calendar/gui/tasks-control.c:465
 #, fuzzy
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
@@ -6648,11 +6595,11 @@ msgstr ""
 "\n"
 "İsmarışları həqiqətən də silək?"
 
-#: calendar/gui/tasks-control.c:451
+#: calendar/gui/tasks-control.c:468
 msgid "Do not ask me again."
 msgstr "Mənə bir də soruşma."
 
-#: calendar/gui/tasks-control.c:593
+#: calendar/gui/tasks-control.c:610
 #, fuzzy
 msgid "Print Tasks"
 msgstr "Kartları çap et"
@@ -8459,28 +8406,28 @@ msgstr ""
 msgid "Pacific/Yap"
 msgstr ""
 
-#: camel/camel-cipher-context.c:167
+#: camel/camel-cipher-context.c:178
 msgid "Signing is not supported by this cipher"
 msgstr "Bu şifrləmə ilə imza dəstəklənmir"
 
-#: camel/camel-cipher-context.c:207
+#: camel/camel-cipher-context.c:218
 msgid "Verifying is not supported by this cipher"
 msgstr "Bu qeydlərdə təsdiqləmə dəstəklənmir"
 
-#: camel/camel-cipher-context.c:251
+#: camel/camel-cipher-context.c:262
 msgid "Encryption is not supported by this cipher"
 msgstr "Bu qeydlərdə şifrləmə dəstəklənmir"
 
-#: camel/camel-cipher-context.c:293
+#: camel/camel-cipher-context.c:304
 msgid "Decryption is not supported by this cipher"
 msgstr "Bu qeydlərdə şifr açma dəstəklənmir"
 
-#: camel/camel-cipher-context.c:331
+#: camel/camel-cipher-context.c:342
 #, fuzzy
 msgid "You may not import keys with this cipher"
 msgstr "Bu qeydlərdə şifr açma dəstəklənmir"
 
-#: camel/camel-cipher-context.c:363
+#: camel/camel-cipher-context.c:374
 #, fuzzy
 msgid "You may not export keys with this cipher"
 msgstr "Bu qeydlərdə şifr açma dəstəklənmir"
@@ -8523,11 +8470,7 @@ msgstr ""
 msgid "Resynchronizing with server"
 msgstr "Verici ilə yenidən sinxronlaşdırılır"
 
-#: camel/camel-disco-folder.c:90
-msgid "Downloading new messages for offline mode"
-msgstr ""
-
-#: camel/camel-disco-folder.c:351
+#: camel/camel-disco-folder.c:278
 #, fuzzy, c-format
 msgid "Preparing folder '%s' for offline"
 msgstr "%s qovluğu saxlanılır"
@@ -8548,57 +8491,57 @@ msgstr "%s ismarışı ön yaddaşa alına bilmədi: %s"
 msgid "Failed to create create child process '%s': %s"
 msgstr "%s ismarışı ön yaddaşa alına bilmədi: %s"
 
-#: camel/camel-filter-driver.c:759
+#: camel/camel-filter-driver.c:744
 #, fuzzy, c-format
 msgid "Invalid message stream received from %s: %s"
 msgstr "%s qovluğunu yarada bilmədim: %s"
 
-#: camel/camel-filter-driver.c:940 camel/camel-filter-driver.c:949
+#: camel/camel-filter-driver.c:923 camel/camel-filter-driver.c:932
 msgid "Syncing folders"
 msgstr "Qovluqlar sinxronlaşdırılır"
 
-#: camel/camel-filter-driver.c:1038 camel/camel-filter-driver.c:1411
+#: camel/camel-filter-driver.c:1021 camel/camel-filter-driver.c:1394
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Alıcı süzgəc xətası: %s: %s"
 
-#: camel/camel-filter-driver.c:1047 camel/camel-filter-driver.c:1417
+#: camel/camel-filter-driver.c:1030 camel/camel-filter-driver.c:1400
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "İşə salıcı süzgəc xətası: %s: %s"
 
-#: camel/camel-filter-driver.c:1114
+#: camel/camel-filter-driver.c:1097
 msgid "Unable to open spool folder"
 msgstr "Növbə faylını aça bilmədim"
 
-#: camel/camel-filter-driver.c:1123
+#: camel/camel-filter-driver.c:1106
 msgid "Unable to process spool folder"
 msgstr "Növbə faylını işlədə bilmirəm"
 
-#: camel/camel-filter-driver.c:1138
+#: camel/camel-filter-driver.c:1121
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "%d (%d%%) İsmarışı alınır"
 
-#: camel/camel-filter-driver.c:1142
+#: camel/camel-filter-driver.c:1125
 msgid "Cannot open message"
 msgstr "İsmarış açıla bilmir"
 
-#: camel/camel-filter-driver.c:1143 camel/camel-filter-driver.c:1155
+#: camel/camel-filter-driver.c:1126 camel/camel-filter-driver.c:1138
 #, c-format
 msgid "Failed on message %d"
 msgstr "Bacarılmayan İsmarış %d"
 
-#: camel/camel-filter-driver.c:1169 camel/camel-filter-driver.c:1263
+#: camel/camel-filter-driver.c:1152 camel/camel-filter-driver.c:1246
 msgid "Syncing folder"
 msgstr "Qovluqlar sinxronlaşdırılır"
 
-#: camel/camel-filter-driver.c:1230
+#: camel/camel-filter-driver.c:1213
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "%d İsmarışın %d qədərə alınır"
 
-#: camel/camel-filter-driver.c:1245
+#: camel/camel-filter-driver.c:1228
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "%d nin(nın) %d ismarışında iflas etdim"
@@ -8623,36 +8566,7 @@ msgstr "Hökmsüz arqumentlər"
 msgid "Error executing filter search: %s: %s"
 msgstr "İşə salıcı süzgəc axtarışı xətası: %s: %s"
 
-#: camel/camel-folder.c:585
-#, c-format
-msgid "Unsupported operation: append message: for %s"
-msgstr "Dəstəklənməyən əməliyyat: ismarış əlavə et: %s üçün"
-
-#: camel/camel-folder.c:1163
-#, c-format
-msgid "Unsupported operation: search by expression: for %s"
-msgstr "Dəstəklənməyən əməliyyat: ifadəyə görə axtar: %s üçün"
-
-#: camel/camel-folder.c:1203
-#, c-format
-msgid "Unsupported operation: search by uids: for %s"
-msgstr "Dəstəklənməyən əməliyyat: uid-ə görə axtar: %s üçün"
-
-#: camel/camel-folder.c:1321
-msgid "Moving messages"
-msgstr "İsmarışlar daşınır"
-
-#: camel/camel-folder.c:1321
-#, fuzzy
-msgid "Copying messages"
-msgstr "İsmarışlar \"%s\"a(ə) köçürülür"
-
-#: camel/camel-folder.c:1571
-#, fuzzy
-msgid "Filtering new message(s)"
-msgstr "%d ismarış alınır"
-
-#: camel/camel-folder-search.c:348
+#: camel/camel-folder-search.c:346
 #, c-format
 msgid ""
 "Cannot parse search expression: %s:\n"
@@ -8661,7 +8575,7 @@ msgstr ""
 "Axtarış ifadəsi darana bilmir:%s:\n"
 "%s"
 
-#: camel/camel-folder-search.c:358
+#: camel/camel-folder-search.c:356
 #, c-format
 msgid ""
 "Error executing search expression: %s:\n"
@@ -8670,15 +8584,39 @@ msgstr ""
 "İşə salıcı axtarış ifadəsi darama xətası:%s:\n"
 "%s"
 
-#: camel/camel-folder-search.c:569 camel/camel-folder-search.c:598
+#: camel/camel-folder-search.c:573 camel/camel-folder-search.c:601
 msgid "(match-all) requires a single bool result"
 msgstr "(hamısını yoxla) tək düzgün nəticə istəyir"
 
-#: camel/camel-folder-search.c:650
+#: camel/camel-folder-search.c:653
 #, c-format
 msgid "Performing query on unknown header: %s"
 msgstr "Naməlum başlıqda sorǧu aparılır: %s"
 
+#: camel/camel-folder.c:583
+#, c-format
+msgid "Unsupported operation: append message: for %s"
+msgstr "Dəstəklənməyən əməliyyat: ismarış əlavə et: %s üçün"
+
+#: camel/camel-folder.c:1161
+#, c-format
+msgid "Unsupported operation: search by expression: for %s"
+msgstr "Dəstəklənməyən əməliyyat: ifadəyə görə axtar: %s üçün"
+
+#: camel/camel-folder.c:1201
+#, c-format
+msgid "Unsupported operation: search by uids: for %s"
+msgstr "Dəstəklənməyən əməliyyat: uid-ə görə axtar: %s üçün"
+
+#: camel/camel-folder.c:1319
+msgid "Moving messages"
+msgstr "İsmarışlar daşınır"
+
+#: camel/camel-folder.c:1319
+#, fuzzy
+msgid "Copying messages"
+msgstr "İsmarışlar \"%s\"a(ə) köçürülür"
+
 #: camel/camel-gpg-context.c:762
 #, c-format
 msgid ""
@@ -8704,7 +8642,7 @@ msgstr ""
 
 #: camel/camel-gpg-context.c:821 camel/camel-gpg-context.c:1297
 #: camel/camel-gpg-context.c:1403 camel/camel-gpg-context.c:1473
-#: camel/camel-gpg-context.c:1529 mail/mail-send-recv.c:574
+#: camel/camel-gpg-context.c:1529 mail/mail-send-recv.c:577
 msgid "Cancelled."
 msgstr "Ləğv Edildi."
 
@@ -8759,6 +8697,26 @@ msgstr "İsmarış kodu açıla bilmir."
 msgid "Cannot verify message signature: could not create temp file: %s"
 msgstr "İsmarış təsdiqlənə bilmir: Müvəqqəti fayl yaradıla bilmir: %s"
 
+#: camel/camel-lock-client.c:111
+#, c-format
+msgid "Cannot build locking helper pipe: %s"
+msgstr "Qıfıllayıcı yardımçı boru yaradıla bilmədi: %s"
+
+#: camel/camel-lock-client.c:124
+#, c-format
+msgid "Cannot fork locking helper: %s"
+msgstr "Qıfıllayıcı yardımçı çəngəllənə bilmir: %s"
+
+#: camel/camel-lock-client.c:202 camel/camel-lock-client.c:225
+#, c-format
+msgid "Could not lock '%s': protocol error with lock-helper"
+msgstr "'%s' qıfıllana bilmir: lock-helper ilə protokol xətası"
+
+#: camel/camel-lock-client.c:215
+#, c-format
+msgid "Could not lock '%s'"
+msgstr "%s qıfıllana bilmir"
+
 #: camel/camel-lock.c:92 camel/camel-lock.c:113
 #, c-format
 msgid "Could not create lock file for %s: %s"
@@ -8779,26 +8737,6 @@ msgstr "fcntl(2) istifadə edilərək qıfıl faylı alınması ifşlas etdi: %s
 msgid "Failed to get lock using flock(2): %s"
 msgstr "fclock(2) istifadə edilərək qıfıl faylı alınması iflas etdi: %s"
 
-#: camel/camel-lock-client.c:100
-#, c-format
-msgid "Cannot build locking helper pipe: %s"
-msgstr "Qıfıllayıcı yardımçı boru yaradıla bilmədi: %s"
-
-#: camel/camel-lock-client.c:113
-#, c-format
-msgid "Cannot fork locking helper: %s"
-msgstr "Qıfıllayıcı yardımçı çəngəllənə bilmir: %s"
-
-#: camel/camel-lock-client.c:191 camel/camel-lock-client.c:214
-#, c-format
-msgid "Could not lock '%s': protocol error with lock-helper"
-msgstr "'%s' qıfıllana bilmir: lock-helper ilə protokol xətası"
-
-#: camel/camel-lock-client.c:204
-#, c-format
-msgid "Could not lock '%s'"
-msgstr "%s qıfıllana bilmir"
-
 #: camel/camel-movemail.c:107
 #, c-format
 msgid "Could not check mail file %s: %s"
@@ -8865,11 +8803,11 @@ msgstr ""
 msgid "Failed to decrypt MIME part: parse error"
 msgstr ""
 
-#: camel/camel-multipart-signed.c:646
+#: camel/camel-multipart-signed.c:644
 msgid "This is a digitally signed message part"
 msgstr ""
 
-#: camel/camel-multipart-signed.c:700
+#: camel/camel-multipart-signed.c:698
 #, fuzzy
 msgid "parse error"
 msgstr "Başqa xəta"
@@ -8940,11 +8878,11 @@ msgstr ""
 "Bu seçənək ,əgər dəstəkləyirsə, verici ilə CRAM-MD5 parolu ilə ünsiyyət "
 "quracaqdır."
 
-#: camel/camel-sasl-digest-md5.c:48
+#: camel/camel-sasl-digest-md5.c:46
 msgid "DIGEST-MD5"
 msgstr "DIGEST-MD5"
 
-#: camel/camel-sasl-digest-md5.c:50
+#: camel/camel-sasl-digest-md5.c:48
 msgid ""
 "This option will connect to the server using a secure DIGEST-MD5 password, "
 "if the server supports it."
@@ -9040,7 +8978,7 @@ msgstr ""
 #: camel/camel-sasl-gssapi.c:189 camel/camel-sasl-gssapi.c:238
 #: camel/camel-sasl-gssapi.c:274 camel/camel-sasl-gssapi.c:289
 #: camel/camel-sasl-kerberos4.c:219
-#: camel/providers/imap/camel-imap-store.c:1207
+#: camel/providers/imap/camel-imap-store.c:1052
 msgid "Bad authentication response from server."
 msgstr "Vericidən xətalı tanıtma istəyi alındı."
 
@@ -9103,23 +9041,23 @@ msgstr ""
 msgid "PLAIN"
 msgstr ""
 
-#: camel/camel-sasl-popb4smtp.c:36
+#: camel/camel-sasl-popb4smtp.c:34
 msgid "POP before SMTP"
 msgstr "SMTP-dən əvvəl POP"
 
-#: camel/camel-sasl-popb4smtp.c:38
+#: camel/camel-sasl-popb4smtp.c:36
 msgid "This option will authorise a POP connection before attempting SMTP"
 msgstr "Bu seçənək SMTP-dən əvvəl POP bağlantını sınayacaq"
 
-#: camel/camel-sasl-popb4smtp.c:103
+#: camel/camel-sasl-popb4smtp.c:107
 msgid "POP Source URI"
 msgstr "POP Qaynaq URI-si"
 
-#: camel/camel-sasl-popb4smtp.c:107
+#: camel/camel-sasl-popb4smtp.c:111
 msgid "POP Before SMTP auth using an unknown transport"
 msgstr "Naməlum nəqliyyat işlədilərək SMTP əvvəli POP"
 
-#: camel/camel-sasl-popb4smtp.c:112
+#: camel/camel-sasl-popb4smtp.c:116
 msgid "POP Before SMTP auth using a non-pop source"
 msgstr "Qeyri-POP mənbəyilə ək SMTP əvvəli POP tanıtma"
 
@@ -9128,57 +9066,57 @@ msgstr "Qeyri-POP mənbəyilə ək SMTP əvvəli POP tanıtma"
 msgid "Regular expression compilation failed: %s: %s"
 msgstr "Qaydalı ifadə dərlanməsi bacarılmadı: %s: %s"
 
-#: camel/camel-service.c:277
+#: camel/camel-service.c:282
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr "'%s' URLsi istifadəçi adına ehtiyac hiss edir"
 
-#: camel/camel-service.c:285
+#: camel/camel-service.c:290
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr "'%s' URLsi ev sahibinə ehtiyac hiss edir"
 
-#: camel/camel-service.c:293
+#: camel/camel-service.c:298
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr "'%s' URLsi yola ehtiyac hiss edir"
 
-#: camel/camel-service.c:738
+#: camel/camel-service.c:750
 #, c-format
 msgid "Resolving: %s"
 msgstr "\"%s\" Həll edilir"
 
-#: camel/camel-service.c:769 camel/camel-service.c:893
+#: camel/camel-service.c:783 camel/camel-service.c:915
 #, c-format
 msgid "Failure in name lookup: %s"
 msgstr "Ad axtarışında iflas etdim: %s"
 
-#: camel/camel-service.c:790 camel/camel-service.c:914
+#: camel/camel-service.c:804
 #, fuzzy, c-format
 msgid "Host lookup failed: cannot create thread: %s"
 msgstr "Qovşaq Ad axtarışı iflas etdi: %s: naməlum səbəb"
 
-#: camel/camel-service.c:803
+#: camel/camel-service.c:818
 #, c-format
 msgid "Host lookup failed: %s: host not found"
 msgstr "Qovşaq Ad axtarışı iflas etdi: %s: qovşaq tapılmadı"
 
-#: camel/camel-service.c:806
+#: camel/camel-service.c:821
 #, c-format
 msgid "Host lookup failed: %s: unknown reason"
 msgstr "Qovşaq Ad axtarışı iflas etdi: %s: naməlum səbəb"
 
-#: camel/camel-service.c:860
+#: camel/camel-service.c:880
 #, fuzzy
 msgid "Resolving address"
 msgstr "\"%s\" Həll edilir"
 
-#: camel/camel-service.c:929
+#: camel/camel-service.c:949
 #, fuzzy
 msgid "Host lookup failed: host not found"
 msgstr "Qovşaq Ad axtarışı iflas etdi: %s: qovşaq tapılmadı"
 
-#: camel/camel-service.c:932
+#: camel/camel-service.c:952
 #, fuzzy
 msgid "Host lookup failed: unknown reason"
 msgstr "Qovşaq Ad axtarışı iflas etdi: %s: naməlum səbəb"
@@ -9191,12 +9129,12 @@ msgstr "_Virtual Qovluq Sehirbazı ..."
 msgid "For reading mail as a query of another set of folders"
 msgstr "Başqa qovluq dəstələrinin istəyi olan məktubların oxunması üçün"
 
-#: camel/camel-session.c:350 camel/camel-session.c:400
+#: camel/camel-session.c:355 camel/camel-session.c:405
 #, c-format
 msgid "No provider available for protocol `%s'"
 msgstr "`%s' protokolu üçün xidmətçi yoxdur"
 
-#: camel/camel-session.c:523
+#: camel/camel-session.c:528
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -9242,142 +9180,142 @@ msgstr "İsmarış kodu açıla bilmir."
 msgid "Failed to verify certificates."
 msgstr "Vəsiqələr təsdiqlənə bilmir."
 
-#: camel/camel-store.c:212
+#: camel/camel-store.c:215
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr "Qovluq alıa bilmir: Mənbədə hökmsüz əməliyyat"
 
-#: camel/camel-store.c:266
+#: camel/camel-store.c:269
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "Qovluq yaradıla bilmir: Ambarda sənv əməliyyat aparılıb"
 
-#: camel/camel-tcp-stream-openssl.c:568
+#: camel/camel-tcp-stream-openssl.c:571
 #, fuzzy
 msgid "Unable to get issuer's certificate"
 msgstr "Vəsiqələr təsdiqlənə bilmir."
 
-#: camel/camel-tcp-stream-openssl.c:570
+#: camel/camel-tcp-stream-openssl.c:573
 msgid "Unable to get Certificate Revocation List"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:572
+#: camel/camel-tcp-stream-openssl.c:575
 #, fuzzy
 msgid "Unable to decrypt certificate signature"
 msgstr "Vəsiqələr təsdiqlənə bilmir."
 
-#: camel/camel-tcp-stream-openssl.c:574
+#: camel/camel-tcp-stream-openssl.c:577
 msgid "Unable to decrypt Certificate Revocation List signature"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:576
+#: camel/camel-tcp-stream-openssl.c:579
 msgid "Unable to decode issuer's public key"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:578
+#: camel/camel-tcp-stream-openssl.c:581
 #, fuzzy
 msgid "Certificate signature failure"
 msgstr "Imza faylı : "
 
-#: camel/camel-tcp-stream-openssl.c:580
+#: camel/camel-tcp-stream-openssl.c:583
 msgid "Certificate Revocation List signature failure"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:582
+#: camel/camel-tcp-stream-openssl.c:585
 msgid "Certificate not yet valid"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:584
+#: camel/camel-tcp-stream-openssl.c:587
 #, fuzzy
 msgid "Certificate has expired"
 msgstr "_Vəsiqə ID:"
 
-#: camel/camel-tcp-stream-openssl.c:586
+#: camel/camel-tcp-stream-openssl.c:589
 msgid "CRL not yet valid"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:588
+#: camel/camel-tcp-stream-openssl.c:591
 msgid "CRL has expired"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:593
+#: camel/camel-tcp-stream-openssl.c:596
 #, fuzzy
 msgid "Error in CRL"
 msgstr "%s yüklənərkən xəta oldu"
 
-#: camel/camel-tcp-stream-openssl.c:595
+#: camel/camel-tcp-stream-openssl.c:598
 #, fuzzy
 msgid "Out of memory"
 msgstr "İş Yerində Deyil"
 
-#: camel/camel-tcp-stream-openssl.c:597
+#: camel/camel-tcp-stream-openssl.c:600
 msgid "Zero-depth self-signed certificate"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:599
+#: camel/camel-tcp-stream-openssl.c:602
 msgid "Self-signed certificate in chain"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:601
+#: camel/camel-tcp-stream-openssl.c:604
 msgid "Unable to get issuer's certificate locally"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:603
+#: camel/camel-tcp-stream-openssl.c:606
 #, fuzzy
 msgid "Unable to verify leaf signature"
 msgstr "Vəsiqələr təsdiqlənə bilmir."
 
-#: camel/camel-tcp-stream-openssl.c:605
+#: camel/camel-tcp-stream-openssl.c:608
 msgid "Certificate chain too long"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:607
+#: camel/camel-tcp-stream-openssl.c:610
 #, fuzzy
 msgid "Certificate Revoked"
 msgstr "_Vəsiqə ID:"
 
-#: camel/camel-tcp-stream-openssl.c:609
+#: camel/camel-tcp-stream-openssl.c:612
 msgid "Invalid Certificate Authority (CA)"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:611
+#: camel/camel-tcp-stream-openssl.c:614
 msgid "Path length exceeded"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:613
+#: camel/camel-tcp-stream-openssl.c:616
 #, fuzzy
 msgid "Invalid purpose"
 msgstr "Səhv qrqument"
 
-#: camel/camel-tcp-stream-openssl.c:615
+#: camel/camel-tcp-stream-openssl.c:618
 #, fuzzy
 msgid "Certificate untrusted"
 msgstr "_Vəsiqə ID:"
 
-#: camel/camel-tcp-stream-openssl.c:617
+#: camel/camel-tcp-stream-openssl.c:620
 #, fuzzy
 msgid "Certificate rejected"
 msgstr "_Vəsiqə ID:"
 
-#: camel/camel-tcp-stream-openssl.c:620
+#: camel/camel-tcp-stream-openssl.c:623
 msgid "Subject/Issuer mismatch"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:622
+#: camel/camel-tcp-stream-openssl.c:625
 msgid "AKID/SKID mismatch"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:624
+#: camel/camel-tcp-stream-openssl.c:627
 msgid "AKID/Issuer serial mismatch"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:626
+#: camel/camel-tcp-stream-openssl.c:629
 msgid "Key usage does not support certificate signing"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:629
+#: camel/camel-tcp-stream-openssl.c:632
 msgid "Error in application verification"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:696 camel/camel-tcp-stream-ssl.c:831
+#: camel/camel-tcp-stream-openssl.c:699 camel/camel-tcp-stream-ssl.c:823
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -9386,15 +9324,15 @@ msgid ""
 "Signature:         %s"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:837
+#: camel/camel-tcp-stream-openssl.c:705 camel/camel-tcp-stream-ssl.c:829
 msgid "GOOD"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:837
+#: camel/camel-tcp-stream-openssl.c:705 camel/camel-tcp-stream-ssl.c:829
 msgid "BAD"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:704
+#: camel/camel-tcp-stream-openssl.c:707
 #, fuzzy, c-format
 msgid ""
 "Bad certificate from %s:\n"
@@ -9412,7 +9350,7 @@ msgstr ""
 "Yenə də qəbul etmək istəyirsiniz?"
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:841
+#: camel/camel-tcp-stream-ssl.c:833
 #, fuzzy, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -9427,28 +9365,28 @@ msgstr ""
 "\n"
 "Yenə də qəbul etmək istəyirsiniz?"
 
-#: camel/camel-tcp-stream-ssl.c:885
+#: camel/camel-tcp-stream-ssl.c:877
 #, c-format
 msgid ""
 "Certificate problem: %s\n"
 "Issuer: %s"
 msgstr ""
 
-#: camel/camel-tcp-stream-ssl.c:937
+#: camel/camel-tcp-stream-ssl.c:929
 #, c-format
 msgid ""
 "Bad certificate domain: %s\n"
 "Issuer: %s"
 msgstr ""
 
-#: camel/camel-tcp-stream-ssl.c:955
+#: camel/camel-tcp-stream-ssl.c:947
 #, fuzzy, c-format
 msgid ""
 "Certificate expired: %s\n"
 "Issuer: %s"
 msgstr "_Vəsiqə ID:"
 
-#: camel/camel-tcp-stream-ssl.c:972
+#: camel/camel-tcp-stream-ssl.c:964
 #, fuzzy, c-format
 msgid ""
 "Certificate revocation list expired: %s\n"
@@ -9460,17 +9398,17 @@ msgstr "_Vəsiqə ID:"
 msgid "Could not parse URL `%s'"
 msgstr "URL `%s' alına bilmir"
 
-#: camel/camel-vee-folder.c:611
+#: camel/camel-vee-folder.c:618
 #, fuzzy, c-format
 msgid "Error storing `%s': %s"
 msgstr "%s başladırkən xəta oldu"
 
-#: camel/camel-vee-folder.c:649
+#: camel/camel-vee-folder.c:656
 #, c-format
 msgid "No such message %s in %s"
 msgstr "\"%s\"da(də) %s deye bir ismarış yoxdur"
 
-#: camel/camel-vee-folder.c:812 camel/camel-vee-folder.c:818
+#: camel/camel-vee-folder.c:819 camel/camel-vee-folder.c:825
 #, fuzzy
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr "Bütün qovluqlarda yeni ePoçt üçün bax"
@@ -9498,12 +9436,12 @@ msgstr "Qovluq adı dəyişdirilə bilmir: %s: Belə qovluq yoxdur"
 #: camel/providers/imap/camel-imap-command.c:221
 #: camel/providers/imap/camel-imap-command.c:260
 #: camel/providers/imap/camel-imap-command.c:450
-#: camel/providers/imap/camel-imap-store.c:2806
+#: camel/providers/imap/camel-imap-store.c:2644
 msgid "Operation cancelled"
 msgstr "Əməliyyat ləğv edildi"
 
 #: camel/providers/imap/camel-imap-command.c:305
-#: camel/providers/imap/camel-imap-store.c:2809
+#: camel/providers/imap/camel-imap-store.c:2647
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "Verici gözlanilməz şakildə bağlantını kəsdi: %s"
@@ -9540,38 +9478,38 @@ msgstr "IMAP vericisi cavabı %s məlumatını daxil etmir"
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "IMAP vericisindən gözlənilməz qəbul cavabı alındı: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:223
+#: camel/providers/imap/camel-imap-folder.c:222
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "%s qovluğunu yarada bilmədim: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:242
+#: camel/providers/imap/camel-imap-folder.c:241
 #, c-format
 msgid "Could not load summary for %s"
 msgstr "%s üçün mündəricat yüklənə bilmədi"
 
-#: camel/providers/imap/camel-imap-folder.c:308
+#: camel/providers/imap/camel-imap-folder.c:307
 msgid "Folder was destroyed and recreated on server."
 msgstr "Qovluq dağıdılıb vericidə yerinə yenisi yaradıldı."
 
 #. Check UIDs and flags of all messages we already know of.
-#: camel/providers/imap/camel-imap-folder.c:550
+#: camel/providers/imap/camel-imap-folder.c:549
 msgid "Scanning for changed messages"
 msgstr "Dəyişdirilmiş ismarışda dəyişikliklər daranır"
 
-#: camel/providers/imap/camel-imap-folder.c:1886
+#: camel/providers/imap/camel-imap-folder.c:1883
 #, fuzzy, c-format
 msgid "Unable to retrieve message: %s"
 msgstr "İsmarış kodu açıla bilmir."
 
-#: camel/providers/imap/camel-imap-folder.c:1923
-#: camel/providers/local/camel-maildir-folder.c:211
-#: camel/providers/local/camel-maildir-folder.c:224
-#: camel/providers/local/camel-maildir-folder.c:233
-#: camel/providers/local/camel-mbox-folder.c:422
-#: camel/providers/local/camel-mh-folder.c:200
-#: camel/providers/local/camel-mh-folder.c:210
-#: camel/providers/local/camel-mh-folder.c:219
+#: camel/providers/imap/camel-imap-folder.c:1920
+#: camel/providers/local/camel-maildir-folder.c:212
+#: camel/providers/local/camel-maildir-folder.c:225
+#: camel/providers/local/camel-maildir-folder.c:234
+#: camel/providers/local/camel-mbox-folder.c:351
+#: camel/providers/local/camel-mh-folder.c:201
+#: camel/providers/local/camel-mh-folder.c:211
+#: camel/providers/local/camel-mh-folder.c:220
 #, c-format
 msgid ""
 "Cannot get message: %s\n"
@@ -9580,24 +9518,24 @@ msgstr ""
 "İSmarıc alına bilmir: %s\n"
 "   %s"
 
-#: camel/providers/imap/camel-imap-folder.c:1923
-#: camel/providers/local/camel-maildir-folder.c:211
-#: camel/providers/local/camel-mbox-folder.c:422
-#: camel/providers/local/camel-mh-folder.c:200
+#: camel/providers/imap/camel-imap-folder.c:1920
+#: camel/providers/local/camel-maildir-folder.c:212
+#: camel/providers/local/camel-mbox-folder.c:351
+#: camel/providers/local/camel-mh-folder.c:201
 msgid "No such message"
 msgstr "Belə bir ismarış yoxdur"
 
-#: camel/providers/imap/camel-imap-folder.c:1946
-#: camel/providers/imap/camel-imap-folder.c:2542
+#: camel/providers/imap/camel-imap-folder.c:1943
+#: camel/providers/imap/camel-imap-folder.c:2539
 msgid "This message is not currently available"
 msgstr "Bu ismarış hazırda mövcuddur"
 
-#: camel/providers/imap/camel-imap-folder.c:2206
-#: camel/providers/imap/camel-imap-folder.c:2276
+#: camel/providers/imap/camel-imap-folder.c:2203
+#: camel/providers/imap/camel-imap-folder.c:2273
 msgid "Fetching summary information for new messages"
 msgstr "Yeni ismarışların icmalı alınır"
 
-#: camel/providers/imap/camel-imap-folder.c:2580
+#: camel/providers/imap/camel-imap-folder.c:2577
 msgid "Could not find message body in FETCH response."
 msgstr "FETCH cavabında ismarış gövdəsi tapıla bilmədi"
 
@@ -9647,106 +9585,90 @@ msgstr "Ad boşluğu"
 msgid "Apply filters to new messages in INBOX on this server"
 msgstr "Bu vericinin GƏLƏNLƏR qutusundaki ismarışlara süzgəv əlavə et"
 
-#: camel/providers/imap/camel-imap-provider.c:59
-#, fuzzy
-msgid "Automatically synchronize remote mail locally"
-msgstr "Yeni Məktubları _avtomatik yoxla"
-
-#: camel/providers/imap/camel-imap-provider.c:65
+#: camel/providers/imap/camel-imap-provider.c:63
 msgid "IMAP"
 msgstr "IMAP"
 
-#: camel/providers/imap/camel-imap-provider.c:67
+#: camel/providers/imap/camel-imap-provider.c:65
 msgid "For reading and storing mail on IMAP servers."
 msgstr "IMAP vericisində məktubların saxlanması və oxuna bilməsi üçün."
 
-#: camel/providers/imap/camel-imap-provider.c:82
-#: camel/providers/imapp/camel-imapp-provider.c:65
-#: camel/providers/nntp/camel-nntp-store.c:265
+#: camel/providers/imap/camel-imap-provider.c:80
+#: camel/providers/nntp/camel-nntp-store.c:267
 #: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:83
 msgid "Password"
 msgstr "Parol"
 
-#: camel/providers/imap/camel-imap-provider.c:84
-#: camel/providers/imapp/camel-imapp-provider.c:67
+#: camel/providers/imap/camel-imap-provider.c:82
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
 "Bu seçənəklə siz IMAP vericisinə düz mətn parol ilə bağlana biləcəksiniz."
 
-#: camel/providers/imap/camel-imap-store.c:459
+#: camel/providers/imap/camel-imap-store.c:457
 #, fuzzy, c-format
 msgid "IMAP server %s"
 msgstr "%s SMTP vericisi"
 
-#: camel/providers/imap/camel-imap-store.c:461
+#: camel/providers/imap/camel-imap-store.c:459
 #, fuzzy, c-format
 msgid "IMAP service for %s on %s"
 msgstr "%s üstündə %s üçün %s xidmətləri"
 
-#: camel/providers/imap/camel-imap-store.c:589
-#: camel/providers/imap/camel-imap-store.c:821
-#: camel/providers/imapp/camel-imapp-store.c:233
-#: camel/providers/nntp/camel-nntp-store.c:128
-#: camel/providers/nntp/camel-nntp-store.c:146
+#: camel/providers/imap/camel-imap-store.c:587
+#: camel/providers/nntp/camel-nntp-store.c:130
+#: camel/providers/nntp/camel-nntp-store.c:148
 #: camel/providers/pop3/camel-pop3-store.c:184
 msgid "Connection cancelled"
 msgstr "Bağlantı Ləğv edildi"
 
-#: camel/providers/imap/camel-imap-store.c:592
-#: camel/providers/imapp/camel-imapp-store.c:236
-#: camel/providers/nntp/camel-nntp-store.c:131
-#: camel/providers/smtp/camel-smtp-transport.c:275
+#: camel/providers/imap/camel-imap-store.c:590
+#: camel/providers/nntp/camel-nntp-store.c:133
+#: camel/providers/smtp/camel-smtp-transport.c:276
 #, c-format
 msgid "Could not connect to %s (port %d): %s"
 msgstr "%s a(ə) bağlana bilmirəm (qapı %d): %s"
 
-#: camel/providers/imap/camel-imap-store.c:655
-#: camel/providers/imap/camel-imap-store.c:686
+#: camel/providers/imap/camel-imap-store.c:649
+#: camel/providers/imap/camel-imap-store.c:680
 #, fuzzy, c-format
 msgid "Failed to connect to IMAP server %s in secure mode: %s"
 msgstr ""
 "POP vericisinə bağlana bilmədim.\n"
 "İstifadəçi adı göndərilmə xətası oldu: %s"
 
-#: camel/providers/imap/camel-imap-store.c:656
+#: camel/providers/imap/camel-imap-store.c:650
 #: camel/providers/pop3/camel-pop3-store.c:220
 #, fuzzy
 msgid "SSL/TLS extension not supported."
 msgstr "Əməliyyat dəstəklənmir"
 
-#: camel/providers/imap/camel-imap-store.c:687
+#: camel/providers/imap/camel-imap-store.c:681
 #: camel/providers/pop3/camel-pop3-store.c:261
 #, fuzzy
 msgid "SSL negotiations failed"
 msgstr "Tanıtma bacarılmadı."
 
-#: camel/providers/imap/camel-imap-store.c:824
-#, fuzzy, c-format
-msgid "Could not connect with command \"%s\": %s"
-msgstr "Vericiyə bağlana bilmirəm: %s"
-
-#: camel/providers/imap/camel-imap-store.c:1237
+#: camel/providers/imap/camel-imap-store.c:1075
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr "%s IMAP vericisi %s tanıtma növünü dəstəkləmir"
 
-#: camel/providers/imap/camel-imap-store.c:1247
-#: camel/providers/smtp/camel-smtp-transport.c:485
+#: camel/providers/imap/camel-imap-store.c:1085
+#: camel/providers/smtp/camel-smtp-transport.c:486
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "%s Tanıtma növü dəßtəklənmir"
 
-#: camel/providers/imap/camel-imap-store.c:1270
-#: camel/providers/imapp/camel-imapp-store.c:349
+#: camel/providers/imap/camel-imap-store.c:1108
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr "%sLütfən %s@%s üçün IMAP parolunu girin"
 
-#: camel/providers/imap/camel-imap-store.c:1284
+#: camel/providers/imap/camel-imap-store.c:1122
 msgid "You didn't enter a password."
 msgstr "Parolu girmədiniz."
 
-#: camel/providers/imap/camel-imap-store.c:1313
+#: camel/providers/imap/camel-imap-store.c:1151
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -9757,70 +9679,42 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:1660
-#: camel/providers/imap/camel-imap-store.c:1802
+#: camel/providers/imap/camel-imap-store.c:1498
+#: camel/providers/imap/camel-imap-store.c:1640
 #, c-format
 msgid "No such folder %s"
 msgstr "%s deyə bir qovluq yoxdur"
 
-#: camel/providers/imap/camel-imap-store.c:2003
+#: camel/providers/imap/camel-imap-store.c:1841
 #, fuzzy, c-format
 msgid ""
 "The folder name \"%s\" is invalid because it containes the character \"%c\""
 msgstr "Qovluq ad Return xarakteri daxil edə bilməz."
 
-#: camel/providers/imap/camel-imap-store.c:2015
+#: camel/providers/imap/camel-imap-store.c:1853
 #, fuzzy, c-format
 msgid "Unknown parent folder: %s"
 msgstr "Naməlum xəta: %s"
 
-#: camel/providers/imap/camel-imap-store.c:2051
+#: camel/providers/imap/camel-imap-store.c:1889
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "Əlaqəli qovluğun alt qovluqlara malik olmağına icazə verilməyib"
 
-#: camel/providers/imapp/camel-imapp-provider.c:39
-#: camel/providers/pop3/camel-pop3-provider.c:38
-msgid "Message storage"
-msgstr "İsmarış saxlanması"
-
-#: camel/providers/imapp/camel-imapp-provider.c:47
-#, fuzzy
-msgid "IMAP+"
-msgstr "IMAP"
-
-#: camel/providers/imapp/camel-imapp-provider.c:49
-msgid ""
-"Experimental IMAP 4(.1) client\n"
-"This is untested and unsupported code, you want to use plain imap instead.\n"
-"\n"
-" !!! DO NOT USE THIS FOR PRODUCTION EMAIL  !!!\n"
-msgstr ""
-
-#: camel/providers/imapp/camel-imapp-store.c:333
-#, fuzzy, c-format
-msgid "Could not connect to POP server on %s"
-msgstr "%s üstündəki POP vericisi ilə ünsiyyət qurula bilmir."
-
-#: camel/providers/local/camel-local-folder.c:179
-#, fuzzy
-msgid "Index message body data"
-msgstr "Əlaqəyə yeni bir ismarış göndər"
-
 #. $HOME relative path + protocol string
-#: camel/providers/local/camel-local-folder.c:379
+#: camel/providers/local/camel-local-folder.c:354
 #, fuzzy, c-format
 msgid "~%s (%s)"
 msgstr "%s (%d)"
 
 #. /var/spool/mail relative path + protocol
-#: camel/providers/local/camel-local-folder.c:383
-#: camel/providers/local/camel-local-folder.c:386
+#: camel/providers/local/camel-local-folder.c:358
+#: camel/providers/local/camel-local-folder.c:361
 #, fuzzy, c-format
 msgid "mailbox:%s (%s)"
 msgstr "Məktub qutusu açıla bilmir: %s: %s\n"
 
 #. a full path + protocol
-#: camel/providers/local/camel-local-folder.c:390
+#: camel/providers/local/camel-local-folder.c:365
 #, fuzzy, c-format
 msgid "%s (%s)"
 msgstr "%s (%d)"
@@ -9877,54 +9771,50 @@ msgid ""
 "May also be used to read a tree of Elm, Pine, or Mutt style folders."
 msgstr "Yerli məktubları mbox tərzi məktub cərgələrində saxlaya bilmək üçün."
 
-#: camel/providers/local/camel-local-store.c:138
-#: camel/providers/local/camel-local-store.c:227
-#: camel/providers/local/camel-mbox-store.c:305
+#: camel/providers/local/camel-local-store.c:139
+#: camel/providers/local/camel-local-store.c:228
 #: camel/providers/local/camel-spool-store.c:116
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr "%s kök saxlama dəqiq bir yol deyildir"
 
-#: camel/providers/local/camel-local-store.c:145
+#: camel/providers/local/camel-local-store.c:146
 #, c-format
 msgid "Store root %s is not a regular directory"
 msgstr "%s kök saxlama düzgün bir qovluq deyildir."
 
-#: camel/providers/local/camel-local-store.c:154
-#: camel/providers/local/camel-local-store.c:170
-#: camel/providers/local/camel-local-store.c:238
+#: camel/providers/local/camel-local-store.c:155
+#: camel/providers/local/camel-local-store.c:171
+#: camel/providers/local/camel-local-store.c:239
 #, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr "Qovluq alına bilmədi: %s: %s"
 
-#: camel/providers/local/camel-local-store.c:186
+#: camel/providers/local/camel-local-store.c:187
 msgid "Local stores do not have an inbox"
 msgstr "Yerli saxlamaların gələnlər qutusu qovluğu yoxdur"
 
-#: camel/providers/local/camel-local-store.c:198
+#: camel/providers/local/camel-local-store.c:199
 #, c-format
 msgid "Local mail file %s"
 msgstr "%s Yeli məktub faylı"
 
-#: camel/providers/local/camel-local-store.c:307 mail/mail-local.c:949
+#: camel/providers/local/camel-local-store.c:308 mail/mail-local.c:909
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr "%s faylı %s adi ilə yenidən adlandırıla bilmir: %s"
 
-#: camel/providers/local/camel-local-store.c:364
-#: camel/providers/local/camel-mbox-store.c:474
+#: camel/providers/local/camel-local-store.c:365
 #, fuzzy, c-format
 msgid "Could not rename '%s': %s"
 msgstr "Qovluq yenidən adlandırıla bilmir: %s"
 
-#: camel/providers/local/camel-local-store.c:387
-#: camel/providers/local/camel-mbox-store.c:258
+#: camel/providers/local/camel-local-store.c:388
 #, c-format
 msgid "Could not delete folder summary file `%s': %s"
 msgstr "`%s' Qovluq mündəricat faylı silinə bilmir: %s"
 
-#: camel/providers/local/camel-local-store.c:397
-#: camel/providers/local/camel-mbox-store.c:270
+#: camel/providers/local/camel-local-store.c:398
 #, c-format
 msgid "Could not delete folder index file `%s': %s"
 msgstr "`%s' Qovluq indeks faylı silinə bilmir: %s"
@@ -9938,17 +9828,17 @@ msgstr "İcmal qeyd edilə bilmir: %s :%s"
 msgid "Unable to add message to summary: unknown reason"
 msgstr "Xülasəyə ismarış əlavə edə bilmədim: naməlum səbəb"
 
-#: camel/providers/local/camel-maildir-folder.c:183
+#: camel/providers/local/camel-maildir-folder.c:184
 msgid "Maildir append message cancelled"
 msgstr "Maildir imsarış əlavə edilməsi ləğv edildi"
 
-#: camel/providers/local/camel-maildir-folder.c:186
+#: camel/providers/local/camel-maildir-folder.c:187
 #, c-format
 msgid "Cannot append message to maildir folder: %s: %s"
 msgstr "İsmarış məktub qovluğu fayllına əlavə edilə bilmir: %s: %s "
 
-#: camel/providers/local/camel-maildir-folder.c:234
-#: camel/providers/local/camel-mh-folder.c:220
+#: camel/providers/local/camel-maildir-folder.c:235
+#: camel/providers/local/camel-mh-folder.c:221
 msgid "Invalid message contents"
 msgstr "Hökmsüz ismarış mövtəviyyatı"
 
@@ -9964,7 +9854,7 @@ msgstr ""
 "%s"
 
 #: camel/providers/local/camel-maildir-store.c:110
-#: camel/providers/local/camel-mbox-store.c:157
+#: camel/providers/local/camel-mbox-store.c:101
 #: camel/providers/local/camel-mh-store.c:209
 #: camel/providers/local/camel-spool-store.c:167
 #, c-format
@@ -10029,29 +9919,29 @@ msgstr "Yeni ismarışlar daranır"
 msgid "Storing folder"
 msgstr "Qovluqlar saxlanılır"
 
-#: camel/providers/local/camel-mbox-folder.c:230
-#: camel/providers/local/camel-spool-folder.c:148
+#: camel/providers/local/camel-mbox-folder.c:159
+#: camel/providers/local/camel-spool-folder.c:149
 #, c-format
 msgid "Cannot create folder lock on %s: %s"
 msgstr "%s üstündə qovluq qıfılı yaradıla bilmədi: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:289
+#: camel/providers/local/camel-mbox-folder.c:218
 #, c-format
 msgid "Cannot open mailbox: %s: %s\n"
 msgstr "Məktub qutusu açıla bilmir: %s: %s\n"
 
-#: camel/providers/local/camel-mbox-folder.c:349
+#: camel/providers/local/camel-mbox-folder.c:278
 msgid "Mail append cancelled"
 msgstr "Məktub əlavəsi ləğv edildi"
 
-#: camel/providers/local/camel-mbox-folder.c:352
+#: camel/providers/local/camel-mbox-folder.c:281
 #, c-format
 msgid "Cannot append message to mbox file: %s: %s"
 msgstr "İsmarış mbox fayllına əlava edilə bimir: %s: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:440
-#: camel/providers/local/camel-mbox-folder.c:471
-#: camel/providers/local/camel-mbox-folder.c:479
+#: camel/providers/local/camel-mbox-folder.c:369
+#: camel/providers/local/camel-mbox-folder.c:400
+#: camel/providers/local/camel-mbox-folder.c:408
 #, c-format
 msgid ""
 "Cannot get message: %s from folder %s\n"
@@ -10060,15 +9950,15 @@ msgstr ""
 "İsmarış alına bilmir: %s qovluğundan %s\n"
 "   %s"
 
-#: camel/providers/local/camel-mbox-folder.c:472
+#: camel/providers/local/camel-mbox-folder.c:401
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr "Qovluq geri dönülməz şəkildə xəsarət alıb."
 
-#: camel/providers/local/camel-mbox-folder.c:480
+#: camel/providers/local/camel-mbox-folder.c:409
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr "İSmarıc quruluşu bacarılmadı: Məktub qutusu yoxsa xəsərlidir?"
 
-#: camel/providers/local/camel-mbox-store.c:149
+#: camel/providers/local/camel-mbox-store.c:94
 #, c-format
 msgid ""
 "Could not open file `%s':\n"
@@ -10077,16 +9967,7 @@ msgstr ""
 "`%s' Faylı açıla bilmir:\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:166
-#, fuzzy, c-format
-msgid ""
-"Could not create directory `%s':\n"
-"%s"
-msgstr ""
-"%s qovluğunu yarada bilmədim:\n"
-"%s"
-
-#: camel/providers/local/camel-mbox-store.c:178
+#: camel/providers/local/camel-mbox-store.c:110
 #, c-format
 msgid ""
 "Could not create file `%s':\n"
@@ -10095,15 +9976,14 @@ msgstr ""
 "`%s' faylı yaradıla bilmədi: \n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:188
-#: camel/providers/local/camel-mbox-store.c:229
+#: camel/providers/local/camel-mbox-store.c:119
+#: camel/providers/local/camel-mbox-store.c:146
 #, c-format
 msgid "`%s' is not a regular file."
 msgstr "`%s' normal bir fayl deyildir ."
 
-#: camel/providers/local/camel-mbox-store.c:210
-#: camel/providers/local/camel-mbox-store.c:221
-#: camel/providers/local/camel-mbox-store.c:244
+#: camel/providers/local/camel-mbox-store.c:138
+#: camel/providers/local/camel-mbox-store.c:161
 #, c-format
 msgid ""
 "Could not delete folder `%s':\n"
@@ -10112,36 +9992,11 @@ msgstr ""
 "`%s' qovluğu silinə bilmir:\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:236
+#: camel/providers/local/camel-mbox-store.c:153
 #, c-format
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr "`%s' qovluğu boş deyildir. Silinmədi."
 
-#: camel/providers/local/camel-mbox-store.c:311
-#, fuzzy
-msgid "Cannot create a folder by this name."
-msgstr "Bu adda qovluq yarada bilmədim"
-
-#: camel/providers/local/camel-mbox-store.c:324
-#, fuzzy, c-format
-msgid "Cannot create directory `%s': %s."
-msgstr "%s qovluğunu yarada bilmədim: %s"
-
-#: camel/providers/local/camel-mbox-store.c:338
-#, fuzzy, c-format
-msgid "Cannot create folder: %s: %s"
-msgstr "Qovluq alına bilmədi: %s: %s"
-
-#: camel/providers/local/camel-mbox-store.c:408
-#, fuzzy, c-format
-msgid "Could not rename %s to %s: %s"
-msgstr "%s faylı %s adi ilə yenidən adlandırıla bilmir: %s"
-
-#: camel/providers/local/camel-mbox-store.c:427
-#, fuzzy
-msgid "The new folder name is illegal."
-msgstr "Bildirilən qovluq adı hökmlü deyildir: %s"
-
 #: camel/providers/local/camel-mbox-summary.c:343
 #, c-format
 msgid "Could not open folder: %s: %s"
@@ -10171,7 +10026,7 @@ msgid "Cannot open temporary mailbox: %s"
 msgstr "Müvəqqəti məktub qutusu açıla bilmir: %s"
 
 #: camel/providers/local/camel-mbox-summary.c:540
-#: camel/providers/local/camel-mbox-summary.c:704
+#: camel/providers/local/camel-mbox-summary.c:702
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr "Qaynaq qovluğu bağlana bilmədi: %s: %s"
@@ -10188,39 +10043,39 @@ msgstr "Qovluq yenidən adlandırıla bilmir: %s"
 
 #: camel/providers/local/camel-mbox-summary.c:644
 #: camel/providers/local/camel-mbox-summary.c:652
-#: camel/providers/local/camel-mbox-summary.c:845
-#: camel/providers/local/camel-mbox-summary.c:853
+#: camel/providers/local/camel-mbox-summary.c:843
+#: camel/providers/local/camel-mbox-summary.c:851
 msgid "Summary and folder mismatch, even after a sync"
 msgstr ""
 "Toplama və qovluq bir birinə uyğun gəlmir, sinxronizasiyadan sonra da əlbətdə"
 
-#: camel/providers/local/camel-mbox-summary.c:779
+#: camel/providers/local/camel-mbox-summary.c:777
 #: camel/providers/local/camel-spool-summary.c:334
 #, c-format
 msgid "Unknown error: %s"
 msgstr "Naməlum xəta: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:814
+#: camel/providers/local/camel-mbox-summary.c:812
 #, fuzzy, c-format
 msgid "Could not store folder: %s"
 msgstr "Qovluq yenidən adlandırıla bilmir: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:908
-#: camel/providers/local/camel-mbox-summary.c:934
+#: camel/providers/local/camel-mbox-summary.c:906
+#: camel/providers/local/camel-mbox-summary.c:932
 #, c-format
 msgid "Error writing to temp mailbox: %s"
 msgstr "Müvəqqəti məktub qutusuna yazıla bilmir: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:925
+#: camel/providers/local/camel-mbox-summary.c:923
 #, c-format
 msgid "Writing to tmp mailbox failed: %s: %s"
 msgstr "Müvəqqəti məktub qutusuna yazılma bacarılmadı: %s: %s"
 
-#: camel/providers/local/camel-mh-folder.c:174
+#: camel/providers/local/camel-mh-folder.c:175
 msgid "MH append message cancelled"
 msgstr "MH ismarış əlavəsi ləğv edildi"
 
-#: camel/providers/local/camel-mh-folder.c:177
+#: camel/providers/local/camel-mh-folder.c:178
 #, c-format
 msgid "Cannot append message to mh folder: %s: %s"
 msgstr "mh qovluğuna ismarış əlavə edilə bilmir: %s: %s"
@@ -10300,64 +10155,6 @@ msgstr ""
 "%s hovuz qovluğu sinxronlaşdırıla bilmir: %s\n"
 "Qovluq xəsarət görmüş ola bilər, üzü `%s' içində qeyd edildi"
 
-#: camel/providers/nntp/camel-nntp-auth.c:44
-#, c-format
-msgid "Please enter the NNTP password for %s@%s"
-msgstr "%s@%s üçün parolu lütfən girin"
-
-#: camel/providers/nntp/camel-nntp-auth.c:64
-msgid "Server rejected username"
-msgstr "Verici istifadəçi adını qəbul etmədi"
-
-#: camel/providers/nntp/camel-nntp-auth.c:70
-msgid "Failed to send username to server"
-msgstr "Vericiyə istifadəçi adı göndərilə bilmədi"
-
-#: camel/providers/nntp/camel-nntp-auth.c:79
-msgid "Server rejected username/password"
-msgstr "Verici istifadəçi adını/parolunu qəbul etmədi"
-
-#: camel/providers/nntp/camel-nntp-folder.c:114
-#, c-format
-msgid "Internal error: uid in invalid format: %s"
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-folder.c:155
-#: camel/providers/nntp/camel-nntp-folder.c:161
-#: camel/providers/pop3/camel-pop3-folder.c:433
-#: camel/providers/pop3/camel-pop3-folder.c:494
-#: camel/providers/pop3/camel-pop3-folder.c:501
-#: camel/providers/pop3/camel-pop3-folder.c:512
-#, fuzzy, c-format
-msgid "Cannot get message %s: %s"
-msgstr ""
-"İSmarıc alına bilmir: %s\n"
-"   %s"
-
-#: camel/providers/nntp/camel-nntp-folder.c:159
-#: camel/providers/pop3/camel-pop3-folder.c:262
-#: camel/providers/pop3/camel-pop3-folder.c:430
-#: camel/providers/pop3/camel-pop3-folder.c:491
-#: camel/providers/pop3/camel-pop3-folder.c:509
-#, fuzzy
-msgid "User cancelled"
-msgstr "Əməliyyat ləğv edildi"
-
-#: camel/providers/nntp/camel-nntp-grouplist.c:45
-msgid "Could not get group list from server."
-msgstr "Vericidən qrup adı öyrənilə bilmədi."
-
-#: camel/providers/nntp/camel-nntp-grouplist.c:98
-#: camel/providers/nntp/camel-nntp-grouplist.c:107
-#, c-format
-msgid "Unable to load grouplist file for %s: %s"
-msgstr "%s üçün qrup siyahısı yüklənə bilmir: %s"
-
-#: camel/providers/nntp/camel-nntp-grouplist.c:158
-#, c-format
-msgid "Unable to save grouplist file for %s: %s"
-msgstr "%s üçün qrup faylı qeyd edilə bilmir: %s"
-
 #: camel/providers/nntp/camel-nntp-provider.c:41
 msgid "USENET news"
 msgstr "USENET xəbərləri"
@@ -10368,22 +10165,22 @@ msgstr ""
 "USENET xəbər qruplarına göndərilmiş hər hansı bir xəbəri oxumaq üçün bir "
 "vasitədir."
 
-#: camel/providers/nntp/camel-nntp-store.c:149
+#: camel/providers/nntp/camel-nntp-store.c:151
 #, fuzzy, c-format
 msgid "Could not read greeting from %s: %s"
 msgstr "%s qovluğunu yarada bilmədim: %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:161
+#: camel/providers/nntp/camel-nntp-store.c:163
 #, c-format
 msgid "NNTP server %s returned error code %d: %s"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:260
+#: camel/providers/nntp/camel-nntp-store.c:262
 #, c-format
 msgid "USENET News via %s"
 msgstr "%s dan(dən) USENET Xəbərləri"
 
-#: camel/providers/nntp/camel-nntp-store.c:267
+#: camel/providers/nntp/camel-nntp-store.c:269
 msgid ""
 "This option will authenticate with the NNTP server using a plaintext "
 "password."
@@ -10391,38 +10188,38 @@ msgstr ""
 "Bu seçənək NNTP verisici ilə düz mətn şəklindəki parol ilə ünsiyyət "
 "quracaqdır."
 
-#: camel/providers/nntp/camel-nntp-summary.c:237
+#: camel/providers/nntp/camel-nntp-summary.c:234
 #, fuzzy, c-format
 msgid "No such folder: %s"
 msgstr "%s deyə bir qovluq yoxdur"
 
-#: camel/providers/nntp/camel-nntp-summary.c:241
+#: camel/providers/nntp/camel-nntp-summary.c:238
 #, fuzzy, c-format
 msgid "Could not get group: %s"
 msgstr "Boru yaradıla bilmədi: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:347
+#: camel/providers/nntp/camel-nntp-summary.c:344
 #, fuzzy, c-format
 msgid "NNTP Command failed: %s"
 msgstr "IMAP əmri iflas etdi: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:407
-#: camel/providers/nntp/camel-nntp-summary.c:508
+#: camel/providers/nntp/camel-nntp-summary.c:404
+#: camel/providers/nntp/camel-nntp-summary.c:505
 #, fuzzy, c-format
 msgid "%s: Scanning new messages"
 msgstr "Yeni ismarışlar daranır"
 
-#: camel/providers/nntp/camel-nntp-summary.c:523
+#: camel/providers/nntp/camel-nntp-summary.c:520
 #, fuzzy, c-format
 msgid "Unknown server response: %s"
 msgstr "Naməlum xəta: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:569
+#: camel/providers/nntp/camel-nntp-summary.c:566
 #, fuzzy
 msgid "Use cancel"
 msgstr "Ləğv Et"
 
-#: camel/providers/nntp/camel-nntp-summary.c:571
+#: camel/providers/nntp/camel-nntp-summary.c:568
 #, fuzzy, c-format
 msgid "Operation failed: %s"
 msgstr "Əməliyyat ləğv edildi"
@@ -10431,6 +10228,14 @@ msgstr "Əməliyyat ləğv edildi"
 msgid "Retrieving POP summary"
 msgstr "POP yığcamlaşdırılması alınır"
 
+#: camel/providers/pop3/camel-pop3-folder.c:262
+#: camel/providers/pop3/camel-pop3-folder.c:429
+#: camel/providers/pop3/camel-pop3-folder.c:490
+#: camel/providers/pop3/camel-pop3-folder.c:508
+#, fuzzy
+msgid "User cancelled"
+msgstr "Əməliyyat ləğv edildi"
+
 #: camel/providers/pop3/camel-pop3-folder.c:265
 #, fuzzy, c-format
 msgid "Cannot get POP summary: %s"
@@ -10440,23 +10245,37 @@ msgstr "Qovluq alına bilmədi: %s: %s"
 msgid "Expunging deleted messages"
 msgstr "Silinmiş ismarışlar açılır"
 
-#: camel/providers/pop3/camel-pop3-folder.c:404
+#: camel/providers/pop3/camel-pop3-folder.c:403
 #, c-format
 msgid "No message with uid %s"
 msgstr "%s uid'li ismarış yoxdur"
 
 #. Sigh, most of the crap in this function is so that the cancel button
 #. returns the proper exception code.  Sigh.
-#: camel/providers/pop3/camel-pop3-folder.c:411
+#: camel/providers/pop3/camel-pop3-folder.c:410
 #, c-format
 msgid "Retrieving POP message %d"
 msgstr "%d POP ismarışı alınır"
 
-#: camel/providers/pop3/camel-pop3-folder.c:501
+#: camel/providers/pop3/camel-pop3-folder.c:432
+#: camel/providers/pop3/camel-pop3-folder.c:493
+#: camel/providers/pop3/camel-pop3-folder.c:500
+#: camel/providers/pop3/camel-pop3-folder.c:511
+#, fuzzy, c-format
+msgid "Cannot get message %s: %s"
+msgstr ""
+"İSmarıc alına bilmir: %s\n"
+"   %s"
+
+#: camel/providers/pop3/camel-pop3-folder.c:500
 #, fuzzy
 msgid "Unknown reason"
 msgstr "Naməlum yağmur"
 
+#: camel/providers/pop3/camel-pop3-provider.c:38
+msgid "Message storage"
+msgstr "İsmarış saxlanması"
+
 #: camel/providers/pop3/camel-pop3-provider.c:40
 msgid "Leave messages on server"
 msgstr "İsmarışları Vericidə burax"
@@ -10627,145 +10446,145 @@ msgstr ""
 "SMTP istifadə edilərək uzaq məktub yayıcısına bağlanaraq məktub göndərmək "
 "üçün.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:174
+#: camel/providers/smtp/camel-smtp-transport.c:175
 msgid "Syntax error, command unrecognized"
 msgstr "Sintaksis xətası, əmr tanınmır"
 
-#: camel/providers/smtp/camel-smtp-transport.c:176
+#: camel/providers/smtp/camel-smtp-transport.c:177
 msgid "Syntax error in parameters or arguments"
 msgstr "Parametr və ya arqumentlərdə sintaksis xətası"
 
-#: camel/providers/smtp/camel-smtp-transport.c:178
+#: camel/providers/smtp/camel-smtp-transport.c:179
 msgid "Command not implemented"
 msgstr "Əmr qəbul edilmədi"
 
-#: camel/providers/smtp/camel-smtp-transport.c:180
+#: camel/providers/smtp/camel-smtp-transport.c:181
 msgid "Command parameter not implemented"
 msgstr "Əmr parametri qəbul edilmədi"
 
-#: camel/providers/smtp/camel-smtp-transport.c:182
+#: camel/providers/smtp/camel-smtp-transport.c:183
 msgid "System status, or system help reply"
 msgstr "Sistem vəziyyəti və ya kömək cavabı"
 
-#: camel/providers/smtp/camel-smtp-transport.c:184
+#: camel/providers/smtp/camel-smtp-transport.c:185
 msgid "Help message"
 msgstr "Kömək İsmarışı"
 
-#: camel/providers/smtp/camel-smtp-transport.c:186
+#: camel/providers/smtp/camel-smtp-transport.c:187
 msgid "Service ready"
 msgstr "Xidmət hazırdır"
 
-#: camel/providers/smtp/camel-smtp-transport.c:188
+#: camel/providers/smtp/camel-smtp-transport.c:189
 msgid "Service closing transmission channel"
 msgstr "Xidmət nəqliyyat kanallarını bağlayır"
 
-#: camel/providers/smtp/camel-smtp-transport.c:190
+#: camel/providers/smtp/camel-smtp-transport.c:191
 msgid "Service not available, closing transmission channel"
 msgstr "Xidmət uyğun deyildir, nəqliyyat kanalları bağlanır"
 
-#: camel/providers/smtp/camel-smtp-transport.c:192
+#: camel/providers/smtp/camel-smtp-transport.c:193
 msgid "Requested mail action okay, completed"
 msgstr "Sorğulanan məktub gedişi müvəffəqiyyətlidir, qurtardı"
 
-#: camel/providers/smtp/camel-smtp-transport.c:194
+#: camel/providers/smtp/camel-smtp-transport.c:195
 msgid "User not local; will forward to <forward-path>"
 msgstr "İstifadəçi yerli deyil; <çatdırma cığırı>na çatdırıram"
 
-#: camel/providers/smtp/camel-smtp-transport.c:196
+#: camel/providers/smtp/camel-smtp-transport.c:197
 msgid "Requested mail action not taken: mailbox unavailable"
 msgstr "Sorğulanan məktub gedişi alınmadı; məktub qutusu əl çatmazdır"
 
-#: camel/providers/smtp/camel-smtp-transport.c:198
+#: camel/providers/smtp/camel-smtp-transport.c:199
 msgid "Requested action not taken: mailbox unavailable"
 msgstr "Sorğulanan gediş alınmadı; məktub qutusu əl çatmazdır"
 
-#: camel/providers/smtp/camel-smtp-transport.c:200
+#: camel/providers/smtp/camel-smtp-transport.c:201
 msgid "Requested action aborted: error in processing"
 msgstr "Sorğulanan gediş ləğv edildi; xəta oldu"
 
-#: camel/providers/smtp/camel-smtp-transport.c:202
+#: camel/providers/smtp/camel-smtp-transport.c:203
 msgid "User not local; please try <forward-path>"
 msgstr "İstifadəçi yerli deyil; lütfən <çatdırma cığırı>nı sınayın"
 
-#: camel/providers/smtp/camel-smtp-transport.c:204
+#: camel/providers/smtp/camel-smtp-transport.c:205
 msgid "Requested action not taken: insufficient system storage"
 msgstr "Sorğulanan gediş alınmadı; uyğunsuz sistem daxılı"
 
-#: camel/providers/smtp/camel-smtp-transport.c:206
+#: camel/providers/smtp/camel-smtp-transport.c:207
 msgid "Requested mail action aborted: exceeded storage allocation"
 msgstr "Sorğulanan məktub gediş ləğv edildi; daxıl dolmuşdur"
 
-#: camel/providers/smtp/camel-smtp-transport.c:208
+#: camel/providers/smtp/camel-smtp-transport.c:209
 msgid "Requested action not taken: mailbox name not allowed"
 msgstr "Sorğulanan gediş alınmadı; məktub qutusu adı qəbul edilmədi"
 
-#: camel/providers/smtp/camel-smtp-transport.c:210
+#: camel/providers/smtp/camel-smtp-transport.c:211
 msgid "Start mail input; end with <CRLF>.<CRLF>"
 msgstr "Məktub alımı başladı; <CRLF>.<CRLF> ilə sonlandırın"
 
-#: camel/providers/smtp/camel-smtp-transport.c:212
+#: camel/providers/smtp/camel-smtp-transport.c:213
 msgid "Transaction failed"
 msgstr "Nəqliyyat bacarılmadı"
 
-#: camel/providers/smtp/camel-smtp-transport.c:216
+#: camel/providers/smtp/camel-smtp-transport.c:217
 msgid "A password transition is needed"
 msgstr "Parol nəqli lazımdır"
 
-#: camel/providers/smtp/camel-smtp-transport.c:218
+#: camel/providers/smtp/camel-smtp-transport.c:219
 msgid "Authentication mechanism is too weak"
 msgstr "Tanıtma mexanizması çox zəifdir"
 
-#: camel/providers/smtp/camel-smtp-transport.c:220
+#: camel/providers/smtp/camel-smtp-transport.c:221
 msgid "Encryption required for requested authentication mechanism"
 msgstr "Sorğulanan tanıtma mexanizması üçün kriptləmək lazımdır"
 
-#: camel/providers/smtp/camel-smtp-transport.c:222
+#: camel/providers/smtp/camel-smtp-transport.c:223
 msgid "Temporary authentication failure"
 msgstr "Müvəqqəti tanıtma iflası"
 
-#: camel/providers/smtp/camel-smtp-transport.c:224
+#: camel/providers/smtp/camel-smtp-transport.c:225
 msgid "Authentication required"
 msgstr "Tanıtma lazımdır"
 
-#: camel/providers/smtp/camel-smtp-transport.c:298
+#: camel/providers/smtp/camel-smtp-transport.c:299
 #, fuzzy
 msgid "Welcome response error"
 msgstr "RSET cavablama xətası: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:342
-#: camel/providers/smtp/camel-smtp-transport.c:381
+#: camel/providers/smtp/camel-smtp-transport.c:343
+#: camel/providers/smtp/camel-smtp-transport.c:382
 #, fuzzy, c-format
 msgid "Failed to connect to SMTP server %s in secure mode: %s"
 msgstr ""
 "POP vericisinə bağlana bilmədim.\n"
 "İstifadəçi adı göndərilmə xətası oldu: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:343
+#: camel/providers/smtp/camel-smtp-transport.c:344
 #, fuzzy
 msgid "server does not appear to support SSL"
 msgstr "Bu ismarış düzgün qurulmuşa oxşamır"
 
-#: camel/providers/smtp/camel-smtp-transport.c:357
+#: camel/providers/smtp/camel-smtp-transport.c:358
 #, fuzzy, c-format
 msgid "STARTTLS request timed out: %s"
 msgstr "AUTH istək vaxt dolması. %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:372
+#: camel/providers/smtp/camel-smtp-transport.c:373
 #, fuzzy
 msgid "STARTTLS response error"
 msgstr "RSET cavablama xətası: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:475
+#: camel/providers/smtp/camel-smtp-transport.c:476
 #, fuzzy, c-format
 msgid "SMTP server %s does not support requested authentication type %s."
 msgstr "%s SMTP vericisi %s tanıtma növünü dəstəkləmir"
 
-#: camel/providers/smtp/camel-smtp-transport.c:513
+#: camel/providers/smtp/camel-smtp-transport.c:514
 #, c-format
 msgid "%sPlease enter the SMTP password for %s@%s"
 msgstr "%sLütfən %s@%s üçün SMTP parolunu girin"
 
-#: camel/providers/smtp/camel-smtp-transport.c:532
+#: camel/providers/smtp/camel-smtp-transport.c:533
 #, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -10776,90 +10595,90 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:665
+#: camel/providers/smtp/camel-smtp-transport.c:666
 #, c-format
 msgid "SMTP server %s"
 msgstr "%s SMTP vericisi"
 
-#: camel/providers/smtp/camel-smtp-transport.c:667
+#: camel/providers/smtp/camel-smtp-transport.c:668
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "%s dan(dən) SMTP məktub göndərilməsi"
 
-#: camel/providers/smtp/camel-smtp-transport.c:685
+#: camel/providers/smtp/camel-smtp-transport.c:686
 msgid "Cannot send message: sender address not valid."
 msgstr "İsmarış göndrərilə bilmədi: göndərənin ünvanı hökmsüzdür."
 
-#: camel/providers/smtp/camel-smtp-transport.c:690 mail/mail-ops.c:631
+#: camel/providers/smtp/camel-smtp-transport.c:691 mail/mail-ops.c:613
 msgid "Sending message"
 msgstr "İsmarış göndərilir"
 
-#: camel/providers/smtp/camel-smtp-transport.c:705
+#: camel/providers/smtp/camel-smtp-transport.c:706
 msgid "Cannot send message: no recipients defined."
 msgstr "İsmarış göndrərilə bilmədi: alıcı bildirilməyib."
 
-#: camel/providers/smtp/camel-smtp-transport.c:714
+#: camel/providers/smtp/camel-smtp-transport.c:715
 #, fuzzy
 msgid "Cannot send message: one or more invalid recipients"
 msgstr "İsmarış göndrərilə bilmədi: alıcı bildirilməyib."
 
-#: camel/providers/smtp/camel-smtp-transport.c:879
+#: camel/providers/smtp/camel-smtp-transport.c:880
 msgid "SMTP Greeting"
 msgstr "SMTP Qarşılaması"
 
-#: camel/providers/smtp/camel-smtp-transport.c:928
+#: camel/providers/smtp/camel-smtp-transport.c:927
 #, fuzzy, c-format
 msgid "HELO request timed out: %s"
 msgstr "RSET istək vaxt dolması. %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:950
+#: camel/providers/smtp/camel-smtp-transport.c:949
 #, fuzzy
 msgid "HELO response error"
 msgstr "RSET cavablama xətası: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1016
+#: camel/providers/smtp/camel-smtp-transport.c:1015
 msgid "SMTP Authentication"
 msgstr "SMTP Tanıtma"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1022
+#: camel/providers/smtp/camel-smtp-transport.c:1021
 msgid "Error creating SASL authentication object."
 msgstr "SASL tanıtma cismi yaratma xətası."
 
-#: camel/providers/smtp/camel-smtp-transport.c:1039
-#: camel/providers/smtp/camel-smtp-transport.c:1051
+#: camel/providers/smtp/camel-smtp-transport.c:1038
+#: camel/providers/smtp/camel-smtp-transport.c:1050
 #, c-format
 msgid "AUTH request timed out: %s"
 msgstr "AUTH istək vaxt dolması. %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1060
+#: camel/providers/smtp/camel-smtp-transport.c:1059
 msgid "AUTH request failed."
 msgstr "AUTH istək bacarılmadı."
 
-#: camel/providers/smtp/camel-smtp-transport.c:1121
+#: camel/providers/smtp/camel-smtp-transport.c:1120
 msgid "Bad authentication response from server.\n"
 msgstr "Vericidən xətalı tanıtma istəyi alındı.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1146
+#: camel/providers/smtp/camel-smtp-transport.c:1145
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
 msgstr "MAİL FROM istək vaxt dolması: %s: məktub göndərilə bilmədi"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1166
+#: camel/providers/smtp/camel-smtp-transport.c:1165
 #, fuzzy
 msgid "MAIL FROM response error"
 msgstr "MAİL FROM cavablama xətası: %s: məktub göndərilə bilmədi"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1190
+#: camel/providers/smtp/camel-smtp-transport.c:1189
 #, c-format
 msgid "RCPT TO request timed out: %s: mail not sent"
 msgstr "RCTP TO istək vaxt dolması: %s: məktub göndərilə bilmədi"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1212
+#: camel/providers/smtp/camel-smtp-transport.c:1211
 #, c-format
 msgid "RCPT TO <%s> failed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1251
+#: camel/providers/smtp/camel-smtp-transport.c:1250
 #, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr "DATA istək vaxt dolamsı. %s: məktub göndərilə bilmədi"
@@ -10867,71 +10686,72 @@ msgstr "DATA istək vaxt dolamsı. %s: məktub göndərilə bilmədi"
 #. we should have gotten instructions on how to use the DATA command:
 #. * 354 Enter mail, end with "." on a line by itself
 #.
-#: camel/providers/smtp/camel-smtp-transport.c:1271
+#: camel/providers/smtp/camel-smtp-transport.c:1270
 #, fuzzy
 msgid "DATA response error"
 msgstr "RSET cavablama xətası: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1312
-#: camel/providers/smtp/camel-smtp-transport.c:1335
+#: camel/providers/smtp/camel-smtp-transport.c:1311
+#: camel/providers/smtp/camel-smtp-transport.c:1334
 #, c-format
 msgid "DATA send timed out: message termination: %s: mail not sent"
 msgstr ""
 "DATA göndərmə vaxt dolması: ismarış qurtarılır: %s: məktub göndərilə bilmədi"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1355
+#: camel/providers/smtp/camel-smtp-transport.c:1354
 #, fuzzy
 msgid "DATA termination response error"
 msgstr "Vericidən xətalı tanıtma istəyi alındı."
 
-#: camel/providers/smtp/camel-smtp-transport.c:1378
+#: camel/providers/smtp/camel-smtp-transport.c:1377
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr "RSET istək vaxt dolması. %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1398
+#: camel/providers/smtp/camel-smtp-transport.c:1397
 #, fuzzy
 msgid "RSET response error"
 msgstr "RSET cavablama xətası: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1421
+#: camel/providers/smtp/camel-smtp-transport.c:1420
 #, fuzzy, c-format
 msgid "QUIT request timed out: %s"
 msgstr "AUTH istək vaxt dolması. %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1441
+#: camel/providers/smtp/camel-smtp-transport.c:1440
 #, fuzzy
 msgid "QUIT response error"
 msgstr "RSET cavablama xətası: %s"
 
-#: composer/e-msg-composer-attachment-bar.c:103
+#: composer/e-msg-composer-attachment-bar.c:102
 #, fuzzy, c-format
 msgid "%.0fK"
 msgstr "%.1fK"
 
-#: composer/e-msg-composer-attachment-bar.c:106
+#: composer/e-msg-composer-attachment-bar.c:105
 #, fuzzy, c-format
 msgid "%.0fM"
 msgstr "%.1fM"
 
-#: composer/e-msg-composer-attachment-bar.c:109
+#: composer/e-msg-composer-attachment-bar.c:108
 #, fuzzy, c-format
 msgid "%.0fG"
 msgstr "%.1fG"
 
-#: composer/e-msg-composer-attachment-bar.c:300
+#. This is a filename. Translators take note.
+#: composer/e-msg-composer-attachment-bar.c:370 mail/mail-display.c:227
 msgid "attachment"
 msgstr "yapışdırılmış fayl"
 
-#: composer/e-msg-composer-attachment-bar.c:445
+#: composer/e-msg-composer-attachment-bar.c:508
 msgid "Remove selected items from the attachment list"
 msgstr "Seçili üzvləri yapışdırılmış fayllar siyahısından sil"
 
-#: composer/e-msg-composer-attachment-bar.c:475
+#: composer/e-msg-composer-attachment-bar.c:538
 msgid "Add attachment..."
 msgstr "Yapışdırılmış fayl əlavə et ..."
 
-#: composer/e-msg-composer-attachment-bar.c:476
+#: composer/e-msg-composer-attachment-bar.c:539
 msgid "Attach a file to the message"
 msgstr "İsmarışa bir fayl əlavə et"
 
@@ -10964,12 +10784,92 @@ msgstr "MIME növü:"
 msgid "Suggest automatic display of attachment"
 msgstr "İlişdirilmişin öz-özünə göstərilməyini tövsiyyə et"
 
-#: composer/e-msg-composer.c:562
+#: composer/e-msg-composer-hdrs.c:290
+msgid "Hey you, dunce. You need an account to send mail doncha know."
+msgstr ""
+
+#: composer/e-msg-composer-hdrs.c:483
+msgid "Click here for the address book"
+msgstr "Ünvan dəftəri üçün buraya tıqla"
+
+#.
+#. * Reply-To:
+#. *
+#. * Create this before we call create_from_optionmenu,
+#. * because that causes from_changed to be called, which
+#. * expects the reply_to fields to be initialized.
+#.
+#: composer/e-msg-composer-hdrs.c:514
+msgid "Reply-To:"
+msgstr "Cavab ver"
+
+#.
+#. * From
+#.
+#: composer/e-msg-composer-hdrs.c:520
+msgid "From:"
+msgstr "Göndərən:"
+
+#.
+#. * Subject
+#.
+#: composer/e-msg-composer-hdrs.c:526
+msgid "Subject:"
+msgstr "Mövzu :"
+
+#: composer/e-msg-composer-hdrs.c:535
+msgid "To:"
+msgstr "Gn:"
+
+#: composer/e-msg-composer-hdrs.c:536
+msgid "Enter the recipients of the message"
+msgstr "İsmarışın göndərildiği adamlar"
+
+#: composer/e-msg-composer-hdrs.c:539
+msgid "Cc:"
+msgstr "Cc:"
+
+#: composer/e-msg-composer-hdrs.c:540
+msgid "Enter the addresses that will receive a carbon copy of the message"
+msgstr "İsmarışın nüsxəsinin göndəriləcəyi ünvanlar"
+
+#: composer/e-msg-composer-hdrs.c:543
+msgid "Bcc:"
+msgstr "Bcc:"
+
+#: composer/e-msg-composer-hdrs.c:544
+msgid ""
+"Enter the addresses that will receive a carbon copy of the message without "
+"appearing in the recipient list of the message."
+msgstr ""
+"İsmarışın nüsxələrinin göndəriləcəyi ünvanları bildir; bunlar özlərini "
+"ismarışın göndərildiği adamlar arasında görməyəcəkdir ."
+
+#.
+#. * Post-To
+#.
+#: composer/e-msg-composer-hdrs.c:551
+#, fuzzy
+msgid "Post To:"
+msgstr "_Qapı:"
+
+#: composer/e-msg-composer-hdrs.c:553
+#, fuzzy
+msgid "Posting destination"
+msgstr "izah"
+
+#: composer/e-msg-composer-select-file.c:102
+#: composer/e-msg-composer-select-file.c:119
+#, fuzzy
+msgid "Attach file(s)"
+msgstr "Bir fayl yapışdır"
+
+#: composer/e-msg-composer.c:535
 #, fuzzy
 msgid "Could not create a PGP signature context"
 msgstr "PGP imza məzmunu yaradıla bilmir."
 
-#: composer/e-msg-composer.c:841
+#: composer/e-msg-composer.c:814
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
@@ -10978,30 +10878,30 @@ msgstr ""
 "%s faylı oxunurkən xəta oldu:\n"
 "%s"
 
-#: composer/e-msg-composer.c:1206
+#: composer/e-msg-composer.c:1177
 msgid "File exists, overwrite?"
 msgstr "Fayl mövcuddur, üstünə yazaq?"
 
-#: composer/e-msg-composer.c:1217 composer/e-msg-composer.c:1233
+#: composer/e-msg-composer.c:1195
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Fayl qeyd edərkən xəta oldu: %s"
 
-#: composer/e-msg-composer.c:1256
+#: composer/e-msg-composer.c:1218
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Fayl yüklərkən xəta oldu: %s"
 
-#: composer/e-msg-composer.c:1294
+#: composer/e-msg-composer.c:1256
 #, c-format
 msgid "Error accessing file: %s"
 msgstr "Fayla yetişilirkən xəta oldu: %s"
 
-#: composer/e-msg-composer.c:1302
+#: composer/e-msg-composer.c:1264
 msgid "Unable to retrieve message from editor"
 msgstr "Editordan ismarışlar alına bilmir"
 
-#: composer/e-msg-composer.c:1309
+#: composer/e-msg-composer.c:1271
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -11010,7 +10910,7 @@ msgstr ""
 "Faylda axtarış aparıla bilmir: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1316
+#: composer/e-msg-composer.c:1278
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -11019,7 +10919,7 @@ msgstr ""
 "Fayl parçalana bilmir: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1325
+#: composer/e-msg-composer.c:1287
 #, fuzzy, c-format
 msgid ""
 "Unable to copy file descriptor: %s\n"
@@ -11028,7 +10928,7 @@ msgstr ""
 "Faylda axtarış aparıla bilmir: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1334
+#: composer/e-msg-composer.c:1296
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -11037,7 +10937,7 @@ msgstr ""
 "İsmarışın öz-özünə qeyd edilmə xatası: %s:\n"
 " %s"
 
-#: composer/e-msg-composer.c:1431
+#: composer/e-msg-composer.c:1390
 msgid ""
 "Ximian Evolution has found unsaved files from a previous session.\n"
 "Would you like to try to recover them?"
@@ -11045,7 +10945,7 @@ msgstr ""
 "Ximian Evolution əvvəlki iclasdan qalan qeyd edilməmiş fayllar tapdı.\n"
 "Onları indi bərpa etməyə cəhd etməyimi istəyirsiniz?"
 
-#: composer/e-msg-composer.c:1594
+#: composer/e-msg-composer.c:1552
 #, fuzzy, c-format
 msgid ""
 "The message \"%s\" has not been sent.\n"
@@ -11056,29 +10956,29 @@ msgstr ""
 "\n"
 "Dəyişiklikləri qeyd etmak istəyirsiniz?"
 
-#: composer/e-msg-composer.c:1603
+#: composer/e-msg-composer.c:1561
 msgid "Warning: Modified Message"
 msgstr "Xəbərdarlıq: Düzəldilmiş İsmarış"
 
-#: composer/e-msg-composer.c:1635
+#: composer/e-msg-composer.c:1593
 msgid "Open file"
 msgstr "Faylı aç"
 
-#: composer/e-msg-composer.c:2054
+#: composer/e-msg-composer.c:2017
 #, fuzzy
 msgid "Signature:"
 msgstr "Imzanı qeyd et"
 
-#: composer/e-msg-composer.c:2094 mail/mail-account-gui.c:1261
+#: composer/e-msg-composer.c:2057 mail/mail-account-gui.c:1261
 msgid "Autogenerated"
 msgstr ""
 
-#: composer/e-msg-composer.c:2274 composer/e-msg-composer.c:2970
-#: composer/e-msg-composer.c:2971
+#: composer/e-msg-composer.c:2233 composer/e-msg-composer.c:2902
+#: composer/e-msg-composer.c:2903
 msgid "Compose a message"
 msgstr "Bir ismarış yaz"
 
-#: composer/e-msg-composer.c:3002
+#: composer/e-msg-composer.c:2934
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
@@ -11086,7 +10986,7 @@ msgstr ""
 "Yazıçı pəncərəsi yaradıla bilmir:\n"
 "Ünvan seçici idarə fəaliyyətə keçirilə bilmir."
 
-#: composer/e-msg-composer.c:3030
+#: composer/e-msg-composer.c:2962
 #, fuzzy
 msgid ""
 "Could not create composer window:\n"
@@ -11097,7 +10997,7 @@ msgstr ""
 "Yazıçı pəncərəsi yaradıla bilmir:\n"
 "HTML editor parçası fəaliyyətə keçirilə bilmir."
 
-#: composer/e-msg-composer.c:3100
+#: composer/e-msg-composer.c:3029
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component."
@@ -11105,94 +11005,12 @@ msgstr ""
 "Yazıçı pəncərəsi yaradıla bilmir:\n"
 "HTML editor parçası fəaliyyətə keçirilə bilmir."
 
-#: composer/e-msg-composer.c:4110
+#: composer/e-msg-composer.c:4045
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)"
 "<b>"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:290
-#, fuzzy
-msgid "You need to configure an account before you can compose mail."
-msgstr ""
-"ePoçt göndərməkdən əvvəl bir \n"
-"şəxs tanıtmalısan."
-
-#: composer/e-msg-composer-hdrs.c:483
-msgid "Click here for the address book"
-msgstr "Ünvan dəftəri üçün buraya tıqla"
-
-#.
-#. * Reply-To:
-#. *
-#. * Create this before we call create_from_optionmenu,
-#. * because that causes from_changed to be called, which
-#. * expects the reply_to fields to be initialized.
-#.
-#: composer/e-msg-composer-hdrs.c:514
-msgid "Reply-To:"
-msgstr "Cavab ver"
-
-#.
-#. * From
-#.
-#: composer/e-msg-composer-hdrs.c:520
-msgid "From:"
-msgstr "Göndərən:"
-
-#.
-#. * Subject
-#.
-#: composer/e-msg-composer-hdrs.c:526
-msgid "Subject:"
-msgstr "Mövzu :"
-
-#: composer/e-msg-composer-hdrs.c:535
-msgid "To:"
-msgstr "Gn:"
-
-#: composer/e-msg-composer-hdrs.c:536
-msgid "Enter the recipients of the message"
-msgstr "İsmarışın göndərildiği adamlar"
-
-#: composer/e-msg-composer-hdrs.c:539
-msgid "Cc:"
-msgstr "Cc:"
-
-#: composer/e-msg-composer-hdrs.c:540
-msgid "Enter the addresses that will receive a carbon copy of the message"
-msgstr "İsmarışın nüsxəsinin göndəriləcəyi ünvanlar"
-
-#: composer/e-msg-composer-hdrs.c:543
-msgid "Bcc:"
-msgstr "Bcc:"
-
-#: composer/e-msg-composer-hdrs.c:544
-msgid ""
-"Enter the addresses that will receive a carbon copy of the message without "
-"appearing in the recipient list of the message."
-msgstr ""
-"İsmarışın nüsxələrinin göndəriləcəyi ünvanları bildir; bunlar özlərini "
-"ismarışın göndərildiği adamlar arasında görməyəcəkdir ."
-
-#.
-#. * Post-To
-#.
-#: composer/e-msg-composer-hdrs.c:551
-#, fuzzy
-msgid "Post To:"
-msgstr "_Qapı:"
-
-#: composer/e-msg-composer-hdrs.c:553
-#, fuzzy
-msgid "Posting destination"
-msgstr "izah"
-
-#: composer/e-msg-composer-select-file.c:119
-#, fuzzy
-msgid "Attach file(s)"
-msgstr "Bir fayl yapışdır"
-
 #: data/evolution.desktop.in.h:1
 msgid "The Evolution groupware suite"
 msgstr "Evolution qruplaşdırılmış proqram təminatı otağı"
@@ -11357,7 +11175,7 @@ msgstr ""
 "Eyni adlı bir fayl onsuz da vardır.\n"
 "Üstünə yazım mı?"
 
-#: e-util/e-dialog-utils.c:249
+#: e-util/e-dialog-utils.c:249 mail/mail-display.c:200
 msgid "Overwrite file?"
 msgstr "Faylının üsütünə yazım mı?"
 
@@ -11380,210 +11198,90 @@ msgstr "Kateqoriyalar"
 
 #. strptime format of a weekday, a date and a time,
 #. in 12-hour format, without seconds.
-#: e-util/e-time-utils.c:185 e-util/e-time-utils.c:398
+#: e-util/e-time-utils.c:172 e-util/e-time-utils.c:385
 msgid "%a %m/%d/%Y %I:%M %p"
 msgstr "%a %m/%d/%Y %I:%M %p"
 
 #. strptime format of a weekday, a date and a time,
 #. in 24-hour format, without seconds.
-#: e-util/e-time-utils.c:190 e-util/e-time-utils.c:389
+#: e-util/e-time-utils.c:177 e-util/e-time-utils.c:376
 msgid "%a %m/%d/%Y %H:%M"
 msgstr "%a %m/%d/%Y %H:%M"
 
 #. strptime format of a weekday, a date and a time,
 #. in 12-hour format, without minutes or seconds.
-#: e-util/e-time-utils.c:195
+#: e-util/e-time-utils.c:182
 msgid "%a %m/%d/%Y %I %p"
 msgstr "%a %m/%d/%Y %I %p"
 
 #. strptime format of a weekday, a date and a time,
 #. in 24-hour format, without minutes or seconds.
-#: e-util/e-time-utils.c:200
+#: e-util/e-time-utils.c:187
 msgid "%a %m/%d/%Y %H"
 msgstr "%a %m/%d/%Y %H"
 
 #. strptime format of a date and a time, in 12-hour format.
-#: e-util/e-time-utils.c:211
+#: e-util/e-time-utils.c:198
 msgid "%m/%d/%Y %I:%M:%S %p"
 msgstr "%m/%d/%Y %I:%M:%S %p"
 
 #. strptime format of a date and a time, in 24-hour format.
-#: e-util/e-time-utils.c:215
+#: e-util/e-time-utils.c:202
 msgid "%m/%d/%Y %H:%M:%S"
 msgstr "%m/%d/%Y %H:%M:%S"
 
 #. strptime format of a date and a time, in 12-hour format,
 #. without seconds.
-#: e-util/e-time-utils.c:220
+#: e-util/e-time-utils.c:207
 msgid "%m/%d/%Y %I:%M %p"
 msgstr "%m/%d/%Y %I:%M %p"
 
 #. strptime format of a date and a time, in 24-hour format,
 #. without seconds.
-#: e-util/e-time-utils.c:225
+#: e-util/e-time-utils.c:212
 msgid "%m/%d/%Y %H:%M"
 msgstr "%m/%d/%Y %H:%M"
 
 #. strptime format of a date and a time, in 12-hour format,
 #. without minutes or seconds.
-#: e-util/e-time-utils.c:230
+#: e-util/e-time-utils.c:217
 msgid "%m/%d/%Y %I %p"
 msgstr "%m/%d/%Y %I %p"
 
 #. strptime format of a date and a time, in 24-hour format,
 #. without minutes or seconds.
-#: e-util/e-time-utils.c:235
+#: e-util/e-time-utils.c:222
 msgid "%m/%d/%Y %H"
 msgstr "%m/%d/%Y %H"
 
 #. strptime format for a time of day, in 12-hour format.
-#: e-util/e-time-utils.c:339 e-util/e-time-utils.c:438
+#: e-util/e-time-utils.c:326 e-util/e-time-utils.c:425
 msgid "%I:%M:%S %p"
 msgstr "%I:%M:%S %p"
 
 #. strptime format for a time of day, in 24-hour format.
-#: e-util/e-time-utils.c:343 e-util/e-time-utils.c:430
+#: e-util/e-time-utils.c:330 e-util/e-time-utils.c:417
 msgid "%H:%M:%S"
 msgstr "%H:%M:%S"
 
 #. strptime format for time of day, without seconds,
 #. in 12-hour format.
-#: e-util/e-time-utils.c:348 e-util/e-time-utils.c:435
-#: widgets/misc/e-dateedit.c:1417 widgets/misc/e-dateedit.c:1642
+#: e-util/e-time-utils.c:335 e-util/e-time-utils.c:422
+#: widgets/misc/e-dateedit.c:1404 widgets/misc/e-dateedit.c:1617
 msgid "%I:%M %p"
 msgstr "%I:%M %p"
 
 #. strptime format for time of day, without seconds 24-hour format.
-#: e-util/e-time-utils.c:352 e-util/e-time-utils.c:427
-#: widgets/misc/e-dateedit.c:1414 widgets/misc/e-dateedit.c:1639
+#: e-util/e-time-utils.c:339 e-util/e-time-utils.c:414
+#: widgets/misc/e-dateedit.c:1401 widgets/misc/e-dateedit.c:1614
 msgid "%H:%M"
 msgstr "%H:%M"
 
 #. strptime format for hour and AM/PM, 12-hour format.
-#: e-util/e-time-utils.c:356
+#: e-util/e-time-utils.c:343
 msgid "%I %p"
 msgstr "%I %p"
 
-#: executive-summary/component/component-factory.c:151
-#, fuzzy
-msgid "Cannot initialize Evolution's Executive Summary component."
-msgstr "Evolution İcmal qismi hazırlana bilmir."
-
-#: executive-summary/component/e-summary.c:925
-#, fuzzy, c-format
-msgid ""
-"Cannot open the HTML file:\n"
-"%s"
-msgstr ""
-"Qovluaq adı dəyişdirilə bilmir:\n"
-"%s"
-
-#: executive-summary/component/e-summary.c:939
-#, fuzzy, c-format
-msgid ""
-"Error reading data:\n"
-"%s"
-msgstr "%s yüklənərkən xəta oldu"
-
-#: executive-summary/component/e-summary.c:957
-msgid "File does not have a place for the services.\n"
-msgstr ""
-
-#: executive-summary/component/e-summary-callbacks.c:125
-#, fuzzy
-msgid "Select a service"
-msgstr "Fayl seç"
-
-#: executive-summary/component/e-summary-callbacks.c:289
-msgid ""
-"You can select a different HTML page for the background of the Executive "
-"Summary.\n"
-"\n"
-"Just leave it blank for the default"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:69
-#: executive-summary/component/e-summary-url.c:74
-#: executive-summary/component/e-summary-url.c:81
-#, c-format
-msgid "Open %s with the default GNOME application"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:70
-#, c-format
-msgid "Open %s with the default GNOME web browser"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:71
-#, fuzzy, c-format
-msgid "Send an email to %s"
-msgstr "ePoçt göndər"
-
-#: executive-summary/component/e-summary-url.c:72
-#, fuzzy, c-format
-msgid "Change the view to %s"
-msgstr "Bu qovluğun adını dəyişdir"
-
-#: executive-summary/component/e-summary-url.c:73
-#, fuzzy, c-format
-msgid "Run %s"
-msgstr "URL: %s"
-
-#: executive-summary/component/e-summary-url.c:75
-#, fuzzy, c-format
-msgid "Close %s"
-msgstr "Qapat"
-
-#: executive-summary/component/e-summary-url.c:76
-#, fuzzy, c-format
-msgid "Move %s to the left"
-msgstr "Bu qovluğu başqa yerə daşı"
-
-#: executive-summary/component/e-summary-url.c:77
-#, c-format
-msgid "Move %s to the right"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:78
-#, c-format
-msgid "Move %s into the previous row"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:79
-#, c-format
-msgid "Move %s into the next row"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:80
-#, fuzzy, c-format
-msgid "Configure %s"
-msgstr "%s i(ı) Yenidən Quraşdır"
-
-#: executive-summary/component/e-summary-url.c:553
-#, fuzzy
-msgid "page"
-msgstr "Səhifə"
-
-#: executive-summary/test-service/rdf-summary.c:512
-#: executive-summary/test-service/rdf-summary.c:549
-#: executive-summary/test-service/rdf-summary.c:594
-msgid "Error"
-msgstr "Xəta"
-
-#: executive-summary/test-service/rdf-summary.c:775
-msgid "Update automatically"
-msgstr ""
-
-#: executive-summary/test-service/rdf-summary.c:785
-#, fuzzy
-msgid "Update now"
-msgstr "Güncəllə"
-
-#: executive-summary/test-service/rdf-summary.c:795
-#, fuzzy
-msgid "Update every "
-msgstr "Sərbəst/Məşğulları _Təzələ"
-
 #: filter/filter-datespec.c:65
 #, fuzzy
 msgid "1 second ago"
@@ -11710,6 +11408,88 @@ msgstr "Tərz adı :"
 msgid "Select Folder"
 msgstr "Qovluq Seçin"
 
+#: filter/filter-input.c:191
+#, c-format
+msgid ""
+"Error in regular expression '%s':\n"
+"%s"
+msgstr ""
+"'%s' qaydalı ifadələrdə xəta oldu:\n"
+"%s"
+
+#: filter/filter-label.c:121 filter/libfilter-i18n.h:26 mail/mail-config.c:65
+#: mail/mail-config.glade.h:62 shell/e-config-upgrade.c:1411
+msgid "Important"
+msgstr "Vacib"
+
+#. red
+#: filter/filter-label.c:122 mail/mail-config.c:66
+#: mail/mail-config.glade.h:129 shell/e-config-upgrade.c:1412
+#, fuzzy
+msgid "Work"
+msgstr "İşləyir"
+
+#. orange
+#: filter/filter-label.c:123 mail/mail-config.c:67 mail/mail-config.glade.h:84
+#: shell/e-config-upgrade.c:1413
+msgid "Personal"
+msgstr ""
+
+#. forest green
+#: filter/filter-label.c:124 mail/mail-config.c:68
+#: mail/mail-config.glade.h:120 shell/e-config-upgrade.c:1414
+#, fuzzy
+msgid "To Do"
+msgstr "Toqo"
+
+#. blue
+#: filter/filter-label.c:125 mail/mail-config.c:69 mail/mail-config.glade.h:66
+#: shell/e-config-upgrade.c:1415
+#, fuzzy
+msgid "Later"
+msgstr "sonra"
+
+#: filter/filter-part.c:531 shell/evolution-test-component.c:63
+msgid "Test"
+msgstr "Sınaq"
+
+#: filter/filter-rule.c:219
+msgid "You must name this filter."
+msgstr "Bu süzgəcə ad verməlisiniz."
+
+#: filter/filter-rule.c:751
+msgid "Rule name: "
+msgstr "Qayda adı :"
+
+#: filter/filter-rule.c:755
+msgid "Untitled"
+msgstr "Adsız"
+
+#: filter/filter-rule.c:772
+msgid "If"
+msgstr "Əgər"
+
+#: filter/filter-rule.c:791
+msgid "Execute actions"
+msgstr "Gedişi işə sal"
+
+#: filter/filter-rule.c:795
+msgid "if all criteria are met"
+msgstr "bütün kriteriyalar uyğun gəlirsə"
+
+#: filter/filter-rule.c:800
+#, fuzzy
+msgid "if any criteria are met"
+msgstr "əgər hər hansı bir kriteriya uyğun gəlirsə"
+
+#: filter/filter-rule.c:895
+msgid "incoming"
+msgstr "gələn"
+
+#: filter/filter-rule.c:895
+msgid "outgoing"
+msgstr "gedən"
+
 #: filter/filter.glade.h:1
 msgid "Compare against"
 msgstr "Müqayisə et"
@@ -11815,88 +11595,6 @@ msgstr "bütün yerli qovluqlarla"
 msgid "years"
 msgstr "il"
 
-#: filter/filter-input.c:191
-#, c-format
-msgid ""
-"Error in regular expression '%s':\n"
-"%s"
-msgstr ""
-"'%s' qaydalı ifadələrdə xəta oldu:\n"
-"%s"
-
-#: filter/filter-label.c:121 filter/libfilter-i18n.h:17 mail/mail-config.c:65
-#: mail/mail-config.glade.h:62 shell/e-config-upgrade.c:1454
-msgid "Important"
-msgstr "Vacib"
-
-#. red
-#: filter/filter-label.c:122 mail/mail-config.c:66
-#: mail/mail-config.glade.h:129 shell/e-config-upgrade.c:1455
-#, fuzzy
-msgid "Work"
-msgstr "İşləyir"
-
-#. orange
-#: filter/filter-label.c:123 mail/mail-config.c:67 mail/mail-config.glade.h:84
-#: shell/e-config-upgrade.c:1456
-msgid "Personal"
-msgstr ""
-
-#. forest green
-#: filter/filter-label.c:124 mail/mail-config.c:68
-#: mail/mail-config.glade.h:120 shell/e-config-upgrade.c:1457
-#, fuzzy
-msgid "To Do"
-msgstr "Toqo"
-
-#. blue
-#: filter/filter-label.c:125 mail/mail-config.c:69 mail/mail-config.glade.h:66
-#: shell/e-config-upgrade.c:1458
-#, fuzzy
-msgid "Later"
-msgstr "sonra"
-
-#: filter/filter-part.c:531 shell/evolution-test-component.c:63
-msgid "Test"
-msgstr "Sınaq"
-
-#: filter/filter-rule.c:219
-msgid "You must name this filter."
-msgstr "Bu süzgəcə ad verməlisiniz."
-
-#: filter/filter-rule.c:751
-msgid "Rule name: "
-msgstr "Qayda adı :"
-
-#: filter/filter-rule.c:755
-msgid "Untitled"
-msgstr "Adsız"
-
-#: filter/filter-rule.c:772
-msgid "If"
-msgstr "Əgər"
-
-#: filter/filter-rule.c:791
-msgid "Execute actions"
-msgstr "Gedişi işə sal"
-
-#: filter/filter-rule.c:795
-msgid "if all criteria are met"
-msgstr "bütün kriteriyalar uyğun gəlirsə"
-
-#: filter/filter-rule.c:800
-#, fuzzy
-msgid "if any criteria are met"
-msgstr "əgər hər hansı bir kriteriya uyğun gəlirsə"
-
-#: filter/filter-rule.c:895
-msgid "incoming"
-msgstr "gələn"
-
-#: filter/filter-rule.c:895
-msgid "outgoing"
-msgstr "gedən"
-
 #. Automatically generated. Do not edit.
 #: filter/libfilter-i18n.h:2
 #, fuzzy
@@ -11921,229 +11619,229 @@ msgid "Beep"
 msgstr "Beliz"
 
 #: filter/libfilter-i18n.h:7
+msgid "contains"
+msgstr "daxil edir"
+
+#: filter/libfilter-i18n.h:8
 msgid "Copy to Folder"
 msgstr "Qovluğa Köçürt"
 
-#: filter/libfilter-i18n.h:8
+#: filter/libfilter-i18n.h:9
 msgid "Date received"
 msgstr "Alınma tarixi"
 
-#: filter/libfilter-i18n.h:9
+#: filter/libfilter-i18n.h:10
 msgid "Date sent"
 msgstr "Göndərilmə tarixi"
 
-#: filter/libfilter-i18n.h:11
+#: filter/libfilter-i18n.h:12
 msgid "Deleted"
 msgstr "Silinən"
 
-#: filter/libfilter-i18n.h:12
+#: filter/libfilter-i18n.h:13
+msgid "does not contain"
+msgstr "daxil etmir"
+
+#: filter/libfilter-i18n.h:14
+msgid "does not end with"
+msgstr "ilə sonlanmır"
+
+#: filter/libfilter-i18n.h:15
+msgid "does not exist"
+msgstr "yoxdur"
+
+#: filter/libfilter-i18n.h:16
+#, fuzzy
+msgid "does not return"
+msgstr "yoxdur"
+
+#: filter/libfilter-i18n.h:17
+msgid "does not sound like"
+msgstr "oxçamır"
+
+#: filter/libfilter-i18n.h:18
+msgid "does not start with"
+msgstr "başlamır"
+
+#: filter/libfilter-i18n.h:19
 msgid "Do Not Exist"
 msgstr "Mövcud Deyildir"
 
-#: filter/libfilter-i18n.h:13
+#: filter/libfilter-i18n.h:20
 msgid "Draft"
 msgstr "Lahiyə"
 
-#: filter/libfilter-i18n.h:14
+#: filter/libfilter-i18n.h:21
+msgid "ends with"
+msgstr "sonlanır"
+
+#: filter/libfilter-i18n.h:22
 msgid "Exist"
 msgstr "Mövcuddur"
 
-#: filter/libfilter-i18n.h:15
+#: filter/libfilter-i18n.h:23
+msgid "exists"
+msgstr "mövcuddur"
+
+#: filter/libfilter-i18n.h:24
 msgid "Expression"
 msgstr "İfadə"
 
-#: filter/libfilter-i18n.h:16
+#: filter/libfilter-i18n.h:25
 msgid "Follow Up"
 msgstr ""
 
-#: filter/libfilter-i18n.h:18
+#: filter/libfilter-i18n.h:27
+msgid "is"
+msgstr "dir(dır)"
+
+#: filter/libfilter-i18n.h:28
+#, fuzzy
+msgid "is after"
+msgstr "sonra idi"
+
+#: filter/libfilter-i18n.h:29
+#, fuzzy
+msgid "is before"
+msgstr "əvvəl idi"
+
+#: filter/libfilter-i18n.h:30
+#, fuzzy
+msgid "is Flagged"
+msgstr "Bayraqlı"
+
+#: filter/libfilter-i18n.h:31
+msgid "is greater than"
+msgstr "böyükdür"
+
+#: filter/libfilter-i18n.h:32
+msgid "is less than"
+msgstr "azdır"
+
+#: filter/libfilter-i18n.h:33
+msgid "is not"
+msgstr "deyil"
+
+#: filter/libfilter-i18n.h:34
+#, fuzzy
+msgid "is not Flagged"
+msgstr "Bayraqlı"
+
+#: filter/libfilter-i18n.h:35 mail/folder-browser.c:1800
 msgid "Label"
 msgstr ""
 
-#: filter/libfilter-i18n.h:19
+#: filter/libfilter-i18n.h:36
 msgid "Mailing list"
 msgstr "Məktublaşma qrupu"
 
-#: filter/libfilter-i18n.h:20
+#: filter/libfilter-i18n.h:37
 msgid "Message Body"
 msgstr "İsmarış Gövdəsi"
 
-#: filter/libfilter-i18n.h:21
+#: filter/libfilter-i18n.h:38
 msgid "Message Header"
 msgstr "İsmarış Başlığı"
 
-#: filter/libfilter-i18n.h:22
+#: filter/libfilter-i18n.h:39
 msgid "Move to Folder"
 msgstr "Qovluğa Köçür"
 
-#: filter/libfilter-i18n.h:23
+#: filter/libfilter-i18n.h:40
 #, fuzzy
 msgid "Pipe Message to Shell Command"
 msgstr "Əlaqəyə İsmarış Göndər"
 
-#: filter/libfilter-i18n.h:24
+#: filter/libfilter-i18n.h:41
 #, fuzzy
 msgid "Play Sound"
 msgstr "Səs çal:"
 
-#: filter/libfilter-i18n.h:25 mail/message-tag-followup.c:68
+#: filter/libfilter-i18n.h:42 mail/message-tag-followup.c:68
 msgid "Read"
 msgstr "Oxu"
 
-#: filter/libfilter-i18n.h:26
+#: filter/libfilter-i18n.h:43
 msgid "Recipients"
 msgstr "Alıcılar"
 
-#: filter/libfilter-i18n.h:27
+#: filter/libfilter-i18n.h:44
 msgid "Regex Match"
 msgstr "Regex Uyğunluqları"
 
-#: filter/libfilter-i18n.h:28
+#: filter/libfilter-i18n.h:45
 msgid "Replied to"
 msgstr "Cavab verilən"
 
-#: filter/libfilter-i18n.h:29 filter/score-rule.c:184 filter/score-rule.c:186
+#: filter/libfilter-i18n.h:46
+#, fuzzy
+msgid "returns"
+msgstr "Məs"
+
+#: filter/libfilter-i18n.h:47
+#, fuzzy
+msgid "returns greater than"
+msgstr "böyükdür"
+
+#: filter/libfilter-i18n.h:48
+#, fuzzy
+msgid "returns less than"
+msgstr "azdır"
+
+#: filter/libfilter-i18n.h:49 filter/score-rule.c:184 filter/score-rule.c:186
 #: mail/message-list.etspec.h:10
 msgid "Score"
 msgstr "Xal"
 
-#: filter/libfilter-i18n.h:30
+#: filter/libfilter-i18n.h:50 mail/mail-callbacks.c:1820
 msgid "Sender"
 msgstr "Göndərən"
 
-#: filter/libfilter-i18n.h:31
+#: filter/libfilter-i18n.h:51
 msgid "Set Status"
 msgstr "Hal Seç"
 
-#: filter/libfilter-i18n.h:32
+#: filter/libfilter-i18n.h:52
 #, fuzzy
 msgid "Shell Command"
 msgstr "Şirkət"
 
-#: filter/libfilter-i18n.h:33
+#: filter/libfilter-i18n.h:53
 msgid "Size (kB)"
 msgstr "Böyüklük (kB)"
 
-#: filter/libfilter-i18n.h:34
+#: filter/libfilter-i18n.h:54
+msgid "sounds like"
+msgstr "oxşayır"
+
+#: filter/libfilter-i18n.h:55
 msgid "Source Account"
 msgstr "Mənbə Hesabı"
 
-#: filter/libfilter-i18n.h:35
+#: filter/libfilter-i18n.h:56
 msgid "Specific header"
 msgstr "Xas başlıq"
 
-#: filter/libfilter-i18n.h:37
+#: filter/libfilter-i18n.h:57
+msgid "starts with"
+msgstr "başlayır"
+
+#: filter/libfilter-i18n.h:59
 msgid "Stop Processing"
 msgstr "İşi Dayandır"
 
-#: filter/libfilter-i18n.h:38 mail/message-list.etspec.h:13
-#: mail/message-tag-followup.c:305
+#: filter/libfilter-i18n.h:60 mail/mail-format.c:934
+#: mail/message-list.etspec.h:13 mail/message-tag-followup.c:305
 msgid "Subject"
 msgstr "Mövzu"
 
-#: filter/libfilter-i18n.h:39
+#: filter/libfilter-i18n.h:61
 #, fuzzy
 msgid "Unset Status"
 msgstr "Hal Seç"
 
-#: filter/libfilter-i18n.h:40
-msgid "contains"
-msgstr "daxil edir"
-
-#: filter/libfilter-i18n.h:41
-msgid "does not contain"
-msgstr "daxil etmir"
-
-#: filter/libfilter-i18n.h:42
-msgid "does not end with"
-msgstr "ilə sonlanmır"
-
-#: filter/libfilter-i18n.h:43
-msgid "does not exist"
-msgstr "yoxdur"
-
-#: filter/libfilter-i18n.h:44
-#, fuzzy
-msgid "does not return"
-msgstr "yoxdur"
-
-#: filter/libfilter-i18n.h:45
-msgid "does not sound like"
-msgstr "oxçamır"
-
-#: filter/libfilter-i18n.h:46
-msgid "does not start with"
-msgstr "başlamır"
-
-#: filter/libfilter-i18n.h:47
-msgid "ends with"
-msgstr "sonlanır"
-
-#: filter/libfilter-i18n.h:48
-msgid "exists"
-msgstr "mövcuddur"
-
-#: filter/libfilter-i18n.h:49
-#, fuzzy
-msgid "is Flagged"
-msgstr "Bayraqlı"
-
-#: filter/libfilter-i18n.h:50
-#, fuzzy
-msgid "is after"
-msgstr "sonra idi"
-
-#: filter/libfilter-i18n.h:51
-#, fuzzy
-msgid "is before"
-msgstr "əvvəl idi"
-
-#: filter/libfilter-i18n.h:52
-msgid "is greater than"
-msgstr "böyükdür"
-
-#: filter/libfilter-i18n.h:53
-msgid "is less than"
-msgstr "azdır"
-
-#: filter/libfilter-i18n.h:54
-#, fuzzy
-msgid "is not Flagged"
-msgstr "Bayraqlı"
-
-#: filter/libfilter-i18n.h:55
-msgid "is not"
-msgstr "deyil"
-
-#: filter/libfilter-i18n.h:56
-msgid "is"
-msgstr "dir(dır)"
-
-#: filter/libfilter-i18n.h:57
-#, fuzzy
-msgid "returns greater than"
-msgstr "böyükdür"
-
-#: filter/libfilter-i18n.h:58
-#, fuzzy
-msgid "returns less than"
-msgstr "azdır"
-
-#: filter/libfilter-i18n.h:59
-#, fuzzy
-msgid "returns"
-msgstr "Məs"
-
-#: filter/libfilter-i18n.h:60
-msgid "sounds like"
-msgstr "oxşayır"
-
-#: filter/libfilter-i18n.h:61
-msgid "starts with"
-msgstr "başlayır"
-
-#: filter/rule-context.c:684 filter/rule-editor.c:241 filter/rule-editor.c:326
-#: mail/mail-vfolder.c:916
+#: filter/rule-context.c:664 filter/rule-editor.c:241 filter/rule-editor.c:326
+#: mail/mail-vfolder.c:917
 #, c-format
 msgid "Rule name '%s' is not unique, choose another."
 msgstr ""
@@ -12213,9 +11911,10 @@ msgid "Scanning %s"
 msgstr "%s daranır"
 
 #: importers/elm-importer.c:525 importers/netscape-importer.c:2128
-#: importers/pine-importer.c:637 mail/component-factory.c:116
-#: mail/importers/elm-importer.c:526 mail/importers/netscape-importer.c:2085
-#: mail/importers/pine-importer.c:572 my-evolution/my-evolution.glade.h:4
+#: importers/pine-importer.c:637 mail/component-factory.c:117
+#: mail/folder-browser-ui.c:360 mail/importers/elm-importer.c:526
+#: mail/importers/netscape-importer.c:2085 mail/importers/pine-importer.c:572
+#: my-evolution/my-evolution.glade.h:4
 msgid "Mail"
 msgstr "Məktub"
 
@@ -12282,7 +11981,7 @@ msgstr "Evolution köhnə Netscape verilənlərini idxal edir"
 
 #. Fill in the new fields
 #: importers/netscape-importer.c:1872 mail/importers/netscape-importer.c:1842
-#: mail/mail-ops.c:1106 shell/e-local-storage.c:184
+#: mail/mail-ops.c:1092 shell/e-local-storage.c:184
 msgid "Trash"
 msgstr "Zibil Qutusu"
 
@@ -12297,7 +11996,7 @@ msgid "Scanning directory"
 msgstr "Qovluq daranır"
 
 #: importers/netscape-importer.c:2047 mail/importers/netscape-importer.c:2015
-#: shell/e-shell-startup-wizard.c:556
+#: shell/e-shell-startup-wizard.c:541
 msgid "Starting import"
 msgstr "İdxal başlanır"
 
@@ -12334,41 +12033,109 @@ msgstr ""
 msgid "Pine"
 msgstr "Pine"
 
-#: mail/component-factory.c:116
+#: mail/GNOME_Evolution_Mail.server.in.in.h:1
+msgid "Composer Preferences"
+msgstr ""
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:2
+msgid ""
+"Configure mail preferences, including security and message display, here"
+msgstr ""
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:3
+msgid "Configure spell-checking, signatures, and the message composer here"
+msgstr ""
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:4
+#, fuzzy
+msgid "Configure your email accounts here"
+msgstr ""
+"Məktub hesabları yaradın və ya təkmilləşdirin, başqa əməliyyatlar aparın"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:5
+#, fuzzy
+msgid "Evolution Mail"
+msgstr "Evolution"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:6
+#, fuzzy
+msgid "Evolution Mail accounts configuration control"
+msgstr "Evolutionun Vəzifə parçası emalatxanası."
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:7
+#, fuzzy
+msgid "Evolution Mail component"
+msgstr "Evolutionun ePoçt yazıçısı."
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:8
+#, fuzzy
+msgid "Evolution Mail composer"
+msgstr "Evolutionun ePoçt yazıçısı."
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:9
+#, fuzzy
+msgid "Evolution Mail composer configuration control"
+msgstr "Evolutionun Vəzifə parçası emalatxanası."
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:10
+#, fuzzy
+msgid "Evolution Mail configuration interface"
+msgstr "Poçt quraşdırılma ara üzü"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:11
+#, fuzzy
+msgid "Evolution Mail folder viewer"
+msgstr "Evolutionun məktub qovluğu nümayişcisi."
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:12
+#, fuzzy
+msgid "Evolution Mail preferences control"
+msgstr "Evolutionun icracı mündəricat parçası."
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:13
+#, fuzzy
+msgid "Mail Accounts"
+msgstr "Hesablar"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:69
+msgid "Mail Preferences"
+msgstr ""
+
+#: mail/component-factory.c:117
 msgid "Folder containing mail"
 msgstr "Məktub daxil edən qovluq"
 
-#: mail/component-factory.c:117
+#: mail/component-factory.c:118
 #, fuzzy
 msgid "Public Mail"
 msgstr "Ümumi"
 
-#: mail/component-factory.c:117
+#: mail/component-factory.c:118
 #, fuzzy
 msgid "Public folder containing mail"
 msgstr "Məktub daxil edən qovluq"
 
-#: mail/component-factory.c:118
+#: mail/component-factory.c:119
 msgid "Virtual Trash"
 msgstr "Virtual Zibil"
 
-#: mail/component-factory.c:118
+#: mail/component-factory.c:119
 msgid "Virtual Trash folder"
 msgstr "Virtual Zibil Qovluğu"
 
-#: mail/component-factory.c:146
+#: mail/component-factory.c:147
 msgid "This folder cannot contain messages."
 msgstr "Bu qovluq ismarış daxil edə bilməz."
 
-#: mail/component-factory.c:444
+#: mail/component-factory.c:441
 msgid "Properties..."
 msgstr "Xüsusiyyətlər..."
 
-#: mail/component-factory.c:444
+#: mail/component-factory.c:441
 msgid "Change this folder's properties"
 msgstr "Qovluqların seçənəklərini dəyişdir"
 
-#: mail/component-factory.c:826
+#: mail/component-factory.c:819
 msgid ""
 "Some of your mail settings seem corrupt, please check that everything is in "
 "order."
@@ -12376,122 +12143,251 @@ msgstr ""
 "Bəzi məktub qurğularınız deyəsən xəsarət görüb, xahiş edirik, hər şeyin "
 "yerində olub olmadığını yoxlayın."
 
-#: mail/component-factory.c:1008
+#: mail/component-factory.c:1000
 msgid "You have not set a mail transport method"
 msgstr "Məktub nəql yolunu bildirməmisən"
 
-#: mail/component-factory.c:1031
+#: mail/component-factory.c:1023
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr ""
 
-#: mail/component-factory.c:1071
+#: mail/component-factory.c:1063
 msgid "New Mail Message"
 msgstr "Yeni Məktub İsmarışı"
 
-#: mail/component-factory.c:1071
+#: mail/component-factory.c:1063
 msgid "_Mail Message"
 msgstr "_Məktub İsmarışı"
 
-#: mail/component-factory.c:1072
+#: mail/component-factory.c:1064
 #, fuzzy
 msgid "Compose a new mail message"
 msgstr "Bir ismarış yaz"
 
-#: mail/component-factory.c:1080
+#: mail/component-factory.c:1072
 #, fuzzy
 msgid "New Message Post"
 msgstr "Sonrakı İsmarış"
 
-#: mail/component-factory.c:1080
+#: mail/component-factory.c:1072
 #, fuzzy
 msgid "_Post Message"
 msgstr "Əvvəlki İsmarış"
 
-#: mail/component-factory.c:1081
+#: mail/component-factory.c:1073
 #, fuzzy
 msgid "Post a new mail message"
 msgstr "Yeni Məktub İsmarışı"
 
-#: mail/component-factory.c:1373
+#: mail/component-factory.c:1365
 #, fuzzy
 msgid "Connecting..."
 msgstr "Vericiyə bağlantı qurulur..."
 
-#: mail/component-factory.c:1384
+#: mail/component-factory.c:1376
 msgid "Cannot register storage with shell"
 msgstr "Nüsxəni qabıq ilə qeyd edə bilmədim"
 
-#: mail/folder-info.c:70
-msgid "Getting Folder Information"
-msgstr "Qovluq Məlumatı Alınır"
+#: mail/folder-browser-ui.c:486
+#, c-format
+msgid "Properties for \"%s\""
+msgstr "\"%s\"in Seçənəkləri"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:1
-msgid "Composer Preferences"
-msgstr ""
+#: mail/folder-browser-ui.c:488
+msgid "Properties"
+msgstr "Seçənəklər"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:2
-msgid ""
-"Configure mail preferences, including security and message display, here"
-msgstr ""
+#: mail/folder-browser.c:327 mail/mail-display.c:394 mail/mail-display.c:942
+#, c-format
+msgid "Could not create temporary directory: %s"
+msgstr "Müvəqqəti qovluq yaradıla bilmədi: %s"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:3
-msgid "Configure spell-checking, signatures, and the message composer here"
+#: mail/folder-browser.c:782
+#, c-format
+msgid "%d new"
+msgstr "%d yeni"
+
+#: mail/folder-browser.c:785 mail/folder-browser.c:793
+#: mail/folder-browser.c:796
+msgid ", "
+msgstr ", "
+
+#: mail/folder-browser.c:787
+#, c-format
+msgid "%d hidden"
+msgstr "%d gizli"
+
+#: mail/folder-browser.c:789
+#, c-format
+msgid "%d visible"
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:4
+#: mail/folder-browser.c:794
+#, c-format
+msgid "%d selected"
+msgstr "%d seçili"
+
+#: mail/folder-browser.c:799
+#, c-format
+msgid "%d unsent"
+msgstr "%d yollanmamış"
+
+#: mail/folder-browser.c:801
+#, c-format
+msgid "%d sent"
+msgstr "%d yollanmış"
+
+#: mail/folder-browser.c:803
+#, c-format
+msgid "%d total"
+msgstr "cəmi %d"
+
+#: mail/folder-browser.c:1182
 #, fuzzy
-msgid "Configure your email accounts here"
+msgid "Create _Virtual Folder From Search..."
+msgstr "İsmarışdan _Virtual Qovluq Yarat"
+
+#: mail/folder-browser.c:1736
+msgid "VFolder on _Subject"
+msgstr "_Mövzudakı vFolder"
+
+#: mail/folder-browser.c:1737
+msgid "VFolder on Se_nder"
+msgstr "Gön_dərəndəki vFolder"
+
+#: mail/folder-browser.c:1738
+msgid "VFolder on _Recipients"
+msgstr "_Alıcıdakı vFolder"
+
+#: mail/folder-browser.c:1739
+msgid "VFolder on Mailing _List"
+msgstr "Məktublaşma Q_rupundakı VFolder"
+
+#: mail/folder-browser.c:1743
+msgid "Filter on Sub_ject"
+msgstr "Mö_vzudakı Süzgəc"
+
+#: mail/folder-browser.c:1744
+msgid "Filter on Sen_der"
+msgstr "Gön_dərəndəki  Süzgəc"
+
+#: mail/folder-browser.c:1745
+msgid "Filter on Re_cipients"
+msgstr "_Alıcıdakı Süzgəc"
+
+#: mail/folder-browser.c:1746 mail/folder-browser.c:2070
+msgid "Filter on _Mailing List"
+msgstr "_Məktublaşma Qrupundakı Süzgəc"
+
+#: mail/folder-browser.c:1764
+msgid "_Edit as New Message..."
+msgstr "Yeni İsmarış olaraq _Düzəlt ..."
+
+#: mail/folder-browser.c:1766
+msgid "_Print"
+msgstr "_Çap Et"
+
+#: mail/folder-browser.c:1770 ui/evolution-mail-message.xml.h:110
+msgid "_Reply to Sender"
+msgstr "Göndərənə _Cavab Ver"
+
+#: mail/folder-browser.c:1771 ui/evolution-mail-message.xml.h:75
+msgid "Reply to _List"
+msgstr "_Qrupa Cavab Ver"
+
+#: mail/folder-browser.c:1772 ui/evolution-mail-message.xml.h:74
+msgid "Reply to _All"
+msgstr "_Hamısına Cavab Ver"
+
+#: mail/folder-browser.c:1773
+msgid "_Forward"
+msgstr "_Çatdır"
+
+#: mail/folder-browser.c:1777
+msgid "Follo_w Up..."
 msgstr ""
-"Məktub hesabları yaradın və ya təkmilləşdirin, başqa əməliyyatlar aparın"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:5
+#: mail/folder-browser.c:1778
 #, fuzzy
-msgid "Evolution Mail"
-msgstr "Evolution"
+msgid "Fla_g Completed"
+msgstr "Bitirmə Tarixi"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:6
+#: mail/folder-browser.c:1779
 #, fuzzy
-msgid "Evolution Mail accounts configuration control"
-msgstr "Evolutionun Vəzifə parçası emalatxanası."
+msgid "Cl_ear Flag"
+msgstr "Təmizlə"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:7
+#. separator here?
+#: mail/folder-browser.c:1783 ui/evolution-mail-message.xml.h:43
+msgid "Mar_k as Read"
+msgstr "Oxun_muş olaraq İşarələ"
+
+#: mail/folder-browser.c:1784
 #, fuzzy
-msgid "Evolution Mail component"
-msgstr "Evolutionun ePoçt yazıçısı."
+msgid "Mark as _Unread"
+msgstr "Ox_unmamış olaraq İşarələ"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:8
+#: mail/folder-browser.c:1785
+msgid "Mark as _Important"
+msgstr "_Vacib olaraq İşarələ"
+
+#: mail/folder-browser.c:1786
 #, fuzzy
-msgid "Evolution Mail composer"
-msgstr "Evolutionun ePoçt yazıçısı."
+msgid "_Mark as Unimportant"
+msgstr "_Qeyri-Vacib olaraq İşarələ"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:9
+#: mail/folder-browser.c:1791
 #, fuzzy
-msgid "Evolution Mail composer configuration control"
-msgstr "Evolutionun Vəzifə parçası emalatxanası."
+msgid "U_ndelete"
+msgstr "_Geri Gətir"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:10
+#: mail/folder-browser.c:1795
 #, fuzzy
-msgid "Evolution Mail configuration interface"
-msgstr "Poçt quraşdırılma ara üzü"
+msgid "Mo_ve to Folder..."
+msgstr "Qovluğa _Daşı ..."
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:11
+#: mail/folder-browser.c:1796 ui/evolution-addressbook.xml.h:31
+msgid "_Copy to Folder..."
+msgstr "Qovluğa _Köçürt..."
+
+#: mail/folder-browser.c:1804
 #, fuzzy
-msgid "Evolution Mail folder viewer"
-msgstr "Evolutionun məktub qovluğu nümayişcisi."
+msgid "Add Sender to Address_book"
+msgstr "Yollayanı Ünvan dəftərinə Əlavə Et"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:12
+#: mail/folder-browser.c:1808
 #, fuzzy
-msgid "Evolution Mail preferences control"
-msgstr "Evolutionun icracı mündəricat parçası."
+msgid "Appl_y Filters"
+msgstr "Süzgəclər Əlavə Et"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:13
+#: mail/folder-browser.c:1812
 #, fuzzy
-msgid "Mail Accounts"
-msgstr "Hesablar"
+msgid "Crea_te Rule From Message"
+msgstr "İsmarışdan Qa_yda Yarat"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:69
-msgid "Mail Preferences"
-msgstr ""
+#: mail/folder-browser.c:2071
+#, fuzzy
+msgid "VFolder on M_ailing List"
+msgstr "Məktublaşma Qrupundakı VFolder"
+
+#: mail/folder-browser.c:2073
+#, fuzzy, c-format
+msgid "Filter on _Mailing List (%s)"
+msgstr "Məktublaşma Qrupunda Süz (%s)"
+
+#: mail/folder-browser.c:2074
+#, fuzzy, c-format
+msgid "VFolder on M_ailing List (%s)"
+msgstr "(%s) Məktublaşma Qrupundakı VFolder"
+
+#: mail/folder-browser.h:26 mail/mail-config.glade.h:39
+#, fuzzy
+msgid "Default"
+msgstr "Ə_sas"
+
+#: mail/folder-info.c:70
+msgid "Getting Folder Information"
+msgstr "Qovluq Məlumatı Alınır"
 
 #: mail/importers/GNOME_Evolution_Mail_Elm_Intelligent_Importer.server.in.in.h:1
 #, fuzzy
@@ -12582,7 +12478,7 @@ msgstr "İ_stifadəci Adı:"
 msgid "_Path:"
 msgstr "_Cığır:"
 
-#: mail/mail-account-gui.c:1886
+#: mail/mail-account-gui.c:1887
 msgid "You may not create two accounts with the same name."
 msgstr "Eyni adda və iki hesab yarada bilməzsiniz."
 
@@ -12614,17 +12510,17 @@ msgstr "Ə_sas"
 
 #. FIXME: This routine should just be a "toggled" event handler on the checkbox cell renderer which
 #. has "activatable" set.
-#: mail/mail-accounts.c:481 mail/mail-composer-prefs.c:708
-#: mail/mail-composer-prefs.c:854
+#: mail/mail-accounts.c:481 mail/mail-accounts.etspec.h:2
+#: mail/mail-composer-prefs.c:708 mail/mail-composer-prefs.c:854
 msgid "Enabled"
 msgstr "Fəal"
 
-#: mail/mail-accounts.c:487
+#: mail/mail-accounts.c:487 mail/mail-accounts.etspec.h:1
 #, fuzzy
 msgid "Account name"
 msgstr "_Hesab adı:"
 
-#: mail/mail-accounts.c:489
+#: mail/mail-accounts.c:489 mail/mail-accounts.etspec.h:3
 #, fuzzy
 msgid "Protocol"
 msgstr "Porto Riko"
@@ -12669,6 +12565,220 @@ msgstr ""
 "    '%s'\n"
 "Və güncəlləndilər."
 
+#. Add the "Don't show this message again." checkbox
+#: mail/mail-callbacks.c:101 widgets/misc/e-messagebox.c:226
+msgid "Don't show this message again."
+msgstr "Bu ismarışı bir də göstərmə."
+
+#: mail/mail-callbacks.c:190
+msgid ""
+"You have not configured the mail client.\n"
+"You need to do this before you can send,\n"
+"receive or compose mail.\n"
+"Would you like to configure it now?"
+msgstr ""
+"Məktub alıcısını hələ quraşdırmamısınız.\n"
+"Məktub yazmaq, almaq, göndərmədən əvvəl \n"
+"bunu quraşdırmalısınız.\n"
+"Bunu indi quraşdırmaq istəyirsiniz?"
+
+#: mail/mail-callbacks.c:212
+#, fuzzy
+msgid ""
+"You need to configure an account\n"
+"before you can compose mail."
+msgstr ""
+"ePoçt göndərməkdən əvvəl bir \n"
+"şəxs tanıtmalısan."
+
+#: mail/mail-callbacks.c:226
+msgid ""
+"You need to configure an identity\n"
+"before you can compose mail."
+msgstr ""
+"ePoçt göndərməkdən əvvəl bir \n"
+"şəxs tanıtmalısan."
+
+#: mail/mail-callbacks.c:233
+msgid ""
+"You need to configure a mail transport\n"
+"before you can compose mail."
+msgstr ""
+"ePoçt göndərməkdən əvvəl bir ePoçt\n"
+"nəqliyyatını qurmalısan."
+
+#. FIXME: this wording sucks
+#: mail/mail-callbacks.c:255
+#, fuzzy
+msgid ""
+"You are sending an HTML-formatted message. Please make sure that\n"
+"the following recipients are willing and able to receive HTML mail:\n"
+msgstr ""
+"HTML şəklində imsarış göndərirsiniz, amma aşağıdakı alıcılar HTML şəklində "
+"məktub istəmirlər:\n"
+
+#: mail/mail-callbacks.c:267
+msgid "Send anyway?"
+msgstr "Yenə də yollayaq?"
+
+#: mail/mail-callbacks.c:288
+msgid ""
+"This message has no subject.\n"
+"Really send?"
+msgstr ""
+"Bu ismarışın mövzusu yoxdur .\n"
+"Həqiqətən də göndərim?"
+
+#: mail/mail-callbacks.c:314
+msgid ""
+"Since the contact list you are sending to is configured to hide the list's "
+"addresses, this message will contain only Bcc recipients."
+msgstr ""
+"Nə vaxta qədər ki, əlaqə siyahınız qrup ünvanıarını gizləyəcək şəkildə "
+"sazlanıb, bi ismarış təkcə Bcc alıcılar daxil edəcək."
+
+#: mail/mail-callbacks.c:318
+msgid "This message contains only Bcc recipients."
+msgstr "İsmarış təkcə Bcc alıcıları daxil edir."
+
+#: mail/mail-callbacks.c:323
+msgid ""
+"It is possible that the mail server may reveal the recipients by adding an "
+"Apparently-To header.\n"
+"Send anyway?"
+msgstr ""
+"Ola bilsin ki, məktub vericisi alıcılara Aydın-Yollayan başlığı ilə "
+"məlumatlndırmaq istəsin.\n"
+"Yenə də göndərək?"
+
+#: mail/mail-callbacks.c:472
+msgid "You must specify recipients in order to send this message."
+msgstr "Məktubu göndərə bilmək üçün alıcını da bildirməlisən."
+
+#: mail/mail-callbacks.c:724
+msgid ""
+"Unable to open the drafts folder for this account.\n"
+"Would you like to use the default drafts folder?"
+msgstr ""
+"Bu hesab üçün lahiyə cərgəsə açıla bilmədi.\n"
+"Əsas lahiyə cərgəsini işlətmək istəyirsiniz?"
+
+#: mail/mail-callbacks.c:1189
+msgid "an unknown sender"
+msgstr "naməlum yollayan"
+
+#: mail/mail-callbacks.c:1193
+msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
+msgstr "%a, %Y-%m-%d at %H:%M, tarixidə %%s yazmışdır ki:"
+
+#: mail/mail-callbacks.c:1700 mail/message-browser.c:132
+msgid "Move message(s) to"
+msgstr "İsmarış(ları) buraya daşı "
+
+#: mail/mail-callbacks.c:1702 mail/message-browser.c:134
+msgid "Copy message(s) to"
+msgstr "İsmarış(ları) buraya köçürt"
+
+#: mail/mail-callbacks.c:2344
+#, c-format
+msgid "Are you sure you want to edit all %d messages?"
+msgstr "Bütün `%d' ismarışlarını düzəltmək istəyirsiniz?"
+
+#: mail/mail-callbacks.c:2360
+msgid ""
+"You may only edit messages saved\n"
+"in the Drafts folder."
+msgstr ""
+"Siz sadəcə olaraq Vəzifələr qovluğundakı\n"
+"ismarışları düzəldə bilərsiniz."
+
+#: mail/mail-callbacks.c:2393
+msgid ""
+"You may only resend messages\n"
+"in the Sent folder."
+msgstr ""
+"Sadəcə olaraq Göndərilən cərgəsinə qeyd edilən\n"
+"ismarışları yeniden gönderebilirsiniz."
+
+#: mail/mail-callbacks.c:2403
+#, c-format
+msgid "Are you sure you want to resend all %d messages?"
+msgstr "Həqiqətən də bütün `%d' ismarışı yenidən yollamaq istəyirsən?"
+
+#: mail/mail-callbacks.c:2424
+msgid "No Message Selected"
+msgstr "Heç İsmarış Seçilmədi"
+
+#: mail/mail-callbacks.c:2465
+#, fuzzy, c-format
+msgid ""
+"Cannot save to `%s'\n"
+" %s"
+msgstr ""
+"İSmarıc alına bilmir: %s\n"
+"   %s"
+
+#: mail/mail-callbacks.c:2470
+#, fuzzy, c-format
+msgid ""
+"`%s' already exists.\n"
+"Overwrite it?"
+msgstr ""
+"%s onsuz da mövcuddur.\n"
+"Üstünə yazmaq istəyirsiniz?"
+
+#: mail/mail-callbacks.c:2511
+msgid "Save Message As..."
+msgstr "İsmarışı Fərqli Qeyd Et..."
+
+#: mail/mail-callbacks.c:2513
+msgid "Save Messages As..."
+msgstr "İsmarışları Fərqli Qeyd Et..."
+
+#: mail/mail-callbacks.c:2686
+#, fuzzy
+msgid ""
+"This operation will permanently erase all messages marked as\n"
+"deleted. If you continue, you will not be able to recover these messages.\n"
+"\n"
+"Really erase these messages?"
+msgstr ""
+"Bu əməliyyat silinəcəklər deyə işarələnmiş bütün məktubları həmişəlik "
+"siləcəkdir. Davam etsəniz, bu ismarışları geri gətirə bilməyəcəksiniz.\n"
+"\n"
+"İsmarışları həqiqətən də silək?"
+
+#: mail/mail-callbacks.c:2781
+#, c-format
+msgid ""
+"Error loading filter information:\n"
+"%s"
+msgstr ""
+"Süzgəc məlumatını yükləmə xətası:\n"
+"%s"
+
+#: mail/mail-callbacks.c:2789
+msgid "Filters"
+msgstr "Süzgəclər"
+
+#: mail/mail-callbacks.c:2830
+#, fuzzy, c-format
+msgid "Page %d of %d"
+msgstr "%d İsmarışın %d qədərə alınır"
+
+#: mail/mail-callbacks.c:2886
+msgid "Print Message"
+msgstr "İsmarışı Çap Et"
+
+#: mail/mail-callbacks.c:2954
+msgid "Printing of message failed"
+msgstr "İsmarıların çap edilməsi bacarılmadı"
+
+#: mail/mail-callbacks.c:3147
+#, c-format
+msgid "Are you sure you want to open all %d messages in separate windows?"
+msgstr "Bütün %d ismarışlarını başqa pəncərədə açmaq istəyirsiniz?"
+
 #: mail/mail-composer-prefs.c:226 mail/mail-composer-prefs.c:349
 #: mail/mail-config.c:1376
 #, fuzzy
@@ -12700,19 +12810,11 @@ msgstr "Kriteriya əlavə et"
 msgid "Signature(s)"
 msgstr "_HTML Imza:"
 
-#: mail/mail-config.c:1080
-msgid "Checking Service"
-msgstr "Xidmət Yoxlanılır"
-
-#: mail/mail-config.c:1158 mail/mail-config.c:1162
-msgid "Connecting to server..."
-msgstr "Vericiyə bağlantı qurulur..."
-
-#: mail/mail-config-druid.c:367 mail/mail-config.glade.h:61
+#: mail/mail-config-druid.c:380 mail/mail-config.glade.h:61
 msgid "Identity"
 msgstr "Kimlik"
 
-#: mail/mail-config-druid.c:369
+#: mail/mail-config-druid.c:382
 #, fuzzy
 msgid ""
 "Please enter your name and email address below. The \"optional\" fields "
@@ -12723,12 +12825,12 @@ msgstr ""
 "sahələrin doldurulmağa çox ehtiyacı yoxdur. Əlbətdə yolladığınız məktublarda "
 "bu məlumatların görünməyini istəmirsinizsə."
 
-#: mail/mail-config-druid.c:375 mail/mail-config-druid.c:382
+#: mail/mail-config-druid.c:388 mail/mail-config-druid.c:395
 #, fuzzy
 msgid "Receiving Mail"
 msgstr "E-poçt Alınır"
 
-#: mail/mail-config-druid.c:377
+#: mail/mail-config-druid.c:390
 #, fuzzy
 msgid ""
 "Please enter information about your incoming mail server below. If you are "
@@ -12738,16 +12840,16 @@ msgstr ""
 "sistem idarəçinizə, ya da İnternet Xidmət\n"
 "vericinizə müraciət edin."
 
-#: mail/mail-config-druid.c:384
+#: mail/mail-config-druid.c:397
 msgid "Please select among the following options"
 msgstr "Xaniş edirik, aşağıdakı seçənəklər arasından seçin"
 
-#: mail/mail-config-druid.c:387
+#: mail/mail-config-druid.c:400
 #, fuzzy
 msgid "Sending Mail"
 msgstr "E-poçt Göndərilir"
 
-#: mail/mail-config-druid.c:389
+#: mail/mail-config-druid.c:402
 #, fuzzy
 msgid ""
 "Please enter information about the way you will send mail. If you are not "
@@ -12757,11 +12859,11 @@ msgstr ""
 "deyilsinizsə, sistem idarəçinizə, ya da\n"
 "İnternet Xidmət Vericinizə müraciət edinu."
 
-#: mail/mail-config-druid.c:394 mail/mail-config.glade.h:10
+#: mail/mail-config-druid.c:407 mail/mail-config.glade.h:10
 msgid "Account Management"
 msgstr "Hesab İdarəsi"
 
-#: mail/mail-config-druid.c:396
+#: mail/mail-config-druid.c:409
 #, fuzzy
 msgid ""
 "You are almost done with the mail configuration process. The identity, "
@@ -12777,6 +12879,14 @@ msgstr ""
 "aşağıdakı boşluğa bir ad girin.\n"
 "Bu ad təkcə ekranda göstərilmək məqsədilə işlədiləcəkdir."
 
+#: mail/mail-config.c:1080
+msgid "Checking Service"
+msgstr "Xidmət Yoxlanılır"
+
+#: mail/mail-config.c:1158 mail/mail-config.c:1162
+msgid "Connecting to server..."
+msgstr "Vericiyə bağlantı qurulur..."
+
 #: mail/mail-config.glade.h:3
 msgid " _Check for supported types "
 msgstr " Dəstəklənən növləri _yoxla "
@@ -12909,11 +13019,6 @@ msgstr ""
 msgid "De_fault"
 msgstr "Ə_sas"
 
-#: mail/mail-config.glade.h:39
-#, fuzzy
-msgid "Default"
-msgstr "Ə_sas"
-
 #: mail/mail-config.glade.h:40
 #, fuzzy
 msgid "Default Behavior"
@@ -13410,25 +13515,219 @@ msgstr "E_tibarlı bağlantı (SSL) işlət"
 msgid "_Use the same fonts as other applications"
 msgstr ""
 
+#: mail/mail-config.glade.h:171
+#, fuzzy
+msgid "color"
+msgstr " rəng"
+
 #: mail/mail-config.glade.h:172
 msgid "description"
 msgstr "izah"
 
-#: mail/mail-folder-cache.c:832
+#: mail/mail-crypto.c:84
+msgid "Could not create a S/MIME signature context."
+msgstr "S/MIME imza məzmunu yaradıla bilmir."
+
+#: mail/mail-crypto.c:116
+msgid "Could not create a S/MIME certsonly context."
+msgstr "S/MIME məzmunu yaradıla bilmir."
+
+#: mail/mail-crypto.c:148
+msgid "Could not create a S/MIME encryption context."
+msgstr "S/MIME enkripsiya məzmunu yaradıla bilmir."
+
+#: mail/mail-crypto.c:180
+msgid "Could not create a S/MIME envelope context."
+msgstr "S/MIME zərf məzmunu yaradıla bilmir."
+
+#: mail/mail-crypto.c:211
+msgid "Could not create a S/MIME decode context."
+msgstr "S/MIME kod açma məzmunu yaradıla bilmir."
+
+#: mail/mail-display.c:197
+#, fuzzy, c-format
+msgid ""
+"File `%s' already exists.\n"
+"Overwrite it?"
+msgstr ""
+"Eyni adlı bir fayl onsuz da vardır.\n"
+"Üstünə yazım mı?"
+
+#: mail/mail-display.c:336
+msgid "Save Attachment"
+msgstr "Yapışdırılmış Faylı Qeyd Et"
+
+#: mail/mail-display.c:409
+#, fuzzy, c-format
+msgid "Could not create temporary file '%s': %s"
+msgstr "Müvəqqəti qovluq yaradıla bilmədi: %s"
+
+#: mail/mail-display.c:457
+#, fuzzy
+msgid "Save Attachment..."
+msgstr "Yapışdırılmış Faylı Qeyd Et"
+
+#: mail/mail-display.c:458
+msgid "View Inline"
+msgstr "İçərisini Göstər"
+
+#: mail/mail-display.c:459
+#, c-format
+msgid "Open in %s..."
+msgstr "%s da(də) Aç ..."
+
+#: mail/mail-display.c:515
+#, c-format
+msgid "View Inline (via %s)"
+msgstr "İçərisini Göstər (%s ilə)"
+
+#: mail/mail-display.c:519
+msgid "Hide"
+msgstr "Gizlə"
+
+#: mail/mail-display.c:539
+msgid "External Viewer"
+msgstr "Xarici Göstərici"
+
+#: mail/mail-display.c:1368
+#, fuzzy
+msgid "Downloading images"
+msgstr "_Rəsmləri Yüklə"
+
+#: mail/mail-display.c:1545
+msgid "Loading message content"
+msgstr "İsmarış içindəkilər yüklənir"
+
+#: mail/mail-display.c:1887
+#, fuzzy
+msgid "Overdue:"
+msgstr "Ge_cikmiş işlər:"
+
+#: mail/mail-display.c:1891
+#, fuzzy
+msgid "by %B %d, %Y, %l:%M %P"
+msgstr "%b %d %l:%M %p"
+
+#: mail/mail-display.c:2255
+msgid "Open Link in Browser"
+msgstr "Körpünü Səyyahda Aç"
+
+#: mail/mail-display.c:2256
+msgid "Copy Link Location"
+msgstr "Körpü Ünvanınə Köçür"
+
+#: mail/mail-display.c:2258
+msgid "Save Link as (FIXME)"
+msgstr "Körpünü Fərqli qeyd et"
+
+#: mail/mail-display.c:2260
+msgid "Save Image as..."
+msgstr "Rəsmi Fərqli qeyd et..."
+
+#: mail/mail-folder-cache.c:745
 #, fuzzy, c-format
 msgid "Pinging %s"
 msgstr "%s daranır"
 
+#: mail/mail-format.c:665
+#, c-format
+msgid "%s attachment"
+msgstr "%s yapışdırılmış fayl"
+
+#: mail/mail-format.c:707 mail/mail-format.c:1370 mail/mail-format.c:1439
+#: mail/mail-format.c:1559 mail/mail-format.c:1683 mail/mail-format.c:1708
+msgid "Could not parse MIME message. Displaying as source."
+msgstr "MIME ismarışı açıla bilmədi: Mənbə kodu gösteriliyor."
+
+#: mail/mail-format.c:785 mail/message-list.etspec.h:2
+msgid "Date"
+msgstr "Tarix"
+
+#: mail/mail-format.c:871
+msgid "Bad Address"
+msgstr "Səhv Ünvan"
+
+#: mail/mail-format.c:912 mail/message-list.etspec.h:7
+#: mail/message-tag-followup.c:301
+msgid "From"
+msgstr "Göndərən"
+
+#: mail/mail-format.c:916
+msgid "Reply-To"
+msgstr "Cavablama"
+
+#: mail/mail-format.c:921 mail/message-list.etspec.h:14
+msgid "To"
+msgstr "Gn:"
+
+#: mail/mail-format.c:926
+msgid "Cc"
+msgstr "Cc"
+
+#: mail/mail-format.c:931
+msgid "Bcc"
+msgstr "Bcc"
+
+#: mail/mail-format.c:1482
+msgid ""
+"This message is digitally signed. Click the lock icon for more information."
+msgstr ""
+"Bu ismarış digital olaraq imzalanmışdır. Ətraflı məlumat üçün qıfıl "
+"timsalına tıqla."
+
+#: mail/mail-format.c:1510
+#, fuzzy
+msgid "Could not create a PGP verfication context"
+msgstr "PGP təsdiq məzmunu yaradıla bilmir."
+
+#: mail/mail-format.c:1518
+msgid "This message is digitally signed and has been found to be authentic."
+msgstr "Bu ismarış digital olaraq imzalanmışdır və original olduğu düşünülür."
+
+#: mail/mail-format.c:1525
+msgid "This message is digitally signed but can not be proven to be authentic."
+msgstr ""
+"Bu ismarış digital olaraq imzalanmışdır amma original olduğu düşünülmür."
+
+#: mail/mail-format.c:1789
+#, c-format
+msgid "Pointer to FTP site (%s)"
+msgstr "FTP saytını göstərən ox (%s)"
+
+#: mail/mail-format.c:1800
+#, c-format
+msgid "Pointer to local file (%s) valid at site \"%s\""
+msgstr "Yerli faylyi göstərən (%s) oxu \"%s\" saytında hökmlüdür"
+
+#: mail/mail-format.c:1803
+#, c-format
+msgid "Pointer to local file (%s)"
+msgstr "Yerli faylyi göstərən ox (%s)"
+
+#: mail/mail-format.c:1830
+#, c-format
+msgid "Pointer to remote data (%s)"
+msgstr "Uzaq verilənlər (%s) nişanı"
+
+#: mail/mail-format.c:1836
+#, c-format
+msgid "Pointer to unknown external data (\"%s\" type)"
+msgstr "Naməlum xarici məlumatı göstərən ox (\"%s\" növündə "
+
+#: mail/mail-format.c:1838
+msgid "Malformed external-body part."
+msgstr "Xəsərli xarici proqram parçası."
+
 #: mail/mail-local.c:541 mail/mail-local.c:543
 #, fuzzy, c-format
 msgid "Local folders/%s"
 msgstr "Yerli Qovluqlar"
 
-#: mail/mail-local.c:711
+#: mail/mail-local.c:671
 msgid "Reconfiguring folder"
 msgstr "Qovluq yenidən qurulur"
 
-#: mail/mail-local.c:792
+#: mail/mail-local.c:752
 #, fuzzy, c-format
 msgid ""
 "Cannot save folder metainfo; you may find you can't\n"
@@ -13437,22 +13736,22 @@ msgstr ""
 "Qovluğun meta məlumatını qeyd eda bilmədim; Bu qovluğu bir də aça\n"
 "bilməyə bilərsən: %s: %s"
 
-#: mail/mail-local.c:848
+#: mail/mail-local.c:808
 #, c-format
 msgid "Cannot save folder metainfo to %s: %s"
 msgstr "%s üstündə meta verilənlər qeyd edilə bilmir: %s"
 
-#: mail/mail-local.c:900
+#: mail/mail-local.c:860
 #, c-format
 msgid "Cannot delete folder metadata %s: %s"
 msgstr "Qovluq meta verilənləri %s silinə bilmir: %s"
 
-#: mail/mail-local.c:1363
+#: mail/mail-local.c:1323
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "\"%s\" qovluğu \"%s\" şəklinə çevrilir"
 
-#: mail/mail-local.c:1388
+#: mail/mail-local.c:1348
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
@@ -13460,16 +13759,16 @@ msgstr ""
 "Bu qovluğu bir də aça bilməsən, onu əllə\n"
 "bərpa etməlisən."
 
-#: mail/mail-local.c:1488
+#: mail/mail-local.c:1448
 #, c-format
 msgid "Reconfigure /%s"
 msgstr "%s i(ı) Yenidən Quraşdır"
 
-#: mail/mail-local.c:1552
+#: mail/mail-local.c:1512
 msgid "You cannot change the format of a non-local folder."
 msgstr "Yerli olmayan qovluqların şəklini dəyişdirə bilməzsiniz."
 
-#: mail/mail-mt.c:259
+#: mail/mail-mt.c:257
 #, c-format
 msgid ""
 "Error while '%s':\n"
@@ -13478,7 +13777,7 @@ msgstr ""
 "'%s' sırasında xəta:\n"
 "%s"
 
-#: mail/mail-mt.c:262
+#: mail/mail-mt.c:260
 #, c-format
 msgid ""
 "Error while performing operation:\n"
@@ -13487,131 +13786,118 @@ msgstr ""
 "Əməliyyat aparılırkən xəta oldu:\n"
 "%s"
 
-#: mail/mail-mt.c:913
+#: mail/mail-mt.c:904
 msgid "Working"
 msgstr "İşləyir"
 
-#: mail/mail-ops.c:87
+#: mail/mail-ops.c:86
 msgid "Filtering Folder"
 msgstr "Qovluq Süzülür"
 
-#: mail/mail-ops.c:260
+#: mail/mail-ops.c:264
 msgid "Fetching Mail"
 msgstr "Poçt Alınır"
 
-#: mail/mail-ops.c:557
-#, fuzzy, c-format
-msgid "Failed to apply outgoing filters: %s"
-msgstr "Məktubların müvəqqəti %s fayllında saxlanma xətası: %s"
-
-#: mail/mail-ops.c:578
-#, c-format
-msgid ""
-"Failed to append to %s: %s\n"
-"Appending to local `Sent' folder instead."
-msgstr ""
-
-#: mail/mail-ops.c:587
-#, fuzzy, c-format
-msgid "Failed to append to local `Sent' folder: %s"
-msgstr "Məktubların müvəqqəti %s fayllında saxlanma xətası: %s"
+#: mail/mail-ops.c:550 mail/mail-ops.c:579
+msgid "However, the message was successfully sent."
+msgstr "Axırı ki, ismarış müvəffəqiyyətlə yollandı."
 
-#: mail/mail-ops.c:629
+#: mail/mail-ops.c:611
 #, c-format
 msgid "Sending \"%s\""
 msgstr "\"%s\" Göndərilir"
 
-#: mail/mail-ops.c:747
+#: mail/mail-ops.c:729
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "%d / %d ismarış göndərilir"
 
-#: mail/mail-ops.c:766
+#: mail/mail-ops.c:748
 #, c-format
 msgid "Failed on message %d of %d"
 msgstr "%d/%d ismarışda xəta"
 
-#: mail/mail-ops.c:768
+#: mail/mail-ops.c:750 mail/mail-send-recv.c:581
 msgid "Complete."
 msgstr "Qurtadı."
 
-#: mail/mail-ops.c:862
+#: mail/mail-ops.c:844
 msgid "Saving message to folder"
 msgstr "İsmarışlar qovluğa qeyd edilir"
 
-#: mail/mail-ops.c:943
+#: mail/mail-ops.c:925
 #, c-format
 msgid "Moving messages to %s"
 msgstr "İsmarışlar \"%s\"a(ə) daşınır"
 
-#: mail/mail-ops.c:943
+#: mail/mail-ops.c:925
 #, c-format
 msgid "Copying messages to %s"
 msgstr "İsmarışlar \"%s\"a(ə) köçürülür"
 
-#: mail/mail-ops.c:1056
+#: mail/mail-ops.c:1042
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "\"%s\" dakı qovluqlar daranır"
 
-#: mail/mail-ops.c:1244
+#: mail/mail-ops.c:1225
 msgid "Forwarded messages"
 msgstr "Çatdırılmış ismarış"
 
-#: mail/mail-ops.c:1287
+#: mail/mail-ops.c:1268
 #, c-format
 msgid "Opening folder %s"
 msgstr "%s qovluğu açılır"
 
-#: mail/mail-ops.c:1359
+#: mail/mail-ops.c:1340
 #, c-format
 msgid "Opening store %s"
 msgstr "%s qaynağı açılır"
 
-#: mail/mail-ops.c:1437
+#: mail/mail-ops.c:1413
 #, c-format
 msgid "Removing folder %s"
 msgstr "%s qovluğu çıxardılır"
 
-#: mail/mail-ops.c:1531
+#: mail/mail-ops.c:1507
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "%s qovluğu saxlanılır"
 
-#: mail/mail-ops.c:1582
+#: mail/mail-ops.c:1558
 msgid "Refreshing folder"
 msgstr "Qovluq yenilənir"
 
-#: mail/mail-ops.c:1618 mail/mail-ops.c:1669
+#: mail/mail-ops.c:1594 mail/mail-ops.c:1645
 msgid "Expunging folder"
 msgstr "Qovluq açılır"
 
-#: mail/mail-ops.c:1666
+#: mail/mail-ops.c:1642
 #, fuzzy, c-format
 msgid "Emptying trash in '%s'"
 msgstr "%s %s olaraq idxal edilir"
 
-#: mail/mail-ops.c:1667 my-evolution/e-summary-mail.c:483
+#: mail/mail-ops.c:1643 my-evolution/e-summary-mail.c:483
 #: shell/e-local-storage.c:1151
 msgid "Local Folders"
 msgstr "Yerli Qovluqlar"
 
-#: mail/mail-ops.c:1742
+#: mail/mail-ops.c:1718
 #, c-format
 msgid "Retrieving message %s"
 msgstr "%s ismarışı alınır"
 
-#: mail/mail-ops.c:1814
+#: mail/mail-ops.c:1790
 #, c-format
 msgid "Retrieving %d message(s)"
 msgstr "%d ismarış alınır"
 
-#: mail/mail-ops.c:1898
+#: mail/mail-ops.c:1876
 #, c-format
 msgid "Saving %d messsage(s)"
 msgstr "%d ismarış qeyd edilir"
 
-#: mail/mail-ops.c:1946
+#: mail/mail-ops.c:1924
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -13620,7 +13906,7 @@ msgstr ""
 "Nəticə faylı yaradıla bilmir: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1974
+#: mail/mail-ops.c:1952
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -13629,11 +13915,11 @@ msgstr ""
 "İsmarışların buraya qeyd edilmə xatası: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2045
+#: mail/mail-ops.c:2026
 msgid "Saving attachment"
 msgstr "Yapışdırılmış Fayl Qeyd Edilir"
 
-#: mail/mail-ops.c:2062
+#: mail/mail-ops.c:2043
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -13642,75 +13928,107 @@ msgstr ""
 "Yekun faylı yaradıla bilmir: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2092
+#: mail/mail-ops.c:2073
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Data yazıla bilmədi: %s"
 
-#: mail/mail-ops.c:2240
+#: mail/mail-ops.c:2221
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "%s ilə bağlantı kəsilir"
 
-#: mail/mail-ops.c:2240
+#: mail/mail-ops.c:2221
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "%s ilə bağlantı yenidən qurulur"
 
-#: mail/mail-send-recv.c:147
+#: mail/mail-search.c:154
+msgid "(Untitled Message)"
+msgstr "(Adsız İsmarış)"
+
+#: mail/mail-search.c:236
+msgid "Untitled Message"
+msgstr "Adsız İsmarış"
+
+#: mail/mail-search.c:238
+msgid "Empty Message"
+msgstr "Boş İsmarış"
+
+#: mail/mail-search.c:287
+msgid "Find in Message"
+msgstr "İsmarışda Axtar"
+
+#: mail/mail-search.c:320
+msgid "Case Sensitive"
+msgstr "Böyük Kiçik Hərfə Həssas"
+
+#: mail/mail-search.c:322
+msgid "Search Forward"
+msgstr "İrəliyə Axtar"
+
+#: mail/mail-search.c:342
+msgid "Find:"
+msgstr "Axtar:"
+
+#: mail/mail-search.c:346
+msgid "Matches:"
+msgstr "Oxşayır:"
+
+#: mail/mail-send-recv.c:146
 msgid "Cancelling..."
 msgstr "Ləğv Edilir ..."
 
-#: mail/mail-send-recv.c:255
+#: mail/mail-send-recv.c:254
 #, c-format
 msgid "Server: %s, Type: %s"
 msgstr "Verici: %s, Növ: %s"
 
-#: mail/mail-send-recv.c:257
+#: mail/mail-send-recv.c:256
 #, c-format
 msgid "Path: %s, Type: %s"
 msgstr "Cığır: %s, Növ: %s"
 
-#: mail/mail-send-recv.c:259
+#: mail/mail-send-recv.c:258
 #, c-format
 msgid "Type: %s"
 msgstr "Növ: %s"
 
-#: mail/mail-send-recv.c:308
+#: mail/mail-send-recv.c:306
 msgid "Send & Receive Mail"
 msgstr "Poçt Göndər və Al"
 
-#: mail/mail-send-recv.c:309
+#: mail/mail-send-recv.c:307
 #, fuzzy
 msgid "Cancel _All"
 msgstr "Hamısını Ləğv Et"
 
-#: mail/mail-send-recv.c:390
+#: mail/mail-send-recv.c:389
 msgid "Updating..."
 msgstr "Güncəllənir ..."
 
-#: mail/mail-send-recv.c:390 mail/mail-send-recv.c:442
+#: mail/mail-send-recv.c:390 mail/mail-send-recv.c:446
 msgid "Waiting..."
 msgstr "Gözləyir..."
 
-#: mail/mail-session.c:229
+#: mail/mail-session.c:226
 msgid "User canceled operation."
 msgstr "İstifadəçi əməliyyatı ləğv etdi."
 
-#: mail/mail-session.c:262
+#: mail/mail-session.c:259
 #, c-format
 msgid "Enter Password for %s"
 msgstr "%s üçün Parol girin"
 
-#: mail/mail-session.c:264
+#: mail/mail-session.c:261
 msgid "Enter Password"
 msgstr "Parol Girin"
 
-#: mail/mail-session.c:287
+#: mail/mail-session.c:284
 msgid "_Remember this password"
 msgstr "Bu parolu _yadda saxla"
 
-#: mail/mail-session.c:288
+#: mail/mail-session.c:285
 #, fuzzy
 msgid "_Remember this password for the remainder of this session"
 msgstr "Bu iclas boyunca bu parolu yadda saxla"
@@ -13761,17 +14079,21 @@ msgstr "Çatdırılmış ismarış - %s"
 msgid "Forwarded message"
 msgstr "Çatdırılmış ismarış"
 
-#: mail/mail-vfolder.c:91
+#: mail/mail-tools.c:438
+msgid "Forwarded Message"
+msgstr "Çatdırılmış İsmarış"
+
+#: mail/mail-vfolder.c:92
 #, c-format
 msgid "Setting up vfolder: %s"
 msgstr "vfolder qurulur: %s"
 
-#: mail/mail-vfolder.c:209
+#: mail/mail-vfolder.c:210
 #, c-format
 msgid "Updating vfolders for uri: %s"
 msgstr "Uri üçün vfolder məlumatı güncəllənir: %s"
 
-#: mail/mail-vfolder.c:467
+#: mail/mail-vfolder.c:468
 #, c-format
 msgid ""
 "The following vFolder(s):\n"
@@ -13784,96 +14106,101 @@ msgstr ""
 "    '%s'\n"
 "Və güncəlləndilər."
 
-#: mail/mail-vfolder.c:776
+#: mail/mail-vfolder.c:777
 msgid "VFolders"
 msgstr "VFolderlər"
 
-#: mail/mail-vfolder.c:834
+#: mail/mail-vfolder.c:835
 #, fuzzy
 msgid "vFolders"
 msgstr "Qovluqlar"
 
-#: mail/mail-vfolder.c:873
+#: mail/mail-vfolder.c:874
 msgid "Edit VFolder"
 msgstr "VFolder-i Düzəlt"
 
-#: mail/mail-vfolder.c:893
+#: mail/mail-vfolder.c:894
 #, c-format
 msgid "Trying to edit a vfolder '%s' which doesn't exist."
 msgstr "Mövcud olmayan '%s' vfolder-i düzəldilməyə çalışılır."
 
-#: mail/mail-vfolder.c:965
+#: mail/mail-vfolder.c:966
 msgid "New VFolder"
 msgstr "Yeni VFolder"
 
-#: mail/message-list.c:900
+#: mail/message-browser.c:233
+msgid "(No subject)"
+msgstr "(Mövzusuz)"
+
+#: mail/message-browser.c:235
+#, c-format
+msgid "%s - Message"
+msgstr "%s - İsmarış"
+
+#: mail/message-list.c:741
 msgid "Unseen"
 msgstr "Görülməmiş"
 
-#: mail/message-list.c:901
+#: mail/message-list.c:742
 msgid "Seen"
 msgstr "Görülmüş"
 
-#: mail/message-list.c:902
+#: mail/message-list.c:743
 msgid "Answered"
 msgstr "Cavab cerilmiş"
 
-#: mail/message-list.c:903
+#: mail/message-list.c:744
 msgid "Multiple Unseen Messages"
 msgstr "Çoxlu Görülməmiş İsmarış"
 
-#: mail/message-list.c:904
+#: mail/message-list.c:745
 msgid "Multiple Messages"
 msgstr "Çoxlu İsmarış"
 
-#: mail/message-list.c:908
+#: mail/message-list.c:749
 msgid "Lowest"
 msgstr "Ən Alçaq"
 
-#: mail/message-list.c:909
+#: mail/message-list.c:750
 msgid "Lower"
 msgstr "Alçalt"
 
-#: mail/message-list.c:913
+#: mail/message-list.c:754
 msgid "Higher"
 msgstr "Yüksək"
 
-#: mail/message-list.c:914
+#: mail/message-list.c:755
 msgid "Highest"
 msgstr "Ən Yüksək"
 
-#: mail/message-list.c:1231
+#: mail/message-list.c:1072
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:1238
+#: mail/message-list.c:1079
 msgid "Today %l:%M %p"
 msgstr "Bugün %l:%M %p"
 
-#: mail/message-list.c:1247
+#: mail/message-list.c:1088
 msgid "Yesterday %l:%M %p"
 msgstr "Sabah: %l:%M %p"
 
-#: mail/message-list.c:1259
+#: mail/message-list.c:1100
 msgid "%a %l:%M %p"
 msgstr "%a %l %M %p"
 
-#: mail/message-list.c:1267
+#: mail/message-list.c:1108
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %l:%M %p"
 
-#: mail/message-list.c:1269
+#: mail/message-list.c:1110
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
-#: mail/message-list.c:3062
+#: mail/message-list.c:2649
 msgid "Generating message list"
 msgstr "İsmarış siyahısı yaradılır"
 
-#: mail/message-list.etspec.h:2
-msgid "Date"
-msgstr "Tarix"
-
 #: mail/message-list.etspec.h:3
 #, fuzzy
 msgid "Due By"
@@ -13892,10 +14219,6 @@ msgstr "Bayraqlı"
 msgid "Follow Up Flag"
 msgstr ""
 
-#: mail/message-list.etspec.h:7 mail/message-tag-followup.c:301
-msgid "From"
-msgstr "Göndərən"
-
 #: mail/message-list.etspec.h:8
 #, fuzzy
 msgid "Original Location"
@@ -13909,10 +14232,6 @@ msgstr "Alındı"
 msgid "Size"
 msgstr "Böyüklük"
 
-#: mail/message-list.etspec.h:14
-msgid "To"
-msgstr "Gn:"
-
 #: mail/message-tag-followup.c:62
 #, fuzzy
 msgid "Call"
@@ -13932,7 +14251,7 @@ msgstr ""
 msgid "For Your Information"
 msgstr "Mənbə Məlumatı"
 
-#: mail/message-tag-followup.c:66 ui/evolution-mail-message.xml.h:40
+#: mail/message-tag-followup.c:66 ui/evolution-mail-message.xml.h:36
 msgid "Forward"
 msgstr "Çatdır"
 
@@ -13940,11 +14259,11 @@ msgstr "Çatdır"
 msgid "No Response Necessary"
 msgstr ""
 
-#: mail/message-tag-followup.c:69 ui/evolution-mail-message.xml.h:77
+#: mail/message-tag-followup.c:69 ui/evolution-mail-message.xml.h:72
 msgid "Reply"
 msgstr "Cavab ver"
 
-#: mail/message-tag-followup.c:70 ui/evolution-mail-message.xml.h:78
+#: mail/message-tag-followup.c:70 ui/evolution-mail-message.xml.h:73
 msgid "Reply to All"
 msgstr "Hamısına cavab ver"
 
@@ -13978,6 +14297,39 @@ msgstr "Aidiyyət"
 msgid "_Flag:"
 msgstr "Fayl adı:"
 
+#: mail/subscribe-dialog.c:230
+#, c-format
+msgid "Scanning folders under %s on \"%s\""
+msgstr "%s altındakı qovluqlar daranır (\"%s\" üstündəki)"
+
+#: mail/subscribe-dialog.c:232
+#, c-format
+msgid "Scanning root-level folders on \"%s\""
+msgstr "\"%s\" üstündəki kök səviyyəsi qovluqlar daranır"
+
+#: mail/subscribe-dialog.c:329
+#, c-format
+msgid "Subscribing to folder \"%s\""
+msgstr "\"%s\" qovluğuna qeydiyyat aparılır"
+
+#: mail/subscribe-dialog.c:331
+#, c-format
+msgid "Unsubscribing to folder \"%s\""
+msgstr "\"%s\" qovluğuna qeydiyyat silinir"
+
+#: mail/subscribe-dialog.c:1270 mail/subscribe-dialog.etspec.h:1
+#: shell/e-storage-set-view.etspec.h:2
+msgid "Folder"
+msgstr "Qovluq"
+
+#: mail/subscribe-dialog.c:1499
+msgid "No server has been selected"
+msgstr "Heç verici seçilməyib"
+
+#: mail/subscribe-dialog.c:1598
+msgid "Please select a server."
+msgstr "Verici seçin."
+
 #: mail/subscribe-dialog.glade.h:1
 #, fuzzy
 msgid "Folder Subscriptions"
@@ -13994,129 +14346,18 @@ msgid "S_erver:"
 msgstr "_Verici adı:"
 
 #: mail/subscribe-dialog.glade.h:4
+#, fuzzy
+msgid "Scanning folders ..."
+msgstr "_Qovluqda qeyd et ..."
+
+#: mail/subscribe-dialog.glade.h:5
 msgid "_Subscribe"
 msgstr "_Qeydiyyatdan Keç"
 
-#: mail/subscribe-dialog.glade.h:5
+#: mail/subscribe-dialog.glade.h:6
 msgid "_Unsubscribe"
 msgstr "Qeydiyyatdan _Çıx"
 
-#: my-evolution/component-factory.c:56
-msgid "Folder containing the Evolution Summary"
-msgstr "Evolution İcmalını daxil edən qovluqlar"
-
-#: my-evolution/e-summary.c:204
-msgid "%A, %B %e %Y"
-msgstr "%A, %B %e %Y"
-
-#: my-evolution/e-summary.c:533
-#, fuzzy
-msgid "Please wait..."
-msgstr "Xahiş edirik gözləyin"
-
-#: my-evolution/e-summary.c:622 ui/my-evolution.xml.h:2
-msgid "Print Summary"
-msgstr "İcmalı Çap Et"
-
-#: my-evolution/e-summary.c:655
-msgid "Printing of Summary failed"
-msgstr "İcmal Çapı bacarılmadı"
-
-#: my-evolution/e-summary-calendar.c:384
-msgid "Appointments"
-msgstr "Görüşlər"
-
-#: my-evolution/e-summary-calendar.c:392
-#, fuzzy
-msgid "No appointments."
-msgstr "Görüş yoxdur"
-
-#: my-evolution/e-summary-calendar.c:409
-msgid "%k:%M %d %B"
-msgstr "%k:%M %d %B"
-
-#: my-evolution/e-summary-calendar.c:411
-#, fuzzy
-msgid "%l:%M%p %d %B"
-msgstr "%l:%M %d %B"
-
-#: my-evolution/e-summary-calendar.c:429
-#, fuzzy
-msgid "No description"
-msgstr "izah"
-
-#: my-evolution/e-summary-mail.c:189
-msgid "Mail summary"
-msgstr "Poçt icmalı"
-
-#: my-evolution/e-summary-preferences.c:355
-msgid "Dictionary.com Word of the Day"
-msgstr "Dictionary.com Word of the Day"
-
-#: my-evolution/e-summary-preferences.c:373
-msgid "Quotes of the Day"
-msgstr "Günün Sitatları"
-
-#: my-evolution/e-summary-preferences.c:565
-#, fuzzy
-msgid "New News Feed"
-msgstr "Yeni Bəsləmə"
-
-#: my-evolution/e-summary-preferences.c:581
-#, fuzzy
-msgid "_URL:"
-msgstr "URL:"
-
-#: my-evolution/e-summary-rdf.c:315
-msgid "Error downloading RDF"
-msgstr "RDF endirmə xətası"
-
-#: my-evolution/e-summary-rdf.c:453
-msgid "News Feed"
-msgstr "Yeni Bəsləmə"
-
-#: my-evolution/e-summary-shown.c:496
-msgid "All"
-msgstr ""
-
-#: my-evolution/e-summary-shown.c:521 my-evolution/e-summary-table.c:58
-#, fuzzy
-msgid "Shown"
-msgstr "Yağış"
-
-#: my-evolution/e-summary-tasks.c:349
-msgid "No tasks"
-msgstr "Vəzifə yoxdur"
-
-#: my-evolution/e-summary-tasks.c:387
-#, fuzzy
-msgid "blue"
-msgstr "Üzv"
-
-#: my-evolution/e-summary-tasks.c:387
-msgid "(No Description)"
-msgstr "(İzahsız)"
-
-#: my-evolution/e-summary-weather.c:72
-msgid "My Weather"
-msgstr "Mənim Hava Vəziyyətim"
-
-#: my-evolution/e-summary-weather.c:261
-msgid "There was an error downloading data for"
-msgstr ""
-
-#: my-evolution/e-summary-weather.c:478 my-evolution/my-evolution.glade.h:16
-msgid "Weather"
-msgstr "Hava"
-
-#. translators: Put here a list of codes for locations you want to
-#. see in My Evolution by default. You can find the list of all
-#. stations and their codes in Evolution sources
-#. (evolution/my-evolution/Locations)
-#: my-evolution/e-summary-weather.c:582
-msgid "KBOS"
-msgstr "KBOS"
-
 #: my-evolution/GNOME_Evolution_Summary.server.in.in.h:1
 #, fuzzy
 msgid "Configure the appearance of the Evolution Summary here"
@@ -24986,6 +25227,117 @@ msgstr ""
 msgid "Zurich"
 msgstr "Türkçə"
 
+#: my-evolution/component-factory.c:56
+msgid "Folder containing the Evolution Summary"
+msgstr "Evolution İcmalını daxil edən qovluqlar"
+
+#: my-evolution/e-summary-calendar.c:381
+msgid "Appointments"
+msgstr "Görüşlər"
+
+#: my-evolution/e-summary-calendar.c:389
+#, fuzzy
+msgid "No appointments."
+msgstr "Görüş yoxdur"
+
+#: my-evolution/e-summary-calendar.c:406
+msgid "%k:%M %d %B"
+msgstr "%k:%M %d %B"
+
+#: my-evolution/e-summary-calendar.c:408
+#, fuzzy
+msgid "%l:%M%P %d %B"
+msgstr "%l:%M %d %B"
+
+#: my-evolution/e-summary-calendar.c:426
+#, fuzzy
+msgid "No description"
+msgstr "izah"
+
+#: my-evolution/e-summary-mail.c:189
+msgid "Mail summary"
+msgstr "Poçt icmalı"
+
+#: my-evolution/e-summary-preferences.c:355
+msgid "Dictionary.com Word of the Day"
+msgstr "Dictionary.com Word of the Day"
+
+#: my-evolution/e-summary-preferences.c:373
+msgid "Quotes of the Day"
+msgstr "Günün Sitatları"
+
+#: my-evolution/e-summary-preferences.c:565
+#, fuzzy
+msgid "New News Feed"
+msgstr "Yeni Bəsləmə"
+
+#: my-evolution/e-summary-preferences.c:581
+#, fuzzy
+msgid "_URL:"
+msgstr "URL:"
+
+#: my-evolution/e-summary-rdf.c:315
+msgid "Error downloading RDF"
+msgstr "RDF endirmə xətası"
+
+#: my-evolution/e-summary-rdf.c:453
+msgid "News Feed"
+msgstr "Yeni Bəsləmə"
+
+#: my-evolution/e-summary-shown.c:496
+msgid "All"
+msgstr ""
+
+#: my-evolution/e-summary-shown.c:521 my-evolution/e-summary-table.c:58
+#, fuzzy
+msgid "Shown"
+msgstr "Yağış"
+
+#: my-evolution/e-summary-tasks.c:330
+msgid "No tasks"
+msgstr "Vəzifə yoxdur"
+
+#: my-evolution/e-summary-tasks.c:364
+msgid "(No Description)"
+msgstr "(İzahsız)"
+
+#: my-evolution/e-summary-weather.c:73
+msgid "My Weather"
+msgstr "Mənim Hava Vəziyyətim"
+
+#: my-evolution/e-summary-weather.c:262
+msgid "There was an error downloading data for"
+msgstr ""
+
+#: my-evolution/e-summary-weather.c:479 my-evolution/my-evolution.glade.h:16
+msgid "Weather"
+msgstr "Hava"
+
+#. translators: Put here a list of codes for locations you want to
+#. see in My Evolution by default. You can find the list of all
+#. stations and their codes in Evolution sources
+#. (evolution/my-evolution/Locations)
+#: my-evolution/e-summary-weather.c:583
+msgid "KBOS"
+msgstr "KBOS"
+
+#: my-evolution/e-summary.c:204
+msgid "%A, %B %e %Y"
+msgstr "%A, %B %e %Y"
+
+#: my-evolution/e-summary.c:533
+#, fuzzy
+msgid "Please wait..."
+msgstr "Xahiş edirik gözləyin"
+
+#: my-evolution/e-summary.c:622 ui/my-evolution.xml.h:2
+msgid "Print Summary"
+msgstr "İcmalı Çap Et"
+
+#: my-evolution/e-summary.c:655
+msgid "Printing of Summary failed"
+msgstr "İcmal Çapı bacarılmadı"
+
 #: my-evolution/metar.c:30
 #, fuzzy
 msgid " F"
@@ -26255,27 +26607,24 @@ msgstr "_Bur Gün"
 msgid "_Show full path for folders"
 msgstr "Qovluqların tam cığırını g_östər"
 
-#: notes/component-factory.c:27
-#: shell/e-shell-user-creatable-items-handler.c:587
-#: shell/e-shell-user-creatable-items-handler.c:643
-#: widgets/misc/e-charset-picker.c:109
-msgid "New"
-msgstr "Yeni"
+#: shell/GNOME_Evolution_Shell.server.in.in.h:1
+msgid "Configure special folders and offline folder behavior here"
+msgstr ""
 
-#: notes/component-factory.c:27
+#: shell/GNOME_Evolution_Shell.server.in.in.h:2
 #, fuzzy
-msgid "Create a new note"
-msgstr "Yeni qovluq yarat"
+msgid "Evolution Shell"
+msgstr "Evolution qabığı."
 
-#: notes/component-factory.c:152
+#: shell/GNOME_Evolution_Shell.server.in.in.h:3
 #, fuzzy
-msgid "Cannot initialize Evolution's notes component."
-msgstr "Evolutionun qovluq info parçasını başlada bilmədim ."
+msgid "Evolution folder settings configuration control"
+msgstr "Evolutionun Vəzifə parçası emalatxanası."
 
-#: notes/main.c:30
+#: shell/GNOME_Evolution_Shell.server.in.in.h:4
 #, fuzzy
-msgid "Notes Component: Could not initialize bonobo"
-msgstr "İcraçı icmal qismi Bonobo-nu hazırlaya bilmədi.\n"
+msgid "Folder Settings"
+msgstr "Qurğular"
 
 #: shell/e-activity-handler.c:164
 msgid "Show Details"
@@ -26373,50 +26722,6 @@ msgstr ""
 msgid "Brought to you by"
 msgstr "Sizə gətirən"
 
-#: shell/e-shell.c:175
-#, fuzzy, c-format
-msgid ""
-"Cannot activate component %s :\n"
-"The error from the activation system is:\n"
-"%s"
-msgstr ""
-"%s\n"
-"\n"
-"Fəallaşdırma sistemi xətası:\n"
-"%s"
-
-#: shell/e-shell.c:741
-#, c-format
-msgid "Cannot set up local storage -- %s"
-msgstr "Yerli qeydi quraşdıra bilmədim -- %s"
-
-#: shell/e-shell.c:1804
-#, c-format
-msgid ""
-"The Evolution component that handles folders of type \"%s\"\n"
-"has unexpectedly quit. You will need to quit Evolution and restart\n"
-"in order to access that data again."
-msgstr ""
-"\"%s\" növündəki qovluqları işləyə bilən Evolution komponenti gözlənilməz\n"
-"şəkildə öldü. Evolution proqramından çıxıb yenidən başlatmalısınız ki,\n"
-"verilənlərə yenidən çata biləsiniz."
-
-#: shell/e-shell.c:2069
-msgid "Invalid arguments"
-msgstr "Hökmsüz arqumentlər"
-
-#: shell/e-shell.c:2071
-msgid "Cannot register on OAF"
-msgstr "OAF-a qeyd edə bilmirəm"
-
-#: shell/e-shell.c:2073
-msgid "Configuration Database not found"
-msgstr "Quraşdırma Databeyzi Tapılmadı"
-
-#: shell/e-shell.c:2075 shell/e-storage.c:568
-msgid "Generic error"
-msgstr "Ümumi xəta"
-
 #: shell/e-shell-config-autocompletion.c:110
 #, fuzzy
 msgid "Extra Completion folders"
@@ -26516,32 +26821,27 @@ msgstr ""
 "Qovluaq adı dəyişdirilə bilmir:\n"
 "%s"
 
-#: shell/e-shell-folder-commands.c:534
+#: shell/e-shell-folder-commands.c:538
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "%s qovluğu adını buna dəyişdir:"
 
-#: shell/e-shell-folder-commands.c:541
+#: shell/e-shell-folder-commands.c:544
 #, fuzzy
 msgid "Rename Folder"
 msgstr "Qovluğun adını dəyişdir"
 
-#: shell/e-shell-folder-commands.c:547
+#: shell/e-shell-folder-commands.c:553
 #: shell/e-shell-folder-creation-dialog.c:180
 #, c-format
 msgid "The specified folder name is not valid: %s"
 msgstr "Bildirilən qovluq adı hökmlü deyildir: %s"
 
-#: shell/e-shell-folder-commands.c:554
-#, c-format
-msgid "A folder named \"%s\" already exists. Please use a different name."
-msgstr ""
-
-#: shell/e-shell-folder-commands.c:584
+#: shell/e-shell-folder-commands.c:587
 msgid "Selected folder does not belong to another user"
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:587
+#: shell/e-shell-folder-commands.c:590
 #, fuzzy, c-format
 msgid ""
 "Cannot remove folder:\n"
@@ -26586,19 +26886,11 @@ msgstr ""
 "Əgər təsəvvürünüz yoxdursa \"Avtomatik\" seçənəyini seçin, \"Evolution\" özü "
 "bildiyi kimi edər."
 
-#: shell/e-shell-importer.c:148 shell/e-shell-startup-wizard.c:724
+#: shell/e-shell-importer.c:148 shell/e-shell-startup-wizard.c:709
 msgid "Please select the information that you would like to import:"
 msgstr "Xahiş edirik, idxal edəcəyiniz məlumatı seçin:"
 
-#: shell/e-shell-importer.c:151
-msgid ""
-"Evolution checked for settings to import from the following\n"
-"applications: Pine, Netscape, Elm, iCalendar. No settings\n"
-"that could be imported where found. If you would like to\n"
-"try again, please click the \"Back\" button.\n"
-msgstr ""
-
-#: shell/e-shell-importer.c:219 shell/e-shell-importer.c:250
+#: shell/e-shell-importer.c:213 shell/e-shell-importer.c:244
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -26607,23 +26899,23 @@ msgstr ""
 "%s Alınır\n"
 "%d üzvü alınır."
 
-#: shell/e-shell-importer.c:323
+#: shell/e-shell-importer.c:317
 #, fuzzy
 msgid "Select importer"
 msgstr "Qovluq Seçin"
 
-#: shell/e-shell-importer.c:464
+#: shell/e-shell-importer.c:458
 #, c-format
 msgid "File %s does not exist"
 msgstr "`%s' faylı yoxdur"
 
-#: shell/e-shell-importer.c:465 shell/e-shell-importer.c:482
-#: shell/e-shell-importer.c:524
+#: shell/e-shell-importer.c:459 shell/e-shell-importer.c:476
+#: shell/e-shell-importer.c:518
 #, fuzzy
 msgid "Evolution Error"
 msgstr "Evolution"
 
-#: shell/e-shell-importer.c:481
+#: shell/e-shell-importer.c:475
 #, c-format
 msgid ""
 "There is no importer that is able to handle\n"
@@ -26632,11 +26924,11 @@ msgstr ""
 "İş görəcək alıcı mövcud deyildir\n"
 "%s"
 
-#: shell/e-shell-importer.c:490
+#: shell/e-shell-importer.c:484
 msgid "Importing"
 msgstr "Alınır"
 
-#: shell/e-shell-importer.c:497
+#: shell/e-shell-importer.c:491
 #, c-format
 msgid ""
 "Importing %s.\n"
@@ -26645,17 +26937,17 @@ msgstr ""
 "%s Alınır.\n"
 "%s Başladılır"
 
-#: shell/e-shell-importer.c:509
+#: shell/e-shell-importer.c:503
 #, c-format
 msgid "Error starting %s"
 msgstr "%s başladırkən xəta oldu"
 
-#: shell/e-shell-importer.c:523
+#: shell/e-shell-importer.c:517
 #, c-format
 msgid "Error loading %s"
 msgstr "%s yüklənərkən xəta oldu"
 
-#: shell/e-shell-importer.c:540
+#: shell/e-shell-importer.c:534
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -26664,35 +26956,31 @@ msgstr ""
 "%s Alınır\n"
 "Alınan üzv 1."
 
-#: shell/e-shell-importer.c:594
+#: shell/e-shell-importer.c:588
 msgid "Automatic"
 msgstr "Avtomatik"
 
-#: shell/e-shell-importer.c:643
-#, fuzzy
-msgid "_Filename:"
+#: shell/e-shell-importer.c:637
+msgid "Filename:"
 msgstr "Fayl adı:"
 
-#: shell/e-shell-importer.c:648
+#: shell/e-shell-importer.c:642
 msgid "Select a file"
 msgstr "Fayl seç"
 
-#: shell/e-shell-importer.c:658
-#, fuzzy
-msgid "File _type:"
+#: shell/e-shell-importer.c:651
+msgid "File type:"
 msgstr "Fayl növü:"
 
-#: shell/e-shell-importer.c:684
-#, fuzzy
-msgid "Import data and settings from _older programs"
+#: shell/e-shell-importer.c:676
+msgid "Import data and settings from older programs"
 msgstr "Köhnə proqramlardakı verilən və qurğuları idxal et"
 
-#: shell/e-shell-importer.c:687
-#, fuzzy
-msgid "Import a _single file"
+#: shell/e-shell-importer.c:680
+msgid "Import a single file"
 msgstr "Tək fayl idxal et"
 
-#: shell/e-shell-importer.c:755 shell/e-shell-startup-wizard.c:553
+#: shell/e-shell-importer.c:746 shell/e-shell-startup-wizard.c:538
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
@@ -26700,26 +26988,25 @@ msgstr ""
 "Xahiş edirik gözləyin...\n"
 "Mövcud qurğular axtarılır"
 
-#: shell/e-shell-importer.c:758
+#: shell/e-shell-importer.c:749
 msgid "Starting Intelligent Importers"
 msgstr "Ağıllı İdxalçılar Başladılır"
 
-#: shell/e-shell-importer.c:884 shell/e-shell-startup-wizard.c:679
+#: shell/e-shell-importer.c:873 shell/e-shell-startup-wizard.c:664
 #, c-format
 msgid "From %s:"
 msgstr "Göndərən %s:"
 
-#: shell/e-shell-importer.c:1061
+#: shell/e-shell-importer.c:1047
 msgid "Select folder"
 msgstr "Qovluq seçin"
 
-#: shell/e-shell-importer.c:1062
+#: shell/e-shell-importer.c:1048
 msgid "Select a destination folder for importing this data"
 msgstr "Bu verilənin idxal ediləcəyi hədəf qovluğu seçin"
 
-#: shell/e-shell-importer.c:1193
-#, fuzzy
-msgid "_Import"
+#: shell/e-shell-importer.c:1178 shell/importer/intelligent.c:191
+msgid "Import"
 msgstr "Al"
 
 #: shell/e-shell-offline-handler.c:592
@@ -26786,19 +27073,11 @@ msgstr ""
 "Bildirilən qovluq yaradıla bilmədi:\n"
 "%s"
 
-#: shell/e-shell-startup-wizard.c:771
-msgid ""
-"If you quit the Evolution Setup Assistant now, all of the information that "
-"you have entered will be forgotten. You will need to run this assistant "
-"again before using Evolution.\n"
-"\n"
-"Do you want to quit using the Assistant now?"
-msgstr ""
-
-#: shell/e-shell-startup-wizard.c:782
-#, fuzzy
-msgid "Quit Assistant"
-msgstr "Köməkçi"
+#: shell/e-shell-user-creatable-items-handler.c:586
+#: shell/e-shell-user-creatable-items-handler.c:642
+#: widgets/misc/e-charset-picker.c:109
+msgid "New"
+msgstr "Yeni"
 
 #: shell/e-shell-utils.c:116
 msgid "No folder name specified."
@@ -26822,35 +27101,6 @@ msgstr "Qovluq ad Return xarakteri daxil edə bilməz."
 msgid "'.' and '..' are reserved folder names."
 msgstr "'.' və '..' saxlanmış qovluq adlarıdır."
 
-#: shell/e-shell-view.c:264
-msgid "(No folder displayed)"
-msgstr "( Heç bir qovluq göstərilmir )"
-
-#: shell/e-shell-view.c:2040
-#, c-format
-msgid "%s (%d)"
-msgstr "%s (%d)"
-
-#: shell/e-shell-view.c:2042
-msgid "(None)"
-msgstr "(Heç Biri)"
-
-#: shell/e-shell-view.c:2083
-msgid ""
-"Ximian Evolution is currently online.  Click on this button to work offline."
-msgstr ""
-"Ximian Evolution hazırda xətdədir. Xətdən çıxmaq üçün bu düyməyə basın."
-
-#: shell/e-shell-view.c:2090
-msgid "Ximian Evolution is in the process of going offline."
-msgstr "Ximian Evolution xətdən çıxmaq gedişatındadır."
-
-#: shell/e-shell-view.c:2096
-msgid ""
-"Ximian Evolution is currently offline.  Click on this button to work online."
-msgstr ""
-"Ximian Evolution hazırda xətdə deyil. Xətdə girmək üçün bu düyməyə tıqlayın."
-
 #: shell/e-shell-view-menu.c:89
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr "GNOME Pilot vasitəlri deyəsən sistemə qurulu deyil."
@@ -26902,13 +27152,78 @@ msgstr "Xətdən Qopuq _İşlə"
 msgid "Work Offline"
 msgstr "Xətdən Qopuq İşlə"
 
-#: shell/e-shortcuts.c:649
-msgid "Error saving shortcuts."
-msgstr "Qısa yolları qeyd edərkən xəta oldu."
+#: shell/e-shell-view.c:264
+msgid "(No folder displayed)"
+msgstr "( Heç bir qovluq göstərilmir )"
 
-#: shell/e-shortcuts.c:1096
-msgid "Shortcuts"
-msgstr "Qısa Yollar"
+#: shell/e-shell-view.c:2040
+#, c-format
+msgid "%s (%d)"
+msgstr "%s (%d)"
+
+#: shell/e-shell-view.c:2042
+msgid "(None)"
+msgstr "(Heç Biri)"
+
+#: shell/e-shell-view.c:2083
+msgid ""
+"Ximian Evolution is currently online.  Click on this button to work offline."
+msgstr ""
+"Ximian Evolution hazırda xətdədir. Xətdən çıxmaq üçün bu düyməyə basın."
+
+#: shell/e-shell-view.c:2090
+msgid "Ximian Evolution is in the process of going offline."
+msgstr "Ximian Evolution xətdən çıxmaq gedişatındadır."
+
+#: shell/e-shell-view.c:2096
+msgid ""
+"Ximian Evolution is currently offline.  Click on this button to work online."
+msgstr ""
+"Ximian Evolution hazırda xətdə deyil. Xətdə girmək üçün bu düyməyə tıqlayın."
+
+#: shell/e-shell.c:175
+#, fuzzy, c-format
+msgid ""
+"Cannot activate component %s :\n"
+"The error from the activation system is:\n"
+"%s"
+msgstr ""
+"%s\n"
+"\n"
+"Fəallaşdırma sistemi xətası:\n"
+"%s"
+
+#: shell/e-shell.c:741
+#, c-format
+msgid "Cannot set up local storage -- %s"
+msgstr "Yerli qeydi quraşdıra bilmədim -- %s"
+
+#: shell/e-shell.c:1804
+#, c-format
+msgid ""
+"The Evolution component that handles folders of type \"%s\"\n"
+"has unexpectedly quit. You will need to quit Evolution and restart\n"
+"in order to access that data again."
+msgstr ""
+"\"%s\" növündəki qovluqları işləyə bilən Evolution komponenti gözlənilməz\n"
+"şəkildə öldü. Evolution proqramından çıxıb yenidən başlatmalısınız ki,\n"
+"verilənlərə yenidən çata biləsiniz."
+
+#: shell/e-shell.c:2069
+msgid "Invalid arguments"
+msgstr "Hökmsüz arqumentlər"
+
+#: shell/e-shell.c:2071
+msgid "Cannot register on OAF"
+msgstr "OAF-a qeyd edə bilmirəm"
+
+#: shell/e-shell.c:2073
+msgid "Configuration Database not found"
+msgstr "Quraşdırma Databeyzi Tapılmadı"
+
+#: shell/e-shell.c:2075 shell/e-storage.c:568
+msgid "Generic error"
+msgstr "Ümumi xəta"
 
 #: shell/e-shortcuts-view.c:80
 #, fuzzy
@@ -27030,6 +27345,18 @@ msgstr "_Sil"
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "Bu qısa yolu qısa yol çubuğundan sil"
 
+#: shell/e-shortcuts.c:649
+msgid "Error saving shortcuts."
+msgstr "Qısa yolları qeyd edərkən xəta oldu."
+
+#: shell/e-shortcuts.c:1096
+msgid "Shortcuts"
+msgstr "Qısa Yollar"
+
+#: shell/e-storage-set-view.etspec.h:1
+msgid "Checkbox"
+msgstr ""
+
 #: shell/e-storage.c:566
 msgid "No error"
 msgstr "Xəta yoxdur"
@@ -27086,14 +27413,6 @@ msgstr "Bu adda qovluq yarada bilmədim"
 msgid "This operation cannot be performed in off-line mode"
 msgstr ""
 
-#: shell/e-storage-set-view.etspec.h:1
-msgid "Checkbox"
-msgstr ""
-
-#: shell/e-storage-set-view.etspec.h:2
-msgid "Folder"
-msgstr "Qovluq"
-
 #: shell/e-task-widget.c:211
 #, c-format
 msgid "%s (...)"
@@ -27108,103 +27427,103 @@ msgstr "%s (%d%% qurtardı)"
 msgid "<click here to select a folder>"
 msgstr "<qovluq seçmək üçün buraya tıqlayın>"
 
-#: shell/evolution-shell-component.c:1187
+#: shell/evolution-shell-component-utils.c:124
+#, c-format
+msgid ""
+"%s\n"
+"\n"
+"Unknown error."
+msgstr ""
+"%s\n"
+"\n"
+"Naməlum xəta."
+
+#: shell/evolution-shell-component-utils.c:127
+#, c-format
+msgid ""
+"%s\n"
+"\n"
+"The error from the component system is:\n"
+"%s"
+msgstr ""
+"%s\n"
+"\n"
+"Komponent sistemi xətası:\n"
+"%s"
+
+#: shell/evolution-shell-component-utils.c:134
+#, c-format
+msgid ""
+"%s\n"
+"\n"
+"The error from the activation system is:\n"
+"%s"
+msgstr ""
+"%s\n"
+"\n"
+"Fəallaşdırma sistemi xətası:\n"
+"%s"
+
+#: shell/evolution-shell-component.c:1184
 msgid "CORBA error"
 msgstr "CORBA xətası"
 
-#: shell/evolution-shell-component.c:1189
+#: shell/evolution-shell-component.c:1186
 msgid "Interrupted"
 msgstr "Kəsilmiş"
 
-#: shell/evolution-shell-component.c:1191
+#: shell/evolution-shell-component.c:1188
 msgid "Invalid argument"
 msgstr "Səhv qrqument"
 
-#: shell/evolution-shell-component.c:1193
+#: shell/evolution-shell-component.c:1190
 msgid "Already has an owner"
 msgstr "Onsuz da yiyəsi var"
 
-#: shell/evolution-shell-component.c:1195
+#: shell/evolution-shell-component.c:1192
 msgid "No owner"
 msgstr "Yiyəsi yoxdur"
 
-#: shell/evolution-shell-component.c:1197
+#: shell/evolution-shell-component.c:1194
 msgid "Not found"
 msgstr "Tapıla bilmədi"
 
-#: shell/evolution-shell-component.c:1199
+#: shell/evolution-shell-component.c:1196
 msgid "Unsupported type"
 msgstr "Dəstəklənməyən növ"
 
-#: shell/evolution-shell-component.c:1201
+#: shell/evolution-shell-component.c:1198
 msgid "Unsupported schema"
 msgstr "Dəstəklənməyən sxem"
 
-#: shell/evolution-shell-component.c:1203
+#: shell/evolution-shell-component.c:1200
 msgid "Unsupported operation"
 msgstr "Dəstəklənməyən gedişat"
 
-#: shell/evolution-shell-component.c:1205
+#: shell/evolution-shell-component.c:1202
 msgid "Internal error"
 msgstr "Daxili xəta"
 
-#: shell/evolution-shell-component.c:1209
+#: shell/evolution-shell-component.c:1206
 msgid "Exists"
 msgstr "Mövcuddur"
 
-#: shell/evolution-shell-component.c:1211
+#: shell/evolution-shell-component.c:1208
 msgid "Invalid URI"
 msgstr "Hökmsüz URI"
 
-#: shell/evolution-shell-component.c:1215
+#: shell/evolution-shell-component.c:1212
 msgid "Has subfolders"
 msgstr "Alt qovluqları var"
 
-#: shell/evolution-shell-component.c:1217
+#: shell/evolution-shell-component.c:1214
 msgid "No space left"
 msgstr "Heç yer qalmayıb"
 
-#: shell/evolution-shell-component.c:1219
+#: shell/evolution-shell-component.c:1216
 msgid "Old owner has died"
 msgstr "Köhnə yiyəsi öldü"
 
-#: shell/evolution-shell-component-utils.c:124
-#, c-format
-msgid ""
-"%s\n"
-"\n"
-"Unknown error."
-msgstr ""
-"%s\n"
-"\n"
-"Naməlum xəta."
-
-#: shell/evolution-shell-component-utils.c:127
-#, c-format
-msgid ""
-"%s\n"
-"\n"
-"The error from the component system is:\n"
-"%s"
-msgstr ""
-"%s\n"
-"\n"
-"Komponent sistemi xətası:\n"
-"%s"
-
-#: shell/evolution-shell-component-utils.c:134
-#, c-format
-msgid ""
-"%s\n"
-"\n"
-"The error from the activation system is:\n"
-"%s"
-msgstr ""
-"%s\n"
-"\n"
-"Fəallaşdırma sistemi xətası:\n"
-"%s"
-
 #: shell/evolution-test-component.c:63
 #, fuzzy
 msgid "Test type"
@@ -27325,25 +27644,6 @@ msgstr ""
 "\n"
 "Qurğularınızı qeyd etmək üçün \"Qurtar\" düyməsinə basın. "
 
-#: shell/GNOME_Evolution_Shell.server.in.in.h:1
-msgid "Configure special folders and offline folder behavior here"
-msgstr ""
-
-#: shell/GNOME_Evolution_Shell.server.in.in.h:2
-#, fuzzy
-msgid "Evolution Shell"
-msgstr "Evolution qabığı."
-
-#: shell/GNOME_Evolution_Shell.server.in.in.h:3
-#, fuzzy
-msgid "Evolution folder settings configuration control"
-msgstr "Evolutionun Vəzifə parçası emalatxanası."
-
-#: shell/GNOME_Evolution_Shell.server.in.in.h:4
-#, fuzzy
-msgid "Folder Settings"
-msgstr "Qurğular"
-
 #: shell/importer/import.glade.h:1
 msgid "Click \"Import\" to begin importing the file into Evolution. "
 msgstr "Faylın \"Evolution\" içina alınması üçün \"Al\" düyməsini tıqlayın. "
@@ -27382,10 +27682,6 @@ msgstr ""
 msgid "Importers"
 msgstr "İdxalçılar"
 
-#: shell/importer/intelligent.c:191
-msgid "Import"
-msgstr "Al"
-
 #: shell/importer/intelligent.c:195
 msgid "Don't import"
 msgstr "İdxal etmə"
@@ -27563,7 +27859,7 @@ msgstr "Seçili ismarışları başqa bir cərgəyə daşı"
 msgid "Move to Folder..."
 msgstr "Qovluğa _Daşı ..."
 
-#: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:18
+#: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:17
 msgid "Paste the clipboard"
 msgstr "Ara yaddaşı yapışdır"
 
@@ -27571,9 +27867,9 @@ msgstr "Ara yaddaşı yapışdır"
 msgid "Previews the contacts to be printed"
 msgstr "Çap ediləcək əlaqəni nümayiş etdirər"
 
-#: ui/evolution-addressbook.xml.h:17 ui/evolution-calendar.xml.h:20
-#: ui/evolution-comp-editor.xml.h:9 ui/evolution-mail-message.xml.h:73
-#: ui/evolution-tasks.xml.h:13
+#: ui/evolution-addressbook.xml.h:17 ui/evolution-calendar.xml.h:19
+#: ui/evolution-comp-editor.xml.h:9 ui/evolution-mail-message.xml.h:68
+#: ui/evolution-tasks.xml.h:12
 msgid "Print Pre_view"
 msgstr "Çap Etmə Nüma_yişi"
 
@@ -27618,21 +27914,17 @@ msgstr "Yükləməni Dayandır"
 msgid "View the current contact"
 msgstr "indiki vaxt"
 
-#: ui/evolution-addressbook.xml.h:29 ui/evolution-calendar.xml.h:32
-#: ui/evolution-comp-editor.xml.h:16 ui/evolution-contact-editor.xml.h:13
-#: ui/evolution-contact-list-editor.xml.h:11
+#: ui/evolution-addressbook.xml.h:29 ui/evolution-calendar.xml.h:28
+#: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:11
+#: ui/evolution-contact-list-editor.xml.h:10
 #: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:17
-#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-messagedisplay.xml.h:4
-#: ui/evolution-mail-message.xml.h:99 ui/evolution-task-editor.xml.h:9
-#: ui/evolution-tasks.xml.h:16 ui/evolution.xml.h:42
+#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:93
+#: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-task-editor.xml.h:9
+#: ui/evolution-tasks.xml.h:14 ui/evolution.xml.h:42
 msgid "_Actions"
 msgstr "_Gedişlər"
 
-#: ui/evolution-addressbook.xml.h:31
-msgid "_Copy to Folder..."
-msgstr "Qovluğa _Köçürt..."
-
-#: ui/evolution-addressbook.xml.h:34 ui/evolution-contact-editor.xml.h:16
+#: ui/evolution-addressbook.xml.h:34 ui/evolution-contact-editor.xml.h:13
 msgid "_Forward Contact..."
 msgstr "Əlaqənı _Çatdır..."
 
@@ -27704,61 +27996,46 @@ msgstr "Xüsusi bir tarixə get"
 msgid "Go to today"
 msgstr "Bugünə get"
 
-#: ui/evolution-calendar.xml.h:17
+#: ui/evolution-calendar.xml.h:16
 msgid "Month"
 msgstr "Ay"
 
-#: ui/evolution-calendar.xml.h:19
+#: ui/evolution-calendar.xml.h:18
 msgid "Previews the calendar to be printed"
 msgstr "Çap ediləcək təqvimi nümayiş etdirər"
 
-#: ui/evolution-calendar.xml.h:21
+#: ui/evolution-calendar.xml.h:20
 msgid "Print this calendar"
 msgstr "Bu təqvimi çap et"
 
-#: ui/evolution-calendar.xml.h:22
+#: ui/evolution-calendar.xml.h:21
 msgid "Publish Free/Busy information for this calendar"
 msgstr "Bu təqcimdə Sərbəst/Məşğul məlumatını dərc et"
 
-#: ui/evolution-calendar.xml.h:23 ui/evolution-tasks.xml.h:15
-#, fuzzy
-msgid "Purg_e"
-msgstr "Qaynaqlar"
-
-#: ui/evolution-calendar.xml.h:24
-#, fuzzy
-msgid "Purge old appointments and meetings"
-msgstr "Görüş və hadisələri daxil edən qovluq"
-
-#: ui/evolution-calendar.xml.h:25
-#, fuzzy
-msgid "Show as list"
-msgstr "Təfsilatı Göstər"
-
-#: ui/evolution-calendar.xml.h:26
+#: ui/evolution-calendar.xml.h:22
 msgid "Show one day"
 msgstr "Bir günü göstər"
 
-#: ui/evolution-calendar.xml.h:27
+#: ui/evolution-calendar.xml.h:23
 msgid "Show one month"
 msgstr "Bir ayı göstər"
 
-#: ui/evolution-calendar.xml.h:28
+#: ui/evolution-calendar.xml.h:24
 msgid "Show one week"
 msgstr "Bir həftəni göster"
 
-#: ui/evolution-calendar.xml.h:29
+#: ui/evolution-calendar.xml.h:25
 msgid "Show the working week"
 msgstr "İş həftəsini göstər"
 
-#: ui/evolution-calendar.xml.h:30
+#: ui/evolution-calendar.xml.h:26
 msgid "Week"
 msgstr "Həftə"
 
-#: ui/evolution-comp-editor.xml.h:2 ui/evolution-contact-editor.xml.h:2
-#: ui/evolution-contact-list-editor.xml.h:2
+#: ui/evolution-comp-editor.xml.h:2 ui/evolution-contact-editor.xml.h:1
+#: ui/evolution-contact-list-editor.xml.h:1
 #: ui/evolution-mail-messagedisplay.xml.h:1
-#: ui/evolution-message-composer.xml.h:3 ui/evolution-signature-editor.xml.h:2
+#: ui/evolution-message-composer.xml.h:3 ui/evolution-signature-editor.xml.h:1
 #: ui/evolution.xml.h:5
 msgid "Close"
 msgstr "Qapat"
@@ -27767,7 +28044,7 @@ msgstr "Qapat"
 msgid "Close this item"
 msgstr "Bu üzvü qapat"
 
-#: ui/evolution-comp-editor.xml.h:5 ui/evolution-contact-editor.xml.h:4
+#: ui/evolution-comp-editor.xml.h:5 ui/evolution-contact-editor.xml.h:3
 msgid "Delete this item"
 msgstr "Bu üzvü sil"
 
@@ -27780,59 +28057,48 @@ msgstr "Ana vasitə çubuğu"
 msgid "Preview the printed item"
 msgstr "Çap ediləcək üzvü nümayiş etdir"
 
-#: ui/evolution-comp-editor.xml.h:10 ui/evolution-contact-editor.xml.h:7
+#: ui/evolution-comp-editor.xml.h:10 ui/evolution-contact-editor.xml.h:6
 msgid "Print this item"
 msgstr "Bu üzvü çap et"
 
-#: ui/evolution-comp-editor.xml.h:11 ui/evolution-contact-editor.xml.h:8
-#: ui/evolution-contact-list-editor.xml.h:5
-#: ui/evolution-message-composer.xml.h:18
-msgid "Save _As..."
-msgstr "_Fərqli Qeyd Et ..."
+#: ui/evolution-comp-editor.xml.h:12 ui/evolution-message-composer.xml.h:16
+#: ui/evolution-signature-editor.xml.h:5
+msgid "Save"
+msgstr "Qeyd Et"
+
+#: ui/evolution-comp-editor.xml.h:13
+msgid "Save As..."
+msgstr "Fərqli Qeyd Et ..."
 
-#: ui/evolution-comp-editor.xml.h:12 ui/evolution-contact-editor.xml.h:9
+#: ui/evolution-comp-editor.xml.h:14 ui/evolution-contact-editor.xml.h:8
 #: ui/evolution-contact-list-editor.xml.h:6
-#: ui/evolution-signature-editor.xml.h:7
+#: ui/evolution-signature-editor.xml.h:6
 msgid "Save and Close"
 msgstr "Qeyd Et və Qapat"
 
-#: ui/evolution-comp-editor.xml.h:13 ui/evolution-contact-editor.xml.h:10
-#: ui/evolution-contact-list-editor.xml.h:7
-#: ui/evolution-signature-editor.xml.h:8
-#, fuzzy
-msgid "Save and _Close"
-msgstr "Qeyd Et və Qapat"
-
-#: ui/evolution-comp-editor.xml.h:14
+#: ui/evolution-comp-editor.xml.h:15
 msgid "Save the item and close the dialog box"
 msgstr "Üzvü qeyd et və dialoqu qapat"
 
-#: ui/evolution-comp-editor.xml.h:15
+#: ui/evolution-comp-editor.xml.h:16
 msgid "Save this item to disk"
 msgstr "Bu üzvü diskə qeyd et"
 
-#: ui/evolution-comp-editor.xml.h:18 ui/evolution-contact-editor.xml.h:15
-#: ui/evolution-contact-list-editor.xml.h:13
+#: ui/evolution-comp-editor.xml.h:18 ui/evolution-contact-editor.xml.h:12
+#: ui/evolution-contact-list-editor.xml.h:11
 #: ui/evolution-mail-messagedisplay.xml.h:7
 #: ui/evolution-message-composer.xml.h:42
-#: ui/evolution-signature-editor.xml.h:13 ui/evolution-subscribe.xml.h:11
+#: ui/evolution-signature-editor.xml.h:12 ui/evolution-subscribe.xml.h:11
 #: ui/evolution.xml.h:46
 msgid "_File"
 msgstr "_Fayl"
 
-#: ui/evolution-comp-editor.xml.h:20 ui/evolution-contact-editor.xml.h:18
-#: ui/evolution-contact-list-editor.xml.h:14
-#: ui/evolution-message-composer.xml.h:47
-#: ui/evolution-signature-editor.xml.h:15
-msgid "_Save"
-msgstr "_Qeyd Et ..."
-
 #: ui/evolution-composer-entries.xml.h:1
 #, fuzzy
 msgid "Copy selected text to the clipboard"
 msgstr "Seçili ismarışları başqa cərgəyə köçür"
 
-#: ui/evolution-composer-entries.xml.h:2 ui/evolution-mail-message.xml.h:21
+#: ui/evolution-composer-entries.xml.h:2 ui/evolution-mail-list.xml.h:3
 msgid "Cu_t"
 msgstr "K_əs"
 
@@ -27856,40 +28122,52 @@ msgstr "_Hamısını Seç"
 msgid "Select all text"
 msgstr "Bütün əlaqələri seç"
 
-#: ui/evolution-contact-editor.xml.h:6
+#: ui/evolution-contact-editor.xml.h:5
 msgid "Print En_velope..."
 msgstr "_Zərfi Çap Et..."
 
-#: ui/evolution-contact-editor.xml.h:11
+#: ui/evolution-contact-editor.xml.h:7
+#: ui/evolution-contact-list-editor.xml.h:5
+#: ui/evolution-message-composer.xml.h:18
+msgid "Save _As..."
+msgstr "_Fərqli Qeyd Et ..."
+
+#: ui/evolution-contact-editor.xml.h:9
 #, fuzzy
 msgid "Save the contact and close the dialog box"
 msgstr "Əlaqəni qeyd et və dialoqu qapat"
 
-#: ui/evolution-contact-editor.xml.h:12
+#: ui/evolution-contact-editor.xml.h:10
 msgid "Send _Message to Contact..."
 msgstr "_İsmarışı Əlaqəyə Göndər..."
 
-#: ui/evolution-contact-list-editor.xml.h:4
+#: ui/evolution-contact-editor.xml.h:15
+#: ui/evolution-contact-list-editor.xml.h:12
+#: ui/evolution-message-composer.xml.h:47
+#: ui/evolution-signature-editor.xml.h:14
+msgid "_Save"
+msgstr "_Qeyd Et ..."
+
+#: ui/evolution-contact-list-editor.xml.h:3
 msgid "Delete this list"
 msgstr "Bu siyahını sil"
 
-#: ui/evolution-contact-list-editor.xml.h:8
+#: ui/evolution-contact-list-editor.xml.h:4
+msgid "Delete..."
+msgstr "Sil..."
+
+#: ui/evolution-contact-list-editor.xml.h:7
 msgid "Save the list and close the dialog box"
 msgstr "Siyahını qeyd et və dialoqu qapat"
 
-#: ui/evolution-contact-list-editor.xml.h:9
+#: ui/evolution-contact-list-editor.xml.h:8
 msgid "Se_nd list to other..."
 msgstr "Siyahını başqalarına gö_ndər..."
 
-#: ui/evolution-contact-list-editor.xml.h:10
+#: ui/evolution-contact-list-editor.xml.h:9
 msgid "Send _message to list..."
 msgstr "qrupa _ismarış göndər..."
 
-#: ui/evolution-contact-list-editor.xml.h:12
-#, fuzzy
-msgid "_Delete..."
-msgstr "Sil..."
-
 #: ui/evolution-event-editor.xml.h:1
 msgid "Cancel Mee_ting"
 msgstr "Görü_şü Ləğv Et"
@@ -27965,7 +28243,7 @@ msgstr "Bütün seçili ismarışları bütün qovluqlardan tamamilə sil"
 
 #: ui/evolution-mail-global.xml.h:11
 #, fuzzy
-msgid "Post Ne_w Message"
+msgid "Post New Message"
 msgstr "_Yeni İsmarış Yaz"
 
 #: ui/evolution-mail-global.xml.h:12
@@ -28002,21 +28280,16 @@ msgstr "_Nümayiş Paneli"
 msgid "Change the properties of this folder"
 msgstr "Bu cərgənin xüsusiyyətlərini dəyişdir"
 
-#: ui/evolution-mail-list.xml.h:2 ui/evolution-mail-message.xml.h:10
+#: ui/evolution-mail-list.xml.h:2
 #, fuzzy
 msgid "Copy selected message(s) to the clipboard"
 msgstr "Seçili ismarışları başqa cərgəyə köçür"
 
-#: ui/evolution-mail-list.xml.h:3 ui/evolution-mail-message.xml.h:22
+#: ui/evolution-mail-list.xml.h:4
 #, fuzzy
 msgid "Cut selected message(s) to the clipboard"
 msgstr "Ara yaddaşdakı ismarışı yapışdır"
 
-#: ui/evolution-mail-list.xml.h:4
-#, fuzzy
-msgid "E_xpunge"
-msgstr "_Təmizlə"
-
 #: ui/evolution-mail-list.xml.h:5
 msgid "Hide S_elected Messages"
 msgstr "S_eçili İsmarışları Gizlə"
@@ -28035,15 +28308,14 @@ msgid ""
 msgstr "Üstünə çızıq çəkmək yerinə silinmiş ismarışları eləcə gizlə"
 
 #: ui/evolution-mail-list.xml.h:9
-#, fuzzy
-msgid "Mark All as _Read"
+msgid "Mark All as R_ead"
 msgstr "Hamısını O_xunmış olaraq İşarələ"
 
 #: ui/evolution-mail-list.xml.h:10
 msgid "Mark all visible messages as read"
 msgstr "Bütün görünəbilən ismarışları oxunmuş olaraq işarələ"
 
-#: ui/evolution-mail-list.xml.h:11 ui/evolution-mail-message.xml.h:66
+#: ui/evolution-mail-list.xml.h:11
 #, fuzzy
 msgid "Paste message(s) from the clipboard"
 msgstr "Ara yaddaşdakı ismarışı yapışdır"
@@ -28089,37 +28361,26 @@ msgstr "Seçili ismarışları müvəqqəti gizlə"
 msgid "Threaded Message list"
 msgstr "İlgək_lənmiş İsmarışlar Siyahısı"
 
-#: ui/evolution-mail-list.xml.h:25 ui/evolution.xml.h:47
+#: ui/evolution-mail-list.xml.h:26 ui/evolution-tasks.xml.h:18
+msgid "_Expunge"
+msgstr "_Təmizlə"
+
+#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:47
 msgid "_Folder"
 msgstr "_Qovluq"
 
-#: ui/evolution-mail-list.xml.h:26 ui/evolution-subscribe.xml.h:12
+#: ui/evolution-mail-list.xml.h:28 ui/evolution-subscribe.xml.h:12
 msgid "_Invert Selection"
 msgstr "Seçkiyi _Tərs Çevir"
 
-#: ui/evolution-mail-list.xml.h:27
+#: ui/evolution-mail-list.xml.h:30
 msgid "_Properties..."
 msgstr "_Seçənəklər..."
 
-#: ui/evolution-mail-list.xml.h:28
+#: ui/evolution-mail-list.xml.h:31
 msgid "_Threaded Message List"
 msgstr "İlmək_lənmiş İsmarışlar Siyahısı"
 
-#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:6
-msgid "Close this window"
-msgstr "Bu pəncərəni qapat"
-
-#: ui/evolution-mail-messagedisplay.xml.h:5
-#: ui/evolution-message-composer.xml.h:39 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:43
-msgid "_Close"
-msgstr "_Qapat"
-
-#: ui/evolution-mail-messagedisplay.xml.h:8
-#: ui/evolution-message-composer.xml.h:49 ui/evolution.xml.h:64
-msgid "_View"
-msgstr "_Göstər"
-
 #: ui/evolution-mail-message.xml.h:1
 #, fuzzy
 msgid "A_dd Sender to Addressbook"
@@ -28140,435 +28401,424 @@ msgid "Apply filter rules to the selected messages"
 msgstr "Seçili ismarışlarlara süzmə qaydaları əlavə et"
 
 #: ui/evolution-mail-message.xml.h:5
-#, fuzzy
-msgid "Caret _Mode"
-msgstr "Mətn Bö_yüklüyü"
-
-#: ui/evolution-mail-message.xml.h:6
 msgid "Compose a reply to all of the recipients of the selected message"
 msgstr "Seçili ismarış göndərən bütün alıcılara cavab yaz"
 
-#: ui/evolution-mail-message.xml.h:7
+#: ui/evolution-mail-message.xml.h:6
 msgid "Compose a reply to the mailing list of the selected message"
 msgstr "Seçili ismarış göndərən məktublaşma qrupuna cavab yaz"
 
-#: ui/evolution-mail-message.xml.h:8
+#: ui/evolution-mail-message.xml.h:7
 msgid "Compose a reply to the sender of the selected message"
 msgstr "Seçili ismarış göndərənə cavab yaz"
 
-#: ui/evolution-mail-message.xml.h:11
+#: ui/evolution-mail-message.xml.h:9
 msgid "Copy selected messages to another folder"
 msgstr "Seçili ismarışları başqa cərgəyə köçür"
 
-#: ui/evolution-mail-message.xml.h:12
+#: ui/evolution-mail-message.xml.h:10
 msgid "Create _Virtual Folder From Message"
 msgstr "İsmarışdan _Virtual Qovluq Yarat"
 
-#: ui/evolution-mail-message.xml.h:13
+#: ui/evolution-mail-message.xml.h:11
 msgid "Create a rule to filter messages from this sender"
 msgstr "Bu yollayanların ismarışlarını süzmək üçün qayda yarat"
 
-#: ui/evolution-mail-message.xml.h:14
+#: ui/evolution-mail-message.xml.h:12
 msgid "Create a rule to filter messages to these recipients"
 msgstr "Bu alıcıların ismarışlarını süzmək üçün qayda yarat"
 
-#: ui/evolution-mail-message.xml.h:15
+#: ui/evolution-mail-message.xml.h:13
 msgid "Create a rule to filter messages to this mailing list"
 msgstr "Bu məktublaşma qrupundakı ismarışları süzmək üçün qayda yarat"
 
-#: ui/evolution-mail-message.xml.h:16
+#: ui/evolution-mail-message.xml.h:14
 msgid "Create a rule to filter messages with this subject"
 msgstr "Bu mövzulu ismarışları süzmək üçün qayda yarat"
 
-#: ui/evolution-mail-message.xml.h:17
+#: ui/evolution-mail-message.xml.h:15
 msgid "Create a virtual folder for these recipients"
 msgstr "Bu alıcılara virtual qovluq yarat"
 
-#: ui/evolution-mail-message.xml.h:18
+#: ui/evolution-mail-message.xml.h:16
 msgid "Create a virtual folder for this mailing list"
 msgstr "Bu məktublaşma qrupuna virtual qovluq yarat"
 
-#: ui/evolution-mail-message.xml.h:19
+#: ui/evolution-mail-message.xml.h:17
 msgid "Create a virtual folder for this sender"
 msgstr "Bu yollayana virtual qovluq yarat"
 
-#: ui/evolution-mail-message.xml.h:20
+#: ui/evolution-mail-message.xml.h:18
 msgid "Create a virtual folder for this subject"
 msgstr "Bu mövzuya virtual qovluq yarat"
 
-#: ui/evolution-mail-message.xml.h:23
+#: ui/evolution-mail-message.xml.h:19
 msgid "Decrease the text size"
 msgstr "Mətn böyüklüyünü azalt"
 
-#: ui/evolution-mail-message.xml.h:25
+#: ui/evolution-mail-message.xml.h:21
 msgid "Display the next important message"
 msgstr "Sonrakı vacib ismarışı göstər"
 
-#: ui/evolution-mail-message.xml.h:26
+#: ui/evolution-mail-message.xml.h:22
 msgid "Display the next message"
 msgstr "Sonrakı ismarışı göstər"
 
-#: ui/evolution-mail-message.xml.h:27
+#: ui/evolution-mail-message.xml.h:23
 msgid "Display the next unread message"
 msgstr "Sonrakı oxunamış ismarışı göstər"
 
-#: ui/evolution-mail-message.xml.h:28
+#: ui/evolution-mail-message.xml.h:24
 msgid "Display the next unread thread"
 msgstr "Sonrakı oxunmamış ismarışı göstər"
 
-#: ui/evolution-mail-message.xml.h:29
+#: ui/evolution-mail-message.xml.h:25
 msgid "Display the previous important message"
 msgstr "Əvvəlki vacib ismarışı göstər"
 
-#: ui/evolution-mail-message.xml.h:30
+#: ui/evolution-mail-message.xml.h:26
 msgid "Display the previous message"
 msgstr "Əvvəlki ismarışı göstər"
 
-#: ui/evolution-mail-message.xml.h:31
+#: ui/evolution-mail-message.xml.h:27
 msgid "Display the previous unread message"
 msgstr "Əvvəlki oxunmamış ismarışı göstər"
 
-#: ui/evolution-mail-message.xml.h:32
+#: ui/evolution-mail-message.xml.h:28
 #, fuzzy
 msgid "F_orward"
 msgstr "Çatdır"
 
-#: ui/evolution-mail-message.xml.h:33
+#: ui/evolution-mail-message.xml.h:29
 msgid "Filter on Mailing _List..."
 msgstr "Məktublaşma Q_rupuna görə Süz..."
 
-#: ui/evolution-mail-message.xml.h:34
+#: ui/evolution-mail-message.xml.h:30
 msgid "Filter on Se_nder..."
 msgstr "Gö_ndərənə görə Süz..."
 
-#: ui/evolution-mail-message.xml.h:35
+#: ui/evolution-mail-message.xml.h:31
 msgid "Filter on _Recipients..."
 msgstr "Alı_cıya görə Süz..."
 
-#: ui/evolution-mail-message.xml.h:36
+#: ui/evolution-mail-message.xml.h:32
 msgid "Filter on _Subject..."
 msgstr "Möv_zuya  görə Süz..."
 
-#: ui/evolution-mail-message.xml.h:37
+#: ui/evolution-mail-message.xml.h:33
 #, fuzzy
 msgid "Flag selected message(s) for follow-up"
 msgstr "Seçili ismarışları silmə üçün işarələ"
 
-#: ui/evolution-mail-message.xml.h:38
+#: ui/evolution-mail-message.xml.h:34
 msgid "Follow _Up..."
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:39
+#: ui/evolution-mail-message.xml.h:35
 msgid "Force images in HTML mail to be loaded"
 msgstr "Məktubdakı HTML içindəki rəsmləri yüklənməyə məcbur et"
 
-#: ui/evolution-mail-message.xml.h:41
+#: ui/evolution-mail-message.xml.h:37
 msgid "Forward the selected message in the body of a new message"
 msgstr "Seçili ismarışı yeni ismarış vücudunda çatdır"
 
-#: ui/evolution-mail-message.xml.h:42
+#: ui/evolution-mail-message.xml.h:38
 msgid "Forward the selected message quoted like a reply"
 msgstr "Seçili ismarışı sitatını cavab olaraq çatdır"
 
-#: ui/evolution-mail-message.xml.h:43
+#: ui/evolution-mail-message.xml.h:39
 msgid "Forward the selected message to someone"
 msgstr "Seçili ismarışı birinə çatdır"
 
-#: ui/evolution-mail-message.xml.h:44
+#: ui/evolution-mail-message.xml.h:40
 msgid "Forward the selected message to someone as an attachment"
 msgstr "Seçili ismarışı birinə ilişdirərək çatdır"
 
-#: ui/evolution-mail-message.xml.h:45
+#: ui/evolution-mail-message.xml.h:41
 msgid "Increase the text size"
 msgstr "Mətn böyüklüyün artıq"
 
-#: ui/evolution-mail-message.xml.h:46
+#: ui/evolution-mail-message.xml.h:42
 msgid "Load _Images"
 msgstr "_Rəsmləri Yüklə"
 
-#: ui/evolution-mail-message.xml.h:47
-msgid "Mar_k as Read"
-msgstr "Oxun_muş olaraq İşarələ"
-
-#: ui/evolution-mail-message.xml.h:48
+#: ui/evolution-mail-message.xml.h:44
 msgid "Mark as I_mportant"
 msgstr "_Vacib olaraq İşarələ"
 
-#: ui/evolution-mail-message.xml.h:49
+#: ui/evolution-mail-message.xml.h:45
 msgid "Mark as U_nread"
 msgstr "Ox_unmamış olaraq İşarələ"
 
-#: ui/evolution-mail-message.xml.h:50
+#: ui/evolution-mail-message.xml.h:46
 msgid "Mark as Unimp_ortant"
 msgstr "Qeyri-Va_cib olaraq İşarələ"
 
-#: ui/evolution-mail-message.xml.h:51
+#: ui/evolution-mail-message.xml.h:47
 #, fuzzy
 msgid "Mark the selected message(s) as having been read"
 msgstr "İşarələ"
 
-#: ui/evolution-mail-message.xml.h:52
+#: ui/evolution-mail-message.xml.h:48
 #, fuzzy
 msgid "Mark the selected message(s) as important"
 msgstr "Seçili ismarışları vacib olaraq işarələ"
 
-#: ui/evolution-mail-message.xml.h:53
+#: ui/evolution-mail-message.xml.h:49
 #, fuzzy
 msgid "Mark the selected message(s) as not having been read"
 msgstr "İsmarışı əvvəl oxunmamış olaraq İşarələ"
 
-#: ui/evolution-mail-message.xml.h:54
+#: ui/evolution-mail-message.xml.h:50
 #, fuzzy
 msgid "Mark the selected message(s) as unimportant"
 msgstr "Seçili ismarışları vacib olaraq işarələ"
 
-#: ui/evolution-mail-message.xml.h:55
+#: ui/evolution-mail-message.xml.h:51
 msgid "Mark the selected messages for deletion"
 msgstr "Seçili ismarışları silmə üçün işarələ"
 
-#: ui/evolution-mail-message.xml.h:56
+#: ui/evolution-mail-message.xml.h:52
 msgid "Move"
 msgstr "Daşı"
 
-#: ui/evolution-mail-message.xml.h:57
+#: ui/evolution-mail-message.xml.h:53
 #, fuzzy
 msgid "Move selected message(s) to another folder"
 msgstr "Seçili ismarışları başqa bir cərgəyə daşı"
 
-#: ui/evolution-mail-message.xml.h:58
+#: ui/evolution-mail-message.xml.h:54
 msgid "Next"
 msgstr "İrəli"
 
-#: ui/evolution-mail-message.xml.h:59
+#: ui/evolution-mail-message.xml.h:55
 #, fuzzy
 msgid "Next _Important Message"
 msgstr "Sonrakı Vacib İsmarış"
 
-#: ui/evolution-mail-message.xml.h:60
+#: ui/evolution-mail-message.xml.h:56
 #, fuzzy
 msgid "Next _Thread"
 msgstr "Sonrakı İlmək"
 
-#: ui/evolution-mail-message.xml.h:61
+#: ui/evolution-mail-message.xml.h:57
 #, fuzzy
 msgid "Next _Unread Message"
 msgstr "Sonrakı Oxunmamış İsmarış"
 
-#: ui/evolution-mail-message.xml.h:62
+#: ui/evolution-mail-message.xml.h:58
 msgid "Open the selected message in a new window"
 msgstr "Seçili ismarışı yeni pəncərədə aç"
 
-#: ui/evolution-mail-message.xml.h:63
+#: ui/evolution-mail-message.xml.h:59
 msgid "Open the selected message in the composer to re-send it"
 msgstr "Seçili ismarışı yenidən yollamaq üçün yazma qutusunda aç"
 
-#: ui/evolution-mail-message.xml.h:64
+#: ui/evolution-mail-message.xml.h:60
 msgid "Original Si_ze"
 msgstr "Əsl Bö_yüklük"
 
-#: ui/evolution-mail-message.xml.h:65
+#: ui/evolution-mail-message.xml.h:61
 #, fuzzy
 msgid "P_revious Unread Message"
 msgstr "Əvvəlki Oxunmamış İsmarış"
 
-#: ui/evolution-mail-message.xml.h:67
+#: ui/evolution-mail-message.xml.h:62
 #, fuzzy
-msgid "Post a Repl_y"
+msgid "Post a Reply"
 msgstr "Vəzifə Cavabı"
 
-#: ui/evolution-mail-message.xml.h:68
+#: ui/evolution-mail-message.xml.h:63
 #, fuzzy
 msgid "Post a reply to a message in a Public folder"
 msgstr "Bütün qovluqlarda yeni ePoçt üçün bax"
 
-#: ui/evolution-mail-message.xml.h:69
+#: ui/evolution-mail-message.xml.h:64
 #, fuzzy
 msgid "Pr_evious Important Message"
 msgstr "Əvvəlki Vacib İsmarış"
 
-#: ui/evolution-mail-message.xml.h:70
+#: ui/evolution-mail-message.xml.h:65
 msgid "Preview the message to be printed"
 msgstr "Çap ediləcək ismarışı nümayiş etdir"
 
-#: ui/evolution-mail-message.xml.h:71
+#: ui/evolution-mail-message.xml.h:66
 msgid "Previous"
 msgstr "Əvvəlki"
 
-#: ui/evolution-mail-message.xml.h:74
+#: ui/evolution-mail-message.xml.h:69
 msgid "Print this message"
 msgstr "İsmarışı çap et"
 
-#: ui/evolution-mail-message.xml.h:75
+#: ui/evolution-mail-message.xml.h:70
 msgid "Re_direct"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:76
+#: ui/evolution-mail-message.xml.h:71
 #, fuzzy
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "Seçili ismarışı birinə çatdır"
 
-#: ui/evolution-mail-message.xml.h:79
-msgid "Reply to _All"
-msgstr "_Hamısına Cavab Ver"
-
-#: ui/evolution-mail-message.xml.h:80
-msgid "Reply to _List"
-msgstr "_Qrupa Cavab Ver"
-
-#: ui/evolution-mail-message.xml.h:81
+#: ui/evolution-mail-message.xml.h:76
 msgid "Reset the text to its original size"
 msgstr "Mətni əsl böyüklüyünə sıfırla"
 
-#: ui/evolution-mail-message.xml.h:82
-#, fuzzy
-msgid "S_earch in Message..."
+#: ui/evolution-mail-message.xml.h:77
+msgid "S_earch Message..."
 msgstr "İsmarışı A_xtar..."
 
-#: ui/evolution-mail-message.xml.h:83
+#: ui/evolution-mail-message.xml.h:78
 msgid "S_maller"
 msgstr "Daha Ki_çik"
 
-#: ui/evolution-mail-message.xml.h:84
+#: ui/evolution-mail-message.xml.h:79
 msgid "Save the message as a text file"
 msgstr "İsmarışı mətn faylı olaraq göstər"
 
-#: ui/evolution-mail-message.xml.h:85
+#: ui/evolution-mail-message.xml.h:80
 msgid "Search for text in the body of the displayed message"
 msgstr "Göstərilən ismarışın vücudunda mətn axtar"
 
-#: ui/evolution-mail-message.xml.h:86
+#: ui/evolution-mail-message.xml.h:81
 #, fuzzy
 msgid "Set up the page settings for your current printer"
 msgstr "Səhifə qurğularını hazırkı çap edicinizə göra uyğunlaşdırın"
 
-#: ui/evolution-mail-message.xml.h:87
+#: ui/evolution-mail-message.xml.h:82
 msgid "Show Email _Source"
 msgstr "Məktub _Mənbəyini Göstər"
 
-#: ui/evolution-mail-message.xml.h:88
+#: ui/evolution-mail-message.xml.h:83
 msgid "Show Full _Headers"
 msgstr "_Tam Başlıqları Göstər"
 
-#: ui/evolution-mail-message.xml.h:89
-#, fuzzy
-msgid "Show a blinking cursor in the body of displayed messages"
-msgstr "Göstərilən ismarışın vücudunda mətn axtar"
-
-#: ui/evolution-mail-message.xml.h:90
+#: ui/evolution-mail-message.xml.h:84
 msgid "Show message in the normal style"
 msgstr "İsmarışı normal tərzdə göstər"
 
-#: ui/evolution-mail-message.xml.h:91
+#: ui/evolution-mail-message.xml.h:85
 msgid "Show message with all email headers"
 msgstr "İsmarışı bütün başlıqlarla göstər"
 
-#: ui/evolution-mail-message.xml.h:92
+#: ui/evolution-mail-message.xml.h:86
 msgid "Show the raw email source of the message"
 msgstr "İsmarışın mənbəyini göstər"
 
-#: ui/evolution-mail-message.xml.h:93
+#: ui/evolution-mail-message.xml.h:87
 msgid "Text Si_ze"
 msgstr "Mətn Bö_yüklüyü"
 
-#: ui/evolution-mail-message.xml.h:94
+#: ui/evolution-mail-message.xml.h:88
 msgid "Un-delete the selected messages"
 msgstr "Seçili ismarışı silmə"
 
-#: ui/evolution-mail-message.xml.h:95
+#: ui/evolution-mail-message.xml.h:89
 msgid "VFolder on Mailing _List..."
 msgstr "Məktublaşma Q_rupundakı VFolder..."
 
-#: ui/evolution-mail-message.xml.h:96
+#: ui/evolution-mail-message.xml.h:90
 msgid "VFolder on Se_nder..."
 msgstr "Gön_dərəndəki VFolder..."
 
-#: ui/evolution-mail-message.xml.h:97
+#: ui/evolution-mail-message.xml.h:91
 msgid "VFolder on _Recipients..."
 msgstr "_Alıcıdakı VFolder..."
 
-#: ui/evolution-mail-message.xml.h:98
+#: ui/evolution-mail-message.xml.h:92
 msgid "VFolder on _Subject..."
 msgstr "_Mövzudakı VFolder..."
 
-#: ui/evolution-mail-message.xml.h:100
+#: ui/evolution-mail-message.xml.h:94
 #, fuzzy
 msgid "_Attached"
 msgstr "Yapışdır"
 
-#: ui/evolution-mail-message.xml.h:102
+#: ui/evolution-mail-message.xml.h:95
 msgid "_Copy to Folder"
 msgstr "Qovluğa _Köçürt"
 
-#: ui/evolution-mail-message.xml.h:103
+#: ui/evolution-mail-message.xml.h:96
 msgid "_Create Filter From Message"
 msgstr "İsmarışdan Qayda _Yarat"
 
-#: ui/evolution-mail-message.xml.h:105
+#: ui/evolution-mail-message.xml.h:98
 msgid "_Forward Message"
 msgstr "İsmarışı Çat_dır"
 
-#: ui/evolution-mail-message.xml.h:106
+#: ui/evolution-mail-message.xml.h:99
 #, fuzzy
 msgid "_Go To"
 msgstr "Get"
 
-#: ui/evolution-mail-message.xml.h:107
+#: ui/evolution-mail-message.xml.h:100
 #, fuzzy
 msgid "_Inline"
 msgstr "Daxili"
 
-#: ui/evolution-mail-message.xml.h:108
+#: ui/evolution-mail-message.xml.h:101
 msgid "_Larger"
 msgstr "Daha _Enli"
 
-#: ui/evolution-mail-message.xml.h:109
+#: ui/evolution-mail-message.xml.h:102
 msgid "_Message Display"
 msgstr "_İsmarış Ekranı"
 
-#: ui/evolution-mail-message.xml.h:110
+#: ui/evolution-mail-message.xml.h:103
 msgid "_Move to Folder"
 msgstr "Qovluğa _Daşı"
 
-#: ui/evolution-mail-message.xml.h:111
+#: ui/evolution-mail-message.xml.h:104
 #, fuzzy
 msgid "_Next Message"
 msgstr "Sonrakı İsmarış"
 
-#: ui/evolution-mail-message.xml.h:112
+#: ui/evolution-mail-message.xml.h:105
 msgid "_Normal Display"
 msgstr "_Normal Ekran"
 
-#: ui/evolution-mail-message.xml.h:113
+#: ui/evolution-mail-message.xml.h:106
 msgid "_Open Message"
 msgstr "İsmarışı _Aç"
 
-#: ui/evolution-mail-message.xml.h:115
+#: ui/evolution-mail-message.xml.h:107
 #, fuzzy
 msgid "_Previous Message"
 msgstr "Əvvəlki İsmarış"
 
-#: ui/evolution-mail-message.xml.h:117
+#: ui/evolution-mail-message.xml.h:109
 #, fuzzy
 msgid "_Quoted"
 msgstr "Sitatlandırılmış"
 
-#: ui/evolution-mail-message.xml.h:118
-msgid "_Reply to Sender"
-msgstr "Göndərənə _Cavab Ver"
-
-#: ui/evolution-mail-message.xml.h:119
+#: ui/evolution-mail-message.xml.h:111
 #, fuzzy
 msgid "_Resend..."
 msgstr "_Adını Dəyişdir..."
 
-#: ui/evolution-mail-message.xml.h:121 ui/evolution.xml.h:63
+#: ui/evolution-mail-message.xml.h:113 ui/evolution.xml.h:63
 msgid "_Tools"
 msgstr "_Vasitələr"
 
-#: ui/evolution-mail-message.xml.h:122
+#: ui/evolution-mail-message.xml.h:114
 msgid "_Undelete"
 msgstr "_Geri Gətir"
 
+#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:6
+msgid "Close this window"
+msgstr "Bu pəncərəni qapat"
+
+#: ui/evolution-mail-messagedisplay.xml.h:5
+#: ui/evolution-message-composer.xml.h:39
+#: ui/evolution-signature-editor.xml.h:10 ui/evolution-subscribe.xml.h:9
+#: ui/evolution.xml.h:43
+msgid "_Close"
+msgstr "_Qapat"
+
+#: ui/evolution-mail-messagedisplay.xml.h:8
+#: ui/evolution-message-composer.xml.h:49 ui/evolution.xml.h:64
+msgid "_View"
+msgstr "_Göstər"
+
 #: ui/evolution-message-composer.xml.h:1
 msgid "Attach"
 msgstr "Yapışdır"
@@ -28577,7 +28827,7 @@ msgstr "Yapışdır"
 msgid "Attach a file"
 msgstr "Bir fayl yapışdır"
 
-#: ui/evolution-message-composer.xml.h:4 ui/evolution-signature-editor.xml.h:3
+#: ui/evolution-message-composer.xml.h:4 ui/evolution-signature-editor.xml.h:2
 msgid "Close the current file"
 msgstr "Hazırkı faylı qapat"
 
@@ -28593,7 +28843,7 @@ msgstr "İsmarışı PGP ilə kodla"
 msgid "Encrypt this message with your S/MIME Encryption Cetificate"
 msgstr "Bu ismarışı S/MIME Vəsiqəniz ilə kriptləyin"
 
-#: ui/evolution-message-composer.xml.h:8 ui/evolution-signature-editor.xml.h:4
+#: ui/evolution-message-composer.xml.h:8 ui/evolution-signature-editor.xml.h:3
 msgid "For_mat"
 msgstr "For_mat"
 
@@ -28626,11 +28876,6 @@ msgstr "S/MIME Kodla"
 msgid "S/MIME Sign"
 msgstr "S/MIME İmzası"
 
-#: ui/evolution-message-composer.xml.h:16
-#: ui/evolution-signature-editor.xml.h:6
-msgid "Save"
-msgstr "Qeyd Et"
-
 #: ui/evolution-message-composer.xml.h:17
 msgid "Save As"
 msgstr "Fərqli Qeyd Et"
@@ -28644,7 +28889,7 @@ msgid "Save in folder..."
 msgstr "_Qovluqda qeyd et ..."
 
 #: ui/evolution-message-composer.xml.h:21
-#: ui/evolution-signature-editor.xml.h:9
+#: ui/evolution-signature-editor.xml.h:7
 msgid "Save the current file"
 msgstr "Hazırkı faylı qeyd et"
 
@@ -28661,7 +28906,7 @@ msgid "Send"
 msgstr "Göndər"
 
 #: ui/evolution-message-composer.xml.h:25
-#: ui/evolution-signature-editor.xml.h:11
+#: ui/evolution-signature-editor.xml.h:9
 msgid "Send the mail in HTML format"
 msgstr "ePoçtu HTML Şəklində göndər"
 
@@ -28727,7 +28972,7 @@ msgid "_From Field"
 msgstr "_Göndərən Girişi"
 
 #: ui/evolution-message-composer.xml.h:44
-#: ui/evolution-signature-editor.xml.h:14
+#: ui/evolution-signature-editor.xml.h:13
 msgid "_Insert"
 msgstr "_Daxil Et"
 
@@ -28743,11 +28988,11 @@ msgstr "_Cavab_Verləcək Girişi"
 msgid "_Security"
 msgstr "_Təhlükəsizlik"
 
-#: ui/evolution-signature-editor.xml.h:5
+#: ui/evolution-signature-editor.xml.h:4
 msgid "H_TML"
 msgstr "H_TML"
 
-#: ui/evolution-signature-editor.xml.h:10
+#: ui/evolution-signature-editor.xml.h:8
 #, fuzzy
 msgid "Save the current file and close the window"
 msgstr "Üzvü qeyd et və dialoqu qapat"
@@ -28826,21 +29071,16 @@ msgstr "Seçili vəzifələri sil"
 msgid "Mar_k as Complete"
 msgstr "Qurtardı deyə _İşarələ"
 
-#: ui/evolution-tasks.xml.h:9
-#, fuzzy
-msgid "Mark selected tasks as complete"
-msgstr "Vəzifələri Qurtardı deyə _İşarələ"
-
-#: ui/evolution-tasks.xml.h:11
+#: ui/evolution-tasks.xml.h:10
 msgid "Paste task from the clipboard"
 msgstr "Vəzifəni ara yaddaşdan yapışdır"
 
-#: ui/evolution-tasks.xml.h:12
+#: ui/evolution-tasks.xml.h:11
 #, fuzzy
 msgid "Previews the list of tasks to be printed"
 msgstr "Çap ediləcək əlaqəni nümayiş etdirər"
 
-#: ui/evolution-tasks.xml.h:14
+#: ui/evolution-tasks.xml.h:13
 #, fuzzy
 msgid "Print the list of tasks"
 msgstr "İsmarışı çap et"
@@ -29109,31 +29349,27 @@ msgstr "İş Həftəsi Nümayişi"
 
 #: views/mail/galview.xml.h:1
 #, fuzzy
-msgid "As _Sent Folder"
+msgid "As Sent Folder"
 msgstr "Qovluq Seçin"
 
 #: views/mail/galview.xml.h:2
-#, fuzzy
-msgid "By S_tatus"
-msgstr "Vəziyyət"
+msgid "By Follow Up Flag"
+msgstr ""
 
 #: views/mail/galview.xml.h:3
-#, fuzzy
-msgid "By Se_nder"
+msgid "By Sender"
 msgstr "Göndərən"
 
 #: views/mail/galview.xml.h:4
-#, fuzzy
-msgid "By Su_bject"
-msgstr "Mövzu"
+msgid "By Status"
+msgstr "Vəziyyət"
 
 #: views/mail/galview.xml.h:5
-msgid "By _Follow Up Flag"
-msgstr ""
+msgid "By Subject"
+msgstr "Mövzu"
 
 #: views/mail/galview.xml.h:6
-#, fuzzy
-msgid "_Messages"
+msgid "Messages"
 msgstr "İsmarışlar"
 
 #: views/tasks/galview.xml.h:1
@@ -29197,20 +29433,20 @@ msgstr "Görünüşləri Müəyyənləşdir"
 
 #. Translators: These are the first characters of each day of the
 #. week, 'M' for 'Monday', 'T' for Tuesday etc.
-#: widgets/misc/e-calendar-item.c:456
+#: widgets/misc/e-calendar-item.c:427
 msgid "MTWTFSS"
 msgstr "MTWTFSS"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: widgets/misc/e-calendar-item.c:1174
+#: widgets/misc/e-calendar-item.c:1127
 msgid "%B %Y"
 msgstr "%B %Y"
 
-#: widgets/misc/e-cell-date-edit.c:241 widgets/misc/e-dateedit.c:431
+#: widgets/misc/e-cell-date-edit.c:241 widgets/misc/e-dateedit.c:428
 msgid "Now"
 msgstr "İndi"
 
-#: widgets/misc/e-cell-date-edit.c:249 widgets/misc/e-dateedit.c:437
+#: widgets/misc/e-cell-date-edit.c:249 widgets/misc/e-dateedit.c:434
 msgid "Today"
 msgstr "Bugün"
 
@@ -29331,6 +29567,22 @@ msgstr "Qeydedilmiş Axtarışlara Əlavə Et"
 msgid "_Advanced..."
 msgstr "Ətraflı..."
 
+#: widgets/misc/e-messagebox.c:154
+msgid "Information"
+msgstr "Məlumat"
+
+#: widgets/misc/e-messagebox.c:168
+msgid "Error"
+msgstr "Xəta"
+
+#: widgets/misc/e-messagebox.c:175
+msgid "Question"
+msgstr "Sual"
+
+#: widgets/misc/e-messagebox.c:182
+msgid "Message"
+msgstr "İsmarış"
+
 #: widgets/misc/e-search-bar.c:531
 msgid "_Search"
 msgstr "A_xtar"
@@ -29382,576 +29634,6 @@ msgstr "Evolutionun İcracı mündəricat parçası."
 msgid "Evolution Addressbook local file backend"
 msgstr "Evolution Ünvan Dəftəri kiçik kart nümaiyişi"
 
-#~ msgid "Chair Persons"
-#~ msgstr "İştirakçılar"
-
-#~ msgid "Required Participants"
-#~ msgstr "Lazımi İştirakçılar"
-
-#~ msgid "Optional Participants"
-#~ msgstr "Ehtiyatdakı İştirakçılar"
-
-#, fuzzy
-#~ msgid "Resources"
-#~ msgstr "Mənbə"
-
-#~ msgid "Individual"
-#~ msgstr "Şəxsi"
-
-#~ msgid "Group"
-#~ msgstr "Qrup"
-
-#~ msgid "Resource"
-#~ msgstr "Mənbə"
-
-#~ msgid "Room"
-#~ msgstr "Otaq"
-
-#~ msgid "Chair"
-#~ msgstr "Stul"
-
-#~ msgid "Required Participant"
-#~ msgstr "Lazımi İştirakçılar"
-
-#~ msgid "Optional Participant"
-#~ msgstr "Ehtiyatdakı İştirakçılar"
-
-#~ msgid "Non-Participant"
-#~ msgstr "Qeyri İştirakçılar"
-
-#~ msgid "Needs Action"
-#~ msgstr "Hərəkət Lazımdır"
-
-#~ msgid "Delegated"
-#~ msgstr "Temsil Edildi"
-
-#~ msgid "In Process"
-#~ msgstr "İşləyir"
-
-#~ msgid "Could not create temporary directory: %s"
-#~ msgstr "Müvəqqəti qovluq yaradıla bilmədi: %s"
-
-#~ msgid "%d new"
-#~ msgstr "%d yeni"
-
-#~ msgid ", "
-#~ msgstr ", "
-
-#~ msgid "%d hidden"
-#~ msgstr "%d gizli"
-
-#~ msgid "%d selected"
-#~ msgstr "%d seçili"
-
-#~ msgid "%d unsent"
-#~ msgstr "%d yollanmamış"
-
-#~ msgid "%d sent"
-#~ msgstr "%d yollanmış"
-
-#~ msgid "%d total"
-#~ msgstr "cəmi %d"
-
-#, fuzzy
-#~ msgid "Create _Virtual Folder From Search..."
-#~ msgstr "İsmarışdan _Virtual Qovluq Yarat"
-
-#~ msgid "VFolder on _Subject"
-#~ msgstr "_Mövzudakı vFolder"
-
-#~ msgid "VFolder on Se_nder"
-#~ msgstr "Gön_dərəndəki vFolder"
-
-#~ msgid "VFolder on _Recipients"
-#~ msgstr "_Alıcıdakı vFolder"
-
-#~ msgid "VFolder on Mailing _List"
-#~ msgstr "Məktublaşma Q_rupundakı VFolder"
-
-#~ msgid "Filter on Sub_ject"
-#~ msgstr "Mö_vzudakı Süzgəc"
-
-#~ msgid "Filter on Sen_der"
-#~ msgstr "Gön_dərəndəki  Süzgəc"
-
-#~ msgid "Filter on Re_cipients"
-#~ msgstr "_Alıcıdakı Süzgəc"
-
-#~ msgid "Filter on _Mailing List"
-#~ msgstr "_Məktublaşma Qrupundakı Süzgəc"
-
-#~ msgid "_Edit as New Message..."
-#~ msgstr "Yeni İsmarış olaraq _Düzəlt ..."
-
-#~ msgid "_Print"
-#~ msgstr "_Çap Et"
-
-#~ msgid "_Forward"
-#~ msgstr "_Çatdır"
-
-#, fuzzy
-#~ msgid "Fla_g Completed"
-#~ msgstr "Bitirmə Tarixi"
-
-#, fuzzy
-#~ msgid "Cl_ear Flag"
-#~ msgstr "Təmizlə"
-
-#, fuzzy
-#~ msgid "Mark as _Unread"
-#~ msgstr "Ox_unmamış olaraq İşarələ"
-
-#~ msgid "Mark as _Important"
-#~ msgstr "_Vacib olaraq İşarələ"
-
-#, fuzzy
-#~ msgid "_Mark as Unimportant"
-#~ msgstr "_Qeyri-Vacib olaraq İşarələ"
-
-#, fuzzy
-#~ msgid "U_ndelete"
-#~ msgstr "_Geri Gətir"
-
-#, fuzzy
-#~ msgid "Mo_ve to Folder..."
-#~ msgstr "Qovluğa _Daşı ..."
-
-#, fuzzy
-#~ msgid "Add Sender to Address_book"
-#~ msgstr "Yollayanı Ünvan dəftərinə Əlavə Et"
-
-#, fuzzy
-#~ msgid "Appl_y Filters"
-#~ msgstr "Süzgəclər Əlavə Et"
-
-#, fuzzy
-#~ msgid "Crea_te Rule From Message"
-#~ msgstr "İsmarışdan Qa_yda Yarat"
-
-#, fuzzy
-#~ msgid "VFolder on M_ailing List"
-#~ msgstr "Məktublaşma Qrupundakı VFolder"
-
-#, fuzzy
-#~ msgid "Filter on _Mailing List (%s)"
-#~ msgstr "Məktublaşma Qrupunda Süz (%s)"
-
-#, fuzzy
-#~ msgid "VFolder on M_ailing List (%s)"
-#~ msgstr "(%s) Məktublaşma Qrupundakı VFolder"
-
-#~ msgid "Properties for \"%s\""
-#~ msgstr "\"%s\"in Seçənəkləri"
-
-#~ msgid "Properties"
-#~ msgstr "Seçənəklər"
-
-#~ msgid "Don't show this message again."
-#~ msgstr "Bu ismarışı bir də göstərmə."
-
-#~ msgid ""
-#~ "You have not configured the mail client.\n"
-#~ "You need to do this before you can send,\n"
-#~ "receive or compose mail.\n"
-#~ "Would you like to configure it now?"
-#~ msgstr ""
-#~ "Məktub alıcısını hələ quraşdırmamısınız.\n"
-#~ "Məktub yazmaq, almaq, göndərmədən əvvəl \n"
-#~ "bunu quraşdırmalısınız.\n"
-#~ "Bunu indi quraşdırmaq istəyirsiniz?"
-
-#, fuzzy
-#~ msgid ""
-#~ "You need to configure an account\n"
-#~ "before you can compose mail."
-#~ msgstr ""
-#~ "ePoçt göndərməkdən əvvəl bir \n"
-#~ "şəxs tanıtmalısan."
-
-#~ msgid ""
-#~ "You need to configure an identity\n"
-#~ "before you can compose mail."
-#~ msgstr ""
-#~ "ePoçt göndərməkdən əvvəl bir \n"
-#~ "şəxs tanıtmalısan."
-
-#~ msgid ""
-#~ "You need to configure a mail transport\n"
-#~ "before you can compose mail."
-#~ msgstr ""
-#~ "ePoçt göndərməkdən əvvəl bir ePoçt\n"
-#~ "nəqliyyatını qurmalısan."
-
-#, fuzzy
-#~ msgid ""
-#~ "You are sending an HTML-formatted message. Please make sure that\n"
-#~ "the following recipients are willing and able to receive HTML mail:\n"
-#~ msgstr ""
-#~ "HTML şəklində imsarış göndərirsiniz, amma aşağıdakı alıcılar HTML "
-#~ "şəklində məktub istəmirlər:\n"
-
-#~ msgid "Send anyway?"
-#~ msgstr "Yenə də yollayaq?"
-
-#~ msgid ""
-#~ "This message has no subject.\n"
-#~ "Really send?"
-#~ msgstr ""
-#~ "Bu ismarışın mövzusu yoxdur .\n"
-#~ "Həqiqətən də göndərim?"
-
-#~ msgid ""
-#~ "Since the contact list you are sending to is configured to hide the "
-#~ "list's addresses, this message will contain only Bcc recipients."
-#~ msgstr ""
-#~ "Nə vaxta qədər ki, əlaqə siyahınız qrup ünvanıarını gizləyəcək şəkildə "
-#~ "sazlanıb, bi ismarış təkcə Bcc alıcılar daxil edəcək."
-
-#~ msgid "This message contains only Bcc recipients."
-#~ msgstr "İsmarış təkcə Bcc alıcıları daxil edir."
-
-#~ msgid ""
-#~ "It is possible that the mail server may reveal the recipients by adding "
-#~ "an Apparently-To header.\n"
-#~ "Send anyway?"
-#~ msgstr ""
-#~ "Ola bilsin ki, məktub vericisi alıcılara Aydın-Yollayan başlığı ilə "
-#~ "məlumatlndırmaq istəsin.\n"
-#~ "Yenə də göndərək?"
-
-#~ msgid "You must specify recipients in order to send this message."
-#~ msgstr "Məktubu göndərə bilmək üçün alıcını da bildirməlisən."
-
-#~ msgid ""
-#~ "Unable to open the drafts folder for this account.\n"
-#~ "Would you like to use the default drafts folder?"
-#~ msgstr ""
-#~ "Bu hesab üçün lahiyə cərgəsə açıla bilmədi.\n"
-#~ "Əsas lahiyə cərgəsini işlətmək istəyirsiniz?"
-
-#~ msgid "an unknown sender"
-#~ msgstr "naməlum yollayan"
-
-#, fuzzy
-#~ msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
-#~ msgstr "%a, %Y-%m-%d at %H:%M, tarixidə %%s yazmışdır ki:"
-
-#~ msgid "Move message(s) to"
-#~ msgstr "İsmarış(ları) buraya daşı "
-
-#~ msgid "Copy message(s) to"
-#~ msgstr "İsmarış(ları) buraya köçürt"
-
-#~ msgid "Are you sure you want to edit all %d messages?"
-#~ msgstr "Bütün `%d' ismarışlarını düzəltmək istəyirsiniz?"
-
-#~ msgid ""
-#~ "You may only edit messages saved\n"
-#~ "in the Drafts folder."
-#~ msgstr ""
-#~ "Siz sadəcə olaraq Vəzifələr qovluğundakı\n"
-#~ "ismarışları düzəldə bilərsiniz."
-
-#~ msgid ""
-#~ "You may only resend messages\n"
-#~ "in the Sent folder."
-#~ msgstr ""
-#~ "Sadəcə olaraq Göndərilən cərgəsinə qeyd edilən\n"
-#~ "ismarışları yeniden gönderebilirsiniz."
-
-#~ msgid "Are you sure you want to resend all %d messages?"
-#~ msgstr "Həqiqətən də bütün `%d' ismarışı yenidən yollamaq istəyirsən?"
-
-#~ msgid "No Message Selected"
-#~ msgstr "Heç İsmarış Seçilmədi"
-
-#, fuzzy
-#~ msgid ""
-#~ "Cannot save to `%s'\n"
-#~ " %s"
-#~ msgstr ""
-#~ "İSmarıc alına bilmir: %s\n"
-#~ "   %s"
-
-#, fuzzy
-#~ msgid ""
-#~ "`%s' already exists.\n"
-#~ "Overwrite it?"
-#~ msgstr ""
-#~ "%s onsuz da mövcuddur.\n"
-#~ "Üstünə yazmaq istəyirsiniz?"
-
-#~ msgid "Save Message As..."
-#~ msgstr "İsmarışı Fərqli Qeyd Et..."
-
-#~ msgid "Save Messages As..."
-#~ msgstr "İsmarışları Fərqli Qeyd Et..."
-
-#, fuzzy
-#~ msgid ""
-#~ "This operation will permanently erase all messages marked as\n"
-#~ "deleted. If you continue, you will not be able to recover these "
-#~ "messages.\n"
-#~ "\n"
-#~ "Really erase these messages?"
-#~ msgstr ""
-#~ "Bu əməliyyat silinəcəklər deyə işarələnmiş bütün məktubları həmişəlik "
-#~ "siləcəkdir. Davam etsəniz, bu ismarışları geri gətirə bilməyəcəksiniz.\n"
-#~ "\n"
-#~ "İsmarışları həqiqətən də silək?"
-
-#~ msgid ""
-#~ "Error loading filter information:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Süzgəc məlumatını yükləmə xətası:\n"
-#~ "%s"
-
-#~ msgid "Filters"
-#~ msgstr "Süzgəclər"
-
-#, fuzzy
-#~ msgid "Page %d of %d"
-#~ msgstr "%d İsmarışın %d qədərə alınır"
-
-#~ msgid "Print Message"
-#~ msgstr "İsmarışı Çap Et"
-
-#~ msgid "Printing of message failed"
-#~ msgstr "İsmarıların çap edilməsi bacarılmadı"
-
-#~ msgid "Are you sure you want to open all %d messages in separate windows?"
-#~ msgstr "Bütün %d ismarışlarını başqa pəncərədə açmaq istəyirsiniz?"
-
-#, fuzzy
-#~ msgid ""
-#~ "File `%s' already exists.\n"
-#~ "Overwrite it?"
-#~ msgstr ""
-#~ "Eyni adlı bir fayl onsuz da vardır.\n"
-#~ "Üstünə yazım mı?"
-
-#~ msgid "Save Attachment"
-#~ msgstr "Yapışdırılmış Faylı Qeyd Et"
-
-#, fuzzy
-#~ msgid "Could not create temporary file '%s': %s"
-#~ msgstr "Müvəqqəti qovluq yaradıla bilmədi: %s"
-
-#, fuzzy
-#~ msgid "%s is not a valid directory name."
-#~ msgstr "`%s' məktub qovluğu faylı deyildir."
-
-#, fuzzy
-#~ msgid "Save Attachment..."
-#~ msgstr "Yapışdırılmış Faylı Qeyd Et"
-
-#, fuzzy
-#~ msgid "Save all attachments..."
-#~ msgstr "Yapışdırılmış Faylı Qeyd Et"
-
-#~ msgid "View Inline"
-#~ msgstr "İçərisini Göstər"
-
-#~ msgid "Open in %s..."
-#~ msgstr "%s da(də) Aç ..."
-
-#~ msgid "View Inline (via %s)"
-#~ msgstr "İçərisini Göstər (%s ilə)"
-
-#~ msgid "Hide"
-#~ msgstr "Gizlə"
-
-#~ msgid "External Viewer"
-#~ msgstr "Xarici Göstərici"
-
-#, fuzzy
-#~ msgid "Downloading images"
-#~ msgstr "_Rəsmləri Yüklə"
-
-#~ msgid "Loading message content"
-#~ msgstr "İsmarış içindəkilər yüklənir"
-
-#, fuzzy
-#~ msgid "Overdue:"
-#~ msgstr "Ge_cikmiş işlər:"
-
-#, fuzzy
-#~ msgid "by %B %d, %Y, %l:%M %p"
-#~ msgstr "%b %d %l:%M %p"
-
-#~ msgid "Open Link in Browser"
-#~ msgstr "Körpünü Səyyahda Aç"
-
-#~ msgid "Copy Link Location"
-#~ msgstr "Körpü Ünvanınə Köçür"
-
-#~ msgid "Save Link as (FIXME)"
-#~ msgstr "Körpünü Fərqli qeyd et"
-
-#~ msgid "Save Image as..."
-#~ msgstr "Rəsmi Fərqli qeyd et..."
-
-#~ msgid "%s attachment"
-#~ msgstr "%s yapışdırılmış fayl"
-
-#~ msgid "Could not parse MIME message. Displaying as source."
-#~ msgstr "MIME ismarışı açıla bilmədi: Mənbə kodu gösteriliyor."
-
-#~ msgid "Bad Address"
-#~ msgstr "Səhv Ünvan"
-
-#~ msgid "Reply-To"
-#~ msgstr "Cavablama"
-
-#~ msgid "Cc"
-#~ msgstr "Cc"
-
-#~ msgid "Bcc"
-#~ msgstr "Bcc"
-
-#~ msgid ""
-#~ "This message is digitally signed. Click the lock icon for more "
-#~ "information."
-#~ msgstr ""
-#~ "Bu ismarış digital olaraq imzalanmışdır. Ətraflı məlumat üçün qıfıl "
-#~ "timsalına tıqla."
-
-#, fuzzy
-#~ msgid "Could not create a PGP verfication context"
-#~ msgstr "PGP təsdiq məzmunu yaradıla bilmir."
-
-#~ msgid "This message is digitally signed and has been found to be authentic."
-#~ msgstr ""
-#~ "Bu ismarış digital olaraq imzalanmışdır və original olduğu düşünülür."
-
-#~ msgid ""
-#~ "This message is digitally signed but can not be proven to be authentic."
-#~ msgstr ""
-#~ "Bu ismarış digital olaraq imzalanmışdır amma original olduğu düşünülmür."
-
-#~ msgid "Pointer to FTP site (%s)"
-#~ msgstr "FTP saytını göstərən ox (%s)"
-
-#~ msgid "Pointer to local file (%s) valid at site \"%s\""
-#~ msgstr "Yerli faylyi göstərən (%s) oxu \"%s\" saytında hökmlüdür"
-
-#~ msgid "Pointer to local file (%s)"
-#~ msgstr "Yerli faylyi göstərən ox (%s)"
-
-#~ msgid "Pointer to remote data (%s)"
-#~ msgstr "Uzaq verilənlər (%s) nişanı"
-
-#~ msgid "Pointer to unknown external data (\"%s\" type)"
-#~ msgstr "Naməlum xarici məlumatı göstərən ox (\"%s\" növündə "
-
-#~ msgid "Malformed external-body part."
-#~ msgstr "Xəsərli xarici proqram parçası."
-
-#~ msgid "(Untitled Message)"
-#~ msgstr "(Adsız İsmarış)"
-
-#~ msgid "Untitled Message"
-#~ msgstr "Adsız İsmarış"
-
-#~ msgid "Empty Message"
-#~ msgstr "Boş İsmarış"
-
-#~ msgid "Find in Message"
-#~ msgstr "İsmarışda Axtar"
-
-#~ msgid "Case Sensitive"
-#~ msgstr "Böyük Kiçik Hərfə Həssas"
-
-#~ msgid "Search Forward"
-#~ msgstr "İrəliyə Axtar"
-
-#~ msgid "Find:"
-#~ msgstr "Axtar:"
-
-#~ msgid "Matches:"
-#~ msgstr "Oxşayır:"
-
-#~ msgid "(No subject)"
-#~ msgstr "(Mövzusuz)"
-
-#~ msgid "%s - Message"
-#~ msgstr "%s - İsmarış"
-
-#~ msgid "Scanning folders under %s on \"%s\""
-#~ msgstr "%s altındakı qovluqlar daranır (\"%s\" üstündəki)"
-
-#~ msgid "Scanning root-level folders on \"%s\""
-#~ msgstr "\"%s\" üstündəki kök səviyyəsi qovluqlar daranır"
-
-#~ msgid "Subscribing to folder \"%s\""
-#~ msgstr "\"%s\" qovluğuna qeydiyyat aparılır"
-
-#~ msgid "Unsubscribing to folder \"%s\""
-#~ msgstr "\"%s\" qovluğuna qeydiyyat silinir"
-
-#~ msgid "No server has been selected"
-#~ msgstr "Heç verici seçilməyib"
-
-#~ msgid "Please select a server."
-#~ msgstr "Verici seçin."
-
-#~ msgid "That person is already attending the meeting!"
-#~ msgstr "Bu şəxs onsuz da iclasın dinləyicisidir!"
-
-#~ msgid "URL:"
-#~ msgstr "URL:"
-
-#, fuzzy
-#~ msgid "_Save as..."
-#~ msgstr "Fərqli qeyd et ..."
-
-#~ msgid "End Date"
-#~ msgstr "Son Tarix"
-
-#~ msgid "New _Appointment"
-#~ msgstr "Yeni _Görüş"
-
-#~ msgid "Print..."
-#~ msgstr "Çap Et ..."
-
-#~ msgid "Could not create a S/MIME signature context."
-#~ msgstr "S/MIME imza məzmunu yaradıla bilmir."
-
-#~ msgid "Could not create a S/MIME certsonly context."
-#~ msgstr "S/MIME məzmunu yaradıla bilmir."
-
-#~ msgid "Could not create a S/MIME encryption context."
-#~ msgstr "S/MIME enkripsiya məzmunu yaradıla bilmir."
-
-#~ msgid "Could not create a S/MIME envelope context."
-#~ msgstr "S/MIME zərf məzmunu yaradıla bilmir."
-
-#~ msgid "Could not create a S/MIME decode context."
-#~ msgstr "S/MIME kod açma məzmunu yaradıla bilmir."
-
-#~ msgid "However, the message was successfully sent."
-#~ msgstr "Axırı ki, ismarış müvəffəqiyyətlə yollandı."
-
-#~ msgid "Forwarded Message"
-#~ msgstr "Çatdırılmış İsmarış"
-
-#, fuzzy
-#~ msgid "Scanning folders ..."
-#~ msgstr "_Qovluqda qeyd et ..."
-
-#~ msgid "Save As..."
-#~ msgstr "Fərqli Qeyd Et ..."
-
-#~ msgid "Information"
-#~ msgstr "Məlumat"
-
-#~ msgid "Question"
-#~ msgstr "Sual"
-
-#~ msgid "Message"
-#~ msgstr "İsmarış"
-
 #~ msgid "Search"
 #~ msgstr "Axtar"
 
@@ -30387,6 +30069,9 @@ msgstr "Evolution Ünvan Dəftəri kiçik kart nümaiyişi"
 #~ msgid "Cannot initialize Evolution's mail config component."
 #~ msgstr "Evolutionun poçt quraşdırma parçasını başlada bilmədim ."
 
+#~ msgid "Cannot initialize Evolution's folder info component."
+#~ msgstr "Evolutionun qovluq info parçasını başlada bilmədim ."
+
 #~ msgid "Factory to import mbox into Evolution"
 #~ msgstr "'Mbox'u Evolution içinə gətirən emalatxana"
 
@@ -30449,6 +30134,9 @@ msgstr "Evolution Ünvan Dəftəri kiçik kart nümaiyişi"
 #~ msgid "Marquette"
 #~ msgstr "Martiniq"
 
+#~ msgid "Executive summary component could not initialize Bonobo.\n"
+#~ msgstr "İcraçı icmal qismi Bonobo-nu hazırlaya bilmədi.\n"
+
 #, fuzzy
 #~ msgid "Configuration control for Evolution folder settings."
 #~ msgstr "Evolutionun məktub yazıçısı emalatxanası."
@@ -31300,9 +30988,30 @@ msgstr "Evolution Ünvan Dəftəri kiçik kart nümaiyişi"
 #~ "Əyalət: %s\n"
 #~ "Ölkə: %s"
 
+#~ msgid "Please enter the NNTP password for %s@%s"
+#~ msgstr "%s@%s üçün parolu lütfən girin"
+
+#~ msgid "Server rejected username"
+#~ msgstr "Verici istifadəçi adını qəbul etmədi"
+
+#~ msgid "Failed to send username to server"
+#~ msgstr "Vericiyə istifadəçi adı göndərilə bilmədi"
+
+#~ msgid "Server rejected username/password"
+#~ msgstr "Verici istifadəçi adını/parolunu qəbul etmədi"
+
 #~ msgid "Message %s not found."
 #~ msgstr "%s ismarışı tapıla bilmədi"
 
+#~ msgid "Could not get group list from server."
+#~ msgstr "Vericidən qrup adı öyrənilə bilmədi."
+
+#~ msgid "Unable to load grouplist file for %s: %s"
+#~ msgstr "%s üçün qrup siyahısı yüklənə bilmir: %s"
+
+#~ msgid "Unable to save grouplist file for %s: %s"
+#~ msgstr "%s üçün qrup faylı qeyd edilə bilmir: %s"
+
 #~ msgid "Could not open directory for news server: %s"
 #~ msgstr "Xəbər vericisi üçün qovluq açıla bilmir: %s"
 
@@ -31328,6 +31037,9 @@ msgstr "Evolution Ünvan Dəftəri kiçik kart nümaiyişi"
 #~ "Bu seçənək POP verisici ilə Kerberos 4 istifadə edərək ünsiyyət "
 #~ "quracaqdır."
 
+#~ msgid "Could not connect to server: %s"
+#~ msgstr "Vericiyə bağlana bilmirəm: %s"
+
 #~ msgid "(Unknown)"
 #~ msgstr "(Naməlum)"
 
@@ -31426,6 +31138,9 @@ msgstr "Evolution Ünvan Dəftəri kiçik kart nümaiyişi"
 #~ msgid "Evolution component for the executive summary."
 #~ msgstr "İcracı mündəricat üçün Evolution parçası."
 
+#~ msgid "Cannot initialize Evolution's Summary component."
+#~ msgstr "Evolution İcmal qismi hazırlana bilmir."
+
 #~ msgid "<dd><b>The weather server could not be contacted</b></dd>"
 #~ msgstr "<dd><b>Hava vəziyyəti vericisi ilə bağlantı qurula bilmədi</b></dd>"
 
diff --git a/po/be.po b/po/be.po
index 224d0590a4..4f1f01d604 100644
--- a/po/be.po
+++ b/po/be.po
@@ -4,192 +4,56 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution.HEAD.be\n"
-"POT-Creation-Date: 2003-10-15 23:45+0200\n"
+"POT-Creation-Date: 2003-06-25 13:24-0400\n"
 "PO-Revision-Date: 2003-05-25 19:42GMT+2\n"
 "Last-Translator: Vital Khilko <dojlid@mova.org>\n"
 "Language-Team: belarusian <i18n@mova.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Report-Msgid-Bugs-To: \n"
 "X-Generator: KBabel 1.0\n"
 
-#: addressbook/backend/ebook/e-card.c:1306
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in.h:1
+msgid "Evolution LDIF importer"
+msgstr "Імпарт LDIF \"Эвалюцыі\""
+
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in.h:2
+msgid "LDAP Data Interchange Format (.ldif)"
+msgstr "Фармат узаемаабмену даньнямі LDAP (.ldif)"
+
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:1
+msgid "Evolution VCard Importer"
+msgstr "Імпарт візытовак \"Эвалюцыі\"."
+
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:2
+msgid "Evolution VCard importer"
+msgstr "Імпарт візытовак \"Эвалюцыі\"."
+
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:3
+msgid "VCard (.vcf, .gcrd)"
+msgstr "Візытоўка (.vcf, .gcrd)"
+
 #: addressbook/backend/ebook/e-card-simple.c:60
+#: addressbook/backend/ebook/e-card.c:1306
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:15
 msgid "File As"
 msgstr "Файл як"
 
-#: addressbook/backend/ebook/e-card.c:1313
-#: addressbook/gui/contact-editor/fullname.glade.h:4
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:17
-msgid "Full Name"
-msgstr "Поўнае імя"
-
-#: addressbook/backend/ebook/e-card.c:1320
 #: addressbook/backend/ebook/e-card-simple.c:61
-#: addressbook/gui/component/select-names/e-select-names.etspec.h:1
+#: addressbook/backend/ebook/e-card.c:1320
 #: addressbook/gui/component/select-names/e-select-names-section.etspec.h:1
+#: addressbook/gui/component/select-names/e-select-names.etspec.h:1
 #: addressbook/gui/contact-editor/e-contact-editor-fullname.c:89
 #: my-evolution/e-summary-table.c:59
 msgid "Name"
 msgstr "Імя"
 
-#: addressbook/backend/ebook/e-card.c:1326
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:96
-msgid "Address"
-msgstr "Адрэса"
-
-#: addressbook/backend/ebook/e-card.c:1333
-msgid "Address Label"
-msgstr "Адмеціна адрэсы"
-
-#: addressbook/backend/ebook/e-card.c:1340
-msgid "Phone"
-msgstr "Тэлефон"
-
-#: addressbook/backend/ebook/e-card.c:1347
 #: addressbook/backend/ebook/e-card-simple.c:62
+#: addressbook/backend/ebook/e-card.c:1347
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
 msgid "Email"
 msgstr "Э. пошта"
 
-#: addressbook/backend/ebook/e-card.c:1354
-msgid "Birth date"
-msgstr "Дата нараджэньня"
-
-#: addressbook/backend/ebook/e-card.c:1360
-#: calendar/gui/e-calendar-table.etspec.h:18
-msgid "URL"
-msgstr "URL"
-
-#: addressbook/backend/ebook/e-card.c:1367
-#: addressbook/backend/ebook/e-card-simple.c:69
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
-msgid "Organization"
-msgstr "Установа"
-
-#: addressbook/backend/ebook/e-card.c:1374
-msgid "Organizational Unit"
-msgstr "Пасада"
-
-#: addressbook/backend/ebook/e-card.c:1381
-#: addressbook/backend/ebook/e-card-simple.c:90
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
-msgid "Office"
-msgstr "Офіс"
-
-#: addressbook/backend/ebook/e-card.c:1388
-#: addressbook/backend/ebook/e-card-simple.c:91
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:39
-msgid "Title"
-msgstr "Пасада"
-
-#: addressbook/backend/ebook/e-card.c:1395
-#: calendar/gui/e-meeting-time-sel.etspec.h:9
-msgid "Role"
-msgstr "Роля"
-
-#: addressbook/backend/ebook/e-card.c:1402
-#: addressbook/backend/ebook/e-card-simple.c:93
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
-msgid "Manager"
-msgstr "Мэнаджар"
-
-#: addressbook/backend/ebook/e-card.c:1409
-#: addressbook/backend/ebook/e-card-simple.c:64
-#: addressbook/backend/ebook/e-card-simple.c:94
-#: addressbook/gui/contact-editor/e-contact-editor.c:1737
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:2
-msgid "Assistant"
-msgstr "Памочнік"
-
-#: addressbook/backend/ebook/e-card.c:1416
-#: addressbook/backend/ebook/e-card-simple.c:95
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-msgid "Nickname"
-msgstr "Мянушка"
-
-#: addressbook/backend/ebook/e-card.c:1423
-#: addressbook/backend/ebook/e-card-simple.c:96
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:36
-msgid "Spouse"
-msgstr "Супруг(а)"
-
-#: addressbook/backend/ebook/e-card.c:1430
-#: addressbook/backend/ebook/e-card-simple.c:101
-msgid "Anniversary"
-msgstr "Юбілей"
-
-#: addressbook/backend/ebook/e-card.c:1436
-msgid "Mailer"
-msgstr "Паштавік"
-
-#: addressbook/backend/ebook/e-card.c:1443
-#: addressbook/backend/ebook/e-card-simple.c:98
-msgid "Calendar URI"
-msgstr "URI календара"
-
-#: addressbook/backend/ebook/e-card.c:1450
-msgid "Free/Busy URL"
-msgstr "Вольны/Заняты URL"
-
-#: addressbook/backend/ebook/e-card.c:1457
-msgid "ICS Calendar"
-msgstr "Каляндар ICS"
-
-#: addressbook/backend/ebook/e-card.c:1464
-#: addressbook/backend/ebook/e-card-simple.c:97
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
-msgid "Note"
-msgstr "Заўвага"
-
-#: addressbook/backend/ebook/e-card.c:1471
-msgid "Related Contacts"
-msgstr "Зьвязаныя кантакты"
-
-#: addressbook/backend/ebook/e-card.c:1478
-#: addressbook/backend/ebook/e-card-simple.c:105
-#: calendar/gui/e-calendar-table.etspec.h:4
-msgid "Categories"
-msgstr "Катэгорыі"
-
-#: addressbook/backend/ebook/e-card.c:1485
-msgid "Category List"
-msgstr "Сьпіс катэгорыяў"
-
-#: addressbook/backend/ebook/e-card.c:1492
-msgid "Wants HTML"
-msgstr "Жадае HTML"
-
-#: addressbook/backend/ebook/e-card.c:1499
-msgid "Wants HTML set"
-msgstr "Жадае усталяваць HTML"
-
-#: addressbook/backend/ebook/e-card.c:1506 ui/evolution-calendar.xml.h:16
-msgid "List"
-msgstr "Сьпіс"
-
-#: addressbook/backend/ebook/e-card.c:1513
-msgid "List Show Addresses"
-msgstr "Сьпіс адлюстраваных адрэсаў"
-
-#: addressbook/backend/ebook/e-card.c:1520
-msgid "Arbitrary"
-msgstr "Адвольнае"
-
-#: addressbook/backend/ebook/e-card.c:1527
-msgid "ID"
-msgstr "Iд"
-
-#: addressbook/backend/ebook/e-card.c:1534
-msgid "Last Use"
-msgstr "Апошняе скарыстанае"
-
-#: addressbook/backend/ebook/e-card.c:1545
-msgid "Use Score"
-msgstr "Выкарыстоўвае лік"
-
 #: addressbook/backend/ebook/e-card-simple.c:63
 #: addressbook/gui/contact-editor/e-contact-editor.c:1752
 msgid "Primary"
@@ -199,6 +63,14 @@ msgstr "Першасны"
 msgid "Prim"
 msgstr "Перш"
 
+#: addressbook/backend/ebook/e-card-simple.c:64
+#: addressbook/backend/ebook/e-card-simple.c:94
+#: addressbook/backend/ebook/e-card.c:1409
+#: addressbook/gui/contact-editor/e-contact-editor.c:1737
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:2
+msgid "Assistant"
+msgstr "Памочнік"
+
 #: addressbook/backend/ebook/e-card-simple.c:65
 #: addressbook/backend/ebook/e-card-simple.c:70
 #: addressbook/gui/contact-editor/e-contact-editor.c:1738
@@ -233,6 +105,12 @@ msgid "Home"
 msgstr "Хатні"
 
 #: addressbook/backend/ebook/e-card-simple.c:69
+#: addressbook/backend/ebook/e-card.c:1367
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
+msgid "Organization"
+msgstr "Установа"
+
+#: addressbook/backend/ebook/e-card-simple.c:69
 msgid "Org"
 msgstr "Уст"
 
@@ -351,9 +229,21 @@ msgid "Dep"
 msgstr "Падр."
 
 #: addressbook/backend/ebook/e-card-simple.c:90
+#: addressbook/backend/ebook/e-card.c:1381
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
+msgid "Office"
+msgstr "Офіс"
+
+#: addressbook/backend/ebook/e-card-simple.c:90
 msgid "Off"
 msgstr "Офіс"
 
+#: addressbook/backend/ebook/e-card-simple.c:91
+#: addressbook/backend/ebook/e-card.c:1388
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:39
+msgid "Title"
+msgstr "Пасада"
+
 #: addressbook/backend/ebook/e-card-simple.c:92
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:34
 msgid "Profession"
@@ -364,6 +254,12 @@ msgid "Prof"
 msgstr "Праф."
 
 #: addressbook/backend/ebook/e-card-simple.c:93
+#: addressbook/backend/ebook/e-card.c:1402
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
+msgid "Manager"
+msgstr "Мэнаджар"
+
+#: addressbook/backend/ebook/e-card-simple.c:93
 msgid "Man"
 msgstr "Mэн."
 
@@ -372,9 +268,32 @@ msgid "Ass"
 msgstr "Дап."
 
 #: addressbook/backend/ebook/e-card-simple.c:95
+#: addressbook/backend/ebook/e-card.c:1416
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
+msgid "Nickname"
+msgstr "Мянушка"
+
+#: addressbook/backend/ebook/e-card-simple.c:95
 msgid "Nick"
 msgstr "Мянушка"
 
+#: addressbook/backend/ebook/e-card-simple.c:96
+#: addressbook/backend/ebook/e-card.c:1423
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:36
+msgid "Spouse"
+msgstr "Супруг(а)"
+
+#: addressbook/backend/ebook/e-card-simple.c:97
+#: addressbook/backend/ebook/e-card.c:1464
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
+msgid "Note"
+msgstr "Заўвага"
+
+#: addressbook/backend/ebook/e-card-simple.c:98
+#: addressbook/backend/ebook/e-card.c:1443
+msgid "Calendar URI"
+msgstr "URI календара"
+
 #: addressbook/backend/ebook/e-card-simple.c:98
 msgid "CALUri"
 msgstr "Кал. Uri"
@@ -397,6 +316,11 @@ msgid "icsCalendar"
 msgstr "icsCalendar"
 
 #: addressbook/backend/ebook/e-card-simple.c:101
+#: addressbook/backend/ebook/e-card.c:1430
+msgid "Anniversary"
+msgstr "Юбілей"
+
+#: addressbook/backend/ebook/e-card-simple.c:101
 msgid "Anniv"
 msgstr "Юбілей"
 
@@ -404,6 +328,12 @@ msgstr "Юбілей"
 msgid "Birth Date"
 msgstr "Дзень народзінаў"
 
+#: addressbook/backend/ebook/e-card-simple.c:105
+#: addressbook/backend/ebook/e-card.c:1478
+#: calendar/gui/e-calendar-table.etspec.h:4
+msgid "Categories"
+msgstr "Катэгорыі"
+
 #: addressbook/backend/ebook/e-card-simple.c:106
 msgid "Family Name"
 msgstr "Прозьвішча"
@@ -418,29 +348,105 @@ msgid "%x"
 msgstr "%x"
 
 #: addressbook/backend/ebook/e-card-simple.c:912
-#: addressbook/backend/ebook/e-destination.c:709
+#: addressbook/backend/ebook/e-destination.c:706
 msgid "Unnamed List"
 msgstr "Сьпіс бяз назвы"
 
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in.h:1
-msgid "Evolution LDIF importer"
-msgstr "Імпарт LDIF \"Эвалюцыі\""
+#: addressbook/backend/ebook/e-card.c:1313
+#: addressbook/gui/contact-editor/fullname.glade.h:4
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:17
+msgid "Full Name"
+msgstr "Поўнае імя"
 
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in.h:2
-msgid "LDAP Data Interchange Format (.ldif)"
-msgstr "Фармат узаемаабмену даньнямі LDAP (.ldif)"
+#: addressbook/backend/ebook/e-card.c:1326
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:96
+msgid "Address"
+msgstr "Адрэса"
 
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:1
-msgid "Evolution VCard Importer"
-msgstr "Імпарт візытовак \"Эвалюцыі\"."
+#: addressbook/backend/ebook/e-card.c:1333
+msgid "Address Label"
+msgstr "Адмеціна адрэсы"
 
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:2
-msgid "Evolution VCard importer"
-msgstr "Імпарт візытовак \"Эвалюцыі\"."
+#: addressbook/backend/ebook/e-card.c:1340
+msgid "Phone"
+msgstr "Тэлефон"
 
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:3
-msgid "VCard (.vcf, .gcrd)"
-msgstr "Візытоўка (.vcf, .gcrd)"
+#: addressbook/backend/ebook/e-card.c:1354
+msgid "Birth date"
+msgstr "Дата нараджэньня"
+
+#: addressbook/backend/ebook/e-card.c:1360
+#: calendar/gui/e-calendar-table.etspec.h:19
+msgid "URL"
+msgstr "URL"
+
+#: addressbook/backend/ebook/e-card.c:1374
+msgid "Organizational Unit"
+msgstr "Пасада"
+
+#: addressbook/backend/ebook/e-card.c:1395
+#: calendar/gui/dialogs/meeting-page.etspec.h:9
+#: calendar/gui/e-meeting-time-sel.etspec.h:9
+msgid "Role"
+msgstr "Роля"
+
+#: addressbook/backend/ebook/e-card.c:1436 mail/mail-format.c:963
+msgid "Mailer"
+msgstr "Паштавік"
+
+#: addressbook/backend/ebook/e-card.c:1450
+msgid "Free/Busy URL"
+msgstr "Вольны/Заняты URL"
+
+#: addressbook/backend/ebook/e-card.c:1457
+msgid "ICS Calendar"
+msgstr "Каляндар ICS"
+
+#: addressbook/backend/ebook/e-card.c:1471
+msgid "Related Contacts"
+msgstr "Зьвязаныя кантакты"
+
+#: addressbook/backend/ebook/e-card.c:1485
+msgid "Category List"
+msgstr "Сьпіс катэгорыяў"
+
+#: addressbook/backend/ebook/e-card.c:1492
+msgid "Wants HTML"
+msgstr "Жадае HTML"
+
+#: addressbook/backend/ebook/e-card.c:1499
+msgid "Wants HTML set"
+msgstr "Жадае усталяваць HTML"
+
+#: addressbook/backend/ebook/e-card.c:1506
+msgid "List"
+msgstr "Сьпіс"
+
+#: addressbook/backend/ebook/e-card.c:1513
+msgid "List Show Addresses"
+msgstr "Сьпіс адлюстраваных адрэсаў"
+
+#: addressbook/backend/ebook/e-card.c:1520
+msgid "Arbitrary"
+msgstr "Адвольнае"
+
+#: addressbook/backend/ebook/e-card.c:1527
+msgid "ID"
+msgstr "Iд"
+
+#: addressbook/backend/ebook/e-card.c:1534
+msgid "Last Use"
+msgstr "Апошняе скарыстанае"
+
+#: addressbook/backend/ebook/e-card.c:1545
+msgid "Use Score"
+msgstr "Выкарыстоўвае лік"
+
+#: addressbook/backend/ebook/test-client-list.c:15
+#: addressbook/backend/ebook/test-client.c:33
+#: calendar/gui/alarm-notify/notify-main.c:171
+msgid "Could not initialize Bonobo"
+msgstr "Неатрымалася ініцыялізаваць Bonobo"
 
 #: addressbook/backend/pas/pas-backend-file.c:464
 #: addressbook/backend/pas/pas-backend-ldap.c:3050
@@ -497,14 +503,14 @@ msgid "EBook not loaded\n"
 msgstr "EBook не загружана\n"
 
 #: addressbook/conduit/address-conduit.c:1376
-#: calendar/conduits/calendar/calendar-conduit.c:1351
-#: calendar/conduits/todo/todo-conduit.c:893
+#: calendar/conduits/calendar/calendar-conduit.c:1342
+#: calendar/conduits/todo/todo-conduit.c:884
 msgid "Could not start wombat server"
 msgstr "Неатрымалася запусьціць паслужнік wombat"
 
 #: addressbook/conduit/address-conduit.c:1377
-#: calendar/conduits/calendar/calendar-conduit.c:1352
-#: calendar/conduits/todo/todo-conduit.c:894
+#: calendar/conduits/calendar/calendar-conduit.c:1343
+#: calendar/conduits/todo/todo-conduit.c:885
 msgid "Could not start wombat"
 msgstr "Неатрымалася запусьціць wombat"
 
@@ -513,6 +519,137 @@ msgstr "Неатрымалася запусьціць wombat"
 msgid "Could not read pilot's Address application block"
 msgstr "Немагчыма прачытаць блёк дастасаваньня адрэсаў Пілёта"
 
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
+msgid "Configure access to LDAP directory servers here"
+msgstr "Наладжвайце доступ да паслужніка каталёгаў LDAP тутака"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
+msgid "Directory Servers"
+msgstr "Паслужнікі каталёгаў"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
+msgid "Evolution Addressbook"
+msgstr "Кніга адрэсаў \"Эвалюцыі\""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
+msgid "Evolution Addressbook LDAP Configuration Control"
+msgstr "Сродак кіраваньня LDAP кнігі адрэсаў \"Эвалюцыі\"."
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
+msgid "Evolution Addressbook address pop-up"
+msgstr "Раптоўнае акенца кнігі адрэсаў \"Эвалюцыі\""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
+msgid "Evolution Addressbook address viewer"
+msgstr "Праглядальнік кнігі адрэсаў \"Эвалюцыі\""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
+msgid "Evolution Addressbook card viewer"
+msgstr "Праглядальнік візытовак кнігі адрэсаў \"Эвалюцыі\""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
+msgid "Evolution Addressbook component"
+msgstr "Кампанэнт кнігі адрэсаў \"Эвалюцыі\""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
+msgid "Evolution Addressbook folder viewer"
+msgstr "Праглядальнік тэчак кнігі адрэсаў \"Эвалюцыі\""
+
+#: addressbook/gui/component/addressbook-component.c:76
+#: addressbook/gui/component/addressbook-component.c:620
+#: importers/netscape-importer.c:1874 mail/importers/netscape-importer.c:1844
+#: shell/e-local-storage.c:178 shell/e-shortcuts.c:1087
+msgid "Contacts"
+msgstr "Кантакты"
+
+#: addressbook/gui/component/addressbook-component.c:76
+msgid "Folder containing contact information"
+msgstr "Тэчка якая утрымлівае кантактную інфармацыю"
+
+#: addressbook/gui/component/addressbook-component.c:78
+msgid "LDAP Server"
+msgstr "Паслужнік LDAP"
+
+#: addressbook/gui/component/addressbook-component.c:78
+msgid "LDAP server containing contact information"
+msgstr "Паслужнік LDAP, які утрымлівае кантактную інфармацыю"
+
+#: addressbook/gui/component/addressbook-component.c:80
+msgid "Public Contacts"
+msgstr "Публічныя кантакты"
+
+#: addressbook/gui/component/addressbook-component.c:80
+msgid "Public folder containing contact information"
+msgstr "Публічная тэчка, якая утрымлівае кантактную інфармацыю"
+
+#: addressbook/gui/component/addressbook-component.c:574
+msgid "New Contact"
+msgstr "Новы кантакт"
+
+#: addressbook/gui/component/addressbook-component.c:574
+msgid "_Contact"
+msgstr "_Кантакт"
+
+#: addressbook/gui/component/addressbook-component.c:575
+msgid "Create a new contact"
+msgstr "Стварыць новы кантакт"
+
+#: addressbook/gui/component/addressbook-component.c:578
+msgid "New Contact List"
+msgstr "Новы сьпіс кантактаў"
+
+#: addressbook/gui/component/addressbook-component.c:578
+msgid "Contact _List"
+msgstr "_Сьпіс кантактаў"
+
+#: addressbook/gui/component/addressbook-component.c:579
+msgid "Create a new contact list"
+msgstr "Стварыць новы сьпіс кантактаў"
+
+#: addressbook/gui/component/addressbook-config.c:206
+msgid "Failed to connect to LDAP server"
+msgstr "Збой далучэньня да паслужніка LDAP"
+
+#: addressbook/gui/component/addressbook-config.c:231
+msgid "Failed to authenticate with LDAP server"
+msgstr "Збой аўтарызацыі на паслужніку LDAP"
+
+#: addressbook/gui/component/addressbook-config.c:259
+msgid "Could not perform query on Root DSE"
+msgstr "Немагчыма выканаць запыт да карэннага DSE"
+
+#: addressbook/gui/component/addressbook-config.c:682
+msgid "The server responded with no supported search bases"
+msgstr "Паслужнік адказаў: \"адсутнічаюць базы пошуку\""
+
+#: addressbook/gui/component/addressbook-config.c:1193
+msgid "This server does not support LDAPv3 schema information"
+msgstr "Паслужнік не падтрымлівае звесткі схемы LDAPv3"
+
+#: addressbook/gui/component/addressbook-config.c:1215
+msgid "Error retrieving schema information"
+msgstr "Памылка атрыманьня зьвестак схемы"
+
+#: addressbook/gui/component/addressbook-config.c:1223
+msgid "Server did not respond with valid schema information"
+msgstr "Паслужнік не адказаў з рэчаіснымі зьвесткамі схемы"
+
+#: addressbook/gui/component/addressbook-config.c:1637
+msgid "Account Name"
+msgstr "Назва уліковага запіса"
+
+#: addressbook/gui/component/addressbook-config.c:1639
+msgid "Server Name"
+msgstr "Назва паслужніка"
+
+#: addressbook/gui/component/addressbook-config.c:1676
+msgid "LDAP was not enabled in this build of Evolution"
+msgstr "Падтрымка LDAP не уключана ў гэтае зборцы \"Эвалюцыі\""
+
+#: addressbook/gui/component/addressbook-storage.c:178
+msgid "Other Contacts"
+msgstr "Іншыя кантакты"
+
 #: addressbook/gui/component/addressbook.c:502
 msgid ""
 "We were unable to open this addressbook.  Please check that the\n"
@@ -639,101 +776,6 @@ msgstr "Любая катэгорыя"
 msgid "The URI that the Folder Browser will display"
 msgstr "URI, які будзе адлюстроўваць праграма прагляду тэчак"
 
-#: addressbook/gui/component/addressbook-component.c:76
-#: addressbook/gui/component/addressbook-component.c:628
-#: importers/netscape-importer.c:1874 mail/importers/netscape-importer.c:1844
-#: shell/e-local-storage.c:178 shell/e-shortcuts.c:1087
-msgid "Contacts"
-msgstr "Кантакты"
-
-#: addressbook/gui/component/addressbook-component.c:76
-msgid "Folder containing contact information"
-msgstr "Тэчка якая утрымлівае кантактную інфармацыю"
-
-#: addressbook/gui/component/addressbook-component.c:78
-msgid "LDAP Server"
-msgstr "Паслужнік LDAP"
-
-#: addressbook/gui/component/addressbook-component.c:78
-msgid "LDAP server containing contact information"
-msgstr "Паслужнік LDAP, які утрымлівае кантактную інфармацыю"
-
-#: addressbook/gui/component/addressbook-component.c:80
-msgid "Public Contacts"
-msgstr "Публічныя кантакты"
-
-#: addressbook/gui/component/addressbook-component.c:80
-msgid "Public folder containing contact information"
-msgstr "Публічная тэчка, якая утрымлівае кантактную інфармацыю"
-
-#: addressbook/gui/component/addressbook-component.c:582
-msgid "New Contact"
-msgstr "Новы кантакт"
-
-#: addressbook/gui/component/addressbook-component.c:582
-msgid "_Contact"
-msgstr "_Кантакт"
-
-#: addressbook/gui/component/addressbook-component.c:583
-msgid "Create a new contact"
-msgstr "Стварыць новы кантакт"
-
-#: addressbook/gui/component/addressbook-component.c:586
-msgid "New Contact List"
-msgstr "Новы сьпіс кантактаў"
-
-#: addressbook/gui/component/addressbook-component.c:586
-msgid "Contact _List"
-msgstr "_Сьпіс кантактаў"
-
-#: addressbook/gui/component/addressbook-component.c:587
-msgid "Create a new contact list"
-msgstr "Стварыць новы сьпіс кантактаў"
-
-#: addressbook/gui/component/addressbook-config.c:206
-msgid "Failed to connect to LDAP server"
-msgstr "Збой далучэньня да паслужніка LDAP"
-
-#: addressbook/gui/component/addressbook-config.c:231
-msgid "Failed to authenticate with LDAP server"
-msgstr "Збой аўтарызацыі на паслужніку LDAP"
-
-#: addressbook/gui/component/addressbook-config.c:259
-msgid "Could not perform query on Root DSE"
-msgstr "Немагчыма выканаць запыт да карэннага DSE"
-
-#: addressbook/gui/component/addressbook-config.c:682
-msgid "The server responded with no supported search bases"
-msgstr "Паслужнік адказаў: \"адсутнічаюць базы пошуку\""
-
-#: addressbook/gui/component/addressbook-config.c:1193
-msgid "This server does not support LDAPv3 schema information"
-msgstr "Паслужнік не падтрымлівае звесткі схемы LDAPv3"
-
-#: addressbook/gui/component/addressbook-config.c:1215
-msgid "Error retrieving schema information"
-msgstr "Памылка атрыманьня зьвестак схемы"
-
-#: addressbook/gui/component/addressbook-config.c:1223
-msgid "Server did not respond with valid schema information"
-msgstr "Паслужнік не адказаў з рэчаіснымі зьвесткамі схемы"
-
-#: addressbook/gui/component/addressbook-config.c:1637
-msgid "Account Name"
-msgstr "Назва уліковага запіса"
-
-#: addressbook/gui/component/addressbook-config.c:1639
-msgid "Server Name"
-msgstr "Назва паслужніка"
-
-#: addressbook/gui/component/addressbook-config.c:1676
-msgid "LDAP was not enabled in this build of Evolution"
-msgstr "Падтрымка LDAP не уключана ў гэтае зборцы \"Эвалюцыі\""
-
-#: addressbook/gui/component/addressbook-storage.c:178
-msgid "Other Contacts"
-msgstr "Іншыя кантакты"
-
 #.
 #. * This is the code for the UI thingie that lets you manipulate the e-mail
 #. * addresses (and *only* the e-mail addresses) associated with an existing
@@ -762,69 +804,33 @@ msgstr "Стварыць новы кантакт \"%s\""
 msgid "Add address to existing contact \"%s\""
 msgstr "Дадаць адрэсу да кантакта \"%s\", які ўжо існуе"
 
-#: addressbook/gui/component/e-address-popup.c:917
+#: addressbook/gui/component/e-address-popup.c:914
 msgid "Querying Addressbook..."
 msgstr "Запыт да кнігі адрэсаў..."
 
-#: addressbook/gui/component/e-address-popup.c:1001
-#: addressbook/gui/component/e-address-widget.c:401
+#: addressbook/gui/component/e-address-popup.c:998
+#: addressbook/gui/component/e-address-widget.c:392
 msgid "Edit Contact Info"
 msgstr "Рэдагаваньне кантактных зьвестак"
 
-#: addressbook/gui/component/e-address-popup.c:1031
-#: addressbook/gui/component/e-address-widget.c:437
+#: addressbook/gui/component/e-address-popup.c:1028
+#: addressbook/gui/component/e-address-widget.c:428
 #: addressbook/gui/component/select-names/e-select-names-popup.c:324
 msgid "Add to Contacts"
 msgstr "Дадаць да кантактаў"
 
-#: addressbook/gui/component/e-address-popup.c:1056
+#: addressbook/gui/component/e-address-popup.c:1053
 msgid "Merge E-Mail Address"
 msgstr "Аб'яднаць адрэсы Э. пошты"
 
-#: addressbook/gui/component/e-address-widget.c:378
+#: addressbook/gui/component/e-address-widget.c:369
 msgid "Disable Queries"
 msgstr "Выключыць чэргі"
 
-#: addressbook/gui/component/e-address-widget.c:378
+#: addressbook/gui/component/e-address-widget.c:369
 msgid "Enable Queries (Dangerous!)"
 msgstr "Уключыць чэргі (Небясьпечна!)"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
-msgid "Configure access to LDAP directory servers here"
-msgstr "Наладжвайце доступ да паслужніка каталёгаў LDAP тутака"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
-msgid "Directory Servers"
-msgstr "Паслужнікі каталёгаў"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
-msgid "Evolution Addressbook"
-msgstr "Кніга адрэсаў \"Эвалюцыі\""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
-msgid "Evolution Addressbook LDAP Configuration Control"
-msgstr "Сродак кіраваньня LDAP кнігі адрэсаў \"Эвалюцыі\"."
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-msgid "Evolution Addressbook address pop-up"
-msgstr "Раптоўнае акенца кнігі адрэсаў \"Эвалюцыі\""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
-msgid "Evolution Addressbook address viewer"
-msgstr "Праглядальнік кнігі адрэсаў \"Эвалюцыі\""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
-msgid "Evolution Addressbook card viewer"
-msgstr "Праглядальнік візытовак кнігі адрэсаў \"Эвалюцыі\""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
-msgid "Evolution Addressbook component"
-msgstr "Кампанэнт кнігі адрэсаў \"Эвалюцыі\""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
-msgid "Evolution Addressbook folder viewer"
-msgstr "Праглядальнік тэчак кнігі адрэсаў \"Эвалюцыі\""
-
 #: addressbook/gui/component/ldap-config.glade.h:1
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:1
 #: mail/mail-config.glade.h:1
@@ -976,9 +982,10 @@ msgstr "Адзін"
 msgid "S_earch scope: "
 msgstr "Межы _пошуку:"
 
+#. No time range is set, so don't start a query
 #: addressbook/gui/component/ldap-config.glade.h:34
-#: calendar/gui/e-cal-view.c:541 calendar/gui/e-day-view.c:3261
-#: calendar/gui/e-week-view.c:1181 calendar/gui/gnome-cal.c:625
+#: calendar/gui/calendar-model.c:1983 calendar/gui/e-day-view.c:1712
+#: calendar/gui/e-week-view.c:1256
 msgid "Searching"
 msgstr "Пошук"
 
@@ -1214,11 +1221,11 @@ msgstr "Аб_межаваньне загрузкі:"
 
 #: addressbook/gui/component/ldap-config.glade.h:85 filter/filter.glade.h:14
 #: mail/mail-config.glade.h:143 ui/evolution-addressbook.xml.h:33
-#: ui/evolution-calendar.xml.h:35 ui/evolution-composer-entries.xml.h:8
-#: ui/evolution-mail-list.xml.h:24 ui/evolution-mail-messagedisplay.xml.h:6
+#: ui/evolution-calendar.xml.h:31 ui/evolution-composer-entries.xml.h:8
+#: ui/evolution-mail-list.xml.h:25 ui/evolution-mail-messagedisplay.xml.h:6
 #: ui/evolution-message-composer.xml.h:41
-#: ui/evolution-signature-editor.xml.h:12 ui/evolution-subscribe.xml.h:10
-#: ui/evolution-tasks.xml.h:19
+#: ui/evolution-signature-editor.xml.h:11 ui/evolution-subscribe.xml.h:10
+#: ui/evolution-tasks.xml.h:17
 msgid "_Edit"
 msgstr "_Рэдагаваньне"
 
@@ -1258,24 +1265,20 @@ msgstr "агульная закладка"
 msgid "searching-tab"
 msgstr "закладка пошуку"
 
-#: addressbook/gui/component/select-names/e-select-names.c:509
-msgid "Select Contacts from Addressbook"
-msgstr "Выбар кантактаў з кнігі адрэсаў"
+#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:1
+msgid "Evolution Addressbook name selection interface"
+msgstr "Інтарфэйс выбару імя з кнігі адрэсаў \"Эвалюцыі\"."
 
-#: addressbook/gui/component/select-names/e-select-names.c:650
-msgid "Find contact in"
-msgstr "Пошук кантактаў у"
+#: addressbook/gui/component/select-names/e-select-names-popup.c:204
+msgid "Remove All"
+msgstr "Выдаліць усё"
 
-#: addressbook/gui/component/select-names/e-select-names.c:694
 #: addressbook/gui/component/select-names/e-select-names-popup.c:211
-#: composer/e-msg-composer-attachment-bar.c:444
+#: addressbook/gui/component/select-names/e-select-names.c:694
+#: composer/e-msg-composer-attachment-bar.c:507
 msgid "Remove"
 msgstr "Выдаліць"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:204
-msgid "Remove All"
-msgstr "Выдаліць усё"
-
 #: addressbook/gui/component/select-names/e-select-names-popup.c:218
 msgid "View Contact List"
 msgstr "Прагляд сьпіса кантактаў"
@@ -1298,9 +1301,13 @@ msgstr "Кантакт бяз назвы"
 msgid "Source"
 msgstr "Крыніца"
 
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:1
-msgid "Evolution Addressbook name selection interface"
-msgstr "Інтарфэйс выбару імя з кнігі адрэсаў \"Эвалюцыі\"."
+#: addressbook/gui/component/select-names/e-select-names.c:509
+msgid "Select Contacts from Addressbook"
+msgstr "Выбар кантактаў з кнігі адрэсаў"
+
+#: addressbook/gui/component/select-names/e-select-names.c:650
+msgid "Find contact in"
+msgstr "Пошук кантактаў у"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:2
 msgid "Find"
@@ -1373,7 +1380,7 @@ msgid "D_epartment:"
 msgstr "Па_дразьдзяленьне:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:11
-#: calendar/gui/dialogs/task-editor.c:200
+#: calendar/gui/dialogs/task-editor.c:197
 msgid "Details"
 msgstr "Дэталі"
 
@@ -1440,13 +1447,11 @@ msgid "_Categories..."
 msgstr "_Катэгорыі..."
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:28
-#: calendar/gui/dialogs/meeting-page.c:634
-#: calendar/gui/e-calendar-table.c:1008 calendar/gui/e-calendar-table.c:1026
-#: calendar/gui/e-cal-view.c:1144 calendar/gui/e-cal-view.c:1176
-#: ui/evolution-addressbook.xml.h:32 ui/evolution-calendar.xml.h:34
-#: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:14
-#: ui/evolution-mail-message.xml.h:104 ui/evolution-tasks.xml.h:18
-#: ui/evolution.xml.h:45
+#: calendar/gui/dialogs/meeting-page.c:717 calendar/gui/e-calendar-table.c:977
+#: calendar/gui/e-day-view.c:3755 calendar/gui/e-week-view.c:3631
+#: mail/folder-browser.c:1790 ui/evolution-addressbook.xml.h:32
+#: ui/evolution-calendar.xml.h:30 ui/evolution-mail-message.xml.h:97
+#: ui/evolution-tasks.xml.h:16 ui/evolution.xml.h:45
 msgid "_Delete"
 msgstr "Вы_даліць"
 
@@ -1487,15 +1492,15 @@ msgid "_Web page address:"
 msgstr "Адрэса Web-старонкі:"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:102
-#: addressbook/gui/contact-editor/e-contact-editor.c:184
 #: addressbook/gui/contact-editor/e-contact-editor-fullname.c:95
+#: addressbook/gui/contact-editor/e-contact-editor.c:184
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.c:163
 #: addressbook/gui/widgets/e-addressbook-model.c:318
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:408
-#: addressbook/gui/widgets/e-minicard.c:183
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:393
 #: addressbook/gui/widgets/e-minicard-label.c:164
-#: addressbook/gui/widgets/e-minicard-view.c:478
 #: addressbook/gui/widgets/e-minicard-view-widget.c:120
+#: addressbook/gui/widgets/e-minicard-view.c:478
+#: addressbook/gui/widgets/e-minicard.c:183
 msgid "Editable"
 msgstr "Можа рэдагавацца"
 
@@ -2523,17 +2528,17 @@ msgstr "Зімбабве"
 #: addressbook/gui/contact-editor/e-contact-editor.c:156
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.c:142
 #: addressbook/gui/widgets/e-addressbook-model.c:304
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:394
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:379
 #: addressbook/gui/widgets/e-addressbook-view.c:180
-#: addressbook/gui/widgets/e-minicard-view.c:464
 #: addressbook/gui/widgets/e-minicard-view-widget.c:106
+#: addressbook/gui/widgets/e-minicard-view.c:464
 msgid "Book"
 msgstr "Кніга"
 
 #: addressbook/gui/contact-editor/e-contact-editor.c:163
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.c:149
-#: addressbook/gui/widgets/e-minicard.c:190
 #: addressbook/gui/widgets/e-minicard-widget.c:93
+#: addressbook/gui/widgets/e-minicard.c:190
 msgid "Card"
 msgstr "Картка"
 
@@ -2754,7 +2759,7 @@ msgstr "Гэта новы сьпіс"
 msgid "Contact List Editor"
 msgstr "Рэдактар сьпісу кантактаў"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:457
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:456
 msgid "Save List as VCard"
 msgstr "Захаваць сьпіс як Візытоўку (VCard)"
 
@@ -2800,7 +2805,7 @@ msgstr ""
 "прысутнічаюць у гэтае тэчцы. Усё адно жадаеце дадаць?"
 
 #. FIXME: get the toplevel window...
-#: addressbook/gui/search/e-addressbook-search-dialog.c:116
+#: addressbook/gui/search/e-addressbook-search-dialog.c:117
 #: widgets/misc/e-filter-bar.c:148
 msgid "Advanced Search"
 msgstr "Адмысловы пошук"
@@ -2819,10 +2824,10 @@ msgid "%d cards"
 msgstr "%d карткі"
 
 #: addressbook/gui/widgets/e-addressbook-model.c:311
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:401
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:386
 #: addressbook/gui/widgets/e-addressbook-view.c:187
-#: addressbook/gui/widgets/e-minicard-view.c:471
 #: addressbook/gui/widgets/e-minicard-view-widget.c:113
+#: addressbook/gui/widgets/e-minicard-view.c:471
 msgid "Query"
 msgstr "Запыт"
 
@@ -2830,113 +2835,113 @@ msgstr "Запыт"
 msgid "Error getting book view"
 msgstr "Памылка атрыманьня прагляду кнігі"
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:415
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:400
 msgid "Model"
 msgstr "Мадэля"
 
-#: addressbook/gui/widgets/e-addressbook-table-adapter.c:148
-#: addressbook/gui/widgets/e-addressbook-util.c:106
+#: addressbook/gui/widgets/e-addressbook-table-adapter.c:145
+#: addressbook/gui/widgets/e-addressbook-util.c:105
 #: addressbook/gui/widgets/e-minicard.c:531
 msgid "Error modifying card"
 msgstr "Памылка пад час зьмены карткі"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:37
-#: shell/evolution-shell-component.c:1183
+#: addressbook/gui/widgets/e-addressbook-util.c:36
+#: shell/evolution-shell-component.c:1180
 msgid "Success"
 msgstr "Пасьпяхова"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:38
+#: addressbook/gui/widgets/e-addressbook-util.c:37
 #: camel/providers/imap/camel-imap-command.c:306
 #: camel/providers/imap/camel-imap-command.c:403
 #: camel/providers/pop3/camel-pop3-store.c:526
 #: camel/providers/pop3/camel-pop3-store.c:533 shell/e-shell.c:2077
-#: shell/e-storage.c:598 shell/evolution-shell-component.c:1222
+#: shell/e-storage.c:598 shell/evolution-shell-component.c:1219
 msgid "Unknown error"
 msgstr "Невядомая памылка"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:39
+#: addressbook/gui/widgets/e-addressbook-util.c:38
 msgid "Repository offline"
 msgstr "Сховішча знаходзіцца ў адлучаным стане"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:40 shell/e-storage.c:584
-#: shell/evolution-shell-component.c:1213
+#: addressbook/gui/widgets/e-addressbook-util.c:39 shell/e-storage.c:584
+#: shell/evolution-shell-component.c:1210
 msgid "Permission denied"
 msgstr "Адмоўлена ў доступе"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:41
+#: addressbook/gui/widgets/e-addressbook-util.c:40
 msgid "Card not found"
 msgstr "Картка ня адшукана"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:42
+#: addressbook/gui/widgets/e-addressbook-util.c:41
 msgid "Card ID already exists"
 msgstr "Ід карткі ужо існуе"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:43
+#: addressbook/gui/widgets/e-addressbook-util.c:42
 msgid "Protocol not supported"
 msgstr "Пратакол не падтрымліваецца"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:44
+#: addressbook/gui/widgets/e-addressbook-util.c:43
+#: calendar/gui/calendar-model.c:759 calendar/gui/calendar-model.c:1184
 #: calendar/gui/dialogs/task-details-page.glade.h:3
-#: calendar/gui/e-calendar-table.c:479 calendar/gui/e-cal-model-tasks.c:325
-#: calendar/gui/e-cal-model-tasks.c:604 calendar/gui/e-tasks.c:253
-#: calendar/gui/print.c:2314 camel/camel-service.c:733
-#: camel/camel-service.c:771 camel/camel-service.c:855
-#: camel/camel-service.c:895 camel/providers/pop3/camel-pop3-store.c:443
+#: calendar/gui/e-calendar-table.c:477 calendar/gui/print.c:2307
+#: camel/camel-service.c:745 camel/camel-service.c:785
+#: camel/camel-service.c:875 camel/camel-service.c:917
+#: camel/providers/pop3/camel-pop3-store.c:443
 #: camel/providers/pop3/camel-pop3-store.c:520
 msgid "Cancelled"
 msgstr "Адменена"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:45
+#: addressbook/gui/widgets/e-addressbook-util.c:44
 msgid "Authentication Failed"
 msgstr "Збой аўтарызацыі"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:46
+#: addressbook/gui/widgets/e-addressbook-util.c:45
 msgid "Authentication Required"
 msgstr "Патрабуе аўтарызацыю"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:47
+#: addressbook/gui/widgets/e-addressbook-util.c:46
 msgid "TLS not Available"
 msgstr "TLS адсутнічае"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:48
+#: addressbook/gui/widgets/e-addressbook-util.c:47
 msgid "Addressbook does not exist"
 msgstr "Кніга адрэсаў адсутнічае"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:49
+#: addressbook/gui/widgets/e-addressbook-util.c:48
 msgid "Other error"
 msgstr "Іншая памылка"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:76
+#: addressbook/gui/widgets/e-addressbook-util.c:75
 msgid "Do you want to save changes?"
 msgstr "Жадаеце захаваць зьмены?"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:78
+#: addressbook/gui/widgets/e-addressbook-util.c:77
 msgid "_Discard"
 msgstr "_Адмовіць"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:97
+#: addressbook/gui/widgets/e-addressbook-util.c:96
 msgid "Error adding list"
 msgstr "Памылка пад час даданьня сьпісу"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:97
-#: addressbook/gui/widgets/e-addressbook-util.c:273
+#: addressbook/gui/widgets/e-addressbook-util.c:96
+#: addressbook/gui/widgets/e-addressbook-util.c:272
 msgid "Error adding card"
 msgstr "Памылка пад час даданьня карткі"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:106
+#: addressbook/gui/widgets/e-addressbook-util.c:105
 msgid "Error modifying list"
 msgstr "Памылка рэдагаваньня сьпісу"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:116
+#: addressbook/gui/widgets/e-addressbook-util.c:115
 msgid "Error removing list"
 msgstr "Памылка выдаленьня сьпісу"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:116
-#: addressbook/gui/widgets/e-addressbook-util.c:231
+#: addressbook/gui/widgets/e-addressbook-util.c:115
+#: addressbook/gui/widgets/e-addressbook-util.c:230
 msgid "Error removing card"
 msgstr "Памылка выдаленьня карткі"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:198
+#: addressbook/gui/widgets/e-addressbook-util.c:197
 #, c-format
 msgid ""
 "Opening %d cards will open %d new windows as well.\n"
@@ -2945,131 +2950,132 @@ msgstr ""
 "Адкрыцьцё %d картак прывядзе да адкрыцьця %d новых вокнаў.\n"
 "Вы сапраўды жадаеце адлюстраваць усе гэтыя карткі?"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:329
+#: addressbook/gui/widgets/e-addressbook-util.c:328
 msgid "Move card to"
 msgstr "Перамясьсціць картку ў"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:331
+#: addressbook/gui/widgets/e-addressbook-util.c:330
 msgid "Copy card to"
 msgstr "Капіяваць картку ў"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:334
+#: addressbook/gui/widgets/e-addressbook-util.c:333
 msgid "Move cards to"
 msgstr "Перамясьсціць карткі ў"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:336
+#: addressbook/gui/widgets/e-addressbook-util.c:335
 msgid "Copy cards to"
 msgstr "Капіяваць карткі ў"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:518
+#: addressbook/gui/widgets/e-addressbook-util.c:517
 msgid "Multiple VCards"
 msgstr "Шматлікія VCard"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:526
+#: addressbook/gui/widgets/e-addressbook-util.c:525
 #, c-format
 msgid "VCard for %s"
 msgstr "VCard для %s"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:194
-#: calendar/gui/e-calendar-table.etspec.h:17
+#: calendar/gui/dialogs/meeting-page.etspec.h:11
+#: calendar/gui/e-calendar-table.etspec.h:18
 #: calendar/gui/e-meeting-time-sel.etspec.h:11
 msgid "Type"
 msgstr "Тып"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:398
+#: addressbook/gui/widgets/e-addressbook-view.c:394
 #: importers/evolution-gnomecard-importer.c:228 importers/pine-importer.c:642
 #: mail/importers/pine-importer.c:577
 msgid "Addressbook"
 msgstr "Кніга адрэсаў"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:680
-#: addressbook/gui/widgets/e-addressbook-view.c:899
-#: addressbook/gui/widgets/e-addressbook-view.c:1883
+#: addressbook/gui/widgets/e-addressbook-view.c:676
+#: addressbook/gui/widgets/e-addressbook-view.c:895
+#: addressbook/gui/widgets/e-addressbook-view.c:1879
 #: ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard"
 msgstr "Захаваць як візытоўку (VCard)"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:886
+#: addressbook/gui/widgets/e-addressbook-view.c:882
 msgid "New Contact..."
 msgstr "Новы кантакт..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:887
+#: addressbook/gui/widgets/e-addressbook-view.c:883
 msgid "New Contact List..."
 msgstr "Новы сьпіс кантактаў..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:890
+#: addressbook/gui/widgets/e-addressbook-view.c:886
 msgid "Go to Folder..."
 msgstr "Пераход у тэчку..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:891
+#: addressbook/gui/widgets/e-addressbook-view.c:887
 msgid "Import..."
 msgstr "Імпарт..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:893
+#: addressbook/gui/widgets/e-addressbook-view.c:889
 msgid "Search for Contacts..."
 msgstr "Пошук кантактаў..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:894
+#: addressbook/gui/widgets/e-addressbook-view.c:890
 msgid "Addressbook Sources..."
 msgstr "Крыніцы кнігі адрэсаў..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:896
+#: addressbook/gui/widgets/e-addressbook-view.c:892
 msgid "Pilot Settings..."
 msgstr "Усталёўкі \"Пілёта\"..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:900
+#: addressbook/gui/widgets/e-addressbook-view.c:896
 #: ui/evolution-addressbook.xml.h:10
 msgid "Forward Contact"
 msgstr "Пераслаць кантакт"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:901
+#: addressbook/gui/widgets/e-addressbook-view.c:897
 msgid "Send Message to Contact"
 msgstr "Даслаць паведамленьне кантактанае асобе"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:902 calendar/gui/print.c:2446
+#: addressbook/gui/widgets/e-addressbook-view.c:898 calendar/gui/print.c:2439
 #: ui/evolution-addressbook.xml.h:16 ui/evolution-comp-editor.xml.h:8
-#: ui/evolution-contact-editor.xml.h:5 ui/evolution-mail-message.xml.h:72
+#: ui/evolution-contact-editor.xml.h:4 ui/evolution-mail-message.xml.h:67
 #: ui/my-evolution.xml.h:1
 msgid "Print"
 msgstr "Друк"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:904
+#: addressbook/gui/widgets/e-addressbook-view.c:900
 msgid "Print Envelope"
 msgstr "Друкаваць паштоўку"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:908
+#: addressbook/gui/widgets/e-addressbook-view.c:904
 msgid "Copy to folder..."
 msgstr "Капіяваць у тэчку..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:909
+#: addressbook/gui/widgets/e-addressbook-view.c:905
 msgid "Move to folder..."
 msgstr "Перамясьсціць у тэчку..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:912
+#: addressbook/gui/widgets/e-addressbook-view.c:908
 #: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "Выразаць"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:913
-#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:9
+#: addressbook/gui/widgets/e-addressbook-view.c:909
+#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:8
 #: ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr "Капіяваць"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:914
-#: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:10
+#: addressbook/gui/widgets/e-addressbook-view.c:910
+#: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:9
 msgid "Paste"
 msgstr "Уставіць"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:915 filter/libfilter-i18n.h:10
+#: addressbook/gui/widgets/e-addressbook-view.c:911 filter/libfilter-i18n.h:11
 #: mail/mail-accounts.c:234 ui/evolution-addressbook.xml.h:8
-#: ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:3
-#: ui/evolution-contact-list-editor.xml.h:3 ui/evolution-mail-message.xml.h:24
+#: ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:2
+#: ui/evolution-contact-list-editor.xml.h:2 ui/evolution-mail-message.xml.h:20
 msgid "Delete"
 msgstr "Выдаліць"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:919
-#: calendar/gui/e-cal-view.c:1109
+#: addressbook/gui/widgets/e-addressbook-view.c:915
+#: calendar/gui/e-day-view.c:3715 calendar/gui/e-week-view.c:3596
 msgid "Current View"
 msgstr "Бягучы выгляд"
 
@@ -3077,7 +3083,7 @@ msgstr "Бягучы выгляд"
 #. Translators: put here a list of labels you want to see on buttons in
 #. addressbook. You may use any character to separate labels but it must
 #. also be placed at the begining ot the string
-#: addressbook/gui/widgets/e-addressbook-view.c:953
+#: addressbook/gui/widgets/e-addressbook-view.c:949
 msgid ",123,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
 msgstr ",123,А,Б,В,Г,Д,Е,Ё,Ж,З,І,К,Л,М,Н,О,П,Р,С,Т,У,Ф,Х,Ц,Ч,Ш,Ы,Э,Ю,Я"
 
@@ -3085,11 +3091,11 @@ msgstr ",123,А,Б,В,Г,Д,Е,Ё,Ж,З,І,К,Л,М,Н,О,П,Р,С,Т,У,Ф,Х,�
 #. in addressbook. You may use any character to separate labels but it
 #. must also be placed at the begining ot the string.
 #. Use lower case letters if possible.
-#: addressbook/gui/widgets/e-addressbook-view.c:958
+#: addressbook/gui/widgets/e-addressbook-view.c:954
 msgid ",0,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
 msgstr ",0,а,б,в,г,д,е,ё,ж,з,і,к,л,м,н,о,п,р,с,т,у,ф,х,ц,ч,ш,ы,э,ю,я"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1356
+#: addressbook/gui/widgets/e-addressbook-view.c:1352
 #, c-format
 msgid ""
 "The addressbook backend for\n"
@@ -3161,29 +3167,6 @@ msgstr "Іншыя тэлефоны"
 msgid "Primary Phone"
 msgstr "Першасны тэлефон"
 
-#: addressbook/gui/widgets/e-minicard.c:146
-#: addressbook/gui/widgets/e-minicard-label.c:115
-msgid "Width"
-msgstr "Шырыня"
-
-#: addressbook/gui/widgets/e-minicard.c:153
-#: addressbook/gui/widgets/e-minicard-label.c:122
-msgid "Height"
-msgstr "Вышыня"
-
-#: addressbook/gui/widgets/e-minicard.c:161
-#: addressbook/gui/widgets/e-minicard-label.c:129
-msgid "Has Focus"
-msgstr "Мае засяроджаньне"
-
-#: addressbook/gui/widgets/e-minicard.c:169
-msgid "Selected"
-msgstr "Вылучаны"
-
-#: addressbook/gui/widgets/e-minicard.c:176
-msgid "Has Cursor"
-msgstr "Мае курсор"
-
 #: addressbook/gui/widgets/e-minicard-control.c:204
 #, c-format
 msgid "and %d other cards."
@@ -3197,6 +3180,21 @@ msgstr "і адна іншая картка."
 msgid "Save in addressbook"
 msgstr "Захаваць у кнізе адрэсаў"
 
+#: addressbook/gui/widgets/e-minicard-label.c:115
+#: addressbook/gui/widgets/e-minicard.c:146
+msgid "Width"
+msgstr "Шырыня"
+
+#: addressbook/gui/widgets/e-minicard-label.c:122
+#: addressbook/gui/widgets/e-minicard.c:153
+msgid "Height"
+msgstr "Вышыня"
+
+#: addressbook/gui/widgets/e-minicard-label.c:129
+#: addressbook/gui/widgets/e-minicard.c:161
+msgid "Has Focus"
+msgstr "Мае засяроджаньне"
+
 #: addressbook/gui/widgets/e-minicard-label.c:136
 msgid "Field"
 msgstr "Поле"
@@ -3213,6 +3211,10 @@ msgstr "Мадэль тэкста"
 msgid "Max field name length"
 msgstr "Максымальная даўжыня поля імя"
 
+#: addressbook/gui/widgets/e-minicard-view-widget.c:127
+msgid "Column Width"
+msgstr "Шырыня слупка"
+
 #: addressbook/gui/widgets/e-minicard-view.c:141
 msgid ""
 "\n"
@@ -3241,9 +3243,13 @@ msgstr ""
 msgid "Adapter"
 msgstr "Адаптар"
 
-#: addressbook/gui/widgets/e-minicard-view-widget.c:127
-msgid "Column Width"
-msgstr "Шырыня слупка"
+#: addressbook/gui/widgets/e-minicard.c:169
+msgid "Selected"
+msgstr "Вылучаны"
+
+#: addressbook/gui/widgets/e-minicard.c:176
+msgid "Has Cursor"
+msgstr "Мае курсор"
 
 #: addressbook/gui/widgets/gal-view-factory-minicard.c:24
 msgid "Card View"
@@ -3253,20 +3259,20 @@ msgstr "Выгляд карткі"
 msgid "GTK Tree View"
 msgstr "Прагляд дрэва GTK"
 
-#: addressbook/printing/e-contact-print.c:1158
+#: addressbook/printing/e-contact-print-envelope.c:217
+#: addressbook/printing/e-contact-print-envelope.c:238
+msgid "Print envelope"
+msgstr "Друк паштоўкі"
+
+#: addressbook/printing/e-contact-print.c:1139
 msgid "Print cards"
 msgstr "Друк картак"
 
-#: addressbook/printing/e-contact-print.c:1224
-#: addressbook/printing/e-contact-print.c:1250
+#: addressbook/printing/e-contact-print.c:1204
+#: addressbook/printing/e-contact-print.c:1226
 msgid "Print card"
 msgstr "Друк карткі"
 
-#: addressbook/printing/e-contact-print-envelope.c:217
-#: addressbook/printing/e-contact-print-envelope.c:238
-msgid "Print envelope"
-msgstr "Друк паштоўкі"
-
 #: addressbook/printing/e-contact-print.glade.h:1
 msgid "10 pt. Tahoma"
 msgstr "10 пт. Tahoma"
@@ -3436,63 +3442,6 @@ msgstr "Шырыня:"
 msgid "_Font..."
 msgstr "Шрыфт..."
 
-#: addressbook/tools/evolution-addressbook-export.c:56
-msgid "Specify the output file instead of standard output"
-msgstr ""
-
-#: addressbook/tools/evolution-addressbook-export.c:57
-msgid "OUTPUTFILE"
-msgstr ""
-
-#: addressbook/tools/evolution-addressbook-export.c:58
-#, fuzzy
-msgid "List local addressbook folders"
-msgstr "з усімі лакальнымі й актыўнымі аддаленымі течкамі"
-
-#: addressbook/tools/evolution-addressbook-export.c:60
-msgid "Show cards as vcard or csv file"
-msgstr ""
-
-#: addressbook/tools/evolution-addressbook-export.c:60
-#, fuzzy
-msgid "[vcard|csv]"
-msgstr "карткі"
-
-#: addressbook/tools/evolution-addressbook-export.c:61
-msgid "Export in asynchronous mode "
-msgstr ""
-
-#: addressbook/tools/evolution-addressbook-export.c:63
-msgid ""
-"The number of cards in one output file in asychronous mode,default size 100."
-msgstr ""
-
-#: addressbook/tools/evolution-addressbook-export.c:63
-msgid "NUMBER"
-msgstr ""
-
-#: addressbook/tools/evolution-addressbook-export.c:91
-msgid ""
-"Command line arguments error, please use --help option to see the usage."
-msgstr ""
-
-#: addressbook/tools/evolution-addressbook-export.c:105
-msgid "Only support csv or vcard format."
-msgstr ""
-
-#: addressbook/tools/evolution-addressbook-export.c:114
-msgid "In async mode, output must be file."
-msgstr ""
-
-#: addressbook/tools/evolution-addressbook-export.c:122
-msgid "In normal mode, there should not need size option."
-msgstr ""
-
-#: addressbook/tools/evolution-addressbook-export.c:153
-#, fuzzy
-msgid "Impossible internal error."
-msgstr "Нутраная памылка"
-
 #: calendar/cal-util/cal-component.c:1218
 msgid "Untitled appointment"
 msgstr "Сустрэча бяз назвы"
@@ -3622,30 +3571,28 @@ msgid "31st"
 msgstr "31-га"
 
 #: calendar/cal-util/cal-util.c:550 calendar/cal-util/cal-util.c:572
-#: calendar/gui/dialogs/task-details-page.glade.h:5
-#: calendar/gui/e-calendar-table.c:403 calendar/gui/e-tasks.c:271
-#: mail/message-list.c:912
+#: calendar/gui/dialogs/task-details-page.glade.h:6
+#: calendar/gui/e-calendar-table.c:401 mail/message-list.c:753
 msgid "High"
 msgstr "Высокі"
 
 #: calendar/cal-util/cal-util.c:552 calendar/cal-util/cal-util.c:574
-#: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-calendar-table.c:404 calendar/gui/e-cal-model.c:826
-#: calendar/gui/e-tasks.c:273 mail/message-list.c:911
+#: calendar/gui/calendar-model.c:1709
+#: calendar/gui/dialogs/task-details-page.glade.h:9
+#: calendar/gui/e-calendar-table.c:402 mail/message-list.c:752
 msgid "Normal"
 msgstr "Нармальны"
 
 #: calendar/cal-util/cal-util.c:554 calendar/cal-util/cal-util.c:576
-#: calendar/gui/dialogs/task-details-page.glade.h:7
-#: calendar/gui/e-calendar-table.c:405 calendar/gui/e-tasks.c:275
-#: mail/message-list.c:910
+#: calendar/gui/dialogs/task-details-page.glade.h:8
+#: calendar/gui/e-calendar-table.c:403 mail/message-list.c:751
 msgid "Low"
 msgstr "Нізкі"
 
 #. An empty string is the same as 'None'.
 #: calendar/cal-util/cal-util.c:570
-#: calendar/gui/dialogs/task-details-page.glade.h:11
-#: calendar/gui/e-calendar-table.c:406
+#: calendar/gui/dialogs/task-details-page.glade.h:13
+#: calendar/gui/e-calendar-table.c:404
 msgid "Undefined"
 msgstr "Нявызначаны"
 
@@ -3653,13 +3600,13 @@ msgstr "Нявызначаны"
 msgid "Split Multi-Day Events:"
 msgstr "Падзяліць шматдзённыя падзеі:"
 
-#: calendar/conduits/calendar/calendar-conduit.c:1297
-#: calendar/conduits/todo/todo-conduit.c:838
+#: calendar/conduits/calendar/calendar-conduit.c:1289
+#: calendar/conduits/todo/todo-conduit.c:830
 msgid "Error while communicating with calendar server"
 msgstr "Памылка пад час далучэньня да паслужніка каляндара"
 
-#: calendar/conduits/calendar/calendar-conduit.c:1456
-#: calendar/conduits/calendar/calendar-conduit.c:1459
+#: calendar/conduits/calendar/calendar-conduit.c:1440
+#: calendar/conduits/calendar/calendar-conduit.c:1443
 msgid "Could not read pilot's Calendar application block"
 msgstr "Немагчыма прачытаць блёк дастасаваньня каляндару \"Пілёта\""
 
@@ -3667,32 +3614,74 @@ msgstr "Немагчыма прачытаць блёк дастасаваньн�
 msgid "Default Priority:"
 msgstr "Дапомны прыярытэт:"
 
-#: calendar/conduits/todo/todo-conduit.c:970
-#: calendar/conduits/todo/todo-conduit.c:973
+#: calendar/conduits/todo/todo-conduit.c:954
+#: calendar/conduits/todo/todo-conduit.c:957
 msgid "Could not read pilot's ToDo application block"
 msgstr "Немагчыма прачытаць блёк дастасаваньня заданьняў \"Пілёта\""
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:213
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
+msgid "Calendar and Tasks"
+msgstr "Каляндар і заданьні"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
+msgid "Configure your timezone, Calendar and Task List here "
+msgstr "Наладка вашае часавае зоны, каляндара і сьпісу задачаў"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
+msgid "Evolution Calendar and Tasks"
+msgstr "Каляндар і заданьні \"Эвалюцыі\""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
+msgid "Evolution Calendar and Tasks component"
+msgstr "Кампанэнт каляндара і заданьняў \"Эвалюцыі\"."
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
+msgid "Evolution Calendar configuration control"
+msgstr "Сродак кіраваньня каляндаром \"Эвалюцыі\""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
+msgid "Evolution Calendar scheduling message viewer"
+msgstr "Праглядальнік паведамленьня плянаваньня каляндара \"Эвалюцыі\""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
+msgid "Evolution Calendar viewer"
+msgstr "Праглядальнік каляндара \"Эвалюцыі\""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
+msgid "Evolution Calendar/Task editor"
+msgstr "Рэдактар каляндара/заданьня \"Эвалюцыі\""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
+msgid "Evolution Tasks viewer"
+msgstr "Праглядальнік заданьняў \"Эвалюцыі\""
+
+#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
+msgid "Evolution Calendar alarm notification service"
+msgstr "Паслуга нагадваньня сыгнала каляндара \"Эвалюцыі\""
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:212
 msgid "Starting:"
 msgstr "Запускаецца:"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:215
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:214
 msgid "Ending:"
 msgstr "Завяршаецца:"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:254
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:227
+msgid "invalid time"
+msgstr "нерэчаісны час"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:272
 msgid "Evolution Alarm"
 msgstr "Нагадваньне \"Эвалюцыі\""
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:347
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:365
 #, c-format
 msgid "Alarm on %s"
 msgstr "Нагадваньне на %s"
 
 #: calendar/gui/alarm-notify/alarm-notify.glade.h:1
-#: ui/evolution-comp-editor.xml.h:1 ui/evolution-contact-editor.xml.h:1
-#: ui/evolution-contact-list-editor.xml.h:1
-#: ui/evolution-signature-editor.xml.h:1
+#: ui/evolution-comp-editor.xml.h:1
 msgid "C_lose"
 msgstr "_Закрыць"
 
@@ -3708,25 +3697,16 @@ msgstr "Нагадаць пасьля (хвіліны)"
 msgid "_Edit appointment"
 msgstr "_Рэдагаваць сустрэчу"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:874
+#: calendar/gui/alarm-notify/alarm-queue.c:770
 msgid "No description available."
 msgstr "Апісаньне недаступна."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:892
-#, c-format
-msgid ""
-"Alarm on %s\n"
-"%s\n"
-"Starting at %s\n"
-"Ending at %s"
-msgstr ""
-
-#: calendar/gui/alarm-notify/alarm-queue.c:979
-#: calendar/gui/alarm-notify/alarm-queue.c:1003
+#: calendar/gui/alarm-notify/alarm-queue.c:843
+#: calendar/gui/alarm-notify/alarm-queue.c:867 widgets/misc/e-messagebox.c:161
 msgid "Warning"
 msgstr "Папярэджаьне"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:983
+#: calendar/gui/alarm-notify/alarm-queue.c:847
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -3738,7 +3718,7 @@ msgstr ""
 "\"Эвалюцыя\" будзе адлюстроўваць замест гэтага звычайны дыялёг\n"
 "нагадваньня."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1009
+#: calendar/gui/alarm-notify/alarm-queue.c:873
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -3754,86 +3734,71 @@ msgstr ""
 "\n"
 "Вы сапраўды жадаеце выканаць гэтую праграму?"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1023
+#: calendar/gui/alarm-notify/alarm-queue.c:887
 msgid "Do not ask me about this program again."
 msgstr "Болей не распавядаць мне пра гэтую праграму."
 
-#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
-msgid "Evolution Calendar alarm notification service"
-msgstr "Паслуга нагадваньня сыгнала каляндара \"Эвалюцыі\""
-
-#: calendar/gui/alarm-notify/notify-main.c:173
-msgid "Could not initialize Bonobo"
-msgstr "Неатрымалася ініцыялізаваць Bonobo"
-
-#: calendar/gui/alarm-notify/notify-main.c:176
+#: calendar/gui/alarm-notify/notify-main.c:174
 msgid "Could not initialize gnome-vfs"
 msgstr "Немагчыма ініцыялізаваць gnome-vfs"
 
-#: calendar/gui/alarm-notify/notify-main.c:185
+#: calendar/gui/alarm-notify/notify-main.c:183
 msgid "Could not create the alarm notify service factory"
 msgstr "Немагчыма стварыць вытворчасьць паслугі нагадваньня"
 
-#: calendar/gui/calendar-commands.c:376
-#, fuzzy
-msgid ""
-"This operation will permanently erase all events older than the selected "
-"amount of time. If you continue, you will not be able to recover these "
-"events."
-msgstr ""
-"Гэтая апэрацыя выдаліць назаўсёды усе заданьні, якія пазначаны як выкананыя. "
-"Калі працягніце, тады ня здолееце вярнуць гэтую апэрацыю.\n"
-"\n"
-"Выдаліць гэтыя заданьні?"
+#: calendar/gui/cal-search-bar.c:50
+msgid "Summary contains"
+msgstr "Агульныя зьвесткі утрымліваюць"
 
-#: calendar/gui/calendar-commands.c:382
-#, fuzzy
-msgid "Purge events older than"
-msgstr "вяртае менш за"
+#: calendar/gui/cal-search-bar.c:51
+msgid "Description contains"
+msgstr "Апісаньне ўтрымлівае"
 
-#: calendar/gui/calendar-commands.c:387
-#: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter.glade.h:17
-msgid "days"
-msgstr "дні"
+#: calendar/gui/cal-search-bar.c:52
+msgid "Comment contains"
+msgstr "Камэнтар утрымлівае"
+
+#: calendar/gui/cal-search-bar.c:358 mail/mail-ops.c:1106
+msgid "Unmatched"
+msgstr "Іншая пошта"
 
-#: calendar/gui/calendar-commands.c:485
+#: calendar/gui/calendar-commands.c:419
 msgid "%A %d %B %Y"
 msgstr "%A %d %B %Y"
 
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
-#: calendar/gui/calendar-commands.c:488 calendar/gui/e-day-view.c:1364
-#: calendar/gui/e-day-view-top-item.c:266
-#: calendar/gui/e-week-view-main-item.c:325
+#: calendar/gui/calendar-commands.c:422 calendar/gui/e-day-view-top-item.c:265
+#: calendar/gui/e-day-view.c:1438 calendar/gui/e-week-view-main-item.c:325
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
-#: calendar/gui/calendar-commands.c:490 calendar/gui/calendar-commands.c:495
-#: calendar/gui/calendar-commands.c:497
+#: calendar/gui/calendar-commands.c:424 calendar/gui/calendar-commands.c:429
+#: calendar/gui/calendar-commands.c:431
 msgid "%a %d %b %Y"
 msgstr "%a %d %b %Y"
 
-#: calendar/gui/calendar-commands.c:514 calendar/gui/calendar-commands.c:520
-#: calendar/gui/calendar-commands.c:526 calendar/gui/calendar-commands.c:528
+#: calendar/gui/calendar-commands.c:442 calendar/gui/calendar-commands.c:449
+#: calendar/gui/calendar-commands.c:455 calendar/gui/calendar-commands.c:457
 msgid "%d %B %Y"
 msgstr "%d %B %Y"
 
 #. strftime format %d = day of month, %B = full
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: calendar/gui/calendar-commands.c:518
-#: calendar/gui/e-week-view-main-item.c:333 calendar/gui/print.c:1508
+#: calendar/gui/calendar-commands.c:447
+#: calendar/gui/e-week-view-main-item.c:333 calendar/gui/print.c:1509
 msgid "%d %B"
 msgstr "%d %B"
 
-#: calendar/gui/calendar-commands.c:918
+#: calendar/gui/calendar-commands.c:849
 msgid ""
 "Could not create the calendar view.  Please check your ORBit and OAF setup."
 msgstr ""
 "Неатрымалася стварыць акно каляндара. Калі ласка, праверце вашу усталёўку "
 "ORBit і OAF."
 
-#: calendar/gui/calendar-component.c:70 calendar/gui/gnome-cal.c:1569
+#: calendar/gui/calendar-component.c:70 calendar/gui/gnome-cal.c:1353
 #: importers/netscape-importer.c:1873 mail/importers/netscape-importer.c:1843
 #: my-evolution/my-evolution.glade.h:2 shell/e-local-storage.c:177
 #: shell/e-shortcuts.c:1085
@@ -3852,11 +3817,11 @@ msgstr "Публічны каляндар"
 msgid "Public folder containing appointments and events"
 msgstr "Публічная тэчка утрымлівае сустрэчы і падзеі"
 
-#: calendar/gui/calendar-component.c:80 calendar/gui/e-tasks.c:1080
-#: calendar/gui/print.c:1787 calendar/gui/tasks-control.c:487
+#: calendar/gui/calendar-component.c:80 calendar/gui/e-tasks.c:738
+#: calendar/gui/print.c:1789 calendar/gui/tasks-control.c:504
 #: calendar/importers/icalendar-importer.c:644
 #: importers/netscape-importer.c:1875 mail/importers/netscape-importer.c:1845
-#: my-evolution/e-summary-tasks.c:348 my-evolution/e-summary-tasks.c:357
+#: my-evolution/e-summary-tasks.c:329 my-evolution/e-summary-tasks.c:338
 #: shell/e-local-storage.c:183 shell/e-shortcuts.c:1086
 msgid "Tasks"
 msgstr "Заданьні"
@@ -3921,6 +3886,107 @@ msgstr "Сустрэча на увесь _дзень"
 msgid "Create a new all-day appointment"
 msgstr "Стварыць новую сустрэчу на увесь дзень"
 
+#: calendar/gui/calendar-model.c:405 calendar/gui/calendar-model.c:964
+#: calendar/gui/e-calendar-table.c:380
+msgid "Private"
+msgstr "Прыватнае"
+
+#: calendar/gui/calendar-model.c:408 calendar/gui/calendar-model.c:966
+#: calendar/gui/e-calendar-table.c:381
+msgid "Confidential"
+msgstr "Сакрэтнае"
+
+#: calendar/gui/calendar-model.c:411 calendar/gui/e-calendar-table.c:379
+msgid "Public"
+msgstr "Публічнае"
+
+#: calendar/gui/calendar-model.c:523
+msgid "N"
+msgstr "N"
+
+#: calendar/gui/calendar-model.c:523
+msgid "S"
+msgstr "S"
+
+#: calendar/gui/calendar-model.c:525
+msgid "E"
+msgstr "E"
+
+#: calendar/gui/calendar-model.c:525
+msgid "W"
+msgstr "W"
+
+#: calendar/gui/calendar-model.c:590 calendar/gui/calendar-model.c:1134
+#: calendar/gui/e-calendar-table.c:453
+msgid "Free"
+msgstr "Вольны"
+
+#: calendar/gui/calendar-model.c:592 calendar/gui/e-calendar-table.c:454
+#: calendar/gui/e-meeting-time-sel.c:406
+#: shell/evolution-shell-component.c:1204
+msgid "Busy"
+msgstr "Заняты"
+
+#: calendar/gui/calendar-model.c:750 calendar/gui/calendar-model.c:1178
+#: calendar/gui/dialogs/task-details-page.glade.h:10
+#: calendar/gui/e-calendar-table.c:474 calendar/gui/print.c:2298
+msgid "Not Started"
+msgstr "Не распачаты"
+
+#: calendar/gui/calendar-model.c:753 calendar/gui/calendar-model.c:1180
+#: calendar/gui/dialogs/task-details-page.glade.h:7
+#: calendar/gui/e-calendar-table.c:475 calendar/gui/print.c:2301
+msgid "In Progress"
+msgstr "Выконваецца"
+
+#: calendar/gui/calendar-model.c:756 calendar/gui/calendar-model.c:1182
+#: calendar/gui/dialogs/task-details-page.glade.h:4
+#: calendar/gui/e-calendar-table.c:476 calendar/gui/e-meeting-model.c:294
+#: calendar/gui/e-meeting-model.c:317 calendar/gui/print.c:2304
+msgid "Completed"
+msgstr "Выканана"
+
+#: calendar/gui/calendar-model.c:1036
+msgid ""
+"The geographical position must be entered in the format: \n"
+"\n"
+"45.436845,125.862501"
+msgstr ""
+"Геаграфічнае разьмяшчэньне мусіць быць пазначана ў фармаце:\n"
+"\n"
+"45.436845,125.862501"
+
+#. An empty string is the same as 'None'.
+#: calendar/gui/calendar-model.c:1176 calendar/gui/dialogs/meeting-page.c:330
+#: calendar/gui/dialogs/meeting-page.glade.h:2 composer/e-msg-composer.c:2056
+#: mail/folder-browser.c:1752 mail/mail-account-gui.c:1260
+#: mail/mail-account-gui.c:1692 mail/mail-accounts.c:442
+#: mail/mail-config.glade.h:76
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:194
+#: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:442
+#: widgets/misc/e-dateedit.c:1458 widgets/misc/e-dateedit.c:1573
+msgid "None"
+msgstr "Няма"
+
+#: calendar/gui/calendar-model.c:1711
+msgid "Recurring"
+msgstr "Паўтор"
+
+#: calendar/gui/calendar-model.c:1713
+msgid "Assigned"
+msgstr "Прызначана"
+
+#: calendar/gui/calendar-model.c:1719 calendar/gui/e-meeting-model.c:266
+#: calendar/gui/e-meeting-model.c:276 calendar/gui/e-meeting-model.c:534
+#: calendar/gui/e-meeting-model.c:784
+msgid "Yes"
+msgstr "Так"
+
+#: calendar/gui/calendar-model.c:1719 calendar/gui/e-meeting-model.c:278
+#: calendar/gui/e-meeting-model.c:785
+msgid "No"
+msgstr "Не"
+
 #: calendar/gui/calendar-view-factory.c:118
 msgid "Day View"
 msgstr "Прагляд дню"
@@ -3937,69 +4003,48 @@ msgstr "Прагляд тыдню"
 msgid "Month View"
 msgstr "Прагляд месяцу"
 
-#: calendar/gui/calendar-view-factory.c:130
-#, fuzzy
-msgid "List View"
-msgstr "Прагляд карыстальніка"
-
-#: calendar/gui/cal-search-bar.c:50
-msgid "Summary contains"
-msgstr "Агульныя зьвесткі утрымліваюць"
-
-#: calendar/gui/cal-search-bar.c:51
-msgid "Description contains"
-msgstr "Апісаньне ўтрымлівае"
-
-#: calendar/gui/cal-search-bar.c:52
-msgid "Comment contains"
-msgstr "Камэнтар утрымлівае"
-
-#: calendar/gui/cal-search-bar.c:358 mail/mail-ops.c:1120
-msgid "Unmatched"
-msgstr "Іншая пошта"
-
-#: calendar/gui/comp-editor-factory.c:462
+#: calendar/gui/comp-editor-factory.c:456
 msgid "Error while opening the calendar"
 msgstr "Памылка пад час адкрыцьця каляндара"
 
-#: calendar/gui/comp-editor-factory.c:473
+#: calendar/gui/comp-editor-factory.c:467
 msgid "Method not supported when opening the calendar"
 msgstr "Мэтад не падтрымліваецца  калі адкрываецца каляндар"
 
-#: calendar/gui/comp-editor-factory.c:479
+#: calendar/gui/comp-editor-factory.c:473
 msgid "Permission denied to open the calendar"
 msgstr "Адсутнічаюць правы на адкрыцьцё каляндара"
 
-#: calendar/gui/control-factory.c:125
+#: calendar/gui/control-factory.c:119
 #, c-format
 msgid "Could not open the folder in '%s'"
 msgstr "Немагчыма адчыніць тэчку у '%s'"
 
-#: calendar/gui/control-factory.c:171
+#: calendar/gui/control-factory.c:165
 msgid "The URI that the calendar will display"
 msgstr "URI, які будзе адлюстроўваць каляндар"
 
-#: calendar/gui/control-factory.c:178
+#: calendar/gui/control-factory.c:172
 msgid "The type of view to show"
 msgstr "Тып прагляду"
 
-#: calendar/gui/dialogs/alarm-options.c:466
+#: calendar/gui/dialogs/alarm-options.c:420
 msgid "Audio Alarm Options"
 msgstr "Парамэтры нагадваньня гукам"
 
-#: calendar/gui/dialogs/alarm-options.c:475
+#: calendar/gui/dialogs/alarm-options.c:429
 msgid "Message Alarm Options"
 msgstr "Парамэтры паведамленьняў нагадваньня"
 
-#: calendar/gui/dialogs/alarm-options.c:484
+#: calendar/gui/dialogs/alarm-options.c:438
 msgid "Email Alarm Options"
 msgstr "Парамэтры нагадваньня праз пошту"
 
-#: calendar/gui/dialogs/alarm-options.c:493
+#: calendar/gui/dialogs/alarm-options.c:447
 msgid "Program Alarm Options"
 msgstr "Парамэтры праграмы нагадваньня"
 
-#: calendar/gui/dialogs/alarm-options.c:509
+#: calendar/gui/dialogs/alarm-options.c:456
 msgid "Unknown Alarm Options"
 msgstr "Парамэтры невядомага нагадваньня"
 
@@ -4035,6 +4080,10 @@ msgstr "Даслаць на:"
 msgid "With these arguments:"
 msgstr "З гэткімі аргумэнтамі:"
 
+#: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter.glade.h:17
+msgid "days"
+msgstr "дні"
+
 #: calendar/gui/dialogs/alarm-options.glade.h:11
 msgid "dialog1"
 msgstr "дыялёг1"
@@ -4047,8 +4096,7 @@ msgstr "дадатковы час кожныя"
 msgid "hours"
 msgstr "гадзіны"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:14
-#: executive-summary/test-service/rdf-summary.c:806 filter/filter.glade.h:19
+#: calendar/gui/dialogs/alarm-options.glade.h:14 filter/filter.glade.h:19
 msgid "minutes"
 msgstr "хвіліны"
 
@@ -4062,11 +4110,11 @@ msgstr "Асноўнае"
 msgid "Date/Time:"
 msgstr "Дата/Час:"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:3 calendar/gui/e-alarm-list.c:465
+#: calendar/gui/dialogs/alarm-page.glade.h:3 calendar/gui/e-alarm-list.c:461
 msgid "Display a message"
 msgstr "Адлюстраваць паведамленьне"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:4 calendar/gui/e-alarm-list.c:461
+#: calendar/gui/dialogs/alarm-page.glade.h:4 calendar/gui/e-alarm-list.c:457
 msgid "Play a sound"
 msgstr "Граць гук"
 
@@ -4074,7 +4122,7 @@ msgstr "Граць гук"
 msgid "Reminders"
 msgstr "Нагадваньні"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:6 calendar/gui/e-alarm-list.c:473
+#: calendar/gui/dialogs/alarm-page.glade.h:6 calendar/gui/e-alarm-list.c:469
 msgid "Run a program"
 msgstr "Запусьціць праграму"
 
@@ -4084,8 +4132,7 @@ msgstr "Даслаць пошту"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:8
 #: calendar/gui/dialogs/recurrence-page.glade.h:8
-#: calendar/gui/e-itip-control.c:1022 calendar/gui/e-itip-control.glade.h:11
-#: calendar/gui/e-tasks.c:208
+#: calendar/gui/e-itip-control.c:1052 calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "Агульныя зьвесткі:"
 
@@ -4168,7 +4215,7 @@ msgstr "Дні"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
 #: calendar/gui/dialogs/recurrence-page.c:1040
-#: calendar/gui/e-itip-control.c:647
+#: calendar/gui/e-itip-control.c:677
 msgid "Friday"
 msgstr "Пятніца"
 
@@ -4182,7 +4229,7 @@ msgstr "Хвіліны"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
 #: calendar/gui/dialogs/recurrence-page.c:1036
-#: calendar/gui/e-itip-control.c:643
+#: calendar/gui/e-itip-control.c:673
 msgid "Monday"
 msgstr "Панядзелак"
 
@@ -4192,7 +4239,7 @@ msgstr "Няд"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
 #: calendar/gui/dialogs/recurrence-page.c:1041
-#: calendar/gui/e-itip-control.c:648
+#: calendar/gui/e-itip-control.c:678
 msgid "Saturday"
 msgstr "Субота"
 
@@ -4206,7 +4253,7 @@ msgstr "Паказаць нумары тыдняў у навігатары па
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
 #: calendar/gui/dialogs/recurrence-page.c:1042
-#: calendar/gui/e-itip-control.c:642
+#: calendar/gui/e-itip-control.c:672
 msgid "Sunday"
 msgstr "Нядзеля"
 
@@ -4224,7 +4271,7 @@ msgstr "Зьпіс заданьняў"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
 #: calendar/gui/dialogs/recurrence-page.c:1039
-#: calendar/gui/e-itip-control.c:646
+#: calendar/gui/e-itip-control.c:676
 msgid "Thursday"
 msgstr "Чацьвер"
 
@@ -4242,7 +4289,7 @@ msgstr "Фармат часу:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
 #: calendar/gui/dialogs/recurrence-page.c:1037
-#: calendar/gui/e-itip-control.c:644
+#: calendar/gui/e-itip-control.c:674
 msgid "Tuesday"
 msgstr "Аўторак"
 
@@ -4252,12 +4299,12 @@ msgstr "Тыдзень пачынаецца з:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
 #: calendar/gui/dialogs/recurrence-page.c:1038
-#: calendar/gui/e-itip-control.c:645
+#: calendar/gui/e-itip-control.c:675
 msgid "Wednesday"
 msgstr "Серада"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-#: ui/evolution-calendar.xml.h:31
+#: ui/evolution-calendar.xml.h:27
 msgid "Work Week"
 msgstr "Працоўны тыдзень"
 
@@ -4370,50 +4417,75 @@ msgid "Are you sure you want to cancel and delete this journal entry?"
 msgstr ""
 "Вы упэўненыя ў тым, што жадаеце адмяніць і выдаліць гэты запіс часопіса?"
 
-#: calendar/gui/dialogs/changed-comp.c:59
+#: calendar/gui/dialogs/changed-comp.c:58
 msgid "This event has been deleted."
 msgstr "Гэтая падзея была выдалена."
 
-#: calendar/gui/dialogs/changed-comp.c:63
+#: calendar/gui/dialogs/changed-comp.c:62
 msgid "This task has been deleted."
 msgstr "Гэтае заданьне было выдалена."
 
-#: calendar/gui/dialogs/changed-comp.c:67
+#: calendar/gui/dialogs/changed-comp.c:66
 msgid "This journal entry has been deleted."
 msgstr "Гэты запіс часопіса быў выдалены."
 
-#: calendar/gui/dialogs/changed-comp.c:76
+#: calendar/gui/dialogs/changed-comp.c:75
 #, c-format
 msgid "%s  You have made changes. Forget those changes and close the editor?"
 msgstr "%s Вы зрабілі зьмены. Забыца на іх і закрыць рэдактар?"
 
-#: calendar/gui/dialogs/changed-comp.c:78
+#: calendar/gui/dialogs/changed-comp.c:77
 #, c-format
 msgid "%s  You have made no changes, close the editor?"
 msgstr "%s Вы анічога не зьмянілі. Зачыніць рэдактар?"
 
-#: calendar/gui/dialogs/changed-comp.c:83
+#: calendar/gui/dialogs/changed-comp.c:82
 msgid "This event has been changed."
 msgstr "Гэтая падзея была зьменена."
 
-#: calendar/gui/dialogs/changed-comp.c:87
+#: calendar/gui/dialogs/changed-comp.c:86
 msgid "This task has been changed."
 msgstr "Гэтае заданьне было зьменана."
 
-#: calendar/gui/dialogs/changed-comp.c:91
+#: calendar/gui/dialogs/changed-comp.c:90
 msgid "This journal entry has been changed."
 msgstr "Гэты запіс часопіса быў зьменены."
 
-#: calendar/gui/dialogs/changed-comp.c:100
+#: calendar/gui/dialogs/changed-comp.c:99
 #, c-format
 msgid "%s  You have made changes. Forget those changes and update the editor?"
 msgstr "%s  Вы ўнесьлі зьмены. Забыцца на іх і абнавіць рэдактар?"
 
-#: calendar/gui/dialogs/changed-comp.c:102
+#: calendar/gui/dialogs/changed-comp.c:101
 #, c-format
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  Вы ўнесьлі зьмены, абнавіць рэдактар?"
 
+#: calendar/gui/dialogs/comp-editor-page.c:409
+#, c-format
+msgid "Validation error: %s"
+msgstr "Памылка зацьверджаньня: %s"
+
+#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2216
+msgid " to "
+msgstr " да "
+
+#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2220
+msgid " (Completed "
+msgstr " (Выканана "
+
+#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2222
+msgid "Completed "
+msgstr "Выканана "
+
+#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2227
+msgid " (Due "
+msgstr " (Патрэба "
+
+#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2229
+msgid "Due "
+msgstr "Умоўленае"
+
 #: calendar/gui/dialogs/comp-editor.c:334
 msgid "Could not update invalid object"
 msgstr "Немагчыма абнавіць нерэчаісны аб'ект"
@@ -4459,47 +4531,21 @@ msgid "No summary"
 msgstr "Няма агульных зьвестак"
 
 #: calendar/gui/dialogs/comp-editor.c:1281
-#: calendar/gui/e-calendar-table.c:1138 calendar/gui/e-cal-view.c:878
-#: composer/e-msg-composer.c:1191
+#: calendar/gui/e-calendar-table.c:1068 calendar/gui/e-day-view.c:3993
+#: calendar/gui/e-week-view.c:3840 composer/e-msg-composer.c:1164
 msgid "Save as..."
 msgstr "Захаваць як..."
 
-#: calendar/gui/dialogs/comp-editor.c:1384
-#: calendar/gui/dialogs/comp-editor.c:1408
-#: calendar/gui/dialogs/comp-editor.c:1434
+#: calendar/gui/dialogs/comp-editor.c:1382
+#: calendar/gui/dialogs/comp-editor.c:1406
+#: calendar/gui/dialogs/comp-editor.c:1432
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:1464
-#: calendar/gui/dialogs/comp-editor.c:1473
+#: calendar/gui/dialogs/comp-editor.c:1459
 msgid "Unable to obtain current version!"
 msgstr "Немагчыма атрымаць бягучую вэрсыю!"
 
-#: calendar/gui/dialogs/comp-editor-page.c:409
-#, c-format
-msgid "Validation error: %s"
-msgstr "Памылка зацьверджаньня: %s"
-
-#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2223
-msgid " to "
-msgstr " да "
-
-#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2227
-msgid " (Completed "
-msgstr " (Выканана "
-
-#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2229
-msgid "Completed "
-msgstr "Выканана "
-
-#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2234
-msgid " (Due "
-msgstr " (Патрэба "
-
-#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2236
-msgid "Due "
-msgstr "Умоўленае"
-
 #: calendar/gui/dialogs/delete-comp.c:96
 #, c-format
 msgid "Are you sure you want to delete the appointment `%s'?"
@@ -4602,31 +4648,31 @@ msgstr "Дэлегаваць да:"
 msgid "Enter Delegate"
 msgstr "Пазначце дэлегата"
 
-#: calendar/gui/dialogs/event-editor.c:200 calendar/gui/print.c:2260
+#: calendar/gui/dialogs/event-editor.c:199 calendar/gui/print.c:2253
 msgid "Appointment"
 msgstr "Сустрэча"
 
-#: calendar/gui/dialogs/event-editor.c:207
+#: calendar/gui/dialogs/event-editor.c:206
 msgid "Reminder"
 msgstr "Нагадваньне"
 
-#: calendar/gui/dialogs/event-editor.c:214
+#: calendar/gui/dialogs/event-editor.c:213
 msgid "Recurrence"
 msgstr "Вяртаньне"
 
-#: calendar/gui/dialogs/event-editor.c:221
-#: calendar/gui/dialogs/event-editor.c:294
-#: calendar/gui/dialogs/event-editor.c:438
+#: calendar/gui/dialogs/event-editor.c:220
+#: calendar/gui/dialogs/event-editor.c:292
+#: calendar/gui/dialogs/event-editor.c:436
 msgid "Scheduling"
 msgstr "Плянаваньне"
 
-#: calendar/gui/dialogs/event-editor.c:228
-#: calendar/gui/dialogs/event-editor.c:297
-#: calendar/gui/dialogs/event-editor.c:441 ui/evolution-event-editor.xml.h:6
+#: calendar/gui/dialogs/event-editor.c:227
+#: calendar/gui/dialogs/event-editor.c:295
+#: calendar/gui/dialogs/event-editor.c:439 ui/evolution-event-editor.xml.h:6
 msgid "Meeting"
 msgstr "Нарада"
 
-#: calendar/gui/dialogs/event-page.c:603 calendar/gui/dialogs/task-page.c:509
+#: calendar/gui/dialogs/event-page.c:603 calendar/gui/dialogs/task-page.c:507
 msgid "Start date is wrong"
 msgstr "Дата пачатку памылковая"
 
@@ -4662,9 +4708,9 @@ msgid "Classification"
 msgstr "Клясыфікацыя"
 
 #: calendar/gui/dialogs/event-page.glade.h:6
-#, fuzzy
-msgid "Co_nfidential"
-msgstr "Сакрэтнае"
+#: calendar/gui/dialogs/task-page.glade.h:4
+msgid "Con_fidential"
+msgstr "_Сакрэтна"
 
 #: calendar/gui/dialogs/event-page.glade.h:7
 #: calendar/gui/dialogs/task-page.glade.h:5
@@ -4690,6 +4736,7 @@ msgid "Pu_blic"
 msgstr "Пу_блічнае"
 
 #: calendar/gui/dialogs/event-page.glade.h:12
+#: calendar/gui/e-calendar-table.etspec.h:13
 msgid "Show Time As"
 msgstr "Паказаць дату як"
 
@@ -4706,34 +4753,74 @@ msgstr "_Час заканчэньня:"
 msgid "_Start time:"
 msgstr "_Час пачатку:"
 
-#. an empty string is the same as 'None'
-#: calendar/gui/dialogs/meeting-page.c:311
-#: calendar/gui/dialogs/meeting-page.glade.h:2
-#: calendar/gui/e-cal-model-tasks.c:596 composer/e-msg-composer.c:2093
-#: mail/mail-account-gui.c:1260 mail/mail-account-gui.c:1692
-#: mail/mail-accounts.c:442 mail/mail-config.glade.h:76
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:194
-#: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:445
-#: widgets/misc/e-dateedit.c:1483 widgets/misc/e-dateedit.c:1598
-msgid "None"
-msgstr "Няма"
-
-#: calendar/gui/dialogs/meeting-page.c:416
+#: calendar/gui/dialogs/meeting-page.c:437
 msgid "The organizer selected no longer has an account."
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:422
+#: calendar/gui/dialogs/meeting-page.c:443
 msgid "An organizer is required."
 msgstr "Неабходны арганізатар."
 
-#: calendar/gui/dialogs/meeting-page.c:437
+#: calendar/gui/dialogs/meeting-page.c:458
 msgid "At least one attendee is required."
 msgstr "Патрабуе хаця б аднаго удзельніка."
 
-#: calendar/gui/dialogs/meeting-page.c:630
+#: calendar/gui/dialogs/meeting-page.c:629
+msgid "That person is already attending the meeting!"
+msgstr "Гэты чалавек ужо ўдзельнічае у нарадзе!"
+
+#: calendar/gui/dialogs/meeting-page.c:713
 msgid "_Delegate To..."
 msgstr "_Дэлегаваць у..."
 
+#: calendar/gui/dialogs/meeting-page.etspec.h:1
+#: calendar/gui/e-meeting-time-sel.etspec.h:1
+msgid "Attendee"
+msgstr "Удзельнік"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:2
+#: calendar/gui/e-meeting-time-sel.etspec.h:2
+msgid "Click here to add an attendee"
+msgstr "Клікніце тутака каб дадаць удзельніка"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:3
+#: calendar/gui/e-meeting-time-sel.etspec.h:3
+msgid "Common Name"
+msgstr "Агульная назва"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:4
+#: calendar/gui/e-meeting-time-sel.etspec.h:4
+msgid "Delegated From"
+msgstr "Дэлегаваць з"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:5
+#: calendar/gui/e-meeting-time-sel.etspec.h:5
+msgid "Delegated To"
+msgstr "Дэлегаваць у"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:6
+#: calendar/gui/e-meeting-time-sel.etspec.h:6
+msgid "Language"
+msgstr "Мова"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:7
+#: calendar/gui/e-meeting-time-sel.etspec.h:7
+msgid "Member"
+msgstr "Удзельнік"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:8
+#: calendar/gui/e-itip-control.c:1179
+#: calendar/gui/e-meeting-time-sel.etspec.h:8
+msgid "RSVP"
+msgstr "RSVP"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:10
+#: calendar/gui/e-calendar-table.etspec.h:15
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:58
+#: mail/message-list.etspec.h:12
+msgid "Status"
+msgstr "Стан"
+
 #: calendar/gui/dialogs/meeting-page.glade.h:3
 #: calendar/gui/e-itip-control.glade.h:9
 msgid "Organizer:"
@@ -4744,7 +4831,7 @@ msgid "_Change Organizer"
 msgstr "_Зьмяніць арганізатара"
 
 #: calendar/gui/dialogs/meeting-page.glade.h:5
-#: calendar/gui/e-meeting-time-sel.c:411
+#: calendar/gui/e-meeting-time-sel.c:424
 msgid "_Invite Others..."
 msgstr "_Запрасіць іншых..."
 
@@ -4897,7 +4984,7 @@ msgstr ""
 "\n"
 "Вы жадаеце захаваць зьмены?"
 
-#: calendar/gui/dialogs/save-comp.c:58 composer/e-msg-composer.c:1599
+#: calendar/gui/dialogs/save-comp.c:58 composer/e-msg-composer.c:1557
 msgid "_Discard Changes"
 msgstr "_Адкінуць зьмены"
 
@@ -4921,82 +5008,52 @@ msgstr "Зьвесткі па заданьні створаны. Даслаць?
 msgid "The task information has changed. Send an updated version?"
 msgstr "Зьвесткі па заданьні зьменены. Даслаць і абнавіць вэрсыю?"
 
-#: calendar/gui/dialogs/task-details-page.c:405
+#: calendar/gui/dialogs/task-details-page.c:401
 msgid "Completed date is wrong"
 msgstr "Дата заканчэньня выкананьня памылковая"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:2
-#, fuzzy, no-c-format
-msgid "% _Complete"
+#: calendar/gui/e-calendar-table.etspec.h:2
+#, no-c-format
+msgid "% Complete"
 msgstr "% Завершана"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:4
-#: calendar/gui/e-calendar-table.c:478 calendar/gui/e-cal-model-tasks.c:323
-#: calendar/gui/e-cal-model-tasks.c:602 calendar/gui/e-tasks.c:250
-#: calendar/gui/print.c:2311
-msgid "Completed"
-msgstr "Выканана"
-
-#: calendar/gui/dialogs/task-details-page.glade.h:6
-#: calendar/gui/e-calendar-table.c:477 calendar/gui/e-cal-model-tasks.c:321
-#: calendar/gui/e-cal-model-tasks.c:600 calendar/gui/e-cal-model-tasks.c:662
-#: calendar/gui/e-tasks.c:247 calendar/gui/print.c:2308
-msgid "In Progress"
-msgstr "Выконваецца"
-
-#: calendar/gui/dialogs/task-details-page.glade.h:9
-#: calendar/gui/e-calendar-table.c:476 calendar/gui/e-cal-model-tasks.c:319
-#: calendar/gui/e-cal-model-tasks.c:598 calendar/gui/e-tasks.c:257
-#: calendar/gui/print.c:2305
-msgid "Not Started"
-msgstr "Не распачаты"
+#: calendar/gui/dialogs/task-details-page.glade.h:5
+msgid "Date Completed:"
+msgstr "Дата заканчэньня:"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:10
+#: calendar/gui/dialogs/task-details-page.glade.h:11
 msgid "Progress"
 msgstr "Выкананьне"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:12
-#, fuzzy
-msgid "_Date Completed:"
-msgstr "Дата заканчэньня:"
+msgid "URL:"
+msgstr "URL:"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:13
+#: calendar/gui/dialogs/task-details-page.glade.h:14
 msgid "_Priority:"
 msgstr "_Прыярытэт:"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:14
+#: calendar/gui/dialogs/task-details-page.glade.h:15
 msgid "_Status:"
 msgstr "_Стан:"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:15
-#, fuzzy
-msgid "_Web Page:"
-msgstr "Адрэса Web-старонкі:"
-
-#: calendar/gui/dialogs/task-editor.c:193
+#: calendar/gui/dialogs/task-editor.c:190
 msgid "Basic"
 msgstr "Асноўнае"
 
-#: calendar/gui/dialogs/task-editor.c:207
-#: calendar/gui/dialogs/task-editor.c:270
-#: calendar/gui/dialogs/task-editor.c:407
+#: calendar/gui/dialogs/task-editor.c:204
+#: calendar/gui/dialogs/task-editor.c:252
+#: calendar/gui/dialogs/task-editor.c:387
 msgid "Assignment"
 msgstr "Прызначэньне"
 
-#: calendar/gui/dialogs/task-page.c:482
+#: calendar/gui/dialogs/task-page.c:480
 msgid "Due date is wrong"
 msgstr "Умоўленая дата памылковая"
 
-#: calendar/gui/dialogs/task-page.c:542
-msgid "Due date is before start date!"
-msgstr ""
-
-#: calendar/gui/dialogs/task-page.glade.h:4
-msgid "Con_fidential"
-msgstr "_Сакрэтна"
-
-#: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-itip-control.c:1077
-#: calendar/gui/e-itip-control.glade.h:6 calendar/gui/e-tasks.c:287
+#: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-itip-control.c:1107
+#: calendar/gui/e-itip-control.glade.h:6
 #: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:43
 msgid "Description:"
 msgstr "Апісаньне:"
@@ -5009,259 +5066,223 @@ msgstr "Дата пачатку:"
 msgid "_Due Date:"
 msgstr "_Умоўленая дата:"
 
-#: calendar/gui/e-alarm-list.c:397
+#: calendar/gui/e-alarm-list.c:393
 #, c-format
 msgid "%d days"
 msgstr "%d дні"
 
-#: calendar/gui/e-alarm-list.c:400
+#: calendar/gui/e-alarm-list.c:396
 msgid "1 day"
 msgstr "1 дзень"
 
-#: calendar/gui/e-alarm-list.c:405
+#: calendar/gui/e-alarm-list.c:401
 #, c-format
 msgid "%d weeks"
 msgstr "%d тыдні"
 
-#: calendar/gui/e-alarm-list.c:408
+#: calendar/gui/e-alarm-list.c:404
 msgid "1 week"
 msgstr "1 тыдзень"
 
-#: calendar/gui/e-alarm-list.c:413
+#: calendar/gui/e-alarm-list.c:409
 #, c-format
 msgid "%d hours"
 msgstr "%d гадзіны"
 
-#: calendar/gui/e-alarm-list.c:416
+#: calendar/gui/e-alarm-list.c:412
 msgid "1 hour"
 msgstr "1 гадзіна"
 
-#: calendar/gui/e-alarm-list.c:421
+#: calendar/gui/e-alarm-list.c:417
 #, c-format
 msgid "%d minutes"
 msgstr "%d хвіліны"
 
-#: calendar/gui/e-alarm-list.c:424
+#: calendar/gui/e-alarm-list.c:420
 msgid "1 minute"
 msgstr "1 хвіліна"
 
-#: calendar/gui/e-alarm-list.c:429
+#: calendar/gui/e-alarm-list.c:425
 #, c-format
 msgid "%d seconds"
 msgstr "%d сэкунды"
 
-#: calendar/gui/e-alarm-list.c:432
+#: calendar/gui/e-alarm-list.c:428
 msgid "1 second"
 msgstr "1 сэкунда"
 
-#: calendar/gui/e-alarm-list.c:469
+#: calendar/gui/e-alarm-list.c:465
 msgid "Send an email"
 msgstr "Даслаць пошту"
 
-#: calendar/gui/e-alarm-list.c:479
+#: calendar/gui/e-alarm-list.c:475
 msgid "Unknown action to be performed"
 msgstr "Невядомае дзеяньне для выкананьня"
 
-#: calendar/gui/e-alarm-list.c:491
+#: calendar/gui/e-alarm-list.c:487
 #, c-format
 msgid "%s %s before the start of the appointment"
 msgstr "%s %s да пачатку сустрэчы"
 
-#: calendar/gui/e-alarm-list.c:494
+#: calendar/gui/e-alarm-list.c:490
 #, c-format
 msgid "%s %s after the start of the appointment"
 msgstr "%s %s пасьля пачатку сустрэчы"
 
-#: calendar/gui/e-alarm-list.c:499
+#: calendar/gui/e-alarm-list.c:495
 #, c-format
 msgid "%s at the start of the appointment"
 msgstr "%s у пачатку сустрэчы"
 
-#: calendar/gui/e-alarm-list.c:508
+#: calendar/gui/e-alarm-list.c:504
 #, c-format
 msgid "%s %s before the end of the appointment"
 msgstr "%s %s перад заканчэньнем сустрэчы"
 
-#: calendar/gui/e-alarm-list.c:511
+#: calendar/gui/e-alarm-list.c:507
 #, c-format
 msgid "%s %s after the end of the appointment"
 msgstr "%s %s пасьля заканчэньня сустрэчы"
 
-#: calendar/gui/e-alarm-list.c:516
+#: calendar/gui/e-alarm-list.c:512
 #, c-format
 msgid "%s at the end of the appointment"
 msgstr "%s на прыканцы сустрэчы"
 
-#: calendar/gui/e-alarm-list.c:540
+#: calendar/gui/e-alarm-list.c:536
 #, c-format
 msgid "%s at %s"
 msgstr "%s на %s"
 
-#: calendar/gui/e-alarm-list.c:546
+#: calendar/gui/e-alarm-list.c:542
 #, c-format
 msgid "%s for an unknown trigger type"
 msgstr "%s для невядомага тыпу трэггера"
 
-#: calendar/gui/e-calendar-table.c:381 calendar/gui/e-cal-model.c:280
-#: calendar/gui/e-cal-model.c:287
-msgid "Public"
-msgstr "Публічнае"
-
-#: calendar/gui/e-calendar-table.c:382 calendar/gui/e-cal-model.c:289
-msgid "Private"
-msgstr "Прыватнае"
-
-#: calendar/gui/e-calendar-table.c:383 calendar/gui/e-cal-model.c:291
-msgid "Confidential"
-msgstr "Сакрэтнае"
-
-#: calendar/gui/e-calendar-table.c:425
+#: calendar/gui/e-calendar-table.c:423
 msgid "0%"
 msgstr "0%"
 
-#: calendar/gui/e-calendar-table.c:426
+#: calendar/gui/e-calendar-table.c:424
 msgid "10%"
 msgstr "10%"
 
-#: calendar/gui/e-calendar-table.c:427
+#: calendar/gui/e-calendar-table.c:425
 msgid "20%"
 msgstr "20%"
 
-#: calendar/gui/e-calendar-table.c:428
+#: calendar/gui/e-calendar-table.c:426
 msgid "30%"
 msgstr "30%"
 
-#: calendar/gui/e-calendar-table.c:429
+#: calendar/gui/e-calendar-table.c:427
 msgid "40%"
 msgstr "40%"
 
-#: calendar/gui/e-calendar-table.c:430
+#: calendar/gui/e-calendar-table.c:428
 msgid "50%"
 msgstr "50%"
 
-#: calendar/gui/e-calendar-table.c:431
+#: calendar/gui/e-calendar-table.c:429
 msgid "60%"
 msgstr "60%"
 
-#: calendar/gui/e-calendar-table.c:432
+#: calendar/gui/e-calendar-table.c:430
 msgid "70%"
 msgstr "70%"
 
-#: calendar/gui/e-calendar-table.c:433
+#: calendar/gui/e-calendar-table.c:431
 msgid "80%"
 msgstr "80%"
 
-#: calendar/gui/e-calendar-table.c:434
+#: calendar/gui/e-calendar-table.c:432
 msgid "90%"
 msgstr "90%"
 
-#: calendar/gui/e-calendar-table.c:435
+#: calendar/gui/e-calendar-table.c:433
 msgid "100%"
 msgstr "100%"
 
-#: calendar/gui/e-calendar-table.c:455 calendar/gui/e-cal-model-calendar.c:163
-msgid "Free"
-msgstr "Вольны"
-
-#: calendar/gui/e-calendar-table.c:456 calendar/gui/e-cal-model-calendar.c:166
-#: calendar/gui/e-meeting-time-sel.c:393
-#: shell/evolution-shell-component.c:1207
-msgid "Busy"
-msgstr "Заняты"
-
-#: calendar/gui/e-calendar-table.c:724 calendar/gui/e-cal-view.c:562
+#: calendar/gui/e-calendar-table.c:726 calendar/gui/e-day-view.c:2867
+#: calendar/gui/e-week-view.c:1933
 msgid "Deleting selected objects"
 msgstr "Выдаленьне вылучаных аб'ектаў"
 
-#: calendar/gui/e-calendar-table.c:988 calendar/gui/e-calendar-table.c:1029
-#: calendar/gui/e-cal-view.c:1126 calendar/gui/e-cal-view.c:1192
+#: calendar/gui/e-calendar-table.c:958 calendar/gui/e-day-view.c:3737
+#: calendar/gui/e-week-view.c:3613 mail/folder-browser.c:1763
 #: shell/e-shortcuts-view.c:422 ui/evolution-addressbook.xml.h:36
 msgid "_Open"
 msgstr "_Адкрыць"
 
-#: calendar/gui/e-calendar-table.c:989
-#, fuzzy
-msgid "Open _Web Page"
-msgstr "Адкрыць паведамленьне"
-
-#: calendar/gui/e-calendar-table.c:990 calendar/gui/e-calendar-table.c:1035
-#: calendar/gui/e-cal-view.c:1127 calendar/gui/e-cal-view.c:1198
-#: ui/evolution-mail-message.xml.h:120
-msgid "_Save As..."
+#: calendar/gui/e-calendar-table.c:959
+msgid "_Save as..."
 msgstr "Захаваць _як..."
 
-#: calendar/gui/e-calendar-table.c:991 calendar/gui/e-calendar-table.c:1033
-#: calendar/gui/e-cal-view.c:1101 calendar/gui/e-cal-view.c:1128
-#: calendar/gui/e-cal-view.c:1196 ui/evolution-addressbook.xml.h:38
-#: ui/evolution-calendar.xml.h:37 ui/evolution-comp-editor.xml.h:19
-#: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:116
-#: ui/evolution-tasks.xml.h:21 ui/my-evolution.xml.h:6
+#: calendar/gui/e-calendar-table.c:960 calendar/gui/e-day-view.c:3739
+#: calendar/gui/e-week-view.c:3588 calendar/gui/e-week-view.c:3615
+#: ui/evolution-addressbook.xml.h:38 ui/evolution-calendar.xml.h:33
+#: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:108
+#: ui/evolution-tasks.xml.h:20 ui/my-evolution.xml.h:6
 msgid "_Print..."
 msgstr "_Друкаваць..."
 
-#: calendar/gui/e-calendar-table.c:995 calendar/gui/e-calendar-table.c:1024
-#: calendar/gui/e-cal-view.c:1133 calendar/gui/e-cal-view.c:1174
-#: ui/evolution-addressbook.xml.h:1 ui/evolution-calendar.xml.h:1
-#: ui/evolution-tasks.xml.h:1
+#: calendar/gui/e-calendar-table.c:964 calendar/gui/e-day-view.c:3744
+#: calendar/gui/e-week-view.c:3620 ui/evolution-addressbook.xml.h:1
+#: ui/evolution-calendar.xml.h:1 ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "Вы_разаць"
 
-#: calendar/gui/e-calendar-table.c:996 calendar/gui/e-calendar-table.c:1022
-#: calendar/gui/e-cal-view.c:1134 calendar/gui/e-cal-view.c:1172
-#: ui/evolution-addressbook.xml.h:30 ui/evolution-calendar.xml.h:33
-#: ui/evolution-composer-entries.xml.h:7 ui/evolution-mail-message.xml.h:101
-#: ui/evolution-tasks.xml.h:17
+#: calendar/gui/e-calendar-table.c:965 calendar/gui/e-day-view.c:3745
+#: calendar/gui/e-week-view.c:3621 ui/evolution-addressbook.xml.h:30
+#: ui/evolution-calendar.xml.h:29 ui/evolution-composer-entries.xml.h:7
+#: ui/evolution-mail-list.xml.h:24 ui/evolution-tasks.xml.h:15
 msgid "_Copy"
 msgstr "_Капіяваць"
 
-#: calendar/gui/e-calendar-table.c:997 calendar/gui/e-calendar-table.c:1031
-#: calendar/gui/e-cal-view.c:1105 calendar/gui/e-cal-view.c:1135
-#: calendar/gui/e-cal-view.c:1194 ui/evolution-addressbook.xml.h:37
-#: ui/evolution-calendar.xml.h:36 ui/evolution-composer-entries.xml.h:9
-#: ui/evolution-mail-message.xml.h:114 ui/evolution-tasks.xml.h:20
+#: calendar/gui/e-calendar-table.c:966 calendar/gui/e-day-view.c:3710
+#: calendar/gui/e-day-view.c:3746 calendar/gui/e-week-view.c:3592
+#: calendar/gui/e-week-view.c:3622 ui/evolution-addressbook.xml.h:37
+#: ui/evolution-calendar.xml.h:32 ui/evolution-composer-entries.xml.h:9
+#: ui/evolution-mail-list.xml.h:29 ui/evolution-tasks.xml.h:19
 msgid "_Paste"
 msgstr "_Уставіць"
 
-#: calendar/gui/e-calendar-table.c:1001
+#: calendar/gui/e-calendar-table.c:970
 msgid "_Assign Task"
 msgstr "_Прызначыць заданьне"
 
-#: calendar/gui/e-calendar-table.c:1002
+#: calendar/gui/e-calendar-table.c:971
 msgid "_Forward as iCalendar"
 msgstr "_Перадаслаць як iCalendar"
 
-#: calendar/gui/e-calendar-table.c:1003
+#: calendar/gui/e-calendar-table.c:972
 msgid "_Mark as Complete"
 msgstr "Пазначыць як выкананае"
 
-#: calendar/gui/e-calendar-table.c:1004
+#: calendar/gui/e-calendar-table.c:973
 msgid "_Mark Selected Tasks as Complete"
 msgstr "Пазначыць вылучаныя заданьні як выкананыя"
 
-#: calendar/gui/e-calendar-table.c:1009 calendar/gui/e-calendar-table.c:1027
+#: calendar/gui/e-calendar-table.c:978
 msgid "_Delete Selected Tasks"
 msgstr "Выдаліць вылучаныя заданьні"
 
-#: calendar/gui/e-calendar-table.c:1341 calendar/gui/e-cal-view.c:253
+#: calendar/gui/e-calendar-table.c:1265 calendar/gui/e-day-view.c:7929
+#: calendar/gui/e-week-view.c:4335
 msgid "Updating objects"
 msgstr "Абнаўленьне аб'ектаў"
 
-#: calendar/gui/e-calendar-table.c:1424
+#: calendar/gui/e-calendar-table.c:1348
 #: calendar/gui/e-calendar-table.etspec.h:6
 msgid "Click to add a task"
 msgstr "Клікніце каб дадаць заданьне"
 
-#: calendar/gui/e-calendar-table.etspec.h:2
-#, no-c-format
-msgid "% Complete"
-msgstr "% Завершана"
-
 #: calendar/gui/e-calendar-table.etspec.h:3
 msgid "Alarms"
 msgstr "Сыгналы"
 
-#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:1173
-#: camel/camel-filter-driver.c:1268 mail/mail-send-recv.c:578
+#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:1156
+#: camel/camel-filter-driver.c:1251
 msgid "Complete"
 msgstr "Выкананьне"
 
@@ -5270,14 +5291,13 @@ msgid "Completion Date"
 msgstr "Дата выкананьня"
 
 #: calendar/gui/e-calendar-table.etspec.h:9
-#, fuzzy
-msgid "Description"
-msgstr "Апісаньне:"
-
-#: calendar/gui/e-calendar-table.etspec.h:10
 msgid "Due Date"
 msgstr "Умоўленая дата"
 
+#: calendar/gui/e-calendar-table.etspec.h:10
+msgid "End Date"
+msgstr "Дата завяршэньня"
+
 #: calendar/gui/e-calendar-table.etspec.h:11
 msgid "Geographical Position"
 msgstr "Геаграфічнае разьмяшчэньне"
@@ -5286,299 +5306,242 @@ msgstr "Геаграфічнае разьмяшчэньне"
 msgid "Priority"
 msgstr "Прыярытэт"
 
-#: calendar/gui/e-calendar-table.etspec.h:13
+#: calendar/gui/e-calendar-table.etspec.h:14
 msgid "Start Date"
 msgstr "Дата пачатку"
 
-#: calendar/gui/e-calendar-table.etspec.h:14
-#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:36
-#: mail/message-list.etspec.h:12
-msgid "Status"
-msgstr "Стан"
-
-#: calendar/gui/e-calendar-table.etspec.h:15
+#: calendar/gui/e-calendar-table.etspec.h:16
 #: my-evolution/component-factory.c:56 shell/e-shell.c:750
 #: shell/e-shortcuts.c:1082
 msgid "Summary"
 msgstr "Агульныя зьвесткі"
 
-#: calendar/gui/e-calendar-table.etspec.h:16
+#: calendar/gui/e-calendar-table.etspec.h:17
 msgid "Task sort"
 msgstr "Сартаваньне заданьняў"
 
-#: calendar/gui/e-calendar-table.etspec.h:19 mail/mail-config.glade.h:171
-msgid "color"
-msgstr "колер"
-
-#: calendar/gui/e-calendar-table.etspec.h:20
-#, fuzzy
-msgid "component"
-msgstr "Сустрэча"
-
-#: calendar/gui/e-cal-model.c:293 calendar/gui/e-cal-model.c:296
-#: calendar/gui/e-itip-control.c:1062 calendar/gui/e-itip-control.c:1278
-#: camel/camel-gpg-context.c:1574 camel/camel-gpg-context.c:1625
-#: camel/camel-tcp-stream-openssl.c:631
-#: camel/providers/smtp/camel-smtp-transport.c:172
-#: camel/providers/smtp/camel-smtp-transport.c:227
-#: widgets/misc/e-charset-picker.c:60
-msgid "Unknown"
-msgstr "Невядома"
-
-#: calendar/gui/e-cal-model.c:828
-msgid "Recurring"
-msgstr "Паўтор"
-
-#: calendar/gui/e-cal-model.c:830
-msgid "Assigned"
-msgstr "Прызначана"
+#. strftime format of a weekday, a date and a time, 24-hour.
+#: calendar/gui/e-cell-date-edit-text.c:118 e-util/e-time-utils.c:167
+#: e-util/e-time-utils.c:380
+msgid "%a %m/%d/%Y %H:%M:%S"
+msgstr "%a %d/%m/%Y %H:%M:%S"
 
-#: calendar/gui/e-cal-model.c:832 calendar/gui/e-cal-model-tasks.c:933
-msgid "Yes"
-msgstr "Так"
+#. strftime format of a weekday, a date and a time, 12-hour.
+#: calendar/gui/e-cell-date-edit-text.c:121 e-util/e-time-utils.c:162
+#: e-util/e-time-utils.c:389
+msgid "%a %m/%d/%Y %I:%M:%S %p"
+msgstr "%a %d/%m/%Y %I:%M:%S %p"
 
-#: calendar/gui/e-cal-model.c:832 calendar/gui/e-cal-model-tasks.c:933
-msgid "No"
-msgstr "Не"
+#: calendar/gui/e-cell-date-edit-text.c:126
+#, c-format
+msgid ""
+"The date must be entered in the format: \n"
+"\n"
+"%s"
+msgstr ""
+"Дата мусіць быць пазначана у фармаце:\n"
+"\n"
+"%s"
 
-#: calendar/gui/e-cal-model-tasks.c:275
-msgid "N"
-msgstr "N"
+#: calendar/gui/e-day-view-time-item.c:532
+#, c-format
+msgid "%02i minute divisions"
+msgstr "дзяленьні %02i хвіліны"
 
-#: calendar/gui/e-cal-model-tasks.c:275
-msgid "S"
-msgstr "S"
+#. strftime format %A = full weekday name, %d = day of month,
+#. %B = full month name. Don't use any other specifiers.
+#: calendar/gui/e-day-view-top-item.c:261 calendar/gui/e-day-view.c:1421
+#: calendar/gui/e-week-view-main-item.c:316 calendar/gui/print.c:1525
+msgid "%A %d %B"
+msgstr "%A %d %B"
 
-#: calendar/gui/e-cal-model-tasks.c:277
-msgid "E"
-msgstr "E"
+#. strftime format %d = day of month, %b = abbreviated month name.
+#. Don't use any other specifiers.
+#: calendar/gui/e-day-view-top-item.c:269 calendar/gui/e-day-view.c:1454
+#: calendar/gui/e-week-view-main-item.c:339
+msgid "%d %b"
+msgstr "%d %b"
 
-#: calendar/gui/e-cal-model-tasks.c:277
-msgid "W"
-msgstr "W"
+#. String to use in 12-hour time format for times in the morning.
+#: calendar/gui/e-day-view.c:636 calendar/gui/e-week-view.c:350
+#: calendar/gui/print.c:809
+msgid "am"
+msgstr "am"
 
-#: calendar/gui/e-cal-model-tasks.c:550
-msgid ""
-"The geographical position must be entered in the format: \n"
-"\n"
-"45.436845,125.862501"
-msgstr ""
-"Геаграфічнае разьмяшчэньне мусіць быць пазначана ў фармаце:\n"
-"\n"
-"45.436845,125.862501"
+#. String to use in 12-hour time format for times in the afternoon.
+#: calendar/gui/e-day-view.c:639 calendar/gui/e-week-view.c:353
+#: calendar/gui/print.c:811
+msgid "pm"
+msgstr "pm"
 
-#: calendar/gui/e-cal-view.c:1094 calendar/gui/e-cal-view.c:1184
-msgid "New _Appointment..."
-msgstr "Новая _сустрэча..."
+#: calendar/gui/e-day-view.c:3694
+msgid "New _Appointment"
+msgstr "Новая _сустрэча"
 
-#: calendar/gui/e-cal-view.c:1095 calendar/gui/e-cal-view.c:1186
+#: calendar/gui/e-day-view.c:3696 calendar/gui/e-week-view.c:3582
 msgid "New All Day _Event"
 msgstr "Новая падзея на ўвесь дзень"
 
-#: calendar/gui/e-cal-view.c:1096 calendar/gui/e-cal-view.c:1188
+#: calendar/gui/e-day-view.c:3698 calendar/gui/e-week-view.c:3583
 msgid "New Meeting"
 msgstr "Новая нарада"
 
-#: calendar/gui/e-cal-view.c:1097 calendar/gui/e-cal-view.c:1190
+#: calendar/gui/e-day-view.c:3700 calendar/gui/e-week-view.c:3584
 msgid "New Task"
 msgstr "Новае заданьне"
 
-#: calendar/gui/e-cal-view.c:1111 calendar/gui/e-cal-view.c:1180
+#: calendar/gui/e-day-view.c:3705 ui/evolution-comp-editor.xml.h:11
+msgid "Print..."
+msgstr "Друк..."
+
+#: calendar/gui/e-day-view.c:3717 calendar/gui/e-week-view.c:3598
 #: ui/evolution-calendar.xml.h:13
 msgid "Go to _Today"
 msgstr "Перайсьці да _сёньня"
 
-#: calendar/gui/e-cal-view.c:1112 calendar/gui/e-cal-view.c:1182
+#: calendar/gui/e-day-view.c:3719 calendar/gui/e-week-view.c:3599
 msgid "_Go to Date..."
 msgstr "Пера_йсьці да даты..."
 
-#: calendar/gui/e-cal-view.c:1116 ui/evolution-calendar.xml.h:38
+#: calendar/gui/e-day-view.c:3724 calendar/gui/e-week-view.c:3603
+#: ui/evolution-calendar.xml.h:34
 msgid "_Publish Free/Busy Information"
 msgstr "_Апублікаваць інфармацыю \"Вольны/Заняты\""
 
-#: calendar/gui/e-cal-view.c:1120 calendar/gui/e-cal-view.c:1200
+#: calendar/gui/e-day-view.c:3729 calendar/gui/e-week-view.c:3607
 #: ui/evolution.xml.h:60
 msgid "_Settings..."
 msgstr "_Усталёўкі..."
 
-#: calendar/gui/e-cal-view.c:1139
+#: calendar/gui/e-day-view.c:3738 calendar/gui/e-week-view.c:3614
+#: mail/folder-browser.c:1765 ui/evolution-mail-message.xml.h:112
+msgid "_Save As..."
+msgstr "Захаваць _як..."
+
+#: calendar/gui/e-day-view.c:3750 calendar/gui/e-week-view.c:3626
 msgid "_Schedule Meeting..."
 msgstr "_Заплянаваць нараду..."
 
-#: calendar/gui/e-cal-view.c:1140
+#: calendar/gui/e-day-view.c:3751 calendar/gui/e-week-view.c:3627
 msgid "_Forward as iCalendar..."
 msgstr "_Перадаслаць як iCalendar..."
 
-#: calendar/gui/e-cal-view.c:1145
+#: calendar/gui/e-day-view.c:3756 calendar/gui/e-week-view.c:3632
 msgid "Make this Occurrence _Movable"
 msgstr "Зрабіць гэтую зьяву здольнай перамяшчацца"
 
-#: calendar/gui/e-cal-view.c:1146 calendar/gui/e-cal-view.c:1177
+#: calendar/gui/e-day-view.c:3757 calendar/gui/e-week-view.c:3633
 msgid "Delete this _Occurrence"
 msgstr "Выдаліць гэтую зьяву"
 
-#: calendar/gui/e-cal-view.c:1147 calendar/gui/e-cal-view.c:1178
+#: calendar/gui/e-day-view.c:3758 calendar/gui/e-week-view.c:3634
 msgid "Delete _All Occurrences"
 msgstr "Выдаліць _усе зьявы"
 
-#. strftime format of a weekday, a date and a time, 24-hour.
-#: calendar/gui/e-cell-date-edit-text.c:118 e-util/e-time-utils.c:180
-#: e-util/e-time-utils.c:393
-msgid "%a %m/%d/%Y %H:%M:%S"
-msgstr "%a %d/%m/%Y %H:%M:%S"
-
-#. strftime format of a weekday, a date and a time, 12-hour.
-#: calendar/gui/e-cell-date-edit-text.c:121 e-util/e-time-utils.c:175
-#: e-util/e-time-utils.c:402
-msgid "%a %m/%d/%Y %I:%M:%S %p"
-msgstr "%a %d/%m/%Y %I:%M:%S %p"
-
-#: calendar/gui/e-cell-date-edit-text.c:126
-#, c-format
-msgid ""
-"The date must be entered in the format: \n"
-"\n"
-"%s"
-msgstr ""
-"Дата мусіць быць пазначана у фармаце:\n"
-"\n"
-"%s"
-
-#. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:600 calendar/gui/e-week-view.c:326
-#: calendar/gui/print.c:809
-msgid "am"
-msgstr "am"
-
-#. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:603 calendar/gui/e-week-view.c:329
-#: calendar/gui/print.c:811
-msgid "pm"
-msgstr "pm"
-
-#. strftime format %A = full weekday name, %d = day of month,
-#. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view.c:1347 calendar/gui/e-day-view-top-item.c:262
-#: calendar/gui/e-week-view-main-item.c:316 calendar/gui/print.c:1524
-msgid "%A %d %B"
-msgstr "%A %d %B"
-
-#. strftime format %d = day of month, %b = abbreviated month name.
-#. Don't use any other specifiers.
-#: calendar/gui/e-day-view.c:1380 calendar/gui/e-day-view-top-item.c:270
-#: calendar/gui/e-week-view-main-item.c:339
-msgid "%d %b"
-msgstr "%d %b"
-
-#: calendar/gui/e-day-view-time-item.c:532
-#, c-format
-msgid "%02i minute divisions"
-msgstr "дзяленьні %02i хвіліны"
-
-#: calendar/gui/e-itip-control.c:676
+#: calendar/gui/e-itip-control.c:706
 msgid "Yes. (Complex Recurrence)"
 msgstr "Так (Комплекснае вяртаньне)"
 
-#: calendar/gui/e-itip-control.c:688
+#: calendar/gui/e-itip-control.c:718
 msgid "Every day"
 msgstr "Штодзённа"
 
-#: calendar/gui/e-itip-control.c:690
+#: calendar/gui/e-itip-control.c:720
 #, c-format
 msgid "Every %d days"
 msgstr "Кожныя %d дзён"
 
-#: calendar/gui/e-itip-control.c:696
+#: calendar/gui/e-itip-control.c:726
 msgid "Every week"
 msgstr "Штотыдзень"
 
-#: calendar/gui/e-itip-control.c:698
+#: calendar/gui/e-itip-control.c:728
 #, c-format
 msgid "Every %d weeks"
 msgstr "Кожныя %d тыдні"
 
-#: calendar/gui/e-itip-control.c:701
+#: calendar/gui/e-itip-control.c:731
 msgid "Every week on "
 msgstr "Штотыдзень на "
 
-#: calendar/gui/e-itip-control.c:703
+#: calendar/gui/e-itip-control.c:733
 #, c-format
 msgid "Every %d weeks on "
 msgstr "Кожныя %d тыдні на"
 
-#: calendar/gui/e-itip-control.c:711
+#: calendar/gui/e-itip-control.c:741
 msgid " and "
 msgstr " і "
 
-#: calendar/gui/e-itip-control.c:718
+#: calendar/gui/e-itip-control.c:748
 #, c-format
 msgid "The %s day of "
 msgstr "%s дзень "
 
-#: calendar/gui/e-itip-control.c:731
+#: calendar/gui/e-itip-control.c:761
 #, c-format
 msgid "The %s %s of "
 msgstr "%s %s"
 
-#: calendar/gui/e-itip-control.c:736
+#: calendar/gui/e-itip-control.c:766
 msgid "every month"
 msgstr "штомесяц"
 
-#: calendar/gui/e-itip-control.c:741
+#: calendar/gui/e-itip-control.c:771
 #, c-format
 msgid "every %d months"
 msgstr "кожныя %d мясацаў"
 
-#: calendar/gui/e-itip-control.c:747
+#: calendar/gui/e-itip-control.c:777
 msgid "Every year"
 msgstr "Штогод"
 
-#: calendar/gui/e-itip-control.c:749
+#: calendar/gui/e-itip-control.c:779
 #, c-format
 msgid "Every %d years"
 msgstr "Кожныя %d год"
 
-#: calendar/gui/e-itip-control.c:761
+#: calendar/gui/e-itip-control.c:791
 #, c-format
 msgid " a total of %d times"
 msgstr " агулам з %d часа"
 
-#: calendar/gui/e-itip-control.c:769
+#: calendar/gui/e-itip-control.c:799
 msgid ", ending on "
 msgstr ", сканчаецца на "
 
-#: calendar/gui/e-itip-control.c:793
+#: calendar/gui/e-itip-control.c:823
 msgid "<b>Starts:</b> "
 msgstr "<b>Пачынаецца:</b> "
 
-#: calendar/gui/e-itip-control.c:803
+#: calendar/gui/e-itip-control.c:833
 msgid "<b>Ends:</b> "
 msgstr "<b>Сканчаецца:</b> "
 
-#: calendar/gui/e-itip-control.c:823
+#: calendar/gui/e-itip-control.c:853
 msgid "<b>Completed:</b> "
 msgstr "<b> Выканана</b> "
 
-#: calendar/gui/e-itip-control.c:833
+#: calendar/gui/e-itip-control.c:863
 msgid "<b>Due:</b> "
 msgstr "<b>Умоўлена:</b> "
 
-#: calendar/gui/e-itip-control.c:870 calendar/gui/e-itip-control.c:923
+#: calendar/gui/e-itip-control.c:900 calendar/gui/e-itip-control.c:953
 msgid "iCalendar Information"
 msgstr "Зьвесткі iCalendar"
 
 #. Title
-#: calendar/gui/e-itip-control.c:885
+#: calendar/gui/e-itip-control.c:915
 msgid "iCalendar Error"
 msgstr "Памылка iCalendar"
 
-#: calendar/gui/e-itip-control.c:954 calendar/gui/e-itip-control.c:970
-#: calendar/gui/e-itip-control.c:981 calendar/gui/e-itip-control.c:998
+#: calendar/gui/e-itip-control.c:984 calendar/gui/e-itip-control.c:1000
+#: calendar/gui/e-itip-control.c:1011 calendar/gui/e-itip-control.c:1028
 msgid "An unknown person"
 msgstr "Невядомая пэрсона"
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:1005
+#: calendar/gui/e-itip-control.c:1035
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
@@ -5586,330 +5549,336 @@ msgstr ""
 "<br>Калі ласка, прагледзьце наступную інфармацыю, і выбярыце дзеяньне з мэню "
 "ніжэй."
 
-#: calendar/gui/e-itip-control.c:1020
+#: calendar/gui/e-itip-control.c:1050
 msgid "<i>None</i>"
 msgstr "<i>Няма</i>"
 
-#: calendar/gui/e-itip-control.c:1031
+#: calendar/gui/e-itip-control.c:1061
 msgid "Location:"
 msgstr "Мейсца:"
 
-#. write status
-#: calendar/gui/e-itip-control.c:1045 calendar/gui/e-tasks.c:243
+#: calendar/gui/e-itip-control.c:1075
 msgid "Status:"
 msgstr "Стан:"
 
-#: calendar/gui/e-itip-control.c:1050 calendar/gui/itip-utils.c:414
+#: calendar/gui/e-itip-control.c:1080 calendar/gui/e-meeting-model.c:286
+#: calendar/gui/e-meeting-model.c:309 calendar/gui/e-meeting-model.c:798
+#: calendar/gui/itip-utils.c:414
 msgid "Accepted"
 msgstr "Прынята"
 
-#: calendar/gui/e-itip-control.c:1054 calendar/gui/itip-utils.c:417
+#: calendar/gui/e-itip-control.c:1084 calendar/gui/itip-utils.c:417
 msgid "Tentatively Accepted"
 msgstr "Прынята для спробы"
 
-#: calendar/gui/e-itip-control.c:1058 calendar/gui/itip-utils.c:420
-#: calendar/gui/itip-utils.c:446
+#: calendar/gui/e-itip-control.c:1088 calendar/gui/e-meeting-model.c:288
+#: calendar/gui/e-meeting-model.c:311 calendar/gui/e-meeting-model.c:799
+#: calendar/gui/itip-utils.c:420 calendar/gui/itip-utils.c:446
 msgid "Declined"
 msgstr "Адхілена"
 
-#: calendar/gui/e-itip-control.c:1117 calendar/gui/e-itip-control.c:1145
-#: calendar/gui/e-itip-control.c:1171 calendar/gui/e-itip-control.c:1184
-#: calendar/gui/e-itip-control.c:1197 calendar/gui/e-itip-control.c:1210
+#: calendar/gui/e-itip-control.c:1092 calendar/gui/e-itip-control.c:1300
+#: calendar/gui/e-meeting-model.c:222 calendar/gui/e-meeting-model.c:257
+#: calendar/gui/e-meeting-model.c:322 calendar/gui/e-meeting-model.c:756
+#: calendar/gui/e-meeting-model.c:772 camel/camel-gpg-context.c:1574
+#: camel/camel-gpg-context.c:1625 camel/camel-tcp-stream-openssl.c:634
+#: camel/providers/smtp/camel-smtp-transport.c:173
+#: camel/providers/smtp/camel-smtp-transport.c:228 mail/folder-browser.c:345
+#: mail/mail-display.c:953 widgets/misc/e-charset-picker.c:60
+msgid "Unknown"
+msgstr "Невядома"
+
+#: calendar/gui/e-itip-control.c:1147 calendar/gui/e-itip-control.c:1175
+#: calendar/gui/e-itip-control.c:1201 calendar/gui/e-itip-control.c:1214
+#: calendar/gui/e-itip-control.c:1227 calendar/gui/e-itip-control.c:1240
 msgid "Choose an action:"
 msgstr "Выбраць дзеяньне:"
 
-#: calendar/gui/e-itip-control.c:1118
+#: calendar/gui/e-itip-control.c:1148
 msgid "Update"
 msgstr "Абнавіць"
 
-#: calendar/gui/e-itip-control.c:1119 calendar/gui/e-itip-control.c:1150
-#: calendar/gui/e-itip-control.c:1173 calendar/gui/e-itip-control.c:1186
-#: calendar/gui/e-itip-control.c:1199 calendar/gui/e-itip-control.c:1212
+#: calendar/gui/e-itip-control.c:1149 calendar/gui/e-itip-control.c:1180
+#: calendar/gui/e-itip-control.c:1203 calendar/gui/e-itip-control.c:1216
+#: calendar/gui/e-itip-control.c:1229 calendar/gui/e-itip-control.c:1242
 #: shell/e-shell.c:2067 widgets/misc/e-cell-date-edit.c:265
 msgid "OK"
 msgstr "Так"
 
-#: calendar/gui/e-itip-control.c:1146
+#: calendar/gui/e-itip-control.c:1176
 msgid "Accept"
 msgstr "Прыняць"
 
-#: calendar/gui/e-itip-control.c:1147
+#: calendar/gui/e-itip-control.c:1177
 msgid "Tentatively accept"
 msgstr "Прыняць для спробы"
 
-#: calendar/gui/e-itip-control.c:1148
+#: calendar/gui/e-itip-control.c:1178
 msgid "Decline"
 msgstr "Адхіліць"
 
-#: calendar/gui/e-itip-control.c:1149
-#: calendar/gui/e-meeting-time-sel.etspec.h:8
-msgid "RSVP"
-msgstr "RSVP"
-
-#: calendar/gui/e-itip-control.c:1172
+#: calendar/gui/e-itip-control.c:1202
 msgid "Send Free/Busy Information"
 msgstr "Даслаць інфармацыю \"Вольны/Заняты\""
 
-#: calendar/gui/e-itip-control.c:1185
+#: calendar/gui/e-itip-control.c:1215
 msgid "Update respondent status"
 msgstr "Абнавіць стан удзельнікаў"
 
-#: calendar/gui/e-itip-control.c:1198
+#: calendar/gui/e-itip-control.c:1228
 msgid "Send Latest Information"
 msgstr "Даслаць апошнюю інфармацыю"
 
-#: calendar/gui/e-itip-control.c:1211 calendar/gui/itip-utils.c:434
-#: mail/mail-send-recv.c:388 mail/mail-send-recv.c:440
-#: shell/e-shell-startup-wizard.c:781 shell/evolution-shell-component.c:1185
-#: ui/evolution-mail-global.xml.h:1
+#: calendar/gui/e-itip-control.c:1241 calendar/gui/itip-utils.c:434
+#: mail/mail-send-recv.c:387 mail/mail-send-recv.c:444
+#: shell/evolution-shell-component.c:1182 ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Адмяніць"
 
-#: calendar/gui/e-itip-control.c:1300
+#: calendar/gui/e-itip-control.c:1322
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "<b>%s</b> разьмясьціў(ла) зьвесткі аб нарадзе."
 
-#: calendar/gui/e-itip-control.c:1301
+#: calendar/gui/e-itip-control.c:1323
 msgid "Meeting Information"
 msgstr "Зьвесткі аб нарадзе"
 
-#: calendar/gui/e-itip-control.c:1306
+#: calendar/gui/e-itip-control.c:1328
 #, c-format
 msgid "<b>%s</b> requests the presence of %s at a meeting."
 msgstr "<b>%s</b> запытваецца прысутнасьці %s на нарадзе."
 
-#: calendar/gui/e-itip-control.c:1308
+#: calendar/gui/e-itip-control.c:1330
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr "<b>%s</b> запытваецца вашае прысутнасьці на нарадзе."
 
-#: calendar/gui/e-itip-control.c:1309
+#: calendar/gui/e-itip-control.c:1331
 msgid "Meeting Proposal"
 msgstr "Плян нарады"
 
-#: calendar/gui/e-itip-control.c:1313
+#: calendar/gui/e-itip-control.c:1335
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr "<b>%s</b> жадае далучыць да распачатае нарады."
 
-#: calendar/gui/e-itip-control.c:1314
+#: calendar/gui/e-itip-control.c:1336
 msgid "Meeting Update"
 msgstr "Абнаўленьне нарады"
 
-#: calendar/gui/e-itip-control.c:1318
+#: calendar/gui/e-itip-control.c:1340
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr "<b>%s</b> запытвае апошнюю інфармацыю па нарадзе."
 
-#: calendar/gui/e-itip-control.c:1319
+#: calendar/gui/e-itip-control.c:1341
 msgid "Meeting Update Request"
 msgstr "Запыт на абнаўленьне нарады"
 
-#: calendar/gui/e-itip-control.c:1326
+#: calendar/gui/e-itip-control.c:1348
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr "<b>%s</b> мае адказ на запыт нарады."
 
-#: calendar/gui/e-itip-control.c:1327
+#: calendar/gui/e-itip-control.c:1349
 msgid "Meeting Reply"
 msgstr "Адказ па нарадзе"
 
-#: calendar/gui/e-itip-control.c:1334
+#: calendar/gui/e-itip-control.c:1356
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr "<b>%s</b> мае адмяніць нараду."
 
-#: calendar/gui/e-itip-control.c:1335
+#: calendar/gui/e-itip-control.c:1357
 msgid "Meeting Cancellation"
 msgstr "Адмена нарады"
 
-#: calendar/gui/e-itip-control.c:1342 calendar/gui/e-itip-control.c:1409
-#: calendar/gui/e-itip-control.c:1444
+#: calendar/gui/e-itip-control.c:1364 calendar/gui/e-itip-control.c:1431
+#: calendar/gui/e-itip-control.c:1466
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr "<b>%s</b> мае даслаць неінтэлегентнае паведамленьне."
 
-#: calendar/gui/e-itip-control.c:1343
+#: calendar/gui/e-itip-control.c:1365
 msgid "Bad Meeting Message"
 msgstr "Дрэннае паведамленьне нарады"
 
-#: calendar/gui/e-itip-control.c:1367
+#: calendar/gui/e-itip-control.c:1389
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr "<b>%s</b> мае апублікаваць зьвесткі аб заданьні."
 
-#: calendar/gui/e-itip-control.c:1368
+#: calendar/gui/e-itip-control.c:1390
 msgid "Task Information"
 msgstr "Інфармацыя аб заданьні"
 
-#: calendar/gui/e-itip-control.c:1373
+#: calendar/gui/e-itip-control.c:1395
 #, c-format
 msgid "<b>%s</b> requests %s to perform a task."
 msgstr "<b>%s</b> пытаецца %s аб выкананьні заданьня."
 
-#: calendar/gui/e-itip-control.c:1375
+#: calendar/gui/e-itip-control.c:1397
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr "<b>%s</b> пытаецца вас аб выкананьні заданьня."
 
-#: calendar/gui/e-itip-control.c:1376
+#: calendar/gui/e-itip-control.c:1398
 msgid "Task Proposal"
 msgstr "Плян заданьня"
 
-#: calendar/gui/e-itip-control.c:1380
+#: calendar/gui/e-itip-control.c:1402
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task."
 msgstr "<b>%s</b> жадае дадаць да распачатага заданьня."
 
-#: calendar/gui/e-itip-control.c:1381
+#: calendar/gui/e-itip-control.c:1403
 msgid "Task Update"
 msgstr "Абнаўленьне заданьня"
 
-#: calendar/gui/e-itip-control.c:1385
+#: calendar/gui/e-itip-control.c:1407
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr "<b>%s</b> жадае атрымаць апошнія зьвесткі па заданьні."
 
-#: calendar/gui/e-itip-control.c:1386
+#: calendar/gui/e-itip-control.c:1408
 msgid "Task Update Request"
 msgstr "Запыт на абнаўленьне заданьня"
 
-#: calendar/gui/e-itip-control.c:1393
+#: calendar/gui/e-itip-control.c:1415
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr "<b>%s</b> мае адказ на заданьне."
 
-#: calendar/gui/e-itip-control.c:1394
+#: calendar/gui/e-itip-control.c:1416
 msgid "Task Reply"
 msgstr "Адказ на заданьне"
 
-#: calendar/gui/e-itip-control.c:1401
+#: calendar/gui/e-itip-control.c:1423
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr "<b>%s</b> мае адмяніць заданьне."
 
-#: calendar/gui/e-itip-control.c:1402
+#: calendar/gui/e-itip-control.c:1424
 msgid "Task Cancellation"
 msgstr "Адмена заданьня"
 
-#: calendar/gui/e-itip-control.c:1410
+#: calendar/gui/e-itip-control.c:1432
 msgid "Bad Task Message"
 msgstr "Дрэннае паведамленьне па заданьні"
 
-#: calendar/gui/e-itip-control.c:1429
+#: calendar/gui/e-itip-control.c:1451
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr "<b>%s</b> мае апублікаваць інфармацыю \"Вольны/Заняты\"."
 
-#: calendar/gui/e-itip-control.c:1430
+#: calendar/gui/e-itip-control.c:1452
 msgid "Free/Busy Information"
 msgstr "Інфармацыя \"Вольны/Заняты\""
 
-#: calendar/gui/e-itip-control.c:1434
+#: calendar/gui/e-itip-control.c:1456
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr "<b>%s</b> патрабуе ад вас інфармацыю \"Вольны/Заняты\"."
 
-#: calendar/gui/e-itip-control.c:1435
+#: calendar/gui/e-itip-control.c:1457
 msgid "Free/Busy Request"
 msgstr "Запыт \"Вольны/Заняты\""
 
-#: calendar/gui/e-itip-control.c:1439
+#: calendar/gui/e-itip-control.c:1461
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr "<b>%s</b> мае адказаць на запыт аб інфармацыі \"Заняты/Вольны\"."
 
-#: calendar/gui/e-itip-control.c:1440
+#: calendar/gui/e-itip-control.c:1462
 msgid "Free/Busy Reply"
 msgstr "Адказ на \"Заняты/Вольны\""
 
-#: calendar/gui/e-itip-control.c:1445
+#: calendar/gui/e-itip-control.c:1467
 msgid "Bad Free/Busy Message"
 msgstr "Дрэннае паведамленьне \"Вольны /Заняты\""
 
-#: calendar/gui/e-itip-control.c:1521
+#: calendar/gui/e-itip-control.c:1543
 msgid "The message does not appear to be properly formed"
 msgstr "Падобна што паведамленьне не было правільна сфармавана"
 
-#: calendar/gui/e-itip-control.c:1584
+#: calendar/gui/e-itip-control.c:1606
 msgid "The message contains only unsupported requests."
 msgstr "Паведамленьне утрымлівае толькі запыты, якія не падтрымліваюцца."
 
-#: calendar/gui/e-itip-control.c:1615 calendar/gui/e-itip-control.c:1621
+#: calendar/gui/e-itip-control.c:1637 calendar/gui/e-itip-control.c:1643
 msgid "The attachment does not contain a valid calendar message"
 msgstr "Укладаньне ня ўтрымлівае рэчаіснага паведамленьня каляндара"
 
-#: calendar/gui/e-itip-control.c:1646
+#: calendar/gui/e-itip-control.c:1668
 msgid "The attachment has no viewable calendar items"
 msgstr "Укладаньне мае элемэнты каляндара, якія нельга адлюстраваць"
 
-#: calendar/gui/e-itip-control.c:1887 calendar/gui/e-itip-control.c:1948
-#: calendar/gui/e-itip-control.c:1986
+#: calendar/gui/e-itip-control.c:1909 calendar/gui/e-itip-control.c:2001
 msgid "Object is invalid and cannot be updated\n"
 msgstr "Аб'ект нерэчаісны і ня будзе абноўлены\n"
 
-#: calendar/gui/e-itip-control.c:1890 calendar/gui/e-itip-control.c:1989
+#: calendar/gui/e-itip-control.c:1912 calendar/gui/e-itip-control.c:2004
 msgid "There was an error on the CORBA system\n"
 msgstr "Адбылася памылка ў сыстэме CORBA\n"
 
-#: calendar/gui/e-itip-control.c:1893 calendar/gui/e-itip-control.c:1992
+#: calendar/gui/e-itip-control.c:1915 calendar/gui/e-itip-control.c:2007
 msgid "Object could not be found\n"
 msgstr "Аб'ект адсутнічае\n"
 
-#: calendar/gui/e-itip-control.c:1896
+#: calendar/gui/e-itip-control.c:1918
 msgid "You do not have the right permissions to update the calendar\n"
 msgstr "Вы ня маеце правільных правоў доступу для абнаўленьня каляндара\n"
 
-#: calendar/gui/e-itip-control.c:1899
+#: calendar/gui/e-itip-control.c:1921
 msgid "Update complete\n"
 msgstr "Абнаўленьне завершана\n"
 
-#: calendar/gui/e-itip-control.c:1902
+#: calendar/gui/e-itip-control.c:1924
 msgid "Calendar file could not be updated!\n"
 msgstr "Файл каляндара ня можа быць абноўлены!\n"
 
-#: calendar/gui/e-itip-control.c:1932 calendar/gui/e-itip-control.c:2004
+#: calendar/gui/e-itip-control.c:1953 calendar/gui/e-itip-control.c:2019
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr "Стан удзельніка ня можа быць абноўлены таму, што элемэнт ужо не існуе"
 
-#: calendar/gui/e-itip-control.c:1958
+#: calendar/gui/e-itip-control.c:1974
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr "Адказ не ад бягучага удзельніка. Дадаць як ад яго?"
 
-#: calendar/gui/e-itip-control.c:1970
+#: calendar/gui/e-itip-control.c:1986
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr "Стан удзельніка ня можа быць абноўлены, таму што ён нерэчаісны!\n"
 
-#: calendar/gui/e-itip-control.c:1995
+#: calendar/gui/e-itip-control.c:2010
 msgid "You don't have the right permissions to update the calendar\n"
 msgstr "Вы ня маеце правільных правоў для абнаўленьня каляндара\n"
 
-#: calendar/gui/e-itip-control.c:1998
+#: calendar/gui/e-itip-control.c:2013
 msgid "Attendee status updated\n"
 msgstr "Стан удзельніка абноўлены\n"
 
-#: calendar/gui/e-itip-control.c:2001
+#: calendar/gui/e-itip-control.c:2016
 msgid "Attendee status could not be updated!\n"
 msgstr "Стан удзельніка ня можа быць абноўлены!\n"
 
-#: calendar/gui/e-itip-control.c:2038
+#: calendar/gui/e-itip-control.c:2053
 msgid "Removal Complete"
 msgstr "Выдаленьне скончана"
 
-#: calendar/gui/e-itip-control.c:2070 calendar/gui/e-itip-control.c:2120
+#: calendar/gui/e-itip-control.c:2085 calendar/gui/e-itip-control.c:2135
 msgid "Item sent!\n"
 msgstr "Элемэнт дасланы!\n"
 
-#: calendar/gui/e-itip-control.c:2072 calendar/gui/e-itip-control.c:2124
+#: calendar/gui/e-itip-control.c:2087 calendar/gui/e-itip-control.c:2139
 msgid "The item could not be sent!\n"
 msgstr "Элемэнт ня можа быць дасланы!\n"
 
-#: calendar/gui/e-itip-control.c:2215
+#: calendar/gui/e-itip-control.c:2212
 msgid "Select Calendar Folder"
 msgstr "Вябярыце тэчку каляндара"
 
-#: calendar/gui/e-itip-control.c:2221
+#: calendar/gui/e-itip-control.c:2219
 msgid "Select Tasks Folder"
 msgstr "Выбярыце тэчку заданьняў"
 
@@ -5950,167 +5919,185 @@ msgstr "дата-завяршэньня"
 msgid "date-start"
 msgstr "дата-пачатку"
 
-#: calendar/gui/e-meeting-time-sel.c:392
+#: calendar/gui/e-meeting-model.c:79
+msgid "Chair Persons"
+msgstr "Кіраўнікі"
+
+#: calendar/gui/e-meeting-model.c:80 calendar/gui/e-meeting-model.c:1636
+msgid "Required Participants"
+msgstr "Патрабаваныя ўдзельнікі"
+
+#: calendar/gui/e-meeting-model.c:81
+msgid "Optional Participants"
+msgstr "Дадатковыя ўдзельнікі"
+
+#: calendar/gui/e-meeting-model.c:82
+msgid "Resources"
+msgstr "Рэсурсы"
+
+#: calendar/gui/e-meeting-model.c:197 calendar/gui/e-meeting-model.c:214
+#: calendar/gui/e-meeting-model.c:530 calendar/gui/e-meeting-model.c:752
+msgid "Individual"
+msgstr "Асабіста"
+
+#: calendar/gui/e-meeting-model.c:199 calendar/gui/e-meeting-model.c:216
+#: calendar/gui/e-meeting-model.c:753
+msgid "Group"
+msgstr "Група"
+
+#: calendar/gui/e-meeting-model.c:201 calendar/gui/e-meeting-model.c:218
+#: calendar/gui/e-meeting-model.c:754
+msgid "Resource"
+msgstr "Рэсурс"
+
+#: calendar/gui/e-meeting-model.c:203 calendar/gui/e-meeting-model.c:220
+#: calendar/gui/e-meeting-model.c:755
+msgid "Room"
+msgstr "Пакой"
+
+#: calendar/gui/e-meeting-model.c:232 calendar/gui/e-meeting-model.c:249
+#: calendar/gui/e-meeting-model.c:768
+msgid "Chair"
+msgstr "Кіраўнік"
+
+#: calendar/gui/e-meeting-model.c:234 calendar/gui/e-meeting-model.c:251
+#: calendar/gui/e-meeting-model.c:532 calendar/gui/e-meeting-model.c:769
+msgid "Required Participant"
+msgstr "Патрабаваны ўдзельнік"
+
+#: calendar/gui/e-meeting-model.c:236 calendar/gui/e-meeting-model.c:253
+#: calendar/gui/e-meeting-model.c:770
+msgid "Optional Participant"
+msgstr "Дадатковы удзельнік"
+
+#: calendar/gui/e-meeting-model.c:238 calendar/gui/e-meeting-model.c:255
+#: calendar/gui/e-meeting-model.c:771
+msgid "Non-Participant"
+msgstr "Неудзельнічае"
+
+#: calendar/gui/e-meeting-model.c:284 calendar/gui/e-meeting-model.c:307
+#: calendar/gui/e-meeting-model.c:540 calendar/gui/e-meeting-model.c:797
+msgid "Needs Action"
+msgstr "Неабходна дзеяньне"
+
+#: calendar/gui/e-meeting-model.c:290 calendar/gui/e-meeting-model.c:313
+#: calendar/gui/e-meeting-model.c:800 calendar/gui/e-meeting-time-sel.c:405
 msgid "Tentative"
 msgstr "Пробны"
 
-#: calendar/gui/e-meeting-time-sel.c:394 designs/OOA/ooa.glade.h:11
+#: calendar/gui/e-meeting-model.c:292 calendar/gui/e-meeting-model.c:315
+#: calendar/gui/e-meeting-model.c:801
+msgid "Delegated"
+msgstr "Дэлегаваны"
+
+#: calendar/gui/e-meeting-model.c:296 calendar/gui/e-meeting-model.c:319
+msgid "In Process"
+msgstr "У выкананьні"
+
+#. This is a strftime() format string %A = full weekday name,
+#. %B = full month name, %d = month day, %Y = full year.
+#: calendar/gui/e-meeting-time-sel-item.c:458
+#: calendar/gui/e-meeting-time-sel.c:2098
+msgid "%A, %B %d, %Y"
+msgstr "%A, %B %d, %Y"
+
+#. This is a strftime() format string %a = abbreviated weekday
+#. name, %m = month number, %d = month day, %Y = full year.
+#: calendar/gui/e-meeting-time-sel-item.c:462
+#: calendar/gui/e-meeting-time-sel.c:2131 e-util/e-time-utils.c:190
+#: e-util/e-time-utils.c:283 e-util/e-time-utils.c:371
+msgid "%a %m/%d/%Y"
+msgstr "%a %d/%m/%Y"
+
+#. This is a strftime() format string %m = month number,
+#. %d = month day, %Y = full year.
+#: calendar/gui/e-meeting-time-sel-item.c:466 e-util/e-time-utils.c:225
+#: e-util/e-time-utils.c:286 widgets/misc/e-dateedit.c:1582
+msgid "%m/%d/%Y"
+msgstr "%d/%m/%Y"
+
+#: calendar/gui/e-meeting-time-sel.c:407 designs/OOA/ooa.glade.h:11
 msgid "Out of Office"
 msgstr "Пакінуу офіс"
 
-#: calendar/gui/e-meeting-time-sel.c:395
+#: calendar/gui/e-meeting-time-sel.c:408
 msgid "No Information"
 msgstr "Зьвесткі адсутнічаюць"
 
-#: calendar/gui/e-meeting-time-sel.c:434
+#: calendar/gui/e-meeting-time-sel.c:447
 msgid "_Options"
 msgstr "_Парамэтры"
 
-#: calendar/gui/e-meeting-time-sel.c:451
+#: calendar/gui/e-meeting-time-sel.c:464
 msgid "Show _Only Working Hours"
 msgstr "Адлюстроўваць толькі _працоўныя часы"
 
-#: calendar/gui/e-meeting-time-sel.c:461
+#: calendar/gui/e-meeting-time-sel.c:474
 msgid "Show _Zoomed Out"
 msgstr "Паказаць паменшанае"
 
-#: calendar/gui/e-meeting-time-sel.c:476
+#: calendar/gui/e-meeting-time-sel.c:489
 msgid "_Update Free/Busy"
 msgstr "Аб_навіць \"Вольны/Заняты\""
 
-#: calendar/gui/e-meeting-time-sel.c:491
+#: calendar/gui/e-meeting-time-sel.c:504
 msgid "_<<"
 msgstr "_<<"
 
-#: calendar/gui/e-meeting-time-sel.c:509
+#: calendar/gui/e-meeting-time-sel.c:522
 msgid "_Autopick"
 msgstr "Аўтавыбар"
 
-#: calendar/gui/e-meeting-time-sel.c:524
+#: calendar/gui/e-meeting-time-sel.c:537
 msgid ">_>"
 msgstr ">_>"
 
-#: calendar/gui/e-meeting-time-sel.c:541
+#: calendar/gui/e-meeting-time-sel.c:554
 msgid "_All People and Resources"
 msgstr "Усе людзі й рэсурсы"
 
-#: calendar/gui/e-meeting-time-sel.c:550
+#: calendar/gui/e-meeting-time-sel.c:563
 msgid "All _People and One Resource"
 msgstr "Усе людзі й адзін рэсурс"
 
-#: calendar/gui/e-meeting-time-sel.c:559
+#: calendar/gui/e-meeting-time-sel.c:572
 msgid "_Required People"
 msgstr "Патрабаваныя людзі"
 
-#: calendar/gui/e-meeting-time-sel.c:568
+#: calendar/gui/e-meeting-time-sel.c:581
 msgid "Required People and _One Resource"
 msgstr "Патрабаваныя людзі й адзін рэсурс"
 
-#: calendar/gui/e-meeting-time-sel.c:587
+#: calendar/gui/e-meeting-time-sel.c:600
 msgid "Meeting _start time:"
 msgstr "Час пачатку нарады:"
 
-#: calendar/gui/e-meeting-time-sel.c:607
+#: calendar/gui/e-meeting-time-sel.c:620
 msgid "Meeting _end time:"
 msgstr "Час заканчэньня нарады:"
 
-#. This is a strftime() format string %A = full weekday name,
-#. %B = full month name, %d = month day, %Y = full year.
-#: calendar/gui/e-meeting-time-sel.c:2054
-#: calendar/gui/e-meeting-time-sel-item.c:452
-msgid "%A, %B %d, %Y"
-msgstr "%A, %B %d, %Y"
-
-#. This is a strftime() format string %a = abbreviated weekday name,
-#. %m = month number, %d = month day, %Y = full year.
-#: calendar/gui/e-meeting-time-sel.c:2087
-#: calendar/gui/e-meeting-time-sel-item.c:456 e-util/e-time-utils.c:203
-#: e-util/e-time-utils.c:296 e-util/e-time-utils.c:384
-msgid "%a %m/%d/%Y"
-msgstr "%a %d/%m/%Y"
-
-#: calendar/gui/e-meeting-time-sel.etspec.h:1
-msgid "Attendee"
-msgstr "Удзельнік"
-
-#: calendar/gui/e-meeting-time-sel.etspec.h:2
-msgid "Click here to add an attendee"
-msgstr "Клікніце тутака каб дадаць удзельніка"
-
-#: calendar/gui/e-meeting-time-sel.etspec.h:3
-msgid "Common Name"
-msgstr "Агульная назва"
-
-#: calendar/gui/e-meeting-time-sel.etspec.h:4
-msgid "Delegated From"
-msgstr "Дэлегаваць з"
-
-#: calendar/gui/e-meeting-time-sel.etspec.h:5
-msgid "Delegated To"
-msgstr "Дэлегаваць у"
-
-#: calendar/gui/e-meeting-time-sel.etspec.h:6
-msgid "Language"
-msgstr "Мова"
-
-#: calendar/gui/e-meeting-time-sel.etspec.h:7
-msgid "Member"
-msgstr "Удзельнік"
-
-#. This is a strftime() format string %m = month number,
-#. %d = month day, %Y = full year.
-#: calendar/gui/e-meeting-time-sel-item.c:460 e-util/e-time-utils.c:238
-#: e-util/e-time-utils.c:299 widgets/misc/e-dateedit.c:1607
-msgid "%m/%d/%Y"
-msgstr "%d/%m/%Y"
-
-#: calendar/gui/e-tasks.c:151
-msgid "invalid time"
-msgstr "нерэчаісны час"
-
-#: calendar/gui/e-tasks.c:221
-#, fuzzy
-msgid "Start Date:"
-msgstr "Дата пачатку:"
-
-#: calendar/gui/e-tasks.c:237
-#, fuzzy
-msgid "Due Date:"
-msgstr "_Умоўленая дата:"
-
-#. write priority
-#: calendar/gui/e-tasks.c:265
-#, fuzzy
-msgid "Priority:"
-msgstr "_Прыярытэт:"
-
-#. URL
-#: calendar/gui/e-tasks.c:321
-#, fuzzy
-msgid "Web Page:"
-msgstr "Старонка"
-
-#: calendar/gui/e-tasks.c:702
+#: calendar/gui/e-tasks.c:360 calendar/gui/gnome-cal.c:2006
+#: calendar/gui/gnome-cal.c:2017
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Адкрыцьцё заданьняў %s"
 
-#: calendar/gui/e-tasks.c:731 calendar/gui/tasks-control.c:201
+#: calendar/gui/e-tasks.c:389 calendar/gui/tasks-control.c:201
 #, c-format
 msgid "Could not load the tasks in `%s'"
 msgstr "Немагчыма загрузіць заданьне ў \"%s\""
 
-#: calendar/gui/e-tasks.c:746
+#: calendar/gui/e-tasks.c:404
 #, c-format
 msgid "The method required to load `%s' is not supported"
 msgstr "Мэтад неабходны для загрузкі \"%s\" не падтрымліваецца"
 
-#: calendar/gui/e-tasks.c:760 calendar/gui/gnome-cal.c:1730
+#: calendar/gui/e-tasks.c:418 calendar/gui/gnome-cal.c:1509
 #, c-format
 msgid "You don't have permission to open the folder in `%s'"
 msgstr "Вы ня маеце правоў для адкрыцьця тэчкі ў `%s'"
 
-#: calendar/gui/e-tasks.c:828 calendar/gui/gnome-cal.c:1944
+#: calendar/gui/e-tasks.c:486 calendar/gui/gnome-cal.c:1728
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -6119,110 +6106,68 @@ msgstr ""
 "Памылка на %s\n"
 " %s"
 
-#: calendar/gui/e-tasks.c:899
+#: calendar/gui/e-tasks.c:557
 msgid "Completing tasks..."
 msgstr "Завяршэньне заданьняў..."
 
-#: calendar/gui/e-tasks.c:922
+#: calendar/gui/e-tasks.c:580
 msgid "Deleting selected objects..."
 msgstr "Выдаленьне вылучаных аб'ектаў..."
 
-#: calendar/gui/e-tasks.c:1017
+#: calendar/gui/e-tasks.c:675
 msgid "Expunging"
 msgstr "Выкрэсьленьне"
 
-#: calendar/gui/gnome-cal.c:1702
+#: calendar/gui/e-week-view.c:3581
+msgid "New _Appointment..."
+msgstr "Новая _сустрэча..."
+
+#: calendar/gui/gnome-cal.c:1481
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr "Немагчыма адчыніць тэчку \"%s\""
 
-#: calendar/gui/gnome-cal.c:1716
+#: calendar/gui/gnome-cal.c:1495
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr "Мэтад неабходны для адкрыцьця \"%s\" не падтрымліваецца"
 
-#: calendar/gui/gnome-cal.c:1772
+#: calendar/gui/gnome-cal.c:1556
 #, c-format
 msgid "Adding alarms for %s"
 msgstr "Даданьне нагадваньня для %s"
 
-#: calendar/gui/gnome-cal.c:1964
+#: calendar/gui/gnome-cal.c:1748
 #, c-format
 msgid ""
-"The task backend for\n"
+"The calendar backend for\n"
 "%s\n"
 " has crashed. You will have to restart Evolution in order to use it again"
 msgstr ""
-"Праграма задачаў\n"
+"Праграма календара для\n"
 "%s\n"
 "павалілася. Вы мусіце перазагрузіць \"Эвалюцыю\" і паспрабаваць яшчэ раз"
 
-#: calendar/gui/gnome-cal.c:1970
+#: calendar/gui/gnome-cal.c:1757
 #, c-format
 msgid ""
-"The calendar backend for\n"
+"The task backend for\n"
 "%s\n"
 " has crashed. You will have to restart Evolution in order to use it again"
 msgstr ""
-"Праграма календара для\n"
+"Праграма задачаў\n"
 "%s\n"
 "павалілася. Вы мусіце перазагрузіць \"Эвалюцыю\" і паспрабаваць яшчэ раз"
 
-#: calendar/gui/gnome-cal.c:2176
+#: calendar/gui/gnome-cal.c:1988
 #, c-format
 msgid "Opening calendar at %s"
 msgstr "Адкрыцьцё календара %s"
 
-#: calendar/gui/gnome-cal.c:2197
+#: calendar/gui/gnome-cal.c:2028
 msgid "Opening default tasks folder"
 msgstr "Адкрыцьцё тэчкі з дапомнымі задачамі"
 
-#: calendar/gui/gnome-cal.c:3094
-#, fuzzy, c-format
-msgid "Purging event %s"
-msgstr "Зандаваньне %s"
-
-#: calendar/gui/gnome-cal.c:3178
-#, fuzzy
-msgid "Purging"
-msgstr "Турэцкае"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-msgid "Calendar and Tasks"
-msgstr "Каляндар і заданьні"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-msgid "Configure your timezone, Calendar and Task List here "
-msgstr "Наладка вашае часавае зоны, каляндара і сьпісу задачаў"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
-msgid "Evolution Calendar and Tasks"
-msgstr "Каляндар і заданьні \"Эвалюцыі\""
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
-msgid "Evolution Calendar and Tasks component"
-msgstr "Кампанэнт каляндара і заданьняў \"Эвалюцыі\"."
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
-msgid "Evolution Calendar configuration control"
-msgstr "Сродак кіраваньня каляндаром \"Эвалюцыі\""
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
-msgid "Evolution Calendar scheduling message viewer"
-msgstr "Праглядальнік паведамленьня плянаваньня каляндара \"Эвалюцыі\""
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
-msgid "Evolution Calendar viewer"
-msgstr "Праглядальнік каляндара \"Эвалюцыі\""
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
-msgid "Evolution Calendar/Task editor"
-msgstr "Рэдактар каляндара/заданьня \"Эвалюцыі\""
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
-msgid "Evolution Tasks viewer"
-msgstr "Праглядальнік заданьняў \"Эвалюцыі\""
-
 #: calendar/gui/goto-dialog.glade.h:1
 msgid "April"
 msgstr "Красавік"
@@ -6329,7 +6274,7 @@ msgstr "Інфармацыя \"Вольны/Заняты\" (%s да %s)"
 msgid "iCalendar information"
 msgstr "Інфармацыя iCalendar"
 
-#: calendar/gui/itip-utils.c:668
+#: calendar/gui/itip-utils.c:667
 msgid "You must be an attendee of the event."
 msgstr "Вы мусіце быць удзельнікам падзеі"
 
@@ -6362,81 +6307,82 @@ msgid "Sa"
 msgstr "Сб"
 
 #. Day
-#: calendar/gui/print.c:1882
+#: calendar/gui/print.c:1875
 msgid "Selected day (%a %b %d %Y)"
 msgstr "Вылучаны дзень (%a %b %d %Y)"
 
-#: calendar/gui/print.c:1907 calendar/gui/print.c:1911
+#: calendar/gui/print.c:1900 calendar/gui/print.c:1904
 msgid "%a %b %d"
 msgstr "%a %b %d"
 
-#: calendar/gui/print.c:1908
+#: calendar/gui/print.c:1901
 msgid "%a %d %Y"
 msgstr "%a %d %Y"
 
-#: calendar/gui/print.c:1912 calendar/gui/print.c:1914
-#: calendar/gui/print.c:1915
+#: calendar/gui/print.c:1905 calendar/gui/print.c:1907
+#: calendar/gui/print.c:1908
 msgid "%a %b %d %Y"
 msgstr "%a %b %d %Y"
 
-#: calendar/gui/print.c:1919
+#: calendar/gui/print.c:1912
 #, c-format
 msgid "Selected week (%s - %s)"
 msgstr "Вылучаны тыдзень (%s - %s)"
 
 #. Month
-#: calendar/gui/print.c:1927
+#: calendar/gui/print.c:1920
 msgid "Selected month (%b %Y)"
 msgstr "Вылучаны месяц (%b %Y)"
 
 #. Year
-#: calendar/gui/print.c:1934
+#: calendar/gui/print.c:1927
 msgid "Selected year (%Y)"
 msgstr "Вылучаны год (%Y)"
 
-#: calendar/gui/print.c:2262
+#: calendar/gui/print.c:2255
 msgid "Task"
 msgstr "Заданьне"
 
-#: calendar/gui/print.c:2321
+#: calendar/gui/print.c:2314
 #, c-format
 msgid "Status: %s"
 msgstr "Стан: %s"
 
-#: calendar/gui/print.c:2338
+#: calendar/gui/print.c:2331
 #, c-format
 msgid "Priority: %s"
 msgstr "Прыярытэт: %s"
 
-#: calendar/gui/print.c:2350
+#: calendar/gui/print.c:2343
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "Адсоткі выкананьня: %i"
 
-#: calendar/gui/print.c:2362
+#: calendar/gui/print.c:2355
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: calendar/gui/print.c:2376
+#: calendar/gui/print.c:2369
 #, c-format
 msgid "Categories: %s"
 msgstr "Катэгорыі: %s"
 
-#: calendar/gui/print.c:2387
+#: calendar/gui/print.c:2380
 msgid "Contacts: "
 msgstr "Кантакты: "
 
-#: calendar/gui/print.c:2525 calendar/gui/print.c:2611
-#: calendar/gui/tasks-control.c:564 my-evolution/e-summary.c:649
+#: calendar/gui/print.c:2518 calendar/gui/print.c:2604
+#: calendar/gui/tasks-control.c:581 mail/mail-callbacks.c:2948
+#: my-evolution/e-summary.c:649
 msgid "Print Preview"
 msgstr "Перадпрагляд друку"
 
-#: calendar/gui/print.c:2559
+#: calendar/gui/print.c:2552
 msgid "Print Item"
 msgstr "Друк элемэнта"
 
-#: calendar/gui/print.c:2632
+#: calendar/gui/print.c:2625
 msgid "Print Setup"
 msgstr "Наладка друку"
 
@@ -6444,7 +6390,7 @@ msgstr "Наладка друку"
 msgid "The URI of the tasks folder to display"
 msgstr "URI, які будзе паказаны у тэчцы заданьняў"
 
-#: calendar/gui/tasks-control.c:448
+#: calendar/gui/tasks-control.c:465
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
 "continue, you will not be able to recover these tasks.\n"
@@ -6456,11 +6402,11 @@ msgstr ""
 "\n"
 "Выдаліць гэтыя заданьні?"
 
-#: calendar/gui/tasks-control.c:451
+#: calendar/gui/tasks-control.c:468
 msgid "Do not ask me again."
 msgstr "Не пытацца наступнага разу."
 
-#: calendar/gui/tasks-control.c:593
+#: calendar/gui/tasks-control.c:610
 msgid "Print Tasks"
 msgstr "Друк заданьняў"
 
@@ -8152,27 +8098,27 @@ msgstr "Ціхі акіян/Валі"
 msgid "Pacific/Yap"
 msgstr "Ціхі акіян/Яп"
 
-#: camel/camel-cipher-context.c:167
+#: camel/camel-cipher-context.c:178
 msgid "Signing is not supported by this cipher"
 msgstr "Подпіс не падтрымліваецца гэтым шыфрам"
 
-#: camel/camel-cipher-context.c:207
+#: camel/camel-cipher-context.c:218
 msgid "Verifying is not supported by this cipher"
 msgstr "Праверка не падтрымліваецца гэтым шыфрам"
 
-#: camel/camel-cipher-context.c:251
+#: camel/camel-cipher-context.c:262
 msgid "Encryption is not supported by this cipher"
 msgstr "Шыфраваньне не падтрымліваецца гэтым шыфрам"
 
-#: camel/camel-cipher-context.c:293
+#: camel/camel-cipher-context.c:304
 msgid "Decryption is not supported by this cipher"
 msgstr "Расшыфроўка не падтрымліваецца гэтым шыфрам"
 
-#: camel/camel-cipher-context.c:331
+#: camel/camel-cipher-context.c:342
 msgid "You may not import keys with this cipher"
 msgstr "Вы ня можаце імпартаваць ключы з гэтым шыфрам"
 
-#: camel/camel-cipher-context.c:363
+#: camel/camel-cipher-context.c:374
 msgid "You may not export keys with this cipher"
 msgstr "Вы ня можаце экспартаваць ключы з гэтым шыфрам"
 
@@ -8211,11 +8157,7 @@ msgstr ""
 msgid "Resynchronizing with server"
 msgstr "Перасынхранізацыя з паслужнікам"
 
-#: camel/camel-disco-folder.c:90
-msgid "Downloading new messages for offline mode"
-msgstr ""
-
-#: camel/camel-disco-folder.c:351
+#: camel/camel-disco-folder.c:278
 #, c-format
 msgid "Preparing folder '%s' for offline"
 msgstr "Падрыхтоўка тэчкі \"%s\" для аўтаномнае працы"
@@ -8236,57 +8178,57 @@ msgstr "Збой пад час стварэньня канала да \"%s\": %s
 msgid "Failed to create create child process '%s': %s"
 msgstr "Збой пад час стварэньня дачэрняга працэса '%s': %s"
 
-#: camel/camel-filter-driver.c:759
+#: camel/camel-filter-driver.c:744
 #, c-format
 msgid "Invalid message stream received from %s: %s"
 msgstr "Недапушчальная плыня паведамленьня атрымана ад %s: %s"
 
-#: camel/camel-filter-driver.c:940 camel/camel-filter-driver.c:949
+#: camel/camel-filter-driver.c:923 camel/camel-filter-driver.c:932
 msgid "Syncing folders"
 msgstr "Сынхранізацыя тэчак"
 
-#: camel/camel-filter-driver.c:1038 camel/camel-filter-driver.c:1411
+#: camel/camel-filter-driver.c:1021 camel/camel-filter-driver.c:1394
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Памылка аналізу фільтра: %s: %s"
 
-#: camel/camel-filter-driver.c:1047 camel/camel-filter-driver.c:1417
+#: camel/camel-filter-driver.c:1030 camel/camel-filter-driver.c:1400
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Памылка выкананьня фільтра: %s: %s"
 
-#: camel/camel-filter-driver.c:1114
+#: camel/camel-filter-driver.c:1097
 msgid "Unable to open spool folder"
 msgstr "Неатрымалася адкрыць тэчку спула"
 
-#: camel/camel-filter-driver.c:1123
+#: camel/camel-filter-driver.c:1106
 msgid "Unable to process spool folder"
 msgstr "Неатрымалася апрацаваць тэчку спула"
 
-#: camel/camel-filter-driver.c:1138
+#: camel/camel-filter-driver.c:1121
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "Атрыманьне паведамленьня %d (%d%%)"
 
-#: camel/camel-filter-driver.c:1142
+#: camel/camel-filter-driver.c:1125
 msgid "Cannot open message"
 msgstr "Немагчыма адкрыць паведамленьне"
 
-#: camel/camel-filter-driver.c:1143 camel/camel-filter-driver.c:1155
+#: camel/camel-filter-driver.c:1126 camel/camel-filter-driver.c:1138
 #, c-format
 msgid "Failed on message %d"
 msgstr "Збой на паведамленьні %d"
 
-#: camel/camel-filter-driver.c:1169 camel/camel-filter-driver.c:1263
+#: camel/camel-filter-driver.c:1152 camel/camel-filter-driver.c:1246
 msgid "Syncing folder"
 msgstr "Сынхранізацыя тэчкі"
 
-#: camel/camel-filter-driver.c:1230
+#: camel/camel-filter-driver.c:1213
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "Атрыманьне паведамленьня %d з %d"
 
-#: camel/camel-filter-driver.c:1245
+#: camel/camel-filter-driver.c:1228
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "Збой на паведамленьні %d з %d"
@@ -8308,36 +8250,7 @@ msgstr "Недапушчальныя аргумэнты для user-tag"
 msgid "Error executing filter search: %s: %s"
 msgstr "Памылка выкананьня пошуку фільтра: %s: %s"
 
-#: camel/camel-folder.c:585
-#, c-format
-msgid "Unsupported operation: append message: for %s"
-msgstr "Апэрацыя, якая не падтрымліваецца: даданьне паведамленьня: для %s"
-
-#: camel/camel-folder.c:1163
-#, c-format
-msgid "Unsupported operation: search by expression: for %s"
-msgstr "Апэрацыя не падтрымліваецца: пошук выраза: для %s"
-
-#: camel/camel-folder.c:1203
-#, c-format
-msgid "Unsupported operation: search by uids: for %s"
-msgstr ""
-"Апэрацыя не падтрымліваецца: пошук па ідэнтыфікатары карыстальніка: для %s"
-
-#: camel/camel-folder.c:1321
-msgid "Moving messages"
-msgstr "Перамяшчэньне паведамленьняў"
-
-#: camel/camel-folder.c:1321
-msgid "Copying messages"
-msgstr "Капіяваньне паведамленьняў"
-
-#: camel/camel-folder.c:1571
-#, fuzzy
-msgid "Filtering new message(s)"
-msgstr "Атрыманьне %d паведамленьняў"
-
-#: camel/camel-folder-search.c:348
+#: camel/camel-folder-search.c:346
 #, c-format
 msgid ""
 "Cannot parse search expression: %s:\n"
@@ -8346,7 +8259,7 @@ msgstr ""
 "Памылка ў сталым выразе \"%s\":\n"
 "%s"
 
-#: camel/camel-folder-search.c:358
+#: camel/camel-folder-search.c:356
 #, c-format
 msgid ""
 "Error executing search expression: %s:\n"
@@ -8355,15 +8268,39 @@ msgstr ""
 "Памылка пад час выкананьня выраза пошуку \"%s\":\n"
 "%s"
 
-#: camel/camel-folder-search.c:569 camel/camel-folder-search.c:598
+#: camel/camel-folder-search.c:573 camel/camel-folder-search.c:601
 msgid "(match-all) requires a single bool result"
 msgstr "(супадае ўсе) патрабуе адзінага лягічнага выніка"
 
-#: camel/camel-folder-search.c:650
+#: camel/camel-folder-search.c:653
 #, c-format
 msgid "Performing query on unknown header: %s"
 msgstr "Завяршэньне запыту на невядомым загалоўке: %s"
 
+#: camel/camel-folder.c:583
+#, c-format
+msgid "Unsupported operation: append message: for %s"
+msgstr "Апэрацыя, якая не падтрымліваецца: даданьне паведамленьня: для %s"
+
+#: camel/camel-folder.c:1161
+#, c-format
+msgid "Unsupported operation: search by expression: for %s"
+msgstr "Апэрацыя не падтрымліваецца: пошук выраза: для %s"
+
+#: camel/camel-folder.c:1201
+#, c-format
+msgid "Unsupported operation: search by uids: for %s"
+msgstr ""
+"Апэрацыя не падтрымліваецца: пошук па ідэнтыфікатары карыстальніка: для %s"
+
+#: camel/camel-folder.c:1319
+msgid "Moving messages"
+msgstr "Перамяшчэньне паведамленьняў"
+
+#: camel/camel-folder.c:1319
+msgid "Copying messages"
+msgstr "Капіяваньне паведамленьняў"
+
 #: camel/camel-gpg-context.c:762
 #, c-format
 msgid ""
@@ -8394,7 +8331,7 @@ msgstr ""
 
 #: camel/camel-gpg-context.c:821 camel/camel-gpg-context.c:1297
 #: camel/camel-gpg-context.c:1403 camel/camel-gpg-context.c:1473
-#: camel/camel-gpg-context.c:1529 mail/mail-send-recv.c:574
+#: camel/camel-gpg-context.c:1529 mail/mail-send-recv.c:577
 msgid "Cancelled."
 msgstr "Адменена."
 
@@ -8455,6 +8392,26 @@ msgstr ""
 "Неатрымалася праверыць подпіс паведамленьня: ня атрымалася стварыць часовы "
 "файл: %s"
 
+#: camel/camel-lock-client.c:111
+#, c-format
+msgid "Cannot build locking helper pipe: %s"
+msgstr "Неатрымалася стварыць канал для блякавальніка: %s"
+
+#: camel/camel-lock-client.c:124
+#, c-format
+msgid "Cannot fork locking helper: %s"
+msgstr "Неатрымліваецца запусьціць блякавальніка: %s"
+
+#: camel/camel-lock-client.c:202 camel/camel-lock-client.c:225
+#, c-format
+msgid "Could not lock '%s': protocol error with lock-helper"
+msgstr "Неатрымліваецца заблякаваць \"%s\": памылка пратакола з блякавальнікам"
+
+#: camel/camel-lock-client.c:215
+#, c-format
+msgid "Could not lock '%s'"
+msgstr "Неатрымалася заблякаваць \"%s\""
+
 #: camel/camel-lock.c:92 camel/camel-lock.c:113
 #, c-format
 msgid "Could not create lock file for %s: %s"
@@ -8477,26 +8434,6 @@ msgstr "Неатрымалася атрымаць lock карыстаючыся
 msgid "Failed to get lock using flock(2): %s"
 msgstr "Неатрымалася атрымаць lock карыстаючыся flock(2): %s"
 
-#: camel/camel-lock-client.c:100
-#, c-format
-msgid "Cannot build locking helper pipe: %s"
-msgstr "Неатрымалася стварыць канал для блякавальніка: %s"
-
-#: camel/camel-lock-client.c:113
-#, c-format
-msgid "Cannot fork locking helper: %s"
-msgstr "Неатрымліваецца запусьціць блякавальніка: %s"
-
-#: camel/camel-lock-client.c:191 camel/camel-lock-client.c:214
-#, c-format
-msgid "Could not lock '%s': protocol error with lock-helper"
-msgstr "Неатрымліваецца заблякаваць \"%s\": памылка пратакола з блякавальнікам"
-
-#: camel/camel-lock-client.c:204
-#, c-format
-msgid "Could not lock '%s'"
-msgstr "Неатрымалася заблякаваць \"%s\""
-
 #: camel/camel-movemail.c:107
 #, c-format
 msgid "Could not check mail file %s: %s"
@@ -8563,11 +8500,11 @@ msgstr "Збой пад час лэкадаваньня часткі MIME: не�
 msgid "Failed to decrypt MIME part: parse error"
 msgstr "Збой пад час дэкадаваньня часткі MIME: апрацоўка памылкі"
 
-#: camel/camel-multipart-signed.c:646
+#: camel/camel-multipart-signed.c:644
 msgid "This is a digitally signed message part"
 msgstr "Гэтая частка паведамленьня падпісана электроным подпісам"
 
-#: camel/camel-multipart-signed.c:700
+#: camel/camel-multipart-signed.c:698
 msgid "parse error"
 msgstr "памылка разбору"
 
@@ -8639,11 +8576,11 @@ msgstr ""
 "Далучэньне да паслужніка будзе адбывацца з выкарыстаньнем для аўтарызацыі "
 "пратакола CRAM-MD5, калі паслужнік яго падтрымлівае."
 
-#: camel/camel-sasl-digest-md5.c:48
+#: camel/camel-sasl-digest-md5.c:46
 msgid "DIGEST-MD5"
 msgstr "DIGEST-MD5"
 
-#: camel/camel-sasl-digest-md5.c:50
+#: camel/camel-sasl-digest-md5.c:48
 msgid ""
 "This option will connect to the server using a secure DIGEST-MD5 password, "
 "if the server supports it."
@@ -8740,7 +8677,7 @@ msgstr ""
 #: camel/camel-sasl-gssapi.c:189 camel/camel-sasl-gssapi.c:238
 #: camel/camel-sasl-gssapi.c:274 camel/camel-sasl-gssapi.c:289
 #: camel/camel-sasl-kerberos4.c:219
-#: camel/providers/imap/camel-imap-store.c:1207
+#: camel/providers/imap/camel-imap-store.c:1052
 msgid "Bad authentication response from server."
 msgstr "Кепскі адказ на аўтарызацыю з паслужніка."
 
@@ -8802,23 +8739,23 @@ msgstr ""
 msgid "PLAIN"
 msgstr "ЗВЫЧАЙНЫ ТЭКСТ"
 
-#: camel/camel-sasl-popb4smtp.c:36
+#: camel/camel-sasl-popb4smtp.c:34
 msgid "POP before SMTP"
 msgstr "POP перад SMTP"
 
-#: camel/camel-sasl-popb4smtp.c:38
+#: camel/camel-sasl-popb4smtp.c:36
 msgid "This option will authorise a POP connection before attempting SMTP"
 msgstr "Будзе адбывацца аўтарызацыя POP да спробы перадачы пошты па SMTP"
 
-#: camel/camel-sasl-popb4smtp.c:103
+#: camel/camel-sasl-popb4smtp.c:107
 msgid "POP Source URI"
 msgstr "URI крыніцы POP"
 
-#: camel/camel-sasl-popb4smtp.c:107
+#: camel/camel-sasl-popb4smtp.c:111
 msgid "POP Before SMTP auth using an unknown transport"
 msgstr "POP да SMTP аўтарызацыя, карыстаючыся невядомым транспартам"
 
-#: camel/camel-sasl-popb4smtp.c:112
+#: camel/camel-sasl-popb4smtp.c:116
 msgid "POP Before SMTP auth using a non-pop source"
 msgstr "POP да SMTP аўтарызацыя, карыстаючыся не POP крыніцай"
 
@@ -8827,55 +8764,55 @@ msgstr "POP да SMTP аўтарызацыя, карыстаючыся не POP
 msgid "Regular expression compilation failed: %s: %s"
 msgstr "Збой кампіляцыі сталага выразу: %s: %s"
 
-#: camel/camel-service.c:277
+#: camel/camel-service.c:282
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr "URL \"%s\" патрабуе кампанэнт імя карыстальніка"
 
-#: camel/camel-service.c:285
+#: camel/camel-service.c:290
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr "URL \\\"%s\\\" патрабуе кампанэнт вузла"
 
-#: camel/camel-service.c:293
+#: camel/camel-service.c:298
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr "URL \\\"%s\\\" патрабуе кампанэнт шляху"
 
-#: camel/camel-service.c:738
+#: camel/camel-service.c:750
 #, c-format
 msgid "Resolving: %s"
 msgstr "Вызначэньне: %s"
 
-#: camel/camel-service.c:769 camel/camel-service.c:893
+#: camel/camel-service.c:783 camel/camel-service.c:915
 #, c-format
 msgid "Failure in name lookup: %s"
 msgstr "Памылка ў вызначэньні назвы: %s"
 
-#: camel/camel-service.c:790 camel/camel-service.c:914
+#: camel/camel-service.c:804
 #, fuzzy, c-format
 msgid "Host lookup failed: cannot create thread: %s"
 msgstr "Вызначэньня адрэсы вузла не адбылося: прычына невядома"
 
-#: camel/camel-service.c:803
+#: camel/camel-service.c:818
 #, c-format
 msgid "Host lookup failed: %s: host not found"
 msgstr "Вызначэньня адрэсы вузла не адбылося:  %s:  вузел адсутнічае"
 
-#: camel/camel-service.c:806
+#: camel/camel-service.c:821
 #, c-format
 msgid "Host lookup failed: %s: unknown reason"
 msgstr "Вызначэньня адрэсы вузла не адбылося: %s: прычына невядома"
 
-#: camel/camel-service.c:860
+#: camel/camel-service.c:880
 msgid "Resolving address"
 msgstr "Вызначэньне адрэсы"
 
-#: camel/camel-service.c:929
+#: camel/camel-service.c:949
 msgid "Host lookup failed: host not found"
 msgstr "Вызначэньня адрэсы вузла не адбылося: адсутнічае вузел"
 
-#: camel/camel-service.c:932
+#: camel/camel-service.c:952
 msgid "Host lookup failed: unknown reason"
 msgstr "Вызначэньня адрэсы вузла не адбылося: прычына невядома"
 
@@ -8887,12 +8824,12 @@ msgstr "Правайдэр віртуальных тэчак электрона�
 msgid "For reading mail as a query of another set of folders"
 msgstr "Для чытаньня пошты па запыце да іншага збору тэчак"
 
-#: camel/camel-session.c:350 camel/camel-session.c:400
+#: camel/camel-session.c:355 camel/camel-session.c:405
 #, c-format
 msgid "No provider available for protocol `%s'"
 msgstr "Правайдэр для пратакола \"%s\" недаступны"
 
-#: camel/camel-session.c:523
+#: camel/camel-session.c:528
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -8939,131 +8876,131 @@ msgstr "Неатрымалася дэкадаваць паведамленьне
 msgid "Failed to verify certificates."
 msgstr "Неатрымалася праверыць сэртыфікаты."
 
-#: camel/camel-store.c:212
+#: camel/camel-store.c:215
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr "Неатрымалася атрымаць тэчку: недапушчальная апэрацыя ў гэтым сховішчы"
 
-#: camel/camel-store.c:266
+#: camel/camel-store.c:269
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "Неатрымалася стварыць тэчку: недапушчальная апэрацыя ў гэтым сховішчы"
 
-#: camel/camel-tcp-stream-openssl.c:568
+#: camel/camel-tcp-stream-openssl.c:571
 msgid "Unable to get issuer's certificate"
 msgstr "Немагчыма атрымаць сэртыфікат выдаўца"
 
-#: camel/camel-tcp-stream-openssl.c:570
+#: camel/camel-tcp-stream-openssl.c:573
 msgid "Unable to get Certificate Revocation List"
 msgstr "Неатрымліваецца атрымаць сьпіс ануляваных сэртыфікатаў"
 
-#: camel/camel-tcp-stream-openssl.c:572
+#: camel/camel-tcp-stream-openssl.c:575
 msgid "Unable to decrypt certificate signature"
 msgstr "Немагчыма дэкадаваць подпіс сэртыфіката"
 
-#: camel/camel-tcp-stream-openssl.c:574
+#: camel/camel-tcp-stream-openssl.c:577
 msgid "Unable to decrypt Certificate Revocation List signature"
 msgstr "Неатрымліваецца дэкадаваць подпіс сьпісу ануляваных сэртыфікатаў"
 
-#: camel/camel-tcp-stream-openssl.c:576
+#: camel/camel-tcp-stream-openssl.c:579
 msgid "Unable to decode issuer's public key"
 msgstr "Немагчыма дэкадаваць публічны ключ выдаўца"
 
-#: camel/camel-tcp-stream-openssl.c:578
+#: camel/camel-tcp-stream-openssl.c:581
 msgid "Certificate signature failure"
 msgstr "Подпіс сэртыфіката памылковы"
 
-#: camel/camel-tcp-stream-openssl.c:580
+#: camel/camel-tcp-stream-openssl.c:583
 msgid "Certificate Revocation List signature failure"
 msgstr "Памылка у подпісе сьпіса ануляваных сэртыфікатаў"
 
-#: camel/camel-tcp-stream-openssl.c:582
+#: camel/camel-tcp-stream-openssl.c:585
 msgid "Certificate not yet valid"
 msgstr "Сэртыфікат яшчэ не зацьверджаны"
 
-#: camel/camel-tcp-stream-openssl.c:584
+#: camel/camel-tcp-stream-openssl.c:587
 msgid "Certificate has expired"
 msgstr "Сэртыфікат ня мае сілы"
 
-#: camel/camel-tcp-stream-openssl.c:586
+#: camel/camel-tcp-stream-openssl.c:589
 msgid "CRL not yet valid"
 msgstr "CRL яшчэ не зацьверджаны"
 
-#: camel/camel-tcp-stream-openssl.c:588
+#: camel/camel-tcp-stream-openssl.c:591
 msgid "CRL has expired"
 msgstr "CRL згубіў сілу"
 
-#: camel/camel-tcp-stream-openssl.c:593
+#: camel/camel-tcp-stream-openssl.c:596
 msgid "Error in CRL"
 msgstr "Памылка у CRL"
 
-#: camel/camel-tcp-stream-openssl.c:595
+#: camel/camel-tcp-stream-openssl.c:598
 msgid "Out of memory"
 msgstr "Не хапае памяці"
 
-#: camel/camel-tcp-stream-openssl.c:597
+#: camel/camel-tcp-stream-openssl.c:600
 msgid "Zero-depth self-signed certificate"
 msgstr "Самападпісаны сэртыфікат нулявой глыбіні"
 
-#: camel/camel-tcp-stream-openssl.c:599
+#: camel/camel-tcp-stream-openssl.c:602
 msgid "Self-signed certificate in chain"
 msgstr "Самападпісаны сэртыфікат у ланцужку"
 
-#: camel/camel-tcp-stream-openssl.c:601
+#: camel/camel-tcp-stream-openssl.c:604
 msgid "Unable to get issuer's certificate locally"
 msgstr "Немагчыма атрымаць сэртыфікат выдаўца ў адлучаным стане"
 
-#: camel/camel-tcp-stream-openssl.c:603
+#: camel/camel-tcp-stream-openssl.c:606
 msgid "Unable to verify leaf signature"
 msgstr "Немагчыма праверыць подпіс"
 
-#: camel/camel-tcp-stream-openssl.c:605
+#: camel/camel-tcp-stream-openssl.c:608
 msgid "Certificate chain too long"
 msgstr "Ланцужок сэртыфіката завялікі"
 
-#: camel/camel-tcp-stream-openssl.c:607
+#: camel/camel-tcp-stream-openssl.c:610
 msgid "Certificate Revoked"
 msgstr "Сэртыфікат ануляваны"
 
-#: camel/camel-tcp-stream-openssl.c:609
+#: camel/camel-tcp-stream-openssl.c:612
 msgid "Invalid Certificate Authority (CA)"
 msgstr "Некарэктная аўтарызацыя сэртыфіката (CA)"
 
-#: camel/camel-tcp-stream-openssl.c:611
+#: camel/camel-tcp-stream-openssl.c:614
 msgid "Path length exceeded"
 msgstr "Перавышана даўжыня шляху"
 
-#: camel/camel-tcp-stream-openssl.c:613
+#: camel/camel-tcp-stream-openssl.c:616
 msgid "Invalid purpose"
 msgstr "Памылковая мэта"
 
-#: camel/camel-tcp-stream-openssl.c:615
+#: camel/camel-tcp-stream-openssl.c:618
 msgid "Certificate untrusted"
 msgstr "Сэртыфікат ненадзейны"
 
-#: camel/camel-tcp-stream-openssl.c:617
+#: camel/camel-tcp-stream-openssl.c:620
 msgid "Certificate rejected"
 msgstr "Сэртыфікат адвергнуты"
 
-#: camel/camel-tcp-stream-openssl.c:620
+#: camel/camel-tcp-stream-openssl.c:623
 msgid "Subject/Issuer mismatch"
 msgstr "Несупадзеньне Тэма/Выдавец"
 
-#: camel/camel-tcp-stream-openssl.c:622
+#: camel/camel-tcp-stream-openssl.c:625
 msgid "AKID/SKID mismatch"
 msgstr "Несупадзеньне AKID/SKID"
 
-#: camel/camel-tcp-stream-openssl.c:624
+#: camel/camel-tcp-stream-openssl.c:627
 msgid "AKID/Issuer serial mismatch"
 msgstr "Пасьлядоўнае несупадзеньне AKID/Выдавец"
 
-#: camel/camel-tcp-stream-openssl.c:626
+#: camel/camel-tcp-stream-openssl.c:629
 msgid "Key usage does not support certificate signing"
 msgstr "Выкарыстаньне ключа не падтрымлівае подпіс сэртыфіката"
 
-#: camel/camel-tcp-stream-openssl.c:629
+#: camel/camel-tcp-stream-openssl.c:632
 msgid "Error in application verification"
 msgstr "Памылка ў дастасаваньні праверкі сапраўднасьці"
 
-#: camel/camel-tcp-stream-openssl.c:696 camel/camel-tcp-stream-ssl.c:831
+#: camel/camel-tcp-stream-openssl.c:699 camel/camel-tcp-stream-ssl.c:823
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -9076,15 +9013,15 @@ msgstr ""
 "Адбітак пальца:       %s\n"
 "Подпіс:         %s"
 
-#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:837
+#: camel/camel-tcp-stream-openssl.c:705 camel/camel-tcp-stream-ssl.c:829
 msgid "GOOD"
 msgstr "ДОБРА"
 
-#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:837
+#: camel/camel-tcp-stream-openssl.c:705 camel/camel-tcp-stream-ssl.c:829
 msgid "BAD"
 msgstr "КЕПСКА"
 
-#: camel/camel-tcp-stream-openssl.c:704
+#: camel/camel-tcp-stream-openssl.c:707
 #, c-format
 msgid ""
 "Bad certificate from %s:\n"
@@ -9104,7 +9041,7 @@ msgstr ""
 "Усёроўна жадаеце прыняць ?"
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:841
+#: camel/camel-tcp-stream-ssl.c:833
 #, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -9119,7 +9056,7 @@ msgstr ""
 "\n"
 "Жадаеце прыняць?"
 
-#: camel/camel-tcp-stream-ssl.c:885
+#: camel/camel-tcp-stream-ssl.c:877
 #, c-format
 msgid ""
 "Certificate problem: %s\n"
@@ -9128,7 +9065,7 @@ msgstr ""
 "Праблема з сэртыфікатам: %s\n"
 "Выдавец: %s"
 
-#: camel/camel-tcp-stream-ssl.c:937
+#: camel/camel-tcp-stream-ssl.c:929
 #, c-format
 msgid ""
 "Bad certificate domain: %s\n"
@@ -9137,7 +9074,7 @@ msgstr ""
 "Дрэнны дамэн сэртыфікату: %s\n"
 "Выдавец: %s"
 
-#: camel/camel-tcp-stream-ssl.c:955
+#: camel/camel-tcp-stream-ssl.c:947
 #, c-format
 msgid ""
 "Certificate expired: %s\n"
@@ -9146,7 +9083,7 @@ msgstr ""
 "Сэртыфікат састарэў: %s\n"
 "Выдавец: %s"
 
-#: camel/camel-tcp-stream-ssl.c:972
+#: camel/camel-tcp-stream-ssl.c:964
 #, c-format
 msgid ""
 "Certificate revocation list expired: %s\n"
@@ -9160,17 +9097,17 @@ msgstr ""
 msgid "Could not parse URL `%s'"
 msgstr "Немагчыма разабраць URL \"%s\""
 
-#: camel/camel-vee-folder.c:611
+#: camel/camel-vee-folder.c:618
 #, c-format
 msgid "Error storing `%s': %s"
 msgstr "Памылка захаваньня `%s': %s"
 
-#: camel/camel-vee-folder.c:649
+#: camel/camel-vee-folder.c:656
 #, c-format
 msgid "No such message %s in %s"
 msgstr "Паведамленьне %s адсутнічае ў %s"
 
-#: camel/camel-vee-folder.c:812 camel/camel-vee-folder.c:818
+#: camel/camel-vee-folder.c:819 camel/camel-vee-folder.c:825
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr "Немагчыма капіяваць ці перамясьціць паведамленьні у віртуальную тэчку"
 
@@ -9197,12 +9134,12 @@ msgstr "Неатрымалася зьмяніць назву тэчкі: %s: т�
 #: camel/providers/imap/camel-imap-command.c:221
 #: camel/providers/imap/camel-imap-command.c:260
 #: camel/providers/imap/camel-imap-command.c:450
-#: camel/providers/imap/camel-imap-store.c:2806
+#: camel/providers/imap/camel-imap-store.c:2644
 msgid "Operation cancelled"
 msgstr "Дзеяньне адмененае"
 
 #: camel/providers/imap/camel-imap-command.c:305
-#: camel/providers/imap/camel-imap-store.c:2809
+#: camel/providers/imap/camel-imap-store.c:2647
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "Паслужнік нечакана адключыўся: %s"
@@ -9241,38 +9178,38 @@ msgstr "Адказ IMAP паслужніка ня ўтрымлівае інфа�
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "Нечаканы адказ \"Добра\" ад IMAP паслужніка: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:223
+#: camel/providers/imap/camel-imap-folder.c:222
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "Немагчыма стварыць каталёг %s: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:242
+#: camel/providers/imap/camel-imap-folder.c:241
 #, c-format
 msgid "Could not load summary for %s"
 msgstr "Немагчыма загрузіць агульныя зьвесткі для %s"
 
-#: camel/providers/imap/camel-imap-folder.c:308
+#: camel/providers/imap/camel-imap-folder.c:307
 msgid "Folder was destroyed and recreated on server."
 msgstr "Тэчка была зьнішчана і нанава створана на паслужніку."
 
 #. Check UIDs and flags of all messages we already know of.
-#: camel/providers/imap/camel-imap-folder.c:550
+#: camel/providers/imap/camel-imap-folder.c:549
 msgid "Scanning for changed messages"
 msgstr "Сканаваньне зьмененых паведамленьняў"
 
-#: camel/providers/imap/camel-imap-folder.c:1886
+#: camel/providers/imap/camel-imap-folder.c:1883
 #, c-format
 msgid "Unable to retrieve message: %s"
 msgstr "Немагчыма арымаць паведамленьне: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:1923
-#: camel/providers/local/camel-maildir-folder.c:211
-#: camel/providers/local/camel-maildir-folder.c:224
-#: camel/providers/local/camel-maildir-folder.c:233
-#: camel/providers/local/camel-mbox-folder.c:422
-#: camel/providers/local/camel-mh-folder.c:200
-#: camel/providers/local/camel-mh-folder.c:210
-#: camel/providers/local/camel-mh-folder.c:219
+#: camel/providers/imap/camel-imap-folder.c:1920
+#: camel/providers/local/camel-maildir-folder.c:212
+#: camel/providers/local/camel-maildir-folder.c:225
+#: camel/providers/local/camel-maildir-folder.c:234
+#: camel/providers/local/camel-mbox-folder.c:351
+#: camel/providers/local/camel-mh-folder.c:201
+#: camel/providers/local/camel-mh-folder.c:211
+#: camel/providers/local/camel-mh-folder.c:220
 #, c-format
 msgid ""
 "Cannot get message: %s\n"
@@ -9281,24 +9218,24 @@ msgstr ""
 "Немагчыма атрымаць паведамленьне: %s\n"
 "  %s"
 
-#: camel/providers/imap/camel-imap-folder.c:1923
-#: camel/providers/local/camel-maildir-folder.c:211
-#: camel/providers/local/camel-mbox-folder.c:422
-#: camel/providers/local/camel-mh-folder.c:200
+#: camel/providers/imap/camel-imap-folder.c:1920
+#: camel/providers/local/camel-maildir-folder.c:212
+#: camel/providers/local/camel-mbox-folder.c:351
+#: camel/providers/local/camel-mh-folder.c:201
 msgid "No such message"
 msgstr "Няма гэткага паведамленьня"
 
-#: camel/providers/imap/camel-imap-folder.c:1946
-#: camel/providers/imap/camel-imap-folder.c:2542
+#: camel/providers/imap/camel-imap-folder.c:1943
+#: camel/providers/imap/camel-imap-folder.c:2539
 msgid "This message is not currently available"
 msgstr "Гэтае паведамленьне ў бягучы момант недаступна"
 
-#: camel/providers/imap/camel-imap-folder.c:2206
-#: camel/providers/imap/camel-imap-folder.c:2276
+#: camel/providers/imap/camel-imap-folder.c:2203
+#: camel/providers/imap/camel-imap-folder.c:2273
 msgid "Fetching summary information for new messages"
 msgstr "Атрыманьне агульнае інфармацыі для новых паведамленьняў"
 
-#: camel/providers/imap/camel-imap-folder.c:2580
+#: camel/providers/imap/camel-imap-folder.c:2577
 msgid "Could not find message body in FETCH response."
 msgstr "Немагчыма адшукаць цела паведамленьня ў адказе FETCH."
 
@@ -9350,103 +9287,87 @@ msgstr ""
 "Ужыць фільтры да усіх новых паведамленьняў у тэчцы \"Атрыманыя\" (INBOX) на "
 "гэтым паслужніку"
 
-#: camel/providers/imap/camel-imap-provider.c:59
-#, fuzzy
-msgid "Automatically synchronize remote mail locally"
-msgstr "Аўтаматычна правяраць пошту кожныя"
-
-#: camel/providers/imap/camel-imap-provider.c:65
+#: camel/providers/imap/camel-imap-provider.c:63
 msgid "IMAP"
 msgstr "IMAP"
 
-#: camel/providers/imap/camel-imap-provider.c:67
+#: camel/providers/imap/camel-imap-provider.c:65
 msgid "For reading and storing mail on IMAP servers."
 msgstr "Для чытаньня і захаваньня пошты на паслужніках IMAP."
 
-#: camel/providers/imap/camel-imap-provider.c:82
-#: camel/providers/imapp/camel-imapp-provider.c:65
-#: camel/providers/nntp/camel-nntp-store.c:265
+#: camel/providers/imap/camel-imap-provider.c:80
+#: camel/providers/nntp/camel-nntp-store.c:267
 #: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:83
 msgid "Password"
 msgstr "Пароль"
 
-#: camel/providers/imap/camel-imap-provider.c:84
-#: camel/providers/imapp/camel-imapp-provider.c:67
+#: camel/providers/imap/camel-imap-provider.c:82
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
 "Далучэньне да IMAP паслужніка будзе адбывацца з выкарыстаньнем "
 "незашыфраванага пароля."
 
-#: camel/providers/imap/camel-imap-store.c:459
+#: camel/providers/imap/camel-imap-store.c:457
 #, c-format
 msgid "IMAP server %s"
 msgstr "Паслужнік IMAP %s"
 
-#: camel/providers/imap/camel-imap-store.c:461
+#: camel/providers/imap/camel-imap-store.c:459
 #, c-format
 msgid "IMAP service for %s on %s"
 msgstr "паслуга IMAP для %s на %s"
 
-#: camel/providers/imap/camel-imap-store.c:589
-#: camel/providers/imap/camel-imap-store.c:821
-#: camel/providers/imapp/camel-imapp-store.c:233
-#: camel/providers/nntp/camel-nntp-store.c:128
-#: camel/providers/nntp/camel-nntp-store.c:146
+#: camel/providers/imap/camel-imap-store.c:587
+#: camel/providers/nntp/camel-nntp-store.c:130
+#: camel/providers/nntp/camel-nntp-store.c:148
 #: camel/providers/pop3/camel-pop3-store.c:184
 msgid "Connection cancelled"
 msgstr "Далучэньне адмененае"
 
-#: camel/providers/imap/camel-imap-store.c:592
-#: camel/providers/imapp/camel-imapp-store.c:236
-#: camel/providers/nntp/camel-nntp-store.c:131
-#: camel/providers/smtp/camel-smtp-transport.c:275
+#: camel/providers/imap/camel-imap-store.c:590
+#: camel/providers/nntp/camel-nntp-store.c:133
+#: camel/providers/smtp/camel-smtp-transport.c:276
 #, c-format
 msgid "Could not connect to %s (port %d): %s"
 msgstr "Немагчыма далучыцца да %s (порт %d): %s"
 
-#: camel/providers/imap/camel-imap-store.c:655
-#: camel/providers/imap/camel-imap-store.c:686
+#: camel/providers/imap/camel-imap-store.c:649
+#: camel/providers/imap/camel-imap-store.c:680
 #, c-format
 msgid "Failed to connect to IMAP server %s in secure mode: %s"
 msgstr "Збой далучэньня да паслужніка IMAP %s у рэжыме бясьпекі: %s"
 
-#: camel/providers/imap/camel-imap-store.c:656
+#: camel/providers/imap/camel-imap-store.c:650
 #: camel/providers/pop3/camel-pop3-store.c:220
 msgid "SSL/TLS extension not supported."
 msgstr "Пашырэньне SSL/TLS не падтрымліваецца."
 
-#: camel/providers/imap/camel-imap-store.c:687
+#: camel/providers/imap/camel-imap-store.c:681
 #: camel/providers/pop3/camel-pop3-store.c:261
 msgid "SSL negotiations failed"
 msgstr "Збой узгадненьня SSL"
 
-#: camel/providers/imap/camel-imap-store.c:824
-#, fuzzy, c-format
-msgid "Could not connect with command \"%s\": %s"
-msgstr "Немагчыма далучыцца да %s (порт %d): %s"
-
-#: camel/providers/imap/camel-imap-store.c:1237
+#: camel/providers/imap/camel-imap-store.c:1075
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr "Паслужнік IMAP %s не падтрымлівае запатрабаваны тып ідэнтыфікацыі %s"
 
-#: camel/providers/imap/camel-imap-store.c:1247
-#: camel/providers/smtp/camel-smtp-transport.c:485
+#: camel/providers/imap/camel-imap-store.c:1085
+#: camel/providers/smtp/camel-smtp-transport.c:486
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "Ідэнтыфікацыя тыпа %s не падтрымліваецца"
 
-#: camel/providers/imap/camel-imap-store.c:1270
-#: camel/providers/imapp/camel-imapp-store.c:349
+#: camel/providers/imap/camel-imap-store.c:1108
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr "%sКалі ласка, увядзіце пароль IMAP для %s@%s"
 
-#: camel/providers/imap/camel-imap-store.c:1284
+#: camel/providers/imap/camel-imap-store.c:1122
 msgid "You didn't enter a password."
 msgstr "Вы не пазначылі пароль."
 
-#: camel/providers/imap/camel-imap-store.c:1313
+#: camel/providers/imap/camel-imap-store.c:1151
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -9457,70 +9378,42 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:1660
-#: camel/providers/imap/camel-imap-store.c:1802
+#: camel/providers/imap/camel-imap-store.c:1498
+#: camel/providers/imap/camel-imap-store.c:1640
 #, c-format
 msgid "No such folder %s"
 msgstr "Тэчка %s адсутнічае "
 
-#: camel/providers/imap/camel-imap-store.c:2003
+#: camel/providers/imap/camel-imap-store.c:1841
 #, c-format
 msgid ""
 "The folder name \"%s\" is invalid because it containes the character \"%c\""
 msgstr "Назва тэчкі \"%s\" памылковая, таму што утрымлівае сымбаль \"%c\""
 
-#: camel/providers/imap/camel-imap-store.c:2015
+#: camel/providers/imap/camel-imap-store.c:1853
 #, c-format
 msgid "Unknown parent folder: %s"
 msgstr "Невядомая бацькоўская тэчка: %s"
 
-#: camel/providers/imap/camel-imap-store.c:2051
+#: camel/providers/imap/camel-imap-store.c:1889
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "Гэтая тэчка ня можа утрымліваць падтэчкі"
 
-#: camel/providers/imapp/camel-imapp-provider.c:39
-#: camel/providers/pop3/camel-pop3-provider.c:38
-msgid "Message storage"
-msgstr "Сховішча паведамленьняў"
-
-#: camel/providers/imapp/camel-imapp-provider.c:47
-#, fuzzy
-msgid "IMAP+"
-msgstr "IMAP"
-
-#: camel/providers/imapp/camel-imapp-provider.c:49
-msgid ""
-"Experimental IMAP 4(.1) client\n"
-"This is untested and unsupported code, you want to use plain imap instead.\n"
-"\n"
-" !!! DO NOT USE THIS FOR PRODUCTION EMAIL  !!!\n"
-msgstr ""
-
-#: camel/providers/imapp/camel-imapp-store.c:333
-#, fuzzy, c-format
-msgid "Could not connect to POP server on %s"
-msgstr "Немагчыма далучыцца да паслужніка POP %s"
-
-#: camel/providers/local/camel-local-folder.c:179
-#, fuzzy
-msgid "Index message body data"
-msgstr "Даслаць паведамленьне кантактанае асобе"
-
 #. $HOME relative path + protocol string
-#: camel/providers/local/camel-local-folder.c:379
+#: camel/providers/local/camel-local-folder.c:354
 #, c-format
 msgid "~%s (%s)"
 msgstr "~%s (%s)"
 
 #. /var/spool/mail relative path + protocol
-#: camel/providers/local/camel-local-folder.c:383
-#: camel/providers/local/camel-local-folder.c:386
+#: camel/providers/local/camel-local-folder.c:358
+#: camel/providers/local/camel-local-folder.c:361
 #, c-format
 msgid "mailbox:%s (%s)"
 msgstr "паштовая скрыня:%s (%s)"
 
 #. a full path + protocol
-#: camel/providers/local/camel-local-folder.c:390
+#: camel/providers/local/camel-local-folder.c:365
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
@@ -9574,54 +9467,50 @@ msgid ""
 "May also be used to read a tree of Elm, Pine, or Mutt style folders."
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:138
-#: camel/providers/local/camel-local-store.c:227
-#: camel/providers/local/camel-mbox-store.c:305
+#: camel/providers/local/camel-local-store.c:139
+#: camel/providers/local/camel-local-store.c:228
 #: camel/providers/local/camel-spool-store.c:116
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr "Адносны шлях да сховішча %s"
 
-#: camel/providers/local/camel-local-store.c:145
+#: camel/providers/local/camel-local-store.c:146
 #, c-format
 msgid "Store root %s is not a regular directory"
 msgstr "Сховішча %s не зьяўляецца каталёгам"
 
-#: camel/providers/local/camel-local-store.c:154
-#: camel/providers/local/camel-local-store.c:170
-#: camel/providers/local/camel-local-store.c:238
+#: camel/providers/local/camel-local-store.c:155
+#: camel/providers/local/camel-local-store.c:171
+#: camel/providers/local/camel-local-store.c:239
 #, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr "Неатрымалася атрымаць тэчку: %s: %s"
 
-#: camel/providers/local/camel-local-store.c:186
+#: camel/providers/local/camel-local-store.c:187
 msgid "Local stores do not have an inbox"
 msgstr "Лакальнае сховішча ня мае тэчкі \"Атрыманае\""
 
-#: camel/providers/local/camel-local-store.c:198
+#: camel/providers/local/camel-local-store.c:199
 #, c-format
 msgid "Local mail file %s"
 msgstr "Лакальны файл пошты %s"
 
-#: camel/providers/local/camel-local-store.c:307 mail/mail-local.c:949
+#: camel/providers/local/camel-local-store.c:308 mail/mail-local.c:909
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr "Неатрымалася зьмяніць назву тэчкі %s у %s: %s"
 
-#: camel/providers/local/camel-local-store.c:364
-#: camel/providers/local/camel-mbox-store.c:474
+#: camel/providers/local/camel-local-store.c:365
 #, c-format
 msgid "Could not rename '%s': %s"
 msgstr "Немагчыма зьмяніць назву '%s': %s"
 
-#: camel/providers/local/camel-local-store.c:387
-#: camel/providers/local/camel-mbox-store.c:258
+#: camel/providers/local/camel-local-store.c:388
 #, c-format
 msgid "Could not delete folder summary file `%s': %s"
 msgstr "Неатрымалася выдаліць выніковы файл тэчкі \"%s\": %s"
 
-#: camel/providers/local/camel-local-store.c:397
-#: camel/providers/local/camel-mbox-store.c:270
+#: camel/providers/local/camel-local-store.c:398
 #, c-format
 msgid "Could not delete folder index file `%s': %s"
 msgstr "Неатрымалася выдаліць індэксны файл тэчкі \"%s\": %s"
@@ -9635,17 +9524,17 @@ msgstr "Немагчыма захаваць вынік: %s: %s"
 msgid "Unable to add message to summary: unknown reason"
 msgstr "Неатрымалася дадаць паведамленьне да выніку: прычына невядома"
 
-#: camel/providers/local/camel-maildir-folder.c:183
+#: camel/providers/local/camel-maildir-folder.c:184
 msgid "Maildir append message cancelled"
 msgstr "Даданьне паведамленьня да тэчкі паштовага каталёга адменена"
 
-#: camel/providers/local/camel-maildir-folder.c:186
+#: camel/providers/local/camel-maildir-folder.c:187
 #, c-format
 msgid "Cannot append message to maildir folder: %s: %s"
 msgstr "Немагчыма дадаць паведамленьне да тэчкі паштовага каталёга: %s: %s"
 
-#: camel/providers/local/camel-maildir-folder.c:234
-#: camel/providers/local/camel-mh-folder.c:220
+#: camel/providers/local/camel-maildir-folder.c:235
+#: camel/providers/local/camel-mh-folder.c:221
 msgid "Invalid message contents"
 msgstr "Нерэчаісны зьмест паведамленьня"
 
@@ -9661,7 +9550,7 @@ msgstr ""
 "%s"
 
 #: camel/providers/local/camel-maildir-store.c:110
-#: camel/providers/local/camel-mbox-store.c:157
+#: camel/providers/local/camel-mbox-store.c:101
 #: camel/providers/local/camel-mh-store.c:209
 #: camel/providers/local/camel-spool-store.c:167
 #, c-format
@@ -9726,29 +9615,29 @@ msgstr "Праверыць наяўнасьць новых паведамлен�
 msgid "Storing folder"
 msgstr "Захаваньне тэчкі"
 
-#: camel/providers/local/camel-mbox-folder.c:230
-#: camel/providers/local/camel-spool-folder.c:148
+#: camel/providers/local/camel-mbox-folder.c:159
+#: camel/providers/local/camel-spool-folder.c:149
 #, c-format
 msgid "Cannot create folder lock on %s: %s"
 msgstr "Не атрымліваецца заблякаваць тэчку %s: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:289
+#: camel/providers/local/camel-mbox-folder.c:218
 #, c-format
 msgid "Cannot open mailbox: %s: %s\n"
 msgstr "Неатрымалася адкрыць паштовую скрыню: %s: %s\n"
 
-#: camel/providers/local/camel-mbox-folder.c:349
+#: camel/providers/local/camel-mbox-folder.c:278
 msgid "Mail append cancelled"
 msgstr "Даданьне пошты адменена"
 
-#: camel/providers/local/camel-mbox-folder.c:352
+#: camel/providers/local/camel-mbox-folder.c:281
 #, c-format
 msgid "Cannot append message to mbox file: %s: %s"
 msgstr "Немагчыма далучыць паведамленьне да файла mbox: %s: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:440
-#: camel/providers/local/camel-mbox-folder.c:471
-#: camel/providers/local/camel-mbox-folder.c:479
+#: camel/providers/local/camel-mbox-folder.c:369
+#: camel/providers/local/camel-mbox-folder.c:400
+#: camel/providers/local/camel-mbox-folder.c:408
 #, c-format
 msgid ""
 "Cannot get message: %s from folder %s\n"
@@ -9757,15 +9646,15 @@ msgstr ""
 "Немагчыма атрымаць паведамленьне: %s з тэчкі %s\n"
 "  %s"
 
-#: camel/providers/local/camel-mbox-folder.c:472
+#: camel/providers/local/camel-mbox-folder.c:401
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr "Магчыма тэчка сапсавана й ня можа быць адноўлена."
 
-#: camel/providers/local/camel-mbox-folder.c:480
+#: camel/providers/local/camel-mbox-folder.c:409
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr "Збой у канструкцыі паведамленьня: паштовая скрыня пашкоджана?"
 
-#: camel/providers/local/camel-mbox-store.c:149
+#: camel/providers/local/camel-mbox-store.c:94
 #, c-format
 msgid ""
 "Could not open file `%s':\n"
@@ -9774,16 +9663,7 @@ msgstr ""
 "Немагчыма адкрыць файл \"%s\":\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:166
-#, fuzzy, c-format
-msgid ""
-"Could not create directory `%s':\n"
-"%s"
-msgstr ""
-"Немагчыма стварыць каталёг %s:\n"
-"%s"
-
-#: camel/providers/local/camel-mbox-store.c:178
+#: camel/providers/local/camel-mbox-store.c:110
 #, c-format
 msgid ""
 "Could not create file `%s':\n"
@@ -9792,15 +9672,14 @@ msgstr ""
 "Неатрымалася стварыць файл \"%s\":\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:188
-#: camel/providers/local/camel-mbox-store.c:229
+#: camel/providers/local/camel-mbox-store.c:119
+#: camel/providers/local/camel-mbox-store.c:146
 #, c-format
 msgid "`%s' is not a regular file."
 msgstr "%s не зьяўляецца звычайным файлам."
 
-#: camel/providers/local/camel-mbox-store.c:210
-#: camel/providers/local/camel-mbox-store.c:221
-#: camel/providers/local/camel-mbox-store.c:244
+#: camel/providers/local/camel-mbox-store.c:138
+#: camel/providers/local/camel-mbox-store.c:161
 #, c-format
 msgid ""
 "Could not delete folder `%s':\n"
@@ -9809,36 +9688,11 @@ msgstr ""
 "Немагчыма выдаліць тэчку \"%s\":\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:236
+#: camel/providers/local/camel-mbox-store.c:153
 #, c-format
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr "Тэчка \"%s\" не пустая. Не выдалена."
 
-#: camel/providers/local/camel-mbox-store.c:311
-#, fuzzy
-msgid "Cannot create a folder by this name."
-msgstr "Немагчыма стварыць тэчку з гэткай назвай"
-
-#: camel/providers/local/camel-mbox-store.c:324
-#, fuzzy, c-format
-msgid "Cannot create directory `%s': %s."
-msgstr "Немагчыма стварыць каталёг %s: %s"
-
-#: camel/providers/local/camel-mbox-store.c:338
-#, fuzzy, c-format
-msgid "Cannot create folder: %s: %s"
-msgstr "Неатрымалася атрымаць тэчку: %s: %s"
-
-#: camel/providers/local/camel-mbox-store.c:408
-#, fuzzy, c-format
-msgid "Could not rename %s to %s: %s"
-msgstr "Неатрымалася зьмяніць назву тэчкі %s у %s: %s"
-
-#: camel/providers/local/camel-mbox-store.c:427
-#, fuzzy
-msgid "The new folder name is illegal."
-msgstr "Пазначаная назва тэчкі недапушчальна: %s"
-
 #: camel/providers/local/camel-mbox-summary.c:343
 #, c-format
 msgid "Could not open folder: %s: %s"
@@ -9868,7 +9722,7 @@ msgid "Cannot open temporary mailbox: %s"
 msgstr "Неатрымалася адкрыць часовую паштовую скрыню: %s"
 
 #: camel/providers/local/camel-mbox-summary.c:540
-#: camel/providers/local/camel-mbox-summary.c:704
+#: camel/providers/local/camel-mbox-summary.c:702
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr "Немагчыма закрыць тэчку крыніцы %s: %s"
@@ -9885,38 +9739,38 @@ msgstr "Неатрымалася зьмяніць назву тэчкі: %s"
 
 #: camel/providers/local/camel-mbox-summary.c:644
 #: camel/providers/local/camel-mbox-summary.c:652
-#: camel/providers/local/camel-mbox-summary.c:845
-#: camel/providers/local/camel-mbox-summary.c:853
+#: camel/providers/local/camel-mbox-summary.c:843
+#: camel/providers/local/camel-mbox-summary.c:851
 msgid "Summary and folder mismatch, even after a sync"
 msgstr "Несупадзеньне тэчкі і выніка, нават пасьля сынхранізацыі"
 
-#: camel/providers/local/camel-mbox-summary.c:779
+#: camel/providers/local/camel-mbox-summary.c:777
 #: camel/providers/local/camel-spool-summary.c:334
 #, c-format
 msgid "Unknown error: %s"
 msgstr "Невядомая памылка: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:814
+#: camel/providers/local/camel-mbox-summary.c:812
 #, c-format
 msgid "Could not store folder: %s"
 msgstr "Немагчыма захаваць тэчку: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:908
-#: camel/providers/local/camel-mbox-summary.c:934
+#: camel/providers/local/camel-mbox-summary.c:906
+#: camel/providers/local/camel-mbox-summary.c:932
 #, c-format
 msgid "Error writing to temp mailbox: %s"
 msgstr "Памылка запісу у часовую паштовую скрыню: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:925
+#: camel/providers/local/camel-mbox-summary.c:923
 #, c-format
 msgid "Writing to tmp mailbox failed: %s: %s"
 msgstr "Збой запісу ў часовую паштовую скрыню: %s: %s"
 
-#: camel/providers/local/camel-mh-folder.c:174
+#: camel/providers/local/camel-mh-folder.c:175
 msgid "MH append message cancelled"
 msgstr "Даданьне паведамленьня да тэчкі MH адменена"
 
-#: camel/providers/local/camel-mh-folder.c:177
+#: camel/providers/local/camel-mh-folder.c:178
 #, c-format
 msgid "Cannot append message to mh folder: %s: %s"
 msgstr "Немагчыма дадаць паведамленьне да тэчкі mh: %s: %s"
@@ -9996,67 +9850,6 @@ msgstr ""
 "Не магчыма сынхранізаваць тэчку спула %s: %s\n"
 "Магчыма тэчка пашкоджана, копія захавана у \"%s\""
 
-#: camel/providers/nntp/camel-nntp-auth.c:44
-#, fuzzy, c-format
-msgid "Please enter the NNTP password for %s@%s"
-msgstr "%sКалі ласка, пазначце пароль SMTP для %s@%s"
-
-#: camel/providers/nntp/camel-nntp-auth.c:64
-msgid "Server rejected username"
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-auth.c:70
-#, fuzzy
-msgid "Failed to send username to server"
-msgstr "Збой далучэньня да паслужніка LDAP"
-
-#: camel/providers/nntp/camel-nntp-auth.c:79
-msgid "Server rejected username/password"
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-folder.c:114
-#, c-format
-msgid "Internal error: uid in invalid format: %s"
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-folder.c:155
-#: camel/providers/nntp/camel-nntp-folder.c:161
-#: camel/providers/pop3/camel-pop3-folder.c:433
-#: camel/providers/pop3/camel-pop3-folder.c:494
-#: camel/providers/pop3/camel-pop3-folder.c:501
-#: camel/providers/pop3/camel-pop3-folder.c:512
-#, c-format
-msgid "Cannot get message %s: %s"
-msgstr "Немагчыма атрымаць паведамленьне %s: %s"
-
-#: camel/providers/nntp/camel-nntp-folder.c:159
-#: camel/providers/pop3/camel-pop3-folder.c:262
-#: camel/providers/pop3/camel-pop3-folder.c:430
-#: camel/providers/pop3/camel-pop3-folder.c:491
-#: camel/providers/pop3/camel-pop3-folder.c:509
-msgid "User cancelled"
-msgstr "Карыстальнік адмяніў"
-
-#: camel/providers/nntp/camel-nntp-grouplist.c:45
-#, fuzzy
-msgid "Could not get group list from server."
-msgstr "Немагчыма атрымаць групу: %s"
-
-#: camel/providers/nntp/camel-nntp-grouplist.c:98
-#: camel/providers/nntp/camel-nntp-grouplist.c:107
-#, fuzzy, c-format
-msgid "Unable to load grouplist file for %s: %s"
-msgstr ""
-"Неатрымалася стварыць файл вываду: %s\n"
-" %s"
-
-#: camel/providers/nntp/camel-nntp-grouplist.c:158
-#, fuzzy, c-format
-msgid "Unable to save grouplist file for %s: %s"
-msgstr ""
-"Неатрымалася стварыць файл вываду: %s\n"
-" %s"
-
 #: camel/providers/nntp/camel-nntp-provider.c:41
 msgid "USENET news"
 msgstr "Навіны USENET"
@@ -10066,22 +9859,22 @@ msgid "This is a provider for reading from and posting toUSENET newsgroups."
 msgstr ""
 "Гэта правайдэр для чытаньня і адпраўкі паведамленьняў у групы навінаў USENET."
 
-#: camel/providers/nntp/camel-nntp-store.c:149
+#: camel/providers/nntp/camel-nntp-store.c:151
 #, c-format
 msgid "Could not read greeting from %s: %s"
 msgstr "Неатрымліваецца прачытаць вітаньне з %s: %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:161
+#: camel/providers/nntp/camel-nntp-store.c:163
 #, c-format
 msgid "NNTP server %s returned error code %d: %s"
 msgstr "Паслужнік NNTP %s вярнуў код памылкі %d: %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:260
+#: camel/providers/nntp/camel-nntp-store.c:262
 #, c-format
 msgid "USENET News via %s"
 msgstr "Навіны USENET праз %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:267
+#: camel/providers/nntp/camel-nntp-store.c:269
 msgid ""
 "This option will authenticate with the NNTP server using a plaintext "
 "password."
@@ -10089,37 +9882,37 @@ msgstr ""
 "Далучэньне да паслужніка NNTP будзе адбывацца з выкарыстаньнем "
 "незашыфраванага пароля."
 
-#: camel/providers/nntp/camel-nntp-summary.c:237
+#: camel/providers/nntp/camel-nntp-summary.c:234
 #, c-format
 msgid "No such folder: %s"
 msgstr "Не адшукана тэчка: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:241
+#: camel/providers/nntp/camel-nntp-summary.c:238
 #, c-format
 msgid "Could not get group: %s"
 msgstr "Немагчыма атрымаць групу: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:347
+#: camel/providers/nntp/camel-nntp-summary.c:344
 #, c-format
 msgid "NNTP Command failed: %s"
 msgstr "Збой каманды NNTP: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:407
-#: camel/providers/nntp/camel-nntp-summary.c:508
+#: camel/providers/nntp/camel-nntp-summary.c:404
+#: camel/providers/nntp/camel-nntp-summary.c:505
 #, c-format
 msgid "%s: Scanning new messages"
 msgstr "%s: Сканаваннье новых паведамленьняў"
 
-#: camel/providers/nntp/camel-nntp-summary.c:523
+#: camel/providers/nntp/camel-nntp-summary.c:520
 #, c-format
 msgid "Unknown server response: %s"
 msgstr "Невядомы адказ паслужніка: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:569
+#: camel/providers/nntp/camel-nntp-summary.c:566
 msgid "Use cancel"
 msgstr "Адмяніце"
 
-#: camel/providers/nntp/camel-nntp-summary.c:571
+#: camel/providers/nntp/camel-nntp-summary.c:568
 #, c-format
 msgid "Operation failed: %s"
 msgstr "Збой апэрацыі: %s"
@@ -10128,6 +9921,13 @@ msgstr "Збой апэрацыі: %s"
 msgid "Retrieving POP summary"
 msgstr "Атрыманьне зьвестак POP"
 
+#: camel/providers/pop3/camel-pop3-folder.c:262
+#: camel/providers/pop3/camel-pop3-folder.c:429
+#: camel/providers/pop3/camel-pop3-folder.c:490
+#: camel/providers/pop3/camel-pop3-folder.c:508
+msgid "User cancelled"
+msgstr "Карыстальнік адмяніў"
+
 #: camel/providers/pop3/camel-pop3-folder.c:265
 #, c-format
 msgid "Cannot get POP summary: %s"
@@ -10137,22 +9937,34 @@ msgstr "Немагчыма атрымаць зьвесткі POP: %s"
 msgid "Expunging deleted messages"
 msgstr "Выкіданьне выдаленых паведамленьняў"
 
-#: camel/providers/pop3/camel-pop3-folder.c:404
+#: camel/providers/pop3/camel-pop3-folder.c:403
 #, c-format
 msgid "No message with uid %s"
 msgstr "Няма паведамленьня з uid %s"
 
 #. Sigh, most of the crap in this function is so that the cancel button
 #. returns the proper exception code.  Sigh.
-#: camel/providers/pop3/camel-pop3-folder.c:411
+#: camel/providers/pop3/camel-pop3-folder.c:410
 #, c-format
 msgid "Retrieving POP message %d"
 msgstr "Атрыманнье паведамленьняў %d па POP"
 
-#: camel/providers/pop3/camel-pop3-folder.c:501
+#: camel/providers/pop3/camel-pop3-folder.c:432
+#: camel/providers/pop3/camel-pop3-folder.c:493
+#: camel/providers/pop3/camel-pop3-folder.c:500
+#: camel/providers/pop3/camel-pop3-folder.c:511
+#, c-format
+msgid "Cannot get message %s: %s"
+msgstr "Немагчыма атрымаць паведамленьне %s: %s"
+
+#: camel/providers/pop3/camel-pop3-folder.c:500
 msgid "Unknown reason"
 msgstr "Невядомая прычына"
 
+#: camel/providers/pop3/camel-pop3-provider.c:38
+msgid "Message storage"
+msgstr "Сховішча паведамленьняў"
+
 #: camel/providers/pop3/camel-pop3-provider.c:40
 msgid "Leave messages on server"
 msgstr "Пакідаць паведамленьні на паслужніку"
@@ -10320,141 +10132,141 @@ msgstr ""
 "Для дастаўкі пошты з дапамогай далучэньня да аддаленага паштовага вузла па "
 "пратаколе SMTP.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:174
+#: camel/providers/smtp/camel-smtp-transport.c:175
 msgid "Syntax error, command unrecognized"
 msgstr "Сынтаксычная памылка, каманда не распазнана"
 
-#: camel/providers/smtp/camel-smtp-transport.c:176
+#: camel/providers/smtp/camel-smtp-transport.c:177
 msgid "Syntax error in parameters or arguments"
 msgstr "Сынтаксычная памылка ў парамэтрах ці аргумэнтах"
 
-#: camel/providers/smtp/camel-smtp-transport.c:178
+#: camel/providers/smtp/camel-smtp-transport.c:179
 msgid "Command not implemented"
 msgstr "Каманда не реалізавана"
 
-#: camel/providers/smtp/camel-smtp-transport.c:180
+#: camel/providers/smtp/camel-smtp-transport.c:181
 msgid "Command parameter not implemented"
 msgstr "Парамэтар каманды не рэалізаваны"
 
-#: camel/providers/smtp/camel-smtp-transport.c:182
+#: camel/providers/smtp/camel-smtp-transport.c:183
 msgid "System status, or system help reply"
 msgstr "Стан сыстэмы ці адказдаведкі сыстэмы"
 
-#: camel/providers/smtp/camel-smtp-transport.c:184
+#: camel/providers/smtp/camel-smtp-transport.c:185
 msgid "Help message"
 msgstr "Даведачнае паведамленьне"
 
-#: camel/providers/smtp/camel-smtp-transport.c:186
+#: camel/providers/smtp/camel-smtp-transport.c:187
 msgid "Service ready"
 msgstr "Паслуга гатова"
 
-#: camel/providers/smtp/camel-smtp-transport.c:188
+#: camel/providers/smtp/camel-smtp-transport.c:189
 msgid "Service closing transmission channel"
 msgstr "Паслуга зачыніла канал перадачы"
 
-#: camel/providers/smtp/camel-smtp-transport.c:190
+#: camel/providers/smtp/camel-smtp-transport.c:191
 msgid "Service not available, closing transmission channel"
 msgstr "Паслуга недаступна, закрыцьцё канала перадачы"
 
-#: camel/providers/smtp/camel-smtp-transport.c:192
+#: camel/providers/smtp/camel-smtp-transport.c:193
 msgid "Requested mail action okay, completed"
 msgstr "Запытанае паштовае дзеяньне выканана"
 
-#: camel/providers/smtp/camel-smtp-transport.c:194
+#: camel/providers/smtp/camel-smtp-transport.c:195
 msgid "User not local; will forward to <forward-path>"
 msgstr "Не лакальны карыстальнік; будзе даслана да <шлях-адпраўкі>"
 
-#: camel/providers/smtp/camel-smtp-transport.c:196
+#: camel/providers/smtp/camel-smtp-transport.c:197
 msgid "Requested mail action not taken: mailbox unavailable"
 msgstr "Запытанае дзеяньне з поштай не выканана: паштовая скрыня не даступена"
 
-#: camel/providers/smtp/camel-smtp-transport.c:198
+#: camel/providers/smtp/camel-smtp-transport.c:199
 msgid "Requested action not taken: mailbox unavailable"
 msgstr "Запытанае дзеяньне не выканана: паштовая скрыня не даступена"
 
-#: camel/providers/smtp/camel-smtp-transport.c:200
+#: camel/providers/smtp/camel-smtp-transport.c:201
 msgid "Requested action aborted: error in processing"
 msgstr "Запытанае дзеяньне адменена: памылка пад час апрацоўкі"
 
-#: camel/providers/smtp/camel-smtp-transport.c:202
+#: camel/providers/smtp/camel-smtp-transport.c:203
 msgid "User not local; please try <forward-path>"
 msgstr "Карыстальнік не лакальны; калі ласка, паспрабуйце <шлях-перасылкі>"
 
-#: camel/providers/smtp/camel-smtp-transport.c:204
+#: camel/providers/smtp/camel-smtp-transport.c:205
 msgid "Requested action not taken: insufficient system storage"
 msgstr "Запытанае дзеяньне не выканана: недастаткова сыстэмнага сховішча"
 
-#: camel/providers/smtp/camel-smtp-transport.c:206
+#: camel/providers/smtp/camel-smtp-transport.c:207
 msgid "Requested mail action aborted: exceeded storage allocation"
 msgstr "Запытанае дзеяньне перарванае: вычарпана мейсца ў сховішчы"
 
-#: camel/providers/smtp/camel-smtp-transport.c:208
+#: camel/providers/smtp/camel-smtp-transport.c:209
 msgid "Requested action not taken: mailbox name not allowed"
 msgstr "Запытанае дзеяньне не выканана: назва паштовае скрыні недапушчальна"
 
-#: camel/providers/smtp/camel-smtp-transport.c:210
+#: camel/providers/smtp/camel-smtp-transport.c:211
 msgid "Start mail input; end with <CRLF>.<CRLF>"
 msgstr "Пачатак уводу пошты; заканчэньне пасьля <CRLF>.<CRLF>"
 
-#: camel/providers/smtp/camel-smtp-transport.c:212
+#: camel/providers/smtp/camel-smtp-transport.c:213
 msgid "Transaction failed"
 msgstr "Збой транзакцыі"
 
-#: camel/providers/smtp/camel-smtp-transport.c:216
+#: camel/providers/smtp/camel-smtp-transport.c:217
 msgid "A password transition is needed"
 msgstr "Неабходна перадача пароля"
 
-#: camel/providers/smtp/camel-smtp-transport.c:218
+#: camel/providers/smtp/camel-smtp-transport.c:219
 msgid "Authentication mechanism is too weak"
 msgstr "Заслабы мэханізм аўтарызацыі"
 
-#: camel/providers/smtp/camel-smtp-transport.c:220
+#: camel/providers/smtp/camel-smtp-transport.c:221
 msgid "Encryption required for requested authentication mechanism"
 msgstr "Для запытанага мэханізма аўтарызацыі патрабуецца шыфраваньне"
 
-#: camel/providers/smtp/camel-smtp-transport.c:222
+#: camel/providers/smtp/camel-smtp-transport.c:223
 msgid "Temporary authentication failure"
 msgstr "Часовы збой аўтарызацыі"
 
-#: camel/providers/smtp/camel-smtp-transport.c:224
+#: camel/providers/smtp/camel-smtp-transport.c:225
 msgid "Authentication required"
 msgstr "Аўтарызацыя патрабуецца"
 
-#: camel/providers/smtp/camel-smtp-transport.c:298
+#: camel/providers/smtp/camel-smtp-transport.c:299
 msgid "Welcome response error"
 msgstr "Памылка пад час адказу на вітаньне"
 
-#: camel/providers/smtp/camel-smtp-transport.c:342
-#: camel/providers/smtp/camel-smtp-transport.c:381
+#: camel/providers/smtp/camel-smtp-transport.c:343
+#: camel/providers/smtp/camel-smtp-transport.c:382
 #, c-format
 msgid "Failed to connect to SMTP server %s in secure mode: %s"
 msgstr ""
 "Неатрымліваецца далучыцца да паслужніка SMTP %s у бясьпечным рэжыме : %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:343
+#: camel/providers/smtp/camel-smtp-transport.c:344
 msgid "server does not appear to support SSL"
 msgstr "здаецца, паслужнік не падтрымлівае SSL"
 
-#: camel/providers/smtp/camel-smtp-transport.c:357
+#: camel/providers/smtp/camel-smtp-transport.c:358
 #, c-format
 msgid "STARTTLS request timed out: %s"
 msgstr "Перавышаны час чаканьня адказу на запыт STARTTLS: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:372
+#: camel/providers/smtp/camel-smtp-transport.c:373
 msgid "STARTTLS response error"
 msgstr "Памылка пад час адказу на STARTTLS"
 
-#: camel/providers/smtp/camel-smtp-transport.c:475
+#: camel/providers/smtp/camel-smtp-transport.c:476
 #, c-format
 msgid "SMTP server %s does not support requested authentication type %s."
 msgstr "Паслужнік SMTP %s не падтрымлівае запатрабаваны тып ідэнтыфікацыі %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:513
+#: camel/providers/smtp/camel-smtp-transport.c:514
 #, c-format
 msgid "%sPlease enter the SMTP password for %s@%s"
 msgstr "%sКалі ласка, пазначце пароль SMTP для %s@%s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:532
+#: camel/providers/smtp/camel-smtp-transport.c:533
 #, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -10465,89 +10277,89 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:665
+#: camel/providers/smtp/camel-smtp-transport.c:666
 #, c-format
 msgid "SMTP server %s"
 msgstr "SMTP-паслужнік %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:667
+#: camel/providers/smtp/camel-smtp-transport.c:668
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "Дастаўка пошты SMTP праз %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:685
+#: camel/providers/smtp/camel-smtp-transport.c:686
 msgid "Cannot send message: sender address not valid."
 msgstr "Немагчыма даслаць паведамленьне: памылковая адрэса адпраўляльніка."
 
-#: camel/providers/smtp/camel-smtp-transport.c:690 mail/mail-ops.c:631
+#: camel/providers/smtp/camel-smtp-transport.c:691 mail/mail-ops.c:613
 msgid "Sending message"
 msgstr "Адпраўка паведамленьня"
 
-#: camel/providers/smtp/camel-smtp-transport.c:705
+#: camel/providers/smtp/camel-smtp-transport.c:706
 msgid "Cannot send message: no recipients defined."
 msgstr "Немагчыма даслаць паведамленьне: ня пазначаны атрымоўцы."
 
-#: camel/providers/smtp/camel-smtp-transport.c:714
+#: camel/providers/smtp/camel-smtp-transport.c:715
 msgid "Cannot send message: one or more invalid recipients"
 msgstr ""
 "Неатрымліваецца даслаць паведамленьне: пазначаны адзін ці некалькі "
 "некарэктных атрымоўцаў"
 
-#: camel/providers/smtp/camel-smtp-transport.c:879
+#: camel/providers/smtp/camel-smtp-transport.c:880
 msgid "SMTP Greeting"
 msgstr "Вітаньне SMTP"
 
-#: camel/providers/smtp/camel-smtp-transport.c:928
+#: camel/providers/smtp/camel-smtp-transport.c:927
 #, c-format
 msgid "HELO request timed out: %s"
 msgstr "Перавышаны час чаканьня адказу на запыт HELO: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:950
+#: camel/providers/smtp/camel-smtp-transport.c:949
 msgid "HELO response error"
 msgstr "Памылка адказу на HELO"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1016
+#: camel/providers/smtp/camel-smtp-transport.c:1015
 msgid "SMTP Authentication"
 msgstr "Аўтарызацыя SMTP"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1022
+#: camel/providers/smtp/camel-smtp-transport.c:1021
 msgid "Error creating SASL authentication object."
 msgstr "Памылка стварэньня аб'екта аўтарызацыі SASL"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1039
-#: camel/providers/smtp/camel-smtp-transport.c:1051
+#: camel/providers/smtp/camel-smtp-transport.c:1038
+#: camel/providers/smtp/camel-smtp-transport.c:1050
 #, c-format
 msgid "AUTH request timed out: %s"
 msgstr "Перавышаны час чаканьня адказу на запыт AUTH: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1060
+#: camel/providers/smtp/camel-smtp-transport.c:1059
 msgid "AUTH request failed."
 msgstr "Памылка запыту AUTH."
 
-#: camel/providers/smtp/camel-smtp-transport.c:1121
+#: camel/providers/smtp/camel-smtp-transport.c:1120
 msgid "Bad authentication response from server.\n"
 msgstr "Адмоўны адказ ідэнтыфікацыі ад паслужніка.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1146
+#: camel/providers/smtp/camel-smtp-transport.c:1145
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
 msgstr "Перавышаны час чаканьня адказу на MAIL FROM: %s: пошта не даслана"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1166
+#: camel/providers/smtp/camel-smtp-transport.c:1165
 msgid "MAIL FROM response error"
 msgstr "Памылка адказу на MAIL FROM"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1190
+#: camel/providers/smtp/camel-smtp-transport.c:1189
 #, c-format
 msgid "RCPT TO request timed out: %s: mail not sent"
 msgstr "Перавышаны час чаканьня адказу на RCPT TO: %s: пошта не даслана"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1212
+#: camel/providers/smtp/camel-smtp-transport.c:1211
 #, c-format
 msgid "RCPT TO <%s> failed"
 msgstr "RCPT TO <%s> ня атрымалася"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1251
+#: camel/providers/smtp/camel-smtp-transport.c:1250
 #, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr "Перавышаны час чаканьня адказу на DATA: %s: пошта не даслана"
@@ -10555,67 +10367,68 @@ msgstr "Перавышаны час чаканьня адказу на DATA: %s:
 #. we should have gotten instructions on how to use the DATA command:
 #. * 354 Enter mail, end with "." on a line by itself
 #.
-#: camel/providers/smtp/camel-smtp-transport.c:1271
+#: camel/providers/smtp/camel-smtp-transport.c:1270
 msgid "DATA response error"
 msgstr "Памылка адказу на DATA"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1312
-#: camel/providers/smtp/camel-smtp-transport.c:1335
+#: camel/providers/smtp/camel-smtp-transport.c:1311
+#: camel/providers/smtp/camel-smtp-transport.c:1334
 #, c-format
 msgid "DATA send timed out: message termination: %s: mail not sent"
 msgstr ""
 "Перавышаны час адпраўкі DATA: паведамленьне перарвана: %s: пошта не даслана"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1355
+#: camel/providers/smtp/camel-smtp-transport.c:1354
 msgid "DATA termination response error"
 msgstr "Збой адказу пад час перарываньня DATA"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1378
+#: camel/providers/smtp/camel-smtp-transport.c:1377
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr "Перавышаны час чаканьня адказу на RSET: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1398
+#: camel/providers/smtp/camel-smtp-transport.c:1397
 msgid "RSET response error"
 msgstr "Памылка адказу на RSET"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1421
+#: camel/providers/smtp/camel-smtp-transport.c:1420
 #, c-format
 msgid "QUIT request timed out: %s"
 msgstr "Перавышаны час чаканьня адказу на запыт QUIT: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1441
+#: camel/providers/smtp/camel-smtp-transport.c:1440
 msgid "QUIT response error"
 msgstr "Памылка адказу на QUIT"
 
-#: composer/e-msg-composer-attachment-bar.c:103
+#: composer/e-msg-composer-attachment-bar.c:102
 #, c-format
 msgid "%.0fK"
 msgstr "%.0fK"
 
-#: composer/e-msg-composer-attachment-bar.c:106
+#: composer/e-msg-composer-attachment-bar.c:105
 #, c-format
 msgid "%.0fM"
 msgstr "%.0fM"
 
-#: composer/e-msg-composer-attachment-bar.c:109
+#: composer/e-msg-composer-attachment-bar.c:108
 #, c-format
 msgid "%.0fG"
 msgstr "%.0fG"
 
-#: composer/e-msg-composer-attachment-bar.c:300
+#. This is a filename. Translators take note.
+#: composer/e-msg-composer-attachment-bar.c:370 mail/mail-display.c:227
 msgid "attachment"
 msgstr "укладаньне"
 
-#: composer/e-msg-composer-attachment-bar.c:445
+#: composer/e-msg-composer-attachment-bar.c:508
 msgid "Remove selected items from the attachment list"
 msgstr "Выдаліць выбраныя элемэнты са сьпіса укладаньняў"
 
-#: composer/e-msg-composer-attachment-bar.c:475
+#: composer/e-msg-composer-attachment-bar.c:538
 msgid "Add attachment..."
 msgstr "Дадаць укладаньне..."
 
-#: composer/e-msg-composer-attachment-bar.c:476
+#: composer/e-msg-composer-attachment-bar.c:539
 msgid "Attach a file to the message"
 msgstr "Укласьці файл у паведамленьне"
 
@@ -10647,11 +10460,88 @@ msgstr "Тып MIME:"
 msgid "Suggest automatic display of attachment"
 msgstr "Прапаноўваць аўтаматычнае адлюстраваньне укладаньня"
 
-#: composer/e-msg-composer.c:562
+#: composer/e-msg-composer-hdrs.c:290
+msgid "Hey you, dunce. You need an account to send mail doncha know."
+msgstr ""
+
+#: composer/e-msg-composer-hdrs.c:483
+msgid "Click here for the address book"
+msgstr "Клікніце тутака для выкліку кнігі адрэсаў"
+
+#.
+#. * Reply-To:
+#. *
+#. * Create this before we call create_from_optionmenu,
+#. * because that causes from_changed to be called, which
+#. * expects the reply_to fields to be initialized.
+#.
+#: composer/e-msg-composer-hdrs.c:514
+msgid "Reply-To:"
+msgstr "Адказаць на:"
+
+#.
+#. * From
+#.
+#: composer/e-msg-composer-hdrs.c:520
+msgid "From:"
+msgstr "Ад каго:"
+
+#.
+#. * Subject
+#.
+#: composer/e-msg-composer-hdrs.c:526
+msgid "Subject:"
+msgstr "Тэма:"
+
+#: composer/e-msg-composer-hdrs.c:535
+msgid "To:"
+msgstr "Каму:"
+
+#: composer/e-msg-composer-hdrs.c:536
+msgid "Enter the recipients of the message"
+msgstr "Пазначце атрымоўцаў паведамленьня"
+
+#: composer/e-msg-composer-hdrs.c:539
+msgid "Cc:"
+msgstr "Копія:"
+
+#: composer/e-msg-composer-hdrs.c:540
+msgid "Enter the addresses that will receive a carbon copy of the message"
+msgstr "Пазначце атрымоўцаў, якія атрымаюць копію паведамленьня"
+
+#: composer/e-msg-composer-hdrs.c:543
+msgid "Bcc:"
+msgstr "Сх. копія:"
+
+#: composer/e-msg-composer-hdrs.c:544
+msgid ""
+"Enter the addresses that will receive a carbon copy of the message without "
+"appearing in the recipient list of the message."
+msgstr ""
+"Пазначце адрэсы тых, хто атрымае копію паведамленьня, не патрапіўшы ў сьпіс "
+"атрымоўцаў."
+
+#.
+#. * Post-To
+#.
+#: composer/e-msg-composer-hdrs.c:551
+msgid "Post To:"
+msgstr "Даслаць на:"
+
+#: composer/e-msg-composer-hdrs.c:553
+msgid "Posting destination"
+msgstr "Мейсца прызначэньня"
+
+#: composer/e-msg-composer-select-file.c:102
+#: composer/e-msg-composer-select-file.c:119
+msgid "Attach file(s)"
+msgstr "Укласьці файл(ы)"
+
+#: composer/e-msg-composer.c:535
 msgid "Could not create a PGP signature context"
 msgstr "Неатрымалася стварыць кантэкст подпіса PGP"
 
-#: composer/e-msg-composer.c:841
+#: composer/e-msg-composer.c:814
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
@@ -10660,30 +10550,30 @@ msgstr ""
 "Памылка пад час чытаньня файла %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:1206
+#: composer/e-msg-composer.c:1177
 msgid "File exists, overwrite?"
 msgstr "Файл існуе, перапісаць?"
 
-#: composer/e-msg-composer.c:1217 composer/e-msg-composer.c:1233
+#: composer/e-msg-composer.c:1195
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Памылка захаваньня файла: %s"
 
-#: composer/e-msg-composer.c:1256
+#: composer/e-msg-composer.c:1218
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Памылка пад час загрузкі файла: %s"
 
-#: composer/e-msg-composer.c:1294
+#: composer/e-msg-composer.c:1256
 #, c-format
 msgid "Error accessing file: %s"
 msgstr "Памылка доступу да файла: %s"
 
-#: composer/e-msg-composer.c:1302
+#: composer/e-msg-composer.c:1264
 msgid "Unable to retrieve message from editor"
 msgstr "Неатрымліваецца атрымаць паведамленьне з рэдактара"
 
-#: composer/e-msg-composer.c:1309
+#: composer/e-msg-composer.c:1271
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -10692,7 +10582,7 @@ msgstr ""
 "Немагчыма зрушыць па файле: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1316
+#: composer/e-msg-composer.c:1278
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -10701,7 +10591,7 @@ msgstr ""
 "Немагчыма усекчы файл: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1325
+#: composer/e-msg-composer.c:1287
 #, c-format
 msgid ""
 "Unable to copy file descriptor: %s\n"
@@ -10710,7 +10600,7 @@ msgstr ""
 "Немагчыма скапіяваць дэскрыптар файла: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1334
+#: composer/e-msg-composer.c:1296
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -10719,7 +10609,7 @@ msgstr ""
 "Памылка аўтазахаваньня паведамленьня: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1431
+#: composer/e-msg-composer.c:1390
 msgid ""
 "Ximian Evolution has found unsaved files from a previous session.\n"
 "Would you like to try to recover them?"
@@ -10727,7 +10617,7 @@ msgstr ""
 "\"Эвалюцыя\" адшукала незахаваныя файлы з папярэдняга сэанса.\n"
 "Жадаеце пспрабаваць аднавіць іх?"
 
-#: composer/e-msg-composer.c:1594
+#: composer/e-msg-composer.c:1552
 #, c-format
 msgid ""
 "The message \"%s\" has not been sent.\n"
@@ -10738,28 +10628,28 @@ msgstr ""
 "\n"
 "Жадаеце захаваць зьмены?"
 
-#: composer/e-msg-composer.c:1603
+#: composer/e-msg-composer.c:1561
 msgid "Warning: Modified Message"
 msgstr "Увага: Зьмененае паведамленьне"
 
-#: composer/e-msg-composer.c:1635
+#: composer/e-msg-composer.c:1593
 msgid "Open file"
 msgstr "Адкрыцьцё файла"
 
-#: composer/e-msg-composer.c:2054
+#: composer/e-msg-composer.c:2017
 msgid "Signature:"
 msgstr "Подпіс:"
 
-#: composer/e-msg-composer.c:2094 mail/mail-account-gui.c:1261
+#: composer/e-msg-composer.c:2057 mail/mail-account-gui.c:1261
 msgid "Autogenerated"
 msgstr "Створана аўтаматычна"
 
-#: composer/e-msg-composer.c:2274 composer/e-msg-composer.c:2970
-#: composer/e-msg-composer.c:2971
+#: composer/e-msg-composer.c:2233 composer/e-msg-composer.c:2902
+#: composer/e-msg-composer.c:2903
 msgid "Compose a message"
 msgstr "Стварыць паведамленьне"
 
-#: composer/e-msg-composer.c:3002
+#: composer/e-msg-composer.c:2934
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
@@ -10767,7 +10657,7 @@ msgstr ""
 "Немагчыма стварыць акно рэдактара.\n"
 "Немагчыма актывізаваць кіраваньне выбарам адрэсы."
 
-#: composer/e-msg-composer.c:3030
+#: composer/e-msg-composer.c:2962
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component.\n"
@@ -10779,7 +10669,7 @@ msgstr ""
 "Калі ласка, праверце карэктнасьць усталяванае вэрсыі\n"
 "gtkhtml і libgtkhtml.\n"
 
-#: composer/e-msg-composer.c:3100
+#: composer/e-msg-composer.c:3029
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component."
@@ -10787,7 +10677,7 @@ msgstr ""
 "Неатрымалася стварыць акно рэдактара:\n"
 "Неатрымалася актывізаваць HTML-кампанэнт рэдактара."
 
-#: composer/e-msg-composer.c:4110
+#: composer/e-msg-composer.c:4045
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)"
 "<b>"
@@ -10795,85 +10685,6 @@ msgstr ""
 "<b>(Рэдактар утрымлівае цэла паведамленьня ў фармаце (не тэксьце), які "
 "нельга рэдагаваць.)<b>"
 
-#: composer/e-msg-composer-hdrs.c:290
-#, fuzzy
-msgid "You need to configure an account before you can compose mail."
-msgstr ""
-"Вы мусіце наладзіць уліковы запіс\n"
-"да таго як стварыць паведамленьне."
-
-#: composer/e-msg-composer-hdrs.c:483
-msgid "Click here for the address book"
-msgstr "Клікніце тутака для выкліку кнігі адрэсаў"
-
-#.
-#. * Reply-To:
-#. *
-#. * Create this before we call create_from_optionmenu,
-#. * because that causes from_changed to be called, which
-#. * expects the reply_to fields to be initialized.
-#.
-#: composer/e-msg-composer-hdrs.c:514
-msgid "Reply-To:"
-msgstr "Адказаць на:"
-
-#.
-#. * From
-#.
-#: composer/e-msg-composer-hdrs.c:520
-msgid "From:"
-msgstr "Ад каго:"
-
-#.
-#. * Subject
-#.
-#: composer/e-msg-composer-hdrs.c:526
-msgid "Subject:"
-msgstr "Тэма:"
-
-#: composer/e-msg-composer-hdrs.c:535
-msgid "To:"
-msgstr "Каму:"
-
-#: composer/e-msg-composer-hdrs.c:536
-msgid "Enter the recipients of the message"
-msgstr "Пазначце атрымоўцаў паведамленьня"
-
-#: composer/e-msg-composer-hdrs.c:539
-msgid "Cc:"
-msgstr "Копія:"
-
-#: composer/e-msg-composer-hdrs.c:540
-msgid "Enter the addresses that will receive a carbon copy of the message"
-msgstr "Пазначце атрымоўцаў, якія атрымаюць копію паведамленьня"
-
-#: composer/e-msg-composer-hdrs.c:543
-msgid "Bcc:"
-msgstr "Сх. копія:"
-
-#: composer/e-msg-composer-hdrs.c:544
-msgid ""
-"Enter the addresses that will receive a carbon copy of the message without "
-"appearing in the recipient list of the message."
-msgstr ""
-"Пазначце адрэсы тых, хто атрымае копію паведамленьня, не патрапіўшы ў сьпіс "
-"атрымоўцаў."
-
-#.
-#. * Post-To
-#.
-#: composer/e-msg-composer-hdrs.c:551
-msgid "Post To:"
-msgstr "Даслаць на:"
-
-#: composer/e-msg-composer-hdrs.c:553
-msgid "Posting destination"
-msgstr "Мейсца прызначэньня"
-
-#: composer/e-msg-composer-select-file.c:119
-msgid "Attach file(s)"
-msgstr "Укласьці файл(ы)"
-
 #: data/evolution.desktop.in.h:1
 msgid "The Evolution groupware suite"
 msgstr "Збор дастасаваньняў для групавой працы \"Эвалюцыя\""
@@ -11036,7 +10847,7 @@ msgstr ""
 "Файл з гэтай назвай ужо існуе.\n"
 "Перапісаць?"
 
-#: e-util/e-dialog-utils.c:249
+#: e-util/e-dialog-utils.c:249 mail/mail-display.c:200
 msgid "Overwrite file?"
 msgstr "Перапісаць файл?"
 
@@ -11058,210 +10869,90 @@ msgstr "Сынхранізаваць катэгорыі:"
 
 #. strptime format of a weekday, a date and a time,
 #. in 12-hour format, without seconds.
-#: e-util/e-time-utils.c:185 e-util/e-time-utils.c:398
+#: e-util/e-time-utils.c:172 e-util/e-time-utils.c:385
 msgid "%a %m/%d/%Y %I:%M %p"
 msgstr "%a %d/%m/%Y %I:%M %p"
 
 #. strptime format of a weekday, a date and a time,
 #. in 24-hour format, without seconds.
-#: e-util/e-time-utils.c:190 e-util/e-time-utils.c:389
+#: e-util/e-time-utils.c:177 e-util/e-time-utils.c:376
 msgid "%a %m/%d/%Y %H:%M"
 msgstr "%a %d/%m/%Y %H:%M"
 
 #. strptime format of a weekday, a date and a time,
 #. in 12-hour format, without minutes or seconds.
-#: e-util/e-time-utils.c:195
+#: e-util/e-time-utils.c:182
 msgid "%a %m/%d/%Y %I %p"
 msgstr "%a %d/%m/%Y %I %p"
 
 #. strptime format of a weekday, a date and a time,
 #. in 24-hour format, without minutes or seconds.
-#: e-util/e-time-utils.c:200
+#: e-util/e-time-utils.c:187
 msgid "%a %m/%d/%Y %H"
 msgstr "%a %d/%m/%Y %H"
 
 #. strptime format of a date and a time, in 12-hour format.
-#: e-util/e-time-utils.c:211
+#: e-util/e-time-utils.c:198
 msgid "%m/%d/%Y %I:%M:%S %p"
 msgstr "%d/%m/%Y %I:%M:%S %p"
 
 #. strptime format of a date and a time, in 24-hour format.
-#: e-util/e-time-utils.c:215
+#: e-util/e-time-utils.c:202
 msgid "%m/%d/%Y %H:%M:%S"
 msgstr "%d/%m/%Y %H:%M:%S"
 
 #. strptime format of a date and a time, in 12-hour format,
 #. without seconds.
-#: e-util/e-time-utils.c:220
+#: e-util/e-time-utils.c:207
 msgid "%m/%d/%Y %I:%M %p"
 msgstr "%d/%m/%Y %I:%M %p"
 
 #. strptime format of a date and a time, in 24-hour format,
 #. without seconds.
-#: e-util/e-time-utils.c:225
+#: e-util/e-time-utils.c:212
 msgid "%m/%d/%Y %H:%M"
 msgstr "%d/%m/%Y %H:%M"
 
 #. strptime format of a date and a time, in 12-hour format,
 #. without minutes or seconds.
-#: e-util/e-time-utils.c:230
+#: e-util/e-time-utils.c:217
 msgid "%m/%d/%Y %I %p"
 msgstr "%d/%m/%Y %I %p"
 
 #. strptime format of a date and a time, in 24-hour format,
 #. without minutes or seconds.
-#: e-util/e-time-utils.c:235
+#: e-util/e-time-utils.c:222
 msgid "%m/%d/%Y %H"
 msgstr "%d/%m/%Y %H"
 
 #. strptime format for a time of day, in 12-hour format.
-#: e-util/e-time-utils.c:339 e-util/e-time-utils.c:438
+#: e-util/e-time-utils.c:326 e-util/e-time-utils.c:425
 msgid "%I:%M:%S %p"
 msgstr "%I:%M:%S %p"
 
 #. strptime format for a time of day, in 24-hour format.
-#: e-util/e-time-utils.c:343 e-util/e-time-utils.c:430
+#: e-util/e-time-utils.c:330 e-util/e-time-utils.c:417
 msgid "%H:%M:%S"
 msgstr "%H:%M:%S"
 
 #. strptime format for time of day, without seconds,
 #. in 12-hour format.
-#: e-util/e-time-utils.c:348 e-util/e-time-utils.c:435
-#: widgets/misc/e-dateedit.c:1417 widgets/misc/e-dateedit.c:1642
+#: e-util/e-time-utils.c:335 e-util/e-time-utils.c:422
+#: widgets/misc/e-dateedit.c:1404 widgets/misc/e-dateedit.c:1617
 msgid "%I:%M %p"
 msgstr "%I:%M %p"
 
 #. strptime format for time of day, without seconds 24-hour format.
-#: e-util/e-time-utils.c:352 e-util/e-time-utils.c:427
-#: widgets/misc/e-dateedit.c:1414 widgets/misc/e-dateedit.c:1639
+#: e-util/e-time-utils.c:339 e-util/e-time-utils.c:414
+#: widgets/misc/e-dateedit.c:1401 widgets/misc/e-dateedit.c:1614
 msgid "%H:%M"
 msgstr "%H:%M"
 
 #. strptime format for hour and AM/PM, 12-hour format.
-#: e-util/e-time-utils.c:356
+#: e-util/e-time-utils.c:343
 msgid "%I %p"
 msgstr "%I %p"
 
-#: executive-summary/component/component-factory.c:151
-#, fuzzy
-msgid "Cannot initialize Evolution's Executive Summary component."
-msgstr "Ня атрымліваецца ініцыялізаваць кампанэнт інфармацыі пра тэчку."
-
-#: executive-summary/component/e-summary.c:925
-#, fuzzy, c-format
-msgid ""
-"Cannot open the HTML file:\n"
-"%s"
-msgstr ""
-"Немагчыма зьмяніць назву тэчкі:\n"
-"%s"
-
-#: executive-summary/component/e-summary.c:939
-#, fuzzy, c-format
-msgid ""
-"Error reading data:\n"
-"%s"
-msgstr "Памылка загрузк %s"
-
-#: executive-summary/component/e-summary.c:957
-msgid "File does not have a place for the services.\n"
-msgstr ""
-
-#: executive-summary/component/e-summary-callbacks.c:125
-#, fuzzy
-msgid "Select a service"
-msgstr "Выбярыце файл"
-
-#: executive-summary/component/e-summary-callbacks.c:289
-msgid ""
-"You can select a different HTML page for the background of the Executive "
-"Summary.\n"
-"\n"
-"Just leave it blank for the default"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:69
-#: executive-summary/component/e-summary-url.c:74
-#: executive-summary/component/e-summary-url.c:81
-#, c-format
-msgid "Open %s with the default GNOME application"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:70
-#, c-format
-msgid "Open %s with the default GNOME web browser"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:71
-#, fuzzy, c-format
-msgid "Send an email to %s"
-msgstr "Даслаць пошту"
-
-#: executive-summary/component/e-summary-url.c:72
-#, fuzzy, c-format
-msgid "Change the view to %s"
-msgstr "Тып прагляду"
-
-#: executive-summary/component/e-summary-url.c:73
-#, fuzzy, c-format
-msgid "Run %s"
-msgstr "URL: %s"
-
-#: executive-summary/component/e-summary-url.c:75
-#, fuzzy, c-format
-msgid "Close %s"
-msgstr "Закрыць"
-
-#: executive-summary/component/e-summary-url.c:76
-#, fuzzy, c-format
-msgid "Move %s to the left"
-msgstr "Перамясьціць гэтую тэчку ў іншае мейсца"
-
-#: executive-summary/component/e-summary-url.c:77
-#, c-format
-msgid "Move %s to the right"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:78
-#, c-format
-msgid "Move %s into the previous row"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:79
-#, c-format
-msgid "Move %s into the next row"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:80
-#, fuzzy, c-format
-msgid "Configure %s"
-msgstr "Пераналадзіць /%s"
-
-#: executive-summary/component/e-summary-url.c:553
-#, fuzzy
-msgid "page"
-msgstr "Старонка"
-
-#: executive-summary/test-service/rdf-summary.c:512
-#: executive-summary/test-service/rdf-summary.c:549
-#: executive-summary/test-service/rdf-summary.c:594
-msgid "Error"
-msgstr "Памылка"
-
-#: executive-summary/test-service/rdf-summary.c:775
-msgid "Update automatically"
-msgstr ""
-
-#: executive-summary/test-service/rdf-summary.c:785
-#, fuzzy
-msgid "Update now"
-msgstr "Абнавіць"
-
-#: executive-summary/test-service/rdf-summary.c:795
-#, fuzzy
-msgid "Update every "
-msgstr "Аб_навіць \"Вольны/Заняты\""
-
 #: filter/filter-datespec.c:65
 msgid "1 second ago"
 msgstr "1 сэкунда таму"
@@ -11377,6 +11068,84 @@ msgstr "Вы мусіце пазначыць тэчку."
 msgid "Select Folder"
 msgstr "Выбраць тэчку"
 
+#: filter/filter-input.c:191
+#, c-format
+msgid ""
+"Error in regular expression '%s':\n"
+"%s"
+msgstr ""
+"Памылка ў сталым выразе \"%s\":\n"
+"%s"
+
+#: filter/filter-label.c:121 filter/libfilter-i18n.h:26 mail/mail-config.c:65
+#: mail/mail-config.glade.h:62 shell/e-config-upgrade.c:1411
+msgid "Important"
+msgstr "Важнае"
+
+#. red
+#: filter/filter-label.c:122 mail/mail-config.c:66
+#: mail/mail-config.glade.h:129 shell/e-config-upgrade.c:1412
+msgid "Work"
+msgstr "Праца"
+
+#. orange
+#: filter/filter-label.c:123 mail/mail-config.c:67 mail/mail-config.glade.h:84
+#: shell/e-config-upgrade.c:1413
+msgid "Personal"
+msgstr "Пэрсанальнае"
+
+#. forest green
+#: filter/filter-label.c:124 mail/mail-config.c:68
+#: mail/mail-config.glade.h:120 shell/e-config-upgrade.c:1414
+msgid "To Do"
+msgstr "Трэба выканаць"
+
+#. blue
+#: filter/filter-label.c:125 mail/mail-config.c:69 mail/mail-config.glade.h:66
+#: shell/e-config-upgrade.c:1415
+msgid "Later"
+msgstr "Пазьней"
+
+#: filter/filter-part.c:531 shell/evolution-test-component.c:63
+msgid "Test"
+msgstr "Тэст"
+
+#: filter/filter-rule.c:219
+msgid "You must name this filter."
+msgstr "Вы мусіце назваць фільтар."
+
+#: filter/filter-rule.c:751
+msgid "Rule name: "
+msgstr "Назва правіла: "
+
+#: filter/filter-rule.c:755
+msgid "Untitled"
+msgstr "Бяз назвы"
+
+#: filter/filter-rule.c:772
+msgid "If"
+msgstr "Калі"
+
+#: filter/filter-rule.c:791
+msgid "Execute actions"
+msgstr "Выканаць дзеяньні"
+
+#: filter/filter-rule.c:795
+msgid "if all criteria are met"
+msgstr "калі адпавядае ўсім крытэрам"
+
+#: filter/filter-rule.c:800
+msgid "if any criteria are met"
+msgstr "калі задавальняе па любому з крытэраў"
+
+#: filter/filter-rule.c:895
+msgid "incoming"
+msgstr "атрыманае"
+
+#: filter/filter-rule.c:895
+msgid "outgoing"
+msgstr "дасланае"
+
 #: filter/filter.glade.h:1
 msgid "Compare against"
 msgstr "Параўнаць з"
@@ -11479,84 +11248,6 @@ msgstr "з усімі лакальнымі тэчкамі"
 msgid "years"
 msgstr "гады"
 
-#: filter/filter-input.c:191
-#, c-format
-msgid ""
-"Error in regular expression '%s':\n"
-"%s"
-msgstr ""
-"Памылка ў сталым выразе \"%s\":\n"
-"%s"
-
-#: filter/filter-label.c:121 filter/libfilter-i18n.h:17 mail/mail-config.c:65
-#: mail/mail-config.glade.h:62 shell/e-config-upgrade.c:1454
-msgid "Important"
-msgstr "Важнае"
-
-#. red
-#: filter/filter-label.c:122 mail/mail-config.c:66
-#: mail/mail-config.glade.h:129 shell/e-config-upgrade.c:1455
-msgid "Work"
-msgstr "Праца"
-
-#. orange
-#: filter/filter-label.c:123 mail/mail-config.c:67 mail/mail-config.glade.h:84
-#: shell/e-config-upgrade.c:1456
-msgid "Personal"
-msgstr "Пэрсанальнае"
-
-#. forest green
-#: filter/filter-label.c:124 mail/mail-config.c:68
-#: mail/mail-config.glade.h:120 shell/e-config-upgrade.c:1457
-msgid "To Do"
-msgstr "Трэба выканаць"
-
-#. blue
-#: filter/filter-label.c:125 mail/mail-config.c:69 mail/mail-config.glade.h:66
-#: shell/e-config-upgrade.c:1458
-msgid "Later"
-msgstr "Пазьней"
-
-#: filter/filter-part.c:531 shell/evolution-test-component.c:63
-msgid "Test"
-msgstr "Тэст"
-
-#: filter/filter-rule.c:219
-msgid "You must name this filter."
-msgstr "Вы мусіце назваць фільтар."
-
-#: filter/filter-rule.c:751
-msgid "Rule name: "
-msgstr "Назва правіла: "
-
-#: filter/filter-rule.c:755
-msgid "Untitled"
-msgstr "Бяз назвы"
-
-#: filter/filter-rule.c:772
-msgid "If"
-msgstr "Калі"
-
-#: filter/filter-rule.c:791
-msgid "Execute actions"
-msgstr "Выканаць дзеяньні"
-
-#: filter/filter-rule.c:795
-msgid "if all criteria are met"
-msgstr "калі адпавядае ўсім крытэрам"
-
-#: filter/filter-rule.c:800
-msgid "if any criteria are met"
-msgstr "калі задавальняе па любому з крытэраў"
-
-#: filter/filter-rule.c:895
-msgid "incoming"
-msgstr "атрыманае"
-
-#: filter/filter-rule.c:895
-msgid "outgoing"
-msgstr "дасланае"
-
 #. Automatically generated. Do not edit.
 #: filter/libfilter-i18n.h:2
 msgid "Adjust Score"
@@ -11579,217 +11270,217 @@ msgid "Beep"
 msgstr "Сыгнал"
 
 #: filter/libfilter-i18n.h:7
+msgid "contains"
+msgstr "утрымлівае"
+
+#: filter/libfilter-i18n.h:8
 msgid "Copy to Folder"
 msgstr "Капіяваць у тэчку"
 
-#: filter/libfilter-i18n.h:8
+#: filter/libfilter-i18n.h:9
 msgid "Date received"
 msgstr "Дата атрыманьня"
 
-#: filter/libfilter-i18n.h:9
+#: filter/libfilter-i18n.h:10
 msgid "Date sent"
 msgstr "Дата адпраўленьня"
 
-#: filter/libfilter-i18n.h:11
+#: filter/libfilter-i18n.h:12
 msgid "Deleted"
 msgstr "Выдаленае"
 
-#: filter/libfilter-i18n.h:12
-msgid "Do Not Exist"
-msgstr "Неіснуе"
-
 #: filter/libfilter-i18n.h:13
-msgid "Draft"
-msgstr "Чарнавік"
+msgid "does not contain"
+msgstr "ня ўтрымлівае"
 
 #: filter/libfilter-i18n.h:14
-msgid "Exist"
-msgstr "Існуе"
+msgid "does not end with"
+msgstr "не сканчаецца на"
 
 #: filter/libfilter-i18n.h:15
-msgid "Expression"
-msgstr "Выраз"
+msgid "does not exist"
+msgstr "ня існуе"
 
 #: filter/libfilter-i18n.h:16
-msgid "Follow Up"
-msgstr "Падняцца вышэй"
+msgid "does not return"
+msgstr "не вяртае"
+
+#: filter/libfilter-i18n.h:17
+msgid "does not sound like"
+msgstr "не гучыць як"
 
 #: filter/libfilter-i18n.h:18
-msgid "Label"
-msgstr "Адмеціна"
+msgid "does not start with"
+msgstr "не пачынаецца на"
 
 #: filter/libfilter-i18n.h:19
-msgid "Mailing list"
-msgstr "Сьпіс рассылкі"
+msgid "Do Not Exist"
+msgstr "Неіснуе"
 
 #: filter/libfilter-i18n.h:20
-msgid "Message Body"
-msgstr "Цела паведамленьня"
+msgid "Draft"
+msgstr "Чарнавік"
 
 #: filter/libfilter-i18n.h:21
-msgid "Message Header"
-msgstr "Загаловак паведамленьня"
+msgid "ends with"
+msgstr "сканчаецца на"
 
 #: filter/libfilter-i18n.h:22
-msgid "Move to Folder"
-msgstr "Перамясьціць у тэчку"
+msgid "Exist"
+msgstr "Існуе"
 
 #: filter/libfilter-i18n.h:23
-msgid "Pipe Message to Shell Command"
-msgstr "Скіраваць паведамленьне у каманду абалонкі"
+msgid "exists"
+msgstr "існуе"
 
 #: filter/libfilter-i18n.h:24
-msgid "Play Sound"
-msgstr "Граць гук"
-
-#: filter/libfilter-i18n.h:25 mail/message-tag-followup.c:68
-msgid "Read"
-msgstr "Чытаньне"
+msgid "Expression"
+msgstr "Выраз"
 
-#: filter/libfilter-i18n.h:26
-msgid "Recipients"
-msgstr "Атрымоўцы"
+#: filter/libfilter-i18n.h:25
+msgid "Follow Up"
+msgstr "Падняцца вышэй"
 
 #: filter/libfilter-i18n.h:27
-msgid "Regex Match"
-msgstr "Супадзеньне стал.выраза"
+msgid "is"
+msgstr "гэта"
 
 #: filter/libfilter-i18n.h:28
-msgid "Replied to"
-msgstr "Адказана на"
+msgid "is after"
+msgstr "пасьля"
 
-#: filter/libfilter-i18n.h:29 filter/score-rule.c:184 filter/score-rule.c:186
-#: mail/message-list.etspec.h:10
-msgid "Score"
-msgstr "Лік"
+#: filter/libfilter-i18n.h:29
+msgid "is before"
+msgstr "перад"
 
 #: filter/libfilter-i18n.h:30
-msgid "Sender"
-msgstr "Адпраўляльнік"
+msgid "is Flagged"
+msgstr "пазначана"
 
 #: filter/libfilter-i18n.h:31
-msgid "Set Status"
-msgstr "Усталяваць стан"
+msgid "is greater than"
+msgstr "больш за"
 
 #: filter/libfilter-i18n.h:32
-msgid "Shell Command"
-msgstr "Каманда абалонкі"
+msgid "is less than"
+msgstr "менш за"
 
 #: filter/libfilter-i18n.h:33
-msgid "Size (kB)"
-msgstr "Памер (kB)"
+msgid "is not"
+msgstr "ня гэта"
 
 #: filter/libfilter-i18n.h:34
-msgid "Source Account"
-msgstr "Крыніца рахунка"
+msgid "is not Flagged"
+msgstr "не пазначана"
 
-#: filter/libfilter-i18n.h:35
-msgid "Specific header"
-msgstr "Спэцыфічны загаловак"
+#: filter/libfilter-i18n.h:35 mail/folder-browser.c:1800
+msgid "Label"
+msgstr "Адмеціна"
+
+#: filter/libfilter-i18n.h:36
+msgid "Mailing list"
+msgstr "Сьпіс рассылкі"
 
 #: filter/libfilter-i18n.h:37
-msgid "Stop Processing"
-msgstr "Спыніць апрацоўку"
+msgid "Message Body"
+msgstr "Цела паведамленьня"
 
-#: filter/libfilter-i18n.h:38 mail/message-list.etspec.h:13
-#: mail/message-tag-followup.c:305
-msgid "Subject"
-msgstr "Тэма"
+#: filter/libfilter-i18n.h:38
+msgid "Message Header"
+msgstr "Загаловак паведамленьня"
 
 #: filter/libfilter-i18n.h:39
-msgid "Unset Status"
-msgstr "Адмяніць папярэдні стан"
+msgid "Move to Folder"
+msgstr "Перамясьціць у тэчку"
 
 #: filter/libfilter-i18n.h:40
-msgid "contains"
-msgstr "утрымлівае"
+msgid "Pipe Message to Shell Command"
+msgstr "Скіраваць паведамленьне у каманду абалонкі"
 
 #: filter/libfilter-i18n.h:41
-msgid "does not contain"
-msgstr "ня ўтрымлівае"
+msgid "Play Sound"
+msgstr "Граць гук"
 
-#: filter/libfilter-i18n.h:42
-msgid "does not end with"
-msgstr "не сканчаецца на"
+#: filter/libfilter-i18n.h:42 mail/message-tag-followup.c:68
+msgid "Read"
+msgstr "Чытаньне"
 
 #: filter/libfilter-i18n.h:43
-msgid "does not exist"
-msgstr "ня існуе"
+msgid "Recipients"
+msgstr "Атрымоўцы"
 
 #: filter/libfilter-i18n.h:44
-msgid "does not return"
-msgstr "не вяртае"
+msgid "Regex Match"
+msgstr "Супадзеньне стал.выраза"
 
 #: filter/libfilter-i18n.h:45
-msgid "does not sound like"
-msgstr "не гучыць як"
+msgid "Replied to"
+msgstr "Адказана на"
 
 #: filter/libfilter-i18n.h:46
-msgid "does not start with"
-msgstr "не пачынаецца на"
+msgid "returns"
+msgstr "вяртае"
 
 #: filter/libfilter-i18n.h:47
-msgid "ends with"
-msgstr "сканчаецца на"
+msgid "returns greater than"
+msgstr "вяртае больш за"
 
 #: filter/libfilter-i18n.h:48
-msgid "exists"
-msgstr "існуе"
+msgid "returns less than"
+msgstr "вяртае менш за"
 
-#: filter/libfilter-i18n.h:49
-msgid "is Flagged"
-msgstr "пазначана"
+#: filter/libfilter-i18n.h:49 filter/score-rule.c:184 filter/score-rule.c:186
+#: mail/message-list.etspec.h:10
+msgid "Score"
+msgstr "Лік"
 
-#: filter/libfilter-i18n.h:50
-msgid "is after"
-msgstr "пасьля"
+#: filter/libfilter-i18n.h:50 mail/mail-callbacks.c:1820
+msgid "Sender"
+msgstr "Адпраўляльнік"
 
 #: filter/libfilter-i18n.h:51
-msgid "is before"
-msgstr "перад"
+msgid "Set Status"
+msgstr "Усталяваць стан"
 
 #: filter/libfilter-i18n.h:52
-msgid "is greater than"
-msgstr "больш за"
+msgid "Shell Command"
+msgstr "Каманда абалонкі"
 
 #: filter/libfilter-i18n.h:53
-msgid "is less than"
-msgstr "менш за"
+msgid "Size (kB)"
+msgstr "Памер (kB)"
 
 #: filter/libfilter-i18n.h:54
-msgid "is not Flagged"
-msgstr "не пазначана"
+msgid "sounds like"
+msgstr "гукі як"
 
 #: filter/libfilter-i18n.h:55
-msgid "is not"
-msgstr "ня гэта"
+msgid "Source Account"
+msgstr "Крыніца рахунка"
 
 #: filter/libfilter-i18n.h:56
-msgid "is"
-msgstr "гэта"
+msgid "Specific header"
+msgstr "Спэцыфічны загаловак"
 
 #: filter/libfilter-i18n.h:57
-msgid "returns greater than"
-msgstr "вяртае больш за"
-
-#: filter/libfilter-i18n.h:58
-msgid "returns less than"
-msgstr "вяртае менш за"
+msgid "starts with"
+msgstr "пачынаецца з"
 
 #: filter/libfilter-i18n.h:59
-msgid "returns"
-msgstr "вяртае"
+msgid "Stop Processing"
+msgstr "Спыніць апрацоўку"
 
-#: filter/libfilter-i18n.h:60
-msgid "sounds like"
-msgstr "гукі як"
+#: filter/libfilter-i18n.h:60 mail/mail-format.c:934
+#: mail/message-list.etspec.h:13 mail/message-tag-followup.c:305
+msgid "Subject"
+msgstr "Тэма"
 
 #: filter/libfilter-i18n.h:61
-msgid "starts with"
-msgstr "пачынаецца з"
+msgid "Unset Status"
+msgstr "Адмяніць папярэдні стан"
 
-#: filter/rule-context.c:684 filter/rule-editor.c:241 filter/rule-editor.c:326
-#: mail/mail-vfolder.c:916
+#: filter/rule-context.c:664 filter/rule-editor.c:241 filter/rule-editor.c:326
+#: mail/mail-vfolder.c:917
 #, c-format
 msgid "Rule name '%s' is not unique, choose another."
 msgstr "Пазва правіла '%s' ня ўнікальна, выбярыце іншую."
@@ -11857,9 +11548,10 @@ msgid "Scanning %s"
 msgstr "Сканаваньне %s"
 
 #: importers/elm-importer.c:525 importers/netscape-importer.c:2128
-#: importers/pine-importer.c:637 mail/component-factory.c:116
-#: mail/importers/elm-importer.c:526 mail/importers/netscape-importer.c:2085
-#: mail/importers/pine-importer.c:572 my-evolution/my-evolution.glade.h:4
+#: importers/pine-importer.c:637 mail/component-factory.c:117
+#: mail/folder-browser-ui.c:360 mail/importers/elm-importer.c:526
+#: mail/importers/netscape-importer.c:2085 mail/importers/pine-importer.c:572
+#: my-evolution/my-evolution.glade.h:4
 msgid "Mail"
 msgstr "Пошта"
 
@@ -11926,7 +11618,7 @@ msgstr "\"Эвалюцыя\" імпартуе вашыя старыя даньн
 
 #. Fill in the new fields
 #: importers/netscape-importer.c:1872 mail/importers/netscape-importer.c:1842
-#: mail/mail-ops.c:1106 shell/e-local-storage.c:184
+#: mail/mail-ops.c:1092 shell/e-local-storage.c:184
 msgid "Trash"
 msgstr "Сьметніца"
 
@@ -11940,7 +11632,7 @@ msgid "Scanning directory"
 msgstr "Сканаваньне каталёга"
 
 #: importers/netscape-importer.c:2047 mail/importers/netscape-importer.c:2015
-#: shell/e-shell-startup-wizard.c:556
+#: shell/e-shell-startup-wizard.c:541
 msgid "Starting import"
 msgstr "Распачата імпартаваньне"
 
@@ -11976,147 +11668,332 @@ msgstr ""
 msgid "Pine"
 msgstr "Pine"
 
-#: mail/component-factory.c:116
+#: mail/GNOME_Evolution_Mail.server.in.in.h:1
+msgid "Composer Preferences"
+msgstr "Перавагі рэдактара паведамленьняў"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:2
+msgid ""
+"Configure mail preferences, including security and message display, here"
+msgstr ""
+"Тут наладжваюцца парвмэтры пошты, уключаючы бясьпеку й адлюстраваньне "
+"паведамленьняў"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:3
+msgid "Configure spell-checking, signatures, and the message composer here"
+msgstr ""
+"Тут наладжваюцца праверка правапісу, подпісу й стварэньне паведамленьняў"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:4
+msgid "Configure your email accounts here"
+msgstr "Наладка вашых уліковых запісаў пошты робіцца тут"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:5
+msgid "Evolution Mail"
+msgstr "Пошта \"Эвалюцыі\""
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:6
+msgid "Evolution Mail accounts configuration control"
+msgstr "Сродак кіраваньня уліковамі запісамі пошты \"Эвалюцыі\""
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:7
+msgid "Evolution Mail component"
+msgstr "Кампанэнт пошты \"Эвалюцыі\""
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:8
+msgid "Evolution Mail composer"
+msgstr "Рэдактар паведамленьняў \"Эвалюцыі\""
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:9
+msgid "Evolution Mail composer configuration control"
+msgstr "Сродак кіраваньня рэдактарам паведамленьняў \"Эвалюцыі\""
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:10
+msgid "Evolution Mail configuration interface"
+msgstr "Інтэрфэйс наладкі пошты \"Эвалюцыі\""
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:11
+msgid "Evolution Mail folder viewer"
+msgstr "Праглядальнік паштовае тэчкі \"Эвалюцыі\"."
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:12
+msgid "Evolution Mail preferences control"
+msgstr "Кіраваньне перавагамі пошты \"Эвалюцыі\""
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:13
+msgid "Mail Accounts"
+msgstr "Уліковыя запісы пошты"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:69
+msgid "Mail Preferences"
+msgstr "Перавагі пошты"
+
+#: mail/component-factory.c:117
 msgid "Folder containing mail"
 msgstr "Тэчка, якая ўтрымлівае пошту"
 
-#: mail/component-factory.c:117
+#: mail/component-factory.c:118
 msgid "Public Mail"
 msgstr "Публічная пошта"
 
-#: mail/component-factory.c:117
+#: mail/component-factory.c:118
 msgid "Public folder containing mail"
 msgstr "Публічная тэчка, якая утрымлівае пошту"
 
-#: mail/component-factory.c:118
+#: mail/component-factory.c:119
 msgid "Virtual Trash"
 msgstr "Віртуальная сьметніца"
 
-#: mail/component-factory.c:118
+#: mail/component-factory.c:119
 msgid "Virtual Trash folder"
 msgstr "Тэчка віртуальнае сьметніцы"
 
-#: mail/component-factory.c:146
+#: mail/component-factory.c:147
 msgid "This folder cannot contain messages."
 msgstr "Гэтая тэчка ня мажа ўтрымліваць паведамленьні."
 
-#: mail/component-factory.c:444
+#: mail/component-factory.c:441
 msgid "Properties..."
 msgstr "Уласьцівасьці..."
 
-#: mail/component-factory.c:444
+#: mail/component-factory.c:441
 msgid "Change this folder's properties"
 msgstr "Зьмяніць уласьцівасьць гэтае тэчкі"
 
-#: mail/component-factory.c:826
+#: mail/component-factory.c:819
 msgid ""
 "Some of your mail settings seem corrupt, please check that everything is in "
 "order."
 msgstr ""
 
-#: mail/component-factory.c:1008
+#: mail/component-factory.c:1000
 msgid "You have not set a mail transport method"
 msgstr "Вы не усталявалі мэтад транспартаваньня пошты"
 
-#: mail/component-factory.c:1031
+#: mail/component-factory.c:1023
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr "Маюцца недасланыя паведамленьні! Вы жадаеце завяршыць працу?"
 
-#: mail/component-factory.c:1071
+#: mail/component-factory.c:1063
 msgid "New Mail Message"
 msgstr "Новае паштовае паведамленьне"
 
-#: mail/component-factory.c:1071
+#: mail/component-factory.c:1063
 msgid "_Mail Message"
 msgstr "_Паштовае паведамленьне"
 
-#: mail/component-factory.c:1072
+#: mail/component-factory.c:1064
 msgid "Compose a new mail message"
 msgstr "Скласьці новае паведамленьне"
 
-#: mail/component-factory.c:1080
+#: mail/component-factory.c:1072
 msgid "New Message Post"
 msgstr "Даслаць новае паведамленьне"
 
-#: mail/component-factory.c:1080
+#: mail/component-factory.c:1072
 msgid "_Post Message"
 msgstr "_Даслаць паведамленьне"
 
-#: mail/component-factory.c:1081
+#: mail/component-factory.c:1073
 msgid "Post a new mail message"
 msgstr "Даслаць новае паштовае паведамленьне"
 
-#: mail/component-factory.c:1373
+#: mail/component-factory.c:1365
 msgid "Connecting..."
 msgstr "Далучэньне..."
 
-#: mail/component-factory.c:1384
+#: mail/component-factory.c:1376
 msgid "Cannot register storage with shell"
 msgstr "Неатрымалася зарэгістраваць сховішча з дапамогай абалонкі"
 
-#: mail/folder-info.c:70
-msgid "Getting Folder Information"
-msgstr "Атрыманьне інфармацыі па тэчке"
+#: mail/folder-browser-ui.c:486
+#, c-format
+msgid "Properties for \"%s\""
+msgstr "Уласьцівасьці для \"%s\""
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:1
-msgid "Composer Preferences"
-msgstr "Перавагі рэдактара паведамленьняў"
+#: mail/folder-browser-ui.c:488
+msgid "Properties"
+msgstr "Уласьцівасьці"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:2
-msgid ""
-"Configure mail preferences, including security and message display, here"
-msgstr ""
-"Тут наладжваюцца парвмэтры пошты, уключаючы бясьпеку й адлюстраваньне "
-"паведамленьняў"
+#: mail/folder-browser.c:327 mail/mail-display.c:394 mail/mail-display.c:942
+#, c-format
+msgid "Could not create temporary directory: %s"
+msgstr "Неатрымалася стварыць часовы каталёг: %s"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:3
-msgid "Configure spell-checking, signatures, and the message composer here"
-msgstr ""
-"Тут наладжваюцца праверка правапісу, подпісу й стварэньне паведамленьняў"
+#: mail/folder-browser.c:782
+#, c-format
+msgid "%d new"
+msgstr "%d новыя"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:4
-msgid "Configure your email accounts here"
-msgstr "Наладка вашых уліковых запісаў пошты робіцца тут"
+#: mail/folder-browser.c:785 mail/folder-browser.c:793
+#: mail/folder-browser.c:796
+msgid ", "
+msgstr ", "
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:5
-msgid "Evolution Mail"
-msgstr "Пошта \"Эвалюцыі\""
+#: mail/folder-browser.c:787
+#, c-format
+msgid "%d hidden"
+msgstr "%d схаваныя"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:6
-msgid "Evolution Mail accounts configuration control"
-msgstr "Сродак кіраваньня уліковамі запісамі пошты \"Эвалюцыі\""
+#: mail/folder-browser.c:789
+#, c-format
+msgid "%d visible"
+msgstr "%d бачныя"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:7
-msgid "Evolution Mail component"
-msgstr "Кампанэнт пошты \"Эвалюцыі\""
+#: mail/folder-browser.c:794
+#, c-format
+msgid "%d selected"
+msgstr "%d выбраныя"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:8
-msgid "Evolution Mail composer"
-msgstr "Рэдактар паведамленьняў \"Эвалюцыі\""
+#: mail/folder-browser.c:799
+#, c-format
+msgid "%d unsent"
+msgstr "%d недасланыя"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:9
-msgid "Evolution Mail composer configuration control"
-msgstr "Сродак кіраваньня рэдактарам паведамленьняў \"Эвалюцыі\""
+#: mail/folder-browser.c:801
+#, c-format
+msgid "%d sent"
+msgstr "%d дасланыя"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:10
-msgid "Evolution Mail configuration interface"
-msgstr "Інтэрфэйс наладкі пошты \"Эвалюцыі\""
+#: mail/folder-browser.c:803
+#, c-format
+msgid "%d total"
+msgstr "%d агулам"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:11
-msgid "Evolution Mail folder viewer"
-msgstr "Праглядальнік паштовае тэчкі \"Эвалюцыі\"."
+#: mail/folder-browser.c:1182
+msgid "Create _Virtual Folder From Search..."
+msgstr "Стварыць _віртуальную тэчку вынікаў пошуку..."
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:12
-msgid "Evolution Mail preferences control"
-msgstr "Кіраваньне перавагамі пошты \"Эвалюцыі\""
+#: mail/folder-browser.c:1736
+msgid "VFolder on _Subject"
+msgstr "Віртуальная тэчка па тэме"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:13
-msgid "Mail Accounts"
-msgstr "Уліковыя запісы пошты"
+#: mail/folder-browser.c:1737
+msgid "VFolder on Se_nder"
+msgstr "Віртуальная тэчка па адпраўляльніку"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:69
-msgid "Mail Preferences"
-msgstr "Перавагі пошты"
+#: mail/folder-browser.c:1738
+msgid "VFolder on _Recipients"
+msgstr "Віртуальная тэчка па атрымоўцы"
+
+#: mail/folder-browser.c:1739
+msgid "VFolder on Mailing _List"
+msgstr "Віртуальная тэчка па сьпісе рассылкі"
+
+#: mail/folder-browser.c:1743
+msgid "Filter on Sub_ject"
+msgstr "Фільтар па тэме"
+
+#: mail/folder-browser.c:1744
+msgid "Filter on Sen_der"
+msgstr "Фільтар па адпраўляльніку"
+
+#: mail/folder-browser.c:1745
+msgid "Filter on Re_cipients"
+msgstr "Фільтар па атрымоўцы"
+
+#: mail/folder-browser.c:1746 mail/folder-browser.c:2070
+msgid "Filter on _Mailing List"
+msgstr "Фільтар па сьпісе рассылкі"
+
+#: mail/folder-browser.c:1764
+msgid "_Edit as New Message..."
+msgstr "Зьмяніць як новае паведамленьне..."
+
+#: mail/folder-browser.c:1766
+msgid "_Print"
+msgstr "_Друк"
+
+#: mail/folder-browser.c:1770 ui/evolution-mail-message.xml.h:110
+msgid "_Reply to Sender"
+msgstr "Адказаць адпраўляльніку"
+
+#: mail/folder-browser.c:1771 ui/evolution-mail-message.xml.h:75
+msgid "Reply to _List"
+msgstr "Адказаць у сьпіс"
+
+#: mail/folder-browser.c:1772 ui/evolution-mail-message.xml.h:74
+msgid "Reply to _All"
+msgstr "Адказаць усім"
+
+#: mail/folder-browser.c:1773
+msgid "_Forward"
+msgstr "_Перадаслаць"
+
+#: mail/folder-browser.c:1777
+msgid "Follo_w Up..."
+msgstr "Падняцца вышэй..."
+
+#: mail/folder-browser.c:1778
+msgid "Fla_g Completed"
+msgstr "Выкананы сьцяг"
+
+#: mail/folder-browser.c:1779
+msgid "Cl_ear Flag"
+msgstr "Ачысьціць сьцяг"
+
+#. separator here?
+#: mail/folder-browser.c:1783 ui/evolution-mail-message.xml.h:43
+msgid "Mar_k as Read"
+msgstr "Пазначыць як чытанае"
+
+#: mail/folder-browser.c:1784
+msgid "Mark as _Unread"
+msgstr "Пазначыць як нечытанае"
+
+#: mail/folder-browser.c:1785
+msgid "Mark as _Important"
+msgstr "Пазначыць як важнае"
+
+#: mail/folder-browser.c:1786
+msgid "_Mark as Unimportant"
+msgstr "Пазначыць як неважнае"
+
+#: mail/folder-browser.c:1791
+msgid "U_ndelete"
+msgstr "_Вярнуць"
+
+#: mail/folder-browser.c:1795
+msgid "Mo_ve to Folder..."
+msgstr "Перамясьціць у тэчку..."
+
+#: mail/folder-browser.c:1796 ui/evolution-addressbook.xml.h:31
+msgid "_Copy to Folder..."
+msgstr "_Капіяваць у тэчку..."
+
+#: mail/folder-browser.c:1804
+msgid "Add Sender to Address_book"
+msgstr "Дадаць адпраўляльніка ў кнігу адрэсаў"
+
+#: mail/folder-browser.c:1808
+msgid "Appl_y Filters"
+msgstr "_Ужыць фільтары"
+
+#: mail/folder-browser.c:1812
+msgid "Crea_te Rule From Message"
+msgstr "Стварыць правіла з паведамленьня"
+
+#: mail/folder-browser.c:2071
+msgid "VFolder on M_ailing List"
+msgstr "Віртуальная тэчка па сьпісе рассылкі"
+
+#: mail/folder-browser.c:2073
+#, c-format
+msgid "Filter on _Mailing List (%s)"
+msgstr "Фільтар па сьпісе рассылкі (%s)"
+
+#: mail/folder-browser.c:2074
+#, c-format
+msgid "VFolder on M_ailing List (%s)"
+msgstr "Віртуальная тэчка па сьпісе рассылкі (%s)"
+
+#: mail/folder-browser.h:26 mail/mail-config.glade.h:39
+msgid "Default"
+msgstr "Дапомна"
+
+#: mail/folder-info.c:70
+msgid "Getting Folder Information"
+msgstr "Атрыманьне інфармацыі па тэчке"
 
 #: mail/importers/GNOME_Evolution_Mail_Elm_Intelligent_Importer.server.in.in.h:1
 msgid "Evolution Elm importer"
@@ -12201,7 +12078,7 @@ msgstr "_Імя карыстальніка:"
 msgid "_Path:"
 msgstr "_Шлях:"
 
-#: mail/mail-account-gui.c:1886
+#: mail/mail-account-gui.c:1887
 msgid "You may not create two accounts with the same name."
 msgstr "Вы ня можаце стварыць два рахункі з аднолькавымі назвамі."
 
@@ -12232,16 +12109,16 @@ msgstr "[Дапомна]"
 
 #. FIXME: This routine should just be a "toggled" event handler on the checkbox cell renderer which
 #. has "activatable" set.
-#: mail/mail-accounts.c:481 mail/mail-composer-prefs.c:708
-#: mail/mail-composer-prefs.c:854
+#: mail/mail-accounts.c:481 mail/mail-accounts.etspec.h:2
+#: mail/mail-composer-prefs.c:708 mail/mail-composer-prefs.c:854
 msgid "Enabled"
 msgstr "Уключана"
 
-#: mail/mail-accounts.c:487
+#: mail/mail-accounts.c:487 mail/mail-accounts.etspec.h:1
 msgid "Account name"
 msgstr "Назва уліковага запіса"
 
-#: mail/mail-accounts.c:489
+#: mail/mail-accounts.c:489 mail/mail-accounts.etspec.h:3
 msgid "Protocol"
 msgstr "Пратакол"
 
@@ -12284,6 +12161,214 @@ msgstr ""
 "    '%s'\n"
 "І будзе абноўлена."
 
+#. Add the "Don't show this message again." checkbox
+#: mail/mail-callbacks.c:101 widgets/misc/e-messagebox.c:226
+msgid "Don't show this message again."
+msgstr "Неадлюстроўваць гэтае паведамленьне нанова."
+
+#: mail/mail-callbacks.c:190
+msgid ""
+"You have not configured the mail client.\n"
+"You need to do this before you can send,\n"
+"receive or compose mail.\n"
+"Would you like to configure it now?"
+msgstr ""
+"Вы не наладзілі паштовага кліента.\n"
+"Вам трэба зрабіць гэта да тагочасу, як вы здолееце\n"
+"дасылаць, атрымліваць ці рэдагаваць пошту.\n"
+"Вы жадаеце наладзіць гэта зараз?"
+
+#: mail/mail-callbacks.c:212
+msgid ""
+"You need to configure an account\n"
+"before you can compose mail."
+msgstr ""
+"Вы мусіце наладзіць уліковы запіс\n"
+"да таго як стварыць паведамленьне."
+
+#: mail/mail-callbacks.c:226
+msgid ""
+"You need to configure an identity\n"
+"before you can compose mail."
+msgstr ""
+"Вы мусіце наладзіць карыстальніка\n"
+"да таго як вы здолееце дасылаць пошту."
+
+#: mail/mail-callbacks.c:233
+msgid ""
+"You need to configure a mail transport\n"
+"before you can compose mail."
+msgstr ""
+"Вы мусіце наладзіць перадачу пошты\n"
+"да таго як вы здолееце даслаць пошту."
+
+#. FIXME: this wording sucks
+#: mail/mail-callbacks.c:255
+msgid ""
+"You are sending an HTML-formatted message. Please make sure that\n"
+"the following recipients are willing and able to receive HTML mail:\n"
+msgstr ""
+"Вы дасылаеце паведамленьне фарматаванае ў HTML. Калі ласка,\n"
+"упэўніцеся што наступныя атрымоўцы жадаюць і могуць атрымліваць\n"
+"пошту у фармаце HTML:\n"
+
+#: mail/mail-callbacks.c:267
+msgid "Send anyway?"
+msgstr "Даслаць у любым выпадку?"
+
+#: mail/mail-callbacks.c:288
+msgid ""
+"This message has no subject.\n"
+"Really send?"
+msgstr ""
+"Гэтае паведамленьне ня мае тэмы.\n"
+"Даслаць яго?"
+
+#: mail/mail-callbacks.c:314
+msgid ""
+"Since the contact list you are sending to is configured to hide the list's "
+"addresses, this message will contain only Bcc recipients."
+msgstr ""
+
+#: mail/mail-callbacks.c:318
+msgid "This message contains only Bcc recipients."
+msgstr "Гэтае паведамленьне утрымлівае толькі атрымоўцаў схаванае копіі."
+
+#: mail/mail-callbacks.c:323
+msgid ""
+"It is possible that the mail server may reveal the recipients by adding an "
+"Apparently-To header.\n"
+"Send anyway?"
+msgstr ""
+
+#: mail/mail-callbacks.c:472
+msgid "You must specify recipients in order to send this message."
+msgstr "Вы мусіце пазначыць атрымоўцаў, каб даслаць гэтае паведамленьне."
+
+#: mail/mail-callbacks.c:724
+msgid ""
+"Unable to open the drafts folder for this account.\n"
+"Would you like to use the default drafts folder?"
+msgstr ""
+"Неатрымалася адкрыць тэчку чарнавікоў для гэтага рахунка.\n"
+"Жадаеце дапомна выкарыстоўваць тэчку чарнавікоў?"
+
+#: mail/mail-callbacks.c:1189
+msgid "an unknown sender"
+msgstr "невядомы адпраўляльнік"
+
+#: mail/mail-callbacks.c:1193
+msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
+msgstr "%a, %Y-%m-%d у %H:%M, %%s піша:"
+
+#: mail/mail-callbacks.c:1700 mail/message-browser.c:132
+msgid "Move message(s) to"
+msgstr "Перамясьціць паведамленьне(і) ў"
+
+#: mail/mail-callbacks.c:1702 mail/message-browser.c:134
+msgid "Copy message(s) to"
+msgstr "Капіяваць паведамленьне(і) ў"
+
+#: mail/mail-callbacks.c:2344
+#, c-format
+msgid "Are you sure you want to edit all %d messages?"
+msgstr "Вы упэўненыя што жадаеце даслаць усе %d паведамленьні?"
+
+#: mail/mail-callbacks.c:2360
+msgid ""
+"You may only edit messages saved\n"
+"in the Drafts folder."
+msgstr ""
+"Вы можаце даслаць толькі паведамленьні\n"
+"захаваныя ў тэчцы \"Чарнавікі\"."
+
+#: mail/mail-callbacks.c:2393
+msgid ""
+"You may only resend messages\n"
+"in the Sent folder."
+msgstr ""
+"Вы можаце толькі перадасылаць паведамленьні\n"
+"з тэчкі \"Дасланыя\"."
+
+#: mail/mail-callbacks.c:2403
+#, c-format
+msgid "Are you sure you want to resend all %d messages?"
+msgstr "Вы упэўненыя што жадаеце перадаслаць усе %d паведамленьні?"
+
+#: mail/mail-callbacks.c:2424
+msgid "No Message Selected"
+msgstr "Паведамленьне ня выбрана"
+
+#: mail/mail-callbacks.c:2465
+#, c-format
+msgid ""
+"Cannot save to `%s'\n"
+" %s"
+msgstr ""
+"Немагчыма захаваць у `%s'\n"
+" %s"
+
+#: mail/mail-callbacks.c:2470
+#, c-format
+msgid ""
+"`%s' already exists.\n"
+"Overwrite it?"
+msgstr ""
+"`%s' ужо існуе.\n"
+"Перазапісаць?"
+
+#: mail/mail-callbacks.c:2511
+msgid "Save Message As..."
+msgstr "Захаваць паведамлеьне як..."
+
+#: mail/mail-callbacks.c:2513
+msgid "Save Messages As..."
+msgstr "Захаваць паведамленьні як..."
+
+#: mail/mail-callbacks.c:2686
+msgid ""
+"This operation will permanently erase all messages marked as\n"
+"deleted. If you continue, you will not be able to recover these messages.\n"
+"\n"
+"Really erase these messages?"
+msgstr ""
+"Гэтая апэрацыя прывядзе да поўнага вынішчэньня усіх паведамленьняў\n"
+"пазначаных як выдаленыя. Калі вы працягніце, гэтае нельга будзе аднавіць.\n"
+"\n"
+"Сапраўды сьцёрці паведамленьні?"
+
+#: mail/mail-callbacks.c:2781
+#, c-format
+msgid ""
+"Error loading filter information:\n"
+"%s"
+msgstr ""
+"Памылка пад час загрузкі інфармацыі фільтара:\n"
+"%s"
+
+#: mail/mail-callbacks.c:2789
+msgid "Filters"
+msgstr "Фільтары"
+
+#: mail/mail-callbacks.c:2830
+#, c-format
+msgid "Page %d of %d"
+msgstr "Аркуш %d з %d"
+
+#: mail/mail-callbacks.c:2886
+msgid "Print Message"
+msgstr "Друк паведамленьня"
+
+#: mail/mail-callbacks.c:2954
+msgid "Printing of message failed"
+msgstr "Збой друку паведамленьня"
+
+#: mail/mail-callbacks.c:3147
+#, c-format
+msgid "Are you sure you want to open all %d messages in separate windows?"
+msgstr ""
+"Вы упэўненыя што жадаеце адкрыць усе %d паведамленьні ў асобных вокнах?"
+
 #: mail/mail-composer-prefs.c:226 mail/mail-composer-prefs.c:349
 #: mail/mail-config.c:1376
 msgid "Unnamed"
@@ -12309,30 +12394,22 @@ msgstr "Дадаць подпіс сцэнара"
 msgid "Signature(s)"
 msgstr "Подпіс(ы)"
 
-#: mail/mail-config.c:1080
-msgid "Checking Service"
-msgstr "Праверка паслугі"
-
-#: mail/mail-config.c:1158 mail/mail-config.c:1162
-msgid "Connecting to server..."
-msgstr "Далучэньне да паслужніка..."
-
-#: mail/mail-config-druid.c:367 mail/mail-config.glade.h:61
+#: mail/mail-config-druid.c:380 mail/mail-config.glade.h:61
 msgid "Identity"
 msgstr "сапраўдны"
 
-#: mail/mail-config-druid.c:369
+#: mail/mail-config-druid.c:382
 msgid ""
 "Please enter your name and email address below. The \"optional\" fields "
 "below do not need to be filled in, unless you wish to include this "
 "information in email you send."
 msgstr ""
 
-#: mail/mail-config-druid.c:375 mail/mail-config-druid.c:382
+#: mail/mail-config-druid.c:388 mail/mail-config-druid.c:395
 msgid "Receiving Mail"
 msgstr "Атрыманьне пошты"
 
-#: mail/mail-config-druid.c:377
+#: mail/mail-config-druid.c:390
 msgid ""
 "Please enter information about your incoming mail server below. If you are "
 "not sure, ask your system administrator or Internet Service Provider."
@@ -12341,15 +12418,15 @@ msgstr ""
 "Калі вы няпэўныя, запытайцеся вашага сыстэмнага адміністратара ці правайдэра "
 "паслуг Інтарнэт."
 
-#: mail/mail-config-druid.c:384
+#: mail/mail-config-druid.c:397
 msgid "Please select among the following options"
 msgstr "Выбярыце адзін з наступных варыянтаў"
 
-#: mail/mail-config-druid.c:387
+#: mail/mail-config-druid.c:400
 msgid "Sending Mail"
 msgstr "Адпраўка пошты"
 
-#: mail/mail-config-druid.c:389
+#: mail/mail-config-druid.c:402
 msgid ""
 "Please enter information about the way you will send mail. If you are not "
 "sure, ask your system administrator or Internet Service Provider."
@@ -12357,11 +12434,11 @@ msgstr ""
 "Калі ласка, пазначце інфармацыю аб шляхах адпраўкі пошты. Калі вы няпэўныя, "
 "запытайцеся вашага сыстэмнага адміністратара ці правайдэра паслуг Інтарнэт."
 
-#: mail/mail-config-druid.c:394 mail/mail-config.glade.h:10
+#: mail/mail-config-druid.c:407 mail/mail-config.glade.h:10
 msgid "Account Management"
 msgstr "Кіраваньне рахункамі"
 
-#: mail/mail-config-druid.c:396
+#: mail/mail-config-druid.c:409
 msgid ""
 "You are almost done with the mail configuration process. The identity, "
 "incoming mail server and outgoing mail transport method which you provided "
@@ -12370,6 +12447,14 @@ msgid ""
 "purposes only."
 msgstr ""
 
+#: mail/mail-config.c:1080
+msgid "Checking Service"
+msgstr "Праверка паслугі"
+
+#: mail/mail-config.c:1158 mail/mail-config.c:1162
+msgid "Connecting to server..."
+msgstr "Далучэньне да паслужніка..."
+
 #: mail/mail-config.glade.h:3
 msgid " _Check for supported types "
 msgstr " Праверка тыпаў якія падтрымліваюцца "
@@ -12492,10 +12577,6 @@ msgstr ""
 msgid "De_fault"
 msgstr "_Дапомна"
 
-#: mail/mail-config.glade.h:39
-msgid "Default"
-msgstr "Дапомна"
-
 #: mail/mail-config.glade.h:40
 msgid "Default Behavior"
 msgstr "Дапомныя паводзіны"
@@ -12941,62 +13022,252 @@ msgstr "_Выкарыстоўваць злучэньне праз SSL:"
 msgid "_Use the same fonts as other applications"
 msgstr "Выкарыстоўваць тойжа шрыфт што і аснатнія дастасаваньні"
 
+#: mail/mail-config.glade.h:171
+msgid "color"
+msgstr "колер"
+
 #: mail/mail-config.glade.h:172
 msgid "description"
 msgstr "апісаньне"
 
-#: mail/mail-folder-cache.c:832
+#: mail/mail-crypto.c:84
+msgid "Could not create a S/MIME signature context."
+msgstr "Неатрымліваецца стварыць кантэкст подпіса s/MIME"
+
+#: mail/mail-crypto.c:116
+msgid "Could not create a S/MIME certsonly context."
+msgstr "Неатрымліваецца стварыць кантэкст S/MIME certonly"
+
+#: mail/mail-crypto.c:148
+msgid "Could not create a S/MIME encryption context."
+msgstr "Неатрымліваецца стварыць кантэкст шыфраваньня S/MIME"
+
+#: mail/mail-crypto.c:180
+msgid "Could not create a S/MIME envelope context."
+msgstr "Неатрымліваецца стварыць кантэкст абалонкі S/MIME"
+
+#: mail/mail-crypto.c:211
+msgid "Could not create a S/MIME decode context."
+msgstr "Неатрымліваецца стварыць кантэкст дэкадаваньня S/MIME"
+
+#: mail/mail-display.c:197
+#, c-format
+msgid ""
+"File `%s' already exists.\n"
+"Overwrite it?"
+msgstr ""
+"Файл `%s' ужо існуе.\n"
+"Перапісаць яго?"
+
+#: mail/mail-display.c:336
+msgid "Save Attachment"
+msgstr "Захаваць укладаньне"
+
+#: mail/mail-display.c:409
+#, c-format
+msgid "Could not create temporary file '%s': %s"
+msgstr "Немагчыма стварыць часовы файл '%s': %s"
+
+#: mail/mail-display.c:457
+msgid "Save Attachment..."
+msgstr "Захаваць укладаньне..."
+
+#: mail/mail-display.c:458
+msgid "View Inline"
+msgstr "Убудаваны прагляд"
+
+#: mail/mail-display.c:459
+#, c-format
+msgid "Open in %s..."
+msgstr "Адкрыць у %s..."
+
+#: mail/mail-display.c:515
+#, c-format
+msgid "View Inline (via %s)"
+msgstr "Убудаваны прагляд (праз %s)"
+
+#: mail/mail-display.c:519
+msgid "Hide"
+msgstr "Схаваць"
+
+#: mail/mail-display.c:539
+msgid "External Viewer"
+msgstr "Вонкавы праглядальнік"
+
+#: mail/mail-display.c:1368
+msgid "Downloading images"
+msgstr "Загрузка відарысаў"
+
+#: mail/mail-display.c:1545
+msgid "Loading message content"
+msgstr "Загрузка зьместу паведамленьня"
+
+#: mail/mail-display.c:1887
+msgid "Overdue:"
+msgstr "Пратэрмінавана:"
+
+#: mail/mail-display.c:1891
+msgid "by %B %d, %Y, %l:%M %P"
+msgstr "да %B %d, %Y, %l:%M %P"
+
+#: mail/mail-display.c:2255
+msgid "Open Link in Browser"
+msgstr "Адкрыць спасылку ў аглядальніке"
+
+#: mail/mail-display.c:2256
+msgid "Copy Link Location"
+msgstr "Скапіяваць спасылку"
+
+#: mail/mail-display.c:2258
+msgid "Save Link as (FIXME)"
+msgstr "Захаваць спасылку як"
+
+#: mail/mail-display.c:2260
+msgid "Save Image as..."
+msgstr "Захаваць відарыс як..."
+
+#: mail/mail-folder-cache.c:745
 #, c-format
 msgid "Pinging %s"
 msgstr "Зандаваньне %s"
 
+#: mail/mail-format.c:665
+#, c-format
+msgid "%s attachment"
+msgstr "%s укладаньне"
+
+#: mail/mail-format.c:707 mail/mail-format.c:1370 mail/mail-format.c:1439
+#: mail/mail-format.c:1559 mail/mail-format.c:1683 mail/mail-format.c:1708
+msgid "Could not parse MIME message. Displaying as source."
+msgstr "Неатрымалася разабраць паведамленьне MIME. Адлюстроўваецца як крыніца."
+
+#: mail/mail-format.c:785 mail/message-list.etspec.h:2
+msgid "Date"
+msgstr "Дата"
+
+#: mail/mail-format.c:871
+msgid "Bad Address"
+msgstr "Кепская адрэса"
+
+#: mail/mail-format.c:912 mail/message-list.etspec.h:7
+#: mail/message-tag-followup.c:301
+msgid "From"
+msgstr "Ад каго"
+
+#: mail/mail-format.c:916
+msgid "Reply-To"
+msgstr "Адказаць на"
+
+#: mail/mail-format.c:921 mail/message-list.etspec.h:14
+msgid "To"
+msgstr "Каму"
+
+#: mail/mail-format.c:926
+msgid "Cc"
+msgstr "Копія"
+
+#: mail/mail-format.c:931
+msgid "Bcc"
+msgstr "Сх.копія"
+
+#: mail/mail-format.c:1482
+msgid ""
+"This message is digitally signed. Click the lock icon for more information."
+msgstr ""
+"Гэта паведамленьне мае лічбавы подпіс. Клікніце па значке замка для "
+"дадатковых зьвестак."
+
+#: mail/mail-format.c:1510
+msgid "Could not create a PGP verfication context"
+msgstr "Неатрымалася стварыць кантэкст праверкі PGP"
+
+#: mail/mail-format.c:1518
+msgid "This message is digitally signed and has been found to be authentic."
+msgstr ""
+"Гэта паведамленьне з лічбавым подпісам, які прайшоў праверку тоеснасьці."
+
+#: mail/mail-format.c:1525
+msgid "This message is digitally signed but can not be proven to be authentic."
+msgstr ""
+"Гэта паведамленьне з лічбавым подпісам, які ня можа быць правераны на "
+"тоеснасьць."
+
+#: mail/mail-format.c:1789
+#, c-format
+msgid "Pointer to FTP site (%s)"
+msgstr "Указальнік на FTP сайт (%s)"
+
+#: mail/mail-format.c:1800
+#, c-format
+msgid "Pointer to local file (%s) valid at site \"%s\""
+msgstr "Указальнік на лякальны файл (%s), даступны на сайце \"%s\""
+
+#: mail/mail-format.c:1803
+#, c-format
+msgid "Pointer to local file (%s)"
+msgstr "Указальнік на лакальны файл (%s)"
+
+#: mail/mail-format.c:1830
+#, c-format
+msgid "Pointer to remote data (%s)"
+msgstr "Указальнік на аддаленыя даньні (%s)"
+
+#: mail/mail-format.c:1836
+#, c-format
+msgid "Pointer to unknown external data (\"%s\" type)"
+msgstr "Указальнік на невядомыя вонкавыя даньні (тыпа \"%s\")"
+
+#: mail/mail-format.c:1838
+msgid "Malformed external-body part."
+msgstr "Часка external-body памылкова сфармаваная"
+
 #: mail/mail-local.c:541 mail/mail-local.c:543
 #, c-format
 msgid "Local folders/%s"
 msgstr "Лакальныя тэчкі/%s"
 
-#: mail/mail-local.c:711
+#: mail/mail-local.c:671
 msgid "Reconfiguring folder"
 msgstr "Пераналадка тэчкі"
 
-#: mail/mail-local.c:792
+#: mail/mail-local.c:752
 #, c-format
 msgid ""
 "Cannot save folder metainfo; you may find you can't\n"
 "open this folder anymore: %s: %s"
 msgstr ""
 
-#: mail/mail-local.c:848
+#: mail/mail-local.c:808
 #, c-format
 msgid "Cannot save folder metainfo to %s: %s"
 msgstr "Неатрымліваецца захаваць мэтаданьні тэчкі ў %s: %s"
 
-#: mail/mail-local.c:900
+#: mail/mail-local.c:860
 #, c-format
 msgid "Cannot delete folder metadata %s: %s"
 msgstr "Неатрымліваецца выдаліць мэтаданьні тэчкі %s: %s"
 
-#: mail/mail-local.c:1363
+#: mail/mail-local.c:1323
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "Зьмяненьне тэчкі \"%s\" у фармат \"%s\""
 
-#: mail/mail-local.c:1388
+#: mail/mail-local.c:1348
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
 msgstr ""
 
-#: mail/mail-local.c:1488
+#: mail/mail-local.c:1448
 #, c-format
 msgid "Reconfigure /%s"
 msgstr "Пераналадзіць /%s"
 
-#: mail/mail-local.c:1552
+#: mail/mail-local.c:1512
 msgid "You cannot change the format of a non-local folder."
 msgstr "Вы ня можаце зьмяніць фармат нелакальнай тэчкі."
 
-#: mail/mail-mt.c:259
+#: mail/mail-mt.c:257
 #, c-format
 msgid ""
 "Error while '%s':\n"
@@ -13005,7 +13276,7 @@ msgstr ""
 "Памылка пад час \"%s\":\n"
 "%s"
 
-#: mail/mail-mt.c:262
+#: mail/mail-mt.c:260
 #, c-format
 msgid ""
 "Error while performing operation:\n"
@@ -13014,131 +13285,118 @@ msgstr ""
 "Памылка пад час выкананьня апэрацыі:\n"
 "%s"
 
-#: mail/mail-mt.c:913
+#: mail/mail-mt.c:904
 msgid "Working"
 msgstr "Праца"
 
-#: mail/mail-ops.c:87
+#: mail/mail-ops.c:86
 msgid "Filtering Folder"
 msgstr "Фільтраваньне тэчкі"
 
-#: mail/mail-ops.c:260
+#: mail/mail-ops.c:264
 msgid "Fetching Mail"
 msgstr "Атрыманьне пошты"
 
-#: mail/mail-ops.c:557
-#, fuzzy, c-format
-msgid "Failed to apply outgoing filters: %s"
-msgstr "Збой пад час захаваньня пошты ў часовым файле %s: %s"
-
-#: mail/mail-ops.c:578
-#, c-format
-msgid ""
-"Failed to append to %s: %s\n"
-"Appending to local `Sent' folder instead."
-msgstr ""
-
-#: mail/mail-ops.c:587
-#, fuzzy, c-format
-msgid "Failed to append to local `Sent' folder: %s"
-msgstr "Збой пад час захаваньня пошты ў часовым файле %s: %s"
+#: mail/mail-ops.c:550 mail/mail-ops.c:579
+msgid "However, the message was successfully sent."
+msgstr "Аднак паведамленьне было пасьпяхова даслана."
 
-#: mail/mail-ops.c:629
+#: mail/mail-ops.c:611
 #, c-format
 msgid "Sending \"%s\""
 msgstr "Адпраўленьне \"%s\""
 
-#: mail/mail-ops.c:747
+#: mail/mail-ops.c:729
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Адпраўленьне паведамленьня %d з %d"
 
-#: mail/mail-ops.c:766
+#: mail/mail-ops.c:748
 #, c-format
 msgid "Failed on message %d of %d"
 msgstr "Збой на паведамленьні %d з %d"
 
-#: mail/mail-ops.c:768
+#: mail/mail-ops.c:750 mail/mail-send-recv.c:581
 msgid "Complete."
 msgstr "Выканана."
 
-#: mail/mail-ops.c:862
+#: mail/mail-ops.c:844
 msgid "Saving message to folder"
 msgstr "Захаваньне паведамленьня ў тэчцы"
 
-#: mail/mail-ops.c:943
+#: mail/mail-ops.c:925
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Перамяшчэньне паведамленьняў у %s"
 
-#: mail/mail-ops.c:943
+#: mail/mail-ops.c:925
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Капіяваньне паведамленьняў у %s"
 
-#: mail/mail-ops.c:1056
+#: mail/mail-ops.c:1042
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Сканаваньне тэчак у \"%s\""
 
-#: mail/mail-ops.c:1244
+#: mail/mail-ops.c:1225
 msgid "Forwarded messages"
 msgstr "Перадасланыя паведамленьні"
 
-#: mail/mail-ops.c:1287
+#: mail/mail-ops.c:1268
 #, c-format
 msgid "Opening folder %s"
 msgstr "Адкрыцьцё тэчкі \"%s\""
 
-#: mail/mail-ops.c:1359
+#: mail/mail-ops.c:1340
 #, c-format
 msgid "Opening store %s"
 msgstr "Адкрыцьцё сховішча %s"
 
-#: mail/mail-ops.c:1437
+#: mail/mail-ops.c:1413
 #, c-format
 msgid "Removing folder %s"
 msgstr "Выдаленьне тэчкі %s"
 
-#: mail/mail-ops.c:1531
+#: mail/mail-ops.c:1507
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Захаваньне тэчкі \"%s\""
 
-#: mail/mail-ops.c:1582
+#: mail/mail-ops.c:1558
 msgid "Refreshing folder"
 msgstr "Абнаўленьне тэчкі"
 
-#: mail/mail-ops.c:1618 mail/mail-ops.c:1669
+#: mail/mail-ops.c:1594 mail/mail-ops.c:1645
 msgid "Expunging folder"
 msgstr "Выкрэсьленьне тэчкі"
 
-#: mail/mail-ops.c:1666
+#: mail/mail-ops.c:1642
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "Спусташэньне сьметніцы ў \"%s\""
 
-#: mail/mail-ops.c:1667 my-evolution/e-summary-mail.c:483
+#: mail/mail-ops.c:1643 my-evolution/e-summary-mail.c:483
 #: shell/e-local-storage.c:1151
 msgid "Local Folders"
 msgstr "Лакальныя тэчкі"
 
-#: mail/mail-ops.c:1742
+#: mail/mail-ops.c:1718
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Атрыманьне паведамленьня %s"
 
-#: mail/mail-ops.c:1814
+#: mail/mail-ops.c:1790
 #, c-format
 msgid "Retrieving %d message(s)"
 msgstr "Атрыманьне %d паведамленьняў"
 
-#: mail/mail-ops.c:1898
+#: mail/mail-ops.c:1876
 #, c-format
 msgid "Saving %d messsage(s)"
 msgstr "Захаваньне %d паведамленьняў"
 
-#: mail/mail-ops.c:1946
+#: mail/mail-ops.c:1924
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -13147,7 +13405,7 @@ msgstr ""
 "Неатрымалася стварыць файл вываду: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1974
+#: mail/mail-ops.c:1952
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -13156,11 +13414,11 @@ msgstr ""
 "Памылка захаваньня паведамленьняў у: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2045
+#: mail/mail-ops.c:2026
 msgid "Saving attachment"
 msgstr "Захаваньне ўкладаньня"
 
-#: mail/mail-ops.c:2062
+#: mail/mail-ops.c:2043
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -13169,74 +13427,106 @@ msgstr ""
 "Неатрымалася стварыць файл вываду: %s\n"
 " %s"
 
-#: mail/mail-ops.c:2092
+#: mail/mail-ops.c:2073
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Немагчыма запісаць даньні: %s"
 
-#: mail/mail-ops.c:2240
+#: mail/mail-ops.c:2221
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Адлучэньне ад %s"
 
-#: mail/mail-ops.c:2240
+#: mail/mail-ops.c:2221
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Перадалучэньне да %s"
 
-#: mail/mail-send-recv.c:147
+#: mail/mail-search.c:154
+msgid "(Untitled Message)"
+msgstr "(Паведамленьне бяз назвы)"
+
+#: mail/mail-search.c:236
+msgid "Untitled Message"
+msgstr "Паведамленьне бяз назвы"
+
+#: mail/mail-search.c:238
+msgid "Empty Message"
+msgstr "Пустое паведамленьне"
+
+#: mail/mail-search.c:287
+msgid "Find in Message"
+msgstr "Пошук у паведамленьні"
+
+#: mail/mail-search.c:320
+msgid "Case Sensitive"
+msgstr "Улічваць рэгістар"
+
+#: mail/mail-search.c:322
+msgid "Search Forward"
+msgstr "Пошук наперад"
+
+#: mail/mail-search.c:342
+msgid "Find:"
+msgstr "Пошук:"
+
+#: mail/mail-search.c:346
+msgid "Matches:"
+msgstr "Супадзеньні:"
+
+#: mail/mail-send-recv.c:146
 msgid "Cancelling..."
 msgstr "Адмена..."
 
-#: mail/mail-send-recv.c:255
+#: mail/mail-send-recv.c:254
 #, c-format
 msgid "Server: %s, Type: %s"
 msgstr "Паслужнік: %s, Тып: %s"
 
-#: mail/mail-send-recv.c:257
+#: mail/mail-send-recv.c:256
 #, c-format
 msgid "Path: %s, Type: %s"
 msgstr "Шлях: %s, Тып: %s"
 
-#: mail/mail-send-recv.c:259
+#: mail/mail-send-recv.c:258
 #, c-format
 msgid "Type: %s"
 msgstr "Тып: %s"
 
-#: mail/mail-send-recv.c:308
+#: mail/mail-send-recv.c:306
 msgid "Send & Receive Mail"
 msgstr "Атрыманьне і адпраўленьне пошты"
 
-#: mail/mail-send-recv.c:309
+#: mail/mail-send-recv.c:307
 msgid "Cancel _All"
 msgstr "Адмяніць _усё"
 
-#: mail/mail-send-recv.c:390
+#: mail/mail-send-recv.c:389
 msgid "Updating..."
 msgstr "Абнаўленьне..."
 
-#: mail/mail-send-recv.c:390 mail/mail-send-recv.c:442
+#: mail/mail-send-recv.c:390 mail/mail-send-recv.c:446
 msgid "Waiting..."
 msgstr "Чаканьне..."
 
-#: mail/mail-session.c:229
+#: mail/mail-session.c:226
 msgid "User canceled operation."
 msgstr "Апэрацыя адменена карыстальнікам."
 
-#: mail/mail-session.c:262
+#: mail/mail-session.c:259
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Пазначце пароль для %s"
 
-#: mail/mail-session.c:264
+#: mail/mail-session.c:261
 msgid "Enter Password"
 msgstr "Пазначце пароль"
 
-#: mail/mail-session.c:287
+#: mail/mail-session.c:284
 msgid "_Remember this password"
 msgstr "_Запомніць гэты пароль"
 
-#: mail/mail-session.c:288
+#: mail/mail-session.c:285
 msgid "_Remember this password for the remainder of this session"
 msgstr "_Запомніць гэты пароль да завяршэньня сэанса"
 
@@ -13284,17 +13574,21 @@ msgstr "Перадасланае паведамленьне - %s"
 msgid "Forwarded message"
 msgstr "Перадасланае паведамленьне"
 
-#: mail/mail-vfolder.c:91
+#: mail/mail-tools.c:438
+msgid "Forwarded Message"
+msgstr "Перадасланае паведамленьне"
+
+#: mail/mail-vfolder.c:92
 #, c-format
 msgid "Setting up vfolder: %s"
 msgstr "Наладка віртуальнае тэчкі %s"
 
-#: mail/mail-vfolder.c:209
+#: mail/mail-vfolder.c:210
 #, c-format
 msgid "Updating vfolders for uri: %s"
 msgstr "Абнаўленьне віртуальнае тэчкі на URI: %s"
 
-#: mail/mail-vfolder.c:467
+#: mail/mail-vfolder.c:468
 #, c-format
 msgid ""
 "The following vFolder(s):\n"
@@ -13307,95 +13601,100 @@ msgstr ""
 "    \"%s\"\n"
 "І быдзе абноўлена."
 
-#: mail/mail-vfolder.c:776
+#: mail/mail-vfolder.c:777
 msgid "VFolders"
 msgstr "Віртуальныя тэчкі"
 
-#: mail/mail-vfolder.c:834
+#: mail/mail-vfolder.c:835
 msgid "vFolders"
 msgstr "Віртуальныя тэчкі"
 
-#: mail/mail-vfolder.c:873
+#: mail/mail-vfolder.c:874
 msgid "Edit VFolder"
 msgstr "Рэдагаваньне віртуальных тэчак"
 
-#: mail/mail-vfolder.c:893
+#: mail/mail-vfolder.c:894
 #, c-format
 msgid "Trying to edit a vfolder '%s' which doesn't exist."
 msgstr "Спроба рэдагаваць віртуальную тэчку '%s' якая не існуе."
 
-#: mail/mail-vfolder.c:965
+#: mail/mail-vfolder.c:966
 msgid "New VFolder"
 msgstr "Новая віртуальная тэчка"
 
-#: mail/message-list.c:900
+#: mail/message-browser.c:233
+msgid "(No subject)"
+msgstr "(Бяз тэмы)"
+
+#: mail/message-browser.c:235
+#, c-format
+msgid "%s - Message"
+msgstr "%s - Паведамленьне"
+
+#: mail/message-list.c:741
 msgid "Unseen"
 msgstr "Нечытанае"
 
-#: mail/message-list.c:901
+#: mail/message-list.c:742
 msgid "Seen"
 msgstr "Прагледзенае"
 
-#: mail/message-list.c:902
+#: mail/message-list.c:743
 msgid "Answered"
 msgstr "Адказанае"
 
-#: mail/message-list.c:903
+#: mail/message-list.c:744
 msgid "Multiple Unseen Messages"
 msgstr "Шматлікія непрагледзеныя паведамленьні"
 
-#: mail/message-list.c:904
+#: mail/message-list.c:745
 msgid "Multiple Messages"
 msgstr "Шматлікія паведамленьні"
 
-#: mail/message-list.c:908
+#: mail/message-list.c:749
 msgid "Lowest"
 msgstr "Ніжэйшы"
 
-#: mail/message-list.c:909
+#: mail/message-list.c:750
 msgid "Lower"
 msgstr "Ніжей"
 
-#: mail/message-list.c:913
+#: mail/message-list.c:754
 msgid "Higher"
 msgstr "Высокі"
 
-#: mail/message-list.c:914
+#: mail/message-list.c:755
 msgid "Highest"
 msgstr "Вышэйшы"
 
-#: mail/message-list.c:1231
+#: mail/message-list.c:1072
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:1238
+#: mail/message-list.c:1079
 msgid "Today %l:%M %p"
 msgstr "Сёньня %I:%M %p"
 
-#: mail/message-list.c:1247
+#: mail/message-list.c:1088
 msgid "Yesterday %l:%M %p"
 msgstr "Учора %l:%M %p"
 
-#: mail/message-list.c:1259
+#: mail/message-list.c:1100
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: mail/message-list.c:1267
+#: mail/message-list.c:1108
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %l:%M %p"
 
-#: mail/message-list.c:1269
+#: mail/message-list.c:1110
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
-#: mail/message-list.c:3062
+#: mail/message-list.c:2649
 msgid "Generating message list"
 msgstr "Стварэньне сьпісу паведамленьняў"
 
-#: mail/message-list.etspec.h:2
-msgid "Date"
-msgstr "Дата"
-
 #: mail/message-list.etspec.h:3
 msgid "Due By"
 msgstr "Умоўлена да"
@@ -13412,10 +13711,6 @@ msgstr "Пазначана"
 msgid "Follow Up Flag"
 msgstr "Сьцяг \"Да выкананьня\""
 
-#: mail/message-list.etspec.h:7 mail/message-tag-followup.c:301
-msgid "From"
-msgstr "Ад каго"
-
 #: mail/message-list.etspec.h:8
 msgid "Original Location"
 msgstr "Зыходнае разьмяшчэньне"
@@ -13428,10 +13723,6 @@ msgstr "Атрымана"
 msgid "Size"
 msgstr "Памер"
 
-#: mail/message-list.etspec.h:14
-msgid "To"
-msgstr "Каму"
-
 #: mail/message-tag-followup.c:62
 msgid "Call"
 msgstr "Выклік"
@@ -13448,7 +13739,7 @@ msgstr "Да выкананьня"
 msgid "For Your Information"
 msgstr "Да вашага ведама"
 
-#: mail/message-tag-followup.c:66 ui/evolution-mail-message.xml.h:40
+#: mail/message-tag-followup.c:66 ui/evolution-mail-message.xml.h:36
 msgid "Forward"
 msgstr "Перадаслаць"
 
@@ -13456,11 +13747,11 @@ msgstr "Перадаслаць"
 msgid "No Response Necessary"
 msgstr "Можна не адказваць"
 
-#: mail/message-tag-followup.c:69 ui/evolution-mail-message.xml.h:77
+#: mail/message-tag-followup.c:69 ui/evolution-mail-message.xml.h:72
 msgid "Reply"
 msgstr "Адказаць"
 
-#: mail/message-tag-followup.c:70 ui/evolution-mail-message.xml.h:78
+#: mail/message-tag-followup.c:70 ui/evolution-mail-message.xml.h:73
 msgid "Reply to All"
 msgstr "Адказаць усім"
 
@@ -13490,6 +13781,39 @@ msgstr "Умоўлена да:"
 msgid "_Flag:"
 msgstr "_Сьцяг:"
 
+#: mail/subscribe-dialog.c:230
+#, c-format
+msgid "Scanning folders under %s on \"%s\""
+msgstr "Сканаваньне тэчак у %s на \"%s\""
+
+#: mail/subscribe-dialog.c:232
+#, c-format
+msgid "Scanning root-level folders on \"%s\""
+msgstr "Сканаваньне карэнных тэчак у \"%s\""
+
+#: mail/subscribe-dialog.c:329
+#, c-format
+msgid "Subscribing to folder \"%s\""
+msgstr "Падпісваньне на тэчку \"%s\""
+
+#: mail/subscribe-dialog.c:331
+#, c-format
+msgid "Unsubscribing to folder \"%s\""
+msgstr "Адмаўленьне ад тэчкі \"%s\""
+
+#: mail/subscribe-dialog.c:1270 mail/subscribe-dialog.etspec.h:1
+#: shell/e-storage-set-view.etspec.h:2
+msgid "Folder"
+msgstr "Тэчка"
+
+#: mail/subscribe-dialog.c:1499
+msgid "No server has been selected"
+msgstr "Небыў выбраны паслужнік"
+
+#: mail/subscribe-dialog.c:1598
+msgid "Please select a server."
+msgstr "Калі ласка, выбярыце паслужнік."
+
 #: mail/subscribe-dialog.glade.h:1
 msgid "Folder Subscriptions"
 msgstr "Тэчка з падпіскамі"
@@ -13503,123 +13827,17 @@ msgid "S_erver:"
 msgstr "Паслужнік:"
 
 #: mail/subscribe-dialog.glade.h:4
+msgid "Scanning folders ..."
+msgstr "Сканаваньне тэчак..."
+
+#: mail/subscribe-dialog.glade.h:5
 msgid "_Subscribe"
 msgstr "_Падпісацца"
 
-#: mail/subscribe-dialog.glade.h:5
+#: mail/subscribe-dialog.glade.h:6
 msgid "_Unsubscribe"
 msgstr "_Адмовіцца ад падпіскі"
 
-#: my-evolution/component-factory.c:56
-msgid "Folder containing the Evolution Summary"
-msgstr "Тэчка утрымлівае агульныя зьвесткі \"Эвалюцыі\""
-
-#: my-evolution/e-summary.c:204
-msgid "%A, %B %e %Y"
-msgstr "%A, %B %e %Y"
-
-#: my-evolution/e-summary.c:533
-msgid "Please wait..."
-msgstr "Калі ласка, пачакайце..."
-
-#: my-evolution/e-summary.c:622 ui/my-evolution.xml.h:2
-msgid "Print Summary"
-msgstr "Надрукаваць агульныя зьвесткі"
-
-#: my-evolution/e-summary.c:655
-msgid "Printing of Summary failed"
-msgstr "Збой друку агульных зьвестак"
-
-#: my-evolution/e-summary-calendar.c:384
-msgid "Appointments"
-msgstr "Сустрэчы"
-
-#: my-evolution/e-summary-calendar.c:392
-msgid "No appointments."
-msgstr "Сустрэчы не заплянаваны."
-
-#: my-evolution/e-summary-calendar.c:409
-msgid "%k:%M %d %B"
-msgstr "%k:%M %d %B"
-
-#: my-evolution/e-summary-calendar.c:411
-#, fuzzy
-msgid "%l:%M%p %d %B"
-msgstr "%l:%M%P %d %B"
-
-#: my-evolution/e-summary-calendar.c:429
-msgid "No description"
-msgstr "Няма апісаньня"
-
-#: my-evolution/e-summary-mail.c:189
-msgid "Mail summary"
-msgstr "Пошта агулам"
-
-#: my-evolution/e-summary-preferences.c:355
-msgid "Dictionary.com Word of the Day"
-msgstr "Dictionary.com - Слова дня"
-
-#: my-evolution/e-summary-preferences.c:373
-msgid "Quotes of the Day"
-msgstr "Цытата дня"
-
-#: my-evolution/e-summary-preferences.c:565
-msgid "New News Feed"
-msgstr "Новая крыніца навінаў"
-
-#: my-evolution/e-summary-preferences.c:581
-msgid "_URL:"
-msgstr "URL:"
-
-#: my-evolution/e-summary-rdf.c:315
-msgid "Error downloading RDF"
-msgstr "Памылка загрузкі RDF"
-
-#: my-evolution/e-summary-rdf.c:453
-msgid "News Feed"
-msgstr "Крыніца навінаў"
-
-#: my-evolution/e-summary-shown.c:496
-msgid "All"
-msgstr "Усё"
-
-#: my-evolution/e-summary-shown.c:521 my-evolution/e-summary-table.c:58
-msgid "Shown"
-msgstr "Паказанае"
-
-#: my-evolution/e-summary-tasks.c:349
-msgid "No tasks"
-msgstr "Заданьні адсутнічаюць"
-
-#: my-evolution/e-summary-tasks.c:387
-#, fuzzy
-msgid "blue"
-msgstr "Амбэр"
-
-#: my-evolution/e-summary-tasks.c:387
-msgid "(No Description)"
-msgstr "(Няма апісаньня)"
-
-#: my-evolution/e-summary-weather.c:72
-msgid "My Weather"
-msgstr "Маё надвор'е"
-
-#: my-evolution/e-summary-weather.c:261
-msgid "There was an error downloading data for"
-msgstr "Адбылася памылка загрузкі даньняў для"
-
-#: my-evolution/e-summary-weather.c:478 my-evolution/my-evolution.glade.h:16
-msgid "Weather"
-msgstr "Надвор'е"
-
-#. translators: Put here a list of codes for locations you want to
-#. see in My Evolution by default. You can find the list of all
-#. stations and their codes in Evolution sources
-#. (evolution/my-evolution/Locations)
-#: my-evolution/e-summary-weather.c:582
-msgid "KBOS"
-msgstr "UMMM"
-
 #: my-evolution/GNOME_Evolution_Summary.server.in.in.h:1
 msgid "Configure the appearance of the Evolution Summary here"
 msgstr "Тутака наладжваецца вонкавы выгляд вынікаў \"Эвалюцыі\""
@@ -24158,6 +24376,110 @@ msgstr "Цані-Пуэбла"
 msgid "Zurich"
 msgstr "Цюрых"
 
+#: my-evolution/component-factory.c:56
+msgid "Folder containing the Evolution Summary"
+msgstr "Тэчка утрымлівае агульныя зьвесткі \"Эвалюцыі\""
+
+#: my-evolution/e-summary-calendar.c:381
+msgid "Appointments"
+msgstr "Сустрэчы"
+
+#: my-evolution/e-summary-calendar.c:389
+msgid "No appointments."
+msgstr "Сустрэчы не заплянаваны."
+
+#: my-evolution/e-summary-calendar.c:406
+msgid "%k:%M %d %B"
+msgstr "%k:%M %d %B"
+
+#: my-evolution/e-summary-calendar.c:408
+msgid "%l:%M%P %d %B"
+msgstr "%l:%M%P %d %B"
+
+#: my-evolution/e-summary-calendar.c:426
+msgid "No description"
+msgstr "Няма апісаньня"
+
+#: my-evolution/e-summary-mail.c:189
+msgid "Mail summary"
+msgstr "Пошта агулам"
+
+#: my-evolution/e-summary-preferences.c:355
+msgid "Dictionary.com Word of the Day"
+msgstr "Dictionary.com - Слова дня"
+
+#: my-evolution/e-summary-preferences.c:373
+msgid "Quotes of the Day"
+msgstr "Цытата дня"
+
+#: my-evolution/e-summary-preferences.c:565
+msgid "New News Feed"
+msgstr "Новая крыніца навінаў"
+
+#: my-evolution/e-summary-preferences.c:581
+msgid "_URL:"
+msgstr "URL:"
+
+#: my-evolution/e-summary-rdf.c:315
+msgid "Error downloading RDF"
+msgstr "Памылка загрузкі RDF"
+
+#: my-evolution/e-summary-rdf.c:453
+msgid "News Feed"
+msgstr "Крыніца навінаў"
+
+#: my-evolution/e-summary-shown.c:496
+msgid "All"
+msgstr "Усё"
+
+#: my-evolution/e-summary-shown.c:521 my-evolution/e-summary-table.c:58
+msgid "Shown"
+msgstr "Паказанае"
+
+#: my-evolution/e-summary-tasks.c:330
+msgid "No tasks"
+msgstr "Заданьні адсутнічаюць"
+
+#: my-evolution/e-summary-tasks.c:364
+msgid "(No Description)"
+msgstr "(Няма апісаньня)"
+
+#: my-evolution/e-summary-weather.c:73
+msgid "My Weather"
+msgstr "Маё надвор'е"
+
+#: my-evolution/e-summary-weather.c:262
+msgid "There was an error downloading data for"
+msgstr "Адбылася памылка загрузкі даньняў для"
+
+#: my-evolution/e-summary-weather.c:479 my-evolution/my-evolution.glade.h:16
+msgid "Weather"
+msgstr "Надвор'е"
+
+#. translators: Put here a list of codes for locations you want to
+#. see in My Evolution by default. You can find the list of all
+#. stations and their codes in Evolution sources
+#. (evolution/my-evolution/Locations)
+#: my-evolution/e-summary-weather.c:583
+msgid "KBOS"
+msgstr "UMMM"
+
+#: my-evolution/e-summary.c:204
+msgid "%A, %B %e %Y"
+msgstr "%A, %B %e %Y"
+
+#: my-evolution/e-summary.c:533
+msgid "Please wait..."
+msgstr "Калі ласка, пачакайце..."
+
+#: my-evolution/e-summary.c:622 ui/my-evolution.xml.h:2
+msgid "Print Summary"
+msgstr "Надрукаваць агульныя зьвесткі"
+
+#: my-evolution/e-summary.c:655
+msgid "Printing of Summary failed"
+msgstr "Збой друку агульных зьвестак"
+
 #: my-evolution/metar.c:30
 msgid " F"
 msgstr " °F"
@@ -25416,27 +25738,21 @@ msgstr "Адзін дзень"
 msgid "_Show full path for folders"
 msgstr "Паказаць поўны _шлях да тэчак"
 
-#: notes/component-factory.c:27
-#: shell/e-shell-user-creatable-items-handler.c:587
-#: shell/e-shell-user-creatable-items-handler.c:643
-#: widgets/misc/e-charset-picker.c:109
-msgid "New"
-msgstr "Стварыць"
+#: shell/GNOME_Evolution_Shell.server.in.in.h:1
+msgid "Configure special folders and offline folder behavior here"
+msgstr "Наладжваеце паводзіны адмысловых і лакальных тэчак тут"
 
-#: notes/component-factory.c:27
-#, fuzzy
-msgid "Create a new note"
-msgstr "Стварыць новую тэчку"
+#: shell/GNOME_Evolution_Shell.server.in.in.h:2
+msgid "Evolution Shell"
+msgstr "Абалонка \"Эвалюцыі\""
 
-#: notes/component-factory.c:152
-#, fuzzy
-msgid "Cannot initialize Evolution's notes component."
-msgstr "Ня атрымліваецца ініцыялізаваць кампанэнт інфармацыі пра тэчку."
+#: shell/GNOME_Evolution_Shell.server.in.in.h:3
+msgid "Evolution folder settings configuration control"
+msgstr "Сродак кіраваньня наладкамі тэчак \"Эвалюцыі\""
 
-#: notes/main.c:30
-#, fuzzy
-msgid "Notes Component: Could not initialize bonobo"
-msgstr "Неатрымалася ініцыялізаваць Bonobo"
+#: shell/GNOME_Evolution_Shell.server.in.in.h:4
+msgid "Folder Settings"
+msgstr "Усталёўкі тэчкі"
 
 #: shell/e-activity-handler.c:164
 msgid "Show Details"
@@ -25525,46 +25841,6 @@ msgstr ""
 msgid "Brought to you by"
 msgstr ""
 
-#: shell/e-shell.c:175
-#, c-format
-msgid ""
-"Cannot activate component %s :\n"
-"The error from the activation system is:\n"
-"%s"
-msgstr ""
-"Немагчыма актывізаваць кампанэнт %s :\n"
-"Памылка ад актывацыі сыстэмы:\n"
-"%s"
-
-#: shell/e-shell.c:741
-#, c-format
-msgid "Cannot set up local storage -- %s"
-msgstr "Немагчыма наладзіць лакальнае сховішча -- %s"
-
-#: shell/e-shell.c:1804
-#, c-format
-msgid ""
-"The Evolution component that handles folders of type \"%s\"\n"
-"has unexpectedly quit. You will need to quit Evolution and restart\n"
-"in order to access that data again."
-msgstr ""
-
-#: shell/e-shell.c:2069
-msgid "Invalid arguments"
-msgstr "Недапушчальныя аргумэнты"
-
-#: shell/e-shell.c:2071
-msgid "Cannot register on OAF"
-msgstr "Неатрымалася зарэгістраваць на OAF"
-
-#: shell/e-shell.c:2073
-msgid "Configuration Database not found"
-msgstr "Адсутніча канфігурацыя базы даньняў"
-
-#: shell/e-shell.c:2075 shell/e-storage.c:568
-msgid "Generic error"
-msgstr "Звычайная памылка"
-
 #: shell/e-shell-config-autocompletion.c:110
 msgid "Extra Completion folders"
 msgstr ""
@@ -25653,31 +25929,26 @@ msgstr ""
 "Немагчыма зьмяніць назву тэчкі:\n"
 "%s"
 
-#: shell/e-shell-folder-commands.c:534
+#: shell/e-shell-folder-commands.c:538
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "Зьмяніць назву тэчкі \"%s\" на:"
 
-#: shell/e-shell-folder-commands.c:541
+#: shell/e-shell-folder-commands.c:544
 msgid "Rename Folder"
 msgstr "Зьмяніць назву тэчкі"
 
-#: shell/e-shell-folder-commands.c:547
+#: shell/e-shell-folder-commands.c:553
 #: shell/e-shell-folder-creation-dialog.c:180
 #, c-format
 msgid "The specified folder name is not valid: %s"
 msgstr "Пазначаная назва тэчкі недапушчальна: %s"
 
-#: shell/e-shell-folder-commands.c:554
-#, c-format
-msgid "A folder named \"%s\" already exists. Please use a different name."
-msgstr ""
-
-#: shell/e-shell-folder-commands.c:584
+#: shell/e-shell-folder-commands.c:587
 msgid "Selected folder does not belong to another user"
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:587
+#: shell/e-shell-folder-commands.c:590
 #, c-format
 msgid ""
 "Cannot remove folder:\n"
@@ -25721,19 +25992,11 @@ msgstr ""
 "Вы можаце выбраць \"Аўтаматычна\", калі не ведаеце, і \"Эвалюцыя\" паспрабуе "
 "зрабіць гэта сама."
 
-#: shell/e-shell-importer.c:148 shell/e-shell-startup-wizard.c:724
+#: shell/e-shell-importer.c:148 shell/e-shell-startup-wizard.c:709
 msgid "Please select the information that you would like to import:"
 msgstr "Калі ласка выбярыце інфармацыю, якую вы жадаеце імпартаваць:"
 
-#: shell/e-shell-importer.c:151
-msgid ""
-"Evolution checked for settings to import from the following\n"
-"applications: Pine, Netscape, Elm, iCalendar. No settings\n"
-"that could be imported where found. If you would like to\n"
-"try again, please click the \"Back\" button.\n"
-msgstr ""
-
-#: shell/e-shell-importer.c:219 shell/e-shell-importer.c:250
+#: shell/e-shell-importer.c:213 shell/e-shell-importer.c:244
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -25742,21 +26005,21 @@ msgstr ""
 "Імпартаваньне %s\n"
 "Імпартаваньне элемэнта %d."
 
-#: shell/e-shell-importer.c:323
+#: shell/e-shell-importer.c:317
 msgid "Select importer"
 msgstr "Выбраць імпарт"
 
-#: shell/e-shell-importer.c:464
+#: shell/e-shell-importer.c:458
 #, c-format
 msgid "File %s does not exist"
 msgstr "файл \"%s\" не існуе"
 
-#: shell/e-shell-importer.c:465 shell/e-shell-importer.c:482
-#: shell/e-shell-importer.c:524
+#: shell/e-shell-importer.c:459 shell/e-shell-importer.c:476
+#: shell/e-shell-importer.c:518
 msgid "Evolution Error"
 msgstr "Памылка \"Эвалюцыі\""
 
-#: shell/e-shell-importer.c:481
+#: shell/e-shell-importer.c:475
 #, c-format
 msgid ""
 "There is no importer that is able to handle\n"
@@ -25765,11 +26028,11 @@ msgstr ""
 "Няма адпаведнага імпарту каб апрацаваць гэта\n"
 "%s"
 
-#: shell/e-shell-importer.c:490
+#: shell/e-shell-importer.c:484
 msgid "Importing"
 msgstr "Імпартаваньне"
 
-#: shell/e-shell-importer.c:497
+#: shell/e-shell-importer.c:491
 #, c-format
 msgid ""
 "Importing %s.\n"
@@ -25778,17 +26041,17 @@ msgstr ""
 "Імпартаваньне %s.\n"
 "Запуск %s"
 
-#: shell/e-shell-importer.c:509
+#: shell/e-shell-importer.c:503
 #, c-format
 msgid "Error starting %s"
 msgstr "Памылка запуску %s"
 
-#: shell/e-shell-importer.c:523
+#: shell/e-shell-importer.c:517
 #, c-format
 msgid "Error loading %s"
 msgstr "Памылка загрузк %s"
 
-#: shell/e-shell-importer.c:540
+#: shell/e-shell-importer.c:534
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -25797,35 +26060,31 @@ msgstr ""
 "Імпартаваньне %s\n"
 "Імпартаваньне 1 элемэнта."
 
-#: shell/e-shell-importer.c:594
+#: shell/e-shell-importer.c:588
 msgid "Automatic"
 msgstr "Аўтаматычна"
 
-#: shell/e-shell-importer.c:643
-#, fuzzy
-msgid "_Filename:"
+#: shell/e-shell-importer.c:637
+msgid "Filename:"
 msgstr "Назва файла:"
 
-#: shell/e-shell-importer.c:648
+#: shell/e-shell-importer.c:642
 msgid "Select a file"
 msgstr "Выбярыце файл"
 
-#: shell/e-shell-importer.c:658
-#, fuzzy
-msgid "File _type:"
+#: shell/e-shell-importer.c:651
+msgid "File type:"
 msgstr "Тып файла:"
 
-#: shell/e-shell-importer.c:684
-#, fuzzy
-msgid "Import data and settings from _older programs"
+#: shell/e-shell-importer.c:676
+msgid "Import data and settings from older programs"
 msgstr "Імпартаваньне даньняў і усталёвак са старых праграм"
 
-#: shell/e-shell-importer.c:687
-#, fuzzy
-msgid "Import a _single file"
+#: shell/e-shell-importer.c:680
+msgid "Import a single file"
 msgstr "Імпартаваньне асобнага файла"
 
-#: shell/e-shell-importer.c:755 shell/e-shell-startup-wizard.c:553
+#: shell/e-shell-importer.c:746 shell/e-shell-startup-wizard.c:538
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
@@ -25833,26 +26092,25 @@ msgstr ""
 "Калі ласка пачакайце...\n"
 "Сканаваньне існуючых усталёвак"
 
-#: shell/e-shell-importer.c:758
+#: shell/e-shell-importer.c:749
 msgid "Starting Intelligent Importers"
 msgstr "Запуск інтэлектуальнага імпарту"
 
-#: shell/e-shell-importer.c:884 shell/e-shell-startup-wizard.c:679
+#: shell/e-shell-importer.c:873 shell/e-shell-startup-wizard.c:664
 #, c-format
 msgid "From %s:"
 msgstr "Ад %s:"
 
-#: shell/e-shell-importer.c:1061
+#: shell/e-shell-importer.c:1047
 msgid "Select folder"
 msgstr "Выбраць тэчку"
 
-#: shell/e-shell-importer.c:1062
+#: shell/e-shell-importer.c:1048
 msgid "Select a destination folder for importing this data"
 msgstr "Выбярыце мейсца прызначэньня для імпартаваньня гэтых даньняў"
 
-#: shell/e-shell-importer.c:1193
-#, fuzzy
-msgid "_Import"
+#: shell/e-shell-importer.c:1178 shell/importer/intelligent.c:191
+msgid "Import"
 msgstr "Імпарт"
 
 #: shell/e-shell-offline-handler.c:592
@@ -25912,19 +26170,11 @@ msgstr "Не атрымалася адкрыць падзеленую тэчку
 msgid "Cannot find the specified shared folder."
 msgstr "Немагчыма адшукаць пазначаную падзеленую тэчку."
 
-#: shell/e-shell-startup-wizard.c:771
-msgid ""
-"If you quit the Evolution Setup Assistant now, all of the information that "
-"you have entered will be forgotten. You will need to run this assistant "
-"again before using Evolution.\n"
-"\n"
-"Do you want to quit using the Assistant now?"
-msgstr ""
-
-#: shell/e-shell-startup-wizard.c:782
-#, fuzzy
-msgid "Quit Assistant"
-msgstr "Памочнік"
+#: shell/e-shell-user-creatable-items-handler.c:586
+#: shell/e-shell-user-creatable-items-handler.c:642
+#: widgets/misc/e-charset-picker.c:109
+msgid "New"
+msgstr "Стварыць"
 
 #: shell/e-shell-utils.c:116
 msgid "No folder name specified."
@@ -25946,37 +26196,6 @@ msgstr "Назва тэчкі ня мусіць ўтрымліваць сымб�
 msgid "'.' and '..' are reserved folder names."
 msgstr "'.' і '..' зарэзэрваваныя назвы тэчак."
 
-#: shell/e-shell-view.c:264
-msgid "(No folder displayed)"
-msgstr ""
-
-#: shell/e-shell-view.c:2040
-#, c-format
-msgid "%s (%d)"
-msgstr "%s (%d)"
-
-#: shell/e-shell-view.c:2042
-msgid "(None)"
-msgstr "(Няма)"
-
-#: shell/e-shell-view.c:2083
-msgid ""
-"Ximian Evolution is currently online.  Click on this button to work offline."
-msgstr ""
-"\"Эвалюцыя\" працуе ў далучаным рэжыме.  Клікніце на гэтую кнопку каб "
-"працаваць у адлучаным рэжыме."
-
-#: shell/e-shell-view.c:2090
-msgid "Ximian Evolution is in the process of going offline."
-msgstr "Эвалюцыя пераходзіць да працы ў адлучаным рэжымн."
-
-#: shell/e-shell-view.c:2096
-msgid ""
-"Ximian Evolution is currently offline.  Click on this button to work online."
-msgstr ""
-"\"Эвалюцыя\" працуе ў адлучаным рэжыме.  Клікніце на гэтую кнопку каб "
-"працаваць у далучаным рэжыме."
-
 #: shell/e-shell-view-menu.c:89
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr "Сродкі GNOME для сувязі з \"Пілётам\" не ўсталяваныя на гэтае сыстэме."
@@ -26026,13 +26245,76 @@ msgstr "_Адлучаны рэжым"
 msgid "Work Offline"
 msgstr "Працаваць у адлучаным рэжыме"
 
-#: shell/e-shortcuts.c:649
-msgid "Error saving shortcuts."
-msgstr "Памылка захаваньня лычак."
+#: shell/e-shell-view.c:264
+msgid "(No folder displayed)"
+msgstr ""
 
-#: shell/e-shortcuts.c:1096
-msgid "Shortcuts"
-msgstr "Лычкаі"
+#: shell/e-shell-view.c:2040
+#, c-format
+msgid "%s (%d)"
+msgstr "%s (%d)"
+
+#: shell/e-shell-view.c:2042
+msgid "(None)"
+msgstr "(Няма)"
+
+#: shell/e-shell-view.c:2083
+msgid ""
+"Ximian Evolution is currently online.  Click on this button to work offline."
+msgstr ""
+"\"Эвалюцыя\" працуе ў далучаным рэжыме.  Клікніце на гэтую кнопку каб "
+"працаваць у адлучаным рэжыме."
+
+#: shell/e-shell-view.c:2090
+msgid "Ximian Evolution is in the process of going offline."
+msgstr "Эвалюцыя пераходзіць да працы ў адлучаным рэжымн."
+
+#: shell/e-shell-view.c:2096
+msgid ""
+"Ximian Evolution is currently offline.  Click on this button to work online."
+msgstr ""
+"\"Эвалюцыя\" працуе ў адлучаным рэжыме.  Клікніце на гэтую кнопку каб "
+"працаваць у далучаным рэжыме."
+
+#: shell/e-shell.c:175
+#, c-format
+msgid ""
+"Cannot activate component %s :\n"
+"The error from the activation system is:\n"
+"%s"
+msgstr ""
+"Немагчыма актывізаваць кампанэнт %s :\n"
+"Памылка ад актывацыі сыстэмы:\n"
+"%s"
+
+#: shell/e-shell.c:741
+#, c-format
+msgid "Cannot set up local storage -- %s"
+msgstr "Немагчыма наладзіць лакальнае сховішча -- %s"
+
+#: shell/e-shell.c:1804
+#, c-format
+msgid ""
+"The Evolution component that handles folders of type \"%s\"\n"
+"has unexpectedly quit. You will need to quit Evolution and restart\n"
+"in order to access that data again."
+msgstr ""
+
+#: shell/e-shell.c:2069
+msgid "Invalid arguments"
+msgstr "Недапушчальныя аргумэнты"
+
+#: shell/e-shell.c:2071
+msgid "Cannot register on OAF"
+msgstr "Неатрымалася зарэгістраваць на OAF"
+
+#: shell/e-shell.c:2073
+msgid "Configuration Database not found"
+msgstr "Адсутніча канфігурацыя базы даньняў"
+
+#: shell/e-shell.c:2075 shell/e-storage.c:568
+msgid "Generic error"
+msgstr "Звычайная памылка"
 
 #: shell/e-shortcuts-view.c:80
 msgid "Create New Shortcut Group"
@@ -26147,6 +26429,18 @@ msgstr "_Выдаліць"
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "Выдаліць гэтую лычку з панэлі лычак"
 
+#: shell/e-shortcuts.c:649
+msgid "Error saving shortcuts."
+msgstr "Памылка захаваньня лычак."
+
+#: shell/e-shortcuts.c:1096
+msgid "Shortcuts"
+msgstr "Лычкаі"
+
+#: shell/e-storage-set-view.etspec.h:1
+msgid "Checkbox"
+msgstr "Пазначальнік"
+
 #: shell/e-storage.c:566
 msgid "No error"
 msgstr "Няма памылкі"
@@ -26203,14 +26497,6 @@ msgstr "Немагчыма стварыць тэчку з гэткай назв�
 msgid "This operation cannot be performed in off-line mode"
 msgstr "Гэтая апэрацыя не працуе ў адлучаным рэжыме."
 
-#: shell/e-storage-set-view.etspec.h:1
-msgid "Checkbox"
-msgstr "Пазначальнік"
-
-#: shell/e-storage-set-view.etspec.h:2
-msgid "Folder"
-msgstr "Тэчка"
-
 #: shell/e-task-widget.c:211
 #, c-format
 msgid "%s (...)"
@@ -26225,103 +26511,103 @@ msgstr "%s (%d%% завершана)"
 msgid "<click here to select a folder>"
 msgstr "<клікніце тутака для выбару тэчкі>"
 
-#: shell/evolution-shell-component.c:1187
+#: shell/evolution-shell-component-utils.c:124
+#, c-format
+msgid ""
+"%s\n"
+"\n"
+"Unknown error."
+msgstr ""
+"%s\n"
+"\n"
+"Невядомая памылка."
+
+#: shell/evolution-shell-component-utils.c:127
+#, c-format
+msgid ""
+"%s\n"
+"\n"
+"The error from the component system is:\n"
+"%s"
+msgstr ""
+"%s\n"
+"\n"
+"Памылка ад актывацыі кампанэнта сыстэмы:\n"
+"%s"
+
+#: shell/evolution-shell-component-utils.c:134
+#, c-format
+msgid ""
+"%s\n"
+"\n"
+"The error from the activation system is:\n"
+"%s"
+msgstr ""
+"%s\n"
+"\n"
+"Памылка ад актывацыі сыстэмы:\n"
+"%s"
+
+#: shell/evolution-shell-component.c:1184
 msgid "CORBA error"
 msgstr "Памылка CORBA"
 
-#: shell/evolution-shell-component.c:1189
+#: shell/evolution-shell-component.c:1186
 msgid "Interrupted"
 msgstr "Перарвана"
 
-#: shell/evolution-shell-component.c:1191
+#: shell/evolution-shell-component.c:1188
 msgid "Invalid argument"
 msgstr "Недапушчальны аргумэнт"
 
-#: shell/evolution-shell-component.c:1193
+#: shell/evolution-shell-component.c:1190
 msgid "Already has an owner"
 msgstr "Ужо мае ўладальніка"
 
-#: shell/evolution-shell-component.c:1195
+#: shell/evolution-shell-component.c:1192
 msgid "No owner"
 msgstr "Няма ўладальніка"
 
-#: shell/evolution-shell-component.c:1197
+#: shell/evolution-shell-component.c:1194
 msgid "Not found"
 msgstr "Адсутнічае"
 
-#: shell/evolution-shell-component.c:1199
+#: shell/evolution-shell-component.c:1196
 msgid "Unsupported type"
 msgstr "Тып не падтрымліваецца"
 
-#: shell/evolution-shell-component.c:1201
+#: shell/evolution-shell-component.c:1198
 msgid "Unsupported schema"
 msgstr "Тэма не падтрымліваецца"
 
-#: shell/evolution-shell-component.c:1203
+#: shell/evolution-shell-component.c:1200
 msgid "Unsupported operation"
 msgstr "Апэрацыя не падтрымліваецца"
 
-#: shell/evolution-shell-component.c:1205
+#: shell/evolution-shell-component.c:1202
 msgid "Internal error"
 msgstr "Нутраная памылка"
 
-#: shell/evolution-shell-component.c:1209
+#: shell/evolution-shell-component.c:1206
 msgid "Exists"
 msgstr "Існуе"
 
-#: shell/evolution-shell-component.c:1211
+#: shell/evolution-shell-component.c:1208
 msgid "Invalid URI"
 msgstr "Памылковы URI"
 
-#: shell/evolution-shell-component.c:1215
+#: shell/evolution-shell-component.c:1212
 msgid "Has subfolders"
 msgstr "Мае падтэчкі"
 
-#: shell/evolution-shell-component.c:1217
+#: shell/evolution-shell-component.c:1214
 msgid "No space left"
 msgstr "Недахоп прасторы"
 
-#: shell/evolution-shell-component.c:1219
+#: shell/evolution-shell-component.c:1216
 msgid "Old owner has died"
 msgstr "Стары уладальнік памёр"
 
-#: shell/evolution-shell-component-utils.c:124
-#, c-format
-msgid ""
-"%s\n"
-"\n"
-"Unknown error."
-msgstr ""
-"%s\n"
-"\n"
-"Невядомая памылка."
-
-#: shell/evolution-shell-component-utils.c:127
-#, c-format
-msgid ""
-"%s\n"
-"\n"
-"The error from the component system is:\n"
-"%s"
-msgstr ""
-"%s\n"
-"\n"
-"Памылка ад актывацыі кампанэнта сыстэмы:\n"
-"%s"
-
-#: shell/evolution-shell-component-utils.c:134
-#, c-format
-msgid ""
-"%s\n"
-"\n"
-"The error from the activation system is:\n"
-"%s"
-msgstr ""
-"%s\n"
-"\n"
-"Памылка ад актывацыі сыстэмы:\n"
-"%s"
-
 #: shell/evolution-test-component.c:63
 msgid "Test type"
 msgstr "Тып тэста"
@@ -26430,22 +26716,6 @@ msgstr ""
 "\n"
 "Клікніце кнопку \"Ужыць\" каб захаваць вашыя усталёўкі. "
 
-#: shell/GNOME_Evolution_Shell.server.in.in.h:1
-msgid "Configure special folders and offline folder behavior here"
-msgstr "Наладжваеце паводзіны адмысловых і лакальных тэчак тут"
-
-#: shell/GNOME_Evolution_Shell.server.in.in.h:2
-msgid "Evolution Shell"
-msgstr "Абалонка \"Эвалюцыі\""
-
-#: shell/GNOME_Evolution_Shell.server.in.in.h:3
-msgid "Evolution folder settings configuration control"
-msgstr "Сродак кіраваньня наладкамі тэчак \"Эвалюцыі\""
-
-#: shell/GNOME_Evolution_Shell.server.in.in.h:4
-msgid "Folder Settings"
-msgstr "Усталёўкі тэчкі"
-
 #: shell/importer/import.glade.h:1
 msgid "Click \"Import\" to begin importing the file into Evolution. "
 msgstr "Клікніце \"Імпарт\" для імпартаваньня файлаў у \"Эвалюцыю\"."
@@ -26484,10 +26754,6 @@ msgstr ""
 msgid "Importers"
 msgstr "Імпарт"
 
-#: shell/importer/intelligent.c:191
-msgid "Import"
-msgstr "Імпарт"
-
 #: shell/importer/intelligent.c:195
 msgid "Don't import"
 msgstr "Не імпартаваць"
@@ -26658,7 +26924,7 @@ msgstr "Перамясьціць кантакты у іншую тэчку"
 msgid "Move to Folder..."
 msgstr "Перамясьціць у тэчку..."
 
-#: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:18
+#: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:17
 msgid "Paste the clipboard"
 msgstr "Уставіць з буфэра абмену"
 
@@ -26666,9 +26932,9 @@ msgstr "Уставіць з буфэра абмену"
 msgid "Previews the contacts to be printed"
 msgstr "Прагледзіць выгляд кантактаў у друку"
 
-#: ui/evolution-addressbook.xml.h:17 ui/evolution-calendar.xml.h:20
-#: ui/evolution-comp-editor.xml.h:9 ui/evolution-mail-message.xml.h:73
-#: ui/evolution-tasks.xml.h:13
+#: ui/evolution-addressbook.xml.h:17 ui/evolution-calendar.xml.h:19
+#: ui/evolution-comp-editor.xml.h:9 ui/evolution-mail-message.xml.h:68
+#: ui/evolution-tasks.xml.h:12
 msgid "Print Pre_view"
 msgstr "_Перадпрагляд друку"
 
@@ -26712,21 +26978,17 @@ msgstr "Спыніць загрузку"
 msgid "View the current contact"
 msgstr "Прагледзіць бягучы кантакт"
 
-#: ui/evolution-addressbook.xml.h:29 ui/evolution-calendar.xml.h:32
-#: ui/evolution-comp-editor.xml.h:16 ui/evolution-contact-editor.xml.h:13
-#: ui/evolution-contact-list-editor.xml.h:11
+#: ui/evolution-addressbook.xml.h:29 ui/evolution-calendar.xml.h:28
+#: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:11
+#: ui/evolution-contact-list-editor.xml.h:10
 #: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:17
-#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-messagedisplay.xml.h:4
-#: ui/evolution-mail-message.xml.h:99 ui/evolution-task-editor.xml.h:9
-#: ui/evolution-tasks.xml.h:16 ui/evolution.xml.h:42
+#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:93
+#: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-task-editor.xml.h:9
+#: ui/evolution-tasks.xml.h:14 ui/evolution.xml.h:42
 msgid "_Actions"
 msgstr "_Дзеяньні"
 
-#: ui/evolution-addressbook.xml.h:31
-msgid "_Copy to Folder..."
-msgstr "_Капіяваць у тэчку..."
-
-#: ui/evolution-addressbook.xml.h:34 ui/evolution-contact-editor.xml.h:16
+#: ui/evolution-addressbook.xml.h:34 ui/evolution-contact-editor.xml.h:13
 msgid "_Forward Contact..."
 msgstr "_Перадаслаць кантакт..."
 
@@ -26794,61 +27056,46 @@ msgstr "Ісьці да пазначанай даты"
 msgid "Go to today"
 msgstr "Перайсьці да сёньня"
 
-#: ui/evolution-calendar.xml.h:17
+#: ui/evolution-calendar.xml.h:16
 msgid "Month"
 msgstr "Месяц"
 
-#: ui/evolution-calendar.xml.h:19
+#: ui/evolution-calendar.xml.h:18
 msgid "Previews the calendar to be printed"
 msgstr "Прагледзіць выгляд каляндара ў друку"
 
-#: ui/evolution-calendar.xml.h:21
+#: ui/evolution-calendar.xml.h:20
 msgid "Print this calendar"
 msgstr "Надрукаваць гэты каляндар"
 
-#: ui/evolution-calendar.xml.h:22
+#: ui/evolution-calendar.xml.h:21
 msgid "Publish Free/Busy information for this calendar"
 msgstr "Апублікаваць інфармацыю \"Вольны/Заняты\" для гэтага каляндара"
 
-#: ui/evolution-calendar.xml.h:23 ui/evolution-tasks.xml.h:15
-#, fuzzy
-msgid "Purg_e"
-msgstr "Старонка"
-
-#: ui/evolution-calendar.xml.h:24
-#, fuzzy
-msgid "Purge old appointments and meetings"
-msgstr "Публічная тэчка утрымлівае сустрэчы і падзеі"
-
-#: ui/evolution-calendar.xml.h:25
-#, fuzzy
-msgid "Show as list"
-msgstr "Паказаць падрабязнасьці"
-
-#: ui/evolution-calendar.xml.h:26
+#: ui/evolution-calendar.xml.h:22
 msgid "Show one day"
 msgstr "Паказаць адзень"
 
-#: ui/evolution-calendar.xml.h:27
+#: ui/evolution-calendar.xml.h:23
 msgid "Show one month"
 msgstr "Паказаць адзін месяц"
 
-#: ui/evolution-calendar.xml.h:28
+#: ui/evolution-calendar.xml.h:24
 msgid "Show one week"
 msgstr "Паказаць адзін тыдзень"
 
-#: ui/evolution-calendar.xml.h:29
+#: ui/evolution-calendar.xml.h:25
 msgid "Show the working week"
 msgstr "Паказаць працоўны тыдзень"
 
-#: ui/evolution-calendar.xml.h:30
+#: ui/evolution-calendar.xml.h:26
 msgid "Week"
 msgstr "Тыдзень"
 
-#: ui/evolution-comp-editor.xml.h:2 ui/evolution-contact-editor.xml.h:2
-#: ui/evolution-contact-list-editor.xml.h:2
+#: ui/evolution-comp-editor.xml.h:2 ui/evolution-contact-editor.xml.h:1
+#: ui/evolution-contact-list-editor.xml.h:1
 #: ui/evolution-mail-messagedisplay.xml.h:1
-#: ui/evolution-message-composer.xml.h:3 ui/evolution-signature-editor.xml.h:2
+#: ui/evolution-message-composer.xml.h:3 ui/evolution-signature-editor.xml.h:1
 #: ui/evolution.xml.h:5
 msgid "Close"
 msgstr "Закрыць"
@@ -26857,7 +27104,7 @@ msgstr "Закрыць"
 msgid "Close this item"
 msgstr "Закрыць гэты элемэнт"
 
-#: ui/evolution-comp-editor.xml.h:5 ui/evolution-contact-editor.xml.h:4
+#: ui/evolution-comp-editor.xml.h:5 ui/evolution-contact-editor.xml.h:3
 msgid "Delete this item"
 msgstr "Выдаліць гэты элемэнт"
 
@@ -26870,58 +27117,47 @@ msgstr "Мая панэля інструмэнта"
 msgid "Preview the printed item"
 msgstr "Прагледзіць выгляд элемэнта ў друку"
 
-#: ui/evolution-comp-editor.xml.h:10 ui/evolution-contact-editor.xml.h:7
+#: ui/evolution-comp-editor.xml.h:10 ui/evolution-contact-editor.xml.h:6
 msgid "Print this item"
 msgstr "Надрукаваць гэты элемэнт"
 
-#: ui/evolution-comp-editor.xml.h:11 ui/evolution-contact-editor.xml.h:8
-#: ui/evolution-contact-list-editor.xml.h:5
-#: ui/evolution-message-composer.xml.h:18
-msgid "Save _As..."
-msgstr "Захаваць _як..."
+#: ui/evolution-comp-editor.xml.h:12 ui/evolution-message-composer.xml.h:16
+#: ui/evolution-signature-editor.xml.h:5
+msgid "Save"
+msgstr "Захаваць"
 
-#: ui/evolution-comp-editor.xml.h:12 ui/evolution-contact-editor.xml.h:9
+#: ui/evolution-comp-editor.xml.h:13
+msgid "Save As..."
+msgstr "Захаваць як..."
+
+#: ui/evolution-comp-editor.xml.h:14 ui/evolution-contact-editor.xml.h:8
 #: ui/evolution-contact-list-editor.xml.h:6
-#: ui/evolution-signature-editor.xml.h:7
+#: ui/evolution-signature-editor.xml.h:6
 msgid "Save and Close"
 msgstr "Захаваць і закрыць"
 
-#: ui/evolution-comp-editor.xml.h:13 ui/evolution-contact-editor.xml.h:10
-#: ui/evolution-contact-list-editor.xml.h:7
-#: ui/evolution-signature-editor.xml.h:8
-#, fuzzy
-msgid "Save and _Close"
-msgstr "Захаваць і закрыць"
-
-#: ui/evolution-comp-editor.xml.h:14
+#: ui/evolution-comp-editor.xml.h:15
 msgid "Save the item and close the dialog box"
 msgstr "Захаваць гэты элемэнт і закрыць дыялёг"
 
-#: ui/evolution-comp-editor.xml.h:15
+#: ui/evolution-comp-editor.xml.h:16
 msgid "Save this item to disk"
 msgstr "Захаваць гэты элемэнт на дыск"
 
-#: ui/evolution-comp-editor.xml.h:18 ui/evolution-contact-editor.xml.h:15
-#: ui/evolution-contact-list-editor.xml.h:13
+#: ui/evolution-comp-editor.xml.h:18 ui/evolution-contact-editor.xml.h:12
+#: ui/evolution-contact-list-editor.xml.h:11
 #: ui/evolution-mail-messagedisplay.xml.h:7
 #: ui/evolution-message-composer.xml.h:42
-#: ui/evolution-signature-editor.xml.h:13 ui/evolution-subscribe.xml.h:11
+#: ui/evolution-signature-editor.xml.h:12 ui/evolution-subscribe.xml.h:11
 #: ui/evolution.xml.h:46
 msgid "_File"
 msgstr "_Файл"
 
-#: ui/evolution-comp-editor.xml.h:20 ui/evolution-contact-editor.xml.h:18
-#: ui/evolution-contact-list-editor.xml.h:14
-#: ui/evolution-message-composer.xml.h:47
-#: ui/evolution-signature-editor.xml.h:15
-msgid "_Save"
-msgstr "_Захаваць"
-
 #: ui/evolution-composer-entries.xml.h:1
 msgid "Copy selected text to the clipboard"
 msgstr "Капіяваць вылучаны тэкст у буфэр абмену"
 
-#: ui/evolution-composer-entries.xml.h:2 ui/evolution-mail-message.xml.h:21
+#: ui/evolution-composer-entries.xml.h:2 ui/evolution-mail-list.xml.h:3
 msgid "Cu_t"
 msgstr "_Выразаць"
 
@@ -26942,39 +27178,51 @@ msgstr "Вылучыць _усё"
 msgid "Select all text"
 msgstr "Вылучыць увесь тэкст"
 
-#: ui/evolution-contact-editor.xml.h:6
+#: ui/evolution-contact-editor.xml.h:5
 msgid "Print En_velope..."
 msgstr "Друкаваць _капэрту..."
 
-#: ui/evolution-contact-editor.xml.h:11
+#: ui/evolution-contact-editor.xml.h:7
+#: ui/evolution-contact-list-editor.xml.h:5
+#: ui/evolution-message-composer.xml.h:18
+msgid "Save _As..."
+msgstr "Захаваць _як..."
+
+#: ui/evolution-contact-editor.xml.h:9
 msgid "Save the contact and close the dialog box"
 msgstr "Захаваць кантакт і закрыць дыялёг"
 
-#: ui/evolution-contact-editor.xml.h:12
+#: ui/evolution-contact-editor.xml.h:10
 msgid "Send _Message to Contact..."
 msgstr "Даслаць паведамленьне кантактнае асобе..."
 
-#: ui/evolution-contact-list-editor.xml.h:4
+#: ui/evolution-contact-editor.xml.h:15
+#: ui/evolution-contact-list-editor.xml.h:12
+#: ui/evolution-message-composer.xml.h:47
+#: ui/evolution-signature-editor.xml.h:14
+msgid "_Save"
+msgstr "_Захаваць"
+
+#: ui/evolution-contact-list-editor.xml.h:3
 msgid "Delete this list"
 msgstr "Выдаліць гэты сьпіс"
 
-#: ui/evolution-contact-list-editor.xml.h:8
+#: ui/evolution-contact-list-editor.xml.h:4
+msgid "Delete..."
+msgstr "Выдаліць..."
+
+#: ui/evolution-contact-list-editor.xml.h:7
 msgid "Save the list and close the dialog box"
 msgstr "Захаваць сьпіс і закрыць дыялёг"
 
-#: ui/evolution-contact-list-editor.xml.h:9
+#: ui/evolution-contact-list-editor.xml.h:8
 msgid "Se_nd list to other..."
 msgstr "Да_слаць сьпіс іншым..."
 
-#: ui/evolution-contact-list-editor.xml.h:10
+#: ui/evolution-contact-list-editor.xml.h:9
 msgid "Send _message to list..."
 msgstr "Даслаць паве_дамленьне ў сьпіс..."
 
-#: ui/evolution-contact-list-editor.xml.h:12
-#, fuzzy
-msgid "_Delete..."
-msgstr "Выдаліць..."
-
 #: ui/evolution-event-editor.xml.h:1
 msgid "Cancel Mee_ting"
 msgstr "Адмяніць на_раду"
@@ -27048,8 +27296,7 @@ msgid "Permanently remove all deleted messages from all folders"
 msgstr "Зьнішчыць усе выдаленыя паведамленьні з усіх тэчак"
 
 #: ui/evolution-mail-global.xml.h:11
-#, fuzzy
-msgid "Post Ne_w Message"
+msgid "Post New Message"
 msgstr "Даслаць новае паведамленьне"
 
 #: ui/evolution-mail-global.xml.h:12
@@ -27084,19 +27331,14 @@ msgstr "_Акно перадпрагляду"
 msgid "Change the properties of this folder"
 msgstr "Зьмяніць уласьцівасьці гэтае тэчкі"
 
-#: ui/evolution-mail-list.xml.h:2 ui/evolution-mail-message.xml.h:10
+#: ui/evolution-mail-list.xml.h:2
 msgid "Copy selected message(s) to the clipboard"
 msgstr "Капіяваць вылучаныя паведамленьні у буфэр абмену"
 
-#: ui/evolution-mail-list.xml.h:3 ui/evolution-mail-message.xml.h:22
+#: ui/evolution-mail-list.xml.h:4
 msgid "Cut selected message(s) to the clipboard"
 msgstr "Выразаць вылучаныя паведамленьні у буфэр абмену"
 
-#: ui/evolution-mail-list.xml.h:4
-#, fuzzy
-msgid "E_xpunge"
-msgstr "_Выкрэсьліць"
-
 #: ui/evolution-mail-list.xml.h:5
 msgid "Hide S_elected Messages"
 msgstr "Схаваць _вылучаныя паведамленьні"
@@ -27115,15 +27357,14 @@ msgid ""
 msgstr ""
 
 #: ui/evolution-mail-list.xml.h:9
-#, fuzzy
-msgid "Mark All as _Read"
+msgid "Mark All as R_ead"
 msgstr "Пазначыць усё як _чытанае"
 
 #: ui/evolution-mail-list.xml.h:10
 msgid "Mark all visible messages as read"
 msgstr "Пазначыць усе бачныя паведамленьні як чытанае"
 
-#: ui/evolution-mail-list.xml.h:11 ui/evolution-mail-message.xml.h:66
+#: ui/evolution-mail-list.xml.h:11
 msgid "Paste message(s) from the clipboard"
 msgstr "Уставіць паведамленьне(і) з буфэра абмену"
 
@@ -27167,37 +27408,26 @@ msgstr "Часова схаваць вылучаныя паведамленьн�
 msgid "Threaded Message list"
 msgstr "Паведамленьні як абмеркаваньне тэмы"
 
-#: ui/evolution-mail-list.xml.h:25 ui/evolution.xml.h:47
+#: ui/evolution-mail-list.xml.h:26 ui/evolution-tasks.xml.h:18
+msgid "_Expunge"
+msgstr "_Выкрэсьліць"
+
+#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:47
 msgid "_Folder"
 msgstr "_Тэчка"
 
-#: ui/evolution-mail-list.xml.h:26 ui/evolution-subscribe.xml.h:12
+#: ui/evolution-mail-list.xml.h:28 ui/evolution-subscribe.xml.h:12
 msgid "_Invert Selection"
 msgstr "_Інвертаваць вылучэньне"
 
-#: ui/evolution-mail-list.xml.h:27
+#: ui/evolution-mail-list.xml.h:30
 msgid "_Properties..."
 msgstr "_Уласьцівасьці..."
 
-#: ui/evolution-mail-list.xml.h:28
+#: ui/evolution-mail-list.xml.h:31
 msgid "_Threaded Message List"
 msgstr "Паведамленьні як абмеркаваньне тэмы"
 
-#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:6
-msgid "Close this window"
-msgstr "Закрыць гэтае акно"
-
-#: ui/evolution-mail-messagedisplay.xml.h:5
-#: ui/evolution-message-composer.xml.h:39 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:43
-msgid "_Close"
-msgstr "Закрыць"
-
-#: ui/evolution-mail-messagedisplay.xml.h:8
-#: ui/evolution-message-composer.xml.h:49 ui/evolution.xml.h:64
-msgid "_View"
-msgstr "Выгляд"
-
 #: ui/evolution-mail-message.xml.h:1
 msgid "A_dd Sender to Addressbook"
 msgstr "_Дадаць адпраўляльніка ў кнігу адрэсаў"
@@ -27215,416 +27445,404 @@ msgid "Apply filter rules to the selected messages"
 msgstr "Ужыць правіла фільтрацыі да вылучаных паведамленьняў"
 
 #: ui/evolution-mail-message.xml.h:5
-#, fuzzy
-msgid "Caret _Mode"
-msgstr "Мадэль тэкста"
-
-#: ui/evolution-mail-message.xml.h:6
 msgid "Compose a reply to all of the recipients of the selected message"
 msgstr "Стварыць адказ усім атрымоўцам вылучанага паведамленьня"
 
-#: ui/evolution-mail-message.xml.h:7
+#: ui/evolution-mail-message.xml.h:6
 msgid "Compose a reply to the mailing list of the selected message"
 msgstr "Стварыць адказ у сьпіс рассылкі вылучанага паведамленьня"
 
-#: ui/evolution-mail-message.xml.h:8
+#: ui/evolution-mail-message.xml.h:7
 msgid "Compose a reply to the sender of the selected message"
 msgstr "Стварыць адказ адпраўляльніку вылучанага паведамленьня"
 
-#: ui/evolution-mail-message.xml.h:11
+#: ui/evolution-mail-message.xml.h:9
 msgid "Copy selected messages to another folder"
 msgstr "Капіяваць вылучаныя паведамленьні ў іншую тэчку"
 
-#: ui/evolution-mail-message.xml.h:12
+#: ui/evolution-mail-message.xml.h:10
 msgid "Create _Virtual Folder From Message"
 msgstr "Стварыць _віртуальную тэчку з паведамленьня"
 
-#: ui/evolution-mail-message.xml.h:13
+#: ui/evolution-mail-message.xml.h:11
 msgid "Create a rule to filter messages from this sender"
 msgstr ""
 "Стварыць правіла для фільтрацыі паведамленьняў ад гэтага адпраўляльніка"
 
-#: ui/evolution-mail-message.xml.h:14
+#: ui/evolution-mail-message.xml.h:12
 msgid "Create a rule to filter messages to these recipients"
 msgstr ""
 "Стварыць правіла для фільтрацыі паведамленьняў да гэтых адпраўляльнікаў"
 
-#: ui/evolution-mail-message.xml.h:15
+#: ui/evolution-mail-message.xml.h:13
 msgid "Create a rule to filter messages to this mailing list"
 msgstr ""
 "Стварыць правіла для фільтрацыі паведамленьняў да гэтага сьпісу рассылкі"
 
-#: ui/evolution-mail-message.xml.h:16
+#: ui/evolution-mail-message.xml.h:14
 msgid "Create a rule to filter messages with this subject"
 msgstr "Стварыць правіла для фільтрацыіпаведамленьняў з гэтай тэмай"
 
-#: ui/evolution-mail-message.xml.h:17
+#: ui/evolution-mail-message.xml.h:15
 msgid "Create a virtual folder for these recipients"
 msgstr "Стварыць віртуальную тэчку для гэтых атрымоўцаў"
 
-#: ui/evolution-mail-message.xml.h:18
+#: ui/evolution-mail-message.xml.h:16
 msgid "Create a virtual folder for this mailing list"
 msgstr "Стварыць віртуальную тэчку для гэтага сьпісу рассылкі"
 
-#: ui/evolution-mail-message.xml.h:19
+#: ui/evolution-mail-message.xml.h:17
 msgid "Create a virtual folder for this sender"
 msgstr "Стварыць віртуальную тэчку для гэтага адпраўляльніка"
 
-#: ui/evolution-mail-message.xml.h:20
+#: ui/evolution-mail-message.xml.h:18
 msgid "Create a virtual folder for this subject"
 msgstr "Стварыць віртуальную тэчку для гэтае тэмы"
 
-#: ui/evolution-mail-message.xml.h:23
+#: ui/evolution-mail-message.xml.h:19
 msgid "Decrease the text size"
 msgstr "Паменшыць памер тэкста"
 
-#: ui/evolution-mail-message.xml.h:25
+#: ui/evolution-mail-message.xml.h:21
 msgid "Display the next important message"
 msgstr "Адлюстраваць наступнае важнае паведамленьне"
 
-#: ui/evolution-mail-message.xml.h:26
+#: ui/evolution-mail-message.xml.h:22
 msgid "Display the next message"
 msgstr "Адлюстраваць наступнае паведамленьне"
 
-#: ui/evolution-mail-message.xml.h:27
+#: ui/evolution-mail-message.xml.h:23
 msgid "Display the next unread message"
 msgstr "Адлюстраваць наступнае нечытанае паведамленьне"
 
-#: ui/evolution-mail-message.xml.h:28
+#: ui/evolution-mail-message.xml.h:24
 msgid "Display the next unread thread"
 msgstr "Адлюстраваць наступнае нечытанае абмеркаваньне тэмы"
 
-#: ui/evolution-mail-message.xml.h:29
+#: ui/evolution-mail-message.xml.h:25
 msgid "Display the previous important message"
 msgstr "Адлюстраваць папярэдняе важнае паведамленьне"
 
-#: ui/evolution-mail-message.xml.h:30
+#: ui/evolution-mail-message.xml.h:26
 msgid "Display the previous message"
 msgstr "Адлюстраваць папярэдняе паведамленьне"
 
-#: ui/evolution-mail-message.xml.h:31
+#: ui/evolution-mail-message.xml.h:27
 msgid "Display the previous unread message"
 msgstr "Адлюстраваць папярэдняе нечытанае паведамленьне"
 
-#: ui/evolution-mail-message.xml.h:32
+#: ui/evolution-mail-message.xml.h:28
 msgid "F_orward"
 msgstr "Перадаслаць"
 
-#: ui/evolution-mail-message.xml.h:33
+#: ui/evolution-mail-message.xml.h:29
 msgid "Filter on Mailing _List..."
 msgstr "Фільтар па сьпісе рассылкі..."
 
-#: ui/evolution-mail-message.xml.h:34
+#: ui/evolution-mail-message.xml.h:30
 msgid "Filter on Se_nder..."
 msgstr "Фільтар па адпраўляльніку..."
 
-#: ui/evolution-mail-message.xml.h:35
+#: ui/evolution-mail-message.xml.h:31
 msgid "Filter on _Recipients..."
 msgstr "Фільтар па атрымоўцах..."
 
-#: ui/evolution-mail-message.xml.h:36
+#: ui/evolution-mail-message.xml.h:32
 msgid "Filter on _Subject..."
 msgstr "Фільтар па тэме..."
 
-#: ui/evolution-mail-message.xml.h:37
+#: ui/evolution-mail-message.xml.h:33
 msgid "Flag selected message(s) for follow-up"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:38
+#: ui/evolution-mail-message.xml.h:34
 msgid "Follow _Up..."
 msgstr "\"Да выкананьня\"..."
 
-#: ui/evolution-mail-message.xml.h:39
+#: ui/evolution-mail-message.xml.h:35
 msgid "Force images in HTML mail to be loaded"
 msgstr "Прымусова загружаць відарысы ў HTML лістах"
 
-#: ui/evolution-mail-message.xml.h:41
+#: ui/evolution-mail-message.xml.h:37
 msgid "Forward the selected message in the body of a new message"
 msgstr "Перадаслаць вылучанае паведамленьне ў целе новага паведамленьня"
 
-#: ui/evolution-mail-message.xml.h:42
+#: ui/evolution-mail-message.xml.h:38
 msgid "Forward the selected message quoted like a reply"
 msgstr "Перадаслаць вылучанае паведамленьне цытаваным як адказ"
 
-#: ui/evolution-mail-message.xml.h:43
+#: ui/evolution-mail-message.xml.h:39
 msgid "Forward the selected message to someone"
 msgstr "Перадаслаць вылучанае паведамленьне"
 
-#: ui/evolution-mail-message.xml.h:44
+#: ui/evolution-mail-message.xml.h:40
 msgid "Forward the selected message to someone as an attachment"
 msgstr "Перадаслаць вылучанае паведамленьне як укладаньне"
 
-#: ui/evolution-mail-message.xml.h:45
+#: ui/evolution-mail-message.xml.h:41
 msgid "Increase the text size"
 msgstr "Павялічыць памер тэкста"
 
-#: ui/evolution-mail-message.xml.h:46
+#: ui/evolution-mail-message.xml.h:42
 msgid "Load _Images"
 msgstr "Загрузіць відарысы"
 
-#: ui/evolution-mail-message.xml.h:47
-msgid "Mar_k as Read"
-msgstr "Пазначыць як чытанае"
-
-#: ui/evolution-mail-message.xml.h:48
+#: ui/evolution-mail-message.xml.h:44
 msgid "Mark as I_mportant"
 msgstr "Пазначыць як важнае"
 
-#: ui/evolution-mail-message.xml.h:49
+#: ui/evolution-mail-message.xml.h:45
 msgid "Mark as U_nread"
 msgstr "Пазначыць як нечытанае"
 
-#: ui/evolution-mail-message.xml.h:50
+#: ui/evolution-mail-message.xml.h:46
 msgid "Mark as Unimp_ortant"
 msgstr "Пазначыць як няважнае"
 
-#: ui/evolution-mail-message.xml.h:51
+#: ui/evolution-mail-message.xml.h:47
 msgid "Mark the selected message(s) as having been read"
 msgstr "Пазначыць вылучаныя паведамленьні як \"да чытаньня\""
 
-#: ui/evolution-mail-message.xml.h:52
+#: ui/evolution-mail-message.xml.h:48
 msgid "Mark the selected message(s) as important"
 msgstr "Пазначыць вылучаныя паведамленьні як важныя"
 
-#: ui/evolution-mail-message.xml.h:53
+#: ui/evolution-mail-message.xml.h:49
 msgid "Mark the selected message(s) as not having been read"
 msgstr "Пазначыць вылучаныя паведамленьні як \"не для чытаньня\""
 
-#: ui/evolution-mail-message.xml.h:54
+#: ui/evolution-mail-message.xml.h:50
 msgid "Mark the selected message(s) as unimportant"
 msgstr "Пазначыць вылучаныя паведамленьні як няважныя"
 
-#: ui/evolution-mail-message.xml.h:55
+#: ui/evolution-mail-message.xml.h:51
 msgid "Mark the selected messages for deletion"
 msgstr "Пазначыць вылучаныя паведамленьні для выдаленьня"
 
-#: ui/evolution-mail-message.xml.h:56
+#: ui/evolution-mail-message.xml.h:52
 msgid "Move"
 msgstr "Перамясьціць"
 
-#: ui/evolution-mail-message.xml.h:57
+#: ui/evolution-mail-message.xml.h:53
 msgid "Move selected message(s) to another folder"
 msgstr "Перамясьціць вылучаныя паведамленьні у іншую тэчку"
 
-#: ui/evolution-mail-message.xml.h:58
+#: ui/evolution-mail-message.xml.h:54
 msgid "Next"
 msgstr "Наступнае"
 
-#: ui/evolution-mail-message.xml.h:59
+#: ui/evolution-mail-message.xml.h:55
 msgid "Next _Important Message"
 msgstr "Наступнае важнае паведамленьне"
 
-#: ui/evolution-mail-message.xml.h:60
+#: ui/evolution-mail-message.xml.h:56
 msgid "Next _Thread"
 msgstr "Наступнае абмеркаваньне тэмы"
 
-#: ui/evolution-mail-message.xml.h:61
+#: ui/evolution-mail-message.xml.h:57
 msgid "Next _Unread Message"
 msgstr "Наступнае нечытанае паведамленьне"
 
-#: ui/evolution-mail-message.xml.h:62
+#: ui/evolution-mail-message.xml.h:58
 msgid "Open the selected message in a new window"
 msgstr "Адкрыць вылучанае паведамленьне ў новым акне"
 
-#: ui/evolution-mail-message.xml.h:63
+#: ui/evolution-mail-message.xml.h:59
 msgid "Open the selected message in the composer to re-send it"
 msgstr "Адкрыць вылучанае паведамленьне ў рэдактары каб перадаслаць яго"
 
-#: ui/evolution-mail-message.xml.h:64
+#: ui/evolution-mail-message.xml.h:60
 msgid "Original Si_ze"
 msgstr "Арыгінальны памер"
 
-#: ui/evolution-mail-message.xml.h:65
+#: ui/evolution-mail-message.xml.h:61
 msgid "P_revious Unread Message"
 msgstr "Папярэдняе нечытанае паведамленьне"
 
-#: ui/evolution-mail-message.xml.h:67
-#, fuzzy
-msgid "Post a Repl_y"
+#: ui/evolution-mail-message.xml.h:62
+msgid "Post a Reply"
 msgstr "Даслаць адказ"
 
-#: ui/evolution-mail-message.xml.h:68
+#: ui/evolution-mail-message.xml.h:63
 msgid "Post a reply to a message in a Public folder"
 msgstr "Даслаць адказ на паведамленьне ў публічную тэчку"
 
-#: ui/evolution-mail-message.xml.h:69
+#: ui/evolution-mail-message.xml.h:64
 msgid "Pr_evious Important Message"
 msgstr "Папярэдняе важнае паведамленьне"
 
-#: ui/evolution-mail-message.xml.h:70
+#: ui/evolution-mail-message.xml.h:65
 msgid "Preview the message to be printed"
 msgstr "Прагледзіць выгляд паведамленьня ў друку"
 
-#: ui/evolution-mail-message.xml.h:71
+#: ui/evolution-mail-message.xml.h:66
 msgid "Previous"
 msgstr "Папярэдняе"
 
-#: ui/evolution-mail-message.xml.h:74
+#: ui/evolution-mail-message.xml.h:69
 msgid "Print this message"
 msgstr "Надрукаваць гэтае паведамленьне"
 
-#: ui/evolution-mail-message.xml.h:75
+#: ui/evolution-mail-message.xml.h:70
 msgid "Re_direct"
 msgstr "Пера_накіраваць"
 
-#: ui/evolution-mail-message.xml.h:76
+#: ui/evolution-mail-message.xml.h:71
 msgid "Redirect (bounce) the selected message to someone"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:79
-msgid "Reply to _All"
-msgstr "Адказаць усім"
-
-#: ui/evolution-mail-message.xml.h:80
-msgid "Reply to _List"
-msgstr "Адказаць у сьпіс"
-
-#: ui/evolution-mail-message.xml.h:81
+#: ui/evolution-mail-message.xml.h:76
 msgid "Reset the text to its original size"
 msgstr "Скінуць тэкст да ягонага арыгінальнага памера"
 
-#: ui/evolution-mail-message.xml.h:82
-#, fuzzy
-msgid "S_earch in Message..."
+#: ui/evolution-mail-message.xml.h:77
+msgid "S_earch Message..."
 msgstr "Шукаць паведамленьне..."
 
-#: ui/evolution-mail-message.xml.h:83
+#: ui/evolution-mail-message.xml.h:78
 msgid "S_maller"
 msgstr "Меншы"
 
-#: ui/evolution-mail-message.xml.h:84
+#: ui/evolution-mail-message.xml.h:79
 msgid "Save the message as a text file"
 msgstr "Захаваць паведамленьне як файл тэкста"
 
-#: ui/evolution-mail-message.xml.h:85
+#: ui/evolution-mail-message.xml.h:80
 msgid "Search for text in the body of the displayed message"
 msgstr "Шукаць тэкст у целе адлюстраванага паведамленьня"
 
-#: ui/evolution-mail-message.xml.h:86
+#: ui/evolution-mail-message.xml.h:81
 msgid "Set up the page settings for your current printer"
 msgstr "Усталяваць парамэтры аркуша для вашае бягучае друкаркі"
 
-#: ui/evolution-mail-message.xml.h:87
+#: ui/evolution-mail-message.xml.h:82
 msgid "Show Email _Source"
 msgstr "Паказаць крыніцу паведамленьня"
 
-#: ui/evolution-mail-message.xml.h:88
+#: ui/evolution-mail-message.xml.h:83
 msgid "Show Full _Headers"
 msgstr "Паказаць усе загалоўкі"
 
-#: ui/evolution-mail-message.xml.h:89
-#, fuzzy
-msgid "Show a blinking cursor in the body of displayed messages"
-msgstr "Шукаць тэкст у целе адлюстраванага паведамленьня"
-
-#: ui/evolution-mail-message.xml.h:90
+#: ui/evolution-mail-message.xml.h:84
 msgid "Show message in the normal style"
 msgstr "Паказаць паведамленьне ў звычайным стылі"
 
-#: ui/evolution-mail-message.xml.h:91
+#: ui/evolution-mail-message.xml.h:85
 msgid "Show message with all email headers"
 msgstr "Паказаць паведамленьне з усімі загалоўкамі"
 
-#: ui/evolution-mail-message.xml.h:92
+#: ui/evolution-mail-message.xml.h:86
 msgid "Show the raw email source of the message"
 msgstr "Паказаць зьмест крыніцы паведамленьня"
 
-#: ui/evolution-mail-message.xml.h:93
+#: ui/evolution-mail-message.xml.h:87
 msgid "Text Si_ze"
 msgstr "Памер тэкста"
 
-#: ui/evolution-mail-message.xml.h:94
+#: ui/evolution-mail-message.xml.h:88
 msgid "Un-delete the selected messages"
 msgstr "Вярнуць з выдаленага вылучаныя паведамленьні"
 
-#: ui/evolution-mail-message.xml.h:95
+#: ui/evolution-mail-message.xml.h:89
 msgid "VFolder on Mailing _List..."
 msgstr "Віртуальная тэчка па сьпісе рассылкі..."
 
-#: ui/evolution-mail-message.xml.h:96
+#: ui/evolution-mail-message.xml.h:90
 msgid "VFolder on Se_nder..."
 msgstr "Віртуальная тэчка па адпраўляльніках..."
 
-#: ui/evolution-mail-message.xml.h:97
+#: ui/evolution-mail-message.xml.h:91
 msgid "VFolder on _Recipients..."
 msgstr "Віртуальная тэчка па атрымоўцах..."
 
-#: ui/evolution-mail-message.xml.h:98
+#: ui/evolution-mail-message.xml.h:92
 msgid "VFolder on _Subject..."
 msgstr "Віртуальная тэчка па тэме..."
 
-#: ui/evolution-mail-message.xml.h:100
+#: ui/evolution-mail-message.xml.h:94
 msgid "_Attached"
 msgstr "Як укладзенае"
 
-#: ui/evolution-mail-message.xml.h:102
+#: ui/evolution-mail-message.xml.h:95
 msgid "_Copy to Folder"
 msgstr "Капіяваць у тэчку"
 
-#: ui/evolution-mail-message.xml.h:103
+#: ui/evolution-mail-message.xml.h:96
 msgid "_Create Filter From Message"
 msgstr "Стварыць фільтар з паведамленьня"
 
-#: ui/evolution-mail-message.xml.h:105
+#: ui/evolution-mail-message.xml.h:98
 msgid "_Forward Message"
 msgstr "Перадаслаць паведамленьне"
 
-#: ui/evolution-mail-message.xml.h:106
+#: ui/evolution-mail-message.xml.h:99
 msgid "_Go To"
 msgstr "Перайсьці да"
 
-#: ui/evolution-mail-message.xml.h:107
+#: ui/evolution-mail-message.xml.h:100
 msgid "_Inline"
 msgstr "Як убудаванае"
 
-#: ui/evolution-mail-message.xml.h:108
+#: ui/evolution-mail-message.xml.h:101
 msgid "_Larger"
 msgstr "Большы"
 
-#: ui/evolution-mail-message.xml.h:109
+#: ui/evolution-mail-message.xml.h:102
 msgid "_Message Display"
 msgstr "Выгляд паведамленьня"
 
-#: ui/evolution-mail-message.xml.h:110
+#: ui/evolution-mail-message.xml.h:103
 msgid "_Move to Folder"
 msgstr "Перамясьціць у тэчку"
 
-#: ui/evolution-mail-message.xml.h:111
+#: ui/evolution-mail-message.xml.h:104
 msgid "_Next Message"
 msgstr "Наступнае паведамленьне"
 
-#: ui/evolution-mail-message.xml.h:112
+#: ui/evolution-mail-message.xml.h:105
 msgid "_Normal Display"
 msgstr "Звычайны выгляд"
 
-#: ui/evolution-mail-message.xml.h:113
+#: ui/evolution-mail-message.xml.h:106
 msgid "_Open Message"
 msgstr "Адкрыць паведамленьне"
 
-#: ui/evolution-mail-message.xml.h:115
+#: ui/evolution-mail-message.xml.h:107
 msgid "_Previous Message"
 msgstr "Папярэдняе паведамленьне"
 
-#: ui/evolution-mail-message.xml.h:117
+#: ui/evolution-mail-message.xml.h:109
 msgid "_Quoted"
 msgstr "_Цытавана"
 
-#: ui/evolution-mail-message.xml.h:118
-msgid "_Reply to Sender"
-msgstr "Адказаць адпраўляльніку"
-
-#: ui/evolution-mail-message.xml.h:119
+#: ui/evolution-mail-message.xml.h:111
 msgid "_Resend..."
 msgstr "Перадаслаць..."
 
-#: ui/evolution-mail-message.xml.h:121 ui/evolution.xml.h:63
+#: ui/evolution-mail-message.xml.h:113 ui/evolution.xml.h:63
 msgid "_Tools"
 msgstr "Інструмэнты"
 
-#: ui/evolution-mail-message.xml.h:122
+#: ui/evolution-mail-message.xml.h:114
 msgid "_Undelete"
 msgstr "Вярнуць з выдаленага"
 
+#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:6
+msgid "Close this window"
+msgstr "Закрыць гэтае акно"
+
+#: ui/evolution-mail-messagedisplay.xml.h:5
+#: ui/evolution-message-composer.xml.h:39
+#: ui/evolution-signature-editor.xml.h:10 ui/evolution-subscribe.xml.h:9
+#: ui/evolution.xml.h:43
+msgid "_Close"
+msgstr "Закрыць"
+
+#: ui/evolution-mail-messagedisplay.xml.h:8
+#: ui/evolution-message-composer.xml.h:49 ui/evolution.xml.h:64
+msgid "_View"
+msgstr "Выгляд"
+
 #: ui/evolution-message-composer.xml.h:1
 msgid "Attach"
 msgstr "Укласьці"
@@ -27633,7 +27851,7 @@ msgstr "Укласьці"
 msgid "Attach a file"
 msgstr "Укласьці файл"
 
-#: ui/evolution-message-composer.xml.h:4 ui/evolution-signature-editor.xml.h:3
+#: ui/evolution-message-composer.xml.h:4 ui/evolution-signature-editor.xml.h:2
 msgid "Close the current file"
 msgstr "Закрыць бягучы файл"
 
@@ -27649,7 +27867,7 @@ msgstr "Закадаваць гэтае паведамленьне з дапам
 msgid "Encrypt this message with your S/MIME Encryption Cetificate"
 msgstr "Закадаваць гэтае паведамленьне вашым сэртыфікатам кадаваньня S/MIME"
 
-#: ui/evolution-message-composer.xml.h:8 ui/evolution-signature-editor.xml.h:4
+#: ui/evolution-message-composer.xml.h:8 ui/evolution-signature-editor.xml.h:3
 msgid "For_mat"
 msgstr "Фармат"
 
@@ -27681,11 +27899,6 @@ msgstr "Кадаваньне S/MIME"
 msgid "S/MIME Sign"
 msgstr "Плдпіс S/MIME"
 
-#: ui/evolution-message-composer.xml.h:16
-#: ui/evolution-signature-editor.xml.h:6
-msgid "Save"
-msgstr "Захаваць"
-
 #: ui/evolution-message-composer.xml.h:17
 msgid "Save As"
 msgstr "Захаваць як"
@@ -27699,7 +27912,7 @@ msgid "Save in folder..."
 msgstr "Захаваць у тэчку..."
 
 #: ui/evolution-message-composer.xml.h:21
-#: ui/evolution-signature-editor.xml.h:9
+#: ui/evolution-signature-editor.xml.h:7
 msgid "Save the current file"
 msgstr "Захаваць бягучы файл"
 
@@ -27716,7 +27929,7 @@ msgid "Send"
 msgstr "Даслаць"
 
 #: ui/evolution-message-composer.xml.h:25
-#: ui/evolution-signature-editor.xml.h:11
+#: ui/evolution-signature-editor.xml.h:9
 msgid "Send the mail in HTML format"
 msgstr "Даслаць ліст у фармаце HTML"
 
@@ -27781,7 +27994,7 @@ msgid "_From Field"
 msgstr "Поле \"Ад каго\""
 
 #: ui/evolution-message-composer.xml.h:44
-#: ui/evolution-signature-editor.xml.h:14
+#: ui/evolution-signature-editor.xml.h:13
 msgid "_Insert"
 msgstr "Уставіць"
 
@@ -27797,11 +28010,11 @@ msgstr "Поле \"Адказаць на\""
 msgid "_Security"
 msgstr "Бясьпека"
 
-#: ui/evolution-signature-editor.xml.h:5
+#: ui/evolution-signature-editor.xml.h:4
 msgid "H_TML"
 msgstr "H_TML"
 
-#: ui/evolution-signature-editor.xml.h:10
+#: ui/evolution-signature-editor.xml.h:8
 msgid "Save the current file and close the window"
 msgstr "Захаваць бягучы файл і закрыць акно"
 
@@ -27877,20 +28090,15 @@ msgstr "Выдаліць вылучаныя заданьні"
 msgid "Mar_k as Complete"
 msgstr "Пазначыць як скончанае"
 
-#: ui/evolution-tasks.xml.h:9
-#, fuzzy
-msgid "Mark selected tasks as complete"
-msgstr "Пазначыць вылучаныя заданьні як выкананыя"
-
-#: ui/evolution-tasks.xml.h:11
+#: ui/evolution-tasks.xml.h:10
 msgid "Paste task from the clipboard"
 msgstr "Уставіць заданьне з буфэра абмену"
 
-#: ui/evolution-tasks.xml.h:12
+#: ui/evolution-tasks.xml.h:11
 msgid "Previews the list of tasks to be printed"
 msgstr "Прагледзіць сьпіс заданьняў які мусіць быць надрукаваны"
 
-#: ui/evolution-tasks.xml.h:14
+#: ui/evolution-tasks.xml.h:13
 msgid "Print the list of tasks"
 msgstr "Надрукаваць сьпіс заданьняў"
 
@@ -28139,33 +28347,27 @@ msgid "_Work Week View"
 msgstr "Прагляд працоўнага тыдня"
 
 #: views/mail/galview.xml.h:1
-#, fuzzy
-msgid "As _Sent Folder"
+msgid "As Sent Folder"
 msgstr "Як тэчка \"дасланае\""
 
 #: views/mail/galview.xml.h:2
-#, fuzzy
-msgid "By S_tatus"
-msgstr "Па стану"
+msgid "By Follow Up Flag"
+msgstr "Па сьцягу \"Да выкананьня\""
 
 #: views/mail/galview.xml.h:3
-#, fuzzy
-msgid "By Se_nder"
+msgid "By Sender"
 msgstr "Па адпраўляльніку"
 
 #: views/mail/galview.xml.h:4
-#, fuzzy
-msgid "By Su_bject"
-msgstr "Па тэме"
+msgid "By Status"
+msgstr "Па стану"
 
 #: views/mail/galview.xml.h:5
-#, fuzzy
-msgid "By _Follow Up Flag"
-msgstr "Па сьцягу \"Да выкананьня\""
+msgid "By Subject"
+msgstr "Па тэме"
 
 #: views/mail/galview.xml.h:6
-#, fuzzy
-msgid "_Messages"
+msgid "Messages"
 msgstr "Паведамленьні"
 
 #: views/tasks/galview.xml.h:1
@@ -28222,20 +28424,20 @@ msgstr "Вызначаныя праглядальнікі..."
 
 #. Translators: These are the first characters of each day of the
 #. week, 'M' for 'Monday', 'T' for Tuesday etc.
-#: widgets/misc/e-calendar-item.c:456
+#: widgets/misc/e-calendar-item.c:427
 msgid "MTWTFSS"
 msgstr "ПАСЧПСН"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: widgets/misc/e-calendar-item.c:1174
+#: widgets/misc/e-calendar-item.c:1127
 msgid "%B %Y"
 msgstr "%B %Y"
 
-#: widgets/misc/e-cell-date-edit.c:241 widgets/misc/e-dateedit.c:431
+#: widgets/misc/e-cell-date-edit.c:241 widgets/misc/e-dateedit.c:428
 msgid "Now"
 msgstr "Зараз"
 
-#: widgets/misc/e-cell-date-edit.c:249 widgets/misc/e-dateedit.c:437
+#: widgets/misc/e-cell-date-edit.c:249 widgets/misc/e-dateedit.c:434
 msgid "Today"
 msgstr "Сёньня"
 
@@ -28352,6 +28554,22 @@ msgstr "Рэдагаваць захаваны пошук..."
 msgid "_Advanced..."
 msgstr "_Адмысловае..."
 
+#: widgets/misc/e-messagebox.c:154
+msgid "Information"
+msgstr "Інфармацыя"
+
+#: widgets/misc/e-messagebox.c:168
+msgid "Error"
+msgstr "Памылка"
+
+#: widgets/misc/e-messagebox.c:175
+msgid "Question"
+msgstr "Пытаньне"
+
+#: widgets/misc/e-messagebox.c:182
+msgid "Message"
+msgstr "Паведамленьне"
+
 #: widgets/misc/e-search-bar.c:531
 msgid "_Search"
 msgstr "По_шук"
@@ -28397,543 +28615,6 @@ msgstr "Праграма лакальнага каляндара \"Эвалюц�
 msgid "Evolution Addressbook local file backend"
 msgstr "Праграма лакальнай кнігі адрэсаў \"Эвалюцыі\""
 
-#~ msgid "Chair Persons"
-#~ msgstr "Кіраўнікі"
-
-#~ msgid "Required Participants"
-#~ msgstr "Патрабаваныя ўдзельнікі"
-
-#~ msgid "Optional Participants"
-#~ msgstr "Дадатковыя ўдзельнікі"
-
-#~ msgid "Resources"
-#~ msgstr "Рэсурсы"
-
-#~ msgid "Individual"
-#~ msgstr "Асабіста"
-
-#~ msgid "Group"
-#~ msgstr "Група"
-
-#~ msgid "Resource"
-#~ msgstr "Рэсурс"
-
-#~ msgid "Room"
-#~ msgstr "Пакой"
-
-#~ msgid "Chair"
-#~ msgstr "Кіраўнік"
-
-#~ msgid "Required Participant"
-#~ msgstr "Патрабаваны ўдзельнік"
-
-#~ msgid "Optional Participant"
-#~ msgstr "Дадатковы удзельнік"
-
-#~ msgid "Non-Participant"
-#~ msgstr "Неудзельнічае"
-
-#~ msgid "Needs Action"
-#~ msgstr "Неабходна дзеяньне"
-
-#~ msgid "Delegated"
-#~ msgstr "Дэлегаваны"
-
-#~ msgid "In Process"
-#~ msgstr "У выкананьні"
-
-#~ msgid "Could not create temporary directory: %s"
-#~ msgstr "Неатрымалася стварыць часовы каталёг: %s"
-
-#~ msgid "%d new"
-#~ msgstr "%d новыя"
-
-#~ msgid ", "
-#~ msgstr ", "
-
-#~ msgid "%d hidden"
-#~ msgstr "%d схаваныя"
-
-#~ msgid "%d visible"
-#~ msgstr "%d бачныя"
-
-#~ msgid "%d selected"
-#~ msgstr "%d выбраныя"
-
-#~ msgid "%d unsent"
-#~ msgstr "%d недасланыя"
-
-#~ msgid "%d sent"
-#~ msgstr "%d дасланыя"
-
-#~ msgid "%d total"
-#~ msgstr "%d агулам"
-
-#~ msgid "Create _Virtual Folder From Search..."
-#~ msgstr "Стварыць _віртуальную тэчку вынікаў пошуку..."
-
-#~ msgid "VFolder on _Subject"
-#~ msgstr "Віртуальная тэчка па тэме"
-
-#~ msgid "VFolder on Se_nder"
-#~ msgstr "Віртуальная тэчка па адпраўляльніку"
-
-#~ msgid "VFolder on _Recipients"
-#~ msgstr "Віртуальная тэчка па атрымоўцы"
-
-#~ msgid "VFolder on Mailing _List"
-#~ msgstr "Віртуальная тэчка па сьпісе рассылкі"
-
-#~ msgid "Filter on Sub_ject"
-#~ msgstr "Фільтар па тэме"
-
-#~ msgid "Filter on Sen_der"
-#~ msgstr "Фільтар па адпраўляльніку"
-
-#~ msgid "Filter on Re_cipients"
-#~ msgstr "Фільтар па атрымоўцы"
-
-#~ msgid "Filter on _Mailing List"
-#~ msgstr "Фільтар па сьпісе рассылкі"
-
-#~ msgid "_Edit as New Message..."
-#~ msgstr "Зьмяніць як новае паведамленьне..."
-
-#~ msgid "_Print"
-#~ msgstr "_Друк"
-
-#~ msgid "_Forward"
-#~ msgstr "_Перадаслаць"
-
-#~ msgid "Follo_w Up..."
-#~ msgstr "Падняцца вышэй..."
-
-#~ msgid "Fla_g Completed"
-#~ msgstr "Выкананы сьцяг"
-
-#~ msgid "Cl_ear Flag"
-#~ msgstr "Ачысьціць сьцяг"
-
-#~ msgid "Mark as _Unread"
-#~ msgstr "Пазначыць як нечытанае"
-
-#~ msgid "Mark as _Important"
-#~ msgstr "Пазначыць як важнае"
-
-#~ msgid "_Mark as Unimportant"
-#~ msgstr "Пазначыць як неважнае"
-
-#~ msgid "U_ndelete"
-#~ msgstr "_Вярнуць"
-
-#~ msgid "Mo_ve to Folder..."
-#~ msgstr "Перамясьціць у тэчку..."
-
-#~ msgid "Add Sender to Address_book"
-#~ msgstr "Дадаць адпраўляльніка ў кнігу адрэсаў"
-
-#~ msgid "Appl_y Filters"
-#~ msgstr "_Ужыць фільтары"
-
-#~ msgid "Crea_te Rule From Message"
-#~ msgstr "Стварыць правіла з паведамленьня"
-
-#~ msgid "VFolder on M_ailing List"
-#~ msgstr "Віртуальная тэчка па сьпісе рассылкі"
-
-#~ msgid "Filter on _Mailing List (%s)"
-#~ msgstr "Фільтар па сьпісе рассылкі (%s)"
-
-#~ msgid "VFolder on M_ailing List (%s)"
-#~ msgstr "Віртуальная тэчка па сьпісе рассылкі (%s)"
-
-#~ msgid "Properties for \"%s\""
-#~ msgstr "Уласьцівасьці для \"%s\""
-
-#~ msgid "Properties"
-#~ msgstr "Уласьцівасьці"
-
-#~ msgid "Don't show this message again."
-#~ msgstr "Неадлюстроўваць гэтае паведамленьне нанова."
-
-#~ msgid ""
-#~ "You have not configured the mail client.\n"
-#~ "You need to do this before you can send,\n"
-#~ "receive or compose mail.\n"
-#~ "Would you like to configure it now?"
-#~ msgstr ""
-#~ "Вы не наладзілі паштовага кліента.\n"
-#~ "Вам трэба зрабіць гэта да тагочасу, як вы здолееце\n"
-#~ "дасылаць, атрымліваць ці рэдагаваць пошту.\n"
-#~ "Вы жадаеце наладзіць гэта зараз?"
-
-#~ msgid ""
-#~ "You need to configure an account\n"
-#~ "before you can compose mail."
-#~ msgstr ""
-#~ "Вы мусіце наладзіць уліковы запіс\n"
-#~ "да таго як стварыць паведамленьне."
-
-#~ msgid ""
-#~ "You need to configure an identity\n"
-#~ "before you can compose mail."
-#~ msgstr ""
-#~ "Вы мусіце наладзіць карыстальніка\n"
-#~ "да таго як вы здолееце дасылаць пошту."
-
-#~ msgid ""
-#~ "You need to configure a mail transport\n"
-#~ "before you can compose mail."
-#~ msgstr ""
-#~ "Вы мусіце наладзіць перадачу пошты\n"
-#~ "да таго як вы здолееце даслаць пошту."
-
-#~ msgid ""
-#~ "You are sending an HTML-formatted message. Please make sure that\n"
-#~ "the following recipients are willing and able to receive HTML mail:\n"
-#~ msgstr ""
-#~ "Вы дасылаеце паведамленьне фарматаванае ў HTML. Калі ласка,\n"
-#~ "упэўніцеся што наступныя атрымоўцы жадаюць і могуць атрымліваць\n"
-#~ "пошту у фармаце HTML:\n"
-
-#~ msgid "Send anyway?"
-#~ msgstr "Даслаць у любым выпадку?"
-
-#~ msgid ""
-#~ "This message has no subject.\n"
-#~ "Really send?"
-#~ msgstr ""
-#~ "Гэтае паведамленьне ня мае тэмы.\n"
-#~ "Даслаць яго?"
-
-#~ msgid "This message contains only Bcc recipients."
-#~ msgstr "Гэтае паведамленьне утрымлівае толькі атрымоўцаў схаванае копіі."
-
-#~ msgid "You must specify recipients in order to send this message."
-#~ msgstr "Вы мусіце пазначыць атрымоўцаў, каб даслаць гэтае паведамленьне."
-
-#~ msgid ""
-#~ "Unable to open the drafts folder for this account.\n"
-#~ "Would you like to use the default drafts folder?"
-#~ msgstr ""
-#~ "Неатрымалася адкрыць тэчку чарнавікоў для гэтага рахунка.\n"
-#~ "Жадаеце дапомна выкарыстоўваць тэчку чарнавікоў?"
-
-#~ msgid "an unknown sender"
-#~ msgstr "невядомы адпраўляльнік"
-
-#, fuzzy
-#~ msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
-#~ msgstr "%a, %Y-%m-%d у %H:%M, %%s піша:"
-
-#~ msgid "Move message(s) to"
-#~ msgstr "Перамясьціць паведамленьне(і) ў"
-
-#~ msgid "Copy message(s) to"
-#~ msgstr "Капіяваць паведамленьне(і) ў"
-
-#~ msgid "Are you sure you want to edit all %d messages?"
-#~ msgstr "Вы упэўненыя што жадаеце даслаць усе %d паведамленьні?"
-
-#~ msgid ""
-#~ "You may only edit messages saved\n"
-#~ "in the Drafts folder."
-#~ msgstr ""
-#~ "Вы можаце даслаць толькі паведамленьні\n"
-#~ "захаваныя ў тэчцы \"Чарнавікі\"."
-
-#~ msgid ""
-#~ "You may only resend messages\n"
-#~ "in the Sent folder."
-#~ msgstr ""
-#~ "Вы можаце толькі перадасылаць паведамленьні\n"
-#~ "з тэчкі \"Дасланыя\"."
-
-#~ msgid "Are you sure you want to resend all %d messages?"
-#~ msgstr "Вы упэўненыя што жадаеце перадаслаць усе %d паведамленьні?"
-
-#~ msgid "No Message Selected"
-#~ msgstr "Паведамленьне ня выбрана"
-
-#~ msgid ""
-#~ "Cannot save to `%s'\n"
-#~ " %s"
-#~ msgstr ""
-#~ "Немагчыма захаваць у `%s'\n"
-#~ " %s"
-
-#~ msgid ""
-#~ "`%s' already exists.\n"
-#~ "Overwrite it?"
-#~ msgstr ""
-#~ "`%s' ужо існуе.\n"
-#~ "Перазапісаць?"
-
-#~ msgid "Save Message As..."
-#~ msgstr "Захаваць паведамлеьне як..."
-
-#~ msgid "Save Messages As..."
-#~ msgstr "Захаваць паведамленьні як..."
-
-#~ msgid ""
-#~ "This operation will permanently erase all messages marked as\n"
-#~ "deleted. If you continue, you will not be able to recover these "
-#~ "messages.\n"
-#~ "\n"
-#~ "Really erase these messages?"
-#~ msgstr ""
-#~ "Гэтая апэрацыя прывядзе да поўнага вынішчэньня усіх паведамленьняў\n"
-#~ "пазначаных як выдаленыя. Калі вы працягніце, гэтае нельга будзе "
-#~ "аднавіць.\n"
-#~ "\n"
-#~ "Сапраўды сьцёрці паведамленьні?"
-
-#~ msgid ""
-#~ "Error loading filter information:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Памылка пад час загрузкі інфармацыі фільтара:\n"
-#~ "%s"
-
-#~ msgid "Filters"
-#~ msgstr "Фільтары"
-
-#~ msgid "Page %d of %d"
-#~ msgstr "Аркуш %d з %d"
-
-#~ msgid "Print Message"
-#~ msgstr "Друк паведамленьня"
-
-#~ msgid "Printing of message failed"
-#~ msgstr "Збой друку паведамленьня"
-
-#~ msgid "Are you sure you want to open all %d messages in separate windows?"
-#~ msgstr ""
-#~ "Вы упэўненыя што жадаеце адкрыць усе %d паведамленьні ў асобных вокнах?"
-
-#~ msgid ""
-#~ "File `%s' already exists.\n"
-#~ "Overwrite it?"
-#~ msgstr ""
-#~ "Файл `%s' ужо існуе.\n"
-#~ "Перапісаць яго?"
-
-#~ msgid "Save Attachment"
-#~ msgstr "Захаваць укладаньне"
-
-#~ msgid "Could not create temporary file '%s': %s"
-#~ msgstr "Немагчыма стварыць часовы файл '%s': %s"
-
-#, fuzzy
-#~ msgid "%s is not a valid directory name."
-#~ msgstr "\"%s\" не зьяўляецца паштовым каталёгам."
-
-#~ msgid "Save Attachment..."
-#~ msgstr "Захаваць укладаньне..."
-
-#, fuzzy
-#~ msgid "Save all attachments..."
-#~ msgstr "Захаваць укладаньне..."
-
-#~ msgid "View Inline"
-#~ msgstr "Убудаваны прагляд"
-
-#~ msgid "Open in %s..."
-#~ msgstr "Адкрыць у %s..."
-
-#~ msgid "View Inline (via %s)"
-#~ msgstr "Убудаваны прагляд (праз %s)"
-
-#~ msgid "Hide"
-#~ msgstr "Схаваць"
-
-#~ msgid "External Viewer"
-#~ msgstr "Вонкавы праглядальнік"
-
-#~ msgid "Downloading images"
-#~ msgstr "Загрузка відарысаў"
-
-#~ msgid "Loading message content"
-#~ msgstr "Загрузка зьместу паведамленьня"
-
-#~ msgid "Overdue:"
-#~ msgstr "Пратэрмінавана:"
-
-#, fuzzy
-#~ msgid "by %B %d, %Y, %l:%M %p"
-#~ msgstr "да %B %d, %Y, %l:%M %P"
-
-#~ msgid "Open Link in Browser"
-#~ msgstr "Адкрыць спасылку ў аглядальніке"
-
-#~ msgid "Copy Link Location"
-#~ msgstr "Скапіяваць спасылку"
-
-#~ msgid "Save Link as (FIXME)"
-#~ msgstr "Захаваць спасылку як"
-
-#~ msgid "Save Image as..."
-#~ msgstr "Захаваць відарыс як..."
-
-#~ msgid "%s attachment"
-#~ msgstr "%s укладаньне"
-
-#~ msgid "Could not parse MIME message. Displaying as source."
-#~ msgstr ""
-#~ "Неатрымалася разабраць паведамленьне MIME. Адлюстроўваецца як крыніца."
-
-#~ msgid "Bad Address"
-#~ msgstr "Кепская адрэса"
-
-#~ msgid "Reply-To"
-#~ msgstr "Адказаць на"
-
-#~ msgid "Cc"
-#~ msgstr "Копія"
-
-#~ msgid "Bcc"
-#~ msgstr "Сх.копія"
-
-#~ msgid ""
-#~ "This message is digitally signed. Click the lock icon for more "
-#~ "information."
-#~ msgstr ""
-#~ "Гэта паведамленьне мае лічбавы подпіс. Клікніце па значке замка для "
-#~ "дадатковых зьвестак."
-
-#~ msgid "Could not create a PGP verfication context"
-#~ msgstr "Неатрымалася стварыць кантэкст праверкі PGP"
-
-#~ msgid "This message is digitally signed and has been found to be authentic."
-#~ msgstr ""
-#~ "Гэта паведамленьне з лічбавым подпісам, які прайшоў праверку тоеснасьці."
-
-#~ msgid ""
-#~ "This message is digitally signed but can not be proven to be authentic."
-#~ msgstr ""
-#~ "Гэта паведамленьне з лічбавым подпісам, які ня можа быць правераны на "
-#~ "тоеснасьць."
-
-#~ msgid "Pointer to FTP site (%s)"
-#~ msgstr "Указальнік на FTP сайт (%s)"
-
-#~ msgid "Pointer to local file (%s) valid at site \"%s\""
-#~ msgstr "Указальнік на лякальны файл (%s), даступны на сайце \"%s\""
-
-#~ msgid "Pointer to local file (%s)"
-#~ msgstr "Указальнік на лакальны файл (%s)"
-
-#~ msgid "Pointer to remote data (%s)"
-#~ msgstr "Указальнік на аддаленыя даньні (%s)"
-
-#~ msgid "Pointer to unknown external data (\"%s\" type)"
-#~ msgstr "Указальнік на невядомыя вонкавыя даньні (тыпа \"%s\")"
-
-#~ msgid "Malformed external-body part."
-#~ msgstr "Часка external-body памылкова сфармаваная"
-
-#~ msgid "(Untitled Message)"
-#~ msgstr "(Паведамленьне бяз назвы)"
-
-#~ msgid "Untitled Message"
-#~ msgstr "Паведамленьне бяз назвы"
-
-#~ msgid "Empty Message"
-#~ msgstr "Пустое паведамленьне"
-
-#~ msgid "Find in Message"
-#~ msgstr "Пошук у паведамленьні"
-
-#~ msgid "Case Sensitive"
-#~ msgstr "Улічваць рэгістар"
-
-#~ msgid "Search Forward"
-#~ msgstr "Пошук наперад"
-
-#~ msgid "Find:"
-#~ msgstr "Пошук:"
-
-#~ msgid "Matches:"
-#~ msgstr "Супадзеньні:"
-
-#~ msgid "(No subject)"
-#~ msgstr "(Бяз тэмы)"
-
-#~ msgid "%s - Message"
-#~ msgstr "%s - Паведамленьне"
-
-#~ msgid "Scanning folders under %s on \"%s\""
-#~ msgstr "Сканаваньне тэчак у %s на \"%s\""
-
-#~ msgid "Scanning root-level folders on \"%s\""
-#~ msgstr "Сканаваньне карэнных тэчак у \"%s\""
-
-#~ msgid "Subscribing to folder \"%s\""
-#~ msgstr "Падпісваньне на тэчку \"%s\""
-
-#~ msgid "Unsubscribing to folder \"%s\""
-#~ msgstr "Адмаўленьне ад тэчкі \"%s\""
-
-#~ msgid "No server has been selected"
-#~ msgstr "Небыў выбраны паслужнік"
-
-#~ msgid "Please select a server."
-#~ msgstr "Калі ласка, выбярыце паслужнік."
-
-#~ msgid "That person is already attending the meeting!"
-#~ msgstr "Гэты чалавек ужо ўдзельнічае у нарадзе!"
-
-#~ msgid "URL:"
-#~ msgstr "URL:"
-
-#~ msgid "_Save as..."
-#~ msgstr "Захаваць _як..."
-
-#~ msgid "End Date"
-#~ msgstr "Дата завяршэньня"
-
-#~ msgid "New _Appointment"
-#~ msgstr "Новая _сустрэча"
-
-#~ msgid "Print..."
-#~ msgstr "Друк..."
-
-#~ msgid "Could not create a S/MIME signature context."
-#~ msgstr "Неатрымліваецца стварыць кантэкст подпіса s/MIME"
-
-#~ msgid "Could not create a S/MIME certsonly context."
-#~ msgstr "Неатрымліваецца стварыць кантэкст S/MIME certonly"
-
-#~ msgid "Could not create a S/MIME encryption context."
-#~ msgstr "Неатрымліваецца стварыць кантэкст шыфраваньня S/MIME"
-
-#~ msgid "Could not create a S/MIME envelope context."
-#~ msgstr "Неатрымліваецца стварыць кантэкст абалонкі S/MIME"
-
-#~ msgid "Could not create a S/MIME decode context."
-#~ msgstr "Неатрымліваецца стварыць кантэкст дэкадаваньня S/MIME"
-
-#~ msgid "However, the message was successfully sent."
-#~ msgstr "Аднак паведамленьне было пасьпяхова даслана."
-
-#~ msgid "Forwarded Message"
-#~ msgstr "Перадасланае паведамленьне"
-
-#~ msgid "Scanning folders ..."
-#~ msgstr "Сканаваньне тэчак..."
-
-#~ msgid "Save As..."
-#~ msgstr "Захаваць як..."
-
-#~ msgid "Information"
-#~ msgstr "Інфармацыя"
-
-#~ msgid "Question"
-#~ msgstr "Пытаньне"
-
-#~ msgid "Message"
-#~ msgstr "Паведамленьне"
-
 #~ msgid ""
 #~ "ping_timeout_callback: could not determine if the CORBA object is nil or "
 #~ "not"
@@ -29004,6 +28685,9 @@ msgstr "Праграма лакальнай кнігі адрэсаў \"Эвал
 #~ msgid "Can't get storage list from registry: %s"
 #~ msgstr "Немагчыма узяць сьпіс з рэгістра : %s"
 
+#~ msgid "Cannot initialize Evolution's folder info component."
+#~ msgstr "Ня атрымліваецца ініцыялізаваць кампанэнт інфармацыі пра тэчку."
+
 #~ msgid "Cannot initialize Evolution's mail config component."
 #~ msgstr "Немагчыма ініцыялізаваць кампанэнт наладкі пошты Evolution."
 
diff --git a/po/bg.po b/po/bg.po
index b24bd8c268..555d82c92f 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -6,210 +6,60 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: 1.1\n"
-"POT-Creation-Date: 2003-10-15 23:45+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2003-07-19 15:37+0800\n"
 "PO-Revision-Date: 2002-08-16 02:00+0300\n"
 "Last-Translator: Borislav Aleksandrov <B.Aleksandrov@cnsys.bg>\n"
 "Language-Team: Bulgarian <dict@linux.zonebg.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Report-Msgid-Bugs-To: \n"
 "X-Generator: KBabel 0.9.6\n"
 
-#: addressbook/backend/ebook/e-card.c:1306
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in.h:1
+#, fuzzy
+msgid "Evolution LDIF importer"
+msgstr "Помощник за Импортиране на Evolution"
+
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in.h:2
+msgid "LDAP Data Interchange Format (.ldif)"
+msgstr ""
+
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:1
+#, fuzzy
+msgid "Evolution VCard Importer"
+msgstr "Композер на поща за Evolution."
+
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:2
+#, fuzzy
+msgid "Evolution VCard importer"
+msgstr "Композер на поща за Evolution."
+
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:3
+msgid "VCard (.vcf, .gcrd)"
+msgstr ""
+
 #: addressbook/backend/ebook/e-card-simple.c:60
+#: addressbook/backend/ebook/e-card.c:1306
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:15
 msgid "File As"
 msgstr "Файл като:"
 
-#: addressbook/backend/ebook/e-card.c:1313
-#: addressbook/gui/contact-editor/fullname.glade.h:4
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:17
-msgid "Full Name"
-msgstr "Пълно Име"
-
-#: addressbook/backend/ebook/e-card.c:1320
 #: addressbook/backend/ebook/e-card-simple.c:61
-#: addressbook/gui/component/select-names/e-select-names.etspec.h:1
+#: addressbook/backend/ebook/e-card.c:1320
 #: addressbook/gui/component/select-names/e-select-names-section.etspec.h:1
+#: addressbook/gui/component/select-names/e-select-names.etspec.h:1
 #: addressbook/gui/contact-editor/e-contact-editor-fullname.c:89
 #: my-evolution/e-summary-table.c:59
 msgid "Name"
 msgstr "Име"
 
-#: addressbook/backend/ebook/e-card.c:1326
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:96
-#, fuzzy
-msgid "Address"
-msgstr "_Адрес:"
-
-#: addressbook/backend/ebook/e-card.c:1333
-#, fuzzy
-msgid "Address Label"
-msgstr "Адресни Карти"
-
-#: addressbook/backend/ebook/e-card.c:1340
-#, fuzzy
-msgid "Phone"
-msgstr "Понце"
-
-#: addressbook/backend/ebook/e-card.c:1347
 #: addressbook/backend/ebook/e-card-simple.c:62
+#: addressbook/backend/ebook/e-card.c:1347
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
 msgid "Email"
 msgstr "Email"
 
-#: addressbook/backend/ebook/e-card.c:1354
-#, fuzzy
-msgid "Birth date"
-msgstr "Дата на раждане"
-
-#: addressbook/backend/ebook/e-card.c:1360
-#: calendar/gui/e-calendar-table.etspec.h:18
-msgid "URL"
-msgstr "URL"
-
-#: addressbook/backend/ebook/e-card.c:1367
-#: addressbook/backend/ebook/e-card-simple.c:69
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
-msgid "Organization"
-msgstr "Организация"
-
-#: addressbook/backend/ebook/e-card.c:1374
-#, fuzzy
-msgid "Organizational Unit"
-msgstr "Организация"
-
-#: addressbook/backend/ebook/e-card.c:1381
-#: addressbook/backend/ebook/e-card-simple.c:90
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
-msgid "Office"
-msgstr "Офис"
-
-#: addressbook/backend/ebook/e-card.c:1388
-#: addressbook/backend/ebook/e-card-simple.c:91
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:39
-msgid "Title"
-msgstr "Титла"
-
-#: addressbook/backend/ebook/e-card.c:1395
-#: calendar/gui/e-meeting-time-sel.etspec.h:9
-msgid "Role"
-msgstr "Роля"
-
-#: addressbook/backend/ebook/e-card.c:1402
-#: addressbook/backend/ebook/e-card-simple.c:93
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
-msgid "Manager"
-msgstr "Мениджър"
-
-#: addressbook/backend/ebook/e-card.c:1409
-#: addressbook/backend/ebook/e-card-simple.c:64
-#: addressbook/backend/ebook/e-card-simple.c:94
-#: addressbook/gui/contact-editor/e-contact-editor.c:1737
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:2
-msgid "Assistant"
-msgstr "Асистент"
-
-#: addressbook/backend/ebook/e-card.c:1416
-#: addressbook/backend/ebook/e-card-simple.c:95
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-msgid "Nickname"
-msgstr "Прякор"
-
-#: addressbook/backend/ebook/e-card.c:1423
-#: addressbook/backend/ebook/e-card-simple.c:96
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:36
-msgid "Spouse"
-msgstr "Съпруг(а)"
-
-#: addressbook/backend/ebook/e-card.c:1430
-#: addressbook/backend/ebook/e-card-simple.c:101
-msgid "Anniversary"
-msgstr "Годишнина"
-
-#: addressbook/backend/ebook/e-card.c:1436
-#, fuzzy
-msgid "Mailer"
-msgstr ""
-"\n"
-"Пощенска програма: "
-
-#: addressbook/backend/ebook/e-card.c:1443
-#: addressbook/backend/ebook/e-card-simple.c:98
-msgid "Calendar URI"
-msgstr "URI за календар"
-
-#: addressbook/backend/ebook/e-card.c:1450
-#, fuzzy
-msgid "Free/Busy URL"
-msgstr "Сво_боден/Зает URL:"
-
-#: addressbook/backend/ebook/e-card.c:1457
-#, fuzzy
-msgid "ICS Calendar"
-msgstr "Календар"
-
-#: addressbook/backend/ebook/e-card.c:1464
-#: addressbook/backend/ebook/e-card-simple.c:97
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
-msgid "Note"
-msgstr "Бележка"
-
-#: addressbook/backend/ebook/e-card.c:1471
-#, fuzzy
-msgid "Related Contacts"
-msgstr "Изтриване на Контакт?"
-
-#: addressbook/backend/ebook/e-card.c:1478
-#: addressbook/backend/ebook/e-card-simple.c:105
-#: calendar/gui/e-calendar-table.etspec.h:4
-msgid "Categories"
-msgstr "Категории"
-
-#: addressbook/backend/ebook/e-card.c:1485
-#, fuzzy
-msgid "Category List"
-msgstr "Категорията е"
-
-#: addressbook/backend/ebook/e-card.c:1492
-msgid "Wants HTML"
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:1499
-msgid "Wants HTML set"
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:1506 ui/evolution-calendar.xml.h:16
-#, fuzzy
-msgid "List"
-msgstr "Листа"
-
-#: addressbook/backend/ebook/e-card.c:1513
-#, fuzzy
-msgid "List Show Addresses"
-msgstr "Друг Адрес"
-
-#: addressbook/backend/ebook/e-card.c:1520
-#, fuzzy
-msgid "Arbitrary"
-msgstr "Амристар"
-
-#: addressbook/backend/ebook/e-card.c:1527
-#, fuzzy
-msgid "ID"
-msgstr "1-ви"
-
-#: addressbook/backend/ebook/e-card.c:1534
-#, fuzzy
-msgid "Last Use"
-msgstr "Поставя"
-
-#: addressbook/backend/ebook/e-card.c:1545
-#, fuzzy
-msgid "Use Score"
-msgstr "Прекръсва"
-
 #: addressbook/backend/ebook/e-card-simple.c:63
 #: addressbook/gui/contact-editor/e-contact-editor.c:1752
 msgid "Primary"
@@ -219,6 +69,14 @@ msgstr "Основен"
 msgid "Prim"
 msgstr "Основен"
 
+#: addressbook/backend/ebook/e-card-simple.c:64
+#: addressbook/backend/ebook/e-card-simple.c:94
+#: addressbook/backend/ebook/e-card.c:1409
+#: addressbook/gui/contact-editor/e-contact-editor.c:1737
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:2
+msgid "Assistant"
+msgstr "Асистент"
+
 #: addressbook/backend/ebook/e-card-simple.c:65
 #: addressbook/backend/ebook/e-card-simple.c:70
 #: addressbook/gui/contact-editor/e-contact-editor.c:1738
@@ -253,6 +111,12 @@ msgid "Home"
 msgstr "Домашен"
 
 #: addressbook/backend/ebook/e-card-simple.c:69
+#: addressbook/backend/ebook/e-card.c:1367
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
+msgid "Organization"
+msgstr "Организация"
+
+#: addressbook/backend/ebook/e-card-simple.c:69
 msgid "Org"
 msgstr "Орг"
 
@@ -371,9 +235,21 @@ msgid "Dep"
 msgstr "Отд"
 
 #: addressbook/backend/ebook/e-card-simple.c:90
+#: addressbook/backend/ebook/e-card.c:1381
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
+msgid "Office"
+msgstr "Офис"
+
+#: addressbook/backend/ebook/e-card-simple.c:90
 msgid "Off"
 msgstr "Офис"
 
+#: addressbook/backend/ebook/e-card-simple.c:91
+#: addressbook/backend/ebook/e-card.c:1388
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:39
+msgid "Title"
+msgstr "Титла"
+
 #: addressbook/backend/ebook/e-card-simple.c:92
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:34
 msgid "Profession"
@@ -384,6 +260,12 @@ msgid "Prof"
 msgstr "Проф"
 
 #: addressbook/backend/ebook/e-card-simple.c:93
+#: addressbook/backend/ebook/e-card.c:1402
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
+msgid "Manager"
+msgstr "Мениджър"
+
+#: addressbook/backend/ebook/e-card-simple.c:93
 msgid "Man"
 msgstr "Мениджър"
 
@@ -392,9 +274,32 @@ msgid "Ass"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:95
+#: addressbook/backend/ebook/e-card.c:1416
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
+msgid "Nickname"
+msgstr "Прякор"
+
+#: addressbook/backend/ebook/e-card-simple.c:95
 msgid "Nick"
 msgstr "Прякор"
 
+#: addressbook/backend/ebook/e-card-simple.c:96
+#: addressbook/backend/ebook/e-card.c:1423
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:36
+msgid "Spouse"
+msgstr "Съпруг(а)"
+
+#: addressbook/backend/ebook/e-card-simple.c:97
+#: addressbook/backend/ebook/e-card.c:1464
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
+msgid "Note"
+msgstr "Бележка"
+
+#: addressbook/backend/ebook/e-card-simple.c:98
+#: addressbook/backend/ebook/e-card.c:1443
+msgid "Calendar URI"
+msgstr "URI за календар"
+
 #: addressbook/backend/ebook/e-card-simple.c:98
 msgid "CALUri"
 msgstr "КалURI"
@@ -418,6 +323,11 @@ msgid "icsCalendar"
 msgstr "Календар"
 
 #: addressbook/backend/ebook/e-card-simple.c:101
+#: addressbook/backend/ebook/e-card.c:1430
+msgid "Anniversary"
+msgstr "Годишнина"
+
+#: addressbook/backend/ebook/e-card-simple.c:101
 msgid "Anniv"
 msgstr "Год"
 
@@ -425,6 +335,12 @@ msgstr "Год"
 msgid "Birth Date"
 msgstr "Дата на раждане"
 
+#: addressbook/backend/ebook/e-card-simple.c:105
+#: addressbook/backend/ebook/e-card.c:1478
+#: calendar/gui/e-calendar-table.etspec.h:4
+msgid "Categories"
+msgstr "Категории"
+
 #: addressbook/backend/ebook/e-card-simple.c:106
 msgid "Family Name"
 msgstr "Фамилия"
@@ -440,34 +356,125 @@ msgid "%x"
 msgstr "%x"
 
 #: addressbook/backend/ebook/e-card-simple.c:912
-#: addressbook/backend/ebook/e-destination.c:709
+#: addressbook/backend/ebook/e-destination.c:706
 #, fuzzy
 msgid "Unnamed List"
 msgstr "Неименуван Списък с Контакти"
 
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in.h:1
+#: addressbook/backend/ebook/e-card.c:1313
+#: addressbook/gui/contact-editor/fullname.glade.h:4
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:17
+msgid "Full Name"
+msgstr "Пълно Име"
+
+#: addressbook/backend/ebook/e-card.c:1326
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:96
 #, fuzzy
-msgid "Evolution LDIF importer"
-msgstr "Помощник за Импортиране на Evolution"
+msgid "Address"
+msgstr "_Адрес:"
 
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in.h:2
-msgid "LDAP Data Interchange Format (.ldif)"
+#: addressbook/backend/ebook/e-card.c:1333
+#, fuzzy
+msgid "Address Label"
+msgstr "Адресни Карти"
+
+#: addressbook/backend/ebook/e-card.c:1340
+#, fuzzy
+msgid "Phone"
+msgstr "Понце"
+
+#: addressbook/backend/ebook/e-card.c:1354
+#, fuzzy
+msgid "Birth date"
+msgstr "Дата на раждане"
+
+#: addressbook/backend/ebook/e-card.c:1360
+#: calendar/gui/e-calendar-table.etspec.h:19
+msgid "URL"
+msgstr "URL"
+
+#: addressbook/backend/ebook/e-card.c:1374
+#, fuzzy
+msgid "Organizational Unit"
+msgstr "Организация"
+
+#: addressbook/backend/ebook/e-card.c:1395
+#: calendar/gui/dialogs/meeting-page.etspec.h:9
+#: calendar/gui/e-meeting-time-sel.etspec.h:9
+msgid "Role"
+msgstr "Роля"
+
+#: addressbook/backend/ebook/e-card.c:1436 mail/mail-format.c:962
+#, fuzzy
+msgid "Mailer"
 msgstr ""
+"\n"
+"Пощенска програма: "
 
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:1
+#: addressbook/backend/ebook/e-card.c:1450
 #, fuzzy
-msgid "Evolution VCard Importer"
-msgstr "Композер на поща за Evolution."
+msgid "Free/Busy URL"
+msgstr "Сво_боден/Зает URL:"
 
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:2
+#: addressbook/backend/ebook/e-card.c:1457
 #, fuzzy
-msgid "Evolution VCard importer"
-msgstr "Композер на поща за Evolution."
+msgid "ICS Calendar"
+msgstr "Календар"
 
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:3
-msgid "VCard (.vcf, .gcrd)"
+#: addressbook/backend/ebook/e-card.c:1471
+#, fuzzy
+msgid "Related Contacts"
+msgstr "Изтриване на Контакт?"
+
+#: addressbook/backend/ebook/e-card.c:1485
+#, fuzzy
+msgid "Category List"
+msgstr "Категорията е"
+
+#: addressbook/backend/ebook/e-card.c:1492
+msgid "Wants HTML"
 msgstr ""
 
+#: addressbook/backend/ebook/e-card.c:1499
+msgid "Wants HTML set"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:1506
+#, fuzzy
+msgid "List"
+msgstr "Листа"
+
+#: addressbook/backend/ebook/e-card.c:1513
+#, fuzzy
+msgid "List Show Addresses"
+msgstr "Друг Адрес"
+
+#: addressbook/backend/ebook/e-card.c:1520
+#, fuzzy
+msgid "Arbitrary"
+msgstr "Амристар"
+
+#: addressbook/backend/ebook/e-card.c:1527
+#, fuzzy
+msgid "ID"
+msgstr "1-ви"
+
+#: addressbook/backend/ebook/e-card.c:1534
+#, fuzzy
+msgid "Last Use"
+msgstr "Поставя"
+
+#: addressbook/backend/ebook/e-card.c:1545
+#, fuzzy
+msgid "Use Score"
+msgstr "Прекръсва"
+
+#: addressbook/backend/ebook/test-client-list.c:15
+#: addressbook/backend/ebook/test-client.c:33
+#: calendar/gui/alarm-notify/notify-main.c:171
+msgid "Could not initialize Bonobo"
+msgstr "Не мога да инициализирам Bonobo"
+
 #: addressbook/backend/pas/pas-backend-file.c:464
 #: addressbook/backend/pas/pas-backend-ldap.c:3050
 msgid "Searching..."
@@ -528,14 +535,14 @@ msgid "EBook not loaded\n"
 msgstr "EBook не е зареден\n"
 
 #: addressbook/conduit/address-conduit.c:1376
-#: calendar/conduits/calendar/calendar-conduit.c:1351
-#: calendar/conduits/todo/todo-conduit.c:893
+#: calendar/conduits/calendar/calendar-conduit.c:1342
+#: calendar/conduits/todo/todo-conduit.c:884
 msgid "Could not start wombat server"
 msgstr "Не мога да стартирам wombat сървър"
 
 #: addressbook/conduit/address-conduit.c:1377
-#: calendar/conduits/calendar/calendar-conduit.c:1352
-#: calendar/conduits/todo/todo-conduit.c:894
+#: calendar/conduits/calendar/calendar-conduit.c:1343
+#: calendar/conduits/todo/todo-conduit.c:885
 msgid "Could not start wombat"
 msgstr "Не мога да стартирам wombat"
 
@@ -544,6 +551,159 @@ msgstr "Не мога да стартирам wombat"
 msgid "Could not read pilot's Address application block"
 msgstr ""
 
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
+msgid "Configure access to LDAP directory servers here"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
+msgid "Directory Servers"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
+#, fuzzy
+msgid "Evolution Addressbook"
+msgstr "Редактирай адресната книга"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
+#, fuzzy
+msgid "Evolution Addressbook LDAP Configuration Control"
+msgstr "Интерфейс за търсенето по имена в адресната книга на Еволюшън"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
+msgid "Evolution Addressbook address pop-up"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
+#, fuzzy
+msgid "Evolution Addressbook address viewer"
+msgstr "Интерфейс за търсенето по имена в адресната книга на Еволюшън"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
+#, fuzzy
+msgid "Evolution Addressbook card viewer"
+msgstr "Интерфейс за търсенето по имена в адресната книга на Еволюшън"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
+#, fuzzy
+msgid "Evolution Addressbook component"
+msgstr "Композер на поща за Evolution."
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
+#, fuzzy
+msgid "Evolution Addressbook folder viewer"
+msgstr "Интерфейс за търсенето по имена в адресната книга на Еволюшън"
+
+#: addressbook/gui/component/addressbook-component.c:76
+#: addressbook/gui/component/addressbook-component.c:625
+#: importers/netscape-importer.c:1874 mail/importers/netscape-importer.c:1844
+#: shell/e-local-storage.c:178 shell/e-shortcuts.c:1087
+msgid "Contacts"
+msgstr "Контакти"
+
+#: addressbook/gui/component/addressbook-component.c:76
+msgid "Folder containing contact information"
+msgstr "Папка, която съдържа информацията за контакти"
+
+#: addressbook/gui/component/addressbook-component.c:78
+msgid "LDAP Server"
+msgstr "LDAP сървър"
+
+#: addressbook/gui/component/addressbook-component.c:78
+msgid "LDAP server containing contact information"
+msgstr "LDAP сървър съдържащ информация за контакт"
+
+#: addressbook/gui/component/addressbook-component.c:80
+#, fuzzy
+msgid "Public Contacts"
+msgstr "Контакти"
+
+#: addressbook/gui/component/addressbook-component.c:80
+#, fuzzy
+msgid "Public folder containing contact information"
+msgstr "Папка, която съдържа информацията за контакти"
+
+#: addressbook/gui/component/addressbook-component.c:579
+msgid "New Contact"
+msgstr "Нов Контакт"
+
+#: addressbook/gui/component/addressbook-component.c:579
+msgid "_Contact"
+msgstr "_Контакт"
+
+#: addressbook/gui/component/addressbook-component.c:580
+#, fuzzy
+msgid "Create a new contact"
+msgstr "Създай нов контакт"
+
+#: addressbook/gui/component/addressbook-component.c:583
+msgid "New Contact List"
+msgstr "Нов списък с контакти"
+
+#: addressbook/gui/component/addressbook-component.c:583
+#, fuzzy
+msgid "Contact _List"
+msgstr "Списък _Контакти"
+
+#: addressbook/gui/component/addressbook-component.c:584
+#, fuzzy
+msgid "Create a new contact list"
+msgstr "Създай нов списък с контакт"
+
+#: addressbook/gui/component/addressbook-config.c:206
+#, fuzzy
+msgid "Failed to connect to LDAP server"
+msgstr "Не успях да се свържа с LDAP сървъра."
+
+#: addressbook/gui/component/addressbook-config.c:231
+#, fuzzy
+msgid "Failed to authenticate with LDAP server"
+msgstr ""
+"Не мога да се оторизирам пред IMAP сървър.\n"
+"%s\n"
+"\n"
+
+#: addressbook/gui/component/addressbook-config.c:259
+msgid "Could not perform query on Root DSE"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:682
+msgid "The server responded with no supported search bases"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:1193
+#, fuzzy
+msgid "This server does not support LDAPv3 schema information"
+msgstr "IMAP сървъра не съдържа %s информация"
+
+#: addressbook/gui/component/addressbook-config.c:1215
+#, fuzzy
+msgid "Error retrieving schema information"
+msgstr ""
+"Грешка при зареждане информацията за финтъра:\n"
+"%s"
+
+#: addressbook/gui/component/addressbook-config.c:1223
+#, fuzzy
+msgid "Server did not respond with valid schema information"
+msgstr "IMAP сървъра не съдържа %s информация"
+
+#: addressbook/gui/component/addressbook-config.c:1637
+msgid "Account Name"
+msgstr "Потребителско име"
+
+#: addressbook/gui/component/addressbook-config.c:1639
+msgid "Server Name"
+msgstr "Име на сървъра"
+
+#: addressbook/gui/component/addressbook-config.c:1676
+#, fuzzy
+msgid "LDAP was not enabled in this build of Evolution"
+msgstr "(SSL не се подържа в тази версия на evolution)"
+
+#: addressbook/gui/component/addressbook-storage.c:178
+msgid "Other Contacts"
+msgstr "Други Контакти"
+
 #: addressbook/gui/component/addressbook.c:502
 msgid ""
 "We were unable to open this addressbook.  Please check that the\n"
@@ -671,117 +831,6 @@ msgstr "Коя да е категория"
 msgid "The URI that the Folder Browser will display"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-component.c:76
-#: addressbook/gui/component/addressbook-component.c:628
-#: importers/netscape-importer.c:1874 mail/importers/netscape-importer.c:1844
-#: shell/e-local-storage.c:178 shell/e-shortcuts.c:1087
-msgid "Contacts"
-msgstr "Контакти"
-
-#: addressbook/gui/component/addressbook-component.c:76
-msgid "Folder containing contact information"
-msgstr "Папка, която съдържа информацията за контакти"
-
-#: addressbook/gui/component/addressbook-component.c:78
-msgid "LDAP Server"
-msgstr "LDAP сървър"
-
-#: addressbook/gui/component/addressbook-component.c:78
-msgid "LDAP server containing contact information"
-msgstr "LDAP сървър съдържащ информация за контакт"
-
-#: addressbook/gui/component/addressbook-component.c:80
-#, fuzzy
-msgid "Public Contacts"
-msgstr "Контакти"
-
-#: addressbook/gui/component/addressbook-component.c:80
-#, fuzzy
-msgid "Public folder containing contact information"
-msgstr "Папка, която съдържа информацията за контакти"
-
-#: addressbook/gui/component/addressbook-component.c:582
-msgid "New Contact"
-msgstr "Нов Контакт"
-
-#: addressbook/gui/component/addressbook-component.c:582
-msgid "_Contact"
-msgstr "_Контакт"
-
-#: addressbook/gui/component/addressbook-component.c:583
-#, fuzzy
-msgid "Create a new contact"
-msgstr "Създай нов контакт"
-
-#: addressbook/gui/component/addressbook-component.c:586
-msgid "New Contact List"
-msgstr "Нов списък с контакти"
-
-#: addressbook/gui/component/addressbook-component.c:586
-#, fuzzy
-msgid "Contact _List"
-msgstr "Списък _Контакти"
-
-#: addressbook/gui/component/addressbook-component.c:587
-#, fuzzy
-msgid "Create a new contact list"
-msgstr "Създай нов списък с контакт"
-
-#: addressbook/gui/component/addressbook-config.c:206
-#, fuzzy
-msgid "Failed to connect to LDAP server"
-msgstr "Не успях да се свържа с LDAP сървъра."
-
-#: addressbook/gui/component/addressbook-config.c:231
-#, fuzzy
-msgid "Failed to authenticate with LDAP server"
-msgstr ""
-"Не мога да се оторизирам пред IMAP сървър.\n"
-"%s\n"
-"\n"
-
-#: addressbook/gui/component/addressbook-config.c:259
-msgid "Could not perform query on Root DSE"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:682
-msgid "The server responded with no supported search bases"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:1193
-#, fuzzy
-msgid "This server does not support LDAPv3 schema information"
-msgstr "IMAP сървъра не съдържа %s информация"
-
-#: addressbook/gui/component/addressbook-config.c:1215
-#, fuzzy
-msgid "Error retrieving schema information"
-msgstr ""
-"Грешка при зареждане информацията за финтъра:\n"
-"%s"
-
-#: addressbook/gui/component/addressbook-config.c:1223
-#, fuzzy
-msgid "Server did not respond with valid schema information"
-msgstr "IMAP сървъра не съдържа %s информация"
-
-#: addressbook/gui/component/addressbook-config.c:1637
-msgid "Account Name"
-msgstr "Потребителско име"
-
-#: addressbook/gui/component/addressbook-config.c:1639
-msgid "Server Name"
-msgstr "Име на сървъра"
-
-#: addressbook/gui/component/addressbook-config.c:1676
-#, fuzzy
-msgid "LDAP was not enabled in this build of Evolution"
-msgstr "(SSL не се подържа в тази версия на evolution)"
-
-#: addressbook/gui/component/addressbook-storage.c:178
-msgid "Other Contacts"
-msgstr "Други Контакти"
-
 #.
 #. * This is the code for the UI thingie that lets you manipulate the e-mail
 #. * addresses (and *only* the e-mail addresses) associated with an existing
@@ -815,12 +864,12 @@ msgid "Querying Addressbook..."
 msgstr "Търся в адресната книга..."
 
 #: addressbook/gui/component/e-address-popup.c:1001
-#: addressbook/gui/component/e-address-widget.c:401
+#: addressbook/gui/component/e-address-widget.c:392
 msgid "Edit Contact Info"
 msgstr "Редактирай инфирмацията за контакти"
 
 #: addressbook/gui/component/e-address-popup.c:1031
-#: addressbook/gui/component/e-address-widget.c:437
+#: addressbook/gui/component/e-address-widget.c:428
 #: addressbook/gui/component/select-names/e-select-names-popup.c:324
 msgid "Add to Contacts"
 msgstr "Добави към контактите"
@@ -829,56 +878,14 @@ msgstr "Добави към контактите"
 msgid "Merge E-Mail Address"
 msgstr "Слей адреса на ел. поща"
 
-#: addressbook/gui/component/e-address-widget.c:378
+#: addressbook/gui/component/e-address-widget.c:369
 msgid "Disable Queries"
 msgstr "Забрани търсенето"
 
-#: addressbook/gui/component/e-address-widget.c:378
+#: addressbook/gui/component/e-address-widget.c:369
 msgid "Enable Queries (Dangerous!)"
 msgstr "Разреши търсенето (ОПАСНО!)"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
-msgid "Configure access to LDAP directory servers here"
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
-msgid "Directory Servers"
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
-#, fuzzy
-msgid "Evolution Addressbook"
-msgstr "Редактирай адресната книга"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
-#, fuzzy
-msgid "Evolution Addressbook LDAP Configuration Control"
-msgstr "Интерфейс за търсенето по имена в адресната книга на Еволюшън"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-msgid "Evolution Addressbook address pop-up"
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
-#, fuzzy
-msgid "Evolution Addressbook address viewer"
-msgstr "Интерфейс за търсенето по имена в адресната книга на Еволюшън"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
-#, fuzzy
-msgid "Evolution Addressbook card viewer"
-msgstr "Интерфейс за търсенето по имена в адресната книга на Еволюшън"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
-#, fuzzy
-msgid "Evolution Addressbook component"
-msgstr "Композер на поща за Evolution."
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
-#, fuzzy
-msgid "Evolution Addressbook folder viewer"
-msgstr "Интерфейс за търсенето по имена в адресната книга на Еволюшън"
-
 #: addressbook/gui/component/ldap-config.glade.h:1
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:1
 #: mail/mail-config.glade.h:1
@@ -1031,9 +1038,10 @@ msgstr "Едно"
 msgid "S_earch scope: "
 msgstr "Обхват на търсенето: "
 
+#. No time range is set, so don't start a query
 #: addressbook/gui/component/ldap-config.glade.h:34
-#: calendar/gui/e-cal-view.c:541 calendar/gui/e-day-view.c:3261
-#: calendar/gui/e-week-view.c:1181 calendar/gui/gnome-cal.c:625
+#: calendar/gui/calendar-model.c:1983 calendar/gui/e-day-view.c:1683
+#: calendar/gui/e-week-view.c:1317
 msgid "Searching"
 msgstr "Търся"
 
@@ -1225,10 +1233,10 @@ msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:85 filter/filter.glade.h:14
 #: mail/mail-config.glade.h:143 ui/evolution-addressbook.xml.h:33
-#: ui/evolution-calendar.xml.h:35 ui/evolution-composer-entries.xml.h:8
-#: ui/evolution-mail-list.xml.h:24 ui/evolution-mail-messagedisplay.xml.h:6
+#: ui/evolution-calendar.xml.h:33 ui/evolution-composer-entries.xml.h:8
+#: ui/evolution-mail-list.xml.h:25 ui/evolution-mail-messagedisplay.xml.h:6
 #: ui/evolution-message-composer.xml.h:41
-#: ui/evolution-signature-editor.xml.h:12 ui/evolution-subscribe.xml.h:10
+#: ui/evolution-signature-editor.xml.h:11 ui/evolution-subscribe.xml.h:10
 #: ui/evolution-tasks.xml.h:19
 msgid "_Edit"
 msgstr "_Редактирай"
@@ -1276,25 +1284,21 @@ msgstr "Основен"
 msgid "searching-tab"
 msgstr "Търся"
 
-#: addressbook/gui/component/select-names/e-select-names.c:509
-msgid "Select Contacts from Addressbook"
-msgstr "Избор на Контакт от Адресната книга"
-
-#: addressbook/gui/component/select-names/e-select-names.c:650
+#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:1
 #, fuzzy
-msgid "Find contact in"
-msgstr "Изпращача съдържа"
-
-#: addressbook/gui/component/select-names/e-select-names.c:694
-#: addressbook/gui/component/select-names/e-select-names-popup.c:211
-#: composer/e-msg-composer-attachment-bar.c:444
-msgid "Remove"
-msgstr "Премахни"
+msgid "Evolution Addressbook name selection interface"
+msgstr "Интерфейс за търсенето по имена в адресната книга на Еволюшън"
 
 #: addressbook/gui/component/select-names/e-select-names-popup.c:204
 msgid "Remove All"
 msgstr "Премахни всички"
 
+#: addressbook/gui/component/select-names/e-select-names-popup.c:211
+#: addressbook/gui/component/select-names/e-select-names.c:694
+#: composer/e-msg-composer-attachment-bar.c:448
+msgid "Remove"
+msgstr "Премахни"
+
 #: addressbook/gui/component/select-names/e-select-names-popup.c:218
 #, fuzzy
 msgid "View Contact List"
@@ -1319,10 +1323,14 @@ msgstr "Неименуван Контакт"
 msgid "Source"
 msgstr "Източник"
 
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:1
+#: addressbook/gui/component/select-names/e-select-names.c:509
+msgid "Select Contacts from Addressbook"
+msgstr "Избор на Контакт от Адресната книга"
+
+#: addressbook/gui/component/select-names/e-select-names.c:650
 #, fuzzy
-msgid "Evolution Addressbook name selection interface"
-msgstr "Интерфейс за търсенето по имена в адресната книга на Еволюшън"
+msgid "Find contact in"
+msgstr "Изпращача съдържа"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:2
 #, fuzzy
@@ -1399,7 +1407,7 @@ msgid "D_epartment:"
 msgstr "От_дел"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:11
-#: calendar/gui/dialogs/task-editor.c:200
+#: calendar/gui/dialogs/task-editor.c:199
 msgid "Details"
 msgstr "Детайли"
 
@@ -1467,12 +1475,11 @@ msgid "_Categories..."
 msgstr "Ка_тегорий..."
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:28
-#: calendar/gui/dialogs/meeting-page.c:634
-#: calendar/gui/e-calendar-table.c:1008 calendar/gui/e-calendar-table.c:1026
-#: calendar/gui/e-cal-view.c:1144 calendar/gui/e-cal-view.c:1176
-#: ui/evolution-addressbook.xml.h:32 ui/evolution-calendar.xml.h:34
-#: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:14
-#: ui/evolution-mail-message.xml.h:104 ui/evolution-tasks.xml.h:18
+#: calendar/gui/dialogs/meeting-page.c:717
+#: calendar/gui/e-calendar-table.c:1000 calendar/gui/e-day-view.c:3729
+#: calendar/gui/e-week-view.c:3698 mail/folder-browser.c:1830
+#: ui/evolution-addressbook.xml.h:32 ui/evolution-calendar.xml.h:32
+#: ui/evolution-mail-message.xml.h:99 ui/evolution-tasks.xml.h:18
 #: ui/evolution.xml.h:45
 msgid "_Delete"
 msgstr "Изтрий"
@@ -1518,15 +1525,15 @@ msgid "_Web page address:"
 msgstr "_Web адрес:"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:102
-#: addressbook/gui/contact-editor/e-contact-editor.c:184
 #: addressbook/gui/contact-editor/e-contact-editor-fullname.c:95
+#: addressbook/gui/contact-editor/e-contact-editor.c:184
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.c:163
 #: addressbook/gui/widgets/e-addressbook-model.c:318
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:408
-#: addressbook/gui/widgets/e-minicard.c:183
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:402
 #: addressbook/gui/widgets/e-minicard-label.c:164
-#: addressbook/gui/widgets/e-minicard-view.c:478
 #: addressbook/gui/widgets/e-minicard-view-widget.c:120
+#: addressbook/gui/widgets/e-minicard-view.c:478
+#: addressbook/gui/widgets/e-minicard.c:183
 #, fuzzy
 msgid "Editable"
 msgstr "Разрешава"
@@ -2556,18 +2563,18 @@ msgstr "Зимбабве"
 #: addressbook/gui/contact-editor/e-contact-editor.c:156
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.c:142
 #: addressbook/gui/widgets/e-addressbook-model.c:304
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:394
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:388
 #: addressbook/gui/widgets/e-addressbook-view.c:180
-#: addressbook/gui/widgets/e-minicard-view.c:464
 #: addressbook/gui/widgets/e-minicard-view-widget.c:106
+#: addressbook/gui/widgets/e-minicard-view.c:464
 #, fuzzy
 msgid "Book"
 msgstr "Бодо"
 
 #: addressbook/gui/contact-editor/e-contact-editor.c:163
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.c:149
-#: addressbook/gui/widgets/e-minicard.c:190
 #: addressbook/gui/widgets/e-minicard-widget.c:93
+#: addressbook/gui/widgets/e-minicard.c:190
 #, fuzzy
 msgid "Card"
 msgstr "Кола"
@@ -2805,7 +2812,7 @@ msgstr "Нов Списък"
 msgid "Contact List Editor"
 msgstr "Редактор за Контакти"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:457
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:456
 msgid "Save List as VCard"
 msgstr "Съхрани Списък като VCard"
 
@@ -2852,7 +2859,7 @@ msgstr ""
 "съществува в папката. Искате ли да го добавите въпреки това?"
 
 #. FIXME: get the toplevel window...
-#: addressbook/gui/search/e-addressbook-search-dialog.c:116
+#: addressbook/gui/search/e-addressbook-search-dialog.c:117
 #: widgets/misc/e-filter-bar.c:148
 msgid "Advanced Search"
 msgstr "Допълнително търсене"
@@ -2871,10 +2878,10 @@ msgid "%d cards"
 msgstr " %d карти"
 
 #: addressbook/gui/widgets/e-addressbook-model.c:311
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:401
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:395
 #: addressbook/gui/widgets/e-addressbook-view.c:187
-#: addressbook/gui/widgets/e-minicard-view.c:471
 #: addressbook/gui/widgets/e-minicard-view-widget.c:113
+#: addressbook/gui/widgets/e-minicard-view.c:471
 #, fuzzy
 msgid "Query"
 msgstr "Гърнси"
@@ -2884,23 +2891,23 @@ msgstr "Гърнси"
 msgid "Error getting book view"
 msgstr "Грешка при стартиране на %s"
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:415
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:409
 #, fuzzy
 msgid "Model"
 msgstr "Молде"
 
-#: addressbook/gui/widgets/e-addressbook-table-adapter.c:148
-#: addressbook/gui/widgets/e-addressbook-util.c:106
+#: addressbook/gui/widgets/e-addressbook-table-adapter.c:145
+#: addressbook/gui/widgets/e-addressbook-util.c:105
 #: addressbook/gui/widgets/e-minicard.c:531
 msgid "Error modifying card"
 msgstr "Грешка при модифициране на карта"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:37
+#: addressbook/gui/widgets/e-addressbook-util.c:36
 #: shell/evolution-shell-component.c:1183
 msgid "Success"
 msgstr "Успешно"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:38
+#: addressbook/gui/widgets/e-addressbook-util.c:37
 #: camel/providers/imap/camel-imap-command.c:306
 #: camel/providers/imap/camel-imap-command.c:403
 #: camel/providers/pop3/camel-pop3-store.c:526
@@ -2909,130 +2916,131 @@ msgstr "Успешно"
 msgid "Unknown error"
 msgstr "Неизвестна грешка"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:39
+#: addressbook/gui/widgets/e-addressbook-util.c:38
 msgid "Repository offline"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:40 shell/e-storage.c:584
+#: addressbook/gui/widgets/e-addressbook-util.c:39 shell/e-storage.c:584
 #: shell/evolution-shell-component.c:1213
 msgid "Permission denied"
 msgstr "Отказан достъп"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:41
+#: addressbook/gui/widgets/e-addressbook-util.c:40
 msgid "Card not found"
 msgstr "Картата не е намерена"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:42
+#: addressbook/gui/widgets/e-addressbook-util.c:41
 msgid "Card ID already exists"
 msgstr "Карта ID вече съществува"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:43
+#: addressbook/gui/widgets/e-addressbook-util.c:42
 msgid "Protocol not supported"
 msgstr "Протокола на се подържа"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:44
+#: addressbook/gui/widgets/e-addressbook-util.c:43
+#: calendar/gui/calendar-model.c:759 calendar/gui/calendar-model.c:1184
 #: calendar/gui/dialogs/task-details-page.glade.h:3
-#: calendar/gui/e-calendar-table.c:479 calendar/gui/e-cal-model-tasks.c:325
-#: calendar/gui/e-cal-model-tasks.c:604 calendar/gui/e-tasks.c:253
-#: calendar/gui/print.c:2314 camel/camel-service.c:733
-#: camel/camel-service.c:771 camel/camel-service.c:855
-#: camel/camel-service.c:895 camel/providers/pop3/camel-pop3-store.c:443
+#: calendar/gui/e-calendar-table.c:477 calendar/gui/e-tasks.c:253
+#: calendar/gui/print.c:2307 camel/camel-service.c:733
+#: camel/camel-service.c:770 camel/camel-service.c:854
+#: camel/camel-service.c:893 camel/providers/pop3/camel-pop3-store.c:443
 #: camel/providers/pop3/camel-pop3-store.c:520
 msgid "Cancelled"
 msgstr "Прекратено"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:45
+#: addressbook/gui/widgets/e-addressbook-util.c:44
 #, fuzzy
 msgid "Authentication Failed"
 msgstr "Оторизацията пропадна"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:46
+#: addressbook/gui/widgets/e-addressbook-util.c:45
 #, fuzzy
 msgid "Authentication Required"
 msgstr "Изисква Удостоверение"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:47
+#: addressbook/gui/widgets/e-addressbook-util.c:46
 msgid "TLS not Available"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:48
+#: addressbook/gui/widgets/e-addressbook-util.c:47
 #, fuzzy
 msgid "Addressbook does not exist"
 msgstr "Файлът `%s' не съществува."
 
-#: addressbook/gui/widgets/e-addressbook-util.c:49
+#: addressbook/gui/widgets/e-addressbook-util.c:48
 msgid "Other error"
 msgstr "Друга грешка"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:76
+#: addressbook/gui/widgets/e-addressbook-util.c:75
 msgid "Do you want to save changes?"
 msgstr "Искате ли да съхраните промените?"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:78
+#: addressbook/gui/widgets/e-addressbook-util.c:77
 #, fuzzy
 msgid "_Discard"
 msgstr "Динард"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:97
+#: addressbook/gui/widgets/e-addressbook-util.c:96
 msgid "Error adding list"
 msgstr "Грешка при добавяне на списък"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:97
-#: addressbook/gui/widgets/e-addressbook-util.c:273
+#: addressbook/gui/widgets/e-addressbook-util.c:96
+#: addressbook/gui/widgets/e-addressbook-util.c:272
 msgid "Error adding card"
 msgstr "Грешка при добавяне на карта"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:106
+#: addressbook/gui/widgets/e-addressbook-util.c:105
 msgid "Error modifying list"
 msgstr "Грешка при модифициране на списък"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:116
+#: addressbook/gui/widgets/e-addressbook-util.c:115
 msgid "Error removing list"
 msgstr "Грешка при изтриване на списък"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:116
-#: addressbook/gui/widgets/e-addressbook-util.c:231
+#: addressbook/gui/widgets/e-addressbook-util.c:115
+#: addressbook/gui/widgets/e-addressbook-util.c:230
 msgid "Error removing card"
 msgstr "Грешка при изтриване на карта"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:198
+#: addressbook/gui/widgets/e-addressbook-util.c:197
 #, c-format
 msgid ""
 "Opening %d cards will open %d new windows as well.\n"
 "Do you really want to display all of these cards?"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:329
+#: addressbook/gui/widgets/e-addressbook-util.c:328
 #, fuzzy
 msgid "Move card to"
 msgstr "Премести съобщени(ето/ята) в"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:331
+#: addressbook/gui/widgets/e-addressbook-util.c:330
 #, fuzzy
 msgid "Copy card to"
 msgstr "Копира избраната задача"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:334
+#: addressbook/gui/widgets/e-addressbook-util.c:333
 #, fuzzy
 msgid "Move cards to"
 msgstr "Няма карти"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:336
+#: addressbook/gui/widgets/e-addressbook-util.c:335
 #, fuzzy
 msgid "Copy cards to"
 msgstr "Няма карти"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:518
+#: addressbook/gui/widgets/e-addressbook-util.c:517
 msgid "Multiple VCards"
 msgstr "Множество VCards"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:526
+#: addressbook/gui/widgets/e-addressbook-util.c:525
 #, c-format
 msgid "VCard for %s"
 msgstr "VCard за %s"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:194
-#: calendar/gui/e-calendar-table.etspec.h:17
+#: calendar/gui/dialogs/meeting-page.etspec.h:11
+#: calendar/gui/e-calendar-table.etspec.h:18
 #: calendar/gui/e-meeting-time-sel.etspec.h:11
 msgid "Type"
 msgstr "Тип"
@@ -3094,9 +3102,9 @@ msgstr "Препрати Контакт"
 msgid "Send Message to Contact"
 msgstr "Изпрати съобщението на Контакт"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:902 calendar/gui/print.c:2446
+#: addressbook/gui/widgets/e-addressbook-view.c:902 calendar/gui/print.c:2439
 #: ui/evolution-addressbook.xml.h:16 ui/evolution-comp-editor.xml.h:8
-#: ui/evolution-contact-editor.xml.h:5 ui/evolution-mail-message.xml.h:72
+#: ui/evolution-contact-editor.xml.h:4 ui/evolution-mail-message.xml.h:68
 #: ui/my-evolution.xml.h:1
 msgid "Print"
 msgstr "Отпечатай"
@@ -3131,15 +3139,15 @@ msgstr "Копирай"
 msgid "Paste"
 msgstr "Поставя"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:915 filter/libfilter-i18n.h:10
+#: addressbook/gui/widgets/e-addressbook-view.c:915 filter/libfilter-i18n.h:11
 #: mail/mail-accounts.c:234 ui/evolution-addressbook.xml.h:8
-#: ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:3
-#: ui/evolution-contact-list-editor.xml.h:3 ui/evolution-mail-message.xml.h:24
+#: ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:2
+#: ui/evolution-contact-list-editor.xml.h:2 ui/evolution-mail-message.xml.h:21
 msgid "Delete"
 msgstr "Изтрий"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:919
-#: calendar/gui/e-cal-view.c:1109
+#: calendar/gui/e-day-view.c:3689 calendar/gui/e-week-view.c:3663
 #, fuzzy
 msgid "Current View"
 msgstr "_Текущ Преглед"
@@ -3228,46 +3236,36 @@ msgstr "Друг Телефон"
 msgid "Primary Phone"
 msgstr "Основен Телефон"
 
-#: addressbook/gui/widgets/e-minicard.c:146
+#: addressbook/gui/widgets/e-minicard-control.c:204
+#, c-format
+msgid "and %d other cards."
+msgstr "и %d други карти."
+
+#: addressbook/gui/widgets/e-minicard-control.c:206
+msgid "and one other card."
+msgstr "е една друга карта."
+
+#: addressbook/gui/widgets/e-minicard-control.c:318
+msgid "Save in addressbook"
+msgstr "Запиши в адресната книга"
+
 #: addressbook/gui/widgets/e-minicard-label.c:115
+#: addressbook/gui/widgets/e-minicard.c:146
 #, fuzzy
 msgid "Width"
 msgstr "Широчина:"
 
-#: addressbook/gui/widgets/e-minicard.c:153
 #: addressbook/gui/widgets/e-minicard-label.c:122
+#: addressbook/gui/widgets/e-minicard.c:153
 #, fuzzy
 msgid "Height"
 msgstr "Височина:"
 
-#: addressbook/gui/widgets/e-minicard.c:161
 #: addressbook/gui/widgets/e-minicard-label.c:129
+#: addressbook/gui/widgets/e-minicard.c:161
 msgid "Has Focus"
 msgstr ""
 
-#: addressbook/gui/widgets/e-minicard.c:169
-#, fuzzy
-msgid "Selected"
-msgstr "Изтрий"
-
-#: addressbook/gui/widgets/e-minicard.c:176
-#, fuzzy
-msgid "Has Cursor"
-msgstr "Сортиране на Задачи"
-
-#: addressbook/gui/widgets/e-minicard-control.c:204
-#, c-format
-msgid "and %d other cards."
-msgstr "и %d други карти."
-
-#: addressbook/gui/widgets/e-minicard-control.c:206
-msgid "and one other card."
-msgstr "е една друга карта."
-
-#: addressbook/gui/widgets/e-minicard-control.c:318
-msgid "Save in addressbook"
-msgstr "Запиши в адресната книга"
-
 #: addressbook/gui/widgets/e-minicard-label.c:136
 #, fuzzy
 msgid "Field"
@@ -3287,6 +3285,11 @@ msgstr "Раз_мер на Текст"
 msgid "Max field name length"
 msgstr ""
 
+#: addressbook/gui/widgets/e-minicard-view-widget.c:127
+#, fuzzy
+msgid "Column Width"
+msgstr "Колумбия"
+
 #: addressbook/gui/widgets/e-minicard-view.c:141
 #, fuzzy
 msgid ""
@@ -3320,10 +3323,15 @@ msgstr ""
 msgid "Adapter"
 msgstr "Адрар"
 
-#: addressbook/gui/widgets/e-minicard-view-widget.c:127
+#: addressbook/gui/widgets/e-minicard.c:169
 #, fuzzy
-msgid "Column Width"
-msgstr "Колумбия"
+msgid "Selected"
+msgstr "Изтрий"
+
+#: addressbook/gui/widgets/e-minicard.c:176
+#, fuzzy
+msgid "Has Cursor"
+msgstr "Сортиране на Задачи"
 
 #: addressbook/gui/widgets/gal-view-factory-minicard.c:24
 msgid "Card View"
@@ -3334,20 +3342,20 @@ msgstr "Преглед на Карта"
 msgid "GTK Tree View"
 msgstr "Изглед за Седмица"
 
-#: addressbook/printing/e-contact-print.c:1158
+#: addressbook/printing/e-contact-print-envelope.c:217
+#: addressbook/printing/e-contact-print-envelope.c:238
+msgid "Print envelope"
+msgstr "Отпечатай плик"
+
+#: addressbook/printing/e-contact-print.c:1139
 msgid "Print cards"
 msgstr "Отпечатай карти"
 
-#: addressbook/printing/e-contact-print.c:1224
-#: addressbook/printing/e-contact-print.c:1250
+#: addressbook/printing/e-contact-print.c:1204
+#: addressbook/printing/e-contact-print.c:1226
 msgid "Print card"
 msgstr "Отпечатай карта"
 
-#: addressbook/printing/e-contact-print-envelope.c:217
-#: addressbook/printing/e-contact-print-envelope.c:238
-msgid "Print envelope"
-msgstr "Отпечатай плик"
-
 #: addressbook/printing/e-contact-print.glade.h:1
 msgid "10 pt. Tahoma"
 msgstr ""
@@ -3517,63 +3525,6 @@ msgstr "Широчина:"
 msgid "_Font..."
 msgstr "_Шрифт..."
 
-#: addressbook/tools/evolution-addressbook-export.c:56
-msgid "Specify the output file instead of standard output"
-msgstr ""
-
-#: addressbook/tools/evolution-addressbook-export.c:57
-msgid "OUTPUTFILE"
-msgstr ""
-
-#: addressbook/tools/evolution-addressbook-export.c:58
-#, fuzzy
-msgid "List local addressbook folders"
-msgstr "с всички локални и актоивни отдалечени папки"
-
-#: addressbook/tools/evolution-addressbook-export.c:60
-msgid "Show cards as vcard or csv file"
-msgstr ""
-
-#: addressbook/tools/evolution-addressbook-export.c:60
-#, fuzzy
-msgid "[vcard|csv]"
-msgstr "Няма карти"
-
-#: addressbook/tools/evolution-addressbook-export.c:61
-msgid "Export in asynchronous mode "
-msgstr ""
-
-#: addressbook/tools/evolution-addressbook-export.c:63
-msgid ""
-"The number of cards in one output file in asychronous mode,default size 100."
-msgstr ""
-
-#: addressbook/tools/evolution-addressbook-export.c:63
-msgid "NUMBER"
-msgstr ""
-
-#: addressbook/tools/evolution-addressbook-export.c:91
-msgid ""
-"Command line arguments error, please use --help option to see the usage."
-msgstr ""
-
-#: addressbook/tools/evolution-addressbook-export.c:105
-msgid "Only support csv or vcard format."
-msgstr ""
-
-#: addressbook/tools/evolution-addressbook-export.c:114
-msgid "In async mode, output must be file."
-msgstr ""
-
-#: addressbook/tools/evolution-addressbook-export.c:122
-msgid "In normal mode, there should not need size option."
-msgstr ""
-
-#: addressbook/tools/evolution-addressbook-export.c:153
-#, fuzzy
-msgid "Impossible internal error."
-msgstr "Вътрешна грешка"
-
 #: calendar/cal-util/cal-component.c:1218
 msgid "Untitled appointment"
 msgstr "Неназовани срещи"
@@ -3704,29 +3655,30 @@ msgstr "31ви"
 
 #: calendar/cal-util/cal-util.c:550 calendar/cal-util/cal-util.c:572
 #: calendar/gui/dialogs/task-details-page.glade.h:5
-#: calendar/gui/e-calendar-table.c:403 calendar/gui/e-tasks.c:271
-#: mail/message-list.c:912
+#: calendar/gui/e-calendar-table.c:401 calendar/gui/e-tasks.c:271
+#: mail/message-list.c:753
 msgid "High"
 msgstr "Високо"
 
 #: calendar/cal-util/cal-util.c:552 calendar/cal-util/cal-util.c:574
+#: calendar/gui/calendar-model.c:1709
 #: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-calendar-table.c:404 calendar/gui/e-cal-model.c:826
-#: calendar/gui/e-tasks.c:273 mail/message-list.c:911
+#: calendar/gui/e-calendar-table.c:402 calendar/gui/e-tasks.c:273
+#: mail/message-list.c:752
 msgid "Normal"
 msgstr "Нормално"
 
 #: calendar/cal-util/cal-util.c:554 calendar/cal-util/cal-util.c:576
 #: calendar/gui/dialogs/task-details-page.glade.h:7
-#: calendar/gui/e-calendar-table.c:405 calendar/gui/e-tasks.c:275
-#: mail/message-list.c:910
+#: calendar/gui/e-calendar-table.c:403 calendar/gui/e-tasks.c:275
+#: mail/message-list.c:751
 msgid "Low"
 msgstr "Ниско"
 
 #. An empty string is the same as 'None'.
 #: calendar/cal-util/cal-util.c:570
 #: calendar/gui/dialogs/task-details-page.glade.h:11
-#: calendar/gui/e-calendar-table.c:406
+#: calendar/gui/e-calendar-table.c:404
 msgid "Undefined"
 msgstr "Недефинирано"
 
@@ -3734,13 +3686,13 @@ msgstr "Недефинирано"
 msgid "Split Multi-Day Events:"
 msgstr ""
 
-#: calendar/conduits/calendar/calendar-conduit.c:1297
-#: calendar/conduits/todo/todo-conduit.c:838
+#: calendar/conduits/calendar/calendar-conduit.c:1289
+#: calendar/conduits/todo/todo-conduit.c:830
 msgid "Error while communicating with calendar server"
 msgstr "Грешка при комуникацията с календарния сървър"
 
-#: calendar/conduits/calendar/calendar-conduit.c:1456
-#: calendar/conduits/calendar/calendar-conduit.c:1459
+#: calendar/conduits/calendar/calendar-conduit.c:1440
+#: calendar/conduits/calendar/calendar-conduit.c:1443
 msgid "Could not read pilot's Calendar application block"
 msgstr "Не мога да прочета календара от pilot"
 
@@ -3749,32 +3701,84 @@ msgstr "Не мога да прочета календара от pilot"
 msgid "Default Priority:"
 msgstr "_Приоритет:"
 
-#: calendar/conduits/todo/todo-conduit.c:970
-#: calendar/conduits/todo/todo-conduit.c:973
+#: calendar/conduits/todo/todo-conduit.c:954
+#: calendar/conduits/todo/todo-conduit.c:957
 msgid "Could not read pilot's ToDo application block"
 msgstr "Не мога да прочета списъкът със задачи от pilot"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:213
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
+#, fuzzy
+msgid "Calendar and Tasks"
+msgstr "Настройки на Календар и Задачи"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
+msgid "Configure your timezone, Calendar and Task List here "
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
+#, fuzzy
+msgid "Evolution Calendar and Tasks"
+msgstr "Настройки на Календар и Задачи"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
+#, fuzzy
+msgid "Evolution Calendar and Tasks component"
+msgstr "Компонент на Evolution за показване на пощенски папки"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
+#, fuzzy
+msgid "Evolution Calendar configuration control"
+msgstr "Фабрика за контрол на задачи в Evolution"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
+#, fuzzy
+msgid "Evolution Calendar scheduling message viewer"
+msgstr "Календар на Evolution iTip/iMip преглед"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
+#, fuzzy
+msgid "Evolution Calendar viewer"
+msgstr "Календар на Evolution iTip/iMip преглед"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
+#, fuzzy
+msgid "Evolution Calendar/Task editor"
+msgstr "Evolution - Редактор на Новини"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
+#, fuzzy
+msgid "Evolution Tasks viewer"
+msgstr "Evolution - Редактор на Новини"
+
+#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
+#, fuzzy
+msgid "Evolution Calendar alarm notification service"
+msgstr "Алармено известяващо обслужване"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:212
 msgid "Starting:"
 msgstr "Стартиращ:"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:215
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:214
 msgid "Ending:"
 msgstr "Завършващ:"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:254
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:227
+#: calendar/gui/e-tasks.c:151
+msgid "invalid time"
+msgstr "грешно време"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:272
 msgid "Evolution Alarm"
 msgstr "Аларма на Evolution."
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:347
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:365
 #, c-format
 msgid "Alarm on %s"
 msgstr "Аларма на %s"
 
 #: calendar/gui/alarm-notify/alarm-notify.glade.h:1
-#: ui/evolution-comp-editor.xml.h:1 ui/evolution-contact-editor.xml.h:1
-#: ui/evolution-contact-list-editor.xml.h:1
-#: ui/evolution-signature-editor.xml.h:1
+#: ui/evolution-comp-editor.xml.h:1
 msgid "C_lose"
 msgstr "_Затвори"
 
@@ -3790,25 +3794,16 @@ msgstr "Време за забавяне (минути)"
 msgid "_Edit appointment"
 msgstr "_Редактирай среща"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:874
+#: calendar/gui/alarm-notify/alarm-queue.c:770
 msgid "No description available."
 msgstr "Няма описание."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:892
-#, c-format
-msgid ""
-"Alarm on %s\n"
-"%s\n"
-"Starting at %s\n"
-"Ending at %s"
-msgstr ""
-
-#: calendar/gui/alarm-notify/alarm-queue.c:979
-#: calendar/gui/alarm-notify/alarm-queue.c:1003
+#: calendar/gui/alarm-notify/alarm-queue.c:843
+#: calendar/gui/alarm-notify/alarm-queue.c:867 widgets/misc/e-messagebox.c:161
 msgid "Warning"
 msgstr "Внимание"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:983
+#: calendar/gui/alarm-notify/alarm-queue.c:847
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -3819,7 +3814,7 @@ msgstr ""
 "по ел. поща все още, но това напомняне е конфигурирано\n"
 "да изпраща поща."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1009
+#: calendar/gui/alarm-notify/alarm-queue.c:873
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -3830,29 +3825,36 @@ msgid ""
 "Are you sure you want to run this program?"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1023
+#: calendar/gui/alarm-notify/alarm-queue.c:887
 #, fuzzy
 msgid "Do not ask me about this program again."
 msgstr "Не показвай това съобщение отново."
 
-#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
-#, fuzzy
-msgid "Evolution Calendar alarm notification service"
-msgstr "Алармено известяващо обслужване"
-
-#: calendar/gui/alarm-notify/notify-main.c:173
-msgid "Could not initialize Bonobo"
-msgstr "Не мога да инициализирам Bonobo"
-
-#: calendar/gui/alarm-notify/notify-main.c:176
+#: calendar/gui/alarm-notify/notify-main.c:174
 msgid "Could not initialize gnome-vfs"
 msgstr "Не мога да инициализирам gnome-vfs"
 
-#: calendar/gui/alarm-notify/notify-main.c:185
+#: calendar/gui/alarm-notify/notify-main.c:183
 msgid "Could not create the alarm notify service factory"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:376
+#: calendar/gui/cal-search-bar.c:50
+msgid "Summary contains"
+msgstr "Съдържания на Обобщен"
+
+#: calendar/gui/cal-search-bar.c:51
+msgid "Description contains"
+msgstr "Съдържания на описание"
+
+#: calendar/gui/cal-search-bar.c:52
+msgid "Comment contains"
+msgstr "Съдържание на Коментар"
+
+#: calendar/gui/cal-search-bar.c:358 mail/mail-ops.c:1106
+msgid "Unmatched"
+msgstr "Несъвпадащ"
+
+#: calendar/gui/calendar-commands.c:358
 #, fuzzy
 msgid ""
 "This operation will permanently erase all events older than the selected "
@@ -3865,54 +3867,53 @@ msgstr ""
 "\n"
 "Действително ли да изтрия съобщенията?"
 
-#: calendar/gui/calendar-commands.c:382
+#: calendar/gui/calendar-commands.c:364
 #, fuzzy
 msgid "Purge events older than"
 msgstr "е по малко от"
 
-#: calendar/gui/calendar-commands.c:387
+#: calendar/gui/calendar-commands.c:369
 #: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter.glade.h:17
 msgid "days"
 msgstr "дни"
 
-#: calendar/gui/calendar-commands.c:485
+#: calendar/gui/calendar-commands.c:468
 msgid "%A %d %B %Y"
 msgstr "%A %d %B %Y"
 
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
-#: calendar/gui/calendar-commands.c:488 calendar/gui/e-day-view.c:1364
-#: calendar/gui/e-day-view-top-item.c:266
-#: calendar/gui/e-week-view-main-item.c:325
+#: calendar/gui/calendar-commands.c:471 calendar/gui/e-day-view-top-item.c:265
+#: calendar/gui/e-day-view.c:1420 calendar/gui/e-week-view-main-item.c:325
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
-#: calendar/gui/calendar-commands.c:490 calendar/gui/calendar-commands.c:495
-#: calendar/gui/calendar-commands.c:497
+#: calendar/gui/calendar-commands.c:473 calendar/gui/calendar-commands.c:478
+#: calendar/gui/calendar-commands.c:480
 msgid "%a %d %b %Y"
 msgstr "%a %d %b %Y"
 
-#: calendar/gui/calendar-commands.c:514 calendar/gui/calendar-commands.c:520
-#: calendar/gui/calendar-commands.c:526 calendar/gui/calendar-commands.c:528
+#: calendar/gui/calendar-commands.c:491 calendar/gui/calendar-commands.c:498
+#: calendar/gui/calendar-commands.c:504 calendar/gui/calendar-commands.c:506
 msgid "%d %B %Y"
 msgstr "%d %B %Y"
 
 #. strftime format %d = day of month, %B = full
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: calendar/gui/calendar-commands.c:518
-#: calendar/gui/e-week-view-main-item.c:333 calendar/gui/print.c:1508
+#: calendar/gui/calendar-commands.c:496
+#: calendar/gui/e-week-view-main-item.c:333 calendar/gui/print.c:1509
 msgid "%d %B"
 msgstr "%d %B"
 
-#: calendar/gui/calendar-commands.c:918
+#: calendar/gui/calendar-commands.c:884
 msgid ""
 "Could not create the calendar view.  Please check your ORBit and OAF setup."
 msgstr ""
 "Не мога да създам календарен изглед. Моля проверете настройките на ORBit и "
 "OAF"
 
-#: calendar/gui/calendar-component.c:70 calendar/gui/gnome-cal.c:1569
+#: calendar/gui/calendar-component.c:70 calendar/gui/gnome-cal.c:1557
 #: importers/netscape-importer.c:1873 mail/importers/netscape-importer.c:1843
 #: my-evolution/my-evolution.glade.h:2 shell/e-local-storage.c:177
 #: shell/e-shortcuts.c:1085
@@ -3934,10 +3935,10 @@ msgid "Public folder containing appointments and events"
 msgstr "Папката съдържа срещи и събития"
 
 #: calendar/gui/calendar-component.c:80 calendar/gui/e-tasks.c:1080
-#: calendar/gui/print.c:1787 calendar/gui/tasks-control.c:487
+#: calendar/gui/print.c:1789 calendar/gui/tasks-control.c:487
 #: calendar/importers/icalendar-importer.c:644
 #: importers/netscape-importer.c:1875 mail/importers/netscape-importer.c:1845
-#: my-evolution/e-summary-tasks.c:348 my-evolution/e-summary-tasks.c:357
+#: my-evolution/e-summary-tasks.c:329 my-evolution/e-summary-tasks.c:338
 #: shell/e-local-storage.c:183 shell/e-shortcuts.c:1086
 msgid "Tasks"
 msgstr "Задачи"
@@ -4013,6 +4014,110 @@ msgstr "Нова _Среща"
 msgid "Create a new all-day appointment"
 msgstr "Създава нова поща"
 
+#: calendar/gui/calendar-model.c:405 calendar/gui/calendar-model.c:964
+#: calendar/gui/e-calendar-table.c:380
+msgid "Private"
+msgstr "Частен"
+
+#: calendar/gui/calendar-model.c:408 calendar/gui/calendar-model.c:966
+#: calendar/gui/e-calendar-table.c:381
+msgid "Confidential"
+msgstr "Конфиденциален"
+
+#: calendar/gui/calendar-model.c:411 calendar/gui/e-calendar-table.c:379
+msgid "Public"
+msgstr "Публичен"
+
+#: calendar/gui/calendar-model.c:523
+msgid "N"
+msgstr "С"
+
+#: calendar/gui/calendar-model.c:523
+msgid "S"
+msgstr "Ю"
+
+#: calendar/gui/calendar-model.c:525
+msgid "E"
+msgstr "И"
+
+#: calendar/gui/calendar-model.c:525
+msgid "W"
+msgstr "З"
+
+#: calendar/gui/calendar-model.c:590 calendar/gui/calendar-model.c:1134
+#: calendar/gui/e-calendar-table.c:453
+msgid "Free"
+msgstr "Свободно"
+
+#: calendar/gui/calendar-model.c:592 calendar/gui/e-calendar-table.c:454
+#: calendar/gui/e-meeting-time-sel.c:406
+#: shell/evolution-shell-component.c:1207
+msgid "Busy"
+msgstr "Заето"
+
+#: calendar/gui/calendar-model.c:750 calendar/gui/calendar-model.c:1178
+#: calendar/gui/dialogs/task-details-page.glade.h:9
+#: calendar/gui/e-calendar-table.c:474 calendar/gui/e-tasks.c:257
+#: calendar/gui/print.c:2298
+msgid "Not Started"
+msgstr "Не е Стартиран"
+
+#: calendar/gui/calendar-model.c:753 calendar/gui/calendar-model.c:1180
+#: calendar/gui/dialogs/task-details-page.glade.h:6
+#: calendar/gui/e-calendar-table.c:475 calendar/gui/e-tasks.c:247
+#: calendar/gui/print.c:2301
+msgid "In Progress"
+msgstr "В Прогрес"
+
+#: calendar/gui/calendar-model.c:756 calendar/gui/calendar-model.c:1182
+#: calendar/gui/dialogs/task-details-page.glade.h:4
+#: calendar/gui/e-calendar-table.c:476 calendar/gui/e-meeting-model.c:294
+#: calendar/gui/e-meeting-model.c:317 calendar/gui/e-tasks.c:250
+#: calendar/gui/print.c:2304
+msgid "Completed"
+msgstr "Приключено"
+
+#: calendar/gui/calendar-model.c:1036
+msgid ""
+"The geographical position must be entered in the format: \n"
+"\n"
+"45.436845,125.862501"
+msgstr ""
+"Географското местонахождение трябва да бъде въведено в следния формат: \n"
+"\n"
+"45.436845,125.862501"
+
+#. An empty string is the same as 'None'.
+#: calendar/gui/calendar-model.c:1176 calendar/gui/dialogs/meeting-page.c:330
+#: calendar/gui/dialogs/meeting-page.glade.h:2 composer/e-msg-composer.c:2079
+#: mail/folder-browser.c:1792 mail/mail-account-gui.c:1260
+#: mail/mail-account-gui.c:1692 mail/mail-accounts.c:442
+#: mail/mail-config.glade.h:76
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:194
+#: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:445
+#: widgets/misc/e-dateedit.c:1469 widgets/misc/e-dateedit.c:1584
+msgid "None"
+msgstr "Без"
+
+#: calendar/gui/calendar-model.c:1711
+msgid "Recurring"
+msgstr "Повтарям"
+
+#: calendar/gui/calendar-model.c:1713
+msgid "Assigned"
+msgstr "Назначен"
+
+#: calendar/gui/calendar-model.c:1719 calendar/gui/e-meeting-model.c:266
+#: calendar/gui/e-meeting-model.c:276 calendar/gui/e-meeting-model.c:534
+#: calendar/gui/e-meeting-model.c:784
+msgid "Yes"
+msgstr "Да"
+
+#: calendar/gui/calendar-model.c:1719 calendar/gui/e-meeting-model.c:278
+#: calendar/gui/e-meeting-model.c:785
+msgid "No"
+msgstr "Не"
+
 #: calendar/gui/calendar-view-factory.c:118
 msgid "Day View"
 msgstr "_Изглед за Ден"
@@ -4029,51 +4134,30 @@ msgstr "Изглед за Седмица"
 msgid "Month View"
 msgstr "Изгел за Месец"
 
-#: calendar/gui/calendar-view-factory.c:130
-#, fuzzy
-msgid "List View"
-msgstr "_Текущ Преглед"
-
-#: calendar/gui/cal-search-bar.c:50
-msgid "Summary contains"
-msgstr "Съдържания на Обобщен"
-
-#: calendar/gui/cal-search-bar.c:51
-msgid "Description contains"
-msgstr "Съдържания на описание"
-
-#: calendar/gui/cal-search-bar.c:52
-msgid "Comment contains"
-msgstr "Съдържание на Коментар"
-
-#: calendar/gui/cal-search-bar.c:358 mail/mail-ops.c:1120
-msgid "Unmatched"
-msgstr "Несъвпадащ"
-
-#: calendar/gui/comp-editor-factory.c:462
+#: calendar/gui/comp-editor-factory.c:456
 #, fuzzy
 msgid "Error while opening the calendar"
 msgstr "Грешка при комуникацията с календарния сървър"
 
-#: calendar/gui/comp-editor-factory.c:473
+#: calendar/gui/comp-editor-factory.c:467
 msgid "Method not supported when opening the calendar"
 msgstr ""
 
-#: calendar/gui/comp-editor-factory.c:479
+#: calendar/gui/comp-editor-factory.c:473
 #, fuzzy
 msgid "Permission denied to open the calendar"
 msgstr "Отказан достъп"
 
-#: calendar/gui/control-factory.c:125
+#: calendar/gui/control-factory.c:119
 #, fuzzy, c-format
 msgid "Could not open the folder in '%s'"
 msgstr "Не мога да отворя папка в `%s'"
 
-#: calendar/gui/control-factory.c:171
+#: calendar/gui/control-factory.c:165
 msgid "The URI that the calendar will display"
 msgstr "URI, което ще се показва в календара"
 
-#: calendar/gui/control-factory.c:178
+#: calendar/gui/control-factory.c:172
 msgid "The type of view to show"
 msgstr ""
 
@@ -4145,8 +4229,7 @@ msgstr "допълнително време всеки"
 msgid "hours"
 msgstr "часове"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:14
-#: executive-summary/test-service/rdf-summary.c:806 filter/filter.glade.h:19
+#: calendar/gui/dialogs/alarm-options.glade.h:14 filter/filter.glade.h:19
 msgid "minutes"
 msgstr "минути"
 
@@ -4160,11 +4243,11 @@ msgstr "Базов"
 msgid "Date/Time:"
 msgstr "Дата/Време:"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:3 calendar/gui/e-alarm-list.c:465
+#: calendar/gui/dialogs/alarm-page.glade.h:3 calendar/gui/e-alarm-list.c:461
 msgid "Display a message"
 msgstr "Показва съобщение"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:4 calendar/gui/e-alarm-list.c:461
+#: calendar/gui/dialogs/alarm-page.glade.h:4 calendar/gui/e-alarm-list.c:457
 msgid "Play a sound"
 msgstr "Издава зук"
 
@@ -4172,7 +4255,7 @@ msgstr "Издава зук"
 msgid "Reminders"
 msgstr "Напомняне"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:6 calendar/gui/e-alarm-list.c:473
+#: calendar/gui/dialogs/alarm-page.glade.h:6 calendar/gui/e-alarm-list.c:469
 msgid "Run a program"
 msgstr "Стартирай програма"
 
@@ -4183,7 +4266,7 @@ msgstr "Изпрати email"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:8
 #: calendar/gui/dialogs/recurrence-page.glade.h:8
-#: calendar/gui/e-itip-control.c:1022 calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-itip-control.c:1052 calendar/gui/e-itip-control.glade.h:11
 #: calendar/gui/e-tasks.c:208
 msgid "Summary:"
 msgstr "Обобщено:"
@@ -4268,7 +4351,7 @@ msgstr "Дни"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
 #: calendar/gui/dialogs/recurrence-page.c:1040
-#: calendar/gui/e-itip-control.c:647
+#: calendar/gui/e-itip-control.c:677
 msgid "Friday"
 msgstr "Петък"
 
@@ -4282,7 +4365,7 @@ msgstr "Минути"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
 #: calendar/gui/dialogs/recurrence-page.c:1036
-#: calendar/gui/e-itip-control.c:643
+#: calendar/gui/e-itip-control.c:673
 msgid "Monday"
 msgstr "Понеделник"
 
@@ -4293,7 +4376,7 @@ msgstr "Н_ед"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
 #: calendar/gui/dialogs/recurrence-page.c:1041
-#: calendar/gui/e-itip-control.c:648
+#: calendar/gui/e-itip-control.c:678
 msgid "Saturday"
 msgstr "Събота"
 
@@ -4307,7 +4390,7 @@ msgstr "Показвай номерата на седмиците в навиг�
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
 #: calendar/gui/dialogs/recurrence-page.c:1042
-#: calendar/gui/e-itip-control.c:642
+#: calendar/gui/e-itip-control.c:672
 msgid "Sunday"
 msgstr "Неделя"
 
@@ -4327,7 +4410,7 @@ msgstr "_Списък със задачи"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
 #: calendar/gui/dialogs/recurrence-page.c:1039
-#: calendar/gui/e-itip-control.c:646
+#: calendar/gui/e-itip-control.c:676
 msgid "Thursday"
 msgstr "Четвъртък"
 
@@ -4345,7 +4428,7 @@ msgstr "Формат на време:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
 #: calendar/gui/dialogs/recurrence-page.c:1037
-#: calendar/gui/e-itip-control.c:644
+#: calendar/gui/e-itip-control.c:674
 msgid "Tuesday"
 msgstr "Вторник"
 
@@ -4355,12 +4438,12 @@ msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
 #: calendar/gui/dialogs/recurrence-page.c:1038
-#: calendar/gui/e-itip-control.c:645
+#: calendar/gui/e-itip-control.c:675
 msgid "Wednesday"
 msgstr "Сряда"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-#: ui/evolution-calendar.xml.h:31
+#: ui/evolution-calendar.xml.h:29
 msgid "Work Week"
 msgstr "Работна Седмица"
 
@@ -4518,6 +4601,31 @@ msgstr "%s  Вие имате промени. Да ги забравя ли и �
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  Вие нямате направени промени, да обновя редактора?"
 
+#: calendar/gui/dialogs/comp-editor-page.c:409
+#, fuzzy, c-format
+msgid "Validation error: %s"
+msgstr "Неизвестна грешка: %s"
+
+#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2216
+msgid " to "
+msgstr " в"
+
+#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2220
+msgid " (Completed "
+msgstr " (Приключено "
+
+#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2222
+msgid "Completed "
+msgstr "Приключено "
+
+#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2227
+msgid " (Due "
+msgstr " (Дължим"
+
+#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2229
+msgid "Due "
+msgstr "Дължим"
+
 #: calendar/gui/dialogs/comp-editor.c:334
 #, fuzzy
 msgid "Could not update invalid object"
@@ -4565,47 +4673,21 @@ msgid "No summary"
 msgstr "Няма резюме"
 
 #: calendar/gui/dialogs/comp-editor.c:1281
-#: calendar/gui/e-calendar-table.c:1138 calendar/gui/e-cal-view.c:878
-#: composer/e-msg-composer.c:1191
+#: calendar/gui/e-calendar-table.c:1103 calendar/gui/e-day-view.c:3971
+#: calendar/gui/e-week-view.c:3909 composer/e-msg-composer.c:1184
 msgid "Save as..."
 msgstr "Съхрани като..."
 
-#: calendar/gui/dialogs/comp-editor.c:1384
-#: calendar/gui/dialogs/comp-editor.c:1408
-#: calendar/gui/dialogs/comp-editor.c:1434
+#: calendar/gui/dialogs/comp-editor.c:1383
+#: calendar/gui/dialogs/comp-editor.c:1407
+#: calendar/gui/dialogs/comp-editor.c:1433
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:1464
-#: calendar/gui/dialogs/comp-editor.c:1473
+#: calendar/gui/dialogs/comp-editor.c:1460
 msgid "Unable to obtain current version!"
 msgstr "Не мога да получа текущата версия!"
 
-#: calendar/gui/dialogs/comp-editor-page.c:409
-#, fuzzy, c-format
-msgid "Validation error: %s"
-msgstr "Неизвестна грешка: %s"
-
-#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2223
-msgid " to "
-msgstr " в"
-
-#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2227
-msgid " (Completed "
-msgstr " (Приключено "
-
-#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2229
-msgid "Completed "
-msgstr "Приключено "
-
-#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2234
-msgid " (Due "
-msgstr " (Дължим"
-
-#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2236
-msgid "Due "
-msgstr "Дължим"
-
 #: calendar/gui/dialogs/delete-comp.c:96
 #, c-format
 msgid "Are you sure you want to delete the appointment `%s'?"
@@ -4710,31 +4792,31 @@ msgstr "Делегира На:"
 msgid "Enter Delegate"
 msgstr "Въведете Делегата"
 
-#: calendar/gui/dialogs/event-editor.c:200 calendar/gui/print.c:2260
+#: calendar/gui/dialogs/event-editor.c:199 calendar/gui/print.c:2253
 msgid "Appointment"
 msgstr "Среща"
 
-#: calendar/gui/dialogs/event-editor.c:207
+#: calendar/gui/dialogs/event-editor.c:206
 msgid "Reminder"
 msgstr "Напомня"
 
-#: calendar/gui/dialogs/event-editor.c:214
+#: calendar/gui/dialogs/event-editor.c:213
 msgid "Recurrence"
 msgstr "Повторение"
 
-#: calendar/gui/dialogs/event-editor.c:221
-#: calendar/gui/dialogs/event-editor.c:294
-#: calendar/gui/dialogs/event-editor.c:438
+#: calendar/gui/dialogs/event-editor.c:220
+#: calendar/gui/dialogs/event-editor.c:292
+#: calendar/gui/dialogs/event-editor.c:436
 msgid "Scheduling"
 msgstr "Разпределение"
 
-#: calendar/gui/dialogs/event-editor.c:228
-#: calendar/gui/dialogs/event-editor.c:297
-#: calendar/gui/dialogs/event-editor.c:441 ui/evolution-event-editor.xml.h:6
+#: calendar/gui/dialogs/event-editor.c:227
+#: calendar/gui/dialogs/event-editor.c:295
+#: calendar/gui/dialogs/event-editor.c:439 ui/evolution-event-editor.xml.h:6
 msgid "Meeting"
 msgstr "Среща"
 
-#: calendar/gui/dialogs/event-page.c:603 calendar/gui/dialogs/task-page.c:509
+#: calendar/gui/dialogs/event-page.c:603 calendar/gui/dialogs/task-page.c:507
 #, fuzzy
 msgid "Start date is wrong"
 msgstr "Начална Дата"
@@ -4772,9 +4854,9 @@ msgid "Classification"
 msgstr "Класификация"
 
 #: calendar/gui/dialogs/event-page.glade.h:6
-#, fuzzy
-msgid "Co_nfidential"
-msgstr "Конфиденциален"
+#: calendar/gui/dialogs/task-page.glade.h:4
+msgid "Con_fidential"
+msgstr "_Конфиденциален"
 
 #: calendar/gui/dialogs/event-page.glade.h:7
 #: calendar/gui/dialogs/task-page.glade.h:5
@@ -4800,6 +4882,7 @@ msgid "Pu_blic"
 msgstr "Публичен"
 
 #: calendar/gui/dialogs/event-page.glade.h:12
+#: calendar/gui/e-calendar-table.etspec.h:13
 msgid "Show Time As"
 msgstr "Покажи Времето Като"
 
@@ -4816,34 +4899,75 @@ msgstr "Край:"
 msgid "_Start time:"
 msgstr "Начало:"
 
-#. an empty string is the same as 'None'
-#: calendar/gui/dialogs/meeting-page.c:311
-#: calendar/gui/dialogs/meeting-page.glade.h:2
-#: calendar/gui/e-cal-model-tasks.c:596 composer/e-msg-composer.c:2093
-#: mail/mail-account-gui.c:1260 mail/mail-account-gui.c:1692
-#: mail/mail-accounts.c:442 mail/mail-config.glade.h:76
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:194
-#: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:445
-#: widgets/misc/e-dateedit.c:1483 widgets/misc/e-dateedit.c:1598
-msgid "None"
-msgstr "Без"
-
-#: calendar/gui/dialogs/meeting-page.c:416
+#: calendar/gui/dialogs/meeting-page.c:437
 msgid "The organizer selected no longer has an account."
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:422
+#: calendar/gui/dialogs/meeting-page.c:443
 msgid "An organizer is required."
 msgstr "Необходим е организатор."
 
-#: calendar/gui/dialogs/meeting-page.c:437
+#: calendar/gui/dialogs/meeting-page.c:458
 msgid "At least one attendee is required."
 msgstr "Необходим е поне един участник."
 
-#: calendar/gui/dialogs/meeting-page.c:630
+#: calendar/gui/dialogs/meeting-page.c:629
+msgid "That person is already attending the meeting!"
+msgstr "Това лице вече е на срещата!"
+
+#: calendar/gui/dialogs/meeting-page.c:713
 msgid "_Delegate To..."
 msgstr "_Делегира На.."
 
+#: calendar/gui/dialogs/meeting-page.etspec.h:1
+#: calendar/gui/e-meeting-time-sel.etspec.h:1
+msgid "Attendee"
+msgstr ""
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:2
+#: calendar/gui/e-meeting-time-sel.etspec.h:2
+#, fuzzy
+msgid "Click here to add an attendee"
+msgstr "* Натиснете тук за да добавите контакт *"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:3
+#: calendar/gui/e-meeting-time-sel.etspec.h:3
+msgid "Common Name"
+msgstr "Общо име"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:4
+#: calendar/gui/e-meeting-time-sel.etspec.h:4
+msgid "Delegated From"
+msgstr "Делегиран От"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:5
+#: calendar/gui/e-meeting-time-sel.etspec.h:5
+msgid "Delegated To"
+msgstr "Делегиран На"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:6
+#: calendar/gui/e-meeting-time-sel.etspec.h:6
+msgid "Language"
+msgstr "Език"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:7
+#: calendar/gui/e-meeting-time-sel.etspec.h:7
+msgid "Member"
+msgstr "Член"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:8
+#: calendar/gui/e-itip-control.c:1179
+#: calendar/gui/e-meeting-time-sel.etspec.h:8
+msgid "RSVP"
+msgstr "RSVP"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:10
+#: calendar/gui/e-calendar-table.etspec.h:15
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:58
+#: mail/message-list.etspec.h:12
+msgid "Status"
+msgstr "Статус"
+
 #: calendar/gui/dialogs/meeting-page.glade.h:3
 #: calendar/gui/e-itip-control.glade.h:9
 msgid "Organizer:"
@@ -4854,7 +4978,7 @@ msgid "_Change Organizer"
 msgstr "_Смяна на организатор"
 
 #: calendar/gui/dialogs/meeting-page.glade.h:5
-#: calendar/gui/e-meeting-time-sel.c:411
+#: calendar/gui/e-meeting-time-sel.c:424
 msgid "_Invite Others..."
 msgstr "_Други Поканени..."
 
@@ -5013,7 +5137,7 @@ msgstr ""
 "\n"
 "Искате ли да запазите промените?"
 
-#: calendar/gui/dialogs/save-comp.c:58 composer/e-msg-composer.c:1599
+#: calendar/gui/dialogs/save-comp.c:58 composer/e-msg-composer.c:1580
 msgid "_Discard Changes"
 msgstr ""
 
@@ -5050,27 +5174,6 @@ msgstr "Приключено "
 msgid "% _Complete"
 msgstr "% Приключено"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:4
-#: calendar/gui/e-calendar-table.c:478 calendar/gui/e-cal-model-tasks.c:323
-#: calendar/gui/e-cal-model-tasks.c:602 calendar/gui/e-tasks.c:250
-#: calendar/gui/print.c:2311
-msgid "Completed"
-msgstr "Приключено"
-
-#: calendar/gui/dialogs/task-details-page.glade.h:6
-#: calendar/gui/e-calendar-table.c:477 calendar/gui/e-cal-model-tasks.c:321
-#: calendar/gui/e-cal-model-tasks.c:600 calendar/gui/e-cal-model-tasks.c:662
-#: calendar/gui/e-tasks.c:247 calendar/gui/print.c:2308
-msgid "In Progress"
-msgstr "В Прогрес"
-
-#: calendar/gui/dialogs/task-details-page.glade.h:9
-#: calendar/gui/e-calendar-table.c:476 calendar/gui/e-cal-model-tasks.c:319
-#: calendar/gui/e-cal-model-tasks.c:598 calendar/gui/e-tasks.c:257
-#: calendar/gui/print.c:2305
-msgid "Not Started"
-msgstr "Не е Стартиран"
-
 #: calendar/gui/dialogs/task-details-page.glade.h:10
 msgid "Progress"
 msgstr "Прогрес"
@@ -5093,29 +5196,21 @@ msgstr "_Статус:"
 msgid "_Web Page:"
 msgstr "_Web адрес:"
 
-#: calendar/gui/dialogs/task-editor.c:193
+#: calendar/gui/dialogs/task-editor.c:192
 msgid "Basic"
 msgstr "Основни"
 
-#: calendar/gui/dialogs/task-editor.c:207
-#: calendar/gui/dialogs/task-editor.c:270
-#: calendar/gui/dialogs/task-editor.c:407
+#: calendar/gui/dialogs/task-editor.c:206
+#: calendar/gui/dialogs/task-editor.c:269
+#: calendar/gui/dialogs/task-editor.c:406
 msgid "Assignment"
 msgstr "Задача"
 
-#: calendar/gui/dialogs/task-page.c:482
+#: calendar/gui/dialogs/task-page.c:480
 msgid "Due date is wrong"
 msgstr ""
 
-#: calendar/gui/dialogs/task-page.c:542
-msgid "Due date is before start date!"
-msgstr ""
-
-#: calendar/gui/dialogs/task-page.glade.h:4
-msgid "Con_fidential"
-msgstr "_Конфиденциален"
-
-#: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-itip-control.c:1077
+#: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-itip-control.c:1107
 #: calendar/gui/e-itip-control.glade.h:6 calendar/gui/e-tasks.c:287
 #: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:43
 msgid "Description:"
@@ -5129,247 +5224,222 @@ msgstr "На_чална Дата:"
 msgid "_Due Date:"
 msgstr "_Крайна Дата"
 
-#: calendar/gui/e-alarm-list.c:397
+#: calendar/gui/e-alarm-list.c:393
 #, c-format
 msgid "%d days"
 msgstr "%d дни"
 
-#: calendar/gui/e-alarm-list.c:400
+#: calendar/gui/e-alarm-list.c:396
 msgid "1 day"
 msgstr "1 ден"
 
-#: calendar/gui/e-alarm-list.c:405
+#: calendar/gui/e-alarm-list.c:401
 #, c-format
 msgid "%d weeks"
 msgstr "%d седмици"
 
-#: calendar/gui/e-alarm-list.c:408
+#: calendar/gui/e-alarm-list.c:404
 msgid "1 week"
 msgstr "1 седмица"
 
-#: calendar/gui/e-alarm-list.c:413
+#: calendar/gui/e-alarm-list.c:409
 #, c-format
 msgid "%d hours"
 msgstr "%d часове"
 
-#: calendar/gui/e-alarm-list.c:416
+#: calendar/gui/e-alarm-list.c:412
 msgid "1 hour"
 msgstr "1 час"
 
-#: calendar/gui/e-alarm-list.c:421
+#: calendar/gui/e-alarm-list.c:417
 #, c-format
 msgid "%d minutes"
 msgstr "%d минути"
 
-#: calendar/gui/e-alarm-list.c:424
+#: calendar/gui/e-alarm-list.c:420
 msgid "1 minute"
 msgstr "1 минута"
 
-#: calendar/gui/e-alarm-list.c:429
+#: calendar/gui/e-alarm-list.c:425
 #, c-format
 msgid "%d seconds"
 msgstr "%d секунди"
 
-#: calendar/gui/e-alarm-list.c:432
+#: calendar/gui/e-alarm-list.c:428
 msgid "1 second"
 msgstr "1 секунда"
 
-#: calendar/gui/e-alarm-list.c:469
+#: calendar/gui/e-alarm-list.c:465
 msgid "Send an email"
 msgstr "Изпрати email"
 
-#: calendar/gui/e-alarm-list.c:479
+#: calendar/gui/e-alarm-list.c:475
 msgid "Unknown action to be performed"
 msgstr "Неизвестно действие за изпълнение"
 
-#: calendar/gui/e-alarm-list.c:491
+#: calendar/gui/e-alarm-list.c:487
 #, c-format
 msgid "%s %s before the start of the appointment"
 msgstr "%s %s преди започване на среща"
 
-#: calendar/gui/e-alarm-list.c:494
+#: calendar/gui/e-alarm-list.c:490
 #, c-format
 msgid "%s %s after the start of the appointment"
 msgstr "%s %s след започване на среща"
 
-#: calendar/gui/e-alarm-list.c:499
+#: calendar/gui/e-alarm-list.c:495
 #, c-format
 msgid "%s at the start of the appointment"
 msgstr "%s от началото на срещата"
 
-#: calendar/gui/e-alarm-list.c:508
+#: calendar/gui/e-alarm-list.c:504
 #, c-format
 msgid "%s %s before the end of the appointment"
 msgstr "%s %s преди края на срещата"
 
-#: calendar/gui/e-alarm-list.c:511
+#: calendar/gui/e-alarm-list.c:507
 #, c-format
 msgid "%s %s after the end of the appointment"
 msgstr "%s %s след края на срещата"
 
-#: calendar/gui/e-alarm-list.c:516
+#: calendar/gui/e-alarm-list.c:512
 #, c-format
 msgid "%s at the end of the appointment"
 msgstr "%s на края на срещата"
 
-#: calendar/gui/e-alarm-list.c:540
+#: calendar/gui/e-alarm-list.c:536
 #, c-format
 msgid "%s at %s"
 msgstr "%s в %s"
 
-#: calendar/gui/e-alarm-list.c:546
+#: calendar/gui/e-alarm-list.c:542
 #, c-format
 msgid "%s for an unknown trigger type"
 msgstr "%s е неизвестен тип за превключване"
 
-#: calendar/gui/e-calendar-table.c:381 calendar/gui/e-cal-model.c:280
-#: calendar/gui/e-cal-model.c:287
-msgid "Public"
-msgstr "Публичен"
-
-#: calendar/gui/e-calendar-table.c:382 calendar/gui/e-cal-model.c:289
-msgid "Private"
-msgstr "Частен"
-
-#: calendar/gui/e-calendar-table.c:383 calendar/gui/e-cal-model.c:291
-msgid "Confidential"
-msgstr "Конфиденциален"
-
-#: calendar/gui/e-calendar-table.c:425
+#: calendar/gui/e-calendar-table.c:423
 msgid "0%"
 msgstr "0%"
 
-#: calendar/gui/e-calendar-table.c:426
+#: calendar/gui/e-calendar-table.c:424
 msgid "10%"
 msgstr "10%"
 
-#: calendar/gui/e-calendar-table.c:427
+#: calendar/gui/e-calendar-table.c:425
 msgid "20%"
 msgstr "20%"
 
-#: calendar/gui/e-calendar-table.c:428
+#: calendar/gui/e-calendar-table.c:426
 msgid "30%"
 msgstr "30%"
 
-#: calendar/gui/e-calendar-table.c:429
+#: calendar/gui/e-calendar-table.c:427
 msgid "40%"
 msgstr "40%"
 
-#: calendar/gui/e-calendar-table.c:430
+#: calendar/gui/e-calendar-table.c:428
 msgid "50%"
 msgstr "50%"
 
-#: calendar/gui/e-calendar-table.c:431
+#: calendar/gui/e-calendar-table.c:429
 msgid "60%"
 msgstr "60%"
 
-#: calendar/gui/e-calendar-table.c:432
+#: calendar/gui/e-calendar-table.c:430
 msgid "70%"
 msgstr "70%"
 
-#: calendar/gui/e-calendar-table.c:433
+#: calendar/gui/e-calendar-table.c:431
 msgid "80%"
 msgstr "80%"
 
-#: calendar/gui/e-calendar-table.c:434
+#: calendar/gui/e-calendar-table.c:432
 msgid "90%"
 msgstr "90%"
 
-#: calendar/gui/e-calendar-table.c:435
+#: calendar/gui/e-calendar-table.c:433
 msgid "100%"
 msgstr "100%"
 
-#: calendar/gui/e-calendar-table.c:455 calendar/gui/e-cal-model-calendar.c:163
-msgid "Free"
-msgstr "Свободно"
-
-#: calendar/gui/e-calendar-table.c:456 calendar/gui/e-cal-model-calendar.c:166
-#: calendar/gui/e-meeting-time-sel.c:393
-#: shell/evolution-shell-component.c:1207
-msgid "Busy"
-msgstr "Заето"
-
-#: calendar/gui/e-calendar-table.c:724 calendar/gui/e-cal-view.c:562
+#: calendar/gui/e-calendar-table.c:726 calendar/gui/e-day-view.c:2838
+#: calendar/gui/e-week-view.c:1994
 msgid "Deleting selected objects"
 msgstr "Изтрий избраните обекти"
 
-#: calendar/gui/e-calendar-table.c:988 calendar/gui/e-calendar-table.c:1029
-#: calendar/gui/e-cal-view.c:1126 calendar/gui/e-cal-view.c:1192
+#: calendar/gui/e-calendar-table.c:980 calendar/gui/e-day-view.c:3711
+#: calendar/gui/e-week-view.c:3680 mail/folder-browser.c:1803
 #: shell/e-shortcuts-view.c:422 ui/evolution-addressbook.xml.h:36
 msgid "_Open"
 msgstr "_Отвори"
 
-#: calendar/gui/e-calendar-table.c:989
+#: calendar/gui/e-calendar-table.c:981
 #, fuzzy
 msgid "Open _Web Page"
 msgstr "Отваря _Съобщение"
 
-#: calendar/gui/e-calendar-table.c:990 calendar/gui/e-calendar-table.c:1035
-#: calendar/gui/e-cal-view.c:1127 calendar/gui/e-cal-view.c:1198
-#: ui/evolution-mail-message.xml.h:120
-msgid "_Save As..."
-msgstr "Запази като..."
+#: calendar/gui/e-calendar-table.c:982
+#, fuzzy
+msgid "_Save as..."
+msgstr "Съхрани като..."
 
-#: calendar/gui/e-calendar-table.c:991 calendar/gui/e-calendar-table.c:1033
-#: calendar/gui/e-cal-view.c:1101 calendar/gui/e-cal-view.c:1128
-#: calendar/gui/e-cal-view.c:1196 ui/evolution-addressbook.xml.h:38
-#: ui/evolution-calendar.xml.h:37 ui/evolution-comp-editor.xml.h:19
-#: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:116
+#: calendar/gui/e-calendar-table.c:983 calendar/gui/e-day-view.c:3713
+#: calendar/gui/e-week-view.c:3655 calendar/gui/e-week-view.c:3682
+#: ui/evolution-addressbook.xml.h:38 ui/evolution-calendar.xml.h:35
+#: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:110
 #: ui/evolution-tasks.xml.h:21 ui/my-evolution.xml.h:6
 msgid "_Print..."
 msgstr "_Печат..."
 
-#: calendar/gui/e-calendar-table.c:995 calendar/gui/e-calendar-table.c:1024
-#: calendar/gui/e-cal-view.c:1133 calendar/gui/e-cal-view.c:1174
-#: ui/evolution-addressbook.xml.h:1 ui/evolution-calendar.xml.h:1
-#: ui/evolution-tasks.xml.h:1
+#: calendar/gui/e-calendar-table.c:987 calendar/gui/e-day-view.c:3718
+#: calendar/gui/e-week-view.c:3687 ui/evolution-addressbook.xml.h:1
+#: ui/evolution-calendar.xml.h:1 ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "Отрежи"
 
-#: calendar/gui/e-calendar-table.c:996 calendar/gui/e-calendar-table.c:1022
-#: calendar/gui/e-cal-view.c:1134 calendar/gui/e-cal-view.c:1172
-#: ui/evolution-addressbook.xml.h:30 ui/evolution-calendar.xml.h:33
-#: ui/evolution-composer-entries.xml.h:7 ui/evolution-mail-message.xml.h:101
-#: ui/evolution-tasks.xml.h:17
+#: calendar/gui/e-calendar-table.c:988 calendar/gui/e-day-view.c:3719
+#: calendar/gui/e-week-view.c:3688 ui/evolution-addressbook.xml.h:30
+#: ui/evolution-calendar.xml.h:31 ui/evolution-composer-entries.xml.h:7
+#: ui/evolution-mail-list.xml.h:24 ui/evolution-tasks.xml.h:17
 msgid "_Copy"
 msgstr "Копирай"
 
-#: calendar/gui/e-calendar-table.c:997 calendar/gui/e-calendar-table.c:1031
-#: calendar/gui/e-cal-view.c:1105 calendar/gui/e-cal-view.c:1135
-#: calendar/gui/e-cal-view.c:1194 ui/evolution-addressbook.xml.h:37
-#: ui/evolution-calendar.xml.h:36 ui/evolution-composer-entries.xml.h:9
-#: ui/evolution-mail-message.xml.h:114 ui/evolution-tasks.xml.h:20
+#: calendar/gui/e-calendar-table.c:989 calendar/gui/e-day-view.c:3684
+#: calendar/gui/e-day-view.c:3720 calendar/gui/e-week-view.c:3659
+#: calendar/gui/e-week-view.c:3689 ui/evolution-addressbook.xml.h:37
+#: ui/evolution-calendar.xml.h:34 ui/evolution-composer-entries.xml.h:9
+#: ui/evolution-mail-list.xml.h:29 ui/evolution-tasks.xml.h:20
 msgid "_Paste"
 msgstr "_Постави"
 
-#: calendar/gui/e-calendar-table.c:1001
+#: calendar/gui/e-calendar-table.c:993
 #, fuzzy
 msgid "_Assign Task"
 msgstr "Присвояване на Задача"
 
-#: calendar/gui/e-calendar-table.c:1002
+#: calendar/gui/e-calendar-table.c:994
 #, fuzzy
 msgid "_Forward as iCalendar"
 msgstr "Препраща като _iКалендар"
 
-#: calendar/gui/e-calendar-table.c:1003
+#: calendar/gui/e-calendar-table.c:995
 msgid "_Mark as Complete"
 msgstr "_Маркира като Приключено"
 
-#: calendar/gui/e-calendar-table.c:1004
+#: calendar/gui/e-calendar-table.c:996
 #, fuzzy
 msgid "_Mark Selected Tasks as Complete"
 msgstr "Мар_кирай тази Задача като Завършена"
 
-#: calendar/gui/e-calendar-table.c:1009 calendar/gui/e-calendar-table.c:1027
+#: calendar/gui/e-calendar-table.c:1001
 msgid "_Delete Selected Tasks"
 msgstr "_Изтрива Избраните Задачи"
 
-#: calendar/gui/e-calendar-table.c:1341 calendar/gui/e-cal-view.c:253
+#: calendar/gui/e-calendar-table.c:1300 calendar/gui/e-day-view.c:7994
+#: calendar/gui/e-week-view.c:4411
 msgid "Updating objects"
 msgstr "Обновява обектите"
 
-#: calendar/gui/e-calendar-table.c:1424
+#: calendar/gui/e-calendar-table.c:1383
 #: calendar/gui/e-calendar-table.etspec.h:6
 msgid "Click to add a task"
 msgstr "Кликнете за да добавите задача"
@@ -5383,8 +5453,8 @@ msgstr "% Приключено"
 msgid "Alarms"
 msgstr "Аларми"
 
-#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:1173
-#: camel/camel-filter-driver.c:1268 mail/mail-send-recv.c:578
+#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:1156
+#: camel/camel-filter-driver.c:1251
 msgid "Complete"
 msgstr "Приключено"
 
@@ -5393,14 +5463,13 @@ msgid "Completion Date"
 msgstr "Дата на приключване"
 
 #: calendar/gui/e-calendar-table.etspec.h:9
-#, fuzzy
-msgid "Description"
-msgstr "Описание:"
-
-#: calendar/gui/e-calendar-table.etspec.h:10
 msgid "Due Date"
 msgstr "Срок"
 
+#: calendar/gui/e-calendar-table.etspec.h:10
+msgid "End Date"
+msgstr "Крайна Дата"
+
 #: calendar/gui/e-calendar-table.etspec.h:11
 msgid "Geographical Position"
 msgstr "Географска Позиция"
@@ -5409,313 +5478,255 @@ msgstr "Географска Позиция"
 msgid "Priority"
 msgstr "Приоритет"
 
-#: calendar/gui/e-calendar-table.etspec.h:13
+#: calendar/gui/e-calendar-table.etspec.h:14
 msgid "Start Date"
 msgstr "Начална Дата"
 
-#: calendar/gui/e-calendar-table.etspec.h:14
-#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:36
-#: mail/message-list.etspec.h:12
-msgid "Status"
-msgstr "Статус"
-
-#: calendar/gui/e-calendar-table.etspec.h:15
+#: calendar/gui/e-calendar-table.etspec.h:16
 #: my-evolution/component-factory.c:56 shell/e-shell.c:750
 #: shell/e-shortcuts.c:1082
 msgid "Summary"
 msgstr "Резюме"
 
-#: calendar/gui/e-calendar-table.etspec.h:16
+#: calendar/gui/e-calendar-table.etspec.h:17
 msgid "Task sort"
 msgstr "Сортиране на Задачи"
 
-#: calendar/gui/e-calendar-table.etspec.h:19 mail/mail-config.glade.h:171
-#, fuzzy
-msgid "color"
-msgstr " цвят"
-
-#: calendar/gui/e-calendar-table.etspec.h:20
-#, fuzzy
-msgid "component"
-msgstr "Среща"
-
-#: calendar/gui/e-cal-model.c:293 calendar/gui/e-cal-model.c:296
-#: calendar/gui/e-itip-control.c:1062 calendar/gui/e-itip-control.c:1278
-#: camel/camel-gpg-context.c:1574 camel/camel-gpg-context.c:1625
-#: camel/camel-tcp-stream-openssl.c:631
-#: camel/providers/smtp/camel-smtp-transport.c:172
-#: camel/providers/smtp/camel-smtp-transport.c:227
-#: widgets/misc/e-charset-picker.c:60
-msgid "Unknown"
-msgstr "Неизвестен"
-
-#: calendar/gui/e-cal-model.c:828
-msgid "Recurring"
-msgstr "Повтарям"
-
-#: calendar/gui/e-cal-model.c:830
-msgid "Assigned"
-msgstr "Назначен"
+#. strftime format of a weekday, a date and a time, 24-hour.
+#: calendar/gui/e-cell-date-edit-text.c:118 e-util/e-time-utils.c:167
+#: e-util/e-time-utils.c:380
+msgid "%a %m/%d/%Y %H:%M:%S"
+msgstr "%a %m/%d/%Y %H:%M:%S"
 
-#: calendar/gui/e-cal-model.c:832 calendar/gui/e-cal-model-tasks.c:933
-msgid "Yes"
-msgstr "Да"
+#. strftime format of a weekday, a date and a time, 12-hour.
+#: calendar/gui/e-cell-date-edit-text.c:121 e-util/e-time-utils.c:162
+#: e-util/e-time-utils.c:389
+msgid "%a %m/%d/%Y %I:%M:%S %p"
+msgstr "%a %m/%d/%Y %I:%M:%S %p"
 
-#: calendar/gui/e-cal-model.c:832 calendar/gui/e-cal-model-tasks.c:933
-msgid "No"
-msgstr "Не"
+#: calendar/gui/e-cell-date-edit-text.c:126
+#, c-format
+msgid ""
+"The date must be entered in the format: \n"
+"\n"
+"%s"
+msgstr ""
+"Датата трябва да е въведена в следния формат: \n"
+"\n"
+"%s"
 
-#: calendar/gui/e-cal-model-tasks.c:275
-msgid "N"
-msgstr "С"
+#: calendar/gui/e-day-view-time-item.c:532
+#, c-format
+msgid "%02i minute divisions"
+msgstr "%02i минутно разделяне"
 
-#: calendar/gui/e-cal-model-tasks.c:275
-msgid "S"
-msgstr "Ю"
+#. strftime format %A = full weekday name, %d = day of month,
+#. %B = full month name. Don't use any other specifiers.
+#: calendar/gui/e-day-view-top-item.c:261 calendar/gui/e-day-view.c:1403
+#: calendar/gui/e-week-view-main-item.c:316 calendar/gui/print.c:1525
+msgid "%A %d %B"
+msgstr "%A %d %B"
 
-#: calendar/gui/e-cal-model-tasks.c:277
-msgid "E"
-msgstr "И"
+#. strftime format %d = day of month, %b = abbreviated month name.
+#. Don't use any other specifiers.
+#: calendar/gui/e-day-view-top-item.c:269 calendar/gui/e-day-view.c:1436
+#: calendar/gui/e-week-view-main-item.c:339
+msgid "%d %b"
+msgstr "%d %b"
 
-#: calendar/gui/e-cal-model-tasks.c:277
-msgid "W"
-msgstr "З"
+#. String to use in 12-hour time format for times in the morning.
+#: calendar/gui/e-day-view.c:618 calendar/gui/e-week-view.c:341
+#: calendar/gui/print.c:809
+msgid "am"
+msgstr "am"
 
-#: calendar/gui/e-cal-model-tasks.c:550
-msgid ""
-"The geographical position must be entered in the format: \n"
-"\n"
-"45.436845,125.862501"
-msgstr ""
-"Географското местонахождение трябва да бъде въведено в следния формат: \n"
-"\n"
-"45.436845,125.862501"
+#. String to use in 12-hour time format for times in the afternoon.
+#: calendar/gui/e-day-view.c:621 calendar/gui/e-week-view.c:344
+#: calendar/gui/print.c:811
+msgid "pm"
+msgstr "pm"
 
-#: calendar/gui/e-cal-view.c:1094 calendar/gui/e-cal-view.c:1184
-msgid "New _Appointment..."
-msgstr "Нова _Среща..."
+#: calendar/gui/e-day-view.c:3668
+msgid "New _Appointment"
+msgstr "Нова _Среща"
 
-#: calendar/gui/e-cal-view.c:1095 calendar/gui/e-cal-view.c:1186
+#: calendar/gui/e-day-view.c:3670 calendar/gui/e-week-view.c:3649
 msgid "New All Day _Event"
 msgstr "Всички Нови _Събития за Деня"
 
-#: calendar/gui/e-cal-view.c:1096 calendar/gui/e-cal-view.c:1188
+#: calendar/gui/e-day-view.c:3672 calendar/gui/e-week-view.c:3650
 #, fuzzy
 msgid "New Meeting"
 msgstr "Среща"
 
-#: calendar/gui/e-cal-view.c:1097 calendar/gui/e-cal-view.c:1190
+#: calendar/gui/e-day-view.c:3674 calendar/gui/e-week-view.c:3651
 msgid "New Task"
 msgstr "Нова Задача"
 
-#: calendar/gui/e-cal-view.c:1111 calendar/gui/e-cal-view.c:1180
+#: calendar/gui/e-day-view.c:3679 ui/evolution-comp-editor.xml.h:11
+msgid "Print..."
+msgstr "Печат..."
+
+#: calendar/gui/e-day-view.c:3691 calendar/gui/e-week-view.c:3665
 #: ui/evolution-calendar.xml.h:13
 msgid "Go to _Today"
 msgstr "Отиди на _Днес"
 
-#: calendar/gui/e-cal-view.c:1112 calendar/gui/e-cal-view.c:1182
+#: calendar/gui/e-day-view.c:3693 calendar/gui/e-week-view.c:3666
 msgid "_Go to Date..."
 msgstr "Отиди _на Дата..."
 
-#: calendar/gui/e-cal-view.c:1116 ui/evolution-calendar.xml.h:38
+#: calendar/gui/e-day-view.c:3698 calendar/gui/e-week-view.c:3670
+#: ui/evolution-calendar.xml.h:36
 msgid "_Publish Free/Busy Information"
 msgstr "_Потребителска Информация"
 
-#: calendar/gui/e-cal-view.c:1120 calendar/gui/e-cal-view.c:1200
+#: calendar/gui/e-day-view.c:3703 calendar/gui/e-week-view.c:3674
 #: ui/evolution.xml.h:60
 #, fuzzy
 msgid "_Settings..."
 msgstr "Пощенски Настройки..."
 
-#: calendar/gui/e-cal-view.c:1139
+#: calendar/gui/e-day-view.c:3712 calendar/gui/e-week-view.c:3681
+#: mail/folder-browser.c:1805 ui/evolution-mail-message.xml.h:114
+msgid "_Save As..."
+msgstr "Запази като..."
+
+#: calendar/gui/e-day-view.c:3724 calendar/gui/e-week-view.c:3693
 #, fuzzy
 msgid "_Schedule Meeting..."
 msgstr "План на _Среща"
 
-#: calendar/gui/e-cal-view.c:1140
+#: calendar/gui/e-day-view.c:3725 calendar/gui/e-week-view.c:3694
 #, fuzzy
 msgid "_Forward as iCalendar..."
 msgstr "Препраща като _iКалендар"
 
-#: calendar/gui/e-cal-view.c:1145
+#: calendar/gui/e-day-view.c:3730 calendar/gui/e-week-view.c:3699
 msgid "Make this Occurrence _Movable"
 msgstr "Прави това Събитие Пр_еместваемо"
 
-#: calendar/gui/e-cal-view.c:1146 calendar/gui/e-cal-view.c:1177
+#: calendar/gui/e-day-view.c:3731 calendar/gui/e-week-view.c:3700
 msgid "Delete this _Occurrence"
 msgstr "Изтрии това С_ъбитие"
 
-#: calendar/gui/e-cal-view.c:1147 calendar/gui/e-cal-view.c:1178
+#: calendar/gui/e-day-view.c:3732 calendar/gui/e-week-view.c:3701
 msgid "Delete _All Occurrences"
 msgstr "Изтрии Всички _Събития"
 
-#. strftime format of a weekday, a date and a time, 24-hour.
-#: calendar/gui/e-cell-date-edit-text.c:118 e-util/e-time-utils.c:180
-#: e-util/e-time-utils.c:393
-msgid "%a %m/%d/%Y %H:%M:%S"
-msgstr "%a %m/%d/%Y %H:%M:%S"
-
-#. strftime format of a weekday, a date and a time, 12-hour.
-#: calendar/gui/e-cell-date-edit-text.c:121 e-util/e-time-utils.c:175
-#: e-util/e-time-utils.c:402
-msgid "%a %m/%d/%Y %I:%M:%S %p"
-msgstr "%a %m/%d/%Y %I:%M:%S %p"
-
-#: calendar/gui/e-cell-date-edit-text.c:126
-#, c-format
-msgid ""
-"The date must be entered in the format: \n"
-"\n"
-"%s"
-msgstr ""
-"Датата трябва да е въведена в следния формат: \n"
-"\n"
-"%s"
-
-#. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:600 calendar/gui/e-week-view.c:326
-#: calendar/gui/print.c:809
-msgid "am"
-msgstr "am"
-
-#. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:603 calendar/gui/e-week-view.c:329
-#: calendar/gui/print.c:811
-msgid "pm"
-msgstr "pm"
-
-#. strftime format %A = full weekday name, %d = day of month,
-#. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view.c:1347 calendar/gui/e-day-view-top-item.c:262
-#: calendar/gui/e-week-view-main-item.c:316 calendar/gui/print.c:1524
-msgid "%A %d %B"
-msgstr "%A %d %B"
-
-#. strftime format %d = day of month, %b = abbreviated month name.
-#. Don't use any other specifiers.
-#: calendar/gui/e-day-view.c:1380 calendar/gui/e-day-view-top-item.c:270
-#: calendar/gui/e-week-view-main-item.c:339
-msgid "%d %b"
-msgstr "%d %b"
-
-#: calendar/gui/e-day-view-time-item.c:532
-#, c-format
-msgid "%02i minute divisions"
-msgstr "%02i минутно разделяне"
-
-#: calendar/gui/e-itip-control.c:676
+#: calendar/gui/e-itip-control.c:706
 #, fuzzy
 msgid "Yes. (Complex Recurrence)"
 msgstr "Пр_осто повторение"
 
-#: calendar/gui/e-itip-control.c:688
+#: calendar/gui/e-itip-control.c:718
 #, fuzzy
 msgid "Every day"
 msgstr "Всеки"
 
-#: calendar/gui/e-itip-control.c:690
+#: calendar/gui/e-itip-control.c:720
 #, fuzzy, c-format
 msgid "Every %d days"
 msgstr "%d дни"
 
-#: calendar/gui/e-itip-control.c:696
+#: calendar/gui/e-itip-control.c:726
 #, fuzzy
 msgid "Every week"
 msgstr "Всеки"
 
-#: calendar/gui/e-itip-control.c:698
+#: calendar/gui/e-itip-control.c:728
 #, fuzzy, c-format
 msgid "Every %d weeks"
 msgstr "%d седмици"
 
-#: calendar/gui/e-itip-control.c:701
+#: calendar/gui/e-itip-control.c:731
 #, fuzzy
 msgid "Every week on "
 msgstr "Евъргриин"
 
-#: calendar/gui/e-itip-control.c:703
+#: calendar/gui/e-itip-control.c:733
 #, fuzzy, c-format
 msgid "Every %d weeks on "
 msgstr "%d седмици"
 
-#: calendar/gui/e-itip-control.c:711
+#: calendar/gui/e-itip-control.c:741
 #, fuzzy
 msgid " and "
 msgstr "Пясък"
 
-#: calendar/gui/e-itip-control.c:718
+#: calendar/gui/e-itip-control.c:748
 #, c-format
 msgid "The %s day of "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:731
+#: calendar/gui/e-itip-control.c:761
 #, c-format
 msgid "The %s %s of "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:736
+#: calendar/gui/e-itip-control.c:766
 #, fuzzy
 msgid "every month"
 msgstr "Един месец"
 
-#: calendar/gui/e-itip-control.c:741
+#: calendar/gui/e-itip-control.c:771
 #, c-format
 msgid "every %d months"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:747
+#: calendar/gui/e-itip-control.c:777
 #, fuzzy
 msgid "Every year"
 msgstr "Всеки"
 
-#: calendar/gui/e-itip-control.c:749
+#: calendar/gui/e-itip-control.c:779
 #, c-format
 msgid "Every %d years"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:761
+#: calendar/gui/e-itip-control.c:791
 #, c-format
 msgid " a total of %d times"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:769
+#: calendar/gui/e-itip-control.c:799
 msgid ", ending on "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:793
+#: calendar/gui/e-itip-control.c:823
 msgid "<b>Starts:</b> "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:803
+#: calendar/gui/e-itip-control.c:833
 #, fuzzy
 msgid "<b>Ends:</b> "
 msgstr "Край: <b>"
 
-#: calendar/gui/e-itip-control.c:823
+#: calendar/gui/e-itip-control.c:853
 #, fuzzy
 msgid "<b>Completed:</b> "
 msgstr "Приключено "
 
-#: calendar/gui/e-itip-control.c:833
+#: calendar/gui/e-itip-control.c:863
 msgid "<b>Due:</b> "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:870 calendar/gui/e-itip-control.c:923
+#: calendar/gui/e-itip-control.c:900 calendar/gui/e-itip-control.c:953
 msgid "iCalendar Information"
 msgstr "iКалендарна информация"
 
 #. Title
-#: calendar/gui/e-itip-control.c:885
+#: calendar/gui/e-itip-control.c:915
 msgid "iCalendar Error"
 msgstr "iКалендар Грешка"
 
-#: calendar/gui/e-itip-control.c:954 calendar/gui/e-itip-control.c:970
-#: calendar/gui/e-itip-control.c:981 calendar/gui/e-itip-control.c:998
+#: calendar/gui/e-itip-control.c:984 calendar/gui/e-itip-control.c:1000
+#: calendar/gui/e-itip-control.c:1011 calendar/gui/e-itip-control.c:1028
 msgid "An unknown person"
 msgstr "Неизвестна личност"
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:1005
+#: calendar/gui/e-itip-control.c:1035
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
@@ -5723,337 +5734,344 @@ msgstr ""
 "<br> Моля, прегледайте следната информация и тогава изберете действие от "
 "долното меню."
 
-#: calendar/gui/e-itip-control.c:1020
+#: calendar/gui/e-itip-control.c:1050
 msgid "<i>None</i>"
 msgstr "<i>Без</i>"
 
-#: calendar/gui/e-itip-control.c:1031
+#: calendar/gui/e-itip-control.c:1061
 #, fuzzy
 msgid "Location:"
 msgstr "_Местонахождение: "
 
 #. write status
-#: calendar/gui/e-itip-control.c:1045 calendar/gui/e-tasks.c:243
+#: calendar/gui/e-itip-control.c:1075 calendar/gui/e-tasks.c:243
 #, fuzzy
 msgid "Status:"
 msgstr "_Статус:"
 
-#: calendar/gui/e-itip-control.c:1050 calendar/gui/itip-utils.c:414
+#: calendar/gui/e-itip-control.c:1080 calendar/gui/e-meeting-model.c:286
+#: calendar/gui/e-meeting-model.c:309 calendar/gui/e-meeting-model.c:798
+#: calendar/gui/itip-utils.c:414
 msgid "Accepted"
 msgstr "Приет"
 
-#: calendar/gui/e-itip-control.c:1054 calendar/gui/itip-utils.c:417
+#: calendar/gui/e-itip-control.c:1084 calendar/gui/itip-utils.c:417
 #, fuzzy
 msgid "Tentatively Accepted"
 msgstr "Временно приема"
 
-#: calendar/gui/e-itip-control.c:1058 calendar/gui/itip-utils.c:420
-#: calendar/gui/itip-utils.c:446
+#: calendar/gui/e-itip-control.c:1088 calendar/gui/e-meeting-model.c:288
+#: calendar/gui/e-meeting-model.c:311 calendar/gui/e-meeting-model.c:799
+#: calendar/gui/itip-utils.c:420 calendar/gui/itip-utils.c:446
 msgid "Declined"
 msgstr "Отказан"
 
-#: calendar/gui/e-itip-control.c:1117 calendar/gui/e-itip-control.c:1145
-#: calendar/gui/e-itip-control.c:1171 calendar/gui/e-itip-control.c:1184
-#: calendar/gui/e-itip-control.c:1197 calendar/gui/e-itip-control.c:1210
+#: calendar/gui/e-itip-control.c:1092 calendar/gui/e-itip-control.c:1300
+#: calendar/gui/e-meeting-model.c:222 calendar/gui/e-meeting-model.c:257
+#: calendar/gui/e-meeting-model.c:322 calendar/gui/e-meeting-model.c:756
+#: calendar/gui/e-meeting-model.c:772 camel/camel-gpg-context.c:1574
+#: camel/camel-gpg-context.c:1625 camel/camel-tcp-stream-openssl.c:631
+#: camel/providers/smtp/camel-smtp-transport.c:172
+#: camel/providers/smtp/camel-smtp-transport.c:227 mail/folder-browser.c:347
+#: mail/mail-display.c:928 widgets/misc/e-charset-picker.c:60
+msgid "Unknown"
+msgstr "Неизвестен"
+
+#: calendar/gui/e-itip-control.c:1147 calendar/gui/e-itip-control.c:1175
+#: calendar/gui/e-itip-control.c:1201 calendar/gui/e-itip-control.c:1214
+#: calendar/gui/e-itip-control.c:1227 calendar/gui/e-itip-control.c:1240
 msgid "Choose an action:"
 msgstr "Избери действие:"
 
-#: calendar/gui/e-itip-control.c:1118
+#: calendar/gui/e-itip-control.c:1148
 msgid "Update"
 msgstr "Обновява"
 
-#: calendar/gui/e-itip-control.c:1119 calendar/gui/e-itip-control.c:1150
-#: calendar/gui/e-itip-control.c:1173 calendar/gui/e-itip-control.c:1186
-#: calendar/gui/e-itip-control.c:1199 calendar/gui/e-itip-control.c:1212
+#: calendar/gui/e-itip-control.c:1149 calendar/gui/e-itip-control.c:1180
+#: calendar/gui/e-itip-control.c:1203 calendar/gui/e-itip-control.c:1216
+#: calendar/gui/e-itip-control.c:1229 calendar/gui/e-itip-control.c:1242
 #: shell/e-shell.c:2067 widgets/misc/e-cell-date-edit.c:265
 msgid "OK"
 msgstr "OK"
 
-#: calendar/gui/e-itip-control.c:1146
+#: calendar/gui/e-itip-control.c:1176
 msgid "Accept"
 msgstr "Приеми"
 
-#: calendar/gui/e-itip-control.c:1147
+#: calendar/gui/e-itip-control.c:1177
 msgid "Tentatively accept"
 msgstr "Временно приема"
 
-#: calendar/gui/e-itip-control.c:1148
+#: calendar/gui/e-itip-control.c:1178
 msgid "Decline"
 msgstr "Откажи"
 
-#: calendar/gui/e-itip-control.c:1149
-#: calendar/gui/e-meeting-time-sel.etspec.h:8
-msgid "RSVP"
-msgstr "RSVP"
-
-#: calendar/gui/e-itip-control.c:1172
+#: calendar/gui/e-itip-control.c:1202
 msgid "Send Free/Busy Information"
 msgstr "Изпрати Информация Свободен/Зает"
 
-#: calendar/gui/e-itip-control.c:1185
+#: calendar/gui/e-itip-control.c:1215
 msgid "Update respondent status"
 msgstr "Обновява статуса на отговарящият"
 
-#: calendar/gui/e-itip-control.c:1198
+#: calendar/gui/e-itip-control.c:1228
 msgid "Send Latest Information"
 msgstr "Изпраща Последната Информация"
 
-#: calendar/gui/e-itip-control.c:1211 calendar/gui/itip-utils.c:434
-#: mail/mail-send-recv.c:388 mail/mail-send-recv.c:440
-#: shell/e-shell-startup-wizard.c:781 shell/evolution-shell-component.c:1185
-#: ui/evolution-mail-global.xml.h:1
+#: calendar/gui/e-itip-control.c:1241 calendar/gui/itip-utils.c:434
+#: mail/mail-send-recv.c:387 mail/mail-send-recv.c:444
+#: shell/evolution-shell-component.c:1185 ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Прекръсва"
 
-#: calendar/gui/e-itip-control.c:1300
+#: calendar/gui/e-itip-control.c:1322
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "<b>%s</b> публикува информация за среща."
 
-#: calendar/gui/e-itip-control.c:1301
+#: calendar/gui/e-itip-control.c:1323
 msgid "Meeting Information"
 msgstr "Информация за Среща"
 
-#: calendar/gui/e-itip-control.c:1306
+#: calendar/gui/e-itip-control.c:1328
 #, fuzzy, c-format
 msgid "<b>%s</b> requests the presence of %s at a meeting."
 msgstr "<b>%s</b> изисква вашето присъствие на срещата."
 
-#: calendar/gui/e-itip-control.c:1308
+#: calendar/gui/e-itip-control.c:1330
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr "<b>%s</b> изисква вашето присъствие на срещата."
 
-#: calendar/gui/e-itip-control.c:1309
+#: calendar/gui/e-itip-control.c:1331
 msgid "Meeting Proposal"
 msgstr "Предложение на срещата:"
 
-#: calendar/gui/e-itip-control.c:1313
+#: calendar/gui/e-itip-control.c:1335
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr "<b>%s</b> желае да бъде добавен на съществуващата среща."
 
-#: calendar/gui/e-itip-control.c:1314
+#: calendar/gui/e-itip-control.c:1336
 msgid "Meeting Update"
 msgstr "Обновяване на срещата:"
 
-#: calendar/gui/e-itip-control.c:1318
+#: calendar/gui/e-itip-control.c:1340
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr "<b>%s</b> желае да получи последната информация за срещата.."
 
-#: calendar/gui/e-itip-control.c:1319
+#: calendar/gui/e-itip-control.c:1341
 msgid "Meeting Update Request"
 msgstr "Заявка за Обновяване на срещата:"
 
-#: calendar/gui/e-itip-control.c:1326
+#: calendar/gui/e-itip-control.c:1348
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr "<b>%s</b> отговори на запитване за срещата."
 
-#: calendar/gui/e-itip-control.c:1327
+#: calendar/gui/e-itip-control.c:1349
 msgid "Meeting Reply"
 msgstr "Отговор на Среща"
 
-#: calendar/gui/e-itip-control.c:1334
+#: calendar/gui/e-itip-control.c:1356
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr "<b>%s</b> прекъсна срещата."
 
-#: calendar/gui/e-itip-control.c:1335
+#: calendar/gui/e-itip-control.c:1357
 msgid "Meeting Cancellation"
 msgstr "Прекъсване на срещата"
 
-#: calendar/gui/e-itip-control.c:1342 calendar/gui/e-itip-control.c:1409
-#: calendar/gui/e-itip-control.c:1444
+#: calendar/gui/e-itip-control.c:1364 calendar/gui/e-itip-control.c:1431
+#: calendar/gui/e-itip-control.c:1466
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr "<b>%s</b> изпрати неразбираемо съобщение."
 
-#: calendar/gui/e-itip-control.c:1343
+#: calendar/gui/e-itip-control.c:1365
 msgid "Bad Meeting Message"
 msgstr "Лошо Съобщение за Среща"
 
-#: calendar/gui/e-itip-control.c:1367
+#: calendar/gui/e-itip-control.c:1389
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr "<b>%s</b> публикува информация за задачата."
 
-#: calendar/gui/e-itip-control.c:1368
+#: calendar/gui/e-itip-control.c:1390
 msgid "Task Information"
 msgstr "Информация за задача"
 
-#: calendar/gui/e-itip-control.c:1373
+#: calendar/gui/e-itip-control.c:1395
 #, fuzzy, c-format
 msgid "<b>%s</b> requests %s to perform a task."
 msgstr "<b>%s</b> изисква вашето участие в задача.."
 
-#: calendar/gui/e-itip-control.c:1375
+#: calendar/gui/e-itip-control.c:1397
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr "<b>%s</b> изисква вашето участие в задача.."
 
-#: calendar/gui/e-itip-control.c:1376
+#: calendar/gui/e-itip-control.c:1398
 msgid "Task Proposal"
 msgstr "Предложение за Задача"
 
-#: calendar/gui/e-itip-control.c:1380
+#: calendar/gui/e-itip-control.c:1402
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task."
 msgstr "<b>%s</b> желае да бъде добавен към съществуваща задача.."
 
-#: calendar/gui/e-itip-control.c:1381
+#: calendar/gui/e-itip-control.c:1403
 msgid "Task Update"
 msgstr "Обновяване на Задача"
 
-#: calendar/gui/e-itip-control.c:1385
+#: calendar/gui/e-itip-control.c:1407
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr "<b>%s</b> желае да получи последната информация за задача.."
 
-#: calendar/gui/e-itip-control.c:1386
+#: calendar/gui/e-itip-control.c:1408
 msgid "Task Update Request"
 msgstr "Заявка за Обновяване на задача"
 
-#: calendar/gui/e-itip-control.c:1393
+#: calendar/gui/e-itip-control.c:1415
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr "<b>%s</b> отговори на включване в задача."
 
-#: calendar/gui/e-itip-control.c:1394
+#: calendar/gui/e-itip-control.c:1416
 msgid "Task Reply"
 msgstr "Отговор на Задача"
 
-#: calendar/gui/e-itip-control.c:1401
+#: calendar/gui/e-itip-control.c:1423
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr "<b>%s</b> прекъсна задача."
 
-#: calendar/gui/e-itip-control.c:1402
+#: calendar/gui/e-itip-control.c:1424
 msgid "Task Cancellation"
 msgstr "Прекъсване на Задача"
 
-#: calendar/gui/e-itip-control.c:1410
+#: calendar/gui/e-itip-control.c:1432
 msgid "Bad Task Message"
 msgstr "Лошо Съобщение за Задача"
 
-#: calendar/gui/e-itip-control.c:1429
+#: calendar/gui/e-itip-control.c:1451
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr "<b>%s</b> публикува информация свободен/зает."
 
-#: calendar/gui/e-itip-control.c:1430
+#: calendar/gui/e-itip-control.c:1452
 msgid "Free/Busy Information"
 msgstr "Информация Свободен/Зает"
 
-#: calendar/gui/e-itip-control.c:1434
+#: calendar/gui/e-itip-control.c:1456
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr "<b>%s</b> изисква от вас информация за свободен/зает."
 
-#: calendar/gui/e-itip-control.c:1435
+#: calendar/gui/e-itip-control.c:1457
 msgid "Free/Busy Request"
 msgstr "Заявка Свободен/Зает"
 
-#: calendar/gui/e-itip-control.c:1439
+#: calendar/gui/e-itip-control.c:1461
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr "<b>%s</b> отговори на заявката свободен/зает."
 
-#: calendar/gui/e-itip-control.c:1440
+#: calendar/gui/e-itip-control.c:1462
 msgid "Free/Busy Reply"
 msgstr "Отговор Свободен/Зает"
 
-#: calendar/gui/e-itip-control.c:1445
+#: calendar/gui/e-itip-control.c:1467
 msgid "Bad Free/Busy Message"
 msgstr "Лошо Свободен/Зает Съобщение"
 
-#: calendar/gui/e-itip-control.c:1521
+#: calendar/gui/e-itip-control.c:1543
 msgid "The message does not appear to be properly formed"
 msgstr "Папката изглежда да е невъстановимо повредена."
 
-#: calendar/gui/e-itip-control.c:1584
+#: calendar/gui/e-itip-control.c:1606
 msgid "The message contains only unsupported requests."
 msgstr "Съобщението съдържа само неподържани заявки."
 
-#: calendar/gui/e-itip-control.c:1615 calendar/gui/e-itip-control.c:1621
+#: calendar/gui/e-itip-control.c:1637 calendar/gui/e-itip-control.c:1643
 msgid "The attachment does not contain a valid calendar message"
 msgstr "Прикаченото не съдържа валидно календар съобщение."
 
-#: calendar/gui/e-itip-control.c:1646
+#: calendar/gui/e-itip-control.c:1668
 msgid "The attachment has no viewable calendar items"
 msgstr "Прикаченото няма видими обекти на календар"
 
-#: calendar/gui/e-itip-control.c:1887 calendar/gui/e-itip-control.c:1948
-#: calendar/gui/e-itip-control.c:1986
+#: calendar/gui/e-itip-control.c:1909 calendar/gui/e-itip-control.c:2001
 msgid "Object is invalid and cannot be updated\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1890 calendar/gui/e-itip-control.c:1989
+#: calendar/gui/e-itip-control.c:1912 calendar/gui/e-itip-control.c:2004
 msgid "There was an error on the CORBA system\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1893 calendar/gui/e-itip-control.c:1992
+#: calendar/gui/e-itip-control.c:1915 calendar/gui/e-itip-control.c:2007
 #, fuzzy
 msgid "Object could not be found\n"
 msgstr "Обекта не може да бъде изпратен!\n"
 
-#: calendar/gui/e-itip-control.c:1896
+#: calendar/gui/e-itip-control.c:1918
 #, fuzzy
 msgid "You do not have the right permissions to update the calendar\n"
 msgstr "Не мога да отворя папка в `%s'"
 
-#: calendar/gui/e-itip-control.c:1899
+#: calendar/gui/e-itip-control.c:1921
 msgid "Update complete\n"
 msgstr "Обновяването приключено\n"
 
-#: calendar/gui/e-itip-control.c:1902
+#: calendar/gui/e-itip-control.c:1924
 msgid "Calendar file could not be updated!\n"
 msgstr "Календарният файл не може да бъде зареден!\n"
 
-#: calendar/gui/e-itip-control.c:1932 calendar/gui/e-itip-control.c:2004
+#: calendar/gui/e-itip-control.c:1953 calendar/gui/e-itip-control.c:2019
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1958
+#: calendar/gui/e-itip-control.c:1974
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1970
+#: calendar/gui/e-itip-control.c:1986
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1995
+#: calendar/gui/e-itip-control.c:2010
 #, fuzzy
 msgid "You don't have the right permissions to update the calendar\n"
 msgstr "Не мога да отворя папка в `%s'"
 
-#: calendar/gui/e-itip-control.c:1998
+#: calendar/gui/e-itip-control.c:2013
 msgid "Attendee status updated\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:2001
+#: calendar/gui/e-itip-control.c:2016
 msgid "Attendee status could not be updated!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:2038
+#: calendar/gui/e-itip-control.c:2053
 msgid "Removal Complete"
 msgstr "Преместването Приключено"
 
-#: calendar/gui/e-itip-control.c:2070 calendar/gui/e-itip-control.c:2120
+#: calendar/gui/e-itip-control.c:2085 calendar/gui/e-itip-control.c:2135
 msgid "Item sent!\n"
 msgstr "Обекта изпратен!\n"
 
-#: calendar/gui/e-itip-control.c:2072 calendar/gui/e-itip-control.c:2124
+#: calendar/gui/e-itip-control.c:2087 calendar/gui/e-itip-control.c:2139
 msgid "The item could not be sent!\n"
 msgstr "Обекта не може да бъде изпратен!\n"
 
-#: calendar/gui/e-itip-control.c:2215
+#: calendar/gui/e-itip-control.c:2212
 #, fuzzy
 msgid "Select Calendar Folder"
 msgstr "Избери Папка"
 
-#: calendar/gui/e-itip-control.c:2221
+#: calendar/gui/e-itip-control.c:2219
 #, fuzzy
 msgid "Select Tasks Folder"
 msgstr "Избери Папка"
@@ -6095,125 +6113,164 @@ msgstr "крайна дата"
 msgid "date-start"
 msgstr "начална дата"
 
-#: calendar/gui/e-meeting-time-sel.c:392
+#: calendar/gui/e-meeting-model.c:79
+msgid "Chair Persons"
+msgstr "Председателствуващ"
+
+#: calendar/gui/e-meeting-model.c:80 calendar/gui/e-meeting-model.c:1636
+msgid "Required Participants"
+msgstr "Членове"
+
+#: calendar/gui/e-meeting-model.c:81
+msgid "Optional Participants"
+msgstr "Допълнителни Членове"
+
+#: calendar/gui/e-meeting-model.c:82
+#, fuzzy
+msgid "Resources"
+msgstr "Ресурс"
+
+#: calendar/gui/e-meeting-model.c:197 calendar/gui/e-meeting-model.c:214
+#: calendar/gui/e-meeting-model.c:530 calendar/gui/e-meeting-model.c:752
+msgid "Individual"
+msgstr "Индивидуално"
+
+#: calendar/gui/e-meeting-model.c:199 calendar/gui/e-meeting-model.c:216
+#: calendar/gui/e-meeting-model.c:753
+msgid "Group"
+msgstr "Група"
+
+#: calendar/gui/e-meeting-model.c:201 calendar/gui/e-meeting-model.c:218
+#: calendar/gui/e-meeting-model.c:754
+msgid "Resource"
+msgstr "Ресурс"
+
+#: calendar/gui/e-meeting-model.c:203 calendar/gui/e-meeting-model.c:220
+#: calendar/gui/e-meeting-model.c:755
+msgid "Room"
+msgstr "Помещение"
+
+#: calendar/gui/e-meeting-model.c:232 calendar/gui/e-meeting-model.c:249
+#: calendar/gui/e-meeting-model.c:768
+msgid "Chair"
+msgstr "Председателствуващ"
+
+#: calendar/gui/e-meeting-model.c:234 calendar/gui/e-meeting-model.c:251
+#: calendar/gui/e-meeting-model.c:532 calendar/gui/e-meeting-model.c:769
+msgid "Required Participant"
+msgstr "Заявен Участник"
+
+#: calendar/gui/e-meeting-model.c:236 calendar/gui/e-meeting-model.c:253
+#: calendar/gui/e-meeting-model.c:770
+msgid "Optional Participant"
+msgstr "Допълнителен Участник"
+
+#: calendar/gui/e-meeting-model.c:238 calendar/gui/e-meeting-model.c:255
+#: calendar/gui/e-meeting-model.c:771
+msgid "Non-Participant"
+msgstr "Не Участник"
+
+#: calendar/gui/e-meeting-model.c:284 calendar/gui/e-meeting-model.c:307
+#: calendar/gui/e-meeting-model.c:540 calendar/gui/e-meeting-model.c:797
+msgid "Needs Action"
+msgstr "Необходими Действия"
+
+#: calendar/gui/e-meeting-model.c:290 calendar/gui/e-meeting-model.c:313
+#: calendar/gui/e-meeting-model.c:800 calendar/gui/e-meeting-time-sel.c:405
 msgid "Tentative"
 msgstr "Пробен"
 
-#: calendar/gui/e-meeting-time-sel.c:394 designs/OOA/ooa.glade.h:11
+#: calendar/gui/e-meeting-model.c:292 calendar/gui/e-meeting-model.c:315
+#: calendar/gui/e-meeting-model.c:801
+msgid "Delegated"
+msgstr "Делегиран"
+
+#: calendar/gui/e-meeting-model.c:296 calendar/gui/e-meeting-model.c:319
+msgid "In Process"
+msgstr "В Прогрес"
+
+#. This is a strftime() format string %A = full weekday name,
+#. %B = full month name, %d = month day, %Y = full year.
+#: calendar/gui/e-meeting-time-sel-item.c:458
+#: calendar/gui/e-meeting-time-sel.c:2098
+msgid "%A, %B %d, %Y"
+msgstr "%A, %B %d, %Y"
+
+#. This is a strftime() format string %a = abbreviated weekday
+#. name, %m = month number, %d = month day, %Y = full year.
+#: calendar/gui/e-meeting-time-sel-item.c:462
+#: calendar/gui/e-meeting-time-sel.c:2131 e-util/e-time-utils.c:190
+#: e-util/e-time-utils.c:283 e-util/e-time-utils.c:371
+msgid "%a %m/%d/%Y"
+msgstr "%a %m/%d/%Y"
+
+#. This is a strftime() format string %m = month number,
+#. %d = month day, %Y = full year.
+#: calendar/gui/e-meeting-time-sel-item.c:466 e-util/e-time-utils.c:225
+#: e-util/e-time-utils.c:286 widgets/misc/e-dateedit.c:1593
+msgid "%m/%d/%Y"
+msgstr "%m/%d/%Y"
+
+#: calendar/gui/e-meeting-time-sel.c:407 designs/OOA/ooa.glade.h:11
 msgid "Out of Office"
 msgstr "Извън Офиса"
 
-#: calendar/gui/e-meeting-time-sel.c:395
+#: calendar/gui/e-meeting-time-sel.c:408
 msgid "No Information"
 msgstr "Няма Информация"
 
-#: calendar/gui/e-meeting-time-sel.c:434
+#: calendar/gui/e-meeting-time-sel.c:447
 msgid "_Options"
 msgstr "_Опций"
 
-#: calendar/gui/e-meeting-time-sel.c:451
+#: calendar/gui/e-meeting-time-sel.c:464
 msgid "Show _Only Working Hours"
 msgstr "Показ_ва само работните часове"
 
-#: calendar/gui/e-meeting-time-sel.c:461
+#: calendar/gui/e-meeting-time-sel.c:474
 msgid "Show _Zoomed Out"
 msgstr "Показва _Намаление"
 
-#: calendar/gui/e-meeting-time-sel.c:476
+#: calendar/gui/e-meeting-time-sel.c:489
 msgid "_Update Free/Busy"
 msgstr "_Обновява Свободен/Зает"
 
-#: calendar/gui/e-meeting-time-sel.c:491
+#: calendar/gui/e-meeting-time-sel.c:504
 msgid "_<<"
 msgstr "_<<"
 
-#: calendar/gui/e-meeting-time-sel.c:509
+#: calendar/gui/e-meeting-time-sel.c:522
 msgid "_Autopick"
 msgstr "_Автизбиране"
 
-#: calendar/gui/e-meeting-time-sel.c:524
+#: calendar/gui/e-meeting-time-sel.c:537
 msgid ">_>"
 msgstr ">_>"
 
-#: calendar/gui/e-meeting-time-sel.c:541
+#: calendar/gui/e-meeting-time-sel.c:554
 msgid "_All People and Resources"
 msgstr "_Всички Хора и Ресурси"
 
-#: calendar/gui/e-meeting-time-sel.c:550
+#: calendar/gui/e-meeting-time-sel.c:563
 msgid "All _People and One Resource"
 msgstr "Вси_чки Хора и Един Ресурс"
 
-#: calendar/gui/e-meeting-time-sel.c:559
+#: calendar/gui/e-meeting-time-sel.c:572
 msgid "_Required People"
 msgstr "_Заявени Хора"
 
-#: calendar/gui/e-meeting-time-sel.c:568
+#: calendar/gui/e-meeting-time-sel.c:581
 msgid "Required People and _One Resource"
 msgstr "Ьаявени Хора и _Един Ресурс"
 
-#: calendar/gui/e-meeting-time-sel.c:587
+#: calendar/gui/e-meeting-time-sel.c:600
 msgid "Meeting _start time:"
 msgstr "Начяло на срещата:"
 
-#: calendar/gui/e-meeting-time-sel.c:607
+#: calendar/gui/e-meeting-time-sel.c:620
 msgid "Meeting _end time:"
 msgstr "Край на срещата:"
 
-#. This is a strftime() format string %A = full weekday name,
-#. %B = full month name, %d = month day, %Y = full year.
-#: calendar/gui/e-meeting-time-sel.c:2054
-#: calendar/gui/e-meeting-time-sel-item.c:452
-msgid "%A, %B %d, %Y"
-msgstr "%A, %B %d, %Y"
-
-#. This is a strftime() format string %a = abbreviated weekday name,
-#. %m = month number, %d = month day, %Y = full year.
-#: calendar/gui/e-meeting-time-sel.c:2087
-#: calendar/gui/e-meeting-time-sel-item.c:456 e-util/e-time-utils.c:203
-#: e-util/e-time-utils.c:296 e-util/e-time-utils.c:384
-msgid "%a %m/%d/%Y"
-msgstr "%a %m/%d/%Y"
-
-#: calendar/gui/e-meeting-time-sel.etspec.h:1
-msgid "Attendee"
-msgstr ""
-
-#: calendar/gui/e-meeting-time-sel.etspec.h:2
-#, fuzzy
-msgid "Click here to add an attendee"
-msgstr "* Натиснете тук за да добавите контакт *"
-
-#: calendar/gui/e-meeting-time-sel.etspec.h:3
-msgid "Common Name"
-msgstr "Общо име"
-
-#: calendar/gui/e-meeting-time-sel.etspec.h:4
-msgid "Delegated From"
-msgstr "Делегиран От"
-
-#: calendar/gui/e-meeting-time-sel.etspec.h:5
-msgid "Delegated To"
-msgstr "Делегиран На"
-
-#: calendar/gui/e-meeting-time-sel.etspec.h:6
-msgid "Language"
-msgstr "Език"
-
-#: calendar/gui/e-meeting-time-sel.etspec.h:7
-msgid "Member"
-msgstr "Член"
-
-#. This is a strftime() format string %m = month number,
-#. %d = month day, %Y = full year.
-#: calendar/gui/e-meeting-time-sel-item.c:460 e-util/e-time-utils.c:238
-#: e-util/e-time-utils.c:299 widgets/misc/e-dateedit.c:1607
-msgid "%m/%d/%Y"
-msgstr "%m/%d/%Y"
-
-#: calendar/gui/e-tasks.c:151
-msgid "invalid time"
-msgstr "грешно време"
-
 #: calendar/gui/e-tasks.c:221
 #, fuzzy
 msgid "Start Date:"
@@ -6236,7 +6293,8 @@ msgstr "_Приоритет:"
 msgid "Web Page:"
 msgstr "Страница"
 
-#: calendar/gui/e-tasks.c:702
+#: calendar/gui/e-tasks.c:702 calendar/gui/gnome-cal.c:2210
+#: calendar/gui/gnome-cal.c:2221
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Отваряне на задачи в %s"
@@ -6251,12 +6309,12 @@ msgstr "Не мога да заредя задачи в `%s'"
 msgid "The method required to load `%s' is not supported"
 msgstr "Метода заявен за зареждане на `%s' не се подържа"
 
-#: calendar/gui/e-tasks.c:760 calendar/gui/gnome-cal.c:1730
+#: calendar/gui/e-tasks.c:760 calendar/gui/gnome-cal.c:1713
 #, fuzzy, c-format
 msgid "You don't have permission to open the folder in `%s'"
 msgstr "Не мога да отворя папка в `%s'"
 
-#: calendar/gui/e-tasks.c:828 calendar/gui/gnome-cal.c:1944
+#: calendar/gui/e-tasks.c:828 calendar/gui/gnome-cal.c:1932
 #, fuzzy, c-format
 msgid ""
 "Error on %s:\n"
@@ -6278,101 +6336,61 @@ msgstr "Изтрий избраните обекти"
 msgid "Expunging"
 msgstr "Изтриване на папка"
 
-#: calendar/gui/gnome-cal.c:1702
+#: calendar/gui/e-week-view.c:3648
+msgid "New _Appointment..."
+msgstr "Нова _Среща..."
+
+#: calendar/gui/gnome-cal.c:1685
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr "Не мога да отворя папка в `%s'"
 
-#: calendar/gui/gnome-cal.c:1716
+#: calendar/gui/gnome-cal.c:1699
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr "Метода заявен за отваряне на `%s' не се подържа"
 
-#: calendar/gui/gnome-cal.c:1772
+#: calendar/gui/gnome-cal.c:1760
 #, fuzzy, c-format
 msgid "Adding alarms for %s"
 msgstr "Аларма на %s"
 
-#: calendar/gui/gnome-cal.c:1964
+#: calendar/gui/gnome-cal.c:1952
 #, c-format
 msgid ""
-"The task backend for\n"
+"The calendar backend for\n"
 "%s\n"
 " has crashed. You will have to restart Evolution in order to use it again"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1970
+#: calendar/gui/gnome-cal.c:1961
 #, c-format
 msgid ""
-"The calendar backend for\n"
+"The task backend for\n"
 "%s\n"
 " has crashed. You will have to restart Evolution in order to use it again"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:2176
+#: calendar/gui/gnome-cal.c:2192
 #, c-format
 msgid "Opening calendar at %s"
 msgstr "Отвори календар в %s"
 
-#: calendar/gui/gnome-cal.c:2197
+#: calendar/gui/gnome-cal.c:2232
 #, fuzzy
 msgid "Opening default tasks folder"
 msgstr "Отваряне на папка %s"
 
-#: calendar/gui/gnome-cal.c:3094
+#: calendar/gui/gnome-cal.c:3156
 #, fuzzy, c-format
 msgid "Purging event %s"
 msgstr "Сканира на \"%s\""
 
-#: calendar/gui/gnome-cal.c:3178
+#: calendar/gui/gnome-cal.c:3237
 #, fuzzy
 msgid "Purging"
 msgstr "Торино"
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-#, fuzzy
-msgid "Calendar and Tasks"
-msgstr "Настройки на Календар и Задачи"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-msgid "Configure your timezone, Calendar and Task List here "
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
-#, fuzzy
-msgid "Evolution Calendar and Tasks"
-msgstr "Настройки на Календар и Задачи"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
-#, fuzzy
-msgid "Evolution Calendar and Tasks component"
-msgstr "Компонент на Evolution за показване на пощенски папки"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
-#, fuzzy
-msgid "Evolution Calendar configuration control"
-msgstr "Фабрика за контрол на задачи в Evolution"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
-#, fuzzy
-msgid "Evolution Calendar scheduling message viewer"
-msgstr "Календар на Evolution iTip/iMip преглед"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
-#, fuzzy
-msgid "Evolution Calendar viewer"
-msgstr "Календар на Evolution iTip/iMip преглед"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
-#, fuzzy
-msgid "Evolution Calendar/Task editor"
-msgstr "Evolution - Редактор на Новини"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
-#, fuzzy
-msgid "Evolution Tasks viewer"
-msgstr "Evolution - Редактор на Новини"
-
 #: calendar/gui/goto-dialog.glade.h:1
 msgid "April"
 msgstr "Април"
@@ -6481,7 +6499,7 @@ msgstr "Информация Свободен/Зает (%s на %s)"
 msgid "iCalendar information"
 msgstr "iКалендарна информация"
 
-#: calendar/gui/itip-utils.c:668
+#: calendar/gui/itip-utils.c:667
 msgid "You must be an attendee of the event."
 msgstr "Вие трябва да сте участни на събирието."
 
@@ -6514,81 +6532,82 @@ msgid "Sa"
 msgstr "Сб"
 
 #. Day
-#: calendar/gui/print.c:1882
+#: calendar/gui/print.c:1875
 msgid "Selected day (%a %b %d %Y)"
 msgstr "Избран ден (%a %b %d %Y)"
 
-#: calendar/gui/print.c:1907 calendar/gui/print.c:1911
+#: calendar/gui/print.c:1900 calendar/gui/print.c:1904
 msgid "%a %b %d"
 msgstr "%a %b %d"
 
-#: calendar/gui/print.c:1908
+#: calendar/gui/print.c:1901
 msgid "%a %d %Y"
 msgstr "%a %d %Y"
 
-#: calendar/gui/print.c:1912 calendar/gui/print.c:1914
-#: calendar/gui/print.c:1915
+#: calendar/gui/print.c:1905 calendar/gui/print.c:1907
+#: calendar/gui/print.c:1908
 msgid "%a %b %d %Y"
 msgstr "%a %b %d %Y"
 
-#: calendar/gui/print.c:1919
+#: calendar/gui/print.c:1912
 #, c-format
 msgid "Selected week (%s - %s)"
 msgstr "Избрана седмица (%s - %s)"
 
 #. Month
-#: calendar/gui/print.c:1927
+#: calendar/gui/print.c:1920
 msgid "Selected month (%b %Y)"
 msgstr "Избран месец (%b %Y)"
 
 #. Year
-#: calendar/gui/print.c:1934
+#: calendar/gui/print.c:1927
 msgid "Selected year (%Y)"
 msgstr "Избрана година (%Y)"
 
-#: calendar/gui/print.c:2262
+#: calendar/gui/print.c:2255
 msgid "Task"
 msgstr "Задача"
 
-#: calendar/gui/print.c:2321
+#: calendar/gui/print.c:2314
 #, c-format
 msgid "Status: %s"
 msgstr "Статус: %s"
 
-#: calendar/gui/print.c:2338
+#: calendar/gui/print.c:2331
 #, c-format
 msgid "Priority: %s"
 msgstr "Приоритет: %s"
 
-#: calendar/gui/print.c:2350
+#: calendar/gui/print.c:2343
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "Приключено в проценти: %i"
 
-#: calendar/gui/print.c:2362
+#: calendar/gui/print.c:2355
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: calendar/gui/print.c:2376
+#: calendar/gui/print.c:2369
 #, c-format
 msgid "Categories: %s"
 msgstr "Категории: %s"
 
-#: calendar/gui/print.c:2387
+#: calendar/gui/print.c:2380
 msgid "Contacts: "
 msgstr "Контакти:"
 
-#: calendar/gui/print.c:2525 calendar/gui/print.c:2611
-#: calendar/gui/tasks-control.c:564 my-evolution/e-summary.c:649
+#: calendar/gui/print.c:2518 calendar/gui/print.c:2604
+#: calendar/gui/tasks-control.c:564 mail/mail-callbacks.c:2948
+#: my-evolution/e-summary.c:649
 msgid "Print Preview"
 msgstr "Печатен Преглед"
 
-#: calendar/gui/print.c:2559
+#: calendar/gui/print.c:2552
 msgid "Print Item"
 msgstr "Печат на Обект"
 
-#: calendar/gui/print.c:2632
+#: calendar/gui/print.c:2625
 msgid "Print Setup"
 msgstr "Печатни Настройки..."
 
@@ -8378,11 +8397,7 @@ msgstr ""
 msgid "Resynchronizing with server"
 msgstr "Ресинхронизира със сървър"
 
-#: camel/camel-disco-folder.c:90
-msgid "Downloading new messages for offline mode"
-msgstr ""
-
-#: camel/camel-disco-folder.c:351
+#: camel/camel-disco-folder.c:278
 #, fuzzy, c-format
 msgid "Preparing folder '%s' for offline"
 msgstr "Запазване на папка %s"
@@ -8403,57 +8418,57 @@ msgstr "Неуспех при кеширане на съобщение %s: %s"
 msgid "Failed to create create child process '%s': %s"
 msgstr "Неуспех при кеширане на съобщение %s: %s"
 
-#: camel/camel-filter-driver.c:759
+#: camel/camel-filter-driver.c:744
 #, fuzzy, c-format
 msgid "Invalid message stream received from %s: %s"
 msgstr "Не мога да създам директория %s: %s"
 
-#: camel/camel-filter-driver.c:940 camel/camel-filter-driver.c:949
+#: camel/camel-filter-driver.c:923 camel/camel-filter-driver.c:932
 msgid "Syncing folders"
 msgstr "Синхронизиране на папки"
 
-#: camel/camel-filter-driver.c:1038 camel/camel-filter-driver.c:1411
+#: camel/camel-filter-driver.c:1021 camel/camel-filter-driver.c:1394
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Грешка при работа с филтър: %s: %s"
 
-#: camel/camel-filter-driver.c:1047 camel/camel-filter-driver.c:1417
+#: camel/camel-filter-driver.c:1030 camel/camel-filter-driver.c:1400
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Грешка при изпълнение на филтър: %s: %s"
 
-#: camel/camel-filter-driver.c:1114
+#: camel/camel-filter-driver.c:1097
 msgid "Unable to open spool folder"
 msgstr "Не мога да отворя spool папка"
 
-#: camel/camel-filter-driver.c:1123
+#: camel/camel-filter-driver.c:1106
 msgid "Unable to process spool folder"
 msgstr "Не мога да обработя spool папка"
 
-#: camel/camel-filter-driver.c:1138
+#: camel/camel-filter-driver.c:1121
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "Получаване на съобщение номер %d (%d%%)"
 
-#: camel/camel-filter-driver.c:1142
+#: camel/camel-filter-driver.c:1125
 msgid "Cannot open message"
 msgstr "Не мога да отворя съобщение"
 
-#: camel/camel-filter-driver.c:1143 camel/camel-filter-driver.c:1155
+#: camel/camel-filter-driver.c:1126 camel/camel-filter-driver.c:1138
 #, c-format
 msgid "Failed on message %d"
 msgstr "Грешка на съобщение %d"
 
-#: camel/camel-filter-driver.c:1169 camel/camel-filter-driver.c:1263
+#: camel/camel-filter-driver.c:1152 camel/camel-filter-driver.c:1246
 msgid "Syncing folder"
 msgstr "Синхронизиране на папка"
 
-#: camel/camel-filter-driver.c:1230
+#: camel/camel-filter-driver.c:1213
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "Получаване на съобщение номер %d от %d"
 
-#: camel/camel-filter-driver.c:1245
+#: camel/camel-filter-driver.c:1228
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "Грешка на съобщение - %d от %d"
@@ -8478,36 +8493,7 @@ msgstr "Грешни аргументи"
 msgid "Error executing filter search: %s: %s"
 msgstr "Грешка при търсене на филтър: %s: %s"
 
-#: camel/camel-folder.c:585
-#, c-format
-msgid "Unsupported operation: append message: for %s"
-msgstr "Неподържана операция: добавяне на съобщение за %s"
-
-#: camel/camel-folder.c:1163
-#, c-format
-msgid "Unsupported operation: search by expression: for %s"
-msgstr "Неподържана операция: търсене по израз: за %s"
-
-#: camel/camel-folder.c:1203
-#, c-format
-msgid "Unsupported operation: search by uids: for %s"
-msgstr "Неподържана операция: търсене по uids: за %s"
-
-#: camel/camel-folder.c:1321
-msgid "Moving messages"
-msgstr "Премести съобщения"
-
-#: camel/camel-folder.c:1321
-#, fuzzy
-msgid "Copying messages"
-msgstr "Копиране на съобщението в %s"
-
-#: camel/camel-folder.c:1571
-#, fuzzy
-msgid "Filtering new message(s)"
-msgstr "Получавам %d съобщение"
-
-#: camel/camel-folder-search.c:348
+#: camel/camel-folder-search.c:347
 #, c-format
 msgid ""
 "Cannot parse search expression: %s:\n"
@@ -8516,7 +8502,7 @@ msgstr ""
 "немога да анализирам търсеният израз: %s:\n"
 "%s"
 
-#: camel/camel-folder-search.c:358
+#: camel/camel-folder-search.c:357
 #, c-format
 msgid ""
 "Error executing search expression: %s:\n"
@@ -8525,15 +8511,39 @@ msgstr ""
 "Грешка при изпълнение търсене на израз: %s:\n"
 "%s"
 
-#: camel/camel-folder-search.c:569 camel/camel-folder-search.c:598
+#: camel/camel-folder-search.c:574 camel/camel-folder-search.c:602
 msgid "(match-all) requires a single bool result"
 msgstr "(съвпадение на всичи) изисква единичен булев резулат"
 
-#: camel/camel-folder-search.c:650
+#: camel/camel-folder-search.c:654
 #, c-format
 msgid "Performing query on unknown header: %s"
 msgstr ""
 
+#: camel/camel-folder.c:583
+#, c-format
+msgid "Unsupported operation: append message: for %s"
+msgstr "Неподържана операция: добавяне на съобщение за %s"
+
+#: camel/camel-folder.c:1161
+#, c-format
+msgid "Unsupported operation: search by expression: for %s"
+msgstr "Неподържана операция: търсене по израз: за %s"
+
+#: camel/camel-folder.c:1201
+#, c-format
+msgid "Unsupported operation: search by uids: for %s"
+msgstr "Неподържана операция: търсене по uids: за %s"
+
+#: camel/camel-folder.c:1319
+msgid "Moving messages"
+msgstr "Премести съобщения"
+
+#: camel/camel-folder.c:1319
+#, fuzzy
+msgid "Copying messages"
+msgstr "Копиране на съобщението в %s"
+
 #: camel/camel-gpg-context.c:762
 #, c-format
 msgid ""
@@ -8559,7 +8569,7 @@ msgstr ""
 
 #: camel/camel-gpg-context.c:821 camel/camel-gpg-context.c:1297
 #: camel/camel-gpg-context.c:1403 camel/camel-gpg-context.c:1473
-#: camel/camel-gpg-context.c:1529 mail/mail-send-recv.c:574
+#: camel/camel-gpg-context.c:1529 mail/mail-send-recv.c:577
 msgid "Cancelled."
 msgstr "Прекратено."
 
@@ -8614,6 +8624,26 @@ msgstr "Неуспех при декодиране на съобщението"
 msgid "Cannot verify message signature: could not create temp file: %s"
 msgstr "Не мога да проверя съобщението: не мога да създам временен файл: %s"
 
+#: camel/camel-lock-client.c:100
+#, c-format
+msgid "Cannot build locking helper pipe: %s"
+msgstr ""
+
+#: camel/camel-lock-client.c:113
+#, c-format
+msgid "Cannot fork locking helper: %s"
+msgstr ""
+
+#: camel/camel-lock-client.c:191 camel/camel-lock-client.c:214
+#, c-format
+msgid "Could not lock '%s': protocol error with lock-helper"
+msgstr ""
+
+#: camel/camel-lock-client.c:204
+#, c-format
+msgid "Could not lock '%s'"
+msgstr "Не мога да заключа '%s'"
+
 #: camel/camel-lock.c:92 camel/camel-lock.c:113
 #, c-format
 msgid "Could not create lock file for %s: %s"
@@ -8636,26 +8666,6 @@ msgstr "Неуспех при получаване на lock използвай�
 msgid "Failed to get lock using flock(2): %s"
 msgstr "Неуспех при получаване на lock използвайки flcntl(2): %s"
 
-#: camel/camel-lock-client.c:100
-#, c-format
-msgid "Cannot build locking helper pipe: %s"
-msgstr ""
-
-#: camel/camel-lock-client.c:113
-#, c-format
-msgid "Cannot fork locking helper: %s"
-msgstr ""
-
-#: camel/camel-lock-client.c:191 camel/camel-lock-client.c:214
-#, c-format
-msgid "Could not lock '%s': protocol error with lock-helper"
-msgstr ""
-
-#: camel/camel-lock-client.c:204
-#, c-format
-msgid "Could not lock '%s'"
-msgstr "Не мога да заключа '%s'"
-
 #: camel/camel-movemail.c:107
 #, c-format
 msgid "Could not check mail file %s: %s"
@@ -8722,11 +8732,11 @@ msgstr ""
 msgid "Failed to decrypt MIME part: parse error"
 msgstr ""
 
-#: camel/camel-multipart-signed.c:646
+#: camel/camel-multipart-signed.c:644
 msgid "This is a digitally signed message part"
 msgstr ""
 
-#: camel/camel-multipart-signed.c:700
+#: camel/camel-multipart-signed.c:698
 #, fuzzy
 msgid "parse error"
 msgstr "Друга грешка"
@@ -8895,7 +8905,7 @@ msgstr ""
 #: camel/camel-sasl-gssapi.c:189 camel/camel-sasl-gssapi.c:238
 #: camel/camel-sasl-gssapi.c:274 camel/camel-sasl-gssapi.c:289
 #: camel/camel-sasl-kerberos4.c:219
-#: camel/providers/imap/camel-imap-store.c:1207
+#: camel/providers/imap/camel-imap-store.c:1053
 msgid "Bad authentication response from server."
 msgstr "Грешна оторизация отговори сървъра."
 
@@ -8999,55 +9009,55 @@ msgstr "URL '%s' се нуждае от компонент път"
 msgid "Resolving: %s"
 msgstr "Анализирам: %s"
 
-#: camel/camel-service.c:769 camel/camel-service.c:893
+#: camel/camel-service.c:768 camel/camel-service.c:891
 #, c-format
 msgid "Failure in name lookup: %s"
 msgstr "Неуспех при търсене наиме %s"
 
-#: camel/camel-service.c:790 camel/camel-service.c:914
+#: camel/camel-service.c:789
 #, fuzzy, c-format
 msgid "Host lookup failed: cannot create thread: %s"
 msgstr "Търсенето на хост пропадна: %s: неизвестна причина"
 
-#: camel/camel-service.c:803
+#: camel/camel-service.c:802
 #, c-format
 msgid "Host lookup failed: %s: host not found"
 msgstr "Търсенето на хост пропадна: %s: хоста не е намерен"
 
-#: camel/camel-service.c:806
+#: camel/camel-service.c:805
 #, c-format
 msgid "Host lookup failed: %s: unknown reason"
 msgstr "Търсенето на хост пропадна: %s: неизвестна причина"
 
-#: camel/camel-service.c:860
+#: camel/camel-service.c:859
 #, fuzzy
 msgid "Resolving address"
 msgstr "Анализирам: %s"
 
-#: camel/camel-service.c:929
+#: camel/camel-service.c:924
 #, fuzzy
 msgid "Host lookup failed: host not found"
 msgstr "Търсенето на хост пропадна: %s: хоста не е намерен"
 
-#: camel/camel-service.c:932
+#: camel/camel-service.c:927
 #, fuzzy
 msgid "Host lookup failed: unknown reason"
 msgstr "Търсенето на хост пропадна: %s: неизвестна причина"
 
-#: camel/camel-session.c:75
+#: camel/camel-session.c:74
 msgid "Virtual folder email provider"
 msgstr ""
 
-#: camel/camel-session.c:77
+#: camel/camel-session.c:76
 msgid "For reading mail as a query of another set of folders"
 msgstr ""
 
-#: camel/camel-session.c:350 camel/camel-session.c:400
+#: camel/camel-session.c:348 camel/camel-session.c:398
 #, c-format
 msgid "No provider available for protocol `%s'"
 msgstr "Няма наличен доставчик за протокол `%s'"
 
-#: camel/camel-session.c:523
+#: camel/camel-session.c:521
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -9228,7 +9238,7 @@ msgstr ""
 msgid "Error in application verification"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:696 camel/camel-tcp-stream-ssl.c:831
+#: camel/camel-tcp-stream-openssl.c:696 camel/camel-tcp-stream-ssl.c:823
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -9237,11 +9247,11 @@ msgid ""
 "Signature:         %s"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:837
+#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:829
 msgid "GOOD"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:837
+#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:829
 msgid "BAD"
 msgstr ""
 
@@ -9263,7 +9273,7 @@ msgstr ""
 "Искате ли да приемете въпреки това?"
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:841
+#: camel/camel-tcp-stream-ssl.c:833
 #, fuzzy, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -9278,35 +9288,35 @@ msgstr ""
 "\n"
 "Искате ли да приемете въпреки това?"
 
-#: camel/camel-tcp-stream-ssl.c:885
+#: camel/camel-tcp-stream-ssl.c:877
 #, c-format
 msgid ""
 "Certificate problem: %s\n"
 "Issuer: %s"
 msgstr ""
 
-#: camel/camel-tcp-stream-ssl.c:937
+#: camel/camel-tcp-stream-ssl.c:929
 #, c-format
 msgid ""
 "Bad certificate domain: %s\n"
 "Issuer: %s"
 msgstr ""
 
-#: camel/camel-tcp-stream-ssl.c:955
+#: camel/camel-tcp-stream-ssl.c:947
 #, fuzzy, c-format
 msgid ""
 "Certificate expired: %s\n"
 "Issuer: %s"
 msgstr "_Сертифициран ID:"
 
-#: camel/camel-tcp-stream-ssl.c:972
+#: camel/camel-tcp-stream-ssl.c:964
 #, fuzzy, c-format
 msgid ""
 "Certificate revocation list expired: %s\n"
 "Issuer: %s"
 msgstr "_Сертифициран ID:"
 
-#: camel/camel-url.c:290 mail/mail-tools.c:143
+#: camel/camel-url.c:289 mail/mail-tools.c:143
 #, c-format
 msgid "Could not parse URL `%s'"
 msgstr "Не мога да анализирам URL `%s'"
@@ -9349,12 +9359,12 @@ msgstr "Не мога да преименувам папката %s Няма т�
 #: camel/providers/imap/camel-imap-command.c:221
 #: camel/providers/imap/camel-imap-command.c:260
 #: camel/providers/imap/camel-imap-command.c:450
-#: camel/providers/imap/camel-imap-store.c:2806
+#: camel/providers/imap/camel-imap-store.c:2645
 msgid "Operation cancelled"
 msgstr "Действието прекратено"
 
 #: camel/providers/imap/camel-imap-command.c:305
-#: camel/providers/imap/camel-imap-store.c:2809
+#: camel/providers/imap/camel-imap-store.c:2648
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "Сървъра неочаквано се откачи: %s"
@@ -9419,7 +9429,7 @@ msgstr "Неуспех при декодиране на съобщението"
 #: camel/providers/local/camel-maildir-folder.c:211
 #: camel/providers/local/camel-maildir-folder.c:224
 #: camel/providers/local/camel-maildir-folder.c:233
-#: camel/providers/local/camel-mbox-folder.c:422
+#: camel/providers/local/camel-mbox-folder.c:350
 #: camel/providers/local/camel-mh-folder.c:200
 #: camel/providers/local/camel-mh-folder.c:210
 #: camel/providers/local/camel-mh-folder.c:219
@@ -9433,7 +9443,7 @@ msgstr ""
 
 #: camel/providers/imap/camel-imap-folder.c:1923
 #: camel/providers/local/camel-maildir-folder.c:211
-#: camel/providers/local/camel-mbox-folder.c:422
+#: camel/providers/local/camel-mbox-folder.c:350
 #: camel/providers/local/camel-mh-folder.c:200
 msgid "No such message"
 msgstr "Няма такова съобщение"
@@ -9498,105 +9508,89 @@ msgstr "Място за име"
 msgid "Apply filters to new messages in INBOX on this server"
 msgstr "Използва филтри за нови съобщения в INBOX от този сървър"
 
-#: camel/providers/imap/camel-imap-provider.c:59
-#, fuzzy
-msgid "Automatically synchronize remote mail locally"
-msgstr "_Автоматична проверка за нов email"
-
-#: camel/providers/imap/camel-imap-provider.c:65
+#: camel/providers/imap/camel-imap-provider.c:63
 msgid "IMAP"
 msgstr "IMAP"
 
-#: camel/providers/imap/camel-imap-provider.c:67
+#: camel/providers/imap/camel-imap-provider.c:65
 msgid "For reading and storing mail on IMAP servers."
 msgstr "За четене и запазване на поща от IMAP сървъри"
 
-#: camel/providers/imap/camel-imap-provider.c:82
-#: camel/providers/imapp/camel-imapp-provider.c:65
+#: camel/providers/imap/camel-imap-provider.c:80
 #: camel/providers/nntp/camel-nntp-store.c:265
 #: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:83
 msgid "Password"
 msgstr "Парола"
 
-#: camel/providers/imap/camel-imap-provider.c:84
-#: camel/providers/imapp/camel-imapp-provider.c:67
+#: camel/providers/imap/camel-imap-provider.c:82
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr "Тази опция ще ви свърже с IMAP сървър използващ нешифрована парола"
 
-#: camel/providers/imap/camel-imap-store.c:459
+#: camel/providers/imap/camel-imap-store.c:457
 #, fuzzy, c-format
 msgid "IMAP server %s"
 msgstr "SMTP сървър %s"
 
-#: camel/providers/imap/camel-imap-store.c:461
+#: camel/providers/imap/camel-imap-store.c:459
 #, fuzzy, c-format
 msgid "IMAP service for %s on %s"
 msgstr "%s услуга за %s на %s"
 
-#: camel/providers/imap/camel-imap-store.c:589
-#: camel/providers/imap/camel-imap-store.c:821
-#: camel/providers/imapp/camel-imapp-store.c:233
+#: camel/providers/imap/camel-imap-store.c:587
 #: camel/providers/nntp/camel-nntp-store.c:128
 #: camel/providers/nntp/camel-nntp-store.c:146
 #: camel/providers/pop3/camel-pop3-store.c:184
 msgid "Connection cancelled"
 msgstr "Връзкрата прекратена"
 
-#: camel/providers/imap/camel-imap-store.c:592
-#: camel/providers/imapp/camel-imapp-store.c:236
+#: camel/providers/imap/camel-imap-store.c:590
 #: camel/providers/nntp/camel-nntp-store.c:131
 #: camel/providers/smtp/camel-smtp-transport.c:275
 #, c-format
 msgid "Could not connect to %s (port %d): %s"
 msgstr "Не мога да се свържа към  %s (порт %d): %s"
 
-#: camel/providers/imap/camel-imap-store.c:655
-#: camel/providers/imap/camel-imap-store.c:686
+#: camel/providers/imap/camel-imap-store.c:650
+#: camel/providers/imap/camel-imap-store.c:681
 #, fuzzy, c-format
 msgid "Failed to connect to IMAP server %s in secure mode: %s"
 msgstr ""
 "Не мога да се свържа с POP сърър.\n"
 "Грешно изпратено име на потребител %s"
 
-#: camel/providers/imap/camel-imap-store.c:656
+#: camel/providers/imap/camel-imap-store.c:651
 #: camel/providers/pop3/camel-pop3-store.c:220
 #, fuzzy
 msgid "SSL/TLS extension not supported."
 msgstr "Операцията не се подържа"
 
-#: camel/providers/imap/camel-imap-store.c:687
+#: camel/providers/imap/camel-imap-store.c:682
 #: camel/providers/pop3/camel-pop3-store.c:261
 #, fuzzy
 msgid "SSL negotiations failed"
 msgstr "Оторизацията пропадна"
 
-#: camel/providers/imap/camel-imap-store.c:824
-#, fuzzy, c-format
-msgid "Could not connect with command \"%s\": %s"
-msgstr "Не мога да се свържа към сървър %s"
-
-#: camel/providers/imap/camel-imap-store.c:1237
+#: camel/providers/imap/camel-imap-store.c:1076
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr "IMAP сървър %s не подържа заявената оторизация тип %s"
 
-#: camel/providers/imap/camel-imap-store.c:1247
+#: camel/providers/imap/camel-imap-store.c:1086
 #: camel/providers/smtp/camel-smtp-transport.c:485
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "Няма подръжка за оторизация тип %s"
 
-#: camel/providers/imap/camel-imap-store.c:1270
-#: camel/providers/imapp/camel-imapp-store.c:349
+#: camel/providers/imap/camel-imap-store.c:1109
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr "%sМоля въведете IMAP паролата за %s@%s"
 
-#: camel/providers/imap/camel-imap-store.c:1284
+#: camel/providers/imap/camel-imap-store.c:1123
 msgid "You didn't enter a password."
 msgstr "Вие не сте въвели парола."
 
-#: camel/providers/imap/camel-imap-store.c:1313
+#: camel/providers/imap/camel-imap-store.c:1152
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -9607,70 +9601,42 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:1660
-#: camel/providers/imap/camel-imap-store.c:1802
+#: camel/providers/imap/camel-imap-store.c:1499
+#: camel/providers/imap/camel-imap-store.c:1641
 #, c-format
 msgid "No such folder %s"
 msgstr "Няма такава папка %s"
 
-#: camel/providers/imap/camel-imap-store.c:2003
+#: camel/providers/imap/camel-imap-store.c:1842
 #, fuzzy, c-format
 msgid ""
 "The folder name \"%s\" is invalid because it containes the character \"%c\""
 msgstr "В името на папката не може да се съдържа символа 'Return'"
 
-#: camel/providers/imap/camel-imap-store.c:2015
+#: camel/providers/imap/camel-imap-store.c:1854
 #, fuzzy, c-format
 msgid "Unknown parent folder: %s"
 msgstr "Неизвестна грешка: %s"
 
-#: camel/providers/imap/camel-imap-store.c:2051
+#: camel/providers/imap/camel-imap-store.c:1890
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "На бащината папка не е разрешено да има подпапки"
 
-#: camel/providers/imapp/camel-imapp-provider.c:39
-#: camel/providers/pop3/camel-pop3-provider.c:38
-msgid "Message storage"
-msgstr "Хранилище на съобщение"
-
-#: camel/providers/imapp/camel-imapp-provider.c:47
-#, fuzzy
-msgid "IMAP+"
-msgstr "IMAP"
-
-#: camel/providers/imapp/camel-imapp-provider.c:49
-msgid ""
-"Experimental IMAP 4(.1) client\n"
-"This is untested and unsupported code, you want to use plain imap instead.\n"
-"\n"
-" !!! DO NOT USE THIS FOR PRODUCTION EMAIL  !!!\n"
-msgstr ""
-
-#: camel/providers/imapp/camel-imapp-store.c:333
-#, fuzzy, c-format
-msgid "Could not connect to POP server on %s"
-msgstr "Не мога да се свържа към POP сървър %s."
-
-#: camel/providers/local/camel-local-folder.c:179
-#, fuzzy
-msgid "Index message body data"
-msgstr "Изпрати съобщение към контакт"
-
 #. $HOME relative path + protocol string
-#: camel/providers/local/camel-local-folder.c:379
+#: camel/providers/local/camel-local-folder.c:353
 #, fuzzy, c-format
 msgid "~%s (%s)"
 msgstr "%s (%d)"
 
 #. /var/spool/mail relative path + protocol
-#: camel/providers/local/camel-local-folder.c:383
-#: camel/providers/local/camel-local-folder.c:386
+#: camel/providers/local/camel-local-folder.c:357
+#: camel/providers/local/camel-local-folder.c:360
 #, fuzzy, c-format
 msgid "mailbox:%s (%s)"
 msgstr "Не мога да отворя mailbox: %s: %s\n"
 
 #. a full path + protocol
-#: camel/providers/local/camel-local-folder.c:390
+#: camel/providers/local/camel-local-folder.c:364
 #, fuzzy, c-format
 msgid "%s (%s)"
 msgstr "%s (%d)"
@@ -9727,54 +9693,50 @@ msgid ""
 "May also be used to read a tree of Elm, Pine, or Mutt style folders."
 msgstr "За четене и съхранение на локална поща в стандартен mbox spool файлове"
 
-#: camel/providers/local/camel-local-store.c:138
-#: camel/providers/local/camel-local-store.c:227
-#: camel/providers/local/camel-mbox-store.c:305
+#: camel/providers/local/camel-local-store.c:139
+#: camel/providers/local/camel-local-store.c:228
 #: camel/providers/local/camel-spool-store.c:116
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:145
+#: camel/providers/local/camel-local-store.c:146
 #, c-format
 msgid "Store root %s is not a regular directory"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:154
-#: camel/providers/local/camel-local-store.c:170
-#: camel/providers/local/camel-local-store.c:238
+#: camel/providers/local/camel-local-store.c:155
+#: camel/providers/local/camel-local-store.c:171
+#: camel/providers/local/camel-local-store.c:239
 #, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr "Не мога да получа папка: %s: %s"
 
-#: camel/providers/local/camel-local-store.c:186
+#: camel/providers/local/camel-local-store.c:187
 msgid "Local stores do not have an inbox"
 msgstr "Локални запазвания няма в inbox"
 
-#: camel/providers/local/camel-local-store.c:198
+#: camel/providers/local/camel-local-store.c:199
 #, c-format
 msgid "Local mail file %s"
 msgstr "Локален mail файл %s"
 
-#: camel/providers/local/camel-local-store.c:307 mail/mail-local.c:949
+#: camel/providers/local/camel-local-store.c:308 mail/mail-local.c:909
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr "Не мога да преименувам папката %s на %s: %s"
 
-#: camel/providers/local/camel-local-store.c:364
-#: camel/providers/local/camel-mbox-store.c:474
+#: camel/providers/local/camel-local-store.c:365
 #, fuzzy, c-format
 msgid "Could not rename '%s': %s"
 msgstr "Не мога да преименувам папката: %s"
 
-#: camel/providers/local/camel-local-store.c:387
-#: camel/providers/local/camel-mbox-store.c:258
+#: camel/providers/local/camel-local-store.c:388
 #, c-format
 msgid "Could not delete folder summary file `%s': %s"
 msgstr "Не мога да изтрия файл с обобщение за папка `%s': %s"
 
-#: camel/providers/local/camel-local-store.c:397
-#: camel/providers/local/camel-mbox-store.c:270
+#: camel/providers/local/camel-local-store.c:398
 #, c-format
 msgid "Could not delete folder index file `%s': %s"
 msgstr "Не мога да изтрия индексен файл за папка `%s': %s"
@@ -9814,7 +9776,7 @@ msgstr ""
 "%s"
 
 #: camel/providers/local/camel-maildir-store.c:110
-#: camel/providers/local/camel-mbox-store.c:157
+#: camel/providers/local/camel-mbox-store.c:101
 #: camel/providers/local/camel-mh-store.c:209
 #: camel/providers/local/camel-spool-store.c:167
 #, c-format
@@ -9881,29 +9843,29 @@ msgstr "Сканирам за нови съобщения"
 msgid "Storing folder"
 msgstr "Запазва папка"
 
-#: camel/providers/local/camel-mbox-folder.c:230
+#: camel/providers/local/camel-mbox-folder.c:158
 #: camel/providers/local/camel-spool-folder.c:148
 #, c-format
 msgid "Cannot create folder lock on %s: %s"
 msgstr "Не мога да създам заклюване за папката %s: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:289
+#: camel/providers/local/camel-mbox-folder.c:217
 #, c-format
 msgid "Cannot open mailbox: %s: %s\n"
 msgstr "Не мога да отворя mailbox: %s: %s\n"
 
-#: camel/providers/local/camel-mbox-folder.c:349
+#: camel/providers/local/camel-mbox-folder.c:277
 msgid "Mail append cancelled"
 msgstr "Действието добавяне на поща е прекъснато"
 
-#: camel/providers/local/camel-mbox-folder.c:352
+#: camel/providers/local/camel-mbox-folder.c:280
 #, c-format
 msgid "Cannot append message to mbox file: %s: %s"
 msgstr "Не мога да добавя съобщението в mbox файла: %s: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:440
-#: camel/providers/local/camel-mbox-folder.c:471
-#: camel/providers/local/camel-mbox-folder.c:479
+#: camel/providers/local/camel-mbox-folder.c:368
+#: camel/providers/local/camel-mbox-folder.c:399
+#: camel/providers/local/camel-mbox-folder.c:407
 #, c-format
 msgid ""
 "Cannot get message: %s from folder %s\n"
@@ -9912,15 +9874,15 @@ msgstr ""
 "Не мога да получа съобщение  %s от папка %s\n"
 "  %s"
 
-#: camel/providers/local/camel-mbox-folder.c:472
+#: camel/providers/local/camel-mbox-folder.c:400
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr "Папката изглежда да е невъстановимо повредена."
 
-#: camel/providers/local/camel-mbox-folder.c:480
+#: camel/providers/local/camel-mbox-folder.c:408
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr "Конструирането на съобщението пропадна: Повреден mailbox?"
 
-#: camel/providers/local/camel-mbox-store.c:149
+#: camel/providers/local/camel-mbox-store.c:94
 #, c-format
 msgid ""
 "Could not open file `%s':\n"
@@ -9929,16 +9891,7 @@ msgstr ""
 "Не мога да отворя файл `%s':\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:166
-#, fuzzy, c-format
-msgid ""
-"Could not create directory `%s':\n"
-"%s"
-msgstr ""
-"Не мога да създам директория %s:\n"
-"%s"
-
-#: camel/providers/local/camel-mbox-store.c:178
+#: camel/providers/local/camel-mbox-store.c:110
 #, c-format
 msgid ""
 "Could not create file `%s':\n"
@@ -9947,15 +9900,14 @@ msgstr ""
 "Не мога да създам файл `%s':\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:188
-#: camel/providers/local/camel-mbox-store.c:229
+#: camel/providers/local/camel-mbox-store.c:119
+#: camel/providers/local/camel-mbox-store.c:146
 #, c-format
 msgid "`%s' is not a regular file."
 msgstr "`%s' не е обикновен файл."
 
-#: camel/providers/local/camel-mbox-store.c:210
-#: camel/providers/local/camel-mbox-store.c:221
-#: camel/providers/local/camel-mbox-store.c:244
+#: camel/providers/local/camel-mbox-store.c:138
+#: camel/providers/local/camel-mbox-store.c:161
 #, c-format
 msgid ""
 "Could not delete folder `%s':\n"
@@ -9964,36 +9916,11 @@ msgstr ""
 "Не мога да изтрия папката `%s':\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:236
+#: camel/providers/local/camel-mbox-store.c:153
 #, c-format
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr "Папката `%s' не е празна. Не е изтрита."
 
-#: camel/providers/local/camel-mbox-store.c:311
-#, fuzzy
-msgid "Cannot create a folder by this name."
-msgstr "Не мога да създам папка с това име"
-
-#: camel/providers/local/camel-mbox-store.c:324
-#, fuzzy, c-format
-msgid "Cannot create directory `%s': %s."
-msgstr "Не мога да създам директория %s: %s"
-
-#: camel/providers/local/camel-mbox-store.c:338
-#, fuzzy, c-format
-msgid "Cannot create folder: %s: %s"
-msgstr "Не мога да получа папка: %s: %s"
-
-#: camel/providers/local/camel-mbox-store.c:408
-#, fuzzy, c-format
-msgid "Could not rename %s to %s: %s"
-msgstr "Не мога да преименувам папката %s на %s: %s"
-
-#: camel/providers/local/camel-mbox-store.c:427
-#, fuzzy
-msgid "The new folder name is illegal."
-msgstr "Указаното име на папка е невалидно: %s"
-
 #: camel/providers/local/camel-mbox-summary.c:343
 #, c-format
 msgid "Could not open folder: %s: %s"
@@ -10151,64 +10078,6 @@ msgstr ""
 "Не мога да синхронизирам spool папката `%s': %s\n"
 "Папката може би е повредена, копието е запазено в `%s'"
 
-#: camel/providers/nntp/camel-nntp-auth.c:44
-#, c-format
-msgid "Please enter the NNTP password for %s@%s"
-msgstr "Моля въведете NNTP парола за %s@%s"
-
-#: camel/providers/nntp/camel-nntp-auth.c:64
-msgid "Server rejected username"
-msgstr "Сървърът отхвърли потребителското име"
-
-#: camel/providers/nntp/camel-nntp-auth.c:70
-msgid "Failed to send username to server"
-msgstr "Изпращането на потребителското име до сървъра неуспешно"
-
-#: camel/providers/nntp/camel-nntp-auth.c:79
-msgid "Server rejected username/password"
-msgstr "Сървърът отхвърли потребителското име/паролата"
-
-#: camel/providers/nntp/camel-nntp-folder.c:114
-#, c-format
-msgid "Internal error: uid in invalid format: %s"
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-folder.c:155
-#: camel/providers/nntp/camel-nntp-folder.c:161
-#: camel/providers/pop3/camel-pop3-folder.c:433
-#: camel/providers/pop3/camel-pop3-folder.c:494
-#: camel/providers/pop3/camel-pop3-folder.c:501
-#: camel/providers/pop3/camel-pop3-folder.c:512
-#, fuzzy, c-format
-msgid "Cannot get message %s: %s"
-msgstr ""
-"Не мога да взема съобщение: %s\n"
-"  %s"
-
-#: camel/providers/nntp/camel-nntp-folder.c:159
-#: camel/providers/pop3/camel-pop3-folder.c:262
-#: camel/providers/pop3/camel-pop3-folder.c:430
-#: camel/providers/pop3/camel-pop3-folder.c:491
-#: camel/providers/pop3/camel-pop3-folder.c:509
-#, fuzzy
-msgid "User cancelled"
-msgstr "Действието прекратено"
-
-#: camel/providers/nntp/camel-nntp-grouplist.c:45
-msgid "Could not get group list from server."
-msgstr "Не мога да взема списък на група от сървъра"
-
-#: camel/providers/nntp/camel-nntp-grouplist.c:98
-#: camel/providers/nntp/camel-nntp-grouplist.c:107
-#, c-format
-msgid "Unable to load grouplist file for %s: %s"
-msgstr "Не мога да заредя файла със списък на група за %s: %s"
-
-#: camel/providers/nntp/camel-nntp-grouplist.c:158
-#, c-format
-msgid "Unable to save grouplist file for %s: %s"
-msgstr "Не мога да запазя файл със списък на група за %s: %s"
-
 #: camel/providers/nntp/camel-nntp-provider.c:41
 msgid "USENET news"
 msgstr "USENET новини"
@@ -10238,38 +10107,38 @@ msgid ""
 "password."
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-summary.c:237
+#: camel/providers/nntp/camel-nntp-summary.c:234
 #, fuzzy, c-format
 msgid "No such folder: %s"
 msgstr "Няма такава папка %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:241
+#: camel/providers/nntp/camel-nntp-summary.c:238
 #, fuzzy, c-format
 msgid "Could not get group: %s"
 msgstr "Не мога да създам програмен канал: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:347
+#: camel/providers/nntp/camel-nntp-summary.c:344
 #, fuzzy, c-format
 msgid "NNTP Command failed: %s"
 msgstr "IMAP команда пропадна: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:407
-#: camel/providers/nntp/camel-nntp-summary.c:508
+#: camel/providers/nntp/camel-nntp-summary.c:404
+#: camel/providers/nntp/camel-nntp-summary.c:505
 #, fuzzy, c-format
 msgid "%s: Scanning new messages"
 msgstr "Сканирам за нови съобщения"
 
-#: camel/providers/nntp/camel-nntp-summary.c:523
+#: camel/providers/nntp/camel-nntp-summary.c:520
 #, fuzzy, c-format
 msgid "Unknown server response: %s"
 msgstr "Неизвестна грешка: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:569
+#: camel/providers/nntp/camel-nntp-summary.c:566
 #, fuzzy
 msgid "Use cancel"
 msgstr "Прекръсва"
 
-#: camel/providers/nntp/camel-nntp-summary.c:571
+#: camel/providers/nntp/camel-nntp-summary.c:568
 #, fuzzy, c-format
 msgid "Operation failed: %s"
 msgstr "Действието прекратено"
@@ -10278,6 +10147,14 @@ msgstr "Действието прекратено"
 msgid "Retrieving POP summary"
 msgstr "Получавам POP обобщение"
 
+#: camel/providers/pop3/camel-pop3-folder.c:262
+#: camel/providers/pop3/camel-pop3-folder.c:429
+#: camel/providers/pop3/camel-pop3-folder.c:490
+#: camel/providers/pop3/camel-pop3-folder.c:508
+#, fuzzy
+msgid "User cancelled"
+msgstr "Действието прекратено"
+
 #: camel/providers/pop3/camel-pop3-folder.c:265
 #, fuzzy, c-format
 msgid "Cannot get POP summary: %s"
@@ -10287,23 +10164,37 @@ msgstr "Не мога да получа папка: %s: %s"
 msgid "Expunging deleted messages"
 msgstr "Скрий изтритите съобщения"
 
-#: camel/providers/pop3/camel-pop3-folder.c:404
+#: camel/providers/pop3/camel-pop3-folder.c:403
 #, c-format
 msgid "No message with uid %s"
 msgstr "Няма съобщение с uid %s"
 
 #. Sigh, most of the crap in this function is so that the cancel button
 #. returns the proper exception code.  Sigh.
-#: camel/providers/pop3/camel-pop3-folder.c:411
+#: camel/providers/pop3/camel-pop3-folder.c:410
 #, c-format
 msgid "Retrieving POP message %d"
 msgstr "Получавам POP съобщение %d"
 
-#: camel/providers/pop3/camel-pop3-folder.c:501
+#: camel/providers/pop3/camel-pop3-folder.c:432
+#: camel/providers/pop3/camel-pop3-folder.c:493
+#: camel/providers/pop3/camel-pop3-folder.c:500
+#: camel/providers/pop3/camel-pop3-folder.c:511
+#, fuzzy, c-format
+msgid "Cannot get message %s: %s"
+msgstr ""
+"Не мога да взема съобщение: %s\n"
+"  %s"
+
+#: camel/providers/pop3/camel-pop3-folder.c:500
 #, fuzzy
 msgid "Unknown reason"
 msgstr "Неизвестна грешка"
 
+#: camel/providers/pop3/camel-pop3-provider.c:38
+msgid "Message storage"
+msgstr "Хранилище на съобщение"
+
 #: camel/providers/pop3/camel-pop3-provider.c:40
 msgid "Leave messages on server"
 msgstr "Оставя пощата на сървъра"
@@ -10636,7 +10527,7 @@ msgstr "SMTP поща през %s"
 msgid "Cannot send message: sender address not valid."
 msgstr "Не мога да изпратя съобщение: невалиден адрес на изпращача."
 
-#: camel/providers/smtp/camel-smtp-transport.c:690 mail/mail-ops.c:631
+#: camel/providers/smtp/camel-smtp-transport.c:690 mail/mail-ops.c:613
 msgid "Sending message"
 msgstr "Изпращане на съпбщението"
 
@@ -10653,59 +10544,59 @@ msgstr "Не мога да изпратя съобщение: няма зада�
 msgid "SMTP Greeting"
 msgstr "SMTP Поздравления"
 
-#: camel/providers/smtp/camel-smtp-transport.c:928
+#: camel/providers/smtp/camel-smtp-transport.c:926
 #, fuzzy, c-format
 msgid "HELO request timed out: %s"
 msgstr "AUTH заявка по таймаут: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:950
+#: camel/providers/smtp/camel-smtp-transport.c:948
 #, fuzzy
 msgid "HELO response error"
 msgstr "RSET върна грешка: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1016
+#: camel/providers/smtp/camel-smtp-transport.c:1014
 msgid "SMTP Authentication"
 msgstr "SMTP Удостоверение"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1022
+#: camel/providers/smtp/camel-smtp-transport.c:1020
 msgid "Error creating SASL authentication object."
 msgstr "Грешка при създаване на SASL оторизация"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1039
-#: camel/providers/smtp/camel-smtp-transport.c:1051
+#: camel/providers/smtp/camel-smtp-transport.c:1037
+#: camel/providers/smtp/camel-smtp-transport.c:1049
 #, c-format
 msgid "AUTH request timed out: %s"
 msgstr "AUTH заявка по таймаут: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1060
+#: camel/providers/smtp/camel-smtp-transport.c:1058
 msgid "AUTH request failed."
 msgstr "AUTH заявката пропадна"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1121
+#: camel/providers/smtp/camel-smtp-transport.c:1119
 msgid "Bad authentication response from server.\n"
 msgstr "Лош отговор за оторизация от сървъра.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1146
+#: camel/providers/smtp/camel-smtp-transport.c:1144
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
 msgstr "MAIL FROM от заявката таймаут %s пощата не е изпратена"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1166
+#: camel/providers/smtp/camel-smtp-transport.c:1164
 #, fuzzy
 msgid "MAIL FROM response error"
 msgstr "MAIL FROM грешен отговор  %s: пощата не е изпратена"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1190
+#: camel/providers/smtp/camel-smtp-transport.c:1188
 #, c-format
 msgid "RCPT TO request timed out: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1212
+#: camel/providers/smtp/camel-smtp-transport.c:1210
 #, c-format
 msgid "RCPT TO <%s> failed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1251
+#: camel/providers/smtp/camel-smtp-transport.c:1249
 #, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr ""
@@ -10713,38 +10604,38 @@ msgstr ""
 #. we should have gotten instructions on how to use the DATA command:
 #. * 354 Enter mail, end with "." on a line by itself
 #.
-#: camel/providers/smtp/camel-smtp-transport.c:1271
+#: camel/providers/smtp/camel-smtp-transport.c:1269
 #, fuzzy
 msgid "DATA response error"
 msgstr "RSET върна грешка: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1312
-#: camel/providers/smtp/camel-smtp-transport.c:1335
+#: camel/providers/smtp/camel-smtp-transport.c:1310
+#: camel/providers/smtp/camel-smtp-transport.c:1333
 #, c-format
 msgid "DATA send timed out: message termination: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1355
+#: camel/providers/smtp/camel-smtp-transport.c:1353
 #, fuzzy
 msgid "DATA termination response error"
 msgstr "Грешна оторизация отговори сървъра."
 
-#: camel/providers/smtp/camel-smtp-transport.c:1378
+#: camel/providers/smtp/camel-smtp-transport.c:1376
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1398
+#: camel/providers/smtp/camel-smtp-transport.c:1396
 #, fuzzy
 msgid "RSET response error"
 msgstr "RSET върна грешка: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1421
+#: camel/providers/smtp/camel-smtp-transport.c:1419
 #, fuzzy, c-format
 msgid "QUIT request timed out: %s"
 msgstr "AUTH заявка по таймаут: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1441
+#: camel/providers/smtp/camel-smtp-transport.c:1439
 #, fuzzy
 msgid "QUIT response error"
 msgstr "RSET върна грешка: %s"
@@ -10764,19 +10655,20 @@ msgstr "%.1fM"
 msgid "%.0fG"
 msgstr "%.1fG"
 
-#: composer/e-msg-composer-attachment-bar.c:300
+#. This is a filename. Translators take note.
+#: composer/e-msg-composer-attachment-bar.c:311 mail/mail-display.c:226
 msgid "attachment"
 msgstr "прикачен"
 
-#: composer/e-msg-composer-attachment-bar.c:445
+#: composer/e-msg-composer-attachment-bar.c:449
 msgid "Remove selected items from the attachment list"
 msgstr "Изтрива избраните обекти от списъка на прикачени"
 
-#: composer/e-msg-composer-attachment-bar.c:475
+#: composer/e-msg-composer-attachment-bar.c:479
 msgid "Add attachment..."
 msgstr "Добавя Прикачен...."
 
-#: composer/e-msg-composer-attachment-bar.c:476
+#: composer/e-msg-composer-attachment-bar.c:480
 msgid "Attach a file to the message"
 msgstr "Прикрепи файл към съобщението"
 
@@ -10809,12 +10701,92 @@ msgstr "MIME тип:"
 msgid "Suggest automatic display of attachment"
 msgstr "Предлага автоматично показване на прикачен"
 
-#: composer/e-msg-composer.c:562
+#: composer/e-msg-composer-hdrs.c:290
+msgid "Hey you, dunce. You need an account to send mail doncha know."
+msgstr ""
+
+#: composer/e-msg-composer-hdrs.c:483
+msgid "Click here for the address book"
+msgstr "Кликнете тук за адресна книга"
+
+#.
+#. * Reply-To:
+#. *
+#. * Create this before we call create_from_optionmenu,
+#. * because that causes from_changed to be called, which
+#. * expects the reply_to fields to be initialized.
+#.
+#: composer/e-msg-composer-hdrs.c:514
+msgid "Reply-To:"
+msgstr "Отговор-До:"
+
+#.
+#. * From
+#.
+#: composer/e-msg-composer-hdrs.c:520
+msgid "From:"
+msgstr "От:"
+
+#.
+#. * Subject
+#.
+#: composer/e-msg-composer-hdrs.c:526
+msgid "Subject:"
+msgstr "Тема:"
+
+#: composer/e-msg-composer-hdrs.c:535
+msgid "To:"
+msgstr "До:"
+
+#: composer/e-msg-composer-hdrs.c:536
+msgid "Enter the recipients of the message"
+msgstr "Въведете получател на съобщението"
+
+#: composer/e-msg-composer-hdrs.c:539
+msgid "Cc:"
+msgstr "Cc:"
+
+#: composer/e-msg-composer-hdrs.c:540
+msgid "Enter the addresses that will receive a carbon copy of the message"
+msgstr "Въведете адреса на получателя на карбон копие за това съобщение"
+
+#: composer/e-msg-composer-hdrs.c:543
+msgid "Bcc:"
+msgstr "Bcc:"
+
+#: composer/e-msg-composer-hdrs.c:544
+msgid ""
+"Enter the addresses that will receive a carbon copy of the message without "
+"appearing in the recipient list of the message."
+msgstr ""
+"Въведете адреса който ще получи копие от съобщението без да се появява в "
+"списъка на получателите на съобщението."
+
+#.
+#. * Post-To
+#.
+#: composer/e-msg-composer-hdrs.c:551
+#, fuzzy
+msgid "Post To:"
+msgstr "Порто"
+
+#: composer/e-msg-composer-hdrs.c:553
+#, fuzzy
+msgid "Posting destination"
+msgstr "Няма Описание"
+
+#: composer/e-msg-composer-select-file.c:102
+#: composer/e-msg-composer-select-file.c:119
+#, fuzzy
+msgid "Attach file(s)"
+msgstr "Прикрепи файл"
+
+#: composer/e-msg-composer.c:555
 #, fuzzy
 msgid "Could not create a PGP signature context"
 msgstr "Не мога да създам сигнатурен контекст за PGP"
 
-#: composer/e-msg-composer.c:841
+#: composer/e-msg-composer.c:834
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
@@ -10823,30 +10795,30 @@ msgstr ""
 "Грешка при четеен на файл: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1206
+#: composer/e-msg-composer.c:1197
 msgid "File exists, overwrite?"
 msgstr "Файла съществува. Да го презапиша?"
 
-#: composer/e-msg-composer.c:1217 composer/e-msg-composer.c:1233
+#: composer/e-msg-composer.c:1215
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Грешка при съхранението на файл: %s"
 
-#: composer/e-msg-composer.c:1256
+#: composer/e-msg-composer.c:1238
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Грешка при зареждането на файл: %s"
 
-#: composer/e-msg-composer.c:1294
+#: composer/e-msg-composer.c:1276
 #, c-format
 msgid "Error accessing file: %s"
 msgstr "Грешка при достъп на файл: %s"
 
-#: composer/e-msg-composer.c:1302
+#: composer/e-msg-composer.c:1284
 msgid "Unable to retrieve message from editor"
 msgstr "Не мога да получа съобщение от редактора"
 
-#: composer/e-msg-composer.c:1309
+#: composer/e-msg-composer.c:1291
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -10855,7 +10827,7 @@ msgstr ""
 "Не мога да намеря във файл %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:1316
+#: composer/e-msg-composer.c:1298
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -10864,7 +10836,7 @@ msgstr ""
 "Не мога да отрежа файл %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:1325
+#: composer/e-msg-composer.c:1307
 #, fuzzy, c-format
 msgid ""
 "Unable to copy file descriptor: %s\n"
@@ -10873,7 +10845,7 @@ msgstr ""
 "Не мога да намеря във файл %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:1334
+#: composer/e-msg-composer.c:1316
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -10882,7 +10854,7 @@ msgstr ""
 "Грешка при автоматичното запазване на файл: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1431
+#: composer/e-msg-composer.c:1413
 msgid ""
 "Ximian Evolution has found unsaved files from a previous session.\n"
 "Would you like to try to recover them?"
@@ -10890,7 +10862,7 @@ msgstr ""
 "Ximian Evolution намери незапазени файлове от предишната сесия.\n"
 "Искате ли да се опитам да ги възстановя?"
 
-#: composer/e-msg-composer.c:1594
+#: composer/e-msg-composer.c:1575
 #, fuzzy, c-format
 msgid ""
 "The message \"%s\" has not been sent.\n"
@@ -10901,35 +10873,35 @@ msgstr ""
 "\n"
 "Искате ли да запазите промените?"
 
-#: composer/e-msg-composer.c:1603
+#: composer/e-msg-composer.c:1584
 msgid "Warning: Modified Message"
 msgstr "Предупреждение: Модифицирано Съобщение"
 
-#: composer/e-msg-composer.c:1635
+#: composer/e-msg-composer.c:1616
 msgid "Open file"
 msgstr "Отвори файл"
 
-#: composer/e-msg-composer.c:2054
+#: composer/e-msg-composer.c:2040
 #, fuzzy
 msgid "Signature:"
 msgstr "Запазва сигнатура"
 
-#: composer/e-msg-composer.c:2094 mail/mail-account-gui.c:1261
+#: composer/e-msg-composer.c:2080 mail/mail-account-gui.c:1261
 msgid "Autogenerated"
 msgstr ""
 
-#: composer/e-msg-composer.c:2274 composer/e-msg-composer.c:2970
-#: composer/e-msg-composer.c:2971
+#: composer/e-msg-composer.c:2256 composer/e-msg-composer.c:2925
+#: composer/e-msg-composer.c:2926
 msgid "Compose a message"
 msgstr "Напиши Съобщение"
 
-#: composer/e-msg-composer.c:3002
+#: composer/e-msg-composer.c:2957
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
 msgstr ""
 
-#: composer/e-msg-composer.c:3030
+#: composer/e-msg-composer.c:2985
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component.\n"
@@ -10937,105 +10909,23 @@ msgid ""
 "of gtkhtml and libgtkhtml installed.\n"
 msgstr ""
 
-#: composer/e-msg-composer.c:3100
+#: composer/e-msg-composer.c:3052
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component."
 msgstr ""
 
-#: composer/e-msg-composer.c:4110
+#: composer/e-msg-composer.c:4078
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)"
 "<b>"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:290
-#, fuzzy
-msgid "You need to configure an account before you can compose mail."
-msgstr ""
-"Необходимо е да конфигурирате потребител\n"
-"преди да създадете поща."
-
-#: composer/e-msg-composer-hdrs.c:483
-msgid "Click here for the address book"
-msgstr "Кликнете тук за адресна книга"
-
-#.
-#. * Reply-To:
-#. *
-#. * Create this before we call create_from_optionmenu,
-#. * because that causes from_changed to be called, which
-#. * expects the reply_to fields to be initialized.
-#.
-#: composer/e-msg-composer-hdrs.c:514
-msgid "Reply-To:"
-msgstr "Отговор-До:"
-
-#.
-#. * From
-#.
-#: composer/e-msg-composer-hdrs.c:520
-msgid "From:"
-msgstr "От:"
-
-#.
-#. * Subject
-#.
-#: composer/e-msg-composer-hdrs.c:526
-msgid "Subject:"
-msgstr "Тема:"
-
-#: composer/e-msg-composer-hdrs.c:535
-msgid "To:"
-msgstr "До:"
-
-#: composer/e-msg-composer-hdrs.c:536
-msgid "Enter the recipients of the message"
-msgstr "Въведете получател на съобщението"
-
-#: composer/e-msg-composer-hdrs.c:539
-msgid "Cc:"
-msgstr "Cc:"
-
-#: composer/e-msg-composer-hdrs.c:540
-msgid "Enter the addresses that will receive a carbon copy of the message"
-msgstr "Въведете адреса на получателя на карбон копие за това съобщение"
-
-#: composer/e-msg-composer-hdrs.c:543
-msgid "Bcc:"
-msgstr "Bcc:"
-
-#: composer/e-msg-composer-hdrs.c:544
-msgid ""
-"Enter the addresses that will receive a carbon copy of the message without "
-"appearing in the recipient list of the message."
-msgstr ""
-"Въведете адреса който ще получи копие от съобщението без да се появява в "
-"списъка на получателите на съобщението."
-
-#.
-#. * Post-To
-#.
-#: composer/e-msg-composer-hdrs.c:551
-#, fuzzy
-msgid "Post To:"
-msgstr "Порто"
-
-#: composer/e-msg-composer-hdrs.c:553
-#, fuzzy
-msgid "Posting destination"
-msgstr "Няма Описание"
-
-#: composer/e-msg-composer-select-file.c:119
-#, fuzzy
-msgid "Attach file(s)"
-msgstr "Прикрепи файл"
-
-#: data/evolution.desktop.in.h:1
+#: data/evolution.desktop.in.in.h:1
 msgid "The Evolution groupware suite"
 msgstr ""
 
-#: data/evolution.desktop.in.h:2
+#: data/evolution.desktop.in.in.h:2
 msgid "Ximian Evolution"
 msgstr "Относно Evolution"
 
@@ -11194,7 +11084,7 @@ msgstr ""
 "Файл със същото име вече съществува.\n"
 "Да го презапиша ли?"
 
-#: e-util/e-dialog-utils.c:249
+#: e-util/e-dialog-utils.c:249 mail/mail-display.c:199
 msgid "Overwrite file?"
 msgstr "Презаписване на файл?"
 
@@ -11217,210 +11107,90 @@ msgstr "Категории"
 
 #. strptime format of a weekday, a date and a time,
 #. in 12-hour format, without seconds.
-#: e-util/e-time-utils.c:185 e-util/e-time-utils.c:398
+#: e-util/e-time-utils.c:172 e-util/e-time-utils.c:385
 msgid "%a %m/%d/%Y %I:%M %p"
 msgstr "%a %m/%d/%Y %I:%M %p"
 
 #. strptime format of a weekday, a date and a time,
 #. in 24-hour format, without seconds.
-#: e-util/e-time-utils.c:190 e-util/e-time-utils.c:389
+#: e-util/e-time-utils.c:177 e-util/e-time-utils.c:376
 msgid "%a %m/%d/%Y %H:%M"
 msgstr "%a %m/%d/%Y %H:%M"
 
 #. strptime format of a weekday, a date and a time,
 #. in 12-hour format, without minutes or seconds.
-#: e-util/e-time-utils.c:195
+#: e-util/e-time-utils.c:182
 msgid "%a %m/%d/%Y %I %p"
 msgstr "%a %m/%d/%Y %I %p"
 
 #. strptime format of a weekday, a date and a time,
 #. in 24-hour format, without minutes or seconds.
-#: e-util/e-time-utils.c:200
+#: e-util/e-time-utils.c:187
 msgid "%a %m/%d/%Y %H"
 msgstr "%a %m/%d/%Y %H"
 
 #. strptime format of a date and a time, in 12-hour format.
-#: e-util/e-time-utils.c:211
+#: e-util/e-time-utils.c:198
 msgid "%m/%d/%Y %I:%M:%S %p"
 msgstr "%m/%d/%Y %I:%M:%S %p"
 
 #. strptime format of a date and a time, in 24-hour format.
-#: e-util/e-time-utils.c:215
+#: e-util/e-time-utils.c:202
 msgid "%m/%d/%Y %H:%M:%S"
 msgstr "%m/%d/%Y %H:%M:%S"
 
 #. strptime format of a date and a time, in 12-hour format,
 #. without seconds.
-#: e-util/e-time-utils.c:220
+#: e-util/e-time-utils.c:207
 msgid "%m/%d/%Y %I:%M %p"
 msgstr "%m/%d/%Y %I:%M %p"
 
 #. strptime format of a date and a time, in 24-hour format,
 #. without seconds.
-#: e-util/e-time-utils.c:225
+#: e-util/e-time-utils.c:212
 msgid "%m/%d/%Y %H:%M"
 msgstr "%m/%d/%Y %H:%M"
 
 #. strptime format of a date and a time, in 12-hour format,
 #. without minutes or seconds.
-#: e-util/e-time-utils.c:230
+#: e-util/e-time-utils.c:217
 msgid "%m/%d/%Y %I %p"
 msgstr "%m/%d/%Y %I %p"
 
 #. strptime format of a date and a time, in 24-hour format,
 #. without minutes or seconds.
-#: e-util/e-time-utils.c:235
+#: e-util/e-time-utils.c:222
 msgid "%m/%d/%Y %H"
 msgstr "%m/%d/%Y %H"
 
 #. strptime format for a time of day, in 12-hour format.
-#: e-util/e-time-utils.c:339 e-util/e-time-utils.c:438
+#: e-util/e-time-utils.c:326 e-util/e-time-utils.c:425
 msgid "%I:%M:%S %p"
 msgstr "%I:%M:%S %p"
 
 #. strptime format for a time of day, in 24-hour format.
-#: e-util/e-time-utils.c:343 e-util/e-time-utils.c:430
+#: e-util/e-time-utils.c:330 e-util/e-time-utils.c:417
 msgid "%H:%M:%S"
 msgstr "%H:%M:%S"
 
 #. strptime format for time of day, without seconds,
 #. in 12-hour format.
-#: e-util/e-time-utils.c:348 e-util/e-time-utils.c:435
-#: widgets/misc/e-dateedit.c:1417 widgets/misc/e-dateedit.c:1642
+#: e-util/e-time-utils.c:335 e-util/e-time-utils.c:422
+#: widgets/misc/e-dateedit.c:1415 widgets/misc/e-dateedit.c:1628
 msgid "%I:%M %p"
 msgstr "%I:%M %p"
 
 #. strptime format for time of day, without seconds 24-hour format.
-#: e-util/e-time-utils.c:352 e-util/e-time-utils.c:427
-#: widgets/misc/e-dateedit.c:1414 widgets/misc/e-dateedit.c:1639
+#: e-util/e-time-utils.c:339 e-util/e-time-utils.c:414
+#: widgets/misc/e-dateedit.c:1412 widgets/misc/e-dateedit.c:1625
 msgid "%H:%M"
 msgstr "%H:%M"
 
 #. strptime format for hour and AM/PM, 12-hour format.
-#: e-util/e-time-utils.c:356
+#: e-util/e-time-utils.c:343
 msgid "%I %p"
 msgstr "%I %p"
 
-#: executive-summary/component/component-factory.c:151
-#, fuzzy
-msgid "Cannot initialize Evolution's Executive Summary component."
-msgstr "Не мога да инициализирам mail компонетнта на Evolution."
-
-#: executive-summary/component/e-summary.c:925
-#, fuzzy, c-format
-msgid ""
-"Cannot open the HTML file:\n"
-"%s"
-msgstr ""
-"Не мога да преименувам папката:\n"
-"%s"
-
-#: executive-summary/component/e-summary.c:939
-#, fuzzy, c-format
-msgid ""
-"Error reading data:\n"
-"%s"
-msgstr "Грешка при зареждането на %s"
-
-#: executive-summary/component/e-summary.c:957
-msgid "File does not have a place for the services.\n"
-msgstr ""
-
-#: executive-summary/component/e-summary-callbacks.c:125
-#, fuzzy
-msgid "Select a service"
-msgstr "Избери файл"
-
-#: executive-summary/component/e-summary-callbacks.c:289
-msgid ""
-"You can select a different HTML page for the background of the Executive "
-"Summary.\n"
-"\n"
-"Just leave it blank for the default"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:69
-#: executive-summary/component/e-summary-url.c:74
-#: executive-summary/component/e-summary-url.c:81
-#, c-format
-msgid "Open %s with the default GNOME application"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:70
-#, c-format
-msgid "Open %s with the default GNOME web browser"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:71
-#, fuzzy, c-format
-msgid "Send an email to %s"
-msgstr "Изпрати email"
-
-#: executive-summary/component/e-summary-url.c:72
-#, fuzzy, c-format
-msgid "Change the view to %s"
-msgstr "Промени името на тази папка"
-
-#: executive-summary/component/e-summary-url.c:73
-#, fuzzy, c-format
-msgid "Run %s"
-msgstr "URL: %s"
-
-#: executive-summary/component/e-summary-url.c:75
-#, fuzzy, c-format
-msgid "Close %s"
-msgstr "Затвори"
-
-#: executive-summary/component/e-summary-url.c:76
-#, fuzzy, c-format
-msgid "Move %s to the left"
-msgstr "Премести тази папка другаде"
-
-#: executive-summary/component/e-summary-url.c:77
-#, c-format
-msgid "Move %s to the right"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:78
-#, c-format
-msgid "Move %s into the previous row"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:79
-#, c-format
-msgid "Move %s into the next row"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:80
-#, fuzzy, c-format
-msgid "Configure %s"
-msgstr "Реконфигурира /%s"
-
-#: executive-summary/component/e-summary-url.c:553
-#, fuzzy
-msgid "page"
-msgstr "Страница"
-
-#: executive-summary/test-service/rdf-summary.c:512
-#: executive-summary/test-service/rdf-summary.c:549
-#: executive-summary/test-service/rdf-summary.c:594
-msgid "Error"
-msgstr "Грешка"
-
-#: executive-summary/test-service/rdf-summary.c:775
-msgid "Update automatically"
-msgstr ""
-
-#: executive-summary/test-service/rdf-summary.c:785
-#, fuzzy
-msgid "Update now"
-msgstr "Обновява"
-
-#: executive-summary/test-service/rdf-summary.c:795
-#, fuzzy
-msgid "Update every "
-msgstr "_Обновява Свободен/Зает"
-
 #: filter/filter-datespec.c:65
 #, fuzzy
 msgid "1 second ago"
@@ -11547,6 +11317,89 @@ msgstr "Име на стил:"
 msgid "Select Folder"
 msgstr "Избери Папка"
 
+#: filter/filter-input.c:191
+#, c-format
+msgid ""
+"Error in regular expression '%s':\n"
+"%s"
+msgstr ""
+"Грешка в регулярен израз '%s':\n"
+"%s"
+
+#: filter/filter-label.c:121 filter/libfilter-i18n.h:26 mail/mail-config.c:65
+#: mail/mail-config.glade.h:62 shell/e-config-upgrade.c:1411
+msgid "Important"
+msgstr "Важно"
+
+#. red
+#: filter/filter-label.c:122 mail/mail-config.c:66
+#: mail/mail-config.glade.h:129 shell/e-config-upgrade.c:1412
+#, fuzzy
+msgid "Work"
+msgstr "Корк"
+
+#. orange
+#: filter/filter-label.c:123 mail/mail-config.c:67 mail/mail-config.glade.h:84
+#: shell/e-config-upgrade.c:1413
+#, fuzzy
+msgid "Personal"
+msgstr "Вернал"
+
+#. forest green
+#: filter/filter-label.c:124 mail/mail-config.c:68
+#: mail/mail-config.glade.h:120 shell/e-config-upgrade.c:1414
+#, fuzzy
+msgid "To Do"
+msgstr "Того"
+
+#. blue
+#: filter/filter-label.c:125 mail/mail-config.c:69 mail/mail-config.glade.h:66
+#: shell/e-config-upgrade.c:1415
+#, fuzzy
+msgid "Later"
+msgstr "след"
+
+#: filter/filter-part.c:531 shell/evolution-test-component.c:63
+msgid "Test"
+msgstr "Тест"
+
+#: filter/filter-rule.c:219
+msgid "You must name this filter."
+msgstr "Трябва да има име този филтър."
+
+#: filter/filter-rule.c:751
+msgid "Rule name: "
+msgstr "Име на правило:"
+
+#: filter/filter-rule.c:755
+msgid "Untitled"
+msgstr "Неименувано"
+
+#: filter/filter-rule.c:772
+msgid "If"
+msgstr "Ако"
+
+#: filter/filter-rule.c:791
+msgid "Execute actions"
+msgstr "Изпълнява действия"
+
+#: filter/filter-rule.c:795
+msgid "if all criteria are met"
+msgstr "ако всички критерии са изпълнени"
+
+#: filter/filter-rule.c:800
+#, fuzzy
+msgid "if any criteria are met"
+msgstr "ако някои от критериите е изпълнен"
+
+#: filter/filter-rule.c:895
+msgid "incoming"
+msgstr "входящ"
+
+#: filter/filter-rule.c:895
+msgid "outgoing"
+msgstr "изходящ"
+
 #: filter/filter.glade.h:1
 msgid "Compare against"
 msgstr "Сравни срещу"
@@ -11651,89 +11504,6 @@ msgstr "с всички локални папки"
 msgid "years"
 msgstr "години"
 
-#: filter/filter-input.c:191
-#, c-format
-msgid ""
-"Error in regular expression '%s':\n"
-"%s"
-msgstr ""
-"Грешка в регулярен израз '%s':\n"
-"%s"
-
-#: filter/filter-label.c:121 filter/libfilter-i18n.h:17 mail/mail-config.c:65
-#: mail/mail-config.glade.h:62 shell/e-config-upgrade.c:1454
-msgid "Important"
-msgstr "Важно"
-
-#. red
-#: filter/filter-label.c:122 mail/mail-config.c:66
-#: mail/mail-config.glade.h:129 shell/e-config-upgrade.c:1455
-#, fuzzy
-msgid "Work"
-msgstr "Корк"
-
-#. orange
-#: filter/filter-label.c:123 mail/mail-config.c:67 mail/mail-config.glade.h:84
-#: shell/e-config-upgrade.c:1456
-#, fuzzy
-msgid "Personal"
-msgstr "Вернал"
-
-#. forest green
-#: filter/filter-label.c:124 mail/mail-config.c:68
-#: mail/mail-config.glade.h:120 shell/e-config-upgrade.c:1457
-#, fuzzy
-msgid "To Do"
-msgstr "Того"
-
-#. blue
-#: filter/filter-label.c:125 mail/mail-config.c:69 mail/mail-config.glade.h:66
-#: shell/e-config-upgrade.c:1458
-#, fuzzy
-msgid "Later"
-msgstr "след"
-
-#: filter/filter-part.c:531 shell/evolution-test-component.c:63
-msgid "Test"
-msgstr "Тест"
-
-#: filter/filter-rule.c:219
-msgid "You must name this filter."
-msgstr "Трябва да има име този филтър."
-
-#: filter/filter-rule.c:751
-msgid "Rule name: "
-msgstr "Име на правило:"
-
-#: filter/filter-rule.c:755
-msgid "Untitled"
-msgstr "Неименувано"
-
-#: filter/filter-rule.c:772
-msgid "If"
-msgstr "Ако"
-
-#: filter/filter-rule.c:791
-msgid "Execute actions"
-msgstr "Изпълнява действия"
-
-#: filter/filter-rule.c:795
-msgid "if all criteria are met"
-msgstr "ако всички критерии са изпълнени"
-
-#: filter/filter-rule.c:800
-#, fuzzy
-msgid "if any criteria are met"
-msgstr "ако някои от критериите е изпълнен"
-
-#: filter/filter-rule.c:895
-msgid "incoming"
-msgstr "входящ"
-
-#: filter/filter-rule.c:895
-msgid "outgoing"
-msgstr "изходящ"
-
 #. Automatically generated. Do not edit.
 #: filter/libfilter-i18n.h:2
 msgid "Adjust Score"
@@ -11757,230 +11527,230 @@ msgid "Beep"
 msgstr "Белем"
 
 #: filter/libfilter-i18n.h:7
+msgid "contains"
+msgstr "съдържа"
+
+#: filter/libfilter-i18n.h:8
 msgid "Copy to Folder"
 msgstr "Копирай в Папка"
 
-#: filter/libfilter-i18n.h:8
+#: filter/libfilter-i18n.h:9
 msgid "Date received"
 msgstr "Получено на дата"
 
-#: filter/libfilter-i18n.h:9
+#: filter/libfilter-i18n.h:10
 msgid "Date sent"
 msgstr "Изпратено на дата"
 
-#: filter/libfilter-i18n.h:11
+#: filter/libfilter-i18n.h:12
 msgid "Deleted"
 msgstr "Изтрий"
 
-#: filter/libfilter-i18n.h:12
+#: filter/libfilter-i18n.h:13
+msgid "does not contain"
+msgstr "не съдържа"
+
+#: filter/libfilter-i18n.h:14
+msgid "does not end with"
+msgstr "не завършва с"
+
+#: filter/libfilter-i18n.h:15
+msgid "does not exist"
+msgstr "не съществува"
+
+#: filter/libfilter-i18n.h:16
+#, fuzzy
+msgid "does not return"
+msgstr "не съществува"
+
+#: filter/libfilter-i18n.h:17
+msgid "does not sound like"
+msgstr "не звучи като"
+
+#: filter/libfilter-i18n.h:18
+msgid "does not start with"
+msgstr "не започва с"
+
+#: filter/libfilter-i18n.h:19
 msgid "Do Not Exist"
 msgstr "Не съществува"
 
-#: filter/libfilter-i18n.h:13
+#: filter/libfilter-i18n.h:20
 msgid "Draft"
 msgstr "Чернова"
 
-#: filter/libfilter-i18n.h:14
+#: filter/libfilter-i18n.h:21
+msgid "ends with"
+msgstr "завършва с"
+
+#: filter/libfilter-i18n.h:22
 msgid "Exist"
 msgstr "Съществува"
 
-#: filter/libfilter-i18n.h:15
+#: filter/libfilter-i18n.h:23
+msgid "exists"
+msgstr "съществува"
+
+#: filter/libfilter-i18n.h:24
 msgid "Expression"
 msgstr "Израз"
 
-#: filter/libfilter-i18n.h:16
+#: filter/libfilter-i18n.h:25
 msgid "Follow Up"
 msgstr ""
 
-#: filter/libfilter-i18n.h:18
+#: filter/libfilter-i18n.h:27
+msgid "is"
+msgstr "е"
+
+#: filter/libfilter-i18n.h:28
+#, fuzzy
+msgid "is after"
+msgstr "било след"
+
+#: filter/libfilter-i18n.h:29
+#, fuzzy
+msgid "is before"
+msgstr "било преди"
+
+#: filter/libfilter-i18n.h:30
+#, fuzzy
+msgid "is Flagged"
+msgstr "Маркирано"
+
+#: filter/libfilter-i18n.h:31
+msgid "is greater than"
+msgstr "е по-голямо от"
+
+#: filter/libfilter-i18n.h:32
+msgid "is less than"
+msgstr "е по малко от"
+
+#: filter/libfilter-i18n.h:33
+msgid "is not"
+msgstr "не е"
+
+#: filter/libfilter-i18n.h:34
+#, fuzzy
+msgid "is not Flagged"
+msgstr "Маркирано"
+
+#: filter/libfilter-i18n.h:35 mail/folder-browser.c:1840
 #, fuzzy
 msgid "Label"
 msgstr "Лаурел"
 
-#: filter/libfilter-i18n.h:19
+#: filter/libfilter-i18n.h:36
 msgid "Mailing list"
 msgstr "Пощенски списъкt"
 
-#: filter/libfilter-i18n.h:20
+#: filter/libfilter-i18n.h:37
 msgid "Message Body"
 msgstr "Тяло на съобщение"
 
-#: filter/libfilter-i18n.h:21
+#: filter/libfilter-i18n.h:38
 msgid "Message Header"
 msgstr "Заглавие на съобщение"
 
-#: filter/libfilter-i18n.h:22
+#: filter/libfilter-i18n.h:39
 msgid "Move to Folder"
 msgstr "Премести в Папка"
 
-#: filter/libfilter-i18n.h:23
+#: filter/libfilter-i18n.h:40
 #, fuzzy
 msgid "Pipe Message to Shell Command"
 msgstr "Изпрати съобщението на Контакт"
 
-#: filter/libfilter-i18n.h:24
+#: filter/libfilter-i18n.h:41
 #, fuzzy
 msgid "Play Sound"
 msgstr "Издава звук:"
 
-#: filter/libfilter-i18n.h:25 mail/message-tag-followup.c:68
+#: filter/libfilter-i18n.h:42 mail/message-tag-followup.c:68
 msgid "Read"
 msgstr "Чети"
 
-#: filter/libfilter-i18n.h:26
+#: filter/libfilter-i18n.h:43
 msgid "Recipients"
 msgstr "Получатели"
 
-#: filter/libfilter-i18n.h:27
+#: filter/libfilter-i18n.h:44
 msgid "Regex Match"
 msgstr ""
 
-#: filter/libfilter-i18n.h:28
+#: filter/libfilter-i18n.h:45
 msgid "Replied to"
 msgstr "Отговаря на"
 
-#: filter/libfilter-i18n.h:29 filter/score-rule.c:184 filter/score-rule.c:186
+#: filter/libfilter-i18n.h:46
+#, fuzzy
+msgid "returns"
+msgstr "Бърнс"
+
+#: filter/libfilter-i18n.h:47
+#, fuzzy
+msgid "returns greater than"
+msgstr "е по-голямо от"
+
+#: filter/libfilter-i18n.h:48
+#, fuzzy
+msgid "returns less than"
+msgstr "е по малко от"
+
+#: filter/libfilter-i18n.h:49 filter/score-rule.c:184 filter/score-rule.c:186
 #: mail/message-list.etspec.h:10
 msgid "Score"
 msgstr ""
 
-#: filter/libfilter-i18n.h:30
+#: filter/libfilter-i18n.h:50 mail/mail-callbacks.c:1820
 msgid "Sender"
 msgstr "Изпращач:"
 
-#: filter/libfilter-i18n.h:31
+#: filter/libfilter-i18n.h:51
 msgid "Set Status"
 msgstr "Задава статус"
 
-#: filter/libfilter-i18n.h:32
+#: filter/libfilter-i18n.h:52
 #, fuzzy
 msgid "Shell Command"
 msgstr "Компания"
 
-#: filter/libfilter-i18n.h:33
+#: filter/libfilter-i18n.h:53
 msgid "Size (kB)"
 msgstr "Размер (кБ)"
 
-#: filter/libfilter-i18n.h:34
+#: filter/libfilter-i18n.h:54
+msgid "sounds like"
+msgstr "звучи като"
+
+#: filter/libfilter-i18n.h:55
 msgid "Source Account"
 msgstr ""
 
-#: filter/libfilter-i18n.h:35
+#: filter/libfilter-i18n.h:56
 msgid "Specific header"
 msgstr "Специфично заглавие"
 
-#: filter/libfilter-i18n.h:37
+#: filter/libfilter-i18n.h:57
+msgid "starts with"
+msgstr "започва с"
+
+#: filter/libfilter-i18n.h:59
 msgid "Stop Processing"
 msgstr "Прекрати Обработката"
 
-#: filter/libfilter-i18n.h:38 mail/message-list.etspec.h:13
-#: mail/message-tag-followup.c:305
+#: filter/libfilter-i18n.h:60 mail/mail-format.c:933
+#: mail/message-list.etspec.h:13 mail/message-tag-followup.c:305
 msgid "Subject"
 msgstr "Тема"
 
-#: filter/libfilter-i18n.h:39
+#: filter/libfilter-i18n.h:61
 #, fuzzy
 msgid "Unset Status"
 msgstr "Задава статус"
 
-#: filter/libfilter-i18n.h:40
-msgid "contains"
-msgstr "съдържа"
-
-#: filter/libfilter-i18n.h:41
-msgid "does not contain"
-msgstr "не съдържа"
-
-#: filter/libfilter-i18n.h:42
-msgid "does not end with"
-msgstr "не завършва с"
-
-#: filter/libfilter-i18n.h:43
-msgid "does not exist"
-msgstr "не съществува"
-
-#: filter/libfilter-i18n.h:44
-#, fuzzy
-msgid "does not return"
-msgstr "не съществува"
-
-#: filter/libfilter-i18n.h:45
-msgid "does not sound like"
-msgstr "не звучи като"
-
-#: filter/libfilter-i18n.h:46
-msgid "does not start with"
-msgstr "не започва с"
-
-#: filter/libfilter-i18n.h:47
-msgid "ends with"
-msgstr "завършва с"
-
-#: filter/libfilter-i18n.h:48
-msgid "exists"
-msgstr "съществува"
-
-#: filter/libfilter-i18n.h:49
-#, fuzzy
-msgid "is Flagged"
-msgstr "Маркирано"
-
-#: filter/libfilter-i18n.h:50
-#, fuzzy
-msgid "is after"
-msgstr "било след"
-
-#: filter/libfilter-i18n.h:51
-#, fuzzy
-msgid "is before"
-msgstr "било преди"
-
-#: filter/libfilter-i18n.h:52
-msgid "is greater than"
-msgstr "е по-голямо от"
-
-#: filter/libfilter-i18n.h:53
-msgid "is less than"
-msgstr "е по малко от"
-
-#: filter/libfilter-i18n.h:54
-#, fuzzy
-msgid "is not Flagged"
-msgstr "Маркирано"
-
-#: filter/libfilter-i18n.h:55
-msgid "is not"
-msgstr "не е"
-
-#: filter/libfilter-i18n.h:56
-msgid "is"
-msgstr "е"
-
-#: filter/libfilter-i18n.h:57
-#, fuzzy
-msgid "returns greater than"
-msgstr "е по-голямо от"
-
-#: filter/libfilter-i18n.h:58
-#, fuzzy
-msgid "returns less than"
-msgstr "е по малко от"
-
-#: filter/libfilter-i18n.h:59
-#, fuzzy
-msgid "returns"
-msgstr "Бърнс"
-
-#: filter/libfilter-i18n.h:60
-msgid "sounds like"
-msgstr "звучи като"
-
-#: filter/libfilter-i18n.h:61
-msgid "starts with"
-msgstr "започва с"
-
-#: filter/rule-context.c:684 filter/rule-editor.c:241 filter/rule-editor.c:326
-#: mail/mail-vfolder.c:916
+#: filter/rule-context.c:664 filter/rule-editor.c:241 filter/rule-editor.c:326
+#: mail/mail-vfolder.c:917
 #, c-format
 msgid "Rule name '%s' is not unique, choose another."
 msgstr ""
@@ -12050,9 +11820,10 @@ msgid "Scanning %s"
 msgstr "Сканира на \"%s\""
 
 #: importers/elm-importer.c:525 importers/netscape-importer.c:2128
-#: importers/pine-importer.c:637 mail/component-factory.c:116
-#: mail/importers/elm-importer.c:526 mail/importers/netscape-importer.c:2085
-#: mail/importers/pine-importer.c:572 my-evolution/my-evolution.glade.h:4
+#: importers/pine-importer.c:637 mail/component-factory.c:117
+#: mail/folder-browser-ui.c:362 mail/importers/elm-importer.c:526
+#: mail/importers/netscape-importer.c:2085 mail/importers/pine-importer.c:572
+#: my-evolution/my-evolution.glade.h:4
 msgid "Mail"
 msgstr "Поща"
 
@@ -12119,7 +11890,7 @@ msgstr "Evolution импортира вашите стари дани от Netsc
 
 #. Fill in the new fields
 #: importers/netscape-importer.c:1872 mail/importers/netscape-importer.c:1842
-#: mail/mail-ops.c:1106 shell/e-local-storage.c:184
+#: mail/mail-ops.c:1092 shell/e-local-storage.c:184
 msgid "Trash"
 msgstr "Кошче"
 
@@ -12134,7 +11905,7 @@ msgid "Scanning directory"
 msgstr "Сканира директория"
 
 #: importers/netscape-importer.c:2047 mail/importers/netscape-importer.c:2015
-#: shell/e-shell-startup-wizard.c:556
+#: shell/e-shell-startup-wizard.c:541
 msgid "Starting import"
 msgstr "Стартира импорт"
 
@@ -12171,41 +11942,108 @@ msgstr ""
 msgid "Pine"
 msgstr "Pine"
 
-#: mail/component-factory.c:116
+#: mail/GNOME_Evolution_Mail.server.in.in.h:1
+msgid "Composer Preferences"
+msgstr ""
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:2
+msgid ""
+"Configure mail preferences, including security and message display, here"
+msgstr ""
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:3
+msgid "Configure spell-checking, signatures, and the message composer here"
+msgstr ""
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:4
+#, fuzzy
+msgid "Configure your email accounts here"
+msgstr "Създава или редактира пощенски акаунти и други настройки"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:5
+#, fuzzy
+msgid "Evolution Mail"
+msgstr "Evolution"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:6
+#, fuzzy
+msgid "Evolution Mail accounts configuration control"
+msgstr "Фабрика за контрол на задачи в Evolution"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:7
+#, fuzzy
+msgid "Evolution Mail component"
+msgstr "Композер на поща за Evolution."
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:8
+#, fuzzy
+msgid "Evolution Mail composer"
+msgstr "Композер на поща за Evolution."
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:9
+#, fuzzy
+msgid "Evolution Mail composer configuration control"
+msgstr "Фабрика за контрол на задачи в Evolution"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:10
+#, fuzzy
+msgid "Evolution Mail configuration interface"
+msgstr "Интерфейс на Mail Конфигурация"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:11
+#, fuzzy
+msgid "Evolution Mail folder viewer"
+msgstr "Компонент на Evolution за показване на пощенски папки"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:12
+#, fuzzy
+msgid "Evolution Mail preferences control"
+msgstr "Компонент на Evolution за показване на пощенски папки"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:13
+#, fuzzy
+msgid "Mail Accounts"
+msgstr "Акаунти"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:69
+msgid "Mail Preferences"
+msgstr ""
+
+#: mail/component-factory.c:117
 msgid "Folder containing mail"
 msgstr "Папка съдържаща поща"
 
-#: mail/component-factory.c:117
+#: mail/component-factory.c:118
 #, fuzzy
 msgid "Public Mail"
 msgstr "Публичен"
 
-#: mail/component-factory.c:117
+#: mail/component-factory.c:118
 #, fuzzy
 msgid "Public folder containing mail"
 msgstr "Папка съдържаща поща"
 
-#: mail/component-factory.c:118
+#: mail/component-factory.c:119
 msgid "Virtual Trash"
 msgstr "Виртуално Кошче"
 
-#: mail/component-factory.c:118
+#: mail/component-factory.c:119
 msgid "Virtual Trash folder"
 msgstr "Папка на Виртуално Кошче"
 
-#: mail/component-factory.c:146
+#: mail/component-factory.c:147
 msgid "This folder cannot contain messages."
 msgstr "Тази папка не може да съдържа съобщения."
 
-#: mail/component-factory.c:444
+#: mail/component-factory.c:441
 msgid "Properties..."
 msgstr "Свойства..."
 
-#: mail/component-factory.c:444
+#: mail/component-factory.c:441
 msgid "Change this folder's properties"
 msgstr "Промяна настройките на тази папка"
 
-#: mail/component-factory.c:826
+#: mail/component-factory.c:823
 msgid ""
 "Some of your mail settings seem corrupt, please check that everything is in "
 "order."
@@ -12213,121 +12051,250 @@ msgstr ""
 "Някой от вашите настройки за пощата изглеждат повредени, моля проверете дали "
 "всичко е наред."
 
-#: mail/component-factory.c:1008
+#: mail/component-factory.c:1004
 msgid "You have not set a mail transport method"
 msgstr "Не се указали метода на изпращане на поща"
 
-#: mail/component-factory.c:1031
+#: mail/component-factory.c:1027
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr ""
 
-#: mail/component-factory.c:1071
+#: mail/component-factory.c:1067
 msgid "New Mail Message"
 msgstr "Ново _Mail съобщение"
 
-#: mail/component-factory.c:1071
+#: mail/component-factory.c:1067
 msgid "_Mail Message"
 msgstr "_Пощенско Съобщение"
 
-#: mail/component-factory.c:1072
+#: mail/component-factory.c:1068
 #, fuzzy
 msgid "Compose a new mail message"
 msgstr "Напиши Съобщение"
 
-#: mail/component-factory.c:1080
+#: mail/component-factory.c:1076
 #, fuzzy
 msgid "New Message Post"
 msgstr "Ново Съобщение"
 
-#: mail/component-factory.c:1080
+#: mail/component-factory.c:1076
 #, fuzzy
 msgid "_Post Message"
 msgstr "Предишно Съобщение"
 
-#: mail/component-factory.c:1081
+#: mail/component-factory.c:1077
 #, fuzzy
 msgid "Post a new mail message"
 msgstr "Ново _Mail съобщение"
 
-#: mail/component-factory.c:1373
+#: mail/component-factory.c:1369
 #, fuzzy
 msgid "Connecting..."
 msgstr "Свързване със сървъра..."
 
-#: mail/component-factory.c:1384
+#: mail/component-factory.c:1380
 msgid "Cannot register storage with shell"
 msgstr "Не мога да регистрирам хранилището със shell"
 
-#: mail/folder-info.c:70
-msgid "Getting Folder Information"
-msgstr "Получавам информация за папка"
+#: mail/folder-browser-ui.c:488
+#, c-format
+msgid "Properties for \"%s\""
+msgstr "Свойства за \"%s\""
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:1
-msgid "Composer Preferences"
-msgstr ""
+#: mail/folder-browser-ui.c:490
+msgid "Properties"
+msgstr "Свойства"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:2
-msgid ""
-"Configure mail preferences, including security and message display, here"
+#: mail/folder-browser.c:329 mail/mail-display.c:393 mail/mail-display.c:917
+#, c-format
+msgid "Could not create temporary directory: %s"
+msgstr "Не мога да създам временна директория: %s"
+
+#: mail/folder-browser.c:804
+#, c-format
+msgid "%d new"
+msgstr "%d нов"
+
+#: mail/folder-browser.c:807 mail/folder-browser.c:815
+#: mail/folder-browser.c:818
+msgid ", "
+msgstr ", "
+
+#: mail/folder-browser.c:809
+#, c-format
+msgid "%d hidden"
+msgstr "%d скрит"
+
+#: mail/folder-browser.c:811
+#, c-format
+msgid "%d visible"
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:3
-msgid "Configure spell-checking, signatures, and the message composer here"
+#: mail/folder-browser.c:816
+#, c-format
+msgid "%d selected"
+msgstr " %d избрано"
+
+#: mail/folder-browser.c:821
+#, c-format
+msgid "%d unsent"
+msgstr " %d неизпратено"
+
+#: mail/folder-browser.c:823
+#, c-format
+msgid "%d sent"
+msgstr " %d изпратено"
+
+#: mail/folder-browser.c:825
+#, c-format
+msgid "%d total"
+msgstr "%d общо"
+
+#: mail/folder-browser.c:1204
+#, fuzzy
+msgid "Create _Virtual Folder From Search..."
+msgstr "Създава Виртуална _Папка От Съобщение"
+
+#: mail/folder-browser.c:1776
+msgid "VFolder on _Subject"
+msgstr "VFolder върху _Тема"
+
+#: mail/folder-browser.c:1777
+msgid "VFolder on Se_nder"
+msgstr "_vПапка на Изпращач"
+
+#: mail/folder-browser.c:1778
+msgid "VFolder on _Recipients"
+msgstr "v_Папка на Получатели"
+
+#: mail/folder-browser.c:1779
+msgid "VFolder on Mailing _List"
+msgstr "Филтър върху _Mailing List"
+
+#: mail/folder-browser.c:1783
+msgid "Filter on Sub_ject"
+msgstr "Филтър върху Т_ема"
+
+#: mail/folder-browser.c:1784
+msgid "Filter on Sen_der"
+msgstr "Филтър върху Из_пращач"
+
+#: mail/folder-browser.c:1785
+msgid "Filter on Re_cipients"
+msgstr "Филтър върху По_лучатели"
+
+#: mail/folder-browser.c:1786 mail/folder-browser.c:2110
+msgid "Filter on _Mailing List"
+msgstr "Филтър върху Mailing _List"
+
+#: mail/folder-browser.c:1804
+msgid "_Edit as New Message..."
+msgstr "Редактирай като ново съобщение..."
+
+#: mail/folder-browser.c:1806
+msgid "_Print"
+msgstr "Печат"
+
+#: mail/folder-browser.c:1810 ui/evolution-mail-message.xml.h:112
+msgid "_Reply to Sender"
+msgstr "Отговори на подателя"
+
+#: mail/folder-browser.c:1811 ui/evolution-mail-message.xml.h:76
+msgid "Reply to _List"
+msgstr "Отговори на списъка"
+
+#: mail/folder-browser.c:1812 ui/evolution-mail-message.xml.h:75
+msgid "Reply to _All"
+msgstr "Отговори на всички"
+
+#: mail/folder-browser.c:1813
+msgid "_Forward"
+msgstr "Препрати"
+
+#: mail/folder-browser.c:1817
+msgid "Follo_w Up..."
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:4
+#: mail/folder-browser.c:1818
 #, fuzzy
-msgid "Configure your email accounts here"
-msgstr "Създава или редактира пощенски акаунти и други настройки"
+msgid "Fla_g Completed"
+msgstr "Приключено"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:5
+#: mail/folder-browser.c:1819
 #, fuzzy
-msgid "Evolution Mail"
-msgstr "Evolution"
+msgid "Cl_ear Flag"
+msgstr "Изчисти"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:6
+#. separator here?
+#: mail/folder-browser.c:1823 ui/evolution-mail-message.xml.h:44
+msgid "Mar_k as Read"
+msgstr "Отбележи: прочетено"
+
+#: mail/folder-browser.c:1824
 #, fuzzy
-msgid "Evolution Mail accounts configuration control"
-msgstr "Фабрика за контрол на задачи в Evolution"
+msgid "Mark as _Unread"
+msgstr "Отбележи: непрочетено"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:7
+#: mail/folder-browser.c:1825
+msgid "Mark as _Important"
+msgstr "Маркира като В_ажно"
+
+#: mail/folder-browser.c:1826
 #, fuzzy
-msgid "Evolution Mail component"
-msgstr "Композер на поща за Evolution."
+msgid "_Mark as Unimportant"
+msgstr "Маркирай като Не_важни"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:8
+#: mail/folder-browser.c:1831
 #, fuzzy
-msgid "Evolution Mail composer"
-msgstr "Композер на поща за Evolution."
+msgid "U_ndelete"
+msgstr "Възстанови изтрито"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:9
+#: mail/folder-browser.c:1835
 #, fuzzy
-msgid "Evolution Mail composer configuration control"
-msgstr "Фабрика за контрол на задачи в Evolution"
+msgid "Mo_ve to Folder..."
+msgstr "Премести в Папка..."
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:10
+#: mail/folder-browser.c:1836 ui/evolution-addressbook.xml.h:31
+msgid "_Copy to Folder..."
+msgstr "Копирай в Папка..."
+
+#: mail/folder-browser.c:1844
 #, fuzzy
-msgid "Evolution Mail configuration interface"
-msgstr "Интерфейс на Mail Конфигурация"
+msgid "Add Sender to Address_book"
+msgstr "Добави подателя в адресната книга"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:11
+#: mail/folder-browser.c:1848
 #, fuzzy
-msgid "Evolution Mail folder viewer"
-msgstr "Компонент на Evolution за показване на пощенски папки"
+msgid "Appl_y Filters"
+msgstr "Приложи Филтри"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:12
+#: mail/folder-browser.c:1852
 #, fuzzy
-msgid "Evolution Mail preferences control"
-msgstr "Компонент на Evolution за показване на пощенски папки"
+msgid "Crea_te Rule From Message"
+msgstr "Създай правило от съобщението"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:13
+#: mail/folder-browser.c:2111
 #, fuzzy
-msgid "Mail Accounts"
-msgstr "Акаунти"
+msgid "VFolder on M_ailing List"
+msgstr "ВПапка по пощенски списък"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:69
-msgid "Mail Preferences"
-msgstr ""
+#: mail/folder-browser.c:2113
+#, fuzzy, c-format
+msgid "Filter on _Mailing List (%s)"
+msgstr "Филтър по пощенски списък (%s)"
+
+#: mail/folder-browser.c:2114
+#, fuzzy, c-format
+msgid "VFolder on M_ailing List (%s)"
+msgstr "ВПапка по пощенски списък (%s)"
+
+#: mail/folder-browser.h:26 mail/mail-config.glade.h:39
+msgid "Default"
+msgstr "По подразбиране"
+
+#: mail/folder-info.c:70
+msgid "Getting Folder Information"
+msgstr "Получавам информация за папка"
 
 #: mail/importers/GNOME_Evolution_Mail_Elm_Intelligent_Importer.server.in.in.h:1
 #, fuzzy
@@ -12420,7 +12387,7 @@ msgstr "_Потрбителско име:"
 msgid "_Path:"
 msgstr "_Път:"
 
-#: mail/mail-account-gui.c:1886
+#: mail/mail-account-gui.c:1887
 msgid "You may not create two accounts with the same name."
 msgstr "Вие не може да имате две сигнатури с едно име."
 
@@ -12452,17 +12419,17 @@ msgstr "По подразбиране"
 
 #. FIXME: This routine should just be a "toggled" event handler on the checkbox cell renderer which
 #. has "activatable" set.
-#: mail/mail-accounts.c:481 mail/mail-composer-prefs.c:708
-#: mail/mail-composer-prefs.c:854
+#: mail/mail-accounts.c:481 mail/mail-accounts.etspec.h:2
+#: mail/mail-composer-prefs.c:708 mail/mail-composer-prefs.c:854
 msgid "Enabled"
 msgstr "Разрешен"
 
-#: mail/mail-accounts.c:487
+#: mail/mail-accounts.c:487 mail/mail-accounts.etspec.h:1
 #, fuzzy
 msgid "Account name"
 msgstr "Потребителско име:"
 
-#: mail/mail-accounts.c:489
+#: mail/mail-accounts.c:489 mail/mail-accounts.etspec.h:3
 #, fuzzy
 msgid "Protocol"
 msgstr "Пуерто Рико"
@@ -12503,6 +12470,217 @@ msgid ""
 "And have been updated."
 msgstr ""
 
+#. Add the "Don't show this message again." checkbox
+#: mail/mail-callbacks.c:101 widgets/misc/e-messagebox.c:226
+msgid "Don't show this message again."
+msgstr "Не показвай това съобщение отново."
+
+#: mail/mail-callbacks.c:190
+msgid ""
+"You have not configured the mail client.\n"
+"You need to do this before you can send,\n"
+"receive or compose mail.\n"
+"Would you like to configure it now?"
+msgstr ""
+"Не сте конфигурирали Вашият mail клиент.\n"
+"Трябва да го направите за да може да изпращате,\n"
+"получавате или пишете поща.\n"
+"Искате ли да го конфигурурате сега?"
+
+#: mail/mail-callbacks.c:212
+#, fuzzy
+msgid ""
+"You need to configure an account\n"
+"before you can compose mail."
+msgstr ""
+"Необходимо е да конфигурирате потребител\n"
+"преди да създадете поща."
+
+#: mail/mail-callbacks.c:226
+msgid ""
+"You need to configure an identity\n"
+"before you can compose mail."
+msgstr ""
+"Необходимо е да конфигурирате потребител\n"
+"преди да създадете поща."
+
+#: mail/mail-callbacks.c:233
+msgid ""
+"You need to configure a mail transport\n"
+"before you can compose mail."
+msgstr ""
+"Необходимо е да конфигурирате транспорт на поща\n"
+"преди да създадете поща."
+
+#. FIXME: this wording sucks
+#: mail/mail-callbacks.c:255
+#, fuzzy
+msgid ""
+"You are sending an HTML-formatted message. Please make sure that\n"
+"the following recipients are willing and able to receive HTML mail:\n"
+msgstr ""
+"Вие изпращате HTML-форматирано съобщение, но следните получатели не искат "
+"HTML форматирана поща:\n"
+
+#: mail/mail-callbacks.c:267
+msgid "Send anyway?"
+msgstr "Изпрати въпреки това?"
+
+#: mail/mail-callbacks.c:288
+msgid ""
+"This message has no subject.\n"
+"Really send?"
+msgstr ""
+"Съобщението няма Тема.\n"
+"Найстина ли да го изпратя?"
+
+#: mail/mail-callbacks.c:314
+msgid ""
+"Since the contact list you are sending to is configured to hide the list's "
+"addresses, this message will contain only Bcc recipients."
+msgstr ""
+
+#: mail/mail-callbacks.c:318
+msgid "This message contains only Bcc recipients."
+msgstr "Това съобщение съдържа само Bcc получател."
+
+#: mail/mail-callbacks.c:323
+msgid ""
+"It is possible that the mail server may reveal the recipients by adding an "
+"Apparently-To header.\n"
+"Send anyway?"
+msgstr ""
+
+#: mail/mail-callbacks.c:472
+msgid "You must specify recipients in order to send this message."
+msgstr "Трябва да укажете получател(и) за да може да изпратите съобщението."
+
+#: mail/mail-callbacks.c:724
+msgid ""
+"Unable to open the drafts folder for this account.\n"
+"Would you like to use the default drafts folder?"
+msgstr ""
+"Не мога да отворя папката чернова за този акаунт.\n"
+"Искате ли да използвате подразбираща се?"
+
+#: mail/mail-callbacks.c:1189
+msgid "an unknown sender"
+msgstr "неизвестен изпрашач"
+
+#: mail/mail-callbacks.c:1193
+msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
+msgstr "На %a, %Y-%m-%d в %H:%M, %%s записа:"
+
+#: mail/mail-callbacks.c:1700 mail/message-browser.c:132
+msgid "Move message(s) to"
+msgstr "Премести съобщени(ето/ята) в"
+
+#: mail/mail-callbacks.c:1702 mail/message-browser.c:134
+msgid "Copy message(s) to"
+msgstr "Копирай съобщени(ето/ята) в"
+
+#: mail/mail-callbacks.c:2344
+#, c-format
+msgid "Are you sure you want to edit all %d messages?"
+msgstr "Сигурен ли сте, че искате да редактирате всички %d съобщения?"
+
+#: mail/mail-callbacks.c:2360
+msgid ""
+"You may only edit messages saved\n"
+"in the Drafts folder."
+msgstr ""
+"Можете да редактирате само съобщения записани\n"
+"в папката Drafts."
+
+#: mail/mail-callbacks.c:2393
+msgid ""
+"You may only resend messages\n"
+"in the Sent folder."
+msgstr ""
+"Можете да изпращате отново само съобщения записани\n"
+"в папката Sent."
+
+#: mail/mail-callbacks.c:2403
+#, c-format
+msgid "Are you sure you want to resend all %d messages?"
+msgstr "Сигурен ли сте, че искате да препратите всичките %d съобщения?"
+
+#: mail/mail-callbacks.c:2424
+msgid "No Message Selected"
+msgstr "Няма Избрано Съобщение"
+
+#: mail/mail-callbacks.c:2465
+#, fuzzy, c-format
+msgid ""
+"Cannot save to `%s'\n"
+" %s"
+msgstr ""
+"Не мога да взема съобщение: %s\n"
+"  %s"
+
+#: mail/mail-callbacks.c:2470
+#, fuzzy, c-format
+msgid ""
+"`%s' already exists.\n"
+"Overwrite it?"
+msgstr ""
+"%s вече съществува\n"
+"Искате ли да го презапишете?"
+
+#: mail/mail-callbacks.c:2511
+msgid "Save Message As..."
+msgstr "Съхрани Съобщението Като..."
+
+#: mail/mail-callbacks.c:2513
+msgid "Save Messages As..."
+msgstr "Съхрани Съобщението Като..."
+
+#: mail/mail-callbacks.c:2686
+#, fuzzy
+msgid ""
+"This operation will permanently erase all messages marked as\n"
+"deleted. If you continue, you will not be able to recover these messages.\n"
+"\n"
+"Really erase these messages?"
+msgstr ""
+"Тази операция ще изтрие за постоянно всички съобщения маркирани за "
+"изтриване. Ако продължите, вие няма да сте в състояние да възстановите тези "
+"съобщения.\n"
+"\n"
+"Действително ли да изтрия съобщенията?"
+
+#: mail/mail-callbacks.c:2781
+#, c-format
+msgid ""
+"Error loading filter information:\n"
+"%s"
+msgstr ""
+"Грешка при зареждане информацията за финтъра:\n"
+"%s"
+
+#: mail/mail-callbacks.c:2789
+msgid "Filters"
+msgstr "Филтри"
+
+#: mail/mail-callbacks.c:2830
+#, fuzzy, c-format
+msgid "Page %d of %d"
+msgstr "Получаване на съобщение номер %d от %d"
+
+#: mail/mail-callbacks.c:2886
+msgid "Print Message"
+msgstr "Отпечатай Съобщението"
+
+#: mail/mail-callbacks.c:2954
+msgid "Printing of message failed"
+msgstr "Отпечатването неуспешно"
+
+#: mail/mail-callbacks.c:3147
+#, c-format
+msgid "Are you sure you want to open all %d messages in separate windows?"
+msgstr ""
+"Сигурен ли сте, че искате да отворите всички %d съобщения в отделни прозорци?"
+
 #: mail/mail-composer-prefs.c:226 mail/mail-composer-prefs.c:349
 #: mail/mail-config.c:1376
 #, fuzzy
@@ -12534,19 +12712,11 @@ msgstr "Добави критерии"
 msgid "Signature(s)"
 msgstr "_Файл с Подпис:"
 
-#: mail/mail-config.c:1080
-msgid "Checking Service"
-msgstr "Проверява Обслужване"
-
-#: mail/mail-config.c:1158 mail/mail-config.c:1162
-msgid "Connecting to server..."
-msgstr "Свързване със сървъра..."
-
-#: mail/mail-config-druid.c:367 mail/mail-config.glade.h:61
+#: mail/mail-config-druid.c:380 mail/mail-config.glade.h:61
 msgid "Identity"
 msgstr "Потребител"
 
-#: mail/mail-config-druid.c:369
+#: mail/mail-config-druid.c:382
 #, fuzzy
 msgid ""
 "Please enter your name and email address below. The \"optional\" fields "
@@ -12557,12 +12727,12 @@ msgstr ""
 "\"опционални\" по-долу не е задължително да бъдат запълнени,\n"
 "освен ако не искате тази информация да бъде изпращана по пощата."
 
-#: mail/mail-config-druid.c:375 mail/mail-config-druid.c:382
+#: mail/mail-config-druid.c:388 mail/mail-config-druid.c:395
 #, fuzzy
 msgid "Receiving Mail"
 msgstr "Получаване на Пощата"
 
-#: mail/mail-config-druid.c:377
+#: mail/mail-config-druid.c:390
 #, fuzzy
 msgid ""
 "Please enter information about your incoming mail server below. If you are "
@@ -12572,16 +12742,16 @@ msgstr ""
 "Ако не сте сигурен питайте системният\n"
 "администратор или вашият доставчик на поща."
 
-#: mail/mail-config-druid.c:384
+#: mail/mail-config-druid.c:397
 msgid "Please select among the following options"
 msgstr "Моля, изберете от следните опции"
 
-#: mail/mail-config-druid.c:387
+#: mail/mail-config-druid.c:400
 #, fuzzy
 msgid "Sending Mail"
 msgstr "Изпращане на Email"
 
-#: mail/mail-config-druid.c:389
+#: mail/mail-config-druid.c:402
 #, fuzzy
 msgid ""
 "Please enter information about the way you will send mail. If you are not "
@@ -12591,11 +12761,11 @@ msgstr ""
 "сигурен питайте системният\n"
 "администратор или вашият доставчик на поща."
 
-#: mail/mail-config-druid.c:394 mail/mail-config.glade.h:10
+#: mail/mail-config-druid.c:407 mail/mail-config.glade.h:10
 msgid "Account Management"
 msgstr "Мениджър на Акаунт"
 
-#: mail/mail-config-druid.c:396
+#: mail/mail-config-druid.c:409
 #, fuzzy
 msgid ""
 "You are almost done with the mail configuration process. The identity, "
@@ -12611,6 +12781,14 @@ msgstr ""
 "да състави акаунта за пощата. Моля въведете име за този акаунт долу.\n"
 "Това име ще бъде предназначено само за показване."
 
+#: mail/mail-config.c:1080
+msgid "Checking Service"
+msgstr "Проверява Обслужване"
+
+#: mail/mail-config.c:1158 mail/mail-config.c:1162
+msgid "Connecting to server..."
+msgstr "Свързване със сървъра..."
+
 #: mail/mail-config.glade.h:3
 msgid " _Check for supported types "
 msgstr " _Проверка за подържани типове"
@@ -12743,10 +12921,6 @@ msgstr ""
 msgid "De_fault"
 msgstr "По Подразбиране"
 
-#: mail/mail-config.glade.h:39
-msgid "Default"
-msgstr "По подразбиране"
-
 #: mail/mail-config.glade.h:40
 #, fuzzy
 msgid "Default Behavior"
@@ -13242,47 +13416,246 @@ msgstr "Изплзва криптирана връзка (_SSL)"
 msgid "_Use the same fonts as other applications"
 msgstr ""
 
+#: mail/mail-config.glade.h:171
+#, fuzzy
+msgid "color"
+msgstr " цвят"
+
 #: mail/mail-config.glade.h:172
 msgid "description"
 msgstr "описание"
 
-#: mail/mail-folder-cache.c:832
+#: mail/mail-crypto.c:84
+msgid "Could not create a S/MIME signature context."
+msgstr "Не мога да създам сигнатурен контекст за S/MIME"
+
+#: mail/mail-crypto.c:116
+msgid "Could not create a S/MIME certsonly context."
+msgstr ""
+
+#: mail/mail-crypto.c:148
+msgid "Could not create a S/MIME encryption context."
+msgstr "Не мога да създам S/MIME криптиращ контекст."
+
+#: mail/mail-crypto.c:180
+msgid "Could not create a S/MIME envelope context."
+msgstr ""
+
+#: mail/mail-crypto.c:211
+msgid "Could not create a S/MIME decode context."
+msgstr "Не мога да създам декодиращ контекст за S/MIME"
+
+#: mail/mail-display.c:196
+#, fuzzy, c-format
+msgid ""
+"File `%s' already exists.\n"
+"Overwrite it?"
+msgstr ""
+"Файл със същото име вече съществува.\n"
+"Да го презапиша ли?"
+
+#: mail/mail-display.c:335
+msgid "Save Attachment"
+msgstr "Запазва Прикачен"
+
+#: mail/mail-display.c:408
+#, fuzzy, c-format
+msgid "Could not create temporary file '%s': %s"
+msgstr "Не мога да създам временна директория: %s"
+
+#: mail/mail-display.c:476
+#, fuzzy
+msgid "Save Attachment..."
+msgstr "Запазва Прикачен"
+
+#: mail/mail-display.c:477
+msgid "View Inline"
+msgstr ""
+
+#: mail/mail-display.c:478
+#, c-format
+msgid "Open in %s..."
+msgstr "Отвори в %s..."
+
+#: mail/mail-display.c:538
+#, c-format
+msgid "View Inline (via %s)"
+msgstr ""
+
+#: mail/mail-display.c:542
+msgid "Hide"
+msgstr "Скрий"
+
+#: mail/mail-display.c:562
+msgid "External Viewer"
+msgstr "Външен Viewer"
+
+#: mail/mail-display.c:1348
+#, fuzzy
+msgid "Downloading images"
+msgstr "Зарежда _Картинки"
+
+#: mail/mail-display.c:1525
+msgid "Loading message content"
+msgstr "Зареждам съсдържанието на съобщението"
+
+#: mail/mail-display.c:1867
+#, fuzzy
+msgid "Overdue:"
+msgstr "П_ресрочени задачи:"
+
+#: mail/mail-display.c:1871
+#, fuzzy
+msgid "by %B %d, %Y, %l:%M %P"
+msgstr "%b %d %l:%M %p"
+
+#: mail/mail-display.c:2235
+msgid "Open Link in Browser"
+msgstr "_Отвори Указател в Браузер"
+
+#: mail/mail-display.c:2236
+msgid "Copy Link Location"
+msgstr "Копира местоположениет на указател"
+
+#: mail/mail-display.c:2238
+msgid "Save Link as (FIXME)"
+msgstr "Запазва указателя като (FIXME)"
+
+#: mail/mail-display.c:2240
+msgid "Save Image as..."
+msgstr "Съхрани картинка като..."
+
+#: mail/mail-folder-cache.c:745
 #, fuzzy, c-format
 msgid "Pinging %s"
 msgstr "Сканира на \"%s\""
 
+#: mail/mail-format.c:664
+#, c-format
+msgid "%s attachment"
+msgstr "%s прикачен"
+
+#: mail/mail-format.c:706 mail/mail-format.c:1343 mail/mail-format.c:1414
+#: mail/mail-format.c:1534 mail/mail-format.c:1658 mail/mail-format.c:1683
+msgid "Could not parse MIME message. Displaying as source."
+msgstr "Не мога да анализирам MIME съобщение. Показвам го в изходен код."
+
+#: mail/mail-format.c:784 mail/message-list.etspec.h:2
+msgid "Date"
+msgstr "Дата"
+
+#: mail/mail-format.c:870
+msgid "Bad Address"
+msgstr "Грешен Адрес"
+
+#: mail/mail-format.c:911 mail/message-list.etspec.h:7
+#: mail/message-tag-followup.c:301
+msgid "From"
+msgstr "От"
+
+#: mail/mail-format.c:915
+msgid "Reply-To"
+msgstr "Отговор-До"
+
+#: mail/mail-format.c:920 mail/message-list.etspec.h:14
+msgid "To"
+msgstr "До"
+
+#: mail/mail-format.c:925
+msgid "Cc"
+msgstr "Cc"
+
+#: mail/mail-format.c:930
+msgid "Bcc"
+msgstr "Bcc"
+
+#: mail/mail-format.c:1457
+msgid ""
+"This message is digitally signed. Click the lock icon for more information."
+msgstr ""
+"Това съобщение е цифрово подписано. Кликнете на иконата за заключване за "
+"повече информация."
+
+#: mail/mail-format.c:1485
+#, fuzzy
+msgid "Could not create a PGP verfication context"
+msgstr "Не мога да създам контекст за проверка на PGP"
+
+#: mail/mail-format.c:1493
+#, fuzzy
+msgid "This message is digitally signed and has been found to be authentic."
+msgstr ""
+"Това съобщение е цифрово подписано. Кликнете на иконата за заключване за "
+"повече информация."
+
+#: mail/mail-format.c:1500
+#, fuzzy
+msgid "This message is digitally signed but can not be proven to be authentic."
+msgstr ""
+"Това съобщение е цифрово подписано. Кликнете на иконата за заключване за "
+"повече информация."
+
+#: mail/mail-format.c:1764
+#, c-format
+msgid "Pointer to FTP site (%s)"
+msgstr "Указател към FTP сайт (%s)"
+
+#: mail/mail-format.c:1775
+#, c-format
+msgid "Pointer to local file (%s) valid at site \"%s\""
+msgstr "Указател към локален файл (%s) валиден на сайта \"%s\""
+
+#: mail/mail-format.c:1778
+#, c-format
+msgid "Pointer to local file (%s)"
+msgstr "Указател към локален файл (%s)"
+
+#: mail/mail-format.c:1805
+#, c-format
+msgid "Pointer to remote data (%s)"
+msgstr "Указател към отдалечени данни (%s)"
+
+#: mail/mail-format.c:1811
+#, c-format
+msgid "Pointer to unknown external data (\"%s\" type)"
+msgstr "Указател към неизвестни външни данни (\"%s\" type)"
+
+#: mail/mail-format.c:1813
+msgid "Malformed external-body part."
+msgstr ""
+
 #: mail/mail-local.c:541 mail/mail-local.c:543
 #, fuzzy, c-format
 msgid "Local folders/%s"
 msgstr "Локални Папки"
 
-#: mail/mail-local.c:711
+#: mail/mail-local.c:671
 msgid "Reconfiguring folder"
 msgstr "Реконфигуриране на папка"
 
-#: mail/mail-local.c:792
+#: mail/mail-local.c:752
 #, fuzzy, c-format
 msgid ""
 "Cannot save folder metainfo; you may find you can't\n"
 "open this folder anymore: %s: %s"
 msgstr "Не мога да запзя мета информация в папка %s: %s"
 
-#: mail/mail-local.c:848
+#: mail/mail-local.c:808
 #, c-format
 msgid "Cannot save folder metainfo to %s: %s"
 msgstr "Не мога да запзя мета информация в папка %s: %s"
 
-#: mail/mail-local.c:900
+#: mail/mail-local.c:860
 #, c-format
 msgid "Cannot delete folder metadata %s: %s"
 msgstr ""
 
-#: mail/mail-local.c:1363
+#: mail/mail-local.c:1323
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "Променям папка \"%s\" в \"%s\" формат"
 
-#: mail/mail-local.c:1388
+#: mail/mail-local.c:1348
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
@@ -13290,16 +13663,16 @@ msgstr ""
 "Ако не може повече да отваряте този mailbox,\n"
 "необходимо е да го поправите ръчно."
 
-#: mail/mail-local.c:1488
+#: mail/mail-local.c:1448
 #, c-format
 msgid "Reconfigure /%s"
 msgstr "Реконфигурира /%s"
 
-#: mail/mail-local.c:1552
+#: mail/mail-local.c:1512
 msgid "You cannot change the format of a non-local folder."
 msgstr "Вие не може да промените формата на нелокална папка."
 
-#: mail/mail-mt.c:259
+#: mail/mail-mt.c:257
 #, c-format
 msgid ""
 "Error while '%s':\n"
@@ -13308,7 +13681,7 @@ msgstr ""
 "Грешка при '%s':\n"
 "%s"
 
-#: mail/mail-mt.c:262
+#: mail/mail-mt.c:260
 #, c-format
 msgid ""
 "Error while performing operation:\n"
@@ -13317,131 +13690,118 @@ msgstr ""
 "Грешка при извършване на операция:\n"
 "%s"
 
-#: mail/mail-mt.c:913
+#: mail/mail-mt.c:904
 msgid "Working"
 msgstr "Работи"
 
-#: mail/mail-ops.c:87
+#: mail/mail-ops.c:86
 msgid "Filtering Folder"
 msgstr "Филтър върху папка"
 
-#: mail/mail-ops.c:260
+#: mail/mail-ops.c:264
 msgid "Fetching Mail"
 msgstr "Получаване на Пощата"
 
-#: mail/mail-ops.c:557
-#, fuzzy, c-format
-msgid "Failed to apply outgoing filters: %s"
-msgstr "Неуспех при запазване на поща във времен файл %s: %s"
-
-#: mail/mail-ops.c:578
-#, c-format
-msgid ""
-"Failed to append to %s: %s\n"
-"Appending to local `Sent' folder instead."
-msgstr ""
-
-#: mail/mail-ops.c:587
-#, fuzzy, c-format
-msgid "Failed to append to local `Sent' folder: %s"
-msgstr "Неуспех при запазване на поща във времен файл %s: %s"
+#: mail/mail-ops.c:550 mail/mail-ops.c:579
+msgid "However, the message was successfully sent."
+msgstr "Обаче, съобщението беше изпратено успешно."
 
-#: mail/mail-ops.c:629
+#: mail/mail-ops.c:611
 #, c-format
 msgid "Sending \"%s\""
 msgstr "Изпращане на \"%s\""
 
-#: mail/mail-ops.c:747
+#: mail/mail-ops.c:729
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Изпращане на съпбщение %d от %d"
 
-#: mail/mail-ops.c:766
+#: mail/mail-ops.c:748
 #, c-format
 msgid "Failed on message %d of %d"
 msgstr "Грешка на съобщение %d от %d"
 
-#: mail/mail-ops.c:768
+#: mail/mail-ops.c:750 mail/mail-send-recv.c:581
 msgid "Complete."
 msgstr "Приключено."
 
-#: mail/mail-ops.c:862
+#: mail/mail-ops.c:844
 msgid "Saving message to folder"
 msgstr "Запазва съобщението в папка"
 
-#: mail/mail-ops.c:943
+#: mail/mail-ops.c:925
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Премести съобщени в %s"
 
-#: mail/mail-ops.c:943
+#: mail/mail-ops.c:925
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Копиране на съобщението в %s"
 
-#: mail/mail-ops.c:1056
+#: mail/mail-ops.c:1042
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Сканиране на папки в \"%s\""
 
-#: mail/mail-ops.c:1244
+#: mail/mail-ops.c:1225
 msgid "Forwarded messages"
 msgstr "Препратени съобщения"
 
-#: mail/mail-ops.c:1287
+#: mail/mail-ops.c:1268
 #, c-format
 msgid "Opening folder %s"
 msgstr "Отваряне на папка %s"
 
-#: mail/mail-ops.c:1359
+#: mail/mail-ops.c:1340
 #, c-format
 msgid "Opening store %s"
 msgstr "Отваря хранилище %s"
 
-#: mail/mail-ops.c:1437
+#: mail/mail-ops.c:1413
 #, c-format
 msgid "Removing folder %s"
 msgstr "Изтривам папка %s"
 
-#: mail/mail-ops.c:1531
+#: mail/mail-ops.c:1507
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Запазване на папка %s"
 
-#: mail/mail-ops.c:1582
+#: mail/mail-ops.c:1558
 msgid "Refreshing folder"
 msgstr "Освежаване на папка"
 
-#: mail/mail-ops.c:1618 mail/mail-ops.c:1669
+#: mail/mail-ops.c:1594 mail/mail-ops.c:1645
 msgid "Expunging folder"
 msgstr "Изтриване на папка"
 
-#: mail/mail-ops.c:1666
+#: mail/mail-ops.c:1642
 #, fuzzy, c-format
 msgid "Emptying trash in '%s'"
 msgstr "Импортира %s като %s"
 
-#: mail/mail-ops.c:1667 my-evolution/e-summary-mail.c:483
+#: mail/mail-ops.c:1643 my-evolution/e-summary-mail.c:483
 #: shell/e-local-storage.c:1151
 msgid "Local Folders"
 msgstr "Локални Папки"
 
-#: mail/mail-ops.c:1742
+#: mail/mail-ops.c:1718
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Получавам съобщение %s"
 
-#: mail/mail-ops.c:1814
+#: mail/mail-ops.c:1790
 #, c-format
 msgid "Retrieving %d message(s)"
 msgstr "Получавам %d съобщение"
 
-#: mail/mail-ops.c:1898
+#: mail/mail-ops.c:1876
 #, c-format
 msgid "Saving %d messsage(s)"
 msgstr "Съхраняване на %d съобщения"
 
-#: mail/mail-ops.c:1946
+#: mail/mail-ops.c:1924
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -13450,7 +13810,7 @@ msgstr ""
 "Не мога да създам изходен файл: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1974
+#: mail/mail-ops.c:1952
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -13459,11 +13819,11 @@ msgstr ""
 "Грешка при запазване на съобщения в: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2045
+#: mail/mail-ops.c:2026
 msgid "Saving attachment"
 msgstr "Запазвам прикачено"
 
-#: mail/mail-ops.c:2062
+#: mail/mail-ops.c:2043
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -13472,75 +13832,107 @@ msgstr ""
 "Не мога да създам изходен файл: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2092
+#: mail/mail-ops.c:2073
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Не мога да запиша данните: %s"
 
-#: mail/mail-ops.c:2240
+#: mail/mail-ops.c:2221
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Разкачване от %s"
 
-#: mail/mail-ops.c:2240
+#: mail/mail-ops.c:2221
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Отново връзка с %s"
 
-#: mail/mail-send-recv.c:147
+#: mail/mail-search.c:154
+msgid "(Untitled Message)"
+msgstr "(Неименувано Съобщение)"
+
+#: mail/mail-search.c:236
+msgid "Untitled Message"
+msgstr "Неименувано Съобщение"
+
+#: mail/mail-search.c:238
+msgid "Empty Message"
+msgstr "Празно Съобщение"
+
+#: mail/mail-search.c:287
+msgid "Find in Message"
+msgstr "Търси в съобщението"
+
+#: mail/mail-search.c:320
+msgid "Case Sensitive"
+msgstr "Със значение на малки/големи букви"
+
+#: mail/mail-search.c:322
+msgid "Search Forward"
+msgstr "Търси нататък"
+
+#: mail/mail-search.c:342
+msgid "Find:"
+msgstr "Намери:"
+
+#: mail/mail-search.c:346
+msgid "Matches:"
+msgstr "Съвпадения:"
+
+#: mail/mail-send-recv.c:146
 msgid "Cancelling..."
 msgstr "Прекратяване..."
 
-#: mail/mail-send-recv.c:255
+#: mail/mail-send-recv.c:254
 #, c-format
 msgid "Server: %s, Type: %s"
 msgstr "Сървър:%s, Тип: %s"
 
-#: mail/mail-send-recv.c:257
+#: mail/mail-send-recv.c:256
 #, c-format
 msgid "Path: %s, Type: %s"
 msgstr "Път: %s, Тип: %s"
 
-#: mail/mail-send-recv.c:259
+#: mail/mail-send-recv.c:258
 #, c-format
 msgid "Type: %s"
 msgstr "Тип: %s"
 
-#: mail/mail-send-recv.c:308
+#: mail/mail-send-recv.c:306
 msgid "Send & Receive Mail"
 msgstr "Изпращане и Получаване на поща"
 
-#: mail/mail-send-recv.c:309
+#: mail/mail-send-recv.c:307
 #, fuzzy
 msgid "Cancel _All"
 msgstr "Прекъсва Всичко"
 
-#: mail/mail-send-recv.c:390
+#: mail/mail-send-recv.c:389
 msgid "Updating..."
 msgstr "Обновяване ..."
 
-#: mail/mail-send-recv.c:390 mail/mail-send-recv.c:442
+#: mail/mail-send-recv.c:390 mail/mail-send-recv.c:446
 msgid "Waiting..."
 msgstr "Изчакване ..."
 
-#: mail/mail-session.c:229
+#: mail/mail-session.c:226
 msgid "User canceled operation."
 msgstr "Потребителя прекрати операцията."
 
-#: mail/mail-session.c:262
+#: mail/mail-session.c:259
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Въведедете парола за %s"
 
-#: mail/mail-session.c:264
+#: mail/mail-session.c:261
 msgid "Enter Password"
 msgstr "Въведедете парола"
 
-#: mail/mail-session.c:287
+#: mail/mail-session.c:284
 msgid "_Remember this password"
 msgstr "_Запомни тази парола"
 
-#: mail/mail-session.c:288
+#: mail/mail-session.c:285
 #, fuzzy
 msgid "_Remember this password for the remainder of this session"
 msgstr "Запомня тази парола за остатъка от тази сесия"
@@ -13591,17 +13983,21 @@ msgstr "Препратено съобщение - %s"
 msgid "Forwarded message"
 msgstr "Препратени съобщения"
 
-#: mail/mail-vfolder.c:91
+#: mail/mail-tools.c:459 mail/mail-tools.c:466
+msgid "Forwarded Message"
+msgstr "Препратени съобщения"
+
+#: mail/mail-vfolder.c:92
 #, c-format
 msgid "Setting up vfolder: %s"
 msgstr "Настройка на vпапка %s"
 
-#: mail/mail-vfolder.c:209
+#: mail/mail-vfolder.c:210
 #, c-format
 msgid "Updating vfolders for uri: %s"
 msgstr "Обновяване на vпапки за uri: %s"
 
-#: mail/mail-vfolder.c:467
+#: mail/mail-vfolder.c:468
 #, c-format
 msgid ""
 "The following vFolder(s):\n"
@@ -13610,95 +14006,100 @@ msgid ""
 "And have been updated."
 msgstr ""
 
-#: mail/mail-vfolder.c:776
+#: mail/mail-vfolder.c:777
 msgid "VFolders"
 msgstr "VFolders"
 
-#: mail/mail-vfolder.c:834
+#: mail/mail-vfolder.c:835
 msgid "vFolders"
 msgstr "vПапки"
 
-#: mail/mail-vfolder.c:873
+#: mail/mail-vfolder.c:874
 msgid "Edit VFolder"
 msgstr "Редактирай VПапки"
 
-#: mail/mail-vfolder.c:893
+#: mail/mail-vfolder.c:894
 #, c-format
 msgid "Trying to edit a vfolder '%s' which doesn't exist."
 msgstr "Опит за редактиране на vпапка '%s' която не съществува."
 
-#: mail/mail-vfolder.c:965
+#: mail/mail-vfolder.c:966
 msgid "New VFolder"
 msgstr "Нов VFolder"
 
-#: mail/message-list.c:900
+#: mail/message-browser.c:233
+msgid "(No subject)"
+msgstr "(Няма тема)"
+
+#: mail/message-browser.c:235
+#, c-format
+msgid "%s - Message"
+msgstr "%s - съобщение"
+
+#: mail/message-list.c:741
 msgid "Unseen"
 msgstr "Непрегледано"
 
-#: mail/message-list.c:901
+#: mail/message-list.c:742
 msgid "Seen"
 msgstr "Прегледано"
 
-#: mail/message-list.c:902
+#: mail/message-list.c:743
 msgid "Answered"
 msgstr "Отговорено"
 
-#: mail/message-list.c:903
+#: mail/message-list.c:744
 msgid "Multiple Unseen Messages"
 msgstr "Множество Невидяни Съобщения"
 
-#: mail/message-list.c:904
+#: mail/message-list.c:745
 msgid "Multiple Messages"
 msgstr "Множество Съобщения"
 
-#: mail/message-list.c:908
+#: mail/message-list.c:749
 msgid "Lowest"
 msgstr "Най долу"
 
-#: mail/message-list.c:909
+#: mail/message-list.c:750
 msgid "Lower"
 msgstr "Ниско"
 
-#: mail/message-list.c:913
+#: mail/message-list.c:754
 msgid "Higher"
 msgstr "По Горе"
 
-#: mail/message-list.c:914
+#: mail/message-list.c:755
 msgid "Highest"
 msgstr "Най Горе"
 
-#: mail/message-list.c:1231
+#: mail/message-list.c:1072
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:1238
+#: mail/message-list.c:1079
 msgid "Today %l:%M %p"
 msgstr "Днес %l:%M %p"
 
-#: mail/message-list.c:1247
+#: mail/message-list.c:1088
 msgid "Yesterday %l:%M %p"
 msgstr "Вчера %l:%M %p"
 
-#: mail/message-list.c:1259
+#: mail/message-list.c:1100
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: mail/message-list.c:1267
+#: mail/message-list.c:1108
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %l:%M %p"
 
-#: mail/message-list.c:1269
+#: mail/message-list.c:1110
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
-#: mail/message-list.c:3062
+#: mail/message-list.c:2649
 msgid "Generating message list"
 msgstr "Генерирам списък на съобщенията"
 
-#: mail/message-list.etspec.h:2
-msgid "Date"
-msgstr "Дата"
-
 #: mail/message-list.etspec.h:3
 #, fuzzy
 msgid "Due By"
@@ -13717,10 +14118,6 @@ msgstr "Маркирано"
 msgid "Follow Up Flag"
 msgstr ""
 
-#: mail/message-list.etspec.h:7 mail/message-tag-followup.c:301
-msgid "From"
-msgstr "От"
-
 #: mail/message-list.etspec.h:8
 #, fuzzy
 msgid "Original Location"
@@ -13734,10 +14131,6 @@ msgstr "Получено"
 msgid "Size"
 msgstr "Размер"
 
-#: mail/message-list.etspec.h:14
-msgid "To"
-msgstr "До"
-
 #: mail/message-tag-followup.c:62
 #, fuzzy
 msgid "Call"
@@ -13757,7 +14150,7 @@ msgstr ""
 msgid "For Your Information"
 msgstr "Източник на Информация"
 
-#: mail/message-tag-followup.c:66 ui/evolution-mail-message.xml.h:40
+#: mail/message-tag-followup.c:66 ui/evolution-mail-message.xml.h:37
 msgid "Forward"
 msgstr "Препрати"
 
@@ -13765,11 +14158,11 @@ msgstr "Препрати"
 msgid "No Response Necessary"
 msgstr ""
 
-#: mail/message-tag-followup.c:69 ui/evolution-mail-message.xml.h:77
+#: mail/message-tag-followup.c:69 ui/evolution-mail-message.xml.h:73
 msgid "Reply"
 msgstr "Отговори"
 
-#: mail/message-tag-followup.c:70 ui/evolution-mail-message.xml.h:78
+#: mail/message-tag-followup.c:70 ui/evolution-mail-message.xml.h:74
 msgid "Reply to All"
 msgstr "Отговори на Всички"
 
@@ -13803,6 +14196,39 @@ msgstr "Дължим"
 msgid "_Flag:"
 msgstr "Име на файл:"
 
+#: mail/subscribe-dialog.c:230
+#, c-format
+msgid "Scanning folders under %s on \"%s\""
+msgstr "Сканиране на папки под %s на \"%s\""
+
+#: mail/subscribe-dialog.c:232
+#, c-format
+msgid "Scanning root-level folders on \"%s\""
+msgstr "Сканиране на папки в основно ниво на \"%s\""
+
+#: mail/subscribe-dialog.c:329
+#, c-format
+msgid "Subscribing to folder \"%s\""
+msgstr "Абонамент за папка \"%s\""
+
+#: mail/subscribe-dialog.c:331
+#, c-format
+msgid "Unsubscribing to folder \"%s\""
+msgstr "Отписване от папка \"%s\""
+
+#: mail/subscribe-dialog.c:1270 mail/subscribe-dialog.etspec.h:1
+#: shell/e-storage-set-view.etspec.h:2
+msgid "Folder"
+msgstr "Папка"
+
+#: mail/subscribe-dialog.c:1499
+msgid "No server has been selected"
+msgstr "Не е избран сървър"
+
+#: mail/subscribe-dialog.c:1598
+msgid "Please select a server."
+msgstr "Моля, изберете сървър."
+
 #: mail/subscribe-dialog.glade.h:1
 #, fuzzy
 msgid "Folder Subscriptions"
@@ -13819,127 +14245,18 @@ msgid "S_erver:"
 msgstr "Име на сървъра:"
 
 #: mail/subscribe-dialog.glade.h:4
+#, fuzzy
+msgid "Scanning folders ..."
+msgstr "Съхрани в папка..."
+
+#: mail/subscribe-dialog.glade.h:5
 msgid "_Subscribe"
 msgstr "Абонирай се"
 
-#: mail/subscribe-dialog.glade.h:5
+#: mail/subscribe-dialog.glade.h:6
 msgid "_Unsubscribe"
 msgstr "О_тпиши се"
 
-#: my-evolution/component-factory.c:56
-msgid "Folder containing the Evolution Summary"
-msgstr "Папката съдържа Обобщение на Evolution"
-
-#: my-evolution/e-summary.c:204
-msgid "%A, %B %e %Y"
-msgstr "%A, %B %e %Y"
-
-#: my-evolution/e-summary.c:533
-msgid "Please wait..."
-msgstr "Моля почакайте..."
-
-#: my-evolution/e-summary.c:622 ui/my-evolution.xml.h:2
-msgid "Print Summary"
-msgstr "Печат на Обобщение"
-
-#: my-evolution/e-summary.c:655
-msgid "Printing of Summary failed"
-msgstr "Пропадна печатането на Обобщено"
-
-#: my-evolution/e-summary-calendar.c:384
-msgid "Appointments"
-msgstr "Срещите"
-
-#: my-evolution/e-summary-calendar.c:392
-#, fuzzy
-msgid "No appointments."
-msgstr "Няма срещи"
-
-#: my-evolution/e-summary-calendar.c:409
-msgid "%k:%M %d %B"
-msgstr "%k:%M %d %B"
-
-#: my-evolution/e-summary-calendar.c:411
-#, fuzzy
-msgid "%l:%M%p %d %B"
-msgstr "%l:%M %d %B"
-
-#: my-evolution/e-summary-calendar.c:429
-msgid "No description"
-msgstr "Няма Описание"
-
-#: my-evolution/e-summary-mail.c:189
-msgid "Mail summary"
-msgstr "Обобщение на Поща"
-
-#: my-evolution/e-summary-preferences.c:355
-msgid "Dictionary.com Word of the Day"
-msgstr "Dictionary.com Дума за Деня"
-
-#: my-evolution/e-summary-preferences.c:373
-msgid "Quotes of the Day"
-msgstr "Цитат на деня"
-
-#: my-evolution/e-summary-preferences.c:565
-#, fuzzy
-msgid "New News Feed"
-msgstr "Новини"
-
-#: my-evolution/e-summary-preferences.c:581
-#, fuzzy
-msgid "_URL:"
-msgstr "URL:"
-
-#: my-evolution/e-summary-rdf.c:315
-msgid "Error downloading RDF"
-msgstr "Грешка при зареждането на RDF"
-
-#: my-evolution/e-summary-rdf.c:453
-msgid "News Feed"
-msgstr "Новини"
-
-#: my-evolution/e-summary-shown.c:496
-msgid "All"
-msgstr ""
-
-#: my-evolution/e-summary-shown.c:521 my-evolution/e-summary-table.c:58
-#, fuzzy
-msgid "Shown"
-msgstr "Шелтън"
-
-#: my-evolution/e-summary-tasks.c:349
-msgid "No tasks"
-msgstr "Няма задачи"
-
-#: my-evolution/e-summary-tasks.c:387
-#, fuzzy
-msgid "blue"
-msgstr "Амбер"
-
-#: my-evolution/e-summary-tasks.c:387
-msgid "(No Description)"
-msgstr "(Без описание)"
-
-#: my-evolution/e-summary-weather.c:72
-msgid "My Weather"
-msgstr "Моето Време"
-
-#: my-evolution/e-summary-weather.c:261
-msgid "There was an error downloading data for"
-msgstr ""
-
-#: my-evolution/e-summary-weather.c:478 my-evolution/my-evolution.glade.h:16
-msgid "Weather"
-msgstr "Време"
-
-#. translators: Put here a list of codes for locations you want to
-#. see in My Evolution by default. You can find the list of all
-#. stations and their codes in Evolution sources
-#. (evolution/my-evolution/Locations)
-#: my-evolution/e-summary-weather.c:582
-msgid "KBOS"
-msgstr "KBOS"
-
 #: my-evolution/GNOME_Evolution_Summary.server.in.in.h:1
 #, fuzzy
 msgid "Configure the appearance of the Evolution Summary here"
@@ -23756,6 +24073,115 @@ msgstr "Зуни Пуебло"
 msgid "Zurich"
 msgstr "Цюрих"
 
+#: my-evolution/component-factory.c:56
+msgid "Folder containing the Evolution Summary"
+msgstr "Папката съдържа Обобщение на Evolution"
+
+#: my-evolution/e-summary-calendar.c:381
+msgid "Appointments"
+msgstr "Срещите"
+
+#: my-evolution/e-summary-calendar.c:389
+#, fuzzy
+msgid "No appointments."
+msgstr "Няма срещи"
+
+#: my-evolution/e-summary-calendar.c:406
+msgid "%k:%M %d %B"
+msgstr "%k:%M %d %B"
+
+#: my-evolution/e-summary-calendar.c:408
+#, fuzzy
+msgid "%l:%M%P %d %B"
+msgstr "%l:%M %d %B"
+
+#: my-evolution/e-summary-calendar.c:426
+msgid "No description"
+msgstr "Няма Описание"
+
+#: my-evolution/e-summary-mail.c:189
+msgid "Mail summary"
+msgstr "Обобщение на Поща"
+
+#: my-evolution/e-summary-preferences.c:355
+msgid "Dictionary.com Word of the Day"
+msgstr "Dictionary.com Дума за Деня"
+
+#: my-evolution/e-summary-preferences.c:373
+msgid "Quotes of the Day"
+msgstr "Цитат на деня"
+
+#: my-evolution/e-summary-preferences.c:565
+#, fuzzy
+msgid "New News Feed"
+msgstr "Новини"
+
+#: my-evolution/e-summary-preferences.c:581
+#, fuzzy
+msgid "_URL:"
+msgstr "URL:"
+
+#: my-evolution/e-summary-rdf.c:315
+msgid "Error downloading RDF"
+msgstr "Грешка при зареждането на RDF"
+
+#: my-evolution/e-summary-rdf.c:453
+msgid "News Feed"
+msgstr "Новини"
+
+#: my-evolution/e-summary-shown.c:496
+msgid "All"
+msgstr ""
+
+#: my-evolution/e-summary-shown.c:521 my-evolution/e-summary-table.c:58
+#, fuzzy
+msgid "Shown"
+msgstr "Шелтън"
+
+#: my-evolution/e-summary-tasks.c:330
+msgid "No tasks"
+msgstr "Няма задачи"
+
+#: my-evolution/e-summary-tasks.c:364
+msgid "(No Description)"
+msgstr "(Без описание)"
+
+#: my-evolution/e-summary-weather.c:73
+msgid "My Weather"
+msgstr "Моето Време"
+
+#: my-evolution/e-summary-weather.c:262
+msgid "There was an error downloading data for"
+msgstr ""
+
+#: my-evolution/e-summary-weather.c:479 my-evolution/my-evolution.glade.h:16
+msgid "Weather"
+msgstr "Време"
+
+#. translators: Put here a list of codes for locations you want to
+#. see in My Evolution by default. You can find the list of all
+#. stations and their codes in Evolution sources
+#. (evolution/my-evolution/Locations)
+#: my-evolution/e-summary-weather.c:583
+msgid "KBOS"
+msgstr "KBOS"
+
+#: my-evolution/e-summary.c:204
+msgid "%A, %B %e %Y"
+msgstr "%A, %B %e %Y"
+
+#: my-evolution/e-summary.c:533
+msgid "Please wait..."
+msgstr "Моля почакайте..."
+
+#: my-evolution/e-summary.c:622 ui/my-evolution.xml.h:2
+msgid "Print Summary"
+msgstr "Печат на Обобщение"
+
+#: my-evolution/e-summary.c:655
+msgid "Printing of Summary failed"
+msgstr "Пропадна печатането на Обобщено"
+
 #: my-evolution/metar.c:30
 msgid " F"
 msgstr " F"
@@ -25021,27 +25447,24 @@ msgstr "_Един Ден"
 msgid "_Show full path for folders"
 msgstr "По_казва пълният път за папки"
 
-#: notes/component-factory.c:27
-#: shell/e-shell-user-creatable-items-handler.c:587
-#: shell/e-shell-user-creatable-items-handler.c:643
-#: widgets/misc/e-charset-picker.c:109
-msgid "New"
-msgstr "Нов"
+#: shell/GNOME_Evolution_Shell.server.in.in.h:1
+msgid "Configure special folders and offline folder behavior here"
+msgstr ""
 
-#: notes/component-factory.c:27
+#: shell/GNOME_Evolution_Shell.server.in.in.h:2
 #, fuzzy
-msgid "Create a new note"
-msgstr "Създай нова папка"
+msgid "Evolution Shell"
+msgstr "Shell на Evolution"
 
-#: notes/component-factory.c:152
+#: shell/GNOME_Evolution_Shell.server.in.in.h:3
 #, fuzzy
-msgid "Cannot initialize Evolution's notes component."
-msgstr "Не мога да инициализирам mail компонетнта на Evolution за инфо."
+msgid "Evolution folder settings configuration control"
+msgstr "Фабрика за контрол на задачи в Evolution"
 
-#: notes/main.c:30
+#: shell/GNOME_Evolution_Shell.server.in.in.h:4
 #, fuzzy
-msgid "Notes Component: Could not initialize bonobo"
-msgstr "Не мога да инициализирам Bonobo"
+msgid "Folder Settings"
+msgstr "Настройки на Поща"
 
 #: shell/e-activity-handler.c:164
 msgid "Show Details"
@@ -25137,51 +25560,6 @@ msgstr ""
 msgid "Brought to you by"
 msgstr "Доведена до вас от"
 
-#: shell/e-shell.c:175
-#, fuzzy, c-format
-msgid ""
-"Cannot activate component %s :\n"
-"The error from the activation system is:\n"
-"%s"
-msgstr ""
-"%s\n"
-"\n"
-"Грешката от активиране на системата е:\n"
-"%s"
-
-#: shell/e-shell.c:741
-#, c-format
-msgid "Cannot set up local storage -- %s"
-msgstr "Не мога да настроя локалното хранилище -- %s"
-
-#: shell/e-shell.c:1804
-#, c-format
-msgid ""
-"The Evolution component that handles folders of type \"%s\"\n"
-"has unexpectedly quit. You will need to quit Evolution and restart\n"
-"in order to access that data again."
-msgstr ""
-"Компонент на Evolution който поддържа папки от тип \"%s\"\n"
-"неочаквано завърши. Необходимо е да излезете от Evolution и да "
-"престартирате\n"
-"за да получите достъп до данните отново."
-
-#: shell/e-shell.c:2069
-msgid "Invalid arguments"
-msgstr "Грешни аргументи"
-
-#: shell/e-shell.c:2071
-msgid "Cannot register on OAF"
-msgstr "Не мога да регистрирам в OAF"
-
-#: shell/e-shell.c:2073
-msgid "Configuration Database not found"
-msgstr "Конфигурационната база данни не е намерена"
-
-#: shell/e-shell.c:2075 shell/e-storage.c:568
-msgid "Generic error"
-msgstr "Генерира грешка"
-
 #: shell/e-shell-config-autocompletion.c:110
 #, fuzzy
 msgid "Extra Completion folders"
@@ -25351,19 +25729,11 @@ msgstr ""
 "Вие може да изберете \"Автоматично\" ако не знаете и Evolution ще се опита "
 "да го определи."
 
-#: shell/e-shell-importer.c:148 shell/e-shell-startup-wizard.c:724
+#: shell/e-shell-importer.c:148 shell/e-shell-startup-wizard.c:709
 msgid "Please select the information that you would like to import:"
 msgstr "Моля, изберете информацията която искате да импортирате:"
 
-#: shell/e-shell-importer.c:151
-msgid ""
-"Evolution checked for settings to import from the following\n"
-"applications: Pine, Netscape, Elm, iCalendar. No settings\n"
-"that could be imported where found. If you would like to\n"
-"try again, please click the \"Back\" button.\n"
-msgstr ""
-
-#: shell/e-shell-importer.c:219 shell/e-shell-importer.c:250
+#: shell/e-shell-importer.c:213 shell/e-shell-importer.c:244
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -25372,22 +25742,22 @@ msgstr ""
 "Импортирам %s\n"
 "Импортирам обект %d."
 
-#: shell/e-shell-importer.c:323
+#: shell/e-shell-importer.c:317
 #, fuzzy
 msgid "Select importer"
 msgstr "Избери Папка"
 
-#: shell/e-shell-importer.c:464
+#: shell/e-shell-importer.c:458
 #, c-format
 msgid "File %s does not exist"
 msgstr "Файлът `%s' не съществува."
 
-#: shell/e-shell-importer.c:465 shell/e-shell-importer.c:482
-#: shell/e-shell-importer.c:524
+#: shell/e-shell-importer.c:459 shell/e-shell-importer.c:476
+#: shell/e-shell-importer.c:518
 msgid "Evolution Error"
 msgstr "Грешка в Evolution"
 
-#: shell/e-shell-importer.c:481
+#: shell/e-shell-importer.c:475
 #, c-format
 msgid ""
 "There is no importer that is able to handle\n"
@@ -25396,11 +25766,11 @@ msgstr ""
 "Няма импортер който да подържа\n"
 "%s"
 
-#: shell/e-shell-importer.c:490
+#: shell/e-shell-importer.c:484
 msgid "Importing"
 msgstr "Импортира"
 
-#: shell/e-shell-importer.c:497
+#: shell/e-shell-importer.c:491
 #, c-format
 msgid ""
 "Importing %s.\n"
@@ -25409,17 +25779,17 @@ msgstr ""
 "Импортирам %s.\n"
 "Стартирам %s"
 
-#: shell/e-shell-importer.c:509
+#: shell/e-shell-importer.c:503
 #, c-format
 msgid "Error starting %s"
 msgstr "Грешка при стартиране на %s"
 
-#: shell/e-shell-importer.c:523
+#: shell/e-shell-importer.c:517
 #, c-format
 msgid "Error loading %s"
 msgstr "Грешка при зареждането на %s"
 
-#: shell/e-shell-importer.c:540
+#: shell/e-shell-importer.c:534
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -25428,35 +25798,31 @@ msgstr ""
 "Импортирам %s\n"
 "Импортирам обект 1."
 
-#: shell/e-shell-importer.c:594
+#: shell/e-shell-importer.c:588
 msgid "Automatic"
 msgstr "Автоматично"
 
-#: shell/e-shell-importer.c:643
-#, fuzzy
-msgid "_Filename:"
+#: shell/e-shell-importer.c:637
+msgid "Filename:"
 msgstr "Име на файл:"
 
-#: shell/e-shell-importer.c:648
+#: shell/e-shell-importer.c:642
 msgid "Select a file"
 msgstr "Избери файл"
 
-#: shell/e-shell-importer.c:658
-#, fuzzy
-msgid "File _type:"
+#: shell/e-shell-importer.c:651
+msgid "File type:"
 msgstr "Тип на файл:"
 
-#: shell/e-shell-importer.c:684
-#, fuzzy
-msgid "Import data and settings from _older programs"
+#: shell/e-shell-importer.c:676
+msgid "Import data and settings from older programs"
 msgstr "Импорт на данни и настройки от стари програми"
 
-#: shell/e-shell-importer.c:687
-#, fuzzy
-msgid "Import a _single file"
+#: shell/e-shell-importer.c:680
+msgid "Import a single file"
 msgstr "Импорт на единичен файл"
 
-#: shell/e-shell-importer.c:755 shell/e-shell-startup-wizard.c:553
+#: shell/e-shell-importer.c:746 shell/e-shell-startup-wizard.c:538
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
@@ -25464,26 +25830,25 @@ msgstr ""
 "Моля, почакайте...\n"
 "Сканирам за съществуващи настройки"
 
-#: shell/e-shell-importer.c:758
+#: shell/e-shell-importer.c:749
 msgid "Starting Intelligent Importers"
 msgstr "Стартира Интелигентно Импортиране"
 
-#: shell/e-shell-importer.c:884 shell/e-shell-startup-wizard.c:679
+#: shell/e-shell-importer.c:873 shell/e-shell-startup-wizard.c:664
 #, c-format
 msgid "From %s:"
 msgstr "От %s:"
 
-#: shell/e-shell-importer.c:1061
+#: shell/e-shell-importer.c:1047
 msgid "Select folder"
 msgstr "Избери папка"
 
-#: shell/e-shell-importer.c:1062
+#: shell/e-shell-importer.c:1048
 msgid "Select a destination folder for importing this data"
 msgstr "Избор на отдалечена папка за импортиране на тези данни"
 
-#: shell/e-shell-importer.c:1193
-#, fuzzy
-msgid "_Import"
+#: shell/e-shell-importer.c:1178 shell/importer/intelligent.c:191
+msgid "Import"
 msgstr "Вмъкни"
 
 #: shell/e-shell-offline-handler.c:592
@@ -25550,19 +25915,11 @@ msgstr ""
 "Не мога да създам указаната папка:\n"
 "%s"
 
-#: shell/e-shell-startup-wizard.c:771
-msgid ""
-"If you quit the Evolution Setup Assistant now, all of the information that "
-"you have entered will be forgotten. You will need to run this assistant "
-"again before using Evolution.\n"
-"\n"
-"Do you want to quit using the Assistant now?"
-msgstr ""
-
-#: shell/e-shell-startup-wizard.c:782
-#, fuzzy
-msgid "Quit Assistant"
-msgstr "Асистент"
+#: shell/e-shell-user-creatable-items-handler.c:587
+#: shell/e-shell-user-creatable-items-handler.c:643
+#: widgets/misc/e-charset-picker.c:109
+msgid "New"
+msgstr "Нов"
 
 #: shell/e-shell-utils.c:116
 msgid "No folder name specified."
@@ -25586,37 +25943,6 @@ msgstr "В името на папката не може да се съдържа
 msgid "'.' and '..' are reserved folder names."
 msgstr "'.' и '..' са запазени имена на папка."
 
-#: shell/e-shell-view.c:264
-msgid "(No folder displayed)"
-msgstr "(Няма показана папка)"
-
-#: shell/e-shell-view.c:2040
-#, c-format
-msgid "%s (%d)"
-msgstr "%s (%d)"
-
-#: shell/e-shell-view.c:2042
-msgid "(None)"
-msgstr "(Няма)"
-
-#: shell/e-shell-view.c:2083
-msgid ""
-"Ximian Evolution is currently online.  Click on this button to work offline."
-msgstr ""
-"Evolution в момента е 'online'.  Кликнете на този бутон за да го превключите "
-"в режим 'offline'."
-
-#: shell/e-shell-view.c:2090
-msgid "Ximian Evolution is in the process of going offline."
-msgstr "Evolution е в процес на преминаване на режим 'offline'."
-
-#: shell/e-shell-view.c:2096
-msgid ""
-"Ximian Evolution is currently offline.  Click on this button to work online."
-msgstr ""
-"Evolution  в момента е 'offline.' Кликнете на този бутон за да го "
-"превключите на 'online'."
-
 #: shell/e-shell-view-menu.c:89
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr "Инструмента GNOME Pilot изглежда не е инсталиран на тази система"
@@ -25668,13 +25994,81 @@ msgstr "Работа в '_Offline'"
 msgid "Work Offline"
 msgstr "Работа в 'Offline'"
 
-#: shell/e-shortcuts.c:649
-msgid "Error saving shortcuts."
-msgstr "Грешка при запазване на препратки."
+#: shell/e-shell-view.c:264
+msgid "(No folder displayed)"
+msgstr "(Няма показана папка)"
 
-#: shell/e-shortcuts.c:1096
-msgid "Shortcuts"
-msgstr "Препратки"
+#: shell/e-shell-view.c:2040
+#, c-format
+msgid "%s (%d)"
+msgstr "%s (%d)"
+
+#: shell/e-shell-view.c:2042
+msgid "(None)"
+msgstr "(Няма)"
+
+#: shell/e-shell-view.c:2083
+msgid ""
+"Ximian Evolution is currently online.  Click on this button to work offline."
+msgstr ""
+"Evolution в момента е 'online'.  Кликнете на този бутон за да го превключите "
+"в режим 'offline'."
+
+#: shell/e-shell-view.c:2090
+msgid "Ximian Evolution is in the process of going offline."
+msgstr "Evolution е в процес на преминаване на режим 'offline'."
+
+#: shell/e-shell-view.c:2096
+msgid ""
+"Ximian Evolution is currently offline.  Click on this button to work online."
+msgstr ""
+"Evolution  в момента е 'offline.' Кликнете на този бутон за да го "
+"превключите на 'online'."
+
+#: shell/e-shell.c:175
+#, fuzzy, c-format
+msgid ""
+"Cannot activate component %s :\n"
+"The error from the activation system is:\n"
+"%s"
+msgstr ""
+"%s\n"
+"\n"
+"Грешката от активиране на системата е:\n"
+"%s"
+
+#: shell/e-shell.c:741
+#, c-format
+msgid "Cannot set up local storage -- %s"
+msgstr "Не мога да настроя локалното хранилище -- %s"
+
+#: shell/e-shell.c:1804
+#, c-format
+msgid ""
+"The Evolution component that handles folders of type \"%s\"\n"
+"has unexpectedly quit. You will need to quit Evolution and restart\n"
+"in order to access that data again."
+msgstr ""
+"Компонент на Evolution който поддържа папки от тип \"%s\"\n"
+"неочаквано завърши. Необходимо е да излезете от Evolution и да "
+"престартирате\n"
+"за да получите достъп до данните отново."
+
+#: shell/e-shell.c:2069
+msgid "Invalid arguments"
+msgstr "Грешни аргументи"
+
+#: shell/e-shell.c:2071
+msgid "Cannot register on OAF"
+msgstr "Не мога да регистрирам в OAF"
+
+#: shell/e-shell.c:2073
+msgid "Configuration Database not found"
+msgstr "Конфигурационната база данни не е намерена"
+
+#: shell/e-shell.c:2075 shell/e-storage.c:568
+msgid "Generic error"
+msgstr "Генерира грешка"
 
 #: shell/e-shortcuts-view.c:80
 #, fuzzy
@@ -25796,6 +26190,19 @@ msgstr "Пр_емахни"
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "Изтрива тази препратка от лентата с препратки"
 
+#: shell/e-shortcuts.c:649
+msgid "Error saving shortcuts."
+msgstr "Грешка при запазване на препратки."
+
+#: shell/e-shortcuts.c:1096
+msgid "Shortcuts"
+msgstr "Препратки"
+
+#: shell/e-storage-set-view.etspec.h:1
+#, fuzzy
+msgid "Checkbox"
+msgstr "Чико"
+
 #: shell/e-storage.c:566
 msgid "No error"
 msgstr "Няма грешка"
@@ -25852,15 +26259,6 @@ msgstr "Не мога да създам папка с това име"
 msgid "This operation cannot be performed in off-line mode"
 msgstr ""
 
-#: shell/e-storage-set-view.etspec.h:1
-#, fuzzy
-msgid "Checkbox"
-msgstr "Чико"
-
-#: shell/e-storage-set-view.etspec.h:2
-msgid "Folder"
-msgstr "Папка"
-
 #: shell/e-task-widget.c:211
 #, c-format
 msgid "%s (...)"
@@ -25875,6 +26273,43 @@ msgstr "%s (%d%% приключено)"
 msgid "<click here to select a folder>"
 msgstr "<натиснете тук за да изберете папка>"
 
+#: shell/evolution-shell-component-utils.c:124
+#, c-format
+msgid ""
+"%s\n"
+"\n"
+"Unknown error."
+msgstr ""
+"%s\n"
+"\n"
+"Неизвестна грешка."
+
+#: shell/evolution-shell-component-utils.c:127
+#, c-format
+msgid ""
+"%s\n"
+"\n"
+"The error from the component system is:\n"
+"%s"
+msgstr ""
+"%s\n"
+"\n"
+"Грешката от компонент на системата е:\n"
+"%s"
+
+#: shell/evolution-shell-component-utils.c:134
+#, c-format
+msgid ""
+"%s\n"
+"\n"
+"The error from the activation system is:\n"
+"%s"
+msgstr ""
+"%s\n"
+"\n"
+"Грешката от активиране на системата е:\n"
+"%s"
+
 #: shell/evolution-shell-component.c:1187
 msgid "CORBA error"
 msgstr "Грешка в CORBA"
@@ -25935,43 +26370,6 @@ msgstr "Няма място"
 msgid "Old owner has died"
 msgstr "Старият собственик е умрял"
 
-#: shell/evolution-shell-component-utils.c:124
-#, c-format
-msgid ""
-"%s\n"
-"\n"
-"Unknown error."
-msgstr ""
-"%s\n"
-"\n"
-"Неизвестна грешка."
-
-#: shell/evolution-shell-component-utils.c:127
-#, c-format
-msgid ""
-"%s\n"
-"\n"
-"The error from the component system is:\n"
-"%s"
-msgstr ""
-"%s\n"
-"\n"
-"Грешката от компонент на системата е:\n"
-"%s"
-
-#: shell/evolution-shell-component-utils.c:134
-#, c-format
-msgid ""
-"%s\n"
-"\n"
-"The error from the activation system is:\n"
-"%s"
-msgstr ""
-"%s\n"
-"\n"
-"Грешката от активиране на системата е:\n"
-"%s"
-
 #: shell/evolution-test-component.c:63
 #, fuzzy
 msgid "Test type"
@@ -26093,25 +26491,6 @@ msgstr ""
 "\n"
 "Кликнете на бутона \"Завърши\" за да запазите настройките."
 
-#: shell/GNOME_Evolution_Shell.server.in.in.h:1
-msgid "Configure special folders and offline folder behavior here"
-msgstr ""
-
-#: shell/GNOME_Evolution_Shell.server.in.in.h:2
-#, fuzzy
-msgid "Evolution Shell"
-msgstr "Shell на Evolution"
-
-#: shell/GNOME_Evolution_Shell.server.in.in.h:3
-#, fuzzy
-msgid "Evolution folder settings configuration control"
-msgstr "Фабрика за контрол на задачи в Evolution"
-
-#: shell/GNOME_Evolution_Shell.server.in.in.h:4
-#, fuzzy
-msgid "Folder Settings"
-msgstr "Настройки на Поща"
-
 #: shell/importer/import.glade.h:1
 msgid "Click \"Import\" to begin importing the file into Evolution. "
 msgstr ""
@@ -26151,10 +26530,6 @@ msgstr ""
 msgid "Importers"
 msgstr "Импортери"
 
-#: shell/importer/intelligent.c:191
-msgid "Import"
-msgstr "Вмъкни"
-
 #: shell/importer/intelligent.c:195
 msgid "Don't import"
 msgstr "Не импортирай"
@@ -26332,7 +26707,7 @@ msgstr "Премести избраните съобщения в нова па�
 msgid "Move to Folder..."
 msgstr "Премести в Папка..."
 
-#: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:18
+#: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:17
 msgid "Paste the clipboard"
 msgstr "Поставя съдържанието на буфера за обмен"
 
@@ -26340,8 +26715,8 @@ msgstr "Поставя съдържанието на буфера за обме�
 msgid "Previews the contacts to be printed"
 msgstr "Преглед на контактите за печат"
 
-#: ui/evolution-addressbook.xml.h:17 ui/evolution-calendar.xml.h:20
-#: ui/evolution-comp-editor.xml.h:9 ui/evolution-mail-message.xml.h:73
+#: ui/evolution-addressbook.xml.h:17 ui/evolution-calendar.xml.h:19
+#: ui/evolution-comp-editor.xml.h:9 ui/evolution-mail-message.xml.h:69
 #: ui/evolution-tasks.xml.h:13
 msgid "Print Pre_view"
 msgstr "Печатен Преглед"
@@ -26387,21 +26762,17 @@ msgstr "Прекрати Зареждането"
 msgid "View the current contact"
 msgstr "текущото време"
 
-#: ui/evolution-addressbook.xml.h:29 ui/evolution-calendar.xml.h:32
-#: ui/evolution-comp-editor.xml.h:16 ui/evolution-contact-editor.xml.h:13
-#: ui/evolution-contact-list-editor.xml.h:11
+#: ui/evolution-addressbook.xml.h:29 ui/evolution-calendar.xml.h:30
+#: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:11
+#: ui/evolution-contact-list-editor.xml.h:10
 #: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:17
-#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-messagedisplay.xml.h:4
-#: ui/evolution-mail-message.xml.h:99 ui/evolution-task-editor.xml.h:9
+#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:95
+#: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-task-editor.xml.h:9
 #: ui/evolution-tasks.xml.h:16 ui/evolution.xml.h:42
 msgid "_Actions"
 msgstr "_Действия"
 
-#: ui/evolution-addressbook.xml.h:31
-msgid "_Copy to Folder..."
-msgstr "Копирай в Папка..."
-
-#: ui/evolution-addressbook.xml.h:34 ui/evolution-contact-editor.xml.h:16
+#: ui/evolution-addressbook.xml.h:34 ui/evolution-contact-editor.xml.h:13
 msgid "_Forward Contact..."
 msgstr "_Напред в Контакти..."
 
@@ -26473,61 +26844,56 @@ msgstr "Отва на определена дата"
 msgid "Go to today"
 msgstr "Отиди на днес"
 
-#: ui/evolution-calendar.xml.h:17
+#: ui/evolution-calendar.xml.h:16
 msgid "Month"
 msgstr "Месец"
 
-#: ui/evolution-calendar.xml.h:19
+#: ui/evolution-calendar.xml.h:18
 msgid "Previews the calendar to be printed"
 msgstr "Преглед на календар за печат"
 
-#: ui/evolution-calendar.xml.h:21
+#: ui/evolution-calendar.xml.h:20
 msgid "Print this calendar"
 msgstr "Отпечатай този календар"
 
-#: ui/evolution-calendar.xml.h:22
+#: ui/evolution-calendar.xml.h:21
 msgid "Publish Free/Busy information for this calendar"
 msgstr "Публична Свободна/Заета информация за този календар"
 
-#: ui/evolution-calendar.xml.h:23 ui/evolution-tasks.xml.h:15
+#: ui/evolution-calendar.xml.h:22 ui/evolution-tasks.xml.h:15
 #, fuzzy
 msgid "Purg_e"
 msgstr "Бургес"
 
-#: ui/evolution-calendar.xml.h:24
+#: ui/evolution-calendar.xml.h:23
 #, fuzzy
 msgid "Purge old appointments and meetings"
 msgstr "Папката съдържа срещи и събития"
 
-#: ui/evolution-calendar.xml.h:25
-#, fuzzy
-msgid "Show as list"
-msgstr "Показва Детайли"
-
-#: ui/evolution-calendar.xml.h:26
+#: ui/evolution-calendar.xml.h:24
 msgid "Show one day"
 msgstr "Покажи един ден"
 
-#: ui/evolution-calendar.xml.h:27
+#: ui/evolution-calendar.xml.h:25
 msgid "Show one month"
 msgstr "Покажи един месец"
 
-#: ui/evolution-calendar.xml.h:28
+#: ui/evolution-calendar.xml.h:26
 msgid "Show one week"
 msgstr "Покажи една седмица"
 
-#: ui/evolution-calendar.xml.h:29
+#: ui/evolution-calendar.xml.h:27
 msgid "Show the working week"
 msgstr "Покажи работната седмица"
 
-#: ui/evolution-calendar.xml.h:30
+#: ui/evolution-calendar.xml.h:28
 msgid "Week"
 msgstr "Седмица"
 
-#: ui/evolution-comp-editor.xml.h:2 ui/evolution-contact-editor.xml.h:2
-#: ui/evolution-contact-list-editor.xml.h:2
+#: ui/evolution-comp-editor.xml.h:2 ui/evolution-contact-editor.xml.h:1
+#: ui/evolution-contact-list-editor.xml.h:1
 #: ui/evolution-mail-messagedisplay.xml.h:1
-#: ui/evolution-message-composer.xml.h:3 ui/evolution-signature-editor.xml.h:2
+#: ui/evolution-message-composer.xml.h:3 ui/evolution-signature-editor.xml.h:1
 #: ui/evolution.xml.h:5
 msgid "Close"
 msgstr "Затвори"
@@ -26536,7 +26902,7 @@ msgstr "Затвори"
 msgid "Close this item"
 msgstr "Затвори тази точка"
 
-#: ui/evolution-comp-editor.xml.h:5 ui/evolution-contact-editor.xml.h:4
+#: ui/evolution-comp-editor.xml.h:5 ui/evolution-contact-editor.xml.h:3
 msgid "Delete this item"
 msgstr "Изтриване на тази точка"
 
@@ -26549,59 +26915,48 @@ msgstr "Главна лента с инструменти"
 msgid "Preview the printed item"
 msgstr "Преглед на точката за печат"
 
-#: ui/evolution-comp-editor.xml.h:10 ui/evolution-contact-editor.xml.h:7
+#: ui/evolution-comp-editor.xml.h:10 ui/evolution-contact-editor.xml.h:6
 msgid "Print this item"
 msgstr "Печат на тази точка"
 
-#: ui/evolution-comp-editor.xml.h:11 ui/evolution-contact-editor.xml.h:8
-#: ui/evolution-contact-list-editor.xml.h:5
-#: ui/evolution-message-composer.xml.h:18
-msgid "Save _As..."
-msgstr "Съхрани К_ато..."
+#: ui/evolution-comp-editor.xml.h:12 ui/evolution-message-composer.xml.h:16
+#: ui/evolution-signature-editor.xml.h:5
+msgid "Save"
+msgstr "Съхрани"
+
+#: ui/evolution-comp-editor.xml.h:13
+msgid "Save As..."
+msgstr "Съхрани Като..."
 
-#: ui/evolution-comp-editor.xml.h:12 ui/evolution-contact-editor.xml.h:9
+#: ui/evolution-comp-editor.xml.h:14 ui/evolution-contact-editor.xml.h:8
 #: ui/evolution-contact-list-editor.xml.h:6
-#: ui/evolution-signature-editor.xml.h:7
+#: ui/evolution-signature-editor.xml.h:6
 msgid "Save and Close"
 msgstr "Съхрани и Затвори"
 
-#: ui/evolution-comp-editor.xml.h:13 ui/evolution-contact-editor.xml.h:10
-#: ui/evolution-contact-list-editor.xml.h:7
-#: ui/evolution-signature-editor.xml.h:8
-#, fuzzy
-msgid "Save and _Close"
-msgstr "Съхрани и Затвори"
-
-#: ui/evolution-comp-editor.xml.h:14
+#: ui/evolution-comp-editor.xml.h:15
 msgid "Save the item and close the dialog box"
 msgstr "Запазва точката и затваря диалога"
 
-#: ui/evolution-comp-editor.xml.h:15
+#: ui/evolution-comp-editor.xml.h:16
 msgid "Save this item to disk"
 msgstr "Запазва тази точка на диска"
 
-#: ui/evolution-comp-editor.xml.h:18 ui/evolution-contact-editor.xml.h:15
-#: ui/evolution-contact-list-editor.xml.h:13
+#: ui/evolution-comp-editor.xml.h:18 ui/evolution-contact-editor.xml.h:12
+#: ui/evolution-contact-list-editor.xml.h:11
 #: ui/evolution-mail-messagedisplay.xml.h:7
 #: ui/evolution-message-composer.xml.h:42
-#: ui/evolution-signature-editor.xml.h:13 ui/evolution-subscribe.xml.h:11
+#: ui/evolution-signature-editor.xml.h:12 ui/evolution-subscribe.xml.h:11
 #: ui/evolution.xml.h:46
 msgid "_File"
 msgstr "_Файл"
 
-#: ui/evolution-comp-editor.xml.h:20 ui/evolution-contact-editor.xml.h:18
-#: ui/evolution-contact-list-editor.xml.h:14
-#: ui/evolution-message-composer.xml.h:47
-#: ui/evolution-signature-editor.xml.h:15
-msgid "_Save"
-msgstr "_Съхрани"
-
 #: ui/evolution-composer-entries.xml.h:1
 #, fuzzy
 msgid "Copy selected text to the clipboard"
 msgstr "Копира избраното съобщение в друга папка"
 
-#: ui/evolution-composer-entries.xml.h:2 ui/evolution-mail-message.xml.h:21
+#: ui/evolution-composer-entries.xml.h:2 ui/evolution-mail-list.xml.h:3
 msgid "Cu_t"
 msgstr "_Отрежи"
 
@@ -26625,39 +26980,51 @@ msgstr "Избери Всичко"
 msgid "Select all text"
 msgstr "Избери всички контакти"
 
-#: ui/evolution-contact-editor.xml.h:6
+#: ui/evolution-contact-editor.xml.h:5
 msgid "Print En_velope..."
 msgstr "Печат на П_лик..."
 
-#: ui/evolution-contact-editor.xml.h:11
+#: ui/evolution-contact-editor.xml.h:7
+#: ui/evolution-contact-list-editor.xml.h:5
+#: ui/evolution-message-composer.xml.h:18
+msgid "Save _As..."
+msgstr "Съхрани К_ато..."
+
+#: ui/evolution-contact-editor.xml.h:9
 msgid "Save the contact and close the dialog box"
 msgstr "Запазва контакта и затваря диалога"
 
-#: ui/evolution-contact-editor.xml.h:12
+#: ui/evolution-contact-editor.xml.h:10
 msgid "Send _Message to Contact..."
 msgstr "Изпрати Съобщението на Контакт.."
 
-#: ui/evolution-contact-list-editor.xml.h:4
+#: ui/evolution-contact-editor.xml.h:15
+#: ui/evolution-contact-list-editor.xml.h:12
+#: ui/evolution-message-composer.xml.h:47
+#: ui/evolution-signature-editor.xml.h:14
+msgid "_Save"
+msgstr "_Съхрани"
+
+#: ui/evolution-contact-list-editor.xml.h:3
 msgid "Delete this list"
 msgstr "Изтрива този списък"
 
-#: ui/evolution-contact-list-editor.xml.h:8
+#: ui/evolution-contact-list-editor.xml.h:4
+msgid "Delete..."
+msgstr "Изтрии..."
+
+#: ui/evolution-contact-list-editor.xml.h:7
 msgid "Save the list and close the dialog box"
 msgstr "Запазва списъка и затваря диалога"
 
-#: ui/evolution-contact-list-editor.xml.h:9
+#: ui/evolution-contact-list-editor.xml.h:8
 msgid "Se_nd list to other..."
 msgstr "Изпрати спис_ък на друг..."
 
-#: ui/evolution-contact-list-editor.xml.h:10
+#: ui/evolution-contact-list-editor.xml.h:9
 msgid "Send _message to list..."
 msgstr "Изпраща с_ъобщението към списък..."
 
-#: ui/evolution-contact-list-editor.xml.h:12
-#, fuzzy
-msgid "_Delete..."
-msgstr "Изтрии..."
-
 #: ui/evolution-event-editor.xml.h:1
 msgid "Cancel Mee_ting"
 msgstr "Прекрати _Среща"
@@ -26734,7 +27101,7 @@ msgstr "Изтрива за постоянно всички съобщения �
 
 #: ui/evolution-mail-global.xml.h:11
 #, fuzzy
-msgid "Post Ne_w Message"
+msgid "Post New Message"
 msgstr "Ново Съобщение"
 
 #: ui/evolution-mail-global.xml.h:12
@@ -26771,21 +27138,16 @@ msgstr "_Предварителен преглед на Pane"
 msgid "Change the properties of this folder"
 msgstr "Промяна настройките за тази папка"
 
-#: ui/evolution-mail-list.xml.h:2 ui/evolution-mail-message.xml.h:10
+#: ui/evolution-mail-list.xml.h:2
 #, fuzzy
 msgid "Copy selected message(s) to the clipboard"
 msgstr "Копира избраното съобщение в друга папка"
 
-#: ui/evolution-mail-list.xml.h:3 ui/evolution-mail-message.xml.h:22
+#: ui/evolution-mail-list.xml.h:4
 #, fuzzy
 msgid "Cut selected message(s) to the clipboard"
 msgstr "Поставя съобщението в буфера за обмен"
 
-#: ui/evolution-mail-list.xml.h:4
-#, fuzzy
-msgid "E_xpunge"
-msgstr "_Задрасква"
-
 #: ui/evolution-mail-list.xml.h:5
 msgid "Hide S_elected Messages"
 msgstr "Скрий Избраните Съобщения"
@@ -26812,7 +27174,7 @@ msgstr "Маркирай като _Прочетено"
 msgid "Mark all visible messages as read"
 msgstr "Маркирай всички видими съобщенията като прочетени"
 
-#: ui/evolution-mail-list.xml.h:11 ui/evolution-mail-message.xml.h:66
+#: ui/evolution-mail-list.xml.h:11
 #, fuzzy
 msgid "Paste message(s) from the clipboard"
 msgstr "Поставя съобщението в буфера за обмен"
@@ -26857,37 +27219,26 @@ msgstr "Временно скрива избраните съобщения"
 msgid "Threaded Message list"
 msgstr ""
 
-#: ui/evolution-mail-list.xml.h:25 ui/evolution.xml.h:47
+#: ui/evolution-mail-list.xml.h:26
+msgid "_Expunge"
+msgstr "_Задрасква"
+
+#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:47
 msgid "_Folder"
 msgstr "Папка"
 
-#: ui/evolution-mail-list.xml.h:26 ui/evolution-subscribe.xml.h:12
+#: ui/evolution-mail-list.xml.h:28 ui/evolution-subscribe.xml.h:12
 msgid "_Invert Selection"
 msgstr "_Обърнат Избор"
 
-#: ui/evolution-mail-list.xml.h:27
+#: ui/evolution-mail-list.xml.h:30
 msgid "_Properties..."
 msgstr "Свойства..."
 
-#: ui/evolution-mail-list.xml.h:28
+#: ui/evolution-mail-list.xml.h:31
 msgid "_Threaded Message List"
 msgstr ""
 
-#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:6
-msgid "Close this window"
-msgstr "Затвори този прозорец"
-
-#: ui/evolution-mail-messagedisplay.xml.h:5
-#: ui/evolution-message-composer.xml.h:39 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:43
-msgid "_Close"
-msgstr "Затвори"
-
-#: ui/evolution-mail-messagedisplay.xml.h:8
-#: ui/evolution-message-composer.xml.h:49 ui/evolution.xml.h:64
-msgid "_View"
-msgstr "_Изглед"
-
 #: ui/evolution-mail-message.xml.h:1
 #, fuzzy
 msgid "A_dd Sender to Addressbook"
@@ -26924,419 +27275,418 @@ msgstr "Създава отговор на пощенски списък на и
 msgid "Compose a reply to the sender of the selected message"
 msgstr "Създава отговор на изпращача на избраното съобщение"
 
-#: ui/evolution-mail-message.xml.h:11
+#: ui/evolution-mail-message.xml.h:10
 msgid "Copy selected messages to another folder"
 msgstr "Копира избраното съобщение в друга папка"
 
-#: ui/evolution-mail-message.xml.h:12
+#: ui/evolution-mail-message.xml.h:11
 msgid "Create _Virtual Folder From Message"
 msgstr "Създава Виртуална _Папка От Съобщение"
 
-#: ui/evolution-mail-message.xml.h:13
+#: ui/evolution-mail-message.xml.h:12
 msgid "Create a rule to filter messages from this sender"
 msgstr "Създава правила за филтриране на съобщения за този изпращач"
 
-#: ui/evolution-mail-message.xml.h:14
+#: ui/evolution-mail-message.xml.h:13
 msgid "Create a rule to filter messages to these recipients"
 msgstr "Създава правила за филтриране на съобщения за тези получатели"
 
-#: ui/evolution-mail-message.xml.h:15
+#: ui/evolution-mail-message.xml.h:14
 msgid "Create a rule to filter messages to this mailing list"
 msgstr "Създава правила за филтриране на съобщения за този пощенски списък"
 
-#: ui/evolution-mail-message.xml.h:16
+#: ui/evolution-mail-message.xml.h:15
 msgid "Create a rule to filter messages with this subject"
 msgstr "Създава правила за филтриране на съобщения с тази тема"
 
-#: ui/evolution-mail-message.xml.h:17
+#: ui/evolution-mail-message.xml.h:16
 msgid "Create a virtual folder for these recipients"
 msgstr "Създава виртуална папка за тези получатели"
 
-#: ui/evolution-mail-message.xml.h:18
+#: ui/evolution-mail-message.xml.h:17
 msgid "Create a virtual folder for this mailing list"
 msgstr "Създава виртуална папка за този пощенски списък"
 
-#: ui/evolution-mail-message.xml.h:19
+#: ui/evolution-mail-message.xml.h:18
 msgid "Create a virtual folder for this sender"
 msgstr "Създава виртуална папка за този изпращач"
 
-#: ui/evolution-mail-message.xml.h:20
+#: ui/evolution-mail-message.xml.h:19
 msgid "Create a virtual folder for this subject"
 msgstr "Създава виртуална папка за този обект"
 
-#: ui/evolution-mail-message.xml.h:23
+#: ui/evolution-mail-message.xml.h:20
 msgid "Decrease the text size"
 msgstr "Намалява размера на текст"
 
-#: ui/evolution-mail-message.xml.h:25
+#: ui/evolution-mail-message.xml.h:22
 msgid "Display the next important message"
 msgstr "Показва следващото важно съобщение"
 
-#: ui/evolution-mail-message.xml.h:26
+#: ui/evolution-mail-message.xml.h:23
 msgid "Display the next message"
 msgstr "Показва следващото съобщение"
 
-#: ui/evolution-mail-message.xml.h:27
+#: ui/evolution-mail-message.xml.h:24
 msgid "Display the next unread message"
 msgstr "Показва следващото непрочетено съобщение"
 
-#: ui/evolution-mail-message.xml.h:28
+#: ui/evolution-mail-message.xml.h:25
 msgid "Display the next unread thread"
 msgstr "Показва следващата непрочетена нишка"
 
-#: ui/evolution-mail-message.xml.h:29
+#: ui/evolution-mail-message.xml.h:26
 msgid "Display the previous important message"
 msgstr "Показва предишното важно съобщение"
 
-#: ui/evolution-mail-message.xml.h:30
+#: ui/evolution-mail-message.xml.h:27
 msgid "Display the previous message"
 msgstr "Показва предишното съобщение"
 
-#: ui/evolution-mail-message.xml.h:31
+#: ui/evolution-mail-message.xml.h:28
 msgid "Display the previous unread message"
 msgstr "Показва предишно непрочетено съобщение"
 
-#: ui/evolution-mail-message.xml.h:32
+#: ui/evolution-mail-message.xml.h:29
 #, fuzzy
 msgid "F_orward"
 msgstr "Препрати"
 
-#: ui/evolution-mail-message.xml.h:33
+#: ui/evolution-mail-message.xml.h:30
 msgid "Filter on Mailing _List..."
 msgstr "Филтър върху Пощенски _Списък.."
 
-#: ui/evolution-mail-message.xml.h:34
+#: ui/evolution-mail-message.xml.h:31
 msgid "Filter on Se_nder..."
 msgstr "Филтър върху _Изпращач..."
 
-#: ui/evolution-mail-message.xml.h:35
+#: ui/evolution-mail-message.xml.h:32
 msgid "Filter on _Recipients..."
 msgstr "Филтър върху П_олучатели..."
 
-#: ui/evolution-mail-message.xml.h:36
+#: ui/evolution-mail-message.xml.h:33
 msgid "Filter on _Subject..."
 msgstr "Филтър върху _Тема.."
 
-#: ui/evolution-mail-message.xml.h:37
+#: ui/evolution-mail-message.xml.h:34
 #, fuzzy
 msgid "Flag selected message(s) for follow-up"
 msgstr "Маркира избраните съобщения за изтриване"
 
-#: ui/evolution-mail-message.xml.h:38
+#: ui/evolution-mail-message.xml.h:35
 #, fuzzy
 msgid "Follow _Up..."
 msgstr "Пълно _Име..."
 
-#: ui/evolution-mail-message.xml.h:39
+#: ui/evolution-mail-message.xml.h:36
 msgid "Force images in HTML mail to be loaded"
 msgstr "Принуждава картинките в HTML поща да бъдат заредени"
 
-#: ui/evolution-mail-message.xml.h:41
+#: ui/evolution-mail-message.xml.h:38
 msgid "Forward the selected message in the body of a new message"
 msgstr "Препраща избраното съобщение в тялото като ново съобщение"
 
-#: ui/evolution-mail-message.xml.h:42
+#: ui/evolution-mail-message.xml.h:39
 msgid "Forward the selected message quoted like a reply"
 msgstr "Препраща избраното съобщение цитирано като отговор"
 
-#: ui/evolution-mail-message.xml.h:43
+#: ui/evolution-mail-message.xml.h:40
 msgid "Forward the selected message to someone"
 msgstr "Препраща избраното съобщение за някой"
 
-#: ui/evolution-mail-message.xml.h:44
+#: ui/evolution-mail-message.xml.h:41
 msgid "Forward the selected message to someone as an attachment"
 msgstr "Препраща избраното съобщение за някой като прикачено"
 
-#: ui/evolution-mail-message.xml.h:45
+#: ui/evolution-mail-message.xml.h:42
 msgid "Increase the text size"
 msgstr "Увеличава размера на текст"
 
-#: ui/evolution-mail-message.xml.h:46
+#: ui/evolution-mail-message.xml.h:43
 msgid "Load _Images"
 msgstr "Зарежда _Картинки"
 
-#: ui/evolution-mail-message.xml.h:47
-msgid "Mar_k as Read"
-msgstr "Отбележи: прочетено"
-
-#: ui/evolution-mail-message.xml.h:48
+#: ui/evolution-mail-message.xml.h:45
 msgid "Mark as I_mportant"
 msgstr "Маркира като Важно"
 
-#: ui/evolution-mail-message.xml.h:49
+#: ui/evolution-mail-message.xml.h:46
 msgid "Mark as U_nread"
 msgstr "Отбележи: непрочетено"
 
-#: ui/evolution-mail-message.xml.h:50
+#: ui/evolution-mail-message.xml.h:47
 msgid "Mark as Unimp_ortant"
 msgstr "Маркирай като Не_важни"
 
-#: ui/evolution-mail-message.xml.h:51
+#: ui/evolution-mail-message.xml.h:48
 #, fuzzy
 msgid "Mark the selected message(s) as having been read"
 msgstr "Маркира избраните съобщения като прочетени"
 
-#: ui/evolution-mail-message.xml.h:52
+#: ui/evolution-mail-message.xml.h:49
 #, fuzzy
 msgid "Mark the selected message(s) as important"
 msgstr "Маркира избраните съобщения като важни"
 
-#: ui/evolution-mail-message.xml.h:53
+#: ui/evolution-mail-message.xml.h:50
 #, fuzzy
 msgid "Mark the selected message(s) as not having been read"
 msgstr "Маркира избраните съобщения като непрочетени"
 
-#: ui/evolution-mail-message.xml.h:54
+#: ui/evolution-mail-message.xml.h:51
 #, fuzzy
 msgid "Mark the selected message(s) as unimportant"
 msgstr "Маркира избраните съобщения като неважни"
 
-#: ui/evolution-mail-message.xml.h:55
+#: ui/evolution-mail-message.xml.h:52
 msgid "Mark the selected messages for deletion"
 msgstr "Маркира избраните съобщения за изтриване"
 
-#: ui/evolution-mail-message.xml.h:56
+#: ui/evolution-mail-message.xml.h:53
 msgid "Move"
 msgstr "Премести"
 
-#: ui/evolution-mail-message.xml.h:57
+#: ui/evolution-mail-message.xml.h:54
 #, fuzzy
 msgid "Move selected message(s) to another folder"
 msgstr "Премести избраните съобщения в нова папка"
 
-#: ui/evolution-mail-message.xml.h:58
+#: ui/evolution-mail-message.xml.h:55
 msgid "Next"
 msgstr "Следващ"
 
-#: ui/evolution-mail-message.xml.h:59
+#: ui/evolution-mail-message.xml.h:56
 #, fuzzy
 msgid "Next _Important Message"
 msgstr "Следващо Важно Съобщение"
 
-#: ui/evolution-mail-message.xml.h:60
+#: ui/evolution-mail-message.xml.h:57
 #, fuzzy
 msgid "Next _Thread"
 msgstr "Следваща Нишка"
 
-#: ui/evolution-mail-message.xml.h:61
+#: ui/evolution-mail-message.xml.h:58
 #, fuzzy
 msgid "Next _Unread Message"
 msgstr "Следващо Непрочетено Съобщение"
 
-#: ui/evolution-mail-message.xml.h:62
+#: ui/evolution-mail-message.xml.h:59
 msgid "Open the selected message in a new window"
 msgstr "Отваря избраните съобщения в нов прозорец"
 
-#: ui/evolution-mail-message.xml.h:63
+#: ui/evolution-mail-message.xml.h:60
 msgid "Open the selected message in the composer to re-send it"
 msgstr "Отваря избраното съобщение в редактора за препращане"
 
-#: ui/evolution-mail-message.xml.h:64
+#: ui/evolution-mail-message.xml.h:61
 msgid "Original Si_ze"
 msgstr "Оригинален Раз_мер"
 
-#: ui/evolution-mail-message.xml.h:65
+#: ui/evolution-mail-message.xml.h:62
 #, fuzzy
 msgid "P_revious Unread Message"
 msgstr "Предишно Непрочетено Съобщение"
 
-#: ui/evolution-mail-message.xml.h:67
+#: ui/evolution-mail-message.xml.h:63
 #, fuzzy
-msgid "Post a Repl_y"
+msgid "Post a Reply"
 msgstr "Отговор на Задача"
 
-#: ui/evolution-mail-message.xml.h:68
+#: ui/evolution-mail-message.xml.h:64
 #, fuzzy
 msgid "Post a reply to a message in a Public folder"
 msgstr "Проврка за нови съобщения във всички папки"
 
-#: ui/evolution-mail-message.xml.h:69
+#: ui/evolution-mail-message.xml.h:65
 #, fuzzy
 msgid "Pr_evious Important Message"
 msgstr "Предишно Важно Съобщение"
 
-#: ui/evolution-mail-message.xml.h:70
+#: ui/evolution-mail-message.xml.h:66
 msgid "Preview the message to be printed"
 msgstr "Преглед на съобщението за печат"
 
-#: ui/evolution-mail-message.xml.h:71
+#: ui/evolution-mail-message.xml.h:67
 msgid "Previous"
 msgstr "Предишен"
 
-#: ui/evolution-mail-message.xml.h:74
+#: ui/evolution-mail-message.xml.h:70
 msgid "Print this message"
 msgstr "Отпечатай това Съобщение"
 
-#: ui/evolution-mail-message.xml.h:75
+#: ui/evolution-mail-message.xml.h:71
 msgid "Re_direct"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:76
+#: ui/evolution-mail-message.xml.h:72
 #, fuzzy
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "Препраща избраното съобщение за някой"
 
-#: ui/evolution-mail-message.xml.h:79
-msgid "Reply to _All"
-msgstr "Отговори на всички"
-
-#: ui/evolution-mail-message.xml.h:80
-msgid "Reply to _List"
-msgstr "Отговори на списъка"
-
-#: ui/evolution-mail-message.xml.h:81
+#: ui/evolution-mail-message.xml.h:77
 msgid "Reset the text to its original size"
 msgstr "Възстановява текста в неговият оригинален размер"
 
-#: ui/evolution-mail-message.xml.h:82
-#, fuzzy
-msgid "S_earch in Message..."
+#: ui/evolution-mail-message.xml.h:78
+msgid "S_earch Message..."
 msgstr "Търсене на съобщение..."
 
-#: ui/evolution-mail-message.xml.h:83
+#: ui/evolution-mail-message.xml.h:79
 msgid "S_maller"
 msgstr "По-_малък"
 
-#: ui/evolution-mail-message.xml.h:84
+#: ui/evolution-mail-message.xml.h:80
 msgid "Save the message as a text file"
 msgstr "Съхрани съобщението като текстови файл"
 
-#: ui/evolution-mail-message.xml.h:85
+#: ui/evolution-mail-message.xml.h:81
 msgid "Search for text in the body of the displayed message"
 msgstr "Търсене на текст в тялото на показваното съобщение"
 
-#: ui/evolution-mail-message.xml.h:86
+#: ui/evolution-mail-message.xml.h:82
 #, fuzzy
 msgid "Set up the page settings for your current printer"
 msgstr "Настройка на страницата за вашият текущ принтер"
 
-#: ui/evolution-mail-message.xml.h:87
+#: ui/evolution-mail-message.xml.h:83
 msgid "Show Email _Source"
 msgstr "Показва Източника на Ел. Поща"
 
-#: ui/evolution-mail-message.xml.h:88
+#: ui/evolution-mail-message.xml.h:84
 msgid "Show Full _Headers"
 msgstr "Покажи Пълните Заглавия"
 
-#: ui/evolution-mail-message.xml.h:89
+#: ui/evolution-mail-message.xml.h:85
 #, fuzzy
 msgid "Show a blinking cursor in the body of displayed messages"
 msgstr "Търсене на текст в тялото на показваното съобщение"
 
-#: ui/evolution-mail-message.xml.h:90
+#: ui/evolution-mail-message.xml.h:86
 msgid "Show message in the normal style"
 msgstr "Показва съобщение в нормален стил"
 
-#: ui/evolution-mail-message.xml.h:91
+#: ui/evolution-mail-message.xml.h:87
 msgid "Show message with all email headers"
 msgstr "Показва съобщение със всички Пощенски заглавия"
 
-#: ui/evolution-mail-message.xml.h:92
+#: ui/evolution-mail-message.xml.h:88
 msgid "Show the raw email source of the message"
 msgstr "Показва необработено съобщението на Ел. поща"
 
-#: ui/evolution-mail-message.xml.h:93
+#: ui/evolution-mail-message.xml.h:89
 msgid "Text Si_ze"
 msgstr "Раз_мер на Текст"
 
-#: ui/evolution-mail-message.xml.h:94
+#: ui/evolution-mail-message.xml.h:90
 msgid "Un-delete the selected messages"
 msgstr "Не изтрива избраните съобщения"
 
-#: ui/evolution-mail-message.xml.h:95
+#: ui/evolution-mail-message.xml.h:91
 msgid "VFolder on Mailing _List..."
 msgstr "VFolder върху Пощенски списък..."
 
-#: ui/evolution-mail-message.xml.h:96
+#: ui/evolution-mail-message.xml.h:92
 msgid "VFolder on Se_nder..."
 msgstr "VFolder върху _Изпращач"
 
-#: ui/evolution-mail-message.xml.h:97
+#: ui/evolution-mail-message.xml.h:93
 msgid "VFolder on _Recipients..."
 msgstr "VFolder върху _Получатели"
 
-#: ui/evolution-mail-message.xml.h:98
+#: ui/evolution-mail-message.xml.h:94
 msgid "VFolder on _Subject..."
 msgstr "VFolder върху _Тема"
 
-#: ui/evolution-mail-message.xml.h:100
+#: ui/evolution-mail-message.xml.h:96
 #, fuzzy
 msgid "_Attached"
 msgstr "Прикрепи"
 
-#: ui/evolution-mail-message.xml.h:102
+#: ui/evolution-mail-message.xml.h:97
 msgid "_Copy to Folder"
 msgstr "_Копирай в Папка"
 
-#: ui/evolution-mail-message.xml.h:103
+#: ui/evolution-mail-message.xml.h:98
 msgid "_Create Filter From Message"
 msgstr "_Създай Правило От Съобщението"
 
-#: ui/evolution-mail-message.xml.h:105
+#: ui/evolution-mail-message.xml.h:100
 msgid "_Forward Message"
 msgstr "П_репратени съобщения"
 
-#: ui/evolution-mail-message.xml.h:106
+#: ui/evolution-mail-message.xml.h:101
 #, fuzzy
 msgid "_Go To"
 msgstr "Отиди"
 
-#: ui/evolution-mail-message.xml.h:107
+#: ui/evolution-mail-message.xml.h:102
 #, fuzzy
 msgid "_Inline"
 msgstr "Работа в 'O_nline' "
 
-#: ui/evolution-mail-message.xml.h:108
+#: ui/evolution-mail-message.xml.h:103
 msgid "_Larger"
 msgstr "_По-голям"
 
-#: ui/evolution-mail-message.xml.h:109
+#: ui/evolution-mail-message.xml.h:104
 msgid "_Message Display"
 msgstr "Показване на _Съобщение"
 
-#: ui/evolution-mail-message.xml.h:110
+#: ui/evolution-mail-message.xml.h:105
 msgid "_Move to Folder"
 msgstr "Премести в _Папка"
 
-#: ui/evolution-mail-message.xml.h:111
+#: ui/evolution-mail-message.xml.h:106
 #, fuzzy
 msgid "_Next Message"
 msgstr "Следващо Съобщение"
 
-#: ui/evolution-mail-message.xml.h:112
+#: ui/evolution-mail-message.xml.h:107
 msgid "_Normal Display"
 msgstr "_Нормално Показване"
 
-#: ui/evolution-mail-message.xml.h:113
+#: ui/evolution-mail-message.xml.h:108
 msgid "_Open Message"
 msgstr "Отваря _Съобщение"
 
-#: ui/evolution-mail-message.xml.h:115
+#: ui/evolution-mail-message.xml.h:109
 #, fuzzy
 msgid "_Previous Message"
 msgstr "Предишно Съобщение"
 
-#: ui/evolution-mail-message.xml.h:117
+#: ui/evolution-mail-message.xml.h:111
 msgid "_Quoted"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:118
-msgid "_Reply to Sender"
-msgstr "Отговори на подателя"
-
-#: ui/evolution-mail-message.xml.h:119
+#: ui/evolution-mail-message.xml.h:113
 #, fuzzy
 msgid "_Resend..."
 msgstr "Преименувай..."
 
-#: ui/evolution-mail-message.xml.h:121 ui/evolution.xml.h:63
+#: ui/evolution-mail-message.xml.h:115 ui/evolution.xml.h:63
 msgid "_Tools"
 msgstr "Инс_трументи"
 
-#: ui/evolution-mail-message.xml.h:122
+#: ui/evolution-mail-message.xml.h:116
 msgid "_Undelete"
 msgstr "Възстанови изтрито"
 
+#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:6
+msgid "Close this window"
+msgstr "Затвори този прозорец"
+
+#: ui/evolution-mail-messagedisplay.xml.h:5
+#: ui/evolution-message-composer.xml.h:39
+#: ui/evolution-signature-editor.xml.h:10 ui/evolution-subscribe.xml.h:9
+#: ui/evolution.xml.h:43
+msgid "_Close"
+msgstr "Затвори"
+
+#: ui/evolution-mail-messagedisplay.xml.h:8
+#: ui/evolution-message-composer.xml.h:49 ui/evolution.xml.h:64
+msgid "_View"
+msgstr "_Изглед"
+
 #: ui/evolution-message-composer.xml.h:1
 msgid "Attach"
 msgstr "Прикрепи"
@@ -27345,7 +27695,7 @@ msgstr "Прикрепи"
 msgid "Attach a file"
 msgstr "Прикрепи файл"
 
-#: ui/evolution-message-composer.xml.h:4 ui/evolution-signature-editor.xml.h:3
+#: ui/evolution-message-composer.xml.h:4 ui/evolution-signature-editor.xml.h:2
 msgid "Close the current file"
 msgstr "Затвори текущият файл"
 
@@ -27361,7 +27711,7 @@ msgstr "Криптирай това съобщение с PGP"
 msgid "Encrypt this message with your S/MIME Encryption Cetificate"
 msgstr "Криптира това съобщение с вашият S/MIME сертификат за криптиране"
 
-#: ui/evolution-message-composer.xml.h:8 ui/evolution-signature-editor.xml.h:4
+#: ui/evolution-message-composer.xml.h:8 ui/evolution-signature-editor.xml.h:3
 msgid "For_mat"
 msgstr "_Формат"
 
@@ -27394,11 +27744,6 @@ msgstr "S/MIME криптиране"
 msgid "S/MIME Sign"
 msgstr "S/MIME Подпис"
 
-#: ui/evolution-message-composer.xml.h:16
-#: ui/evolution-signature-editor.xml.h:6
-msgid "Save"
-msgstr "Съхрани"
-
 #: ui/evolution-message-composer.xml.h:17
 msgid "Save As"
 msgstr "Съхрани Като"
@@ -27412,7 +27757,7 @@ msgid "Save in folder..."
 msgstr "Съхрани в папка..."
 
 #: ui/evolution-message-composer.xml.h:21
-#: ui/evolution-signature-editor.xml.h:9
+#: ui/evolution-signature-editor.xml.h:7
 msgid "Save the current file"
 msgstr "Съхрани текущия файл"
 
@@ -27429,7 +27774,7 @@ msgid "Send"
 msgstr "Изпрати"
 
 #: ui/evolution-message-composer.xml.h:25
-#: ui/evolution-signature-editor.xml.h:11
+#: ui/evolution-signature-editor.xml.h:9
 msgid "Send the mail in HTML format"
 msgstr "Изпрати mail-а в HTML формат"
 
@@ -27495,7 +27840,7 @@ msgid "_From Field"
 msgstr "_От Поле"
 
 #: ui/evolution-message-composer.xml.h:44
-#: ui/evolution-signature-editor.xml.h:14
+#: ui/evolution-signature-editor.xml.h:13
 msgid "_Insert"
 msgstr "_Вмъква"
 
@@ -27511,11 +27856,11 @@ msgstr "Отговор-До Поле"
 msgid "_Security"
 msgstr "_Сигурност"
 
-#: ui/evolution-signature-editor.xml.h:5
+#: ui/evolution-signature-editor.xml.h:4
 msgid "H_TML"
 msgstr "H_TML"
 
-#: ui/evolution-signature-editor.xml.h:10
+#: ui/evolution-signature-editor.xml.h:8
 #, fuzzy
 msgid "Save the current file and close the window"
 msgstr "Запазва точката и затваря диалога"
@@ -27877,31 +28222,27 @@ msgstr "Изглед за Работна седмица"
 
 #: views/mail/galview.xml.h:1
 #, fuzzy
-msgid "As _Sent Folder"
+msgid "As Sent Folder"
 msgstr "Избери Папка"
 
 #: views/mail/galview.xml.h:2
-#, fuzzy
-msgid "By S_tatus"
-msgstr "По Статус"
+msgid "By Follow Up Flag"
+msgstr ""
 
 #: views/mail/galview.xml.h:3
-#, fuzzy
-msgid "By Se_nder"
+msgid "By Sender"
 msgstr "По Изпращач"
 
 #: views/mail/galview.xml.h:4
-#, fuzzy
-msgid "By Su_bject"
-msgstr "По Тема"
+msgid "By Status"
+msgstr "По Статус"
 
 #: views/mail/galview.xml.h:5
-msgid "By _Follow Up Flag"
-msgstr ""
+msgid "By Subject"
+msgstr "По Тема"
 
 #: views/mail/galview.xml.h:6
-#, fuzzy
-msgid "_Messages"
+msgid "Messages"
 msgstr "Съобщения"
 
 #: views/tasks/galview.xml.h:1
@@ -27965,12 +28306,12 @@ msgstr "Задава Прегледи"
 
 #. Translators: These are the first characters of each day of the
 #. week, 'M' for 'Monday', 'T' for Tuesday etc.
-#: widgets/misc/e-calendar-item.c:456
+#: widgets/misc/e-calendar-item.c:427
 msgid "MTWTFSS"
 msgstr "MTWTFSS"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: widgets/misc/e-calendar-item.c:1174
+#: widgets/misc/e-calendar-item.c:1127
 msgid "%B %Y"
 msgstr "%B %Y"
 
@@ -28099,6 +28440,22 @@ msgstr "Добави в Запазените Търсения"
 msgid "_Advanced..."
 msgstr "Допълнителни..."
 
+#: widgets/misc/e-messagebox.c:154
+msgid "Information"
+msgstr "Информация"
+
+#: widgets/misc/e-messagebox.c:168
+msgid "Error"
+msgstr "Грешка"
+
+#: widgets/misc/e-messagebox.c:175
+msgid "Question"
+msgstr "Въпрос"
+
+#: widgets/misc/e-messagebox.c:182
+msgid "Message"
+msgstr "Съобщение"
+
 #: widgets/misc/e-search-bar.c:531
 msgid "_Search"
 msgstr "Търсене"
@@ -28150,549 +28507,6 @@ msgstr "Календар на Evolution iTip/iMip преглед"
 msgid "Evolution Addressbook local file backend"
 msgstr "Интерфейс за търсенето по имена в адресната книга на Еволюшън"
 
-#~ msgid "Chair Persons"
-#~ msgstr "Председателствуващ"
-
-#~ msgid "Required Participants"
-#~ msgstr "Членове"
-
-#~ msgid "Optional Participants"
-#~ msgstr "Допълнителни Членове"
-
-#, fuzzy
-#~ msgid "Resources"
-#~ msgstr "Ресурс"
-
-#~ msgid "Individual"
-#~ msgstr "Индивидуално"
-
-#~ msgid "Group"
-#~ msgstr "Група"
-
-#~ msgid "Resource"
-#~ msgstr "Ресурс"
-
-#~ msgid "Room"
-#~ msgstr "Помещение"
-
-#~ msgid "Chair"
-#~ msgstr "Председателствуващ"
-
-#~ msgid "Required Participant"
-#~ msgstr "Заявен Участник"
-
-#~ msgid "Optional Participant"
-#~ msgstr "Допълнителен Участник"
-
-#~ msgid "Non-Participant"
-#~ msgstr "Не Участник"
-
-#~ msgid "Needs Action"
-#~ msgstr "Необходими Действия"
-
-#~ msgid "Delegated"
-#~ msgstr "Делегиран"
-
-#~ msgid "In Process"
-#~ msgstr "В Прогрес"
-
-#~ msgid "Could not create temporary directory: %s"
-#~ msgstr "Не мога да създам временна директория: %s"
-
-#~ msgid "%d new"
-#~ msgstr "%d нов"
-
-#~ msgid ", "
-#~ msgstr ", "
-
-#~ msgid "%d hidden"
-#~ msgstr "%d скрит"
-
-#~ msgid "%d selected"
-#~ msgstr " %d избрано"
-
-#~ msgid "%d unsent"
-#~ msgstr " %d неизпратено"
-
-#~ msgid "%d sent"
-#~ msgstr " %d изпратено"
-
-#~ msgid "%d total"
-#~ msgstr "%d общо"
-
-#, fuzzy
-#~ msgid "Create _Virtual Folder From Search..."
-#~ msgstr "Създава Виртуална _Папка От Съобщение"
-
-#~ msgid "VFolder on _Subject"
-#~ msgstr "VFolder върху _Тема"
-
-#~ msgid "VFolder on Se_nder"
-#~ msgstr "_vПапка на Изпращач"
-
-#~ msgid "VFolder on _Recipients"
-#~ msgstr "v_Папка на Получатели"
-
-#~ msgid "VFolder on Mailing _List"
-#~ msgstr "Филтър върху _Mailing List"
-
-#~ msgid "Filter on Sub_ject"
-#~ msgstr "Филтър върху Т_ема"
-
-#~ msgid "Filter on Sen_der"
-#~ msgstr "Филтър върху Из_пращач"
-
-#~ msgid "Filter on Re_cipients"
-#~ msgstr "Филтър върху По_лучатели"
-
-#~ msgid "Filter on _Mailing List"
-#~ msgstr "Филтър върху Mailing _List"
-
-#~ msgid "_Edit as New Message..."
-#~ msgstr "Редактирай като ново съобщение..."
-
-#~ msgid "_Print"
-#~ msgstr "Печат"
-
-#~ msgid "_Forward"
-#~ msgstr "Препрати"
-
-#, fuzzy
-#~ msgid "Fla_g Completed"
-#~ msgstr "Приключено"
-
-#, fuzzy
-#~ msgid "Cl_ear Flag"
-#~ msgstr "Изчисти"
-
-#, fuzzy
-#~ msgid "Mark as _Unread"
-#~ msgstr "Отбележи: непрочетено"
-
-#~ msgid "Mark as _Important"
-#~ msgstr "Маркира като В_ажно"
-
-#, fuzzy
-#~ msgid "_Mark as Unimportant"
-#~ msgstr "Маркирай като Не_важни"
-
-#, fuzzy
-#~ msgid "U_ndelete"
-#~ msgstr "Възстанови изтрито"
-
-#, fuzzy
-#~ msgid "Mo_ve to Folder..."
-#~ msgstr "Премести в Папка..."
-
-#, fuzzy
-#~ msgid "Add Sender to Address_book"
-#~ msgstr "Добави подателя в адресната книга"
-
-#, fuzzy
-#~ msgid "Appl_y Filters"
-#~ msgstr "Приложи Филтри"
-
-#, fuzzy
-#~ msgid "Crea_te Rule From Message"
-#~ msgstr "Създай правило от съобщението"
-
-#, fuzzy
-#~ msgid "VFolder on M_ailing List"
-#~ msgstr "ВПапка по пощенски списък"
-
-#, fuzzy
-#~ msgid "Filter on _Mailing List (%s)"
-#~ msgstr "Филтър по пощенски списък (%s)"
-
-#, fuzzy
-#~ msgid "VFolder on M_ailing List (%s)"
-#~ msgstr "ВПапка по пощенски списък (%s)"
-
-#~ msgid "Properties for \"%s\""
-#~ msgstr "Свойства за \"%s\""
-
-#~ msgid "Properties"
-#~ msgstr "Свойства"
-
-#~ msgid "Don't show this message again."
-#~ msgstr "Не показвай това съобщение отново."
-
-#~ msgid ""
-#~ "You have not configured the mail client.\n"
-#~ "You need to do this before you can send,\n"
-#~ "receive or compose mail.\n"
-#~ "Would you like to configure it now?"
-#~ msgstr ""
-#~ "Не сте конфигурирали Вашият mail клиент.\n"
-#~ "Трябва да го направите за да може да изпращате,\n"
-#~ "получавате или пишете поща.\n"
-#~ "Искате ли да го конфигурурате сега?"
-
-#, fuzzy
-#~ msgid ""
-#~ "You need to configure an account\n"
-#~ "before you can compose mail."
-#~ msgstr ""
-#~ "Необходимо е да конфигурирате потребител\n"
-#~ "преди да създадете поща."
-
-#~ msgid ""
-#~ "You need to configure an identity\n"
-#~ "before you can compose mail."
-#~ msgstr ""
-#~ "Необходимо е да конфигурирате потребител\n"
-#~ "преди да създадете поща."
-
-#~ msgid ""
-#~ "You need to configure a mail transport\n"
-#~ "before you can compose mail."
-#~ msgstr ""
-#~ "Необходимо е да конфигурирате транспорт на поща\n"
-#~ "преди да създадете поща."
-
-#, fuzzy
-#~ msgid ""
-#~ "You are sending an HTML-formatted message. Please make sure that\n"
-#~ "the following recipients are willing and able to receive HTML mail:\n"
-#~ msgstr ""
-#~ "Вие изпращате HTML-форматирано съобщение, но следните получатели не искат "
-#~ "HTML форматирана поща:\n"
-
-#~ msgid "Send anyway?"
-#~ msgstr "Изпрати въпреки това?"
-
-#~ msgid ""
-#~ "This message has no subject.\n"
-#~ "Really send?"
-#~ msgstr ""
-#~ "Съобщението няма Тема.\n"
-#~ "Найстина ли да го изпратя?"
-
-#~ msgid "This message contains only Bcc recipients."
-#~ msgstr "Това съобщение съдържа само Bcc получател."
-
-#~ msgid "You must specify recipients in order to send this message."
-#~ msgstr "Трябва да укажете получател(и) за да може да изпратите съобщението."
-
-#~ msgid ""
-#~ "Unable to open the drafts folder for this account.\n"
-#~ "Would you like to use the default drafts folder?"
-#~ msgstr ""
-#~ "Не мога да отворя папката чернова за този акаунт.\n"
-#~ "Искате ли да използвате подразбираща се?"
-
-#~ msgid "an unknown sender"
-#~ msgstr "неизвестен изпрашач"
-
-#, fuzzy
-#~ msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
-#~ msgstr "На %a, %Y-%m-%d в %H:%M, %%s записа:"
-
-#~ msgid "Move message(s) to"
-#~ msgstr "Премести съобщени(ето/ята) в"
-
-#~ msgid "Copy message(s) to"
-#~ msgstr "Копирай съобщени(ето/ята) в"
-
-#~ msgid "Are you sure you want to edit all %d messages?"
-#~ msgstr "Сигурен ли сте, че искате да редактирате всички %d съобщения?"
-
-#~ msgid ""
-#~ "You may only edit messages saved\n"
-#~ "in the Drafts folder."
-#~ msgstr ""
-#~ "Можете да редактирате само съобщения записани\n"
-#~ "в папката Drafts."
-
-#~ msgid ""
-#~ "You may only resend messages\n"
-#~ "in the Sent folder."
-#~ msgstr ""
-#~ "Можете да изпращате отново само съобщения записани\n"
-#~ "в папката Sent."
-
-#~ msgid "Are you sure you want to resend all %d messages?"
-#~ msgstr "Сигурен ли сте, че искате да препратите всичките %d съобщения?"
-
-#~ msgid "No Message Selected"
-#~ msgstr "Няма Избрано Съобщение"
-
-#, fuzzy
-#~ msgid ""
-#~ "Cannot save to `%s'\n"
-#~ " %s"
-#~ msgstr ""
-#~ "Не мога да взема съобщение: %s\n"
-#~ "  %s"
-
-#, fuzzy
-#~ msgid ""
-#~ "`%s' already exists.\n"
-#~ "Overwrite it?"
-#~ msgstr ""
-#~ "%s вече съществува\n"
-#~ "Искате ли да го презапишете?"
-
-#~ msgid "Save Message As..."
-#~ msgstr "Съхрани Съобщението Като..."
-
-#~ msgid "Save Messages As..."
-#~ msgstr "Съхрани Съобщението Като..."
-
-#, fuzzy
-#~ msgid ""
-#~ "This operation will permanently erase all messages marked as\n"
-#~ "deleted. If you continue, you will not be able to recover these "
-#~ "messages.\n"
-#~ "\n"
-#~ "Really erase these messages?"
-#~ msgstr ""
-#~ "Тази операция ще изтрие за постоянно всички съобщения маркирани за "
-#~ "изтриване. Ако продължите, вие няма да сте в състояние да възстановите "
-#~ "тези съобщения.\n"
-#~ "\n"
-#~ "Действително ли да изтрия съобщенията?"
-
-#~ msgid ""
-#~ "Error loading filter information:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Грешка при зареждане информацията за финтъра:\n"
-#~ "%s"
-
-#~ msgid "Filters"
-#~ msgstr "Филтри"
-
-#, fuzzy
-#~ msgid "Page %d of %d"
-#~ msgstr "Получаване на съобщение номер %d от %d"
-
-#~ msgid "Print Message"
-#~ msgstr "Отпечатай Съобщението"
-
-#~ msgid "Printing of message failed"
-#~ msgstr "Отпечатването неуспешно"
-
-#~ msgid "Are you sure you want to open all %d messages in separate windows?"
-#~ msgstr ""
-#~ "Сигурен ли сте, че искате да отворите всички %d съобщения в отделни "
-#~ "прозорци?"
-
-#, fuzzy
-#~ msgid ""
-#~ "File `%s' already exists.\n"
-#~ "Overwrite it?"
-#~ msgstr ""
-#~ "Файл със същото име вече съществува.\n"
-#~ "Да го презапиша ли?"
-
-#~ msgid "Save Attachment"
-#~ msgstr "Запазва Прикачен"
-
-#, fuzzy
-#~ msgid "Could not create temporary file '%s': %s"
-#~ msgstr "Не мога да създам временна директория: %s"
-
-#, fuzzy
-#~ msgid "%s is not a valid directory name."
-#~ msgstr "`%s' не е maildir директория."
-
-#, fuzzy
-#~ msgid "Save Attachment..."
-#~ msgstr "Запазва Прикачен"
-
-#, fuzzy
-#~ msgid "Save all attachments..."
-#~ msgstr "Запазва Прикачен"
-
-#~ msgid "Open in %s..."
-#~ msgstr "Отвори в %s..."
-
-#~ msgid "Hide"
-#~ msgstr "Скрий"
-
-#~ msgid "External Viewer"
-#~ msgstr "Външен Viewer"
-
-#, fuzzy
-#~ msgid "Downloading images"
-#~ msgstr "Зарежда _Картинки"
-
-#~ msgid "Loading message content"
-#~ msgstr "Зареждам съсдържанието на съобщението"
-
-#, fuzzy
-#~ msgid "Overdue:"
-#~ msgstr "П_ресрочени задачи:"
-
-#, fuzzy
-#~ msgid "by %B %d, %Y, %l:%M %p"
-#~ msgstr "%b %d %l:%M %p"
-
-#~ msgid "Open Link in Browser"
-#~ msgstr "_Отвори Указател в Браузер"
-
-#~ msgid "Copy Link Location"
-#~ msgstr "Копира местоположениет на указател"
-
-#~ msgid "Save Link as (FIXME)"
-#~ msgstr "Запазва указателя като (FIXME)"
-
-#~ msgid "Save Image as..."
-#~ msgstr "Съхрани картинка като..."
-
-#~ msgid "%s attachment"
-#~ msgstr "%s прикачен"
-
-#~ msgid "Could not parse MIME message. Displaying as source."
-#~ msgstr "Не мога да анализирам MIME съобщение. Показвам го в изходен код."
-
-#~ msgid "Bad Address"
-#~ msgstr "Грешен Адрес"
-
-#~ msgid "Reply-To"
-#~ msgstr "Отговор-До"
-
-#~ msgid "Cc"
-#~ msgstr "Cc"
-
-#~ msgid "Bcc"
-#~ msgstr "Bcc"
-
-#~ msgid ""
-#~ "This message is digitally signed. Click the lock icon for more "
-#~ "information."
-#~ msgstr ""
-#~ "Това съобщение е цифрово подписано. Кликнете на иконата за заключване за "
-#~ "повече информация."
-
-#, fuzzy
-#~ msgid "Could not create a PGP verfication context"
-#~ msgstr "Не мога да създам контекст за проверка на PGP"
-
-#, fuzzy
-#~ msgid "This message is digitally signed and has been found to be authentic."
-#~ msgstr ""
-#~ "Това съобщение е цифрово подписано. Кликнете на иконата за заключване за "
-#~ "повече информация."
-
-#, fuzzy
-#~ msgid ""
-#~ "This message is digitally signed but can not be proven to be authentic."
-#~ msgstr ""
-#~ "Това съобщение е цифрово подписано. Кликнете на иконата за заключване за "
-#~ "повече информация."
-
-#~ msgid "Pointer to FTP site (%s)"
-#~ msgstr "Указател към FTP сайт (%s)"
-
-#~ msgid "Pointer to local file (%s) valid at site \"%s\""
-#~ msgstr "Указател към локален файл (%s) валиден на сайта \"%s\""
-
-#~ msgid "Pointer to local file (%s)"
-#~ msgstr "Указател към локален файл (%s)"
-
-#~ msgid "Pointer to remote data (%s)"
-#~ msgstr "Указател към отдалечени данни (%s)"
-
-#~ msgid "Pointer to unknown external data (\"%s\" type)"
-#~ msgstr "Указател към неизвестни външни данни (\"%s\" type)"
-
-#~ msgid "(Untitled Message)"
-#~ msgstr "(Неименувано Съобщение)"
-
-#~ msgid "Untitled Message"
-#~ msgstr "Неименувано Съобщение"
-
-#~ msgid "Empty Message"
-#~ msgstr "Празно Съобщение"
-
-#~ msgid "Find in Message"
-#~ msgstr "Търси в съобщението"
-
-#~ msgid "Case Sensitive"
-#~ msgstr "Със значение на малки/големи букви"
-
-#~ msgid "Search Forward"
-#~ msgstr "Търси нататък"
-
-#~ msgid "Find:"
-#~ msgstr "Намери:"
-
-#~ msgid "Matches:"
-#~ msgstr "Съвпадения:"
-
-#~ msgid "(No subject)"
-#~ msgstr "(Няма тема)"
-
-#~ msgid "%s - Message"
-#~ msgstr "%s - съобщение"
-
-#~ msgid "Scanning folders under %s on \"%s\""
-#~ msgstr "Сканиране на папки под %s на \"%s\""
-
-#~ msgid "Scanning root-level folders on \"%s\""
-#~ msgstr "Сканиране на папки в основно ниво на \"%s\""
-
-#~ msgid "Subscribing to folder \"%s\""
-#~ msgstr "Абонамент за папка \"%s\""
-
-#~ msgid "Unsubscribing to folder \"%s\""
-#~ msgstr "Отписване от папка \"%s\""
-
-#~ msgid "No server has been selected"
-#~ msgstr "Не е избран сървър"
-
-#~ msgid "Please select a server."
-#~ msgstr "Моля, изберете сървър."
-
-#~ msgid "That person is already attending the meeting!"
-#~ msgstr "Това лице вече е на срещата!"
-
-#, fuzzy
-#~ msgid "_Save as..."
-#~ msgstr "Съхрани като..."
-
-#~ msgid "End Date"
-#~ msgstr "Крайна Дата"
-
-#~ msgid "New _Appointment"
-#~ msgstr "Нова _Среща"
-
-#~ msgid "Print..."
-#~ msgstr "Печат..."
-
-#~ msgid "Could not create a S/MIME signature context."
-#~ msgstr "Не мога да създам сигнатурен контекст за S/MIME"
-
-#~ msgid "Could not create a S/MIME encryption context."
-#~ msgstr "Не мога да създам S/MIME криптиращ контекст."
-
-#~ msgid "Could not create a S/MIME decode context."
-#~ msgstr "Не мога да създам декодиращ контекст за S/MIME"
-
-#~ msgid "However, the message was successfully sent."
-#~ msgstr "Обаче, съобщението беше изпратено успешно."
-
-#~ msgid "Forwarded Message"
-#~ msgstr "Препратени съобщения"
-
-#, fuzzy
-#~ msgid "Scanning folders ..."
-#~ msgstr "Съхрани в папка..."
-
-#~ msgid "Save As..."
-#~ msgstr "Съхрани Като..."
-
-#~ msgid "Information"
-#~ msgstr "Информация"
-
-#~ msgid "Question"
-#~ msgstr "Въпрос"
-
-#~ msgid "Message"
-#~ msgstr "Съобщение"
-
 #~ msgid "URL:"
 #~ msgstr "URL:"
 
@@ -29086,6 +28900,9 @@ msgstr "Интерфейс за търсенето по имена в адрес
 #~ msgstr ""
 #~ "Не мога да инициализирам mail компонетнта на Evolution за конфигуриране."
 
+#~ msgid "Cannot initialize Evolution's folder info component."
+#~ msgstr "Не мога да инициализирам mail компонетнта на Evolution за инфо."
+
 #~ msgid "Factory to import mbox into Evolution"
 #~ msgstr "Фабрика за импорт на mbox в Evolution"
 
@@ -30004,9 +29821,30 @@ msgstr "Интерфейс за търсенето по имена в адрес
 #~ "Област: %s\n"
 #~ "Държава: %s"
 
+#~ msgid "Please enter the NNTP password for %s@%s"
+#~ msgstr "Моля въведете NNTP парола за %s@%s"
+
+#~ msgid "Server rejected username"
+#~ msgstr "Сървърът отхвърли потребителското име"
+
+#~ msgid "Failed to send username to server"
+#~ msgstr "Изпращането на потребителското име до сървъра неуспешно"
+
+#~ msgid "Server rejected username/password"
+#~ msgstr "Сървърът отхвърли потребителското име/паролата"
+
 #~ msgid "Message %s not found."
 #~ msgstr "Съобщението %s не е намерено."
 
+#~ msgid "Could not get group list from server."
+#~ msgstr "Не мога да взема списък на група от сървъра"
+
+#~ msgid "Unable to load grouplist file for %s: %s"
+#~ msgstr "Не мога да заредя файла със списък на група за %s: %s"
+
+#~ msgid "Unable to save grouplist file for %s: %s"
+#~ msgstr "Не мога да запазя файл със списък на група за %s: %s"
+
 #~ msgid "Could not open directory for news server: %s"
 #~ msgstr "Не мога да отворя директория за сървър с новини %s"
 
@@ -30030,6 +29868,9 @@ msgstr "Интерфейс за търсенето по имена в адрес
 #~ "it."
 #~ msgstr "Това ще ви свърже към POP сървър използващ за оторизация Kerberos 4"
 
+#~ msgid "Could not connect to server: %s"
+#~ msgstr "Не мога да се свържа към сървър %s"
+
 #~ msgid "(Unknown)"
 #~ msgstr "(Неизвестен)"
 
@@ -30126,6 +29967,9 @@ msgstr "Интерфейс за търсенето по имена в адрес
 #~ msgid "seconds."
 #~ msgstr "секунди."
 
+#~ msgid "Cannot initialize Evolution's Summary component."
+#~ msgstr "Не мога да инициализирам mail компонетнта на Evolution."
+
 #~ msgid "<dd><b>The weather server could not be contacted</b></dd>"
 #~ msgstr "<dd><b>Не мога да контактувам със метео сървър</b></dd>"
 
diff --git a/po/ca.po b/po/ca.po
index 22e939bc5d..c82c6a5527 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 0.0.6\n"
-"POT-Creation-Date: 2003-10-15 23:45+0200\n"
+"POT-Creation-Date: 2003-06-25 13:24-0400\n"
 "PO-Revision-Date: 2000-11-01 00:40+0100\n"
 "Last-Translator: Quico Llach <tradgnome@softcatala.org>\n"
 "Language-Team: Catalan <linux@softcatala.org>\n"
@@ -15,212 +15,52 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: addressbook/backend/ebook/e-card.c:1306
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in.h:1
+#, fuzzy
+msgid "Evolution LDIF importer"
+msgstr "Conducte de les coses per fer de l'Evolution"
+
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in.h:2
+msgid "LDAP Data Interchange Format (.ldif)"
+msgstr ""
+
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:1
+#, fuzzy
+msgid "Evolution VCard Importer"
+msgstr "No es pot inicialitzar el component de correu de l'Evolution."
+
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:2
+#, fuzzy
+msgid "Evolution VCard importer"
+msgstr "No es pot inicialitzar el component de correu de l'Evolution."
+
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:3
+msgid "VCard (.vcf, .gcrd)"
+msgstr ""
+
 #: addressbook/backend/ebook/e-card-simple.c:60
+#: addressbook/backend/ebook/e-card.c:1306
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:15
 #, fuzzy
 msgid "File As"
 msgstr "Arxiva com:"
 
-#: addressbook/backend/ebook/e-card.c:1313
-#: addressbook/gui/contact-editor/fullname.glade.h:4
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:17
-#, fuzzy
-msgid "Full Name"
-msgstr "Nom complet:"
-
-#: addressbook/backend/ebook/e-card.c:1320
 #: addressbook/backend/ebook/e-card-simple.c:61
-#: addressbook/gui/component/select-names/e-select-names.etspec.h:1
+#: addressbook/backend/ebook/e-card.c:1320
 #: addressbook/gui/component/select-names/e-select-names-section.etspec.h:1
+#: addressbook/gui/component/select-names/e-select-names.etspec.h:1
 #: addressbook/gui/contact-editor/e-contact-editor-fullname.c:89
 #: my-evolution/e-summary-table.c:59
 msgid "Name"
 msgstr "Nom"
 
-#: addressbook/backend/ebook/e-card.c:1326
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:96
-#, fuzzy
-msgid "Address"
-msgstr "_Adreça:"
-
-#: addressbook/backend/ebook/e-card.c:1333
-#, fuzzy
-msgid "Address Label"
-msgstr "Adreça"
-
-#: addressbook/backend/ebook/e-card.c:1340
-#, fuzzy
-msgid "Phone"
-msgstr "Cap"
-
-#: addressbook/backend/ebook/e-card.c:1347
 #: addressbook/backend/ebook/e-card-simple.c:62
+#: addressbook/backend/ebook/e-card.c:1347
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
 #, fuzzy
 msgid "Email"
 msgstr "Adreça electrònica 2"
 
-#: addressbook/backend/ebook/e-card.c:1354
-#, fuzzy
-msgid "Birth date"
-msgstr "Data d'ini_ci:"
-
-#: addressbook/backend/ebook/e-card.c:1360
-#: calendar/gui/e-calendar-table.etspec.h:18
-#, fuzzy
-msgid "URL"
-msgstr "URL:"
-
-#: addressbook/backend/ebook/e-card.c:1367
-#: addressbook/backend/ebook/e-card-simple.c:69
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
-msgid "Organization"
-msgstr "Organització"
-
-#: addressbook/backend/ebook/e-card.c:1374
-#, fuzzy
-msgid "Organizational Unit"
-msgstr "Organització"
-
-#: addressbook/backend/ebook/e-card.c:1381
-#: addressbook/backend/ebook/e-card-simple.c:90
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
-#, fuzzy
-msgid "Office"
-msgstr "_Oficina"
-
-#: addressbook/backend/ebook/e-card.c:1388
-#: addressbook/backend/ebook/e-card-simple.c:91
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:39
-#, fuzzy
-msgid "Title"
-msgstr "_Títol:"
-
-#: addressbook/backend/ebook/e-card.c:1395
-#: calendar/gui/e-meeting-time-sel.etspec.h:9
-#, fuzzy
-msgid "Role"
-msgstr "Mòbil"
-
-#: addressbook/backend/ebook/e-card.c:1402
-#: addressbook/backend/ebook/e-card-simple.c:93
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
-#, fuzzy
-msgid "Manager"
-msgstr "Busca"
-
-#: addressbook/backend/ebook/e-card.c:1409
-#: addressbook/backend/ebook/e-card-simple.c:64
-#: addressbook/backend/ebook/e-card-simple.c:94
-#: addressbook/gui/contact-editor/e-contact-editor.c:1737
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:2
-msgid "Assistant"
-msgstr "Assistent"
-
-#: addressbook/backend/ebook/e-card.c:1416
-#: addressbook/backend/ebook/e-card-simple.c:95
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-#, fuzzy
-msgid "Nickname"
-msgstr "_Sobrenom:"
-
-#: addressbook/backend/ebook/e-card.c:1423
-#: addressbook/backend/ebook/e-card-simple.c:96
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:36
-#, fuzzy
-msgid "Spouse"
-msgstr "_Cònjuge:"
-
-#: addressbook/backend/ebook/e-card.c:1430
-#: addressbook/backend/ebook/e-card-simple.c:101
-#, fuzzy
-msgid "Anniversary"
-msgstr "Ani_versari:"
-
-#: addressbook/backend/ebook/e-card.c:1436
-#, fuzzy
-msgid "Mailer"
-msgstr "_Correu"
-
-#: addressbook/backend/ebook/e-card.c:1443
-#: addressbook/backend/ebook/e-card-simple.c:98
-#, fuzzy
-msgid "Calendar URI"
-msgstr "Agenda"
-
-#: addressbook/backend/ebook/e-card.c:1450
-#, fuzzy
-msgid "Free/Busy URL"
-msgstr "Imprimeix el missatge"
-
-#: addressbook/backend/ebook/e-card.c:1457
-#, fuzzy
-msgid "ICS Calendar"
-msgstr "Agenda"
-
-#: addressbook/backend/ebook/e-card.c:1464
-#: addressbook/backend/ebook/e-card-simple.c:97
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
-#, fuzzy
-msgid "Note"
-msgstr "Cap"
-
-#: addressbook/backend/ebook/e-card.c:1471
-#, fuzzy
-msgid "Related Contacts"
-msgstr "Voleu suprimir el contacte?"
-
-#: addressbook/backend/ebook/e-card.c:1478
-#: addressbook/backend/ebook/e-card-simple.c:105
-#: calendar/gui/e-calendar-table.etspec.h:4
-#, fuzzy
-msgid "Categories"
-msgstr "categories"
-
-#: addressbook/backend/ebook/e-card.c:1485
-#, fuzzy
-msgid "Category List"
-msgstr "categories"
-
-#: addressbook/backend/ebook/e-card.c:1492
-msgid "Wants HTML"
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:1499
-msgid "Wants HTML set"
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:1506 ui/evolution-calendar.xml.h:16
-#, fuzzy
-msgid "List"
-msgstr "és"
-
-#: addressbook/backend/ebook/e-card.c:1513
-#, fuzzy
-msgid "List Show Addresses"
-msgstr "Comprova l'adreça"
-
-#: addressbook/backend/ebook/e-card.c:1520
-#, fuzzy
-msgid "Arbitrary"
-msgstr "Primari"
-
-#: addressbook/backend/ebook/e-card.c:1527
-#, fuzzy
-msgid "ID"
-msgstr "Si"
-
-#: addressbook/backend/ebook/e-card.c:1534
-#, fuzzy
-msgid "Last Use"
-msgstr "Enganxa"
-
-#: addressbook/backend/ebook/e-card.c:1545
-#, fuzzy
-msgid "Use Score"
-msgstr "Puntuació"
-
 #: addressbook/backend/ebook/e-card-simple.c:63
 #: addressbook/gui/contact-editor/e-contact-editor.c:1752
 msgid "Primary"
@@ -231,6 +71,14 @@ msgstr "Primari"
 msgid "Prim"
 msgstr "Primari"
 
+#: addressbook/backend/ebook/e-card-simple.c:64
+#: addressbook/backend/ebook/e-card-simple.c:94
+#: addressbook/backend/ebook/e-card.c:1409
+#: addressbook/gui/contact-editor/e-contact-editor.c:1737
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:2
+msgid "Assistant"
+msgstr "Assistent"
+
 #: addressbook/backend/ebook/e-card-simple.c:65
 #: addressbook/backend/ebook/e-card-simple.c:70
 #: addressbook/gui/contact-editor/e-contact-editor.c:1738
@@ -267,6 +115,12 @@ msgid "Home"
 msgstr "Particular"
 
 #: addressbook/backend/ebook/e-card-simple.c:69
+#: addressbook/backend/ebook/e-card.c:1367
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
+msgid "Organization"
+msgstr "Organització"
+
+#: addressbook/backend/ebook/e-card-simple.c:69
 msgid "Org"
 msgstr ""
 
@@ -389,10 +243,24 @@ msgid "Dep"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:90
+#: addressbook/backend/ebook/e-card.c:1381
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
+#, fuzzy
+msgid "Office"
+msgstr "_Oficina"
+
+#: addressbook/backend/ebook/e-card-simple.c:90
 #, fuzzy
 msgid "Off"
 msgstr "_Oficina"
 
+#: addressbook/backend/ebook/e-card-simple.c:91
+#: addressbook/backend/ebook/e-card.c:1388
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:39
+#, fuzzy
+msgid "Title"
+msgstr "_Títol:"
+
 #: addressbook/backend/ebook/e-card-simple.c:92
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:34
 #, fuzzy
@@ -404,6 +272,13 @@ msgid "Prof"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:93
+#: addressbook/backend/ebook/e-card.c:1402
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
+#, fuzzy
+msgid "Manager"
+msgstr "Busca"
+
+#: addressbook/backend/ebook/e-card-simple.c:93
 #, fuzzy
 msgid "Man"
 msgstr "Dilluns"
@@ -413,10 +288,37 @@ msgid "Ass"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:95
+#: addressbook/backend/ebook/e-card.c:1416
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
+#, fuzzy
+msgid "Nickname"
+msgstr "_Sobrenom:"
+
+#: addressbook/backend/ebook/e-card-simple.c:95
 #, fuzzy
 msgid "Nick"
 msgstr "_Sobrenom:"
 
+#: addressbook/backend/ebook/e-card-simple.c:96
+#: addressbook/backend/ebook/e-card.c:1423
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:36
+#, fuzzy
+msgid "Spouse"
+msgstr "_Cònjuge:"
+
+#: addressbook/backend/ebook/e-card-simple.c:97
+#: addressbook/backend/ebook/e-card.c:1464
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
+#, fuzzy
+msgid "Note"
+msgstr "Cap"
+
+#: addressbook/backend/ebook/e-card-simple.c:98
+#: addressbook/backend/ebook/e-card.c:1443
+#, fuzzy
+msgid "Calendar URI"
+msgstr "Agenda"
+
 #: addressbook/backend/ebook/e-card-simple.c:98
 msgid "CALUri"
 msgstr ""
@@ -441,6 +343,12 @@ msgid "icsCalendar"
 msgstr "Agenda"
 
 #: addressbook/backend/ebook/e-card-simple.c:101
+#: addressbook/backend/ebook/e-card.c:1430
+#, fuzzy
+msgid "Anniversary"
+msgstr "Ani_versari:"
+
+#: addressbook/backend/ebook/e-card-simple.c:101
 msgid "Anniv"
 msgstr ""
 
@@ -449,6 +357,13 @@ msgstr ""
 msgid "Birth Date"
 msgstr "Data d'ini_ci:"
 
+#: addressbook/backend/ebook/e-card-simple.c:105
+#: addressbook/backend/ebook/e-card.c:1478
+#: calendar/gui/e-calendar-table.etspec.h:4
+#, fuzzy
+msgid "Categories"
+msgstr "categories"
+
 #: addressbook/backend/ebook/e-card-simple.c:106
 #, fuzzy
 msgid "Family Name"
@@ -465,34 +380,126 @@ msgid "%x"
 msgstr "x"
 
 #: addressbook/backend/ebook/e-card-simple.c:912
-#: addressbook/backend/ebook/e-destination.c:709
+#: addressbook/backend/ebook/e-destination.c:706
 #, fuzzy
 msgid "Unnamed List"
 msgstr "Contacte _nou"
 
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in.h:1
+#: addressbook/backend/ebook/e-card.c:1313
+#: addressbook/gui/contact-editor/fullname.glade.h:4
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:17
 #, fuzzy
-msgid "Evolution LDIF importer"
-msgstr "Conducte de les coses per fer de l'Evolution"
+msgid "Full Name"
+msgstr "Nom complet:"
 
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in.h:2
-msgid "LDAP Data Interchange Format (.ldif)"
-msgstr ""
+#: addressbook/backend/ebook/e-card.c:1326
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:96
+#, fuzzy
+msgid "Address"
+msgstr "_Adreça:"
 
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:1
+#: addressbook/backend/ebook/e-card.c:1333
 #, fuzzy
-msgid "Evolution VCard Importer"
-msgstr "No es pot inicialitzar el component de correu de l'Evolution."
+msgid "Address Label"
+msgstr "Adreça"
 
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:2
+#: addressbook/backend/ebook/e-card.c:1340
 #, fuzzy
-msgid "Evolution VCard importer"
-msgstr "No es pot inicialitzar el component de correu de l'Evolution."
+msgid "Phone"
+msgstr "Cap"
 
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:3
-msgid "VCard (.vcf, .gcrd)"
+#: addressbook/backend/ebook/e-card.c:1354
+#, fuzzy
+msgid "Birth date"
+msgstr "Data d'ini_ci:"
+
+#: addressbook/backend/ebook/e-card.c:1360
+#: calendar/gui/e-calendar-table.etspec.h:19
+#, fuzzy
+msgid "URL"
+msgstr "URL:"
+
+#: addressbook/backend/ebook/e-card.c:1374
+#, fuzzy
+msgid "Organizational Unit"
+msgstr "Organització"
+
+#: addressbook/backend/ebook/e-card.c:1395
+#: calendar/gui/dialogs/meeting-page.etspec.h:9
+#: calendar/gui/e-meeting-time-sel.etspec.h:9
+#, fuzzy
+msgid "Role"
+msgstr "Mòbil"
+
+#: addressbook/backend/ebook/e-card.c:1436 mail/mail-format.c:963
+#, fuzzy
+msgid "Mailer"
+msgstr "_Correu"
+
+#: addressbook/backend/ebook/e-card.c:1450
+#, fuzzy
+msgid "Free/Busy URL"
+msgstr "Imprimeix el missatge"
+
+#: addressbook/backend/ebook/e-card.c:1457
+#, fuzzy
+msgid "ICS Calendar"
+msgstr "Agenda"
+
+#: addressbook/backend/ebook/e-card.c:1471
+#, fuzzy
+msgid "Related Contacts"
+msgstr "Voleu suprimir el contacte?"
+
+#: addressbook/backend/ebook/e-card.c:1485
+#, fuzzy
+msgid "Category List"
+msgstr "categories"
+
+#: addressbook/backend/ebook/e-card.c:1492
+msgid "Wants HTML"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:1499
+msgid "Wants HTML set"
 msgstr ""
 
+#: addressbook/backend/ebook/e-card.c:1506
+#, fuzzy
+msgid "List"
+msgstr "és"
+
+#: addressbook/backend/ebook/e-card.c:1513
+#, fuzzy
+msgid "List Show Addresses"
+msgstr "Comprova l'adreça"
+
+#: addressbook/backend/ebook/e-card.c:1520
+#, fuzzy
+msgid "Arbitrary"
+msgstr "Primari"
+
+#: addressbook/backend/ebook/e-card.c:1527
+#, fuzzy
+msgid "ID"
+msgstr "Si"
+
+#: addressbook/backend/ebook/e-card.c:1534
+#, fuzzy
+msgid "Last Use"
+msgstr "Enganxa"
+
+#: addressbook/backend/ebook/e-card.c:1545
+#, fuzzy
+msgid "Use Score"
+msgstr "Puntuació"
+
+#: addressbook/backend/ebook/test-client-list.c:15
+#: addressbook/backend/ebook/test-client.c:33
+#: calendar/gui/alarm-notify/notify-main.c:171
+msgid "Could not initialize Bonobo"
+msgstr "No s'ha pogut inicialitzar el Bonobo"
+
 #: addressbook/backend/pas/pas-backend-file.c:464
 #: addressbook/backend/pas/pas-backend-ldap.c:3050
 #, fuzzy
@@ -557,14 +564,14 @@ msgid "EBook not loaded\n"
 msgstr ""
 
 #: addressbook/conduit/address-conduit.c:1376
-#: calendar/conduits/calendar/calendar-conduit.c:1351
-#: calendar/conduits/todo/todo-conduit.c:893
+#: calendar/conduits/calendar/calendar-conduit.c:1342
+#: calendar/conduits/todo/todo-conduit.c:884
 msgid "Could not start wombat server"
 msgstr "No s'ha pogut iniciar el servidor wombat"
 
 #: addressbook/conduit/address-conduit.c:1377
-#: calendar/conduits/calendar/calendar-conduit.c:1352
-#: calendar/conduits/todo/todo-conduit.c:894
+#: calendar/conduits/calendar/calendar-conduit.c:1343
+#: calendar/conduits/todo/todo-conduit.c:885
 msgid "Could not start wombat"
 msgstr "No s'ha pogut iniciar el wombat"
 
@@ -573,125 +580,52 @@ msgstr "No s'ha pogut iniciar el wombat"
 msgid "Could not read pilot's Address application block"
 msgstr "No s'ha pogut llegir el bloc d'aplicació d'adreça del Pilot"
 
-#: addressbook/gui/component/addressbook.c:502
-msgid ""
-"We were unable to open this addressbook.  Please check that the\n"
-"path exists and that you have permission to access it."
-msgstr ""
-
-#: addressbook/gui/component/addressbook.c:512
-msgid ""
-"We were unable to open this addressbook.  This either\n"
-"means you have entered an incorrect URI, or the LDAP server\n"
-"is unreachable."
-msgstr ""
-
-#: addressbook/gui/component/addressbook.c:517
-msgid ""
-"This version of Evolution does not have LDAP support\n"
-"compiled in to it.  If you want to use LDAP in Evolution\n"
-"you must compile the program from the CVS sources after\n"
-"retrieving OpenLDAP from the link below.\n"
-msgstr ""
-
-#: addressbook/gui/component/addressbook.c:527
-msgid ""
-"We were unable to open this addressbook.  This either\n"
-"means you have entered an incorrect URI, or the server\n"
-"is unreachable."
-msgstr ""
-
-#: addressbook/gui/component/addressbook.c:547
-msgid "Unable to open addressbook"
-msgstr "No es pot obrir la llibreta d'adreces"
-
-#: addressbook/gui/component/addressbook.c:607
-msgid "Accessing LDAP Server anonymously"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
+msgid "Configure access to LDAP directory servers here"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:652
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
 #, fuzzy
-msgid "Failed to authenticate.\n"
-msgstr ""
-"No es pot autenticar davant del servidor IMAP.\n"
-"%s\n"
-"\n"
-
-#: addressbook/gui/component/addressbook.c:660
-#: addressbook/gui/component/addressbook.c:663
-#, fuzzy, c-format
-msgid "%sEnter password for %s (user %s)"
-msgstr "Si us plau, introduïu la contrasenya NNTP per a %s@%s"
+msgid "Directory Servers"
+msgstr "N_ou servidor de directori"
 
-#: addressbook/gui/component/addressbook.c:794
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
 #, fuzzy
-msgid "Name begins with"
-msgstr "acaba amb"
+msgid "Evolution Addressbook"
+msgstr "Desa a la llibreta d'adreces"
 
-#: addressbook/gui/component/addressbook.c:795
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
 #, fuzzy
-msgid "Email begins with"
-msgstr "acaba amb"
+msgid "Evolution Addressbook LDAP Configuration Control"
+msgstr "Configuració del _correu..."
 
-#: addressbook/gui/component/addressbook.c:796
-#: calendar/gui/cal-search-bar.c:53
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
 #, fuzzy
-msgid "Category is"
-msgstr "categories"
+msgid "Evolution Addressbook address pop-up"
+msgstr "Utilitat de configuració per al conducte de l'agenda de l'Evolution.\n"
 
-#. We attach subitems below
-#: addressbook/gui/component/addressbook.c:797
-#: calendar/gui/cal-search-bar.c:49
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
 #, fuzzy
-msgid "Any field contains"
-msgstr "El cos conté"
+msgid "Evolution Addressbook address viewer"
+msgstr "Conducte de la llibreta d'adreces de l'Evolution"
 
-#: addressbook/gui/component/addressbook.c:798
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
 #, fuzzy
-msgid "Advanced..."
-msgstr "Afegeix..."
-
-#: addressbook/gui/component/addressbook.c:955
-msgid ""
-"More cards matched this query than either the server is \n"
-"configured to return or Evolution is configured to display.\n"
-"Please make your search more specific or raise the result limit in\n"
-"the directory server preferences for this addressbook."
-msgstr ""
-
-#: addressbook/gui/component/addressbook.c:961
-msgid ""
-"The time to execute this query exceeded the server limit or the limit\n"
-"you have configured for this addressbook.  Please make your search\n"
-"more specific or raise the time limit in the directory server\n"
-"preferences for this addressbook."
-msgstr ""
-
-#: addressbook/gui/component/addressbook.c:967
-msgid "The backend for this addressbook was unable to parse this query."
-msgstr ""
-
-#: addressbook/gui/component/addressbook.c:970
-msgid "The backend for this addressbook refused to perform this query."
-msgstr ""
-
-#: addressbook/gui/component/addressbook.c:974
-msgid "This query did not complete successfully."
-msgstr ""
+msgid "Evolution Addressbook card viewer"
+msgstr "Conducte de la llibreta d'adreces de l'Evolution"
 
-#. All, unmatched, separator
-#: addressbook/gui/component/addressbook.c:1059
-#: calendar/gui/cal-search-bar.c:354
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
 #, fuzzy
-msgid "Any Category"
-msgstr "categories"
+msgid "Evolution Addressbook component"
+msgstr "Conducte de la llibreta d'adreces de l'Evolution"
 
-#: addressbook/gui/component/addressbook.c:1145
-msgid "The URI that the Folder Browser will display"
-msgstr "L'URI que mostrarà el navegador de carpetes"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
+#, fuzzy
+msgid "Evolution Addressbook folder viewer"
+msgstr "Conducte de la llibreta d'adreces de l'Evolution"
 
 #: addressbook/gui/component/addressbook-component.c:76
-#: addressbook/gui/component/addressbook-component.c:628
+#: addressbook/gui/component/addressbook-component.c:620
 #: importers/netscape-importer.c:1874 mail/importers/netscape-importer.c:1844
 #: shell/e-local-storage.c:178 shell/e-shortcuts.c:1087
 #, fuzzy
@@ -729,32 +663,32 @@ msgstr ""
 "Error en carregar la informació del filtre:\n"
 "%s"
 
-#: addressbook/gui/component/addressbook-component.c:582
+#: addressbook/gui/component/addressbook-component.c:574
 #, fuzzy
 msgid "New Contact"
 msgstr "Visualitza tots els contactes"
 
-#: addressbook/gui/component/addressbook-component.c:582
+#: addressbook/gui/component/addressbook-component.c:574
 #, fuzzy
 msgid "_Contact"
 msgstr "_Contactes..."
 
-#: addressbook/gui/component/addressbook-component.c:583
+#: addressbook/gui/component/addressbook-component.c:575
 #, fuzzy
 msgid "Create a new contact"
 msgstr "Crea un nou contacte"
 
-#: addressbook/gui/component/addressbook-component.c:586
+#: addressbook/gui/component/addressbook-component.c:578
 #, fuzzy
 msgid "New Contact List"
 msgstr "Visualitza tots els contactes"
 
-#: addressbook/gui/component/addressbook-component.c:586
+#: addressbook/gui/component/addressbook-component.c:578
 #, fuzzy
 msgid "Contact _List"
 msgstr "_Contactes..."
 
-#: addressbook/gui/component/addressbook-component.c:587
+#: addressbook/gui/component/addressbook-component.c:579
 #, fuzzy
 msgid "Create a new contact list"
 msgstr "Crea un nou contacte"
@@ -820,6 +754,123 @@ msgstr "El tipus indicat no es suporta en aquest emmagatzemament"
 msgid "Other Contacts"
 msgstr "Contacte _nou"
 
+#: addressbook/gui/component/addressbook.c:502
+msgid ""
+"We were unable to open this addressbook.  Please check that the\n"
+"path exists and that you have permission to access it."
+msgstr ""
+
+#: addressbook/gui/component/addressbook.c:512
+msgid ""
+"We were unable to open this addressbook.  This either\n"
+"means you have entered an incorrect URI, or the LDAP server\n"
+"is unreachable."
+msgstr ""
+
+#: addressbook/gui/component/addressbook.c:517
+msgid ""
+"This version of Evolution does not have LDAP support\n"
+"compiled in to it.  If you want to use LDAP in Evolution\n"
+"you must compile the program from the CVS sources after\n"
+"retrieving OpenLDAP from the link below.\n"
+msgstr ""
+
+#: addressbook/gui/component/addressbook.c:527
+msgid ""
+"We were unable to open this addressbook.  This either\n"
+"means you have entered an incorrect URI, or the server\n"
+"is unreachable."
+msgstr ""
+
+#: addressbook/gui/component/addressbook.c:547
+msgid "Unable to open addressbook"
+msgstr "No es pot obrir la llibreta d'adreces"
+
+#: addressbook/gui/component/addressbook.c:607
+msgid "Accessing LDAP Server anonymously"
+msgstr ""
+
+#: addressbook/gui/component/addressbook.c:652
+#, fuzzy
+msgid "Failed to authenticate.\n"
+msgstr ""
+"No es pot autenticar davant del servidor IMAP.\n"
+"%s\n"
+"\n"
+
+#: addressbook/gui/component/addressbook.c:660
+#: addressbook/gui/component/addressbook.c:663
+#, fuzzy, c-format
+msgid "%sEnter password for %s (user %s)"
+msgstr "Si us plau, introduïu la contrasenya NNTP per a %s@%s"
+
+#: addressbook/gui/component/addressbook.c:794
+#, fuzzy
+msgid "Name begins with"
+msgstr "acaba amb"
+
+#: addressbook/gui/component/addressbook.c:795
+#, fuzzy
+msgid "Email begins with"
+msgstr "acaba amb"
+
+#: addressbook/gui/component/addressbook.c:796
+#: calendar/gui/cal-search-bar.c:53
+#, fuzzy
+msgid "Category is"
+msgstr "categories"
+
+#. We attach subitems below
+#: addressbook/gui/component/addressbook.c:797
+#: calendar/gui/cal-search-bar.c:49
+#, fuzzy
+msgid "Any field contains"
+msgstr "El cos conté"
+
+#: addressbook/gui/component/addressbook.c:798
+#, fuzzy
+msgid "Advanced..."
+msgstr "Afegeix..."
+
+#: addressbook/gui/component/addressbook.c:955
+msgid ""
+"More cards matched this query than either the server is \n"
+"configured to return or Evolution is configured to display.\n"
+"Please make your search more specific or raise the result limit in\n"
+"the directory server preferences for this addressbook."
+msgstr ""
+
+#: addressbook/gui/component/addressbook.c:961
+msgid ""
+"The time to execute this query exceeded the server limit or the limit\n"
+"you have configured for this addressbook.  Please make your search\n"
+"more specific or raise the time limit in the directory server\n"
+"preferences for this addressbook."
+msgstr ""
+
+#: addressbook/gui/component/addressbook.c:967
+msgid "The backend for this addressbook was unable to parse this query."
+msgstr ""
+
+#: addressbook/gui/component/addressbook.c:970
+msgid "The backend for this addressbook refused to perform this query."
+msgstr ""
+
+#: addressbook/gui/component/addressbook.c:974
+msgid "This query did not complete successfully."
+msgstr ""
+
+#. All, unmatched, separator
+#: addressbook/gui/component/addressbook.c:1059
+#: calendar/gui/cal-search-bar.c:354
+#, fuzzy
+msgid "Any Category"
+msgstr "categories"
+
+#: addressbook/gui/component/addressbook.c:1145
+msgid "The URI that the Folder Browser will display"
+msgstr "L'URI que mostrarà el navegador de carpetes"
+
 #.
 #. * This is the code for the UI thingie that lets you manipulate the e-mail
 #. * addresses (and *only* the e-mail addresses) associated with an existing
@@ -850,81 +901,37 @@ msgstr "Crea un nou contacte"
 msgid "Add address to existing contact \"%s\""
 msgstr ""
 
-#: addressbook/gui/component/e-address-popup.c:917
+#: addressbook/gui/component/e-address-popup.c:914
 #, fuzzy
 msgid "Querying Addressbook..."
 msgstr "Desa a la llibreta d'adreces"
 
-#: addressbook/gui/component/e-address-popup.c:1001
-#: addressbook/gui/component/e-address-widget.c:401
+#: addressbook/gui/component/e-address-popup.c:998
+#: addressbook/gui/component/e-address-widget.c:392
 msgid "Edit Contact Info"
 msgstr ""
 
-#: addressbook/gui/component/e-address-popup.c:1031
-#: addressbook/gui/component/e-address-widget.c:437
+#: addressbook/gui/component/e-address-popup.c:1028
+#: addressbook/gui/component/e-address-widget.c:428
 #: addressbook/gui/component/select-names/e-select-names-popup.c:324
 #, fuzzy
 msgid "Add to Contacts"
 msgstr "Contacte _nou"
 
-#: addressbook/gui/component/e-address-popup.c:1056
+#: addressbook/gui/component/e-address-popup.c:1053
 #, fuzzy
 msgid "Merge E-Mail Address"
 msgstr "Adreça electrònica:"
 
-#: addressbook/gui/component/e-address-widget.c:378
+#: addressbook/gui/component/e-address-widget.c:369
 #, fuzzy
 msgid "Disable Queries"
 msgstr "Categories disponibles:"
 
-#: addressbook/gui/component/e-address-widget.c:378
+#: addressbook/gui/component/e-address-widget.c:369
 msgid "Enable Queries (Dangerous!)"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
-msgid "Configure access to LDAP directory servers here"
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
-#, fuzzy
-msgid "Directory Servers"
-msgstr "N_ou servidor de directori"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
-#, fuzzy
-msgid "Evolution Addressbook"
-msgstr "Desa a la llibreta d'adreces"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
-#, fuzzy
-msgid "Evolution Addressbook LDAP Configuration Control"
-msgstr "Configuració del _correu..."
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-#, fuzzy
-msgid "Evolution Addressbook address pop-up"
-msgstr "Utilitat de configuració per al conducte de l'agenda de l'Evolution.\n"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
-#, fuzzy
-msgid "Evolution Addressbook address viewer"
-msgstr "Conducte de la llibreta d'adreces de l'Evolution"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
-#, fuzzy
-msgid "Evolution Addressbook card viewer"
-msgstr "Conducte de la llibreta d'adreces de l'Evolution"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
-#, fuzzy
-msgid "Evolution Addressbook component"
-msgstr "Conducte de la llibreta d'adreces de l'Evolution"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
-#, fuzzy
-msgid "Evolution Addressbook folder viewer"
-msgstr "Conducte de la llibreta d'adreces de l'Evolution"
-
 #: addressbook/gui/component/ldap-config.glade.h:1
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:1
 #: mail/mail-config.glade.h:1
@@ -1075,9 +1082,10 @@ msgstr ""
 msgid "S_earch scope: "
 msgstr "Cerca"
 
+#. No time range is set, so don't start a query
 #: addressbook/gui/component/ldap-config.glade.h:34
-#: calendar/gui/e-cal-view.c:541 calendar/gui/e-day-view.c:3261
-#: calendar/gui/e-week-view.c:1181 calendar/gui/gnome-cal.c:625
+#: calendar/gui/calendar-model.c:1983 calendar/gui/e-day-view.c:1712
+#: calendar/gui/e-week-view.c:1256
 #, fuzzy
 msgid "Searching"
 msgstr "Cerca"
@@ -1269,11 +1277,11 @@ msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:85 filter/filter.glade.h:14
 #: mail/mail-config.glade.h:143 ui/evolution-addressbook.xml.h:33
-#: ui/evolution-calendar.xml.h:35 ui/evolution-composer-entries.xml.h:8
-#: ui/evolution-mail-list.xml.h:24 ui/evolution-mail-messagedisplay.xml.h:6
+#: ui/evolution-calendar.xml.h:31 ui/evolution-composer-entries.xml.h:8
+#: ui/evolution-mail-list.xml.h:25 ui/evolution-mail-messagedisplay.xml.h:6
 #: ui/evolution-message-composer.xml.h:41
-#: ui/evolution-signature-editor.xml.h:12 ui/evolution-subscribe.xml.h:10
-#: ui/evolution-tasks.xml.h:19
+#: ui/evolution-signature-editor.xml.h:11 ui/evolution-subscribe.xml.h:10
+#: ui/evolution-tasks.xml.h:17
 msgid "_Edit"
 msgstr "_Edita"
 
@@ -1321,26 +1329,22 @@ msgstr "General"
 msgid "searching-tab"
 msgstr "Cerca"
 
-#: addressbook/gui/component/select-names/e-select-names.c:509
-msgid "Select Contacts from Addressbook"
-msgstr ""
-
-#: addressbook/gui/component/select-names/e-select-names.c:650
+#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:1
 #, fuzzy
-msgid "Find contact in"
-msgstr "Cerca un contacte"
-
-#: addressbook/gui/component/select-names/e-select-names.c:694
-#: addressbook/gui/component/select-names/e-select-names-popup.c:211
-#: composer/e-msg-composer-attachment-bar.c:444
-msgid "Remove"
-msgstr "Elimina"
+msgid "Evolution Addressbook name selection interface"
+msgstr "Conducte de la llibreta d'adreces de l'Evolution"
 
 #: addressbook/gui/component/select-names/e-select-names-popup.c:204
 #, fuzzy
 msgid "Remove All"
 msgstr "Elimina"
 
+#: addressbook/gui/component/select-names/e-select-names-popup.c:211
+#: addressbook/gui/component/select-names/e-select-names.c:694
+#: composer/e-msg-composer-attachment-bar.c:507
+msgid "Remove"
+msgstr "Elimina"
+
 #: addressbook/gui/component/select-names/e-select-names-popup.c:218
 #, fuzzy
 msgid "View Contact List"
@@ -1367,10 +1371,14 @@ msgstr "Contacte _nou"
 msgid "Source"
 msgstr "Font"
 
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:1
+#: addressbook/gui/component/select-names/e-select-names.c:509
+msgid "Select Contacts from Addressbook"
+msgstr ""
+
+#: addressbook/gui/component/select-names/e-select-names.c:650
 #, fuzzy
-msgid "Evolution Addressbook name selection interface"
-msgstr "Conducte de la llibreta d'adreces de l'Evolution"
+msgid "Find contact in"
+msgstr "Cerca un contacte"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:2
 #, fuzzy
@@ -1452,7 +1460,7 @@ msgid "D_epartment:"
 msgstr "_Departament:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:11
-#: calendar/gui/dialogs/task-editor.c:200
+#: calendar/gui/dialogs/task-editor.c:197
 msgid "Details"
 msgstr "Detalls"
 
@@ -1524,13 +1532,11 @@ msgid "_Categories..."
 msgstr "Ca_tegories..."
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:28
-#: calendar/gui/dialogs/meeting-page.c:634
-#: calendar/gui/e-calendar-table.c:1008 calendar/gui/e-calendar-table.c:1026
-#: calendar/gui/e-cal-view.c:1144 calendar/gui/e-cal-view.c:1176
-#: ui/evolution-addressbook.xml.h:32 ui/evolution-calendar.xml.h:34
-#: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:14
-#: ui/evolution-mail-message.xml.h:104 ui/evolution-tasks.xml.h:18
-#: ui/evolution.xml.h:45
+#: calendar/gui/dialogs/meeting-page.c:717 calendar/gui/e-calendar-table.c:977
+#: calendar/gui/e-day-view.c:3755 calendar/gui/e-week-view.c:3631
+#: mail/folder-browser.c:1790 ui/evolution-addressbook.xml.h:32
+#: ui/evolution-calendar.xml.h:30 ui/evolution-mail-message.xml.h:97
+#: ui/evolution-tasks.xml.h:16 ui/evolution.xml.h:45
 msgid "_Delete"
 msgstr "_Suprimeix"
 
@@ -1577,15 +1583,15 @@ msgid "_Web page address:"
 msgstr "Adreça de pàgina web:"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:102
-#: addressbook/gui/contact-editor/e-contact-editor.c:184
 #: addressbook/gui/contact-editor/e-contact-editor-fullname.c:95
+#: addressbook/gui/contact-editor/e-contact-editor.c:184
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.c:163
 #: addressbook/gui/widgets/e-addressbook-model.c:318
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:408
-#: addressbook/gui/widgets/e-minicard.c:183
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:393
 #: addressbook/gui/widgets/e-minicard-label.c:164
-#: addressbook/gui/widgets/e-minicard-view.c:478
 #: addressbook/gui/widgets/e-minicard-view-widget.c:120
+#: addressbook/gui/widgets/e-minicard-view.c:478
+#: addressbook/gui/widgets/e-minicard.c:183
 #, fuzzy
 msgid "Editable"
 msgstr "Filtres d'edició"
@@ -2688,18 +2694,18 @@ msgstr ""
 #: addressbook/gui/contact-editor/e-contact-editor.c:156
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.c:142
 #: addressbook/gui/widgets/e-addressbook-model.c:304
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:394
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:379
 #: addressbook/gui/widgets/e-addressbook-view.c:180
-#: addressbook/gui/widgets/e-minicard-view.c:464
 #: addressbook/gui/widgets/e-minicard-view-widget.c:106
+#: addressbook/gui/widgets/e-minicard-view.c:464
 #, fuzzy
 msgid "Book"
 msgstr "Cos"
 
 #: addressbook/gui/contact-editor/e-contact-editor.c:163
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.c:149
-#: addressbook/gui/widgets/e-minicard.c:190
 #: addressbook/gui/widgets/e-minicard-widget.c:93
+#: addressbook/gui/widgets/e-minicard.c:190
 #, fuzzy
 msgid "Card"
 msgstr "Cotxe"
@@ -2941,7 +2947,7 @@ msgstr "Nou"
 msgid "Contact List Editor"
 msgstr "Contacta l'editor"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:457
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:456
 #, fuzzy
 msgid "Save List as VCard"
 msgstr "Desa com a VCard"
@@ -2988,7 +2994,7 @@ msgid ""
 msgstr ""
 
 #. FIXME: get the toplevel window...
-#: addressbook/gui/search/e-addressbook-search-dialog.c:116
+#: addressbook/gui/search/e-addressbook-search-dialog.c:117
 #: widgets/misc/e-filter-bar.c:148
 #, fuzzy
 msgid "Advanced Search"
@@ -3010,10 +3016,10 @@ msgid "%d cards"
 msgstr " segons"
 
 #: addressbook/gui/widgets/e-addressbook-model.c:311
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:401
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:386
 #: addressbook/gui/widgets/e-addressbook-view.c:187
-#: addressbook/gui/widgets/e-minicard-view.c:471
 #: addressbook/gui/widgets/e-minicard-view-widget.c:113
+#: addressbook/gui/widgets/e-minicard-view.c:471
 #, fuzzy
 msgid "Query"
 msgstr "maig"
@@ -3023,281 +3029,282 @@ msgstr "maig"
 msgid "Error getting book view"
 msgstr "Error en carregar el fitxer: %s"
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:415
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:400
 #, fuzzy
 msgid "Model"
 msgstr "Mòbil"
 
-#: addressbook/gui/widgets/e-addressbook-table-adapter.c:148
-#: addressbook/gui/widgets/e-addressbook-util.c:106
+#: addressbook/gui/widgets/e-addressbook-table-adapter.c:145
+#: addressbook/gui/widgets/e-addressbook-util.c:105
 #: addressbook/gui/widgets/e-minicard.c:531
 #, fuzzy
 msgid "Error modifying card"
 msgstr "Error en carregar el fitxer: %s"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:37
-#: shell/evolution-shell-component.c:1183
+#: addressbook/gui/widgets/e-addressbook-util.c:36
+#: shell/evolution-shell-component.c:1180
 #, fuzzy
 msgid "Success"
 msgstr "Fonts"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:38
+#: addressbook/gui/widgets/e-addressbook-util.c:37
 #: camel/providers/imap/camel-imap-command.c:306
 #: camel/providers/imap/camel-imap-command.c:403
 #: camel/providers/pop3/camel-pop3-store.c:526
 #: camel/providers/pop3/camel-pop3-store.c:533 shell/e-shell.c:2077
-#: shell/e-storage.c:598 shell/evolution-shell-component.c:1222
+#: shell/e-storage.c:598 shell/evolution-shell-component.c:1219
 msgid "Unknown error"
 msgstr "Error desconegut"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:39
+#: addressbook/gui/widgets/e-addressbook-util.c:38
 #, fuzzy
 msgid "Repository offline"
 msgstr "S'està movent"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:40 shell/e-storage.c:584
-#: shell/evolution-shell-component.c:1213
+#: addressbook/gui/widgets/e-addressbook-util.c:39 shell/e-storage.c:584
+#: shell/evolution-shell-component.c:1210
 msgid "Permission denied"
 msgstr "Permís denegat"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:41
+#: addressbook/gui/widgets/e-addressbook-util.c:40
 #, fuzzy
 msgid "Card not found"
 msgstr "No s'ha trobat el fitxer"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:42
+#: addressbook/gui/widgets/e-addressbook-util.c:41
 msgid "Card ID already exists"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:43
+#: addressbook/gui/widgets/e-addressbook-util.c:42
 #, fuzzy
 msgid "Protocol not supported"
 msgstr "Operació no suportada"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:44
+#: addressbook/gui/widgets/e-addressbook-util.c:43
+#: calendar/gui/calendar-model.c:759 calendar/gui/calendar-model.c:1184
 #: calendar/gui/dialogs/task-details-page.glade.h:3
-#: calendar/gui/e-calendar-table.c:479 calendar/gui/e-cal-model-tasks.c:325
-#: calendar/gui/e-cal-model-tasks.c:604 calendar/gui/e-tasks.c:253
-#: calendar/gui/print.c:2314 camel/camel-service.c:733
-#: camel/camel-service.c:771 camel/camel-service.c:855
-#: camel/camel-service.c:895 camel/providers/pop3/camel-pop3-store.c:443
+#: calendar/gui/e-calendar-table.c:477 calendar/gui/print.c:2307
+#: camel/camel-service.c:745 camel/camel-service.c:785
+#: camel/camel-service.c:875 camel/camel-service.c:917
+#: camel/providers/pop3/camel-pop3-store.c:443
 #: camel/providers/pop3/camel-pop3-store.c:520
 #, fuzzy
 msgid "Cancelled"
 msgstr "Cancel·lat"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:45
+#: addressbook/gui/widgets/e-addressbook-util.c:44
 #, fuzzy
 msgid "Authentication Failed"
 msgstr "Autenticació:"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:46
+#: addressbook/gui/widgets/e-addressbook-util.c:45
 #, fuzzy
 msgid "Authentication Required"
 msgstr "Autenticació:"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:47
+#: addressbook/gui/widgets/e-addressbook-util.c:46
 msgid "TLS not Available"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:48
+#: addressbook/gui/widgets/e-addressbook-util.c:47
 #, fuzzy
 msgid "Addressbook does not exist"
 msgstr "La carpeta `%s' no existeix."
 
-#: addressbook/gui/widgets/e-addressbook-util.c:49
+#: addressbook/gui/widgets/e-addressbook-util.c:48
 #, fuzzy
 msgid "Other error"
 msgstr "Error d'E/S"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:76
+#: addressbook/gui/widgets/e-addressbook-util.c:75
 msgid "Do you want to save changes?"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:78
+#: addressbook/gui/widgets/e-addressbook-util.c:77
 #, fuzzy
 msgid "_Discard"
 msgstr "Imprimeix l'agenda"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:97
+#: addressbook/gui/widgets/e-addressbook-util.c:96
 #, fuzzy
 msgid "Error adding list"
 msgstr "Error en carregar el fitxer: %s"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:97
-#: addressbook/gui/widgets/e-addressbook-util.c:273
+#: addressbook/gui/widgets/e-addressbook-util.c:96
+#: addressbook/gui/widgets/e-addressbook-util.c:272
 #, fuzzy
 msgid "Error adding card"
 msgstr "Error en carregar el fitxer: %s"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:106
+#: addressbook/gui/widgets/e-addressbook-util.c:105
 #, fuzzy
 msgid "Error modifying list"
 msgstr "Error en carregar el fitxer: %s"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:116
+#: addressbook/gui/widgets/e-addressbook-util.c:115
 #, fuzzy
 msgid "Error removing list"
 msgstr "Error en carregar el fitxer: %s"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:116
-#: addressbook/gui/widgets/e-addressbook-util.c:231
+#: addressbook/gui/widgets/e-addressbook-util.c:115
+#: addressbook/gui/widgets/e-addressbook-util.c:230
 #, fuzzy
 msgid "Error removing card"
 msgstr "Error en llegir el fitxer de correu: %s"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:198
+#: addressbook/gui/widgets/e-addressbook-util.c:197
 #, c-format
 msgid ""
 "Opening %d cards will open %d new windows as well.\n"
 "Do you really want to display all of these cards?"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:329
+#: addressbook/gui/widgets/e-addressbook-util.c:328
 #, fuzzy
 msgid "Move card to"
 msgstr "No iniciat"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:331
+#: addressbook/gui/widgets/e-addressbook-util.c:330
 #, fuzzy
 msgid "Copy card to"
 msgstr "No iniciat"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:334
+#: addressbook/gui/widgets/e-addressbook-util.c:333
 #, fuzzy
 msgid "Move cards to"
 msgstr "No iniciat"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:336
+#: addressbook/gui/widgets/e-addressbook-util.c:335
 #, fuzzy
 msgid "Copy cards to"
 msgstr "No iniciat"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:518
+#: addressbook/gui/widgets/e-addressbook-util.c:517
 #, fuzzy
 msgid "Multiple VCards"
 msgstr "Mou el missatge"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:526
+#: addressbook/gui/widgets/e-addressbook-util.c:525
 #, fuzzy, c-format
 msgid "VCard for %s"
 msgstr "Si us plau, introduïu la contrasenya NNTP per a %s@%s"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:194
-#: calendar/gui/e-calendar-table.etspec.h:17
+#: calendar/gui/dialogs/meeting-page.etspec.h:11
+#: calendar/gui/e-calendar-table.etspec.h:18
 #: calendar/gui/e-meeting-time-sel.etspec.h:11
 #, fuzzy
 msgid "Type"
 msgstr "Tipus:"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:398
+#: addressbook/gui/widgets/e-addressbook-view.c:394
 #: importers/evolution-gnomecard-importer.c:228 importers/pine-importer.c:642
 #: mail/importers/pine-importer.c:577
 #, fuzzy
 msgid "Addressbook"
 msgstr "Desa a la llibreta d'adreces"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:680
-#: addressbook/gui/widgets/e-addressbook-view.c:899
-#: addressbook/gui/widgets/e-addressbook-view.c:1883
+#: addressbook/gui/widgets/e-addressbook-view.c:676
+#: addressbook/gui/widgets/e-addressbook-view.c:895
+#: addressbook/gui/widgets/e-addressbook-view.c:1879
 #: ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard"
 msgstr "Desa com a VCard"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:886
+#: addressbook/gui/widgets/e-addressbook-view.c:882
 #, fuzzy
 msgid "New Contact..."
 msgstr "Visualitza tots els contactes"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:887
+#: addressbook/gui/widgets/e-addressbook-view.c:883
 #, fuzzy
 msgid "New Contact List..."
 msgstr "Visualitza tots els contactes"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:890
+#: addressbook/gui/widgets/e-addressbook-view.c:886
 #, fuzzy
 msgid "Go to Folder..."
 msgstr "_Vés a la carpeta..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:891
+#: addressbook/gui/widgets/e-addressbook-view.c:887
 #, fuzzy
 msgid "Import..."
 msgstr "S'està movent"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:893
+#: addressbook/gui/widgets/e-addressbook-view.c:889
 #, fuzzy
 msgid "Search for Contacts..."
 msgstr "_Cerca contactes"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:894
+#: addressbook/gui/widgets/e-addressbook-view.c:890
 #, fuzzy
 msgid "Addressbook Sources..."
 msgstr "Afegeix una font"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:896
+#: addressbook/gui/widgets/e-addressbook-view.c:892
 #, fuzzy
 msgid "Pilot Settings..."
 msgstr "_Paràmetres"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:900
+#: addressbook/gui/widgets/e-addressbook-view.c:896
 #: ui/evolution-addressbook.xml.h:10
 #, fuzzy
 msgid "Forward Contact"
 msgstr "Reenvia"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:901
+#: addressbook/gui/widgets/e-addressbook-view.c:897
 #, fuzzy
 msgid "Send Message to Contact"
 msgstr "FIXME: Nou _missatge per contactar"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:902 calendar/gui/print.c:2446
+#: addressbook/gui/widgets/e-addressbook-view.c:898 calendar/gui/print.c:2439
 #: ui/evolution-addressbook.xml.h:16 ui/evolution-comp-editor.xml.h:8
-#: ui/evolution-contact-editor.xml.h:5 ui/evolution-mail-message.xml.h:72
+#: ui/evolution-contact-editor.xml.h:4 ui/evolution-mail-message.xml.h:67
 #: ui/my-evolution.xml.h:1
 msgid "Print"
 msgstr "Imprimeix"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:904
+#: addressbook/gui/widgets/e-addressbook-view.c:900
 #, fuzzy
 msgid "Print Envelope"
 msgstr "Imprimeix el missatge..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:908
+#: addressbook/gui/widgets/e-addressbook-view.c:904
 #, fuzzy
 msgid "Copy to folder..."
 msgstr "Copia a la carpeta"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:909
+#: addressbook/gui/widgets/e-addressbook-view.c:905
 #, fuzzy
 msgid "Move to folder..."
 msgstr "Mou a la carpeta"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:912
+#: addressbook/gui/widgets/e-addressbook-view.c:908
 #: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
 #, fuzzy
 msgid "Cut"
 msgstr "Personalitzat"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:913
-#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:9
+#: addressbook/gui/widgets/e-addressbook-view.c:909
+#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:8
 #: ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr "Copia"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:914
-#: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:10
+#: addressbook/gui/widgets/e-addressbook-view.c:910
+#: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:9
 msgid "Paste"
 msgstr "Enganxa"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:915 filter/libfilter-i18n.h:10
+#: addressbook/gui/widgets/e-addressbook-view.c:911 filter/libfilter-i18n.h:11
 #: mail/mail-accounts.c:234 ui/evolution-addressbook.xml.h:8
-#: ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:3
-#: ui/evolution-contact-list-editor.xml.h:3 ui/evolution-mail-message.xml.h:24
+#: ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:2
+#: ui/evolution-contact-list-editor.xml.h:2 ui/evolution-mail-message.xml.h:20
 msgid "Delete"
 msgstr "Suprimeix"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:919
-#: calendar/gui/e-cal-view.c:1109
+#: addressbook/gui/widgets/e-addressbook-view.c:915
+#: calendar/gui/e-day-view.c:3715 calendar/gui/e-week-view.c:3596
 #, fuzzy
 msgid "Current View"
 msgstr "l'hora actual"
@@ -3306,7 +3313,7 @@ msgstr "l'hora actual"
 #. Translators: put here a list of labels you want to see on buttons in
 #. addressbook. You may use any character to separate labels but it must
 #. also be placed at the begining ot the string
-#: addressbook/gui/widgets/e-addressbook-view.c:953
+#: addressbook/gui/widgets/e-addressbook-view.c:949
 msgid ",123,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
 msgstr ""
 
@@ -3314,11 +3321,11 @@ msgstr ""
 #. in addressbook. You may use any character to separate labels but it
 #. must also be placed at the begining ot the string.
 #. Use lower case letters if possible.
-#: addressbook/gui/widgets/e-addressbook-view.c:958
+#: addressbook/gui/widgets/e-addressbook-view.c:954
 msgid ",0,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1356
+#: addressbook/gui/widgets/e-addressbook-view.c:1352
 #, c-format
 msgid ""
 "The addressbook backend for\n"
@@ -3400,46 +3407,36 @@ msgstr "Contacte _nou"
 msgid "Primary Phone"
 msgstr "Primari"
 
-#: addressbook/gui/widgets/e-minicard.c:146
+#: addressbook/gui/widgets/e-minicard-control.c:204
+#, c-format
+msgid "and %d other cards."
+msgstr ""
+
+#: addressbook/gui/widgets/e-minicard-control.c:206
+msgid "and one other card."
+msgstr ""
+
+#: addressbook/gui/widgets/e-minicard-control.c:318
+msgid "Save in addressbook"
+msgstr "Desa a la llibreta d'adreces"
+
 #: addressbook/gui/widgets/e-minicard-label.c:115
+#: addressbook/gui/widgets/e-minicard.c:146
 #, fuzzy
 msgid "Width"
 msgstr "Amplada:"
 
-#: addressbook/gui/widgets/e-minicard.c:153
 #: addressbook/gui/widgets/e-minicard-label.c:122
+#: addressbook/gui/widgets/e-minicard.c:153
 #, fuzzy
 msgid "Height"
 msgstr "Alçada:"
 
-#: addressbook/gui/widgets/e-minicard.c:161
 #: addressbook/gui/widgets/e-minicard-label.c:129
+#: addressbook/gui/widgets/e-minicard.c:161
 msgid "Has Focus"
 msgstr ""
 
-#: addressbook/gui/widgets/e-minicard.c:169
-#, fuzzy
-msgid "Selected"
-msgstr "Suprimeix"
-
-#: addressbook/gui/widgets/e-minicard.c:176
-#, fuzzy
-msgid "Has Cursor"
-msgstr "Tasques"
-
-#: addressbook/gui/widgets/e-minicard-control.c:204
-#, c-format
-msgid "and %d other cards."
-msgstr ""
-
-#: addressbook/gui/widgets/e-minicard-control.c:206
-msgid "and one other card."
-msgstr ""
-
-#: addressbook/gui/widgets/e-minicard-control.c:318
-msgid "Save in addressbook"
-msgstr "Desa a la llibreta d'adreces"
-
 #: addressbook/gui/widgets/e-minicard-label.c:136
 #, fuzzy
 msgid "Field"
@@ -3458,6 +3455,10 @@ msgstr ""
 msgid "Max field name length"
 msgstr ""
 
+#: addressbook/gui/widgets/e-minicard-view-widget.c:127
+msgid "Column Width"
+msgstr ""
+
 #: addressbook/gui/widgets/e-minicard-view.c:141
 #, fuzzy
 msgid ""
@@ -3491,9 +3492,15 @@ msgstr ""
 msgid "Adapter"
 msgstr "després de"
 
-#: addressbook/gui/widgets/e-minicard-view-widget.c:127
-msgid "Column Width"
-msgstr ""
+#: addressbook/gui/widgets/e-minicard.c:169
+#, fuzzy
+msgid "Selected"
+msgstr "Suprimeix"
+
+#: addressbook/gui/widgets/e-minicard.c:176
+#, fuzzy
+msgid "Has Cursor"
+msgstr "Tasques"
 
 #: addressbook/gui/widgets/gal-view-factory-minicard.c:24
 #, fuzzy
@@ -3505,23 +3512,23 @@ msgstr "Cotxe"
 msgid "GTK Tree View"
 msgstr "Setmana"
 
-#: addressbook/printing/e-contact-print.c:1158
+#: addressbook/printing/e-contact-print-envelope.c:217
+#: addressbook/printing/e-contact-print-envelope.c:238
+#, fuzzy
+msgid "Print envelope"
+msgstr "Imprimeix el missatge..."
+
+#: addressbook/printing/e-contact-print.c:1139
 #, fuzzy
 msgid "Print cards"
 msgstr "Imprimeix l'agenda"
 
-#: addressbook/printing/e-contact-print.c:1224
-#: addressbook/printing/e-contact-print.c:1250
+#: addressbook/printing/e-contact-print.c:1204
+#: addressbook/printing/e-contact-print.c:1226
 #, fuzzy
 msgid "Print card"
 msgstr "Imprimeix l'agenda"
 
-#: addressbook/printing/e-contact-print-envelope.c:217
-#: addressbook/printing/e-contact-print-envelope.c:238
-#, fuzzy
-msgid "Print envelope"
-msgstr "Imprimeix el missatge..."
-
 #: addressbook/printing/e-contact-print.glade.h:1
 msgid "10 pt. Tahoma"
 msgstr "10 pt. Tahoma"
@@ -3693,63 +3700,6 @@ msgstr "Amplada:"
 msgid "_Font..."
 msgstr "Lletra..."
 
-#: addressbook/tools/evolution-addressbook-export.c:56
-msgid "Specify the output file instead of standard output"
-msgstr ""
-
-#: addressbook/tools/evolution-addressbook-export.c:57
-msgid "OUTPUTFILE"
-msgstr ""
-
-#: addressbook/tools/evolution-addressbook-export.c:58
-#, fuzzy
-msgid "List local addressbook folders"
-msgstr "Conducte de la llibreta d'adreces de l'Evolution"
-
-#: addressbook/tools/evolution-addressbook-export.c:60
-msgid "Show cards as vcard or csv file"
-msgstr ""
-
-#: addressbook/tools/evolution-addressbook-export.c:60
-#, fuzzy
-msgid "[vcard|csv]"
-msgstr "No iniciat"
-
-#: addressbook/tools/evolution-addressbook-export.c:61
-msgid "Export in asynchronous mode "
-msgstr ""
-
-#: addressbook/tools/evolution-addressbook-export.c:63
-msgid ""
-"The number of cards in one output file in asychronous mode,default size 100."
-msgstr ""
-
-#: addressbook/tools/evolution-addressbook-export.c:63
-msgid "NUMBER"
-msgstr ""
-
-#: addressbook/tools/evolution-addressbook-export.c:91
-msgid ""
-"Command line arguments error, please use --help option to see the usage."
-msgstr ""
-
-#: addressbook/tools/evolution-addressbook-export.c:105
-msgid "Only support csv or vcard format."
-msgstr ""
-
-#: addressbook/tools/evolution-addressbook-export.c:114
-msgid "In async mode, output must be file."
-msgstr ""
-
-#: addressbook/tools/evolution-addressbook-export.c:122
-msgid "In normal mode, there should not need size option."
-msgstr ""
-
-#: addressbook/tools/evolution-addressbook-export.c:153
-#, fuzzy
-msgid "Impossible internal error."
-msgstr "Error d'E/S"
-
 #: calendar/cal-util/cal-component.c:1218
 #, fuzzy
 msgid "Untitled appointment"
@@ -3880,30 +3830,28 @@ msgid "31st"
 msgstr "31"
 
 #: calendar/cal-util/cal-util.c:550 calendar/cal-util/cal-util.c:572
-#: calendar/gui/dialogs/task-details-page.glade.h:5
-#: calendar/gui/e-calendar-table.c:403 calendar/gui/e-tasks.c:271
-#: mail/message-list.c:912
+#: calendar/gui/dialogs/task-details-page.glade.h:6
+#: calendar/gui/e-calendar-table.c:401 mail/message-list.c:753
 msgid "High"
 msgstr "Alta"
 
 #: calendar/cal-util/cal-util.c:552 calendar/cal-util/cal-util.c:574
-#: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-calendar-table.c:404 calendar/gui/e-cal-model.c:826
-#: calendar/gui/e-tasks.c:273 mail/message-list.c:911
+#: calendar/gui/calendar-model.c:1709
+#: calendar/gui/dialogs/task-details-page.glade.h:9
+#: calendar/gui/e-calendar-table.c:402 mail/message-list.c:752
 msgid "Normal"
 msgstr "Normal"
 
 #: calendar/cal-util/cal-util.c:554 calendar/cal-util/cal-util.c:576
-#: calendar/gui/dialogs/task-details-page.glade.h:7
-#: calendar/gui/e-calendar-table.c:405 calendar/gui/e-tasks.c:275
-#: mail/message-list.c:910
+#: calendar/gui/dialogs/task-details-page.glade.h:8
+#: calendar/gui/e-calendar-table.c:403 mail/message-list.c:751
 msgid "Low"
 msgstr "Baixa"
 
 #. An empty string is the same as 'None'.
 #: calendar/cal-util/cal-util.c:570
-#: calendar/gui/dialogs/task-details-page.glade.h:11
-#: calendar/gui/e-calendar-table.c:406
+#: calendar/gui/dialogs/task-details-page.glade.h:13
+#: calendar/gui/e-calendar-table.c:404
 msgid "Undefined"
 msgstr ""
 
@@ -3911,13 +3859,13 @@ msgstr ""
 msgid "Split Multi-Day Events:"
 msgstr ""
 
-#: calendar/conduits/calendar/calendar-conduit.c:1297
-#: calendar/conduits/todo/todo-conduit.c:838
+#: calendar/conduits/calendar/calendar-conduit.c:1289
+#: calendar/conduits/todo/todo-conduit.c:830
 msgid "Error while communicating with calendar server"
 msgstr "Error en comunicar-se amb el servidor d'agenda"
 
-#: calendar/conduits/calendar/calendar-conduit.c:1456
-#: calendar/conduits/calendar/calendar-conduit.c:1459
+#: calendar/conduits/calendar/calendar-conduit.c:1440
+#: calendar/conduits/calendar/calendar-conduit.c:1443
 msgid "Could not read pilot's Calendar application block"
 msgstr "No s'ha pogut llegir el bloc d'aplicació d'agenda del Pilot"
 
@@ -3926,35 +3874,88 @@ msgstr "No s'ha pogut llegir el bloc d'aplicació d'agenda del Pilot"
 msgid "Default Priority:"
 msgstr "_Prioritat:"
 
-#: calendar/conduits/todo/todo-conduit.c:970
-#: calendar/conduits/todo/todo-conduit.c:973
+#: calendar/conduits/todo/todo-conduit.c:954
+#: calendar/conduits/todo/todo-conduit.c:957
 msgid "Could not read pilot's ToDo application block"
 msgstr "No s'ha pogut llegir el bloc d'aplicació de coses per fer del Pilot"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:213
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
+#, fuzzy
+msgid "Calendar and Tasks"
+msgstr "_Paràmetres"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
+msgid "Configure your timezone, Calendar and Task List here "
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
+#, fuzzy
+msgid "Evolution Calendar and Tasks"
+msgstr "_Paràmetres"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
+#, fuzzy
+msgid "Evolution Calendar and Tasks component"
+msgstr ""
+"No es pot inicialitzar el component de resum del correu de l'Evolution."
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
+#, fuzzy
+msgid "Evolution Calendar configuration control"
+msgstr "Configuració del correu"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
+#, fuzzy
+msgid "Evolution Calendar scheduling message viewer"
+msgstr "Conducte de l'agenda de l'Evolution"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
+#, fuzzy
+msgid "Evolution Calendar viewer"
+msgstr "Conducte de l'agenda de l'Evolution"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
+#, fuzzy
+msgid "Evolution Calendar/Task editor"
+msgstr "Conducte de l'agenda de l'Evolution"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
+#, fuzzy
+msgid "Evolution Tasks viewer"
+msgstr "Conducte de les coses per fer de l'Evolution"
+
+#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
+#, fuzzy
+msgid "Evolution Calendar alarm notification service"
+msgstr "Conducte de l'agenda de l'Evolution"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:212
 #, fuzzy
 msgid "Starting:"
 msgstr "_Paràmetres"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:215
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:214
 #, fuzzy
 msgid "Ending:"
 msgstr "Ombrejat"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:254
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:227
+#, fuzzy
+msgid "invalid time"
+msgstr "Hora de _finalització:"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:272
 #, fuzzy
 msgid "Evolution Alarm"
 msgstr "Evolution"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:347
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:365
 #, fuzzy, c-format
 msgid "Alarm on %s"
 msgstr "Alarmes"
 
 #: calendar/gui/alarm-notify/alarm-notify.glade.h:1
-#: ui/evolution-comp-editor.xml.h:1 ui/evolution-contact-editor.xml.h:1
-#: ui/evolution-contact-list-editor.xml.h:1
-#: ui/evolution-signature-editor.xml.h:1
+#: ui/evolution-comp-editor.xml.h:1
 #, fuzzy
 msgid "C_lose"
 msgstr "Tanca"
@@ -3973,27 +3974,18 @@ msgstr "Durada de l'snooze (minuts)"
 msgid "_Edit appointment"
 msgstr "Edita una cita"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:874
+#: calendar/gui/alarm-notify/alarm-queue.c:770
 #, fuzzy
 msgid "No description available."
 msgstr "No hi ha cap resum disponible."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:892
-#, c-format
-msgid ""
-"Alarm on %s\n"
-"%s\n"
-"Starting at %s\n"
-"Ending at %s"
-msgstr ""
-
-#: calendar/gui/alarm-notify/alarm-queue.c:979
-#: calendar/gui/alarm-notify/alarm-queue.c:1003
+#: calendar/gui/alarm-notify/alarm-queue.c:843
+#: calendar/gui/alarm-notify/alarm-queue.c:867 widgets/misc/e-messagebox.c:161
 #, fuzzy
 msgid "Warning"
 msgstr "S'està movent"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:983
+#: calendar/gui/alarm-notify/alarm-queue.c:847
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -4001,7 +3993,7 @@ msgid ""
 "a normal reminder dialog box instead."
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1009
+#: calendar/gui/alarm-notify/alarm-queue.c:873
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -4012,68 +4004,60 @@ msgid ""
 "Are you sure you want to run this program?"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1023
+#: calendar/gui/alarm-notify/alarm-queue.c:887
 #, fuzzy
 msgid "Do not ask me about this program again."
 msgstr "Envia aquest missatge"
 
-#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
-#, fuzzy
-msgid "Evolution Calendar alarm notification service"
-msgstr "Conducte de l'agenda de l'Evolution"
-
-#: calendar/gui/alarm-notify/notify-main.c:173
-msgid "Could not initialize Bonobo"
-msgstr "No s'ha pogut inicialitzar el Bonobo"
-
-#: calendar/gui/alarm-notify/notify-main.c:176
+#: calendar/gui/alarm-notify/notify-main.c:174
 #, fuzzy
 msgid "Could not initialize gnome-vfs"
 msgstr "No s'ha pogut inicialitzar el Bonobo"
 
-#: calendar/gui/alarm-notify/notify-main.c:185
+#: calendar/gui/alarm-notify/notify-main.c:183
 #, fuzzy
 msgid "Could not create the alarm notify service factory"
 msgstr "No s'ha pogut crear el directori temporal: %s"
 
-#: calendar/gui/calendar-commands.c:376
-msgid ""
-"This operation will permanently erase all events older than the selected "
-"amount of time. If you continue, you will not be able to recover these "
-"events."
-msgstr ""
+#: calendar/gui/cal-search-bar.c:50
+#, fuzzy
+msgid "Summary contains"
+msgstr "conté"
 
-#: calendar/gui/calendar-commands.c:382
+#: calendar/gui/cal-search-bar.c:51
 #, fuzzy
-msgid "Purge events older than"
-msgstr "és més petit que"
+msgid "Description contains"
+msgstr "Descripció:"
 
-#: calendar/gui/calendar-commands.c:387
-#: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter.glade.h:17
-msgid "days"
-msgstr "dies"
+#: calendar/gui/cal-search-bar.c:52
+#, fuzzy
+msgid "Comment contains"
+msgstr "conté"
+
+#: calendar/gui/cal-search-bar.c:358 mail/mail-ops.c:1106
+msgid "Unmatched"
+msgstr ""
 
-#: calendar/gui/calendar-commands.c:485
+#: calendar/gui/calendar-commands.c:419
 #, fuzzy
 msgid "%A %d %B %Y"
 msgstr "%A, %d de %B de %Y"
 
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
-#: calendar/gui/calendar-commands.c:488 calendar/gui/e-day-view.c:1364
-#: calendar/gui/e-day-view-top-item.c:266
-#: calendar/gui/e-week-view-main-item.c:325
+#: calendar/gui/calendar-commands.c:422 calendar/gui/e-day-view-top-item.c:265
+#: calendar/gui/e-day-view.c:1438 calendar/gui/e-week-view-main-item.c:325
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
-#: calendar/gui/calendar-commands.c:490 calendar/gui/calendar-commands.c:495
-#: calendar/gui/calendar-commands.c:497
+#: calendar/gui/calendar-commands.c:424 calendar/gui/calendar-commands.c:429
+#: calendar/gui/calendar-commands.c:431
 #, fuzzy
 msgid "%a %d %b %Y"
 msgstr "%a %d %b"
 
-#: calendar/gui/calendar-commands.c:514 calendar/gui/calendar-commands.c:520
-#: calendar/gui/calendar-commands.c:526 calendar/gui/calendar-commands.c:528
+#: calendar/gui/calendar-commands.c:442 calendar/gui/calendar-commands.c:449
+#: calendar/gui/calendar-commands.c:455 calendar/gui/calendar-commands.c:457
 #, fuzzy
 msgid "%d %B %Y"
 msgstr "%A, %d de %B de %Y"
@@ -4081,17 +4065,17 @@ msgstr "%A, %d de %B de %Y"
 #. strftime format %d = day of month, %B = full
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: calendar/gui/calendar-commands.c:518
-#: calendar/gui/e-week-view-main-item.c:333 calendar/gui/print.c:1508
+#: calendar/gui/calendar-commands.c:447
+#: calendar/gui/e-week-view-main-item.c:333 calendar/gui/print.c:1509
 msgid "%d %B"
 msgstr "%d %B"
 
-#: calendar/gui/calendar-commands.c:918
+#: calendar/gui/calendar-commands.c:849
 msgid ""
 "Could not create the calendar view.  Please check your ORBit and OAF setup."
 msgstr ""
 
-#: calendar/gui/calendar-component.c:70 calendar/gui/gnome-cal.c:1569
+#: calendar/gui/calendar-component.c:70 calendar/gui/gnome-cal.c:1353
 #: importers/netscape-importer.c:1873 mail/importers/netscape-importer.c:1843
 #: my-evolution/my-evolution.glade.h:2 shell/e-local-storage.c:177
 #: shell/e-shortcuts.c:1085
@@ -4111,11 +4095,11 @@ msgstr "Agenda"
 msgid "Public folder containing appointments and events"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:80 calendar/gui/e-tasks.c:1080
-#: calendar/gui/print.c:1787 calendar/gui/tasks-control.c:487
+#: calendar/gui/calendar-component.c:80 calendar/gui/e-tasks.c:738
+#: calendar/gui/print.c:1789 calendar/gui/tasks-control.c:504
 #: calendar/importers/icalendar-importer.c:644
 #: importers/netscape-importer.c:1875 mail/importers/netscape-importer.c:1845
-#: my-evolution/e-summary-tasks.c:348 my-evolution/e-summary-tasks.c:357
+#: my-evolution/e-summary-tasks.c:329 my-evolution/e-summary-tasks.c:338
 #: shell/e-local-storage.c:183 shell/e-shortcuts.c:1086
 msgid "Tasks"
 msgstr "Tasques"
@@ -4194,6 +4178,112 @@ msgstr "Nova cita..."
 msgid "Create a new all-day appointment"
 msgstr "Crea una nova cita"
 
+#: calendar/gui/calendar-model.c:405 calendar/gui/calendar-model.c:964
+#: calendar/gui/e-calendar-table.c:380
+msgid "Private"
+msgstr "Privat"
+
+#: calendar/gui/calendar-model.c:408 calendar/gui/calendar-model.c:966
+#: calendar/gui/e-calendar-table.c:381
+msgid "Confidential"
+msgstr "Confidencial"
+
+#: calendar/gui/calendar-model.c:411 calendar/gui/e-calendar-table.c:379
+msgid "Public"
+msgstr "Públic"
+
+#: calendar/gui/calendar-model.c:523
+msgid "N"
+msgstr "N"
+
+#: calendar/gui/calendar-model.c:523
+msgid "S"
+msgstr "S"
+
+#: calendar/gui/calendar-model.c:525
+msgid "E"
+msgstr "E"
+
+#: calendar/gui/calendar-model.c:525
+msgid "W"
+msgstr "O"
+
+#: calendar/gui/calendar-model.c:590 calendar/gui/calendar-model.c:1134
+#: calendar/gui/e-calendar-table.c:453
+#, fuzzy
+msgid "Free"
+msgstr "setmana"
+
+#: calendar/gui/calendar-model.c:592 calendar/gui/e-calendar-table.c:454
+#: calendar/gui/e-meeting-time-sel.c:406
+#: shell/evolution-shell-component.c:1204
+msgid "Busy"
+msgstr "Ocupat"
+
+#: calendar/gui/calendar-model.c:750 calendar/gui/calendar-model.c:1178
+#: calendar/gui/dialogs/task-details-page.glade.h:10
+#: calendar/gui/e-calendar-table.c:474 calendar/gui/print.c:2298
+msgid "Not Started"
+msgstr "No iniciat"
+
+#: calendar/gui/calendar-model.c:753 calendar/gui/calendar-model.c:1180
+#: calendar/gui/dialogs/task-details-page.glade.h:7
+#: calendar/gui/e-calendar-table.c:475 calendar/gui/print.c:2301
+msgid "In Progress"
+msgstr "En procés"
+
+#: calendar/gui/calendar-model.c:756 calendar/gui/calendar-model.c:1182
+#: calendar/gui/dialogs/task-details-page.glade.h:4
+#: calendar/gui/e-calendar-table.c:476 calendar/gui/e-meeting-model.c:294
+#: calendar/gui/e-meeting-model.c:317 calendar/gui/print.c:2304
+#, fuzzy
+msgid "Completed"
+msgstr "% comp_let:"
+
+#: calendar/gui/calendar-model.c:1036
+msgid ""
+"The geographical position must be entered in the format: \n"
+"\n"
+"45.436845,125.862501"
+msgstr ""
+"La posició geogràfica s'ha d'introduir amb el format: \n"
+"\n"
+"45.436845,125.862501"
+
+#. An empty string is the same as 'None'.
+#: calendar/gui/calendar-model.c:1176 calendar/gui/dialogs/meeting-page.c:330
+#: calendar/gui/dialogs/meeting-page.glade.h:2 composer/e-msg-composer.c:2056
+#: mail/folder-browser.c:1752 mail/mail-account-gui.c:1260
+#: mail/mail-account-gui.c:1692 mail/mail-accounts.c:442
+#: mail/mail-config.glade.h:76
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:194
+#: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:442
+#: widgets/misc/e-dateedit.c:1458 widgets/misc/e-dateedit.c:1573
+msgid "None"
+msgstr "Cap"
+
+#: calendar/gui/calendar-model.c:1711
+#, fuzzy
+msgid "Recurring"
+msgstr "Recurrència"
+
+#: calendar/gui/calendar-model.c:1713
+#, fuzzy
+msgid "Assigned"
+msgstr "Assigna una puntuació"
+
+#: calendar/gui/calendar-model.c:1719 calendar/gui/e-meeting-model.c:266
+#: calendar/gui/e-meeting-model.c:276 calendar/gui/e-meeting-model.c:534
+#: calendar/gui/e-meeting-model.c:784
+msgid "Yes"
+msgstr ""
+
+#: calendar/gui/calendar-model.c:1719 calendar/gui/e-meeting-model.c:278
+#: calendar/gui/e-meeting-model.c:785
+#, fuzzy
+msgid "No"
+msgstr "Ara"
+
 #: calendar/gui/calendar-view-factory.c:118
 #, fuzzy
 msgid "Day View"
@@ -4214,79 +4304,55 @@ msgstr "Setmana"
 msgid "Month View"
 msgstr "Mes"
 
-#: calendar/gui/calendar-view-factory.c:130
-#, fuzzy
-msgid "List View"
-msgstr "Cerca personalitzada"
-
-#: calendar/gui/cal-search-bar.c:50
-#, fuzzy
-msgid "Summary contains"
-msgstr "conté"
-
-#: calendar/gui/cal-search-bar.c:51
-#, fuzzy
-msgid "Description contains"
-msgstr "Descripció:"
-
-#: calendar/gui/cal-search-bar.c:52
-#, fuzzy
-msgid "Comment contains"
-msgstr "conté"
-
-#: calendar/gui/cal-search-bar.c:358 mail/mail-ops.c:1120
-msgid "Unmatched"
-msgstr ""
-
-#: calendar/gui/comp-editor-factory.c:462
+#: calendar/gui/comp-editor-factory.c:456
 #, fuzzy
 msgid "Error while opening the calendar"
 msgstr "Error en comunicar-se amb el servidor d'agenda"
 
-#: calendar/gui/comp-editor-factory.c:473
+#: calendar/gui/comp-editor-factory.c:467
 msgid "Method not supported when opening the calendar"
 msgstr ""
 
-#: calendar/gui/comp-editor-factory.c:479
+#: calendar/gui/comp-editor-factory.c:473
 #, fuzzy
 msgid "Permission denied to open the calendar"
 msgstr "Permís denegat"
 
-#: calendar/gui/control-factory.c:125
+#: calendar/gui/control-factory.c:119
 #, fuzzy, c-format
 msgid "Could not open the folder in '%s'"
 msgstr ""
 "No s'ha pogut obrir la carpeta `%s':\n"
 "%s"
 
-#: calendar/gui/control-factory.c:171
+#: calendar/gui/control-factory.c:165
 msgid "The URI that the calendar will display"
 msgstr "La URI que mostrarà l'agenda"
 
-#: calendar/gui/control-factory.c:178
+#: calendar/gui/control-factory.c:172
 msgid "The type of view to show"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-options.c:466
+#: calendar/gui/dialogs/alarm-options.c:420
 #, fuzzy
 msgid "Audio Alarm Options"
 msgstr "Alarmes acústiques"
 
-#: calendar/gui/dialogs/alarm-options.c:475
+#: calendar/gui/dialogs/alarm-options.c:429
 #, fuzzy
 msgid "Message Alarm Options"
 msgstr "Destinataris del missatge"
 
-#: calendar/gui/dialogs/alarm-options.c:484
+#: calendar/gui/dialogs/alarm-options.c:438
 #, fuzzy
 msgid "Email Alarm Options"
 msgstr "Opcions de visualització"
 
-#: calendar/gui/dialogs/alarm-options.c:493
+#: calendar/gui/dialogs/alarm-options.c:447
 msgid "Program Alarm Options"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-options.c:509
+#: calendar/gui/dialogs/alarm-options.c:456
 msgid "Unknown Alarm Options"
 msgstr ""
 
@@ -4328,6 +4394,10 @@ msgstr "Envia \"%s\""
 msgid "With these arguments:"
 msgstr ""
 
+#: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter.glade.h:17
+msgid "days"
+msgstr "dies"
+
 #: calendar/gui/dialogs/alarm-options.glade.h:11
 msgid "dialog1"
 msgstr ""
@@ -4341,8 +4411,7 @@ msgstr "_Actualitza lliure/ocupat"
 msgid "hours"
 msgstr "hores"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:14
-#: executive-summary/test-service/rdf-summary.c:806 filter/filter.glade.h:19
+#: calendar/gui/dialogs/alarm-options.glade.h:14 filter/filter.glade.h:19
 msgid "minutes"
 msgstr "minuts"
 
@@ -4358,12 +4427,12 @@ msgstr "Enganxa"
 msgid "Date/Time:"
 msgstr "Data d'enviament"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:3 calendar/gui/e-alarm-list.c:465
+#: calendar/gui/dialogs/alarm-page.glade.h:3 calendar/gui/e-alarm-list.c:461
 #, fuzzy
 msgid "Display a message"
 msgstr "Visualitza l'UID del missatge \"%s\""
 
-#: calendar/gui/dialogs/alarm-page.glade.h:4 calendar/gui/e-alarm-list.c:461
+#: calendar/gui/dialogs/alarm-page.glade.h:4 calendar/gui/e-alarm-list.c:457
 msgid "Play a sound"
 msgstr ""
 
@@ -4371,7 +4440,7 @@ msgstr ""
 msgid "Reminders"
 msgstr "Recordatoris"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:6 calendar/gui/e-alarm-list.c:473
+#: calendar/gui/dialogs/alarm-page.glade.h:6 calendar/gui/e-alarm-list.c:469
 #, fuzzy
 msgid "Run a program"
 msgstr "_Executa el programa:"
@@ -4383,8 +4452,7 @@ msgstr "S'està recollint el correu des de %s"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:8
 #: calendar/gui/dialogs/recurrence-page.glade.h:8
-#: calendar/gui/e-itip-control.c:1022 calendar/gui/e-itip-control.glade.h:11
-#: calendar/gui/e-tasks.c:208
+#: calendar/gui/e-itip-control.c:1052 calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "Resum:"
 
@@ -4476,7 +4544,7 @@ msgstr "Dies"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
 #: calendar/gui/dialogs/recurrence-page.c:1040
-#: calendar/gui/e-itip-control.c:647
+#: calendar/gui/e-itip-control.c:677
 msgid "Friday"
 msgstr "Divendres"
 
@@ -4490,7 +4558,7 @@ msgstr "Minuts"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
 #: calendar/gui/dialogs/recurrence-page.c:1036
-#: calendar/gui/e-itip-control.c:643
+#: calendar/gui/e-itip-control.c:673
 msgid "Monday"
 msgstr "Dilluns"
 
@@ -4501,7 +4569,7 @@ msgstr "dg."
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
 #: calendar/gui/dialogs/recurrence-page.c:1041
-#: calendar/gui/e-itip-control.c:648
+#: calendar/gui/e-itip-control.c:678
 msgid "Saturday"
 msgstr "Dissabte"
 
@@ -4516,7 +4584,7 @@ msgstr "Mostra els números de les setmanes"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
 #: calendar/gui/dialogs/recurrence-page.c:1042
-#: calendar/gui/e-itip-control.c:642
+#: calendar/gui/e-itip-control.c:672
 msgid "Sunday"
 msgstr "Diumenge"
 
@@ -4537,7 +4605,7 @@ msgstr "Tasques"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
 #: calendar/gui/dialogs/recurrence-page.c:1039
-#: calendar/gui/e-itip-control.c:646
+#: calendar/gui/e-itip-control.c:676
 msgid "Thursday"
 msgstr "Dijous"
 
@@ -4556,7 +4624,7 @@ msgstr "Format de l'hora:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
 #: calendar/gui/dialogs/recurrence-page.c:1037
-#: calendar/gui/e-itip-control.c:644
+#: calendar/gui/e-itip-control.c:674
 msgid "Tuesday"
 msgstr "Dimarts"
 
@@ -4566,12 +4634,12 @@ msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
 #: calendar/gui/dialogs/recurrence-page.c:1038
-#: calendar/gui/e-itip-control.c:645
+#: calendar/gui/e-itip-control.c:675
 msgid "Wednesday"
 msgstr "Dimecres"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-#: ui/evolution-calendar.xml.h:31
+#: ui/evolution-calendar.xml.h:27
 #, fuzzy
 msgid "Work Week"
 msgstr "Setmana de treball"
@@ -4704,50 +4772,78 @@ msgstr ""
 "Esteu segur que voleu\n"
 "suprimir aquest contacte?"
 
-#: calendar/gui/dialogs/changed-comp.c:59
+#: calendar/gui/dialogs/changed-comp.c:58
 msgid "This event has been deleted."
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:63
+#: calendar/gui/dialogs/changed-comp.c:62
 msgid "This task has been deleted."
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:67
+#: calendar/gui/dialogs/changed-comp.c:66
 msgid "This journal entry has been deleted."
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:76
+#: calendar/gui/dialogs/changed-comp.c:75
 #, c-format
 msgid "%s  You have made changes. Forget those changes and close the editor?"
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:78
+#: calendar/gui/dialogs/changed-comp.c:77
 #, c-format
 msgid "%s  You have made no changes, close the editor?"
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:83
+#: calendar/gui/dialogs/changed-comp.c:82
 msgid "This event has been changed."
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:87
+#: calendar/gui/dialogs/changed-comp.c:86
 msgid "This task has been changed."
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:91
+#: calendar/gui/dialogs/changed-comp.c:90
 msgid "This journal entry has been changed."
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:100
+#: calendar/gui/dialogs/changed-comp.c:99
 #, c-format
 msgid "%s  You have made changes. Forget those changes and update the editor?"
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:102
+#: calendar/gui/dialogs/changed-comp.c:101
 #, c-format
 msgid "%s  You have made no changes, update the editor?"
 msgstr ""
 
+#: calendar/gui/dialogs/comp-editor-page.c:409
+#, fuzzy, c-format
+msgid "Validation error: %s"
+msgstr "Error desconegut: %s"
+
+#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2216
+msgid " to "
+msgstr ""
+
+#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2220
+#, fuzzy
+msgid " (Completed "
+msgstr "% comp_let:"
+
+#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2222
+#, fuzzy
+msgid "Completed "
+msgstr "% comp_let:"
+
+#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2227
+msgid " (Due "
+msgstr ""
+
+#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2229
+#, fuzzy
+msgid "Due "
+msgstr "Data de venciment"
+
 #: calendar/gui/dialogs/comp-editor.c:334
 #, fuzzy
 msgid "Could not update invalid object"
@@ -4795,50 +4891,21 @@ msgid "No summary"
 msgstr "Sense resum"
 
 #: calendar/gui/dialogs/comp-editor.c:1281
-#: calendar/gui/e-calendar-table.c:1138 calendar/gui/e-cal-view.c:878
-#: composer/e-msg-composer.c:1191
+#: calendar/gui/e-calendar-table.c:1068 calendar/gui/e-day-view.c:3993
+#: calendar/gui/e-week-view.c:3840 composer/e-msg-composer.c:1164
 msgid "Save as..."
 msgstr "Anomena i desa..."
 
-#: calendar/gui/dialogs/comp-editor.c:1384
-#: calendar/gui/dialogs/comp-editor.c:1408
-#: calendar/gui/dialogs/comp-editor.c:1434
+#: calendar/gui/dialogs/comp-editor.c:1382
+#: calendar/gui/dialogs/comp-editor.c:1406
+#: calendar/gui/dialogs/comp-editor.c:1432
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:1464
-#: calendar/gui/dialogs/comp-editor.c:1473
+#: calendar/gui/dialogs/comp-editor.c:1459
 msgid "Unable to obtain current version!"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor-page.c:409
-#, fuzzy, c-format
-msgid "Validation error: %s"
-msgstr "Error desconegut: %s"
-
-#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2223
-msgid " to "
-msgstr ""
-
-#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2227
-#, fuzzy
-msgid " (Completed "
-msgstr "% comp_let:"
-
-#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2229
-#, fuzzy
-msgid "Completed "
-msgstr "% comp_let:"
-
-#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2234
-msgid " (Due "
-msgstr ""
-
-#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2236
-#, fuzzy
-msgid "Due "
-msgstr "Data de venciment"
-
 #: calendar/gui/dialogs/delete-comp.c:96
 #, fuzzy, c-format
 msgid "Are you sure you want to delete the appointment `%s'?"
@@ -4965,34 +5032,34 @@ msgstr "Suprimeix"
 msgid "Enter Delegate"
 msgstr "Suprimeix"
 
-#: calendar/gui/dialogs/event-editor.c:200 calendar/gui/print.c:2260
+#: calendar/gui/dialogs/event-editor.c:199 calendar/gui/print.c:2253
 #, fuzzy
 msgid "Appointment"
 msgstr "Cites:"
 
-#: calendar/gui/dialogs/event-editor.c:207
+#: calendar/gui/dialogs/event-editor.c:206
 msgid "Reminder"
 msgstr "Recordatori"
 
-#: calendar/gui/dialogs/event-editor.c:214
+#: calendar/gui/dialogs/event-editor.c:213
 msgid "Recurrence"
 msgstr "Recurrència"
 
-#: calendar/gui/dialogs/event-editor.c:221
-#: calendar/gui/dialogs/event-editor.c:294
-#: calendar/gui/dialogs/event-editor.c:438
+#: calendar/gui/dialogs/event-editor.c:220
+#: calendar/gui/dialogs/event-editor.c:292
+#: calendar/gui/dialogs/event-editor.c:436
 #, fuzzy
 msgid "Scheduling"
 msgstr "Seleccioneu una carpeta"
 
-#: calendar/gui/dialogs/event-editor.c:228
-#: calendar/gui/dialogs/event-editor.c:297
-#: calendar/gui/dialogs/event-editor.c:441 ui/evolution-event-editor.xml.h:6
+#: calendar/gui/dialogs/event-editor.c:227
+#: calendar/gui/dialogs/event-editor.c:295
+#: calendar/gui/dialogs/event-editor.c:439 ui/evolution-event-editor.xml.h:6
 #, fuzzy
 msgid "Meeting"
 msgstr "Cancel·lat"
 
-#: calendar/gui/dialogs/event-page.c:603 calendar/gui/dialogs/task-page.c:509
+#: calendar/gui/dialogs/event-page.c:603 calendar/gui/dialogs/task-page.c:507
 #, fuzzy
 msgid "Start date is wrong"
 msgstr "Data d'ini_ci:"
@@ -5031,8 +5098,9 @@ msgid "Classification"
 msgstr "Classificació"
 
 #: calendar/gui/dialogs/event-page.glade.h:6
+#: calendar/gui/dialogs/task-page.glade.h:4
 #, fuzzy
-msgid "Co_nfidential"
+msgid "Con_fidential"
 msgstr "Confidencial"
 
 #: calendar/gui/dialogs/event-page.glade.h:7
@@ -5062,6 +5130,7 @@ msgid "Pu_blic"
 msgstr "Pú_blic"
 
 #: calendar/gui/dialogs/event-page.glade.h:12
+#: calendar/gui/e-calendar-table.etspec.h:13
 #, fuzzy
 msgid "Show Time As"
 msgstr "Mostra"
@@ -5080,35 +5149,83 @@ msgstr "Hora de _finalització:"
 msgid "_Start time:"
 msgstr "Hora d'_inici:"
 
-#. an empty string is the same as 'None'
-#: calendar/gui/dialogs/meeting-page.c:311
-#: calendar/gui/dialogs/meeting-page.glade.h:2
-#: calendar/gui/e-cal-model-tasks.c:596 composer/e-msg-composer.c:2093
-#: mail/mail-account-gui.c:1260 mail/mail-account-gui.c:1692
-#: mail/mail-accounts.c:442 mail/mail-config.glade.h:76
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:194
-#: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:445
-#: widgets/misc/e-dateedit.c:1483 widgets/misc/e-dateedit.c:1598
-msgid "None"
-msgstr "Cap"
-
-#: calendar/gui/dialogs/meeting-page.c:416
+#: calendar/gui/dialogs/meeting-page.c:437
 msgid "The organizer selected no longer has an account."
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:422
+#: calendar/gui/dialogs/meeting-page.c:443
 msgid "An organizer is required."
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:437
+#: calendar/gui/dialogs/meeting-page.c:458
 msgid "At least one attendee is required."
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:630
+#: calendar/gui/dialogs/meeting-page.c:629
+msgid "That person is already attending the meeting!"
+msgstr ""
+
+#: calendar/gui/dialogs/meeting-page.c:713
 #, fuzzy
 msgid "_Delegate To..."
 msgstr "Suprimeix"
 
+#: calendar/gui/dialogs/meeting-page.etspec.h:1
+#: calendar/gui/e-meeting-time-sel.etspec.h:1
+#, fuzzy
+msgid "Attendee"
+msgstr "Tots els assistents"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:2
+#: calendar/gui/e-meeting-time-sel.etspec.h:2
+#, fuzzy
+msgid "Click here to add an attendee"
+msgstr "<feu clic aquí per seleccionar una data>"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:3
+#: calendar/gui/e-meeting-time-sel.etspec.h:3
+#, fuzzy
+msgid "Common Name"
+msgstr "Completat"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:4
+#: calendar/gui/e-meeting-time-sel.etspec.h:4
+#, fuzzy
+msgid "Delegated From"
+msgstr "Suprimeix"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:5
+#: calendar/gui/e-meeting-time-sel.etspec.h:5
+#, fuzzy
+msgid "Delegated To"
+msgstr "Suprimeix"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:6
+#: calendar/gui/e-meeting-time-sel.etspec.h:6
+#, fuzzy
+msgid "Language"
+msgstr "Busca"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:7
+#: calendar/gui/e-meeting-time-sel.etspec.h:7
+#, fuzzy
+msgid "Member"
+msgstr "desembre"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:8
+#: calendar/gui/e-itip-control.c:1179
+#: calendar/gui/e-meeting-time-sel.etspec.h:8
+msgid "RSVP"
+msgstr ""
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:10
+#: calendar/gui/e-calendar-table.etspec.h:15
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:58
+#: mail/message-list.etspec.h:12
+#, fuzzy
+msgid "Status"
+msgstr "_Estat:"
+
 #: calendar/gui/dialogs/meeting-page.glade.h:3
 #: calendar/gui/e-itip-control.glade.h:9
 #, fuzzy
@@ -5121,7 +5238,7 @@ msgid "_Change Organizer"
 msgstr "Organització:"
 
 #: calendar/gui/dialogs/meeting-page.glade.h:5
-#: calendar/gui/e-meeting-time-sel.c:411
+#: calendar/gui/e-meeting-time-sel.c:424
 msgid "_Invite Others..."
 msgstr "_Invita a altres..."
 
@@ -5286,7 +5403,7 @@ msgstr ""
 "\n"
 "Voleu desar-ne els canvis?"
 
-#: calendar/gui/dialogs/save-comp.c:58 composer/e-msg-composer.c:1599
+#: calendar/gui/dialogs/save-comp.c:58 composer/e-msg-composer.c:1557
 msgid "_Discard Changes"
 msgstr ""
 
@@ -5311,88 +5428,57 @@ msgstr ""
 msgid "The task information has changed. Send an updated version?"
 msgstr ""
 
-#: calendar/gui/dialogs/task-details-page.c:405
+#: calendar/gui/dialogs/task-details-page.c:401
 #, fuzzy
 msgid "Completed date is wrong"
 msgstr "% comp_let:"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:2
+#: calendar/gui/e-calendar-table.etspec.h:2
 #, fuzzy, no-c-format
-msgid "% _Complete"
-msgstr "% comp_let:"
-
-#: calendar/gui/dialogs/task-details-page.glade.h:4
-#: calendar/gui/e-calendar-table.c:478 calendar/gui/e-cal-model-tasks.c:323
-#: calendar/gui/e-cal-model-tasks.c:602 calendar/gui/e-tasks.c:250
-#: calendar/gui/print.c:2311
-#, fuzzy
-msgid "Completed"
+msgid "% Complete"
 msgstr "% comp_let:"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:6
-#: calendar/gui/e-calendar-table.c:477 calendar/gui/e-cal-model-tasks.c:321
-#: calendar/gui/e-cal-model-tasks.c:600 calendar/gui/e-cal-model-tasks.c:662
-#: calendar/gui/e-tasks.c:247 calendar/gui/print.c:2308
-msgid "In Progress"
-msgstr "En procés"
-
-#: calendar/gui/dialogs/task-details-page.glade.h:9
-#: calendar/gui/e-calendar-table.c:476 calendar/gui/e-cal-model-tasks.c:319
-#: calendar/gui/e-cal-model-tasks.c:598 calendar/gui/e-tasks.c:257
-#: calendar/gui/print.c:2305
-msgid "Not Started"
-msgstr "No iniciat"
+#: calendar/gui/dialogs/task-details-page.glade.h:5
+msgid "Date Completed:"
+msgstr "Data completa:"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:10
+#: calendar/gui/dialogs/task-details-page.glade.h:11
 #, fuzzy
 msgid "Progress"
 msgstr "En procés"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:12
 #, fuzzy
-msgid "_Date Completed:"
-msgstr "Data completa:"
+msgid "URL:"
+msgstr "URL:"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:13
+#: calendar/gui/dialogs/task-details-page.glade.h:14
 msgid "_Priority:"
 msgstr "_Prioritat:"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:14
+#: calendar/gui/dialogs/task-details-page.glade.h:15
 msgid "_Status:"
 msgstr "_Estat:"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:15
-#, fuzzy
-msgid "_Web Page:"
-msgstr "Adreça de pàgina web:"
-
-#: calendar/gui/dialogs/task-editor.c:193
+#: calendar/gui/dialogs/task-editor.c:190
 #, fuzzy
 msgid "Basic"
 msgstr "Enganxa"
 
-#: calendar/gui/dialogs/task-editor.c:207
-#: calendar/gui/dialogs/task-editor.c:270
-#: calendar/gui/dialogs/task-editor.c:407
+#: calendar/gui/dialogs/task-editor.c:204
+#: calendar/gui/dialogs/task-editor.c:252
+#: calendar/gui/dialogs/task-editor.c:387
 #, fuzzy
 msgid "Assignment"
 msgstr "Assigna una puntuació"
 
-#: calendar/gui/dialogs/task-page.c:482
+#: calendar/gui/dialogs/task-page.c:480
 msgid "Due date is wrong"
 msgstr ""
 
-#: calendar/gui/dialogs/task-page.c:542
-msgid "Due date is before start date!"
-msgstr ""
-
-#: calendar/gui/dialogs/task-page.glade.h:4
-#, fuzzy
-msgid "Con_fidential"
-msgstr "Confidencial"
-
-#: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-itip-control.c:1077
-#: calendar/gui/e-itip-control.glade.h:6 calendar/gui/e-tasks.c:287
+#: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-itip-control.c:1107
+#: calendar/gui/e-itip-control.glade.h:6
 #: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:43
 msgid "Description:"
 msgstr "Descripció:"
@@ -5406,280 +5492,243 @@ msgstr "Data d'ini_ci:"
 msgid "_Due Date:"
 msgstr "_Data de venciment:"
 
-#: calendar/gui/e-alarm-list.c:397
+#: calendar/gui/e-alarm-list.c:393
 #, fuzzy, c-format
 msgid "%d days"
 msgstr "dies"
 
-#: calendar/gui/e-alarm-list.c:400
+#: calendar/gui/e-alarm-list.c:396
 #, fuzzy
 msgid "1 day"
 msgstr "Mostra 1 dia"
 
-#: calendar/gui/e-alarm-list.c:405
+#: calendar/gui/e-alarm-list.c:401
 #, fuzzy, c-format
 msgid "%d weeks"
 msgstr "setmanes"
 
-#: calendar/gui/e-alarm-list.c:408
+#: calendar/gui/e-alarm-list.c:404
 #, fuzzy
 msgid "1 week"
 msgstr "Mostra 1 setmana"
 
-#: calendar/gui/e-alarm-list.c:413
+#: calendar/gui/e-alarm-list.c:409
 #, fuzzy, c-format
 msgid "%d hours"
 msgstr "hores"
 
-#: calendar/gui/e-alarm-list.c:416
+#: calendar/gui/e-alarm-list.c:412
 #, fuzzy
 msgid "1 hour"
 msgstr "hora"
 
-#: calendar/gui/e-alarm-list.c:421
+#: calendar/gui/e-alarm-list.c:417
 #, fuzzy, c-format
 msgid "%d minutes"
 msgstr "minuts"
 
-#: calendar/gui/e-alarm-list.c:424
+#: calendar/gui/e-alarm-list.c:420
 #, fuzzy
 msgid "1 minute"
 msgstr "10 minuts"
 
-#: calendar/gui/e-alarm-list.c:429
+#: calendar/gui/e-alarm-list.c:425
 #, fuzzy, c-format
 msgid "%d seconds"
 msgstr " segons"
 
-#: calendar/gui/e-alarm-list.c:432
+#: calendar/gui/e-alarm-list.c:428
 #, fuzzy
 msgid "1 second"
 msgstr " segons"
 
-#: calendar/gui/e-alarm-list.c:469
+#: calendar/gui/e-alarm-list.c:465
 #, fuzzy
 msgid "Send an email"
 msgstr "S'està recollint el correu des de %s"
 
-#: calendar/gui/e-alarm-list.c:479
+#: calendar/gui/e-alarm-list.c:475
 #, fuzzy
 msgid "Unknown action to be performed"
 msgstr "Error desconegut"
 
-#: calendar/gui/e-alarm-list.c:491
+#: calendar/gui/e-alarm-list.c:487
 #, fuzzy, c-format
 msgid "%s %s before the start of the appointment"
 msgstr "Crea una nova cita"
 
-#: calendar/gui/e-alarm-list.c:494
+#: calendar/gui/e-alarm-list.c:490
 #, fuzzy, c-format
 msgid "%s %s after the start of the appointment"
 msgstr "Crea una nova cita"
 
-#: calendar/gui/e-alarm-list.c:499
+#: calendar/gui/e-alarm-list.c:495
 #, fuzzy, c-format
 msgid "%s at the start of the appointment"
 msgstr "Crea una nova cita"
 
-#: calendar/gui/e-alarm-list.c:508
+#: calendar/gui/e-alarm-list.c:504
 #, fuzzy, c-format
 msgid "%s %s before the end of the appointment"
 msgstr "Crea una nova cita"
 
-#: calendar/gui/e-alarm-list.c:511
+#: calendar/gui/e-alarm-list.c:507
 #, fuzzy, c-format
 msgid "%s %s after the end of the appointment"
 msgstr "Crea una nova cita"
 
-#: calendar/gui/e-alarm-list.c:516
+#: calendar/gui/e-alarm-list.c:512
 #, fuzzy, c-format
 msgid "%s at the end of the appointment"
 msgstr "Crea una nova cita"
 
-#: calendar/gui/e-alarm-list.c:540
+#: calendar/gui/e-alarm-list.c:536
 #, fuzzy, c-format
 msgid "%s at %s"
 msgstr "%2$s%1$s"
 
-#: calendar/gui/e-alarm-list.c:546
+#: calendar/gui/e-alarm-list.c:542
 #, c-format
 msgid "%s for an unknown trigger type"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:381 calendar/gui/e-cal-model.c:280
-#: calendar/gui/e-cal-model.c:287
-msgid "Public"
-msgstr "Públic"
-
-#: calendar/gui/e-calendar-table.c:382 calendar/gui/e-cal-model.c:289
-msgid "Private"
-msgstr "Privat"
-
-#: calendar/gui/e-calendar-table.c:383 calendar/gui/e-cal-model.c:291
-msgid "Confidential"
-msgstr "Confidencial"
-
-#: calendar/gui/e-calendar-table.c:425
+#: calendar/gui/e-calendar-table.c:423
 msgid "0%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:426
+#: calendar/gui/e-calendar-table.c:424
 msgid "10%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:427
+#: calendar/gui/e-calendar-table.c:425
 msgid "20%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:428
+#: calendar/gui/e-calendar-table.c:426
 msgid "30%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:429
+#: calendar/gui/e-calendar-table.c:427
 msgid "40%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:430
+#: calendar/gui/e-calendar-table.c:428
 msgid "50%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:431
+#: calendar/gui/e-calendar-table.c:429
 msgid "60%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:432
+#: calendar/gui/e-calendar-table.c:430
 msgid "70%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:433
+#: calendar/gui/e-calendar-table.c:431
 msgid "80%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:434
+#: calendar/gui/e-calendar-table.c:432
 msgid "90%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:435
+#: calendar/gui/e-calendar-table.c:433
 msgid "100%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:455 calendar/gui/e-cal-model-calendar.c:163
-#, fuzzy
-msgid "Free"
-msgstr "setmana"
-
-#: calendar/gui/e-calendar-table.c:456 calendar/gui/e-cal-model-calendar.c:166
-#: calendar/gui/e-meeting-time-sel.c:393
-#: shell/evolution-shell-component.c:1207
-msgid "Busy"
-msgstr "Ocupat"
-
-#: calendar/gui/e-calendar-table.c:724 calendar/gui/e-cal-view.c:562
+#: calendar/gui/e-calendar-table.c:726 calendar/gui/e-day-view.c:2867
+#: calendar/gui/e-week-view.c:1933
 #, fuzzy
 msgid "Deleting selected objects"
 msgstr "Suprimeix un contacte"
 
-#: calendar/gui/e-calendar-table.c:988 calendar/gui/e-calendar-table.c:1029
-#: calendar/gui/e-cal-view.c:1126 calendar/gui/e-cal-view.c:1192
+#: calendar/gui/e-calendar-table.c:958 calendar/gui/e-day-view.c:3737
+#: calendar/gui/e-week-view.c:3613 mail/folder-browser.c:1763
 #: shell/e-shortcuts-view.c:422 ui/evolution-addressbook.xml.h:36
 #, fuzzy
 msgid "_Open"
 msgstr "_Obre"
 
-#: calendar/gui/e-calendar-table.c:989
-#, fuzzy
-msgid "Open _Web Page"
-msgstr "FIXME: _Obre la pàgina web"
-
-#: calendar/gui/e-calendar-table.c:990 calendar/gui/e-calendar-table.c:1035
-#: calendar/gui/e-cal-view.c:1127 calendar/gui/e-cal-view.c:1198
-#: ui/evolution-mail-message.xml.h:120
+#: calendar/gui/e-calendar-table.c:959
 #, fuzzy
-msgid "_Save As..."
+msgid "_Save as..."
 msgstr "Anomena i desa..."
 
-#: calendar/gui/e-calendar-table.c:991 calendar/gui/e-calendar-table.c:1033
-#: calendar/gui/e-cal-view.c:1101 calendar/gui/e-cal-view.c:1128
-#: calendar/gui/e-cal-view.c:1196 ui/evolution-addressbook.xml.h:38
-#: ui/evolution-calendar.xml.h:37 ui/evolution-comp-editor.xml.h:19
-#: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:116
-#: ui/evolution-tasks.xml.h:21 ui/my-evolution.xml.h:6
+#: calendar/gui/e-calendar-table.c:960 calendar/gui/e-day-view.c:3739
+#: calendar/gui/e-week-view.c:3588 calendar/gui/e-week-view.c:3615
+#: ui/evolution-addressbook.xml.h:38 ui/evolution-calendar.xml.h:33
+#: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:108
+#: ui/evolution-tasks.xml.h:20 ui/my-evolution.xml.h:6
 #, fuzzy
 msgid "_Print..."
 msgstr "Imprimeix..."
 
-#: calendar/gui/e-calendar-table.c:995 calendar/gui/e-calendar-table.c:1024
-#: calendar/gui/e-cal-view.c:1133 calendar/gui/e-cal-view.c:1174
-#: ui/evolution-addressbook.xml.h:1 ui/evolution-calendar.xml.h:1
-#: ui/evolution-tasks.xml.h:1
+#: calendar/gui/e-calendar-table.c:964 calendar/gui/e-day-view.c:3744
+#: calendar/gui/e-week-view.c:3620 ui/evolution-addressbook.xml.h:1
+#: ui/evolution-calendar.xml.h:1 ui/evolution-tasks.xml.h:1
 #, fuzzy
 msgid "C_ut"
 msgstr "Personalitzat"
 
-#: calendar/gui/e-calendar-table.c:996 calendar/gui/e-calendar-table.c:1022
-#: calendar/gui/e-cal-view.c:1134 calendar/gui/e-cal-view.c:1172
-#: ui/evolution-addressbook.xml.h:30 ui/evolution-calendar.xml.h:33
-#: ui/evolution-composer-entries.xml.h:7 ui/evolution-mail-message.xml.h:101
-#: ui/evolution-tasks.xml.h:17
+#: calendar/gui/e-calendar-table.c:965 calendar/gui/e-day-view.c:3745
+#: calendar/gui/e-week-view.c:3621 ui/evolution-addressbook.xml.h:30
+#: ui/evolution-calendar.xml.h:29 ui/evolution-composer-entries.xml.h:7
+#: ui/evolution-mail-list.xml.h:24 ui/evolution-tasks.xml.h:15
 #, fuzzy
 msgid "_Copy"
 msgstr "Copia"
 
-#: calendar/gui/e-calendar-table.c:997 calendar/gui/e-calendar-table.c:1031
-#: calendar/gui/e-cal-view.c:1105 calendar/gui/e-cal-view.c:1135
-#: calendar/gui/e-cal-view.c:1194 ui/evolution-addressbook.xml.h:37
-#: ui/evolution-calendar.xml.h:36 ui/evolution-composer-entries.xml.h:9
-#: ui/evolution-mail-message.xml.h:114 ui/evolution-tasks.xml.h:20
+#: calendar/gui/e-calendar-table.c:966 calendar/gui/e-day-view.c:3710
+#: calendar/gui/e-day-view.c:3746 calendar/gui/e-week-view.c:3592
+#: calendar/gui/e-week-view.c:3622 ui/evolution-addressbook.xml.h:37
+#: ui/evolution-calendar.xml.h:32 ui/evolution-composer-entries.xml.h:9
+#: ui/evolution-mail-list.xml.h:29 ui/evolution-tasks.xml.h:19
 #, fuzzy
 msgid "_Paste"
 msgstr "Enganxa"
 
-#: calendar/gui/e-calendar-table.c:1001
+#: calendar/gui/e-calendar-table.c:970
 #, fuzzy
 msgid "_Assign Task"
 msgstr "_Tasca (FIXME)"
 
-#: calendar/gui/e-calendar-table.c:1002
+#: calendar/gui/e-calendar-table.c:971
 #, fuzzy
 msgid "_Forward as iCalendar"
 msgstr "FIXME: Reenvia com a v_Calendar"
 
-#: calendar/gui/e-calendar-table.c:1003
+#: calendar/gui/e-calendar-table.c:972
 #, fuzzy
 msgid "_Mark as Complete"
 msgstr "Marca com a completa"
 
-#: calendar/gui/e-calendar-table.c:1004
+#: calendar/gui/e-calendar-table.c:973
 #, fuzzy
 msgid "_Mark Selected Tasks as Complete"
 msgstr "Marca com a completa"
 
-#: calendar/gui/e-calendar-table.c:1009 calendar/gui/e-calendar-table.c:1027
+#: calendar/gui/e-calendar-table.c:978
 #, fuzzy
 msgid "_Delete Selected Tasks"
 msgstr "Suprimeix la tasca"
 
-#: calendar/gui/e-calendar-table.c:1341 calendar/gui/e-cal-view.c:253
+#: calendar/gui/e-calendar-table.c:1265 calendar/gui/e-day-view.c:7929
+#: calendar/gui/e-week-view.c:4335
 msgid "Updating objects"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:1424
+#: calendar/gui/e-calendar-table.c:1348
 #: calendar/gui/e-calendar-table.etspec.h:6
 #, fuzzy
 msgid "Click to add a task"
 msgstr "Feu clic aquí per a la llibreta d'adreces"
 
-#: calendar/gui/e-calendar-table.etspec.h:2
-#, fuzzy, no-c-format
-msgid "% Complete"
-msgstr "% comp_let:"
-
 #: calendar/gui/e-calendar-table.etspec.h:3
 msgid "Alarms"
 msgstr "Alarmes"
 
-#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:1173
-#: camel/camel-filter-driver.c:1268 mail/mail-send-recv.c:578
+#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:1156
+#: camel/camel-filter-driver.c:1251
 #, fuzzy
 msgid "Complete"
 msgstr "% comp_let:"
@@ -5690,14 +5739,14 @@ msgid "Completion Date"
 msgstr "Completat"
 
 #: calendar/gui/e-calendar-table.etspec.h:9
-#, fuzzy
-msgid "Description"
-msgstr "Descripció:"
-
-#: calendar/gui/e-calendar-table.etspec.h:10
 msgid "Due Date"
 msgstr "Data de venciment"
 
+#: calendar/gui/e-calendar-table.etspec.h:10
+#, fuzzy
+msgid "End Date"
+msgstr "Hora de _finalització:"
+
 #: calendar/gui/e-calendar-table.etspec.h:11
 msgid "Geographical Position"
 msgstr ""
@@ -5706,706 +5755,651 @@ msgstr ""
 msgid "Priority"
 msgstr "Prioritat"
 
-#: calendar/gui/e-calendar-table.etspec.h:13
+#: calendar/gui/e-calendar-table.etspec.h:14
 #, fuzzy
 msgid "Start Date"
 msgstr "Data d'ini_ci:"
 
-#: calendar/gui/e-calendar-table.etspec.h:14
-#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:36
-#: mail/message-list.etspec.h:12
-#, fuzzy
-msgid "Status"
-msgstr "_Estat:"
-
-#: calendar/gui/e-calendar-table.etspec.h:15
+#: calendar/gui/e-calendar-table.etspec.h:16
 #: my-evolution/component-factory.c:56 shell/e-shell.c:750
 #: shell/e-shortcuts.c:1082
 #, fuzzy
 msgid "Summary"
 msgstr "R_esum"
 
-#: calendar/gui/e-calendar-table.etspec.h:16
+#: calendar/gui/e-calendar-table.etspec.h:17
 #, fuzzy
 msgid "Task sort"
 msgstr "Tasques"
 
-#: calendar/gui/e-calendar-table.etspec.h:19 mail/mail-config.glade.h:171
-#, fuzzy
-msgid "color"
-msgstr "Colors"
-
-#: calendar/gui/e-calendar-table.etspec.h:20
-#, fuzzy
-msgid "component"
-msgstr "Cites:"
-
-#: calendar/gui/e-cal-model.c:293 calendar/gui/e-cal-model.c:296
-#: calendar/gui/e-itip-control.c:1062 calendar/gui/e-itip-control.c:1278
-#: camel/camel-gpg-context.c:1574 camel/camel-gpg-context.c:1625
-#: camel/camel-tcp-stream-openssl.c:631
-#: camel/providers/smtp/camel-smtp-transport.c:172
-#: camel/providers/smtp/camel-smtp-transport.c:227
-#: widgets/misc/e-charset-picker.c:60
-msgid "Unknown"
-msgstr "Desconegut"
-
-#: calendar/gui/e-cal-model.c:828
-#, fuzzy
-msgid "Recurring"
-msgstr "Recurrència"
+#. strftime format of a weekday, a date and a time, 24-hour.
+#: calendar/gui/e-cell-date-edit-text.c:118 e-util/e-time-utils.c:167
+#: e-util/e-time-utils.c:380
+msgid "%a %m/%d/%Y %H:%M:%S"
+msgstr "%a %d/%m/%Y %H:%M:%S"
 
-#: calendar/gui/e-cal-model.c:830
-#, fuzzy
-msgid "Assigned"
-msgstr "Assigna una puntuació"
+#. strftime format of a weekday, a date and a time, 12-hour.
+#: calendar/gui/e-cell-date-edit-text.c:121 e-util/e-time-utils.c:162
+#: e-util/e-time-utils.c:389
+msgid "%a %m/%d/%Y %I:%M:%S %p"
+msgstr "%a %d/%m/%Y %I:%M:%S %p"
 
-#: calendar/gui/e-cal-model.c:832 calendar/gui/e-cal-model-tasks.c:933
-msgid "Yes"
+#: calendar/gui/e-cell-date-edit-text.c:126
+#, c-format
+msgid ""
+"The date must be entered in the format: \n"
+"\n"
+"%s"
 msgstr ""
+"La data s'ha d'introduir amb el format: \n"
+"\n"
+"%s"
 
-#: calendar/gui/e-cal-model.c:832 calendar/gui/e-cal-model-tasks.c:933
-#, fuzzy
-msgid "No"
-msgstr "Ara"
-
-#: calendar/gui/e-cal-model-tasks.c:275
-msgid "N"
-msgstr "N"
+#: calendar/gui/e-day-view-time-item.c:532
+#, c-format
+msgid "%02i minute divisions"
+msgstr "%02i divisions de minut"
 
-#: calendar/gui/e-cal-model-tasks.c:275
-msgid "S"
-msgstr "S"
+#. strftime format %A = full weekday name, %d = day of month,
+#. %B = full month name. Don't use any other specifiers.
+#: calendar/gui/e-day-view-top-item.c:261 calendar/gui/e-day-view.c:1421
+#: calendar/gui/e-week-view-main-item.c:316 calendar/gui/print.c:1525
+msgid "%A %d %B"
+msgstr "%A, %d de %B"
 
-#: calendar/gui/e-cal-model-tasks.c:277
-msgid "E"
-msgstr "E"
+#. strftime format %d = day of month, %b = abbreviated month name.
+#. Don't use any other specifiers.
+#: calendar/gui/e-day-view-top-item.c:269 calendar/gui/e-day-view.c:1454
+#: calendar/gui/e-week-view-main-item.c:339
+msgid "%d %b"
+msgstr "%d %b"
 
-#: calendar/gui/e-cal-model-tasks.c:277
-msgid "W"
-msgstr "O"
+#. String to use in 12-hour time format for times in the morning.
+#: calendar/gui/e-day-view.c:636 calendar/gui/e-week-view.c:350
+#: calendar/gui/print.c:809
+msgid "am"
+msgstr "am"
 
-#: calendar/gui/e-cal-model-tasks.c:550
-msgid ""
-"The geographical position must be entered in the format: \n"
-"\n"
-"45.436845,125.862501"
-msgstr ""
-"La posició geogràfica s'ha d'introduir amb el format: \n"
-"\n"
-"45.436845,125.862501"
+#. String to use in 12-hour time format for times in the afternoon.
+#: calendar/gui/e-day-view.c:639 calendar/gui/e-week-view.c:353
+#: calendar/gui/print.c:811
+msgid "pm"
+msgstr "pm"
 
-#: calendar/gui/e-cal-view.c:1094 calendar/gui/e-cal-view.c:1184
+#: calendar/gui/e-day-view.c:3694
 #, fuzzy
-msgid "New _Appointment..."
+msgid "New _Appointment"
 msgstr "Nova cita..."
 
-#: calendar/gui/e-cal-view.c:1095 calendar/gui/e-cal-view.c:1186
+#: calendar/gui/e-day-view.c:3696 calendar/gui/e-week-view.c:3582
 #, fuzzy
 msgid "New All Day _Event"
 msgstr "Esdeveniment per a _tot el dia"
 
-#: calendar/gui/e-cal-view.c:1096 calendar/gui/e-cal-view.c:1188
+#: calendar/gui/e-day-view.c:3698 calendar/gui/e-week-view.c:3583
 #, fuzzy
 msgid "New Meeting"
 msgstr "Cancel·lat"
 
-#: calendar/gui/e-cal-view.c:1097 calendar/gui/e-cal-view.c:1190
+#: calendar/gui/e-day-view.c:3700 calendar/gui/e-week-view.c:3584
 #, fuzzy
 msgid "New Task"
 msgstr "Tasca"
 
-#: calendar/gui/e-cal-view.c:1111 calendar/gui/e-cal-view.c:1180
+#: calendar/gui/e-day-view.c:3705 ui/evolution-comp-editor.xml.h:11
+msgid "Print..."
+msgstr "Imprimeix..."
+
+#: calendar/gui/e-day-view.c:3717 calendar/gui/e-week-view.c:3598
 #: ui/evolution-calendar.xml.h:13
 #, fuzzy
 msgid "Go to _Today"
 msgstr "Vés a avui"
 
-#: calendar/gui/e-cal-view.c:1112 calendar/gui/e-cal-view.c:1182
+#: calendar/gui/e-day-view.c:3719 calendar/gui/e-week-view.c:3599
 #, fuzzy
 msgid "_Go to Date..."
 msgstr "Vés a una data"
 
-#: calendar/gui/e-cal-view.c:1116 ui/evolution-calendar.xml.h:38
+#: calendar/gui/e-day-view.c:3724 calendar/gui/e-week-view.c:3603
+#: ui/evolution-calendar.xml.h:34
 #, fuzzy
 msgid "_Publish Free/Busy Information"
 msgstr "Cap informació"
 
-#: calendar/gui/e-cal-view.c:1120 calendar/gui/e-cal-view.c:1200
+#: calendar/gui/e-day-view.c:3729 calendar/gui/e-week-view.c:3607
 #: ui/evolution.xml.h:60
 #, fuzzy
 msgid "_Settings..."
 msgstr "_Paràmetres"
 
-#: calendar/gui/e-cal-view.c:1139
+#: calendar/gui/e-day-view.c:3738 calendar/gui/e-week-view.c:3614
+#: mail/folder-browser.c:1765 ui/evolution-mail-message.xml.h:112
+#, fuzzy
+msgid "_Save As..."
+msgstr "Anomena i desa..."
+
+#: calendar/gui/e-day-view.c:3750 calendar/gui/e-week-view.c:3626
 #, fuzzy
 msgid "_Schedule Meeting..."
 msgstr "Seleccioneu una carpeta"
 
-#: calendar/gui/e-cal-view.c:1140
+#: calendar/gui/e-day-view.c:3751 calendar/gui/e-week-view.c:3627
 #, fuzzy
 msgid "_Forward as iCalendar..."
 msgstr "FIXME: Reenvia com a v_Calendar"
 
-#: calendar/gui/e-cal-view.c:1145
+#: calendar/gui/e-day-view.c:3756 calendar/gui/e-week-view.c:3632
 #, fuzzy
 msgid "Make this Occurrence _Movable"
 msgstr "Fes aquesta cita movible"
 
-#: calendar/gui/e-cal-view.c:1146 calendar/gui/e-cal-view.c:1177
+#: calendar/gui/e-day-view.c:3757 calendar/gui/e-week-view.c:3633
 #, fuzzy
 msgid "Delete this _Occurrence"
 msgstr "Suprimeix-ne aquesta aparició"
 
-#: calendar/gui/e-cal-view.c:1147 calendar/gui/e-cal-view.c:1178
+#: calendar/gui/e-day-view.c:3758 calendar/gui/e-week-view.c:3634
 #, fuzzy
 msgid "Delete _All Occurrences"
 msgstr "Suprimeix-ne totes les aparicions"
 
-#. strftime format of a weekday, a date and a time, 24-hour.
-#: calendar/gui/e-cell-date-edit-text.c:118 e-util/e-time-utils.c:180
-#: e-util/e-time-utils.c:393
-msgid "%a %m/%d/%Y %H:%M:%S"
-msgstr "%a %d/%m/%Y %H:%M:%S"
-
-#. strftime format of a weekday, a date and a time, 12-hour.
-#: calendar/gui/e-cell-date-edit-text.c:121 e-util/e-time-utils.c:175
-#: e-util/e-time-utils.c:402
-msgid "%a %m/%d/%Y %I:%M:%S %p"
-msgstr "%a %d/%m/%Y %I:%M:%S %p"
-
-#: calendar/gui/e-cell-date-edit-text.c:126
-#, c-format
-msgid ""
-"The date must be entered in the format: \n"
-"\n"
-"%s"
-msgstr ""
-"La data s'ha d'introduir amb el format: \n"
-"\n"
-"%s"
-
-#. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:600 calendar/gui/e-week-view.c:326
-#: calendar/gui/print.c:809
-msgid "am"
-msgstr "am"
-
-#. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:603 calendar/gui/e-week-view.c:329
-#: calendar/gui/print.c:811
-msgid "pm"
-msgstr "pm"
-
-#. strftime format %A = full weekday name, %d = day of month,
-#. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view.c:1347 calendar/gui/e-day-view-top-item.c:262
-#: calendar/gui/e-week-view-main-item.c:316 calendar/gui/print.c:1524
-msgid "%A %d %B"
-msgstr "%A, %d de %B"
-
-#. strftime format %d = day of month, %b = abbreviated month name.
-#. Don't use any other specifiers.
-#: calendar/gui/e-day-view.c:1380 calendar/gui/e-day-view-top-item.c:270
-#: calendar/gui/e-week-view-main-item.c:339
-msgid "%d %b"
-msgstr "%d %b"
-
-#: calendar/gui/e-day-view-time-item.c:532
-#, c-format
-msgid "%02i minute divisions"
-msgstr "%02i divisions de minut"
-
-#: calendar/gui/e-itip-control.c:676
+#: calendar/gui/e-itip-control.c:706
 #, fuzzy
 msgid "Yes. (Complex Recurrence)"
 msgstr "Recurrència simple"
 
-#: calendar/gui/e-itip-control.c:688
+#: calendar/gui/e-itip-control.c:718
 #, fuzzy
 msgid "Every day"
 msgstr "Cada"
 
-#: calendar/gui/e-itip-control.c:690
+#: calendar/gui/e-itip-control.c:720
 #, fuzzy, c-format
 msgid "Every %d days"
 msgstr "dies"
 
-#: calendar/gui/e-itip-control.c:696
+#: calendar/gui/e-itip-control.c:726
 #, fuzzy
 msgid "Every week"
 msgstr "Cada"
 
-#: calendar/gui/e-itip-control.c:698
+#: calendar/gui/e-itip-control.c:728
 #, fuzzy, c-format
 msgid "Every %d weeks"
 msgstr "setmanes"
 
-#: calendar/gui/e-itip-control.c:701
+#: calendar/gui/e-itip-control.c:731
 msgid "Every week on "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:703
+#: calendar/gui/e-itip-control.c:733
 #, fuzzy, c-format
 msgid "Every %d weeks on "
 msgstr "setmanes"
 
-#: calendar/gui/e-itip-control.c:711
+#: calendar/gui/e-itip-control.c:741
 #, fuzzy
 msgid " and "
 msgstr "_Envia"
 
-#: calendar/gui/e-itip-control.c:718
+#: calendar/gui/e-itip-control.c:748
 #, c-format
 msgid "The %s day of "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:731
+#: calendar/gui/e-itip-control.c:761
 #, c-format
 msgid "The %s %s of "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:736
+#: calendar/gui/e-itip-control.c:766
 #, fuzzy
 msgid "every month"
 msgstr "mes"
 
-#: calendar/gui/e-itip-control.c:741
+#: calendar/gui/e-itip-control.c:771
 #, c-format
 msgid "every %d months"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:747
+#: calendar/gui/e-itip-control.c:777
 #, fuzzy
 msgid "Every year"
 msgstr "Cada"
 
-#: calendar/gui/e-itip-control.c:749
+#: calendar/gui/e-itip-control.c:779
 #, c-format
 msgid "Every %d years"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:761
+#: calendar/gui/e-itip-control.c:791
 #, c-format
 msgid " a total of %d times"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:769
+#: calendar/gui/e-itip-control.c:799
 msgid ", ending on "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:793
+#: calendar/gui/e-itip-control.c:823
 msgid "<b>Starts:</b> "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:803
+#: calendar/gui/e-itip-control.c:833
 #, fuzzy
 msgid "<b>Ends:</b> "
 msgstr "Hora de _finalització de la reunió:"
 
-#: calendar/gui/e-itip-control.c:823
+#: calendar/gui/e-itip-control.c:853
 #, fuzzy
 msgid "<b>Completed:</b> "
 msgstr "% comp_let:"
 
-#: calendar/gui/e-itip-control.c:833
+#: calendar/gui/e-itip-control.c:863
 #, fuzzy
 msgid "<b>Due:</b> "
 msgstr "Descripció:"
 
-#: calendar/gui/e-itip-control.c:870 calendar/gui/e-itip-control.c:923
+#: calendar/gui/e-itip-control.c:900 calendar/gui/e-itip-control.c:953
 #, fuzzy
 msgid "iCalendar Information"
 msgstr "Cap informació"
 
 #. Title
-#: calendar/gui/e-itip-control.c:885
+#: calendar/gui/e-itip-control.c:915
 #, fuzzy
 msgid "iCalendar Error"
 msgstr "Agenda"
 
-#: calendar/gui/e-itip-control.c:954 calendar/gui/e-itip-control.c:970
-#: calendar/gui/e-itip-control.c:981 calendar/gui/e-itip-control.c:998
+#: calendar/gui/e-itip-control.c:984 calendar/gui/e-itip-control.c:1000
+#: calendar/gui/e-itip-control.c:1011 calendar/gui/e-itip-control.c:1028
 #, fuzzy
 msgid "An unknown person"
 msgstr "Error desconegut"
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:1005
+#: calendar/gui/e-itip-control.c:1035
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1020
+#: calendar/gui/e-itip-control.c:1050
 msgid "<i>None</i>"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1031
+#: calendar/gui/e-itip-control.c:1061
 #, fuzzy
 msgid "Location:"
 msgstr "_Accions"
 
-#. write status
-#: calendar/gui/e-itip-control.c:1045 calendar/gui/e-tasks.c:243
+#: calendar/gui/e-itip-control.c:1075
 #, fuzzy
 msgid "Status:"
 msgstr "_Estat:"
 
-#: calendar/gui/e-itip-control.c:1050 calendar/gui/itip-utils.c:414
+#: calendar/gui/e-itip-control.c:1080 calendar/gui/e-meeting-model.c:286
+#: calendar/gui/e-meeting-model.c:309 calendar/gui/e-meeting-model.c:798
+#: calendar/gui/itip-utils.c:414
 #, fuzzy
 msgid "Accepted"
 msgstr "set"
 
-#: calendar/gui/e-itip-control.c:1054 calendar/gui/itip-utils.c:417
+#: calendar/gui/e-itip-control.c:1084 calendar/gui/itip-utils.c:417
 #, fuzzy
 msgid "Tentatively Accepted"
 msgstr "Tentatiu"
 
-#: calendar/gui/e-itip-control.c:1058 calendar/gui/itip-utils.c:420
-#: calendar/gui/itip-utils.c:446
+#: calendar/gui/e-itip-control.c:1088 calendar/gui/e-meeting-model.c:288
+#: calendar/gui/e-meeting-model.c:311 calendar/gui/e-meeting-model.c:799
+#: calendar/gui/itip-utils.c:420 calendar/gui/itip-utils.c:446
 #, fuzzy
 msgid "Declined"
 msgstr "Suprimeix"
 
-#: calendar/gui/e-itip-control.c:1117 calendar/gui/e-itip-control.c:1145
-#: calendar/gui/e-itip-control.c:1171 calendar/gui/e-itip-control.c:1184
-#: calendar/gui/e-itip-control.c:1197 calendar/gui/e-itip-control.c:1210
+#: calendar/gui/e-itip-control.c:1092 calendar/gui/e-itip-control.c:1300
+#: calendar/gui/e-meeting-model.c:222 calendar/gui/e-meeting-model.c:257
+#: calendar/gui/e-meeting-model.c:322 calendar/gui/e-meeting-model.c:756
+#: calendar/gui/e-meeting-model.c:772 camel/camel-gpg-context.c:1574
+#: camel/camel-gpg-context.c:1625 camel/camel-tcp-stream-openssl.c:634
+#: camel/providers/smtp/camel-smtp-transport.c:173
+#: camel/providers/smtp/camel-smtp-transport.c:228 mail/folder-browser.c:345
+#: mail/mail-display.c:953 widgets/misc/e-charset-picker.c:60
+msgid "Unknown"
+msgstr "Desconegut"
+
+#: calendar/gui/e-itip-control.c:1147 calendar/gui/e-itip-control.c:1175
+#: calendar/gui/e-itip-control.c:1201 calendar/gui/e-itip-control.c:1214
+#: calendar/gui/e-itip-control.c:1227 calendar/gui/e-itip-control.c:1240
 #, fuzzy
 msgid "Choose an action:"
 msgstr "Fitxer de signatura:"
 
-#: calendar/gui/e-itip-control.c:1118
+#: calendar/gui/e-itip-control.c:1148
 #, fuzzy
 msgid "Update"
 msgstr "ha estat després de"
 
-#: calendar/gui/e-itip-control.c:1119 calendar/gui/e-itip-control.c:1150
-#: calendar/gui/e-itip-control.c:1173 calendar/gui/e-itip-control.c:1186
-#: calendar/gui/e-itip-control.c:1199 calendar/gui/e-itip-control.c:1212
+#: calendar/gui/e-itip-control.c:1149 calendar/gui/e-itip-control.c:1180
+#: calendar/gui/e-itip-control.c:1203 calendar/gui/e-itip-control.c:1216
+#: calendar/gui/e-itip-control.c:1229 calendar/gui/e-itip-control.c:1242
 #: shell/e-shell.c:2067 widgets/misc/e-cell-date-edit.c:265
 msgid "OK"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1146
+#: calendar/gui/e-itip-control.c:1176
 #, fuzzy
 msgid "Accept"
 msgstr "set"
 
-#: calendar/gui/e-itip-control.c:1147
+#: calendar/gui/e-itip-control.c:1177
 #, fuzzy
 msgid "Tentatively accept"
 msgstr "Tentatiu"
 
-#: calendar/gui/e-itip-control.c:1148
+#: calendar/gui/e-itip-control.c:1178
 #, fuzzy
 msgid "Decline"
 msgstr "Suprimeix"
 
-#: calendar/gui/e-itip-control.c:1149
-#: calendar/gui/e-meeting-time-sel.etspec.h:8
-msgid "RSVP"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:1172
+#: calendar/gui/e-itip-control.c:1202
 #, fuzzy
 msgid "Send Free/Busy Information"
 msgstr "Cap informació"
 
-#: calendar/gui/e-itip-control.c:1185
+#: calendar/gui/e-itip-control.c:1215
 msgid "Update respondent status"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1198
+#: calendar/gui/e-itip-control.c:1228
 #, fuzzy
 msgid "Send Latest Information"
 msgstr "Cap informació"
 
-#: calendar/gui/e-itip-control.c:1211 calendar/gui/itip-utils.c:434
-#: mail/mail-send-recv.c:388 mail/mail-send-recv.c:440
-#: shell/e-shell-startup-wizard.c:781 shell/evolution-shell-component.c:1185
-#: ui/evolution-mail-global.xml.h:1
+#: calendar/gui/e-itip-control.c:1241 calendar/gui/itip-utils.c:434
+#: mail/mail-send-recv.c:387 mail/mail-send-recv.c:444
+#: shell/evolution-shell-component.c:1182 ui/evolution-mail-global.xml.h:1
 #, fuzzy
 msgid "Cancel"
 msgstr "Cancel·lat"
 
-#: calendar/gui/e-itip-control.c:1300
+#: calendar/gui/e-itip-control.c:1322
 #, fuzzy, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "Cap informació"
 
-#: calendar/gui/e-itip-control.c:1301
+#: calendar/gui/e-itip-control.c:1323
 #, fuzzy
 msgid "Meeting Information"
 msgstr "Cap informació"
 
-#: calendar/gui/e-itip-control.c:1306
+#: calendar/gui/e-itip-control.c:1328
 #, fuzzy, c-format
 msgid "<b>%s</b> requests the presence of %s at a meeting."
 msgstr "_Aquesta és l'adreça de correu"
 
-#: calendar/gui/e-itip-control.c:1308
+#: calendar/gui/e-itip-control.c:1330
 #, fuzzy, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr "_Aquesta és l'adreça de correu"
 
-#: calendar/gui/e-itip-control.c:1309
+#: calendar/gui/e-itip-control.c:1331
 #, fuzzy
 msgid "Meeting Proposal"
 msgstr "Cancel·lat"
 
-#: calendar/gui/e-itip-control.c:1313
+#: calendar/gui/e-itip-control.c:1335
 #, fuzzy, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr "_Aquesta és l'adreça de correu"
 
-#: calendar/gui/e-itip-control.c:1314
+#: calendar/gui/e-itip-control.c:1336
 #, fuzzy
 msgid "Meeting Update"
 msgstr "Hora de _finalització de la reunió:"
 
-#: calendar/gui/e-itip-control.c:1318
+#: calendar/gui/e-itip-control.c:1340
 #, fuzzy, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr "_Aquesta és l'adreça de correu"
 
-#: calendar/gui/e-itip-control.c:1319
+#: calendar/gui/e-itip-control.c:1341
 #, fuzzy
 msgid "Meeting Update Request"
 msgstr "FIXME: Pe_tició de cita"
 
-#: calendar/gui/e-itip-control.c:1326
+#: calendar/gui/e-itip-control.c:1348
 #, fuzzy, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr "_Aquesta és l'adreça de correu"
 
-#: calendar/gui/e-itip-control.c:1327
+#: calendar/gui/e-itip-control.c:1349
 #, fuzzy
 msgid "Meeting Reply"
 msgstr "Cancel·lat"
 
-#: calendar/gui/e-itip-control.c:1334
+#: calendar/gui/e-itip-control.c:1356
 #, fuzzy, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr "_Aquesta és l'adreça de correu"
 
-#: calendar/gui/e-itip-control.c:1335
+#: calendar/gui/e-itip-control.c:1357
 #, fuzzy
 msgid "Meeting Cancellation"
 msgstr "Fitxer de signatura:"
 
-#: calendar/gui/e-itip-control.c:1342 calendar/gui/e-itip-control.c:1409
-#: calendar/gui/e-itip-control.c:1444
+#: calendar/gui/e-itip-control.c:1364 calendar/gui/e-itip-control.c:1431
+#: calendar/gui/e-itip-control.c:1466
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1343
+#: calendar/gui/e-itip-control.c:1365
 #, fuzzy
 msgid "Bad Meeting Message"
 msgstr "_Edita el missatge"
 
-#: calendar/gui/e-itip-control.c:1367
+#: calendar/gui/e-itip-control.c:1389
 #, fuzzy, c-format
 msgid "<b>%s</b> has published task information."
 msgstr "Cap informació"
 
-#: calendar/gui/e-itip-control.c:1368
+#: calendar/gui/e-itip-control.c:1390
 #, fuzzy
 msgid "Task Information"
 msgstr "Cap informació"
 
-#: calendar/gui/e-itip-control.c:1373
+#: calendar/gui/e-itip-control.c:1395
 #, fuzzy, c-format
 msgid "<b>%s</b> requests %s to perform a task."
 msgstr "Cap informació"
 
-#: calendar/gui/e-itip-control.c:1375
+#: calendar/gui/e-itip-control.c:1397
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1376
+#: calendar/gui/e-itip-control.c:1398
 #, fuzzy
 msgid "Task Proposal"
 msgstr "TaskPad"
 
-#: calendar/gui/e-itip-control.c:1380
+#: calendar/gui/e-itip-control.c:1402
 #, fuzzy, c-format
 msgid "<b>%s</b> wishes to add to an existing task."
 msgstr "_Aquesta és l'adreça de correu"
 
-#: calendar/gui/e-itip-control.c:1381
+#: calendar/gui/e-itip-control.c:1403
 #, fuzzy
 msgid "Task Update"
 msgstr "ha estat després de"
 
-#: calendar/gui/e-itip-control.c:1385
+#: calendar/gui/e-itip-control.c:1407
 #, fuzzy, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr "_Aquesta és l'adreça de correu"
 
-#: calendar/gui/e-itip-control.c:1386
+#: calendar/gui/e-itip-control.c:1408
 #, fuzzy
 msgid "Task Update Request"
 msgstr "FIXME: _Petició de tasca"
 
-#: calendar/gui/e-itip-control.c:1393
+#: calendar/gui/e-itip-control.c:1415
 #, fuzzy, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr "_Aquesta és l'adreça de correu"
 
-#: calendar/gui/e-itip-control.c:1394
+#: calendar/gui/e-itip-control.c:1416
 #, fuzzy
 msgid "Task Reply"
 msgstr "Respon"
 
-#: calendar/gui/e-itip-control.c:1401
+#: calendar/gui/e-itip-control.c:1423
 #, fuzzy, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr "_Aquesta és l'adreça de correu"
 
-#: calendar/gui/e-itip-control.c:1402
+#: calendar/gui/e-itip-control.c:1424
 #, fuzzy
 msgid "Task Cancellation"
 msgstr "Cancel·lat"
 
-#: calendar/gui/e-itip-control.c:1410
+#: calendar/gui/e-itip-control.c:1432
 #, fuzzy
 msgid "Bad Task Message"
 msgstr "Agenda"
 
-#: calendar/gui/e-itip-control.c:1429
+#: calendar/gui/e-itip-control.c:1451
 #, fuzzy, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr "Cap informació"
 
-#: calendar/gui/e-itip-control.c:1430
+#: calendar/gui/e-itip-control.c:1452
 #, fuzzy
 msgid "Free/Busy Information"
 msgstr "Cap informació"
 
-#: calendar/gui/e-itip-control.c:1434
+#: calendar/gui/e-itip-control.c:1456
 #, fuzzy, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr "Cap informació"
 
-#: calendar/gui/e-itip-control.c:1435
+#: calendar/gui/e-itip-control.c:1457
 #, fuzzy
 msgid "Free/Busy Request"
 msgstr "Imprimeix el missatge"
 
-#: calendar/gui/e-itip-control.c:1439
+#: calendar/gui/e-itip-control.c:1461
 #, fuzzy, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr "_Aquesta és l'adreça de correu"
 
-#: calendar/gui/e-itip-control.c:1440
+#: calendar/gui/e-itip-control.c:1462
 #, fuzzy
 msgid "Free/Busy Reply"
 msgstr "Imprimeix el missatge"
 
-#: calendar/gui/e-itip-control.c:1445
+#: calendar/gui/e-itip-control.c:1467
 #, fuzzy
 msgid "Bad Free/Busy Message"
 msgstr "Imprimeix el missatge"
 
-#: calendar/gui/e-itip-control.c:1521
+#: calendar/gui/e-itip-control.c:1543
 msgid "The message does not appear to be properly formed"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1584
+#: calendar/gui/e-itip-control.c:1606
 #, fuzzy
 msgid "The message contains only unsupported requests."
 msgstr "S'està afegint un missatge sense cap assumpte"
 
-#: calendar/gui/e-itip-control.c:1615 calendar/gui/e-itip-control.c:1621
+#: calendar/gui/e-itip-control.c:1637 calendar/gui/e-itip-control.c:1643
 msgid "The attachment does not contain a valid calendar message"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1646
+#: calendar/gui/e-itip-control.c:1668
 msgid "The attachment has no viewable calendar items"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1887 calendar/gui/e-itip-control.c:1948
-#: calendar/gui/e-itip-control.c:1986
+#: calendar/gui/e-itip-control.c:1909 calendar/gui/e-itip-control.c:2001
 msgid "Object is invalid and cannot be updated\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1890 calendar/gui/e-itip-control.c:1989
+#: calendar/gui/e-itip-control.c:1912 calendar/gui/e-itip-control.c:2004
 msgid "There was an error on the CORBA system\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1893 calendar/gui/e-itip-control.c:1992
+#: calendar/gui/e-itip-control.c:1915 calendar/gui/e-itip-control.c:2007
 #, fuzzy
 msgid "Object could not be found\n"
 msgstr "No es pot executar el Bug Buddy."
 
-#: calendar/gui/e-itip-control.c:1896
+#: calendar/gui/e-itip-control.c:1918
 #, fuzzy
 msgid "You do not have the right permissions to update the calendar\n"
 msgstr ""
 "No s'ha pogut obrir la carpeta `%s':\n"
 "%s"
 
-#: calendar/gui/e-itip-control.c:1899
+#: calendar/gui/e-itip-control.c:1921
 #, fuzzy
 msgid "Update complete\n"
 msgstr "Data completa:"
 
-#: calendar/gui/e-itip-control.c:1902
+#: calendar/gui/e-itip-control.c:1924
 msgid "Calendar file could not be updated!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1932 calendar/gui/e-itip-control.c:2004
+#: calendar/gui/e-itip-control.c:1953 calendar/gui/e-itip-control.c:2019
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1958
+#: calendar/gui/e-itip-control.c:1974
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1970
+#: calendar/gui/e-itip-control.c:1986
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1995
+#: calendar/gui/e-itip-control.c:2010
 #, fuzzy
 msgid "You don't have the right permissions to update the calendar\n"
 msgstr ""
 "No s'ha pogut obrir la carpeta `%s':\n"
 "%s"
 
-#: calendar/gui/e-itip-control.c:1998
+#: calendar/gui/e-itip-control.c:2013
 #, fuzzy
 msgid "Attendee status updated\n"
 msgstr "Tots els assistents"
 
-#: calendar/gui/e-itip-control.c:2001
+#: calendar/gui/e-itip-control.c:2016
 #, fuzzy
 msgid "Attendee status could not be updated!\n"
 msgstr "Tots els assistents"
 
-#: calendar/gui/e-itip-control.c:2038
+#: calendar/gui/e-itip-control.c:2053
 #, fuzzy
 msgid "Removal Complete"
 msgstr "% comp_let:"
 
-#: calendar/gui/e-itip-control.c:2070 calendar/gui/e-itip-control.c:2120
+#: calendar/gui/e-itip-control.c:2085 calendar/gui/e-itip-control.c:2135
 #, fuzzy
 msgid "Item sent!\n"
 msgstr "Data d'enviament"
 
-#: calendar/gui/e-itip-control.c:2072 calendar/gui/e-itip-control.c:2124
+#: calendar/gui/e-itip-control.c:2087 calendar/gui/e-itip-control.c:2139
 msgid "The item could not be sent!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:2215
+#: calendar/gui/e-itip-control.c:2212
 #, fuzzy
 msgid "Select Calendar Folder"
 msgstr "Seleccioneu una carpeta"
 
-#: calendar/gui/e-itip-control.c:2221
+#: calendar/gui/e-itip-control.c:2219
 #, fuzzy
 msgid "Select Tasks Folder"
 msgstr "Seleccioneu una carpeta"
@@ -6453,295 +6447,266 @@ msgstr ""
 msgid "date-start"
 msgstr "Inici del dia:"
 
-#: calendar/gui/e-meeting-time-sel.c:392
+#: calendar/gui/e-meeting-model.c:79
+msgid "Chair Persons"
+msgstr ""
+
+#: calendar/gui/e-meeting-model.c:80 calendar/gui/e-meeting-model.c:1636
+#, fuzzy
+msgid "Required Participants"
+msgstr "Persones _requerides"
+
+#: calendar/gui/e-meeting-model.c:81
+#, fuzzy
+msgid "Optional Participants"
+msgstr "Persones _requerides"
+
+#: calendar/gui/e-meeting-model.c:82
+#, fuzzy
+msgid "Resources"
+msgstr "Font"
+
+#: calendar/gui/e-meeting-model.c:197 calendar/gui/e-meeting-model.c:214
+#: calendar/gui/e-meeting-model.c:530 calendar/gui/e-meeting-model.c:752
+msgid "Individual"
+msgstr ""
+
+#: calendar/gui/e-meeting-model.c:199 calendar/gui/e-meeting-model.c:216
+#: calendar/gui/e-meeting-model.c:753
+#, fuzzy
+msgid "Group"
+msgstr "Grup %i"
+
+#: calendar/gui/e-meeting-model.c:201 calendar/gui/e-meeting-model.c:218
+#: calendar/gui/e-meeting-model.c:754
+#, fuzzy
+msgid "Resource"
+msgstr "Font"
+
+#: calendar/gui/e-meeting-model.c:203 calendar/gui/e-meeting-model.c:220
+#: calendar/gui/e-meeting-model.c:755
+msgid "Room"
+msgstr ""
+
+#: calendar/gui/e-meeting-model.c:232 calendar/gui/e-meeting-model.c:249
+#: calendar/gui/e-meeting-model.c:768
+#, fuzzy
+msgid "Chair"
+msgstr "Cotxe"
+
+#: calendar/gui/e-meeting-model.c:234 calendar/gui/e-meeting-model.c:251
+#: calendar/gui/e-meeting-model.c:532 calendar/gui/e-meeting-model.c:769
+#, fuzzy
+msgid "Required Participant"
+msgstr "Persones _requerides"
+
+#: calendar/gui/e-meeting-model.c:236 calendar/gui/e-meeting-model.c:253
+#: calendar/gui/e-meeting-model.c:770
+msgid "Optional Participant"
+msgstr ""
+
+#: calendar/gui/e-meeting-model.c:238 calendar/gui/e-meeting-model.c:255
+#: calendar/gui/e-meeting-model.c:771
+msgid "Non-Participant"
+msgstr ""
+
+#: calendar/gui/e-meeting-model.c:284 calendar/gui/e-meeting-model.c:307
+#: calendar/gui/e-meeting-model.c:540 calendar/gui/e-meeting-model.c:797
+#, fuzzy
+msgid "Needs Action"
+msgstr "Elimina una acció"
+
+#: calendar/gui/e-meeting-model.c:290 calendar/gui/e-meeting-model.c:313
+#: calendar/gui/e-meeting-model.c:800 calendar/gui/e-meeting-time-sel.c:405
 msgid "Tentative"
 msgstr "Tentatiu"
 
-#: calendar/gui/e-meeting-time-sel.c:394 designs/OOA/ooa.glade.h:11
+#: calendar/gui/e-meeting-model.c:292 calendar/gui/e-meeting-model.c:315
+#: calendar/gui/e-meeting-model.c:801
+#, fuzzy
+msgid "Delegated"
+msgstr "Suprimeix"
+
+#: calendar/gui/e-meeting-model.c:296 calendar/gui/e-meeting-model.c:319
+#, fuzzy
+msgid "In Process"
+msgstr "En procés"
+
+#. This is a strftime() format string %A = full weekday name,
+#. %B = full month name, %d = month day, %Y = full year.
+#: calendar/gui/e-meeting-time-sel-item.c:458
+#: calendar/gui/e-meeting-time-sel.c:2098
+msgid "%A, %B %d, %Y"
+msgstr "%A, %d de %B de %Y"
+
+#. This is a strftime() format string %a = abbreviated weekday
+#. name, %m = month number, %d = month day, %Y = full year.
+#: calendar/gui/e-meeting-time-sel-item.c:462
+#: calendar/gui/e-meeting-time-sel.c:2131 e-util/e-time-utils.c:190
+#: e-util/e-time-utils.c:283 e-util/e-time-utils.c:371
+msgid "%a %m/%d/%Y"
+msgstr "%a %d/%m/%Y"
+
+#. This is a strftime() format string %m = month number,
+#. %d = month day, %Y = full year.
+#: calendar/gui/e-meeting-time-sel-item.c:466 e-util/e-time-utils.c:225
+#: e-util/e-time-utils.c:286 widgets/misc/e-dateedit.c:1582
+msgid "%m/%d/%Y"
+msgstr "%d/%m/%Y"
+
+#: calendar/gui/e-meeting-time-sel.c:407 designs/OOA/ooa.glade.h:11
 msgid "Out of Office"
 msgstr "Fora de l'oficina"
 
-#: calendar/gui/e-meeting-time-sel.c:395
+#: calendar/gui/e-meeting-time-sel.c:408
 msgid "No Information"
 msgstr "Cap informació"
 
-#: calendar/gui/e-meeting-time-sel.c:434
+#: calendar/gui/e-meeting-time-sel.c:447
 msgid "_Options"
 msgstr "_Opcions"
 
-#: calendar/gui/e-meeting-time-sel.c:451
+#: calendar/gui/e-meeting-time-sel.c:464
 msgid "Show _Only Working Hours"
 msgstr "Mostra _només les hores de treball"
 
-#: calendar/gui/e-meeting-time-sel.c:461
+#: calendar/gui/e-meeting-time-sel.c:474
 msgid "Show _Zoomed Out"
 msgstr "Mostra-ho reduint el zoom"
 
-#: calendar/gui/e-meeting-time-sel.c:476
+#: calendar/gui/e-meeting-time-sel.c:489
 msgid "_Update Free/Busy"
 msgstr "_Actualitza lliure/ocupat"
 
-#: calendar/gui/e-meeting-time-sel.c:491
+#: calendar/gui/e-meeting-time-sel.c:504
 msgid "_<<"
 msgstr "_<<"
 
-#: calendar/gui/e-meeting-time-sel.c:509
+#: calendar/gui/e-meeting-time-sel.c:522
 msgid "_Autopick"
 msgstr "Tria automàtica"
 
-#: calendar/gui/e-meeting-time-sel.c:524
+#: calendar/gui/e-meeting-time-sel.c:537
 msgid ">_>"
 msgstr ">_>"
 
-#: calendar/gui/e-meeting-time-sel.c:541
+#: calendar/gui/e-meeting-time-sel.c:554
 msgid "_All People and Resources"
 msgstr "_Totes les persones i recursos"
 
-#: calendar/gui/e-meeting-time-sel.c:550
+#: calendar/gui/e-meeting-time-sel.c:563
 msgid "All _People and One Resource"
 msgstr "Totes les persones i un recurs"
 
-#: calendar/gui/e-meeting-time-sel.c:559
+#: calendar/gui/e-meeting-time-sel.c:572
 msgid "_Required People"
 msgstr "Persones _requerides"
 
-#: calendar/gui/e-meeting-time-sel.c:568
+#: calendar/gui/e-meeting-time-sel.c:581
 msgid "Required People and _One Resource"
 msgstr "Persones requerides i _un recurs"
 
-#: calendar/gui/e-meeting-time-sel.c:587
+#: calendar/gui/e-meeting-time-sel.c:600
 msgid "Meeting _start time:"
 msgstr "Hora d'_inici de la reunió:"
 
-#: calendar/gui/e-meeting-time-sel.c:607
+#: calendar/gui/e-meeting-time-sel.c:620
 msgid "Meeting _end time:"
 msgstr "Hora de _finalització de la reunió:"
 
-#. This is a strftime() format string %A = full weekday name,
-#. %B = full month name, %d = month day, %Y = full year.
-#: calendar/gui/e-meeting-time-sel.c:2054
-#: calendar/gui/e-meeting-time-sel-item.c:452
-msgid "%A, %B %d, %Y"
-msgstr "%A, %d de %B de %Y"
-
-#. This is a strftime() format string %a = abbreviated weekday name,
-#. %m = month number, %d = month day, %Y = full year.
-#: calendar/gui/e-meeting-time-sel.c:2087
-#: calendar/gui/e-meeting-time-sel-item.c:456 e-util/e-time-utils.c:203
-#: e-util/e-time-utils.c:296 e-util/e-time-utils.c:384
-msgid "%a %m/%d/%Y"
-msgstr "%a %d/%m/%Y"
-
-#: calendar/gui/e-meeting-time-sel.etspec.h:1
-#, fuzzy
-msgid "Attendee"
-msgstr "Tots els assistents"
-
-#: calendar/gui/e-meeting-time-sel.etspec.h:2
-#, fuzzy
-msgid "Click here to add an attendee"
-msgstr "<feu clic aquí per seleccionar una data>"
-
-#: calendar/gui/e-meeting-time-sel.etspec.h:3
-#, fuzzy
-msgid "Common Name"
-msgstr "Completat"
-
-#: calendar/gui/e-meeting-time-sel.etspec.h:4
-#, fuzzy
-msgid "Delegated From"
-msgstr "Suprimeix"
-
-#: calendar/gui/e-meeting-time-sel.etspec.h:5
-#, fuzzy
-msgid "Delegated To"
-msgstr "Suprimeix"
-
-#: calendar/gui/e-meeting-time-sel.etspec.h:6
-#, fuzzy
-msgid "Language"
-msgstr "Busca"
-
-#: calendar/gui/e-meeting-time-sel.etspec.h:7
-#, fuzzy
-msgid "Member"
-msgstr "desembre"
-
-#. This is a strftime() format string %m = month number,
-#. %d = month day, %Y = full year.
-#: calendar/gui/e-meeting-time-sel-item.c:460 e-util/e-time-utils.c:238
-#: e-util/e-time-utils.c:299 widgets/misc/e-dateedit.c:1607
-msgid "%m/%d/%Y"
-msgstr "%d/%m/%Y"
-
-#: calendar/gui/e-tasks.c:151
-#, fuzzy
-msgid "invalid time"
-msgstr "Hora de _finalització:"
-
-#: calendar/gui/e-tasks.c:221
-#, fuzzy
-msgid "Start Date:"
-msgstr "Data d'ini_ci:"
-
-#: calendar/gui/e-tasks.c:237
-msgid "Due Date:"
-msgstr "Data de venciment:"
-
-#. write priority
-#: calendar/gui/e-tasks.c:265
-#, fuzzy
-msgid "Priority:"
-msgstr "_Prioritat:"
-
-#. URL
-#: calendar/gui/e-tasks.c:321
-#, fuzzy
-msgid "Web Page:"
-msgstr "Pàgina"
-
-#: calendar/gui/e-tasks.c:702
+#: calendar/gui/e-tasks.c:360 calendar/gui/gnome-cal.c:2006
+#: calendar/gui/gnome-cal.c:2017
 #, fuzzy, c-format
 msgid "Opening tasks at %s"
 msgstr "S'estan escanejant les carpetes de \"%s\""
 
-#: calendar/gui/e-tasks.c:731 calendar/gui/tasks-control.c:201
+#: calendar/gui/e-tasks.c:389 calendar/gui/tasks-control.c:201
 #, fuzzy, c-format
 msgid "Could not load the tasks in `%s'"
 msgstr "No s'ha pogut carregar l'agenda en `%s'"
 
-#: calendar/gui/e-tasks.c:746
+#: calendar/gui/e-tasks.c:404
 #, c-format
 msgid "The method required to load `%s' is not supported"
 msgstr "El mètode necessari per carregar `%s' no està suportat"
 
-#: calendar/gui/e-tasks.c:760 calendar/gui/gnome-cal.c:1730
+#: calendar/gui/e-tasks.c:418 calendar/gui/gnome-cal.c:1509
 #, fuzzy, c-format
 msgid "You don't have permission to open the folder in `%s'"
 msgstr ""
 "No s'ha pogut obrir la carpeta `%s':\n"
 "%s"
 
-#: calendar/gui/e-tasks.c:828 calendar/gui/gnome-cal.c:1944
+#: calendar/gui/e-tasks.c:486 calendar/gui/gnome-cal.c:1728
 #, fuzzy, c-format
 msgid ""
 "Error on %s:\n"
 " %s"
 msgstr "Error en carregar el fitxer: %s"
 
-#: calendar/gui/e-tasks.c:899
+#: calendar/gui/e-tasks.c:557
 #, fuzzy
 msgid "Completing tasks..."
 msgstr "Completat"
 
-#: calendar/gui/e-tasks.c:922
+#: calendar/gui/e-tasks.c:580
 #, fuzzy
 msgid "Deleting selected objects..."
 msgstr "Suprimeix un contacte"
 
-#: calendar/gui/e-tasks.c:1017
+#: calendar/gui/e-tasks.c:675
 #, fuzzy
 msgid "Expunging"
 msgstr "_Esborra"
 
-#: calendar/gui/gnome-cal.c:1702
+#: calendar/gui/e-week-view.c:3581
+#, fuzzy
+msgid "New _Appointment..."
+msgstr "Nova cita..."
+
+#: calendar/gui/gnome-cal.c:1481
 #, fuzzy, c-format
 msgid "Could not open the folder in `%s'"
 msgstr ""
 "No s'ha pogut obrir la carpeta `%s':\n"
 "%s"
 
-#: calendar/gui/gnome-cal.c:1716
+#: calendar/gui/gnome-cal.c:1495
 #, fuzzy, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr "El mètode necessari per carregar `%s' no està suportat"
 
-#: calendar/gui/gnome-cal.c:1772
+#: calendar/gui/gnome-cal.c:1556
 #, fuzzy, c-format
 msgid "Adding alarms for %s"
 msgstr "Alarmes"
 
-#: calendar/gui/gnome-cal.c:1964
+#: calendar/gui/gnome-cal.c:1748
 #, c-format
 msgid ""
-"The task backend for\n"
+"The calendar backend for\n"
 "%s\n"
 " has crashed. You will have to restart Evolution in order to use it again"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1970
+#: calendar/gui/gnome-cal.c:1757
 #, c-format
 msgid ""
-"The calendar backend for\n"
+"The task backend for\n"
 "%s\n"
 " has crashed. You will have to restart Evolution in order to use it again"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:2176
+#: calendar/gui/gnome-cal.c:1988
 #, fuzzy, c-format
 msgid "Opening calendar at %s"
 msgstr "Obre l'agenda"
 
-#: calendar/gui/gnome-cal.c:2197
+#: calendar/gui/gnome-cal.c:2028
 #, fuzzy
 msgid "Opening default tasks folder"
 msgstr "S'estan escanejant les carpetes de \"%s\""
 
-#: calendar/gui/gnome-cal.c:3094
-#, fuzzy, c-format
-msgid "Purging event %s"
-msgstr "S'està examinant %s"
-
-#: calendar/gui/gnome-cal.c:3178
-#, fuzzy
-msgid "Purging"
-msgstr "Tasca"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-#, fuzzy
-msgid "Calendar and Tasks"
-msgstr "_Paràmetres"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-msgid "Configure your timezone, Calendar and Task List here "
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
-#, fuzzy
-msgid "Evolution Calendar and Tasks"
-msgstr "_Paràmetres"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
-#, fuzzy
-msgid "Evolution Calendar and Tasks component"
-msgstr ""
-"No es pot inicialitzar el component de resum del correu de l'Evolution."
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
-#, fuzzy
-msgid "Evolution Calendar configuration control"
-msgstr "Configuració del correu"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
-#, fuzzy
-msgid "Evolution Calendar scheduling message viewer"
-msgstr "Conducte de l'agenda de l'Evolution"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
-#, fuzzy
-msgid "Evolution Calendar viewer"
-msgstr "Conducte de l'agenda de l'Evolution"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
-#, fuzzy
-msgid "Evolution Calendar/Task editor"
-msgstr "Conducte de l'agenda de l'Evolution"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
-#, fuzzy
-msgid "Evolution Tasks viewer"
-msgstr "Conducte de les coses per fer de l'Evolution"
-
 #: calendar/gui/goto-dialog.glade.h:1
 #, fuzzy
 msgid "April"
@@ -6870,7 +6835,7 @@ msgstr "Cap informació"
 msgid "iCalendar information"
 msgstr "Cap informació"
 
-#: calendar/gui/itip-utils.c:668
+#: calendar/gui/itip-utils.c:667
 msgid "You must be an attendee of the event."
 msgstr ""
 
@@ -6903,87 +6868,88 @@ msgid "Sa"
 msgstr "Ds"
 
 #. Day
-#: calendar/gui/print.c:1882
+#: calendar/gui/print.c:1875
 #, fuzzy
 msgid "Selected day (%a %b %d %Y)"
 msgstr "Avui (%a, %d de %b de %Y)"
 
-#: calendar/gui/print.c:1907 calendar/gui/print.c:1911
+#: calendar/gui/print.c:1900 calendar/gui/print.c:1904
 msgid "%a %b %d"
 msgstr "%a, %d de %b"
 
-#: calendar/gui/print.c:1908
+#: calendar/gui/print.c:1901
 msgid "%a %d %Y"
 msgstr "%a %d %Y"
 
-#: calendar/gui/print.c:1912 calendar/gui/print.c:1914
-#: calendar/gui/print.c:1915
+#: calendar/gui/print.c:1905 calendar/gui/print.c:1907
+#: calendar/gui/print.c:1908
 msgid "%a %b %d %Y"
 msgstr "%a, %d de %b de %Y"
 
-#: calendar/gui/print.c:1919
+#: calendar/gui/print.c:1912
 #, fuzzy, c-format
 msgid "Selected week (%s - %s)"
 msgstr "Aquesta setmana (%s - %s)"
 
 #. Month
-#: calendar/gui/print.c:1927
+#: calendar/gui/print.c:1920
 #, fuzzy
 msgid "Selected month (%b %Y)"
 msgstr "Aquest mes (%b %Y)"
 
 #. Year
-#: calendar/gui/print.c:1934
+#: calendar/gui/print.c:1927
 #, fuzzy
 msgid "Selected year (%Y)"
 msgstr "Enguany (%Y)"
 
-#: calendar/gui/print.c:2262
+#: calendar/gui/print.c:2255
 #, fuzzy
 msgid "Task"
 msgstr "Tasca"
 
-#: calendar/gui/print.c:2321
+#: calendar/gui/print.c:2314
 #, fuzzy, c-format
 msgid "Status: %s"
 msgstr "_Estat:"
 
-#: calendar/gui/print.c:2338
+#: calendar/gui/print.c:2331
 #, fuzzy, c-format
 msgid "Priority: %s"
 msgstr "_Prioritat:"
 
-#: calendar/gui/print.c:2350
+#: calendar/gui/print.c:2343
 #, fuzzy, c-format
 msgid "Percent Complete: %i"
 msgstr "Marca la tasca com a completa"
 
-#: calendar/gui/print.c:2362
+#: calendar/gui/print.c:2355
 #, fuzzy, c-format
 msgid "URL: %s"
 msgstr "URL:"
 
-#: calendar/gui/print.c:2376
+#: calendar/gui/print.c:2369
 #, fuzzy, c-format
 msgid "Categories: %s"
 msgstr "categories"
 
-#: calendar/gui/print.c:2387
+#: calendar/gui/print.c:2380
 #, fuzzy
 msgid "Contacts: "
 msgstr "_Contactes..."
 
-#: calendar/gui/print.c:2525 calendar/gui/print.c:2611
-#: calendar/gui/tasks-control.c:564 my-evolution/e-summary.c:649
+#: calendar/gui/print.c:2518 calendar/gui/print.c:2604
+#: calendar/gui/tasks-control.c:581 mail/mail-callbacks.c:2948
+#: my-evolution/e-summary.c:649
 msgid "Print Preview"
 msgstr "Previsualització d'impressió"
 
-#: calendar/gui/print.c:2559
+#: calendar/gui/print.c:2552
 #, fuzzy
 msgid "Print Item"
 msgstr "Imprimeix aquest element"
 
-#: calendar/gui/print.c:2632
+#: calendar/gui/print.c:2625
 #, fuzzy
 msgid "Print Setup"
 msgstr "Configuració de la pàgina:"
@@ -6993,7 +6959,7 @@ msgstr "Configuració de la pàgina:"
 msgid "The URI of the tasks folder to display"
 msgstr "La URI que mostrarà l'agenda"
 
-#: calendar/gui/tasks-control.c:448
+#: calendar/gui/tasks-control.c:465
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
 "continue, you will not be able to recover these tasks.\n"
@@ -7001,12 +6967,12 @@ msgid ""
 "Really erase these tasks?"
 msgstr ""
 
-#: calendar/gui/tasks-control.c:451
+#: calendar/gui/tasks-control.c:468
 #, fuzzy
 msgid "Do not ask me again."
 msgstr "Envia aquest missatge"
 
-#: calendar/gui/tasks-control.c:593
+#: calendar/gui/tasks-control.c:610
 #, fuzzy
 msgid "Print Tasks"
 msgstr "Imprimeix l'agenda"
@@ -8733,32 +8699,32 @@ msgstr ""
 msgid "Pacific/Yap"
 msgstr ""
 
-#: camel/camel-cipher-context.c:167
+#: camel/camel-cipher-context.c:178
 #, fuzzy
 msgid "Signing is not supported by this cipher"
 msgstr "El tipus indicat no es suporta en aquest emmagatzemament"
 
-#: camel/camel-cipher-context.c:207
+#: camel/camel-cipher-context.c:218
 #, fuzzy
 msgid "Verifying is not supported by this cipher"
 msgstr "El tipus indicat no es suporta en aquest emmagatzemament"
 
-#: camel/camel-cipher-context.c:251
+#: camel/camel-cipher-context.c:262
 #, fuzzy
 msgid "Encryption is not supported by this cipher"
 msgstr "El tipus indicat no es suporta en aquest emmagatzemament"
 
-#: camel/camel-cipher-context.c:293
+#: camel/camel-cipher-context.c:304
 #, fuzzy
 msgid "Decryption is not supported by this cipher"
 msgstr "El tipus indicat no es suporta en aquest emmagatzemament"
 
-#: camel/camel-cipher-context.c:331
+#: camel/camel-cipher-context.c:342
 #, fuzzy
 msgid "You may not import keys with this cipher"
 msgstr "El tipus indicat no es suporta en aquest emmagatzemament"
 
-#: camel/camel-cipher-context.c:363
+#: camel/camel-cipher-context.c:374
 #, fuzzy
 msgid "You may not export keys with this cipher"
 msgstr "El tipus indicat no es suporta en aquest emmagatzemament"
@@ -8793,11 +8759,7 @@ msgstr ""
 msgid "Resynchronizing with server"
 msgstr ""
 
-#: camel/camel-disco-folder.c:90
-msgid "Downloading new messages for offline mode"
-msgstr ""
-
-#: camel/camel-disco-folder.c:351
+#: camel/camel-disco-folder.c:278
 #, fuzzy, c-format
 msgid "Preparing folder '%s' for offline"
 msgstr "S'estan escanejant les carpetes de \"%s\""
@@ -8818,62 +8780,62 @@ msgstr "No s'ha pogut crear el conducte a %s: %s"
 msgid "Failed to create create child process '%s': %s"
 msgstr "Missatge de _correu (FIXME)"
 
-#: camel/camel-filter-driver.c:759
+#: camel/camel-filter-driver.c:744
 #, fuzzy, c-format
 msgid "Invalid message stream received from %s: %s"
 msgstr "No s'ha pogut crear el directori %s: %s"
 
-#: camel/camel-filter-driver.c:940 camel/camel-filter-driver.c:949
+#: camel/camel-filter-driver.c:923 camel/camel-filter-driver.c:932
 #, fuzzy
 msgid "Syncing folders"
 msgstr "S'està sincronitzant \"%s\""
 
-#: camel/camel-filter-driver.c:1038 camel/camel-filter-driver.c:1411
+#: camel/camel-filter-driver.c:1021 camel/camel-filter-driver.c:1394
 #, fuzzy, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Error en desar el fitxer: %s"
 
-#: camel/camel-filter-driver.c:1047 camel/camel-filter-driver.c:1417
+#: camel/camel-filter-driver.c:1030 camel/camel-filter-driver.c:1400
 #, fuzzy, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Error en desar el fitxer: %s"
 
-#: camel/camel-filter-driver.c:1114
+#: camel/camel-filter-driver.c:1097
 #, fuzzy
 msgid "Unable to open spool folder"
 msgstr "No es pot obrir la llibreta d'adreces"
 
-#: camel/camel-filter-driver.c:1123
+#: camel/camel-filter-driver.c:1106
 #, fuzzy
 msgid "Unable to process spool folder"
 msgstr "No es pot desar el fitxer de llista de grups per a %s: %s"
 
-#: camel/camel-filter-driver.c:1138
+#: camel/camel-filter-driver.c:1121
 #, fuzzy, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "S'està escrivint el missatge %d de %d"
 
-#: camel/camel-filter-driver.c:1142
+#: camel/camel-filter-driver.c:1125
 #, fuzzy
 msgid "Cannot open message"
 msgstr "No es pot recuperar el missatge: %s"
 
-#: camel/camel-filter-driver.c:1143 camel/camel-filter-driver.c:1155
+#: camel/camel-filter-driver.c:1126 camel/camel-filter-driver.c:1138
 #, fuzzy, c-format
 msgid "Failed on message %d"
 msgstr "Missatge de _correu (FIXME)"
 
-#: camel/camel-filter-driver.c:1169 camel/camel-filter-driver.c:1263
+#: camel/camel-filter-driver.c:1152 camel/camel-filter-driver.c:1246
 #, fuzzy
 msgid "Syncing folder"
 msgstr "S'està sincronitzant \"%s\""
 
-#: camel/camel-filter-driver.c:1230
+#: camel/camel-filter-driver.c:1213
 #, fuzzy, c-format
 msgid "Getting message %d of %d"
 msgstr "S'està escrivint el missatge %d de %d"
 
-#: camel/camel-filter-driver.c:1245
+#: camel/camel-filter-driver.c:1228
 #, fuzzy, c-format
 msgid "Failed at message %d of %d"
 msgstr "S'està escrivint el missatge %d de %d"
@@ -8898,66 +8860,61 @@ msgstr "adjunció"
 msgid "Error executing filter search: %s: %s"
 msgstr "Error en desar el fitxer: %s"
 
-#: camel/camel-folder.c:585
-#, c-format
-msgid "Unsupported operation: append message: for %s"
-msgstr ""
-
-#: camel/camel-folder.c:1163
+#: camel/camel-folder-search.c:346
 #, fuzzy, c-format
-msgid "Unsupported operation: search by expression: for %s"
+msgid ""
+"Cannot parse search expression: %s:\n"
+"%s"
 msgstr ""
 "Error en preparar-se per a %s:\n"
 "%s"
 
-#: camel/camel-folder.c:1203
+#: camel/camel-folder-search.c:356
 #, fuzzy, c-format
-msgid "Unsupported operation: search by uids: for %s"
+msgid ""
+"Error executing search expression: %s:\n"
+"%s"
 msgstr ""
 "Error en preparar-se per a %s:\n"
 "%s"
 
-#: camel/camel-folder.c:1321
-#, fuzzy
-msgid "Moving messages"
-msgstr "Còpia de missatges"
+#: camel/camel-folder-search.c:573 camel/camel-folder-search.c:601
+msgid "(match-all) requires a single bool result"
+msgstr ""
 
-#: camel/camel-folder.c:1321
-#, fuzzy
-msgid "Copying messages"
-msgstr "Còpia de missatges"
+#: camel/camel-folder-search.c:653
+#, c-format
+msgid "Performing query on unknown header: %s"
+msgstr ""
 
-#: camel/camel-folder.c:1571
-#, fuzzy
-msgid "Filtering new message(s)"
-msgstr "S'estan recuperant els missatges : %s"
+#: camel/camel-folder.c:583
+#, c-format
+msgid "Unsupported operation: append message: for %s"
+msgstr ""
 
-#: camel/camel-folder-search.c:348
+#: camel/camel-folder.c:1161
 #, fuzzy, c-format
-msgid ""
-"Cannot parse search expression: %s:\n"
-"%s"
+msgid "Unsupported operation: search by expression: for %s"
 msgstr ""
 "Error en preparar-se per a %s:\n"
 "%s"
 
-#: camel/camel-folder-search.c:358
+#: camel/camel-folder.c:1201
 #, fuzzy, c-format
-msgid ""
-"Error executing search expression: %s:\n"
-"%s"
+msgid "Unsupported operation: search by uids: for %s"
 msgstr ""
 "Error en preparar-se per a %s:\n"
 "%s"
 
-#: camel/camel-folder-search.c:569 camel/camel-folder-search.c:598
-msgid "(match-all) requires a single bool result"
-msgstr ""
+#: camel/camel-folder.c:1319
+#, fuzzy
+msgid "Moving messages"
+msgstr "Còpia de missatges"
 
-#: camel/camel-folder-search.c:650
-#, c-format
-msgid "Performing query on unknown header: %s"
-msgstr ""
+#: camel/camel-folder.c:1319
+#, fuzzy
+msgid "Copying messages"
+msgstr "Còpia de missatges"
 
 #: camel/camel-gpg-context.c:762
 #, c-format
@@ -8984,7 +8941,7 @@ msgstr ""
 
 #: camel/camel-gpg-context.c:821 camel/camel-gpg-context.c:1297
 #: camel/camel-gpg-context.c:1403 camel/camel-gpg-context.c:1473
-#: camel/camel-gpg-context.c:1529 mail/mail-send-recv.c:574
+#: camel/camel-gpg-context.c:1529 mail/mail-send-recv.c:577
 #, fuzzy
 msgid "Cancelled."
 msgstr "Cancel·lat"
@@ -9039,6 +8996,26 @@ msgstr "Missatge de _correu (FIXME)"
 msgid "Cannot verify message signature: could not create temp file: %s"
 msgstr "No s'ha pogut crear el conducte: %s"
 
+#: camel/camel-lock-client.c:111
+#, fuzzy, c-format
+msgid "Cannot build locking helper pipe: %s"
+msgstr "No s'ha pogut crear el conducte: %s"
+
+#: camel/camel-lock-client.c:124
+#, fuzzy, c-format
+msgid "Cannot fork locking helper: %s"
+msgstr "No es pot bifurcar %s: %s"
+
+#: camel/camel-lock-client.c:202 camel/camel-lock-client.c:225
+#, c-format
+msgid "Could not lock '%s': protocol error with lock-helper"
+msgstr ""
+
+#: camel/camel-lock-client.c:215
+#, fuzzy, c-format
+msgid "Could not lock '%s'"
+msgstr "No s'ha pogut bifurcar: %s"
+
 #: camel/camel-lock.c:92 camel/camel-lock.c:113
 #, c-format
 msgid "Could not create lock file for %s: %s"
@@ -9061,26 +9038,6 @@ msgstr ""
 msgid "Failed to get lock using flock(2): %s"
 msgstr ""
 
-#: camel/camel-lock-client.c:100
-#, fuzzy, c-format
-msgid "Cannot build locking helper pipe: %s"
-msgstr "No s'ha pogut crear el conducte: %s"
-
-#: camel/camel-lock-client.c:113
-#, fuzzy, c-format
-msgid "Cannot fork locking helper: %s"
-msgstr "No es pot bifurcar %s: %s"
-
-#: camel/camel-lock-client.c:191 camel/camel-lock-client.c:214
-#, c-format
-msgid "Could not lock '%s': protocol error with lock-helper"
-msgstr ""
-
-#: camel/camel-lock-client.c:204
-#, fuzzy, c-format
-msgid "Could not lock '%s'"
-msgstr "No s'ha pogut bifurcar: %s"
-
 #: camel/camel-movemail.c:107
 #, c-format
 msgid "Could not check mail file %s: %s"
@@ -9147,11 +9104,11 @@ msgstr ""
 msgid "Failed to decrypt MIME part: parse error"
 msgstr ""
 
-#: camel/camel-multipart-signed.c:646
+#: camel/camel-multipart-signed.c:644
 msgid "This is a digitally signed message part"
 msgstr ""
 
-#: camel/camel-multipart-signed.c:700
+#: camel/camel-multipart-signed.c:698
 #, fuzzy
 msgid "parse error"
 msgstr "Error d'E/S"
@@ -9226,11 +9183,11 @@ msgstr ""
 "Això us connectarà al servidor POP i utilitzarà el Kerberos 4 per autenticar-"
 "vos-hi."
 
-#: camel/camel-sasl-digest-md5.c:48
+#: camel/camel-sasl-digest-md5.c:46
 msgid "DIGEST-MD5"
 msgstr ""
 
-#: camel/camel-sasl-digest-md5.c:50
+#: camel/camel-sasl-digest-md5.c:48
 #, fuzzy
 msgid ""
 "This option will connect to the server using a secure DIGEST-MD5 password, "
@@ -9329,7 +9286,7 @@ msgstr ""
 #: camel/camel-sasl-gssapi.c:189 camel/camel-sasl-gssapi.c:238
 #: camel/camel-sasl-gssapi.c:274 camel/camel-sasl-gssapi.c:289
 #: camel/camel-sasl-kerberos4.c:219
-#: camel/providers/imap/camel-imap-store.c:1207
+#: camel/providers/imap/camel-imap-store.c:1052
 #, fuzzy
 msgid "Bad authentication response from server."
 msgstr "Resposta inesperada del servidor IMAP: %s"
@@ -9396,24 +9353,24 @@ msgstr ""
 msgid "PLAIN"
 msgstr ""
 
-#: camel/camel-sasl-popb4smtp.c:36
+#: camel/camel-sasl-popb4smtp.c:34
 msgid "POP before SMTP"
 msgstr ""
 
-#: camel/camel-sasl-popb4smtp.c:38
+#: camel/camel-sasl-popb4smtp.c:36
 msgid "This option will authorise a POP connection before attempting SMTP"
 msgstr ""
 
-#: camel/camel-sasl-popb4smtp.c:103
+#: camel/camel-sasl-popb4smtp.c:107
 #, fuzzy
 msgid "POP Source URI"
 msgstr "Font"
 
-#: camel/camel-sasl-popb4smtp.c:107
+#: camel/camel-sasl-popb4smtp.c:111
 msgid "POP Before SMTP auth using an unknown transport"
 msgstr ""
 
-#: camel/camel-sasl-popb4smtp.c:112
+#: camel/camel-sasl-popb4smtp.c:116
 msgid "POP Before SMTP auth using a non-pop source"
 msgstr ""
 
@@ -9422,56 +9379,56 @@ msgstr ""
 msgid "Regular expression compilation failed: %s: %s"
 msgstr "Error en escriure a la bústia de correu temporal: %s"
 
-#: camel/camel-service.c:277
+#: camel/camel-service.c:282
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr "L'URL '%s' necessita un component de nom d'usuari"
 
-#: camel/camel-service.c:285
+#: camel/camel-service.c:290
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr "L'URL '%s' necessita un component d'ordinador central"
 
-#: camel/camel-service.c:293
+#: camel/camel-service.c:298
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr "L'URL '%s' necessita un component de camí"
 
-#: camel/camel-service.c:738
+#: camel/camel-service.c:750
 #, fuzzy, c-format
 msgid "Resolving: %s"
 msgstr "S'està comprovant \"%s\""
 
-#: camel/camel-service.c:769 camel/camel-service.c:893
+#: camel/camel-service.c:783 camel/camel-service.c:915
 #, c-format
 msgid "Failure in name lookup: %s"
 msgstr ""
 
-#: camel/camel-service.c:790 camel/camel-service.c:914
+#: camel/camel-service.c:804
 #, fuzzy, c-format
 msgid "Host lookup failed: cannot create thread: %s"
 msgstr "No s'ha pogut crear el conducte: %s"
 
-#: camel/camel-service.c:803
+#: camel/camel-service.c:818
 #, c-format
 msgid "Host lookup failed: %s: host not found"
 msgstr ""
 
-#: camel/camel-service.c:806
+#: camel/camel-service.c:821
 #, c-format
 msgid "Host lookup failed: %s: unknown reason"
 msgstr ""
 
-#: camel/camel-service.c:860
+#: camel/camel-service.c:880
 #, fuzzy
 msgid "Resolving address"
 msgstr "S'està comprovant \"%s\""
 
-#: camel/camel-service.c:929
+#: camel/camel-service.c:949
 msgid "Host lookup failed: host not found"
 msgstr ""
 
-#: camel/camel-service.c:932
+#: camel/camel-service.c:952
 msgid "Host lookup failed: unknown reason"
 msgstr ""
 
@@ -9483,12 +9440,12 @@ msgstr "Proveïdor de correu de la carpeta virtual"
 msgid "For reading mail as a query of another set of folders"
 msgstr "Per llegir correu com a consulta d'un altre joc de carpetes"
 
-#: camel/camel-session.c:350 camel/camel-session.c:400
+#: camel/camel-session.c:355 camel/camel-session.c:405
 #, c-format
 msgid "No provider available for protocol `%s'"
 msgstr "No hi ha cap proveïdor disponible per al protocol `%s'"
 
-#: camel/camel-session.c:523
+#: camel/camel-session.c:528
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -9535,139 +9492,139 @@ msgstr "Missatge de _correu (FIXME)"
 msgid "Failed to verify certificates."
 msgstr ""
 
-#: camel/camel-store.c:212
+#: camel/camel-store.c:215
 #, fuzzy
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr "No es pot bifurcar %s: %s"
 
-#: camel/camel-store.c:266
+#: camel/camel-store.c:269
 #, fuzzy
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "No es pot bifurcar %s: %s"
 
-#: camel/camel-tcp-stream-openssl.c:568
+#: camel/camel-tcp-stream-openssl.c:571
 msgid "Unable to get issuer's certificate"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:570
+#: camel/camel-tcp-stream-openssl.c:573
 msgid "Unable to get Certificate Revocation List"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:572
+#: camel/camel-tcp-stream-openssl.c:575
 #, fuzzy
 msgid "Unable to decrypt certificate signature"
 msgstr "No es pot desar el fitxer de llista de grups per a %s: %s"
 
-#: camel/camel-tcp-stream-openssl.c:574
+#: camel/camel-tcp-stream-openssl.c:577
 msgid "Unable to decrypt Certificate Revocation List signature"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:576
+#: camel/camel-tcp-stream-openssl.c:579
 msgid "Unable to decode issuer's public key"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:578
+#: camel/camel-tcp-stream-openssl.c:581
 #, fuzzy
 msgid "Certificate signature failure"
 msgstr "Fitxer de signatura:"
 
-#: camel/camel-tcp-stream-openssl.c:580
+#: camel/camel-tcp-stream-openssl.c:583
 msgid "Certificate Revocation List signature failure"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:582
+#: camel/camel-tcp-stream-openssl.c:585
 msgid "Certificate not yet valid"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:584
+#: camel/camel-tcp-stream-openssl.c:587
 msgid "Certificate has expired"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:586
+#: camel/camel-tcp-stream-openssl.c:589
 msgid "CRL not yet valid"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:588
+#: camel/camel-tcp-stream-openssl.c:591
 msgid "CRL has expired"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:593
+#: camel/camel-tcp-stream-openssl.c:596
 #, fuzzy
 msgid "Error in CRL"
 msgstr "Error en carregar el fitxer: %s"
 
-#: camel/camel-tcp-stream-openssl.c:595
+#: camel/camel-tcp-stream-openssl.c:598
 #, fuzzy
 msgid "Out of memory"
 msgstr "Fora de l'oficina"
 
-#: camel/camel-tcp-stream-openssl.c:597
+#: camel/camel-tcp-stream-openssl.c:600
 msgid "Zero-depth self-signed certificate"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:599
+#: camel/camel-tcp-stream-openssl.c:602
 msgid "Self-signed certificate in chain"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:601
+#: camel/camel-tcp-stream-openssl.c:604
 msgid "Unable to get issuer's certificate locally"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:603
+#: camel/camel-tcp-stream-openssl.c:606
 #, fuzzy
 msgid "Unable to verify leaf signature"
 msgstr "No s'ha pogut recuperar el missatge %s del servidor POP: %s"
 
-#: camel/camel-tcp-stream-openssl.c:605
+#: camel/camel-tcp-stream-openssl.c:608
 msgid "Certificate chain too long"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:607
+#: camel/camel-tcp-stream-openssl.c:610
 msgid "Certificate Revoked"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:609
+#: camel/camel-tcp-stream-openssl.c:612
 msgid "Invalid Certificate Authority (CA)"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:611
+#: camel/camel-tcp-stream-openssl.c:614
 msgid "Path length exceeded"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:613
+#: camel/camel-tcp-stream-openssl.c:616
 #, fuzzy
 msgid "Invalid purpose"
 msgstr "adjunció"
 
-#: camel/camel-tcp-stream-openssl.c:615
+#: camel/camel-tcp-stream-openssl.c:618
 msgid "Certificate untrusted"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:617
+#: camel/camel-tcp-stream-openssl.c:620
 msgid "Certificate rejected"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:620
+#: camel/camel-tcp-stream-openssl.c:623
 msgid "Subject/Issuer mismatch"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:622
+#: camel/camel-tcp-stream-openssl.c:625
 msgid "AKID/SKID mismatch"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:624
+#: camel/camel-tcp-stream-openssl.c:627
 msgid "AKID/Issuer serial mismatch"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:626
+#: camel/camel-tcp-stream-openssl.c:629
 msgid "Key usage does not support certificate signing"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:629
+#: camel/camel-tcp-stream-openssl.c:632
 msgid "Error in application verification"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:696 camel/camel-tcp-stream-ssl.c:831
+#: camel/camel-tcp-stream-openssl.c:699 camel/camel-tcp-stream-ssl.c:823
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -9676,15 +9633,15 @@ msgid ""
 "Signature:         %s"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:837
+#: camel/camel-tcp-stream-openssl.c:705 camel/camel-tcp-stream-ssl.c:829
 msgid "GOOD"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:837
+#: camel/camel-tcp-stream-openssl.c:705 camel/camel-tcp-stream-ssl.c:829
 msgid "BAD"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:704
+#: camel/camel-tcp-stream-openssl.c:707
 #, c-format
 msgid ""
 "Bad certificate from %s:\n"
@@ -9697,7 +9654,7 @@ msgid ""
 msgstr ""
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:841
+#: camel/camel-tcp-stream-ssl.c:833
 #, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -9707,28 +9664,28 @@ msgid ""
 "Do you wish to accept?"
 msgstr ""
 
-#: camel/camel-tcp-stream-ssl.c:885
+#: camel/camel-tcp-stream-ssl.c:877
 #, c-format
 msgid ""
 "Certificate problem: %s\n"
 "Issuer: %s"
 msgstr ""
 
-#: camel/camel-tcp-stream-ssl.c:937
+#: camel/camel-tcp-stream-ssl.c:929
 #, c-format
 msgid ""
 "Bad certificate domain: %s\n"
 "Issuer: %s"
 msgstr ""
 
-#: camel/camel-tcp-stream-ssl.c:955
+#: camel/camel-tcp-stream-ssl.c:947
 #, c-format
 msgid ""
 "Certificate expired: %s\n"
 "Issuer: %s"
 msgstr ""
 
-#: camel/camel-tcp-stream-ssl.c:972
+#: camel/camel-tcp-stream-ssl.c:964
 #, c-format
 msgid ""
 "Certificate revocation list expired: %s\n"
@@ -9742,17 +9699,17 @@ msgstr ""
 "No s'ha pogut obrir el fitxer `%s':\n"
 "%s"
 
-#: camel/camel-vee-folder.c:611
+#: camel/camel-vee-folder.c:618
 #, fuzzy, c-format
 msgid "Error storing `%s': %s"
 msgstr "Error en carregar el fitxer: %s"
 
-#: camel/camel-vee-folder.c:649
+#: camel/camel-vee-folder.c:656
 #, fuzzy, c-format
 msgid "No such message %s in %s"
 msgstr "L'ordinador central %s no existeix."
 
-#: camel/camel-vee-folder.c:812 camel/camel-vee-folder.c:818
+#: camel/camel-vee-folder.c:819 camel/camel-vee-folder.c:825
 #, fuzzy
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr "Comprova si hi ha nou correu"
@@ -9780,13 +9737,13 @@ msgstr "No es pot bifurcar %s: %s"
 #: camel/providers/imap/camel-imap-command.c:221
 #: camel/providers/imap/camel-imap-command.c:260
 #: camel/providers/imap/camel-imap-command.c:450
-#: camel/providers/imap/camel-imap-store.c:2806
+#: camel/providers/imap/camel-imap-store.c:2644
 #, fuzzy
 msgid "Operation cancelled"
 msgstr "Obre l'agenda"
 
 #: camel/providers/imap/camel-imap-command.c:305
-#: camel/providers/imap/camel-imap-store.c:2809
+#: camel/providers/imap/camel-imap-store.c:2647
 #, fuzzy, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "El servidor ha rebutjat el nom d'usuari"
@@ -9824,39 +9781,39 @@ msgstr "La resposta del servidor IMAP no contenia la informació %s"
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "Resposta D'acord inesperada del servidor IMAP: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:223
+#: camel/providers/imap/camel-imap-folder.c:222
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "No s'ha pogut crear el directori %s: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:242
+#: camel/providers/imap/camel-imap-folder.c:241
 #, c-format
 msgid "Could not load summary for %s"
 msgstr "No s'ha pogut carregar el resum per a %s"
 
-#: camel/providers/imap/camel-imap-folder.c:308
+#: camel/providers/imap/camel-imap-folder.c:307
 msgid "Folder was destroyed and recreated on server."
 msgstr ""
 
 #. Check UIDs and flags of all messages we already know of.
-#: camel/providers/imap/camel-imap-folder.c:550
+#: camel/providers/imap/camel-imap-folder.c:549
 #, fuzzy
 msgid "Scanning for changed messages"
 msgstr "S'estan desant els canvis al missatge..."
 
-#: camel/providers/imap/camel-imap-folder.c:1886
+#: camel/providers/imap/camel-imap-folder.c:1883
 #, fuzzy, c-format
 msgid "Unable to retrieve message: %s"
 msgstr "Missatge de _correu (FIXME)"
 
-#: camel/providers/imap/camel-imap-folder.c:1923
-#: camel/providers/local/camel-maildir-folder.c:211
-#: camel/providers/local/camel-maildir-folder.c:224
-#: camel/providers/local/camel-maildir-folder.c:233
-#: camel/providers/local/camel-mbox-folder.c:422
-#: camel/providers/local/camel-mh-folder.c:200
-#: camel/providers/local/camel-mh-folder.c:210
-#: camel/providers/local/camel-mh-folder.c:219
+#: camel/providers/imap/camel-imap-folder.c:1920
+#: camel/providers/local/camel-maildir-folder.c:212
+#: camel/providers/local/camel-maildir-folder.c:225
+#: camel/providers/local/camel-maildir-folder.c:234
+#: camel/providers/local/camel-mbox-folder.c:351
+#: camel/providers/local/camel-mh-folder.c:201
+#: camel/providers/local/camel-mh-folder.c:211
+#: camel/providers/local/camel-mh-folder.c:220
 #, c-format
 msgid ""
 "Cannot get message: %s\n"
@@ -9865,28 +9822,28 @@ msgstr ""
 "No es pot recuperar el missatge: %s\n"
 "  %s"
 
-#: camel/providers/imap/camel-imap-folder.c:1923
-#: camel/providers/local/camel-maildir-folder.c:211
-#: camel/providers/local/camel-mbox-folder.c:422
-#: camel/providers/local/camel-mh-folder.c:200
+#: camel/providers/imap/camel-imap-folder.c:1920
+#: camel/providers/local/camel-maildir-folder.c:212
+#: camel/providers/local/camel-mbox-folder.c:351
+#: camel/providers/local/camel-mh-folder.c:201
 #, fuzzy
 msgid "No such message"
 msgstr "L'ordinador central %s no existeix."
 
-#: camel/providers/imap/camel-imap-folder.c:1946
-#: camel/providers/imap/camel-imap-folder.c:2542
+#: camel/providers/imap/camel-imap-folder.c:1943
+#: camel/providers/imap/camel-imap-folder.c:2539
 #, fuzzy
 msgid "This message is not currently available"
 msgstr ""
 "Aquest missatge no té cap assumpte.\n"
 "Voleu que l'enviï igualment?"
 
-#: camel/providers/imap/camel-imap-folder.c:2206
-#: camel/providers/imap/camel-imap-folder.c:2276
+#: camel/providers/imap/camel-imap-folder.c:2203
+#: camel/providers/imap/camel-imap-folder.c:2273
 msgid "Fetching summary information for new messages"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:2580
+#: camel/providers/imap/camel-imap-folder.c:2577
 msgid "Could not find message body in FETCH response."
 msgstr "No s'ha pogut trobar el cos del missatge en la resposta al FETCH."
 
@@ -9940,111 +9897,95 @@ msgstr "Nom:"
 msgid "Apply filters to new messages in INBOX on this server"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-provider.c:59
-#, fuzzy
-msgid "Automatically synchronize remote mail locally"
-msgstr "Comprova si hi ha nou correu"
-
-#: camel/providers/imap/camel-imap-provider.c:65
+#: camel/providers/imap/camel-imap-provider.c:63
 #, fuzzy
 msgid "IMAP"
 msgstr "IMAPv4"
 
-#: camel/providers/imap/camel-imap-provider.c:67
+#: camel/providers/imap/camel-imap-provider.c:65
 msgid "For reading and storing mail on IMAP servers."
 msgstr "Per llegir i emmagatzemar correu en servidors IMAP."
 
-#: camel/providers/imap/camel-imap-provider.c:82
-#: camel/providers/imapp/camel-imapp-provider.c:65
-#: camel/providers/nntp/camel-nntp-store.c:265
+#: camel/providers/imap/camel-imap-provider.c:80
+#: camel/providers/nntp/camel-nntp-store.c:267
 #: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:83
 msgid "Password"
 msgstr "Contrasenya"
 
-#: camel/providers/imap/camel-imap-provider.c:84
-#: camel/providers/imapp/camel-imapp-provider.c:67
+#: camel/providers/imap/camel-imap-provider.c:82
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
 "Aquesta opció es connectarà al servidor IMAP mitjançant una contrasenya de "
 "text net."
 
-#: camel/providers/imap/camel-imap-store.c:459
+#: camel/providers/imap/camel-imap-store.c:457
 #, fuzzy, c-format
 msgid "IMAP server %s"
 msgstr "Servidor %s %s"
 
-#: camel/providers/imap/camel-imap-store.c:461
+#: camel/providers/imap/camel-imap-store.c:459
 #, fuzzy, c-format
 msgid "IMAP service for %s on %s"
 msgstr "Servei %s per a %s en %s"
 
-#: camel/providers/imap/camel-imap-store.c:589
-#: camel/providers/imap/camel-imap-store.c:821
-#: camel/providers/imapp/camel-imapp-store.c:233
-#: camel/providers/nntp/camel-nntp-store.c:128
-#: camel/providers/nntp/camel-nntp-store.c:146
+#: camel/providers/imap/camel-imap-store.c:587
+#: camel/providers/nntp/camel-nntp-store.c:130
+#: camel/providers/nntp/camel-nntp-store.c:148
 #: camel/providers/pop3/camel-pop3-store.c:184
 #, fuzzy
 msgid "Connection cancelled"
 msgstr "Cancel·lat"
 
-#: camel/providers/imap/camel-imap-store.c:592
-#: camel/providers/imapp/camel-imapp-store.c:236
-#: camel/providers/nntp/camel-nntp-store.c:131
-#: camel/providers/smtp/camel-smtp-transport.c:275
+#: camel/providers/imap/camel-imap-store.c:590
+#: camel/providers/nntp/camel-nntp-store.c:133
+#: camel/providers/smtp/camel-smtp-transport.c:276
 #, c-format
 msgid "Could not connect to %s (port %d): %s"
 msgstr "No s'ha pogut connectar a %s (port %d): %s"
 
-#: camel/providers/imap/camel-imap-store.c:655
-#: camel/providers/imap/camel-imap-store.c:686
+#: camel/providers/imap/camel-imap-store.c:649
+#: camel/providers/imap/camel-imap-store.c:680
 #, fuzzy, c-format
 msgid "Failed to connect to IMAP server %s in secure mode: %s"
 msgstr ""
 "No es pot connectar al servidor POP.\n"
 "Error en enviar el nom d'usuari: %s"
 
-#: camel/providers/imap/camel-imap-store.c:656
+#: camel/providers/imap/camel-imap-store.c:650
 #: camel/providers/pop3/camel-pop3-store.c:220
 #, fuzzy
 msgid "SSL/TLS extension not supported."
 msgstr "Operació no suportada"
 
-#: camel/providers/imap/camel-imap-store.c:687
+#: camel/providers/imap/camel-imap-store.c:681
 #: camel/providers/pop3/camel-pop3-store.c:261
 #, fuzzy
 msgid "SSL negotiations failed"
 msgstr "Autenticació:"
 
-#: camel/providers/imap/camel-imap-store.c:824
-#, fuzzy, c-format
-msgid "Could not connect with command \"%s\": %s"
-msgstr "No s'ha pogut connectar al servidor POP en %s."
-
-#: camel/providers/imap/camel-imap-store.c:1237
+#: camel/providers/imap/camel-imap-store.c:1075
 #, fuzzy, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr ""
 "No es pot connectar al servidor POP.\n"
 "No hi ha suport per al mecanisme d'autenticació sol·licitat."
 
-#: camel/providers/imap/camel-imap-store.c:1247
-#: camel/providers/smtp/camel-smtp-transport.c:485
+#: camel/providers/imap/camel-imap-store.c:1085
+#: camel/providers/smtp/camel-smtp-transport.c:486
 #, fuzzy, c-format
 msgid "No support for authentication type %s"
 msgstr "Autenticació:"
 
-#: camel/providers/imap/camel-imap-store.c:1270
-#: camel/providers/imapp/camel-imapp-store.c:349
+#: camel/providers/imap/camel-imap-store.c:1108
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr "%sSi us plau, introduïu la contrasenya IMAP per a %s@%s"
 
-#: camel/providers/imap/camel-imap-store.c:1284
+#: camel/providers/imap/camel-imap-store.c:1122
 msgid "You didn't enter a password."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1313
+#: camel/providers/imap/camel-imap-store.c:1151
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -10055,71 +9996,42 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:1660
-#: camel/providers/imap/camel-imap-store.c:1802
+#: camel/providers/imap/camel-imap-store.c:1498
+#: camel/providers/imap/camel-imap-store.c:1640
 #, fuzzy, c-format
 msgid "No such folder %s"
 msgstr "La carpeta `%s' no existeix."
 
-#: camel/providers/imap/camel-imap-store.c:2003
+#: camel/providers/imap/camel-imap-store.c:1841
 #, c-format
 msgid ""
 "The folder name \"%s\" is invalid because it containes the character \"%c\""
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:2015
+#: camel/providers/imap/camel-imap-store.c:1853
 #, fuzzy, c-format
 msgid "Unknown parent folder: %s"
 msgstr "Error desconegut: %s"
 
-#: camel/providers/imap/camel-imap-store.c:2051
+#: camel/providers/imap/camel-imap-store.c:1889
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr ""
 
-#: camel/providers/imapp/camel-imapp-provider.c:39
-#: camel/providers/pop3/camel-pop3-provider.c:38
-#, fuzzy
-msgid "Message storage"
-msgstr "Cos del missatge"
-
-#: camel/providers/imapp/camel-imapp-provider.c:47
-#, fuzzy
-msgid "IMAP+"
-msgstr "IMAPv4"
-
-#: camel/providers/imapp/camel-imapp-provider.c:49
-msgid ""
-"Experimental IMAP 4(.1) client\n"
-"This is untested and unsupported code, you want to use plain imap instead.\n"
-"\n"
-" !!! DO NOT USE THIS FOR PRODUCTION EMAIL  !!!\n"
-msgstr ""
-
-#: camel/providers/imapp/camel-imapp-store.c:333
-#, fuzzy, c-format
-msgid "Could not connect to POP server on %s"
-msgstr "No s'ha pogut connectar al servidor POP en %s."
-
-#: camel/providers/local/camel-local-folder.c:179
-#, fuzzy
-msgid "Index message body data"
-msgstr "FIXME: Nou _missatge per contactar"
-
 #. $HOME relative path + protocol string
-#: camel/providers/local/camel-local-folder.c:379
+#: camel/providers/local/camel-local-folder.c:354
 #, fuzzy, c-format
 msgid "~%s (%s)"
 msgstr "%2$s%1$s"
 
 #. /var/spool/mail relative path + protocol
-#: camel/providers/local/camel-local-folder.c:383
-#: camel/providers/local/camel-local-folder.c:386
+#: camel/providers/local/camel-local-folder.c:358
+#: camel/providers/local/camel-local-folder.c:361
 #, fuzzy, c-format
 msgid "mailbox:%s (%s)"
 msgstr "No es pot obrir la bústia de correu temporal: %s"
 
 #. a full path + protocol
-#: camel/providers/local/camel-local-folder.c:390
+#: camel/providers/local/camel-local-folder.c:365
 #, fuzzy, c-format
 msgid "%s (%s)"
 msgstr "%2$s%1$s"
@@ -10181,54 +10093,50 @@ msgid ""
 "May also be used to read a tree of Elm, Pine, or Mutt style folders."
 msgstr "Per emmagatzemar correu local en directoris de correu de tipus MH"
 
-#: camel/providers/local/camel-local-store.c:138
-#: camel/providers/local/camel-local-store.c:227
-#: camel/providers/local/camel-mbox-store.c:305
+#: camel/providers/local/camel-local-store.c:139
+#: camel/providers/local/camel-local-store.c:228
 #: camel/providers/local/camel-spool-store.c:116
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:145
+#: camel/providers/local/camel-local-store.c:146
 #, fuzzy, c-format
 msgid "Store root %s is not a regular directory"
 msgstr "`%s' no és un fitxer habitual."
 
-#: camel/providers/local/camel-local-store.c:154
-#: camel/providers/local/camel-local-store.c:170
-#: camel/providers/local/camel-local-store.c:238
+#: camel/providers/local/camel-local-store.c:155
+#: camel/providers/local/camel-local-store.c:171
+#: camel/providers/local/camel-local-store.c:239
 #, fuzzy, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr "No es pot bifurcar %s: %s"
 
-#: camel/providers/local/camel-local-store.c:186
+#: camel/providers/local/camel-local-store.c:187
 msgid "Local stores do not have an inbox"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:198
+#: camel/providers/local/camel-local-store.c:199
 #, c-format
 msgid "Local mail file %s"
 msgstr "Fitxer de correu local %s"
 
-#: camel/providers/local/camel-local-store.c:307 mail/mail-local.c:949
+#: camel/providers/local/camel-local-store.c:308 mail/mail-local.c:909
 #, fuzzy, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr "No s'ha pogut canviar el nom de la carpeta `%s': %s"
 
-#: camel/providers/local/camel-local-store.c:364
-#: camel/providers/local/camel-mbox-store.c:474
+#: camel/providers/local/camel-local-store.c:365
 #, fuzzy, c-format
 msgid "Could not rename '%s': %s"
 msgstr "No s'ha pogut canviar el nom de la carpeta: %s"
 
-#: camel/providers/local/camel-local-store.c:387
-#: camel/providers/local/camel-mbox-store.c:258
+#: camel/providers/local/camel-local-store.c:388
 #, fuzzy, c-format
 msgid "Could not delete folder summary file `%s': %s"
 msgstr "No s'ha pogut suprimir la carpeta `%s': %s"
 
-#: camel/providers/local/camel-local-store.c:397
-#: camel/providers/local/camel-mbox-store.c:270
+#: camel/providers/local/camel-local-store.c:398
 #, fuzzy, c-format
 msgid "Could not delete folder index file `%s': %s"
 msgstr "No s'ha pogut suprimir la carpeta `%s': %s"
@@ -10242,18 +10150,18 @@ msgstr "No s'ha pogut obrir el resum %s"
 msgid "Unable to add message to summary: unknown reason"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-folder.c:183
+#: camel/providers/local/camel-maildir-folder.c:184
 #, fuzzy
 msgid "Maildir append message cancelled"
 msgstr "Missatge de _correu (FIXME)"
 
-#: camel/providers/local/camel-maildir-folder.c:186
+#: camel/providers/local/camel-maildir-folder.c:187
 #, fuzzy, c-format
 msgid "Cannot append message to maildir folder: %s: %s"
 msgstr "No es pot afegir cap missatge a la carpeta mh: %s"
 
-#: camel/providers/local/camel-maildir-folder.c:234
-#: camel/providers/local/camel-mh-folder.c:220
+#: camel/providers/local/camel-maildir-folder.c:235
+#: camel/providers/local/camel-mh-folder.c:221
 msgid "Invalid message contents"
 msgstr ""
 
@@ -10269,7 +10177,7 @@ msgstr ""
 "%s"
 
 #: camel/providers/local/camel-maildir-store.c:110
-#: camel/providers/local/camel-mbox-store.c:157
+#: camel/providers/local/camel-mbox-store.c:101
 #: camel/providers/local/camel-mh-store.c:209
 #: camel/providers/local/camel-spool-store.c:167
 #, c-format
@@ -10338,30 +10246,30 @@ msgstr "Còpia de missatges"
 msgid "Storing folder"
 msgstr "S'està sincronitzant \"%s\""
 
-#: camel/providers/local/camel-mbox-folder.c:230
-#: camel/providers/local/camel-spool-folder.c:148
+#: camel/providers/local/camel-mbox-folder.c:159
+#: camel/providers/local/camel-spool-folder.c:149
 #, fuzzy, c-format
 msgid "Cannot create folder lock on %s: %s"
 msgstr "No es pot bifurcar %s: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:289
+#: camel/providers/local/camel-mbox-folder.c:218
 #, fuzzy, c-format
 msgid "Cannot open mailbox: %s: %s\n"
 msgstr "No es pot obrir la bústia de correu temporal: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:349
+#: camel/providers/local/camel-mbox-folder.c:278
 #, fuzzy
 msgid "Mail append cancelled"
 msgstr "Obre l'agenda"
 
-#: camel/providers/local/camel-mbox-folder.c:352
+#: camel/providers/local/camel-mbox-folder.c:281
 #, fuzzy, c-format
 msgid "Cannot append message to mbox file: %s: %s"
 msgstr "No es pot afegir el missatge al fitxer mbox: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:440
-#: camel/providers/local/camel-mbox-folder.c:471
-#: camel/providers/local/camel-mbox-folder.c:479
+#: camel/providers/local/camel-mbox-folder.c:369
+#: camel/providers/local/camel-mbox-folder.c:400
+#: camel/providers/local/camel-mbox-folder.c:408
 #, fuzzy, c-format
 msgid ""
 "Cannot get message: %s from folder %s\n"
@@ -10370,15 +10278,15 @@ msgstr ""
 "No es pot recuperar el missatge: %s\n"
 "  %s"
 
-#: camel/providers/local/camel-mbox-folder.c:472
+#: camel/providers/local/camel-mbox-folder.c:401
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr ""
 
-#: camel/providers/local/camel-mbox-folder.c:480
+#: camel/providers/local/camel-mbox-folder.c:409
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-store.c:149
+#: camel/providers/local/camel-mbox-store.c:94
 #, c-format
 msgid ""
 "Could not open file `%s':\n"
@@ -10387,16 +10295,7 @@ msgstr ""
 "No s'ha pogut obrir el fitxer `%s':\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:166
-#, fuzzy, c-format
-msgid ""
-"Could not create directory `%s':\n"
-"%s"
-msgstr ""
-"No s'ha pogut crear el directori %s:\n"
-"%s"
-
-#: camel/providers/local/camel-mbox-store.c:178
+#: camel/providers/local/camel-mbox-store.c:110
 #, c-format
 msgid ""
 "Could not create file `%s':\n"
@@ -10405,15 +10304,14 @@ msgstr ""
 "No s'ha pogut crear el fitxer `%s':\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:188
-#: camel/providers/local/camel-mbox-store.c:229
+#: camel/providers/local/camel-mbox-store.c:119
+#: camel/providers/local/camel-mbox-store.c:146
 #, c-format
 msgid "`%s' is not a regular file."
 msgstr "`%s' no és un fitxer habitual."
 
-#: camel/providers/local/camel-mbox-store.c:210
-#: camel/providers/local/camel-mbox-store.c:221
-#: camel/providers/local/camel-mbox-store.c:244
+#: camel/providers/local/camel-mbox-store.c:138
+#: camel/providers/local/camel-mbox-store.c:161
 #, c-format
 msgid ""
 "Could not delete folder `%s':\n"
@@ -10422,36 +10320,11 @@ msgstr ""
 "No s'ha pogut suprimir la carpeta `%s':\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:236
+#: camel/providers/local/camel-mbox-store.c:153
 #, c-format
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr "La carpeta `%s' no és buida. No s'ha suprimit."
 
-#: camel/providers/local/camel-mbox-store.c:311
-#, fuzzy
-msgid "Cannot create a folder by this name."
-msgstr "No es pot bifurcar %s: %s"
-
-#: camel/providers/local/camel-mbox-store.c:324
-#, fuzzy, c-format
-msgid "Cannot create directory `%s': %s."
-msgstr "No s'ha pogut crear el directori %s: %s"
-
-#: camel/providers/local/camel-mbox-store.c:338
-#, fuzzy, c-format
-msgid "Cannot create folder: %s: %s"
-msgstr "No es pot bifurcar %s: %s"
-
-#: camel/providers/local/camel-mbox-store.c:408
-#, fuzzy, c-format
-msgid "Could not rename %s to %s: %s"
-msgstr "No s'ha pogut canviar el nom de la carpeta `%s': %s"
-
-#: camel/providers/local/camel-mbox-store.c:427
-#, fuzzy
-msgid "The new folder name is illegal."
-msgstr "El nom de carpeta indicat no és vàlid."
-
 #: camel/providers/local/camel-mbox-summary.c:343
 #, fuzzy, c-format
 msgid "Could not open folder: %s: %s"
@@ -10485,7 +10358,7 @@ msgid "Cannot open temporary mailbox: %s"
 msgstr "No es pot obrir la bústia de correu temporal: %s"
 
 #: camel/providers/local/camel-mbox-summary.c:540
-#: camel/providers/local/camel-mbox-summary.c:704
+#: camel/providers/local/camel-mbox-summary.c:702
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr "No s'ha pogut tancar la carpeta font %s: %s"
@@ -10502,40 +10375,40 @@ msgstr "No s'ha pogut canviar el nom de la carpeta: %s"
 
 #: camel/providers/local/camel-mbox-summary.c:644
 #: camel/providers/local/camel-mbox-summary.c:652
-#: camel/providers/local/camel-mbox-summary.c:845
-#: camel/providers/local/camel-mbox-summary.c:853
+#: camel/providers/local/camel-mbox-summary.c:843
+#: camel/providers/local/camel-mbox-summary.c:851
 #, fuzzy
 msgid "Summary and folder mismatch, even after a sync"
 msgstr "Incongruència del resum, s'està interrompent la sincronització"
 
-#: camel/providers/local/camel-mbox-summary.c:779
+#: camel/providers/local/camel-mbox-summary.c:777
 #: camel/providers/local/camel-spool-summary.c:334
 #, c-format
 msgid "Unknown error: %s"
 msgstr "Error desconegut: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:814
+#: camel/providers/local/camel-mbox-summary.c:812
 #, fuzzy, c-format
 msgid "Could not store folder: %s"
 msgstr "No s'ha pogut canviar el nom de la carpeta: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:908
-#: camel/providers/local/camel-mbox-summary.c:934
+#: camel/providers/local/camel-mbox-summary.c:906
+#: camel/providers/local/camel-mbox-summary.c:932
 #, c-format
 msgid "Error writing to temp mailbox: %s"
 msgstr "Error en escriure a la bústia de correu temporal: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:925
+#: camel/providers/local/camel-mbox-summary.c:923
 #, fuzzy, c-format
 msgid "Writing to tmp mailbox failed: %s: %s"
 msgstr "Error en escriure a la bústia de correu temporal: %s"
 
-#: camel/providers/local/camel-mh-folder.c:174
+#: camel/providers/local/camel-mh-folder.c:175
 #, fuzzy
 msgid "MH append message cancelled"
 msgstr "FIXME: Nou _missatge per contactar"
 
-#: camel/providers/local/camel-mh-folder.c:177
+#: camel/providers/local/camel-mh-folder.c:178
 #, fuzzy, c-format
 msgid "Cannot append message to mh folder: %s: %s"
 msgstr "No es pot afegir cap missatge a la carpeta mh: %s"
@@ -10615,64 +10488,6 @@ msgid ""
 "Folder may be corrupt, copy saved in `%s'"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-auth.c:44
-#, c-format
-msgid "Please enter the NNTP password for %s@%s"
-msgstr "Si us plau, introduïu la contrasenya NNTP per a %s@%s"
-
-#: camel/providers/nntp/camel-nntp-auth.c:64
-msgid "Server rejected username"
-msgstr "El servidor ha rebutjat el nom d'usuari"
-
-#: camel/providers/nntp/camel-nntp-auth.c:70
-msgid "Failed to send username to server"
-msgstr "No s'ha pogut enviar el nom d'usuari al servidor"
-
-#: camel/providers/nntp/camel-nntp-auth.c:79
-msgid "Server rejected username/password"
-msgstr "El servidor ha rebutjat el nom d'usuari/la contrasenya"
-
-#: camel/providers/nntp/camel-nntp-folder.c:114
-#, c-format
-msgid "Internal error: uid in invalid format: %s"
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-folder.c:155
-#: camel/providers/nntp/camel-nntp-folder.c:161
-#: camel/providers/pop3/camel-pop3-folder.c:433
-#: camel/providers/pop3/camel-pop3-folder.c:494
-#: camel/providers/pop3/camel-pop3-folder.c:501
-#: camel/providers/pop3/camel-pop3-folder.c:512
-#, fuzzy, c-format
-msgid "Cannot get message %s: %s"
-msgstr ""
-"No es pot recuperar el missatge: %s\n"
-"  %s"
-
-#: camel/providers/nntp/camel-nntp-folder.c:159
-#: camel/providers/pop3/camel-pop3-folder.c:262
-#: camel/providers/pop3/camel-pop3-folder.c:430
-#: camel/providers/pop3/camel-pop3-folder.c:491
-#: camel/providers/pop3/camel-pop3-folder.c:509
-#, fuzzy
-msgid "User cancelled"
-msgstr "Obre l'agenda"
-
-#: camel/providers/nntp/camel-nntp-grouplist.c:45
-msgid "Could not get group list from server."
-msgstr "No s'ha pogut aconseguir la llista de grups del servidor"
-
-#: camel/providers/nntp/camel-nntp-grouplist.c:98
-#: camel/providers/nntp/camel-nntp-grouplist.c:107
-#, c-format
-msgid "Unable to load grouplist file for %s: %s"
-msgstr "No es pot carregar el fitxer de llista de grups per a %s: %s"
-
-#: camel/providers/nntp/camel-nntp-grouplist.c:158
-#, c-format
-msgid "Unable to save grouplist file for %s: %s"
-msgstr "No es pot desar el fitxer de llista de grups per a %s: %s"
-
 #: camel/providers/nntp/camel-nntp-provider.c:41
 msgid "USENET news"
 msgstr "Notícies d'USENET"
@@ -10681,22 +10496,22 @@ msgstr "Notícies d'USENET"
 msgid "This is a provider for reading from and posting toUSENET newsgroups."
 msgstr "Proveïdor per llegir i publicar als grups de notícies d'USENET."
 
-#: camel/providers/nntp/camel-nntp-store.c:149
+#: camel/providers/nntp/camel-nntp-store.c:151
 #, fuzzy, c-format
 msgid "Could not read greeting from %s: %s"
 msgstr "No s'ha pogut crear el directori %s: %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:161
+#: camel/providers/nntp/camel-nntp-store.c:163
 #, c-format
 msgid "NNTP server %s returned error code %d: %s"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:260
+#: camel/providers/nntp/camel-nntp-store.c:262
 #, c-format
 msgid "USENET News via %s"
 msgstr "Notícies d'USENET mitjançant %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:267
+#: camel/providers/nntp/camel-nntp-store.c:269
 msgid ""
 "This option will authenticate with the NNTP server using a plaintext "
 "password."
@@ -10704,38 +10519,38 @@ msgstr ""
 "Aquesta opció us autentica al servidor NNTP mitjançant una contrasenya en "
 "text net"
 
-#: camel/providers/nntp/camel-nntp-summary.c:237
+#: camel/providers/nntp/camel-nntp-summary.c:234
 #, fuzzy, c-format
 msgid "No such folder: %s"
 msgstr "La carpeta `%s' no existeix."
 
-#: camel/providers/nntp/camel-nntp-summary.c:241
+#: camel/providers/nntp/camel-nntp-summary.c:238
 #, fuzzy, c-format
 msgid "Could not get group: %s"
 msgstr "No s'ha pogut crear el conducte: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:347
+#: camel/providers/nntp/camel-nntp-summary.c:344
 #, fuzzy, c-format
 msgid "NNTP Command failed: %s"
 msgstr "L'ordre IMAP ha fallat: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:407
-#: camel/providers/nntp/camel-nntp-summary.c:508
+#: camel/providers/nntp/camel-nntp-summary.c:404
+#: camel/providers/nntp/camel-nntp-summary.c:505
 #, fuzzy, c-format
 msgid "%s: Scanning new messages"
 msgstr "Còpia de missatges"
 
-#: camel/providers/nntp/camel-nntp-summary.c:523
+#: camel/providers/nntp/camel-nntp-summary.c:520
 #, fuzzy, c-format
 msgid "Unknown server response: %s"
 msgstr "Error desconegut: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:569
+#: camel/providers/nntp/camel-nntp-summary.c:566
 #, fuzzy
 msgid "Use cancel"
 msgstr "Cancel·lat"
 
-#: camel/providers/nntp/camel-nntp-summary.c:571
+#: camel/providers/nntp/camel-nntp-summary.c:568
 #, fuzzy, c-format
 msgid "Operation failed: %s"
 msgstr "Obre l'agenda"
@@ -10745,6 +10560,14 @@ msgstr "Obre l'agenda"
 msgid "Retrieving POP summary"
 msgstr "S'estan recuperant els missatges : %s"
 
+#: camel/providers/pop3/camel-pop3-folder.c:262
+#: camel/providers/pop3/camel-pop3-folder.c:429
+#: camel/providers/pop3/camel-pop3-folder.c:490
+#: camel/providers/pop3/camel-pop3-folder.c:508
+#, fuzzy
+msgid "User cancelled"
+msgstr "Obre l'agenda"
+
 #: camel/providers/pop3/camel-pop3-folder.c:265
 #, fuzzy, c-format
 msgid "Cannot get POP summary: %s"
@@ -10755,23 +10578,38 @@ msgstr "No es pot bifurcar %s: %s"
 msgid "Expunging deleted messages"
 msgstr "Imprimeix el missatge seleccionat"
 
-#: camel/providers/pop3/camel-pop3-folder.c:404
+#: camel/providers/pop3/camel-pop3-folder.c:403
 #, c-format
 msgid "No message with uid %s"
 msgstr "No hi ha cap missatge amb l'uid %s"
 
 #. Sigh, most of the crap in this function is so that the cancel button
 #. returns the proper exception code.  Sigh.
-#: camel/providers/pop3/camel-pop3-folder.c:411
+#: camel/providers/pop3/camel-pop3-folder.c:410
 #, fuzzy, c-format
 msgid "Retrieving POP message %d"
 msgstr "S'estan recuperant els missatges : %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:501
+#: camel/providers/pop3/camel-pop3-folder.c:432
+#: camel/providers/pop3/camel-pop3-folder.c:493
+#: camel/providers/pop3/camel-pop3-folder.c:500
+#: camel/providers/pop3/camel-pop3-folder.c:511
+#, fuzzy, c-format
+msgid "Cannot get message %s: %s"
+msgstr ""
+"No es pot recuperar el missatge: %s\n"
+"  %s"
+
+#: camel/providers/pop3/camel-pop3-folder.c:500
 #, fuzzy
 msgid "Unknown reason"
 msgstr "Error desconegut"
 
+#: camel/providers/pop3/camel-pop3-provider.c:38
+#, fuzzy
+msgid "Message storage"
+msgstr "Cos del missatge"
+
 #: camel/providers/pop3/camel-pop3-provider.c:40
 #, fuzzy
 msgid "Leave messages on server"
@@ -10947,154 +10785,154 @@ msgstr ""
 "Per al lliurament de correu mitjançant la connexió a un concentrador de "
 "correu utilitzant SMTP."
 
-#: camel/providers/smtp/camel-smtp-transport.c:174
+#: camel/providers/smtp/camel-smtp-transport.c:175
 msgid "Syntax error, command unrecognized"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:176
+#: camel/providers/smtp/camel-smtp-transport.c:177
 msgid "Syntax error in parameters or arguments"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:178
+#: camel/providers/smtp/camel-smtp-transport.c:179
 msgid "Command not implemented"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:180
+#: camel/providers/smtp/camel-smtp-transport.c:181
 msgid "Command parameter not implemented"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:182
+#: camel/providers/smtp/camel-smtp-transport.c:183
 msgid "System status, or system help reply"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:184
+#: camel/providers/smtp/camel-smtp-transport.c:185
 #, fuzzy
 msgid "Help message"
 msgstr "Mou el missatge"
 
-#: camel/providers/smtp/camel-smtp-transport.c:186
+#: camel/providers/smtp/camel-smtp-transport.c:187
 #, fuzzy
 msgid "Service ready"
 msgstr "Amaga"
 
-#: camel/providers/smtp/camel-smtp-transport.c:188
+#: camel/providers/smtp/camel-smtp-transport.c:189
 msgid "Service closing transmission channel"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:190
+#: camel/providers/smtp/camel-smtp-transport.c:191
 msgid "Service not available, closing transmission channel"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:192
+#: camel/providers/smtp/camel-smtp-transport.c:193
 msgid "Requested mail action okay, completed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:194
+#: camel/providers/smtp/camel-smtp-transport.c:195
 msgid "User not local; will forward to <forward-path>"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:196
+#: camel/providers/smtp/camel-smtp-transport.c:197
 msgid "Requested mail action not taken: mailbox unavailable"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:198
+#: camel/providers/smtp/camel-smtp-transport.c:199
 msgid "Requested action not taken: mailbox unavailable"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:200
+#: camel/providers/smtp/camel-smtp-transport.c:201
 msgid "Requested action aborted: error in processing"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:202
+#: camel/providers/smtp/camel-smtp-transport.c:203
 msgid "User not local; please try <forward-path>"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:204
+#: camel/providers/smtp/camel-smtp-transport.c:205
 msgid "Requested action not taken: insufficient system storage"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:206
+#: camel/providers/smtp/camel-smtp-transport.c:207
 msgid "Requested mail action aborted: exceeded storage allocation"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:208
+#: camel/providers/smtp/camel-smtp-transport.c:209
 msgid "Requested action not taken: mailbox name not allowed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:210
+#: camel/providers/smtp/camel-smtp-transport.c:211
 msgid "Start mail input; end with <CRLF>.<CRLF>"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:212
+#: camel/providers/smtp/camel-smtp-transport.c:213
 msgid "Transaction failed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:216
+#: camel/providers/smtp/camel-smtp-transport.c:217
 #, fuzzy
 msgid "A password transition is needed"
 msgstr "No s'ha indicat cap contrasenya."
 
-#: camel/providers/smtp/camel-smtp-transport.c:218
+#: camel/providers/smtp/camel-smtp-transport.c:219
 msgid "Authentication mechanism is too weak"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:220
+#: camel/providers/smtp/camel-smtp-transport.c:221
 #, fuzzy
 msgid "Encryption required for requested authentication mechanism"
 msgstr ""
 "No es pot connectar al servidor POP.\n"
 "No hi ha suport per al mecanisme d'autenticació sol·licitat."
 
-#: camel/providers/smtp/camel-smtp-transport.c:222
+#: camel/providers/smtp/camel-smtp-transport.c:223
 #, fuzzy
 msgid "Temporary authentication failure"
 msgstr "Autenticació:"
 
-#: camel/providers/smtp/camel-smtp-transport.c:224
+#: camel/providers/smtp/camel-smtp-transport.c:225
 #, fuzzy
 msgid "Authentication required"
 msgstr "Autenticació:"
 
-#: camel/providers/smtp/camel-smtp-transport.c:298
+#: camel/providers/smtp/camel-smtp-transport.c:299
 #, fuzzy
 msgid "Welcome response error"
 msgstr "Error desconegut: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:342
-#: camel/providers/smtp/camel-smtp-transport.c:381
+#: camel/providers/smtp/camel-smtp-transport.c:343
+#: camel/providers/smtp/camel-smtp-transport.c:382
 #, fuzzy, c-format
 msgid "Failed to connect to SMTP server %s in secure mode: %s"
 msgstr ""
 "No es pot connectar al servidor POP.\n"
 "Error en enviar el nom d'usuari: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:343
+#: camel/providers/smtp/camel-smtp-transport.c:344
 msgid "server does not appear to support SSL"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:357
+#: camel/providers/smtp/camel-smtp-transport.c:358
 #, fuzzy, c-format
 msgid "STARTTLS request timed out: %s"
 msgstr "No s'ha pogut executar %s: no s'ha enviat el correu."
 
-#: camel/providers/smtp/camel-smtp-transport.c:372
+#: camel/providers/smtp/camel-smtp-transport.c:373
 #, fuzzy
 msgid "STARTTLS response error"
 msgstr "Error desconegut: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:475
+#: camel/providers/smtp/camel-smtp-transport.c:476
 #, fuzzy, c-format
 msgid "SMTP server %s does not support requested authentication type %s."
 msgstr ""
 "No es pot connectar al servidor POP.\n"
 "No hi ha suport per al mecanisme d'autenticació sol·licitat."
 
-#: camel/providers/smtp/camel-smtp-transport.c:513
+#: camel/providers/smtp/camel-smtp-transport.c:514
 #, fuzzy, c-format
 msgid "%sPlease enter the SMTP password for %s@%s"
 msgstr "%sSi us plau, introduïu la contrasenya IMAP per a %s@%s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:532
+#: camel/providers/smtp/camel-smtp-transport.c:533
 #, fuzzy, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -11105,95 +10943,95 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:665
+#: camel/providers/smtp/camel-smtp-transport.c:666
 #, fuzzy, c-format
 msgid "SMTP server %s"
 msgstr "Servidor %s %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:667
+#: camel/providers/smtp/camel-smtp-transport.c:668
 #, fuzzy, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "Lliurament de correu mitjançant el programa sendmail"
 
-#: camel/providers/smtp/camel-smtp-transport.c:685
+#: camel/providers/smtp/camel-smtp-transport.c:686
 msgid "Cannot send message: sender address not valid."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:690 mail/mail-ops.c:631
+#: camel/providers/smtp/camel-smtp-transport.c:691 mail/mail-ops.c:613
 #, fuzzy
 msgid "Sending message"
 msgstr "Envia aquest missatge"
 
-#: camel/providers/smtp/camel-smtp-transport.c:705
+#: camel/providers/smtp/camel-smtp-transport.c:706
 msgid "Cannot send message: no recipients defined."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:714
+#: camel/providers/smtp/camel-smtp-transport.c:715
 #, fuzzy
 msgid "Cannot send message: one or more invalid recipients"
 msgstr "No es pot afegir el missatge al fitxer mbox: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:879
+#: camel/providers/smtp/camel-smtp-transport.c:880
 msgid "SMTP Greeting"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:928
+#: camel/providers/smtp/camel-smtp-transport.c:927
 #, fuzzy, c-format
 msgid "HELO request timed out: %s"
 msgstr "No s'ha pogut executar %s: no s'ha enviat el correu."
 
-#: camel/providers/smtp/camel-smtp-transport.c:950
+#: camel/providers/smtp/camel-smtp-transport.c:949
 #, fuzzy
 msgid "HELO response error"
 msgstr "Error desconegut: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1016
+#: camel/providers/smtp/camel-smtp-transport.c:1015
 #, fuzzy
 msgid "SMTP Authentication"
 msgstr "Autenticació:"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1022
+#: camel/providers/smtp/camel-smtp-transport.c:1021
 msgid "Error creating SASL authentication object."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1039
-#: camel/providers/smtp/camel-smtp-transport.c:1051
+#: camel/providers/smtp/camel-smtp-transport.c:1038
+#: camel/providers/smtp/camel-smtp-transport.c:1050
 #, fuzzy, c-format
 msgid "AUTH request timed out: %s"
 msgstr "No s'ha pogut executar %s: no s'ha enviat el correu."
 
-#: camel/providers/smtp/camel-smtp-transport.c:1060
+#: camel/providers/smtp/camel-smtp-transport.c:1059
 #, fuzzy
 msgid "AUTH request failed."
 msgstr "No s'ha pogut executar %s: no s'ha enviat el correu."
 
-#: camel/providers/smtp/camel-smtp-transport.c:1121
+#: camel/providers/smtp/camel-smtp-transport.c:1120
 #, fuzzy
 msgid "Bad authentication response from server.\n"
 msgstr "Resposta inesperada del servidor IMAP: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1146
+#: camel/providers/smtp/camel-smtp-transport.c:1145
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1166
+#: camel/providers/smtp/camel-smtp-transport.c:1165
 #, fuzzy
 msgid "MAIL FROM response error"
 msgstr "Error desconegut: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1190
+#: camel/providers/smtp/camel-smtp-transport.c:1189
 #, fuzzy, c-format
 msgid "RCPT TO request timed out: %s: mail not sent"
 msgstr ""
 "No s'ha pogut crear el conducte al sendmail: %s: no s'ha enviat el correu"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1212
+#: camel/providers/smtp/camel-smtp-transport.c:1211
 #, c-format
 msgid "RCPT TO <%s> failed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1251
+#: camel/providers/smtp/camel-smtp-transport.c:1250
 #, fuzzy, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr "No s'ha pogut executar %s: no s'ha enviat el correu."
@@ -11201,70 +11039,71 @@ msgstr "No s'ha pogut executar %s: no s'ha enviat el correu."
 #. we should have gotten instructions on how to use the DATA command:
 #. * 354 Enter mail, end with "." on a line by itself
 #.
-#: camel/providers/smtp/camel-smtp-transport.c:1271
+#: camel/providers/smtp/camel-smtp-transport.c:1270
 #, fuzzy
 msgid "DATA response error"
 msgstr "Error desconegut: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1312
-#: camel/providers/smtp/camel-smtp-transport.c:1335
+#: camel/providers/smtp/camel-smtp-transport.c:1311
+#: camel/providers/smtp/camel-smtp-transport.c:1334
 #, fuzzy, c-format
 msgid "DATA send timed out: message termination: %s: mail not sent"
 msgstr "El sendmail ha acabat amb el senyal %s: no s'ha enviat el correu."
 
-#: camel/providers/smtp/camel-smtp-transport.c:1355
+#: camel/providers/smtp/camel-smtp-transport.c:1354
 #, fuzzy
 msgid "DATA termination response error"
 msgstr "Resposta inesperada del servidor IMAP: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1378
+#: camel/providers/smtp/camel-smtp-transport.c:1377
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1398
+#: camel/providers/smtp/camel-smtp-transport.c:1397
 #, fuzzy
 msgid "RSET response error"
 msgstr "Error desconegut: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1421
+#: camel/providers/smtp/camel-smtp-transport.c:1420
 #, fuzzy, c-format
 msgid "QUIT request timed out: %s"
 msgstr "No s'ha pogut executar %s: no s'ha enviat el correu."
 
-#: camel/providers/smtp/camel-smtp-transport.c:1441
+#: camel/providers/smtp/camel-smtp-transport.c:1440
 #, fuzzy
 msgid "QUIT response error"
 msgstr "Error desconegut: %s"
 
-#: composer/e-msg-composer-attachment-bar.c:103
+#: composer/e-msg-composer-attachment-bar.c:102
 #, fuzzy, c-format
 msgid "%.0fK"
 msgstr "%.1fK"
 
-#: composer/e-msg-composer-attachment-bar.c:106
+#: composer/e-msg-composer-attachment-bar.c:105
 #, fuzzy, c-format
 msgid "%.0fM"
 msgstr "%.1fM"
 
-#: composer/e-msg-composer-attachment-bar.c:109
+#: composer/e-msg-composer-attachment-bar.c:108
 #, fuzzy, c-format
 msgid "%.0fG"
 msgstr "%.1fG"
 
-#: composer/e-msg-composer-attachment-bar.c:300
+#. This is a filename. Translators take note.
+#: composer/e-msg-composer-attachment-bar.c:370 mail/mail-display.c:227
 msgid "attachment"
 msgstr "adjunció"
 
-#: composer/e-msg-composer-attachment-bar.c:445
+#: composer/e-msg-composer-attachment-bar.c:508
 msgid "Remove selected items from the attachment list"
 msgstr "Elimina els elements seleccionats de la llista d'adjuncions"
 
-#: composer/e-msg-composer-attachment-bar.c:475
+#: composer/e-msg-composer-attachment-bar.c:538
 msgid "Add attachment..."
 msgstr "Afegeix una adjunció..."
 
-#: composer/e-msg-composer-attachment-bar.c:476
+#: composer/e-msg-composer-attachment-bar.c:539
 msgid "Attach a file to the message"
 msgstr "Adjunta un fitxer al missatge"
 
@@ -11297,12 +11136,93 @@ msgstr "Tipus de MIME:"
 msgid "Suggest automatic display of attachment"
 msgstr ""
 
-#: composer/e-msg-composer.c:562
+#: composer/e-msg-composer-hdrs.c:290
+msgid "Hey you, dunce. You need an account to send mail doncha know."
+msgstr ""
+
+#: composer/e-msg-composer-hdrs.c:483
+msgid "Click here for the address book"
+msgstr "Feu clic aquí per a la llibreta d'adreces"
+
+#.
+#. * Reply-To:
+#. *
+#. * Create this before we call create_from_optionmenu,
+#. * because that causes from_changed to be called, which
+#. * expects the reply_to fields to be initialized.
+#.
+#: composer/e-msg-composer-hdrs.c:514
+#, fuzzy
+msgid "Reply-To:"
+msgstr "Respon"
+
+#.
+#. * From
+#.
+#: composer/e-msg-composer-hdrs.c:520
+msgid "From:"
+msgstr "De:"
+
+#.
+#. * Subject
+#.
+#: composer/e-msg-composer-hdrs.c:526
+msgid "Subject:"
+msgstr "Assumpte:"
+
+#: composer/e-msg-composer-hdrs.c:535
+msgid "To:"
+msgstr "Per a:"
+
+#: composer/e-msg-composer-hdrs.c:536
+msgid "Enter the recipients of the message"
+msgstr "Introduïu els destinataris del missatge"
+
+#: composer/e-msg-composer-hdrs.c:539
+msgid "Cc:"
+msgstr "Cc:"
+
+#: composer/e-msg-composer-hdrs.c:540
+msgid "Enter the addresses that will receive a carbon copy of the message"
+msgstr "Întroduïu les adreces que rebran una còpia del missatge"
+
+#: composer/e-msg-composer-hdrs.c:543
+msgid "Bcc:"
+msgstr "Bcc:"
+
+#: composer/e-msg-composer-hdrs.c:544
+msgid ""
+"Enter the addresses that will receive a carbon copy of the message without "
+"appearing in the recipient list of the message."
+msgstr ""
+"introduïu les adreces que rebran una còpia del missatge sense aparèixer a la "
+"llista de destinataris del missatge."
+
+#.
+#. * Post-To
+#.
+#: composer/e-msg-composer-hdrs.c:551
+#, fuzzy
+msgid "Post To:"
+msgstr "Prioritat:"
+
+#: composer/e-msg-composer-hdrs.c:553
+#, fuzzy
+msgid "Posting destination"
+msgstr "Descripció:"
+
+#: composer/e-msg-composer-select-file.c:102
+#: composer/e-msg-composer-select-file.c:119
+#, fuzzy
+msgid "Attach file(s)"
+msgstr "Adjunta un fitxer"
+
+#: composer/e-msg-composer.c:535
 #, fuzzy
 msgid "Could not create a PGP signature context"
 msgstr "No s'ha pogut crear el quadre de diàleg."
 
-#: composer/e-msg-composer.c:841
+#: composer/e-msg-composer.c:814
 #, fuzzy, c-format
 msgid ""
 "Error while reading file %s:\n"
@@ -11311,65 +11231,65 @@ msgstr ""
 "Error en preparar-se per a %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:1206
+#: composer/e-msg-composer.c:1177
 msgid "File exists, overwrite?"
 msgstr ""
 
-#: composer/e-msg-composer.c:1217 composer/e-msg-composer.c:1233
+#: composer/e-msg-composer.c:1195
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Error en desar el fitxer: %s"
 
-#: composer/e-msg-composer.c:1256
+#: composer/e-msg-composer.c:1218
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Error en carregar el fitxer: %s"
 
-#: composer/e-msg-composer.c:1294
+#: composer/e-msg-composer.c:1256
 #, fuzzy, c-format
 msgid "Error accessing file: %s"
 msgstr "Error en desar el fitxer: %s"
 
-#: composer/e-msg-composer.c:1302
+#: composer/e-msg-composer.c:1264
 #, fuzzy
 msgid "Unable to retrieve message from editor"
 msgstr "No s'ha pogut recuperar el missatge %s del servidor POP: %s"
 
-#: composer/e-msg-composer.c:1309
+#: composer/e-msg-composer.c:1271
 #, fuzzy, c-format
 msgid ""
 "Unable to seek on file: %s\n"
 "%s"
 msgstr "No es pot desar el fitxer de llista de grups per a %s: %s"
 
-#: composer/e-msg-composer.c:1316
+#: composer/e-msg-composer.c:1278
 #, fuzzy, c-format
 msgid ""
 "Unable to truncate file: %s\n"
 "%s"
 msgstr "No es pot desar el fitxer de llista de grups per a %s: %s"
 
-#: composer/e-msg-composer.c:1325
+#: composer/e-msg-composer.c:1287
 #, fuzzy, c-format
 msgid ""
 "Unable to copy file descriptor: %s\n"
 "%s"
 msgstr "No es pot desar el fitxer de llista de grups per a %s: %s"
 
-#: composer/e-msg-composer.c:1334
+#: composer/e-msg-composer.c:1296
 #, fuzzy, c-format
 msgid ""
 "Error autosaving message: %s\n"
 " %s"
 msgstr "Error en desar el fitxer: %s"
 
-#: composer/e-msg-composer.c:1431
+#: composer/e-msg-composer.c:1390
 msgid ""
 "Ximian Evolution has found unsaved files from a previous session.\n"
 "Would you like to try to recover them?"
 msgstr ""
 
-#: composer/e-msg-composer.c:1594
+#: composer/e-msg-composer.c:1552
 #, fuzzy, c-format
 msgid ""
 "The message \"%s\" has not been sent.\n"
@@ -11380,36 +11300,36 @@ msgstr ""
 "\n"
 "Voleu desar-ne els canvis?"
 
-#: composer/e-msg-composer.c:1603
+#: composer/e-msg-composer.c:1561
 #, fuzzy
 msgid "Warning: Modified Message"
 msgstr "Reenvia el missatge"
 
-#: composer/e-msg-composer.c:1635
+#: composer/e-msg-composer.c:1593
 msgid "Open file"
 msgstr "Obre un fitxer"
 
-#: composer/e-msg-composer.c:2054
+#: composer/e-msg-composer.c:2017
 #, fuzzy
 msgid "Signature:"
 msgstr "Fitxer de signatura:"
 
-#: composer/e-msg-composer.c:2094 mail/mail-account-gui.c:1261
+#: composer/e-msg-composer.c:2057 mail/mail-account-gui.c:1261
 msgid "Autogenerated"
 msgstr ""
 
-#: composer/e-msg-composer.c:2274 composer/e-msg-composer.c:2970
-#: composer/e-msg-composer.c:2971
+#: composer/e-msg-composer.c:2233 composer/e-msg-composer.c:2902
+#: composer/e-msg-composer.c:2903
 msgid "Compose a message"
 msgstr "Redacta un missatge"
 
-#: composer/e-msg-composer.c:3002
+#: composer/e-msg-composer.c:2934
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
 msgstr ""
 
-#: composer/e-msg-composer.c:3030
+#: composer/e-msg-composer.c:2962
 #, fuzzy
 msgid ""
 "Could not create composer window:\n"
@@ -11418,102 +11338,19 @@ msgid ""
 "of gtkhtml and libgtkhtml installed.\n"
 msgstr "No s'ha pogut crear la finestra del redactor."
 
-#: composer/e-msg-composer.c:3100
+#: composer/e-msg-composer.c:3029
 #, fuzzy
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component."
 msgstr "No s'ha pogut crear la finestra del redactor."
 
-#: composer/e-msg-composer.c:4110
+#: composer/e-msg-composer.c:4045
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)"
 "<b>"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:290
-#, fuzzy
-msgid "You need to configure an account before you can compose mail."
-msgstr ""
-"Cal que configureu una identitat\n"
-"abans de poder redactar correu."
-
-#: composer/e-msg-composer-hdrs.c:483
-msgid "Click here for the address book"
-msgstr "Feu clic aquí per a la llibreta d'adreces"
-
-#.
-#. * Reply-To:
-#. *
-#. * Create this before we call create_from_optionmenu,
-#. * because that causes from_changed to be called, which
-#. * expects the reply_to fields to be initialized.
-#.
-#: composer/e-msg-composer-hdrs.c:514
-#, fuzzy
-msgid "Reply-To:"
-msgstr "Respon"
-
-#.
-#. * From
-#.
-#: composer/e-msg-composer-hdrs.c:520
-msgid "From:"
-msgstr "De:"
-
-#.
-#. * Subject
-#.
-#: composer/e-msg-composer-hdrs.c:526
-msgid "Subject:"
-msgstr "Assumpte:"
-
-#: composer/e-msg-composer-hdrs.c:535
-msgid "To:"
-msgstr "Per a:"
-
-#: composer/e-msg-composer-hdrs.c:536
-msgid "Enter the recipients of the message"
-msgstr "Introduïu els destinataris del missatge"
-
-#: composer/e-msg-composer-hdrs.c:539
-msgid "Cc:"
-msgstr "Cc:"
-
-#: composer/e-msg-composer-hdrs.c:540
-msgid "Enter the addresses that will receive a carbon copy of the message"
-msgstr "Întroduïu les adreces que rebran una còpia del missatge"
-
-#: composer/e-msg-composer-hdrs.c:543
-msgid "Bcc:"
-msgstr "Bcc:"
-
-#: composer/e-msg-composer-hdrs.c:544
-msgid ""
-"Enter the addresses that will receive a carbon copy of the message without "
-"appearing in the recipient list of the message."
-msgstr ""
-"introduïu les adreces que rebran una còpia del missatge sense aparèixer a la "
-"llista de destinataris del missatge."
-
-#.
-#. * Post-To
-#.
-#: composer/e-msg-composer-hdrs.c:551
-#, fuzzy
-msgid "Post To:"
-msgstr "Prioritat:"
-
-#: composer/e-msg-composer-hdrs.c:553
-#, fuzzy
-msgid "Posting destination"
-msgstr "Descripció:"
-
-#: composer/e-msg-composer-select-file.c:119
-#, fuzzy
-msgid "Attach file(s)"
-msgstr "Adjunta un fitxer"
-
 #: data/evolution.desktop.in.h:1
 #, fuzzy
 msgid "The Evolution groupware suite"
@@ -11684,7 +11521,7 @@ msgstr ""
 "Ja existeix una fitxer amb aquest nom.\n"
 "El voleu sobreescriure?"
 
-#: e-util/e-dialog-utils.c:249
+#: e-util/e-dialog-utils.c:249 mail/mail-display.c:200
 msgid "Overwrite file?"
 msgstr "Voleu sobreescriure el fitxer?"
 
@@ -11707,224 +11544,103 @@ msgstr "categories"
 
 #. strptime format of a weekday, a date and a time,
 #. in 12-hour format, without seconds.
-#: e-util/e-time-utils.c:185 e-util/e-time-utils.c:398
+#: e-util/e-time-utils.c:172 e-util/e-time-utils.c:385
 #, fuzzy
 msgid "%a %m/%d/%Y %I:%M %p"
 msgstr "%a %d/%m/%Y %I:%M:%S %p"
 
 #. strptime format of a weekday, a date and a time,
 #. in 24-hour format, without seconds.
-#: e-util/e-time-utils.c:190 e-util/e-time-utils.c:389
+#: e-util/e-time-utils.c:177 e-util/e-time-utils.c:376
 #, fuzzy
 msgid "%a %m/%d/%Y %H:%M"
 msgstr "%a %d/%m/%Y %H:%M:%S"
 
 #. strptime format of a weekday, a date and a time,
 #. in 12-hour format, without minutes or seconds.
-#: e-util/e-time-utils.c:195
+#: e-util/e-time-utils.c:182
 #, fuzzy
 msgid "%a %m/%d/%Y %I %p"
 msgstr "%a %d/%m/%Y %I:%M:%S %p"
 
 #. strptime format of a weekday, a date and a time,
 #. in 24-hour format, without minutes or seconds.
-#: e-util/e-time-utils.c:200
+#: e-util/e-time-utils.c:187
 #, fuzzy
 msgid "%a %m/%d/%Y %H"
 msgstr "%a %d/%m/%Y %H:%M:%S"
 
 #. strptime format of a date and a time, in 12-hour format.
-#: e-util/e-time-utils.c:211
+#: e-util/e-time-utils.c:198
 #, fuzzy
 msgid "%m/%d/%Y %I:%M:%S %p"
 msgstr "%a %d/%m/%Y %I:%M:%S %p"
 
 #. strptime format of a date and a time, in 24-hour format.
-#: e-util/e-time-utils.c:215
+#: e-util/e-time-utils.c:202
 #, fuzzy
 msgid "%m/%d/%Y %H:%M:%S"
 msgstr "%a %d/%m/%Y %H:%M:%S"
 
 #. strptime format of a date and a time, in 12-hour format,
 #. without seconds.
-#: e-util/e-time-utils.c:220
+#: e-util/e-time-utils.c:207
 #, fuzzy
 msgid "%m/%d/%Y %I:%M %p"
 msgstr "%a %d/%m/%Y %I:%M:%S %p"
 
 #. strptime format of a date and a time, in 24-hour format,
 #. without seconds.
-#: e-util/e-time-utils.c:225
+#: e-util/e-time-utils.c:212
 #, fuzzy
 msgid "%m/%d/%Y %H:%M"
 msgstr "%a %d/%m/%Y %H:%M:%S"
 
 #. strptime format of a date and a time, in 12-hour format,
 #. without minutes or seconds.
-#: e-util/e-time-utils.c:230
+#: e-util/e-time-utils.c:217
 #, fuzzy
 msgid "%m/%d/%Y %I %p"
 msgstr "%a %d/%m/%Y %I:%M:%S %p"
 
 #. strptime format of a date and a time, in 24-hour format,
 #. without minutes or seconds.
-#: e-util/e-time-utils.c:235
+#: e-util/e-time-utils.c:222
 #, fuzzy
 msgid "%m/%d/%Y %H"
 msgstr "%d/%m/%Y"
 
 #. strptime format for a time of day, in 12-hour format.
-#: e-util/e-time-utils.c:339 e-util/e-time-utils.c:438
+#: e-util/e-time-utils.c:326 e-util/e-time-utils.c:425
 #, fuzzy
 msgid "%I:%M:%S %p"
 msgstr "%I:%M:%S %p%n"
 
 #. strptime format for a time of day, in 24-hour format.
-#: e-util/e-time-utils.c:343 e-util/e-time-utils.c:430
+#: e-util/e-time-utils.c:330 e-util/e-time-utils.c:417
 #, fuzzy
 msgid "%H:%M:%S"
 msgstr "%H:%M:%S%n"
 
 #. strptime format for time of day, without seconds,
 #. in 12-hour format.
-#: e-util/e-time-utils.c:348 e-util/e-time-utils.c:435
-#: widgets/misc/e-dateedit.c:1417 widgets/misc/e-dateedit.c:1642
+#: e-util/e-time-utils.c:335 e-util/e-time-utils.c:422
+#: widgets/misc/e-dateedit.c:1404 widgets/misc/e-dateedit.c:1617
 msgid "%I:%M %p"
 msgstr "%I:%M %p"
 
 #. strptime format for time of day, without seconds 24-hour format.
-#: e-util/e-time-utils.c:352 e-util/e-time-utils.c:427
-#: widgets/misc/e-dateedit.c:1414 widgets/misc/e-dateedit.c:1639
+#: e-util/e-time-utils.c:339 e-util/e-time-utils.c:414
+#: widgets/misc/e-dateedit.c:1401 widgets/misc/e-dateedit.c:1614
 msgid "%H:%M"
 msgstr "%H:%M"
 
 #. strptime format for hour and AM/PM, 12-hour format.
-#: e-util/e-time-utils.c:356
+#: e-util/e-time-utils.c:343
 #, fuzzy
 msgid "%I %p"
 msgstr "%I:%M %p"
 
-#: executive-summary/component/component-factory.c:151
-#, fuzzy
-msgid "Cannot initialize Evolution's Executive Summary component."
-msgstr "No es pot inicialitzar el component de correu de l'Evolution."
-
-#: executive-summary/component/e-summary.c:925
-#, fuzzy, c-format
-msgid ""
-"Cannot open the HTML file:\n"
-"%s"
-msgstr ""
-"No s'ha pogut obrir el fitxer %s:\n"
-"%s"
-
-#: executive-summary/component/e-summary.c:939
-#, fuzzy, c-format
-msgid ""
-"Error reading data:\n"
-"%s"
-msgstr "Error en carregar el fitxer: %s"
-
-#: executive-summary/component/e-summary.c:957
-msgid "File does not have a place for the services.\n"
-msgstr ""
-
-#: executive-summary/component/e-summary-callbacks.c:125
-#, fuzzy
-msgid "Select a service"
-msgstr "Fitxer de signatura:"
-
-#: executive-summary/component/e-summary-callbacks.c:289
-msgid ""
-"You can select a different HTML page for the background of the Executive "
-"Summary.\n"
-"\n"
-"Just leave it blank for the default"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:69
-#: executive-summary/component/e-summary-url.c:74
-#: executive-summary/component/e-summary-url.c:81
-#, c-format
-msgid "Open %s with the default GNOME application"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:70
-#, c-format
-msgid "Open %s with the default GNOME web browser"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:71
-#, fuzzy, c-format
-msgid "Send an email to %s"
-msgstr "S'està recollint el correu des de %s"
-
-#: executive-summary/component/e-summary-url.c:72
-#, c-format
-msgid "Change the view to %s"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:73
-#, fuzzy, c-format
-msgid "Run %s"
-msgstr "URL:"
-
-#: executive-summary/component/e-summary-url.c:75
-#, fuzzy, c-format
-msgid "Close %s"
-msgstr "Tanca"
-
-#: executive-summary/component/e-summary-url.c:76
-#, fuzzy, c-format
-msgid "Move %s to the left"
-msgstr "Mou a la carpeta"
-
-#: executive-summary/component/e-summary-url.c:77
-#, fuzzy, c-format
-msgid "Move %s to the right"
-msgstr "Mou a la carpeta"
-
-#: executive-summary/component/e-summary-url.c:78
-#, fuzzy, c-format
-msgid "Move %s into the previous row"
-msgstr "Vés a l'element anterior"
-
-#: executive-summary/component/e-summary-url.c:79
-#, fuzzy, c-format
-msgid "Move %s into the next row"
-msgstr "Vés a l'element següent"
-
-#: executive-summary/component/e-summary-url.c:80
-#, fuzzy, c-format
-msgid "Configure %s"
-msgstr "_Configura la carpeta"
-
-#: executive-summary/component/e-summary-url.c:553
-#, fuzzy
-msgid "page"
-msgstr "Pàgina"
-
-#: executive-summary/test-service/rdf-summary.c:512
-#: executive-summary/test-service/rdf-summary.c:549
-#: executive-summary/test-service/rdf-summary.c:594
-#, fuzzy
-msgid "Error"
-msgstr "Cap error"
-
-#: executive-summary/test-service/rdf-summary.c:775
-msgid "Update automatically"
-msgstr ""
-
-#: executive-summary/test-service/rdf-summary.c:785
-#, fuzzy
-msgid "Update now"
-msgstr "ha estat després de"
-
-#: executive-summary/test-service/rdf-summary.c:795
-#, fuzzy
-msgid "Update every "
-msgstr "_Actualitza lliure/ocupat"
-
 #: filter/filter-datespec.c:65
 #, fuzzy
 msgid "1 second ago"
@@ -12052,6 +11768,92 @@ msgstr "Nom de l'estil:"
 msgid "Select Folder"
 msgstr "Seleccioneu una carpeta"
 
+#: filter/filter-input.c:191
+#, fuzzy, c-format
+msgid ""
+"Error in regular expression '%s':\n"
+"%s"
+msgstr ""
+"Error en preparar-se per a %s:\n"
+"%s"
+
+#: filter/filter-label.c:121 filter/libfilter-i18n.h:26 mail/mail-config.c:65
+#: mail/mail-config.glade.h:62 shell/e-config-upgrade.c:1411
+msgid "Important"
+msgstr ""
+
+#. red
+#: filter/filter-label.c:122 mail/mail-config.c:66
+#: mail/mail-config.glade.h:129 shell/e-config-upgrade.c:1412
+#, fuzzy
+msgid "Work"
+msgstr "S'està movent"
+
+#. orange
+#: filter/filter-label.c:123 mail/mail-config.c:67 mail/mail-config.glade.h:84
+#: shell/e-config-upgrade.c:1413
+msgid "Personal"
+msgstr ""
+
+#. forest green
+#: filter/filter-label.c:124 mail/mail-config.c:68
+#: mail/mail-config.glade.h:120 shell/e-config-upgrade.c:1414
+#, fuzzy
+msgid "To Do"
+msgstr "Per a"
+
+#. blue
+#: filter/filter-label.c:125 mail/mail-config.c:69 mail/mail-config.glade.h:66
+#: shell/e-config-upgrade.c:1415
+#, fuzzy
+msgid "Later"
+msgstr "després de"
+
+#: filter/filter-part.c:531 shell/evolution-test-component.c:63
+msgid "Test"
+msgstr "Comprova"
+
+#: filter/filter-rule.c:219
+msgid "You must name this filter."
+msgstr ""
+
+#: filter/filter-rule.c:751
+msgid "Rule name: "
+msgstr "Nom de la regla: "
+
+#: filter/filter-rule.c:755
+msgid "Untitled"
+msgstr "Sense títol"
+
+#: filter/filter-rule.c:772
+msgid "If"
+msgstr "Si"
+
+#: filter/filter-rule.c:791
+msgid "Execute actions"
+msgstr "Executa les accions"
+
+#: filter/filter-rule.c:795
+msgid "if all criteria are met"
+msgstr "si es compleixen tots els criteris"
+
+#: filter/filter-rule.c:800
+#, fuzzy
+msgid "if any criteria are met"
+msgstr "si es compleix qualsevol criteri"
+
+#: filter/filter-rule.c:895
+#, fuzzy
+msgid "incoming"
+msgstr ""
+"Entrant\n"
+"Sortint\n"
+
+#: filter/filter-rule.c:895
+#, fuzzy
+msgid "outgoing"
+msgstr "Agrupament"
+
 #: filter/filter.glade.h:1
 msgid "Compare against"
 msgstr "Compara-la amb"
@@ -12163,92 +11965,6 @@ msgstr "Crea una carpeta nova"
 msgid "years"
 msgstr "anys"
 
-#: filter/filter-input.c:191
-#, fuzzy, c-format
-msgid ""
-"Error in regular expression '%s':\n"
-"%s"
-msgstr ""
-"Error en preparar-se per a %s:\n"
-"%s"
-
-#: filter/filter-label.c:121 filter/libfilter-i18n.h:17 mail/mail-config.c:65
-#: mail/mail-config.glade.h:62 shell/e-config-upgrade.c:1454
-msgid "Important"
-msgstr ""
-
-#. red
-#: filter/filter-label.c:122 mail/mail-config.c:66
-#: mail/mail-config.glade.h:129 shell/e-config-upgrade.c:1455
-#, fuzzy
-msgid "Work"
-msgstr "S'està movent"
-
-#. orange
-#: filter/filter-label.c:123 mail/mail-config.c:67 mail/mail-config.glade.h:84
-#: shell/e-config-upgrade.c:1456
-msgid "Personal"
-msgstr ""
-
-#. forest green
-#: filter/filter-label.c:124 mail/mail-config.c:68
-#: mail/mail-config.glade.h:120 shell/e-config-upgrade.c:1457
-#, fuzzy
-msgid "To Do"
-msgstr "Per a"
-
-#. blue
-#: filter/filter-label.c:125 mail/mail-config.c:69 mail/mail-config.glade.h:66
-#: shell/e-config-upgrade.c:1458
-#, fuzzy
-msgid "Later"
-msgstr "després de"
-
-#: filter/filter-part.c:531 shell/evolution-test-component.c:63
-msgid "Test"
-msgstr "Comprova"
-
-#: filter/filter-rule.c:219
-msgid "You must name this filter."
-msgstr ""
-
-#: filter/filter-rule.c:751
-msgid "Rule name: "
-msgstr "Nom de la regla: "
-
-#: filter/filter-rule.c:755
-msgid "Untitled"
-msgstr "Sense títol"
-
-#: filter/filter-rule.c:772
-msgid "If"
-msgstr "Si"
-
-#: filter/filter-rule.c:791
-msgid "Execute actions"
-msgstr "Executa les accions"
-
-#: filter/filter-rule.c:795
-msgid "if all criteria are met"
-msgstr "si es compleixen tots els criteris"
-
-#: filter/filter-rule.c:800
-#, fuzzy
-msgid "if any criteria are met"
-msgstr "si es compleix qualsevol criteri"
-
-#: filter/filter-rule.c:895
-#, fuzzy
-msgid "incoming"
-msgstr ""
-"Entrant\n"
-"Sortint\n"
-
-#: filter/filter-rule.c:895
-#, fuzzy
-msgid "outgoing"
-msgstr "Agrupament"
-
 #. Automatically generated. Do not edit.
 #: filter/libfilter-i18n.h:2
 #, fuzzy
@@ -12275,241 +11991,241 @@ msgid "Beep"
 msgstr "Mida"
 
 #: filter/libfilter-i18n.h:7
+msgid "contains"
+msgstr "conté"
+
+#: filter/libfilter-i18n.h:8
 msgid "Copy to Folder"
 msgstr "Copia a la carpeta"
 
-#: filter/libfilter-i18n.h:8
+#: filter/libfilter-i18n.h:9
 msgid "Date received"
 msgstr "Data de recepció"
 
-#: filter/libfilter-i18n.h:9
+#: filter/libfilter-i18n.h:10
 msgid "Date sent"
 msgstr "Data d'enviament"
 
-#: filter/libfilter-i18n.h:11
+#: filter/libfilter-i18n.h:12
 #, fuzzy
 msgid "Deleted"
 msgstr "Suprimeix"
 
-#: filter/libfilter-i18n.h:12
+#: filter/libfilter-i18n.h:13
+msgid "does not contain"
+msgstr "no conté"
+
+#: filter/libfilter-i18n.h:14
+msgid "does not end with"
+msgstr "no acaba amb "
+
+#: filter/libfilter-i18n.h:15
+msgid "does not exist"
+msgstr "no existeix"
+
+#: filter/libfilter-i18n.h:16
+#, fuzzy
+msgid "does not return"
+msgstr "no existeix"
+
+#: filter/libfilter-i18n.h:17
+#, fuzzy
+msgid "does not sound like"
+msgstr "no acaba amb "
+
+#: filter/libfilter-i18n.h:18
+msgid "does not start with"
+msgstr "no comença per"
+
+#: filter/libfilter-i18n.h:19
 #, fuzzy
 msgid "Do Not Exist"
 msgstr "no existeix"
 
-#: filter/libfilter-i18n.h:13
+#: filter/libfilter-i18n.h:20
 #, fuzzy
 msgid "Draft"
 msgstr "Data de venciment"
 
-#: filter/libfilter-i18n.h:14
+#: filter/libfilter-i18n.h:21
+msgid "ends with"
+msgstr "acaba amb"
+
+#: filter/libfilter-i18n.h:22
 #, fuzzy
 msgid "Exist"
 msgstr "S_urt"
 
-#: filter/libfilter-i18n.h:15
+#: filter/libfilter-i18n.h:23
+msgid "exists"
+msgstr "existeix"
+
+#: filter/libfilter-i18n.h:24
 msgid "Expression"
 msgstr "Expressió"
 
-#: filter/libfilter-i18n.h:16
+#: filter/libfilter-i18n.h:25
 msgid "Follow Up"
 msgstr ""
 
-#: filter/libfilter-i18n.h:18
+#: filter/libfilter-i18n.h:27
+msgid "is"
+msgstr "és"
+
+#: filter/libfilter-i18n.h:28
+#, fuzzy
+msgid "is after"
+msgstr "ha estat després de"
+
+#: filter/libfilter-i18n.h:29
+#, fuzzy
+msgid "is before"
+msgstr "ha estat abans de"
+
+#: filter/libfilter-i18n.h:30
+msgid "is Flagged"
+msgstr ""
+
+#: filter/libfilter-i18n.h:31
+msgid "is greater than"
+msgstr "és més gran que"
+
+#: filter/libfilter-i18n.h:32
+msgid "is less than"
+msgstr "és més petit que"
+
+#: filter/libfilter-i18n.h:33
+msgid "is not"
+msgstr "no és"
+
+#: filter/libfilter-i18n.h:34
+#, fuzzy
+msgid "is not Flagged"
+msgstr "no és"
+
+#: filter/libfilter-i18n.h:35 mail/folder-browser.c:1800
 #, fuzzy
 msgid "Label"
 msgstr "etiqueta9"
 
-#: filter/libfilter-i18n.h:19
+#: filter/libfilter-i18n.h:36
 #, fuzzy
 msgid "Mailing list"
 msgstr "Llista de correu %s"
 
-#: filter/libfilter-i18n.h:20
+#: filter/libfilter-i18n.h:37
 msgid "Message Body"
 msgstr "Cos del missatge"
 
-#: filter/libfilter-i18n.h:21
+#: filter/libfilter-i18n.h:38
 #, fuzzy
 msgid "Message Header"
 msgstr "Cos del missatge"
 
-#: filter/libfilter-i18n.h:22
+#: filter/libfilter-i18n.h:39
 msgid "Move to Folder"
 msgstr "Mou a la carpeta"
 
-#: filter/libfilter-i18n.h:23
+#: filter/libfilter-i18n.h:40
 #, fuzzy
 msgid "Pipe Message to Shell Command"
 msgstr "FIXME: Nou _missatge per contactar"
 
-#: filter/libfilter-i18n.h:24
+#: filter/libfilter-i18n.h:41
 #, fuzzy
 msgid "Play Sound"
 msgstr "Final del dia:"
 
-#: filter/libfilter-i18n.h:25 mail/message-tag-followup.c:68
+#: filter/libfilter-i18n.h:42 mail/message-tag-followup.c:68
 #, fuzzy
 msgid "Read"
 msgstr "Ràdio"
 
-#: filter/libfilter-i18n.h:26
+#: filter/libfilter-i18n.h:43
 msgid "Recipients"
 msgstr "Destinataris"
 
-#: filter/libfilter-i18n.h:27
+#: filter/libfilter-i18n.h:44
 msgid "Regex Match"
 msgstr ""
 
-#: filter/libfilter-i18n.h:28
+#: filter/libfilter-i18n.h:45
 #, fuzzy
 msgid "Replied to"
 msgstr "Respon a tots"
 
-#: filter/libfilter-i18n.h:29 filter/score-rule.c:184 filter/score-rule.c:186
+#: filter/libfilter-i18n.h:46
+#, fuzzy
+msgid "returns"
+msgstr "Ocupat"
+
+#: filter/libfilter-i18n.h:47
+#, fuzzy
+msgid "returns greater than"
+msgstr "és més gran que"
+
+#: filter/libfilter-i18n.h:48
+#, fuzzy
+msgid "returns less than"
+msgstr "és més petit que"
+
+#: filter/libfilter-i18n.h:49 filter/score-rule.c:184 filter/score-rule.c:186
 #: mail/message-list.etspec.h:10
 msgid "Score"
 msgstr "Puntuació"
 
-#: filter/libfilter-i18n.h:30
+#: filter/libfilter-i18n.h:50 mail/mail-callbacks.c:1820
 msgid "Sender"
 msgstr "Remitent"
 
-#: filter/libfilter-i18n.h:31
+#: filter/libfilter-i18n.h:51
 #, fuzzy
 msgid "Set Status"
 msgstr "Estat de la connexió"
 
-#: filter/libfilter-i18n.h:32
+#: filter/libfilter-i18n.h:52
 #, fuzzy
 msgid "Shell Command"
 msgstr "Empresa"
 
-#: filter/libfilter-i18n.h:33
+#: filter/libfilter-i18n.h:53
 #, fuzzy
 msgid "Size (kB)"
 msgstr "Mida"
 
-#: filter/libfilter-i18n.h:34
+#: filter/libfilter-i18n.h:54
+msgid "sounds like"
+msgstr ""
+
+#: filter/libfilter-i18n.h:55
 #, fuzzy
 msgid "Source Account"
 msgstr "conté"
 
-#: filter/libfilter-i18n.h:35
+#: filter/libfilter-i18n.h:56
 msgid "Specific header"
 msgstr "Especifiqueu la capçalera"
 
-#: filter/libfilter-i18n.h:37
+#: filter/libfilter-i18n.h:57
+msgid "starts with"
+msgstr "comença per"
+
+#: filter/libfilter-i18n.h:59
 msgid "Stop Processing"
 msgstr "Atura el processament"
 
-#: filter/libfilter-i18n.h:38 mail/message-list.etspec.h:13
-#: mail/message-tag-followup.c:305
+#: filter/libfilter-i18n.h:60 mail/mail-format.c:934
+#: mail/message-list.etspec.h:13 mail/message-tag-followup.c:305
 msgid "Subject"
 msgstr "Assumpte"
 
-#: filter/libfilter-i18n.h:39
+#: filter/libfilter-i18n.h:61
 #, fuzzy
 msgid "Unset Status"
 msgstr "Estat de la connexió"
 
-#: filter/libfilter-i18n.h:40
-msgid "contains"
-msgstr "conté"
-
-#: filter/libfilter-i18n.h:41
-msgid "does not contain"
-msgstr "no conté"
-
-#: filter/libfilter-i18n.h:42
-msgid "does not end with"
-msgstr "no acaba amb "
-
-#: filter/libfilter-i18n.h:43
-msgid "does not exist"
-msgstr "no existeix"
-
-#: filter/libfilter-i18n.h:44
-#, fuzzy
-msgid "does not return"
-msgstr "no existeix"
-
-#: filter/libfilter-i18n.h:45
-#, fuzzy
-msgid "does not sound like"
-msgstr "no acaba amb "
-
-#: filter/libfilter-i18n.h:46
-msgid "does not start with"
-msgstr "no comença per"
-
-#: filter/libfilter-i18n.h:47
-msgid "ends with"
-msgstr "acaba amb"
-
-#: filter/libfilter-i18n.h:48
-msgid "exists"
-msgstr "existeix"
-
-#: filter/libfilter-i18n.h:49
-msgid "is Flagged"
-msgstr ""
-
-#: filter/libfilter-i18n.h:50
-#, fuzzy
-msgid "is after"
-msgstr "ha estat després de"
-
-#: filter/libfilter-i18n.h:51
-#, fuzzy
-msgid "is before"
-msgstr "ha estat abans de"
-
-#: filter/libfilter-i18n.h:52
-msgid "is greater than"
-msgstr "és més gran que"
-
-#: filter/libfilter-i18n.h:53
-msgid "is less than"
-msgstr "és més petit que"
-
-#: filter/libfilter-i18n.h:54
-#, fuzzy
-msgid "is not Flagged"
-msgstr "no és"
-
-#: filter/libfilter-i18n.h:55
-msgid "is not"
-msgstr "no és"
-
-#: filter/libfilter-i18n.h:56
-msgid "is"
-msgstr "és"
-
-#: filter/libfilter-i18n.h:57
-#, fuzzy
-msgid "returns greater than"
-msgstr "és més gran que"
-
-#: filter/libfilter-i18n.h:58
-#, fuzzy
-msgid "returns less than"
-msgstr "és més petit que"
-
-#: filter/libfilter-i18n.h:59
-#, fuzzy
-msgid "returns"
-msgstr "Ocupat"
-
-#: filter/libfilter-i18n.h:60
-msgid "sounds like"
-msgstr ""
-
-#: filter/libfilter-i18n.h:61
-msgid "starts with"
-msgstr "comença per"
-
-#: filter/rule-context.c:684 filter/rule-editor.c:241 filter/rule-editor.c:326
-#: mail/mail-vfolder.c:916
+#: filter/rule-context.c:664 filter/rule-editor.c:241 filter/rule-editor.c:326
+#: mail/mail-vfolder.c:917
 #, c-format
 msgid "Rule name '%s' is not unique, choose another."
 msgstr ""
@@ -12585,9 +12301,10 @@ msgid "Scanning %s"
 msgstr "S'està examinant %s"
 
 #: importers/elm-importer.c:525 importers/netscape-importer.c:2128
-#: importers/pine-importer.c:637 mail/component-factory.c:116
-#: mail/importers/elm-importer.c:526 mail/importers/netscape-importer.c:2085
-#: mail/importers/pine-importer.c:572 my-evolution/my-evolution.glade.h:4
+#: importers/pine-importer.c:637 mail/component-factory.c:117
+#: mail/folder-browser-ui.c:360 mail/importers/elm-importer.c:526
+#: mail/importers/netscape-importer.c:2085 mail/importers/pine-importer.c:572
+#: my-evolution/my-evolution.glade.h:4
 #, fuzzy
 msgid "Mail"
 msgstr "_Correu"
@@ -12651,7 +12368,7 @@ msgstr ""
 
 #. Fill in the new fields
 #: importers/netscape-importer.c:1872 mail/importers/netscape-importer.c:1842
-#: mail/mail-ops.c:1106 shell/e-local-storage.c:184
+#: mail/mail-ops.c:1092 shell/e-local-storage.c:184
 #, fuzzy
 msgid "Trash"
 msgstr "Tasca"
@@ -12668,7 +12385,7 @@ msgid "Scanning directory"
 msgstr "S'estan escanejant les carpetes de \"%s\""
 
 #: importers/netscape-importer.c:2047 mail/importers/netscape-importer.c:2015
-#: shell/e-shell-startup-wizard.c:556
+#: shell/e-shell-startup-wizard.c:541
 #, fuzzy
 msgid "Starting import"
 msgstr "Data d'_inici:"
@@ -12704,172 +12421,382 @@ msgstr ""
 msgid "Pine"
 msgstr "Imprimeix"
 
-#: mail/component-factory.c:116
+#: mail/GNOME_Evolution_Mail.server.in.in.h:1
+#, fuzzy
+msgid "Composer Preferences"
+msgstr "Preferències de l'agenda"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:2
+msgid ""
+"Configure mail preferences, including security and message display, here"
+msgstr ""
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:3
+msgid "Configure spell-checking, signatures, and the message composer here"
+msgstr ""
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:4
+msgid "Configure your email accounts here"
+msgstr ""
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:5
+#, fuzzy
+msgid "Evolution Mail"
+msgstr "Evolution"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:6
+#, fuzzy
+msgid "Evolution Mail accounts configuration control"
+msgstr "Configuració del correu"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:7
+#, fuzzy
+msgid "Evolution Mail component"
+msgstr "No es pot inicialitzar el component de correu de l'Evolution."
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:8
+#, fuzzy
+msgid "Evolution Mail composer"
+msgstr "No es pot inicialitzar el component de correu de l'Evolution."
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:9
+#, fuzzy
+msgid "Evolution Mail composer configuration control"
+msgstr "Configuració del correu"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:10
+#, fuzzy
+msgid "Evolution Mail configuration interface"
+msgstr "Configuració del correu"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:11
+#, fuzzy
+msgid "Evolution Mail folder viewer"
+msgstr ""
+"No es pot inicialitzar el component de resum del correu de l'Evolution."
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:12
+#, fuzzy
+msgid "Evolution Mail preferences control"
+msgstr ""
+"No es pot inicialitzar el component de resum del correu de l'Evolution."
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:13
+#, fuzzy
+msgid "Mail Accounts"
+msgstr "conté"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:69
+#, fuzzy
+msgid "Mail Preferences"
+msgstr "Preferències"
+
+#: mail/component-factory.c:117
 #, fuzzy
 msgid "Folder containing mail"
 msgstr "Filtre sobre la llista de correu"
 
-#: mail/component-factory.c:117
+#: mail/component-factory.c:118
 #, fuzzy
 msgid "Public Mail"
 msgstr "Públic"
 
-#: mail/component-factory.c:117
+#: mail/component-factory.c:118
 #, fuzzy
 msgid "Public folder containing mail"
 msgstr "Filtre sobre la llista de correu"
 
-#: mail/component-factory.c:118
+#: mail/component-factory.c:119
 #, fuzzy
 msgid "Virtual Trash"
 msgstr "Carpetes virtuals"
 
-#: mail/component-factory.c:118
+#: mail/component-factory.c:119
 #, fuzzy
 msgid "Virtual Trash folder"
 msgstr "Carpetes virtuals"
 
-#: mail/component-factory.c:146
+#: mail/component-factory.c:147
 msgid "This folder cannot contain messages."
 msgstr ""
 
-#: mail/component-factory.c:444
+#: mail/component-factory.c:441
 #, fuzzy
 msgid "Properties..."
 msgstr "Propietats..."
 
-#: mail/component-factory.c:444
+#: mail/component-factory.c:441
 #, fuzzy
 msgid "Change this folder's properties"
 msgstr "Propietats de la llista de coses per fer"
 
-#: mail/component-factory.c:826
+#: mail/component-factory.c:819
 msgid ""
 "Some of your mail settings seem corrupt, please check that everything is in "
 "order."
 msgstr ""
 
-#: mail/component-factory.c:1008
+#: mail/component-factory.c:1000
 msgid "You have not set a mail transport method"
 msgstr "No heu definit cap mètode de transport de correu"
 
-#: mail/component-factory.c:1031
+#: mail/component-factory.c:1023
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr ""
 
-#: mail/component-factory.c:1071
+#: mail/component-factory.c:1063
 #, fuzzy
 msgid "New Mail Message"
 msgstr "FIXME: Missatge de _correu"
 
-#: mail/component-factory.c:1071
+#: mail/component-factory.c:1063
 #, fuzzy
 msgid "_Mail Message"
 msgstr "FIXME: Missatge de _correu"
 
-#: mail/component-factory.c:1072
+#: mail/component-factory.c:1064
 #, fuzzy
 msgid "Compose a new mail message"
 msgstr "Redacta un missatge"
 
-#: mail/component-factory.c:1080
+#: mail/component-factory.c:1072
 #, fuzzy
 msgid "New Message Post"
 msgstr "_Missatge"
 
-#: mail/component-factory.c:1080
+#: mail/component-factory.c:1072
 #, fuzzy
 msgid "_Post Message"
 msgstr "_Imprimeix el missatge"
 
-#: mail/component-factory.c:1081
+#: mail/component-factory.c:1073
 #, fuzzy
 msgid "Post a new mail message"
 msgstr "FIXME: Missatge de _correu"
 
-#: mail/component-factory.c:1373
+#: mail/component-factory.c:1365
 #, fuzzy
 msgid "Connecting..."
 msgstr "Connexió de prova a \"%s\""
 
-#: mail/component-factory.c:1384
+#: mail/component-factory.c:1376
 msgid "Cannot register storage with shell"
 msgstr "No es pot registrar l'emmagatzemament amb l'intèrpret d'ordres"
 
-#: mail/folder-info.c:70
-#, fuzzy
-msgid "Getting Folder Information"
-msgstr "Cap informació"
+#: mail/folder-browser-ui.c:486
+#, fuzzy, c-format
+msgid "Properties for \"%s\""
+msgstr "Propietats..."
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:1
+#: mail/folder-browser-ui.c:488
 #, fuzzy
-msgid "Composer Preferences"
-msgstr "Preferències de l'agenda"
+msgid "Properties"
+msgstr "Propietats..."
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:2
-msgid ""
-"Configure mail preferences, including security and message display, here"
+#: mail/folder-browser.c:327 mail/mail-display.c:394 mail/mail-display.c:942
+#, c-format
+msgid "Could not create temporary directory: %s"
+msgstr "No s'ha pogut crear el directori temporal: %s"
+
+#: mail/folder-browser.c:782
+#, c-format
+msgid "%d new"
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:3
-msgid "Configure spell-checking, signatures, and the message composer here"
+#: mail/folder-browser.c:785 mail/folder-browser.c:793
+#: mail/folder-browser.c:796
+msgid ", "
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:4
-msgid "Configure your email accounts here"
+#: mail/folder-browser.c:787
+#, c-format
+msgid "%d hidden"
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:5
+#: mail/folder-browser.c:789
+#, c-format
+msgid "%d visible"
+msgstr ""
+
+#: mail/folder-browser.c:794
+#, fuzzy, c-format
+msgid "%d selected"
+msgstr "Suprimeix"
+
+#: mail/folder-browser.c:799
+#, fuzzy, c-format
+msgid "%d unsent"
+msgstr " segons"
+
+#: mail/folder-browser.c:801
+#, fuzzy, c-format
+msgid "%d sent"
+msgstr " segons"
+
+#: mail/folder-browser.c:803
+#, c-format
+msgid "%d total"
+msgstr ""
+
+#: mail/folder-browser.c:1182
 #, fuzzy
-msgid "Evolution Mail"
-msgstr "Evolution"
+msgid "Create _Virtual Folder From Search..."
+msgstr "Carpetes virtuals"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:6
+#: mail/folder-browser.c:1736
 #, fuzzy
-msgid "Evolution Mail accounts configuration control"
-msgstr "Configuració del correu"
+msgid "VFolder on _Subject"
+msgstr "VFolder sobre l'assumpte"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:7
+#: mail/folder-browser.c:1737
+msgid "VFolder on Se_nder"
+msgstr "VFolder sobre el remite_nt"
+
+#: mail/folder-browser.c:1738
+msgid "VFolder on _Recipients"
+msgstr "VFolder sobre els destinata_ris"
+
+#: mail/folder-browser.c:1739
 #, fuzzy
-msgid "Evolution Mail component"
-msgstr "No es pot inicialitzar el component de correu de l'Evolution."
+msgid "VFolder on Mailing _List"
+msgstr "Filtre sobre la llista de correu"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:8
+#: mail/folder-browser.c:1743
 #, fuzzy
-msgid "Evolution Mail composer"
-msgstr "No es pot inicialitzar el component de correu de l'Evolution."
+msgid "Filter on Sub_ject"
+msgstr "Filtre sobre l'assumpte"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:9
+#: mail/folder-browser.c:1744
 #, fuzzy
-msgid "Evolution Mail composer configuration control"
-msgstr "Configuració del correu"
+msgid "Filter on Sen_der"
+msgstr "Filtre sobre el remitent"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:10
+#: mail/folder-browser.c:1745
 #, fuzzy
-msgid "Evolution Mail configuration interface"
-msgstr "Configuració del correu"
+msgid "Filter on Re_cipients"
+msgstr "Filtre sobre els destinataris"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:11
+#: mail/folder-browser.c:1746 mail/folder-browser.c:2070
 #, fuzzy
-msgid "Evolution Mail folder viewer"
-msgstr ""
-"No es pot inicialitzar el component de resum del correu de l'Evolution."
+msgid "Filter on _Mailing List"
+msgstr "Filtre sobre la llista de correu"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:12
+#: mail/folder-browser.c:1764
 #, fuzzy
-msgid "Evolution Mail preferences control"
+msgid "_Edit as New Message..."
+msgstr "_Anomena i desa..."
+
+#: mail/folder-browser.c:1766
+msgid "_Print"
+msgstr "_Imprimeix"
+
+#: mail/folder-browser.c:1770 ui/evolution-mail-message.xml.h:110
+#, fuzzy
+msgid "_Reply to Sender"
+msgstr "Respon al remitent"
+
+#: mail/folder-browser.c:1771 ui/evolution-mail-message.xml.h:75
+#, fuzzy
+msgid "Reply to _List"
+msgstr "Respon a _tots"
+
+#: mail/folder-browser.c:1772 ui/evolution-mail-message.xml.h:74
+msgid "Reply to _All"
+msgstr "Respon a _tots"
+
+#: mail/folder-browser.c:1773
+msgid "_Forward"
+msgstr "_Reenvia"
+
+#: mail/folder-browser.c:1777
+msgid "Follo_w Up..."
 msgstr ""
-"No es pot inicialitzar el component de resum del correu de l'Evolution."
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:13
+#: mail/folder-browser.c:1778
 #, fuzzy
-msgid "Mail Accounts"
-msgstr "conté"
+msgid "Fla_g Completed"
+msgstr "% comp_let:"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:69
+#: mail/folder-browser.c:1779
 #, fuzzy
-msgid "Mail Preferences"
-msgstr "Preferències"
+msgid "Cl_ear Flag"
+msgstr "Agenda"
+
+#. separator here?
+#: mail/folder-browser.c:1783 ui/evolution-mail-message.xml.h:43
+#, fuzzy
+msgid "Mar_k as Read"
+msgstr "Mar_ca'l com a llegit"
+
+#: mail/folder-browser.c:1784
+#, fuzzy
+msgid "Mark as _Unread"
+msgstr "Marca'l com a per _llegir"
+
+#: mail/folder-browser.c:1785
+#, fuzzy
+msgid "Mark as _Important"
+msgstr "Marca'l com a per _llegir"
+
+#: mail/folder-browser.c:1786
+#, fuzzy
+msgid "_Mark as Unimportant"
+msgstr "Marca'l com a per _llegir"
+
+#: mail/folder-browser.c:1791
+#, fuzzy
+msgid "U_ndelete"
+msgstr "_Suprimeix"
+
+#: mail/folder-browser.c:1795
+#, fuzzy
+msgid "Mo_ve to Folder..."
+msgstr "Mou a la carpeta"
+
+#: mail/folder-browser.c:1796 ui/evolution-addressbook.xml.h:31
+#, fuzzy
+msgid "_Copy to Folder..."
+msgstr "_Copia a la carpeta"
+
+#: mail/folder-browser.c:1804
+#, fuzzy
+msgid "Add Sender to Address_book"
+msgstr "Desa a la llibreta d'adreces"
+
+#: mail/folder-browser.c:1808
+#, fuzzy
+msgid "Appl_y Filters"
+msgstr "_Aplica els filtres"
+
+#: mail/folder-browser.c:1812
+#, fuzzy
+msgid "Crea_te Rule From Message"
+msgstr "Carpetes virtuals"
+
+#: mail/folder-browser.c:2071
+#, fuzzy
+msgid "VFolder on M_ailing List"
+msgstr "Filtre sobre la llista de correu"
+
+#: mail/folder-browser.c:2073
+#, fuzzy, c-format
+msgid "Filter on _Mailing List (%s)"
+msgstr "Filtre sobre la llista de correu (%s)"
+
+#: mail/folder-browser.c:2074
+#, fuzzy, c-format
+msgid "VFolder on M_ailing List (%s)"
+msgstr "Filtre sobre la llista de correu (%s)"
+
+#: mail/folder-browser.h:26 mail/mail-config.glade.h:39
+#, fuzzy
+msgid "Default"
+msgstr "Valors predeterminats"
+
+#: mail/folder-info.c:70
+#, fuzzy
+msgid "Getting Folder Information"
+msgstr "Cap informació"
 
 #: mail/importers/GNOME_Evolution_Mail_Elm_Intelligent_Importer.server.in.in.h:1
 #, fuzzy
@@ -12964,7 +12891,7 @@ msgstr "Nom d'usuari:"
 msgid "_Path:"
 msgstr "Camí:"
 
-#: mail/mail-account-gui.c:1886
+#: mail/mail-account-gui.c:1887
 msgid "You may not create two accounts with the same name."
 msgstr ""
 
@@ -13001,18 +12928,18 @@ msgstr "Valors predeterminats"
 
 #. FIXME: This routine should just be a "toggled" event handler on the checkbox cell renderer which
 #. has "activatable" set.
-#: mail/mail-accounts.c:481 mail/mail-composer-prefs.c:708
-#: mail/mail-composer-prefs.c:854
+#: mail/mail-accounts.c:481 mail/mail-accounts.etspec.h:2
+#: mail/mail-composer-prefs.c:708 mail/mail-composer-prefs.c:854
 #, fuzzy
 msgid "Enabled"
 msgstr "Inhabilitat"
 
-#: mail/mail-accounts.c:487
+#: mail/mail-accounts.c:487 mail/mail-accounts.etspec.h:1
 #, fuzzy
 msgid "Account name"
 msgstr "conté"
 
-#: mail/mail-accounts.c:489
+#: mail/mail-accounts.c:489 mail/mail-accounts.etspec.h:3
 msgid "Protocol"
 msgstr ""
 
@@ -13052,6 +12979,220 @@ msgid ""
 "And have been updated."
 msgstr ""
 
+#. Add the "Don't show this message again." checkbox
+#: mail/mail-callbacks.c:101 widgets/misc/e-messagebox.c:226
+#, fuzzy
+msgid "Don't show this message again."
+msgstr "Envia aquest missatge"
+
+#: mail/mail-callbacks.c:190
+msgid ""
+"You have not configured the mail client.\n"
+"You need to do this before you can send,\n"
+"receive or compose mail.\n"
+"Would you like to configure it now?"
+msgstr ""
+"No heu configurat el client de correu.\n"
+"Cal que ho feu abans de poder enviar,\n"
+"rebre o redactar correu.\n"
+"El voleu configurar ara?"
+
+#: mail/mail-callbacks.c:212
+#, fuzzy
+msgid ""
+"You need to configure an account\n"
+"before you can compose mail."
+msgstr ""
+"Cal que configureu una identitat\n"
+"abans de poder redactar correu."
+
+#: mail/mail-callbacks.c:226
+msgid ""
+"You need to configure an identity\n"
+"before you can compose mail."
+msgstr ""
+"Cal que configureu una identitat\n"
+"abans de poder redactar correu."
+
+#: mail/mail-callbacks.c:233
+msgid ""
+"You need to configure a mail transport\n"
+"before you can compose mail."
+msgstr ""
+"Cal que configureu un transport de correu\n"
+"abans de poder redactar correu."
+
+#. FIXME: this wording sucks
+#: mail/mail-callbacks.c:255
+msgid ""
+"You are sending an HTML-formatted message. Please make sure that\n"
+"the following recipients are willing and able to receive HTML mail:\n"
+msgstr ""
+
+#: mail/mail-callbacks.c:267
+#, fuzzy
+msgid "Send anyway?"
+msgstr "S'està recollint el correu des de %s"
+
+#: mail/mail-callbacks.c:288
+msgid ""
+"This message has no subject.\n"
+"Really send?"
+msgstr ""
+"Aquest missatge no té cap assumpte.\n"
+"Voleu que l'enviï igualment?"
+
+#: mail/mail-callbacks.c:314
+msgid ""
+"Since the contact list you are sending to is configured to hide the list's "
+"addresses, this message will contain only Bcc recipients."
+msgstr ""
+
+#: mail/mail-callbacks.c:318
+#, fuzzy
+msgid "This message contains only Bcc recipients."
+msgstr "S'està afegint un missatge sense cap assumpte"
+
+#: mail/mail-callbacks.c:323
+msgid ""
+"It is possible that the mail server may reveal the recipients by adding an "
+"Apparently-To header.\n"
+"Send anyway?"
+msgstr ""
+
+#: mail/mail-callbacks.c:472
+msgid "You must specify recipients in order to send this message."
+msgstr "Cal que indiqueu els destinataris per poder enviar aquest missatge."
+
+#: mail/mail-callbacks.c:724
+msgid ""
+"Unable to open the drafts folder for this account.\n"
+"Would you like to use the default drafts folder?"
+msgstr ""
+
+#: mail/mail-callbacks.c:1189
+#, fuzzy
+msgid "an unknown sender"
+msgstr "Error desconegut"
+
+#: mail/mail-callbacks.c:1193
+msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
+msgstr ""
+
+#: mail/mail-callbacks.c:1700 mail/message-browser.c:132
+msgid "Move message(s) to"
+msgstr "Mou el(s) missatge(s) cap a"
+
+#: mail/mail-callbacks.c:1702 mail/message-browser.c:134
+msgid "Copy message(s) to"
+msgstr "Copia el(s) missatge(s) a"
+
+#: mail/mail-callbacks.c:2344
+#, fuzzy, c-format
+msgid "Are you sure you want to edit all %d messages?"
+msgstr ""
+"Esteu segur que voleu\n"
+"suprimir aquest contacte?"
+
+#: mail/mail-callbacks.c:2360
+msgid ""
+"You may only edit messages saved\n"
+"in the Drafts folder."
+msgstr ""
+"Només podeu editar els missatges que s'hagin desat\n"
+"a la carpeta Esborranys."
+
+#: mail/mail-callbacks.c:2393
+#, fuzzy
+msgid ""
+"You may only resend messages\n"
+"in the Sent folder."
+msgstr ""
+"Només podeu editar els missatges que s'hagin desat\n"
+"a la carpeta Esborranys."
+
+#: mail/mail-callbacks.c:2403
+#, fuzzy, c-format
+msgid "Are you sure you want to resend all %d messages?"
+msgstr ""
+"Esteu segur que voleu\n"
+"suprimir aquest contacte?"
+
+#: mail/mail-callbacks.c:2424
+#, fuzzy
+msgid "No Message Selected"
+msgstr "S'ha rebut el missatge"
+
+#: mail/mail-callbacks.c:2465
+#, fuzzy, c-format
+msgid ""
+"Cannot save to `%s'\n"
+" %s"
+msgstr ""
+"No es pot obrir la ubicació `%s':\n"
+"%s"
+
+#: mail/mail-callbacks.c:2470
+#, fuzzy, c-format
+msgid ""
+"`%s' already exists.\n"
+"Overwrite it?"
+msgstr ""
+"Ja existeix una fitxer amb aquest nom.\n"
+"El voleu sobreescriure?"
+
+#: mail/mail-callbacks.c:2511
+#, fuzzy
+msgid "Save Message As..."
+msgstr "Anomena i desa..."
+
+#: mail/mail-callbacks.c:2513
+#, fuzzy
+msgid "Save Messages As..."
+msgstr "Anomena i desa..."
+
+#: mail/mail-callbacks.c:2686
+msgid ""
+"This operation will permanently erase all messages marked as\n"
+"deleted. If you continue, you will not be able to recover these messages.\n"
+"\n"
+"Really erase these messages?"
+msgstr ""
+
+#: mail/mail-callbacks.c:2781
+#, c-format
+msgid ""
+"Error loading filter information:\n"
+"%s"
+msgstr ""
+"Error en carregar la informació del filtre:\n"
+"%s"
+
+#: mail/mail-callbacks.c:2789
+#, fuzzy
+msgid "Filters"
+msgstr "_Filtres de correu ..."
+
+#: mail/mail-callbacks.c:2830
+#, fuzzy, c-format
+msgid "Page %d of %d"
+msgstr "S'està escrivint el missatge %d de %d"
+
+#: mail/mail-callbacks.c:2886
+msgid "Print Message"
+msgstr "Imprimeix el missatge"
+
+#: mail/mail-callbacks.c:2954
+msgid "Printing of message failed"
+msgstr "Ha fallat la impressió del missatge"
+
+#: mail/mail-callbacks.c:3147
+#, fuzzy, c-format
+msgid "Are you sure you want to open all %d messages in separate windows?"
+msgstr ""
+"Esteu segur que voleu\n"
+"suprimir aquest contacte?"
+
 #: mail/mail-composer-prefs.c:226 mail/mail-composer-prefs.c:349
 #: mail/mail-config.c:1376
 #, fuzzy
@@ -13083,57 +13224,48 @@ msgstr "Afegeix un criteri"
 msgid "Signature(s)"
 msgstr "Fitxer de signatura:"
 
-#: mail/mail-config.c:1080
-msgid "Checking Service"
-msgstr ""
-
-#: mail/mail-config.c:1158 mail/mail-config.c:1162
-#, fuzzy
-msgid "Connecting to server..."
-msgstr "Connexió de prova a \"%s\""
-
-#: mail/mail-config-druid.c:367 mail/mail-config.glade.h:61
+#: mail/mail-config-druid.c:380 mail/mail-config.glade.h:61
 msgid "Identity"
 msgstr "Identitat"
 
-#: mail/mail-config-druid.c:369
+#: mail/mail-config-druid.c:382
 msgid ""
 "Please enter your name and email address below. The \"optional\" fields "
 "below do not need to be filled in, unless you wish to include this "
 "information in email you send."
 msgstr ""
 
-#: mail/mail-config-druid.c:375 mail/mail-config-druid.c:382
+#: mail/mail-config-druid.c:388 mail/mail-config-druid.c:395
 #, fuzzy
 msgid "Receiving Mail"
 msgstr "Sendmail"
 
-#: mail/mail-config-druid.c:377
+#: mail/mail-config-druid.c:390
 msgid ""
 "Please enter information about your incoming mail server below. If you are "
 "not sure, ask your system administrator or Internet Service Provider."
 msgstr ""
 
-#: mail/mail-config-druid.c:384
+#: mail/mail-config-druid.c:397
 msgid "Please select among the following options"
 msgstr ""
 
-#: mail/mail-config-druid.c:387
+#: mail/mail-config-druid.c:400
 #, fuzzy
 msgid "Sending Mail"
 msgstr "Sendmail"
 
-#: mail/mail-config-druid.c:389
+#: mail/mail-config-druid.c:402
 msgid ""
 "Please enter information about the way you will send mail. If you are not "
 "sure, ask your system administrator or Internet Service Provider."
 msgstr ""
 
-#: mail/mail-config-druid.c:394 mail/mail-config.glade.h:10
+#: mail/mail-config-druid.c:407 mail/mail-config.glade.h:10
 msgid "Account Management"
 msgstr ""
 
-#: mail/mail-config-druid.c:396
+#: mail/mail-config-druid.c:409
 msgid ""
 "You are almost done with the mail configuration process. The identity, "
 "incoming mail server and outgoing mail transport method which you provided "
@@ -13142,6 +13274,15 @@ msgid ""
 "purposes only."
 msgstr ""
 
+#: mail/mail-config.c:1080
+msgid "Checking Service"
+msgstr ""
+
+#: mail/mail-config.c:1158 mail/mail-config.c:1162
+#, fuzzy
+msgid "Connecting to server..."
+msgstr "Connexió de prova a \"%s\""
+
 #: mail/mail-config.glade.h:3
 #, fuzzy
 msgid " _Check for supported types "
@@ -13276,11 +13417,6 @@ msgstr ""
 msgid "De_fault"
 msgstr "Valors predeterminats"
 
-#: mail/mail-config.glade.h:39
-#, fuzzy
-msgid "Default"
-msgstr "Valors predeterminats"
-
 #: mail/mail-config.glade.h:40
 #, fuzzy
 msgid "Default Behavior"
@@ -13785,27 +13921,235 @@ msgstr ""
 msgid "_Use the same fonts as other applications"
 msgstr ""
 
+#: mail/mail-config.glade.h:171
+#, fuzzy
+msgid "color"
+msgstr "Colors"
+
 #: mail/mail-config.glade.h:172
 #, fuzzy
 msgid "description"
 msgstr "Descripció:"
 
-#: mail/mail-folder-cache.c:832
+#: mail/mail-crypto.c:84
+#, fuzzy
+msgid "Could not create a S/MIME signature context."
+msgstr "No s'ha pogut crear el quadre de diàleg."
+
+#: mail/mail-crypto.c:116
+#, fuzzy
+msgid "Could not create a S/MIME certsonly context."
+msgstr "No s'ha pogut crear el quadre de diàleg."
+
+#: mail/mail-crypto.c:148
+#, fuzzy
+msgid "Could not create a S/MIME encryption context."
+msgstr "No s'ha pogut crear el quadre de diàleg."
+
+#: mail/mail-crypto.c:180
+#, fuzzy
+msgid "Could not create a S/MIME envelope context."
+msgstr "No s'ha pogut crear el quadre de diàleg."
+
+#: mail/mail-crypto.c:211
+#, fuzzy
+msgid "Could not create a S/MIME decode context."
+msgstr "No s'ha pogut crear el quadre de diàleg."
+
+#: mail/mail-display.c:197
+#, fuzzy, c-format
+msgid ""
+"File `%s' already exists.\n"
+"Overwrite it?"
+msgstr ""
+"Ja existeix una fitxer amb aquest nom.\n"
+"El voleu sobreescriure?"
+
+#: mail/mail-display.c:336
+msgid "Save Attachment"
+msgstr "Desa l'adjunció"
+
+#: mail/mail-display.c:409
+#, fuzzy, c-format
+msgid "Could not create temporary file '%s': %s"
+msgstr "No s'ha pogut crear la mbox temporal `%s': %s"
+
+#: mail/mail-display.c:457
+#, fuzzy
+msgid "Save Attachment..."
+msgstr "Desa l'adjunció"
+
+#: mail/mail-display.c:458
+msgid "View Inline"
+msgstr "Visualitza en línia"
+
+#: mail/mail-display.c:459
+#, c-format
+msgid "Open in %s..."
+msgstr "Obre a %s..."
+
+#: mail/mail-display.c:515
+#, c-format
+msgid "View Inline (via %s)"
+msgstr "Visualitza en línia (mitjançant %s)"
+
+#: mail/mail-display.c:519
+msgid "Hide"
+msgstr "Amaga"
+
+#: mail/mail-display.c:539
+msgid "External Viewer"
+msgstr "Visualitzador extern"
+
+#: mail/mail-display.c:1368
+#, fuzzy
+msgid "Downloading images"
+msgstr "Missatge reenviat - %s"
+
+#: mail/mail-display.c:1545
+#, fuzzy
+msgid "Loading message content"
+msgstr "S'estan reenviant els missatges \"%s\""
+
+#: mail/mail-display.c:1887
+#, fuzzy
+msgid "Overdue:"
+msgstr "Elements que ja han vençut:"
+
+#: mail/mail-display.c:1891
+#, fuzzy
+msgid "by %B %d, %Y, %l:%M %P"
+msgstr "%a %d/%m/%Y %I:%M:%S %p"
+
+#: mail/mail-display.c:2255
+#, fuzzy
+msgid "Open Link in Browser"
+msgstr "Obre'l en una nova finestra"
+
+#: mail/mail-display.c:2256
+#, fuzzy
+msgid "Copy Link Location"
+msgstr "_Contacte (FIXME)"
+
+#: mail/mail-display.c:2258
+#, fuzzy
+msgid "Save Link as (FIXME)"
+msgstr "_Tasca (FIXME)"
+
+#: mail/mail-display.c:2260
+#, fuzzy
+msgid "Save Image as..."
+msgstr "Anomena i desa..."
+
+#: mail/mail-folder-cache.c:745
 #, fuzzy, c-format
 msgid "Pinging %s"
 msgstr "S'està examinant %s"
 
+#: mail/mail-format.c:665
+#, fuzzy, c-format
+msgid "%s attachment"
+msgstr "adjunció"
+
+#: mail/mail-format.c:707 mail/mail-format.c:1370 mail/mail-format.c:1439
+#: mail/mail-format.c:1559 mail/mail-format.c:1683 mail/mail-format.c:1708
+#, fuzzy
+msgid "Could not parse MIME message. Displaying as source."
+msgstr "No s'ha pogut obrir la carpeta: la llista de missatges era incompleta."
+
+#: mail/mail-format.c:785 mail/message-list.etspec.h:2
+#, fuzzy
+msgid "Date"
+msgstr "Data de venciment"
+
+#: mail/mail-format.c:871
+#, fuzzy
+msgid "Bad Address"
+msgstr "Adreça electrònica:"
+
+#: mail/mail-format.c:912 mail/message-list.etspec.h:7
+#: mail/message-tag-followup.c:301
+#, fuzzy
+msgid "From"
+msgstr "De:"
+
+#: mail/mail-format.c:916
+#, fuzzy
+msgid "Reply-To"
+msgstr "Respon"
+
+#: mail/mail-format.c:921 mail/message-list.etspec.h:14
+msgid "To"
+msgstr "Per a"
+
+#: mail/mail-format.c:926
+#, fuzzy
+msgid "Cc"
+msgstr "Cc:"
+
+#: mail/mail-format.c:931
+#, fuzzy
+msgid "Bcc"
+msgstr "Bcc:"
+
+#: mail/mail-format.c:1482
+msgid ""
+"This message is digitally signed. Click the lock icon for more information."
+msgstr ""
+
+#: mail/mail-format.c:1510
+#, fuzzy
+msgid "Could not create a PGP verfication context"
+msgstr "No s'ha pogut crear el quadre de diàleg."
+
+#: mail/mail-format.c:1518
+msgid "This message is digitally signed and has been found to be authentic."
+msgstr ""
+
+#: mail/mail-format.c:1525
+msgid "This message is digitally signed but can not be proven to be authentic."
+msgstr ""
+
+#: mail/mail-format.c:1789
+#, c-format
+msgid "Pointer to FTP site (%s)"
+msgstr ""
+
+#: mail/mail-format.c:1800
+#, c-format
+msgid "Pointer to local file (%s) valid at site \"%s\""
+msgstr ""
+
+#: mail/mail-format.c:1803
+#, fuzzy, c-format
+msgid "Pointer to local file (%s)"
+msgstr "Filtre sobre la llista de correu (%s)"
+
+#: mail/mail-format.c:1830
+#, fuzzy, c-format
+msgid "Pointer to remote data (%s)"
+msgstr "Filtre sobre la llista de correu (%s)"
+
+#: mail/mail-format.c:1836
+#, c-format
+msgid "Pointer to unknown external data (\"%s\" type)"
+msgstr ""
+
+#: mail/mail-format.c:1838
+msgid "Malformed external-body part."
+msgstr ""
+
 #: mail/mail-local.c:541 mail/mail-local.c:543
 #, fuzzy, c-format
 msgid "Local folders/%s"
 msgstr "Carpetes virtuals"
 
-#: mail/mail-local.c:711
+#: mail/mail-local.c:671
 #, fuzzy
 msgid "Reconfiguring folder"
 msgstr "_Configura la carpeta"
 
-#: mail/mail-local.c:792
+#: mail/mail-local.c:752
 #, fuzzy, c-format
 msgid ""
 "Cannot save folder metainfo; you may find you can't\n"
@@ -13814,24 +14158,24 @@ msgstr ""
 "No es pot desar la informació meta de la carpeta; probablement\n"
 "no la podreu tornar a obrir: %s"
 
-#: mail/mail-local.c:848
+#: mail/mail-local.c:808
 #, fuzzy, c-format
 msgid "Cannot save folder metainfo to %s: %s"
 msgstr "No es pot bifurcar %s: %s"
 
-#: mail/mail-local.c:900
+#: mail/mail-local.c:860
 #, fuzzy, c-format
 msgid "Cannot delete folder metadata %s: %s"
 msgstr ""
 "No s'ha pogut suprimir la carpeta `%s':\n"
 "%s"
 
-#: mail/mail-local.c:1363
+#: mail/mail-local.c:1323
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "S'està convertint la carpeta \"%s\" al format \"%s\""
 
-#: mail/mail-local.c:1388
+#: mail/mail-local.c:1348
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
@@ -13839,16 +14183,16 @@ msgstr ""
 "Si ja no podeu obrir aquesta bústia de correu\n"
 "potser us caldrà reparar-la manualment."
 
-#: mail/mail-local.c:1488
+#: mail/mail-local.c:1448
 #, fuzzy, c-format
 msgid "Reconfigure /%s"
 msgstr "_Configura la carpeta"
 
-#: mail/mail-local.c:1552
+#: mail/mail-local.c:1512
 msgid "You cannot change the format of a non-local folder."
 msgstr ""
 
-#: mail/mail-mt.c:259
+#: mail/mail-mt.c:257
 #, fuzzy, c-format
 msgid ""
 "Error while '%s':\n"
@@ -13857,7 +14201,7 @@ msgstr ""
 "Error en `%s':\n"
 "%s"
 
-#: mail/mail-mt.c:262
+#: mail/mail-mt.c:260
 #, fuzzy, c-format
 msgid ""
 "Error while performing operation:\n"
@@ -13866,241 +14210,267 @@ msgstr ""
 "Error en preparar-se per a %s:\n"
 "%s"
 
-#: mail/mail-mt.c:913
+#: mail/mail-mt.c:904
 #, fuzzy
 msgid "Working"
 msgstr "S'està movent"
 
-#: mail/mail-ops.c:87
+#: mail/mail-ops.c:86
 #, fuzzy
 msgid "Filtering Folder"
 msgstr "Fi_ltre sobre el remitent"
 
-#: mail/mail-ops.c:260
+#: mail/mail-ops.c:264
 #, fuzzy
 msgid "Fetching Mail"
 msgstr "Sendmail"
 
-#: mail/mail-ops.c:557
-#, fuzzy, c-format
-msgid "Failed to apply outgoing filters: %s"
-msgstr "No s'ha pogut emmagatzemar el correu en el fitxer temporal %s: %s"
-
-#: mail/mail-ops.c:578
-#, c-format
-msgid ""
-"Failed to append to %s: %s\n"
-"Appending to local `Sent' folder instead."
+#: mail/mail-ops.c:550 mail/mail-ops.c:579
+msgid "However, the message was successfully sent."
 msgstr ""
 
-#: mail/mail-ops.c:587
-#, fuzzy, c-format
-msgid "Failed to append to local `Sent' folder: %s"
-msgstr "No s'ha pogut emmagatzemar el correu en el fitxer temporal %s: %s"
-
-#: mail/mail-ops.c:629
+#: mail/mail-ops.c:611
 #, c-format
 msgid "Sending \"%s\""
 msgstr "S'està enviant \"%s\""
 
-#: mail/mail-ops.c:747
+#: mail/mail-ops.c:729
 #, fuzzy, c-format
 msgid "Sending message %d of %d"
 msgstr "S'està escrivint el missatge %d de %d"
 
-#: mail/mail-ops.c:766
+#: mail/mail-ops.c:748
 #, fuzzy, c-format
 msgid "Failed on message %d of %d"
 msgstr "S'està marcant el missatge %d de %d"
 
-#: mail/mail-ops.c:768
+#: mail/mail-ops.c:750 mail/mail-send-recv.c:581
 #, fuzzy
 msgid "Complete."
 msgstr "% comp_let:"
 
-#: mail/mail-ops.c:862
+#: mail/mail-ops.c:844
 #, fuzzy
 msgid "Saving message to folder"
 msgstr "S'estan adjuntant els missatges de la carpeta \"%s\""
 
-#: mail/mail-ops.c:943
+#: mail/mail-ops.c:925
 #, fuzzy, c-format
 msgid "Moving messages to %s"
 msgstr "Mou el(s) missatge(s) cap a"
 
-#: mail/mail-ops.c:943
+#: mail/mail-ops.c:925
 #, fuzzy, c-format
 msgid "Copying messages to %s"
 msgstr "Còpia de missatges"
 
-#: mail/mail-ops.c:1056
+#: mail/mail-ops.c:1042
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "S'estan escanejant les carpetes de \"%s\""
 
-#: mail/mail-ops.c:1244
+#: mail/mail-ops.c:1225
 #, fuzzy
 msgid "Forwarded messages"
 msgstr "Missatge reenviat - %s"
 
-#: mail/mail-ops.c:1287
+#: mail/mail-ops.c:1268
 #, fuzzy, c-format
 msgid "Opening folder %s"
 msgstr "S'estan escanejant les carpetes de \"%s\""
 
-#: mail/mail-ops.c:1359
+#: mail/mail-ops.c:1340
 #, fuzzy, c-format
 msgid "Opening store %s"
 msgstr "S'estan escanejant les carpetes de \"%s\""
 
-#: mail/mail-ops.c:1437
+#: mail/mail-ops.c:1413
 #, fuzzy, c-format
 msgid "Removing folder %s"
 msgstr "S'estan escanejant les carpetes de \"%s\""
 
-#: mail/mail-ops.c:1531
+#: mail/mail-ops.c:1507
 #, fuzzy, c-format
 msgid "Storing folder '%s'"
 msgstr "S'estan escanejant les carpetes de \"%s\""
 
-#: mail/mail-ops.c:1582
+#: mail/mail-ops.c:1558
 #, fuzzy
 msgid "Refreshing folder"
 msgstr "_Configura la carpeta"
 
-#: mail/mail-ops.c:1618 mail/mail-ops.c:1669
+#: mail/mail-ops.c:1594 mail/mail-ops.c:1645
 #, fuzzy
 msgid "Expunging folder"
 msgstr "S'està esborrant \"%s\""
 
-#: mail/mail-ops.c:1666
+#: mail/mail-ops.c:1642
 #, fuzzy, c-format
 msgid "Emptying trash in '%s'"
 msgstr "S'està movent"
 
-#: mail/mail-ops.c:1667 my-evolution/e-summary-mail.c:483
+#: mail/mail-ops.c:1643 my-evolution/e-summary-mail.c:483
 #: shell/e-local-storage.c:1151
 #, fuzzy
 msgid "Local Folders"
 msgstr "Carpetes virtuals"
 
-#: mail/mail-ops.c:1742
+#: mail/mail-ops.c:1718
 #, fuzzy, c-format
 msgid "Retrieving message %s"
 msgstr "S'estan recuperant els missatges : %s"
 
-#: mail/mail-ops.c:1814
+#: mail/mail-ops.c:1790
 #, fuzzy, c-format
 msgid "Retrieving %d message(s)"
 msgstr "S'estan recuperant els missatges : %s"
 
-#: mail/mail-ops.c:1898
+#: mail/mail-ops.c:1876
 #, fuzzy, c-format
 msgid "Saving %d messsage(s)"
 msgstr "Còpia de missatges"
 
-#: mail/mail-ops.c:1946
+#: mail/mail-ops.c:1924
 #, fuzzy, c-format
 msgid ""
 "Unable to create output file: %s\n"
 " %s"
 msgstr "No es pot desar el fitxer de llista de grups per a %s: %s"
 
-#: mail/mail-ops.c:1974
+#: mail/mail-ops.c:1952
 #, fuzzy, c-format
 msgid ""
 "Error saving messages to: %s:\n"
 " %s"
 msgstr "Error en desar el fitxer: %s"
 
-#: mail/mail-ops.c:2045
+#: mail/mail-ops.c:2026
 #, fuzzy
 msgid "Saving attachment"
 msgstr "Desa l'adjunció"
 
-#: mail/mail-ops.c:2062
+#: mail/mail-ops.c:2043
 #, fuzzy, c-format
 msgid ""
 "Cannot create output file: %s:\n"
 " %s"
 msgstr "No es pot desar el fitxer de llista de grups per a %s: %s"
 
-#: mail/mail-ops.c:2092
+#: mail/mail-ops.c:2073
 #, c-format
 msgid "Could not write data: %s"
 msgstr "No s'han pogut escriure les dades: %s"
 
-#: mail/mail-ops.c:2240
+#: mail/mail-ops.c:2221
 #, fuzzy, c-format
 msgid "Disconnecting from %s"
 msgstr "S'està recollint el correu des de %s"
 
-#: mail/mail-ops.c:2240
+#: mail/mail-ops.c:2221
 #, fuzzy, c-format
 msgid "Reconnecting to %s"
 msgstr "S'està recollint el correu des de %s"
 
-#: mail/mail-send-recv.c:147
+#: mail/mail-search.c:154
+#, fuzzy
+msgid "(Untitled Message)"
+msgstr "(Sense títol)"
+
+#: mail/mail-search.c:236
+#, fuzzy
+msgid "Untitled Message"
+msgstr "Mou el missatge"
+
+#: mail/mail-search.c:238
+#, fuzzy
+msgid "Empty Message"
+msgstr "_Edita el missatge"
+
+#: mail/mail-search.c:287
+#, fuzzy
+msgid "Find in Message"
+msgstr "_Edita el missatge"
+
+#: mail/mail-search.c:320
+msgid "Case Sensitive"
+msgstr ""
+
+#: mail/mail-search.c:322
+#, fuzzy
+msgid "Search Forward"
+msgstr "Reenvia"
+
+#: mail/mail-search.c:342
+#, fuzzy
+msgid "Find:"
+msgstr "Cerca"
+
+#: mail/mail-search.c:346
+#, fuzzy
+msgid "Matches:"
+msgstr "Camí:"
+
+#: mail/mail-send-recv.c:146
 #, fuzzy
 msgid "Cancelling..."
 msgstr "Cancel·lat"
 
-#: mail/mail-send-recv.c:255
+#: mail/mail-send-recv.c:254
 #, fuzzy, c-format
 msgid "Server: %s, Type: %s"
 msgstr "Servidor:"
 
-#: mail/mail-send-recv.c:257
+#: mail/mail-send-recv.c:256
 #, c-format
 msgid "Path: %s, Type: %s"
 msgstr ""
 
-#: mail/mail-send-recv.c:259
+#: mail/mail-send-recv.c:258
 #, fuzzy, c-format
 msgid "Type: %s"
 msgstr "Tipus:"
 
-#: mail/mail-send-recv.c:308
+#: mail/mail-send-recv.c:306
 #, fuzzy
 msgid "Send & Receive Mail"
 msgstr "Sendmail"
 
-#: mail/mail-send-recv.c:309
+#: mail/mail-send-recv.c:307
 #, fuzzy
 msgid "Cancel _All"
 msgstr "Cancel·lat"
 
-#: mail/mail-send-recv.c:390
+#: mail/mail-send-recv.c:389
 #, fuzzy
 msgid "Updating..."
 msgstr "_Paràmetres"
 
-#: mail/mail-send-recv.c:390 mail/mail-send-recv.c:442
+#: mail/mail-send-recv.c:390 mail/mail-send-recv.c:446
 #, fuzzy
 msgid "Waiting..."
 msgstr "_Paràmetres"
 
-#: mail/mail-session.c:229
+#: mail/mail-session.c:226
 #, fuzzy
 msgid "User canceled operation."
 msgstr "Consulta cancel·lada per l'usuari."
 
-#: mail/mail-session.c:262
+#: mail/mail-session.c:259
 #, fuzzy, c-format
 msgid "Enter Password for %s"
 msgstr "Si us plau, introduïu la contrasenya NNTP per a %s@%s"
 
-#: mail/mail-session.c:264
+#: mail/mail-session.c:261
 #, fuzzy
 msgid "Enter Password"
 msgstr "Si us plau, introduïu la contrasenya NNTP per a %s@%s"
 
-#: mail/mail-session.c:287
+#: mail/mail-session.c:284
 #, fuzzy
 msgid "_Remember this password"
 msgstr "Desa com a VCard"
 
-#: mail/mail-session.c:288
+#: mail/mail-session.c:285
 msgid "_Remember this password for the remainder of this session"
 msgstr ""
 
@@ -14155,17 +14525,22 @@ msgstr "Missatge reenviat - %s"
 msgid "Forwarded message"
 msgstr "Missatge reenviat - %s"
 
-#: mail/mail-vfolder.c:91
+#: mail/mail-tools.c:438
+#, fuzzy
+msgid "Forwarded Message"
+msgstr "Reenvia el missatge"
+
+#: mail/mail-vfolder.c:92
 #, fuzzy, c-format
 msgid "Setting up vfolder: %s"
 msgstr "S'estan escanejant les carpetes de \"%s\""
 
-#: mail/mail-vfolder.c:209
+#: mail/mail-vfolder.c:210
 #, fuzzy, c-format
 msgid "Updating vfolders for uri: %s"
 msgstr "S'està carregant la carpeta %s"
 
-#: mail/mail-vfolder.c:467
+#: mail/mail-vfolder.c:468
 #, c-format
 msgid ""
 "The following vFolder(s):\n"
@@ -14174,109 +14549,114 @@ msgid ""
 "And have been updated."
 msgstr ""
 
-#: mail/mail-vfolder.c:776
+#: mail/mail-vfolder.c:777
 msgid "VFolders"
 msgstr "VFolders"
 
-#: mail/mail-vfolder.c:834
+#: mail/mail-vfolder.c:835
 #, fuzzy
 msgid "vFolders"
 msgstr "Carpetes"
 
-#: mail/mail-vfolder.c:873
+#: mail/mail-vfolder.c:874
 #, fuzzy
 msgid "Edit VFolder"
 msgstr "Edita les VFolders"
 
-#: mail/mail-vfolder.c:893
+#: mail/mail-vfolder.c:894
 #, c-format
 msgid "Trying to edit a vfolder '%s' which doesn't exist."
 msgstr ""
 
-#: mail/mail-vfolder.c:965
+#: mail/mail-vfolder.c:966
 msgid "New VFolder"
 msgstr "Nova VFolder"
 
-#: mail/message-list.c:900
+#: mail/message-browser.c:233
+#, fuzzy
+msgid "(No subject)"
+msgstr "Re: (sense assumpte)"
+
+#: mail/message-browser.c:235
+#, fuzzy, c-format
+msgid "%s - Message"
+msgstr "_Missatge"
+
+#: mail/message-list.c:741
 msgid "Unseen"
 msgstr "No vist"
 
-#: mail/message-list.c:901
+#: mail/message-list.c:742
 msgid "Seen"
 msgstr "Vist"
 
-#: mail/message-list.c:902
+#: mail/message-list.c:743
 msgid "Answered"
 msgstr "Respost"
 
-#: mail/message-list.c:903
+#: mail/message-list.c:744
 #, fuzzy
 msgid "Multiple Unseen Messages"
 msgstr "No s'ha pogut enviar el missatge: %s"
 
-#: mail/message-list.c:904
+#: mail/message-list.c:745
 #, fuzzy
 msgid "Multiple Messages"
 msgstr "Mou el missatge"
 
-#: mail/message-list.c:908
+#: mail/message-list.c:749
 #, fuzzy
 msgid "Lowest"
 msgstr "Baixa"
 
-#: mail/message-list.c:909
+#: mail/message-list.c:750
 #, fuzzy
 msgid "Lower"
 msgstr "Baixa"
 
-#: mail/message-list.c:913
+#: mail/message-list.c:754
 #, fuzzy
 msgid "Higher"
 msgstr "Alta"
 
-#: mail/message-list.c:914
+#: mail/message-list.c:755
 #, fuzzy
 msgid "Highest"
 msgstr "Alta"
 
-#: mail/message-list.c:1231
+#: mail/message-list.c:1072
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:1238
+#: mail/message-list.c:1079
 #, fuzzy
 msgid "Today %l:%M %p"
 msgstr "%I:%M %p"
 
-#: mail/message-list.c:1247
+#: mail/message-list.c:1088
 msgid "Yesterday %l:%M %p"
 msgstr ""
 
-#: mail/message-list.c:1259
+#: mail/message-list.c:1100
 #, fuzzy
 msgid "%a %l:%M %p"
 msgstr "%I:%M %p"
 
-#: mail/message-list.c:1267
+#: mail/message-list.c:1108
 #, fuzzy
 msgid "%b %d %l:%M %p"
 msgstr "%a %d/%m/%Y %I:%M:%S %p"
 
-#: mail/message-list.c:1269
+#: mail/message-list.c:1110
 #, fuzzy
 msgid "%b %d %Y"
 msgstr "%a %d %Y"
 
-#: mail/message-list.c:3062
+#: mail/message-list.c:2649
 #, fuzzy
 msgid "Generating message list"
 msgstr "Còpia de missatges"
 
-#: mail/message-list.etspec.h:2
-#, fuzzy
-msgid "Date"
-msgstr "Data de venciment"
-
 #: mail/message-list.etspec.h:3
 #, fuzzy
 msgid "Due By"
@@ -14295,11 +14675,6 @@ msgstr ""
 msgid "Follow Up Flag"
 msgstr ""
 
-#: mail/message-list.etspec.h:7 mail/message-tag-followup.c:301
-#, fuzzy
-msgid "From"
-msgstr "De:"
-
 #: mail/message-list.etspec.h:8
 #, fuzzy
 msgid "Original Location"
@@ -14314,10 +14689,6 @@ msgstr "Data de recepció"
 msgid "Size"
 msgstr "Mida"
 
-#: mail/message-list.etspec.h:14
-msgid "To"
-msgstr "Per a"
-
 #: mail/message-tag-followup.c:62
 #, fuzzy
 msgid "Call"
@@ -14337,7 +14708,7 @@ msgstr ""
 msgid "For Your Information"
 msgstr "Cap informació"
 
-#: mail/message-tag-followup.c:66 ui/evolution-mail-message.xml.h:40
+#: mail/message-tag-followup.c:66 ui/evolution-mail-message.xml.h:36
 msgid "Forward"
 msgstr "Reenvia"
 
@@ -14345,11 +14716,11 @@ msgstr "Reenvia"
 msgid "No Response Necessary"
 msgstr ""
 
-#: mail/message-tag-followup.c:69 ui/evolution-mail-message.xml.h:77
+#: mail/message-tag-followup.c:69 ui/evolution-mail-message.xml.h:72
 msgid "Reply"
 msgstr "Respon"
 
-#: mail/message-tag-followup.c:70 ui/evolution-mail-message.xml.h:78
+#: mail/message-tag-followup.c:70 ui/evolution-mail-message.xml.h:73
 msgid "Reply to All"
 msgstr "Respon a tots"
 
@@ -14384,6 +14755,41 @@ msgstr "Data de venciment"
 msgid "_Flag:"
 msgstr "Nom del fitxer:"
 
+#: mail/subscribe-dialog.c:230
+#, fuzzy, c-format
+msgid "Scanning folders under %s on \"%s\""
+msgstr "S'estan escanejant les carpetes de \"%s\""
+
+#: mail/subscribe-dialog.c:232
+#, fuzzy, c-format
+msgid "Scanning root-level folders on \"%s\""
+msgstr "S'estan escanejant les carpetes de \"%s\""
+
+#: mail/subscribe-dialog.c:329
+#, fuzzy, c-format
+msgid "Subscribing to folder \"%s\""
+msgstr "S'estan escanejant les carpetes de \"%s\""
+
+#: mail/subscribe-dialog.c:331
+#, fuzzy, c-format
+msgid "Unsubscribing to folder \"%s\""
+msgstr "S'estan obrint els missatges des de la carpeta \"%s\""
+
+#: mail/subscribe-dialog.c:1270 mail/subscribe-dialog.etspec.h:1
+#: shell/e-storage-set-view.etspec.h:2
+#, fuzzy
+msgid "Folder"
+msgstr "Carpetes"
+
+#: mail/subscribe-dialog.c:1499
+#, fuzzy
+msgid "No server has been selected"
+msgstr "S'ha rebut el missatge"
+
+#: mail/subscribe-dialog.c:1598
+msgid "Please select a server."
+msgstr ""
+
 #: mail/subscribe-dialog.glade.h:1
 #, fuzzy
 msgid "Folder Subscriptions"
@@ -14401,141 +14807,19 @@ msgstr "Servidor:"
 
 #: mail/subscribe-dialog.glade.h:4
 #, fuzzy
+msgid "Scanning folders ..."
+msgstr "Desa a la _carpeta..."
+
+#: mail/subscribe-dialog.glade.h:5
+#, fuzzy
 msgid "_Subscribe"
 msgstr "Subscriu-me"
 
-#: mail/subscribe-dialog.glade.h:5
+#: mail/subscribe-dialog.glade.h:6
 #, fuzzy
 msgid "_Unsubscribe"
 msgstr "Cancel·la la subscripció"
 
-#: my-evolution/component-factory.c:56
-msgid "Folder containing the Evolution Summary"
-msgstr ""
-
-#: my-evolution/e-summary.c:204
-#, fuzzy
-msgid "%A, %B %e %Y"
-msgstr "%A, %d de %B de %Y"
-
-#: my-evolution/e-summary.c:533
-#, fuzzy
-msgid "Please wait..."
-msgstr "acaba amb"
-
-#: my-evolution/e-summary.c:622 ui/my-evolution.xml.h:2
-#, fuzzy
-msgid "Print Summary"
-msgstr "R_esum"
-
-#: my-evolution/e-summary.c:655
-#, fuzzy
-msgid "Printing of Summary failed"
-msgstr "Ha fallat la impressió del missatge"
-
-#: my-evolution/e-summary-calendar.c:384
-#, fuzzy
-msgid "Appointments"
-msgstr "Cites:"
-
-#: my-evolution/e-summary-calendar.c:392
-#, fuzzy
-msgid "No appointments."
-msgstr "Mostra les hores d'acabament de les cites"
-
-#: my-evolution/e-summary-calendar.c:409
-#, fuzzy
-msgid "%k:%M %d %B"
-msgstr "%A, %d de %B"
-
-#: my-evolution/e-summary-calendar.c:411
-#, fuzzy
-msgid "%l:%M%p %d %B"
-msgstr "%A, %d de %B"
-
-#: my-evolution/e-summary-calendar.c:429
-#, fuzzy
-msgid "No description"
-msgstr "Descripció:"
-
-#: my-evolution/e-summary-mail.c:189
-#, fuzzy
-msgid "Mail summary"
-msgstr "Sense resum"
-
-#: my-evolution/e-summary-preferences.c:355
-msgid "Dictionary.com Word of the Day"
-msgstr ""
-
-#: my-evolution/e-summary-preferences.c:373
-msgid "Quotes of the Day"
-msgstr ""
-
-#: my-evolution/e-summary-preferences.c:565
-#, fuzzy
-msgid "New News Feed"
-msgstr "Servidors de notícies"
-
-#: my-evolution/e-summary-preferences.c:581
-#, fuzzy
-msgid "_URL:"
-msgstr "URL:"
-
-#: my-evolution/e-summary-rdf.c:315
-#, fuzzy
-msgid "Error downloading RDF"
-msgstr "Error en carregar el fitxer: %s"
-
-#: my-evolution/e-summary-rdf.c:453
-#, fuzzy
-msgid "News Feed"
-msgstr "Servidors de notícies"
-
-#: my-evolution/e-summary-shown.c:496
-msgid "All"
-msgstr ""
-
-#: my-evolution/e-summary-shown.c:521 my-evolution/e-summary-table.c:58
-#, fuzzy
-msgid "Shown"
-msgstr "Mostra"
-
-#: my-evolution/e-summary-tasks.c:349
-#, fuzzy
-msgid "No tasks"
-msgstr "Mostra les _adjuncions"
-
-#: my-evolution/e-summary-tasks.c:387
-#, fuzzy
-msgid "blue"
-msgstr "desembre"
-
-#: my-evolution/e-summary-tasks.c:387
-#, fuzzy
-msgid "(No Description)"
-msgstr "(Sense descripció)"
-
-#: my-evolution/e-summary-weather.c:72
-msgid "My Weather"
-msgstr ""
-
-#: my-evolution/e-summary-weather.c:261
-msgid "There was an error downloading data for"
-msgstr ""
-
-#: my-evolution/e-summary-weather.c:478 my-evolution/my-evolution.glade.h:16
-#, fuzzy
-msgid "Weather"
-msgstr "Altres"
-
-#. translators: Put here a list of codes for locations you want to
-#. see in My Evolution by default. You can find the list of all
-#. stations and their codes in Evolution sources
-#. (evolution/my-evolution/Locations)
-#: my-evolution/e-summary-weather.c:582
-msgid "KBOS"
-msgstr ""
-
 #: my-evolution/GNOME_Evolution_Summary.server.in.in.h:1
 #, fuzzy
 msgid "Configure the appearance of the Evolution Summary here"
@@ -25236,6 +25520,128 @@ msgstr ""
 msgid "Zurich"
 msgstr "Tasca"
 
+#: my-evolution/component-factory.c:56
+msgid "Folder containing the Evolution Summary"
+msgstr ""
+
+#: my-evolution/e-summary-calendar.c:381
+#, fuzzy
+msgid "Appointments"
+msgstr "Cites:"
+
+#: my-evolution/e-summary-calendar.c:389
+#, fuzzy
+msgid "No appointments."
+msgstr "Mostra les hores d'acabament de les cites"
+
+#: my-evolution/e-summary-calendar.c:406
+#, fuzzy
+msgid "%k:%M %d %B"
+msgstr "%A, %d de %B"
+
+#: my-evolution/e-summary-calendar.c:408
+#, fuzzy
+msgid "%l:%M%P %d %B"
+msgstr "%A, %d de %B"
+
+#: my-evolution/e-summary-calendar.c:426
+#, fuzzy
+msgid "No description"
+msgstr "Descripció:"
+
+#: my-evolution/e-summary-mail.c:189
+#, fuzzy
+msgid "Mail summary"
+msgstr "Sense resum"
+
+#: my-evolution/e-summary-preferences.c:355
+msgid "Dictionary.com Word of the Day"
+msgstr ""
+
+#: my-evolution/e-summary-preferences.c:373
+msgid "Quotes of the Day"
+msgstr ""
+
+#: my-evolution/e-summary-preferences.c:565
+#, fuzzy
+msgid "New News Feed"
+msgstr "Servidors de notícies"
+
+#: my-evolution/e-summary-preferences.c:581
+#, fuzzy
+msgid "_URL:"
+msgstr "URL:"
+
+#: my-evolution/e-summary-rdf.c:315
+#, fuzzy
+msgid "Error downloading RDF"
+msgstr "Error en carregar el fitxer: %s"
+
+#: my-evolution/e-summary-rdf.c:453
+#, fuzzy
+msgid "News Feed"
+msgstr "Servidors de notícies"
+
+#: my-evolution/e-summary-shown.c:496
+msgid "All"
+msgstr ""
+
+#: my-evolution/e-summary-shown.c:521 my-evolution/e-summary-table.c:58
+#, fuzzy
+msgid "Shown"
+msgstr "Mostra"
+
+#: my-evolution/e-summary-tasks.c:330
+#, fuzzy
+msgid "No tasks"
+msgstr "Mostra les _adjuncions"
+
+#: my-evolution/e-summary-tasks.c:364
+#, fuzzy
+msgid "(No Description)"
+msgstr "(Sense descripció)"
+
+#: my-evolution/e-summary-weather.c:73
+msgid "My Weather"
+msgstr ""
+
+#: my-evolution/e-summary-weather.c:262
+msgid "There was an error downloading data for"
+msgstr ""
+
+#: my-evolution/e-summary-weather.c:479 my-evolution/my-evolution.glade.h:16
+#, fuzzy
+msgid "Weather"
+msgstr "Altres"
+
+#. translators: Put here a list of codes for locations you want to
+#. see in My Evolution by default. You can find the list of all
+#. stations and their codes in Evolution sources
+#. (evolution/my-evolution/Locations)
+#: my-evolution/e-summary-weather.c:583
+msgid "KBOS"
+msgstr ""
+
+#: my-evolution/e-summary.c:204
+#, fuzzy
+msgid "%A, %B %e %Y"
+msgstr "%A, %d de %B de %Y"
+
+#: my-evolution/e-summary.c:533
+#, fuzzy
+msgid "Please wait..."
+msgstr "acaba amb"
+
+#: my-evolution/e-summary.c:622 ui/my-evolution.xml.h:2
+#, fuzzy
+msgid "Print Summary"
+msgstr "R_esum"
+
+#: my-evolution/e-summary.c:655
+#, fuzzy
+msgid "Printing of Summary failed"
+msgstr "Ha fallat la impressió del missatge"
+
 #: my-evolution/metar.c:30
 msgid " F"
 msgstr ""
@@ -26554,27 +26960,24 @@ msgstr "Dimecres"
 msgid "_Show full path for folders"
 msgstr "Mostra en aquest ordre"
 
-#: notes/component-factory.c:27
-#: shell/e-shell-user-creatable-items-handler.c:587
-#: shell/e-shell-user-creatable-items-handler.c:643
-#: widgets/misc/e-charset-picker.c:109
-msgid "New"
-msgstr "Nou"
+#: shell/GNOME_Evolution_Shell.server.in.in.h:1
+msgid "Configure special folders and offline folder behavior here"
+msgstr ""
 
-#: notes/component-factory.c:27
+#: shell/GNOME_Evolution_Shell.server.in.in.h:2
 #, fuzzy
-msgid "Create a new note"
-msgstr "Creació d'una nova carpeta"
+msgid "Evolution Shell"
+msgstr "No es pot inicialitzat l'intèrpret d'ordres de l'Evolution."
 
-#: notes/component-factory.c:152
+#: shell/GNOME_Evolution_Shell.server.in.in.h:3
 #, fuzzy
-msgid "Cannot initialize Evolution's notes component."
-msgstr "No es pot inicialitzar el component de correu de l'Evolution."
+msgid "Evolution folder settings configuration control"
+msgstr "Utilitat de configuració per al conducte de l'agenda de l'Evolution.\n"
 
-#: notes/main.c:30
+#: shell/GNOME_Evolution_Shell.server.in.in.h:4
 #, fuzzy
-msgid "Notes Component: Could not initialize bonobo"
-msgstr "No s'ha pogut inicialitzar el Bonobo"
+msgid "Folder Settings"
+msgstr "_Paràmetres"
 
 #: shell/e-activity-handler.c:164
 #, fuzzy
@@ -26672,45 +27075,6 @@ msgstr ""
 msgid "Brought to you by"
 msgstr ""
 
-#: shell/e-shell.c:175
-#, c-format
-msgid ""
-"Cannot activate component %s :\n"
-"The error from the activation system is:\n"
-"%s"
-msgstr ""
-
-#: shell/e-shell.c:741
-#, c-format
-msgid "Cannot set up local storage -- %s"
-msgstr "No es pot configurar l'emmagatzemament local -- %s"
-
-#: shell/e-shell.c:1804
-#, c-format
-msgid ""
-"The Evolution component that handles folders of type \"%s\"\n"
-"has unexpectedly quit. You will need to quit Evolution and restart\n"
-"in order to access that data again."
-msgstr ""
-
-#: shell/e-shell.c:2069
-msgid "Invalid arguments"
-msgstr ""
-
-#: shell/e-shell.c:2071
-#, fuzzy
-msgid "Cannot register on OAF"
-msgstr "No es pot registrar l'emmagatzemament amb l'intèrpret d'ordres"
-
-#: shell/e-shell.c:2073
-#, fuzzy
-msgid "Configuration Database not found"
-msgstr "Configuració del correu"
-
-#: shell/e-shell.c:2075 shell/e-storage.c:568
-msgid "Generic error"
-msgstr "Error genèric"
-
 #: shell/e-shell-config-autocompletion.c:110
 #, fuzzy
 msgid "Extra Completion folders"
@@ -26812,32 +27176,27 @@ msgstr ""
 "No s'ha pogut suprimir la carpeta `%s':\n"
 "%s"
 
-#: shell/e-shell-folder-commands.c:534
+#: shell/e-shell-folder-commands.c:538
 #, fuzzy, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "S'estan escanejant les carpetes de \"%s\""
 
-#: shell/e-shell-folder-commands.c:541
+#: shell/e-shell-folder-commands.c:544
 #, fuzzy
 msgid "Rename Folder"
 msgstr "S'estan escanejant les carpetes de \"%s\""
 
-#: shell/e-shell-folder-commands.c:547
+#: shell/e-shell-folder-commands.c:553
 #: shell/e-shell-folder-creation-dialog.c:180
 #, fuzzy, c-format
 msgid "The specified folder name is not valid: %s"
 msgstr "El nom de carpeta indicat no és vàlid."
 
-#: shell/e-shell-folder-commands.c:554
-#, c-format
-msgid "A folder named \"%s\" already exists. Please use a different name."
-msgstr ""
-
-#: shell/e-shell-folder-commands.c:584
+#: shell/e-shell-folder-commands.c:587
 msgid "Selected folder does not belong to another user"
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:587
+#: shell/e-shell-folder-commands.c:590
 #, fuzzy, c-format
 msgid ""
 "Cannot remove folder:\n"
@@ -26877,134 +27236,125 @@ msgid ""
 "to work it out."
 msgstr ""
 
-#: shell/e-shell-importer.c:148 shell/e-shell-startup-wizard.c:724
+#: shell/e-shell-importer.c:148 shell/e-shell-startup-wizard.c:709
 msgid "Please select the information that you would like to import:"
 msgstr ""
 
-#: shell/e-shell-importer.c:151
-msgid ""
-"Evolution checked for settings to import from the following\n"
-"applications: Pine, Netscape, Elm, iCalendar. No settings\n"
-"that could be imported where found. If you would like to\n"
-"try again, please click the \"Back\" button.\n"
-msgstr ""
-
-#: shell/e-shell-importer.c:219 shell/e-shell-importer.c:250
+#: shell/e-shell-importer.c:213 shell/e-shell-importer.c:244
 #, c-format
 msgid ""
 "Importing %s\n"
 "Importing item %d."
 msgstr ""
 
-#: shell/e-shell-importer.c:323
+#: shell/e-shell-importer.c:317
 #, fuzzy
 msgid "Select importer"
 msgstr "Seleccioneu una carpeta"
 
-#: shell/e-shell-importer.c:464
+#: shell/e-shell-importer.c:458
 #, fuzzy, c-format
 msgid "File %s does not exist"
 msgstr "La carpeta `%s' no existeix."
 
-#: shell/e-shell-importer.c:465 shell/e-shell-importer.c:482
-#: shell/e-shell-importer.c:524
+#: shell/e-shell-importer.c:459 shell/e-shell-importer.c:476
+#: shell/e-shell-importer.c:518
 #, fuzzy
 msgid "Evolution Error"
 msgstr "Evolution"
 
-#: shell/e-shell-importer.c:481
+#: shell/e-shell-importer.c:475
 #, fuzzy, c-format
 msgid ""
 "There is no importer that is able to handle\n"
 "%s"
 msgstr "No hi ha nou correu a %s."
 
-#: shell/e-shell-importer.c:490
+#: shell/e-shell-importer.c:484
 #, fuzzy
 msgid "Importing"
 msgstr "S'està movent"
 
-#: shell/e-shell-importer.c:497
+#: shell/e-shell-importer.c:491
 #, c-format
 msgid ""
 "Importing %s.\n"
 "Starting %s"
 msgstr ""
 
-#: shell/e-shell-importer.c:509
+#: shell/e-shell-importer.c:503
 #, fuzzy, c-format
 msgid "Error starting %s"
 msgstr "Error en carregar el fitxer: %s"
 
-#: shell/e-shell-importer.c:523
+#: shell/e-shell-importer.c:517
 #, fuzzy, c-format
 msgid "Error loading %s"
 msgstr "Error en carregar el fitxer: %s"
 
-#: shell/e-shell-importer.c:540
+#: shell/e-shell-importer.c:534
 #, c-format
 msgid ""
 "Importing %s\n"
 "Importing item 1."
 msgstr ""
 
-#: shell/e-shell-importer.c:594
+#: shell/e-shell-importer.c:588
 #, fuzzy
 msgid "Automatic"
 msgstr "Tria automàtica"
 
-#: shell/e-shell-importer.c:643
+#: shell/e-shell-importer.c:637
 #, fuzzy
-msgid "_Filename:"
+msgid "Filename:"
 msgstr "Nom del fitxer:"
 
-#: shell/e-shell-importer.c:648
+#: shell/e-shell-importer.c:642
 #, fuzzy
 msgid "Select a file"
 msgstr "Fitxer de signatura:"
 
-#: shell/e-shell-importer.c:658
+#: shell/e-shell-importer.c:651
 #, fuzzy
-msgid "File _type:"
+msgid "File type:"
 msgstr "Nom del fitxer:"
 
-#: shell/e-shell-importer.c:684
-msgid "Import data and settings from _older programs"
+#: shell/e-shell-importer.c:676
+msgid "Import data and settings from older programs"
 msgstr ""
 
-#: shell/e-shell-importer.c:687
+#: shell/e-shell-importer.c:680
 #, fuzzy
-msgid "Import a _single file"
+msgid "Import a single file"
 msgstr "S'està movent"
 
-#: shell/e-shell-importer.c:755 shell/e-shell-startup-wizard.c:553
+#: shell/e-shell-importer.c:746 shell/e-shell-startup-wizard.c:538
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
 msgstr ""
 
-#: shell/e-shell-importer.c:758
+#: shell/e-shell-importer.c:749
 msgid "Starting Intelligent Importers"
 msgstr ""
 
-#: shell/e-shell-importer.c:884 shell/e-shell-startup-wizard.c:679
+#: shell/e-shell-importer.c:873 shell/e-shell-startup-wizard.c:664
 #, fuzzy, c-format
 msgid "From %s:"
 msgstr "De:"
 
-#: shell/e-shell-importer.c:1061
+#: shell/e-shell-importer.c:1047
 #, fuzzy
 msgid "Select folder"
 msgstr "Seleccioneu una carpeta"
 
-#: shell/e-shell-importer.c:1062
+#: shell/e-shell-importer.c:1048
 msgid "Select a destination folder for importing this data"
 msgstr ""
 
-#: shell/e-shell-importer.c:1193
-#, fuzzy
-msgid "_Import"
-msgstr "S'està movent"
+#: shell/e-shell-importer.c:1178 shell/importer/intelligent.c:191
+msgid "Import"
+msgstr ""
 
 #: shell/e-shell-offline-handler.c:592
 msgid "Closing connections..."
@@ -27068,19 +27418,11 @@ msgstr ""
 "No es pot crear la carpeta indicada:\n"
 "%s"
 
-#: shell/e-shell-startup-wizard.c:771
-msgid ""
-"If you quit the Evolution Setup Assistant now, all of the information that "
-"you have entered will be forgotten. You will need to run this assistant "
-"again before using Evolution.\n"
-"\n"
-"Do you want to quit using the Assistant now?"
-msgstr ""
-
-#: shell/e-shell-startup-wizard.c:782
-#, fuzzy
-msgid "Quit Assistant"
-msgstr "Assistent"
+#: shell/e-shell-user-creatable-items-handler.c:586
+#: shell/e-shell-user-creatable-items-handler.c:642
+#: widgets/misc/e-charset-picker.c:109
+msgid "New"
+msgstr "Nou"
 
 #: shell/e-shell-utils.c:116
 #, fuzzy
@@ -27105,34 +27447,6 @@ msgstr "No s'ha pogut crear el directori %s: %s"
 msgid "'.' and '..' are reserved folder names."
 msgstr ""
 
-#: shell/e-shell-view.c:264
-msgid "(No folder displayed)"
-msgstr "(Cap carpeta mostrada)"
-
-#: shell/e-shell-view.c:2040
-#, c-format
-msgid "%s (%d)"
-msgstr ""
-
-#: shell/e-shell-view.c:2042
-#, fuzzy
-msgid "(None)"
-msgstr "(Sense nom)"
-
-#: shell/e-shell-view.c:2083
-msgid ""
-"Ximian Evolution is currently online.  Click on this button to work offline."
-msgstr ""
-
-#: shell/e-shell-view.c:2090
-msgid "Ximian Evolution is in the process of going offline."
-msgstr ""
-
-#: shell/e-shell-view.c:2096
-msgid ""
-"Ximian Evolution is currently offline.  Click on this button to work online."
-msgstr ""
-
 #: shell/e-shell-view-menu.c:89
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr ""
@@ -27188,14 +27502,72 @@ msgstr "S'està movent"
 msgid "Work Offline"
 msgstr "S'està movent"
 
-#: shell/e-shortcuts.c:649
-msgid "Error saving shortcuts."
-msgstr "Error en desar les dreceres."
+#: shell/e-shell-view.c:264
+msgid "(No folder displayed)"
+msgstr "(Cap carpeta mostrada)"
 
-#: shell/e-shortcuts.c:1096
+#: shell/e-shell-view.c:2040
+#, c-format
+msgid "%s (%d)"
+msgstr ""
+
+#: shell/e-shell-view.c:2042
 #, fuzzy
-msgid "Shortcuts"
-msgstr "Mostra la barra de _dreceres"
+msgid "(None)"
+msgstr "(Sense nom)"
+
+#: shell/e-shell-view.c:2083
+msgid ""
+"Ximian Evolution is currently online.  Click on this button to work offline."
+msgstr ""
+
+#: shell/e-shell-view.c:2090
+msgid "Ximian Evolution is in the process of going offline."
+msgstr ""
+
+#: shell/e-shell-view.c:2096
+msgid ""
+"Ximian Evolution is currently offline.  Click on this button to work online."
+msgstr ""
+
+#: shell/e-shell.c:175
+#, c-format
+msgid ""
+"Cannot activate component %s :\n"
+"The error from the activation system is:\n"
+"%s"
+msgstr ""
+
+#: shell/e-shell.c:741
+#, c-format
+msgid "Cannot set up local storage -- %s"
+msgstr "No es pot configurar l'emmagatzemament local -- %s"
+
+#: shell/e-shell.c:1804
+#, c-format
+msgid ""
+"The Evolution component that handles folders of type \"%s\"\n"
+"has unexpectedly quit. You will need to quit Evolution and restart\n"
+"in order to access that data again."
+msgstr ""
+
+#: shell/e-shell.c:2069
+msgid "Invalid arguments"
+msgstr ""
+
+#: shell/e-shell.c:2071
+#, fuzzy
+msgid "Cannot register on OAF"
+msgstr "No es pot registrar l'emmagatzemament amb l'intèrpret d'ordres"
+
+#: shell/e-shell.c:2073
+#, fuzzy
+msgid "Configuration Database not found"
+msgstr "Configuració del correu"
+
+#: shell/e-shell.c:2075 shell/e-storage.c:568
+msgid "Generic error"
+msgstr "Error genèric"
 
 #: shell/e-shortcuts-view.c:80
 #, fuzzy
@@ -27330,6 +27702,19 @@ msgstr "Elimina"
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "Elimina aquesta drecera de la barra de dreceres"
 
+#: shell/e-shortcuts.c:649
+msgid "Error saving shortcuts."
+msgstr "Error en desar les dreceres."
+
+#: shell/e-shortcuts.c:1096
+#, fuzzy
+msgid "Shortcuts"
+msgstr "Mostra la barra de _dreceres"
+
+#: shell/e-storage-set-view.etspec.h:1
+msgid "Checkbox"
+msgstr ""
+
 #: shell/e-storage.c:566
 msgid "No error"
 msgstr "Cap error"
@@ -27388,15 +27773,6 @@ msgstr "No es pot bifurcar %s: %s"
 msgid "This operation cannot be performed in off-line mode"
 msgstr ""
 
-#: shell/e-storage-set-view.etspec.h:1
-msgid "Checkbox"
-msgstr ""
-
-#: shell/e-storage-set-view.etspec.h:2
-#, fuzzy
-msgid "Folder"
-msgstr "Carpetes"
-
 #: shell/e-task-widget.c:211
 #, c-format
 msgid "%s (...)"
@@ -27411,103 +27787,103 @@ msgstr "% comp_let:"
 msgid "<click here to select a folder>"
 msgstr "<feu clic aquí per seleccionar una carpeta>"
 
-#: shell/evolution-shell-component.c:1187
+#: shell/evolution-shell-component-utils.c:124
+#, fuzzy, c-format
+msgid ""
+"%s\n"
+"\n"
+"Unknown error."
+msgstr "Error desconegut"
+
+#: shell/evolution-shell-component-utils.c:127
+#, c-format
+msgid ""
+"%s\n"
+"\n"
+"The error from the component system is:\n"
+"%s"
+msgstr ""
+
+#: shell/evolution-shell-component-utils.c:134
+#, c-format
+msgid ""
+"%s\n"
+"\n"
+"The error from the activation system is:\n"
+"%s"
+msgstr ""
+
+#: shell/evolution-shell-component.c:1184
 #, fuzzy
 msgid "CORBA error"
 msgstr "Error d'E/S"
 
-#: shell/evolution-shell-component.c:1189
+#: shell/evolution-shell-component.c:1186
 msgid "Interrupted"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1191
+#: shell/evolution-shell-component.c:1188
 #, fuzzy
 msgid "Invalid argument"
 msgstr "adjunció"
 
-#: shell/evolution-shell-component.c:1193
+#: shell/evolution-shell-component.c:1190
 msgid "Already has an owner"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1195
+#: shell/evolution-shell-component.c:1192
 #, fuzzy
 msgid "No owner"
 msgstr "Cap"
 
-#: shell/evolution-shell-component.c:1197
+#: shell/evolution-shell-component.c:1194
 #, fuzzy
 msgid "Not found"
 msgstr "No s'ha trobat el fitxer"
 
-#: shell/evolution-shell-component.c:1199
+#: shell/evolution-shell-component.c:1196
 #, fuzzy
 msgid "Unsupported type"
 msgstr "Detecta els tipus suportats..."
 
-#: shell/evolution-shell-component.c:1201
+#: shell/evolution-shell-component.c:1198
 msgid "Unsupported schema"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1203
+#: shell/evolution-shell-component.c:1200
 #, fuzzy
 msgid "Unsupported operation"
 msgstr "Consulta cancel·lada per l'usuari."
 
-#: shell/evolution-shell-component.c:1205
+#: shell/evolution-shell-component.c:1202
 #, fuzzy
 msgid "Internal error"
 msgstr "Error d'E/S"
 
-#: shell/evolution-shell-component.c:1209
+#: shell/evolution-shell-component.c:1206
 #, fuzzy
 msgid "Exists"
 msgstr "S_urt"
 
-#: shell/evolution-shell-component.c:1211
+#: shell/evolution-shell-component.c:1208
 #, fuzzy
 msgid "Invalid URI"
 msgstr "Agenda"
 
-#: shell/evolution-shell-component.c:1215
+#: shell/evolution-shell-component.c:1212
 #, fuzzy
 msgid "Has subfolders"
 msgstr "La carpeta `%s' no existeix."
 
-#: shell/evolution-shell-component.c:1217
+#: shell/evolution-shell-component.c:1214
 #, fuzzy
 msgid "No space left"
 msgstr "S'ha rebut el missatge"
 
-#: shell/evolution-shell-component.c:1219
+#: shell/evolution-shell-component.c:1216
 msgid "Old owner has died"
 msgstr ""
 
-#: shell/evolution-shell-component-utils.c:124
-#, fuzzy, c-format
-msgid ""
-"%s\n"
-"\n"
-"Unknown error."
-msgstr "Error desconegut"
-
-#: shell/evolution-shell-component-utils.c:127
-#, c-format
-msgid ""
-"%s\n"
-"\n"
-"The error from the component system is:\n"
-"%s"
-msgstr ""
-
-#: shell/evolution-shell-component-utils.c:134
-#, c-format
-msgid ""
-"%s\n"
-"\n"
-"The error from the activation system is:\n"
-"%s"
-msgstr ""
-
 #: shell/evolution-test-component.c:63
 #, fuzzy
 msgid "Test type"
@@ -27622,25 +27998,6 @@ msgid ""
 "Click the \"Apply\" button to save your settings. "
 msgstr ""
 
-#: shell/GNOME_Evolution_Shell.server.in.in.h:1
-msgid "Configure special folders and offline folder behavior here"
-msgstr ""
-
-#: shell/GNOME_Evolution_Shell.server.in.in.h:2
-#, fuzzy
-msgid "Evolution Shell"
-msgstr "No es pot inicialitzat l'intèrpret d'ordres de l'Evolution."
-
-#: shell/GNOME_Evolution_Shell.server.in.in.h:3
-#, fuzzy
-msgid "Evolution folder settings configuration control"
-msgstr "Utilitat de configuració per al conducte de l'agenda de l'Evolution.\n"
-
-#: shell/GNOME_Evolution_Shell.server.in.in.h:4
-#, fuzzy
-msgid "Folder Settings"
-msgstr "_Paràmetres"
-
 #: shell/importer/import.glade.h:1
 msgid "Click \"Import\" to begin importing the file into Evolution. "
 msgstr ""
@@ -27681,10 +28038,6 @@ msgstr ""
 msgid "Importers"
 msgstr "S'està movent"
 
-#: shell/importer/intelligent.c:191
-msgid "Import"
-msgstr ""
-
 #: shell/importer/intelligent.c:195
 #, fuzzy
 msgid "Don't import"
@@ -27895,7 +28248,7 @@ msgstr "Mou a la carpeta"
 msgid "Move to Folder..."
 msgstr "Mou a la carpeta"
 
-#: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:18
+#: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:17
 #, fuzzy
 msgid "Paste the clipboard"
 msgstr "Enganxa l'element del porta-retalls"
@@ -27905,9 +28258,9 @@ msgstr "Enganxa l'element del porta-retalls"
 msgid "Previews the contacts to be printed"
 msgstr "Previsualitza el missatge que s'ha d'imprimir"
 
-#: ui/evolution-addressbook.xml.h:17 ui/evolution-calendar.xml.h:20
-#: ui/evolution-comp-editor.xml.h:9 ui/evolution-mail-message.xml.h:73
-#: ui/evolution-tasks.xml.h:13
+#: ui/evolution-addressbook.xml.h:17 ui/evolution-calendar.xml.h:19
+#: ui/evolution-comp-editor.xml.h:9 ui/evolution-mail-message.xml.h:68
+#: ui/evolution-tasks.xml.h:12
 #, fuzzy
 msgid "Print Pre_view"
 msgstr "Previsualització d'impressió"
@@ -27960,22 +28313,17 @@ msgstr "Atura la càrrega"
 msgid "View the current contact"
 msgstr "l'hora actual"
 
-#: ui/evolution-addressbook.xml.h:29 ui/evolution-calendar.xml.h:32
-#: ui/evolution-comp-editor.xml.h:16 ui/evolution-contact-editor.xml.h:13
-#: ui/evolution-contact-list-editor.xml.h:11
+#: ui/evolution-addressbook.xml.h:29 ui/evolution-calendar.xml.h:28
+#: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:11
+#: ui/evolution-contact-list-editor.xml.h:10
 #: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:17
-#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-messagedisplay.xml.h:4
-#: ui/evolution-mail-message.xml.h:99 ui/evolution-task-editor.xml.h:9
-#: ui/evolution-tasks.xml.h:16 ui/evolution.xml.h:42
+#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:93
+#: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-task-editor.xml.h:9
+#: ui/evolution-tasks.xml.h:14 ui/evolution.xml.h:42
 msgid "_Actions"
 msgstr "_Accions"
 
-#: ui/evolution-addressbook.xml.h:31
-#, fuzzy
-msgid "_Copy to Folder..."
-msgstr "_Copia a la carpeta"
-
-#: ui/evolution-addressbook.xml.h:34 ui/evolution-contact-editor.xml.h:16
+#: ui/evolution-addressbook.xml.h:34 ui/evolution-contact-editor.xml.h:13
 #, fuzzy
 msgid "_Forward Contact..."
 msgstr "_Contactes..."
@@ -28058,67 +28406,53 @@ msgstr "Vés a una data concreta"
 msgid "Go to today"
 msgstr "Vés a avui"
 
-#: ui/evolution-calendar.xml.h:17
+#: ui/evolution-calendar.xml.h:16
 #, fuzzy
 msgid "Month"
 msgstr "Mes"
 
-#: ui/evolution-calendar.xml.h:19
+#: ui/evolution-calendar.xml.h:18
 #, fuzzy
 msgid "Previews the calendar to be printed"
 msgstr "Previsualitza el missatge que s'ha d'imprimir"
 
-#: ui/evolution-calendar.xml.h:21
+#: ui/evolution-calendar.xml.h:20
 #, fuzzy
 msgid "Print this calendar"
 msgstr "_Imprimeix aquest agenda"
 
-#: ui/evolution-calendar.xml.h:22
+#: ui/evolution-calendar.xml.h:21
 msgid "Publish Free/Busy information for this calendar"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:23 ui/evolution-tasks.xml.h:15
-#, fuzzy
-msgid "Purg_e"
-msgstr "Fonts"
-
-#: ui/evolution-calendar.xml.h:24
-msgid "Purge old appointments and meetings"
-msgstr ""
-
-#: ui/evolution-calendar.xml.h:25
-#, fuzzy
-msgid "Show as list"
-msgstr "Detalls"
-
-#: ui/evolution-calendar.xml.h:26
+#: ui/evolution-calendar.xml.h:22
 #, fuzzy
 msgid "Show one day"
 msgstr "Mostra 1 dia"
 
-#: ui/evolution-calendar.xml.h:27
+#: ui/evolution-calendar.xml.h:23
 #, fuzzy
 msgid "Show one month"
 msgstr "Mostra 1 mes"
 
-#: ui/evolution-calendar.xml.h:28
+#: ui/evolution-calendar.xml.h:24
 #, fuzzy
 msgid "Show one week"
 msgstr "Mostra 1 setmana"
 
-#: ui/evolution-calendar.xml.h:29
+#: ui/evolution-calendar.xml.h:25
 msgid "Show the working week"
 msgstr "Mostra la setmana de treball"
 
-#: ui/evolution-calendar.xml.h:30
+#: ui/evolution-calendar.xml.h:26
 #, fuzzy
 msgid "Week"
 msgstr "Setmanes"
 
-#: ui/evolution-comp-editor.xml.h:2 ui/evolution-contact-editor.xml.h:2
-#: ui/evolution-contact-list-editor.xml.h:2
+#: ui/evolution-comp-editor.xml.h:2 ui/evolution-contact-editor.xml.h:1
+#: ui/evolution-contact-list-editor.xml.h:1
 #: ui/evolution-mail-messagedisplay.xml.h:1
-#: ui/evolution-message-composer.xml.h:3 ui/evolution-signature-editor.xml.h:2
+#: ui/evolution-message-composer.xml.h:3 ui/evolution-signature-editor.xml.h:1
 #: ui/evolution.xml.h:5
 #, fuzzy
 msgid "Close"
@@ -28129,7 +28463,7 @@ msgstr "Tanca"
 msgid "Close this item"
 msgstr "Suprimeix aquest element"
 
-#: ui/evolution-comp-editor.xml.h:5 ui/evolution-contact-editor.xml.h:4
+#: ui/evolution-comp-editor.xml.h:5 ui/evolution-contact-editor.xml.h:3
 msgid "Delete this item"
 msgstr "Suprimeix aquest element"
 
@@ -28143,61 +28477,50 @@ msgstr ""
 msgid "Preview the printed item"
 msgstr "Previsualitza el missatge que s'ha d'imprimir"
 
-#: ui/evolution-comp-editor.xml.h:10 ui/evolution-contact-editor.xml.h:7
+#: ui/evolution-comp-editor.xml.h:10 ui/evolution-contact-editor.xml.h:6
 msgid "Print this item"
 msgstr "Imprimeix aquest element"
 
-#: ui/evolution-comp-editor.xml.h:11 ui/evolution-contact-editor.xml.h:8
-#: ui/evolution-contact-list-editor.xml.h:5
-#: ui/evolution-message-composer.xml.h:18
+#: ui/evolution-comp-editor.xml.h:12 ui/evolution-message-composer.xml.h:16
+#: ui/evolution-signature-editor.xml.h:5
+msgid "Save"
+msgstr "Desa"
+
+#: ui/evolution-comp-editor.xml.h:13
 #, fuzzy
-msgid "Save _As..."
+msgid "Save As..."
 msgstr "Anomena i desa..."
 
-#: ui/evolution-comp-editor.xml.h:12 ui/evolution-contact-editor.xml.h:9
+#: ui/evolution-comp-editor.xml.h:14 ui/evolution-contact-editor.xml.h:8
 #: ui/evolution-contact-list-editor.xml.h:6
-#: ui/evolution-signature-editor.xml.h:7
+#: ui/evolution-signature-editor.xml.h:6
 msgid "Save and Close"
 msgstr "Desa i tanca"
 
-#: ui/evolution-comp-editor.xml.h:13 ui/evolution-contact-editor.xml.h:10
-#: ui/evolution-contact-list-editor.xml.h:7
-#: ui/evolution-signature-editor.xml.h:8
-#, fuzzy
-msgid "Save and _Close"
-msgstr "Desa i tanca"
-
-#: ui/evolution-comp-editor.xml.h:14
+#: ui/evolution-comp-editor.xml.h:15
 #, fuzzy
 msgid "Save the item and close the dialog box"
 msgstr "Desa el contacte i tanca el quadre de diàleg"
 
-#: ui/evolution-comp-editor.xml.h:15
+#: ui/evolution-comp-editor.xml.h:16
 msgid "Save this item to disk"
 msgstr ""
 
-#: ui/evolution-comp-editor.xml.h:18 ui/evolution-contact-editor.xml.h:15
-#: ui/evolution-contact-list-editor.xml.h:13
+#: ui/evolution-comp-editor.xml.h:18 ui/evolution-contact-editor.xml.h:12
+#: ui/evolution-contact-list-editor.xml.h:11
 #: ui/evolution-mail-messagedisplay.xml.h:7
 #: ui/evolution-message-composer.xml.h:42
-#: ui/evolution-signature-editor.xml.h:13 ui/evolution-subscribe.xml.h:11
+#: ui/evolution-signature-editor.xml.h:12 ui/evolution-subscribe.xml.h:11
 #: ui/evolution.xml.h:46
 msgid "_File"
 msgstr "_Fitxer"
 
-#: ui/evolution-comp-editor.xml.h:20 ui/evolution-contact-editor.xml.h:18
-#: ui/evolution-contact-list-editor.xml.h:14
-#: ui/evolution-message-composer.xml.h:47
-#: ui/evolution-signature-editor.xml.h:15
-msgid "_Save"
-msgstr "_Desa"
-
 #: ui/evolution-composer-entries.xml.h:1
 #, fuzzy
 msgid "Copy selected text to the clipboard"
 msgstr "Copia l'element seleccionat al porta-retalls"
 
-#: ui/evolution-composer-entries.xml.h:2 ui/evolution-mail-message.xml.h:21
+#: ui/evolution-composer-entries.xml.h:2 ui/evolution-mail-list.xml.h:3
 #, fuzzy
 msgid "Cu_t"
 msgstr "Personalitzat"
@@ -28222,45 +28545,59 @@ msgstr "Selecciona'ls _tots"
 msgid "Select all text"
 msgstr "Suprimeix un contacte"
 
-#: ui/evolution-contact-editor.xml.h:6
+#: ui/evolution-contact-editor.xml.h:5
 #, fuzzy
 msgid "Print En_velope..."
 msgstr "Imprimeix el missatge..."
 
-#: ui/evolution-contact-editor.xml.h:11
+#: ui/evolution-contact-editor.xml.h:7
+#: ui/evolution-contact-list-editor.xml.h:5
+#: ui/evolution-message-composer.xml.h:18
+#, fuzzy
+msgid "Save _As..."
+msgstr "Anomena i desa..."
+
+#: ui/evolution-contact-editor.xml.h:9
 msgid "Save the contact and close the dialog box"
 msgstr "Desa el contacte i tanca el quadre de diàleg"
 
-#: ui/evolution-contact-editor.xml.h:12
+#: ui/evolution-contact-editor.xml.h:10
 #, fuzzy
 msgid "Send _Message to Contact..."
 msgstr "FIXME: Nou _missatge per contactar"
 
-#: ui/evolution-contact-list-editor.xml.h:4
+#: ui/evolution-contact-editor.xml.h:15
+#: ui/evolution-contact-list-editor.xml.h:12
+#: ui/evolution-message-composer.xml.h:47
+#: ui/evolution-signature-editor.xml.h:14
+msgid "_Save"
+msgstr "_Desa"
+
+#: ui/evolution-contact-list-editor.xml.h:3
 #, fuzzy
 msgid "Delete this list"
 msgstr "Suprimeix aquest element"
 
-#: ui/evolution-contact-list-editor.xml.h:8
+#: ui/evolution-contact-list-editor.xml.h:4
+#, fuzzy
+msgid "Delete..."
+msgstr "Suprimeix"
+
+#: ui/evolution-contact-list-editor.xml.h:7
 #, fuzzy
 msgid "Save the list and close the dialog box"
 msgstr "Desa el contacte i tanca el quadre de diàleg"
 
-#: ui/evolution-contact-list-editor.xml.h:9
+#: ui/evolution-contact-list-editor.xml.h:8
 #, fuzzy
 msgid "Se_nd list to other..."
 msgstr "_Invita a altres..."
 
-#: ui/evolution-contact-list-editor.xml.h:10
+#: ui/evolution-contact-list-editor.xml.h:9
 #, fuzzy
 msgid "Send _message to list..."
 msgstr "FIXME: Nou _missatge per contactar"
 
-#: ui/evolution-contact-list-editor.xml.h:12
-#, fuzzy
-msgid "_Delete..."
-msgstr "Suprimeix"
-
 #: ui/evolution-event-editor.xml.h:1
 #, fuzzy
 msgid "Cancel Mee_ting"
@@ -28346,7 +28683,7 @@ msgstr "Mou un missatge a una nova carpeta"
 
 #: ui/evolution-mail-global.xml.h:11
 #, fuzzy
-msgid "Post Ne_w Message"
+msgid "Post New Message"
 msgstr "Redacta un nou missatge"
 
 #: ui/evolution-mail-global.xml.h:12
@@ -28386,21 +28723,16 @@ msgstr "Previsualització:"
 msgid "Change the properties of this folder"
 msgstr ""
 
-#: ui/evolution-mail-list.xml.h:2 ui/evolution-mail-message.xml.h:10
+#: ui/evolution-mail-list.xml.h:2
 #, fuzzy
 msgid "Copy selected message(s) to the clipboard"
 msgstr "Copia el missatge a una nova carpeta"
 
-#: ui/evolution-mail-list.xml.h:3 ui/evolution-mail-message.xml.h:22
+#: ui/evolution-mail-list.xml.h:4
 #, fuzzy
 msgid "Cut selected message(s) to the clipboard"
 msgstr "Retalla l'element seleccionat i posa'l al porta-retalls"
 
-#: ui/evolution-mail-list.xml.h:4
-#, fuzzy
-msgid "E_xpunge"
-msgstr "_Esborra"
-
 #: ui/evolution-mail-list.xml.h:5
 #, fuzzy
 msgid "Hide S_elected Messages"
@@ -28423,7 +28755,7 @@ msgstr ""
 
 #: ui/evolution-mail-list.xml.h:9
 #, fuzzy
-msgid "Mark All as _Read"
+msgid "Mark All as R_ead"
 msgstr "Mar_ca'l com a llegit"
 
 #: ui/evolution-mail-list.xml.h:10
@@ -28431,7 +28763,7 @@ msgstr "Mar_ca'l com a llegit"
 msgid "Mark all visible messages as read"
 msgstr "Imprimeix el missatge seleccionat"
 
-#: ui/evolution-mail-list.xml.h:11 ui/evolution-mail-message.xml.h:66
+#: ui/evolution-mail-list.xml.h:11
 #, fuzzy
 msgid "Paste message(s) from the clipboard"
 msgstr "Enganxa l'element del porta-retalls"
@@ -28482,41 +28814,28 @@ msgstr "Imprimeix el missatge seleccionat"
 msgid "Threaded Message list"
 msgstr "Llista de missatges en cadena"
 
-#: ui/evolution-mail-list.xml.h:25 ui/evolution.xml.h:47
+#: ui/evolution-mail-list.xml.h:26 ui/evolution-tasks.xml.h:18
+msgid "_Expunge"
+msgstr "_Esborra"
+
+#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:47
 msgid "_Folder"
 msgstr "_Carpeta"
 
-#: ui/evolution-mail-list.xml.h:26 ui/evolution-subscribe.xml.h:12
+#: ui/evolution-mail-list.xml.h:28 ui/evolution-subscribe.xml.h:12
 msgid "_Invert Selection"
 msgstr "_Inverteix la selecció"
 
-#: ui/evolution-mail-list.xml.h:27
+#: ui/evolution-mail-list.xml.h:30
 #, fuzzy
 msgid "_Properties..."
 msgstr "Propietats..."
 
-#: ui/evolution-mail-list.xml.h:28
+#: ui/evolution-mail-list.xml.h:31
 #, fuzzy
 msgid "_Threaded Message List"
 msgstr "Llista de missatges en cadena"
 
-#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:6
-#, fuzzy
-msgid "Close this window"
-msgstr "Suprimeix aquesta cita"
-
-#: ui/evolution-mail-messagedisplay.xml.h:5
-#: ui/evolution-message-composer.xml.h:39 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:43
-#, fuzzy
-msgid "_Close"
-msgstr "Tanca"
-
-#: ui/evolution-mail-messagedisplay.xml.h:8
-#: ui/evolution-message-composer.xml.h:49 ui/evolution.xml.h:64
-msgid "_View"
-msgstr "_Visualitza"
-
 #: ui/evolution-mail-message.xml.h:1
 #, fuzzy
 msgid "A_dd Sender to Addressbook"
@@ -28538,488 +28857,479 @@ msgid "Apply filter rules to the selected messages"
 msgstr "Imprimeix el missatge seleccionat"
 
 #: ui/evolution-mail-message.xml.h:5
-msgid "Caret _Mode"
-msgstr ""
-
-#: ui/evolution-mail-message.xml.h:6
 #, fuzzy
 msgid "Compose a reply to all of the recipients of the selected message"
 msgstr "Respon a tots els destinataris d'aquest missatge"
 
-#: ui/evolution-mail-message.xml.h:7
+#: ui/evolution-mail-message.xml.h:6
 msgid "Compose a reply to the mailing list of the selected message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:8
+#: ui/evolution-mail-message.xml.h:7
 #, fuzzy
 msgid "Compose a reply to the sender of the selected message"
 msgstr "Respon al remitent d'aquest missatge"
 
-#: ui/evolution-mail-message.xml.h:11
+#: ui/evolution-mail-message.xml.h:9
 #, fuzzy
 msgid "Copy selected messages to another folder"
 msgstr "Copia el missatge a una nova carpeta"
 
-#: ui/evolution-mail-message.xml.h:12
+#: ui/evolution-mail-message.xml.h:10
 #, fuzzy
 msgid "Create _Virtual Folder From Message"
 msgstr "Carpetes virtuals"
 
-#: ui/evolution-mail-message.xml.h:13
+#: ui/evolution-mail-message.xml.h:11
 msgid "Create a rule to filter messages from this sender"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:14
+#: ui/evolution-mail-message.xml.h:12
 msgid "Create a rule to filter messages to these recipients"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:15
+#: ui/evolution-mail-message.xml.h:13
 msgid "Create a rule to filter messages to this mailing list"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:16
+#: ui/evolution-mail-message.xml.h:14
 #, fuzzy
 msgid "Create a rule to filter messages with this subject"
 msgstr "Envia un missatge sense assumpte"
 
-#: ui/evolution-mail-message.xml.h:17
+#: ui/evolution-mail-message.xml.h:15
 #, fuzzy
 msgid "Create a virtual folder for these recipients"
 msgstr "Carpetes virtuals"
 
-#: ui/evolution-mail-message.xml.h:18
+#: ui/evolution-mail-message.xml.h:16
 #, fuzzy
 msgid "Create a virtual folder for this mailing list"
 msgstr "Carpetes virtuals"
 
-#: ui/evolution-mail-message.xml.h:19
+#: ui/evolution-mail-message.xml.h:17
 #, fuzzy
 msgid "Create a virtual folder for this sender"
 msgstr "Carpetes virtuals"
 
-#: ui/evolution-mail-message.xml.h:20
+#: ui/evolution-mail-message.xml.h:18
 #, fuzzy
 msgid "Create a virtual folder for this subject"
 msgstr "Carpetes virtuals"
 
-#: ui/evolution-mail-message.xml.h:23
+#: ui/evolution-mail-message.xml.h:19
 msgid "Decrease the text size"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:25
+#: ui/evolution-mail-message.xml.h:21
 #, fuzzy
 msgid "Display the next important message"
 msgstr "Respon al remitent d'aquest missatge"
 
-#: ui/evolution-mail-message.xml.h:26
+#: ui/evolution-mail-message.xml.h:22
 #, fuzzy
 msgid "Display the next message"
 msgstr "l'hora actual"
 
-#: ui/evolution-mail-message.xml.h:27
+#: ui/evolution-mail-message.xml.h:23
 #, fuzzy
 msgid "Display the next unread message"
 msgstr "Imprimeix el missatge seleccionat"
 
-#: ui/evolution-mail-message.xml.h:28
+#: ui/evolution-mail-message.xml.h:24
 msgid "Display the next unread thread"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:29
+#: ui/evolution-mail-message.xml.h:25
 #, fuzzy
 msgid "Display the previous important message"
 msgstr "Carrega un missatge desat anteriorment"
 
-#: ui/evolution-mail-message.xml.h:30
+#: ui/evolution-mail-message.xml.h:26
 #, fuzzy
 msgid "Display the previous message"
 msgstr "Voleu descartar aquest missatge?"
 
-#: ui/evolution-mail-message.xml.h:31
+#: ui/evolution-mail-message.xml.h:27
 #, fuzzy
 msgid "Display the previous unread message"
 msgstr "Carrega un missatge desat anteriorment"
 
-#: ui/evolution-mail-message.xml.h:32
+#: ui/evolution-mail-message.xml.h:28
 #, fuzzy
 msgid "F_orward"
 msgstr "Reenvia"
 
-#: ui/evolution-mail-message.xml.h:33
+#: ui/evolution-mail-message.xml.h:29
 #, fuzzy
 msgid "Filter on Mailing _List..."
 msgstr "Filtre sobre la llista de correu"
 
-#: ui/evolution-mail-message.xml.h:34
+#: ui/evolution-mail-message.xml.h:30
 #, fuzzy
 msgid "Filter on Se_nder..."
 msgstr "Filtre sobre el remitent"
 
-#: ui/evolution-mail-message.xml.h:35
+#: ui/evolution-mail-message.xml.h:31
 #, fuzzy
 msgid "Filter on _Recipients..."
 msgstr "Filtre sobre els destinataris"
 
-#: ui/evolution-mail-message.xml.h:36
+#: ui/evolution-mail-message.xml.h:32
 #, fuzzy
 msgid "Filter on _Subject..."
 msgstr "Filtre sobre l'assumpte"
 
-#: ui/evolution-mail-message.xml.h:37
+#: ui/evolution-mail-message.xml.h:33
 #, fuzzy
 msgid "Flag selected message(s) for follow-up"
 msgstr "Imprimeix el missatge seleccionat"
 
-#: ui/evolution-mail-message.xml.h:38
+#: ui/evolution-mail-message.xml.h:34
 msgid "Follow _Up..."
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:39
+#: ui/evolution-mail-message.xml.h:35
 msgid "Force images in HTML mail to be loaded"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:41
+#: ui/evolution-mail-message.xml.h:37
 #, fuzzy
 msgid "Forward the selected message in the body of a new message"
 msgstr "Imprimeix el missatge seleccionat"
 
-#: ui/evolution-mail-message.xml.h:42
+#: ui/evolution-mail-message.xml.h:38
 #, fuzzy
 msgid "Forward the selected message quoted like a reply"
 msgstr "Imprimeix el missatge seleccionat"
 
-#: ui/evolution-mail-message.xml.h:43
+#: ui/evolution-mail-message.xml.h:39
 #, fuzzy
 msgid "Forward the selected message to someone"
 msgstr "Mou un missatge a una nova carpeta"
 
-#: ui/evolution-mail-message.xml.h:44
+#: ui/evolution-mail-message.xml.h:40
 #, fuzzy
 msgid "Forward the selected message to someone as an attachment"
 msgstr "Imprimeix el missatge seleccionat"
 
-#: ui/evolution-mail-message.xml.h:45
+#: ui/evolution-mail-message.xml.h:41
 #, fuzzy
 msgid "Increase the text size"
 msgstr "_Insereix el fitxer de text... (FIXME)"
 
-#: ui/evolution-mail-message.xml.h:46
+#: ui/evolution-mail-message.xml.h:42
 #, fuzzy
 msgid "Load _Images"
 msgstr "Missatge reenviat - %s"
 
-#: ui/evolution-mail-message.xml.h:47
-#, fuzzy
-msgid "Mar_k as Read"
-msgstr "Mar_ca'l com a llegit"
-
-#: ui/evolution-mail-message.xml.h:48
+#: ui/evolution-mail-message.xml.h:44
 #, fuzzy
 msgid "Mark as I_mportant"
 msgstr "Marca'l com a per _llegir"
 
-#: ui/evolution-mail-message.xml.h:49
+#: ui/evolution-mail-message.xml.h:45
 #, fuzzy
 msgid "Mark as U_nread"
 msgstr "Marca'l com a per _llegir"
 
-#: ui/evolution-mail-message.xml.h:50
+#: ui/evolution-mail-message.xml.h:46
 #, fuzzy
 msgid "Mark as Unimp_ortant"
 msgstr "Marca'l com a per _llegir"
 
-#: ui/evolution-mail-message.xml.h:51
+#: ui/evolution-mail-message.xml.h:47
 #, fuzzy
 msgid "Mark the selected message(s) as having been read"
 msgstr "Imprimeix el missatge seleccionat"
 
-#: ui/evolution-mail-message.xml.h:52
+#: ui/evolution-mail-message.xml.h:48
 #, fuzzy
 msgid "Mark the selected message(s) as important"
 msgstr "Imprimeix el missatge seleccionat"
 
-#: ui/evolution-mail-message.xml.h:53
+#: ui/evolution-mail-message.xml.h:49
 #, fuzzy
 msgid "Mark the selected message(s) as not having been read"
 msgstr "Imprimeix el missatge seleccionat"
 
-#: ui/evolution-mail-message.xml.h:54
+#: ui/evolution-mail-message.xml.h:50
 #, fuzzy
 msgid "Mark the selected message(s) as unimportant"
 msgstr "Imprimeix el missatge seleccionat"
 
-#: ui/evolution-mail-message.xml.h:55
+#: ui/evolution-mail-message.xml.h:51
 #, fuzzy
 msgid "Mark the selected messages for deletion"
 msgstr "Imprimeix el missatge seleccionat"
 
-#: ui/evolution-mail-message.xml.h:56
+#: ui/evolution-mail-message.xml.h:52
 msgid "Move"
 msgstr "Mou"
 
-#: ui/evolution-mail-message.xml.h:57
+#: ui/evolution-mail-message.xml.h:53
 #, fuzzy
 msgid "Move selected message(s) to another folder"
 msgstr "Mou un missatge a una nova carpeta"
 
-#: ui/evolution-mail-message.xml.h:58
+#: ui/evolution-mail-message.xml.h:54
 msgid "Next"
 msgstr "Següent"
 
-#: ui/evolution-mail-message.xml.h:59
+#: ui/evolution-mail-message.xml.h:55
 #, fuzzy
 msgid "Next _Important Message"
 msgstr "Respon al remitent d'aquest missatge"
 
-#: ui/evolution-mail-message.xml.h:60
+#: ui/evolution-mail-message.xml.h:56
 #, fuzzy
 msgid "Next _Thread"
 msgstr "Selecciona'ls _tots"
 
-#: ui/evolution-mail-message.xml.h:61
+#: ui/evolution-mail-message.xml.h:57
 #, fuzzy
 msgid "Next _Unread Message"
 msgstr "Mou el missatge"
 
-#: ui/evolution-mail-message.xml.h:62
+#: ui/evolution-mail-message.xml.h:58
 #, fuzzy
 msgid "Open the selected message in a new window"
 msgstr "Envia aquest missatge"
 
-#: ui/evolution-mail-message.xml.h:63
+#: ui/evolution-mail-message.xml.h:59
 #, fuzzy
 msgid "Open the selected message in the composer to re-send it"
 msgstr "Imprimeix el missatge seleccionat"
 
-#: ui/evolution-mail-message.xml.h:64
+#: ui/evolution-mail-message.xml.h:60
 msgid "Original Si_ze"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:65
+#: ui/evolution-mail-message.xml.h:61
 #, fuzzy
 msgid "P_revious Unread Message"
 msgstr "Carrega un missatge desat anteriorment"
 
-#: ui/evolution-mail-message.xml.h:67
+#: ui/evolution-mail-message.xml.h:62
 #, fuzzy
-msgid "Post a Repl_y"
+msgid "Post a Reply"
 msgstr "Respon"
 
-#: ui/evolution-mail-message.xml.h:68
+#: ui/evolution-mail-message.xml.h:63
 #, fuzzy
 msgid "Post a reply to a message in a Public folder"
 msgstr "Comprova si hi ha nou correu"
 
-#: ui/evolution-mail-message.xml.h:69
+#: ui/evolution-mail-message.xml.h:64
 #, fuzzy
 msgid "Pr_evious Important Message"
 msgstr "Carrega un missatge desat anteriorment"
 
-#: ui/evolution-mail-message.xml.h:70
+#: ui/evolution-mail-message.xml.h:65
 #, fuzzy
 msgid "Preview the message to be printed"
 msgstr "Previsualitza el missatge que s'ha d'imprimir"
 
-#: ui/evolution-mail-message.xml.h:71
+#: ui/evolution-mail-message.xml.h:66
 #, fuzzy
 msgid "Previous"
 msgstr "Ant_erior"
 
-#: ui/evolution-mail-message.xml.h:74
+#: ui/evolution-mail-message.xml.h:69
 #, fuzzy
 msgid "Print this message"
 msgstr "Imprimeix el missatge"
 
-#: ui/evolution-mail-message.xml.h:75
+#: ui/evolution-mail-message.xml.h:70
 msgid "Re_direct"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:76
+#: ui/evolution-mail-message.xml.h:71
 #, fuzzy
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "Mou un missatge a una nova carpeta"
 
-#: ui/evolution-mail-message.xml.h:79
-msgid "Reply to _All"
-msgstr "Respon a _tots"
-
-#: ui/evolution-mail-message.xml.h:80
-#, fuzzy
-msgid "Reply to _List"
-msgstr "Respon a _tots"
-
-#: ui/evolution-mail-message.xml.h:81
+#: ui/evolution-mail-message.xml.h:76
 msgid "Reset the text to its original size"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:82
+#: ui/evolution-mail-message.xml.h:77
 #, fuzzy
-msgid "S_earch in Message..."
+msgid "S_earch Message..."
 msgstr "Anomena i desa..."
 
-#: ui/evolution-mail-message.xml.h:83
+#: ui/evolution-mail-message.xml.h:78
 msgid "S_maller"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:84
+#: ui/evolution-mail-message.xml.h:79
 #, fuzzy
 msgid "Save the message as a text file"
 msgstr "Desa el missatge a una carpeta determinada"
 
-#: ui/evolution-mail-message.xml.h:85
+#: ui/evolution-mail-message.xml.h:80
 msgid "Search for text in the body of the displayed message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:86
+#: ui/evolution-mail-message.xml.h:81
 msgid "Set up the page settings for your current printer"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:87
+#: ui/evolution-mail-message.xml.h:82
 #, fuzzy
 msgid "Show Email _Source"
 msgstr "Font del correu"
 
-#: ui/evolution-mail-message.xml.h:88
+#: ui/evolution-mail-message.xml.h:83
 #, fuzzy
 msgid "Show Full _Headers"
 msgstr "Cerca completa"
 
-#: ui/evolution-mail-message.xml.h:89
-msgid "Show a blinking cursor in the body of displayed messages"
-msgstr ""
-
-#: ui/evolution-mail-message.xml.h:90
+#: ui/evolution-mail-message.xml.h:84
 #, fuzzy
 msgid "Show message in the normal style"
 msgstr "Envia els missatges en format HTML"
 
-#: ui/evolution-mail-message.xml.h:91
+#: ui/evolution-mail-message.xml.h:85
 #, fuzzy
 msgid "Show message with all email headers"
 msgstr "Comprova si hi ha nou correu"
 
-#: ui/evolution-mail-message.xml.h:92
+#: ui/evolution-mail-message.xml.h:86
 #, fuzzy
 msgid "Show the raw email source of the message"
 msgstr "Adjunta un fitxer al missatge"
 
-#: ui/evolution-mail-message.xml.h:93
+#: ui/evolution-mail-message.xml.h:87
 msgid "Text Si_ze"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:94
+#: ui/evolution-mail-message.xml.h:88
 #, fuzzy
 msgid "Un-delete the selected messages"
 msgstr "Imprimeix el missatge seleccionat"
 
-#: ui/evolution-mail-message.xml.h:95
+#: ui/evolution-mail-message.xml.h:89
 #, fuzzy
 msgid "VFolder on Mailing _List..."
 msgstr "Filtre sobre la llista de correu"
 
-#: ui/evolution-mail-message.xml.h:96
+#: ui/evolution-mail-message.xml.h:90
 #, fuzzy
 msgid "VFolder on Se_nder..."
 msgstr "VFolder sobre el remite_nt"
 
-#: ui/evolution-mail-message.xml.h:97
+#: ui/evolution-mail-message.xml.h:91
 #, fuzzy
 msgid "VFolder on _Recipients..."
 msgstr "VFolder sobre els destinata_ris"
 
-#: ui/evolution-mail-message.xml.h:98
+#: ui/evolution-mail-message.xml.h:92
 #, fuzzy
 msgid "VFolder on _Subject..."
 msgstr "VFolder sobre l'assumpte"
 
-#: ui/evolution-mail-message.xml.h:100
+#: ui/evolution-mail-message.xml.h:94
 #, fuzzy
 msgid "_Attached"
 msgstr "Adjunta"
 
-#: ui/evolution-mail-message.xml.h:102
+#: ui/evolution-mail-message.xml.h:95
 #, fuzzy
 msgid "_Copy to Folder"
 msgstr "Copia a la carpeta"
 
-#: ui/evolution-mail-message.xml.h:103
+#: ui/evolution-mail-message.xml.h:96
 msgid "_Create Filter From Message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:105
+#: ui/evolution-mail-message.xml.h:98
 #, fuzzy
 msgid "_Forward Message"
 msgstr "Reenvia el missatge"
 
-#: ui/evolution-mail-message.xml.h:106
+#: ui/evolution-mail-message.xml.h:99
 #, fuzzy
 msgid "_Go To"
 msgstr "Vés a"
 
-#: ui/evolution-mail-message.xml.h:107
+#: ui/evolution-mail-message.xml.h:100
 #, fuzzy
 msgid "_Inline"
 msgstr "Visualitza en línia"
 
-#: ui/evolution-mail-message.xml.h:108
+#: ui/evolution-mail-message.xml.h:101
 #, fuzzy
 msgid "_Larger"
 msgstr "Busca"
 
-#: ui/evolution-mail-message.xml.h:109
+#: ui/evolution-mail-message.xml.h:102
 #, fuzzy
 msgid "_Message Display"
 msgstr "Esborra la visualització del missatge"
 
-#: ui/evolution-mail-message.xml.h:110
+#: ui/evolution-mail-message.xml.h:103
 #, fuzzy
 msgid "_Move to Folder"
 msgstr "Mou a la carpeta"
 
-#: ui/evolution-mail-message.xml.h:111
+#: ui/evolution-mail-message.xml.h:104
 #, fuzzy
 msgid "_Next Message"
 msgstr "_Missatge"
 
-#: ui/evolution-mail-message.xml.h:112
+#: ui/evolution-mail-message.xml.h:105
 #, fuzzy
 msgid "_Normal Display"
 msgstr "_Visualització"
 
-#: ui/evolution-mail-message.xml.h:113
+#: ui/evolution-mail-message.xml.h:106
 #, fuzzy
 msgid "_Open Message"
 msgstr "_Edita el missatge"
 
-#: ui/evolution-mail-message.xml.h:115
+#: ui/evolution-mail-message.xml.h:107
 #, fuzzy
 msgid "_Previous Message"
 msgstr "Imprimeix el missatge"
 
-#: ui/evolution-mail-message.xml.h:117
+#: ui/evolution-mail-message.xml.h:109
 #, fuzzy
 msgid "_Quoted"
 msgstr "Cap"
 
-#: ui/evolution-mail-message.xml.h:118
-#, fuzzy
-msgid "_Reply to Sender"
-msgstr "Respon al remitent"
-
-#: ui/evolution-mail-message.xml.h:119
+#: ui/evolution-mail-message.xml.h:111
 #, fuzzy
 msgid "_Resend..."
 msgstr "_Tanca..."
 
-#: ui/evolution-mail-message.xml.h:121 ui/evolution.xml.h:63
+#: ui/evolution-mail-message.xml.h:113 ui/evolution.xml.h:63
 msgid "_Tools"
 msgstr "_Eines"
 
-#: ui/evolution-mail-message.xml.h:122
+#: ui/evolution-mail-message.xml.h:114
 #, fuzzy
 msgid "_Undelete"
 msgstr "_Suprimeix"
 
+#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:6
+#, fuzzy
+msgid "Close this window"
+msgstr "Suprimeix aquesta cita"
+
+#: ui/evolution-mail-messagedisplay.xml.h:5
+#: ui/evolution-message-composer.xml.h:39
+#: ui/evolution-signature-editor.xml.h:10 ui/evolution-subscribe.xml.h:9
+#: ui/evolution.xml.h:43
+#, fuzzy
+msgid "_Close"
+msgstr "Tanca"
+
+#: ui/evolution-mail-messagedisplay.xml.h:8
+#: ui/evolution-message-composer.xml.h:49 ui/evolution.xml.h:64
+msgid "_View"
+msgstr "_Visualitza"
+
 #: ui/evolution-message-composer.xml.h:1
 msgid "Attach"
 msgstr "Adjunta"
@@ -29028,7 +29338,7 @@ msgstr "Adjunta"
 msgid "Attach a file"
 msgstr "Adjunta un fitxer"
 
-#: ui/evolution-message-composer.xml.h:4 ui/evolution-signature-editor.xml.h:3
+#: ui/evolution-message-composer.xml.h:4 ui/evolution-signature-editor.xml.h:2
 #, fuzzy
 msgid "Close the current file"
 msgstr "l'hora actual"
@@ -29047,7 +29357,7 @@ msgstr "Edita el missatge"
 msgid "Encrypt this message with your S/MIME Encryption Cetificate"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:8 ui/evolution-signature-editor.xml.h:4
+#: ui/evolution-message-composer.xml.h:8 ui/evolution-signature-editor.xml.h:3
 #, fuzzy
 msgid "For_mat"
 msgstr "Format"
@@ -29083,11 +29393,6 @@ msgstr ""
 msgid "S/MIME Sign"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:16
-#: ui/evolution-signature-editor.xml.h:6
-msgid "Save"
-msgstr "Desa"
-
 #: ui/evolution-message-composer.xml.h:17
 #, fuzzy
 msgid "Save As"
@@ -29103,7 +29408,7 @@ msgid "Save in folder..."
 msgstr "Desa a la _carpeta..."
 
 #: ui/evolution-message-composer.xml.h:21
-#: ui/evolution-signature-editor.xml.h:9
+#: ui/evolution-signature-editor.xml.h:7
 #, fuzzy
 msgid "Save the current file"
 msgstr "l'hora actual"
@@ -29123,7 +29428,7 @@ msgid "Send"
 msgstr "_Envia"
 
 #: ui/evolution-message-composer.xml.h:25
-#: ui/evolution-signature-editor.xml.h:11
+#: ui/evolution-signature-editor.xml.h:9
 #, fuzzy
 msgid "Send the mail in HTML format"
 msgstr "Envia els missatges en format HTML"
@@ -29201,7 +29506,7 @@ msgid "_From Field"
 msgstr ""
 
 #: ui/evolution-message-composer.xml.h:44
-#: ui/evolution-signature-editor.xml.h:14
+#: ui/evolution-signature-editor.xml.h:13
 #, fuzzy
 msgid "_Insert"
 msgstr "_Índex"
@@ -29220,12 +29525,12 @@ msgstr "Respon"
 msgid "_Security"
 msgstr ""
 
-#: ui/evolution-signature-editor.xml.h:5
+#: ui/evolution-signature-editor.xml.h:4
 #, fuzzy
 msgid "H_TML"
 msgstr "HTML"
 
-#: ui/evolution-signature-editor.xml.h:10
+#: ui/evolution-signature-editor.xml.h:8
 #, fuzzy
 msgid "Save the current file and close the window"
 msgstr "Desa el contacte i tanca el quadre de diàleg"
@@ -29311,22 +29616,17 @@ msgstr "Suprimeix la tasca"
 msgid "Mar_k as Complete"
 msgstr "Marca com a completa"
 
-#: ui/evolution-tasks.xml.h:9
-#, fuzzy
-msgid "Mark selected tasks as complete"
-msgstr "Marca com a completa"
-
-#: ui/evolution-tasks.xml.h:11
+#: ui/evolution-tasks.xml.h:10
 #, fuzzy
 msgid "Paste task from the clipboard"
 msgstr "Enganxa l'element del porta-retalls"
 
-#: ui/evolution-tasks.xml.h:12
+#: ui/evolution-tasks.xml.h:11
 #, fuzzy
 msgid "Previews the list of tasks to be printed"
 msgstr "Previsualitza el missatge que s'ha d'imprimir"
 
-#: ui/evolution-tasks.xml.h:14
+#: ui/evolution-tasks.xml.h:13
 #, fuzzy
 msgid "Print the list of tasks"
 msgstr "Imprimeix el missatge"
@@ -29625,31 +29925,31 @@ msgstr "Setmana de treball"
 
 #: views/mail/galview.xml.h:1
 #, fuzzy
-msgid "As _Sent Folder"
+msgid "As Sent Folder"
 msgstr "Seleccioneu una carpeta"
 
 #: views/mail/galview.xml.h:2
-#, fuzzy
-msgid "By S_tatus"
-msgstr "_Estat:"
+msgid "By Follow Up Flag"
+msgstr ""
 
 #: views/mail/galview.xml.h:3
 #, fuzzy
-msgid "By Se_nder"
+msgid "By Sender"
 msgstr "Remitent"
 
 #: views/mail/galview.xml.h:4
 #, fuzzy
-msgid "By Su_bject"
-msgstr "Assumpte"
+msgid "By Status"
+msgstr "_Estat:"
 
 #: views/mail/galview.xml.h:5
-msgid "By _Follow Up Flag"
-msgstr ""
+#, fuzzy
+msgid "By Subject"
+msgstr "Assumpte"
 
 #: views/mail/galview.xml.h:6
 #, fuzzy
-msgid "_Messages"
+msgid "Messages"
 msgstr "_Missatge"
 
 #: views/tasks/galview.xml.h:1
@@ -29711,20 +30011,20 @@ msgstr ""
 
 #. Translators: These are the first characters of each day of the
 #. week, 'M' for 'Monday', 'T' for Tuesday etc.
-#: widgets/misc/e-calendar-item.c:456
+#: widgets/misc/e-calendar-item.c:427
 msgid "MTWTFSS"
 msgstr "DDDDDDD"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: widgets/misc/e-calendar-item.c:1174
+#: widgets/misc/e-calendar-item.c:1127
 msgid "%B %Y"
 msgstr "%B %Y"
 
-#: widgets/misc/e-cell-date-edit.c:241 widgets/misc/e-dateedit.c:431
+#: widgets/misc/e-cell-date-edit.c:241 widgets/misc/e-dateedit.c:428
 msgid "Now"
 msgstr "Ara"
 
-#: widgets/misc/e-cell-date-edit.c:249 widgets/misc/e-dateedit.c:437
+#: widgets/misc/e-cell-date-edit.c:249 widgets/misc/e-dateedit.c:434
 msgid "Today"
 msgstr "Avui"
 
@@ -29854,6 +30154,26 @@ msgstr "Cerca"
 msgid "_Advanced..."
 msgstr "Afegeix..."
 
+#: widgets/misc/e-messagebox.c:154
+#, fuzzy
+msgid "Information"
+msgstr "Cap informació"
+
+#: widgets/misc/e-messagebox.c:168
+#, fuzzy
+msgid "Error"
+msgstr "Cap error"
+
+#: widgets/misc/e-messagebox.c:175
+#, fuzzy
+msgid "Question"
+msgstr "Descripció:"
+
+#: widgets/misc/e-messagebox.c:182
+#, fuzzy
+msgid "Message"
+msgstr "_Missatge"
+
 #: widgets/misc/e-search-bar.c:531
 #, fuzzy
 msgid "_Search"
@@ -29909,526 +30229,6 @@ msgstr "Conducte de l'agenda de l'Evolution"
 msgid "Evolution Addressbook local file backend"
 msgstr "Conducte de la llibreta d'adreces de l'Evolution"
 
-#, fuzzy
-#~ msgid "URL:"
-#~ msgstr "URL:"
-
-#, fuzzy
-#~ msgid "_Save as..."
-#~ msgstr "Anomena i desa..."
-
-#, fuzzy
-#~ msgid "End Date"
-#~ msgstr "Hora de _finalització:"
-
-#, fuzzy
-#~ msgid "New _Appointment"
-#~ msgstr "Nova cita..."
-
-#~ msgid "Print..."
-#~ msgstr "Imprimeix..."
-
-#, fuzzy
-#~ msgid "Required Participants"
-#~ msgstr "Persones _requerides"
-
-#, fuzzy
-#~ msgid "Optional Participants"
-#~ msgstr "Persones _requerides"
-
-#, fuzzy
-#~ msgid "Resources"
-#~ msgstr "Font"
-
-#, fuzzy
-#~ msgid "Group"
-#~ msgstr "Grup %i"
-
-#, fuzzy
-#~ msgid "Resource"
-#~ msgstr "Font"
-
-#, fuzzy
-#~ msgid "Chair"
-#~ msgstr "Cotxe"
-
-#, fuzzy
-#~ msgid "Required Participant"
-#~ msgstr "Persones _requerides"
-
-#, fuzzy
-#~ msgid "Needs Action"
-#~ msgstr "Elimina una acció"
-
-#, fuzzy
-#~ msgid "Delegated"
-#~ msgstr "Suprimeix"
-
-#, fuzzy
-#~ msgid "In Process"
-#~ msgstr "En procés"
-
-#, fuzzy
-#~ msgid "Properties for \"%s\""
-#~ msgstr "Propietats..."
-
-#, fuzzy
-#~ msgid "Properties"
-#~ msgstr "Propietats..."
-
-#~ msgid "Could not create temporary directory: %s"
-#~ msgstr "No s'ha pogut crear el directori temporal: %s"
-
-#, fuzzy
-#~ msgid "%d selected"
-#~ msgstr "Suprimeix"
-
-#, fuzzy
-#~ msgid "%d unsent"
-#~ msgstr " segons"
-
-#, fuzzy
-#~ msgid "%d sent"
-#~ msgstr " segons"
-
-#, fuzzy
-#~ msgid "Create _Virtual Folder From Search..."
-#~ msgstr "Carpetes virtuals"
-
-#, fuzzy
-#~ msgid "VFolder on _Subject"
-#~ msgstr "VFolder sobre l'assumpte"
-
-#~ msgid "VFolder on Se_nder"
-#~ msgstr "VFolder sobre el remite_nt"
-
-#~ msgid "VFolder on _Recipients"
-#~ msgstr "VFolder sobre els destinata_ris"
-
-#, fuzzy
-#~ msgid "VFolder on Mailing _List"
-#~ msgstr "Filtre sobre la llista de correu"
-
-#, fuzzy
-#~ msgid "Filter on Sub_ject"
-#~ msgstr "Filtre sobre l'assumpte"
-
-#, fuzzy
-#~ msgid "Filter on Sen_der"
-#~ msgstr "Filtre sobre el remitent"
-
-#, fuzzy
-#~ msgid "Filter on Re_cipients"
-#~ msgstr "Filtre sobre els destinataris"
-
-#, fuzzy
-#~ msgid "Filter on _Mailing List"
-#~ msgstr "Filtre sobre la llista de correu"
-
-#, fuzzy
-#~ msgid "_Edit as New Message..."
-#~ msgstr "_Anomena i desa..."
-
-#~ msgid "_Print"
-#~ msgstr "_Imprimeix"
-
-#~ msgid "_Forward"
-#~ msgstr "_Reenvia"
-
-#, fuzzy
-#~ msgid "Fla_g Completed"
-#~ msgstr "% comp_let:"
-
-#, fuzzy
-#~ msgid "Cl_ear Flag"
-#~ msgstr "Agenda"
-
-#, fuzzy
-#~ msgid "Mark as _Unread"
-#~ msgstr "Marca'l com a per _llegir"
-
-#, fuzzy
-#~ msgid "Mark as _Important"
-#~ msgstr "Marca'l com a per _llegir"
-
-#, fuzzy
-#~ msgid "_Mark as Unimportant"
-#~ msgstr "Marca'l com a per _llegir"
-
-#, fuzzy
-#~ msgid "U_ndelete"
-#~ msgstr "_Suprimeix"
-
-#, fuzzy
-#~ msgid "Mo_ve to Folder..."
-#~ msgstr "Mou a la carpeta"
-
-#, fuzzy
-#~ msgid "Add Sender to Address_book"
-#~ msgstr "Desa a la llibreta d'adreces"
-
-#, fuzzy
-#~ msgid "Appl_y Filters"
-#~ msgstr "_Aplica els filtres"
-
-#, fuzzy
-#~ msgid "Crea_te Rule From Message"
-#~ msgstr "Carpetes virtuals"
-
-#, fuzzy
-#~ msgid "VFolder on M_ailing List"
-#~ msgstr "Filtre sobre la llista de correu"
-
-#, fuzzy
-#~ msgid "Filter on _Mailing List (%s)"
-#~ msgstr "Filtre sobre la llista de correu (%s)"
-
-#, fuzzy
-#~ msgid "VFolder on M_ailing List (%s)"
-#~ msgstr "Filtre sobre la llista de correu (%s)"
-
-#, fuzzy
-#~ msgid "Don't show this message again."
-#~ msgstr "Envia aquest missatge"
-
-#~ msgid ""
-#~ "You have not configured the mail client.\n"
-#~ "You need to do this before you can send,\n"
-#~ "receive or compose mail.\n"
-#~ "Would you like to configure it now?"
-#~ msgstr ""
-#~ "No heu configurat el client de correu.\n"
-#~ "Cal que ho feu abans de poder enviar,\n"
-#~ "rebre o redactar correu.\n"
-#~ "El voleu configurar ara?"
-
-#~ msgid ""
-#~ "You need to configure an identity\n"
-#~ "before you can compose mail."
-#~ msgstr ""
-#~ "Cal que configureu una identitat\n"
-#~ "abans de poder redactar correu."
-
-#~ msgid ""
-#~ "You need to configure a mail transport\n"
-#~ "before you can compose mail."
-#~ msgstr ""
-#~ "Cal que configureu un transport de correu\n"
-#~ "abans de poder redactar correu."
-
-#, fuzzy
-#~ msgid "Send anyway?"
-#~ msgstr "S'està recollint el correu des de %s"
-
-#~ msgid ""
-#~ "This message has no subject.\n"
-#~ "Really send?"
-#~ msgstr ""
-#~ "Aquest missatge no té cap assumpte.\n"
-#~ "Voleu que l'enviï igualment?"
-
-#, fuzzy
-#~ msgid "This message contains only Bcc recipients."
-#~ msgstr "S'està afegint un missatge sense cap assumpte"
-
-#~ msgid "You must specify recipients in order to send this message."
-#~ msgstr "Cal que indiqueu els destinataris per poder enviar aquest missatge."
-
-#, fuzzy
-#~ msgid "an unknown sender"
-#~ msgstr "Error desconegut"
-
-#~ msgid "Move message(s) to"
-#~ msgstr "Mou el(s) missatge(s) cap a"
-
-#~ msgid "Copy message(s) to"
-#~ msgstr "Copia el(s) missatge(s) a"
-
-#, fuzzy
-#~ msgid "Are you sure you want to edit all %d messages?"
-#~ msgstr ""
-#~ "Esteu segur que voleu\n"
-#~ "suprimir aquest contacte?"
-
-#~ msgid ""
-#~ "You may only edit messages saved\n"
-#~ "in the Drafts folder."
-#~ msgstr ""
-#~ "Només podeu editar els missatges que s'hagin desat\n"
-#~ "a la carpeta Esborranys."
-
-#, fuzzy
-#~ msgid ""
-#~ "You may only resend messages\n"
-#~ "in the Sent folder."
-#~ msgstr ""
-#~ "Només podeu editar els missatges que s'hagin desat\n"
-#~ "a la carpeta Esborranys."
-
-#, fuzzy
-#~ msgid "Are you sure you want to resend all %d messages?"
-#~ msgstr ""
-#~ "Esteu segur que voleu\n"
-#~ "suprimir aquest contacte?"
-
-#, fuzzy
-#~ msgid "No Message Selected"
-#~ msgstr "S'ha rebut el missatge"
-
-#, fuzzy
-#~ msgid ""
-#~ "Cannot save to `%s'\n"
-#~ " %s"
-#~ msgstr ""
-#~ "No es pot obrir la ubicació `%s':\n"
-#~ "%s"
-
-#, fuzzy
-#~ msgid ""
-#~ "`%s' already exists.\n"
-#~ "Overwrite it?"
-#~ msgstr ""
-#~ "Ja existeix una fitxer amb aquest nom.\n"
-#~ "El voleu sobreescriure?"
-
-#, fuzzy
-#~ msgid "Save Message As..."
-#~ msgstr "Anomena i desa..."
-
-#, fuzzy
-#~ msgid "Save Messages As..."
-#~ msgstr "Anomena i desa..."
-
-#~ msgid ""
-#~ "Error loading filter information:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Error en carregar la informació del filtre:\n"
-#~ "%s"
-
-#, fuzzy
-#~ msgid "Filters"
-#~ msgstr "_Filtres de correu ..."
-
-#, fuzzy
-#~ msgid "Page %d of %d"
-#~ msgstr "S'està escrivint el missatge %d de %d"
-
-#~ msgid "Print Message"
-#~ msgstr "Imprimeix el missatge"
-
-#~ msgid "Printing of message failed"
-#~ msgstr "Ha fallat la impressió del missatge"
-
-#, fuzzy
-#~ msgid "Are you sure you want to open all %d messages in separate windows?"
-#~ msgstr ""
-#~ "Esteu segur que voleu\n"
-#~ "suprimir aquest contacte?"
-
-#, fuzzy
-#~ msgid "Could not create a S/MIME signature context."
-#~ msgstr "No s'ha pogut crear el quadre de diàleg."
-
-#, fuzzy
-#~ msgid "Could not create a S/MIME certsonly context."
-#~ msgstr "No s'ha pogut crear el quadre de diàleg."
-
-#, fuzzy
-#~ msgid "Could not create a S/MIME encryption context."
-#~ msgstr "No s'ha pogut crear el quadre de diàleg."
-
-#, fuzzy
-#~ msgid "Could not create a S/MIME envelope context."
-#~ msgstr "No s'ha pogut crear el quadre de diàleg."
-
-#, fuzzy
-#~ msgid "Could not create a S/MIME decode context."
-#~ msgstr "No s'ha pogut crear el quadre de diàleg."
-
-#, fuzzy
-#~ msgid ""
-#~ "File `%s' already exists.\n"
-#~ "Overwrite it?"
-#~ msgstr ""
-#~ "Ja existeix una fitxer amb aquest nom.\n"
-#~ "El voleu sobreescriure?"
-
-#~ msgid "Save Attachment"
-#~ msgstr "Desa l'adjunció"
-
-#, fuzzy
-#~ msgid "Could not create temporary file '%s': %s"
-#~ msgstr "No s'ha pogut crear la mbox temporal `%s': %s"
-
-#, fuzzy
-#~ msgid "Save Attachment..."
-#~ msgstr "Desa l'adjunció"
-
-#~ msgid "View Inline"
-#~ msgstr "Visualitza en línia"
-
-#~ msgid "Open in %s..."
-#~ msgstr "Obre a %s..."
-
-#~ msgid "View Inline (via %s)"
-#~ msgstr "Visualitza en línia (mitjançant %s)"
-
-#~ msgid "Hide"
-#~ msgstr "Amaga"
-
-#~ msgid "External Viewer"
-#~ msgstr "Visualitzador extern"
-
-#, fuzzy
-#~ msgid "Downloading images"
-#~ msgstr "Missatge reenviat - %s"
-
-#, fuzzy
-#~ msgid "Loading message content"
-#~ msgstr "S'estan reenviant els missatges \"%s\""
-
-#, fuzzy
-#~ msgid "Overdue:"
-#~ msgstr "Elements que ja han vençut:"
-
-#, fuzzy
-#~ msgid "by %B %d, %Y, %l:%M %P"
-#~ msgstr "%a %d/%m/%Y %I:%M:%S %p"
-
-#, fuzzy
-#~ msgid "Open Link in Browser"
-#~ msgstr "Obre'l en una nova finestra"
-
-#, fuzzy
-#~ msgid "Copy Link Location"
-#~ msgstr "_Contacte (FIXME)"
-
-#, fuzzy
-#~ msgid "Save Link as (FIXME)"
-#~ msgstr "_Tasca (FIXME)"
-
-#, fuzzy
-#~ msgid "Save Image as..."
-#~ msgstr "Anomena i desa..."
-
-#, fuzzy
-#~ msgid "%s attachment"
-#~ msgstr "adjunció"
-
-#, fuzzy
-#~ msgid "Could not parse MIME message. Displaying as source."
-#~ msgstr ""
-#~ "No s'ha pogut obrir la carpeta: la llista de missatges era incompleta."
-
-#, fuzzy
-#~ msgid "Bad Address"
-#~ msgstr "Adreça electrònica:"
-
-#, fuzzy
-#~ msgid "Reply-To"
-#~ msgstr "Respon"
-
-#, fuzzy
-#~ msgid "Cc"
-#~ msgstr "Cc:"
-
-#, fuzzy
-#~ msgid "Bcc"
-#~ msgstr "Bcc:"
-
-#, fuzzy
-#~ msgid "Could not create a PGP verfication context"
-#~ msgstr "No s'ha pogut crear el quadre de diàleg."
-
-#, fuzzy
-#~ msgid "Pointer to local file (%s)"
-#~ msgstr "Filtre sobre la llista de correu (%s)"
-
-#, fuzzy
-#~ msgid "Pointer to remote data (%s)"
-#~ msgstr "Filtre sobre la llista de correu (%s)"
-
-#, fuzzy
-#~ msgid "(Untitled Message)"
-#~ msgstr "(Sense títol)"
-
-#, fuzzy
-#~ msgid "Untitled Message"
-#~ msgstr "Mou el missatge"
-
-#, fuzzy
-#~ msgid "Empty Message"
-#~ msgstr "_Edita el missatge"
-
-#, fuzzy
-#~ msgid "Find in Message"
-#~ msgstr "_Edita el missatge"
-
-#, fuzzy
-#~ msgid "Search Forward"
-#~ msgstr "Reenvia"
-
-#, fuzzy
-#~ msgid "Find:"
-#~ msgstr "Cerca"
-
-#, fuzzy
-#~ msgid "Matches:"
-#~ msgstr "Camí:"
-
-#, fuzzy
-#~ msgid "Forwarded Message"
-#~ msgstr "Reenvia el missatge"
-
-#, fuzzy
-#~ msgid "(No subject)"
-#~ msgstr "Re: (sense assumpte)"
-
-#, fuzzy
-#~ msgid "%s - Message"
-#~ msgstr "_Missatge"
-
-#, fuzzy
-#~ msgid "Scanning folders under %s on \"%s\""
-#~ msgstr "S'estan escanejant les carpetes de \"%s\""
-
-#, fuzzy
-#~ msgid "Scanning root-level folders on \"%s\""
-#~ msgstr "S'estan escanejant les carpetes de \"%s\""
-
-#, fuzzy
-#~ msgid "Subscribing to folder \"%s\""
-#~ msgstr "S'estan escanejant les carpetes de \"%s\""
-
-#, fuzzy
-#~ msgid "Unsubscribing to folder \"%s\""
-#~ msgstr "S'estan obrint els missatges des de la carpeta \"%s\""
-
-#, fuzzy
-#~ msgid "No server has been selected"
-#~ msgstr "S'ha rebut el missatge"
-
-#, fuzzy
-#~ msgid "Scanning folders ..."
-#~ msgstr "Desa a la _carpeta..."
-
-#, fuzzy
-#~ msgid "Save As..."
-#~ msgstr "Anomena i desa..."
-
-#, fuzzy
-#~ msgid "Information"
-#~ msgstr "Cap informació"
-
-#, fuzzy
-#~ msgid "Question"
-#~ msgstr "Descripció:"
-
-#, fuzzy
-#~ msgid "Message"
-#~ msgstr "_Missatge"
-
 #~ msgid "Search"
 #~ msgstr "Cerca"
 
@@ -30841,6 +30641,10 @@ msgstr "Conducte de la llibreta d'adreces de l'Evolution"
 #~ msgstr "No es pot inicialitzar el component de correu de l'Evolution."
 
 #, fuzzy
+#~ msgid "Cannot initialize Evolution's folder info component."
+#~ msgstr "No es pot inicialitzar el component de correu de l'Evolution."
+
+#, fuzzy
 #~ msgid "Factory to import mbox into Evolution"
 #~ msgstr ""
 #~ "Utilitat de configuració per al conducte de l'agenda de l'Evolution.\n"
@@ -30893,6 +30697,10 @@ msgstr "Conducte de la llibreta d'adreces de l'Evolution"
 #~ msgstr "Minut"
 
 #, fuzzy
+#~ msgid "Executive summary component could not initialize Bonobo.\n"
+#~ msgstr "No s'ha pogut inicialitzar el Bonobo"
+
+#, fuzzy
 #~ msgid "Configuration control for Evolution folder settings."
 #~ msgstr ""
 #~ "Utilitat de configuració per al conducte de les coses per fer de "
@@ -31498,9 +31306,30 @@ msgstr "Conducte de la llibreta d'adreces de l'Evolution"
 #~ msgid "_Delete this Task"
 #~ msgstr "Suprimeix la tasca"
 
+#~ msgid "Please enter the NNTP password for %s@%s"
+#~ msgstr "Si us plau, introduïu la contrasenya NNTP per a %s@%s"
+
+#~ msgid "Server rejected username"
+#~ msgstr "El servidor ha rebutjat el nom d'usuari"
+
+#~ msgid "Failed to send username to server"
+#~ msgstr "No s'ha pogut enviar el nom d'usuari al servidor"
+
+#~ msgid "Server rejected username/password"
+#~ msgstr "El servidor ha rebutjat el nom d'usuari/la contrasenya"
+
 #~ msgid "Message %s not found."
 #~ msgstr "No s'ha trobat el missatge %s."
 
+#~ msgid "Could not get group list from server."
+#~ msgstr "No s'ha pogut aconseguir la llista de grups del servidor"
+
+#~ msgid "Unable to load grouplist file for %s: %s"
+#~ msgstr "No es pot carregar el fitxer de llista de grups per a %s: %s"
+
+#~ msgid "Unable to save grouplist file for %s: %s"
+#~ msgstr "No es pot desar el fitxer de llista de grups per a %s: %s"
+
 #~ msgid "Could not open directory for news server: %s"
 #~ msgstr "No s'ha pogut obrir el directori per al servidor de notícies: %s"
 
@@ -31529,6 +31358,10 @@ msgstr "Conducte de la llibreta d'adreces de l'Evolution"
 #~ "Això us connectarà al servidor POP i utilitzarà el Kerberos 4 per "
 #~ "autenticar-vos-hi."
 
+#, fuzzy
+#~ msgid "Could not connect to server: %s"
+#~ msgstr "No s'ha pogut connectar al servidor POP en %s."
+
 #~ msgid "(Unknown)"
 #~ msgstr "(Desconegut)"
 
@@ -31799,6 +31632,10 @@ msgstr "Conducte de la llibreta d'adreces de l'Evolution"
 #~ "`%s'."
 
 #, fuzzy
+#~ msgid "Cannot initialize Evolution's Executive Summary component."
+#~ msgstr "No es pot inicialitzar el component de correu de l'Evolution."
+
+#, fuzzy
 #~ msgid ""
 #~ "Ximian Evolution is a suite of groupware applications\n"
 #~ "for mail, calendaring, and contact management\n"
@@ -32393,6 +32230,34 @@ msgstr "Conducte de la llibreta d'adreces de l'Evolution"
 #~ msgstr "%H:%M%n"
 
 #, fuzzy
+#~ msgid "Send an email to %s"
+#~ msgstr "S'està recollint el correu des de %s"
+
+#, fuzzy
+#~ msgid "Close %s"
+#~ msgstr "Tanca"
+
+#, fuzzy
+#~ msgid "Move %s to the left"
+#~ msgstr "Mou a la carpeta"
+
+#, fuzzy
+#~ msgid "Move %s into the previous row"
+#~ msgstr "Vés a l'element anterior"
+
+#, fuzzy
+#~ msgid "Move %s into the next row"
+#~ msgstr "Vés a l'element següent"
+
+#, fuzzy
+#~ msgid ""
+#~ "Cannot open the HTML file:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "No s'ha pogut obrir el fitxer %s:\n"
+#~ "%s"
+
+#, fuzzy
 #~ msgid "Factory for the test bonobo component."
 #~ msgstr ""
 #~ "Utilitat de configuració per al conducte de l'agenda de l'Evolution.\n"
@@ -33120,6 +32985,9 @@ msgstr "Conducte de la llibreta d'adreces de l'Evolution"
 #~ msgid "FIXME: _Display Map of Address"
 #~ msgstr "FIXME: _Mostra el mapa de l'adreça"
 
+#~ msgid "FIXME: _Open Web Page"
+#~ msgstr "FIXME: _Obre la pàgina web"
+
 #~ msgid "FIXME: Forward as _vCard"
 #~ msgstr "FIXME: Reenvia com a _vCard"
 
@@ -33490,6 +33358,9 @@ msgstr "Conducte de la llibreta d'adreces de l'Evolution"
 #~ msgid "Edit to-do item"
 #~ msgstr "Edita un element per fer"
 
+#~ msgid "Due Date:"
+#~ msgstr "Data de venciment:"
+
 #~ msgid "Time display"
 #~ msgstr "Visualització de l'hora"
 
diff --git a/po/cs.po b/po/cs.po
index 1e29a33deb..ecffa1b503 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution VERSION\n"
-"POT-Creation-Date: 2003-10-15 23:45+0200\n"
+"POT-Creation-Date: 2003-06-25 13:24-0400\n"
 "PO-Revision-Date: 2003-06-23 20:43+0200\n"
 "Last-Translator: Miloslav Trmac <mitr@volny.cz>\n"
 "Language-Team: Czech <cs@li.org>\n"
@@ -15,182 +15,47 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Report-Msgid-Bugs-To: \n"
 
-#: addressbook/backend/ebook/e-card.c:1306
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in.h:1
+msgid "Evolution LDIF importer"
+msgstr "Importér Evolution z LDIF"
+
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in.h:2
+msgid "LDAP Data Interchange Format (.ldif)"
+msgstr "LDAP Data Interchange Format (.ldif)"
+
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:1
+msgid "Evolution VCard Importer"
+msgstr "Importér Evolution z VCard"
+
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:2
+msgid "Evolution VCard importer"
+msgstr "Importér Evolution z VCard"
+
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:3
+msgid "VCard (.vcf, .gcrd)"
+msgstr "VCard (.vcf, .gcrd)"
+
 #: addressbook/backend/ebook/e-card-simple.c:60
+#: addressbook/backend/ebook/e-card.c:1306
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:15
 msgid "File As"
 msgstr "Uložit jako"
 
-#: addressbook/backend/ebook/e-card.c:1313
-#: addressbook/gui/contact-editor/fullname.glade.h:4
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:17
-msgid "Full Name"
-msgstr "Celé jméno"
-
-#: addressbook/backend/ebook/e-card.c:1320
 #: addressbook/backend/ebook/e-card-simple.c:61
-#: addressbook/gui/component/select-names/e-select-names.etspec.h:1
+#: addressbook/backend/ebook/e-card.c:1320
 #: addressbook/gui/component/select-names/e-select-names-section.etspec.h:1
+#: addressbook/gui/component/select-names/e-select-names.etspec.h:1
 #: addressbook/gui/contact-editor/e-contact-editor-fullname.c:89
 #: my-evolution/e-summary-table.c:59
 msgid "Name"
 msgstr "Jméno"
 
-#: addressbook/backend/ebook/e-card.c:1326
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:96
-msgid "Address"
-msgstr "Adresa"
-
-#: addressbook/backend/ebook/e-card.c:1333
-msgid "Address Label"
-msgstr "Adresní štítek"
-
-#: addressbook/backend/ebook/e-card.c:1340
-msgid "Phone"
-msgstr "Telefon"
-
-#: addressbook/backend/ebook/e-card.c:1347
 #: addressbook/backend/ebook/e-card-simple.c:62
+#: addressbook/backend/ebook/e-card.c:1347
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
 msgid "Email"
 msgstr "E-mail"
 
-#: addressbook/backend/ebook/e-card.c:1354
-msgid "Birth date"
-msgstr "Datum narození"
-
-#: addressbook/backend/ebook/e-card.c:1360
-#: calendar/gui/e-calendar-table.etspec.h:18
-msgid "URL"
-msgstr "URL"
-
-#: addressbook/backend/ebook/e-card.c:1367
-#: addressbook/backend/ebook/e-card-simple.c:69
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
-msgid "Organization"
-msgstr "Organizace"
-
-#: addressbook/backend/ebook/e-card.c:1374
-msgid "Organizational Unit"
-msgstr "Organizační jednotka"
-
-#: addressbook/backend/ebook/e-card.c:1381
-#: addressbook/backend/ebook/e-card-simple.c:90
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
-msgid "Office"
-msgstr "Kancelář"
-
-#: addressbook/backend/ebook/e-card.c:1388
-#: addressbook/backend/ebook/e-card-simple.c:91
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:39
-msgid "Title"
-msgstr "Titul"
-
-#: addressbook/backend/ebook/e-card.c:1395
-#: calendar/gui/e-meeting-time-sel.etspec.h:9
-msgid "Role"
-msgstr "Funkce"
-
-#: addressbook/backend/ebook/e-card.c:1402
-#: addressbook/backend/ebook/e-card-simple.c:93
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
-msgid "Manager"
-msgstr "Vedoucí"
-
-#: addressbook/backend/ebook/e-card.c:1409
-#: addressbook/backend/ebook/e-card-simple.c:64
-#: addressbook/backend/ebook/e-card-simple.c:94
-#: addressbook/gui/contact-editor/e-contact-editor.c:1737
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:2
-msgid "Assistant"
-msgstr "Asistent"
-
-#: addressbook/backend/ebook/e-card.c:1416
-#: addressbook/backend/ebook/e-card-simple.c:95
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-msgid "Nickname"
-msgstr "Přezdívka"
-
-#: addressbook/backend/ebook/e-card.c:1423
-#: addressbook/backend/ebook/e-card-simple.c:96
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:36
-msgid "Spouse"
-msgstr "Partner/-ka"
-
-#: addressbook/backend/ebook/e-card.c:1430
-#: addressbook/backend/ebook/e-card-simple.c:101
-msgid "Anniversary"
-msgstr "Výročí"
-
-#: addressbook/backend/ebook/e-card.c:1436
-msgid "Mailer"
-msgstr "Program elektronické pošty"
-
-#: addressbook/backend/ebook/e-card.c:1443
-#: addressbook/backend/ebook/e-card-simple.c:98
-msgid "Calendar URI"
-msgstr "Kalendář URI"
-
-#: addressbook/backend/ebook/e-card.c:1450
-msgid "Free/Busy URL"
-msgstr "Volno/zaneprázdněná URL"
-
-#: addressbook/backend/ebook/e-card.c:1457
-msgid "ICS Calendar"
-msgstr "Kalendář ICS"
-
-#: addressbook/backend/ebook/e-card.c:1464
-#: addressbook/backend/ebook/e-card-simple.c:97
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
-msgid "Note"
-msgstr "Poznámka"
-
-#: addressbook/backend/ebook/e-card.c:1471
-msgid "Related Contacts"
-msgstr "Související kontakty"
-
-#: addressbook/backend/ebook/e-card.c:1478
-#: addressbook/backend/ebook/e-card-simple.c:105
-#: calendar/gui/e-calendar-table.etspec.h:4
-msgid "Categories"
-msgstr "Kategorie"
-
-#: addressbook/backend/ebook/e-card.c:1485
-msgid "Category List"
-msgstr "Seznam kategorií"
-
-#: addressbook/backend/ebook/e-card.c:1492
-msgid "Wants HTML"
-msgstr "Dává přednost HTML"
-
-#: addressbook/backend/ebook/e-card.c:1499
-msgid "Wants HTML set"
-msgstr "Nastaveno Dává přednost HTML"
-
-#: addressbook/backend/ebook/e-card.c:1506 ui/evolution-calendar.xml.h:16
-msgid "List"
-msgstr "Seznam"
-
-#: addressbook/backend/ebook/e-card.c:1513
-msgid "List Show Addresses"
-msgstr "Seznam zobrazených adres"
-
-#: addressbook/backend/ebook/e-card.c:1520
-msgid "Arbitrary"
-msgstr "Libovolný"
-
-#: addressbook/backend/ebook/e-card.c:1527
-msgid "ID"
-msgstr "ID"
-
-#: addressbook/backend/ebook/e-card.c:1534
-msgid "Last Use"
-msgstr "Poslední použití"
-
-#: addressbook/backend/ebook/e-card.c:1545
-msgid "Use Score"
-msgstr "Použít skóre"
-
 #: addressbook/backend/ebook/e-card-simple.c:63
 #: addressbook/gui/contact-editor/e-contact-editor.c:1752
 msgid "Primary"
@@ -200,6 +65,14 @@ msgstr "Primární"
 msgid "Prim"
 msgstr "Prim"
 
+#: addressbook/backend/ebook/e-card-simple.c:64
+#: addressbook/backend/ebook/e-card-simple.c:94
+#: addressbook/backend/ebook/e-card.c:1409
+#: addressbook/gui/contact-editor/e-contact-editor.c:1737
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:2
+msgid "Assistant"
+msgstr "Asistent"
+
 #: addressbook/backend/ebook/e-card-simple.c:65
 #: addressbook/backend/ebook/e-card-simple.c:70
 #: addressbook/gui/contact-editor/e-contact-editor.c:1738
@@ -234,6 +107,12 @@ msgid "Home"
 msgstr "Domů"
 
 #: addressbook/backend/ebook/e-card-simple.c:69
+#: addressbook/backend/ebook/e-card.c:1367
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
+msgid "Organization"
+msgstr "Organizace"
+
+#: addressbook/backend/ebook/e-card-simple.c:69
 msgid "Org"
 msgstr "Org."
 
@@ -352,9 +231,21 @@ msgid "Dep"
 msgstr "Odd."
 
 #: addressbook/backend/ebook/e-card-simple.c:90
+#: addressbook/backend/ebook/e-card.c:1381
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
+msgid "Office"
+msgstr "Kancelář"
+
+#: addressbook/backend/ebook/e-card-simple.c:90
 msgid "Off"
 msgstr "Kanc."
 
+#: addressbook/backend/ebook/e-card-simple.c:91
+#: addressbook/backend/ebook/e-card.c:1388
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:39
+msgid "Title"
+msgstr "Titul"
+
 #: addressbook/backend/ebook/e-card-simple.c:92
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:34
 msgid "Profession"
@@ -365,6 +256,12 @@ msgid "Prof"
 msgstr "Pov."
 
 #: addressbook/backend/ebook/e-card-simple.c:93
+#: addressbook/backend/ebook/e-card.c:1402
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
+msgid "Manager"
+msgstr "Vedoucí"
+
+#: addressbook/backend/ebook/e-card-simple.c:93
 msgid "Man"
 msgstr "Ved."
 
@@ -373,9 +270,32 @@ msgid "Ass"
 msgstr "Asist."
 
 #: addressbook/backend/ebook/e-card-simple.c:95
+#: addressbook/backend/ebook/e-card.c:1416
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
+msgid "Nickname"
+msgstr "Přezdívka"
+
+#: addressbook/backend/ebook/e-card-simple.c:95
 msgid "Nick"
 msgstr "Přezd."
 
+#: addressbook/backend/ebook/e-card-simple.c:96
+#: addressbook/backend/ebook/e-card.c:1423
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:36
+msgid "Spouse"
+msgstr "Partner/-ka"
+
+#: addressbook/backend/ebook/e-card-simple.c:97
+#: addressbook/backend/ebook/e-card.c:1464
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
+msgid "Note"
+msgstr "Poznámka"
+
+#: addressbook/backend/ebook/e-card-simple.c:98
+#: addressbook/backend/ebook/e-card.c:1443
+msgid "Calendar URI"
+msgstr "Kalendář URI"
+
 #: addressbook/backend/ebook/e-card-simple.c:98
 msgid "CALUri"
 msgstr "CALUri"
@@ -398,6 +318,11 @@ msgid "icsCalendar"
 msgstr "icsCalendar"
 
 #: addressbook/backend/ebook/e-card-simple.c:101
+#: addressbook/backend/ebook/e-card.c:1430
+msgid "Anniversary"
+msgstr "Výročí"
+
+#: addressbook/backend/ebook/e-card-simple.c:101
 msgid "Anniv"
 msgstr "Výr."
 
@@ -405,6 +330,12 @@ msgstr "Výr."
 msgid "Birth Date"
 msgstr "Narozeniny"
 
+#: addressbook/backend/ebook/e-card-simple.c:105
+#: addressbook/backend/ebook/e-card.c:1478
+#: calendar/gui/e-calendar-table.etspec.h:4
+msgid "Categories"
+msgstr "Kategorie"
+
 #: addressbook/backend/ebook/e-card-simple.c:106
 msgid "Family Name"
 msgstr "Příjmení"
@@ -419,29 +350,105 @@ msgid "%x"
 msgstr "%x"
 
 #: addressbook/backend/ebook/e-card-simple.c:912
-#: addressbook/backend/ebook/e-destination.c:709
+#: addressbook/backend/ebook/e-destination.c:706
 msgid "Unnamed List"
 msgstr "Nepojmenovaný seznam"
 
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in.h:1
-msgid "Evolution LDIF importer"
-msgstr "Importér Evolution z LDIF"
+#: addressbook/backend/ebook/e-card.c:1313
+#: addressbook/gui/contact-editor/fullname.glade.h:4
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:17
+msgid "Full Name"
+msgstr "Celé jméno"
 
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in.h:2
-msgid "LDAP Data Interchange Format (.ldif)"
-msgstr "LDAP Data Interchange Format (.ldif)"
+#: addressbook/backend/ebook/e-card.c:1326
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:96
+msgid "Address"
+msgstr "Adresa"
 
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:1
-msgid "Evolution VCard Importer"
-msgstr "Importér Evolution z VCard"
+#: addressbook/backend/ebook/e-card.c:1333
+msgid "Address Label"
+msgstr "Adresní štítek"
 
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:2
-msgid "Evolution VCard importer"
-msgstr "Importér Evolution z VCard"
+#: addressbook/backend/ebook/e-card.c:1340
+msgid "Phone"
+msgstr "Telefon"
 
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:3
-msgid "VCard (.vcf, .gcrd)"
-msgstr "VCard (.vcf, .gcrd)"
+#: addressbook/backend/ebook/e-card.c:1354
+msgid "Birth date"
+msgstr "Datum narození"
+
+#: addressbook/backend/ebook/e-card.c:1360
+#: calendar/gui/e-calendar-table.etspec.h:19
+msgid "URL"
+msgstr "URL"
+
+#: addressbook/backend/ebook/e-card.c:1374
+msgid "Organizational Unit"
+msgstr "Organizační jednotka"
+
+#: addressbook/backend/ebook/e-card.c:1395
+#: calendar/gui/dialogs/meeting-page.etspec.h:9
+#: calendar/gui/e-meeting-time-sel.etspec.h:9
+msgid "Role"
+msgstr "Funkce"
+
+#: addressbook/backend/ebook/e-card.c:1436 mail/mail-format.c:963
+msgid "Mailer"
+msgstr "Program elektronické pošty"
+
+#: addressbook/backend/ebook/e-card.c:1450
+msgid "Free/Busy URL"
+msgstr "Volno/zaneprázdněná URL"
+
+#: addressbook/backend/ebook/e-card.c:1457
+msgid "ICS Calendar"
+msgstr "Kalendář ICS"
+
+#: addressbook/backend/ebook/e-card.c:1471
+msgid "Related Contacts"
+msgstr "Související kontakty"
+
+#: addressbook/backend/ebook/e-card.c:1485
+msgid "Category List"
+msgstr "Seznam kategorií"
+
+#: addressbook/backend/ebook/e-card.c:1492
+msgid "Wants HTML"
+msgstr "Dává přednost HTML"
+
+#: addressbook/backend/ebook/e-card.c:1499
+msgid "Wants HTML set"
+msgstr "Nastaveno Dává přednost HTML"
+
+#: addressbook/backend/ebook/e-card.c:1506
+msgid "List"
+msgstr "Seznam"
+
+#: addressbook/backend/ebook/e-card.c:1513
+msgid "List Show Addresses"
+msgstr "Seznam zobrazených adres"
+
+#: addressbook/backend/ebook/e-card.c:1520
+msgid "Arbitrary"
+msgstr "Libovolný"
+
+#: addressbook/backend/ebook/e-card.c:1527
+msgid "ID"
+msgstr "ID"
+
+#: addressbook/backend/ebook/e-card.c:1534
+msgid "Last Use"
+msgstr "Poslední použití"
+
+#: addressbook/backend/ebook/e-card.c:1545
+msgid "Use Score"
+msgstr "Použít skóre"
+
+#: addressbook/backend/ebook/test-client-list.c:15
+#: addressbook/backend/ebook/test-client.c:33
+#: calendar/gui/alarm-notify/notify-main.c:171
+msgid "Could not initialize Bonobo"
+msgstr "Nelze spustit Bonobo"
 
 #: addressbook/backend/pas/pas-backend-file.c:464
 #: addressbook/backend/pas/pas-backend-ldap.c:3050
@@ -498,14 +505,14 @@ msgid "EBook not loaded\n"
 msgstr "EBook nebyl načten\n"
 
 #: addressbook/conduit/address-conduit.c:1376
-#: calendar/conduits/calendar/calendar-conduit.c:1351
-#: calendar/conduits/todo/todo-conduit.c:893
+#: calendar/conduits/calendar/calendar-conduit.c:1342
+#: calendar/conduits/todo/todo-conduit.c:884
 msgid "Could not start wombat server"
 msgstr "Nelze spustit wombat server"
 
 #: addressbook/conduit/address-conduit.c:1377
-#: calendar/conduits/calendar/calendar-conduit.c:1352
-#: calendar/conduits/todo/todo-conduit.c:894
+#: calendar/conduits/calendar/calendar-conduit.c:1343
+#: calendar/conduits/todo/todo-conduit.c:885
 msgid "Could not start wombat"
 msgstr "Nelze spustit wombat"
 
@@ -514,6 +521,137 @@ msgstr "Nelze spustit wombat"
 msgid "Could not read pilot's Address application block"
 msgstr "Není možné přečíst blok aplikace Adresa z pilota"
 
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
+msgid "Configure access to LDAP directory servers here"
+msgstr "Zde lze nastavit přístup k adresářům LDAP serverů"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
+msgid "Directory Servers"
+msgstr "Adresářové servery"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
+msgid "Evolution Addressbook"
+msgstr "Adresář Evolution"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
+msgid "Evolution Addressbook LDAP Configuration Control"
+msgstr "Ovládací prvek nastavení adresáře LDAP Evolution"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
+msgid "Evolution Addressbook address pop-up"
+msgstr "Pop-up menu adresy adresáře Evolution"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
+msgid "Evolution Addressbook address viewer"
+msgstr "Prohlížeč adres adresáře Evolution"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
+msgid "Evolution Addressbook card viewer"
+msgstr "Prohlížeč karet adresáře Evolution"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
+msgid "Evolution Addressbook component"
+msgstr "Komponenta adresáře Evolution."
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
+msgid "Evolution Addressbook folder viewer"
+msgstr "Prohlížeč složek adresáře Evolution"
+
+#: addressbook/gui/component/addressbook-component.c:76
+#: addressbook/gui/component/addressbook-component.c:620
+#: importers/netscape-importer.c:1874 mail/importers/netscape-importer.c:1844
+#: shell/e-local-storage.c:178 shell/e-shortcuts.c:1087
+msgid "Contacts"
+msgstr "Kontakty"
+
+#: addressbook/gui/component/addressbook-component.c:76
+msgid "Folder containing contact information"
+msgstr "Složka obsahující kontaktní informace"
+
+#: addressbook/gui/component/addressbook-component.c:78
+msgid "LDAP Server"
+msgstr "Server LDAP"
+
+#: addressbook/gui/component/addressbook-component.c:78
+msgid "LDAP server containing contact information"
+msgstr "Server LDAP obsahující kontaktní informace"
+
+#: addressbook/gui/component/addressbook-component.c:80
+msgid "Public Contacts"
+msgstr "Veřejné kontakty"
+
+#: addressbook/gui/component/addressbook-component.c:80
+msgid "Public folder containing contact information"
+msgstr "Veřejná složka obsahující kontaktní informace"
+
+#: addressbook/gui/component/addressbook-component.c:574
+msgid "New Contact"
+msgstr "Nový kontakt"
+
+#: addressbook/gui/component/addressbook-component.c:574
+msgid "_Contact"
+msgstr "_Kontakt"
+
+#: addressbook/gui/component/addressbook-component.c:575
+msgid "Create a new contact"
+msgstr "Vytvořit nový kontakt"
+
+#: addressbook/gui/component/addressbook-component.c:578
+msgid "New Contact List"
+msgstr "Nový seznam kontaktů"
+
+#: addressbook/gui/component/addressbook-component.c:578
+msgid "Contact _List"
+msgstr "_Seznam kontaktů"
+
+#: addressbook/gui/component/addressbook-component.c:579
+msgid "Create a new contact list"
+msgstr "Vytvořit nový seznam kontaktů"
+
+#: addressbook/gui/component/addressbook-config.c:206
+msgid "Failed to connect to LDAP server"
+msgstr "Nepodařilo se připojit k serveru LDAP."
+
+#: addressbook/gui/component/addressbook-config.c:231
+msgid "Failed to authenticate with LDAP server"
+msgstr "Nepodařilo se ověřit na serveru LDAP"
+
+#: addressbook/gui/component/addressbook-config.c:259
+msgid "Could not perform query on Root DSE"
+msgstr "Není možné dotázat se na kořenový DSE"
+
+#: addressbook/gui/component/addressbook-config.c:682
+msgid "The server responded with no supported search bases"
+msgstr "V odpovědi serveru nejsou podporované základy vyhledávání"
+
+#: addressbook/gui/component/addressbook-config.c:1193
+msgid "This server does not support LDAPv3 schema information"
+msgstr "Tento server nepodporuje schéma informací LDAPv3"
+
+#: addressbook/gui/component/addressbook-config.c:1215
+msgid "Error retrieving schema information"
+msgstr "Chyba při načítání informací o schématu"
+
+#: addressbook/gui/component/addressbook-config.c:1223
+msgid "Server did not respond with valid schema information"
+msgstr "Server neodpověděl platnou informací o schématu"
+
+#: addressbook/gui/component/addressbook-config.c:1637
+msgid "Account Name"
+msgstr "Název účtu"
+
+#: addressbook/gui/component/addressbook-config.c:1639
+msgid "Server Name"
+msgstr "Jméno serveru"
+
+#: addressbook/gui/component/addressbook-config.c:1676
+msgid "LDAP was not enabled in this build of Evolution"
+msgstr "LDAP není v tomto sestavení Evolution povolen"
+
+#: addressbook/gui/component/addressbook-storage.c:178
+msgid "Other Contacts"
+msgstr "Další kontakty"
+
 #: addressbook/gui/component/addressbook.c:502
 msgid ""
 "We were unable to open this addressbook.  Please check that the\n"
@@ -641,101 +779,6 @@ msgstr "Jakákoliv kategorie"
 msgid "The URI that the Folder Browser will display"
 msgstr "URI, kterou prohlížeč složek zobrazí"
 
-#: addressbook/gui/component/addressbook-component.c:76
-#: addressbook/gui/component/addressbook-component.c:628
-#: importers/netscape-importer.c:1874 mail/importers/netscape-importer.c:1844
-#: shell/e-local-storage.c:178 shell/e-shortcuts.c:1087
-msgid "Contacts"
-msgstr "Kontakty"
-
-#: addressbook/gui/component/addressbook-component.c:76
-msgid "Folder containing contact information"
-msgstr "Složka obsahující kontaktní informace"
-
-#: addressbook/gui/component/addressbook-component.c:78
-msgid "LDAP Server"
-msgstr "Server LDAP"
-
-#: addressbook/gui/component/addressbook-component.c:78
-msgid "LDAP server containing contact information"
-msgstr "Server LDAP obsahující kontaktní informace"
-
-#: addressbook/gui/component/addressbook-component.c:80
-msgid "Public Contacts"
-msgstr "Veřejné kontakty"
-
-#: addressbook/gui/component/addressbook-component.c:80
-msgid "Public folder containing contact information"
-msgstr "Veřejná složka obsahující kontaktní informace"
-
-#: addressbook/gui/component/addressbook-component.c:582
-msgid "New Contact"
-msgstr "Nový kontakt"
-
-#: addressbook/gui/component/addressbook-component.c:582
-msgid "_Contact"
-msgstr "_Kontakt"
-
-#: addressbook/gui/component/addressbook-component.c:583
-msgid "Create a new contact"
-msgstr "Vytvořit nový kontakt"
-
-#: addressbook/gui/component/addressbook-component.c:586
-msgid "New Contact List"
-msgstr "Nový seznam kontaktů"
-
-#: addressbook/gui/component/addressbook-component.c:586
-msgid "Contact _List"
-msgstr "_Seznam kontaktů"
-
-#: addressbook/gui/component/addressbook-component.c:587
-msgid "Create a new contact list"
-msgstr "Vytvořit nový seznam kontaktů"
-
-#: addressbook/gui/component/addressbook-config.c:206
-msgid "Failed to connect to LDAP server"
-msgstr "Nepodařilo se připojit k serveru LDAP."
-
-#: addressbook/gui/component/addressbook-config.c:231
-msgid "Failed to authenticate with LDAP server"
-msgstr "Nepodařilo se ověřit na serveru LDAP"
-
-#: addressbook/gui/component/addressbook-config.c:259
-msgid "Could not perform query on Root DSE"
-msgstr "Není možné dotázat se na kořenový DSE"
-
-#: addressbook/gui/component/addressbook-config.c:682
-msgid "The server responded with no supported search bases"
-msgstr "V odpovědi serveru nejsou podporované základy vyhledávání"
-
-#: addressbook/gui/component/addressbook-config.c:1193
-msgid "This server does not support LDAPv3 schema information"
-msgstr "Tento server nepodporuje schéma informací LDAPv3"
-
-#: addressbook/gui/component/addressbook-config.c:1215
-msgid "Error retrieving schema information"
-msgstr "Chyba při načítání informací o schématu"
-
-#: addressbook/gui/component/addressbook-config.c:1223
-msgid "Server did not respond with valid schema information"
-msgstr "Server neodpověděl platnou informací o schématu"
-
-#: addressbook/gui/component/addressbook-config.c:1637
-msgid "Account Name"
-msgstr "Název účtu"
-
-#: addressbook/gui/component/addressbook-config.c:1639
-msgid "Server Name"
-msgstr "Jméno serveru"
-
-#: addressbook/gui/component/addressbook-config.c:1676
-msgid "LDAP was not enabled in this build of Evolution"
-msgstr "LDAP není v tomto sestavení Evolution povolen"
-
-#: addressbook/gui/component/addressbook-storage.c:178
-msgid "Other Contacts"
-msgstr "Další kontakty"
-
 #.
 #. * This is the code for the UI thingie that lets you manipulate the e-mail
 #. * addresses (and *only* the e-mail addresses) associated with an existing
@@ -764,69 +807,33 @@ msgstr "Vytvořit nový kontakt \"%s\""
 msgid "Add address to existing contact \"%s\""
 msgstr "Přidat adresu k existujícímu kontaktu \"%s\""
 
-#: addressbook/gui/component/e-address-popup.c:917
+#: addressbook/gui/component/e-address-popup.c:914
 msgid "Querying Addressbook..."
 msgstr "Otázka pro adresář..."
 
-#: addressbook/gui/component/e-address-popup.c:1001
-#: addressbook/gui/component/e-address-widget.c:401
+#: addressbook/gui/component/e-address-popup.c:998
+#: addressbook/gui/component/e-address-widget.c:392
 msgid "Edit Contact Info"
 msgstr "Upravit kontaktní info"
 
-#: addressbook/gui/component/e-address-popup.c:1031
-#: addressbook/gui/component/e-address-widget.c:437
+#: addressbook/gui/component/e-address-popup.c:1028
+#: addressbook/gui/component/e-address-widget.c:428
 #: addressbook/gui/component/select-names/e-select-names-popup.c:324
 msgid "Add to Contacts"
 msgstr "Přidat ke kontaktům"
 
-#: addressbook/gui/component/e-address-popup.c:1056
+#: addressbook/gui/component/e-address-popup.c:1053
 msgid "Merge E-Mail Address"
 msgstr "Sloučit e-mailovou adresu"
 
-#: addressbook/gui/component/e-address-widget.c:378
+#: addressbook/gui/component/e-address-widget.c:369
 msgid "Disable Queries"
 msgstr "Znemožnit dotazy"
 
-#: addressbook/gui/component/e-address-widget.c:378
+#: addressbook/gui/component/e-address-widget.c:369
 msgid "Enable Queries (Dangerous!)"
 msgstr "Umožnit dotazy (nebezpečné!)"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
-msgid "Configure access to LDAP directory servers here"
-msgstr "Zde lze nastavit přístup k adresářům LDAP serverů"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
-msgid "Directory Servers"
-msgstr "Adresářové servery"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
-msgid "Evolution Addressbook"
-msgstr "Adresář Evolution"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
-msgid "Evolution Addressbook LDAP Configuration Control"
-msgstr "Ovládací prvek nastavení adresáře LDAP Evolution"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-msgid "Evolution Addressbook address pop-up"
-msgstr "Pop-up menu adresy adresáře Evolution"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
-msgid "Evolution Addressbook address viewer"
-msgstr "Prohlížeč adres adresáře Evolution"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
-msgid "Evolution Addressbook card viewer"
-msgstr "Prohlížeč karet adresáře Evolution"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
-msgid "Evolution Addressbook component"
-msgstr "Komponenta adresáře Evolution."
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
-msgid "Evolution Addressbook folder viewer"
-msgstr "Prohlížeč složek adresáře Evolution"
-
 #: addressbook/gui/component/ldap-config.glade.h:1
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:1
 #: mail/mail-config.glade.h:1
@@ -977,9 +984,10 @@ msgstr "Jeden"
 msgid "S_earch scope: "
 msgstr "_Rozsah vyhledávání: "
 
+#. No time range is set, so don't start a query
 #: addressbook/gui/component/ldap-config.glade.h:34
-#: calendar/gui/e-cal-view.c:541 calendar/gui/e-day-view.c:3261
-#: calendar/gui/e-week-view.c:1181 calendar/gui/gnome-cal.c:625
+#: calendar/gui/calendar-model.c:1983 calendar/gui/e-day-view.c:1712
+#: calendar/gui/e-week-view.c:1256
 msgid "Searching"
 msgstr "Vyhledávání"
 
@@ -1210,11 +1218,11 @@ msgstr "_Omezení stahování:"
 
 #: addressbook/gui/component/ldap-config.glade.h:85 filter/filter.glade.h:14
 #: mail/mail-config.glade.h:143 ui/evolution-addressbook.xml.h:33
-#: ui/evolution-calendar.xml.h:35 ui/evolution-composer-entries.xml.h:8
-#: ui/evolution-mail-list.xml.h:24 ui/evolution-mail-messagedisplay.xml.h:6
+#: ui/evolution-calendar.xml.h:31 ui/evolution-composer-entries.xml.h:8
+#: ui/evolution-mail-list.xml.h:25 ui/evolution-mail-messagedisplay.xml.h:6
 #: ui/evolution-message-composer.xml.h:41
-#: ui/evolution-signature-editor.xml.h:12 ui/evolution-subscribe.xml.h:10
-#: ui/evolution-tasks.xml.h:19
+#: ui/evolution-signature-editor.xml.h:11 ui/evolution-subscribe.xml.h:10
+#: ui/evolution-tasks.xml.h:17
 msgid "_Edit"
 msgstr "_Upravit"
 
@@ -1254,24 +1262,20 @@ msgstr "obecný přehled"
 msgid "searching-tab"
 msgstr "vyhledávací přehled"
 
-#: addressbook/gui/component/select-names/e-select-names.c:509
-msgid "Select Contacts from Addressbook"
-msgstr "Vyberte kontakty z adresáře"
+#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:1
+msgid "Evolution Addressbook name selection interface"
+msgstr "Rozhraní pro výběr jména adresáře Evolution"
 
-#: addressbook/gui/component/select-names/e-select-names.c:650
-msgid "Find contact in"
-msgstr "Hledat kontakt v"
+#: addressbook/gui/component/select-names/e-select-names-popup.c:204
+msgid "Remove All"
+msgstr "Odstranit vše"
 
-#: addressbook/gui/component/select-names/e-select-names.c:694
 #: addressbook/gui/component/select-names/e-select-names-popup.c:211
-#: composer/e-msg-composer-attachment-bar.c:444
+#: addressbook/gui/component/select-names/e-select-names.c:694
+#: composer/e-msg-composer-attachment-bar.c:507
 msgid "Remove"
 msgstr "Odstranit"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:204
-msgid "Remove All"
-msgstr "Odstranit vše"
-
 #: addressbook/gui/component/select-names/e-select-names-popup.c:218
 msgid "View Contact List"
 msgstr "Zobrazit seznam kontaktů"
@@ -1294,9 +1298,13 @@ msgstr "Nepojmenovaný kontakt"
 msgid "Source"
 msgstr "Zdroj"
 
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:1
-msgid "Evolution Addressbook name selection interface"
-msgstr "Rozhraní pro výběr jména adresáře Evolution"
+#: addressbook/gui/component/select-names/e-select-names.c:509
+msgid "Select Contacts from Addressbook"
+msgstr "Vyberte kontakty z adresáře"
+
+#: addressbook/gui/component/select-names/e-select-names.c:650
+msgid "Find contact in"
+msgstr "Hledat kontakt v"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:2
 msgid "Find"
@@ -1369,7 +1377,7 @@ msgid "D_epartment:"
 msgstr "O_ddělení:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:11
-#: calendar/gui/dialogs/task-editor.c:200
+#: calendar/gui/dialogs/task-editor.c:197
 msgid "Details"
 msgstr "Podrobnosti"
 
@@ -1436,13 +1444,11 @@ msgid "_Categories..."
 msgstr "Ka_tegorie..."
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:28
-#: calendar/gui/dialogs/meeting-page.c:634
-#: calendar/gui/e-calendar-table.c:1008 calendar/gui/e-calendar-table.c:1026
-#: calendar/gui/e-cal-view.c:1144 calendar/gui/e-cal-view.c:1176
-#: ui/evolution-addressbook.xml.h:32 ui/evolution-calendar.xml.h:34
-#: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:14
-#: ui/evolution-mail-message.xml.h:104 ui/evolution-tasks.xml.h:18
-#: ui/evolution.xml.h:45
+#: calendar/gui/dialogs/meeting-page.c:717 calendar/gui/e-calendar-table.c:977
+#: calendar/gui/e-day-view.c:3755 calendar/gui/e-week-view.c:3631
+#: mail/folder-browser.c:1790 ui/evolution-addressbook.xml.h:32
+#: ui/evolution-calendar.xml.h:30 ui/evolution-mail-message.xml.h:97
+#: ui/evolution-tasks.xml.h:16 ui/evolution.xml.h:45
 msgid "_Delete"
 msgstr "_Smazat"
 
@@ -1483,15 +1489,15 @@ msgid "_Web page address:"
 msgstr "Adresa _webové stránky:"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:102
-#: addressbook/gui/contact-editor/e-contact-editor.c:184
 #: addressbook/gui/contact-editor/e-contact-editor-fullname.c:95
+#: addressbook/gui/contact-editor/e-contact-editor.c:184
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.c:163
 #: addressbook/gui/widgets/e-addressbook-model.c:318
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:408
-#: addressbook/gui/widgets/e-minicard.c:183
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:393
 #: addressbook/gui/widgets/e-minicard-label.c:164
-#: addressbook/gui/widgets/e-minicard-view.c:478
 #: addressbook/gui/widgets/e-minicard-view-widget.c:120
+#: addressbook/gui/widgets/e-minicard-view.c:478
+#: addressbook/gui/widgets/e-minicard.c:183
 msgid "Editable"
 msgstr "Upravitelné"
 
@@ -2519,17 +2525,17 @@ msgstr "Zimbabwe"
 #: addressbook/gui/contact-editor/e-contact-editor.c:156
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.c:142
 #: addressbook/gui/widgets/e-addressbook-model.c:304
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:394
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:379
 #: addressbook/gui/widgets/e-addressbook-view.c:180
-#: addressbook/gui/widgets/e-minicard-view.c:464
 #: addressbook/gui/widgets/e-minicard-view-widget.c:106
+#: addressbook/gui/widgets/e-minicard-view.c:464
 msgid "Book"
 msgstr "Kniha"
 
 #: addressbook/gui/contact-editor/e-contact-editor.c:163
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.c:149
-#: addressbook/gui/widgets/e-minicard.c:190
 #: addressbook/gui/widgets/e-minicard-widget.c:93
+#: addressbook/gui/widgets/e-minicard.c:190
 msgid "Card"
 msgstr "Karta"
 
@@ -2751,7 +2757,7 @@ msgstr "Nový seznam"
 msgid "Contact List Editor"
 msgstr "Editor seznamu kontaktů"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:457
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:456
 msgid "Save List as VCard"
 msgstr "Uložit seznam jako VCard"
 
@@ -2797,7 +2803,7 @@ msgstr ""
 "Přejete si jej přesto přidat?"
 
 #. FIXME: get the toplevel window...
-#: addressbook/gui/search/e-addressbook-search-dialog.c:116
+#: addressbook/gui/search/e-addressbook-search-dialog.c:117
 #: widgets/misc/e-filter-bar.c:148
 msgid "Advanced Search"
 msgstr "Pokročilé vyhledávání"
@@ -2816,10 +2822,10 @@ msgid "%d cards"
 msgstr "%d karty/karet"
 
 #: addressbook/gui/widgets/e-addressbook-model.c:311
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:401
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:386
 #: addressbook/gui/widgets/e-addressbook-view.c:187
-#: addressbook/gui/widgets/e-minicard-view.c:471
 #: addressbook/gui/widgets/e-minicard-view-widget.c:113
+#: addressbook/gui/widgets/e-minicard-view.c:471
 msgid "Query"
 msgstr "Dotaz"
 
@@ -2827,113 +2833,113 @@ msgstr "Dotaz"
 msgid "Error getting book view"
 msgstr "Chyba při získávání náhledu knihy"
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:415
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:400
 msgid "Model"
 msgstr "Model"
 
-#: addressbook/gui/widgets/e-addressbook-table-adapter.c:148
-#: addressbook/gui/widgets/e-addressbook-util.c:106
+#: addressbook/gui/widgets/e-addressbook-table-adapter.c:145
+#: addressbook/gui/widgets/e-addressbook-util.c:105
 #: addressbook/gui/widgets/e-minicard.c:531
 msgid "Error modifying card"
 msgstr "Chyba při úpravě karty"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:37
-#: shell/evolution-shell-component.c:1183
+#: addressbook/gui/widgets/e-addressbook-util.c:36
+#: shell/evolution-shell-component.c:1180
 msgid "Success"
 msgstr "Úspěch"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:38
+#: addressbook/gui/widgets/e-addressbook-util.c:37
 #: camel/providers/imap/camel-imap-command.c:306
 #: camel/providers/imap/camel-imap-command.c:403
 #: camel/providers/pop3/camel-pop3-store.c:526
 #: camel/providers/pop3/camel-pop3-store.c:533 shell/e-shell.c:2077
-#: shell/e-storage.c:598 shell/evolution-shell-component.c:1222
+#: shell/e-storage.c:598 shell/evolution-shell-component.c:1219
 msgid "Unknown error"
 msgstr "Neznámá chyba"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:39
+#: addressbook/gui/widgets/e-addressbook-util.c:38
 msgid "Repository offline"
 msgstr "Sklad při odpojení"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:40 shell/e-storage.c:584
-#: shell/evolution-shell-component.c:1213
+#: addressbook/gui/widgets/e-addressbook-util.c:39 shell/e-storage.c:584
+#: shell/evolution-shell-component.c:1210
 msgid "Permission denied"
 msgstr "Přístup zamítnut"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:41
+#: addressbook/gui/widgets/e-addressbook-util.c:40
 msgid "Card not found"
 msgstr "Karta nenalezena"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:42
+#: addressbook/gui/widgets/e-addressbook-util.c:41
 msgid "Card ID already exists"
 msgstr "Identifikační číslo karty již existuje"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:43
+#: addressbook/gui/widgets/e-addressbook-util.c:42
 msgid "Protocol not supported"
 msgstr "Protokol není podporován"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:44
+#: addressbook/gui/widgets/e-addressbook-util.c:43
+#: calendar/gui/calendar-model.c:759 calendar/gui/calendar-model.c:1184
 #: calendar/gui/dialogs/task-details-page.glade.h:3
-#: calendar/gui/e-calendar-table.c:479 calendar/gui/e-cal-model-tasks.c:325
-#: calendar/gui/e-cal-model-tasks.c:604 calendar/gui/e-tasks.c:253
-#: calendar/gui/print.c:2314 camel/camel-service.c:733
-#: camel/camel-service.c:771 camel/camel-service.c:855
-#: camel/camel-service.c:895 camel/providers/pop3/camel-pop3-store.c:443
+#: calendar/gui/e-calendar-table.c:477 calendar/gui/print.c:2307
+#: camel/camel-service.c:745 camel/camel-service.c:785
+#: camel/camel-service.c:875 camel/camel-service.c:917
+#: camel/providers/pop3/camel-pop3-store.c:443
 #: camel/providers/pop3/camel-pop3-store.c:520
 msgid "Cancelled"
 msgstr "Zrušeno"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:45
+#: addressbook/gui/widgets/e-addressbook-util.c:44
 msgid "Authentication Failed"
 msgstr "Ověření se nepodařilo"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:46
+#: addressbook/gui/widgets/e-addressbook-util.c:45
 msgid "Authentication Required"
 msgstr "Je vyžadováno ověření"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:47
+#: addressbook/gui/widgets/e-addressbook-util.c:46
 msgid "TLS not Available"
 msgstr "TLS není k dispozici"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:48
+#: addressbook/gui/widgets/e-addressbook-util.c:47
 msgid "Addressbook does not exist"
 msgstr "Adresář neexistuje"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:49
+#: addressbook/gui/widgets/e-addressbook-util.c:48
 msgid "Other error"
 msgstr "Jiná chyba"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:76
+#: addressbook/gui/widgets/e-addressbook-util.c:75
 msgid "Do you want to save changes?"
 msgstr "Přejete si uložit změny?"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:78
+#: addressbook/gui/widgets/e-addressbook-util.c:77
 msgid "_Discard"
 msgstr "Zaho_dit"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:97
+#: addressbook/gui/widgets/e-addressbook-util.c:96
 msgid "Error adding list"
 msgstr "Chyba při přidávání seznamu"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:97
-#: addressbook/gui/widgets/e-addressbook-util.c:273
+#: addressbook/gui/widgets/e-addressbook-util.c:96
+#: addressbook/gui/widgets/e-addressbook-util.c:272
 msgid "Error adding card"
 msgstr "Chyba při přidávání karty"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:106
+#: addressbook/gui/widgets/e-addressbook-util.c:105
 msgid "Error modifying list"
 msgstr "Chyba při úpravě seznamu"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:116
+#: addressbook/gui/widgets/e-addressbook-util.c:115
 msgid "Error removing list"
 msgstr "Chyba při odstraňování seznamu"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:116
-#: addressbook/gui/widgets/e-addressbook-util.c:231
+#: addressbook/gui/widgets/e-addressbook-util.c:115
+#: addressbook/gui/widgets/e-addressbook-util.c:230
 msgid "Error removing card"
 msgstr "Chyba při odstraňování karty"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:198
+#: addressbook/gui/widgets/e-addressbook-util.c:197
 #, c-format
 msgid ""
 "Opening %d cards will open %d new windows as well.\n"
@@ -2942,131 +2948,132 @@ msgstr ""
 "Zobrazení %d karet otevře %d nových oken.\n"
 "Opravdu si přejete zobrazit všechny tyto karty?"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:329
+#: addressbook/gui/widgets/e-addressbook-util.c:328
 msgid "Move card to"
 msgstr "Přesunout kartu do"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:331
+#: addressbook/gui/widgets/e-addressbook-util.c:330
 msgid "Copy card to"
 msgstr "Kopírovat kartu do"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:334
+#: addressbook/gui/widgets/e-addressbook-util.c:333
 msgid "Move cards to"
 msgstr "Přesunout karty do"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:336
+#: addressbook/gui/widgets/e-addressbook-util.c:335
 msgid "Copy cards to"
 msgstr "Kopírovat karty do"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:518
+#: addressbook/gui/widgets/e-addressbook-util.c:517
 msgid "Multiple VCards"
 msgstr "Vícero VKaret"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:526
+#: addressbook/gui/widgets/e-addressbook-util.c:525
 #, c-format
 msgid "VCard for %s"
 msgstr "VCard pro %s"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:194
-#: calendar/gui/e-calendar-table.etspec.h:17
+#: calendar/gui/dialogs/meeting-page.etspec.h:11
+#: calendar/gui/e-calendar-table.etspec.h:18
 #: calendar/gui/e-meeting-time-sel.etspec.h:11
 msgid "Type"
 msgstr "Typ"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:398
+#: addressbook/gui/widgets/e-addressbook-view.c:394
 #: importers/evolution-gnomecard-importer.c:228 importers/pine-importer.c:642
 #: mail/importers/pine-importer.c:577
 msgid "Addressbook"
 msgstr "Adresář"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:680
-#: addressbook/gui/widgets/e-addressbook-view.c:899
-#: addressbook/gui/widgets/e-addressbook-view.c:1883
+#: addressbook/gui/widgets/e-addressbook-view.c:676
+#: addressbook/gui/widgets/e-addressbook-view.c:895
+#: addressbook/gui/widgets/e-addressbook-view.c:1879
 #: ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard"
 msgstr "Uložit jako VCard"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:886
+#: addressbook/gui/widgets/e-addressbook-view.c:882
 msgid "New Contact..."
 msgstr "Nový kontakt..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:887
+#: addressbook/gui/widgets/e-addressbook-view.c:883
 msgid "New Contact List..."
 msgstr "Nový seznam kontaktů..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:890
+#: addressbook/gui/widgets/e-addressbook-view.c:886
 msgid "Go to Folder..."
 msgstr "Jít do složky..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:891
+#: addressbook/gui/widgets/e-addressbook-view.c:887
 msgid "Import..."
 msgstr "Importovat..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:893
+#: addressbook/gui/widgets/e-addressbook-view.c:889
 msgid "Search for Contacts..."
 msgstr "Hledat kontakty..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:894
+#: addressbook/gui/widgets/e-addressbook-view.c:890
 msgid "Addressbook Sources..."
 msgstr "Zdroje adresáře..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:896
+#: addressbook/gui/widgets/e-addressbook-view.c:892
 msgid "Pilot Settings..."
 msgstr "Předběžná nastavení..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:900
+#: addressbook/gui/widgets/e-addressbook-view.c:896
 #: ui/evolution-addressbook.xml.h:10
 msgid "Forward Contact"
 msgstr "Přeposlat kontakt"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:901
+#: addressbook/gui/widgets/e-addressbook-view.c:897
 msgid "Send Message to Contact"
 msgstr "Poslat kontaktu zprávu"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:902 calendar/gui/print.c:2446
+#: addressbook/gui/widgets/e-addressbook-view.c:898 calendar/gui/print.c:2439
 #: ui/evolution-addressbook.xml.h:16 ui/evolution-comp-editor.xml.h:8
-#: ui/evolution-contact-editor.xml.h:5 ui/evolution-mail-message.xml.h:72
+#: ui/evolution-contact-editor.xml.h:4 ui/evolution-mail-message.xml.h:67
 #: ui/my-evolution.xml.h:1
 msgid "Print"
 msgstr "Tisknout"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:904
+#: addressbook/gui/widgets/e-addressbook-view.c:900
 msgid "Print Envelope"
 msgstr "Tisknout obálku"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:908
+#: addressbook/gui/widgets/e-addressbook-view.c:904
 msgid "Copy to folder..."
 msgstr "Kopírovat do složky..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:909
+#: addressbook/gui/widgets/e-addressbook-view.c:905
 msgid "Move to folder..."
 msgstr "Přesunout do složky..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:912
+#: addressbook/gui/widgets/e-addressbook-view.c:908
 #: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "Vyjmout"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:913
-#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:9
+#: addressbook/gui/widgets/e-addressbook-view.c:909
+#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:8
 #: ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr "Kopírovat"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:914
-#: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:10
+#: addressbook/gui/widgets/e-addressbook-view.c:910
+#: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:9
 msgid "Paste"
 msgstr "Vložit"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:915 filter/libfilter-i18n.h:10
+#: addressbook/gui/widgets/e-addressbook-view.c:911 filter/libfilter-i18n.h:11
 #: mail/mail-accounts.c:234 ui/evolution-addressbook.xml.h:8
-#: ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:3
-#: ui/evolution-contact-list-editor.xml.h:3 ui/evolution-mail-message.xml.h:24
+#: ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:2
+#: ui/evolution-contact-list-editor.xml.h:2 ui/evolution-mail-message.xml.h:20
 msgid "Delete"
 msgstr "Smazat"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:919
-#: calendar/gui/e-cal-view.c:1109
+#: addressbook/gui/widgets/e-addressbook-view.c:915
+#: calendar/gui/e-day-view.c:3715 calendar/gui/e-week-view.c:3596
 msgid "Current View"
 msgstr "Aktuální náhled"
 
@@ -3074,7 +3081,7 @@ msgstr "Aktuální náhled"
 #. Translators: put here a list of labels you want to see on buttons in
 #. addressbook. You may use any character to separate labels but it must
 #. also be placed at the begining ot the string
-#: addressbook/gui/widgets/e-addressbook-view.c:953
+#: addressbook/gui/widgets/e-addressbook-view.c:949
 msgid ",123,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
 msgstr ",123,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
 
@@ -3082,11 +3089,11 @@ msgstr ",123,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
 #. in addressbook. You may use any character to separate labels but it
 #. must also be placed at the begining ot the string.
 #. Use lower case letters if possible.
-#: addressbook/gui/widgets/e-addressbook-view.c:958
+#: addressbook/gui/widgets/e-addressbook-view.c:954
 msgid ",0,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
 msgstr ",0,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1356
+#: addressbook/gui/widgets/e-addressbook-view.c:1352
 #, c-format
 msgid ""
 "The addressbook backend for\n"
@@ -3157,29 +3164,6 @@ msgstr "Další telefon"
 msgid "Primary Phone"
 msgstr "Primární telefon"
 
-#: addressbook/gui/widgets/e-minicard.c:146
-#: addressbook/gui/widgets/e-minicard-label.c:115
-msgid "Width"
-msgstr "Šířka"
-
-#: addressbook/gui/widgets/e-minicard.c:153
-#: addressbook/gui/widgets/e-minicard-label.c:122
-msgid "Height"
-msgstr "Výška"
-
-#: addressbook/gui/widgets/e-minicard.c:161
-#: addressbook/gui/widgets/e-minicard-label.c:129
-msgid "Has Focus"
-msgstr "Je zaměřen"
-
-#: addressbook/gui/widgets/e-minicard.c:169
-msgid "Selected"
-msgstr "Vybráno"
-
-#: addressbook/gui/widgets/e-minicard.c:176
-msgid "Has Cursor"
-msgstr "Má kurzor"
-
 #: addressbook/gui/widgets/e-minicard-control.c:204
 #, c-format
 msgid "and %d other cards."
@@ -3193,6 +3177,21 @@ msgstr "a jedna další karta."
 msgid "Save in addressbook"
 msgstr "Uložit do adresáře"
 
+#: addressbook/gui/widgets/e-minicard-label.c:115
+#: addressbook/gui/widgets/e-minicard.c:146
+msgid "Width"
+msgstr "Šířka"
+
+#: addressbook/gui/widgets/e-minicard-label.c:122
+#: addressbook/gui/widgets/e-minicard.c:153
+msgid "Height"
+msgstr "Výška"
+
+#: addressbook/gui/widgets/e-minicard-label.c:129
+#: addressbook/gui/widgets/e-minicard.c:161
+msgid "Has Focus"
+msgstr "Je zaměřen"
+
 #: addressbook/gui/widgets/e-minicard-label.c:136
 msgid "Field"
 msgstr "Pole"
@@ -3209,6 +3208,10 @@ msgstr "Textový model"
 msgid "Max field name length"
 msgstr "Maximální délka názvu pole"
 
+#: addressbook/gui/widgets/e-minicard-view-widget.c:127
+msgid "Column Width"
+msgstr "Šířka sloupce"
+
 #: addressbook/gui/widgets/e-minicard-view.c:141
 msgid ""
 "\n"
@@ -3237,9 +3240,13 @@ msgstr ""
 msgid "Adapter"
 msgstr "Adaptér"
 
-#: addressbook/gui/widgets/e-minicard-view-widget.c:127
-msgid "Column Width"
-msgstr "Šířka sloupce"
+#: addressbook/gui/widgets/e-minicard.c:169
+msgid "Selected"
+msgstr "Vybráno"
+
+#: addressbook/gui/widgets/e-minicard.c:176
+msgid "Has Cursor"
+msgstr "Má kurzor"
 
 #: addressbook/gui/widgets/gal-view-factory-minicard.c:24
 msgid "Card View"
@@ -3249,20 +3256,20 @@ msgstr "Náhled karty"
 msgid "GTK Tree View"
 msgstr "GTK Tree View"
 
-#: addressbook/printing/e-contact-print.c:1158
+#: addressbook/printing/e-contact-print-envelope.c:217
+#: addressbook/printing/e-contact-print-envelope.c:238
+msgid "Print envelope"
+msgstr "Tisknout obálku"
+
+#: addressbook/printing/e-contact-print.c:1139
 msgid "Print cards"
 msgstr "Tisknout karty"
 
-#: addressbook/printing/e-contact-print.c:1224
-#: addressbook/printing/e-contact-print.c:1250
+#: addressbook/printing/e-contact-print.c:1204
+#: addressbook/printing/e-contact-print.c:1226
 msgid "Print card"
 msgstr "Tisknout kartu"
 
-#: addressbook/printing/e-contact-print-envelope.c:217
-#: addressbook/printing/e-contact-print-envelope.c:238
-msgid "Print envelope"
-msgstr "Tisknout obálku"
-
 #: addressbook/printing/e-contact-print.glade.h:1
 msgid "10 pt. Tahoma"
 msgstr "10 b. Tahoma"
@@ -3432,63 +3439,6 @@ msgstr "šířka"
 msgid "_Font..."
 msgstr "_Písmo..."
 
-#: addressbook/tools/evolution-addressbook-export.c:56
-msgid "Specify the output file instead of standard output"
-msgstr ""
-
-#: addressbook/tools/evolution-addressbook-export.c:57
-msgid "OUTPUTFILE"
-msgstr ""
-
-#: addressbook/tools/evolution-addressbook-export.c:58
-#, fuzzy
-msgid "List local addressbook folders"
-msgstr "pro všechny lokální a aktivní vzdálené složky"
-
-#: addressbook/tools/evolution-addressbook-export.c:60
-msgid "Show cards as vcard or csv file"
-msgstr ""
-
-#: addressbook/tools/evolution-addressbook-export.c:60
-#, fuzzy
-msgid "[vcard|csv]"
-msgstr "karty"
-
-#: addressbook/tools/evolution-addressbook-export.c:61
-msgid "Export in asynchronous mode "
-msgstr ""
-
-#: addressbook/tools/evolution-addressbook-export.c:63
-msgid ""
-"The number of cards in one output file in asychronous mode,default size 100."
-msgstr ""
-
-#: addressbook/tools/evolution-addressbook-export.c:63
-msgid "NUMBER"
-msgstr ""
-
-#: addressbook/tools/evolution-addressbook-export.c:91
-msgid ""
-"Command line arguments error, please use --help option to see the usage."
-msgstr ""
-
-#: addressbook/tools/evolution-addressbook-export.c:105
-msgid "Only support csv or vcard format."
-msgstr ""
-
-#: addressbook/tools/evolution-addressbook-export.c:114
-msgid "In async mode, output must be file."
-msgstr ""
-
-#: addressbook/tools/evolution-addressbook-export.c:122
-msgid "In normal mode, there should not need size option."
-msgstr ""
-
-#: addressbook/tools/evolution-addressbook-export.c:153
-#, fuzzy
-msgid "Impossible internal error."
-msgstr "Vnitřní chyba"
-
 #: calendar/cal-util/cal-component.c:1218
 msgid "Untitled appointment"
 msgstr "Neoznačená událost"
@@ -3618,30 +3568,28 @@ msgid "31st"
 msgstr "31."
 
 #: calendar/cal-util/cal-util.c:550 calendar/cal-util/cal-util.c:572
-#: calendar/gui/dialogs/task-details-page.glade.h:5
-#: calendar/gui/e-calendar-table.c:403 calendar/gui/e-tasks.c:271
-#: mail/message-list.c:912
+#: calendar/gui/dialogs/task-details-page.glade.h:6
+#: calendar/gui/e-calendar-table.c:401 mail/message-list.c:753
 msgid "High"
 msgstr "Vysoká"
 
 #: calendar/cal-util/cal-util.c:552 calendar/cal-util/cal-util.c:574
-#: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-calendar-table.c:404 calendar/gui/e-cal-model.c:826
-#: calendar/gui/e-tasks.c:273 mail/message-list.c:911
+#: calendar/gui/calendar-model.c:1709
+#: calendar/gui/dialogs/task-details-page.glade.h:9
+#: calendar/gui/e-calendar-table.c:402 mail/message-list.c:752
 msgid "Normal"
 msgstr "Normální"
 
 #: calendar/cal-util/cal-util.c:554 calendar/cal-util/cal-util.c:576
-#: calendar/gui/dialogs/task-details-page.glade.h:7
-#: calendar/gui/e-calendar-table.c:405 calendar/gui/e-tasks.c:275
-#: mail/message-list.c:910
+#: calendar/gui/dialogs/task-details-page.glade.h:8
+#: calendar/gui/e-calendar-table.c:403 mail/message-list.c:751
 msgid "Low"
 msgstr "Nízká"
 
 #. An empty string is the same as 'None'.
 #: calendar/cal-util/cal-util.c:570
-#: calendar/gui/dialogs/task-details-page.glade.h:11
-#: calendar/gui/e-calendar-table.c:406
+#: calendar/gui/dialogs/task-details-page.glade.h:13
+#: calendar/gui/e-calendar-table.c:404
 msgid "Undefined"
 msgstr "Nedefinováno"
 
@@ -3649,13 +3597,13 @@ msgstr "Nedefinováno"
 msgid "Split Multi-Day Events:"
 msgstr "Rozdělit vícedenní události:"
 
-#: calendar/conduits/calendar/calendar-conduit.c:1297
-#: calendar/conduits/todo/todo-conduit.c:838
+#: calendar/conduits/calendar/calendar-conduit.c:1289
+#: calendar/conduits/todo/todo-conduit.c:830
 msgid "Error while communicating with calendar server"
 msgstr "Chyba při komunikaci se serverem kalendáře"
 
-#: calendar/conduits/calendar/calendar-conduit.c:1456
-#: calendar/conduits/calendar/calendar-conduit.c:1459
+#: calendar/conduits/calendar/calendar-conduit.c:1440
+#: calendar/conduits/calendar/calendar-conduit.c:1443
 msgid "Could not read pilot's Calendar application block"
 msgstr "Nelze přečíst blok aplikací Calendar pilota"
 
@@ -3663,32 +3611,74 @@ msgstr "Nelze přečíst blok aplikací Calendar pilota"
 msgid "Default Priority:"
 msgstr "Výchozí priority:"
 
-#: calendar/conduits/todo/todo-conduit.c:970
-#: calendar/conduits/todo/todo-conduit.c:973
+#: calendar/conduits/todo/todo-conduit.c:954
+#: calendar/conduits/todo/todo-conduit.c:957
 msgid "Could not read pilot's ToDo application block"
 msgstr "Nelze přečíst blok aplikací ToDo pilota"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:213
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
+msgid "Calendar and Tasks"
+msgstr "Kalendář a úkoly"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
+msgid "Configure your timezone, Calendar and Task List here "
+msgstr "Nastavení vaší časové zóny, Kalendáře a Seznamu úloh"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
+msgid "Evolution Calendar and Tasks"
+msgstr "Evolution Kalendář a úkoly"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
+msgid "Evolution Calendar and Tasks component"
+msgstr "Komponenta Kalendář a úkoly Evolution."
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
+msgid "Evolution Calendar configuration control"
+msgstr "Ovládací prvek nastavení kalendáře Evolution"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
+msgid "Evolution Calendar scheduling message viewer"
+msgstr "Prohlížeč naplánovaných zpráv kalendáře Evolution"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
+msgid "Evolution Calendar viewer"
+msgstr "Prohlížeč kalendáře Evolution"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
+msgid "Evolution Calendar/Task editor"
+msgstr "Editor kalendáře/úkolů Evolution"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
+msgid "Evolution Tasks viewer"
+msgstr "Prohlížeč úkolů Evolution"
+
+#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
+msgid "Evolution Calendar alarm notification service"
+msgstr "Sloužba upozornění na alarm kalendáře Evolution"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:212
 msgid "Starting:"
 msgstr "Spuštění:"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:215
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:214
 msgid "Ending:"
 msgstr "Ukončení:"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:254
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:227
+msgid "invalid time"
+msgstr "neplatný čas"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:272
 msgid "Evolution Alarm"
 msgstr "Evolution alarm"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:347
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:365
 #, c-format
 msgid "Alarm on %s"
 msgstr "Alarm na %s"
 
 #: calendar/gui/alarm-notify/alarm-notify.glade.h:1
-#: ui/evolution-comp-editor.xml.h:1 ui/evolution-contact-editor.xml.h:1
-#: ui/evolution-contact-list-editor.xml.h:1
-#: ui/evolution-signature-editor.xml.h:1
+#: ui/evolution-comp-editor.xml.h:1
 msgid "C_lose"
 msgstr "Z_avřít"
 
@@ -3704,25 +3694,16 @@ msgstr "Doba odložení (minut)"
 msgid "_Edit appointment"
 msgstr "_Upravit událost"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:874
+#: calendar/gui/alarm-notify/alarm-queue.c:770
 msgid "No description available."
 msgstr "Popis není dostupný."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:892
-#, c-format
-msgid ""
-"Alarm on %s\n"
-"%s\n"
-"Starting at %s\n"
-"Ending at %s"
-msgstr ""
-
-#: calendar/gui/alarm-notify/alarm-queue.c:979
-#: calendar/gui/alarm-notify/alarm-queue.c:1003
+#: calendar/gui/alarm-notify/alarm-queue.c:843
+#: calendar/gui/alarm-notify/alarm-queue.c:867 widgets/misc/e-messagebox.c:161
 msgid "Warning"
 msgstr "Varování"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:983
+#: calendar/gui/alarm-notify/alarm-queue.c:847
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -3734,7 +3715,7 @@ msgstr ""
 "vytvořena k poslání e-mailu. Evolution namísto toho\n"
 "zobrazí dialogové okno pro běžnou připomínku."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1009
+#: calendar/gui/alarm-notify/alarm-queue.c:873
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -3751,86 +3732,71 @@ msgstr ""
 "\n"
 "Opravdu chcete spustit tento program?"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1023
+#: calendar/gui/alarm-notify/alarm-queue.c:887
 msgid "Do not ask me about this program again."
 msgstr "Příště se neptat na tento program."
 
-#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
-msgid "Evolution Calendar alarm notification service"
-msgstr "Sloužba upozornění na alarm kalendáře Evolution"
-
-#: calendar/gui/alarm-notify/notify-main.c:173
-msgid "Could not initialize Bonobo"
-msgstr "Nelze spustit Bonobo"
-
-#: calendar/gui/alarm-notify/notify-main.c:176
+#: calendar/gui/alarm-notify/notify-main.c:174
 msgid "Could not initialize gnome-vfs"
 msgstr "Nelze spustit gnome-vfs"
 
-#: calendar/gui/alarm-notify/notify-main.c:185
+#: calendar/gui/alarm-notify/notify-main.c:183
 msgid "Could not create the alarm notify service factory"
 msgstr "Nelze vytvořit továrnu ke službě hlášení alarmu"
 
-#: calendar/gui/calendar-commands.c:376
-#, fuzzy
-msgid ""
-"This operation will permanently erase all events older than the selected "
-"amount of time. If you continue, you will not be able to recover these "
-"events."
-msgstr ""
-"Tato operace natrvalo odstraní všechny úkoly označené jako dokončené. Pokud "
-"budete pokračovat, nebude již možné tyto úkoly obnovit.\n"
-"\n"
-"Opravdu odstranit tyto úkoly?"
+#: calendar/gui/cal-search-bar.c:50
+msgid "Summary contains"
+msgstr "Přehled obsahuje"
 
-#: calendar/gui/calendar-commands.c:382
-#, fuzzy
-msgid "Purge events older than"
-msgstr "vrací méně než"
+#: calendar/gui/cal-search-bar.c:51
+msgid "Description contains"
+msgstr "Popis obsahuje"
 
-#: calendar/gui/calendar-commands.c:387
-#: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter.glade.h:17
-msgid "days"
-msgstr "den/dny/dnů"
+#: calendar/gui/cal-search-bar.c:52
+msgid "Comment contains"
+msgstr "Komentář obsahuje"
+
+#: calendar/gui/cal-search-bar.c:358 mail/mail-ops.c:1106
+msgid "Unmatched"
+msgstr "Nepřiřazené"
 
-#: calendar/gui/calendar-commands.c:485
+#: calendar/gui/calendar-commands.c:419
 msgid "%A %d %B %Y"
 msgstr "%A %d %B %Y"
 
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
-#: calendar/gui/calendar-commands.c:488 calendar/gui/e-day-view.c:1364
-#: calendar/gui/e-day-view-top-item.c:266
-#: calendar/gui/e-week-view-main-item.c:325
+#: calendar/gui/calendar-commands.c:422 calendar/gui/e-day-view-top-item.c:265
+#: calendar/gui/e-day-view.c:1438 calendar/gui/e-week-view-main-item.c:325
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
-#: calendar/gui/calendar-commands.c:490 calendar/gui/calendar-commands.c:495
-#: calendar/gui/calendar-commands.c:497
+#: calendar/gui/calendar-commands.c:424 calendar/gui/calendar-commands.c:429
+#: calendar/gui/calendar-commands.c:431
 msgid "%a %d %b %Y"
 msgstr "%a %d %b %Y"
 
-#: calendar/gui/calendar-commands.c:514 calendar/gui/calendar-commands.c:520
-#: calendar/gui/calendar-commands.c:526 calendar/gui/calendar-commands.c:528
+#: calendar/gui/calendar-commands.c:442 calendar/gui/calendar-commands.c:449
+#: calendar/gui/calendar-commands.c:455 calendar/gui/calendar-commands.c:457
 msgid "%d %B %Y"
 msgstr "%d %B %Y"
 
 #. strftime format %d = day of month, %B = full
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: calendar/gui/calendar-commands.c:518
-#: calendar/gui/e-week-view-main-item.c:333 calendar/gui/print.c:1508
+#: calendar/gui/calendar-commands.c:447
+#: calendar/gui/e-week-view-main-item.c:333 calendar/gui/print.c:1509
 msgid "%d %B"
 msgstr "%d %B"
 
-#: calendar/gui/calendar-commands.c:918
+#: calendar/gui/calendar-commands.c:849
 msgid ""
 "Could not create the calendar view.  Please check your ORBit and OAF setup."
 msgstr ""
 "Nelze vytvořit náhled kalendáře. Zkontrolujte, prosím, vaše nastavení ORBit "
 "a OAF."
 
-#: calendar/gui/calendar-component.c:70 calendar/gui/gnome-cal.c:1569
+#: calendar/gui/calendar-component.c:70 calendar/gui/gnome-cal.c:1353
 #: importers/netscape-importer.c:1873 mail/importers/netscape-importer.c:1843
 #: my-evolution/my-evolution.glade.h:2 shell/e-local-storage.c:177
 #: shell/e-shortcuts.c:1085
@@ -3849,11 +3815,11 @@ msgstr "Veřejný kalendář"
 msgid "Public folder containing appointments and events"
 msgstr "Veřejná složka obsahující události a schůzky"
 
-#: calendar/gui/calendar-component.c:80 calendar/gui/e-tasks.c:1080
-#: calendar/gui/print.c:1787 calendar/gui/tasks-control.c:487
+#: calendar/gui/calendar-component.c:80 calendar/gui/e-tasks.c:738
+#: calendar/gui/print.c:1789 calendar/gui/tasks-control.c:504
 #: calendar/importers/icalendar-importer.c:644
 #: importers/netscape-importer.c:1875 mail/importers/netscape-importer.c:1845
-#: my-evolution/e-summary-tasks.c:348 my-evolution/e-summary-tasks.c:357
+#: my-evolution/e-summary-tasks.c:329 my-evolution/e-summary-tasks.c:338
 #: shell/e-local-storage.c:183 shell/e-shortcuts.c:1086
 msgid "Tasks"
 msgstr "Úkoly"
@@ -3918,6 +3884,107 @@ msgstr "_Celodenní událost"
 msgid "Create a new all-day appointment"
 msgstr "Vytvořit novou celodenní událost"
 
+#: calendar/gui/calendar-model.c:405 calendar/gui/calendar-model.c:964
+#: calendar/gui/e-calendar-table.c:380
+msgid "Private"
+msgstr "Soukromé"
+
+#: calendar/gui/calendar-model.c:408 calendar/gui/calendar-model.c:966
+#: calendar/gui/e-calendar-table.c:381
+msgid "Confidential"
+msgstr "Důvěrné"
+
+#: calendar/gui/calendar-model.c:411 calendar/gui/e-calendar-table.c:379
+msgid "Public"
+msgstr "Veřejné"
+
+#: calendar/gui/calendar-model.c:523
+msgid "N"
+msgstr "S"
+
+#: calendar/gui/calendar-model.c:523
+msgid "S"
+msgstr "J"
+
+#: calendar/gui/calendar-model.c:525
+msgid "E"
+msgstr "V"
+
+#: calendar/gui/calendar-model.c:525
+msgid "W"
+msgstr "Z"
+
+#: calendar/gui/calendar-model.c:590 calendar/gui/calendar-model.c:1134
+#: calendar/gui/e-calendar-table.c:453
+msgid "Free"
+msgstr "Volný"
+
+#: calendar/gui/calendar-model.c:592 calendar/gui/e-calendar-table.c:454
+#: calendar/gui/e-meeting-time-sel.c:406
+#: shell/evolution-shell-component.c:1204
+msgid "Busy"
+msgstr "Obsazený"
+
+#: calendar/gui/calendar-model.c:750 calendar/gui/calendar-model.c:1178
+#: calendar/gui/dialogs/task-details-page.glade.h:10
+#: calendar/gui/e-calendar-table.c:474 calendar/gui/print.c:2298
+msgid "Not Started"
+msgstr "Nezačato"
+
+#: calendar/gui/calendar-model.c:753 calendar/gui/calendar-model.c:1180
+#: calendar/gui/dialogs/task-details-page.glade.h:7
+#: calendar/gui/e-calendar-table.c:475 calendar/gui/print.c:2301
+msgid "In Progress"
+msgstr "Probíhá"
+
+#: calendar/gui/calendar-model.c:756 calendar/gui/calendar-model.c:1182
+#: calendar/gui/dialogs/task-details-page.glade.h:4
+#: calendar/gui/e-calendar-table.c:476 calendar/gui/e-meeting-model.c:294
+#: calendar/gui/e-meeting-model.c:317 calendar/gui/print.c:2304
+msgid "Completed"
+msgstr "Dokončeno"
+
+#: calendar/gui/calendar-model.c:1036
+msgid ""
+"The geographical position must be entered in the format: \n"
+"\n"
+"45.436845,125.862501"
+msgstr ""
+"\"Zeměpisná pozice musí být uvedena ve formátu: \\n\"\n"
+"\"\\n\"\n"
+"\"45.436845,125.862501\""
+
+#. An empty string is the same as 'None'.
+#: calendar/gui/calendar-model.c:1176 calendar/gui/dialogs/meeting-page.c:330
+#: calendar/gui/dialogs/meeting-page.glade.h:2 composer/e-msg-composer.c:2056
+#: mail/folder-browser.c:1752 mail/mail-account-gui.c:1260
+#: mail/mail-account-gui.c:1692 mail/mail-accounts.c:442
+#: mail/mail-config.glade.h:76
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:194
+#: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:442
+#: widgets/misc/e-dateedit.c:1458 widgets/misc/e-dateedit.c:1573
+msgid "None"
+msgstr "žádný"
+
+#: calendar/gui/calendar-model.c:1711
+msgid "Recurring"
+msgstr "Opakovaný"
+
+#: calendar/gui/calendar-model.c:1713
+msgid "Assigned"
+msgstr "Přiřazeno"
+
+#: calendar/gui/calendar-model.c:1719 calendar/gui/e-meeting-model.c:266
+#: calendar/gui/e-meeting-model.c:276 calendar/gui/e-meeting-model.c:534
+#: calendar/gui/e-meeting-model.c:784
+msgid "Yes"
+msgstr "Ano"
+
+#: calendar/gui/calendar-model.c:1719 calendar/gui/e-meeting-model.c:278
+#: calendar/gui/e-meeting-model.c:785
+msgid "No"
+msgstr "Ne"
+
 #: calendar/gui/calendar-view-factory.c:118
 msgid "Day View"
 msgstr "Denní náhled"
@@ -3934,69 +4001,48 @@ msgstr "Týdenní náhled"
 msgid "Month View"
 msgstr "Měsíční náhled"
 
-#: calendar/gui/calendar-view-factory.c:130
-#, fuzzy
-msgid "List View"
-msgstr "Upravené zobrazení"
-
-#: calendar/gui/cal-search-bar.c:50
-msgid "Summary contains"
-msgstr "Přehled obsahuje"
-
-#: calendar/gui/cal-search-bar.c:51
-msgid "Description contains"
-msgstr "Popis obsahuje"
-
-#: calendar/gui/cal-search-bar.c:52
-msgid "Comment contains"
-msgstr "Komentář obsahuje"
-
-#: calendar/gui/cal-search-bar.c:358 mail/mail-ops.c:1120
-msgid "Unmatched"
-msgstr "Nepřiřazené"
-
-#: calendar/gui/comp-editor-factory.c:462
+#: calendar/gui/comp-editor-factory.c:456
 msgid "Error while opening the calendar"
 msgstr "Chyba při otevírání kalendáře"
 
-#: calendar/gui/comp-editor-factory.c:473
+#: calendar/gui/comp-editor-factory.c:467
 msgid "Method not supported when opening the calendar"
 msgstr "Metoda nepodporována při otevírání kalendáře"
 
-#: calendar/gui/comp-editor-factory.c:479
+#: calendar/gui/comp-editor-factory.c:473
 msgid "Permission denied to open the calendar"
 msgstr "Přístup zamítnut při otevírání kalendáře"
 
-#: calendar/gui/control-factory.c:125
+#: calendar/gui/control-factory.c:119
 #, c-format
 msgid "Could not open the folder in '%s'"
 msgstr "Nelze otevřít složku v '%s'"
 
-#: calendar/gui/control-factory.c:171
+#: calendar/gui/control-factory.c:165
 msgid "The URI that the calendar will display"
 msgstr "URI, které kalendář zobrazí"
 
-#: calendar/gui/control-factory.c:178
+#: calendar/gui/control-factory.c:172
 msgid "The type of view to show"
 msgstr "Typ náhledu, který má být ukázán"
 
-#: calendar/gui/dialogs/alarm-options.c:466
+#: calendar/gui/dialogs/alarm-options.c:420
 msgid "Audio Alarm Options"
 msgstr "Volby zvukového alarmu"
 
-#: calendar/gui/dialogs/alarm-options.c:475
+#: calendar/gui/dialogs/alarm-options.c:429
 msgid "Message Alarm Options"
 msgstr "Volby alarmu zprávou"
 
-#: calendar/gui/dialogs/alarm-options.c:484
+#: calendar/gui/dialogs/alarm-options.c:438
 msgid "Email Alarm Options"
 msgstr "Volby alarmu e-mailem"
 
-#: calendar/gui/dialogs/alarm-options.c:493
+#: calendar/gui/dialogs/alarm-options.c:447
 msgid "Program Alarm Options"
 msgstr "Volby alarmu programem"
 
-#: calendar/gui/dialogs/alarm-options.c:509
+#: calendar/gui/dialogs/alarm-options.c:456
 msgid "Unknown Alarm Options"
 msgstr "Neznámé volby alarmu"
 
@@ -4032,6 +4078,10 @@ msgstr "Komu poslat:"
 msgid "With these arguments:"
 msgstr "S těmito parametry:"
 
+#: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter.glade.h:17
+msgid "days"
+msgstr "den/dny/dnů"
+
 #: calendar/gui/dialogs/alarm-options.glade.h:11
 msgid "dialog1"
 msgstr "dialog1"
@@ -4044,8 +4094,7 @@ msgstr "krát navíc každé"
 msgid "hours"
 msgstr "hodinu/-y"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:14
-#: executive-summary/test-service/rdf-summary.c:806 filter/filter.glade.h:19
+#: calendar/gui/dialogs/alarm-options.glade.h:14 filter/filter.glade.h:19
 msgid "minutes"
 msgstr "minut"
 
@@ -4059,11 +4108,11 @@ msgstr "Základní informace"
 msgid "Date/Time:"
 msgstr "Datum/čas:"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:3 calendar/gui/e-alarm-list.c:465
+#: calendar/gui/dialogs/alarm-page.glade.h:3 calendar/gui/e-alarm-list.c:461
 msgid "Display a message"
 msgstr "Zobrazit zprávu"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:4 calendar/gui/e-alarm-list.c:461
+#: calendar/gui/dialogs/alarm-page.glade.h:4 calendar/gui/e-alarm-list.c:457
 msgid "Play a sound"
 msgstr "Zahrát zvuk"
 
@@ -4071,7 +4120,7 @@ msgstr "Zahrát zvuk"
 msgid "Reminders"
 msgstr "Připomínky"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:6 calendar/gui/e-alarm-list.c:473
+#: calendar/gui/dialogs/alarm-page.glade.h:6 calendar/gui/e-alarm-list.c:469
 msgid "Run a program"
 msgstr "Spustit program"
 
@@ -4081,8 +4130,7 @@ msgstr "Poslat e-mail"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:8
 #: calendar/gui/dialogs/recurrence-page.glade.h:8
-#: calendar/gui/e-itip-control.c:1022 calendar/gui/e-itip-control.glade.h:11
-#: calendar/gui/e-tasks.c:208
+#: calendar/gui/e-itip-control.c:1052 calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "Shrnutí"
 
@@ -4165,7 +4213,7 @@ msgstr "den/dny/dní"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
 #: calendar/gui/dialogs/recurrence-page.c:1040
-#: calendar/gui/e-itip-control.c:647
+#: calendar/gui/e-itip-control.c:677
 msgid "Friday"
 msgstr "pátek"
 
@@ -4179,7 +4227,7 @@ msgstr "minut"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
 #: calendar/gui/dialogs/recurrence-page.c:1036
-#: calendar/gui/e-itip-control.c:643
+#: calendar/gui/e-itip-control.c:673
 msgid "Monday"
 msgstr "pondělí"
 
@@ -4189,7 +4237,7 @@ msgstr "_ne"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
 #: calendar/gui/dialogs/recurrence-page.c:1041
-#: calendar/gui/e-itip-control.c:648
+#: calendar/gui/e-itip-control.c:678
 msgid "Saturday"
 msgstr "sobota"
 
@@ -4203,7 +4251,7 @@ msgstr "Ukazovat čísla _týdnů v měsíčním přehledu"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
 #: calendar/gui/dialogs/recurrence-page.c:1042
-#: calendar/gui/e-itip-control.c:642
+#: calendar/gui/e-itip-control.c:672
 msgid "Sunday"
 msgstr "neděle"
 
@@ -4221,7 +4269,7 @@ msgstr "Seznam úkolů"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
 #: calendar/gui/dialogs/recurrence-page.c:1039
-#: calendar/gui/e-itip-control.c:646
+#: calendar/gui/e-itip-control.c:676
 msgid "Thursday"
 msgstr "čtvrtek"
 
@@ -4239,7 +4287,7 @@ msgstr "Formát času:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
 #: calendar/gui/dialogs/recurrence-page.c:1037
-#: calendar/gui/e-itip-control.c:644
+#: calendar/gui/e-itip-control.c:674
 msgid "Tuesday"
 msgstr "úterý"
 
@@ -4249,12 +4297,12 @@ msgstr "_Týden začíná:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
 #: calendar/gui/dialogs/recurrence-page.c:1038
-#: calendar/gui/e-itip-control.c:645
+#: calendar/gui/e-itip-control.c:675
 msgid "Wednesday"
 msgstr "středa"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-#: ui/evolution-calendar.xml.h:31
+#: ui/evolution-calendar.xml.h:27
 msgid "Work Week"
 msgstr "Pracovní týden"
 
@@ -4362,50 +4410,75 @@ msgstr ""
 msgid "Are you sure you want to cancel and delete this journal entry?"
 msgstr "Opravdu chcete zrušit a smazat tento zápis v deníku?"
 
-#: calendar/gui/dialogs/changed-comp.c:59
+#: calendar/gui/dialogs/changed-comp.c:58
 msgid "This event has been deleted."
 msgstr "Tato událost byla smazána."
 
-#: calendar/gui/dialogs/changed-comp.c:63
+#: calendar/gui/dialogs/changed-comp.c:62
 msgid "This task has been deleted."
 msgstr "Tento úkol byl smazán."
 
-#: calendar/gui/dialogs/changed-comp.c:67
+#: calendar/gui/dialogs/changed-comp.c:66
 msgid "This journal entry has been deleted."
 msgstr "Tento zápis v deníku byl smazán."
 
-#: calendar/gui/dialogs/changed-comp.c:76
+#: calendar/gui/dialogs/changed-comp.c:75
 #, c-format
 msgid "%s  You have made changes. Forget those changes and close the editor?"
 msgstr "%s Byly provedeny změny. Opominout tyto změny a zavřít editor?"
 
-#: calendar/gui/dialogs/changed-comp.c:78
+#: calendar/gui/dialogs/changed-comp.c:77
 #, c-format
 msgid "%s  You have made no changes, close the editor?"
 msgstr "%s Nebyly provedeny žádné změny. Zavřít editor?"
 
-#: calendar/gui/dialogs/changed-comp.c:83
+#: calendar/gui/dialogs/changed-comp.c:82
 msgid "This event has been changed."
 msgstr "Tato událost byla změněna."
 
-#: calendar/gui/dialogs/changed-comp.c:87
+#: calendar/gui/dialogs/changed-comp.c:86
 msgid "This task has been changed."
 msgstr "Tento úkol byl změněn."
 
-#: calendar/gui/dialogs/changed-comp.c:91
+#: calendar/gui/dialogs/changed-comp.c:90
 msgid "This journal entry has been changed."
 msgstr "Tento zápis v deníku byl změněn."
 
-#: calendar/gui/dialogs/changed-comp.c:100
+#: calendar/gui/dialogs/changed-comp.c:99
 #, c-format
 msgid "%s  You have made changes. Forget those changes and update the editor?"
 msgstr "%s Byly provedeny změny. Opominout tyto změny a aktualizovat editor?"
 
-#: calendar/gui/dialogs/changed-comp.c:102
+#: calendar/gui/dialogs/changed-comp.c:101
 #, c-format
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s Nebyly provedeny žádné změny. Aktualizovat editor?"
 
+#: calendar/gui/dialogs/comp-editor-page.c:409
+#, c-format
+msgid "Validation error: %s"
+msgstr "Chyba ověření: %s"
+
+#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2216
+msgid " to "
+msgstr " do "
+
+#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2220
+msgid " (Completed "
+msgstr " (Dokončený "
+
+#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2222
+msgid "Completed "
+msgstr "Dokončený "
+
+#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2227
+msgid " (Due "
+msgstr " (Termín dokončení "
+
+#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2229
+msgid "Due "
+msgstr "Termín dokončení "
+
 #: calendar/gui/dialogs/comp-editor.c:334
 msgid "Could not update invalid object"
 msgstr "Nelze aktualizovat neplatný objekt"
@@ -4451,48 +4524,22 @@ msgid "No summary"
 msgstr "Není shrnutí"
 
 #: calendar/gui/dialogs/comp-editor.c:1281
-#: calendar/gui/e-calendar-table.c:1138 calendar/gui/e-cal-view.c:878
-#: composer/e-msg-composer.c:1191
+#: calendar/gui/e-calendar-table.c:1068 calendar/gui/e-day-view.c:3993
+#: calendar/gui/e-week-view.c:3840 composer/e-msg-composer.c:1164
 msgid "Save as..."
 msgstr "Uložit jako..."
 
-#: calendar/gui/dialogs/comp-editor.c:1384
-#: calendar/gui/dialogs/comp-editor.c:1408
-#: calendar/gui/dialogs/comp-editor.c:1434
+#: calendar/gui/dialogs/comp-editor.c:1382
+#: calendar/gui/dialogs/comp-editor.c:1406
+#: calendar/gui/dialogs/comp-editor.c:1432
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr ""
 "Změny provedené v této položce mohou být ztraceny, pokud dorazí aktualizace"
 
-#: calendar/gui/dialogs/comp-editor.c:1464
-#: calendar/gui/dialogs/comp-editor.c:1473
+#: calendar/gui/dialogs/comp-editor.c:1459
 msgid "Unable to obtain current version!"
 msgstr "Není možné získat aktuální verzi!"
 
-#: calendar/gui/dialogs/comp-editor-page.c:409
-#, c-format
-msgid "Validation error: %s"
-msgstr "Chyba ověření: %s"
-
-#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2223
-msgid " to "
-msgstr " do "
-
-#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2227
-msgid " (Completed "
-msgstr " (Dokončený "
-
-#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2229
-msgid "Completed "
-msgstr "Dokončený "
-
-#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2234
-msgid " (Due "
-msgstr " (Termín dokončení "
-
-#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2236
-msgid "Due "
-msgstr "Termín dokončení "
-
 #: calendar/gui/dialogs/delete-comp.c:96
 #, c-format
 msgid "Are you sure you want to delete the appointment `%s'?"
@@ -4595,31 +4642,31 @@ msgstr "Postoupit komu:"
 msgid "Enter Delegate"
 msgstr "Zapsat postoupení"
 
-#: calendar/gui/dialogs/event-editor.c:200 calendar/gui/print.c:2260
+#: calendar/gui/dialogs/event-editor.c:199 calendar/gui/print.c:2253
 msgid "Appointment"
 msgstr "Událost"
 
-#: calendar/gui/dialogs/event-editor.c:207
+#: calendar/gui/dialogs/event-editor.c:206
 msgid "Reminder"
 msgstr "Připomínka"
 
-#: calendar/gui/dialogs/event-editor.c:214
+#: calendar/gui/dialogs/event-editor.c:213
 msgid "Recurrence"
 msgstr "Opakování"
 
-#: calendar/gui/dialogs/event-editor.c:221
-#: calendar/gui/dialogs/event-editor.c:294
-#: calendar/gui/dialogs/event-editor.c:438
+#: calendar/gui/dialogs/event-editor.c:220
+#: calendar/gui/dialogs/event-editor.c:292
+#: calendar/gui/dialogs/event-editor.c:436
 msgid "Scheduling"
 msgstr "Plánování"
 
-#: calendar/gui/dialogs/event-editor.c:228
-#: calendar/gui/dialogs/event-editor.c:297
-#: calendar/gui/dialogs/event-editor.c:441 ui/evolution-event-editor.xml.h:6
+#: calendar/gui/dialogs/event-editor.c:227
+#: calendar/gui/dialogs/event-editor.c:295
+#: calendar/gui/dialogs/event-editor.c:439 ui/evolution-event-editor.xml.h:6
 msgid "Meeting"
 msgstr "Schůzka"
 
-#: calendar/gui/dialogs/event-page.c:603 calendar/gui/dialogs/task-page.c:509
+#: calendar/gui/dialogs/event-page.c:603 calendar/gui/dialogs/task-page.c:507
 msgid "Start date is wrong"
 msgstr "Počáteční datum je chybné"
 
@@ -4655,9 +4702,9 @@ msgid "Classification"
 msgstr "Třídění"
 
 #: calendar/gui/dialogs/event-page.glade.h:6
-#, fuzzy
-msgid "Co_nfidential"
-msgstr "Důvěrné"
+#: calendar/gui/dialogs/task-page.glade.h:4
+msgid "Con_fidential"
+msgstr "Dů_věrné"
 
 #: calendar/gui/dialogs/event-page.glade.h:7
 #: calendar/gui/dialogs/task-page.glade.h:5
@@ -4683,6 +4730,7 @@ msgid "Pu_blic"
 msgstr "Veře_jné"
 
 #: calendar/gui/dialogs/event-page.glade.h:12
+#: calendar/gui/e-calendar-table.etspec.h:13
 msgid "Show Time As"
 msgstr "Zobrazit čas jako"
 
@@ -4699,34 +4747,74 @@ msgstr "_Konec:"
 msgid "_Start time:"
 msgstr "_Začátek:"
 
-#. an empty string is the same as 'None'
-#: calendar/gui/dialogs/meeting-page.c:311
-#: calendar/gui/dialogs/meeting-page.glade.h:2
-#: calendar/gui/e-cal-model-tasks.c:596 composer/e-msg-composer.c:2093
-#: mail/mail-account-gui.c:1260 mail/mail-account-gui.c:1692
-#: mail/mail-accounts.c:442 mail/mail-config.glade.h:76
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:194
-#: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:445
-#: widgets/misc/e-dateedit.c:1483 widgets/misc/e-dateedit.c:1598
-msgid "None"
-msgstr "žádný"
-
-#: calendar/gui/dialogs/meeting-page.c:416
+#: calendar/gui/dialogs/meeting-page.c:437
 msgid "The organizer selected no longer has an account."
 msgstr "Vybraný organizátor už nemá účet."
 
-#: calendar/gui/dialogs/meeting-page.c:422
+#: calendar/gui/dialogs/meeting-page.c:443
 msgid "An organizer is required."
 msgstr "Je požadován organizátor."
 
-#: calendar/gui/dialogs/meeting-page.c:437
+#: calendar/gui/dialogs/meeting-page.c:458
 msgid "At least one attendee is required."
 msgstr "Je požadován alespoň jeden účastník."
 
-#: calendar/gui/dialogs/meeting-page.c:630
+#: calendar/gui/dialogs/meeting-page.c:629
+msgid "That person is already attending the meeting!"
+msgstr "Tato osoba se již schůzky účastní!"
+
+#: calendar/gui/dialogs/meeting-page.c:713
 msgid "_Delegate To..."
 msgstr "_Postoupit komu..."
 
+#: calendar/gui/dialogs/meeting-page.etspec.h:1
+#: calendar/gui/e-meeting-time-sel.etspec.h:1
+msgid "Attendee"
+msgstr "Účastník"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:2
+#: calendar/gui/e-meeting-time-sel.etspec.h:2
+msgid "Click here to add an attendee"
+msgstr "Účastníka přidáte kliknutím zde"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:3
+#: calendar/gui/e-meeting-time-sel.etspec.h:3
+msgid "Common Name"
+msgstr "Společné jméno"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:4
+#: calendar/gui/e-meeting-time-sel.etspec.h:4
+msgid "Delegated From"
+msgstr "Postoupeno kým"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:5
+#: calendar/gui/e-meeting-time-sel.etspec.h:5
+msgid "Delegated To"
+msgstr "Postoupeno komu"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:6
+#: calendar/gui/e-meeting-time-sel.etspec.h:6
+msgid "Language"
+msgstr "Jazyk"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:7
+#: calendar/gui/e-meeting-time-sel.etspec.h:7
+msgid "Member"
+msgstr "Člen"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:8
+#: calendar/gui/e-itip-control.c:1179
+#: calendar/gui/e-meeting-time-sel.etspec.h:8
+msgid "RSVP"
+msgstr "RSVP"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:10
+#: calendar/gui/e-calendar-table.etspec.h:15
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:58
+#: mail/message-list.etspec.h:12
+msgid "Status"
+msgstr "Stav"
+
 #: calendar/gui/dialogs/meeting-page.glade.h:3
 #: calendar/gui/e-itip-control.glade.h:9
 msgid "Organizer:"
@@ -4737,7 +4825,7 @@ msgid "_Change Organizer"
 msgstr "_Změnit organizátora"
 
 #: calendar/gui/dialogs/meeting-page.glade.h:5
-#: calendar/gui/e-meeting-time-sel.c:411
+#: calendar/gui/e-meeting-time-sel.c:424
 msgid "_Invite Others..."
 msgstr "_Pozvat další..."
 
@@ -4889,7 +4977,7 @@ msgstr ""
 "\n"
 "Chcete uložit změny?"
 
-#: calendar/gui/dialogs/save-comp.c:58 composer/e-msg-composer.c:1599
+#: calendar/gui/dialogs/save-comp.c:58 composer/e-msg-composer.c:1557
 msgid "_Discard Changes"
 msgstr "Zaho_dit změny"
 
@@ -4913,82 +5001,52 @@ msgstr "Byla vytvořena informace o předání úkolu. Poslat ji?"
 msgid "The task information has changed. Send an updated version?"
 msgstr "Informace o úkolu se změnila. Poslat aktualizovanou verzi?"
 
-#: calendar/gui/dialogs/task-details-page.c:405
+#: calendar/gui/dialogs/task-details-page.c:401
 msgid "Completed date is wrong"
 msgstr "Čas dokončení je chybný"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:2
-#, fuzzy, no-c-format
-msgid "% _Complete"
+#: calendar/gui/e-calendar-table.etspec.h:2
+#, no-c-format
+msgid "% Complete"
 msgstr "% dokončeno"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:4
-#: calendar/gui/e-calendar-table.c:478 calendar/gui/e-cal-model-tasks.c:323
-#: calendar/gui/e-cal-model-tasks.c:602 calendar/gui/e-tasks.c:250
-#: calendar/gui/print.c:2311
-msgid "Completed"
-msgstr "Dokončeno"
-
-#: calendar/gui/dialogs/task-details-page.glade.h:6
-#: calendar/gui/e-calendar-table.c:477 calendar/gui/e-cal-model-tasks.c:321
-#: calendar/gui/e-cal-model-tasks.c:600 calendar/gui/e-cal-model-tasks.c:662
-#: calendar/gui/e-tasks.c:247 calendar/gui/print.c:2308
-msgid "In Progress"
-msgstr "Probíhá"
-
-#: calendar/gui/dialogs/task-details-page.glade.h:9
-#: calendar/gui/e-calendar-table.c:476 calendar/gui/e-cal-model-tasks.c:319
-#: calendar/gui/e-cal-model-tasks.c:598 calendar/gui/e-tasks.c:257
-#: calendar/gui/print.c:2305
-msgid "Not Started"
-msgstr "Nezačato"
+#: calendar/gui/dialogs/task-details-page.glade.h:5
+msgid "Date Completed:"
+msgstr "Datum dokončení:"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:10
+#: calendar/gui/dialogs/task-details-page.glade.h:11
 msgid "Progress"
 msgstr "Průběh"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:12
-#, fuzzy
-msgid "_Date Completed:"
-msgstr "Datum dokončení:"
+msgid "URL:"
+msgstr "URL:"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:13
+#: calendar/gui/dialogs/task-details-page.glade.h:14
 msgid "_Priority:"
 msgstr "_Naléhavost:"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:14
+#: calendar/gui/dialogs/task-details-page.glade.h:15
 msgid "_Status:"
 msgstr "_Stav:"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:15
-#, fuzzy
-msgid "_Web Page:"
-msgstr "Adresa _webové stránky:"
-
-#: calendar/gui/dialogs/task-editor.c:193
+#: calendar/gui/dialogs/task-editor.c:190
 msgid "Basic"
 msgstr "Základní"
 
-#: calendar/gui/dialogs/task-editor.c:207
-#: calendar/gui/dialogs/task-editor.c:270
-#: calendar/gui/dialogs/task-editor.c:407
+#: calendar/gui/dialogs/task-editor.c:204
+#: calendar/gui/dialogs/task-editor.c:252
+#: calendar/gui/dialogs/task-editor.c:387
 msgid "Assignment"
 msgstr "Předání"
 
-#: calendar/gui/dialogs/task-page.c:482
+#: calendar/gui/dialogs/task-page.c:480
 msgid "Due date is wrong"
 msgstr "Datum splnění je chybné"
 
-#: calendar/gui/dialogs/task-page.c:542
-msgid "Due date is before start date!"
-msgstr ""
-
-#: calendar/gui/dialogs/task-page.glade.h:4
-msgid "Con_fidential"
-msgstr "Dů_věrné"
-
-#: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-itip-control.c:1077
-#: calendar/gui/e-itip-control.glade.h:6 calendar/gui/e-tasks.c:287
+#: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-itip-control.c:1107
+#: calendar/gui/e-itip-control.glade.h:6
 #: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:43
 msgid "Description:"
 msgstr "Popis:"
@@ -5001,259 +5059,223 @@ msgstr "_Začátek:"
 msgid "_Due Date:"
 msgstr "_Termín dokončení:"
 
-#: calendar/gui/e-alarm-list.c:397
+#: calendar/gui/e-alarm-list.c:393
 #, c-format
 msgid "%d days"
 msgstr "%d dny/-ů"
 
-#: calendar/gui/e-alarm-list.c:400
+#: calendar/gui/e-alarm-list.c:396
 msgid "1 day"
 msgstr "1 den"
 
-#: calendar/gui/e-alarm-list.c:405
+#: calendar/gui/e-alarm-list.c:401
 #, c-format
 msgid "%d weeks"
 msgstr "%d týdny/-ů"
 
-#: calendar/gui/e-alarm-list.c:408
+#: calendar/gui/e-alarm-list.c:404
 msgid "1 week"
 msgstr "1 týden"
 
-#: calendar/gui/e-alarm-list.c:413
+#: calendar/gui/e-alarm-list.c:409
 #, c-format
 msgid "%d hours"
 msgstr "%d hodin"
 
-#: calendar/gui/e-alarm-list.c:416
+#: calendar/gui/e-alarm-list.c:412
 msgid "1 hour"
 msgstr "1 hodinu"
 
-#: calendar/gui/e-alarm-list.c:421
+#: calendar/gui/e-alarm-list.c:417
 #, c-format
 msgid "%d minutes"
 msgstr "%d minut"
 
-#: calendar/gui/e-alarm-list.c:424
+#: calendar/gui/e-alarm-list.c:420
 msgid "1 minute"
 msgstr "1 minutu"
 
-#: calendar/gui/e-alarm-list.c:429
+#: calendar/gui/e-alarm-list.c:425
 #, c-format
 msgid "%d seconds"
 msgstr "%d sekund"
 
-#: calendar/gui/e-alarm-list.c:432
+#: calendar/gui/e-alarm-list.c:428
 msgid "1 second"
 msgstr "1 sekunda"
 
-#: calendar/gui/e-alarm-list.c:469
+#: calendar/gui/e-alarm-list.c:465
 msgid "Send an email"
 msgstr "Poslat e-mail"
 
-#: calendar/gui/e-alarm-list.c:479
+#: calendar/gui/e-alarm-list.c:475
 msgid "Unknown action to be performed"
 msgstr "Má se vykonat neznámá akce"
 
-#: calendar/gui/e-alarm-list.c:491
+#: calendar/gui/e-alarm-list.c:487
 #, c-format
 msgid "%s %s before the start of the appointment"
 msgstr "%s %s před začátkem události"
 
-#: calendar/gui/e-alarm-list.c:494
+#: calendar/gui/e-alarm-list.c:490
 #, c-format
 msgid "%s %s after the start of the appointment"
 msgstr "%s %s po začátku události"
 
-#: calendar/gui/e-alarm-list.c:499
+#: calendar/gui/e-alarm-list.c:495
 #, c-format
 msgid "%s at the start of the appointment"
 msgstr "%s při začátku události"
 
-#: calendar/gui/e-alarm-list.c:508
+#: calendar/gui/e-alarm-list.c:504
 #, c-format
 msgid "%s %s before the end of the appointment"
 msgstr "%s %s před koncem události"
 
-#: calendar/gui/e-alarm-list.c:511
+#: calendar/gui/e-alarm-list.c:507
 #, c-format
 msgid "%s %s after the end of the appointment"
 msgstr "%s %s po konci události"
 
-#: calendar/gui/e-alarm-list.c:516
+#: calendar/gui/e-alarm-list.c:512
 #, c-format
 msgid "%s at the end of the appointment"
 msgstr "%s na konci události"
 
-#: calendar/gui/e-alarm-list.c:540
+#: calendar/gui/e-alarm-list.c:536
 #, c-format
 msgid "%s at %s"
 msgstr "%s při %s"
 
-#: calendar/gui/e-alarm-list.c:546
+#: calendar/gui/e-alarm-list.c:542
 #, c-format
 msgid "%s for an unknown trigger type"
 msgstr "%s pro neznámý typ spouštění"
 
-#: calendar/gui/e-calendar-table.c:381 calendar/gui/e-cal-model.c:280
-#: calendar/gui/e-cal-model.c:287
-msgid "Public"
-msgstr "Veřejné"
-
-#: calendar/gui/e-calendar-table.c:382 calendar/gui/e-cal-model.c:289
-msgid "Private"
-msgstr "Soukromé"
-
-#: calendar/gui/e-calendar-table.c:383 calendar/gui/e-cal-model.c:291
-msgid "Confidential"
-msgstr "Důvěrné"
-
-#: calendar/gui/e-calendar-table.c:425
+#: calendar/gui/e-calendar-table.c:423
 msgid "0%"
 msgstr "0%"
 
-#: calendar/gui/e-calendar-table.c:426
+#: calendar/gui/e-calendar-table.c:424
 msgid "10%"
 msgstr "10%"
 
-#: calendar/gui/e-calendar-table.c:427
+#: calendar/gui/e-calendar-table.c:425
 msgid "20%"
 msgstr "20%"
 
-#: calendar/gui/e-calendar-table.c:428
+#: calendar/gui/e-calendar-table.c:426
 msgid "30%"
 msgstr "30%"
 
-#: calendar/gui/e-calendar-table.c:429
+#: calendar/gui/e-calendar-table.c:427
 msgid "40%"
 msgstr "40%"
 
-#: calendar/gui/e-calendar-table.c:430
+#: calendar/gui/e-calendar-table.c:428
 msgid "50%"
 msgstr "50%"
 
-#: calendar/gui/e-calendar-table.c:431
+#: calendar/gui/e-calendar-table.c:429
 msgid "60%"
 msgstr "60%"
 
-#: calendar/gui/e-calendar-table.c:432
+#: calendar/gui/e-calendar-table.c:430
 msgid "70%"
 msgstr "70%"
 
-#: calendar/gui/e-calendar-table.c:433
+#: calendar/gui/e-calendar-table.c:431
 msgid "80%"
 msgstr "80%"
 
-#: calendar/gui/e-calendar-table.c:434
+#: calendar/gui/e-calendar-table.c:432
 msgid "90%"
 msgstr "90%"
 
-#: calendar/gui/e-calendar-table.c:435
+#: calendar/gui/e-calendar-table.c:433
 msgid "100%"
 msgstr "100%"
 
-#: calendar/gui/e-calendar-table.c:455 calendar/gui/e-cal-model-calendar.c:163
-msgid "Free"
-msgstr "Volný"
-
-#: calendar/gui/e-calendar-table.c:456 calendar/gui/e-cal-model-calendar.c:166
-#: calendar/gui/e-meeting-time-sel.c:393
-#: shell/evolution-shell-component.c:1207
-msgid "Busy"
-msgstr "Obsazený"
-
-#: calendar/gui/e-calendar-table.c:724 calendar/gui/e-cal-view.c:562
+#: calendar/gui/e-calendar-table.c:726 calendar/gui/e-day-view.c:2867
+#: calendar/gui/e-week-view.c:1933
 msgid "Deleting selected objects"
 msgstr "Odstraňuji vybrané objekty"
 
-#: calendar/gui/e-calendar-table.c:988 calendar/gui/e-calendar-table.c:1029
-#: calendar/gui/e-cal-view.c:1126 calendar/gui/e-cal-view.c:1192
+#: calendar/gui/e-calendar-table.c:958 calendar/gui/e-day-view.c:3737
+#: calendar/gui/e-week-view.c:3613 mail/folder-browser.c:1763
 #: shell/e-shortcuts-view.c:422 ui/evolution-addressbook.xml.h:36
 msgid "_Open"
 msgstr "_Otevřít"
 
-#: calendar/gui/e-calendar-table.c:989
-#, fuzzy
-msgid "Open _Web Page"
-msgstr "_Otevřít zprávu"
-
-#: calendar/gui/e-calendar-table.c:990 calendar/gui/e-calendar-table.c:1035
-#: calendar/gui/e-cal-view.c:1127 calendar/gui/e-cal-view.c:1198
-#: ui/evolution-mail-message.xml.h:120
-msgid "_Save As..."
+#: calendar/gui/e-calendar-table.c:959
+msgid "_Save as..."
 msgstr "_Uložit jako..."
 
-#: calendar/gui/e-calendar-table.c:991 calendar/gui/e-calendar-table.c:1033
-#: calendar/gui/e-cal-view.c:1101 calendar/gui/e-cal-view.c:1128
-#: calendar/gui/e-cal-view.c:1196 ui/evolution-addressbook.xml.h:38
-#: ui/evolution-calendar.xml.h:37 ui/evolution-comp-editor.xml.h:19
-#: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:116
-#: ui/evolution-tasks.xml.h:21 ui/my-evolution.xml.h:6
+#: calendar/gui/e-calendar-table.c:960 calendar/gui/e-day-view.c:3739
+#: calendar/gui/e-week-view.c:3588 calendar/gui/e-week-view.c:3615
+#: ui/evolution-addressbook.xml.h:38 ui/evolution-calendar.xml.h:33
+#: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:108
+#: ui/evolution-tasks.xml.h:20 ui/my-evolution.xml.h:6
 msgid "_Print..."
 msgstr "_Tisknout..."
 
-#: calendar/gui/e-calendar-table.c:995 calendar/gui/e-calendar-table.c:1024
-#: calendar/gui/e-cal-view.c:1133 calendar/gui/e-cal-view.c:1174
-#: ui/evolution-addressbook.xml.h:1 ui/evolution-calendar.xml.h:1
-#: ui/evolution-tasks.xml.h:1
+#: calendar/gui/e-calendar-table.c:964 calendar/gui/e-day-view.c:3744
+#: calendar/gui/e-week-view.c:3620 ui/evolution-addressbook.xml.h:1
+#: ui/evolution-calendar.xml.h:1 ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "_Vyjmout"
 
-#: calendar/gui/e-calendar-table.c:996 calendar/gui/e-calendar-table.c:1022
-#: calendar/gui/e-cal-view.c:1134 calendar/gui/e-cal-view.c:1172
-#: ui/evolution-addressbook.xml.h:30 ui/evolution-calendar.xml.h:33
-#: ui/evolution-composer-entries.xml.h:7 ui/evolution-mail-message.xml.h:101
-#: ui/evolution-tasks.xml.h:17
+#: calendar/gui/e-calendar-table.c:965 calendar/gui/e-day-view.c:3745
+#: calendar/gui/e-week-view.c:3621 ui/evolution-addressbook.xml.h:30
+#: ui/evolution-calendar.xml.h:29 ui/evolution-composer-entries.xml.h:7
+#: ui/evolution-mail-list.xml.h:24 ui/evolution-tasks.xml.h:15
 msgid "_Copy"
 msgstr "_Kopírovat"
 
-#: calendar/gui/e-calendar-table.c:997 calendar/gui/e-calendar-table.c:1031
-#: calendar/gui/e-cal-view.c:1105 calendar/gui/e-cal-view.c:1135
-#: calendar/gui/e-cal-view.c:1194 ui/evolution-addressbook.xml.h:37
-#: ui/evolution-calendar.xml.h:36 ui/evolution-composer-entries.xml.h:9
-#: ui/evolution-mail-message.xml.h:114 ui/evolution-tasks.xml.h:20
+#: calendar/gui/e-calendar-table.c:966 calendar/gui/e-day-view.c:3710
+#: calendar/gui/e-day-view.c:3746 calendar/gui/e-week-view.c:3592
+#: calendar/gui/e-week-view.c:3622 ui/evolution-addressbook.xml.h:37
+#: ui/evolution-calendar.xml.h:32 ui/evolution-composer-entries.xml.h:9
+#: ui/evolution-mail-list.xml.h:29 ui/evolution-tasks.xml.h:19
 msgid "_Paste"
 msgstr "Vl_ožit"
 
-#: calendar/gui/e-calendar-table.c:1001
+#: calendar/gui/e-calendar-table.c:970
 msgid "_Assign Task"
 msgstr "P_ředat úkol"
 
-#: calendar/gui/e-calendar-table.c:1002
+#: calendar/gui/e-calendar-table.c:971
 msgid "_Forward as iCalendar"
 msgstr "_Odeslat jako iCalendar"
 
-#: calendar/gui/e-calendar-table.c:1003
+#: calendar/gui/e-calendar-table.c:972
 msgid "_Mark as Complete"
 msgstr "Označit jako _dokončené"
 
-#: calendar/gui/e-calendar-table.c:1004
+#: calendar/gui/e-calendar-table.c:973
 msgid "_Mark Selected Tasks as Complete"
 msgstr "Označit _vybrané úkoly jako dokončené"
 
-#: calendar/gui/e-calendar-table.c:1009 calendar/gui/e-calendar-table.c:1027
+#: calendar/gui/e-calendar-table.c:978
 msgid "_Delete Selected Tasks"
 msgstr "_Smazat vybrané úkoly"
 
-#: calendar/gui/e-calendar-table.c:1341 calendar/gui/e-cal-view.c:253
+#: calendar/gui/e-calendar-table.c:1265 calendar/gui/e-day-view.c:7929
+#: calendar/gui/e-week-view.c:4335
 msgid "Updating objects"
 msgstr "Aktualizuji objekty"
 
-#: calendar/gui/e-calendar-table.c:1424
+#: calendar/gui/e-calendar-table.c:1348
 #: calendar/gui/e-calendar-table.etspec.h:6
 msgid "Click to add a task"
 msgstr "Úkol přidáte kliknutím zde"
 
-#: calendar/gui/e-calendar-table.etspec.h:2
-#, no-c-format
-msgid "% Complete"
-msgstr "% dokončeno"
-
 #: calendar/gui/e-calendar-table.etspec.h:3
 msgid "Alarms"
 msgstr "Alarmy"
 
-#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:1173
-#: camel/camel-filter-driver.c:1268 mail/mail-send-recv.c:578
+#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:1156
+#: camel/camel-filter-driver.c:1251
 msgid "Complete"
 msgstr "Dokončeno"
 
@@ -5262,14 +5284,13 @@ msgid "Completion Date"
 msgstr "Datum dokončení"
 
 #: calendar/gui/e-calendar-table.etspec.h:9
-#, fuzzy
-msgid "Description"
-msgstr "Popis:"
-
-#: calendar/gui/e-calendar-table.etspec.h:10
 msgid "Due Date"
 msgstr "Termín dokončení"
 
+#: calendar/gui/e-calendar-table.etspec.h:10
+msgid "End Date"
+msgstr "Konec"
+
 #: calendar/gui/e-calendar-table.etspec.h:11
 msgid "Geographical Position"
 msgstr "Zeměpisná poloha"
@@ -5278,299 +5299,242 @@ msgstr "Zeměpisná poloha"
 msgid "Priority"
 msgstr "Naléhavost"
 
-#: calendar/gui/e-calendar-table.etspec.h:13
+#: calendar/gui/e-calendar-table.etspec.h:14
 msgid "Start Date"
 msgstr "Začátek"
 
-#: calendar/gui/e-calendar-table.etspec.h:14
-#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:36
-#: mail/message-list.etspec.h:12
-msgid "Status"
-msgstr "Stav"
-
-#: calendar/gui/e-calendar-table.etspec.h:15
+#: calendar/gui/e-calendar-table.etspec.h:16
 #: my-evolution/component-factory.c:56 shell/e-shell.c:750
 #: shell/e-shortcuts.c:1082
 msgid "Summary"
 msgstr "Přehled"
 
-#: calendar/gui/e-calendar-table.etspec.h:16
+#: calendar/gui/e-calendar-table.etspec.h:17
 msgid "Task sort"
 msgstr "Třídění úkolů"
 
-#: calendar/gui/e-calendar-table.etspec.h:19 mail/mail-config.glade.h:171
-msgid "color"
-msgstr "barva"
-
-#: calendar/gui/e-calendar-table.etspec.h:20
-#, fuzzy
-msgid "component"
-msgstr "Událost"
-
-#: calendar/gui/e-cal-model.c:293 calendar/gui/e-cal-model.c:296
-#: calendar/gui/e-itip-control.c:1062 calendar/gui/e-itip-control.c:1278
-#: camel/camel-gpg-context.c:1574 camel/camel-gpg-context.c:1625
-#: camel/camel-tcp-stream-openssl.c:631
-#: camel/providers/smtp/camel-smtp-transport.c:172
-#: camel/providers/smtp/camel-smtp-transport.c:227
-#: widgets/misc/e-charset-picker.c:60
-msgid "Unknown"
-msgstr "Neznámá"
-
-#: calendar/gui/e-cal-model.c:828
-msgid "Recurring"
-msgstr "Opakovaný"
-
-#: calendar/gui/e-cal-model.c:830
-msgid "Assigned"
-msgstr "Přiřazeno"
+#. strftime format of a weekday, a date and a time, 24-hour.
+#: calendar/gui/e-cell-date-edit-text.c:118 e-util/e-time-utils.c:167
+#: e-util/e-time-utils.c:380
+msgid "%a %m/%d/%Y %H:%M:%S"
+msgstr "%a %d/%m/%Y %H:%M:%S"
 
-#: calendar/gui/e-cal-model.c:832 calendar/gui/e-cal-model-tasks.c:933
-msgid "Yes"
-msgstr "Ano"
+#. strftime format of a weekday, a date and a time, 12-hour.
+#: calendar/gui/e-cell-date-edit-text.c:121 e-util/e-time-utils.c:162
+#: e-util/e-time-utils.c:389
+msgid "%a %m/%d/%Y %I:%M:%S %p"
+msgstr "%a %d/%m/%Y %I:%M:%S %p"
 
-#: calendar/gui/e-cal-model.c:832 calendar/gui/e-cal-model-tasks.c:933
-msgid "No"
-msgstr "Ne"
+#: calendar/gui/e-cell-date-edit-text.c:126
+#, c-format
+msgid ""
+"The date must be entered in the format: \n"
+"\n"
+"%s"
+msgstr ""
+"Datum musí být napsáno ve formátu:\n"
+"\n"
+"%s"
 
-#: calendar/gui/e-cal-model-tasks.c:275
-msgid "N"
-msgstr "S"
+#: calendar/gui/e-day-view-time-item.c:532
+#, c-format
+msgid "%02i minute divisions"
+msgstr "%02i rozdělení minuty"
 
-#: calendar/gui/e-cal-model-tasks.c:275
-msgid "S"
-msgstr "J"
+#. strftime format %A = full weekday name, %d = day of month,
+#. %B = full month name. Don't use any other specifiers.
+#: calendar/gui/e-day-view-top-item.c:261 calendar/gui/e-day-view.c:1421
+#: calendar/gui/e-week-view-main-item.c:316 calendar/gui/print.c:1525
+msgid "%A %d %B"
+msgstr "%A %d %B"
 
-#: calendar/gui/e-cal-model-tasks.c:277
-msgid "E"
-msgstr "V"
+#. strftime format %d = day of month, %b = abbreviated month name.
+#. Don't use any other specifiers.
+#: calendar/gui/e-day-view-top-item.c:269 calendar/gui/e-day-view.c:1454
+#: calendar/gui/e-week-view-main-item.c:339
+msgid "%d %b"
+msgstr "%d %b"
 
-#: calendar/gui/e-cal-model-tasks.c:277
-msgid "W"
-msgstr "Z"
+#. String to use in 12-hour time format for times in the morning.
+#: calendar/gui/e-day-view.c:636 calendar/gui/e-week-view.c:350
+#: calendar/gui/print.c:809
+msgid "am"
+msgstr "am"
 
-#: calendar/gui/e-cal-model-tasks.c:550
-msgid ""
-"The geographical position must be entered in the format: \n"
-"\n"
-"45.436845,125.862501"
-msgstr ""
-"\"Zeměpisná pozice musí být uvedena ve formátu: \\n\"\n"
-"\"\\n\"\n"
-"\"45.436845,125.862501\""
+#. String to use in 12-hour time format for times in the afternoon.
+#: calendar/gui/e-day-view.c:639 calendar/gui/e-week-view.c:353
+#: calendar/gui/print.c:811
+msgid "pm"
+msgstr "pm"
 
-#: calendar/gui/e-cal-view.c:1094 calendar/gui/e-cal-view.c:1184
-msgid "New _Appointment..."
-msgstr "Nová _událost..."
+#: calendar/gui/e-day-view.c:3694
+msgid "New _Appointment"
+msgstr "Nová _událost"
 
-#: calendar/gui/e-cal-view.c:1095 calendar/gui/e-cal-view.c:1186
+#: calendar/gui/e-day-view.c:3696 calendar/gui/e-week-view.c:3582
 msgid "New All Day _Event"
 msgstr "Nová _celodenní událost"
 
-#: calendar/gui/e-cal-view.c:1096 calendar/gui/e-cal-view.c:1188
+#: calendar/gui/e-day-view.c:3698 calendar/gui/e-week-view.c:3583
 msgid "New Meeting"
 msgstr "Nová schůzka"
 
-#: calendar/gui/e-cal-view.c:1097 calendar/gui/e-cal-view.c:1190
+#: calendar/gui/e-day-view.c:3700 calendar/gui/e-week-view.c:3584
 msgid "New Task"
 msgstr "Nový úkol"
 
-#: calendar/gui/e-cal-view.c:1111 calendar/gui/e-cal-view.c:1180
+#: calendar/gui/e-day-view.c:3705 ui/evolution-comp-editor.xml.h:11
+msgid "Print..."
+msgstr "Tisk..."
+
+#: calendar/gui/e-day-view.c:3717 calendar/gui/e-week-view.c:3598
 #: ui/evolution-calendar.xml.h:13
 msgid "Go to _Today"
 msgstr "Jít na _dnešek"
 
-#: calendar/gui/e-cal-view.c:1112 calendar/gui/e-cal-view.c:1182
+#: calendar/gui/e-day-view.c:3719 calendar/gui/e-week-view.c:3599
 msgid "_Go to Date..."
 msgstr "_Jít na datum..."
 
-#: calendar/gui/e-cal-view.c:1116 ui/evolution-calendar.xml.h:38
+#: calendar/gui/e-day-view.c:3724 calendar/gui/e-week-view.c:3603
+#: ui/evolution-calendar.xml.h:34
 msgid "_Publish Free/Busy Information"
 msgstr "_Zveřejnit informaci o volném/obsazeném čase"
 
-#: calendar/gui/e-cal-view.c:1120 calendar/gui/e-cal-view.c:1200
+#: calendar/gui/e-day-view.c:3729 calendar/gui/e-week-view.c:3607
 #: ui/evolution.xml.h:60
 msgid "_Settings..."
 msgstr "Na_stavení..."
 
-#: calendar/gui/e-cal-view.c:1139
+#: calendar/gui/e-day-view.c:3738 calendar/gui/e-week-view.c:3614
+#: mail/folder-browser.c:1765 ui/evolution-mail-message.xml.h:112
+msgid "_Save As..."
+msgstr "_Uložit jako..."
+
+#: calendar/gui/e-day-view.c:3750 calendar/gui/e-week-view.c:3626
 msgid "_Schedule Meeting..."
 msgstr "Naplánovat _schůzku..."
 
-#: calendar/gui/e-cal-view.c:1140
+#: calendar/gui/e-day-view.c:3751 calendar/gui/e-week-view.c:3627
 msgid "_Forward as iCalendar..."
 msgstr "_Odeslat jako iCalendar..."
 
-#: calendar/gui/e-cal-view.c:1145
+#: calendar/gui/e-day-view.c:3756 calendar/gui/e-week-view.c:3632
 msgid "Make this Occurrence _Movable"
 msgstr "Nastavit tento výskyt jako _přesunutelný"
 
-#: calendar/gui/e-cal-view.c:1146 calendar/gui/e-cal-view.c:1177
+#: calendar/gui/e-day-view.c:3757 calendar/gui/e-week-view.c:3633
 msgid "Delete this _Occurrence"
 msgstr "Odstranit tento vý_skyt"
 
-#: calendar/gui/e-cal-view.c:1147 calendar/gui/e-cal-view.c:1178
+#: calendar/gui/e-day-view.c:3758 calendar/gui/e-week-view.c:3634
 msgid "Delete _All Occurrences"
 msgstr "Odstranit _všechny výskyty"
 
-#. strftime format of a weekday, a date and a time, 24-hour.
-#: calendar/gui/e-cell-date-edit-text.c:118 e-util/e-time-utils.c:180
-#: e-util/e-time-utils.c:393
-msgid "%a %m/%d/%Y %H:%M:%S"
-msgstr "%a %d/%m/%Y %H:%M:%S"
-
-#. strftime format of a weekday, a date and a time, 12-hour.
-#: calendar/gui/e-cell-date-edit-text.c:121 e-util/e-time-utils.c:175
-#: e-util/e-time-utils.c:402
-msgid "%a %m/%d/%Y %I:%M:%S %p"
-msgstr "%a %d/%m/%Y %I:%M:%S %p"
-
-#: calendar/gui/e-cell-date-edit-text.c:126
-#, c-format
-msgid ""
-"The date must be entered in the format: \n"
-"\n"
-"%s"
-msgstr ""
-"Datum musí být napsáno ve formátu:\n"
-"\n"
-"%s"
-
-#. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:600 calendar/gui/e-week-view.c:326
-#: calendar/gui/print.c:809
-msgid "am"
-msgstr "am"
-
-#. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:603 calendar/gui/e-week-view.c:329
-#: calendar/gui/print.c:811
-msgid "pm"
-msgstr "pm"
-
-#. strftime format %A = full weekday name, %d = day of month,
-#. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view.c:1347 calendar/gui/e-day-view-top-item.c:262
-#: calendar/gui/e-week-view-main-item.c:316 calendar/gui/print.c:1524
-msgid "%A %d %B"
-msgstr "%A %d %B"
-
-#. strftime format %d = day of month, %b = abbreviated month name.
-#. Don't use any other specifiers.
-#: calendar/gui/e-day-view.c:1380 calendar/gui/e-day-view-top-item.c:270
-#: calendar/gui/e-week-view-main-item.c:339
-msgid "%d %b"
-msgstr "%d %b"
-
-#: calendar/gui/e-day-view-time-item.c:532
-#, c-format
-msgid "%02i minute divisions"
-msgstr "%02i rozdělení minuty"
-
-#: calendar/gui/e-itip-control.c:676
+#: calendar/gui/e-itip-control.c:706
 msgid "Yes. (Complex Recurrence)"
 msgstr "Ano. (Komplexní opakování)"
 
-#: calendar/gui/e-itip-control.c:688
+#: calendar/gui/e-itip-control.c:718
 msgid "Every day"
 msgstr "Každý den"
 
-#: calendar/gui/e-itip-control.c:690
+#: calendar/gui/e-itip-control.c:720
 #, c-format
 msgid "Every %d days"
 msgstr "Každé(ých) %d dny(ů)"
 
-#: calendar/gui/e-itip-control.c:696
+#: calendar/gui/e-itip-control.c:726
 msgid "Every week"
 msgstr "Každý týden"
 
-#: calendar/gui/e-itip-control.c:698
+#: calendar/gui/e-itip-control.c:728
 #, c-format
 msgid "Every %d weeks"
 msgstr "Každé(ých) %d týdny(ů)"
 
-#: calendar/gui/e-itip-control.c:701
+#: calendar/gui/e-itip-control.c:731
 msgid "Every week on "
 msgstr "Každý týden v "
 
-#: calendar/gui/e-itip-control.c:703
+#: calendar/gui/e-itip-control.c:733
 #, c-format
 msgid "Every %d weeks on "
 msgstr "Každé(ých) %d týdny(ů) v "
 
-#: calendar/gui/e-itip-control.c:711
+#: calendar/gui/e-itip-control.c:741
 msgid " and "
 msgstr " a "
 
-#: calendar/gui/e-itip-control.c:718
+#: calendar/gui/e-itip-control.c:748
 #, c-format
 msgid "The %s day of "
 msgstr "%s. den "
 
-#: calendar/gui/e-itip-control.c:731
+#: calendar/gui/e-itip-control.c:761
 #, c-format
 msgid "The %s %s of "
 msgstr "%s %s "
 
-#: calendar/gui/e-itip-control.c:736
+#: calendar/gui/e-itip-control.c:766
 msgid "every month"
 msgstr "každý měsíc"
 
-#: calendar/gui/e-itip-control.c:741
+#: calendar/gui/e-itip-control.c:771
 #, c-format
 msgid "every %d months"
 msgstr "každý %d. měsíc"
 
-#: calendar/gui/e-itip-control.c:747
+#: calendar/gui/e-itip-control.c:777
 msgid "Every year"
 msgstr "Každý rok"
 
-#: calendar/gui/e-itip-control.c:749
+#: calendar/gui/e-itip-control.c:779
 #, c-format
 msgid "Every %d years"
 msgstr "Každé(ých) %d roky/let"
 
-#: calendar/gui/e-itip-control.c:761
+#: calendar/gui/e-itip-control.c:791
 #, c-format
 msgid " a total of %d times"
 msgstr " celkem %dkrát"
 
-#: calendar/gui/e-itip-control.c:769
+#: calendar/gui/e-itip-control.c:799
 msgid ", ending on "
 msgstr ", konec "
 
-#: calendar/gui/e-itip-control.c:793
+#: calendar/gui/e-itip-control.c:823
 msgid "<b>Starts:</b> "
 msgstr "<b>Začíná:</b>"
 
-#: calendar/gui/e-itip-control.c:803
+#: calendar/gui/e-itip-control.c:833
 msgid "<b>Ends:</b> "
 msgstr "<b>Končí:</b>"
 
-#: calendar/gui/e-itip-control.c:823
+#: calendar/gui/e-itip-control.c:853
 msgid "<b>Completed:</b> "
 msgstr "<b>Úkol splněn:</b>"
 
-#: calendar/gui/e-itip-control.c:833
+#: calendar/gui/e-itip-control.c:863
 msgid "<b>Due:</b> "
 msgstr "<b>Splnění:</b>"
 
-#: calendar/gui/e-itip-control.c:870 calendar/gui/e-itip-control.c:923
+#: calendar/gui/e-itip-control.c:900 calendar/gui/e-itip-control.c:953
 msgid "iCalendar Information"
 msgstr "Informace iCalendar"
 
 #. Title
-#: calendar/gui/e-itip-control.c:885
+#: calendar/gui/e-itip-control.c:915
 msgid "iCalendar Error"
 msgstr "Chyba iCalendar"
 
-#: calendar/gui/e-itip-control.c:954 calendar/gui/e-itip-control.c:970
-#: calendar/gui/e-itip-control.c:981 calendar/gui/e-itip-control.c:998
+#: calendar/gui/e-itip-control.c:984 calendar/gui/e-itip-control.c:1000
+#: calendar/gui/e-itip-control.c:1011 calendar/gui/e-itip-control.c:1028
 msgid "An unknown person"
 msgstr "Neznámá osoba"
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:1005
+#: calendar/gui/e-itip-control.c:1035
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
@@ -5578,332 +5542,338 @@ msgstr ""
 "Prohlédněte si, prosím, následující informaci a poté vyberte akci z uvedené "
 "nabídky"
 
-#: calendar/gui/e-itip-control.c:1020
+#: calendar/gui/e-itip-control.c:1050
 msgid "<i>None</i>"
 msgstr "<i>Žádná</i>"
 
-#: calendar/gui/e-itip-control.c:1031
+#: calendar/gui/e-itip-control.c:1061
 msgid "Location:"
 msgstr "Místo:"
 
-#. write status
-#: calendar/gui/e-itip-control.c:1045 calendar/gui/e-tasks.c:243
+#: calendar/gui/e-itip-control.c:1075
 msgid "Status:"
 msgstr "Stav"
 
-#: calendar/gui/e-itip-control.c:1050 calendar/gui/itip-utils.c:414
+#: calendar/gui/e-itip-control.c:1080 calendar/gui/e-meeting-model.c:286
+#: calendar/gui/e-meeting-model.c:309 calendar/gui/e-meeting-model.c:798
+#: calendar/gui/itip-utils.c:414
 msgid "Accepted"
 msgstr "Akceptováno"
 
-#: calendar/gui/e-itip-control.c:1054 calendar/gui/itip-utils.c:417
+#: calendar/gui/e-itip-control.c:1084 calendar/gui/itip-utils.c:417
 msgid "Tentatively Accepted"
 msgstr "Předběžně akceptováno"
 
-#: calendar/gui/e-itip-control.c:1058 calendar/gui/itip-utils.c:420
-#: calendar/gui/itip-utils.c:446
+#: calendar/gui/e-itip-control.c:1088 calendar/gui/e-meeting-model.c:288
+#: calendar/gui/e-meeting-model.c:311 calendar/gui/e-meeting-model.c:799
+#: calendar/gui/itip-utils.c:420 calendar/gui/itip-utils.c:446
 msgid "Declined"
 msgstr "Zamítnuto"
 
-#: calendar/gui/e-itip-control.c:1117 calendar/gui/e-itip-control.c:1145
-#: calendar/gui/e-itip-control.c:1171 calendar/gui/e-itip-control.c:1184
-#: calendar/gui/e-itip-control.c:1197 calendar/gui/e-itip-control.c:1210
+#: calendar/gui/e-itip-control.c:1092 calendar/gui/e-itip-control.c:1300
+#: calendar/gui/e-meeting-model.c:222 calendar/gui/e-meeting-model.c:257
+#: calendar/gui/e-meeting-model.c:322 calendar/gui/e-meeting-model.c:756
+#: calendar/gui/e-meeting-model.c:772 camel/camel-gpg-context.c:1574
+#: camel/camel-gpg-context.c:1625 camel/camel-tcp-stream-openssl.c:634
+#: camel/providers/smtp/camel-smtp-transport.c:173
+#: camel/providers/smtp/camel-smtp-transport.c:228 mail/folder-browser.c:345
+#: mail/mail-display.c:953 widgets/misc/e-charset-picker.c:60
+msgid "Unknown"
+msgstr "Neznámá"
+
+#: calendar/gui/e-itip-control.c:1147 calendar/gui/e-itip-control.c:1175
+#: calendar/gui/e-itip-control.c:1201 calendar/gui/e-itip-control.c:1214
+#: calendar/gui/e-itip-control.c:1227 calendar/gui/e-itip-control.c:1240
 msgid "Choose an action:"
 msgstr "Vybrat akci:"
 
-#: calendar/gui/e-itip-control.c:1118
+#: calendar/gui/e-itip-control.c:1148
 msgid "Update"
 msgstr "Zaktualizovat"
 
-#: calendar/gui/e-itip-control.c:1119 calendar/gui/e-itip-control.c:1150
-#: calendar/gui/e-itip-control.c:1173 calendar/gui/e-itip-control.c:1186
-#: calendar/gui/e-itip-control.c:1199 calendar/gui/e-itip-control.c:1212
+#: calendar/gui/e-itip-control.c:1149 calendar/gui/e-itip-control.c:1180
+#: calendar/gui/e-itip-control.c:1203 calendar/gui/e-itip-control.c:1216
+#: calendar/gui/e-itip-control.c:1229 calendar/gui/e-itip-control.c:1242
 #: shell/e-shell.c:2067 widgets/misc/e-cell-date-edit.c:265
 msgid "OK"
 msgstr "OK"
 
-#: calendar/gui/e-itip-control.c:1146
+#: calendar/gui/e-itip-control.c:1176
 msgid "Accept"
 msgstr "Akceptovat"
 
-#: calendar/gui/e-itip-control.c:1147
+#: calendar/gui/e-itip-control.c:1177
 msgid "Tentatively accept"
 msgstr "Předběžně akceptovat"
 
-#: calendar/gui/e-itip-control.c:1148
+#: calendar/gui/e-itip-control.c:1178
 msgid "Decline"
 msgstr "Odmítnout"
 
-#: calendar/gui/e-itip-control.c:1149
-#: calendar/gui/e-meeting-time-sel.etspec.h:8
-msgid "RSVP"
-msgstr "RSVP"
-
-#: calendar/gui/e-itip-control.c:1172
+#: calendar/gui/e-itip-control.c:1202
 msgid "Send Free/Busy Information"
 msgstr "Poslat informaci o volném/obsazeném čase"
 
-#: calendar/gui/e-itip-control.c:1185
+#: calendar/gui/e-itip-control.c:1215
 msgid "Update respondent status"
 msgstr "Aktualizovat stav respondenta"
 
-#: calendar/gui/e-itip-control.c:1198
+#: calendar/gui/e-itip-control.c:1228
 msgid "Send Latest Information"
 msgstr "Poslat nejnovější informace"
 
-#: calendar/gui/e-itip-control.c:1211 calendar/gui/itip-utils.c:434
-#: mail/mail-send-recv.c:388 mail/mail-send-recv.c:440
-#: shell/e-shell-startup-wizard.c:781 shell/evolution-shell-component.c:1185
-#: ui/evolution-mail-global.xml.h:1
+#: calendar/gui/e-itip-control.c:1241 calendar/gui/itip-utils.c:434
+#: mail/mail-send-recv.c:387 mail/mail-send-recv.c:444
+#: shell/evolution-shell-component.c:1182 ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Zrušit"
 
-#: calendar/gui/e-itip-control.c:1300
+#: calendar/gui/e-itip-control.c:1322
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "<b>%s</b> zveřejnil(-a) informaci o schůzce."
 
-#: calendar/gui/e-itip-control.c:1301
+#: calendar/gui/e-itip-control.c:1323
 msgid "Meeting Information"
 msgstr "Informace o schůzce"
 
-#: calendar/gui/e-itip-control.c:1306
+#: calendar/gui/e-itip-control.c:1328
 #, c-format
 msgid "<b>%s</b> requests the presence of %s at a meeting."
 msgstr "<b>%s</b> požaduje účast %s na schůzce."
 
-#: calendar/gui/e-itip-control.c:1308
+#: calendar/gui/e-itip-control.c:1330
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr "<b>%s</b> požaduje vaši účast na schůzce."
 
-#: calendar/gui/e-itip-control.c:1309
+#: calendar/gui/e-itip-control.c:1331
 msgid "Meeting Proposal"
 msgstr "Návrh na schůzku"
 
-#: calendar/gui/e-itip-control.c:1313
+#: calendar/gui/e-itip-control.c:1335
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr "<b>%s</b> si přeje být přidán(-a) na existující schůzku."
 
-#: calendar/gui/e-itip-control.c:1314
+#: calendar/gui/e-itip-control.c:1336
 msgid "Meeting Update"
 msgstr "Aktualizace schůzky"
 
-#: calendar/gui/e-itip-control.c:1318
+#: calendar/gui/e-itip-control.c:1340
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr "<b>%s</b> si přeje obdržet nejnovější informaci o schůzce."
 
-#: calendar/gui/e-itip-control.c:1319
+#: calendar/gui/e-itip-control.c:1341
 msgid "Meeting Update Request"
 msgstr "Požadavek na aktualizaci schůzky"
 
-#: calendar/gui/e-itip-control.c:1326
+#: calendar/gui/e-itip-control.c:1348
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr "<b>%s</b> odpověděl(-a) na žádost o schůzku."
 
-#: calendar/gui/e-itip-control.c:1327
+#: calendar/gui/e-itip-control.c:1349
 msgid "Meeting Reply"
 msgstr "Odpověď pro schůzku"
 
-#: calendar/gui/e-itip-control.c:1334
+#: calendar/gui/e-itip-control.c:1356
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr "<b>%s</b> zrušil(-a) schůzku."
 
-#: calendar/gui/e-itip-control.c:1335
+#: calendar/gui/e-itip-control.c:1357
 msgid "Meeting Cancellation"
 msgstr "Zrušení schůzky"
 
-#: calendar/gui/e-itip-control.c:1342 calendar/gui/e-itip-control.c:1409
-#: calendar/gui/e-itip-control.c:1444
+#: calendar/gui/e-itip-control.c:1364 calendar/gui/e-itip-control.c:1431
+#: calendar/gui/e-itip-control.c:1466
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr "<b>%s</b> poslal(-a) nesrozumitelnou zprávu."
 
-#: calendar/gui/e-itip-control.c:1343
+#: calendar/gui/e-itip-control.c:1365
 msgid "Bad Meeting Message"
 msgstr "Neplatná zpráva o schůzce"
 
-#: calendar/gui/e-itip-control.c:1367
+#: calendar/gui/e-itip-control.c:1389
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr "<b>%s</b> zveřejnil(-a) informaci o úkolu."
 
-#: calendar/gui/e-itip-control.c:1368
+#: calendar/gui/e-itip-control.c:1390
 msgid "Task Information"
 msgstr "Informace o úkolu"
 
-#: calendar/gui/e-itip-control.c:1373
+#: calendar/gui/e-itip-control.c:1395
 #, c-format
 msgid "<b>%s</b> requests %s to perform a task."
 msgstr "<b>%s</b> žádá %s o vypracování úkolu."
 
-#: calendar/gui/e-itip-control.c:1375
+#: calendar/gui/e-itip-control.c:1397
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr "<b>%s</b> vás žádá, abyste vypracovali úkol."
 
-#: calendar/gui/e-itip-control.c:1376
+#: calendar/gui/e-itip-control.c:1398
 msgid "Task Proposal"
 msgstr "Návrh úkolu"
 
-#: calendar/gui/e-itip-control.c:1380
+#: calendar/gui/e-itip-control.c:1402
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task."
 msgstr "<b>%s</b> si přeje být přidán(-a) k existujícímu úkolu."
 
-#: calendar/gui/e-itip-control.c:1381
+#: calendar/gui/e-itip-control.c:1403
 msgid "Task Update"
 msgstr "Aktualizovat úkol"
 
-#: calendar/gui/e-itip-control.c:1385
+#: calendar/gui/e-itip-control.c:1407
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr "<b>%s</b> si přeje získat nejnovější informace o úkolu."
 
-#: calendar/gui/e-itip-control.c:1386
+#: calendar/gui/e-itip-control.c:1408
 msgid "Task Update Request"
 msgstr "Požadavek na aktualizaci úkolu."
 
-#: calendar/gui/e-itip-control.c:1393
+#: calendar/gui/e-itip-control.c:1415
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr "<b>%s</b> odpověděl(-a) na přiřazení úkolu."
 
-#: calendar/gui/e-itip-control.c:1394
+#: calendar/gui/e-itip-control.c:1416
 msgid "Task Reply"
 msgstr "Odpověď pro úkol"
 
-#: calendar/gui/e-itip-control.c:1401
+#: calendar/gui/e-itip-control.c:1423
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr "<b>%s</b> zrušil(-a) úkol."
 
-#: calendar/gui/e-itip-control.c:1402
+#: calendar/gui/e-itip-control.c:1424
 msgid "Task Cancellation"
 msgstr "Zrušení úkolu"
 
-#: calendar/gui/e-itip-control.c:1410
+#: calendar/gui/e-itip-control.c:1432
 msgid "Bad Task Message"
 msgstr "Zpráva o špatném úkolu"
 
-#: calendar/gui/e-itip-control.c:1429
+#: calendar/gui/e-itip-control.c:1451
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr "<b>%s</b> zveřejnil(-a) informaci o volném/obsazeném čase."
 
-#: calendar/gui/e-itip-control.c:1430
+#: calendar/gui/e-itip-control.c:1452
 msgid "Free/Busy Information"
 msgstr "Informace o volném/obsazeném čase"
 
-#: calendar/gui/e-itip-control.c:1434
+#: calendar/gui/e-itip-control.c:1456
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr "<b>%s</b> požaduje vaše informace o volném/obsazeném čase."
 
-#: calendar/gui/e-itip-control.c:1435
+#: calendar/gui/e-itip-control.c:1457
 msgid "Free/Busy Request"
 msgstr "Požadavek na informace o volném/obsazeném čase"
 
-#: calendar/gui/e-itip-control.c:1439
+#: calendar/gui/e-itip-control.c:1461
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr ""
 "<b>%s</b> odpověděl(-a) na požadavek na informace o volném/obsazeném čase."
 
-#: calendar/gui/e-itip-control.c:1440
+#: calendar/gui/e-itip-control.c:1462
 msgid "Free/Busy Reply"
 msgstr "Odpověď s informací o volném/zaneprázdněném čase"
 
-#: calendar/gui/e-itip-control.c:1445
+#: calendar/gui/e-itip-control.c:1467
 msgid "Bad Free/Busy Message"
 msgstr "Neplatná zpráva o volném/zaneprázdněném čase"
 
-#: calendar/gui/e-itip-control.c:1521
+#: calendar/gui/e-itip-control.c:1543
 msgid "The message does not appear to be properly formed"
 msgstr "Zdá se, že zpráva nebyla správně vytvořena."
 
-#: calendar/gui/e-itip-control.c:1584
+#: calendar/gui/e-itip-control.c:1606
 msgid "The message contains only unsupported requests."
 msgstr "Zpráva obsahuje pouze nepodporované požadavky."
 
-#: calendar/gui/e-itip-control.c:1615 calendar/gui/e-itip-control.c:1621
+#: calendar/gui/e-itip-control.c:1637 calendar/gui/e-itip-control.c:1643
 msgid "The attachment does not contain a valid calendar message"
 msgstr "Příloha neobsahuje platnou zprávu kalendáře"
 
-#: calendar/gui/e-itip-control.c:1646
+#: calendar/gui/e-itip-control.c:1668
 msgid "The attachment has no viewable calendar items"
 msgstr "Příloha nemá žádné zobrazitelné položky kalendáře"
 
-#: calendar/gui/e-itip-control.c:1887 calendar/gui/e-itip-control.c:1948
-#: calendar/gui/e-itip-control.c:1986
+#: calendar/gui/e-itip-control.c:1909 calendar/gui/e-itip-control.c:2001
 msgid "Object is invalid and cannot be updated\n"
 msgstr "Objekt není platný a není možné jej aktualizovat\n"
 
-#: calendar/gui/e-itip-control.c:1890 calendar/gui/e-itip-control.c:1989
+#: calendar/gui/e-itip-control.c:1912 calendar/gui/e-itip-control.c:2004
 msgid "There was an error on the CORBA system\n"
 msgstr "Nastala chyba v systému CORBA\n"
 
-#: calendar/gui/e-itip-control.c:1893 calendar/gui/e-itip-control.c:1992
+#: calendar/gui/e-itip-control.c:1915 calendar/gui/e-itip-control.c:2007
 msgid "Object could not be found\n"
 msgstr "Objekt nelze nalézt\n"
 
-#: calendar/gui/e-itip-control.c:1896
+#: calendar/gui/e-itip-control.c:1918
 msgid "You do not have the right permissions to update the calendar\n"
 msgstr "Nemáte příslušná práva pro aktualizaci kalendáře\n"
 
-#: calendar/gui/e-itip-control.c:1899
+#: calendar/gui/e-itip-control.c:1921
 msgid "Update complete\n"
 msgstr "Aktualizace dokončena\n"
 
-#: calendar/gui/e-itip-control.c:1902
+#: calendar/gui/e-itip-control.c:1924
 msgid "Calendar file could not be updated!\n"
 msgstr "Soubor kalendáře nemůže být aktualizován!\n"
 
-#: calendar/gui/e-itip-control.c:1932 calendar/gui/e-itip-control.c:2004
+#: calendar/gui/e-itip-control.c:1953 calendar/gui/e-itip-control.c:2019
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr "Stav účastníka není možné aktualizovat, protože položka již neexistuje"
 
-#: calendar/gui/e-itip-control.c:1958
+#: calendar/gui/e-itip-control.c:1974
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr "Tato reakce není od stávajícího účastníka. Přidat jako účastníka?"
 
-#: calendar/gui/e-itip-control.c:1970
+#: calendar/gui/e-itip-control.c:1986
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr ""
 "Stav účastníka není možné aktualizovat, protože jeho stav není platný!\n"
 
-#: calendar/gui/e-itip-control.c:1995
+#: calendar/gui/e-itip-control.c:2010
 msgid "You don't have the right permissions to update the calendar\n"
 msgstr "Nemáte příslušná práva pro aktualizaci kalendáře\n"
 
-#: calendar/gui/e-itip-control.c:1998
+#: calendar/gui/e-itip-control.c:2013
 msgid "Attendee status updated\n"
 msgstr "Stav účastníka byl zaktualizován\n"
 
-#: calendar/gui/e-itip-control.c:2001
+#: calendar/gui/e-itip-control.c:2016
 msgid "Attendee status could not be updated!\n"
 msgstr "Stav účastníka nelze aktualizovat!\n"
 
-#: calendar/gui/e-itip-control.c:2038
+#: calendar/gui/e-itip-control.c:2053
 msgid "Removal Complete"
 msgstr "Odstranění dokončeno"
 
-#: calendar/gui/e-itip-control.c:2070 calendar/gui/e-itip-control.c:2120
+#: calendar/gui/e-itip-control.c:2085 calendar/gui/e-itip-control.c:2135
 msgid "Item sent!\n"
 msgstr "Položka odeslána!\n"
 
-#: calendar/gui/e-itip-control.c:2072 calendar/gui/e-itip-control.c:2124
+#: calendar/gui/e-itip-control.c:2087 calendar/gui/e-itip-control.c:2139
 msgid "The item could not be sent!\n"
 msgstr "Položka nemůže být odeslána!\n"
 
-#: calendar/gui/e-itip-control.c:2215
+#: calendar/gui/e-itip-control.c:2212
 msgid "Select Calendar Folder"
 msgstr "Vybrat složku kalendář"
 
-#: calendar/gui/e-itip-control.c:2221
+#: calendar/gui/e-itip-control.c:2219
 msgid "Select Tasks Folder"
 msgstr "Vybrat složku úkoly"
 
@@ -5944,167 +5914,185 @@ msgstr "datum ukončení"
 msgid "date-start"
 msgstr "datum začátku"
 
-#: calendar/gui/e-meeting-time-sel.c:392
+#: calendar/gui/e-meeting-model.c:79
+msgid "Chair Persons"
+msgstr "Předsedové"
+
+#: calendar/gui/e-meeting-model.c:80 calendar/gui/e-meeting-model.c:1636
+msgid "Required Participants"
+msgstr "Vyžadovaní účastníci"
+
+#: calendar/gui/e-meeting-model.c:81
+msgid "Optional Participants"
+msgstr "Nepovinní účastníci"
+
+#: calendar/gui/e-meeting-model.c:82
+msgid "Resources"
+msgstr "Zdroje"
+
+#: calendar/gui/e-meeting-model.c:197 calendar/gui/e-meeting-model.c:214
+#: calendar/gui/e-meeting-model.c:530 calendar/gui/e-meeting-model.c:752
+msgid "Individual"
+msgstr "Individuálně"
+
+#: calendar/gui/e-meeting-model.c:199 calendar/gui/e-meeting-model.c:216
+#: calendar/gui/e-meeting-model.c:753
+msgid "Group"
+msgstr "Skupina"
+
+#: calendar/gui/e-meeting-model.c:201 calendar/gui/e-meeting-model.c:218
+#: calendar/gui/e-meeting-model.c:754
+msgid "Resource"
+msgstr "Zdroj"
+
+#: calendar/gui/e-meeting-model.c:203 calendar/gui/e-meeting-model.c:220
+#: calendar/gui/e-meeting-model.c:755
+msgid "Room"
+msgstr "Místnost"
+
+#: calendar/gui/e-meeting-model.c:232 calendar/gui/e-meeting-model.c:249
+#: calendar/gui/e-meeting-model.c:768
+msgid "Chair"
+msgstr "Předseda"
+
+#: calendar/gui/e-meeting-model.c:234 calendar/gui/e-meeting-model.c:251
+#: calendar/gui/e-meeting-model.c:532 calendar/gui/e-meeting-model.c:769
+msgid "Required Participant"
+msgstr "Vyžadovaný účastník"
+
+#: calendar/gui/e-meeting-model.c:236 calendar/gui/e-meeting-model.c:253
+#: calendar/gui/e-meeting-model.c:770
+msgid "Optional Participant"
+msgstr "Nepovinný účastník"
+
+#: calendar/gui/e-meeting-model.c:238 calendar/gui/e-meeting-model.c:255
+#: calendar/gui/e-meeting-model.c:771
+msgid "Non-Participant"
+msgstr "Bez účasti"
+
+#: calendar/gui/e-meeting-model.c:284 calendar/gui/e-meeting-model.c:307
+#: calendar/gui/e-meeting-model.c:540 calendar/gui/e-meeting-model.c:797
+msgid "Needs Action"
+msgstr "Potřebné akce"
+
+#: calendar/gui/e-meeting-model.c:290 calendar/gui/e-meeting-model.c:313
+#: calendar/gui/e-meeting-model.c:800 calendar/gui/e-meeting-time-sel.c:405
 msgid "Tentative"
 msgstr "Předběžný"
 
-#: calendar/gui/e-meeting-time-sel.c:394 designs/OOA/ooa.glade.h:11
+#: calendar/gui/e-meeting-model.c:292 calendar/gui/e-meeting-model.c:315
+#: calendar/gui/e-meeting-model.c:801
+msgid "Delegated"
+msgstr "Delegováno"
+
+#: calendar/gui/e-meeting-model.c:296 calendar/gui/e-meeting-model.c:319
+msgid "In Process"
+msgstr "Probíhá"
+
+#. This is a strftime() format string %A = full weekday name,
+#. %B = full month name, %d = month day, %Y = full year.
+#: calendar/gui/e-meeting-time-sel-item.c:458
+#: calendar/gui/e-meeting-time-sel.c:2098
+msgid "%A, %B %d, %Y"
+msgstr "%A, %B %d, %Y"
+
+#. This is a strftime() format string %a = abbreviated weekday
+#. name, %m = month number, %d = month day, %Y = full year.
+#: calendar/gui/e-meeting-time-sel-item.c:462
+#: calendar/gui/e-meeting-time-sel.c:2131 e-util/e-time-utils.c:190
+#: e-util/e-time-utils.c:283 e-util/e-time-utils.c:371
+msgid "%a %m/%d/%Y"
+msgstr "%a %d/%m/%Y"
+
+#. This is a strftime() format string %m = month number,
+#. %d = month day, %Y = full year.
+#: calendar/gui/e-meeting-time-sel-item.c:466 e-util/e-time-utils.c:225
+#: e-util/e-time-utils.c:286 widgets/misc/e-dateedit.c:1582
+msgid "%m/%d/%Y"
+msgstr "%d/%m/%Y"
+
+#: calendar/gui/e-meeting-time-sel.c:407 designs/OOA/ooa.glade.h:11
 msgid "Out of Office"
 msgstr "Mimo kancelář"
 
-#: calendar/gui/e-meeting-time-sel.c:395
+#: calendar/gui/e-meeting-time-sel.c:408
 msgid "No Information"
 msgstr "(Není informace)"
 
-#: calendar/gui/e-meeting-time-sel.c:434
+#: calendar/gui/e-meeting-time-sel.c:447
 msgid "_Options"
 msgstr "_Volby"
 
-#: calendar/gui/e-meeting-time-sel.c:451
+#: calendar/gui/e-meeting-time-sel.c:464
 msgid "Show _Only Working Hours"
 msgstr "Ukázat pouze _pracovní hodiny"
 
-#: calendar/gui/e-meeting-time-sel.c:461
+#: calendar/gui/e-meeting-time-sel.c:474
 msgid "Show _Zoomed Out"
 msgstr "Ukázat _méně podrobně"
 
-#: calendar/gui/e-meeting-time-sel.c:476
+#: calendar/gui/e-meeting-time-sel.c:489
 msgid "_Update Free/Busy"
 msgstr "_Aktualizovat volný/obsazený čas"
 
-#: calendar/gui/e-meeting-time-sel.c:491
+#: calendar/gui/e-meeting-time-sel.c:504
 msgid "_<<"
 msgstr "_<<"
 
-#: calendar/gui/e-meeting-time-sel.c:509
+#: calendar/gui/e-meeting-time-sel.c:522
 msgid "_Autopick"
 msgstr "_Automatický výběr"
 
-#: calendar/gui/e-meeting-time-sel.c:524
+#: calendar/gui/e-meeting-time-sel.c:537
 msgid ">_>"
 msgstr ">_>"
 
-#: calendar/gui/e-meeting-time-sel.c:541
+#: calendar/gui/e-meeting-time-sel.c:554
 msgid "_All People and Resources"
 msgstr "_Všichni lidé a zdroje"
 
-#: calendar/gui/e-meeting-time-sel.c:550
+#: calendar/gui/e-meeting-time-sel.c:563
 msgid "All _People and One Resource"
 msgstr "Všichni _lidé a jeden zdroj"
 
-#: calendar/gui/e-meeting-time-sel.c:559
+#: calendar/gui/e-meeting-time-sel.c:572
 msgid "_Required People"
 msgstr "_Nezbytní lidé"
 
-#: calendar/gui/e-meeting-time-sel.c:568
+#: calendar/gui/e-meeting-time-sel.c:581
 msgid "Required People and _One Resource"
 msgstr "Nezbytní lidé a _jeden zdroj"
 
-#: calendar/gui/e-meeting-time-sel.c:587
+#: calendar/gui/e-meeting-time-sel.c:600
 msgid "Meeting _start time:"
 msgstr "_Začátek schůzky:"
 
-#: calendar/gui/e-meeting-time-sel.c:607
+#: calendar/gui/e-meeting-time-sel.c:620
 msgid "Meeting _end time:"
 msgstr "_Konec schůzky:"
 
-#. This is a strftime() format string %A = full weekday name,
-#. %B = full month name, %d = month day, %Y = full year.
-#: calendar/gui/e-meeting-time-sel.c:2054
-#: calendar/gui/e-meeting-time-sel-item.c:452
-msgid "%A, %B %d, %Y"
-msgstr "%A, %B %d, %Y"
-
-#. This is a strftime() format string %a = abbreviated weekday name,
-#. %m = month number, %d = month day, %Y = full year.
-#: calendar/gui/e-meeting-time-sel.c:2087
-#: calendar/gui/e-meeting-time-sel-item.c:456 e-util/e-time-utils.c:203
-#: e-util/e-time-utils.c:296 e-util/e-time-utils.c:384
-msgid "%a %m/%d/%Y"
-msgstr "%a %d/%m/%Y"
-
-#: calendar/gui/e-meeting-time-sel.etspec.h:1
-msgid "Attendee"
-msgstr "Účastník"
-
-#: calendar/gui/e-meeting-time-sel.etspec.h:2
-msgid "Click here to add an attendee"
-msgstr "Účastníka přidáte kliknutím zde"
-
-#: calendar/gui/e-meeting-time-sel.etspec.h:3
-msgid "Common Name"
-msgstr "Společné jméno"
-
-#: calendar/gui/e-meeting-time-sel.etspec.h:4
-msgid "Delegated From"
-msgstr "Postoupeno kým"
-
-#: calendar/gui/e-meeting-time-sel.etspec.h:5
-msgid "Delegated To"
-msgstr "Postoupeno komu"
-
-#: calendar/gui/e-meeting-time-sel.etspec.h:6
-msgid "Language"
-msgstr "Jazyk"
-
-#: calendar/gui/e-meeting-time-sel.etspec.h:7
-msgid "Member"
-msgstr "Člen"
-
-#. This is a strftime() format string %m = month number,
-#. %d = month day, %Y = full year.
-#: calendar/gui/e-meeting-time-sel-item.c:460 e-util/e-time-utils.c:238
-#: e-util/e-time-utils.c:299 widgets/misc/e-dateedit.c:1607
-msgid "%m/%d/%Y"
-msgstr "%d/%m/%Y"
-
-#: calendar/gui/e-tasks.c:151
-msgid "invalid time"
-msgstr "neplatný čas"
-
-#: calendar/gui/e-tasks.c:221
-#, fuzzy
-msgid "Start Date:"
-msgstr "_Začátek:"
-
-#: calendar/gui/e-tasks.c:237
-#, fuzzy
-msgid "Due Date:"
-msgstr "_Termín dokončení:"
-
-#. write priority
-#: calendar/gui/e-tasks.c:265
-#, fuzzy
-msgid "Priority:"
-msgstr "_Naléhavost:"
-
-#. URL
-#: calendar/gui/e-tasks.c:321
-#, fuzzy
-msgid "Web Page:"
-msgstr "Stránka"
-
-#: calendar/gui/e-tasks.c:702
+#: calendar/gui/e-tasks.c:360 calendar/gui/gnome-cal.c:2006
+#: calendar/gui/gnome-cal.c:2017
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Otevírám úkoly na %s"
 
-#: calendar/gui/e-tasks.c:731 calendar/gui/tasks-control.c:201
+#: calendar/gui/e-tasks.c:389 calendar/gui/tasks-control.c:201
 #, c-format
 msgid "Could not load the tasks in `%s'"
 msgstr "Nepodařilo se načíst úkoly v `%s'"
 
-#: calendar/gui/e-tasks.c:746
+#: calendar/gui/e-tasks.c:404
 #, c-format
 msgid "The method required to load `%s' is not supported"
 msgstr "Metoda potřebná pro načtení `%s' není podporována"
 
-#: calendar/gui/e-tasks.c:760 calendar/gui/gnome-cal.c:1730
+#: calendar/gui/e-tasks.c:418 calendar/gui/gnome-cal.c:1509
 #, c-format
 msgid "You don't have permission to open the folder in `%s'"
 msgstr "Nemáte práva k otevření adresáře v `%s'"
 
-#: calendar/gui/e-tasks.c:828 calendar/gui/gnome-cal.c:1944
+#: calendar/gui/e-tasks.c:486 calendar/gui/gnome-cal.c:1728
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -6113,110 +6101,68 @@ msgstr ""
 "Chyba na %s:\n"
 " %s"
 
-#: calendar/gui/e-tasks.c:899
+#: calendar/gui/e-tasks.c:557
 msgid "Completing tasks..."
 msgstr "Dokončuji úkoly..."
 
-#: calendar/gui/e-tasks.c:922
+#: calendar/gui/e-tasks.c:580
 msgid "Deleting selected objects..."
 msgstr "Mažu vybrané objekty..."
 
-#: calendar/gui/e-tasks.c:1017
+#: calendar/gui/e-tasks.c:675
 msgid "Expunging"
 msgstr "Čistí se"
 
-#: calendar/gui/gnome-cal.c:1702
+#: calendar/gui/e-week-view.c:3581
+msgid "New _Appointment..."
+msgstr "Nová _událost..."
+
+#: calendar/gui/gnome-cal.c:1481
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr "Nelze otevřít složku v `%s'"
 
-#: calendar/gui/gnome-cal.c:1716
+#: calendar/gui/gnome-cal.c:1495
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr "Metoda vyžadovaná k otevřeni `%s' není podporována"
 
-#: calendar/gui/gnome-cal.c:1772
+#: calendar/gui/gnome-cal.c:1556
 #, c-format
 msgid "Adding alarms for %s"
 msgstr "Přidávají se alarmy pro %s"
 
-#: calendar/gui/gnome-cal.c:1964
+#: calendar/gui/gnome-cal.c:1748
 #, c-format
 msgid ""
-"The task backend for\n"
+"The calendar backend for\n"
 "%s\n"
 " has crashed. You will have to restart Evolution in order to use it again"
 msgstr ""
-"Obsluha úlohy pro\n"
+"Obsluha kalendáře pro\n"
 "%s\n"
-"havarovala. Chcete-li ji znovu použít, musíte znovu spustit Evolution"
+"havarovala. Chcete-li jej znovu použít, musíte znovu spustit Evolution"
 
-#: calendar/gui/gnome-cal.c:1970
+#: calendar/gui/gnome-cal.c:1757
 #, c-format
 msgid ""
-"The calendar backend for\n"
+"The task backend for\n"
 "%s\n"
 " has crashed. You will have to restart Evolution in order to use it again"
 msgstr ""
-"Obsluha kalendáře pro\n"
+"Obsluha úlohy pro\n"
 "%s\n"
-"havarovala. Chcete-li jej znovu použít, musíte znovu spustit Evolution"
+"havarovala. Chcete-li ji znovu použít, musíte znovu spustit Evolution"
 
-#: calendar/gui/gnome-cal.c:2176
+#: calendar/gui/gnome-cal.c:1988
 #, c-format
 msgid "Opening calendar at %s"
 msgstr "Otevírám kalendář na %s"
 
-#: calendar/gui/gnome-cal.c:2197
+#: calendar/gui/gnome-cal.c:2028
 msgid "Opening default tasks folder"
 msgstr "Otevírám výchozí složku úkolů"
 
-#: calendar/gui/gnome-cal.c:3094
-#, fuzzy, c-format
-msgid "Purging event %s"
-msgstr "Zkouší se %s"
-
-#: calendar/gui/gnome-cal.c:3178
-#, fuzzy
-msgid "Purging"
-msgstr "Turín"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-msgid "Calendar and Tasks"
-msgstr "Kalendář a úkoly"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-msgid "Configure your timezone, Calendar and Task List here "
-msgstr "Nastavení vaší časové zóny, Kalendáře a Seznamu úloh"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
-msgid "Evolution Calendar and Tasks"
-msgstr "Evolution Kalendář a úkoly"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
-msgid "Evolution Calendar and Tasks component"
-msgstr "Komponenta Kalendář a úkoly Evolution."
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
-msgid "Evolution Calendar configuration control"
-msgstr "Ovládací prvek nastavení kalendáře Evolution"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
-msgid "Evolution Calendar scheduling message viewer"
-msgstr "Prohlížeč naplánovaných zpráv kalendáře Evolution"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
-msgid "Evolution Calendar viewer"
-msgstr "Prohlížeč kalendáře Evolution"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
-msgid "Evolution Calendar/Task editor"
-msgstr "Editor kalendáře/úkolů Evolution"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
-msgid "Evolution Tasks viewer"
-msgstr "Prohlížeč úkolů Evolution"
-
 #: calendar/gui/goto-dialog.glade.h:1
 msgid "April"
 msgstr "duben"
@@ -6323,7 +6269,7 @@ msgstr "Informace o volném čase (%s do %s)"
 msgid "iCalendar information"
 msgstr "Informace iCalendar"
 
-#: calendar/gui/itip-utils.c:668
+#: calendar/gui/itip-utils.c:667
 msgid "You must be an attendee of the event."
 msgstr "Musíte být účastníkem události."
 
@@ -6356,81 +6302,82 @@ msgid "Sa"
 msgstr "So"
 
 #. Day
-#: calendar/gui/print.c:1882
+#: calendar/gui/print.c:1875
 msgid "Selected day (%a %b %d %Y)"
 msgstr "Vybraný den (%a, %b. %d %Y)"
 
-#: calendar/gui/print.c:1907 calendar/gui/print.c:1911
+#: calendar/gui/print.c:1900 calendar/gui/print.c:1904
 msgid "%a %b %d"
 msgstr "%a, %e. %b"
 
-#: calendar/gui/print.c:1908
+#: calendar/gui/print.c:1901
 msgid "%a %d %Y"
 msgstr "%a %d %Y"
 
-#: calendar/gui/print.c:1912 calendar/gui/print.c:1914
-#: calendar/gui/print.c:1915
+#: calendar/gui/print.c:1905 calendar/gui/print.c:1907
+#: calendar/gui/print.c:1908
 msgid "%a %b %d %Y"
 msgstr "%a %b %d %Y"
 
-#: calendar/gui/print.c:1919
+#: calendar/gui/print.c:1912
 #, c-format
 msgid "Selected week (%s - %s)"
 msgstr "Vybraný týden (%s - %s)"
 
 #. Month
-#: calendar/gui/print.c:1927
+#: calendar/gui/print.c:1920
 msgid "Selected month (%b %Y)"
 msgstr "Vybraný měsíc (%b %Y)"
 
 #. Year
-#: calendar/gui/print.c:1934
+#: calendar/gui/print.c:1927
 msgid "Selected year (%Y)"
 msgstr "Vybraný rok (%Y)"
 
-#: calendar/gui/print.c:2262
+#: calendar/gui/print.c:2255
 msgid "Task"
 msgstr "Úkol"
 
-#: calendar/gui/print.c:2321
+#: calendar/gui/print.c:2314
 #, c-format
 msgid "Status: %s"
 msgstr "Stav: %s"
 
-#: calendar/gui/print.c:2338
+#: calendar/gui/print.c:2331
 #, c-format
 msgid "Priority: %s"
 msgstr "Priorita: %s"
 
-#: calendar/gui/print.c:2350
+#: calendar/gui/print.c:2343
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "Dokončeno procent: %i"
 
-#: calendar/gui/print.c:2362
+#: calendar/gui/print.c:2355
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: calendar/gui/print.c:2376
+#: calendar/gui/print.c:2369
 #, c-format
 msgid "Categories: %s"
 msgstr "Kategorie: %s"
 
-#: calendar/gui/print.c:2387
+#: calendar/gui/print.c:2380
 msgid "Contacts: "
 msgstr "Kontakty: "
 
-#: calendar/gui/print.c:2525 calendar/gui/print.c:2611
-#: calendar/gui/tasks-control.c:564 my-evolution/e-summary.c:649
+#: calendar/gui/print.c:2518 calendar/gui/print.c:2604
+#: calendar/gui/tasks-control.c:581 mail/mail-callbacks.c:2948
+#: my-evolution/e-summary.c:649
 msgid "Print Preview"
 msgstr "Náhled před tiskem"
 
-#: calendar/gui/print.c:2559
+#: calendar/gui/print.c:2552
 msgid "Print Item"
 msgstr "Tisknout položku"
 
-#: calendar/gui/print.c:2632
+#: calendar/gui/print.c:2625
 msgid "Print Setup"
 msgstr "Tisknout nastavení"
 
@@ -6438,7 +6385,7 @@ msgstr "Tisknout nastavení"
 msgid "The URI of the tasks folder to display"
 msgstr "URI, které bude zobrazovat složku úkolů"
 
-#: calendar/gui/tasks-control.c:448
+#: calendar/gui/tasks-control.c:465
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
 "continue, you will not be able to recover these tasks.\n"
@@ -6450,11 +6397,11 @@ msgstr ""
 "\n"
 "Opravdu odstranit tyto úkoly?"
 
-#: calendar/gui/tasks-control.c:451
+#: calendar/gui/tasks-control.c:468
 msgid "Do not ask me again."
 msgstr "Příště se neptat."
 
-#: calendar/gui/tasks-control.c:593
+#: calendar/gui/tasks-control.c:610
 msgid "Print Tasks"
 msgstr "Tisknout úkoly"
 
@@ -8147,27 +8094,27 @@ msgstr "Tichý oceán/Wallis"
 msgid "Pacific/Yap"
 msgstr "Tichý oceán/Yap"
 
-#: camel/camel-cipher-context.c:167
+#: camel/camel-cipher-context.c:178
 msgid "Signing is not supported by this cipher"
 msgstr "Digitální podpis není podporován touto šifrou"
 
-#: camel/camel-cipher-context.c:207
+#: camel/camel-cipher-context.c:218
 msgid "Verifying is not supported by this cipher"
 msgstr "Ověření podpisu není podporováno touto šifrou"
 
-#: camel/camel-cipher-context.c:251
+#: camel/camel-cipher-context.c:262
 msgid "Encryption is not supported by this cipher"
 msgstr "Šifrovaní není podporováno touto šifrou"
 
-#: camel/camel-cipher-context.c:293
+#: camel/camel-cipher-context.c:304
 msgid "Decryption is not supported by this cipher"
 msgstr "Dešifrovaní není podporováno touto šifrou"
 
-#: camel/camel-cipher-context.c:331
+#: camel/camel-cipher-context.c:342
 msgid "You may not import keys with this cipher"
 msgstr "Nemůžete importovat klíče s touto šifrou"
 
-#: camel/camel-cipher-context.c:363
+#: camel/camel-cipher-context.c:374
 msgid "You may not export keys with this cipher"
 msgstr "Nemůžete exportovat klíče s touto šifrou"
 
@@ -8206,11 +8153,7 @@ msgstr ""
 msgid "Resynchronizing with server"
 msgstr "Obnovuji synchronizaci se serverem"
 
-#: camel/camel-disco-folder.c:90
-msgid "Downloading new messages for offline mode"
-msgstr ""
-
-#: camel/camel-disco-folder.c:351
+#: camel/camel-disco-folder.c:278
 #, c-format
 msgid "Preparing folder '%s' for offline"
 msgstr "Příprava složky '%s' pro práci při odpojení"
@@ -8231,57 +8174,57 @@ msgstr "Nepodařilo se vytvořit propojení ' %s': %s"
 msgid "Failed to create create child process '%s': %s"
 msgstr "Selhalo vytvoření procesu potomka '%s': %s"
 
-#: camel/camel-filter-driver.c:759
+#: camel/camel-filter-driver.c:744
 #, c-format
 msgid "Invalid message stream received from %s: %s"
 msgstr "Přijat neplatný proud zprávy od %s: %s"
 
-#: camel/camel-filter-driver.c:940 camel/camel-filter-driver.c:949
+#: camel/camel-filter-driver.c:923 camel/camel-filter-driver.c:932
 msgid "Syncing folders"
 msgstr "Synchronizuji složky"
 
-#: camel/camel-filter-driver.c:1038 camel/camel-filter-driver.c:1411
+#: camel/camel-filter-driver.c:1021 camel/camel-filter-driver.c:1394
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Chyba při zpracování filtru: %s: %s"
 
-#: camel/camel-filter-driver.c:1047 camel/camel-filter-driver.c:1417
+#: camel/camel-filter-driver.c:1030 camel/camel-filter-driver.c:1400
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Chyba při spuštění filtru: %s: %s"
 
-#: camel/camel-filter-driver.c:1114
+#: camel/camel-filter-driver.c:1097
 msgid "Unable to open spool folder"
 msgstr "Nelze otevřít adresář fronty"
 
-#: camel/camel-filter-driver.c:1123
+#: camel/camel-filter-driver.c:1106
 msgid "Unable to process spool folder"
 msgstr "Nelze zpracovat adresář fronty"
 
-#: camel/camel-filter-driver.c:1138
+#: camel/camel-filter-driver.c:1121
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "Stahuji zprávu %d (%d%%)"
 
-#: camel/camel-filter-driver.c:1142
+#: camel/camel-filter-driver.c:1125
 msgid "Cannot open message"
 msgstr "Nelze otevřít zprávu"
 
-#: camel/camel-filter-driver.c:1143 camel/camel-filter-driver.c:1155
+#: camel/camel-filter-driver.c:1126 camel/camel-filter-driver.c:1138
 #, c-format
 msgid "Failed on message %d"
 msgstr "Nepodařilo se stáhnout zprávu %d"
 
-#: camel/camel-filter-driver.c:1169 camel/camel-filter-driver.c:1263
+#: camel/camel-filter-driver.c:1152 camel/camel-filter-driver.c:1246
 msgid "Syncing folder"
 msgstr "Synchronizuji složku"
 
-#: camel/camel-filter-driver.c:1230
+#: camel/camel-filter-driver.c:1213
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "Stahuji zprávu %d z %d"
 
-#: camel/camel-filter-driver.c:1245
+#: camel/camel-filter-driver.c:1228
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "Nepodařilo se stáhnout zprávu %d z %d"
@@ -8303,35 +8246,7 @@ msgstr "Neplatné parametry pro (user-tag)"
 msgid "Error executing filter search: %s: %s"
 msgstr "Chyba při spuštění vyhledávání filtru: %s: %s"
 
-#: camel/camel-folder.c:585
-#, c-format
-msgid "Unsupported operation: append message: for %s"
-msgstr "Nepodporovaná operace: přidat zprávu: pro %s"
-
-#: camel/camel-folder.c:1163
-#, c-format
-msgid "Unsupported operation: search by expression: for %s"
-msgstr "Nepodporovaná operace: hledání výrazem: %s"
-
-#: camel/camel-folder.c:1203
-#, c-format
-msgid "Unsupported operation: search by uids: for %s"
-msgstr "Nepodporovaná operace: hledání pomocí uid: %s"
-
-#: camel/camel-folder.c:1321
-msgid "Moving messages"
-msgstr "Přesunuji zprávy"
-
-#: camel/camel-folder.c:1321
-msgid "Copying messages"
-msgstr "Kopíruji zprávy"
-
-#: camel/camel-folder.c:1571
-#, fuzzy
-msgid "Filtering new message(s)"
-msgstr "Získávají se zprávy (%d)"
-
-#: camel/camel-folder-search.c:348
+#: camel/camel-folder-search.c:346
 #, c-format
 msgid ""
 "Cannot parse search expression: %s:\n"
@@ -8340,7 +8255,7 @@ msgstr ""
 "Nelze zpracovat vyhledávací výraz: %s:\n"
 "%s"
 
-#: camel/camel-folder-search.c:358
+#: camel/camel-folder-search.c:356
 #, c-format
 msgid ""
 "Error executing search expression: %s:\n"
@@ -8349,15 +8264,38 @@ msgstr ""
 "Chyba při provádění vyhledávacího výrazu: %s:\n"
 "%s"
 
-#: camel/camel-folder-search.c:569 camel/camel-folder-search.c:598
+#: camel/camel-folder-search.c:573 camel/camel-folder-search.c:601
 msgid "(match-all) requires a single bool result"
 msgstr "(odpovídá všemu) vyžaduje jeden pravdivý výsledek"
 
-#: camel/camel-folder-search.c:650
+#: camel/camel-folder-search.c:653
 #, c-format
 msgid "Performing query on unknown header: %s"
 msgstr "Vykonání otázky na neznámé hlavičce: %s"
 
+#: camel/camel-folder.c:583
+#, c-format
+msgid "Unsupported operation: append message: for %s"
+msgstr "Nepodporovaná operace: přidat zprávu: pro %s"
+
+#: camel/camel-folder.c:1161
+#, c-format
+msgid "Unsupported operation: search by expression: for %s"
+msgstr "Nepodporovaná operace: hledání výrazem: %s"
+
+#: camel/camel-folder.c:1201
+#, c-format
+msgid "Unsupported operation: search by uids: for %s"
+msgstr "Nepodporovaná operace: hledání pomocí uid: %s"
+
+#: camel/camel-folder.c:1319
+msgid "Moving messages"
+msgstr "Přesunuji zprávy"
+
+#: camel/camel-folder.c:1319
+msgid "Copying messages"
+msgstr "Kopíruji zprávy"
+
 #: camel/camel-gpg-context.c:762
 #, c-format
 msgid ""
@@ -8388,7 +8326,7 @@ msgstr ""
 
 #: camel/camel-gpg-context.c:821 camel/camel-gpg-context.c:1297
 #: camel/camel-gpg-context.c:1403 camel/camel-gpg-context.c:1473
-#: camel/camel-gpg-context.c:1529 mail/mail-send-recv.c:574
+#: camel/camel-gpg-context.c:1529 mail/mail-send-recv.c:577
 msgid "Cancelled."
 msgstr "Zrušeno"
 
@@ -8443,6 +8381,26 @@ msgstr "Nepodařilo se provést gpg."
 msgid "Cannot verify message signature: could not create temp file: %s"
 msgstr "Nelze ověřit podpis zprávy: nelze vytvořit dočasný soubor: %s"
 
+#: camel/camel-lock-client.c:111
+#, c-format
+msgid "Cannot build locking helper pipe: %s"
+msgstr "Nelze vytvořit pomocné propojení pro zamykání: %s"
+
+#: camel/camel-lock-client.c:124
+#, c-format
+msgid "Cannot fork locking helper: %s"
+msgstr "Nelze spustit pomocný program pro zámek: %s"
+
+#: camel/camel-lock-client.c:202 camel/camel-lock-client.c:225
+#, c-format
+msgid "Could not lock '%s': protocol error with lock-helper"
+msgstr "Nelze zamknout '%s': chyba protokolu s lock-helper"
+
+#: camel/camel-lock-client.c:215
+#, c-format
+msgid "Could not lock '%s'"
+msgstr "Nelze zamknout '%s'"
+
 #: camel/camel-lock.c:92 camel/camel-lock.c:113
 #, c-format
 msgid "Could not create lock file for %s: %s"
@@ -8463,26 +8421,6 @@ msgstr "Nepodařilo se získat zámek pomocí fcntl(2): %s"
 msgid "Failed to get lock using flock(2): %s"
 msgstr "Nepodařilo se získat zámek pomocí flock(2): %s"
 
-#: camel/camel-lock-client.c:100
-#, c-format
-msgid "Cannot build locking helper pipe: %s"
-msgstr "Nelze vytvořit pomocné propojení pro zamykání: %s"
-
-#: camel/camel-lock-client.c:113
-#, c-format
-msgid "Cannot fork locking helper: %s"
-msgstr "Nelze spustit pomocný program pro zámek: %s"
-
-#: camel/camel-lock-client.c:191 camel/camel-lock-client.c:214
-#, c-format
-msgid "Could not lock '%s': protocol error with lock-helper"
-msgstr "Nelze zamknout '%s': chyba protokolu s lock-helper"
-
-#: camel/camel-lock-client.c:204
-#, c-format
-msgid "Could not lock '%s'"
-msgstr "Nelze zamknout '%s'"
-
 #: camel/camel-movemail.c:107
 #, c-format
 msgid "Could not check mail file %s: %s"
@@ -8549,11 +8487,11 @@ msgstr "Nepodařilo se dešifrovat MIME part: neplatná struktura"
 msgid "Failed to decrypt MIME part: parse error"
 msgstr "Nepodařilo se dešifrovat MIME part: chyba ve zpracování"
 
-#: camel/camel-multipart-signed.c:646
+#: camel/camel-multipart-signed.c:644
 msgid "This is a digitally signed message part"
 msgstr "Toto je digitálně podepsaná část zprávy"
 
-#: camel/camel-multipart-signed.c:700
+#: camel/camel-multipart-signed.c:698
 msgid "parse error"
 msgstr "chyba ve zpracování"
 
@@ -8623,11 +8561,11 @@ msgstr ""
 "Tato volba vás připojí k serveru pomocí bezpečného hesla CRAM-MD5, pokud ho "
 "server podporuje."
 
-#: camel/camel-sasl-digest-md5.c:48
+#: camel/camel-sasl-digest-md5.c:46
 msgid "DIGEST-MD5"
 msgstr "DIGEST-MD5"
 
-#: camel/camel-sasl-digest-md5.c:50
+#: camel/camel-sasl-digest-md5.c:48
 msgid ""
 "This option will connect to the server using a secure DIGEST-MD5 password, "
 "if the server supports it."
@@ -8728,7 +8666,7 @@ msgstr "Odkazované údaje vypršely."
 #: camel/camel-sasl-gssapi.c:189 camel/camel-sasl-gssapi.c:238
 #: camel/camel-sasl-gssapi.c:274 camel/camel-sasl-gssapi.c:289
 #: camel/camel-sasl-kerberos4.c:219
-#: camel/providers/imap/camel-imap-store.c:1207
+#: camel/providers/imap/camel-imap-store.c:1052
 msgid "Bad authentication response from server."
 msgstr "Neplatná odpověď na ověření od serveru."
 
@@ -8786,23 +8724,23 @@ msgstr ""
 msgid "PLAIN"
 msgstr "PLAIN"
 
-#: camel/camel-sasl-popb4smtp.c:36
+#: camel/camel-sasl-popb4smtp.c:34
 msgid "POP before SMTP"
 msgstr "POP před SMTP"
 
-#: camel/camel-sasl-popb4smtp.c:38
+#: camel/camel-sasl-popb4smtp.c:36
 msgid "This option will authorise a POP connection before attempting SMTP"
 msgstr "Tato volba bude přihlašovat POP spojení před pokusem o SMTP"
 
-#: camel/camel-sasl-popb4smtp.c:103
+#: camel/camel-sasl-popb4smtp.c:107
 msgid "POP Source URI"
 msgstr "Zdrojové URI pro POP"
 
-#: camel/camel-sasl-popb4smtp.c:107
+#: camel/camel-sasl-popb4smtp.c:111
 msgid "POP Before SMTP auth using an unknown transport"
 msgstr "Přihlášení POP před SMTP pomocí neznámého transportu"
 
-#: camel/camel-sasl-popb4smtp.c:112
+#: camel/camel-sasl-popb4smtp.c:116
 msgid "POP Before SMTP auth using a non-pop source"
 msgstr "Přihlášení POP před SMTP bez použití zdroje POP"
 
@@ -8811,55 +8749,55 @@ msgstr "Přihlášení POP před SMTP bez použití zdroje POP"
 msgid "Regular expression compilation failed: %s: %s"
 msgstr "Překlad regulárního výrazu selhal: %s: %s"
 
-#: camel/camel-service.c:277
+#: camel/camel-service.c:282
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr "URL '%s' vyžaduje komponentu uživatelského jména"
 
-#: camel/camel-service.c:285
+#: camel/camel-service.c:290
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr "URL '%s' vyžaduje komponentu hostitele"
 
-#: camel/camel-service.c:293
+#: camel/camel-service.c:298
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr "URL '%s' vyžaduje komponentu cesty"
 
-#: camel/camel-service.c:738
+#: camel/camel-service.c:750
 #, c-format
 msgid "Resolving: %s"
 msgstr "Zjišťuje se: %s"
 
-#: camel/camel-service.c:769 camel/camel-service.c:893
+#: camel/camel-service.c:783 camel/camel-service.c:915
 #, c-format
 msgid "Failure in name lookup: %s"
 msgstr "Selhalo hledání jména: %s"
 
-#: camel/camel-service.c:790 camel/camel-service.c:914
+#: camel/camel-service.c:804
 #, c-format
 msgid "Host lookup failed: cannot create thread: %s"
 msgstr "Selhalo hledání počítače: nemohu vytvořit thread: %s"
 
-#: camel/camel-service.c:803
+#: camel/camel-service.c:818
 #, c-format
 msgid "Host lookup failed: %s: host not found"
 msgstr "Selhalo hledání počítače: %s: počítač nenalezen"
 
-#: camel/camel-service.c:806
+#: camel/camel-service.c:821
 #, c-format
 msgid "Host lookup failed: %s: unknown reason"
 msgstr "Selhalo hledání počítače: %s: neznámý důvod"
 
-#: camel/camel-service.c:860
+#: camel/camel-service.c:880
 msgid "Resolving address"
 msgstr "Zjišťuje se adresa"
 
-#: camel/camel-service.c:929
+#: camel/camel-service.c:949
 msgid "Host lookup failed: host not found"
 msgstr "Selhalo hledání počítače: počítač nenalezen"
 
-#: camel/camel-service.c:932
+#: camel/camel-service.c:952
 msgid "Host lookup failed: unknown reason"
 msgstr "Selhalo hledání počítače: neznámý důvod"
 
@@ -8871,12 +8809,12 @@ msgstr "Poskytovatel pošty pro virtuální složky"
 msgid "For reading mail as a query of another set of folders"
 msgstr "Pro čtení pošty jako otázky na jinou množinu složek"
 
-#: camel/camel-session.c:350 camel/camel-session.c:400
+#: camel/camel-session.c:355 camel/camel-session.c:405
 #, c-format
 msgid "No provider available for protocol `%s'"
 msgstr "Pro protokol `%s' není k dispozici poskytovatel"
 
-#: camel/camel-session.c:523
+#: camel/camel-session.c:528
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -8922,136 +8860,136 @@ msgstr "Nepodařilo se dekódovat zprávu."
 msgid "Failed to verify certificates."
 msgstr "Nepodařilo se ověřit certifikáty"
 
-#: camel/camel-store.c:212
+#: camel/camel-store.c:215
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr "Nelze získat složku: Neplatná operace pro tento sklad"
 
-#: camel/camel-store.c:266
+#: camel/camel-store.c:269
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "Nelze vytvořit složku: Neplatná operace pro tento sklad"
 
-#: camel/camel-tcp-stream-openssl.c:568
+#: camel/camel-tcp-stream-openssl.c:571
 msgid "Unable to get issuer's certificate"
 msgstr "Nepodařilo se získat certifikát výstavce"
 
-#: camel/camel-tcp-stream-openssl.c:570
+#: camel/camel-tcp-stream-openssl.c:573
 msgid "Unable to get Certificate Revocation List"
 msgstr ""
 "Nepodařilo se získat Certificate Revocation List (seznam zrušených "
 "certifikátů)"
 
-#: camel/camel-tcp-stream-openssl.c:572
+#: camel/camel-tcp-stream-openssl.c:575
 msgid "Unable to decrypt certificate signature"
 msgstr "Nepodařilo se dekódovat certifikovaný podpis"
 
-#: camel/camel-tcp-stream-openssl.c:574
+#: camel/camel-tcp-stream-openssl.c:577
 msgid "Unable to decrypt Certificate Revocation List signature"
 msgstr ""
 "Nepodařilo se dekódovat podpis Certificate Revocation List (seznam zrušených "
 "certifikátů)"
 
-#: camel/camel-tcp-stream-openssl.c:576
+#: camel/camel-tcp-stream-openssl.c:579
 msgid "Unable to decode issuer's public key"
 msgstr "Nepodařilo se dekódovat veřejný klíč výstavce"
 
-#: camel/camel-tcp-stream-openssl.c:578
+#: camel/camel-tcp-stream-openssl.c:581
 msgid "Certificate signature failure"
 msgstr "Selhala certifikace podpisu"
 
-#: camel/camel-tcp-stream-openssl.c:580
+#: camel/camel-tcp-stream-openssl.c:583
 msgid "Certificate Revocation List signature failure"
 msgstr ""
 "Selhal podpis Certificate Revocation List (seznam zrušených certifikátů)"
 
-#: camel/camel-tcp-stream-openssl.c:582
+#: camel/camel-tcp-stream-openssl.c:585
 msgid "Certificate not yet valid"
 msgstr "Certifikát ještě není platný"
 
-#: camel/camel-tcp-stream-openssl.c:584
+#: camel/camel-tcp-stream-openssl.c:587
 msgid "Certificate has expired"
 msgstr "Certifikát přestal platit"
 
-#: camel/camel-tcp-stream-openssl.c:586
+#: camel/camel-tcp-stream-openssl.c:589
 msgid "CRL not yet valid"
 msgstr "CRL ještě není platný"
 
-#: camel/camel-tcp-stream-openssl.c:588
+#: camel/camel-tcp-stream-openssl.c:591
 msgid "CRL has expired"
 msgstr "CRL přestal platit"
 
-#: camel/camel-tcp-stream-openssl.c:593
+#: camel/camel-tcp-stream-openssl.c:596
 msgid "Error in CRL"
 msgstr "Chyba v CRL"
 
-#: camel/camel-tcp-stream-openssl.c:595
+#: camel/camel-tcp-stream-openssl.c:598
 msgid "Out of memory"
 msgstr "Nedostatek paměti"
 
-#: camel/camel-tcp-stream-openssl.c:597
+#: camel/camel-tcp-stream-openssl.c:600
 msgid "Zero-depth self-signed certificate"
 msgstr "Samopodepsaný certifikát s nulovou úrovní"
 
-#: camel/camel-tcp-stream-openssl.c:599
+#: camel/camel-tcp-stream-openssl.c:602
 msgid "Self-signed certificate in chain"
 msgstr "Samopodepsaný certifikát v řetězci"
 
-#: camel/camel-tcp-stream-openssl.c:601
+#: camel/camel-tcp-stream-openssl.c:604
 msgid "Unable to get issuer's certificate locally"
 msgstr "Nepodařilo se lokálně získat certifikát výstavce"
 
-#: camel/camel-tcp-stream-openssl.c:603
+#: camel/camel-tcp-stream-openssl.c:606
 msgid "Unable to verify leaf signature"
 msgstr "Nelze ověřit podpis větve"
 
-#: camel/camel-tcp-stream-openssl.c:605
+#: camel/camel-tcp-stream-openssl.c:608
 msgid "Certificate chain too long"
 msgstr "Řetězec certifikátu je příliš dlouhý"
 
-#: camel/camel-tcp-stream-openssl.c:607
+#: camel/camel-tcp-stream-openssl.c:610
 msgid "Certificate Revoked"
 msgstr "Certifikát zrušen"
 
-#: camel/camel-tcp-stream-openssl.c:609
+#: camel/camel-tcp-stream-openssl.c:612
 msgid "Invalid Certificate Authority (CA)"
 msgstr "Neplatná certifikační autorita (CA)"
 
-#: camel/camel-tcp-stream-openssl.c:611
+#: camel/camel-tcp-stream-openssl.c:614
 msgid "Path length exceeded"
 msgstr "Překročena délka cesty"
 
-#: camel/camel-tcp-stream-openssl.c:613
+#: camel/camel-tcp-stream-openssl.c:616
 msgid "Invalid purpose"
 msgstr "Neplatný účel"
 
-#: camel/camel-tcp-stream-openssl.c:615
+#: camel/camel-tcp-stream-openssl.c:618
 msgid "Certificate untrusted"
 msgstr "Nedůvěryhodný certifikát"
 
-#: camel/camel-tcp-stream-openssl.c:617
+#: camel/camel-tcp-stream-openssl.c:620
 msgid "Certificate rejected"
 msgstr "Certifikát odmítnut"
 
-#: camel/camel-tcp-stream-openssl.c:620
+#: camel/camel-tcp-stream-openssl.c:623
 msgid "Subject/Issuer mismatch"
 msgstr "Neshoda předmět/výstavce"
 
-#: camel/camel-tcp-stream-openssl.c:622
+#: camel/camel-tcp-stream-openssl.c:625
 msgid "AKID/SKID mismatch"
 msgstr "Neshoda AKID/SKID"
 
-#: camel/camel-tcp-stream-openssl.c:624
+#: camel/camel-tcp-stream-openssl.c:627
 msgid "AKID/Issuer serial mismatch"
 msgstr "Řadová neshoda AKID/výstavce"
 
-#: camel/camel-tcp-stream-openssl.c:626
+#: camel/camel-tcp-stream-openssl.c:629
 msgid "Key usage does not support certificate signing"
 msgstr "Použití klíče nepodporuje certifikovaný podpis"
 
-#: camel/camel-tcp-stream-openssl.c:629
+#: camel/camel-tcp-stream-openssl.c:632
 msgid "Error in application verification"
 msgstr "Chyba v ověření aplikace"
 
-#: camel/camel-tcp-stream-openssl.c:696 camel/camel-tcp-stream-ssl.c:831
+#: camel/camel-tcp-stream-openssl.c:699 camel/camel-tcp-stream-ssl.c:823
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -9064,15 +9002,15 @@ msgstr ""
 "Otisk:             %s\n"
 "Podpis:            %s"
 
-#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:837
+#: camel/camel-tcp-stream-openssl.c:705 camel/camel-tcp-stream-ssl.c:829
 msgid "GOOD"
 msgstr "DOBŘE"
 
-#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:837
+#: camel/camel-tcp-stream-openssl.c:705 camel/camel-tcp-stream-ssl.c:829
 msgid "BAD"
 msgstr "ŠPATNĚ"
 
-#: camel/camel-tcp-stream-openssl.c:704
+#: camel/camel-tcp-stream-openssl.c:707
 #, c-format
 msgid ""
 "Bad certificate from %s:\n"
@@ -9092,7 +9030,7 @@ msgstr ""
 "Chcete ho přesto akceptovat?"
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:841
+#: camel/camel-tcp-stream-ssl.c:833
 #, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -9107,7 +9045,7 @@ msgstr ""
 "\n"
 "Chcete ho akceptovat?"
 
-#: camel/camel-tcp-stream-ssl.c:885
+#: camel/camel-tcp-stream-ssl.c:877
 #, c-format
 msgid ""
 "Certificate problem: %s\n"
@@ -9116,7 +9054,7 @@ msgstr ""
 "Problém s certifikátem: %s\n"
 "Výstavce: %s"
 
-#: camel/camel-tcp-stream-ssl.c:937
+#: camel/camel-tcp-stream-ssl.c:929
 #, c-format
 msgid ""
 "Bad certificate domain: %s\n"
@@ -9125,7 +9063,7 @@ msgstr ""
 "Chybná doména certifikátu: %s\n"
 "Výstavce: %s"
 
-#: camel/camel-tcp-stream-ssl.c:955
+#: camel/camel-tcp-stream-ssl.c:947
 #, c-format
 msgid ""
 "Certificate expired: %s\n"
@@ -9134,7 +9072,7 @@ msgstr ""
 "Certifikát vypršel: %s\n"
 "Výstavce: %s"
 
-#: camel/camel-tcp-stream-ssl.c:972
+#: camel/camel-tcp-stream-ssl.c:964
 #, c-format
 msgid ""
 "Certificate revocation list expired: %s\n"
@@ -9148,17 +9086,17 @@ msgstr ""
 msgid "Could not parse URL `%s'"
 msgstr "Nelze zpracovat URL `%s'"
 
-#: camel/camel-vee-folder.c:611
+#: camel/camel-vee-folder.c:618
 #, c-format
 msgid "Error storing `%s': %s"
 msgstr "Chyba při uskladnění `%s': %s"
 
-#: camel/camel-vee-folder.c:649
+#: camel/camel-vee-folder.c:656
 #, c-format
 msgid "No such message %s in %s"
 msgstr "Taková zpráva neexistuje %s v %s"
 
-#: camel/camel-vee-folder.c:812 camel/camel-vee-folder.c:818
+#: camel/camel-vee-folder.c:819 camel/camel-vee-folder.c:825
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr "Nelze kopírovat nebo přesunout zprávy do Virtuální složky"
 
@@ -9185,12 +9123,12 @@ msgstr "Nelze přejmenovat složku: %s: Složka neexistuje"
 #: camel/providers/imap/camel-imap-command.c:221
 #: camel/providers/imap/camel-imap-command.c:260
 #: camel/providers/imap/camel-imap-command.c:450
-#: camel/providers/imap/camel-imap-store.c:2806
+#: camel/providers/imap/camel-imap-store.c:2644
 msgid "Operation cancelled"
 msgstr "Operace zrušena"
 
 #: camel/providers/imap/camel-imap-command.c:305
-#: camel/providers/imap/camel-imap-store.c:2809
+#: camel/providers/imap/camel-imap-store.c:2647
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "Server neočekávaně zrušil spojení: %s"
@@ -9229,38 +9167,38 @@ msgstr "Odpověď IMAP serveru neobsahovala informaci %s"
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "Neočekávaná odpověď OK od IMAP serveru: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:223
+#: camel/providers/imap/camel-imap-folder.c:222
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "Nelze vytvořit adresář %s: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:242
+#: camel/providers/imap/camel-imap-folder.c:241
 #, c-format
 msgid "Could not load summary for %s"
 msgstr "Nelze načíst souhrn pro %s"
 
-#: camel/providers/imap/camel-imap-folder.c:308
+#: camel/providers/imap/camel-imap-folder.c:307
 msgid "Folder was destroyed and recreated on server."
 msgstr "Složka byl zrušena a znovu vytvořena na serveru."
 
 #. Check UIDs and flags of all messages we already know of.
-#: camel/providers/imap/camel-imap-folder.c:550
+#: camel/providers/imap/camel-imap-folder.c:549
 msgid "Scanning for changed messages"
 msgstr "Hledají se změněné zprávy"
 
-#: camel/providers/imap/camel-imap-folder.c:1886
+#: camel/providers/imap/camel-imap-folder.c:1883
 #, c-format
 msgid "Unable to retrieve message: %s"
 msgstr "Nepodařilo se přijmout zprávu: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:1923
-#: camel/providers/local/camel-maildir-folder.c:211
-#: camel/providers/local/camel-maildir-folder.c:224
-#: camel/providers/local/camel-maildir-folder.c:233
-#: camel/providers/local/camel-mbox-folder.c:422
-#: camel/providers/local/camel-mh-folder.c:200
-#: camel/providers/local/camel-mh-folder.c:210
-#: camel/providers/local/camel-mh-folder.c:219
+#: camel/providers/imap/camel-imap-folder.c:1920
+#: camel/providers/local/camel-maildir-folder.c:212
+#: camel/providers/local/camel-maildir-folder.c:225
+#: camel/providers/local/camel-maildir-folder.c:234
+#: camel/providers/local/camel-mbox-folder.c:351
+#: camel/providers/local/camel-mh-folder.c:201
+#: camel/providers/local/camel-mh-folder.c:211
+#: camel/providers/local/camel-mh-folder.c:220
 #, c-format
 msgid ""
 "Cannot get message: %s\n"
@@ -9269,24 +9207,24 @@ msgstr ""
 "Nelze získat zprávu: %s\n"
 "  %s"
 
-#: camel/providers/imap/camel-imap-folder.c:1923
-#: camel/providers/local/camel-maildir-folder.c:211
-#: camel/providers/local/camel-mbox-folder.c:422
-#: camel/providers/local/camel-mh-folder.c:200
+#: camel/providers/imap/camel-imap-folder.c:1920
+#: camel/providers/local/camel-maildir-folder.c:212
+#: camel/providers/local/camel-mbox-folder.c:351
+#: camel/providers/local/camel-mh-folder.c:201
 msgid "No such message"
 msgstr "Taková zpráva neexistuje"
 
-#: camel/providers/imap/camel-imap-folder.c:1946
-#: camel/providers/imap/camel-imap-folder.c:2542
+#: camel/providers/imap/camel-imap-folder.c:1943
+#: camel/providers/imap/camel-imap-folder.c:2539
 msgid "This message is not currently available"
 msgstr "Tato zpráva není právě dostupná"
 
-#: camel/providers/imap/camel-imap-folder.c:2206
-#: camel/providers/imap/camel-imap-folder.c:2276
+#: camel/providers/imap/camel-imap-folder.c:2203
+#: camel/providers/imap/camel-imap-folder.c:2273
 msgid "Fetching summary information for new messages"
 msgstr "Stahují se souhrnné informace pro nové zprávy"
 
-#: camel/providers/imap/camel-imap-folder.c:2580
+#: camel/providers/imap/camel-imap-folder.c:2577
 msgid "Could not find message body in FETCH response."
 msgstr "Nelze nalézt tělo zprávy v odpovědi FETCH."
 
@@ -9336,102 +9274,86 @@ msgstr "Jmenný prostor"
 msgid "Apply filters to new messages in INBOX on this server"
 msgstr "Použít filtry na nové příchozí zprávy na tomto serveru"
 
-#: camel/providers/imap/camel-imap-provider.c:59
-#, fuzzy
-msgid "Automatically synchronize remote mail locally"
-msgstr "_Automaticky kontrolovat novou poštu každých"
-
-#: camel/providers/imap/camel-imap-provider.c:65
+#: camel/providers/imap/camel-imap-provider.c:63
 msgid "IMAP"
 msgstr "IMAP"
 
-#: camel/providers/imap/camel-imap-provider.c:67
+#: camel/providers/imap/camel-imap-provider.c:65
 msgid "For reading and storing mail on IMAP servers."
 msgstr "Pro čtení a ukládání pošty na IMAP serverech."
 
-#: camel/providers/imap/camel-imap-provider.c:82
-#: camel/providers/imapp/camel-imapp-provider.c:65
-#: camel/providers/nntp/camel-nntp-store.c:265
+#: camel/providers/imap/camel-imap-provider.c:80
+#: camel/providers/nntp/camel-nntp-store.c:267
 #: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:83
 msgid "Password"
 msgstr "Heslo"
 
-#: camel/providers/imap/camel-imap-provider.c:84
-#: camel/providers/imapp/camel-imapp-provider.c:67
+#: camel/providers/imap/camel-imap-provider.c:82
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
 "Tato volba připojí na IMAP server pomocí hesel přenášených jako čistý text."
 
-#: camel/providers/imap/camel-imap-store.c:459
+#: camel/providers/imap/camel-imap-store.c:457
 #, c-format
 msgid "IMAP server %s"
 msgstr "IMAP server %s"
 
-#: camel/providers/imap/camel-imap-store.c:461
+#: camel/providers/imap/camel-imap-store.c:459
 #, c-format
 msgid "IMAP service for %s on %s"
 msgstr "IMAP služba pro %s na %s"
 
-#: camel/providers/imap/camel-imap-store.c:589
-#: camel/providers/imap/camel-imap-store.c:821
-#: camel/providers/imapp/camel-imapp-store.c:233
-#: camel/providers/nntp/camel-nntp-store.c:128
-#: camel/providers/nntp/camel-nntp-store.c:146
+#: camel/providers/imap/camel-imap-store.c:587
+#: camel/providers/nntp/camel-nntp-store.c:130
+#: camel/providers/nntp/camel-nntp-store.c:148
 #: camel/providers/pop3/camel-pop3-store.c:184
 msgid "Connection cancelled"
 msgstr "Spojení zrušeno"
 
-#: camel/providers/imap/camel-imap-store.c:592
-#: camel/providers/imapp/camel-imapp-store.c:236
-#: camel/providers/nntp/camel-nntp-store.c:131
-#: camel/providers/smtp/camel-smtp-transport.c:275
+#: camel/providers/imap/camel-imap-store.c:590
+#: camel/providers/nntp/camel-nntp-store.c:133
+#: camel/providers/smtp/camel-smtp-transport.c:276
 #, c-format
 msgid "Could not connect to %s (port %d): %s"
 msgstr "Nelze spojit s %s (port %d): %s"
 
-#: camel/providers/imap/camel-imap-store.c:655
-#: camel/providers/imap/camel-imap-store.c:686
+#: camel/providers/imap/camel-imap-store.c:649
+#: camel/providers/imap/camel-imap-store.c:680
 #, c-format
 msgid "Failed to connect to IMAP server %s in secure mode: %s"
 msgstr "Nepodařilo se spojit s IMAP serverem %s v bezpečném režimu: %s"
 
-#: camel/providers/imap/camel-imap-store.c:656
+#: camel/providers/imap/camel-imap-store.c:650
 #: camel/providers/pop3/camel-pop3-store.c:220
 msgid "SSL/TLS extension not supported."
 msgstr "SSL/TLS rozšíření není podporováno."
 
-#: camel/providers/imap/camel-imap-store.c:687
+#: camel/providers/imap/camel-imap-store.c:681
 #: camel/providers/pop3/camel-pop3-store.c:261
 msgid "SSL negotiations failed"
 msgstr "Vyjednávání SSL selhalo"
 
-#: camel/providers/imap/camel-imap-store.c:824
-#, fuzzy, c-format
-msgid "Could not connect with command \"%s\": %s"
-msgstr "Nelze spojit s %s (port %d): %s"
-
-#: camel/providers/imap/camel-imap-store.c:1237
+#: camel/providers/imap/camel-imap-store.c:1075
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr "IMAP server %s nepodporuje požadovaný typ ověření %s"
 
-#: camel/providers/imap/camel-imap-store.c:1247
-#: camel/providers/smtp/camel-smtp-transport.c:485
+#: camel/providers/imap/camel-imap-store.c:1085
+#: camel/providers/smtp/camel-smtp-transport.c:486
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "Typ ověření %s není podporován"
 
-#: camel/providers/imap/camel-imap-store.c:1270
-#: camel/providers/imapp/camel-imapp-store.c:349
+#: camel/providers/imap/camel-imap-store.c:1108
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr "%sUveďte IMAP heslo pro %s@%s"
 
-#: camel/providers/imap/camel-imap-store.c:1284
+#: camel/providers/imap/camel-imap-store.c:1122
 msgid "You didn't enter a password."
 msgstr "Neuvedli jste heslo."
 
-#: camel/providers/imap/camel-imap-store.c:1313
+#: camel/providers/imap/camel-imap-store.c:1151
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -9442,70 +9364,42 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:1660
-#: camel/providers/imap/camel-imap-store.c:1802
+#: camel/providers/imap/camel-imap-store.c:1498
+#: camel/providers/imap/camel-imap-store.c:1640
 #, c-format
 msgid "No such folder %s"
 msgstr "Složka %s neexistuje"
 
-#: camel/providers/imap/camel-imap-store.c:2003
+#: camel/providers/imap/camel-imap-store.c:1841
 #, c-format
 msgid ""
 "The folder name \"%s\" is invalid because it containes the character \"%c\""
 msgstr "Název složky \"%s\" je neplatný, protože obsahuje znak \"%c\""
 
-#: camel/providers/imap/camel-imap-store.c:2015
+#: camel/providers/imap/camel-imap-store.c:1853
 #, c-format
 msgid "Unknown parent folder: %s"
 msgstr "Neznámá rodičovská složka: %s"
 
-#: camel/providers/imap/camel-imap-store.c:2051
+#: camel/providers/imap/camel-imap-store.c:1889
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "Rodičovská složka nemůže obsahovat podsložky"
 
-#: camel/providers/imapp/camel-imapp-provider.c:39
-#: camel/providers/pop3/camel-pop3-provider.c:38
-msgid "Message storage"
-msgstr "Úložiště zpráv"
-
-#: camel/providers/imapp/camel-imapp-provider.c:47
-#, fuzzy
-msgid "IMAP+"
-msgstr "IMAP"
-
-#: camel/providers/imapp/camel-imapp-provider.c:49
-msgid ""
-"Experimental IMAP 4(.1) client\n"
-"This is untested and unsupported code, you want to use plain imap instead.\n"
-"\n"
-" !!! DO NOT USE THIS FOR PRODUCTION EMAIL  !!!\n"
-msgstr ""
-
-#: camel/providers/imapp/camel-imapp-store.c:333
-#, fuzzy, c-format
-msgid "Could not connect to POP server on %s"
-msgstr "Není možné spojit se s POP serverem %s"
-
-#: camel/providers/local/camel-local-folder.c:179
-#, fuzzy
-msgid "Index message body data"
-msgstr "Poslat zprávu kontaktu"
-
 #. $HOME relative path + protocol string
-#: camel/providers/local/camel-local-folder.c:379
+#: camel/providers/local/camel-local-folder.c:354
 #, c-format
 msgid "~%s (%s)"
 msgstr "~%s (%s)"
 
 #. /var/spool/mail relative path + protocol
-#: camel/providers/local/camel-local-folder.c:383
-#: camel/providers/local/camel-local-folder.c:386
+#: camel/providers/local/camel-local-folder.c:358
+#: camel/providers/local/camel-local-folder.c:361
 #, c-format
 msgid "mailbox:%s (%s)"
 msgstr "schránka %s (%s)"
 
 #. a full path + protocol
-#: camel/providers/local/camel-local-folder.c:390
+#: camel/providers/local/camel-local-folder.c:365
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
@@ -9564,54 +9458,50 @@ msgstr ""
 "formátu\n"
 "mbox. Lze též použít pro čtení stromů složek ve stylu Elm, Pine nebo Mutt."
 
-#: camel/providers/local/camel-local-store.c:138
-#: camel/providers/local/camel-local-store.c:227
-#: camel/providers/local/camel-mbox-store.c:305
+#: camel/providers/local/camel-local-store.c:139
+#: camel/providers/local/camel-local-store.c:228
 #: camel/providers/local/camel-spool-store.c:116
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr "Kořen pro ukládání %s není absolutní cesta"
 
-#: camel/providers/local/camel-local-store.c:145
+#: camel/providers/local/camel-local-store.c:146
 #, c-format
 msgid "Store root %s is not a regular directory"
 msgstr "Kořen ukládání %s není běžný adresář"
 
-#: camel/providers/local/camel-local-store.c:154
-#: camel/providers/local/camel-local-store.c:170
-#: camel/providers/local/camel-local-store.c:238
+#: camel/providers/local/camel-local-store.c:155
+#: camel/providers/local/camel-local-store.c:171
+#: camel/providers/local/camel-local-store.c:239
 #, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr "Nelze získat složku: %s: %s"
 
-#: camel/providers/local/camel-local-store.c:186
+#: camel/providers/local/camel-local-store.c:187
 msgid "Local stores do not have an inbox"
 msgstr "Lokální ukládání nemá adresář pro příchozí poštu"
 
-#: camel/providers/local/camel-local-store.c:198
+#: camel/providers/local/camel-local-store.c:199
 #, c-format
 msgid "Local mail file %s"
 msgstr "Lokální poštovní soubor %s"
 
-#: camel/providers/local/camel-local-store.c:307 mail/mail-local.c:949
+#: camel/providers/local/camel-local-store.c:308 mail/mail-local.c:909
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr "Nelze přejmenovat složku %s na %s: %s"
 
-#: camel/providers/local/camel-local-store.c:364
-#: camel/providers/local/camel-mbox-store.c:474
+#: camel/providers/local/camel-local-store.c:365
 #, c-format
 msgid "Could not rename '%s': %s"
 msgstr "Nelze přejmenovat '%s': %s"
 
-#: camel/providers/local/camel-local-store.c:387
-#: camel/providers/local/camel-mbox-store.c:258
+#: camel/providers/local/camel-local-store.c:388
 #, c-format
 msgid "Could not delete folder summary file `%s': %s"
 msgstr "Nelze odstranit soubor souhrnu složky `%s': %s"
 
-#: camel/providers/local/camel-local-store.c:397
-#: camel/providers/local/camel-mbox-store.c:270
+#: camel/providers/local/camel-local-store.c:398
 #, c-format
 msgid "Could not delete folder index file `%s': %s"
 msgstr "Nelze odstranit indexový soubor složky `%s': %s"
@@ -9625,17 +9515,17 @@ msgstr "Nelze uložit souhrn: %s: %s"
 msgid "Unable to add message to summary: unknown reason"
 msgstr "Nelze přidat zprávu do souhrnu: neznámý důvod"
 
-#: camel/providers/local/camel-maildir-folder.c:183
+#: camel/providers/local/camel-maildir-folder.c:184
 msgid "Maildir append message cancelled"
 msgstr "Přidaní zprávy maildir zrušeno"
 
-#: camel/providers/local/camel-maildir-folder.c:186
+#: camel/providers/local/camel-maildir-folder.c:187
 #, c-format
 msgid "Cannot append message to maildir folder: %s: %s"
 msgstr "Nelze přidat zprávu do složky maildir: %s: %s"
 
-#: camel/providers/local/camel-maildir-folder.c:234
-#: camel/providers/local/camel-mh-folder.c:220
+#: camel/providers/local/camel-maildir-folder.c:235
+#: camel/providers/local/camel-mh-folder.c:221
 msgid "Invalid message contents"
 msgstr "Neplatný obsah zprávy"
 
@@ -9651,7 +9541,7 @@ msgstr ""
 "%s"
 
 #: camel/providers/local/camel-maildir-store.c:110
-#: camel/providers/local/camel-mbox-store.c:157
+#: camel/providers/local/camel-mbox-store.c:101
 #: camel/providers/local/camel-mh-store.c:209
 #: camel/providers/local/camel-spool-store.c:167
 #, c-format
@@ -9714,29 +9604,29 @@ msgstr "Hledají se nové zprávy"
 msgid "Storing folder"
 msgstr "Ukládá se složka"
 
-#: camel/providers/local/camel-mbox-folder.c:230
-#: camel/providers/local/camel-spool-folder.c:148
+#: camel/providers/local/camel-mbox-folder.c:159
+#: camel/providers/local/camel-spool-folder.c:149
 #, c-format
 msgid "Cannot create folder lock on %s: %s"
 msgstr "Nelze získat zámek na složku %s: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:289
+#: camel/providers/local/camel-mbox-folder.c:218
 #, c-format
 msgid "Cannot open mailbox: %s: %s\n"
 msgstr "Nelze otevřít poštovní schránku: %s: %s\n"
 
-#: camel/providers/local/camel-mbox-folder.c:349
+#: camel/providers/local/camel-mbox-folder.c:278
 msgid "Mail append cancelled"
 msgstr "Přidaní pošty zrušeno"
 
-#: camel/providers/local/camel-mbox-folder.c:352
+#: camel/providers/local/camel-mbox-folder.c:281
 #, c-format
 msgid "Cannot append message to mbox file: %s: %s"
 msgstr "Nelze přidat zprávu do souboru mbox: %s: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:440
-#: camel/providers/local/camel-mbox-folder.c:471
-#: camel/providers/local/camel-mbox-folder.c:479
+#: camel/providers/local/camel-mbox-folder.c:369
+#: camel/providers/local/camel-mbox-folder.c:400
+#: camel/providers/local/camel-mbox-folder.c:408
 #, c-format
 msgid ""
 "Cannot get message: %s from folder %s\n"
@@ -9745,15 +9635,15 @@ msgstr ""
 "Nelze získat zprávu: %s ze složky %s\n"
 "  %s"
 
-#: camel/providers/local/camel-mbox-folder.c:472
+#: camel/providers/local/camel-mbox-folder.c:401
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr "Složka je zřejmě nenapravitelně poškozená."
 
-#: camel/providers/local/camel-mbox-folder.c:480
+#: camel/providers/local/camel-mbox-folder.c:409
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr "Vytvoření zprávy selhalo: Poškozená poštovní schránka?"
 
-#: camel/providers/local/camel-mbox-store.c:149
+#: camel/providers/local/camel-mbox-store.c:94
 #, c-format
 msgid ""
 "Could not open file `%s':\n"
@@ -9762,16 +9652,7 @@ msgstr ""
 "Nelze otevřít soubor `%s':\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:166
-#, fuzzy, c-format
-msgid ""
-"Could not create directory `%s':\n"
-"%s"
-msgstr ""
-"Nelze vytvořit adresář %s:\n"
-"%s"
-
-#: camel/providers/local/camel-mbox-store.c:178
+#: camel/providers/local/camel-mbox-store.c:110
 #, c-format
 msgid ""
 "Could not create file `%s':\n"
@@ -9780,15 +9661,14 @@ msgstr ""
 "Nelze vytvořit soubor `%s':\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:188
-#: camel/providers/local/camel-mbox-store.c:229
+#: camel/providers/local/camel-mbox-store.c:119
+#: camel/providers/local/camel-mbox-store.c:146
 #, c-format
 msgid "`%s' is not a regular file."
 msgstr "`%s' není obvyklý soubor."
 
-#: camel/providers/local/camel-mbox-store.c:210
-#: camel/providers/local/camel-mbox-store.c:221
-#: camel/providers/local/camel-mbox-store.c:244
+#: camel/providers/local/camel-mbox-store.c:138
+#: camel/providers/local/camel-mbox-store.c:161
 #, c-format
 msgid ""
 "Could not delete folder `%s':\n"
@@ -9797,36 +9677,11 @@ msgstr ""
 "Nelze smazat složku `%s':\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:236
+#: camel/providers/local/camel-mbox-store.c:153
 #, c-format
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr "Složka `%s' není prázdná, nebyla tudíž smazána."
 
-#: camel/providers/local/camel-mbox-store.c:311
-#, fuzzy
-msgid "Cannot create a folder by this name."
-msgstr "Nelze vytvořit složku s tímto názvem"
-
-#: camel/providers/local/camel-mbox-store.c:324
-#, fuzzy, c-format
-msgid "Cannot create directory `%s': %s."
-msgstr "Nelze vytvořit adresář %s: %s"
-
-#: camel/providers/local/camel-mbox-store.c:338
-#, fuzzy, c-format
-msgid "Cannot create folder: %s: %s"
-msgstr "Nelze získat složku: %s: %s"
-
-#: camel/providers/local/camel-mbox-store.c:408
-#, fuzzy, c-format
-msgid "Could not rename %s to %s: %s"
-msgstr "Nelze přejmenovat složku %s na %s: %s"
-
-#: camel/providers/local/camel-mbox-store.c:427
-#, fuzzy
-msgid "The new folder name is illegal."
-msgstr "Zadaný název složky není platný: %s"
-
 #: camel/providers/local/camel-mbox-summary.c:343
 #, c-format
 msgid "Could not open folder: %s: %s"
@@ -9856,7 +9711,7 @@ msgid "Cannot open temporary mailbox: %s"
 msgstr "Nelze otevřít dočasnou poštovní schránku: %s"
 
 #: camel/providers/local/camel-mbox-summary.c:540
-#: camel/providers/local/camel-mbox-summary.c:704
+#: camel/providers/local/camel-mbox-summary.c:702
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr "Nelze zavřít zdrojovou složku: %s: %s"
@@ -9873,38 +9728,38 @@ msgstr "Nelze přejmenovat složku: %s"
 
 #: camel/providers/local/camel-mbox-summary.c:644
 #: camel/providers/local/camel-mbox-summary.c:652
-#: camel/providers/local/camel-mbox-summary.c:845
-#: camel/providers/local/camel-mbox-summary.c:853
+#: camel/providers/local/camel-mbox-summary.c:843
+#: camel/providers/local/camel-mbox-summary.c:851
 msgid "Summary and folder mismatch, even after a sync"
 msgstr "Souhrn a složka si neodpovídají, ani po synchronizaci"
 
-#: camel/providers/local/camel-mbox-summary.c:779
+#: camel/providers/local/camel-mbox-summary.c:777
 #: camel/providers/local/camel-spool-summary.c:334
 #, c-format
 msgid "Unknown error: %s"
 msgstr "Neznámá chyba: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:814
+#: camel/providers/local/camel-mbox-summary.c:812
 #, c-format
 msgid "Could not store folder: %s"
 msgstr "Nelze uložit složku: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:908
-#: camel/providers/local/camel-mbox-summary.c:934
+#: camel/providers/local/camel-mbox-summary.c:906
+#: camel/providers/local/camel-mbox-summary.c:932
 #, c-format
 msgid "Error writing to temp mailbox: %s"
 msgstr "Chyba při zápisu do dočasné schránky: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:925
+#: camel/providers/local/camel-mbox-summary.c:923
 #, c-format
 msgid "Writing to tmp mailbox failed: %s: %s"
 msgstr "Zápis do dočasné schránky selhal: %s: %s"
 
-#: camel/providers/local/camel-mh-folder.c:174
+#: camel/providers/local/camel-mh-folder.c:175
 msgid "MH append message cancelled"
 msgstr "Přidání zprávy MH zrušeno"
 
-#: camel/providers/local/camel-mh-folder.c:177
+#: camel/providers/local/camel-mh-folder.c:178
 #, c-format
 msgid "Cannot append message to mh folder: %s: %s"
 msgstr "Nelze přidat zprávu do adresáře mh: %s: %s"
@@ -9984,67 +9839,6 @@ msgstr ""
 "Nelze synchronizovat adresář fronty %s: %s\n"
 "Adresář je možná poškozený, kopie uložena do `%s'"
 
-#: camel/providers/nntp/camel-nntp-auth.c:44
-#, fuzzy, c-format
-msgid "Please enter the NNTP password for %s@%s"
-msgstr "%sUveďte SMTP heslo pro %s@%s"
-
-#: camel/providers/nntp/camel-nntp-auth.c:64
-msgid "Server rejected username"
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-auth.c:70
-#, fuzzy
-msgid "Failed to send username to server"
-msgstr "Nepodařilo se připojit k serveru LDAP."
-
-#: camel/providers/nntp/camel-nntp-auth.c:79
-msgid "Server rejected username/password"
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-folder.c:114
-#, c-format
-msgid "Internal error: uid in invalid format: %s"
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-folder.c:155
-#: camel/providers/nntp/camel-nntp-folder.c:161
-#: camel/providers/pop3/camel-pop3-folder.c:433
-#: camel/providers/pop3/camel-pop3-folder.c:494
-#: camel/providers/pop3/camel-pop3-folder.c:501
-#: camel/providers/pop3/camel-pop3-folder.c:512
-#, c-format
-msgid "Cannot get message %s: %s"
-msgstr "Nelze získat zprávu %s: %s"
-
-#: camel/providers/nntp/camel-nntp-folder.c:159
-#: camel/providers/pop3/camel-pop3-folder.c:262
-#: camel/providers/pop3/camel-pop3-folder.c:430
-#: camel/providers/pop3/camel-pop3-folder.c:491
-#: camel/providers/pop3/camel-pop3-folder.c:509
-msgid "User cancelled"
-msgstr "Uživatel zrušen"
-
-#: camel/providers/nntp/camel-nntp-grouplist.c:45
-#, fuzzy
-msgid "Could not get group list from server."
-msgstr "Nelze získat skupinu: %s"
-
-#: camel/providers/nntp/camel-nntp-grouplist.c:98
-#: camel/providers/nntp/camel-nntp-grouplist.c:107
-#, fuzzy, c-format
-msgid "Unable to load grouplist file for %s: %s"
-msgstr ""
-"Nepodařilo se vytvořit výstupní soubor: %s\n"
-" %s"
-
-#: camel/providers/nntp/camel-nntp-grouplist.c:158
-#, fuzzy, c-format
-msgid "Unable to save grouplist file for %s: %s"
-msgstr ""
-"Nepodařilo se vytvořit výstupní soubor: %s\n"
-" %s"
-
 #: camel/providers/nntp/camel-nntp-provider.c:41
 msgid "USENET news"
 msgstr "Diskusní skupiny USENET"
@@ -10053,22 +9847,22 @@ msgstr "Diskusní skupiny USENET"
 msgid "This is a provider for reading from and posting toUSENET newsgroups."
 msgstr "Toto je poskytovatel čtení a posílaní do Diskusních skupin USENET."
 
-#: camel/providers/nntp/camel-nntp-store.c:149
+#: camel/providers/nntp/camel-nntp-store.c:151
 #, c-format
 msgid "Could not read greeting from %s: %s"
 msgstr "Nelze číst pozdrav od %s: %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:161
+#: camel/providers/nntp/camel-nntp-store.c:163
 #, c-format
 msgid "NNTP server %s returned error code %d: %s"
 msgstr "NNTP server %s vrátil chybový kód %d: %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:260
+#: camel/providers/nntp/camel-nntp-store.c:262
 #, c-format
 msgid "USENET News via %s"
 msgstr "Diskusní skupiny USENET pomocí %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:267
+#: camel/providers/nntp/camel-nntp-store.c:269
 msgid ""
 "This option will authenticate with the NNTP server using a plaintext "
 "password."
@@ -10076,37 +9870,37 @@ msgstr ""
 "Tato volba nastaví ověření na NNTP server pomocí poslání hesla jako čistého "
 "textu."
 
-#: camel/providers/nntp/camel-nntp-summary.c:237
+#: camel/providers/nntp/camel-nntp-summary.c:234
 #, c-format
 msgid "No such folder: %s"
 msgstr "Taková složka neexistuje: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:241
+#: camel/providers/nntp/camel-nntp-summary.c:238
 #, c-format
 msgid "Could not get group: %s"
 msgstr "Nelze získat skupinu: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:347
+#: camel/providers/nntp/camel-nntp-summary.c:344
 #, c-format
 msgid "NNTP Command failed: %s"
 msgstr "NNTP příkaz selhal: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:407
-#: camel/providers/nntp/camel-nntp-summary.c:508
+#: camel/providers/nntp/camel-nntp-summary.c:404
+#: camel/providers/nntp/camel-nntp-summary.c:505
 #, c-format
 msgid "%s: Scanning new messages"
 msgstr "%s: Hledají se nové zprávy"
 
-#: camel/providers/nntp/camel-nntp-summary.c:523
+#: camel/providers/nntp/camel-nntp-summary.c:520
 #, c-format
 msgid "Unknown server response: %s"
 msgstr "Neznámá odpověď serveru: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:569
+#: camel/providers/nntp/camel-nntp-summary.c:566
 msgid "Use cancel"
 msgstr "Použít Zrušit"
 
-#: camel/providers/nntp/camel-nntp-summary.c:571
+#: camel/providers/nntp/camel-nntp-summary.c:568
 #, c-format
 msgid "Operation failed: %s"
 msgstr "Operace selhala: %s"
@@ -10115,6 +9909,13 @@ msgstr "Operace selhala: %s"
 msgid "Retrieving POP summary"
 msgstr "Načítám shrnutí POP"
 
+#: camel/providers/pop3/camel-pop3-folder.c:262
+#: camel/providers/pop3/camel-pop3-folder.c:429
+#: camel/providers/pop3/camel-pop3-folder.c:490
+#: camel/providers/pop3/camel-pop3-folder.c:508
+msgid "User cancelled"
+msgstr "Uživatel zrušen"
+
 #: camel/providers/pop3/camel-pop3-folder.c:265
 #, c-format
 msgid "Cannot get POP summary: %s"
@@ -10124,22 +9925,34 @@ msgstr "Nelze získat shrnutí POP: %s"
 msgid "Expunging deleted messages"
 msgstr "Odstraňují se smazané zprávy"
 
-#: camel/providers/pop3/camel-pop3-folder.c:404
+#: camel/providers/pop3/camel-pop3-folder.c:403
 #, c-format
 msgid "No message with uid %s"
 msgstr "Žádná zpráva s uid %s"
 
 #. Sigh, most of the crap in this function is so that the cancel button
 #. returns the proper exception code.  Sigh.
-#: camel/providers/pop3/camel-pop3-folder.c:411
+#: camel/providers/pop3/camel-pop3-folder.c:410
 #, c-format
 msgid "Retrieving POP message %d"
 msgstr "Načítám POP zprávu %d"
 
-#: camel/providers/pop3/camel-pop3-folder.c:501
+#: camel/providers/pop3/camel-pop3-folder.c:432
+#: camel/providers/pop3/camel-pop3-folder.c:493
+#: camel/providers/pop3/camel-pop3-folder.c:500
+#: camel/providers/pop3/camel-pop3-folder.c:511
+#, c-format
+msgid "Cannot get message %s: %s"
+msgstr "Nelze získat zprávu %s: %s"
+
+#: camel/providers/pop3/camel-pop3-folder.c:500
 msgid "Unknown reason"
 msgstr "Neznámý důvod"
 
+#: camel/providers/pop3/camel-pop3-provider.c:38
+msgid "Message storage"
+msgstr "Úložiště zpráv"
+
 #: camel/providers/pop3/camel-pop3-provider.c:40
 msgid "Leave messages on server"
 msgstr "Zanechat zprávy na serveru"
@@ -10302,141 +10115,141 @@ msgstr "SMTP"
 msgid "For delivering mail by connecting to a remote mailhub using SMTP.\n"
 msgstr "Pro doručení pošty spojením se se vzdáleným serverem pomocí SMTP.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:174
+#: camel/providers/smtp/camel-smtp-transport.c:175
 msgid "Syntax error, command unrecognized"
 msgstr "Syntaktická chyba, příkaz neznámý"
 
-#: camel/providers/smtp/camel-smtp-transport.c:176
+#: camel/providers/smtp/camel-smtp-transport.c:177
 msgid "Syntax error in parameters or arguments"
 msgstr "Syntaktická chyba v parametrech nebo argumentech"
 
-#: camel/providers/smtp/camel-smtp-transport.c:178
+#: camel/providers/smtp/camel-smtp-transport.c:179
 msgid "Command not implemented"
 msgstr "Příkaz není implementovaný"
 
-#: camel/providers/smtp/camel-smtp-transport.c:180
+#: camel/providers/smtp/camel-smtp-transport.c:181
 msgid "Command parameter not implemented"
 msgstr "Parametr příkazu není implementovaný"
 
-#: camel/providers/smtp/camel-smtp-transport.c:182
+#: camel/providers/smtp/camel-smtp-transport.c:183
 msgid "System status, or system help reply"
 msgstr "Stav systému nebo odpověď na pomoc"
 
-#: camel/providers/smtp/camel-smtp-transport.c:184
+#: camel/providers/smtp/camel-smtp-transport.c:185
 msgid "Help message"
 msgstr "Nápověda"
 
-#: camel/providers/smtp/camel-smtp-transport.c:186
+#: camel/providers/smtp/camel-smtp-transport.c:187
 msgid "Service ready"
 msgstr "Služba připravena"
 
-#: camel/providers/smtp/camel-smtp-transport.c:188
+#: camel/providers/smtp/camel-smtp-transport.c:189
 msgid "Service closing transmission channel"
 msgstr "Služba zavírá přenosový kanál"
 
-#: camel/providers/smtp/camel-smtp-transport.c:190
+#: camel/providers/smtp/camel-smtp-transport.c:191
 msgid "Service not available, closing transmission channel"
 msgstr "Služba není k dispozici, zavírá se přenosový kanál"
 
-#: camel/providers/smtp/camel-smtp-transport.c:192
+#: camel/providers/smtp/camel-smtp-transport.c:193
 msgid "Requested mail action okay, completed"
 msgstr "Požadovaná poštovní akce v pořádku, dokončena"
 
-#: camel/providers/smtp/camel-smtp-transport.c:194
+#: camel/providers/smtp/camel-smtp-transport.c:195
 msgid "User not local; will forward to <forward-path>"
 msgstr "Uživatel není lokální, bude předán podle <forward-path>"
 
-#: camel/providers/smtp/camel-smtp-transport.c:196
+#: camel/providers/smtp/camel-smtp-transport.c:197
 msgid "Requested mail action not taken: mailbox unavailable"
 msgstr ""
 "Požadovaná poštovní akce nebyla vykonána, poštovní schránka není k dispozici"
 
-#: camel/providers/smtp/camel-smtp-transport.c:198
+#: camel/providers/smtp/camel-smtp-transport.c:199
 msgid "Requested action not taken: mailbox unavailable"
 msgstr "Požadovaná akce nebyla vykonána, poštovní schránka není k dispozici"
 
-#: camel/providers/smtp/camel-smtp-transport.c:200
+#: camel/providers/smtp/camel-smtp-transport.c:201
 msgid "Requested action aborted: error in processing"
 msgstr "Požadovaná činnost se nezdařila: chyba při zpracování"
 
-#: camel/providers/smtp/camel-smtp-transport.c:202
+#: camel/providers/smtp/camel-smtp-transport.c:203
 msgid "User not local; please try <forward-path>"
 msgstr "Uživatel není lokální, zkuste prosím <forward-path>"
 
-#: camel/providers/smtp/camel-smtp-transport.c:204
+#: camel/providers/smtp/camel-smtp-transport.c:205
 msgid "Requested action not taken: insufficient system storage"
 msgstr "Požadovaná akce nebyla vykonána: nedostatek místa v systému"
 
-#: camel/providers/smtp/camel-smtp-transport.c:206
+#: camel/providers/smtp/camel-smtp-transport.c:207
 msgid "Requested mail action aborted: exceeded storage allocation"
 msgstr "Požadovaná poštovní akce přerušena: přesáhnutí alokace místa"
 
-#: camel/providers/smtp/camel-smtp-transport.c:208
+#: camel/providers/smtp/camel-smtp-transport.c:209
 msgid "Requested action not taken: mailbox name not allowed"
 msgstr "Požadovaná akce nebyla vykonána: název poštovní schránky nepovolen"
 
-#: camel/providers/smtp/camel-smtp-transport.c:210
+#: camel/providers/smtp/camel-smtp-transport.c:211
 msgid "Start mail input; end with <CRLF>.<CRLF>"
 msgstr "Spustit vstup pošty, končí <CRLF>.<CRLF>"
 
-#: camel/providers/smtp/camel-smtp-transport.c:212
+#: camel/providers/smtp/camel-smtp-transport.c:213
 msgid "Transaction failed"
 msgstr "Transakce selhala"
 
-#: camel/providers/smtp/camel-smtp-transport.c:216
+#: camel/providers/smtp/camel-smtp-transport.c:217
 msgid "A password transition is needed"
 msgstr "Vyžadován přenos hesla"
 
-#: camel/providers/smtp/camel-smtp-transport.c:218
+#: camel/providers/smtp/camel-smtp-transport.c:219
 msgid "Authentication mechanism is too weak"
 msgstr "Ověřovací mechanismus je příliš slabý"
 
-#: camel/providers/smtp/camel-smtp-transport.c:220
+#: camel/providers/smtp/camel-smtp-transport.c:221
 msgid "Encryption required for requested authentication mechanism"
 msgstr "Pro požadovaný způsob ověření je vyžadováno šifrovaní"
 
-#: camel/providers/smtp/camel-smtp-transport.c:222
+#: camel/providers/smtp/camel-smtp-transport.c:223
 msgid "Temporary authentication failure"
 msgstr "Dočasné selhání ověření."
 
-#: camel/providers/smtp/camel-smtp-transport.c:224
+#: camel/providers/smtp/camel-smtp-transport.c:225
 msgid "Authentication required"
 msgstr "Je požadováno ověření"
 
-#: camel/providers/smtp/camel-smtp-transport.c:298
+#: camel/providers/smtp/camel-smtp-transport.c:299
 msgid "Welcome response error"
 msgstr "Chyba odpovědi přivítání"
 
-#: camel/providers/smtp/camel-smtp-transport.c:342
-#: camel/providers/smtp/camel-smtp-transport.c:381
+#: camel/providers/smtp/camel-smtp-transport.c:343
+#: camel/providers/smtp/camel-smtp-transport.c:382
 #, c-format
 msgid "Failed to connect to SMTP server %s in secure mode: %s"
 msgstr "Nepodařilo se spojit se SMTP serverem %s v bezpečném modu: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:343
+#: camel/providers/smtp/camel-smtp-transport.c:344
 msgid "server does not appear to support SSL"
 msgstr "server pravděpodobně nepodporuje SSL"
 
-#: camel/providers/smtp/camel-smtp-transport.c:357
+#: camel/providers/smtp/camel-smtp-transport.c:358
 #, c-format
 msgid "STARTTLS request timed out: %s"
 msgstr "Vypršel čas požadavku STARTTLS: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:372
+#: camel/providers/smtp/camel-smtp-transport.c:373
 msgid "STARTTLS response error"
 msgstr "Chyba odpovědi STARTTLS"
 
-#: camel/providers/smtp/camel-smtp-transport.c:475
+#: camel/providers/smtp/camel-smtp-transport.c:476
 #, c-format
 msgid "SMTP server %s does not support requested authentication type %s."
 msgstr "SMTP server %s nepodporuje požadovaný typ ověření %s."
 
-#: camel/providers/smtp/camel-smtp-transport.c:513
+#: camel/providers/smtp/camel-smtp-transport.c:514
 #, c-format
 msgid "%sPlease enter the SMTP password for %s@%s"
 msgstr "%sUveďte SMTP heslo pro %s@%s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:532
+#: camel/providers/smtp/camel-smtp-transport.c:533
 #, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -10447,87 +10260,87 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:665
+#: camel/providers/smtp/camel-smtp-transport.c:666
 #, c-format
 msgid "SMTP server %s"
 msgstr "SMTP server %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:667
+#: camel/providers/smtp/camel-smtp-transport.c:668
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "Doručení pošty SMTP pomocí %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:685
+#: camel/providers/smtp/camel-smtp-transport.c:686
 msgid "Cannot send message: sender address not valid."
 msgstr "Zprávu nelze poslat: adresa odesílatele je neplatná."
 
-#: camel/providers/smtp/camel-smtp-transport.c:690 mail/mail-ops.c:631
+#: camel/providers/smtp/camel-smtp-transport.c:691 mail/mail-ops.c:613
 msgid "Sending message"
 msgstr "Posílám zprávu"
 
-#: camel/providers/smtp/camel-smtp-transport.c:705
+#: camel/providers/smtp/camel-smtp-transport.c:706
 msgid "Cannot send message: no recipients defined."
 msgstr "Nelze poslat zprávu: nebyli určeni příjemci."
 
-#: camel/providers/smtp/camel-smtp-transport.c:714
+#: camel/providers/smtp/camel-smtp-transport.c:715
 msgid "Cannot send message: one or more invalid recipients"
 msgstr "Nelze poslat zprávu: jeden nebo více neplatných příjemců"
 
-#: camel/providers/smtp/camel-smtp-transport.c:879
+#: camel/providers/smtp/camel-smtp-transport.c:880
 msgid "SMTP Greeting"
 msgstr "SMTP pozdrav"
 
-#: camel/providers/smtp/camel-smtp-transport.c:928
+#: camel/providers/smtp/camel-smtp-transport.c:927
 #, c-format
 msgid "HELO request timed out: %s"
 msgstr "Vypršel čas odpovědi HELO: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:950
+#: camel/providers/smtp/camel-smtp-transport.c:949
 msgid "HELO response error"
 msgstr "Chyba odpovědi HELO"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1016
+#: camel/providers/smtp/camel-smtp-transport.c:1015
 msgid "SMTP Authentication"
 msgstr "SMTP ověření"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1022
+#: camel/providers/smtp/camel-smtp-transport.c:1021
 msgid "Error creating SASL authentication object."
 msgstr "Chyba při vytváření ověřovacího objektu SASL."
 
-#: camel/providers/smtp/camel-smtp-transport.c:1039
-#: camel/providers/smtp/camel-smtp-transport.c:1051
+#: camel/providers/smtp/camel-smtp-transport.c:1038
+#: camel/providers/smtp/camel-smtp-transport.c:1050
 #, c-format
 msgid "AUTH request timed out: %s"
 msgstr "Vypršel čas požadavku AUTH: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1060
+#: camel/providers/smtp/camel-smtp-transport.c:1059
 msgid "AUTH request failed."
 msgstr "Požadavek AUTH selhal."
 
-#: camel/providers/smtp/camel-smtp-transport.c:1121
+#: camel/providers/smtp/camel-smtp-transport.c:1120
 msgid "Bad authentication response from server.\n"
 msgstr "Neplatná odpověď na ověření od serveru.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1146
+#: camel/providers/smtp/camel-smtp-transport.c:1145
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
 msgstr "Vypršel čas požadavku MAIL FROM: %s: pošta neodeslána"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1166
+#: camel/providers/smtp/camel-smtp-transport.c:1165
 msgid "MAIL FROM response error"
 msgstr "Chyba odpovědi MAIL FROM"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1190
+#: camel/providers/smtp/camel-smtp-transport.c:1189
 #, c-format
 msgid "RCPT TO request timed out: %s: mail not sent"
 msgstr "Vypršel čas požadavku RCPT TO: %s: pošta neodeslána"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1212
+#: camel/providers/smtp/camel-smtp-transport.c:1211
 #, c-format
 msgid "RCPT TO <%s> failed"
 msgstr "RCPT TO <%s> selhal"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1251
+#: camel/providers/smtp/camel-smtp-transport.c:1250
 #, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr "Vypršel čas požadavku DATA: %s: pošta neodeslána"
@@ -10535,66 +10348,67 @@ msgstr "Vypršel čas požadavku DATA: %s: pošta neodeslána"
 #. we should have gotten instructions on how to use the DATA command:
 #. * 354 Enter mail, end with "." on a line by itself
 #.
-#: camel/providers/smtp/camel-smtp-transport.c:1271
+#: camel/providers/smtp/camel-smtp-transport.c:1270
 msgid "DATA response error"
 msgstr "Chyba odpovědi DATA"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1312
-#: camel/providers/smtp/camel-smtp-transport.c:1335
+#: camel/providers/smtp/camel-smtp-transport.c:1311
+#: camel/providers/smtp/camel-smtp-transport.c:1334
 #, c-format
 msgid "DATA send timed out: message termination: %s: mail not sent"
 msgstr "Vypršel čas posílání DATA: konec zprávy: %s: pošta neodeslána"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1355
+#: camel/providers/smtp/camel-smtp-transport.c:1354
 msgid "DATA termination response error"
 msgstr "Chyba odpovědi ukončení DATA"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1378
+#: camel/providers/smtp/camel-smtp-transport.c:1377
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr "Vypršel čas požadavku RSET: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1398
+#: camel/providers/smtp/camel-smtp-transport.c:1397
 msgid "RSET response error"
 msgstr "Chyba odpovědi RSET"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1421
+#: camel/providers/smtp/camel-smtp-transport.c:1420
 #, c-format
 msgid "QUIT request timed out: %s"
 msgstr "Vypršel čas požadavku QUIT: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1441
+#: camel/providers/smtp/camel-smtp-transport.c:1440
 msgid "QUIT response error"
 msgstr "Chyba odpovědi QUIT"
 
-#: composer/e-msg-composer-attachment-bar.c:103
+#: composer/e-msg-composer-attachment-bar.c:102
 #, c-format
 msgid "%.0fK"
 msgstr "%.0fK"
 
-#: composer/e-msg-composer-attachment-bar.c:106
+#: composer/e-msg-composer-attachment-bar.c:105
 #, c-format
 msgid "%.0fM"
 msgstr "%.0fM"
 
-#: composer/e-msg-composer-attachment-bar.c:109
+#: composer/e-msg-composer-attachment-bar.c:108
 #, c-format
 msgid "%.0fG"
 msgstr "%.0fG"
 
-#: composer/e-msg-composer-attachment-bar.c:300
+#. This is a filename. Translators take note.
+#: composer/e-msg-composer-attachment-bar.c:370 mail/mail-display.c:227
 msgid "attachment"
 msgstr "příloha"
 
-#: composer/e-msg-composer-attachment-bar.c:445
+#: composer/e-msg-composer-attachment-bar.c:508
 msgid "Remove selected items from the attachment list"
 msgstr "Odstranit vybrané položky ze seznamu příloh"
 
-#: composer/e-msg-composer-attachment-bar.c:475
+#: composer/e-msg-composer-attachment-bar.c:538
 msgid "Add attachment..."
 msgstr "Přidat přílohu..."
 
-#: composer/e-msg-composer-attachment-bar.c:476
+#: composer/e-msg-composer-attachment-bar.c:539
 msgid "Attach a file to the message"
 msgstr "Přiložit soubor ke zprávě"
 
@@ -10626,11 +10440,88 @@ msgstr "Typ MIME:"
 msgid "Suggest automatic display of attachment"
 msgstr "Navrhnout automatické zobrazovaní příloh"
 
-#: composer/e-msg-composer.c:562
+#: composer/e-msg-composer-hdrs.c:290
+msgid "Hey you, dunce. You need an account to send mail doncha know."
+msgstr "Hej ty, truhlíku. Potřebuješ účet, abys mohl poslat poštu, chápeš."
+
+#: composer/e-msg-composer-hdrs.c:483
+msgid "Click here for the address book"
+msgstr "Kliknutím zobrazíte adresář"
+
+#.
+#. * Reply-To:
+#. *
+#. * Create this before we call create_from_optionmenu,
+#. * because that causes from_changed to be called, which
+#. * expects the reply_to fields to be initialized.
+#.
+#: composer/e-msg-composer-hdrs.c:514
+msgid "Reply-To:"
+msgstr "Odpovědět-komu:"
+
+#.
+#. * From
+#.
+#: composer/e-msg-composer-hdrs.c:520
+msgid "From:"
+msgstr "Od:"
+
+#.
+#. * Subject
+#.
+#: composer/e-msg-composer-hdrs.c:526
+msgid "Subject:"
+msgstr "Předmět:"
+
+#: composer/e-msg-composer-hdrs.c:535
+msgid "To:"
+msgstr "Komu:"
+
+#: composer/e-msg-composer-hdrs.c:536
+msgid "Enter the recipients of the message"
+msgstr "Vyplnit příjemce zprávy"
+
+#: composer/e-msg-composer-hdrs.c:539
+msgid "Cc:"
+msgstr "Kopie:"
+
+#: composer/e-msg-composer-hdrs.c:540
+msgid "Enter the addresses that will receive a carbon copy of the message"
+msgstr "Vyplňte adresy, které obdrží kopii této zprávy."
+
+#: composer/e-msg-composer-hdrs.c:543
+msgid "Bcc:"
+msgstr "Skrytá kopie:"
+
+#: composer/e-msg-composer-hdrs.c:544
+msgid ""
+"Enter the addresses that will receive a carbon copy of the message without "
+"appearing in the recipient list of the message."
+msgstr ""
+"Vyplňte adresy, které obdrží kopii, aniž by se objevily v seznamu příjemců "
+"zprávy."
+
+#.
+#. * Post-To
+#.
+#: composer/e-msg-composer-hdrs.c:551
+msgid "Post To:"
+msgstr "Poslat komu:"
+
+#: composer/e-msg-composer-hdrs.c:553
+msgid "Posting destination"
+msgstr "Cíl odeslání"
+
+#: composer/e-msg-composer-select-file.c:102
+#: composer/e-msg-composer-select-file.c:119
+msgid "Attach file(s)"
+msgstr "Připojit soubor(y)"
+
+#: composer/e-msg-composer.c:535
 msgid "Could not create a PGP signature context"
 msgstr "Nelze vytvořit kontext podpisu PGP."
 
-#: composer/e-msg-composer.c:841
+#: composer/e-msg-composer.c:814
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
@@ -10639,30 +10530,30 @@ msgstr ""
 "Chyba při čtení souboru %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:1206
+#: composer/e-msg-composer.c:1177
 msgid "File exists, overwrite?"
 msgstr "Soubor existuje, přepsat?"
 
-#: composer/e-msg-composer.c:1217 composer/e-msg-composer.c:1233
+#: composer/e-msg-composer.c:1195
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Chyba při ukládání souboru: %s"
 
-#: composer/e-msg-composer.c:1256
+#: composer/e-msg-composer.c:1218
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Chyba při načítání souboru: %s"
 
-#: composer/e-msg-composer.c:1294
+#: composer/e-msg-composer.c:1256
 #, c-format
 msgid "Error accessing file: %s"
 msgstr "Chyba při přístupu k souboru: %s"
 
-#: composer/e-msg-composer.c:1302
+#: composer/e-msg-composer.c:1264
 msgid "Unable to retrieve message from editor"
 msgstr "Nelze obdržet zprávu z editoru"
 
-#: composer/e-msg-composer.c:1309
+#: composer/e-msg-composer.c:1271
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -10671,7 +10562,7 @@ msgstr ""
 "Nelze hledat v souboru: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1316
+#: composer/e-msg-composer.c:1278
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -10680,7 +10571,7 @@ msgstr ""
 "Nelze rozdělit soubor: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1325
+#: composer/e-msg-composer.c:1287
 #, c-format
 msgid ""
 "Unable to copy file descriptor: %s\n"
@@ -10689,7 +10580,7 @@ msgstr ""
 "Nelze kopírovat popisovač souboru: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1334
+#: composer/e-msg-composer.c:1296
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -10698,7 +10589,7 @@ msgstr ""
 "Chyba při automatickém ukládaní zprávy: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1431
+#: composer/e-msg-composer.c:1390
 msgid ""
 "Ximian Evolution has found unsaved files from a previous session.\n"
 "Would you like to try to recover them?"
@@ -10706,7 +10597,7 @@ msgstr ""
 "Ximian Evolution našla neuložené soubory z předchozího sezení.\n"
 "Chcete se pokusit o jejich obnovení?"
 
-#: composer/e-msg-composer.c:1594
+#: composer/e-msg-composer.c:1552
 #, c-format
 msgid ""
 "The message \"%s\" has not been sent.\n"
@@ -10717,28 +10608,28 @@ msgstr ""
 "\n"
 "Chcete uložit změny?"
 
-#: composer/e-msg-composer.c:1603
+#: composer/e-msg-composer.c:1561
 msgid "Warning: Modified Message"
 msgstr "Varování: Změněná zpráva"
 
-#: composer/e-msg-composer.c:1635
+#: composer/e-msg-composer.c:1593
 msgid "Open file"
 msgstr "Otevřít soubor"
 
-#: composer/e-msg-composer.c:2054
+#: composer/e-msg-composer.c:2017
 msgid "Signature:"
 msgstr "Podpis:"
 
-#: composer/e-msg-composer.c:2094 mail/mail-account-gui.c:1261
+#: composer/e-msg-composer.c:2057 mail/mail-account-gui.c:1261
 msgid "Autogenerated"
 msgstr "automatický"
 
-#: composer/e-msg-composer.c:2274 composer/e-msg-composer.c:2970
-#: composer/e-msg-composer.c:2971
+#: composer/e-msg-composer.c:2233 composer/e-msg-composer.c:2902
+#: composer/e-msg-composer.c:2903
 msgid "Compose a message"
 msgstr "Napsat zprávu"
 
-#: composer/e-msg-composer.c:3002
+#: composer/e-msg-composer.c:2934
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
@@ -10746,7 +10637,7 @@ msgstr ""
 "Nelze vytvořit okno pro psaní zpráv:\n"
 "Nelze aktivovat ovládací prvek pro výběr adresy."
 
-#: composer/e-msg-composer.c:3030
+#: composer/e-msg-composer.c:2962
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component.\n"
@@ -10758,7 +10649,7 @@ msgstr ""
 "Ujistěte se prosím, že máte instalovanou\n"
 "správnou verzi gtkhtml a libgtkhtml.\n"
 
-#: composer/e-msg-composer.c:3100
+#: composer/e-msg-composer.c:3029
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component."
@@ -10766,92 +10657,13 @@ msgstr ""
 "Nelze vytvořit okno pro psaní zpráv:\n"
 "Nelze aktivovat komponentu HTML editor."
 
-#: composer/e-msg-composer.c:4110
+#: composer/e-msg-composer.c:4045
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)"
 "<b>"
 msgstr ""
 "<b>(Editor zpráv obsahuje netextové tělo zprávy, které nelze upravit.)<b>"
 
-#: composer/e-msg-composer-hdrs.c:290
-#, fuzzy
-msgid "You need to configure an account before you can compose mail."
-msgstr ""
-"Než začnete psát zprávu,\n"
-"musíte nastavit účet."
-
-#: composer/e-msg-composer-hdrs.c:483
-msgid "Click here for the address book"
-msgstr "Kliknutím zobrazíte adresář"
-
-#.
-#. * Reply-To:
-#. *
-#. * Create this before we call create_from_optionmenu,
-#. * because that causes from_changed to be called, which
-#. * expects the reply_to fields to be initialized.
-#.
-#: composer/e-msg-composer-hdrs.c:514
-msgid "Reply-To:"
-msgstr "Odpovědět-komu:"
-
-#.
-#. * From
-#.
-#: composer/e-msg-composer-hdrs.c:520
-msgid "From:"
-msgstr "Od:"
-
-#.
-#. * Subject
-#.
-#: composer/e-msg-composer-hdrs.c:526
-msgid "Subject:"
-msgstr "Předmět:"
-
-#: composer/e-msg-composer-hdrs.c:535
-msgid "To:"
-msgstr "Komu:"
-
-#: composer/e-msg-composer-hdrs.c:536
-msgid "Enter the recipients of the message"
-msgstr "Vyplnit příjemce zprávy"
-
-#: composer/e-msg-composer-hdrs.c:539
-msgid "Cc:"
-msgstr "Kopie:"
-
-#: composer/e-msg-composer-hdrs.c:540
-msgid "Enter the addresses that will receive a carbon copy of the message"
-msgstr "Vyplňte adresy, které obdrží kopii této zprávy."
-
-#: composer/e-msg-composer-hdrs.c:543
-msgid "Bcc:"
-msgstr "Skrytá kopie:"
-
-#: composer/e-msg-composer-hdrs.c:544
-msgid ""
-"Enter the addresses that will receive a carbon copy of the message without "
-"appearing in the recipient list of the message."
-msgstr ""
-"Vyplňte adresy, které obdrží kopii, aniž by se objevily v seznamu příjemců "
-"zprávy."
-
-#.
-#. * Post-To
-#.
-#: composer/e-msg-composer-hdrs.c:551
-msgid "Post To:"
-msgstr "Poslat komu:"
-
-#: composer/e-msg-composer-hdrs.c:553
-msgid "Posting destination"
-msgstr "Cíl odeslání"
-
-#: composer/e-msg-composer-select-file.c:119
-msgid "Attach file(s)"
-msgstr "Připojit soubor(y)"
-
 #: data/evolution.desktop.in.h:1
 msgid "The Evolution groupware suite"
 msgstr "Evolution - sada nástrojů pro skupinovou spolupráci"
@@ -11020,7 +10832,7 @@ msgstr ""
 "Soubor s tímto názvem již existuje.\n"
 "Přejete si jej přepsat?"
 
-#: e-util/e-dialog-utils.c:249
+#: e-util/e-dialog-utils.c:249 mail/mail-display.c:200
 msgid "Overwrite file?"
 msgstr "Přepsat soubor?"
 
@@ -11042,210 +10854,90 @@ msgstr "Synchronizované kategorie:"
 
 #. strptime format of a weekday, a date and a time,
 #. in 12-hour format, without seconds.
-#: e-util/e-time-utils.c:185 e-util/e-time-utils.c:398
+#: e-util/e-time-utils.c:172 e-util/e-time-utils.c:385
 msgid "%a %m/%d/%Y %I:%M %p"
 msgstr "%a %d/%m/%Y %I:%M: %p"
 
 #. strptime format of a weekday, a date and a time,
 #. in 24-hour format, without seconds.
-#: e-util/e-time-utils.c:190 e-util/e-time-utils.c:389
+#: e-util/e-time-utils.c:177 e-util/e-time-utils.c:376
 msgid "%a %m/%d/%Y %H:%M"
 msgstr "%a %d/%m/%Y %H:%M:"
 
 #. strptime format of a weekday, a date and a time,
 #. in 12-hour format, without minutes or seconds.
-#: e-util/e-time-utils.c:195
+#: e-util/e-time-utils.c:182
 msgid "%a %m/%d/%Y %I %p"
 msgstr "%a %d/%m/%Y %I %p"
 
 #. strptime format of a weekday, a date and a time,
 #. in 24-hour format, without minutes or seconds.
-#: e-util/e-time-utils.c:200
+#: e-util/e-time-utils.c:187
 msgid "%a %m/%d/%Y %H"
 msgstr "%a %d/%m/%Y %H"
 
 #. strptime format of a date and a time, in 12-hour format.
-#: e-util/e-time-utils.c:211
+#: e-util/e-time-utils.c:198
 msgid "%m/%d/%Y %I:%M:%S %p"
 msgstr "%d/%m/%Y %I:%M:%S %p"
 
 #. strptime format of a date and a time, in 24-hour format.
-#: e-util/e-time-utils.c:215
+#: e-util/e-time-utils.c:202
 msgid "%m/%d/%Y %H:%M:%S"
 msgstr "%d/%m/%Y %H:%M:%S"
 
 #. strptime format of a date and a time, in 12-hour format,
 #. without seconds.
-#: e-util/e-time-utils.c:220
+#: e-util/e-time-utils.c:207
 msgid "%m/%d/%Y %I:%M %p"
 msgstr "%d/%m/%Y %I:%M %p"
 
 #. strptime format of a date and a time, in 24-hour format,
 #. without seconds.
-#: e-util/e-time-utils.c:225
+#: e-util/e-time-utils.c:212
 msgid "%m/%d/%Y %H:%M"
 msgstr "%d/%m/%Y %H:%M"
 
 #. strptime format of a date and a time, in 12-hour format,
 #. without minutes or seconds.
-#: e-util/e-time-utils.c:230
+#: e-util/e-time-utils.c:217
 msgid "%m/%d/%Y %I %p"
 msgstr "%d/%m/%Y %I %p"
 
 #. strptime format of a date and a time, in 24-hour format,
 #. without minutes or seconds.
-#: e-util/e-time-utils.c:235
+#: e-util/e-time-utils.c:222
 msgid "%m/%d/%Y %H"
 msgstr "%d/%m/%Y %H"
 
 #. strptime format for a time of day, in 12-hour format.
-#: e-util/e-time-utils.c:339 e-util/e-time-utils.c:438
+#: e-util/e-time-utils.c:326 e-util/e-time-utils.c:425
 msgid "%I:%M:%S %p"
 msgstr "%H:%M:%S %p"
 
 #. strptime format for a time of day, in 24-hour format.
-#: e-util/e-time-utils.c:343 e-util/e-time-utils.c:430
+#: e-util/e-time-utils.c:330 e-util/e-time-utils.c:417
 msgid "%H:%M:%S"
 msgstr "%H:%M:%S"
 
 #. strptime format for time of day, without seconds,
 #. in 12-hour format.
-#: e-util/e-time-utils.c:348 e-util/e-time-utils.c:435
-#: widgets/misc/e-dateedit.c:1417 widgets/misc/e-dateedit.c:1642
+#: e-util/e-time-utils.c:335 e-util/e-time-utils.c:422
+#: widgets/misc/e-dateedit.c:1404 widgets/misc/e-dateedit.c:1617
 msgid "%I:%M %p"
 msgstr "%H:%M, %x"
 
 #. strptime format for time of day, without seconds 24-hour format.
-#: e-util/e-time-utils.c:352 e-util/e-time-utils.c:427
-#: widgets/misc/e-dateedit.c:1414 widgets/misc/e-dateedit.c:1639
+#: e-util/e-time-utils.c:339 e-util/e-time-utils.c:414
+#: widgets/misc/e-dateedit.c:1401 widgets/misc/e-dateedit.c:1614
 msgid "%H:%M"
 msgstr "%H:%M"
 
 #. strptime format for hour and AM/PM, 12-hour format.
-#: e-util/e-time-utils.c:356
+#: e-util/e-time-utils.c:343
 msgid "%I %p"
 msgstr "%I %p"
 
-#: executive-summary/component/component-factory.c:151
-#, fuzzy
-msgid "Cannot initialize Evolution's Executive Summary component."
-msgstr "Komponenta souhrnu Evolution"
-
-#: executive-summary/component/e-summary.c:925
-#, fuzzy, c-format
-msgid ""
-"Cannot open the HTML file:\n"
-"%s"
-msgstr ""
-"Nelze přejmenovat složku:\n"
-"%s"
-
-#: executive-summary/component/e-summary.c:939
-#, fuzzy, c-format
-msgid ""
-"Error reading data:\n"
-"%s"
-msgstr "Chyba při načítání %s"
-
-#: executive-summary/component/e-summary.c:957
-msgid "File does not have a place for the services.\n"
-msgstr ""
-
-#: executive-summary/component/e-summary-callbacks.c:125
-#, fuzzy
-msgid "Select a service"
-msgstr "Vyberte soubor"
-
-#: executive-summary/component/e-summary-callbacks.c:289
-msgid ""
-"You can select a different HTML page for the background of the Executive "
-"Summary.\n"
-"\n"
-"Just leave it blank for the default"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:69
-#: executive-summary/component/e-summary-url.c:74
-#: executive-summary/component/e-summary-url.c:81
-#, c-format
-msgid "Open %s with the default GNOME application"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:70
-#, c-format
-msgid "Open %s with the default GNOME web browser"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:71
-#, fuzzy, c-format
-msgid "Send an email to %s"
-msgstr "Poslat e-mail"
-
-#: executive-summary/component/e-summary-url.c:72
-#, fuzzy, c-format
-msgid "Change the view to %s"
-msgstr "Typ náhledu, který má být ukázán"
-
-#: executive-summary/component/e-summary-url.c:73
-#, fuzzy, c-format
-msgid "Run %s"
-msgstr "URL: %s"
-
-#: executive-summary/component/e-summary-url.c:75
-#, fuzzy, c-format
-msgid "Close %s"
-msgstr "Zavřít"
-
-#: executive-summary/component/e-summary-url.c:76
-#, fuzzy, c-format
-msgid "Move %s to the left"
-msgstr "Přesunout tuto složku na jiné místo"
-
-#: executive-summary/component/e-summary-url.c:77
-#, c-format
-msgid "Move %s to the right"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:78
-#, c-format
-msgid "Move %s into the previous row"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:79
-#, c-format
-msgid "Move %s into the next row"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:80
-#, fuzzy, c-format
-msgid "Configure %s"
-msgstr "Znovu nastavit /%s"
-
-#: executive-summary/component/e-summary-url.c:553
-#, fuzzy
-msgid "page"
-msgstr "Stránka"
-
-#: executive-summary/test-service/rdf-summary.c:512
-#: executive-summary/test-service/rdf-summary.c:549
-#: executive-summary/test-service/rdf-summary.c:594
-msgid "Error"
-msgstr "Chyba"
-
-#: executive-summary/test-service/rdf-summary.c:775
-msgid "Update automatically"
-msgstr ""
-
-#: executive-summary/test-service/rdf-summary.c:785
-#, fuzzy
-msgid "Update now"
-msgstr "Zaktualizovat"
-
-#: executive-summary/test-service/rdf-summary.c:795
-#, fuzzy
-msgid "Update every "
-msgstr "_Aktualizovat volný/obsazený čas"
-
 #: filter/filter-datespec.c:65
 msgid "1 second ago"
 msgstr "1 sekunda nazpět"
@@ -11361,6 +11053,84 @@ msgstr "Musíte uvést složku."
 msgid "Select Folder"
 msgstr "Vybrat složku"
 
+#: filter/filter-input.c:191
+#, c-format
+msgid ""
+"Error in regular expression '%s':\n"
+"%s"
+msgstr ""
+"Chyba v regulérním výrazu '%s':\n"
+"%s"
+
+#: filter/filter-label.c:121 filter/libfilter-i18n.h:26 mail/mail-config.c:65
+#: mail/mail-config.glade.h:62 shell/e-config-upgrade.c:1411
+msgid "Important"
+msgstr "Důležité"
+
+#. red
+#: filter/filter-label.c:122 mail/mail-config.c:66
+#: mail/mail-config.glade.h:129 shell/e-config-upgrade.c:1412
+msgid "Work"
+msgstr "Pracovní"
+
+#. orange
+#: filter/filter-label.c:123 mail/mail-config.c:67 mail/mail-config.glade.h:84
+#: shell/e-config-upgrade.c:1413
+msgid "Personal"
+msgstr "Osobní"
+
+#. forest green
+#: filter/filter-label.c:124 mail/mail-config.c:68
+#: mail/mail-config.glade.h:120 shell/e-config-upgrade.c:1414
+msgid "To Do"
+msgstr "Udělat"
+
+#. blue
+#: filter/filter-label.c:125 mail/mail-config.c:69 mail/mail-config.glade.h:66
+#: shell/e-config-upgrade.c:1415
+msgid "Later"
+msgstr "Později"
+
+#: filter/filter-part.c:531 shell/evolution-test-component.c:63
+msgid "Test"
+msgstr "Test"
+
+#: filter/filter-rule.c:219
+msgid "You must name this filter."
+msgstr "Musíte pojmenovat tento filtr."
+
+#: filter/filter-rule.c:751
+msgid "Rule name: "
+msgstr "Název pravidla: "
+
+#: filter/filter-rule.c:755
+msgid "Untitled"
+msgstr "Bez názvu"
+
+#: filter/filter-rule.c:772
+msgid "If"
+msgstr "Pokud"
+
+#: filter/filter-rule.c:791
+msgid "Execute actions"
+msgstr "Provést akce"
+
+#: filter/filter-rule.c:795
+msgid "if all criteria are met"
+msgstr "pokud souhlasí všechna kritéria"
+
+#: filter/filter-rule.c:800
+msgid "if any criteria are met"
+msgstr "pokud souhlasí některá kritéria"
+
+#: filter/filter-rule.c:895
+msgid "incoming"
+msgstr "příchozí"
+
+#: filter/filter-rule.c:895
+msgid "outgoing"
+msgstr "odchozí"
+
 #: filter/filter.glade.h:1
 msgid "Compare against"
 msgstr "Porovnat"
@@ -11461,84 +11231,6 @@ msgstr "pro všechny lokální složky"
 msgid "years"
 msgstr "roky/let"
 
-#: filter/filter-input.c:191
-#, c-format
-msgid ""
-"Error in regular expression '%s':\n"
-"%s"
-msgstr ""
-"Chyba v regulérním výrazu '%s':\n"
-"%s"
-
-#: filter/filter-label.c:121 filter/libfilter-i18n.h:17 mail/mail-config.c:65
-#: mail/mail-config.glade.h:62 shell/e-config-upgrade.c:1454
-msgid "Important"
-msgstr "Důležité"
-
-#. red
-#: filter/filter-label.c:122 mail/mail-config.c:66
-#: mail/mail-config.glade.h:129 shell/e-config-upgrade.c:1455
-msgid "Work"
-msgstr "Pracovní"
-
-#. orange
-#: filter/filter-label.c:123 mail/mail-config.c:67 mail/mail-config.glade.h:84
-#: shell/e-config-upgrade.c:1456
-msgid "Personal"
-msgstr "Osobní"
-
-#. forest green
-#: filter/filter-label.c:124 mail/mail-config.c:68
-#: mail/mail-config.glade.h:120 shell/e-config-upgrade.c:1457
-msgid "To Do"
-msgstr "Udělat"
-
-#. blue
-#: filter/filter-label.c:125 mail/mail-config.c:69 mail/mail-config.glade.h:66
-#: shell/e-config-upgrade.c:1458
-msgid "Later"
-msgstr "Později"
-
-#: filter/filter-part.c:531 shell/evolution-test-component.c:63
-msgid "Test"
-msgstr "Test"
-
-#: filter/filter-rule.c:219
-msgid "You must name this filter."
-msgstr "Musíte pojmenovat tento filtr."
-
-#: filter/filter-rule.c:751
-msgid "Rule name: "
-msgstr "Název pravidla: "
-
-#: filter/filter-rule.c:755
-msgid "Untitled"
-msgstr "Bez názvu"
-
-#: filter/filter-rule.c:772
-msgid "If"
-msgstr "Pokud"
-
-#: filter/filter-rule.c:791
-msgid "Execute actions"
-msgstr "Provést akce"
-
-#: filter/filter-rule.c:795
-msgid "if all criteria are met"
-msgstr "pokud souhlasí všechna kritéria"
-
-#: filter/filter-rule.c:800
-msgid "if any criteria are met"
-msgstr "pokud souhlasí některá kritéria"
-
-#: filter/filter-rule.c:895
-msgid "incoming"
-msgstr "příchozí"
-
-#: filter/filter-rule.c:895
-msgid "outgoing"
-msgstr "odchozí"
-
 #. Automatically generated. Do not edit.
 #: filter/libfilter-i18n.h:2
 msgid "Adjust Score"
@@ -11561,217 +11253,217 @@ msgid "Beep"
 msgstr "Pípnutí"
 
 #: filter/libfilter-i18n.h:7
+msgid "contains"
+msgstr "obsahuje"
+
+#: filter/libfilter-i18n.h:8
 msgid "Copy to Folder"
 msgstr "Kopírovat do složky"
 
-#: filter/libfilter-i18n.h:8
+#: filter/libfilter-i18n.h:9
 msgid "Date received"
 msgstr "Datum přijetí"
 
-#: filter/libfilter-i18n.h:9
+#: filter/libfilter-i18n.h:10
 msgid "Date sent"
 msgstr "Datum odeslání"
 
-#: filter/libfilter-i18n.h:11
+#: filter/libfilter-i18n.h:12
 msgid "Deleted"
 msgstr "Smazáno"
 
-#: filter/libfilter-i18n.h:12
-msgid "Do Not Exist"
-msgstr "Neexistuje"
-
 #: filter/libfilter-i18n.h:13
-msgid "Draft"
-msgstr "Koncept"
+msgid "does not contain"
+msgstr "neobsahuje"
 
 #: filter/libfilter-i18n.h:14
-msgid "Exist"
-msgstr "Existuje"
+msgid "does not end with"
+msgstr "nekončí na"
 
 #: filter/libfilter-i18n.h:15
-msgid "Expression"
-msgstr "Výraz"
+msgid "does not exist"
+msgstr "neexistuje"
 
 #: filter/libfilter-i18n.h:16
-msgid "Follow Up"
-msgstr "Follow Up"
+msgid "does not return"
+msgstr "nevrací"
+
+#: filter/libfilter-i18n.h:17
+msgid "does not sound like"
+msgstr "nezní jako"
 
 #: filter/libfilter-i18n.h:18
-msgid "Label"
-msgstr "Štítek"
+msgid "does not start with"
+msgstr "nezačíná na"
 
 #: filter/libfilter-i18n.h:19
-msgid "Mailing list"
-msgstr "Poštovní konference"
+msgid "Do Not Exist"
+msgstr "Neexistuje"
 
 #: filter/libfilter-i18n.h:20
-msgid "Message Body"
-msgstr "Tělo zprávy"
+msgid "Draft"
+msgstr "Koncept"
 
 #: filter/libfilter-i18n.h:21
-msgid "Message Header"
-msgstr "Hlavička zprávy"
+msgid "ends with"
+msgstr "končí na"
 
 #: filter/libfilter-i18n.h:22
-msgid "Move to Folder"
-msgstr "Přesunout do složky"
+msgid "Exist"
+msgstr "Existuje"
 
 #: filter/libfilter-i18n.h:23
-msgid "Pipe Message to Shell Command"
-msgstr "Předat zprávu příkazu shellu rourou"
+msgid "exists"
+msgstr "existuje"
 
 #: filter/libfilter-i18n.h:24
-msgid "Play Sound"
-msgstr "Přehrát zvuk"
-
-#: filter/libfilter-i18n.h:25 mail/message-tag-followup.c:68
-msgid "Read"
-msgstr "Přečteno"
+msgid "Expression"
+msgstr "Výraz"
 
-#: filter/libfilter-i18n.h:26
-msgid "Recipients"
-msgstr "Příjemce"
+#: filter/libfilter-i18n.h:25
+msgid "Follow Up"
+msgstr "Follow Up"
 
 #: filter/libfilter-i18n.h:27
-msgid "Regex Match"
-msgstr "Odp. regul. výrazu"
+msgid "is"
+msgstr "je"
 
 #: filter/libfilter-i18n.h:28
-msgid "Replied to"
-msgstr "Odpovězeno komu:"
+msgid "is after"
+msgstr "je po"
 
-#: filter/libfilter-i18n.h:29 filter/score-rule.c:184 filter/score-rule.c:186
-#: mail/message-list.etspec.h:10
-msgid "Score"
-msgstr "Skóre"
+#: filter/libfilter-i18n.h:29
+msgid "is before"
+msgstr "je před"
 
 #: filter/libfilter-i18n.h:30
-msgid "Sender"
-msgstr "Odesílatel"
+msgid "is Flagged"
+msgstr "je označený"
 
 #: filter/libfilter-i18n.h:31
-msgid "Set Status"
-msgstr "Nastavit stav"
+msgid "is greater than"
+msgstr "je více než"
 
 #: filter/libfilter-i18n.h:32
-msgid "Shell Command"
-msgstr "Příkaz shellu"
+msgid "is less than"
+msgstr "je méně než"
 
 #: filter/libfilter-i18n.h:33
-msgid "Size (kB)"
-msgstr "Velikost (kB)"
+msgid "is not"
+msgstr "není"
 
 #: filter/libfilter-i18n.h:34
-msgid "Source Account"
-msgstr "Zdrojový účet"
+msgid "is not Flagged"
+msgstr "není označený"
 
-#: filter/libfilter-i18n.h:35
-msgid "Specific header"
-msgstr "Specifická hlavička"
+#: filter/libfilter-i18n.h:35 mail/folder-browser.c:1800
+msgid "Label"
+msgstr "Štítek"
+
+#: filter/libfilter-i18n.h:36
+msgid "Mailing list"
+msgstr "Poštovní konference"
 
 #: filter/libfilter-i18n.h:37
-msgid "Stop Processing"
-msgstr "Zastavit zpracování"
+msgid "Message Body"
+msgstr "Tělo zprávy"
 
-#: filter/libfilter-i18n.h:38 mail/message-list.etspec.h:13
-#: mail/message-tag-followup.c:305
-msgid "Subject"
-msgstr "Předmět"
+#: filter/libfilter-i18n.h:38
+msgid "Message Header"
+msgstr "Hlavička zprávy"
 
 #: filter/libfilter-i18n.h:39
-msgid "Unset Status"
-msgstr "Odnastavit stav"
+msgid "Move to Folder"
+msgstr "Přesunout do složky"
 
 #: filter/libfilter-i18n.h:40
-msgid "contains"
-msgstr "obsahuje"
+msgid "Pipe Message to Shell Command"
+msgstr "Předat zprávu příkazu shellu rourou"
 
 #: filter/libfilter-i18n.h:41
-msgid "does not contain"
-msgstr "neobsahuje"
+msgid "Play Sound"
+msgstr "Přehrát zvuk"
 
-#: filter/libfilter-i18n.h:42
-msgid "does not end with"
-msgstr "nekončí na"
+#: filter/libfilter-i18n.h:42 mail/message-tag-followup.c:68
+msgid "Read"
+msgstr "Přečteno"
 
 #: filter/libfilter-i18n.h:43
-msgid "does not exist"
-msgstr "neexistuje"
+msgid "Recipients"
+msgstr "Příjemce"
 
 #: filter/libfilter-i18n.h:44
-msgid "does not return"
-msgstr "nevrací"
+msgid "Regex Match"
+msgstr "Odp. regul. výrazu"
 
 #: filter/libfilter-i18n.h:45
-msgid "does not sound like"
-msgstr "nezní jako"
+msgid "Replied to"
+msgstr "Odpovězeno komu:"
 
 #: filter/libfilter-i18n.h:46
-msgid "does not start with"
-msgstr "nezačíná na"
+msgid "returns"
+msgstr "vrací"
 
 #: filter/libfilter-i18n.h:47
-msgid "ends with"
-msgstr "končí na"
+msgid "returns greater than"
+msgstr "vrací více než"
 
 #: filter/libfilter-i18n.h:48
-msgid "exists"
-msgstr "existuje"
+msgid "returns less than"
+msgstr "vrací méně než"
 
-#: filter/libfilter-i18n.h:49
-msgid "is Flagged"
-msgstr "je označený"
+#: filter/libfilter-i18n.h:49 filter/score-rule.c:184 filter/score-rule.c:186
+#: mail/message-list.etspec.h:10
+msgid "Score"
+msgstr "Skóre"
 
-#: filter/libfilter-i18n.h:50
-msgid "is after"
-msgstr "je po"
+#: filter/libfilter-i18n.h:50 mail/mail-callbacks.c:1820
+msgid "Sender"
+msgstr "Odesílatel"
 
 #: filter/libfilter-i18n.h:51
-msgid "is before"
-msgstr "je před"
+msgid "Set Status"
+msgstr "Nastavit stav"
 
 #: filter/libfilter-i18n.h:52
-msgid "is greater than"
-msgstr "je více než"
+msgid "Shell Command"
+msgstr "Příkaz shellu"
 
 #: filter/libfilter-i18n.h:53
-msgid "is less than"
-msgstr "je méně než"
+msgid "Size (kB)"
+msgstr "Velikost (kB)"
 
 #: filter/libfilter-i18n.h:54
-msgid "is not Flagged"
-msgstr "není označený"
+msgid "sounds like"
+msgstr "zní jako"
 
 #: filter/libfilter-i18n.h:55
-msgid "is not"
-msgstr "není"
+msgid "Source Account"
+msgstr "Zdrojový účet"
 
 #: filter/libfilter-i18n.h:56
-msgid "is"
-msgstr "je"
+msgid "Specific header"
+msgstr "Specifická hlavička"
 
 #: filter/libfilter-i18n.h:57
-msgid "returns greater than"
-msgstr "vrací více než"
-
-#: filter/libfilter-i18n.h:58
-msgid "returns less than"
-msgstr "vrací méně než"
+msgid "starts with"
+msgstr "začíná na"
 
 #: filter/libfilter-i18n.h:59
-msgid "returns"
-msgstr "vrací"
+msgid "Stop Processing"
+msgstr "Zastavit zpracování"
 
-#: filter/libfilter-i18n.h:60
-msgid "sounds like"
-msgstr "zní jako"
+#: filter/libfilter-i18n.h:60 mail/mail-format.c:934
+#: mail/message-list.etspec.h:13 mail/message-tag-followup.c:305
+msgid "Subject"
+msgstr "Předmět"
 
 #: filter/libfilter-i18n.h:61
-msgid "starts with"
-msgstr "začíná na"
+msgid "Unset Status"
+msgstr "Odnastavit stav"
 
-#: filter/rule-context.c:684 filter/rule-editor.c:241 filter/rule-editor.c:326
-#: mail/mail-vfolder.c:916
+#: filter/rule-context.c:664 filter/rule-editor.c:241 filter/rule-editor.c:326
+#: mail/mail-vfolder.c:917
 #, c-format
 msgid "Rule name '%s' is not unique, choose another."
 msgstr "Název pravidla '%s' není unikátní, vyberte jiný."
@@ -11839,9 +11531,10 @@ msgid "Scanning %s"
 msgstr "Prohledávám %s"
 
 #: importers/elm-importer.c:525 importers/netscape-importer.c:2128
-#: importers/pine-importer.c:637 mail/component-factory.c:116
-#: mail/importers/elm-importer.c:526 mail/importers/netscape-importer.c:2085
-#: mail/importers/pine-importer.c:572 my-evolution/my-evolution.glade.h:4
+#: importers/pine-importer.c:637 mail/component-factory.c:117
+#: mail/folder-browser-ui.c:360 mail/importers/elm-importer.c:526
+#: mail/importers/netscape-importer.c:2085 mail/importers/pine-importer.c:572
+#: my-evolution/my-evolution.glade.h:4
 msgid "Mail"
 msgstr "Pošta"
 
@@ -11927,7 +11620,7 @@ msgstr "Evolution importuje vaše stará data z Netscape"
 
 #. Fill in the new fields
 #: importers/netscape-importer.c:1872 mail/importers/netscape-importer.c:1842
-#: mail/mail-ops.c:1106 shell/e-local-storage.c:184
+#: mail/mail-ops.c:1092 shell/e-local-storage.c:184
 msgid "Trash"
 msgstr "Koš"
 
@@ -11941,7 +11634,7 @@ msgid "Scanning directory"
 msgstr "Prohledává se adresář"
 
 #: importers/netscape-importer.c:2047 mail/importers/netscape-importer.c:2015
-#: shell/e-shell-startup-wizard.c:556
+#: shell/e-shell-startup-wizard.c:541
 msgid "Starting import"
 msgstr "Spouští se import"
 
@@ -11977,39 +11670,97 @@ msgstr ""
 msgid "Pine"
 msgstr "Pine"
 
-#: mail/component-factory.c:116
+#: mail/GNOME_Evolution_Mail.server.in.in.h:1
+msgid "Composer Preferences"
+msgstr "Nastavení editoru"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:2
+msgid ""
+"Configure mail preferences, including security and message display, here"
+msgstr ""
+"Zde se nachází nastavení voleb pošty, včetně bezpečnosti a zobrazení zprávy"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:3
+msgid "Configure spell-checking, signatures, and the message composer here"
+msgstr "Zde se nachází nastavení kontroly pravopisu, podpisů a editoru zpráv"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:4
+msgid "Configure your email accounts here"
+msgstr "Zde se nachází nastavení vašich emailových účtů"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:5
+msgid "Evolution Mail"
+msgstr "Evolution Pošta"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:6
+msgid "Evolution Mail accounts configuration control"
+msgstr "Ovládací prvek nastavení účtů pošty Evolution"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:7
+msgid "Evolution Mail component"
+msgstr "Komponenta pošty Evolution"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:8
+msgid "Evolution Mail composer"
+msgstr "Editor zpráv pošty Evolution"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:9
+msgid "Evolution Mail composer configuration control"
+msgstr "Ovládací prvek nastavení editoru zpráv pošty Evolution"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:10
+msgid "Evolution Mail configuration interface"
+msgstr "Konfigurační rozhraní pošty Evolution"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:11
+msgid "Evolution Mail folder viewer"
+msgstr "Prohlížeč složek pošty Evolution"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:12
+msgid "Evolution Mail preferences control"
+msgstr "Ovládací prvek nastavení pošty Evolution."
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:13
+msgid "Mail Accounts"
+msgstr "Emailové účty"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:69
+msgid "Mail Preferences"
+msgstr "Nastavení pošty"
+
+#: mail/component-factory.c:117
 msgid "Folder containing mail"
 msgstr "Složka obsahující poštu"
 
-#: mail/component-factory.c:117
+#: mail/component-factory.c:118
 msgid "Public Mail"
 msgstr "Veřejná pošta"
 
-#: mail/component-factory.c:117
+#: mail/component-factory.c:118
 msgid "Public folder containing mail"
 msgstr "Veřejná složka obsahující poštu"
 
-#: mail/component-factory.c:118
+#: mail/component-factory.c:119
 msgid "Virtual Trash"
 msgstr "Virtuální Odpadkový koš"
 
-#: mail/component-factory.c:118
+#: mail/component-factory.c:119
 msgid "Virtual Trash folder"
 msgstr "Virtuální složka Odpadkový koš"
 
-#: mail/component-factory.c:146
+#: mail/component-factory.c:147
 msgid "This folder cannot contain messages."
 msgstr "Tato složka nemůže obsahovat zprávy."
 
-#: mail/component-factory.c:444
+#: mail/component-factory.c:441
 msgid "Properties..."
 msgstr "Vlastnosti..."
 
-#: mail/component-factory.c:444
+#: mail/component-factory.c:441
 msgid "Change this folder's properties"
 msgstr "Změna vlastností této složky"
 
-#: mail/component-factory.c:826
+#: mail/component-factory.c:819
 msgid ""
 "Some of your mail settings seem corrupt, please check that everything is in "
 "order."
@@ -12017,107 +11768,234 @@ msgstr ""
 "Některá vaše nastavení pošty se zdají být poškozená. Zkontrolujte, zda je "
 "vše v pořádku."
 
-#: mail/component-factory.c:1008
+#: mail/component-factory.c:1000
 msgid "You have not set a mail transport method"
 msgstr "Nemáte nastavený způsob přenosu pošty"
 
-#: mail/component-factory.c:1031
+#: mail/component-factory.c:1023
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr "Máte neodeslané zprávy, chcete přesto skončit?"
 
-#: mail/component-factory.c:1071
+#: mail/component-factory.c:1063
 msgid "New Mail Message"
 msgstr "Nový dopis"
 
-#: mail/component-factory.c:1071
+#: mail/component-factory.c:1063
 msgid "_Mail Message"
 msgstr "_Dopis"
 
-#: mail/component-factory.c:1072
+#: mail/component-factory.c:1064
 msgid "Compose a new mail message"
 msgstr "Napsat nový dopis"
 
-#: mail/component-factory.c:1080
+#: mail/component-factory.c:1072
 msgid "New Message Post"
 msgstr "Nový příspěvek"
 
-#: mail/component-factory.c:1080
+#: mail/component-factory.c:1072
 msgid "_Post Message"
 msgstr "_Poslat zprávu"
 
-#: mail/component-factory.c:1081
+#: mail/component-factory.c:1073
 msgid "Post a new mail message"
 msgstr "Poslat novou zprávu"
 
-#: mail/component-factory.c:1373
+#: mail/component-factory.c:1365
 msgid "Connecting..."
 msgstr "Připojuji se..."
 
-#: mail/component-factory.c:1384
+#: mail/component-factory.c:1376
 msgid "Cannot register storage with shell"
 msgstr "Nelze zaregistrovat sklad u shellu"
 
-#: mail/folder-info.c:70
-msgid "Getting Folder Information"
-msgstr "Získání informací o složce"
+#: mail/folder-browser-ui.c:486
+#, c-format
+msgid "Properties for \"%s\""
+msgstr "Vlastnosti \"%s\""
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:1
-msgid "Composer Preferences"
-msgstr "Nastavení editoru"
+#: mail/folder-browser-ui.c:488
+msgid "Properties"
+msgstr "Vlastnosti"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:2
-msgid ""
-"Configure mail preferences, including security and message display, here"
-msgstr ""
-"Zde se nachází nastavení voleb pošty, včetně bezpečnosti a zobrazení zprávy"
+#: mail/folder-browser.c:327 mail/mail-display.c:394 mail/mail-display.c:942
+#, c-format
+msgid "Could not create temporary directory: %s"
+msgstr "Nelze vytvořit dočasný adresář: %s"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:3
-msgid "Configure spell-checking, signatures, and the message composer here"
-msgstr "Zde se nachází nastavení kontroly pravopisu, podpisů a editoru zpráv"
+#: mail/folder-browser.c:782
+#, c-format
+msgid "%d new"
+msgstr "nové %d"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:4
-msgid "Configure your email accounts here"
-msgstr "Zde se nachází nastavení vašich emailových účtů"
+#: mail/folder-browser.c:785 mail/folder-browser.c:793
+#: mail/folder-browser.c:796
+msgid ", "
+msgstr ", "
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:5
-msgid "Evolution Mail"
-msgstr "Evolution Pošta"
+#: mail/folder-browser.c:787
+#, c-format
+msgid "%d hidden"
+msgstr "skryté %d"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:6
-msgid "Evolution Mail accounts configuration control"
-msgstr "Ovládací prvek nastavení účtů pošty Evolution"
+#: mail/folder-browser.c:789
+#, c-format
+msgid "%d visible"
+msgstr "viditelné %d"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:7
-msgid "Evolution Mail component"
-msgstr "Komponenta pošty Evolution"
+#: mail/folder-browser.c:794
+#, c-format
+msgid "%d selected"
+msgstr "vybráno %d"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:8
-msgid "Evolution Mail composer"
-msgstr "Editor zpráv pošty Evolution"
+#: mail/folder-browser.c:799
+#, c-format
+msgid "%d unsent"
+msgstr "neodesláno %d"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:9
-msgid "Evolution Mail composer configuration control"
-msgstr "Ovládací prvek nastavení editoru zpráv pošty Evolution"
+#: mail/folder-browser.c:801
+#, c-format
+msgid "%d sent"
+msgstr "odesláno %d"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:10
-msgid "Evolution Mail configuration interface"
-msgstr "Konfigurační rozhraní pošty Evolution"
+#: mail/folder-browser.c:803
+#, c-format
+msgid "%d total"
+msgstr "celkem %d"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:11
-msgid "Evolution Mail folder viewer"
-msgstr "Prohlížeč složek pošty Evolution"
+#: mail/folder-browser.c:1182
+msgid "Create _Virtual Folder From Search..."
+msgstr "Vytvořit _virtuální složku z vyhledávání..."
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:12
-msgid "Evolution Mail preferences control"
-msgstr "Ovládací prvek nastavení pošty Evolution."
+#: mail/folder-browser.c:1736
+msgid "VFolder on _Subject"
+msgstr "V-složka podle _předmětu"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:13
-msgid "Mail Accounts"
-msgstr "Emailové účty"
+#: mail/folder-browser.c:1737
+msgid "VFolder on Se_nder"
+msgstr "V-složka podle _odesílatele"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:69
-msgid "Mail Preferences"
-msgstr "Nastavení pošty"
+#: mail/folder-browser.c:1738
+msgid "VFolder on _Recipients"
+msgstr "V-složka podle příje_mců"
+
+#: mail/folder-browser.c:1739
+msgid "VFolder on Mailing _List"
+msgstr "V-složka podle poštovní _konference"
+
+#: mail/folder-browser.c:1743
+msgid "Filter on Sub_ject"
+msgstr "Filtr podle _předmětu"
+
+#: mail/folder-browser.c:1744
+msgid "Filter on Sen_der"
+msgstr "Filtr podle _odesílatele"
+
+#: mail/folder-browser.c:1745
+msgid "Filter on Re_cipients"
+msgstr "Filtr podle příje_mců"
+
+#: mail/folder-browser.c:1746 mail/folder-browser.c:2070
+msgid "Filter on _Mailing List"
+msgstr "Filtr podle poštovní _konference"
+
+#: mail/folder-browser.c:1764
+msgid "_Edit as New Message..."
+msgstr "_Upravit jako novou zprávu..."
+
+#: mail/folder-browser.c:1766
+msgid "_Print"
+msgstr "_Tisknout"
+
+#: mail/folder-browser.c:1770 ui/evolution-mail-message.xml.h:110
+msgid "_Reply to Sender"
+msgstr "_Odpovědět odesílateli"
+
+#: mail/folder-browser.c:1771 ui/evolution-mail-message.xml.h:75
+msgid "Reply to _List"
+msgstr "Odpovědět _do konference"
+
+#: mail/folder-browser.c:1772 ui/evolution-mail-message.xml.h:74
+msgid "Reply to _All"
+msgstr "Odpovědět _všem"
+
+#: mail/folder-browser.c:1773
+msgid "_Forward"
+msgstr "_Přeposlat"
+
+#: mail/folder-browser.c:1777
+msgid "Follo_w Up..."
+msgstr "Follo_w Up..."
+
+#: mail/folder-browser.c:1778
+msgid "Fla_g Completed"
+msgstr "Označit jako _dokončeno"
+
+#: mail/folder-browser.c:1779
+msgid "Cl_ear Flag"
+msgstr "Vymazat _značky"
+
+#. separator here?
+#: mail/folder-browser.c:1783 ui/evolution-mail-message.xml.h:43
+msgid "Mar_k as Read"
+msgstr "Označit jako _přečtené"
+
+#: mail/folder-browser.c:1784
+msgid "Mark as _Unread"
+msgstr "Označit jako _nepřečtené"
+
+#: mail/folder-browser.c:1785
+msgid "Mark as _Important"
+msgstr "Označit jako _důležité"
+
+#: mail/folder-browser.c:1786
+msgid "_Mark as Unimportant"
+msgstr "_Označit jako nedůležité"
+
+#: mail/folder-browser.c:1791
+msgid "U_ndelete"
+msgstr "Obnovit _smazané"
+
+#: mail/folder-browser.c:1795
+msgid "Mo_ve to Folder..."
+msgstr "Pře_sunout do složky..."
+
+#: mail/folder-browser.c:1796 ui/evolution-addressbook.xml.h:31
+msgid "_Copy to Folder..."
+msgstr "_Kopírovat do složky..."
+
+#: mail/folder-browser.c:1804
+msgid "Add Sender to Address_book"
+msgstr "Přidat odesílatele do _adresáře"
+
+#: mail/folder-browser.c:1808
+msgid "Appl_y Filters"
+msgstr "Použít _filtry"
+
+#: mail/folder-browser.c:1812
+msgid "Crea_te Rule From Message"
+msgstr "Vy_tvořit pravidlo ze zprávy"
+
+#: mail/folder-browser.c:2071
+msgid "VFolder on M_ailing List"
+msgstr "V-složku podle _poštovní konference"
+
+#: mail/folder-browser.c:2073
+#, c-format
+msgid "Filter on _Mailing List (%s)"
+msgstr "Filtr podle poštovní ko_nference (%s)"
+
+#: mail/folder-browser.c:2074
+#, c-format
+msgid "VFolder on M_ailing List (%s)"
+msgstr "V-složku podle poštovní _konference (%s)"
+
+#: mail/folder-browser.h:26 mail/mail-config.glade.h:39
+msgid "Default"
+msgstr "Výchozí"
+
+#: mail/folder-info.c:70
+msgid "Getting Folder Information"
+msgstr "Získání informací o složce"
 
 #: mail/importers/GNOME_Evolution_Mail_Elm_Intelligent_Importer.server.in.in.h:1
 msgid "Evolution Elm importer"
@@ -12202,7 +12080,7 @@ msgstr "_Jméno uživatele:"
 msgid "_Path:"
 msgstr "_Cesta:"
 
-#: mail/mail-account-gui.c:1886
+#: mail/mail-account-gui.c:1887
 msgid "You may not create two accounts with the same name."
 msgstr "Nemůžete vytvořit dva účty se stejným jménem."
 
@@ -12233,16 +12111,16 @@ msgstr "[Výchozí]"
 
 #. FIXME: This routine should just be a "toggled" event handler on the checkbox cell renderer which
 #. has "activatable" set.
-#: mail/mail-accounts.c:481 mail/mail-composer-prefs.c:708
-#: mail/mail-composer-prefs.c:854
+#: mail/mail-accounts.c:481 mail/mail-accounts.etspec.h:2
+#: mail/mail-composer-prefs.c:708 mail/mail-composer-prefs.c:854
 msgid "Enabled"
 msgstr "Povoleno"
 
-#: mail/mail-accounts.c:487
+#: mail/mail-accounts.c:487 mail/mail-accounts.etspec.h:1
 msgid "Account name"
 msgstr "Název účtu"
 
-#: mail/mail-accounts.c:489
+#: mail/mail-accounts.c:489 mail/mail-accounts.etspec.h:3
 msgid "Protocol"
 msgstr "Protokol"
 
@@ -12285,6 +12163,217 @@ msgstr ""
 "    '%s'\n"
 "a byla aktualizována."
 
+#. Add the "Don't show this message again." checkbox
+#: mail/mail-callbacks.c:101 widgets/misc/e-messagebox.c:226
+msgid "Don't show this message again."
+msgstr "Příště tuto zprávu nezobrazovat."
+
+#: mail/mail-callbacks.c:190
+msgid ""
+"You have not configured the mail client.\n"
+"You need to do this before you can send,\n"
+"receive or compose mail.\n"
+"Would you like to configure it now?"
+msgstr ""
+"Nemáte nastaveného poštovního klienta.\n"
+"To je nutné udělat před tím, než budete\n"
+"posílat, přijímat nebo psát poštu.\n"
+"Chcete ho nastavit nyní?"
+
+#: mail/mail-callbacks.c:212
+msgid ""
+"You need to configure an account\n"
+"before you can compose mail."
+msgstr ""
+"Než začnete psát zprávu,\n"
+"musíte nastavit účet."
+
+#: mail/mail-callbacks.c:226
+msgid ""
+"You need to configure an identity\n"
+"before you can compose mail."
+msgstr ""
+"Než začnete psát zprávu,\n"
+"musíte nastavit identitu."
+
+#: mail/mail-callbacks.c:233
+msgid ""
+"You need to configure a mail transport\n"
+"before you can compose mail."
+msgstr ""
+"Než začnete psát zprávu,\n"
+"musíte nastavit způsob přenosu."
+
+#. FIXME: this wording sucks
+#: mail/mail-callbacks.c:255
+msgid ""
+"You are sending an HTML-formatted message. Please make sure that\n"
+"the following recipients are willing and able to receive HTML mail:\n"
+msgstr ""
+"Posíláte zprávu ve formátu HTML. Ujistěte se, že následující příjemci\n"
+"si přejí a mohou dostávat zprávy ve formátu HTML:\n"
+
+#: mail/mail-callbacks.c:267
+msgid "Send anyway?"
+msgstr "Přesto poslat?"
+
+#: mail/mail-callbacks.c:288
+msgid ""
+"This message has no subject.\n"
+"Really send?"
+msgstr ""
+"Tato zpráva nemá předmět.\n"
+"Opravdu ji chcete poslat?"
+
+#: mail/mail-callbacks.c:314
+msgid ""
+"Since the contact list you are sending to is configured to hide the list's "
+"addresses, this message will contain only Bcc recipients."
+msgstr ""
+"Protože je seznam kontaktů, na který posíláte zprávu, nastavený tak, aby "
+"skrýval adresy, tato zpráva bude obsahovat pouze adresáty ve skryté kopii."
+
+#: mail/mail-callbacks.c:318
+msgid "This message contains only Bcc recipients."
+msgstr "Tato zpráva je určena pouze skrytým příjemcům."
+
+#: mail/mail-callbacks.c:323
+msgid ""
+"It is possible that the mail server may reveal the recipients by adding an "
+"Apparently-To header.\n"
+"Send anyway?"
+msgstr ""
+"Je možné, že poštovní server zveřejní seznam adresátů přidáním hlavičky "
+"Apparently-To.\n"
+"Přesto poslat?"
+
+#: mail/mail-callbacks.c:472
+msgid "You must specify recipients in order to send this message."
+msgstr "Aby mohla být tato zpráva odeslána, je nutné určit příjemce."
+
+#: mail/mail-callbacks.c:724
+msgid ""
+"Unable to open the drafts folder for this account.\n"
+"Would you like to use the default drafts folder?"
+msgstr ""
+"Není možné otevřít složku konceptů pro tento účet.\n"
+"Chcete použít výchozí složku konceptů?"
+
+#: mail/mail-callbacks.c:1189
+msgid "an unknown sender"
+msgstr "neznámý odesílatel"
+
+#: mail/mail-callbacks.c:1193
+msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
+msgstr "V %a, %d. %m. %Y v %H:%M, %%s píše:"
+
+#: mail/mail-callbacks.c:1700 mail/message-browser.c:132
+msgid "Move message(s) to"
+msgstr "Přesunout zprávu(y) do"
+
+#: mail/mail-callbacks.c:1702 mail/message-browser.c:134
+msgid "Copy message(s) to"
+msgstr "Kopírovat zprávu(y) do"
+
+#: mail/mail-callbacks.c:2344
+#, c-format
+msgid "Are you sure you want to edit all %d messages?"
+msgstr "Opravdu chcete upravit všechny zprávy (%d)?"
+
+#: mail/mail-callbacks.c:2360
+msgid ""
+"You may only edit messages saved\n"
+"in the Drafts folder."
+msgstr ""
+"Upravovat můžete pouze zprávy uložené\n"
+"ve složce Koncepty."
+
+#: mail/mail-callbacks.c:2393
+msgid ""
+"You may only resend messages\n"
+"in the Sent folder."
+msgstr ""
+"Pouze zprávy ze složky Odeslané je možné\n"
+"znovu poslat."
+
+#: mail/mail-callbacks.c:2403
+#, c-format
+msgid "Are you sure you want to resend all %d messages?"
+msgstr "Opravdu chcete přeposlat všechny zprávy (%d)?"
+
+#: mail/mail-callbacks.c:2424
+msgid "No Message Selected"
+msgstr "Žádná vybraná zpráva"
+
+#: mail/mail-callbacks.c:2465
+#, c-format
+msgid ""
+"Cannot save to `%s'\n"
+" %s"
+msgstr ""
+"Nelze uložit do `%s'\n"
+" %s"
+
+#: mail/mail-callbacks.c:2470
+#, c-format
+msgid ""
+"`%s' already exists.\n"
+"Overwrite it?"
+msgstr ""
+"`%s' již existuje.\n"
+"Chcete jej přepsat?"
+
+#: mail/mail-callbacks.c:2511
+msgid "Save Message As..."
+msgstr "Uložit zprávu jako..."
+
+#: mail/mail-callbacks.c:2513
+msgid "Save Messages As..."
+msgstr "Uložit zprávy jako..."
+
+#: mail/mail-callbacks.c:2686
+msgid ""
+"This operation will permanently erase all messages marked as\n"
+"deleted. If you continue, you will not be able to recover these messages.\n"
+"\n"
+"Really erase these messages?"
+msgstr ""
+"Tato operace trvale vymaže všechny zprávy označené jako smazané.\n"
+"Pokud budete pokračovat, nebude už možné tyto zprávy obnovit.\n"
+"\n"
+"Opravdu vymazat tyto zprávy?"
+
+#: mail/mail-callbacks.c:2781
+#, c-format
+msgid ""
+"Error loading filter information:\n"
+"%s"
+msgstr ""
+"Chyba při načítání informací o filtrech:\n"
+"%s"
+
+#: mail/mail-callbacks.c:2789
+msgid "Filters"
+msgstr "Filtry"
+
+#: mail/mail-callbacks.c:2830
+#, c-format
+msgid "Page %d of %d"
+msgstr "Stránka %d z %d"
+
+#: mail/mail-callbacks.c:2886
+msgid "Print Message"
+msgstr "Tisknout zprávu"
+
+#: mail/mail-callbacks.c:2954
+msgid "Printing of message failed"
+msgstr "Tisk zprávy selhal"
+
+#: mail/mail-callbacks.c:3147
+#, c-format
+msgid "Are you sure you want to open all %d messages in separate windows?"
+msgstr "Opravdu chcete otevřít všechny zprávy (%d) v samostatných oknech?"
+
 #: mail/mail-composer-prefs.c:226 mail/mail-composer-prefs.c:349
 #: mail/mail-config.c:1376
 msgid "Unnamed"
@@ -12310,19 +12399,11 @@ msgstr "Přidat skript podpisu"
 msgid "Signature(s)"
 msgstr "Podpis(y)"
 
-#: mail/mail-config.c:1080
-msgid "Checking Service"
-msgstr "Kontroluje se služba"
-
-#: mail/mail-config.c:1158 mail/mail-config.c:1162
-msgid "Connecting to server..."
-msgstr "Připojuji se k serveru..."
-
-#: mail/mail-config-druid.c:367 mail/mail-config.glade.h:61
+#: mail/mail-config-druid.c:380 mail/mail-config.glade.h:61
 msgid "Identity"
 msgstr "Identita"
 
-#: mail/mail-config-druid.c:369
+#: mail/mail-config-druid.c:382
 msgid ""
 "Please enter your name and email address below. The \"optional\" fields "
 "below do not need to be filled in, unless you wish to include this "
@@ -12332,11 +12413,11 @@ msgstr ""
 "být vyplněna, ledaže byste si přáli, aby byly tyto informace obsaženy v "
 "odesílaných emailech."
 
-#: mail/mail-config-druid.c:375 mail/mail-config-druid.c:382
+#: mail/mail-config-druid.c:388 mail/mail-config-druid.c:395
 msgid "Receiving Mail"
 msgstr "Příjem pošty"
 
-#: mail/mail-config-druid.c:377
+#: mail/mail-config-druid.c:390
 msgid ""
 "Please enter information about your incoming mail server below. If you are "
 "not sure, ask your system administrator or Internet Service Provider."
@@ -12344,15 +12425,15 @@ msgstr ""
 "Zadejte prosím informace o svém serveru pro příchozí poštu. Pokud si nejste "
 "jisti, kontaktujte svého správce nebo poskytovatele připojení k Internetu."
 
-#: mail/mail-config-druid.c:384
+#: mail/mail-config-druid.c:397
 msgid "Please select among the following options"
 msgstr "Vyberte si prosím z následujících možností"
 
-#: mail/mail-config-druid.c:387
+#: mail/mail-config-druid.c:400
 msgid "Sending Mail"
 msgstr "Odesílání pošty"
 
-#: mail/mail-config-druid.c:389
+#: mail/mail-config-druid.c:402
 msgid ""
 "Please enter information about the way you will send mail. If you are not "
 "sure, ask your system administrator or Internet Service Provider."
@@ -12360,11 +12441,11 @@ msgstr ""
 "Zadejte prosím informace o způsobu odesílání pošty. Pokud si nejste jisti, "
 "kontaktujte svého správce nebo poskytovatele připojení k Internetu."
 
-#: mail/mail-config-druid.c:394 mail/mail-config.glade.h:10
+#: mail/mail-config-druid.c:407 mail/mail-config.glade.h:10
 msgid "Account Management"
 msgstr "Správa účtu"
 
-#: mail/mail-config-druid.c:396
+#: mail/mail-config-druid.c:409
 msgid ""
 "You are almost done with the mail configuration process. The identity, "
 "incoming mail server and outgoing mail transport method which you provided "
@@ -12377,6 +12458,14 @@ msgstr ""
 "pro vytvoření poštovního účtu Evolution. Zadejte prosím níže název pro tento "
 "účet. Tento název bude použit pouze pro zobrazení."
 
+#: mail/mail-config.c:1080
+msgid "Checking Service"
+msgstr "Kontroluje se služba"
+
+#: mail/mail-config.c:1158 mail/mail-config.c:1162
+msgid "Connecting to server..."
+msgstr "Připojuji se k serveru..."
+
 #: mail/mail-config.glade.h:3
 msgid " _Check for supported types "
 msgstr "Zkontrolovat _podporované typy"
@@ -12497,10 +12586,6 @@ msgstr ""
 msgid "De_fault"
 msgstr "_Výchozí"
 
-#: mail/mail-config.glade.h:39
-msgid "Default"
-msgstr "Výchozí"
-
 #: mail/mail-config.glade.h:40
 msgid "Default Behavior"
 msgstr "Předem nastavené chování"
@@ -12949,25 +13034,212 @@ msgstr "Použít _bezpečné připojení (SSL):"
 msgid "_Use the same fonts as other applications"
 msgstr "Používat _stejná písma jako jiné aplikace"
 
+#: mail/mail-config.glade.h:171
+msgid "color"
+msgstr "barva"
+
 #: mail/mail-config.glade.h:172
 msgid "description"
 msgstr "popis"
 
-#: mail/mail-folder-cache.c:832
+#: mail/mail-crypto.c:84
+msgid "Could not create a S/MIME signature context."
+msgstr "Nepodařilo se vytvořit kontext podpisu S/MIME."
+
+#: mail/mail-crypto.c:116
+msgid "Could not create a S/MIME certsonly context."
+msgstr "Nepodařilo se vytvořit kontext certsonly S/MIME."
+
+#: mail/mail-crypto.c:148
+msgid "Could not create a S/MIME encryption context."
+msgstr "Nepodařilo se vytvořit kontext zašifrovaní S/MIME."
+
+#: mail/mail-crypto.c:180
+msgid "Could not create a S/MIME envelope context."
+msgstr "Nepodařilo se vytvořit kontext obálky S/MIME."
+
+#: mail/mail-crypto.c:211
+msgid "Could not create a S/MIME decode context."
+msgstr "Nepodařilo se vytvořit kontext dekódování S/MIME."
+
+#: mail/mail-display.c:197
+#, c-format
+msgid ""
+"File `%s' already exists.\n"
+"Overwrite it?"
+msgstr ""
+"Soubor `%s' již existuje.\n"
+"Přepsat jej?"
+
+#: mail/mail-display.c:336
+msgid "Save Attachment"
+msgstr "Uložit přílohu"
+
+#: mail/mail-display.c:409
+#, c-format
+msgid "Could not create temporary file '%s': %s"
+msgstr "Nelze vytvořit dočasný soubor '%s': %s"
+
+#: mail/mail-display.c:457
+msgid "Save Attachment..."
+msgstr "Uložit přílohu..."
+
+#: mail/mail-display.c:458
+msgid "View Inline"
+msgstr "Zobrazit v textu"
+
+#: mail/mail-display.c:459
+#, c-format
+msgid "Open in %s..."
+msgstr "Otevřít v %s..."
+
+#: mail/mail-display.c:515
+#, c-format
+msgid "View Inline (via %s)"
+msgstr "Zobrazit v textu (pomocí %s)"
+
+#: mail/mail-display.c:519
+msgid "Hide"
+msgstr "Skrýt"
+
+#: mail/mail-display.c:539
+msgid "External Viewer"
+msgstr "Externí prohlížeč"
+
+#: mail/mail-display.c:1368
+msgid "Downloading images"
+msgstr "Stahování obrázků"
+
+#: mail/mail-display.c:1545
+msgid "Loading message content"
+msgstr "Načítání obsahu zprávy"
+
+#: mail/mail-display.c:1887
+msgid "Overdue:"
+msgstr "Úkoly po termínu:"
+
+#: mail/mail-display.c:1891
+msgid "by %B %d, %Y, %l:%M %P"
+msgstr "do %B %d, %Y, %l:%M %P"
+
+#: mail/mail-display.c:2255
+msgid "Open Link in Browser"
+msgstr "Otevřít odkaz v prohlížeči"
+
+#: mail/mail-display.c:2256
+msgid "Copy Link Location"
+msgstr "Kopírovat umístění odkazu"
+
+#: mail/mail-display.c:2258
+msgid "Save Link as (FIXME)"
+msgstr "Uložit odkaz jako"
+
+#: mail/mail-display.c:2260
+msgid "Save Image as..."
+msgstr "Uložit obrázek jako..."
+
+#: mail/mail-folder-cache.c:745
 #, c-format
 msgid "Pinging %s"
 msgstr "Zkouší se %s"
 
+#: mail/mail-format.c:665
+#, c-format
+msgid "%s attachment"
+msgstr "%s příloha"
+
+#: mail/mail-format.c:707 mail/mail-format.c:1370 mail/mail-format.c:1439
+#: mail/mail-format.c:1559 mail/mail-format.c:1683 mail/mail-format.c:1708
+msgid "Could not parse MIME message. Displaying as source."
+msgstr "Není možné zpracovat zprávu MIME. Zobrazí se jako zdrojový kód."
+
+#: mail/mail-format.c:785 mail/message-list.etspec.h:2
+msgid "Date"
+msgstr "Datum"
+
+#: mail/mail-format.c:871
+msgid "Bad Address"
+msgstr "Špatná adresa"
+
+#: mail/mail-format.c:912 mail/message-list.etspec.h:7
+#: mail/message-tag-followup.c:301
+msgid "From"
+msgstr "Od"
+
+#: mail/mail-format.c:916
+msgid "Reply-To"
+msgstr "Odpovědět-komu"
+
+#: mail/mail-format.c:921 mail/message-list.etspec.h:14
+msgid "To"
+msgstr "Komu"
+
+#: mail/mail-format.c:926
+msgid "Cc"
+msgstr "Kopie"
+
+#: mail/mail-format.c:931
+msgid "Bcc"
+msgstr "Skrytá kopie"
+
+#: mail/mail-format.c:1482
+msgid ""
+"This message is digitally signed. Click the lock icon for more information."
+msgstr ""
+"Tato zpráva je digitálně podepsaná. Kliknutím na ikonu zámku získáte "
+"podrobnosti."
+
+#: mail/mail-format.c:1510
+msgid "Could not create a PGP verfication context"
+msgstr "Nepodařilo se vytvořit kontext ověření PGP."
+
+#: mail/mail-format.c:1518
+msgid "This message is digitally signed and has been found to be authentic."
+msgstr "Tato zpráva je digitálně podepsaná a byla shledána platnou."
+
+#: mail/mail-format.c:1525
+msgid "This message is digitally signed but can not be proven to be authentic."
+msgstr "Tato zpráva je digitálně podepsaná, ale nelze ověřit její platnost."
+
+#: mail/mail-format.c:1789
+#, c-format
+msgid "Pointer to FTP site (%s)"
+msgstr "Odkaz na FTP server (%s)"
+
+#: mail/mail-format.c:1800
+#, c-format
+msgid "Pointer to local file (%s) valid at site \"%s\""
+msgstr "Odkaz na lokální soubor (%s) platný na serveru \"%s\""
+
+#: mail/mail-format.c:1803
+#, c-format
+msgid "Pointer to local file (%s)"
+msgstr "Odkaz na lokální soubor (%s)"
+
+#: mail/mail-format.c:1830
+#, c-format
+msgid "Pointer to remote data (%s)"
+msgstr "Odkaz na vzdálená data (%s)"
+
+#: mail/mail-format.c:1836
+#, c-format
+msgid "Pointer to unknown external data (\"%s\" type)"
+msgstr "Odkaz na neznámá externí data (typ \"%s\")"
+
+#: mail/mail-format.c:1838
+msgid "Malformed external-body part."
+msgstr "Chybná část externího těla."
+
 #: mail/mail-local.c:541 mail/mail-local.c:543
 #, c-format
 msgid "Local folders/%s"
 msgstr "Místní složky/%s"
 
-#: mail/mail-local.c:711
+#: mail/mail-local.c:671
 msgid "Reconfiguring folder"
 msgstr "Znovu nastavuji složku"
 
-#: mail/mail-local.c:792
+#: mail/mail-local.c:752
 #, c-format
 msgid ""
 "Cannot save folder metainfo; you may find you can't\n"
@@ -12976,22 +13248,22 @@ msgstr ""
 "Nelze uložit metainformace složky, asi zjistíte,\n"
 "že ji již není možné ani otevřít: %s: %s"
 
-#: mail/mail-local.c:848
+#: mail/mail-local.c:808
 #, c-format
 msgid "Cannot save folder metainfo to %s: %s"
 msgstr "Nelze uložit metainformace složky do %s: %s"
 
-#: mail/mail-local.c:900
+#: mail/mail-local.c:860
 #, c-format
 msgid "Cannot delete folder metadata %s: %s"
 msgstr "Nelze odstranit metainformace složky %s: %s"
 
-#: mail/mail-local.c:1363
+#: mail/mail-local.c:1323
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "Mění se složka \"%s\" na formát \"%s\""
 
-#: mail/mail-local.c:1388
+#: mail/mail-local.c:1348
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
@@ -12999,16 +13271,16 @@ msgstr ""
 "Pokud již nemůžete otevřít tuto poštovní schránku, budete\n"
 "ji možná muset opravit ručně."
 
-#: mail/mail-local.c:1488
+#: mail/mail-local.c:1448
 #, c-format
 msgid "Reconfigure /%s"
 msgstr "Znovu nastavit /%s"
 
-#: mail/mail-local.c:1552
+#: mail/mail-local.c:1512
 msgid "You cannot change the format of a non-local folder."
 msgstr "Nemůžete změnit formát nelokálních složek."
 
-#: mail/mail-mt.c:259
+#: mail/mail-mt.c:257
 #, c-format
 msgid ""
 "Error while '%s':\n"
@@ -13017,7 +13289,7 @@ msgstr ""
 "Chyba během '%s':\n"
 "%s"
 
-#: mail/mail-mt.c:262
+#: mail/mail-mt.c:260
 #, c-format
 msgid ""
 "Error while performing operation:\n"
@@ -13026,131 +13298,118 @@ msgstr ""
 "Chyba při vykonávání operace:\n"
 "%s"
 
-#: mail/mail-mt.c:913
+#: mail/mail-mt.c:904
 msgid "Working"
 msgstr "Pracuje se"
 
-#: mail/mail-ops.c:87
+#: mail/mail-ops.c:86
 msgid "Filtering Folder"
 msgstr "Filtruje se složka"
 
-#: mail/mail-ops.c:260
+#: mail/mail-ops.c:264
 msgid "Fetching Mail"
 msgstr "Přijímá se pošta"
 
-#: mail/mail-ops.c:557
-#, fuzzy, c-format
-msgid "Failed to apply outgoing filters: %s"
-msgstr "Nepodařilo se uložit poštu v dočasném souboru %s: %s"
+#: mail/mail-ops.c:550 mail/mail-ops.c:579
+msgid "However, the message was successfully sent."
+msgstr "Zpráva byla ale úspěšně odeslána."
 
-#: mail/mail-ops.c:578
-#, c-format
-msgid ""
-"Failed to append to %s: %s\n"
-"Appending to local `Sent' folder instead."
-msgstr ""
-
-#: mail/mail-ops.c:587
-#, fuzzy, c-format
-msgid "Failed to append to local `Sent' folder: %s"
-msgstr "Nepodařilo se uložit poštu v dočasném souboru %s: %s"
-
-#: mail/mail-ops.c:629
+#: mail/mail-ops.c:611
 #, c-format
 msgid "Sending \"%s\""
 msgstr "Posílá se \"%s\""
 
-#: mail/mail-ops.c:747
+#: mail/mail-ops.c:729
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Posílá se zpráva č. %d z %d"
 
-#: mail/mail-ops.c:766
+#: mail/mail-ops.c:748
 #, c-format
 msgid "Failed on message %d of %d"
 msgstr "Selhání na zprávě %d z %d"
 
-#: mail/mail-ops.c:768
+#: mail/mail-ops.c:750 mail/mail-send-recv.c:581
 msgid "Complete."
 msgstr "Dokončeno."
 
-#: mail/mail-ops.c:862
+#: mail/mail-ops.c:844
 msgid "Saving message to folder"
 msgstr "Ukládá se zpráva do složky"
 
-#: mail/mail-ops.c:943
+#: mail/mail-ops.c:925
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Přesouvají se zprávy do %s"
 
-#: mail/mail-ops.c:943
+#: mail/mail-ops.c:925
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Kopírují se zprávy do %s"
 
-#: mail/mail-ops.c:1056
+#: mail/mail-ops.c:1042
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Prochází se složky v \"%s\""
 
-#: mail/mail-ops.c:1244
+#: mail/mail-ops.c:1225
 msgid "Forwarded messages"
 msgstr "Přeposlané zprávy"
 
-#: mail/mail-ops.c:1287
+#: mail/mail-ops.c:1268
 #, c-format
 msgid "Opening folder %s"
 msgstr "Otevírá se složka %s"
 
-#: mail/mail-ops.c:1359
+#: mail/mail-ops.c:1340
 #, c-format
 msgid "Opening store %s"
 msgstr "Otevírá se úložiště %s"
 
-#: mail/mail-ops.c:1437
+#: mail/mail-ops.c:1413
 #, c-format
 msgid "Removing folder %s"
 msgstr "Odstraňuje se složka %s"
 
-#: mail/mail-ops.c:1531
+#: mail/mail-ops.c:1507
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Ukládá se složka '%s'"
 
-#: mail/mail-ops.c:1582
+#: mail/mail-ops.c:1558
 msgid "Refreshing folder"
 msgstr "Aktualizuje se složka"
 
-#: mail/mail-ops.c:1618 mail/mail-ops.c:1669
+#: mail/mail-ops.c:1594 mail/mail-ops.c:1645
 msgid "Expunging folder"
 msgstr "Čistí se složka"
 
-#: mail/mail-ops.c:1666
+#: mail/mail-ops.c:1642
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "Vyprazdňuji koš v '%s'"
 
-#: mail/mail-ops.c:1667 my-evolution/e-summary-mail.c:483
+#: mail/mail-ops.c:1643 my-evolution/e-summary-mail.c:483
 #: shell/e-local-storage.c:1151
 msgid "Local Folders"
 msgstr "Místní složky"
 
-#: mail/mail-ops.c:1742
+#: mail/mail-ops.c:1718
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Získává se zpráva %s"
 
-#: mail/mail-ops.c:1814
+#: mail/mail-ops.c:1790
 #, c-format
 msgid "Retrieving %d message(s)"
 msgstr "Získávají se zprávy (%d)"
 
-#: mail/mail-ops.c:1898
+#: mail/mail-ops.c:1876
 #, c-format
 msgid "Saving %d messsage(s)"
 msgstr "Ukládají se zprávy (%d)"
 
-#: mail/mail-ops.c:1946
+#: mail/mail-ops.c:1924
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -13159,7 +13418,7 @@ msgstr ""
 "Nepodařilo se vytvořit výstupní soubor: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1974
+#: mail/mail-ops.c:1952
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -13168,11 +13427,11 @@ msgstr ""
 "Chyba při ukládání zpráv do: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2045
+#: mail/mail-ops.c:2026
 msgid "Saving attachment"
 msgstr "Ukládá se příloha"
 
-#: mail/mail-ops.c:2062
+#: mail/mail-ops.c:2043
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -13181,74 +13440,106 @@ msgstr ""
 "Nepodařilo se vytvořit výstupní soubor: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2092
+#: mail/mail-ops.c:2073
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Nelze zapisovat data: %s"
 
-#: mail/mail-ops.c:2240
+#: mail/mail-ops.c:2221
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Odpojuji se od %s"
 
-#: mail/mail-ops.c:2240
+#: mail/mail-ops.c:2221
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Znovu se připojuji na %s"
 
-#: mail/mail-send-recv.c:147
+#: mail/mail-search.c:154
+msgid "(Untitled Message)"
+msgstr "(Nepojmenovaná zpráva)"
+
+#: mail/mail-search.c:236
+msgid "Untitled Message"
+msgstr "Nepojmenovaná zpráva"
+
+#: mail/mail-search.c:238
+msgid "Empty Message"
+msgstr "Prázdná zpráva"
+
+#: mail/mail-search.c:287
+msgid "Find in Message"
+msgstr "Hledat ve zprávě"
+
+#: mail/mail-search.c:320
+msgid "Case Sensitive"
+msgstr "Rozlišovat malá/velká"
+
+#: mail/mail-search.c:322
+msgid "Search Forward"
+msgstr "Hledat dopředu"
+
+#: mail/mail-search.c:342
+msgid "Find:"
+msgstr "Hledat:"
+
+#: mail/mail-search.c:346
+msgid "Matches:"
+msgstr "Odpovídá:"
+
+#: mail/mail-send-recv.c:146
 msgid "Cancelling..."
 msgstr "Ruší se..."
 
-#: mail/mail-send-recv.c:255
+#: mail/mail-send-recv.c:254
 #, c-format
 msgid "Server: %s, Type: %s"
 msgstr "Server: %s, typ: %s"
 
-#: mail/mail-send-recv.c:257
+#: mail/mail-send-recv.c:256
 #, c-format
 msgid "Path: %s, Type: %s"
 msgstr "Cesta: %s, Typ: %s"
 
-#: mail/mail-send-recv.c:259
+#: mail/mail-send-recv.c:258
 #, c-format
 msgid "Type: %s"
 msgstr "Typ: %s"
 
-#: mail/mail-send-recv.c:308
+#: mail/mail-send-recv.c:306
 msgid "Send & Receive Mail"
 msgstr "Odeslat a přijmout poštu"
 
-#: mail/mail-send-recv.c:309
+#: mail/mail-send-recv.c:307
 msgid "Cancel _All"
 msgstr "Zrušit _vše"
 
-#: mail/mail-send-recv.c:390
+#: mail/mail-send-recv.c:389
 msgid "Updating..."
 msgstr "Aktualizuje se..."
 
-#: mail/mail-send-recv.c:390 mail/mail-send-recv.c:442
+#: mail/mail-send-recv.c:390 mail/mail-send-recv.c:446
 msgid "Waiting..."
 msgstr "Čeká se..."
 
-#: mail/mail-session.c:229
+#: mail/mail-session.c:226
 msgid "User canceled operation."
 msgstr "Uživatel zrušil operaci."
 
-#: mail/mail-session.c:262
+#: mail/mail-session.c:259
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Zadat heslo pro %s"
 
-#: mail/mail-session.c:264
+#: mail/mail-session.c:261
 msgid "Enter Password"
 msgstr "Zadat heslo"
 
-#: mail/mail-session.c:287
+#: mail/mail-session.c:284
 msgid "_Remember this password"
 msgstr "_Zapamatovat si toto heslo"
 
-#: mail/mail-session.c:288
+#: mail/mail-session.c:285
 msgid "_Remember this password for the remainder of this session"
 msgstr "_Zapamatovat si toto heslo pro zbytek tohoto sezení"
 
@@ -13296,17 +13587,21 @@ msgstr "Přeposlaná zpráva - %s"
 msgid "Forwarded message"
 msgstr "Přeposlaná zpráva"
 
-#: mail/mail-vfolder.c:91
+#: mail/mail-tools.c:438
+msgid "Forwarded Message"
+msgstr "Přeposlaná zpráva"
+
+#: mail/mail-vfolder.c:92
 #, c-format
 msgid "Setting up vfolder: %s"
 msgstr "Nastavuje se v-složka: %s"
 
-#: mail/mail-vfolder.c:209
+#: mail/mail-vfolder.c:210
 #, c-format
 msgid "Updating vfolders for uri: %s"
 msgstr "Aktualizuje se v-složka pro uri: %s"
 
-#: mail/mail-vfolder.c:467
+#: mail/mail-vfolder.c:468
 #, c-format
 msgid ""
 "The following vFolder(s):\n"
@@ -13319,95 +13614,100 @@ msgstr ""
 "    '%s'\n"
 "A byly aktualizovány."
 
-#: mail/mail-vfolder.c:776
+#: mail/mail-vfolder.c:777
 msgid "VFolders"
 msgstr "V-složky"
 
-#: mail/mail-vfolder.c:834
+#: mail/mail-vfolder.c:835
 msgid "vFolders"
 msgstr "v-složky"
 
-#: mail/mail-vfolder.c:873
+#: mail/mail-vfolder.c:874
 msgid "Edit VFolder"
 msgstr "Upravit V-složku"
 
-#: mail/mail-vfolder.c:893
+#: mail/mail-vfolder.c:894
 #, c-format
 msgid "Trying to edit a vfolder '%s' which doesn't exist."
 msgstr "Pokus o úpravu v-složky '%s', která neexistuje."
 
-#: mail/mail-vfolder.c:965
+#: mail/mail-vfolder.c:966
 msgid "New VFolder"
 msgstr "Nová V-složka"
 
-#: mail/message-list.c:900
+#: mail/message-browser.c:233
+msgid "(No subject)"
+msgstr "(Bez předmětu)"
+
+#: mail/message-browser.c:235
+#, c-format
+msgid "%s - Message"
+msgstr "%s - zpráva"
+
+#: mail/message-list.c:741
 msgid "Unseen"
 msgstr "Nepřečtené"
 
-#: mail/message-list.c:901
+#: mail/message-list.c:742
 msgid "Seen"
 msgstr "Přečtené"
 
-#: mail/message-list.c:902
+#: mail/message-list.c:743
 msgid "Answered"
 msgstr "Odpovězené"
 
-#: mail/message-list.c:903
+#: mail/message-list.c:744
 msgid "Multiple Unseen Messages"
 msgstr "Více nepřečtených zpráv"
 
-#: mail/message-list.c:904
+#: mail/message-list.c:745
 msgid "Multiple Messages"
 msgstr "Více zpráv"
 
-#: mail/message-list.c:908
+#: mail/message-list.c:749
 msgid "Lowest"
 msgstr "Nejnižší"
 
-#: mail/message-list.c:909
+#: mail/message-list.c:750
 msgid "Lower"
 msgstr "Nižší"
 
-#: mail/message-list.c:913
+#: mail/message-list.c:754
 msgid "Higher"
 msgstr "Vyšší"
 
-#: mail/message-list.c:914
+#: mail/message-list.c:755
 msgid "Highest"
 msgstr "Nejvyšší"
 
-#: mail/message-list.c:1231
+#: mail/message-list.c:1072
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:1238
+#: mail/message-list.c:1079
 msgid "Today %l:%M %p"
 msgstr "Dnes %k:%M"
 
-#: mail/message-list.c:1247
+#: mail/message-list.c:1088
 msgid "Yesterday %l:%M %p"
 msgstr "Včera %k:%M"
 
-#: mail/message-list.c:1259
+#: mail/message-list.c:1100
 msgid "%a %l:%M %p"
 msgstr "%a %k:%M"
 
-#: mail/message-list.c:1267
+#: mail/message-list.c:1108
 msgid "%b %d %l:%M %p"
 msgstr "%d %b %k:%M"
 
-#: mail/message-list.c:1269
+#: mail/message-list.c:1110
 msgid "%b %d %Y"
 msgstr "%d %b %Y"
 
-#: mail/message-list.c:3062
+#: mail/message-list.c:2649
 msgid "Generating message list"
 msgstr "Generuje se seznam zpráv"
 
-#: mail/message-list.etspec.h:2
-msgid "Date"
-msgstr "Datum"
-
 #: mail/message-list.etspec.h:3
 msgid "Due By"
 msgstr "Termín dokončení"
@@ -13424,10 +13724,6 @@ msgstr "Označeno"
 msgid "Follow Up Flag"
 msgstr "Značka Follow up"
 
-#: mail/message-list.etspec.h:7 mail/message-tag-followup.c:301
-msgid "From"
-msgstr "Od"
-
 #: mail/message-list.etspec.h:8
 msgid "Original Location"
 msgstr "Původní umístění"
@@ -13440,10 +13736,6 @@ msgstr "Přijato"
 msgid "Size"
 msgstr "Velikost"
 
-#: mail/message-list.etspec.h:14
-msgid "To"
-msgstr "Komu"
-
 #: mail/message-tag-followup.c:62
 msgid "Call"
 msgstr "Zavolat"
@@ -13460,7 +13752,7 @@ msgstr "Follow Up"
 msgid "For Your Information"
 msgstr "Pro vaši informaci"
 
-#: mail/message-tag-followup.c:66 ui/evolution-mail-message.xml.h:40
+#: mail/message-tag-followup.c:66 ui/evolution-mail-message.xml.h:36
 msgid "Forward"
 msgstr "Přeposlat"
 
@@ -13468,11 +13760,11 @@ msgstr "Přeposlat"
 msgid "No Response Necessary"
 msgstr "Není nutná odpověď"
 
-#: mail/message-tag-followup.c:69 ui/evolution-mail-message.xml.h:77
+#: mail/message-tag-followup.c:69 ui/evolution-mail-message.xml.h:72
 msgid "Reply"
 msgstr "Odpovědět"
 
-#: mail/message-tag-followup.c:70 ui/evolution-mail-message.xml.h:78
+#: mail/message-tag-followup.c:70 ui/evolution-mail-message.xml.h:73
 msgid "Reply to All"
 msgstr "Odpovědět všem"
 
@@ -13504,6 +13796,39 @@ msgstr "Termín _dokončení:"
 msgid "_Flag:"
 msgstr "_Značka:"
 
+#: mail/subscribe-dialog.c:230
+#, c-format
+msgid "Scanning folders under %s on \"%s\""
+msgstr "Prochází se složky pod %s na \"%s\""
+
+#: mail/subscribe-dialog.c:232
+#, c-format
+msgid "Scanning root-level folders on \"%s\""
+msgstr "Prochází se kořenové složky na \"%s\""
+
+#: mail/subscribe-dialog.c:329
+#, c-format
+msgid "Subscribing to folder \"%s\""
+msgstr "Přihlašuji si složku \"%s\""
+
+#: mail/subscribe-dialog.c:331
+#, c-format
+msgid "Unsubscribing to folder \"%s\""
+msgstr "Odhlašuji se ze složky \"%s\""
+
+#: mail/subscribe-dialog.c:1270 mail/subscribe-dialog.etspec.h:1
+#: shell/e-storage-set-view.etspec.h:2
+msgid "Folder"
+msgstr "Složka"
+
+#: mail/subscribe-dialog.c:1499
+msgid "No server has been selected"
+msgstr "Nebyl vybrán žádný server"
+
+#: mail/subscribe-dialog.c:1598
+msgid "Please select a server."
+msgstr "Vyberte prosím server."
+
 #: mail/subscribe-dialog.glade.h:1
 msgid "Folder Subscriptions"
 msgstr "Přihlášené složky"
@@ -13517,123 +13842,17 @@ msgid "S_erver:"
 msgstr "S_erver:"
 
 #: mail/subscribe-dialog.glade.h:4
+msgid "Scanning folders ..."
+msgstr "Zkoumám složky..."
+
+#: mail/subscribe-dialog.glade.h:5
 msgid "_Subscribe"
 msgstr "_Přihlásit se"
 
-#: mail/subscribe-dialog.glade.h:5
+#: mail/subscribe-dialog.glade.h:6
 msgid "_Unsubscribe"
 msgstr "_Odhlásit se"
 
-#: my-evolution/component-factory.c:56
-msgid "Folder containing the Evolution Summary"
-msgstr "Adresář obsahující souhrn Evolution"
-
-#: my-evolution/e-summary.c:204
-msgid "%A, %B %e %Y"
-msgstr "%A, %B %e %Y"
-
-#: my-evolution/e-summary.c:533
-msgid "Please wait..."
-msgstr "Prosím čekejte..."
-
-#: my-evolution/e-summary.c:622 ui/my-evolution.xml.h:2
-msgid "Print Summary"
-msgstr "Tisk souhrnu"
-
-#: my-evolution/e-summary.c:655
-msgid "Printing of Summary failed"
-msgstr "Tisk souhrnu selhal"
-
-#: my-evolution/e-summary-calendar.c:384
-msgid "Appointments"
-msgstr "Události"
-
-#: my-evolution/e-summary-calendar.c:392
-msgid "No appointments."
-msgstr "Žádné události."
-
-#: my-evolution/e-summary-calendar.c:409
-msgid "%k:%M %d %B"
-msgstr "%d. %B %k:%M"
-
-#: my-evolution/e-summary-calendar.c:411
-#, fuzzy
-msgid "%l:%M%p %d %B"
-msgstr "%d. %B %k:%M"
-
-#: my-evolution/e-summary-calendar.c:429
-msgid "No description"
-msgstr "Bez popisu"
-
-#: my-evolution/e-summary-mail.c:189
-msgid "Mail summary"
-msgstr "Pošta"
-
-#: my-evolution/e-summary-preferences.c:355
-msgid "Dictionary.com Word of the Day"
-msgstr "Dictionary.com Slovo dne"
-
-#: my-evolution/e-summary-preferences.c:373
-msgid "Quotes of the Day"
-msgstr "Citát dne"
-
-#: my-evolution/e-summary-preferences.c:565
-msgid "New News Feed"
-msgstr "Nové novinky"
-
-#: my-evolution/e-summary-preferences.c:581
-msgid "_URL:"
-msgstr "_URL:"
-
-#: my-evolution/e-summary-rdf.c:315
-msgid "Error downloading RDF"
-msgstr "Chyba při stahování RDF"
-
-#: my-evolution/e-summary-rdf.c:453
-msgid "News Feed"
-msgstr "Novinky"
-
-#: my-evolution/e-summary-shown.c:496
-msgid "All"
-msgstr "Vše"
-
-#: my-evolution/e-summary-shown.c:521 my-evolution/e-summary-table.c:58
-msgid "Shown"
-msgstr "Zobrazené"
-
-#: my-evolution/e-summary-tasks.c:349
-msgid "No tasks"
-msgstr "Žádné úkoly"
-
-#: my-evolution/e-summary-tasks.c:387
-#, fuzzy
-msgid "blue"
-msgstr "Ambler"
-
-#: my-evolution/e-summary-tasks.c:387
-msgid "(No Description)"
-msgstr "(Bez popisu)"
-
-#: my-evolution/e-summary-weather.c:72
-msgid "My Weather"
-msgstr "Moje počasí"
-
-#: my-evolution/e-summary-weather.c:261
-msgid "There was an error downloading data for"
-msgstr "Nastala chyba při stahování dat pro"
-
-#: my-evolution/e-summary-weather.c:478 my-evolution/my-evolution.glade.h:16
-msgid "Weather"
-msgstr "Počasí"
-
-#. translators: Put here a list of codes for locations you want to
-#. see in My Evolution by default. You can find the list of all
-#. stations and their codes in Evolution sources
-#. (evolution/my-evolution/Locations)
-#: my-evolution/e-summary-weather.c:582
-msgid "KBOS"
-msgstr "KBOS"
-
 #: my-evolution/GNOME_Evolution_Summary.server.in.in.h:1
 msgid "Configure the appearance of the Evolution Summary here"
 msgstr "Zde se nastavuje vzhled souhrnu Evolution"
@@ -23439,6 +23658,110 @@ msgstr "Zuni Pueblo"
 msgid "Zurich"
 msgstr "Curych"
 
+#: my-evolution/component-factory.c:56
+msgid "Folder containing the Evolution Summary"
+msgstr "Adresář obsahující souhrn Evolution"
+
+#: my-evolution/e-summary-calendar.c:381
+msgid "Appointments"
+msgstr "Události"
+
+#: my-evolution/e-summary-calendar.c:389
+msgid "No appointments."
+msgstr "Žádné události."
+
+#: my-evolution/e-summary-calendar.c:406
+msgid "%k:%M %d %B"
+msgstr "%d. %B %k:%M"
+
+#: my-evolution/e-summary-calendar.c:408
+msgid "%l:%M%P %d %B"
+msgstr "%d. %B %k:%M"
+
+#: my-evolution/e-summary-calendar.c:426
+msgid "No description"
+msgstr "Bez popisu"
+
+#: my-evolution/e-summary-mail.c:189
+msgid "Mail summary"
+msgstr "Pošta"
+
+#: my-evolution/e-summary-preferences.c:355
+msgid "Dictionary.com Word of the Day"
+msgstr "Dictionary.com Slovo dne"
+
+#: my-evolution/e-summary-preferences.c:373
+msgid "Quotes of the Day"
+msgstr "Citát dne"
+
+#: my-evolution/e-summary-preferences.c:565
+msgid "New News Feed"
+msgstr "Nové novinky"
+
+#: my-evolution/e-summary-preferences.c:581
+msgid "_URL:"
+msgstr "_URL:"
+
+#: my-evolution/e-summary-rdf.c:315
+msgid "Error downloading RDF"
+msgstr "Chyba při stahování RDF"
+
+#: my-evolution/e-summary-rdf.c:453
+msgid "News Feed"
+msgstr "Novinky"
+
+#: my-evolution/e-summary-shown.c:496
+msgid "All"
+msgstr "Vše"
+
+#: my-evolution/e-summary-shown.c:521 my-evolution/e-summary-table.c:58
+msgid "Shown"
+msgstr "Zobrazené"
+
+#: my-evolution/e-summary-tasks.c:330
+msgid "No tasks"
+msgstr "Žádné úkoly"
+
+#: my-evolution/e-summary-tasks.c:364
+msgid "(No Description)"
+msgstr "(Bez popisu)"
+
+#: my-evolution/e-summary-weather.c:73
+msgid "My Weather"
+msgstr "Moje počasí"
+
+#: my-evolution/e-summary-weather.c:262
+msgid "There was an error downloading data for"
+msgstr "Nastala chyba při stahování dat pro"
+
+#: my-evolution/e-summary-weather.c:479 my-evolution/my-evolution.glade.h:16
+msgid "Weather"
+msgstr "Počasí"
+
+#. translators: Put here a list of codes for locations you want to
+#. see in My Evolution by default. You can find the list of all
+#. stations and their codes in Evolution sources
+#. (evolution/my-evolution/Locations)
+#: my-evolution/e-summary-weather.c:583
+msgid "KBOS"
+msgstr "KBOS"
+
+#: my-evolution/e-summary.c:204
+msgid "%A, %B %e %Y"
+msgstr "%A, %B %e %Y"
+
+#: my-evolution/e-summary.c:533
+msgid "Please wait..."
+msgstr "Prosím čekejte..."
+
+#: my-evolution/e-summary.c:622 ui/my-evolution.xml.h:2
+msgid "Print Summary"
+msgstr "Tisk souhrnu"
+
+#: my-evolution/e-summary.c:655
+msgid "Printing of Summary failed"
+msgstr "Tisk souhrnu selhal"
+
 #: my-evolution/metar.c:30
 msgid " F"
 msgstr " F"
@@ -24697,27 +25020,21 @@ msgstr "_Jeden den"
 msgid "_Show full path for folders"
 msgstr "Zobrazovat _celé cesty ke složkám"
 
-#: notes/component-factory.c:27
-#: shell/e-shell-user-creatable-items-handler.c:587
-#: shell/e-shell-user-creatable-items-handler.c:643
-#: widgets/misc/e-charset-picker.c:109
-msgid "New"
-msgstr "Nový"
+#: shell/GNOME_Evolution_Shell.server.in.in.h:1
+msgid "Configure special folders and offline folder behavior here"
+msgstr "Zde lze nastavit speciální složky a chování odpojené složky"
 
-#: notes/component-factory.c:27
-#, fuzzy
-msgid "Create a new note"
-msgstr "Vytvořit novou složku"
+#: shell/GNOME_Evolution_Shell.server.in.in.h:2
+msgid "Evolution Shell"
+msgstr "Shell Evolution"
 
-#: notes/component-factory.c:152
-#, fuzzy
-msgid "Cannot initialize Evolution's notes component."
-msgstr "Nelze inicializovat shell Ximian Evolution: %s"
+#: shell/GNOME_Evolution_Shell.server.in.in.h:3
+msgid "Evolution folder settings configuration control"
+msgstr "Ovládací prvek nastavení složky Evolution"
 
-#: notes/main.c:30
-#, fuzzy
-msgid "Notes Component: Could not initialize bonobo"
-msgstr "Nelze spustit Bonobo"
+#: shell/GNOME_Evolution_Shell.server.in.in.h:4
+msgid "Folder Settings"
+msgstr "Nastavení složky"
 
 #: shell/e-activity-handler.c:164
 msgid "Show Details"
@@ -24812,49 +25129,6 @@ msgstr ""
 msgid "Brought to you by"
 msgstr "Pro vás vytvořili"
 
-#: shell/e-shell.c:175
-#, c-format
-msgid ""
-"Cannot activate component %s :\n"
-"The error from the activation system is:\n"
-"%s"
-msgstr ""
-"Nelze aktivovat komponentu %s :\n"
-"Chyba aktivačního systému je:\n"
-"%s"
-
-#: shell/e-shell.c:741
-#, c-format
-msgid "Cannot set up local storage -- %s"
-msgstr "Nelze vytvořit lokální úložiště -- %s"
-
-#: shell/e-shell.c:1804
-#, c-format
-msgid ""
-"The Evolution component that handles folders of type \"%s\"\n"
-"has unexpectedly quit. You will need to quit Evolution and restart\n"
-"in order to access that data again."
-msgstr ""
-"Komponenta Evolution, která se stará o složky typu \"%s\"\n"
-"neočekávaně skončila. Musíte ukončit aplikaci Evolution a znovu ji\n"
-"spustit, chcete-li znovu získat přístup k vašim datům."
-
-#: shell/e-shell.c:2069
-msgid "Invalid arguments"
-msgstr "Neplatné argumenty"
-
-#: shell/e-shell.c:2071
-msgid "Cannot register on OAF"
-msgstr "Nelze registrovat u OAF"
-
-#: shell/e-shell.c:2073
-msgid "Configuration Database not found"
-msgstr "Databáze nastavení nebyla nalezena"
-
-#: shell/e-shell.c:2075 shell/e-storage.c:568
-msgid "Generic error"
-msgstr "Obecná chyba"
-
 #: shell/e-shell-config-autocompletion.c:110
 msgid "Extra Completion folders"
 msgstr "Další složky dokončení"
@@ -24943,31 +25217,26 @@ msgstr ""
 "Nelze přejmenovat složku:\n"
 "%s"
 
-#: shell/e-shell-folder-commands.c:534
+#: shell/e-shell-folder-commands.c:538
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "Přejmenovat složku \"%s\" na:"
 
-#: shell/e-shell-folder-commands.c:541
+#: shell/e-shell-folder-commands.c:544
 msgid "Rename Folder"
 msgstr "Přejmenovat složku"
 
-#: shell/e-shell-folder-commands.c:547
+#: shell/e-shell-folder-commands.c:553
 #: shell/e-shell-folder-creation-dialog.c:180
 #, c-format
 msgid "The specified folder name is not valid: %s"
 msgstr "Zadaný název složky není platný: %s"
 
-#: shell/e-shell-folder-commands.c:554
-#, c-format
-msgid "A folder named \"%s\" already exists. Please use a different name."
-msgstr ""
-
-#: shell/e-shell-folder-commands.c:584
+#: shell/e-shell-folder-commands.c:587
 msgid "Selected folder does not belong to another user"
 msgstr "Vybraná složka nepatří jinému uživateli"
 
-#: shell/e-shell-folder-commands.c:587
+#: shell/e-shell-folder-commands.c:590
 #, c-format
 msgid ""
 "Cannot remove folder:\n"
@@ -25010,19 +25279,11 @@ msgstr ""
 "\n"
 "Použijte \"Automaticky\" pokud typ neznáte a Evolution se jej pokusí určit."
 
-#: shell/e-shell-importer.c:148 shell/e-shell-startup-wizard.c:724
+#: shell/e-shell-importer.c:148 shell/e-shell-startup-wizard.c:709
 msgid "Please select the information that you would like to import:"
 msgstr "Vyberte prosím informace, které chcete importovat:"
 
-#: shell/e-shell-importer.c:151
-msgid ""
-"Evolution checked for settings to import from the following\n"
-"applications: Pine, Netscape, Elm, iCalendar. No settings\n"
-"that could be imported where found. If you would like to\n"
-"try again, please click the \"Back\" button.\n"
-msgstr ""
-
-#: shell/e-shell-importer.c:219 shell/e-shell-importer.c:250
+#: shell/e-shell-importer.c:213 shell/e-shell-importer.c:244
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -25031,21 +25292,21 @@ msgstr ""
 "Importuje se %s\n"
 "Importuje se položka %d."
 
-#: shell/e-shell-importer.c:323
+#: shell/e-shell-importer.c:317
 msgid "Select importer"
 msgstr "Vyberte importér"
 
-#: shell/e-shell-importer.c:464
+#: shell/e-shell-importer.c:458
 #, c-format
 msgid "File %s does not exist"
 msgstr "Soubor %s neexistuje"
 
-#: shell/e-shell-importer.c:465 shell/e-shell-importer.c:482
-#: shell/e-shell-importer.c:524
+#: shell/e-shell-importer.c:459 shell/e-shell-importer.c:476
+#: shell/e-shell-importer.c:518
 msgid "Evolution Error"
 msgstr "Chyba Evolution"
 
-#: shell/e-shell-importer.c:481
+#: shell/e-shell-importer.c:475
 #, c-format
 msgid ""
 "There is no importer that is able to handle\n"
@@ -25054,11 +25315,11 @@ msgstr ""
 "Není k dispozici importér pro zpracování\n"
 "%s"
 
-#: shell/e-shell-importer.c:490
+#: shell/e-shell-importer.c:484
 msgid "Importing"
 msgstr "Importuje se"
 
-#: shell/e-shell-importer.c:497
+#: shell/e-shell-importer.c:491
 #, c-format
 msgid ""
 "Importing %s.\n"
@@ -25067,17 +25328,17 @@ msgstr ""
 "Importuje se %s\n"
 "Začíná %s"
 
-#: shell/e-shell-importer.c:509
+#: shell/e-shell-importer.c:503
 #, c-format
 msgid "Error starting %s"
 msgstr "Chyba při startu %s"
 
-#: shell/e-shell-importer.c:523
+#: shell/e-shell-importer.c:517
 #, c-format
 msgid "Error loading %s"
 msgstr "Chyba při načítání %s"
 
-#: shell/e-shell-importer.c:540
+#: shell/e-shell-importer.c:534
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -25086,35 +25347,31 @@ msgstr ""
 "Importuje se %s\n"
 "Importuje se položka 1."
 
-#: shell/e-shell-importer.c:594
+#: shell/e-shell-importer.c:588
 msgid "Automatic"
 msgstr "Automaticky"
 
-#: shell/e-shell-importer.c:643
-#, fuzzy
-msgid "_Filename:"
+#: shell/e-shell-importer.c:637
+msgid "Filename:"
 msgstr "Název souboru:"
 
-#: shell/e-shell-importer.c:648
+#: shell/e-shell-importer.c:642
 msgid "Select a file"
 msgstr "Vyberte soubor"
 
-#: shell/e-shell-importer.c:658
-#, fuzzy
-msgid "File _type:"
+#: shell/e-shell-importer.c:651
+msgid "File type:"
 msgstr "Typ souboru:"
 
-#: shell/e-shell-importer.c:684
-#, fuzzy
-msgid "Import data and settings from _older programs"
+#: shell/e-shell-importer.c:676
+msgid "Import data and settings from older programs"
 msgstr "Import dat a nastavení ze starších programů"
 
-#: shell/e-shell-importer.c:687
-#, fuzzy
-msgid "Import a _single file"
+#: shell/e-shell-importer.c:680
+msgid "Import a single file"
 msgstr "Importovat jeden soubor"
 
-#: shell/e-shell-importer.c:755 shell/e-shell-startup-wizard.c:553
+#: shell/e-shell-importer.c:746 shell/e-shell-startup-wizard.c:538
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
@@ -25122,26 +25379,25 @@ msgstr ""
 "Prosím čekejte...\n"
 "Hledají se existující nastavení"
 
-#: shell/e-shell-importer.c:758
+#: shell/e-shell-importer.c:749
 msgid "Starting Intelligent Importers"
 msgstr "Spouští se inteligentní importy"
 
-#: shell/e-shell-importer.c:884 shell/e-shell-startup-wizard.c:679
+#: shell/e-shell-importer.c:873 shell/e-shell-startup-wizard.c:664
 #, c-format
 msgid "From %s:"
 msgstr "Z %s:"
 
-#: shell/e-shell-importer.c:1061
+#: shell/e-shell-importer.c:1047
 msgid "Select folder"
 msgstr "Vyberte složku"
 
-#: shell/e-shell-importer.c:1062
+#: shell/e-shell-importer.c:1048
 msgid "Select a destination folder for importing this data"
 msgstr "Výběr složky, do které mají být importována tato data"
 
-#: shell/e-shell-importer.c:1193
-#, fuzzy
-msgid "_Import"
+#: shell/e-shell-importer.c:1178 shell/importer/intelligent.c:191
+msgid "Import"
 msgstr "Importovat"
 
 #: shell/e-shell-offline-handler.c:592
@@ -25201,19 +25457,11 @@ msgstr "Nelze otevřít sdílenou složku: %s."
 msgid "Cannot find the specified shared folder."
 msgstr "Nelze nalézt zadanou sdílenou složku."
 
-#: shell/e-shell-startup-wizard.c:771
-msgid ""
-"If you quit the Evolution Setup Assistant now, all of the information that "
-"you have entered will be forgotten. You will need to run this assistant "
-"again before using Evolution.\n"
-"\n"
-"Do you want to quit using the Assistant now?"
-msgstr ""
-
-#: shell/e-shell-startup-wizard.c:782
-#, fuzzy
-msgid "Quit Assistant"
-msgstr "Asistent"
+#: shell/e-shell-user-creatable-items-handler.c:586
+#: shell/e-shell-user-creatable-items-handler.c:642
+#: widgets/misc/e-charset-picker.c:109
+msgid "New"
+msgstr "Nový"
 
 #: shell/e-shell-utils.c:116
 msgid "No folder name specified."
@@ -25235,37 +25483,6 @@ msgstr "Název složky nesmí obsahovat znak \"#\"."
 msgid "'.' and '..' are reserved folder names."
 msgstr "'.' a '..' jsou rezervované názvy složek."
 
-#: shell/e-shell-view.c:264
-msgid "(No folder displayed)"
-msgstr "(Není zobrazena žádná složka)"
-
-#: shell/e-shell-view.c:2040
-#, c-format
-msgid "%s (%d)"
-msgstr "%s (%d)"
-
-#: shell/e-shell-view.c:2042
-msgid "(None)"
-msgstr "(Nic)"
-
-#: shell/e-shell-view.c:2083
-msgid ""
-"Ximian Evolution is currently online.  Click on this button to work offline."
-msgstr ""
-"Ximian Evolution je nyní on-line. Stiskem tohoto tlačítka přejdete do režimu "
-"off-line."
-
-#: shell/e-shell-view.c:2090
-msgid "Ximian Evolution is in the process of going offline."
-msgstr "Ximian Evolution přechází do režimu off-line."
-
-#: shell/e-shell-view.c:2096
-msgid ""
-"Ximian Evolution is currently offline.  Click on this button to work online."
-msgstr ""
-"Ximian Evolution je nyní off-line. Stiskem tohoto tlačítka přejdete do "
-"režimu on-line."
-
 #: shell/e-shell-view-menu.c:89
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr "Zdá se, že nemáte nainstalované nástroje pro PalmPilota GNOME."
@@ -25315,13 +25532,79 @@ msgstr "_Pracovat při odpojení"
 msgid "Work Offline"
 msgstr "Pracovat při odpojení"
 
-#: shell/e-shortcuts.c:649
-msgid "Error saving shortcuts."
-msgstr "Chyba při ukládání zkratek."
+#: shell/e-shell-view.c:264
+msgid "(No folder displayed)"
+msgstr "(Není zobrazena žádná složka)"
 
-#: shell/e-shortcuts.c:1096
-msgid "Shortcuts"
-msgstr "Zkratky"
+#: shell/e-shell-view.c:2040
+#, c-format
+msgid "%s (%d)"
+msgstr "%s (%d)"
+
+#: shell/e-shell-view.c:2042
+msgid "(None)"
+msgstr "(Nic)"
+
+#: shell/e-shell-view.c:2083
+msgid ""
+"Ximian Evolution is currently online.  Click on this button to work offline."
+msgstr ""
+"Ximian Evolution je nyní on-line. Stiskem tohoto tlačítka přejdete do režimu "
+"off-line."
+
+#: shell/e-shell-view.c:2090
+msgid "Ximian Evolution is in the process of going offline."
+msgstr "Ximian Evolution přechází do režimu off-line."
+
+#: shell/e-shell-view.c:2096
+msgid ""
+"Ximian Evolution is currently offline.  Click on this button to work online."
+msgstr ""
+"Ximian Evolution je nyní off-line. Stiskem tohoto tlačítka přejdete do "
+"režimu on-line."
+
+#: shell/e-shell.c:175
+#, c-format
+msgid ""
+"Cannot activate component %s :\n"
+"The error from the activation system is:\n"
+"%s"
+msgstr ""
+"Nelze aktivovat komponentu %s :\n"
+"Chyba aktivačního systému je:\n"
+"%s"
+
+#: shell/e-shell.c:741
+#, c-format
+msgid "Cannot set up local storage -- %s"
+msgstr "Nelze vytvořit lokální úložiště -- %s"
+
+#: shell/e-shell.c:1804
+#, c-format
+msgid ""
+"The Evolution component that handles folders of type \"%s\"\n"
+"has unexpectedly quit. You will need to quit Evolution and restart\n"
+"in order to access that data again."
+msgstr ""
+"Komponenta Evolution, která se stará o složky typu \"%s\"\n"
+"neočekávaně skončila. Musíte ukončit aplikaci Evolution a znovu ji\n"
+"spustit, chcete-li znovu získat přístup k vašim datům."
+
+#: shell/e-shell.c:2069
+msgid "Invalid arguments"
+msgstr "Neplatné argumenty"
+
+#: shell/e-shell.c:2071
+msgid "Cannot register on OAF"
+msgstr "Nelze registrovat u OAF"
+
+#: shell/e-shell.c:2073
+msgid "Configuration Database not found"
+msgstr "Databáze nastavení nebyla nalezena"
+
+#: shell/e-shell.c:2075 shell/e-storage.c:568
+msgid "Generic error"
+msgstr "Obecná chyba"
 
 #: shell/e-shortcuts-view.c:80
 msgid "Create New Shortcut Group"
@@ -25436,6 +25719,18 @@ msgstr "_Odstranit"
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "Odstranit tuto zkratku z lišty zkratek"
 
+#: shell/e-shortcuts.c:649
+msgid "Error saving shortcuts."
+msgstr "Chyba při ukládání zkratek."
+
+#: shell/e-shortcuts.c:1096
+msgid "Shortcuts"
+msgstr "Zkratky"
+
+#: shell/e-storage-set-view.etspec.h:1
+msgid "Checkbox"
+msgstr "Zaškrtávací políčko"
+
 #: shell/e-storage.c:566
 msgid "No error"
 msgstr "Žádná chyba"
@@ -25492,14 +25787,6 @@ msgstr "Nelze vytvořit složku s tímto názvem"
 msgid "This operation cannot be performed in off-line mode"
 msgstr "Tuto operaci nelze provést v režimu odpojení"
 
-#: shell/e-storage-set-view.etspec.h:1
-msgid "Checkbox"
-msgstr "Zaškrtávací políčko"
-
-#: shell/e-storage-set-view.etspec.h:2
-msgid "Folder"
-msgstr "Složka"
-
 #: shell/e-task-widget.c:211
 #, c-format
 msgid "%s (...)"
@@ -25514,103 +25801,103 @@ msgstr "%s (%d%% hotovo)"
 msgid "<click here to select a folder>"
 msgstr "<kliknutím zde vyberete složku>"
 
-#: shell/evolution-shell-component.c:1187
+#: shell/evolution-shell-component-utils.c:124
+#, c-format
+msgid ""
+"%s\n"
+"\n"
+"Unknown error."
+msgstr ""
+"%s\n"
+"\n"
+"Neznámá chyba."
+
+#: shell/evolution-shell-component-utils.c:127
+#, c-format
+msgid ""
+"%s\n"
+"\n"
+"The error from the component system is:\n"
+"%s"
+msgstr ""
+"%s\n"
+"\n"
+"Chyba ze systému komponent:\n"
+"%s"
+
+#: shell/evolution-shell-component-utils.c:134
+#, c-format
+msgid ""
+"%s\n"
+"\n"
+"The error from the activation system is:\n"
+"%s"
+msgstr ""
+"%s\n"
+"\n"
+"Chyba z aktivačního systému je:\n"
+"%s"
+
+#: shell/evolution-shell-component.c:1184
 msgid "CORBA error"
 msgstr "Chyba CORBA"
 
-#: shell/evolution-shell-component.c:1189
+#: shell/evolution-shell-component.c:1186
 msgid "Interrupted"
 msgstr "Přerušeno"
 
-#: shell/evolution-shell-component.c:1191
+#: shell/evolution-shell-component.c:1188
 msgid "Invalid argument"
 msgstr "Neplatný argument"
 
-#: shell/evolution-shell-component.c:1193
+#: shell/evolution-shell-component.c:1190
 msgid "Already has an owner"
 msgstr "Již má vlastníka"
 
-#: shell/evolution-shell-component.c:1195
+#: shell/evolution-shell-component.c:1192
 msgid "No owner"
 msgstr "Žádný vlastník"
 
-#: shell/evolution-shell-component.c:1197
+#: shell/evolution-shell-component.c:1194
 msgid "Not found"
 msgstr "Nenalezeno"
 
-#: shell/evolution-shell-component.c:1199
+#: shell/evolution-shell-component.c:1196
 msgid "Unsupported type"
 msgstr "Nepodporovaný typ"
 
-#: shell/evolution-shell-component.c:1201
+#: shell/evolution-shell-component.c:1198
 msgid "Unsupported schema"
 msgstr "Nepodporované schéma"
 
-#: shell/evolution-shell-component.c:1203
+#: shell/evolution-shell-component.c:1200
 msgid "Unsupported operation"
 msgstr "Nepodporovaná operace"
 
-#: shell/evolution-shell-component.c:1205
+#: shell/evolution-shell-component.c:1202
 msgid "Internal error"
 msgstr "Vnitřní chyba"
 
-#: shell/evolution-shell-component.c:1209
+#: shell/evolution-shell-component.c:1206
 msgid "Exists"
 msgstr "Existuje"
 
-#: shell/evolution-shell-component.c:1211
+#: shell/evolution-shell-component.c:1208
 msgid "Invalid URI"
 msgstr "Neplatné URI"
 
-#: shell/evolution-shell-component.c:1215
+#: shell/evolution-shell-component.c:1212
 msgid "Has subfolders"
 msgstr "Má podsložky"
 
-#: shell/evolution-shell-component.c:1217
+#: shell/evolution-shell-component.c:1214
 msgid "No space left"
 msgstr "Nezbývá žádné místo"
 
-#: shell/evolution-shell-component.c:1219
+#: shell/evolution-shell-component.c:1216
 msgid "Old owner has died"
 msgstr "Starý vlastník zemřel"
 
-#: shell/evolution-shell-component-utils.c:124
-#, c-format
-msgid ""
-"%s\n"
-"\n"
-"Unknown error."
-msgstr ""
-"%s\n"
-"\n"
-"Neznámá chyba."
-
-#: shell/evolution-shell-component-utils.c:127
-#, c-format
-msgid ""
-"%s\n"
-"\n"
-"The error from the component system is:\n"
-"%s"
-msgstr ""
-"%s\n"
-"\n"
-"Chyba ze systému komponent:\n"
-"%s"
-
-#: shell/evolution-shell-component-utils.c:134
-#, c-format
-msgid ""
-"%s\n"
-"\n"
-"The error from the activation system is:\n"
-"%s"
-msgstr ""
-"%s\n"
-"\n"
-"Chyba z aktivačního systému je:\n"
-"%s"
-
 #: shell/evolution-test-component.c:63
 msgid "Test type"
 msgstr "Typ testu"
@@ -25717,22 +26004,6 @@ msgstr ""
 "\n"
 "Stiskem \"Použít\" své nastavení uložíte."
 
-#: shell/GNOME_Evolution_Shell.server.in.in.h:1
-msgid "Configure special folders and offline folder behavior here"
-msgstr "Zde lze nastavit speciální složky a chování odpojené složky"
-
-#: shell/GNOME_Evolution_Shell.server.in.in.h:2
-msgid "Evolution Shell"
-msgstr "Shell Evolution"
-
-#: shell/GNOME_Evolution_Shell.server.in.in.h:3
-msgid "Evolution folder settings configuration control"
-msgstr "Ovládací prvek nastavení složky Evolution"
-
-#: shell/GNOME_Evolution_Shell.server.in.in.h:4
-msgid "Folder Settings"
-msgstr "Nastavení složky"
-
 #: shell/importer/import.glade.h:1
 msgid "Click \"Import\" to begin importing the file into Evolution. "
 msgstr "Spusťte import souboru do Evolution kliknutím na \"Import\"."
@@ -25771,10 +26042,6 @@ msgstr ""
 msgid "Importers"
 msgstr "Importéry"
 
-#: shell/importer/intelligent.c:191
-msgid "Import"
-msgstr "Importovat"
-
 #: shell/importer/intelligent.c:195
 msgid "Don't import"
 msgstr "Neimportovat"
@@ -25961,7 +26228,7 @@ msgstr "Přesunout kontakt(y) do jiné složky..."
 msgid "Move to Folder..."
 msgstr "Přesunout do složky..."
 
-#: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:18
+#: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:17
 msgid "Paste the clipboard"
 msgstr "Vložit schránku"
 
@@ -25969,9 +26236,9 @@ msgstr "Vložit schránku"
 msgid "Previews the contacts to be printed"
 msgstr "Náhled kontaktů před tiskem"
 
-#: ui/evolution-addressbook.xml.h:17 ui/evolution-calendar.xml.h:20
-#: ui/evolution-comp-editor.xml.h:9 ui/evolution-mail-message.xml.h:73
-#: ui/evolution-tasks.xml.h:13
+#: ui/evolution-addressbook.xml.h:17 ui/evolution-calendar.xml.h:19
+#: ui/evolution-comp-editor.xml.h:9 ui/evolution-mail-message.xml.h:68
+#: ui/evolution-tasks.xml.h:12
 msgid "Print Pre_view"
 msgstr "_Náhled před tiskem"
 
@@ -26015,21 +26282,17 @@ msgstr "Zastavit načítání"
 msgid "View the current contact"
 msgstr "Zobrazit aktuální kontakt"
 
-#: ui/evolution-addressbook.xml.h:29 ui/evolution-calendar.xml.h:32
-#: ui/evolution-comp-editor.xml.h:16 ui/evolution-contact-editor.xml.h:13
-#: ui/evolution-contact-list-editor.xml.h:11
+#: ui/evolution-addressbook.xml.h:29 ui/evolution-calendar.xml.h:28
+#: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:11
+#: ui/evolution-contact-list-editor.xml.h:10
 #: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:17
-#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-messagedisplay.xml.h:4
-#: ui/evolution-mail-message.xml.h:99 ui/evolution-task-editor.xml.h:9
-#: ui/evolution-tasks.xml.h:16 ui/evolution.xml.h:42
+#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:93
+#: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-task-editor.xml.h:9
+#: ui/evolution-tasks.xml.h:14 ui/evolution.xml.h:42
 msgid "_Actions"
 msgstr "_Akce"
 
-#: ui/evolution-addressbook.xml.h:31
-msgid "_Copy to Folder..."
-msgstr "_Kopírovat do složky..."
-
-#: ui/evolution-addressbook.xml.h:34 ui/evolution-contact-editor.xml.h:16
+#: ui/evolution-addressbook.xml.h:34 ui/evolution-contact-editor.xml.h:13
 msgid "_Forward Contact..."
 msgstr "_Přeposlat kontakt..."
 
@@ -26097,61 +26360,46 @@ msgstr "Jít na určité datum"
 msgid "Go to today"
 msgstr "Jít na dnešek"
 
-#: ui/evolution-calendar.xml.h:17
+#: ui/evolution-calendar.xml.h:16
 msgid "Month"
 msgstr "měsíc"
 
-#: ui/evolution-calendar.xml.h:19
+#: ui/evolution-calendar.xml.h:18
 msgid "Previews the calendar to be printed"
 msgstr "Náhledy kalendáře k tisku"
 
-#: ui/evolution-calendar.xml.h:21
+#: ui/evolution-calendar.xml.h:20
 msgid "Print this calendar"
 msgstr "Tisknout tento kalendář"
 
-#: ui/evolution-calendar.xml.h:22
+#: ui/evolution-calendar.xml.h:21
 msgid "Publish Free/Busy information for this calendar"
 msgstr "Zveřejnit informace o volném/obsazeném čase pro tento kalendář"
 
-#: ui/evolution-calendar.xml.h:23 ui/evolution-tasks.xml.h:15
-#, fuzzy
-msgid "Purg_e"
-msgstr "Bourges"
-
-#: ui/evolution-calendar.xml.h:24
-#, fuzzy
-msgid "Purge old appointments and meetings"
-msgstr "Veřejná složka obsahující události a schůzky"
-
-#: ui/evolution-calendar.xml.h:25
-#, fuzzy
-msgid "Show as list"
-msgstr "Ukázat podrobnosti"
-
-#: ui/evolution-calendar.xml.h:26
+#: ui/evolution-calendar.xml.h:22
 msgid "Show one day"
 msgstr "Ukázat jeden den"
 
-#: ui/evolution-calendar.xml.h:27
+#: ui/evolution-calendar.xml.h:23
 msgid "Show one month"
 msgstr "Ukázat jeden měsíc"
 
-#: ui/evolution-calendar.xml.h:28
+#: ui/evolution-calendar.xml.h:24
 msgid "Show one week"
 msgstr "Ukázat jeden týden"
 
-#: ui/evolution-calendar.xml.h:29
+#: ui/evolution-calendar.xml.h:25
 msgid "Show the working week"
 msgstr "Ukázat pracovní týden"
 
-#: ui/evolution-calendar.xml.h:30
+#: ui/evolution-calendar.xml.h:26
 msgid "Week"
 msgstr "týden"
 
-#: ui/evolution-comp-editor.xml.h:2 ui/evolution-contact-editor.xml.h:2
-#: ui/evolution-contact-list-editor.xml.h:2
+#: ui/evolution-comp-editor.xml.h:2 ui/evolution-contact-editor.xml.h:1
+#: ui/evolution-contact-list-editor.xml.h:1
 #: ui/evolution-mail-messagedisplay.xml.h:1
-#: ui/evolution-message-composer.xml.h:3 ui/evolution-signature-editor.xml.h:2
+#: ui/evolution-message-composer.xml.h:3 ui/evolution-signature-editor.xml.h:1
 #: ui/evolution.xml.h:5
 msgid "Close"
 msgstr "Zavřít"
@@ -26160,7 +26408,7 @@ msgstr "Zavřít"
 msgid "Close this item"
 msgstr "Zavřít tuto položku"
 
-#: ui/evolution-comp-editor.xml.h:5 ui/evolution-contact-editor.xml.h:4
+#: ui/evolution-comp-editor.xml.h:5 ui/evolution-contact-editor.xml.h:3
 msgid "Delete this item"
 msgstr "Smazat tuto položku"
 
@@ -26173,58 +26421,47 @@ msgstr "Hlavní nástrojová lišta"
 msgid "Preview the printed item"
 msgstr "Náhled položky před tiskem"
 
-#: ui/evolution-comp-editor.xml.h:10 ui/evolution-contact-editor.xml.h:7
+#: ui/evolution-comp-editor.xml.h:10 ui/evolution-contact-editor.xml.h:6
 msgid "Print this item"
 msgstr "Tisknout tuto položku"
 
-#: ui/evolution-comp-editor.xml.h:11 ui/evolution-contact-editor.xml.h:8
-#: ui/evolution-contact-list-editor.xml.h:5
-#: ui/evolution-message-composer.xml.h:18
-msgid "Save _As..."
-msgstr "Uložit j_ako..."
+#: ui/evolution-comp-editor.xml.h:12 ui/evolution-message-composer.xml.h:16
+#: ui/evolution-signature-editor.xml.h:5
+msgid "Save"
+msgstr "Uložit"
 
-#: ui/evolution-comp-editor.xml.h:12 ui/evolution-contact-editor.xml.h:9
+#: ui/evolution-comp-editor.xml.h:13
+msgid "Save As..."
+msgstr "Uložit jako..."
+
+#: ui/evolution-comp-editor.xml.h:14 ui/evolution-contact-editor.xml.h:8
 #: ui/evolution-contact-list-editor.xml.h:6
-#: ui/evolution-signature-editor.xml.h:7
+#: ui/evolution-signature-editor.xml.h:6
 msgid "Save and Close"
 msgstr "Uložit a zavřít"
 
-#: ui/evolution-comp-editor.xml.h:13 ui/evolution-contact-editor.xml.h:10
-#: ui/evolution-contact-list-editor.xml.h:7
-#: ui/evolution-signature-editor.xml.h:8
-#, fuzzy
-msgid "Save and _Close"
-msgstr "Uložit a zavřít"
-
-#: ui/evolution-comp-editor.xml.h:14
+#: ui/evolution-comp-editor.xml.h:15
 msgid "Save the item and close the dialog box"
 msgstr "Uložit tuto položku a zavřít dialog"
 
-#: ui/evolution-comp-editor.xml.h:15
+#: ui/evolution-comp-editor.xml.h:16
 msgid "Save this item to disk"
 msgstr "Uložit tuto položku na disk"
 
-#: ui/evolution-comp-editor.xml.h:18 ui/evolution-contact-editor.xml.h:15
-#: ui/evolution-contact-list-editor.xml.h:13
+#: ui/evolution-comp-editor.xml.h:18 ui/evolution-contact-editor.xml.h:12
+#: ui/evolution-contact-list-editor.xml.h:11
 #: ui/evolution-mail-messagedisplay.xml.h:7
 #: ui/evolution-message-composer.xml.h:42
-#: ui/evolution-signature-editor.xml.h:13 ui/evolution-subscribe.xml.h:11
+#: ui/evolution-signature-editor.xml.h:12 ui/evolution-subscribe.xml.h:11
 #: ui/evolution.xml.h:46
 msgid "_File"
 msgstr "_Soubor"
 
-#: ui/evolution-comp-editor.xml.h:20 ui/evolution-contact-editor.xml.h:18
-#: ui/evolution-contact-list-editor.xml.h:14
-#: ui/evolution-message-composer.xml.h:47
-#: ui/evolution-signature-editor.xml.h:15
-msgid "_Save"
-msgstr "_Uložit"
-
 #: ui/evolution-composer-entries.xml.h:1
 msgid "Copy selected text to the clipboard"
 msgstr "Kopírovat vybraný text do schránky"
 
-#: ui/evolution-composer-entries.xml.h:2 ui/evolution-mail-message.xml.h:21
+#: ui/evolution-composer-entries.xml.h:2 ui/evolution-mail-list.xml.h:3
 msgid "Cu_t"
 msgstr "Vyjmou_t"
 
@@ -26245,39 +26482,51 @@ msgstr "Vybrat _vše"
 msgid "Select all text"
 msgstr "Vybrat všechen text"
 
-#: ui/evolution-contact-editor.xml.h:6
+#: ui/evolution-contact-editor.xml.h:5
 msgid "Print En_velope..."
 msgstr "Tisknout _obálku..."
 
-#: ui/evolution-contact-editor.xml.h:11
+#: ui/evolution-contact-editor.xml.h:7
+#: ui/evolution-contact-list-editor.xml.h:5
+#: ui/evolution-message-composer.xml.h:18
+msgid "Save _As..."
+msgstr "Uložit j_ako..."
+
+#: ui/evolution-contact-editor.xml.h:9
 msgid "Save the contact and close the dialog box"
 msgstr "Uložit kontakt a zavřít dialog"
 
-#: ui/evolution-contact-editor.xml.h:12
+#: ui/evolution-contact-editor.xml.h:10
 msgid "Send _Message to Contact..."
 msgstr "_Poslat kontaktu zprávu..."
 
-#: ui/evolution-contact-list-editor.xml.h:4
+#: ui/evolution-contact-editor.xml.h:15
+#: ui/evolution-contact-list-editor.xml.h:12
+#: ui/evolution-message-composer.xml.h:47
+#: ui/evolution-signature-editor.xml.h:14
+msgid "_Save"
+msgstr "_Uložit"
+
+#: ui/evolution-contact-list-editor.xml.h:3
 msgid "Delete this list"
 msgstr "Smazat tento seznam"
 
-#: ui/evolution-contact-list-editor.xml.h:8
+#: ui/evolution-contact-list-editor.xml.h:4
+msgid "Delete..."
+msgstr "Smazat..."
+
+#: ui/evolution-contact-list-editor.xml.h:7
 msgid "Save the list and close the dialog box"
 msgstr "Uložit seznam a zavřít dialog"
 
-#: ui/evolution-contact-list-editor.xml.h:9
+#: ui/evolution-contact-list-editor.xml.h:8
 msgid "Se_nd list to other..."
 msgstr "Po_slat seznam dalším..."
 
-#: ui/evolution-contact-list-editor.xml.h:10
+#: ui/evolution-contact-list-editor.xml.h:9
 msgid "Send _message to list..."
 msgstr "Poslat _zprávu seznamu..."
 
-#: ui/evolution-contact-list-editor.xml.h:12
-#, fuzzy
-msgid "_Delete..."
-msgstr "Smazat..."
-
 #: ui/evolution-event-editor.xml.h:1
 msgid "Cancel Mee_ting"
 msgstr "Zrušit _schůzku"
@@ -26352,8 +26601,7 @@ msgid "Permanently remove all deleted messages from all folders"
 msgstr "Natrvalo odstranit všechny smazané zprávy ze všech složek"
 
 #: ui/evolution-mail-global.xml.h:11
-#, fuzzy
-msgid "Post Ne_w Message"
+msgid "Post New Message"
 msgstr "Poslat novou zprávu"
 
 #: ui/evolution-mail-global.xml.h:12
@@ -26388,19 +26636,14 @@ msgstr "_Panel náhledu"
 msgid "Change the properties of this folder"
 msgstr "Změnit vlastnosti této složky"
 
-#: ui/evolution-mail-list.xml.h:2 ui/evolution-mail-message.xml.h:10
+#: ui/evolution-mail-list.xml.h:2
 msgid "Copy selected message(s) to the clipboard"
 msgstr "Kopírovat vybrané zprávy do schránky"
 
-#: ui/evolution-mail-list.xml.h:3 ui/evolution-mail-message.xml.h:22
+#: ui/evolution-mail-list.xml.h:4
 msgid "Cut selected message(s) to the clipboard"
 msgstr "Vyjmout vybrané zprávy do schránky"
 
-#: ui/evolution-mail-list.xml.h:4
-#, fuzzy
-msgid "E_xpunge"
-msgstr "_Vyčistit"
-
 #: ui/evolution-mail-list.xml.h:5
 msgid "Hide S_elected Messages"
 msgstr "Skrýt _vybrané zprávy"
@@ -26419,15 +26662,14 @@ msgid ""
 msgstr "Skrýt smazané zprávy (nezobrazovat je přeškrtnuté)"
 
 #: ui/evolution-mail-list.xml.h:9
-#, fuzzy
-msgid "Mark All as _Read"
+msgid "Mark All as R_ead"
 msgstr "Označit vše jako př_ečtené"
 
 #: ui/evolution-mail-list.xml.h:10
 msgid "Mark all visible messages as read"
 msgstr "Označit všechny viditelné zprávy jako přečtené"
 
-#: ui/evolution-mail-list.xml.h:11 ui/evolution-mail-message.xml.h:66
+#: ui/evolution-mail-list.xml.h:11
 msgid "Paste message(s) from the clipboard"
 msgstr "Vložit zprávy ze schránky"
 
@@ -26471,37 +26713,26 @@ msgstr "Dočasně skrýt vybrané zprávy"
 msgid "Threaded Message list"
 msgstr "Seznam zpráv dle vláken"
 
-#: ui/evolution-mail-list.xml.h:25 ui/evolution.xml.h:47
+#: ui/evolution-mail-list.xml.h:26 ui/evolution-tasks.xml.h:18
+msgid "_Expunge"
+msgstr "_Vyčistit"
+
+#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:47
 msgid "_Folder"
 msgstr "_Složka"
 
-#: ui/evolution-mail-list.xml.h:26 ui/evolution-subscribe.xml.h:12
+#: ui/evolution-mail-list.xml.h:28 ui/evolution-subscribe.xml.h:12
 msgid "_Invert Selection"
 msgstr "_Obrátit výběr"
 
-#: ui/evolution-mail-list.xml.h:27
+#: ui/evolution-mail-list.xml.h:30
 msgid "_Properties..."
 msgstr "Vla_stnosti..."
 
-#: ui/evolution-mail-list.xml.h:28
+#: ui/evolution-mail-list.xml.h:31
 msgid "_Threaded Message List"
 msgstr "Seznam zpráv dle _vláken"
 
-#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:6
-msgid "Close this window"
-msgstr "Zavřít toto okno"
-
-#: ui/evolution-mail-messagedisplay.xml.h:5
-#: ui/evolution-message-composer.xml.h:39 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:43
-msgid "_Close"
-msgstr "_Zavřít"
-
-#: ui/evolution-mail-messagedisplay.xml.h:8
-#: ui/evolution-message-composer.xml.h:49 ui/evolution.xml.h:64
-msgid "_View"
-msgstr "_Zobrazení"
-
 #: ui/evolution-mail-message.xml.h:1
 msgid "A_dd Sender to Addressbook"
 msgstr "Přidat _odesílatele do adresáře"
@@ -26519,413 +26750,401 @@ msgid "Apply filter rules to the selected messages"
 msgstr "Použít pravidla filtru na vybrané zprávy"
 
 #: ui/evolution-mail-message.xml.h:5
-#, fuzzy
-msgid "Caret _Mode"
-msgstr "Textový model"
-
-#: ui/evolution-mail-message.xml.h:6
 msgid "Compose a reply to all of the recipients of the selected message"
 msgstr "Napsat odpověď všem příjemcům vybrané zprávy"
 
-#: ui/evolution-mail-message.xml.h:7
+#: ui/evolution-mail-message.xml.h:6
 msgid "Compose a reply to the mailing list of the selected message"
 msgstr "Napsat odpověď do poštovní konference z vybraných zpráv"
 
-#: ui/evolution-mail-message.xml.h:8
+#: ui/evolution-mail-message.xml.h:7
 msgid "Compose a reply to the sender of the selected message"
 msgstr "Napsat odpověď odesílateli vybrané zprávy"
 
-#: ui/evolution-mail-message.xml.h:11
+#: ui/evolution-mail-message.xml.h:9
 msgid "Copy selected messages to another folder"
 msgstr "Kopírovat vybrané zprávy do jiné složky"
 
-#: ui/evolution-mail-message.xml.h:12
+#: ui/evolution-mail-message.xml.h:10
 msgid "Create _Virtual Folder From Message"
 msgstr "Ze zprávy vytvořit _virtuální složku"
 
-#: ui/evolution-mail-message.xml.h:13
+#: ui/evolution-mail-message.xml.h:11
 msgid "Create a rule to filter messages from this sender"
 msgstr "Vytvořit pravidlo pro filtrování zpráv od tohoto odesílatele"
 
-#: ui/evolution-mail-message.xml.h:14
+#: ui/evolution-mail-message.xml.h:12
 msgid "Create a rule to filter messages to these recipients"
 msgstr "Vytvořit pravidlo pro filtrování zpráv těmto příjemcům"
 
-#: ui/evolution-mail-message.xml.h:15
+#: ui/evolution-mail-message.xml.h:13
 msgid "Create a rule to filter messages to this mailing list"
 msgstr "Vytvořit pravidlo pro filtrování zpráv pro tuto poštovní konferenci"
 
-#: ui/evolution-mail-message.xml.h:16
+#: ui/evolution-mail-message.xml.h:14
 msgid "Create a rule to filter messages with this subject"
 msgstr "Vytvořit pravidlo pro filtrování zpráv s tímto předmětem"
 
-#: ui/evolution-mail-message.xml.h:17
+#: ui/evolution-mail-message.xml.h:15
 msgid "Create a virtual folder for these recipients"
 msgstr "Vytvořit virtuální složku pro tyto příjemce"
 
-#: ui/evolution-mail-message.xml.h:18
+#: ui/evolution-mail-message.xml.h:16
 msgid "Create a virtual folder for this mailing list"
 msgstr "Vytvořit virtuální složku pro tuto poštovní konferenci"
 
-#: ui/evolution-mail-message.xml.h:19
+#: ui/evolution-mail-message.xml.h:17
 msgid "Create a virtual folder for this sender"
 msgstr "Vytvořit virtuální složku pro tohoto odesílatele"
 
-#: ui/evolution-mail-message.xml.h:20
+#: ui/evolution-mail-message.xml.h:18
 msgid "Create a virtual folder for this subject"
 msgstr "Vytvořit virtuální složku pro tento předmět"
 
-#: ui/evolution-mail-message.xml.h:23
+#: ui/evolution-mail-message.xml.h:19
 msgid "Decrease the text size"
 msgstr "Zmenšit velikost textu"
 
-#: ui/evolution-mail-message.xml.h:25
+#: ui/evolution-mail-message.xml.h:21
 msgid "Display the next important message"
 msgstr "Zobrazit následující důležitou zprávu"
 
-#: ui/evolution-mail-message.xml.h:26
+#: ui/evolution-mail-message.xml.h:22
 msgid "Display the next message"
 msgstr "Zobrazit následující zprávu"
 
-#: ui/evolution-mail-message.xml.h:27
+#: ui/evolution-mail-message.xml.h:23
 msgid "Display the next unread message"
 msgstr "Zobrazit následující nepřečtenou zprávu"
 
-#: ui/evolution-mail-message.xml.h:28
+#: ui/evolution-mail-message.xml.h:24
 msgid "Display the next unread thread"
 msgstr "Zobrazit následující nepřečtené vlákno"
 
-#: ui/evolution-mail-message.xml.h:29
+#: ui/evolution-mail-message.xml.h:25
 msgid "Display the previous important message"
 msgstr "Zobrazit předcházející důležitou zprávu"
 
-#: ui/evolution-mail-message.xml.h:30
+#: ui/evolution-mail-message.xml.h:26
 msgid "Display the previous message"
 msgstr "Zobrazit předcházející zprávu"
 
-#: ui/evolution-mail-message.xml.h:31
+#: ui/evolution-mail-message.xml.h:27
 msgid "Display the previous unread message"
 msgstr "Zobrazit předcházející nepřečtenou zprávu"
 
-#: ui/evolution-mail-message.xml.h:32
+#: ui/evolution-mail-message.xml.h:28
 msgid "F_orward"
 msgstr "Př_eposlat"
 
-#: ui/evolution-mail-message.xml.h:33
+#: ui/evolution-mail-message.xml.h:29
 msgid "Filter on Mailing _List..."
 msgstr "Filtr podle poštovní _konference..."
 
-#: ui/evolution-mail-message.xml.h:34
+#: ui/evolution-mail-message.xml.h:30
 msgid "Filter on Se_nder..."
 msgstr "Filtr podle _odesílatele..."
 
-#: ui/evolution-mail-message.xml.h:35
+#: ui/evolution-mail-message.xml.h:31
 msgid "Filter on _Recipients..."
 msgstr "Filtr podle _příjemců..."
 
-#: ui/evolution-mail-message.xml.h:36
+#: ui/evolution-mail-message.xml.h:32
 msgid "Filter on _Subject..."
 msgstr "Filtr podle pře_dmětu..."
 
-#: ui/evolution-mail-message.xml.h:37
+#: ui/evolution-mail-message.xml.h:33
 msgid "Flag selected message(s) for follow-up"
 msgstr "Označí vybrané zprávy pro follow up"
 
-#: ui/evolution-mail-message.xml.h:38
+#: ui/evolution-mail-message.xml.h:34
 msgid "Follow _Up..."
 msgstr "Follow _Up..."
 
-#: ui/evolution-mail-message.xml.h:39
+#: ui/evolution-mail-message.xml.h:35
 msgid "Force images in HTML mail to be loaded"
 msgstr "Vždy nahrávat obrázky v HTML zprávách"
 
-#: ui/evolution-mail-message.xml.h:41
+#: ui/evolution-mail-message.xml.h:37
 msgid "Forward the selected message in the body of a new message"
 msgstr "Přeposlat vybranou zprávu v těle nové zprávy"
 
-#: ui/evolution-mail-message.xml.h:42
+#: ui/evolution-mail-message.xml.h:38
 msgid "Forward the selected message quoted like a reply"
 msgstr "Přeposlat vybranou zprávu uvedenou jako odpověď"
 
-#: ui/evolution-mail-message.xml.h:43
+#: ui/evolution-mail-message.xml.h:39
 msgid "Forward the selected message to someone"
 msgstr "Přeposlat někomu vybranou zprávu"
 
-#: ui/evolution-mail-message.xml.h:44
+#: ui/evolution-mail-message.xml.h:40
 msgid "Forward the selected message to someone as an attachment"
 msgstr "Přeposlat někomu vybranou zprávu jako přílohu"
 
-#: ui/evolution-mail-message.xml.h:45
+#: ui/evolution-mail-message.xml.h:41
 msgid "Increase the text size"
 msgstr "Zvětšit velikost textu"
 
-#: ui/evolution-mail-message.xml.h:46
+#: ui/evolution-mail-message.xml.h:42
 msgid "Load _Images"
 msgstr "Nahrávat _obrázky"
 
-#: ui/evolution-mail-message.xml.h:47
-msgid "Mar_k as Read"
-msgstr "Označit jako _přečtené"
-
-#: ui/evolution-mail-message.xml.h:48
+#: ui/evolution-mail-message.xml.h:44
 msgid "Mark as I_mportant"
 msgstr "Označit jako _důležité"
 
-#: ui/evolution-mail-message.xml.h:49
+#: ui/evolution-mail-message.xml.h:45
 msgid "Mark as U_nread"
 msgstr "Označit jako _nepřečtené"
 
-#: ui/evolution-mail-message.xml.h:50
+#: ui/evolution-mail-message.xml.h:46
 msgid "Mark as Unimp_ortant"
 msgstr "Označit jako nedů_ležité"
 
-#: ui/evolution-mail-message.xml.h:51
+#: ui/evolution-mail-message.xml.h:47
 msgid "Mark the selected message(s) as having been read"
 msgstr "Označit vybrané zprávy jako přečtené"
 
-#: ui/evolution-mail-message.xml.h:52
+#: ui/evolution-mail-message.xml.h:48
 msgid "Mark the selected message(s) as important"
 msgstr "Označit vybrané zprávy jako důležité"
 
-#: ui/evolution-mail-message.xml.h:53
+#: ui/evolution-mail-message.xml.h:49
 msgid "Mark the selected message(s) as not having been read"
 msgstr "Označit vybrané zprávy jako nepřečtené"
 
-#: ui/evolution-mail-message.xml.h:54
+#: ui/evolution-mail-message.xml.h:50
 msgid "Mark the selected message(s) as unimportant"
 msgstr "Označit vybrané zprávy jako nedůležité"
 
-#: ui/evolution-mail-message.xml.h:55
+#: ui/evolution-mail-message.xml.h:51
 msgid "Mark the selected messages for deletion"
 msgstr "Označit vybrané zprávy ke smazání"
 
-#: ui/evolution-mail-message.xml.h:56
+#: ui/evolution-mail-message.xml.h:52
 msgid "Move"
 msgstr "Přesunout"
 
-#: ui/evolution-mail-message.xml.h:57
+#: ui/evolution-mail-message.xml.h:53
 msgid "Move selected message(s) to another folder"
 msgstr "Přesunout vybrané zprávy do jiné složky"
 
-#: ui/evolution-mail-message.xml.h:58
+#: ui/evolution-mail-message.xml.h:54
 msgid "Next"
 msgstr "Další"
 
-#: ui/evolution-mail-message.xml.h:59
+#: ui/evolution-mail-message.xml.h:55
 msgid "Next _Important Message"
 msgstr "další důležit_ou zprávu"
 
-#: ui/evolution-mail-message.xml.h:60
+#: ui/evolution-mail-message.xml.h:56
 msgid "Next _Thread"
 msgstr "další _vlákno"
 
-#: ui/evolution-mail-message.xml.h:61
+#: ui/evolution-mail-message.xml.h:57
 msgid "Next _Unread Message"
 msgstr "d_alší nepřečtenou zprávu"
 
-#: ui/evolution-mail-message.xml.h:62
+#: ui/evolution-mail-message.xml.h:58
 msgid "Open the selected message in a new window"
 msgstr "Otevřít vybranou zprávu v novém okně"
 
-#: ui/evolution-mail-message.xml.h:63
+#: ui/evolution-mail-message.xml.h:59
 msgid "Open the selected message in the composer to re-send it"
 msgstr "Otevřít vybranou zprávu a upravit ji pro znovu-poslání"
 
-#: ui/evolution-mail-message.xml.h:64
+#: ui/evolution-mail-message.xml.h:60
 msgid "Original Si_ze"
 msgstr "Původní _velikost"
 
-#: ui/evolution-mail-message.xml.h:65
+#: ui/evolution-mail-message.xml.h:61
 msgid "P_revious Unread Message"
 msgstr "pře_dchozí nepřečtenou zprávu"
 
-#: ui/evolution-mail-message.xml.h:67
-#, fuzzy
-msgid "Post a Repl_y"
+#: ui/evolution-mail-message.xml.h:62
+msgid "Post a Reply"
 msgstr "Poslat odpověď"
 
-#: ui/evolution-mail-message.xml.h:68
+#: ui/evolution-mail-message.xml.h:63
 msgid "Post a reply to a message in a Public folder"
 msgstr "Poslat odpověď na zprávu do veřejné složky"
 
-#: ui/evolution-mail-message.xml.h:69
+#: ui/evolution-mail-message.xml.h:64
 msgid "Pr_evious Important Message"
 msgstr "př_edchozí důležitou zprávu"
 
-#: ui/evolution-mail-message.xml.h:70
+#: ui/evolution-mail-message.xml.h:65
 msgid "Preview the message to be printed"
 msgstr "Náhled zprávy před tiskem"
 
-#: ui/evolution-mail-message.xml.h:71
+#: ui/evolution-mail-message.xml.h:66
 msgid "Previous"
 msgstr "Předchozí"
 
-#: ui/evolution-mail-message.xml.h:74
+#: ui/evolution-mail-message.xml.h:69
 msgid "Print this message"
 msgstr "Vytisknout tuto zprávu"
 
-#: ui/evolution-mail-message.xml.h:75
+#: ui/evolution-mail-message.xml.h:70
 msgid "Re_direct"
 msgstr "Přesmě_rovat"
 
-#: ui/evolution-mail-message.xml.h:76
+#: ui/evolution-mail-message.xml.h:71
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "Přesměruje (bounce) vybranou zprávu někomu jinému"
 
-#: ui/evolution-mail-message.xml.h:79
-msgid "Reply to _All"
-msgstr "Odpovědět _všem"
-
-#: ui/evolution-mail-message.xml.h:80
-msgid "Reply to _List"
-msgstr "Odpovědět _do konference"
-
-#: ui/evolution-mail-message.xml.h:81
+#: ui/evolution-mail-message.xml.h:76
 msgid "Reset the text to its original size"
 msgstr "Obnovit text v jeho původní velikosti"
 
-#: ui/evolution-mail-message.xml.h:82
-#, fuzzy
-msgid "S_earch in Message..."
+#: ui/evolution-mail-message.xml.h:77
+msgid "S_earch Message..."
 msgstr "Hledat _ve zprávě..."
 
-#: ui/evolution-mail-message.xml.h:83
+#: ui/evolution-mail-message.xml.h:78
 msgid "S_maller"
 msgstr "_Menší"
 
-#: ui/evolution-mail-message.xml.h:84
+#: ui/evolution-mail-message.xml.h:79
 msgid "Save the message as a text file"
 msgstr "Uložit tuto zprávu jako textový soubor"
 
-#: ui/evolution-mail-message.xml.h:85
+#: ui/evolution-mail-message.xml.h:80
 msgid "Search for text in the body of the displayed message"
 msgstr "Hledat text v těle zobrazené zprávy"
 
-#: ui/evolution-mail-message.xml.h:86
+#: ui/evolution-mail-message.xml.h:81
 msgid "Set up the page settings for your current printer"
 msgstr "Nastavit stránku pro vaši aktuální tiskárnu"
 
-#: ui/evolution-mail-message.xml.h:87
+#: ui/evolution-mail-message.xml.h:82
 msgid "Show Email _Source"
 msgstr "Ukázat _zdroj emailu"
 
-#: ui/evolution-mail-message.xml.h:88
+#: ui/evolution-mail-message.xml.h:83
 msgid "Show Full _Headers"
 msgstr "Ukázat celou _hlavičku"
 
-#: ui/evolution-mail-message.xml.h:89
-#, fuzzy
-msgid "Show a blinking cursor in the body of displayed messages"
-msgstr "Hledat text v těle zobrazené zprávy"
-
-#: ui/evolution-mail-message.xml.h:90
+#: ui/evolution-mail-message.xml.h:84
 msgid "Show message in the normal style"
 msgstr "Ukázat zprávu v normálním stylu"
 
-#: ui/evolution-mail-message.xml.h:91
+#: ui/evolution-mail-message.xml.h:85
 msgid "Show message with all email headers"
 msgstr "Ukázat zprávu se všemi e-mailovými hlavičkami"
 
-#: ui/evolution-mail-message.xml.h:92
+#: ui/evolution-mail-message.xml.h:86
 msgid "Show the raw email source of the message"
 msgstr "Zobrazit zdrojový formát poštovní zprávy"
 
-#: ui/evolution-mail-message.xml.h:93
+#: ui/evolution-mail-message.xml.h:87
 msgid "Text Si_ze"
 msgstr "_Velikost textu"
 
-#: ui/evolution-mail-message.xml.h:94
+#: ui/evolution-mail-message.xml.h:88
 msgid "Un-delete the selected messages"
 msgstr "Obnovit smazané vybrané zprávy"
 
-#: ui/evolution-mail-message.xml.h:95
+#: ui/evolution-mail-message.xml.h:89
 msgid "VFolder on Mailing _List..."
 msgstr "V-složku podle poštovní _konference..."
 
-#: ui/evolution-mail-message.xml.h:96
+#: ui/evolution-mail-message.xml.h:90
 msgid "VFolder on Se_nder..."
 msgstr "V-složku podle _odesílatele..."
 
-#: ui/evolution-mail-message.xml.h:97
+#: ui/evolution-mail-message.xml.h:91
 msgid "VFolder on _Recipients..."
 msgstr "V-složku podle _příjemců"
 
-#: ui/evolution-mail-message.xml.h:98
+#: ui/evolution-mail-message.xml.h:92
 msgid "VFolder on _Subject..."
 msgstr "V-složku podle pře_dmětu..."
 
-#: ui/evolution-mail-message.xml.h:100
+#: ui/evolution-mail-message.xml.h:94
 msgid "_Attached"
 msgstr "_Přiložené"
 
-#: ui/evolution-mail-message.xml.h:102
+#: ui/evolution-mail-message.xml.h:95
 msgid "_Copy to Folder"
 msgstr "_Kopírovat do složky"
 
-#: ui/evolution-mail-message.xml.h:103
+#: ui/evolution-mail-message.xml.h:96
 msgid "_Create Filter From Message"
 msgstr "_Vytvořit filtr ze zprávy"
 
-#: ui/evolution-mail-message.xml.h:105
+#: ui/evolution-mail-message.xml.h:98
 msgid "_Forward Message"
 msgstr "_Přeposlat zprávu"
 
-#: ui/evolution-mail-message.xml.h:106
+#: ui/evolution-mail-message.xml.h:99
 msgid "_Go To"
 msgstr "_Jít na"
 
-#: ui/evolution-mail-message.xml.h:107
+#: ui/evolution-mail-message.xml.h:100
 msgid "_Inline"
 msgstr "_Vložené"
 
-#: ui/evolution-mail-message.xml.h:108
+#: ui/evolution-mail-message.xml.h:101
 msgid "_Larger"
 msgstr "_Větší"
 
-#: ui/evolution-mail-message.xml.h:109
+#: ui/evolution-mail-message.xml.h:102
 msgid "_Message Display"
 msgstr "_Zobrazení zprávy"
 
-#: ui/evolution-mail-message.xml.h:110
+#: ui/evolution-mail-message.xml.h:103
 msgid "_Move to Folder"
 msgstr "_Přesunout do složky"
 
-#: ui/evolution-mail-message.xml.h:111
+#: ui/evolution-mail-message.xml.h:104
 msgid "_Next Message"
 msgstr "_následující zprávu"
 
-#: ui/evolution-mail-message.xml.h:112
+#: ui/evolution-mail-message.xml.h:105
 msgid "_Normal Display"
 msgstr "_Normální zobrazení"
 
-#: ui/evolution-mail-message.xml.h:113
+#: ui/evolution-mail-message.xml.h:106
 msgid "_Open Message"
 msgstr "_Otevřít zprávu"
 
-#: ui/evolution-mail-message.xml.h:115
+#: ui/evolution-mail-message.xml.h:107
 msgid "_Previous Message"
 msgstr "_předchozí zprávu"
 
-#: ui/evolution-mail-message.xml.h:117
+#: ui/evolution-mail-message.xml.h:109
 msgid "_Quoted"
 msgstr "_Citace"
 
-#: ui/evolution-mail-message.xml.h:118
-msgid "_Reply to Sender"
-msgstr "_Odpovědět odesílateli"
-
-#: ui/evolution-mail-message.xml.h:119
+#: ui/evolution-mail-message.xml.h:111
 msgid "_Resend..."
 msgstr "_Znovu poslat..."
 
-#: ui/evolution-mail-message.xml.h:121 ui/evolution.xml.h:63
+#: ui/evolution-mail-message.xml.h:113 ui/evolution.xml.h:63
 msgid "_Tools"
 msgstr "_Nástroje"
 
-#: ui/evolution-mail-message.xml.h:122
+#: ui/evolution-mail-message.xml.h:114
 msgid "_Undelete"
 msgstr "_Obnovit smazané"
 
+#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:6
+msgid "Close this window"
+msgstr "Zavřít toto okno"
+
+#: ui/evolution-mail-messagedisplay.xml.h:5
+#: ui/evolution-message-composer.xml.h:39
+#: ui/evolution-signature-editor.xml.h:10 ui/evolution-subscribe.xml.h:9
+#: ui/evolution.xml.h:43
+msgid "_Close"
+msgstr "_Zavřít"
+
+#: ui/evolution-mail-messagedisplay.xml.h:8
+#: ui/evolution-message-composer.xml.h:49 ui/evolution.xml.h:64
+msgid "_View"
+msgstr "_Zobrazení"
+
 #: ui/evolution-message-composer.xml.h:1
 msgid "Attach"
 msgstr "Příloha"
@@ -26934,7 +27153,7 @@ msgstr "Příloha"
 msgid "Attach a file"
 msgstr "Připojit soubor"
 
-#: ui/evolution-message-composer.xml.h:4 ui/evolution-signature-editor.xml.h:3
+#: ui/evolution-message-composer.xml.h:4 ui/evolution-signature-editor.xml.h:2
 msgid "Close the current file"
 msgstr "Uzavřít aktuální soubor"
 
@@ -26950,7 +27169,7 @@ msgstr "Zašifrovat tuto zprávu pomocí PGP"
 msgid "Encrypt this message with your S/MIME Encryption Cetificate"
 msgstr "Zašifrovat tuto zprávu vaším šifrovacím certifikátem S/MIME"
 
-#: ui/evolution-message-composer.xml.h:8 ui/evolution-signature-editor.xml.h:4
+#: ui/evolution-message-composer.xml.h:8 ui/evolution-signature-editor.xml.h:3
 msgid "For_mat"
 msgstr "For_mát"
 
@@ -26982,11 +27201,6 @@ msgstr "Šifrování S/MIME"
 msgid "S/MIME Sign"
 msgstr "Podpis S/MIME"
 
-#: ui/evolution-message-composer.xml.h:16
-#: ui/evolution-signature-editor.xml.h:6
-msgid "Save"
-msgstr "Uložit"
-
 #: ui/evolution-message-composer.xml.h:17
 msgid "Save As"
 msgstr "Uložit jako"
@@ -27000,7 +27214,7 @@ msgid "Save in folder..."
 msgstr "Uložit ve složce..."
 
 #: ui/evolution-message-composer.xml.h:21
-#: ui/evolution-signature-editor.xml.h:9
+#: ui/evolution-signature-editor.xml.h:7
 msgid "Save the current file"
 msgstr "Uložit aktuální soubor"
 
@@ -27017,7 +27231,7 @@ msgid "Send"
 msgstr "Poslat"
 
 #: ui/evolution-message-composer.xml.h:25
-#: ui/evolution-signature-editor.xml.h:11
+#: ui/evolution-signature-editor.xml.h:9
 msgid "Send the mail in HTML format"
 msgstr "Poslat zprávu ve formátu HTML"
 
@@ -27082,7 +27296,7 @@ msgid "_From Field"
 msgstr "_Od:"
 
 #: ui/evolution-message-composer.xml.h:44
-#: ui/evolution-signature-editor.xml.h:14
+#: ui/evolution-signature-editor.xml.h:13
 msgid "_Insert"
 msgstr "_Vložit"
 
@@ -27098,11 +27312,11 @@ msgstr "Odpovědět-_komu:"
 msgid "_Security"
 msgstr "_Zabezpečení"
 
-#: ui/evolution-signature-editor.xml.h:5
+#: ui/evolution-signature-editor.xml.h:4
 msgid "H_TML"
 msgstr "_HTML"
 
-#: ui/evolution-signature-editor.xml.h:10
+#: ui/evolution-signature-editor.xml.h:8
 msgid "Save the current file and close the window"
 msgstr "Uložit aktuální soubor a zavřít okno"
 
@@ -27178,20 +27392,15 @@ msgstr "Smazat vybrané úkoly"
 msgid "Mar_k as Complete"
 msgstr "Označit jako _dokončený"
 
-#: ui/evolution-tasks.xml.h:9
-#, fuzzy
-msgid "Mark selected tasks as complete"
-msgstr "Označit _vybrané úkoly jako dokončené"
-
-#: ui/evolution-tasks.xml.h:11
+#: ui/evolution-tasks.xml.h:10
 msgid "Paste task from the clipboard"
 msgstr "Vloží úlohu ze schránky"
 
-#: ui/evolution-tasks.xml.h:12
+#: ui/evolution-tasks.xml.h:11
 msgid "Previews the list of tasks to be printed"
 msgstr "Náhled seznamu úkolů před tiskem"
 
-#: ui/evolution-tasks.xml.h:14
+#: ui/evolution-tasks.xml.h:13
 msgid "Print the list of tasks"
 msgstr "Tisknout seznam úkolů"
 
@@ -27440,33 +27649,27 @@ msgid "_Work Week View"
 msgstr "Náhled na _pracovní týden"
 
 #: views/mail/galview.xml.h:1
-#, fuzzy
-msgid "As _Sent Folder"
+msgid "As Sent Folder"
 msgstr "Jako složka Odeslané"
 
 #: views/mail/galview.xml.h:2
-#, fuzzy
-msgid "By S_tatus"
-msgstr "Podle stavu"
+msgid "By Follow Up Flag"
+msgstr "Podle příznaku Follow up"
 
 #: views/mail/galview.xml.h:3
-#, fuzzy
-msgid "By Se_nder"
+msgid "By Sender"
 msgstr "Podle odesílatele"
 
 #: views/mail/galview.xml.h:4
-#, fuzzy
-msgid "By Su_bject"
-msgstr "Podle předmětu"
+msgid "By Status"
+msgstr "Podle stavu"
 
 #: views/mail/galview.xml.h:5
-#, fuzzy
-msgid "By _Follow Up Flag"
-msgstr "Podle příznaku Follow up"
+msgid "By Subject"
+msgstr "Podle předmětu"
 
 #: views/mail/galview.xml.h:6
-#, fuzzy
-msgid "_Messages"
+msgid "Messages"
 msgstr "Zprávy"
 
 #: views/tasks/galview.xml.h:1
@@ -27523,20 +27726,20 @@ msgstr "Definovat zobrazení..."
 
 #. Translators: These are the first characters of each day of the
 #. week, 'M' for 'Monday', 'T' for Tuesday etc.
-#: widgets/misc/e-calendar-item.c:456
+#: widgets/misc/e-calendar-item.c:427
 msgid "MTWTFSS"
 msgstr "PÚSČPSN"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: widgets/misc/e-calendar-item.c:1174
+#: widgets/misc/e-calendar-item.c:1127
 msgid "%B %Y"
 msgstr "%B %Y"
 
-#: widgets/misc/e-cell-date-edit.c:241 widgets/misc/e-dateedit.c:431
+#: widgets/misc/e-cell-date-edit.c:241 widgets/misc/e-dateedit.c:428
 msgid "Now"
 msgstr "Nyní"
 
-#: widgets/misc/e-cell-date-edit.c:249 widgets/misc/e-dateedit.c:437
+#: widgets/misc/e-cell-date-edit.c:249 widgets/misc/e-dateedit.c:434
 msgid "Today"
 msgstr "Dnes"
 
@@ -27653,6 +27856,22 @@ msgstr "_Upravit uložená vyhledávání..."
 msgid "_Advanced..."
 msgstr "_Pokročilé..."
 
+#: widgets/misc/e-messagebox.c:154
+msgid "Information"
+msgstr "Předformátované"
+
+#: widgets/misc/e-messagebox.c:168
+msgid "Error"
+msgstr "Chyba"
+
+#: widgets/misc/e-messagebox.c:175
+msgid "Question"
+msgstr "Otázka"
+
+#: widgets/misc/e-messagebox.c:182
+msgid "Message"
+msgstr "Zpráva"
+
 #: widgets/misc/e-search-bar.c:531
 msgid "_Search"
 msgstr "_Vyhledávání"
@@ -27698,537 +27917,5 @@ msgstr "Obsluha místního souboru kalendáře Evolution"
 msgid "Evolution Addressbook local file backend"
 msgstr "Obsluha místního souboru adresáře Evolution"
 
-#~ msgid "That person is already attending the meeting!"
-#~ msgstr "Tato osoba se již schůzky účastní!"
-
-#~ msgid "URL:"
-#~ msgstr "URL:"
-
-#~ msgid "_Save as..."
-#~ msgstr "_Uložit jako..."
-
-#~ msgid "End Date"
-#~ msgstr "Konec"
-
-#~ msgid "New _Appointment"
-#~ msgstr "Nová _událost"
-
-#~ msgid "Print..."
-#~ msgstr "Tisk..."
-
-#~ msgid "Chair Persons"
-#~ msgstr "Předsedové"
-
-#~ msgid "Required Participants"
-#~ msgstr "Vyžadovaní účastníci"
-
-#~ msgid "Optional Participants"
-#~ msgstr "Nepovinní účastníci"
-
-#~ msgid "Resources"
-#~ msgstr "Zdroje"
-
-#~ msgid "Individual"
-#~ msgstr "Individuálně"
-
-#~ msgid "Group"
-#~ msgstr "Skupina"
-
-#~ msgid "Resource"
-#~ msgstr "Zdroj"
-
-#~ msgid "Room"
-#~ msgstr "Místnost"
-
-#~ msgid "Chair"
-#~ msgstr "Předseda"
-
-#~ msgid "Required Participant"
-#~ msgstr "Vyžadovaný účastník"
-
-#~ msgid "Optional Participant"
-#~ msgstr "Nepovinný účastník"
-
-#~ msgid "Non-Participant"
-#~ msgstr "Bez účasti"
-
-#~ msgid "Needs Action"
-#~ msgstr "Potřebné akce"
-
-#~ msgid "Delegated"
-#~ msgstr "Delegováno"
-
-#~ msgid "In Process"
-#~ msgstr "Probíhá"
-
-#~ msgid "Hey you, dunce. You need an account to send mail doncha know."
-#~ msgstr "Hej ty, truhlíku. Potřebuješ účet, abys mohl poslat poštu, chápeš."
-
-#~ msgid "Properties for \"%s\""
-#~ msgstr "Vlastnosti \"%s\""
-
-#~ msgid "Properties"
-#~ msgstr "Vlastnosti"
-
-#~ msgid "Could not create temporary directory: %s"
-#~ msgstr "Nelze vytvořit dočasný adresář: %s"
-
-#~ msgid "%d new"
-#~ msgstr "nové %d"
-
-#~ msgid ", "
-#~ msgstr ", "
-
-#~ msgid "%d hidden"
-#~ msgstr "skryté %d"
-
-#~ msgid "%d visible"
-#~ msgstr "viditelné %d"
-
-#~ msgid "%d selected"
-#~ msgstr "vybráno %d"
-
-#~ msgid "%d unsent"
-#~ msgstr "neodesláno %d"
-
-#~ msgid "%d sent"
-#~ msgstr "odesláno %d"
-
-#~ msgid "%d total"
-#~ msgstr "celkem %d"
-
-#~ msgid "Create _Virtual Folder From Search..."
-#~ msgstr "Vytvořit _virtuální složku z vyhledávání..."
-
-#~ msgid "VFolder on _Subject"
-#~ msgstr "V-složka podle _předmětu"
-
-#~ msgid "VFolder on Se_nder"
-#~ msgstr "V-složka podle _odesílatele"
-
-#~ msgid "VFolder on _Recipients"
-#~ msgstr "V-složka podle příje_mců"
-
-#~ msgid "VFolder on Mailing _List"
-#~ msgstr "V-složka podle poštovní _konference"
-
-#~ msgid "Filter on Sub_ject"
-#~ msgstr "Filtr podle _předmětu"
-
-#~ msgid "Filter on Sen_der"
-#~ msgstr "Filtr podle _odesílatele"
-
-#~ msgid "Filter on Re_cipients"
-#~ msgstr "Filtr podle příje_mců"
-
-#~ msgid "Filter on _Mailing List"
-#~ msgstr "Filtr podle poštovní _konference"
-
-#~ msgid "_Edit as New Message..."
-#~ msgstr "_Upravit jako novou zprávu..."
-
-#~ msgid "_Print"
-#~ msgstr "_Tisknout"
-
-#~ msgid "_Forward"
-#~ msgstr "_Přeposlat"
-
-#~ msgid "Follo_w Up..."
-#~ msgstr "Follo_w Up..."
-
-#~ msgid "Fla_g Completed"
-#~ msgstr "Označit jako _dokončeno"
-
-#~ msgid "Cl_ear Flag"
-#~ msgstr "Vymazat _značky"
-
-#~ msgid "Mark as _Unread"
-#~ msgstr "Označit jako _nepřečtené"
-
-#~ msgid "Mark as _Important"
-#~ msgstr "Označit jako _důležité"
-
-#~ msgid "_Mark as Unimportant"
-#~ msgstr "_Označit jako nedůležité"
-
-#~ msgid "U_ndelete"
-#~ msgstr "Obnovit _smazané"
-
-#~ msgid "Mo_ve to Folder..."
-#~ msgstr "Pře_sunout do složky..."
-
-#~ msgid "Add Sender to Address_book"
-#~ msgstr "Přidat odesílatele do _adresáře"
-
-#~ msgid "Appl_y Filters"
-#~ msgstr "Použít _filtry"
-
-#~ msgid "Crea_te Rule From Message"
-#~ msgstr "Vy_tvořit pravidlo ze zprávy"
-
-#~ msgid "VFolder on M_ailing List"
-#~ msgstr "V-složku podle _poštovní konference"
-
-#~ msgid "Filter on _Mailing List (%s)"
-#~ msgstr "Filtr podle poštovní ko_nference (%s)"
-
-#~ msgid "VFolder on M_ailing List (%s)"
-#~ msgstr "V-složku podle poštovní _konference (%s)"
-
-#~ msgid "Don't show this message again."
-#~ msgstr "Příště tuto zprávu nezobrazovat."
-
-#~ msgid ""
-#~ "You have not configured the mail client.\n"
-#~ "You need to do this before you can send,\n"
-#~ "receive or compose mail.\n"
-#~ "Would you like to configure it now?"
-#~ msgstr ""
-#~ "Nemáte nastaveného poštovního klienta.\n"
-#~ "To je nutné udělat před tím, než budete\n"
-#~ "posílat, přijímat nebo psát poštu.\n"
-#~ "Chcete ho nastavit nyní?"
-
-#~ msgid ""
-#~ "You need to configure an identity\n"
-#~ "before you can compose mail."
-#~ msgstr ""
-#~ "Než začnete psát zprávu,\n"
-#~ "musíte nastavit identitu."
-
-#~ msgid ""
-#~ "You need to configure a mail transport\n"
-#~ "before you can compose mail."
-#~ msgstr ""
-#~ "Než začnete psát zprávu,\n"
-#~ "musíte nastavit způsob přenosu."
-
-#~ msgid ""
-#~ "You are sending an HTML-formatted message. Please make sure that\n"
-#~ "the following recipients are willing and able to receive HTML mail:\n"
-#~ msgstr ""
-#~ "Posíláte zprávu ve formátu HTML. Ujistěte se, že následující příjemci\n"
-#~ "si přejí a mohou dostávat zprávy ve formátu HTML:\n"
-
-#~ msgid "Send anyway?"
-#~ msgstr "Přesto poslat?"
-
-#~ msgid ""
-#~ "This message has no subject.\n"
-#~ "Really send?"
-#~ msgstr ""
-#~ "Tato zpráva nemá předmět.\n"
-#~ "Opravdu ji chcete poslat?"
-
-#~ msgid ""
-#~ "Since the contact list you are sending to is configured to hide the "
-#~ "list's addresses, this message will contain only Bcc recipients."
-#~ msgstr ""
-#~ "Protože je seznam kontaktů, na který posíláte zprávu, nastavený tak, aby "
-#~ "skrýval adresy, tato zpráva bude obsahovat pouze adresáty ve skryté kopii."
-
-#~ msgid "This message contains only Bcc recipients."
-#~ msgstr "Tato zpráva je určena pouze skrytým příjemcům."
-
-#~ msgid ""
-#~ "It is possible that the mail server may reveal the recipients by adding "
-#~ "an Apparently-To header.\n"
-#~ "Send anyway?"
-#~ msgstr ""
-#~ "Je možné, že poštovní server zveřejní seznam adresátů přidáním hlavičky "
-#~ "Apparently-To.\n"
-#~ "Přesto poslat?"
-
-#~ msgid "You must specify recipients in order to send this message."
-#~ msgstr "Aby mohla být tato zpráva odeslána, je nutné určit příjemce."
-
-#~ msgid ""
-#~ "Unable to open the drafts folder for this account.\n"
-#~ "Would you like to use the default drafts folder?"
-#~ msgstr ""
-#~ "Není možné otevřít složku konceptů pro tento účet.\n"
-#~ "Chcete použít výchozí složku konceptů?"
-
-#~ msgid "an unknown sender"
-#~ msgstr "neznámý odesílatel"
-
-#~ msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
-#~ msgstr "V %a, %d. %m. %Y v %H:%M, %%s píše:"
-
-#~ msgid "Move message(s) to"
-#~ msgstr "Přesunout zprávu(y) do"
-
-#~ msgid "Copy message(s) to"
-#~ msgstr "Kopírovat zprávu(y) do"
-
-#~ msgid "Are you sure you want to edit all %d messages?"
-#~ msgstr "Opravdu chcete upravit všechny zprávy (%d)?"
-
-#~ msgid ""
-#~ "You may only edit messages saved\n"
-#~ "in the Drafts folder."
-#~ msgstr ""
-#~ "Upravovat můžete pouze zprávy uložené\n"
-#~ "ve složce Koncepty."
-
-#~ msgid ""
-#~ "You may only resend messages\n"
-#~ "in the Sent folder."
-#~ msgstr ""
-#~ "Pouze zprávy ze složky Odeslané je možné\n"
-#~ "znovu poslat."
-
-#~ msgid "Are you sure you want to resend all %d messages?"
-#~ msgstr "Opravdu chcete přeposlat všechny zprávy (%d)?"
-
-#~ msgid "No Message Selected"
-#~ msgstr "Žádná vybraná zpráva"
-
-#~ msgid ""
-#~ "Cannot save to `%s'\n"
-#~ " %s"
-#~ msgstr ""
-#~ "Nelze uložit do `%s'\n"
-#~ " %s"
-
-#~ msgid ""
-#~ "`%s' already exists.\n"
-#~ "Overwrite it?"
-#~ msgstr ""
-#~ "`%s' již existuje.\n"
-#~ "Chcete jej přepsat?"
-
-#~ msgid "Save Message As..."
-#~ msgstr "Uložit zprávu jako..."
-
-#~ msgid "Save Messages As..."
-#~ msgstr "Uložit zprávy jako..."
-
-#~ msgid ""
-#~ "This operation will permanently erase all messages marked as\n"
-#~ "deleted. If you continue, you will not be able to recover these "
-#~ "messages.\n"
-#~ "\n"
-#~ "Really erase these messages?"
-#~ msgstr ""
-#~ "Tato operace trvale vymaže všechny zprávy označené jako smazané.\n"
-#~ "Pokud budete pokračovat, nebude už možné tyto zprávy obnovit.\n"
-#~ "\n"
-#~ "Opravdu vymazat tyto zprávy?"
-
-#~ msgid ""
-#~ "Error loading filter information:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Chyba při načítání informací o filtrech:\n"
-#~ "%s"
-
-#~ msgid "Filters"
-#~ msgstr "Filtry"
-
-#~ msgid "Page %d of %d"
-#~ msgstr "Stránka %d z %d"
-
-#~ msgid "Print Message"
-#~ msgstr "Tisknout zprávu"
-
-#~ msgid "Printing of message failed"
-#~ msgstr "Tisk zprávy selhal"
-
-#~ msgid "Are you sure you want to open all %d messages in separate windows?"
-#~ msgstr "Opravdu chcete otevřít všechny zprávy (%d) v samostatných oknech?"
-
-#~ msgid "Could not create a S/MIME signature context."
-#~ msgstr "Nepodařilo se vytvořit kontext podpisu S/MIME."
-
-#~ msgid "Could not create a S/MIME certsonly context."
-#~ msgstr "Nepodařilo se vytvořit kontext certsonly S/MIME."
-
-#~ msgid "Could not create a S/MIME encryption context."
-#~ msgstr "Nepodařilo se vytvořit kontext zašifrovaní S/MIME."
-
-#~ msgid "Could not create a S/MIME envelope context."
-#~ msgstr "Nepodařilo se vytvořit kontext obálky S/MIME."
-
-#~ msgid "Could not create a S/MIME decode context."
-#~ msgstr "Nepodařilo se vytvořit kontext dekódování S/MIME."
-
-#~ msgid ""
-#~ "File `%s' already exists.\n"
-#~ "Overwrite it?"
-#~ msgstr ""
-#~ "Soubor `%s' již existuje.\n"
-#~ "Přepsat jej?"
-
-#~ msgid "Save Attachment"
-#~ msgstr "Uložit přílohu"
-
-#~ msgid "Could not create temporary file '%s': %s"
-#~ msgstr "Nelze vytvořit dočasný soubor '%s': %s"
-
-#~ msgid "Save Attachment..."
-#~ msgstr "Uložit přílohu..."
-
-#~ msgid "View Inline"
-#~ msgstr "Zobrazit v textu"
-
-#~ msgid "Open in %s..."
-#~ msgstr "Otevřít v %s..."
-
-#~ msgid "View Inline (via %s)"
-#~ msgstr "Zobrazit v textu (pomocí %s)"
-
-#~ msgid "Hide"
-#~ msgstr "Skrýt"
-
-#~ msgid "External Viewer"
-#~ msgstr "Externí prohlížeč"
-
-#~ msgid "Downloading images"
-#~ msgstr "Stahování obrázků"
-
-#~ msgid "Loading message content"
-#~ msgstr "Načítání obsahu zprávy"
-
-#~ msgid "Overdue:"
-#~ msgstr "Úkoly po termínu:"
-
-#~ msgid "by %B %d, %Y, %l:%M %P"
-#~ msgstr "do %B %d, %Y, %l:%M %P"
-
-#~ msgid "Open Link in Browser"
-#~ msgstr "Otevřít odkaz v prohlížeči"
-
-#~ msgid "Copy Link Location"
-#~ msgstr "Kopírovat umístění odkazu"
-
-#~ msgid "Save Link as (FIXME)"
-#~ msgstr "Uložit odkaz jako"
-
-#~ msgid "Save Image as..."
-#~ msgstr "Uložit obrázek jako..."
-
-#~ msgid "%s attachment"
-#~ msgstr "%s příloha"
-
-#~ msgid "Could not parse MIME message. Displaying as source."
-#~ msgstr "Není možné zpracovat zprávu MIME. Zobrazí se jako zdrojový kód."
-
-#~ msgid "Bad Address"
-#~ msgstr "Špatná adresa"
-
-#~ msgid "Reply-To"
-#~ msgstr "Odpovědět-komu"
-
-#~ msgid "Cc"
-#~ msgstr "Kopie"
-
-#~ msgid "Bcc"
-#~ msgstr "Skrytá kopie"
-
-#~ msgid ""
-#~ "This message is digitally signed. Click the lock icon for more "
-#~ "information."
-#~ msgstr ""
-#~ "Tato zpráva je digitálně podepsaná. Kliknutím na ikonu zámku získáte "
-#~ "podrobnosti."
-
-#~ msgid "Could not create a PGP verfication context"
-#~ msgstr "Nepodařilo se vytvořit kontext ověření PGP."
-
-#~ msgid "This message is digitally signed and has been found to be authentic."
-#~ msgstr "Tato zpráva je digitálně podepsaná a byla shledána platnou."
-
-#~ msgid ""
-#~ "This message is digitally signed but can not be proven to be authentic."
-#~ msgstr "Tato zpráva je digitálně podepsaná, ale nelze ověřit její platnost."
-
-#~ msgid "Pointer to FTP site (%s)"
-#~ msgstr "Odkaz na FTP server (%s)"
-
-#~ msgid "Pointer to local file (%s) valid at site \"%s\""
-#~ msgstr "Odkaz na lokální soubor (%s) platný na serveru \"%s\""
-
-#~ msgid "Pointer to local file (%s)"
-#~ msgstr "Odkaz na lokální soubor (%s)"
-
-#~ msgid "Pointer to remote data (%s)"
-#~ msgstr "Odkaz na vzdálená data (%s)"
-
-#~ msgid "Pointer to unknown external data (\"%s\" type)"
-#~ msgstr "Odkaz na neznámá externí data (typ \"%s\")"
-
-#~ msgid "Malformed external-body part."
-#~ msgstr "Chybná část externího těla."
-
-#~ msgid "However, the message was successfully sent."
-#~ msgstr "Zpráva byla ale úspěšně odeslána."
-
-#~ msgid "(Untitled Message)"
-#~ msgstr "(Nepojmenovaná zpráva)"
-
-#~ msgid "Untitled Message"
-#~ msgstr "Nepojmenovaná zpráva"
-
-#~ msgid "Empty Message"
-#~ msgstr "Prázdná zpráva"
-
-#~ msgid "Find in Message"
-#~ msgstr "Hledat ve zprávě"
-
-#~ msgid "Case Sensitive"
-#~ msgstr "Rozlišovat malá/velká"
-
-#~ msgid "Search Forward"
-#~ msgstr "Hledat dopředu"
-
-#~ msgid "Find:"
-#~ msgstr "Hledat:"
-
-#~ msgid "Matches:"
-#~ msgstr "Odpovídá:"
-
-#~ msgid "Forwarded Message"
-#~ msgstr "Přeposlaná zpráva"
-
-#~ msgid "(No subject)"
-#~ msgstr "(Bez předmětu)"
-
-#~ msgid "%s - Message"
-#~ msgstr "%s - zpráva"
-
-#~ msgid "Scanning folders under %s on \"%s\""
-#~ msgstr "Prochází se složky pod %s na \"%s\""
-
-#~ msgid "Scanning root-level folders on \"%s\""
-#~ msgstr "Prochází se kořenové složky na \"%s\""
-
-#~ msgid "Subscribing to folder \"%s\""
-#~ msgstr "Přihlašuji si složku \"%s\""
-
-#~ msgid "Unsubscribing to folder \"%s\""
-#~ msgstr "Odhlašuji se ze složky \"%s\""
-
-#~ msgid "No server has been selected"
-#~ msgstr "Nebyl vybrán žádný server"
-
-#~ msgid "Please select a server."
-#~ msgstr "Vyberte prosím server."
-
-#~ msgid "Scanning folders ..."
-#~ msgstr "Zkoumám složky..."
-
-#~ msgid "Save As..."
-#~ msgstr "Uložit jako..."
-
-#~ msgid "Information"
-#~ msgstr "Předformátované"
-
-#~ msgid "Question"
-#~ msgstr "Otázka"
-
-#~ msgid "Message"
-#~ msgstr "Zpráva"
-
 #~ msgid "Search"
 #~ msgstr "Hledat"
diff --git a/po/da.po b/po/da.po
index d0b0c96bec..8d9ac0d00d 100644
--- a/po/da.po
+++ b/po/da.po
@@ -12,7 +12,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 1.4.1\n"
-"POT-Creation-Date: 2003-10-15 23:45+0200\n"
+"POT-Creation-Date: 2003-06-25 13:24-0400\n"
 "PO-Revision-Date: 2003-02-02 12:41+0100\n"
 "Last-Translator: Søren Boll Overgaard <boll@debian.org>\n"
 "Language-Team: Danish <dansk@klid.dk>\n"
@@ -20,182 +20,47 @@ msgstr ""
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: addressbook/backend/ebook/e-card.c:1306
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in.h:1
+msgid "Evolution LDIF importer"
+msgstr "Evolution LDIF-importerer"
+
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in.h:2
+msgid "LDAP Data Interchange Format (.ldif)"
+msgstr "LDAP-dataudvækslingsformat (.ldif)"
+
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:1
+msgid "Evolution VCard Importer"
+msgstr "Evolution VCard-importerer"
+
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:2
+msgid "Evolution VCard importer"
+msgstr "Evolutions VCard-importerer"
+
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:3
+msgid "VCard (.vcf, .gcrd)"
+msgstr "VCard (.vcf, .gcrd)"
+
 #: addressbook/backend/ebook/e-card-simple.c:60
+#: addressbook/backend/ebook/e-card.c:1306
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:15
 msgid "File As"
 msgstr "Gem som"
 
-#: addressbook/backend/ebook/e-card.c:1313
-#: addressbook/gui/contact-editor/fullname.glade.h:4
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:17
-msgid "Full Name"
-msgstr "Fulde navn"
-
-#: addressbook/backend/ebook/e-card.c:1320
 #: addressbook/backend/ebook/e-card-simple.c:61
-#: addressbook/gui/component/select-names/e-select-names.etspec.h:1
+#: addressbook/backend/ebook/e-card.c:1320
 #: addressbook/gui/component/select-names/e-select-names-section.etspec.h:1
+#: addressbook/gui/component/select-names/e-select-names.etspec.h:1
 #: addressbook/gui/contact-editor/e-contact-editor-fullname.c:89
 #: my-evolution/e-summary-table.c:59
 msgid "Name"
 msgstr "Navn"
 
-#: addressbook/backend/ebook/e-card.c:1326
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:96
-msgid "Address"
-msgstr "Adresse"
-
-#: addressbook/backend/ebook/e-card.c:1333
-msgid "Address Label"
-msgstr "Adresseetikette"
-
-#: addressbook/backend/ebook/e-card.c:1340
-msgid "Phone"
-msgstr "Telefon"
-
-#: addressbook/backend/ebook/e-card.c:1347
 #: addressbook/backend/ebook/e-card-simple.c:62
+#: addressbook/backend/ebook/e-card.c:1347
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
 msgid "Email"
 msgstr "E-post"
 
-#: addressbook/backend/ebook/e-card.c:1354
-msgid "Birth date"
-msgstr "Fødselsdato"
-
-#: addressbook/backend/ebook/e-card.c:1360
-#: calendar/gui/e-calendar-table.etspec.h:18
-msgid "URL"
-msgstr "URL"
-
-#: addressbook/backend/ebook/e-card.c:1367
-#: addressbook/backend/ebook/e-card-simple.c:69
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
-msgid "Organization"
-msgstr "Organisation"
-
-#: addressbook/backend/ebook/e-card.c:1374
-msgid "Organizational Unit"
-msgstr "Organisationsenhed"
-
-#: addressbook/backend/ebook/e-card.c:1381
-#: addressbook/backend/ebook/e-card-simple.c:90
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
-msgid "Office"
-msgstr "Kontor"
-
-#: addressbook/backend/ebook/e-card.c:1388
-#: addressbook/backend/ebook/e-card-simple.c:91
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:39
-msgid "Title"
-msgstr "Titel"
-
-#: addressbook/backend/ebook/e-card.c:1395
-#: calendar/gui/e-meeting-time-sel.etspec.h:9
-msgid "Role"
-msgstr "Rolle"
-
-#: addressbook/backend/ebook/e-card.c:1402
-#: addressbook/backend/ebook/e-card-simple.c:93
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
-msgid "Manager"
-msgstr "Leder"
-
-#: addressbook/backend/ebook/e-card.c:1409
-#: addressbook/backend/ebook/e-card-simple.c:64
-#: addressbook/backend/ebook/e-card-simple.c:94
-#: addressbook/gui/contact-editor/e-contact-editor.c:1737
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:2
-msgid "Assistant"
-msgstr "Assistent"
-
-#: addressbook/backend/ebook/e-card.c:1416
-#: addressbook/backend/ebook/e-card-simple.c:95
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-msgid "Nickname"
-msgstr "Kaldenavn"
-
-#: addressbook/backend/ebook/e-card.c:1423
-#: addressbook/backend/ebook/e-card-simple.c:96
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:36
-msgid "Spouse"
-msgstr "Ægtefælle"
-
-#: addressbook/backend/ebook/e-card.c:1430
-#: addressbook/backend/ebook/e-card-simple.c:101
-msgid "Anniversary"
-msgstr "Bryllupsdag"
-
-#: addressbook/backend/ebook/e-card.c:1436
-msgid "Mailer"
-msgstr "E-postprogram"
-
-#: addressbook/backend/ebook/e-card.c:1443
-#: addressbook/backend/ebook/e-card-simple.c:98
-msgid "Calendar URI"
-msgstr "Kalender URI"
-
-#: addressbook/backend/ebook/e-card.c:1450
-msgid "Free/Busy URL"
-msgstr "Ledig/Optaget-URL"
-
-#: addressbook/backend/ebook/e-card.c:1457
-msgid "ICS Calendar"
-msgstr "ICS-kalender"
-
-#: addressbook/backend/ebook/e-card.c:1464
-#: addressbook/backend/ebook/e-card-simple.c:97
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
-msgid "Note"
-msgstr "Kommentar"
-
-#: addressbook/backend/ebook/e-card.c:1471
-msgid "Related Contacts"
-msgstr "Beslægtede kontakter"
-
-#: addressbook/backend/ebook/e-card.c:1478
-#: addressbook/backend/ebook/e-card-simple.c:105
-#: calendar/gui/e-calendar-table.etspec.h:4
-msgid "Categories"
-msgstr "Kategorier"
-
-#: addressbook/backend/ebook/e-card.c:1485
-msgid "Category List"
-msgstr "Kategoriliste"
-
-#: addressbook/backend/ebook/e-card.c:1492
-msgid "Wants HTML"
-msgstr "Ønsker HTML"
-
-#: addressbook/backend/ebook/e-card.c:1499
-msgid "Wants HTML set"
-msgstr "Vil have HTML valgt"
-
-#: addressbook/backend/ebook/e-card.c:1506 ui/evolution-calendar.xml.h:16
-msgid "List"
-msgstr "Liste"
-
-#: addressbook/backend/ebook/e-card.c:1513
-msgid "List Show Addresses"
-msgstr "Vis visningsadresser"
-
-#: addressbook/backend/ebook/e-card.c:1520
-msgid "Arbitrary"
-msgstr "Tilfældig"
-
-#: addressbook/backend/ebook/e-card.c:1527
-msgid "ID"
-msgstr "ID"
-
-#: addressbook/backend/ebook/e-card.c:1534
-msgid "Last Use"
-msgstr "Seneste anvendelse"
-
-#: addressbook/backend/ebook/e-card.c:1545
-msgid "Use Score"
-msgstr "Anvend point"
-
 #: addressbook/backend/ebook/e-card-simple.c:63
 #: addressbook/gui/contact-editor/e-contact-editor.c:1752
 msgid "Primary"
@@ -205,6 +70,14 @@ msgstr "Primær"
 msgid "Prim"
 msgstr "Pri"
 
+#: addressbook/backend/ebook/e-card-simple.c:64
+#: addressbook/backend/ebook/e-card-simple.c:94
+#: addressbook/backend/ebook/e-card.c:1409
+#: addressbook/gui/contact-editor/e-contact-editor.c:1737
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:2
+msgid "Assistant"
+msgstr "Assistent"
+
 #: addressbook/backend/ebook/e-card-simple.c:65
 #: addressbook/backend/ebook/e-card-simple.c:70
 #: addressbook/gui/contact-editor/e-contact-editor.c:1738
@@ -239,6 +112,12 @@ msgid "Home"
 msgstr "Hjemme"
 
 #: addressbook/backend/ebook/e-card-simple.c:69
+#: addressbook/backend/ebook/e-card.c:1367
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
+msgid "Organization"
+msgstr "Organisation"
+
+#: addressbook/backend/ebook/e-card-simple.c:69
 msgid "Org"
 msgstr "Org"
 
@@ -357,9 +236,21 @@ msgid "Dep"
 msgstr "Afd"
 
 #: addressbook/backend/ebook/e-card-simple.c:90
+#: addressbook/backend/ebook/e-card.c:1381
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
+msgid "Office"
+msgstr "Kontor"
+
+#: addressbook/backend/ebook/e-card-simple.c:90
 msgid "Off"
 msgstr "Ktr"
 
+#: addressbook/backend/ebook/e-card-simple.c:91
+#: addressbook/backend/ebook/e-card.c:1388
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:39
+msgid "Title"
+msgstr "Titel"
+
 #: addressbook/backend/ebook/e-card-simple.c:92
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:34
 msgid "Profession"
@@ -370,6 +261,12 @@ msgid "Prof"
 msgstr "Prof."
 
 #: addressbook/backend/ebook/e-card-simple.c:93
+#: addressbook/backend/ebook/e-card.c:1402
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
+msgid "Manager"
+msgstr "Leder"
+
+#: addressbook/backend/ebook/e-card-simple.c:93
 msgid "Man"
 msgstr "Leder"
 
@@ -378,9 +275,32 @@ msgid "Ass"
 msgstr "Ass."
 
 #: addressbook/backend/ebook/e-card-simple.c:95
+#: addressbook/backend/ebook/e-card.c:1416
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
+msgid "Nickname"
+msgstr "Kaldenavn"
+
+#: addressbook/backend/ebook/e-card-simple.c:95
 msgid "Nick"
 msgstr "Kaldt"
 
+#: addressbook/backend/ebook/e-card-simple.c:96
+#: addressbook/backend/ebook/e-card.c:1423
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:36
+msgid "Spouse"
+msgstr "Ægtefælle"
+
+#: addressbook/backend/ebook/e-card-simple.c:97
+#: addressbook/backend/ebook/e-card.c:1464
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
+msgid "Note"
+msgstr "Kommentar"
+
+#: addressbook/backend/ebook/e-card-simple.c:98
+#: addressbook/backend/ebook/e-card.c:1443
+msgid "Calendar URI"
+msgstr "Kalender URI"
+
 #: addressbook/backend/ebook/e-card-simple.c:98
 msgid "CALUri"
 msgstr "CALUri"
@@ -403,6 +323,11 @@ msgid "icsCalendar"
 msgstr "icsKalender"
 
 #: addressbook/backend/ebook/e-card-simple.c:101
+#: addressbook/backend/ebook/e-card.c:1430
+msgid "Anniversary"
+msgstr "Bryllupsdag"
+
+#: addressbook/backend/ebook/e-card-simple.c:101
 msgid "Anniv"
 msgstr "Br.dag"
 
@@ -410,6 +335,12 @@ msgstr "Br.dag"
 msgid "Birth Date"
 msgstr "Fødselsdato"
 
+#: addressbook/backend/ebook/e-card-simple.c:105
+#: addressbook/backend/ebook/e-card.c:1478
+#: calendar/gui/e-calendar-table.etspec.h:4
+msgid "Categories"
+msgstr "Kategorier"
+
 #: addressbook/backend/ebook/e-card-simple.c:106
 msgid "Family Name"
 msgstr "Efternavn"
@@ -424,29 +355,105 @@ msgid "%x"
 msgstr "%x"
 
 #: addressbook/backend/ebook/e-card-simple.c:912
-#: addressbook/backend/ebook/e-destination.c:709
+#: addressbook/backend/ebook/e-destination.c:706
 msgid "Unnamed List"
 msgstr "Navnløs liste"
 
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in.h:1
-msgid "Evolution LDIF importer"
-msgstr "Evolution LDIF-importerer"
+#: addressbook/backend/ebook/e-card.c:1313
+#: addressbook/gui/contact-editor/fullname.glade.h:4
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:17
+msgid "Full Name"
+msgstr "Fulde navn"
 
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in.h:2
-msgid "LDAP Data Interchange Format (.ldif)"
-msgstr "LDAP-dataudvækslingsformat (.ldif)"
+#: addressbook/backend/ebook/e-card.c:1326
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:96
+msgid "Address"
+msgstr "Adresse"
 
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:1
-msgid "Evolution VCard Importer"
-msgstr "Evolution VCard-importerer"
+#: addressbook/backend/ebook/e-card.c:1333
+msgid "Address Label"
+msgstr "Adresseetikette"
 
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:2
-msgid "Evolution VCard importer"
-msgstr "Evolutions VCard-importerer"
+#: addressbook/backend/ebook/e-card.c:1340
+msgid "Phone"
+msgstr "Telefon"
 
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:3
-msgid "VCard (.vcf, .gcrd)"
-msgstr "VCard (.vcf, .gcrd)"
+#: addressbook/backend/ebook/e-card.c:1354
+msgid "Birth date"
+msgstr "Fødselsdato"
+
+#: addressbook/backend/ebook/e-card.c:1360
+#: calendar/gui/e-calendar-table.etspec.h:19
+msgid "URL"
+msgstr "URL"
+
+#: addressbook/backend/ebook/e-card.c:1374
+msgid "Organizational Unit"
+msgstr "Organisationsenhed"
+
+#: addressbook/backend/ebook/e-card.c:1395
+#: calendar/gui/dialogs/meeting-page.etspec.h:9
+#: calendar/gui/e-meeting-time-sel.etspec.h:9
+msgid "Role"
+msgstr "Rolle"
+
+#: addressbook/backend/ebook/e-card.c:1436 mail/mail-format.c:963
+msgid "Mailer"
+msgstr "E-postprogram"
+
+#: addressbook/backend/ebook/e-card.c:1450
+msgid "Free/Busy URL"
+msgstr "Ledig/Optaget-URL"
+
+#: addressbook/backend/ebook/e-card.c:1457
+msgid "ICS Calendar"
+msgstr "ICS-kalender"
+
+#: addressbook/backend/ebook/e-card.c:1471
+msgid "Related Contacts"
+msgstr "Beslægtede kontakter"
+
+#: addressbook/backend/ebook/e-card.c:1485
+msgid "Category List"
+msgstr "Kategoriliste"
+
+#: addressbook/backend/ebook/e-card.c:1492
+msgid "Wants HTML"
+msgstr "Ønsker HTML"
+
+#: addressbook/backend/ebook/e-card.c:1499
+msgid "Wants HTML set"
+msgstr "Vil have HTML valgt"
+
+#: addressbook/backend/ebook/e-card.c:1506
+msgid "List"
+msgstr "Liste"
+
+#: addressbook/backend/ebook/e-card.c:1513
+msgid "List Show Addresses"
+msgstr "Vis visningsadresser"
+
+#: addressbook/backend/ebook/e-card.c:1520
+msgid "Arbitrary"
+msgstr "Tilfældig"
+
+#: addressbook/backend/ebook/e-card.c:1527
+msgid "ID"
+msgstr "ID"
+
+#: addressbook/backend/ebook/e-card.c:1534
+msgid "Last Use"
+msgstr "Seneste anvendelse"
+
+#: addressbook/backend/ebook/e-card.c:1545
+msgid "Use Score"
+msgstr "Anvend point"
+
+#: addressbook/backend/ebook/test-client-list.c:15
+#: addressbook/backend/ebook/test-client.c:33
+#: calendar/gui/alarm-notify/notify-main.c:171
+msgid "Could not initialize Bonobo"
+msgstr "Kunne ikke initialisere Bonobo"
 
 #: addressbook/backend/pas/pas-backend-file.c:464
 #: addressbook/backend/pas/pas-backend-ldap.c:3050
@@ -503,14 +510,14 @@ msgid "EBook not loaded\n"
 msgstr "EBook ikke indlæst\n"
 
 #: addressbook/conduit/address-conduit.c:1376
-#: calendar/conduits/calendar/calendar-conduit.c:1351
-#: calendar/conduits/todo/todo-conduit.c:893
+#: calendar/conduits/calendar/calendar-conduit.c:1342
+#: calendar/conduits/todo/todo-conduit.c:884
 msgid "Could not start wombat server"
 msgstr "Kunne ikke starte wombat-server"
 
 #: addressbook/conduit/address-conduit.c:1377
-#: calendar/conduits/calendar/calendar-conduit.c:1352
-#: calendar/conduits/todo/todo-conduit.c:894
+#: calendar/conduits/calendar/calendar-conduit.c:1343
+#: calendar/conduits/todo/todo-conduit.c:885
 msgid "Could not start wombat"
 msgstr "Kunne ikke starte wombat"
 
@@ -519,6 +526,137 @@ msgstr "Kunne ikke starte wombat"
 msgid "Could not read pilot's Address application block"
 msgstr "Kunne ikke læse pilotens adresseapplikationsblok"
 
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
+msgid "Configure access to LDAP directory servers here"
+msgstr "Konfigurer adgang til LDAP-katalogservere her"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
+msgid "Directory Servers"
+msgstr "Katalogservere"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
+msgid "Evolution Addressbook"
+msgstr "Evolution adressebog"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
+msgid "Evolution Addressbook LDAP Configuration Control"
+msgstr "Evolution adressebog - LDAP-opsætningsstyring"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
+msgid "Evolution Addressbook address pop-up"
+msgstr "Evolution adressebog - adresse-pop-op"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
+msgid "Evolution Addressbook address viewer"
+msgstr "Evolution adressebog - adressevisning"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
+msgid "Evolution Addressbook card viewer"
+msgstr "Evolution adressebog - kortvisning"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
+msgid "Evolution Addressbook component"
+msgstr "Evolutions adressebogskomponent"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
+msgid "Evolution Addressbook folder viewer"
+msgstr "Evolution adressebog - mappevisning"
+
+#: addressbook/gui/component/addressbook-component.c:76
+#: addressbook/gui/component/addressbook-component.c:620
+#: importers/netscape-importer.c:1874 mail/importers/netscape-importer.c:1844
+#: shell/e-local-storage.c:178 shell/e-shortcuts.c:1087
+msgid "Contacts"
+msgstr "Kontakter"
+
+#: addressbook/gui/component/addressbook-component.c:76
+msgid "Folder containing contact information"
+msgstr "Mappe som indeholder kontaktinformation"
+
+#: addressbook/gui/component/addressbook-component.c:78
+msgid "LDAP Server"
+msgstr "LDAP-server"
+
+#: addressbook/gui/component/addressbook-component.c:78
+msgid "LDAP server containing contact information"
+msgstr "LDAP-server som indeholder kontaktinformation"
+
+#: addressbook/gui/component/addressbook-component.c:80
+msgid "Public Contacts"
+msgstr "Offentlige kontakter"
+
+#: addressbook/gui/component/addressbook-component.c:80
+msgid "Public folder containing contact information"
+msgstr "Offentlig folder som indeholder kontaktinformation"
+
+#: addressbook/gui/component/addressbook-component.c:574
+msgid "New Contact"
+msgstr "Ny kontakt"
+
+#: addressbook/gui/component/addressbook-component.c:574
+msgid "_Contact"
+msgstr "_Kontakt"
+
+#: addressbook/gui/component/addressbook-component.c:575
+msgid "Create a new contact"
+msgstr "Opret en ny kontakt"
+
+#: addressbook/gui/component/addressbook-component.c:578
+msgid "New Contact List"
+msgstr "Ny kontaktliste"
+
+#: addressbook/gui/component/addressbook-component.c:578
+msgid "Contact _List"
+msgstr "Kontakt_liste"
+
+#: addressbook/gui/component/addressbook-component.c:579
+msgid "Create a new contact list"
+msgstr "Opret en ny kontaktliste"
+
+#: addressbook/gui/component/addressbook-config.c:206
+msgid "Failed to connect to LDAP server"
+msgstr "Tilslutning til LDAP-serveren mislykkedes"
+
+#: addressbook/gui/component/addressbook-config.c:231
+msgid "Failed to authenticate with LDAP server"
+msgstr "Mislykkedes med godkendelse på LDAP-server"
+
+#: addressbook/gui/component/addressbook-config.c:259
+msgid "Could not perform query on Root DSE"
+msgstr "Kunne ikke gennemføre forespørgsel på rod-DSE"
+
+#: addressbook/gui/component/addressbook-config.c:682
+msgid "The server responded with no supported search bases"
+msgstr "Serveren svarede at ingen søgebaser understøttes"
+
+#: addressbook/gui/component/addressbook-config.c:1193
+msgid "This server does not support LDAPv3 schema information"
+msgstr "Denne server understøtter ikke LDAPv3-schemainformation"
+
+#: addressbook/gui/component/addressbook-config.c:1215
+msgid "Error retrieving schema information"
+msgstr "Fejl ved hentning af schemainformation"
+
+#: addressbook/gui/component/addressbook-config.c:1223
+msgid "Server did not respond with valid schema information"
+msgstr "Serveren svarede ikke med gyldig schemainformation"
+
+#: addressbook/gui/component/addressbook-config.c:1637
+msgid "Account Name"
+msgstr "Kontonavn"
+
+#: addressbook/gui/component/addressbook-config.c:1639
+msgid "Server Name"
+msgstr "Servernavn"
+
+#: addressbook/gui/component/addressbook-config.c:1676
+msgid "LDAP was not enabled in this build of Evolution"
+msgstr "LDAP understøttes ikke i denne udgave af Evolution"
+
+#: addressbook/gui/component/addressbook-storage.c:178
+msgid "Other Contacts"
+msgstr "Andre kontakter"
+
 #: addressbook/gui/component/addressbook.c:502
 msgid ""
 "We were unable to open this addressbook.  Please check that the\n"
@@ -647,101 +785,6 @@ msgstr "Enhver kategori"
 msgid "The URI that the Folder Browser will display"
 msgstr "URIen som mappe-skimmeren vil vise"
 
-#: addressbook/gui/component/addressbook-component.c:76
-#: addressbook/gui/component/addressbook-component.c:628
-#: importers/netscape-importer.c:1874 mail/importers/netscape-importer.c:1844
-#: shell/e-local-storage.c:178 shell/e-shortcuts.c:1087
-msgid "Contacts"
-msgstr "Kontakter"
-
-#: addressbook/gui/component/addressbook-component.c:76
-msgid "Folder containing contact information"
-msgstr "Mappe som indeholder kontaktinformation"
-
-#: addressbook/gui/component/addressbook-component.c:78
-msgid "LDAP Server"
-msgstr "LDAP-server"
-
-#: addressbook/gui/component/addressbook-component.c:78
-msgid "LDAP server containing contact information"
-msgstr "LDAP-server som indeholder kontaktinformation"
-
-#: addressbook/gui/component/addressbook-component.c:80
-msgid "Public Contacts"
-msgstr "Offentlige kontakter"
-
-#: addressbook/gui/component/addressbook-component.c:80
-msgid "Public folder containing contact information"
-msgstr "Offentlig folder som indeholder kontaktinformation"
-
-#: addressbook/gui/component/addressbook-component.c:582
-msgid "New Contact"
-msgstr "Ny kontakt"
-
-#: addressbook/gui/component/addressbook-component.c:582
-msgid "_Contact"
-msgstr "_Kontakt"
-
-#: addressbook/gui/component/addressbook-component.c:583
-msgid "Create a new contact"
-msgstr "Opret en ny kontakt"
-
-#: addressbook/gui/component/addressbook-component.c:586
-msgid "New Contact List"
-msgstr "Ny kontaktliste"
-
-#: addressbook/gui/component/addressbook-component.c:586
-msgid "Contact _List"
-msgstr "Kontakt_liste"
-
-#: addressbook/gui/component/addressbook-component.c:587
-msgid "Create a new contact list"
-msgstr "Opret en ny kontaktliste"
-
-#: addressbook/gui/component/addressbook-config.c:206
-msgid "Failed to connect to LDAP server"
-msgstr "Tilslutning til LDAP-serveren mislykkedes"
-
-#: addressbook/gui/component/addressbook-config.c:231
-msgid "Failed to authenticate with LDAP server"
-msgstr "Mislykkedes med godkendelse på LDAP-server"
-
-#: addressbook/gui/component/addressbook-config.c:259
-msgid "Could not perform query on Root DSE"
-msgstr "Kunne ikke gennemføre forespørgsel på rod-DSE"
-
-#: addressbook/gui/component/addressbook-config.c:682
-msgid "The server responded with no supported search bases"
-msgstr "Serveren svarede at ingen søgebaser understøttes"
-
-#: addressbook/gui/component/addressbook-config.c:1193
-msgid "This server does not support LDAPv3 schema information"
-msgstr "Denne server understøtter ikke LDAPv3-schemainformation"
-
-#: addressbook/gui/component/addressbook-config.c:1215
-msgid "Error retrieving schema information"
-msgstr "Fejl ved hentning af schemainformation"
-
-#: addressbook/gui/component/addressbook-config.c:1223
-msgid "Server did not respond with valid schema information"
-msgstr "Serveren svarede ikke med gyldig schemainformation"
-
-#: addressbook/gui/component/addressbook-config.c:1637
-msgid "Account Name"
-msgstr "Kontonavn"
-
-#: addressbook/gui/component/addressbook-config.c:1639
-msgid "Server Name"
-msgstr "Servernavn"
-
-#: addressbook/gui/component/addressbook-config.c:1676
-msgid "LDAP was not enabled in this build of Evolution"
-msgstr "LDAP understøttes ikke i denne udgave af Evolution"
-
-#: addressbook/gui/component/addressbook-storage.c:178
-msgid "Other Contacts"
-msgstr "Andre kontakter"
-
 #.
 #. * This is the code for the UI thingie that lets you manipulate the e-mail
 #. * addresses (and *only* the e-mail addresses) associated with an existing
@@ -770,69 +813,33 @@ msgstr "Opret en ny kontakt \"%s\""
 msgid "Add address to existing contact \"%s\""
 msgstr "Tilføj adresse for eksisterende kontakt \"%s\""
 
-#: addressbook/gui/component/e-address-popup.c:917
+#: addressbook/gui/component/e-address-popup.c:914
 msgid "Querying Addressbook..."
 msgstr "Kører forespørgsel i adressebog..."
 
-#: addressbook/gui/component/e-address-popup.c:1001
-#: addressbook/gui/component/e-address-widget.c:401
+#: addressbook/gui/component/e-address-popup.c:998
+#: addressbook/gui/component/e-address-widget.c:392
 msgid "Edit Contact Info"
 msgstr "Redigér kontaktinfo"
 
-#: addressbook/gui/component/e-address-popup.c:1031
-#: addressbook/gui/component/e-address-widget.c:437
+#: addressbook/gui/component/e-address-popup.c:1028
+#: addressbook/gui/component/e-address-widget.c:428
 #: addressbook/gui/component/select-names/e-select-names-popup.c:324
 msgid "Add to Contacts"
 msgstr "Tilføj i kontakter"
 
-#: addressbook/gui/component/e-address-popup.c:1056
+#: addressbook/gui/component/e-address-popup.c:1053
 msgid "Merge E-Mail Address"
 msgstr "Flet e-postadresse"
 
-#: addressbook/gui/component/e-address-widget.c:378
+#: addressbook/gui/component/e-address-widget.c:369
 msgid "Disable Queries"
 msgstr "Deaktivér forespørgsler"
 
-#: addressbook/gui/component/e-address-widget.c:378
+#: addressbook/gui/component/e-address-widget.c:369
 msgid "Enable Queries (Dangerous!)"
 msgstr "Aktivér forespørgsler (farligt!)"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
-msgid "Configure access to LDAP directory servers here"
-msgstr "Konfigurer adgang til LDAP-katalogservere her"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
-msgid "Directory Servers"
-msgstr "Katalogservere"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
-msgid "Evolution Addressbook"
-msgstr "Evolution adressebog"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
-msgid "Evolution Addressbook LDAP Configuration Control"
-msgstr "Evolution adressebog - LDAP-opsætningsstyring"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-msgid "Evolution Addressbook address pop-up"
-msgstr "Evolution adressebog - adresse-pop-op"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
-msgid "Evolution Addressbook address viewer"
-msgstr "Evolution adressebog - adressevisning"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
-msgid "Evolution Addressbook card viewer"
-msgstr "Evolution adressebog - kortvisning"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
-msgid "Evolution Addressbook component"
-msgstr "Evolutions adressebogskomponent"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
-msgid "Evolution Addressbook folder viewer"
-msgstr "Evolution adressebog - mappevisning"
-
 #: addressbook/gui/component/ldap-config.glade.h:1
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:1
 #: mail/mail-config.glade.h:1
@@ -980,9 +987,10 @@ msgstr "Én"
 msgid "S_earch scope: "
 msgstr "S_øgningsomfang: "
 
+#. No time range is set, so don't start a query
 #: addressbook/gui/component/ldap-config.glade.h:34
-#: calendar/gui/e-cal-view.c:541 calendar/gui/e-day-view.c:3261
-#: calendar/gui/e-week-view.c:1181 calendar/gui/gnome-cal.c:625
+#: calendar/gui/calendar-model.c:1983 calendar/gui/e-day-view.c:1712
+#: calendar/gui/e-week-view.c:1256
 msgid "Searching"
 msgstr "Søger..."
 
@@ -1220,11 +1228,11 @@ msgstr "_Nedhæntningsgrænse:"
 
 #: addressbook/gui/component/ldap-config.glade.h:85 filter/filter.glade.h:14
 #: mail/mail-config.glade.h:143 ui/evolution-addressbook.xml.h:33
-#: ui/evolution-calendar.xml.h:35 ui/evolution-composer-entries.xml.h:8
-#: ui/evolution-mail-list.xml.h:24 ui/evolution-mail-messagedisplay.xml.h:6
+#: ui/evolution-calendar.xml.h:31 ui/evolution-composer-entries.xml.h:8
+#: ui/evolution-mail-list.xml.h:25 ui/evolution-mail-messagedisplay.xml.h:6
 #: ui/evolution-message-composer.xml.h:41
-#: ui/evolution-signature-editor.xml.h:12 ui/evolution-subscribe.xml.h:10
-#: ui/evolution-tasks.xml.h:19
+#: ui/evolution-signature-editor.xml.h:11 ui/evolution-subscribe.xml.h:10
+#: ui/evolution-tasks.xml.h:17
 msgid "_Edit"
 msgstr "R_edigér"
 
@@ -1264,24 +1272,20 @@ msgstr "generel-faneblad"
 msgid "searching-tab"
 msgstr "søgefaneblad"
 
-#: addressbook/gui/component/select-names/e-select-names.c:509
-msgid "Select Contacts from Addressbook"
-msgstr "Vælg kontakter fra adressebogen"
+#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:1
+msgid "Evolution Addressbook name selection interface"
+msgstr "Evolution adressebog - navnevalgsgrænseflade"
 
-#: addressbook/gui/component/select-names/e-select-names.c:650
-msgid "Find contact in"
-msgstr "Søg kontakt i"
+#: addressbook/gui/component/select-names/e-select-names-popup.c:204
+msgid "Remove All"
+msgstr "Fjern alle"
 
-#: addressbook/gui/component/select-names/e-select-names.c:694
 #: addressbook/gui/component/select-names/e-select-names-popup.c:211
-#: composer/e-msg-composer-attachment-bar.c:444
+#: addressbook/gui/component/select-names/e-select-names.c:694
+#: composer/e-msg-composer-attachment-bar.c:507
 msgid "Remove"
 msgstr "Fjern"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:204
-msgid "Remove All"
-msgstr "Fjern alle"
-
 #: addressbook/gui/component/select-names/e-select-names-popup.c:218
 msgid "View Contact List"
 msgstr "Vis kontaktliste"
@@ -1304,9 +1308,13 @@ msgstr "Kontakt uden navn:"
 msgid "Source"
 msgstr "Kilde"
 
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:1
-msgid "Evolution Addressbook name selection interface"
-msgstr "Evolution adressebog - navnevalgsgrænseflade"
+#: addressbook/gui/component/select-names/e-select-names.c:509
+msgid "Select Contacts from Addressbook"
+msgstr "Vælg kontakter fra adressebogen"
+
+#: addressbook/gui/component/select-names/e-select-names.c:650
+msgid "Find contact in"
+msgstr "Søg kontakt i"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:2
 msgid "Find"
@@ -1382,7 +1390,7 @@ msgid "D_epartment:"
 msgstr "Af_deling:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:11
-#: calendar/gui/dialogs/task-editor.c:200
+#: calendar/gui/dialogs/task-editor.c:197
 msgid "Details"
 msgstr "Detaljer"
 
@@ -1453,13 +1461,11 @@ msgid "_Categories..."
 msgstr "Ka_tegorier..."
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:28
-#: calendar/gui/dialogs/meeting-page.c:634
-#: calendar/gui/e-calendar-table.c:1008 calendar/gui/e-calendar-table.c:1026
-#: calendar/gui/e-cal-view.c:1144 calendar/gui/e-cal-view.c:1176
-#: ui/evolution-addressbook.xml.h:32 ui/evolution-calendar.xml.h:34
-#: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:14
-#: ui/evolution-mail-message.xml.h:104 ui/evolution-tasks.xml.h:18
-#: ui/evolution.xml.h:45
+#: calendar/gui/dialogs/meeting-page.c:717 calendar/gui/e-calendar-table.c:977
+#: calendar/gui/e-day-view.c:3755 calendar/gui/e-week-view.c:3631
+#: mail/folder-browser.c:1790 ui/evolution-addressbook.xml.h:32
+#: ui/evolution-calendar.xml.h:30 ui/evolution-mail-message.xml.h:97
+#: ui/evolution-tasks.xml.h:16 ui/evolution.xml.h:45
 msgid "_Delete"
 msgstr "_Slet"
 
@@ -1504,15 +1510,15 @@ msgid "_Web page address:"
 msgstr "_Hjemmeside-adresse:"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:102
-#: addressbook/gui/contact-editor/e-contact-editor.c:184
 #: addressbook/gui/contact-editor/e-contact-editor-fullname.c:95
+#: addressbook/gui/contact-editor/e-contact-editor.c:184
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.c:163
 #: addressbook/gui/widgets/e-addressbook-model.c:318
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:408
-#: addressbook/gui/widgets/e-minicard.c:183
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:393
 #: addressbook/gui/widgets/e-minicard-label.c:164
-#: addressbook/gui/widgets/e-minicard-view.c:478
 #: addressbook/gui/widgets/e-minicard-view-widget.c:120
+#: addressbook/gui/widgets/e-minicard-view.c:478
+#: addressbook/gui/widgets/e-minicard.c:183
 msgid "Editable"
 msgstr "Redigerbar"
 
@@ -2543,17 +2549,17 @@ msgstr "Zimbabwe"
 #: addressbook/gui/contact-editor/e-contact-editor.c:156
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.c:142
 #: addressbook/gui/widgets/e-addressbook-model.c:304
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:394
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:379
 #: addressbook/gui/widgets/e-addressbook-view.c:180
-#: addressbook/gui/widgets/e-minicard-view.c:464
 #: addressbook/gui/widgets/e-minicard-view-widget.c:106
+#: addressbook/gui/widgets/e-minicard-view.c:464
 msgid "Book"
 msgstr "Bog"
 
 #: addressbook/gui/contact-editor/e-contact-editor.c:163
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.c:149
-#: addressbook/gui/widgets/e-minicard.c:190
 #: addressbook/gui/widgets/e-minicard-widget.c:93
+#: addressbook/gui/widgets/e-minicard.c:190
 msgid "Card"
 msgstr "Kort"
 
@@ -2781,7 +2787,7 @@ msgstr "Er ny liste"
 msgid "Contact List Editor"
 msgstr "Kontaktlisteredigering"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:457
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:456
 msgid "Save List as VCard"
 msgstr "Gem liste som VCard"
 
@@ -2827,7 +2833,7 @@ msgstr ""
 "eksisterer allerede i denne mappe. Vil du tilføje den alligevel?"
 
 #. FIXME: get the toplevel window...
-#: addressbook/gui/search/e-addressbook-search-dialog.c:116
+#: addressbook/gui/search/e-addressbook-search-dialog.c:117
 #: widgets/misc/e-filter-bar.c:148
 msgid "Advanced Search"
 msgstr "Avanceret søgning"
@@ -2846,10 +2852,10 @@ msgid "%d cards"
 msgstr "%d kort"
 
 #: addressbook/gui/widgets/e-addressbook-model.c:311
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:401
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:386
 #: addressbook/gui/widgets/e-addressbook-view.c:187
-#: addressbook/gui/widgets/e-minicard-view.c:471
 #: addressbook/gui/widgets/e-minicard-view-widget.c:113
+#: addressbook/gui/widgets/e-minicard-view.c:471
 msgid "Query"
 msgstr "Forespørgsel"
 
@@ -2857,113 +2863,113 @@ msgstr "Forespørgsel"
 msgid "Error getting book view"
 msgstr "Fejl ved bogvisning"
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:415
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:400
 msgid "Model"
 msgstr "Model"
 
-#: addressbook/gui/widgets/e-addressbook-table-adapter.c:148
-#: addressbook/gui/widgets/e-addressbook-util.c:106
+#: addressbook/gui/widgets/e-addressbook-table-adapter.c:145
+#: addressbook/gui/widgets/e-addressbook-util.c:105
 #: addressbook/gui/widgets/e-minicard.c:531
 msgid "Error modifying card"
 msgstr "Fejl ved ændring af kort"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:37
-#: shell/evolution-shell-component.c:1183
+#: addressbook/gui/widgets/e-addressbook-util.c:36
+#: shell/evolution-shell-component.c:1180
 msgid "Success"
 msgstr "Succes"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:38
+#: addressbook/gui/widgets/e-addressbook-util.c:37
 #: camel/providers/imap/camel-imap-command.c:306
 #: camel/providers/imap/camel-imap-command.c:403
 #: camel/providers/pop3/camel-pop3-store.c:526
 #: camel/providers/pop3/camel-pop3-store.c:533 shell/e-shell.c:2077
-#: shell/e-storage.c:598 shell/evolution-shell-component.c:1222
+#: shell/e-storage.c:598 shell/evolution-shell-component.c:1219
 msgid "Unknown error"
 msgstr "Ukendt fejl"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:39
+#: addressbook/gui/widgets/e-addressbook-util.c:38
 msgid "Repository offline"
 msgstr "\"Offline\" lager"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:40 shell/e-storage.c:584
-#: shell/evolution-shell-component.c:1213
+#: addressbook/gui/widgets/e-addressbook-util.c:39 shell/e-storage.c:584
+#: shell/evolution-shell-component.c:1210
 msgid "Permission denied"
 msgstr "Tilgang nægtet"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:41
+#: addressbook/gui/widgets/e-addressbook-util.c:40
 msgid "Card not found"
 msgstr "Kort ikke fundet"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:42
+#: addressbook/gui/widgets/e-addressbook-util.c:41
 msgid "Card ID already exists"
 msgstr "Kort-ID eksisterer allerede"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:43
+#: addressbook/gui/widgets/e-addressbook-util.c:42
 msgid "Protocol not supported"
 msgstr "Protokollen er ikke understøttet"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:44
+#: addressbook/gui/widgets/e-addressbook-util.c:43
+#: calendar/gui/calendar-model.c:759 calendar/gui/calendar-model.c:1184
 #: calendar/gui/dialogs/task-details-page.glade.h:3
-#: calendar/gui/e-calendar-table.c:479 calendar/gui/e-cal-model-tasks.c:325
-#: calendar/gui/e-cal-model-tasks.c:604 calendar/gui/e-tasks.c:253
-#: calendar/gui/print.c:2314 camel/camel-service.c:733
-#: camel/camel-service.c:771 camel/camel-service.c:855
-#: camel/camel-service.c:895 camel/providers/pop3/camel-pop3-store.c:443
+#: calendar/gui/e-calendar-table.c:477 calendar/gui/print.c:2307
+#: camel/camel-service.c:745 camel/camel-service.c:785
+#: camel/camel-service.c:875 camel/camel-service.c:917
+#: camel/providers/pop3/camel-pop3-store.c:443
 #: camel/providers/pop3/camel-pop3-store.c:520
 msgid "Cancelled"
 msgstr "Afbrudt"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:45
+#: addressbook/gui/widgets/e-addressbook-util.c:44
 msgid "Authentication Failed"
 msgstr "Godkendelse mislykkedes"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:46
+#: addressbook/gui/widgets/e-addressbook-util.c:45
 msgid "Authentication Required"
 msgstr "Godkendelse kræves"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:47
+#: addressbook/gui/widgets/e-addressbook-util.c:46
 msgid "TLS not Available"
 msgstr "TLS er ikke tilgængelig"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:48
+#: addressbook/gui/widgets/e-addressbook-util.c:47
 msgid "Addressbook does not exist"
 msgstr "Adressbogen findes ikke"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:49
+#: addressbook/gui/widgets/e-addressbook-util.c:48
 msgid "Other error"
 msgstr "Anden fejl"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:76
+#: addressbook/gui/widgets/e-addressbook-util.c:75
 msgid "Do you want to save changes?"
 msgstr "Vil du gemme ændringene?"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:78
+#: addressbook/gui/widgets/e-addressbook-util.c:77
 msgid "_Discard"
 msgstr "_Forkast"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:97
+#: addressbook/gui/widgets/e-addressbook-util.c:96
 msgid "Error adding list"
 msgstr "Fejl ved tilføjelse af liste"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:97
-#: addressbook/gui/widgets/e-addressbook-util.c:273
+#: addressbook/gui/widgets/e-addressbook-util.c:96
+#: addressbook/gui/widgets/e-addressbook-util.c:272
 msgid "Error adding card"
 msgstr "Fejl ved tilføjelse af kort"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:106
+#: addressbook/gui/widgets/e-addressbook-util.c:105
 msgid "Error modifying list"
 msgstr "Fejl ved ændring af liste"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:116
+#: addressbook/gui/widgets/e-addressbook-util.c:115
 msgid "Error removing list"
 msgstr "Fejl ved fjernelse af liste"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:116
-#: addressbook/gui/widgets/e-addressbook-util.c:231
+#: addressbook/gui/widgets/e-addressbook-util.c:115
+#: addressbook/gui/widgets/e-addressbook-util.c:230
 msgid "Error removing card"
 msgstr "Fejl ved fjernelse af kort"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:198
+#: addressbook/gui/widgets/e-addressbook-util.c:197
 #, c-format
 msgid ""
 "Opening %d cards will open %d new windows as well.\n"
@@ -2972,131 +2978,132 @@ msgstr ""
 "At åbna %d kort vil yderligere åbne %d nye vinduer.\n"
 "Ønsker du virkelig at vise alle disse kort?"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:329
+#: addressbook/gui/widgets/e-addressbook-util.c:328
 msgid "Move card to"
 msgstr "Flyt kort til"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:331
+#: addressbook/gui/widgets/e-addressbook-util.c:330
 msgid "Copy card to"
 msgstr "Kopiér kort til"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:334
+#: addressbook/gui/widgets/e-addressbook-util.c:333
 msgid "Move cards to"
 msgstr "Flyt kort til"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:336
+#: addressbook/gui/widgets/e-addressbook-util.c:335
 msgid "Copy cards to"
 msgstr "Kopiér kort til"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:518
+#: addressbook/gui/widgets/e-addressbook-util.c:517
 msgid "Multiple VCards"
 msgstr "Flere VCard"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:526
+#: addressbook/gui/widgets/e-addressbook-util.c:525
 #, c-format
 msgid "VCard for %s"
 msgstr "VCard for %s"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:194
-#: calendar/gui/e-calendar-table.etspec.h:17
+#: calendar/gui/dialogs/meeting-page.etspec.h:11
+#: calendar/gui/e-calendar-table.etspec.h:18
 #: calendar/gui/e-meeting-time-sel.etspec.h:11
 msgid "Type"
 msgstr "Type"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:398
+#: addressbook/gui/widgets/e-addressbook-view.c:394
 #: importers/evolution-gnomecard-importer.c:228 importers/pine-importer.c:642
 #: mail/importers/pine-importer.c:577
 msgid "Addressbook"
 msgstr "Adressebog"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:680
-#: addressbook/gui/widgets/e-addressbook-view.c:899
-#: addressbook/gui/widgets/e-addressbook-view.c:1883
+#: addressbook/gui/widgets/e-addressbook-view.c:676
+#: addressbook/gui/widgets/e-addressbook-view.c:895
+#: addressbook/gui/widgets/e-addressbook-view.c:1879
 #: ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard"
 msgstr "Gem som VCard"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:886
+#: addressbook/gui/widgets/e-addressbook-view.c:882
 msgid "New Contact..."
 msgstr "Ny kontakt..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:887
+#: addressbook/gui/widgets/e-addressbook-view.c:883
 msgid "New Contact List..."
 msgstr "Ny kontaktliste..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:890
+#: addressbook/gui/widgets/e-addressbook-view.c:886
 msgid "Go to Folder..."
 msgstr "Gå til mappe..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:891
+#: addressbook/gui/widgets/e-addressbook-view.c:887
 msgid "Import..."
 msgstr "Importér..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:893
+#: addressbook/gui/widgets/e-addressbook-view.c:889
 msgid "Search for Contacts..."
 msgstr "Søg efter kontakter..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:894
+#: addressbook/gui/widgets/e-addressbook-view.c:890
 msgid "Addressbook Sources..."
 msgstr "Adressbogskilder..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:896
+#: addressbook/gui/widgets/e-addressbook-view.c:892
 msgid "Pilot Settings..."
 msgstr "Pilotindstillinger..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:900
+#: addressbook/gui/widgets/e-addressbook-view.c:896
 #: ui/evolution-addressbook.xml.h:10
 msgid "Forward Contact"
 msgstr "Videresend kontakt"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:901
+#: addressbook/gui/widgets/e-addressbook-view.c:897
 msgid "Send Message to Contact"
 msgstr "Send besked til kontakt"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:902 calendar/gui/print.c:2446
+#: addressbook/gui/widgets/e-addressbook-view.c:898 calendar/gui/print.c:2439
 #: ui/evolution-addressbook.xml.h:16 ui/evolution-comp-editor.xml.h:8
-#: ui/evolution-contact-editor.xml.h:5 ui/evolution-mail-message.xml.h:72
+#: ui/evolution-contact-editor.xml.h:4 ui/evolution-mail-message.xml.h:67
 #: ui/my-evolution.xml.h:1
 msgid "Print"
 msgstr "Udskriv"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:904
+#: addressbook/gui/widgets/e-addressbook-view.c:900
 msgid "Print Envelope"
 msgstr "Udskriv konvolut"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:908
+#: addressbook/gui/widgets/e-addressbook-view.c:904
 msgid "Copy to folder..."
 msgstr "Kopiér til mappe..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:909
+#: addressbook/gui/widgets/e-addressbook-view.c:905
 msgid "Move to folder..."
 msgstr "Flyt til mappe..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:912
+#: addressbook/gui/widgets/e-addressbook-view.c:908
 #: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "Klip ud"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:913
-#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:9
+#: addressbook/gui/widgets/e-addressbook-view.c:909
+#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:8
 #: ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr "Kopier"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:914
-#: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:10
+#: addressbook/gui/widgets/e-addressbook-view.c:910
+#: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:9
 msgid "Paste"
 msgstr "Indsæt"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:915 filter/libfilter-i18n.h:10
+#: addressbook/gui/widgets/e-addressbook-view.c:911 filter/libfilter-i18n.h:11
 #: mail/mail-accounts.c:234 ui/evolution-addressbook.xml.h:8
-#: ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:3
-#: ui/evolution-contact-list-editor.xml.h:3 ui/evolution-mail-message.xml.h:24
+#: ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:2
+#: ui/evolution-contact-list-editor.xml.h:2 ui/evolution-mail-message.xml.h:20
 msgid "Delete"
 msgstr "Slet"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:919
-#: calendar/gui/e-cal-view.c:1109
+#: addressbook/gui/widgets/e-addressbook-view.c:915
+#: calendar/gui/e-day-view.c:3715 calendar/gui/e-week-view.c:3596
 msgid "Current View"
 msgstr "Aktuel visning"
 
@@ -3106,7 +3113,7 @@ msgstr "Aktuel visning"
 #. Translators: put here a list of labels you want to see on buttons in
 #. addressbook. You may use any character to separate labels but it must
 #. also be placed at the begining ot the string
-#: addressbook/gui/widgets/e-addressbook-view.c:953
+#: addressbook/gui/widgets/e-addressbook-view.c:949
 msgid ",123,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
 msgstr ",123,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z,æ,ø,å"
 
@@ -3114,11 +3121,11 @@ msgstr ",123,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z,æ,ø,å"
 #. in addressbook. You may use any character to separate labels but it
 #. must also be placed at the begining ot the string.
 #. Use lower case letters if possible.
-#: addressbook/gui/widgets/e-addressbook-view.c:958
+#: addressbook/gui/widgets/e-addressbook-view.c:954
 msgid ",0,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
 msgstr ",0,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z,æ,ø,å"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1356
+#: addressbook/gui/widgets/e-addressbook-view.c:1352
 #, c-format
 msgid ""
 "The addressbook backend for\n"
@@ -3189,29 +3196,6 @@ msgstr "Anden telefon"
 msgid "Primary Phone"
 msgstr "Primær telefon"
 
-#: addressbook/gui/widgets/e-minicard.c:146
-#: addressbook/gui/widgets/e-minicard-label.c:115
-msgid "Width"
-msgstr "Bredde"
-
-#: addressbook/gui/widgets/e-minicard.c:153
-#: addressbook/gui/widgets/e-minicard-label.c:122
-msgid "Height"
-msgstr "Højde"
-
-#: addressbook/gui/widgets/e-minicard.c:161
-#: addressbook/gui/widgets/e-minicard-label.c:129
-msgid "Has Focus"
-msgstr "Har fokus"
-
-#: addressbook/gui/widgets/e-minicard.c:169
-msgid "Selected"
-msgstr "Valgt"
-
-#: addressbook/gui/widgets/e-minicard.c:176
-msgid "Has Cursor"
-msgstr "Har markør"
-
 #: addressbook/gui/widgets/e-minicard-control.c:204
 #, c-format
 msgid "and %d other cards."
@@ -3225,6 +3209,21 @@ msgstr "og ét andet kort."
 msgid "Save in addressbook"
 msgstr "Gem i adressebog"
 
+#: addressbook/gui/widgets/e-minicard-label.c:115
+#: addressbook/gui/widgets/e-minicard.c:146
+msgid "Width"
+msgstr "Bredde"
+
+#: addressbook/gui/widgets/e-minicard-label.c:122
+#: addressbook/gui/widgets/e-minicard.c:153
+msgid "Height"
+msgstr "Højde"
+
+#: addressbook/gui/widgets/e-minicard-label.c:129
+#: addressbook/gui/widgets/e-minicard.c:161
+msgid "Has Focus"
+msgstr "Har fokus"
+
 #: addressbook/gui/widgets/e-minicard-label.c:136
 msgid "Field"
 msgstr "Felt"
@@ -3241,6 +3240,10 @@ msgstr "Tekstmodel"
 msgid "Max field name length"
 msgstr "Maksimal feltnavnslængde"
 
+#: addressbook/gui/widgets/e-minicard-view-widget.c:127
+msgid "Column Width"
+msgstr "Kolonnebredde"
+
 #: addressbook/gui/widgets/e-minicard-view.c:141
 msgid ""
 "\n"
@@ -3269,9 +3272,13 @@ msgstr ""
 msgid "Adapter"
 msgstr "Adapter"
 
-#: addressbook/gui/widgets/e-minicard-view-widget.c:127
-msgid "Column Width"
-msgstr "Kolonnebredde"
+#: addressbook/gui/widgets/e-minicard.c:169
+msgid "Selected"
+msgstr "Valgt"
+
+#: addressbook/gui/widgets/e-minicard.c:176
+msgid "Has Cursor"
+msgstr "Har markør"
 
 #: addressbook/gui/widgets/gal-view-factory-minicard.c:24
 msgid "Card View"
@@ -3281,20 +3288,20 @@ msgstr "Kortvisning"
 msgid "GTK Tree View"
 msgstr "GTK-trævisning"
 
-#: addressbook/printing/e-contact-print.c:1158
+#: addressbook/printing/e-contact-print-envelope.c:217
+#: addressbook/printing/e-contact-print-envelope.c:238
+msgid "Print envelope"
+msgstr "Udskriv konvolut"
+
+#: addressbook/printing/e-contact-print.c:1139
 msgid "Print cards"
 msgstr "Udskriv kort"
 
-#: addressbook/printing/e-contact-print.c:1224
-#: addressbook/printing/e-contact-print.c:1250
+#: addressbook/printing/e-contact-print.c:1204
+#: addressbook/printing/e-contact-print.c:1226
 msgid "Print card"
 msgstr "Udskriv kort"
 
-#: addressbook/printing/e-contact-print-envelope.c:217
-#: addressbook/printing/e-contact-print-envelope.c:238
-msgid "Print envelope"
-msgstr "Udskriv konvolut"
-
 #: addressbook/printing/e-contact-print.glade.h:1
 msgid "10 pt. Tahoma"
 msgstr "10 pt. Tahoma"
@@ -3464,63 +3471,6 @@ msgstr "Bredde:"
 msgid "_Font..."
 msgstr "Skri_fttype..."
 
-#: addressbook/tools/evolution-addressbook-export.c:56
-msgid "Specify the output file instead of standard output"
-msgstr ""
-
-#: addressbook/tools/evolution-addressbook-export.c:57
-msgid "OUTPUTFILE"
-msgstr ""
-
-#: addressbook/tools/evolution-addressbook-export.c:58
-#, fuzzy
-msgid "List local addressbook folders"
-msgstr "med alle lokale og aktive eksterne mapper"
-
-#: addressbook/tools/evolution-addressbook-export.c:60
-msgid "Show cards as vcard or csv file"
-msgstr ""
-
-#: addressbook/tools/evolution-addressbook-export.c:60
-#, fuzzy
-msgid "[vcard|csv]"
-msgstr "kort"
-
-#: addressbook/tools/evolution-addressbook-export.c:61
-msgid "Export in asynchronous mode "
-msgstr ""
-
-#: addressbook/tools/evolution-addressbook-export.c:63
-msgid ""
-"The number of cards in one output file in asychronous mode,default size 100."
-msgstr ""
-
-#: addressbook/tools/evolution-addressbook-export.c:63
-msgid "NUMBER"
-msgstr ""
-
-#: addressbook/tools/evolution-addressbook-export.c:91
-msgid ""
-"Command line arguments error, please use --help option to see the usage."
-msgstr ""
-
-#: addressbook/tools/evolution-addressbook-export.c:105
-msgid "Only support csv or vcard format."
-msgstr ""
-
-#: addressbook/tools/evolution-addressbook-export.c:114
-msgid "In async mode, output must be file."
-msgstr ""
-
-#: addressbook/tools/evolution-addressbook-export.c:122
-msgid "In normal mode, there should not need size option."
-msgstr ""
-
-#: addressbook/tools/evolution-addressbook-export.c:153
-#, fuzzy
-msgid "Impossible internal error."
-msgstr "Intern fejl"
-
 #: calendar/cal-util/cal-component.c:1218
 msgid "Untitled appointment"
 msgstr "Unavngivet aftale"
@@ -3650,30 +3600,28 @@ msgid "31st"
 msgstr "31."
 
 #: calendar/cal-util/cal-util.c:550 calendar/cal-util/cal-util.c:572
-#: calendar/gui/dialogs/task-details-page.glade.h:5
-#: calendar/gui/e-calendar-table.c:403 calendar/gui/e-tasks.c:271
-#: mail/message-list.c:912
+#: calendar/gui/dialogs/task-details-page.glade.h:6
+#: calendar/gui/e-calendar-table.c:401 mail/message-list.c:753
 msgid "High"
 msgstr "Høj"
 
 #: calendar/cal-util/cal-util.c:552 calendar/cal-util/cal-util.c:574
-#: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-calendar-table.c:404 calendar/gui/e-cal-model.c:826
-#: calendar/gui/e-tasks.c:273 mail/message-list.c:911
+#: calendar/gui/calendar-model.c:1709
+#: calendar/gui/dialogs/task-details-page.glade.h:9
+#: calendar/gui/e-calendar-table.c:402 mail/message-list.c:752
 msgid "Normal"
 msgstr "Normal"
 
 #: calendar/cal-util/cal-util.c:554 calendar/cal-util/cal-util.c:576
-#: calendar/gui/dialogs/task-details-page.glade.h:7
-#: calendar/gui/e-calendar-table.c:405 calendar/gui/e-tasks.c:275
-#: mail/message-list.c:910
+#: calendar/gui/dialogs/task-details-page.glade.h:8
+#: calendar/gui/e-calendar-table.c:403 mail/message-list.c:751
 msgid "Low"
 msgstr "Lav"
 
 #. An empty string is the same as 'None'.
 #: calendar/cal-util/cal-util.c:570
-#: calendar/gui/dialogs/task-details-page.glade.h:11
-#: calendar/gui/e-calendar-table.c:406
+#: calendar/gui/dialogs/task-details-page.glade.h:13
+#: calendar/gui/e-calendar-table.c:404
 msgid "Undefined"
 msgstr "Udefineret"
 
@@ -3681,13 +3629,13 @@ msgstr "Udefineret"
 msgid "Split Multi-Day Events:"
 msgstr "Dél flerdagshændelser:"
 
-#: calendar/conduits/calendar/calendar-conduit.c:1297
-#: calendar/conduits/todo/todo-conduit.c:838
+#: calendar/conduits/calendar/calendar-conduit.c:1289
+#: calendar/conduits/todo/todo-conduit.c:830
 msgid "Error while communicating with calendar server"
 msgstr "Fejl under kommunikation med kalenderserveren"
 
-#: calendar/conduits/calendar/calendar-conduit.c:1456
-#: calendar/conduits/calendar/calendar-conduit.c:1459
+#: calendar/conduits/calendar/calendar-conduit.c:1440
+#: calendar/conduits/calendar/calendar-conduit.c:1443
 msgid "Could not read pilot's Calendar application block"
 msgstr "Kunne ikke læse pilotens kalender-programblok"
 
@@ -3695,33 +3643,75 @@ msgstr "Kunne ikke læse pilotens kalender-programblok"
 msgid "Default Priority:"
 msgstr "Standardprioritet:"
 
-#: calendar/conduits/todo/todo-conduit.c:970
-#: calendar/conduits/todo/todo-conduit.c:973
+#: calendar/conduits/todo/todo-conduit.c:954
+#: calendar/conduits/todo/todo-conduit.c:957
 msgid "Could not read pilot's ToDo application block"
 msgstr "Kunne ikke læse pilotens programblok for opgaveliste"
 
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
+msgid "Calendar and Tasks"
+msgstr "Kalender og opgaver"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
+msgid "Configure your timezone, Calendar and Task List here "
+msgstr "Konfigurér din tidszone, kalender og opgaveliste her "
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
+msgid "Evolution Calendar and Tasks"
+msgstr "Evolution kalender og opgaver"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
+msgid "Evolution Calendar and Tasks component"
+msgstr "Evolution kalender-og-opgaver-komponent"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
+msgid "Evolution Calendar configuration control"
+msgstr "Evolution kalender-opsætnings-styringselement"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
+msgid "Evolution Calendar scheduling message viewer"
+msgstr "Evolution kalendertilrettelægnings-beskedvisning"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
+msgid "Evolution Calendar viewer"
+msgstr "Evolution kalendervisning"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
+msgid "Evolution Calendar/Task editor"
+msgstr "Evolution kalender/opgave-redigering"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
+msgid "Evolution Tasks viewer"
+msgstr "Evolution opgavevisning"
+
+#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
+msgid "Evolution Calendar alarm notification service"
+msgstr "Evolution kalenderalarmbekendgørelsestjeneste"
+
 # Konteksten er planlægning af opgaver. Dette er tidspunktet for begyndelsen
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:213
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:212
 msgid "Starting:"
 msgstr "Begynder:"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:215
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:214
 msgid "Ending:"
 msgstr "Slutter:"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:254
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:227
+msgid "invalid time"
+msgstr "Ugyldig tidsangivelse"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:272
 msgid "Evolution Alarm"
 msgstr "Evolutionalarm"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:347
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:365
 #, c-format
 msgid "Alarm on %s"
 msgstr "Alarmer %s"
 
 #: calendar/gui/alarm-notify/alarm-notify.glade.h:1
-#: ui/evolution-comp-editor.xml.h:1 ui/evolution-contact-editor.xml.h:1
-#: ui/evolution-contact-list-editor.xml.h:1
-#: ui/evolution-signature-editor.xml.h:1
+#: ui/evolution-comp-editor.xml.h:1
 msgid "C_lose"
 msgstr "_Luk"
 
@@ -3737,25 +3727,16 @@ msgstr "Udsæt-tid (minutter)"
 msgid "_Edit appointment"
 msgstr "R_edigér aftale"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:874
+#: calendar/gui/alarm-notify/alarm-queue.c:770
 msgid "No description available."
 msgstr "Ingen beskrivelse tilgængelig."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:892
-#, c-format
-msgid ""
-"Alarm on %s\n"
-"%s\n"
-"Starting at %s\n"
-"Ending at %s"
-msgstr ""
-
-#: calendar/gui/alarm-notify/alarm-queue.c:979
-#: calendar/gui/alarm-notify/alarm-queue.c:1003
+#: calendar/gui/alarm-notify/alarm-queue.c:843
+#: calendar/gui/alarm-notify/alarm-queue.c:867 widgets/misc/e-messagebox.c:161
 msgid "Warning"
 msgstr "Advarsel"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:983
+#: calendar/gui/alarm-notify/alarm-queue.c:847
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -3767,7 +3748,7 @@ msgstr ""
 "at sende e-post. Evolution vil vise en normal dialog\n"
 "for påmindelse i stedet."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1009
+#: calendar/gui/alarm-notify/alarm-queue.c:873
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -3784,86 +3765,71 @@ msgstr ""
 "\n"
 "Er du sikker på at du vil køre dette program?"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1023
+#: calendar/gui/alarm-notify/alarm-queue.c:887
 msgid "Do not ask me about this program again."
 msgstr "Spørg mig ikke om dette program igen."
 
-#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
-msgid "Evolution Calendar alarm notification service"
-msgstr "Evolution kalenderalarmbekendgørelsestjeneste"
-
-#: calendar/gui/alarm-notify/notify-main.c:173
-msgid "Could not initialize Bonobo"
-msgstr "Kunne ikke initialisere Bonobo"
-
-#: calendar/gui/alarm-notify/notify-main.c:176
+#: calendar/gui/alarm-notify/notify-main.c:174
 msgid "Could not initialize gnome-vfs"
 msgstr "Kunne ikke initiere gnome-vfs"
 
-#: calendar/gui/alarm-notify/notify-main.c:185
+#: calendar/gui/alarm-notify/notify-main.c:183
 msgid "Could not create the alarm notify service factory"
 msgstr "Kunne ikke oprette fabrik for alarm-tjenesten"
 
-#: calendar/gui/calendar-commands.c:376
-#, fuzzy
-msgid ""
-"This operation will permanently erase all events older than the selected "
-"amount of time. If you continue, you will not be able to recover these "
-"events."
-msgstr ""
-"Denne handling vil permanent fjerne alle opgaver markeret som udførte Hvis "
-"du fortsætter vil du ikke længere kunne tilvejebringe disse opgaver.\n"
-"\n"
-"Vil du virkelig fjerne disse opgaver?"
+#: calendar/gui/cal-search-bar.c:50
+msgid "Summary contains"
+msgstr "Sammendrag indeholder"
 
-#: calendar/gui/calendar-commands.c:382
-#, fuzzy
-msgid "Purge events older than"
-msgstr "returnerer mindre end"
+#: calendar/gui/cal-search-bar.c:51
+msgid "Description contains"
+msgstr "Beskrivelse indeholder"
 
-#: calendar/gui/calendar-commands.c:387
-#: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter.glade.h:17
-msgid "days"
-msgstr "dage"
+#: calendar/gui/cal-search-bar.c:52
+msgid "Comment contains"
+msgstr "Kommentar indeholder"
+
+#: calendar/gui/cal-search-bar.c:358 mail/mail-ops.c:1106
+msgid "Unmatched"
+msgstr "Ingen træffere"
 
-#: calendar/gui/calendar-commands.c:485
+#: calendar/gui/calendar-commands.c:419
 msgid "%A %d %B %Y"
 msgstr "%A den %d. %B %Y"
 
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
-#: calendar/gui/calendar-commands.c:488 calendar/gui/e-day-view.c:1364
-#: calendar/gui/e-day-view-top-item.c:266
-#: calendar/gui/e-week-view-main-item.c:325
+#: calendar/gui/calendar-commands.c:422 calendar/gui/e-day-view-top-item.c:265
+#: calendar/gui/e-day-view.c:1438 calendar/gui/e-week-view-main-item.c:325
 msgid "%a %d %b"
 msgstr "%a %d. %b"
 
-#: calendar/gui/calendar-commands.c:490 calendar/gui/calendar-commands.c:495
-#: calendar/gui/calendar-commands.c:497
+#: calendar/gui/calendar-commands.c:424 calendar/gui/calendar-commands.c:429
+#: calendar/gui/calendar-commands.c:431
 msgid "%a %d %b %Y"
 msgstr "%a, %d. %b %Y"
 
-#: calendar/gui/calendar-commands.c:514 calendar/gui/calendar-commands.c:520
-#: calendar/gui/calendar-commands.c:526 calendar/gui/calendar-commands.c:528
+#: calendar/gui/calendar-commands.c:442 calendar/gui/calendar-commands.c:449
+#: calendar/gui/calendar-commands.c:455 calendar/gui/calendar-commands.c:457
 msgid "%d %B %Y"
 msgstr "%d. %B %Y"
 
 #. strftime format %d = day of month, %B = full
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: calendar/gui/calendar-commands.c:518
-#: calendar/gui/e-week-view-main-item.c:333 calendar/gui/print.c:1508
+#: calendar/gui/calendar-commands.c:447
+#: calendar/gui/e-week-view-main-item.c:333 calendar/gui/print.c:1509
 msgid "%d %B"
 msgstr "%d %B"
 
-#: calendar/gui/calendar-commands.c:918
+#: calendar/gui/calendar-commands.c:849
 msgid ""
 "Could not create the calendar view.  Please check your ORBit and OAF setup."
 msgstr ""
 "Kunne ikke oprette kalendervisning. Kontrollér venligs din konfiguration af "
 "ORBit og OAF."
 
-#: calendar/gui/calendar-component.c:70 calendar/gui/gnome-cal.c:1569
+#: calendar/gui/calendar-component.c:70 calendar/gui/gnome-cal.c:1353
 #: importers/netscape-importer.c:1873 mail/importers/netscape-importer.c:1843
 #: my-evolution/my-evolution.glade.h:2 shell/e-local-storage.c:177
 #: shell/e-shortcuts.c:1085
@@ -3882,11 +3848,11 @@ msgstr "Offentlig kalender"
 msgid "Public folder containing appointments and events"
 msgstr "Offentlig mappe som indeholder mødelser og hændelser"
 
-#: calendar/gui/calendar-component.c:80 calendar/gui/e-tasks.c:1080
-#: calendar/gui/print.c:1787 calendar/gui/tasks-control.c:487
+#: calendar/gui/calendar-component.c:80 calendar/gui/e-tasks.c:738
+#: calendar/gui/print.c:1789 calendar/gui/tasks-control.c:504
 #: calendar/importers/icalendar-importer.c:644
 #: importers/netscape-importer.c:1875 mail/importers/netscape-importer.c:1845
-#: my-evolution/e-summary-tasks.c:348 my-evolution/e-summary-tasks.c:357
+#: my-evolution/e-summary-tasks.c:329 my-evolution/e-summary-tasks.c:338
 #: shell/e-local-storage.c:183 shell/e-shortcuts.c:1086
 msgid "Tasks"
 msgstr "Opgaver"
@@ -3951,6 +3917,107 @@ msgstr "Hel_dagsmøde"
 msgid "Create a new all-day appointment"
 msgstr "Opret et nyt heldagsmøde"
 
+#: calendar/gui/calendar-model.c:405 calendar/gui/calendar-model.c:964
+#: calendar/gui/e-calendar-table.c:380
+msgid "Private"
+msgstr "Privat"
+
+#: calendar/gui/calendar-model.c:408 calendar/gui/calendar-model.c:966
+#: calendar/gui/e-calendar-table.c:381
+msgid "Confidential"
+msgstr "Fortroligt"
+
+#: calendar/gui/calendar-model.c:411 calendar/gui/e-calendar-table.c:379
+msgid "Public"
+msgstr "Offentlig"
+
+#: calendar/gui/calendar-model.c:523
+msgid "N"
+msgstr "N"
+
+#: calendar/gui/calendar-model.c:523
+msgid "S"
+msgstr "S"
+
+#: calendar/gui/calendar-model.c:525
+msgid "E"
+msgstr "Ø"
+
+#: calendar/gui/calendar-model.c:525
+msgid "W"
+msgstr "V"
+
+#: calendar/gui/calendar-model.c:590 calendar/gui/calendar-model.c:1134
+#: calendar/gui/e-calendar-table.c:453
+msgid "Free"
+msgstr "Ledig"
+
+#: calendar/gui/calendar-model.c:592 calendar/gui/e-calendar-table.c:454
+#: calendar/gui/e-meeting-time-sel.c:406
+#: shell/evolution-shell-component.c:1204
+msgid "Busy"
+msgstr "Optaget"
+
+#: calendar/gui/calendar-model.c:750 calendar/gui/calendar-model.c:1178
+#: calendar/gui/dialogs/task-details-page.glade.h:10
+#: calendar/gui/e-calendar-table.c:474 calendar/gui/print.c:2298
+msgid "Not Started"
+msgstr "Ikke startet"
+
+#: calendar/gui/calendar-model.c:753 calendar/gui/calendar-model.c:1180
+#: calendar/gui/dialogs/task-details-page.glade.h:7
+#: calendar/gui/e-calendar-table.c:475 calendar/gui/print.c:2301
+msgid "In Progress"
+msgstr "I gang"
+
+#: calendar/gui/calendar-model.c:756 calendar/gui/calendar-model.c:1182
+#: calendar/gui/dialogs/task-details-page.glade.h:4
+#: calendar/gui/e-calendar-table.c:476 calendar/gui/e-meeting-model.c:294
+#: calendar/gui/e-meeting-model.c:317 calendar/gui/print.c:2304
+msgid "Completed"
+msgstr "Fuldført"
+
+#: calendar/gui/calendar-model.c:1036
+msgid ""
+"The geographical position must be entered in the format: \n"
+"\n"
+"45.436845,125.862501"
+msgstr ""
+"Den geografiske positionen skal skrives ind på formatet: \n"
+"\n"
+"45.436845,125.862501"
+
+#. An empty string is the same as 'None'.
+#: calendar/gui/calendar-model.c:1176 calendar/gui/dialogs/meeting-page.c:330
+#: calendar/gui/dialogs/meeting-page.glade.h:2 composer/e-msg-composer.c:2056
+#: mail/folder-browser.c:1752 mail/mail-account-gui.c:1260
+#: mail/mail-account-gui.c:1692 mail/mail-accounts.c:442
+#: mail/mail-config.glade.h:76
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:194
+#: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:442
+#: widgets/misc/e-dateedit.c:1458 widgets/misc/e-dateedit.c:1573
+msgid "None"
+msgstr "Ingen"
+
+#: calendar/gui/calendar-model.c:1711
+msgid "Recurring"
+msgstr "Genindtræffer"
+
+#: calendar/gui/calendar-model.c:1713
+msgid "Assigned"
+msgstr "Tildelt"
+
+#: calendar/gui/calendar-model.c:1719 calendar/gui/e-meeting-model.c:266
+#: calendar/gui/e-meeting-model.c:276 calendar/gui/e-meeting-model.c:534
+#: calendar/gui/e-meeting-model.c:784
+msgid "Yes"
+msgstr "Ja"
+
+#: calendar/gui/calendar-model.c:1719 calendar/gui/e-meeting-model.c:278
+#: calendar/gui/e-meeting-model.c:785
+msgid "No"
+msgstr "Nej"
+
 #: calendar/gui/calendar-view-factory.c:118
 msgid "Day View"
 msgstr "Dagvisning"
@@ -3967,69 +4034,48 @@ msgstr "Ugevisning"
 msgid "Month View"
 msgstr "Månedsvisning"
 
-#: calendar/gui/calendar-view-factory.c:130
-#, fuzzy
-msgid "List View"
-msgstr "Tilrettet visning"
-
-#: calendar/gui/cal-search-bar.c:50
-msgid "Summary contains"
-msgstr "Sammendrag indeholder"
-
-#: calendar/gui/cal-search-bar.c:51
-msgid "Description contains"
-msgstr "Beskrivelse indeholder"
-
-#: calendar/gui/cal-search-bar.c:52
-msgid "Comment contains"
-msgstr "Kommentar indeholder"
-
-#: calendar/gui/cal-search-bar.c:358 mail/mail-ops.c:1120
-msgid "Unmatched"
-msgstr "Ingen træffere"
-
-#: calendar/gui/comp-editor-factory.c:462
+#: calendar/gui/comp-editor-factory.c:456
 msgid "Error while opening the calendar"
 msgstr "Fejl under åbning af kalender"
 
-#: calendar/gui/comp-editor-factory.c:473
+#: calendar/gui/comp-editor-factory.c:467
 msgid "Method not supported when opening the calendar"
 msgstr "Metode ikke understøttet under åbning af kalenderen"
 
-#: calendar/gui/comp-editor-factory.c:479
+#: calendar/gui/comp-editor-factory.c:473
 msgid "Permission denied to open the calendar"
 msgstr "Du har ikke rettigheder til at åbne kalenderen"
 
-#: calendar/gui/control-factory.c:125
+#: calendar/gui/control-factory.c:119
 #, c-format
 msgid "Could not open the folder in '%s'"
 msgstr "Kunne ikke åbne mappen i \"%s\""
 
-#: calendar/gui/control-factory.c:171
+#: calendar/gui/control-factory.c:165
 msgid "The URI that the calendar will display"
 msgstr "URIen som kalenderen skal vise"
 
-#: calendar/gui/control-factory.c:178
+#: calendar/gui/control-factory.c:172
 msgid "The type of view to show"
 msgstr "Typen af visning der skal bruges"
 
-#: calendar/gui/dialogs/alarm-options.c:466
+#: calendar/gui/dialogs/alarm-options.c:420
 msgid "Audio Alarm Options"
 msgstr "Valgmuligheder for lyd-alarmer"
 
-#: calendar/gui/dialogs/alarm-options.c:475
+#: calendar/gui/dialogs/alarm-options.c:429
 msgid "Message Alarm Options"
 msgstr "Valgmuligheder for beskedsalarmer"
 
-#: calendar/gui/dialogs/alarm-options.c:484
+#: calendar/gui/dialogs/alarm-options.c:438
 msgid "Email Alarm Options"
 msgstr "Valgmuligheder for e-post-alarm"
 
-#: calendar/gui/dialogs/alarm-options.c:493
+#: calendar/gui/dialogs/alarm-options.c:447
 msgid "Program Alarm Options"
 msgstr "Valgmuligheder for program-alarmer"
 
-#: calendar/gui/dialogs/alarm-options.c:509
+#: calendar/gui/dialogs/alarm-options.c:456
 msgid "Unknown Alarm Options"
 msgstr "Valgmuligheder for ukendte alarmer"
 
@@ -4065,6 +4111,10 @@ msgstr "Send-til:"
 msgid "With these arguments:"
 msgstr "Med disse argumenter:"
 
+#: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter.glade.h:17
+msgid "days"
+msgstr "dage"
+
 #: calendar/gui/dialogs/alarm-options.glade.h:11
 msgid "dialog1"
 msgstr "dialog1"
@@ -4077,8 +4127,7 @@ msgstr "ekstra gange hver"
 msgid "hours"
 msgstr "timer"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:14
-#: executive-summary/test-service/rdf-summary.c:806 filter/filter.glade.h:19
+#: calendar/gui/dialogs/alarm-options.glade.h:14 filter/filter.glade.h:19
 msgid "minutes"
 msgstr "minutter"
 
@@ -4092,11 +4141,11 @@ msgstr "Basis"
 msgid "Date/Time:"
 msgstr "Dato/klokke:"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:3 calendar/gui/e-alarm-list.c:465
+#: calendar/gui/dialogs/alarm-page.glade.h:3 calendar/gui/e-alarm-list.c:461
 msgid "Display a message"
 msgstr "Vis en besked"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:4 calendar/gui/e-alarm-list.c:461
+#: calendar/gui/dialogs/alarm-page.glade.h:4 calendar/gui/e-alarm-list.c:457
 msgid "Play a sound"
 msgstr "Afspil en lyd"
 
@@ -4104,7 +4153,7 @@ msgstr "Afspil en lyd"
 msgid "Reminders"
 msgstr "Påmindelser"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:6 calendar/gui/e-alarm-list.c:473
+#: calendar/gui/dialogs/alarm-page.glade.h:6 calendar/gui/e-alarm-list.c:469
 msgid "Run a program"
 msgstr "Kør et program"
 
@@ -4114,8 +4163,7 @@ msgstr "Send et e-brev"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:8
 #: calendar/gui/dialogs/recurrence-page.glade.h:8
-#: calendar/gui/e-itip-control.c:1022 calendar/gui/e-itip-control.glade.h:11
-#: calendar/gui/e-tasks.c:208
+#: calendar/gui/e-itip-control.c:1052 calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "Sammendrag:"
 
@@ -4198,7 +4246,7 @@ msgstr "Dage"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
 #: calendar/gui/dialogs/recurrence-page.c:1040
-#: calendar/gui/e-itip-control.c:647
+#: calendar/gui/e-itip-control.c:677
 msgid "Friday"
 msgstr "Fredag"
 
@@ -4212,7 +4260,7 @@ msgstr "Minutter"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
 #: calendar/gui/dialogs/recurrence-page.c:1036
-#: calendar/gui/e-itip-control.c:643
+#: calendar/gui/e-itip-control.c:673
 msgid "Monday"
 msgstr "Mandag"
 
@@ -4222,7 +4270,7 @@ msgstr "_søn"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
 #: calendar/gui/dialogs/recurrence-page.c:1041
-#: calendar/gui/e-itip-control.c:648
+#: calendar/gui/e-itip-control.c:678
 msgid "Saturday"
 msgstr "Lørdag"
 
@@ -4236,7 +4284,7 @@ msgstr "Vis uge_nummer i datonavigation"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
 #: calendar/gui/dialogs/recurrence-page.c:1042
-#: calendar/gui/e-itip-control.c:642
+#: calendar/gui/e-itip-control.c:672
 msgid "Sunday"
 msgstr "Søndag"
 
@@ -4254,7 +4302,7 @@ msgstr "Opgaveliste"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
 #: calendar/gui/dialogs/recurrence-page.c:1039
-#: calendar/gui/e-itip-control.c:646
+#: calendar/gui/e-itip-control.c:676
 msgid "Thursday"
 msgstr "Torsdag"
 
@@ -4272,7 +4320,7 @@ msgstr "Tidsformat:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
 #: calendar/gui/dialogs/recurrence-page.c:1037
-#: calendar/gui/e-itip-control.c:644
+#: calendar/gui/e-itip-control.c:674
 msgid "Tuesday"
 msgstr "Tirsdag"
 
@@ -4282,12 +4330,12 @@ msgstr "_Ugen begynder:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
 #: calendar/gui/dialogs/recurrence-page.c:1038
-#: calendar/gui/e-itip-control.c:645
+#: calendar/gui/e-itip-control.c:675
 msgid "Wednesday"
 msgstr "Onsdag"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-#: ui/evolution-calendar.xml.h:31
+#: ui/evolution-calendar.xml.h:27
 msgid "Work Week"
 msgstr "Arbejdsuge"
 
@@ -4397,54 +4445,79 @@ msgstr ""
 msgid "Are you sure you want to cancel and delete this journal entry?"
 msgstr "Er du sikker på, at du vil aflyse og slette denne journalopføring?"
 
-#: calendar/gui/dialogs/changed-comp.c:59
+#: calendar/gui/dialogs/changed-comp.c:58
 msgid "This event has been deleted."
 msgstr "Denne hændelse er slettet."
 
-#: calendar/gui/dialogs/changed-comp.c:63
+#: calendar/gui/dialogs/changed-comp.c:62
 msgid "This task has been deleted."
 msgstr "Denne opgave er slettet."
 
-#: calendar/gui/dialogs/changed-comp.c:67
+#: calendar/gui/dialogs/changed-comp.c:66
 msgid "This journal entry has been deleted."
 msgstr "Denne journalopføring er slettet."
 
-#: calendar/gui/dialogs/changed-comp.c:76
+#: calendar/gui/dialogs/changed-comp.c:75
 #, c-format
 msgid "%s  You have made changes. Forget those changes and close the editor?"
 msgstr ""
 "%s  Du har lavet ændringer. Skal disse ændringer forkastes og redigeringen "
 "lukkes?"
 
-#: calendar/gui/dialogs/changed-comp.c:78
+#: calendar/gui/dialogs/changed-comp.c:77
 #, c-format
 msgid "%s  You have made no changes, close the editor?"
 msgstr "%s  Du har ikke lavet ændringer. Skal redigeringen lukkes?"
 
-#: calendar/gui/dialogs/changed-comp.c:83
+#: calendar/gui/dialogs/changed-comp.c:82
 msgid "This event has been changed."
 msgstr "Denne hændelse er ændret."
 
-#: calendar/gui/dialogs/changed-comp.c:87
+#: calendar/gui/dialogs/changed-comp.c:86
 msgid "This task has been changed."
 msgstr "Denne opgave er ændret."
 
-#: calendar/gui/dialogs/changed-comp.c:91
+#: calendar/gui/dialogs/changed-comp.c:90
 msgid "This journal entry has been changed."
 msgstr "Denne journalopføring er ændret."
 
-#: calendar/gui/dialogs/changed-comp.c:100
+#: calendar/gui/dialogs/changed-comp.c:99
 #, c-format
 msgid "%s  You have made changes. Forget those changes and update the editor?"
 msgstr ""
 "%s  Du har lavet ændringer. Skal disse ændringer forkastes og redigeringen "
 "opdateres?"
 
-#: calendar/gui/dialogs/changed-comp.c:102
+#: calendar/gui/dialogs/changed-comp.c:101
 #, c-format
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  Du har ikke gjort ændringer. Opdater redigering?"
 
+#: calendar/gui/dialogs/comp-editor-page.c:409
+#, c-format
+msgid "Validation error: %s"
+msgstr "Valideringsfejl: %s"
+
+#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2216
+msgid " to "
+msgstr " til "
+
+#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2220
+msgid " (Completed "
+msgstr " (Fuldført "
+
+#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2222
+msgid "Completed "
+msgstr "Fuldført "
+
+#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2227
+msgid " (Due "
+msgstr " (Færdig "
+
+#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2229
+msgid "Due "
+msgstr "Færdig "
+
 #: calendar/gui/dialogs/comp-editor.c:334
 msgid "Could not update invalid object"
 msgstr "Kunne ikke opdatera ugyldigt objekt"
@@ -4490,50 +4563,24 @@ msgid "No summary"
 msgstr "Ingen sammendrag"
 
 #: calendar/gui/dialogs/comp-editor.c:1281
-#: calendar/gui/e-calendar-table.c:1138 calendar/gui/e-cal-view.c:878
-#: composer/e-msg-composer.c:1191
+#: calendar/gui/e-calendar-table.c:1068 calendar/gui/e-day-view.c:3993
+#: calendar/gui/e-week-view.c:3840 composer/e-msg-composer.c:1164
 msgid "Save as..."
 msgstr "Gem som..."
 
-#: calendar/gui/dialogs/comp-editor.c:1384
-#: calendar/gui/dialogs/comp-editor.c:1408
-#: calendar/gui/dialogs/comp-editor.c:1434
+#: calendar/gui/dialogs/comp-editor.c:1382
+#: calendar/gui/dialogs/comp-editor.c:1406
+#: calendar/gui/dialogs/comp-editor.c:1432
 #, fuzzy
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr ""
 "Ændringer i dette objekt kan bliver muligvis ignoreret hvis en opdatering "
 "ankommer via e-post"
 
-#: calendar/gui/dialogs/comp-editor.c:1464
-#: calendar/gui/dialogs/comp-editor.c:1473
+#: calendar/gui/dialogs/comp-editor.c:1459
 msgid "Unable to obtain current version!"
 msgstr "Kan ikke hente versionsdata!"
 
-#: calendar/gui/dialogs/comp-editor-page.c:409
-#, c-format
-msgid "Validation error: %s"
-msgstr "Valideringsfejl: %s"
-
-#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2223
-msgid " to "
-msgstr " til "
-
-#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2227
-msgid " (Completed "
-msgstr " (Fuldført "
-
-#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2229
-msgid "Completed "
-msgstr "Fuldført "
-
-#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2234
-msgid " (Due "
-msgstr " (Færdig "
-
-#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2236
-msgid "Due "
-msgstr "Færdig "
-
 #: calendar/gui/dialogs/delete-comp.c:96
 #, c-format
 msgid "Are you sure you want to delete the appointment `%s'?"
@@ -4637,31 +4684,31 @@ msgstr "Delegér til:"
 msgid "Enter Delegate"
 msgstr "Indtast delegat"
 
-#: calendar/gui/dialogs/event-editor.c:200 calendar/gui/print.c:2260
+#: calendar/gui/dialogs/event-editor.c:199 calendar/gui/print.c:2253
 msgid "Appointment"
 msgstr "Aftale"
 
-#: calendar/gui/dialogs/event-editor.c:207
+#: calendar/gui/dialogs/event-editor.c:206
 msgid "Reminder"
 msgstr "Påmindelse"
 
-#: calendar/gui/dialogs/event-editor.c:214
+#: calendar/gui/dialogs/event-editor.c:213
 msgid "Recurrence"
 msgstr "Genindtræffelse"
 
-#: calendar/gui/dialogs/event-editor.c:221
-#: calendar/gui/dialogs/event-editor.c:294
-#: calendar/gui/dialogs/event-editor.c:438
+#: calendar/gui/dialogs/event-editor.c:220
+#: calendar/gui/dialogs/event-editor.c:292
+#: calendar/gui/dialogs/event-editor.c:436
 msgid "Scheduling"
 msgstr "Mødeplanlægning"
 
-#: calendar/gui/dialogs/event-editor.c:228
-#: calendar/gui/dialogs/event-editor.c:297
-#: calendar/gui/dialogs/event-editor.c:441 ui/evolution-event-editor.xml.h:6
+#: calendar/gui/dialogs/event-editor.c:227
+#: calendar/gui/dialogs/event-editor.c:295
+#: calendar/gui/dialogs/event-editor.c:439 ui/evolution-event-editor.xml.h:6
 msgid "Meeting"
 msgstr "Møde"
 
-#: calendar/gui/dialogs/event-page.c:603 calendar/gui/dialogs/task-page.c:509
+#: calendar/gui/dialogs/event-page.c:603 calendar/gui/dialogs/task-page.c:507
 msgid "Start date is wrong"
 msgstr "Startdatoen er forkert"
 
@@ -4697,9 +4744,9 @@ msgid "Classification"
 msgstr "Klassificering"
 
 #: calendar/gui/dialogs/event-page.glade.h:6
-#, fuzzy
-msgid "Co_nfidential"
-msgstr "Fortroligt"
+#: calendar/gui/dialogs/task-page.glade.h:4
+msgid "Con_fidential"
+msgstr "Kon_fidensiel"
 
 #: calendar/gui/dialogs/event-page.glade.h:7
 #: calendar/gui/dialogs/task-page.glade.h:5
@@ -4725,6 +4772,7 @@ msgid "Pu_blic"
 msgstr "Of_fentlig"
 
 #: calendar/gui/dialogs/event-page.glade.h:12
+#: calendar/gui/e-calendar-table.etspec.h:13
 msgid "Show Time As"
 msgstr "Vis tid som"
 
@@ -4741,34 +4789,74 @@ msgstr "S_lut-tid:"
 msgid "_Start time:"
 msgstr "_Start-tid:"
 
-#. an empty string is the same as 'None'
-#: calendar/gui/dialogs/meeting-page.c:311
-#: calendar/gui/dialogs/meeting-page.glade.h:2
-#: calendar/gui/e-cal-model-tasks.c:596 composer/e-msg-composer.c:2093
-#: mail/mail-account-gui.c:1260 mail/mail-account-gui.c:1692
-#: mail/mail-accounts.c:442 mail/mail-config.glade.h:76
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:194
-#: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:445
-#: widgets/misc/e-dateedit.c:1483 widgets/misc/e-dateedit.c:1598
-msgid "None"
-msgstr "Ingen"
-
-#: calendar/gui/dialogs/meeting-page.c:416
+#: calendar/gui/dialogs/meeting-page.c:437
 msgid "The organizer selected no longer has an account."
 msgstr "Den valgte organisator har ikke længere en konto."
 
-#: calendar/gui/dialogs/meeting-page.c:422
+#: calendar/gui/dialogs/meeting-page.c:443
 msgid "An organizer is required."
 msgstr "En organisator er påkrævet."
 
-#: calendar/gui/dialogs/meeting-page.c:437
+#: calendar/gui/dialogs/meeting-page.c:458
 msgid "At least one attendee is required."
 msgstr "Mindst en deltager er nødvendig"
 
-#: calendar/gui/dialogs/meeting-page.c:630
+#: calendar/gui/dialogs/meeting-page.c:629
+msgid "That person is already attending the meeting!"
+msgstr "Denne person er allerede sat op til dette møde!"
+
+#: calendar/gui/dialogs/meeting-page.c:713
 msgid "_Delegate To..."
 msgstr "_Deleger til..."
 
+#: calendar/gui/dialogs/meeting-page.etspec.h:1
+#: calendar/gui/e-meeting-time-sel.etspec.h:1
+msgid "Attendee"
+msgstr "Deltager"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:2
+#: calendar/gui/e-meeting-time-sel.etspec.h:2
+msgid "Click here to add an attendee"
+msgstr "Klik her for at tilføje en deltager"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:3
+#: calendar/gui/e-meeting-time-sel.etspec.h:3
+msgid "Common Name"
+msgstr "Normalt navn"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:4
+#: calendar/gui/e-meeting-time-sel.etspec.h:4
+msgid "Delegated From"
+msgstr "Delegeret fra"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:5
+#: calendar/gui/e-meeting-time-sel.etspec.h:5
+msgid "Delegated To"
+msgstr "Delegeret til"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:6
+#: calendar/gui/e-meeting-time-sel.etspec.h:6
+msgid "Language"
+msgstr "Sprog"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:7
+#: calendar/gui/e-meeting-time-sel.etspec.h:7
+msgid "Member"
+msgstr "Medlem"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:8
+#: calendar/gui/e-itip-control.c:1179
+#: calendar/gui/e-meeting-time-sel.etspec.h:8
+msgid "RSVP"
+msgstr "SU"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:10
+#: calendar/gui/e-calendar-table.etspec.h:15
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:58
+#: mail/message-list.etspec.h:12
+msgid "Status"
+msgstr "Status"
+
 #: calendar/gui/dialogs/meeting-page.glade.h:3
 #: calendar/gui/e-itip-control.glade.h:9
 msgid "Organizer:"
@@ -4779,7 +4867,7 @@ msgid "_Change Organizer"
 msgstr "Æn_dr organisator"
 
 #: calendar/gui/dialogs/meeting-page.glade.h:5
-#: calendar/gui/e-meeting-time-sel.c:411
+#: calendar/gui/e-meeting-time-sel.c:424
 msgid "_Invite Others..."
 msgstr "_Invitér andre..."
 
@@ -4931,7 +5019,7 @@ msgstr ""
 "\n"
 "Vil du gemme ændringene?"
 
-#: calendar/gui/dialogs/save-comp.c:58 composer/e-msg-composer.c:1599
+#: calendar/gui/dialogs/save-comp.c:58 composer/e-msg-composer.c:1557
 msgid "_Discard Changes"
 msgstr "_Forkast ændringer"
 
@@ -4956,82 +5044,52 @@ msgstr "Opgaveinformationen er genereret. Send den?"
 msgid "The task information has changed. Send an updated version?"
 msgstr "Opgaveinformationen er ændret. Send en opdateret version?"
 
-#: calendar/gui/dialogs/task-details-page.c:405
+#: calendar/gui/dialogs/task-details-page.c:401
 msgid "Completed date is wrong"
 msgstr "Udførelsesdatoen er forkert"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:2
-#, fuzzy, no-c-format
-msgid "% _Complete"
+#: calendar/gui/e-calendar-table.etspec.h:2
+#, no-c-format
+msgid "% Complete"
 msgstr "% færdig"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:4
-#: calendar/gui/e-calendar-table.c:478 calendar/gui/e-cal-model-tasks.c:323
-#: calendar/gui/e-cal-model-tasks.c:602 calendar/gui/e-tasks.c:250
-#: calendar/gui/print.c:2311
-msgid "Completed"
-msgstr "Fuldført"
-
-#: calendar/gui/dialogs/task-details-page.glade.h:6
-#: calendar/gui/e-calendar-table.c:477 calendar/gui/e-cal-model-tasks.c:321
-#: calendar/gui/e-cal-model-tasks.c:600 calendar/gui/e-cal-model-tasks.c:662
-#: calendar/gui/e-tasks.c:247 calendar/gui/print.c:2308
-msgid "In Progress"
-msgstr "I gang"
-
-#: calendar/gui/dialogs/task-details-page.glade.h:9
-#: calendar/gui/e-calendar-table.c:476 calendar/gui/e-cal-model-tasks.c:319
-#: calendar/gui/e-cal-model-tasks.c:598 calendar/gui/e-tasks.c:257
-#: calendar/gui/print.c:2305
-msgid "Not Started"
-msgstr "Ikke startet"
+#: calendar/gui/dialogs/task-details-page.glade.h:5
+msgid "Date Completed:"
+msgstr "Dato for fuldførelse:"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:10
+#: calendar/gui/dialogs/task-details-page.glade.h:11
 msgid "Progress"
 msgstr "Fremgang"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:12
-#, fuzzy
-msgid "_Date Completed:"
-msgstr "Dato for fuldførelse:"
+msgid "URL:"
+msgstr "URL:"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:13
+#: calendar/gui/dialogs/task-details-page.glade.h:14
 msgid "_Priority:"
 msgstr "_Prioritet:"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:14
+#: calendar/gui/dialogs/task-details-page.glade.h:15
 msgid "_Status:"
 msgstr "_Status:"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:15
-#, fuzzy
-msgid "_Web Page:"
-msgstr "_Hjemmeside-adresse:"
-
-#: calendar/gui/dialogs/task-editor.c:193
+#: calendar/gui/dialogs/task-editor.c:190
 msgid "Basic"
 msgstr "Grundlæggende"
 
-#: calendar/gui/dialogs/task-editor.c:207
-#: calendar/gui/dialogs/task-editor.c:270
-#: calendar/gui/dialogs/task-editor.c:407
+#: calendar/gui/dialogs/task-editor.c:204
+#: calendar/gui/dialogs/task-editor.c:252
+#: calendar/gui/dialogs/task-editor.c:387
 msgid "Assignment"
 msgstr "Tildeling"
 
-#: calendar/gui/dialogs/task-page.c:482
+#: calendar/gui/dialogs/task-page.c:480
 msgid "Due date is wrong"
 msgstr "Forfaldsdatoen er forkert"
 
-#: calendar/gui/dialogs/task-page.c:542
-msgid "Due date is before start date!"
-msgstr ""
-
-#: calendar/gui/dialogs/task-page.glade.h:4
-msgid "Con_fidential"
-msgstr "Kon_fidensiel"
-
-#: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-itip-control.c:1077
-#: calendar/gui/e-itip-control.glade.h:6 calendar/gui/e-tasks.c:287
+#: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-itip-control.c:1107
+#: calendar/gui/e-itip-control.glade.h:6
 #: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:43
 msgid "Description:"
 msgstr "Beskrivelse:"
@@ -5044,259 +5102,223 @@ msgstr "Sta_rt dato:"
 msgid "_Due Date:"
 msgstr "Fær_dig-dato:"
 
-#: calendar/gui/e-alarm-list.c:397
+#: calendar/gui/e-alarm-list.c:393
 #, c-format
 msgid "%d days"
 msgstr "%d dage"
 
-#: calendar/gui/e-alarm-list.c:400
+#: calendar/gui/e-alarm-list.c:396
 msgid "1 day"
 msgstr "1 dag"
 
-#: calendar/gui/e-alarm-list.c:405
+#: calendar/gui/e-alarm-list.c:401
 #, c-format
 msgid "%d weeks"
 msgstr "%d uger"
 
-#: calendar/gui/e-alarm-list.c:408
+#: calendar/gui/e-alarm-list.c:404
 msgid "1 week"
 msgstr "1 uge"
 
-#: calendar/gui/e-alarm-list.c:413
+#: calendar/gui/e-alarm-list.c:409
 #, c-format
 msgid "%d hours"
 msgstr "%d timer"
 
-#: calendar/gui/e-alarm-list.c:416
+#: calendar/gui/e-alarm-list.c:412
 msgid "1 hour"
 msgstr "1 time"
 
-#: calendar/gui/e-alarm-list.c:421
+#: calendar/gui/e-alarm-list.c:417
 #, c-format
 msgid "%d minutes"
 msgstr "%d minutter"
 
-#: calendar/gui/e-alarm-list.c:424
+#: calendar/gui/e-alarm-list.c:420
 msgid "1 minute"
 msgstr "1 minut"
 
-#: calendar/gui/e-alarm-list.c:429
+#: calendar/gui/e-alarm-list.c:425
 #, c-format
 msgid "%d seconds"
 msgstr "%d sekunder"
 
-#: calendar/gui/e-alarm-list.c:432
+#: calendar/gui/e-alarm-list.c:428
 msgid "1 second"
 msgstr "1 sekund"
 
-#: calendar/gui/e-alarm-list.c:469
+#: calendar/gui/e-alarm-list.c:465
 msgid "Send an email"
 msgstr "Send en besked"
 
-#: calendar/gui/e-alarm-list.c:479
+#: calendar/gui/e-alarm-list.c:475
 msgid "Unknown action to be performed"
 msgstr "Ukendt handling som skal udføres"
 
-#: calendar/gui/e-alarm-list.c:491
+#: calendar/gui/e-alarm-list.c:487
 #, c-format
 msgid "%s %s before the start of the appointment"
 msgstr "%s %s før aftalen starter"
 
-#: calendar/gui/e-alarm-list.c:494
+#: calendar/gui/e-alarm-list.c:490
 #, c-format
 msgid "%s %s after the start of the appointment"
 msgstr "%s %s efter aftalen er startet"
 
-#: calendar/gui/e-alarm-list.c:499
+#: calendar/gui/e-alarm-list.c:495
 #, c-format
 msgid "%s at the start of the appointment"
 msgstr "%s ved aftalens start"
 
-#: calendar/gui/e-alarm-list.c:508
+#: calendar/gui/e-alarm-list.c:504
 #, c-format
 msgid "%s %s before the end of the appointment"
 msgstr "%s %s før aftalen slutter"
 
-#: calendar/gui/e-alarm-list.c:511
+#: calendar/gui/e-alarm-list.c:507
 #, c-format
 msgid "%s %s after the end of the appointment"
 msgstr "%s %s efter aftalens slutning"
 
-#: calendar/gui/e-alarm-list.c:516
+#: calendar/gui/e-alarm-list.c:512
 #, c-format
 msgid "%s at the end of the appointment"
 msgstr "%s ved aftalens slutning"
 
-#: calendar/gui/e-alarm-list.c:540
+#: calendar/gui/e-alarm-list.c:536
 #, c-format
 msgid "%s at %s"
 msgstr "%s ved %s"
 
-#: calendar/gui/e-alarm-list.c:546
+#: calendar/gui/e-alarm-list.c:542
 #, c-format
 msgid "%s for an unknown trigger type"
 msgstr "%s for en ukendt udløsertype"
 
-#: calendar/gui/e-calendar-table.c:381 calendar/gui/e-cal-model.c:280
-#: calendar/gui/e-cal-model.c:287
-msgid "Public"
-msgstr "Offentlig"
-
-#: calendar/gui/e-calendar-table.c:382 calendar/gui/e-cal-model.c:289
-msgid "Private"
-msgstr "Privat"
-
-#: calendar/gui/e-calendar-table.c:383 calendar/gui/e-cal-model.c:291
-msgid "Confidential"
-msgstr "Fortroligt"
-
-#: calendar/gui/e-calendar-table.c:425
+#: calendar/gui/e-calendar-table.c:423
 msgid "0%"
 msgstr "0%"
 
-#: calendar/gui/e-calendar-table.c:426
+#: calendar/gui/e-calendar-table.c:424
 msgid "10%"
 msgstr "10%"
 
-#: calendar/gui/e-calendar-table.c:427
+#: calendar/gui/e-calendar-table.c:425
 msgid "20%"
 msgstr "20%"
 
-#: calendar/gui/e-calendar-table.c:428
+#: calendar/gui/e-calendar-table.c:426
 msgid "30%"
 msgstr "30%"
 
-#: calendar/gui/e-calendar-table.c:429
+#: calendar/gui/e-calendar-table.c:427
 msgid "40%"
 msgstr "40%"
 
-#: calendar/gui/e-calendar-table.c:430
+#: calendar/gui/e-calendar-table.c:428
 msgid "50%"
 msgstr "50%"
 
-#: calendar/gui/e-calendar-table.c:431
+#: calendar/gui/e-calendar-table.c:429
 msgid "60%"
 msgstr "60%"
 
-#: calendar/gui/e-calendar-table.c:432
+#: calendar/gui/e-calendar-table.c:430
 msgid "70%"
 msgstr "70%"
 
-#: calendar/gui/e-calendar-table.c:433
+#: calendar/gui/e-calendar-table.c:431
 msgid "80%"
 msgstr "80%"
 
-#: calendar/gui/e-calendar-table.c:434
+#: calendar/gui/e-calendar-table.c:432
 msgid "90%"
 msgstr "90%"
 
-#: calendar/gui/e-calendar-table.c:435
+#: calendar/gui/e-calendar-table.c:433
 msgid "100%"
 msgstr "100%"
 
-#: calendar/gui/e-calendar-table.c:455 calendar/gui/e-cal-model-calendar.c:163
-msgid "Free"
-msgstr "Ledig"
-
-#: calendar/gui/e-calendar-table.c:456 calendar/gui/e-cal-model-calendar.c:166
-#: calendar/gui/e-meeting-time-sel.c:393
-#: shell/evolution-shell-component.c:1207
-msgid "Busy"
-msgstr "Optaget"
-
-#: calendar/gui/e-calendar-table.c:724 calendar/gui/e-cal-view.c:562
+#: calendar/gui/e-calendar-table.c:726 calendar/gui/e-day-view.c:2867
+#: calendar/gui/e-week-view.c:1933
 msgid "Deleting selected objects"
 msgstr "Sletter de valgte objekter"
 
-#: calendar/gui/e-calendar-table.c:988 calendar/gui/e-calendar-table.c:1029
-#: calendar/gui/e-cal-view.c:1126 calendar/gui/e-cal-view.c:1192
+#: calendar/gui/e-calendar-table.c:958 calendar/gui/e-day-view.c:3737
+#: calendar/gui/e-week-view.c:3613 mail/folder-browser.c:1763
 #: shell/e-shortcuts-view.c:422 ui/evolution-addressbook.xml.h:36
 msgid "_Open"
 msgstr "_Åbn"
 
-#: calendar/gui/e-calendar-table.c:989
-#, fuzzy
-msgid "Open _Web Page"
-msgstr "_Åbn besked"
+#: calendar/gui/e-calendar-table.c:959
+msgid "_Save as..."
+msgstr "_Gem som..."
 
-#: calendar/gui/e-calendar-table.c:990 calendar/gui/e-calendar-table.c:1035
-#: calendar/gui/e-cal-view.c:1127 calendar/gui/e-cal-view.c:1198
-#: ui/evolution-mail-message.xml.h:120
-msgid "_Save As..."
-msgstr "Gem _som..."
-
-#: calendar/gui/e-calendar-table.c:991 calendar/gui/e-calendar-table.c:1033
-#: calendar/gui/e-cal-view.c:1101 calendar/gui/e-cal-view.c:1128
-#: calendar/gui/e-cal-view.c:1196 ui/evolution-addressbook.xml.h:38
-#: ui/evolution-calendar.xml.h:37 ui/evolution-comp-editor.xml.h:19
-#: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:116
-#: ui/evolution-tasks.xml.h:21 ui/my-evolution.xml.h:6
+#: calendar/gui/e-calendar-table.c:960 calendar/gui/e-day-view.c:3739
+#: calendar/gui/e-week-view.c:3588 calendar/gui/e-week-view.c:3615
+#: ui/evolution-addressbook.xml.h:38 ui/evolution-calendar.xml.h:33
+#: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:108
+#: ui/evolution-tasks.xml.h:20 ui/my-evolution.xml.h:6
 msgid "_Print..."
 msgstr "S_kriv ud..."
 
-#: calendar/gui/e-calendar-table.c:995 calendar/gui/e-calendar-table.c:1024
-#: calendar/gui/e-cal-view.c:1133 calendar/gui/e-cal-view.c:1174
-#: ui/evolution-addressbook.xml.h:1 ui/evolution-calendar.xml.h:1
-#: ui/evolution-tasks.xml.h:1
+#: calendar/gui/e-calendar-table.c:964 calendar/gui/e-day-view.c:3744
+#: calendar/gui/e-week-view.c:3620 ui/evolution-addressbook.xml.h:1
+#: ui/evolution-calendar.xml.h:1 ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "Klip _ud"
 
-#: calendar/gui/e-calendar-table.c:996 calendar/gui/e-calendar-table.c:1022
-#: calendar/gui/e-cal-view.c:1134 calendar/gui/e-cal-view.c:1172
-#: ui/evolution-addressbook.xml.h:30 ui/evolution-calendar.xml.h:33
-#: ui/evolution-composer-entries.xml.h:7 ui/evolution-mail-message.xml.h:101
-#: ui/evolution-tasks.xml.h:17
+#: calendar/gui/e-calendar-table.c:965 calendar/gui/e-day-view.c:3745
+#: calendar/gui/e-week-view.c:3621 ui/evolution-addressbook.xml.h:30
+#: ui/evolution-calendar.xml.h:29 ui/evolution-composer-entries.xml.h:7
+#: ui/evolution-mail-list.xml.h:24 ui/evolution-tasks.xml.h:15
 msgid "_Copy"
 msgstr "_Kopiér"
 
-#: calendar/gui/e-calendar-table.c:997 calendar/gui/e-calendar-table.c:1031
-#: calendar/gui/e-cal-view.c:1105 calendar/gui/e-cal-view.c:1135
-#: calendar/gui/e-cal-view.c:1194 ui/evolution-addressbook.xml.h:37
-#: ui/evolution-calendar.xml.h:36 ui/evolution-composer-entries.xml.h:9
-#: ui/evolution-mail-message.xml.h:114 ui/evolution-tasks.xml.h:20
+#: calendar/gui/e-calendar-table.c:966 calendar/gui/e-day-view.c:3710
+#: calendar/gui/e-day-view.c:3746 calendar/gui/e-week-view.c:3592
+#: calendar/gui/e-week-view.c:3622 ui/evolution-addressbook.xml.h:37
+#: ui/evolution-calendar.xml.h:32 ui/evolution-composer-entries.xml.h:9
+#: ui/evolution-mail-list.xml.h:29 ui/evolution-tasks.xml.h:19
 msgid "_Paste"
 msgstr "_Indsæt"
 
-#: calendar/gui/e-calendar-table.c:1001
+#: calendar/gui/e-calendar-table.c:970
 msgid "_Assign Task"
 msgstr "_Tildel opgave"
 
-#: calendar/gui/e-calendar-table.c:1002
+#: calendar/gui/e-calendar-table.c:971
 msgid "_Forward as iCalendar"
 msgstr "_Videresend som iCalendar"
 
-#: calendar/gui/e-calendar-table.c:1003
+#: calendar/gui/e-calendar-table.c:972
 msgid "_Mark as Complete"
 msgstr "_Markér som fuldført"
 
-#: calendar/gui/e-calendar-table.c:1004
+#: calendar/gui/e-calendar-table.c:973
 msgid "_Mark Selected Tasks as Complete"
 msgstr "_Markér valgte opgaver som komplette"
 
-#: calendar/gui/e-calendar-table.c:1009 calendar/gui/e-calendar-table.c:1027
+#: calendar/gui/e-calendar-table.c:978
 msgid "_Delete Selected Tasks"
 msgstr "Sle_t valgte opgaver"
 
-#: calendar/gui/e-calendar-table.c:1341 calendar/gui/e-cal-view.c:253
+#: calendar/gui/e-calendar-table.c:1265 calendar/gui/e-day-view.c:7929
+#: calendar/gui/e-week-view.c:4335
 msgid "Updating objects"
 msgstr "Opdaterer objekter"
 
-#: calendar/gui/e-calendar-table.c:1424
+#: calendar/gui/e-calendar-table.c:1348
 #: calendar/gui/e-calendar-table.etspec.h:6
 msgid "Click to add a task"
 msgstr "Klik for at tilføje en opgave"
 
-#: calendar/gui/e-calendar-table.etspec.h:2
-#, no-c-format
-msgid "% Complete"
-msgstr "% færdig"
-
 #: calendar/gui/e-calendar-table.etspec.h:3
 msgid "Alarms"
 msgstr "Alarmer"
 
-#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:1173
-#: camel/camel-filter-driver.c:1268 mail/mail-send-recv.c:578
+#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:1156
+#: camel/camel-filter-driver.c:1251
 msgid "Complete"
 msgstr "Fuldført"
 
@@ -5305,14 +5327,13 @@ msgid "Completion Date"
 msgstr "Fuldført dato"
 
 #: calendar/gui/e-calendar-table.etspec.h:9
-#, fuzzy
-msgid "Description"
-msgstr "Beskrivelse:"
-
-#: calendar/gui/e-calendar-table.etspec.h:10
 msgid "Due Date"
 msgstr "Færdig-dato"
 
+#: calendar/gui/e-calendar-table.etspec.h:10
+msgid "End Date"
+msgstr "Slutdato"
+
 #: calendar/gui/e-calendar-table.etspec.h:11
 msgid "Geographical Position"
 msgstr "Geografisk placering"
@@ -5321,299 +5342,242 @@ msgstr "Geografisk placering"
 msgid "Priority"
 msgstr "Prioritet"
 
-#: calendar/gui/e-calendar-table.etspec.h:13
+#: calendar/gui/e-calendar-table.etspec.h:14
 msgid "Start Date"
 msgstr "Startdato"
 
-#: calendar/gui/e-calendar-table.etspec.h:14
-#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:36
-#: mail/message-list.etspec.h:12
-msgid "Status"
-msgstr "Status"
-
-#: calendar/gui/e-calendar-table.etspec.h:15
+#: calendar/gui/e-calendar-table.etspec.h:16
 #: my-evolution/component-factory.c:56 shell/e-shell.c:750
 #: shell/e-shortcuts.c:1082
 msgid "Summary"
 msgstr "Sammendrag"
 
-#: calendar/gui/e-calendar-table.etspec.h:16
+#: calendar/gui/e-calendar-table.etspec.h:17
 msgid "Task sort"
 msgstr "Opgavesortering"
 
-#: calendar/gui/e-calendar-table.etspec.h:19 mail/mail-config.glade.h:171
-msgid "color"
-msgstr "farve"
-
-#: calendar/gui/e-calendar-table.etspec.h:20
-#, fuzzy
-msgid "component"
-msgstr "Aftale"
-
-#: calendar/gui/e-cal-model.c:293 calendar/gui/e-cal-model.c:296
-#: calendar/gui/e-itip-control.c:1062 calendar/gui/e-itip-control.c:1278
-#: camel/camel-gpg-context.c:1574 camel/camel-gpg-context.c:1625
-#: camel/camel-tcp-stream-openssl.c:631
-#: camel/providers/smtp/camel-smtp-transport.c:172
-#: camel/providers/smtp/camel-smtp-transport.c:227
-#: widgets/misc/e-charset-picker.c:60
-msgid "Unknown"
-msgstr "Ukendt"
-
-#: calendar/gui/e-cal-model.c:828
-msgid "Recurring"
-msgstr "Genindtræffer"
-
-#: calendar/gui/e-cal-model.c:830
-msgid "Assigned"
-msgstr "Tildelt"
+#. strftime format of a weekday, a date and a time, 24-hour.
+#: calendar/gui/e-cell-date-edit-text.c:118 e-util/e-time-utils.c:167
+#: e-util/e-time-utils.c:380
+msgid "%a %m/%d/%Y %H:%M:%S"
+msgstr "%a %Y-%m-%d %H:%M:%S"
 
-#: calendar/gui/e-cal-model.c:832 calendar/gui/e-cal-model-tasks.c:933
-msgid "Yes"
-msgstr "Ja"
+#. strftime format of a weekday, a date and a time, 12-hour.
+#: calendar/gui/e-cell-date-edit-text.c:121 e-util/e-time-utils.c:162
+#: e-util/e-time-utils.c:389
+msgid "%a %m/%d/%Y %I:%M:%S %p"
+msgstr "%a %d/%m-%Y %H:%M:%S"
 
-#: calendar/gui/e-cal-model.c:832 calendar/gui/e-cal-model-tasks.c:933
-msgid "No"
-msgstr "Nej"
+#: calendar/gui/e-cell-date-edit-text.c:126
+#, c-format
+msgid ""
+"The date must be entered in the format: \n"
+"\n"
+"%s"
+msgstr ""
+"Datoen skal skrives ind på formatet: \n"
+"\n"
+"%s"
 
-#: calendar/gui/e-cal-model-tasks.c:275
-msgid "N"
-msgstr "N"
+#: calendar/gui/e-day-view-time-item.c:532
+#, c-format
+msgid "%02i minute divisions"
+msgstr "%02i minutters opdeling"
 
-#: calendar/gui/e-cal-model-tasks.c:275
-msgid "S"
-msgstr "S"
+#. strftime format %A = full weekday name, %d = day of month,
+#. %B = full month name. Don't use any other specifiers.
+#: calendar/gui/e-day-view-top-item.c:261 calendar/gui/e-day-view.c:1421
+#: calendar/gui/e-week-view-main-item.c:316 calendar/gui/print.c:1525
+msgid "%A %d %B"
+msgstr "%A %d %B"
 
-#: calendar/gui/e-cal-model-tasks.c:277
-msgid "E"
-msgstr "Ø"
+#. strftime format %d = day of month, %b = abbreviated month name.
+#. Don't use any other specifiers.
+#: calendar/gui/e-day-view-top-item.c:269 calendar/gui/e-day-view.c:1454
+#: calendar/gui/e-week-view-main-item.c:339
+msgid "%d %b"
+msgstr "%d %b"
 
-#: calendar/gui/e-cal-model-tasks.c:277
-msgid "W"
-msgstr "V"
+#. String to use in 12-hour time format for times in the morning.
+#: calendar/gui/e-day-view.c:636 calendar/gui/e-week-view.c:350
+#: calendar/gui/print.c:809
+msgid "am"
+msgstr " "
 
-#: calendar/gui/e-cal-model-tasks.c:550
-msgid ""
-"The geographical position must be entered in the format: \n"
-"\n"
-"45.436845,125.862501"
-msgstr ""
-"Den geografiske positionen skal skrives ind på formatet: \n"
-"\n"
-"45.436845,125.862501"
+#. String to use in 12-hour time format for times in the afternoon.
+#: calendar/gui/e-day-view.c:639 calendar/gui/e-week-view.c:353
+#: calendar/gui/print.c:811
+msgid "pm"
+msgstr " "
 
-#: calendar/gui/e-cal-view.c:1094 calendar/gui/e-cal-view.c:1184
-msgid "New _Appointment..."
-msgstr "Ny _aftale..."
+#: calendar/gui/e-day-view.c:3694
+msgid "New _Appointment"
+msgstr "Ny _aftale"
 
-#: calendar/gui/e-cal-view.c:1095 calendar/gui/e-cal-view.c:1186
+#: calendar/gui/e-day-view.c:3696 calendar/gui/e-week-view.c:3582
 msgid "New All Day _Event"
 msgstr "Ny aftale som varer h_ele dagen"
 
-#: calendar/gui/e-cal-view.c:1096 calendar/gui/e-cal-view.c:1188
+#: calendar/gui/e-day-view.c:3698 calendar/gui/e-week-view.c:3583
 msgid "New Meeting"
 msgstr "Nyt møde"
 
-#: calendar/gui/e-cal-view.c:1097 calendar/gui/e-cal-view.c:1190
+#: calendar/gui/e-day-view.c:3700 calendar/gui/e-week-view.c:3584
 msgid "New Task"
 msgstr "Ny opgave"
 
-#: calendar/gui/e-cal-view.c:1111 calendar/gui/e-cal-view.c:1180
+#: calendar/gui/e-day-view.c:3705 ui/evolution-comp-editor.xml.h:11
+msgid "Print..."
+msgstr "Udskriv..."
+
+#: calendar/gui/e-day-view.c:3717 calendar/gui/e-week-view.c:3598
 #: ui/evolution-calendar.xml.h:13
 msgid "Go to _Today"
 msgstr "Gå _til i dag"
 
-#: calendar/gui/e-cal-view.c:1112 calendar/gui/e-cal-view.c:1182
+#: calendar/gui/e-day-view.c:3719 calendar/gui/e-week-view.c:3599
 msgid "_Go to Date..."
 msgstr "_Gå til dato..."
 
-#: calendar/gui/e-cal-view.c:1116 ui/evolution-calendar.xml.h:38
+#: calendar/gui/e-day-view.c:3724 calendar/gui/e-week-view.c:3603
+#: ui/evolution-calendar.xml.h:34
 msgid "_Publish Free/Busy Information"
 msgstr "_Udgiv ledig/optaget-information"
 
-#: calendar/gui/e-cal-view.c:1120 calendar/gui/e-cal-view.c:1200
+#: calendar/gui/e-day-view.c:3729 calendar/gui/e-week-view.c:3607
 #: ui/evolution.xml.h:60
 msgid "_Settings..."
 msgstr "_Indstillinger..."
 
-#: calendar/gui/e-cal-view.c:1139
+#: calendar/gui/e-day-view.c:3738 calendar/gui/e-week-view.c:3614
+#: mail/folder-browser.c:1765 ui/evolution-mail-message.xml.h:112
+msgid "_Save As..."
+msgstr "Gem _som..."
+
+#: calendar/gui/e-day-view.c:3750 calendar/gui/e-week-view.c:3626
 msgid "_Schedule Meeting..."
 msgstr "_Book møde..."
 
-#: calendar/gui/e-cal-view.c:1140
+#: calendar/gui/e-day-view.c:3751 calendar/gui/e-week-view.c:3627
 msgid "_Forward as iCalendar..."
 msgstr "_Videresend som iCalendar..."
 
-#: calendar/gui/e-cal-view.c:1145
+#: calendar/gui/e-day-view.c:3756 calendar/gui/e-week-view.c:3632
 msgid "Make this Occurrence _Movable"
 msgstr "Gør denne hændelse _flytbar"
 
-#: calendar/gui/e-cal-view.c:1146 calendar/gui/e-cal-view.c:1177
+#: calendar/gui/e-day-view.c:3757 calendar/gui/e-week-view.c:3633
 msgid "Delete this _Occurrence"
 msgstr "Slet denne _hændelse"
 
-#: calendar/gui/e-cal-view.c:1147 calendar/gui/e-cal-view.c:1178
+#: calendar/gui/e-day-view.c:3758 calendar/gui/e-week-view.c:3634
 msgid "Delete _All Occurrences"
 msgstr "Slet _alle hændelser"
 
-#. strftime format of a weekday, a date and a time, 24-hour.
-#: calendar/gui/e-cell-date-edit-text.c:118 e-util/e-time-utils.c:180
-#: e-util/e-time-utils.c:393
-msgid "%a %m/%d/%Y %H:%M:%S"
-msgstr "%a %Y-%m-%d %H:%M:%S"
-
-#. strftime format of a weekday, a date and a time, 12-hour.
-#: calendar/gui/e-cell-date-edit-text.c:121 e-util/e-time-utils.c:175
-#: e-util/e-time-utils.c:402
-msgid "%a %m/%d/%Y %I:%M:%S %p"
-msgstr "%a %d/%m-%Y %H:%M:%S"
-
-#: calendar/gui/e-cell-date-edit-text.c:126
-#, c-format
-msgid ""
-"The date must be entered in the format: \n"
-"\n"
-"%s"
-msgstr ""
-"Datoen skal skrives ind på formatet: \n"
-"\n"
-"%s"
-
-#. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:600 calendar/gui/e-week-view.c:326
-#: calendar/gui/print.c:809
-msgid "am"
-msgstr " "
-
-#. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:603 calendar/gui/e-week-view.c:329
-#: calendar/gui/print.c:811
-msgid "pm"
-msgstr " "
-
-#. strftime format %A = full weekday name, %d = day of month,
-#. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view.c:1347 calendar/gui/e-day-view-top-item.c:262
-#: calendar/gui/e-week-view-main-item.c:316 calendar/gui/print.c:1524
-msgid "%A %d %B"
-msgstr "%A %d %B"
-
-#. strftime format %d = day of month, %b = abbreviated month name.
-#. Don't use any other specifiers.
-#: calendar/gui/e-day-view.c:1380 calendar/gui/e-day-view-top-item.c:270
-#: calendar/gui/e-week-view-main-item.c:339
-msgid "%d %b"
-msgstr "%d %b"
-
-#: calendar/gui/e-day-view-time-item.c:532
-#, c-format
-msgid "%02i minute divisions"
-msgstr "%02i minutters opdeling"
-
-#: calendar/gui/e-itip-control.c:676
+#: calendar/gui/e-itip-control.c:706
 msgid "Yes. (Complex Recurrence)"
 msgstr "Ja. (Kompleks genindtræffelse)"
 
-#: calendar/gui/e-itip-control.c:688
+#: calendar/gui/e-itip-control.c:718
 msgid "Every day"
 msgstr "Hver dag"
 
-#: calendar/gui/e-itip-control.c:690
+#: calendar/gui/e-itip-control.c:720
 #, c-format
 msgid "Every %d days"
 msgstr "Hver %d. dag"
 
-#: calendar/gui/e-itip-control.c:696
+#: calendar/gui/e-itip-control.c:726
 msgid "Every week"
 msgstr "Hver uge"
 
-#: calendar/gui/e-itip-control.c:698
+#: calendar/gui/e-itip-control.c:728
 #, c-format
 msgid "Every %d weeks"
 msgstr "Hver %d. uge"
 
-#: calendar/gui/e-itip-control.c:701
+#: calendar/gui/e-itip-control.c:731
 msgid "Every week on "
 msgstr "Hver uge på "
 
-#: calendar/gui/e-itip-control.c:703
+#: calendar/gui/e-itip-control.c:733
 #, c-format
 msgid "Every %d weeks on "
 msgstr "Hver %d uge på "
 
-#: calendar/gui/e-itip-control.c:711
+#: calendar/gui/e-itip-control.c:741
 msgid " and "
 msgstr " og "
 
-#: calendar/gui/e-itip-control.c:718
+#: calendar/gui/e-itip-control.c:748
 #, c-format
 msgid "The %s day of "
 msgstr "Den %s. dag af "
 
-#: calendar/gui/e-itip-control.c:731
+#: calendar/gui/e-itip-control.c:761
 #, c-format
 msgid "The %s %s of "
 msgstr "Den %s %s af "
 
-#: calendar/gui/e-itip-control.c:736
+#: calendar/gui/e-itip-control.c:766
 msgid "every month"
 msgstr "hver månede"
 
-#: calendar/gui/e-itip-control.c:741
+#: calendar/gui/e-itip-control.c:771
 #, c-format
 msgid "every %d months"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:747
+#: calendar/gui/e-itip-control.c:777
 msgid "Every year"
 msgstr "Hver år"
 
-#: calendar/gui/e-itip-control.c:749
+#: calendar/gui/e-itip-control.c:779
 #, c-format
 msgid "Every %d years"
 msgstr "Hver %d. år"
 
-#: calendar/gui/e-itip-control.c:761
+#: calendar/gui/e-itip-control.c:791
 #, c-format
 msgid " a total of %d times"
 msgstr " i alt %d gange"
 
-#: calendar/gui/e-itip-control.c:769
+#: calendar/gui/e-itip-control.c:799
 msgid ", ending on "
 msgstr ", sluttende på "
 
-#: calendar/gui/e-itip-control.c:793
+#: calendar/gui/e-itip-control.c:823
 msgid "<b>Starts:</b> "
 msgstr "<b>Begynder:</b>"
 
-#: calendar/gui/e-itip-control.c:803
+#: calendar/gui/e-itip-control.c:833
 msgid "<b>Ends:</b> "
 msgstr "<b>Slutter:<b>"
 
-#: calendar/gui/e-itip-control.c:823
+#: calendar/gui/e-itip-control.c:853
 msgid "<b>Completed:</b> "
 msgstr "<b>Færdig:</b> "
 
-#: calendar/gui/e-itip-control.c:833
+#: calendar/gui/e-itip-control.c:863
 msgid "<b>Due:</b> "
 msgstr "<b>Udføres inden:</b> "
 
-#: calendar/gui/e-itip-control.c:870 calendar/gui/e-itip-control.c:923
+#: calendar/gui/e-itip-control.c:900 calendar/gui/e-itip-control.c:953
 msgid "iCalendar Information"
 msgstr "iCalendar-information"
 
 #. Title
-#: calendar/gui/e-itip-control.c:885
+#: calendar/gui/e-itip-control.c:915
 msgid "iCalendar Error"
 msgstr "iCalendar-fejl"
 
-#: calendar/gui/e-itip-control.c:954 calendar/gui/e-itip-control.c:970
-#: calendar/gui/e-itip-control.c:981 calendar/gui/e-itip-control.c:998
+#: calendar/gui/e-itip-control.c:984 calendar/gui/e-itip-control.c:1000
+#: calendar/gui/e-itip-control.c:1011 calendar/gui/e-itip-control.c:1028
 msgid "An unknown person"
 msgstr "en ukendt afsender"
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:1005
+#: calendar/gui/e-itip-control.c:1035
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
@@ -5621,333 +5585,339 @@ msgstr ""
 "<br>Kontrollér venligst følgende information og vælg så en handling fra "
 "menuen nedenfor."
 
-#: calendar/gui/e-itip-control.c:1020
+#: calendar/gui/e-itip-control.c:1050
 msgid "<i>None</i>"
 msgstr "<i>Ingen</i>"
 
-#: calendar/gui/e-itip-control.c:1031
+#: calendar/gui/e-itip-control.c:1061
 msgid "Location:"
 msgstr "Sted:"
 
-#. write status
-#: calendar/gui/e-itip-control.c:1045 calendar/gui/e-tasks.c:243
+#: calendar/gui/e-itip-control.c:1075
 msgid "Status:"
 msgstr "Status:"
 
-#: calendar/gui/e-itip-control.c:1050 calendar/gui/itip-utils.c:414
+#: calendar/gui/e-itip-control.c:1080 calendar/gui/e-meeting-model.c:286
+#: calendar/gui/e-meeting-model.c:309 calendar/gui/e-meeting-model.c:798
+#: calendar/gui/itip-utils.c:414
 msgid "Accepted"
 msgstr "Accepteret"
 
-#: calendar/gui/e-itip-control.c:1054 calendar/gui/itip-utils.c:417
+#: calendar/gui/e-itip-control.c:1084 calendar/gui/itip-utils.c:417
 msgid "Tentatively Accepted"
 msgstr "Preliminært godtaget"
 
-#: calendar/gui/e-itip-control.c:1058 calendar/gui/itip-utils.c:420
-#: calendar/gui/itip-utils.c:446
+#: calendar/gui/e-itip-control.c:1088 calendar/gui/e-meeting-model.c:288
+#: calendar/gui/e-meeting-model.c:311 calendar/gui/e-meeting-model.c:799
+#: calendar/gui/itip-utils.c:420 calendar/gui/itip-utils.c:446
 msgid "Declined"
 msgstr "Afslået"
 
-#: calendar/gui/e-itip-control.c:1117 calendar/gui/e-itip-control.c:1145
-#: calendar/gui/e-itip-control.c:1171 calendar/gui/e-itip-control.c:1184
-#: calendar/gui/e-itip-control.c:1197 calendar/gui/e-itip-control.c:1210
+#: calendar/gui/e-itip-control.c:1092 calendar/gui/e-itip-control.c:1300
+#: calendar/gui/e-meeting-model.c:222 calendar/gui/e-meeting-model.c:257
+#: calendar/gui/e-meeting-model.c:322 calendar/gui/e-meeting-model.c:756
+#: calendar/gui/e-meeting-model.c:772 camel/camel-gpg-context.c:1574
+#: camel/camel-gpg-context.c:1625 camel/camel-tcp-stream-openssl.c:634
+#: camel/providers/smtp/camel-smtp-transport.c:173
+#: camel/providers/smtp/camel-smtp-transport.c:228 mail/folder-browser.c:345
+#: mail/mail-display.c:953 widgets/misc/e-charset-picker.c:60
+msgid "Unknown"
+msgstr "Ukendt"
+
+#: calendar/gui/e-itip-control.c:1147 calendar/gui/e-itip-control.c:1175
+#: calendar/gui/e-itip-control.c:1201 calendar/gui/e-itip-control.c:1214
+#: calendar/gui/e-itip-control.c:1227 calendar/gui/e-itip-control.c:1240
 msgid "Choose an action:"
 msgstr "Vælg en handling"
 
-#: calendar/gui/e-itip-control.c:1118
+#: calendar/gui/e-itip-control.c:1148
 msgid "Update"
 msgstr "Opgaveopdatering"
 
-#: calendar/gui/e-itip-control.c:1119 calendar/gui/e-itip-control.c:1150
-#: calendar/gui/e-itip-control.c:1173 calendar/gui/e-itip-control.c:1186
-#: calendar/gui/e-itip-control.c:1199 calendar/gui/e-itip-control.c:1212
+#: calendar/gui/e-itip-control.c:1149 calendar/gui/e-itip-control.c:1180
+#: calendar/gui/e-itip-control.c:1203 calendar/gui/e-itip-control.c:1216
+#: calendar/gui/e-itip-control.c:1229 calendar/gui/e-itip-control.c:1242
 #: shell/e-shell.c:2067 widgets/misc/e-cell-date-edit.c:265
 msgid "OK"
 msgstr "O.k."
 
-#: calendar/gui/e-itip-control.c:1146
+#: calendar/gui/e-itip-control.c:1176
 msgid "Accept"
 msgstr "Godtaget"
 
-#: calendar/gui/e-itip-control.c:1147
+#: calendar/gui/e-itip-control.c:1177
 msgid "Tentatively accept"
 msgstr "Foreslået"
 
-#: calendar/gui/e-itip-control.c:1148
+#: calendar/gui/e-itip-control.c:1178
 msgid "Decline"
 msgstr "Afslået"
 
-#: calendar/gui/e-itip-control.c:1149
-#: calendar/gui/e-meeting-time-sel.etspec.h:8
-msgid "RSVP"
-msgstr "SU"
-
-#: calendar/gui/e-itip-control.c:1172
+#: calendar/gui/e-itip-control.c:1202
 msgid "Send Free/Busy Information"
 msgstr "Send oplysning om ledig/optaget"
 
-#: calendar/gui/e-itip-control.c:1185
+#: calendar/gui/e-itip-control.c:1215
 msgid "Update respondent status"
 msgstr "Opdaterer modpartens status"
 
-#: calendar/gui/e-itip-control.c:1198
+#: calendar/gui/e-itip-control.c:1228
 msgid "Send Latest Information"
 msgstr "Send nyeste oplysninger"
 
-#: calendar/gui/e-itip-control.c:1211 calendar/gui/itip-utils.c:434
-#: mail/mail-send-recv.c:388 mail/mail-send-recv.c:440
-#: shell/e-shell-startup-wizard.c:781 shell/evolution-shell-component.c:1185
-#: ui/evolution-mail-global.xml.h:1
+#: calendar/gui/e-itip-control.c:1241 calendar/gui/itip-utils.c:434
+#: mail/mail-send-recv.c:387 mail/mail-send-recv.c:444
+#: shell/evolution-shell-component.c:1182 ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Afbryd"
 
-#: calendar/gui/e-itip-control.c:1300
+#: calendar/gui/e-itip-control.c:1322
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "<b>%s</b> har offentliggjort mødeoplysning."
 
-#: calendar/gui/e-itip-control.c:1301
+#: calendar/gui/e-itip-control.c:1323
 msgid "Meeting Information"
 msgstr "Mødeinformation"
 
-#: calendar/gui/e-itip-control.c:1306
+#: calendar/gui/e-itip-control.c:1328
 #, c-format
 msgid "<b>%s</b> requests the presence of %s at a meeting."
 msgstr "<b>%s</b> ønsker at %s er til stede ved et møde."
 
-#: calendar/gui/e-itip-control.c:1308
+#: calendar/gui/e-itip-control.c:1330
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr "<b>%s</b> beder om din tilstedeværelse i et møde."
 
-#: calendar/gui/e-itip-control.c:1309
+#: calendar/gui/e-itip-control.c:1331
 msgid "Meeting Proposal"
 msgstr "Mødeforslag"
 
-#: calendar/gui/e-itip-control.c:1313
+#: calendar/gui/e-itip-control.c:1335
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr "<b>%s</b> ønsker at tilføje information til et eksisterende møde."
 
-#: calendar/gui/e-itip-control.c:1314
+#: calendar/gui/e-itip-control.c:1336
 msgid "Meeting Update"
 msgstr "Mødeopdatering"
 
-#: calendar/gui/e-itip-control.c:1318
+#: calendar/gui/e-itip-control.c:1340
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr "<b>%s</b> ønsker at modtage seneste mødeinformation."
 
-#: calendar/gui/e-itip-control.c:1319
+#: calendar/gui/e-itip-control.c:1341
 msgid "Meeting Update Request"
 msgstr "Anmodning om mødeopdatering"
 
-#: calendar/gui/e-itip-control.c:1326
+#: calendar/gui/e-itip-control.c:1348
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr "<b>%s</b> har svaret på en mødeforespørgsel."
 
-#: calendar/gui/e-itip-control.c:1327
+#: calendar/gui/e-itip-control.c:1349
 msgid "Meeting Reply"
 msgstr "Mødesvar"
 
-#: calendar/gui/e-itip-control.c:1334
+#: calendar/gui/e-itip-control.c:1356
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr "<b>%s</b> har aflyst et møde."
 
-#: calendar/gui/e-itip-control.c:1335
+#: calendar/gui/e-itip-control.c:1357
 msgid "Meeting Cancellation"
 msgstr "Mødeaflysing"
 
-#: calendar/gui/e-itip-control.c:1342 calendar/gui/e-itip-control.c:1409
-#: calendar/gui/e-itip-control.c:1444
+#: calendar/gui/e-itip-control.c:1364 calendar/gui/e-itip-control.c:1431
+#: calendar/gui/e-itip-control.c:1466
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr "<b>%s</b> har sendt en uforståelig besked."
 
-#: calendar/gui/e-itip-control.c:1343
+#: calendar/gui/e-itip-control.c:1365
 msgid "Bad Meeting Message"
 msgstr "Ugyldig mødebesked"
 
-#: calendar/gui/e-itip-control.c:1367
+#: calendar/gui/e-itip-control.c:1389
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr "<b>%s</b> har offentliggjort information om en opgave."
 
-#: calendar/gui/e-itip-control.c:1368
+#: calendar/gui/e-itip-control.c:1390
 msgid "Task Information"
 msgstr "Opgaveinformation"
 
-#: calendar/gui/e-itip-control.c:1373
+#: calendar/gui/e-itip-control.c:1395
 #, c-format
 msgid "<b>%s</b> requests %s to perform a task."
 msgstr "<b>%s</b> ønsker at %s udfører en opgave."
 
-#: calendar/gui/e-itip-control.c:1375
+#: calendar/gui/e-itip-control.c:1397
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr "<b>%s</b> anmoder om at du udfører en opgave."
 
-#: calendar/gui/e-itip-control.c:1376
+#: calendar/gui/e-itip-control.c:1398
 msgid "Task Proposal"
 msgstr "Forslag om opgave"
 
-#: calendar/gui/e-itip-control.c:1380
+#: calendar/gui/e-itip-control.c:1402
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task."
 msgstr "<b>%s</b> ønsker at tilføje information til en eksisterende opgave."
 
-#: calendar/gui/e-itip-control.c:1381
+#: calendar/gui/e-itip-control.c:1403
 msgid "Task Update"
 msgstr "Opgaveopdatering"
 
-#: calendar/gui/e-itip-control.c:1385
+#: calendar/gui/e-itip-control.c:1407
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr "<b>%s</b> ønsker at modtage den seneste information om opgaven."
 
-#: calendar/gui/e-itip-control.c:1386
+#: calendar/gui/e-itip-control.c:1408
 msgid "Task Update Request"
 msgstr "Anmodning om opgaveopdatering"
 
-#: calendar/gui/e-itip-control.c:1393
+#: calendar/gui/e-itip-control.c:1415
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr "<b>%s</b> har svaret på en opgavetildeling."
 
-#: calendar/gui/e-itip-control.c:1394
+#: calendar/gui/e-itip-control.c:1416
 msgid "Task Reply"
 msgstr "Svar på opgave"
 
-#: calendar/gui/e-itip-control.c:1401
+#: calendar/gui/e-itip-control.c:1423
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr "<b>%s</b> har aflyst en opgave."
 
-#: calendar/gui/e-itip-control.c:1402
+#: calendar/gui/e-itip-control.c:1424
 msgid "Task Cancellation"
 msgstr "Aflysing af opgave"
 
-#: calendar/gui/e-itip-control.c:1410
+#: calendar/gui/e-itip-control.c:1432
 msgid "Bad Task Message"
 msgstr "Ugyldig opgavebesked"
 
-#: calendar/gui/e-itip-control.c:1429
+#: calendar/gui/e-itip-control.c:1451
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr "<b>%s</b> har publiseret ledig/optaget-information."
 
-#: calendar/gui/e-itip-control.c:1430
+#: calendar/gui/e-itip-control.c:1452
 msgid "Free/Busy Information"
 msgstr "Ugyldig besked om ledig/optaget"
 
-#: calendar/gui/e-itip-control.c:1434
+#: calendar/gui/e-itip-control.c:1456
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr "<b>%s</b> anmoder om din oplysning om ledig/optaget."
 
-#: calendar/gui/e-itip-control.c:1435
+#: calendar/gui/e-itip-control.c:1457
 msgid "Free/Busy Request"
 msgstr "Forespørgsel om ledig/optaget"
 
-#: calendar/gui/e-itip-control.c:1439
+#: calendar/gui/e-itip-control.c:1461
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr ""
 "<b>%s</b> har svaret på en forespørgsel efter oplysning om ledig/optaget."
 
-#: calendar/gui/e-itip-control.c:1440
+#: calendar/gui/e-itip-control.c:1462
 msgid "Free/Busy Reply"
 msgstr "Svar på ledig/optaget"
 
-#: calendar/gui/e-itip-control.c:1445
+#: calendar/gui/e-itip-control.c:1467
 msgid "Bad Free/Busy Message"
 msgstr "Ugyldig besked om ledig/optaget"
 
-#: calendar/gui/e-itip-control.c:1521
+#: calendar/gui/e-itip-control.c:1543
 msgid "The message does not appear to be properly formed"
 msgstr "Meddelelsen ser ikke ud til at være korrekt udformet"
 
-#: calendar/gui/e-itip-control.c:1584
+#: calendar/gui/e-itip-control.c:1606
 msgid "The message contains only unsupported requests."
 msgstr "Denne besked indeholder forespørgsler, som ikke er understøttet."
 
-#: calendar/gui/e-itip-control.c:1615 calendar/gui/e-itip-control.c:1621
+#: calendar/gui/e-itip-control.c:1637 calendar/gui/e-itip-control.c:1643
 msgid "The attachment does not contain a valid calendar message"
 msgstr "Bilaget indeholder ikke en gyldig kalender-besked"
 
-#: calendar/gui/e-itip-control.c:1646
+#: calendar/gui/e-itip-control.c:1668
 msgid "The attachment has no viewable calendar items"
 msgstr "Bilaget har ingen synlige kalender-elementer"
 
-#: calendar/gui/e-itip-control.c:1887 calendar/gui/e-itip-control.c:1948
-#: calendar/gui/e-itip-control.c:1986
+#: calendar/gui/e-itip-control.c:1909 calendar/gui/e-itip-control.c:2001
 msgid "Object is invalid and cannot be updated\n"
 msgstr "Objektet er ugyldigt og kan ikke opdateres\n"
 
-#: calendar/gui/e-itip-control.c:1890 calendar/gui/e-itip-control.c:1989
+#: calendar/gui/e-itip-control.c:1912 calendar/gui/e-itip-control.c:2004
 msgid "There was an error on the CORBA system\n"
 msgstr "Der opstod en fejl i CORBA-systemet\n"
 
-#: calendar/gui/e-itip-control.c:1893 calendar/gui/e-itip-control.c:1992
+#: calendar/gui/e-itip-control.c:1915 calendar/gui/e-itip-control.c:2007
 msgid "Object could not be found\n"
 msgstr "Objektet kunne ikke findes\n"
 
-#: calendar/gui/e-itip-control.c:1896
+#: calendar/gui/e-itip-control.c:1918
 msgid "You do not have the right permissions to update the calendar\n"
 msgstr "Du har ikke rettigheder til at opdatere kalenderen\n"
 
-#: calendar/gui/e-itip-control.c:1899
+#: calendar/gui/e-itip-control.c:1921
 msgid "Update complete\n"
 msgstr "Opdatering fuldført\n"
 
-#: calendar/gui/e-itip-control.c:1902
+#: calendar/gui/e-itip-control.c:1924
 msgid "Calendar file could not be updated!\n"
 msgstr "Kalenderfilen kunne ikke opdateres!\n"
 
-#: calendar/gui/e-itip-control.c:1932 calendar/gui/e-itip-control.c:2004
+#: calendar/gui/e-itip-control.c:1953 calendar/gui/e-itip-control.c:2019
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 "Deltagerstatus kan ikke opdateres, fordi elementet ikke længere eksisterer"
 
-#: calendar/gui/e-itip-control.c:1958
+#: calendar/gui/e-itip-control.c:1974
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr ""
 "Dette svar er ikke fra en nuværende mødesdeltager. Tilføj som mødesdeltager?"
 
-#: calendar/gui/e-itip-control.c:1970
+#: calendar/gui/e-itip-control.c:1986
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr "Deltagerstatus kunne ikke opdateres pga. ugyldig status!\n"
 
-#: calendar/gui/e-itip-control.c:1995
+#: calendar/gui/e-itip-control.c:2010
 msgid "You don't have the right permissions to update the calendar\n"
 msgstr "Du har ikke rettigheder for at opdatere kalenderen\n"
 
-#: calendar/gui/e-itip-control.c:1998
+#: calendar/gui/e-itip-control.c:2013
 msgid "Attendee status updated\n"
 msgstr "Deltagerstatus opdateret\n"
 
-#: calendar/gui/e-itip-control.c:2001
+#: calendar/gui/e-itip-control.c:2016
 msgid "Attendee status could not be updated!\n"
 msgstr "Deltagerstatus kunne ikke opdateres!\n"
 
-#: calendar/gui/e-itip-control.c:2038
+#: calendar/gui/e-itip-control.c:2053
 msgid "Removal Complete"
 msgstr "Fjernelse fuldført"
 
-#: calendar/gui/e-itip-control.c:2070 calendar/gui/e-itip-control.c:2120
+#: calendar/gui/e-itip-control.c:2085 calendar/gui/e-itip-control.c:2135
 msgid "Item sent!\n"
 msgstr "Elementet sendt!\n"
 
-#: calendar/gui/e-itip-control.c:2072 calendar/gui/e-itip-control.c:2124
+#: calendar/gui/e-itip-control.c:2087 calendar/gui/e-itip-control.c:2139
 msgid "The item could not be sent!\n"
 msgstr "Elementet kunne ikke sendes!\n"
 
-#: calendar/gui/e-itip-control.c:2215
+#: calendar/gui/e-itip-control.c:2212
 msgid "Select Calendar Folder"
 msgstr "Vælg kalendermappe"
 
-#: calendar/gui/e-itip-control.c:2221
+#: calendar/gui/e-itip-control.c:2219
 msgid "Select Tasks Folder"
 msgstr "Vælg opgavefolder"
 
@@ -5988,167 +5958,185 @@ msgstr "slut-dato"
 msgid "date-start"
 msgstr "start-dato"
 
-#: calendar/gui/e-meeting-time-sel.c:392
+#: calendar/gui/e-meeting-model.c:79
+msgid "Chair Persons"
+msgstr "Formænd"
+
+#: calendar/gui/e-meeting-model.c:80 calendar/gui/e-meeting-model.c:1636
+msgid "Required Participants"
+msgstr "Obligatoriske deltagere"
+
+#: calendar/gui/e-meeting-model.c:81
+msgid "Optional Participants"
+msgstr "Valgfrie deltagere"
+
+#: calendar/gui/e-meeting-model.c:82
+msgid "Resources"
+msgstr "Ressourcer"
+
+#: calendar/gui/e-meeting-model.c:197 calendar/gui/e-meeting-model.c:214
+#: calendar/gui/e-meeting-model.c:530 calendar/gui/e-meeting-model.c:752
+msgid "Individual"
+msgstr "Individuel"
+
+#: calendar/gui/e-meeting-model.c:199 calendar/gui/e-meeting-model.c:216
+#: calendar/gui/e-meeting-model.c:753
+msgid "Group"
+msgstr "Gruppe"
+
+#: calendar/gui/e-meeting-model.c:201 calendar/gui/e-meeting-model.c:218
+#: calendar/gui/e-meeting-model.c:754
+msgid "Resource"
+msgstr "Ressourse"
+
+#: calendar/gui/e-meeting-model.c:203 calendar/gui/e-meeting-model.c:220
+#: calendar/gui/e-meeting-model.c:755
+msgid "Room"
+msgstr "Rum"
+
+#: calendar/gui/e-meeting-model.c:232 calendar/gui/e-meeting-model.c:249
+#: calendar/gui/e-meeting-model.c:768
+msgid "Chair"
+msgstr "Formand"
+
+#: calendar/gui/e-meeting-model.c:234 calendar/gui/e-meeting-model.c:251
+#: calendar/gui/e-meeting-model.c:532 calendar/gui/e-meeting-model.c:769
+msgid "Required Participant"
+msgstr "Obligatorisk deltager"
+
+#: calendar/gui/e-meeting-model.c:236 calendar/gui/e-meeting-model.c:253
+#: calendar/gui/e-meeting-model.c:770
+msgid "Optional Participant"
+msgstr "Valgfri deltager"
+
+#: calendar/gui/e-meeting-model.c:238 calendar/gui/e-meeting-model.c:255
+#: calendar/gui/e-meeting-model.c:771
+msgid "Non-Participant"
+msgstr "Ikke-deltager"
+
+#: calendar/gui/e-meeting-model.c:284 calendar/gui/e-meeting-model.c:307
+#: calendar/gui/e-meeting-model.c:540 calendar/gui/e-meeting-model.c:797
+msgid "Needs Action"
+msgstr "Behøver handling"
+
+#: calendar/gui/e-meeting-model.c:290 calendar/gui/e-meeting-model.c:313
+#: calendar/gui/e-meeting-model.c:800 calendar/gui/e-meeting-time-sel.c:405
 msgid "Tentative"
 msgstr "Foreslået"
 
-#: calendar/gui/e-meeting-time-sel.c:394 designs/OOA/ooa.glade.h:11
+#: calendar/gui/e-meeting-model.c:292 calendar/gui/e-meeting-model.c:315
+#: calendar/gui/e-meeting-model.c:801
+msgid "Delegated"
+msgstr "Delegeret"
+
+#: calendar/gui/e-meeting-model.c:296 calendar/gui/e-meeting-model.c:319
+msgid "In Process"
+msgstr "I gang"
+
+#. This is a strftime() format string %A = full weekday name,
+#. %B = full month name, %d = month day, %Y = full year.
+#: calendar/gui/e-meeting-time-sel-item.c:458
+#: calendar/gui/e-meeting-time-sel.c:2098
+msgid "%A, %B %d, %Y"
+msgstr "%A den %d %B, %Y"
+
+#. This is a strftime() format string %a = abbreviated weekday
+#. name, %m = month number, %d = month day, %Y = full year.
+#: calendar/gui/e-meeting-time-sel-item.c:462
+#: calendar/gui/e-meeting-time-sel.c:2131 e-util/e-time-utils.c:190
+#: e-util/e-time-utils.c:283 e-util/e-time-utils.c:371
+msgid "%a %m/%d/%Y"
+msgstr "%a %d/%m-%Y"
+
+#. This is a strftime() format string %m = month number,
+#. %d = month day, %Y = full year.
+#: calendar/gui/e-meeting-time-sel-item.c:466 e-util/e-time-utils.c:225
+#: e-util/e-time-utils.c:286 widgets/misc/e-dateedit.c:1582
+msgid "%m/%d/%Y"
+msgstr "%d/%m-%Y"
+
+#: calendar/gui/e-meeting-time-sel.c:407 designs/OOA/ooa.glade.h:11
 msgid "Out of Office"
 msgstr "Ude"
 
-#: calendar/gui/e-meeting-time-sel.c:395
+#: calendar/gui/e-meeting-time-sel.c:408
 msgid "No Information"
 msgstr "Ingen information"
 
-#: calendar/gui/e-meeting-time-sel.c:434
+#: calendar/gui/e-meeting-time-sel.c:447
 msgid "_Options"
 msgstr "_Tilvalg"
 
-#: calendar/gui/e-meeting-time-sel.c:451
+#: calendar/gui/e-meeting-time-sel.c:464
 msgid "Show _Only Working Hours"
 msgstr "Vis k_un arbejdstid"
 
-#: calendar/gui/e-meeting-time-sel.c:461
+#: calendar/gui/e-meeting-time-sel.c:474
 msgid "Show _Zoomed Out"
 msgstr "Vis _zoomet ud"
 
-#: calendar/gui/e-meeting-time-sel.c:476
+#: calendar/gui/e-meeting-time-sel.c:489
 msgid "_Update Free/Busy"
 msgstr "_Opdatér ledig/optaget"
 
-#: calendar/gui/e-meeting-time-sel.c:491
+#: calendar/gui/e-meeting-time-sel.c:504
 msgid "_<<"
 msgstr "_<<"
 
-#: calendar/gui/e-meeting-time-sel.c:509
+#: calendar/gui/e-meeting-time-sel.c:522
 msgid "_Autopick"
 msgstr "_Autovælg"
 
-#: calendar/gui/e-meeting-time-sel.c:524
+#: calendar/gui/e-meeting-time-sel.c:537
 msgid ">_>"
 msgstr "_>>"
 
-#: calendar/gui/e-meeting-time-sel.c:541
+#: calendar/gui/e-meeting-time-sel.c:554
 msgid "_All People and Resources"
 msgstr "_Alle mennesker og ressourser"
 
-#: calendar/gui/e-meeting-time-sel.c:550
+#: calendar/gui/e-meeting-time-sel.c:563
 msgid "All _People and One Resource"
 msgstr "Alle _mennesker og en ressourse"
 
-#: calendar/gui/e-meeting-time-sel.c:559
+#: calendar/gui/e-meeting-time-sel.c:572
 msgid "_Required People"
 msgstr "_Obligatoriske deltagere"
 
-#: calendar/gui/e-meeting-time-sel.c:568
+#: calendar/gui/e-meeting-time-sel.c:581
 msgid "Required People and _One Resource"
 msgstr "Obligatoriske deltagere _og en ressourse"
 
-#: calendar/gui/e-meeting-time-sel.c:587
+#: calendar/gui/e-meeting-time-sel.c:600
 msgid "Meeting _start time:"
 msgstr "Tid for mødets _start:"
 
-#: calendar/gui/e-meeting-time-sel.c:607
+#: calendar/gui/e-meeting-time-sel.c:620
 msgid "Meeting _end time:"
 msgstr "Tid for mødets slutning:"
 
-#. This is a strftime() format string %A = full weekday name,
-#. %B = full month name, %d = month day, %Y = full year.
-#: calendar/gui/e-meeting-time-sel.c:2054
-#: calendar/gui/e-meeting-time-sel-item.c:452
-msgid "%A, %B %d, %Y"
-msgstr "%A den %d %B, %Y"
-
-#. This is a strftime() format string %a = abbreviated weekday name,
-#. %m = month number, %d = month day, %Y = full year.
-#: calendar/gui/e-meeting-time-sel.c:2087
-#: calendar/gui/e-meeting-time-sel-item.c:456 e-util/e-time-utils.c:203
-#: e-util/e-time-utils.c:296 e-util/e-time-utils.c:384
-msgid "%a %m/%d/%Y"
-msgstr "%a %d/%m-%Y"
-
-#: calendar/gui/e-meeting-time-sel.etspec.h:1
-msgid "Attendee"
-msgstr "Deltager"
-
-#: calendar/gui/e-meeting-time-sel.etspec.h:2
-msgid "Click here to add an attendee"
-msgstr "Klik her for at tilføje en deltager"
-
-#: calendar/gui/e-meeting-time-sel.etspec.h:3
-msgid "Common Name"
-msgstr "Normalt navn"
-
-#: calendar/gui/e-meeting-time-sel.etspec.h:4
-msgid "Delegated From"
-msgstr "Delegeret fra"
-
-#: calendar/gui/e-meeting-time-sel.etspec.h:5
-msgid "Delegated To"
-msgstr "Delegeret til"
-
-#: calendar/gui/e-meeting-time-sel.etspec.h:6
-msgid "Language"
-msgstr "Sprog"
-
-#: calendar/gui/e-meeting-time-sel.etspec.h:7
-msgid "Member"
-msgstr "Medlem"
-
-#. This is a strftime() format string %m = month number,
-#. %d = month day, %Y = full year.
-#: calendar/gui/e-meeting-time-sel-item.c:460 e-util/e-time-utils.c:238
-#: e-util/e-time-utils.c:299 widgets/misc/e-dateedit.c:1607
-msgid "%m/%d/%Y"
-msgstr "%d/%m-%Y"
-
-#: calendar/gui/e-tasks.c:151
-msgid "invalid time"
-msgstr "Ugyldig tidsangivelse"
-
-#: calendar/gui/e-tasks.c:221
-#, fuzzy
-msgid "Start Date:"
-msgstr "Sta_rt dato:"
-
-#: calendar/gui/e-tasks.c:237
-#, fuzzy
-msgid "Due Date:"
-msgstr "Fær_dig-dato:"
-
-#. write priority
-#: calendar/gui/e-tasks.c:265
-#, fuzzy
-msgid "Priority:"
-msgstr "_Prioritet:"
-
-#. URL
-#: calendar/gui/e-tasks.c:321
-#, fuzzy
-msgid "Web Page:"
-msgstr "Side"
-
-#: calendar/gui/e-tasks.c:702
+#: calendar/gui/e-tasks.c:360 calendar/gui/gnome-cal.c:2006
+#: calendar/gui/gnome-cal.c:2017
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Åbner lager %s"
 
-#: calendar/gui/e-tasks.c:731 calendar/gui/tasks-control.c:201
+#: calendar/gui/e-tasks.c:389 calendar/gui/tasks-control.c:201
 #, c-format
 msgid "Could not load the tasks in `%s'"
 msgstr "Kunne ikke indlæse opgaverne i `%s'"
 
-#: calendar/gui/e-tasks.c:746
+#: calendar/gui/e-tasks.c:404
 #, c-format
 msgid "The method required to load `%s' is not supported"
 msgstr "Den nødvendige metode til indlæsning af `%s' er ikke understøttet"
 
-#: calendar/gui/e-tasks.c:760 calendar/gui/gnome-cal.c:1730
+#: calendar/gui/e-tasks.c:418 calendar/gui/gnome-cal.c:1509
 #, c-format
 msgid "You don't have permission to open the folder in `%s'"
 msgstr "Du har ikke rettigheder til at åbne mappen i \"%s\""
 
-#: calendar/gui/e-tasks.c:828 calendar/gui/gnome-cal.c:1944
+#: calendar/gui/e-tasks.c:486 calendar/gui/gnome-cal.c:1728
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -6157,110 +6145,68 @@ msgstr ""
 "Fejl ved %s:\n"
 " %s"
 
-#: calendar/gui/e-tasks.c:899
+#: calendar/gui/e-tasks.c:557
 msgid "Completing tasks..."
 msgstr "Færdiggør opgaver..."
 
-#: calendar/gui/e-tasks.c:922
+#: calendar/gui/e-tasks.c:580
 msgid "Deleting selected objects..."
 msgstr "Fjerner markerede objekter..."
 
-#: calendar/gui/e-tasks.c:1017
+#: calendar/gui/e-tasks.c:675
 msgid "Expunging"
 msgstr "Udrenser"
 
-#: calendar/gui/gnome-cal.c:1702
+#: calendar/gui/e-week-view.c:3581
+msgid "New _Appointment..."
+msgstr "Ny _aftale..."
+
+#: calendar/gui/gnome-cal.c:1481
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr "Kunne ikke åbne mappen i `%s'"
 
-#: calendar/gui/gnome-cal.c:1716
+#: calendar/gui/gnome-cal.c:1495
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr "Den nødvendige metode til åbning af `%s' er ikke understøttet"
 
-#: calendar/gui/gnome-cal.c:1772
+#: calendar/gui/gnome-cal.c:1556
 #, c-format
 msgid "Adding alarms for %s"
 msgstr "Tilføjer alarm for %s"
 
-#: calendar/gui/gnome-cal.c:1964
+#: calendar/gui/gnome-cal.c:1748
 #, c-format
 msgid ""
-"The task backend for\n"
+"The calendar backend for\n"
 "%s\n"
 " has crashed. You will have to restart Evolution in order to use it again"
 msgstr ""
-"Opgavebagenden for\n"
+"Kalenderbagenden for\n"
 "%s\n"
 " er gået ned. Du skal genstarte Evolution for at kunne bruge den igen"
 
-#: calendar/gui/gnome-cal.c:1970
+#: calendar/gui/gnome-cal.c:1757
 #, c-format
 msgid ""
-"The calendar backend for\n"
+"The task backend for\n"
 "%s\n"
 " has crashed. You will have to restart Evolution in order to use it again"
 msgstr ""
-"Kalenderbagenden for\n"
+"Opgavebagenden for\n"
 "%s\n"
 " er gået ned. Du skal genstarte Evolution for at kunne bruge den igen"
 
-#: calendar/gui/gnome-cal.c:2176
+#: calendar/gui/gnome-cal.c:1988
 #, c-format
 msgid "Opening calendar at %s"
 msgstr "Åbner kalender ved %s"
 
-#: calendar/gui/gnome-cal.c:2197
+#: calendar/gui/gnome-cal.c:2028
 msgid "Opening default tasks folder"
 msgstr "Åbner standardopgavemappen"
 
-#: calendar/gui/gnome-cal.c:3094
-#, fuzzy, c-format
-msgid "Purging event %s"
-msgstr "Pinger %s"
-
-#: calendar/gui/gnome-cal.c:3178
-#, fuzzy
-msgid "Purging"
-msgstr "Turin"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-msgid "Calendar and Tasks"
-msgstr "Kalender og opgaver"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-msgid "Configure your timezone, Calendar and Task List here "
-msgstr "Konfigurér din tidszone, kalender og opgaveliste her "
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
-msgid "Evolution Calendar and Tasks"
-msgstr "Evolution kalender og opgaver"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
-msgid "Evolution Calendar and Tasks component"
-msgstr "Evolution kalender-og-opgaver-komponent"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
-msgid "Evolution Calendar configuration control"
-msgstr "Evolution kalender-opsætnings-styringselement"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
-msgid "Evolution Calendar scheduling message viewer"
-msgstr "Evolution kalendertilrettelægnings-beskedvisning"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
-msgid "Evolution Calendar viewer"
-msgstr "Evolution kalendervisning"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
-msgid "Evolution Calendar/Task editor"
-msgstr "Evolution kalender/opgave-redigering"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
-msgid "Evolution Tasks viewer"
-msgstr "Evolution opgavevisning"
-
 #: calendar/gui/goto-dialog.glade.h:1
 msgid "April"
 msgstr "April"
@@ -6367,7 +6313,7 @@ msgstr "Ledig/optaget-information (%s til %s)"
 msgid "iCalendar information"
 msgstr "iCalendar-information"
 
-#: calendar/gui/itip-utils.c:668
+#: calendar/gui/itip-utils.c:667
 msgid "You must be an attendee of the event."
 msgstr "Du må være en deltager i arrangementet"
 
@@ -6400,81 +6346,82 @@ msgid "Sa"
 msgstr "Lør"
 
 #. Day
-#: calendar/gui/print.c:1882
+#: calendar/gui/print.c:1875
 msgid "Selected day (%a %b %d %Y)"
 msgstr "Valgt dag (%a %d %b %Y)"
 
-#: calendar/gui/print.c:1907 calendar/gui/print.c:1911
+#: calendar/gui/print.c:1900 calendar/gui/print.c:1904
 msgid "%a %b %d"
 msgstr "%a %d %b"
 
-#: calendar/gui/print.c:1908
+#: calendar/gui/print.c:1901
 msgid "%a %d %Y"
 msgstr "%a %d %Y"
 
-#: calendar/gui/print.c:1912 calendar/gui/print.c:1914
-#: calendar/gui/print.c:1915
+#: calendar/gui/print.c:1905 calendar/gui/print.c:1907
+#: calendar/gui/print.c:1908
 msgid "%a %b %d %Y"
 msgstr "%a %d %b %Y"
 
-#: calendar/gui/print.c:1919
+#: calendar/gui/print.c:1912
 #, c-format
 msgid "Selected week (%s - %s)"
 msgstr "Valgt uge (%s - %s)"
 
 #. Month
-#: calendar/gui/print.c:1927
+#: calendar/gui/print.c:1920
 msgid "Selected month (%b %Y)"
 msgstr "Valgt måned (%b %Y)"
 
 #. Year
-#: calendar/gui/print.c:1934
+#: calendar/gui/print.c:1927
 msgid "Selected year (%Y)"
 msgstr "Valgt år (%Y)"
 
-#: calendar/gui/print.c:2262
+#: calendar/gui/print.c:2255
 msgid "Task"
 msgstr "Opgave"
 
-#: calendar/gui/print.c:2321
+#: calendar/gui/print.c:2314
 #, c-format
 msgid "Status: %s"
 msgstr "Status: %s"
 
-#: calendar/gui/print.c:2338
+#: calendar/gui/print.c:2331
 #, c-format
 msgid "Priority: %s"
 msgstr "Prioritet: %s"
 
-#: calendar/gui/print.c:2350
+#: calendar/gui/print.c:2343
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "Færdige procenter: %i"
 
-#: calendar/gui/print.c:2362
+#: calendar/gui/print.c:2355
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: calendar/gui/print.c:2376
+#: calendar/gui/print.c:2369
 #, c-format
 msgid "Categories: %s"
 msgstr "Kategorier: %s"
 
-#: calendar/gui/print.c:2387
+#: calendar/gui/print.c:2380
 msgid "Contacts: "
 msgstr "Kontakter: "
 
-#: calendar/gui/print.c:2525 calendar/gui/print.c:2611
-#: calendar/gui/tasks-control.c:564 my-evolution/e-summary.c:649
+#: calendar/gui/print.c:2518 calendar/gui/print.c:2604
+#: calendar/gui/tasks-control.c:581 mail/mail-callbacks.c:2948
+#: my-evolution/e-summary.c:649
 msgid "Print Preview"
 msgstr "Forhåndsvisning af udskrift"
 
-#: calendar/gui/print.c:2559
+#: calendar/gui/print.c:2552
 msgid "Print Item"
 msgstr "Udskriv element"
 
-#: calendar/gui/print.c:2632
+#: calendar/gui/print.c:2625
 msgid "Print Setup"
 msgstr "Printeropsætning"
 
@@ -6482,7 +6429,7 @@ msgstr "Printeropsætning"
 msgid "The URI of the tasks folder to display"
 msgstr "URIen til opgavemappen, der skal vises"
 
-#: calendar/gui/tasks-control.c:448
+#: calendar/gui/tasks-control.c:465
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
 "continue, you will not be able to recover these tasks.\n"
@@ -6494,11 +6441,11 @@ msgstr ""
 "\n"
 "Vil du virkelig fjerne disse opgaver?"
 
-#: calendar/gui/tasks-control.c:451
+#: calendar/gui/tasks-control.c:468
 msgid "Do not ask me again."
 msgstr "Spørg mig ikke igen."
 
-#: calendar/gui/tasks-control.c:593
+#: calendar/gui/tasks-control.c:610
 msgid "Print Tasks"
 msgstr "Udskriv opgaver"
 
@@ -8192,27 +8139,27 @@ msgstr "Stillehavet/Wallis"
 msgid "Pacific/Yap"
 msgstr "Stillehavet/Yap"
 
-#: camel/camel-cipher-context.c:167
+#: camel/camel-cipher-context.c:178
 msgid "Signing is not supported by this cipher"
 msgstr "Signering er ikke understøttet af dette cipher"
 
-#: camel/camel-cipher-context.c:207
+#: camel/camel-cipher-context.c:218
 msgid "Verifying is not supported by this cipher"
 msgstr "Verificering er ikke understøttet af dette cipher"
 
-#: camel/camel-cipher-context.c:251
+#: camel/camel-cipher-context.c:262
 msgid "Encryption is not supported by this cipher"
 msgstr "Kryptering er ikke understøttet af dette cipher"
 
-#: camel/camel-cipher-context.c:293
+#: camel/camel-cipher-context.c:304
 msgid "Decryption is not supported by this cipher"
 msgstr "Dekryptering er ikke understøttet af dette cipher"
 
-#: camel/camel-cipher-context.c:331
+#: camel/camel-cipher-context.c:342
 msgid "You may not import keys with this cipher"
 msgstr "Du kan ikke importere nøgler med dette cipher"
 
-#: camel/camel-cipher-context.c:363
+#: camel/camel-cipher-context.c:374
 msgid "You may not export keys with this cipher"
 msgstr "Du kan ikke eksportere nøgler med dette cipher"
 
@@ -8251,11 +8198,7 @@ msgstr ""
 msgid "Resynchronizing with server"
 msgstr "Resynkroniserer med server"
 
-#: camel/camel-disco-folder.c:90
-msgid "Downloading new messages for offline mode"
-msgstr ""
-
-#: camel/camel-disco-folder.c:351
+#: camel/camel-disco-folder.c:278
 #, c-format
 msgid "Preparing folder '%s' for offline"
 msgstr "Forbereder mappen \"%s\" til afkoblet tilstand"
@@ -8276,57 +8219,57 @@ msgstr "Mislykkedes med at oprette rør til \"%s\": %s"
 msgid "Failed to create create child process '%s': %s"
 msgstr "Mislykkedes med at oprette barneprocessen \"%s\": %s"
 
-#: camel/camel-filter-driver.c:759
+#: camel/camel-filter-driver.c:744
 #, c-format
 msgid "Invalid message stream received from %s: %s"
 msgstr "Ugyldig beskedstrøm modtaget fra %s: %s"
 
-#: camel/camel-filter-driver.c:940 camel/camel-filter-driver.c:949
+#: camel/camel-filter-driver.c:923 camel/camel-filter-driver.c:932
 msgid "Syncing folders"
 msgstr "Synkroniserer mapper"
 
-#: camel/camel-filter-driver.c:1038 camel/camel-filter-driver.c:1411
+#: camel/camel-filter-driver.c:1021 camel/camel-filter-driver.c:1394
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Fejl under læsning af filter: %s: %s"
 
-#: camel/camel-filter-driver.c:1047 camel/camel-filter-driver.c:1417
+#: camel/camel-filter-driver.c:1030 camel/camel-filter-driver.c:1400
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Fejl under kørsel af filter: %s: %s"
 
-#: camel/camel-filter-driver.c:1114
+#: camel/camel-filter-driver.c:1097
 msgid "Unable to open spool folder"
 msgstr "Kunne ikke åbne spool-mappen"
 
-#: camel/camel-filter-driver.c:1123
+#: camel/camel-filter-driver.c:1106
 msgid "Unable to process spool folder"
 msgstr "Kan ikke behandle spool-mappen"
 
-#: camel/camel-filter-driver.c:1138
+#: camel/camel-filter-driver.c:1121
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "Henter besked %d (%d%%)"
 
-#: camel/camel-filter-driver.c:1142
+#: camel/camel-filter-driver.c:1125
 msgid "Cannot open message"
 msgstr "Kan ikke åbne besked"
 
-#: camel/camel-filter-driver.c:1143 camel/camel-filter-driver.c:1155
+#: camel/camel-filter-driver.c:1126 camel/camel-filter-driver.c:1138
 #, c-format
 msgid "Failed on message %d"
 msgstr "Mislykkedes på besked %d"
 
-#: camel/camel-filter-driver.c:1169 camel/camel-filter-driver.c:1263
+#: camel/camel-filter-driver.c:1152 camel/camel-filter-driver.c:1246
 msgid "Syncing folder"
 msgstr "Synkroniserer mappe"
 
-#: camel/camel-filter-driver.c:1230
+#: camel/camel-filter-driver.c:1213
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "Henter besked %d af %d"
 
-#: camel/camel-filter-driver.c:1245
+#: camel/camel-filter-driver.c:1228
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "Mislykkedes på besked %d af %d"
@@ -8348,35 +8291,7 @@ msgstr "Ugyldige argumenter til (user-tag)"
 msgid "Error executing filter search: %s: %s"
 msgstr "Fejl under udførelse af filtersøgning: %s: %s"
 
-#: camel/camel-folder.c:585
-#, c-format
-msgid "Unsupported operation: append message: for %s"
-msgstr "Uunderstøttet operation: tillæg besked: for %s"
-
-#: camel/camel-folder.c:1163
-#, c-format
-msgid "Unsupported operation: search by expression: for %s"
-msgstr "Uunderstøttet operation: søg efter udtryk: efter %s"
-
-#: camel/camel-folder.c:1203
-#, c-format
-msgid "Unsupported operation: search by uids: for %s"
-msgstr "Uunderstøttet operation: søg efter uid'er: efter %s"
-
-#: camel/camel-folder.c:1321
-msgid "Moving messages"
-msgstr "Flytter beskeder"
-
-#: camel/camel-folder.c:1321
-msgid "Copying messages"
-msgstr "Kopierer meddelelser"
-
-#: camel/camel-folder.c:1571
-#, fuzzy
-msgid "Filtering new message(s)"
-msgstr "Henter %d beskeder"
-
-#: camel/camel-folder-search.c:348
+#: camel/camel-folder-search.c:346
 #, c-format
 msgid ""
 "Cannot parse search expression: %s:\n"
@@ -8385,7 +8300,7 @@ msgstr ""
 "Kan ikke tolke søgeudtrykket: %s:\n"
 "%s"
 
-#: camel/camel-folder-search.c:358
+#: camel/camel-folder-search.c:356
 #, c-format
 msgid ""
 "Error executing search expression: %s:\n"
@@ -8394,15 +8309,38 @@ msgstr ""
 "Fejl under kørsel af søgeudtrykket %s:\n"
 "%s"
 
-#: camel/camel-folder-search.c:569 camel/camel-folder-search.c:598
+#: camel/camel-folder-search.c:573 camel/camel-folder-search.c:601
 msgid "(match-all) requires a single bool result"
 msgstr "(match-all) kræver et enkelt boolsk resultat"
 
-#: camel/camel-folder-search.c:650
+#: camel/camel-folder-search.c:653
 #, c-format
 msgid "Performing query on unknown header: %s"
 msgstr "Udfører forespørgsel på ukendt header: %s"
 
+#: camel/camel-folder.c:583
+#, c-format
+msgid "Unsupported operation: append message: for %s"
+msgstr "Uunderstøttet operation: tillæg besked: for %s"
+
+#: camel/camel-folder.c:1161
+#, c-format
+msgid "Unsupported operation: search by expression: for %s"
+msgstr "Uunderstøttet operation: søg efter udtryk: efter %s"
+
+#: camel/camel-folder.c:1201
+#, c-format
+msgid "Unsupported operation: search by uids: for %s"
+msgstr "Uunderstøttet operation: søg efter uid'er: efter %s"
+
+#: camel/camel-folder.c:1319
+msgid "Moving messages"
+msgstr "Flytter beskeder"
+
+#: camel/camel-folder.c:1319
+msgid "Copying messages"
+msgstr "Kopierer meddelelser"
+
 #: camel/camel-gpg-context.c:762
 #, c-format
 msgid ""
@@ -8433,7 +8371,7 @@ msgstr ""
 
 #: camel/camel-gpg-context.c:821 camel/camel-gpg-context.c:1297
 #: camel/camel-gpg-context.c:1403 camel/camel-gpg-context.c:1473
-#: camel/camel-gpg-context.c:1529 mail/mail-send-recv.c:574
+#: camel/camel-gpg-context.c:1529 mail/mail-send-recv.c:577
 msgid "Cancelled."
 msgstr "Afbrudt."
 
@@ -8489,6 +8427,26 @@ msgid "Cannot verify message signature: could not create temp file: %s"
 msgstr ""
 "Kan ikke verificere meddelelsesignatur: kunne ikke oprette temporær fil: %s"
 
+#: camel/camel-lock-client.c:111
+#, c-format
+msgid "Cannot build locking helper pipe: %s"
+msgstr "Kunne ikke bygge kanal for låsehjælper: %s"
+
+#: camel/camel-lock-client.c:124
+#, c-format
+msgid "Cannot fork locking helper: %s"
+msgstr "Kan ikke forgrene låsehjælper: %s"
+
+#: camel/camel-lock-client.c:202 camel/camel-lock-client.c:225
+#, c-format
+msgid "Could not lock '%s': protocol error with lock-helper"
+msgstr "Kunne ikke låse '%s': protokolfejl med låsehjælper"
+
+#: camel/camel-lock-client.c:215
+#, c-format
+msgid "Could not lock '%s'"
+msgstr "Kunne ikke låse '%s'"
+
 #: camel/camel-lock.c:92 camel/camel-lock.c:113
 #, c-format
 msgid "Could not create lock file for %s: %s"
@@ -8509,26 +8467,6 @@ msgstr "Fejl under låsning ved brug af fcntl(2): %s"
 msgid "Failed to get lock using flock(2): %s"
 msgstr "Fejl under låsning ved brug af flock(2): %s"
 
-#: camel/camel-lock-client.c:100
-#, c-format
-msgid "Cannot build locking helper pipe: %s"
-msgstr "Kunne ikke bygge kanal for låsehjælper: %s"
-
-#: camel/camel-lock-client.c:113
-#, c-format
-msgid "Cannot fork locking helper: %s"
-msgstr "Kan ikke forgrene låsehjælper: %s"
-
-#: camel/camel-lock-client.c:191 camel/camel-lock-client.c:214
-#, c-format
-msgid "Could not lock '%s': protocol error with lock-helper"
-msgstr "Kunne ikke låse '%s': protokolfejl med låsehjælper"
-
-#: camel/camel-lock-client.c:204
-#, c-format
-msgid "Could not lock '%s'"
-msgstr "Kunne ikke låse '%s'"
-
 #: camel/camel-movemail.c:107
 #, c-format
 msgid "Could not check mail file %s: %s"
@@ -8595,11 +8533,11 @@ msgstr "Kunne ikke dekryptere MIME-del: ugyldig struktur"
 msgid "Failed to decrypt MIME part: parse error"
 msgstr "Kunne ikke dekryptere MIME-del: tolkningsfejl"
 
-#: camel/camel-multipart-signed.c:646
+#: camel/camel-multipart-signed.c:644
 msgid "This is a digitally signed message part"
 msgstr "Dette er en digitalt underskrevet brevdel"
 
-#: camel/camel-multipart-signed.c:700
+#: camel/camel-multipart-signed.c:698
 msgid "parse error"
 msgstr "tolkningsfejl"
 
@@ -8670,11 +8608,11 @@ msgstr ""
 "Dette alternativ kobler til serveren med brug af CRAM-MD5-adgangskode, hvis "
 "serveren understøtter det."
 
-#: camel/camel-sasl-digest-md5.c:48
+#: camel/camel-sasl-digest-md5.c:46
 msgid "DIGEST-MD5"
 msgstr "DIGEST-MD5"
 
-#: camel/camel-sasl-digest-md5.c:50
+#: camel/camel-sasl-digest-md5.c:48
 msgid ""
 "This option will connect to the server using a secure DIGEST-MD5 password, "
 "if the server supports it."
@@ -8770,7 +8708,7 @@ msgstr ""
 #: camel/camel-sasl-gssapi.c:189 camel/camel-sasl-gssapi.c:238
 #: camel/camel-sasl-gssapi.c:274 camel/camel-sasl-gssapi.c:289
 #: camel/camel-sasl-kerberos4.c:219
-#: camel/providers/imap/camel-imap-store.c:1207
+#: camel/providers/imap/camel-imap-store.c:1052
 msgid "Bad authentication response from server."
 msgstr "Ugyldigt svar på autenticering fra server."
 
@@ -8828,23 +8766,23 @@ msgstr ""
 msgid "PLAIN"
 msgstr "SIMPEL"
 
-#: camel/camel-sasl-popb4smtp.c:36
+#: camel/camel-sasl-popb4smtp.c:34
 msgid "POP before SMTP"
 msgstr "POP før SMTP"
 
-#: camel/camel-sasl-popb4smtp.c:38
+#: camel/camel-sasl-popb4smtp.c:36
 msgid "This option will authorise a POP connection before attempting SMTP"
 msgstr "Dette alternativ vil godkende en POP-forbindelse før forsøg på SMTP"
 
-#: camel/camel-sasl-popb4smtp.c:103
+#: camel/camel-sasl-popb4smtp.c:107
 msgid "POP Source URI"
 msgstr "Kilde-URI for POP"
 
-#: camel/camel-sasl-popb4smtp.c:107
+#: camel/camel-sasl-popb4smtp.c:111
 msgid "POP Before SMTP auth using an unknown transport"
 msgstr "POP før SMTP-godkendelse via en ukendt transport"
 
-#: camel/camel-sasl-popb4smtp.c:112
+#: camel/camel-sasl-popb4smtp.c:116
 msgid "POP Before SMTP auth using a non-pop source"
 msgstr "POP før SMTP-godkendelse via ikke-pop kilde"
 
@@ -8853,55 +8791,55 @@ msgstr "POP før SMTP-godkendelse via ikke-pop kilde"
 msgid "Regular expression compilation failed: %s: %s"
 msgstr "Oversættelse af regulært udtryk mislykkedes: %s: %s"
 
-#: camel/camel-service.c:277
+#: camel/camel-service.c:282
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr "URL '%s' skal indeholde et brugernavn"
 
-#: camel/camel-service.c:285
+#: camel/camel-service.c:290
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr "URL '%s' skal indeholde et værtsnavn"
 
-#: camel/camel-service.c:293
+#: camel/camel-service.c:298
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr "URL '%s' skal indeholde en sti"
 
-#: camel/camel-service.c:738
+#: camel/camel-service.c:750
 #, c-format
 msgid "Resolving: %s"
 msgstr "Finder: \"%s\""
 
-#: camel/camel-service.c:769 camel/camel-service.c:893
+#: camel/camel-service.c:783 camel/camel-service.c:915
 #, c-format
 msgid "Failure in name lookup: %s"
 msgstr "Fejl i navneopslag: %s"
 
-#: camel/camel-service.c:790 camel/camel-service.c:914
+#: camel/camel-service.c:804
 #, fuzzy, c-format
 msgid "Host lookup failed: cannot create thread: %s"
 msgstr "Opslag af værtsnavn mislykkedes: ukendt årsag"
 
-#: camel/camel-service.c:803
+#: camel/camel-service.c:818
 #, c-format
 msgid "Host lookup failed: %s: host not found"
 msgstr "Værtsopslag mislykkedes: %s: vært ikke fundet"
 
-#: camel/camel-service.c:806
+#: camel/camel-service.c:821
 #, c-format
 msgid "Host lookup failed: %s: unknown reason"
 msgstr "Værtsopslag mislykkedes: %s: ukendt årsag"
 
-#: camel/camel-service.c:860
+#: camel/camel-service.c:880
 msgid "Resolving address"
 msgstr "Slår adresse op"
 
-#: camel/camel-service.c:929
+#: camel/camel-service.c:949
 msgid "Host lookup failed: host not found"
 msgstr "Opslag af værtsnavn mislykkedes: vært kunne ikke findes"
 
-#: camel/camel-service.c:932
+#: camel/camel-service.c:952
 msgid "Host lookup failed: unknown reason"
 msgstr "Opslag af værtsnavn mislykkedes: ukendt årsag"
 
@@ -8913,12 +8851,12 @@ msgstr "E-post-udbyder for virtuelle mapper"
 msgid "For reading mail as a query of another set of folders"
 msgstr "For læsning af e-post som en forespørgsel på et andet sæt mapper"
 
-#: camel/camel-session.c:350 camel/camel-session.c:400
+#: camel/camel-session.c:355 camel/camel-session.c:405
 #, c-format
 msgid "No provider available for protocol `%s'"
 msgstr "Ingen udbyder tilgængelig for protokol `%s'"
 
-#: camel/camel-session.c:523
+#: camel/camel-session.c:528
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -8964,131 +8902,131 @@ msgstr "Kunne ikke afkode besked."
 msgid "Failed to verify certificates."
 msgstr "Fejl under verificering af certifikater."
 
-#: camel/camel-store.c:212
+#: camel/camel-store.c:215
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr "Kan ikke finde mappe: Ugyldig operation på dette lager"
 
-#: camel/camel-store.c:266
+#: camel/camel-store.c:269
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "Kan ikke oprette mappe: Ugyldig operation på dette lager"
 
-#: camel/camel-tcp-stream-openssl.c:568
+#: camel/camel-tcp-stream-openssl.c:571
 msgid "Unable to get issuer's certificate"
 msgstr "Kan ikke hente udstederens certifikat."
 
-#: camel/camel-tcp-stream-openssl.c:570
+#: camel/camel-tcp-stream-openssl.c:573
 msgid "Unable to get Certificate Revocation List"
 msgstr "Kan ikke hente certifikattilbagetrækningsliste"
 
-#: camel/camel-tcp-stream-openssl.c:572
+#: camel/camel-tcp-stream-openssl.c:575
 msgid "Unable to decrypt certificate signature"
 msgstr "Kan ikke dekryptere certifikatsignatur"
 
-#: camel/camel-tcp-stream-openssl.c:574
+#: camel/camel-tcp-stream-openssl.c:577
 msgid "Unable to decrypt Certificate Revocation List signature"
 msgstr "Kan ikke dekryptera signatur for certifikattilbagetrækningsliste"
 
-#: camel/camel-tcp-stream-openssl.c:576
+#: camel/camel-tcp-stream-openssl.c:579
 msgid "Unable to decode issuer's public key"
 msgstr "Kan ikke afkode udsteders offentlige nøgle"
 
-#: camel/camel-tcp-stream-openssl.c:578
+#: camel/camel-tcp-stream-openssl.c:581
 msgid "Certificate signature failure"
 msgstr "Certifikatsignaturfejl"
 
-#: camel/camel-tcp-stream-openssl.c:580
+#: camel/camel-tcp-stream-openssl.c:583
 msgid "Certificate Revocation List signature failure"
 msgstr "Signaturfejl i certifikattilbagetrækningslisten"
 
-#: camel/camel-tcp-stream-openssl.c:582
+#: camel/camel-tcp-stream-openssl.c:585
 msgid "Certificate not yet valid"
 msgstr "Certifikatet er ikke gyldigt endnu"
 
-#: camel/camel-tcp-stream-openssl.c:584
+#: camel/camel-tcp-stream-openssl.c:587
 msgid "Certificate has expired"
 msgstr "Certifikatet er udløbet"
 
-#: camel/camel-tcp-stream-openssl.c:586
+#: camel/camel-tcp-stream-openssl.c:589
 msgid "CRL not yet valid"
 msgstr "CRL er ikke gyldig endnu"
 
-#: camel/camel-tcp-stream-openssl.c:588
+#: camel/camel-tcp-stream-openssl.c:591
 msgid "CRL has expired"
 msgstr "CRL er udløbet"
 
-#: camel/camel-tcp-stream-openssl.c:593
+#: camel/camel-tcp-stream-openssl.c:596
 msgid "Error in CRL"
 msgstr "Fejl i CRL"
 
-#: camel/camel-tcp-stream-openssl.c:595
+#: camel/camel-tcp-stream-openssl.c:598
 msgid "Out of memory"
 msgstr "Løbet tør for hukommelse"
 
-#: camel/camel-tcp-stream-openssl.c:597
+#: camel/camel-tcp-stream-openssl.c:600
 msgid "Zero-depth self-signed certificate"
 msgstr "Nuldybde selvsigneret certifikat"
 
-#: camel/camel-tcp-stream-openssl.c:599
+#: camel/camel-tcp-stream-openssl.c:602
 msgid "Self-signed certificate in chain"
 msgstr "Selvsigneret certifikat i kæden"
 
-#: camel/camel-tcp-stream-openssl.c:601
+#: camel/camel-tcp-stream-openssl.c:604
 msgid "Unable to get issuer's certificate locally"
 msgstr "Kan ikke finde udsteders certifikat lokalt"
 
-#: camel/camel-tcp-stream-openssl.c:603
+#: camel/camel-tcp-stream-openssl.c:606
 msgid "Unable to verify leaf signature"
 msgstr "Kan ikke verificere bladsignatur"
 
-#: camel/camel-tcp-stream-openssl.c:605
+#: camel/camel-tcp-stream-openssl.c:608
 msgid "Certificate chain too long"
 msgstr "Certifikatkæden er for lang"
 
-#: camel/camel-tcp-stream-openssl.c:607
+#: camel/camel-tcp-stream-openssl.c:610
 msgid "Certificate Revoked"
 msgstr "Certifikat tilbagekaldt"
 
-#: camel/camel-tcp-stream-openssl.c:609
+#: camel/camel-tcp-stream-openssl.c:612
 msgid "Invalid Certificate Authority (CA)"
 msgstr "Ugyldig certifikatmyndighed (CA)"
 
-#: camel/camel-tcp-stream-openssl.c:611
+#: camel/camel-tcp-stream-openssl.c:614
 msgid "Path length exceeded"
 msgstr "Søgestiens længde overskredet"
 
-#: camel/camel-tcp-stream-openssl.c:613
+#: camel/camel-tcp-stream-openssl.c:616
 msgid "Invalid purpose"
 msgstr "Ugyldigt formål"
 
-#: camel/camel-tcp-stream-openssl.c:615
+#: camel/camel-tcp-stream-openssl.c:618
 msgid "Certificate untrusted"
 msgstr "Certifikat utroværdigt"
 
-#: camel/camel-tcp-stream-openssl.c:617
+#: camel/camel-tcp-stream-openssl.c:620
 msgid "Certificate rejected"
 msgstr "Certifikat afvist"
 
-#: camel/camel-tcp-stream-openssl.c:620
+#: camel/camel-tcp-stream-openssl.c:623
 msgid "Subject/Issuer mismatch"
 msgstr "Emne/Udsteder stemmer ikke overens"
 
-#: camel/camel-tcp-stream-openssl.c:622
+#: camel/camel-tcp-stream-openssl.c:625
 msgid "AKID/SKID mismatch"
 msgstr "AKID/SKID stemmer ikke overens"
 
-#: camel/camel-tcp-stream-openssl.c:624
+#: camel/camel-tcp-stream-openssl.c:627
 msgid "AKID/Issuer serial mismatch"
 msgstr "AKID/Udsteder-serienummer stemmer ikke overens"
 
-#: camel/camel-tcp-stream-openssl.c:626
+#: camel/camel-tcp-stream-openssl.c:629
 msgid "Key usage does not support certificate signing"
 msgstr "Nøgleanvendelse understøtter ikke certifikatsignering"
 
-#: camel/camel-tcp-stream-openssl.c:629
+#: camel/camel-tcp-stream-openssl.c:632
 msgid "Error in application verification"
 msgstr "Fejl i programverifikation"
 
-#: camel/camel-tcp-stream-openssl.c:696 camel/camel-tcp-stream-ssl.c:831
+#: camel/camel-tcp-stream-openssl.c:699 camel/camel-tcp-stream-ssl.c:823
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -9101,15 +9039,15 @@ msgstr ""
 "Fingeraftryk:      %s\n"
 "Signatur:          %s"
 
-#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:837
+#: camel/camel-tcp-stream-openssl.c:705 camel/camel-tcp-stream-ssl.c:829
 msgid "GOOD"
 msgstr "GOD"
 
-#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:837
+#: camel/camel-tcp-stream-openssl.c:705 camel/camel-tcp-stream-ssl.c:829
 msgid "BAD"
 msgstr "DÅRLIG"
 
-#: camel/camel-tcp-stream-openssl.c:704
+#: camel/camel-tcp-stream-openssl.c:707
 #, c-format
 msgid ""
 "Bad certificate from %s:\n"
@@ -9129,7 +9067,7 @@ msgstr ""
 "Vil du acceptere alligevel?"
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:841
+#: camel/camel-tcp-stream-ssl.c:833
 #, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -9144,7 +9082,7 @@ msgstr ""
 "\n"
 "Vil du acceptere?"
 
-#: camel/camel-tcp-stream-ssl.c:885
+#: camel/camel-tcp-stream-ssl.c:877
 #, c-format
 msgid ""
 "Certificate problem: %s\n"
@@ -9153,7 +9091,7 @@ msgstr ""
 "Certifikatproblem: %s\n"
 "Udsteder: %s"
 
-#: camel/camel-tcp-stream-ssl.c:937
+#: camel/camel-tcp-stream-ssl.c:929
 #, c-format
 msgid ""
 "Bad certificate domain: %s\n"
@@ -9162,7 +9100,7 @@ msgstr ""
 "Fejlagtigt certifikatdomæne: %s\n"
 "Udsteder: %s"
 
-#: camel/camel-tcp-stream-ssl.c:955
+#: camel/camel-tcp-stream-ssl.c:947
 #, c-format
 msgid ""
 "Certificate expired: %s\n"
@@ -9171,7 +9109,7 @@ msgstr ""
 "Certifikatet er udløbet: %s\n"
 "Udsteder: %s"
 
-#: camel/camel-tcp-stream-ssl.c:972
+#: camel/camel-tcp-stream-ssl.c:964
 #, c-format
 msgid ""
 "Certificate revocation list expired: %s\n"
@@ -9185,17 +9123,17 @@ msgstr ""
 msgid "Could not parse URL `%s'"
 msgstr "Kunne ikke tolke URL `%s'"
 
-#: camel/camel-vee-folder.c:611
+#: camel/camel-vee-folder.c:618
 #, c-format
 msgid "Error storing `%s': %s"
 msgstr "Fejl ved lagring af \"%s\": %s"
 
-#: camel/camel-vee-folder.c:649
+#: camel/camel-vee-folder.c:656
 #, c-format
 msgid "No such message %s in %s"
 msgstr "Ingen sådan besked %s i %s"
 
-#: camel/camel-vee-folder.c:812 camel/camel-vee-folder.c:818
+#: camel/camel-vee-folder.c:819 camel/camel-vee-folder.c:825
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr "Kan ikke kopiere eller flytte meddelelser til en virtuel mappe"
 
@@ -9222,12 +9160,12 @@ msgstr "Kan ikke ændre navn på mappe: %s: Ingen sådan mappe"
 #: camel/providers/imap/camel-imap-command.c:221
 #: camel/providers/imap/camel-imap-command.c:260
 #: camel/providers/imap/camel-imap-command.c:450
-#: camel/providers/imap/camel-imap-store.c:2806
+#: camel/providers/imap/camel-imap-store.c:2644
 msgid "Operation cancelled"
 msgstr "Operation afbrudt"
 
 #: camel/providers/imap/camel-imap-command.c:305
-#: camel/providers/imap/camel-imap-store.c:2809
+#: camel/providers/imap/camel-imap-store.c:2647
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "Server koblet fra uventet: %s"
@@ -9266,38 +9204,38 @@ msgstr "Svar fra IMAP-server indeholdt ikke %s-information"
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "Uventet 'OK'-svar fra IMAP-server: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:223
+#: camel/providers/imap/camel-imap-folder.c:222
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "Kan ikke oprette katalog %s: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:242
+#: camel/providers/imap/camel-imap-folder.c:241
 #, c-format
 msgid "Could not load summary for %s"
 msgstr "Kunne ikke indlæse sammendrag for %s"
 
-#: camel/providers/imap/camel-imap-folder.c:308
+#: camel/providers/imap/camel-imap-folder.c:307
 msgid "Folder was destroyed and recreated on server."
 msgstr "Mappen blev ødelagt og genskabt på serveren."
 
 #. Check UIDs and flags of all messages we already know of.
-#: camel/providers/imap/camel-imap-folder.c:550
+#: camel/providers/imap/camel-imap-folder.c:549
 msgid "Scanning for changed messages"
 msgstr "Søger efter ændrede beskeder"
 
-#: camel/providers/imap/camel-imap-folder.c:1886
+#: camel/providers/imap/camel-imap-folder.c:1883
 #, c-format
 msgid "Unable to retrieve message: %s"
 msgstr "Kan ikke hente meddelelse: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:1923
-#: camel/providers/local/camel-maildir-folder.c:211
-#: camel/providers/local/camel-maildir-folder.c:224
-#: camel/providers/local/camel-maildir-folder.c:233
-#: camel/providers/local/camel-mbox-folder.c:422
-#: camel/providers/local/camel-mh-folder.c:200
-#: camel/providers/local/camel-mh-folder.c:210
-#: camel/providers/local/camel-mh-folder.c:219
+#: camel/providers/imap/camel-imap-folder.c:1920
+#: camel/providers/local/camel-maildir-folder.c:212
+#: camel/providers/local/camel-maildir-folder.c:225
+#: camel/providers/local/camel-maildir-folder.c:234
+#: camel/providers/local/camel-mbox-folder.c:351
+#: camel/providers/local/camel-mh-folder.c:201
+#: camel/providers/local/camel-mh-folder.c:211
+#: camel/providers/local/camel-mh-folder.c:220
 #, c-format
 msgid ""
 "Cannot get message: %s\n"
@@ -9306,24 +9244,24 @@ msgstr ""
 "Kan ikke hente besked: %s\n"
 "  %s"
 
-#: camel/providers/imap/camel-imap-folder.c:1923
-#: camel/providers/local/camel-maildir-folder.c:211
-#: camel/providers/local/camel-mbox-folder.c:422
-#: camel/providers/local/camel-mh-folder.c:200
+#: camel/providers/imap/camel-imap-folder.c:1920
+#: camel/providers/local/camel-maildir-folder.c:212
+#: camel/providers/local/camel-mbox-folder.c:351
+#: camel/providers/local/camel-mh-folder.c:201
 msgid "No such message"
 msgstr "Ingen sådan besked"
 
-#: camel/providers/imap/camel-imap-folder.c:1946
-#: camel/providers/imap/camel-imap-folder.c:2542
+#: camel/providers/imap/camel-imap-folder.c:1943
+#: camel/providers/imap/camel-imap-folder.c:2539
 msgid "This message is not currently available"
 msgstr "Denne besked er ikke tilgængelig"
 
-#: camel/providers/imap/camel-imap-folder.c:2206
-#: camel/providers/imap/camel-imap-folder.c:2276
+#: camel/providers/imap/camel-imap-folder.c:2203
+#: camel/providers/imap/camel-imap-folder.c:2273
 msgid "Fetching summary information for new messages"
 msgstr "Henter sammendragsinformation for nye beskeder"
 
-#: camel/providers/imap/camel-imap-folder.c:2580
+#: camel/providers/imap/camel-imap-folder.c:2577
 msgid "Could not find message body in FETCH response."
 msgstr "Kunne ikke finde beskedens indhold i FETCH-svar."
 
@@ -9373,103 +9311,87 @@ msgstr "Navneområde"
 msgid "Apply filters to new messages in INBOX on this server"
 msgstr "Brug filtre for nye beskeder i INDBAKKE på denne server"
 
-#: camel/providers/imap/camel-imap-provider.c:59
-#, fuzzy
-msgid "Automatically synchronize remote mail locally"
-msgstr "Hent nye beskeder _automatisk hver(t)"
-
-#: camel/providers/imap/camel-imap-provider.c:65
+#: camel/providers/imap/camel-imap-provider.c:63
 msgid "IMAP"
 msgstr "IMAP"
 
-#: camel/providers/imap/camel-imap-provider.c:67
+#: camel/providers/imap/camel-imap-provider.c:65
 msgid "For reading and storing mail on IMAP servers."
 msgstr "For læsning og lagring af e-post på IMAP-servere."
 
-#: camel/providers/imap/camel-imap-provider.c:82
-#: camel/providers/imapp/camel-imapp-provider.c:65
-#: camel/providers/nntp/camel-nntp-store.c:265
+#: camel/providers/imap/camel-imap-provider.c:80
+#: camel/providers/nntp/camel-nntp-store.c:267
 #: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:83
 msgid "Password"
 msgstr "Adgangskode"
 
-#: camel/providers/imap/camel-imap-provider.c:84
-#: camel/providers/imapp/camel-imapp-provider.c:67
+#: camel/providers/imap/camel-imap-provider.c:82
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
 "Dette valg vil lade dig koble til en IMAP-server ved at bruge en klartekst-"
 "adgangskode."
 
-#: camel/providers/imap/camel-imap-store.c:459
+#: camel/providers/imap/camel-imap-store.c:457
 #, c-format
 msgid "IMAP server %s"
 msgstr "IMAP-server %s"
 
-#: camel/providers/imap/camel-imap-store.c:461
+#: camel/providers/imap/camel-imap-store.c:459
 #, c-format
 msgid "IMAP service for %s on %s"
 msgstr "IMAP-tjeneste for %s på %s"
 
-#: camel/providers/imap/camel-imap-store.c:589
-#: camel/providers/imap/camel-imap-store.c:821
-#: camel/providers/imapp/camel-imapp-store.c:233
-#: camel/providers/nntp/camel-nntp-store.c:128
-#: camel/providers/nntp/camel-nntp-store.c:146
+#: camel/providers/imap/camel-imap-store.c:587
+#: camel/providers/nntp/camel-nntp-store.c:130
+#: camel/providers/nntp/camel-nntp-store.c:148
 #: camel/providers/pop3/camel-pop3-store.c:184
 msgid "Connection cancelled"
 msgstr "Tilkobling afbrudt"
 
-#: camel/providers/imap/camel-imap-store.c:592
-#: camel/providers/imapp/camel-imapp-store.c:236
-#: camel/providers/nntp/camel-nntp-store.c:131
-#: camel/providers/smtp/camel-smtp-transport.c:275
+#: camel/providers/imap/camel-imap-store.c:590
+#: camel/providers/nntp/camel-nntp-store.c:133
+#: camel/providers/smtp/camel-smtp-transport.c:276
 #, c-format
 msgid "Could not connect to %s (port %d): %s"
 msgstr "Kunne ikke koble til %s (port %d): %s"
 
-#: camel/providers/imap/camel-imap-store.c:655
-#: camel/providers/imap/camel-imap-store.c:686
+#: camel/providers/imap/camel-imap-store.c:649
+#: camel/providers/imap/camel-imap-store.c:680
 #, c-format
 msgid "Failed to connect to IMAP server %s in secure mode: %s"
 msgstr "Kunne ikke tilslutte IMAP-servern %s i sikker tilstand: %s"
 
-#: camel/providers/imap/camel-imap-store.c:656
+#: camel/providers/imap/camel-imap-store.c:650
 #: camel/providers/pop3/camel-pop3-store.c:220
 msgid "SSL/TLS extension not supported."
 msgstr "SSL/TLS-udvidelsen understøttes ikke."
 
-#: camel/providers/imap/camel-imap-store.c:687
+#: camel/providers/imap/camel-imap-store.c:681
 #: camel/providers/pop3/camel-pop3-store.c:261
 msgid "SSL negotiations failed"
 msgstr "SSL-forhandlinger mislykkedes"
 
-#: camel/providers/imap/camel-imap-store.c:824
-#, fuzzy, c-format
-msgid "Could not connect with command \"%s\": %s"
-msgstr "Kunne ikke koble til %s (port %d): %s"
-
-#: camel/providers/imap/camel-imap-store.c:1237
+#: camel/providers/imap/camel-imap-store.c:1075
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr "IMAP-server %s understøtter ikke efterspurgt autenticeringstype %s"
 
-#: camel/providers/imap/camel-imap-store.c:1247
-#: camel/providers/smtp/camel-smtp-transport.c:485
+#: camel/providers/imap/camel-imap-store.c:1085
+#: camel/providers/smtp/camel-smtp-transport.c:486
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "Ingen understøtte for autenticeringstype %s"
 
-#: camel/providers/imap/camel-imap-store.c:1270
-#: camel/providers/imapp/camel-imapp-store.c:349
+#: camel/providers/imap/camel-imap-store.c:1108
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr "%sIndtast venligst IMAP-adgangskode for %s@%s"
 
-#: camel/providers/imap/camel-imap-store.c:1284
+#: camel/providers/imap/camel-imap-store.c:1122
 msgid "You didn't enter a password."
 msgstr "Du indtastede ikke en adgangskode."
 
-#: camel/providers/imap/camel-imap-store.c:1313
+#: camel/providers/imap/camel-imap-store.c:1151
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -9480,70 +9402,42 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:1660
-#: camel/providers/imap/camel-imap-store.c:1802
+#: camel/providers/imap/camel-imap-store.c:1498
+#: camel/providers/imap/camel-imap-store.c:1640
 #, c-format
 msgid "No such folder %s"
 msgstr "Mappen %s eksisterer ikke"
 
-#: camel/providers/imap/camel-imap-store.c:2003
+#: camel/providers/imap/camel-imap-store.c:1841
 #, c-format
 msgid ""
 "The folder name \"%s\" is invalid because it containes the character \"%c\""
 msgstr "Mappnavnet \"%s\" er ugyldigt eftersom det indeholder tegnet \"%c\""
 
-#: camel/providers/imap/camel-imap-store.c:2015
+#: camel/providers/imap/camel-imap-store.c:1853
 #, c-format
 msgid "Unknown parent folder: %s"
 msgstr "Ukendt forældermappe: %s"
 
-#: camel/providers/imap/camel-imap-store.c:2051
+#: camel/providers/imap/camel-imap-store.c:1889
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "Ophavsmappen tillades ikke at have undermapper"
 
-#: camel/providers/imapp/camel-imapp-provider.c:39
-#: camel/providers/pop3/camel-pop3-provider.c:38
-msgid "Message storage"
-msgstr "Beskedslager"
-
-#: camel/providers/imapp/camel-imapp-provider.c:47
-#, fuzzy
-msgid "IMAP+"
-msgstr "IMAP"
-
-#: camel/providers/imapp/camel-imapp-provider.c:49
-msgid ""
-"Experimental IMAP 4(.1) client\n"
-"This is untested and unsupported code, you want to use plain imap instead.\n"
-"\n"
-" !!! DO NOT USE THIS FOR PRODUCTION EMAIL  !!!\n"
-msgstr ""
-
-#: camel/providers/imapp/camel-imapp-store.c:333
-#, fuzzy, c-format
-msgid "Could not connect to POP server on %s"
-msgstr "Kunne ikke tilslutte POP-servern %s"
-
-#: camel/providers/local/camel-local-folder.c:179
-#, fuzzy
-msgid "Index message body data"
-msgstr "Send besked til kontakt"
-
 #. $HOME relative path + protocol string
-#: camel/providers/local/camel-local-folder.c:379
+#: camel/providers/local/camel-local-folder.c:354
 #, c-format
 msgid "~%s (%s)"
 msgstr "~%s (%s)"
 
 #. /var/spool/mail relative path + protocol
-#: camel/providers/local/camel-local-folder.c:383
-#: camel/providers/local/camel-local-folder.c:386
+#: camel/providers/local/camel-local-folder.c:358
+#: camel/providers/local/camel-local-folder.c:361
 #, c-format
 msgid "mailbox:%s (%s)"
 msgstr "postkasse:%s (%s)"
 
 #. a full path + protocol
-#: camel/providers/local/camel-local-folder.c:390
+#: camel/providers/local/camel-local-folder.c:365
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
@@ -9601,54 +9495,50 @@ msgstr ""
 "Til at læse og gemme lokal post i eksterne standard mbox kø-filer.\n"
 "Kan også anvendes til at læse et træ mapper i Elm-, Pine- eller Mutt-format."
 
-#: camel/providers/local/camel-local-store.c:138
-#: camel/providers/local/camel-local-store.c:227
-#: camel/providers/local/camel-mbox-store.c:305
+#: camel/providers/local/camel-local-store.c:139
+#: camel/providers/local/camel-local-store.c:228
 #: camel/providers/local/camel-spool-store.c:116
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr "Lagerrod %s er ikke en absolut sti"
 
-#: camel/providers/local/camel-local-store.c:145
+#: camel/providers/local/camel-local-store.c:146
 #, c-format
 msgid "Store root %s is not a regular directory"
 msgstr "Lagerrod %s er ikke et normalt katalog"
 
-#: camel/providers/local/camel-local-store.c:154
-#: camel/providers/local/camel-local-store.c:170
-#: camel/providers/local/camel-local-store.c:238
+#: camel/providers/local/camel-local-store.c:155
+#: camel/providers/local/camel-local-store.c:171
+#: camel/providers/local/camel-local-store.c:239
 #, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr "Finder ikke mappe: %s: %s"
 
-#: camel/providers/local/camel-local-store.c:186
+#: camel/providers/local/camel-local-store.c:187
 msgid "Local stores do not have an inbox"
 msgstr "Lokalt lager har ikke en indbakke"
 
-#: camel/providers/local/camel-local-store.c:198
+#: camel/providers/local/camel-local-store.c:199
 #, c-format
 msgid "Local mail file %s"
 msgstr "Lokal e-post-fil %s"
 
-#: camel/providers/local/camel-local-store.c:307 mail/mail-local.c:949
+#: camel/providers/local/camel-local-store.c:308 mail/mail-local.c:909
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr "Kunne ikke ændre navn på mappe %s til %s: %s"
 
-#: camel/providers/local/camel-local-store.c:364
-#: camel/providers/local/camel-mbox-store.c:474
+#: camel/providers/local/camel-local-store.c:365
 #, c-format
 msgid "Could not rename '%s': %s"
 msgstr "Kunne ikke skifte navn på \"%s\": %s"
 
-#: camel/providers/local/camel-local-store.c:387
-#: camel/providers/local/camel-mbox-store.c:258
+#: camel/providers/local/camel-local-store.c:388
 #, c-format
 msgid "Could not delete folder summary file `%s': %s"
 msgstr "Kunne ikke slette sammendragsfil for mappe `%s': %s"
 
-#: camel/providers/local/camel-local-store.c:397
-#: camel/providers/local/camel-mbox-store.c:270
+#: camel/providers/local/camel-local-store.c:398
 #, c-format
 msgid "Could not delete folder index file `%s': %s"
 msgstr "Kunne ikke slette indeksfil for mappe `%s': %s"
@@ -9662,17 +9552,17 @@ msgstr "Kunne ikke gemme sammendrag: %s: %s"
 msgid "Unable to add message to summary: unknown reason"
 msgstr "Kunne ikke tilføje besked i sammendraget: ukendt grund"
 
-#: camel/providers/local/camel-maildir-folder.c:183
+#: camel/providers/local/camel-maildir-folder.c:184
 msgid "Maildir append message cancelled"
 msgstr "Besked aflyst"
 
-#: camel/providers/local/camel-maildir-folder.c:186
+#: camel/providers/local/camel-maildir-folder.c:187
 #, c-format
 msgid "Cannot append message to maildir folder: %s: %s"
 msgstr "Kan ikke tilføje besked i maildir mappe: %s: %s"
 
-#: camel/providers/local/camel-maildir-folder.c:234
-#: camel/providers/local/camel-mh-folder.c:220
+#: camel/providers/local/camel-maildir-folder.c:235
+#: camel/providers/local/camel-mh-folder.c:221
 msgid "Invalid message contents"
 msgstr "Ugyldig beskedsindhold"
 
@@ -9688,7 +9578,7 @@ msgstr ""
 "%s"
 
 #: camel/providers/local/camel-maildir-store.c:110
-#: camel/providers/local/camel-mbox-store.c:157
+#: camel/providers/local/camel-mbox-store.c:101
 #: camel/providers/local/camel-mh-store.c:209
 #: camel/providers/local/camel-spool-store.c:167
 #, c-format
@@ -9751,29 +9641,29 @@ msgstr "Checker for nye meddelelser"
 msgid "Storing folder"
 msgstr "Gemmer mappe"
 
-#: camel/providers/local/camel-mbox-folder.c:230
-#: camel/providers/local/camel-spool-folder.c:148
+#: camel/providers/local/camel-mbox-folder.c:159
+#: camel/providers/local/camel-spool-folder.c:149
 #, c-format
 msgid "Cannot create folder lock on %s: %s"
 msgstr "Kan ikke oprette mappelås på: %s: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:289
+#: camel/providers/local/camel-mbox-folder.c:218
 #, c-format
 msgid "Cannot open mailbox: %s: %s\n"
 msgstr "Kan ikke åbne postboks: %s: %s\n"
 
-#: camel/providers/local/camel-mbox-folder.c:349
+#: camel/providers/local/camel-mbox-folder.c:278
 msgid "Mail append cancelled"
 msgstr "Tilføjelse af brev blev aflyst"
 
-#: camel/providers/local/camel-mbox-folder.c:352
+#: camel/providers/local/camel-mbox-folder.c:281
 #, c-format
 msgid "Cannot append message to mbox file: %s: %s"
 msgstr "Kan ikke tilføje besked i mbox-filen: %s: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:440
-#: camel/providers/local/camel-mbox-folder.c:471
-#: camel/providers/local/camel-mbox-folder.c:479
+#: camel/providers/local/camel-mbox-folder.c:369
+#: camel/providers/local/camel-mbox-folder.c:400
+#: camel/providers/local/camel-mbox-folder.c:408
 #, c-format
 msgid ""
 "Cannot get message: %s from folder %s\n"
@@ -9782,15 +9672,15 @@ msgstr ""
 "Kan ikke hente besked: %s fra mappe %s\n"
 "  %s"
 
-#: camel/providers/local/camel-mbox-folder.c:472
+#: camel/providers/local/camel-mbox-folder.c:401
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr "Mappen ser ud til at have blevet korrupt og kan ikke repareres."
 
-#: camel/providers/local/camel-mbox-folder.c:480
+#: camel/providers/local/camel-mbox-folder.c:409
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr "Opbygning af besked mislykkedes: Beskadiget postboks?"
 
-#: camel/providers/local/camel-mbox-store.c:149
+#: camel/providers/local/camel-mbox-store.c:94
 #, c-format
 msgid ""
 "Could not open file `%s':\n"
@@ -9799,16 +9689,7 @@ msgstr ""
 "Kunne ikke åbne fil `%s':\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:166
-#, fuzzy, c-format
-msgid ""
-"Could not create directory `%s':\n"
-"%s"
-msgstr ""
-"Kan ikke oprette katalog %s:\n"
-"%s"
-
-#: camel/providers/local/camel-mbox-store.c:178
+#: camel/providers/local/camel-mbox-store.c:110
 #, c-format
 msgid ""
 "Could not create file `%s':\n"
@@ -9817,15 +9698,14 @@ msgstr ""
 "Kunne ikke oprette fil '%s'\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:188
-#: camel/providers/local/camel-mbox-store.c:229
+#: camel/providers/local/camel-mbox-store.c:119
+#: camel/providers/local/camel-mbox-store.c:146
 #, c-format
 msgid "`%s' is not a regular file."
 msgstr "`%s' er ikke en normal fil."
 
-#: camel/providers/local/camel-mbox-store.c:210
-#: camel/providers/local/camel-mbox-store.c:221
-#: camel/providers/local/camel-mbox-store.c:244
+#: camel/providers/local/camel-mbox-store.c:138
+#: camel/providers/local/camel-mbox-store.c:161
 #, c-format
 msgid ""
 "Could not delete folder `%s':\n"
@@ -9834,36 +9714,11 @@ msgstr ""
 "Kunne ikke slette mappen `%s'\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:236
+#: camel/providers/local/camel-mbox-store.c:153
 #, c-format
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr "Mappen `%s' er ikke tom. Ikke slettet."
 
-#: camel/providers/local/camel-mbox-store.c:311
-#, fuzzy
-msgid "Cannot create a folder by this name."
-msgstr "Kan ikke oprette en mappe med det navn"
-
-#: camel/providers/local/camel-mbox-store.c:324
-#, fuzzy, c-format
-msgid "Cannot create directory `%s': %s."
-msgstr "Kan ikke oprette katalog %s: %s"
-
-#: camel/providers/local/camel-mbox-store.c:338
-#, fuzzy, c-format
-msgid "Cannot create folder: %s: %s"
-msgstr "Finder ikke mappe: %s: %s"
-
-#: camel/providers/local/camel-mbox-store.c:408
-#, fuzzy, c-format
-msgid "Could not rename %s to %s: %s"
-msgstr "Kunne ikke ændre navn på mappe %s til %s: %s"
-
-#: camel/providers/local/camel-mbox-store.c:427
-#, fuzzy
-msgid "The new folder name is illegal."
-msgstr "Specificeret mappenavn er ikke gyldigt: %s"
-
 #: camel/providers/local/camel-mbox-summary.c:343
 #, c-format
 msgid "Could not open folder: %s: %s"
@@ -9893,7 +9748,7 @@ msgid "Cannot open temporary mailbox: %s"
 msgstr "Kan ikke åbne midlertidig postboks: %s"
 
 #: camel/providers/local/camel-mbox-summary.c:540
-#: camel/providers/local/camel-mbox-summary.c:704
+#: camel/providers/local/camel-mbox-summary.c:702
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr "Kunne ikke lukke kildemappe %s: %s"
@@ -9910,38 +9765,38 @@ msgstr "Kunne ikke ændre navn på mappe: %s"
 
 #: camel/providers/local/camel-mbox-summary.c:644
 #: camel/providers/local/camel-mbox-summary.c:652
-#: camel/providers/local/camel-mbox-summary.c:845
-#: camel/providers/local/camel-mbox-summary.c:853
+#: camel/providers/local/camel-mbox-summary.c:843
+#: camel/providers/local/camel-mbox-summary.c:851
 msgid "Summary and folder mismatch, even after a sync"
 msgstr "Fejl i sammendrag og mappe, selv efter synkronisering"
 
-#: camel/providers/local/camel-mbox-summary.c:779
+#: camel/providers/local/camel-mbox-summary.c:777
 #: camel/providers/local/camel-spool-summary.c:334
 #, c-format
 msgid "Unknown error: %s"
 msgstr "Ukendt fejl: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:814
+#: camel/providers/local/camel-mbox-summary.c:812
 #, c-format
 msgid "Could not store folder: %s"
 msgstr "Kunne ikke gemme mappe: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:908
-#: camel/providers/local/camel-mbox-summary.c:934
+#: camel/providers/local/camel-mbox-summary.c:906
+#: camel/providers/local/camel-mbox-summary.c:932
 #, c-format
 msgid "Error writing to temp mailbox: %s"
 msgstr "Fejl under skriving til midlertidig postboks: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:925
+#: camel/providers/local/camel-mbox-summary.c:923
 #, c-format
 msgid "Writing to tmp mailbox failed: %s: %s"
 msgstr "Skriving til midlertidig postboks mislykkedes: %s: %s"
 
-#: camel/providers/local/camel-mh-folder.c:174
+#: camel/providers/local/camel-mh-folder.c:175
 msgid "MH append message cancelled"
 msgstr "Tilføjet brev er annulleret"
 
-#: camel/providers/local/camel-mh-folder.c:177
+#: camel/providers/local/camel-mh-folder.c:178
 #, c-format
 msgid "Cannot append message to mh folder: %s: %s"
 msgstr "Kan ikke tilføje besked i mh-mappe: %s: %s"
@@ -10021,67 +9876,6 @@ msgstr ""
 "Kunne ikke synkronisere spool-mappe %s: %s\n"
 "Mappen kan være beskadiget, kopi gemt i `%s'"
 
-#: camel/providers/nntp/camel-nntp-auth.c:44
-#, fuzzy, c-format
-msgid "Please enter the NNTP password for %s@%s"
-msgstr "%sIndtast venligst SMTP-adgangskode for %s@%s"
-
-#: camel/providers/nntp/camel-nntp-auth.c:64
-msgid "Server rejected username"
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-auth.c:70
-#, fuzzy
-msgid "Failed to send username to server"
-msgstr "Tilslutning til LDAP-serveren mislykkedes"
-
-#: camel/providers/nntp/camel-nntp-auth.c:79
-msgid "Server rejected username/password"
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-folder.c:114
-#, c-format
-msgid "Internal error: uid in invalid format: %s"
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-folder.c:155
-#: camel/providers/nntp/camel-nntp-folder.c:161
-#: camel/providers/pop3/camel-pop3-folder.c:433
-#: camel/providers/pop3/camel-pop3-folder.c:494
-#: camel/providers/pop3/camel-pop3-folder.c:501
-#: camel/providers/pop3/camel-pop3-folder.c:512
-#, c-format
-msgid "Cannot get message %s: %s"
-msgstr "Kan ikke hente meddelelse %s: %s"
-
-#: camel/providers/nntp/camel-nntp-folder.c:159
-#: camel/providers/pop3/camel-pop3-folder.c:262
-#: camel/providers/pop3/camel-pop3-folder.c:430
-#: camel/providers/pop3/camel-pop3-folder.c:491
-#: camel/providers/pop3/camel-pop3-folder.c:509
-msgid "User cancelled"
-msgstr "Brugeren afbrød"
-
-#: camel/providers/nntp/camel-nntp-grouplist.c:45
-#, fuzzy
-msgid "Could not get group list from server."
-msgstr "Kunne ikke hente gruppe: %s"
-
-#: camel/providers/nntp/camel-nntp-grouplist.c:98
-#: camel/providers/nntp/camel-nntp-grouplist.c:107
-#, fuzzy, c-format
-msgid "Unable to load grouplist file for %s: %s"
-msgstr ""
-"Kunne ikke oprette uddatafil: %s\n"
-" %s"
-
-#: camel/providers/nntp/camel-nntp-grouplist.c:158
-#, fuzzy, c-format
-msgid "Unable to save grouplist file for %s: %s"
-msgstr ""
-"Kunne ikke oprette uddatafil: %s\n"
-" %s"
-
 #: camel/providers/nntp/camel-nntp-provider.c:41
 msgid "USENET news"
 msgstr "USENET nyheder"
@@ -10092,22 +9886,22 @@ msgstr ""
 "Dette er en udbyder for læsning af og postning af indlæg til USENET "
 "nyhedsgrupper."
 
-#: camel/providers/nntp/camel-nntp-store.c:149
+#: camel/providers/nntp/camel-nntp-store.c:151
 #, c-format
 msgid "Could not read greeting from %s: %s"
 msgstr "Kunne ikke oprette hilsen fra %s: %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:161
+#: camel/providers/nntp/camel-nntp-store.c:163
 #, c-format
 msgid "NNTP server %s returned error code %d: %s"
 msgstr "NNTP-serveren %s returnerede fejlkoden %d: %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:260
+#: camel/providers/nntp/camel-nntp-store.c:262
 #, c-format
 msgid "USENET News via %s"
 msgstr "USENET Nyheder via %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:267
+#: camel/providers/nntp/camel-nntp-store.c:269
 msgid ""
 "This option will authenticate with the NNTP server using a plaintext "
 "password."
@@ -10115,37 +9909,37 @@ msgstr ""
 "Dette alternativ vil autenticere mod NNTP-serveren ved brug af klartekst "
 "adgangskode."
 
-#: camel/providers/nntp/camel-nntp-summary.c:237
+#: camel/providers/nntp/camel-nntp-summary.c:234
 #, c-format
 msgid "No such folder: %s"
 msgstr "Der findes ingen sådan mappe: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:241
+#: camel/providers/nntp/camel-nntp-summary.c:238
 #, c-format
 msgid "Could not get group: %s"
 msgstr "Kunne ikke hente gruppe: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:347
+#: camel/providers/nntp/camel-nntp-summary.c:344
 #, c-format
 msgid "NNTP Command failed: %s"
 msgstr "NNTP-kommandoen mislykkedes: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:407
-#: camel/providers/nntp/camel-nntp-summary.c:508
+#: camel/providers/nntp/camel-nntp-summary.c:404
+#: camel/providers/nntp/camel-nntp-summary.c:505
 #, c-format
 msgid "%s: Scanning new messages"
 msgstr "%s: Skanner nye meddelelser"
 
-#: camel/providers/nntp/camel-nntp-summary.c:523
+#: camel/providers/nntp/camel-nntp-summary.c:520
 #, c-format
 msgid "Unknown server response: %s"
 msgstr "Ukendt serversvar: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:569
+#: camel/providers/nntp/camel-nntp-summary.c:566
 msgid "Use cancel"
 msgstr "Anvend afbryd"
 
-#: camel/providers/nntp/camel-nntp-summary.c:571
+#: camel/providers/nntp/camel-nntp-summary.c:568
 #, c-format
 msgid "Operation failed: %s"
 msgstr "Handlingen mislykkedes: %s"
@@ -10154,6 +9948,13 @@ msgstr "Handlingen mislykkedes: %s"
 msgid "Retrieving POP summary"
 msgstr "Henter POP-sammendrag"
 
+#: camel/providers/pop3/camel-pop3-folder.c:262
+#: camel/providers/pop3/camel-pop3-folder.c:429
+#: camel/providers/pop3/camel-pop3-folder.c:490
+#: camel/providers/pop3/camel-pop3-folder.c:508
+msgid "User cancelled"
+msgstr "Brugeren afbrød"
+
 #: camel/providers/pop3/camel-pop3-folder.c:265
 #, c-format
 msgid "Cannot get POP summary: %s"
@@ -10163,22 +9964,34 @@ msgstr "Kan ikke hente POP-sammenfatning: %s"
 msgid "Expunging deleted messages"
 msgstr "Fjerner slettede beskeder"
 
-#: camel/providers/pop3/camel-pop3-folder.c:404
+#: camel/providers/pop3/camel-pop3-folder.c:403
 #, c-format
 msgid "No message with uid %s"
 msgstr "Ingen besked med uid %s"
 
 #. Sigh, most of the crap in this function is so that the cancel button
 #. returns the proper exception code.  Sigh.
-#: camel/providers/pop3/camel-pop3-folder.c:411
+#: camel/providers/pop3/camel-pop3-folder.c:410
 #, c-format
 msgid "Retrieving POP message %d"
 msgstr "Henter POP-besked %d"
 
-#: camel/providers/pop3/camel-pop3-folder.c:501
+#: camel/providers/pop3/camel-pop3-folder.c:432
+#: camel/providers/pop3/camel-pop3-folder.c:493
+#: camel/providers/pop3/camel-pop3-folder.c:500
+#: camel/providers/pop3/camel-pop3-folder.c:511
+#, c-format
+msgid "Cannot get message %s: %s"
+msgstr "Kan ikke hente meddelelse %s: %s"
+
+#: camel/providers/pop3/camel-pop3-folder.c:500
 msgid "Unknown reason"
 msgstr "Ukendt anledning"
 
+#: camel/providers/pop3/camel-pop3-provider.c:38
+msgid "Message storage"
+msgstr "Beskedslager"
+
 #: camel/providers/pop3/camel-pop3-provider.c:40
 msgid "Leave messages on server"
 msgstr "Behold beskeder på serveren"
@@ -10344,140 +10157,140 @@ msgstr "SMTP"
 msgid "For delivering mail by connecting to a remote mailhub using SMTP.\n"
 msgstr "For levering af e-post via en ekstern e-postserver med SMTP.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:174
+#: camel/providers/smtp/camel-smtp-transport.c:175
 msgid "Syntax error, command unrecognized"
 msgstr "Syntaksfejl, kommando ikke genkendt"
 
-#: camel/providers/smtp/camel-smtp-transport.c:176
+#: camel/providers/smtp/camel-smtp-transport.c:177
 msgid "Syntax error in parameters or arguments"
 msgstr "Syntaksfejl i parametre eller argumenter"
 
-#: camel/providers/smtp/camel-smtp-transport.c:178
+#: camel/providers/smtp/camel-smtp-transport.c:179
 msgid "Command not implemented"
 msgstr "Kommando ikke implementeret"
 
-#: camel/providers/smtp/camel-smtp-transport.c:180
+#: camel/providers/smtp/camel-smtp-transport.c:181
 msgid "Command parameter not implemented"
 msgstr "Kommandoparameter ikke implementeret"
 
-#: camel/providers/smtp/camel-smtp-transport.c:182
+#: camel/providers/smtp/camel-smtp-transport.c:183
 msgid "System status, or system help reply"
 msgstr "Systemstatus, eller svar på systemhjælp"
 
-#: camel/providers/smtp/camel-smtp-transport.c:184
+#: camel/providers/smtp/camel-smtp-transport.c:185
 msgid "Help message"
 msgstr "Hjælpebesked"
 
-#: camel/providers/smtp/camel-smtp-transport.c:186
+#: camel/providers/smtp/camel-smtp-transport.c:187
 msgid "Service ready"
 msgstr "Tjeneste klar"
 
-#: camel/providers/smtp/camel-smtp-transport.c:188
+#: camel/providers/smtp/camel-smtp-transport.c:189
 msgid "Service closing transmission channel"
 msgstr "Tjenesten lukker sendekanalen"
 
-#: camel/providers/smtp/camel-smtp-transport.c:190
+#: camel/providers/smtp/camel-smtp-transport.c:191
 msgid "Service not available, closing transmission channel"
 msgstr "Tjenesten er ikke tilgængelig, lukker sendekanalen"
 
-#: camel/providers/smtp/camel-smtp-transport.c:192
+#: camel/providers/smtp/camel-smtp-transport.c:193
 msgid "Requested mail action okay, completed"
 msgstr "Forespurgt e-post handling er ok, fuldført"
 
-#: camel/providers/smtp/camel-smtp-transport.c:194
+#: camel/providers/smtp/camel-smtp-transport.c:195
 msgid "User not local; will forward to <forward-path>"
 msgstr "Ikke lokal bruger; videresender til <forward-path>"
 
-#: camel/providers/smtp/camel-smtp-transport.c:196
+#: camel/providers/smtp/camel-smtp-transport.c:197
 msgid "Requested mail action not taken: mailbox unavailable"
 msgstr "Forespurgt e-post-handling er ikke udført: postboks ikke tilgængelig"
 
-#: camel/providers/smtp/camel-smtp-transport.c:198
+#: camel/providers/smtp/camel-smtp-transport.c:199
 msgid "Requested action not taken: mailbox unavailable"
 msgstr "Forespurgt handling ikke udført: postboks ikke tilgængelig"
 
-#: camel/providers/smtp/camel-smtp-transport.c:200
+#: camel/providers/smtp/camel-smtp-transport.c:201
 msgid "Requested action aborted: error in processing"
 msgstr "Forespurgt handling afbrudt: fejl i processering"
 
-#: camel/providers/smtp/camel-smtp-transport.c:202
+#: camel/providers/smtp/camel-smtp-transport.c:203
 msgid "User not local; please try <forward-path>"
 msgstr "Ikke lokal bruger; venligst prøv <forward-path>"
 
-#: camel/providers/smtp/camel-smtp-transport.c:204
+#: camel/providers/smtp/camel-smtp-transport.c:205
 msgid "Requested action not taken: insufficient system storage"
 msgstr "Forespurgt handling ikke udført: utilstrækkelig lagringsplads"
 
-#: camel/providers/smtp/camel-smtp-transport.c:206
+#: camel/providers/smtp/camel-smtp-transport.c:207
 msgid "Requested mail action aborted: exceeded storage allocation"
 msgstr "Forespurgt e-post handling afbrudt: lagringsallokering overskredet"
 
-#: camel/providers/smtp/camel-smtp-transport.c:208
+#: camel/providers/smtp/camel-smtp-transport.c:209
 msgid "Requested action not taken: mailbox name not allowed"
 msgstr "Forespurgt handling ikke udført: postboksnavn ikke tilladt"
 
-#: camel/providers/smtp/camel-smtp-transport.c:210
+#: camel/providers/smtp/camel-smtp-transport.c:211
 msgid "Start mail input; end with <CRLF>.<CRLF>"
 msgstr "Start e-post input; slut med <CRLF>.<CRLF>"
 
-#: camel/providers/smtp/camel-smtp-transport.c:212
+#: camel/providers/smtp/camel-smtp-transport.c:213
 msgid "Transaction failed"
 msgstr "Transaktionen mislykkedes"
 
-#: camel/providers/smtp/camel-smtp-transport.c:216
+#: camel/providers/smtp/camel-smtp-transport.c:217
 msgid "A password transition is needed"
 msgstr "Adgangskodeoverføring kræves"
 
-#: camel/providers/smtp/camel-smtp-transport.c:218
+#: camel/providers/smtp/camel-smtp-transport.c:219
 msgid "Authentication mechanism is too weak"
 msgstr "Autenticeringsmekanismen er for svag"
 
-#: camel/providers/smtp/camel-smtp-transport.c:220
+#: camel/providers/smtp/camel-smtp-transport.c:221
 msgid "Encryption required for requested authentication mechanism"
 msgstr "Kryptering kræves for forespurgt autenticeringsmekanisme."
 
-#: camel/providers/smtp/camel-smtp-transport.c:222
+#: camel/providers/smtp/camel-smtp-transport.c:223
 msgid "Temporary authentication failure"
 msgstr "Midlertidig autenticeringsfejl"
 
-#: camel/providers/smtp/camel-smtp-transport.c:224
+#: camel/providers/smtp/camel-smtp-transport.c:225
 msgid "Authentication required"
 msgstr "Autenticering kræves"
 
-#: camel/providers/smtp/camel-smtp-transport.c:298
+#: camel/providers/smtp/camel-smtp-transport.c:299
 msgid "Welcome response error"
 msgstr "Fejl i velkomstsvar"
 
-#: camel/providers/smtp/camel-smtp-transport.c:342
-#: camel/providers/smtp/camel-smtp-transport.c:381
+#: camel/providers/smtp/camel-smtp-transport.c:343
+#: camel/providers/smtp/camel-smtp-transport.c:382
 #, c-format
 msgid "Failed to connect to SMTP server %s in secure mode: %s"
 msgstr "Tilslutning til SMTP-servern %s mislykkedes i sikkert tilstand: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:343
+#: camel/providers/smtp/camel-smtp-transport.c:344
 msgid "server does not appear to support SSL"
 msgstr "serveren ser ikke ud til at understøtte SSL"
 
-#: camel/providers/smtp/camel-smtp-transport.c:357
+#: camel/providers/smtp/camel-smtp-transport.c:358
 #, c-format
 msgid "STARTTLS request timed out: %s"
 msgstr "STARTTLS-forespørgslen gav time-out: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:372
+#: camel/providers/smtp/camel-smtp-transport.c:373
 msgid "STARTTLS response error"
 msgstr "Fejl i STARTTLS-svar"
 
-#: camel/providers/smtp/camel-smtp-transport.c:475
+#: camel/providers/smtp/camel-smtp-transport.c:476
 #, c-format
 msgid "SMTP server %s does not support requested authentication type %s."
 msgstr "SMTP-serveren %s understøtter ikke den ønskede godkendelsestype %s."
 
-#: camel/providers/smtp/camel-smtp-transport.c:513
+#: camel/providers/smtp/camel-smtp-transport.c:514
 #, c-format
 msgid "%sPlease enter the SMTP password for %s@%s"
 msgstr "%sIndtast venligst SMTP-adgangskode for %s@%s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:532
+#: camel/providers/smtp/camel-smtp-transport.c:533
 #, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -10488,87 +10301,87 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:665
+#: camel/providers/smtp/camel-smtp-transport.c:666
 #, c-format
 msgid "SMTP server %s"
 msgstr "SMTP-server %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:667
+#: camel/providers/smtp/camel-smtp-transport.c:668
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "SMTP e-postlevering via %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:685
+#: camel/providers/smtp/camel-smtp-transport.c:686
 msgid "Cannot send message: sender address not valid."
 msgstr "Kan ikke sende besked: afsenderadresse ikke gyldig."
 
-#: camel/providers/smtp/camel-smtp-transport.c:690 mail/mail-ops.c:631
+#: camel/providers/smtp/camel-smtp-transport.c:691 mail/mail-ops.c:613
 msgid "Sending message"
 msgstr "Sender besked"
 
-#: camel/providers/smtp/camel-smtp-transport.c:705
+#: camel/providers/smtp/camel-smtp-transport.c:706
 msgid "Cannot send message: no recipients defined."
 msgstr "Kan ikke sende besked: ingen modtagere definerte."
 
-#: camel/providers/smtp/camel-smtp-transport.c:714
+#: camel/providers/smtp/camel-smtp-transport.c:715
 msgid "Cannot send message: one or more invalid recipients"
 msgstr "Kan ikke sende meddelelse: en eller flere ugyldige modtagere"
 
-#: camel/providers/smtp/camel-smtp-transport.c:879
+#: camel/providers/smtp/camel-smtp-transport.c:880
 msgid "SMTP Greeting"
 msgstr "SMTP-velkomst"
 
-#: camel/providers/smtp/camel-smtp-transport.c:928
+#: camel/providers/smtp/camel-smtp-transport.c:927
 #, c-format
 msgid "HELO request timed out: %s"
 msgstr "HELO-forespørgsel gav time-out: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:950
+#: camel/providers/smtp/camel-smtp-transport.c:949
 msgid "HELO response error"
 msgstr "Fejl i HELO-svar"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1016
+#: camel/providers/smtp/camel-smtp-transport.c:1015
 msgid "SMTP Authentication"
 msgstr "SMTP-autenticering"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1022
+#: camel/providers/smtp/camel-smtp-transport.c:1021
 msgid "Error creating SASL authentication object."
 msgstr "Fejl under opretelse af SASL-autenticeringsobjekt."
 
-#: camel/providers/smtp/camel-smtp-transport.c:1039
-#: camel/providers/smtp/camel-smtp-transport.c:1051
+#: camel/providers/smtp/camel-smtp-transport.c:1038
+#: camel/providers/smtp/camel-smtp-transport.c:1050
 #, c-format
 msgid "AUTH request timed out: %s"
 msgstr "Tidsafbrud for AUTH-forespørgsel: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1060
+#: camel/providers/smtp/camel-smtp-transport.c:1059
 msgid "AUTH request failed."
 msgstr "AUTH-forespørgsel mislykkedes."
 
-#: camel/providers/smtp/camel-smtp-transport.c:1121
+#: camel/providers/smtp/camel-smtp-transport.c:1120
 msgid "Bad authentication response from server.\n"
 msgstr "Ugyldig svar på autenticering fra server.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1146
+#: camel/providers/smtp/camel-smtp-transport.c:1145
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
 msgstr "Tidsafbrud for \"MAIL FROM\"-forespørgsel: %s: besked ikke sendt"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1166
+#: camel/providers/smtp/camel-smtp-transport.c:1165
 msgid "MAIL FROM response error"
 msgstr "Fejl i MAIL FROM-svar"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1190
+#: camel/providers/smtp/camel-smtp-transport.c:1189
 #, c-format
 msgid "RCPT TO request timed out: %s: mail not sent"
 msgstr "Tidsafbrud for \"RCPT TO\"-forespørgsel: %s: besked ikke sendt"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1212
+#: camel/providers/smtp/camel-smtp-transport.c:1211
 #, c-format
 msgid "RCPT TO <%s> failed"
 msgstr "RCPT TO <%s> mislykkedes"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1251
+#: camel/providers/smtp/camel-smtp-transport.c:1250
 #, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr "Tidsafbrud for DATA-forespørgsel: %s: besked ikke sendt."
@@ -10576,66 +10389,67 @@ msgstr "Tidsafbrud for DATA-forespørgsel: %s: besked ikke sendt."
 #. we should have gotten instructions on how to use the DATA command:
 #. * 354 Enter mail, end with "." on a line by itself
 #.
-#: camel/providers/smtp/camel-smtp-transport.c:1271
+#: camel/providers/smtp/camel-smtp-transport.c:1270
 msgid "DATA response error"
 msgstr "Fejl i DATA-svar"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1312
-#: camel/providers/smtp/camel-smtp-transport.c:1335
+#: camel/providers/smtp/camel-smtp-transport.c:1311
+#: camel/providers/smtp/camel-smtp-transport.c:1334
 #, c-format
 msgid "DATA send timed out: message termination: %s: mail not sent"
 msgstr "Tidsafbrud for DATA-send: beskedsterminering: %s: besked ikke sendt."
 
-#: camel/providers/smtp/camel-smtp-transport.c:1355
+#: camel/providers/smtp/camel-smtp-transport.c:1354
 msgid "DATA termination response error"
 msgstr "Fejl i DATA-termineringssvar"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1378
+#: camel/providers/smtp/camel-smtp-transport.c:1377
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr "Tidsafbrud for RSET-forespørgsel: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1398
+#: camel/providers/smtp/camel-smtp-transport.c:1397
 msgid "RSET response error"
 msgstr "Fejl i RSET-svar"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1421
+#: camel/providers/smtp/camel-smtp-transport.c:1420
 #, c-format
 msgid "QUIT request timed out: %s"
 msgstr "QUIT-forespørgslen gav time-out: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1441
+#: camel/providers/smtp/camel-smtp-transport.c:1440
 msgid "QUIT response error"
 msgstr "Fejl i QUIT-svar"
 
-#: composer/e-msg-composer-attachment-bar.c:103
+#: composer/e-msg-composer-attachment-bar.c:102
 #, c-format
 msgid "%.0fK"
 msgstr "%.0f k"
 
-#: composer/e-msg-composer-attachment-bar.c:106
+#: composer/e-msg-composer-attachment-bar.c:105
 #, c-format
 msgid "%.0fM"
 msgstr "%.0f M"
 
-#: composer/e-msg-composer-attachment-bar.c:109
+#: composer/e-msg-composer-attachment-bar.c:108
 #, c-format
 msgid "%.0fG"
 msgstr "%.0f G"
 
-#: composer/e-msg-composer-attachment-bar.c:300
+#. This is a filename. Translators take note.
+#: composer/e-msg-composer-attachment-bar.c:370 mail/mail-display.c:227
 msgid "attachment"
 msgstr "bilag"
 
-#: composer/e-msg-composer-attachment-bar.c:445
+#: composer/e-msg-composer-attachment-bar.c:508
 msgid "Remove selected items from the attachment list"
 msgstr "Fjern valgte opføringer fra bilagslisten"
 
-#: composer/e-msg-composer-attachment-bar.c:475
+#: composer/e-msg-composer-attachment-bar.c:538
 msgid "Add attachment..."
 msgstr "Tilføj bilag..."
 
-#: composer/e-msg-composer-attachment-bar.c:476
+#: composer/e-msg-composer-attachment-bar.c:539
 msgid "Attach a file to the message"
 msgstr "Vedlæg en fil til beskeden"
 
@@ -10667,11 +10481,88 @@ msgstr "MIME-type:"
 msgid "Suggest automatic display of attachment"
 msgstr "Foreslå automatisk visning af bilag"
 
-#: composer/e-msg-composer.c:562
+#: composer/e-msg-composer-hdrs.c:290
+msgid "Hey you, dunce. You need an account to send mail doncha know."
+msgstr ""
+
+#: composer/e-msg-composer-hdrs.c:483
+msgid "Click here for the address book"
+msgstr "Klik her for at få adressebogen op"
+
+#.
+#. * Reply-To:
+#. *
+#. * Create this before we call create_from_optionmenu,
+#. * because that causes from_changed to be called, which
+#. * expects the reply_to fields to be initialized.
+#.
+#: composer/e-msg-composer-hdrs.c:514
+msgid "Reply-To:"
+msgstr "Svar-til:"
+
+#.
+#. * From
+#.
+#: composer/e-msg-composer-hdrs.c:520
+msgid "From:"
+msgstr "Fra:"
+
+#.
+#. * Subject
+#.
+#: composer/e-msg-composer-hdrs.c:526
+msgid "Subject:"
+msgstr "Emne:"
+
+#: composer/e-msg-composer-hdrs.c:535
+msgid "To:"
+msgstr "Til:"
+
+#: composer/e-msg-composer-hdrs.c:536
+msgid "Enter the recipients of the message"
+msgstr "Indtast modtagerene for beskeden"
+
+#: composer/e-msg-composer-hdrs.c:539
+msgid "Cc:"
+msgstr "Cc:"
+
+#: composer/e-msg-composer-hdrs.c:540
+msgid "Enter the addresses that will receive a carbon copy of the message"
+msgstr "Indtast adresserne som skal modtage en kopi af beskeden"
+
+#: composer/e-msg-composer-hdrs.c:543
+msgid "Bcc:"
+msgstr "Bcc:"
+
+#: composer/e-msg-composer-hdrs.c:544
+msgid ""
+"Enter the addresses that will receive a carbon copy of the message without "
+"appearing in the recipient list of the message."
+msgstr ""
+"Indtast adresserne som skal modtage en kopi af beskeden uden at komme til "
+"syne i modtagerlisten for beskeden."
+
+#.
+#. * Post-To
+#.
+#: composer/e-msg-composer-hdrs.c:551
+msgid "Post To:"
+msgstr "Send til:"
+
+#: composer/e-msg-composer-hdrs.c:553
+msgid "Posting destination"
+msgstr "Postdestination"
+
+#: composer/e-msg-composer-select-file.c:102
+#: composer/e-msg-composer-select-file.c:119
+msgid "Attach file(s)"
+msgstr "Vedhæft fil(er)"
+
+#: composer/e-msg-composer.c:535
 msgid "Could not create a PGP signature context"
 msgstr "Kunne ikke oprette et PGP-signaturkontekst"
 
-#: composer/e-msg-composer.c:841
+#: composer/e-msg-composer.c:814
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
@@ -10680,30 +10571,30 @@ msgstr ""
 "Fejl under læsning af fil %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:1206
+#: composer/e-msg-composer.c:1177
 msgid "File exists, overwrite?"
 msgstr "Filen eksisterer, overskriv?"
 
-#: composer/e-msg-composer.c:1217 composer/e-msg-composer.c:1233
+#: composer/e-msg-composer.c:1195
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Fejl under gemning af fil: %s"
 
-#: composer/e-msg-composer.c:1256
+#: composer/e-msg-composer.c:1218
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Fejl under indlæsning af fil: %s"
 
-#: composer/e-msg-composer.c:1294
+#: composer/e-msg-composer.c:1256
 #, c-format
 msgid "Error accessing file: %s"
 msgstr "Fejl ved adgang til fil: %s"
 
-#: composer/e-msg-composer.c:1302
+#: composer/e-msg-composer.c:1264
 msgid "Unable to retrieve message from editor"
 msgstr "Kunne ikke hente besked fra redigering"
 
-#: composer/e-msg-composer.c:1309
+#: composer/e-msg-composer.c:1271
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -10712,7 +10603,7 @@ msgstr ""
 "Kunne ikke søge i fil: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1316
+#: composer/e-msg-composer.c:1278
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -10721,7 +10612,7 @@ msgstr ""
 "Kunne ikke afkorte fil: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1325
+#: composer/e-msg-composer.c:1287
 #, c-format
 msgid ""
 "Unable to copy file descriptor: %s\n"
@@ -10730,7 +10621,7 @@ msgstr ""
 "Kan ikke kopiere filhandtag: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1334
+#: composer/e-msg-composer.c:1296
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -10739,7 +10630,7 @@ msgstr ""
 "Fejl under autogemning af besked: %s:\n"
 " %s"
 
-#: composer/e-msg-composer.c:1431
+#: composer/e-msg-composer.c:1390
 msgid ""
 "Ximian Evolution has found unsaved files from a previous session.\n"
 "Would you like to try to recover them?"
@@ -10747,7 +10638,7 @@ msgstr ""
 "Ximian Evolution har fundet ikke-gemte filer fra en tidligere session.\n"
 "Vil du prøve at genoprette dem?"
 
-#: composer/e-msg-composer.c:1594
+#: composer/e-msg-composer.c:1552
 #, c-format
 msgid ""
 "The message \"%s\" has not been sent.\n"
@@ -10758,28 +10649,28 @@ msgstr ""
 "\n"
 "Vil du gemme dine ændringar?"
 
-#: composer/e-msg-composer.c:1603
+#: composer/e-msg-composer.c:1561
 msgid "Warning: Modified Message"
 msgstr "Advarsel: Ændret besked"
 
-#: composer/e-msg-composer.c:1635
+#: composer/e-msg-composer.c:1593
 msgid "Open file"
 msgstr "Åbn fil"
 
-#: composer/e-msg-composer.c:2054
+#: composer/e-msg-composer.c:2017
 msgid "Signature:"
 msgstr "Signatur:"
 
-#: composer/e-msg-composer.c:2094 mail/mail-account-gui.c:1261
+#: composer/e-msg-composer.c:2057 mail/mail-account-gui.c:1261
 msgid "Autogenerated"
 msgstr "Automatisk genereret"
 
-#: composer/e-msg-composer.c:2274 composer/e-msg-composer.c:2970
-#: composer/e-msg-composer.c:2971
+#: composer/e-msg-composer.c:2233 composer/e-msg-composer.c:2902
+#: composer/e-msg-composer.c:2903
 msgid "Compose a message"
 msgstr "Skriv en besked"
 
-#: composer/e-msg-composer.c:3002
+#: composer/e-msg-composer.c:2934
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
@@ -10787,7 +10678,7 @@ msgstr ""
 "Kunne ikke oprette vindue:\n"
 "adresseudvælgelses-kontrol kunne ikke aktiveres."
 
-#: composer/e-msg-composer.c:3030
+#: composer/e-msg-composer.c:2962
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component.\n"
@@ -10799,7 +10690,7 @@ msgstr ""
 "Verficér at du har de rette versioner af\n"
 "gtkhtml og libgtkhtml installeret.\n"
 
-#: composer/e-msg-composer.c:3100
+#: composer/e-msg-composer.c:3029
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component."
@@ -10807,7 +10698,7 @@ msgstr ""
 "Kunne ikke oprette vindue:\n"
 "En komponent i HTML tekstbehandler kunne ikke aktiveres."
 
-#: composer/e-msg-composer.c:4110
+#: composer/e-msg-composer.c:4045
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)"
 "<b>"
@@ -10815,85 +10706,6 @@ msgstr ""
 "<b>(Redigeringsværktøjet indeholder et meddelelse som ikke er text og som "
 "ikke kan redigeres.)<b>"
 
-#: composer/e-msg-composer-hdrs.c:290
-#, fuzzy
-msgid "You need to configure an account before you can compose mail."
-msgstr ""
-"Du skal konfigurere en konto\n"
-"inden du kan skrive e-post."
-
-#: composer/e-msg-composer-hdrs.c:483
-msgid "Click here for the address book"
-msgstr "Klik her for at få adressebogen op"
-
-#.
-#. * Reply-To:
-#. *
-#. * Create this before we call create_from_optionmenu,
-#. * because that causes from_changed to be called, which
-#. * expects the reply_to fields to be initialized.
-#.
-#: composer/e-msg-composer-hdrs.c:514
-msgid "Reply-To:"
-msgstr "Svar-til:"
-
-#.
-#. * From
-#.
-#: composer/e-msg-composer-hdrs.c:520
-msgid "From:"
-msgstr "Fra:"
-
-#.
-#. * Subject
-#.
-#: composer/e-msg-composer-hdrs.c:526
-msgid "Subject:"
-msgstr "Emne:"
-
-#: composer/e-msg-composer-hdrs.c:535
-msgid "To:"
-msgstr "Til:"
-
-#: composer/e-msg-composer-hdrs.c:536
-msgid "Enter the recipients of the message"
-msgstr "Indtast modtagerene for beskeden"
-
-#: composer/e-msg-composer-hdrs.c:539
-msgid "Cc:"
-msgstr "Cc:"
-
-#: composer/e-msg-composer-hdrs.c:540
-msgid "Enter the addresses that will receive a carbon copy of the message"
-msgstr "Indtast adresserne som skal modtage en kopi af beskeden"
-
-#: composer/e-msg-composer-hdrs.c:543
-msgid "Bcc:"
-msgstr "Bcc:"
-
-#: composer/e-msg-composer-hdrs.c:544
-msgid ""
-"Enter the addresses that will receive a carbon copy of the message without "
-"appearing in the recipient list of the message."
-msgstr ""
-"Indtast adresserne som skal modtage en kopi af beskeden uden at komme til "
-"syne i modtagerlisten for beskeden."
-
-#.
-#. * Post-To
-#.
-#: composer/e-msg-composer-hdrs.c:551
-msgid "Post To:"
-msgstr "Send til:"
-
-#: composer/e-msg-composer-hdrs.c:553
-msgid "Posting destination"
-msgstr "Postdestination"
-
-#: composer/e-msg-composer-select-file.c:119
-msgid "Attach file(s)"
-msgstr "Vedhæft fil(er)"
-
 #: data/evolution.desktop.in.h:1
 msgid "The Evolution groupware suite"
 msgstr "Gruppevaresuiten Evolution"
@@ -11056,7 +10868,7 @@ msgstr ""
 "En fil med samme navn eksisterer allerede.\n"
 "Overskriv den?"
 
-#: e-util/e-dialog-utils.c:249
+#: e-util/e-dialog-utils.c:249 mail/mail-display.c:200
 msgid "Overwrite file?"
 msgstr "Overskriv fil?"
 
@@ -11078,210 +10890,90 @@ msgstr "Synkroniser kategorier:"
 
 #. strptime format of a weekday, a date and a time,
 #. in 12-hour format, without seconds.
-#: e-util/e-time-utils.c:185 e-util/e-time-utils.c:398
+#: e-util/e-time-utils.c:172 e-util/e-time-utils.c:385
 msgid "%a %m/%d/%Y %I:%M %p"
 msgstr "%a %Y-%m-%d %H:%M"
 
 #. strptime format of a weekday, a date and a time,
 #. in 24-hour format, without seconds.
-#: e-util/e-time-utils.c:190 e-util/e-time-utils.c:389
+#: e-util/e-time-utils.c:177 e-util/e-time-utils.c:376
 msgid "%a %m/%d/%Y %H:%M"
 msgstr "%a %Y-%m-%d %H:%M"
 
 #. strptime format of a weekday, a date and a time,
 #. in 12-hour format, without minutes or seconds.
-#: e-util/e-time-utils.c:195
+#: e-util/e-time-utils.c:182
 msgid "%a %m/%d/%Y %I %p"
 msgstr "%a %Y-%m-%d %H"
 
 #. strptime format of a weekday, a date and a time,
 #. in 24-hour format, without minutes or seconds.
-#: e-util/e-time-utils.c:200
+#: e-util/e-time-utils.c:187
 msgid "%a %m/%d/%Y %H"
 msgstr "%a %Y-%m-%d %H"
 
 #. strptime format of a date and a time, in 12-hour format.
-#: e-util/e-time-utils.c:211
+#: e-util/e-time-utils.c:198
 msgid "%m/%d/%Y %I:%M:%S %p"
 msgstr "%Y-%m-%d %H:%M:%S"
 
 #. strptime format of a date and a time, in 24-hour format.
-#: e-util/e-time-utils.c:215
+#: e-util/e-time-utils.c:202
 msgid "%m/%d/%Y %H:%M:%S"
 msgstr "%Y-%m-%d %H:%M:%S"
 
 #. strptime format of a date and a time, in 12-hour format,
 #. without seconds.
-#: e-util/e-time-utils.c:220
+#: e-util/e-time-utils.c:207
 msgid "%m/%d/%Y %I:%M %p"
 msgstr "%Y-%m-%d %H:%M"
 
 #. strptime format of a date and a time, in 24-hour format,
 #. without seconds.
-#: e-util/e-time-utils.c:225
+#: e-util/e-time-utils.c:212
 msgid "%m/%d/%Y %H:%M"
 msgstr "%Y-%m-%d %H:%M"
 
 #. strptime format of a date and a time, in 12-hour format,
 #. without minutes or seconds.
-#: e-util/e-time-utils.c:230
+#: e-util/e-time-utils.c:217
 msgid "%m/%d/%Y %I %p"
 msgstr "%Y-%m-%d %H %p"
 
 #. strptime format of a date and a time, in 24-hour format,
 #. without minutes or seconds.
-#: e-util/e-time-utils.c:235
+#: e-util/e-time-utils.c:222
 msgid "%m/%d/%Y %H"
 msgstr "%Y-%m-%d %H"
 
 #. strptime format for a time of day, in 12-hour format.
-#: e-util/e-time-utils.c:339 e-util/e-time-utils.c:438
+#: e-util/e-time-utils.c:326 e-util/e-time-utils.c:425
 msgid "%I:%M:%S %p"
 msgstr "%H:%M:%S"
 
 #. strptime format for a time of day, in 24-hour format.
-#: e-util/e-time-utils.c:343 e-util/e-time-utils.c:430
+#: e-util/e-time-utils.c:330 e-util/e-time-utils.c:417
 msgid "%H:%M:%S"
 msgstr "%H:%M:%S"
 
 #. strptime format for time of day, without seconds,
 #. in 12-hour format.
-#: e-util/e-time-utils.c:348 e-util/e-time-utils.c:435
-#: widgets/misc/e-dateedit.c:1417 widgets/misc/e-dateedit.c:1642
+#: e-util/e-time-utils.c:335 e-util/e-time-utils.c:422
+#: widgets/misc/e-dateedit.c:1404 widgets/misc/e-dateedit.c:1617
 msgid "%I:%M %p"
 msgstr "%H:%M"
 
 #. strptime format for time of day, without seconds 24-hour format.
-#: e-util/e-time-utils.c:352 e-util/e-time-utils.c:427
-#: widgets/misc/e-dateedit.c:1414 widgets/misc/e-dateedit.c:1639
+#: e-util/e-time-utils.c:339 e-util/e-time-utils.c:414
+#: widgets/misc/e-dateedit.c:1401 widgets/misc/e-dateedit.c:1614
 msgid "%H:%M"
 msgstr "%H:%M"
 
 #. strptime format for hour and AM/PM, 12-hour format.
-#: e-util/e-time-utils.c:356
+#: e-util/e-time-utils.c:343
 msgid "%I %p"
 msgstr "%H"
 
-#: executive-summary/component/component-factory.c:151
-#, fuzzy
-msgid "Cannot initialize Evolution's Executive Summary component."
-msgstr "Kan ikke initiere Evolutions konfigurationskomponent for e-post."
-
-#: executive-summary/component/e-summary.c:925
-#, fuzzy, c-format
-msgid ""
-"Cannot open the HTML file:\n"
-"%s"
-msgstr ""
-"Kunne ikke ændre navn på mappe:\n"
-"%s"
-
-#: executive-summary/component/e-summary.c:939
-#, fuzzy, c-format
-msgid ""
-"Error reading data:\n"
-"%s"
-msgstr "Fejl under indlæsning af %s"
-
-#: executive-summary/component/e-summary.c:957
-msgid "File does not have a place for the services.\n"
-msgstr ""
-
-#: executive-summary/component/e-summary-callbacks.c:125
-#, fuzzy
-msgid "Select a service"
-msgstr "Vælg en fil"
-
-#: executive-summary/component/e-summary-callbacks.c:289
-msgid ""
-"You can select a different HTML page for the background of the Executive "
-"Summary.\n"
-"\n"
-"Just leave it blank for the default"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:69
-#: executive-summary/component/e-summary-url.c:74
-#: executive-summary/component/e-summary-url.c:81
-#, c-format
-msgid "Open %s with the default GNOME application"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:70
-#, c-format
-msgid "Open %s with the default GNOME web browser"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:71
-#, fuzzy, c-format
-msgid "Send an email to %s"
-msgstr "Send en besked"
-
-#: executive-summary/component/e-summary-url.c:72
-#, fuzzy, c-format
-msgid "Change the view to %s"
-msgstr "Typen af visning der skal bruges"
-
-#: executive-summary/component/e-summary-url.c:73
-#, fuzzy, c-format
-msgid "Run %s"
-msgstr "URL: %s"
-
-#: executive-summary/component/e-summary-url.c:75
-#, fuzzy, c-format
-msgid "Close %s"
-msgstr "Luk"
-
-#: executive-summary/component/e-summary-url.c:76
-#, fuzzy, c-format
-msgid "Move %s to the left"
-msgstr "Flyt denne mappe til et andet sted"
-
-#: executive-summary/component/e-summary-url.c:77
-#, c-format
-msgid "Move %s to the right"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:78
-#, c-format
-msgid "Move %s into the previous row"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:79
-#, c-format
-msgid "Move %s into the next row"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:80
-#, fuzzy, c-format
-msgid "Configure %s"
-msgstr "Konfigurér /%s igen"
-
-#: executive-summary/component/e-summary-url.c:553
-#, fuzzy
-msgid "page"
-msgstr "Side"
-
-#: executive-summary/test-service/rdf-summary.c:512
-#: executive-summary/test-service/rdf-summary.c:549
-#: executive-summary/test-service/rdf-summary.c:594
-msgid "Error"
-msgstr "Fejl"
-
-#: executive-summary/test-service/rdf-summary.c:775
-msgid "Update automatically"
-msgstr ""
-
-#: executive-summary/test-service/rdf-summary.c:785
-#, fuzzy
-msgid "Update now"
-msgstr "Opgaveopdatering"
-
-#: executive-summary/test-service/rdf-summary.c:795
-#, fuzzy
-msgid "Update every "
-msgstr "_Opdatér ledig/optaget"
-
 #: filter/filter-datespec.c:65
 msgid "1 second ago"
 msgstr "1 sekund siden"
@@ -11397,6 +11089,84 @@ msgstr "Du skal angive en mappe."
 msgid "Select Folder"
 msgstr "Vælg mappe"
 
+#: filter/filter-input.c:191
+#, c-format
+msgid ""
+"Error in regular expression '%s':\n"
+"%s"
+msgstr ""
+"Fejl i regulært udtryk '%s':\n"
+"%s"
+
+#: filter/filter-label.c:121 filter/libfilter-i18n.h:26 mail/mail-config.c:65
+#: mail/mail-config.glade.h:62 shell/e-config-upgrade.c:1411
+msgid "Important"
+msgstr "Vigtig"
+
+#. red
+#: filter/filter-label.c:122 mail/mail-config.c:66
+#: mail/mail-config.glade.h:129 shell/e-config-upgrade.c:1412
+msgid "Work"
+msgstr "Arbejde"
+
+#. orange
+#: filter/filter-label.c:123 mail/mail-config.c:67 mail/mail-config.glade.h:84
+#: shell/e-config-upgrade.c:1413
+msgid "Personal"
+msgstr "Personligt"
+
+#. forest green
+#: filter/filter-label.c:124 mail/mail-config.c:68
+#: mail/mail-config.glade.h:120 shell/e-config-upgrade.c:1414
+msgid "To Do"
+msgstr "At-gøre"
+
+#. blue
+#: filter/filter-label.c:125 mail/mail-config.c:69 mail/mail-config.glade.h:66
+#: shell/e-config-upgrade.c:1415
+msgid "Later"
+msgstr "Senere"
+
+#: filter/filter-part.c:531 shell/evolution-test-component.c:63
+msgid "Test"
+msgstr "Test"
+
+#: filter/filter-rule.c:219
+msgid "You must name this filter."
+msgstr "Du skal give navn til dette filter."
+
+#: filter/filter-rule.c:751
+msgid "Rule name: "
+msgstr "Regelnavn: "
+
+#: filter/filter-rule.c:755
+msgid "Untitled"
+msgstr "Uden navn"
+
+#: filter/filter-rule.c:772
+msgid "If"
+msgstr "Hvis"
+
+#: filter/filter-rule.c:791
+msgid "Execute actions"
+msgstr "Udfør handlinger"
+
+#: filter/filter-rule.c:795
+msgid "if all criteria are met"
+msgstr "hvis alle kriterier er mødt"
+
+#: filter/filter-rule.c:800
+msgid "if any criteria are met"
+msgstr "hvis nogen betingelser er opfyldt"
+
+#: filter/filter-rule.c:895
+msgid "incoming"
+msgstr "indkommende"
+
+#: filter/filter-rule.c:895
+msgid "outgoing"
+msgstr "udgående"
+
 #: filter/filter.glade.h:1
 msgid "Compare against"
 msgstr "Sammenlign med"
@@ -11498,84 +11268,6 @@ msgstr "med alle lokale mapper"
 msgid "years"
 msgstr "år"
 
-#: filter/filter-input.c:191
-#, c-format
-msgid ""
-"Error in regular expression '%s':\n"
-"%s"
-msgstr ""
-"Fejl i regulært udtryk '%s':\n"
-"%s"
-
-#: filter/filter-label.c:121 filter/libfilter-i18n.h:17 mail/mail-config.c:65
-#: mail/mail-config.glade.h:62 shell/e-config-upgrade.c:1454
-msgid "Important"
-msgstr "Vigtig"
-
-#. red
-#: filter/filter-label.c:122 mail/mail-config.c:66
-#: mail/mail-config.glade.h:129 shell/e-config-upgrade.c:1455
-msgid "Work"
-msgstr "Arbejde"
-
-#. orange
-#: filter/filter-label.c:123 mail/mail-config.c:67 mail/mail-config.glade.h:84
-#: shell/e-config-upgrade.c:1456
-msgid "Personal"
-msgstr "Personligt"
-
-#. forest green
-#: filter/filter-label.c:124 mail/mail-config.c:68
-#: mail/mail-config.glade.h:120 shell/e-config-upgrade.c:1457
-msgid "To Do"
-msgstr "At-gøre"
-
-#. blue
-#: filter/filter-label.c:125 mail/mail-config.c:69 mail/mail-config.glade.h:66
-#: shell/e-config-upgrade.c:1458
-msgid "Later"
-msgstr "Senere"
-
-#: filter/filter-part.c:531 shell/evolution-test-component.c:63
-msgid "Test"
-msgstr "Test"
-
-#: filter/filter-rule.c:219
-msgid "You must name this filter."
-msgstr "Du skal give navn til dette filter."
-
-#: filter/filter-rule.c:751
-msgid "Rule name: "
-msgstr "Regelnavn: "
-
-#: filter/filter-rule.c:755
-msgid "Untitled"
-msgstr "Uden navn"
-
-#: filter/filter-rule.c:772
-msgid "If"
-msgstr "Hvis"
-
-#: filter/filter-rule.c:791
-msgid "Execute actions"
-msgstr "Udfør handlinger"
-
-#: filter/filter-rule.c:795
-msgid "if all criteria are met"
-msgstr "hvis alle kriterier er mødt"
-
-#: filter/filter-rule.c:800
-msgid "if any criteria are met"
-msgstr "hvis nogen betingelser er opfyldt"
-
-#: filter/filter-rule.c:895
-msgid "incoming"
-msgstr "indkommende"
-
-#: filter/filter-rule.c:895
-msgid "outgoing"
-msgstr "udgående"
-
 #. Automatically generated. Do not edit.
 #: filter/libfilter-i18n.h:2
 msgid "Adjust Score"
@@ -11598,217 +11290,217 @@ msgid "Beep"
 msgstr "Bip"
 
 #: filter/libfilter-i18n.h:7
+msgid "contains"
+msgstr "indeholder"
+
+#: filter/libfilter-i18n.h:8
 msgid "Copy to Folder"
 msgstr "Kopier til mappe"
 
-#: filter/libfilter-i18n.h:8
+#: filter/libfilter-i18n.h:9
 msgid "Date received"
 msgstr "Dato modtaget"
 
-#: filter/libfilter-i18n.h:9
+#: filter/libfilter-i18n.h:10
 msgid "Date sent"
 msgstr "Dato sendt"
 
-#: filter/libfilter-i18n.h:11
+#: filter/libfilter-i18n.h:12
 msgid "Deleted"
 msgstr "Slettet"
 
-#: filter/libfilter-i18n.h:12
-msgid "Do Not Exist"
-msgstr "Eksisterer ikke"
-
 #: filter/libfilter-i18n.h:13
-msgid "Draft"
-msgstr "Skitse"
+msgid "does not contain"
+msgstr "indeholder ikke"
 
 #: filter/libfilter-i18n.h:14
-msgid "Exist"
-msgstr "Eksisterer"
+msgid "does not end with"
+msgstr "slutter ikke med"
 
 #: filter/libfilter-i18n.h:15
-msgid "Expression"
-msgstr "Udtryk"
+msgid "does not exist"
+msgstr "eksisterer ikke"
 
 #: filter/libfilter-i18n.h:16
-msgid "Follow Up"
-msgstr "Følg op"
+msgid "does not return"
+msgstr "returnerer ikke"
+
+#: filter/libfilter-i18n.h:17
+msgid "does not sound like"
+msgstr "ligner ikke"
 
 #: filter/libfilter-i18n.h:18
-msgid "Label"
-msgstr "Etiket"
+msgid "does not start with"
+msgstr "starter ikke med"
 
 #: filter/libfilter-i18n.h:19
-msgid "Mailing list"
-msgstr "E-post-liste"
+msgid "Do Not Exist"
+msgstr "Eksisterer ikke"
 
 #: filter/libfilter-i18n.h:20
-msgid "Message Body"
-msgstr "Beskedskrop"
+msgid "Draft"
+msgstr "Skitse"
 
 #: filter/libfilter-i18n.h:21
-msgid "Message Header"
-msgstr "Beskedshoved"
+msgid "ends with"
+msgstr "slutter med"
 
 #: filter/libfilter-i18n.h:22
-msgid "Move to Folder"
-msgstr "Flyt til mappe"
+msgid "Exist"
+msgstr "Eksisterer"
 
 #: filter/libfilter-i18n.h:23
-msgid "Pipe Message to Shell Command"
-msgstr "Send meddelelse igennem skalkommando"
+msgid "exists"
+msgstr "eksisterer"
 
 #: filter/libfilter-i18n.h:24
-msgid "Play Sound"
-msgstr "Afspil lyd"
-
-#: filter/libfilter-i18n.h:25 mail/message-tag-followup.c:68
-msgid "Read"
-msgstr "Læs"
+msgid "Expression"
+msgstr "Udtryk"
 
-#: filter/libfilter-i18n.h:26
-msgid "Recipients"
-msgstr "Modtagere"
+#: filter/libfilter-i18n.h:25
+msgid "Follow Up"
+msgstr "Følg op"
 
 #: filter/libfilter-i18n.h:27
-msgid "Regex Match"
-msgstr "Træffer på regulært udtryk"
+msgid "is"
+msgstr "er"
 
 #: filter/libfilter-i18n.h:28
-msgid "Replied to"
-msgstr "Svaret til"
+msgid "is after"
+msgstr "er efter"
 
-#: filter/libfilter-i18n.h:29 filter/score-rule.c:184 filter/score-rule.c:186
-#: mail/message-list.etspec.h:10
-msgid "Score"
-msgstr "Point"
+#: filter/libfilter-i18n.h:29
+msgid "is before"
+msgstr "er inden"
 
 #: filter/libfilter-i18n.h:30
-msgid "Sender"
-msgstr "Afsender"
+msgid "is Flagged"
+msgstr "er markeret med flag"
 
 #: filter/libfilter-i18n.h:31
-msgid "Set Status"
-msgstr "Sæt status"
+msgid "is greater than"
+msgstr "er større end"
 
 #: filter/libfilter-i18n.h:32
-msgid "Shell Command"
-msgstr "Skalkommando"
+msgid "is less than"
+msgstr "er mindre end"
 
 #: filter/libfilter-i18n.h:33
-msgid "Size (kB)"
-msgstr "Størrelse (kB)"
+msgid "is not"
+msgstr "er ikke"
 
 #: filter/libfilter-i18n.h:34
-msgid "Source Account"
-msgstr "Kildekonto"
+msgid "is not Flagged"
+msgstr "er ikke markeret med flag"
 
-#: filter/libfilter-i18n.h:35
-msgid "Specific header"
-msgstr "Specifik header"
+#: filter/libfilter-i18n.h:35 mail/folder-browser.c:1800
+msgid "Label"
+msgstr "Etiket"
+
+#: filter/libfilter-i18n.h:36
+msgid "Mailing list"
+msgstr "E-post-liste"
 
 #: filter/libfilter-i18n.h:37
-msgid "Stop Processing"
-msgstr "Stop behandling"
+msgid "Message Body"
+msgstr "Beskedskrop"
 
-#: filter/libfilter-i18n.h:38 mail/message-list.etspec.h:13
-#: mail/message-tag-followup.c:305
-msgid "Subject"
-msgstr "Emne"
+#: filter/libfilter-i18n.h:38
+msgid "Message Header"
+msgstr "Beskedshoved"
 
 #: filter/libfilter-i18n.h:39
-msgid "Unset Status"
-msgstr "Neutraliser status"
+msgid "Move to Folder"
+msgstr "Flyt til mappe"
 
 #: filter/libfilter-i18n.h:40
-msgid "contains"
-msgstr "indeholder"
+msgid "Pipe Message to Shell Command"
+msgstr "Send meddelelse igennem skalkommando"
 
 #: filter/libfilter-i18n.h:41
-msgid "does not contain"
-msgstr "indeholder ikke"
+msgid "Play Sound"
+msgstr "Afspil lyd"
 
-#: filter/libfilter-i18n.h:42
-msgid "does not end with"
-msgstr "slutter ikke med"
+#: filter/libfilter-i18n.h:42 mail/message-tag-followup.c:68
+msgid "Read"
+msgstr "Læs"
 
 #: filter/libfilter-i18n.h:43
-msgid "does not exist"
-msgstr "eksisterer ikke"
+msgid "Recipients"
+msgstr "Modtagere"
 
 #: filter/libfilter-i18n.h:44
-msgid "does not return"
-msgstr "returnerer ikke"
+msgid "Regex Match"
+msgstr "Træffer på regulært udtryk"
 
 #: filter/libfilter-i18n.h:45
-msgid "does not sound like"
-msgstr "ligner ikke"
+msgid "Replied to"
+msgstr "Svaret til"
 
 #: filter/libfilter-i18n.h:46
-msgid "does not start with"
-msgstr "starter ikke med"
+msgid "returns"
+msgstr "returnerer"
 
 #: filter/libfilter-i18n.h:47
-msgid "ends with"
-msgstr "slutter med"
+msgid "returns greater than"
+msgstr "returnerer større end"
 
 #: filter/libfilter-i18n.h:48
-msgid "exists"
-msgstr "eksisterer"
+msgid "returns less than"
+msgstr "returnerer mindre end"
 
-#: filter/libfilter-i18n.h:49
-msgid "is Flagged"
-msgstr "er markeret med flag"
+#: filter/libfilter-i18n.h:49 filter/score-rule.c:184 filter/score-rule.c:186
+#: mail/message-list.etspec.h:10
+msgid "Score"
+msgstr "Point"
 
-#: filter/libfilter-i18n.h:50
-msgid "is after"
-msgstr "er efter"
+#: filter/libfilter-i18n.h:50 mail/mail-callbacks.c:1820
+msgid "Sender"
+msgstr "Afsender"
 
 #: filter/libfilter-i18n.h:51
-msgid "is before"
-msgstr "er inden"
+msgid "Set Status"
+msgstr "Sæt status"
 
 #: filter/libfilter-i18n.h:52
-msgid "is greater than"
-msgstr "er større end"
+msgid "Shell Command"
+msgstr "Skalkommando"
 
 #: filter/libfilter-i18n.h:53
-msgid "is less than"
-msgstr "er mindre end"
+msgid "Size (kB)"
+msgstr "Størrelse (kB)"
 
 #: filter/libfilter-i18n.h:54
-msgid "is not Flagged"
-msgstr "er ikke markeret med flag"
+msgid "sounds like"
+msgstr "lyder som"
 
 #: filter/libfilter-i18n.h:55
-msgid "is not"
-msgstr "er ikke"
+msgid "Source Account"
+msgstr "Kildekonto"
 
 #: filter/libfilter-i18n.h:56
-msgid "is"
-msgstr "er"
+msgid "Specific header"
+msgstr "Specifik header"
 
 #: filter/libfilter-i18n.h:57
-msgid "returns greater than"
-msgstr "returnerer større end"
-
-#: filter/libfilter-i18n.h:58
-msgid "returns less than"
-msgstr "returnerer mindre end"
+msgid "starts with"
+msgstr "starter med"
 
 #: filter/libfilter-i18n.h:59
-msgid "returns"
-msgstr "returnerer"
+msgid "Stop Processing"
+msgstr "Stop behandling"
 
-#: filter/libfilter-i18n.h:60
-msgid "sounds like"
-msgstr "lyder som"
+#: filter/libfilter-i18n.h:60 mail/mail-format.c:934
+#: mail/message-list.etspec.h:13 mail/message-tag-followup.c:305
+msgid "Subject"
+msgstr "Emne"
 
 #: filter/libfilter-i18n.h:61
-msgid "starts with"
-msgstr "starter med"
+msgid "Unset Status"
+msgstr "Neutraliser status"
 
-#: filter/rule-context.c:684 filter/rule-editor.c:241 filter/rule-editor.c:326
-#: mail/mail-vfolder.c:916
+#: filter/rule-context.c:664 filter/rule-editor.c:241 filter/rule-editor.c:326
+#: mail/mail-vfolder.c:917
 #, c-format
 msgid "Rule name '%s' is not unique, choose another."
 msgstr "Regelnavnet \"%s\" er ikke unikt, vælg et andet."
@@ -11876,9 +11568,10 @@ msgid "Scanning %s"
 msgstr "Søger i %s"
 
 #: importers/elm-importer.c:525 importers/netscape-importer.c:2128
-#: importers/pine-importer.c:637 mail/component-factory.c:116
-#: mail/importers/elm-importer.c:526 mail/importers/netscape-importer.c:2085
-#: mail/importers/pine-importer.c:572 my-evolution/my-evolution.glade.h:4
+#: importers/pine-importer.c:637 mail/component-factory.c:117
+#: mail/folder-browser-ui.c:360 mail/importers/elm-importer.c:526
+#: mail/importers/netscape-importer.c:2085 mail/importers/pine-importer.c:572
+#: my-evolution/my-evolution.glade.h:4
 msgid "Mail"
 msgstr "Post"
 
@@ -11965,7 +11658,7 @@ msgstr "Evolution importerer dine gamle data fra Netscape"
 
 #. Fill in the new fields
 #: importers/netscape-importer.c:1872 mail/importers/netscape-importer.c:1842
-#: mail/mail-ops.c:1106 shell/e-local-storage.c:184
+#: mail/mail-ops.c:1092 shell/e-local-storage.c:184
 msgid "Trash"
 msgstr "Affald"
 
@@ -11979,7 +11672,7 @@ msgid "Scanning directory"
 msgstr "Søger i katalog"
 
 #: importers/netscape-importer.c:2047 mail/importers/netscape-importer.c:2015
-#: shell/e-shell-startup-wizard.c:556
+#: shell/e-shell-startup-wizard.c:541
 msgid "Starting import"
 msgstr "Starter import"
 
@@ -12015,39 +11708,98 @@ msgstr ""
 msgid "Pine"
 msgstr "Pine"
 
-#: mail/component-factory.c:116
+#: mail/GNOME_Evolution_Mail.server.in.in.h:1
+msgid "Composer Preferences"
+msgstr "Redigererindstillinger"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:2
+msgid ""
+"Configure mail preferences, including security and message display, here"
+msgstr ""
+"Konfigurér e-post-indstillinger, inklusive sikkerhed og meddelelsesvisning, "
+"hér"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:3
+msgid "Configure spell-checking, signatures, and the message composer here"
+msgstr "Konfigurér stavekontrol, signaturer, og meddelelseredigeringen hér"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:4
+msgid "Configure your email accounts here"
+msgstr "Konfigurér dine e-post-konti her"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:5
+msgid "Evolution Mail"
+msgstr "Evolution e-post"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:6
+msgid "Evolution Mail accounts configuration control"
+msgstr "Evolution e-post-kontoopsætnings-styreelement"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:7
+msgid "Evolution Mail component"
+msgstr "Evolutions e-post-komponent"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:8
+msgid "Evolution Mail composer"
+msgstr "Evolutions e-post-redigering"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:9
+msgid "Evolution Mail composer configuration control"
+msgstr "Evolutions e-post-redigereropsætnings-styreelement"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:10
+msgid "Evolution Mail configuration interface"
+msgstr "Evolution e-post-opsætningsgrænseflade"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:11
+msgid "Evolution Mail folder viewer"
+msgstr "Evolution e-post-mappevisning"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:12
+msgid "Evolution Mail preferences control"
+msgstr "Evolution e-post-indstillings-styreelement"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:13
+msgid "Mail Accounts"
+msgstr "E-post-konti"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:69
+msgid "Mail Preferences"
+msgstr "E-post-indstillinger"
+
+#: mail/component-factory.c:117
 msgid "Folder containing mail"
 msgstr "Mappe som indeholder e-post"
 
-#: mail/component-factory.c:117
+#: mail/component-factory.c:118
 msgid "Public Mail"
 msgstr "Offentlig post"
 
-#: mail/component-factory.c:117
+#: mail/component-factory.c:118
 msgid "Public folder containing mail"
 msgstr "Offentlig mappe som indeholder e-post"
 
-#: mail/component-factory.c:118
+#: mail/component-factory.c:119
 msgid "Virtual Trash"
 msgstr "Virtuelt affald"
 
-#: mail/component-factory.c:118
+#: mail/component-factory.c:119
 msgid "Virtual Trash folder"
 msgstr "Virtuel affaldsmappe"
 
-#: mail/component-factory.c:146
+#: mail/component-factory.c:147
 msgid "This folder cannot contain messages."
 msgstr "Denne mappe kan ikke indeholde beskeder."
 
-#: mail/component-factory.c:444
+#: mail/component-factory.c:441
 msgid "Properties..."
 msgstr "Egenskaber ..."
 
-#: mail/component-factory.c:444
+#: mail/component-factory.c:441
 msgid "Change this folder's properties"
 msgstr "Ændr denne mappes egenskaber"
 
-#: mail/component-factory.c:826
+#: mail/component-factory.c:819
 msgid ""
 "Some of your mail settings seem corrupt, please check that everything is in "
 "order."
@@ -12055,108 +11807,234 @@ msgstr ""
 "Nogen af dine indstillinger for e-post ser ud til at være beskadiget. "
 "Venligst tjek at alt er i orden."
 
-#: mail/component-factory.c:1008
+#: mail/component-factory.c:1000
 msgid "You have not set a mail transport method"
 msgstr "Du har ikke sat en transportmetode for e-post"
 
-#: mail/component-factory.c:1031
+#: mail/component-factory.c:1023
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr "Du har usendte meddelelser, vil du afslutte alligevel?"
 
-#: mail/component-factory.c:1071
+#: mail/component-factory.c:1063
 msgid "New Mail Message"
 msgstr "Ny e-post-besked"
 
-#: mail/component-factory.c:1071
+#: mail/component-factory.c:1063
 msgid "_Mail Message"
 msgstr "Send _besked"
 
-#: mail/component-factory.c:1072
+#: mail/component-factory.c:1064
 msgid "Compose a new mail message"
 msgstr "Skriv en ny e-post-meddelelse"
 
-#: mail/component-factory.c:1080
+#: mail/component-factory.c:1072
 msgid "New Message Post"
 msgstr "Postning af ny meddelelse"
 
-#: mail/component-factory.c:1080
+#: mail/component-factory.c:1072
 msgid "_Post Message"
 msgstr "_Post meddelelse"
 
-#: mail/component-factory.c:1081
+#: mail/component-factory.c:1073
 msgid "Post a new mail message"
 msgstr "Post en ny e-post-meddelelse"
 
-#: mail/component-factory.c:1373
+#: mail/component-factory.c:1365
 msgid "Connecting..."
 msgstr "Tilslutter..."
 
-#: mail/component-factory.c:1384
+#: mail/component-factory.c:1376
 msgid "Cannot register storage with shell"
 msgstr "Kan ikke registrere lagring med skallen"
 
-#: mail/folder-info.c:70
-msgid "Getting Folder Information"
-msgstr "Henter mappeinformation"
+#: mail/folder-browser-ui.c:486
+#, c-format
+msgid "Properties for \"%s\""
+msgstr "Egenskaber for \"%s\""
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:1
-msgid "Composer Preferences"
-msgstr "Redigererindstillinger"
+#: mail/folder-browser-ui.c:488
+msgid "Properties"
+msgstr "Egenskaber"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:2
-msgid ""
-"Configure mail preferences, including security and message display, here"
-msgstr ""
-"Konfigurér e-post-indstillinger, inklusive sikkerhed og meddelelsesvisning, "
-"hér"
+#: mail/folder-browser.c:327 mail/mail-display.c:394 mail/mail-display.c:942
+#, c-format
+msgid "Could not create temporary directory: %s"
+msgstr "Kunne ikke oprette midlertidigt katalog: %s"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:3
-msgid "Configure spell-checking, signatures, and the message composer here"
-msgstr "Konfigurér stavekontrol, signaturer, og meddelelseredigeringen hér"
+#: mail/folder-browser.c:782
+#, c-format
+msgid "%d new"
+msgstr "%d nye"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:4
-msgid "Configure your email accounts here"
-msgstr "Konfigurér dine e-post-konti her"
+#: mail/folder-browser.c:785 mail/folder-browser.c:793
+#: mail/folder-browser.c:796
+msgid ", "
+msgstr ", "
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:5
-msgid "Evolution Mail"
-msgstr "Evolution e-post"
+#: mail/folder-browser.c:787
+#, c-format
+msgid "%d hidden"
+msgstr "%d skjulte"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:6
-msgid "Evolution Mail accounts configuration control"
-msgstr "Evolution e-post-kontoopsætnings-styreelement"
+#: mail/folder-browser.c:789
+#, c-format
+msgid "%d visible"
+msgstr "%d synlige"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:7
-msgid "Evolution Mail component"
-msgstr "Evolutions e-post-komponent"
+#: mail/folder-browser.c:794
+#, c-format
+msgid "%d selected"
+msgstr "%d valgte"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:8
-msgid "Evolution Mail composer"
-msgstr "Evolutions e-post-redigering"
+#: mail/folder-browser.c:799
+#, c-format
+msgid "%d unsent"
+msgstr "%d usendte"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:9
-msgid "Evolution Mail composer configuration control"
-msgstr "Evolutions e-post-redigereropsætnings-styreelement"
+#: mail/folder-browser.c:801
+#, c-format
+msgid "%d sent"
+msgstr "%d sendte"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:10
-msgid "Evolution Mail configuration interface"
-msgstr "Evolution e-post-opsætningsgrænseflade"
+#: mail/folder-browser.c:803
+#, c-format
+msgid "%d total"
+msgstr "%d totalt"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:11
-msgid "Evolution Mail folder viewer"
-msgstr "Evolution e-post-mappevisning"
+#: mail/folder-browser.c:1182
+msgid "Create _Virtual Folder From Search..."
+msgstr "Opret _virtuel mappe fra søgning..."
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:12
-msgid "Evolution Mail preferences control"
-msgstr "Evolution e-post-indstillings-styreelement"
+#: mail/folder-browser.c:1736
+msgid "VFolder on _Subject"
+msgstr "Virtuel mappe for e_mnet"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:13
-msgid "Mail Accounts"
-msgstr "E-post-konti"
+#: mail/folder-browser.c:1737
+msgid "VFolder on Se_nder"
+msgstr "Virtuel mappe for afse_nder"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:69
-msgid "Mail Preferences"
-msgstr "E-post-indstillinger"
+#: mail/folder-browser.c:1738
+msgid "VFolder on _Recipients"
+msgstr "Virtuel mappe for modtage_re"
+
+#: mail/folder-browser.c:1739
+msgid "VFolder on Mailing _List"
+msgstr "Virtuel mappe på e-post-_liste"
+
+#: mail/folder-browser.c:1743
+msgid "Filter on Sub_ject"
+msgstr "Filtrér på em_ne"
+
+#: mail/folder-browser.c:1744
+msgid "Filter on Sen_der"
+msgstr "Filtrér på afsen_der"
+
+#: mail/folder-browser.c:1745
+msgid "Filter on Re_cipients"
+msgstr "Filtrér på modta_gere"
+
+#: mail/folder-browser.c:1746 mail/folder-browser.c:2070
+msgid "Filter on _Mailing List"
+msgstr "Filtrér på e-_postliste"
+
+#: mail/folder-browser.c:1764
+msgid "_Edit as New Message..."
+msgstr "R_edigér som ny besked..."
+
+#: mail/folder-browser.c:1766
+msgid "_Print"
+msgstr "S_kriv ud"
+
+#: mail/folder-browser.c:1770 ui/evolution-mail-message.xml.h:110
+msgid "_Reply to Sender"
+msgstr "Sva_r til sender"
+
+#: mail/folder-browser.c:1771 ui/evolution-mail-message.xml.h:75
+msgid "Reply to _List"
+msgstr "Svar til _listen"
+
+#: mail/folder-browser.c:1772 ui/evolution-mail-message.xml.h:74
+msgid "Reply to _All"
+msgstr "Svar til _alle"
+
+#: mail/folder-browser.c:1773
+msgid "_Forward"
+msgstr "_Videresend"
+
+#: mail/folder-browser.c:1777
+msgid "Follo_w Up..."
+msgstr "Føl_g op..."
+
+#: mail/folder-browser.c:1778
+msgid "Fla_g Completed"
+msgstr "Marker færdi_ge med flag"
+
+#: mail/folder-browser.c:1779
+msgid "Cl_ear Flag"
+msgstr "Neutralis_er flag"
+
+#. separator here?
+#: mail/folder-browser.c:1783 ui/evolution-mail-message.xml.h:43
+msgid "Mar_k as Read"
+msgstr "Mar_kér som læst"
+
+#: mail/folder-browser.c:1784
+msgid "Mark as _Unread"
+msgstr "Marker som _ulæst"
+
+#: mail/folder-browser.c:1785
+msgid "Mark as _Important"
+msgstr "Markér som v_igtig"
+
+#: mail/folder-browser.c:1786
+msgid "_Mark as Unimportant"
+msgstr "Markér som uvi_gtig"
+
+#: mail/folder-browser.c:1791
+msgid "U_ndelete"
+msgstr "_Fortryd sletning"
+
+#: mail/folder-browser.c:1795
+msgid "Mo_ve to Folder..."
+msgstr "Fl_yt til mappe..."
+
+#: mail/folder-browser.c:1796 ui/evolution-addressbook.xml.h:31
+msgid "_Copy to Folder..."
+msgstr "K_opiér til mappe..."
+
+#: mail/folder-browser.c:1804
+msgid "Add Sender to Address_book"
+msgstr "Tilføj afsenderen til adresse_bogen"
+
+#: mail/folder-browser.c:1808
+msgid "Appl_y Filters"
+msgstr "Anvend filtre"
+
+#: mail/folder-browser.c:1812
+msgid "Crea_te Rule From Message"
+msgstr "Ska_b regel fra meddelelse"
+
+#: mail/folder-browser.c:2071
+msgid "VFolder on M_ailing List"
+msgstr "Virtuele mappe på postliste"
+
+#: mail/folder-browser.c:2073
+#, c-format
+msgid "Filter on _Mailing List (%s)"
+msgstr "Filtre på postliste (%s)"
+
+#: mail/folder-browser.c:2074
+#, c-format
+msgid "VFolder on M_ailing List (%s)"
+msgstr "Virtuel mappe på postliste (%s)"
+
+#: mail/folder-browser.h:26 mail/mail-config.glade.h:39
+msgid "Default"
+msgstr "Standard"
+
+#: mail/folder-info.c:70
+msgid "Getting Folder Information"
+msgstr "Henter mappeinformation"
 
 #: mail/importers/GNOME_Evolution_Mail_Elm_Intelligent_Importer.server.in.in.h:1
 msgid "Evolution Elm importer"
@@ -12241,7 +12119,7 @@ msgstr "Bruger_navn:"
 msgid "_Path:"
 msgstr "S_ti:"
 
-#: mail/mail-account-gui.c:1886
+#: mail/mail-account-gui.c:1887
 msgid "You may not create two accounts with the same name."
 msgstr "Du kan ikke oprette to konti med samme navn."
 
@@ -12272,16 +12150,16 @@ msgstr "[Standard]"
 
 #. FIXME: This routine should just be a "toggled" event handler on the checkbox cell renderer which
 #. has "activatable" set.
-#: mail/mail-accounts.c:481 mail/mail-composer-prefs.c:708
-#: mail/mail-composer-prefs.c:854
+#: mail/mail-accounts.c:481 mail/mail-accounts.etspec.h:2
+#: mail/mail-composer-prefs.c:708 mail/mail-composer-prefs.c:854
 msgid "Enabled"
 msgstr "Aktiveret"
 
-#: mail/mail-accounts.c:487
+#: mail/mail-accounts.c:487 mail/mail-accounts.etspec.h:1
 msgid "Account name"
 msgstr "Kontonavn"
 
-#: mail/mail-accounts.c:489
+#: mail/mail-accounts.c:489 mail/mail-accounts.etspec.h:3
 msgid "Protocol"
 msgstr "Protokol"
 
@@ -12324,6 +12202,218 @@ msgstr ""
 "    \"%s\"\n"
 "og er blevet opdateret."
 
+#. Add the "Don't show this message again." checkbox
+#: mail/mail-callbacks.c:101 widgets/misc/e-messagebox.c:226
+msgid "Don't show this message again."
+msgstr "Vis ikke denne besked igen."
+
+#: mail/mail-callbacks.c:190
+msgid ""
+"You have not configured the mail client.\n"
+"You need to do this before you can send,\n"
+"receive or compose mail.\n"
+"Would you like to configure it now?"
+msgstr ""
+"Du har ikke konfigureret e-post-klienten.\n"
+"Du skal gøre dette før du kan sende,\n"
+"modtage eller skrive beskeder.\n"
+"Vil du konfigurere den nu?"
+
+#: mail/mail-callbacks.c:212
+msgid ""
+"You need to configure an account\n"
+"before you can compose mail."
+msgstr ""
+"Du skal konfigurere en konto\n"
+"inden du kan skrive e-post."
+
+#: mail/mail-callbacks.c:226
+msgid ""
+"You need to configure an identity\n"
+"before you can compose mail."
+msgstr ""
+"Du skal konfigurere en identitet\n"
+"før du kan skrive e-post."
+
+#: mail/mail-callbacks.c:233
+msgid ""
+"You need to configure a mail transport\n"
+"before you can compose mail."
+msgstr ""
+"Du skal konfigurere en e-post-transport\n"
+"før du kan skrive e-post."
+
+#. FIXME: this wording sucks
+#: mail/mail-callbacks.c:255
+msgid ""
+"You are sending an HTML-formatted message. Please make sure that\n"
+"the following recipients are willing and able to receive HTML mail:\n"
+msgstr ""
+"Du sender et HTML-formaterat brev. Sørg for at følgende\n"
+"modtagere ønsker, og kan modtage, HTML-formateret e-post:\n"
+
+#: mail/mail-callbacks.c:267
+msgid "Send anyway?"
+msgstr "Send alligevel?"
+
+#: mail/mail-callbacks.c:288
+msgid ""
+"This message has no subject.\n"
+"Really send?"
+msgstr ""
+"Denne besked har ikke et emne.\n"
+"Send alligevel?"
+
+#: mail/mail-callbacks.c:314
+msgid ""
+"Since the contact list you are sending to is configured to hide the list's "
+"addresses, this message will contain only Bcc recipients."
+msgstr ""
+"Siden kontaktlisten du sender til er konfigureret til at skjule listens "
+"adresser vil denne besked kun indeholde Bcc-modtagere."
+
+#: mail/mail-callbacks.c:318
+msgid "This message contains only Bcc recipients."
+msgstr "Denne besked indeholder kun Bcc-modtagere."
+
+#: mail/mail-callbacks.c:323
+msgid ""
+"It is possible that the mail server may reveal the recipients by adding an "
+"Apparently-To header.\n"
+"Send anyway?"
+msgstr ""
+"Det er muligt at e-post-serveren kan vise modtagerne ved at tilføje en "
+"\"Apparently-To\" header.\n"
+"Send alligevel?"
+
+#: mail/mail-callbacks.c:472
+msgid "You must specify recipients in order to send this message."
+msgstr "Du skal specificere modtagere for at kunne sende denne besked."
+
+#: mail/mail-callbacks.c:724
+msgid ""
+"Unable to open the drafts folder for this account.\n"
+"Would you like to use the default drafts folder?"
+msgstr ""
+"Kunne ikke åbne skitse-mappen for denne konto.\n"
+"Vil du bruge standard skitse-mappe?"
+
+#: mail/mail-callbacks.c:1189
+msgid "an unknown sender"
+msgstr "en ukendt afsender"
+
+#: mail/mail-callbacks.c:1193
+msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
+msgstr "%a, %Y-%m-%d kl. %H:%M skrev %%s:"
+
+#: mail/mail-callbacks.c:1700 mail/message-browser.c:132
+msgid "Move message(s) to"
+msgstr "Flyt beskeder til"
+
+#: mail/mail-callbacks.c:1702 mail/message-browser.c:134
+msgid "Copy message(s) to"
+msgstr "Kopiér beskeder til"
+
+#: mail/mail-callbacks.c:2344
+#, c-format
+msgid "Are you sure you want to edit all %d messages?"
+msgstr "Er du sikker på at du vil redigere alle %d beskeder?"
+
+#: mail/mail-callbacks.c:2360
+msgid ""
+"You may only edit messages saved\n"
+"in the Drafts folder."
+msgstr ""
+"Du kan kun redigere beskeder gemt\n"
+"i Skitser-kataloget."
+
+#: mail/mail-callbacks.c:2393
+msgid ""
+"You may only resend messages\n"
+"in the Sent folder."
+msgstr ""
+"Du kan kun sende beskeder igen\n"
+"som er gemt i sendt-kataloget."
+
+#: mail/mail-callbacks.c:2403
+#, c-format
+msgid "Are you sure you want to resend all %d messages?"
+msgstr "Er du sikker på at du vil sende alle %d beskederne igen?"
+
+#: mail/mail-callbacks.c:2424
+msgid "No Message Selected"
+msgstr "Ingen besked valgt"
+
+#: mail/mail-callbacks.c:2465
+#, c-format
+msgid ""
+"Cannot save to `%s'\n"
+" %s"
+msgstr ""
+"Kan ikke gemme til \"%s\":\n"
+" %s"
+
+#: mail/mail-callbacks.c:2470
+#, c-format
+msgid ""
+"`%s' already exists.\n"
+"Overwrite it?"
+msgstr ""
+"\"%s\" findes allerede.\n"
+"Vil du overskrive den?"
+
+#: mail/mail-callbacks.c:2511
+msgid "Save Message As..."
+msgstr "Gem besked som..."
+
+#: mail/mail-callbacks.c:2513
+msgid "Save Messages As..."
+msgstr "Gem beskeder som..."
+
+#: mail/mail-callbacks.c:2686
+msgid ""
+"This operation will permanently erase all messages marked as\n"
+"deleted. If you continue, you will not be able to recover these messages.\n"
+"\n"
+"Really erase these messages?"
+msgstr ""
+"Denne handling vil permanent fjerne de meddelelser der er\n"
+"markeret som slettede. Hvis du fortsætter kan du ikke længere tilvejebringe\n"
+"disse meddelelser.\n"
+"\n"
+"Vil du virkelig fjerne disse meddelelser?"
+
+#: mail/mail-callbacks.c:2781
+#, c-format
+msgid ""
+"Error loading filter information:\n"
+"%s"
+msgstr ""
+"Fejl under indlæsning af filter-information:\n"
+"%s"
+
+#: mail/mail-callbacks.c:2789
+msgid "Filters"
+msgstr "Filtre"
+
+#: mail/mail-callbacks.c:2830
+#, c-format
+msgid "Page %d of %d"
+msgstr "Side %d af %d"
+
+#: mail/mail-callbacks.c:2886
+msgid "Print Message"
+msgstr "Udskriv besked"
+
+#: mail/mail-callbacks.c:2954
+msgid "Printing of message failed"
+msgstr "Fejl under udskrift af besked"
+
+#: mail/mail-callbacks.c:3147
+#, c-format
+msgid "Are you sure you want to open all %d messages in separate windows?"
+msgstr "Er du sikker på at du vil åbne alle %d beskeder i separate vinduer?"
+
 #: mail/mail-composer-prefs.c:226 mail/mail-composer-prefs.c:349
 #: mail/mail-config.c:1376
 msgid "Unnamed"
@@ -12349,19 +12439,11 @@ msgstr "Tilføj skriptsignatur"
 msgid "Signature(s)"
 msgstr "Signatur(er)"
 
-#: mail/mail-config.c:1080
-msgid "Checking Service"
-msgstr "Tjekker tjeneste"
-
-#: mail/mail-config.c:1158 mail/mail-config.c:1162
-msgid "Connecting to server..."
-msgstr "Kobler til server..."
-
-#: mail/mail-config-druid.c:367 mail/mail-config.glade.h:61
+#: mail/mail-config-druid.c:380 mail/mail-config.glade.h:61
 msgid "Identity"
 msgstr "Identitet"
 
-#: mail/mail-config-druid.c:369
+#: mail/mail-config-druid.c:382
 msgid ""
 "Please enter your name and email address below. The \"optional\" fields "
 "below do not need to be filled in, unless you wish to include this "
@@ -12371,11 +12453,11 @@ msgstr ""
 "nedenfor er ikke obligatoriske, medmindre du ønsker at inkludere "
 "informationen i den e-post du sender."
 
-#: mail/mail-config-druid.c:375 mail/mail-config-druid.c:382
+#: mail/mail-config-druid.c:388 mail/mail-config-druid.c:395
 msgid "Receiving Mail"
 msgstr "Modtager post"
 
-#: mail/mail-config-druid.c:377
+#: mail/mail-config-druid.c:390
 msgid ""
 "Please enter information about your incoming mail server below. If you are "
 "not sure, ask your system administrator or Internet Service Provider."
@@ -12384,15 +12466,15 @@ msgstr ""
 "ikke er sikker bør du spørge din systemadministrator eller "
 "Internetleverandør."
 
-#: mail/mail-config-druid.c:384
+#: mail/mail-config-druid.c:397
 msgid "Please select among the following options"
 msgstr "Venligst vælg mellem følgende alternativer"
 
-#: mail/mail-config-druid.c:387
+#: mail/mail-config-druid.c:400
 msgid "Sending Mail"
 msgstr "Sender post"
 
-#: mail/mail-config-druid.c:389
+#: mail/mail-config-druid.c:402
 msgid ""
 "Please enter information about the way you will send mail. If you are not "
 "sure, ask your system administrator or Internet Service Provider."
@@ -12400,11 +12482,11 @@ msgstr ""
 "Angiv information om hvordan du vil sende e-post. Hvis du ikke er sikker bør "
 "du spørge din systemadministrator eller Internetleverandør."
 
-#: mail/mail-config-druid.c:394 mail/mail-config.glade.h:10
+#: mail/mail-config-druid.c:407 mail/mail-config.glade.h:10
 msgid "Account Management"
 msgstr "Håndtering af konti"
 
-#: mail/mail-config-druid.c:396
+#: mail/mail-config-druid.c:409
 msgid ""
 "You are almost done with the mail configuration process. The identity, "
 "incoming mail server and outgoing mail transport method which you provided "
@@ -12417,6 +12499,14 @@ msgstr ""
 "angav samles til en Evolution-epostkonto. Angiv et navn for denne konto "
 "nedenfor. Dette navn anvendes kun til visning."
 
+#: mail/mail-config.c:1080
+msgid "Checking Service"
+msgstr "Tjekker tjeneste"
+
+#: mail/mail-config.c:1158 mail/mail-config.c:1162
+msgid "Connecting to server..."
+msgstr "Kobler til server..."
+
 #: mail/mail-config.glade.h:3
 msgid " _Check for supported types "
 msgstr "_Søg efter understøttede typer"
@@ -12537,10 +12627,6 @@ msgstr ""
 msgid "De_fault"
 msgstr "_Forvalgt"
 
-#: mail/mail-config.glade.h:39
-msgid "Default"
-msgstr "Standard"
-
 #: mail/mail-config.glade.h:40
 msgid "Default Behavior"
 msgstr "Standardopførsel"
@@ -12985,25 +13071,212 @@ msgstr "_Brug sikker anslutning (SSL):"
 msgid "_Use the same fonts as other applications"
 msgstr "Br_ug de samme skrifttyper som andre programmer"
 
+#: mail/mail-config.glade.h:171
+msgid "color"
+msgstr "farve"
+
 #: mail/mail-config.glade.h:172
 msgid "description"
 msgstr "beskrivelse"
 
-#: mail/mail-folder-cache.c:832
+#: mail/mail-crypto.c:84
+msgid "Could not create a S/MIME signature context."
+msgstr "Kunne ikke oprette S/MIME-signaturkontekst."
+
+#: mail/mail-crypto.c:116
+msgid "Could not create a S/MIME certsonly context."
+msgstr "Kunne ikke oprette S/MIME \"certsonly\" kontekst."
+
+#: mail/mail-crypto.c:148
+msgid "Could not create a S/MIME encryption context."
+msgstr "Kunne ikke oprette S/MIME-krypteringskontekst."
+
+#: mail/mail-crypto.c:180
+msgid "Could not create a S/MIME envelope context."
+msgstr "Kunne ikke oprette S/MIME-\"envelope\"-kontekst."
+
+#: mail/mail-crypto.c:211
+msgid "Could not create a S/MIME decode context."
+msgstr "Kunne ikke oprette S/MIME-afkodningskontekst."
+
+#: mail/mail-display.c:197
+#, c-format
+msgid ""
+"File `%s' already exists.\n"
+"Overwrite it?"
+msgstr ""
+"Filen \"%s\" findes allerede.\n"
+"Skal den overskrives?"
+
+#: mail/mail-display.c:336
+msgid "Save Attachment"
+msgstr "Gem bilag"
+
+#: mail/mail-display.c:409
+#, c-format
+msgid "Could not create temporary file '%s': %s"
+msgstr "Kunne ikke oprette temporær fil \"%s\": %s"
+
+#: mail/mail-display.c:457
+msgid "Save Attachment..."
+msgstr "Gem bilag..."
+
+#: mail/mail-display.c:458
+msgid "View Inline"
+msgstr "Vis indlejret"
+
+#: mail/mail-display.c:459
+#, c-format
+msgid "Open in %s..."
+msgstr "Åbn i %s..."
+
+#: mail/mail-display.c:515
+#, c-format
+msgid "View Inline (via %s)"
+msgstr "Vis indlejret (via %s)"
+
+#: mail/mail-display.c:519
+msgid "Hide"
+msgstr "Skjul"
+
+#: mail/mail-display.c:539
+msgid "External Viewer"
+msgstr "Ekstern visning"
+
+#: mail/mail-display.c:1368
+msgid "Downloading images"
+msgstr "Henter billeder"
+
+#: mail/mail-display.c:1545
+msgid "Loading message content"
+msgstr "Indlæser beskedsindhold"
+
+#: mail/mail-display.c:1887
+msgid "Overdue:"
+msgstr "Overskredet:"
+
+#: mail/mail-display.c:1891
+msgid "by %B %d, %Y, %l:%M %P"
+msgstr "den %d. %B %Y %H:%M"
+
+#: mail/mail-display.c:2255
+msgid "Open Link in Browser"
+msgstr "Åbn henvisning i netlæser"
+
+#: mail/mail-display.c:2256
+msgid "Copy Link Location"
+msgstr "Kopiér henvisning"
+
+#: mail/mail-display.c:2258
+msgid "Save Link as (FIXME)"
+msgstr "Gem henvisning som"
+
+#: mail/mail-display.c:2260
+msgid "Save Image as..."
+msgstr "Gem billede som..."
+
+#: mail/mail-folder-cache.c:745
 #, c-format
 msgid "Pinging %s"
 msgstr "Pinger %s"
 
+#: mail/mail-format.c:665
+#, c-format
+msgid "%s attachment"
+msgstr "%s-bilag"
+
+#: mail/mail-format.c:707 mail/mail-format.c:1370 mail/mail-format.c:1439
+#: mail/mail-format.c:1559 mail/mail-format.c:1683 mail/mail-format.c:1708
+msgid "Could not parse MIME message. Displaying as source."
+msgstr "Kunne ikke læse MIME-besked. Viser ren beskedstekst."
+
+#: mail/mail-format.c:785 mail/message-list.etspec.h:2
+msgid "Date"
+msgstr "Dato"
+
+#: mail/mail-format.c:871
+msgid "Bad Address"
+msgstr "Ugyldig e-post-adresse:"
+
+#: mail/mail-format.c:912 mail/message-list.etspec.h:7
+#: mail/message-tag-followup.c:301
+msgid "From"
+msgstr "Fra"
+
+#: mail/mail-format.c:916
+msgid "Reply-To"
+msgstr "Svar-til"
+
+#: mail/mail-format.c:921 mail/message-list.etspec.h:14
+msgid "To"
+msgstr "Til"
+
+#: mail/mail-format.c:926
+msgid "Cc"
+msgstr "Cc"
+
+#: mail/mail-format.c:931
+msgid "Bcc"
+msgstr "Bcc:"
+
+#: mail/mail-format.c:1482
+msgid ""
+"This message is digitally signed. Click the lock icon for more information."
+msgstr ""
+"Denne besked er digitalt signeret. For flere informationer, klik på "
+"låsikonen."
+
+#: mail/mail-format.c:1510
+msgid "Could not create a PGP verfication context"
+msgstr "Kunne ikke oprette en PGP-verifieringssammenhæng"
+
+#: mail/mail-format.c:1518
+msgid "This message is digitally signed and has been found to be authentic."
+msgstr "Denne besked er digitalt signeret og er fundet autentisk."
+
+#: mail/mail-format.c:1525
+msgid "This message is digitally signed but can not be proven to be authentic."
+msgstr "Denne besked er digitalt signeret, men kan ikke findes autentisk."
+
+#: mail/mail-format.c:1789
+#, c-format
+msgid "Pointer to FTP site (%s)"
+msgstr "Peger til FTP-server (%s)"
+
+#: mail/mail-format.c:1800
+#, c-format
+msgid "Pointer to local file (%s) valid at site \"%s\""
+msgstr "Peger til lokal fil (%s) gyldig på netsted \"%s\""
+
+#: mail/mail-format.c:1803
+#, c-format
+msgid "Pointer to local file (%s)"
+msgstr "Peger til lokal fil (%s)"
+
+#: mail/mail-format.c:1830
+#, c-format
+msgid "Pointer to remote data (%s)"
+msgstr "Peger til eksterne data (%s)"
+
+#: mail/mail-format.c:1836
+#, c-format
+msgid "Pointer to unknown external data (\"%s\" type)"
+msgstr "Peger til ukendt ekstern data (\"%s\"-type)"
+
+#: mail/mail-format.c:1838
+msgid "Malformed external-body part."
+msgstr "Fejludformet del for ekstern-krop."
+
 #: mail/mail-local.c:541 mail/mail-local.c:543
 #, c-format
 msgid "Local folders/%s"
 msgstr "Lokale mapper/%s"
 
-#: mail/mail-local.c:711
+#: mail/mail-local.c:671
 msgid "Reconfiguring folder"
 msgstr "Omkonfigurerer mappe"
 
-#: mail/mail-local.c:792
+#: mail/mail-local.c:752
 #, c-format
 msgid ""
 "Cannot save folder metainfo; you may find you can't\n"
@@ -13012,22 +13285,22 @@ msgstr ""
 "Kan ikke gemme mappemetainformation; du vil måske\n"
 "opdage at du ikke kan åbne denne mappe længere: %s: %s"
 
-#: mail/mail-local.c:848
+#: mail/mail-local.c:808
 #, c-format
 msgid "Cannot save folder metainfo to %s: %s"
 msgstr "Kan ikke gemme metainformation om mappe på: %s: %s"
 
-#: mail/mail-local.c:900
+#: mail/mail-local.c:860
 #, c-format
 msgid "Cannot delete folder metadata %s: %s"
 msgstr "Kan ikke slette metainformation for mappe %s: %s"
 
-#: mail/mail-local.c:1363
+#: mail/mail-local.c:1323
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "Ændrer mappe \"%s\" til \"%s\"-format"
 
-#: mail/mail-local.c:1388
+#: mail/mail-local.c:1348
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
@@ -13035,16 +13308,16 @@ msgstr ""
 "Hvis du ikke kan åbne denne postboks igen må\n"
 "du reparere den manuelt."
 
-#: mail/mail-local.c:1488
+#: mail/mail-local.c:1448
 #, c-format
 msgid "Reconfigure /%s"
 msgstr "Konfigurér /%s igen"
 
-#: mail/mail-local.c:1552
+#: mail/mail-local.c:1512
 msgid "You cannot change the format of a non-local folder."
 msgstr "Du kan ikke ændre format på en ikke-lokal mappe."
 
-#: mail/mail-mt.c:259
+#: mail/mail-mt.c:257
 #, c-format
 msgid ""
 "Error while '%s':\n"
@@ -13053,7 +13326,7 @@ msgstr ""
 "Fejl under '%s':\n"
 "%s"
 
-#: mail/mail-mt.c:262
+#: mail/mail-mt.c:260
 #, c-format
 msgid ""
 "Error while performing operation:\n"
@@ -13062,131 +13335,118 @@ msgstr ""
 "Fejl under udførsel af operation:\n"
 "%s"
 
-#: mail/mail-mt.c:913
+#: mail/mail-mt.c:904
 msgid "Working"
 msgstr "Arbejder"
 
-#: mail/mail-ops.c:87
+#: mail/mail-ops.c:86
 msgid "Filtering Folder"
 msgstr "Filtrerer mappe"
 
-#: mail/mail-ops.c:260
+#: mail/mail-ops.c:264
 msgid "Fetching Mail"
 msgstr "Henter e-post"
 
-#: mail/mail-ops.c:557
-#, fuzzy, c-format
-msgid "Failed to apply outgoing filters: %s"
-msgstr "Kunne ikke gemme post i midlertidig fil %s: %s"
-
-#: mail/mail-ops.c:578
-#, c-format
-msgid ""
-"Failed to append to %s: %s\n"
-"Appending to local `Sent' folder instead."
-msgstr ""
-
-#: mail/mail-ops.c:587
-#, fuzzy, c-format
-msgid "Failed to append to local `Sent' folder: %s"
-msgstr "Kunne ikke gemme post i midlertidig fil %s: %s"
+#: mail/mail-ops.c:550 mail/mail-ops.c:579
+msgid "However, the message was successfully sent."
+msgstr "Fuldførte alligevel sending af beskeden."
 
-#: mail/mail-ops.c:629
+#: mail/mail-ops.c:611
 #, c-format
 msgid "Sending \"%s\""
 msgstr "Sender \"%s\""
 
-#: mail/mail-ops.c:747
+#: mail/mail-ops.c:729
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Sender besked %d af %d"
 
-#: mail/mail-ops.c:766
+#: mail/mail-ops.c:748
 #, c-format
 msgid "Failed on message %d of %d"
 msgstr "Fejlet på besked %d af %d"
 
-#: mail/mail-ops.c:768
+#: mail/mail-ops.c:750 mail/mail-send-recv.c:581
 msgid "Complete."
 msgstr "Fuldført."
 
-#: mail/mail-ops.c:862
+#: mail/mail-ops.c:844
 msgid "Saving message to folder"
 msgstr "Gemmer besked til mappe"
 
-#: mail/mail-ops.c:943
+#: mail/mail-ops.c:925
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Flytter beskeder til %s"
 
-#: mail/mail-ops.c:943
+#: mail/mail-ops.c:925
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Kopierer beskeder til %s"
 
-#: mail/mail-ops.c:1056
+#: mail/mail-ops.c:1042
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Skanner mapper i \"%s\""
 
-#: mail/mail-ops.c:1244
+#: mail/mail-ops.c:1225
 msgid "Forwarded messages"
 msgstr "Videresendte beskeder"
 
-#: mail/mail-ops.c:1287
+#: mail/mail-ops.c:1268
 #, c-format
 msgid "Opening folder %s"
 msgstr "Åbner mappe %s"
 
-#: mail/mail-ops.c:1359
+#: mail/mail-ops.c:1340
 #, c-format
 msgid "Opening store %s"
 msgstr "Åbner lager %s"
 
-#: mail/mail-ops.c:1437
+#: mail/mail-ops.c:1413
 #, c-format
 msgid "Removing folder %s"
 msgstr "Fjerner mappe %s"
 
-#: mail/mail-ops.c:1531
+#: mail/mail-ops.c:1507
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Gemmer mappe '%s'"
 
-#: mail/mail-ops.c:1582
+#: mail/mail-ops.c:1558
 msgid "Refreshing folder"
 msgstr "Opfrisker mappe"
 
-#: mail/mail-ops.c:1618 mail/mail-ops.c:1669
+#: mail/mail-ops.c:1594 mail/mail-ops.c:1645
 msgid "Expunging folder"
 msgstr "Fjerner slettede beskeder fra mappe"
 
-#: mail/mail-ops.c:1666
+#: mail/mail-ops.c:1642
 #, fuzzy, c-format
 msgid "Emptying trash in '%s'"
 msgstr "Importerer %s som %s"
 
-#: mail/mail-ops.c:1667 my-evolution/e-summary-mail.c:483
+#: mail/mail-ops.c:1643 my-evolution/e-summary-mail.c:483
 #: shell/e-local-storage.c:1151
 msgid "Local Folders"
 msgstr "Lokale mapper"
 
-#: mail/mail-ops.c:1742
+#: mail/mail-ops.c:1718
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Henter besked %s"
 
-#: mail/mail-ops.c:1814
+#: mail/mail-ops.c:1790
 #, c-format
 msgid "Retrieving %d message(s)"
 msgstr "Henter %d beskeder"
 
-#: mail/mail-ops.c:1898
+#: mail/mail-ops.c:1876
 #, c-format
 msgid "Saving %d messsage(s)"
 msgstr "Gemmer %d beskeder"
 
-#: mail/mail-ops.c:1946
+#: mail/mail-ops.c:1924
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -13195,7 +13455,7 @@ msgstr ""
 "Kunne ikke oprette uddatafil: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1974
+#: mail/mail-ops.c:1952
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -13204,11 +13464,11 @@ msgstr ""
 "Fejl under gemning af beskeder til: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2045
+#: mail/mail-ops.c:2026
 msgid "Saving attachment"
 msgstr "Gemmer bilag"
 
-#: mail/mail-ops.c:2062
+#: mail/mail-ops.c:2043
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -13217,74 +13477,106 @@ msgstr ""
 "Kunne ikke oprette uddatafil: %s\n"
 " %s"
 
-#: mail/mail-ops.c:2092
+#: mail/mail-ops.c:2073
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Kan ikke skrive data: %s"
 
-#: mail/mail-ops.c:2240
+#: mail/mail-ops.c:2221
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Kobler fra %s"
 
-#: mail/mail-ops.c:2240
+#: mail/mail-ops.c:2221
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Kobler til %s igen"
 
-#: mail/mail-send-recv.c:147
+#: mail/mail-search.c:154
+msgid "(Untitled Message)"
+msgstr "(Besked uden titel)"
+
+#: mail/mail-search.c:236
+msgid "Untitled Message"
+msgstr "Besked uden titel"
+
+#: mail/mail-search.c:238
+msgid "Empty Message"
+msgstr "Tom besked"
+
+#: mail/mail-search.c:287
+msgid "Find in Message"
+msgstr "Find i besked"
+
+#: mail/mail-search.c:320
+msgid "Case Sensitive"
+msgstr "Skeln mellem store og små bogstaver"
+
+#: mail/mail-search.c:322
+msgid "Search Forward"
+msgstr "Søg fremad"
+
+#: mail/mail-search.c:342
+msgid "Find:"
+msgstr "Find:"
+
+#: mail/mail-search.c:346
+msgid "Matches:"
+msgstr "Træffere:"
+
+#: mail/mail-send-recv.c:146
 msgid "Cancelling..."
 msgstr "Afbryder..."
 
-#: mail/mail-send-recv.c:255
+#: mail/mail-send-recv.c:254
 #, c-format
 msgid "Server: %s, Type: %s"
 msgstr "Server: %s, Type: %s"
 
-#: mail/mail-send-recv.c:257
+#: mail/mail-send-recv.c:256
 #, c-format
 msgid "Path: %s, Type: %s"
 msgstr "Sti: %s, Type: %s"
 
-#: mail/mail-send-recv.c:259
+#: mail/mail-send-recv.c:258
 #, c-format
 msgid "Type: %s"
 msgstr "Type: %s"
 
-#: mail/mail-send-recv.c:308
+#: mail/mail-send-recv.c:306
 msgid "Send & Receive Mail"
 msgstr "Send & modtag e-post"
 
-#: mail/mail-send-recv.c:309
+#: mail/mail-send-recv.c:307
 msgid "Cancel _All"
 msgstr "Afbryd _alle"
 
-#: mail/mail-send-recv.c:390
+#: mail/mail-send-recv.c:389
 msgid "Updating..."
 msgstr "Opdaterer..."
 
-#: mail/mail-send-recv.c:390 mail/mail-send-recv.c:442
+#: mail/mail-send-recv.c:390 mail/mail-send-recv.c:446
 msgid "Waiting..."
 msgstr "Venter..."
 
-#: mail/mail-session.c:229
+#: mail/mail-session.c:226
 msgid "User canceled operation."
 msgstr "Operation afbrudt af bruger."
 
-#: mail/mail-session.c:262
+#: mail/mail-session.c:259
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Indtast adgangskode for %s"
 
-#: mail/mail-session.c:264
+#: mail/mail-session.c:261
 msgid "Enter Password"
 msgstr "Indtast adgangskode"
 
-#: mail/mail-session.c:287
+#: mail/mail-session.c:284
 msgid "_Remember this password"
 msgstr "Husk denne adgangs_kode"
 
-#: mail/mail-session.c:288
+#: mail/mail-session.c:285
 msgid "_Remember this password for the remainder of this session"
 msgstr "_Husk denne adgangskode for resten af denne session"
 
@@ -13332,17 +13624,21 @@ msgstr "Videresendt besked - %s"
 msgid "Forwarded message"
 msgstr "Videresendt besked"
 
-#: mail/mail-vfolder.c:91
+#: mail/mail-tools.c:438
+msgid "Forwarded Message"
+msgstr "Videresendt besked"
+
+#: mail/mail-vfolder.c:92
 #, c-format
 msgid "Setting up vfolder: %s"
 msgstr "Opsætter vmappe: %s"
 
-#: mail/mail-vfolder.c:209
+#: mail/mail-vfolder.c:210
 #, c-format
 msgid "Updating vfolders for uri: %s"
 msgstr "Opdaterer vfoldere for URI: %s"
 
-#: mail/mail-vfolder.c:467
+#: mail/mail-vfolder.c:468
 #, c-format
 msgid ""
 "The following vFolder(s):\n"
@@ -13355,95 +13651,100 @@ msgstr ""
 "    '%s'\n"
 "Og er blevet opdateret."
 
-#: mail/mail-vfolder.c:776
+#: mail/mail-vfolder.c:777
 msgid "VFolders"
 msgstr "Virtuelle mapper "
 
-#: mail/mail-vfolder.c:834
+#: mail/mail-vfolder.c:835
 msgid "vFolders"
 msgstr "vMapper"
 
-#: mail/mail-vfolder.c:873
+#: mail/mail-vfolder.c:874
 msgid "Edit VFolder"
 msgstr "Rediger Virtuel mappe"
 
-#: mail/mail-vfolder.c:893
+#: mail/mail-vfolder.c:894
 #, c-format
 msgid "Trying to edit a vfolder '%s' which doesn't exist."
 msgstr "Prøver at redigere en vfolder '%s' som ikke eksisterer."
 
-#: mail/mail-vfolder.c:965
+#: mail/mail-vfolder.c:966
 msgid "New VFolder"
 msgstr "Ny Virtuel mappe"
 
-#: mail/message-list.c:900
+#: mail/message-browser.c:233
+msgid "(No subject)"
+msgstr "(Uden emne)"
+
+#: mail/message-browser.c:235
+#, c-format
+msgid "%s - Message"
+msgstr "%s - Besked"
+
+#: mail/message-list.c:741
 msgid "Unseen"
 msgstr "Ulæst"
 
-#: mail/message-list.c:901
+#: mail/message-list.c:742
 msgid "Seen"
 msgstr "Læst"
 
-#: mail/message-list.c:902
+#: mail/message-list.c:743
 msgid "Answered"
 msgstr "Besvaret"
 
-#: mail/message-list.c:903
+#: mail/message-list.c:744
 msgid "Multiple Unseen Messages"
 msgstr "Flere ulæste beskeder"
 
-#: mail/message-list.c:904
+#: mail/message-list.c:745
 msgid "Multiple Messages"
 msgstr "Flere beskeder"
 
-#: mail/message-list.c:908
+#: mail/message-list.c:749
 msgid "Lowest"
 msgstr "Lavest"
 
-#: mail/message-list.c:909
+#: mail/message-list.c:750
 msgid "Lower"
 msgstr "Lavere"
 
-#: mail/message-list.c:913
+#: mail/message-list.c:754
 msgid "Higher"
 msgstr "Højere"
 
-#: mail/message-list.c:914
+#: mail/message-list.c:755
 msgid "Highest"
 msgstr "Højest"
 
-#: mail/message-list.c:1231
+#: mail/message-list.c:1072
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:1238
+#: mail/message-list.c:1079
 msgid "Today %l:%M %p"
 msgstr "I dag %H:%M"
 
-#: mail/message-list.c:1247
+#: mail/message-list.c:1088
 msgid "Yesterday %l:%M %p"
 msgstr "I går %H:%M"
 
-#: mail/message-list.c:1259
+#: mail/message-list.c:1100
 msgid "%a %l:%M %p"
 msgstr "%a %H:%M"
 
-#: mail/message-list.c:1267
+#: mail/message-list.c:1108
 msgid "%b %d %l:%M %p"
 msgstr "%d %b %H:%M"
 
-#: mail/message-list.c:1269
+#: mail/message-list.c:1110
 msgid "%b %d %Y"
 msgstr "%d %b %Y"
 
-#: mail/message-list.c:3062
+#: mail/message-list.c:2649
 msgid "Generating message list"
 msgstr "Genererer beskedsliste"
 
-#: mail/message-list.etspec.h:2
-msgid "Date"
-msgstr "Dato"
-
 #: mail/message-list.etspec.h:3
 msgid "Due By"
 msgstr "Skal afleveres den"
@@ -13460,10 +13761,6 @@ msgstr "Mærket"
 msgid "Follow Up Flag"
 msgstr "Opfølgningsflag"
 
-#: mail/message-list.etspec.h:7 mail/message-tag-followup.c:301
-msgid "From"
-msgstr "Fra"
-
 #: mail/message-list.etspec.h:8
 msgid "Original Location"
 msgstr "Oprindelig plads"
@@ -13476,10 +13773,6 @@ msgstr "Modtaget"
 msgid "Size"
 msgstr "Størrelse"
 
-#: mail/message-list.etspec.h:14
-msgid "To"
-msgstr "Til"
-
 #: mail/message-tag-followup.c:62
 msgid "Call"
 msgstr "Ring"
@@ -13496,7 +13789,7 @@ msgstr "Følg op"
 msgid "For Your Information"
 msgstr "For information"
 
-#: mail/message-tag-followup.c:66 ui/evolution-mail-message.xml.h:40
+#: mail/message-tag-followup.c:66 ui/evolution-mail-message.xml.h:36
 msgid "Forward"
 msgstr "Videresend"
 
@@ -13504,11 +13797,11 @@ msgstr "Videresend"
 msgid "No Response Necessary"
 msgstr "Intet svar krævet"
 
-#: mail/message-tag-followup.c:69 ui/evolution-mail-message.xml.h:77
+#: mail/message-tag-followup.c:69 ui/evolution-mail-message.xml.h:72
 msgid "Reply"
 msgstr "Svar"
 
-#: mail/message-tag-followup.c:70 ui/evolution-mail-message.xml.h:78
+#: mail/message-tag-followup.c:70 ui/evolution-mail-message.xml.h:73
 msgid "Reply to All"
 msgstr "Svar til alle"
 
@@ -13540,6 +13833,39 @@ msgstr "_Skal leveres den:"
 msgid "_Flag:"
 msgstr "_Flag:"
 
+#: mail/subscribe-dialog.c:230
+#, c-format
+msgid "Scanning folders under %s on \"%s\""
+msgstr "Søger i mapper under %s på \"%s\""
+
+#: mail/subscribe-dialog.c:232
+#, c-format
+msgid "Scanning root-level folders on \"%s\""
+msgstr "Søger i mapper på rod-niveau på \"%s\""
+
+#: mail/subscribe-dialog.c:329
+#, c-format
+msgid "Subscribing to folder \"%s\""
+msgstr "Abonnerer på mappe \"%s\""
+
+#: mail/subscribe-dialog.c:331
+#, c-format
+msgid "Unsubscribing to folder \"%s\""
+msgstr "Fjerner abonnement på mappe \"%s\""
+
+#: mail/subscribe-dialog.c:1270 mail/subscribe-dialog.etspec.h:1
+#: shell/e-storage-set-view.etspec.h:2
+msgid "Folder"
+msgstr "Mappe"
+
+#: mail/subscribe-dialog.c:1499
+msgid "No server has been selected"
+msgstr "Ingen server er valgt"
+
+#: mail/subscribe-dialog.c:1598
+msgid "Please select a server."
+msgstr "Venligst vælg en server."
+
 #: mail/subscribe-dialog.glade.h:1
 msgid "Folder Subscriptions"
 msgstr "Mappeabonnementer"
@@ -13553,125 +13879,17 @@ msgid "S_erver:"
 msgstr "S_erver:"
 
 #: mail/subscribe-dialog.glade.h:4
+msgid "Scanning folders ..."
+msgstr "Gennemsøger mapper ..."
+
+#: mail/subscribe-dialog.glade.h:5
 msgid "_Subscribe"
 msgstr "_Abonnér"
 
-#: mail/subscribe-dialog.glade.h:5
+#: mail/subscribe-dialog.glade.h:6
 msgid "_Unsubscribe"
 msgstr "_Fjern abonnement"
 
-#: my-evolution/component-factory.c:56
-msgid "Folder containing the Evolution Summary"
-msgstr "Mappe som indeholder Evolution sammendrag"
-
-#: my-evolution/e-summary.c:204
-msgid "%A, %B %e %Y"
-msgstr "%A %e. %B %Y"
-
-#: my-evolution/e-summary.c:533
-msgid "Please wait..."
-msgstr "Venligst vent..."
-
-#: my-evolution/e-summary.c:622 ui/my-evolution.xml.h:2
-msgid "Print Summary"
-msgstr "Udskriv sammendrag"
-
-#: my-evolution/e-summary.c:655
-msgid "Printing of Summary failed"
-msgstr "Fejl under udskrift af sammendrag"
-
-#: my-evolution/e-summary-calendar.c:384
-msgid "Appointments"
-msgstr "Aftaler"
-
-#: my-evolution/e-summary-calendar.c:392
-msgid "No appointments."
-msgstr "Ingen aftaler."
-
-#: my-evolution/e-summary-calendar.c:409
-msgid "%k:%M %d %B"
-msgstr "%k:%M %d %B"
-
-#: my-evolution/e-summary-calendar.c:411
-#, fuzzy
-msgid "%l:%M%p %d %B"
-msgstr "%l: %M %d %B"
-
-#: my-evolution/e-summary-calendar.c:429
-msgid "No description"
-msgstr "Inegn beskrivelse"
-
-#: my-evolution/e-summary-mail.c:189
-msgid "Mail summary"
-msgstr "E-post-sammendrag"
-
-#: my-evolution/e-summary-preferences.c:355
-msgid "Dictionary.com Word of the Day"
-msgstr "Dictionary.com Ord for dagen"
-
-#: my-evolution/e-summary-preferences.c:373
-msgid "Quotes of the Day"
-msgstr "Dagens citater"
-
-#: my-evolution/e-summary-preferences.c:565
-#, fuzzy
-msgid "New News Feed"
-msgstr "Nyhedstjenester"
-
-#: my-evolution/e-summary-preferences.c:581
-#, fuzzy
-msgid "_URL:"
-msgstr "URL:"
-
-#: my-evolution/e-summary-rdf.c:315
-msgid "Error downloading RDF"
-msgstr "Fejl under nedhentning af RDF"
-
-#: my-evolution/e-summary-rdf.c:453
-msgid "News Feed"
-msgstr "Nyhedstjenester"
-
-#: my-evolution/e-summary-shown.c:496
-msgid "All"
-msgstr "Alle"
-
-#: my-evolution/e-summary-shown.c:521 my-evolution/e-summary-table.c:58
-msgid "Shown"
-msgstr "Viste"
-
-#: my-evolution/e-summary-tasks.c:349
-msgid "No tasks"
-msgstr "Ingen opgaver"
-
-#: my-evolution/e-summary-tasks.c:387
-#, fuzzy
-msgid "blue"
-msgstr "Ambler"
-
-#: my-evolution/e-summary-tasks.c:387
-msgid "(No Description)"
-msgstr "(Ingen beskrivelse)"
-
-#: my-evolution/e-summary-weather.c:72
-msgid "My Weather"
-msgstr "Min vejrbesked"
-
-#: my-evolution/e-summary-weather.c:261
-msgid "There was an error downloading data for"
-msgstr "Et fejl opstod ved hentning af data for"
-
-#: my-evolution/e-summary-weather.c:478 my-evolution/my-evolution.glade.h:16
-msgid "Weather"
-msgstr "Vejr"
-
-#. translators: Put here a list of codes for locations you want to
-#. see in My Evolution by default. You can find the list of all
-#. stations and their codes in Evolution sources
-#. (evolution/my-evolution/Locations)
-#: my-evolution/e-summary-weather.c:582
-msgid "KBOS"
-msgstr "KBOS"
-
 #: my-evolution/GNOME_Evolution_Summary.server.in.in.h:1
 msgid "Configure the appearance of the Evolution Summary here"
 msgstr "Konfigurér udseendet af Evolution-sammenfatningerne."
@@ -23477,6 +23695,113 @@ msgstr "Zuni Pueblo"
 msgid "Zurich"
 msgstr "Zürich"
 
+#: my-evolution/component-factory.c:56
+msgid "Folder containing the Evolution Summary"
+msgstr "Mappe som indeholder Evolution sammendrag"
+
+#: my-evolution/e-summary-calendar.c:381
+msgid "Appointments"
+msgstr "Aftaler"
+
+#: my-evolution/e-summary-calendar.c:389
+msgid "No appointments."
+msgstr "Ingen aftaler."
+
+#: my-evolution/e-summary-calendar.c:406
+msgid "%k:%M %d %B"
+msgstr "%k:%M %d %B"
+
+#: my-evolution/e-summary-calendar.c:408
+#, fuzzy
+msgid "%l:%M%P %d %B"
+msgstr "%l: %M %d %B"
+
+#: my-evolution/e-summary-calendar.c:426
+msgid "No description"
+msgstr "Inegn beskrivelse"
+
+#: my-evolution/e-summary-mail.c:189
+msgid "Mail summary"
+msgstr "E-post-sammendrag"
+
+#: my-evolution/e-summary-preferences.c:355
+msgid "Dictionary.com Word of the Day"
+msgstr "Dictionary.com Ord for dagen"
+
+#: my-evolution/e-summary-preferences.c:373
+msgid "Quotes of the Day"
+msgstr "Dagens citater"
+
+#: my-evolution/e-summary-preferences.c:565
+#, fuzzy
+msgid "New News Feed"
+msgstr "Nyhedstjenester"
+
+#: my-evolution/e-summary-preferences.c:581
+#, fuzzy
+msgid "_URL:"
+msgstr "URL:"
+
+#: my-evolution/e-summary-rdf.c:315
+msgid "Error downloading RDF"
+msgstr "Fejl under nedhentning af RDF"
+
+#: my-evolution/e-summary-rdf.c:453
+msgid "News Feed"
+msgstr "Nyhedstjenester"
+
+#: my-evolution/e-summary-shown.c:496
+msgid "All"
+msgstr "Alle"
+
+#: my-evolution/e-summary-shown.c:521 my-evolution/e-summary-table.c:58
+msgid "Shown"
+msgstr "Viste"
+
+#: my-evolution/e-summary-tasks.c:330
+msgid "No tasks"
+msgstr "Ingen opgaver"
+
+#: my-evolution/e-summary-tasks.c:364
+msgid "(No Description)"
+msgstr "(Ingen beskrivelse)"
+
+#: my-evolution/e-summary-weather.c:73
+msgid "My Weather"
+msgstr "Min vejrbesked"
+
+#: my-evolution/e-summary-weather.c:262
+msgid "There was an error downloading data for"
+msgstr "Et fejl opstod ved hentning af data for"
+
+#: my-evolution/e-summary-weather.c:479 my-evolution/my-evolution.glade.h:16
+msgid "Weather"
+msgstr "Vejr"
+
+#. translators: Put here a list of codes for locations you want to
+#. see in My Evolution by default. You can find the list of all
+#. stations and their codes in Evolution sources
+#. (evolution/my-evolution/Locations)
+#: my-evolution/e-summary-weather.c:583
+msgid "KBOS"
+msgstr "KBOS"
+
+#: my-evolution/e-summary.c:204
+msgid "%A, %B %e %Y"
+msgstr "%A %e. %B %Y"
+
+#: my-evolution/e-summary.c:533
+msgid "Please wait..."
+msgstr "Venligst vent..."
+
+#: my-evolution/e-summary.c:622 ui/my-evolution.xml.h:2
+msgid "Print Summary"
+msgstr "Udskriv sammendrag"
+
+#: my-evolution/e-summary.c:655
+msgid "Printing of Summary failed"
+msgstr "Fejl under udskrift af sammendrag"
+
 #: my-evolution/metar.c:30
 msgid " F"
 msgstr " F"
@@ -24742,27 +25067,21 @@ msgstr "_En dag"
 msgid "_Show full path for folders"
 msgstr "V_is fuld sti for mapper"
 
-#: notes/component-factory.c:27
-#: shell/e-shell-user-creatable-items-handler.c:587
-#: shell/e-shell-user-creatable-items-handler.c:643
-#: widgets/misc/e-charset-picker.c:109
-msgid "New"
-msgstr "Ny"
+#: shell/GNOME_Evolution_Shell.server.in.in.h:1
+msgid "Configure special folders and offline folder behavior here"
+msgstr "Konfigurér opførsel for specialmapper og frakoblede mapper her"
 
-#: notes/component-factory.c:27
-#, fuzzy
-msgid "Create a new note"
-msgstr "Opret en ny mappe"
+#: shell/GNOME_Evolution_Shell.server.in.in.h:2
+msgid "Evolution Shell"
+msgstr "Evolution skallen"
 
-#: notes/component-factory.c:152
-#, fuzzy
-msgid "Cannot initialize Evolution's notes component."
-msgstr "Kan ikke initiere Evolutions mappeinfo-komponent."
+#: shell/GNOME_Evolution_Shell.server.in.in.h:3
+msgid "Evolution folder settings configuration control"
+msgstr "Evolution mappeindstillingsopsætnings-styreelement"
 
-#: notes/main.c:30
-#, fuzzy
-msgid "Notes Component: Could not initialize bonobo"
-msgstr "Kunne ikke initialisere Bonobo"
+#: shell/GNOME_Evolution_Shell.server.in.in.h:4
+msgid "Folder Settings"
+msgstr "Mappeindstillinger"
 
 #: shell/e-activity-handler.c:164
 msgid "Show Details"
@@ -24857,49 +25176,6 @@ msgstr ""
 msgid "Brought to you by"
 msgstr "Bragt til dig af"
 
-#: shell/e-shell.c:175
-#, c-format
-msgid ""
-"Cannot activate component %s :\n"
-"The error from the activation system is:\n"
-"%s"
-msgstr ""
-"Kan ikke aktivere komponenten %s:\n"
-"Fejlen fra aktiveringssystemet er:\n"
-"%s"
-
-#: shell/e-shell.c:741
-#, c-format
-msgid "Cannot set up local storage -- %s"
-msgstr "Kan ikke opsætte lokal lagring -- %s"
-
-#: shell/e-shell.c:1804
-#, c-format
-msgid ""
-"The Evolution component that handles folders of type \"%s\"\n"
-"has unexpectedly quit. You will need to quit Evolution and restart\n"
-"in order to access that data again."
-msgstr ""
-"Evolution-komponenten som håndterer mapper af type \"%s\"\n"
-"er afsluttet uventet. Du må afslutte Evolution og genstarte\n"
-"for at få adgang til disse data igen."
-
-#: shell/e-shell.c:2069
-msgid "Invalid arguments"
-msgstr "Ugyldige argumenter"
-
-#: shell/e-shell.c:2071
-msgid "Cannot register on OAF"
-msgstr "Kan ikke registrere i OAF"
-
-#: shell/e-shell.c:2073
-msgid "Configuration Database not found"
-msgstr "Konfigurationsdatabase ikke fundet"
-
-#: shell/e-shell.c:2075 shell/e-storage.c:568
-msgid "Generic error"
-msgstr "Generisk fejl"
-
 #: shell/e-shell-config-autocompletion.c:110
 msgid "Extra Completion folders"
 msgstr "Ekstra udfyldningsmapper"
@@ -24988,31 +25264,26 @@ msgstr ""
 "Kunne ikke ændre navn på mappe:\n"
 "%s"
 
-#: shell/e-shell-folder-commands.c:534
+#: shell/e-shell-folder-commands.c:538
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "Ændr navn på mappe \"%s\" til:"
 
-#: shell/e-shell-folder-commands.c:541
+#: shell/e-shell-folder-commands.c:544
 msgid "Rename Folder"
 msgstr "Ændr navn på mappe"
 
-#: shell/e-shell-folder-commands.c:547
+#: shell/e-shell-folder-commands.c:553
 #: shell/e-shell-folder-creation-dialog.c:180
 #, c-format
 msgid "The specified folder name is not valid: %s"
 msgstr "Specificeret mappenavn er ikke gyldigt: %s"
 
-#: shell/e-shell-folder-commands.c:554
-#, c-format
-msgid "A folder named \"%s\" already exists. Please use a different name."
-msgstr ""
-
-#: shell/e-shell-folder-commands.c:584
+#: shell/e-shell-folder-commands.c:587
 msgid "Selected folder does not belong to another user"
 msgstr "Den valgte mappe tilhører ikke en anden bruger"
 
-#: shell/e-shell-folder-commands.c:587
+#: shell/e-shell-folder-commands.c:590
 #, c-format
 msgid ""
 "Cannot remove folder:\n"
@@ -25056,19 +25327,11 @@ msgstr ""
 "Du kan vælge \"Automatisk\" hvis du ikke véd, så vil Evolution prøve at "
 "finde ud af hvilken type det er for dig."
 
-#: shell/e-shell-importer.c:148 shell/e-shell-startup-wizard.c:724
+#: shell/e-shell-importer.c:148 shell/e-shell-startup-wizard.c:709
 msgid "Please select the information that you would like to import:"
 msgstr "Venligst vælg information du ønsker at importere:"
 
-#: shell/e-shell-importer.c:151
-msgid ""
-"Evolution checked for settings to import from the following\n"
-"applications: Pine, Netscape, Elm, iCalendar. No settings\n"
-"that could be imported where found. If you would like to\n"
-"try again, please click the \"Back\" button.\n"
-msgstr ""
-
-#: shell/e-shell-importer.c:219 shell/e-shell-importer.c:250
+#: shell/e-shell-importer.c:213 shell/e-shell-importer.c:244
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -25077,21 +25340,21 @@ msgstr ""
 "Importerer %s\n"
 "Importerer opføring %d."
 
-#: shell/e-shell-importer.c:323
+#: shell/e-shell-importer.c:317
 msgid "Select importer"
 msgstr "Vælg importør"
 
-#: shell/e-shell-importer.c:464
+#: shell/e-shell-importer.c:458
 #, c-format
 msgid "File %s does not exist"
 msgstr "Filen %s eksisterer ikke"
 
-#: shell/e-shell-importer.c:465 shell/e-shell-importer.c:482
-#: shell/e-shell-importer.c:524
+#: shell/e-shell-importer.c:459 shell/e-shell-importer.c:476
+#: shell/e-shell-importer.c:518
 msgid "Evolution Error"
 msgstr "Evolution fejl"
 
-#: shell/e-shell-importer.c:481
+#: shell/e-shell-importer.c:475
 #, c-format
 msgid ""
 "There is no importer that is able to handle\n"
@@ -25100,11 +25363,11 @@ msgstr ""
 "Ingen importerer som kan håndtere\n"
 "%s"
 
-#: shell/e-shell-importer.c:490
+#: shell/e-shell-importer.c:484
 msgid "Importing"
 msgstr "Importerer"
 
-#: shell/e-shell-importer.c:497
+#: shell/e-shell-importer.c:491
 #, c-format
 msgid ""
 "Importing %s.\n"
@@ -25113,17 +25376,17 @@ msgstr ""
 "Importerer %s.\n"
 "Starter %s"
 
-#: shell/e-shell-importer.c:509
+#: shell/e-shell-importer.c:503
 #, c-format
 msgid "Error starting %s"
 msgstr "Fejl under start af %s"
 
-#: shell/e-shell-importer.c:523
+#: shell/e-shell-importer.c:517
 #, c-format
 msgid "Error loading %s"
 msgstr "Fejl under indlæsning af %s"
 
-#: shell/e-shell-importer.c:540
+#: shell/e-shell-importer.c:534
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -25132,35 +25395,31 @@ msgstr ""
 "Importerer %s\n"
 "Importerer opføring 1."
 
-#: shell/e-shell-importer.c:594
+#: shell/e-shell-importer.c:588
 msgid "Automatic"
 msgstr "Automatisk"
 
-#: shell/e-shell-importer.c:643
-#, fuzzy
-msgid "_Filename:"
+#: shell/e-shell-importer.c:637
+msgid "Filename:"
 msgstr "Filnavn:"
 
-#: shell/e-shell-importer.c:648
+#: shell/e-shell-importer.c:642
 msgid "Select a file"
 msgstr "Vælg en fil"
 
-#: shell/e-shell-importer.c:658
-#, fuzzy
-msgid "File _type:"
+#: shell/e-shell-importer.c:651
+msgid "File type:"
 msgstr "Filtype:"
 
-#: shell/e-shell-importer.c:684
-#, fuzzy
-msgid "Import data and settings from _older programs"
+#: shell/e-shell-importer.c:676
+msgid "Import data and settings from older programs"
 msgstr "Importer data og indstillinger fra andre programmer"
 
-#: shell/e-shell-importer.c:687
-#, fuzzy
-msgid "Import a _single file"
+#: shell/e-shell-importer.c:680
+msgid "Import a single file"
 msgstr "Importer en enkelt fil"
 
-#: shell/e-shell-importer.c:755 shell/e-shell-startup-wizard.c:553
+#: shell/e-shell-importer.c:746 shell/e-shell-startup-wizard.c:538
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
@@ -25168,26 +25427,25 @@ msgstr ""
 "Venligst vent...\n"
 "Søger efter eksisterende opsætning"
 
-#: shell/e-shell-importer.c:758
+#: shell/e-shell-importer.c:749
 msgid "Starting Intelligent Importers"
 msgstr "Starter intelligent importering"
 
-#: shell/e-shell-importer.c:884 shell/e-shell-startup-wizard.c:679
+#: shell/e-shell-importer.c:873 shell/e-shell-startup-wizard.c:664
 #, c-format
 msgid "From %s:"
 msgstr "Fra %s:"
 
-#: shell/e-shell-importer.c:1061
+#: shell/e-shell-importer.c:1047
 msgid "Select folder"
 msgstr "Vælg mappe"
 
-#: shell/e-shell-importer.c:1062
+#: shell/e-shell-importer.c:1048
 msgid "Select a destination folder for importing this data"
 msgstr "Vælg en målmappe til at importere data"
 
-#: shell/e-shell-importer.c:1193
-#, fuzzy
-msgid "_Import"
+#: shell/e-shell-importer.c:1178 shell/importer/intelligent.c:191
+msgid "Import"
 msgstr "Importér"
 
 #: shell/e-shell-offline-handler.c:592
@@ -25247,19 +25505,11 @@ msgstr "Kunne ikke åbne den delte mappe: %s."
 msgid "Cannot find the specified shared folder."
 msgstr "Kan ikke oprette den angivne delte mappe."
 
-#: shell/e-shell-startup-wizard.c:771
-msgid ""
-"If you quit the Evolution Setup Assistant now, all of the information that "
-"you have entered will be forgotten. You will need to run this assistant "
-"again before using Evolution.\n"
-"\n"
-"Do you want to quit using the Assistant now?"
-msgstr ""
-
-#: shell/e-shell-startup-wizard.c:782
-#, fuzzy
-msgid "Quit Assistant"
-msgstr "Assistent"
+#: shell/e-shell-user-creatable-items-handler.c:586
+#: shell/e-shell-user-creatable-items-handler.c:642
+#: widgets/misc/e-charset-picker.c:109
+msgid "New"
+msgstr "Ny"
 
 #: shell/e-shell-utils.c:116
 msgid "No folder name specified."
@@ -25281,35 +25531,6 @@ msgstr "Mappenavn kan ikke indeholde følgende tegn \"#\"."
 msgid "'.' and '..' are reserved folder names."
 msgstr "'.' og '..' er reserverede mappenavne."
 
-#: shell/e-shell-view.c:264
-msgid "(No folder displayed)"
-msgstr "(Ingen mappe vist)"
-
-#: shell/e-shell-view.c:2040
-#, c-format
-msgid "%s (%d)"
-msgstr "%s (%d)"
-
-#: shell/e-shell-view.c:2042
-msgid "(None)"
-msgstr "(Ingen)"
-
-#: shell/e-shell-view.c:2083
-msgid ""
-"Ximian Evolution is currently online.  Click on this button to work offline."
-msgstr ""
-"Ximian Evolution er koblet til. Klik på denne knap for at arbejde frakoblet."
-
-#: shell/e-shell-view.c:2090
-msgid "Ximian Evolution is in the process of going offline."
-msgstr "Ximian Evolution er i færd med at koble fra."
-
-#: shell/e-shell-view.c:2096
-msgid ""
-"Ximian Evolution is currently offline.  Click on this button to work online."
-msgstr ""
-"Ximian Evolution er frakoblet. Klik på denne knap for at arbejde tilkoblet."
-
 #: shell/e-shell-view-menu.c:89
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr ""
@@ -25360,13 +25581,77 @@ msgstr "Ar_bejd frakoblet"
 msgid "Work Offline"
 msgstr "Arbejd frakoblet"
 
-#: shell/e-shortcuts.c:649
-msgid "Error saving shortcuts."
-msgstr "Fejl ved gemning af genveje."
+#: shell/e-shell-view.c:264
+msgid "(No folder displayed)"
+msgstr "(Ingen mappe vist)"
 
-#: shell/e-shortcuts.c:1096
-msgid "Shortcuts"
-msgstr "Genveje"
+#: shell/e-shell-view.c:2040
+#, c-format
+msgid "%s (%d)"
+msgstr "%s (%d)"
+
+#: shell/e-shell-view.c:2042
+msgid "(None)"
+msgstr "(Ingen)"
+
+#: shell/e-shell-view.c:2083
+msgid ""
+"Ximian Evolution is currently online.  Click on this button to work offline."
+msgstr ""
+"Ximian Evolution er koblet til. Klik på denne knap for at arbejde frakoblet."
+
+#: shell/e-shell-view.c:2090
+msgid "Ximian Evolution is in the process of going offline."
+msgstr "Ximian Evolution er i færd med at koble fra."
+
+#: shell/e-shell-view.c:2096
+msgid ""
+"Ximian Evolution is currently offline.  Click on this button to work online."
+msgstr ""
+"Ximian Evolution er frakoblet. Klik på denne knap for at arbejde tilkoblet."
+
+#: shell/e-shell.c:175
+#, c-format
+msgid ""
+"Cannot activate component %s :\n"
+"The error from the activation system is:\n"
+"%s"
+msgstr ""
+"Kan ikke aktivere komponenten %s:\n"
+"Fejlen fra aktiveringssystemet er:\n"
+"%s"
+
+#: shell/e-shell.c:741
+#, c-format
+msgid "Cannot set up local storage -- %s"
+msgstr "Kan ikke opsætte lokal lagring -- %s"
+
+#: shell/e-shell.c:1804
+#, c-format
+msgid ""
+"The Evolution component that handles folders of type \"%s\"\n"
+"has unexpectedly quit. You will need to quit Evolution and restart\n"
+"in order to access that data again."
+msgstr ""
+"Evolution-komponenten som håndterer mapper af type \"%s\"\n"
+"er afsluttet uventet. Du må afslutte Evolution og genstarte\n"
+"for at få adgang til disse data igen."
+
+#: shell/e-shell.c:2069
+msgid "Invalid arguments"
+msgstr "Ugyldige argumenter"
+
+#: shell/e-shell.c:2071
+msgid "Cannot register on OAF"
+msgstr "Kan ikke registrere i OAF"
+
+#: shell/e-shell.c:2073
+msgid "Configuration Database not found"
+msgstr "Konfigurationsdatabase ikke fundet"
+
+#: shell/e-shell.c:2075 shell/e-storage.c:568
+msgid "Generic error"
+msgstr "Generisk fejl"
 
 #: shell/e-shortcuts-view.c:80
 msgid "Create New Shortcut Group"
@@ -25481,6 +25766,18 @@ msgstr "_Fjern"
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "Fjern denne genvej fra genvejslinjen"
 
+#: shell/e-shortcuts.c:649
+msgid "Error saving shortcuts."
+msgstr "Fejl ved gemning af genveje."
+
+#: shell/e-shortcuts.c:1096
+msgid "Shortcuts"
+msgstr "Genveje"
+
+#: shell/e-storage-set-view.etspec.h:1
+msgid "Checkbox"
+msgstr "Afkrydsningsboks"
+
 #: shell/e-storage.c:566
 msgid "No error"
 msgstr "Ingen fejl"
@@ -25537,14 +25834,6 @@ msgstr "Kan ikke oprette en mappe med det navn"
 msgid "This operation cannot be performed in off-line mode"
 msgstr "Denne handling kan ikke udføres i frakoblet tilstand"
 
-#: shell/e-storage-set-view.etspec.h:1
-msgid "Checkbox"
-msgstr "Afkrydsningsboks"
-
-#: shell/e-storage-set-view.etspec.h:2
-msgid "Folder"
-msgstr "Mappe"
-
 #: shell/e-task-widget.c:211
 #, c-format
 msgid "%s (...)"
@@ -25559,103 +25848,103 @@ msgstr "%s (%d%% fuldført)"
 msgid "<click here to select a folder>"
 msgstr "<klik her for at vælge en mappe>"
 
-#: shell/evolution-shell-component.c:1187
+#: shell/evolution-shell-component-utils.c:124
+#, c-format
+msgid ""
+"%s\n"
+"\n"
+"Unknown error."
+msgstr ""
+"%s\n"
+"\n"
+"Ukendt fejl."
+
+#: shell/evolution-shell-component-utils.c:127
+#, c-format
+msgid ""
+"%s\n"
+"\n"
+"The error from the component system is:\n"
+"%s"
+msgstr ""
+"%s\n"
+"\n"
+"Fejlen fra komponentsystemet er:\n"
+"%s"
+
+#: shell/evolution-shell-component-utils.c:134
+#, c-format
+msgid ""
+"%s\n"
+"\n"
+"The error from the activation system is:\n"
+"%s"
+msgstr ""
+"%s\n"
+"\n"
+"Fejlen fra aktiveringssystemet er:\n"
+"%s"
+
+#: shell/evolution-shell-component.c:1184
 msgid "CORBA error"
 msgstr "CORBA-fejl"
 
-#: shell/evolution-shell-component.c:1189
+#: shell/evolution-shell-component.c:1186
 msgid "Interrupted"
 msgstr "Afbrudt"
 
-#: shell/evolution-shell-component.c:1191
+#: shell/evolution-shell-component.c:1188
 msgid "Invalid argument"
 msgstr "Ugyldige argumenter"
 
-#: shell/evolution-shell-component.c:1193
+#: shell/evolution-shell-component.c:1190
 msgid "Already has an owner"
 msgstr "Har en ejer allerede"
 
-#: shell/evolution-shell-component.c:1195
+#: shell/evolution-shell-component.c:1192
 msgid "No owner"
 msgstr "Ingen ejer"
 
-#: shell/evolution-shell-component.c:1197
+#: shell/evolution-shell-component.c:1194
 msgid "Not found"
 msgstr "Ikke fundet"
 
-#: shell/evolution-shell-component.c:1199
+#: shell/evolution-shell-component.c:1196
 msgid "Unsupported type"
 msgstr "En ikke-understøttet type"
 
-#: shell/evolution-shell-component.c:1201
+#: shell/evolution-shell-component.c:1198
 msgid "Unsupported schema"
 msgstr "Et ikke understøttet skema"
 
-#: shell/evolution-shell-component.c:1203
+#: shell/evolution-shell-component.c:1200
 msgid "Unsupported operation"
 msgstr "En ikke-understøttet handling"
 
-#: shell/evolution-shell-component.c:1205
+#: shell/evolution-shell-component.c:1202
 msgid "Internal error"
 msgstr "Intern fejl"
 
-#: shell/evolution-shell-component.c:1209
+#: shell/evolution-shell-component.c:1206
 msgid "Exists"
 msgstr "Eksisterer"
 
-#: shell/evolution-shell-component.c:1211
+#: shell/evolution-shell-component.c:1208
 msgid "Invalid URI"
 msgstr "Ugyldig URI"
 
-#: shell/evolution-shell-component.c:1215
+#: shell/evolution-shell-component.c:1212
 msgid "Has subfolders"
 msgstr "Har undermapper"
 
-#: shell/evolution-shell-component.c:1217
+#: shell/evolution-shell-component.c:1214
 msgid "No space left"
 msgstr "Ingen plads tilbage"
 
-#: shell/evolution-shell-component.c:1219
+#: shell/evolution-shell-component.c:1216
 msgid "Old owner has died"
 msgstr "Tidligere ejer er død FIXME"
 
-#: shell/evolution-shell-component-utils.c:124
-#, c-format
-msgid ""
-"%s\n"
-"\n"
-"Unknown error."
-msgstr ""
-"%s\n"
-"\n"
-"Ukendt fejl."
-
-#: shell/evolution-shell-component-utils.c:127
-#, c-format
-msgid ""
-"%s\n"
-"\n"
-"The error from the component system is:\n"
-"%s"
-msgstr ""
-"%s\n"
-"\n"
-"Fejlen fra komponentsystemet er:\n"
-"%s"
-
-#: shell/evolution-shell-component-utils.c:134
-#, c-format
-msgid ""
-"%s\n"
-"\n"
-"The error from the activation system is:\n"
-"%s"
-msgstr ""
-"%s\n"
-"\n"
-"Fejlen fra aktiveringssystemet er:\n"
-"%s"
-
 #: shell/evolution-test-component.c:63
 msgid "Test type"
 msgstr "Testtype"
@@ -25762,22 +26051,6 @@ msgstr ""
 "\n"
 "Klik på knappen \"Afslut\" for at gemme dine indstillinger. "
 
-#: shell/GNOME_Evolution_Shell.server.in.in.h:1
-msgid "Configure special folders and offline folder behavior here"
-msgstr "Konfigurér opførsel for specialmapper og frakoblede mapper her"
-
-#: shell/GNOME_Evolution_Shell.server.in.in.h:2
-msgid "Evolution Shell"
-msgstr "Evolution skallen"
-
-#: shell/GNOME_Evolution_Shell.server.in.in.h:3
-msgid "Evolution folder settings configuration control"
-msgstr "Evolution mappeindstillingsopsætnings-styreelement"
-
-#: shell/GNOME_Evolution_Shell.server.in.in.h:4
-msgid "Folder Settings"
-msgstr "Mappeindstillinger"
-
 #: shell/importer/import.glade.h:1
 msgid "Click \"Import\" to begin importing the file into Evolution. "
 msgstr "Klik \"Importér\" for at starte import af filen til Evolution."
@@ -25816,10 +26089,6 @@ msgstr ""
 msgid "Importers"
 msgstr "Importerere"
 
-#: shell/importer/intelligent.c:191
-msgid "Import"
-msgstr "Importér"
-
 #: shell/importer/intelligent.c:195
 msgid "Don't import"
 msgstr "Importér ikke"
@@ -26009,7 +26278,7 @@ msgstr "Flyt kontakter til en anden mappe..."
 msgid "Move to Folder..."
 msgstr "Flyt til mappe..."
 
-#: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:18
+#: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:17
 msgid "Paste the clipboard"
 msgstr "Indsæt fra klippebordet"
 
@@ -26017,9 +26286,9 @@ msgstr "Indsæt fra klippebordet"
 msgid "Previews the contacts to be printed"
 msgstr "Forhåndsviser kontakterne som skal skrives ud"
 
-#: ui/evolution-addressbook.xml.h:17 ui/evolution-calendar.xml.h:20
-#: ui/evolution-comp-editor.xml.h:9 ui/evolution-mail-message.xml.h:73
-#: ui/evolution-tasks.xml.h:13
+#: ui/evolution-addressbook.xml.h:17 ui/evolution-calendar.xml.h:19
+#: ui/evolution-comp-editor.xml.h:9 ui/evolution-mail-message.xml.h:68
+#: ui/evolution-tasks.xml.h:12
 msgid "Print Pre_view"
 msgstr "Forhåndsvisning af udskrift"
 
@@ -26063,21 +26332,17 @@ msgstr "Stop indlæsning"
 msgid "View the current contact"
 msgstr "Vis den aktuelle kontakt"
 
-#: ui/evolution-addressbook.xml.h:29 ui/evolution-calendar.xml.h:32
-#: ui/evolution-comp-editor.xml.h:16 ui/evolution-contact-editor.xml.h:13
-#: ui/evolution-contact-list-editor.xml.h:11
+#: ui/evolution-addressbook.xml.h:29 ui/evolution-calendar.xml.h:28
+#: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:11
+#: ui/evolution-contact-list-editor.xml.h:10
 #: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:17
-#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-messagedisplay.xml.h:4
-#: ui/evolution-mail-message.xml.h:99 ui/evolution-task-editor.xml.h:9
-#: ui/evolution-tasks.xml.h:16 ui/evolution.xml.h:42
+#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:93
+#: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-task-editor.xml.h:9
+#: ui/evolution-tasks.xml.h:14 ui/evolution.xml.h:42
 msgid "_Actions"
 msgstr "H_andlinger"
 
-#: ui/evolution-addressbook.xml.h:31
-msgid "_Copy to Folder..."
-msgstr "K_opiér til mappe..."
-
-#: ui/evolution-addressbook.xml.h:34 ui/evolution-contact-editor.xml.h:16
+#: ui/evolution-addressbook.xml.h:34 ui/evolution-contact-editor.xml.h:13
 msgid "_Forward Contact..."
 msgstr "_Videresend kontakt..."
 
@@ -26145,61 +26410,46 @@ msgstr "Gå til en specifik dato"
 msgid "Go to today"
 msgstr "Gå til i dag"
 
-#: ui/evolution-calendar.xml.h:17
+#: ui/evolution-calendar.xml.h:16
 msgid "Month"
 msgstr "Måned"
 
-#: ui/evolution-calendar.xml.h:19
+#: ui/evolution-calendar.xml.h:18
 msgid "Previews the calendar to be printed"
 msgstr "Forhåndsviser kalenderen som skal skrives ud"
 
-#: ui/evolution-calendar.xml.h:21
+#: ui/evolution-calendar.xml.h:20
 msgid "Print this calendar"
 msgstr "Udskriv denne kalender"
 
-#: ui/evolution-calendar.xml.h:22
+#: ui/evolution-calendar.xml.h:21
 msgid "Publish Free/Busy information for this calendar"
 msgstr "Udgiv ledig/optaget information for denne kalender"
 
-#: ui/evolution-calendar.xml.h:23 ui/evolution-tasks.xml.h:15
-#, fuzzy
-msgid "Purg_e"
-msgstr "Bourges"
-
-#: ui/evolution-calendar.xml.h:24
-#, fuzzy
-msgid "Purge old appointments and meetings"
-msgstr "Offentlig mappe som indeholder mødelser og hændelser"
-
-#: ui/evolution-calendar.xml.h:25
-#, fuzzy
-msgid "Show as list"
-msgstr "Vis detaljer"
-
-#: ui/evolution-calendar.xml.h:26
+#: ui/evolution-calendar.xml.h:22
 msgid "Show one day"
 msgstr "Vis en dag"
 
-#: ui/evolution-calendar.xml.h:27
+#: ui/evolution-calendar.xml.h:23
 msgid "Show one month"
 msgstr "Vis en måned"
 
-#: ui/evolution-calendar.xml.h:28
+#: ui/evolution-calendar.xml.h:24
 msgid "Show one week"
 msgstr "Vis en uge"
 
-#: ui/evolution-calendar.xml.h:29
+#: ui/evolution-calendar.xml.h:25
 msgid "Show the working week"
 msgstr "Vis arbejdsugen"
 
-#: ui/evolution-calendar.xml.h:30
+#: ui/evolution-calendar.xml.h:26
 msgid "Week"
 msgstr "Uge"
 
-#: ui/evolution-comp-editor.xml.h:2 ui/evolution-contact-editor.xml.h:2
-#: ui/evolution-contact-list-editor.xml.h:2
+#: ui/evolution-comp-editor.xml.h:2 ui/evolution-contact-editor.xml.h:1
+#: ui/evolution-contact-list-editor.xml.h:1
 #: ui/evolution-mail-messagedisplay.xml.h:1
-#: ui/evolution-message-composer.xml.h:3 ui/evolution-signature-editor.xml.h:2
+#: ui/evolution-message-composer.xml.h:3 ui/evolution-signature-editor.xml.h:1
 #: ui/evolution.xml.h:5
 msgid "Close"
 msgstr "Luk"
@@ -26208,7 +26458,7 @@ msgstr "Luk"
 msgid "Close this item"
 msgstr "Luk denne opføring"
 
-#: ui/evolution-comp-editor.xml.h:5 ui/evolution-contact-editor.xml.h:4
+#: ui/evolution-comp-editor.xml.h:5 ui/evolution-contact-editor.xml.h:3
 msgid "Delete this item"
 msgstr "Slet denne opføring"
 
@@ -26221,58 +26471,47 @@ msgstr "Hovedværktøjslinje"
 msgid "Preview the printed item"
 msgstr "Forhåndsvisning af opføring som skal skrives ud"
 
-#: ui/evolution-comp-editor.xml.h:10 ui/evolution-contact-editor.xml.h:7
+#: ui/evolution-comp-editor.xml.h:10 ui/evolution-contact-editor.xml.h:6
 msgid "Print this item"
 msgstr "Udskriv denne opføring"
 
-#: ui/evolution-comp-editor.xml.h:11 ui/evolution-contact-editor.xml.h:8
-#: ui/evolution-contact-list-editor.xml.h:5
-#: ui/evolution-message-composer.xml.h:18
-msgid "Save _As..."
-msgstr "Gem _som..."
+#: ui/evolution-comp-editor.xml.h:12 ui/evolution-message-composer.xml.h:16
+#: ui/evolution-signature-editor.xml.h:5
+msgid "Save"
+msgstr "Gem"
 
-#: ui/evolution-comp-editor.xml.h:12 ui/evolution-contact-editor.xml.h:9
+#: ui/evolution-comp-editor.xml.h:13
+msgid "Save As..."
+msgstr "Gem som..."
+
+#: ui/evolution-comp-editor.xml.h:14 ui/evolution-contact-editor.xml.h:8
 #: ui/evolution-contact-list-editor.xml.h:6
-#: ui/evolution-signature-editor.xml.h:7
+#: ui/evolution-signature-editor.xml.h:6
 msgid "Save and Close"
 msgstr "Gem og luk"
 
-#: ui/evolution-comp-editor.xml.h:13 ui/evolution-contact-editor.xml.h:10
-#: ui/evolution-contact-list-editor.xml.h:7
-#: ui/evolution-signature-editor.xml.h:8
-#, fuzzy
-msgid "Save and _Close"
-msgstr "Gem og luk"
-
-#: ui/evolution-comp-editor.xml.h:14
+#: ui/evolution-comp-editor.xml.h:15
 msgid "Save the item and close the dialog box"
 msgstr "Gem opføringen og luk dialogboksen"
 
-#: ui/evolution-comp-editor.xml.h:15
+#: ui/evolution-comp-editor.xml.h:16
 msgid "Save this item to disk"
 msgstr "Gem denne opføring på disk"
 
-#: ui/evolution-comp-editor.xml.h:18 ui/evolution-contact-editor.xml.h:15
-#: ui/evolution-contact-list-editor.xml.h:13
+#: ui/evolution-comp-editor.xml.h:18 ui/evolution-contact-editor.xml.h:12
+#: ui/evolution-contact-list-editor.xml.h:11
 #: ui/evolution-mail-messagedisplay.xml.h:7
 #: ui/evolution-message-composer.xml.h:42
-#: ui/evolution-signature-editor.xml.h:13 ui/evolution-subscribe.xml.h:11
+#: ui/evolution-signature-editor.xml.h:12 ui/evolution-subscribe.xml.h:11
 #: ui/evolution.xml.h:46
 msgid "_File"
 msgstr "_Fil"
 
-#: ui/evolution-comp-editor.xml.h:20 ui/evolution-contact-editor.xml.h:18
-#: ui/evolution-contact-list-editor.xml.h:14
-#: ui/evolution-message-composer.xml.h:47
-#: ui/evolution-signature-editor.xml.h:15
-msgid "_Save"
-msgstr "_Gem"
-
 #: ui/evolution-composer-entries.xml.h:1
 msgid "Copy selected text to the clipboard"
 msgstr "Kopiér markerede meddelelser til klippebord"
 
-#: ui/evolution-composer-entries.xml.h:2 ui/evolution-mail-message.xml.h:21
+#: ui/evolution-composer-entries.xml.h:2 ui/evolution-mail-list.xml.h:3
 msgid "Cu_t"
 msgstr "Klip u_d"
 
@@ -26293,39 +26532,51 @@ msgstr "Vælg _alle"
 msgid "Select all text"
 msgstr "Vælg hele teksten"
 
-#: ui/evolution-contact-editor.xml.h:6
+#: ui/evolution-contact-editor.xml.h:5
 msgid "Print En_velope..."
 msgstr "Udskriv konvolut..."
 
-#: ui/evolution-contact-editor.xml.h:11
+#: ui/evolution-contact-editor.xml.h:7
+#: ui/evolution-contact-list-editor.xml.h:5
+#: ui/evolution-message-composer.xml.h:18
+msgid "Save _As..."
+msgstr "Gem _som..."
+
+#: ui/evolution-contact-editor.xml.h:9
 msgid "Save the contact and close the dialog box"
 msgstr "Gem kontakten og luk dialogboksen"
 
-#: ui/evolution-contact-editor.xml.h:12
+#: ui/evolution-contact-editor.xml.h:10
 msgid "Send _Message to Contact..."
 msgstr "Send _besked til kontakt..."
 
-#: ui/evolution-contact-list-editor.xml.h:4
+#: ui/evolution-contact-editor.xml.h:15
+#: ui/evolution-contact-list-editor.xml.h:12
+#: ui/evolution-message-composer.xml.h:47
+#: ui/evolution-signature-editor.xml.h:14
+msgid "_Save"
+msgstr "_Gem"
+
+#: ui/evolution-contact-list-editor.xml.h:3
 msgid "Delete this list"
 msgstr "Slet denne liste"
 
-#: ui/evolution-contact-list-editor.xml.h:8
+#: ui/evolution-contact-list-editor.xml.h:4
+msgid "Delete..."
+msgstr "Slet..."
+
+#: ui/evolution-contact-list-editor.xml.h:7
 msgid "Save the list and close the dialog box"
 msgstr "Gem listen og luk dialogboksen"
 
-#: ui/evolution-contact-list-editor.xml.h:9
+#: ui/evolution-contact-list-editor.xml.h:8
 msgid "Se_nd list to other..."
 msgstr "Se_nd liste til andre..."
 
-#: ui/evolution-contact-list-editor.xml.h:10
+#: ui/evolution-contact-list-editor.xml.h:9
 msgid "Send _message to list..."
 msgstr "Send _besked til liste..."
 
-#: ui/evolution-contact-list-editor.xml.h:12
-#, fuzzy
-msgid "_Delete..."
-msgstr "Slet..."
-
 #: ui/evolution-event-editor.xml.h:1
 msgid "Cancel Mee_ting"
 msgstr "Aflys mø_de"
@@ -26399,8 +26650,7 @@ msgid "Permanently remove all deleted messages from all folders"
 msgstr "Fjern alle slettede beskeder fra alle mapper permanent"
 
 #: ui/evolution-mail-global.xml.h:11
-#, fuzzy
-msgid "Post Ne_w Message"
+msgid "Post New Message"
 msgstr "Post ny meddelelse"
 
 #: ui/evolution-mail-global.xml.h:12
@@ -26435,19 +26685,14 @@ msgstr "_Forhåndsvisningsvindue"
 msgid "Change the properties of this folder"
 msgstr "Ændr egenskaber for denne mappe"
 
-#: ui/evolution-mail-list.xml.h:2 ui/evolution-mail-message.xml.h:10
+#: ui/evolution-mail-list.xml.h:2
 msgid "Copy selected message(s) to the clipboard"
 msgstr "Kopiér markerede meddelelser til klippebord"
 
-#: ui/evolution-mail-list.xml.h:3 ui/evolution-mail-message.xml.h:22
+#: ui/evolution-mail-list.xml.h:4
 msgid "Cut selected message(s) to the clipboard"
 msgstr "Klip markerede meddelelser ud til klippebord"
 
-#: ui/evolution-mail-list.xml.h:4
-#, fuzzy
-msgid "E_xpunge"
-msgstr "_Fjern slettede beskeder"
-
 #: ui/evolution-mail-list.xml.h:5
 msgid "Hide S_elected Messages"
 msgstr "Skjul valgt_e beskeder"
@@ -26466,15 +26711,14 @@ msgid ""
 msgstr "Skjul slettede beskeder i stedet for at vise dem gennemstreget"
 
 #: ui/evolution-mail-list.xml.h:9
-#, fuzzy
-msgid "Mark All as _Read"
+msgid "Mark All as R_ead"
 msgstr "Markér alle som l_æst"
 
 #: ui/evolution-mail-list.xml.h:10
 msgid "Mark all visible messages as read"
 msgstr "Markér alle synlige beskeder som læst"
 
-#: ui/evolution-mail-list.xml.h:11 ui/evolution-mail-message.xml.h:66
+#: ui/evolution-mail-list.xml.h:11
 msgid "Paste message(s) from the clipboard"
 msgstr "Indsæt meddelelsen fra klippebord"
 
@@ -26518,37 +26762,26 @@ msgstr "Skjul valgte beskeder midlertidigt"
 msgid "Threaded Message list"
 msgstr "Beskedsliste med tråde"
 
-#: ui/evolution-mail-list.xml.h:25 ui/evolution.xml.h:47
+#: ui/evolution-mail-list.xml.h:26 ui/evolution-tasks.xml.h:18
+msgid "_Expunge"
+msgstr "_Fjern slettede beskeder"
+
+#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:47
 msgid "_Folder"
 msgstr "M_appe"
 
-#: ui/evolution-mail-list.xml.h:26 ui/evolution-subscribe.xml.h:12
+#: ui/evolution-mail-list.xml.h:28 ui/evolution-subscribe.xml.h:12
 msgid "_Invert Selection"
 msgstr "Re_versér udvalg"
 
-#: ui/evolution-mail-list.xml.h:27
+#: ui/evolution-mail-list.xml.h:30
 msgid "_Properties..."
 msgstr "Egenska_ber..."
 
-#: ui/evolution-mail-list.xml.h:28
+#: ui/evolution-mail-list.xml.h:31
 msgid "_Threaded Message List"
 msgstr "Beskedsliste med _tråde"
 
-#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:6
-msgid "Close this window"
-msgstr "Luk dette vindue"
-
-#: ui/evolution-mail-messagedisplay.xml.h:5
-#: ui/evolution-message-composer.xml.h:39 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:43
-msgid "_Close"
-msgstr "L_uk"
-
-#: ui/evolution-mail-messagedisplay.xml.h:8
-#: ui/evolution-message-composer.xml.h:49 ui/evolution.xml.h:64
-msgid "_View"
-msgstr "_Vis"
-
 #: ui/evolution-mail-message.xml.h:1
 msgid "A_dd Sender to Addressbook"
 msgstr "_Tilføj afsenderen i adressebogen"
@@ -26566,413 +26799,401 @@ msgid "Apply filter rules to the selected messages"
 msgstr "Aktivér filterregler på de valgte beskeder"
 
 #: ui/evolution-mail-message.xml.h:5
-#, fuzzy
-msgid "Caret _Mode"
-msgstr "Tekstmodel"
-
-#: ui/evolution-mail-message.xml.h:6
 msgid "Compose a reply to all of the recipients of the selected message"
 msgstr "Skriv et svar til alle modtagere af den valgte besked"
 
-#: ui/evolution-mail-message.xml.h:7
+#: ui/evolution-mail-message.xml.h:6
 msgid "Compose a reply to the mailing list of the selected message"
 msgstr "Skriv et svar til e-post-listen for den valgte besked"
 
-#: ui/evolution-mail-message.xml.h:8
+#: ui/evolution-mail-message.xml.h:7
 msgid "Compose a reply to the sender of the selected message"
 msgstr "Skriv et svar til afsender af den valgte besked"
 
-#: ui/evolution-mail-message.xml.h:11
+#: ui/evolution-mail-message.xml.h:9
 msgid "Copy selected messages to another folder"
 msgstr "Kopiér valgte beskeder til en anden mappe"
 
-#: ui/evolution-mail-message.xml.h:12
+#: ui/evolution-mail-message.xml.h:10
 msgid "Create _Virtual Folder From Message"
 msgstr "Opret _virtuel mappe fra besked"
 
-#: ui/evolution-mail-message.xml.h:13
+#: ui/evolution-mail-message.xml.h:11
 msgid "Create a rule to filter messages from this sender"
 msgstr "Lav en regel for at filtrere beskeder fra denne afsender"
 
-#: ui/evolution-mail-message.xml.h:14
+#: ui/evolution-mail-message.xml.h:12
 msgid "Create a rule to filter messages to these recipients"
 msgstr "Lav en regel for at filtrere beskeder til disse modtagere"
 
-#: ui/evolution-mail-message.xml.h:15
+#: ui/evolution-mail-message.xml.h:13
 msgid "Create a rule to filter messages to this mailing list"
 msgstr "Lav en regel for at filtrere beskeder til denne beskedsliste"
 
-#: ui/evolution-mail-message.xml.h:16
+#: ui/evolution-mail-message.xml.h:14
 msgid "Create a rule to filter messages with this subject"
 msgstr "Lav en regel for filtrering af beskeder med dette emne"
 
-#: ui/evolution-mail-message.xml.h:17
+#: ui/evolution-mail-message.xml.h:15
 msgid "Create a virtual folder for these recipients"
 msgstr "Lav en virtuel mappe for disse modtagere"
 
-#: ui/evolution-mail-message.xml.h:18
+#: ui/evolution-mail-message.xml.h:16
 msgid "Create a virtual folder for this mailing list"
 msgstr "Lav en virtuel mappe for denne e-post-liste"
 
-#: ui/evolution-mail-message.xml.h:19
+#: ui/evolution-mail-message.xml.h:17
 msgid "Create a virtual folder for this sender"
 msgstr "Lav en virtuel mappe for denne afsender"
 
-#: ui/evolution-mail-message.xml.h:20
+#: ui/evolution-mail-message.xml.h:18
 msgid "Create a virtual folder for this subject"
 msgstr "Lav en virtuel mappe for dette emne"
 
-#: ui/evolution-mail-message.xml.h:23
+#: ui/evolution-mail-message.xml.h:19
 msgid "Decrease the text size"
 msgstr "Formindsk tekstens størrelse"
 
-#: ui/evolution-mail-message.xml.h:25
+#: ui/evolution-mail-message.xml.h:21
 msgid "Display the next important message"
 msgstr "Vis næste vigtige besked"
 
-#: ui/evolution-mail-message.xml.h:26
+#: ui/evolution-mail-message.xml.h:22
 msgid "Display the next message"
 msgstr "Vis næste besked"
 
-#: ui/evolution-mail-message.xml.h:27
+#: ui/evolution-mail-message.xml.h:23
 msgid "Display the next unread message"
 msgstr "Vis næste ulæste besked"
 
-#: ui/evolution-mail-message.xml.h:28
+#: ui/evolution-mail-message.xml.h:24
 msgid "Display the next unread thread"
 msgstr "Vis næste ulæste tråd"
 
-#: ui/evolution-mail-message.xml.h:29
+#: ui/evolution-mail-message.xml.h:25
 msgid "Display the previous important message"
 msgstr "Vis forrige vigtige besked"
 
-#: ui/evolution-mail-message.xml.h:30
+#: ui/evolution-mail-message.xml.h:26
 msgid "Display the previous message"
 msgstr "Vis forrige besked"
 
-#: ui/evolution-mail-message.xml.h:31
+#: ui/evolution-mail-message.xml.h:27
 msgid "Display the previous unread message"
 msgstr "Vis forrige ulæste besked"
 
-#: ui/evolution-mail-message.xml.h:32
+#: ui/evolution-mail-message.xml.h:28
 msgid "F_orward"
 msgstr "_Videresend"
 
-#: ui/evolution-mail-message.xml.h:33
+#: ui/evolution-mail-message.xml.h:29
 msgid "Filter on Mailing _List..."
 msgstr "Filtrér på e-post_liste..."
 
-#: ui/evolution-mail-message.xml.h:34
+#: ui/evolution-mail-message.xml.h:30
 msgid "Filter on Se_nder..."
 msgstr "Filtrér på se_nder..."
 
-#: ui/evolution-mail-message.xml.h:35
+#: ui/evolution-mail-message.xml.h:31
 msgid "Filter on _Recipients..."
 msgstr "Filtrér på modtage_re..."
 
-#: ui/evolution-mail-message.xml.h:36
+#: ui/evolution-mail-message.xml.h:32
 msgid "Filter on _Subject..."
 msgstr "Filtrér på e_mne..."
 
-#: ui/evolution-mail-message.xml.h:37
+#: ui/evolution-mail-message.xml.h:33
 msgid "Flag selected message(s) for follow-up"
 msgstr "Markér markerede meddelelser for opfølgning"
 
-#: ui/evolution-mail-message.xml.h:38
+#: ui/evolution-mail-message.xml.h:34
 msgid "Follow _Up..."
 msgstr "Følg _op..."
 
-#: ui/evolution-mail-message.xml.h:39
+#: ui/evolution-mail-message.xml.h:35
 msgid "Force images in HTML mail to be loaded"
 msgstr "Tvungen indlæsning af billeder i HTML-baseret e-post"
 
-#: ui/evolution-mail-message.xml.h:41
+#: ui/evolution-mail-message.xml.h:37
 msgid "Forward the selected message in the body of a new message"
 msgstr "Videresend den valgte besked i kroppen af en ny besked"
 
-#: ui/evolution-mail-message.xml.h:42
+#: ui/evolution-mail-message.xml.h:38
 msgid "Forward the selected message quoted like a reply"
 msgstr "Videresend den valgte besked citeret som et svar"
 
-#: ui/evolution-mail-message.xml.h:43
+#: ui/evolution-mail-message.xml.h:39
 msgid "Forward the selected message to someone"
 msgstr "Videresend den valgte besked til nogen"
 
-#: ui/evolution-mail-message.xml.h:44
+#: ui/evolution-mail-message.xml.h:40
 msgid "Forward the selected message to someone as an attachment"
 msgstr "Videresend den valgte besked til nogen som et bilag"
 
-#: ui/evolution-mail-message.xml.h:45
+#: ui/evolution-mail-message.xml.h:41
 msgid "Increase the text size"
 msgstr "Forøg tekstens størrelse"
 
-#: ui/evolution-mail-message.xml.h:46
+#: ui/evolution-mail-message.xml.h:42
 msgid "Load _Images"
 msgstr "Indlæs b_illeder"
 
-#: ui/evolution-mail-message.xml.h:47
-msgid "Mar_k as Read"
-msgstr "Mar_kér som læst"
-
-#: ui/evolution-mail-message.xml.h:48
+#: ui/evolution-mail-message.xml.h:44
 msgid "Mark as I_mportant"
 msgstr "Markér som _vigtig"
 
-#: ui/evolution-mail-message.xml.h:49
+#: ui/evolution-mail-message.xml.h:45
 msgid "Mark as U_nread"
 msgstr "Markér som _ulæst"
 
-#: ui/evolution-mail-message.xml.h:50
+#: ui/evolution-mail-message.xml.h:46
 msgid "Mark as Unimp_ortant"
 msgstr "Markér som uv_igtig"
 
-#: ui/evolution-mail-message.xml.h:51
+#: ui/evolution-mail-message.xml.h:47
 msgid "Mark the selected message(s) as having been read"
 msgstr "Markér de valgte beskeder som læste"
 
-#: ui/evolution-mail-message.xml.h:52
+#: ui/evolution-mail-message.xml.h:48
 msgid "Mark the selected message(s) as important"
 msgstr "Markér de valgte beskeder som vigtige"
 
-#: ui/evolution-mail-message.xml.h:53
+#: ui/evolution-mail-message.xml.h:49
 msgid "Mark the selected message(s) as not having been read"
 msgstr "Markér de valgte beskeder som ulæste"
 
-#: ui/evolution-mail-message.xml.h:54
+#: ui/evolution-mail-message.xml.h:50
 msgid "Mark the selected message(s) as unimportant"
 msgstr "Markér de valgte beskeder som uvigtige"
 
-#: ui/evolution-mail-message.xml.h:55
+#: ui/evolution-mail-message.xml.h:51
 msgid "Mark the selected messages for deletion"
 msgstr "Markér de valgte beskeder for sletning"
 
-#: ui/evolution-mail-message.xml.h:56
+#: ui/evolution-mail-message.xml.h:52
 msgid "Move"
 msgstr "Flyt"
 
-#: ui/evolution-mail-message.xml.h:57
+#: ui/evolution-mail-message.xml.h:53
 msgid "Move selected message(s) to another folder"
 msgstr "Flyt de valgte beskeder til en anden mappe"
 
-#: ui/evolution-mail-message.xml.h:58
+#: ui/evolution-mail-message.xml.h:54
 msgid "Next"
 msgstr "Næste"
 
-#: ui/evolution-mail-message.xml.h:59
+#: ui/evolution-mail-message.xml.h:55
 msgid "Next _Important Message"
 msgstr "Næste _vigtige meddelelse"
 
-#: ui/evolution-mail-message.xml.h:60
+#: ui/evolution-mail-message.xml.h:56
 msgid "Next _Thread"
 msgstr "Næste _tråd"
 
-#: ui/evolution-mail-message.xml.h:61
+#: ui/evolution-mail-message.xml.h:57
 msgid "Next _Unread Message"
 msgstr "Næste _ulæste meddelelse"
 
-#: ui/evolution-mail-message.xml.h:62
+#: ui/evolution-mail-message.xml.h:58
 msgid "Open the selected message in a new window"
 msgstr "Åbn valgt besked i et nyt vindue"
 
-#: ui/evolution-mail-message.xml.h:63
+#: ui/evolution-mail-message.xml.h:59
 msgid "Open the selected message in the composer to re-send it"
 msgstr "Åbn valgt besked i redigeringsvinduet for at sende den igen"
 
-#: ui/evolution-mail-message.xml.h:64
+#: ui/evolution-mail-message.xml.h:60
 msgid "Original Si_ze"
 msgstr "Oprindelig _størrelse"
 
-#: ui/evolution-mail-message.xml.h:65
+#: ui/evolution-mail-message.xml.h:61
 msgid "P_revious Unread Message"
 msgstr "F_oregående ulæste meddelelse"
 
-#: ui/evolution-mail-message.xml.h:67
-#, fuzzy
-msgid "Post a Repl_y"
+#: ui/evolution-mail-message.xml.h:62
+msgid "Post a Reply"
 msgstr "Post et svar"
 
-#: ui/evolution-mail-message.xml.h:68
+#: ui/evolution-mail-message.xml.h:63
 msgid "Post a reply to a message in a Public folder"
 msgstr "Post et svar til en meddelelse i en offentlig mappe"
 
-#: ui/evolution-mail-message.xml.h:69
+#: ui/evolution-mail-message.xml.h:64
 msgid "Pr_evious Important Message"
 msgstr "Fo_regående vigtige meddelelse"
 
-#: ui/evolution-mail-message.xml.h:70
+#: ui/evolution-mail-message.xml.h:65
 msgid "Preview the message to be printed"
 msgstr "Forhåndsvis beskeden som skal skrives ud"
 
-#: ui/evolution-mail-message.xml.h:71
+#: ui/evolution-mail-message.xml.h:66
 msgid "Previous"
 msgstr "Forrige"
 
-#: ui/evolution-mail-message.xml.h:74
+#: ui/evolution-mail-message.xml.h:69
 msgid "Print this message"
 msgstr "Udskriv denne besked"
 
-#: ui/evolution-mail-message.xml.h:75
+#: ui/evolution-mail-message.xml.h:70
 msgid "Re_direct"
 msgstr "_Omdirigér"
 
-#: ui/evolution-mail-message.xml.h:76
+#: ui/evolution-mail-message.xml.h:71
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "Omdirigér (bounce) den markerede meddelelse til nogen"
 
-#: ui/evolution-mail-message.xml.h:79
-msgid "Reply to _All"
-msgstr "Svar til _alle"
-
-#: ui/evolution-mail-message.xml.h:80
-msgid "Reply to _List"
-msgstr "Svar til _listen"
-
-#: ui/evolution-mail-message.xml.h:81
+#: ui/evolution-mail-message.xml.h:76
 msgid "Reset the text to its original size"
 msgstr "Nulstil tekststørrelsen til den oprindelige"
 
-#: ui/evolution-mail-message.xml.h:82
-#, fuzzy
-msgid "S_earch in Message..."
+#: ui/evolution-mail-message.xml.h:77
+msgid "S_earch Message..."
 msgstr "Søg i b_esked..."
 
-#: ui/evolution-mail-message.xml.h:83
+#: ui/evolution-mail-message.xml.h:78
 msgid "S_maller"
 msgstr "_Mindre"
 
-#: ui/evolution-mail-message.xml.h:84
+#: ui/evolution-mail-message.xml.h:79
 msgid "Save the message as a text file"
 msgstr "Gem beskeden som en tekstfil"
 
-#: ui/evolution-mail-message.xml.h:85
+#: ui/evolution-mail-message.xml.h:80
 msgid "Search for text in the body of the displayed message"
 msgstr "Søg efter tekst i kroppen af vist besked"
 
-#: ui/evolution-mail-message.xml.h:86
+#: ui/evolution-mail-message.xml.h:81
 msgid "Set up the page settings for your current printer"
 msgstr "Konfigurér sideindstillingerne for din aktuelle printer"
 
-#: ui/evolution-mail-message.xml.h:87
+#: ui/evolution-mail-message.xml.h:82
 msgid "Show Email _Source"
 msgstr "Vis e-post-kilde"
 
-#: ui/evolution-mail-message.xml.h:88
+#: ui/evolution-mail-message.xml.h:83
 msgid "Show Full _Headers"
 msgstr "Vis brevets _kildetekst"
 
-#: ui/evolution-mail-message.xml.h:89
-#, fuzzy
-msgid "Show a blinking cursor in the body of displayed messages"
-msgstr "Søg efter tekst i kroppen af vist besked"
-
-#: ui/evolution-mail-message.xml.h:90
+#: ui/evolution-mail-message.xml.h:84
 msgid "Show message in the normal style"
 msgstr "Vis besked i normal stíl"
 
-#: ui/evolution-mail-message.xml.h:91
+#: ui/evolution-mail-message.xml.h:85
 msgid "Show message with all email headers"
 msgstr "Vis besked med fulde e-post-headere"
 
-#: ui/evolution-mail-message.xml.h:92
+#: ui/evolution-mail-message.xml.h:86
 msgid "Show the raw email source of the message"
 msgstr "Vis e-post-beskeden i sin rå form"
 
-#: ui/evolution-mail-message.xml.h:93
+#: ui/evolution-mail-message.xml.h:87
 msgid "Text Si_ze"
 msgstr "Tekst-større_lse"
 
-#: ui/evolution-mail-message.xml.h:94
+#: ui/evolution-mail-message.xml.h:88
 msgid "Un-delete the selected messages"
 msgstr "Fortryd sletning af den valgte besked"
 
-#: ui/evolution-mail-message.xml.h:95
+#: ui/evolution-mail-message.xml.h:89
 msgid "VFolder on Mailing _List..."
 msgstr "Virtuel mappe for e-post-_liste..."
 
-#: ui/evolution-mail-message.xml.h:96
+#: ui/evolution-mail-message.xml.h:90
 msgid "VFolder on Se_nder..."
 msgstr "Virtuel mappe for afse_nder..."
 
-#: ui/evolution-mail-message.xml.h:97
+#: ui/evolution-mail-message.xml.h:91
 msgid "VFolder on _Recipients..."
 msgstr "Virtuel mappe for modtage_re..."
 
-#: ui/evolution-mail-message.xml.h:98
+#: ui/evolution-mail-message.xml.h:92
 msgid "VFolder on _Subject..."
 msgstr "Virtuel mappe for e_mne..."
 
-#: ui/evolution-mail-message.xml.h:100
+#: ui/evolution-mail-message.xml.h:94
 msgid "_Attached"
 msgstr "_Vedlagt"
 
-#: ui/evolution-mail-message.xml.h:102
+#: ui/evolution-mail-message.xml.h:95
 msgid "_Copy to Folder"
 msgstr "_Kopiér til mappe"
 
-#: ui/evolution-mail-message.xml.h:103
+#: ui/evolution-mail-message.xml.h:96
 msgid "_Create Filter From Message"
 msgstr "_Opret filter fra besked"
 
-#: ui/evolution-mail-message.xml.h:105
+#: ui/evolution-mail-message.xml.h:98
 msgid "_Forward Message"
 msgstr "_Videresend besked"
 
-#: ui/evolution-mail-message.xml.h:106
+#: ui/evolution-mail-message.xml.h:99
 msgid "_Go To"
 msgstr "_Gå til"
 
-#: ui/evolution-mail-message.xml.h:107
+#: ui/evolution-mail-message.xml.h:100
 msgid "_Inline"
 msgstr "_Inlejret"
 
-#: ui/evolution-mail-message.xml.h:108
+#: ui/evolution-mail-message.xml.h:101
 msgid "_Larger"
 msgstr "_Større"
 
-#: ui/evolution-mail-message.xml.h:109
+#: ui/evolution-mail-message.xml.h:102
 msgid "_Message Display"
 msgstr "_Beskedsvisning"
 
-#: ui/evolution-mail-message.xml.h:110
+#: ui/evolution-mail-message.xml.h:103
 msgid "_Move to Folder"
 msgstr "_Flyt til mappe"
 
-#: ui/evolution-mail-message.xml.h:111
+#: ui/evolution-mail-message.xml.h:104
 msgid "_Next Message"
 msgstr "_Næste meddelelse"
 
-#: ui/evolution-mail-message.xml.h:112
+#: ui/evolution-mail-message.xml.h:105
 msgid "_Normal Display"
 msgstr "_Normal visning"
 
-#: ui/evolution-mail-message.xml.h:113
+#: ui/evolution-mail-message.xml.h:106
 msgid "_Open Message"
 msgstr "_Åbn besked"
 
-#: ui/evolution-mail-message.xml.h:115
+#: ui/evolution-mail-message.xml.h:107
 msgid "_Previous Message"
 msgstr "_Foregående meddelelse"
 
-#: ui/evolution-mail-message.xml.h:117
+#: ui/evolution-mail-message.xml.h:109
 msgid "_Quoted"
 msgstr "_Citeret"
 
-#: ui/evolution-mail-message.xml.h:118
-msgid "_Reply to Sender"
-msgstr "Sva_r til sender"
-
-#: ui/evolution-mail-message.xml.h:119
+#: ui/evolution-mail-message.xml.h:111
 msgid "_Resend..."
 msgstr "Send igen..."
 
-#: ui/evolution-mail-message.xml.h:121 ui/evolution.xml.h:63
+#: ui/evolution-mail-message.xml.h:113 ui/evolution.xml.h:63
 msgid "_Tools"
 msgstr "_Værktøjer"
 
-#: ui/evolution-mail-message.xml.h:122
+#: ui/evolution-mail-message.xml.h:114
 msgid "_Undelete"
 msgstr "Fortryd sletning"
 
+#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:6
+msgid "Close this window"
+msgstr "Luk dette vindue"
+
+#: ui/evolution-mail-messagedisplay.xml.h:5
+#: ui/evolution-message-composer.xml.h:39
+#: ui/evolution-signature-editor.xml.h:10 ui/evolution-subscribe.xml.h:9
+#: ui/evolution.xml.h:43
+msgid "_Close"
+msgstr "L_uk"
+
+#: ui/evolution-mail-messagedisplay.xml.h:8
+#: ui/evolution-message-composer.xml.h:49 ui/evolution.xml.h:64
+msgid "_View"
+msgstr "_Vis"
+
 #: ui/evolution-message-composer.xml.h:1
 msgid "Attach"
 msgstr "Vedlæg"
@@ -26981,7 +27202,7 @@ msgstr "Vedlæg"
 msgid "Attach a file"
 msgstr "Vedlæg en fil"
 
-#: ui/evolution-message-composer.xml.h:4 ui/evolution-signature-editor.xml.h:3
+#: ui/evolution-message-composer.xml.h:4 ui/evolution-signature-editor.xml.h:2
 msgid "Close the current file"
 msgstr "Luk aktiv fil"
 
@@ -26997,7 +27218,7 @@ msgstr "Kryptér denne besked med PGP"
 msgid "Encrypt this message with your S/MIME Encryption Cetificate"
 msgstr "Kryptér denne besked med dit S/MIME krypteringscertifikat"
 
-#: ui/evolution-message-composer.xml.h:8 ui/evolution-signature-editor.xml.h:4
+#: ui/evolution-message-composer.xml.h:8 ui/evolution-signature-editor.xml.h:3
 msgid "For_mat"
 msgstr "For_matér"
 
@@ -27029,11 +27250,6 @@ msgstr "Kryptér med S/MIME"
 msgid "S/MIME Sign"
 msgstr "Signér med S/MIME"
 
-#: ui/evolution-message-composer.xml.h:16
-#: ui/evolution-signature-editor.xml.h:6
-msgid "Save"
-msgstr "Gem"
-
 #: ui/evolution-message-composer.xml.h:17
 msgid "Save As"
 msgstr "Gem som"
@@ -27047,7 +27263,7 @@ msgid "Save in folder..."
 msgstr "Gem i mappe..."
 
 #: ui/evolution-message-composer.xml.h:21
-#: ui/evolution-signature-editor.xml.h:9
+#: ui/evolution-signature-editor.xml.h:7
 msgid "Save the current file"
 msgstr "Gem aktiv fil"
 
@@ -27064,7 +27280,7 @@ msgid "Send"
 msgstr "Send"
 
 #: ui/evolution-message-composer.xml.h:25
-#: ui/evolution-signature-editor.xml.h:11
+#: ui/evolution-signature-editor.xml.h:9
 msgid "Send the mail in HTML format"
 msgstr "Send beskeden i HTML-format"
 
@@ -27129,7 +27345,7 @@ msgid "_From Field"
 msgstr "_Fra-felt"
 
 #: ui/evolution-message-composer.xml.h:44
-#: ui/evolution-signature-editor.xml.h:14
+#: ui/evolution-signature-editor.xml.h:13
 msgid "_Insert"
 msgstr "_Indsæt"
 
@@ -27145,11 +27361,11 @@ msgstr "Svar-til felt"
 msgid "_Security"
 msgstr "_Sikkerhed"
 
-#: ui/evolution-signature-editor.xml.h:5
+#: ui/evolution-signature-editor.xml.h:4
 msgid "H_TML"
 msgstr "H_TML"
 
-#: ui/evolution-signature-editor.xml.h:10
+#: ui/evolution-signature-editor.xml.h:8
 msgid "Save the current file and close the window"
 msgstr "Gem den aktuelle fil og luk vinduet"
 
@@ -27225,20 +27441,15 @@ msgstr "Slet valgte opgaver"
 msgid "Mar_k as Complete"
 msgstr "Mar_kér som færdig"
 
-#: ui/evolution-tasks.xml.h:9
-#, fuzzy
-msgid "Mark selected tasks as complete"
-msgstr "_Markér valgte opgaver som komplette"
-
-#: ui/evolution-tasks.xml.h:11
+#: ui/evolution-tasks.xml.h:10
 msgid "Paste task from the clipboard"
 msgstr "Indsæt opgave fra klippeborder"
 
-#: ui/evolution-tasks.xml.h:12
+#: ui/evolution-tasks.xml.h:11
 msgid "Previews the list of tasks to be printed"
 msgstr "Forhåndsgransker listen af opgaver som skal skrives ud"
 
-#: ui/evolution-tasks.xml.h:14
+#: ui/evolution-tasks.xml.h:13
 msgid "Print the list of tasks"
 msgstr "Udskriv listen med opgaver"
 
@@ -27487,33 +27698,27 @@ msgid "_Work Week View"
 msgstr "_Arbejdsugesvisning"
 
 #: views/mail/galview.xml.h:1
-#, fuzzy
-msgid "As _Sent Folder"
+msgid "As Sent Folder"
 msgstr "Som ud-mappe"
 
 #: views/mail/galview.xml.h:2
-#, fuzzy
-msgid "By S_tatus"
-msgstr "Efter status"
+msgid "By Follow Up Flag"
+msgstr "Efter opfølgningsflag"
 
 #: views/mail/galview.xml.h:3
-#, fuzzy
-msgid "By Se_nder"
+msgid "By Sender"
 msgstr "Efter afsender"
 
 #: views/mail/galview.xml.h:4
-#, fuzzy
-msgid "By Su_bject"
-msgstr "Efter emne"
+msgid "By Status"
+msgstr "Efter status"
 
 #: views/mail/galview.xml.h:5
-#, fuzzy
-msgid "By _Follow Up Flag"
-msgstr "Efter opfølgningsflag"
+msgid "By Subject"
+msgstr "Efter emne"
 
 #: views/mail/galview.xml.h:6
-#, fuzzy
-msgid "_Messages"
+msgid "Messages"
 msgstr "Beskeder"
 
 #: views/tasks/galview.xml.h:1
@@ -27572,20 +27777,20 @@ msgstr "Definér visninger..."
 
 #. Translators: These are the first characters of each day of the
 #. week, 'M' for 'Monday', 'T' for Tuesday etc.
-#: widgets/misc/e-calendar-item.c:456
+#: widgets/misc/e-calendar-item.c:427
 msgid "MTWTFSS"
 msgstr "MTOTFLS"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: widgets/misc/e-calendar-item.c:1174
+#: widgets/misc/e-calendar-item.c:1127
 msgid "%B %Y"
 msgstr "%B %Y"
 
-#: widgets/misc/e-cell-date-edit.c:241 widgets/misc/e-dateedit.c:431
+#: widgets/misc/e-cell-date-edit.c:241 widgets/misc/e-dateedit.c:428
 msgid "Now"
 msgstr "nu"
 
-#: widgets/misc/e-cell-date-edit.c:249 widgets/misc/e-dateedit.c:437
+#: widgets/misc/e-cell-date-edit.c:249 widgets/misc/e-dateedit.c:434
 msgid "Today"
 msgstr "I dag"
 
@@ -27702,6 +27907,22 @@ msgstr "_Redigér gemte søgninger..."
 msgid "_Advanced..."
 msgstr "_Avanceret..."
 
+#: widgets/misc/e-messagebox.c:154
+msgid "Information"
+msgstr "Information"
+
+#: widgets/misc/e-messagebox.c:168
+msgid "Error"
+msgstr "Fejl"
+
+#: widgets/misc/e-messagebox.c:175
+msgid "Question"
+msgstr "Spørgsmål"
+
+#: widgets/misc/e-messagebox.c:182
+msgid "Message"
+msgstr "Besked"
+
 #: widgets/misc/e-search-bar.c:531
 msgid "_Search"
 msgstr "_Søg"
@@ -27747,537 +27968,6 @@ msgstr "Evolution kalender lokalfil-backend"
 msgid "Evolution Addressbook local file backend"
 msgstr "Evolution adressebog lokalfil-backend"
 
-#~ msgid "That person is already attending the meeting!"
-#~ msgstr "Denne person er allerede sat op til dette møde!"
-
-#~ msgid "URL:"
-#~ msgstr "URL:"
-
-#~ msgid "_Save as..."
-#~ msgstr "_Gem som..."
-
-#~ msgid "End Date"
-#~ msgstr "Slutdato"
-
-#~ msgid "New _Appointment"
-#~ msgstr "Ny _aftale"
-
-#~ msgid "Print..."
-#~ msgstr "Udskriv..."
-
-#~ msgid "Chair Persons"
-#~ msgstr "Formænd"
-
-#~ msgid "Required Participants"
-#~ msgstr "Obligatoriske deltagere"
-
-#~ msgid "Optional Participants"
-#~ msgstr "Valgfrie deltagere"
-
-#~ msgid "Resources"
-#~ msgstr "Ressourcer"
-
-#~ msgid "Individual"
-#~ msgstr "Individuel"
-
-#~ msgid "Group"
-#~ msgstr "Gruppe"
-
-#~ msgid "Resource"
-#~ msgstr "Ressourse"
-
-#~ msgid "Room"
-#~ msgstr "Rum"
-
-#~ msgid "Chair"
-#~ msgstr "Formand"
-
-#~ msgid "Required Participant"
-#~ msgstr "Obligatorisk deltager"
-
-#~ msgid "Optional Participant"
-#~ msgstr "Valgfri deltager"
-
-#~ msgid "Non-Participant"
-#~ msgstr "Ikke-deltager"
-
-#~ msgid "Needs Action"
-#~ msgstr "Behøver handling"
-
-#~ msgid "Delegated"
-#~ msgstr "Delegeret"
-
-#~ msgid "In Process"
-#~ msgstr "I gang"
-
-#~ msgid "Properties for \"%s\""
-#~ msgstr "Egenskaber for \"%s\""
-
-#~ msgid "Properties"
-#~ msgstr "Egenskaber"
-
-#~ msgid "Could not create temporary directory: %s"
-#~ msgstr "Kunne ikke oprette midlertidigt katalog: %s"
-
-#~ msgid "%d new"
-#~ msgstr "%d nye"
-
-#~ msgid ", "
-#~ msgstr ", "
-
-#~ msgid "%d hidden"
-#~ msgstr "%d skjulte"
-
-#~ msgid "%d visible"
-#~ msgstr "%d synlige"
-
-#~ msgid "%d selected"
-#~ msgstr "%d valgte"
-
-#~ msgid "%d unsent"
-#~ msgstr "%d usendte"
-
-#~ msgid "%d sent"
-#~ msgstr "%d sendte"
-
-#~ msgid "%d total"
-#~ msgstr "%d totalt"
-
-#~ msgid "Create _Virtual Folder From Search..."
-#~ msgstr "Opret _virtuel mappe fra søgning..."
-
-#~ msgid "VFolder on _Subject"
-#~ msgstr "Virtuel mappe for e_mnet"
-
-#~ msgid "VFolder on Se_nder"
-#~ msgstr "Virtuel mappe for afse_nder"
-
-#~ msgid "VFolder on _Recipients"
-#~ msgstr "Virtuel mappe for modtage_re"
-
-#~ msgid "VFolder on Mailing _List"
-#~ msgstr "Virtuel mappe på e-post-_liste"
-
-#~ msgid "Filter on Sub_ject"
-#~ msgstr "Filtrér på em_ne"
-
-#~ msgid "Filter on Sen_der"
-#~ msgstr "Filtrér på afsen_der"
-
-#~ msgid "Filter on Re_cipients"
-#~ msgstr "Filtrér på modta_gere"
-
-#~ msgid "Filter on _Mailing List"
-#~ msgstr "Filtrér på e-_postliste"
-
-#~ msgid "_Edit as New Message..."
-#~ msgstr "R_edigér som ny besked..."
-
-#~ msgid "_Print"
-#~ msgstr "S_kriv ud"
-
-#~ msgid "_Forward"
-#~ msgstr "_Videresend"
-
-#~ msgid "Follo_w Up..."
-#~ msgstr "Føl_g op..."
-
-#~ msgid "Fla_g Completed"
-#~ msgstr "Marker færdi_ge med flag"
-
-#~ msgid "Cl_ear Flag"
-#~ msgstr "Neutralis_er flag"
-
-#~ msgid "Mark as _Unread"
-#~ msgstr "Marker som _ulæst"
-
-#~ msgid "Mark as _Important"
-#~ msgstr "Markér som v_igtig"
-
-#~ msgid "_Mark as Unimportant"
-#~ msgstr "Markér som uvi_gtig"
-
-#~ msgid "U_ndelete"
-#~ msgstr "_Fortryd sletning"
-
-#~ msgid "Mo_ve to Folder..."
-#~ msgstr "Fl_yt til mappe..."
-
-#~ msgid "Add Sender to Address_book"
-#~ msgstr "Tilføj afsenderen til adresse_bogen"
-
-#~ msgid "Appl_y Filters"
-#~ msgstr "Anvend filtre"
-
-#~ msgid "Crea_te Rule From Message"
-#~ msgstr "Ska_b regel fra meddelelse"
-
-#~ msgid "VFolder on M_ailing List"
-#~ msgstr "Virtuele mappe på postliste"
-
-#~ msgid "Filter on _Mailing List (%s)"
-#~ msgstr "Filtre på postliste (%s)"
-
-#~ msgid "VFolder on M_ailing List (%s)"
-#~ msgstr "Virtuel mappe på postliste (%s)"
-
-#~ msgid "Don't show this message again."
-#~ msgstr "Vis ikke denne besked igen."
-
-#~ msgid ""
-#~ "You have not configured the mail client.\n"
-#~ "You need to do this before you can send,\n"
-#~ "receive or compose mail.\n"
-#~ "Would you like to configure it now?"
-#~ msgstr ""
-#~ "Du har ikke konfigureret e-post-klienten.\n"
-#~ "Du skal gøre dette før du kan sende,\n"
-#~ "modtage eller skrive beskeder.\n"
-#~ "Vil du konfigurere den nu?"
-
-#~ msgid ""
-#~ "You need to configure an identity\n"
-#~ "before you can compose mail."
-#~ msgstr ""
-#~ "Du skal konfigurere en identitet\n"
-#~ "før du kan skrive e-post."
-
-#~ msgid ""
-#~ "You need to configure a mail transport\n"
-#~ "before you can compose mail."
-#~ msgstr ""
-#~ "Du skal konfigurere en e-post-transport\n"
-#~ "før du kan skrive e-post."
-
-#~ msgid ""
-#~ "You are sending an HTML-formatted message. Please make sure that\n"
-#~ "the following recipients are willing and able to receive HTML mail:\n"
-#~ msgstr ""
-#~ "Du sender et HTML-formaterat brev. Sørg for at følgende\n"
-#~ "modtagere ønsker, og kan modtage, HTML-formateret e-post:\n"
-
-#~ msgid "Send anyway?"
-#~ msgstr "Send alligevel?"
-
-#~ msgid ""
-#~ "This message has no subject.\n"
-#~ "Really send?"
-#~ msgstr ""
-#~ "Denne besked har ikke et emne.\n"
-#~ "Send alligevel?"
-
-#~ msgid ""
-#~ "Since the contact list you are sending to is configured to hide the "
-#~ "list's addresses, this message will contain only Bcc recipients."
-#~ msgstr ""
-#~ "Siden kontaktlisten du sender til er konfigureret til at skjule listens "
-#~ "adresser vil denne besked kun indeholde Bcc-modtagere."
-
-#~ msgid "This message contains only Bcc recipients."
-#~ msgstr "Denne besked indeholder kun Bcc-modtagere."
-
-#~ msgid ""
-#~ "It is possible that the mail server may reveal the recipients by adding "
-#~ "an Apparently-To header.\n"
-#~ "Send anyway?"
-#~ msgstr ""
-#~ "Det er muligt at e-post-serveren kan vise modtagerne ved at tilføje en "
-#~ "\"Apparently-To\" header.\n"
-#~ "Send alligevel?"
-
-#~ msgid "You must specify recipients in order to send this message."
-#~ msgstr "Du skal specificere modtagere for at kunne sende denne besked."
-
-#~ msgid ""
-#~ "Unable to open the drafts folder for this account.\n"
-#~ "Would you like to use the default drafts folder?"
-#~ msgstr ""
-#~ "Kunne ikke åbne skitse-mappen for denne konto.\n"
-#~ "Vil du bruge standard skitse-mappe?"
-
-#~ msgid "an unknown sender"
-#~ msgstr "en ukendt afsender"
-
-#~ msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
-#~ msgstr "%a, %Y-%m-%d kl. %H:%M skrev %%s:"
-
-#~ msgid "Move message(s) to"
-#~ msgstr "Flyt beskeder til"
-
-#~ msgid "Copy message(s) to"
-#~ msgstr "Kopiér beskeder til"
-
-#~ msgid "Are you sure you want to edit all %d messages?"
-#~ msgstr "Er du sikker på at du vil redigere alle %d beskeder?"
-
-#~ msgid ""
-#~ "You may only edit messages saved\n"
-#~ "in the Drafts folder."
-#~ msgstr ""
-#~ "Du kan kun redigere beskeder gemt\n"
-#~ "i Skitser-kataloget."
-
-#~ msgid ""
-#~ "You may only resend messages\n"
-#~ "in the Sent folder."
-#~ msgstr ""
-#~ "Du kan kun sende beskeder igen\n"
-#~ "som er gemt i sendt-kataloget."
-
-#~ msgid "Are you sure you want to resend all %d messages?"
-#~ msgstr "Er du sikker på at du vil sende alle %d beskederne igen?"
-
-#~ msgid "No Message Selected"
-#~ msgstr "Ingen besked valgt"
-
-#~ msgid ""
-#~ "Cannot save to `%s'\n"
-#~ " %s"
-#~ msgstr ""
-#~ "Kan ikke gemme til \"%s\":\n"
-#~ " %s"
-
-#~ msgid ""
-#~ "`%s' already exists.\n"
-#~ "Overwrite it?"
-#~ msgstr ""
-#~ "\"%s\" findes allerede.\n"
-#~ "Vil du overskrive den?"
-
-#~ msgid "Save Message As..."
-#~ msgstr "Gem besked som..."
-
-#~ msgid "Save Messages As..."
-#~ msgstr "Gem beskeder som..."
-
-#~ msgid ""
-#~ "This operation will permanently erase all messages marked as\n"
-#~ "deleted. If you continue, you will not be able to recover these "
-#~ "messages.\n"
-#~ "\n"
-#~ "Really erase these messages?"
-#~ msgstr ""
-#~ "Denne handling vil permanent fjerne de meddelelser der er\n"
-#~ "markeret som slettede. Hvis du fortsætter kan du ikke længere "
-#~ "tilvejebringe\n"
-#~ "disse meddelelser.\n"
-#~ "\n"
-#~ "Vil du virkelig fjerne disse meddelelser?"
-
-#~ msgid ""
-#~ "Error loading filter information:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Fejl under indlæsning af filter-information:\n"
-#~ "%s"
-
-#~ msgid "Filters"
-#~ msgstr "Filtre"
-
-#~ msgid "Page %d of %d"
-#~ msgstr "Side %d af %d"
-
-#~ msgid "Print Message"
-#~ msgstr "Udskriv besked"
-
-#~ msgid "Printing of message failed"
-#~ msgstr "Fejl under udskrift af besked"
-
-#~ msgid "Are you sure you want to open all %d messages in separate windows?"
-#~ msgstr "Er du sikker på at du vil åbne alle %d beskeder i separate vinduer?"
-
-#~ msgid "Could not create a S/MIME signature context."
-#~ msgstr "Kunne ikke oprette S/MIME-signaturkontekst."
-
-#~ msgid "Could not create a S/MIME certsonly context."
-#~ msgstr "Kunne ikke oprette S/MIME \"certsonly\" kontekst."
-
-#~ msgid "Could not create a S/MIME encryption context."
-#~ msgstr "Kunne ikke oprette S/MIME-krypteringskontekst."
-
-#~ msgid "Could not create a S/MIME envelope context."
-#~ msgstr "Kunne ikke oprette S/MIME-\"envelope\"-kontekst."
-
-#~ msgid "Could not create a S/MIME decode context."
-#~ msgstr "Kunne ikke oprette S/MIME-afkodningskontekst."
-
-#~ msgid ""
-#~ "File `%s' already exists.\n"
-#~ "Overwrite it?"
-#~ msgstr ""
-#~ "Filen \"%s\" findes allerede.\n"
-#~ "Skal den overskrives?"
-
-#~ msgid "Save Attachment"
-#~ msgstr "Gem bilag"
-
-#~ msgid "Could not create temporary file '%s': %s"
-#~ msgstr "Kunne ikke oprette temporær fil \"%s\": %s"
-
-#~ msgid "Save Attachment..."
-#~ msgstr "Gem bilag..."
-
-#~ msgid "View Inline"
-#~ msgstr "Vis indlejret"
-
-#~ msgid "Open in %s..."
-#~ msgstr "Åbn i %s..."
-
-#~ msgid "View Inline (via %s)"
-#~ msgstr "Vis indlejret (via %s)"
-
-#~ msgid "Hide"
-#~ msgstr "Skjul"
-
-#~ msgid "External Viewer"
-#~ msgstr "Ekstern visning"
-
-#~ msgid "Downloading images"
-#~ msgstr "Henter billeder"
-
-#~ msgid "Loading message content"
-#~ msgstr "Indlæser beskedsindhold"
-
-#~ msgid "Overdue:"
-#~ msgstr "Overskredet:"
-
-#~ msgid "by %B %d, %Y, %l:%M %P"
-#~ msgstr "den %d. %B %Y %H:%M"
-
-#~ msgid "Open Link in Browser"
-#~ msgstr "Åbn henvisning i netlæser"
-
-#~ msgid "Copy Link Location"
-#~ msgstr "Kopiér henvisning"
-
-#~ msgid "Save Link as (FIXME)"
-#~ msgstr "Gem henvisning som"
-
-#~ msgid "Save Image as..."
-#~ msgstr "Gem billede som..."
-
-#~ msgid "%s attachment"
-#~ msgstr "%s-bilag"
-
-#~ msgid "Could not parse MIME message. Displaying as source."
-#~ msgstr "Kunne ikke læse MIME-besked. Viser ren beskedstekst."
-
-#~ msgid "Bad Address"
-#~ msgstr "Ugyldig e-post-adresse:"
-
-#~ msgid "Reply-To"
-#~ msgstr "Svar-til"
-
-#~ msgid "Cc"
-#~ msgstr "Cc"
-
-#~ msgid "Bcc"
-#~ msgstr "Bcc:"
-
-#~ msgid ""
-#~ "This message is digitally signed. Click the lock icon for more "
-#~ "information."
-#~ msgstr ""
-#~ "Denne besked er digitalt signeret. For flere informationer, klik på "
-#~ "låsikonen."
-
-#~ msgid "Could not create a PGP verfication context"
-#~ msgstr "Kunne ikke oprette en PGP-verifieringssammenhæng"
-
-#~ msgid "This message is digitally signed and has been found to be authentic."
-#~ msgstr "Denne besked er digitalt signeret og er fundet autentisk."
-
-#~ msgid ""
-#~ "This message is digitally signed but can not be proven to be authentic."
-#~ msgstr "Denne besked er digitalt signeret, men kan ikke findes autentisk."
-
-#~ msgid "Pointer to FTP site (%s)"
-#~ msgstr "Peger til FTP-server (%s)"
-
-#~ msgid "Pointer to local file (%s) valid at site \"%s\""
-#~ msgstr "Peger til lokal fil (%s) gyldig på netsted \"%s\""
-
-#~ msgid "Pointer to local file (%s)"
-#~ msgstr "Peger til lokal fil (%s)"
-
-#~ msgid "Pointer to remote data (%s)"
-#~ msgstr "Peger til eksterne data (%s)"
-
-#~ msgid "Pointer to unknown external data (\"%s\" type)"
-#~ msgstr "Peger til ukendt ekstern data (\"%s\"-type)"
-
-#~ msgid "Malformed external-body part."
-#~ msgstr "Fejludformet del for ekstern-krop."
-
-#~ msgid "However, the message was successfully sent."
-#~ msgstr "Fuldførte alligevel sending af beskeden."
-
-#~ msgid "(Untitled Message)"
-#~ msgstr "(Besked uden titel)"
-
-#~ msgid "Untitled Message"
-#~ msgstr "Besked uden titel"
-
-#~ msgid "Empty Message"
-#~ msgstr "Tom besked"
-
-#~ msgid "Find in Message"
-#~ msgstr "Find i besked"
-
-#~ msgid "Case Sensitive"
-#~ msgstr "Skeln mellem store og små bogstaver"
-
-#~ msgid "Search Forward"
-#~ msgstr "Søg fremad"
-
-#~ msgid "Find:"
-#~ msgstr "Find:"
-
-#~ msgid "Matches:"
-#~ msgstr "Træffere:"
-
-#~ msgid "Forwarded Message"
-#~ msgstr "Videresendt besked"
-
-#~ msgid "(No subject)"
-#~ msgstr "(Uden emne)"
-
-#~ msgid "%s - Message"
-#~ msgstr "%s - Besked"
-
-#~ msgid "Scanning folders under %s on \"%s\""
-#~ msgstr "Søger i mapper under %s på \"%s\""
-
-#~ msgid "Scanning root-level folders on \"%s\""
-#~ msgstr "Søger i mapper på rod-niveau på \"%s\""
-
-#~ msgid "Subscribing to folder \"%s\""
-#~ msgstr "Abonnerer på mappe \"%s\""
-
-#~ msgid "Unsubscribing to folder \"%s\""
-#~ msgstr "Fjerner abonnement på mappe \"%s\""
-
-#~ msgid "No server has been selected"
-#~ msgstr "Ingen server er valgt"
-
-#~ msgid "Please select a server."
-#~ msgstr "Venligst vælg en server."
-
-#~ msgid "Scanning folders ..."
-#~ msgstr "Gennemsøger mapper ..."
-
-#~ msgid "Save As..."
-#~ msgstr "Gem som..."
-
-#~ msgid "Information"
-#~ msgstr "Information"
-
-#~ msgid "Question"
-#~ msgstr "Spørgsmål"
-
-#~ msgid "Message"
-#~ msgstr "Besked"
-
 #~ msgid ""
 #~ "ping_timeout_callback: could not determine if the CORBA object is nil or "
 #~ "not"
@@ -28666,6 +28356,12 @@ msgstr "Evolution adressebog lokalfil-backend"
 #~ msgid "Cannot initialize the Evolution mail component."
 #~ msgstr "Kan ikke initialisere Evolutions e-postkomponent."
 
+#~ msgid "Cannot initialize Evolution's mail config component."
+#~ msgstr "Kan ikke initiere Evolutions konfigurationskomponent for e-post."
+
+#~ msgid "Cannot initialize Evolution's folder info component."
+#~ msgstr "Kan ikke initiere Evolutions mappeinfo-komponent."
+
 #~ msgid "Factory to import mbox into Evolution"
 #~ msgstr "Fabrik for at importere mbox til Evolution"
 
diff --git a/po/de.po b/po/de.po
index 3782663948..3bfa3ae60a 100644
--- a/po/de.po
+++ b/po/de.po
@@ -14,193 +14,56 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 1.3.5\n"
-"POT-Creation-Date: 2003-10-15 23:45+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2003-07-22 20:27+0200\n"
 "PO-Revision-Date: 2003-07-22 20:27+0200\n"
 "Last-Translator: Christian Neumair <chris@gnome-de.org>\n"
 "Language-Team: German <gnome-de@gnome.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Report-Msgid-Bugs-To: \n"
 
-#: addressbook/backend/ebook/e-card.c:1306
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in.h:1
+msgid "Evolution LDIF importer"
+msgstr "Evolution-LDIF-Importeur"
+
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in.h:2
+msgid "LDAP Data Interchange Format (.ldif)"
+msgstr "LDAP-Data-Interchange-Format (.ldif)"
+
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:1
+msgid "Evolution VCard Importer"
+msgstr "Evolution-VCard-Importeur"
+
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:2
+msgid "Evolution VCard importer"
+msgstr "Evolution-VCard-Importeur"
+
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:3
+msgid "VCard (.vcf, .gcrd)"
+msgstr "VCard (.vcf, .gcrd)"
+
 #: addressbook/backend/ebook/e-card-simple.c:60
+#: addressbook/backend/ebook/e-card.c:1306
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:15
 msgid "File As"
 msgstr "Einsortieren unter"
 
-#: addressbook/backend/ebook/e-card.c:1313
-#: addressbook/gui/contact-editor/fullname.glade.h:4
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:17
-msgid "Full Name"
-msgstr "Voller Name"
-
-#: addressbook/backend/ebook/e-card.c:1320
 #: addressbook/backend/ebook/e-card-simple.c:61
-#: addressbook/gui/component/select-names/e-select-names.etspec.h:1
+#: addressbook/backend/ebook/e-card.c:1320
 #: addressbook/gui/component/select-names/e-select-names-section.etspec.h:1
+#: addressbook/gui/component/select-names/e-select-names.etspec.h:1
 #: addressbook/gui/contact-editor/e-contact-editor-fullname.c:89
 #: my-evolution/e-summary-table.c:59
 msgid "Name"
 msgstr "Name"
 
-#: addressbook/backend/ebook/e-card.c:1326
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:96
-msgid "Address"
-msgstr "Adresse"
-
-#: addressbook/backend/ebook/e-card.c:1333
-msgid "Address Label"
-msgstr "Adress-Beschriftung"
-
-#: addressbook/backend/ebook/e-card.c:1340
-msgid "Phone"
-msgstr "Telefon"
-
-#: addressbook/backend/ebook/e-card.c:1347
 #: addressbook/backend/ebook/e-card-simple.c:62
+#: addressbook/backend/ebook/e-card.c:1347
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
 msgid "Email"
 msgstr "E-Mail"
 
-#: addressbook/backend/ebook/e-card.c:1354
-msgid "Birth date"
-msgstr "Geburtsdatum"
-
-#: addressbook/backend/ebook/e-card.c:1360
-#: calendar/gui/e-calendar-table.etspec.h:18
-msgid "URL"
-msgstr "URL"
-
-#: addressbook/backend/ebook/e-card.c:1367
-#: addressbook/backend/ebook/e-card-simple.c:69
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
-msgid "Organization"
-msgstr "Organisation"
-
-#: addressbook/backend/ebook/e-card.c:1374
-msgid "Organizational Unit"
-msgstr "Organisationseinheit"
-
-#: addressbook/backend/ebook/e-card.c:1381
-#: addressbook/backend/ebook/e-card-simple.c:90
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
-msgid "Office"
-msgstr "Büro"
-
-#: addressbook/backend/ebook/e-card.c:1388
-#: addressbook/backend/ebook/e-card-simple.c:91
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:39
-msgid "Title"
-msgstr "Titel"
-
-#: addressbook/backend/ebook/e-card.c:1395
-#: calendar/gui/e-meeting-time-sel.etspec.h:9
-msgid "Role"
-msgstr "Position"
-
-#: addressbook/backend/ebook/e-card.c:1402
-#: addressbook/backend/ebook/e-card-simple.c:93
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
-msgid "Manager"
-msgstr "Vorgesetzter"
-
-#: addressbook/backend/ebook/e-card.c:1409
-#: addressbook/backend/ebook/e-card-simple.c:64
-#: addressbook/backend/ebook/e-card-simple.c:94
-#: addressbook/gui/contact-editor/e-contact-editor.c:1737
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:2
-msgid "Assistant"
-msgstr "Assistent"
-
-#: addressbook/backend/ebook/e-card.c:1416
-#: addressbook/backend/ebook/e-card-simple.c:95
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-msgid "Nickname"
-msgstr "Spitzname"
-
-#: addressbook/backend/ebook/e-card.c:1423
-#: addressbook/backend/ebook/e-card-simple.c:96
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:36
-msgid "Spouse"
-msgstr "Ehepartner"
-
-#: addressbook/backend/ebook/e-card.c:1430
-#: addressbook/backend/ebook/e-card-simple.c:101
-msgid "Anniversary"
-msgstr "Jahrestag"
-
-#: addressbook/backend/ebook/e-card.c:1436
-msgid "Mailer"
-msgstr "Mailer"
-
-#: addressbook/backend/ebook/e-card.c:1443
-#: addressbook/backend/ebook/e-card-simple.c:98
-msgid "Calendar URI"
-msgstr "Kalender-URI"
-
-#: addressbook/backend/ebook/e-card.c:1450
-msgid "Free/Busy URL"
-msgstr "Verfügbarkeits-URL"
-
-#: addressbook/backend/ebook/e-card.c:1457
-msgid "ICS Calendar"
-msgstr "ICS-Kalender"
-
-#: addressbook/backend/ebook/e-card.c:1464
-#: addressbook/backend/ebook/e-card-simple.c:97
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
-msgid "Note"
-msgstr "Notiz"
-
-# CHECK
-#: addressbook/backend/ebook/e-card.c:1471
-msgid "Related Contacts"
-msgstr "Verwandte Kontakte"
-
-#: addressbook/backend/ebook/e-card.c:1478
-#: addressbook/backend/ebook/e-card-simple.c:105
-#: calendar/gui/e-calendar-table.etspec.h:4
-msgid "Categories"
-msgstr "Kategorien"
-
-#: addressbook/backend/ebook/e-card.c:1485
-msgid "Category List"
-msgstr "Liste der Kategorien"
-
-#: addressbook/backend/ebook/e-card.c:1492
-msgid "Wants HTML"
-msgstr "Will HTML"
-
-#: addressbook/backend/ebook/e-card.c:1499
-msgid "Wants HTML set"
-msgstr "Will HTML gesetzt"
-
-#: addressbook/backend/ebook/e-card.c:1506 ui/evolution-calendar.xml.h:16
-msgid "List"
-msgstr "Liste"
-
-# CHECK
-#: addressbook/backend/ebook/e-card.c:1513
-msgid "List Show Addresses"
-msgstr "Liste der Anzeigeadressen"
-
-#: addressbook/backend/ebook/e-card.c:1520
-msgid "Arbitrary"
-msgstr "Beliebig"
-
-#: addressbook/backend/ebook/e-card.c:1527
-msgid "ID"
-msgstr "Kennung"
-
-#: addressbook/backend/ebook/e-card.c:1534
-msgid "Last Use"
-msgstr "Zuletzt verwendet"
-
-#: addressbook/backend/ebook/e-card.c:1545
-msgid "Use Score"
-msgstr "Bewertung verwenden"
-
 #: addressbook/backend/ebook/e-card-simple.c:63
 #: addressbook/gui/contact-editor/e-contact-editor.c:1752
 msgid "Primary"
@@ -210,6 +73,14 @@ msgstr "Primär"
 msgid "Prim"
 msgstr "Prim"
 
+#: addressbook/backend/ebook/e-card-simple.c:64
+#: addressbook/backend/ebook/e-card-simple.c:94
+#: addressbook/backend/ebook/e-card.c:1409
+#: addressbook/gui/contact-editor/e-contact-editor.c:1737
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:2
+msgid "Assistant"
+msgstr "Assistent"
+
 #: addressbook/backend/ebook/e-card-simple.c:65
 #: addressbook/backend/ebook/e-card-simple.c:70
 #: addressbook/gui/contact-editor/e-contact-editor.c:1738
@@ -244,6 +115,12 @@ msgid "Home"
 msgstr "Zu Hause"
 
 #: addressbook/backend/ebook/e-card-simple.c:69
+#: addressbook/backend/ebook/e-card.c:1367
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
+msgid "Organization"
+msgstr "Organisation"
+
+#: addressbook/backend/ebook/e-card-simple.c:69
 msgid "Org"
 msgstr "Org"
 
@@ -362,9 +239,21 @@ msgid "Dep"
 msgstr "Abt"
 
 #: addressbook/backend/ebook/e-card-simple.c:90
+#: addressbook/backend/ebook/e-card.c:1381
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
+msgid "Office"
+msgstr "Büro"
+
+#: addressbook/backend/ebook/e-card-simple.c:90
 msgid "Off"
 msgstr "Büro"
 
+#: addressbook/backend/ebook/e-card-simple.c:91
+#: addressbook/backend/ebook/e-card.c:1388
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:39
+msgid "Title"
+msgstr "Titel"
+
 #: addressbook/backend/ebook/e-card-simple.c:92
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:34
 msgid "Profession"
@@ -375,6 +264,12 @@ msgid "Prof"
 msgstr "Beruf"
 
 #: addressbook/backend/ebook/e-card-simple.c:93
+#: addressbook/backend/ebook/e-card.c:1402
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
+msgid "Manager"
+msgstr "Vorgesetzter"
+
+#: addressbook/backend/ebook/e-card-simple.c:93
 msgid "Man"
 msgstr "Chef"
 
@@ -383,9 +278,32 @@ msgid "Ass"
 msgstr "Ass"
 
 #: addressbook/backend/ebook/e-card-simple.c:95
+#: addressbook/backend/ebook/e-card.c:1416
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
+msgid "Nickname"
+msgstr "Spitzname"
+
+#: addressbook/backend/ebook/e-card-simple.c:95
 msgid "Nick"
 msgstr "Spitzname"
 
+#: addressbook/backend/ebook/e-card-simple.c:96
+#: addressbook/backend/ebook/e-card.c:1423
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:36
+msgid "Spouse"
+msgstr "Ehepartner"
+
+#: addressbook/backend/ebook/e-card-simple.c:97
+#: addressbook/backend/ebook/e-card.c:1464
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
+msgid "Note"
+msgstr "Notiz"
+
+#: addressbook/backend/ebook/e-card-simple.c:98
+#: addressbook/backend/ebook/e-card.c:1443
+msgid "Calendar URI"
+msgstr "Kalender-URI"
+
 #: addressbook/backend/ebook/e-card-simple.c:98
 msgid "CALUri"
 msgstr "KalURI"
@@ -409,6 +327,11 @@ msgid "icsCalendar"
 msgstr "icsCalendar"
 
 #: addressbook/backend/ebook/e-card-simple.c:101
+#: addressbook/backend/ebook/e-card.c:1430
+msgid "Anniversary"
+msgstr "Jahrestag"
+
+#: addressbook/backend/ebook/e-card-simple.c:101
 msgid "Anniv"
 msgstr "JTag"
 
@@ -416,6 +339,12 @@ msgstr "JTag"
 msgid "Birth Date"
 msgstr "Geburtsdatum"
 
+#: addressbook/backend/ebook/e-card-simple.c:105
+#: addressbook/backend/ebook/e-card.c:1478
+#: calendar/gui/e-calendar-table.etspec.h:4
+msgid "Categories"
+msgstr "Kategorien"
+
 #: addressbook/backend/ebook/e-card-simple.c:106
 msgid "Family Name"
 msgstr "Familienname"
@@ -430,29 +359,107 @@ msgid "%x"
 msgstr "%x"
 
 #: addressbook/backend/ebook/e-card-simple.c:912
-#: addressbook/backend/ebook/e-destination.c:709
+#: addressbook/backend/ebook/e-destination.c:706
 msgid "Unnamed List"
 msgstr "Namenlose Liste"
 
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in.h:1
-msgid "Evolution LDIF importer"
-msgstr "Evolution-LDIF-Importeur"
+#: addressbook/backend/ebook/e-card.c:1313
+#: addressbook/gui/contact-editor/fullname.glade.h:4
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:17
+msgid "Full Name"
+msgstr "Voller Name"
 
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in.h:2
-msgid "LDAP Data Interchange Format (.ldif)"
-msgstr "LDAP-Data-Interchange-Format (.ldif)"
+#: addressbook/backend/ebook/e-card.c:1326
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:96
+msgid "Address"
+msgstr "Adresse"
 
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:1
-msgid "Evolution VCard Importer"
-msgstr "Evolution-VCard-Importeur"
+#: addressbook/backend/ebook/e-card.c:1333
+msgid "Address Label"
+msgstr "Adress-Beschriftung"
 
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:2
-msgid "Evolution VCard importer"
-msgstr "Evolution-VCard-Importeur"
+#: addressbook/backend/ebook/e-card.c:1340
+msgid "Phone"
+msgstr "Telefon"
 
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:3
-msgid "VCard (.vcf, .gcrd)"
-msgstr "VCard (.vcf, .gcrd)"
+#: addressbook/backend/ebook/e-card.c:1354
+msgid "Birth date"
+msgstr "Geburtsdatum"
+
+#: addressbook/backend/ebook/e-card.c:1360
+#: calendar/gui/e-calendar-table.etspec.h:19
+msgid "URL"
+msgstr "URL"
+
+#: addressbook/backend/ebook/e-card.c:1374
+msgid "Organizational Unit"
+msgstr "Organisationseinheit"
+
+#: addressbook/backend/ebook/e-card.c:1395
+#: calendar/gui/dialogs/meeting-page.etspec.h:9
+#: calendar/gui/e-meeting-time-sel.etspec.h:9
+msgid "Role"
+msgstr "Position"
+
+#: addressbook/backend/ebook/e-card.c:1436 mail/mail-format.c:962
+msgid "Mailer"
+msgstr "Mailer"
+
+#: addressbook/backend/ebook/e-card.c:1450
+msgid "Free/Busy URL"
+msgstr "Verfügbarkeits-URL"
+
+#: addressbook/backend/ebook/e-card.c:1457
+msgid "ICS Calendar"
+msgstr "ICS-Kalender"
+
+# CHECK
+#: addressbook/backend/ebook/e-card.c:1471
+msgid "Related Contacts"
+msgstr "Verwandte Kontakte"
+
+#: addressbook/backend/ebook/e-card.c:1485
+msgid "Category List"
+msgstr "Liste der Kategorien"
+
+#: addressbook/backend/ebook/e-card.c:1492
+msgid "Wants HTML"
+msgstr "Will HTML"
+
+#: addressbook/backend/ebook/e-card.c:1499
+msgid "Wants HTML set"
+msgstr "Will HTML gesetzt"
+
+#: addressbook/backend/ebook/e-card.c:1506
+msgid "List"
+msgstr "Liste"
+
+# CHECK
+#: addressbook/backend/ebook/e-card.c:1513
+msgid "List Show Addresses"
+msgstr "Liste der Anzeigeadressen"
+
+#: addressbook/backend/ebook/e-card.c:1520
+msgid "Arbitrary"
+msgstr "Beliebig"
+
+#: addressbook/backend/ebook/e-card.c:1527
+msgid "ID"
+msgstr "Kennung"
+
+#: addressbook/backend/ebook/e-card.c:1534
+msgid "Last Use"
+msgstr "Zuletzt verwendet"
+
+#: addressbook/backend/ebook/e-card.c:1545
+msgid "Use Score"
+msgstr "Bewertung verwenden"
+
+#: addressbook/backend/ebook/test-client-list.c:15
+#: addressbook/backend/ebook/test-client.c:33
+#: calendar/gui/alarm-notify/notify-main.c:171
+msgid "Could not initialize Bonobo"
+msgstr "Bonobo konnte nicht initialisiert werden"
 
 #: addressbook/backend/pas/pas-backend-file.c:464
 #: addressbook/backend/pas/pas-backend-ldap.c:3050
@@ -509,14 +516,14 @@ msgid "EBook not loaded\n"
 msgstr "EBook nicht geladen\n"
 
 #: addressbook/conduit/address-conduit.c:1376
-#: calendar/conduits/calendar/calendar-conduit.c:1351
-#: calendar/conduits/todo/todo-conduit.c:893
+#: calendar/conduits/calendar/calendar-conduit.c:1342
+#: calendar/conduits/todo/todo-conduit.c:884
 msgid "Could not start wombat server"
 msgstr "Der Wombat-Server konnte nicht gestartet werden"
 
 #: addressbook/conduit/address-conduit.c:1377
-#: calendar/conduits/calendar/calendar-conduit.c:1352
-#: calendar/conduits/todo/todo-conduit.c:894
+#: calendar/conduits/calendar/calendar-conduit.c:1343
+#: calendar/conduits/todo/todo-conduit.c:885
 msgid "Could not start wombat"
 msgstr "Wombat konnte nicht gestartet werden"
 
@@ -525,6 +532,137 @@ msgstr "Wombat konnte nicht gestartet werden"
 msgid "Could not read pilot's Address application block"
 msgstr "Adress-Anwendungsblock des konnte Pilot nicht gelesen werden"
 
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
+msgid "Configure access to LDAP directory servers here"
+msgstr "Hier können Sie den Zugriff auf LDAP-Verzeichnis-Server konfigurieren"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
+msgid "Directory Servers"
+msgstr "Verzeichnis-Server"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
+msgid "Evolution Addressbook"
+msgstr "Evolution-Adressbuch"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
+msgid "Evolution Addressbook LDAP Configuration Control"
+msgstr "Bedienelement zur LDAP-Konfiguration des Evolution-Adressbuchs"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
+msgid "Evolution Addressbook address pop-up"
+msgstr "Evolution-Adressbuch-Adress-Popup-Fenster"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
+msgid "Evolution Addressbook address viewer"
+msgstr "Evolution-Adressbuch-Adressbetrachter"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
+msgid "Evolution Addressbook card viewer"
+msgstr "Evolution-Adressbuch-Minikarten-Betrachter"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
+msgid "Evolution Addressbook component"
+msgstr "Evolution-Adressbuch-Komponente"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
+msgid "Evolution Addressbook folder viewer"
+msgstr "Evolution-Adressbuch-Ordnerbetrachter"
+
+#: addressbook/gui/component/addressbook-component.c:76
+#: addressbook/gui/component/addressbook-component.c:625
+#: importers/netscape-importer.c:1874 mail/importers/netscape-importer.c:1844
+#: shell/e-local-storage.c:178 shell/e-shortcuts.c:1087
+msgid "Contacts"
+msgstr "Kontakte"
+
+#: addressbook/gui/component/addressbook-component.c:76
+msgid "Folder containing contact information"
+msgstr "Ordner mit Kontaktinformationen"
+
+#: addressbook/gui/component/addressbook-component.c:78
+msgid "LDAP Server"
+msgstr "LDAP-Server:"
+
+#: addressbook/gui/component/addressbook-component.c:78
+msgid "LDAP server containing contact information"
+msgstr "LDAP-Server mit Kontaktinformationen"
+
+#: addressbook/gui/component/addressbook-component.c:80
+msgid "Public Contacts"
+msgstr "Öffentliche Kontakte"
+
+#: addressbook/gui/component/addressbook-component.c:80
+msgid "Public folder containing contact information"
+msgstr "Öffentlicher Ordner mit Kontaktinformationen"
+
+#: addressbook/gui/component/addressbook-component.c:579
+msgid "New Contact"
+msgstr "Neuer Kontakt"
+
+#: addressbook/gui/component/addressbook-component.c:579
+msgid "_Contact"
+msgstr "_Kontakt"
+
+#: addressbook/gui/component/addressbook-component.c:580
+msgid "Create a new contact"
+msgstr "Einen neuen Kontakt anlegen"
+
+#: addressbook/gui/component/addressbook-component.c:583
+msgid "New Contact List"
+msgstr "Neu Kontaktliste"
+
+#: addressbook/gui/component/addressbook-component.c:583
+msgid "Contact _List"
+msgstr "Kontakt_liste"
+
+#: addressbook/gui/component/addressbook-component.c:584
+msgid "Create a new contact list"
+msgstr "Eine neue Kontaktliste anlegen"
+
+#: addressbook/gui/component/addressbook-config.c:206
+msgid "Failed to connect to LDAP server"
+msgstr "Verbindung zum LDAP-Server ist fehlgeschlagen"
+
+#: addressbook/gui/component/addressbook-config.c:231
+msgid "Failed to authenticate with LDAP server"
+msgstr "Legitimation beim IMAP-Server ist fehlgeschlagen"
+
+#: addressbook/gui/component/addressbook-config.c:259
+msgid "Could not perform query on Root DSE"
+msgstr "Abfrage auf Root DSE konnte nicht ausgeführt werden"
+
+#: addressbook/gui/component/addressbook-config.c:682
+msgid "The server responded with no supported search bases"
+msgstr "Der Server antwortete mit nicht unterstützen Suchbasen"
+
+#: addressbook/gui/component/addressbook-config.c:1193
+msgid "This server does not support LDAPv3 schema information"
+msgstr "Dieser Server unterstützt keine LDAPv3 Schema-Information"
+
+#: addressbook/gui/component/addressbook-config.c:1215
+msgid "Error retrieving schema information"
+msgstr "Fehler beim Abrufen der Schema-Informationen"
+
+#: addressbook/gui/component/addressbook-config.c:1223
+msgid "Server did not respond with valid schema information"
+msgstr "Server antwortetet nicht mit einer gültigen Schema-Information"
+
+#: addressbook/gui/component/addressbook-config.c:1637
+msgid "Account Name"
+msgstr "Kontoname"
+
+#: addressbook/gui/component/addressbook-config.c:1639
+msgid "Server Name"
+msgstr "Servername"
+
+#: addressbook/gui/component/addressbook-config.c:1676
+msgid "LDAP was not enabled in this build of Evolution"
+msgstr "LDAP wurde in diesem Build von Evolution nicht aktiviert"
+
+#: addressbook/gui/component/addressbook-storage.c:178
+msgid "Other Contacts"
+msgstr "Andere Kontakte"
+
 #: addressbook/gui/component/addressbook.c:502
 msgid ""
 "We were unable to open this addressbook.  Please check that the\n"
@@ -657,101 +795,6 @@ msgstr "Beliebige Kategorie"
 msgid "The URI that the Folder Browser will display"
 msgstr "Die URI, die der Suchdienst anzeigen wird"
 
-#: addressbook/gui/component/addressbook-component.c:76
-#: addressbook/gui/component/addressbook-component.c:628
-#: importers/netscape-importer.c:1874 mail/importers/netscape-importer.c:1844
-#: shell/e-local-storage.c:178 shell/e-shortcuts.c:1087
-msgid "Contacts"
-msgstr "Kontakte"
-
-#: addressbook/gui/component/addressbook-component.c:76
-msgid "Folder containing contact information"
-msgstr "Ordner mit Kontaktinformationen"
-
-#: addressbook/gui/component/addressbook-component.c:78
-msgid "LDAP Server"
-msgstr "LDAP-Server:"
-
-#: addressbook/gui/component/addressbook-component.c:78
-msgid "LDAP server containing contact information"
-msgstr "LDAP-Server mit Kontaktinformationen"
-
-#: addressbook/gui/component/addressbook-component.c:80
-msgid "Public Contacts"
-msgstr "Öffentliche Kontakte"
-
-#: addressbook/gui/component/addressbook-component.c:80
-msgid "Public folder containing contact information"
-msgstr "Öffentlicher Ordner mit Kontaktinformationen"
-
-#: addressbook/gui/component/addressbook-component.c:582
-msgid "New Contact"
-msgstr "Neuer Kontakt"
-
-#: addressbook/gui/component/addressbook-component.c:582
-msgid "_Contact"
-msgstr "_Kontakt"
-
-#: addressbook/gui/component/addressbook-component.c:583
-msgid "Create a new contact"
-msgstr "Einen neuen Kontakt anlegen"
-
-#: addressbook/gui/component/addressbook-component.c:586
-msgid "New Contact List"
-msgstr "Neu Kontaktliste"
-
-#: addressbook/gui/component/addressbook-component.c:586
-msgid "Contact _List"
-msgstr "Kontakt_liste"
-
-#: addressbook/gui/component/addressbook-component.c:587
-msgid "Create a new contact list"
-msgstr "Eine neue Kontaktliste anlegen"
-
-#: addressbook/gui/component/addressbook-config.c:206
-msgid "Failed to connect to LDAP server"
-msgstr "Verbindung zum LDAP-Server ist fehlgeschlagen"
-
-#: addressbook/gui/component/addressbook-config.c:231
-msgid "Failed to authenticate with LDAP server"
-msgstr "Legitimation beim IMAP-Server ist fehlgeschlagen"
-
-#: addressbook/gui/component/addressbook-config.c:259
-msgid "Could not perform query on Root DSE"
-msgstr "Abfrage auf Root DSE konnte nicht ausgeführt werden"
-
-#: addressbook/gui/component/addressbook-config.c:682
-msgid "The server responded with no supported search bases"
-msgstr "Der Server antwortete mit nicht unterstützen Suchbasen"
-
-#: addressbook/gui/component/addressbook-config.c:1193
-msgid "This server does not support LDAPv3 schema information"
-msgstr "Dieser Server unterstützt keine LDAPv3 Schema-Information"
-
-#: addressbook/gui/component/addressbook-config.c:1215
-msgid "Error retrieving schema information"
-msgstr "Fehler beim Abrufen der Schema-Informationen"
-
-#: addressbook/gui/component/addressbook-config.c:1223
-msgid "Server did not respond with valid schema information"
-msgstr "Server antwortetet nicht mit einer gültigen Schema-Information"
-
-#: addressbook/gui/component/addressbook-config.c:1637
-msgid "Account Name"
-msgstr "Kontoname"
-
-#: addressbook/gui/component/addressbook-config.c:1639
-msgid "Server Name"
-msgstr "Servername"
-
-#: addressbook/gui/component/addressbook-config.c:1676
-msgid "LDAP was not enabled in this build of Evolution"
-msgstr "LDAP wurde in diesem Build von Evolution nicht aktiviert"
-
-#: addressbook/gui/component/addressbook-storage.c:178
-msgid "Other Contacts"
-msgstr "Andere Kontakte"
-
 #.
 #. * This is the code for the UI thingie that lets you manipulate the e-mail
 #. * addresses (and *only* the e-mail addresses) associated with an existing
@@ -785,12 +828,12 @@ msgid "Querying Addressbook..."
 msgstr "Anfrage beim Adressbuch..."
 
 #: addressbook/gui/component/e-address-popup.c:1001
-#: addressbook/gui/component/e-address-widget.c:401
+#: addressbook/gui/component/e-address-widget.c:392
 msgid "Edit Contact Info"
 msgstr "Kontaktinfo bearbeiten"
 
 #: addressbook/gui/component/e-address-popup.c:1031
-#: addressbook/gui/component/e-address-widget.c:437
+#: addressbook/gui/component/e-address-widget.c:428
 #: addressbook/gui/component/select-names/e-select-names-popup.c:324
 msgid "Add to Contacts"
 msgstr "Zu Kontakten hinzufügen"
@@ -799,50 +842,14 @@ msgstr "Zu Kontakten hinzufügen"
 msgid "Merge E-Mail Address"
 msgstr "E-Mail-Adresse einfließen lassen"
 
-#: addressbook/gui/component/e-address-widget.c:378
+#: addressbook/gui/component/e-address-widget.c:369
 msgid "Disable Queries"
 msgstr "Abfragen deaktivieren"
 
-#: addressbook/gui/component/e-address-widget.c:378
+#: addressbook/gui/component/e-address-widget.c:369
 msgid "Enable Queries (Dangerous!)"
 msgstr "Abfragen aktivieren (gefährlich!)"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
-msgid "Configure access to LDAP directory servers here"
-msgstr "Hier können Sie den Zugriff auf LDAP-Verzeichnis-Server konfigurieren"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
-msgid "Directory Servers"
-msgstr "Verzeichnis-Server"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
-msgid "Evolution Addressbook"
-msgstr "Evolution-Adressbuch"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
-msgid "Evolution Addressbook LDAP Configuration Control"
-msgstr "Bedienelement zur LDAP-Konfiguration des Evolution-Adressbuchs"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-msgid "Evolution Addressbook address pop-up"
-msgstr "Evolution-Adressbuch-Adress-Popup-Fenster"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
-msgid "Evolution Addressbook address viewer"
-msgstr "Evolution-Adressbuch-Adressbetrachter"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
-msgid "Evolution Addressbook card viewer"
-msgstr "Evolution-Adressbuch-Minikarten-Betrachter"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
-msgid "Evolution Addressbook component"
-msgstr "Evolution-Adressbuch-Komponente"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
-msgid "Evolution Addressbook folder viewer"
-msgstr "Evolution-Adressbuch-Ordnerbetrachter"
-
 #: addressbook/gui/component/ldap-config.glade.h:1
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:1
 #: mail/mail-config.glade.h:1
@@ -996,9 +1003,10 @@ msgstr "One"
 msgid "S_earch scope: "
 msgstr "Suchb_ereich: "
 
+#. No time range is set, so don't start a query
 #: addressbook/gui/component/ldap-config.glade.h:34
-#: calendar/gui/e-cal-view.c:541 calendar/gui/e-day-view.c:3261
-#: calendar/gui/e-week-view.c:1181 calendar/gui/gnome-cal.c:625
+#: calendar/gui/calendar-model.c:1983 calendar/gui/e-day-view.c:1672
+#: calendar/gui/e-week-view.c:1306
 msgid "Searching"
 msgstr "Suchen"
 
@@ -1244,10 +1252,10 @@ msgstr "_Downloadbegrenzung:"
 
 #: addressbook/gui/component/ldap-config.glade.h:85 filter/filter.glade.h:14
 #: mail/mail-config.glade.h:143 ui/evolution-addressbook.xml.h:33
-#: ui/evolution-calendar.xml.h:35 ui/evolution-composer-entries.xml.h:8
-#: ui/evolution-mail-list.xml.h:24 ui/evolution-mail-messagedisplay.xml.h:6
+#: ui/evolution-calendar.xml.h:33 ui/evolution-composer-entries.xml.h:8
+#: ui/evolution-mail-list.xml.h:25 ui/evolution-mail-messagedisplay.xml.h:6
 #: ui/evolution-message-composer.xml.h:41
-#: ui/evolution-signature-editor.xml.h:12 ui/evolution-subscribe.xml.h:10
+#: ui/evolution-signature-editor.xml.h:11 ui/evolution-subscribe.xml.h:10
 #: ui/evolution-tasks.xml.h:19
 msgid "_Edit"
 msgstr "_Bearbeiten"
@@ -1288,24 +1296,20 @@ msgstr "general-tab"
 msgid "searching-tab"
 msgstr "searching-tab"
 
-#: addressbook/gui/component/select-names/e-select-names.c:509
-msgid "Select Contacts from Addressbook"
-msgstr "Kontakte aus Adressbuch wählen"
+#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:1
+msgid "Evolution Addressbook name selection interface"
+msgstr "Oberfläche zur Auswahl eines Namens für Evolution-Adressbücher"
 
-#: addressbook/gui/component/select-names/e-select-names.c:650
-msgid "Find contact in"
-msgstr "Kontakt finden in"
+#: addressbook/gui/component/select-names/e-select-names-popup.c:204
+msgid "Remove All"
+msgstr "Alle Entfernen"
 
-#: addressbook/gui/component/select-names/e-select-names.c:694
 #: addressbook/gui/component/select-names/e-select-names-popup.c:211
-#: composer/e-msg-composer-attachment-bar.c:444
+#: addressbook/gui/component/select-names/e-select-names.c:694
+#: composer/e-msg-composer-attachment-bar.c:448
 msgid "Remove"
 msgstr "Entfernen"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:204
-msgid "Remove All"
-msgstr "Alle Entfernen"
-
 #: addressbook/gui/component/select-names/e-select-names-popup.c:218
 msgid "View Contact List"
 msgstr "Kontaktliste anzeigen"
@@ -1328,9 +1332,13 @@ msgstr "Namenloser Kontakt"
 msgid "Source"
 msgstr "Quelle"
 
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:1
-msgid "Evolution Addressbook name selection interface"
-msgstr "Oberfläche zur Auswahl eines Namens für Evolution-Adressbücher"
+#: addressbook/gui/component/select-names/e-select-names.c:509
+msgid "Select Contacts from Addressbook"
+msgstr "Kontakte aus Adressbuch wählen"
+
+#: addressbook/gui/component/select-names/e-select-names.c:650
+msgid "Find contact in"
+msgstr "Kontakt finden in"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:2
 msgid "Find"
@@ -1403,7 +1411,7 @@ msgid "D_epartment:"
 msgstr "_Abteilung:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:11
-#: calendar/gui/dialogs/task-editor.c:200
+#: calendar/gui/dialogs/task-editor.c:199
 msgid "Details"
 msgstr "Details"
 
@@ -1470,12 +1478,11 @@ msgid "_Categories..."
 msgstr "Ka_tegorien..."
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:28
-#: calendar/gui/dialogs/meeting-page.c:634
-#: calendar/gui/e-calendar-table.c:1008 calendar/gui/e-calendar-table.c:1026
-#: calendar/gui/e-cal-view.c:1144 calendar/gui/e-cal-view.c:1176
-#: ui/evolution-addressbook.xml.h:32 ui/evolution-calendar.xml.h:34
-#: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:14
-#: ui/evolution-mail-message.xml.h:104 ui/evolution-tasks.xml.h:18
+#: calendar/gui/dialogs/meeting-page.c:717
+#: calendar/gui/e-calendar-table.c:1000 calendar/gui/e-day-view.c:3718
+#: calendar/gui/e-week-view.c:3687 mail/folder-browser.c:1830
+#: ui/evolution-addressbook.xml.h:32 ui/evolution-calendar.xml.h:32
+#: ui/evolution-mail-message.xml.h:99 ui/evolution-tasks.xml.h:18
 #: ui/evolution.xml.h:45
 msgid "_Delete"
 msgstr "Löschen"
@@ -1517,15 +1524,15 @@ msgid "_Web page address:"
 msgstr "Adresse der _Website:"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:102
-#: addressbook/gui/contact-editor/e-contact-editor.c:184
 #: addressbook/gui/contact-editor/e-contact-editor-fullname.c:95
+#: addressbook/gui/contact-editor/e-contact-editor.c:184
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.c:163
 #: addressbook/gui/widgets/e-addressbook-model.c:318
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:408
-#: addressbook/gui/widgets/e-minicard.c:183
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:402
 #: addressbook/gui/widgets/e-minicard-label.c:164
-#: addressbook/gui/widgets/e-minicard-view.c:478
 #: addressbook/gui/widgets/e-minicard-view-widget.c:120
+#: addressbook/gui/widgets/e-minicard-view.c:478
+#: addressbook/gui/widgets/e-minicard.c:183
 msgid "Editable"
 msgstr "Editierbar"
 
@@ -2554,17 +2561,17 @@ msgstr "Simbabwe"
 #: addressbook/gui/contact-editor/e-contact-editor.c:156
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.c:142
 #: addressbook/gui/widgets/e-addressbook-model.c:304
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:394
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:388
 #: addressbook/gui/widgets/e-addressbook-view.c:180
-#: addressbook/gui/widgets/e-minicard-view.c:464
 #: addressbook/gui/widgets/e-minicard-view-widget.c:106
+#: addressbook/gui/widgets/e-minicard-view.c:464
 msgid "Book"
 msgstr "Buch"
 
 #: addressbook/gui/contact-editor/e-contact-editor.c:163
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.c:149
-#: addressbook/gui/widgets/e-minicard.c:190
 #: addressbook/gui/widgets/e-minicard-widget.c:93
+#: addressbook/gui/widgets/e-minicard.c:190
 msgid "Card"
 msgstr "Karte"
 
@@ -2787,7 +2794,7 @@ msgstr "Ist neue Liste"
 msgid "Contact List Editor"
 msgstr "Kontaktlisten-Editor"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:457
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:456
 msgid "Save List as VCard"
 msgstr "Liste als VCard speichern"
 
@@ -2834,7 +2841,7 @@ msgstr ""
 "trotzdem hinzufügen?"
 
 #. FIXME: get the toplevel window...
-#: addressbook/gui/search/e-addressbook-search-dialog.c:116
+#: addressbook/gui/search/e-addressbook-search-dialog.c:117
 #: widgets/misc/e-filter-bar.c:148
 msgid "Advanced Search"
 msgstr "Komplexe Suche"
@@ -2853,10 +2860,10 @@ msgid "%d cards"
 msgstr "%d Karten"
 
 #: addressbook/gui/widgets/e-addressbook-model.c:311
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:401
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:395
 #: addressbook/gui/widgets/e-addressbook-view.c:187
-#: addressbook/gui/widgets/e-minicard-view.c:471
 #: addressbook/gui/widgets/e-minicard-view-widget.c:113
+#: addressbook/gui/widgets/e-minicard-view.c:471
 msgid "Query"
 msgstr "Abfrage"
 
@@ -2864,22 +2871,22 @@ msgstr "Abfrage"
 msgid "Error getting book view"
 msgstr "Fehler beim Abrufen der Buchansicht"
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:415
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:409
 msgid "Model"
 msgstr "Modell"
 
-#: addressbook/gui/widgets/e-addressbook-table-adapter.c:148
-#: addressbook/gui/widgets/e-addressbook-util.c:106
+#: addressbook/gui/widgets/e-addressbook-table-adapter.c:145
+#: addressbook/gui/widgets/e-addressbook-util.c:105
 #: addressbook/gui/widgets/e-minicard.c:531
 msgid "Error modifying card"
 msgstr "Fehler beim Ändern einer Karte"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:37
+#: addressbook/gui/widgets/e-addressbook-util.c:36
 #: shell/evolution-shell-component.c:1183
 msgid "Success"
 msgstr "Erfolg"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:38
+#: addressbook/gui/widgets/e-addressbook-util.c:37
 #: camel/providers/imap/camel-imap-command.c:306
 #: camel/providers/imap/camel-imap-command.c:403
 #: camel/providers/pop3/camel-pop3-store.c:526
@@ -2888,90 +2895,90 @@ msgstr "Erfolg"
 msgid "Unknown error"
 msgstr "Unbekannter Fehler"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:39
+#: addressbook/gui/widgets/e-addressbook-util.c:38
 msgid "Repository offline"
 msgstr "Repository offline"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:40 shell/e-storage.c:584
+#: addressbook/gui/widgets/e-addressbook-util.c:39 shell/e-storage.c:584
 #: shell/evolution-shell-component.c:1213
 msgid "Permission denied"
 msgstr "Erlaubnis verweigert"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:41
+#: addressbook/gui/widgets/e-addressbook-util.c:40
 msgid "Card not found"
 msgstr "Karte nicht gefunden"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:42
+#: addressbook/gui/widgets/e-addressbook-util.c:41
 msgid "Card ID already exists"
 msgstr "Kartenkennung existiert bereits"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:43
+#: addressbook/gui/widgets/e-addressbook-util.c:42
 msgid "Protocol not supported"
 msgstr "Protokoll nicht unterstützt"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:44
+#: addressbook/gui/widgets/e-addressbook-util.c:43
+#: calendar/gui/calendar-model.c:759 calendar/gui/calendar-model.c:1184
 #: calendar/gui/dialogs/task-details-page.glade.h:3
-#: calendar/gui/e-calendar-table.c:479 calendar/gui/e-cal-model-tasks.c:325
-#: calendar/gui/e-cal-model-tasks.c:604 calendar/gui/e-tasks.c:253
-#: calendar/gui/print.c:2314 camel/camel-service.c:733
-#: camel/camel-service.c:771 camel/camel-service.c:855
-#: camel/camel-service.c:895 camel/providers/pop3/camel-pop3-store.c:443
+#: calendar/gui/e-calendar-table.c:477 calendar/gui/e-tasks.c:253
+#: calendar/gui/print.c:2307 camel/camel-service.c:733
+#: camel/camel-service.c:770 camel/camel-service.c:854
+#: camel/camel-service.c:893 camel/providers/pop3/camel-pop3-store.c:443
 #: camel/providers/pop3/camel-pop3-store.c:520
 msgid "Cancelled"
 msgstr "Storniert"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:45
+#: addressbook/gui/widgets/e-addressbook-util.c:44
 msgid "Authentication Failed"
 msgstr "Legitimation fehlgeschlagen"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:46
+#: addressbook/gui/widgets/e-addressbook-util.c:45
 msgid "Authentication Required"
 msgstr "Legitimation erforderlich"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:47
+#: addressbook/gui/widgets/e-addressbook-util.c:46
 msgid "TLS not Available"
 msgstr "TLS nicht verfügbar"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:48
+#: addressbook/gui/widgets/e-addressbook-util.c:47
 msgid "Addressbook does not exist"
 msgstr "Adressbuch existiert nicht"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:49
+#: addressbook/gui/widgets/e-addressbook-util.c:48
 msgid "Other error"
 msgstr "Anderer Fehler"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:76
+#: addressbook/gui/widgets/e-addressbook-util.c:75
 msgid "Do you want to save changes?"
 msgstr "Wollen Sie die Änderungen speichern?"
 
 # CHECK
-#: addressbook/gui/widgets/e-addressbook-util.c:78
+#: addressbook/gui/widgets/e-addressbook-util.c:77
 msgid "_Discard"
 msgstr "_Verwerfen"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:97
+#: addressbook/gui/widgets/e-addressbook-util.c:96
 msgid "Error adding list"
 msgstr "Fehler beim Hinzufügen der Liste"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:97
-#: addressbook/gui/widgets/e-addressbook-util.c:273
+#: addressbook/gui/widgets/e-addressbook-util.c:96
+#: addressbook/gui/widgets/e-addressbook-util.c:272
 msgid "Error adding card"
 msgstr "Fehler beim Hinzufügen einer Karte"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:106
+#: addressbook/gui/widgets/e-addressbook-util.c:105
 msgid "Error modifying list"
 msgstr "Fehler beim Ändern einer Liste"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:116
+#: addressbook/gui/widgets/e-addressbook-util.c:115
 msgid "Error removing list"
 msgstr "Fehler beim Entfernen einer Liste"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:116
-#: addressbook/gui/widgets/e-addressbook-util.c:231
+#: addressbook/gui/widgets/e-addressbook-util.c:115
+#: addressbook/gui/widgets/e-addressbook-util.c:230
 msgid "Error removing card"
 msgstr "Fehler beim Entfernen einer Karte"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:198
+#: addressbook/gui/widgets/e-addressbook-util.c:197
 #, c-format
 msgid ""
 "Opening %d cards will open %d new windows as well.\n"
@@ -2981,33 +2988,34 @@ msgstr ""
 "%d zusätzliche Fenster auf ihrem Bildschirm angezeigt werden.\n"
 "Wollen Sie wirklich alle Karten anzeigen lassen?"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:329
+#: addressbook/gui/widgets/e-addressbook-util.c:328
 msgid "Move card to"
 msgstr "Karte verschieben nach"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:331
+#: addressbook/gui/widgets/e-addressbook-util.c:330
 msgid "Copy card to"
 msgstr "Karte kopieren nach"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:334
+#: addressbook/gui/widgets/e-addressbook-util.c:333
 msgid "Move cards to"
 msgstr "Karten verschieben nach"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:336
+#: addressbook/gui/widgets/e-addressbook-util.c:335
 msgid "Copy cards to"
 msgstr "Karten kopieren nach"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:518
+#: addressbook/gui/widgets/e-addressbook-util.c:517
 msgid "Multiple VCards"
 msgstr "Mehrere VCards"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:526
+#: addressbook/gui/widgets/e-addressbook-util.c:525
 #, c-format
 msgid "VCard for %s"
 msgstr "VCard für %s"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:194
-#: calendar/gui/e-calendar-table.etspec.h:17
+#: calendar/gui/dialogs/meeting-page.etspec.h:11
+#: calendar/gui/e-calendar-table.etspec.h:18
 #: calendar/gui/e-meeting-time-sel.etspec.h:11
 msgid "Type"
 msgstr "Typ"
@@ -3062,9 +3070,9 @@ msgstr "Kontakt weiterleiten"
 msgid "Send Message to Contact"
 msgstr "Nachricht an Kontakt schicken"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:902 calendar/gui/print.c:2446
+#: addressbook/gui/widgets/e-addressbook-view.c:902 calendar/gui/print.c:2439
 #: ui/evolution-addressbook.xml.h:16 ui/evolution-comp-editor.xml.h:8
-#: ui/evolution-contact-editor.xml.h:5 ui/evolution-mail-message.xml.h:72
+#: ui/evolution-contact-editor.xml.h:4 ui/evolution-mail-message.xml.h:68
 #: ui/my-evolution.xml.h:1
 msgid "Print"
 msgstr "Drucken"
@@ -3097,15 +3105,15 @@ msgstr "Kopieren"
 msgid "Paste"
 msgstr "Einfügen"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:915 filter/libfilter-i18n.h:10
+#: addressbook/gui/widgets/e-addressbook-view.c:915 filter/libfilter-i18n.h:11
 #: mail/mail-accounts.c:234 ui/evolution-addressbook.xml.h:8
-#: ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:3
-#: ui/evolution-contact-list-editor.xml.h:3 ui/evolution-mail-message.xml.h:24
+#: ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:2
+#: ui/evolution-contact-list-editor.xml.h:2 ui/evolution-mail-message.xml.h:21
 msgid "Delete"
 msgstr "Löschen"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:919
-#: calendar/gui/e-cal-view.c:1109
+#: calendar/gui/e-day-view.c:3678 calendar/gui/e-week-view.c:3652
 msgid "Current View"
 msgstr "Aktuelle Ansicht"
 
@@ -3197,29 +3205,6 @@ msgstr "Anderes Telefon"
 msgid "Primary Phone"
 msgstr "Primäres Telefon"
 
-#: addressbook/gui/widgets/e-minicard.c:146
-#: addressbook/gui/widgets/e-minicard-label.c:115
-msgid "Width"
-msgstr "Breite"
-
-#: addressbook/gui/widgets/e-minicard.c:153
-#: addressbook/gui/widgets/e-minicard-label.c:122
-msgid "Height"
-msgstr "Höhe"
-
-#: addressbook/gui/widgets/e-minicard.c:161
-#: addressbook/gui/widgets/e-minicard-label.c:129
-msgid "Has Focus"
-msgstr "Hat den Fokus"
-
-#: addressbook/gui/widgets/e-minicard.c:169
-msgid "Selected"
-msgstr "Gewählt"
-
-#: addressbook/gui/widgets/e-minicard.c:176
-msgid "Has Cursor"
-msgstr "Hat Cursor"
-
 #: addressbook/gui/widgets/e-minicard-control.c:204
 #, c-format
 msgid "and %d other cards."
@@ -3233,6 +3218,21 @@ msgstr "und eine andere Karte."
 msgid "Save in addressbook"
 msgstr "In Adressbuch speichern"
 
+#: addressbook/gui/widgets/e-minicard-label.c:115
+#: addressbook/gui/widgets/e-minicard.c:146
+msgid "Width"
+msgstr "Breite"
+
+#: addressbook/gui/widgets/e-minicard-label.c:122
+#: addressbook/gui/widgets/e-minicard.c:153
+msgid "Height"
+msgstr "Höhe"
+
+#: addressbook/gui/widgets/e-minicard-label.c:129
+#: addressbook/gui/widgets/e-minicard.c:161
+msgid "Has Focus"
+msgstr "Hat den Fokus"
+
 #: addressbook/gui/widgets/e-minicard-label.c:136
 msgid "Field"
 msgstr "Feld"
@@ -3249,6 +3249,10 @@ msgstr "Textmodell"
 msgid "Max field name length"
 msgstr "Maximale Länge des Feldnamens"
 
+#: addressbook/gui/widgets/e-minicard-view-widget.c:127
+msgid "Column Width"
+msgstr "Spaltenbreite"
+
 #: addressbook/gui/widgets/e-minicard-view.c:141
 msgid ""
 "\n"
@@ -3277,9 +3281,13 @@ msgstr ""
 msgid "Adapter"
 msgstr "Adapter"
 
-#: addressbook/gui/widgets/e-minicard-view-widget.c:127
-msgid "Column Width"
-msgstr "Spaltenbreite"
+#: addressbook/gui/widgets/e-minicard.c:169
+msgid "Selected"
+msgstr "Gewählt"
+
+#: addressbook/gui/widgets/e-minicard.c:176
+msgid "Has Cursor"
+msgstr "Hat Cursor"
 
 #: addressbook/gui/widgets/gal-view-factory-minicard.c:24
 msgid "Card View"
@@ -3289,20 +3297,20 @@ msgstr "Kartenansicht"
 msgid "GTK Tree View"
 msgstr "GTK-Baumansicht"
 
-#: addressbook/printing/e-contact-print.c:1158
+#: addressbook/printing/e-contact-print-envelope.c:217
+#: addressbook/printing/e-contact-print-envelope.c:238
+msgid "Print envelope"
+msgstr "Umschlag drucken"
+
+#: addressbook/printing/e-contact-print.c:1139
 msgid "Print cards"
 msgstr "Karten drucken"
 
-#: addressbook/printing/e-contact-print.c:1224
-#: addressbook/printing/e-contact-print.c:1250
+#: addressbook/printing/e-contact-print.c:1204
+#: addressbook/printing/e-contact-print.c:1226
 msgid "Print card"
 msgstr "Karte drucken"
 
-#: addressbook/printing/e-contact-print-envelope.c:217
-#: addressbook/printing/e-contact-print-envelope.c:238
-msgid "Print envelope"
-msgstr "Umschlag drucken"
-
 #: addressbook/printing/e-contact-print.glade.h:1
 msgid "10 pt. Tahoma"
 msgstr "10 Punkt Tahoma"
@@ -3472,63 +3480,6 @@ msgstr "Breite:"
 msgid "_Font..."
 msgstr "_Schrift..."
 
-#: addressbook/tools/evolution-addressbook-export.c:56
-msgid "Specify the output file instead of standard output"
-msgstr ""
-
-#: addressbook/tools/evolution-addressbook-export.c:57
-msgid "OUTPUTFILE"
-msgstr ""
-
-#: addressbook/tools/evolution-addressbook-export.c:58
-#, fuzzy
-msgid "List local addressbook folders"
-msgstr "mit allen lokalen Ordnern und aktiven Ordnern im Netz"
-
-#: addressbook/tools/evolution-addressbook-export.c:60
-msgid "Show cards as vcard or csv file"
-msgstr ""
-
-#: addressbook/tools/evolution-addressbook-export.c:60
-#, fuzzy
-msgid "[vcard|csv]"
-msgstr "Karten"
-
-#: addressbook/tools/evolution-addressbook-export.c:61
-msgid "Export in asynchronous mode "
-msgstr ""
-
-#: addressbook/tools/evolution-addressbook-export.c:63
-msgid ""
-"The number of cards in one output file in asychronous mode,default size 100."
-msgstr ""
-
-#: addressbook/tools/evolution-addressbook-export.c:63
-msgid "NUMBER"
-msgstr ""
-
-#: addressbook/tools/evolution-addressbook-export.c:91
-msgid ""
-"Command line arguments error, please use --help option to see the usage."
-msgstr ""
-
-#: addressbook/tools/evolution-addressbook-export.c:105
-msgid "Only support csv or vcard format."
-msgstr ""
-
-#: addressbook/tools/evolution-addressbook-export.c:114
-msgid "In async mode, output must be file."
-msgstr ""
-
-#: addressbook/tools/evolution-addressbook-export.c:122
-msgid "In normal mode, there should not need size option."
-msgstr ""
-
-#: addressbook/tools/evolution-addressbook-export.c:153
-#, fuzzy
-msgid "Impossible internal error."
-msgstr "Interner Fehler"
-
 #: calendar/cal-util/cal-component.c:1218
 msgid "Untitled appointment"
 msgstr "Unbenannter Termin"
@@ -3659,29 +3610,30 @@ msgstr "31."
 
 #: calendar/cal-util/cal-util.c:550 calendar/cal-util/cal-util.c:572
 #: calendar/gui/dialogs/task-details-page.glade.h:5
-#: calendar/gui/e-calendar-table.c:403 calendar/gui/e-tasks.c:271
-#: mail/message-list.c:912
+#: calendar/gui/e-calendar-table.c:401 calendar/gui/e-tasks.c:271
+#: mail/message-list.c:753
 msgid "High"
 msgstr "Hoch"
 
 #: calendar/cal-util/cal-util.c:552 calendar/cal-util/cal-util.c:574
+#: calendar/gui/calendar-model.c:1709
 #: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-calendar-table.c:404 calendar/gui/e-cal-model.c:826
-#: calendar/gui/e-tasks.c:273 mail/message-list.c:911
+#: calendar/gui/e-calendar-table.c:402 calendar/gui/e-tasks.c:273
+#: mail/message-list.c:752
 msgid "Normal"
 msgstr "Normal"
 
 #: calendar/cal-util/cal-util.c:554 calendar/cal-util/cal-util.c:576
 #: calendar/gui/dialogs/task-details-page.glade.h:7
-#: calendar/gui/e-calendar-table.c:405 calendar/gui/e-tasks.c:275
-#: mail/message-list.c:910
+#: calendar/gui/e-calendar-table.c:403 calendar/gui/e-tasks.c:275
+#: mail/message-list.c:751
 msgid "Low"
 msgstr "Niedrig"
 
 #. An empty string is the same as 'None'.
 #: calendar/cal-util/cal-util.c:570
 #: calendar/gui/dialogs/task-details-page.glade.h:11
-#: calendar/gui/e-calendar-table.c:406
+#: calendar/gui/e-calendar-table.c:404
 msgid "Undefined"
 msgstr "Undefiniert"
 
@@ -3689,13 +3641,13 @@ msgstr "Undefiniert"
 msgid "Split Multi-Day Events:"
 msgstr "Mehrtätige Ereignisse aufteilen:"
 
-#: calendar/conduits/calendar/calendar-conduit.c:1297
-#: calendar/conduits/todo/todo-conduit.c:838
+#: calendar/conduits/calendar/calendar-conduit.c:1289
+#: calendar/conduits/todo/todo-conduit.c:830
 msgid "Error while communicating with calendar server"
 msgstr "Fehler bei der Kommunikation mit dem Kalender-Server"
 
-#: calendar/conduits/calendar/calendar-conduit.c:1456
-#: calendar/conduits/calendar/calendar-conduit.c:1459
+#: calendar/conduits/calendar/calendar-conduit.c:1440
+#: calendar/conduits/calendar/calendar-conduit.c:1443
 msgid "Could not read pilot's Calendar application block"
 msgstr "Calendar-Anwendungsblock des Pilot konnte nicht gelesen werden"
 
@@ -3703,32 +3655,77 @@ msgstr "Calendar-Anwendungsblock des Pilot konnte nicht gelesen werden"
 msgid "Default Priority:"
 msgstr "Vorgabepriorität:"
 
-#: calendar/conduits/todo/todo-conduit.c:970
-#: calendar/conduits/todo/todo-conduit.c:973
+#: calendar/conduits/todo/todo-conduit.c:954
+#: calendar/conduits/todo/todo-conduit.c:957
 msgid "Could not read pilot's ToDo application block"
 msgstr "ToDo-Anwendungsblock des Pilot konnte nicht gelesen werden"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:213
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
+msgid "Calendar and Tasks"
+msgstr "Kalender und Aufgaben"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
+msgid "Configure your timezone, Calendar and Task List here "
+msgstr ""
+"Hier können Sie Ihre Zeitzone, den Kalender und die Aufgabenliste "
+"konfigurieren"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
+msgid "Evolution Calendar and Tasks"
+msgstr "Evolution Kalender und Aufgaben"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
+msgid "Evolution Calendar and Tasks component"
+msgstr "Evolution-Komponente für Kalender und Aufgaben"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
+msgid "Evolution Calendar configuration control"
+msgstr "Bedienelement zur Konfiguration des Evolution-Kalenders"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
+msgid "Evolution Calendar scheduling message viewer"
+msgstr "Evolution-Kalender-Terminplan-Nachrichtenbetrachter"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
+msgid "Evolution Calendar viewer"
+msgstr "Evolution-Kalenderbetrachter"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
+msgid "Evolution Calendar/Task editor"
+msgstr "Evolution-Kalender/Aufgaben-Editor"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
+msgid "Evolution Tasks viewer"
+msgstr "Evolution-Aufgabenbetrachter"
+
+#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
+msgid "Evolution Calendar alarm notification service"
+msgstr "Evolution-Kalender-Alarmbenachrichtigungsdienst"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:212
 msgid "Starting:"
 msgstr "Beginnt:"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:215
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:214
 msgid "Ending:"
 msgstr "Endent:"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:254
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:227
+#: calendar/gui/e-tasks.c:151
+msgid "invalid time"
+msgstr "ungültige Zeit"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:272
 msgid "Evolution Alarm"
 msgstr "Evolution-Alarm"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:347
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:365
 #, c-format
 msgid "Alarm on %s"
 msgstr "Alarm am %s"
 
 #: calendar/gui/alarm-notify/alarm-notify.glade.h:1
-#: ui/evolution-comp-editor.xml.h:1 ui/evolution-contact-editor.xml.h:1
-#: ui/evolution-contact-list-editor.xml.h:1
-#: ui/evolution-signature-editor.xml.h:1
+#: ui/evolution-comp-editor.xml.h:1
 msgid "C_lose"
 msgstr "S_chließen"
 
@@ -3744,25 +3741,16 @@ msgstr "Weiterschlaf-Zeit (Minuten)"
 msgid "_Edit appointment"
 msgstr "Termin _bearbeiten"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:874
+#: calendar/gui/alarm-notify/alarm-queue.c:770
 msgid "No description available."
 msgstr "Keine Beschreibung verfügbar."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:892
-#, c-format
-msgid ""
-"Alarm on %s\n"
-"%s\n"
-"Starting at %s\n"
-"Ending at %s"
-msgstr ""
-
-#: calendar/gui/alarm-notify/alarm-queue.c:979
-#: calendar/gui/alarm-notify/alarm-queue.c:1003
+#: calendar/gui/alarm-notify/alarm-queue.c:843
+#: calendar/gui/alarm-notify/alarm-queue.c:867 widgets/misc/e-messagebox.c:161
 msgid "Warning"
 msgstr "Warnung"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:983
+#: calendar/gui/alarm-notify/alarm-queue.c:847
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -3775,7 +3763,7 @@ msgstr ""
 "wird statt dessen eine normales Erinnerungsdialogfenster\n"
 "anzeigen."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1009
+#: calendar/gui/alarm-notify/alarm-queue.c:873
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -3792,27 +3780,36 @@ msgstr ""
 "\n"
 "Sind Sie sicher, dass Sie dieses Programm ausführen wollen?"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1023
+#: calendar/gui/alarm-notify/alarm-queue.c:887
 msgid "Do not ask me about this program again."
 msgstr "Mich über dieses Programm nicht mehr fragen."
 
-#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
-msgid "Evolution Calendar alarm notification service"
-msgstr "Evolution-Kalender-Alarmbenachrichtigungsdienst"
-
-#: calendar/gui/alarm-notify/notify-main.c:173
-msgid "Could not initialize Bonobo"
-msgstr "Bonobo konnte nicht initialisiert werden"
-
-#: calendar/gui/alarm-notify/notify-main.c:176
+#: calendar/gui/alarm-notify/notify-main.c:174
 msgid "Could not initialize gnome-vfs"
 msgstr "gnome-vfs konnte nicht initialisiert werden"
 
-#: calendar/gui/alarm-notify/notify-main.c:185
+#: calendar/gui/alarm-notify/notify-main.c:183
 msgid "Could not create the alarm notify service factory"
 msgstr "Fabrik für Alarm-Benachrichtigungsdienst konnte nicht angelegt werden"
 
-#: calendar/gui/calendar-commands.c:376
+#: calendar/gui/cal-search-bar.c:50
+msgid "Summary contains"
+msgstr "Zusammenfassung enthält"
+
+#: calendar/gui/cal-search-bar.c:51
+msgid "Description contains"
+msgstr "Beschreibung enthält"
+
+#: calendar/gui/cal-search-bar.c:52
+msgid "Comment contains"
+msgstr "Kommentar enthält"
+
+# CHECK
+#: calendar/gui/cal-search-bar.c:358 mail/mail-ops.c:1106
+msgid "Unmatched"
+msgstr "Nicht einsortiert"
+
+#: calendar/gui/calendar-commands.c:358
 msgid ""
 "This operation will permanently erase all events older than the selected "
 "amount of time. If you continue, you will not be able to recover these "
@@ -3823,53 +3820,52 @@ msgstr ""
 "nicht wiederherstellen."
 
 # CHECK
-#: calendar/gui/calendar-commands.c:382
+#: calendar/gui/calendar-commands.c:364
 msgid "Purge events older than"
 msgstr "Ereignisse säubern nach"
 
-#: calendar/gui/calendar-commands.c:387
+#: calendar/gui/calendar-commands.c:369
 #: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter.glade.h:17
 msgid "days"
 msgstr "Tage"
 
-#: calendar/gui/calendar-commands.c:485
+#: calendar/gui/calendar-commands.c:468
 msgid "%A %d %B %Y"
 msgstr "%A, %d. %B %Y"
 
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
-#: calendar/gui/calendar-commands.c:488 calendar/gui/e-day-view.c:1364
-#: calendar/gui/e-day-view-top-item.c:266
-#: calendar/gui/e-week-view-main-item.c:325
+#: calendar/gui/calendar-commands.c:471 calendar/gui/e-day-view-top-item.c:265
+#: calendar/gui/e-day-view.c:1409 calendar/gui/e-week-view-main-item.c:325
 msgid "%a %d %b"
 msgstr "%a, %d. %b"
 
-#: calendar/gui/calendar-commands.c:490 calendar/gui/calendar-commands.c:495
-#: calendar/gui/calendar-commands.c:497
+#: calendar/gui/calendar-commands.c:473 calendar/gui/calendar-commands.c:478
+#: calendar/gui/calendar-commands.c:480
 msgid "%a %d %b %Y"
 msgstr "%a, %d. %Y"
 
-#: calendar/gui/calendar-commands.c:514 calendar/gui/calendar-commands.c:520
-#: calendar/gui/calendar-commands.c:526 calendar/gui/calendar-commands.c:528
+#: calendar/gui/calendar-commands.c:491 calendar/gui/calendar-commands.c:498
+#: calendar/gui/calendar-commands.c:504 calendar/gui/calendar-commands.c:506
 msgid "%d %B %Y"
 msgstr "%d. %B %Y"
 
 #. strftime format %d = day of month, %B = full
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: calendar/gui/calendar-commands.c:518
-#: calendar/gui/e-week-view-main-item.c:333 calendar/gui/print.c:1508
+#: calendar/gui/calendar-commands.c:496
+#: calendar/gui/e-week-view-main-item.c:333 calendar/gui/print.c:1509
 msgid "%d %B"
 msgstr "%d. %B"
 
-#: calendar/gui/calendar-commands.c:918
+#: calendar/gui/calendar-commands.c:884
 msgid ""
 "Could not create the calendar view.  Please check your ORBit and OAF setup."
 msgstr ""
 "Die Kalenderansicht konnte nicht erstellt werden. Bitte überprüfen Sie Ihre "
 "ORBit- und OAF-Einstellungen. "
 
-#: calendar/gui/calendar-component.c:70 calendar/gui/gnome-cal.c:1569
+#: calendar/gui/calendar-component.c:70 calendar/gui/gnome-cal.c:1557
 #: importers/netscape-importer.c:1873 mail/importers/netscape-importer.c:1843
 #: my-evolution/my-evolution.glade.h:2 shell/e-local-storage.c:177
 #: shell/e-shortcuts.c:1085
@@ -3889,10 +3885,10 @@ msgid "Public folder containing appointments and events"
 msgstr "Öffentlicher Ordner mit Kontaktinformationen"
 
 #: calendar/gui/calendar-component.c:80 calendar/gui/e-tasks.c:1080
-#: calendar/gui/print.c:1787 calendar/gui/tasks-control.c:487
+#: calendar/gui/print.c:1789 calendar/gui/tasks-control.c:487
 #: calendar/importers/icalendar-importer.c:644
 #: importers/netscape-importer.c:1875 mail/importers/netscape-importer.c:1845
-#: my-evolution/e-summary-tasks.c:348 my-evolution/e-summary-tasks.c:357
+#: my-evolution/e-summary-tasks.c:329 my-evolution/e-summary-tasks.c:338
 #: shell/e-local-storage.c:183 shell/e-shortcuts.c:1086
 msgid "Tasks"
 msgstr "Aufgaben"
@@ -3957,6 +3953,110 @@ msgstr "_Ganztags-Termin"
 msgid "Create a new all-day appointment"
 msgstr "Einen neuen ganztätigen Termin anlegen"
 
+#: calendar/gui/calendar-model.c:405 calendar/gui/calendar-model.c:964
+#: calendar/gui/e-calendar-table.c:380
+msgid "Private"
+msgstr "Privat"
+
+#: calendar/gui/calendar-model.c:408 calendar/gui/calendar-model.c:966
+#: calendar/gui/e-calendar-table.c:381
+msgid "Confidential"
+msgstr "Vertraulich"
+
+#: calendar/gui/calendar-model.c:411 calendar/gui/e-calendar-table.c:379
+msgid "Public"
+msgstr "Öffentlich"
+
+#: calendar/gui/calendar-model.c:523
+msgid "N"
+msgstr "N"
+
+#: calendar/gui/calendar-model.c:523
+msgid "S"
+msgstr "S"
+
+#: calendar/gui/calendar-model.c:525
+msgid "E"
+msgstr "O"
+
+#: calendar/gui/calendar-model.c:525
+msgid "W"
+msgstr "W"
+
+#: calendar/gui/calendar-model.c:590 calendar/gui/calendar-model.c:1134
+#: calendar/gui/e-calendar-table.c:453
+msgid "Free"
+msgstr "Frei"
+
+#: calendar/gui/calendar-model.c:592 calendar/gui/e-calendar-table.c:454
+#: calendar/gui/e-meeting-time-sel.c:406
+#: shell/evolution-shell-component.c:1207
+msgid "Busy"
+msgstr "Beschäftigt"
+
+#: calendar/gui/calendar-model.c:750 calendar/gui/calendar-model.c:1178
+#: calendar/gui/dialogs/task-details-page.glade.h:9
+#: calendar/gui/e-calendar-table.c:474 calendar/gui/e-tasks.c:257
+#: calendar/gui/print.c:2298
+msgid "Not Started"
+msgstr "Nicht begonnen"
+
+#: calendar/gui/calendar-model.c:753 calendar/gui/calendar-model.c:1180
+#: calendar/gui/dialogs/task-details-page.glade.h:6
+#: calendar/gui/e-calendar-table.c:475 calendar/gui/e-tasks.c:247
+#: calendar/gui/print.c:2301
+msgid "In Progress"
+msgstr "In Bearbeitung"
+
+#: calendar/gui/calendar-model.c:756 calendar/gui/calendar-model.c:1182
+#: calendar/gui/dialogs/task-details-page.glade.h:4
+#: calendar/gui/e-calendar-table.c:476 calendar/gui/e-meeting-model.c:294
+#: calendar/gui/e-meeting-model.c:317 calendar/gui/e-tasks.c:250
+#: calendar/gui/print.c:2304
+msgid "Completed"
+msgstr "Abgeschlossen"
+
+#: calendar/gui/calendar-model.c:1036
+msgid ""
+"The geographical position must be entered in the format: \n"
+"\n"
+"45.436845,125.862501"
+msgstr ""
+"Die geographische Position muss in diesem Format eingegeben werden: \n"
+"\n"
+"45.436845,125.862501"
+
+#. An empty string is the same as 'None'.
+#: calendar/gui/calendar-model.c:1176 calendar/gui/dialogs/meeting-page.c:330
+#: calendar/gui/dialogs/meeting-page.glade.h:2 composer/e-msg-composer.c:2079
+#: mail/folder-browser.c:1792 mail/mail-account-gui.c:1260
+#: mail/mail-account-gui.c:1692 mail/mail-accounts.c:442
+#: mail/mail-config.glade.h:76
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:194
+#: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:445
+#: widgets/misc/e-dateedit.c:1469 widgets/misc/e-dateedit.c:1584
+msgid "None"
+msgstr "Keine"
+
+#: calendar/gui/calendar-model.c:1711
+msgid "Recurring"
+msgstr "Wiederkehrend"
+
+#: calendar/gui/calendar-model.c:1713
+msgid "Assigned"
+msgstr "Zugewiesen"
+
+#: calendar/gui/calendar-model.c:1719 calendar/gui/e-meeting-model.c:266
+#: calendar/gui/e-meeting-model.c:276 calendar/gui/e-meeting-model.c:534
+#: calendar/gui/e-meeting-model.c:784
+msgid "Yes"
+msgstr "Ja"
+
+#: calendar/gui/calendar-model.c:1719 calendar/gui/e-meeting-model.c:278
+#: calendar/gui/e-meeting-model.c:785
+msgid "No"
+msgstr "Nein"
+
 #: calendar/gui/calendar-view-factory.c:118
 msgid "Day View"
 msgstr "Tagesansicht"
@@ -3973,50 +4073,28 @@ msgstr "Wochenansicht"
 msgid "Month View"
 msgstr "Monatsansicht"
 
-#: calendar/gui/calendar-view-factory.c:130
-#, fuzzy
-msgid "List View"
-msgstr "Benutzerdefinierte Ansicht"
-
-#: calendar/gui/cal-search-bar.c:50
-msgid "Summary contains"
-msgstr "Zusammenfassung enthält"
-
-#: calendar/gui/cal-search-bar.c:51
-msgid "Description contains"
-msgstr "Beschreibung enthält"
-
-#: calendar/gui/cal-search-bar.c:52
-msgid "Comment contains"
-msgstr "Kommentar enthält"
-
-# CHECK
-#: calendar/gui/cal-search-bar.c:358 mail/mail-ops.c:1120
-msgid "Unmatched"
-msgstr "Nicht einsortiert"
-
-#: calendar/gui/comp-editor-factory.c:462
+#: calendar/gui/comp-editor-factory.c:456
 msgid "Error while opening the calendar"
 msgstr "Fehler beim Öffnen des Kalenders"
 
-#: calendar/gui/comp-editor-factory.c:473
+#: calendar/gui/comp-editor-factory.c:467
 msgid "Method not supported when opening the calendar"
 msgstr "Methode beim Öffnen des Kalenders nicht unterstützt"
 
-#: calendar/gui/comp-editor-factory.c:479
+#: calendar/gui/comp-editor-factory.c:473
 msgid "Permission denied to open the calendar"
 msgstr "Erlaubnis zum Öffnen des Kalenders verweigert"
 
-#: calendar/gui/control-factory.c:125
+#: calendar/gui/control-factory.c:119
 #, c-format
 msgid "Could not open the folder in '%s'"
 msgstr "Der Ordner in »%s« konnte nicht geöffnet werden"
 
-#: calendar/gui/control-factory.c:171
+#: calendar/gui/control-factory.c:165
 msgid "The URI that the calendar will display"
 msgstr "Der URI, den der Kalender anzeigen wird"
 
-#: calendar/gui/control-factory.c:178
+#: calendar/gui/control-factory.c:172
 msgid "The type of view to show"
 msgstr "Typ der anzuzeigenden Ansicht"
 
@@ -4084,8 +4162,7 @@ msgstr "weitere Male alle"
 msgid "hours"
 msgstr "Stunden"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:14
-#: executive-summary/test-service/rdf-summary.c:806 filter/filter.glade.h:19
+#: calendar/gui/dialogs/alarm-options.glade.h:14 filter/filter.glade.h:19
 msgid "minutes"
 msgstr "Minuten"
 
@@ -4099,11 +4176,11 @@ msgstr "Grundlegend"
 msgid "Date/Time:"
 msgstr "Datum/Zeit:"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:3 calendar/gui/e-alarm-list.c:465
+#: calendar/gui/dialogs/alarm-page.glade.h:3 calendar/gui/e-alarm-list.c:461
 msgid "Display a message"
 msgstr "Eine Nachricht anzeigen"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:4 calendar/gui/e-alarm-list.c:461
+#: calendar/gui/dialogs/alarm-page.glade.h:4 calendar/gui/e-alarm-list.c:457
 msgid "Play a sound"
 msgstr "Einen Klang abspielen"
 
@@ -4111,7 +4188,7 @@ msgstr "Einen Klang abspielen"
 msgid "Reminders"
 msgstr "Erinnerungen"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:6 calendar/gui/e-alarm-list.c:473
+#: calendar/gui/dialogs/alarm-page.glade.h:6 calendar/gui/e-alarm-list.c:469
 msgid "Run a program"
 msgstr "Ein Programm ausführen"
 
@@ -4121,7 +4198,7 @@ msgstr "Eine E-Mail verschicken"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:8
 #: calendar/gui/dialogs/recurrence-page.glade.h:8
-#: calendar/gui/e-itip-control.c:1022 calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-itip-control.c:1052 calendar/gui/e-itip-control.glade.h:11
 #: calendar/gui/e-tasks.c:208
 msgid "Summary:"
 msgstr "Zusammenfassung:"
@@ -4205,7 +4282,7 @@ msgstr "Tage"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
 #: calendar/gui/dialogs/recurrence-page.c:1040
-#: calendar/gui/e-itip-control.c:647
+#: calendar/gui/e-itip-control.c:677
 msgid "Friday"
 msgstr "Freitag"
 
@@ -4219,7 +4296,7 @@ msgstr "Minuten"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
 #: calendar/gui/dialogs/recurrence-page.c:1036
-#: calendar/gui/e-itip-control.c:643
+#: calendar/gui/e-itip-control.c:673
 msgid "Monday"
 msgstr "Montag"
 
@@ -4229,7 +4306,7 @@ msgstr "_So"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
 #: calendar/gui/dialogs/recurrence-page.c:1041
-#: calendar/gui/e-itip-control.c:648
+#: calendar/gui/e-itip-control.c:678
 msgid "Saturday"
 msgstr "Samstag"
 
@@ -4243,7 +4320,7 @@ msgstr "_Wochennummern im Datumsnavigator anzeigen"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
 #: calendar/gui/dialogs/recurrence-page.c:1042
-#: calendar/gui/e-itip-control.c:642
+#: calendar/gui/e-itip-control.c:672
 msgid "Sunday"
 msgstr "Sonntag"
 
@@ -4261,7 +4338,7 @@ msgstr "Aufgabenliste"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
 #: calendar/gui/dialogs/recurrence-page.c:1039
-#: calendar/gui/e-itip-control.c:646
+#: calendar/gui/e-itip-control.c:676
 msgid "Thursday"
 msgstr "Donnerstag"
 
@@ -4279,7 +4356,7 @@ msgstr "Zeitformat:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
 #: calendar/gui/dialogs/recurrence-page.c:1037
-#: calendar/gui/e-itip-control.c:644
+#: calendar/gui/e-itip-control.c:674
 msgid "Tuesday"
 msgstr "Dienstag"
 
@@ -4289,12 +4366,12 @@ msgstr "W_oche beginnt:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
 #: calendar/gui/dialogs/recurrence-page.c:1038
-#: calendar/gui/e-itip-control.c:645
+#: calendar/gui/e-itip-control.c:675
 msgid "Wednesday"
 msgstr "Mittwoch"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-#: ui/evolution-calendar.xml.h:31
+#: ui/evolution-calendar.xml.h:29
 msgid "Work Week"
 msgstr "Werkwoche"
 
@@ -4458,6 +4535,31 @@ msgstr ""
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  Sie haben keine Änderungen vorgenommen, den Editor aktualisieren?"
 
+#: calendar/gui/dialogs/comp-editor-page.c:409
+#, c-format
+msgid "Validation error: %s"
+msgstr "Validierungsfehler: %s"
+
+#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2216
+msgid " to "
+msgstr " bis "
+
+#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2220
+msgid " (Completed "
+msgstr " (Abgeschlossen "
+
+#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2222
+msgid "Completed "
+msgstr "Abgeschlossen "
+
+#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2227
+msgid " (Due "
+msgstr " (Fällig am "
+
+#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2229
+msgid "Due "
+msgstr "Fällig am "
+
 #: calendar/gui/dialogs/comp-editor.c:334
 msgid "Could not update invalid object"
 msgstr "Ungültiges Objekt konnte nicht aktualisiert werden"
@@ -4503,49 +4605,23 @@ msgid "No summary"
 msgstr "Keine Zusammenfassung"
 
 #: calendar/gui/dialogs/comp-editor.c:1281
-#: calendar/gui/e-calendar-table.c:1138 calendar/gui/e-cal-view.c:878
-#: composer/e-msg-composer.c:1191
+#: calendar/gui/e-calendar-table.c:1103 calendar/gui/e-day-view.c:3960
+#: calendar/gui/e-week-view.c:3898 composer/e-msg-composer.c:1184
 msgid "Save as..."
 msgstr "Speichern unter..."
 
-#: calendar/gui/dialogs/comp-editor.c:1384
-#: calendar/gui/dialogs/comp-editor.c:1408
-#: calendar/gui/dialogs/comp-editor.c:1434
+#: calendar/gui/dialogs/comp-editor.c:1383
+#: calendar/gui/dialogs/comp-editor.c:1407
+#: calendar/gui/dialogs/comp-editor.c:1433
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr ""
 "An diesem Objekt vorgenommene Änderungen verfallen möglicherweise, sobald "
 "Aktualisierungen eintreffen"
 
-#: calendar/gui/dialogs/comp-editor.c:1464
-#: calendar/gui/dialogs/comp-editor.c:1473
+#: calendar/gui/dialogs/comp-editor.c:1460
 msgid "Unable to obtain current version!"
 msgstr "Aktuelle Version konnte nicht ermittelt werden!"
 
-#: calendar/gui/dialogs/comp-editor-page.c:409
-#, c-format
-msgid "Validation error: %s"
-msgstr "Validierungsfehler: %s"
-
-#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2223
-msgid " to "
-msgstr " bis "
-
-#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2227
-msgid " (Completed "
-msgstr " (Abgeschlossen "
-
-#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2229
-msgid "Completed "
-msgstr "Abgeschlossen "
-
-#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2234
-msgid " (Due "
-msgstr " (Fällig am "
-
-#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2236
-msgid "Due "
-msgstr "Fällig am "
-
 #: calendar/gui/dialogs/delete-comp.c:96
 #, c-format
 msgid "Are you sure you want to delete the appointment `%s'?"
@@ -4656,31 +4732,31 @@ msgstr "Delegieren an:"
 msgid "Enter Delegate"
 msgstr "Delegaten eingeben"
 
-#: calendar/gui/dialogs/event-editor.c:200 calendar/gui/print.c:2260
+#: calendar/gui/dialogs/event-editor.c:199 calendar/gui/print.c:2253
 msgid "Appointment"
 msgstr "Termin"
 
-#: calendar/gui/dialogs/event-editor.c:207
+#: calendar/gui/dialogs/event-editor.c:206
 msgid "Reminder"
 msgstr "Erinnerung"
 
-#: calendar/gui/dialogs/event-editor.c:214
+#: calendar/gui/dialogs/event-editor.c:213
 msgid "Recurrence"
 msgstr "Wiederholung"
 
-#: calendar/gui/dialogs/event-editor.c:221
-#: calendar/gui/dialogs/event-editor.c:294
-#: calendar/gui/dialogs/event-editor.c:438
+#: calendar/gui/dialogs/event-editor.c:220
+#: calendar/gui/dialogs/event-editor.c:292
+#: calendar/gui/dialogs/event-editor.c:436
 msgid "Scheduling"
 msgstr "Planung"
 
-#: calendar/gui/dialogs/event-editor.c:228
-#: calendar/gui/dialogs/event-editor.c:297
-#: calendar/gui/dialogs/event-editor.c:441 ui/evolution-event-editor.xml.h:6
+#: calendar/gui/dialogs/event-editor.c:227
+#: calendar/gui/dialogs/event-editor.c:295
+#: calendar/gui/dialogs/event-editor.c:439 ui/evolution-event-editor.xml.h:6
 msgid "Meeting"
 msgstr "Besprechung"
 
-#: calendar/gui/dialogs/event-page.c:603 calendar/gui/dialogs/task-page.c:509
+#: calendar/gui/dialogs/event-page.c:603 calendar/gui/dialogs/task-page.c:507
 msgid "Start date is wrong"
 msgstr "Das Anfangsdatum ist falsch"
 
@@ -4716,9 +4792,9 @@ msgid "Classification"
 msgstr "Einstufung"
 
 #: calendar/gui/dialogs/event-page.glade.h:6
-#, fuzzy
-msgid "Co_nfidential"
-msgstr "Vertraulich"
+#: calendar/gui/dialogs/task-page.glade.h:4
+msgid "Con_fidential"
+msgstr "_Vertraulich"
 
 #: calendar/gui/dialogs/event-page.glade.h:7
 #: calendar/gui/dialogs/task-page.glade.h:5
@@ -4744,6 +4820,7 @@ msgid "Pu_blic"
 msgstr "Ö_ffentlich"
 
 #: calendar/gui/dialogs/event-page.glade.h:12
+#: calendar/gui/e-calendar-table.etspec.h:13
 msgid "Show Time As"
 msgstr "Zeit einstufen als"
 
@@ -4760,34 +4837,74 @@ msgstr "_Endzeit:"
 msgid "_Start time:"
 msgstr "Anfangszeit:"
 
-#. an empty string is the same as 'None'
-#: calendar/gui/dialogs/meeting-page.c:311
-#: calendar/gui/dialogs/meeting-page.glade.h:2
-#: calendar/gui/e-cal-model-tasks.c:596 composer/e-msg-composer.c:2093
-#: mail/mail-account-gui.c:1260 mail/mail-account-gui.c:1692
-#: mail/mail-accounts.c:442 mail/mail-config.glade.h:76
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:194
-#: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:445
-#: widgets/misc/e-dateedit.c:1483 widgets/misc/e-dateedit.c:1598
-msgid "None"
-msgstr "Keine"
-
-#: calendar/gui/dialogs/meeting-page.c:416
+#: calendar/gui/dialogs/meeting-page.c:437
 msgid "The organizer selected no longer has an account."
 msgstr "Dem gewählten Organizer ist kein Konto mehr zugeordnet."
 
-#: calendar/gui/dialogs/meeting-page.c:422
+#: calendar/gui/dialogs/meeting-page.c:443
 msgid "An organizer is required."
 msgstr "Es ist ein Organisator erforderlich."
 
-#: calendar/gui/dialogs/meeting-page.c:437
+#: calendar/gui/dialogs/meeting-page.c:458
 msgid "At least one attendee is required."
 msgstr "Es ist mindestens ein Teilnehmer erforderlich."
 
-#: calendar/gui/dialogs/meeting-page.c:630
+#: calendar/gui/dialogs/meeting-page.c:629
+msgid "That person is already attending the meeting!"
+msgstr "Diese Person nimmt bereits an der Besprechung teil!"
+
+#: calendar/gui/dialogs/meeting-page.c:713
 msgid "_Delegate To..."
 msgstr "_Delegieren an..."
 
+#: calendar/gui/dialogs/meeting-page.etspec.h:1
+#: calendar/gui/e-meeting-time-sel.etspec.h:1
+msgid "Attendee"
+msgstr "Anwesender"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:2
+#: calendar/gui/e-meeting-time-sel.etspec.h:2
+msgid "Click here to add an attendee"
+msgstr "Klicken Sie hier, um einen Teilnehmer hinzuzufügen"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:3
+#: calendar/gui/e-meeting-time-sel.etspec.h:3
+msgid "Common Name"
+msgstr "Gemeinsamer Name"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:4
+#: calendar/gui/e-meeting-time-sel.etspec.h:4
+msgid "Delegated From"
+msgstr "Delegiert durch"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:5
+#: calendar/gui/e-meeting-time-sel.etspec.h:5
+msgid "Delegated To"
+msgstr "Delegiert an"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:6
+#: calendar/gui/e-meeting-time-sel.etspec.h:6
+msgid "Language"
+msgstr "Sprache"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:7
+#: calendar/gui/e-meeting-time-sel.etspec.h:7
+msgid "Member"
+msgstr "Mitglied"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:8
+#: calendar/gui/e-itip-control.c:1179
+#: calendar/gui/e-meeting-time-sel.etspec.h:8
+msgid "RSVP"
+msgstr "UAwg"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:10
+#: calendar/gui/e-calendar-table.etspec.h:15
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:58
+#: mail/message-list.etspec.h:12
+msgid "Status"
+msgstr "Status"
+
 #: calendar/gui/dialogs/meeting-page.glade.h:3
 #: calendar/gui/e-itip-control.glade.h:9
 msgid "Organizer:"
@@ -4798,7 +4915,7 @@ msgid "_Change Organizer"
 msgstr "Organisator _ändern"
 
 #: calendar/gui/dialogs/meeting-page.glade.h:5
-#: calendar/gui/e-meeting-time-sel.c:411
+#: calendar/gui/e-meeting-time-sel.c:424
 msgid "_Invite Others..."
 msgstr "Andere einladen..."
 
@@ -4958,7 +5075,7 @@ msgstr ""
 "Möchten Sie Ihre Änderungen speichern?"
 
 # CHECK
-#: calendar/gui/dialogs/save-comp.c:58 composer/e-msg-composer.c:1599
+#: calendar/gui/dialogs/save-comp.c:58 composer/e-msg-composer.c:1580
 msgid "_Discard Changes"
 msgstr "Änderungen _verwerfen"
 
@@ -4996,27 +5113,6 @@ msgstr "Das Fertiggestellt-Datum ist falsch"
 msgid "% _Complete"
 msgstr "% _abgeschlossen"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:4
-#: calendar/gui/e-calendar-table.c:478 calendar/gui/e-cal-model-tasks.c:323
-#: calendar/gui/e-cal-model-tasks.c:602 calendar/gui/e-tasks.c:250
-#: calendar/gui/print.c:2311
-msgid "Completed"
-msgstr "Abgeschlossen"
-
-#: calendar/gui/dialogs/task-details-page.glade.h:6
-#: calendar/gui/e-calendar-table.c:477 calendar/gui/e-cal-model-tasks.c:321
-#: calendar/gui/e-cal-model-tasks.c:600 calendar/gui/e-cal-model-tasks.c:662
-#: calendar/gui/e-tasks.c:247 calendar/gui/print.c:2308
-msgid "In Progress"
-msgstr "In Bearbeitung"
-
-#: calendar/gui/dialogs/task-details-page.glade.h:9
-#: calendar/gui/e-calendar-table.c:476 calendar/gui/e-cal-model-tasks.c:319
-#: calendar/gui/e-cal-model-tasks.c:598 calendar/gui/e-tasks.c:257
-#: calendar/gui/print.c:2305
-msgid "Not Started"
-msgstr "Nicht begonnen"
-
 #: calendar/gui/dialogs/task-details-page.glade.h:10
 msgid "Progress"
 msgstr "Fortschritt"
@@ -5037,29 +5133,21 @@ msgstr "Status:"
 msgid "_Web Page:"
 msgstr "_Website:"
 
-#: calendar/gui/dialogs/task-editor.c:193
+#: calendar/gui/dialogs/task-editor.c:192
 msgid "Basic"
 msgstr "Grundlegend"
 
-#: calendar/gui/dialogs/task-editor.c:207
-#: calendar/gui/dialogs/task-editor.c:270
-#: calendar/gui/dialogs/task-editor.c:407
+#: calendar/gui/dialogs/task-editor.c:206
+#: calendar/gui/dialogs/task-editor.c:269
+#: calendar/gui/dialogs/task-editor.c:406
 msgid "Assignment"
 msgstr "Arbeitsauftrag"
 
-#: calendar/gui/dialogs/task-page.c:482
+#: calendar/gui/dialogs/task-page.c:480
 msgid "Due date is wrong"
 msgstr "Das Fälligkeitsdatum ist falsch"
 
-#: calendar/gui/dialogs/task-page.c:542
-msgid "Due date is before start date!"
-msgstr ""
-
-#: calendar/gui/dialogs/task-page.glade.h:4
-msgid "Con_fidential"
-msgstr "_Vertraulich"
-
-#: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-itip-control.c:1077
+#: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-itip-control.c:1107
 #: calendar/gui/e-itip-control.glade.h:6 calendar/gui/e-tasks.c:287
 #: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:43
 msgid "Description:"
@@ -5073,243 +5161,217 @@ msgstr "Anfangsdatum:"
 msgid "_Due Date:"
 msgstr "Fällig am:"
 
-#: calendar/gui/e-alarm-list.c:397
+#: calendar/gui/e-alarm-list.c:393
 #, c-format
 msgid "%d days"
 msgstr "%d Tage"
 
-#: calendar/gui/e-alarm-list.c:400
+#: calendar/gui/e-alarm-list.c:396
 msgid "1 day"
 msgstr "1 Tag"
 
-#: calendar/gui/e-alarm-list.c:405
+#: calendar/gui/e-alarm-list.c:401
 #, c-format
 msgid "%d weeks"
 msgstr "%d Wochen"
 
-#: calendar/gui/e-alarm-list.c:408
+#: calendar/gui/e-alarm-list.c:404
 msgid "1 week"
 msgstr "1 Woche"
 
-#: calendar/gui/e-alarm-list.c:413
+#: calendar/gui/e-alarm-list.c:409
 #, c-format
 msgid "%d hours"
 msgstr "%d Stunden"
 
-#: calendar/gui/e-alarm-list.c:416
+#: calendar/gui/e-alarm-list.c:412
 msgid "1 hour"
 msgstr "1 Stunde"
 
-#: calendar/gui/e-alarm-list.c:421
+#: calendar/gui/e-alarm-list.c:417
 #, c-format
 msgid "%d minutes"
 msgstr "%d Minuten"
 
-#: calendar/gui/e-alarm-list.c:424
+#: calendar/gui/e-alarm-list.c:420
 msgid "1 minute"
 msgstr "1 Minute"
 
-#: calendar/gui/e-alarm-list.c:429
+#: calendar/gui/e-alarm-list.c:425
 #, c-format
 msgid "%d seconds"
 msgstr "%d Sekunden"
 
-#: calendar/gui/e-alarm-list.c:432
+#: calendar/gui/e-alarm-list.c:428
 msgid "1 second"
 msgstr "1 Sekunde"
 
-#: calendar/gui/e-alarm-list.c:469
+#: calendar/gui/e-alarm-list.c:465
 msgid "Send an email"
 msgstr "Eine E-Mail verschicken"
 
-#: calendar/gui/e-alarm-list.c:479
+#: calendar/gui/e-alarm-list.c:475
 msgid "Unknown action to be performed"
 msgstr "Unbekannte auszuführende Aktion"
 
-#: calendar/gui/e-alarm-list.c:491
+#: calendar/gui/e-alarm-list.c:487
 #, c-format
 msgid "%s %s before the start of the appointment"
 msgstr "%s %s vor Terminbeginn"
 
-#: calendar/gui/e-alarm-list.c:494
+#: calendar/gui/e-alarm-list.c:490
 #, c-format
 msgid "%s %s after the start of the appointment"
 msgstr "%s %s nach Terminbeginn"
 
-#: calendar/gui/e-alarm-list.c:499
+#: calendar/gui/e-alarm-list.c:495
 #, c-format
 msgid "%s at the start of the appointment"
 msgstr "%s zum Terminbeginn"
 
-#: calendar/gui/e-alarm-list.c:508
+#: calendar/gui/e-alarm-list.c:504
 #, c-format
 msgid "%s %s before the end of the appointment"
 msgstr "%s %s vor Terminende"
 
-#: calendar/gui/e-alarm-list.c:511
+#: calendar/gui/e-alarm-list.c:507
 #, c-format
 msgid "%s %s after the end of the appointment"
 msgstr "%s %s nach Terminende"
 
-#: calendar/gui/e-alarm-list.c:516
+#: calendar/gui/e-alarm-list.c:512
 #, c-format
 msgid "%s at the end of the appointment"
 msgstr "%s zum Terminende"
 
-#: calendar/gui/e-alarm-list.c:540
+#: calendar/gui/e-alarm-list.c:536
 #, c-format
 msgid "%s at %s"
 msgstr "%s um %s"
 
-#: calendar/gui/e-alarm-list.c:546
+#: calendar/gui/e-alarm-list.c:542
 #, c-format
 msgid "%s for an unknown trigger type"
 msgstr "%s für einen unbekannten Auslösertyp."
 
-#: calendar/gui/e-calendar-table.c:381 calendar/gui/e-cal-model.c:280
-#: calendar/gui/e-cal-model.c:287
-msgid "Public"
-msgstr "Öffentlich"
-
-#: calendar/gui/e-calendar-table.c:382 calendar/gui/e-cal-model.c:289
-msgid "Private"
-msgstr "Privat"
-
-#: calendar/gui/e-calendar-table.c:383 calendar/gui/e-cal-model.c:291
-msgid "Confidential"
-msgstr "Vertraulich"
-
-#: calendar/gui/e-calendar-table.c:425
+#: calendar/gui/e-calendar-table.c:423
 msgid "0%"
 msgstr "0%"
 
-#: calendar/gui/e-calendar-table.c:426
+#: calendar/gui/e-calendar-table.c:424
 msgid "10%"
 msgstr "10%"
 
-#: calendar/gui/e-calendar-table.c:427
+#: calendar/gui/e-calendar-table.c:425
 msgid "20%"
 msgstr "20%"
 
-#: calendar/gui/e-calendar-table.c:428
+#: calendar/gui/e-calendar-table.c:426
 msgid "30%"
 msgstr "30%"
 
-#: calendar/gui/e-calendar-table.c:429
+#: calendar/gui/e-calendar-table.c:427
 msgid "40%"
 msgstr "40%"
 
-#: calendar/gui/e-calendar-table.c:430
+#: calendar/gui/e-calendar-table.c:428
 msgid "50%"
 msgstr "50%"
 
-#: calendar/gui/e-calendar-table.c:431
+#: calendar/gui/e-calendar-table.c:429
 msgid "60%"
 msgstr "60%"
 
-#: calendar/gui/e-calendar-table.c:432
+#: calendar/gui/e-calendar-table.c:430
 msgid "70%"
 msgstr "70%"
 
-#: calendar/gui/e-calendar-table.c:433
+#: calendar/gui/e-calendar-table.c:431
 msgid "80%"
 msgstr "80%"
 
-#: calendar/gui/e-calendar-table.c:434
+#: calendar/gui/e-calendar-table.c:432
 msgid "90%"
 msgstr "90%"
 
-#: calendar/gui/e-calendar-table.c:435
+#: calendar/gui/e-calendar-table.c:433
 msgid "100%"
 msgstr "100%"
 
-#: calendar/gui/e-calendar-table.c:455 calendar/gui/e-cal-model-calendar.c:163
-msgid "Free"
-msgstr "Frei"
-
-#: calendar/gui/e-calendar-table.c:456 calendar/gui/e-cal-model-calendar.c:166
-#: calendar/gui/e-meeting-time-sel.c:393
-#: shell/evolution-shell-component.c:1207
-msgid "Busy"
-msgstr "Beschäftigt"
-
-#: calendar/gui/e-calendar-table.c:724 calendar/gui/e-cal-view.c:562
+#: calendar/gui/e-calendar-table.c:726 calendar/gui/e-day-view.c:2827
+#: calendar/gui/e-week-view.c:1983
 msgid "Deleting selected objects"
 msgstr "Gewählte Objekte werden gelöscht"
 
-#: calendar/gui/e-calendar-table.c:988 calendar/gui/e-calendar-table.c:1029
-#: calendar/gui/e-cal-view.c:1126 calendar/gui/e-cal-view.c:1192
+#: calendar/gui/e-calendar-table.c:980 calendar/gui/e-day-view.c:3700
+#: calendar/gui/e-week-view.c:3669 mail/folder-browser.c:1803
 #: shell/e-shortcuts-view.c:422 ui/evolution-addressbook.xml.h:36
 msgid "_Open"
 msgstr "Ö_ffnen"
 
-#: calendar/gui/e-calendar-table.c:989
+#: calendar/gui/e-calendar-table.c:981
 msgid "Open _Web Page"
 msgstr "_Website öffnen"
 
-#: calendar/gui/e-calendar-table.c:990 calendar/gui/e-calendar-table.c:1035
-#: calendar/gui/e-cal-view.c:1127 calendar/gui/e-cal-view.c:1198
-#: ui/evolution-mail-message.xml.h:120
-msgid "_Save As..."
-msgstr "Speichern _unter..."
+#: calendar/gui/e-calendar-table.c:982
+msgid "_Save as..."
+msgstr "_Speichern unter..."
 
-#: calendar/gui/e-calendar-table.c:991 calendar/gui/e-calendar-table.c:1033
-#: calendar/gui/e-cal-view.c:1101 calendar/gui/e-cal-view.c:1128
-#: calendar/gui/e-cal-view.c:1196 ui/evolution-addressbook.xml.h:38
-#: ui/evolution-calendar.xml.h:37 ui/evolution-comp-editor.xml.h:19
-#: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:116
+#: calendar/gui/e-calendar-table.c:983 calendar/gui/e-day-view.c:3702
+#: calendar/gui/e-week-view.c:3644 calendar/gui/e-week-view.c:3671
+#: ui/evolution-addressbook.xml.h:38 ui/evolution-calendar.xml.h:35
+#: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:110
 #: ui/evolution-tasks.xml.h:21 ui/my-evolution.xml.h:6
 msgid "_Print..."
 msgstr "_Drucken..."
 
-#: calendar/gui/e-calendar-table.c:995 calendar/gui/e-calendar-table.c:1024
-#: calendar/gui/e-cal-view.c:1133 calendar/gui/e-cal-view.c:1174
-#: ui/evolution-addressbook.xml.h:1 ui/evolution-calendar.xml.h:1
-#: ui/evolution-tasks.xml.h:1
+#: calendar/gui/e-calendar-table.c:987 calendar/gui/e-day-view.c:3707
+#: calendar/gui/e-week-view.c:3676 ui/evolution-addressbook.xml.h:1
+#: ui/evolution-calendar.xml.h:1 ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "Ausschneiden"
 
-#: calendar/gui/e-calendar-table.c:996 calendar/gui/e-calendar-table.c:1022
-#: calendar/gui/e-cal-view.c:1134 calendar/gui/e-cal-view.c:1172
-#: ui/evolution-addressbook.xml.h:30 ui/evolution-calendar.xml.h:33
-#: ui/evolution-composer-entries.xml.h:7 ui/evolution-mail-message.xml.h:101
-#: ui/evolution-tasks.xml.h:17
+#: calendar/gui/e-calendar-table.c:988 calendar/gui/e-day-view.c:3708
+#: calendar/gui/e-week-view.c:3677 ui/evolution-addressbook.xml.h:30
+#: ui/evolution-calendar.xml.h:31 ui/evolution-composer-entries.xml.h:7
+#: ui/evolution-mail-list.xml.h:24 ui/evolution-tasks.xml.h:17
 msgid "_Copy"
 msgstr "Kopieren"
 
-#: calendar/gui/e-calendar-table.c:997 calendar/gui/e-calendar-table.c:1031
-#: calendar/gui/e-cal-view.c:1105 calendar/gui/e-cal-view.c:1135
-#: calendar/gui/e-cal-view.c:1194 ui/evolution-addressbook.xml.h:37
-#: ui/evolution-calendar.xml.h:36 ui/evolution-composer-entries.xml.h:9
-#: ui/evolution-mail-message.xml.h:114 ui/evolution-tasks.xml.h:20
+#: calendar/gui/e-calendar-table.c:989 calendar/gui/e-day-view.c:3673
+#: calendar/gui/e-day-view.c:3709 calendar/gui/e-week-view.c:3648
+#: calendar/gui/e-week-view.c:3678 ui/evolution-addressbook.xml.h:37
+#: ui/evolution-calendar.xml.h:34 ui/evolution-composer-entries.xml.h:9
+#: ui/evolution-mail-list.xml.h:29 ui/evolution-tasks.xml.h:20
 msgid "_Paste"
 msgstr "Einfügen"
 
-#: calendar/gui/e-calendar-table.c:1001
+#: calendar/gui/e-calendar-table.c:993
 msgid "_Assign Task"
 msgstr "_Aufgabe zuweisen"
 
-#: calendar/gui/e-calendar-table.c:1002
+#: calendar/gui/e-calendar-table.c:994
 msgid "_Forward as iCalendar"
 msgstr "Als i_Calendar weiterleiten"
 
-#: calendar/gui/e-calendar-table.c:1003
+#: calendar/gui/e-calendar-table.c:995
 msgid "_Mark as Complete"
 msgstr "Als abgeschlossen _markieren"
 
-#: calendar/gui/e-calendar-table.c:1004
+#: calendar/gui/e-calendar-table.c:996
 msgid "_Mark Selected Tasks as Complete"
 msgstr "Gewählte Aufgaben als abgeschlossen _markieren"
 
-#: calendar/gui/e-calendar-table.c:1009 calendar/gui/e-calendar-table.c:1027
+#: calendar/gui/e-calendar-table.c:1001
 msgid "_Delete Selected Tasks"
 msgstr "Gewählte Aufgaben _löschen"
 
-#: calendar/gui/e-calendar-table.c:1341 calendar/gui/e-cal-view.c:253
+#: calendar/gui/e-calendar-table.c:1300 calendar/gui/e-day-view.c:7983
+#: calendar/gui/e-week-view.c:4400
 msgid "Updating objects"
 msgstr "Objekte werden aktualisiert"
 
-#: calendar/gui/e-calendar-table.c:1424
+#: calendar/gui/e-calendar-table.c:1383
 #: calendar/gui/e-calendar-table.etspec.h:6
 msgid "Click to add a task"
 msgstr "Klicken Sie hier, um eine Aufgabe hinzuzufügen"
@@ -5323,8 +5385,8 @@ msgstr "% abgeschlossen"
 msgid "Alarms"
 msgstr "Alarme"
 
-#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:1173
-#: camel/camel-filter-driver.c:1268 mail/mail-send-recv.c:578
+#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:1156
+#: camel/camel-filter-driver.c:1251
 msgid "Complete"
 msgstr "Abgeschlossen"
 
@@ -5333,14 +5395,13 @@ msgid "Completion Date"
 msgstr "Abschlussdatum"
 
 #: calendar/gui/e-calendar-table.etspec.h:9
-#, fuzzy
-msgid "Description"
-msgstr "Beschreibung:"
-
-#: calendar/gui/e-calendar-table.etspec.h:10
 msgid "Due Date"
 msgstr "Fällig am"
 
+#: calendar/gui/e-calendar-table.etspec.h:10
+msgid "End Date"
+msgstr "Enddatum"
+
 #: calendar/gui/e-calendar-table.etspec.h:11
 msgid "Geographical Position"
 msgstr "Geographische Lage"
@@ -5349,301 +5410,244 @@ msgstr "Geographische Lage"
 msgid "Priority"
 msgstr "Priorität"
 
-#: calendar/gui/e-calendar-table.etspec.h:13
+#: calendar/gui/e-calendar-table.etspec.h:14
 msgid "Start Date"
 msgstr "Anfangsdatum"
 
-#: calendar/gui/e-calendar-table.etspec.h:14
-#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:36
-#: mail/message-list.etspec.h:12
-msgid "Status"
-msgstr "Status"
-
-#: calendar/gui/e-calendar-table.etspec.h:15
+#: calendar/gui/e-calendar-table.etspec.h:16
 #: my-evolution/component-factory.c:56 shell/e-shell.c:750
 #: shell/e-shortcuts.c:1082
 msgid "Summary"
 msgstr "Zusammenfassung"
 
-#: calendar/gui/e-calendar-table.etspec.h:16
+#: calendar/gui/e-calendar-table.etspec.h:17
 msgid "Task sort"
 msgstr "Aufgabensorte"
 
-#: calendar/gui/e-calendar-table.etspec.h:19 mail/mail-config.glade.h:171
-msgid "color"
-msgstr "Farbe"
-
-#: calendar/gui/e-calendar-table.etspec.h:20
-#, fuzzy
-msgid "component"
-msgstr "Termin"
-
-#: calendar/gui/e-cal-model.c:293 calendar/gui/e-cal-model.c:296
-#: calendar/gui/e-itip-control.c:1062 calendar/gui/e-itip-control.c:1278
-#: camel/camel-gpg-context.c:1574 camel/camel-gpg-context.c:1625
-#: camel/camel-tcp-stream-openssl.c:631
-#: camel/providers/smtp/camel-smtp-transport.c:172
-#: camel/providers/smtp/camel-smtp-transport.c:227
-#: widgets/misc/e-charset-picker.c:60
-msgid "Unknown"
-msgstr "Unbekannt"
-
-#: calendar/gui/e-cal-model.c:828
-msgid "Recurring"
-msgstr "Wiederkehrend"
-
-#: calendar/gui/e-cal-model.c:830
-msgid "Assigned"
-msgstr "Zugewiesen"
+#. strftime format of a weekday, a date and a time, 24-hour.
+#: calendar/gui/e-cell-date-edit-text.c:118 e-util/e-time-utils.c:167
+#: e-util/e-time-utils.c:380
+msgid "%a %m/%d/%Y %H:%M:%S"
+msgstr "%a, %d. %m %Y %H:%M:%S"
 
-#: calendar/gui/e-cal-model.c:832 calendar/gui/e-cal-model-tasks.c:933
-msgid "Yes"
-msgstr "Ja"
+#. strftime format of a weekday, a date and a time, 12-hour.
+#: calendar/gui/e-cell-date-edit-text.c:121 e-util/e-time-utils.c:162
+#: e-util/e-time-utils.c:389
+msgid "%a %m/%d/%Y %I:%M:%S %p"
+msgstr "%a, %d.%m.%Y %I:%M:%S %p"
 
-#: calendar/gui/e-cal-model.c:832 calendar/gui/e-cal-model-tasks.c:933
-msgid "No"
-msgstr "Nein"
+#: calendar/gui/e-cell-date-edit-text.c:126
+#, c-format
+msgid ""
+"The date must be entered in the format: \n"
+"\n"
+"%s"
+msgstr ""
+"Das Datum muss in diesem Format eingegeben werden: \n"
+"\n"
+"%s"
 
-#: calendar/gui/e-cal-model-tasks.c:275
-msgid "N"
-msgstr "N"
+#: calendar/gui/e-day-view-time-item.c:532
+#, c-format
+msgid "%02i minute divisions"
+msgstr "%02i Minuten-Unterteilungen"
 
-#: calendar/gui/e-cal-model-tasks.c:275
-msgid "S"
-msgstr "S"
+#. strftime format %A = full weekday name, %d = day of month,
+#. %B = full month name. Don't use any other specifiers.
+#: calendar/gui/e-day-view-top-item.c:261 calendar/gui/e-day-view.c:1392
+#: calendar/gui/e-week-view-main-item.c:316 calendar/gui/print.c:1525
+msgid "%A %d %B"
+msgstr "%A, %d. %B"
 
-#: calendar/gui/e-cal-model-tasks.c:277
-msgid "E"
-msgstr "O"
+#. strftime format %d = day of month, %b = abbreviated month name.
+#. Don't use any other specifiers.
+#: calendar/gui/e-day-view-top-item.c:269 calendar/gui/e-day-view.c:1425
+#: calendar/gui/e-week-view-main-item.c:339
+msgid "%d %b"
+msgstr "%d. %b"
 
-#: calendar/gui/e-cal-model-tasks.c:277
-msgid "W"
-msgstr "W"
+#. String to use in 12-hour time format for times in the morning.
+#: calendar/gui/e-day-view.c:614 calendar/gui/e-week-view.c:337
+#: calendar/gui/print.c:809
+msgid "am"
+msgstr "AM"
 
-#: calendar/gui/e-cal-model-tasks.c:550
-msgid ""
-"The geographical position must be entered in the format: \n"
-"\n"
-"45.436845,125.862501"
-msgstr ""
-"Die geographische Position muss in diesem Format eingegeben werden: \n"
-"\n"
-"45.436845,125.862501"
+#. String to use in 12-hour time format for times in the afternoon.
+#: calendar/gui/e-day-view.c:617 calendar/gui/e-week-view.c:340
+#: calendar/gui/print.c:811
+msgid "pm"
+msgstr "PM"
 
-#: calendar/gui/e-cal-view.c:1094 calendar/gui/e-cal-view.c:1184
-msgid "New _Appointment..."
-msgstr "Neuer _Termin..."
+#: calendar/gui/e-day-view.c:3657
+msgid "New _Appointment"
+msgstr "Neuer _Termin"
 
-#: calendar/gui/e-cal-view.c:1095 calendar/gui/e-cal-view.c:1186
+#: calendar/gui/e-day-view.c:3659 calendar/gui/e-week-view.c:3638
 msgid "New All Day _Event"
 msgstr "Neues _ganztägiges Ereignis"
 
-#: calendar/gui/e-cal-view.c:1096 calendar/gui/e-cal-view.c:1188
+#: calendar/gui/e-day-view.c:3661 calendar/gui/e-week-view.c:3639
 msgid "New Meeting"
 msgstr "Neue Besprechung"
 
-#: calendar/gui/e-cal-view.c:1097 calendar/gui/e-cal-view.c:1190
+#: calendar/gui/e-day-view.c:3663 calendar/gui/e-week-view.c:3640
 msgid "New Task"
 msgstr "Neue Aufgabe"
 
-#: calendar/gui/e-cal-view.c:1111 calendar/gui/e-cal-view.c:1180
+#: calendar/gui/e-day-view.c:3668 ui/evolution-comp-editor.xml.h:11
+msgid "Print..."
+msgstr "Drucken..."
+
+#: calendar/gui/e-day-view.c:3680 calendar/gui/e-week-view.c:3654
 #: ui/evolution-calendar.xml.h:13
 msgid "Go to _Today"
 msgstr "Zum _heutigen Tag"
 
-#: calendar/gui/e-cal-view.c:1112 calendar/gui/e-cal-view.c:1182
+#: calendar/gui/e-day-view.c:3682 calendar/gui/e-week-view.c:3655
 msgid "_Go to Date..."
 msgstr "_Gehe zu Datum..."
 
-#: calendar/gui/e-cal-view.c:1116 ui/evolution-calendar.xml.h:38
+#: calendar/gui/e-day-view.c:3687 calendar/gui/e-week-view.c:3659
+#: ui/evolution-calendar.xml.h:36
 msgid "_Publish Free/Busy Information"
 msgstr "Ver_fügbarkeitsinformationen veröffentlichen"
 
-#: calendar/gui/e-cal-view.c:1120 calendar/gui/e-cal-view.c:1200
+#: calendar/gui/e-day-view.c:3692 calendar/gui/e-week-view.c:3663
 #: ui/evolution.xml.h:60
 msgid "_Settings..."
 msgstr "_Einstellungen..."
 
-#: calendar/gui/e-cal-view.c:1139
+#: calendar/gui/e-day-view.c:3701 calendar/gui/e-week-view.c:3670
+#: mail/folder-browser.c:1805 ui/evolution-mail-message.xml.h:114
+msgid "_Save As..."
+msgstr "Speichern _unter..."
+
+#: calendar/gui/e-day-view.c:3713 calendar/gui/e-week-view.c:3682
 msgid "_Schedule Meeting..."
 msgstr "Besprechung _ansetzen..."
 
-#: calendar/gui/e-cal-view.c:1140
+#: calendar/gui/e-day-view.c:3714 calendar/gui/e-week-view.c:3683
 msgid "_Forward as iCalendar..."
 msgstr "Als i_Calendar weiterleiten..."
 
-#: calendar/gui/e-cal-view.c:1145
+#: calendar/gui/e-day-view.c:3719 calendar/gui/e-week-view.c:3688
 msgid "Make this Occurrence _Movable"
 msgstr "Dieses Auftreten _beweglich machen"
 
-#: calendar/gui/e-cal-view.c:1146 calendar/gui/e-cal-view.c:1177
+#: calendar/gui/e-day-view.c:3720 calendar/gui/e-week-view.c:3689
 msgid "Delete this _Occurrence"
 msgstr "Dieses _Auftreten löschen"
 
-#: calendar/gui/e-cal-view.c:1147 calendar/gui/e-cal-view.c:1178
+#: calendar/gui/e-day-view.c:3721 calendar/gui/e-week-view.c:3690
 msgid "Delete _All Occurrences"
 msgstr "Jedes _Auftreten löschen"
 
-#. strftime format of a weekday, a date and a time, 24-hour.
-#: calendar/gui/e-cell-date-edit-text.c:118 e-util/e-time-utils.c:180
-#: e-util/e-time-utils.c:393
-msgid "%a %m/%d/%Y %H:%M:%S"
-msgstr "%a, %d. %m %Y %H:%M:%S"
-
-#. strftime format of a weekday, a date and a time, 12-hour.
-#: calendar/gui/e-cell-date-edit-text.c:121 e-util/e-time-utils.c:175
-#: e-util/e-time-utils.c:402
-msgid "%a %m/%d/%Y %I:%M:%S %p"
-msgstr "%a, %d.%m.%Y %I:%M:%S %p"
-
-#: calendar/gui/e-cell-date-edit-text.c:126
-#, c-format
-msgid ""
-"The date must be entered in the format: \n"
-"\n"
-"%s"
-msgstr ""
-"Das Datum muss in diesem Format eingegeben werden: \n"
-"\n"
-"%s"
-
-#. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:600 calendar/gui/e-week-view.c:326
-#: calendar/gui/print.c:809
-msgid "am"
-msgstr "AM"
-
-#. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:603 calendar/gui/e-week-view.c:329
-#: calendar/gui/print.c:811
-msgid "pm"
-msgstr "PM"
-
-#. strftime format %A = full weekday name, %d = day of month,
-#. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view.c:1347 calendar/gui/e-day-view-top-item.c:262
-#: calendar/gui/e-week-view-main-item.c:316 calendar/gui/print.c:1524
-msgid "%A %d %B"
-msgstr "%A, %d. %B"
-
-#. strftime format %d = day of month, %b = abbreviated month name.
-#. Don't use any other specifiers.
-#: calendar/gui/e-day-view.c:1380 calendar/gui/e-day-view-top-item.c:270
-#: calendar/gui/e-week-view-main-item.c:339
-msgid "%d %b"
-msgstr "%d. %b"
-
-#: calendar/gui/e-day-view-time-item.c:532
-#, c-format
-msgid "%02i minute divisions"
-msgstr "%02i Minuten-Unterteilungen"
-
-#: calendar/gui/e-itip-control.c:676
+#: calendar/gui/e-itip-control.c:706
 msgid "Yes. (Complex Recurrence)"
 msgstr "Ja (Komplexe Wiederholung)."
 
-#: calendar/gui/e-itip-control.c:688
+#: calendar/gui/e-itip-control.c:718
 msgid "Every day"
 msgstr "Täglich"
 
-#: calendar/gui/e-itip-control.c:690
+#: calendar/gui/e-itip-control.c:720
 #, c-format
 msgid "Every %d days"
 msgstr "Alle %d Tage"
 
-#: calendar/gui/e-itip-control.c:696
+#: calendar/gui/e-itip-control.c:726
 msgid "Every week"
 msgstr "Wöchentlich"
 
-#: calendar/gui/e-itip-control.c:698
+#: calendar/gui/e-itip-control.c:728
 #, c-format
 msgid "Every %d weeks"
 msgstr "Alle %d Wochen"
 
-#: calendar/gui/e-itip-control.c:701
+#: calendar/gui/e-itip-control.c:731
 msgid "Every week on "
 msgstr "Wöchentlich am "
 
-#: calendar/gui/e-itip-control.c:703
+#: calendar/gui/e-itip-control.c:733
 #, c-format
 msgid "Every %d weeks on "
 msgstr "Alle %d Wochen am "
 
-#: calendar/gui/e-itip-control.c:711
+#: calendar/gui/e-itip-control.c:741
 msgid " and "
 msgstr " und "
 
 # CHECK - muss mit erste(r), zweite(r) usw. übereinstimmen
-#: calendar/gui/e-itip-control.c:718
+#: calendar/gui/e-itip-control.c:748
 #, c-format
 msgid "The %s day of "
 msgstr "%s Tag des "
 
-#: calendar/gui/e-itip-control.c:731
+#: calendar/gui/e-itip-control.c:761
 #, c-format
 msgid "The %s %s of "
 msgstr "%s %s des "
 
-#: calendar/gui/e-itip-control.c:736
+#: calendar/gui/e-itip-control.c:766
 msgid "every month"
 msgstr "monatlich"
 
-#: calendar/gui/e-itip-control.c:741
+#: calendar/gui/e-itip-control.c:771
 #, c-format
 msgid "every %d months"
 msgstr "alle %d Monate"
 
-#: calendar/gui/e-itip-control.c:747
+#: calendar/gui/e-itip-control.c:777
 msgid "Every year"
 msgstr "Jährlich"
 
-#: calendar/gui/e-itip-control.c:749
+#: calendar/gui/e-itip-control.c:779
 #, c-format
 msgid "Every %d years"
 msgstr "Alle %d Jahre"
 
-#: calendar/gui/e-itip-control.c:761
+#: calendar/gui/e-itip-control.c:791
 #, c-format
 msgid " a total of %d times"
 msgstr " insgesamt %d Mal"
 
 # CHECK
-#: calendar/gui/e-itip-control.c:769
+#: calendar/gui/e-itip-control.c:799
 msgid ", ending on "
 msgstr ", endet am "
 
-#: calendar/gui/e-itip-control.c:793
+#: calendar/gui/e-itip-control.c:823
 msgid "<b>Starts:</b> "
 msgstr "<b>Beginnt:</b> "
 
-#: calendar/gui/e-itip-control.c:803
+#: calendar/gui/e-itip-control.c:833
 msgid "<b>Ends:</b> "
 msgstr "<b>Endet:</b>"
 
-#: calendar/gui/e-itip-control.c:823
+#: calendar/gui/e-itip-control.c:853
 msgid "<b>Completed:</b> "
 msgstr "<b>Abgeschlossen:</b>"
 
-#: calendar/gui/e-itip-control.c:833
+#: calendar/gui/e-itip-control.c:863
 msgid "<b>Due:</b> "
 msgstr "<b>Fällig:</b>"
 
-#: calendar/gui/e-itip-control.c:870 calendar/gui/e-itip-control.c:923
+#: calendar/gui/e-itip-control.c:900 calendar/gui/e-itip-control.c:953
 msgid "iCalendar Information"
 msgstr "iCalendar-Informationen"
 
 #. Title
-#: calendar/gui/e-itip-control.c:885
+#: calendar/gui/e-itip-control.c:915
 msgid "iCalendar Error"
 msgstr "iCalendar-Fehler"
 
-#: calendar/gui/e-itip-control.c:954 calendar/gui/e-itip-control.c:970
-#: calendar/gui/e-itip-control.c:981 calendar/gui/e-itip-control.c:998
+#: calendar/gui/e-itip-control.c:984 calendar/gui/e-itip-control.c:1000
+#: calendar/gui/e-itip-control.c:1011 calendar/gui/e-itip-control.c:1028
 msgid "An unknown person"
 msgstr "Eine unbekannte Person"
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:1005
+#: calendar/gui/e-itip-control.c:1035
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
@@ -5651,336 +5655,343 @@ msgstr ""
 "<br> Bitte sehen Sie sich die folgenden Informationen noch einmal an und "
 "wählen Sie dann eine Aktion aus dem Menü unten aus."
 
-#: calendar/gui/e-itip-control.c:1020
+#: calendar/gui/e-itip-control.c:1050
 msgid "<i>None</i>"
 msgstr "<i>Keine</i>"
 
-#: calendar/gui/e-itip-control.c:1031
+#: calendar/gui/e-itip-control.c:1061
 msgid "Location:"
 msgstr "Standort: "
 
 #. write status
-#: calendar/gui/e-itip-control.c:1045 calendar/gui/e-tasks.c:243
+#: calendar/gui/e-itip-control.c:1075 calendar/gui/e-tasks.c:243
 msgid "Status:"
 msgstr "Status:"
 
-#: calendar/gui/e-itip-control.c:1050 calendar/gui/itip-utils.c:414
+#: calendar/gui/e-itip-control.c:1080 calendar/gui/e-meeting-model.c:286
+#: calendar/gui/e-meeting-model.c:309 calendar/gui/e-meeting-model.c:798
+#: calendar/gui/itip-utils.c:414
 msgid "Accepted"
 msgstr "Angenommen"
 
-#: calendar/gui/e-itip-control.c:1054 calendar/gui/itip-utils.c:417
+#: calendar/gui/e-itip-control.c:1084 calendar/gui/itip-utils.c:417
 msgid "Tentatively Accepted"
 msgstr "Vorläufig angenommen"
 
-#: calendar/gui/e-itip-control.c:1058 calendar/gui/itip-utils.c:420
-#: calendar/gui/itip-utils.c:446
+#: calendar/gui/e-itip-control.c:1088 calendar/gui/e-meeting-model.c:288
+#: calendar/gui/e-meeting-model.c:311 calendar/gui/e-meeting-model.c:799
+#: calendar/gui/itip-utils.c:420 calendar/gui/itip-utils.c:446
 msgid "Declined"
 msgstr "Abgelehnt"
 
-#: calendar/gui/e-itip-control.c:1117 calendar/gui/e-itip-control.c:1145
-#: calendar/gui/e-itip-control.c:1171 calendar/gui/e-itip-control.c:1184
-#: calendar/gui/e-itip-control.c:1197 calendar/gui/e-itip-control.c:1210
+#: calendar/gui/e-itip-control.c:1092 calendar/gui/e-itip-control.c:1300
+#: calendar/gui/e-meeting-model.c:222 calendar/gui/e-meeting-model.c:257
+#: calendar/gui/e-meeting-model.c:322 calendar/gui/e-meeting-model.c:756
+#: calendar/gui/e-meeting-model.c:772 camel/camel-gpg-context.c:1574
+#: camel/camel-gpg-context.c:1625 camel/camel-tcp-stream-openssl.c:631
+#: camel/providers/smtp/camel-smtp-transport.c:172
+#: camel/providers/smtp/camel-smtp-transport.c:227 mail/folder-browser.c:347
+#: mail/mail-display.c:928 widgets/misc/e-charset-picker.c:60
+msgid "Unknown"
+msgstr "Unbekannt"
+
+#: calendar/gui/e-itip-control.c:1147 calendar/gui/e-itip-control.c:1175
+#: calendar/gui/e-itip-control.c:1201 calendar/gui/e-itip-control.c:1214
+#: calendar/gui/e-itip-control.c:1227 calendar/gui/e-itip-control.c:1240
 msgid "Choose an action:"
 msgstr "Eine Aktion wählen:"
 
-#: calendar/gui/e-itip-control.c:1118
+#: calendar/gui/e-itip-control.c:1148
 msgid "Update"
 msgstr "Aktualisieren"
 
-#: calendar/gui/e-itip-control.c:1119 calendar/gui/e-itip-control.c:1150
-#: calendar/gui/e-itip-control.c:1173 calendar/gui/e-itip-control.c:1186
-#: calendar/gui/e-itip-control.c:1199 calendar/gui/e-itip-control.c:1212
+#: calendar/gui/e-itip-control.c:1149 calendar/gui/e-itip-control.c:1180
+#: calendar/gui/e-itip-control.c:1203 calendar/gui/e-itip-control.c:1216
+#: calendar/gui/e-itip-control.c:1229 calendar/gui/e-itip-control.c:1242
 #: shell/e-shell.c:2067 widgets/misc/e-cell-date-edit.c:265
 msgid "OK"
 msgstr "OK"
 
-#: calendar/gui/e-itip-control.c:1146
+#: calendar/gui/e-itip-control.c:1176
 msgid "Accept"
 msgstr "Annehmen"
 
-#: calendar/gui/e-itip-control.c:1147
+#: calendar/gui/e-itip-control.c:1177
 msgid "Tentatively accept"
 msgstr "Vorläufig annehmen"
 
-#: calendar/gui/e-itip-control.c:1148
+#: calendar/gui/e-itip-control.c:1178
 msgid "Decline"
 msgstr "Ablehnen"
 
-#: calendar/gui/e-itip-control.c:1149
-#: calendar/gui/e-meeting-time-sel.etspec.h:8
-msgid "RSVP"
-msgstr "UAwg"
-
-#: calendar/gui/e-itip-control.c:1172
+#: calendar/gui/e-itip-control.c:1202
 msgid "Send Free/Busy Information"
 msgstr "Verfügbarkeitsinformationen übermitteln"
 
-#: calendar/gui/e-itip-control.c:1185
+#: calendar/gui/e-itip-control.c:1215
 msgid "Update respondent status"
 msgstr "Status des Antwortenden aktualisieren"
 
-#: calendar/gui/e-itip-control.c:1198
+#: calendar/gui/e-itip-control.c:1228
 msgid "Send Latest Information"
 msgstr "Neueste Informationen übermitteln"
 
-#: calendar/gui/e-itip-control.c:1211 calendar/gui/itip-utils.c:434
-#: mail/mail-send-recv.c:388 mail/mail-send-recv.c:440
-#: shell/e-shell-startup-wizard.c:781 shell/evolution-shell-component.c:1185
-#: ui/evolution-mail-global.xml.h:1
+#: calendar/gui/e-itip-control.c:1241 calendar/gui/itip-utils.c:434
+#: mail/mail-send-recv.c:387 mail/mail-send-recv.c:444
+#: shell/evolution-shell-component.c:1185 ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Abbrechen"
 
-#: calendar/gui/e-itip-control.c:1300
+#: calendar/gui/e-itip-control.c:1322
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "<b>%s</b> hat Besprechungsinformationen veröffentlicht."
 
-#: calendar/gui/e-itip-control.c:1301
+#: calendar/gui/e-itip-control.c:1323
 msgid "Meeting Information"
 msgstr "Besprechungsinformationen"
 
-#: calendar/gui/e-itip-control.c:1306
+#: calendar/gui/e-itip-control.c:1328
 #, c-format
 msgid "<b>%s</b> requests the presence of %s at a meeting."
 msgstr "<b>%s</b> wünscht die Anwesenheit von %s bei einer Besprechung"
 
-#: calendar/gui/e-itip-control.c:1308
+#: calendar/gui/e-itip-control.c:1330
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr "<b>%s</b> wünscht Ihre Anwesenheit bei einer Besprechung"
 
-#: calendar/gui/e-itip-control.c:1309
+#: calendar/gui/e-itip-control.c:1331
 msgid "Meeting Proposal"
 msgstr "Besprechungsvorschlag"
 
-#: calendar/gui/e-itip-control.c:1313
+#: calendar/gui/e-itip-control.c:1335
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr "<b>%s</b> wünscht zu einer vorhandenen Besprechung hinzuzufügen"
 
-#: calendar/gui/e-itip-control.c:1314
+#: calendar/gui/e-itip-control.c:1336
 msgid "Meeting Update"
 msgstr "Besprechungsaktualisierung"
 
-#: calendar/gui/e-itip-control.c:1318
+#: calendar/gui/e-itip-control.c:1340
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr "<b>%s</b> wünscht aktuelle Besprechungsinformationen zu erhalten."
 
-#: calendar/gui/e-itip-control.c:1319
+#: calendar/gui/e-itip-control.c:1341
 msgid "Meeting Update Request"
 msgstr "Besprechungs-Aktualisierungsanfrage"
 
-#: calendar/gui/e-itip-control.c:1326
+#: calendar/gui/e-itip-control.c:1348
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr "<b>%s</b> hat auf eine Besprechungsanfrage geantwortet."
 
-#: calendar/gui/e-itip-control.c:1327
+#: calendar/gui/e-itip-control.c:1349
 msgid "Meeting Reply"
 msgstr "Besprechungsantwort"
 
-#: calendar/gui/e-itip-control.c:1334
+#: calendar/gui/e-itip-control.c:1356
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr "<b>%s</b> hat eine Besprechung widerrufen."
 
-#: calendar/gui/e-itip-control.c:1335
+#: calendar/gui/e-itip-control.c:1357
 msgid "Meeting Cancellation"
 msgstr "Besprechungswiderruf"
 
-#: calendar/gui/e-itip-control.c:1342 calendar/gui/e-itip-control.c:1409
-#: calendar/gui/e-itip-control.c:1444
+#: calendar/gui/e-itip-control.c:1364 calendar/gui/e-itip-control.c:1431
+#: calendar/gui/e-itip-control.c:1466
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr "<b>%s</b> hat eine unverständliche Nachricht verschickt."
 
-#: calendar/gui/e-itip-control.c:1343
+#: calendar/gui/e-itip-control.c:1365
 msgid "Bad Meeting Message"
 msgstr "Fehlerhafte Besprechungsmitteilung"
 
-#: calendar/gui/e-itip-control.c:1367
+#: calendar/gui/e-itip-control.c:1389
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr "<b>%s</b> hat Aufgabeninformationen veröffentlicht."
 
-#: calendar/gui/e-itip-control.c:1368
+#: calendar/gui/e-itip-control.c:1390
 msgid "Task Information"
 msgstr "Aufgabeninformationen"
 
-#: calendar/gui/e-itip-control.c:1373
+#: calendar/gui/e-itip-control.c:1395
 #, c-format
 msgid "<b>%s</b> requests %s to perform a task."
 msgstr "<b>%s</b> fordert %s auf, eine Aufgabe auszuführen."
 
-#: calendar/gui/e-itip-control.c:1375
+#: calendar/gui/e-itip-control.c:1397
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr "<b>%s</b> fordert Sie auf eine Aufgabe auszuführen."
 
-#: calendar/gui/e-itip-control.c:1376
+#: calendar/gui/e-itip-control.c:1398
 msgid "Task Proposal"
 msgstr "Aufgabenvorschlag"
 
-#: calendar/gui/e-itip-control.c:1380
+#: calendar/gui/e-itip-control.c:1402
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task."
 msgstr "<b>%s</b> wünscht zu einer bestehenden Aufgabe hinzuzufügen."
 
-#: calendar/gui/e-itip-control.c:1381
+#: calendar/gui/e-itip-control.c:1403
 msgid "Task Update"
 msgstr "Aufgabenaktualisierung"
 
-#: calendar/gui/e-itip-control.c:1385
+#: calendar/gui/e-itip-control.c:1407
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr "<b>%s</b> wünscht letzte Aufgabeninformationen zu erhalten."
 
-#: calendar/gui/e-itip-control.c:1386
+#: calendar/gui/e-itip-control.c:1408
 msgid "Task Update Request"
 msgstr "Aufgaben-Aktualisierungsanfrage"
 
-#: calendar/gui/e-itip-control.c:1393
+#: calendar/gui/e-itip-control.c:1415
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr "<b>%s</b> hat auf eine Aufgabenzuweisung geantwortet."
 
-#: calendar/gui/e-itip-control.c:1394
+#: calendar/gui/e-itip-control.c:1416
 msgid "Task Reply"
 msgstr "Aufgaben-Antwort"
 
-#: calendar/gui/e-itip-control.c:1401
+#: calendar/gui/e-itip-control.c:1423
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr "<b>%s</b> hat eine Aufgabe widerrufen."
 
-#: calendar/gui/e-itip-control.c:1402
+#: calendar/gui/e-itip-control.c:1424
 msgid "Task Cancellation"
 msgstr "Aufgabenwiderruf"
 
-#: calendar/gui/e-itip-control.c:1410
+#: calendar/gui/e-itip-control.c:1432
 msgid "Bad Task Message"
 msgstr "Fehlerhafte Aufgabenmitteilung"
 
-#: calendar/gui/e-itip-control.c:1429
+#: calendar/gui/e-itip-control.c:1451
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr "<b>%s</b> hat Verfügbarkeitsinformationen veröffentlicht."
 
-#: calendar/gui/e-itip-control.c:1430
+#: calendar/gui/e-itip-control.c:1452
 msgid "Free/Busy Information"
 msgstr "Verfügbarkeitsinformationen"
 
-#: calendar/gui/e-itip-control.c:1434
+#: calendar/gui/e-itip-control.c:1456
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr "<b>%s</b> fordert Ihre Verfügbarkeitsinformationen an."
 
-#: calendar/gui/e-itip-control.c:1435
+#: calendar/gui/e-itip-control.c:1457
 msgid "Free/Busy Request"
 msgstr "Verfügbarkeitsanfrage"
 
-#: calendar/gui/e-itip-control.c:1439
+#: calendar/gui/e-itip-control.c:1461
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr "<b>%s</b> hat auf eine Verfugbarkeitsanfrage geantwortet."
 
-#: calendar/gui/e-itip-control.c:1440
+#: calendar/gui/e-itip-control.c:1462
 msgid "Free/Busy Reply"
 msgstr "Verfügbarkeitsantwort"
 
-#: calendar/gui/e-itip-control.c:1445
+#: calendar/gui/e-itip-control.c:1467
 msgid "Bad Free/Busy Message"
 msgstr "Fehlerhafte Verfügbarkeitsmitteilung"
 
-#: calendar/gui/e-itip-control.c:1521
+#: calendar/gui/e-itip-control.c:1543
 msgid "The message does not appear to be properly formed"
 msgstr "Diese Nachricht scheint falsch formatiert zu sein"
 
-#: calendar/gui/e-itip-control.c:1584
+#: calendar/gui/e-itip-control.c:1606
 msgid "The message contains only unsupported requests."
 msgstr "Diese Nachricht enthält ausschließlich nicht unterstützte Anfragen."
 
-#: calendar/gui/e-itip-control.c:1615 calendar/gui/e-itip-control.c:1621
+#: calendar/gui/e-itip-control.c:1637 calendar/gui/e-itip-control.c:1643
 msgid "The attachment does not contain a valid calendar message"
 msgstr "Die Anlage enthält keine gültige Kalendernachricht"
 
-#: calendar/gui/e-itip-control.c:1646
+#: calendar/gui/e-itip-control.c:1668
 msgid "The attachment has no viewable calendar items"
 msgstr "Die Anlage hat keine anzeigbaren Kalenderinformationen"
 
-#: calendar/gui/e-itip-control.c:1887 calendar/gui/e-itip-control.c:1948
-#: calendar/gui/e-itip-control.c:1986
+#: calendar/gui/e-itip-control.c:1909 calendar/gui/e-itip-control.c:2001
 msgid "Object is invalid and cannot be updated\n"
 msgstr "Objekt ist ungültig und konnte nicht aktualisiert werden\n"
 
-#: calendar/gui/e-itip-control.c:1890 calendar/gui/e-itip-control.c:1989
+#: calendar/gui/e-itip-control.c:1912 calendar/gui/e-itip-control.c:2004
 msgid "There was an error on the CORBA system\n"
 msgstr "Es trat ein Fehler im CORBA-System auf\n"
 
-#: calendar/gui/e-itip-control.c:1893 calendar/gui/e-itip-control.c:1992
+#: calendar/gui/e-itip-control.c:1915 calendar/gui/e-itip-control.c:2007
 msgid "Object could not be found\n"
 msgstr "Objekt konnte nicht gefunden werden\n"
 
-#: calendar/gui/e-itip-control.c:1896
+#: calendar/gui/e-itip-control.c:1918
 msgid "You do not have the right permissions to update the calendar\n"
 msgstr ""
 "Sie haben nicht die nötige Berechtigung, um den Kalender zu aktualisieren\n"
 
-#: calendar/gui/e-itip-control.c:1899
+#: calendar/gui/e-itip-control.c:1921
 msgid "Update complete\n"
 msgstr "Aktualisierung abgeschlossen\n"
 
-#: calendar/gui/e-itip-control.c:1902
+#: calendar/gui/e-itip-control.c:1924
 msgid "Calendar file could not be updated!\n"
 msgstr "Kalenderdatei konnte nicht aktualisiert werden!\n"
 
-#: calendar/gui/e-itip-control.c:1932 calendar/gui/e-itip-control.c:2004
+#: calendar/gui/e-itip-control.c:1953 calendar/gui/e-itip-control.c:2019
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 "Anwesenheitsstatus konnte nicht aktualisiert werden, da der Eintrag nicht "
 "mehr existiert"
 
-#: calendar/gui/e-itip-control.c:1958
+#: calendar/gui/e-itip-control.c:1974
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr "Diese Antwort ist von keinem Teilnehmer.  Als Teilnehmer hinzufügen?"
 
-#: calendar/gui/e-itip-control.c:1970
+#: calendar/gui/e-itip-control.c:1986
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr ""
 "Anwesenheitsstatus konnte auf Grund eines ungültigen Status nicht "
 "aktualisiert werden!\n"
 
-#: calendar/gui/e-itip-control.c:1995
+#: calendar/gui/e-itip-control.c:2010
 msgid "You don't have the right permissions to update the calendar\n"
 msgstr ""
 "Sie haben nicht die nötige Berechtigung, um den Kalender zu aktualisieren\n"
 
-#: calendar/gui/e-itip-control.c:1998
+#: calendar/gui/e-itip-control.c:2013
 msgid "Attendee status updated\n"
 msgstr "Anwesenheitsstatus aktualisiert\n"
 
-#: calendar/gui/e-itip-control.c:2001
+#: calendar/gui/e-itip-control.c:2016
 msgid "Attendee status could not be updated!\n"
 msgstr "Teilnehmerstatus konnte nicht aktualisiert werden!\n"
 
-#: calendar/gui/e-itip-control.c:2038
+#: calendar/gui/e-itip-control.c:2053
 msgid "Removal Complete"
 msgstr "Entfernen abgeschlossen"
 
-#: calendar/gui/e-itip-control.c:2070 calendar/gui/e-itip-control.c:2120
+#: calendar/gui/e-itip-control.c:2085 calendar/gui/e-itip-control.c:2135
 msgid "Item sent!\n"
 msgstr "Eintrag verschickt!\n"
 
-#: calendar/gui/e-itip-control.c:2072 calendar/gui/e-itip-control.c:2124
+#: calendar/gui/e-itip-control.c:2087 calendar/gui/e-itip-control.c:2139
 msgid "The item could not be sent!\n"
 msgstr "Der Eintrag konnte nicht verschickt werden!\n"
 
-#: calendar/gui/e-itip-control.c:2215
+#: calendar/gui/e-itip-control.c:2212
 msgid "Select Calendar Folder"
 msgstr "Ordner für Kalender wählen"
 
-#: calendar/gui/e-itip-control.c:2221
+#: calendar/gui/e-itip-control.c:2219
 msgid "Select Tasks Folder"
 msgstr "Ordner für Aufgaben wählen"
 
@@ -6021,124 +6032,163 @@ msgstr "datum-ende"
 msgid "date-start"
 msgstr "datum-anfang"
 
-#: calendar/gui/e-meeting-time-sel.c:392
+#: calendar/gui/e-meeting-model.c:79
+msgid "Chair Persons"
+msgstr "Vorsitzende"
+
+#: calendar/gui/e-meeting-model.c:80 calendar/gui/e-meeting-model.c:1636
+msgid "Required Participants"
+msgstr "Benötigte Teilnehmer"
+
+#: calendar/gui/e-meeting-model.c:81
+msgid "Optional Participants"
+msgstr "Optionale Teilnehmer"
+
+#: calendar/gui/e-meeting-model.c:82
+msgid "Resources"
+msgstr "Ressourcen"
+
+#: calendar/gui/e-meeting-model.c:197 calendar/gui/e-meeting-model.c:214
+#: calendar/gui/e-meeting-model.c:530 calendar/gui/e-meeting-model.c:752
+msgid "Individual"
+msgstr "Individuell"
+
+#: calendar/gui/e-meeting-model.c:199 calendar/gui/e-meeting-model.c:216
+#: calendar/gui/e-meeting-model.c:753
+msgid "Group"
+msgstr "Gruppe"
+
+#: calendar/gui/e-meeting-model.c:201 calendar/gui/e-meeting-model.c:218
+#: calendar/gui/e-meeting-model.c:754
+msgid "Resource"
+msgstr "Ressource"
+
+#: calendar/gui/e-meeting-model.c:203 calendar/gui/e-meeting-model.c:220
+#: calendar/gui/e-meeting-model.c:755
+msgid "Room"
+msgstr "Raum"
+
+#: calendar/gui/e-meeting-model.c:232 calendar/gui/e-meeting-model.c:249
+#: calendar/gui/e-meeting-model.c:768
+msgid "Chair"
+msgstr "Vorsitzender"
+
+#: calendar/gui/e-meeting-model.c:234 calendar/gui/e-meeting-model.c:251
+#: calendar/gui/e-meeting-model.c:532 calendar/gui/e-meeting-model.c:769
+msgid "Required Participant"
+msgstr "Benötigter Teilnehmer"
+
+#: calendar/gui/e-meeting-model.c:236 calendar/gui/e-meeting-model.c:253
+#: calendar/gui/e-meeting-model.c:770
+msgid "Optional Participant"
+msgstr "Optionaler Teilnehmer"
+
+#: calendar/gui/e-meeting-model.c:238 calendar/gui/e-meeting-model.c:255
+#: calendar/gui/e-meeting-model.c:771
+msgid "Non-Participant"
+msgstr "Nicht-Teilnehmer"
+
+#: calendar/gui/e-meeting-model.c:284 calendar/gui/e-meeting-model.c:307
+#: calendar/gui/e-meeting-model.c:540 calendar/gui/e-meeting-model.c:797
+msgid "Needs Action"
+msgstr "Erfordert Maßnahme"
+
+#: calendar/gui/e-meeting-model.c:290 calendar/gui/e-meeting-model.c:313
+#: calendar/gui/e-meeting-model.c:800 calendar/gui/e-meeting-time-sel.c:405
 msgid "Tentative"
 msgstr "Vorläufig"
 
-#: calendar/gui/e-meeting-time-sel.c:394 designs/OOA/ooa.glade.h:11
+#: calendar/gui/e-meeting-model.c:292 calendar/gui/e-meeting-model.c:315
+#: calendar/gui/e-meeting-model.c:801
+msgid "Delegated"
+msgstr "Delegiert"
+
+#: calendar/gui/e-meeting-model.c:296 calendar/gui/e-meeting-model.c:319
+msgid "In Process"
+msgstr "In Bearbeitung"
+
+#. This is a strftime() format string %A = full weekday name,
+#. %B = full month name, %d = month day, %Y = full year.
+#: calendar/gui/e-meeting-time-sel-item.c:458
+#: calendar/gui/e-meeting-time-sel.c:2098
+msgid "%A, %B %d, %Y"
+msgstr "%a, %d. %B %Y"
+
+#. This is a strftime() format string %a = abbreviated weekday
+#. name, %m = month number, %d = month day, %Y = full year.
+#: calendar/gui/e-meeting-time-sel-item.c:462
+#: calendar/gui/e-meeting-time-sel.c:2131 e-util/e-time-utils.c:190
+#: e-util/e-time-utils.c:283 e-util/e-time-utils.c:371
+msgid "%a %m/%d/%Y"
+msgstr "%a, %d.%m.%Y"
+
+#. This is a strftime() format string %m = month number,
+#. %d = month day, %Y = full year.
+#: calendar/gui/e-meeting-time-sel-item.c:466 e-util/e-time-utils.c:225
+#: e-util/e-time-utils.c:286 widgets/misc/e-dateedit.c:1593
+msgid "%m/%d/%Y"
+msgstr "%d.%m.%Y"
+
+#: calendar/gui/e-meeting-time-sel.c:407 designs/OOA/ooa.glade.h:11
 msgid "Out of Office"
 msgstr "Außer Haus"
 
-#: calendar/gui/e-meeting-time-sel.c:395
+#: calendar/gui/e-meeting-time-sel.c:408
 msgid "No Information"
 msgstr "Keine Information"
 
-#: calendar/gui/e-meeting-time-sel.c:434
+#: calendar/gui/e-meeting-time-sel.c:447
 msgid "_Options"
 msgstr "Optionen"
 
-#: calendar/gui/e-meeting-time-sel.c:451
+#: calendar/gui/e-meeting-time-sel.c:464
 msgid "Show _Only Working Hours"
 msgstr "Nur Arbeitszeit anzeigen"
 
-#: calendar/gui/e-meeting-time-sel.c:461
+#: calendar/gui/e-meeting-time-sel.c:474
 msgid "Show _Zoomed Out"
 msgstr "Weggezoomt anzeigen"
 
-#: calendar/gui/e-meeting-time-sel.c:476
+#: calendar/gui/e-meeting-time-sel.c:489
 msgid "_Update Free/Busy"
 msgstr "Verfügbarkeit _aktualisieren"
 
-#: calendar/gui/e-meeting-time-sel.c:491
+#: calendar/gui/e-meeting-time-sel.c:504
 msgid "_<<"
 msgstr "<<"
 
-#: calendar/gui/e-meeting-time-sel.c:509
+#: calendar/gui/e-meeting-time-sel.c:522
 msgid "_Autopick"
 msgstr "AutoWahl"
 
-#: calendar/gui/e-meeting-time-sel.c:524
+#: calendar/gui/e-meeting-time-sel.c:537
 msgid ">_>"
 msgstr ">>"
 
-#: calendar/gui/e-meeting-time-sel.c:541
+#: calendar/gui/e-meeting-time-sel.c:554
 msgid "_All People and Resources"
 msgstr "Alle Leute und Ressourcen"
 
-#: calendar/gui/e-meeting-time-sel.c:550
+#: calendar/gui/e-meeting-time-sel.c:563
 msgid "All _People and One Resource"
 msgstr "Alle Leute und eine Ressource"
 
-#: calendar/gui/e-meeting-time-sel.c:559
+#: calendar/gui/e-meeting-time-sel.c:572
 msgid "_Required People"
 msgstr "Benötigte Leute"
 
-#: calendar/gui/e-meeting-time-sel.c:568
+#: calendar/gui/e-meeting-time-sel.c:581
 msgid "Required People and _One Resource"
 msgstr "Benötigte Leute und eine Ressource"
 
-#: calendar/gui/e-meeting-time-sel.c:587
+#: calendar/gui/e-meeting-time-sel.c:600
 msgid "Meeting _start time:"
 msgstr "Anfang der Besprechung:"
 
-#: calendar/gui/e-meeting-time-sel.c:607
+#: calendar/gui/e-meeting-time-sel.c:620
 msgid "Meeting _end time:"
 msgstr "Ende der Besprechung:"
 
-#. This is a strftime() format string %A = full weekday name,
-#. %B = full month name, %d = month day, %Y = full year.
-#: calendar/gui/e-meeting-time-sel.c:2054
-#: calendar/gui/e-meeting-time-sel-item.c:452
-msgid "%A, %B %d, %Y"
-msgstr "%a, %d. %B %Y"
-
-#. This is a strftime() format string %a = abbreviated weekday name,
-#. %m = month number, %d = month day, %Y = full year.
-#: calendar/gui/e-meeting-time-sel.c:2087
-#: calendar/gui/e-meeting-time-sel-item.c:456 e-util/e-time-utils.c:203
-#: e-util/e-time-utils.c:296 e-util/e-time-utils.c:384
-msgid "%a %m/%d/%Y"
-msgstr "%a, %d.%m.%Y"
-
-#: calendar/gui/e-meeting-time-sel.etspec.h:1
-msgid "Attendee"
-msgstr "Anwesender"
-
-#: calendar/gui/e-meeting-time-sel.etspec.h:2
-msgid "Click here to add an attendee"
-msgstr "Klicken Sie hier, um einen Teilnehmer hinzuzufügen"
-
-#: calendar/gui/e-meeting-time-sel.etspec.h:3
-msgid "Common Name"
-msgstr "Gemeinsamer Name"
-
-#: calendar/gui/e-meeting-time-sel.etspec.h:4
-msgid "Delegated From"
-msgstr "Delegiert durch"
-
-#: calendar/gui/e-meeting-time-sel.etspec.h:5
-msgid "Delegated To"
-msgstr "Delegiert an"
-
-#: calendar/gui/e-meeting-time-sel.etspec.h:6
-msgid "Language"
-msgstr "Sprache"
-
-#: calendar/gui/e-meeting-time-sel.etspec.h:7
-msgid "Member"
-msgstr "Mitglied"
-
-#. This is a strftime() format string %m = month number,
-#. %d = month day, %Y = full year.
-#: calendar/gui/e-meeting-time-sel-item.c:460 e-util/e-time-utils.c:238
-#: e-util/e-time-utils.c:299 widgets/misc/e-dateedit.c:1607
-msgid "%m/%d/%Y"
-msgstr "%d.%m.%Y"
-
-#: calendar/gui/e-tasks.c:151
-msgid "invalid time"
-msgstr "ungültige Zeit"
-
 #: calendar/gui/e-tasks.c:221
 msgid "Start Date:"
 msgstr "Anfangsdatum:"
@@ -6157,7 +6207,8 @@ msgstr "Priorität:"
 msgid "Web Page:"
 msgstr "Website:"
 
-#: calendar/gui/e-tasks.c:702
+#: calendar/gui/e-tasks.c:702 calendar/gui/gnome-cal.c:2210
+#: calendar/gui/gnome-cal.c:2221
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Aufgaben bei %s werden geöffnet"
@@ -6172,12 +6223,12 @@ msgstr "Die Aufgaben in »%s« konnten nicht geladen werden"
 msgid "The method required to load `%s' is not supported"
 msgstr "Die zum Laden von »%s« erfoderliche Methode wird nicht unterstützt"
 
-#: calendar/gui/e-tasks.c:760 calendar/gui/gnome-cal.c:1730
+#: calendar/gui/e-tasks.c:760 calendar/gui/gnome-cal.c:1713
 #, c-format
 msgid "You don't have permission to open the folder in `%s'"
 msgstr "Sie haben keine Berechtigung den Ordner in »%s« zu öffnen"
 
-#: calendar/gui/e-tasks.c:828 calendar/gui/gnome-cal.c:1944
+#: calendar/gui/e-tasks.c:828 calendar/gui/gnome-cal.c:1932
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -6198,101 +6249,67 @@ msgstr "Gewählte Objekte werden gelöscht..."
 msgid "Expunging"
 msgstr "Wird gesäubert"
 
-#: calendar/gui/gnome-cal.c:1702
+#: calendar/gui/e-week-view.c:3637
+msgid "New _Appointment..."
+msgstr "Neuer _Termin..."
+
+#: calendar/gui/gnome-cal.c:1685
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr "Der Ordner in »%s« konnte nicht geöffnet werden"
 
-#: calendar/gui/gnome-cal.c:1716
+#: calendar/gui/gnome-cal.c:1699
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr "Die zum Öffnen von »%s« erforderliche Methode wird nicht unterstützt"
 
-#: calendar/gui/gnome-cal.c:1772
+#: calendar/gui/gnome-cal.c:1760
 #, c-format
 msgid "Adding alarms for %s"
 msgstr "Alarme für %s werden hinzugefügt"
 
-#: calendar/gui/gnome-cal.c:1964
+#: calendar/gui/gnome-cal.c:1952
 #, c-format
 msgid ""
-"The task backend for\n"
+"The calendar backend for\n"
 "%s\n"
 " has crashed. You will have to restart Evolution in order to use it again"
 msgstr ""
-"Die Aufgaben-Hintegrundkomponente für\n"
+"Die Kalender-Hintegrundkomponente für\n"
 "%s\n"
 "ist abgestürzt. Sie müssen Evolution neu starten, um sie wieder verwenden zu "
 "können"
 
-#: calendar/gui/gnome-cal.c:1970
+#: calendar/gui/gnome-cal.c:1961
 #, c-format
 msgid ""
-"The calendar backend for\n"
+"The task backend for\n"
 "%s\n"
 " has crashed. You will have to restart Evolution in order to use it again"
 msgstr ""
-"Die Kalender-Hintegrundkomponente für\n"
+"Die Aufgaben-Hintegrundkomponente für\n"
 "%s\n"
 "ist abgestürzt. Sie müssen Evolution neu starten, um sie wieder verwenden zu "
 "können"
 
-#: calendar/gui/gnome-cal.c:2176
+#: calendar/gui/gnome-cal.c:2192
 #, c-format
 msgid "Opening calendar at %s"
 msgstr "Kalender bei %s wird geöffnet"
 
-#: calendar/gui/gnome-cal.c:2197
+#: calendar/gui/gnome-cal.c:2232
 msgid "Opening default tasks folder"
 msgstr "Vorgabe-Aufgabenordner wird geöffnet"
 
-#: calendar/gui/gnome-cal.c:3094
+#: calendar/gui/gnome-cal.c:3156
 #, c-format
 msgid "Purging event %s"
 msgstr "Ereignis %s wird entfernt"
 
-#: calendar/gui/gnome-cal.c:3178
+#: calendar/gui/gnome-cal.c:3237
 msgid "Purging"
 msgstr "Entfernen"
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-msgid "Calendar and Tasks"
-msgstr "Kalender und Aufgaben"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-msgid "Configure your timezone, Calendar and Task List here "
-msgstr ""
-"Hier können Sie Ihre Zeitzone, den Kalender und die Aufgabenliste "
-"konfigurieren"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
-msgid "Evolution Calendar and Tasks"
-msgstr "Evolution Kalender und Aufgaben"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
-msgid "Evolution Calendar and Tasks component"
-msgstr "Evolution-Komponente für Kalender und Aufgaben"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
-msgid "Evolution Calendar configuration control"
-msgstr "Bedienelement zur Konfiguration des Evolution-Kalenders"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
-msgid "Evolution Calendar scheduling message viewer"
-msgstr "Evolution-Kalender-Terminplan-Nachrichtenbetrachter"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
-msgid "Evolution Calendar viewer"
-msgstr "Evolution-Kalenderbetrachter"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
-msgid "Evolution Calendar/Task editor"
-msgstr "Evolution-Kalender/Aufgaben-Editor"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
-msgid "Evolution Tasks viewer"
-msgstr "Evolution-Aufgabenbetrachter"
-
 #: calendar/gui/goto-dialog.glade.h:1
 msgid "April"
 msgstr "April"
@@ -6400,7 +6417,7 @@ msgstr "Verfügbarkeitsinformationen (%s bis %s)"
 msgid "iCalendar information"
 msgstr "iCalendar-Informationen"
 
-#: calendar/gui/itip-utils.c:668
+#: calendar/gui/itip-utils.c:667
 msgid "You must be an attendee of the event."
 msgstr "Sie müssen ein Teilnehmer des Ereignisses sein."
 
@@ -6433,81 +6450,82 @@ msgid "Sa"
 msgstr "Sa"
 
 #. Day
-#: calendar/gui/print.c:1882
+#: calendar/gui/print.c:1875
 msgid "Selected day (%a %b %d %Y)"
 msgstr "Gewählter Tag (%a, %d. %b %Y)"
 
-#: calendar/gui/print.c:1907 calendar/gui/print.c:1911
+#: calendar/gui/print.c:1900 calendar/gui/print.c:1904
 msgid "%a %b %d"
 msgstr "%a, %d. %b"
 
-#: calendar/gui/print.c:1908
+#: calendar/gui/print.c:1901
 msgid "%a %d %Y"
 msgstr "%a, %d. %Y"
 
-#: calendar/gui/print.c:1912 calendar/gui/print.c:1914
-#: calendar/gui/print.c:1915
+#: calendar/gui/print.c:1905 calendar/gui/print.c:1907
+#: calendar/gui/print.c:1908
 msgid "%a %b %d %Y"
 msgstr "%a, %d. %b %Y"
 
-#: calendar/gui/print.c:1919
+#: calendar/gui/print.c:1912
 #, c-format
 msgid "Selected week (%s - %s)"
 msgstr "Gewählte Woche (%s - %s)"
 
 #. Month
-#: calendar/gui/print.c:1927
+#: calendar/gui/print.c:1920
 msgid "Selected month (%b %Y)"
 msgstr "Gewählter Monat (%b %Y)"
 
 #. Year
-#: calendar/gui/print.c:1934
+#: calendar/gui/print.c:1927
 msgid "Selected year (%Y)"
 msgstr "Gewähltes Jahr (%Y)"
 
-#: calendar/gui/print.c:2262
+#: calendar/gui/print.c:2255
 msgid "Task"
 msgstr "Aufgabe"
 
-#: calendar/gui/print.c:2321
+#: calendar/gui/print.c:2314
 #, c-format
 msgid "Status: %s"
 msgstr "Status: %s"
 
-#: calendar/gui/print.c:2338
+#: calendar/gui/print.c:2331
 #, c-format
 msgid "Priority: %s"
 msgstr "Priorität: %s"
 
-#: calendar/gui/print.c:2350
+#: calendar/gui/print.c:2343
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "Prozent abgeschlossen: %i"
 
-#: calendar/gui/print.c:2362
+#: calendar/gui/print.c:2355
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: calendar/gui/print.c:2376
+#: calendar/gui/print.c:2369
 #, c-format
 msgid "Categories: %s"
 msgstr "Kategorien: %s"
 
-#: calendar/gui/print.c:2387
+#: calendar/gui/print.c:2380
 msgid "Contacts: "
 msgstr "Kontakte: "
 
-#: calendar/gui/print.c:2525 calendar/gui/print.c:2611
-#: calendar/gui/tasks-control.c:564 my-evolution/e-summary.c:649
+#: calendar/gui/print.c:2518 calendar/gui/print.c:2604
+#: calendar/gui/tasks-control.c:564 mail/mail-callbacks.c:2948
+#: my-evolution/e-summary.c:649
 msgid "Print Preview"
 msgstr "Druckvorschau"
 
-#: calendar/gui/print.c:2559
+#: calendar/gui/print.c:2552
 msgid "Print Item"
 msgstr "Eintrag drucken"
 
-#: calendar/gui/print.c:2632
+#: calendar/gui/print.c:2625
 msgid "Print Setup"
 msgstr "Druckeinstellungen"
 
@@ -8287,11 +8305,7 @@ msgstr ""
 msgid "Resynchronizing with server"
 msgstr "Resynchronisieren mit dem Server"
 
-#: camel/camel-disco-folder.c:90
-msgid "Downloading new messages for offline mode"
-msgstr ""
-
-#: camel/camel-disco-folder.c:351
+#: camel/camel-disco-folder.c:278
 #, c-format
 msgid "Preparing folder '%s' for offline"
 msgstr "Ordner »%s« wird für den Offline-Modus vorbereitet"
@@ -8312,57 +8326,57 @@ msgstr "Weiterleitung zu »%s« konnte nicht erstellt werden: %s"
 msgid "Failed to create create child process '%s': %s"
 msgstr "Kindprozess »%s« konnte nicht erstellt werden: %s"
 
-#: camel/camel-filter-driver.c:759
+#: camel/camel-filter-driver.c:744
 #, c-format
 msgid "Invalid message stream received from %s: %s"
 msgstr "Ungültiger Nachrichten-Datenstrom von %s empfangen: %s"
 
-#: camel/camel-filter-driver.c:940 camel/camel-filter-driver.c:949
+#: camel/camel-filter-driver.c:923 camel/camel-filter-driver.c:932
 msgid "Syncing folders"
 msgstr "Ordner werden synchronisiert"
 
-#: camel/camel-filter-driver.c:1038 camel/camel-filter-driver.c:1411
+#: camel/camel-filter-driver.c:1021 camel/camel-filter-driver.c:1394
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Fehler beim Verarbeiten des Filters: %s: %s"
 
-#: camel/camel-filter-driver.c:1047 camel/camel-filter-driver.c:1417
+#: camel/camel-filter-driver.c:1030 camel/camel-filter-driver.c:1400
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Fehler beim Ausführen des Filters: %s: %s"
 
-#: camel/camel-filter-driver.c:1114
+#: camel/camel-filter-driver.c:1097
 msgid "Unable to open spool folder"
 msgstr "Der Spool-Ordner konnte nicht geöffnet werden"
 
-#: camel/camel-filter-driver.c:1123
+#: camel/camel-filter-driver.c:1106
 msgid "Unable to process spool folder"
 msgstr "Der Spool-Ordner konnte nicht verarbeitet werden"
 
-#: camel/camel-filter-driver.c:1138
+#: camel/camel-filter-driver.c:1121
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "Nachricht %d wird abgerufen (%d%%)"
 
-#: camel/camel-filter-driver.c:1142
+#: camel/camel-filter-driver.c:1125
 msgid "Cannot open message"
 msgstr "Nachricht konnte nicht geöffnet werden"
 
-#: camel/camel-filter-driver.c:1143 camel/camel-filter-driver.c:1155
+#: camel/camel-filter-driver.c:1126 camel/camel-filter-driver.c:1138
 #, c-format
 msgid "Failed on message %d"
 msgstr "Fehlgeschlagen bei Nachricht %d"
 
-#: camel/camel-filter-driver.c:1169 camel/camel-filter-driver.c:1263
+#: camel/camel-filter-driver.c:1152 camel/camel-filter-driver.c:1246
 msgid "Syncing folder"
 msgstr "Ordner wird synchronisiert"
 
-#: camel/camel-filter-driver.c:1230
+#: camel/camel-filter-driver.c:1213
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "Nachricht %d von %d wird abgerufen"
 
-#: camel/camel-filter-driver.c:1245
+#: camel/camel-filter-driver.c:1228
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "Fehlgeschlagen bei Nachricht %d von %d"
@@ -8384,35 +8398,7 @@ msgstr "Ungültige Argumente bei (user-tag)"
 msgid "Error executing filter search: %s: %s"
 msgstr "Fehler beim Ausführen einer Filtersuche: %s: %s"
 
-#: camel/camel-folder.c:585
-#, c-format
-msgid "Unsupported operation: append message: for %s"
-msgstr "Nicht unterstützte Operation: Nachricht anhängen: für %s"
-
-#: camel/camel-folder.c:1163
-#, c-format
-msgid "Unsupported operation: search by expression: for %s"
-msgstr "Nicht unterstützte Operation: Suche nach Ausdruck: für %s"
-
-#: camel/camel-folder.c:1203
-#, c-format
-msgid "Unsupported operation: search by uids: for %s"
-msgstr "Nicht unterstützte Operation: nach UIDs suchen: für %s"
-
-#: camel/camel-folder.c:1321
-msgid "Moving messages"
-msgstr "Nachrichten werden verschoben"
-
-#: camel/camel-folder.c:1321
-msgid "Copying messages"
-msgstr "Nachrichten werden kopiert"
-
-#: camel/camel-folder.c:1571
-#, fuzzy
-msgid "Filtering new message(s)"
-msgstr "%d Nachricht(en) werden/wird abgerufen"
-
-#: camel/camel-folder-search.c:348
+#: camel/camel-folder-search.c:347
 #, c-format
 msgid ""
 "Cannot parse search expression: %s:\n"
@@ -8421,7 +8407,7 @@ msgstr ""
 "Suchausdruck konnte nicht verarbeitet werden: %s:\n"
 "%s"
 
-#: camel/camel-folder-search.c:358
+#: camel/camel-folder-search.c:357
 #, c-format
 msgid ""
 "Error executing search expression: %s:\n"
@@ -8430,15 +8416,38 @@ msgstr ""
 "Fehler beim Ausführen eines Suchausdrucks: %s:\n"
 "%s"
 
-#: camel/camel-folder-search.c:569 camel/camel-folder-search.c:598
+#: camel/camel-folder-search.c:574 camel/camel-folder-search.c:602
 msgid "(match-all) requires a single bool result"
 msgstr "(match-all) verlangt einen einzelnen Wahrheitswert als Ergebnis"
 
-#: camel/camel-folder-search.c:650
+#: camel/camel-folder-search.c:654
 #, c-format
 msgid "Performing query on unknown header: %s"
 msgstr "Abfrage wird auf unbekannte Kopfzeile ausgeführt: %s"
 
+#: camel/camel-folder.c:583
+#, c-format
+msgid "Unsupported operation: append message: for %s"
+msgstr "Nicht unterstützte Operation: Nachricht anhängen: für %s"
+
+#: camel/camel-folder.c:1161
+#, c-format
+msgid "Unsupported operation: search by expression: for %s"
+msgstr "Nicht unterstützte Operation: Suche nach Ausdruck: für %s"
+
+#: camel/camel-folder.c:1201
+#, c-format
+msgid "Unsupported operation: search by uids: for %s"
+msgstr "Nicht unterstützte Operation: nach UIDs suchen: für %s"
+
+#: camel/camel-folder.c:1319
+msgid "Moving messages"
+msgstr "Nachrichten werden verschoben"
+
+#: camel/camel-folder.c:1319
+msgid "Copying messages"
+msgstr "Nachrichten werden kopiert"
+
 #: camel/camel-gpg-context.c:762
 #, c-format
 msgid ""
@@ -8469,7 +8478,7 @@ msgstr ""
 
 #: camel/camel-gpg-context.c:821 camel/camel-gpg-context.c:1297
 #: camel/camel-gpg-context.c:1403 camel/camel-gpg-context.c:1473
-#: camel/camel-gpg-context.c:1529 mail/mail-send-recv.c:574
+#: camel/camel-gpg-context.c:1529 mail/mail-send-recv.c:577
 msgid "Cancelled."
 msgstr "Storniert"
 
@@ -8530,6 +8539,26 @@ msgstr ""
 "Die Nachrichtensignatur konnte nicht verifiziert werden: Temporäre Datei "
 "konnte nicht erstellt werden: %s"
 
+#: camel/camel-lock-client.c:100
+#, c-format
+msgid "Cannot build locking helper pipe: %s"
+msgstr "Weiterleitung zu Sperrhilfsprogramm konnte nicht angelegt werden: %s"
+
+#: camel/camel-lock-client.c:113
+#, c-format
+msgid "Cannot fork locking helper: %s"
+msgstr "Sperrhilfsprogramm konnte nicht abgespalten werden: %s"
+
+#: camel/camel-lock-client.c:191 camel/camel-lock-client.c:214
+#, c-format
+msgid "Could not lock '%s': protocol error with lock-helper"
+msgstr "»%s« konnte nicht gesperrt werden: Protokollfehler mit lock-helper"
+
+#: camel/camel-lock-client.c:204
+#, c-format
+msgid "Could not lock '%s'"
+msgstr "»%s« konnte nicht gesperrt werden"
+
 #: camel/camel-lock.c:92 camel/camel-lock.c:113
 #, c-format
 msgid "Could not create lock file for %s: %s"
@@ -8552,26 +8581,6 @@ msgstr "fcntl(2)-Sperre konnte nicht erhalten werden: %s"
 msgid "Failed to get lock using flock(2): %s"
 msgstr "flock(2)-Sperre konnte nicht erhalten werden: %s"
 
-#: camel/camel-lock-client.c:100
-#, c-format
-msgid "Cannot build locking helper pipe: %s"
-msgstr "Weiterleitung zu Sperrhilfsprogramm konnte nicht angelegt werden: %s"
-
-#: camel/camel-lock-client.c:113
-#, c-format
-msgid "Cannot fork locking helper: %s"
-msgstr "Sperrhilfsprogramm konnte nicht abgespalten werden: %s"
-
-#: camel/camel-lock-client.c:191 camel/camel-lock-client.c:214
-#, c-format
-msgid "Could not lock '%s': protocol error with lock-helper"
-msgstr "»%s« konnte nicht gesperrt werden: Protokollfehler mit lock-helper"
-
-#: camel/camel-lock-client.c:204
-#, c-format
-msgid "Could not lock '%s'"
-msgstr "»%s« konnte nicht gesperrt werden"
-
 #: camel/camel-movemail.c:107
 #, c-format
 msgid "Could not check mail file %s: %s"
@@ -8638,11 +8647,11 @@ msgstr "MIME-Teil konnte nicht entschlüsselt werden: Ungültige Struktur"
 msgid "Failed to decrypt MIME part: parse error"
 msgstr "MIME-Teil konnte nicht entschlüsselt werden: Fehler beim Verarbeiten"
 
-#: camel/camel-multipart-signed.c:646
+#: camel/camel-multipart-signed.c:644
 msgid "This is a digitally signed message part"
 msgstr "Dies ist ein digital signierter Nachrichtenteil"
 
-#: camel/camel-multipart-signed.c:700
+#: camel/camel-multipart-signed.c:698
 msgid "parse error"
 msgstr "Fehler beim Verarbeiten"
 
@@ -8832,7 +8841,7 @@ msgstr ""
 #: camel/camel-sasl-gssapi.c:189 camel/camel-sasl-gssapi.c:238
 #: camel/camel-sasl-gssapi.c:274 camel/camel-sasl-gssapi.c:289
 #: camel/camel-sasl-kerberos4.c:219
-#: camel/providers/imap/camel-imap-store.c:1207
+#: camel/providers/imap/camel-imap-store.c:1053
 msgid "Bad authentication response from server."
 msgstr "Ungültige Legitimationsantwort vom Server."
 
@@ -8937,53 +8946,53 @@ msgstr "URL »%s« benötigt eine Pfadkomponente"
 msgid "Resolving: %s"
 msgstr "%s wird aufgelöst"
 
-#: camel/camel-service.c:769 camel/camel-service.c:893
+#: camel/camel-service.c:768 camel/camel-service.c:891
 #, c-format
 msgid "Failure in name lookup: %s"
 msgstr "Fehler beim Auflösen eines Namens: %s"
 
-#: camel/camel-service.c:790 camel/camel-service.c:914
+#: camel/camel-service.c:789
 #, c-format
 msgid "Host lookup failed: cannot create thread: %s"
 msgstr ""
 "Finden eines Rechners fehlgeschlagen: Thread konnte nicht erstellt werden: %s"
 
-#: camel/camel-service.c:803
+#: camel/camel-service.c:802
 #, c-format
 msgid "Host lookup failed: %s: host not found"
 msgstr "Finden eines Rechners fehlgeschlagen: %s: Rechner nicht gefunden"
 
-#: camel/camel-service.c:806
+#: camel/camel-service.c:805
 #, c-format
 msgid "Host lookup failed: %s: unknown reason"
 msgstr "Finden eines Rechners fehlgeschlagen: %s: unbekannter Grund"
 
-#: camel/camel-service.c:860
+#: camel/camel-service.c:859
 msgid "Resolving address"
 msgstr "Adresse wird aufgelöst"
 
-#: camel/camel-service.c:929
+#: camel/camel-service.c:924
 msgid "Host lookup failed: host not found"
 msgstr "Finden eines Rechners fehlgeschlagen: Rechner nicht gefunden"
 
-#: camel/camel-service.c:932
+#: camel/camel-service.c:927
 msgid "Host lookup failed: unknown reason"
 msgstr "Finden eines Rechners fehlgeschlagen: unbekannter Grund"
 
-#: camel/camel-session.c:75
+#: camel/camel-session.c:74
 msgid "Virtual folder email provider"
 msgstr "E-Mail-Quelle: Virtueller Ordner"
 
-#: camel/camel-session.c:77
+#: camel/camel-session.c:76
 msgid "For reading mail as a query of another set of folders"
 msgstr "Zum Lesen von E-Mails in Form einer Abfrage über andere Ordner"
 
-#: camel/camel-session.c:350 camel/camel-session.c:400
+#: camel/camel-session.c:348 camel/camel-session.c:398
 #, c-format
 msgid "No provider available for protocol `%s'"
 msgstr "Keine Quelle für Protokoll »%s« verfügbar"
 
-#: camel/camel-session.c:523
+#: camel/camel-session.c:521
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -9158,7 +9167,7 @@ msgstr "Schlüsselverwendung untertützt das Signieren von Zertifikaten nicht"
 msgid "Error in application verification"
 msgstr "Fehler bei der Anwendungsüberprüfung"
 
-#: camel/camel-tcp-stream-openssl.c:696 camel/camel-tcp-stream-ssl.c:831
+#: camel/camel-tcp-stream-openssl.c:696 camel/camel-tcp-stream-ssl.c:823
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -9171,11 +9180,11 @@ msgstr ""
 "Fingerabdruck:       %s\n"
 "Signatur:                %s"
 
-#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:837
+#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:829
 msgid "GOOD"
 msgstr "GUT"
 
-#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:837
+#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:829
 msgid "BAD"
 msgstr "SCHLECHT"
 
@@ -9199,7 +9208,7 @@ msgstr ""
 "Möchten Sie es dennoch akzeptieren?"
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:841
+#: camel/camel-tcp-stream-ssl.c:833
 #, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -9214,7 +9223,7 @@ msgstr ""
 "\n"
 "Möchten Sie akzeptieren?"
 
-#: camel/camel-tcp-stream-ssl.c:885
+#: camel/camel-tcp-stream-ssl.c:877
 #, c-format
 msgid ""
 "Certificate problem: %s\n"
@@ -9223,7 +9232,7 @@ msgstr ""
 "Zertifikatproblem: %s\n"
 "Aussteller: %s"
 
-#: camel/camel-tcp-stream-ssl.c:937
+#: camel/camel-tcp-stream-ssl.c:929
 #, c-format
 msgid ""
 "Bad certificate domain: %s\n"
@@ -9232,7 +9241,7 @@ msgstr ""
 "Fehlerhafte Zertifikatdomäne: %s\n"
 "Aussteller: %s"
 
-#: camel/camel-tcp-stream-ssl.c:955
+#: camel/camel-tcp-stream-ssl.c:947
 #, c-format
 msgid ""
 "Certificate expired: %s\n"
@@ -9241,7 +9250,7 @@ msgstr ""
 "Zertifikat nicht mehr gültig: %s\n"
 "Aussteller: %s"
 
-#: camel/camel-tcp-stream-ssl.c:972
+#: camel/camel-tcp-stream-ssl.c:964
 #, c-format
 msgid ""
 "Certificate revocation list expired: %s\n"
@@ -9250,7 +9259,7 @@ msgstr ""
 "Zertifikat-Rückrufliste nicht mehr gültig: %s\n"
 "Aussteller: %s"
 
-#: camel/camel-url.c:290 mail/mail-tools.c:143
+#: camel/camel-url.c:289 mail/mail-tools.c:143
 #, c-format
 msgid "Could not parse URL `%s'"
 msgstr "URL »%s« konnte nicht verarbeitet werden"
@@ -9293,12 +9302,12 @@ msgstr "Ordner konnte umbenannt werden: %s: Ordner gibt es nicht"
 #: camel/providers/imap/camel-imap-command.c:221
 #: camel/providers/imap/camel-imap-command.c:260
 #: camel/providers/imap/camel-imap-command.c:450
-#: camel/providers/imap/camel-imap-store.c:2806
+#: camel/providers/imap/camel-imap-store.c:2645
 msgid "Operation cancelled"
 msgstr "Vorgang abgebrochen"
 
 #: camel/providers/imap/camel-imap-command.c:305
-#: camel/providers/imap/camel-imap-store.c:2809
+#: camel/providers/imap/camel-imap-store.c:2648
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "Verbindung zum Server unerwartet getrennt: %s"
@@ -9365,7 +9374,7 @@ msgstr "Nachricht konnte nicht abgerufen werden: %s"
 #: camel/providers/local/camel-maildir-folder.c:211
 #: camel/providers/local/camel-maildir-folder.c:224
 #: camel/providers/local/camel-maildir-folder.c:233
-#: camel/providers/local/camel-mbox-folder.c:422
+#: camel/providers/local/camel-mbox-folder.c:350
 #: camel/providers/local/camel-mh-folder.c:200
 #: camel/providers/local/camel-mh-folder.c:210
 #: camel/providers/local/camel-mh-folder.c:219
@@ -9379,7 +9388,7 @@ msgstr ""
 
 #: camel/providers/imap/camel-imap-folder.c:1923
 #: camel/providers/local/camel-maildir-folder.c:211
-#: camel/providers/local/camel-mbox-folder.c:422
+#: camel/providers/local/camel-mbox-folder.c:350
 #: camel/providers/local/camel-mh-folder.c:200
 msgid "No such message"
 msgstr "Keine solche Nachricht"
@@ -9444,104 +9453,88 @@ msgstr "Namensraum"
 msgid "Apply filters to new messages in INBOX on this server"
 msgstr "Filter auf neue Nachrichten in INBOX dieses Servers anwenden"
 
-#: camel/providers/imap/camel-imap-provider.c:59
-#, fuzzy
-msgid "Automatically synchronize remote mail locally"
-msgstr "_Automatisch nach neuen E-Mails sehen alle"
-
-#: camel/providers/imap/camel-imap-provider.c:65
+#: camel/providers/imap/camel-imap-provider.c:63
 msgid "IMAP"
 msgstr "IMAP"
 
-#: camel/providers/imap/camel-imap-provider.c:67
+#: camel/providers/imap/camel-imap-provider.c:65
 msgid "For reading and storing mail on IMAP servers."
 msgstr "Zum Lesen und Speichern von E-Mails auf IMAP-Servern."
 
-#: camel/providers/imap/camel-imap-provider.c:82
-#: camel/providers/imapp/camel-imapp-provider.c:65
+#: camel/providers/imap/camel-imap-provider.c:80
 #: camel/providers/nntp/camel-nntp-store.c:265
 #: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:83
 msgid "Password"
 msgstr "Passwort"
 
-#: camel/providers/imap/camel-imap-provider.c:84
-#: camel/providers/imapp/camel-imapp-provider.c:67
+#: camel/providers/imap/camel-imap-provider.c:82
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
 "Diese Option verbindet zum IMAP-Server mit einem unverschlüsselten "
 "Passwortes."
 
-#: camel/providers/imap/camel-imap-store.c:459
+#: camel/providers/imap/camel-imap-store.c:457
 #, c-format
 msgid "IMAP server %s"
 msgstr "IMAP-Server %s"
 
-#: camel/providers/imap/camel-imap-store.c:461
+#: camel/providers/imap/camel-imap-store.c:459
 #, c-format
 msgid "IMAP service for %s on %s"
 msgstr "IMAP-Dienst für %s auf %s"
 
-#: camel/providers/imap/camel-imap-store.c:589
-#: camel/providers/imap/camel-imap-store.c:821
-#: camel/providers/imapp/camel-imapp-store.c:233
+#: camel/providers/imap/camel-imap-store.c:587
 #: camel/providers/nntp/camel-nntp-store.c:128
 #: camel/providers/nntp/camel-nntp-store.c:146
 #: camel/providers/pop3/camel-pop3-store.c:184
 msgid "Connection cancelled"
 msgstr "Verbindung abgebrochen"
 
-#: camel/providers/imap/camel-imap-store.c:592
-#: camel/providers/imapp/camel-imapp-store.c:236
+#: camel/providers/imap/camel-imap-store.c:590
 #: camel/providers/nntp/camel-nntp-store.c:131
 #: camel/providers/smtp/camel-smtp-transport.c:275
 #, c-format
 msgid "Could not connect to %s (port %d): %s"
 msgstr "Verbindung zu %s (Port %d) konnte nicht hergestellt werden: %s"
 
-#: camel/providers/imap/camel-imap-store.c:655
-#: camel/providers/imap/camel-imap-store.c:686
+#: camel/providers/imap/camel-imap-store.c:650
+#: camel/providers/imap/camel-imap-store.c:681
 #, c-format
 msgid "Failed to connect to IMAP server %s in secure mode: %s"
 msgstr "Verbindung mit IMAP-Server %s im sicheren Modus ist fehlgeschlagen: %s"
 
-#: camel/providers/imap/camel-imap-store.c:656
+#: camel/providers/imap/camel-imap-store.c:651
 #: camel/providers/pop3/camel-pop3-store.c:220
 msgid "SSL/TLS extension not supported."
 msgstr "SSL/TLS Erweiterung nicht unterstützt."
 
-#: camel/providers/imap/camel-imap-store.c:687
+#: camel/providers/imap/camel-imap-store.c:682
 #: camel/providers/pop3/camel-pop3-store.c:261
 msgid "SSL negotiations failed"
 msgstr "SSL »Verhandlungen« fehlgeschlagen"
 
-#: camel/providers/imap/camel-imap-store.c:824
-#, fuzzy, c-format
-msgid "Could not connect with command \"%s\": %s"
-msgstr "Verbindung zu %s (Port %d) konnte nicht hergestellt werden: %s"
-
-#: camel/providers/imap/camel-imap-store.c:1237
+#: camel/providers/imap/camel-imap-store.c:1076
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr ""
 "IMAP-Server %s unterstützt den verlangten Legitimationsmechanismus %s nicht."
 
-#: camel/providers/imap/camel-imap-store.c:1247
+#: camel/providers/imap/camel-imap-store.c:1086
 #: camel/providers/smtp/camel-smtp-transport.c:485
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "Keine Unterstützung für Legitimationstyp %s"
 
-#: camel/providers/imap/camel-imap-store.c:1270
-#: camel/providers/imapp/camel-imapp-store.c:349
+#: camel/providers/imap/camel-imap-store.c:1109
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr "%sBitte geben Sie das IMAP-Passwort für %s@%s ein"
 
-#: camel/providers/imap/camel-imap-store.c:1284
+#: camel/providers/imap/camel-imap-store.c:1123
 msgid "You didn't enter a password."
 msgstr "Sie haben kein Passwort eingegeben."
 
-#: camel/providers/imap/camel-imap-store.c:1313
+#: camel/providers/imap/camel-imap-store.c:1152
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -9552,70 +9545,42 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:1660
-#: camel/providers/imap/camel-imap-store.c:1802
+#: camel/providers/imap/camel-imap-store.c:1499
+#: camel/providers/imap/camel-imap-store.c:1641
 #, c-format
 msgid "No such folder %s"
 msgstr "Ordner %s gibt es nicht"
 
-#: camel/providers/imap/camel-imap-store.c:2003
+#: camel/providers/imap/camel-imap-store.c:1842
 #, c-format
 msgid ""
 "The folder name \"%s\" is invalid because it containes the character \"%c\""
 msgstr "Der Ordnername »%s« ist ungültig, da er das Zeichen »%c« enthält"
 
-#: camel/providers/imap/camel-imap-store.c:2015
+#: camel/providers/imap/camel-imap-store.c:1854
 #, c-format
 msgid "Unknown parent folder: %s"
 msgstr "Unbekannter Eltern-Ordner %s"
 
-#: camel/providers/imap/camel-imap-store.c:2051
+#: camel/providers/imap/camel-imap-store.c:1890
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "Der Elternordner darf keine Unterordner enthalten"
 
-#: camel/providers/imapp/camel-imapp-provider.c:39
-#: camel/providers/pop3/camel-pop3-provider.c:38
-msgid "Message storage"
-msgstr "Nachrichtenspeicherung"
-
-#: camel/providers/imapp/camel-imapp-provider.c:47
-#, fuzzy
-msgid "IMAP+"
-msgstr "IMAP"
-
-#: camel/providers/imapp/camel-imapp-provider.c:49
-msgid ""
-"Experimental IMAP 4(.1) client\n"
-"This is untested and unsupported code, you want to use plain imap instead.\n"
-"\n"
-" !!! DO NOT USE THIS FOR PRODUCTION EMAIL  !!!\n"
-msgstr ""
-
-#: camel/providers/imapp/camel-imapp-store.c:333
-#, fuzzy, c-format
-msgid "Could not connect to POP server on %s"
-msgstr "Verbindung mit POP-Server %s konnte nicht hergestellt werden"
-
-#: camel/providers/local/camel-local-folder.c:179
-#, fuzzy
-msgid "Index message body data"
-msgstr "Nachricht an Kontakt schicken"
-
 #. $HOME relative path + protocol string
-#: camel/providers/local/camel-local-folder.c:379
+#: camel/providers/local/camel-local-folder.c:353
 #, c-format
 msgid "~%s (%s)"
 msgstr "~%s (%s)"
 
 #. /var/spool/mail relative path + protocol
-#: camel/providers/local/camel-local-folder.c:383
-#: camel/providers/local/camel-local-folder.c:386
+#: camel/providers/local/camel-local-folder.c:357
+#: camel/providers/local/camel-local-folder.c:360
 #, c-format
 msgid "mailbox:%s (%s)"
 msgstr "Postfach: %s (%s)"
 
 #. a full path + protocol
-#: camel/providers/local/camel-local-folder.c:390
+#: camel/providers/local/camel-local-folder.c:364
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
@@ -9675,54 +9640,50 @@ msgstr ""
 "Kann außerdem zum Einlesen eines Baums mit Elm-, Pine- oder Mutt-Ordnern "
 "verwendet werden."
 
-#: camel/providers/local/camel-local-store.c:138
-#: camel/providers/local/camel-local-store.c:227
-#: camel/providers/local/camel-mbox-store.c:305
+#: camel/providers/local/camel-local-store.c:139
+#: camel/providers/local/camel-local-store.c:228
 #: camel/providers/local/camel-spool-store.c:116
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr "Speicherungswurzel %s ist kein absoluter Pfad"
 
-#: camel/providers/local/camel-local-store.c:145
+#: camel/providers/local/camel-local-store.c:146
 #, c-format
 msgid "Store root %s is not a regular directory"
 msgstr "Speicherwurzel »%s« ist kein reguläres Verzeichnis."
 
-#: camel/providers/local/camel-local-store.c:154
-#: camel/providers/local/camel-local-store.c:170
-#: camel/providers/local/camel-local-store.c:238
+#: camel/providers/local/camel-local-store.c:155
+#: camel/providers/local/camel-local-store.c:171
+#: camel/providers/local/camel-local-store.c:239
 #, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr "Ordner konnte nicht abgerufen werden: %s: %s"
 
-#: camel/providers/local/camel-local-store.c:186
+#: camel/providers/local/camel-local-store.c:187
 msgid "Local stores do not have an inbox"
 msgstr "Lokale Speicher haben keinen Eingangsordner"
 
-#: camel/providers/local/camel-local-store.c:198
+#: camel/providers/local/camel-local-store.c:199
 #, c-format
 msgid "Local mail file %s"
 msgstr "Lokale E-Mail-Datei %s"
 
-#: camel/providers/local/camel-local-store.c:307 mail/mail-local.c:949
+#: camel/providers/local/camel-local-store.c:308 mail/mail-local.c:909
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr "Ordner %s konnte nicht in %s umbenannt werden: %s"
 
-#: camel/providers/local/camel-local-store.c:364
-#: camel/providers/local/camel-mbox-store.c:474
+#: camel/providers/local/camel-local-store.c:365
 #, c-format
 msgid "Could not rename '%s': %s"
 msgstr "»%s« konnte nicht umbenannt werden: %s"
 
-#: camel/providers/local/camel-local-store.c:387
-#: camel/providers/local/camel-mbox-store.c:258
+#: camel/providers/local/camel-local-store.c:388
 #, c-format
 msgid "Could not delete folder summary file `%s': %s"
 msgstr "Ordner-Zusammenfassungsdatei »%s« konnte nicht gelöscht werden: %s"
 
-#: camel/providers/local/camel-local-store.c:397
-#: camel/providers/local/camel-mbox-store.c:270
+#: camel/providers/local/camel-local-store.c:398
 #, c-format
 msgid "Could not delete folder index file `%s': %s"
 msgstr "Ordner-Indexdatei »%s« konnte nicht gelöscht werden: %s"
@@ -9764,7 +9725,7 @@ msgstr ""
 "%s"
 
 #: camel/providers/local/camel-maildir-store.c:110
-#: camel/providers/local/camel-mbox-store.c:157
+#: camel/providers/local/camel-mbox-store.c:101
 #: camel/providers/local/camel-mh-store.c:209
 #: camel/providers/local/camel-spool-store.c:167
 #, c-format
@@ -9827,29 +9788,29 @@ msgstr "Suchen nach neuen Nachrichten"
 msgid "Storing folder"
 msgstr "Ordner wird gespeichert"
 
-#: camel/providers/local/camel-mbox-folder.c:230
+#: camel/providers/local/camel-mbox-folder.c:158
 #: camel/providers/local/camel-spool-folder.c:148
 #, c-format
 msgid "Cannot create folder lock on %s: %s"
 msgstr "Ordnersperre auf %s konnte nicht erzeugt werden: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:289
+#: camel/providers/local/camel-mbox-folder.c:217
 #, c-format
 msgid "Cannot open mailbox: %s: %s\n"
 msgstr "Postfach konnte nicht geöffnet werden: %s: %s\n"
 
-#: camel/providers/local/camel-mbox-folder.c:349
+#: camel/providers/local/camel-mbox-folder.c:277
 msgid "Mail append cancelled"
 msgstr "Anhängen der E-Mail abgebrochen"
 
-#: camel/providers/local/camel-mbox-folder.c:352
+#: camel/providers/local/camel-mbox-folder.c:280
 #, c-format
 msgid "Cannot append message to mbox file: %s: %s"
 msgstr "Nachricht konnte nicht an mbox-Datei angehängt werden: %s: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:440
-#: camel/providers/local/camel-mbox-folder.c:471
-#: camel/providers/local/camel-mbox-folder.c:479
+#: camel/providers/local/camel-mbox-folder.c:368
+#: camel/providers/local/camel-mbox-folder.c:399
+#: camel/providers/local/camel-mbox-folder.c:407
 #, c-format
 msgid ""
 "Cannot get message: %s from folder %s\n"
@@ -9858,15 +9819,15 @@ msgstr ""
 "Nachricht konnte nicht erhalten werden: %s aus Ordner %s\n"
 "  %s"
 
-#: camel/providers/local/camel-mbox-folder.c:472
+#: camel/providers/local/camel-mbox-folder.c:400
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr "Dieser Ordner scheint nicht-wiederherstellbar korrupt zu sein."
 
-#: camel/providers/local/camel-mbox-folder.c:480
+#: camel/providers/local/camel-mbox-folder.c:408
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr "Erstellen der Nachricht fehlgeschlagen: Fehlerhaftes Postfach?"
 
-#: camel/providers/local/camel-mbox-store.c:149
+#: camel/providers/local/camel-mbox-store.c:94
 #, c-format
 msgid ""
 "Could not open file `%s':\n"
@@ -9875,16 +9836,7 @@ msgstr ""
 "Datei »%s« konnte nicht geöffnet werden:\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:166
-#, fuzzy, c-format
-msgid ""
-"Could not create directory `%s':\n"
-"%s"
-msgstr ""
-"Verzeichnis %s konnte nicht angelegt werden:\n"
-"%s"
-
-#: camel/providers/local/camel-mbox-store.c:178
+#: camel/providers/local/camel-mbox-store.c:110
 #, c-format
 msgid ""
 "Could not create file `%s':\n"
@@ -9893,15 +9845,14 @@ msgstr ""
 "Datei »%s« konnte nicht angelegt werden:\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:188
-#: camel/providers/local/camel-mbox-store.c:229
+#: camel/providers/local/camel-mbox-store.c:119
+#: camel/providers/local/camel-mbox-store.c:146
 #, c-format
 msgid "`%s' is not a regular file."
 msgstr "»%s« ist keine reguläre Datei."
 
-#: camel/providers/local/camel-mbox-store.c:210
-#: camel/providers/local/camel-mbox-store.c:221
-#: camel/providers/local/camel-mbox-store.c:244
+#: camel/providers/local/camel-mbox-store.c:138
+#: camel/providers/local/camel-mbox-store.c:161
 #, c-format
 msgid ""
 "Could not delete folder `%s':\n"
@@ -9910,36 +9861,11 @@ msgstr ""
 "Ordner »%s« konnte nicht gelöscht werden:\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:236
+#: camel/providers/local/camel-mbox-store.c:153
 #, c-format
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr "Ordner »%s« ist nicht leer. Nicht gelöscht."
 
-#: camel/providers/local/camel-mbox-store.c:311
-#, fuzzy
-msgid "Cannot create a folder by this name."
-msgstr "Ein Ordnersperre mit diesem Namen konnte nicht erzeugt werden"
-
-#: camel/providers/local/camel-mbox-store.c:324
-#, fuzzy, c-format
-msgid "Cannot create directory `%s': %s."
-msgstr "Verzeichnis %s konnte nicht angelegt werden: %s"
-
-#: camel/providers/local/camel-mbox-store.c:338
-#, fuzzy, c-format
-msgid "Cannot create folder: %s: %s"
-msgstr "Ordner konnte nicht abgerufen werden: %s: %s"
-
-#: camel/providers/local/camel-mbox-store.c:408
-#, fuzzy, c-format
-msgid "Could not rename %s to %s: %s"
-msgstr "Ordner %s konnte nicht in %s umbenannt werden: %s"
-
-#: camel/providers/local/camel-mbox-store.c:427
-#, fuzzy
-msgid "The new folder name is illegal."
-msgstr "Der angegebene Ordnername ist nicht gültig: %s"
-
 #: camel/providers/local/camel-mbox-summary.c:343
 #, c-format
 msgid "Could not open folder: %s: %s"
@@ -10101,67 +10027,6 @@ msgstr ""
 "Spool-Ordner %s konnte nicht synchronisiert werden: %s\n"
 "Ordner könnte beschädigt sein, Kopie in »%s« gespeichert"
 
-#: camel/providers/nntp/camel-nntp-auth.c:44
-#, fuzzy, c-format
-msgid "Please enter the NNTP password for %s@%s"
-msgstr "%sBitte geben Sie das SMTP-Passwort für %s@%s ein"
-
-#: camel/providers/nntp/camel-nntp-auth.c:64
-msgid "Server rejected username"
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-auth.c:70
-#, fuzzy
-msgid "Failed to send username to server"
-msgstr "Verbindung zum LDAP-Server ist fehlgeschlagen"
-
-#: camel/providers/nntp/camel-nntp-auth.c:79
-msgid "Server rejected username/password"
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-folder.c:114
-#, c-format
-msgid "Internal error: uid in invalid format: %s"
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-folder.c:155
-#: camel/providers/nntp/camel-nntp-folder.c:161
-#: camel/providers/pop3/camel-pop3-folder.c:433
-#: camel/providers/pop3/camel-pop3-folder.c:494
-#: camel/providers/pop3/camel-pop3-folder.c:501
-#: camel/providers/pop3/camel-pop3-folder.c:512
-#, c-format
-msgid "Cannot get message %s: %s"
-msgstr "Nachricht %s konnte nicht abgerufen werden: %s"
-
-#: camel/providers/nntp/camel-nntp-folder.c:159
-#: camel/providers/pop3/camel-pop3-folder.c:262
-#: camel/providers/pop3/camel-pop3-folder.c:430
-#: camel/providers/pop3/camel-pop3-folder.c:491
-#: camel/providers/pop3/camel-pop3-folder.c:509
-msgid "User cancelled"
-msgstr "Benutzer hat abgebrochen"
-
-#: camel/providers/nntp/camel-nntp-grouplist.c:45
-#, fuzzy
-msgid "Could not get group list from server."
-msgstr "Gruppe konnte nicht ermittelt werden: %s"
-
-#: camel/providers/nntp/camel-nntp-grouplist.c:98
-#: camel/providers/nntp/camel-nntp-grouplist.c:107
-#, fuzzy, c-format
-msgid "Unable to load grouplist file for %s: %s"
-msgstr ""
-"Ausgabedatei konnte nicht angelegt werden: %s\n"
-" %s"
-
-#: camel/providers/nntp/camel-nntp-grouplist.c:158
-#, fuzzy, c-format
-msgid "Unable to save grouplist file for %s: %s"
-msgstr ""
-"Ausgabedatei konnte nicht angelegt werden: %s\n"
-" %s"
-
 #: camel/providers/nntp/camel-nntp-provider.c:41
 msgid "USENET news"
 msgstr "USENET-News"
@@ -10194,37 +10059,37 @@ msgstr ""
 "Diese Option führt die Legitimation am NNTP-Server mit einem "
 "unverschlüsselten Passwort durch."
 
-#: camel/providers/nntp/camel-nntp-summary.c:237
+#: camel/providers/nntp/camel-nntp-summary.c:234
 #, c-format
 msgid "No such folder: %s"
 msgstr "Ordner existiert nicht: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:241
+#: camel/providers/nntp/camel-nntp-summary.c:238
 #, c-format
 msgid "Could not get group: %s"
 msgstr "Gruppe konnte nicht ermittelt werden: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:347
+#: camel/providers/nntp/camel-nntp-summary.c:344
 #, c-format
 msgid "NNTP Command failed: %s"
 msgstr "NNTP-Befehl fehlgeschlagen: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:407
-#: camel/providers/nntp/camel-nntp-summary.c:508
+#: camel/providers/nntp/camel-nntp-summary.c:404
+#: camel/providers/nntp/camel-nntp-summary.c:505
 #, c-format
 msgid "%s: Scanning new messages"
 msgstr "%s: neue Nachrichten werden abgefragt"
 
-#: camel/providers/nntp/camel-nntp-summary.c:523
+#: camel/providers/nntp/camel-nntp-summary.c:520
 #, c-format
 msgid "Unknown server response: %s"
 msgstr "Unbekannte Serverrückmeldung: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:569
+#: camel/providers/nntp/camel-nntp-summary.c:566
 msgid "Use cancel"
 msgstr "Abbrechen verwenden"
 
-#: camel/providers/nntp/camel-nntp-summary.c:571
+#: camel/providers/nntp/camel-nntp-summary.c:568
 #, c-format
 msgid "Operation failed: %s"
 msgstr "Operation fehlgeschlagen: %s"
@@ -10233,6 +10098,13 @@ msgstr "Operation fehlgeschlagen: %s"
 msgid "Retrieving POP summary"
 msgstr "POP-Zusammenfassung wird abgerufen"
 
+#: camel/providers/pop3/camel-pop3-folder.c:262
+#: camel/providers/pop3/camel-pop3-folder.c:429
+#: camel/providers/pop3/camel-pop3-folder.c:490
+#: camel/providers/pop3/camel-pop3-folder.c:508
+msgid "User cancelled"
+msgstr "Benutzer hat abgebrochen"
+
 #: camel/providers/pop3/camel-pop3-folder.c:265
 #, c-format
 msgid "Cannot get POP summary: %s"
@@ -10242,22 +10114,34 @@ msgstr "POP-Zusammenfassung konnte nicht abgerufen werden: %s"
 msgid "Expunging deleted messages"
 msgstr "Gelöschte Nachrichten werden ausgeräumt"
 
-#: camel/providers/pop3/camel-pop3-folder.c:404
+#: camel/providers/pop3/camel-pop3-folder.c:403
 #, c-format
 msgid "No message with uid %s"
 msgstr "Keine Nachricht mit UID %s"
 
 #. Sigh, most of the crap in this function is so that the cancel button
 #. returns the proper exception code.  Sigh.
-#: camel/providers/pop3/camel-pop3-folder.c:411
+#: camel/providers/pop3/camel-pop3-folder.c:410
 #, c-format
 msgid "Retrieving POP message %d"
 msgstr "POP-Nachricht %d wird abgerufen"
 
-#: camel/providers/pop3/camel-pop3-folder.c:501
+#: camel/providers/pop3/camel-pop3-folder.c:432
+#: camel/providers/pop3/camel-pop3-folder.c:493
+#: camel/providers/pop3/camel-pop3-folder.c:500
+#: camel/providers/pop3/camel-pop3-folder.c:511
+#, c-format
+msgid "Cannot get message %s: %s"
+msgstr "Nachricht %s konnte nicht abgerufen werden: %s"
+
+#: camel/providers/pop3/camel-pop3-folder.c:500
 msgid "Unknown reason"
 msgstr "Unbekannter Grund"
 
+#: camel/providers/pop3/camel-pop3-provider.c:38
+msgid "Message storage"
+msgstr "Nachrichtenspeicherung"
+
 #: camel/providers/pop3/camel-pop3-provider.c:40
 msgid "Leave messages on server"
 msgstr "E-Mail auf Server belassen"
@@ -10588,7 +10472,7 @@ msgid "Cannot send message: sender address not valid."
 msgstr ""
 "Nachricht konnte nicht verschickt werden: Absenderadresse nicht gültig."
 
-#: camel/providers/smtp/camel-smtp-transport.c:690 mail/mail-ops.c:631
+#: camel/providers/smtp/camel-smtp-transport.c:690 mail/mail-ops.c:613
 msgid "Sending message"
 msgstr "Nachricht wird verschickt"
 
@@ -10606,57 +10490,57 @@ msgstr ""
 msgid "SMTP Greeting"
 msgstr "SMTP-Begrüßung"
 
-#: camel/providers/smtp/camel-smtp-transport.c:928
+#: camel/providers/smtp/camel-smtp-transport.c:926
 #, c-format
 msgid "HELO request timed out: %s"
 msgstr "Zeitüberschreitung bei HELO-Anfrage: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:950
+#: camel/providers/smtp/camel-smtp-transport.c:948
 msgid "HELO response error"
 msgstr "Fehler bei HELO-Antwort"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1016
+#: camel/providers/smtp/camel-smtp-transport.c:1014
 msgid "SMTP Authentication"
 msgstr "SMTP-Legitimation"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1022
+#: camel/providers/smtp/camel-smtp-transport.c:1020
 msgid "Error creating SASL authentication object."
 msgstr "Fehler beim Anlegen eines SASL-Legitimations-Objektes."
 
-#: camel/providers/smtp/camel-smtp-transport.c:1039
-#: camel/providers/smtp/camel-smtp-transport.c:1051
+#: camel/providers/smtp/camel-smtp-transport.c:1037
+#: camel/providers/smtp/camel-smtp-transport.c:1049
 #, c-format
 msgid "AUTH request timed out: %s"
 msgstr "Zeitüberschreitung bei AUTH-Anfrage: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1060
+#: camel/providers/smtp/camel-smtp-transport.c:1058
 msgid "AUTH request failed."
 msgstr "AUTH-Anfrage fehlgeschlagen."
 
-#: camel/providers/smtp/camel-smtp-transport.c:1121
+#: camel/providers/smtp/camel-smtp-transport.c:1119
 msgid "Bad authentication response from server.\n"
 msgstr "Ungültige Legitimationsantwort vom Server.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1146
+#: camel/providers/smtp/camel-smtp-transport.c:1144
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
 msgstr "Zeitüberschreitung bei MAIL-FROM-Anfrage: %s: E-Mail nicht verschickt"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1166
+#: camel/providers/smtp/camel-smtp-transport.c:1164
 msgid "MAIL FROM response error"
 msgstr "Fehler bei MAIL-FROM-Antwort"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1190
+#: camel/providers/smtp/camel-smtp-transport.c:1188
 #, c-format
 msgid "RCPT TO request timed out: %s: mail not sent"
 msgstr "Zeitüberschreitung bei RCPT-TO-Anfrage: %s: E-Mail nicht verschickt"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1212
+#: camel/providers/smtp/camel-smtp-transport.c:1210
 #, c-format
 msgid "RCPT TO <%s> failed"
 msgstr "RCPT TO <%s> fehlgeschlagen"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1251
+#: camel/providers/smtp/camel-smtp-transport.c:1249
 #, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr "Zeitüberschreitung bei DATA-Anfrage: %s: E-Mail nicht verschickt."
@@ -10664,37 +10548,37 @@ msgstr "Zeitüberschreitung bei DATA-Anfrage: %s: E-Mail nicht verschickt."
 #. we should have gotten instructions on how to use the DATA command:
 #. * 354 Enter mail, end with "." on a line by itself
 #.
-#: camel/providers/smtp/camel-smtp-transport.c:1271
+#: camel/providers/smtp/camel-smtp-transport.c:1269
 msgid "DATA response error"
 msgstr "Fehler bei DATA-Antwort"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1312
-#: camel/providers/smtp/camel-smtp-transport.c:1335
+#: camel/providers/smtp/camel-smtp-transport.c:1310
+#: camel/providers/smtp/camel-smtp-transport.c:1333
 #, c-format
 msgid "DATA send timed out: message termination: %s: mail not sent"
 msgstr ""
 "Zeitüberschreitung beim Übermitteln von DATA: Nachrichtenabschluss: %s E-"
 "Mail nicht verschickt"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1355
+#: camel/providers/smtp/camel-smtp-transport.c:1353
 msgid "DATA termination response error"
 msgstr "Fehler bei DATA-Terminierungsantwort"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1378
+#: camel/providers/smtp/camel-smtp-transport.c:1376
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr "Zeitüberschreitung bei RSET-Anfrage: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1398
+#: camel/providers/smtp/camel-smtp-transport.c:1396
 msgid "RSET response error"
 msgstr "Fehler bei RSET-Antwort"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1421
+#: camel/providers/smtp/camel-smtp-transport.c:1419
 #, c-format
 msgid "QUIT request timed out: %s"
 msgstr "Zeitüberschreitung bei QUIT-Anfrage: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1441
+#: camel/providers/smtp/camel-smtp-transport.c:1439
 msgid "QUIT response error"
 msgstr "Fehler bei QUIT-Antwort"
 
@@ -10713,19 +10597,20 @@ msgstr "%.0f MB"
 msgid "%.0fG"
 msgstr "%.0f GB"
 
-#: composer/e-msg-composer-attachment-bar.c:300
+#. This is a filename. Translators take note.
+#: composer/e-msg-composer-attachment-bar.c:311 mail/mail-display.c:226
 msgid "attachment"
 msgstr "anlage"
 
-#: composer/e-msg-composer-attachment-bar.c:445
+#: composer/e-msg-composer-attachment-bar.c:449
 msgid "Remove selected items from the attachment list"
 msgstr "Die gewählten Objekte aus der Anlagenliste entfernen"
 
-#: composer/e-msg-composer-attachment-bar.c:475
+#: composer/e-msg-composer-attachment-bar.c:479
 msgid "Add attachment..."
 msgstr "Anlage hinzufügen..."
 
-#: composer/e-msg-composer-attachment-bar.c:476
+#: composer/e-msg-composer-attachment-bar.c:480
 msgid "Attach a file to the message"
 msgstr "Der Nachricht eine Datei beilegen"
 
@@ -10757,11 +10642,89 @@ msgstr "MIME-Typ:"
 msgid "Suggest automatic display of attachment"
 msgstr "Automatische Anzeige der Anlage vorschlagen"
 
-#: composer/e-msg-composer.c:562
+#: composer/e-msg-composer-hdrs.c:290
+msgid "Hey you, dunce. You need an account to send mail doncha know."
+msgstr "Hey, Sie! Sie brauchen ein Konto, um E-Mails zu verschicken!"
+
+#: composer/e-msg-composer-hdrs.c:483
+msgid "Click here for the address book"
+msgstr "Klicken Sie hier, um das Adressbuch zu öffnen"
+
+#.
+#. * Reply-To:
+#. *
+#. * Create this before we call create_from_optionmenu,
+#. * because that causes from_changed to be called, which
+#. * expects the reply_to fields to be initialized.
+#.
+#: composer/e-msg-composer-hdrs.c:514
+msgid "Reply-To:"
+msgstr "Antwort an:"
+
+#.
+#. * From
+#.
+#: composer/e-msg-composer-hdrs.c:520
+msgid "From:"
+msgstr "Von:"
+
+#.
+#. * Subject
+#.
+#: composer/e-msg-composer-hdrs.c:526
+msgid "Subject:"
+msgstr "Betreff:"
+
+#: composer/e-msg-composer-hdrs.c:535
+msgid "To:"
+msgstr "An:"
+
+#: composer/e-msg-composer-hdrs.c:536
+msgid "Enter the recipients of the message"
+msgstr "Geben Sie die Empfänger der Nachricht ein"
+
+#: composer/e-msg-composer-hdrs.c:539
+msgid "Cc:"
+msgstr "Kopie an:"
+
+#: composer/e-msg-composer-hdrs.c:540
+msgid "Enter the addresses that will receive a carbon copy of the message"
+msgstr ""
+"Geben Sie die Adressen ein, die eine Kopie der Nachricht erhalten sollen"
+
+#: composer/e-msg-composer-hdrs.c:543
+msgid "Bcc:"
+msgstr "Blindkopie an:"
+
+#: composer/e-msg-composer-hdrs.c:544
+msgid ""
+"Enter the addresses that will receive a carbon copy of the message without "
+"appearing in the recipient list of the message."
+msgstr ""
+"Geben Sie die Adressen ein, die eine Kopie erhalten, die nicht in der "
+"Empfängerliste auftaucht."
+
+#.
+#. * Post-To
+#.
+#: composer/e-msg-composer-hdrs.c:551
+msgid "Post To:"
+msgstr "Ablegen in:"
+
+#: composer/e-msg-composer-hdrs.c:553
+msgid "Posting destination"
+msgstr "Zielordner"
+
+#: composer/e-msg-composer-select-file.c:102
+#: composer/e-msg-composer-select-file.c:119
+msgid "Attach file(s)"
+msgstr "Datei(en) beilegen"
+
+#: composer/e-msg-composer.c:555
 msgid "Could not create a PGP signature context"
 msgstr "Es konnte kein PGP-Signaturkontext angelegt werden"
 
-#: composer/e-msg-composer.c:841
+#: composer/e-msg-composer.c:834
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
@@ -10770,30 +10733,30 @@ msgstr ""
 "Fehler beim Lesen der Datei %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:1206
+#: composer/e-msg-composer.c:1197
 msgid "File exists, overwrite?"
 msgstr "Datei existiert, überschreiben?"
 
-#: composer/e-msg-composer.c:1217 composer/e-msg-composer.c:1233
+#: composer/e-msg-composer.c:1215
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Fehler beim Speichern der Datei: %s"
 
-#: composer/e-msg-composer.c:1256
+#: composer/e-msg-composer.c:1238
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Fehler beim Laden der Datei: %s"
 
-#: composer/e-msg-composer.c:1294
+#: composer/e-msg-composer.c:1276
 #, c-format
 msgid "Error accessing file: %s"
 msgstr "Fehler beim Zugriff auf Datei: %s"
 
-#: composer/e-msg-composer.c:1302
+#: composer/e-msg-composer.c:1284
 msgid "Unable to retrieve message from editor"
 msgstr "Nachricht konnte nicht vom Editor erhalten werden"
 
-#: composer/e-msg-composer.c:1309
+#: composer/e-msg-composer.c:1291
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -10802,7 +10765,7 @@ msgstr ""
 "In Datei konnte nicht gesucht werden: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1316
+#: composer/e-msg-composer.c:1298
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -10811,7 +10774,7 @@ msgstr ""
 "Datei konnte nicht verkürzt werden: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1325
+#: composer/e-msg-composer.c:1307
 #, c-format
 msgid ""
 "Unable to copy file descriptor: %s\n"
@@ -10820,7 +10783,7 @@ msgstr ""
 "Dateideskriptor %s konnte nicht kopiert werden:\n"
 "%s"
 
-#: composer/e-msg-composer.c:1334
+#: composer/e-msg-composer.c:1316
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -10829,7 +10792,7 @@ msgstr ""
 "Fehler beim automatischen Speichern der Nachricht: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1431
+#: composer/e-msg-composer.c:1413
 msgid ""
 "Ximian Evolution has found unsaved files from a previous session.\n"
 "Would you like to try to recover them?"
@@ -10838,7 +10801,7 @@ msgstr ""
 "entdeckt.\n"
 "Möchten Sie eine Wiederherstellung versuchen?"
 
-#: composer/e-msg-composer.c:1594
+#: composer/e-msg-composer.c:1575
 #, c-format
 msgid ""
 "The message \"%s\" has not been sent.\n"
@@ -10849,28 +10812,28 @@ msgstr ""
 "\n"
 "Wollen Sie die Änderungen speichern?"
 
-#: composer/e-msg-composer.c:1603
+#: composer/e-msg-composer.c:1584
 msgid "Warning: Modified Message"
 msgstr "Warnung: Geänderte Nachricht"
 
-#: composer/e-msg-composer.c:1635
+#: composer/e-msg-composer.c:1616
 msgid "Open file"
 msgstr "Datei öffnen"
 
-#: composer/e-msg-composer.c:2054
+#: composer/e-msg-composer.c:2040
 msgid "Signature:"
 msgstr "Signatur:"
 
-#: composer/e-msg-composer.c:2094 mail/mail-account-gui.c:1261
+#: composer/e-msg-composer.c:2080 mail/mail-account-gui.c:1261
 msgid "Autogenerated"
 msgstr "Automatisch erzeugt"
 
-#: composer/e-msg-composer.c:2274 composer/e-msg-composer.c:2970
-#: composer/e-msg-composer.c:2971
+#: composer/e-msg-composer.c:2256 composer/e-msg-composer.c:2925
+#: composer/e-msg-composer.c:2926
 msgid "Compose a message"
 msgstr "Eine Nachricht verfassen"
 
-#: composer/e-msg-composer.c:3002
+#: composer/e-msg-composer.c:2957
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
@@ -10878,7 +10841,7 @@ msgstr ""
 "Das Editorfenster konnte nicht erzeugt werden:\n"
 "Adresswähler-Control konnte nicht aktiviert werden."
 
-#: composer/e-msg-composer.c:3030
+#: composer/e-msg-composer.c:2985
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component.\n"
@@ -10890,7 +10853,7 @@ msgstr ""
 "Bitte stellen Sie sicher, dass die korrekte gtkhtml- und\n"
 "libgtkhtml-Version installiert ist.\n"
 
-#: composer/e-msg-composer.c:3100
+#: composer/e-msg-composer.c:3052
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component."
@@ -10898,7 +10861,7 @@ msgstr ""
 "Das Editorfenster konnte nicht erzeugt werden:\n"
 "HTML-Editorkomponente konnte nicht aktiviert werden."
 
-#: composer/e-msg-composer.c:4110
+#: composer/e-msg-composer.c:4078
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)"
 "<b>"
@@ -10906,86 +10869,6 @@ msgstr ""
 "<b>(Der Editor enthält einen nicht-Text Nachrichtenrumpf, der nicht "
 "bearbeitet werden kann.)<b>"
 
-#: composer/e-msg-composer-hdrs.c:290
-#, fuzzy
-msgid "You need to configure an account before you can compose mail."
-msgstr ""
-"Sie müssen ein Konto einrichten,\n"
-"bevor Sie E-Mails verfassen können."
-
-#: composer/e-msg-composer-hdrs.c:483
-msgid "Click here for the address book"
-msgstr "Klicken Sie hier, um das Adressbuch zu öffnen"
-
-#.
-#. * Reply-To:
-#. *
-#. * Create this before we call create_from_optionmenu,
-#. * because that causes from_changed to be called, which
-#. * expects the reply_to fields to be initialized.
-#.
-#: composer/e-msg-composer-hdrs.c:514
-msgid "Reply-To:"
-msgstr "Antwort an:"
-
-#.
-#. * From
-#.
-#: composer/e-msg-composer-hdrs.c:520
-msgid "From:"
-msgstr "Von:"
-
-#.
-#. * Subject
-#.
-#: composer/e-msg-composer-hdrs.c:526
-msgid "Subject:"
-msgstr "Betreff:"
-
-#: composer/e-msg-composer-hdrs.c:535
-msgid "To:"
-msgstr "An:"
-
-#: composer/e-msg-composer-hdrs.c:536
-msgid "Enter the recipients of the message"
-msgstr "Geben Sie die Empfänger der Nachricht ein"
-
-#: composer/e-msg-composer-hdrs.c:539
-msgid "Cc:"
-msgstr "Kopie an:"
-
-#: composer/e-msg-composer-hdrs.c:540
-msgid "Enter the addresses that will receive a carbon copy of the message"
-msgstr ""
-"Geben Sie die Adressen ein, die eine Kopie der Nachricht erhalten sollen"
-
-#: composer/e-msg-composer-hdrs.c:543
-msgid "Bcc:"
-msgstr "Blindkopie an:"
-
-#: composer/e-msg-composer-hdrs.c:544
-msgid ""
-"Enter the addresses that will receive a carbon copy of the message without "
-"appearing in the recipient list of the message."
-msgstr ""
-"Geben Sie die Adressen ein, die eine Kopie erhalten, die nicht in der "
-"Empfängerliste auftaucht."
-
-#.
-#. * Post-To
-#.
-#: composer/e-msg-composer-hdrs.c:551
-msgid "Post To:"
-msgstr "Ablegen in:"
-
-#: composer/e-msg-composer-hdrs.c:553
-msgid "Posting destination"
-msgstr "Zielordner"
-
-#: composer/e-msg-composer-select-file.c:119
-msgid "Attach file(s)"
-msgstr "Datei(en) beilegen"
-
 #: data/evolution.desktop.in.h:1
 msgid "The Evolution groupware suite"
 msgstr "Die Groupware-Suite Evolution"
@@ -11156,7 +11039,7 @@ msgstr ""
 "Es existiert bereits eine Datei mit diesem Namen.\n"
 "Überschreiben?"
 
-#: e-util/e-dialog-utils.c:249
+#: e-util/e-dialog-utils.c:249 mail/mail-display.c:199
 msgid "Overwrite file?"
 msgstr "Datei überschreiben?"
 
@@ -11178,210 +11061,90 @@ msgstr "Kategorien synchronisieren"
 
 #. strptime format of a weekday, a date and a time,
 #. in 12-hour format, without seconds.
-#: e-util/e-time-utils.c:185 e-util/e-time-utils.c:398
+#: e-util/e-time-utils.c:172 e-util/e-time-utils.c:385
 msgid "%a %m/%d/%Y %I:%M %p"
 msgstr "%a, %d.%m.%Y / %I.%M %p"
 
 #. strptime format of a weekday, a date and a time,
 #. in 24-hour format, without seconds.
-#: e-util/e-time-utils.c:190 e-util/e-time-utils.c:389
+#: e-util/e-time-utils.c:177 e-util/e-time-utils.c:376
 msgid "%a %m/%d/%Y %H:%M"
 msgstr "%a, %d.%m.%Y / %H.%M"
 
 #. strptime format of a weekday, a date and a time,
 #. in 12-hour format, without minutes or seconds.
-#: e-util/e-time-utils.c:195
+#: e-util/e-time-utils.c:182
 msgid "%a %m/%d/%Y %I %p"
 msgstr "%a, %d.%m.%Y %I %p"
 
 #. strptime format of a weekday, a date and a time,
 #. in 24-hour format, without minutes or seconds.
-#: e-util/e-time-utils.c:200
+#: e-util/e-time-utils.c:187
 msgid "%a %m/%d/%Y %H"
 msgstr "%a, %d.%m.%Y %H"
 
 #. strptime format of a date and a time, in 12-hour format.
-#: e-util/e-time-utils.c:211
+#: e-util/e-time-utils.c:198
 msgid "%m/%d/%Y %I:%M:%S %p"
 msgstr "%d.%m.%Y %I:%M:%S %p"
 
 #. strptime format of a date and a time, in 24-hour format.
-#: e-util/e-time-utils.c:215
+#: e-util/e-time-utils.c:202
 msgid "%m/%d/%Y %H:%M:%S"
 msgstr "%d.%m.%Y %H:%M:%S"
 
 #. strptime format of a date and a time, in 12-hour format,
 #. without seconds.
-#: e-util/e-time-utils.c:220
+#: e-util/e-time-utils.c:207
 msgid "%m/%d/%Y %I:%M %p"
 msgstr "%d.%m.%Y / %I:%M %p"
 
 #. strptime format of a date and a time, in 24-hour format,
 #. without seconds.
-#: e-util/e-time-utils.c:225
+#: e-util/e-time-utils.c:212
 msgid "%m/%d/%Y %H:%M"
 msgstr "%d.%m.%Y %H.%M"
 
 #. strptime format of a date and a time, in 12-hour format,
 #. without minutes or seconds.
-#: e-util/e-time-utils.c:230
+#: e-util/e-time-utils.c:217
 msgid "%m/%d/%Y %I %p"
 msgstr "%d.%m.%Y %I %p"
 
 #. strptime format of a date and a time, in 24-hour format,
 #. without minutes or seconds.
-#: e-util/e-time-utils.c:235
+#: e-util/e-time-utils.c:222
 msgid "%m/%d/%Y %H"
 msgstr "%d.%m.%Y %H"
 
 #. strptime format for a time of day, in 12-hour format.
-#: e-util/e-time-utils.c:339 e-util/e-time-utils.c:438
+#: e-util/e-time-utils.c:326 e-util/e-time-utils.c:425
 msgid "%I:%M:%S %p"
 msgstr "%I:%M:%S %p"
 
 #. strptime format for a time of day, in 24-hour format.
-#: e-util/e-time-utils.c:343 e-util/e-time-utils.c:430
+#: e-util/e-time-utils.c:330 e-util/e-time-utils.c:417
 msgid "%H:%M:%S"
 msgstr "%H:%M:%S"
 
 #. strptime format for time of day, without seconds,
 #. in 12-hour format.
-#: e-util/e-time-utils.c:348 e-util/e-time-utils.c:435
-#: widgets/misc/e-dateedit.c:1417 widgets/misc/e-dateedit.c:1642
+#: e-util/e-time-utils.c:335 e-util/e-time-utils.c:422
+#: widgets/misc/e-dateedit.c:1415 widgets/misc/e-dateedit.c:1628
 msgid "%I:%M %p"
 msgstr "%I:%M %p"
 
 #. strptime format for time of day, without seconds 24-hour format.
-#: e-util/e-time-utils.c:352 e-util/e-time-utils.c:427
-#: widgets/misc/e-dateedit.c:1414 widgets/misc/e-dateedit.c:1639
+#: e-util/e-time-utils.c:339 e-util/e-time-utils.c:414
+#: widgets/misc/e-dateedit.c:1412 widgets/misc/e-dateedit.c:1625
 msgid "%H:%M"
 msgstr "%H:%M"
 
 #. strptime format for hour and AM/PM, 12-hour format.
-#: e-util/e-time-utils.c:356
+#: e-util/e-time-utils.c:343
 msgid "%I %p"
 msgstr "%I %p"
 
-#: executive-summary/component/component-factory.c:151
-#, fuzzy
-msgid "Cannot initialize Evolution's Executive Summary component."
-msgstr "Evolution-Zusammenfassungskomponente"
-
-#: executive-summary/component/e-summary.c:925
-#, fuzzy, c-format
-msgid ""
-"Cannot open the HTML file:\n"
-"%s"
-msgstr ""
-"Ordner konnte nicht umbenannt werden:\n"
-"%s"
-
-#: executive-summary/component/e-summary.c:939
-#, fuzzy, c-format
-msgid ""
-"Error reading data:\n"
-"%s"
-msgstr "Fehler beim Laden von %s"
-
-#: executive-summary/component/e-summary.c:957
-msgid "File does not have a place for the services.\n"
-msgstr ""
-
-#: executive-summary/component/e-summary-callbacks.c:125
-#, fuzzy
-msgid "Select a service"
-msgstr "Eine Datei wählen"
-
-#: executive-summary/component/e-summary-callbacks.c:289
-msgid ""
-"You can select a different HTML page for the background of the Executive "
-"Summary.\n"
-"\n"
-"Just leave it blank for the default"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:69
-#: executive-summary/component/e-summary-url.c:74
-#: executive-summary/component/e-summary-url.c:81
-#, c-format
-msgid "Open %s with the default GNOME application"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:70
-#, c-format
-msgid "Open %s with the default GNOME web browser"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:71
-#, fuzzy, c-format
-msgid "Send an email to %s"
-msgstr "Eine E-Mail verschicken"
-
-#: executive-summary/component/e-summary-url.c:72
-#, fuzzy, c-format
-msgid "Change the view to %s"
-msgstr "Typ der anzuzeigenden Ansicht"
-
-#: executive-summary/component/e-summary-url.c:73
-#, fuzzy, c-format
-msgid "Run %s"
-msgstr "URL: %s"
-
-#: executive-summary/component/e-summary-url.c:75
-#, fuzzy, c-format
-msgid "Close %s"
-msgstr "Schließen"
-
-#: executive-summary/component/e-summary-url.c:76
-#, fuzzy, c-format
-msgid "Move %s to the left"
-msgstr "Diesen Ordner an einen anderen Ort verschieben"
-
-#: executive-summary/component/e-summary-url.c:77
-#, c-format
-msgid "Move %s to the right"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:78
-#, c-format
-msgid "Move %s into the previous row"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:79
-#, c-format
-msgid "Move %s into the next row"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:80
-#, fuzzy, c-format
-msgid "Configure %s"
-msgstr "/%s neu konfigurieren"
-
-#: executive-summary/component/e-summary-url.c:553
-#, fuzzy
-msgid "page"
-msgstr "Seite"
-
-#: executive-summary/test-service/rdf-summary.c:512
-#: executive-summary/test-service/rdf-summary.c:549
-#: executive-summary/test-service/rdf-summary.c:594
-msgid "Error"
-msgstr "Fehler"
-
-#: executive-summary/test-service/rdf-summary.c:775
-msgid "Update automatically"
-msgstr ""
-
-#: executive-summary/test-service/rdf-summary.c:785
-#, fuzzy
-msgid "Update now"
-msgstr "Aktualisieren"
-
-#: executive-summary/test-service/rdf-summary.c:795
-#, fuzzy
-msgid "Update every "
-msgstr "Verfügbarkeit _aktualisieren"
-
 #: filter/filter-datespec.c:65
 msgid "1 second ago"
 msgstr "Vor 1 Sekunde"
@@ -11497,6 +11260,84 @@ msgstr "Sie müssen einen Ordner angeben"
 msgid "Select Folder"
 msgstr "Ordner wählen"
 
+#: filter/filter-input.c:191
+#, c-format
+msgid ""
+"Error in regular expression '%s':\n"
+"%s"
+msgstr ""
+"Fehler im regulären Ausdruck »%s«:\n"
+"%s"
+
+#: filter/filter-label.c:121 filter/libfilter-i18n.h:26 mail/mail-config.c:65
+#: mail/mail-config.glade.h:62 shell/e-config-upgrade.c:1411
+msgid "Important"
+msgstr "Wichtig"
+
+#. red
+#: filter/filter-label.c:122 mail/mail-config.c:66
+#: mail/mail-config.glade.h:129 shell/e-config-upgrade.c:1412
+msgid "Work"
+msgstr "Arbeit"
+
+#. orange
+#: filter/filter-label.c:123 mail/mail-config.c:67 mail/mail-config.glade.h:84
+#: shell/e-config-upgrade.c:1413
+msgid "Personal"
+msgstr "Persönlich"
+
+#. forest green
+#: filter/filter-label.c:124 mail/mail-config.c:68
+#: mail/mail-config.glade.h:120 shell/e-config-upgrade.c:1414
+msgid "To Do"
+msgstr "Zu erledigen"
+
+#. blue
+#: filter/filter-label.c:125 mail/mail-config.c:69 mail/mail-config.glade.h:66
+#: shell/e-config-upgrade.c:1415
+msgid "Later"
+msgstr "Später"
+
+#: filter/filter-part.c:531 shell/evolution-test-component.c:63
+msgid "Test"
+msgstr "Test"
+
+#: filter/filter-rule.c:219
+msgid "You must name this filter."
+msgstr "Der Filter muss benannt werden."
+
+#: filter/filter-rule.c:751
+msgid "Rule name: "
+msgstr "Regelname: "
+
+#: filter/filter-rule.c:755
+msgid "Untitled"
+msgstr "Namenlos"
+
+#: filter/filter-rule.c:772
+msgid "If"
+msgstr "Falls"
+
+#: filter/filter-rule.c:791
+msgid "Execute actions"
+msgstr "Aktionen ausführen"
+
+#: filter/filter-rule.c:795
+msgid "if all criteria are met"
+msgstr "falls alle Kriterien zutreffen"
+
+#: filter/filter-rule.c:800
+msgid "if any criteria are met"
+msgstr "falls irgendein Kriterium zutreffen"
+
+#: filter/filter-rule.c:895
+msgid "incoming"
+msgstr "Eingang"
+
+#: filter/filter-rule.c:895
+msgid "outgoing"
+msgstr "Ausgang"
+
 #: filter/filter.glade.h:1
 msgid "Compare against"
 msgstr "Vergleichen mit"
@@ -11599,84 +11440,6 @@ msgstr "mit allen lokalen Ordnern"
 msgid "years"
 msgstr "Jahre"
 
-#: filter/filter-input.c:191
-#, c-format
-msgid ""
-"Error in regular expression '%s':\n"
-"%s"
-msgstr ""
-"Fehler im regulären Ausdruck »%s«:\n"
-"%s"
-
-#: filter/filter-label.c:121 filter/libfilter-i18n.h:17 mail/mail-config.c:65
-#: mail/mail-config.glade.h:62 shell/e-config-upgrade.c:1454
-msgid "Important"
-msgstr "Wichtig"
-
-#. red
-#: filter/filter-label.c:122 mail/mail-config.c:66
-#: mail/mail-config.glade.h:129 shell/e-config-upgrade.c:1455
-msgid "Work"
-msgstr "Arbeit"
-
-#. orange
-#: filter/filter-label.c:123 mail/mail-config.c:67 mail/mail-config.glade.h:84
-#: shell/e-config-upgrade.c:1456
-msgid "Personal"
-msgstr "Persönlich"
-
-#. forest green
-#: filter/filter-label.c:124 mail/mail-config.c:68
-#: mail/mail-config.glade.h:120 shell/e-config-upgrade.c:1457
-msgid "To Do"
-msgstr "Zu erledigen"
-
-#. blue
-#: filter/filter-label.c:125 mail/mail-config.c:69 mail/mail-config.glade.h:66
-#: shell/e-config-upgrade.c:1458
-msgid "Later"
-msgstr "Später"
-
-#: filter/filter-part.c:531 shell/evolution-test-component.c:63
-msgid "Test"
-msgstr "Test"
-
-#: filter/filter-rule.c:219
-msgid "You must name this filter."
-msgstr "Der Filter muss benannt werden."
-
-#: filter/filter-rule.c:751
-msgid "Rule name: "
-msgstr "Regelname: "
-
-#: filter/filter-rule.c:755
-msgid "Untitled"
-msgstr "Namenlos"
-
-#: filter/filter-rule.c:772
-msgid "If"
-msgstr "Falls"
-
-#: filter/filter-rule.c:791
-msgid "Execute actions"
-msgstr "Aktionen ausführen"
-
-#: filter/filter-rule.c:795
-msgid "if all criteria are met"
-msgstr "falls alle Kriterien zutreffen"
-
-#: filter/filter-rule.c:800
-msgid "if any criteria are met"
-msgstr "falls irgendein Kriterium zutreffen"
-
-#: filter/filter-rule.c:895
-msgid "incoming"
-msgstr "Eingang"
-
-#: filter/filter-rule.c:895
-msgid "outgoing"
-msgstr "Ausgang"
-
 #. Automatically generated. Do not edit.
 #: filter/libfilter-i18n.h:2
 msgid "Adjust Score"
@@ -11700,217 +11463,217 @@ msgid "Beep"
 msgstr "Beep"
 
 #: filter/libfilter-i18n.h:7
+msgid "contains"
+msgstr "enthält"
+
+#: filter/libfilter-i18n.h:8
 msgid "Copy to Folder"
 msgstr "In Ordner kopieren"
 
-#: filter/libfilter-i18n.h:8
+#: filter/libfilter-i18n.h:9
 msgid "Date received"
 msgstr "Empfangsdatum"
 
-#: filter/libfilter-i18n.h:9
+#: filter/libfilter-i18n.h:10
 msgid "Date sent"
 msgstr "Verschickt-Datum"
 
-#: filter/libfilter-i18n.h:11
+#: filter/libfilter-i18n.h:12
 msgid "Deleted"
 msgstr "Gelöscht"
 
-#: filter/libfilter-i18n.h:12
-msgid "Do Not Exist"
-msgstr "Existieren nicht"
-
 #: filter/libfilter-i18n.h:13
-msgid "Draft"
-msgstr "Entwurf"
+msgid "does not contain"
+msgstr "enthält nicht"
 
 #: filter/libfilter-i18n.h:14
-msgid "Exist"
-msgstr "Existieren"
+msgid "does not end with"
+msgstr "endet nicht auf"
 
 #: filter/libfilter-i18n.h:15
-msgid "Expression"
-msgstr "Ausdruck"
+msgid "does not exist"
+msgstr "existiert nicht"
 
 #: filter/libfilter-i18n.h:16
-msgid "Follow Up"
-msgstr "Folgenachricht"
+msgid "does not return"
+msgstr "liefert nicht"
+
+#: filter/libfilter-i18n.h:17
+msgid "does not sound like"
+msgstr "klingt nicht wie"
 
 #: filter/libfilter-i18n.h:18
-msgid "Label"
-msgstr "Etikett"
+msgid "does not start with"
+msgstr "beginnt nicht mit"
 
 #: filter/libfilter-i18n.h:19
-msgid "Mailing list"
-msgstr "Mailingliste"
+msgid "Do Not Exist"
+msgstr "Existieren nicht"
 
 #: filter/libfilter-i18n.h:20
-msgid "Message Body"
-msgstr "Nachrichtenrumpf"
+msgid "Draft"
+msgstr "Entwurf"
 
 #: filter/libfilter-i18n.h:21
-msgid "Message Header"
-msgstr "Nachrichtenkopf"
+msgid "ends with"
+msgstr "endet auf"
 
 #: filter/libfilter-i18n.h:22
-msgid "Move to Folder"
-msgstr "In Ordner verschieben"
+msgid "Exist"
+msgstr "Existieren"
 
 #: filter/libfilter-i18n.h:23
-msgid "Pipe Message to Shell Command"
-msgstr "Nachricht an Befehl im Terminal weiterleiten"
+msgid "exists"
+msgstr "existiert"
 
 #: filter/libfilter-i18n.h:24
-msgid "Play Sound"
-msgstr "Klang abspielen"
-
-#: filter/libfilter-i18n.h:25 mail/message-tag-followup.c:68
-msgid "Read"
-msgstr "Gelesen"
+msgid "Expression"
+msgstr "Ausdruck"
 
-#: filter/libfilter-i18n.h:26
-msgid "Recipients"
-msgstr "Empfänger"
+#: filter/libfilter-i18n.h:25
+msgid "Follow Up"
+msgstr "Folgenachricht"
 
 #: filter/libfilter-i18n.h:27
-msgid "Regex Match"
-msgstr "Regex-Treffer"
+msgid "is"
+msgstr "ist"
 
 #: filter/libfilter-i18n.h:28
-msgid "Replied to"
-msgstr "Beantwortet"
+msgid "is after"
+msgstr "ist nach"
 
-#: filter/libfilter-i18n.h:29 filter/score-rule.c:184 filter/score-rule.c:186
-#: mail/message-list.etspec.h:10
-msgid "Score"
-msgstr "Bewertung"
+#: filter/libfilter-i18n.h:29
+msgid "is before"
+msgstr "ist vor"
 
 #: filter/libfilter-i18n.h:30
-msgid "Sender"
-msgstr "Absender"
+msgid "is Flagged"
+msgstr "ist markiert"
 
 #: filter/libfilter-i18n.h:31
-msgid "Set Status"
-msgstr "Status setzen:"
+msgid "is greater than"
+msgstr "ist größer als"
 
 #: filter/libfilter-i18n.h:32
-msgid "Shell Command"
-msgstr "Terminal-Befehl"
+msgid "is less than"
+msgstr "ist kleiner als"
 
 #: filter/libfilter-i18n.h:33
-msgid "Size (kB)"
-msgstr "Größe (kB)"
+msgid "is not"
+msgstr "ist nicht"
 
 #: filter/libfilter-i18n.h:34
-msgid "Source Account"
-msgstr "Herkunftskonto"
+msgid "is not Flagged"
+msgstr "ist nicht markiert"
 
-#: filter/libfilter-i18n.h:35
-msgid "Specific header"
-msgstr "Bestimmte Kopfzeile"
+#: filter/libfilter-i18n.h:35 mail/folder-browser.c:1840
+msgid "Label"
+msgstr "Etikett"
+
+#: filter/libfilter-i18n.h:36
+msgid "Mailing list"
+msgstr "Mailingliste"
 
 #: filter/libfilter-i18n.h:37
-msgid "Stop Processing"
-msgstr "Verarbeitung abbrechen"
+msgid "Message Body"
+msgstr "Nachrichtenrumpf"
 
-#: filter/libfilter-i18n.h:38 mail/message-list.etspec.h:13
-#: mail/message-tag-followup.c:305
-msgid "Subject"
-msgstr "Betreff"
+#: filter/libfilter-i18n.h:38
+msgid "Message Header"
+msgstr "Nachrichtenkopf"
 
 #: filter/libfilter-i18n.h:39
-msgid "Unset Status"
-msgstr "Status nicht setzen"
+msgid "Move to Folder"
+msgstr "In Ordner verschieben"
 
 #: filter/libfilter-i18n.h:40
-msgid "contains"
-msgstr "enthält"
+msgid "Pipe Message to Shell Command"
+msgstr "Nachricht an Befehl im Terminal weiterleiten"
 
 #: filter/libfilter-i18n.h:41
-msgid "does not contain"
-msgstr "enthält nicht"
+msgid "Play Sound"
+msgstr "Klang abspielen"
 
-#: filter/libfilter-i18n.h:42
-msgid "does not end with"
-msgstr "endet nicht auf"
+#: filter/libfilter-i18n.h:42 mail/message-tag-followup.c:68
+msgid "Read"
+msgstr "Gelesen"
 
 #: filter/libfilter-i18n.h:43
-msgid "does not exist"
-msgstr "existiert nicht"
+msgid "Recipients"
+msgstr "Empfänger"
 
 #: filter/libfilter-i18n.h:44
-msgid "does not return"
-msgstr "liefert nicht"
+msgid "Regex Match"
+msgstr "Regex-Treffer"
 
 #: filter/libfilter-i18n.h:45
-msgid "does not sound like"
-msgstr "klingt nicht wie"
+msgid "Replied to"
+msgstr "Beantwortet"
 
 #: filter/libfilter-i18n.h:46
-msgid "does not start with"
-msgstr "beginnt nicht mit"
+msgid "returns"
+msgstr "liefert"
 
 #: filter/libfilter-i18n.h:47
-msgid "ends with"
-msgstr "endet auf"
+msgid "returns greater than"
+msgstr "liefert größer als"
 
 #: filter/libfilter-i18n.h:48
-msgid "exists"
-msgstr "existiert"
+msgid "returns less than"
+msgstr "liefert kleiner als"
 
-#: filter/libfilter-i18n.h:49
-msgid "is Flagged"
-msgstr "ist markiert"
+#: filter/libfilter-i18n.h:49 filter/score-rule.c:184 filter/score-rule.c:186
+#: mail/message-list.etspec.h:10
+msgid "Score"
+msgstr "Bewertung"
 
-#: filter/libfilter-i18n.h:50
-msgid "is after"
-msgstr "ist nach"
+#: filter/libfilter-i18n.h:50 mail/mail-callbacks.c:1820
+msgid "Sender"
+msgstr "Absender"
 
 #: filter/libfilter-i18n.h:51
-msgid "is before"
-msgstr "ist vor"
+msgid "Set Status"
+msgstr "Status setzen:"
 
 #: filter/libfilter-i18n.h:52
-msgid "is greater than"
-msgstr "ist größer als"
+msgid "Shell Command"
+msgstr "Terminal-Befehl"
 
 #: filter/libfilter-i18n.h:53
-msgid "is less than"
-msgstr "ist kleiner als"
+msgid "Size (kB)"
+msgstr "Größe (kB)"
 
 #: filter/libfilter-i18n.h:54
-msgid "is not Flagged"
-msgstr "ist nicht markiert"
+msgid "sounds like"
+msgstr "klingt wie"
 
 #: filter/libfilter-i18n.h:55
-msgid "is not"
-msgstr "ist nicht"
+msgid "Source Account"
+msgstr "Herkunftskonto"
 
 #: filter/libfilter-i18n.h:56
-msgid "is"
-msgstr "ist"
+msgid "Specific header"
+msgstr "Bestimmte Kopfzeile"
 
 #: filter/libfilter-i18n.h:57
-msgid "returns greater than"
-msgstr "liefert größer als"
-
-#: filter/libfilter-i18n.h:58
-msgid "returns less than"
-msgstr "liefert kleiner als"
+msgid "starts with"
+msgstr "beginnt mit"
 
 #: filter/libfilter-i18n.h:59
-msgid "returns"
-msgstr "liefert"
+msgid "Stop Processing"
+msgstr "Verarbeitung abbrechen"
 
-#: filter/libfilter-i18n.h:60
-msgid "sounds like"
-msgstr "klingt wie"
+#: filter/libfilter-i18n.h:60 mail/mail-format.c:933
+#: mail/message-list.etspec.h:13 mail/message-tag-followup.c:305
+msgid "Subject"
+msgstr "Betreff"
 
 #: filter/libfilter-i18n.h:61
-msgid "starts with"
-msgstr "beginnt mit"
+msgid "Unset Status"
+msgstr "Status nicht setzen"
 
-#: filter/rule-context.c:684 filter/rule-editor.c:241 filter/rule-editor.c:326
-#: mail/mail-vfolder.c:916
+#: filter/rule-context.c:664 filter/rule-editor.c:241 filter/rule-editor.c:326
+#: mail/mail-vfolder.c:917
 #, c-format
 msgid "Rule name '%s' is not unique, choose another."
 msgstr "Regelname »%s« ist nicht eindeutig. Wählen Sie einen anderen."
@@ -11978,9 +11741,10 @@ msgid "Scanning %s"
 msgstr "%s wird abgetastet"
 
 #: importers/elm-importer.c:525 importers/netscape-importer.c:2128
-#: importers/pine-importer.c:637 mail/component-factory.c:116
-#: mail/importers/elm-importer.c:526 mail/importers/netscape-importer.c:2085
-#: mail/importers/pine-importer.c:572 my-evolution/my-evolution.glade.h:4
+#: importers/pine-importer.c:637 mail/component-factory.c:117
+#: mail/folder-browser-ui.c:362 mail/importers/elm-importer.c:526
+#: mail/importers/netscape-importer.c:2085 mail/importers/pine-importer.c:572
+#: my-evolution/my-evolution.glade.h:4
 msgid "Mail"
 msgstr "E-Mail"
 
@@ -12071,7 +11835,7 @@ msgstr "Evolution importiert Ihre alten Netscape-Daten"
 
 #. Fill in the new fields
 #: importers/netscape-importer.c:1872 mail/importers/netscape-importer.c:1842
-#: mail/mail-ops.c:1106 shell/e-local-storage.c:184
+#: mail/mail-ops.c:1092 shell/e-local-storage.c:184
 msgid "Trash"
 msgstr "Müll"
 
@@ -12121,39 +11885,100 @@ msgstr ""
 msgid "Pine"
 msgstr "Pine"
 
-#: mail/component-factory.c:116
+#: mail/GNOME_Evolution_Mail.server.in.in.h:1
+msgid "Composer Preferences"
+msgstr "Editoreinstellungen"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:2
+msgid ""
+"Configure mail preferences, including security and message display, here"
+msgstr ""
+"Hier können Sie die E-Mail-Einstellungen einschließlich der Sicherheit und "
+"der Anzeige von Nachrichten festlegen"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:3
+msgid "Configure spell-checking, signatures, and the message composer here"
+msgstr ""
+"Hier können Sie die Rechtschreibprüfung, Signaturen sowie den "
+"Nachrichteneditor konfigurieren"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:4
+msgid "Configure your email accounts here"
+msgstr "Hier können Sie Ihre E-Mail-Konten konfigurieren"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:5
+msgid "Evolution Mail"
+msgstr "Evolution E-Mail"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:6
+msgid "Evolution Mail accounts configuration control"
+msgstr "Bedienelement zur Konfiguration von Evolution-E-Mail-Konten"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:7
+msgid "Evolution Mail component"
+msgstr "Evolution-E-Mail-Komponente"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:8
+msgid "Evolution Mail composer"
+msgstr "Evolution-E-Mail-Editor"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:9
+msgid "Evolution Mail composer configuration control"
+msgstr "Bedienelement zur Konfiguration des Evolution-E-Mail-Editors"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:10
+msgid "Evolution Mail configuration interface"
+msgstr "Evolution-E-Mail-Konfigurationsoberfläche"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:11
+msgid "Evolution Mail folder viewer"
+msgstr "Evolution-E-Mail-Ordnerbetrachter"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:12
+msgid "Evolution Mail preferences control"
+msgstr "Evoltion-E-Mail-Einstellungen-Bedienelement"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:13
+msgid "Mail Accounts"
+msgstr "E-Mail-Konten"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:69
+msgid "Mail Preferences"
+msgstr "E-Mail-Einstellungen"
+
+#: mail/component-factory.c:117
 msgid "Folder containing mail"
 msgstr "Ordner, der E-Mails enthält"
 
-#: mail/component-factory.c:117
+#: mail/component-factory.c:118
 msgid "Public Mail"
 msgstr "Öffentliche E-Mail"
 
-#: mail/component-factory.c:117
+#: mail/component-factory.c:118
 msgid "Public folder containing mail"
 msgstr "Öffentlicher Ordner, der E-Mails enthält"
 
-#: mail/component-factory.c:118
+#: mail/component-factory.c:119
 msgid "Virtual Trash"
 msgstr "Virtueller Müll"
 
-#: mail/component-factory.c:118
+#: mail/component-factory.c:119
 msgid "Virtual Trash folder"
 msgstr "Virtueller Müllordner"
 
-#: mail/component-factory.c:146
+#: mail/component-factory.c:147
 msgid "This folder cannot contain messages."
 msgstr "Dieser Ordner kann keine Nachrichten aufnehmen."
 
-#: mail/component-factory.c:444
+#: mail/component-factory.c:441
 msgid "Properties..."
 msgstr "Eigenschaften..."
 
-#: mail/component-factory.c:444
+#: mail/component-factory.c:441
 msgid "Change this folder's properties"
 msgstr "Die Eigenschaften dieses Ordners festlegen"
 
-#: mail/component-factory.c:826
+#: mail/component-factory.c:823
 msgid ""
 "Some of your mail settings seem corrupt, please check that everything is in "
 "order."
@@ -12161,112 +11986,236 @@ msgstr ""
 "Einige Ihrer E-Mail-Einstellungen scheinen ungültig zu sein, bitte stellen "
 "Sie sicher, dass alles in Ordnung ist."
 
-#: mail/component-factory.c:1008
+#: mail/component-factory.c:1004
 msgid "You have not set a mail transport method"
 msgstr "Sie haben keine Methode für den Transport von E-Mails eingestellt"
 
-#: mail/component-factory.c:1031
+#: mail/component-factory.c:1027
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr ""
 "Es sind noch nicht verschickte Nachrichten vorhanden. Wollen Sie Evolution "
 "dennoch beenden?"
 
-#: mail/component-factory.c:1071
+#: mail/component-factory.c:1067
 msgid "New Mail Message"
 msgstr "Neue E-Mail-Nachricht"
 
-#: mail/component-factory.c:1071
+#: mail/component-factory.c:1067
 msgid "_Mail Message"
 msgstr "E-_Mail-Nachricht"
 
-#: mail/component-factory.c:1072
+#: mail/component-factory.c:1068
 msgid "Compose a new mail message"
 msgstr "Eine neue E-Mail-Nachricht verfassen"
 
-#: mail/component-factory.c:1080
+#: mail/component-factory.c:1076
 msgid "New Message Post"
 msgstr "Neue Ordner-Nachricht"
 
-#: mail/component-factory.c:1080
+#: mail/component-factory.c:1076
 msgid "_Post Message"
 msgstr "_Nachricht an Ordner"
 
-#: mail/component-factory.c:1081
+#: mail/component-factory.c:1077
 msgid "Post a new mail message"
 msgstr "Eine neue E-Mail-Nachricht an einen Ordner verfassen"
 
-#: mail/component-factory.c:1373
+#: mail/component-factory.c:1369
 msgid "Connecting..."
 msgstr "Verbindung wird hergestellt..."
 
-#: mail/component-factory.c:1384
+#: mail/component-factory.c:1380
 msgid "Cannot register storage with shell"
 msgstr "Speicher konnte nicht bei der Shell registriert werden"
 
-#: mail/folder-info.c:70
-msgid "Getting Folder Information"
-msgstr "Ordner-Informationen werden entnommen"
+#: mail/folder-browser-ui.c:488
+#, c-format
+msgid "Properties for \"%s\""
+msgstr "Eigenschaften von »%s«"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:1
-msgid "Composer Preferences"
-msgstr "Editoreinstellungen"
+#: mail/folder-browser-ui.c:490
+msgid "Properties"
+msgstr "Eigenschaften"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:2
-msgid ""
-"Configure mail preferences, including security and message display, here"
-msgstr ""
-"Hier können Sie die E-Mail-Einstellungen einschließlich der Sicherheit und "
-"der Anzeige von Nachrichten festlegen"
+#: mail/folder-browser.c:329 mail/mail-display.c:393 mail/mail-display.c:917
+#, c-format
+msgid "Could not create temporary directory: %s"
+msgstr "Temporäres Verzeichnis konnte nicht angelegt werden: %s"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:3
-msgid "Configure spell-checking, signatures, and the message composer here"
-msgstr ""
-"Hier können Sie die Rechtschreibprüfung, Signaturen sowie den "
-"Nachrichteneditor konfigurieren"
+#: mail/folder-browser.c:804
+#, c-format
+msgid "%d new"
+msgstr "%d neu"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:4
-msgid "Configure your email accounts here"
-msgstr "Hier können Sie Ihre E-Mail-Konten konfigurieren"
+#: mail/folder-browser.c:807 mail/folder-browser.c:815
+#: mail/folder-browser.c:818
+msgid ", "
+msgstr ", "
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:5
-msgid "Evolution Mail"
-msgstr "Evolution E-Mail"
+#: mail/folder-browser.c:809
+#, c-format
+msgid "%d hidden"
+msgstr "%d verborgen"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:6
-msgid "Evolution Mail accounts configuration control"
-msgstr "Bedienelement zur Konfiguration von Evolution-E-Mail-Konten"
+#: mail/folder-browser.c:811
+#, c-format
+msgid "%d visible"
+msgstr "%d sichtbar"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:7
-msgid "Evolution Mail component"
-msgstr "Evolution-E-Mail-Komponente"
+#: mail/folder-browser.c:816
+#, c-format
+msgid "%d selected"
+msgstr "%d ausgewählt"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:8
-msgid "Evolution Mail composer"
-msgstr "Evolution-E-Mail-Editor"
+#: mail/folder-browser.c:821
+#, c-format
+msgid "%d unsent"
+msgstr "%d nicht verschickt"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:9
-msgid "Evolution Mail composer configuration control"
-msgstr "Bedienelement zur Konfiguration des Evolution-E-Mail-Editors"
+#: mail/folder-browser.c:823
+#, c-format
+msgid "%d sent"
+msgstr "%d verschickt"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:10
-msgid "Evolution Mail configuration interface"
-msgstr "Evolution-E-Mail-Konfigurationsoberfläche"
+#: mail/folder-browser.c:825
+#, c-format
+msgid "%d total"
+msgstr "%d insgesamt"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:11
-msgid "Evolution Mail folder viewer"
-msgstr "Evolution-E-Mail-Ordnerbetrachter"
+#: mail/folder-browser.c:1204
+msgid "Create _Virtual Folder From Search..."
+msgstr "_Virtuellen Ordner aus Suche anlegen..."
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:12
-msgid "Evolution Mail preferences control"
-msgstr "Evoltion-E-Mail-Einstellungen-Bedienelement"
+#: mail/folder-browser.c:1776
+msgid "VFolder on _Subject"
+msgstr "VOrdner über _Betreff"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:13
-msgid "Mail Accounts"
-msgstr "E-Mail-Konten"
+#: mail/folder-browser.c:1777
+msgid "VFolder on Se_nder"
+msgstr "VOrdner über Abse_nder"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:69
-msgid "Mail Preferences"
-msgstr "E-Mail-Einstellungen"
+#: mail/folder-browser.c:1778
+msgid "VFolder on _Recipients"
+msgstr "VOrdner über _Empfänger"
+
+#: mail/folder-browser.c:1779
+msgid "VFolder on Mailing _List"
+msgstr "VOrdner über Mailing_liste"
+
+#: mail/folder-browser.c:1783
+msgid "Filter on Sub_ject"
+msgstr "Filter über _Betreff"
+
+#: mail/folder-browser.c:1784
+msgid "Filter on Sen_der"
+msgstr "Filter über _Absender"
+
+#: mail/folder-browser.c:1785
+msgid "Filter on Re_cipients"
+msgstr "Filter über _Empfänger"
+
+#: mail/folder-browser.c:1786 mail/folder-browser.c:2110
+msgid "Filter on _Mailing List"
+msgstr "Filter über _Mailingliste"
+
+#: mail/folder-browser.c:1804
+msgid "_Edit as New Message..."
+msgstr "Als neue Nachricht _bearbeiten..."
+
+#: mail/folder-browser.c:1806
+msgid "_Print"
+msgstr "_Drucken"
+
+#: mail/folder-browser.c:1810 ui/evolution-mail-message.xml.h:112
+msgid "_Reply to Sender"
+msgstr "Antwort an Ab_sender"
+
+#: mail/folder-browser.c:1811 ui/evolution-mail-message.xml.h:76
+msgid "Reply to _List"
+msgstr "_Liste antworten"
+
+#: mail/folder-browser.c:1812 ui/evolution-mail-message.xml.h:75
+msgid "Reply to _All"
+msgstr "_Allen antworten"
+
+#: mail/folder-browser.c:1813
+msgid "_Forward"
+msgstr "_Weiterleiten"
+
+#: mail/folder-browser.c:1817
+msgid "Follo_w Up..."
+msgstr "Follo_w Up..."
+
+#: mail/folder-browser.c:1818
+msgid "Fla_g Completed"
+msgstr "Als abgeschlossen _markieren"
+
+#: mail/folder-browser.c:1819
+msgid "Cl_ear Flag"
+msgstr "Markierung _löschen"
+
+#. separator here?
+#: mail/folder-browser.c:1823 ui/evolution-mail-message.xml.h:44
+msgid "Mar_k as Read"
+msgstr "Als gelesen mar_kieren"
+
+#: mail/folder-browser.c:1824
+msgid "Mark as _Unread"
+msgstr "Als _ungelesen markieren"
+
+#: mail/folder-browser.c:1825
+msgid "Mark as _Important"
+msgstr "Als _wichtig markieren"
+
+#: mail/folder-browser.c:1826
+msgid "_Mark as Unimportant"
+msgstr "Als unwichtig _markieren"
+
+#: mail/folder-browser.c:1831
+msgid "U_ndelete"
+msgstr "Lösche_n rückgängig"
+
+#: mail/folder-browser.c:1835
+msgid "Mo_ve to Folder..."
+msgstr "In Ordner _verschieben..."
+
+#: mail/folder-browser.c:1836 ui/evolution-addressbook.xml.h:31
+msgid "_Copy to Folder..."
+msgstr "In Ordner kopieren..."
+
+#: mail/folder-browser.c:1844
+msgid "Add Sender to Address_book"
+msgstr "Absender zum Adress_buch hinzufügen"
+
+#: mail/folder-browser.c:1848
+msgid "Appl_y Filters"
+msgstr "Filter _anwenden"
+
+#: mail/folder-browser.c:1852
+msgid "Crea_te Rule From Message"
+msgstr "_Regel aus Nachricht anlegen"
+
+#: mail/folder-browser.c:2111
+msgid "VFolder on M_ailing List"
+msgstr "VOrdner über M_ailingliste"
+
+#: mail/folder-browser.c:2113
+#, c-format
+msgid "Filter on _Mailing List (%s)"
+msgstr "Filter über _Mailingliste (%s)"
+
+#: mail/folder-browser.c:2114
+#, c-format
+msgid "VFolder on M_ailing List (%s)"
+msgstr "VOrdner über M_ailingliste (%s)"
+
+#: mail/folder-browser.h:26 mail/mail-config.glade.h:39
+msgid "Default"
+msgstr "Vorgabe"
+
+#: mail/folder-info.c:70
+msgid "Getting Folder Information"
+msgstr "Ordner-Informationen werden entnommen"
 
 #: mail/importers/GNOME_Evolution_Mail_Elm_Intelligent_Importer.server.in.in.h:1
 msgid "Evolution Elm importer"
@@ -12352,7 +12301,7 @@ msgstr "_Benutzername:"
 msgid "_Path:"
 msgstr "_Pfad:"
 
-#: mail/mail-account-gui.c:1886
+#: mail/mail-account-gui.c:1887
 msgid "You may not create two accounts with the same name."
 msgstr "Sie können keine zwei Konten mit demselben Namen anlegen."
 
@@ -12383,16 +12332,16 @@ msgstr "[Vorgabe]"
 
 #. FIXME: This routine should just be a "toggled" event handler on the checkbox cell renderer which
 #. has "activatable" set.
-#: mail/mail-accounts.c:481 mail/mail-composer-prefs.c:708
-#: mail/mail-composer-prefs.c:854
+#: mail/mail-accounts.c:481 mail/mail-accounts.etspec.h:2
+#: mail/mail-composer-prefs.c:708 mail/mail-composer-prefs.c:854
 msgid "Enabled"
 msgstr "Aktiv"
 
-#: mail/mail-accounts.c:487
+#: mail/mail-accounts.c:487 mail/mail-accounts.etspec.h:1
 msgid "Account name"
 msgstr "Kontoname"
 
-#: mail/mail-accounts.c:489
+#: mail/mail-accounts.c:489 mail/mail-accounts.etspec.h:3
 msgid "Protocol"
 msgstr "Protokoll"
 
@@ -12435,6 +12384,222 @@ msgstr ""
 "    »%s«\n"
 "Und wurden aktualisiert."
 
+#. Add the "Don't show this message again." checkbox
+#: mail/mail-callbacks.c:101 widgets/misc/e-messagebox.c:226
+msgid "Don't show this message again."
+msgstr "Diese Meldung nicht mehr anzeigen."
+
+#: mail/mail-callbacks.c:190
+msgid ""
+"You have not configured the mail client.\n"
+"You need to do this before you can send,\n"
+"receive or compose mail.\n"
+"Would you like to configure it now?"
+msgstr ""
+"Sie haben den E-Mail-Client nicht konfiguriert.\n"
+"Sie müssen dies tun, bevor Sie E-Mails verschicken,\n"
+"abrufen oder verfassen können.\n"
+"Möchten Sie ihn jetzt konfigurieren?"
+
+#: mail/mail-callbacks.c:212
+msgid ""
+"You need to configure an account\n"
+"before you can compose mail."
+msgstr ""
+"Sie müssen ein Konto einrichten,\n"
+"bevor Sie E-Mails verfassen können."
+
+#: mail/mail-callbacks.c:226
+msgid ""
+"You need to configure an identity\n"
+"before you can compose mail."
+msgstr ""
+"Sie müssen eine Identität einrichten,\n"
+"bevor Sie E-Mails verfassen können."
+
+#: mail/mail-callbacks.c:233
+msgid ""
+"You need to configure a mail transport\n"
+"before you can compose mail."
+msgstr ""
+"Sie müssen einen Mailtransport einrichten,\n"
+"bevor Sie E-Mails verfassen können."
+
+#. FIXME: this wording sucks
+#: mail/mail-callbacks.c:255
+msgid ""
+"You are sending an HTML-formatted message. Please make sure that\n"
+"the following recipients are willing and able to receive HTML mail:\n"
+msgstr ""
+"Sie verschicken eine HTML-formatierte Nachricht. Bitte stellen Sie sicher,\n"
+"dass die folgenden Empfänger HTML-Mails abrufen können und wollen:\n"
+
+#: mail/mail-callbacks.c:267
+msgid "Send anyway?"
+msgstr "Dennoch verschicken?"
+
+#: mail/mail-callbacks.c:288
+msgid ""
+"This message has no subject.\n"
+"Really send?"
+msgstr ""
+"Diese Nachricht hat keinen Betreff.\n"
+"Wirklich verschicken?"
+
+#: mail/mail-callbacks.c:314
+msgid ""
+"Since the contact list you are sending to is configured to hide the list's "
+"addresses, this message will contain only Bcc recipients."
+msgstr ""
+"Da die Kontaktliste, an die Sie diese Nachricht verschicken, konfiguriert "
+"ist, die Adressen der Liste zu verbergen, wird die Nachricht lediglich an "
+"Blindkopie-Empfängeradressen übermittlt."
+
+#: mail/mail-callbacks.c:318
+msgid "This message contains only Bcc recipients."
+msgstr "Diese Nachricht enthält ausschließlich Blindkopie-Empfänger."
+
+#: mail/mail-callbacks.c:323
+msgid ""
+"It is possible that the mail server may reveal the recipients by adding an "
+"Apparently-To header.\n"
+"Send anyway?"
+msgstr ""
+"Es ist möglich, dass der E-Mail-Server die Empfänger kenntlich macht, indem "
+"er eine Apparently-To-Kopfzeile hinzufügt.\n"
+"Dennoch verschicken?"
+
+#: mail/mail-callbacks.c:472
+msgid "You must specify recipients in order to send this message."
+msgstr "Sie müssen Empfänger angeben, um diese Nachricht zu verschicken."
+
+#: mail/mail-callbacks.c:724
+msgid ""
+"Unable to open the drafts folder for this account.\n"
+"Would you like to use the default drafts folder?"
+msgstr ""
+"Der Entwürfe-Ordner für dieses Konto konnte nicht geöffnet werden.\n"
+"Möchten Sie den voreingestellten Entwürfe-Ordner verwenden?"
+
+#: mail/mail-callbacks.c:1189
+msgid "an unknown sender"
+msgstr "ein unbekannter Absender"
+
+#: mail/mail-callbacks.c:1193
+msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
+msgstr "Am %a, %Y-%m-%d um %H.%M schrieb %%s:"
+
+#: mail/mail-callbacks.c:1700 mail/message-browser.c:132
+msgid "Move message(s) to"
+msgstr "Nachricht(en) verschieben in"
+
+#: mail/mail-callbacks.c:1702 mail/message-browser.c:134
+msgid "Copy message(s) to"
+msgstr "Nachricht(en) kopieren in"
+
+#: mail/mail-callbacks.c:2344
+#, c-format
+msgid "Are you sure you want to edit all %d messages?"
+msgstr "Sind Sie sicher, dass Sie alle %d Nachrichten bearbeiten wollen?"
+
+#: mail/mail-callbacks.c:2360
+msgid ""
+"You may only edit messages saved\n"
+"in the Drafts folder."
+msgstr ""
+"Sie können nur im Entwürfe-Ordner\n"
+"abgespeicherte Nachrichten bearbeiten."
+
+#: mail/mail-callbacks.c:2393
+msgid ""
+"You may only resend messages\n"
+"in the Sent folder."
+msgstr ""
+"Sie können nur Nachrichten im\n"
+"Verschickt-Ordner neu verschicken."
+
+#: mail/mail-callbacks.c:2403
+#, c-format
+msgid "Are you sure you want to resend all %d messages?"
+msgstr ""
+"Sind Sie sicher, dass Sie alle %d Nachrichten nochmals verschicken wollen?"
+
+#: mail/mail-callbacks.c:2424
+msgid "No Message Selected"
+msgstr "Keine Nachricht markiert"
+
+#: mail/mail-callbacks.c:2465
+#, c-format
+msgid ""
+"Cannot save to `%s'\n"
+" %s"
+msgstr ""
+"In »%s« konnte nicht gespeichert werden:\n"
+"  %s"
+
+#: mail/mail-callbacks.c:2470
+#, c-format
+msgid ""
+"`%s' already exists.\n"
+"Overwrite it?"
+msgstr ""
+"»%s« ist bereits vorhanden.\n"
+"Soll es überschrieben werden?"
+
+#: mail/mail-callbacks.c:2511
+msgid "Save Message As..."
+msgstr "Nachricht speichern unter..."
+
+#: mail/mail-callbacks.c:2513
+msgid "Save Messages As..."
+msgstr "Nachrichten speichern unter..."
+
+#: mail/mail-callbacks.c:2686
+msgid ""
+"This operation will permanently erase all messages marked as\n"
+"deleted. If you continue, you will not be able to recover these messages.\n"
+"\n"
+"Really erase these messages?"
+msgstr ""
+"Dieser Vorgang wird alle als gelöscht markierten Nachrichten dauerhaft "
+"entfernen. Falls Sie fortfahren, werden Sie diese Nachrichten nicht "
+"wiederherstellen können.\n"
+"\n"
+"Sollen die Nachrichten wirklich entfernt werden?"
+
+#: mail/mail-callbacks.c:2781
+#, c-format
+msgid ""
+"Error loading filter information:\n"
+"%s"
+msgstr ""
+"Fehler beim Laden von Filterinformation:\n"
+"%s"
+
+#: mail/mail-callbacks.c:2789
+msgid "Filters"
+msgstr "Filter"
+
+#: mail/mail-callbacks.c:2830
+#, c-format
+msgid "Page %d of %d"
+msgstr "Seite %d von %d"
+
+#: mail/mail-callbacks.c:2886
+msgid "Print Message"
+msgstr "Nachricht drucken"
+
+#: mail/mail-callbacks.c:2954
+msgid "Printing of message failed"
+msgstr "Drucken der Nachricht fehlgeschlagen"
+
+#: mail/mail-callbacks.c:3147
+#, c-format
+msgid "Are you sure you want to open all %d messages in separate windows?"
+msgstr ""
+"Sind Sie sicher, dass Sie alle %d Nachrichten in getrennten Fenstern öffnen "
+"wollen?"
+
 #: mail/mail-composer-prefs.c:226 mail/mail-composer-prefs.c:349
 #: mail/mail-config.c:1376
 msgid "Unnamed"
@@ -12460,19 +12625,11 @@ msgstr "Skript-Signatur hinzufügen"
 msgid "Signature(s)"
 msgstr "Signatur(en)"
 
-#: mail/mail-config.c:1080
-msgid "Checking Service"
-msgstr "Dienst wird überprüft"
-
-#: mail/mail-config.c:1158 mail/mail-config.c:1162
-msgid "Connecting to server..."
-msgstr "Verbindung zu Server..."
-
-#: mail/mail-config-druid.c:367 mail/mail-config.glade.h:61
+#: mail/mail-config-druid.c:380 mail/mail-config.glade.h:61
 msgid "Identity"
 msgstr "Identität"
 
-#: mail/mail-config-druid.c:369
+#: mail/mail-config-druid.c:382
 msgid ""
 "Please enter your name and email address below. The \"optional\" fields "
 "below do not need to be filled in, unless you wish to include this "
@@ -12483,11 +12640,11 @@ msgstr ""
 "ausgefüllt werden, sofern Sie diese Informationen nicht in den E-Mails, die "
 "Sie verschicken, einschließen wollen."
 
-#: mail/mail-config-druid.c:375 mail/mail-config-druid.c:382
+#: mail/mail-config-druid.c:388 mail/mail-config-druid.c:395
 msgid "Receiving Mail"
 msgstr "Abrufen von E-Mail"
 
-#: mail/mail-config-druid.c:377
+#: mail/mail-config-druid.c:390
 msgid ""
 "Please enter information about your incoming mail server below. If you are "
 "not sure, ask your system administrator or Internet Service Provider."
@@ -12496,15 +12653,15 @@ msgstr ""
 "an. Falls Sie nicht sich sicher sind, wenden Sie sich bitte an Ihren "
 "Systemadministrator oder Internet-Provider."
 
-#: mail/mail-config-druid.c:384
+#: mail/mail-config-druid.c:397
 msgid "Please select among the following options"
 msgstr "Bitte wählen Sie aus den folgenden Optionen"
 
-#: mail/mail-config-druid.c:387
+#: mail/mail-config-druid.c:400
 msgid "Sending Mail"
 msgstr "Verschicken von E-Mail"
 
-#: mail/mail-config-druid.c:389
+#: mail/mail-config-druid.c:402
 msgid ""
 "Please enter information about the way you will send mail. If you are not "
 "sure, ask your system administrator or Internet Service Provider."
@@ -12513,11 +12670,11 @@ msgstr ""
 "verschicken wollen. Falls Sie sich nicht sicher sind, wenden Sie sich bitte "
 "an Ihren Systemadministrator oder Internet-Provider."
 
-#: mail/mail-config-druid.c:394 mail/mail-config.glade.h:10
+#: mail/mail-config-druid.c:407 mail/mail-config.glade.h:10
 msgid "Account Management"
 msgstr "Kontenverwaltung"
 
-#: mail/mail-config-druid.c:396
+#: mail/mail-config-druid.c:409
 msgid ""
 "You are almost done with the mail configuration process. The identity, "
 "incoming mail server and outgoing mail transport method which you provided "
@@ -12533,6 +12690,14 @@ msgstr ""
 "dieses Konto ein.\n"
 "Dieser Name wird nur zur Anzeige auf dem Bildschirm verwendet."
 
+#: mail/mail-config.c:1080
+msgid "Checking Service"
+msgstr "Dienst wird überprüft"
+
+#: mail/mail-config.c:1158 mail/mail-config.c:1162
+msgid "Connecting to server..."
+msgstr "Verbindung zu Server..."
+
 #: mail/mail-config.glade.h:3
 msgid " _Check for supported types "
 msgstr "_Prüfen, welche Typen unterstützt werden "
@@ -12658,10 +12823,6 @@ msgstr ""
 msgid "De_fault"
 msgstr "_Vorgabe"
 
-#: mail/mail-config.glade.h:39
-msgid "Default"
-msgstr "Vorgabe"
-
 #: mail/mail-config.glade.h:40
 msgid "Default Behavior"
 msgstr "Vorgabe-Verhalten"
@@ -13113,25 +13274,218 @@ msgstr "Sichere Verbindung (_SSL) verwenden:"
 msgid "_Use the same fonts as other applications"
 msgstr "Dieselben Schriften wie die anderen Anwendungen _verwenden"
 
+#: mail/mail-config.glade.h:171
+msgid "color"
+msgstr "Farbe"
+
 #: mail/mail-config.glade.h:172
 msgid "description"
 msgstr "Beschreibung"
 
-#: mail/mail-folder-cache.c:832
+#: mail/mail-crypto.c:84
+msgid "Could not create a S/MIME signature context."
+msgstr "S/MIME-Signaturkontext konnte nicht angelegt werden."
+
+#: mail/mail-crypto.c:116
+msgid "Could not create a S/MIME certsonly context."
+msgstr "S/MIME-certsonly-Kontext konnte nicht angelegt werden."
+
+#: mail/mail-crypto.c:148
+msgid "Could not create a S/MIME encryption context."
+msgstr "S/MIME-Verschlüsselungskontext konnte nicht angelegt werden."
+
+#: mail/mail-crypto.c:180
+msgid "Could not create a S/MIME envelope context."
+msgstr "S/MIME-Umschlagkontext konnte nicht angelegt werden."
+
+#: mail/mail-crypto.c:211
+msgid "Could not create a S/MIME decode context."
+msgstr "S/MIME-Entschlüsselungskontext konnte nicht angelegt werden."
+
+#: mail/mail-display.c:196
+#, c-format
+msgid ""
+"File `%s' already exists.\n"
+"Overwrite it?"
+msgstr ""
+"Es existiert bereits eine Datei mit Namen »%s«.\n"
+"Soll diese überschrieben werden?"
+
+#: mail/mail-display.c:335
+msgid "Save Attachment"
+msgstr "Anlage speichern"
+
+#: mail/mail-display.c:408
+#, c-format
+msgid "Could not create temporary file '%s': %s"
+msgstr "Die temporäre Datei »%s« konnte nicht angelegt werden: %s"
+
+#: mail/mail-display.c:476
+msgid "Save Attachment..."
+msgstr "Anlage speichern..."
+
+#: mail/mail-display.c:477
+msgid "View Inline"
+msgstr "An Ort und Stelle anzeigen"
+
+#: mail/mail-display.c:478
+#, c-format
+msgid "Open in %s..."
+msgstr "Öffnen in %s..."
+
+#: mail/mail-display.c:538
+#, c-format
+msgid "View Inline (via %s)"
+msgstr "An Ort und Stelle anzeigen (mit %s)"
+
+#: mail/mail-display.c:542
+msgid "Hide"
+msgstr "Verbergen"
+
+#: mail/mail-display.c:562
+msgid "External Viewer"
+msgstr "Externer Betrachter"
+
+#: mail/mail-display.c:1348
+msgid "Downloading images"
+msgstr "Bilder werden heruntergeladen"
+
+#: mail/mail-display.c:1525
+msgid "Loading message content"
+msgstr "Laden des Nachrichteninhalts"
+
+#: mail/mail-display.c:1867
+msgid "Overdue:"
+msgstr "Überfallig:"
+
+#: mail/mail-display.c:1871
+msgid "by %B %d, %Y, %l:%M %P"
+msgstr "am %d. %B %Y, %H:%M"
+
+#: mail/mail-display.c:2235
+msgid "Open Link in Browser"
+msgstr "Link in Browser öffnen"
+
+#: mail/mail-display.c:2236
+msgid "Copy Link Location"
+msgstr "Linkziel kopieren"
+
+#: mail/mail-display.c:2238
+msgid "Save Link as (FIXME)"
+msgstr "Link speichern unter (FIXME)"
+
+#: mail/mail-display.c:2240
+msgid "Save Image as..."
+msgstr "Bild speichern unter..."
+
+#: mail/mail-folder-cache.c:745
 #, c-format
 msgid "Pinging %s"
 msgstr "Ping zu %s wird ermittelt"
 
+#: mail/mail-format.c:664
+#, c-format
+msgid "%s attachment"
+msgstr "%s-Anlage"
+
+#: mail/mail-format.c:706 mail/mail-format.c:1343 mail/mail-format.c:1414
+#: mail/mail-format.c:1534 mail/mail-format.c:1658 mail/mail-format.c:1683
+msgid "Could not parse MIME message. Displaying as source."
+msgstr ""
+"Die MIME-Nachricht konnte nicht verarbeitet werden und wird daher als "
+"Quellxt angezeigt."
+
+#: mail/mail-format.c:784 mail/message-list.etspec.h:2
+msgid "Date"
+msgstr "Datum"
+
+#: mail/mail-format.c:870
+msgid "Bad Address"
+msgstr "Ungültige Adresse"
+
+#: mail/mail-format.c:911 mail/message-list.etspec.h:7
+#: mail/message-tag-followup.c:301
+msgid "From"
+msgstr "Von"
+
+#: mail/mail-format.c:915
+msgid "Reply-To"
+msgstr "Antwort an"
+
+#: mail/mail-format.c:920 mail/message-list.etspec.h:14
+msgid "To"
+msgstr "An"
+
+#: mail/mail-format.c:925
+msgid "Cc"
+msgstr "Kopie"
+
+#: mail/mail-format.c:930
+msgid "Bcc"
+msgstr "Blindkopie"
+
+#: mail/mail-format.c:1457
+msgid ""
+"This message is digitally signed. Click the lock icon for more information."
+msgstr ""
+"Diese Nachricht ist digital signiert. Klicken Sie auf das Schlosssymbol, um "
+"weitere Informationen zu erhalten."
+
+#: mail/mail-format.c:1485
+msgid "Could not create a PGP verfication context"
+msgstr "Es konnte kein PGP-Überprüfungskontext angelegt werden"
+
+#: mail/mail-format.c:1493
+msgid "This message is digitally signed and has been found to be authentic."
+msgstr ""
+"Diese Nachricht ist digital unterzeichnet und wurde als authentisch "
+"nachgewiesen."
+
+#: mail/mail-format.c:1500
+msgid "This message is digitally signed but can not be proven to be authentic."
+msgstr ""
+"Diese Nachricht ist digital unterzeichnet, aber konnte nicht als authentisch "
+"nachgewiesen werden."
+
+#: mail/mail-format.c:1764
+#, c-format
+msgid "Pointer to FTP site (%s)"
+msgstr "Zeiger auf FTP-Site (%s)"
+
+#: mail/mail-format.c:1775
+#, c-format
+msgid "Pointer to local file (%s) valid at site \"%s\""
+msgstr "Zeiger auf lokale Datei (%s) gültig auf Site »%s«"
+
+#: mail/mail-format.c:1778
+#, c-format
+msgid "Pointer to local file (%s)"
+msgstr "Zeiger auf lokale Datei (%s)"
+
+#: mail/mail-format.c:1805
+#, c-format
+msgid "Pointer to remote data (%s)"
+msgstr "Zeiger auf Daten im Netz (%s)"
+
+#: mail/mail-format.c:1811
+#, c-format
+msgid "Pointer to unknown external data (\"%s\" type)"
+msgstr "Zeiger auf unbekannte externe Daten (Typ »%s«)"
+
+#: mail/mail-format.c:1813
+msgid "Malformed external-body part."
+msgstr "Ungültiger external-body-Teil."
+
 #: mail/mail-local.c:541 mail/mail-local.c:543
 #, c-format
 msgid "Local folders/%s"
 msgstr "Lokale Ordner/%s"
 
-#: mail/mail-local.c:711
+#: mail/mail-local.c:671
 msgid "Reconfiguring folder"
 msgstr "Ordner wird umkonfiguriert"
 
-#: mail/mail-local.c:792
+#: mail/mail-local.c:752
 #, c-format
 msgid ""
 "Cannot save folder metainfo; you may find you can't\n"
@@ -13140,37 +13494,37 @@ msgstr ""
 "Metainformationen zum Ordner konnten nicht gespeichert werden; Sie\n"
 "können ihn wahrscheinlich nicht mehr öffnen: %s: %s"
 
-#: mail/mail-local.c:848
+#: mail/mail-local.c:808
 #, c-format
 msgid "Cannot save folder metainfo to %s: %s"
 msgstr "Metainformationen zum Ordner können nicht in %s gespeichert werden: %s"
 
-#: mail/mail-local.c:900
+#: mail/mail-local.c:860
 #, c-format
 msgid "Cannot delete folder metadata %s: %s"
 msgstr "Ordner-Metadaten %s können nicht gelöscht werden: %s"
 
-#: mail/mail-local.c:1363
+#: mail/mail-local.c:1323
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "Wandle Ordner »%s« in »%s«-Format um"
 
-#: mail/mail-local.c:1388
+#: mail/mail-local.c:1348
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
 msgstr "Datei %s konnte nicht geladen werden"
 
-#: mail/mail-local.c:1488
+#: mail/mail-local.c:1448
 #, c-format
 msgid "Reconfigure /%s"
 msgstr "/%s neu konfigurieren"
 
-#: mail/mail-local.c:1552
+#: mail/mail-local.c:1512
 msgid "You cannot change the format of a non-local folder."
 msgstr "Sie können das Format eines nichtlokalen Ordners nicht ändern."
 
-#: mail/mail-mt.c:259
+#: mail/mail-mt.c:257
 #, c-format
 msgid ""
 "Error while '%s':\n"
@@ -13180,7 +13534,7 @@ msgstr ""
 "  %s:\n"
 "%s"
 
-#: mail/mail-mt.c:262
+#: mail/mail-mt.c:260
 #, c-format
 msgid ""
 "Error while performing operation:\n"
@@ -13189,131 +13543,118 @@ msgstr ""
 "Fehler bei folgendem Vorgangs:\n"
 "%s"
 
-#: mail/mail-mt.c:913
+#: mail/mail-mt.c:904
 msgid "Working"
 msgstr "In Arbeit"
 
-#: mail/mail-ops.c:87
+#: mail/mail-ops.c:86
 msgid "Filtering Folder"
 msgstr "Ordner wird gefiltert"
 
-#: mail/mail-ops.c:260
+#: mail/mail-ops.c:264
 msgid "Fetching Mail"
 msgstr "E-Mail wird abgerufen"
 
-#: mail/mail-ops.c:557
-#, fuzzy, c-format
-msgid "Failed to apply outgoing filters: %s"
-msgstr "E-Mail konnte nicht in temporärer Datei %s gespeichert werden: %s"
-
-#: mail/mail-ops.c:578
-#, c-format
-msgid ""
-"Failed to append to %s: %s\n"
-"Appending to local `Sent' folder instead."
-msgstr ""
-
-#: mail/mail-ops.c:587
-#, fuzzy, c-format
-msgid "Failed to append to local `Sent' folder: %s"
-msgstr "E-Mail konnte nicht in temporärer Datei %s gespeichert werden: %s"
+#: mail/mail-ops.c:550 mail/mail-ops.c:579
+msgid "However, the message was successfully sent."
+msgstr "Dennoch wurde die Nachricht erfolgreich verschickt."
 
-#: mail/mail-ops.c:629
+#: mail/mail-ops.c:611
 #, c-format
 msgid "Sending \"%s\""
 msgstr "»%s« wird verschickt"
 
-#: mail/mail-ops.c:747
+#: mail/mail-ops.c:729
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Nachricht %d von %d wird verschickt"
 
-#: mail/mail-ops.c:766
+#: mail/mail-ops.c:748
 #, c-format
 msgid "Failed on message %d of %d"
 msgstr "Fehlgeschlagen bei Nachricht %d von %d"
 
-#: mail/mail-ops.c:768
+#: mail/mail-ops.c:750 mail/mail-send-recv.c:581
 msgid "Complete."
 msgstr "Abgeschlossen."
 
-#: mail/mail-ops.c:862
+#: mail/mail-ops.c:844
 msgid "Saving message to folder"
 msgstr "Nachricht wird in Ordner gespeichert"
 
-#: mail/mail-ops.c:943
+#: mail/mail-ops.c:925
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Nachrichten werden nach %s verschoben"
 
-#: mail/mail-ops.c:943
+#: mail/mail-ops.c:925
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Nachrichten werden nach %s kopiert"
 
-#: mail/mail-ops.c:1056
+#: mail/mail-ops.c:1042
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Ordner in »%s« werden abgetastet"
 
-#: mail/mail-ops.c:1244
+#: mail/mail-ops.c:1225
 msgid "Forwarded messages"
 msgstr "Weitergeleitete Nachrichten"
 
-#: mail/mail-ops.c:1287
+#: mail/mail-ops.c:1268
 #, c-format
 msgid "Opening folder %s"
 msgstr "Ordner %s wird geöffnet"
 
-#: mail/mail-ops.c:1359
+#: mail/mail-ops.c:1340
 #, c-format
 msgid "Opening store %s"
 msgstr "Speicher %s wird geöffnet"
 
-#: mail/mail-ops.c:1437
+#: mail/mail-ops.c:1413
 #, c-format
 msgid "Removing folder %s"
 msgstr "Ordner %s wird entfernt"
 
-#: mail/mail-ops.c:1531
+#: mail/mail-ops.c:1507
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Ordner »%s« wird gespeichert"
 
-#: mail/mail-ops.c:1582
+#: mail/mail-ops.c:1558
 msgid "Refreshing folder"
 msgstr "Ordner wird aktualisiert"
 
-#: mail/mail-ops.c:1618 mail/mail-ops.c:1669
+#: mail/mail-ops.c:1594 mail/mail-ops.c:1645
 msgid "Expunging folder"
 msgstr "Ordner wird gesäubert"
 
-#: mail/mail-ops.c:1666
+#: mail/mail-ops.c:1642
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "Müll in »%s« wird geleert"
 
-#: mail/mail-ops.c:1667 my-evolution/e-summary-mail.c:483
+#: mail/mail-ops.c:1643 my-evolution/e-summary-mail.c:483
 #: shell/e-local-storage.c:1151
 msgid "Local Folders"
 msgstr "Lokale Ordner"
 
-#: mail/mail-ops.c:1742
+#: mail/mail-ops.c:1718
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Nachricht %s wird abgerufen"
 
-#: mail/mail-ops.c:1814
+#: mail/mail-ops.c:1790
 #, c-format
 msgid "Retrieving %d message(s)"
 msgstr "%d Nachricht(en) werden/wird abgerufen"
 
-#: mail/mail-ops.c:1898
+#: mail/mail-ops.c:1876
 #, c-format
 msgid "Saving %d messsage(s)"
 msgstr "%d Nachricht(en) werden/wird gespeichert"
 
-#: mail/mail-ops.c:1946
+#: mail/mail-ops.c:1924
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -13322,7 +13663,7 @@ msgstr ""
 "Ausgabedatei konnte nicht angelegt werden: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1974
+#: mail/mail-ops.c:1952
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -13331,11 +13672,11 @@ msgstr ""
 "Fehler beim Speichern der Nachrichten in: %s\n"
 "%s"
 
-#: mail/mail-ops.c:2045
+#: mail/mail-ops.c:2026
 msgid "Saving attachment"
 msgstr "Speichern der Anlage"
 
-#: mail/mail-ops.c:2062
+#: mail/mail-ops.c:2043
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -13344,74 +13685,106 @@ msgstr ""
 "Ausgabedatei konnte nicht angelegt werden: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2092
+#: mail/mail-ops.c:2073
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Daten konnten nicht geschrieben werden: %s"
 
-#: mail/mail-ops.c:2240
+#: mail/mail-ops.c:2221
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Verbindung mit %s wird getrennt"
 
-#: mail/mail-ops.c:2240
+#: mail/mail-ops.c:2221
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Verbindung mit %s wird neu aufgebaut"
 
-#: mail/mail-send-recv.c:147
+#: mail/mail-search.c:154
+msgid "(Untitled Message)"
+msgstr "(Unbenannte Nachricht)"
+
+#: mail/mail-search.c:236
+msgid "Untitled Message"
+msgstr "Unbenannte Nachricht"
+
+#: mail/mail-search.c:238
+msgid "Empty Message"
+msgstr "Leere Nachricht"
+
+#: mail/mail-search.c:287
+msgid "Find in Message"
+msgstr "In Nachricht suchen"
+
+#: mail/mail-search.c:320
+msgid "Case Sensitive"
+msgstr "Groß-/Kleinschreibung beachten"
+
+#: mail/mail-search.c:322
+msgid "Search Forward"
+msgstr "Vorwärts suchen"
+
+#: mail/mail-search.c:342
+msgid "Find:"
+msgstr "Suchen:"
+
+#: mail/mail-search.c:346
+msgid "Matches:"
+msgstr "Passt auf:"
+
+#: mail/mail-send-recv.c:146
 msgid "Cancelling..."
 msgstr "Stornieren..."
 
-#: mail/mail-send-recv.c:255
+#: mail/mail-send-recv.c:254
 #, c-format
 msgid "Server: %s, Type: %s"
 msgstr "Server: %s, Typ: %s"
 
-#: mail/mail-send-recv.c:257
+#: mail/mail-send-recv.c:256
 #, c-format
 msgid "Path: %s, Type: %s"
 msgstr "Pfad: %s, Typ: %s"
 
-#: mail/mail-send-recv.c:259
+#: mail/mail-send-recv.c:258
 #, c-format
 msgid "Type: %s"
 msgstr "Typ: %s"
 
-#: mail/mail-send-recv.c:308
+#: mail/mail-send-recv.c:306
 msgid "Send & Receive Mail"
 msgstr "E-Mails abrufen und verschicken"
 
-#: mail/mail-send-recv.c:309
+#: mail/mail-send-recv.c:307
 msgid "Cancel _All"
 msgstr "_Alles abbrechen"
 
-#: mail/mail-send-recv.c:390
+#: mail/mail-send-recv.c:389
 msgid "Updating..."
 msgstr "Aktualisieren..."
 
-#: mail/mail-send-recv.c:390 mail/mail-send-recv.c:442
+#: mail/mail-send-recv.c:390 mail/mail-send-recv.c:446
 msgid "Waiting..."
 msgstr "Warten..."
 
-#: mail/mail-session.c:229
+#: mail/mail-session.c:226
 msgid "User canceled operation."
 msgstr "Benutzer hat Aktion abgebrochen."
 
-#: mail/mail-session.c:262
+#: mail/mail-session.c:259
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Passwort für %s eingeben"
 
-#: mail/mail-session.c:264
+#: mail/mail-session.c:261
 msgid "Enter Password"
 msgstr "Geben Sie das Passwort ein"
 
-#: mail/mail-session.c:287
+#: mail/mail-session.c:284
 msgid "_Remember this password"
 msgstr "An dieses Passwort e_rinnern"
 
-#: mail/mail-session.c:288
+#: mail/mail-session.c:285
 msgid "_Remember this password for the remainder of this session"
 msgstr "Für den Rest dieser Sitzung an dieses Passwort e_rinnern"
 
@@ -13460,17 +13833,21 @@ msgstr "Weitergeleitete Nachricht - %s"
 msgid "Forwarded message"
 msgstr "Weitergeleitete Nachricht"
 
-#: mail/mail-vfolder.c:91
+#: mail/mail-tools.c:459 mail/mail-tools.c:466
+msgid "Forwarded Message"
+msgstr "Weitergeleitete Nachricht"
+
+#: mail/mail-vfolder.c:92
 #, c-format
 msgid "Setting up vfolder: %s"
 msgstr "VOrdner wird eingerichtet: %s"
 
-#: mail/mail-vfolder.c:209
+#: mail/mail-vfolder.c:210
 #, c-format
 msgid "Updating vfolders for uri: %s"
 msgstr "VOrdner werden aktualisiert für URI: %s"
 
-#: mail/mail-vfolder.c:467
+#: mail/mail-vfolder.c:468
 #, c-format
 msgid ""
 "The following vFolder(s):\n"
@@ -13483,96 +13860,101 @@ msgstr ""
 "   »%s«\n"
 "Und wurden aktualisiert."
 
-#: mail/mail-vfolder.c:776
+#: mail/mail-vfolder.c:777
 msgid "VFolders"
 msgstr "VOrdner"
 
-#: mail/mail-vfolder.c:834
+#: mail/mail-vfolder.c:835
 msgid "vFolders"
 msgstr "vOrdner"
 
-#: mail/mail-vfolder.c:873
+#: mail/mail-vfolder.c:874
 msgid "Edit VFolder"
 msgstr "VOrdner bearbeiten"
 
-#: mail/mail-vfolder.c:893
+#: mail/mail-vfolder.c:894
 #, c-format
 msgid "Trying to edit a vfolder '%s' which doesn't exist."
 msgstr ""
 "Es wurde versucht, einen vOrdner »%s« zu editieren, der nicht existiert."
 
-#: mail/mail-vfolder.c:965
+#: mail/mail-vfolder.c:966
 msgid "New VFolder"
 msgstr "Neuer VOrdner"
 
-#: mail/message-list.c:900
+#: mail/message-browser.c:233
+msgid "(No subject)"
+msgstr "(Kein Betreff)"
+
+#: mail/message-browser.c:235
+#, c-format
+msgid "%s - Message"
+msgstr "%s - Nachricht"
+
+#: mail/message-list.c:741
 msgid "Unseen"
 msgstr "Ungelesen"
 
-#: mail/message-list.c:901
+#: mail/message-list.c:742
 msgid "Seen"
 msgstr "Gelesen"
 
-#: mail/message-list.c:902
+#: mail/message-list.c:743
 msgid "Answered"
 msgstr "Beantwortet"
 
-#: mail/message-list.c:903
+#: mail/message-list.c:744
 msgid "Multiple Unseen Messages"
 msgstr "Mehrere ungelesene Nachrichten"
 
-#: mail/message-list.c:904
+#: mail/message-list.c:745
 msgid "Multiple Messages"
 msgstr "Mehrere Nachrichten"
 
-#: mail/message-list.c:908
+#: mail/message-list.c:749
 msgid "Lowest"
 msgstr "Am niedrigsten"
 
-#: mail/message-list.c:909
+#: mail/message-list.c:750
 msgid "Lower"
 msgstr "Niedriger"
 
-#: mail/message-list.c:913
+#: mail/message-list.c:754
 msgid "Higher"
 msgstr "Höher"
 
-#: mail/message-list.c:914
+#: mail/message-list.c:755
 msgid "Highest"
 msgstr "Am höchsten"
 
-#: mail/message-list.c:1231
+#: mail/message-list.c:1072
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:1238
+#: mail/message-list.c:1079
 msgid "Today %l:%M %p"
 msgstr "Heute %I:%M %p"
 
-#: mail/message-list.c:1247
+#: mail/message-list.c:1088
 msgid "Yesterday %l:%M %p"
 msgstr "Gestern %l:%M %p"
 
-#: mail/message-list.c:1259
+#: mail/message-list.c:1100
 msgid "%a %l:%M %p"
 msgstr "%a %I:%M %p"
 
-#: mail/message-list.c:1267
+#: mail/message-list.c:1108
 msgid "%b %d %l:%M %p"
 msgstr "%d. %b %H.%M"
 
-#: mail/message-list.c:1269
+#: mail/message-list.c:1110
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
-#: mail/message-list.c:3062
+#: mail/message-list.c:2649
 msgid "Generating message list"
 msgstr "Erzeugen der Nachrichtenliste"
 
-#: mail/message-list.etspec.h:2
-msgid "Date"
-msgstr "Datum"
-
 #: mail/message-list.etspec.h:3
 msgid "Due By"
 msgstr "Fällig am "
@@ -13589,10 +13971,6 @@ msgstr "Markiert"
 msgid "Follow Up Flag"
 msgstr "Folgenachricht-Markierung"
 
-#: mail/message-list.etspec.h:7 mail/message-tag-followup.c:301
-msgid "From"
-msgstr "Von"
-
 #: mail/message-list.etspec.h:8
 msgid "Original Location"
 msgstr "Ursprünglicher Speicherort"
@@ -13605,10 +13983,6 @@ msgstr "Erhalten"
 msgid "Size"
 msgstr "Größe"
 
-#: mail/message-list.etspec.h:14
-msgid "To"
-msgstr "An"
-
 #: mail/message-tag-followup.c:62
 msgid "Call"
 msgstr "Anrufen"
@@ -13625,7 +13999,7 @@ msgstr "Follow-Up"
 msgid "For Your Information"
 msgstr "Zu Ihrer Information"
 
-#: mail/message-tag-followup.c:66 ui/evolution-mail-message.xml.h:40
+#: mail/message-tag-followup.c:66 ui/evolution-mail-message.xml.h:37
 msgid "Forward"
 msgstr "Weiterleiten"
 
@@ -13633,11 +14007,11 @@ msgstr "Weiterleiten"
 msgid "No Response Necessary"
 msgstr "Keine Antwort erforderlich"
 
-#: mail/message-tag-followup.c:69 ui/evolution-mail-message.xml.h:77
+#: mail/message-tag-followup.c:69 ui/evolution-mail-message.xml.h:73
 msgid "Reply"
 msgstr "Antworten"
 
-#: mail/message-tag-followup.c:70 ui/evolution-mail-message.xml.h:78
+#: mail/message-tag-followup.c:70 ui/evolution-mail-message.xml.h:74
 msgid "Reply to All"
 msgstr "Allen antworten"
 
@@ -13671,6 +14045,39 @@ msgstr "_Fällig am:"
 msgid "_Flag:"
 msgstr "_Markierung:"
 
+#: mail/subscribe-dialog.c:230
+#, c-format
+msgid "Scanning folders under %s on \"%s\""
+msgstr "Ordner unter %s auf »%s« werden abgetastet"
+
+#: mail/subscribe-dialog.c:232
+#, c-format
+msgid "Scanning root-level folders on \"%s\""
+msgstr "Ordner der obersten Ebene auf »%s« werden abgetastet"
+
+#: mail/subscribe-dialog.c:329
+#, c-format
+msgid "Subscribing to folder \"%s\""
+msgstr "Ordner »%s« wird abonniert"
+
+#: mail/subscribe-dialog.c:331
+#, c-format
+msgid "Unsubscribing to folder \"%s\""
+msgstr "Abonnement auf Ordner »%s« wird abbestellt"
+
+#: mail/subscribe-dialog.c:1270 mail/subscribe-dialog.etspec.h:1
+#: shell/e-storage-set-view.etspec.h:2
+msgid "Folder"
+msgstr "Ordner"
+
+#: mail/subscribe-dialog.c:1499
+msgid "No server has been selected"
+msgstr "Es wurde kein Server gewählt"
+
+#: mail/subscribe-dialog.c:1598
+msgid "Please select a server."
+msgstr "Bitte wählen Sie einen Server."
+
 #: mail/subscribe-dialog.glade.h:1
 msgid "Folder Subscriptions"
 msgstr "Abonnements verwalten"
@@ -13684,123 +14091,17 @@ msgid "S_erver:"
 msgstr "_Server:"
 
 #: mail/subscribe-dialog.glade.h:4
+msgid "Scanning folders ..."
+msgstr "Ordner werden abgetastet..."
+
+#: mail/subscribe-dialog.glade.h:5
 msgid "_Subscribe"
 msgstr "_Abonnieren"
 
-#: mail/subscribe-dialog.glade.h:5
+#: mail/subscribe-dialog.glade.h:6
 msgid "_Unsubscribe"
 msgstr "Ab_bestellen"
 
-#: my-evolution/component-factory.c:56
-msgid "Folder containing the Evolution Summary"
-msgstr "Ordner mit der Evolution-Übersicht"
-
-#: my-evolution/e-summary.c:204
-msgid "%A, %B %e %Y"
-msgstr "%A, %e. %B %Y"
-
-#: my-evolution/e-summary.c:533
-msgid "Please wait..."
-msgstr "Bitte warten..."
-
-#: my-evolution/e-summary.c:622 ui/my-evolution.xml.h:2
-msgid "Print Summary"
-msgstr "Zusammenfassung drucken"
-
-#: my-evolution/e-summary.c:655
-msgid "Printing of Summary failed"
-msgstr "Drucken der Übersicht fehlgeschlagen"
-
-#: my-evolution/e-summary-calendar.c:384
-msgid "Appointments"
-msgstr "Termine"
-
-#: my-evolution/e-summary-calendar.c:392
-msgid "No appointments."
-msgstr "Keine Termine."
-
-#: my-evolution/e-summary-calendar.c:409
-msgid "%k:%M %d %B"
-msgstr "%k.%M %d. %B"
-
-#: my-evolution/e-summary-calendar.c:411
-#, fuzzy
-msgid "%l:%M%p %d %B"
-msgstr "%k.%M %d. %B"
-
-#: my-evolution/e-summary-calendar.c:429
-msgid "No description"
-msgstr "Keine Beschreibung"
-
-#: my-evolution/e-summary-mail.c:189
-msgid "Mail summary"
-msgstr "E-Mail-Zusammenfassung"
-
-#: my-evolution/e-summary-preferences.c:355
-msgid "Dictionary.com Word of the Day"
-msgstr "Dictionary.com: Wort des Tages"
-
-#: my-evolution/e-summary-preferences.c:373
-msgid "Quotes of the Day"
-msgstr "Zitate des Tages"
-
-#: my-evolution/e-summary-preferences.c:565
-msgid "New News Feed"
-msgstr "Neuer Nachrichtenkanal"
-
-#: my-evolution/e-summary-preferences.c:581
-msgid "_URL:"
-msgstr "_URL:"
-
-#: my-evolution/e-summary-rdf.c:315
-msgid "Error downloading RDF"
-msgstr "Fehler beim Herunterladen des RDF"
-
-#: my-evolution/e-summary-rdf.c:453
-msgid "News Feed"
-msgstr "Nachrichtenkanal"
-
-#: my-evolution/e-summary-shown.c:496
-msgid "All"
-msgstr "Alle"
-
-#: my-evolution/e-summary-shown.c:521 my-evolution/e-summary-table.c:58
-msgid "Shown"
-msgstr "Angezeigt"
-
-#: my-evolution/e-summary-tasks.c:349
-msgid "No tasks"
-msgstr "Keine Aufgaben"
-
-#: my-evolution/e-summary-tasks.c:387
-#, fuzzy
-msgid "blue"
-msgstr "Ambler"
-
-#: my-evolution/e-summary-tasks.c:387
-msgid "(No Description)"
-msgstr "(keine Beschreibung)"
-
-#: my-evolution/e-summary-weather.c:72
-msgid "My Weather"
-msgstr "Mein Wetter"
-
-#: my-evolution/e-summary-weather.c:261
-msgid "There was an error downloading data for"
-msgstr "Ein Fehler ist aufgetreten beim Herunterladen der Daten für"
-
-#: my-evolution/e-summary-weather.c:478 my-evolution/my-evolution.glade.h:16
-msgid "Weather"
-msgstr "Wetter"
-
-#. translators: Put here a list of codes for locations you want to
-#. see in My Evolution by default. You can find the list of all
-#. stations and their codes in Evolution sources
-#. (evolution/my-evolution/Locations)
-#: my-evolution/e-summary-weather.c:582
-msgid "KBOS"
-msgstr "KBOS"
-
 #: my-evolution/GNOME_Evolution_Summary.server.in.in.h:1
 msgid "Configure the appearance of the Evolution Summary here"
 msgstr "Hier können Sie das Erscheinungsbild von Evolution konfigurieren"
@@ -23606,6 +23907,110 @@ msgstr "Zuni Pueblo"
 msgid "Zurich"
 msgstr "Zürich"
 
+#: my-evolution/component-factory.c:56
+msgid "Folder containing the Evolution Summary"
+msgstr "Ordner mit der Evolution-Übersicht"
+
+#: my-evolution/e-summary-calendar.c:381
+msgid "Appointments"
+msgstr "Termine"
+
+#: my-evolution/e-summary-calendar.c:389
+msgid "No appointments."
+msgstr "Keine Termine."
+
+#: my-evolution/e-summary-calendar.c:406
+msgid "%k:%M %d %B"
+msgstr "%k.%M %d. %B"
+
+#: my-evolution/e-summary-calendar.c:408
+msgid "%l:%M%P %d %B"
+msgstr "%k.%M %d. %B"
+
+#: my-evolution/e-summary-calendar.c:426
+msgid "No description"
+msgstr "Keine Beschreibung"
+
+#: my-evolution/e-summary-mail.c:189
+msgid "Mail summary"
+msgstr "E-Mail-Zusammenfassung"
+
+#: my-evolution/e-summary-preferences.c:355
+msgid "Dictionary.com Word of the Day"
+msgstr "Dictionary.com: Wort des Tages"
+
+#: my-evolution/e-summary-preferences.c:373
+msgid "Quotes of the Day"
+msgstr "Zitate des Tages"
+
+#: my-evolution/e-summary-preferences.c:565
+msgid "New News Feed"
+msgstr "Neuer Nachrichtenkanal"
+
+#: my-evolution/e-summary-preferences.c:581
+msgid "_URL:"
+msgstr "_URL:"
+
+#: my-evolution/e-summary-rdf.c:315
+msgid "Error downloading RDF"
+msgstr "Fehler beim Herunterladen des RDF"
+
+#: my-evolution/e-summary-rdf.c:453
+msgid "News Feed"
+msgstr "Nachrichtenkanal"
+
+#: my-evolution/e-summary-shown.c:496
+msgid "All"
+msgstr "Alle"
+
+#: my-evolution/e-summary-shown.c:521 my-evolution/e-summary-table.c:58
+msgid "Shown"
+msgstr "Angezeigt"
+
+#: my-evolution/e-summary-tasks.c:330
+msgid "No tasks"
+msgstr "Keine Aufgaben"
+
+#: my-evolution/e-summary-tasks.c:364
+msgid "(No Description)"
+msgstr "(keine Beschreibung)"
+
+#: my-evolution/e-summary-weather.c:73
+msgid "My Weather"
+msgstr "Mein Wetter"
+
+#: my-evolution/e-summary-weather.c:262
+msgid "There was an error downloading data for"
+msgstr "Ein Fehler ist aufgetreten beim Herunterladen der Daten für"
+
+#: my-evolution/e-summary-weather.c:479 my-evolution/my-evolution.glade.h:16
+msgid "Weather"
+msgstr "Wetter"
+
+#. translators: Put here a list of codes for locations you want to
+#. see in My Evolution by default. You can find the list of all
+#. stations and their codes in Evolution sources
+#. (evolution/my-evolution/Locations)
+#: my-evolution/e-summary-weather.c:583
+msgid "KBOS"
+msgstr "KBOS"
+
+#: my-evolution/e-summary.c:204
+msgid "%A, %B %e %Y"
+msgstr "%A, %e. %B %Y"
+
+#: my-evolution/e-summary.c:533
+msgid "Please wait..."
+msgstr "Bitte warten..."
+
+#: my-evolution/e-summary.c:622 ui/my-evolution.xml.h:2
+msgid "Print Summary"
+msgstr "Zusammenfassung drucken"
+
+#: my-evolution/e-summary.c:655
+msgid "Printing of Summary failed"
+msgstr "Drucken der Übersicht fehlgeschlagen"
+
 #: my-evolution/metar.c:30
 msgid " F"
 msgstr " F"
@@ -24864,27 +25269,21 @@ msgstr "_Ein Tag"
 msgid "_Show full path for folders"
 msgstr "_Vollen Pfad für Ordner anzeigen"
 
-#: notes/component-factory.c:27
-#: shell/e-shell-user-creatable-items-handler.c:587
-#: shell/e-shell-user-creatable-items-handler.c:643
-#: widgets/misc/e-charset-picker.c:109
-msgid "New"
-msgstr "Neu"
+#: shell/GNOME_Evolution_Shell.server.in.in.h:1
+msgid "Configure special folders and offline folder behavior here"
+msgstr "Hier können Sie spezielle Ordner und Offline-Ordner konfigurieren"
 
-#: notes/component-factory.c:27
-#, fuzzy
-msgid "Create a new note"
-msgstr "Einen neuen Ordner anlegen"
+#: shell/GNOME_Evolution_Shell.server.in.in.h:2
+msgid "Evolution Shell"
+msgstr "Evolution-Shell"
 
-#: notes/component-factory.c:152
-#, fuzzy
-msgid "Cannot initialize Evolution's notes component."
-msgstr "Die Ximian-Evolution-Shell konnte nicht initialisiert werden: %s"
+#: shell/GNOME_Evolution_Shell.server.in.in.h:3
+msgid "Evolution folder settings configuration control"
+msgstr "Bedienelement zur Konfiguration von Evolution-Ordner"
 
-#: notes/main.c:30
-#, fuzzy
-msgid "Notes Component: Could not initialize bonobo"
-msgstr "Bonobo konnte nicht initialisiert werden"
+#: shell/GNOME_Evolution_Shell.server.in.in.h:4
+msgid "Folder Settings"
+msgstr "Ordnereinstellungen"
 
 #: shell/e-activity-handler.c:164
 msgid "Show Details"
@@ -24980,49 +25379,6 @@ msgstr ""
 msgid "Brought to you by"
 msgstr "Das Team:"
 
-#: shell/e-shell.c:175
-#, c-format
-msgid ""
-"Cannot activate component %s :\n"
-"The error from the activation system is:\n"
-"%s"
-msgstr ""
-"Komponente %s konnte nicht aktiviert werden:\n"
-"Der Fehler im Aktivierungssystem lautet:\n"
-"%s"
-
-#: shell/e-shell.c:741
-#, c-format
-msgid "Cannot set up local storage -- %s"
-msgstr "Lokaler Speicher konnte nicht eingestellt werden -- %s"
-
-#: shell/e-shell.c:1804
-#, c-format
-msgid ""
-"The Evolution component that handles folders of type \"%s\"\n"
-"has unexpectedly quit. You will need to quit Evolution and restart\n"
-"in order to access that data again."
-msgstr ""
-"Die Evolution-Komponente, die Ordner des Typs »%s« betreut, brach\n"
-"unerwartet ab. Sie müssen Evolution beenden und neu starten, um\n"
-"wieder auf diese Daten zugreifen zu können."
-
-#: shell/e-shell.c:2069
-msgid "Invalid arguments"
-msgstr "Ungültige Argumente"
-
-#: shell/e-shell.c:2071
-msgid "Cannot register on OAF"
-msgstr "Registrierung bei OAF konnte nicht stattfinden"
-
-#: shell/e-shell.c:2073
-msgid "Configuration Database not found"
-msgstr "Konfigurationsdatenbank nicht gefunden"
-
-#: shell/e-shell.c:2075 shell/e-storage.c:568
-msgid "Generic error"
-msgstr "Allgemeiner Fehler"
-
 #: shell/e-shell-config-autocompletion.c:110
 msgid "Extra Completion folders"
 msgstr "Extra Ordner zur Vervollständigung"
@@ -25268,27 +25624,23 @@ msgid "Automatic"
 msgstr "Automatisch"
 
 #: shell/e-shell-importer.c:643
-#, fuzzy
-msgid "_Filename:"
+msgid "Filename:"
 msgstr "Dateiname:"
 
 #: shell/e-shell-importer.c:648
 msgid "Select a file"
 msgstr "Eine Datei wählen"
 
-#: shell/e-shell-importer.c:658
-#, fuzzy
-msgid "File _type:"
+#: shell/e-shell-importer.c:657
+msgid "File type:"
 msgstr "Dateityp:"
 
-#: shell/e-shell-importer.c:684
-#, fuzzy
-msgid "Import data and settings from _older programs"
+#: shell/e-shell-importer.c:682
+msgid "Import data and settings from older programs"
 msgstr "Daten und Einstellungen aus älteren Programmen importieren"
 
-#: shell/e-shell-importer.c:687
-#, fuzzy
-msgid "Import a _single file"
+#: shell/e-shell-importer.c:686
+msgid "Import a single file"
 msgstr "Eine einzelne Datei importieren"
 
 #: shell/e-shell-importer.c:755 shell/e-shell-startup-wizard.c:553
@@ -25316,9 +25668,8 @@ msgstr "Ordner wählen"
 msgid "Select a destination folder for importing this data"
 msgstr "Geben Sie einen Zielordner für das Importieren dieser Daten an"
 
-#: shell/e-shell-importer.c:1193
-#, fuzzy
-msgid "_Import"
+#: shell/e-shell-importer.c:1192 shell/importer/intelligent.c:191
+msgid "Import"
 msgstr "Importieren"
 
 #: shell/e-shell-offline-handler.c:592
@@ -25378,19 +25729,11 @@ msgstr "Gemeinschaftsordner konnte nicht geöffnet werden: %s."
 msgid "Cannot find the specified shared folder."
 msgstr "Der angegebene Gemeinschaftsordner konnte nicht gefunden werden."
 
-#: shell/e-shell-startup-wizard.c:771
-msgid ""
-"If you quit the Evolution Setup Assistant now, all of the information that "
-"you have entered will be forgotten. You will need to run this assistant "
-"again before using Evolution.\n"
-"\n"
-"Do you want to quit using the Assistant now?"
-msgstr ""
-
-#: shell/e-shell-startup-wizard.c:782
-#, fuzzy
-msgid "Quit Assistant"
-msgstr "Assistent"
+#: shell/e-shell-user-creatable-items-handler.c:587
+#: shell/e-shell-user-creatable-items-handler.c:643
+#: widgets/misc/e-charset-picker.c:109
+msgid "New"
+msgstr "Neu"
 
 #: shell/e-shell-utils.c:116
 msgid "No folder name specified."
@@ -25412,37 +25755,6 @@ msgstr "Ordnername darf das Raute-Zeichen »#« nicht enthalten."
 msgid "'.' and '..' are reserved folder names."
 msgstr "'.' und '..' sind reservierte Ordnernamen."
 
-#: shell/e-shell-view.c:264
-msgid "(No folder displayed)"
-msgstr "(Kein Ordner angezeigt)"
-
-#: shell/e-shell-view.c:2040
-#, c-format
-msgid "%s (%d)"
-msgstr "%s (%d)"
-
-#: shell/e-shell-view.c:2042
-msgid "(None)"
-msgstr "(keine)"
-
-#: shell/e-shell-view.c:2083
-msgid ""
-"Ximian Evolution is currently online.  Click on this button to work offline."
-msgstr ""
-"Ximian Evolution ist im Augenblick online. Klicken Sie auf diesen Knopf, um "
-"offline zu arbeiten."
-
-#: shell/e-shell-view.c:2090
-msgid "Ximian Evolution is in the process of going offline."
-msgstr "Ximian Evolution geht gerade offline."
-
-#: shell/e-shell-view.c:2096
-msgid ""
-"Ximian Evolution is currently offline.  Click on this button to work online."
-msgstr ""
-"Ximian Evolution ist im Augenblick offline. Klicken Sie auf diesen Knopf, um "
-"online zu arbeiten."
-
 #: shell/e-shell-view-menu.c:89
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr ""
@@ -25494,13 +25806,79 @@ msgstr "_Offline arbeiten"
 msgid "Work Offline"
 msgstr "Offline arbeiten"
 
-#: shell/e-shortcuts.c:649
-msgid "Error saving shortcuts."
-msgstr "Fehler beim Speichern von Verknüpfungen."
+#: shell/e-shell-view.c:264
+msgid "(No folder displayed)"
+msgstr "(Kein Ordner angezeigt)"
 
-#: shell/e-shortcuts.c:1096
-msgid "Shortcuts"
-msgstr "Verknüpfungen"
+#: shell/e-shell-view.c:2040
+#, c-format
+msgid "%s (%d)"
+msgstr "%s (%d)"
+
+#: shell/e-shell-view.c:2042
+msgid "(None)"
+msgstr "(keine)"
+
+#: shell/e-shell-view.c:2083
+msgid ""
+"Ximian Evolution is currently online.  Click on this button to work offline."
+msgstr ""
+"Ximian Evolution ist im Augenblick online. Klicken Sie auf diesen Knopf, um "
+"offline zu arbeiten."
+
+#: shell/e-shell-view.c:2090
+msgid "Ximian Evolution is in the process of going offline."
+msgstr "Ximian Evolution geht gerade offline."
+
+#: shell/e-shell-view.c:2096
+msgid ""
+"Ximian Evolution is currently offline.  Click on this button to work online."
+msgstr ""
+"Ximian Evolution ist im Augenblick offline. Klicken Sie auf diesen Knopf, um "
+"online zu arbeiten."
+
+#: shell/e-shell.c:175
+#, c-format
+msgid ""
+"Cannot activate component %s :\n"
+"The error from the activation system is:\n"
+"%s"
+msgstr ""
+"Komponente %s konnte nicht aktiviert werden:\n"
+"Der Fehler im Aktivierungssystem lautet:\n"
+"%s"
+
+#: shell/e-shell.c:741
+#, c-format
+msgid "Cannot set up local storage -- %s"
+msgstr "Lokaler Speicher konnte nicht eingestellt werden -- %s"
+
+#: shell/e-shell.c:1804
+#, c-format
+msgid ""
+"The Evolution component that handles folders of type \"%s\"\n"
+"has unexpectedly quit. You will need to quit Evolution and restart\n"
+"in order to access that data again."
+msgstr ""
+"Die Evolution-Komponente, die Ordner des Typs »%s« betreut, brach\n"
+"unerwartet ab. Sie müssen Evolution beenden und neu starten, um\n"
+"wieder auf diese Daten zugreifen zu können."
+
+#: shell/e-shell.c:2069
+msgid "Invalid arguments"
+msgstr "Ungültige Argumente"
+
+#: shell/e-shell.c:2071
+msgid "Cannot register on OAF"
+msgstr "Registrierung bei OAF konnte nicht stattfinden"
+
+#: shell/e-shell.c:2073
+msgid "Configuration Database not found"
+msgstr "Konfigurationsdatenbank nicht gefunden"
+
+#: shell/e-shell.c:2075 shell/e-storage.c:568
+msgid "Generic error"
+msgstr "Allgemeiner Fehler"
 
 #: shell/e-shortcuts-view.c:80
 msgid "Create New Shortcut Group"
@@ -25616,6 +25994,18 @@ msgstr "_Entfernen"
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "Diese Verknüpfung aus der Verknüpfungsleiste entfernen"
 
+#: shell/e-shortcuts.c:649
+msgid "Error saving shortcuts."
+msgstr "Fehler beim Speichern von Verknüpfungen."
+
+#: shell/e-shortcuts.c:1096
+msgid "Shortcuts"
+msgstr "Verknüpfungen"
+
+#: shell/e-storage-set-view.etspec.h:1
+msgid "Checkbox"
+msgstr "Kontrollkästchen"
+
 #: shell/e-storage.c:566
 msgid "No error"
 msgstr "Kein Fehler"
@@ -25672,14 +26062,6 @@ msgstr "Ein Ordnersperre mit diesem Namen konnte nicht erzeugt werden"
 msgid "This operation cannot be performed in off-line mode"
 msgstr "Diese Aktion kann im Offline-Modus nicht ausgeführt werden"
 
-#: shell/e-storage-set-view.etspec.h:1
-msgid "Checkbox"
-msgstr "Kontrollkästchen"
-
-#: shell/e-storage-set-view.etspec.h:2
-msgid "Folder"
-msgstr "Ordner"
-
 #: shell/e-task-widget.c:211
 #, c-format
 msgid "%s (...)"
@@ -25694,6 +26076,43 @@ msgstr "%s (zu %d%% abgeschlossen)"
 msgid "<click here to select a folder>"
 msgstr "<Klicken Sie hier, um einen Ordner auszuwählen>"
 
+#: shell/evolution-shell-component-utils.c:124
+#, c-format
+msgid ""
+"%s\n"
+"\n"
+"Unknown error."
+msgstr ""
+"%s\n"
+"\n"
+"Unbekannter Fehler."
+
+#: shell/evolution-shell-component-utils.c:127
+#, c-format
+msgid ""
+"%s\n"
+"\n"
+"The error from the component system is:\n"
+"%s"
+msgstr ""
+"%s\n"
+"\n"
+"Der Fehler im Komponentensystem ist:\n"
+"%s"
+
+#: shell/evolution-shell-component-utils.c:134
+#, c-format
+msgid ""
+"%s\n"
+"\n"
+"The error from the activation system is:\n"
+"%s"
+msgstr ""
+"%s\n"
+"\n"
+"Der Fehler vom Aktivierungssystem ist:\n"
+"%s"
+
 #: shell/evolution-shell-component.c:1187
 msgid "CORBA error"
 msgstr "CORBA-Fehler"
@@ -25754,43 +26173,6 @@ msgstr "Keine Platz mehr frei"
 msgid "Old owner has died"
 msgstr "Alter Besitzer ist gestorben"
 
-#: shell/evolution-shell-component-utils.c:124
-#, c-format
-msgid ""
-"%s\n"
-"\n"
-"Unknown error."
-msgstr ""
-"%s\n"
-"\n"
-"Unbekannter Fehler."
-
-#: shell/evolution-shell-component-utils.c:127
-#, c-format
-msgid ""
-"%s\n"
-"\n"
-"The error from the component system is:\n"
-"%s"
-msgstr ""
-"%s\n"
-"\n"
-"Der Fehler im Komponentensystem ist:\n"
-"%s"
-
-#: shell/evolution-shell-component-utils.c:134
-#, c-format
-msgid ""
-"%s\n"
-"\n"
-"The error from the activation system is:\n"
-"%s"
-msgstr ""
-"%s\n"
-"\n"
-"Der Fehler vom Aktivierungssystem ist:\n"
-"%s"
-
 #: shell/evolution-test-component.c:63
 msgid "Test type"
 msgstr "Testtyp"
@@ -25898,22 +26280,6 @@ msgstr ""
 "\n"
 "Klicken Sie auf »Anwenden«, um Ihre Einstellungen zu speichern."
 
-#: shell/GNOME_Evolution_Shell.server.in.in.h:1
-msgid "Configure special folders and offline folder behavior here"
-msgstr "Hier können Sie spezielle Ordner und Offline-Ordner konfigurieren"
-
-#: shell/GNOME_Evolution_Shell.server.in.in.h:2
-msgid "Evolution Shell"
-msgstr "Evolution-Shell"
-
-#: shell/GNOME_Evolution_Shell.server.in.in.h:3
-msgid "Evolution folder settings configuration control"
-msgstr "Bedienelement zur Konfiguration von Evolution-Ordner"
-
-#: shell/GNOME_Evolution_Shell.server.in.in.h:4
-msgid "Folder Settings"
-msgstr "Ordnereinstellungen"
-
 #: shell/importer/import.glade.h:1
 msgid "Click \"Import\" to begin importing the file into Evolution. "
 msgstr ""
@@ -25954,10 +26320,6 @@ msgstr ""
 msgid "Importers"
 msgstr "Importeure"
 
-#: shell/importer/intelligent.c:191
-msgid "Import"
-msgstr "Importieren"
-
 #: shell/importer/intelligent.c:195
 msgid "Don't import"
 msgstr "Nicht importieren"
@@ -26152,7 +26514,7 @@ msgstr "Kontakt(e) in einen anderen Ordner verschieben..."
 msgid "Move to Folder..."
 msgstr "In Ordner verschieben..."
 
-#: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:18
+#: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:17
 msgid "Paste the clipboard"
 msgstr "Inhalt der Zwischenablage einfügen"
 
@@ -26160,8 +26522,8 @@ msgstr "Inhalt der Zwischenablage einfügen"
 msgid "Previews the contacts to be printed"
 msgstr "Eine Vorschau auf die zu druckenden Kontakte anzeigen"
 
-#: ui/evolution-addressbook.xml.h:17 ui/evolution-calendar.xml.h:20
-#: ui/evolution-comp-editor.xml.h:9 ui/evolution-mail-message.xml.h:73
+#: ui/evolution-addressbook.xml.h:17 ui/evolution-calendar.xml.h:19
+#: ui/evolution-comp-editor.xml.h:9 ui/evolution-mail-message.xml.h:69
 #: ui/evolution-tasks.xml.h:13
 msgid "Print Pre_view"
 msgstr "Druck_vorschau"
@@ -26206,21 +26568,17 @@ msgstr "Laden abbrechen"
 msgid "View the current contact"
 msgstr "Den aktuellen Kontakt anzeigen"
 
-#: ui/evolution-addressbook.xml.h:29 ui/evolution-calendar.xml.h:32
-#: ui/evolution-comp-editor.xml.h:16 ui/evolution-contact-editor.xml.h:13
-#: ui/evolution-contact-list-editor.xml.h:11
+#: ui/evolution-addressbook.xml.h:29 ui/evolution-calendar.xml.h:30
+#: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:11
+#: ui/evolution-contact-list-editor.xml.h:10
 #: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:17
-#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-messagedisplay.xml.h:4
-#: ui/evolution-mail-message.xml.h:99 ui/evolution-task-editor.xml.h:9
+#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:95
+#: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-task-editor.xml.h:9
 #: ui/evolution-tasks.xml.h:16 ui/evolution.xml.h:42
 msgid "_Actions"
 msgstr "A_ktionen"
 
-#: ui/evolution-addressbook.xml.h:31
-msgid "_Copy to Folder..."
-msgstr "In Ordner kopieren..."
-
-#: ui/evolution-addressbook.xml.h:34 ui/evolution-contact-editor.xml.h:16
+#: ui/evolution-addressbook.xml.h:34 ui/evolution-contact-editor.xml.h:13
 msgid "_Forward Contact..."
 msgstr "Kontakt _weiterleiten..."
 
@@ -26288,59 +26646,54 @@ msgstr "Zu einem bestimmten Datum gehen"
 msgid "Go to today"
 msgstr "Zum heutigen Tag gehen"
 
-#: ui/evolution-calendar.xml.h:17
+#: ui/evolution-calendar.xml.h:16
 msgid "Month"
 msgstr "Monat"
 
-#: ui/evolution-calendar.xml.h:19
+#: ui/evolution-calendar.xml.h:18
 msgid "Previews the calendar to be printed"
 msgstr "Eine Vorschau auf den zu druckenden Kalender anzeigen"
 
-#: ui/evolution-calendar.xml.h:21
+#: ui/evolution-calendar.xml.h:20
 msgid "Print this calendar"
 msgstr "Diesen Kalender drucken"
 
-#: ui/evolution-calendar.xml.h:22
+#: ui/evolution-calendar.xml.h:21
 msgid "Publish Free/Busy information for this calendar"
 msgstr "Verfügbarkeitsinformationen für diesen Kalender veröffentlichen"
 
-#: ui/evolution-calendar.xml.h:23 ui/evolution-tasks.xml.h:15
+#: ui/evolution-calendar.xml.h:22 ui/evolution-tasks.xml.h:15
 msgid "Purg_e"
 msgstr "_Säubern"
 
-#: ui/evolution-calendar.xml.h:24
+#: ui/evolution-calendar.xml.h:23
 msgid "Purge old appointments and meetings"
 msgstr "Alte Termine und Treffen säubern"
 
-#: ui/evolution-calendar.xml.h:25
-#, fuzzy
-msgid "Show as list"
-msgstr "Details anzeigen"
-
-#: ui/evolution-calendar.xml.h:26
+#: ui/evolution-calendar.xml.h:24
 msgid "Show one day"
 msgstr "Einen Tag anzeigen"
 
-#: ui/evolution-calendar.xml.h:27
+#: ui/evolution-calendar.xml.h:25
 msgid "Show one month"
 msgstr "Einen Monat anzeigen"
 
-#: ui/evolution-calendar.xml.h:28
+#: ui/evolution-calendar.xml.h:26
 msgid "Show one week"
 msgstr "Eine Woche anzeigen"
 
-#: ui/evolution-calendar.xml.h:29
+#: ui/evolution-calendar.xml.h:27
 msgid "Show the working week"
 msgstr "Die Werkwoche anzeigen"
 
-#: ui/evolution-calendar.xml.h:30
+#: ui/evolution-calendar.xml.h:28
 msgid "Week"
 msgstr "Woche"
 
-#: ui/evolution-comp-editor.xml.h:2 ui/evolution-contact-editor.xml.h:2
-#: ui/evolution-contact-list-editor.xml.h:2
+#: ui/evolution-comp-editor.xml.h:2 ui/evolution-contact-editor.xml.h:1
+#: ui/evolution-contact-list-editor.xml.h:1
 #: ui/evolution-mail-messagedisplay.xml.h:1
-#: ui/evolution-message-composer.xml.h:3 ui/evolution-signature-editor.xml.h:2
+#: ui/evolution-message-composer.xml.h:3 ui/evolution-signature-editor.xml.h:1
 #: ui/evolution.xml.h:5
 msgid "Close"
 msgstr "Schließen"
@@ -26349,7 +26702,7 @@ msgstr "Schließen"
 msgid "Close this item"
 msgstr "Diesen Eintrag schließen"
 
-#: ui/evolution-comp-editor.xml.h:5 ui/evolution-contact-editor.xml.h:4
+#: ui/evolution-comp-editor.xml.h:5 ui/evolution-contact-editor.xml.h:3
 msgid "Delete this item"
 msgstr "Diesen Eintrag löschen"
 
@@ -26362,58 +26715,47 @@ msgstr "Hauptwerkzeugleiste"
 msgid "Preview the printed item"
 msgstr "Eine Vorschau auf das zu druckende Objekt anzeigen"
 
-#: ui/evolution-comp-editor.xml.h:10 ui/evolution-contact-editor.xml.h:7
+#: ui/evolution-comp-editor.xml.h:10 ui/evolution-contact-editor.xml.h:6
 msgid "Print this item"
 msgstr "Diesen Eintrag drucken"
 
-#: ui/evolution-comp-editor.xml.h:11 ui/evolution-contact-editor.xml.h:8
-#: ui/evolution-contact-list-editor.xml.h:5
-#: ui/evolution-message-composer.xml.h:18
-msgid "Save _As..."
-msgstr "Speichern _unter..."
+#: ui/evolution-comp-editor.xml.h:12 ui/evolution-message-composer.xml.h:16
+#: ui/evolution-signature-editor.xml.h:5
+msgid "Save"
+msgstr "Speichern"
+
+#: ui/evolution-comp-editor.xml.h:13
+msgid "Save As..."
+msgstr "Speichern unter..."
 
-#: ui/evolution-comp-editor.xml.h:12 ui/evolution-contact-editor.xml.h:9
+#: ui/evolution-comp-editor.xml.h:14 ui/evolution-contact-editor.xml.h:8
 #: ui/evolution-contact-list-editor.xml.h:6
-#: ui/evolution-signature-editor.xml.h:7
+#: ui/evolution-signature-editor.xml.h:6
 msgid "Save and Close"
 msgstr "Speichern und schließen"
 
-#: ui/evolution-comp-editor.xml.h:13 ui/evolution-contact-editor.xml.h:10
-#: ui/evolution-contact-list-editor.xml.h:7
-#: ui/evolution-signature-editor.xml.h:8
-#, fuzzy
-msgid "Save and _Close"
-msgstr "Speichern und schließen"
-
-#: ui/evolution-comp-editor.xml.h:14
+#: ui/evolution-comp-editor.xml.h:15
 msgid "Save the item and close the dialog box"
 msgstr "Den Eintrag speichern und das Dialogfenster schließen"
 
-#: ui/evolution-comp-editor.xml.h:15
+#: ui/evolution-comp-editor.xml.h:16
 msgid "Save this item to disk"
 msgstr "Diesen Eintrag auf Platte speichern"
 
-#: ui/evolution-comp-editor.xml.h:18 ui/evolution-contact-editor.xml.h:15
-#: ui/evolution-contact-list-editor.xml.h:13
+#: ui/evolution-comp-editor.xml.h:18 ui/evolution-contact-editor.xml.h:12
+#: ui/evolution-contact-list-editor.xml.h:11
 #: ui/evolution-mail-messagedisplay.xml.h:7
 #: ui/evolution-message-composer.xml.h:42
-#: ui/evolution-signature-editor.xml.h:13 ui/evolution-subscribe.xml.h:11
+#: ui/evolution-signature-editor.xml.h:12 ui/evolution-subscribe.xml.h:11
 #: ui/evolution.xml.h:46
 msgid "_File"
 msgstr "_Datei"
 
-#: ui/evolution-comp-editor.xml.h:20 ui/evolution-contact-editor.xml.h:18
-#: ui/evolution-contact-list-editor.xml.h:14
-#: ui/evolution-message-composer.xml.h:47
-#: ui/evolution-signature-editor.xml.h:15
-msgid "_Save"
-msgstr "_Speichern"
-
 #: ui/evolution-composer-entries.xml.h:1
 msgid "Copy selected text to the clipboard"
 msgstr "Den markierten Text in die Zwischenablage kopieren"
 
-#: ui/evolution-composer-entries.xml.h:2 ui/evolution-mail-message.xml.h:21
+#: ui/evolution-composer-entries.xml.h:2 ui/evolution-mail-list.xml.h:3
 msgid "Cu_t"
 msgstr "_Ausschneiden"
 
@@ -26434,39 +26776,51 @@ msgstr "_Alle auswählen"
 msgid "Select all text"
 msgstr "Den gesamten Text markieren"
 
-#: ui/evolution-contact-editor.xml.h:6
+#: ui/evolution-contact-editor.xml.h:5
 msgid "Print En_velope..."
 msgstr "Umschlag drucken..."
 
-#: ui/evolution-contact-editor.xml.h:11
+#: ui/evolution-contact-editor.xml.h:7
+#: ui/evolution-contact-list-editor.xml.h:5
+#: ui/evolution-message-composer.xml.h:18
+msgid "Save _As..."
+msgstr "Speichern _unter..."
+
+#: ui/evolution-contact-editor.xml.h:9
 msgid "Save the contact and close the dialog box"
 msgstr "Den Kontakt speichern und das Dialogfenster schließen"
 
-#: ui/evolution-contact-editor.xml.h:12
+#: ui/evolution-contact-editor.xml.h:10
 msgid "Send _Message to Contact..."
 msgstr "_Nachricht an Kontakt schicken..."
 
-#: ui/evolution-contact-list-editor.xml.h:4
+#: ui/evolution-contact-editor.xml.h:15
+#: ui/evolution-contact-list-editor.xml.h:12
+#: ui/evolution-message-composer.xml.h:47
+#: ui/evolution-signature-editor.xml.h:14
+msgid "_Save"
+msgstr "_Speichern"
+
+#: ui/evolution-contact-list-editor.xml.h:3
 msgid "Delete this list"
 msgstr "Diese Liste löschen"
 
-#: ui/evolution-contact-list-editor.xml.h:8
+#: ui/evolution-contact-list-editor.xml.h:4
+msgid "Delete..."
+msgstr "Löschen..."
+
+#: ui/evolution-contact-list-editor.xml.h:7
 msgid "Save the list and close the dialog box"
 msgstr "Die Liste speichern und das Dialogfenster schließen"
 
-#: ui/evolution-contact-list-editor.xml.h:9
+#: ui/evolution-contact-list-editor.xml.h:8
 msgid "Se_nd list to other..."
 msgstr "Liste an andere schicken..."
 
-#: ui/evolution-contact-list-editor.xml.h:10
+#: ui/evolution-contact-list-editor.xml.h:9
 msgid "Send _message to list..."
 msgstr "_Nachricht an Liste schicken..."
 
-#: ui/evolution-contact-list-editor.xml.h:12
-#, fuzzy
-msgid "_Delete..."
-msgstr "Löschen..."
-
 #: ui/evolution-event-editor.xml.h:1
 msgid "Cancel Mee_ting"
 msgstr "Besprechung a_bsagen"
@@ -26541,8 +26895,7 @@ msgid "Permanently remove all deleted messages from all folders"
 msgstr "Alle gelöschten Nachrichten auf Dauer aus allen Ordnern entfernen"
 
 #: ui/evolution-mail-global.xml.h:11
-#, fuzzy
-msgid "Post Ne_w Message"
+msgid "Post New Message"
 msgstr "Nachricht an Ordner verfassen"
 
 #: ui/evolution-mail-global.xml.h:12
@@ -26577,19 +26930,14 @@ msgstr "_Vorschaufläche"
 msgid "Change the properties of this folder"
 msgstr "Die Eigenschaften dieses Ordners ändern"
 
-#: ui/evolution-mail-list.xml.h:2 ui/evolution-mail-message.xml.h:10
+#: ui/evolution-mail-list.xml.h:2
 msgid "Copy selected message(s) to the clipboard"
 msgstr "Die markierte(n) Nachricht(en) in die Zwischenablage kopieren"
 
-#: ui/evolution-mail-list.xml.h:3 ui/evolution-mail-message.xml.h:22
+#: ui/evolution-mail-list.xml.h:4
 msgid "Cut selected message(s) to the clipboard"
 msgstr "Die markierte(n) Nachricht(en) in die Zwischenablage verschieben"
 
-#: ui/evolution-mail-list.xml.h:4
-#, fuzzy
-msgid "E_xpunge"
-msgstr "_Säubern"
-
 #: ui/evolution-mail-list.xml.h:5
 msgid "Hide S_elected Messages"
 msgstr "_Gewählte Nachrichten verbergen"
@@ -26616,7 +26964,7 @@ msgstr "Alle als _gelesen markieren"
 msgid "Mark all visible messages as read"
 msgstr "Alle sichtbaren Nachrichten als gelesen markieren"
 
-#: ui/evolution-mail-list.xml.h:11 ui/evolution-mail-message.xml.h:66
+#: ui/evolution-mail-list.xml.h:11
 msgid "Paste message(s) from the clipboard"
 msgstr "Die in der Zwischenablage befindliche(n) Nachricht(en) einfügen"
 
@@ -26661,37 +27009,26 @@ msgstr "Die markierten Nachrichten zeitweilig verbergen"
 msgid "Threaded Message list"
 msgstr "Nachrichtenliste in Threads ordnen"
 
-#: ui/evolution-mail-list.xml.h:25 ui/evolution.xml.h:47
+#: ui/evolution-mail-list.xml.h:26
+msgid "_Expunge"
+msgstr "_Säubern"
+
+#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:47
 msgid "_Folder"
 msgstr "_Ordner"
 
-#: ui/evolution-mail-list.xml.h:26 ui/evolution-subscribe.xml.h:12
+#: ui/evolution-mail-list.xml.h:28 ui/evolution-subscribe.xml.h:12
 msgid "_Invert Selection"
 msgstr "Auswahl _umkehren"
 
-#: ui/evolution-mail-list.xml.h:27
+#: ui/evolution-mail-list.xml.h:30
 msgid "_Properties..."
 msgstr "Ei_genschaften..."
 
-#: ui/evolution-mail-list.xml.h:28
+#: ui/evolution-mail-list.xml.h:31
 msgid "_Threaded Message List"
 msgstr "Nachrichtenliste nach _Threads ordnen"
 
-#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:6
-msgid "Close this window"
-msgstr "Dieses Fenster schließen"
-
-#: ui/evolution-mail-messagedisplay.xml.h:5
-#: ui/evolution-message-composer.xml.h:39 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:43
-msgid "_Close"
-msgstr "Schließen"
-
-#: ui/evolution-mail-messagedisplay.xml.h:8
-#: ui/evolution-message-composer.xml.h:49 ui/evolution.xml.h:64
-msgid "_View"
-msgstr "_Ansicht"
-
 #: ui/evolution-mail-message.xml.h:1
 msgid "A_dd Sender to Addressbook"
 msgstr "Absender zum Adressbuch _hinzufügen"
@@ -26724,398 +27061,396 @@ msgstr "Eine Antwort an die Mailingliste der markierten Nachricht verfassen"
 msgid "Compose a reply to the sender of the selected message"
 msgstr "Eine Antwort an den Absender der markierten Nachricht verfassen"
 
-#: ui/evolution-mail-message.xml.h:11
+#: ui/evolution-mail-message.xml.h:10
 msgid "Copy selected messages to another folder"
 msgstr "Die markierten Nachrichten in einen anderen Ordner kopieren"
 
-#: ui/evolution-mail-message.xml.h:12
+#: ui/evolution-mail-message.xml.h:11
 msgid "Create _Virtual Folder From Message"
 msgstr "_Virtuellen Ordner aus Nachricht erzeugen"
 
-#: ui/evolution-mail-message.xml.h:13
+#: ui/evolution-mail-message.xml.h:12
 msgid "Create a rule to filter messages from this sender"
 msgstr "Eine Regel anlegen, um Nachrichten von diesem Absender zu filtern"
 
-#: ui/evolution-mail-message.xml.h:14
+#: ui/evolution-mail-message.xml.h:13
 msgid "Create a rule to filter messages to these recipients"
 msgstr "Eine Regel anlegen, um Nachrichten an diese Empfänger zu filtern"
 
-#: ui/evolution-mail-message.xml.h:15
+#: ui/evolution-mail-message.xml.h:14
 msgid "Create a rule to filter messages to this mailing list"
 msgstr "Eine Regel anlegen, um Nachrichten an diese Mailingliste zu filtern"
 
-#: ui/evolution-mail-message.xml.h:16
+#: ui/evolution-mail-message.xml.h:15
 msgid "Create a rule to filter messages with this subject"
 msgstr "Eine Regel anlegen, um Nachrichten mit diesem Betreff zu filtern"
 
-#: ui/evolution-mail-message.xml.h:17
+#: ui/evolution-mail-message.xml.h:16
 msgid "Create a virtual folder for these recipients"
 msgstr "Einen virtuellen Ordner für diese Empfänger anlegen"
 
-#: ui/evolution-mail-message.xml.h:18
+#: ui/evolution-mail-message.xml.h:17
 msgid "Create a virtual folder for this mailing list"
 msgstr "Einen virtuellen Ordner für diese Mailingliste anlegen"
 
-#: ui/evolution-mail-message.xml.h:19
+#: ui/evolution-mail-message.xml.h:18
 msgid "Create a virtual folder for this sender"
 msgstr "Einen virtuellen Ordner für diesen Absender anlegen"
 
-#: ui/evolution-mail-message.xml.h:20
+#: ui/evolution-mail-message.xml.h:19
 msgid "Create a virtual folder for this subject"
 msgstr "Einen virtuellen Ordner für diesen Betreff anlegen"
 
-#: ui/evolution-mail-message.xml.h:23
+#: ui/evolution-mail-message.xml.h:20
 msgid "Decrease the text size"
 msgstr "Die Textgröße heruntersetzen"
 
-#: ui/evolution-mail-message.xml.h:25
+#: ui/evolution-mail-message.xml.h:22
 msgid "Display the next important message"
 msgstr "Die nächste wichtige Nachricht anzeigen"
 
-#: ui/evolution-mail-message.xml.h:26
+#: ui/evolution-mail-message.xml.h:23
 msgid "Display the next message"
 msgstr "Die nächste Nachricht anzeigen"
 
-#: ui/evolution-mail-message.xml.h:27
+#: ui/evolution-mail-message.xml.h:24
 msgid "Display the next unread message"
 msgstr "Die nächste ungelesene Nachricht anzeigen"
 
-#: ui/evolution-mail-message.xml.h:28
+#: ui/evolution-mail-message.xml.h:25
 msgid "Display the next unread thread"
 msgstr "Den nächsten ungelesenen Thread anzeigen"
 
-#: ui/evolution-mail-message.xml.h:29
+#: ui/evolution-mail-message.xml.h:26
 msgid "Display the previous important message"
 msgstr "Die letzte wichtige Nachricht anzeigen"
 
-#: ui/evolution-mail-message.xml.h:30
+#: ui/evolution-mail-message.xml.h:27
 msgid "Display the previous message"
 msgstr "Die vorhergehende Nachricht anzeigen"
 
-#: ui/evolution-mail-message.xml.h:31
+#: ui/evolution-mail-message.xml.h:28
 msgid "Display the previous unread message"
 msgstr "Die letzte ungelesene Nachricht anzeigen"
 
-#: ui/evolution-mail-message.xml.h:32
+#: ui/evolution-mail-message.xml.h:29
 msgid "F_orward"
 msgstr "_Weiterleiten"
 
-#: ui/evolution-mail-message.xml.h:33
+#: ui/evolution-mail-message.xml.h:30
 msgid "Filter on Mailing _List..."
 msgstr "Filter über Mailing_liste..."
 
-#: ui/evolution-mail-message.xml.h:34
+#: ui/evolution-mail-message.xml.h:31
 msgid "Filter on Se_nder..."
 msgstr "Filter über _Absender..."
 
-#: ui/evolution-mail-message.xml.h:35
+#: ui/evolution-mail-message.xml.h:32
 msgid "Filter on _Recipients..."
 msgstr "Filter über _Empfänger..."
 
-#: ui/evolution-mail-message.xml.h:36
+#: ui/evolution-mail-message.xml.h:33
 msgid "Filter on _Subject..."
 msgstr "Filter über _Betreff..."
 
-#: ui/evolution-mail-message.xml.h:37
+#: ui/evolution-mail-message.xml.h:34
 msgid "Flag selected message(s) for follow-up"
 msgstr "Die markierte(n) Nachricht(en) als Follow-Up markieren"
 
-#: ui/evolution-mail-message.xml.h:38
+#: ui/evolution-mail-message.xml.h:35
 msgid "Follow _Up..."
 msgstr "_Folgenachricht..."
 
-#: ui/evolution-mail-message.xml.h:39
+#: ui/evolution-mail-message.xml.h:36
 msgid "Force images in HTML mail to be loaded"
 msgstr "Laden von Bildern in HTML-Mail erzwingen"
 
-#: ui/evolution-mail-message.xml.h:41
+#: ui/evolution-mail-message.xml.h:38
 msgid "Forward the selected message in the body of a new message"
 msgstr "Die markierte Nachricht im Rumpf einer neuen Nachricht weiterleiten"
 
-#: ui/evolution-mail-message.xml.h:42
+#: ui/evolution-mail-message.xml.h:39
 msgid "Forward the selected message quoted like a reply"
 msgstr "Die markierte Nachricht als Zitat wie in einer Antwort weiterleiten"
 
-#: ui/evolution-mail-message.xml.h:43
+#: ui/evolution-mail-message.xml.h:40
 msgid "Forward the selected message to someone"
 msgstr "Die markierte Nachricht an jemanden weiterleiten"
 
-#: ui/evolution-mail-message.xml.h:44
+#: ui/evolution-mail-message.xml.h:41
 msgid "Forward the selected message to someone as an attachment"
 msgstr "Die markierte Nachricht an jemanden als Anlage weiterleiten"
 
-#: ui/evolution-mail-message.xml.h:45
+#: ui/evolution-mail-message.xml.h:42
 msgid "Increase the text size"
 msgstr "Die Textgröße heraufsetzen"
 
-#: ui/evolution-mail-message.xml.h:46
+#: ui/evolution-mail-message.xml.h:43
 msgid "Load _Images"
 msgstr "_Bilder laden"
 
-#: ui/evolution-mail-message.xml.h:47
-msgid "Mar_k as Read"
-msgstr "Als gelesen mar_kieren"
-
-#: ui/evolution-mail-message.xml.h:48
+#: ui/evolution-mail-message.xml.h:45
 msgid "Mark as I_mportant"
 msgstr "Als _wichtig markieren"
 
-#: ui/evolution-mail-message.xml.h:49
+#: ui/evolution-mail-message.xml.h:46
 msgid "Mark as U_nread"
 msgstr "Als ungelesen markieren"
 
-#: ui/evolution-mail-message.xml.h:50
+#: ui/evolution-mail-message.xml.h:47
 msgid "Mark as Unimp_ortant"
 msgstr "Als _unwichtig markieren"
 
-#: ui/evolution-mail-message.xml.h:51
+#: ui/evolution-mail-message.xml.h:48
 msgid "Mark the selected message(s) as having been read"
 msgstr "Die markierte(n) Nachricht(en) als gelesen markieren"
 
-#: ui/evolution-mail-message.xml.h:52
+#: ui/evolution-mail-message.xml.h:49
 msgid "Mark the selected message(s) as important"
 msgstr "Die markierte(n) Nachricht(en) als wichtig markieren"
 
-#: ui/evolution-mail-message.xml.h:53
+#: ui/evolution-mail-message.xml.h:50
 msgid "Mark the selected message(s) as not having been read"
 msgstr "Die markierte(n) Nachricht(en) als ungelesen markieren"
 
-#: ui/evolution-mail-message.xml.h:54
+#: ui/evolution-mail-message.xml.h:51
 msgid "Mark the selected message(s) as unimportant"
 msgstr "Die markierte(n) Nachricht(en) als unwichtig markieren"
 
-#: ui/evolution-mail-message.xml.h:55
+#: ui/evolution-mail-message.xml.h:52
 msgid "Mark the selected messages for deletion"
 msgstr "Alle sichtbaren Nachrichten zum Löschen vorsehen"
 
-#: ui/evolution-mail-message.xml.h:56
+#: ui/evolution-mail-message.xml.h:53
 msgid "Move"
 msgstr "Verschieben"
 
-#: ui/evolution-mail-message.xml.h:57
+#: ui/evolution-mail-message.xml.h:54
 msgid "Move selected message(s) to another folder"
 msgstr "Die markierte(n) Nachricht(en) in einen anderen Ordner verschieben"
 
-#: ui/evolution-mail-message.xml.h:58
+#: ui/evolution-mail-message.xml.h:55
 msgid "Next"
 msgstr "Weiter"
 
-#: ui/evolution-mail-message.xml.h:59
+#: ui/evolution-mail-message.xml.h:56
 msgid "Next _Important Message"
 msgstr "Nächste _wichtige Nachricht"
 
-#: ui/evolution-mail-message.xml.h:60
+#: ui/evolution-mail-message.xml.h:57
 msgid "Next _Thread"
 msgstr "Nächster _Thread"
 
-#: ui/evolution-mail-message.xml.h:61
+#: ui/evolution-mail-message.xml.h:58
 msgid "Next _Unread Message"
 msgstr "Nächste _ungelesene Nachricht"
 
-#: ui/evolution-mail-message.xml.h:62
+#: ui/evolution-mail-message.xml.h:59
 msgid "Open the selected message in a new window"
 msgstr "Die markierte Nachricht in einem neuen Fenster öffnen"
 
-#: ui/evolution-mail-message.xml.h:63
+#: ui/evolution-mail-message.xml.h:60
 msgid "Open the selected message in the composer to re-send it"
 msgstr ""
 "Die markierte Nachrichte im E-Mail-Editor öffnen, um sie nochmals zu "
 "verschicken"
 
-#: ui/evolution-mail-message.xml.h:64
+#: ui/evolution-mail-message.xml.h:61
 msgid "Original Si_ze"
 msgstr "Original_größe"
 
-#: ui/evolution-mail-message.xml.h:65
+#: ui/evolution-mail-message.xml.h:62
 msgid "P_revious Unread Message"
 msgstr "_Letzte ungelesene Nachricht"
 
-#: ui/evolution-mail-message.xml.h:67
-#, fuzzy
-msgid "Post a Repl_y"
+#: ui/evolution-mail-message.xml.h:63
+msgid "Post a Reply"
 msgstr "Eine Antwort verfassen"
 
-#: ui/evolution-mail-message.xml.h:68
+#: ui/evolution-mail-message.xml.h:64
 msgid "Post a reply to a message in a Public folder"
 msgstr "Eine Antwort auf eine Nachricht in einem öffentlichen Ordner verfassen"
 
-#: ui/evolution-mail-message.xml.h:69
+#: ui/evolution-mail-message.xml.h:65
 msgid "Pr_evious Important Message"
 msgstr "V_orherige wichtige Nachricht"
 
-#: ui/evolution-mail-message.xml.h:70
+#: ui/evolution-mail-message.xml.h:66
 msgid "Preview the message to be printed"
 msgstr "Eine Vorschau auf die zu druckende Nachricht anzeigen"
 
-#: ui/evolution-mail-message.xml.h:71
+#: ui/evolution-mail-message.xml.h:67
 msgid "Previous"
 msgstr "Zurück"
 
-#: ui/evolution-mail-message.xml.h:74
+#: ui/evolution-mail-message.xml.h:70
 msgid "Print this message"
 msgstr "Diese Nachricht drucken"
 
-#: ui/evolution-mail-message.xml.h:75
+#: ui/evolution-mail-message.xml.h:71
 msgid "Re_direct"
 msgstr "_Weiterleiten"
 
-#: ui/evolution-mail-message.xml.h:76
+#: ui/evolution-mail-message.xml.h:72
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "Die markierte Nachricht an jemanden weiterleiten"
 
-#: ui/evolution-mail-message.xml.h:79
-msgid "Reply to _All"
-msgstr "_Allen antworten"
-
-#: ui/evolution-mail-message.xml.h:80
-msgid "Reply to _List"
-msgstr "_Liste antworten"
-
-#: ui/evolution-mail-message.xml.h:81
+#: ui/evolution-mail-message.xml.h:77
 msgid "Reset the text to its original size"
 msgstr "Den Text auf seine Originalgröße zurücksetzen"
 
-#: ui/evolution-mail-message.xml.h:82
-#, fuzzy
-msgid "S_earch in Message..."
+#: ui/evolution-mail-message.xml.h:78
+msgid "S_earch Message..."
 msgstr "Nachricht durch_suchen..."
 
-#: ui/evolution-mail-message.xml.h:83
+#: ui/evolution-mail-message.xml.h:79
 msgid "S_maller"
 msgstr "_Kleiner"
 
-#: ui/evolution-mail-message.xml.h:84
+#: ui/evolution-mail-message.xml.h:80
 msgid "Save the message as a text file"
 msgstr "Die Nachricht als Textdatei speichern"
 
-#: ui/evolution-mail-message.xml.h:85
+#: ui/evolution-mail-message.xml.h:81
 msgid "Search for text in the body of the displayed message"
 msgstr "Im Rumpf der angezeigten Nachricht nach einem Text suchen"
 
-#: ui/evolution-mail-message.xml.h:86
+#: ui/evolution-mail-message.xml.h:82
 msgid "Set up the page settings for your current printer"
 msgstr "Die Seiteneinstellungen für Ihren aktuellen Drucker festlegen"
 
-#: ui/evolution-mail-message.xml.h:87
+#: ui/evolution-mail-message.xml.h:83
 msgid "Show Email _Source"
 msgstr "E-Mail-_Quelltext anzeigen"
 
-#: ui/evolution-mail-message.xml.h:88
+#: ui/evolution-mail-message.xml.h:84
 msgid "Show Full _Headers"
 msgstr "Alle _Kopfzeilen anzeigen"
 
-#: ui/evolution-mail-message.xml.h:89
+#: ui/evolution-mail-message.xml.h:85
 msgid "Show a blinking cursor in the body of displayed messages"
 msgstr "Im Rumpf der angezeigten Nachricht einen blinkenden Cursor anzeigen"
 
-#: ui/evolution-mail-message.xml.h:90
+#: ui/evolution-mail-message.xml.h:86
 msgid "Show message in the normal style"
 msgstr "Nachricht im normalen Stil anzeigen"
 
-#: ui/evolution-mail-message.xml.h:91
+#: ui/evolution-mail-message.xml.h:87
 msgid "Show message with all email headers"
 msgstr "Nachricht mit allen E-Mail-Kopfzeilen anzeigen"
 
-#: ui/evolution-mail-message.xml.h:92
+#: ui/evolution-mail-message.xml.h:88
 msgid "Show the raw email source of the message"
 msgstr "Den zugrunde liegenden E-Mail-Quelltext dieser Nachricht anzeigen"
 
-#: ui/evolution-mail-message.xml.h:93
+#: ui/evolution-mail-message.xml.h:89
 msgid "Text Si_ze"
 msgstr "Te_xtgröße"
 
-#: ui/evolution-mail-message.xml.h:94
+#: ui/evolution-mail-message.xml.h:90
 msgid "Un-delete the selected messages"
 msgstr "Löschen der markierten Nachrichten rückgängig machen"
 
-#: ui/evolution-mail-message.xml.h:95
+#: ui/evolution-mail-message.xml.h:91
 msgid "VFolder on Mailing _List..."
 msgstr "VOrdner über Mailing_liste..."
 
-#: ui/evolution-mail-message.xml.h:96
+#: ui/evolution-mail-message.xml.h:92
 msgid "VFolder on Se_nder..."
 msgstr "VOrdner über _Absender..."
 
-#: ui/evolution-mail-message.xml.h:97
+#: ui/evolution-mail-message.xml.h:93
 msgid "VFolder on _Recipients..."
 msgstr "VOrdner über _Empfänger..."
 
-#: ui/evolution-mail-message.xml.h:98
+#: ui/evolution-mail-message.xml.h:94
 msgid "VFolder on _Subject..."
 msgstr "VOrdner über _Betreff..."
 
-#: ui/evolution-mail-message.xml.h:100
+#: ui/evolution-mail-message.xml.h:96
 msgid "_Attached"
 msgstr "_Beigelegt"
 
-#: ui/evolution-mail-message.xml.h:102
+#: ui/evolution-mail-message.xml.h:97
 msgid "_Copy to Folder"
 msgstr "In Ordner _kopieren"
 
-#: ui/evolution-mail-message.xml.h:103
+#: ui/evolution-mail-message.xml.h:98
 msgid "_Create Filter From Message"
 msgstr "Filter aus Nachricht _erzeugen"
 
-#: ui/evolution-mail-message.xml.h:105
+#: ui/evolution-mail-message.xml.h:100
 msgid "_Forward Message"
 msgstr "Nachricht _weiterleiten"
 
-#: ui/evolution-mail-message.xml.h:106
+#: ui/evolution-mail-message.xml.h:101
 msgid "_Go To"
 msgstr "_Gehe zu"
 
-#: ui/evolution-mail-message.xml.h:107
+#: ui/evolution-mail-message.xml.h:102
 msgid "_Inline"
 msgstr "An _Ort und Stelle"
 
-#: ui/evolution-mail-message.xml.h:108
+#: ui/evolution-mail-message.xml.h:103
 msgid "_Larger"
 msgstr "_Größer"
 
-#: ui/evolution-mail-message.xml.h:109
+#: ui/evolution-mail-message.xml.h:104
 msgid "_Message Display"
 msgstr "_Nachrichtenanzeige"
 
-#: ui/evolution-mail-message.xml.h:110
+#: ui/evolution-mail-message.xml.h:105
 msgid "_Move to Folder"
 msgstr "In Ordner _verschieben"
 
-#: ui/evolution-mail-message.xml.h:111
+#: ui/evolution-mail-message.xml.h:106
 msgid "_Next Message"
 msgstr "_Nächste Nachricht"
 
-#: ui/evolution-mail-message.xml.h:112
+#: ui/evolution-mail-message.xml.h:107
 msgid "_Normal Display"
 msgstr "_Normal anzeigen"
 
-#: ui/evolution-mail-message.xml.h:113
+#: ui/evolution-mail-message.xml.h:108
 msgid "_Open Message"
 msgstr "Nachricht ö_ffnen"
 
-#: ui/evolution-mail-message.xml.h:115
+#: ui/evolution-mail-message.xml.h:109
 msgid "_Previous Message"
 msgstr "_Vorherige Nachricht"
 
-#: ui/evolution-mail-message.xml.h:117
+#: ui/evolution-mail-message.xml.h:111
 msgid "_Quoted"
 msgstr "_Zitiert"
 
-#: ui/evolution-mail-message.xml.h:118
-msgid "_Reply to Sender"
-msgstr "Antwort an Ab_sender"
-
-#: ui/evolution-mail-message.xml.h:119
+#: ui/evolution-mail-message.xml.h:113
 msgid "_Resend..."
 msgstr "E_rneut verschicken..."
 
-#: ui/evolution-mail-message.xml.h:121 ui/evolution.xml.h:63
+#: ui/evolution-mail-message.xml.h:115 ui/evolution.xml.h:63
 msgid "_Tools"
 msgstr "_Werkzeuge"
 
-#: ui/evolution-mail-message.xml.h:122
+#: ui/evolution-mail-message.xml.h:116
 msgid "_Undelete"
 msgstr "Löschen rückgängig"
 
+#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:6
+msgid "Close this window"
+msgstr "Dieses Fenster schließen"
+
+#: ui/evolution-mail-messagedisplay.xml.h:5
+#: ui/evolution-message-composer.xml.h:39
+#: ui/evolution-signature-editor.xml.h:10 ui/evolution-subscribe.xml.h:9
+#: ui/evolution.xml.h:43
+msgid "_Close"
+msgstr "Schließen"
+
+#: ui/evolution-mail-messagedisplay.xml.h:8
+#: ui/evolution-message-composer.xml.h:49 ui/evolution.xml.h:64
+msgid "_View"
+msgstr "_Ansicht"
+
 #: ui/evolution-message-composer.xml.h:1
 msgid "Attach"
 msgstr "Beilegen"
@@ -27124,7 +27459,7 @@ msgstr "Beilegen"
 msgid "Attach a file"
 msgstr "Eine Datei beilegen"
 
-#: ui/evolution-message-composer.xml.h:4 ui/evolution-signature-editor.xml.h:3
+#: ui/evolution-message-composer.xml.h:4 ui/evolution-signature-editor.xml.h:2
 msgid "Close the current file"
 msgstr "Die aktuelle Datei schließen"
 
@@ -27141,7 +27476,7 @@ msgid "Encrypt this message with your S/MIME Encryption Cetificate"
 msgstr ""
 "Diese Nachricht mit Ihrem S/MIME-Verschlüsselungszertifikat verschlüsseln"
 
-#: ui/evolution-message-composer.xml.h:8 ui/evolution-signature-editor.xml.h:4
+#: ui/evolution-message-composer.xml.h:8 ui/evolution-signature-editor.xml.h:3
 msgid "For_mat"
 msgstr "_Format"
 
@@ -27173,11 +27508,6 @@ msgstr "Mit S/MIME verschlüsseln"
 msgid "S/MIME Sign"
 msgstr "Mit S/MIME signieren"
 
-#: ui/evolution-message-composer.xml.h:16
-#: ui/evolution-signature-editor.xml.h:6
-msgid "Save"
-msgstr "Speichern"
-
 #: ui/evolution-message-composer.xml.h:17
 msgid "Save As"
 msgstr "Speichern _unter"
@@ -27191,7 +27521,7 @@ msgid "Save in folder..."
 msgstr "In Ordner speichern..."
 
 #: ui/evolution-message-composer.xml.h:21
-#: ui/evolution-signature-editor.xml.h:9
+#: ui/evolution-signature-editor.xml.h:7
 msgid "Save the current file"
 msgstr "Die aktuelle Datei speichern"
 
@@ -27208,7 +27538,7 @@ msgid "Send"
 msgstr "Abschicken"
 
 #: ui/evolution-message-composer.xml.h:25
-#: ui/evolution-signature-editor.xml.h:11
+#: ui/evolution-signature-editor.xml.h:9
 msgid "Send the mail in HTML format"
 msgstr "Diese E-Mail im HTML-Format verschicken"
 
@@ -27273,7 +27603,7 @@ msgid "_From Field"
 msgstr "_Von-Feld"
 
 #: ui/evolution-message-composer.xml.h:44
-#: ui/evolution-signature-editor.xml.h:14
+#: ui/evolution-signature-editor.xml.h:13
 msgid "_Insert"
 msgstr "Einfügen"
 
@@ -27289,11 +27619,11 @@ msgstr "Antwort-an-Feld"
 msgid "_Security"
 msgstr "_Sicherheit"
 
-#: ui/evolution-signature-editor.xml.h:5
+#: ui/evolution-signature-editor.xml.h:4
 msgid "H_TML"
 msgstr "_HTML"
 
-#: ui/evolution-signature-editor.xml.h:10
+#: ui/evolution-signature-editor.xml.h:8
 msgid "Save the current file and close the window"
 msgstr "Die aktuelle Datei speichern und das Fenster schließen"
 
@@ -27632,33 +27962,27 @@ msgid "_Work Week View"
 msgstr "_Werkwochenansicht"
 
 #: views/mail/galview.xml.h:1
-#, fuzzy
-msgid "As _Sent Folder"
+msgid "As Sent Folder"
 msgstr "Als Verschickt-Ordner"
 
 #: views/mail/galview.xml.h:2
-#, fuzzy
-msgid "By S_tatus"
-msgstr "Nach Status"
+msgid "By Follow Up Flag"
+msgstr "Nach Folgenachricht-Markierung"
 
 #: views/mail/galview.xml.h:3
-#, fuzzy
-msgid "By Se_nder"
+msgid "By Sender"
 msgstr "Nach Absender"
 
 #: views/mail/galview.xml.h:4
-#, fuzzy
-msgid "By Su_bject"
-msgstr "Nach Betreff"
+msgid "By Status"
+msgstr "Nach Status"
 
 #: views/mail/galview.xml.h:5
-#, fuzzy
-msgid "By _Follow Up Flag"
-msgstr "Nach Folgenachricht-Markierung"
+msgid "By Subject"
+msgstr "Nach Betreff"
 
 #: views/mail/galview.xml.h:6
-#, fuzzy
-msgid "_Messages"
+msgid "Messages"
 msgstr "Nachrichten"
 
 #: views/tasks/galview.xml.h:1
@@ -27715,12 +28039,12 @@ msgstr "Ansichten definieren..."
 
 #. Translators: These are the first characters of each day of the
 #. week, 'M' for 'Monday', 'T' for Tuesday etc.
-#: widgets/misc/e-calendar-item.c:456
+#: widgets/misc/e-calendar-item.c:427
 msgid "MTWTFSS"
 msgstr "MDMDFSS"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: widgets/misc/e-calendar-item.c:1174
+#: widgets/misc/e-calendar-item.c:1127
 msgid "%B %Y"
 msgstr "%B %Y"
 
@@ -27846,6 +28170,22 @@ msgstr "Gespeicherte Suchen _bearbeiten..."
 msgid "_Advanced..."
 msgstr "_Komplex..."
 
+#: widgets/misc/e-messagebox.c:154
+msgid "Information"
+msgstr "Information"
+
+#: widgets/misc/e-messagebox.c:168
+msgid "Error"
+msgstr "Fehler"
+
+#: widgets/misc/e-messagebox.c:175
+msgid "Question"
+msgstr "Frage"
+
+#: widgets/misc/e-messagebox.c:182
+msgid "Message"
+msgstr "Meldung"
+
 #: widgets/misc/e-search-bar.c:531
 msgid "_Search"
 msgstr "_Suchen"
@@ -27891,546 +28231,5 @@ msgstr "Evolution-Kalender-Backend für lokale Dateien"
 msgid "Evolution Addressbook local file backend"
 msgstr "Evolution-Adressbuch-Backend für lokale Dateien"
 
-#~ msgid "That person is already attending the meeting!"
-#~ msgstr "Diese Person nimmt bereits an der Besprechung teil!"
-
-#~ msgid "_Save as..."
-#~ msgstr "_Speichern unter..."
-
-#~ msgid "End Date"
-#~ msgstr "Enddatum"
-
-#~ msgid "New _Appointment"
-#~ msgstr "Neuer _Termin"
-
-#~ msgid "Print..."
-#~ msgstr "Drucken..."
-
-#~ msgid "Chair Persons"
-#~ msgstr "Vorsitzende"
-
-#~ msgid "Required Participants"
-#~ msgstr "Benötigte Teilnehmer"
-
-#~ msgid "Optional Participants"
-#~ msgstr "Optionale Teilnehmer"
-
-#~ msgid "Resources"
-#~ msgstr "Ressourcen"
-
-#~ msgid "Individual"
-#~ msgstr "Individuell"
-
-#~ msgid "Group"
-#~ msgstr "Gruppe"
-
-#~ msgid "Resource"
-#~ msgstr "Ressource"
-
-#~ msgid "Room"
-#~ msgstr "Raum"
-
-#~ msgid "Chair"
-#~ msgstr "Vorsitzender"
-
-#~ msgid "Required Participant"
-#~ msgstr "Benötigter Teilnehmer"
-
-#~ msgid "Optional Participant"
-#~ msgstr "Optionaler Teilnehmer"
-
-#~ msgid "Non-Participant"
-#~ msgstr "Nicht-Teilnehmer"
-
-#~ msgid "Needs Action"
-#~ msgstr "Erfordert Maßnahme"
-
-#~ msgid "Delegated"
-#~ msgstr "Delegiert"
-
-#~ msgid "In Process"
-#~ msgstr "In Bearbeitung"
-
-#~ msgid "Hey you, dunce. You need an account to send mail doncha know."
-#~ msgstr "Hey, Sie! Sie brauchen ein Konto, um E-Mails zu verschicken!"
-
-#~ msgid "Properties for \"%s\""
-#~ msgstr "Eigenschaften von »%s«"
-
-#~ msgid "Properties"
-#~ msgstr "Eigenschaften"
-
-#~ msgid "Could not create temporary directory: %s"
-#~ msgstr "Temporäres Verzeichnis konnte nicht angelegt werden: %s"
-
-#~ msgid "%d new"
-#~ msgstr "%d neu"
-
-#~ msgid ", "
-#~ msgstr ", "
-
-#~ msgid "%d hidden"
-#~ msgstr "%d verborgen"
-
-#~ msgid "%d visible"
-#~ msgstr "%d sichtbar"
-
-#~ msgid "%d selected"
-#~ msgstr "%d ausgewählt"
-
-#~ msgid "%d unsent"
-#~ msgstr "%d nicht verschickt"
-
-#~ msgid "%d sent"
-#~ msgstr "%d verschickt"
-
-#~ msgid "%d total"
-#~ msgstr "%d insgesamt"
-
-#~ msgid "Create _Virtual Folder From Search..."
-#~ msgstr "_Virtuellen Ordner aus Suche anlegen..."
-
-#~ msgid "VFolder on _Subject"
-#~ msgstr "VOrdner über _Betreff"
-
-#~ msgid "VFolder on Se_nder"
-#~ msgstr "VOrdner über Abse_nder"
-
-#~ msgid "VFolder on _Recipients"
-#~ msgstr "VOrdner über _Empfänger"
-
-#~ msgid "VFolder on Mailing _List"
-#~ msgstr "VOrdner über Mailing_liste"
-
-#~ msgid "Filter on Sub_ject"
-#~ msgstr "Filter über _Betreff"
-
-#~ msgid "Filter on Sen_der"
-#~ msgstr "Filter über _Absender"
-
-#~ msgid "Filter on Re_cipients"
-#~ msgstr "Filter über _Empfänger"
-
-#~ msgid "Filter on _Mailing List"
-#~ msgstr "Filter über _Mailingliste"
-
-#~ msgid "_Edit as New Message..."
-#~ msgstr "Als neue Nachricht _bearbeiten..."
-
-#~ msgid "_Print"
-#~ msgstr "_Drucken"
-
-#~ msgid "_Forward"
-#~ msgstr "_Weiterleiten"
-
-#~ msgid "Follo_w Up..."
-#~ msgstr "Follo_w Up..."
-
-#~ msgid "Fla_g Completed"
-#~ msgstr "Als abgeschlossen _markieren"
-
-#~ msgid "Cl_ear Flag"
-#~ msgstr "Markierung _löschen"
-
-#~ msgid "Mark as _Unread"
-#~ msgstr "Als _ungelesen markieren"
-
-#~ msgid "Mark as _Important"
-#~ msgstr "Als _wichtig markieren"
-
-#~ msgid "_Mark as Unimportant"
-#~ msgstr "Als unwichtig _markieren"
-
-#~ msgid "U_ndelete"
-#~ msgstr "Lösche_n rückgängig"
-
-#~ msgid "Mo_ve to Folder..."
-#~ msgstr "In Ordner _verschieben..."
-
-#~ msgid "Add Sender to Address_book"
-#~ msgstr "Absender zum Adress_buch hinzufügen"
-
-#~ msgid "Appl_y Filters"
-#~ msgstr "Filter _anwenden"
-
-#~ msgid "Crea_te Rule From Message"
-#~ msgstr "_Regel aus Nachricht anlegen"
-
-#~ msgid "VFolder on M_ailing List"
-#~ msgstr "VOrdner über M_ailingliste"
-
-#~ msgid "Filter on _Mailing List (%s)"
-#~ msgstr "Filter über _Mailingliste (%s)"
-
-#~ msgid "VFolder on M_ailing List (%s)"
-#~ msgstr "VOrdner über M_ailingliste (%s)"
-
-#~ msgid "Don't show this message again."
-#~ msgstr "Diese Meldung nicht mehr anzeigen."
-
-#~ msgid ""
-#~ "You have not configured the mail client.\n"
-#~ "You need to do this before you can send,\n"
-#~ "receive or compose mail.\n"
-#~ "Would you like to configure it now?"
-#~ msgstr ""
-#~ "Sie haben den E-Mail-Client nicht konfiguriert.\n"
-#~ "Sie müssen dies tun, bevor Sie E-Mails verschicken,\n"
-#~ "abrufen oder verfassen können.\n"
-#~ "Möchten Sie ihn jetzt konfigurieren?"
-
-#~ msgid ""
-#~ "You need to configure an identity\n"
-#~ "before you can compose mail."
-#~ msgstr ""
-#~ "Sie müssen eine Identität einrichten,\n"
-#~ "bevor Sie E-Mails verfassen können."
-
-#~ msgid ""
-#~ "You need to configure a mail transport\n"
-#~ "before you can compose mail."
-#~ msgstr ""
-#~ "Sie müssen einen Mailtransport einrichten,\n"
-#~ "bevor Sie E-Mails verfassen können."
-
-#~ msgid ""
-#~ "You are sending an HTML-formatted message. Please make sure that\n"
-#~ "the following recipients are willing and able to receive HTML mail:\n"
-#~ msgstr ""
-#~ "Sie verschicken eine HTML-formatierte Nachricht. Bitte stellen Sie "
-#~ "sicher,\n"
-#~ "dass die folgenden Empfänger HTML-Mails abrufen können und wollen:\n"
-
-#~ msgid "Send anyway?"
-#~ msgstr "Dennoch verschicken?"
-
-#~ msgid ""
-#~ "This message has no subject.\n"
-#~ "Really send?"
-#~ msgstr ""
-#~ "Diese Nachricht hat keinen Betreff.\n"
-#~ "Wirklich verschicken?"
-
-#~ msgid ""
-#~ "Since the contact list you are sending to is configured to hide the "
-#~ "list's addresses, this message will contain only Bcc recipients."
-#~ msgstr ""
-#~ "Da die Kontaktliste, an die Sie diese Nachricht verschicken, konfiguriert "
-#~ "ist, die Adressen der Liste zu verbergen, wird die Nachricht lediglich an "
-#~ "Blindkopie-Empfängeradressen übermittlt."
-
-#~ msgid "This message contains only Bcc recipients."
-#~ msgstr "Diese Nachricht enthält ausschließlich Blindkopie-Empfänger."
-
-#~ msgid ""
-#~ "It is possible that the mail server may reveal the recipients by adding "
-#~ "an Apparently-To header.\n"
-#~ "Send anyway?"
-#~ msgstr ""
-#~ "Es ist möglich, dass der E-Mail-Server die Empfänger kenntlich macht, "
-#~ "indem er eine Apparently-To-Kopfzeile hinzufügt.\n"
-#~ "Dennoch verschicken?"
-
-#~ msgid "You must specify recipients in order to send this message."
-#~ msgstr "Sie müssen Empfänger angeben, um diese Nachricht zu verschicken."
-
-#~ msgid ""
-#~ "Unable to open the drafts folder for this account.\n"
-#~ "Would you like to use the default drafts folder?"
-#~ msgstr ""
-#~ "Der Entwürfe-Ordner für dieses Konto konnte nicht geöffnet werden.\n"
-#~ "Möchten Sie den voreingestellten Entwürfe-Ordner verwenden?"
-
-#~ msgid "an unknown sender"
-#~ msgstr "ein unbekannter Absender"
-
-#~ msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
-#~ msgstr "Am %a, %Y-%m-%d um %H.%M schrieb %%s:"
-
-#~ msgid "Move message(s) to"
-#~ msgstr "Nachricht(en) verschieben in"
-
-#~ msgid "Copy message(s) to"
-#~ msgstr "Nachricht(en) kopieren in"
-
-#~ msgid "Are you sure you want to edit all %d messages?"
-#~ msgstr "Sind Sie sicher, dass Sie alle %d Nachrichten bearbeiten wollen?"
-
-#~ msgid ""
-#~ "You may only edit messages saved\n"
-#~ "in the Drafts folder."
-#~ msgstr ""
-#~ "Sie können nur im Entwürfe-Ordner\n"
-#~ "abgespeicherte Nachrichten bearbeiten."
-
-#~ msgid ""
-#~ "You may only resend messages\n"
-#~ "in the Sent folder."
-#~ msgstr ""
-#~ "Sie können nur Nachrichten im\n"
-#~ "Verschickt-Ordner neu verschicken."
-
-#~ msgid "Are you sure you want to resend all %d messages?"
-#~ msgstr ""
-#~ "Sind Sie sicher, dass Sie alle %d Nachrichten nochmals verschicken wollen?"
-
-#~ msgid "No Message Selected"
-#~ msgstr "Keine Nachricht markiert"
-
-#~ msgid ""
-#~ "Cannot save to `%s'\n"
-#~ " %s"
-#~ msgstr ""
-#~ "In »%s« konnte nicht gespeichert werden:\n"
-#~ "  %s"
-
-#~ msgid ""
-#~ "`%s' already exists.\n"
-#~ "Overwrite it?"
-#~ msgstr ""
-#~ "»%s« ist bereits vorhanden.\n"
-#~ "Soll es überschrieben werden?"
-
-#~ msgid "Save Message As..."
-#~ msgstr "Nachricht speichern unter..."
-
-#~ msgid "Save Messages As..."
-#~ msgstr "Nachrichten speichern unter..."
-
-#~ msgid ""
-#~ "This operation will permanently erase all messages marked as\n"
-#~ "deleted. If you continue, you will not be able to recover these "
-#~ "messages.\n"
-#~ "\n"
-#~ "Really erase these messages?"
-#~ msgstr ""
-#~ "Dieser Vorgang wird alle als gelöscht markierten Nachrichten dauerhaft "
-#~ "entfernen. Falls Sie fortfahren, werden Sie diese Nachrichten nicht "
-#~ "wiederherstellen können.\n"
-#~ "\n"
-#~ "Sollen die Nachrichten wirklich entfernt werden?"
-
-#~ msgid ""
-#~ "Error loading filter information:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Fehler beim Laden von Filterinformation:\n"
-#~ "%s"
-
-#~ msgid "Filters"
-#~ msgstr "Filter"
-
-#~ msgid "Page %d of %d"
-#~ msgstr "Seite %d von %d"
-
-#~ msgid "Print Message"
-#~ msgstr "Nachricht drucken"
-
-#~ msgid "Printing of message failed"
-#~ msgstr "Drucken der Nachricht fehlgeschlagen"
-
-#~ msgid "Are you sure you want to open all %d messages in separate windows?"
-#~ msgstr ""
-#~ "Sind Sie sicher, dass Sie alle %d Nachrichten in getrennten Fenstern "
-#~ "öffnen wollen?"
-
-#~ msgid "Could not create a S/MIME signature context."
-#~ msgstr "S/MIME-Signaturkontext konnte nicht angelegt werden."
-
-#~ msgid "Could not create a S/MIME certsonly context."
-#~ msgstr "S/MIME-certsonly-Kontext konnte nicht angelegt werden."
-
-#~ msgid "Could not create a S/MIME encryption context."
-#~ msgstr "S/MIME-Verschlüsselungskontext konnte nicht angelegt werden."
-
-#~ msgid "Could not create a S/MIME envelope context."
-#~ msgstr "S/MIME-Umschlagkontext konnte nicht angelegt werden."
-
-#~ msgid "Could not create a S/MIME decode context."
-#~ msgstr "S/MIME-Entschlüsselungskontext konnte nicht angelegt werden."
-
-#~ msgid ""
-#~ "File `%s' already exists.\n"
-#~ "Overwrite it?"
-#~ msgstr ""
-#~ "Es existiert bereits eine Datei mit Namen »%s«.\n"
-#~ "Soll diese überschrieben werden?"
-
-#~ msgid "Save Attachment"
-#~ msgstr "Anlage speichern"
-
-#~ msgid "Could not create temporary file '%s': %s"
-#~ msgstr "Die temporäre Datei »%s« konnte nicht angelegt werden: %s"
-
-#~ msgid "Save Attachment..."
-#~ msgstr "Anlage speichern..."
-
-#~ msgid "View Inline"
-#~ msgstr "An Ort und Stelle anzeigen"
-
-#~ msgid "Open in %s..."
-#~ msgstr "Öffnen in %s..."
-
-#~ msgid "View Inline (via %s)"
-#~ msgstr "An Ort und Stelle anzeigen (mit %s)"
-
-#~ msgid "Hide"
-#~ msgstr "Verbergen"
-
-#~ msgid "External Viewer"
-#~ msgstr "Externer Betrachter"
-
-#~ msgid "Downloading images"
-#~ msgstr "Bilder werden heruntergeladen"
-
-#~ msgid "Loading message content"
-#~ msgstr "Laden des Nachrichteninhalts"
-
-#~ msgid "Overdue:"
-#~ msgstr "Überfallig:"
-
-#~ msgid "by %B %d, %Y, %l:%M %P"
-#~ msgstr "am %d. %B %Y, %H:%M"
-
-#~ msgid "Open Link in Browser"
-#~ msgstr "Link in Browser öffnen"
-
-#~ msgid "Copy Link Location"
-#~ msgstr "Linkziel kopieren"
-
-#~ msgid "Save Link as (FIXME)"
-#~ msgstr "Link speichern unter (FIXME)"
-
-#~ msgid "Save Image as..."
-#~ msgstr "Bild speichern unter..."
-
-#~ msgid "%s attachment"
-#~ msgstr "%s-Anlage"
-
-#~ msgid "Could not parse MIME message. Displaying as source."
-#~ msgstr ""
-#~ "Die MIME-Nachricht konnte nicht verarbeitet werden und wird daher als "
-#~ "Quellxt angezeigt."
-
-#~ msgid "Bad Address"
-#~ msgstr "Ungültige Adresse"
-
-#~ msgid "Reply-To"
-#~ msgstr "Antwort an"
-
-#~ msgid "Cc"
-#~ msgstr "Kopie"
-
-#~ msgid "Bcc"
-#~ msgstr "Blindkopie"
-
-#~ msgid ""
-#~ "This message is digitally signed. Click the lock icon for more "
-#~ "information."
-#~ msgstr ""
-#~ "Diese Nachricht ist digital signiert. Klicken Sie auf das Schlosssymbol, "
-#~ "um weitere Informationen zu erhalten."
-
-#~ msgid "Could not create a PGP verfication context"
-#~ msgstr "Es konnte kein PGP-Überprüfungskontext angelegt werden"
-
-#~ msgid "This message is digitally signed and has been found to be authentic."
-#~ msgstr ""
-#~ "Diese Nachricht ist digital unterzeichnet und wurde als authentisch "
-#~ "nachgewiesen."
-
-#~ msgid ""
-#~ "This message is digitally signed but can not be proven to be authentic."
-#~ msgstr ""
-#~ "Diese Nachricht ist digital unterzeichnet, aber konnte nicht als "
-#~ "authentisch nachgewiesen werden."
-
-#~ msgid "Pointer to FTP site (%s)"
-#~ msgstr "Zeiger auf FTP-Site (%s)"
-
-#~ msgid "Pointer to local file (%s) valid at site \"%s\""
-#~ msgstr "Zeiger auf lokale Datei (%s) gültig auf Site »%s«"
-
-#~ msgid "Pointer to local file (%s)"
-#~ msgstr "Zeiger auf lokale Datei (%s)"
-
-#~ msgid "Pointer to remote data (%s)"
-#~ msgstr "Zeiger auf Daten im Netz (%s)"
-
-#~ msgid "Pointer to unknown external data (\"%s\" type)"
-#~ msgstr "Zeiger auf unbekannte externe Daten (Typ »%s«)"
-
-#~ msgid "Malformed external-body part."
-#~ msgstr "Ungültiger external-body-Teil."
-
-#~ msgid "However, the message was successfully sent."
-#~ msgstr "Dennoch wurde die Nachricht erfolgreich verschickt."
-
-#~ msgid "(Untitled Message)"
-#~ msgstr "(Unbenannte Nachricht)"
-
-#~ msgid "Untitled Message"
-#~ msgstr "Unbenannte Nachricht"
-
-#~ msgid "Empty Message"
-#~ msgstr "Leere Nachricht"
-
-#~ msgid "Find in Message"
-#~ msgstr "In Nachricht suchen"
-
-#~ msgid "Case Sensitive"
-#~ msgstr "Groß-/Kleinschreibung beachten"
-
-#~ msgid "Search Forward"
-#~ msgstr "Vorwärts suchen"
-
-#~ msgid "Find:"
-#~ msgstr "Suchen:"
-
-#~ msgid "Matches:"
-#~ msgstr "Passt auf:"
-
-#~ msgid "Forwarded Message"
-#~ msgstr "Weitergeleitete Nachricht"
-
-#~ msgid "(No subject)"
-#~ msgstr "(Kein Betreff)"
-
-#~ msgid "%s - Message"
-#~ msgstr "%s - Nachricht"
-
-#~ msgid "Scanning folders under %s on \"%s\""
-#~ msgstr "Ordner unter %s auf »%s« werden abgetastet"
-
-#~ msgid "Scanning root-level folders on \"%s\""
-#~ msgstr "Ordner der obersten Ebene auf »%s« werden abgetastet"
-
-#~ msgid "Subscribing to folder \"%s\""
-#~ msgstr "Ordner »%s« wird abonniert"
-
-#~ msgid "Unsubscribing to folder \"%s\""
-#~ msgstr "Abonnement auf Ordner »%s« wird abbestellt"
-
-#~ msgid "No server has been selected"
-#~ msgstr "Es wurde kein Server gewählt"
-
-#~ msgid "Please select a server."
-#~ msgstr "Bitte wählen Sie einen Server."
-
-#~ msgid "Scanning folders ..."
-#~ msgstr "Ordner werden abgetastet..."
-
-#~ msgid "Save As..."
-#~ msgstr "Speichern unter..."
-
-#~ msgid "Information"
-#~ msgstr "Information"
-
-#~ msgid "Question"
-#~ msgstr "Frage"
-
-#~ msgid "Message"
-#~ msgstr "Meldung"
-
 #~ msgid "URL:"
 #~ msgstr "URL:"
diff --git a/po/el.po b/po/el.po
index 1d7bf7a664..df8d69cd9e 100644
--- a/po/el.po
+++ b/po/el.po
@@ -26,7 +26,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution.el\n"
-"POT-Creation-Date: 2003-10-15 23:45+0200\n"
+"POT-Creation-Date: 2003-06-23 12:07+0200\n"
 "PO-Revision-Date: 2003-06-25 18:26-0200\n"
 "Last-Translator: Nikos Charonitakis <charosn@her.forthnet.gr>\n"
 "Language-Team: Greek <nls@hellug.gr>\n"
@@ -34,182 +34,47 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: addressbook/backend/ebook/e-card.c:1306
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in.h:1
+msgid "Evolution LDIF importer"
+msgstr "Εφαρμογή εισαγωγής LDIF του Evolution."
+
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in.h:2
+msgid "LDAP Data Interchange Format (.ldif)"
+msgstr "LDAP Data Interchange Format (.ldif)"
+
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:1
+msgid "Evolution VCard Importer"
+msgstr "Εφαρμογή εισαγωγής VCard του Evolution."
+
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:2
+msgid "Evolution VCard importer"
+msgstr "Εφαρμογή εισαγωγής VCard του Evolution"
+
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:3
+msgid "VCard (.vcf, .gcrd)"
+msgstr "VCard (.vcf, .gcrd)"
+
 #: addressbook/backend/ebook/e-card-simple.c:60
+#: addressbook/backend/ebook/e-card.c:1306
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:15
 msgid "File As"
 msgstr "Αρχειοθέτηση Ως"
 
-#: addressbook/backend/ebook/e-card.c:1313
-#: addressbook/gui/contact-editor/fullname.glade.h:4
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:17
-msgid "Full Name"
-msgstr "Πλήρες Όνομα"
-
-#: addressbook/backend/ebook/e-card.c:1320
 #: addressbook/backend/ebook/e-card-simple.c:61
-#: addressbook/gui/component/select-names/e-select-names.etspec.h:1
+#: addressbook/backend/ebook/e-card.c:1320
 #: addressbook/gui/component/select-names/e-select-names-section.etspec.h:1
+#: addressbook/gui/component/select-names/e-select-names.etspec.h:1
 #: addressbook/gui/contact-editor/e-contact-editor-fullname.c:89
 #: my-evolution/e-summary-table.c:59
 msgid "Name"
 msgstr "Όνομα"
 
-#: addressbook/backend/ebook/e-card.c:1326
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:96
-msgid "Address"
-msgstr "Διεύθυνση:"
-
-#: addressbook/backend/ebook/e-card.c:1333
-msgid "Address Label"
-msgstr "Ετικέτα διεύθυνσης"
-
-#: addressbook/backend/ebook/e-card.c:1340
-msgid "Phone"
-msgstr "Τηλέφωνο"
-
-#: addressbook/backend/ebook/e-card.c:1347
 #: addressbook/backend/ebook/e-card-simple.c:62
+#: addressbook/backend/ebook/e-card.c:1347
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
 msgid "Email"
 msgstr "Email"
 
-#: addressbook/backend/ebook/e-card.c:1354
-msgid "Birth date"
-msgstr "Ημερομηνία Γέννησης"
-
-#: addressbook/backend/ebook/e-card.c:1360
-#: calendar/gui/e-calendar-table.etspec.h:18
-msgid "URL"
-msgstr "URL"
-
-#: addressbook/backend/ebook/e-card.c:1367
-#: addressbook/backend/ebook/e-card-simple.c:69
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
-msgid "Organization"
-msgstr "Οργανισμός"
-
-#: addressbook/backend/ebook/e-card.c:1374
-msgid "Organizational Unit"
-msgstr "Μονάδα Οργανισμού"
-
-#: addressbook/backend/ebook/e-card.c:1381
-#: addressbook/backend/ebook/e-card-simple.c:90
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
-msgid "Office"
-msgstr "Γραφείο"
-
-#: addressbook/backend/ebook/e-card.c:1388
-#: addressbook/backend/ebook/e-card-simple.c:91
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:39
-msgid "Title"
-msgstr "Τίτλος"
-
-#: addressbook/backend/ebook/e-card.c:1395
-#: calendar/gui/e-meeting-time-sel.etspec.h:9
-msgid "Role"
-msgstr "Ρόλος"
-
-#: addressbook/backend/ebook/e-card.c:1402
-#: addressbook/backend/ebook/e-card-simple.c:93
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
-msgid "Manager"
-msgstr "Διευθυντής"
-
-#: addressbook/backend/ebook/e-card.c:1409
-#: addressbook/backend/ebook/e-card-simple.c:64
-#: addressbook/backend/ebook/e-card-simple.c:94
-#: addressbook/gui/contact-editor/e-contact-editor.c:1737
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:2
-msgid "Assistant"
-msgstr "Βοηθός"
-
-#: addressbook/backend/ebook/e-card.c:1416
-#: addressbook/backend/ebook/e-card-simple.c:95
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-msgid "Nickname"
-msgstr "Ψευδώνυμο"
-
-#: addressbook/backend/ebook/e-card.c:1423
-#: addressbook/backend/ebook/e-card-simple.c:96
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:36
-msgid "Spouse"
-msgstr "Σύζυγος"
-
-#: addressbook/backend/ebook/e-card.c:1430
-#: addressbook/backend/ebook/e-card-simple.c:101
-msgid "Anniversary"
-msgstr "Επέτειος"
-
-#: addressbook/backend/ebook/e-card.c:1436
-msgid "Mailer"
-msgstr "Πρόγραμμα αλληλογραφίας"
-
-#: addressbook/backend/ebook/e-card.c:1443
-#: addressbook/backend/ebook/e-card-simple.c:98
-msgid "Calendar URI"
-msgstr "URI Ημερολογίου"
-
-#: addressbook/backend/ebook/e-card.c:1450
-msgid "Free/Busy URL"
-msgstr "Διαθέσιμο/απασχολημένο URL"
-
-#: addressbook/backend/ebook/e-card.c:1457
-msgid "ICS Calendar"
-msgstr "Ημερολόγιο ICS"
-
-#: addressbook/backend/ebook/e-card.c:1464
-#: addressbook/backend/ebook/e-card-simple.c:97
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
-msgid "Note"
-msgstr "Σημείωση"
-
-#: addressbook/backend/ebook/e-card.c:1471
-msgid "Related Contacts"
-msgstr "Σχετικές επαφές"
-
-#: addressbook/backend/ebook/e-card.c:1478
-#: addressbook/backend/ebook/e-card-simple.c:105
-#: calendar/gui/e-calendar-table.etspec.h:4
-msgid "Categories"
-msgstr "Κατηγορίες"
-
-#: addressbook/backend/ebook/e-card.c:1485
-msgid "Category List"
-msgstr "Λίστα κατηγορίας"
-
-#: addressbook/backend/ebook/e-card.c:1492
-msgid "Wants HTML"
-msgstr "Επιθυμεί  HTML"
-
-#: addressbook/backend/ebook/e-card.c:1499
-msgid "Wants HTML set"
-msgstr "Ορισμός αποδοχής HTML "
-
-#: addressbook/backend/ebook/e-card.c:1506 ui/evolution-calendar.xml.h:16
-msgid "List"
-msgstr "Λίστα"
-
-#: addressbook/backend/ebook/e-card.c:1513
-msgid "List Show Addresses"
-msgstr "Εμφάνιση λίστας διευθύνσεων"
-
-#: addressbook/backend/ebook/e-card.c:1520
-msgid "Arbitrary"
-msgstr "Τυχαίο"
-
-#: addressbook/backend/ebook/e-card.c:1527
-msgid "ID"
-msgstr "ID"
-
-#: addressbook/backend/ebook/e-card.c:1534
-msgid "Last Use"
-msgstr "Τελευταία χρήση"
-
-#: addressbook/backend/ebook/e-card.c:1545
-msgid "Use Score"
-msgstr "Χρήση σκορ"
-
 #: addressbook/backend/ebook/e-card-simple.c:63
 #: addressbook/gui/contact-editor/e-contact-editor.c:1752
 msgid "Primary"
@@ -219,6 +84,14 @@ msgstr "Πρωτεύον"
 msgid "Prim"
 msgstr "Πρωτ."
 
+#: addressbook/backend/ebook/e-card-simple.c:64
+#: addressbook/backend/ebook/e-card-simple.c:94
+#: addressbook/backend/ebook/e-card.c:1409
+#: addressbook/gui/contact-editor/e-contact-editor.c:1737
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:2
+msgid "Assistant"
+msgstr "Βοηθός"
+
 #: addressbook/backend/ebook/e-card-simple.c:65
 #: addressbook/backend/ebook/e-card-simple.c:70
 #: addressbook/gui/contact-editor/e-contact-editor.c:1738
@@ -253,6 +126,12 @@ msgid "Home"
 msgstr "Οικία"
 
 #: addressbook/backend/ebook/e-card-simple.c:69
+#: addressbook/backend/ebook/e-card.c:1367
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
+msgid "Organization"
+msgstr "Οργανισμός"
+
+#: addressbook/backend/ebook/e-card-simple.c:69
 msgid "Org"
 msgstr "Οργ."
 
@@ -371,9 +250,21 @@ msgid "Dep"
 msgstr "Τμήμ."
 
 #: addressbook/backend/ebook/e-card-simple.c:90
+#: addressbook/backend/ebook/e-card.c:1381
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
+msgid "Office"
+msgstr "Γραφείο"
+
+#: addressbook/backend/ebook/e-card-simple.c:90
 msgid "Off"
 msgstr "Γραφ."
 
+#: addressbook/backend/ebook/e-card-simple.c:91
+#: addressbook/backend/ebook/e-card.c:1388
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:39
+msgid "Title"
+msgstr "Τίτλος"
+
 #: addressbook/backend/ebook/e-card-simple.c:92
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:34
 msgid "Profession"
@@ -384,6 +275,12 @@ msgid "Prof"
 msgstr "Επάγγ."
 
 #: addressbook/backend/ebook/e-card-simple.c:93
+#: addressbook/backend/ebook/e-card.c:1402
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
+msgid "Manager"
+msgstr "Διευθυντής"
+
+#: addressbook/backend/ebook/e-card-simple.c:93
 msgid "Man"
 msgstr "Διευθ."
 
@@ -392,9 +289,32 @@ msgid "Ass"
 msgstr "Βοηθ."
 
 #: addressbook/backend/ebook/e-card-simple.c:95
+#: addressbook/backend/ebook/e-card.c:1416
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
+msgid "Nickname"
+msgstr "Ψευδώνυμο"
+
+#: addressbook/backend/ebook/e-card-simple.c:95
 msgid "Nick"
 msgstr "Ψευδ."
 
+#: addressbook/backend/ebook/e-card-simple.c:96
+#: addressbook/backend/ebook/e-card.c:1423
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:36
+msgid "Spouse"
+msgstr "Σύζυγος"
+
+#: addressbook/backend/ebook/e-card-simple.c:97
+#: addressbook/backend/ebook/e-card.c:1464
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
+msgid "Note"
+msgstr "Σημείωση"
+
+#: addressbook/backend/ebook/e-card-simple.c:98
+#: addressbook/backend/ebook/e-card.c:1443
+msgid "Calendar URI"
+msgstr "URI Ημερολογίου"
+
 #: addressbook/backend/ebook/e-card-simple.c:98
 msgid "CALUri"
 msgstr "URI Ημερ."
@@ -417,6 +337,11 @@ msgid "icsCalendar"
 msgstr "Ημερολόγιο ics"
 
 #: addressbook/backend/ebook/e-card-simple.c:101
+#: addressbook/backend/ebook/e-card.c:1430
+msgid "Anniversary"
+msgstr "Επέτειος"
+
+#: addressbook/backend/ebook/e-card-simple.c:101
 msgid "Anniv"
 msgstr "Επέτ."
 
@@ -424,6 +349,12 @@ msgstr "Επέτ."
 msgid "Birth Date"
 msgstr "Ημερομηνία Γέννησης"
 
+#: addressbook/backend/ebook/e-card-simple.c:105
+#: addressbook/backend/ebook/e-card.c:1478
+#: calendar/gui/e-calendar-table.etspec.h:4
+msgid "Categories"
+msgstr "Κατηγορίες"
+
 #: addressbook/backend/ebook/e-card-simple.c:106
 msgid "Family Name"
 msgstr "Οικογενειακό Όνομα"
@@ -438,29 +369,106 @@ msgid "%x"
 msgstr "%x"
 
 #: addressbook/backend/ebook/e-card-simple.c:912
-#: addressbook/backend/ebook/e-destination.c:709
+#: addressbook/backend/ebook/e-destination.c:706
 msgid "Unnamed List"
 msgstr "Λίστα Χωρίς Τίτλο"
 
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in.h:1
-msgid "Evolution LDIF importer"
-msgstr "Εφαρμογή εισαγωγής LDIF του Evolution."
+#: addressbook/backend/ebook/e-card.c:1313
+#: addressbook/gui/contact-editor/fullname.glade.h:4
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:17
+msgid "Full Name"
+msgstr "Πλήρες Όνομα"
 
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in.h:2
-msgid "LDAP Data Interchange Format (.ldif)"
-msgstr "LDAP Data Interchange Format (.ldif)"
+#: addressbook/backend/ebook/e-card.c:1326
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:96
+msgid "Address"
+msgstr "Διεύθυνση:"
 
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:1
-msgid "Evolution VCard Importer"
-msgstr "Εφαρμογή εισαγωγής VCard του Evolution."
+#: addressbook/backend/ebook/e-card.c:1333
+msgid "Address Label"
+msgstr "Ετικέτα διεύθυνσης"
 
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:2
-msgid "Evolution VCard importer"
-msgstr "Εφαρμογή εισαγωγής VCard του Evolution"
+#: addressbook/backend/ebook/e-card.c:1340
+msgid "Phone"
+msgstr "Τηλέφωνο"
 
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:3
-msgid "VCard (.vcf, .gcrd)"
-msgstr "VCard (.vcf, .gcrd)"
+#: addressbook/backend/ebook/e-card.c:1354
+msgid "Birth date"
+msgstr "Ημερομηνία Γέννησης"
+
+#: addressbook/backend/ebook/e-card.c:1360
+#: calendar/gui/e-calendar-table.etspec.h:19
+msgid "URL"
+msgstr "URL"
+
+#: addressbook/backend/ebook/e-card.c:1374
+msgid "Organizational Unit"
+msgstr "Μονάδα Οργανισμού"
+
+#: addressbook/backend/ebook/e-card.c:1395
+#: calendar/gui/dialogs/meeting-page.etspec.h:9
+#: calendar/gui/e-meeting-time-sel.etspec.h:9
+msgid "Role"
+msgstr "Ρόλος"
+
+#: addressbook/backend/ebook/e-card.c:1436
+#: mail/mail-format.c:963
+msgid "Mailer"
+msgstr "Πρόγραμμα αλληλογραφίας"
+
+#: addressbook/backend/ebook/e-card.c:1450
+msgid "Free/Busy URL"
+msgstr "Διαθέσιμο/απασχολημένο URL"
+
+#: addressbook/backend/ebook/e-card.c:1457
+msgid "ICS Calendar"
+msgstr "Ημερολόγιο ICS"
+
+#: addressbook/backend/ebook/e-card.c:1471
+msgid "Related Contacts"
+msgstr "Σχετικές επαφές"
+
+#: addressbook/backend/ebook/e-card.c:1485
+msgid "Category List"
+msgstr "Λίστα κατηγορίας"
+
+#: addressbook/backend/ebook/e-card.c:1492
+msgid "Wants HTML"
+msgstr "Επιθυμεί  HTML"
+
+#: addressbook/backend/ebook/e-card.c:1499
+msgid "Wants HTML set"
+msgstr "Ορισμός αποδοχής HTML "
+
+#: addressbook/backend/ebook/e-card.c:1506
+msgid "List"
+msgstr "Λίστα"
+
+#: addressbook/backend/ebook/e-card.c:1513
+msgid "List Show Addresses"
+msgstr "Εμφάνιση λίστας διευθύνσεων"
+
+#: addressbook/backend/ebook/e-card.c:1520
+msgid "Arbitrary"
+msgstr "Τυχαίο"
+
+#: addressbook/backend/ebook/e-card.c:1527
+msgid "ID"
+msgstr "ID"
+
+#: addressbook/backend/ebook/e-card.c:1534
+msgid "Last Use"
+msgstr "Τελευταία χρήση"
+
+#: addressbook/backend/ebook/e-card.c:1545
+msgid "Use Score"
+msgstr "Χρήση σκορ"
+
+#: addressbook/backend/ebook/test-client-list.c:15
+#: addressbook/backend/ebook/test-client.c:33
+#: calendar/gui/alarm-notify/notify-main.c:171
+msgid "Could not initialize Bonobo"
+msgstr "Δεν ήταν δυνατή η αρχικοποίηση του Bonobo"
 
 #: addressbook/backend/pas/pas-backend-file.c:464
 #: addressbook/backend/pas/pas-backend-ldap.c:3050
@@ -517,22 +525,154 @@ msgid "EBook not loaded\n"
 msgstr "To ΕΒοοk δεν φορτώθηκε\n"
 
 #: addressbook/conduit/address-conduit.c:1376
-#: calendar/conduits/calendar/calendar-conduit.c:1351
-#: calendar/conduits/todo/todo-conduit.c:893
+#: calendar/conduits/calendar/calendar-conduit.c:1342
+#: calendar/conduits/todo/todo-conduit.c:884
 msgid "Could not start wombat server"
 msgstr "Δεν ήταν δυνατή η εκκίνηση του διακομιστή wombat"
 
 #: addressbook/conduit/address-conduit.c:1377
-#: calendar/conduits/calendar/calendar-conduit.c:1352
-#: calendar/conduits/todo/todo-conduit.c:894
+#: calendar/conduits/calendar/calendar-conduit.c:1343
+#: calendar/conduits/todo/todo-conduit.c:885
 msgid "Could not start wombat"
 msgstr "Δεν ήταν δυνατή η εκκίνηση του wombat"
 
 #: addressbook/conduit/address-conduit.c:1407
 #: addressbook/conduit/address-conduit.c:1410
 msgid "Could not read pilot's Address application block"
-msgstr ""
-"Δεν ήταν δυνατή η ανάγνωση του τμήματος Διεύθυνσης του υπολογιστή Παλάμης"
+msgstr "Δεν ήταν δυνατή η ανάγνωση του τμήματος Διεύθυνσης του υπολογιστή Παλάμης"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
+msgid "Configure access to LDAP directory servers here"
+msgstr "Ρυθμίστε εδώ την πρόσβαση στους διακομιστές καταλόγου  LDAP"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
+msgid "Directory Servers"
+msgstr "Εξυπηρετητές καταλόγου"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
+msgid "Evolution Addressbook"
+msgstr "Βιβλίου Διευθύνσεων του Evolution"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
+msgid "Evolution Addressbook LDAP Configuration Control"
+msgstr "Ρύθμιση Βιβλίου Διευθύνσεων LDAP του Evolution"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
+msgid "Evolution Addressbook address pop-up"
+msgstr "Προβολή μίνι-κάρτας του Βιβλίου Διευθύνσεων του Evolution"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
+msgid "Evolution Addressbook address viewer"
+msgstr "Εφαρμογή προβολής διευθύνσεων του Βιβλίου Διευθύνσεων"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
+msgid "Evolution Addressbook card viewer"
+msgstr "Εφαρμογή προβολής κάρτας του Βιβλίου Διευθύνσεων του Evolution"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
+msgid "Evolution Addressbook component"
+msgstr "Στοιχείο βιβλίου διευθύνσεων του Evolution"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
+msgid "Evolution Addressbook folder viewer"
+msgstr "Εφαρμογή προβολής φακέλου του Βιβλίου Διευθύνσεων του Evolution"
+
+#: addressbook/gui/component/addressbook-component.c:76
+#: addressbook/gui/component/addressbook-component.c:620
+#: importers/netscape-importer.c:1874
+#: mail/importers/netscape-importer.c:1844
+#: shell/e-local-storage.c:178
+#: shell/e-shortcuts.c:1087
+msgid "Contacts"
+msgstr "Επαφές"
+
+#: addressbook/gui/component/addressbook-component.c:76
+msgid "Folder containing contact information"
+msgstr "Φάκελος που περιέχει πληροφορίες επαφών"
+
+#: addressbook/gui/component/addressbook-component.c:78
+msgid "LDAP Server"
+msgstr "Διακομιστής LDAP"
+
+#: addressbook/gui/component/addressbook-component.c:78
+msgid "LDAP server containing contact information"
+msgstr "Διακομιστής LDAP που περιέχει πληροφορίες επαφών"
+
+#: addressbook/gui/component/addressbook-component.c:80
+msgid "Public Contacts"
+msgstr "Κοινόχρηστες επαφές"
+
+#: addressbook/gui/component/addressbook-component.c:80
+msgid "Public folder containing contact information"
+msgstr "Κοινόχρηστος φάκελος που περιέχει πληροφορίες επαφών"
+
+#: addressbook/gui/component/addressbook-component.c:574
+msgid "New Contact"
+msgstr "Νέα Επαφή"
+
+#: addressbook/gui/component/addressbook-component.c:574
+msgid "_Contact"
+msgstr "_Επαφή"
+
+#: addressbook/gui/component/addressbook-component.c:575
+msgid "Create a new contact"
+msgstr "Δημιουργία νέας επαφής"
+
+#: addressbook/gui/component/addressbook-component.c:578
+msgid "New Contact List"
+msgstr "Νέα Λίστα Επαφών"
+
+#: addressbook/gui/component/addressbook-component.c:578
+msgid "Contact _List"
+msgstr "_Λίστα Επαφών"
+
+#: addressbook/gui/component/addressbook-component.c:579
+msgid "Create a new contact list"
+msgstr "Δημιουργία νέας λίστας επαφών"
+
+#: addressbook/gui/component/addressbook-config.c:206
+msgid "Failed to connect to LDAP server"
+msgstr "Δεν είναι δυνατή η σύνδεση με τον διακομιστή LDAP."
+
+#: addressbook/gui/component/addressbook-config.c:231
+msgid "Failed to authenticate with LDAP server"
+msgstr "Δεν ήταν δυνατή η πιστοποίηση στον διακομιστή  LDAP"
+
+#: addressbook/gui/component/addressbook-config.c:259
+msgid "Could not perform query on Root DSE"
+msgstr "Αδύνατη η δημιουργία ερωτήματος στο  Root DSE"
+
+#: addressbook/gui/component/addressbook-config.c:682
+msgid "The server responded with no supported search bases"
+msgstr "Ο διακομιστής αποκρίθηκε χωρίς υποστηριζόμενες βάσεις αναζήτησης"
+
+#: addressbook/gui/component/addressbook-config.c:1193
+msgid "This server does not support LDAPv3 schema information"
+msgstr "Αυτός ο διακομιστής δεν υποστηρίζει σχήμα πληροφοριών LDAPv3"
+
+#: addressbook/gui/component/addressbook-config.c:1215
+msgid "Error retrieving schema information"
+msgstr "Σφάλμα ανάκτησης σχήματος πληροφοριών"
+
+#: addressbook/gui/component/addressbook-config.c:1223
+msgid "Server did not respond with valid schema information"
+msgstr "Η απάντηση του διακομιστή  δεν περιείχε έγκυρο σχήμα πληροφοριών"
+
+#: addressbook/gui/component/addressbook-config.c:1637
+msgid "Account Name"
+msgstr "Όνομα Λογαριασμού"
+
+#: addressbook/gui/component/addressbook-config.c:1639
+msgid "Server Name"
+msgstr "Όνομα Διακομιστή"
+
+#: addressbook/gui/component/addressbook-config.c:1676
+msgid "LDAP was not enabled in this build of Evolution"
+msgstr "Το LDAP δεν ενεργοποιήθηκε σε αυτή την έκδοση του evolution"
+
+#: addressbook/gui/component/addressbook-storage.c:178
+msgid "Other Contacts"
+msgstr "Λοιπές Επαφές"
 
 #: addressbook/gui/component/addressbook.c:502
 msgid ""
@@ -634,24 +774,18 @@ msgid ""
 "more specific or raise the time limit in the directory server\n"
 "preferences for this addressbook."
 msgstr ""
-"Η χρονική διάρκεια για την εκτέλεση αυτού του ερωτήματος ξεπέρασε το όριο "
-"του διακομιστή ή το\n"
-"όριο που έχετε καθορίσει στο ευρετήριο διευθύνσεων.Κάνετε την αναζήτηση σας "
-"πιό συγκεκριμένη\n"
+"Η χρονική διάρκεια για την εκτέλεση αυτού του ερωτήματος ξεπέρασε το όριο του διακομιστή ή το\n"
+"όριο που έχετε καθορίσει στο ευρετήριο διευθύνσεων.Κάνετε την αναζήτηση σας πιό συγκεκριμένη\n"
 "ή αυξήστε το όριο αποτελεσμάτων στις προτιμήσεις διακομιστή καταλόγου\n"
 "για αυτό το ευρετήριο διευθύνσεων. "
 
 #: addressbook/gui/component/addressbook.c:967
 msgid "The backend for this addressbook was unable to parse this query."
-msgstr ""
-"Το backend για αυτό το ευρετήριο διευθύνσεων αδυνατεί να αναλύσει αυτό το "
-"ερώτημα."
+msgstr "Το backend για αυτό το ευρετήριο διευθύνσεων αδυνατεί να αναλύσει αυτό το ερώτημα."
 
 #: addressbook/gui/component/addressbook.c:970
 msgid "The backend for this addressbook refused to perform this query."
-msgstr ""
-"Το backend για αυτό το ευρετήριο διευθύνσεων αρνήθηκε να αναλύσει αυτό το "
-"ερώτημα."
+msgstr "Το backend για αυτό το ευρετήριο διευθύνσεων αρνήθηκε να αναλύσει αυτό το ερώτημα."
 
 #: addressbook/gui/component/addressbook.c:974
 msgid "This query did not complete successfully."
@@ -667,101 +801,6 @@ msgstr "Κάθε Κατηγορία"
 msgid "The URI that the Folder Browser will display"
 msgstr "Το URI που θα εμφανίσει η Αναζήτηση Φακέλων"
 
-#: addressbook/gui/component/addressbook-component.c:76
-#: addressbook/gui/component/addressbook-component.c:628
-#: importers/netscape-importer.c:1874 mail/importers/netscape-importer.c:1844
-#: shell/e-local-storage.c:178 shell/e-shortcuts.c:1087
-msgid "Contacts"
-msgstr "Επαφές"
-
-#: addressbook/gui/component/addressbook-component.c:76
-msgid "Folder containing contact information"
-msgstr "Φάκελος που περιέχει πληροφορίες επαφών"
-
-#: addressbook/gui/component/addressbook-component.c:78
-msgid "LDAP Server"
-msgstr "Διακομιστής LDAP"
-
-#: addressbook/gui/component/addressbook-component.c:78
-msgid "LDAP server containing contact information"
-msgstr "Διακομιστής LDAP που περιέχει πληροφορίες επαφών"
-
-#: addressbook/gui/component/addressbook-component.c:80
-msgid "Public Contacts"
-msgstr "Κοινόχρηστες επαφές"
-
-#: addressbook/gui/component/addressbook-component.c:80
-msgid "Public folder containing contact information"
-msgstr "Κοινόχρηστος φάκελος που περιέχει πληροφορίες επαφών"
-
-#: addressbook/gui/component/addressbook-component.c:582
-msgid "New Contact"
-msgstr "Νέα Επαφή"
-
-#: addressbook/gui/component/addressbook-component.c:582
-msgid "_Contact"
-msgstr "_Επαφή"
-
-#: addressbook/gui/component/addressbook-component.c:583
-msgid "Create a new contact"
-msgstr "Δημιουργία νέας επαφής"
-
-#: addressbook/gui/component/addressbook-component.c:586
-msgid "New Contact List"
-msgstr "Νέα Λίστα Επαφών"
-
-#: addressbook/gui/component/addressbook-component.c:586
-msgid "Contact _List"
-msgstr "_Λίστα Επαφών"
-
-#: addressbook/gui/component/addressbook-component.c:587
-msgid "Create a new contact list"
-msgstr "Δημιουργία νέας λίστας επαφών"
-
-#: addressbook/gui/component/addressbook-config.c:206
-msgid "Failed to connect to LDAP server"
-msgstr "Δεν είναι δυνατή η σύνδεση με τον διακομιστή LDAP."
-
-#: addressbook/gui/component/addressbook-config.c:231
-msgid "Failed to authenticate with LDAP server"
-msgstr "Δεν ήταν δυνατή η πιστοποίηση στον διακομιστή  LDAP"
-
-#: addressbook/gui/component/addressbook-config.c:259
-msgid "Could not perform query on Root DSE"
-msgstr "Αδύνατη η δημιουργία ερωτήματος στο  Root DSE"
-
-#: addressbook/gui/component/addressbook-config.c:682
-msgid "The server responded with no supported search bases"
-msgstr "Ο διακομιστής αποκρίθηκε χωρίς υποστηριζόμενες βάσεις αναζήτησης"
-
-#: addressbook/gui/component/addressbook-config.c:1193
-msgid "This server does not support LDAPv3 schema information"
-msgstr "Αυτός ο διακομιστής δεν υποστηρίζει σχήμα πληροφοριών LDAPv3"
-
-#: addressbook/gui/component/addressbook-config.c:1215
-msgid "Error retrieving schema information"
-msgstr "Σφάλμα ανάκτησης σχήματος πληροφοριών"
-
-#: addressbook/gui/component/addressbook-config.c:1223
-msgid "Server did not respond with valid schema information"
-msgstr "Η απάντηση του διακομιστή  δεν περιείχε έγκυρο σχήμα πληροφοριών"
-
-#: addressbook/gui/component/addressbook-config.c:1637
-msgid "Account Name"
-msgstr "Όνομα Λογαριασμού"
-
-#: addressbook/gui/component/addressbook-config.c:1639
-msgid "Server Name"
-msgstr "Όνομα Διακομιστή"
-
-#: addressbook/gui/component/addressbook-config.c:1676
-msgid "LDAP was not enabled in this build of Evolution"
-msgstr "Το LDAP δεν ενεργοποιήθηκε σε αυτή την έκδοση του evolution"
-
-#: addressbook/gui/component/addressbook-storage.c:178
-msgid "Other Contacts"
-msgstr "Λοιπές Επαφές"
-
 #.
 #. * This is the code for the UI thingie that lets you manipulate the e-mail
 #. * addresses (and *only* the e-mail addresses) associated with an existing
@@ -790,69 +829,33 @@ msgstr "Δημιουργία νέας επαφής \"%s\""
 msgid "Add address to existing contact \"%s\""
 msgstr "Προσθήκη διεύθυνσης στην υπάρχουσα επαφή \"%s\""
 
-#: addressbook/gui/component/e-address-popup.c:917
+#: addressbook/gui/component/e-address-popup.c:914
 msgid "Querying Addressbook..."
 msgstr "Υποβολή ερωτήματος στο Βιβλίο Διευθύνσεων..."
 
-#: addressbook/gui/component/e-address-popup.c:1001
-#: addressbook/gui/component/e-address-widget.c:401
+#: addressbook/gui/component/e-address-popup.c:998
+#: addressbook/gui/component/e-address-widget.c:392
 msgid "Edit Contact Info"
 msgstr "Επεξεργασία Πληροφοριών Επαφής"
 
-#: addressbook/gui/component/e-address-popup.c:1031
-#: addressbook/gui/component/e-address-widget.c:437
+#: addressbook/gui/component/e-address-popup.c:1028
+#: addressbook/gui/component/e-address-widget.c:428
 #: addressbook/gui/component/select-names/e-select-names-popup.c:324
 msgid "Add to Contacts"
 msgstr "Προσθήκη στις Επαφές"
 
-#: addressbook/gui/component/e-address-popup.c:1056
+#: addressbook/gui/component/e-address-popup.c:1053
 msgid "Merge E-Mail Address"
 msgstr "Συγχώνευση Διεύθυνσης E-mail"
 
-#: addressbook/gui/component/e-address-widget.c:378
+#: addressbook/gui/component/e-address-widget.c:369
 msgid "Disable Queries"
 msgstr "Απενεργοποίηση υποβολής ερωτημάτων"
 
-#: addressbook/gui/component/e-address-widget.c:378
+#: addressbook/gui/component/e-address-widget.c:369
 msgid "Enable Queries (Dangerous!)"
 msgstr "Ενεργοποίηση υποβολής ερωτημάτων (Επικίνδυνο!)"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
-msgid "Configure access to LDAP directory servers here"
-msgstr "Ρυθμίστε εδώ την πρόσβαση στους διακομιστές καταλόγου  LDAP"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
-msgid "Directory Servers"
-msgstr "Εξυπηρετητές καταλόγου"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
-msgid "Evolution Addressbook"
-msgstr "Βιβλίου Διευθύνσεων του Evolution"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
-msgid "Evolution Addressbook LDAP Configuration Control"
-msgstr "Ρύθμιση Βιβλίου Διευθύνσεων LDAP του Evolution"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-msgid "Evolution Addressbook address pop-up"
-msgstr "Προβολή μίνι-κάρτας του Βιβλίου Διευθύνσεων του Evolution"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
-msgid "Evolution Addressbook address viewer"
-msgstr "Εφαρμογή προβολής διευθύνσεων του Βιβλίου Διευθύνσεων"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
-msgid "Evolution Addressbook card viewer"
-msgstr "Εφαρμογή προβολής κάρτας του Βιβλίου Διευθύνσεων του Evolution"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
-msgid "Evolution Addressbook component"
-msgstr "Στοιχείο βιβλίου διευθύνσεων του Evolution"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
-msgid "Evolution Addressbook folder viewer"
-msgstr "Εφαρμογή προβολής φακέλου του Βιβλίου Διευθύνσεων του Evolution"
-
 #: addressbook/gui/component/ldap-config.glade.h:1
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:1
 #: mail/mail-config.glade.h:1
@@ -873,7 +876,8 @@ msgstr "Ε_μφάνιση υποστηριζόμενων βάσεων"
 #: calendar/gui/dialogs/event-page.glade.h:1
 #: calendar/gui/dialogs/meeting-page.glade.h:1
 #: calendar/gui/dialogs/task-page.glade.h:1
-#: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:6
+#: composer/e-msg-composer-attachment.glade.h:1
+#: mail/mail-config.glade.h:6
 #: mail/message-tags.glade.h:1
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:1
 #: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
@@ -912,7 +916,8 @@ msgstr "Προσθήκη διακομιστή LDAP"
 msgid "Addressbook Sources"
 msgstr "Πηγές Βιβλίου Διευθύνσεων"
 
-#: addressbook/gui/component/ldap-config.glade.h:13 mail/mail-account-gui.c:62
+#: addressbook/gui/component/ldap-config.glade.h:13
+#: mail/mail-account-gui.c:62
 #: mail/mail-config.glade.h:16
 msgid "Always"
 msgstr "Πάντοτε"
@@ -926,14 +931,12 @@ msgid ""
 "Congratulations, you are finished setting up this LDAP server. You\n"
 "are now ready to access this directory.\n"
 "\n"
-"Please click the \"Finish\" button to save the settings you have entered "
-"here."
+"Please click the \"Finish\" button to save the settings you have entered here."
 msgstr ""
 "Συγχαρητήρια, ολοκληρώσατε την ρύθμιση του διακομιστή LDAP\n"
 "Τώρα είστε έτοιμοι να έχετε πρόσβαση στον κατάλογο.\n"
 "\n"
-"Πατήστε το πλήκτρο \"Τέλος\" για να αποθηκεύσετε τις ρυθμίσεις που έχετε "
-"εισάγει εδώ."
+"Πατήστε το πλήκτρο \"Τέλος\" για να αποθηκεύσετε τις ρυθμίσεις που έχετε εισάγει εδώ."
 
 #: addressbook/gui/component/ldap-config.glade.h:19
 msgid "Connecting"
@@ -953,16 +956,11 @@ msgstr "Διεύθυνση Email:"
 
 #: addressbook/gui/component/ldap-config.glade.h:23
 msgid "Evolution will use this DN to authenticate you with the server"
-msgstr ""
-"Το Evolution θα χρησιμοποίησει αυτό το DN για την πιστοποίησή σας στον "
-"διακομιστή"
+msgstr "Το Evolution θα χρησιμοποίησει αυτό το DN για την πιστοποίησή σας στον διακομιστή"
 
 #: addressbook/gui/component/ldap-config.glade.h:24
-msgid ""
-"Evolution will use this email address to authenticate you with the server"
-msgstr ""
-"Το Evolution θα χρησιμοποίηση αυτήν τη διεύθυνση για την πιστοποίησή σας "
-"στον διακομιστή"
+msgid "Evolution will use this email address to authenticate you with the server"
+msgstr "Το Evolution θα χρησιμοποίηση αυτήν τη διεύθυνση για την πιστοποίησή σας στον διακομιστή"
 
 #: addressbook/gui/component/ldap-config.glade.h:25
 msgid "Finished"
@@ -977,26 +975,21 @@ msgstr "Γενικά"
 msgid "LDAP Configuration Assistant"
 msgstr "Βοηθός ρύθμισης LDAP"
 
-#: addressbook/gui/component/ldap-config.glade.h:28 mail/mail-account-gui.c:64
+#: addressbook/gui/component/ldap-config.glade.h:28
+#: mail/mail-account-gui.c:64
 #: mail/mail-config.glade.h:74
 msgid "Never"
 msgstr "Ποτέ"
 
 #: addressbook/gui/component/ldap-config.glade.h:29
 msgid ""
-"Now, you must specify how you want to connect to the LDAP server. The SSL "
-"(Secure Sockets Layer)\n"
-"and TLS (Transport Layer Security) protocols are used by some servers to "
-"cryptographically protect\n"
-"your connection. Ask your system administrator if your LDAP server uses "
-"these protocols."
-msgstr ""
-"Τώρα θα πρέπει να καθορίσετε τον τρόπο με το οποίο θα συνδέεστε με τον "
-"διακομιστή LDAP. Τα πρωτόκολλα\n"
-"SSL (Secure Sockets Layer) και TLS (Transport Layer Security) "
-"χρησιμοποιούνται από κάποιους διακομιστές για\n"
-"να προστατεύουν κρυπτογραφικά την σύνδεση σας. Ρωτήστε τον διαχειριστή του "
-"συστήματος αν αυτός ο διακομιστής\n"
+"Now, you must specify how you want to connect to the LDAP server. The SSL (Secure Sockets Layer)\n"
+"and TLS (Transport Layer Security) protocols are used by some servers to cryptographically protect\n"
+"your connection. Ask your system administrator if your LDAP server uses these protocols."
+msgstr ""
+"Τώρα θα πρέπει να καθορίσετε τον τρόπο με το οποίο θα συνδέεστε με τον διακομιστή LDAP. Τα πρωτόκολλα\n"
+"SSL (Secure Sockets Layer) και TLS (Transport Layer Security) χρησιμοποιούνται από κάποιους διακομιστές για\n"
+"να προστατεύουν κρυπτογραφικά την σύνδεση σας. Ρωτήστε τον διαχειριστή του συστήματος αν αυτός ο διακομιστής\n"
 "χρησιμοποιεί αυτά τα πρωτόκολλα."
 
 #: addressbook/gui/component/ldap-config.glade.h:32
@@ -1007,9 +1000,11 @@ msgstr "Ένα"
 msgid "S_earch scope: "
 msgstr "Βάθος ανα_ζήτησης:"
 
+#. No time range is set, so don't start a query
 #: addressbook/gui/component/ldap-config.glade.h:34
-#: calendar/gui/e-cal-view.c:541 calendar/gui/e-day-view.c:3261
-#: calendar/gui/e-week-view.c:1181 calendar/gui/gnome-cal.c:625
+#: calendar/gui/calendar-model.c:1983
+#: calendar/gui/e-day-view.c:1696
+#: calendar/gui/e-week-view.c:1256
 msgid "Searching"
 msgstr "Γίνεται αναζήτηση"
 
@@ -1019,63 +1014,45 @@ msgstr "Επιλεγμένα:"
 
 #: addressbook/gui/component/ldap-config.glade.h:36
 msgid ""
-"Selecting this option means that Evolution will only connect to your LDAP "
-"server if\n"
+"Selecting this option means that Evolution will only connect to your LDAP server if\n"
 "your LDAP server supports SSL or TLS."
 msgstr ""
-"Διαλέγοντας αυτή την επιλογή σημαίνει ότι το Evolution  θα συνδέεται στον "
-"διακομιστή LDAP\n"
+"Διαλέγοντας αυτή την επιλογή σημαίνει ότι το Evolution  θα συνδέεται στον διακομιστή LDAP\n"
 "μόνο αν ο διακομιστής υποστηρίζει SSL ή TLS."
 
 #: addressbook/gui/component/ldap-config.glade.h:38
 msgid ""
-"Selecting this option means that Evolution will only try to use SSL/TLS if "
-"you are in a \n"
-"insecure environment. For example, if you and your LDAP server are behind a "
-"firewall\n"
-"at work, then Evolution doesn't need to use SSL/TLS because your connection "
-"is already\n"
+"Selecting this option means that Evolution will only try to use SSL/TLS if you are in a \n"
+"insecure environment. For example, if you and your LDAP server are behind a firewall\n"
+"at work, then Evolution doesn't need to use SSL/TLS because your connection is already\n"
 "secure."
 msgstr ""
-"Η επιλογή αυτή σημαίνει ότι το Evolution θα προσπαθεί να χρησιμοποιεί μόνο "
-"SSL/TLS αν είστε σε\n"
-"μη ασφαλές περιβάλλον. Για παράδειγμα αν ο διακομιστής  LDAP στην δουλειά "
-"είναι πίσω από firewall\n"
-"τότε το Evolution  δεν χρειάζεται να χρησιμοποιήσει SSL/TLS  μιας και η "
-"σύνδεση σας είναι ήδη\n"
+"Η επιλογή αυτή σημαίνει ότι το Evolution θα προσπαθεί να χρησιμοποιεί μόνο SSL/TLS αν είστε σε\n"
+"μη ασφαλές περιβάλλον. Για παράδειγμα αν ο διακομιστής  LDAP στην δουλειά είναι πίσω από firewall\n"
+"τότε το Evolution  δεν χρειάζεται να χρησιμοποιήσει SSL/TLS  μιας και η σύνδεση σας είναι ήδη\n"
 " ασφαλής."
 
 #: addressbook/gui/component/ldap-config.glade.h:42
 msgid ""
-"Selecting this option means that your server does not support either SSL or "
-"TLS.  This \n"
-"means that your connection will be insecure, and that you will be vulnerable "
-"to security\n"
+"Selecting this option means that your server does not support either SSL or TLS.  This \n"
+"means that your connection will be insecure, and that you will be vulnerable to security\n"
 "exploits. "
 msgstr ""
-"Η επιλογή αυτή σημαίνει ότι ο διακομιστής σας δεν υποστηρίζει SSL ή TLS. "
-"Αυτό σημαίνει \n"
-"ότι η σύνδεση σας θα είναι μη ασφαλής και θα είστε ευάλωτοι σε επιθέσεις και "
-"τρύπες \n"
+"Η επιλογή αυτή σημαίνει ότι ο διακομιστής σας δεν υποστηρίζει SSL ή TLS. Αυτό σημαίνει \n"
+"ότι η σύνδεση σας θα είναι μη ασφαλής και θα είστε ευάλωτοι σε επιθέσεις και τρύπες \n"
 "ασφαλείας."
 
 #: addressbook/gui/component/ldap-config.glade.h:45
 msgid ""
-"Selecting this option will let you change Evolution's default settings for "
-"LDAP\n"
+"Selecting this option will let you change Evolution's default settings for LDAP\n"
 "searches, and for creating and editing contacts. "
 msgstr ""
-"Η επιλογή αυτή σας επιτρέπει να αλλάξετε τις εξ ορισμού ρυθμίσεις του "
-"Evolution για\n"
+"Η επιλογή αυτή σας επιτρέπει να αλλάξετε τις εξ ορισμού ρυθμίσεις του Evolution για\n"
 "αναζητήσεις LDAP και την δημιουργία και επεξεργασία επαφών."
 
 #: addressbook/gui/component/ldap-config.glade.h:47
-msgid ""
-"Specifying a display name is the last required step in configuring an LDAP "
-"server."
-msgstr ""
-"Ο καθορισμός ενός ονόματος εμφάνισης είναι το τελευταίο απαιτούμενο βήμα "
-"στην ρύθμιση ενός διακομιστή LDAP."
+msgid "Specifying a display name is the last required step in configuring an LDAP server."
+msgstr "Ο καθορισμός ενός ονόματος εμφάνισης είναι το τελευταίο απαιτούμενο βήμα στην ρύθμιση ενός διακομιστή LDAP."
 
 #: addressbook/gui/component/ldap-config.glade.h:48
 msgid "Step 1: Server Information"
@@ -1103,129 +1080,89 @@ msgstr "Υποστηριζόμενες βάσεις αναζήτησης"
 
 #: addressbook/gui/component/ldap-config.glade.h:54
 msgid ""
-"The first step in configuring an LDAP server is to provide its name, and "
-"your log in\n"
-"information. Please ask your system administrator if you are unsure of this "
-"information."
+"The first step in configuring an LDAP server is to provide its name, and your log in\n"
+"information. Please ask your system administrator if you are unsure of this information."
 msgstr ""
-"Το πρώτο βήμα για την ρύθμιση ενός διακομιστή LDAP είναι να καταχωρήσετε το "
-"όνομα του και τις\n"
-"πληροφορίες εισόδου σας. Ζητήστε από τον διαχειριστή τις απαραίτητες "
-"πληροφορίες αν δεν είστε σίγουροι."
+"Το πρώτο βήμα για την ρύθμιση ενός διακομιστή LDAP είναι να καταχωρήσετε το όνομα του και τις\n"
+"πληροφορίες εισόδου σας. Ζητήστε από τον διαχειριστή τις απαραίτητες πληροφορίες αν δεν είστε σίγουροι."
 
 #: addressbook/gui/component/ldap-config.glade.h:56
 msgid ""
-"The options on this page control how many entries should be included in "
-"your\n"
-"searches, and how long a search should take. Ask your system administrator "
-"if you\n"
+"The options on this page control how many entries should be included in your\n"
+"searches, and how long a search should take. Ask your system administrator if you\n"
 "need to change these options."
 msgstr ""
-"Οι επιλογές σε αυτήν την σελίδα ελέγχουν τον αριθμό των καταχωρήσεων που θα "
-"περιέχονται\n"
-"στις αναζητήσεις και την χρονική διάρκεια της αναζήτησης. Ρωτήστε τον "
-"διαχειριστή του συστήματος σας\n"
+"Οι επιλογές σε αυτήν την σελίδα ελέγχουν τον αριθμό των καταχωρήσεων που θα περιέχονται\n"
+"στις αναζητήσεις και την χρονική διάρκεια της αναζήτησης. Ρωτήστε τον διαχειριστή του συστήματος σας\n"
 "αν θέλετε να αλλάξετε αυτές τις επιλογές."
 
 #: addressbook/gui/component/ldap-config.glade.h:59
 msgid ""
-"The search base is the distinguished name (DN)  of the entry where your "
-"searches will \n"
-"begin. If you leave this blank, the search will begin at the root of the "
-"directory tree."
+"The search base is the distinguished name (DN)  of the entry where your searches will \n"
+"begin. If you leave this blank, the search will begin at the root of the directory tree."
 msgstr ""
-"Η βάση αναζήτησης είναι το διακεκριμένο όνομα  (DN) της καταχώρησης όπου θα "
-"ξεκινούν οι \n"
-"αναζητήσεις σας. Αν αφήσετε αυτό κενό, η αναζήτηση θα ξεκινά από τον ριζικό "
-"κατάλογο του δέντρου. "
+"Η βάση αναζήτησης είναι το διακεκριμένο όνομα  (DN) της καταχώρησης όπου θα ξεκινούν οι \n"
+"αναζητήσεις σας. Αν αφήσετε αυτό κενό, η αναζήτηση θα ξεκινά από τον ριζικό κατάλογο του δέντρου. "
 
 #: addressbook/gui/component/ldap-config.glade.h:61
 msgid ""
-"The search scope defines how deep you would like the search to extend down "
-"the \n"
-"directory tree. A search scope of \"sub\" will include all entries below "
-"your search base.\n"
-"A search scope of \"one\" will only include the entries one level beneath "
-"your base.\n"
-msgstr ""
-"Το βάθος αναζήτησης καθορίζει το βάθος της αναζήτησης στο δέντρο του "
-"καταλόγου \n"
-"Μια αναζήτηση με \"sub\" θα περιλαμβάνει όλες τις καταχωρήσεις κάτω από την "
-"βάση αναζήτησης σας.\n"
-"Μια αναζήτηση με \"ένα\"  θα περιλαμβάνει μόνο τις καταχωρήσεις που "
-"βρίσκονται μόνο ένα επίπεδο κάτω.\n"
+"The search scope defines how deep you would like the search to extend down the \n"
+"directory tree. A search scope of \"sub\" will include all entries below your search base.\n"
+"A search scope of \"one\" will only include the entries one level beneath your base.\n"
+msgstr ""
+"Το βάθος αναζήτησης καθορίζει το βάθος της αναζήτησης στο δέντρο του καταλόγου \n"
+"Μια αναζήτηση με \"sub\" θα περιλαμβάνει όλες τις καταχωρήσεις κάτω από την βάση αναζήτησης σας.\n"
+"Μια αναζήτηση με \"ένα\"  θα περιλαμβάνει μόνο τις καταχωρήσεις που βρίσκονται μόνο ένα επίπεδο κάτω.\n"
 
 #: addressbook/gui/component/ldap-config.glade.h:65
 msgid ""
 "This assistant will help you to access online directory services\n"
 "using LDAP (Lightweight Directory Access Protocol) servers. \n"
 "\n"
-"Adding a new LDAP server requires some specialized information about the "
-"server. Please contact your system administrator if you need help finding "
-"this information."
+"Adding a new LDAP server requires some specialized information about the server. Please contact your system administrator if you need help finding this information."
 msgstr ""
 "Ο βοηθός θα σας βοηθήσει να έχετε πρόσβαση στις υπηρεσίες καταλόγου\n"
 "με την χρήση διακομιστών LDAP (Lightweight Directory Access Protocol). \n"
 "\n"
-"Η προσθήκη ενός νέου διακομιστή LDAP απαιτεί κάποιες ειδικές πληροφορίεςγια "
-"τον διακομιστή. Επικοινωνήστε με τον διαχειριστή του συστήματος σας αν "
-"θέλετε βοήθεια για να βρείτε αυτές τις πληροφορίες."
+"Η προσθήκη ενός νέου διακομιστή LDAP απαιτεί κάποιες ειδικές πληροφορίεςγια τον διακομιστή. Επικοινωνήστε με τον διαχειριστή του συστήματος σας αν θέλετε βοήθεια για να βρείτε αυτές τις πληροφορίες."
 
 #: addressbook/gui/component/ldap-config.glade.h:69
-msgid ""
-"This is the full name of your ldap server. For example, \"ldap.mycompany.com"
-"\"."
-msgstr ""
-"Αυτό είναι το πλήρες όνομα του διακομιστή ldap. Για παράδειγμα , \"ldap."
-"mycompany.com\"."
+msgid "This is the full name of your ldap server. For example, \"ldap.mycompany.com\"."
+msgstr "Αυτό είναι το πλήρες όνομα του διακομιστή ldap. Για παράδειγμα , \"ldap.mycompany.com\"."
 
 #: addressbook/gui/component/ldap-config.glade.h:70
 msgid ""
-"This is the maximum number of entries to download. Setting this number to "
-"be \n"
+"This is the maximum number of entries to download. Setting this number to be \n"
 "too large will slow down your addressbook."
 msgstr ""
-"Αυτός είναι το μέγιστος αριθμός καταχωρήσεων για μεταφόρτωση. Ο ορισμός ενός "
-"μεγάλου αριθμού \n"
+"Αυτός είναι το μέγιστος αριθμός καταχωρήσεων για μεταφόρτωση. Ο ορισμός ενός μεγάλου αριθμού \n"
 "θα κάνει αργό το ευρετήριο διευθύνσεων σας."
 
 #: addressbook/gui/component/ldap-config.glade.h:72
-msgid ""
-"This is the method evolution will use to authenticate you.  Note that "
-"setting this to \"Email Address\" requires anonymous access to your ldap "
-"server."
-msgstr ""
-"Αυτή είναι η μέθοδος που θα χρησιμοποιεί το evolution για την πιστοποίηση "
-"σας.  Σημειώστε ότι η ρύθμιση σε \"Διεύθυνση Email\" απαιτεί ανώνυμη "
-"πρόσβαση στον διακομιστή ldap. "
+msgid "This is the method evolution will use to authenticate you.  Note that setting this to \"Email Address\" requires anonymous access to your ldap server."
+msgstr "Αυτή είναι η μέθοδος που θα χρησιμοποιεί το evolution για την πιστοποίηση σας.  Σημειώστε ότι η ρύθμιση σε \"Διεύθυνση Email\" απαιτεί ανώνυμη πρόσβαση στον διακομιστή ldap. "
 
 #: addressbook/gui/component/ldap-config.glade.h:73
 msgid ""
-"This is the name for this server that will appear in your Evolution folder "
-"list.\n"
+"This is the name for this server that will appear in your Evolution folder list.\n"
 "It is for display purposes only. "
 msgstr ""
-"Αυτό είναι το όνομα για τον διακομιστή και θα εμφανιστεί στη λίστα φακέλων "
-"του Evolution.\n"
+"Αυτό είναι το όνομα για τον διακομιστή και θα εμφανιστεί στη λίστα φακέλων του Evolution.\n"
 " Είναι μόνο για λόγους εμφάνισης."
 
 #: addressbook/gui/component/ldap-config.glade.h:75
 msgid ""
-"This is the port on the LDAP server that Evolution will try to connect to. "
-"A \n"
+"This is the port on the LDAP server that Evolution will try to connect to. A \n"
 "list of standard ports has been provided. Ask your system administrator\n"
 "what port you should specify."
 msgstr ""
-"Αυτή είναι η θύρα του διακομιστή LDAP στην οποία θα προσπαθεί να συνδεθεί το "
-"Evolution\n"
-"Μια λίστα καθορισμένων θυρών είναι διαθέσιμη. Ρωτήστε τον διαχειριστή του "
-"συστήματος σας\n"
+"Αυτή είναι η θύρα του διακομιστή LDAP στην οποία θα προσπαθεί να συνδεθεί το Evolution\n"
+"Μια λίστα καθορισμένων θυρών είναι διαθέσιμη. Ρωτήστε τον διαχειριστή του συστήματος σας\n"
 "για το ποιά θύρα θα χρησιμοποιήσετε."
 
 #: addressbook/gui/component/ldap-config.glade.h:78
 msgid "This option controls how long a search will be run."
-msgstr ""
-"Αυτή η επιλογή ελέγχει την χρονική διάρκεια της εκτέλεσης της αναζήτησης."
+msgstr "Αυτή η επιλογή ελέγχει την χρονική διάρκεια της εκτέλεσης της αναζήτησης."
 
 #: addressbook/gui/component/ldap-config.glade.h:79
 msgid "U_se SSL/TLS:"
@@ -1239,7 +1176,8 @@ msgstr "Χρήση διακεκριμένου ονόματος (DN)"
 msgid "Using email address"
 msgstr "Χρήση  διεύθυνσης ταχυδρομείου"
 
-#: addressbook/gui/component/ldap-config.glade.h:82 mail/mail-account-gui.c:63
+#: addressbook/gui/component/ldap-config.glade.h:82
+#: mail/mail-account-gui.c:63
 #: mail/mail-config.glade.h:128
 msgid "Whenever Possible"
 msgstr "Όταν είναι δυνατόν"
@@ -1252,13 +1190,18 @@ msgstr "_Όνομα εμφάνισης:"
 msgid "_Download limit:"
 msgstr "Όριο _μεταφόρτωσης:"
 
-#: addressbook/gui/component/ldap-config.glade.h:85 filter/filter.glade.h:14
-#: mail/mail-config.glade.h:143 ui/evolution-addressbook.xml.h:33
-#: ui/evolution-calendar.xml.h:35 ui/evolution-composer-entries.xml.h:8
-#: ui/evolution-mail-list.xml.h:24 ui/evolution-mail-messagedisplay.xml.h:6
+#: addressbook/gui/component/ldap-config.glade.h:85
+#: filter/filter.glade.h:14
+#: mail/mail-config.glade.h:143
+#: ui/evolution-addressbook.xml.h:33
+#: ui/evolution-calendar.xml.h:31
+#: ui/evolution-composer-entries.xml.h:8
+#: ui/evolution-mail-list.xml.h:25
+#: ui/evolution-mail-messagedisplay.xml.h:6
 #: ui/evolution-message-composer.xml.h:41
-#: ui/evolution-signature-editor.xml.h:12 ui/evolution-subscribe.xml.h:10
-#: ui/evolution-tasks.xml.h:19
+#: ui/evolution-signature-editor.xml.h:11
+#: ui/evolution-subscribe.xml.h:10
+#: ui/evolution-tasks.xml.h:17
 msgid "_Edit"
 msgstr "_Επεξεργασία"
 
@@ -1298,24 +1241,20 @@ msgstr "στήλη-γενικών"
 msgid "searching-tab"
 msgstr "στήλη-αναζήτησης"
 
-#: addressbook/gui/component/select-names/e-select-names.c:509
-msgid "Select Contacts from Addressbook"
-msgstr "Επιλέξτε Επαφές από το Βιβλίο Διευθύνσεων"
+#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:1
+msgid "Evolution Addressbook name selection interface"
+msgstr "Διασύνδεση επιλογής ονομάτων του Βιβλίου Διευθύνσεων του Evolution."
 
-#: addressbook/gui/component/select-names/e-select-names.c:650
-msgid "Find contact in"
-msgstr "Εύρεση επαφής σε"
+#: addressbook/gui/component/select-names/e-select-names-popup.c:204
+msgid "Remove All"
+msgstr "Αφαίρεση Όλων"
 
-#: addressbook/gui/component/select-names/e-select-names.c:694
 #: addressbook/gui/component/select-names/e-select-names-popup.c:211
-#: composer/e-msg-composer-attachment-bar.c:444
+#: addressbook/gui/component/select-names/e-select-names.c:694
+#: composer/e-msg-composer-attachment-bar.c:507
 msgid "Remove"
 msgstr "Αφαίρεση"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:204
-msgid "Remove All"
-msgstr "Αφαίρεση Όλων"
-
 #: addressbook/gui/component/select-names/e-select-names-popup.c:218
 msgid "View Contact List"
 msgstr "Προβολή Λίστας Επαφών"
@@ -1338,9 +1277,13 @@ msgstr "Επαφή Χωρίς Τίτλο"
 msgid "Source"
 msgstr "Πηγή"
 
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:1
-msgid "Evolution Addressbook name selection interface"
-msgstr "Διασύνδεση επιλογής ονομάτων του Βιβλίου Διευθύνσεων του Evolution."
+#: addressbook/gui/component/select-names/e-select-names.c:509
+msgid "Select Contacts from Addressbook"
+msgstr "Επιλέξτε Επαφές από το Βιβλίο Διευθύνσεων"
+
+#: addressbook/gui/component/select-names/e-select-names.c:650
+msgid "Find contact in"
+msgstr "Εύρεση επαφής σε"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:2
 msgid "Find"
@@ -1413,7 +1356,7 @@ msgid "D_epartment:"
 msgstr "Τ_μήμα:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:11
-#: calendar/gui/dialogs/task-editor.c:200
+#: calendar/gui/dialogs/task-editor.c:197
 msgid "Details"
 msgstr "Λεπτομέρειες"
 
@@ -1431,12 +1374,10 @@ msgstr "Πλήρες Ό_νομα..."
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:16
 msgid ""
-"If this person publishes free/busy or other calendar information on the "
-"Internet, enter the address\n"
+"If this person publishes free/busy or other calendar information on the Internet, enter the address\n"
 "of that information here."
 msgstr ""
-"Αν το άτομο κοινοποιεί πληροφορίες για τη διαθεσιμότητά του ή άλλες "
-"πληροφορίες ημερολογίου στο Internet, \n"
+"Αν το άτομο κοινοποιεί πληροφορίες για τη διαθεσιμότητά του ή άλλες πληροφορίες ημερολογίου στο Internet, \n"
 "εισαγάγετε τη διεύθυνση προβολής αυτών των πληροφοριών εδώ."
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:18
@@ -1480,12 +1421,15 @@ msgid "_Categories..."
 msgstr "_Κατηγορίες..."
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:28
-#: calendar/gui/dialogs/meeting-page.c:634
-#: calendar/gui/e-calendar-table.c:1008 calendar/gui/e-calendar-table.c:1026
-#: calendar/gui/e-cal-view.c:1144 calendar/gui/e-cal-view.c:1176
-#: ui/evolution-addressbook.xml.h:32 ui/evolution-calendar.xml.h:34
-#: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:14
-#: ui/evolution-mail-message.xml.h:104 ui/evolution-tasks.xml.h:18
+#: calendar/gui/dialogs/meeting-page.c:717
+#: calendar/gui/e-calendar-table.c:968
+#: calendar/gui/e-day-view.c:3739
+#: calendar/gui/e-week-view.c:3631
+#: mail/folder-browser.c:1790
+#: ui/evolution-addressbook.xml.h:32
+#: ui/evolution-calendar.xml.h:30
+#: ui/evolution-mail-message.xml.h:97
+#: ui/evolution-tasks.xml.h:16
 #: ui/evolution.xml.h:45
 msgid "_Delete"
 msgstr "_Διαγραφή"
@@ -1527,15 +1471,15 @@ msgid "_Web page address:"
 msgstr "_Διεύθυνση Ιστοσελίδας:"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:102
-#: addressbook/gui/contact-editor/e-contact-editor.c:184
 #: addressbook/gui/contact-editor/e-contact-editor-fullname.c:95
+#: addressbook/gui/contact-editor/e-contact-editor.c:184
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.c:163
 #: addressbook/gui/widgets/e-addressbook-model.c:318
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:408
-#: addressbook/gui/widgets/e-minicard.c:183
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:393
 #: addressbook/gui/widgets/e-minicard-label.c:164
+#: addressbook/gui/widgets/e-minicard-view-widget.c:119
 #: addressbook/gui/widgets/e-minicard-view.c:478
-#: addressbook/gui/widgets/e-minicard-view-widget.c:120
+#: addressbook/gui/widgets/e-minicard.c:183
 msgid "Editable"
 msgstr "Επεξεργάσιμο"
 
@@ -2563,17 +2507,17 @@ msgstr "Ζιμπάμπουε"
 #: addressbook/gui/contact-editor/e-contact-editor.c:156
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.c:142
 #: addressbook/gui/widgets/e-addressbook-model.c:304
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:394
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:379
 #: addressbook/gui/widgets/e-addressbook-view.c:180
+#: addressbook/gui/widgets/e-minicard-view-widget.c:105
 #: addressbook/gui/widgets/e-minicard-view.c:464
-#: addressbook/gui/widgets/e-minicard-view-widget.c:106
 msgid "Book"
 msgstr "Βιβλίο"
 
 #: addressbook/gui/contact-editor/e-contact-editor.c:163
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.c:149
-#: addressbook/gui/widgets/e-minicard.c:190
 #: addressbook/gui/widgets/e-minicard-widget.c:93
+#: addressbook/gui/widgets/e-minicard.c:190
 msgid "Card"
 msgstr "Κάρτα"
 
@@ -2621,7 +2565,7 @@ msgstr ""
 msgid "TTY/TDD"
 msgstr "TTY/TDD"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2376
+#: addressbook/gui/contact-editor/e-contact-editor.c:2375
 #, c-format
 msgid "Could not find widget for a field: `%s'"
 msgstr "Δε βρέθηκε συστατικό για το πεδίο: `%s'"
@@ -2779,8 +2723,7 @@ msgstr "Λίστα _ονόματος:"
 
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
 msgid "_Type an email address or drag a contact into the list below:"
-msgstr ""
-"Π_ληκτρολογήστε μια διεύθυνση e-mail ή σύρετε μια επαφή στην παρακάτω λίστα:"
+msgstr "Π_ληκτρολογήστε μια διεύθυνση e-mail ή σύρετε μια επαφή στην παρακάτω λίστα:"
 
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8
 msgid "contact-list-editor"
@@ -2795,7 +2738,7 @@ msgstr "Είναι Νέα Λίστα"
 msgid "Contact List Editor"
 msgstr "Επεξεργαστής Λίστας Επαφών"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:457
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:456
 msgid "Save List as VCard"
 msgstr "Αποθήκευση Λίστας ως Vcard"
 
@@ -2841,7 +2784,7 @@ msgstr ""
 "ήδη σε αυτόν τον φάκελο.  Θέλετε οπωσδήποτε να προστεθεί;"
 
 #. FIXME: get the toplevel window...
-#: addressbook/gui/search/e-addressbook-search-dialog.c:116
+#: addressbook/gui/search/e-addressbook-search-dialog.c:117
 #: widgets/misc/e-filter-bar.c:148
 msgid "Advanced Search"
 msgstr "Προχωρημένη Αναζήτηση"
@@ -2860,10 +2803,10 @@ msgid "%d cards"
 msgstr "%d κάρτες"
 
 #: addressbook/gui/widgets/e-addressbook-model.c:311
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:401
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:386
 #: addressbook/gui/widgets/e-addressbook-view.c:187
+#: addressbook/gui/widgets/e-minicard-view-widget.c:112
 #: addressbook/gui/widgets/e-minicard-view.c:471
-#: addressbook/gui/widgets/e-minicard-view-widget.c:113
 msgid "Query"
 msgstr "Ερώτημα"
 
@@ -2871,113 +2814,120 @@ msgstr "Ερώτημα"
 msgid "Error getting book view"
 msgstr "Σφάλμα λήψης όψης βιβλίου"
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:415
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:400
 msgid "Model"
 msgstr "Μοντέλο"
 
-#: addressbook/gui/widgets/e-addressbook-table-adapter.c:148
-#: addressbook/gui/widgets/e-addressbook-util.c:106
+#: addressbook/gui/widgets/e-addressbook-table-adapter.c:145
+#: addressbook/gui/widgets/e-addressbook-util.c:105
 #: addressbook/gui/widgets/e-minicard.c:531
 msgid "Error modifying card"
 msgstr "Σφάλμα τροποποίησης κάρτας"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:37
-#: shell/evolution-shell-component.c:1183
+#: addressbook/gui/widgets/e-addressbook-util.c:36
+#: shell/evolution-shell-component.c:1180
 msgid "Success"
 msgstr "Επιτυχία"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:38
+#: addressbook/gui/widgets/e-addressbook-util.c:37
 #: camel/providers/imap/camel-imap-command.c:306
 #: camel/providers/imap/camel-imap-command.c:403
 #: camel/providers/pop3/camel-pop3-store.c:526
-#: camel/providers/pop3/camel-pop3-store.c:533 shell/e-shell.c:2077
-#: shell/e-storage.c:598 shell/evolution-shell-component.c:1222
+#: camel/providers/pop3/camel-pop3-store.c:533
+#: shell/e-shell.c:2077
+#: shell/e-storage.c:598
+#: shell/evolution-shell-component.c:1219
 msgid "Unknown error"
 msgstr "Άγνωστο Σφάλμα"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:39
+#: addressbook/gui/widgets/e-addressbook-util.c:38
 msgid "Repository offline"
 msgstr "Αρχείο φύλαξης εκτός δικτύου"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:40 shell/e-storage.c:584
-#: shell/evolution-shell-component.c:1213
+#: addressbook/gui/widgets/e-addressbook-util.c:39
+#: shell/e-storage.c:584
+#: shell/evolution-shell-component.c:1210
 msgid "Permission denied"
 msgstr "Δεν επιτρέπεται η πρόσβαση"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:41
+#: addressbook/gui/widgets/e-addressbook-util.c:40
 msgid "Card not found"
 msgstr "Η κάρτα δεν βρέθηκε"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:42
+#: addressbook/gui/widgets/e-addressbook-util.c:41
 msgid "Card ID already exists"
 msgstr "Το αναγνωριστικό κάρτας υπάρχει ήδη"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:43
+#: addressbook/gui/widgets/e-addressbook-util.c:42
 msgid "Protocol not supported"
 msgstr "Δεν υποστηρίζεται το πρωτόκολλο"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:44
+#: addressbook/gui/widgets/e-addressbook-util.c:43
+#: calendar/gui/calendar-model.c:759
+#: calendar/gui/calendar-model.c:1184
 #: calendar/gui/dialogs/task-details-page.glade.h:3
-#: calendar/gui/e-calendar-table.c:479 calendar/gui/e-cal-model-tasks.c:325
-#: calendar/gui/e-cal-model-tasks.c:604 calendar/gui/e-tasks.c:253
-#: calendar/gui/print.c:2314 camel/camel-service.c:733
-#: camel/camel-service.c:771 camel/camel-service.c:855
-#: camel/camel-service.c:895 camel/providers/pop3/camel-pop3-store.c:443
+#: calendar/gui/e-calendar-table.c:469
+#: calendar/gui/print.c:2309
+#: camel/camel-service.c:744
+#: camel/camel-service.c:783
+#: camel/camel-service.c:870
+#: camel/camel-service.c:911
+#: camel/providers/pop3/camel-pop3-store.c:443
 #: camel/providers/pop3/camel-pop3-store.c:520
 msgid "Cancelled"
 msgstr "Ακυρώθηκε"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:45
+#: addressbook/gui/widgets/e-addressbook-util.c:44
 msgid "Authentication Failed"
 msgstr "Η πιστοποίηση απέτυχε."
 
-#: addressbook/gui/widgets/e-addressbook-util.c:46
+#: addressbook/gui/widgets/e-addressbook-util.c:45
 msgid "Authentication Required"
 msgstr "Απαιτείται πιστοποίηση"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:47
+#: addressbook/gui/widgets/e-addressbook-util.c:46
 msgid "TLS not Available"
 msgstr "TLS δεν είναι διαθέσιμο"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:48
+#: addressbook/gui/widgets/e-addressbook-util.c:47
 msgid "Addressbook does not exist"
 msgstr "Το ευρετήριο διευθύνσεων δεν υπάρχει"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:49
+#: addressbook/gui/widgets/e-addressbook-util.c:48
 msgid "Other error"
 msgstr "Άλλο σφάλμα"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:76
+#: addressbook/gui/widgets/e-addressbook-util.c:75
 msgid "Do you want to save changes?"
 msgstr "Θέλετε να αποθηκεύσετε τις αλλαγές;"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:78
+#: addressbook/gui/widgets/e-addressbook-util.c:77
 msgid "_Discard"
 msgstr "Α_πόρριψη"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:97
+#: addressbook/gui/widgets/e-addressbook-util.c:96
 msgid "Error adding list"
 msgstr "Σφάλμα προσθήκης λίστας"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:97
-#: addressbook/gui/widgets/e-addressbook-util.c:273
+#: addressbook/gui/widgets/e-addressbook-util.c:96
+#: addressbook/gui/widgets/e-addressbook-util.c:272
 msgid "Error adding card"
 msgstr "Σφάλμα προσθήκης κάρτας"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:106
+#: addressbook/gui/widgets/e-addressbook-util.c:105
 msgid "Error modifying list"
 msgstr "Σφάλμα τροποποίησης λίστας"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:116
+#: addressbook/gui/widgets/e-addressbook-util.c:115
 msgid "Error removing list"
 msgstr "Σφάλμα κατάργησης λίστας"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:116
-#: addressbook/gui/widgets/e-addressbook-util.c:231
+#: addressbook/gui/widgets/e-addressbook-util.c:115
+#: addressbook/gui/widgets/e-addressbook-util.c:230
 msgid "Error removing card"
 msgstr "Σφάλμα αφαίρεσης κάρτας"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:198
+#: addressbook/gui/widgets/e-addressbook-util.c:197
 #, c-format
 msgid ""
 "Opening %d cards will open %d new windows as well.\n"
@@ -2986,131 +2936,144 @@ msgstr ""
 "Το άνοιγμα %d καρτών θα ανοίξει και %d νέα παράθυρα.\n"
 "Θέλετε πραγματικά να εμφανίσετε όλες αυτές τις κάρτες?"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:329
+#: addressbook/gui/widgets/e-addressbook-util.c:328
 msgid "Move card to"
 msgstr "Μετακίνηση κάρτας σε"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:331
+#: addressbook/gui/widgets/e-addressbook-util.c:330
 msgid "Copy card to"
 msgstr "Αντιγραφή κάρτας σε"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:334
+#: addressbook/gui/widgets/e-addressbook-util.c:333
 msgid "Move cards to"
 msgstr "Μετακίνηση καρτών σε"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:336
+#: addressbook/gui/widgets/e-addressbook-util.c:335
 msgid "Copy cards to"
 msgstr "Αντιγραφή καρτών σε"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:518
+#: addressbook/gui/widgets/e-addressbook-util.c:517
 msgid "Multiple VCards"
 msgstr "Πολλαπλές Εκάρτες"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:526
+#: addressbook/gui/widgets/e-addressbook-util.c:525
 #, c-format
 msgid "VCard for %s"
 msgstr "VCard για %s"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:194
-#: calendar/gui/e-calendar-table.etspec.h:17
+#: calendar/gui/dialogs/meeting-page.etspec.h:11
+#: calendar/gui/e-calendar-table.etspec.h:18
 #: calendar/gui/e-meeting-time-sel.etspec.h:11
 msgid "Type"
 msgstr "Τύπος"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:398
-#: importers/evolution-gnomecard-importer.c:228 importers/pine-importer.c:642
+#: addressbook/gui/widgets/e-addressbook-view.c:394
+#: importers/evolution-gnomecard-importer.c:228
+#: importers/pine-importer.c:642
 #: mail/importers/pine-importer.c:577
 msgid "Addressbook"
 msgstr "Βιβλίο Διευθύνσεων"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:680
-#: addressbook/gui/widgets/e-addressbook-view.c:899
-#: addressbook/gui/widgets/e-addressbook-view.c:1883
+#: addressbook/gui/widgets/e-addressbook-view.c:676
+#: addressbook/gui/widgets/e-addressbook-view.c:895
+#: addressbook/gui/widgets/e-addressbook-view.c:1879
 #: ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard"
 msgstr "Αποθήκευση ως (VCard)"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:886
+#: addressbook/gui/widgets/e-addressbook-view.c:882
 msgid "New Contact..."
 msgstr "Νέα Επαφή..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:887
+#: addressbook/gui/widgets/e-addressbook-view.c:883
 msgid "New Contact List..."
 msgstr "Νέα Λίστα Επαφών..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:890
+#: addressbook/gui/widgets/e-addressbook-view.c:886
 msgid "Go to Folder..."
 msgstr "Μετάβαση στον Φάκελο..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:891
+#: addressbook/gui/widgets/e-addressbook-view.c:887
 msgid "Import..."
 msgstr "Εισαγωγή..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:893
+#: addressbook/gui/widgets/e-addressbook-view.c:889
 msgid "Search for Contacts..."
 msgstr "Αναζήτηση  για επαφές"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:894
+#: addressbook/gui/widgets/e-addressbook-view.c:890
 msgid "Addressbook Sources..."
 msgstr "Πηγές βιβλίου διευθύνσεων..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:896
+#: addressbook/gui/widgets/e-addressbook-view.c:892
 msgid "Pilot Settings..."
 msgstr "Ρυθμίσεις Pilot ..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:900
+#: addressbook/gui/widgets/e-addressbook-view.c:896
 #: ui/evolution-addressbook.xml.h:10
 msgid "Forward Contact"
 msgstr "Προώθηση Επαφής"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:901
+#: addressbook/gui/widgets/e-addressbook-view.c:897
 msgid "Send Message to Contact"
 msgstr "Αποστολή Μηνύματος στη Επαφή"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:902 calendar/gui/print.c:2446
-#: ui/evolution-addressbook.xml.h:16 ui/evolution-comp-editor.xml.h:8
-#: ui/evolution-contact-editor.xml.h:5 ui/evolution-mail-message.xml.h:72
+#: addressbook/gui/widgets/e-addressbook-view.c:898
+#: calendar/gui/print.c:2441
+#: ui/evolution-addressbook.xml.h:16
+#: ui/evolution-comp-editor.xml.h:8
+#: ui/evolution-contact-editor.xml.h:4
+#: ui/evolution-mail-message.xml.h:67
 #: ui/my-evolution.xml.h:1
 msgid "Print"
 msgstr "Εκτύπωση"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:904
+#: addressbook/gui/widgets/e-addressbook-view.c:900
 msgid "Print Envelope"
 msgstr "Εκτύπωση Φακέλου"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:908
+#: addressbook/gui/widgets/e-addressbook-view.c:904
 msgid "Copy to folder..."
 msgstr "Αντιγραφή στο Φάκελο..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:909
+#: addressbook/gui/widgets/e-addressbook-view.c:905
 msgid "Move to folder..."
 msgstr "Μετακίνηση στο Φάκελο..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:912
-#: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
+#: addressbook/gui/widgets/e-addressbook-view.c:908
+#: ui/evolution-addressbook.xml.h:6
+#: ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "Αποκοπή"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:913
-#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:9
+#: addressbook/gui/widgets/e-addressbook-view.c:909
+#: ui/evolution-addressbook.xml.h:2
+#: ui/evolution-mail-message.xml.h:8
 #: ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr "Αντιγραφή"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:914
-#: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:10
+#: addressbook/gui/widgets/e-addressbook-view.c:910
+#: ui/evolution-addressbook.xml.h:13
+#: ui/evolution-tasks.xml.h:9
 msgid "Paste"
 msgstr "Επικόλληση"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:915 filter/libfilter-i18n.h:10
-#: mail/mail-accounts.c:234 ui/evolution-addressbook.xml.h:8
-#: ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:3
-#: ui/evolution-contact-list-editor.xml.h:3 ui/evolution-mail-message.xml.h:24
+#: addressbook/gui/widgets/e-addressbook-view.c:911
+#: filter/libfilter-i18n.h:11
+#: mail/mail-accounts.c:234
+#: ui/evolution-addressbook.xml.h:8
+#: ui/evolution-comp-editor.xml.h:4
+#: ui/evolution-contact-editor.xml.h:2
+#: ui/evolution-contact-list-editor.xml.h:2
+#: ui/evolution-mail-message.xml.h:20
 msgid "Delete"
 msgstr "Διαγραφή"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:919
-#: calendar/gui/e-cal-view.c:1109
+#: addressbook/gui/widgets/e-addressbook-view.c:915
+#: calendar/gui/e-day-view.c:3699
+#: calendar/gui/e-week-view.c:3596
 msgid "Current View"
 msgstr "Τρέχουσα Προβολή"
 
@@ -3122,7 +3085,7 @@ msgstr "Τρέχουσα Προβολή"
 #. Translators: put here a list of labels you want to see on buttons in
 #. addressbook. You may use any character to separate labels but it must
 #. also be placed at the begining ot the string
-#: addressbook/gui/widgets/e-addressbook-view.c:953
+#: addressbook/gui/widgets/e-addressbook-view.c:949
 msgid ",123,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
 msgstr ",123,α,β,γ,δ,ε,ζ,η,θ,ι,κ,λ,μ,ν,ξ,ο,π,ρ,σ,τ,υ,φ,χ,ψ,ω"
 
@@ -3130,11 +3093,11 @@ msgstr ",123,α,β,γ,δ,ε,ζ,η,θ,ι,κ,λ,μ,ν,ξ,ο,π,ρ,σ,τ,υ,φ,χ,�
 #. in addressbook. You may use any character to separate labels but it
 #. must also be placed at the begining ot the string.
 #. Use lower case letters if possible.
-#: addressbook/gui/widgets/e-addressbook-view.c:958
+#: addressbook/gui/widgets/e-addressbook-view.c:954
 msgid ",0,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
 msgstr ",0,α,β,γ,δ,ε,ζ,η,θ,ι,κ,λ,μ,ν,ξ,ο,π,ρ,σ,τ,υ,φ,χ,ψ,ω"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1356
+#: addressbook/gui/widgets/e-addressbook-view.c:1352
 #, c-format
 msgid ""
 "The addressbook backend for\n"
@@ -3143,8 +3106,7 @@ msgid ""
 msgstr ""
 "Το backend του ευρετηρίου διευθύνσεων για\n"
 "%s\n"
-"κόλλησε. Θα πρέπει να επανεκκινήσετε το Evolution για να το "
-"ξαναχρησιμοποιήσετε"
+"κόλλησε. Θα πρέπει να επανεκκινήσετε το Evolution για να το ξαναχρησιμοποιήσετε"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:1
 msgid "* Click here to add a contact *"
@@ -3206,29 +3168,6 @@ msgstr "Άλλο Τηλέφωνο"
 msgid "Primary Phone"
 msgstr "Πρωτεύον Τηλέφωνο"
 
-#: addressbook/gui/widgets/e-minicard.c:146
-#: addressbook/gui/widgets/e-minicard-label.c:115
-msgid "Width"
-msgstr "Πλάτος"
-
-#: addressbook/gui/widgets/e-minicard.c:153
-#: addressbook/gui/widgets/e-minicard-label.c:122
-msgid "Height"
-msgstr "Ύψος"
-
-#: addressbook/gui/widgets/e-minicard.c:161
-#: addressbook/gui/widgets/e-minicard-label.c:129
-msgid "Has Focus"
-msgstr "Έχει εστίαση"
-
-#: addressbook/gui/widgets/e-minicard.c:169
-msgid "Selected"
-msgstr "Επιλεγμένα"
-
-#: addressbook/gui/widgets/e-minicard.c:176
-msgid "Has Cursor"
-msgstr "Έχει δρομέα"
-
 #: addressbook/gui/widgets/e-minicard-control.c:204
 #, c-format
 msgid "and %d other cards."
@@ -3242,6 +3181,21 @@ msgstr "και άλλη μία κάρτα."
 msgid "Save in addressbook"
 msgstr "Αποθήκευση στο Βιβλίο Διευθύνσεων"
 
+#: addressbook/gui/widgets/e-minicard-label.c:115
+#: addressbook/gui/widgets/e-minicard.c:146
+msgid "Width"
+msgstr "Πλάτος"
+
+#: addressbook/gui/widgets/e-minicard-label.c:122
+#: addressbook/gui/widgets/e-minicard.c:153
+msgid "Height"
+msgstr "Ύψος"
+
+#: addressbook/gui/widgets/e-minicard-label.c:129
+#: addressbook/gui/widgets/e-minicard.c:161
+msgid "Has Focus"
+msgstr "Έχει εστίαση"
+
 #: addressbook/gui/widgets/e-minicard-label.c:136
 msgid "Field"
 msgstr "Πεδίο"
@@ -3258,6 +3212,10 @@ msgstr "Μοντέλο Κειμένου"
 msgid "Max field name length"
 msgstr "Μέγιστο μάκρος ονόματος πεδίου"
 
+#: addressbook/gui/widgets/e-minicard-view-widget.c:126
+msgid "Column Width"
+msgstr "Πλάτος στήλης"
+
 #: addressbook/gui/widgets/e-minicard-view.c:141
 msgid ""
 "\n"
@@ -3286,9 +3244,13 @@ msgstr ""
 msgid "Adapter"
 msgstr "Προσαρμογέας"
 
-#: addressbook/gui/widgets/e-minicard-view-widget.c:127
-msgid "Column Width"
-msgstr "Πλάτος στήλης"
+#: addressbook/gui/widgets/e-minicard.c:169
+msgid "Selected"
+msgstr "Επιλεγμένα"
+
+#: addressbook/gui/widgets/e-minicard.c:176
+msgid "Has Cursor"
+msgstr "Έχει δρομέα"
 
 #: addressbook/gui/widgets/gal-view-factory-minicard.c:24
 msgid "Card View"
@@ -3298,20 +3260,20 @@ msgstr "Προβολή Κάρτας"
 msgid "GTK Tree View"
 msgstr "Προβολή δένδρου GTK "
 
-#: addressbook/printing/e-contact-print.c:1158
+#: addressbook/printing/e-contact-print-envelope.c:217
+#: addressbook/printing/e-contact-print-envelope.c:238
+msgid "Print envelope"
+msgstr "Εκτύπωση φακέλου"
+
+#: addressbook/printing/e-contact-print.c:1139
 msgid "Print cards"
 msgstr "Εκτύπωση καρτών"
 
-#: addressbook/printing/e-contact-print.c:1224
-#: addressbook/printing/e-contact-print.c:1250
+#: addressbook/printing/e-contact-print.c:1204
+#: addressbook/printing/e-contact-print.c:1226
 msgid "Print card"
 msgstr "Εκτύπωση κάρτας"
 
-#: addressbook/printing/e-contact-print-envelope.c:217
-#: addressbook/printing/e-contact-print-envelope.c:238
-msgid "Print envelope"
-msgstr "Εκτύπωση φακέλου"
-
 #: addressbook/printing/e-contact-print.glade.h:1
 msgid "10 pt. Tahoma"
 msgstr "10 pt. Tahoma"
@@ -3400,7 +3362,8 @@ msgstr "Περιθώρια"
 msgid "Number of columns:"
 msgstr "Αριθμός στηλών:"
 
-#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:79
+#: addressbook/printing/e-contact-print.glade.h:23
+#: mail/mail-config.glade.h:79
 msgid "Options"
 msgstr "Επιλογές"
 
@@ -3481,216 +3444,194 @@ msgstr "Πλάτος:"
 msgid "_Font..."
 msgstr "_Γραμματοσειρά..."
 
-#: addressbook/tools/evolution-addressbook-export.c:56
-msgid "Specify the output file instead of standard output"
-msgstr ""
-
-#: addressbook/tools/evolution-addressbook-export.c:57
-msgid "OUTPUTFILE"
-msgstr ""
-
-#: addressbook/tools/evolution-addressbook-export.c:58
-#, fuzzy
-msgid "List local addressbook folders"
-msgstr "με όλους τους τοπικούς και ενεργούς απομακρυσμένους φακέλους"
-
-#: addressbook/tools/evolution-addressbook-export.c:60
-msgid "Show cards as vcard or csv file"
-msgstr ""
-
-#: addressbook/tools/evolution-addressbook-export.c:60
-#, fuzzy
-msgid "[vcard|csv]"
-msgstr "κάρτες"
-
-#: addressbook/tools/evolution-addressbook-export.c:61
-msgid "Export in asynchronous mode "
-msgstr ""
-
-#: addressbook/tools/evolution-addressbook-export.c:63
-msgid ""
-"The number of cards in one output file in asychronous mode,default size 100."
-msgstr ""
-
-#: addressbook/tools/evolution-addressbook-export.c:63
-msgid "NUMBER"
-msgstr ""
-
-#: addressbook/tools/evolution-addressbook-export.c:91
-msgid ""
-"Command line arguments error, please use --help option to see the usage."
-msgstr ""
-
-#: addressbook/tools/evolution-addressbook-export.c:105
-msgid "Only support csv or vcard format."
-msgstr ""
-
-#: addressbook/tools/evolution-addressbook-export.c:114
-msgid "In async mode, output must be file."
-msgstr ""
-
-#: addressbook/tools/evolution-addressbook-export.c:122
-msgid "In normal mode, there should not need size option."
-msgstr ""
-
-#: addressbook/tools/evolution-addressbook-export.c:153
-#, fuzzy
-msgid "Impossible internal error."
-msgstr "Εσωτερικό σφάλμα"
-
 #: calendar/cal-util/cal-component.c:1218
 msgid "Untitled appointment"
 msgstr "Ραντεβού χωρίς τίτλο"
 
-#: calendar/cal-util/cal-recur.c:3985 calendar/gui/print.c:477
+#: calendar/cal-util/cal-recur.c:3985
+#: calendar/gui/print.c:479
 msgid "1st"
 msgstr "1η"
 
-#: calendar/cal-util/cal-recur.c:3986 calendar/gui/print.c:477
+#: calendar/cal-util/cal-recur.c:3986
+#: calendar/gui/print.c:479
 msgid "2nd"
 msgstr "2η"
 
-#: calendar/cal-util/cal-recur.c:3987 calendar/gui/print.c:477
+#: calendar/cal-util/cal-recur.c:3987
+#: calendar/gui/print.c:479
 msgid "3rd"
 msgstr "3η"
 
-#: calendar/cal-util/cal-recur.c:3988 calendar/gui/print.c:477
+#: calendar/cal-util/cal-recur.c:3988
+#: calendar/gui/print.c:479
 msgid "4th"
 msgstr "4η"
 
-#: calendar/cal-util/cal-recur.c:3989 calendar/gui/print.c:477
+#: calendar/cal-util/cal-recur.c:3989
+#: calendar/gui/print.c:479
 msgid "5th"
 msgstr "5η"
 
-#: calendar/cal-util/cal-recur.c:3990 calendar/gui/print.c:478
+#: calendar/cal-util/cal-recur.c:3990
+#: calendar/gui/print.c:480
 msgid "6th"
 msgstr "6η"
 
-#: calendar/cal-util/cal-recur.c:3991 calendar/gui/print.c:478
+#: calendar/cal-util/cal-recur.c:3991
+#: calendar/gui/print.c:480
 msgid "7th"
 msgstr "7η"
 
-#: calendar/cal-util/cal-recur.c:3992 calendar/gui/print.c:478
+#: calendar/cal-util/cal-recur.c:3992
+#: calendar/gui/print.c:480
 msgid "8th"
 msgstr "8η"
 
-#: calendar/cal-util/cal-recur.c:3993 calendar/gui/print.c:478
+#: calendar/cal-util/cal-recur.c:3993
+#: calendar/gui/print.c:480
 msgid "9th"
 msgstr "9η"
 
-#: calendar/cal-util/cal-recur.c:3994 calendar/gui/print.c:478
+#: calendar/cal-util/cal-recur.c:3994
+#: calendar/gui/print.c:480
 msgid "10th"
 msgstr "10η"
 
-#: calendar/cal-util/cal-recur.c:3995 calendar/gui/print.c:479
+#: calendar/cal-util/cal-recur.c:3995
+#: calendar/gui/print.c:481
 msgid "11th"
 msgstr "11η"
 
-#: calendar/cal-util/cal-recur.c:3996 calendar/gui/print.c:479
+#: calendar/cal-util/cal-recur.c:3996
+#: calendar/gui/print.c:481
 msgid "12th"
 msgstr "12η"
 
-#: calendar/cal-util/cal-recur.c:3997 calendar/gui/print.c:479
+#: calendar/cal-util/cal-recur.c:3997
+#: calendar/gui/print.c:481
 msgid "13th"
 msgstr "13η"
 
-#: calendar/cal-util/cal-recur.c:3998 calendar/gui/print.c:479
+#: calendar/cal-util/cal-recur.c:3998
+#: calendar/gui/print.c:481
 msgid "14th"
 msgstr "14η"
 
-#: calendar/cal-util/cal-recur.c:3999 calendar/gui/print.c:479
+#: calendar/cal-util/cal-recur.c:3999
+#: calendar/gui/print.c:481
 msgid "15th"
 msgstr "15η"
 
-#: calendar/cal-util/cal-recur.c:4000 calendar/gui/print.c:480
+#: calendar/cal-util/cal-recur.c:4000
+#: calendar/gui/print.c:482
 msgid "16th"
 msgstr "16η"
 
-#: calendar/cal-util/cal-recur.c:4001 calendar/gui/print.c:480
+#: calendar/cal-util/cal-recur.c:4001
+#: calendar/gui/print.c:482
 msgid "17th"
 msgstr "17η"
 
-#: calendar/cal-util/cal-recur.c:4002 calendar/gui/print.c:480
+#: calendar/cal-util/cal-recur.c:4002
+#: calendar/gui/print.c:482
 msgid "18th"
 msgstr "18η"
 
-#: calendar/cal-util/cal-recur.c:4003 calendar/gui/print.c:480
+#: calendar/cal-util/cal-recur.c:4003
+#: calendar/gui/print.c:482
 msgid "19th"
 msgstr "19η"
 
-#: calendar/cal-util/cal-recur.c:4004 calendar/gui/print.c:480
+#: calendar/cal-util/cal-recur.c:4004
+#: calendar/gui/print.c:482
 msgid "20th"
 msgstr "20η"
 
-#: calendar/cal-util/cal-recur.c:4005 calendar/gui/print.c:481
+#: calendar/cal-util/cal-recur.c:4005
+#: calendar/gui/print.c:483
 msgid "21st"
 msgstr "21η"
 
-#: calendar/cal-util/cal-recur.c:4006 calendar/gui/print.c:481
+#: calendar/cal-util/cal-recur.c:4006
+#: calendar/gui/print.c:483
 msgid "22nd"
 msgstr "22η"
 
-#: calendar/cal-util/cal-recur.c:4007 calendar/gui/print.c:481
+#: calendar/cal-util/cal-recur.c:4007
+#: calendar/gui/print.c:483
 msgid "23rd"
 msgstr "23η"
 
-#: calendar/cal-util/cal-recur.c:4008 calendar/gui/print.c:481
+#: calendar/cal-util/cal-recur.c:4008
+#: calendar/gui/print.c:483
 msgid "24th"
 msgstr "24η"
 
-#: calendar/cal-util/cal-recur.c:4009 calendar/gui/print.c:481
+#: calendar/cal-util/cal-recur.c:4009
+#: calendar/gui/print.c:483
 msgid "25th"
 msgstr "25η"
 
-#: calendar/cal-util/cal-recur.c:4010 calendar/gui/print.c:482
+#: calendar/cal-util/cal-recur.c:4010
+#: calendar/gui/print.c:484
 msgid "26th"
 msgstr "26η"
 
-#: calendar/cal-util/cal-recur.c:4011 calendar/gui/print.c:482
+#: calendar/cal-util/cal-recur.c:4011
+#: calendar/gui/print.c:484
 msgid "27th"
 msgstr "27η"
 
-#: calendar/cal-util/cal-recur.c:4012 calendar/gui/print.c:482
+#: calendar/cal-util/cal-recur.c:4012
+#: calendar/gui/print.c:484
 msgid "28th"
 msgstr "28η"
 
-#: calendar/cal-util/cal-recur.c:4013 calendar/gui/print.c:482
+#: calendar/cal-util/cal-recur.c:4013
+#: calendar/gui/print.c:484
 msgid "29th"
 msgstr "29η"
 
-#: calendar/cal-util/cal-recur.c:4014 calendar/gui/print.c:482
+#: calendar/cal-util/cal-recur.c:4014
+#: calendar/gui/print.c:484
 msgid "30th"
 msgstr "30η"
 
-#: calendar/cal-util/cal-recur.c:4015 calendar/gui/print.c:483
+#: calendar/cal-util/cal-recur.c:4015
+#: calendar/gui/print.c:485
 msgid "31st"
 msgstr "31η"
 
-#: calendar/cal-util/cal-util.c:550 calendar/cal-util/cal-util.c:572
-#: calendar/gui/dialogs/task-details-page.glade.h:5
-#: calendar/gui/e-calendar-table.c:403 calendar/gui/e-tasks.c:271
-#: mail/message-list.c:912
+#: calendar/cal-util/cal-util.c:550
+#: calendar/cal-util/cal-util.c:572
+#: calendar/gui/dialogs/task-details-page.glade.h:6
+#: calendar/gui/e-calendar-table.c:393
+#: mail/message-list.c:753
 msgid "High"
 msgstr "Υψηλή"
 
-#: calendar/cal-util/cal-util.c:552 calendar/cal-util/cal-util.c:574
-#: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-calendar-table.c:404 calendar/gui/e-cal-model.c:826
-#: calendar/gui/e-tasks.c:273 mail/message-list.c:911
+#: calendar/cal-util/cal-util.c:552
+#: calendar/cal-util/cal-util.c:574
+#: calendar/gui/calendar-model.c:1709
+#: calendar/gui/dialogs/task-details-page.glade.h:9
+#: calendar/gui/e-calendar-table.c:394
+#: mail/message-list.c:752
 msgid "Normal"
 msgstr "Κανονική"
 
-#: calendar/cal-util/cal-util.c:554 calendar/cal-util/cal-util.c:576
-#: calendar/gui/dialogs/task-details-page.glade.h:7
-#: calendar/gui/e-calendar-table.c:405 calendar/gui/e-tasks.c:275
-#: mail/message-list.c:910
+#: calendar/cal-util/cal-util.c:554
+#: calendar/cal-util/cal-util.c:576
+#: calendar/gui/dialogs/task-details-page.glade.h:8
+#: calendar/gui/e-calendar-table.c:395
+#: mail/message-list.c:751
 msgid "Low"
 msgstr "Χαμηλή"
 
 #. An empty string is the same as 'None'.
 #: calendar/cal-util/cal-util.c:570
-#: calendar/gui/dialogs/task-details-page.glade.h:11
-#: calendar/gui/e-calendar-table.c:406
+#: calendar/gui/dialogs/task-details-page.glade.h:13
+#: calendar/gui/e-calendar-table.c:396
 msgid "Undefined"
 msgstr "Αόριστο"
 
@@ -3698,48 +3639,88 @@ msgstr "Αόριστο"
 msgid "Split Multi-Day Events:"
 msgstr "Διαχωρισμός Γεγονότων Multi-Day:"
 
-#: calendar/conduits/calendar/calendar-conduit.c:1297
-#: calendar/conduits/todo/todo-conduit.c:838
+#: calendar/conduits/calendar/calendar-conduit.c:1289
+#: calendar/conduits/todo/todo-conduit.c:830
 msgid "Error while communicating with calendar server"
 msgstr "Σφάλμα κατά την επικοινωνία με τον εξυπηρετητή ημερολογίου"
 
-#: calendar/conduits/calendar/calendar-conduit.c:1456
-#: calendar/conduits/calendar/calendar-conduit.c:1459
+#: calendar/conduits/calendar/calendar-conduit.c:1440
+#: calendar/conduits/calendar/calendar-conduit.c:1443
 msgid "Could not read pilot's Calendar application block"
-msgstr ""
-"Δεν ήταν δυνατή η ανανέωση του τμήματος ημερολογίου του Υπολογιστή Παλάμης"
+msgstr "Δεν ήταν δυνατή η ανανέωση του τμήματος ημερολογίου του Υπολογιστή Παλάμης"
 
 #: calendar/conduits/todo/todo-conduit.c:206
 msgid "Default Priority:"
 msgstr "Εξ ορισμού Προτεραιότητα"
 
-#: calendar/conduits/todo/todo-conduit.c:970
-#: calendar/conduits/todo/todo-conduit.c:973
+#: calendar/conduits/todo/todo-conduit.c:954
+#: calendar/conduits/todo/todo-conduit.c:957
 msgid "Could not read pilot's ToDo application block"
-msgstr ""
-"Δεν ήταν δυνατή η ανανέωση του τμήματος Εκκρεμοτήτων του Υπολογιστή Παλάμης"
+msgstr "Δεν ήταν δυνατή η ανανέωση του τμήματος Εκκρεμοτήτων του Υπολογιστή Παλάμης"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
+msgid "Calendar and Tasks"
+msgstr "Ημερολόγιο και Εργασίες"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
+msgid "Configure your timezone, Calendar and Task List here "
+msgstr "Ρυθμίστε εδώ την Ζώνη ώρας, Ημερολόγιο και Λίστα Εργασιών σας."
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
+msgid "Evolution Calendar and Tasks"
+msgstr "Ημερολόγιο και Εργασίες του Evolution"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
+msgid "Evolution Calendar and Tasks component"
+msgstr "Στοιχείο ημερολογίου και εργασιών του Evolution"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
+msgid "Evolution Calendar configuration control"
+msgstr "Έλεγχος ρυθμίσεων του ημερολογίου του Evolution"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
+msgid "Evolution Calendar scheduling message viewer"
+msgstr "Εφαρμογή προβολής μυνημάτων ραντεβού του ημερολογίου του Evolution"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:213
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
+msgid "Evolution Calendar viewer"
+msgstr "Εφαρμογή προβολής ημερολογίου Evolution"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
+msgid "Evolution Calendar/Task editor"
+msgstr "Επεξεργαστής ημερολογίου/εργασιών του Evolution"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
+msgid "Evolution Tasks viewer"
+msgstr "Εφαρμογή προβολής εργασιών του Evolution "
+
+#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
+msgid "Evolution Calendar alarm notification service"
+msgstr "Υπηρεσία υπενθύμισης ειδοποίησης του ημερολογίου του Evolution"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:212
 msgid "Starting:"
 msgstr "Εκκίνηση:"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:215
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:214
 msgid "Ending:"
 msgstr "Τέλος:"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:254
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:227
+msgid "invalid time"
+msgstr "μη-έγκυρη ώρα"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:272
 msgid "Evolution Alarm"
 msgstr "Συναγερμός Evolution "
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:347
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:365
 #, c-format
 msgid "Alarm on %s"
 msgstr "Ειδοποίηση στις %s"
 
 #: calendar/gui/alarm-notify/alarm-notify.glade.h:1
-#: ui/evolution-comp-editor.xml.h:1 ui/evolution-contact-editor.xml.h:1
-#: ui/evolution-contact-list-editor.xml.h:1
-#: ui/evolution-signature-editor.xml.h:1
+#: ui/evolution-comp-editor.xml.h:1
 msgid "C_lose"
 msgstr "_Κλείσιμο"
 
@@ -3755,25 +3736,17 @@ msgstr "Χρόνος της χρονική μετάθεσης (λεπτά)"
 msgid "_Edit appointment"
 msgstr "Επεξεργασία _ραντεβού"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:874
+#: calendar/gui/alarm-notify/alarm-queue.c:770
 msgid "No description available."
 msgstr "Δεν υπάρχει διαθέσιμη περιγραφή."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:892
-#, c-format
-msgid ""
-"Alarm on %s\n"
-"%s\n"
-"Starting at %s\n"
-"Ending at %s"
-msgstr ""
-
-#: calendar/gui/alarm-notify/alarm-queue.c:979
-#: calendar/gui/alarm-notify/alarm-queue.c:1003
+#: calendar/gui/alarm-notify/alarm-queue.c:843
+#: calendar/gui/alarm-notify/alarm-queue.c:867
+#: widgets/misc/e-messagebox.c:161
 msgid "Warning"
 msgstr "Προειδοποίηση"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:983
+#: calendar/gui/alarm-notify/alarm-queue.c:847
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -3785,11 +3758,10 @@ msgstr ""
 "αποστολή e-mail το Evolution θα εμφανίσει ένα παράθυρο\n"
 "διαλόγου με μια κανονική υπενθύμιση."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1009
+#: calendar/gui/alarm-notify/alarm-queue.c:873
 #, c-format
 msgid ""
-"An Evolution Calendar reminder is about to trigger. This reminder is "
-"configured to run the following program:\n"
+"An Evolution Calendar reminder is about to trigger. This reminder is configured to run the following program:\n"
 "\n"
 "        %s\n"
 "\n"
@@ -3802,89 +3774,80 @@ msgstr ""
 "\n"
 "Είστε βέβαιοι για την εκτέλεση του προγράμματος;"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1023
+#: calendar/gui/alarm-notify/alarm-queue.c:887
 msgid "Do not ask me about this program again."
 msgstr "Να μην ξαναγίνει η ερώτηση για αυτό το πρόγραμμα."
 
-#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
-msgid "Evolution Calendar alarm notification service"
-msgstr "Υπηρεσία υπενθύμισης ειδοποίησης του ημερολογίου του Evolution"
-
-#: calendar/gui/alarm-notify/notify-main.c:173
-msgid "Could not initialize Bonobo"
-msgstr "Δεν ήταν δυνατή η αρχικοποίηση του Bonobo"
-
-#: calendar/gui/alarm-notify/notify-main.c:176
+#: calendar/gui/alarm-notify/notify-main.c:174
 msgid "Could not initialize gnome-vfs"
 msgstr "Δεν ήταν δυνατή η προετοιμασία του gnome-vfs"
 
-#: calendar/gui/alarm-notify/notify-main.c:185
+#: calendar/gui/alarm-notify/notify-main.c:183
 msgid "Could not create the alarm notify service factory"
 msgstr "Δεν ήταν δυνατή η δημιουργία του εργοστασίου της υπηρεσίας ειδοποίησης"
 
-#: calendar/gui/calendar-commands.c:376
-#, fuzzy
-msgid ""
-"This operation will permanently erase all events older than the selected "
-"amount of time. If you continue, you will not be able to recover these "
-"events."
-msgstr ""
-"Με αυτή την λειτουργία θα διαγράψετε μόνιμα όλες τις εργασίες που έχετε "
-"σημειώσει ως ολοκληρωμένες. Αν συνεχίσετε,\n"
-" δεν θα μπορέσετε να τα ανακτήσετε.\n"
-"\n"
-"Είστε βέβαιοι για την διαγραφή των μηνυμάτων;"
+#: calendar/gui/cal-search-bar.c:50
+msgid "Summary contains"
+msgstr "Η Περίληψη περιέχει"
 
-#: calendar/gui/calendar-commands.c:382
-#, fuzzy
-msgid "Purge events older than"
-msgstr "επιστρέφει λιγότερο από"
+#: calendar/gui/cal-search-bar.c:51
+msgid "Description contains"
+msgstr "Η περιγραφή περιέχει"
 
-#: calendar/gui/calendar-commands.c:387
-#: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter.glade.h:17
-msgid "days"
-msgstr "ημέρες"
+#: calendar/gui/cal-search-bar.c:52
+msgid "Comment contains"
+msgstr "Το σχόλιο περιέχει"
 
-#: calendar/gui/calendar-commands.c:485
+#: calendar/gui/cal-search-bar.c:358
+#: mail/mail-ops.c:1106
+msgid "Unmatched"
+msgstr "Αταίριαστο"
+
+#: calendar/gui/calendar-commands.c:419
 msgid "%A %d %B %Y"
 msgstr "%A %d %B %Y"
 
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
-#: calendar/gui/calendar-commands.c:488 calendar/gui/e-day-view.c:1364
-#: calendar/gui/e-day-view-top-item.c:266
+#: calendar/gui/calendar-commands.c:422
+#: calendar/gui/e-day-view-top-item.c:265
+#: calendar/gui/e-day-view.c:1422
 #: calendar/gui/e-week-view-main-item.c:325
 msgid "%a %d %b"
 msgstr "%d %a %b"
 
-#: calendar/gui/calendar-commands.c:490 calendar/gui/calendar-commands.c:495
-#: calendar/gui/calendar-commands.c:497
+#: calendar/gui/calendar-commands.c:424
+#: calendar/gui/calendar-commands.c:429
+#: calendar/gui/calendar-commands.c:431
 msgid "%a %d %b %Y"
 msgstr "%a %d %b %Y"
 
-#: calendar/gui/calendar-commands.c:514 calendar/gui/calendar-commands.c:520
-#: calendar/gui/calendar-commands.c:526 calendar/gui/calendar-commands.c:528
+#: calendar/gui/calendar-commands.c:442
+#: calendar/gui/calendar-commands.c:449
+#: calendar/gui/calendar-commands.c:455
+#: calendar/gui/calendar-commands.c:457
 msgid "%d %B %Y"
 msgstr "%d %B %Y"
 
 #. strftime format %d = day of month, %B = full
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: calendar/gui/calendar-commands.c:518
-#: calendar/gui/e-week-view-main-item.c:333 calendar/gui/print.c:1508
+#: calendar/gui/calendar-commands.c:447
+#: calendar/gui/e-week-view-main-item.c:333
+#: calendar/gui/print.c:1511
 msgid "%d %B"
 msgstr "%d %B"
 
-#: calendar/gui/calendar-commands.c:918
-msgid ""
-"Could not create the calendar view.  Please check your ORBit and OAF setup."
-msgstr ""
-"Δεν ήταν δυνατό να δημιουργηθεί προβολή ημερολογίου. Παρακαλώ ελέγξτε την "
-"εγκατάσταση του ORBit and OAF"
+#: calendar/gui/calendar-commands.c:849
+msgid "Could not create the calendar view.  Please check your ORBit and OAF setup."
+msgstr "Δεν ήταν δυνατό να δημιουργηθεί προβολή ημερολογίου. Παρακαλώ ελέγξτε την εγκατάσταση του ORBit and OAF"
 
-#: calendar/gui/calendar-component.c:70 calendar/gui/gnome-cal.c:1569
-#: importers/netscape-importer.c:1873 mail/importers/netscape-importer.c:1843
-#: my-evolution/my-evolution.glade.h:2 shell/e-local-storage.c:177
+#: calendar/gui/calendar-component.c:70
+#: calendar/gui/gnome-cal.c:1353
+#: importers/netscape-importer.c:1873
+#: mail/importers/netscape-importer.c:1843
+#: my-evolution/my-evolution.glade.h:2
+#: shell/e-local-storage.c:177
 #: shell/e-shortcuts.c:1085
 msgid "Calendar"
 msgstr "Ημερολόγιο"
@@ -3901,12 +3864,17 @@ msgstr "Κοινόχρηστο ημερολόγιο"
 msgid "Public folder containing appointments and events"
 msgstr "Δημόσιος φάκελος που περιέχει ραντεβού και γεγονότα"
 
-#: calendar/gui/calendar-component.c:80 calendar/gui/e-tasks.c:1080
-#: calendar/gui/print.c:1787 calendar/gui/tasks-control.c:487
+#: calendar/gui/calendar-component.c:80
+#: calendar/gui/e-tasks.c:738
+#: calendar/gui/print.c:1791
+#: calendar/gui/tasks-control.c:503
 #: calendar/importers/icalendar-importer.c:644
-#: importers/netscape-importer.c:1875 mail/importers/netscape-importer.c:1845
-#: my-evolution/e-summary-tasks.c:348 my-evolution/e-summary-tasks.c:357
-#: shell/e-local-storage.c:183 shell/e-shortcuts.c:1086
+#: importers/netscape-importer.c:1875
+#: mail/importers/netscape-importer.c:1845
+#: my-evolution/e-summary-tasks.c:329
+#: my-evolution/e-summary-tasks.c:338
+#: shell/e-local-storage.c:183
+#: shell/e-shortcuts.c:1086
 msgid "Tasks"
 msgstr "Εργασίες"
 
@@ -3970,6 +3938,128 @@ msgstr "All _Day Ραντεβού"
 msgid "Create a new all-day appointment"
 msgstr "Δημιουργία ένος νέου all-day ραντεβού"
 
+#: calendar/gui/calendar-model.c:405
+#: calendar/gui/calendar-model.c:964
+#: calendar/gui/e-calendar-table.c:372
+msgid "Private"
+msgstr "Ιδιωτικό"
+
+#: calendar/gui/calendar-model.c:408
+#: calendar/gui/calendar-model.c:966
+#: calendar/gui/e-calendar-table.c:373
+msgid "Confidential"
+msgstr "Εμπιστευτικό"
+
+#: calendar/gui/calendar-model.c:411
+#: calendar/gui/e-calendar-table.c:371
+msgid "Public"
+msgstr "Δημόσιο"
+
+#: calendar/gui/calendar-model.c:523
+msgid "N"
+msgstr "Β"
+
+#: calendar/gui/calendar-model.c:523
+msgid "S"
+msgstr "Ν"
+
+#: calendar/gui/calendar-model.c:525
+msgid "E"
+msgstr "Α"
+
+#: calendar/gui/calendar-model.c:525
+msgid "W"
+msgstr "Δ"
+
+#: calendar/gui/calendar-model.c:590
+#: calendar/gui/calendar-model.c:1134
+#: calendar/gui/e-calendar-table.c:445
+msgid "Free"
+msgstr "Διαθέσιμη"
+
+#: calendar/gui/calendar-model.c:592
+#: calendar/gui/e-calendar-table.c:446
+#: calendar/gui/e-meeting-time-sel.c:406
+#: shell/evolution-shell-component.c:1204
+msgid "Busy"
+msgstr "Απασχολημένη"
+
+#: calendar/gui/calendar-model.c:750
+#: calendar/gui/calendar-model.c:1178
+#: calendar/gui/dialogs/task-details-page.glade.h:10
+#: calendar/gui/e-calendar-table.c:466
+#: calendar/gui/print.c:2300
+msgid "Not Started"
+msgstr "Δεν έχει ξεκινήσει"
+
+#: calendar/gui/calendar-model.c:753
+#: calendar/gui/calendar-model.c:1180
+#: calendar/gui/dialogs/task-details-page.glade.h:7
+#: calendar/gui/e-calendar-table.c:467
+#: calendar/gui/print.c:2303
+msgid "In Progress"
+msgstr "Σε εξέλιξη"
+
+#: calendar/gui/calendar-model.c:756
+#: calendar/gui/calendar-model.c:1182
+#: calendar/gui/dialogs/task-details-page.glade.h:4
+#: calendar/gui/e-calendar-table.c:468
+#: calendar/gui/e-meeting-model.c:294
+#: calendar/gui/e-meeting-model.c:317
+#: calendar/gui/print.c:2306
+msgid "Completed"
+msgstr "Ολοκληρώθηκε"
+
+#: calendar/gui/calendar-model.c:1036
+msgid ""
+"The geographical position must be entered in the format: \n"
+"\n"
+"45.436845,125.862501"
+msgstr ""
+"Η γεωγραφική θέση πρέπει να έχει την παρακάτω μορφή: \n"
+"\n"
+"45.436845,125.862501"
+
+#. An empty string is the same as 'None'.
+#: calendar/gui/calendar-model.c:1176
+#: calendar/gui/dialogs/meeting-page.c:330
+#: calendar/gui/dialogs/meeting-page.glade.h:2
+#: composer/e-msg-composer.c:2056
+#: mail/folder-browser.c:1752
+#: mail/mail-account-gui.c:1260
+#: mail/mail-account-gui.c:1692
+#: mail/mail-accounts.c:442
+#: mail/mail-config.glade.h:76
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:194
+#: widgets/misc/e-cell-date-edit.c:257
+#: widgets/misc/e-dateedit.c:442
+#: widgets/misc/e-dateedit.c:1458
+#: widgets/misc/e-dateedit.c:1573
+msgid "None"
+msgstr "Κανένα"
+
+#: calendar/gui/calendar-model.c:1711
+msgid "Recurring"
+msgstr "Επανάληψη"
+
+#: calendar/gui/calendar-model.c:1713
+msgid "Assigned"
+msgstr "Ανάθεση"
+
+#: calendar/gui/calendar-model.c:1719
+#: calendar/gui/e-meeting-model.c:266
+#: calendar/gui/e-meeting-model.c:276
+#: calendar/gui/e-meeting-model.c:534
+#: calendar/gui/e-meeting-model.c:784
+msgid "Yes"
+msgstr "Ναι"
+
+#: calendar/gui/calendar-model.c:1719
+#: calendar/gui/e-meeting-model.c:278
+#: calendar/gui/e-meeting-model.c:785
+msgid "No"
+msgstr "Όχι"
+
 #: calendar/gui/calendar-view-factory.c:118
 msgid "Day View"
 msgstr "Προβολή Ημέρας"
@@ -3986,69 +4076,48 @@ msgstr "Προβολή Εβδομάδας"
 msgid "Month View"
 msgstr "Προβολή Μήνα"
 
-#: calendar/gui/calendar-view-factory.c:130
-#, fuzzy
-msgid "List View"
-msgstr "Προσαρμοσμένη Προβολή"
-
-#: calendar/gui/cal-search-bar.c:50
-msgid "Summary contains"
-msgstr "Η Περίληψη περιέχει"
-
-#: calendar/gui/cal-search-bar.c:51
-msgid "Description contains"
-msgstr "Η περιγραφή περιέχει"
-
-#: calendar/gui/cal-search-bar.c:52
-msgid "Comment contains"
-msgstr "Το σχόλιο περιέχει"
-
-#: calendar/gui/cal-search-bar.c:358 mail/mail-ops.c:1120
-msgid "Unmatched"
-msgstr "Αταίριαστο"
-
-#: calendar/gui/comp-editor-factory.c:462
+#: calendar/gui/comp-editor-factory.c:456
 msgid "Error while opening the calendar"
 msgstr "Σφάλμα κατά το άνοιγμα του ημερολογίου"
 
-#: calendar/gui/comp-editor-factory.c:473
+#: calendar/gui/comp-editor-factory.c:467
 msgid "Method not supported when opening the calendar"
 msgstr "Η μέθοδος δεν υποστηρίζεται κατά το άνοιγμα του ημερολογίου"
 
-#: calendar/gui/comp-editor-factory.c:479
+#: calendar/gui/comp-editor-factory.c:473
 msgid "Permission denied to open the calendar"
 msgstr "Δεν επιτρέπεται η πρόσβαση για το άνοιγμα του ημερολογίου"
 
-#: calendar/gui/control-factory.c:125
+#: calendar/gui/control-factory.c:119
 #, c-format
 msgid "Could not open the folder in '%s'"
 msgstr "Αδύνατο το άνοιγμα φακέλου στο `%s'"
 
-#: calendar/gui/control-factory.c:171
+#: calendar/gui/control-factory.c:165
 msgid "The URI that the calendar will display"
 msgstr "Το URI που θα εμφανίσει το ημερολόγιο"
 
-#: calendar/gui/control-factory.c:178
+#: calendar/gui/control-factory.c:172
 msgid "The type of view to show"
 msgstr "Ο τύπος της προβολής για εμφάνιση"
 
-#: calendar/gui/dialogs/alarm-options.c:466
+#: calendar/gui/dialogs/alarm-options.c:420
 msgid "Audio Alarm Options"
 msgstr "Επιλογές Ηχητικής Ειδοποίησης"
 
-#: calendar/gui/dialogs/alarm-options.c:475
+#: calendar/gui/dialogs/alarm-options.c:429
 msgid "Message Alarm Options"
 msgstr "Επιλογές Ειδοποίησης Μηνύματος"
 
-#: calendar/gui/dialogs/alarm-options.c:484
+#: calendar/gui/dialogs/alarm-options.c:438
 msgid "Email Alarm Options"
 msgstr "Επιλογές Ειδοποίησης Email"
 
-#: calendar/gui/dialogs/alarm-options.c:493
+#: calendar/gui/dialogs/alarm-options.c:447
 msgid "Program Alarm Options"
 msgstr "Επιλογές Ειδοποίησης Προγράμματος"
 
-#: calendar/gui/dialogs/alarm-options.c:509
+#: calendar/gui/dialogs/alarm-options.c:456
 msgid "Unknown Alarm Options"
 msgstr "Άγνωστες Επιλογές Ειδοποίησης"
 
@@ -4084,6 +4153,11 @@ msgstr "Αποστολή σε:"
 msgid "With these arguments:"
 msgstr "Με αυτές τις παραμέτρους:"
 
+#: calendar/gui/dialogs/alarm-options.glade.h:10
+#: filter/filter.glade.h:17
+msgid "days"
+msgstr "ημέρες"
+
 #: calendar/gui/dialogs/alarm-options.glade.h:11
 msgid "dialog1"
 msgstr "διάλογος1"
@@ -4092,12 +4166,13 @@ msgstr "διάλογος1"
 msgid "extra times every"
 msgstr "επιπλέον φορές κάθε"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:13 filter/filter.glade.h:18
+#: calendar/gui/dialogs/alarm-options.glade.h:13
+#: filter/filter.glade.h:18
 msgid "hours"
 msgstr "ώρες"
 
 #: calendar/gui/dialogs/alarm-options.glade.h:14
-#: executive-summary/test-service/rdf-summary.c:806 filter/filter.glade.h:19
+#: filter/filter.glade.h:19
 msgid "minutes"
 msgstr "λεπτά"
 
@@ -4111,11 +4186,13 @@ msgstr "Βασικά"
 msgid "Date/Time:"
 msgstr "Ημερομηνία/Ώρα:"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:3 calendar/gui/e-alarm-list.c:465
+#: calendar/gui/dialogs/alarm-page.glade.h:3
+#: calendar/gui/e-alarm-list.c:461
 msgid "Display a message"
 msgstr "Εμφάνιση μηνύματος"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:4 calendar/gui/e-alarm-list.c:461
+#: calendar/gui/dialogs/alarm-page.glade.h:4
+#: calendar/gui/e-alarm-list.c:457
 msgid "Play a sound"
 msgstr "Εκτέλεση Ήχου"
 
@@ -4123,7 +4200,8 @@ msgstr "Εκτέλεση Ήχου"
 msgid "Reminders"
 msgstr "Υπενθυμίσεις"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:6 calendar/gui/e-alarm-list.c:473
+#: calendar/gui/dialogs/alarm-page.glade.h:6
+#: calendar/gui/e-alarm-list.c:469
 msgid "Run a program"
 msgstr "Εκτέλεσε ένα πρόγραμμα"
 
@@ -4133,8 +4211,8 @@ msgstr "Αποστολή e-mail"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:8
 #: calendar/gui/dialogs/recurrence-page.glade.h:8
-#: calendar/gui/e-itip-control.c:1022 calendar/gui/e-itip-control.glade.h:11
-#: calendar/gui/e-tasks.c:208
+#: calendar/gui/e-itip-control.c:1052
+#: calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "Περίληψη:"
 
@@ -4163,7 +4241,8 @@ msgstr "τέλος του ραντεβού"
 msgid "hour(s)"
 msgstr "ώρα(ες)"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:15 mail/mail-config.glade.h:173
+#: calendar/gui/dialogs/alarm-page.glade.h:15
+#: mail/mail-config.glade.h:173
 msgid "minute(s)"
 msgstr "λεπτό(ά)"
 
@@ -4191,7 +4270,8 @@ msgstr "30 λεπτά"
 msgid "60 minutes"
 msgstr "60 λεπτά"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6 mail/mail-config.glade.h:14
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6
+#: mail/mail-config.glade.h:14
 msgid "Alerts"
 msgstr "Ειδοποιήσεις"
 
@@ -4217,7 +4297,7 @@ msgstr "Ημέρες"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
 #: calendar/gui/dialogs/recurrence-page.c:1040
-#: calendar/gui/e-itip-control.c:647
+#: calendar/gui/e-itip-control.c:677
 msgid "Friday"
 msgstr "Παρασκευή"
 
@@ -4231,7 +4311,7 @@ msgstr "Λεπτά"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
 #: calendar/gui/dialogs/recurrence-page.c:1036
-#: calendar/gui/e-itip-control.c:643
+#: calendar/gui/e-itip-control.c:673
 msgid "Monday"
 msgstr "Δευτέρα"
 
@@ -4241,7 +4321,7 @@ msgstr "_Κυρ"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
 #: calendar/gui/dialogs/recurrence-page.c:1041
-#: calendar/gui/e-itip-control.c:648
+#: calendar/gui/e-itip-control.c:678
 msgid "Saturday"
 msgstr "Σάββατο"
 
@@ -4255,7 +4335,7 @@ msgstr "Εμφάνιση _αριθμών εβδομάδων στον περιη�
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
 #: calendar/gui/dialogs/recurrence-page.c:1042
-#: calendar/gui/e-itip-control.c:642
+#: calendar/gui/e-itip-control.c:672
 msgid "Sunday"
 msgstr "Κυριακή"
 
@@ -4273,7 +4353,7 @@ msgstr "Λίστα Εργασιών"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
 #: calendar/gui/dialogs/recurrence-page.c:1039
-#: calendar/gui/e-itip-control.c:646
+#: calendar/gui/e-itip-control.c:676
 msgid "Thursday"
 msgstr "Πέμπτη"
 
@@ -4291,7 +4371,7 @@ msgstr "Μορφή ώρας:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
 #: calendar/gui/dialogs/recurrence-page.c:1037
-#: calendar/gui/e-itip-control.c:644
+#: calendar/gui/e-itip-control.c:674
 msgid "Tuesday"
 msgstr "Τρίτη"
 
@@ -4301,12 +4381,12 @@ msgstr "Ε_βδομάδα ξεκινάει:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
 #: calendar/gui/dialogs/recurrence-page.c:1038
-#: calendar/gui/e-itip-control.c:645
+#: calendar/gui/e-itip-control.c:675
 msgid "Wednesday"
 msgstr "Τετάρτη"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-#: ui/evolution-calendar.xml.h:31
+#: ui/evolution-calendar.xml.h:27
 msgid "Work Week"
 msgstr "Εργάσιμη Εβδομάδα"
 
@@ -4384,91 +4464,103 @@ msgid "before every appointment"
 msgstr "πριν από κάθε ραντεβού"
 
 #: calendar/gui/dialogs/cancel-comp.c:58
-msgid ""
-"The event being deleted is a meeting, would you like to send a cancellation "
-"notice?"
-msgstr ""
-"Το γεγονός που διαγράφηκε ήταν μια συνάντηση, θέλετε να στείλετε μια "
-"ειδοποίηση ακύρωσης?"
+msgid "The event being deleted is a meeting, would you like to send a cancellation notice?"
+msgstr "Το γεγονός που διαγράφηκε ήταν μια συνάντηση, θέλετε να στείλετε μια ειδοποίηση ακύρωσης?"
 
 #: calendar/gui/dialogs/cancel-comp.c:61
 msgid "Are you sure you want to cancel and delete this meeting?"
 msgstr "Είστε βέβαιοι για την ακύρωση και διαγραφή της συνάντησης;"
 
 #: calendar/gui/dialogs/cancel-comp.c:67
-msgid ""
-"The task being deleted is assigned, would you like to send a cancellation "
-"notice?"
-msgstr ""
-"Η εργασία που διαγράφηκε είχε ανατεθεί, θέλετε να στείλετε μια ειδοποίηση "
-"ακύρωσης?"
+msgid "The task being deleted is assigned, would you like to send a cancellation notice?"
+msgstr "Η εργασία που διαγράφηκε είχε ανατεθεί, θέλετε να στείλετε μια ειδοποίηση ακύρωσης?"
 
 #: calendar/gui/dialogs/cancel-comp.c:70
 msgid "Are you sure you want to cancel and delete this task?"
 msgstr "Είστε βέβαιοι για την ακύρωση και την διαγραφή της εργασίας;"
 
 #: calendar/gui/dialogs/cancel-comp.c:76
-msgid ""
-"The journal entry being deleted is published, would you like to send a "
-"cancellation notice?"
-msgstr ""
-"Η καταχώρηση που διαγράφηκε είχε δημοσιευθεί, θέλετε να στείλετε μια "
-"ειδοποίηση ακύρωσης?"
+msgid "The journal entry being deleted is published, would you like to send a cancellation notice?"
+msgstr "Η καταχώρηση που διαγράφηκε είχε δημοσιευθεί, θέλετε να στείλετε μια ειδοποίηση ακύρωσης?"
 
 #: calendar/gui/dialogs/cancel-comp.c:79
 msgid "Are you sure you want to cancel and delete this journal entry?"
-msgstr ""
-"Είστε βέβαιοι για την ακύρωση και την διαγραφή της καταχώρισης του "
-"ημερολογίου;"
+msgstr "Είστε βέβαιοι για την ακύρωση και την διαγραφή της καταχώρισης του ημερολογίου;"
 
-#: calendar/gui/dialogs/changed-comp.c:59
+#: calendar/gui/dialogs/changed-comp.c:58
 msgid "This event has been deleted."
 msgstr "Το συμβάν έχει διαγραφεί."
 
-#: calendar/gui/dialogs/changed-comp.c:63
+#: calendar/gui/dialogs/changed-comp.c:62
 msgid "This task has been deleted."
 msgstr "Η εργασία έχει διαγραφεί."
 
-#: calendar/gui/dialogs/changed-comp.c:67
+#: calendar/gui/dialogs/changed-comp.c:66
 msgid "This journal entry has been deleted."
 msgstr "Η καταχώριση του ημερολογίου έχει διαγραφεί."
 
-#: calendar/gui/dialogs/changed-comp.c:76
+#: calendar/gui/dialogs/changed-comp.c:75
 #, c-format
 msgid "%s  You have made changes. Forget those changes and close the editor?"
-msgstr ""
-"%s  Έχετε κάνει αλλαγές. Να αγνοηθούν οι αλλαγές και να τερματιστεί ο "
-"επεξεργαστής;"
+msgstr "%s  Έχετε κάνει αλλαγές. Να αγνοηθούν οι αλλαγές και να τερματιστεί ο επεξεργαστής;"
 
-#: calendar/gui/dialogs/changed-comp.c:78
+#: calendar/gui/dialogs/changed-comp.c:77
 #, c-format
 msgid "%s  You have made no changes, close the editor?"
 msgstr "%s  Δεν έχετε κάνει αλλαγές. Να τερματιστεί ο επεξεργαστής;"
 
-#: calendar/gui/dialogs/changed-comp.c:83
+#: calendar/gui/dialogs/changed-comp.c:82
 msgid "This event has been changed."
 msgstr "Το συμβάν έχει αλλάξει."
 
-#: calendar/gui/dialogs/changed-comp.c:87
+#: calendar/gui/dialogs/changed-comp.c:86
 msgid "This task has been changed."
 msgstr "Η εργασία έχει αλλάξει."
 
-#: calendar/gui/dialogs/changed-comp.c:91
+#: calendar/gui/dialogs/changed-comp.c:90
 msgid "This journal entry has been changed."
 msgstr "Η καταχώριση του ημερολογίου έχει αλλάξει."
 
-#: calendar/gui/dialogs/changed-comp.c:100
+#: calendar/gui/dialogs/changed-comp.c:99
 #, c-format
 msgid "%s  You have made changes. Forget those changes and update the editor?"
-msgstr ""
-"%s  Δεν έχετε κάνει αλλαγές. Να αγνοηθούν οι αλλαγές και να ανανεωθεί ο "
-"επεξεργαστής;"
+msgstr "%s  Δεν έχετε κάνει αλλαγές. Να αγνοηθούν οι αλλαγές και να ανανεωθεί ο επεξεργαστής;"
 
-#: calendar/gui/dialogs/changed-comp.c:102
+#: calendar/gui/dialogs/changed-comp.c:101
 #, c-format
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  Δεν έχετε κάνει αλλαγές. Να ανανεωθεί ο επεξεργαστής;"
 
+#: calendar/gui/dialogs/comp-editor-page.c:409
+#, c-format
+msgid "Validation error: %s"
+msgstr "Άγνωστο πιστοποίησης: %s"
+
+#: calendar/gui/dialogs/comp-editor-util.c:187
+#: calendar/gui/print.c:2218
+msgid " to "
+msgstr " με "
+
+#: calendar/gui/dialogs/comp-editor-util.c:191
+#: calendar/gui/print.c:2222
+msgid " (Completed "
+msgstr "(Ολοκληρωμένο"
+
+#: calendar/gui/dialogs/comp-editor-util.c:193
+#: calendar/gui/print.c:2224
+msgid "Completed "
+msgstr "Ολοκληρωμένο "
+
+#: calendar/gui/dialogs/comp-editor-util.c:198
+#: calendar/gui/print.c:2229
+msgid " (Due "
+msgstr "(Λήξη"
+
+#: calendar/gui/dialogs/comp-editor-util.c:200
+#: calendar/gui/print.c:2231
+msgid "Due "
+msgstr "Λήξη "
+
 #: calendar/gui/dialogs/comp-editor.c:334
 msgid "Could not update invalid object"
 msgstr "Δεν ήταν δυνατή μη έγκυρου αντικειμένου"
@@ -4486,77 +4578,46 @@ msgid "Could not update object"
 msgstr "Δεν ήταν δυνατή η ενημέρωση του αντικειμένου"
 
 #: calendar/gui/dialogs/comp-editor.c:793
-#: calendar/gui/dialogs/comp-editor.c:830
 msgid "Edit Appointment"
 msgstr "Επεξεργασία Ραντεβού"
 
 #: calendar/gui/dialogs/comp-editor.c:798
-#: calendar/gui/dialogs/comp-editor.c:835
 #, c-format
 msgid "Appointment - %s"
 msgstr "Ραντεβού - %s"
 
 #: calendar/gui/dialogs/comp-editor.c:801
-#: calendar/gui/dialogs/comp-editor.c:838
 #, c-format
 msgid "Task - %s"
 msgstr "Εργασία - %s"
 
 #: calendar/gui/dialogs/comp-editor.c:804
-#: calendar/gui/dialogs/comp-editor.c:841
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Ημερολογιακή καταχώριση - %s"
 
 #: calendar/gui/dialogs/comp-editor.c:815
-#: calendar/gui/dialogs/comp-editor.c:851
 msgid "No summary"
 msgstr "Χωρίς περίληψη"
 
-#: calendar/gui/dialogs/comp-editor.c:1281
-#: calendar/gui/e-calendar-table.c:1138 calendar/gui/e-cal-view.c:878
-#: composer/e-msg-composer.c:1191
+#: calendar/gui/dialogs/comp-editor.c:1233
+#: calendar/gui/e-calendar-table.c:1039
+#: calendar/gui/e-day-view.c:3977
+#: calendar/gui/e-week-view.c:3840
+#: composer/e-msg-composer.c:1164
 msgid "Save as..."
 msgstr "Αποθήκευση ως..."
 
-#: calendar/gui/dialogs/comp-editor.c:1384
-#: calendar/gui/dialogs/comp-editor.c:1408
-#: calendar/gui/dialogs/comp-editor.c:1434
+#: calendar/gui/dialogs/comp-editor.c:1334
+#: calendar/gui/dialogs/comp-editor.c:1358
+#: calendar/gui/dialogs/comp-editor.c:1382
 msgid "Changes made to this item may be discarded if an update arrives"
-msgstr ""
-"Οι αλλαγές που έγιναν σε αυτό το αντικείμενο μπορεί να απορριφθούν αν "
-"καταφθάσει μια ενημέρωση"
+msgstr "Οι αλλαγές που έγιναν σε αυτό το αντικείμενο μπορεί να απορριφθούν αν καταφθάσει μια ενημέρωση"
 
-#: calendar/gui/dialogs/comp-editor.c:1464
-#: calendar/gui/dialogs/comp-editor.c:1473
+#: calendar/gui/dialogs/comp-editor.c:1409
 msgid "Unable to obtain current version!"
 msgstr "Δεν ήταν δυνατό να αποκτηθεί η τρέχουσα έκδοση!"
 
-#: calendar/gui/dialogs/comp-editor-page.c:409
-#, c-format
-msgid "Validation error: %s"
-msgstr "Άγνωστο πιστοποίησης: %s"
-
-#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2223
-msgid " to "
-msgstr " με "
-
-#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2227
-msgid " (Completed "
-msgstr "(Ολοκληρωμένο"
-
-#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2229
-msgid "Completed "
-msgstr "Ολοκληρωμένο "
-
-#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2234
-msgid " (Due "
-msgstr "(Λήξη"
-
-#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2236
-msgid "Due "
-msgstr "Λήξη "
-
 #: calendar/gui/dialogs/delete-comp.c:96
 #, c-format
 msgid "Are you sure you want to delete the appointment `%s'?"
@@ -4582,8 +4643,7 @@ msgstr "Είστε βέβαιοι για την διαγραφή της κατα
 
 #: calendar/gui/dialogs/delete-comp.c:117
 msgid "Are you sure want to delete this untitled journal entry?"
-msgstr ""
-"Είστε βέβαιοι για την διαγραφή της καταχώρισης ημερολογίου χωρίς τίτλο;"
+msgstr "Είστε βέβαιοι για την διαγραφή της καταχώρισης ημερολογίου χωρίς τίτλο;"
 
 #: calendar/gui/dialogs/delete-comp.c:132
 #, c-format
@@ -4626,8 +4686,7 @@ msgstr "Δεν ήταν δυνατή η διαγραφή της εργασίας
 
 #: calendar/gui/dialogs/delete-error.c:72
 msgid "The journal entry could not be deleted because permission was denied"
-msgstr ""
-"Δεν ήταν δυνατή η διαγραφή της καταχώρησης ημερολογίου λόγω άρνησης πρόσβασης"
+msgstr "Δεν ήταν δυνατή η διαγραφή της καταχώρησης ημερολογίου λόγω άρνησης πρόσβασης"
 
 #: calendar/gui/dialogs/delete-error.c:75
 msgid "The item could not be deleted because permission was denied"
@@ -4644,16 +4703,12 @@ msgstr "Δεν ήταν δυνατή η διαγραφή της εργασίας
 #: calendar/gui/dialogs/delete-error.c:88
 #, fuzzy
 msgid "The journal entry could not be deleted because it was invalid"
-msgstr ""
-"Δεν ήταν δυνατή η ανανεωθεί της κατάστασης παρευρισκομένων λόγο μιας μη "
-"έγκυρης κατάστασης\n"
+msgstr "Δεν ήταν δυνατή η ανανεωθεί της κατάστασης παρευρισκομένων λόγο μιας μη έγκυρης κατάστασης\n"
 
 #: calendar/gui/dialogs/delete-error.c:91
 #, fuzzy
 msgid "The item could not be deleted because it was invalid"
-msgstr ""
-"Δεν ήταν δυνατή η ανανεωθεί της κατάστασης παρευρισκομένων λόγο μιας μη "
-"έγκυρης κατάστασης\n"
+msgstr "Δεν ήταν δυνατή η ανανεωθεί της κατάστασης παρευρισκομένων λόγο μιας μη έγκυρης κατάστασης\n"
 
 #: calendar/gui/dialogs/e-delegate-dialog.glade.h:1
 msgid "Addressbook..."
@@ -4667,31 +4722,34 @@ msgstr "Εξουσιοδότηση Σε:"
 msgid "Enter Delegate"
 msgstr "Εισαγωγή Αντιπροσώπου"
 
-#: calendar/gui/dialogs/event-editor.c:200 calendar/gui/print.c:2260
+#: calendar/gui/dialogs/event-editor.c:199
+#: calendar/gui/print.c:2255
 msgid "Appointment"
 msgstr "Ραντεβού"
 
-#: calendar/gui/dialogs/event-editor.c:207
+#: calendar/gui/dialogs/event-editor.c:206
 msgid "Reminder"
 msgstr "Υπενθύμιση"
 
-#: calendar/gui/dialogs/event-editor.c:214
+#: calendar/gui/dialogs/event-editor.c:213
 msgid "Recurrence"
 msgstr "Επανεμφάνιση"
 
-#: calendar/gui/dialogs/event-editor.c:221
-#: calendar/gui/dialogs/event-editor.c:294
-#: calendar/gui/dialogs/event-editor.c:438
+#: calendar/gui/dialogs/event-editor.c:220
+#: calendar/gui/dialogs/event-editor.c:292
+#: calendar/gui/dialogs/event-editor.c:436
 msgid "Scheduling"
 msgstr "Δρομολόγηση"
 
-#: calendar/gui/dialogs/event-editor.c:228
-#: calendar/gui/dialogs/event-editor.c:297
-#: calendar/gui/dialogs/event-editor.c:441 ui/evolution-event-editor.xml.h:6
+#: calendar/gui/dialogs/event-editor.c:227
+#: calendar/gui/dialogs/event-editor.c:295
+#: calendar/gui/dialogs/event-editor.c:439
+#: ui/evolution-event-editor.xml.h:6
 msgid "Meeting"
 msgstr "Συνάντηση"
 
-#: calendar/gui/dialogs/event-page.c:603 calendar/gui/dialogs/task-page.c:509
+#: calendar/gui/dialogs/event-page.c:603
+#: calendar/gui/dialogs/task-page.c:507
 msgid "Start date is wrong"
 msgstr "Η ημερομηνία έναρξης είναι λανθασμένη"
 
@@ -4727,9 +4785,9 @@ msgid "Classification"
 msgstr "Ταξινόμηση"
 
 #: calendar/gui/dialogs/event-page.glade.h:6
-#, fuzzy
-msgid "Co_nfidential"
-msgstr "Εμπιστευτικό"
+#: calendar/gui/dialogs/task-page.glade.h:4
+msgid "Con_fidential"
+msgstr "_Εμπιστευτικό"
 
 #: calendar/gui/dialogs/event-page.glade.h:7
 #: calendar/gui/dialogs/task-page.glade.h:5
@@ -4755,6 +4813,7 @@ msgid "Pu_blic"
 msgstr "Δη_μόσιο"
 
 #: calendar/gui/dialogs/event-page.glade.h:12
+#: calendar/gui/e-calendar-table.etspec.h:13
 msgid "Show Time As"
 msgstr "Εμφάνιση Ώρας Ως"
 
@@ -4771,34 +4830,75 @@ msgstr "_Χρόνος Λήξης:"
 msgid "_Start time:"
 msgstr "Χρόνος Έ_ναρξης:"
 
-#. an empty string is the same as 'None'
-#: calendar/gui/dialogs/meeting-page.c:311
-#: calendar/gui/dialogs/meeting-page.glade.h:2
-#: calendar/gui/e-cal-model-tasks.c:596 composer/e-msg-composer.c:2093
-#: mail/mail-account-gui.c:1260 mail/mail-account-gui.c:1692
-#: mail/mail-accounts.c:442 mail/mail-config.glade.h:76
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:194
-#: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:445
-#: widgets/misc/e-dateedit.c:1483 widgets/misc/e-dateedit.c:1598
-msgid "None"
-msgstr "Κανένα"
-
-#: calendar/gui/dialogs/meeting-page.c:416
+#: calendar/gui/dialogs/meeting-page.c:437
 msgid "The organizer selected no longer has an account."
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:422
+#: calendar/gui/dialogs/meeting-page.c:443
 msgid "An organizer is required."
 msgstr "Χρειάζεται ένας διοργανωτής."
 
-#: calendar/gui/dialogs/meeting-page.c:437
+#: calendar/gui/dialogs/meeting-page.c:458
 msgid "At least one attendee is required."
 msgstr "Απαιτείται τουλάχιστον ένας παρευρισκόμενος."
 
-#: calendar/gui/dialogs/meeting-page.c:630
+#: calendar/gui/dialogs/meeting-page.c:629
+msgid "That person is already attending the meeting!"
+msgstr "Αυτό το άτομο είναι ήδη σε συνάντηση!"
+
+#: calendar/gui/dialogs/meeting-page.c:713
 msgid "_Delegate To..."
 msgstr "_Εξουσιοδότηση Σε..."
 
+#: calendar/gui/dialogs/meeting-page.etspec.h:1
+#: calendar/gui/e-meeting-time-sel.etspec.h:1
+msgid "Attendee"
+msgstr "Παρευρισκόμενος"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:2
+#: calendar/gui/e-meeting-time-sel.etspec.h:2
+msgid "Click here to add an attendee"
+msgstr "Κάντε κλικ εδώ για να προσθέσετε έναν παρευρισκόμενο"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:3
+#: calendar/gui/e-meeting-time-sel.etspec.h:3
+msgid "Common Name"
+msgstr "Κοινό Όνομα"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:4
+#: calendar/gui/e-meeting-time-sel.etspec.h:4
+msgid "Delegated From"
+msgstr "Εξουσιοδοτημένος Από"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:5
+#: calendar/gui/e-meeting-time-sel.etspec.h:5
+msgid "Delegated To"
+msgstr "Εξουσιοδότηση Σε"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:6
+#: calendar/gui/e-meeting-time-sel.etspec.h:6
+msgid "Language"
+msgstr "Γλώσσα"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:7
+#: calendar/gui/e-meeting-time-sel.etspec.h:7
+msgid "Member"
+msgstr "Μέλος"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:8
+#: calendar/gui/e-itip-control.c:1179
+#: calendar/gui/e-meeting-time-sel.etspec.h:8
+msgid "RSVP"
+msgstr "RSVP"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:10
+#: calendar/gui/e-calendar-table.etspec.h:15
+#: calendar/gui/e-meeting-time-sel.etspec.h:10
+#: filter/libfilter-i18n.h:58
+#: mail/message-list.etspec.h:12
+msgid "Status"
+msgstr "Κατάσταση"
+
 #: calendar/gui/dialogs/meeting-page.glade.h:3
 #: calendar/gui/e-itip-control.glade.h:9
 msgid "Organizer:"
@@ -4809,7 +4909,7 @@ msgid "_Change Organizer"
 msgstr "_Αλλαγή Διοργανωτή"
 
 #: calendar/gui/dialogs/meeting-page.glade.h:5
-#: calendar/gui/e-meeting-time-sel.c:411
+#: calendar/gui/e-meeting-time-sel.c:424
 msgid "_Invite Others..."
 msgstr "_Πρόσκληση Άλλων..."
 
@@ -4822,8 +4922,7 @@ msgid "You are modifying a recurring task, what would you like to modify?"
 msgstr ""
 
 #: calendar/gui/dialogs/recur-comp.c:58
-msgid ""
-"You are modifying a recurring journal entry, what would you like to modify?"
+msgid "You are modifying a recurring journal entry, what would you like to modify?"
 msgstr ""
 
 #: calendar/gui/dialogs/recur-comp.c:72
@@ -4842,9 +4941,7 @@ msgstr "Για Προχωρημένους"
 
 #: calendar/gui/dialogs/recurrence-page.c:535
 msgid "This appointment contains recurrences that Evolution cannot edit."
-msgstr ""
-"Αυτή η συνάντηση περιέχει επαναλήψεις που το Evolution δεν μπορεί να "
-"επεξεργαστεί."
+msgstr "Αυτή η συνάντηση περιέχει επαναλήψεις που το Evolution δεν μπορεί να επεξεργαστεί."
 
 #: calendar/gui/dialogs/recurrence-page.c:809
 #, fuzzy
@@ -4966,7 +5063,8 @@ msgstr ""
 "\n"
 "Θέλετε να αποθηκεύσετε τις αλλαγές τώρα;"
 
-#: calendar/gui/dialogs/save-comp.c:58 composer/e-msg-composer.c:1599
+#: calendar/gui/dialogs/save-comp.c:58
+#: composer/e-msg-composer.c:1557
 msgid "_Discard Changes"
 msgstr "Α_πόρριψη αλλαγών"
 
@@ -4981,96 +5079,65 @@ msgstr "Η πληροφορίες της συνάντησης έχουν δημ�
 
 #: calendar/gui/dialogs/send-comp.c:61
 msgid "The meeting information has changed. Send an updated version?"
-msgstr ""
-"Η πληροφορίες της συνάντησης έχουν αλλάζει. Να αποσταλεί ενημερωμένη έκδοση;"
+msgstr "Η πληροφορίες της συνάντησης έχουν αλλάζει. Να αποσταλεί ενημερωμένη έκδοση;"
 
 #: calendar/gui/dialogs/send-comp.c:68
 msgid "The task assignment information has been created. Send it?"
-msgstr ""
-"Οι πληροφορίες της ανάθεσης εργασίας έχουν δημιουργηθεί. Να αποσταλούν;"
+msgstr "Οι πληροφορίες της ανάθεσης εργασίας έχουν δημιουργηθεί. Να αποσταλούν;"
 
 #: calendar/gui/dialogs/send-comp.c:72
 msgid "The task information has changed. Send an updated version?"
-msgstr ""
-"Η πληροφορίες της εργασία έχει αλλάξει. Να αποσταλεί ενημερωμένη έκδοση;"
+msgstr "Η πληροφορίες της εργασία έχει αλλάξει. Να αποσταλεί ενημερωμένη έκδοση;"
 
-#: calendar/gui/dialogs/task-details-page.c:405
+#: calendar/gui/dialogs/task-details-page.c:401
 msgid "Completed date is wrong"
 msgstr "Η συμπληρωμένη ημερομηνία είναι λανθασμένη"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:2
-#, fuzzy, no-c-format
-msgid "% _Complete"
+#: calendar/gui/e-calendar-table.etspec.h:2
+#, no-c-format
+msgid "% Complete"
 msgstr "% Ολοκληρωμένο"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:4
-#: calendar/gui/e-calendar-table.c:478 calendar/gui/e-cal-model-tasks.c:323
-#: calendar/gui/e-cal-model-tasks.c:602 calendar/gui/e-tasks.c:250
-#: calendar/gui/print.c:2311
-msgid "Completed"
-msgstr "Ολοκληρώθηκε"
-
-#: calendar/gui/dialogs/task-details-page.glade.h:6
-#: calendar/gui/e-calendar-table.c:477 calendar/gui/e-cal-model-tasks.c:321
-#: calendar/gui/e-cal-model-tasks.c:600 calendar/gui/e-cal-model-tasks.c:662
-#: calendar/gui/e-tasks.c:247 calendar/gui/print.c:2308
-msgid "In Progress"
-msgstr "Σε εξέλιξη"
-
-#: calendar/gui/dialogs/task-details-page.glade.h:9
-#: calendar/gui/e-calendar-table.c:476 calendar/gui/e-cal-model-tasks.c:319
-#: calendar/gui/e-cal-model-tasks.c:598 calendar/gui/e-tasks.c:257
-#: calendar/gui/print.c:2305
-msgid "Not Started"
-msgstr "Δεν έχει ξεκινήσει"
+#: calendar/gui/dialogs/task-details-page.glade.h:5
+msgid "Date Completed:"
+msgstr "Ολοκληρώθηκε την:"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:10
+#: calendar/gui/dialogs/task-details-page.glade.h:11
 msgid "Progress"
 msgstr "Πρόοδος"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:12
-#, fuzzy
-msgid "_Date Completed:"
-msgstr "Ολοκληρώθηκε την:"
+msgid "URL:"
+msgstr "URL:"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:13
+#: calendar/gui/dialogs/task-details-page.glade.h:14
 msgid "_Priority:"
 msgstr "_Προτεραιότητα"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:14
+#: calendar/gui/dialogs/task-details-page.glade.h:15
 msgid "_Status:"
 msgstr "_Κατάσταση:"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:15
-#, fuzzy
-msgid "_Web Page:"
-msgstr "_Διεύθυνση Ιστοσελίδας:"
-
-#: calendar/gui/dialogs/task-editor.c:193
+#: calendar/gui/dialogs/task-editor.c:190
 msgid "Basic"
 msgstr "Βασικό"
 
-#: calendar/gui/dialogs/task-editor.c:207
-#: calendar/gui/dialogs/task-editor.c:270
-#: calendar/gui/dialogs/task-editor.c:407
+#: calendar/gui/dialogs/task-editor.c:204
+#: calendar/gui/dialogs/task-editor.c:252
+#: calendar/gui/dialogs/task-editor.c:387
 msgid "Assignment"
 msgstr "Εργασία"
 
-#: calendar/gui/dialogs/task-page.c:482
+#: calendar/gui/dialogs/task-page.c:480
 msgid "Due date is wrong"
 msgstr "Η ημερομηνία λήξης είναι λανθασμένη"
 
-#: calendar/gui/dialogs/task-page.c:542
-msgid "Due date is before start date!"
-msgstr ""
-
-#: calendar/gui/dialogs/task-page.glade.h:4
-msgid "Con_fidential"
-msgstr "_Εμπιστευτικό"
-
-#: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-itip-control.c:1077
-#: calendar/gui/e-itip-control.glade.h:6 calendar/gui/e-tasks.c:287
-#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:43
+#: calendar/gui/dialogs/task-page.glade.h:6
+#: calendar/gui/e-itip-control.c:1107
+#: calendar/gui/e-itip-control.glade.h:6
+#: composer/e-msg-composer-attachment.glade.h:3
+#: mail/mail-config.glade.h:43
 msgid "Description:"
 msgstr "Περιγραφή:"
 
@@ -5082,259 +5149,246 @@ msgstr "Ημερομηνία Έ_ναρξης:"
 msgid "_Due Date:"
 msgstr "Ημερομηνία _Λήξης:"
 
-#: calendar/gui/e-alarm-list.c:397
+#: calendar/gui/e-alarm-list.c:393
 #, c-format
 msgid "%d days"
 msgstr "%d ημέρες"
 
-#: calendar/gui/e-alarm-list.c:400
+#: calendar/gui/e-alarm-list.c:396
 msgid "1 day"
 msgstr "1 ημέρα"
 
-#: calendar/gui/e-alarm-list.c:405
+#: calendar/gui/e-alarm-list.c:401
 #, c-format
 msgid "%d weeks"
 msgstr "%d εβδομάδες"
 
-#: calendar/gui/e-alarm-list.c:408
+#: calendar/gui/e-alarm-list.c:404
 msgid "1 week"
 msgstr "1 εβδομάδα"
 
-#: calendar/gui/e-alarm-list.c:413
+#: calendar/gui/e-alarm-list.c:409
 #, c-format
 msgid "%d hours"
 msgstr "%d ώρες"
 
-#: calendar/gui/e-alarm-list.c:416
+#: calendar/gui/e-alarm-list.c:412
 msgid "1 hour"
 msgstr "1 ώρα"
 
-#: calendar/gui/e-alarm-list.c:421
+#: calendar/gui/e-alarm-list.c:417
 #, c-format
 msgid "%d minutes"
 msgstr "%d λεπτά"
 
-#: calendar/gui/e-alarm-list.c:424
+#: calendar/gui/e-alarm-list.c:420
 msgid "1 minute"
 msgstr "1 λεπτό"
 
-#: calendar/gui/e-alarm-list.c:429
+#: calendar/gui/e-alarm-list.c:425
 #, c-format
 msgid "%d seconds"
 msgstr "%d δευτερόλεπτα"
 
-#: calendar/gui/e-alarm-list.c:432
+#: calendar/gui/e-alarm-list.c:428
 msgid "1 second"
 msgstr "1 δευτερόλεπτο"
 
-#: calendar/gui/e-alarm-list.c:469
+#: calendar/gui/e-alarm-list.c:465
 msgid "Send an email"
 msgstr "Αποστολή e-mail"
 
-#: calendar/gui/e-alarm-list.c:479
+#: calendar/gui/e-alarm-list.c:475
 msgid "Unknown action to be performed"
 msgstr "Εκτέλεση άγνωστης ενέργειας"
 
-#: calendar/gui/e-alarm-list.c:491
+#: calendar/gui/e-alarm-list.c:487
 #, c-format
 msgid "%s %s before the start of the appointment"
 msgstr "%s %s πριν την αρχή του ραντεβού"
 
-#: calendar/gui/e-alarm-list.c:494
+#: calendar/gui/e-alarm-list.c:490
 #, c-format
 msgid "%s %s after the start of the appointment"
 msgstr "%s %s πριν την αρχή του ραντεβού"
 
-#: calendar/gui/e-alarm-list.c:499
+#: calendar/gui/e-alarm-list.c:495
 #, c-format
 msgid "%s at the start of the appointment"
 msgstr "%s στην αρχή του ραντεβού"
 
-#: calendar/gui/e-alarm-list.c:508
+#: calendar/gui/e-alarm-list.c:504
 #, c-format
 msgid "%s %s before the end of the appointment"
 msgstr "%s %s πριν το τέλος του ραντεβού"
 
-#: calendar/gui/e-alarm-list.c:511
+#: calendar/gui/e-alarm-list.c:507
 #, c-format
 msgid "%s %s after the end of the appointment"
 msgstr "%s %s μετά το τέλος του ραντεβού"
 
-#: calendar/gui/e-alarm-list.c:516
+#: calendar/gui/e-alarm-list.c:512
 #, c-format
 msgid "%s at the end of the appointment"
 msgstr "%s στο τέλος του ραντεβού"
 
-#: calendar/gui/e-alarm-list.c:540
+#: calendar/gui/e-alarm-list.c:536
 #, c-format
 msgid "%s at %s"
 msgstr "%s στις %s"
 
-#: calendar/gui/e-alarm-list.c:546
+#: calendar/gui/e-alarm-list.c:542
 #, c-format
 msgid "%s for an unknown trigger type"
 msgstr "%s για άγνωστο τύπο ενεργοποίησης"
 
-#: calendar/gui/e-calendar-table.c:381 calendar/gui/e-cal-model.c:280
-#: calendar/gui/e-cal-model.c:287
-msgid "Public"
-msgstr "Δημόσιο"
-
-#: calendar/gui/e-calendar-table.c:382 calendar/gui/e-cal-model.c:289
-msgid "Private"
-msgstr "Ιδιωτικό"
-
-#: calendar/gui/e-calendar-table.c:383 calendar/gui/e-cal-model.c:291
-msgid "Confidential"
-msgstr "Εμπιστευτικό"
-
-#: calendar/gui/e-calendar-table.c:425
+#: calendar/gui/e-calendar-table.c:415
 msgid "0%"
 msgstr "0%"
 
-#: calendar/gui/e-calendar-table.c:426
+#: calendar/gui/e-calendar-table.c:416
 msgid "10%"
 msgstr "10%"
 
-#: calendar/gui/e-calendar-table.c:427
+#: calendar/gui/e-calendar-table.c:417
 msgid "20%"
 msgstr "20%"
 
-#: calendar/gui/e-calendar-table.c:428
+#: calendar/gui/e-calendar-table.c:418
 msgid "30%"
 msgstr "30%"
 
-#: calendar/gui/e-calendar-table.c:429
+#: calendar/gui/e-calendar-table.c:419
 msgid "40%"
 msgstr "40%"
 
-#: calendar/gui/e-calendar-table.c:430
+#: calendar/gui/e-calendar-table.c:420
 msgid "50%"
 msgstr "50%"
 
-#: calendar/gui/e-calendar-table.c:431
+#: calendar/gui/e-calendar-table.c:421
 msgid "60%"
 msgstr "60%"
 
-#: calendar/gui/e-calendar-table.c:432
+#: calendar/gui/e-calendar-table.c:422
 msgid "70%"
 msgstr "70%"
 
-#: calendar/gui/e-calendar-table.c:433
+#: calendar/gui/e-calendar-table.c:423
 msgid "80%"
 msgstr "80%"
 
-#: calendar/gui/e-calendar-table.c:434
+#: calendar/gui/e-calendar-table.c:424
 msgid "90%"
 msgstr "90%"
 
-#: calendar/gui/e-calendar-table.c:435
+#: calendar/gui/e-calendar-table.c:425
 msgid "100%"
 msgstr "100%"
 
-#: calendar/gui/e-calendar-table.c:455 calendar/gui/e-cal-model-calendar.c:163
-msgid "Free"
-msgstr "Διαθέσιμη"
-
-#: calendar/gui/e-calendar-table.c:456 calendar/gui/e-cal-model-calendar.c:166
-#: calendar/gui/e-meeting-time-sel.c:393
-#: shell/evolution-shell-component.c:1207
-msgid "Busy"
-msgstr "Απασχολημένη"
-
-#: calendar/gui/e-calendar-table.c:724 calendar/gui/e-cal-view.c:562
+#: calendar/gui/e-calendar-table.c:717
+#: calendar/gui/e-day-view.c:2851
+#: calendar/gui/e-week-view.c:1933
 msgid "Deleting selected objects"
 msgstr "Διαγραφή επιλεγμένων αντικειμένων"
 
-#: calendar/gui/e-calendar-table.c:988 calendar/gui/e-calendar-table.c:1029
-#: calendar/gui/e-cal-view.c:1126 calendar/gui/e-cal-view.c:1192
-#: shell/e-shortcuts-view.c:422 ui/evolution-addressbook.xml.h:36
+#: calendar/gui/e-calendar-table.c:949
+#: calendar/gui/e-day-view.c:3721
+#: calendar/gui/e-week-view.c:3613
+#: mail/folder-browser.c:1763
+#: shell/e-shortcuts-view.c:422
+#: ui/evolution-addressbook.xml.h:36
 msgid "_Open"
 msgstr "_Άνοιγμα"
 
-#: calendar/gui/e-calendar-table.c:989
-#, fuzzy
-msgid "Open _Web Page"
-msgstr "_Άνοιγμα Μηνύματος"
-
-#: calendar/gui/e-calendar-table.c:990 calendar/gui/e-calendar-table.c:1035
-#: calendar/gui/e-cal-view.c:1127 calendar/gui/e-cal-view.c:1198
-#: ui/evolution-mail-message.xml.h:120
-msgid "_Save As..."
-msgstr "Αποθήκευση _ως..."
-
-#: calendar/gui/e-calendar-table.c:991 calendar/gui/e-calendar-table.c:1033
-#: calendar/gui/e-cal-view.c:1101 calendar/gui/e-cal-view.c:1128
-#: calendar/gui/e-cal-view.c:1196 ui/evolution-addressbook.xml.h:38
-#: ui/evolution-calendar.xml.h:37 ui/evolution-comp-editor.xml.h:19
-#: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:116
-#: ui/evolution-tasks.xml.h:21 ui/my-evolution.xml.h:6
+#: calendar/gui/e-calendar-table.c:950
+msgid "_Save as..."
+msgstr "Αποθήκευ_ση ως..."
+
+#: calendar/gui/e-calendar-table.c:951
+#: calendar/gui/e-day-view.c:3723
+#: calendar/gui/e-week-view.c:3588
+#: calendar/gui/e-week-view.c:3615
+#: ui/evolution-addressbook.xml.h:38
+#: ui/evolution-calendar.xml.h:33
+#: ui/evolution-contact-editor.xml.h:14
+#: ui/evolution-mail-message.xml.h:108
+#: ui/evolution-tasks.xml.h:20
+#: ui/my-evolution.xml.h:6
 msgid "_Print..."
 msgstr "_Εκτύπωση..."
 
-#: calendar/gui/e-calendar-table.c:995 calendar/gui/e-calendar-table.c:1024
-#: calendar/gui/e-cal-view.c:1133 calendar/gui/e-cal-view.c:1174
-#: ui/evolution-addressbook.xml.h:1 ui/evolution-calendar.xml.h:1
+#: calendar/gui/e-calendar-table.c:955
+#: calendar/gui/e-day-view.c:3728
+#: calendar/gui/e-week-view.c:3620
+#: ui/evolution-addressbook.xml.h:1
+#: ui/evolution-calendar.xml.h:1
 #: ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "_Αποκοπή"
 
-#: calendar/gui/e-calendar-table.c:996 calendar/gui/e-calendar-table.c:1022
-#: calendar/gui/e-cal-view.c:1134 calendar/gui/e-cal-view.c:1172
-#: ui/evolution-addressbook.xml.h:30 ui/evolution-calendar.xml.h:33
-#: ui/evolution-composer-entries.xml.h:7 ui/evolution-mail-message.xml.h:101
-#: ui/evolution-tasks.xml.h:17
+#: calendar/gui/e-calendar-table.c:956
+#: calendar/gui/e-day-view.c:3729
+#: calendar/gui/e-week-view.c:3621
+#: ui/evolution-addressbook.xml.h:30
+#: ui/evolution-calendar.xml.h:29
+#: ui/evolution-composer-entries.xml.h:7
+#: ui/evolution-mail-list.xml.h:24
+#: ui/evolution-tasks.xml.h:15
 msgid "_Copy"
 msgstr "Αντι_γραφή"
 
-#: calendar/gui/e-calendar-table.c:997 calendar/gui/e-calendar-table.c:1031
-#: calendar/gui/e-cal-view.c:1105 calendar/gui/e-cal-view.c:1135
-#: calendar/gui/e-cal-view.c:1194 ui/evolution-addressbook.xml.h:37
-#: ui/evolution-calendar.xml.h:36 ui/evolution-composer-entries.xml.h:9
-#: ui/evolution-mail-message.xml.h:114 ui/evolution-tasks.xml.h:20
+#: calendar/gui/e-calendar-table.c:957
+#: calendar/gui/e-day-view.c:3694
+#: calendar/gui/e-day-view.c:3730
+#: calendar/gui/e-week-view.c:3592
+#: calendar/gui/e-week-view.c:3622
+#: ui/evolution-addressbook.xml.h:37
+#: ui/evolution-calendar.xml.h:32
+#: ui/evolution-composer-entries.xml.h:9
+#: ui/evolution-mail-list.xml.h:29
+#: ui/evolution-tasks.xml.h:19
 msgid "_Paste"
 msgstr "Επι_κόλληση"
 
-#: calendar/gui/e-calendar-table.c:1001
+#: calendar/gui/e-calendar-table.c:961
 msgid "_Assign Task"
 msgstr "_Ανάθεση Εργασίας"
 
-#: calendar/gui/e-calendar-table.c:1002
+#: calendar/gui/e-calendar-table.c:962
 msgid "_Forward as iCalendar"
 msgstr "Προώ_θηση ως i_Calendar"
 
-#: calendar/gui/e-calendar-table.c:1003
+#: calendar/gui/e-calendar-table.c:963
 msgid "_Mark as Complete"
 msgstr "_Σημείωση ως Ολοκληρωμένο"
 
-#: calendar/gui/e-calendar-table.c:1004
+#: calendar/gui/e-calendar-table.c:964
 msgid "_Mark Selected Tasks as Complete"
 msgstr "_Σημείωση επιλεγμένων εργασιών ως ολοκληρωμένες"
 
-#: calendar/gui/e-calendar-table.c:1009 calendar/gui/e-calendar-table.c:1027
+#: calendar/gui/e-calendar-table.c:969
 msgid "_Delete Selected Tasks"
 msgstr "_Διαγραφή Επιλεγμένων Εργασιών"
 
-#: calendar/gui/e-calendar-table.c:1341 calendar/gui/e-cal-view.c:253
+#: calendar/gui/e-calendar-table.c:1236
+#: calendar/gui/e-day-view.c:7701
+#: calendar/gui/e-week-view.c:4335
 msgid "Updating objects"
 msgstr "Αναβάθμιση Αντικειμένων"
 
-#: calendar/gui/e-calendar-table.c:1424
+#: calendar/gui/e-calendar-table.c:1319
 #: calendar/gui/e-calendar-table.etspec.h:6
 msgid "Click to add a task"
 msgstr "Κλικ εδώ για προσθήκη εργασίας"
 
-#: calendar/gui/e-calendar-table.etspec.h:2
-#, no-c-format
-msgid "% Complete"
-msgstr "% Ολοκληρωμένο"
-
 #: calendar/gui/e-calendar-table.etspec.h:3
 msgid "Alarms"
 msgstr "Ειδοποιήσεις"
 
-#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:1173
-#: camel/camel-filter-driver.c:1268 mail/mail-send-recv.c:578
+#: calendar/gui/e-calendar-table.etspec.h:7
+#: camel/camel-filter-driver.c:1156
+#: camel/camel-filter-driver.c:1251
 msgid "Complete"
 msgstr "Ολοκληρώθηκε"
 
@@ -5343,12 +5397,11 @@ msgid "Completion Date"
 msgstr "Ημερομηνία Ολοκλήρωσης"
 
 #: calendar/gui/e-calendar-table.etspec.h:9
-#, fuzzy
-msgid "Description"
-msgstr "Περιγραφή:"
+msgid "Due Date"
+msgstr "Ημερομηνία Λήξης"
 
 #: calendar/gui/e-calendar-table.etspec.h:10
-msgid "Due Date"
+msgid "End Date"
 msgstr "Ημερομηνία Λήξης"
 
 #: calendar/gui/e-calendar-table.etspec.h:11
@@ -5359,641 +5412,637 @@ msgstr "Γεωγραφική Θέση"
 msgid "Priority"
 msgstr "Προτεραιότητα"
 
-#: calendar/gui/e-calendar-table.etspec.h:13
+#: calendar/gui/e-calendar-table.etspec.h:14
 msgid "Start Date"
 msgstr "Ημερομηνία Έναρξης"
 
-#: calendar/gui/e-calendar-table.etspec.h:14
-#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:36
-#: mail/message-list.etspec.h:12
-msgid "Status"
-msgstr "Κατάσταση"
-
-#: calendar/gui/e-calendar-table.etspec.h:15
-#: my-evolution/component-factory.c:56 shell/e-shell.c:750
+#: calendar/gui/e-calendar-table.etspec.h:16
+#: my-evolution/component-factory.c:56
+#: shell/e-shell.c:750
 #: shell/e-shortcuts.c:1082
 msgid "Summary"
 msgstr "Περίληψη"
 
-#: calendar/gui/e-calendar-table.etspec.h:16
+#: calendar/gui/e-calendar-table.etspec.h:17
 msgid "Task sort"
 msgstr "Ταξινόμηση Εργασιών"
 
-#: calendar/gui/e-calendar-table.etspec.h:19 mail/mail-config.glade.h:171
-msgid "color"
-msgstr " χρώμα"
-
-#: calendar/gui/e-calendar-table.etspec.h:20
-#, fuzzy
-msgid "component"
-msgstr "Ραντεβού"
-
-#: calendar/gui/e-cal-model.c:293 calendar/gui/e-cal-model.c:296
-#: calendar/gui/e-itip-control.c:1062 calendar/gui/e-itip-control.c:1278
-#: camel/camel-gpg-context.c:1574 camel/camel-gpg-context.c:1625
-#: camel/camel-tcp-stream-openssl.c:631
-#: camel/providers/smtp/camel-smtp-transport.c:172
-#: camel/providers/smtp/camel-smtp-transport.c:227
-#: widgets/misc/e-charset-picker.c:60
-msgid "Unknown"
-msgstr "Άγνωστο"
-
-#: calendar/gui/e-cal-model.c:828
-msgid "Recurring"
-msgstr "Επανάληψη"
-
-#: calendar/gui/e-cal-model.c:830
-msgid "Assigned"
-msgstr "Ανάθεση"
+#. strftime format of a weekday, a date and a time, 24-hour.
+#: calendar/gui/e-cell-date-edit-text.c:118
+#: e-util/e-time-utils.c:167
+#: e-util/e-time-utils.c:380
+msgid "%a %m/%d/%Y %H:%M:%S"
+msgstr "%a %d/%m/%Y %H:%M:%S"
 
-#: calendar/gui/e-cal-model.c:832 calendar/gui/e-cal-model-tasks.c:933
-msgid "Yes"
-msgstr "Ναι"
+#. strftime format of a weekday, a date and a time, 12-hour.
+#: calendar/gui/e-cell-date-edit-text.c:121
+#: e-util/e-time-utils.c:162
+#: e-util/e-time-utils.c:389
+msgid "%a %m/%d/%Y %I:%M:%S %p"
+msgstr "%a %d/%m/%Y %I:%M:%S %p"
 
-#: calendar/gui/e-cal-model.c:832 calendar/gui/e-cal-model-tasks.c:933
-msgid "No"
-msgstr "Όχι"
+#: calendar/gui/e-cell-date-edit-text.c:126
+#, c-format
+msgid ""
+"The date must be entered in the format: \n"
+"\n"
+"%s"
+msgstr ""
+"Η ημερομηνία πρέπει να έχει την παρακάτω μορφή: \n"
+"\n"
+"%s"
 
-#: calendar/gui/e-cal-model-tasks.c:275
-msgid "N"
-msgstr "Β"
+#: calendar/gui/e-day-view-time-item.c:532
+#, c-format
+msgid "%02i minute divisions"
+msgstr "%02i τμήματα λεπτών"
 
-#: calendar/gui/e-cal-model-tasks.c:275
-msgid "S"
-msgstr "Ν"
+#. strftime format %A = full weekday name, %d = day of month,
+#. %B = full month name. Don't use any other specifiers.
+#: calendar/gui/e-day-view-top-item.c:261
+#: calendar/gui/e-day-view.c:1405
+#: calendar/gui/e-week-view-main-item.c:316
+#: calendar/gui/print.c:1527
+msgid "%A %d %B"
+msgstr "%A %d %B"
 
-#: calendar/gui/e-cal-model-tasks.c:277
-msgid "E"
-msgstr "Α"
+#. strftime format %d = day of month, %b = abbreviated month name.
+#. Don't use any other specifiers.
+#: calendar/gui/e-day-view-top-item.c:269
+#: calendar/gui/e-day-view.c:1438
+#: calendar/gui/e-week-view-main-item.c:339
+msgid "%d %b"
+msgstr "%d %b"
 
-#: calendar/gui/e-cal-model-tasks.c:277
-msgid "W"
-msgstr "Δ"
+#. String to use in 12-hour time format for times in the morning.
+#: calendar/gui/e-day-view.c:620
+#: calendar/gui/e-week-view.c:350
+#: calendar/gui/print.c:811
+msgid "am"
+msgstr "πμ"
 
-#: calendar/gui/e-cal-model-tasks.c:550
-msgid ""
-"The geographical position must be entered in the format: \n"
-"\n"
-"45.436845,125.862501"
-msgstr ""
-"Η γεωγραφική θέση πρέπει να έχει την παρακάτω μορφή: \n"
-"\n"
-"45.436845,125.862501"
+#. String to use in 12-hour time format for times in the afternoon.
+#: calendar/gui/e-day-view.c:623
+#: calendar/gui/e-week-view.c:353
+#: calendar/gui/print.c:813
+msgid "pm"
+msgstr "μμ"
 
-#: calendar/gui/e-cal-view.c:1094 calendar/gui/e-cal-view.c:1184
-msgid "New _Appointment..."
-msgstr "Νέο _Ραντεβού..."
+#: calendar/gui/e-day-view.c:3678
+msgid "New _Appointment"
+msgstr "Νέο _Ραντεβού"
 
-#: calendar/gui/e-cal-view.c:1095 calendar/gui/e-cal-view.c:1186
+#: calendar/gui/e-day-view.c:3680
+#: calendar/gui/e-week-view.c:3582
 msgid "New All Day _Event"
 msgstr "Νέο _Γεγονός Ολόκληρης της Ημέρας"
 
-#: calendar/gui/e-cal-view.c:1096 calendar/gui/e-cal-view.c:1188
+#: calendar/gui/e-day-view.c:3682
+#: calendar/gui/e-week-view.c:3583
 msgid "New Meeting"
 msgstr "Νέα Συνάντηση"
 
-#: calendar/gui/e-cal-view.c:1097 calendar/gui/e-cal-view.c:1190
+#: calendar/gui/e-day-view.c:3684
+#: calendar/gui/e-week-view.c:3584
 msgid "New Task"
 msgstr "Νέα Εργασία"
 
-#: calendar/gui/e-cal-view.c:1111 calendar/gui/e-cal-view.c:1180
+#: calendar/gui/e-day-view.c:3689
+#: ui/evolution-comp-editor.xml.h:11
+msgid "Print..."
+msgstr "Εκτύπωση..."
+
+#: calendar/gui/e-day-view.c:3701
+#: calendar/gui/e-week-view.c:3598
 #: ui/evolution-calendar.xml.h:13
 msgid "Go to _Today"
 msgstr "Μετάβαση στο _Σήμερα"
 
-#: calendar/gui/e-cal-view.c:1112 calendar/gui/e-cal-view.c:1182
+#: calendar/gui/e-day-view.c:3703
+#: calendar/gui/e-week-view.c:3599
 msgid "_Go to Date..."
 msgstr "_Μετάβαση στην Ημερομηνία..."
 
-#: calendar/gui/e-cal-view.c:1116 ui/evolution-calendar.xml.h:38
+#: calendar/gui/e-day-view.c:3708
+#: calendar/gui/e-week-view.c:3603
+#: ui/evolution-calendar.xml.h:34
 msgid "_Publish Free/Busy Information"
 msgstr "Δημο_σίευση πληροφοριών Διαθεσιμότητας"
 
-#: calendar/gui/e-cal-view.c:1120 calendar/gui/e-cal-view.c:1200
+#: calendar/gui/e-day-view.c:3713
+#: calendar/gui/e-week-view.c:3607
 #: ui/evolution.xml.h:60
 msgid "_Settings..."
 msgstr "_Ρυθμίσεις..."
 
-#: calendar/gui/e-cal-view.c:1139
+#: calendar/gui/e-day-view.c:3722
+#: calendar/gui/e-week-view.c:3614
+#: mail/folder-browser.c:1765
+#: ui/evolution-mail-message.xml.h:112
+msgid "_Save As..."
+msgstr "Αποθήκευση _ως..."
+
+#: calendar/gui/e-day-view.c:3734
+#: calendar/gui/e-week-view.c:3626
 msgid "_Schedule Meeting..."
 msgstr "Προγραμματισμός _Συνάντησης..."
 
-#: calendar/gui/e-cal-view.c:1140
+#: calendar/gui/e-day-view.c:3735
+#: calendar/gui/e-week-view.c:3627
 msgid "_Forward as iCalendar..."
 msgstr "Προώ_θηση ως iCalendar"
 
-#: calendar/gui/e-cal-view.c:1145
+#: calendar/gui/e-day-view.c:3740
+#: calendar/gui/e-week-view.c:3632
 msgid "Make this Occurrence _Movable"
 msgstr "Να γίνει αυτή η Εμφάνιση _Μετακινήσιμη"
 
-#: calendar/gui/e-cal-view.c:1146 calendar/gui/e-cal-view.c:1177
+#: calendar/gui/e-day-view.c:3741
+#: calendar/gui/e-week-view.c:3633
 msgid "Delete this _Occurrence"
 msgstr "Διαγραφή αυτής της _Εμφάνισης"
 
-#: calendar/gui/e-cal-view.c:1147 calendar/gui/e-cal-view.c:1178
+#: calendar/gui/e-day-view.c:3742
+#: calendar/gui/e-week-view.c:3634
 msgid "Delete _All Occurrences"
 msgstr "Διαγραφή Ό_λων των Εμφανίσεων"
 
-#. strftime format of a weekday, a date and a time, 24-hour.
-#: calendar/gui/e-cell-date-edit-text.c:118 e-util/e-time-utils.c:180
-#: e-util/e-time-utils.c:393
-msgid "%a %m/%d/%Y %H:%M:%S"
-msgstr "%a %d/%m/%Y %H:%M:%S"
-
-#. strftime format of a weekday, a date and a time, 12-hour.
-#: calendar/gui/e-cell-date-edit-text.c:121 e-util/e-time-utils.c:175
-#: e-util/e-time-utils.c:402
-msgid "%a %m/%d/%Y %I:%M:%S %p"
-msgstr "%a %d/%m/%Y %I:%M:%S %p"
-
-#: calendar/gui/e-cell-date-edit-text.c:126
-#, c-format
-msgid ""
-"The date must be entered in the format: \n"
-"\n"
-"%s"
-msgstr ""
-"Η ημερομηνία πρέπει να έχει την παρακάτω μορφή: \n"
-"\n"
-"%s"
-
-#. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:600 calendar/gui/e-week-view.c:326
-#: calendar/gui/print.c:809
-msgid "am"
-msgstr "πμ"
-
-#. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:603 calendar/gui/e-week-view.c:329
-#: calendar/gui/print.c:811
-msgid "pm"
-msgstr "μμ"
-
-#. strftime format %A = full weekday name, %d = day of month,
-#. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view.c:1347 calendar/gui/e-day-view-top-item.c:262
-#: calendar/gui/e-week-view-main-item.c:316 calendar/gui/print.c:1524
-msgid "%A %d %B"
-msgstr "%A %d %B"
-
-#. strftime format %d = day of month, %b = abbreviated month name.
-#. Don't use any other specifiers.
-#: calendar/gui/e-day-view.c:1380 calendar/gui/e-day-view-top-item.c:270
-#: calendar/gui/e-week-view-main-item.c:339
-msgid "%d %b"
-msgstr "%d %b"
-
-#: calendar/gui/e-day-view-time-item.c:532
-#, c-format
-msgid "%02i minute divisions"
-msgstr "%02i τμήματα λεπτών"
-
-#: calendar/gui/e-itip-control.c:676
+#: calendar/gui/e-itip-control.c:706
 #, fuzzy
 msgid "Yes. (Complex Recurrence)"
 msgstr "_Απλή επανεμφάνιση"
 
-#: calendar/gui/e-itip-control.c:688
+#: calendar/gui/e-itip-control.c:718
 #, fuzzy
 msgid "Every day"
 msgstr "Κάθε"
 
-#: calendar/gui/e-itip-control.c:690
+#: calendar/gui/e-itip-control.c:720
 #, fuzzy, c-format
 msgid "Every %d days"
 msgstr "%d ημέρες"
 
-#: calendar/gui/e-itip-control.c:696
+#: calendar/gui/e-itip-control.c:726
 #, fuzzy
 msgid "Every week"
 msgstr "Κάθε"
 
-#: calendar/gui/e-itip-control.c:698
+#: calendar/gui/e-itip-control.c:728
 #, fuzzy, c-format
 msgid "Every %d weeks"
 msgstr "%d εβδομάδες"
 
-#: calendar/gui/e-itip-control.c:701
+#: calendar/gui/e-itip-control.c:731
 msgid "Every week on "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:703
+#: calendar/gui/e-itip-control.c:733
 #, fuzzy, c-format
 msgid "Every %d weeks on "
 msgstr "%d εβδομάδες"
 
-#: calendar/gui/e-itip-control.c:711
+#: calendar/gui/e-itip-control.c:741
 msgid " and "
 msgstr " και"
 
-#: calendar/gui/e-itip-control.c:718
+#: calendar/gui/e-itip-control.c:748
 #, c-format
 msgid "The %s day of "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:731
+#: calendar/gui/e-itip-control.c:761
 #, c-format
 msgid "The %s %s of "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:736
+#: calendar/gui/e-itip-control.c:766
 #, fuzzy
 msgid "every month"
 msgstr "Ένας Μήνας"
 
-#: calendar/gui/e-itip-control.c:741
+#: calendar/gui/e-itip-control.c:771
 #, c-format
 msgid "every %d months"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:747
+#: calendar/gui/e-itip-control.c:777
 #, fuzzy
 msgid "Every year"
 msgstr "Κάθε"
 
-#: calendar/gui/e-itip-control.c:749
+#: calendar/gui/e-itip-control.c:779
 #, c-format
 msgid "Every %d years"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:761
+#: calendar/gui/e-itip-control.c:791
 #, c-format
 msgid " a total of %d times"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:769
+#: calendar/gui/e-itip-control.c:799
 msgid ", ending on "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:793
+#: calendar/gui/e-itip-control.c:823
 msgid "<b>Starts:</b> "
 msgstr "<b>Ξεκινάει:</b> "
 
-#: calendar/gui/e-itip-control.c:803
+#: calendar/gui/e-itip-control.c:833
 msgid "<b>Ends:</b> "
 msgstr "<b>Τελειώνει:</b> "
 
-#: calendar/gui/e-itip-control.c:823
+#: calendar/gui/e-itip-control.c:853
 msgid "<b>Completed:</b> "
 msgstr "<b>Ολοκληρώθηκε:</b> "
 
-#: calendar/gui/e-itip-control.c:833
+#: calendar/gui/e-itip-control.c:863
 msgid "<b>Due:</b> "
 msgstr "<b>Λήγει:</b> "
 
-#: calendar/gui/e-itip-control.c:870 calendar/gui/e-itip-control.c:923
+#: calendar/gui/e-itip-control.c:900
+#: calendar/gui/e-itip-control.c:953
 msgid "iCalendar Information"
 msgstr "Πληροφορίες iCalendar"
 
 #. Title
-#: calendar/gui/e-itip-control.c:885
+#: calendar/gui/e-itip-control.c:915
 msgid "iCalendar Error"
 msgstr "Σφάλμα iCalendar"
 
-#: calendar/gui/e-itip-control.c:954 calendar/gui/e-itip-control.c:970
-#: calendar/gui/e-itip-control.c:981 calendar/gui/e-itip-control.c:998
+#: calendar/gui/e-itip-control.c:984
+#: calendar/gui/e-itip-control.c:1000
+#: calendar/gui/e-itip-control.c:1011
+#: calendar/gui/e-itip-control.c:1028
 msgid "An unknown person"
 msgstr "Ένα άγνωστο άτομο"
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:1005
-msgid ""
-"<br> Please review the following information, and then select an action from "
-"the menu below."
-msgstr ""
-"<br> Παρακαλώ διαβάστε τις παρακάτω πληροφορίες, και επιλέξτε μετά μια "
-"ενέργεια από το παρακάτω μενού."
+#: calendar/gui/e-itip-control.c:1035
+msgid "<br> Please review the following information, and then select an action from the menu below."
+msgstr "<br> Παρακαλώ διαβάστε τις παρακάτω πληροφορίες, και επιλέξτε μετά μια ενέργεια από το παρακάτω μενού."
 
-#: calendar/gui/e-itip-control.c:1020
+#: calendar/gui/e-itip-control.c:1050
 msgid "<i>None</i>"
 msgstr "<i>Κανένα</i>"
 
-#: calendar/gui/e-itip-control.c:1031
+#: calendar/gui/e-itip-control.c:1061
 msgid "Location:"
 msgstr "Τοποθεσία: "
 
-#. write status
-#: calendar/gui/e-itip-control.c:1045 calendar/gui/e-tasks.c:243
+#: calendar/gui/e-itip-control.c:1075
 msgid "Status:"
 msgstr "Κατάσταση:"
 
-#: calendar/gui/e-itip-control.c:1050 calendar/gui/itip-utils.c:414
+#: calendar/gui/e-itip-control.c:1080
+#: calendar/gui/e-meeting-model.c:286
+#: calendar/gui/e-meeting-model.c:309
+#: calendar/gui/e-meeting-model.c:798
+#: calendar/gui/itip-utils.c:414
 msgid "Accepted"
 msgstr "Αποδοχή"
 
-#: calendar/gui/e-itip-control.c:1054 calendar/gui/itip-utils.c:417
+#: calendar/gui/e-itip-control.c:1084
+#: calendar/gui/itip-utils.c:417
 msgid "Tentatively Accepted"
 msgstr "Δοκιμαστική αποδοχή"
 
-#: calendar/gui/e-itip-control.c:1058 calendar/gui/itip-utils.c:420
+#: calendar/gui/e-itip-control.c:1088
+#: calendar/gui/e-meeting-model.c:288
+#: calendar/gui/e-meeting-model.c:311
+#: calendar/gui/e-meeting-model.c:799
+#: calendar/gui/itip-utils.c:420
 #: calendar/gui/itip-utils.c:446
 msgid "Declined"
 msgstr "Άρνηση πρόσβασης"
 
-#: calendar/gui/e-itip-control.c:1117 calendar/gui/e-itip-control.c:1145
-#: calendar/gui/e-itip-control.c:1171 calendar/gui/e-itip-control.c:1184
-#: calendar/gui/e-itip-control.c:1197 calendar/gui/e-itip-control.c:1210
+#: calendar/gui/e-itip-control.c:1092
+#: calendar/gui/e-itip-control.c:1300
+#: calendar/gui/e-meeting-model.c:222
+#: calendar/gui/e-meeting-model.c:257
+#: calendar/gui/e-meeting-model.c:322
+#: calendar/gui/e-meeting-model.c:756
+#: calendar/gui/e-meeting-model.c:772
+#: camel/camel-gpg-context.c:1574
+#: camel/camel-gpg-context.c:1625
+#: camel/camel-tcp-stream-openssl.c:634
+#: camel/providers/smtp/camel-smtp-transport.c:173
+#: camel/providers/smtp/camel-smtp-transport.c:228
+#: mail/folder-browser.c:345
+#: mail/mail-display.c:953
+#: widgets/misc/e-charset-picker.c:60
+msgid "Unknown"
+msgstr "Άγνωστο"
+
+#: calendar/gui/e-itip-control.c:1147
+#: calendar/gui/e-itip-control.c:1175
+#: calendar/gui/e-itip-control.c:1201
+#: calendar/gui/e-itip-control.c:1214
+#: calendar/gui/e-itip-control.c:1227
+#: calendar/gui/e-itip-control.c:1240
 msgid "Choose an action:"
 msgstr "Επιλέξτε μια ενέργεια:"
 
-#: calendar/gui/e-itip-control.c:1118
+#: calendar/gui/e-itip-control.c:1148
 msgid "Update"
 msgstr "Ενημέρωση"
 
-#: calendar/gui/e-itip-control.c:1119 calendar/gui/e-itip-control.c:1150
-#: calendar/gui/e-itip-control.c:1173 calendar/gui/e-itip-control.c:1186
-#: calendar/gui/e-itip-control.c:1199 calendar/gui/e-itip-control.c:1212
-#: shell/e-shell.c:2067 widgets/misc/e-cell-date-edit.c:265
+#: calendar/gui/e-itip-control.c:1149
+#: calendar/gui/e-itip-control.c:1180
+#: calendar/gui/e-itip-control.c:1203
+#: calendar/gui/e-itip-control.c:1216
+#: calendar/gui/e-itip-control.c:1229
+#: calendar/gui/e-itip-control.c:1242
+#: shell/e-shell.c:2067
+#: widgets/misc/e-cell-date-edit.c:265
 msgid "OK"
 msgstr "ΟΚ"
 
-#: calendar/gui/e-itip-control.c:1146
+#: calendar/gui/e-itip-control.c:1176
 msgid "Accept"
 msgstr "Αποδοχή"
 
-#: calendar/gui/e-itip-control.c:1147
+#: calendar/gui/e-itip-control.c:1177
 msgid "Tentatively accept"
 msgstr "Δοκιμαστική αποδοχή"
 
-#: calendar/gui/e-itip-control.c:1148
+#: calendar/gui/e-itip-control.c:1178
 msgid "Decline"
 msgstr "Απόκρυψη"
 
-#: calendar/gui/e-itip-control.c:1149
-#: calendar/gui/e-meeting-time-sel.etspec.h:8
-msgid "RSVP"
-msgstr "RSVP"
-
-#: calendar/gui/e-itip-control.c:1172
+#: calendar/gui/e-itip-control.c:1202
 msgid "Send Free/Busy Information"
 msgstr "Αποστολή πληροφοριών Διαθεσιμότητας"
 
-#: calendar/gui/e-itip-control.c:1185
+#: calendar/gui/e-itip-control.c:1215
 msgid "Update respondent status"
 msgstr "Ανανέωση κατάστασης απάντησης"
 
-#: calendar/gui/e-itip-control.c:1198
+#: calendar/gui/e-itip-control.c:1228
 msgid "Send Latest Information"
 msgstr "Αποστολή τελευταίων πληροφοριών"
 
-#: calendar/gui/e-itip-control.c:1211 calendar/gui/itip-utils.c:434
-#: mail/mail-send-recv.c:388 mail/mail-send-recv.c:440
-#: shell/e-shell-startup-wizard.c:781 shell/evolution-shell-component.c:1185
+#: calendar/gui/e-itip-control.c:1241
+#: calendar/gui/itip-utils.c:434
+#: mail/mail-send-recv.c:387
+#: mail/mail-send-recv.c:444
+#: shell/evolution-shell-component.c:1182
 #: ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Άκυρο"
 
-#: calendar/gui/e-itip-control.c:1300
+#: calendar/gui/e-itip-control.c:1322
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "<b>%s</b> έχει δημοσιεύσει πληροφορίες συνάντησης."
 
-#: calendar/gui/e-itip-control.c:1301
+#: calendar/gui/e-itip-control.c:1323
 msgid "Meeting Information"
 msgstr "Πληροφορίες Συνάντησης"
 
-#: calendar/gui/e-itip-control.c:1306
+#: calendar/gui/e-itip-control.c:1328
 #, c-format
 msgid "<b>%s</b> requests the presence of %s at a meeting."
 msgstr "<b>%s</b> παρακαλεί την παρουσία του %s σε μια συνάντηση."
 
-#: calendar/gui/e-itip-control.c:1308
+#: calendar/gui/e-itip-control.c:1330
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr "<b>%s</b> παρακαλεί την παρουσία σας σε μια συνάντηση."
 
-#: calendar/gui/e-itip-control.c:1309
+#: calendar/gui/e-itip-control.c:1331
 msgid "Meeting Proposal"
 msgstr "Πρόταση Συνάντησης"
 
-#: calendar/gui/e-itip-control.c:1313
+#: calendar/gui/e-itip-control.c:1335
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr "<b>%s</b> θα ήθελε να προσθέσει σε μια υπάρχουσα συνάντηση."
 
-#: calendar/gui/e-itip-control.c:1314
+#: calendar/gui/e-itip-control.c:1336
 msgid "Meeting Update"
 msgstr "Ανανέωση Συνάντησης"
 
-#: calendar/gui/e-itip-control.c:1318
+#: calendar/gui/e-itip-control.c:1340
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr "<b>%s</b> θα ήθελε να παραλάβει τις τελευταίες πληροφορίες συνάντησης."
 
-#: calendar/gui/e-itip-control.c:1319
+#: calendar/gui/e-itip-control.c:1341
 msgid "Meeting Update Request"
 msgstr "Αίτη_ση Ανανέωσης Συνάντησης"
 
-#: calendar/gui/e-itip-control.c:1326
+#: calendar/gui/e-itip-control.c:1348
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr "<b>%s</b> έχει απαντήσει σε μία πρόσκληση σε συνάντηση."
 
-#: calendar/gui/e-itip-control.c:1327
+#: calendar/gui/e-itip-control.c:1349
 msgid "Meeting Reply"
 msgstr "Απάντηση Συνάντησης"
 
-#: calendar/gui/e-itip-control.c:1334
+#: calendar/gui/e-itip-control.c:1356
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr "<b>%s</b> ακύρωσε μια συνάντηση."
 
-#: calendar/gui/e-itip-control.c:1335
+#: calendar/gui/e-itip-control.c:1357
 msgid "Meeting Cancellation"
 msgstr "Ακύρωση Συνάντησης"
 
-#: calendar/gui/e-itip-control.c:1342 calendar/gui/e-itip-control.c:1409
-#: calendar/gui/e-itip-control.c:1444
+#: calendar/gui/e-itip-control.c:1364
+#: calendar/gui/e-itip-control.c:1431
+#: calendar/gui/e-itip-control.c:1466
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr "ο/η <b>%s</b> έστειλε ένα ακατανόητο μήνυμα."
 
-#: calendar/gui/e-itip-control.c:1343
+#: calendar/gui/e-itip-control.c:1365
 msgid "Bad Meeting Message"
 msgstr "Εσφαλμένο Μήνυμα Συνάντησης"
 
-#: calendar/gui/e-itip-control.c:1367
+#: calendar/gui/e-itip-control.c:1389
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr "<b>%s</b> έχει δημοσιεύσει πληροφορίες εργασιών."
 
-#: calendar/gui/e-itip-control.c:1368
+#: calendar/gui/e-itip-control.c:1390
 msgid "Task Information"
 msgstr "Πληροφορίες Εργασιών"
 
-#: calendar/gui/e-itip-control.c:1373
+#: calendar/gui/e-itip-control.c:1395
 #, c-format
 msgid "<b>%s</b> requests %s to perform a task."
 msgstr "<b>%s</b> ζητάει από τον %s να εκτελέσει μια εργασία."
 
-#: calendar/gui/e-itip-control.c:1375
+#: calendar/gui/e-itip-control.c:1397
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr "<b>%s</b> σας έχει ζητήσει να εκτελέσετε μια εργασία"
 
-#: calendar/gui/e-itip-control.c:1376
+#: calendar/gui/e-itip-control.c:1398
 msgid "Task Proposal"
 msgstr "Πρόταση Εργασίας"
 
-#: calendar/gui/e-itip-control.c:1380
+#: calendar/gui/e-itip-control.c:1402
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task."
 msgstr "<b>%s</b> θα ήθελε να προσθέσει σε μια υπάρχουσα εργασία."
 
-#: calendar/gui/e-itip-control.c:1381
+#: calendar/gui/e-itip-control.c:1403
 msgid "Task Update"
 msgstr "Ανανέωση Εργασίας"
 
-#: calendar/gui/e-itip-control.c:1385
+#: calendar/gui/e-itip-control.c:1407
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr "<b>%s</b> θα ήθελε την τελευταία πληροφορία εργασιών."
 
-#: calendar/gui/e-itip-control.c:1386
+#: calendar/gui/e-itip-control.c:1408
 msgid "Task Update Request"
 msgstr "Αίτηση _Ανανέωση Εργασίας"
 
-#: calendar/gui/e-itip-control.c:1393
+#: calendar/gui/e-itip-control.c:1415
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr "<b>%s</b> απάντησε σε μια ανάθεση εργασίας"
 
-#: calendar/gui/e-itip-control.c:1394
+#: calendar/gui/e-itip-control.c:1416
 msgid "Task Reply"
 msgstr "Απάντηση Εργασίας"
 
-#: calendar/gui/e-itip-control.c:1401
+#: calendar/gui/e-itip-control.c:1423
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr "<b>%s</b> έχει ακυρώσει μια εργασία."
 
-#: calendar/gui/e-itip-control.c:1402
+#: calendar/gui/e-itip-control.c:1424
 msgid "Task Cancellation"
 msgstr "Ακύρωση Εργασίας"
 
-#: calendar/gui/e-itip-control.c:1410
+#: calendar/gui/e-itip-control.c:1432
 msgid "Bad Task Message"
 msgstr " Μήνυμα κακής εργασίας"
 
-#: calendar/gui/e-itip-control.c:1429
+#: calendar/gui/e-itip-control.c:1451
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr "<b>%s</b> έχει δημοσίευση πληροφορίες διαθεσιμότητας"
 
-#: calendar/gui/e-itip-control.c:1430
+#: calendar/gui/e-itip-control.c:1452
 msgid "Free/Busy Information"
 msgstr "Πληροφορίες Διαθεσιμότητας"
 
-#: calendar/gui/e-itip-control.c:1434
+#: calendar/gui/e-itip-control.c:1456
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr "ο/η <b>%s</b> ζητά πληροφορίες διαθεσιμότητας."
 
-#: calendar/gui/e-itip-control.c:1435
+#: calendar/gui/e-itip-control.c:1457
 msgid "Free/Busy Request"
 msgstr "Αίτηση Διαθεσιμότητας"
 
-#: calendar/gui/e-itip-control.c:1439
+#: calendar/gui/e-itip-control.c:1461
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr "ο/η <b>%s</b> απάντησε στην αίτηση διαθεσιμότητας."
 
-#: calendar/gui/e-itip-control.c:1440
+#: calendar/gui/e-itip-control.c:1462
 msgid "Free/Busy Reply"
 msgstr "Απάντηση Διαθεσιμότητας"
 
-#: calendar/gui/e-itip-control.c:1445
+#: calendar/gui/e-itip-control.c:1467
 msgid "Bad Free/Busy Message"
 msgstr "Εσφαλμένο Μήνυμα Διαθεσιμότητας"
 
-#: calendar/gui/e-itip-control.c:1521
+#: calendar/gui/e-itip-control.c:1543
 msgid "The message does not appear to be properly formed"
 msgstr "Αυτό το μήνυμα δεν φαίνεται να έχει συνταχθεί σωστά."
 
-#: calendar/gui/e-itip-control.c:1584
+#: calendar/gui/e-itip-control.c:1606
 msgid "The message contains only unsupported requests."
 msgstr "Το μήνυμα περιέχει μόνο αιτήσεις που δεν υποστηρίζονται"
 
-#: calendar/gui/e-itip-control.c:1615 calendar/gui/e-itip-control.c:1621
+#: calendar/gui/e-itip-control.c:1637
+#: calendar/gui/e-itip-control.c:1643
 msgid "The attachment does not contain a valid calendar message"
 msgstr "Το επισυναπτόμενο αρχείο δεν περιέχει έγκυρο αρχείο ημερολογίου"
 
-#: calendar/gui/e-itip-control.c:1646
+#: calendar/gui/e-itip-control.c:1668
 msgid "The attachment has no viewable calendar items"
-msgstr ""
-"Το επισυναπτόμενο αρχείο περιέχει στοιχεία που δεν μπορούν να προβληθούν"
+msgstr "Το επισυναπτόμενο αρχείο περιέχει στοιχεία που δεν μπορούν να προβληθούν"
 
-#: calendar/gui/e-itip-control.c:1887 calendar/gui/e-itip-control.c:1948
-#: calendar/gui/e-itip-control.c:1986
+#: calendar/gui/e-itip-control.c:1909
+#: calendar/gui/e-itip-control.c:2001
 msgid "Object is invalid and cannot be updated\n"
 msgstr "Το αντικείμενο δεν είναι έγκυρο και δεν μπορεί να ενημερωθεί\n"
 
-#: calendar/gui/e-itip-control.c:1890 calendar/gui/e-itip-control.c:1989
+#: calendar/gui/e-itip-control.c:1912
+#: calendar/gui/e-itip-control.c:2004
 msgid "There was an error on the CORBA system\n"
 msgstr "Υπήρξε σφάλμα στο σύστημα CORBA\n"
 
-#: calendar/gui/e-itip-control.c:1893 calendar/gui/e-itip-control.c:1992
+#: calendar/gui/e-itip-control.c:1915
+#: calendar/gui/e-itip-control.c:2007
 msgid "Object could not be found\n"
 msgstr "Δεν ήταν εύρεση του αντικειμένου\n"
 
-#: calendar/gui/e-itip-control.c:1896
+#: calendar/gui/e-itip-control.c:1918
 msgid "You do not have the right permissions to update the calendar\n"
 msgstr "Δεν έχετε τα απαραίτητα δικαιώματα για να ενημερώσετε το ημερολόγιο\n"
 
-#: calendar/gui/e-itip-control.c:1899
+#: calendar/gui/e-itip-control.c:1921
 msgid "Update complete\n"
 msgstr "Η ανανέωση ολοκληρώθηκε\n"
 
-#: calendar/gui/e-itip-control.c:1902
+#: calendar/gui/e-itip-control.c:1924
 msgid "Calendar file could not be updated!\n"
 msgstr "Δεν ήταν δυνατό να ανανεωθεί\n"
 
-#: calendar/gui/e-itip-control.c:1932 calendar/gui/e-itip-control.c:2004
+#: calendar/gui/e-itip-control.c:1953
+#: calendar/gui/e-itip-control.c:2019
 msgid "Attendee status can not be updated because the item no longer exists"
-msgstr ""
-"Δεν ήταν δυνατή η ανανέωση της κατάστασης παρευρισκομένων επειδή το στοιχείο "
-"δεν υπάρχει πλέον"
+msgstr "Δεν ήταν δυνατή η ανανέωση της κατάστασης παρευρισκομένων επειδή το στοιχείο δεν υπάρχει πλέον"
 
-#: calendar/gui/e-itip-control.c:1958
+#: calendar/gui/e-itip-control.c:1974
 msgid "This response is not from a current attendee.  Add as an attendee?"
-msgstr ""
-"Αυτή η απάντηση δεν είναι από ένα τρέχοντα παρευρισκόμενο. Να προστεθεί?"
+msgstr "Αυτή η απάντηση δεν είναι από ένα τρέχοντα παρευρισκόμενο. Να προστεθεί?"
 
-#: calendar/gui/e-itip-control.c:1970
+#: calendar/gui/e-itip-control.c:1986
 msgid "Attendee status could not be updated because of an invalid status!\n"
-msgstr ""
-"Δεν ήταν δυνατή η ανανεωθεί της κατάστασης παρευρισκομένων λόγο μιας μη "
-"έγκυρης κατάστασης\n"
+msgstr "Δεν ήταν δυνατή η ανανεωθεί της κατάστασης παρευρισκομένων λόγο μιας μη έγκυρης κατάστασης\n"
 
-#: calendar/gui/e-itip-control.c:1995
+#: calendar/gui/e-itip-control.c:2010
 msgid "You don't have the right permissions to update the calendar\n"
 msgstr "Δεν έχετε τα απαραίτητα δικαιώματα για να ενημερώσετε το ημερολόγιο\n"
 
-#: calendar/gui/e-itip-control.c:1998
+#: calendar/gui/e-itip-control.c:2013
 msgid "Attendee status updated\n"
 msgstr "Η κατάσταση παρευρισκομένων ανανεώθηκε\n"
 
-#: calendar/gui/e-itip-control.c:2001
+#: calendar/gui/e-itip-control.c:2016
 msgid "Attendee status could not be updated!\n"
 msgstr "Δεν ήταν δυνατή η ανανέωση της κατάστασης παρευρισκομένων\n"
 
-#: calendar/gui/e-itip-control.c:2038
+#: calendar/gui/e-itip-control.c:2053
 msgid "Removal Complete"
 msgstr "Η Αφαίρεση Ολοκληρώθηκε"
 
-#: calendar/gui/e-itip-control.c:2070 calendar/gui/e-itip-control.c:2120
+#: calendar/gui/e-itip-control.c:2085
+#: calendar/gui/e-itip-control.c:2135
 msgid "Item sent!\n"
 msgstr "Το στοιχείο στάλθηκε!\n"
 
-#: calendar/gui/e-itip-control.c:2072 calendar/gui/e-itip-control.c:2124
+#: calendar/gui/e-itip-control.c:2087
+#: calendar/gui/e-itip-control.c:2139
 msgid "The item could not be sent!\n"
 msgstr "Δεν ήταν δυνατή η αποστολή του στοιχείου!\n"
 
-#: calendar/gui/e-itip-control.c:2215
+#: calendar/gui/e-itip-control.c:2212
 msgid "Select Calendar Folder"
 msgstr "Επιλογή Φακέλου Ημερολογίου"
 
-#: calendar/gui/e-itip-control.c:2221
+#: calendar/gui/e-itip-control.c:2219
 msgid "Select Tasks Folder"
 msgstr "Επιλογή Φακέλου Εργασιών"
 
@@ -6034,167 +6083,211 @@ msgstr "ημερομηνία τέλους"
 msgid "date-start"
 msgstr "ημερομηνία έναρξης"
 
-#: calendar/gui/e-meeting-time-sel.c:392
+#: calendar/gui/e-meeting-model.c:79
+msgid "Chair Persons"
+msgstr "Άτομα Προεδρείου"
+
+#: calendar/gui/e-meeting-model.c:80
+#: calendar/gui/e-meeting-model.c:1636
+msgid "Required Participants"
+msgstr "Απαραίτητοι Συμμετέχοντες"
+
+#: calendar/gui/e-meeting-model.c:81
+msgid "Optional Participants"
+msgstr "Προαιρετικοί Συμμετέχοντες"
+
+#: calendar/gui/e-meeting-model.c:82
+msgid "Resources"
+msgstr "Πόροι"
+
+#: calendar/gui/e-meeting-model.c:197
+#: calendar/gui/e-meeting-model.c:214
+#: calendar/gui/e-meeting-model.c:530
+#: calendar/gui/e-meeting-model.c:752
+msgid "Individual"
+msgstr "Άτομο"
+
+#: calendar/gui/e-meeting-model.c:199
+#: calendar/gui/e-meeting-model.c:216
+#: calendar/gui/e-meeting-model.c:753
+msgid "Group"
+msgstr "Ομάδα"
+
+#: calendar/gui/e-meeting-model.c:201
+#: calendar/gui/e-meeting-model.c:218
+#: calendar/gui/e-meeting-model.c:754
+msgid "Resource"
+msgstr "Πόρος"
+
+#: calendar/gui/e-meeting-model.c:203
+#: calendar/gui/e-meeting-model.c:220
+#: calendar/gui/e-meeting-model.c:755
+msgid "Room"
+msgstr "Αίθουσα"
+
+#: calendar/gui/e-meeting-model.c:232
+#: calendar/gui/e-meeting-model.c:249
+#: calendar/gui/e-meeting-model.c:768
+msgid "Chair"
+msgstr "Προεδρείο"
+
+#: calendar/gui/e-meeting-model.c:234
+#: calendar/gui/e-meeting-model.c:251
+#: calendar/gui/e-meeting-model.c:532
+#: calendar/gui/e-meeting-model.c:769
+msgid "Required Participant"
+msgstr "Απαραίτητος Συμμετέχων"
+
+#: calendar/gui/e-meeting-model.c:236
+#: calendar/gui/e-meeting-model.c:253
+#: calendar/gui/e-meeting-model.c:770
+msgid "Optional Participant"
+msgstr "Προαιρετικός Συμμετέχων"
+
+#: calendar/gui/e-meeting-model.c:238
+#: calendar/gui/e-meeting-model.c:255
+#: calendar/gui/e-meeting-model.c:771
+msgid "Non-Participant"
+msgstr "Μη-Συμμετέχων"
+
+#: calendar/gui/e-meeting-model.c:284
+#: calendar/gui/e-meeting-model.c:307
+#: calendar/gui/e-meeting-model.c:540
+#: calendar/gui/e-meeting-model.c:797
+msgid "Needs Action"
+msgstr "Απαιτεί Ενέργεια"
+
+#: calendar/gui/e-meeting-model.c:290
+#: calendar/gui/e-meeting-model.c:313
+#: calendar/gui/e-meeting-model.c:800
+#: calendar/gui/e-meeting-time-sel.c:405
 msgid "Tentative"
 msgstr "Δοκιμαστικά"
 
-#: calendar/gui/e-meeting-time-sel.c:394 designs/OOA/ooa.glade.h:11
+#: calendar/gui/e-meeting-model.c:292
+#: calendar/gui/e-meeting-model.c:315
+#: calendar/gui/e-meeting-model.c:801
+msgid "Delegated"
+msgstr "Εξουσιοδοτήθηκε"
+
+#: calendar/gui/e-meeting-model.c:296
+#: calendar/gui/e-meeting-model.c:319
+msgid "In Process"
+msgstr "Σε Εξέλιξη"
+
+#. This is a strftime() format string %A = full weekday name,
+#. %B = full month name, %d = month day, %Y = full year.
+#: calendar/gui/e-meeting-time-sel-item.c:458
+#: calendar/gui/e-meeting-time-sel.c:2098
+msgid "%A, %B %d, %Y"
+msgstr "%A, %d %B, %Y"
+
+#. This is a strftime() format string %a = abbreviated weekday
+#. name, %m = month number, %d = month day, %Y = full year.
+#: calendar/gui/e-meeting-time-sel-item.c:462
+#: calendar/gui/e-meeting-time-sel.c:2131
+#: e-util/e-time-utils.c:190
+#: e-util/e-time-utils.c:283
+#: e-util/e-time-utils.c:371
+msgid "%a %m/%d/%Y"
+msgstr "%a %d/%m/%Y"
+
+#. This is a strftime() format string %m = month number,
+#. %d = month day, %Y = full year.
+#: calendar/gui/e-meeting-time-sel-item.c:466
+#: e-util/e-time-utils.c:225
+#: e-util/e-time-utils.c:286
+#: widgets/misc/e-dateedit.c:1582
+msgid "%m/%d/%Y"
+msgstr "%d/%m/%Y"
+
+#: calendar/gui/e-meeting-time-sel.c:407
+#: designs/OOA/ooa.glade.h:11
 msgid "Out of Office"
 msgstr "Εκτός Γραφείου"
 
-#: calendar/gui/e-meeting-time-sel.c:395
+#: calendar/gui/e-meeting-time-sel.c:408
 msgid "No Information"
 msgstr "Χωρίς Πληροφόρηση"
 
-#: calendar/gui/e-meeting-time-sel.c:434
+#: calendar/gui/e-meeting-time-sel.c:447
 msgid "_Options"
 msgstr "_Επιλογές"
 
-#: calendar/gui/e-meeting-time-sel.c:451
+#: calendar/gui/e-meeting-time-sel.c:464
 msgid "Show _Only Working Hours"
 msgstr "Εμφάνιση _μόνο των ωρών Εργασίας"
 
-#: calendar/gui/e-meeting-time-sel.c:461
+#: calendar/gui/e-meeting-time-sel.c:474
 msgid "Show _Zoomed Out"
 msgstr "Εμφάνιση _Σμίκρυνσης"
 
-#: calendar/gui/e-meeting-time-sel.c:476
+#: calendar/gui/e-meeting-time-sel.c:489
 msgid "_Update Free/Busy"
 msgstr "Ανα_νέωση Διαθεσιμότητας"
 
-#: calendar/gui/e-meeting-time-sel.c:491
+#: calendar/gui/e-meeting-time-sel.c:504
 msgid "_<<"
 msgstr "_<<"
 
-#: calendar/gui/e-meeting-time-sel.c:509
+#: calendar/gui/e-meeting-time-sel.c:522
 msgid "_Autopick"
 msgstr "_Αυτόματη επιλογή"
 
-#: calendar/gui/e-meeting-time-sel.c:524
+#: calendar/gui/e-meeting-time-sel.c:537
 msgid ">_>"
 msgstr ">_>"
 
-#: calendar/gui/e-meeting-time-sel.c:541
+#: calendar/gui/e-meeting-time-sel.c:554
 msgid "_All People and Resources"
 msgstr "Όλα _τα Άτομα και οι Πόροι"
 
-#: calendar/gui/e-meeting-time-sel.c:550
+#: calendar/gui/e-meeting-time-sel.c:563
 msgid "All _People and One Resource"
 msgstr "Όλα τα Άτομα και Ένας _Πόρος"
 
-#: calendar/gui/e-meeting-time-sel.c:559
+#: calendar/gui/e-meeting-time-sel.c:572
 msgid "_Required People"
 msgstr "_Απαιτούμενα Άτομα"
 
-#: calendar/gui/e-meeting-time-sel.c:568
+#: calendar/gui/e-meeting-time-sel.c:581
 msgid "Required People and _One Resource"
 msgstr "Απαιτούμενα Άτομα και _Ένας Πόρος"
 
-#: calendar/gui/e-meeting-time-sel.c:587
+#: calendar/gui/e-meeting-time-sel.c:600
 msgid "Meeting _start time:"
 msgstr "Χρόνος έ_ναρξης συνάντησης:"
 
-#: calendar/gui/e-meeting-time-sel.c:607
+#: calendar/gui/e-meeting-time-sel.c:620
 msgid "Meeting _end time:"
 msgstr "Χρόνος _περάτωσης συνάντησης:"
 
-#. This is a strftime() format string %A = full weekday name,
-#. %B = full month name, %d = month day, %Y = full year.
-#: calendar/gui/e-meeting-time-sel.c:2054
-#: calendar/gui/e-meeting-time-sel-item.c:452
-msgid "%A, %B %d, %Y"
-msgstr "%A, %d %B, %Y"
-
-#. This is a strftime() format string %a = abbreviated weekday name,
-#. %m = month number, %d = month day, %Y = full year.
-#: calendar/gui/e-meeting-time-sel.c:2087
-#: calendar/gui/e-meeting-time-sel-item.c:456 e-util/e-time-utils.c:203
-#: e-util/e-time-utils.c:296 e-util/e-time-utils.c:384
-msgid "%a %m/%d/%Y"
-msgstr "%a %d/%m/%Y"
-
-#: calendar/gui/e-meeting-time-sel.etspec.h:1
-msgid "Attendee"
-msgstr "Παρευρισκόμενος"
-
-#: calendar/gui/e-meeting-time-sel.etspec.h:2
-msgid "Click here to add an attendee"
-msgstr "Κάντε κλικ εδώ για να προσθέσετε έναν παρευρισκόμενο"
-
-#: calendar/gui/e-meeting-time-sel.etspec.h:3
-msgid "Common Name"
-msgstr "Κοινό Όνομα"
-
-#: calendar/gui/e-meeting-time-sel.etspec.h:4
-msgid "Delegated From"
-msgstr "Εξουσιοδοτημένος Από"
-
-#: calendar/gui/e-meeting-time-sel.etspec.h:5
-msgid "Delegated To"
-msgstr "Εξουσιοδότηση Σε"
-
-#: calendar/gui/e-meeting-time-sel.etspec.h:6
-msgid "Language"
-msgstr "Γλώσσα"
-
-#: calendar/gui/e-meeting-time-sel.etspec.h:7
-msgid "Member"
-msgstr "Μέλος"
-
-#. This is a strftime() format string %m = month number,
-#. %d = month day, %Y = full year.
-#: calendar/gui/e-meeting-time-sel-item.c:460 e-util/e-time-utils.c:238
-#: e-util/e-time-utils.c:299 widgets/misc/e-dateedit.c:1607
-msgid "%m/%d/%Y"
-msgstr "%d/%m/%Y"
-
-#: calendar/gui/e-tasks.c:151
-msgid "invalid time"
-msgstr "μη-έγκυρη ώρα"
-
-#: calendar/gui/e-tasks.c:221
-#, fuzzy
-msgid "Start Date:"
-msgstr "Ημερομηνία Έ_ναρξης:"
-
-#: calendar/gui/e-tasks.c:237
-#, fuzzy
-msgid "Due Date:"
-msgstr "Ημερομηνία _Λήξης:"
-
-#. write priority
-#: calendar/gui/e-tasks.c:265
-#, fuzzy
-msgid "Priority:"
-msgstr "_Προτεραιότητα"
-
-#. URL
-#: calendar/gui/e-tasks.c:321
-#, fuzzy
-msgid "Web Page:"
-msgstr "Σελίδα"
-
-#: calendar/gui/e-tasks.c:702
+#: calendar/gui/e-tasks.c:360
+#: calendar/gui/gnome-cal.c:2006
+#: calendar/gui/gnome-cal.c:2017
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Άνοιγμα ενεργειών στο %s"
 
-#: calendar/gui/e-tasks.c:731 calendar/gui/tasks-control.c:201
+#: calendar/gui/e-tasks.c:389
+#: calendar/gui/tasks-control.c:200
 #, c-format
 msgid "Could not load the tasks in `%s'"
 msgstr "Αδύνατη η φόρτωση ενεργειών στο `%s'"
 
-#: calendar/gui/e-tasks.c:746
+#: calendar/gui/e-tasks.c:404
 #, c-format
 msgid "The method required to load `%s' is not supported"
 msgstr "Η μέθοδος που απαιτείται για την φόρτωση του '%s' δεν υποστηρίζεται"
 
-#: calendar/gui/e-tasks.c:760 calendar/gui/gnome-cal.c:1730
+#: calendar/gui/e-tasks.c:418
+#: calendar/gui/gnome-cal.c:1509
 #, c-format
 msgid "You don't have permission to open the folder in `%s'"
 msgstr "Δεν έχετε τα απαραίτητα δικαιώματα για να ανοίξετε τον φάκελο στο`%s'"
 
-#: calendar/gui/e-tasks.c:828 calendar/gui/gnome-cal.c:1944
+#: calendar/gui/e-tasks.c:486
+#: calendar/gui/gnome-cal.c:1728
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -6203,112 +6296,68 @@ msgstr ""
 "Σφάλμα στο  %s:\n"
 " %s"
 
-#: calendar/gui/e-tasks.c:899
+#: calendar/gui/e-tasks.c:557
 msgid "Completing tasks..."
 msgstr "Ολοκλήρωση εργασιών..."
 
-#: calendar/gui/e-tasks.c:922
+#: calendar/gui/e-tasks.c:580
 msgid "Deleting selected objects..."
 msgstr "Διαγραφή επιλεγμένων αντικειμένων..."
 
-#: calendar/gui/e-tasks.c:1017
+#: calendar/gui/e-tasks.c:675
 msgid "Expunging"
 msgstr "Εξάλειψη"
 
-#: calendar/gui/gnome-cal.c:1702
+#: calendar/gui/e-week-view.c:3581
+msgid "New _Appointment..."
+msgstr "Νέο _Ραντεβού..."
+
+#: calendar/gui/gnome-cal.c:1481
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr "Αδύνατο το άνοιγμα φακέλου στο `%s'"
 
-#: calendar/gui/gnome-cal.c:1716
+#: calendar/gui/gnome-cal.c:1495
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr "Η μέθοδος που απαιτείται για την άνοιγμα του '%s' δεν υποστηρίζεται"
 
-#: calendar/gui/gnome-cal.c:1772
+#: calendar/gui/gnome-cal.c:1556
 #, c-format
 msgid "Adding alarms for %s"
 msgstr "Προσθήκη ειδοποιήσεων για %s"
 
-#: calendar/gui/gnome-cal.c:1964
+#: calendar/gui/gnome-cal.c:1748
 #, c-format
 msgid ""
-"The task backend for\n"
+"The calendar backend for\n"
 "%s\n"
 " has crashed. You will have to restart Evolution in order to use it again"
 msgstr ""
-"Το backend εργασίας για\n"
+"Το backend ημερολογίου για\n"
 "%s\n"
-"έχει κολλήσει. Θα πρέπει να επανεκκινήσετε το Evolution για να το "
-"χρησιμοποιήσετε ξανά"
+"έχει κολλήσει. Θα πρέπει να επανεκκινήσετε το Evolution για να το χρησιμοποιήσετε ξανά"
 
-#: calendar/gui/gnome-cal.c:1970
+#: calendar/gui/gnome-cal.c:1757
 #, c-format
 msgid ""
-"The calendar backend for\n"
+"The task backend for\n"
 "%s\n"
 " has crashed. You will have to restart Evolution in order to use it again"
 msgstr ""
-"Το backend ημερολογίου για\n"
+"Το backend εργασίας για\n"
 "%s\n"
-"έχει κολλήσει. Θα πρέπει να επανεκκινήσετε το Evolution για να το "
-"χρησιμοποιήσετε ξανά"
+"έχει κολλήσει. Θα πρέπει να επανεκκινήσετε το Evolution για να το χρησιμοποιήσετε ξανά"
 
-#: calendar/gui/gnome-cal.c:2176
+#: calendar/gui/gnome-cal.c:1988
 #, c-format
 msgid "Opening calendar at %s"
 msgstr "Άνοιγμα ημερολογίου στο %s"
 
-#: calendar/gui/gnome-cal.c:2197
+#: calendar/gui/gnome-cal.c:2028
 msgid "Opening default tasks folder"
 msgstr "Άνοιγμα φακέλου εξ ορισμού εργασιών"
 
-#: calendar/gui/gnome-cal.c:3094
-#, fuzzy, c-format
-msgid "Purging event %s"
-msgstr "Pinging %s"
-
-#: calendar/gui/gnome-cal.c:3178
-#, fuzzy
-msgid "Purging"
-msgstr "Τουρίν"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-msgid "Calendar and Tasks"
-msgstr "Ημερολόγιο και Εργασίες"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-msgid "Configure your timezone, Calendar and Task List here "
-msgstr "Ρυθμίστε εδώ την Ζώνη ώρας, Ημερολόγιο και Λίστα Εργασιών σας."
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
-msgid "Evolution Calendar and Tasks"
-msgstr "Ημερολόγιο και Εργασίες του Evolution"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
-msgid "Evolution Calendar and Tasks component"
-msgstr "Στοιχείο ημερολογίου και εργασιών του Evolution"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
-msgid "Evolution Calendar configuration control"
-msgstr "Έλεγχος ρυθμίσεων του ημερολογίου του Evolution"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
-msgid "Evolution Calendar scheduling message viewer"
-msgstr "Εφαρμογή προβολής μυνημάτων ραντεβού του ημερολογίου του Evolution"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
-msgid "Evolution Calendar viewer"
-msgstr "Εφαρμογή προβολής ημερολογίου Evolution"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
-msgid "Evolution Calendar/Task editor"
-msgstr "Επεξεργαστής ημερολογίου/εργασιών του Evolution"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
-msgid "Evolution Tasks viewer"
-msgstr "Εφαρμογή προβολής εργασιών του Evolution "
-
 #: calendar/gui/goto-dialog.glade.h:1
 msgid "April"
 msgstr "Απρίλιος"
@@ -6365,7 +6414,8 @@ msgstr "Οκτώβριος"
 msgid "September"
 msgstr "Σεπτέμβριος"
 
-#: calendar/gui/itip-utils.c:263 calendar/gui/itip-utils.c:311
+#: calendar/gui/itip-utils.c:263
+#: calendar/gui/itip-utils.c:311
 #: calendar/gui/itip-utils.c:343
 msgid "An organizer must be set."
 msgstr "Πρέπει να ορίσετε έναν διοργανωτή."
@@ -6374,19 +6424,23 @@ msgstr "Πρέπει να ορίσετε έναν διοργανωτή."
 msgid "At least one attendee is necessary"
 msgstr "Απαιτείται τουλάχιστον ένας παρευρισκόμενος"
 
-#: calendar/gui/itip-utils.c:386 calendar/gui/itip-utils.c:495
+#: calendar/gui/itip-utils.c:386
+#: calendar/gui/itip-utils.c:495
 msgid "Event information"
 msgstr "Πληροφορίες Γεγονότος"
 
-#: calendar/gui/itip-utils.c:388 calendar/gui/itip-utils.c:497
+#: calendar/gui/itip-utils.c:388
+#: calendar/gui/itip-utils.c:497
 msgid "Task information"
 msgstr "Πληροφορίες Εργασιών"
 
-#: calendar/gui/itip-utils.c:390 calendar/gui/itip-utils.c:499
+#: calendar/gui/itip-utils.c:390
+#: calendar/gui/itip-utils.c:499
 msgid "Journal information"
 msgstr "Πληροφορίες Ημερολογίου"
 
-#: calendar/gui/itip-utils.c:392 calendar/gui/itip-utils.c:517
+#: calendar/gui/itip-utils.c:392
+#: calendar/gui/itip-utils.c:517
 msgid "Free/Busy information"
 msgstr "Πληροφορία Διαθεσιμότητας"
 
@@ -6415,139 +6469,142 @@ msgstr "Πληροφορία Διαθεσιμότητας (%s έως %s)"
 msgid "iCalendar information"
 msgstr "Πληροφορίες iCalendar"
 
-#: calendar/gui/itip-utils.c:668
+#: calendar/gui/itip-utils.c:667
 msgid "You must be an attendee of the event."
 msgstr "Πρέπει να είστε παρευρισκόμενος για αυτό το γεγονός."
 
-#: calendar/gui/print.c:547
+#: calendar/gui/print.c:549
 msgid "Su"
 msgstr "Κυ"
 
-#: calendar/gui/print.c:547
+#: calendar/gui/print.c:549
 msgid "Mo"
 msgstr "Δε"
 
-#: calendar/gui/print.c:547
+#: calendar/gui/print.c:549
 msgid "Tu"
 msgstr "Τρ"
 
-#: calendar/gui/print.c:547
+#: calendar/gui/print.c:549
 msgid "We"
 msgstr "Τε"
 
-#: calendar/gui/print.c:548
+#: calendar/gui/print.c:550
 msgid "Th"
 msgstr "Πε"
 
-#: calendar/gui/print.c:548
+#: calendar/gui/print.c:550
 msgid "Fr"
 msgstr "Πα"
 
-#: calendar/gui/print.c:548
+#: calendar/gui/print.c:550
 msgid "Sa"
 msgstr "Σα"
 
 #. Day
-#: calendar/gui/print.c:1882
+#: calendar/gui/print.c:1877
 msgid "Selected day (%a %b %d %Y)"
 msgstr "Επιλεγμένη ημέρα (%a %d %b %Y)"
 
-#: calendar/gui/print.c:1907 calendar/gui/print.c:1911
+#: calendar/gui/print.c:1902
+#: calendar/gui/print.c:1906
 msgid "%a %b %d"
 msgstr "%a %d %b"
 
-#: calendar/gui/print.c:1908
+#: calendar/gui/print.c:1903
 msgid "%a %d %Y"
 msgstr "%a %d %Y"
 
-#: calendar/gui/print.c:1912 calendar/gui/print.c:1914
-#: calendar/gui/print.c:1915
+#: calendar/gui/print.c:1907
+#: calendar/gui/print.c:1909
+#: calendar/gui/print.c:1910
 msgid "%a %b %d %Y"
 msgstr "%a %d %b %Y"
 
-#: calendar/gui/print.c:1919
+#: calendar/gui/print.c:1914
 #, c-format
 msgid "Selected week (%s - %s)"
 msgstr "Επιλεγμένη εβδομάδα (%s - %s)"
 
 #. Month
-#: calendar/gui/print.c:1927
+#: calendar/gui/print.c:1922
 msgid "Selected month (%b %Y)"
 msgstr "Επιλεγμένος μήνας (%b %Y)"
 
 #. Year
-#: calendar/gui/print.c:1934
+#: calendar/gui/print.c:1929
 msgid "Selected year (%Y)"
 msgstr "Επιλεγμένο έτος (%Y)"
 
-#: calendar/gui/print.c:2262
+#: calendar/gui/print.c:2257
 msgid "Task"
 msgstr "Εργασία"
 
-#: calendar/gui/print.c:2321
+#: calendar/gui/print.c:2316
 #, c-format
 msgid "Status: %s"
 msgstr "_Κατάσταση: %s"
 
-#: calendar/gui/print.c:2338
+#: calendar/gui/print.c:2333
 #, c-format
 msgid "Priority: %s"
 msgstr "Προτεραιότητα: %s"
 
-#: calendar/gui/print.c:2350
+#: calendar/gui/print.c:2345
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "%i Ολοκληρωμένο"
 
-#: calendar/gui/print.c:2362
+#: calendar/gui/print.c:2357
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: calendar/gui/print.c:2376
+#: calendar/gui/print.c:2371
 #, c-format
 msgid "Categories: %s"
 msgstr "Κατηγορίες: %s"
 
-#: calendar/gui/print.c:2387
+#: calendar/gui/print.c:2382
 msgid "Contacts: "
 msgstr "Επαφές: "
 
-#: calendar/gui/print.c:2525 calendar/gui/print.c:2611
-#: calendar/gui/tasks-control.c:564 my-evolution/e-summary.c:649
+#: calendar/gui/print.c:2520
+#: calendar/gui/print.c:2606
+#: calendar/gui/tasks-control.c:571
+#: mail/mail-callbacks.c:2947
+#: my-evolution/e-summary.c:649
 msgid "Print Preview"
 msgstr "Προεπισκόπηση Εκτύπωσης"
 
-#: calendar/gui/print.c:2559
+#: calendar/gui/print.c:2554
 msgid "Print Item"
 msgstr "Εκτύπωση Στοιχείου"
 
-#: calendar/gui/print.c:2632
+#: calendar/gui/print.c:2627
 msgid "Print Setup"
 msgstr "Ρυθμίσεις Εκτύπωσης"
 
-#: calendar/gui/tasks-control.c:152
+#: calendar/gui/tasks-control.c:151
 msgid "The URI of the tasks folder to display"
 msgstr "Το URI του φακέλου ενεργειών προς εμφάνιση"
 
-#: calendar/gui/tasks-control.c:448
+#: calendar/gui/tasks-control.c:464
 msgid ""
-"This operation will permanently erase all tasks marked as completed. If you "
-"continue, you will not be able to recover these tasks.\n"
+"This operation will permanently erase all tasks marked as completed. If you continue, you will not be able to recover these tasks.\n"
 "\n"
 "Really erase these tasks?"
 msgstr ""
-"Με αυτή την λειτουργία θα διαγράψετε μόνιμα όλες τις εργασίες που έχετε "
-"σημειώσει ως ολοκληρωμένες. Αν συνεχίσετε,\n"
+"Με αυτή την λειτουργία θα διαγράψετε μόνιμα όλες τις εργασίες που έχετε σημειώσει ως ολοκληρωμένες. Αν συνεχίσετε,\n"
 " δεν θα μπορέσετε να τα ανακτήσετε.\n"
 "\n"
 "Είστε βέβαιοι για την διαγραφή των μηνυμάτων;"
 
-#: calendar/gui/tasks-control.c:451
+#: calendar/gui/tasks-control.c:467
 msgid "Do not ask me again."
 msgstr "Να μην ξαναγίνει η ερώτηση."
 
-#: calendar/gui/tasks-control.c:593
+#: calendar/gui/tasks-control.c:600
 msgid "Print Tasks"
 msgstr "Εργασίες Εκτύπωσης"
 
@@ -6618,9 +6675,7 @@ msgstr "αναγκαστική αναμονή του χρόνου να είνα�
 
 #: calendar/pcs/query.c:326
 msgid "make-time argument 1 must be an ISO 8601 date/time string"
-msgstr ""
-"αναγκαστικά η παράμετρος χρόνου 1 να είναι στοιχείο ημερομηνία/χρόνος ISO "
-"8601"
+msgstr "αναγκαστικά η παράμετρος χρόνου 1 να είναι στοιχείο ημερομηνία/χρόνος ISO 8601"
 
 #: calendar/pcs/query.c:355
 msgid "time-add-day expects 2 arguments"
@@ -6633,8 +6688,7 @@ msgstr "time-add-day αναμένει argument 1 to be a time_t"
 
 #: calendar/pcs/query.c:367
 msgid "time-add-day expects argument 2 to be an integer"
-msgstr ""
-"η προσθήκη χρόνου ημέρας αναμένεται να έχει ως παράμετρο 2 έναν ακέραιο"
+msgstr "η προσθήκη χρόνου ημέρας αναμένεται να έχει ως παράμετρο 2 έναν ακέραιο"
 
 #: calendar/pcs/query.c:394
 msgid "time-day-begin expects 1 argument"
@@ -6684,24 +6738,16 @@ msgid "contains? expects argument 2 to be a string"
 msgstr "περιέχει? αναμένει ότι η παράμετρος 2 είναι αλφαριθμητικό"
 
 #: calendar/pcs/query.c:734
-msgid ""
-"contains? expects argument 1 to be one of \"any\", \"summary\", \"description"
-"\""
-msgstr ""
-"περιέχει? αναμένει ότι η παράμετρος 1 είναι ένα από \"any\", \"summary\", "
-"\"description\""
+msgid "contains? expects argument 1 to be one of \"any\", \"summary\", \"description\""
+msgstr "περιέχει? αναμένει ότι η παράμετρος 1 είναι ένα από \"any\", \"summary\", \"description\""
 
 #: calendar/pcs/query.c:776
 msgid "has-categories? expects at least 1 argument"
 msgstr "έχει-κατηγορίες? αναμένει τουλάχιστον 1 παράμετρο"
 
 #: calendar/pcs/query.c:788
-msgid ""
-"has-categories? expects all arguments to be strings or one and only one "
-"argument to be a boolean false (#f)"
-msgstr ""
-"έχει-κατηγορίες? αναμένει ότι όλες οι παράμετροι θα είναι αλφαριθμητικά ή "
-"μια και μόνο μια παράμετρος θα είναι  boolean false (#f)"
+msgid "has-categories? expects all arguments to be strings or one and only one argument to be a boolean false (#f)"
+msgstr "έχει-κατηγορίες? αναμένει ότι όλες οι παράμετροι θα είναι αλφαριθμητικά ή μια και μόνο μια παράμετρος θα είναι  boolean false (#f)"
 
 #: calendar/pcs/query.c:876
 msgid "is-completed? expects 0 arguments"
@@ -8252,27 +8298,27 @@ msgstr "Ειρηνικός/Γουάλις"
 msgid "Pacific/Yap"
 msgstr "Ειρηνικός/ Γιάπ"
 
-#: camel/camel-cipher-context.c:167
+#: camel/camel-cipher-context.c:178
 msgid "Signing is not supported by this cipher"
 msgstr "Η υπογραφή δεν υποστηρίζεται από αυτό το cipher"
 
-#: camel/camel-cipher-context.c:207
+#: camel/camel-cipher-context.c:218
 msgid "Verifying is not supported by this cipher"
 msgstr "Η επαλήθευση δεν υποστηρίζεται από αυτό το cipher"
 
-#: camel/camel-cipher-context.c:251
+#: camel/camel-cipher-context.c:262
 msgid "Encryption is not supported by this cipher"
 msgstr "Η κρυπτογράφηση δεν υποστηρίζεται από αυτό το cipher"
 
-#: camel/camel-cipher-context.c:293
+#: camel/camel-cipher-context.c:304
 msgid "Decryption is not supported by this cipher"
 msgstr "Η αποκρυπτογράφηση δεν υποστηρίζεται από αυτό το cipher"
 
-#: camel/camel-cipher-context.c:331
+#: camel/camel-cipher-context.c:342
 msgid "You may not import keys with this cipher"
 msgstr "Δεν μπορεί να εισάγετε κλειδιά αυτό το cipher"
 
-#: camel/camel-cipher-context.c:363
+#: camel/camel-cipher-context.c:374
 msgid "You may not export keys with this cipher"
 msgstr "Δεν μπορεί να εξάγετε κλειδιά αυτό το cipher"
 
@@ -8311,83 +8357,85 @@ msgstr ""
 msgid "Resynchronizing with server"
 msgstr "Ξανασυγχρονισμός με τον διακομιστή"
 
-#: camel/camel-disco-folder.c:90
-msgid "Downloading new messages for offline mode"
-msgstr ""
-
-#: camel/camel-disco-folder.c:351
+#: camel/camel-disco-folder.c:278
 #, c-format
 msgid "Preparing folder '%s' for offline"
 msgstr "Προετοιμασία φακέλου  '%s' για εργασία χωρίς σύνδεση"
 
 #: camel/camel-disco-store.c:367
 msgid "You must be working online to complete this operation"
-msgstr ""
-"Πρέπει να είστε συνδεμένοι στο δίκτυο για να ολοκληρωθεί αυτή η διαδικασία"
+msgstr "Πρέπει να είστε συνδεμένοι στο δίκτυο για να ολοκληρωθεί αυτή η διαδικασία"
 
-#: camel/camel-filter-driver.c:667 camel/camel-filter-search.c:511
+#: camel/camel-filter-driver.c:667
+#: camel/camel-filter-search.c:511
 #: camel/camel-process.c:48
 #, c-format
 msgid "Failed to create pipe to '%s': %s"
 msgstr "Δεν ήταν δυνατή η δημιουργία σωλήνωσης σε  '%s': %s"
 
-#: camel/camel-filter-driver.c:715 camel/camel-filter-search.c:551
+#: camel/camel-filter-driver.c:715
+#: camel/camel-filter-search.c:551
 #: camel/camel-process.c:92
 #, c-format
 msgid "Failed to create create child process '%s': %s"
 msgstr "Δεν ήταν δυνατή η  δημιουργία θυγατρικης διεργασίας  '%s': %s"
 
-#: camel/camel-filter-driver.c:759
+#: camel/camel-filter-driver.c:744
 #, fuzzy, c-format
 msgid "Invalid message stream received from %s: %s"
 msgstr "Αδυναμία ανάγνωσης χαιρετισμού από %s: %s"
 
-#: camel/camel-filter-driver.c:940 camel/camel-filter-driver.c:949
+#: camel/camel-filter-driver.c:923
+#: camel/camel-filter-driver.c:932
 msgid "Syncing folders"
 msgstr "Συγχρονισμός φακέλων"
 
-#: camel/camel-filter-driver.c:1038 camel/camel-filter-driver.c:1411
+#: camel/camel-filter-driver.c:1021
+#: camel/camel-filter-driver.c:1394
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Σφάλμα στην ανάλυση φίλτρου: %s: %s"
 
-#: camel/camel-filter-driver.c:1047 camel/camel-filter-driver.c:1417
+#: camel/camel-filter-driver.c:1030
+#: camel/camel-filter-driver.c:1400
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Σφάλμα στην εκτέλεση φίλτρου: %s: %s"
 
-#: camel/camel-filter-driver.c:1114
+#: camel/camel-filter-driver.c:1097
 msgid "Unable to open spool folder"
 msgstr "Αδυναμία ανοίγματος φακέλου spool"
 
-#: camel/camel-filter-driver.c:1123
+#: camel/camel-filter-driver.c:1106
 msgid "Unable to process spool folder"
 msgstr "Αδυναμία ανάλυσης φακέλου spool"
 
-#: camel/camel-filter-driver.c:1138
+#: camel/camel-filter-driver.c:1121
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "Λήψη μηνύματος %d (%d%%)"
 
-#: camel/camel-filter-driver.c:1142
+#: camel/camel-filter-driver.c:1125
 msgid "Cannot open message"
 msgstr "Δεν ήταν δυνατό το άνοιγμα του μηνύματος"
 
-#: camel/camel-filter-driver.c:1143 camel/camel-filter-driver.c:1155
+#: camel/camel-filter-driver.c:1126
+#: camel/camel-filter-driver.c:1138
 #, c-format
 msgid "Failed on message %d"
 msgstr "Αποτυχία στο μήνυμα %d"
 
-#: camel/camel-filter-driver.c:1169 camel/camel-filter-driver.c:1263
+#: camel/camel-filter-driver.c:1152
+#: camel/camel-filter-driver.c:1246
 msgid "Syncing folder"
 msgstr "Συγχρονισμός φακέλου"
 
-#: camel/camel-filter-driver.c:1230
+#: camel/camel-filter-driver.c:1213
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "Λήψη μηνύματος %d από %d"
 
-#: camel/camel-filter-driver.c:1245
+#: camel/camel-filter-driver.c:1228
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "Αποτυχία στο μήνυμα %d από %d"
@@ -8404,41 +8452,13 @@ msgstr "Μη έγκυρες παράμετροι σε  (system-flag)"
 msgid "Invalid arguments to (user-tag)"
 msgstr "Μη έγκυρη παράμετρος σε (user-tag)"
 
-#: camel/camel-filter-search.c:657 camel/camel-filter-search.c:665
+#: camel/camel-filter-search.c:657
+#: camel/camel-filter-search.c:665
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "Σφάλμα στην εκτέλεση αναζήτησης φίλτρου: %s: %s"
 
-#: camel/camel-folder.c:585
-#, c-format
-msgid "Unsupported operation: append message: for %s"
-msgstr "Μη υποστηριζόμενη λειτουργία : προθήκη μηνύματος: για  %s"
-
-#: camel/camel-folder.c:1163
-#, c-format
-msgid "Unsupported operation: search by expression: for %s"
-msgstr "Μη υποστηριζόμενη λειτουργία: αναζήτηση βάσει έκφρασης: για %s"
-
-#: camel/camel-folder.c:1203
-#, c-format
-msgid "Unsupported operation: search by uids: for %s"
-msgstr ""
-"Μη υποστηριζόμενη λειτουργία: αναζήτηση βάσει ταυτοτήτων χρήστη: για %s"
-
-#: camel/camel-folder.c:1321
-msgid "Moving messages"
-msgstr "Μετακίνηση μηνυμάτων"
-
-#: camel/camel-folder.c:1321
-msgid "Copying messages"
-msgstr "Αντιγραφή μηνυμάτων"
-
-#: camel/camel-folder.c:1571
-#, fuzzy
-msgid "Filtering new message(s)"
-msgstr "Παραλαμβάνονται %d μήνυμα(τα)"
-
-#: camel/camel-folder-search.c:348
+#: camel/camel-folder-search.c:346
 #, c-format
 msgid ""
 "Cannot parse search expression: %s:\n"
@@ -8447,7 +8467,7 @@ msgstr ""
 "Αδυναμία ανάλυσης έκφρασης αναζήτησης: %s:\n"
 "%s"
 
-#: camel/camel-folder-search.c:358
+#: camel/camel-folder-search.c:356
 #, c-format
 msgid ""
 "Error executing search expression: %s:\n"
@@ -8456,15 +8476,39 @@ msgstr ""
 "Σφάλμα στην εκτέλεση έκφρασης αναζήτησης: %s:\n"
 "%s"
 
-#: camel/camel-folder-search.c:569 camel/camel-folder-search.c:598
+#: camel/camel-folder-search.c:573
+#: camel/camel-folder-search.c:601
 msgid "(match-all) requires a single bool result"
 msgstr "(ταίρισμα-όλων) απαιτεί ένα single bool result"
 
-#: camel/camel-folder-search.c:650
+#: camel/camel-folder-search.c:653
 #, c-format
 msgid "Performing query on unknown header: %s"
 msgstr "Γίνεται επερώτηση σε άγνωστη επικεφαλίδα: %s"
 
+#: camel/camel-folder.c:583
+#, c-format
+msgid "Unsupported operation: append message: for %s"
+msgstr "Μη υποστηριζόμενη λειτουργία : προθήκη μηνύματος: για  %s"
+
+#: camel/camel-folder.c:1161
+#, c-format
+msgid "Unsupported operation: search by expression: for %s"
+msgstr "Μη υποστηριζόμενη λειτουργία: αναζήτηση βάσει έκφρασης: για %s"
+
+#: camel/camel-folder.c:1201
+#, c-format
+msgid "Unsupported operation: search by uids: for %s"
+msgstr "Μη υποστηριζόμενη λειτουργία: αναζήτηση βάσει ταυτοτήτων χρήστη: για %s"
+
+#: camel/camel-folder.c:1319
+msgid "Moving messages"
+msgstr "Μετακίνηση μηνυμάτων"
+
+#: camel/camel-folder.c:1319
+msgid "Copying messages"
+msgstr "Αντιγραφή μηνυμάτων"
+
 #: camel/camel-gpg-context.c:762
 #, c-format
 msgid ""
@@ -8493,17 +8537,18 @@ msgstr ""
 "Χρειάζεστε μια φράση εισόδου για το ξεκλείδωμα του κλειδιού για\n"
 "χρήστη: \"%s\" "
 
-#: camel/camel-gpg-context.c:821 camel/camel-gpg-context.c:1297
-#: camel/camel-gpg-context.c:1403 camel/camel-gpg-context.c:1473
-#: camel/camel-gpg-context.c:1529 mail/mail-send-recv.c:574
+#: camel/camel-gpg-context.c:821
+#: camel/camel-gpg-context.c:1297
+#: camel/camel-gpg-context.c:1403
+#: camel/camel-gpg-context.c:1473
+#: camel/camel-gpg-context.c:1529
+#: mail/mail-send-recv.c:577
 msgid "Cancelled."
 msgstr "Ακυρώθηκε."
 
 #: camel/camel-gpg-context.c:839
 msgid "Failed to unlock secret key: 3 bad passphrases given."
-msgstr ""
-"Αποτυχία ξεκλειδώματος μυστικού κλειδιού: Δόθηκαν 3 εσφαλμένες φράσεις "
-"εισόδου."
+msgstr "Αποτυχία ξεκλειδώματος μυστικού κλειδιού: Δόθηκαν 3 εσφαλμένες φράσεις εισόδου."
 
 #: camel/camel-gpg-context.c:845
 #, c-format
@@ -8519,7 +8564,7 @@ msgid "Failed to encrypt: No valid recipients specified."
 msgstr "Δεν ήταν δυνατή η κρυπτογράφηση: δεν έχουν οριστεί έγκυροι παραλήπτες"
 
 #: camel/camel-gpg-context.c:1172
-#, fuzzy, c-format
+#, fuzzy
 msgid ""
 "Failed to GPG %s: %s\n"
 "\n"
@@ -8534,27 +8579,52 @@ msgstr ""
 msgid "Failed to GPG %s: %s\n"
 msgstr "Αποτυχία GPG %s: %s\n"
 
-#: camel/camel-gpg-context.c:1288 camel/camel-gpg-context.c:1573
+#: camel/camel-gpg-context.c:1288
+#: camel/camel-gpg-context.c:1573
 #: camel/camel-gpg-context.c:1624
 #, c-format
 msgid "Failed to execute gpg: %s"
 msgstr "Αποτυχία εκτέλεσης gpg: %s"
 
-#: camel/camel-gpg-context.c:1318 camel/camel-gpg-context.c:1395
-#: camel/camel-gpg-context.c:1464 camel/camel-gpg-context.c:1494
-#: camel/camel-gpg-context.c:1520 camel/camel-gpg-context.c:1550
-#: camel/camel-gpg-context.c:1595 camel/camel-gpg-context.c:1646
+#: camel/camel-gpg-context.c:1318
+#: camel/camel-gpg-context.c:1395
+#: camel/camel-gpg-context.c:1464
+#: camel/camel-gpg-context.c:1494
+#: camel/camel-gpg-context.c:1520
+#: camel/camel-gpg-context.c:1550
+#: camel/camel-gpg-context.c:1595
+#: camel/camel-gpg-context.c:1646
 msgid "Failed to execute gpg."
 msgstr "Αποτυχία εκτέλεσης gpg"
 
 #: camel/camel-gpg-context.c:1380
 #, c-format
 msgid "Cannot verify message signature: could not create temp file: %s"
-msgstr ""
-"Δεν ήταν δυνατή η επαλήθευση υπογραφής μηνύματος: δεν ήταν δυνατή η "
-"δημιουργία προσωρινού αρχείου: %s"
+msgstr "Δεν ήταν δυνατή η επαλήθευση υπογραφής μηνύματος: δεν ήταν δυνατή η δημιουργία προσωρινού αρχείου: %s"
 
-#: camel/camel-lock.c:92 camel/camel-lock.c:113
+#: camel/camel-lock-client.c:111
+#, c-format
+msgid "Cannot build locking helper pipe: %s"
+msgstr "Αδύνατη η κατασκευή σωλήνωσης με βοήθημα κλειδωμάτων: %s"
+
+#: camel/camel-lock-client.c:124
+#, c-format
+msgid "Cannot fork locking helper: %s"
+msgstr "Αδύνατη η δικράνωση βοηθήματος κλειδωμάτων: %s"
+
+#: camel/camel-lock-client.c:202
+#: camel/camel-lock-client.c:225
+#, c-format
+msgid "Could not lock '%s': protocol error with lock-helper"
+msgstr "Δεν ήταν δυνατό να κλειδωθεί το %s: σφάλμα πρωτοκόλλου με βοήθημα κλειδωμάτων"
+
+#: camel/camel-lock-client.c:215
+#, c-format
+msgid "Could not lock '%s'"
+msgstr "Δεν ήταν δυνατό το κλείδωμα του %s"
+
+#: camel/camel-lock.c:92
+#: camel/camel-lock.c:113
 #, c-format
 msgid "Could not create lock file for %s: %s"
 msgstr "Δεν ήταν δυνατή η δημιουργία αρχείου κλειδώματος για %s: %s"
@@ -8562,8 +8632,7 @@ msgstr "Δεν ήταν δυνατή η δημιουργία αρχείου κλ
 #: camel/camel-lock.c:154
 #, c-format
 msgid "Timed out trying to get lock file on %s. Try again later."
-msgstr ""
-"Εκτός χρόνου για την λήψη αρχείου κλειδώματος στο %s. Προσπαθήστε αργότερα."
+msgstr "Εκτός χρόνου για την λήψη αρχείου κλειδώματος στο %s. Προσπαθήστε αργότερα."
 
 #: camel/camel-lock.c:209
 #, c-format
@@ -8575,27 +8644,6 @@ msgstr "Αποτυχία κλειδώματος με χρήση fcntl(2): %s"
 msgid "Failed to get lock using flock(2): %s"
 msgstr "Αποτυχία κλειδώματος με χρήση flock(2): %s"
 
-#: camel/camel-lock-client.c:100
-#, c-format
-msgid "Cannot build locking helper pipe: %s"
-msgstr "Αδύνατη η κατασκευή σωλήνωσης με βοήθημα κλειδωμάτων: %s"
-
-#: camel/camel-lock-client.c:113
-#, c-format
-msgid "Cannot fork locking helper: %s"
-msgstr "Αδύνατη η δικράνωση βοηθήματος κλειδωμάτων: %s"
-
-#: camel/camel-lock-client.c:191 camel/camel-lock-client.c:214
-#, c-format
-msgid "Could not lock '%s': protocol error with lock-helper"
-msgstr ""
-"Δεν ήταν δυνατό να κλειδωθεί το %s: σφάλμα πρωτοκόλλου με βοήθημα κλειδωμάτων"
-
-#: camel/camel-lock-client.c:204
-#, c-format
-msgid "Could not lock '%s'"
-msgstr "Δεν ήταν δυνατό το κλείδωμα του %s"
-
 #: camel/camel-movemail.c:107
 #, c-format
 msgid "Could not check mail file %s: %s"
@@ -8645,12 +8693,14 @@ msgstr "Σφάλμα κατά την ανάγνωση του αρχείου μη
 msgid "Error writing mail temp file: %s"
 msgstr "Σφάλμα κατά την εγγραφή του μηνύματος στο πρόχειρο αρχείο: %s"
 
-#: camel/camel-movemail.c:465 camel/camel-movemail.c:532
+#: camel/camel-movemail.c:465
+#: camel/camel-movemail.c:532
 #, c-format
 msgid "Error copying mail temp file: %s"
 msgstr "Σφάλμα κατά την αντιγραφή του μηνύματος στο πρόχειρο αρχείο: %s"
 
-#: camel/camel-multipart-encrypted.c:259 camel/camel-multipart-encrypted.c:274
+#: camel/camel-multipart-encrypted.c:259
+#: camel/camel-multipart-encrypted.c:274
 msgid "Failed to decrypt MIME part: protocol error"
 msgstr "Αποτυχία αποκρυπτογράφησης τμήματος MIME: σφάλμα πρωτοκόλλου"
 
@@ -8662,20 +8712,18 @@ msgstr "Αποτυχία αποκρυπτογράφησης τμήματος MIM
 msgid "Failed to decrypt MIME part: parse error"
 msgstr "Αποτυχία αποκρυπτογράφησης τμήματος MIME: σφάλμα ανάλυσης"
 
-#: camel/camel-multipart-signed.c:646
+#: camel/camel-multipart-signed.c:644
 msgid "This is a digitally signed message part"
 msgstr "Αυτό το σημείο του μηνύματος είναι ψηφιακά υπογεγραμμένο"
 
-#: camel/camel-multipart-signed.c:700
+#: camel/camel-multipart-signed.c:698
 msgid "parse error"
 msgstr "σφάλμα ανάλυσης"
 
 #: camel/camel-provider.c:132
 #, c-format
 msgid "Could not load %s: Module loading not supported on this system."
-msgstr ""
-"Δεν ήταν δυνατό να φορτωθεί το %s: Το φόρτωμα αρθρωμάτων δεν υποστηρίζεται "
-"σ' αυτό το σύστημα."
+msgstr "Δεν ήταν δυνατό να φορτωθεί το %s: Το φόρτωμα αρθρωμάτων δεν υποστηρίζεται σ' αυτό το σύστημα."
 
 #: camel/camel-provider.c:141
 #, c-format
@@ -8685,9 +8733,7 @@ msgstr "Δεν ήταν δυνατό να φορτωθεί το %s: %s"
 #: camel/camel-provider.c:149
 #, c-format
 msgid "Could not load %s: No initialization code in module."
-msgstr ""
-"Δεν ήταν δυνατό να φορτωθεί το %s: Δεν βρέθηκε κώδικας αρχικοποίησης στο "
-"άρθρωμα."
+msgstr "Δεν ήταν δυνατό να φορτωθεί το %s: Δεν βρέθηκε κώδικας αρχικοποίησης στο άρθρωμα."
 
 #: camel/camel-sasl-anonymous.c:33
 msgid "Anonymous"
@@ -8697,7 +8743,8 @@ msgstr "Ανώνυμη"
 msgid "This option will connect to the server using an anonymous login."
 msgstr "Με την επιλογή αυτή θα συνδεθεί στον διακομιστή με ανώνυμη προσπέλαση"
 
-#: camel/camel-sasl-anonymous.c:110 camel/camel-sasl-plain.c:87
+#: camel/camel-sasl-anonymous.c:110
+#: camel/camel-sasl-plain.c:87
 msgid "Authentication failed."
 msgstr "Η πιστοποίηση απέτυχε."
 
@@ -8733,24 +8780,16 @@ msgid "CRAM-MD5"
 msgstr "CRAM-MD5"
 
 #: camel/camel-sasl-cram-md5.c:37
-msgid ""
-"This option will connect to the server using a secure CRAM-MD5 password, if "
-"the server supports it."
-msgstr ""
-"Με την επιλογή αυτή θα συνδεθεί στον διακομιστή με ασφαλή CRAM-MD5 κωδικό, "
-"αν το υποστηρίζει ο διακομιστής."
+msgid "This option will connect to the server using a secure CRAM-MD5 password, if the server supports it."
+msgstr "Με την επιλογή αυτή θα συνδεθεί στον διακομιστή με ασφαλή CRAM-MD5 κωδικό, αν το υποστηρίζει ο διακομιστής."
 
-#: camel/camel-sasl-digest-md5.c:48
+#: camel/camel-sasl-digest-md5.c:46
 msgid "DIGEST-MD5"
 msgstr "DIGEST-MD5"
 
-#: camel/camel-sasl-digest-md5.c:50
-msgid ""
-"This option will connect to the server using a secure DIGEST-MD5 password, "
-"if the server supports it."
-msgstr ""
-"Με την επιλογή αυτή θα συνδεθεί στον διακομιστή με ασφαλή DIGEST-MD5 κωδικό, "
-"αν το υποστηρίζει ο διακομιστής."
+#: camel/camel-sasl-digest-md5.c:48
+msgid "This option will connect to the server using a secure DIGEST-MD5 password, if the server supports it."
+msgstr "Με την επιλογή αυτή θα συνδεθεί στον διακομιστή με ασφαλή DIGEST-MD5 κωδικό, αν το υποστηρίζει ο διακομιστής."
 
 #: camel/camel-sasl-digest-md5.c:813
 msgid "Server challenge too long (>2048 octets)\n"
@@ -8762,8 +8801,7 @@ msgstr "Μη έγκυρο challenge διακομιστή\n"
 
 #: camel/camel-sasl-digest-md5.c:828
 msgid "Server challenge contained invalid \"Quality of Protection\" token\n"
-msgstr ""
-"Το challenge διακομιστή περιέχει μη έγκυρο κουπόνι \"Ποιότητας Προστασίας\"\n"
+msgstr "Το challenge διακομιστή περιέχει μη έγκυρο κουπόνι \"Ποιότητας Προστασίας\"\n"
 
 #: camel/camel-sasl-digest-md5.c:850
 msgid "Server response did not contain authorization data\n"
@@ -8771,8 +8809,7 @@ msgstr "Στην απάντηση του διακομιστή δεν υπάρχ�
 
 #: camel/camel-sasl-digest-md5.c:868
 msgid "Server response contained incomplete authorization data\n"
-msgstr ""
-"Στην απάντηση του διακομιστή δεν υπάρχουν όλα τα δεδομένα εξουσιοδότησης\n"
+msgstr "Στην απάντηση του διακομιστή δεν υπάρχουν όλα τα δεδομένα εξουσιοδότησης\n"
 
 #: camel/camel-sasl-digest-md5.c:878
 msgid "Server response does not match\n"
@@ -8785,14 +8822,10 @@ msgstr ""
 #: camel/camel-sasl-gssapi.c:50
 #, fuzzy
 msgid "This option will connect to the server using Kerberos 5 authentication."
-msgstr ""
-"Με την επιλογή αυτή θα συνδεθεί στον διακομιστή με την πιστοποίηση Kerberos "
-"4."
+msgstr "Με την επιλογή αυτή θα συνδεθεί στον διακομιστή με την πιστοποίηση Kerberos 4."
 
 #: camel/camel-sasl-gssapi.c:148
-msgid ""
-"The specified mechanism is not supported by the provided credential, or is "
-"unrecognized by the implementation."
+msgid "The specified mechanism is not supported by the provided credential, or is unrecognized by the implementation."
 msgstr ""
 
 #: camel/camel-sasl-gssapi.c:153
@@ -8800,27 +8833,19 @@ msgid "The provided target_name parameter was ill-formed."
 msgstr ""
 
 #: camel/camel-sasl-gssapi.c:156
-msgid ""
-"The provided target_name parameter contained an invalid or unsupported type "
-"of name."
+msgid "The provided target_name parameter contained an invalid or unsupported type of name."
 msgstr ""
 
 #: camel/camel-sasl-gssapi.c:160
-msgid ""
-"The input_token contains different channel bindings to those specified via "
-"the input_chan_bindings parameter."
+msgid "The input_token contains different channel bindings to those specified via the input_chan_bindings parameter."
 msgstr ""
 
 #: camel/camel-sasl-gssapi.c:165
-msgid ""
-"The input_token contains an invalid signature, or a signature that could not "
-"be verified."
+msgid "The input_token contains an invalid signature, or a signature that could not be verified."
 msgstr ""
 
 #: camel/camel-sasl-gssapi.c:169
-msgid ""
-"The supplied credentials were not valid for context initiation, or the "
-"credential handle did not reference any credentials."
+msgid "The supplied credentials were not valid for context initiation, or the credential handle did not reference any credentials."
 msgstr ""
 
 #: camel/camel-sasl-gssapi.c:174
@@ -8839,10 +8864,12 @@ msgstr ""
 msgid "The referenced credentials have expired."
 msgstr ""
 
-#: camel/camel-sasl-gssapi.c:189 camel/camel-sasl-gssapi.c:238
-#: camel/camel-sasl-gssapi.c:274 camel/camel-sasl-gssapi.c:289
+#: camel/camel-sasl-gssapi.c:189
+#: camel/camel-sasl-gssapi.c:238
+#: camel/camel-sasl-gssapi.c:274
+#: camel/camel-sasl-gssapi.c:289
 #: camel/camel-sasl-kerberos4.c:219
-#: camel/providers/imap/camel-imap-store.c:1207
+#: camel/providers/imap/camel-imap-store.c:1052
 msgid "Bad authentication response from server."
 msgstr "Εσφαλμένη απάντηση πιστοποίησης από τον διακομιστή"
 
@@ -8862,9 +8889,7 @@ msgstr "Kerberos 4"
 
 #: camel/camel-sasl-kerberos4.c:43
 msgid "This option will connect to the server using Kerberos 4 authentication."
-msgstr ""
-"Με την επιλογή αυτή θα συνδεθεί στον διακομιστή με την πιστοποίηση Kerberos "
-"4."
+msgstr "Με την επιλογή αυτή θα συνδεθεί στον διακομιστή με την πιστοποίηση Kerberos 4."
 
 #: camel/camel-sasl-kerberos4.c:162
 #, c-format
@@ -8879,10 +8904,10 @@ msgstr ""
 msgid "Login"
 msgstr "Είσοδος"
 
-#: camel/camel-sasl-login.c:34 camel/camel-sasl-plain.c:34
+#: camel/camel-sasl-login.c:34
+#: camel/camel-sasl-plain.c:34
 msgid "This option will connect to the server using a simple password."
-msgstr ""
-"Με την επιλογή αυτή θα γίνει σύνδεση στον διακομιστή με χρήση ενός κωδικού."
+msgstr "Με την επιλογή αυτή θα γίνει σύνδεση στον διακομιστή με χρήση ενός κωδικού."
 
 #: camel/camel-sasl-login.c:127
 msgid "Unknown authentication state."
@@ -8893,36 +8918,30 @@ msgid "NTLM / SPA"
 msgstr "NTLM / SPA"
 
 #: camel/camel-sasl-ntlm.c:33
-msgid ""
-"This option will connect to a Windows-based server using NTLM / Secure "
-"Password Authentication."
-msgstr ""
-"Με την επιλογή αυτή θα συνδεθεί σε έναν Windows-based με την χρήση NTLM / "
-"Secure Password Authentication."
+msgid "This option will connect to a Windows-based server using NTLM / Secure Password Authentication."
+msgstr "Με την επιλογή αυτή θα συνδεθεί σε έναν Windows-based με την χρήση NTLM / Secure Password Authentication."
 
 #: camel/camel-sasl-plain.c:32
 msgid "PLAIN"
 msgstr "PLAIN"
 
-#: camel/camel-sasl-popb4smtp.c:36
+#: camel/camel-sasl-popb4smtp.c:34
 msgid "POP before SMTP"
 msgstr "ΡΟΡ πριν από SMTP"
 
-#: camel/camel-sasl-popb4smtp.c:38
+#: camel/camel-sasl-popb4smtp.c:36
 msgid "This option will authorise a POP connection before attempting SMTP"
-msgstr ""
-"Με την επιλογή αυτή θα γίνει πρώτα η εξουσιοδότηση ΡΟΡ πριν από την "
-"προσπάθεια SMTP"
+msgstr "Με την επιλογή αυτή θα γίνει πρώτα η εξουσιοδότηση ΡΟΡ πριν από την προσπάθεια SMTP"
 
-#: camel/camel-sasl-popb4smtp.c:103
+#: camel/camel-sasl-popb4smtp.c:107
 msgid "POP Source URI"
 msgstr "Πηγή POP URI"
 
-#: camel/camel-sasl-popb4smtp.c:107
+#: camel/camel-sasl-popb4smtp.c:111
 msgid "POP Before SMTP auth using an unknown transport"
 msgstr "ΡΟΡ πριν από SMTP εξουσιοδότηση με άγνωστη μεταφορά"
 
-#: camel/camel-sasl-popb4smtp.c:112
+#: camel/camel-sasl-popb4smtp.c:116
 msgid "POP Before SMTP auth using a non-pop source"
 msgstr "ΡΟΡ Πριν από SMTP εξουσιοδότηση με χρήση μη-pop πηγής"
 
@@ -8931,55 +8950,56 @@ msgstr "ΡΟΡ Πριν από SMTP εξουσιοδότηση με χρήση �
 msgid "Regular expression compilation failed: %s: %s"
 msgstr "Αποτυχία σύνταξης κανονικής έκφρασης: %s: %s"
 
-#: camel/camel-service.c:277
+#: camel/camel-service.c:282
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr "Η ηλεκτρονική διεύθυνση '%s'χρειάζεται ένα συστατικό ονόματος χρήστη"
 
-#: camel/camel-service.c:285
+#: camel/camel-service.c:290
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr "URL '%s' χρειάζεται ένα στοιχείο συστήματος"
 
-#: camel/camel-service.c:293
+#: camel/camel-service.c:298
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr "Η ηλεκτρονική διεύθυνση '%s' χρειάζεται ένα συστατικό θέσης"
 
-#: camel/camel-service.c:738
+#: camel/camel-service.c:748
 #, c-format
 msgid "Resolving: %s"
 msgstr "Ανάλυση: %s"
 
-#: camel/camel-service.c:769 camel/camel-service.c:893
+#: camel/camel-service.c:781
+#: camel/camel-service.c:909
 #, c-format
 msgid "Failure in name lookup: %s"
 msgstr "Αποτυχία στην αναζήτηση ονόματος: %s"
 
-#: camel/camel-service.c:790 camel/camel-service.c:914
+#: camel/camel-service.c:802
 #, c-format
 msgid "Host lookup failed: cannot create thread: %s"
 msgstr ""
 
-#: camel/camel-service.c:803
+#: camel/camel-service.c:816
 #, c-format
 msgid "Host lookup failed: %s: host not found"
 msgstr "Αποτυχία συσχέτισης εξυπηρετητή: %s: εξυπηρετητής δεν βρέθηκε"
 
-#: camel/camel-service.c:806
+#: camel/camel-service.c:819
 #, c-format
 msgid "Host lookup failed: %s: unknown reason"
 msgstr "Αποτυχία συσχέτισης εξυπηρετητή: %s: άγνωστος λόγος"
 
-#: camel/camel-service.c:860
+#: camel/camel-service.c:874
 msgid "Resolving address"
 msgstr "Ανάλυση διεύθυνσης"
 
-#: camel/camel-service.c:929
+#: camel/camel-service.c:943
 msgid "Host lookup failed: host not found"
 msgstr "Αποτυχία συσχέτισης εξυπηρετητή: εξυπηρετητής δεν βρέθηκε"
 
-#: camel/camel-service.c:932
+#: camel/camel-service.c:946
 msgid "Host lookup failed: unknown reason"
 msgstr "Αποτυχία συσχέτισης εξυπηρετητή: άγνωστος λόγος"
 
@@ -8991,12 +9011,13 @@ msgstr "Παροχέας ταχυδρομείου για τον Εικονικό
 msgid "For reading mail as a query of another set of folders"
 msgstr "Για την ανάγνωση μηνυμάτων ως ερώτηση για κάποιους άλλους φακέλους"
 
-#: camel/camel-session.c:350 camel/camel-session.c:400
+#: camel/camel-session.c:355
+#: camel/camel-session.c:405
 #, c-format
 msgid "No provider available for protocol `%s'"
 msgstr "Δεν υπάρχει διαθέσιμος παροχέας για το πρωτόκολλο `%s'"
 
-#: camel/camel-session.c:523
+#: camel/camel-session.c:528
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -9024,8 +9045,10 @@ msgstr "Η υπογραφή πιστοποίησης για το \"%s\" δεν �
 msgid "The encryption certificate for \"%s\" does not exist."
 msgstr "Το πιστοποιητικό κρυπτογράφησης για το \"%s\" δεν υπάρχει."
 
-#: camel/camel-smime-context.c:417 camel/camel-smime-context.c:428
-#: camel/camel-smime-context.c:534 camel/camel-smime-context.c:544
+#: camel/camel-smime-context.c:417
+#: camel/camel-smime-context.c:428
+#: camel/camel-smime-context.c:534
+#: camel/camel-smime-context.c:544
 #, c-format
 msgid "Failed to find certificate for \"%s\"."
 msgstr "Αποτυχία κατά την αναζήτηση του πιστοποιητικού \"%s\"."
@@ -9042,133 +9065,132 @@ msgstr "Αποτυχία κατά την αποκωδικοποίηση του �
 msgid "Failed to verify certificates."
 msgstr "Αποτυχία κατά την επαλήθευση των πιστοποιητικών."
 
-#: camel/camel-store.c:212
+#: camel/camel-store.c:215
 msgid "Cannot get folder: Invalid operation on this store"
-msgstr ""
-"Δεν είναι δυνατό να γίνει η λήψη του φακέλου: Μη έγκυρη σε αυτή την αποθήκη"
+msgstr "Δεν είναι δυνατό να γίνει η λήψη του φακέλου: Μη έγκυρη σε αυτή την αποθήκη"
 
-#: camel/camel-store.c:266
+#: camel/camel-store.c:269
 msgid "Cannot create folder: Invalid operation on this store"
-msgstr ""
-"Δεν είναι δυνατό να δημιουργηθεί ο φακέλος: Μη έγκυρη σε αυτή την αποθήκη"
+msgstr "Δεν είναι δυνατό να δημιουργηθεί ο φακέλος: Μη έγκυρη σε αυτή την αποθήκη"
 
-#: camel/camel-tcp-stream-openssl.c:568
+#: camel/camel-tcp-stream-openssl.c:571
 msgid "Unable to get issuer's certificate"
 msgstr "Αποτυχία κατά την λήψη πιστοποιητικού εκδότη"
 
-#: camel/camel-tcp-stream-openssl.c:570
+#: camel/camel-tcp-stream-openssl.c:573
 msgid "Unable to get Certificate Revocation List"
 msgstr "Αδυναμία λήψης Λίστας Ανάκτησης Πιστοποιητικών"
 
-#: camel/camel-tcp-stream-openssl.c:572
+#: camel/camel-tcp-stream-openssl.c:575
 msgid "Unable to decrypt certificate signature"
 msgstr "Αδυναμία αποκρυπτογράφησης υπογραφής πιστοποιητικού"
 
-#: camel/camel-tcp-stream-openssl.c:574
+#: camel/camel-tcp-stream-openssl.c:577
 msgid "Unable to decrypt Certificate Revocation List signature"
 msgstr "Αδυναμία αποκρυπτογράφησης υπογραφής Λίστας Ανάκτησης Πιστοποιητικών"
 
-#: camel/camel-tcp-stream-openssl.c:576
+#: camel/camel-tcp-stream-openssl.c:579
 msgid "Unable to decode issuer's public key"
 msgstr "Αδυναμία αποκωδικοποίησης δημοσίου κλειδιού εκδότη"
 
-#: camel/camel-tcp-stream-openssl.c:578
+#: camel/camel-tcp-stream-openssl.c:581
 msgid "Certificate signature failure"
 msgstr "Αποτυχία υπογραφής πιστοποιητικού"
 
-#: camel/camel-tcp-stream-openssl.c:580
+#: camel/camel-tcp-stream-openssl.c:583
 msgid "Certificate Revocation List signature failure"
 msgstr "Αποτυχία υπογραφής  Λίστας Ανάκτησης Πιστοποιητικών"
 
-#: camel/camel-tcp-stream-openssl.c:582
+#: camel/camel-tcp-stream-openssl.c:585
 msgid "Certificate not yet valid"
 msgstr "Το πιστοποιητικό δεν είναι ακόμα έγκυρο"
 
-#: camel/camel-tcp-stream-openssl.c:584
+#: camel/camel-tcp-stream-openssl.c:587
 msgid "Certificate has expired"
 msgstr "Το πιστοποιητικό έχει λήξει"
 
-#: camel/camel-tcp-stream-openssl.c:586
+#: camel/camel-tcp-stream-openssl.c:589
 msgid "CRL not yet valid"
 msgstr "Η CRL δεν είναι ακόμα έγκυρη"
 
-#: camel/camel-tcp-stream-openssl.c:588
+#: camel/camel-tcp-stream-openssl.c:591
 msgid "CRL has expired"
 msgstr "Η CRL έχει λήξει"
 
-#: camel/camel-tcp-stream-openssl.c:593
+#: camel/camel-tcp-stream-openssl.c:596
 msgid "Error in CRL"
 msgstr "Σφάλμα στο  CRL"
 
-#: camel/camel-tcp-stream-openssl.c:595
+#: camel/camel-tcp-stream-openssl.c:598
 msgid "Out of memory"
 msgstr "Ανεπάρκεια μνήμης"
 
-#: camel/camel-tcp-stream-openssl.c:597
+#: camel/camel-tcp-stream-openssl.c:600
 msgid "Zero-depth self-signed certificate"
 msgstr "Αυτο-υπογεγραμμένο , μηδενικού βάθους πιστοποιητικό "
 
-#: camel/camel-tcp-stream-openssl.c:599
+#: camel/camel-tcp-stream-openssl.c:602
 msgid "Self-signed certificate in chain"
 msgstr "Αυτο-υπογεγραμμένο πιστοποιητικό στην αλυσίδα"
 
-#: camel/camel-tcp-stream-openssl.c:601
+#: camel/camel-tcp-stream-openssl.c:604
 msgid "Unable to get issuer's certificate locally"
 msgstr "Αδυναμία λήψης πιστοποιητικού εκδότη τοπικά"
 
-#: camel/camel-tcp-stream-openssl.c:603
+#: camel/camel-tcp-stream-openssl.c:606
 msgid "Unable to verify leaf signature"
 msgstr "Αδυναμία επαλήθευσης υπογραφής leaf"
 
-#: camel/camel-tcp-stream-openssl.c:605
+#: camel/camel-tcp-stream-openssl.c:608
 msgid "Certificate chain too long"
 msgstr "Αλυσίδα πιστοποιητικού πολύ μακριά"
 
-#: camel/camel-tcp-stream-openssl.c:607
+#: camel/camel-tcp-stream-openssl.c:610
 msgid "Certificate Revoked"
 msgstr "Το πιστοποιητικό ανακλήθηκε"
 
-#: camel/camel-tcp-stream-openssl.c:609
+#: camel/camel-tcp-stream-openssl.c:612
 msgid "Invalid Certificate Authority (CA)"
 msgstr "Μή έγκυρη Αρχή Πιστοποίησης (CA)"
 
-#: camel/camel-tcp-stream-openssl.c:611
+#: camel/camel-tcp-stream-openssl.c:614
 msgid "Path length exceeded"
 msgstr "Υπέρβαση μήκους διαδρομής"
 
-#: camel/camel-tcp-stream-openssl.c:613
+#: camel/camel-tcp-stream-openssl.c:616
 msgid "Invalid purpose"
 msgstr "Μη έγκυρος σκοπός"
 
-#: camel/camel-tcp-stream-openssl.c:615
+#: camel/camel-tcp-stream-openssl.c:618
 msgid "Certificate untrusted"
 msgstr "Μη έμπιστο πιστοποιητικό"
 
-#: camel/camel-tcp-stream-openssl.c:617
+#: camel/camel-tcp-stream-openssl.c:620
 msgid "Certificate rejected"
 msgstr "Απόρριψη πιστοποιητικού"
 
-#: camel/camel-tcp-stream-openssl.c:620
+#: camel/camel-tcp-stream-openssl.c:623
 msgid "Subject/Issuer mismatch"
 msgstr "Αναντιστοιχία Εκδότη/Θέματος"
 
-#: camel/camel-tcp-stream-openssl.c:622
+#: camel/camel-tcp-stream-openssl.c:625
 msgid "AKID/SKID mismatch"
 msgstr "Αναντιστοιχία AKID/SKID"
 
-#: camel/camel-tcp-stream-openssl.c:624
+#: camel/camel-tcp-stream-openssl.c:627
 msgid "AKID/Issuer serial mismatch"
 msgstr "Αναντιστοιχία  σειριακού AKID/εκδότη"
 
-#: camel/camel-tcp-stream-openssl.c:626
+#: camel/camel-tcp-stream-openssl.c:629
 msgid "Key usage does not support certificate signing"
 msgstr "Η χρήση κλειδιού δεν υποστηρίζει υπογραφή πιστοποιητικού"
 
-#: camel/camel-tcp-stream-openssl.c:629
+#: camel/camel-tcp-stream-openssl.c:632
 msgid "Error in application verification"
 msgstr "Σφάλμα στην επαλήθευση εφαρμογής"
 
-#: camel/camel-tcp-stream-openssl.c:696 camel/camel-tcp-stream-ssl.c:831
+#: camel/camel-tcp-stream-openssl.c:699
+#: camel/camel-tcp-stream-ssl.c:823
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -9181,15 +9203,17 @@ msgstr ""
 "Αποτύπωμα:       %s\n"
 "Υπογραφή:         %s"
 
-#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:837
+#: camel/camel-tcp-stream-openssl.c:705
+#: camel/camel-tcp-stream-ssl.c:829
 msgid "GOOD"
 msgstr "ΚΑΛΟ"
 
-#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:837
+#: camel/camel-tcp-stream-openssl.c:705
+#: camel/camel-tcp-stream-ssl.c:829
 msgid "BAD"
 msgstr "ΚΑΚΟ"
 
-#: camel/camel-tcp-stream-openssl.c:704
+#: camel/camel-tcp-stream-openssl.c:707
 #, c-format
 msgid ""
 "Bad certificate from %s:\n"
@@ -9209,7 +9233,7 @@ msgstr ""
 "Θέλετε να το δεχτείτε ούτως ή άλλως;"
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:841
+#: camel/camel-tcp-stream-ssl.c:833
 #, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -9224,7 +9248,7 @@ msgstr ""
 "\n"
 "Θέλετε να το αποδεχθείτε;"
 
-#: camel/camel-tcp-stream-ssl.c:885
+#: camel/camel-tcp-stream-ssl.c:877
 #, c-format
 msgid ""
 "Certificate problem: %s\n"
@@ -9233,7 +9257,7 @@ msgstr ""
 "Πρόβλημα Πιστοποιητικού: %s\n"
 "Εκδότης: %s"
 
-#: camel/camel-tcp-stream-ssl.c:937
+#: camel/camel-tcp-stream-ssl.c:929
 #, c-format
 msgid ""
 "Bad certificate domain: %s\n"
@@ -9242,7 +9266,7 @@ msgstr ""
 "Εσφαλμένος τομέας πιστοποιητικού: %s\n"
 "Εκδότης: %s"
 
-#: camel/camel-tcp-stream-ssl.c:955
+#: camel/camel-tcp-stream-ssl.c:947
 #, c-format
 msgid ""
 "Certificate expired: %s\n"
@@ -9251,7 +9275,7 @@ msgstr ""
 "Το πιστοποιητικό έχει λήξει: %s\n"
 "Εκδότης: %s"
 
-#: camel/camel-tcp-stream-ssl.c:972
+#: camel/camel-tcp-stream-ssl.c:964
 #, c-format
 msgid ""
 "Certificate revocation list expired: %s\n"
@@ -9260,22 +9284,24 @@ msgstr ""
 "Η λίστα ανάκτησης πιστοποιητικών έχει λήξει: %s\n"
 "Εκδότης: %s"
 
-#: camel/camel-url.c:290 mail/mail-tools.c:143
+#: camel/camel-url.c:290
+#: mail/mail-tools.c:143
 #, c-format
 msgid "Could not parse URL `%s'"
 msgstr "Αδυναμία ανάλυσης URL `%s'"
 
-#: camel/camel-vee-folder.c:611
+#: camel/camel-vee-folder.c:618
 #, c-format
 msgid "Error storing `%s': %s"
 msgstr "Σφάλμα αποθήκευσης `%s': %s"
 
-#: camel/camel-vee-folder.c:649
+#: camel/camel-vee-folder.c:656
 #, c-format
 msgid "No such message %s in %s"
 msgstr "Κανένα τέτοιο μήνυμα %s στο %s"
 
-#: camel/camel-vee-folder.c:812 camel/camel-vee-folder.c:818
+#: camel/camel-vee-folder.c:819
+#: camel/camel-vee-folder.c:825
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr "Αδυναμία αντιγραφής ή μετακίνησης μηνυμάτων σε ένα εικονικό φάκελο"
 
@@ -9297,18 +9323,17 @@ msgstr "Δεν ήταν δυνατή η μετονομασία του φακέλ
 #: camel/camel-vee-store.c:301
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
-msgstr ""
-"Δεν ήταν δυνατή η μετονομασία του φακέλου %s: Δεν υπάρχει τέτοιος φάκελος"
+msgstr "Δεν ήταν δυνατή η μετονομασία του φακέλου %s: Δεν υπάρχει τέτοιος φάκελος"
 
 #: camel/providers/imap/camel-imap-command.c:221
 #: camel/providers/imap/camel-imap-command.c:260
 #: camel/providers/imap/camel-imap-command.c:450
-#: camel/providers/imap/camel-imap-store.c:2806
+#: camel/providers/imap/camel-imap-store.c:2644
 msgid "Operation cancelled"
 msgstr "Η λειτουργία ακυρώθηκε"
 
 #: camel/providers/imap/camel-imap-command.c:305
-#: camel/providers/imap/camel-imap-store.c:2809
+#: camel/providers/imap/camel-imap-store.c:2647
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "Απροσδόκητη αποσύνδεση του διακομιστή: %s"
@@ -9347,38 +9372,38 @@ msgstr "Η απάντηση του διακομιστή ΙΜΑΡ δεν περι
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "Απροσδόκητη απάντηση ΟΚ από τον διακομιστή IMAP: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:223
+#: camel/providers/imap/camel-imap-folder.c:222
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "Δεν ήταν δυνατή η δημιουργία του καταλόγου %s: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:242
+#: camel/providers/imap/camel-imap-folder.c:241
 #, c-format
 msgid "Could not load summary for %s"
 msgstr "Δεν ήταν δυνατή η φόρτωση της περίληψης του  %s"
 
-#: camel/providers/imap/camel-imap-folder.c:308
+#: camel/providers/imap/camel-imap-folder.c:307
 msgid "Folder was destroyed and recreated on server."
 msgstr "Ο φάκελος καταστράφηκε και ξαναδημιουργήθηκε στον διακομιστή."
 
 #. Check UIDs and flags of all messages we already know of.
-#: camel/providers/imap/camel-imap-folder.c:550
+#: camel/providers/imap/camel-imap-folder.c:549
 msgid "Scanning for changed messages"
 msgstr "Γίνεται σάρωση για αλλαγμένα μηνύματα"
 
-#: camel/providers/imap/camel-imap-folder.c:1886
+#: camel/providers/imap/camel-imap-folder.c:1883
 #, c-format
 msgid "Unable to retrieve message: %s"
 msgstr "Αδυναμία ανάκτησης μηνύματος: %s "
 
-#: camel/providers/imap/camel-imap-folder.c:1923
-#: camel/providers/local/camel-maildir-folder.c:211
-#: camel/providers/local/camel-maildir-folder.c:224
-#: camel/providers/local/camel-maildir-folder.c:233
-#: camel/providers/local/camel-mbox-folder.c:422
-#: camel/providers/local/camel-mh-folder.c:200
-#: camel/providers/local/camel-mh-folder.c:210
-#: camel/providers/local/camel-mh-folder.c:219
+#: camel/providers/imap/camel-imap-folder.c:1920
+#: camel/providers/local/camel-maildir-folder.c:212
+#: camel/providers/local/camel-maildir-folder.c:225
+#: camel/providers/local/camel-maildir-folder.c:234
+#: camel/providers/local/camel-mbox-folder.c:351
+#: camel/providers/local/camel-mh-folder.c:201
+#: camel/providers/local/camel-mh-folder.c:211
+#: camel/providers/local/camel-mh-folder.c:220
 #, c-format
 msgid ""
 "Cannot get message: %s\n"
@@ -9387,24 +9412,24 @@ msgstr ""
 "Δεν μπορεί να γίνει η λήψη του μηνύματος: %s\n"
 "  %s"
 
-#: camel/providers/imap/camel-imap-folder.c:1923
-#: camel/providers/local/camel-maildir-folder.c:211
-#: camel/providers/local/camel-mbox-folder.c:422
-#: camel/providers/local/camel-mh-folder.c:200
+#: camel/providers/imap/camel-imap-folder.c:1920
+#: camel/providers/local/camel-maildir-folder.c:212
+#: camel/providers/local/camel-mbox-folder.c:351
+#: camel/providers/local/camel-mh-folder.c:201
 msgid "No such message"
 msgstr "Δεν υπάρχει τέτοιο μήνυμα"
 
-#: camel/providers/imap/camel-imap-folder.c:1946
-#: camel/providers/imap/camel-imap-folder.c:2542
+#: camel/providers/imap/camel-imap-folder.c:1943
+#: camel/providers/imap/camel-imap-folder.c:2539
 msgid "This message is not currently available"
 msgstr "Το μήνυμα δεν είναι διαθέσιμο αύτη την στιγμή"
 
-#: camel/providers/imap/camel-imap-folder.c:2206
-#: camel/providers/imap/camel-imap-folder.c:2276
+#: camel/providers/imap/camel-imap-folder.c:2203
+#: camel/providers/imap/camel-imap-folder.c:2273
 msgid "Fetching summary information for new messages"
 msgstr "Λήψη πληροφορίες περίληψης για νέα μηνύματα"
 
-#: camel/providers/imap/camel-imap-folder.c:2580
+#: camel/providers/imap/camel-imap-folder.c:2577
 msgid "Could not find message body in FETCH response."
 msgstr "Αδυναμία εύρεσης σώματος μηνύματος στην απάντηση FETCH."
 
@@ -9434,7 +9459,8 @@ msgstr "Έλεγχος για νέα μηνύματα"
 msgid "Check for new messages in all folders"
 msgstr "Έλεγχος για νέα μηνύματα σε όλους τους φακέλους"
 
-#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:1178
+#: camel/providers/imap/camel-imap-provider.c:48
+#: shell/e-shell-view.c:1178
 msgid "Folders"
 msgstr "Φάκελοι"
 
@@ -9452,108 +9478,88 @@ msgstr "Namespace"
 
 #: camel/providers/imap/camel-imap-provider.c:57
 msgid "Apply filters to new messages in INBOX on this server"
-msgstr ""
-"Εφαρμογή φίλτρων στα νέα μηνύματα στα ΕΙΣΕΡΧΟΜΕΝΑ σ' αυτόν τον διακομιστή"
+msgstr "Εφαρμογή φίλτρων στα νέα μηνύματα στα ΕΙΣΕΡΧΟΜΕΝΑ σ' αυτόν τον διακομιστή"
 
-#: camel/providers/imap/camel-imap-provider.c:59
-#, fuzzy
-msgid "Automatically synchronize remote mail locally"
-msgstr "_Αυτόματος έλεγχος για νέα μηνύματα"
-
-#: camel/providers/imap/camel-imap-provider.c:65
+#: camel/providers/imap/camel-imap-provider.c:63
 msgid "IMAP"
 msgstr "IMAP"
 
-#: camel/providers/imap/camel-imap-provider.c:67
+#: camel/providers/imap/camel-imap-provider.c:65
 msgid "For reading and storing mail on IMAP servers."
 msgstr "Για ανάγνωση και αποθήκευση μηνυμάτων σε διακομιστές IMAP."
 
-#: camel/providers/imap/camel-imap-provider.c:82
-#: camel/providers/imapp/camel-imapp-provider.c:65
-#: camel/providers/nntp/camel-nntp-store.c:265
-#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:83
+#: camel/providers/imap/camel-imap-provider.c:80
+#: camel/providers/nntp/camel-nntp-store.c:267
+#: camel/providers/pop3/camel-pop3-provider.c:71
+#: mail/mail-config.glade.h:83
 msgid "Password"
 msgstr "Κωδικός Πρόσβασης"
 
-#: camel/providers/imap/camel-imap-provider.c:84
-#: camel/providers/imapp/camel-imapp-provider.c:67
+#: camel/providers/imap/camel-imap-provider.c:82
 msgid "This option will connect to the IMAP server using a plaintext password."
-msgstr ""
-"Με την επιλογή αύτη θα γίνει σύνδεση στον διακομιστή IMAP με χρήση κωδικού "
-"απλού κειμένου."
+msgstr "Με την επιλογή αύτη θα γίνει σύνδεση στον διακομιστή IMAP με χρήση κωδικού απλού κειμένου."
 
-#: camel/providers/imap/camel-imap-store.c:459
+#: camel/providers/imap/camel-imap-store.c:457
 #, c-format
 msgid "IMAP server %s"
 msgstr "Διακομιστής IMAP %s"
 
-#: camel/providers/imap/camel-imap-store.c:461
+#: camel/providers/imap/camel-imap-store.c:459
 #, c-format
 msgid "IMAP service for %s on %s"
 msgstr "Υπηρεσία IMAP για %s στο %s"
 
-#: camel/providers/imap/camel-imap-store.c:589
-#: camel/providers/imap/camel-imap-store.c:821
-#: camel/providers/imapp/camel-imapp-store.c:233
-#: camel/providers/nntp/camel-nntp-store.c:128
-#: camel/providers/nntp/camel-nntp-store.c:146
+#: camel/providers/imap/camel-imap-store.c:587
+#: camel/providers/nntp/camel-nntp-store.c:130
+#: camel/providers/nntp/camel-nntp-store.c:148
 #: camel/providers/pop3/camel-pop3-store.c:184
 msgid "Connection cancelled"
 msgstr "Η σύνδεση ακυρώθηκε"
 
-#: camel/providers/imap/camel-imap-store.c:592
-#: camel/providers/imapp/camel-imapp-store.c:236
-#: camel/providers/nntp/camel-nntp-store.c:131
-#: camel/providers/smtp/camel-smtp-transport.c:275
+#: camel/providers/imap/camel-imap-store.c:590
+#: camel/providers/nntp/camel-nntp-store.c:133
+#: camel/providers/smtp/camel-smtp-transport.c:276
 #, c-format
 msgid "Could not connect to %s (port %d): %s"
 msgstr "Δεν ήταν δυνατή η σύνδεση στο %s (θύρα %d) : %s"
 
-#: camel/providers/imap/camel-imap-store.c:655
-#: camel/providers/imap/camel-imap-store.c:686
-#, fuzzy, c-format
+#: camel/providers/imap/camel-imap-store.c:649
+#: camel/providers/imap/camel-imap-store.c:680
+#, fuzzy
 msgid "Failed to connect to IMAP server %s in secure mode: %s"
-msgstr ""
-"Δεν ήταν δυνατή η σύνδεση με τον διακομιστή IMAP %s σε ασφαλή λειτουργία: %s"
+msgstr "Δεν ήταν δυνατή η σύνδεση με τον διακομιστή IMAP %s σε ασφαλή λειτουργία: %s"
 
-#: camel/providers/imap/camel-imap-store.c:656
+#: camel/providers/imap/camel-imap-store.c:650
 #: camel/providers/pop3/camel-pop3-store.c:220
 msgid "SSL/TLS extension not supported."
 msgstr "Η επέκταση SSL/TLS  δεν υποστηρίζεται"
 
-#: camel/providers/imap/camel-imap-store.c:687
+#: camel/providers/imap/camel-imap-store.c:681
 #: camel/providers/pop3/camel-pop3-store.c:261
 msgid "SSL negotiations failed"
 msgstr "Αποτυχία διαπραγματεύσεων SSL"
 
-#: camel/providers/imap/camel-imap-store.c:824
-#, fuzzy, c-format
-msgid "Could not connect with command \"%s\": %s"
-msgstr "Δεν ήταν δυνατή η σύνδεση στο %s (θύρα %d) : %s"
-
-#: camel/providers/imap/camel-imap-store.c:1237
+#: camel/providers/imap/camel-imap-store.c:1075
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
-msgstr ""
-"Ο διακομιστής IMAP %s δεν υποστηρίζει την αιτούμενο τύπο πιστοποίησης %s"
+msgstr "Ο διακομιστής IMAP %s δεν υποστηρίζει την αιτούμενο τύπο πιστοποίησης %s"
 
-#: camel/providers/imap/camel-imap-store.c:1247
-#: camel/providers/smtp/camel-smtp-transport.c:485
+#: camel/providers/imap/camel-imap-store.c:1085
+#: camel/providers/smtp/camel-smtp-transport.c:486
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "Μη υποστηριζόμενος τύπος πιστοποίησης %s"
 
-#: camel/providers/imap/camel-imap-store.c:1270
-#: camel/providers/imapp/camel-imapp-store.c:349
+#: camel/providers/imap/camel-imap-store.c:1108
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr "%sΠαρακαλώ εισάγετε τον κωδικό IMAP για %s@%s"
 
-#: camel/providers/imap/camel-imap-store.c:1284
+#: camel/providers/imap/camel-imap-store.c:1122
 msgid "You didn't enter a password."
 msgstr "Δεν έχετε εισάγει κωδικό πρόσβασης."
 
-#: camel/providers/imap/camel-imap-store.c:1313
+#: camel/providers/imap/camel-imap-store.c:1151
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -9564,72 +9570,41 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:1660
-#: camel/providers/imap/camel-imap-store.c:1802
+#: camel/providers/imap/camel-imap-store.c:1498
+#: camel/providers/imap/camel-imap-store.c:1640
 #, c-format
 msgid "No such folder %s"
 msgstr "Δεν υπάρχει τέτοιος φάκελος %s"
 
-#: camel/providers/imap/camel-imap-store.c:2003
+#: camel/providers/imap/camel-imap-store.c:1841
 #, c-format
-msgid ""
-"The folder name \"%s\" is invalid because it containes the character \"%c\""
-msgstr ""
-"Το όνομα φακέλου \"%s\" δεν είναι έγκυρο δεν μπορεί να περιέχει τον "
-"χαρακτήρα \"%c\""
+msgid "The folder name \"%s\" is invalid because it containes the character \"%c\""
+msgstr "Το όνομα φακέλου \"%s\" δεν είναι έγκυρο δεν μπορεί να περιέχει τον χαρακτήρα \"%c\""
 
-#: camel/providers/imap/camel-imap-store.c:2015
+#: camel/providers/imap/camel-imap-store.c:1853
 #, c-format
 msgid "Unknown parent folder: %s"
 msgstr "Άγνωστος μητρικός φάκελος: %s"
 
-#: camel/providers/imap/camel-imap-store.c:2051
+#: camel/providers/imap/camel-imap-store.c:1889
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "Ο μητρικός φάκελος δεν επιτρέπεται να περιέχει υποφάκελους"
 
-#: camel/providers/imapp/camel-imapp-provider.c:39
-#: camel/providers/pop3/camel-pop3-provider.c:38
-msgid "Message storage"
-msgstr "Αποθήκη μηνυμάτων"
-
-#: camel/providers/imapp/camel-imapp-provider.c:47
-#, fuzzy
-msgid "IMAP+"
-msgstr "IMAP"
-
-#: camel/providers/imapp/camel-imapp-provider.c:49
-msgid ""
-"Experimental IMAP 4(.1) client\n"
-"This is untested and unsupported code, you want to use plain imap instead.\n"
-"\n"
-" !!! DO NOT USE THIS FOR PRODUCTION EMAIL  !!!\n"
-msgstr ""
-
-#: camel/providers/imapp/camel-imapp-store.c:333
-#, fuzzy, c-format
-msgid "Could not connect to POP server on %s"
-msgstr "Δεν ήταν δυνατή η σύνδεση με τον διακομιστή POP %s "
-
-#: camel/providers/local/camel-local-folder.c:179
-#, fuzzy
-msgid "Index message body data"
-msgstr "Αποστολή μηνύματος σε επαφή"
-
 #. $HOME relative path + protocol string
-#: camel/providers/local/camel-local-folder.c:379
+#: camel/providers/local/camel-local-folder.c:354
 #, c-format
 msgid "~%s (%s)"
 msgstr "~%s (%s)"
 
 #. /var/spool/mail relative path + protocol
-#: camel/providers/local/camel-local-folder.c:383
-#: camel/providers/local/camel-local-folder.c:386
+#: camel/providers/local/camel-local-folder.c:358
+#: camel/providers/local/camel-local-folder.c:361
 #, c-format
 msgid "mailbox:%s (%s)"
 msgstr "mailbox:%s (%s)"
 
 #. a full path + protocol
-#: camel/providers/local/camel-local-folder.c:390
+#: camel/providers/local/camel-local-folder.c:365
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
@@ -9651,12 +9626,8 @@ msgid "Local delivery"
 msgstr "Τοπική παράδοση"
 
 #: camel/providers/local/camel-local-provider.c:66
-msgid ""
-"For retrieving (moving) local mail from standard mbox formated spools into "
-"folders managed by Evolution."
-msgstr ""
-"Για την ανάκτηση (μετακίνηση) τοπικής αλληλογραφίας από μορφοποιημένα mbox "
-"spools σε φακέλους του Evolution."
+msgid "For retrieving (moving) local mail from standard mbox formated spools into folders managed by Evolution."
+msgstr "Για την ανάκτηση (μετακίνηση) τοπικής αλληλογραφίας από μορφοποιημένα mbox spools σε φακέλους του Evolution."
 
 #: camel/providers/local/camel-local-provider.c:77
 #: camel/providers/local/camel-local-provider.c:94
@@ -9685,61 +9656,56 @@ msgid ""
 "May also be used to read a tree of Elm, Pine, or Mutt style folders."
 msgstr ""
 "Για ανάγνωση και αποθήκευση τοπικής αλληλογραφίας σε αρχεία mbox spool.\n"
-"Μπορεί ακόμα να χρησιμοποιηθούν για την ανάγνωση δέντρου φακέλων στυλ Elm, "
-"Pine, ή Mutt."
+"Μπορεί ακόμα να χρησιμοποιηθούν για την ανάγνωση δέντρου φακέλων στυλ Elm, Pine, ή Mutt."
 
-#: camel/providers/local/camel-local-store.c:138
-#: camel/providers/local/camel-local-store.c:227
-#: camel/providers/local/camel-mbox-store.c:305
+#: camel/providers/local/camel-local-store.c:139
+#: camel/providers/local/camel-local-store.c:228
 #: camel/providers/local/camel-spool-store.c:116
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr "Η αποθήκη του root %s δεν είναι απόλυτη θέση"
 
-#: camel/providers/local/camel-local-store.c:145
+#: camel/providers/local/camel-local-store.c:146
 #, c-format
 msgid "Store root %s is not a regular directory"
 msgstr "Η αποθήκη του root %s δεν είναι κανονικός κατάλογος"
 
-#: camel/providers/local/camel-local-store.c:154
-#: camel/providers/local/camel-local-store.c:170
-#: camel/providers/local/camel-local-store.c:238
+#: camel/providers/local/camel-local-store.c:155
+#: camel/providers/local/camel-local-store.c:171
+#: camel/providers/local/camel-local-store.c:239
 #, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr "Δεν είναι δυνατή η λήψη του φακέλου: %s: %s"
 
-#: camel/providers/local/camel-local-store.c:186
+#: camel/providers/local/camel-local-store.c:187
 msgid "Local stores do not have an inbox"
 msgstr "Οι τοπικές αποθήκες δεν έχουν εισερχόμενα"
 
-#: camel/providers/local/camel-local-store.c:198
+#: camel/providers/local/camel-local-store.c:199
 #, c-format
 msgid "Local mail file %s"
 msgstr "Τοπικό αρχείο μηνυμάτων %s"
 
-#: camel/providers/local/camel-local-store.c:307 mail/mail-local.c:949
+#: camel/providers/local/camel-local-store.c:308
+#: mail/mail-local.c:909
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr "Δεν ήταν δυνατή η μετονομασία του φακέλου %s στο %s: %s"
 
-#: camel/providers/local/camel-local-store.c:364
-#: camel/providers/local/camel-mbox-store.c:474
+#: camel/providers/local/camel-local-store.c:365
 #, c-format
 msgid "Could not rename '%s': %s"
 msgstr "Δεν ήταν δυνατή η μετονομασία '%s': %s"
 
-#: camel/providers/local/camel-local-store.c:387
-#: camel/providers/local/camel-mbox-store.c:258
+#: camel/providers/local/camel-local-store.c:388
 #, c-format
 msgid "Could not delete folder summary file `%s': %s"
 msgstr "Δεν ήταν δυνατή η διαγραφή του αρχείου περίληψης του φακέλου `%s': %s"
 
-#: camel/providers/local/camel-local-store.c:397
-#: camel/providers/local/camel-mbox-store.c:270
+#: camel/providers/local/camel-local-store.c:398
 #, c-format
 msgid "Could not delete folder index file `%s': %s"
-msgstr ""
-"Δεν ήταν δυνατή η διαγραφή του αρχείου περιεχομένων του φακέλου `%s': %s"
+msgstr "Δεν ήταν δυνατή η διαγραφή του αρχείου περιεχομένων του φακέλου `%s': %s"
 
 #: camel/providers/local/camel-local-summary.c:398
 #, c-format
@@ -9750,17 +9716,17 @@ msgstr "Δεν ήταν δυνατή η αποθήκευση της περίλη
 msgid "Unable to add message to summary: unknown reason"
 msgstr "Δεν ήταν δυνατή η προσθήκη του μηνύματος στην περίληψη : άγνωστη αιτία"
 
-#: camel/providers/local/camel-maildir-folder.c:183
+#: camel/providers/local/camel-maildir-folder.c:184
 msgid "Maildir append message cancelled"
 msgstr "Ακυρώθηκε η προθήκη μηνύματος Maildir"
 
-#: camel/providers/local/camel-maildir-folder.c:186
+#: camel/providers/local/camel-maildir-folder.c:187
 #, c-format
 msgid "Cannot append message to maildir folder: %s: %s"
 msgstr "Δεν είναι δυνατή η προσθήκη μηνύματος στον φάκελο maildir: %s: %s"
 
-#: camel/providers/local/camel-maildir-folder.c:234
-#: camel/providers/local/camel-mh-folder.c:220
+#: camel/providers/local/camel-maildir-folder.c:235
+#: camel/providers/local/camel-mh-folder.c:221
 msgid "Invalid message contents"
 msgstr "Μη έγκυρα περιεχόμενα στο μήνυμα"
 
@@ -9776,7 +9742,7 @@ msgstr ""
 "%s"
 
 #: camel/providers/local/camel-maildir-store.c:110
-#: camel/providers/local/camel-mbox-store.c:157
+#: camel/providers/local/camel-mbox-store.c:101
 #: camel/providers/local/camel-mh-store.c:209
 #: camel/providers/local/camel-spool-store.c:167
 #, c-format
@@ -9839,29 +9805,29 @@ msgstr "Έλεγχος για νέα μηνύματα"
 msgid "Storing folder"
 msgstr "Φάκελος αποθήκευσης"
 
-#: camel/providers/local/camel-mbox-folder.c:230
-#: camel/providers/local/camel-spool-folder.c:148
+#: camel/providers/local/camel-mbox-folder.c:159
+#: camel/providers/local/camel-spool-folder.c:149
 #, c-format
 msgid "Cannot create folder lock on %s: %s"
 msgstr "Δεν ήταν δυνατό το κλείδωμα του φακέλου στο %s: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:289
+#: camel/providers/local/camel-mbox-folder.c:218
 #, c-format
 msgid "Cannot open mailbox: %s: %s\n"
 msgstr "Δεν είναι δυνατό το άνοιγμα του mailbox: %s: %s\n"
 
-#: camel/providers/local/camel-mbox-folder.c:349
+#: camel/providers/local/camel-mbox-folder.c:278
 msgid "Mail append cancelled"
 msgstr "Ακύρωση πρόσθεσης μηνυμάτων"
 
-#: camel/providers/local/camel-mbox-folder.c:352
+#: camel/providers/local/camel-mbox-folder.c:281
 #, c-format
 msgid "Cannot append message to mbox file: %s: %s"
 msgstr "Δεν είναι δυνατή η προσθήκη του μηνύματος στο αρχείο mbox: %s: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:440
-#: camel/providers/local/camel-mbox-folder.c:471
-#: camel/providers/local/camel-mbox-folder.c:479
+#: camel/providers/local/camel-mbox-folder.c:369
+#: camel/providers/local/camel-mbox-folder.c:400
+#: camel/providers/local/camel-mbox-folder.c:408
 #, c-format
 msgid ""
 "Cannot get message: %s from folder %s\n"
@@ -9870,15 +9836,15 @@ msgstr ""
 "Δεν είναι δυνατή η λήψη του μηνύματος: %s από τον φάκελο %s\n"
 "  %s"
 
-#: camel/providers/local/camel-mbox-folder.c:472
+#: camel/providers/local/camel-mbox-folder.c:401
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr "Ο φάκελος φαίνεται να έχει ανεπανόρθωτη ζημιά."
 
-#: camel/providers/local/camel-mbox-folder.c:480
+#: camel/providers/local/camel-mbox-folder.c:409
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr "Αποτυχία δημιουργίας μηνύματος: Κατεστραμμένο  mailbox;"
 
-#: camel/providers/local/camel-mbox-store.c:149
+#: camel/providers/local/camel-mbox-store.c:94
 #, c-format
 msgid ""
 "Could not open file `%s':\n"
@@ -9887,16 +9853,7 @@ msgstr ""
 "Δεν ήταν δυνατό το άνοιγμα του αρχείου`%s':\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:166
-#, fuzzy, c-format
-msgid ""
-"Could not create directory `%s':\n"
-"%s"
-msgstr ""
-"Δεν ήταν δυνατή η δημιουργία του καταλόγου %s:\n"
-"%s"
-
-#: camel/providers/local/camel-mbox-store.c:178
+#: camel/providers/local/camel-mbox-store.c:110
 #, c-format
 msgid ""
 "Could not create file `%s':\n"
@@ -9905,15 +9862,14 @@ msgstr ""
 "Δεν ήταν δυνατή η δημιουργία του αρχείου`%s':\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:188
-#: camel/providers/local/camel-mbox-store.c:229
+#: camel/providers/local/camel-mbox-store.c:119
+#: camel/providers/local/camel-mbox-store.c:146
 #, c-format
 msgid "`%s' is not a regular file."
 msgstr "`%s' δεν είναι κανονικό αρχείο."
 
-#: camel/providers/local/camel-mbox-store.c:210
-#: camel/providers/local/camel-mbox-store.c:221
-#: camel/providers/local/camel-mbox-store.c:244
+#: camel/providers/local/camel-mbox-store.c:138
+#: camel/providers/local/camel-mbox-store.c:161
 #, c-format
 msgid ""
 "Could not delete folder `%s':\n"
@@ -9922,36 +9878,11 @@ msgstr ""
 "Δεν ήταν δυνατή η διαγραφή του φακέλου `%s':\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:236
+#: camel/providers/local/camel-mbox-store.c:153
 #, c-format
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr "Ο φάκελος `%s' δεν είναι άδειος. Δεν έγινε η διαγραφή."
 
-#: camel/providers/local/camel-mbox-store.c:311
-#, fuzzy
-msgid "Cannot create a folder by this name."
-msgstr "Δεν ήταν δυνατή η δημιουργία φακέλου με αυτό το όνομα"
-
-#: camel/providers/local/camel-mbox-store.c:324
-#, fuzzy, c-format
-msgid "Cannot create directory `%s': %s."
-msgstr "Δεν ήταν δυνατή η δημιουργία του καταλόγου %s: %s"
-
-#: camel/providers/local/camel-mbox-store.c:338
-#, fuzzy, c-format
-msgid "Cannot create folder: %s: %s"
-msgstr "Δεν είναι δυνατή η λήψη του φακέλου: %s: %s"
-
-#: camel/providers/local/camel-mbox-store.c:408
-#, fuzzy, c-format
-msgid "Could not rename %s to %s: %s"
-msgstr "Δεν ήταν δυνατή η μετονομασία του φακέλου %s στο %s: %s"
-
-#: camel/providers/local/camel-mbox-store.c:427
-#, fuzzy
-msgid "The new folder name is illegal."
-msgstr "Το συγκεκριμένο όνομα φακέλου δεν είναι έγκυρο: %s"
-
 #: camel/providers/local/camel-mbox-summary.c:343
 #, c-format
 msgid "Could not open folder: %s: %s"
@@ -9960,8 +9891,7 @@ msgstr "Δεν ήταν δυνατό το άνοιγμα του φακέλου:
 #: camel/providers/local/camel-mbox-summary.c:391
 #, c-format
 msgid "Fatal mail parser error near position %ld in folder %s"
-msgstr ""
-"Μοιραίο σφάλμα ανάλυσης αλληλογραφίας κοντά στην τοποθεσία %ld στον φάκελο %s"
+msgstr "Μοιραίο σφάλμα ανάλυσης αλληλογραφίας κοντά στην τοποθεσία %ld στον φάκελο %s"
 
 #: camel/providers/local/camel-mbox-summary.c:447
 #, c-format
@@ -9982,7 +9912,7 @@ msgid "Cannot open temporary mailbox: %s"
 msgstr "Δεν είναι δυνατό το άνοιγμα του προσωρινού mailbox: %s"
 
 #: camel/providers/local/camel-mbox-summary.c:540
-#: camel/providers/local/camel-mbox-summary.c:704
+#: camel/providers/local/camel-mbox-summary.c:702
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr "Δεν ήταν δυνατό το κλείσιμο του φακέλου πηγής %s: %s"
@@ -9999,38 +9929,38 @@ msgstr "Δεν ήταν δυνατή η μετονομασία του φακέλ
 
 #: camel/providers/local/camel-mbox-summary.c:644
 #: camel/providers/local/camel-mbox-summary.c:652
-#: camel/providers/local/camel-mbox-summary.c:845
-#: camel/providers/local/camel-mbox-summary.c:853
+#: camel/providers/local/camel-mbox-summary.c:843
+#: camel/providers/local/camel-mbox-summary.c:851
 msgid "Summary and folder mismatch, even after a sync"
 msgstr "Ασυμφωνία περίληψης και φακέλου, ακόμα και μετά από συγχρονισμό"
 
-#: camel/providers/local/camel-mbox-summary.c:779
+#: camel/providers/local/camel-mbox-summary.c:777
 #: camel/providers/local/camel-spool-summary.c:334
 #, c-format
 msgid "Unknown error: %s"
 msgstr "Άγνωστο σφάλμα: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:814
+#: camel/providers/local/camel-mbox-summary.c:812
 #, c-format
 msgid "Could not store folder: %s"
 msgstr "Αδυναμία αποθήκευσης φακέλου : %s"
 
-#: camel/providers/local/camel-mbox-summary.c:908
-#: camel/providers/local/camel-mbox-summary.c:934
+#: camel/providers/local/camel-mbox-summary.c:906
+#: camel/providers/local/camel-mbox-summary.c:932
 #, c-format
 msgid "Error writing to temp mailbox: %s"
 msgstr "Σφάλμα κατά την εγγραφή του προσωρινού mailbox: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:925
+#: camel/providers/local/camel-mbox-summary.c:923
 #, c-format
 msgid "Writing to tmp mailbox failed: %s: %s"
 msgstr "Η εγγραφή του προσωρινού mailbox απέτυχε: %s: %s"
 
-#: camel/providers/local/camel-mh-folder.c:174
+#: camel/providers/local/camel-mh-folder.c:175
 msgid "MH append message cancelled"
 msgstr "Η προσθήκη μηνύματος ΜΗ ακυρώθηκε"
 
-#: camel/providers/local/camel-mh-folder.c:177
+#: camel/providers/local/camel-mh-folder.c:178
 #, c-format
 msgid "Cannot append message to mh folder: %s: %s"
 msgstr "Δεν είναι δυνατή η προσθήκη μηνύματος στον mh φάκελο: %s: %s"
@@ -10075,7 +10005,7 @@ msgid "Spool mail file %s"
 msgstr "Αρχειο αλληλογραφίας spool %s"
 
 #: camel/providers/local/camel-spool-store.c:209
-#, fuzzy, c-format
+#, fuzzy
 msgid "Spool folder tree %s"
 msgstr "Δέντρο φακέλου spool %s"
 
@@ -10110,131 +10040,64 @@ msgstr ""
 "Αδυναμία συγχρονισμού φακέλου spool %s: %s\n"
 "Ο φάκελος μπορεί να είναι κατεστραμμένος, αποθηκεύθηκε αντίγραφο στο  `%s'"
 
-#: camel/providers/nntp/camel-nntp-auth.c:44
-#, fuzzy, c-format
-msgid "Please enter the NNTP password for %s@%s"
-msgstr "%sΠαρακαλώ εισάγετε τον κωδικό πρόσβασης SMTP για %s@%s"
-
-#: camel/providers/nntp/camel-nntp-auth.c:64
-msgid "Server rejected username"
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-auth.c:70
-#, fuzzy
-msgid "Failed to send username to server"
-msgstr "Δεν είναι δυνατή η σύνδεση με τον διακομιστή LDAP."
-
-#: camel/providers/nntp/camel-nntp-auth.c:79
-msgid "Server rejected username/password"
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-folder.c:114
-#, c-format
-msgid "Internal error: uid in invalid format: %s"
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-folder.c:155
-#: camel/providers/nntp/camel-nntp-folder.c:161
-#: camel/providers/pop3/camel-pop3-folder.c:433
-#: camel/providers/pop3/camel-pop3-folder.c:494
-#: camel/providers/pop3/camel-pop3-folder.c:501
-#: camel/providers/pop3/camel-pop3-folder.c:512
-#, c-format
-msgid "Cannot get message %s: %s"
-msgstr "Αδυναμία λήψης  μηνύματος %s: %s"
-
-#: camel/providers/nntp/camel-nntp-folder.c:159
-#: camel/providers/pop3/camel-pop3-folder.c:262
-#: camel/providers/pop3/camel-pop3-folder.c:430
-#: camel/providers/pop3/camel-pop3-folder.c:491
-#: camel/providers/pop3/camel-pop3-folder.c:509
-msgid "User cancelled"
-msgstr "Ακυρώθηκε από τον χρήστη"
-
-#: camel/providers/nntp/camel-nntp-grouplist.c:45
-#, fuzzy
-msgid "Could not get group list from server."
-msgstr "Αδυναμία λήψης ομάδας: %s"
-
-#: camel/providers/nntp/camel-nntp-grouplist.c:98
-#: camel/providers/nntp/camel-nntp-grouplist.c:107
-#, fuzzy, c-format
-msgid "Unable to load grouplist file for %s: %s"
-msgstr ""
-"Δεν είναι δυνατή η δημιουργία του αρχείου εξόδου: %s\n"
-" %s"
-
-#: camel/providers/nntp/camel-nntp-grouplist.c:158
-#, fuzzy, c-format
-msgid "Unable to save grouplist file for %s: %s"
-msgstr ""
-"Δεν είναι δυνατή η δημιουργία του αρχείου εξόδου: %s\n"
-" %s"
-
 #: camel/providers/nntp/camel-nntp-provider.c:41
 msgid "USENET news"
 msgstr "Ειδήσεις USENET"
 
 #: camel/providers/nntp/camel-nntp-provider.c:43
 msgid "This is a provider for reading from and posting toUSENET newsgroups."
-msgstr ""
-"Αυτός είναι ένας παροχέας για την ανάγνωση και δημοσίευση μηνυμάτων σε "
-"ομάδες ειδήσεων USENET"
+msgstr "Αυτός είναι ένας παροχέας για την ανάγνωση και δημοσίευση μηνυμάτων σε ομάδες ειδήσεων USENET"
 
-#: camel/providers/nntp/camel-nntp-store.c:149
+#: camel/providers/nntp/camel-nntp-store.c:151
 #, c-format
 msgid "Could not read greeting from %s: %s"
 msgstr "Αδυναμία ανάγνωσης χαιρετισμού από %s: %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:161
+#: camel/providers/nntp/camel-nntp-store.c:163
 #, c-format
 msgid "NNTP server %s returned error code %d: %s"
 msgstr "Ο διακομιστής NNTP %s επέστρεψε κωδικό σφάλματος %d: %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:260
+#: camel/providers/nntp/camel-nntp-store.c:262
 #, c-format
 msgid "USENET News via %s"
 msgstr "Ειδήσεις USENET μέσω %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:267
-msgid ""
-"This option will authenticate with the NNTP server using a plaintext "
-"password."
-msgstr ""
-"Με την επιλογή αυτή θα γίνει πιστοποίηση με τον διακομιστή NNTP με την χρήση "
-"κωδικού πρόσβασης σε μορφή απλού κειμένου."
+#: camel/providers/nntp/camel-nntp-store.c:269
+msgid "This option will authenticate with the NNTP server using a plaintext password."
+msgstr "Με την επιλογή αυτή θα γίνει πιστοποίηση με τον διακομιστή NNTP με την χρήση κωδικού πρόσβασης σε μορφή απλού κειμένου."
 
-#: camel/providers/nntp/camel-nntp-summary.c:237
+#: camel/providers/nntp/camel-nntp-summary.c:234
 #, c-format
 msgid "No such folder: %s"
 msgstr "Δεν υπάρχει τέτοιος φάκελος %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:241
+#: camel/providers/nntp/camel-nntp-summary.c:238
 #, c-format
 msgid "Could not get group: %s"
 msgstr "Αδυναμία λήψης ομάδας: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:347
+#: camel/providers/nntp/camel-nntp-summary.c:344
 #, c-format
 msgid "NNTP Command failed: %s"
 msgstr "Η εντολή NNTP απέτυχε: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:407
-#: camel/providers/nntp/camel-nntp-summary.c:508
+#: camel/providers/nntp/camel-nntp-summary.c:404
+#: camel/providers/nntp/camel-nntp-summary.c:505
 #, c-format
 msgid "%s: Scanning new messages"
 msgstr "%s: Σάρωση για νέα μηνύματα"
 
-#: camel/providers/nntp/camel-nntp-summary.c:523
+#: camel/providers/nntp/camel-nntp-summary.c:520
 #, c-format
 msgid "Unknown server response: %s"
 msgstr "Άγνωστη απάντηση διακομιστή: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:569
+#: camel/providers/nntp/camel-nntp-summary.c:566
 msgid "Use cancel"
 msgstr "Χρήση ακύρωσης"
 
-#: camel/providers/nntp/camel-nntp-summary.c:571
+#: camel/providers/nntp/camel-nntp-summary.c:568
 #, c-format
 msgid "Operation failed: %s"
 msgstr "Η λειτουργία απέτυχε: %s"
@@ -10243,8 +10106,15 @@ msgstr "Η λειτουργία απέτυχε: %s"
 msgid "Retrieving POP summary"
 msgstr "Παραλαβή περίληψης ΡΟΡ"
 
+#: camel/providers/pop3/camel-pop3-folder.c:262
+#: camel/providers/pop3/camel-pop3-folder.c:429
+#: camel/providers/pop3/camel-pop3-folder.c:490
+#: camel/providers/pop3/camel-pop3-folder.c:508
+msgid "User cancelled"
+msgstr "Ακυρώθηκε από τον χρήστη"
+
 #: camel/providers/pop3/camel-pop3-folder.c:265
-#, fuzzy, c-format
+#, fuzzy
 msgid "Cannot get POP summary: %s"
 msgstr "Δεν είναι δυνατή η λήψη περίληψης POP:%s"
 
@@ -10252,22 +10122,34 @@ msgstr "Δεν είναι δυνατή η λήψη περίληψης POP:%s"
 msgid "Expunging deleted messages"
 msgstr "Εξάλειψη των διαγραμμένων μηνυμάτων"
 
-#: camel/providers/pop3/camel-pop3-folder.c:404
+#: camel/providers/pop3/camel-pop3-folder.c:403
 #, c-format
 msgid "No message with uid %s"
 msgstr "Κανένα μήνυμα με uid %s"
 
 #. Sigh, most of the crap in this function is so that the cancel button
 #. returns the proper exception code.  Sigh.
-#: camel/providers/pop3/camel-pop3-folder.c:411
+#: camel/providers/pop3/camel-pop3-folder.c:410
 #, c-format
 msgid "Retrieving POP message %d"
 msgstr "Παραλαβή μηνύματος ΡΟΡ %d"
 
-#: camel/providers/pop3/camel-pop3-folder.c:501
+#: camel/providers/pop3/camel-pop3-folder.c:432
+#: camel/providers/pop3/camel-pop3-folder.c:493
+#: camel/providers/pop3/camel-pop3-folder.c:500
+#: camel/providers/pop3/camel-pop3-folder.c:511
+#, c-format
+msgid "Cannot get message %s: %s"
+msgstr "Αδυναμία λήψης  μηνύματος %s: %s"
+
+#: camel/providers/pop3/camel-pop3-folder.c:500
 msgid "Unknown reason"
 msgstr "Άγνωστος λόγος"
 
+#: camel/providers/pop3/camel-pop3-provider.c:38
+msgid "Message storage"
+msgstr "Αποθήκη μηνυμάτων"
+
 #: camel/providers/pop3/camel-pop3-provider.c:40
 msgid "Leave messages on server"
 msgstr "Αντίγραφο στον διακομιστή"
@@ -10281,7 +10163,8 @@ msgstr "Διαγραφή μετά από %s ημέρα(ες)"
 msgid "Disable support for all POP3 extensions"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:82
+#: camel/providers/pop3/camel-pop3-provider.c:54
+#: mail/mail-config.glade.h:82
 msgid "POP"
 msgstr "POP"
 
@@ -10290,23 +10173,12 @@ msgid "For connecting to and downloading mail from POP servers."
 msgstr "Για την σύνδεση και λήψη μηνυμάτων από διακομιστές POP."
 
 #: camel/providers/pop3/camel-pop3-provider.c:73
-msgid ""
-"This option will connect to the POP server using a plaintext password. This "
-"is the only option supported by many POP servers."
-msgstr ""
-"Με την επιλογή αύτη θα γίνει σύνδεση στον διακομιστή ΡΟΡ με την χρήση "
-"κωδικού πρόσβασης σε μορφή απλού κειμένου. Είναι η επιλογή που υποστηρίζουν "
-"οι πιο πολλοί διακομιστές POP."
+msgid "This option will connect to the POP server using a plaintext password. This is the only option supported by many POP servers."
+msgstr "Με την επιλογή αύτη θα γίνει σύνδεση στον διακομιστή ΡΟΡ με την χρήση κωδικού πρόσβασης σε μορφή απλού κειμένου. Είναι η επιλογή που υποστηρίζουν οι πιο πολλοί διακομιστές POP."
 
 #: camel/providers/pop3/camel-pop3-provider.c:83
-msgid ""
-"This option will connect to the POP server using an encrypted password via "
-"the APOP protocol. This may not work for all users even on servers that "
-"claim to support it."
-msgstr ""
-"Με την επιλογή αυτή θα γίνει σύνδεση στον διακομιστή ΡΟΡ με την χρήση "
-"κρυπτογραφημένου κωδικού πρόσβασης. Αυτό μπορεί να μην λειτουργεί για όλους "
-"του χρήστες, ακόμα και αν οι διακομιστές υποστηρίζουν το αντίθετο."
+msgid "This option will connect to the POP server using an encrypted password via the APOP protocol. This may not work for all users even on servers that claim to support it."
+msgstr "Με την επιλογή αυτή θα γίνει σύνδεση στον διακομιστή ΡΟΡ με την χρήση κρυπτογραφημένου κωδικού πρόσβασης. Αυτό μπορεί να μην λειτουργεί για όλους του χρήστες, ακόμα και αν οι διακομιστές υποστηρίζουν το αντίθετο."
 
 #: camel/providers/pop3/camel-pop3-store.c:187
 #, c-format
@@ -10318,8 +10190,7 @@ msgstr "Δεν ήταν δυνατή η σύνδεση στον διακομισ
 #: camel/providers/pop3/camel-pop3-store.c:260
 #, c-format
 msgid "Failed to connect to POP server %s in secure mode: %s"
-msgstr ""
-"Δεν ήταν δυνατή η σύνδεση με τον διακομιστή POP %s σε ασφαλή λειτουργία: %s"
+msgstr "Δεν ήταν δυνατή η σύνδεση με τον διακομιστή POP %s σε ασφαλή λειτουργία: %s"
 
 #: camel/providers/pop3/camel-pop3-store.c:358
 #, c-format
@@ -10329,9 +10200,7 @@ msgstr "Δεν ήταν δυνατή η σύνδεση με τον διακομ�
 #: camel/providers/pop3/camel-pop3-store.c:399
 #: camel/providers/pop3/camel-pop3-store.c:509
 #, c-format
-msgid ""
-"Unable to connect to POP server %s: No support for requested authentication "
-"mechanism."
+msgid "Unable to connect to POP server %s: No support for requested authentication mechanism."
 msgstr ""
 "Δεν ήταν δυνατή η σύνδεση με τον διακομιστή POP %s .\n"
 "Δεν υποστηρίζεται ο μηχανισμός πιστοποίησης."
@@ -10377,12 +10246,8 @@ msgid "Sendmail"
 msgstr "Sendmail"
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:38
-msgid ""
-"For delivering mail by passing it to the \"sendmail\" program on the local "
-"system."
-msgstr ""
-"Για την παράδοση μηνυμάτων με την προώθηση στο πρόγραμμα \"sendmail\" στο "
-"τοπικό σύστημα."
+msgid "For delivering mail by passing it to the \"sendmail\" program on the local system."
+msgstr "Για την παράδοση μηνυμάτων με την προώθηση στο πρόγραμμα \"sendmail\" στο τοπικό σύστημα."
 
 #: camel/providers/sendmail/camel-sendmail-transport.c:113
 msgid "Could not parse recipient list"
@@ -10391,9 +10256,7 @@ msgstr "Αδυναμία ανάλυσης λίστας παραληπτών"
 #: camel/providers/sendmail/camel-sendmail-transport.c:144
 #, c-format
 msgid "Could not create pipe to sendmail: %s: mail not sent"
-msgstr ""
-"Δεν ήταν δυνατή η δημιουργία σωλήνωσης προς το sendmail: %s: το μήνυμα δεν "
-"στάλθηκε"
+msgstr "Δεν ήταν δυνατή η δημιουργία σωλήνωσης προς το sendmail: %s: το μήνυμα δεν στάλθηκε"
 
 #: camel/providers/sendmail/camel-sendmail-transport.c:165
 #, c-format
@@ -10418,8 +10281,7 @@ msgstr "Δεν είναι δυνατό να εκτελεστεί το %s: το �
 #: camel/providers/sendmail/camel-sendmail-transport.c:245
 #, c-format
 msgid "sendmail exited with status %d: mail not sent."
-msgstr ""
-"το πρόγραμμα sendmail τερματίστηκε σε κατάσταση %d: το μήνυμα δεν στάλθηκε."
+msgstr "το πρόγραμμα sendmail τερματίστηκε σε κατάσταση %d: το μήνυμα δεν στάλθηκε."
 
 #: camel/providers/sendmail/camel-sendmail-transport.c:259
 msgid "sendmail"
@@ -10429,157 +10291,149 @@ msgstr "sendmail"
 msgid "Mail delivery via the sendmail program"
 msgstr "Παράδοση μηνυμάτων μέσω του προγράμματος sendmail"
 
-#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:99
+#: camel/providers/smtp/camel-smtp-provider.c:37
+#: mail/mail-config.glade.h:99
 msgid "SMTP"
 msgstr "SMTP"
 
 #: camel/providers/smtp/camel-smtp-provider.c:39
 msgid "For delivering mail by connecting to a remote mailhub using SMTP.\n"
-msgstr ""
-"Για τη παράδοση μηνυμάτων με την σύνδεση σε απομακρυσμένο mailhub με χρήση "
-"SMTP.\n"
+msgstr "Για τη παράδοση μηνυμάτων με την σύνδεση σε απομακρυσμένο mailhub με χρήση SMTP.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:174
+#: camel/providers/smtp/camel-smtp-transport.c:175
 msgid "Syntax error, command unrecognized"
 msgstr "Σφάλμα σύνταξης, δεν αναγνωρίζεται η εντολή"
 
-#: camel/providers/smtp/camel-smtp-transport.c:176
+#: camel/providers/smtp/camel-smtp-transport.c:177
 msgid "Syntax error in parameters or arguments"
 msgstr "Σφάλμα σύνταξης σε παραμέτρους"
 
-#: camel/providers/smtp/camel-smtp-transport.c:178
+#: camel/providers/smtp/camel-smtp-transport.c:179
 msgid "Command not implemented"
 msgstr "Η εντολή δεν έχει ενσωματωθεί"
 
-#: camel/providers/smtp/camel-smtp-transport.c:180
+#: camel/providers/smtp/camel-smtp-transport.c:181
 msgid "Command parameter not implemented"
 msgstr "Η παράμετρος της εντολής δεν έχει ενσωματωθεί"
 
-#: camel/providers/smtp/camel-smtp-transport.c:182
+#: camel/providers/smtp/camel-smtp-transport.c:183
 msgid "System status, or system help reply"
 msgstr "Κατάσταση συστήματος, ή το σύστημα βοήθειας έτοιμο"
 
-#: camel/providers/smtp/camel-smtp-transport.c:184
+#: camel/providers/smtp/camel-smtp-transport.c:185
 msgid "Help message"
 msgstr "Μήνυμα βοήθειας"
 
-#: camel/providers/smtp/camel-smtp-transport.c:186
+#: camel/providers/smtp/camel-smtp-transport.c:187
 msgid "Service ready"
 msgstr "Η υπηρεσία είναι έτοιμη"
 
-#: camel/providers/smtp/camel-smtp-transport.c:188
+#: camel/providers/smtp/camel-smtp-transport.c:189
 msgid "Service closing transmission channel"
 msgstr "Η υπηρεσία κλείνει το κανάλι μετάδοσης"
 
-#: camel/providers/smtp/camel-smtp-transport.c:190
+#: camel/providers/smtp/camel-smtp-transport.c:191
 msgid "Service not available, closing transmission channel"
 msgstr "Η υπηρεσία δεν υπάρχει τερματίζεται το κανάλι μετάδοσης"
 
-#: camel/providers/smtp/camel-smtp-transport.c:192
+#: camel/providers/smtp/camel-smtp-transport.c:193
 msgid "Requested mail action okay, completed"
 msgstr "Εντάξει η αιτηθείσα ενέργεια ταχυδρομείου, ολοκληρώθηκε"
 
-#: camel/providers/smtp/camel-smtp-transport.c:194
+#: camel/providers/smtp/camel-smtp-transport.c:195
 msgid "User not local; will forward to <forward-path>"
 msgstr "Όχι τοπικός χρήστης , θα γίνει προώθηση στο <forward-path>"
 
-#: camel/providers/smtp/camel-smtp-transport.c:196
+#: camel/providers/smtp/camel-smtp-transport.c:197
 msgid "Requested mail action not taken: mailbox unavailable"
-msgstr ""
-"Η αιτηθείσα ενέργεια ταχυδρομείου δεν εκτελέστηκε: το mailbox δεν είναι "
-"διαθέσιμο"
+msgstr "Η αιτηθείσα ενέργεια ταχυδρομείου δεν εκτελέστηκε: το mailbox δεν είναι διαθέσιμο"
 
-#: camel/providers/smtp/camel-smtp-transport.c:198
+#: camel/providers/smtp/camel-smtp-transport.c:199
 msgid "Requested action not taken: mailbox unavailable"
 msgstr "Η αιτηθείσα ενέργεια δεν εκτελέστηκε: το mailbox δεν είναι διαθέσιμο"
 
-#: camel/providers/smtp/camel-smtp-transport.c:200
+#: camel/providers/smtp/camel-smtp-transport.c:201
 msgid "Requested action aborted: error in processing"
 msgstr "Η αιτηθείσα ενέργεια εγκαταλείφθηκε: σφάλμα κατά την επεξεργασία"
 
-#: camel/providers/smtp/camel-smtp-transport.c:202
+#: camel/providers/smtp/camel-smtp-transport.c:203
 msgid "User not local; please try <forward-path>"
 msgstr "Όχι τοπικός χρήστης, παρακαλώ δοκιμάστε <forward-path>"
 
-#: camel/providers/smtp/camel-smtp-transport.c:204
+#: camel/providers/smtp/camel-smtp-transport.c:205
 msgid "Requested action not taken: insufficient system storage"
 msgstr "Η αιτηθείσα ενέργεια δεν εκτελέστηκε: ανεπαρκή αποθήκη συστήματος"
 
-#: camel/providers/smtp/camel-smtp-transport.c:206
+#: camel/providers/smtp/camel-smtp-transport.c:207
 msgid "Requested mail action aborted: exceeded storage allocation"
-msgstr ""
-"Η αιτηθείσα ενέργεια εγκαταλείφθηκε: υπέρβαση του κατανεμημένου χώρου "
-"αποθήκευσης"
+msgstr "Η αιτηθείσα ενέργεια εγκαταλείφθηκε: υπέρβαση του κατανεμημένου χώρου αποθήκευσης"
 
-#: camel/providers/smtp/camel-smtp-transport.c:208
+#: camel/providers/smtp/camel-smtp-transport.c:209
 msgid "Requested action not taken: mailbox name not allowed"
-msgstr ""
-"Η αιτηθείσα ενέργεια δεν εκτελέστηκε: το όνομα του mailbox δεν επιτρέπεται"
+msgstr "Η αιτηθείσα ενέργεια δεν εκτελέστηκε: το όνομα του mailbox δεν επιτρέπεται"
 
-#: camel/providers/smtp/camel-smtp-transport.c:210
+#: camel/providers/smtp/camel-smtp-transport.c:211
 msgid "Start mail input; end with <CRLF>.<CRLF>"
 msgstr "Εκκίνηση εισαγωγής μηνυμάτων; τελειώνει με <CRLF>.<CRLF>"
 
-#: camel/providers/smtp/camel-smtp-transport.c:212
+#: camel/providers/smtp/camel-smtp-transport.c:213
 msgid "Transaction failed"
 msgstr "Η διεξαγωγή απέτυχε"
 
-#: camel/providers/smtp/camel-smtp-transport.c:216
+#: camel/providers/smtp/camel-smtp-transport.c:217
 msgid "A password transition is needed"
 msgstr "Απαιτείται η ανταλλαγή κωδικού πρόσβασης"
 
-#: camel/providers/smtp/camel-smtp-transport.c:218
+#: camel/providers/smtp/camel-smtp-transport.c:219
 msgid "Authentication mechanism is too weak"
 msgstr "Ο μηχανισμός πιστοποίησης είναι αδύναμος"
 
-#: camel/providers/smtp/camel-smtp-transport.c:220
+#: camel/providers/smtp/camel-smtp-transport.c:221
 msgid "Encryption required for requested authentication mechanism"
 msgstr "Απαιτείται Κρυπτογράφηση για τον μηχανισμό πιστοποίησης που ζητήθηκε"
 
-#: camel/providers/smtp/camel-smtp-transport.c:222
+#: camel/providers/smtp/camel-smtp-transport.c:223
 msgid "Temporary authentication failure"
 msgstr "Προσωρινή αποτυχία πιστοποίησης"
 
-#: camel/providers/smtp/camel-smtp-transport.c:224
+#: camel/providers/smtp/camel-smtp-transport.c:225
 msgid "Authentication required"
 msgstr "Απαιτείται πιστοποίηση"
 
-#: camel/providers/smtp/camel-smtp-transport.c:298
+#: camel/providers/smtp/camel-smtp-transport.c:299
 msgid "Welcome response error"
 msgstr "Σφάλμα απάντησης Welcome"
 
-#: camel/providers/smtp/camel-smtp-transport.c:342
-#: camel/providers/smtp/camel-smtp-transport.c:381
+#: camel/providers/smtp/camel-smtp-transport.c:343
+#: camel/providers/smtp/camel-smtp-transport.c:382
 #, c-format
 msgid "Failed to connect to SMTP server %s in secure mode: %s"
-msgstr ""
-"Δεν ήταν δυνατή η σύνδεση με τον διακομιστή SMTP %s  σε ασφαλή λειτουργία: %s"
+msgstr "Δεν ήταν δυνατή η σύνδεση με τον διακομιστή SMTP %s  σε ασφαλή λειτουργία: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:343
+#: camel/providers/smtp/camel-smtp-transport.c:344
 msgid "server does not appear to support SSL"
 msgstr "ο διακομιστής δεν φαίνεται να υποστηρίζει SSL"
 
-#: camel/providers/smtp/camel-smtp-transport.c:357
+#: camel/providers/smtp/camel-smtp-transport.c:358
 #, c-format
 msgid "STARTTLS request timed out: %s"
 msgstr "Αίτηση  STARTTLS εκτός χρόνου: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:372
+#: camel/providers/smtp/camel-smtp-transport.c:373
 msgid "STARTTLS response error"
 msgstr "Σφάλμα απάντησης STARTTLS"
 
-#: camel/providers/smtp/camel-smtp-transport.c:475
+#: camel/providers/smtp/camel-smtp-transport.c:476
 #, c-format
 msgid "SMTP server %s does not support requested authentication type %s."
-msgstr ""
-"Ο διακομιστής SMTP %s δεν υποστηρίζει τον τύπο πιστοποίησης %s που ζητήθηκε"
+msgstr "Ο διακομιστής SMTP %s δεν υποστηρίζει τον τύπο πιστοποίησης %s που ζητήθηκε"
 
-#: camel/providers/smtp/camel-smtp-transport.c:513
+#: camel/providers/smtp/camel-smtp-transport.c:514
 #, c-format
 msgid "%sPlease enter the SMTP password for %s@%s"
 msgstr "%sΠαρακαλώ εισάγετε τον κωδικό πρόσβασης SMTP για %s@%s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:532
+#: camel/providers/smtp/camel-smtp-transport.c:533
 #, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -10590,92 +10444,88 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:665
+#: camel/providers/smtp/camel-smtp-transport.c:666
 #, c-format
 msgid "SMTP server %s"
 msgstr "Διακομιστής SMTP %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:667
+#: camel/providers/smtp/camel-smtp-transport.c:668
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "Παράδοση μηνυμάτων μέσω %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:685
+#: camel/providers/smtp/camel-smtp-transport.c:686
 msgid "Cannot send message: sender address not valid."
-msgstr ""
-"Δεν είναι δυνατή η αποστολή του μηνύματος: η διεύθυνση αποστολέα δεν είναι "
-"έγκυρη."
+msgstr "Δεν είναι δυνατή η αποστολή του μηνύματος: η διεύθυνση αποστολέα δεν είναι έγκυρη."
 
-#: camel/providers/smtp/camel-smtp-transport.c:690 mail/mail-ops.c:631
+#: camel/providers/smtp/camel-smtp-transport.c:691
+#: mail/mail-ops.c:613
 msgid "Sending message"
 msgstr "Γίνεται αποστολή μηνύματος"
 
-#: camel/providers/smtp/camel-smtp-transport.c:705
+#: camel/providers/smtp/camel-smtp-transport.c:706
 msgid "Cannot send message: no recipients defined."
-msgstr ""
-"Δεν είναι δυνατή η αποστολή του μηνύματος: δεν καθορίστηκαν παραλήπτες."
+msgstr "Δεν είναι δυνατή η αποστολή του μηνύματος: δεν καθορίστηκαν παραλήπτες."
 
-#: camel/providers/smtp/camel-smtp-transport.c:714
+#: camel/providers/smtp/camel-smtp-transport.c:715
 msgid "Cannot send message: one or more invalid recipients"
-msgstr ""
-"Δεν είναι δυνατή η αποστολή του μηνύματος: ένας ή περισσότεροι μη έγκυροι "
-"παραλήπτες"
+msgstr "Δεν είναι δυνατή η αποστολή του μηνύματος: ένας ή περισσότεροι μη έγκυροι παραλήπτες"
 
-#: camel/providers/smtp/camel-smtp-transport.c:879
+#: camel/providers/smtp/camel-smtp-transport.c:880
 msgid "SMTP Greeting"
 msgstr "Χαιρετισμός SMTP"
 
-#: camel/providers/smtp/camel-smtp-transport.c:928
+#: camel/providers/smtp/camel-smtp-transport.c:927
 #, c-format
 msgid "HELO request timed out: %s"
 msgstr "Αίτηση HELO εκτός χρόνου: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:950
+#: camel/providers/smtp/camel-smtp-transport.c:949
 msgid "HELO response error"
 msgstr "Σφάλμα απάντησης HELO"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1016
+#: camel/providers/smtp/camel-smtp-transport.c:1015
 msgid "SMTP Authentication"
 msgstr "Πιστοποίηση SMTP"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1022
+#: camel/providers/smtp/camel-smtp-transport.c:1021
 msgid "Error creating SASL authentication object."
 msgstr "Σφάλμα κατά την δημιουργία του αντικειμένου πιστοποίησης SASL."
 
-#: camel/providers/smtp/camel-smtp-transport.c:1039
-#: camel/providers/smtp/camel-smtp-transport.c:1051
+#: camel/providers/smtp/camel-smtp-transport.c:1038
+#: camel/providers/smtp/camel-smtp-transport.c:1050
 #, c-format
 msgid "AUTH request timed out: %s"
 msgstr "Αίτηση Πιστοποίησης εκτός χρόνου: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1060
+#: camel/providers/smtp/camel-smtp-transport.c:1059
 msgid "AUTH request failed."
 msgstr "Η αίτηση Πιστοποίησης απέτυχε."
 
-#: camel/providers/smtp/camel-smtp-transport.c:1121
+#: camel/providers/smtp/camel-smtp-transport.c:1120
 msgid "Bad authentication response from server.\n"
 msgstr "Εσφαλμένη απάντηση πιστοποίησης από τον διακομιστής.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1146
+#: camel/providers/smtp/camel-smtp-transport.c:1145
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
 msgstr "Αίτηση MAIL FROM εκτός χρόνου: %s: το μήνυμα δεν στάλθηκε"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1166
+#: camel/providers/smtp/camel-smtp-transport.c:1165
 msgid "MAIL FROM response error"
 msgstr "Σφάλμα απάντησης MAIL FROM"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1190
+#: camel/providers/smtp/camel-smtp-transport.c:1189
 #, c-format
 msgid "RCPT TO request timed out: %s: mail not sent"
 msgstr "Αίτηση RCPT TO εκτός χρόνου: %s:το μήνυμα δεν στάλθηκε"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1212
+#: camel/providers/smtp/camel-smtp-transport.c:1211
 #, c-format
 msgid "RCPT TO <%s> failed"
 msgstr "RCPT TO <%s> απέτυχε"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1251
+#: camel/providers/smtp/camel-smtp-transport.c:1250
 #, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr "Αίτηση DATA εκτός χρόνου: %s:το μήνυμα δεν στάλθηκε"
@@ -10683,68 +10533,68 @@ msgstr "Αίτηση DATA εκτός χρόνου: %s:το μήνυμα δεν �
 #. we should have gotten instructions on how to use the DATA command:
 #. * 354 Enter mail, end with "." on a line by itself
 #.
-#: camel/providers/smtp/camel-smtp-transport.c:1271
+#: camel/providers/smtp/camel-smtp-transport.c:1270
 msgid "DATA response error"
 msgstr "Σφάλμα απάντησης DATA"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1312
-#: camel/providers/smtp/camel-smtp-transport.c:1335
+#: camel/providers/smtp/camel-smtp-transport.c:1311
+#: camel/providers/smtp/camel-smtp-transport.c:1334
 #, c-format
 msgid "DATA send timed out: message termination: %s: mail not sent"
-msgstr ""
-"Εκτός χρόνου η αποστολή DATA: τερματισμός μηνύματος:  %s: το μήνυμα δεν "
-"στάλθηκε"
+msgstr "Εκτός χρόνου η αποστολή DATA: τερματισμός μηνύματος:  %s: το μήνυμα δεν στάλθηκε"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1355
+#: camel/providers/smtp/camel-smtp-transport.c:1354
 msgid "DATA termination response error"
 msgstr "Εσφαλμένη απάντηση τερματισμού DATA"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1378
+#: camel/providers/smtp/camel-smtp-transport.c:1377
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr "Αίτηση RSET εκτός χρόνου: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1398
+#: camel/providers/smtp/camel-smtp-transport.c:1397
 msgid "RSET response error"
 msgstr "Σφάλμα απάντησης RSET"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1421
+#: camel/providers/smtp/camel-smtp-transport.c:1420
 #, c-format
 msgid "QUIT request timed out: %s"
 msgstr "Αίτηση QUIT έκτος χρόνου: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1441
+#: camel/providers/smtp/camel-smtp-transport.c:1440
 msgid "QUIT response error"
 msgstr "Σφάλμα απάντησης QUIT"
 
-#: composer/e-msg-composer-attachment-bar.c:103
+#: composer/e-msg-composer-attachment-bar.c:102
 #, c-format
 msgid "%.0fK"
 msgstr "%.0fK"
 
-#: composer/e-msg-composer-attachment-bar.c:106
+#: composer/e-msg-composer-attachment-bar.c:105
 #, c-format
 msgid "%.0fM"
 msgstr "%.0fM"
 
-#: composer/e-msg-composer-attachment-bar.c:109
+#: composer/e-msg-composer-attachment-bar.c:108
 #, c-format
 msgid "%.0fG"
 msgstr "%.0fG"
 
-#: composer/e-msg-composer-attachment-bar.c:300
+#. This is a filename. Translators take note.
+#: composer/e-msg-composer-attachment-bar.c:370
+#: mail/mail-display.c:227
 msgid "attachment"
 msgstr "συννημένο"
 
-#: composer/e-msg-composer-attachment-bar.c:445
+#: composer/e-msg-composer-attachment-bar.c:508
 msgid "Remove selected items from the attachment list"
 msgstr "Αφαίρεση επιλεγμένων αντικειμένων από τον κατάλογο συννημένων"
 
-#: composer/e-msg-composer-attachment-bar.c:475
+#: composer/e-msg-composer-attachment-bar.c:538
 msgid "Add attachment..."
 msgstr "Προσθήκη συννημένου..."
 
-#: composer/e-msg-composer-attachment-bar.c:476
+#: composer/e-msg-composer-attachment-bar.c:539
 msgid "Attach a file to the message"
 msgstr "Επισύναψη αρχείου στο μήνυμα"
 
@@ -10777,11 +10627,84 @@ msgstr "Τύπος MIME:"
 msgid "Suggest automatic display of attachment"
 msgstr "Πρόταση για αυτόματη προβολή της επισύναψης"
 
-#: composer/e-msg-composer.c:562
+#: composer/e-msg-composer-hdrs.c:290
+msgid "Hey you, dunce. You need an account to send mail doncha know."
+msgstr ""
+
+#: composer/e-msg-composer-hdrs.c:483
+msgid "Click here for the address book"
+msgstr "Κλικ εδώ για το βιβλίου διευθύνσεων"
+
+#.
+#. * Reply-To:
+#. *
+#. * Create this before we call create_from_optionmenu,
+#. * because that causes from_changed to be called, which
+#. * expects the reply_to fields to be initialized.
+#.
+#: composer/e-msg-composer-hdrs.c:514
+msgid "Reply-To:"
+msgstr "Απάντηση Σε:"
+
+#.
+#. * From
+#.
+#: composer/e-msg-composer-hdrs.c:520
+msgid "From:"
+msgstr "Από:"
+
+#.
+#. * Subject
+#.
+#: composer/e-msg-composer-hdrs.c:526
+msgid "Subject:"
+msgstr "Θέμα:"
+
+#: composer/e-msg-composer-hdrs.c:535
+msgid "To:"
+msgstr "Προς:"
+
+#: composer/e-msg-composer-hdrs.c:536
+msgid "Enter the recipients of the message"
+msgstr "Εισάγετε τους παραλήπτες του μηνύματος"
+
+#: composer/e-msg-composer-hdrs.c:539
+msgid "Cc:"
+msgstr "Κοινοποίηση:"
+
+#: composer/e-msg-composer-hdrs.c:540
+msgid "Enter the addresses that will receive a carbon copy of the message"
+msgstr "Εισάγετε τις διευθύνσεις όπου θα σταλεί αντίγραφο του μηνύματος"
+
+#: composer/e-msg-composer-hdrs.c:543
+msgid "Bcc:"
+msgstr "Κρυφή κοινοποίηση:"
+
+#: composer/e-msg-composer-hdrs.c:544
+msgid "Enter the addresses that will receive a carbon copy of the message without appearing in the recipient list of the message."
+msgstr "Εισάγετε τις διευθύνσεις όπου θα σταλεί αντίγραφο του μηνύματος χωρίς αυτές να εμφανιστούν στον κατάλογο παραληπτών του μηνύματος."
+
+#.
+#. * Post-To
+#.
+#: composer/e-msg-composer-hdrs.c:551
+msgid "Post To:"
+msgstr "Αποστολή σε:"
+
+#: composer/e-msg-composer-hdrs.c:553
+msgid "Posting destination"
+msgstr "Προορισμός αποστολής"
+
+#: composer/e-msg-composer-select-file.c:102
+#: composer/e-msg-composer-select-file.c:119
+msgid "Attach file(s)"
+msgstr "Επισύναψη αρχείου"
+
+#: composer/e-msg-composer.c:535
 msgid "Could not create a PGP signature context"
 msgstr "Δεν ήταν δυνατή η δημιουργία περιεχομένων υπογραφής PGP"
 
-#: composer/e-msg-composer.c:841
+#: composer/e-msg-composer.c:814
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
@@ -10790,30 +10713,30 @@ msgstr ""
 "Σφάλμα κατά την ανάγνωση του αρχείου %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:1206
+#: composer/e-msg-composer.c:1177
 msgid "File exists, overwrite?"
 msgstr "Το αρχείο υπάρχει, να γίνει επικάλυψη;"
 
-#: composer/e-msg-composer.c:1217 composer/e-msg-composer.c:1233
+#: composer/e-msg-composer.c:1195
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Σφάλμα κατά την αποθήκευση του αρχείου: %s"
 
-#: composer/e-msg-composer.c:1256
+#: composer/e-msg-composer.c:1218
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Σφάλμα κατά το φόρτωμα του αρχείου: %s"
 
-#: composer/e-msg-composer.c:1294
+#: composer/e-msg-composer.c:1256
 #, c-format
 msgid "Error accessing file: %s"
 msgstr "Σφάλμα κατά την προσπέλαση του αρχείου: %s"
 
-#: composer/e-msg-composer.c:1302
+#: composer/e-msg-composer.c:1264
 msgid "Unable to retrieve message from editor"
 msgstr "Αδύνατη η ανάκτηση του μηνύματος από τον επεξεργαστή"
 
-#: composer/e-msg-composer.c:1309
+#: composer/e-msg-composer.c:1271
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -10822,7 +10745,7 @@ msgstr ""
 "Αδύνατη η αναζήτηση στο αρχείο: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1316
+#: composer/e-msg-composer.c:1278
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -10831,7 +10754,7 @@ msgstr ""
 "Αδυναμία  truncate αρχείου: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1325
+#: composer/e-msg-composer.c:1287
 #, c-format
 msgid ""
 "Unable to copy file descriptor: %s\n"
@@ -10840,7 +10763,7 @@ msgstr ""
 "Αδυναμία αντιγραφής περιγραφέα αρχείου: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1334
+#: composer/e-msg-composer.c:1296
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -10849,16 +10772,15 @@ msgstr ""
 "Σφάλμα κατά την αυτόματη αποθήκευση του μηνύματος: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1431
+#: composer/e-msg-composer.c:1390
 msgid ""
 "Ximian Evolution has found unsaved files from a previous session.\n"
 "Would you like to try to recover them?"
 msgstr ""
-"Το Ximian Evolution βρήκε αρχεία που δεν είχαν αποθηκευτεί από μια "
-"προηγούμενη συνεδρία.\n"
+"Το Ximian Evolution βρήκε αρχεία που δεν είχαν αποθηκευτεί από μια προηγούμενη συνεδρία.\n"
 "Θέλετε να γίνει προσπάθεια ανάκτηση τους;"
 
-#: composer/e-msg-composer.c:1594
+#: composer/e-msg-composer.c:1552
 #, c-format
 msgid ""
 "The message \"%s\" has not been sent.\n"
@@ -10869,28 +10791,30 @@ msgstr ""
 "\n"
 "Θέλετε να αποθηκεύσετε τις αλλαγές;"
 
-#: composer/e-msg-composer.c:1603
+#: composer/e-msg-composer.c:1561
 msgid "Warning: Modified Message"
 msgstr "Προειδοποίηση: Τροποποιημένο Μήνυμα"
 
-#: composer/e-msg-composer.c:1635
+#: composer/e-msg-composer.c:1593
 msgid "Open file"
 msgstr "Άνοιγμα αρχείου"
 
-#: composer/e-msg-composer.c:2054
+#: composer/e-msg-composer.c:2017
 msgid "Signature:"
 msgstr "Υπογραφή"
 
-#: composer/e-msg-composer.c:2094 mail/mail-account-gui.c:1261
+#: composer/e-msg-composer.c:2057
+#: mail/mail-account-gui.c:1261
 msgid "Autogenerated"
 msgstr "Αυτόματη δημιουργία"
 
-#: composer/e-msg-composer.c:2274 composer/e-msg-composer.c:2970
-#: composer/e-msg-composer.c:2971
+#: composer/e-msg-composer.c:2233
+#: composer/e-msg-composer.c:2902
+#: composer/e-msg-composer.c:2903
 msgid "Compose a message"
 msgstr "Συγγραφή νέου μηνύματος"
 
-#: composer/e-msg-composer.c:3002
+#: composer/e-msg-composer.c:2934
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
@@ -10898,7 +10822,7 @@ msgstr ""
 "Δεν ήταν δυνατή ή δημιουργία του παραθύρου του επεξεργαστή:\n"
 "Αδύνατη η ενεργοποίηση του συστατικού ελέγχου του επιλογέα διευθύνσεων."
 
-#: composer/e-msg-composer.c:3030
+#: composer/e-msg-composer.c:2962
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component.\n"
@@ -10910,7 +10834,7 @@ msgstr ""
 "Βεβαιωθείτε ότι έχετε εγκατεστημένη την σωστή έκδοση\n"
 "gtkhtml και libgtkhtml.\n"
 
-#: composer/e-msg-composer.c:3100
+#: composer/e-msg-composer.c:3029
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component."
@@ -10918,92 +10842,9 @@ msgstr ""
 "Δεν ήταν δυνατή ή δημιουργία του παραθύρου του επεξεργαστή:\n"
 "Αδύνατη η ενεργοποίηση του συστατικού του επεξεργαστή HTML."
 
-#: composer/e-msg-composer.c:4110
-msgid ""
-"<b>(The composer contains a non-text message body, which cannot be edited.)"
-"<b>"
-msgstr ""
-"<b>(Ο επεξεργαστής περιέχει ένα σώμα μηνύματος που δεν είναι κείμενο, στο "
-"οποίο δεν είναι δυνατή η επεξεργασία.)<b>"
-
-#: composer/e-msg-composer-hdrs.c:290
-#, fuzzy
-msgid "You need to configure an account before you can compose mail."
-msgstr ""
-"Πρέπει να ρυθμίσετε έναν λογαριασμό\n"
-"πριν από την συγγραφή μηνύματος"
-
-#: composer/e-msg-composer-hdrs.c:483
-msgid "Click here for the address book"
-msgstr "Κλικ εδώ για το βιβλίου διευθύνσεων"
-
-#.
-#. * Reply-To:
-#. *
-#. * Create this before we call create_from_optionmenu,
-#. * because that causes from_changed to be called, which
-#. * expects the reply_to fields to be initialized.
-#.
-#: composer/e-msg-composer-hdrs.c:514
-msgid "Reply-To:"
-msgstr "Απάντηση Σε:"
-
-#.
-#. * From
-#.
-#: composer/e-msg-composer-hdrs.c:520
-msgid "From:"
-msgstr "Από:"
-
-#.
-#. * Subject
-#.
-#: composer/e-msg-composer-hdrs.c:526
-msgid "Subject:"
-msgstr "Θέμα:"
-
-#: composer/e-msg-composer-hdrs.c:535
-msgid "To:"
-msgstr "Προς:"
-
-#: composer/e-msg-composer-hdrs.c:536
-msgid "Enter the recipients of the message"
-msgstr "Εισάγετε τους παραλήπτες του μηνύματος"
-
-#: composer/e-msg-composer-hdrs.c:539
-msgid "Cc:"
-msgstr "Κοινοποίηση:"
-
-#: composer/e-msg-composer-hdrs.c:540
-msgid "Enter the addresses that will receive a carbon copy of the message"
-msgstr "Εισάγετε τις διευθύνσεις όπου θα σταλεί αντίγραφο του μηνύματος"
-
-#: composer/e-msg-composer-hdrs.c:543
-msgid "Bcc:"
-msgstr "Κρυφή κοινοποίηση:"
-
-#: composer/e-msg-composer-hdrs.c:544
-msgid ""
-"Enter the addresses that will receive a carbon copy of the message without "
-"appearing in the recipient list of the message."
-msgstr ""
-"Εισάγετε τις διευθύνσεις όπου θα σταλεί αντίγραφο του μηνύματος χωρίς αυτές "
-"να εμφανιστούν στον κατάλογο παραληπτών του μηνύματος."
-
-#.
-#. * Post-To
-#.
-#: composer/e-msg-composer-hdrs.c:551
-msgid "Post To:"
-msgstr "Αποστολή σε:"
-
-#: composer/e-msg-composer-hdrs.c:553
-msgid "Posting destination"
-msgstr "Προορισμός αποστολής"
-
-#: composer/e-msg-composer-select-file.c:119
-msgid "Attach file(s)"
-msgstr "Επισύναψη αρχείου"
+#: composer/e-msg-composer.c:4045
+msgid "<b>(The composer contains a non-text message body, which cannot be edited.)<b>"
+msgstr "<b>(Ο επεξεργαστής περιέχει ένα σώμα μηνύματος που δεν είναι κείμενο, στο οποίο δεν είναι δυνατή η επεξεργασία.)<b>"
 
 #: data/evolution.desktop.in.h:1
 msgid "The Evolution groupware suite"
@@ -11082,8 +10923,7 @@ msgstr "<b>Ξεκινάει:</b> "
 
 #: designs/OOA/ooa.glade.h:6
 msgid ""
-"<small>The message specified below will be automatically sent to each person "
-"who sends\n"
+"<small>The message specified below will be automatically sent to each person who sends\n"
 "mail to you while you are out of the office.</small>"
 msgstr ""
 
@@ -11127,10 +10967,8 @@ msgstr "Αποστέλλονται τα μηνύματα"
 
 #: designs/read_receipts/read.glade.h:4
 msgid ""
-"<small>This page allows you to choose if you want to be notified via a read "
-"receipt when a message you\n"
-"sent is read, and to specify what Evolution should do when someone requests "
-"a receipt from you.</small>"
+"<small>This page allows you to choose if you want to be notified via a read receipt when a message you\n"
+"sent is read, and to specify what Evolution should do when someone requests a receipt from you.</small>"
 msgstr ""
 
 #: designs/read_receipts/read.glade.h:6
@@ -11159,9 +10997,7 @@ msgid "Unless the message is sent to a mailing list, and not to me personally"
 msgstr ""
 
 #: designs/read_receipts/read.glade.h:12
-msgid ""
-"When you receive an email with a read receipt request, what should Evolution "
-"do?"
+msgid "When you receive an email with a read receipt request, what should Evolution do?"
 msgstr ""
 
 #: e-util/e-dialog-utils.c:247
@@ -11173,6 +11009,7 @@ msgstr ""
 "Να γίνει επικάλυψη;"
 
 #: e-util/e-dialog-utils.c:249
+#: mail/mail-display.c:200
 msgid "Overwrite file?"
 msgstr "Επικάλυψη αρχείου;"
 
@@ -11182,8 +11019,7 @@ msgstr "Απομνημόνευση του κωδικού πρόσβασης"
 
 #: e-util/e-passwords.c:359
 msgid "Remember this password for the remainder of this session"
-msgstr ""
-"Απομνημόνευση αυτού του κωδικού πρόσβασης για το υπόλοιπο της συνεδρίας"
+msgstr "Απομνημόνευση αυτού του κωδικού πρόσβασης για το υπόλοιπο της συνεδρίας"
 
 #: e-util/e-pilot-settings.c:93
 msgid "Sync Private Records:"
@@ -11195,210 +11031,98 @@ msgstr "Κατηγορίες συγχρονισμού:"
 
 #. strptime format of a weekday, a date and a time,
 #. in 12-hour format, without seconds.
-#: e-util/e-time-utils.c:185 e-util/e-time-utils.c:398
+#: e-util/e-time-utils.c:172
+#: e-util/e-time-utils.c:385
 msgid "%a %m/%d/%Y %I:%M %p"
 msgstr "%a %d/%m/%Y %I:%M %p"
 
 #. strptime format of a weekday, a date and a time,
 #. in 24-hour format, without seconds.
-#: e-util/e-time-utils.c:190 e-util/e-time-utils.c:389
+#: e-util/e-time-utils.c:177
+#: e-util/e-time-utils.c:376
 msgid "%a %m/%d/%Y %H:%M"
 msgstr "%a %d/%m/%Y %H:%M"
 
 #. strptime format of a weekday, a date and a time,
 #. in 12-hour format, without minutes or seconds.
-#: e-util/e-time-utils.c:195
+#: e-util/e-time-utils.c:182
 msgid "%a %m/%d/%Y %I %p"
 msgstr "%a %d/%m/%Y %I %p"
 
 #. strptime format of a weekday, a date and a time,
 #. in 24-hour format, without minutes or seconds.
-#: e-util/e-time-utils.c:200
+#: e-util/e-time-utils.c:187
 msgid "%a %m/%d/%Y %H"
 msgstr "%a %d/%m/%Y %H"
 
 #. strptime format of a date and a time, in 12-hour format.
-#: e-util/e-time-utils.c:211
+#: e-util/e-time-utils.c:198
 msgid "%m/%d/%Y %I:%M:%S %p"
 msgstr "%d/%m/%Y %I:%M:%S %p"
 
 #. strptime format of a date and a time, in 24-hour format.
-#: e-util/e-time-utils.c:215
+#: e-util/e-time-utils.c:202
 msgid "%m/%d/%Y %H:%M:%S"
 msgstr "%d/%m/%Y %H:%M:%S"
 
 #. strptime format of a date and a time, in 12-hour format,
 #. without seconds.
-#: e-util/e-time-utils.c:220
+#: e-util/e-time-utils.c:207
 msgid "%m/%d/%Y %I:%M %p"
 msgstr "%d/%m/%Y %I:%M %p"
 
 #. strptime format of a date and a time, in 24-hour format,
 #. without seconds.
-#: e-util/e-time-utils.c:225
+#: e-util/e-time-utils.c:212
 msgid "%m/%d/%Y %H:%M"
 msgstr "%d/%m/%Y %H:%M"
 
 #. strptime format of a date and a time, in 12-hour format,
 #. without minutes or seconds.
-#: e-util/e-time-utils.c:230
+#: e-util/e-time-utils.c:217
 msgid "%m/%d/%Y %I %p"
 msgstr "%d/%m/%Y %I %p"
 
 #. strptime format of a date and a time, in 24-hour format,
 #. without minutes or seconds.
-#: e-util/e-time-utils.c:235
+#: e-util/e-time-utils.c:222
 msgid "%m/%d/%Y %H"
 msgstr "%d/%m/%Y %H"
 
 #. strptime format for a time of day, in 12-hour format.
-#: e-util/e-time-utils.c:339 e-util/e-time-utils.c:438
+#: e-util/e-time-utils.c:326
+#: e-util/e-time-utils.c:425
 msgid "%I:%M:%S %p"
 msgstr "%I:%M:%S %p"
 
 #. strptime format for a time of day, in 24-hour format.
-#: e-util/e-time-utils.c:343 e-util/e-time-utils.c:430
+#: e-util/e-time-utils.c:330
+#: e-util/e-time-utils.c:417
 msgid "%H:%M:%S"
 msgstr "%H:%M:%S"
 
 #. strptime format for time of day, without seconds,
 #. in 12-hour format.
-#: e-util/e-time-utils.c:348 e-util/e-time-utils.c:435
-#: widgets/misc/e-dateedit.c:1417 widgets/misc/e-dateedit.c:1642
+#: e-util/e-time-utils.c:335
+#: e-util/e-time-utils.c:422
+#: widgets/misc/e-dateedit.c:1404
+#: widgets/misc/e-dateedit.c:1617
 msgid "%I:%M %p"
 msgstr "%I:%M %p"
 
 #. strptime format for time of day, without seconds 24-hour format.
-#: e-util/e-time-utils.c:352 e-util/e-time-utils.c:427
-#: widgets/misc/e-dateedit.c:1414 widgets/misc/e-dateedit.c:1639
+#: e-util/e-time-utils.c:339
+#: e-util/e-time-utils.c:414
+#: widgets/misc/e-dateedit.c:1401
+#: widgets/misc/e-dateedit.c:1614
 msgid "%H:%M"
 msgstr "%H:%M"
 
 #. strptime format for hour and AM/PM, 12-hour format.
-#: e-util/e-time-utils.c:356
+#: e-util/e-time-utils.c:343
 msgid "%I %p"
 msgstr "%I %p"
 
-#: executive-summary/component/component-factory.c:151
-#, fuzzy
-msgid "Cannot initialize Evolution's Executive Summary component."
-msgstr "Στοιχείο περίληψης του Evolution."
-
-#: executive-summary/component/e-summary.c:925
-#, fuzzy, c-format
-msgid ""
-"Cannot open the HTML file:\n"
-"%s"
-msgstr ""
-"Δεν ήταν δυνατή η μετονομασία του φακέλου :\n"
-"%s"
-
-#: executive-summary/component/e-summary.c:939
-#, fuzzy, c-format
-msgid ""
-"Error reading data:\n"
-"%s"
-msgstr "Σφάλμα κατά το φόρτωμα του %s"
-
-#: executive-summary/component/e-summary.c:957
-msgid "File does not have a place for the services.\n"
-msgstr ""
-
-#: executive-summary/component/e-summary-callbacks.c:125
-#, fuzzy
-msgid "Select a service"
-msgstr "Επιλέξτε ένα αρχείο"
-
-#: executive-summary/component/e-summary-callbacks.c:289
-msgid ""
-"You can select a different HTML page for the background of the Executive "
-"Summary.\n"
-"\n"
-"Just leave it blank for the default"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:69
-#: executive-summary/component/e-summary-url.c:74
-#: executive-summary/component/e-summary-url.c:81
-#, c-format
-msgid "Open %s with the default GNOME application"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:70
-#, c-format
-msgid "Open %s with the default GNOME web browser"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:71
-#, fuzzy, c-format
-msgid "Send an email to %s"
-msgstr "Αποστολή e-mail"
-
-#: executive-summary/component/e-summary-url.c:72
-#, fuzzy, c-format
-msgid "Change the view to %s"
-msgstr "Ο τύπος της προβολής για εμφάνιση"
-
-#: executive-summary/component/e-summary-url.c:73
-#, fuzzy, c-format
-msgid "Run %s"
-msgstr "URL: %s"
-
-#: executive-summary/component/e-summary-url.c:75
-#, fuzzy, c-format
-msgid "Close %s"
-msgstr "Κλείσιμο"
-
-#: executive-summary/component/e-summary-url.c:76
-#, fuzzy, c-format
-msgid "Move %s to the left"
-msgstr "Μετακίνηση αυτού του φακέλου σε άλλη θέση"
-
-#: executive-summary/component/e-summary-url.c:77
-#, c-format
-msgid "Move %s to the right"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:78
-#, c-format
-msgid "Move %s into the previous row"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:79
-#, c-format
-msgid "Move %s into the next row"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:80
-#, fuzzy, c-format
-msgid "Configure %s"
-msgstr "Ρυθμίζεται ξανά ο /%s"
-
-#: executive-summary/component/e-summary-url.c:553
-#, fuzzy
-msgid "page"
-msgstr "Σελίδα"
-
-#: executive-summary/test-service/rdf-summary.c:512
-#: executive-summary/test-service/rdf-summary.c:549
-#: executive-summary/test-service/rdf-summary.c:594
-msgid "Error"
-msgstr "Σφάλμα"
-
-#: executive-summary/test-service/rdf-summary.c:775
-msgid "Update automatically"
-msgstr ""
-
-#: executive-summary/test-service/rdf-summary.c:785
-#, fuzzy
-msgid "Update now"
-msgstr "Ενημέρωση"
-
-#: executive-summary/test-service/rdf-summary.c:795
-#, fuzzy
-msgid "Update every "
-msgstr "Ανα_νέωση Διαθεσιμότητας"
-
 #: filter/filter-datespec.c:65
 #, fuzzy
 msgid "1 second ago"
@@ -11435,7 +11159,7 @@ msgid "1 day ago"
 msgstr "1 ημέρα"
 
 #: filter/filter-datespec.c:68
-#, fuzzy, c-format
+#, fuzzy
 msgid "%d days ago"
 msgstr "%d πριν"
 
@@ -11455,7 +11179,7 @@ msgid "1 month ago"
 msgstr "μήνας"
 
 #: filter/filter-datespec.c:70
-#, fuzzy, c-format
+#, fuzzy
 msgid "%d months ago"
 msgstr "%d πριν"
 
@@ -11465,7 +11189,7 @@ msgid "1 year ago"
 msgstr "1 έτος πριν"
 
 #: filter/filter-datespec.c:71
-#, fuzzy, c-format
+#, fuzzy
 msgid "%d years ago"
 msgstr "%d πριν"
 
@@ -11477,7 +11201,8 @@ msgstr "Πρέπει να επιλέξετε μια ημερομηνία."
 msgid "<click here to select a date>"
 msgstr "<κάντε κλικ εδώ για να επιλέξετε ημερομηνία>"
 
-#: filter/filter-datespec.c:278 filter/filter-datespec.c:289
+#: filter/filter-datespec.c:278
+#: filter/filter-datespec.c:289
 msgid "now"
 msgstr "τώρα"
 
@@ -11490,7 +11215,8 @@ msgstr "%d-%b-%Y"
 msgid "Select a time to compare against"
 msgstr "Επιλέξτε μια ώρα για να συγκρίνετε"
 
-#: filter/filter-editor.c:114 filter/filter.glade.h:4
+#: filter/filter-editor.c:114
+#: filter/filter.glade.h:4
 msgid "Filter Rules"
 msgstr "Κανόνες Φίλτρων"
 
@@ -11516,11 +11242,103 @@ msgstr "Τότε"
 msgid "You must specify a folder."
 msgstr "Πρέπει να καθορίσετε ένα κατάλογο."
 
-#: filter/filter-folder.c:243 filter/vfolder-rule.c:438
-#: mail/mail-account-gui.c:1510 mail/mail-account-gui.c:1524
+#: filter/filter-folder.c:243
+#: filter/vfolder-rule.c:438
+#: mail/mail-account-gui.c:1510
+#: mail/mail-account-gui.c:1524
 msgid "Select Folder"
 msgstr "Επιλογή Φακέλου"
 
+#: filter/filter-input.c:191
+#, c-format
+msgid ""
+"Error in regular expression '%s':\n"
+"%s"
+msgstr ""
+"Σφάλμα στην κανονική έκφραση '%s':\n"
+"%s"
+
+#: filter/filter-label.c:121
+#: filter/libfilter-i18n.h:26
+#: mail/mail-config.c:65
+#: mail/mail-config.glade.h:62
+#: shell/e-config-upgrade.c:1404
+msgid "Important"
+msgstr "Σημαντικό"
+
+#. red
+#: filter/filter-label.c:122
+#: mail/mail-config.c:66
+#: mail/mail-config.glade.h:129
+#: shell/e-config-upgrade.c:1405
+msgid "Work"
+msgstr "Εργασία"
+
+#. orange
+#: filter/filter-label.c:123
+#: mail/mail-config.c:67
+#: mail/mail-config.glade.h:84
+#: shell/e-config-upgrade.c:1406
+msgid "Personal"
+msgstr "Προσωπικό"
+
+#. forest green
+#: filter/filter-label.c:124
+#: mail/mail-config.c:68
+#: mail/mail-config.glade.h:120
+#: shell/e-config-upgrade.c:1407
+msgid "To Do"
+msgstr "Πρός Τακτοποίηση"
+
+#. blue
+#: filter/filter-label.c:125
+#: mail/mail-config.c:69
+#: mail/mail-config.glade.h:66
+#: shell/e-config-upgrade.c:1408
+msgid "Later"
+msgstr "Αργότερα"
+
+#: filter/filter-part.c:531
+#: shell/evolution-test-component.c:63
+msgid "Test"
+msgstr "Δοκιμή"
+
+#: filter/filter-rule.c:219
+msgid "You must name this filter."
+msgstr "Πρέπει να δώσετε όνομα σ' αυτό το φίλτρο."
+
+#: filter/filter-rule.c:751
+msgid "Rule name: "
+msgstr "'Όνομα κανόνα: "
+
+#: filter/filter-rule.c:755
+msgid "Untitled"
+msgstr "Χωρίς τίτλο"
+
+#: filter/filter-rule.c:772
+msgid "If"
+msgstr "Αν"
+
+#: filter/filter-rule.c:791
+msgid "Execute actions"
+msgstr "Εκτέλεση ενεργειών"
+
+#: filter/filter-rule.c:795
+msgid "if all criteria are met"
+msgstr "αν ικανοποιηθούν όλα τα κριτήρια"
+
+#: filter/filter-rule.c:800
+msgid "if any criteria are met"
+msgstr "αν ικανοποιηθούν κάποια από τα κριτήρια"
+
+#: filter/filter-rule.c:895
+msgid "incoming"
+msgstr "εισερχόμενα"
+
+#: filter/filter-rule.c:895
+msgid "outgoing"
+msgstr "εξερχόμενα"
+
 #: filter/filter.glade.h:1
 msgid "Compare against"
 msgstr "Σύγκριση με"
@@ -11565,7 +11383,8 @@ msgstr ""
 "Η ημερομηνία του μηνύματος θα συγκριθεί με\n"
 "την τρέχουσα ώρα  όταν λειτουργεί το φίλτρο."
 
-#: filter/filter.glade.h:13 filter/vfolder-editor.c:114
+#: filter/filter.glade.h:13
+#: filter/vfolder-editor.c:114
 msgid "Virtual Folders"
 msgstr "Εικονικοί Φάκελοι"
 
@@ -11581,7 +11400,8 @@ msgstr "πριν"
 msgid "months"
 msgstr "μήνες"
 
-#: filter/filter.glade.h:21 mail/mail-config.glade.h:174
+#: filter/filter.glade.h:21
+#: mail/mail-config.glade.h:174
 msgid "seconds"
 msgstr "δευτερόλεπτα"
 
@@ -11621,84 +11441,6 @@ msgstr "με όλους τους τοπικούς φακέλους"
 msgid "years"
 msgstr "χρόνια"
 
-#: filter/filter-input.c:191
-#, c-format
-msgid ""
-"Error in regular expression '%s':\n"
-"%s"
-msgstr ""
-"Σφάλμα στην κανονική έκφραση '%s':\n"
-"%s"
-
-#: filter/filter-label.c:121 filter/libfilter-i18n.h:17 mail/mail-config.c:65
-#: mail/mail-config.glade.h:62 shell/e-config-upgrade.c:1454
-msgid "Important"
-msgstr "Σημαντικό"
-
-#. red
-#: filter/filter-label.c:122 mail/mail-config.c:66
-#: mail/mail-config.glade.h:129 shell/e-config-upgrade.c:1455
-msgid "Work"
-msgstr "Εργασία"
-
-#. orange
-#: filter/filter-label.c:123 mail/mail-config.c:67 mail/mail-config.glade.h:84
-#: shell/e-config-upgrade.c:1456
-msgid "Personal"
-msgstr "Προσωπικό"
-
-#. forest green
-#: filter/filter-label.c:124 mail/mail-config.c:68
-#: mail/mail-config.glade.h:120 shell/e-config-upgrade.c:1457
-msgid "To Do"
-msgstr "Πρός Τακτοποίηση"
-
-#. blue
-#: filter/filter-label.c:125 mail/mail-config.c:69 mail/mail-config.glade.h:66
-#: shell/e-config-upgrade.c:1458
-msgid "Later"
-msgstr "Αργότερα"
-
-#: filter/filter-part.c:531 shell/evolution-test-component.c:63
-msgid "Test"
-msgstr "Δοκιμή"
-
-#: filter/filter-rule.c:219
-msgid "You must name this filter."
-msgstr "Πρέπει να δώσετε όνομα σ' αυτό το φίλτρο."
-
-#: filter/filter-rule.c:751
-msgid "Rule name: "
-msgstr "'Όνομα κανόνα: "
-
-#: filter/filter-rule.c:755
-msgid "Untitled"
-msgstr "Χωρίς τίτλο"
-
-#: filter/filter-rule.c:772
-msgid "If"
-msgstr "Αν"
-
-#: filter/filter-rule.c:791
-msgid "Execute actions"
-msgstr "Εκτέλεση ενεργειών"
-
-#: filter/filter-rule.c:795
-msgid "if all criteria are met"
-msgstr "αν ικανοποιηθούν όλα τα κριτήρια"
-
-#: filter/filter-rule.c:800
-msgid "if any criteria are met"
-msgstr "αν ικανοποιηθούν κάποια από τα κριτήρια"
-
-#: filter/filter-rule.c:895
-msgid "incoming"
-msgstr "εισερχόμενα"
-
-#: filter/filter-rule.c:895
-msgid "outgoing"
-msgstr "εξερχόμενα"
-
 #. Automatically generated. Do not edit.
 #: filter/libfilter-i18n.h:2
 msgid "Adjust Score"
@@ -11721,217 +11463,226 @@ msgid "Beep"
 msgstr "Ήχος"
 
 #: filter/libfilter-i18n.h:7
+msgid "contains"
+msgstr "περιέχει"
+
+#: filter/libfilter-i18n.h:8
 msgid "Copy to Folder"
 msgstr "Αντιγραφή σε Φάκελο"
 
-#: filter/libfilter-i18n.h:8
+#: filter/libfilter-i18n.h:9
 msgid "Date received"
 msgstr "Ημερομηνία παραλαβής"
 
-#: filter/libfilter-i18n.h:9
+#: filter/libfilter-i18n.h:10
 msgid "Date sent"
 msgstr "Ημερομηνία αποστολής"
 
-#: filter/libfilter-i18n.h:11
+#: filter/libfilter-i18n.h:12
 msgid "Deleted"
 msgstr "Διαγραμμένα"
 
-#: filter/libfilter-i18n.h:12
-msgid "Do Not Exist"
-msgstr "Δεν Υπάρχει"
-
 #: filter/libfilter-i18n.h:13
-msgid "Draft"
-msgstr "Πρόχειρα"
+msgid "does not contain"
+msgstr "δεν περιέχει"
 
 #: filter/libfilter-i18n.h:14
-msgid "Exist"
-msgstr "Υπάρχει"
+msgid "does not end with"
+msgstr "δεν τελειώνει με"
 
 #: filter/libfilter-i18n.h:15
-msgid "Expression"
-msgstr "Έκφραση"
+msgid "does not exist"
+msgstr "δεν υπάρχει"
 
 #: filter/libfilter-i18n.h:16
-msgid "Follow Up"
-msgstr ""
+msgid "does not return"
+msgstr "δεν επιστρέφει"
+
+#: filter/libfilter-i18n.h:17
+msgid "does not sound like"
+msgstr "δεν φαίνεται να είναι"
 
 #: filter/libfilter-i18n.h:18
-msgid "Label"
-msgstr "Ετικέτα"
+msgid "does not start with"
+msgstr "δεν ξεκινά με"
 
 #: filter/libfilter-i18n.h:19
-msgid "Mailing list"
-msgstr "Λίστα Ταχυδρομείου"
+msgid "Do Not Exist"
+msgstr "Δεν Υπάρχει"
 
 #: filter/libfilter-i18n.h:20
-msgid "Message Body"
-msgstr "Σώμα Μηνύματος"
+msgid "Draft"
+msgstr "Πρόχειρα"
 
 #: filter/libfilter-i18n.h:21
-msgid "Message Header"
-msgstr "Επικεφαλίδα Μηνύματος"
+msgid "ends with"
+msgstr "τελείωνε με"
 
 #: filter/libfilter-i18n.h:22
-msgid "Move to Folder"
-msgstr "Μετακίνηση σε Φάκελο"
+msgid "Exist"
+msgstr "Υπάρχει"
 
 #: filter/libfilter-i18n.h:23
-msgid "Pipe Message to Shell Command"
-msgstr "Σωλήνωση μηνύματος στην εντολή κελύφους"
+msgid "exists"
+msgstr "υπάρχει"
 
 #: filter/libfilter-i18n.h:24
-msgid "Play Sound"
-msgstr "Εκτέλεση Ήχου"
-
-#: filter/libfilter-i18n.h:25 mail/message-tag-followup.c:68
-msgid "Read"
-msgstr "Αναγνωσμένα"
+msgid "Expression"
+msgstr "Έκφραση"
 
-#: filter/libfilter-i18n.h:26
-msgid "Recipients"
-msgstr "Παραλήπτες"
+#: filter/libfilter-i18n.h:25
+msgid "Follow Up"
+msgstr ""
 
 #: filter/libfilter-i18n.h:27
-msgid "Regex Match"
-msgstr "Ταίριασμα κανον. έκφρ."
+msgid "is"
+msgstr "είναι"
 
 #: filter/libfilter-i18n.h:28
-msgid "Replied to"
-msgstr "Απαντημένα στους"
+msgid "is after"
+msgstr "ήταν μετά"
 
-#: filter/libfilter-i18n.h:29 filter/score-rule.c:184 filter/score-rule.c:186
-#: mail/message-list.etspec.h:10
-msgid "Score"
-msgstr "Σκορ"
+#: filter/libfilter-i18n.h:29
+msgid "is before"
+msgstr "ήταν πριν"
 
 #: filter/libfilter-i18n.h:30
-msgid "Sender"
-msgstr "Αποστολέας"
+msgid "is Flagged"
+msgstr "έχει σημαία"
 
 #: filter/libfilter-i18n.h:31
-msgid "Set Status"
-msgstr "Ορισμός Κατάστασης"
+msgid "is greater than"
+msgstr "είναι μεγαλύτερο από"
 
 #: filter/libfilter-i18n.h:32
-msgid "Shell Command"
-msgstr "Εντολή κελύφους"
+msgid "is less than"
+msgstr "είναι μικρότερο από"
 
 #: filter/libfilter-i18n.h:33
-msgid "Size (kB)"
-msgstr "Μέγεθος (kB)"
+msgid "is not"
+msgstr "δεν είναι"
 
 #: filter/libfilter-i18n.h:34
-msgid "Source Account"
-msgstr "Πηγαίος Λογαριασμός"
+msgid "is not Flagged"
+msgstr "δεν έχει σημαία"
 
 #: filter/libfilter-i18n.h:35
-msgid "Specific header"
-msgstr "Ακριβής επικεφαλίδα"
+#: mail/folder-browser.c:1800
+msgid "Label"
+msgstr "Ετικέτα"
+
+#: filter/libfilter-i18n.h:36
+msgid "Mailing list"
+msgstr "Λίστα Ταχυδρομείου"
 
 #: filter/libfilter-i18n.h:37
-msgid "Stop Processing"
-msgstr "Τερματισμός Επεξεργασίας"
+msgid "Message Body"
+msgstr "Σώμα Μηνύματος"
 
-#: filter/libfilter-i18n.h:38 mail/message-list.etspec.h:13
-#: mail/message-tag-followup.c:305
-msgid "Subject"
-msgstr "Θέμα"
+#: filter/libfilter-i18n.h:38
+msgid "Message Header"
+msgstr "Επικεφαλίδα Μηνύματος"
 
 #: filter/libfilter-i18n.h:39
-msgid "Unset Status"
-msgstr "Ορισμός Κατάστασης"
+msgid "Move to Folder"
+msgstr "Μετακίνηση σε Φάκελο"
 
 #: filter/libfilter-i18n.h:40
-msgid "contains"
-msgstr "περιέχει"
+msgid "Pipe Message to Shell Command"
+msgstr "Σωλήνωση μηνύματος στην εντολή κελύφους"
 
 #: filter/libfilter-i18n.h:41
-msgid "does not contain"
-msgstr "δεν περιέχει"
+msgid "Play Sound"
+msgstr "Εκτέλεση Ήχου"
 
 #: filter/libfilter-i18n.h:42
-msgid "does not end with"
-msgstr "δεν τελειώνει με"
+#: mail/message-tag-followup.c:68
+msgid "Read"
+msgstr "Αναγνωσμένα"
 
 #: filter/libfilter-i18n.h:43
-msgid "does not exist"
-msgstr "δεν υπάρχει"
+msgid "Recipients"
+msgstr "Παραλήπτες"
 
 #: filter/libfilter-i18n.h:44
-msgid "does not return"
-msgstr "δεν επιστρέφει"
+msgid "Regex Match"
+msgstr "Ταίριασμα κανον. έκφρ."
 
 #: filter/libfilter-i18n.h:45
-msgid "does not sound like"
-msgstr "δεν φαίνεται να είναι"
+msgid "Replied to"
+msgstr "Απαντημένα στους"
 
 #: filter/libfilter-i18n.h:46
-msgid "does not start with"
-msgstr "δεν ξεκινά με"
+msgid "returns"
+msgstr "επιστρέφει"
 
 #: filter/libfilter-i18n.h:47
-msgid "ends with"
-msgstr "τελείωνε με"
+msgid "returns greater than"
+msgstr "επιστρέφει μεγαλύτερο από"
 
 #: filter/libfilter-i18n.h:48
-msgid "exists"
-msgstr "υπάρχει"
+msgid "returns less than"
+msgstr "επιστρέφει λιγότερο από"
 
 #: filter/libfilter-i18n.h:49
-msgid "is Flagged"
-msgstr "έχει σημαία"
+#: filter/score-rule.c:184
+#: filter/score-rule.c:186
+#: mail/message-list.etspec.h:10
+msgid "Score"
+msgstr "Σκορ"
 
 #: filter/libfilter-i18n.h:50
-msgid "is after"
-msgstr "ήταν μετά"
+#: mail/mail-callbacks.c:1820
+msgid "Sender"
+msgstr "Αποστολέας"
 
 #: filter/libfilter-i18n.h:51
-msgid "is before"
-msgstr "ήταν πριν"
+msgid "Set Status"
+msgstr "Ορισμός Κατάστασης"
 
 #: filter/libfilter-i18n.h:52
-msgid "is greater than"
-msgstr "είναι μεγαλύτερο από"
+msgid "Shell Command"
+msgstr "Εντολή κελύφους"
 
 #: filter/libfilter-i18n.h:53
-msgid "is less than"
-msgstr "είναι μικρότερο από"
+msgid "Size (kB)"
+msgstr "Μέγεθος (kB)"
 
 #: filter/libfilter-i18n.h:54
-msgid "is not Flagged"
-msgstr "δεν έχει σημαία"
+msgid "sounds like"
+msgstr "φαίνεται να είναι"
 
 #: filter/libfilter-i18n.h:55
-msgid "is not"
-msgstr "δεν είναι"
+msgid "Source Account"
+msgstr "Πηγαίος Λογαριασμός"
 
 #: filter/libfilter-i18n.h:56
-msgid "is"
-msgstr "είναι"
+msgid "Specific header"
+msgstr "Ακριβής επικεφαλίδα"
 
 #: filter/libfilter-i18n.h:57
-msgid "returns greater than"
-msgstr "επιστρέφει μεγαλύτερο από"
-
-#: filter/libfilter-i18n.h:58
-msgid "returns less than"
-msgstr "επιστρέφει λιγότερο από"
+msgid "starts with"
+msgstr "ξεκινά με"
 
 #: filter/libfilter-i18n.h:59
-msgid "returns"
-msgstr "επιστρέφει"
+msgid "Stop Processing"
+msgstr "Τερματισμός Επεξεργασίας"
 
 #: filter/libfilter-i18n.h:60
-msgid "sounds like"
-msgstr "φαίνεται να είναι"
+#: mail/mail-format.c:934
+#: mail/message-list.etspec.h:13
+#: mail/message-tag-followup.c:305
+msgid "Subject"
+msgstr "Θέμα"
 
 #: filter/libfilter-i18n.h:61
-msgid "starts with"
-msgstr "ξεκινά με"
+msgid "Unset Status"
+msgstr "Ορισμός Κατάστασης"
 
-#: filter/rule-context.c:684 filter/rule-editor.c:241 filter/rule-editor.c:326
-#: mail/mail-vfolder.c:916
+#: filter/rule-context.c:664
+#: filter/rule-editor.c:241
+#: filter/rule-editor.c:326
+#: mail/mail-vfolder.c:917
 #, c-format
 msgid "Rule name '%s' is not unique, choose another."
 msgstr "Το όνομα κανόνα '%s' δεν είναι μοναδικό, επιλέξτε ένα άλλο."
@@ -11968,44 +11719,63 @@ msgstr "Πρέπει να δηλώσετε τουλάχιστον έναν φά�
 msgid "VFolder source"
 msgstr "Πηγή εΦακέλων"
 
-#: importers/elm-importer.c:95 mail/importers/elm-importer.c:105
+#: importers/elm-importer.c:95
+#: mail/importers/elm-importer.c:105
 msgid "Evolution is importing your old Elm mail"
 msgstr "Evolution εισάγει τα παλαιά σας Elm μηνύματα"
 
-#: importers/elm-importer.c:96 importers/netscape-importer.c:1228
-#: importers/pine-importer.c:101 mail/importers/elm-importer.c:106
-#: mail/importers/netscape-importer.c:1238 mail/importers/pine-importer.c:115
+#: importers/elm-importer.c:96
+#: importers/netscape-importer.c:1228
+#: importers/pine-importer.c:101
+#: mail/importers/elm-importer.c:106
+#: mail/importers/netscape-importer.c:1238
+#: mail/importers/pine-importer.c:115
 msgid "Importing..."
 msgstr "Γίνεται εισαγωγή..."
 
-#: importers/elm-importer.c:98 importers/netscape-importer.c:1230
-#: importers/pine-importer.c:103 mail/importers/elm-importer.c:108
-#: mail/importers/netscape-importer.c:1240 mail/importers/pine-importer.c:117
+#: importers/elm-importer.c:98
+#: importers/netscape-importer.c:1230
+#: importers/pine-importer.c:103
+#: mail/importers/elm-importer.c:108
+#: mail/importers/netscape-importer.c:1240
+#: mail/importers/pine-importer.c:117
 msgid "Please wait"
 msgstr "Παρακαλώ περιμένετε"
 
-#: importers/elm-importer.c:169 importers/netscape-importer.c:1808
-#: importers/pine-importer.c:365 mail/importers/elm-importer.c:157
-#: mail/importers/netscape-importer.c:1759 mail/importers/pine-importer.c:288
+#: importers/elm-importer.c:169
+#: importers/netscape-importer.c:1808
+#: importers/pine-importer.c:365
+#: mail/importers/elm-importer.c:157
+#: mail/importers/netscape-importer.c:1759
+#: mail/importers/pine-importer.c:288
 #, c-format
 msgid "Importing %s as %s"
 msgstr "Εισάγεται %s ως %s"
 
-#: importers/elm-importer.c:375 importers/netscape-importer.c:1917
-#: importers/pine-importer.c:471 mail/importers/elm-importer.c:392
-#: mail/importers/netscape-importer.c:1887 mail/importers/pine-importer.c:425
+#: importers/elm-importer.c:375
+#: importers/netscape-importer.c:1917
+#: importers/pine-importer.c:471
+#: mail/importers/elm-importer.c:392
+#: mail/importers/netscape-importer.c:1887
+#: mail/importers/pine-importer.c:425
 #, c-format
 msgid "Scanning %s"
 msgstr "Γίνεται σάρωση του %s"
 
-#: importers/elm-importer.c:525 importers/netscape-importer.c:2128
-#: importers/pine-importer.c:637 mail/component-factory.c:116
-#: mail/importers/elm-importer.c:526 mail/importers/netscape-importer.c:2085
-#: mail/importers/pine-importer.c:572 my-evolution/my-evolution.glade.h:4
+#: importers/elm-importer.c:525
+#: importers/netscape-importer.c:2128
+#: importers/pine-importer.c:637
+#: mail/component-factory.c:117
+#: mail/folder-browser-ui.c:360
+#: mail/importers/elm-importer.c:526
+#: mail/importers/netscape-importer.c:2085
+#: mail/importers/pine-importer.c:572
+#: my-evolution/my-evolution.glade.h:4
 msgid "Mail"
 msgstr "Μηνύματα"
 
-#: importers/elm-importer.c:545 mail/importers/elm-importer.c:547
+#: importers/elm-importer.c:545
+#: mail/importers/elm-importer.c:547
 msgid ""
 "Evolution has found Elm mail files\n"
 "Would you like to import them into Evolution?"
@@ -12013,7 +11783,8 @@ msgstr ""
 "Το Evolution βρήκε μηνύματα Elm\n"
 "Θέλετε να γίνει εισαγωγή στο Evolution;"
 
-#: importers/elm-importer.c:574 mail/importers/elm-importer.c:568
+#: importers/elm-importer.c:574
+#: mail/importers/elm-importer.c:568
 msgid "Elm"
 msgstr "Elm"
 
@@ -12025,12 +11796,14 @@ msgstr ""
 "Το Evolution βρήκε μηνύματα Elm\n"
 "Θέλετε να εισαχθούν στο Evolution;"
 
-#: importers/netscape-importer.c:70 mail/importers/netscape-importer.c:75
+#: importers/netscape-importer.c:70
+#: mail/importers/netscape-importer.c:75
 #, c-format
 msgid "Priority Filter \"%s\""
 msgstr "Φίλτρο προτεραιότητας \"%s\""
 
-#: importers/netscape-importer.c:653 mail/importers/netscape-importer.c:663
+#: importers/netscape-importer.c:653
+#: mail/importers/netscape-importer.c:663
 msgid ""
 "Some of your Netscape email filters are based on\n"
 "email priorities, which are not used in Evolution.\n"
@@ -12050,14 +11823,13 @@ msgstr ""
 "έως 3 που μπορούν αν ανατεθούν σε email και να φιλτραριστούν\n"
 "αντίστοιχα.\n"
 "\n"
-"Σαν λύση έχει προστεθεί μια ομάδα φίλτρων που ονομάζεται \"Φίλτρο "
-"Προτεραιότητας\"\n"
+"Σαν λύση έχει προστεθεί μια ομάδα φίλτρων που ονομάζεται \"Φίλτρο Προτεραιότητας\"\n"
 "για να μετατρέπει τις προτεραιότητες του Netscape σε σκορ του Evolution\n"
-"ώστε τα φίλτρα να χρησιμοποιούν σκορ αντί για προτεραιότητες. Ελέγξτε τα "
-"εισηγμένα\n"
+"ώστε τα φίλτρα να χρησιμοποιούν σκορ αντί για προτεραιότητες. Ελέγξτε τα εισηγμένα\n"
 "φίλτρα για να δείτε αν όλα λειτουργούν όπως πρέπει."
 
-#: importers/netscape-importer.c:677 mail/importers/netscape-importer.c:687
+#: importers/netscape-importer.c:677
+#: mail/importers/netscape-importer.c:687
 msgid ""
 "Some of your Netscape email filters use\n"
 "the \"Ignore Thread\" or \"Watch Thread\"\n"
@@ -12069,7 +11841,8 @@ msgstr ""
 "τα οποία δεν υποστηρίζονται από το Evolution.\n"
 "Αυτά τα φίλτρα δεν θα χρησιμοποιηθούν."
 
-#: importers/netscape-importer.c:694 mail/importers/netscape-importer.c:704
+#: importers/netscape-importer.c:694
+#: mail/importers/netscape-importer.c:704
 msgid ""
 "Some of your Netscape email filters test the\n"
 "body of emails for (in)equality to a given string,\n"
@@ -12078,39 +11851,49 @@ msgid ""
 "contained in the message body."
 msgstr ""
 
-#: importers/netscape-importer.c:1227 mail/importers/netscape-importer.c:1237
+#: importers/netscape-importer.c:1227
+#: mail/importers/netscape-importer.c:1237
 msgid "Evolution is importing your old Netscape data"
 msgstr "Το Evolution εισάγει τα παλαιά σας δεδομένα Netscape"
 
 #. Fill in the new fields
-#: importers/netscape-importer.c:1872 mail/importers/netscape-importer.c:1842
-#: mail/mail-ops.c:1106 shell/e-local-storage.c:184
+#: importers/netscape-importer.c:1872
+#: mail/importers/netscape-importer.c:1842
+#: mail/mail-ops.c:1092
+#: shell/e-local-storage.c:184
 msgid "Trash"
 msgstr "Απορρίμματα"
 
-#: importers/netscape-importer.c:2028 mail/importers/netscape-importer.c:1995
+#: importers/netscape-importer.c:2028
+#: mail/importers/netscape-importer.c:1995
 msgid "Scanning mail filters"
 msgstr "Ανάγνωση νέων μηνυμάτων"
 
-#: importers/netscape-importer.c:2038 importers/pine-importer.c:570
-#: mail/importers/netscape-importer.c:2006 mail/importers/pine-importer.c:520
+#: importers/netscape-importer.c:2038
+#: importers/pine-importer.c:570
+#: mail/importers/netscape-importer.c:2006
+#: mail/importers/pine-importer.c:520
 msgid "Scanning directory"
 msgstr "Σαρώνεται ο κατάλογος"
 
-#: importers/netscape-importer.c:2047 mail/importers/netscape-importer.c:2015
-#: shell/e-shell-startup-wizard.c:556
+#: importers/netscape-importer.c:2047
+#: mail/importers/netscape-importer.c:2015
+#: shell/e-shell-startup-wizard.c:541
 msgid "Starting import"
 msgstr "Εκκίνηση εισαγωγής"
 
-#: importers/netscape-importer.c:2133 mail/importers/netscape-importer.c:2090
+#: importers/netscape-importer.c:2133
+#: mail/importers/netscape-importer.c:2090
 msgid "Settings"
 msgstr "Ρυθμίσεις"
 
-#: importers/netscape-importer.c:2138 mail/importers/netscape-importer.c:2095
+#: importers/netscape-importer.c:2138
+#: mail/importers/netscape-importer.c:2095
 msgid "Mail Filters"
 msgstr "Φίλτρα μηνυμάτων"
 
-#: importers/netscape-importer.c:2161 mail/importers/netscape-importer.c:2119
+#: importers/netscape-importer.c:2161
+#: mail/importers/netscape-importer.c:2119
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
@@ -12118,11 +11901,13 @@ msgstr ""
 "Το Evolution βρήκε μηνύματα Netscape\n"
 "Θέλετε να εισαχθούν στο Evolution;"
 
-#: importers/pine-importer.c:100 mail/importers/pine-importer.c:114
+#: importers/pine-importer.c:100
+#: mail/importers/pine-importer.c:114
 msgid "Evolution is importing your old Pine data"
 msgstr "Το Evolution εισάγει τα παλαιά σας δεδομένα Pine"
 
-#: importers/pine-importer.c:663 mail/importers/pine-importer.c:599
+#: importers/pine-importer.c:663
+#: mail/importers/pine-importer.c:599
 msgid ""
 "Evolution has found Pine mail files.\n"
 "Would you like to import them into Evolution?"
@@ -12130,161 +11915,351 @@ msgstr ""
 "Το Evolution βρήκε μηνύματα Pine\n"
 "Θέλετε να εισαχθούν στο Evolution;"
 
-#: importers/pine-importer.c:691 mail/importers/pine-importer.c:618
+#: importers/pine-importer.c:691
+#: mail/importers/pine-importer.c:618
 msgid "Pine"
 msgstr "Pine"
 
-#: mail/component-factory.c:116
+#: mail/GNOME_Evolution_Mail.server.in.in.h:1
+msgid "Composer Preferences"
+msgstr "Προτιμήσεις Επεξεργαστή"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:2
+msgid "Configure mail preferences, including security and message display, here"
+msgstr "Ρύθμιστε εδώ τις προτιμήσεις αλληλογραφίας, συμπεριλαμβανομένης της ασφάλειας και της προβολής μηνυμάτων"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:3
+msgid "Configure spell-checking, signatures, and the message composer here"
+msgstr "Ρύθμιστε εδώ τον έλεγχο ορθογραφίας, υπογραφές και τον επεξεργαστή μηνυμάτων"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:4
+msgid "Configure your email accounts here"
+msgstr "Ρυθμίστε εδώ τους λογαριασμούς αλληλογραφίας σας"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:5
+#, fuzzy
+msgid "Evolution Mail"
+msgstr "Evolution"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:6
+#, fuzzy
+msgid "Evolution Mail accounts configuration control"
+msgstr "Επεξεργαστής Λογαριασμού Evolution"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:7
+#, fuzzy
+msgid "Evolution Mail component"
+msgstr "Επεξεργαστής μηνυμάτων του Evolution."
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:8
+#, fuzzy
+msgid "Evolution Mail composer"
+msgstr "Επεξεργαστής μηνυμάτων του Evolution."
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:9
+#, fuzzy
+msgid "Evolution Mail composer configuration control"
+msgstr "Επεξεργαστής μηνυμάτων του Evolution."
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:10
+#, fuzzy
+msgid "Evolution Mail configuration interface"
+msgstr "Διεπαφή ρυθμίσεων Μηνυμάτων"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:11
+#, fuzzy
+msgid "Evolution Mail folder viewer"
+msgstr "Συστατικό για την προβολή φακέλου μηνυμάτων του Evolution."
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:12
+#, fuzzy
+msgid "Evolution Mail preferences control"
+msgstr "Στοιχείο εκτελεστικής σύνοψης μηνυμάτων."
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:13
+msgid "Mail Accounts"
+msgstr "Λογαριασμοί αλληλογραφίας"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:14
+#: mail/mail-config.glade.h:69
+msgid "Mail Preferences"
+msgstr "Προτιμήσεις Αλληλογραφίας"
+
+#: mail/component-factory.c:117
 msgid "Folder containing mail"
 msgstr "Φάκελος που περιέχει μηνύματα"
 
-#: mail/component-factory.c:117
+#: mail/component-factory.c:118
 msgid "Public Mail"
 msgstr "Κοινόχρηστη αλληλογραφία"
 
-#: mail/component-factory.c:117
+#: mail/component-factory.c:118
 msgid "Public folder containing mail"
 msgstr "Κοινόχρηστος φάκελος που περιέχει μηνύματα"
 
-#: mail/component-factory.c:118
+#: mail/component-factory.c:119
 msgid "Virtual Trash"
 msgstr "Εικονικά Απορρίμματα"
 
-#: mail/component-factory.c:118
+#: mail/component-factory.c:119
 msgid "Virtual Trash folder"
 msgstr "Εικονικός Φάκελος Απορριμμάτων"
 
-#: mail/component-factory.c:146
+#: mail/component-factory.c:147
 msgid "This folder cannot contain messages."
 msgstr "Αυτός ο φάκελος δεν μπορεί να περιέχει μηνύματα."
 
-#: mail/component-factory.c:444
+#: mail/component-factory.c:441
 msgid "Properties..."
 msgstr "Ιδιότητες..."
 
-#: mail/component-factory.c:444
+#: mail/component-factory.c:441
 msgid "Change this folder's properties"
 msgstr "Αλλαγή των ιδιοτήτων του φακέλου"
 
-#: mail/component-factory.c:826
-msgid ""
-"Some of your mail settings seem corrupt, please check that everything is in "
-"order."
-msgstr ""
-"Μερικές από τις ρυθμίσεις του ταχυδρομείου σας φαίνεται να είναι "
-"κατεστραμμένες, παρακαλώ ελέγξτε ότι όλα είναι σωστά."
+#: mail/component-factory.c:819
+msgid "Some of your mail settings seem corrupt, please check that everything is in order."
+msgstr "Μερικές από τις ρυθμίσεις του ταχυδρομείου σας φαίνεται να είναι κατεστραμμένες, παρακαλώ ελέγξτε ότι όλα είναι σωστά."
 
-#: mail/component-factory.c:1008
+#: mail/component-factory.c:1000
 msgid "You have not set a mail transport method"
 msgstr "Δεν έχετε ορίσει τρόπο μεταφορά των μηνυμάτων"
 
-#: mail/component-factory.c:1031
+#: mail/component-factory.c:1023
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr "Έχετε μηνύματα που δεν έχουν αποσταλεί, θέλετε να βγείτε οπωσδήποτε? "
 
-#: mail/component-factory.c:1071
+#: mail/component-factory.c:1063
 msgid "New Mail Message"
 msgstr "Νέο Μήνυμα Ταχυδρομείου"
 
-#: mail/component-factory.c:1071
+#: mail/component-factory.c:1063
 msgid "_Mail Message"
 msgstr "_Αποστολή Μηνύματος"
 
-#: mail/component-factory.c:1072
+#: mail/component-factory.c:1064
 msgid "Compose a new mail message"
 msgstr "Συγγραφή νέου μηνύματος"
 
-#: mail/component-factory.c:1080
+#: mail/component-factory.c:1072
 msgid "New Message Post"
 msgstr "Αποστολή  νέου μηνύματος"
 
-#: mail/component-factory.c:1080
+#: mail/component-factory.c:1072
 msgid "_Post Message"
 msgstr "Α_ποστολή Μηνύματος"
 
-#: mail/component-factory.c:1081
+#: mail/component-factory.c:1073
 msgid "Post a new mail message"
 msgstr "Αποστολή ενός νέου μηνύματος"
 
-#: mail/component-factory.c:1373
+#: mail/component-factory.c:1365
 msgid "Connecting..."
 msgstr "Σύνδεση..."
 
-#: mail/component-factory.c:1384
+#: mail/component-factory.c:1376
 msgid "Cannot register storage with shell"
 msgstr "Δεν είναι δυνατό να γίνει καταχώρηση αποθήκευσης με κέλυφος"
 
-#: mail/folder-info.c:70
-msgid "Getting Folder Information"
-msgstr "Λήψη Πληροφοριών Φακέλου"
+#: mail/folder-browser-ui.c:486
+#, c-format
+msgid "Properties for \"%s\""
+msgstr "Ιδιότητες για \"%s\""
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:1
-msgid "Composer Preferences"
-msgstr "Προτιμήσεις Επεξεργαστή"
+#: mail/folder-browser-ui.c:488
+msgid "Properties"
+msgstr "Ιδιότητες"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:2
-msgid ""
-"Configure mail preferences, including security and message display, here"
-msgstr ""
-"Ρύθμιστε εδώ τις προτιμήσεις αλληλογραφίας, συμπεριλαμβανομένης της "
-"ασφάλειας και της προβολής μηνυμάτων"
+#: mail/folder-browser.c:327
+#: mail/mail-display.c:394
+#: mail/mail-display.c:942
+#, c-format
+msgid "Could not create temporary directory: %s"
+msgstr "Δεν είναι δυνατή η δημιουργία του προσωρινού καταλόγου: %s"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:3
-msgid "Configure spell-checking, signatures, and the message composer here"
-msgstr ""
-"Ρύθμιστε εδώ τον έλεγχο ορθογραφίας, υπογραφές και τον επεξεργαστή μηνυμάτων"
+#: mail/folder-browser.c:782
+#, c-format
+msgid "%d new"
+msgstr "%d νέα"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:4
-msgid "Configure your email accounts here"
-msgstr "Ρυθμίστε εδώ τους λογαριασμούς αλληλογραφίας σας"
+#: mail/folder-browser.c:785
+#: mail/folder-browser.c:793
+#: mail/folder-browser.c:796
+msgid ", "
+msgstr ", "
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:5
-#, fuzzy
-msgid "Evolution Mail"
-msgstr "Evolution"
+#: mail/folder-browser.c:787
+#, c-format
+msgid "%d hidden"
+msgstr "%d κρυμμένα"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:6
-#, fuzzy
-msgid "Evolution Mail accounts configuration control"
-msgstr "Επεξεργαστής Λογαριασμού Evolution"
+#: mail/folder-browser.c:789
+#, c-format
+msgid "%d visible"
+msgstr "%d ορατά"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:7
-#, fuzzy
-msgid "Evolution Mail component"
-msgstr "Επεξεργαστής μηνυμάτων του Evolution."
+#: mail/folder-browser.c:794
+#, c-format
+msgid "%d selected"
+msgstr "%d επιλεγμένα"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:8
-#, fuzzy
-msgid "Evolution Mail composer"
-msgstr "Επεξεργαστής μηνυμάτων του Evolution."
+#: mail/folder-browser.c:799
+#, c-format
+msgid "%d unsent"
+msgstr "%d μη απεσταλμένα"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:9
-#, fuzzy
-msgid "Evolution Mail composer configuration control"
-msgstr "Επεξεργαστής μηνυμάτων του Evolution."
+#: mail/folder-browser.c:801
+#, c-format
+msgid "%d sent"
+msgstr "%d απεσταλμένα"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:10
-#, fuzzy
-msgid "Evolution Mail configuration interface"
-msgstr "Διεπαφή ρυθμίσεων Μηνυμάτων"
+#: mail/folder-browser.c:803
+#, c-format
+msgid "%d total"
+msgstr "%d συνολικά"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:11
+#: mail/folder-browser.c:1182
 #, fuzzy
-msgid "Evolution Mail folder viewer"
-msgstr "Συστατικό για την προβολή φακέλου μηνυμάτων του Evolution."
+msgid "Create _Virtual Folder From Search..."
+msgstr "Δημιουργία Ει_κονικού Φακέλου Από το Μήνυμα"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:12
-#, fuzzy
-msgid "Evolution Mail preferences control"
-msgstr "Στοιχείο εκτελεστικής σύνοψης μηνυμάτων."
+#: mail/folder-browser.c:1736
+msgid "VFolder on _Subject"
+msgstr "ΕΦάκελος στο _Θέμα"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:13
-msgid "Mail Accounts"
-msgstr "Λογαριασμοί αλληλογραφίας"
+#: mail/folder-browser.c:1737
+msgid "VFolder on Se_nder"
+msgstr "ΕΦάκελος στον _Αποστολέα"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:69
-msgid "Mail Preferences"
-msgstr "Προτιμήσεις Αλληλογραφίας"
+#: mail/folder-browser.c:1738
+msgid "VFolder on _Recipients"
+msgstr "ΕΦάκελος στους _Παραλήπτες"
+
+#: mail/folder-browser.c:1739
+msgid "VFolder on Mailing _List"
+msgstr "ΕΦάκελος στη Λίστα _Ταχυδρομείου"
+
+#: mail/folder-browser.c:1743
+msgid "Filter on Sub_ject"
+msgstr "Φίλτρο στο _Θέμα"
+
+#: mail/folder-browser.c:1744
+msgid "Filter on Sen_der"
+msgstr "Φίλτρο στον Α_ποστολέα"
+
+#: mail/folder-browser.c:1745
+msgid "Filter on Re_cipients"
+msgstr "Φίλτρο στους Παρα_λήπτες"
+
+#: mail/folder-browser.c:1746
+#: mail/folder-browser.c:2070
+msgid "Filter on _Mailing List"
+msgstr "Φίλτρο στη Λίστα _Ταχυδρομείου"
+
+#: mail/folder-browser.c:1764
+msgid "_Edit as New Message..."
+msgstr "_Επεξεργασία ως Νέο Μήνυμα..."
+
+#: mail/folder-browser.c:1766
+msgid "_Print"
+msgstr "_Εκτύπωση"
+
+#: mail/folder-browser.c:1770
+#: ui/evolution-mail-message.xml.h:110
+msgid "_Reply to Sender"
+msgstr "_Απάντηση στον Αποστολέα"
+
+#: mail/folder-browser.c:1771
+#: ui/evolution-mail-message.xml.h:75
+msgid "Reply to _List"
+msgstr "Απάντηση στη _Λίστα"
+
+#: mail/folder-browser.c:1772
+#: ui/evolution-mail-message.xml.h:74
+msgid "Reply to _All"
+msgstr "Απάντηση σε _Όλους"
+
+#: mail/folder-browser.c:1773
+msgid "_Forward"
+msgstr "_Προώθηση"
+
+#: mail/folder-browser.c:1777
+msgid "Follo_w Up..."
+msgstr ""
+
+#: mail/folder-browser.c:1778
+msgid "Fla_g Completed"
+msgstr "Ση_μαία Ολοκληρώθηκε"
+
+#: mail/folder-browser.c:1779
+msgid "Cl_ear Flag"
+msgstr "Εκκα_θάριση Σημαίας"
+
+#. separator here?
+#: mail/folder-browser.c:1783
+#: ui/evolution-mail-message.xml.h:43
+msgid "Mar_k as Read"
+msgstr "Σήμανση _ως Αναγνωσμένα"
+
+#: mail/folder-browser.c:1784
+msgid "Mark as _Unread"
+msgstr "Σήμανση ως _Μη Αναγνωσμένα"
+
+#: mail/folder-browser.c:1785
+msgid "Mark as _Important"
+msgstr "Σήμανση ως _Σημαντικά"
+
+#: mail/folder-browser.c:1786
+msgid "_Mark as Unimportant"
+msgstr "Σή_μανση ως Μη Σημαντικά"
+
+#: mail/folder-browser.c:1791
+msgid "U_ndelete"
+msgstr "Α_κύρωση Διαγραφής"
+
+#: mail/folder-browser.c:1795
+msgid "Mo_ve to Folder..."
+msgstr "Με_τακίνηση στο Φάκελο..."
+
+#: mail/folder-browser.c:1796
+#: ui/evolution-addressbook.xml.h:31
+msgid "_Copy to Folder..."
+msgstr "_Αντιγραφή στο Φάκελο..."
+
+#: mail/folder-browser.c:1804
+msgid "Add Sender to Address_book"
+msgstr "Προσθήκη Αποστολέα στο _Βιβλίο Διευθύνσεων"
+
+#: mail/folder-browser.c:1808
+msgid "Appl_y Filters"
+msgstr "Εφαρμο_γή Φίλτρων"
+
+#: mail/folder-browser.c:1812
+msgid "Crea_te Rule From Message"
+msgstr "Δη_μιουργία Κανόνα Από το Μήνυμα"
+
+#: mail/folder-browser.c:2071
+msgid "VFolder on M_ailing List"
+msgstr "ΕΦάκελος στη Λίστα Τα_χυδρομείου"
+
+#: mail/folder-browser.c:2073
+#, c-format
+msgid "Filter on _Mailing List (%s)"
+msgstr "Φίλτρο στη Λίστα Τα_χυδρομείου (%s)"
+
+#: mail/folder-browser.c:2074
+#, c-format
+msgid "VFolder on M_ailing List (%s)"
+msgstr "ΕΦάκελος στη Λίστα Τα_χυδρομείου (%s)"
+
+#: mail/folder-browser.h:26
+#: mail/mail-config.glade.h:39
+msgid "Default"
+msgstr "Εξ ορισμού"
+
+#: mail/folder-info.c:70
+msgid "Getting Folder Information"
+msgstr "Λήψη Πληροφοριών Φακέλου"
 
 #: mail/importers/GNOME_Evolution_Mail_Elm_Intelligent_Importer.server.in.in.h:1
 #, fuzzy
@@ -12361,19 +12336,22 @@ msgstr "Δεν έχετε συμπληρώσει όλα τις απαιτούμ�
 msgid "Evolution Account Editor"
 msgstr "Επεξεργαστής Λογαριασμού Evolution"
 
-#: mail/mail-account-gui.c:752 mail/mail-config.glade.h:149
+#: mail/mail-account-gui.c:752
+#: mail/mail-config.glade.h:149
 msgid "_Host:"
 msgstr "_Σύστημα:"
 
-#: mail/mail-account-gui.c:756 mail/mail-config.glade.h:123
+#: mail/mail-account-gui.c:756
+#: mail/mail-config.glade.h:123
 msgid "User_name:"
 msgstr "_Όνομα Χρήστη:"
 
-#: mail/mail-account-gui.c:760 mail/mail-config.glade.h:156
+#: mail/mail-account-gui.c:760
+#: mail/mail-config.glade.h:156
 msgid "_Path:"
 msgstr "_Θέση:"
 
-#: mail/mail-account-gui.c:1886
+#: mail/mail-account-gui.c:1887
 msgid "You may not create two accounts with the same name."
 msgstr "Δεν επιτρέπεται να δημιουργήσετε δύο λογαριασμούς με το ίδιο όνομα."
 
@@ -12385,14 +12363,20 @@ msgstr "Είστε βέβαιοι για την διαγραφή αυτού το
 msgid "Don't delete"
 msgstr "Να μην διαγραφεί"
 
-#: mail/mail-accounts.c:312 mail/mail-accounts.c:351 mail/mail-accounts.c:391
-#: mail/mail-composer-prefs.c:675 mail/mail-composer-prefs.c:693
+#: mail/mail-accounts.c:312
+#: mail/mail-accounts.c:351
+#: mail/mail-accounts.c:391
+#: mail/mail-composer-prefs.c:675
+#: mail/mail-composer-prefs.c:693
 #: mail/mail-composer-prefs.c:717
 msgid "Disable"
 msgstr "Απενεργοποίηση"
 
-#: mail/mail-accounts.c:312 mail/mail-accounts.c:351 mail/mail-accounts.c:393
-#: mail/mail-composer-prefs.c:675 mail/mail-composer-prefs.c:693
+#: mail/mail-accounts.c:312
+#: mail/mail-accounts.c:351
+#: mail/mail-accounts.c:393
+#: mail/mail-composer-prefs.c:675
+#: mail/mail-composer-prefs.c:693
 #: mail/mail-composer-prefs.c:717
 msgid "Enable"
 msgstr "Ενεργοποίηση"
@@ -12404,16 +12388,20 @@ msgstr "[Εξ ορισμού]"
 
 #. FIXME: This routine should just be a "toggled" event handler on the checkbox cell renderer which
 #. has "activatable" set.
-#: mail/mail-accounts.c:481 mail/mail-composer-prefs.c:708
+#: mail/mail-accounts.c:481
+#: mail/mail-accounts.etspec.h:2
+#: mail/mail-composer-prefs.c:708
 #: mail/mail-composer-prefs.c:854
 msgid "Enabled"
 msgstr "Ενεργοποίηση"
 
 #: mail/mail-accounts.c:487
+#: mail/mail-accounts.etspec.h:1
 msgid "Account name"
 msgstr "Όνομα λογαριασμού:"
 
 #: mail/mail-accounts.c:489
+#: mail/mail-accounts.etspec.h:3
 msgid "Protocol"
 msgstr "Πρωτόκολλο"
 
@@ -12456,8 +12444,217 @@ msgstr ""
 "    '%s'\n"
 "Και έχει ανανεωθεί."
 
-#: mail/mail-composer-prefs.c:226 mail/mail-composer-prefs.c:349
-#: mail/mail-config.c:1376
+#. Add the "Don't show this message again." checkbox
+#: mail/mail-callbacks.c:101
+#: widgets/misc/e-messagebox.c:226
+msgid "Don't show this message again."
+msgstr "Να μην ξαναεμφανιστεί αυτό το μήνυμα"
+
+#: mail/mail-callbacks.c:190
+msgid ""
+"You have not configured the mail client.\n"
+"You need to do this before you can send,\n"
+"receive or compose mail.\n"
+"Would you like to configure it now?"
+msgstr ""
+"Δεν έχετε ρυθμίσει το πρόγραμμα ταχυδρομείου\n"
+"Πρέπει πρώτα να γίνει η ρύθμιση πριν την αποστολή\n"
+"ή συγγραφή μηνυμάτων\n"
+"Θέλετε να κάνετε την ρύθμιση τώρα;"
+
+#: mail/mail-callbacks.c:212
+msgid ""
+"You need to configure an account\n"
+"before you can compose mail."
+msgstr ""
+"Πρέπει να ρυθμίσετε έναν λογαριασμό\n"
+"πριν από την συγγραφή μηνύματος"
+
+#: mail/mail-callbacks.c:226
+msgid ""
+"You need to configure an identity\n"
+"before you can compose mail."
+msgstr ""
+"Πρέπει να ρυθμίσετε μια ταυτότητα\n"
+"πριν από την συγγραφή μηνύματος"
+
+#: mail/mail-callbacks.c:233
+msgid ""
+"You need to configure a mail transport\n"
+"before you can compose mail."
+msgstr ""
+"Πρέπει να ρυθμίσετε την μεταφορά ταχυδρομείου\n"
+"πριν από την συγγραφή μηνύματος"
+
+#. FIXME: this wording sucks
+#: mail/mail-callbacks.c:255
+msgid ""
+"You are sending an HTML-formatted message. Please make sure that\n"
+"the following recipients are willing and able to receive HTML mail:\n"
+msgstr ""
+"Θα στείλετε μήνυμα σε μορφή HTML. Παρακαλώ βεβαιωθείτε ότι\n"
+" παρακάτω παραλήπτες επιθυμούν μηνύματα σε μορφή HTML:\n"
+
+#: mail/mail-callbacks.c:267
+msgid "Send anyway?"
+msgstr "Να σταλεί οπωσδήποτε;"
+
+#: mail/mail-callbacks.c:288
+msgid ""
+"This message has no subject.\n"
+"Really send?"
+msgstr ""
+"Αυτό το μήνυμα δεν έχει θέμα.\n"
+"Να σταλεί;"
+
+#: mail/mail-callbacks.c:314
+msgid "Since the contact list you are sending to is configured to hide the list's addresses, this message will contain only Bcc recipients."
+msgstr "Μιας και η λίστα επαφών που στέλνετε είναι ρυθμισμένη να αποκρύπτει τις διευθύνσεις, αυτό το μήνυμα θα περιέχει μόνο παραλήπτες στην Ιδιαίτερη κοινοποίηση(Bcc)."
+
+#: mail/mail-callbacks.c:318
+msgid "This message contains only Bcc recipients."
+msgstr "Αυτό το μήνυμα περιέχει μόνο παραλήπτες στο Ιδιαίτερης κοινοποίησηςBcc)."
+
+#: mail/mail-callbacks.c:323
+msgid ""
+"It is possible that the mail server may reveal the recipients by adding an Apparently-To header.\n"
+"Send anyway?"
+msgstr ""
+"Είναι δυνατό να αποκαλύψει ο διακομιστής ταχυδρομείου τους παραλήπτες με την προσθήκη μια εμφανή επικεφαλίδα Προς.\n"
+"Να σταλεί ούτως η άλλως;"
+
+#: mail/mail-callbacks.c:472
+msgid "You must specify recipients in order to send this message."
+msgstr "Πρέπει να ορίσετε παραλήπτες προκειμένου να στείλετε αυτό το μήνυμα."
+
+#: mail/mail-callbacks.c:724
+msgid ""
+"Unable to open the drafts folder for this account.\n"
+"Would you like to use the default drafts folder?"
+msgstr ""
+"Δεν είναι δυνατό το άνοιγμα του προσωρινού φακέλου για αυτόν τον λογαριασμό.\n"
+"Θέλετε να κάνετε χρήση του εξ' ορισμού προσωρινού φακέλου;"
+
+#: mail/mail-callbacks.c:1189
+msgid "an unknown sender"
+msgstr "ένας άγνωστος αποστολέας"
+
+#: mail/mail-callbacks.c:1193
+msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
+msgstr "Στις %d/%b/%Y, ημέρα %A και ώρα %H:%M, ο/η %%s έγραψε:"
+
+#: mail/mail-callbacks.c:1700
+#: mail/message-browser.c:123
+msgid "Move message(s) to"
+msgstr "Μετακίνηση μηνύματος(ων) στο"
+
+#: mail/mail-callbacks.c:1702
+#: mail/message-browser.c:125
+msgid "Copy message(s) to"
+msgstr "Αντιγραφή μηνύματος(ων) στο"
+
+#: mail/mail-callbacks.c:2344
+#, c-format
+msgid "Are you sure you want to edit all %d messages?"
+msgstr "Είστε βέβαιοι ότι θέλετε να επεξεργαστείτε και τα %d μηνύματα;"
+
+#: mail/mail-callbacks.c:2360
+msgid ""
+"You may only edit messages saved\n"
+"in the Drafts folder."
+msgstr ""
+"Επιτρέπεται να επεξεργαστείτε μόνο τα\n"
+"μηνύματα στον Πρόχειρο Φάκελο."
+
+#: mail/mail-callbacks.c:2393
+msgid ""
+"You may only resend messages\n"
+"in the Sent folder."
+msgstr ""
+"Επιτρέπεται να ξαναστείλετε μόνο τα\n"
+"μηνύματα από τον φάκελο Απεσταλμένα."
+
+#: mail/mail-callbacks.c:2403
+#, c-format
+msgid "Are you sure you want to resend all %d messages?"
+msgstr "Είστε βέβαιοι ότι θέλετε να ξαναστείλετε και τα %d μηνύματα;"
+
+#: mail/mail-callbacks.c:2424
+msgid "No Message Selected"
+msgstr "Δεν Έχει Επιλεγεί Μήνυμα"
+
+#: mail/mail-callbacks.c:2465
+#, c-format
+msgid ""
+"Cannot save to `%s'\n"
+" %s"
+msgstr ""
+"Αδυναμία αποθήκευσης σε `%s'\n"
+" %s"
+
+#: mail/mail-callbacks.c:2470
+#, c-format
+msgid ""
+"`%s' already exists.\n"
+"Overwrite it?"
+msgstr ""
+"Το %s υπάρχει ήδη.\n"
+"Θέλετε να αντικατασταθεί;"
+
+#: mail/mail-callbacks.c:2511
+msgid "Save Message As..."
+msgstr "Αποθήκευση Μηνύματος Ως..."
+
+#: mail/mail-callbacks.c:2513
+msgid "Save Messages As..."
+msgstr "Αποθήκευση Μηνυμάτων Ως..."
+
+#: mail/mail-callbacks.c:2686
+msgid ""
+"This operation will permanently erase all messages marked as\n"
+"deleted. If you continue, you will not be able to recover these messages.\n"
+"\n"
+"Really erase these messages?"
+msgstr ""
+"Με αυτή την λειτουργία θα διαγράψετε μόνιμα όλα τα μηνύματα που έχετε σημειώσει ως διαγραμμένα,\n"
+"και δεν θα μπορέσετε να τα ανακτήσετε.\n"
+"\n"
+"Είστε βέβαιοι για την διαγραφή των μηνυμάτων;"
+
+#: mail/mail-callbacks.c:2781
+#, c-format
+msgid ""
+"Error loading filter information:\n"
+"%s"
+msgstr ""
+"Σφάλμα κατά το φόρτωμα των πληροφοριών:\n"
+"%s"
+
+#: mail/mail-callbacks.c:2789
+msgid "Filters"
+msgstr "Φίλτρα"
+
+#: mail/mail-callbacks.c:2830
+#, c-format
+msgid "Page %d of %d"
+msgstr "Σελίδα %d από %d"
+
+#: mail/mail-callbacks.c:2886
+msgid "Print Message"
+msgstr "Εκτύπωση Μηνύματος"
+
+#: mail/mail-callbacks.c:2953
+msgid "Printing of message failed"
+msgstr "Απέτυχε η εκτύπωση του μηνύματος"
+
+#: mail/mail-callbacks.c:3146
+#, c-format
+msgid "Are you sure you want to open all %d messages in separate windows?"
+msgstr "Είστε βέβαιοι ότι θέλετε να ανοίξετε και τα %d μηνύματα σε άλλα παράθυρα;"
+
+#: mail/mail-composer-prefs.c:226
+#: mail/mail-composer-prefs.c:349
+#: mail/mail-config.c:1370
 msgid "Unnamed"
 msgstr "Χωρίς Τίτλο"
 
@@ -12465,7 +12662,8 @@ msgstr "Χωρίς Τίτλο"
 msgid "You must specify a valid script name."
 msgstr "Θα πρέπει να καθορίσετε ένα έγκυρο όνομα δέσμης ενεργειών."
 
-#: mail/mail-composer-prefs.c:392 mail/mail-composer-prefs.c:454
+#: mail/mail-composer-prefs.c:392
+#: mail/mail-composer-prefs.c:454
 msgid "[script]"
 msgstr "[δέσμη ενεργειών]"
 
@@ -12481,78 +12679,55 @@ msgstr "Προσθήκη δέσμης ενεργειών υπογραφής"
 msgid "Signature(s)"
 msgstr "Υπογραφή"
 
-#: mail/mail-config.c:1080
-msgid "Checking Service"
-msgstr "Γίνεται Έλεγχος Υπηρεσίας"
-
-#: mail/mail-config.c:1158 mail/mail-config.c:1162
-msgid "Connecting to server..."
-msgstr "Σύνδεση στον διακομιστή..."
-
-#: mail/mail-config-druid.c:367 mail/mail-config.glade.h:61
+#: mail/mail-config-druid.c:380
+#: mail/mail-config.glade.h:61
 msgid "Identity"
 msgstr "Ταυτότητα"
 
-#: mail/mail-config-druid.c:369
-msgid ""
-"Please enter your name and email address below. The \"optional\" fields "
-"below do not need to be filled in, unless you wish to include this "
-"information in email you send."
-msgstr ""
-"Παρακαλώ εισάγετε το όνομά σας και την ηλεκτρονική σας διεύθυνση Τα"
-"\"προαιρετικά\" πεδία που εμφανίζονται παρακάτω δεν είναι απαραίτητο να "
-"συμπληρωθούν εκτός αν θέλετε να συμπεριλάβετε αυτές τις πληροφορίες όταν "
-"στέλνετε μηνύματα."
+#: mail/mail-config-druid.c:382
+msgid "Please enter your name and email address below. The \"optional\" fields below do not need to be filled in, unless you wish to include this information in email you send."
+msgstr "Παρακαλώ εισάγετε το όνομά σας και την ηλεκτρονική σας διεύθυνση Τα\"προαιρετικά\" πεδία που εμφανίζονται παρακάτω δεν είναι απαραίτητο να συμπληρωθούν εκτός αν θέλετε να συμπεριλάβετε αυτές τις πληροφορίες όταν στέλνετε μηνύματα."
 
-#: mail/mail-config-druid.c:375 mail/mail-config-druid.c:382
+#: mail/mail-config-druid.c:388
+#: mail/mail-config-druid.c:395
 #, fuzzy
 msgid "Receiving Mail"
 msgstr "_Λήψη Μηνυμάτων"
 
-#: mail/mail-config-druid.c:377
-msgid ""
-"Please enter information about your incoming mail server below. If you are "
-"not sure, ask your system administrator or Internet Service Provider."
-msgstr ""
-"Παρακαλώ εισάγετε πληροφορίες για τον διακομιστή εισερχομένων μηνυμάτων. Αν "
-"δεν είστε βέβαιοι ρωτήστε τον διαχειριστή δικτύου σας ή τον παροχέα "
-"διαδικτύου"
+#: mail/mail-config-druid.c:390
+msgid "Please enter information about your incoming mail server below. If you are not sure, ask your system administrator or Internet Service Provider."
+msgstr "Παρακαλώ εισάγετε πληροφορίες για τον διακομιστή εισερχομένων μηνυμάτων. Αν δεν είστε βέβαιοι ρωτήστε τον διαχειριστή δικτύου σας ή τον παροχέα διαδικτύου"
 
-#: mail/mail-config-druid.c:384
+#: mail/mail-config-druid.c:397
 msgid "Please select among the following options"
 msgstr "Παρακαλώ επιλέξτε ανάμεσα ανάμεσα στις παρακάτω επιλογές"
 
-#: mail/mail-config-druid.c:387
+#: mail/mail-config-druid.c:400
 #, fuzzy
 msgid "Sending Mail"
 msgstr "Απο_στολή αλληλογραφίας"
 
-#: mail/mail-config-druid.c:389
-msgid ""
-"Please enter information about the way you will send mail. If you are not "
-"sure, ask your system administrator or Internet Service Provider."
-msgstr ""
-"Παρακαλώ εισάγετε τις πληροφορίες σχετικά με τον τρόπο παράδοσης των "
-"μηνυμάτων. Αν δεν είστε βέβαιοι ρωτήστε τον διαχειριστή δικτύου σας ή τον "
-"Παροχέα Διαδικτύου."
+#: mail/mail-config-druid.c:402
+msgid "Please enter information about the way you will send mail. If you are not sure, ask your system administrator or Internet Service Provider."
+msgstr "Παρακαλώ εισάγετε τις πληροφορίες σχετικά με τον τρόπο παράδοσης των μηνυμάτων. Αν δεν είστε βέβαιοι ρωτήστε τον διαχειριστή δικτύου σας ή τον Παροχέα Διαδικτύου."
 
-#: mail/mail-config-druid.c:394 mail/mail-config.glade.h:10
+#: mail/mail-config-druid.c:407
+#: mail/mail-config.glade.h:10
 msgid "Account Management"
 msgstr "Διαχείριση Λογαριασμού"
 
-#: mail/mail-config-druid.c:396
-msgid ""
-"You are almost done with the mail configuration process. The identity, "
-"incoming mail server and outgoing mail transport method which you provided "
-"will be grouped together to make an Evolution mail account. Please enter a "
-"name for this account in the space below. This name will be used for display "
-"purposes only."
-msgstr ""
-"Έχετε σχεδόν τελειώσει με την διαδικασία ρύθμισης του ταχυδρομείου. Η "
-"ταυτότητα ο διακομιστής εισερχομένων και εξερχομένων καθώς και οι "
-"πληροφορίες μεταφοράς θα ομαδοποιηθούν για να δημιουργήσουν τον λογαριασμό "
-"ταχυδρομείου Evolution. Παρακαλώ εισάγετε ένα όνομα στο παρακάτω κενό.Το "
-"όνομα είναι μόνο για να προβάλει τον λογαριασμό."
+#: mail/mail-config-druid.c:409
+msgid "You are almost done with the mail configuration process. The identity, incoming mail server and outgoing mail transport method which you provided will be grouped together to make an Evolution mail account. Please enter a name for this account in the space below. This name will be used for display purposes only."
+msgstr "Έχετε σχεδόν τελειώσει με την διαδικασία ρύθμισης του ταχυδρομείου. Η ταυτότητα ο διακομιστής εισερχομένων και εξερχομένων καθώς και οι πληροφορίες μεταφοράς θα ομαδοποιηθούν για να δημιουργήσουν τον λογαριασμό ταχυδρομείου Evolution. Παρακαλώ εισάγετε ένα όνομα στο παρακάτω κενό.Το όνομα είναι μόνο για να προβάλει τον λογαριασμό."
+
+#: mail/mail-config.c:1074
+msgid "Checking Service"
+msgstr "Γίνεται Έλεγχος Υπηρεσίας"
+
+#: mail/mail-config.c:1152
+#: mail/mail-config.c:1156
+msgid "Connecting to server..."
+msgstr "Σύνδεση στον διακομιστή..."
 
 #: mail/mail-config.glade.h:3
 msgid " _Check for supported types "
@@ -12568,9 +12743,7 @@ msgstr "(το SSL δεν υποστηρίζεται σε αυτή την έκδ�
 
 #: mail/mail-config.glade.h:7
 msgid "A_lways encrypt to myself when sending encrypted mail"
-msgstr ""
-"Να γίνεται _πάντα κρυπτογράφηση στον εαυτό μου κατά την αποστολή "
-"κρυπτογραφημένων μηνυμάτων"
+msgstr "Να γίνεται _πάντα κρυπτογράφηση στον εαυτό μου κατά την αποστολή κρυπτογραφημένων μηνυμάτων"
 
 #: mail/mail-config.glade.h:8
 msgid "Account Editor"
@@ -12590,9 +12763,7 @@ msgstr "Προσθήκη νέας υπογραφής..."
 
 #: mail/mail-config.glade.h:13
 msgid "Al_ways encrypt to myself when sending encrypted mail"
-msgstr ""
-"Να γίνεται πάντα κ_ρυπτογράφηση στον εαυτό μου κατά την αποστολή "
-"κρυπτογραφημένων μηνυμάτων"
+msgstr "Να γίνεται πάντα κ_ρυπτογράφηση στον εαυτό μου κατά την αποστολή κρυπτογραφημένων μηνυμάτων"
 
 #: mail/mail-config.glade.h:15
 msgid "Alwa_ys sign outgoing messages when using this account"
@@ -12608,15 +12779,14 @@ msgstr "Πάντοτε κοι_νοποίηση (Cc) σε:"
 
 #: mail/mail-config.glade.h:19
 msgid "Always _trust keys in my keyring when encrypting"
-msgstr ""
-"Να είναι πάντοτε έμπισ_τα τα κλειδία στην κλειδοθήκη μου κατά την "
-"κρυπτογράφηση"
+msgstr "Να είναι πάντοτε έμπισ_τα τα κλειδία στην κλειδοθήκη μου κατά την κρυπτογράφηση"
 
 #: mail/mail-config.glade.h:20
 msgid "Attach original message"
 msgstr "Επισύναψη αρχικού μηνύματος"
 
-#: mail/mail-config.glade.h:21 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:21
+#: mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "Συννημένο"
 
@@ -12681,10 +12851,6 @@ msgstr ""
 msgid "De_fault"
 msgstr "Εξ ορισμού"
 
-#: mail/mail-config.glade.h:39
-msgid "Default"
-msgstr "Εξ ορισμού"
-
 #: mail/mail-config.glade.h:40
 msgid "Default Behavior"
 msgstr "Εξ ορισμού Συμπεριφορά"
@@ -12707,10 +12873,10 @@ msgstr "Να μην γίνεται παράθεση αρχικού μηνύμα�
 
 #: mail/mail-config.glade.h:46
 msgid "Don't sign _meeting requests (for Outlook compatibility)"
-msgstr ""
-"Να μην υπογράφονται αιτήσεις _συναντήσεων (για συμβατότητα με το Outlook)"
+msgstr "Να μην υπογράφονται αιτήσεις _συναντήσεων (για συμβατότητα με το Outlook)"
 
-#: mail/mail-config.glade.h:47 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:47
+#: shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Done"
 msgstr "Τέλος"
 
@@ -12808,11 +12974,8 @@ msgid "New Mail Notification"
 msgstr "Ειδοποίηση Νέου Μηνύματος"
 
 #: mail/mail-config.glade.h:77
-msgid ""
-"Note: you will not be prompted for a password until you connect for the "
-"first time"
-msgstr ""
-"Σημείωση: θα σας γίνει ερώτηση για κωδικό μέχρι να συνδεθείτε για πρώτη φορά"
+msgid "Note: you will not be prompted for a password until you connect for the first time"
+msgstr "Σημείωση: θα σας γίνει ερώτηση για κωδικό μέχρι να συνδεθείτε για πρώτη φορά"
 
 #: mail/mail-config.glade.h:78
 msgid "Optional Information"
@@ -12832,9 +12995,7 @@ msgstr "Διαλέξτε χρώμα"
 
 #: mail/mail-config.glade.h:86
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
-msgstr ""
-"Ερώτηση στην αποστολή μηνυμάτων όπου έχουν οριστεί μόνο παραλήπτες στην "
-"κρυφή _κοινοποίηση (Bcc)"
+msgstr "Ερώτηση στην αποστολή μηνυμάτων όπου έχουν οριστεί μόνο παραλήπτες στην κρυφή _κοινοποίηση (Bcc)"
 
 #: mail/mail-config.glade.h:87
 msgid "Pretty Good Privacy (PGP/GPG)"
@@ -12955,14 +13116,8 @@ msgstr ""
 "μόνο για την εμφάνιση."
 
 #: mail/mail-config.glade.h:119
-msgid ""
-"This page allows you to configure spell checking behavior and language. The "
-"list of languages here reflects only the languages for which you have a "
-"dictionary installed."
-msgstr ""
-"Αυτή η σελίδα σας επιτρέπει να ρυθμίσετε την συμπεριφορά του ορθογραφικού "
-"ελέγχου και της γλώσσας. Η λίστα των γλωσσών εδώ αντικατοπτρίζει μόνο τις "
-"γλώσσες για τις οποίες έχετε εγκαταστήσει το αντίστοιχο λεξικό."
+msgid "This page allows you to configure spell checking behavior and language. The list of languages here reflects only the languages for which you have a dictionary installed."
+msgstr "Αυτή η σελίδα σας επιτρέπει να ρυθμίσετε την συμπεριφορά του ορθογραφικού ελέγχου και της γλώσσας. Η λίστα των γλωσσών εδώ αντικατοπτρίζει μόνο τις γλώσσες για τις οποίες έχετε εγκαταστήσει το αντίστοιχο λεξικό."
 
 #: mail/mail-config.glade.h:121
 msgid ""
@@ -13072,7 +13227,8 @@ msgstr "Αυτός είναι ο _εξ ορισμού λογαριασμός"
 msgid "_Mark messages as read after"
 msgstr "_Σήμανση μηνυμάτων ως αναγνωσμένα μετά από"
 
-#: mail/mail-config.glade.h:154 my-evolution/e-summary-preferences.c:575
+#: mail/mail-config.glade.h:154
+#: my-evolution/e-summary-preferences.c:575
 msgid "_Name:"
 msgstr "_Όνομα:"
 
@@ -13138,25 +13294,217 @@ msgstr "_Χρήση ασφαλούς σύνδεσης (SSL):"
 msgid "_Use the same fonts as other applications"
 msgstr ""
 
+#: mail/mail-config.glade.h:171
+msgid "color"
+msgstr " χρώμα"
+
 #: mail/mail-config.glade.h:172
 msgid "description"
 msgstr "Περιγραφή"
 
-#: mail/mail-folder-cache.c:832
+#: mail/mail-crypto.c:84
+msgid "Could not create a S/MIME signature context."
+msgstr "Δεν ήταν δυνατή η δημιουργία περιεχομένων υπογραφής S/MIME."
+
+#: mail/mail-crypto.c:116
+msgid "Could not create a S/MIME certsonly context."
+msgstr "Αδυναμία δημιουργίας S/MIME certsonly context."
+
+#: mail/mail-crypto.c:148
+msgid "Could not create a S/MIME encryption context."
+msgstr "Δεν ήταν δυνατή η δημιουργία περιεχομένων κρυπτογράφηση S/MIME."
+
+#: mail/mail-crypto.c:180
+msgid "Could not create a S/MIME envelope context."
+msgstr "Δεν ήταν δυνατή η δημιουργία περιεχομένων φακέλου S/MIME."
+
+#: mail/mail-crypto.c:211
+msgid "Could not create a S/MIME decode context."
+msgstr "Δεν ήταν δυνατή η δημιουργία περιεχομένων αποκρυπτογράφηση S/MIME."
+
+#: mail/mail-display.c:197
+#, c-format
+msgid ""
+"File `%s' already exists.\n"
+"Overwrite it?"
+msgstr ""
+"Το αρχείο `%s' υπάρχει ήδη\n"
+"Να αντικατασταθεί;"
+
+#: mail/mail-display.c:336
+msgid "Save Attachment"
+msgstr "Αποθήκευση επισύναψης..."
+
+#: mail/mail-display.c:409
+#, c-format
+msgid "Could not create temporary file '%s': %s"
+msgstr "Δεν είναι δυνατή η δημιουργία προσωρινού αρχείου '%s': %s"
+
+#: mail/mail-display.c:457
+msgid "Save Attachment..."
+msgstr "Αποθήκευση συνημμένου..."
+
+#: mail/mail-display.c:458
+msgid "View Inline"
+msgstr "Προβολή μέσα στο μήνυμα"
+
+#: mail/mail-display.c:459
+#, c-format
+msgid "Open in %s..."
+msgstr "Άνοιγμα με %s..."
+
+#: mail/mail-display.c:515
+#, c-format
+msgid "View Inline (via %s)"
+msgstr "Προβολή μέσα στο μήνυμα (μέσω %s)"
+
+#: mail/mail-display.c:519
+msgid "Hide"
+msgstr "Απόκρυψη"
+
+#: mail/mail-display.c:539
+msgid "External Viewer"
+msgstr "Εξωτερικό Πρόγραμμα Προβολής"
+
+#: mail/mail-display.c:1368
+msgid "Downloading images"
+msgstr "Μεταφόρτωση εικόνων"
+
+#: mail/mail-display.c:1545
+msgid "Loading message content"
+msgstr "Φόρτωμα περιεχόμενα μηνύματος"
+
+#: mail/mail-display.c:1887
+msgid "Overdue:"
+msgstr "'Εχουν λήξει:"
+
+#: mail/mail-display.c:1891
+msgid "by %B %d, %Y, %l:%M %P"
+msgstr "από %B %d, %Y, %l:%M %P"
+
+#: mail/mail-display.c:2255
+msgid "Open Link in Browser"
+msgstr "Άνοιγμα Συνδέσμου στον Περιηγητή"
+
+#: mail/mail-display.c:2256
+msgid "Copy Link Location"
+msgstr "Αντιγραφή Θέσης Συντόμευσης"
+
+#: mail/mail-display.c:2258
+msgid "Save Link as (FIXME)"
+msgstr "Αποθήκευση δεσμού ως (FIXME)"
+
+#: mail/mail-display.c:2260
+msgid "Save Image as..."
+msgstr "Αποθήκευση εικόνας ως..."
+
+#: mail/mail-folder-cache.c:745
 #, c-format
 msgid "Pinging %s"
 msgstr "Pinging %s"
 
-#: mail/mail-local.c:541 mail/mail-local.c:543
+#: mail/mail-format.c:665
+#, c-format
+msgid "%s attachment"
+msgstr " %s επισύναψη"
+
+#: mail/mail-format.c:707
+#: mail/mail-format.c:1370
+#: mail/mail-format.c:1439
+#: mail/mail-format.c:1559
+#: mail/mail-format.c:1683
+#: mail/mail-format.c:1708
+msgid "Could not parse MIME message. Displaying as source."
+msgstr "Δεν ήταν δυνατή η ανάλυση του μηνύματος MIME. Προβολή ως πηγή."
+
+#: mail/mail-format.c:785
+#: mail/message-list.etspec.h:2
+msgid "Date"
+msgstr "Ημερομηνία"
+
+#: mail/mail-format.c:871
+msgid "Bad Address"
+msgstr "Εσφαλμένη Διεύθυνση"
+
+#: mail/mail-format.c:912
+#: mail/message-list.etspec.h:7
+#: mail/message-tag-followup.c:301
+msgid "From"
+msgstr "Από"
+
+#: mail/mail-format.c:916
+msgid "Reply-To"
+msgstr "Απάντηση Σε"
+
+#: mail/mail-format.c:921
+#: mail/message-list.etspec.h:14
+msgid "To"
+msgstr "Προς"
+
+#: mail/mail-format.c:926
+msgid "Cc"
+msgstr "Αντίγραφο:"
+
+#: mail/mail-format.c:931
+msgid "Bcc"
+msgstr "Ιδιαίτερη Κοινοποίηση"
+
+#: mail/mail-format.c:1482
+msgid "This message is digitally signed. Click the lock icon for more information."
+msgstr "Αυτό το μήνυμα είναι ψηφιακά υπογεγραμμένο. Κάντε κλικ στο εικονίδιο με το λουκέτο για περισσότερες πληροφορίες."
+
+#: mail/mail-format.c:1510
+msgid "Could not create a PGP verfication context"
+msgstr "Δεν ήταν δυνατή η δημιουργία περιεχομένων επαλήθευσης PGP."
+
+#: mail/mail-format.c:1518
+msgid "This message is digitally signed and has been found to be authentic."
+msgstr "Αυτό το μήνυμα είναι ψηφιακά υπογεγραμμένο και βρέθηκε να είναι αυθεντικό."
+
+#: mail/mail-format.c:1525
+msgid "This message is digitally signed but can not be proven to be authentic."
+msgstr "Αυτό το μήνυμα είναι ψηφιακά υπογεγραμμένο και δεν βρέθηκε να είναι αυθεντικό."
+
+#: mail/mail-format.c:1789
+#, c-format
+msgid "Pointer to FTP site (%s)"
+msgstr "Δείκτης σε σελίδα FTP (%s)"
+
+#: mail/mail-format.c:1800
+#, c-format
+msgid "Pointer to local file (%s) valid at site \"%s\""
+msgstr "Δείκτης σε τοπικό αρχείο (%s) έγκυρο στην σελίδα \"%s\""
+
+#: mail/mail-format.c:1803
+#, c-format
+msgid "Pointer to local file (%s)"
+msgstr "Δείκτης σε τοπικό αρχείο (%s)"
+
+#: mail/mail-format.c:1830
+#, c-format
+msgid "Pointer to remote data (%s)"
+msgstr "Δείκτης σε απομακρυσμένα δεδομένα (%s)"
+
+#: mail/mail-format.c:1836
+#, c-format
+msgid "Pointer to unknown external data (\"%s\" type)"
+msgstr "Δείκτης σε άγνωστα εξωτερικά δεδομένα (τύπος \"%s\")"
+
+#: mail/mail-format.c:1838
+msgid "Malformed external-body part."
+msgstr "Κακοδιατυπωμένο εξωτερικό μέρος μηνύματος."
+
+#: mail/mail-local.c:541
+#: mail/mail-local.c:543
 #, c-format
 msgid "Local folders/%s"
 msgstr "Τοπικοί Φάκελοι/%s"
 
-#: mail/mail-local.c:711
+#: mail/mail-local.c:671
 msgid "Reconfiguring folder"
 msgstr "Επαναρύθμιση φακέλου"
 
-#: mail/mail-local.c:792
+#: mail/mail-local.c:752
 #, c-format
 msgid ""
 "Cannot save folder metainfo; you may find you can't\n"
@@ -13165,22 +13513,22 @@ msgstr ""
 "Δεν είναι δυνατό να αποθηκευτεί ο φάκελος metainfo, μάλλον θα διαπιστώσετε\n"
 "ότι δεν μπορείτε να ανοίξετε πλέον αυτόν τον φάκελο: %s: %s"
 
-#: mail/mail-local.c:848
+#: mail/mail-local.c:808
 #, c-format
 msgid "Cannot save folder metainfo to %s: %s"
 msgstr "Δεν είναι δυνατό να αποθηκευτεί ο φάκελος metainfo στο %s: %s"
 
-#: mail/mail-local.c:900
+#: mail/mail-local.c:860
 #, c-format
 msgid "Cannot delete folder metadata %s: %s"
 msgstr "Δεν ήταν δυνατό να διαγραφεί ο φάκελος metadata %s: %s"
 
-#: mail/mail-local.c:1363
+#: mail/mail-local.c:1323
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "Γίνεται αλλαγή του φακέλου \"%s\" σε φορμά \"%s\""
 
-#: mail/mail-local.c:1388
+#: mail/mail-local.c:1348
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
@@ -13188,16 +13536,16 @@ msgstr ""
 "Αν δεν μπορείτε να ανοίξετε πλέον αυτό το maibox, τότε\n"
 "θα πρέπει να το επισκευάστε μόνοι σας."
 
-#: mail/mail-local.c:1488
+#: mail/mail-local.c:1448
 #, c-format
 msgid "Reconfigure /%s"
 msgstr "Ρυθμίζεται ξανά ο /%s"
 
-#: mail/mail-local.c:1552
+#: mail/mail-local.c:1512
 msgid "You cannot change the format of a non-local folder."
 msgstr "Δεν μπορείτε να αλλάξετε το φορμά ενός μη-τοπικού φακέλου."
 
-#: mail/mail-mt.c:259
+#: mail/mail-mt.c:257
 #, c-format
 msgid ""
 "Error while '%s':\n"
@@ -13206,7 +13554,7 @@ msgstr ""
 "Σφάλμα κατά '%s':\n"
 "%s"
 
-#: mail/mail-mt.c:262
+#: mail/mail-mt.c:260
 #, c-format
 msgid ""
 "Error while performing operation:\n"
@@ -13215,131 +13563,122 @@ msgstr ""
 "Σφάλμα κατά την εκτέλεση της λειτουργίας:\n"
 "%s"
 
-#: mail/mail-mt.c:913
+#: mail/mail-mt.c:904
 msgid "Working"
 msgstr "Εργάζεται"
 
-#: mail/mail-ops.c:87
+#: mail/mail-ops.c:86
 msgid "Filtering Folder"
 msgstr "Φιλτράρισμα Φακέλου"
 
-#: mail/mail-ops.c:260
+#: mail/mail-ops.c:264
 msgid "Fetching Mail"
 msgstr "Λήψη Μηνύματος"
 
-#: mail/mail-ops.c:557
-#, fuzzy, c-format
-msgid "Failed to apply outgoing filters: %s"
-msgstr "Δεν ήταν δυνατή η αποθήκευση του προσωρινού αρχείο μηνυμάτων %s: %s"
-
-#: mail/mail-ops.c:578
-#, c-format
-msgid ""
-"Failed to append to %s: %s\n"
-"Appending to local `Sent' folder instead."
-msgstr ""
-
-#: mail/mail-ops.c:587
-#, fuzzy, c-format
-msgid "Failed to append to local `Sent' folder: %s"
-msgstr "Δεν ήταν δυνατή η αποθήκευση του προσωρινού αρχείο μηνυμάτων %s: %s"
+#: mail/mail-ops.c:550
+#: mail/mail-ops.c:579
+msgid "However, the message was successfully sent."
+msgstr "Παρ'όλα αυτά το μήνυμα στάλθηκε με επιτυχία."
 
-#: mail/mail-ops.c:629
+#: mail/mail-ops.c:611
 #, c-format
 msgid "Sending \"%s\""
 msgstr "Αποστέλλεται \"%s\""
 
-#: mail/mail-ops.c:747
+#: mail/mail-ops.c:729
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Αποστολή μηνύματος %d από %d"
 
-#: mail/mail-ops.c:766
+#: mail/mail-ops.c:748
 #, c-format
 msgid "Failed on message %d of %d"
 msgstr "Αποτυχία στο μήνυμα %d από %d"
 
-#: mail/mail-ops.c:768
+#: mail/mail-ops.c:750
+#: mail/mail-send-recv.c:581
 msgid "Complete."
 msgstr "Ολοκληρώθηκε."
 
-#: mail/mail-ops.c:862
+#: mail/mail-ops.c:844
 msgid "Saving message to folder"
 msgstr "Αποθήκευση μηνύματος στον φάκελο"
 
-#: mail/mail-ops.c:943
+#: mail/mail-ops.c:925
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Μετακίνηση μηνυμάτων στο %s"
 
-#: mail/mail-ops.c:943
+#: mail/mail-ops.c:925
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Αντιγραφή μηνυμάτων στο %s"
 
-#: mail/mail-ops.c:1056
+#: mail/mail-ops.c:1042
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Σάρωση φακέλων στο \"%s\""
 
-#: mail/mail-ops.c:1244
+#: mail/mail-ops.c:1225
 msgid "Forwarded messages"
 msgstr "Προωθημένα μηνύματα"
 
-#: mail/mail-ops.c:1287
+#: mail/mail-ops.c:1268
 #, c-format
 msgid "Opening folder %s"
 msgstr "Άνοιγμα φακέλου %s"
 
-#: mail/mail-ops.c:1359
+#: mail/mail-ops.c:1340
 #, c-format
 msgid "Opening store %s"
 msgstr "Άνοιγμα αποθήκης %s"
 
-#: mail/mail-ops.c:1437
+#: mail/mail-ops.c:1413
 #, c-format
 msgid "Removing folder %s"
 msgstr "Αφαιρείται ο φακέλος %s"
 
-#: mail/mail-ops.c:1531
+#: mail/mail-ops.c:1507
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Αποθηκεύεται ο φακέλος '%s'"
 
-#: mail/mail-ops.c:1582
+#: mail/mail-ops.c:1558
 msgid "Refreshing folder"
 msgstr "Ανανεώνεται ο φακέλος"
 
-#: mail/mail-ops.c:1618 mail/mail-ops.c:1669
+#: mail/mail-ops.c:1594
+#: mail/mail-ops.c:1645
 msgid "Expunging folder"
 msgstr "Εξαλείφεται ο φακέλος"
 
-#: mail/mail-ops.c:1666
-#, fuzzy, c-format
+#: mail/mail-ops.c:1642
+#, fuzzy
 msgid "Emptying trash in '%s'"
 msgstr "Εισάγεται ως %s"
 
-#: mail/mail-ops.c:1667 my-evolution/e-summary-mail.c:483
+#: mail/mail-ops.c:1643
+#: my-evolution/e-summary-mail.c:483
 #: shell/e-local-storage.c:1151
 msgid "Local Folders"
 msgstr "Τοπικοί Φάκελοι"
 
-#: mail/mail-ops.c:1742
+#: mail/mail-ops.c:1718
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Παραλαμβάνεται το μήνυμα %s"
 
-#: mail/mail-ops.c:1814
+#: mail/mail-ops.c:1790
 #, c-format
 msgid "Retrieving %d message(s)"
 msgstr "Παραλαμβάνονται %d μήνυμα(τα)"
 
-#: mail/mail-ops.c:1898
+#: mail/mail-ops.c:1876
 #, c-format
 msgid "Saving %d messsage(s)"
 msgstr "Αποθήκευση %d μηνυμάτων"
 
-#: mail/mail-ops.c:1946
+#: mail/mail-ops.c:1924
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -13348,7 +13687,7 @@ msgstr ""
 "Δεν είναι δυνατή η δημιουργία του αρχείου εξόδου: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1974
+#: mail/mail-ops.c:1952
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -13357,11 +13696,11 @@ msgstr ""
 "Σφάλμα κατά την αποθήκευση μηνυμάτων στο %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2045
+#: mail/mail-ops.c:2026
 msgid "Saving attachment"
 msgstr "Αποθήκευση συννημένου"
 
-#: mail/mail-ops.c:2062
+#: mail/mail-ops.c:2043
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -13370,78 +13709,110 @@ msgstr ""
 "Δεν είναι δυνατή η δημιουργία αρχείου εξόδου: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2092
+#: mail/mail-ops.c:2073
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Δεν ήταν δυνατή η εγγραφή δεδομένων:%s"
 
-#: mail/mail-ops.c:2240
+#: mail/mail-ops.c:2221
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Αποσύνδεση από το %s"
 
-#: mail/mail-ops.c:2240
+#: mail/mail-ops.c:2221
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Επανασύνδεση στο %s"
 
-#: mail/mail-send-recv.c:147
+#: mail/mail-search.c:154
+msgid "(Untitled Message)"
+msgstr "(Μήνυμα Χωρίς Τίτλο)"
+
+#: mail/mail-search.c:236
+msgid "Untitled Message"
+msgstr "Μήνυμα Χωρίς Τίτλο"
+
+#: mail/mail-search.c:238
+msgid "Empty Message"
+msgstr "Κενό Μήνυμα"
+
+#: mail/mail-search.c:287
+msgid "Find in Message"
+msgstr "Εύρεση στο Μήνυμα"
+
+#: mail/mail-search.c:320
+msgid "Case Sensitive"
+msgstr "Διάκριση πεζών κεφαλαίων"
+
+#: mail/mail-search.c:322
+msgid "Search Forward"
+msgstr "Αναζήτηση Προωθημένων"
+
+#: mail/mail-search.c:342
+msgid "Find:"
+msgstr "Εύρεση:"
+
+#: mail/mail-search.c:346
+msgid "Matches:"
+msgstr "Ταιριάζει με:"
+
+#: mail/mail-send-recv.c:146
 msgid "Cancelling..."
 msgstr "Γίνεται Ακύρωση..."
 
-#: mail/mail-send-recv.c:255
+#: mail/mail-send-recv.c:254
 #, c-format
 msgid "Server: %s, Type: %s"
 msgstr "Διακομιστής: %s, Είδος: %s"
 
-#: mail/mail-send-recv.c:257
+#: mail/mail-send-recv.c:256
 #, c-format
 msgid "Path: %s, Type: %s"
 msgstr "Θέση: %s, Τύπος: %s"
 
-#: mail/mail-send-recv.c:259
+#: mail/mail-send-recv.c:258
 #, c-format
 msgid "Type: %s"
 msgstr "Τύπος: %s"
 
-#: mail/mail-send-recv.c:308
+#: mail/mail-send-recv.c:306
 msgid "Send & Receive Mail"
 msgstr "Αποστολή & Λήψη Μηνυμάτων"
 
-#: mail/mail-send-recv.c:309
+#: mail/mail-send-recv.c:307
 #, fuzzy
 msgid "Cancel _All"
 msgstr "Ακύρωση Όλων"
 
-#: mail/mail-send-recv.c:390
+#: mail/mail-send-recv.c:389
 msgid "Updating..."
 msgstr "Ανανέωση..."
 
-#: mail/mail-send-recv.c:390 mail/mail-send-recv.c:442
+#: mail/mail-send-recv.c:390
+#: mail/mail-send-recv.c:446
 msgid "Waiting..."
 msgstr "Αναμονή..."
 
-#: mail/mail-session.c:229
+#: mail/mail-session.c:226
 msgid "User canceled operation."
 msgstr "Ο χρήστης ακύρωσε την λειτουργία."
 
-#: mail/mail-session.c:262
+#: mail/mail-session.c:259
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Εισάγετε κωδικό πρόσβασης για %s"
 
-#: mail/mail-session.c:264
+#: mail/mail-session.c:261
 msgid "Enter Password"
 msgstr "Εισάγετε κωδικό πρόσβασης"
 
-#: mail/mail-session.c:287
+#: mail/mail-session.c:284
 msgid "_Remember this password"
 msgstr "_Απομνημόνευση αυτού του κωδικού"
 
-#: mail/mail-session.c:288
+#: mail/mail-session.c:285
 msgid "_Remember this password for the remainder of this session"
-msgstr ""
-"Απο_μνημόνευση αυτού του κωδικού πρόσβασης για το υπόλοιπο της συνεδρίας"
+msgstr "Απο_μνημόνευση αυτού του κωδικού πρόσβασης για το υπόλοιπο της συνεδρίας"
 
 #: mail/mail-signature-editor.c:80
 #, c-format
@@ -13487,17 +13858,21 @@ msgstr "Προωθημένο μήνυμα - %s"
 msgid "Forwarded message"
 msgstr "Προωθημένο μήνυμα"
 
-#: mail/mail-vfolder.c:91
+#: mail/mail-tools.c:438
+msgid "Forwarded Message"
+msgstr "Προωθημένο Μήνυμα"
+
+#: mail/mail-vfolder.c:92
 #, c-format
 msgid "Setting up vfolder: %s"
 msgstr "Ρύθμιση εφακέλου: %s"
 
-#: mail/mail-vfolder.c:209
+#: mail/mail-vfolder.c:210
 #, c-format
 msgid "Updating vfolders for uri: %s"
 msgstr "Αναβάθμιση εφακέλων για το uri: %s"
 
-#: mail/mail-vfolder.c:467
+#: mail/mail-vfolder.c:468
 #, c-format
 msgid ""
 "The following vFolder(s):\n"
@@ -13510,95 +13885,100 @@ msgstr ""
 "    '%s'\n"
 "Και έχει ανανεωθεί."
 
-#: mail/mail-vfolder.c:776
+#: mail/mail-vfolder.c:777
 msgid "VFolders"
 msgstr "ΕΦάκελοι"
 
-#: mail/mail-vfolder.c:834
+#: mail/mail-vfolder.c:835
 msgid "vFolders"
 msgstr "εΦάκελοι"
 
-#: mail/mail-vfolder.c:873
+#: mail/mail-vfolder.c:874
 msgid "Edit VFolder"
 msgstr "Επεξεργασία ΕΦακέλου"
 
-#: mail/mail-vfolder.c:893
+#: mail/mail-vfolder.c:894
 #, c-format
 msgid "Trying to edit a vfolder '%s' which doesn't exist."
 msgstr "Προσπάθεια επεξεργασίας εφακέλου '%s' που δεν υπάρχει."
 
-#: mail/mail-vfolder.c:965
+#: mail/mail-vfolder.c:966
 msgid "New VFolder"
 msgstr "Νέος ΕΦάκελος"
 
-#: mail/message-list.c:900
+#: mail/message-browser.c:224
+msgid "(No subject)"
+msgstr "(Χωρίς Θέμα)"
+
+#: mail/message-browser.c:226
+#, c-format
+msgid "%s - Message"
+msgstr "%s - Μήνυμα"
+
+#: mail/message-list.c:741
 msgid "Unseen"
 msgstr ""
 
-#: mail/message-list.c:901
+#: mail/message-list.c:742
 msgid "Seen"
 msgstr ""
 
-#: mail/message-list.c:902
+#: mail/message-list.c:743
 msgid "Answered"
 msgstr "Απαντημένα"
 
-#: mail/message-list.c:903
+#: mail/message-list.c:744
 msgid "Multiple Unseen Messages"
 msgstr ""
 
-#: mail/message-list.c:904
+#: mail/message-list.c:745
 msgid "Multiple Messages"
 msgstr "Πολλαπλά Μηνύματα"
 
-#: mail/message-list.c:908
+#: mail/message-list.c:749
 msgid "Lowest"
 msgstr "Χαμηλότερα"
 
-#: mail/message-list.c:909
+#: mail/message-list.c:750
 msgid "Lower"
 msgstr "Χαμηλά"
 
-#: mail/message-list.c:913
+#: mail/message-list.c:754
 msgid "Higher"
 msgstr "Υψηλά"
 
-#: mail/message-list.c:914
+#: mail/message-list.c:755
 msgid "Highest"
 msgstr "Υψηλότερα"
 
-#: mail/message-list.c:1231
+#: mail/message-list.c:1072
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:1238
+#: mail/message-list.c:1079
 msgid "Today %l:%M %p"
 msgstr "Σήμερα %l:%M %p"
 
-#: mail/message-list.c:1247
+#: mail/message-list.c:1088
 msgid "Yesterday %l:%M %p"
 msgstr "Χθες %l:%M %p"
 
-#: mail/message-list.c:1259
+#: mail/message-list.c:1100
 msgid "%a %l:%M %p"
 msgstr "%l:%M %p %a"
 
-#: mail/message-list.c:1267
+#: mail/message-list.c:1108
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %l:%M %p"
 
-#: mail/message-list.c:1269
+#: mail/message-list.c:1110
 msgid "%b %d %Y"
 msgstr "%d %b %Y"
 
-#: mail/message-list.c:3062
+#: mail/message-list.c:2649
 msgid "Generating message list"
 msgstr "Δημιουργία λίστας μηνυμάτων"
 
-#: mail/message-list.etspec.h:2
-msgid "Date"
-msgstr "Ημερομηνία"
-
 #: mail/message-list.etspec.h:3
 msgid "Due By"
 msgstr "Λήξη "
@@ -13615,10 +13995,6 @@ msgstr "Σημειωμένο"
 msgid "Follow Up Flag"
 msgstr ""
 
-#: mail/message-list.etspec.h:7 mail/message-tag-followup.c:301
-msgid "From"
-msgstr "Από"
-
 #: mail/message-list.etspec.h:8
 msgid "Original Location"
 msgstr "Αρχική τοποθεσία"
@@ -13631,10 +14007,6 @@ msgstr "Ελήφθη"
 msgid "Size"
 msgstr "Μέγεθος"
 
-#: mail/message-list.etspec.h:14
-msgid "To"
-msgstr "Προς"
-
 #: mail/message-tag-followup.c:62
 msgid "Call"
 msgstr "Κλήση"
@@ -13651,7 +14023,8 @@ msgstr ""
 msgid "For Your Information"
 msgstr "Για πληροφόρηση σας"
 
-#: mail/message-tag-followup.c:66 ui/evolution-mail-message.xml.h:40
+#: mail/message-tag-followup.c:66
+#: ui/evolution-mail-message.xml.h:36
 msgid "Forward"
 msgstr "Προώθηση"
 
@@ -13659,11 +14032,13 @@ msgstr "Προώθηση"
 msgid "No Response Necessary"
 msgstr "Δεν είναι απαραίτητη απάντηση"
 
-#: mail/message-tag-followup.c:69 ui/evolution-mail-message.xml.h:77
+#: mail/message-tag-followup.c:69
+#: ui/evolution-mail-message.xml.h:72
 msgid "Reply"
 msgstr "Απάντηση"
 
-#: mail/message-tag-followup.c:70 ui/evolution-mail-message.xml.h:78
+#: mail/message-tag-followup.c:70
+#: ui/evolution-mail-message.xml.h:73
 msgid "Reply to All"
 msgstr "Απάντηση σε Όλους"
 
@@ -13671,7 +14046,8 @@ msgstr "Απάντηση σε Όλους"
 msgid "Review"
 msgstr "Επισκόπηση"
 
-#: mail/message-tag-followup.c:281 mail/message-tags.glade.h:3
+#: mail/message-tag-followup.c:281
+#: mail/message-tags.glade.h:3
 msgid "Flag to Follow Up"
 msgstr ""
 
@@ -13693,6 +14069,40 @@ msgstr "_Λήξη: "
 msgid "_Flag:"
 msgstr "_Σημαία:"
 
+#: mail/subscribe-dialog.c:230
+#, c-format
+msgid "Scanning folders under %s on \"%s\""
+msgstr "Σάρωση φακέλων κάτω από %s στο \"%s\""
+
+#: mail/subscribe-dialog.c:232
+#, c-format
+msgid "Scanning root-level folders on \"%s\""
+msgstr "Σάρωση των ριζικών φακέλων στο \"%s\""
+
+#: mail/subscribe-dialog.c:329
+#, c-format
+msgid "Subscribing to folder \"%s\""
+msgstr "Συνδρομή στον φάκελο \"%s\""
+
+#: mail/subscribe-dialog.c:331
+#, c-format
+msgid "Unsubscribing to folder \"%s\""
+msgstr "Κατάργηση συνδρομής στον φάκελο \"%s\""
+
+#: mail/subscribe-dialog.c:1270
+#: mail/subscribe-dialog.etspec.h:1
+#: shell/e-storage-set-view.etspec.h:2
+msgid "Folder"
+msgstr "Φάκελος"
+
+#: mail/subscribe-dialog.c:1499
+msgid "No server has been selected"
+msgstr "Δεν έχει επιλεγεί διακομιστής"
+
+#: mail/subscribe-dialog.c:1598
+msgid "Please select a server."
+msgstr "Παρακαλώ επιλέξτε διακομιστή."
+
 #: mail/subscribe-dialog.glade.h:1
 #, fuzzy
 msgid "Folder Subscriptions"
@@ -13709,126 +14119,18 @@ msgid "S_erver:"
 msgstr "_κάθε"
 
 #: mail/subscribe-dialog.glade.h:4
+#, fuzzy
+msgid "Scanning folders ..."
+msgstr "Ανάγνωση φακέλων..."
+
+#: mail/subscribe-dialog.glade.h:5
 msgid "_Subscribe"
 msgstr "_Συνδρομή"
 
-#: mail/subscribe-dialog.glade.h:5
+#: mail/subscribe-dialog.glade.h:6
 msgid "_Unsubscribe"
 msgstr "_Κατάργηση Συνδρομής"
 
-#: my-evolution/component-factory.c:56
-msgid "Folder containing the Evolution Summary"
-msgstr "Φάκελος που περιέχει την περίληψη του Evolution"
-
-#: my-evolution/e-summary.c:204
-msgid "%A, %B %e %Y"
-msgstr "%A, %e %B  %Y"
-
-#: my-evolution/e-summary.c:533
-msgid "Please wait..."
-msgstr "Παρακαλώ περιμένετε..."
-
-#: my-evolution/e-summary.c:622 ui/my-evolution.xml.h:2
-msgid "Print Summary"
-msgstr "Εκτύπωση Περίληψης"
-
-#: my-evolution/e-summary.c:655
-msgid "Printing of Summary failed"
-msgstr "Η Εκτύπωση Περίληψης απέτυχε"
-
-#: my-evolution/e-summary-calendar.c:384
-msgid "Appointments"
-msgstr "Ραντεβού"
-
-#: my-evolution/e-summary-calendar.c:392
-#, fuzzy
-msgid "No appointments."
-msgstr "Χωρίς Ραντεβού"
-
-#: my-evolution/e-summary-calendar.c:409
-msgid "%k:%M %d %B"
-msgstr "%k:%M %d %B"
-
-#: my-evolution/e-summary-calendar.c:411
-#, fuzzy
-msgid "%l:%M%p %d %B"
-msgstr "%l:%M %d %B"
-
-#: my-evolution/e-summary-calendar.c:429
-msgid "No description"
-msgstr "Χωρίς περιγραφή"
-
-#: my-evolution/e-summary-mail.c:189
-msgid "Mail summary"
-msgstr "Σύνοψη μηνυμάτων"
-
-#: my-evolution/e-summary-preferences.c:355
-msgid "Dictionary.com Word of the Day"
-msgstr "Dictionary.com Word of the Day"
-
-#: my-evolution/e-summary-preferences.c:373
-msgid "Quotes of the Day"
-msgstr "Φράσεις Ημέρας"
-
-#: my-evolution/e-summary-preferences.c:565
-#, fuzzy
-msgid "New News Feed"
-msgstr "Τροφοδοσία Ειδήσεων"
-
-#: my-evolution/e-summary-preferences.c:581
-msgid "_URL:"
-msgstr "_URL:"
-
-#: my-evolution/e-summary-rdf.c:315
-msgid "Error downloading RDF"
-msgstr "Σφάλμα κατά την λήψη του RDF"
-
-#: my-evolution/e-summary-rdf.c:453
-msgid "News Feed"
-msgstr "Τροφοδοσία Ειδήσεων"
-
-#: my-evolution/e-summary-shown.c:496
-msgid "All"
-msgstr "Όλα"
-
-#: my-evolution/e-summary-shown.c:521 my-evolution/e-summary-table.c:58
-#, fuzzy
-msgid "Shown"
-msgstr "Σουηδία"
-
-#: my-evolution/e-summary-tasks.c:349
-msgid "No tasks"
-msgstr "Δεν υπάρχουν εργασίες"
-
-#: my-evolution/e-summary-tasks.c:387
-#, fuzzy
-msgid "blue"
-msgstr "Μέλος"
-
-#: my-evolution/e-summary-tasks.c:387
-msgid "(No Description)"
-msgstr "(Χωρίς Περιγραφή)"
-
-#: my-evolution/e-summary-weather.c:72
-msgid "My Weather"
-msgstr "Ο Καιρός μου"
-
-#: my-evolution/e-summary-weather.c:261
-msgid "There was an error downloading data for"
-msgstr "Σφάλμα μεταφόρτωσης δεδομένων για"
-
-#: my-evolution/e-summary-weather.c:478 my-evolution/my-evolution.glade.h:16
-msgid "Weather"
-msgstr "Καιρός"
-
-#. translators: Put here a list of codes for locations you want to
-#. see in My Evolution by default. You can find the list of all
-#. stations and their codes in Evolution sources
-#. (evolution/my-evolution/Locations)
-#: my-evolution/e-summary-weather.c:582
-msgid "KBOS"
-msgstr "KBOS"
-
 #: my-evolution/GNOME_Evolution_Summary.server.in.in.h:1
 msgid "Configure the appearance of the Evolution Summary here"
 msgstr "Ρυθμίστε εδώ την εμφάνιση της περίληψης του Evolution"
@@ -17405,7 +17707,8 @@ msgid "Hagerstown"
 msgstr ""
 
 #. HAIL
-#: my-evolution/Locations.h:885 my-evolution/metar.c:218
+#: my-evolution/Locations.h:885
+#: my-evolution/metar.c:218
 msgid "Hail"
 msgstr "Χαλάζι"
 
@@ -24229,6 +24532,117 @@ msgstr ""
 msgid "Zurich"
 msgstr "Ζυρίχη"
 
+#: my-evolution/component-factory.c:56
+msgid "Folder containing the Evolution Summary"
+msgstr "Φάκελος που περιέχει την περίληψη του Evolution"
+
+#: my-evolution/e-summary-calendar.c:381
+msgid "Appointments"
+msgstr "Ραντεβού"
+
+#: my-evolution/e-summary-calendar.c:389
+#, fuzzy
+msgid "No appointments."
+msgstr "Χωρίς Ραντεβού"
+
+#: my-evolution/e-summary-calendar.c:406
+msgid "%k:%M %d %B"
+msgstr "%k:%M %d %B"
+
+#: my-evolution/e-summary-calendar.c:408
+#, fuzzy
+msgid "%l:%M%P %d %B"
+msgstr "%l:%M %d %B"
+
+#: my-evolution/e-summary-calendar.c:426
+msgid "No description"
+msgstr "Χωρίς περιγραφή"
+
+#: my-evolution/e-summary-mail.c:189
+msgid "Mail summary"
+msgstr "Σύνοψη μηνυμάτων"
+
+#: my-evolution/e-summary-preferences.c:355
+msgid "Dictionary.com Word of the Day"
+msgstr "Dictionary.com Word of the Day"
+
+#: my-evolution/e-summary-preferences.c:373
+msgid "Quotes of the Day"
+msgstr "Φράσεις Ημέρας"
+
+#: my-evolution/e-summary-preferences.c:565
+#, fuzzy
+msgid "New News Feed"
+msgstr "Τροφοδοσία Ειδήσεων"
+
+#: my-evolution/e-summary-preferences.c:581
+msgid "_URL:"
+msgstr "_URL:"
+
+#: my-evolution/e-summary-rdf.c:315
+msgid "Error downloading RDF"
+msgstr "Σφάλμα κατά την λήψη του RDF"
+
+#: my-evolution/e-summary-rdf.c:453
+msgid "News Feed"
+msgstr "Τροφοδοσία Ειδήσεων"
+
+#: my-evolution/e-summary-shown.c:496
+msgid "All"
+msgstr "Όλα"
+
+#: my-evolution/e-summary-shown.c:521
+#: my-evolution/e-summary-table.c:58
+#, fuzzy
+msgid "Shown"
+msgstr "Σουηδία"
+
+#: my-evolution/e-summary-tasks.c:330
+msgid "No tasks"
+msgstr "Δεν υπάρχουν εργασίες"
+
+#: my-evolution/e-summary-tasks.c:364
+msgid "(No Description)"
+msgstr "(Χωρίς Περιγραφή)"
+
+#: my-evolution/e-summary-weather.c:73
+msgid "My Weather"
+msgstr "Ο Καιρός μου"
+
+#: my-evolution/e-summary-weather.c:262
+msgid "There was an error downloading data for"
+msgstr "Σφάλμα μεταφόρτωσης δεδομένων για"
+
+#: my-evolution/e-summary-weather.c:479
+#: my-evolution/my-evolution.glade.h:16
+msgid "Weather"
+msgstr "Καιρός"
+
+#. translators: Put here a list of codes for locations you want to
+#. see in My Evolution by default. You can find the list of all
+#. stations and their codes in Evolution sources
+#. (evolution/my-evolution/Locations)
+#: my-evolution/e-summary-weather.c:583
+msgid "KBOS"
+msgstr "KBOS"
+
+#: my-evolution/e-summary.c:204
+msgid "%A, %B %e %Y"
+msgstr "%A, %e %B  %Y"
+
+#: my-evolution/e-summary.c:533
+msgid "Please wait..."
+msgstr "Παρακαλώ περιμένετε..."
+
+#: my-evolution/e-summary.c:622
+#: ui/my-evolution.xml.h:2
+msgid "Print Summary"
+msgstr "Εκτύπωση Περίληψης"
+
+#: my-evolution/e-summary.c:655
+msgid "Printing of Summary failed"
+msgstr "Η Εκτύπωση Περίληψης απέτυχε"
+
 #: my-evolution/metar.c:30
 msgid " F"
 msgstr " F"
@@ -24281,7 +24695,9 @@ msgstr "Μερικά σύννεφα"
 msgid "Overcast"
 msgstr "Συννεφιά"
 
-#: my-evolution/metar.c:57 my-evolution/metar.c:75 my-evolution/metar.c:486
+#: my-evolution/metar.c:57
+#: my-evolution/metar.c:75
+#: my-evolution/metar.c:486
 msgid "Invalid"
 msgstr "Μη έγκυρη"
 
@@ -24386,7 +24802,8 @@ msgstr "Τμήματα με ψιχάλισμα"
 msgid "Partial drizzle"
 msgstr "Μερικό ψιχάλισμα"
 
-#: my-evolution/metar.c:136 my-evolution/metar.c:151
+#: my-evolution/metar.c:136
+#: my-evolution/metar.c:151
 msgid "Thunderstorm"
 msgstr "Καταιγίδα"
 
@@ -24488,7 +24905,8 @@ msgstr "Τμήματα με χιόνι"
 msgid "Partial snowfall"
 msgstr "Τμήματα με χιονόπτωση"
 
-#: my-evolution/metar.c:166 my-evolution/metar.c:181
+#: my-evolution/metar.c:166
+#: my-evolution/metar.c:181
 msgid "Snowstorm"
 msgstr "Χιονοθύελλα"
 
@@ -24663,7 +25081,8 @@ msgstr "Παγωμένοι σβώλοι πάγου"
 msgid "Hail in the vicinity"
 msgstr "Τοπικό χαλάζι"
 
-#: my-evolution/metar.c:220 my-evolution/metar.c:235
+#: my-evolution/metar.c:220
+#: my-evolution/metar.c:235
 msgid "Light hail"
 msgstr "Ελαφρύ χαλάζι"
 
@@ -25330,7 +25749,8 @@ msgid "Drifting funnel cloud"
 msgstr "Μετακινούμενα στενά σύννεφα"
 
 #. TORNADO
-#: my-evolution/metar.c:443 my-evolution/metar.c:452
+#: my-evolution/metar.c:443
+#: my-evolution/metar.c:452
 msgid "Tornado"
 msgstr "Θύελλα"
 
@@ -25493,28 +25913,22 @@ msgstr "_Μία ημέρα"
 msgid "_Show full path for folders"
 msgstr "_Εμφάνιση ολόκληρης θέσης των φακέλων"
 
-#: notes/component-factory.c:27
-#: shell/e-shell-user-creatable-items-handler.c:587
-#: shell/e-shell-user-creatable-items-handler.c:643
-#: widgets/misc/e-charset-picker.c:109
-msgid "New"
-msgstr "Νέο"
+#: shell/GNOME_Evolution_Shell.server.in.in.h:1
+msgid "Configure special folders and offline folder behavior here"
+msgstr ""
 
-#: notes/component-factory.c:27
+#: shell/GNOME_Evolution_Shell.server.in.in.h:2
 #, fuzzy
-msgid "Create a new note"
-msgstr "Δημιουργία νέου φακέλου"
+msgid "Evolution Shell"
+msgstr "Κέλυφος Evolution."
 
-#: notes/component-factory.c:152
-#, fuzzy
-msgid "Cannot initialize Evolution's notes component."
+#: shell/GNOME_Evolution_Shell.server.in.in.h:3
+msgid "Evolution folder settings configuration control"
 msgstr ""
-"Δεν ήταν δυνατή η αρχικοποίηση του περιβάλλοντος του Ximian Evolution: %s"
 
-#: notes/main.c:30
-#, fuzzy
-msgid "Notes Component: Could not initialize bonobo"
-msgstr "Δεν ήταν δυνατή η αρχικοποίηση του Bonobo"
+#: shell/GNOME_Evolution_Shell.server.in.in.h:4
+msgid "Folder Settings"
+msgstr "Ρυθμίσεις φακέλων"
 
 #: shell/e-activity-handler.c:164
 msgid "Show Details"
@@ -25533,7 +25947,8 @@ msgstr ""
 "Αδύνατη η μεταφορά του φακέλου:\n"
 "%s"
 
-#: shell/e-folder-list.c:122 shell/evolution-folder-selector-button.c:128
+#: shell/e-folder-list.c:122
+#: shell/evolution-folder-selector-button.c:128
 #, c-format
 msgid "\"%s\" in \"%s\""
 msgstr "\"%s\" σε  \"%s\""
@@ -25546,7 +25961,8 @@ msgstr "Προσθήκη ενός φακέλου"
 msgid "Drafts"
 msgstr "Πρόχειρα"
 
-#: shell/e-local-storage.c:180 shell/e-shell-view.c:481
+#: shell/e-local-storage.c:180
+#: shell/e-shell-view.c:481
 #: shell/e-shortcuts.c:1084
 msgid "Inbox"
 msgstr "Εισερχόμενα"
@@ -25609,49 +26025,6 @@ msgstr ""
 msgid "Brought to you by"
 msgstr "Συνεργάστηκαν"
 
-#: shell/e-shell.c:175
-#, c-format
-msgid ""
-"Cannot activate component %s :\n"
-"The error from the activation system is:\n"
-"%s"
-msgstr ""
-"Αδυναμία ενεργοποίησης στοιχείου%s :\n"
-"Το σφάλμα από το σύστημα ενεργοποίησης είναι:\n"
-"%s"
-
-#: shell/e-shell.c:741
-#, c-format
-msgid "Cannot set up local storage -- %s"
-msgstr "Δεν ήταν δυνατή η δημιουργία τοπικής αποθήκευσης -- %s"
-
-#: shell/e-shell.c:1804
-#, c-format
-msgid ""
-"The Evolution component that handles folders of type \"%s\"\n"
-"has unexpectedly quit. You will need to quit Evolution and restart\n"
-"in order to access that data again."
-msgstr ""
-"Το συστατικό του Evolution που διαχειρίζεται του φακέλους τύπου\"%s\"\n"
-"τερματίστηκαν αναπάντεχα. Θα χρειαστεί να τερματίζεται το Evolution και\n"
-"να το ξεκινήσετε πάλι για να έχετε ξανά πρόσβαση στα δεδομένα."
-
-#: shell/e-shell.c:2069
-msgid "Invalid arguments"
-msgstr "Μη έγκυρη παράμετρος"
-
-#: shell/e-shell.c:2071
-msgid "Cannot register on OAF"
-msgstr "Δεν ήταν δυνατή η εγγραφή στο OAF"
-
-#: shell/e-shell.c:2073
-msgid "Configuration Database not found"
-msgstr "Δεν βρέθηκε η βάση δεδομένων ρυθμίσεων"
-
-#: shell/e-shell.c:2075 shell/e-storage.c:568
-msgid "Generic error"
-msgstr "Γενικό σφάλμα"
-
 #: shell/e-shell-config-autocompletion.c:110
 #, fuzzy
 msgid "Extra Completion folders"
@@ -25741,31 +26114,26 @@ msgstr ""
 "Δεν ήταν δυνατή η μετονομασία του φακέλου :\n"
 "%s"
 
-#: shell/e-shell-folder-commands.c:534
+#: shell/e-shell-folder-commands.c:538
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "Μετονομασία φακέλου \"%s\" σε:"
 
-#: shell/e-shell-folder-commands.c:541
+#: shell/e-shell-folder-commands.c:544
 msgid "Rename Folder"
 msgstr "Μετονομασία Φακέλου"
 
-#: shell/e-shell-folder-commands.c:547
+#: shell/e-shell-folder-commands.c:553
 #: shell/e-shell-folder-creation-dialog.c:180
 #, c-format
 msgid "The specified folder name is not valid: %s"
 msgstr "Το συγκεκριμένο όνομα φακέλου δεν είναι έγκυρο: %s"
 
-#: shell/e-shell-folder-commands.c:554
-#, c-format
-msgid "A folder named \"%s\" already exists. Please use a different name."
-msgstr ""
-
-#: shell/e-shell-folder-commands.c:584
+#: shell/e-shell-folder-commands.c:587
 msgid "Selected folder does not belong to another user"
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:587
+#: shell/e-shell-folder-commands.c:590
 #, c-format
 msgid ""
 "Cannot remove folder:\n"
@@ -25787,7 +26155,8 @@ msgstr ""
 msgid "Create New Folder"
 msgstr "Δημιουργία Νέου Φακέλου.."
 
-#: shell/e-shell-folder-title-bar.c:592 shell/e-shell-folder-title-bar.c:593
+#: shell/e-shell-folder-title-bar.c:592
+#: shell/e-shell-folder-title-bar.c:593
 msgid "(Untitled)"
 msgstr "(Χωρίς Τίτλο)"
 
@@ -25797,31 +26166,21 @@ msgstr "Επιλέξτε τον τύπο του εισαγωγέα που θα �
 
 #: shell/e-shell-importer.c:142
 msgid ""
-"Choose the file that you want to import into Evolution, and select what type "
-"of file it is from the list.\n"
+"Choose the file that you want to import into Evolution, and select what type of file it is from the list.\n"
 "\n"
-"You can select \"Automatic\" if you do not know, and Evolution will attempt "
-"to work it out."
+"You can select \"Automatic\" if you do not know, and Evolution will attempt to work it out."
 msgstr ""
-"Επιλέξτε το αρχείο και τον τύπο του αρχείου που θέλετε να εισάγετε στο "
-"Evolution, από την λίστα\n"
+"Επιλέξτε το αρχείο και τον τύπο του αρχείου που θέλετε να εισάγετε στο Evolution, από την λίστα\n"
 "\n"
-"Μπορείτε να επιλέξτε \"Αυτόματη\" αν δεν ξέρετε, και το Evolution θα "
-"δοκιμάσει να βρει την λίστα."
+"Μπορείτε να επιλέξτε \"Αυτόματη\" αν δεν ξέρετε, και το Evolution θα δοκιμάσει να βρει την λίστα."
 
-#: shell/e-shell-importer.c:148 shell/e-shell-startup-wizard.c:724
+#: shell/e-shell-importer.c:148
+#: shell/e-shell-startup-wizard.c:709
 msgid "Please select the information that you would like to import:"
 msgstr "Παρακαλώ επιλέξτε την πληροφορία που θέλετε να εισάγετε:"
 
-#: shell/e-shell-importer.c:151
-msgid ""
-"Evolution checked for settings to import from the following\n"
-"applications: Pine, Netscape, Elm, iCalendar. No settings\n"
-"that could be imported where found. If you would like to\n"
-"try again, please click the \"Back\" button.\n"
-msgstr ""
-
-#: shell/e-shell-importer.c:219 shell/e-shell-importer.c:250
+#: shell/e-shell-importer.c:213
+#: shell/e-shell-importer.c:244
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -25830,21 +26189,22 @@ msgstr ""
 "Εισάγεται το %s\n"
 "Εισάγεται το στοιχείο%d."
 
-#: shell/e-shell-importer.c:323
+#: shell/e-shell-importer.c:317
 msgid "Select importer"
 msgstr "Επιλογή εισαγωγής"
 
-#: shell/e-shell-importer.c:464
+#: shell/e-shell-importer.c:458
 #, c-format
 msgid "File %s does not exist"
 msgstr "Το αρχείο %s δεν υπάρχει"
 
-#: shell/e-shell-importer.c:465 shell/e-shell-importer.c:482
-#: shell/e-shell-importer.c:524
+#: shell/e-shell-importer.c:459
+#: shell/e-shell-importer.c:476
+#: shell/e-shell-importer.c:518
 msgid "Evolution Error"
 msgstr "Σφάλμα Evolution"
 
-#: shell/e-shell-importer.c:481
+#: shell/e-shell-importer.c:475
 #, c-format
 msgid ""
 "There is no importer that is able to handle\n"
@@ -25853,11 +26213,11 @@ msgstr ""
 "Δεν υπάρχει εισαγωγέας που να μπορεί να χειριστεί το\n"
 "%s"
 
-#: shell/e-shell-importer.c:490
+#: shell/e-shell-importer.c:484
 msgid "Importing"
 msgstr "Εισάγεται"
 
-#: shell/e-shell-importer.c:497
+#: shell/e-shell-importer.c:491
 #, c-format
 msgid ""
 "Importing %s.\n"
@@ -25866,17 +26226,17 @@ msgstr ""
 "Εισάγεται το %s.\n"
 "Ξεκίνα το %s"
 
-#: shell/e-shell-importer.c:509
+#: shell/e-shell-importer.c:503
 #, c-format
 msgid "Error starting %s"
 msgstr "Σφάλμα κατά την εκκίνηση του %s"
 
-#: shell/e-shell-importer.c:523
+#: shell/e-shell-importer.c:517
 #, c-format
 msgid "Error loading %s"
 msgstr "Σφάλμα κατά το φόρτωμα του %s"
 
-#: shell/e-shell-importer.c:540
+#: shell/e-shell-importer.c:534
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -25885,35 +26245,32 @@ msgstr ""
 "Εισάγεται το %s\n"
 "Εισάγεται το στοιχείο 1."
 
-#: shell/e-shell-importer.c:594
+#: shell/e-shell-importer.c:588
 msgid "Automatic"
 msgstr "Αυτόματη"
 
-#: shell/e-shell-importer.c:643
-#, fuzzy
-msgid "_Filename:"
+#: shell/e-shell-importer.c:637
+msgid "Filename:"
 msgstr "Όνομα Αρχείου:"
 
-#: shell/e-shell-importer.c:648
+#: shell/e-shell-importer.c:642
 msgid "Select a file"
 msgstr "Επιλέξτε ένα αρχείο"
 
-#: shell/e-shell-importer.c:658
-#, fuzzy
-msgid "File _type:"
+#: shell/e-shell-importer.c:651
+msgid "File type:"
 msgstr "Τύπος αρχείου:"
 
-#: shell/e-shell-importer.c:684
-#, fuzzy
-msgid "Import data and settings from _older programs"
+#: shell/e-shell-importer.c:676
+msgid "Import data and settings from older programs"
 msgstr "Εισαγωγή δεδομένων και ρυθμίσεις από παλαιότερα προγράμματα"
 
-#: shell/e-shell-importer.c:687
-#, fuzzy
-msgid "Import a _single file"
+#: shell/e-shell-importer.c:680
+msgid "Import a single file"
 msgstr "Εισαγωγή μοναδικού αρχείου"
 
-#: shell/e-shell-importer.c:755 shell/e-shell-startup-wizard.c:553
+#: shell/e-shell-importer.c:746
+#: shell/e-shell-startup-wizard.c:538
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
@@ -25921,26 +26278,27 @@ msgstr ""
 "Παρακαλώ περιμένετε...\n"
 "Γίνεται σάρωση για υπάρχουσες εγκαταστάσεις"
 
-#: shell/e-shell-importer.c:758
+#: shell/e-shell-importer.c:749
 msgid "Starting Intelligent Importers"
 msgstr "Εκκίνηση των Έξυπνων Εισαγωγέων"
 
-#: shell/e-shell-importer.c:884 shell/e-shell-startup-wizard.c:679
+#: shell/e-shell-importer.c:873
+#: shell/e-shell-startup-wizard.c:664
 #, c-format
 msgid "From %s:"
 msgstr "Από %s:"
 
-#: shell/e-shell-importer.c:1061
+#: shell/e-shell-importer.c:1047
 msgid "Select folder"
 msgstr "Επιλογή Φακέλου"
 
-#: shell/e-shell-importer.c:1062
+#: shell/e-shell-importer.c:1048
 msgid "Select a destination folder for importing this data"
 msgstr "Επιλέξτε έναν φάκελο προορισμού για την εισαγωγή αυτών των δεδομένων"
 
-#: shell/e-shell-importer.c:1193
-#, fuzzy
-msgid "_Import"
+#: shell/e-shell-importer.c:1178
+#: shell/importer/intelligent.c:191
+msgid "Import"
 msgstr "Εισαγωγή"
 
 #: shell/e-shell-offline-handler.c:592
@@ -26000,19 +26358,11 @@ msgstr "Δεν ήταν δυνατό το άνοιγμα κοινόχρηστο�
 msgid "Cannot find the specified shared folder."
 msgstr "Δεν ήταν δυνατή η εύρεση του συγκεκριμένου κοινόχρηστου φακέλου."
 
-#: shell/e-shell-startup-wizard.c:771
-msgid ""
-"If you quit the Evolution Setup Assistant now, all of the information that "
-"you have entered will be forgotten. You will need to run this assistant "
-"again before using Evolution.\n"
-"\n"
-"Do you want to quit using the Assistant now?"
-msgstr ""
-
-#: shell/e-shell-startup-wizard.c:782
-#, fuzzy
-msgid "Quit Assistant"
-msgstr "Βοηθός"
+#: shell/e-shell-user-creatable-items-handler.c:586
+#: shell/e-shell-user-creatable-items-handler.c:642
+#: widgets/misc/e-charset-picker.c:109
+msgid "New"
+msgstr "Νέο"
 
 #: shell/e-shell-utils.c:116
 msgid "No folder name specified."
@@ -26036,42 +26386,9 @@ msgstr "Ο φάκελος δεν είναι δυνατό να περιέχει �
 msgid "'.' and '..' are reserved folder names."
 msgstr "το '.' and '..' είναι κρατημένα ονόματα φακέλων."
 
-#: shell/e-shell-view.c:264
-msgid "(No folder displayed)"
-msgstr "(Δεν εμφανίζεται φάκελος)"
-
-#: shell/e-shell-view.c:2040
-#, c-format
-msgid "%s (%d)"
-msgstr "%s (%d)"
-
-#: shell/e-shell-view.c:2042
-msgid "(None)"
-msgstr "(Κενό)"
-
-#: shell/e-shell-view.c:2083
-msgid ""
-"Ximian Evolution is currently online.  Click on this button to work offline."
-msgstr ""
-"Το Ximian Evolution είναι συνδεμένο στο δίκτυο. Κάντε κλικ στο πλήκτρο για "
-"να αποσυνδεθείτε."
-
-#: shell/e-shell-view.c:2090
-msgid "Ximian Evolution is in the process of going offline."
-msgstr "Το Ximian Evolution είναι στην διαδικασία αποσύνδεσης από το δίκτυο."
-
-#: shell/e-shell-view.c:2096
-msgid ""
-"Ximian Evolution is currently offline.  Click on this button to work online."
-msgstr ""
-"Το Ximian Evolution είναι εκτός δικτύου. Κάντε κλικ στο πλήκτρο για να "
-"συνδεθείτε."
-
 #: shell/e-shell-view-menu.c:89
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
-msgstr ""
-"Τα εργαλεία GNOME Pilot φαίνεται να μην είναι εγκατεστημένα σ' αυτό το "
-"σύστημα."
+msgstr "Τα εργαλεία GNOME Pilot φαίνεται να μην είναι εγκατεστημένα σ' αυτό το σύστημα."
 
 #: shell/e-shell-view-menu.c:97
 #, c-format
@@ -26110,21 +26427,84 @@ msgstr "Επιλέξτε τον φάκελο που θα συνδεθεί με �
 msgid "_Work Online"
 msgstr "Εργασία εν_τός Δικτύου"
 
-#: shell/e-shell-view-menu.c:782 ui/evolution.xml.h:65
+#: shell/e-shell-view-menu.c:782
+#: ui/evolution.xml.h:65
 msgid "_Work Offline"
 msgstr "Εργασία εκ_τός Δικτύου"
 
-#: shell/e-shell-view-menu.c:795 ui/evolution.xml.h:39
+#: shell/e-shell-view-menu.c:795
+#: ui/evolution.xml.h:39
 msgid "Work Offline"
 msgstr "Χρήση Χωρίς Σύνδεση"
 
-#: shell/e-shortcuts.c:649
-msgid "Error saving shortcuts."
-msgstr "Σφάλμα κατά την αποθήκευση των συντομεύσεων."
+#: shell/e-shell-view.c:264
+msgid "(No folder displayed)"
+msgstr "(Δεν εμφανίζεται φάκελος)"
 
-#: shell/e-shortcuts.c:1096
-msgid "Shortcuts"
-msgstr "Συντομεύσεις"
+#: shell/e-shell-view.c:2040
+#, c-format
+msgid "%s (%d)"
+msgstr "%s (%d)"
+
+#: shell/e-shell-view.c:2042
+msgid "(None)"
+msgstr "(Κενό)"
+
+#: shell/e-shell-view.c:2083
+msgid "Ximian Evolution is currently online.  Click on this button to work offline."
+msgstr "Το Ximian Evolution είναι συνδεμένο στο δίκτυο. Κάντε κλικ στο πλήκτρο για να αποσυνδεθείτε."
+
+#: shell/e-shell-view.c:2090
+msgid "Ximian Evolution is in the process of going offline."
+msgstr "Το Ximian Evolution είναι στην διαδικασία αποσύνδεσης από το δίκτυο."
+
+#: shell/e-shell-view.c:2096
+msgid "Ximian Evolution is currently offline.  Click on this button to work online."
+msgstr "Το Ximian Evolution είναι εκτός δικτύου. Κάντε κλικ στο πλήκτρο για να συνδεθείτε."
+
+#: shell/e-shell.c:175
+#, c-format
+msgid ""
+"Cannot activate component %s :\n"
+"The error from the activation system is:\n"
+"%s"
+msgstr ""
+"Αδυναμία ενεργοποίησης στοιχείου%s :\n"
+"Το σφάλμα από το σύστημα ενεργοποίησης είναι:\n"
+"%s"
+
+#: shell/e-shell.c:741
+#, c-format
+msgid "Cannot set up local storage -- %s"
+msgstr "Δεν ήταν δυνατή η δημιουργία τοπικής αποθήκευσης -- %s"
+
+#: shell/e-shell.c:1804
+#, c-format
+msgid ""
+"The Evolution component that handles folders of type \"%s\"\n"
+"has unexpectedly quit. You will need to quit Evolution and restart\n"
+"in order to access that data again."
+msgstr ""
+"Το συστατικό του Evolution που διαχειρίζεται του φακέλους τύπου\"%s\"\n"
+"τερματίστηκαν αναπάντεχα. Θα χρειαστεί να τερματίζεται το Evolution και\n"
+"να το ξεκινήσετε πάλι για να έχετε ξανά πρόσβαση στα δεδομένα."
+
+#: shell/e-shell.c:2069
+msgid "Invalid arguments"
+msgstr "Μη έγκυρη παράμετρος"
+
+#: shell/e-shell.c:2071
+msgid "Cannot register on OAF"
+msgstr "Δεν ήταν δυνατή η εγγραφή στο OAF"
+
+#: shell/e-shell.c:2073
+msgid "Configuration Database not found"
+msgstr "Δεν βρέθηκε η βάση δεδομένων ρυθμίσεων"
+
+#: shell/e-shell.c:2075
+#: shell/e-storage.c:568
+msgid "Generic error"
+msgstr "Γενικό σφάλμα"
 
 #: shell/e-shortcuts-view.c:80
 #, fuzzy
@@ -26219,7 +26599,8 @@ msgstr "Μετονομασία επιλεγμένης συντόμευσης σ�
 msgid "Open the folder linked to this shortcut"
 msgstr "Άνοιγμα του φακέλου συνδεμένο με αυτή την συντόμευση"
 
-#: shell/e-shortcuts-view.c:424 ui/evolution.xml.h:23
+#: shell/e-shortcuts-view.c:424
+#: ui/evolution.xml.h:23
 msgid "Open in New _Window"
 msgstr "Άνοιγμα σε Νέο _Παράθυρο"
 
@@ -26243,6 +26624,18 @@ msgstr "_Αφαίρεση"
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "Αφαίρεση αυτής της συντόμευσης από την γραμμή συντομεύσεων"
 
+#: shell/e-shortcuts.c:649
+msgid "Error saving shortcuts."
+msgstr "Σφάλμα κατά την αποθήκευση των συντομεύσεων."
+
+#: shell/e-shortcuts.c:1096
+msgid "Shortcuts"
+msgstr "Συντομεύσεις"
+
+#: shell/e-storage-set-view.etspec.h:1
+msgid "Checkbox"
+msgstr "Checkbox"
+
 #: shell/e-storage.c:566
 msgid "No error"
 msgstr "Χωρίς σφάλμα"
@@ -26281,13 +26674,11 @@ msgstr "Η λειτουργία δεν υποστηρίζεται"
 
 #: shell/e-storage.c:588
 msgid "The specified type is not supported in this storage"
-msgstr ""
-"Δεν υπάρχει υποστηρίξει για τον συγκεκριμένο τύπο σε αυτή τη αποθήκευση"
+msgstr "Δεν υπάρχει υποστηρίξει για τον συγκεκριμένο τύπο σε αυτή τη αποθήκευση"
 
 #: shell/e-storage.c:590
 msgid "The specified folder cannot be modified or removed"
-msgstr ""
-"Δεν είναι δυνατό να μετονομαστεί η να μετακινηθεί ο συγκεκριμένος φάκελος "
+msgstr "Δεν είναι δυνατό να μετονομαστεί η να μετακινηθεί ο συγκεκριμένος φάκελος "
 
 #: shell/e-storage.c:592
 msgid "Cannot make a folder a child of one of its descendants"
@@ -26301,14 +26692,6 @@ msgstr "Δεν ήταν δυνατή η δημιουργία φακέλου με
 msgid "This operation cannot be performed in off-line mode"
 msgstr ""
 
-#: shell/e-storage-set-view.etspec.h:1
-msgid "Checkbox"
-msgstr "Checkbox"
-
-#: shell/e-storage-set-view.etspec.h:2
-msgid "Folder"
-msgstr "Φάκελος"
-
 #: shell/e-task-widget.c:211
 #, c-format
 msgid "%s (...)"
@@ -26323,103 +26706,103 @@ msgstr "%s (%d%% έχει ολοκληρωθεί)"
 msgid "<click here to select a folder>"
 msgstr "<κάντε κλικ εδώ για να επιλέξετε φάκελο>"
 
-#: shell/evolution-shell-component.c:1187
+#: shell/evolution-shell-component-utils.c:124
+#, c-format
+msgid ""
+"%s\n"
+"\n"
+"Unknown error."
+msgstr ""
+"%s\n"
+"\n"
+"Άγνωστο Σφάλμα."
+
+#: shell/evolution-shell-component-utils.c:127
+#, c-format
+msgid ""
+"%s\n"
+"\n"
+"The error from the component system is:\n"
+"%s"
+msgstr ""
+"%s\n"
+"\n"
+"Το σφάλμα από το σύστημα συστατικών είναι:\n"
+"%s"
+
+#: shell/evolution-shell-component-utils.c:134
+#, c-format
+msgid ""
+"%s\n"
+"\n"
+"The error from the activation system is:\n"
+"%s"
+msgstr ""
+"%s\n"
+"\n"
+"Το σφάλμα από το σύστημα ενεργοποίησης είναι:\n"
+"%s"
+
+#: shell/evolution-shell-component.c:1184
 msgid "CORBA error"
 msgstr "Σφάλμα CORBA"
 
-#: shell/evolution-shell-component.c:1189
+#: shell/evolution-shell-component.c:1186
 msgid "Interrupted"
 msgstr "Έγινε Διακοπή"
 
-#: shell/evolution-shell-component.c:1191
+#: shell/evolution-shell-component.c:1188
 msgid "Invalid argument"
 msgstr "Μη έγκυρη παράμετρος"
 
-#: shell/evolution-shell-component.c:1193
+#: shell/evolution-shell-component.c:1190
 msgid "Already has an owner"
 msgstr "Έχει ήδη ιδιοκτήτη"
 
-#: shell/evolution-shell-component.c:1195
+#: shell/evolution-shell-component.c:1192
 msgid "No owner"
 msgstr "Χωρίς ιδιοκτήτη"
 
-#: shell/evolution-shell-component.c:1197
+#: shell/evolution-shell-component.c:1194
 msgid "Not found"
 msgstr "Δεν βρέθηκε"
 
-#: shell/evolution-shell-component.c:1199
+#: shell/evolution-shell-component.c:1196
 msgid "Unsupported type"
 msgstr "Ο τύπος δεν υποστηρίζεται"
 
-#: shell/evolution-shell-component.c:1201
+#: shell/evolution-shell-component.c:1198
 msgid "Unsupported schema"
 msgstr "Μη υποστηριζόμενο σχήμα"
 
-#: shell/evolution-shell-component.c:1203
+#: shell/evolution-shell-component.c:1200
 msgid "Unsupported operation"
 msgstr "Η λειτουργία δεν υποστηρίζεται"
 
-#: shell/evolution-shell-component.c:1205
+#: shell/evolution-shell-component.c:1202
 msgid "Internal error"
 msgstr "Εσωτερικό σφάλμα"
 
-#: shell/evolution-shell-component.c:1209
+#: shell/evolution-shell-component.c:1206
 msgid "Exists"
 msgstr "Τερματίζει"
 
-#: shell/evolution-shell-component.c:1211
+#: shell/evolution-shell-component.c:1208
 msgid "Invalid URI"
 msgstr "Μη έγκυρο URI"
 
-#: shell/evolution-shell-component.c:1215
+#: shell/evolution-shell-component.c:1212
 msgid "Has subfolders"
 msgstr "Έχει υποφακέλους"
 
-#: shell/evolution-shell-component.c:1217
+#: shell/evolution-shell-component.c:1214
 msgid "No space left"
 msgstr "Δεν έχει μείνει ελεύθερος χώρος"
 
-#: shell/evolution-shell-component.c:1219
+#: shell/evolution-shell-component.c:1216
 msgid "Old owner has died"
 msgstr "Ο παλαιός ιδιοκτήτης έχει πεθάνει"
 
-#: shell/evolution-shell-component-utils.c:124
-#, c-format
-msgid ""
-"%s\n"
-"\n"
-"Unknown error."
-msgstr ""
-"%s\n"
-"\n"
-"Άγνωστο Σφάλμα."
-
-#: shell/evolution-shell-component-utils.c:127
-#, c-format
-msgid ""
-"%s\n"
-"\n"
-"The error from the component system is:\n"
-"%s"
-msgstr ""
-"%s\n"
-"\n"
-"Το σφάλμα από το σύστημα συστατικών είναι:\n"
-"%s"
-
-#: shell/evolution-shell-component-utils.c:134
-#, c-format
-msgid ""
-"%s\n"
-"\n"
-"The error from the activation system is:\n"
-"%s"
-msgstr ""
-"%s\n"
-"\n"
-"Το σφάλμα από το σύστημα ενεργοποίησης είναι:\n"
-"%s"
-
 #: shell/evolution-test-component.c:63
 msgid "Test type"
 msgstr "Τύπος δοκιμής:"
@@ -26434,9 +26817,7 @@ msgstr "Ενεργές Συνδέσεις"
 
 #: shell/glade/e-active-connection-dialog.glade.h:2
 msgid "Click OK to close these connections and go offline"
-msgstr ""
-"Κάντε κλικ στο ΟΚ για να κλείσετε τις συνδέσεις και να δουλέψετε εκτός "
-"δικτύου"
+msgstr "Κάντε κλικ στο ΟΚ για να κλείσετε τις συνδέσεις και να δουλέψετε εκτός δικτύου"
 
 #: shell/glade/e-active-connection-dialog.glade.h:3
 msgid "The following connections are currently active:"
@@ -26530,28 +26911,9 @@ msgstr ""
 "\n"
 "Επιλέξτε \"Τερματισμός\" για να αποθηκεύσετε τις ρυθμίσεις. "
 
-#: shell/GNOME_Evolution_Shell.server.in.in.h:1
-msgid "Configure special folders and offline folder behavior here"
-msgstr ""
-
-#: shell/GNOME_Evolution_Shell.server.in.in.h:2
-#, fuzzy
-msgid "Evolution Shell"
-msgstr "Κέλυφος Evolution."
-
-#: shell/GNOME_Evolution_Shell.server.in.in.h:3
-msgid "Evolution folder settings configuration control"
-msgstr ""
-
-#: shell/GNOME_Evolution_Shell.server.in.in.h:4
-msgid "Folder Settings"
-msgstr "Ρυθμίσεις φακέλων"
-
 #: shell/importer/import.glade.h:1
 msgid "Click \"Import\" to begin importing the file into Evolution. "
-msgstr ""
-"Κάντε κλικ στο \"Εισαγωγή\" για να ξεκινήσετε την εισαγωγή του αρχείου στο "
-"Evolution. "
+msgstr "Κάντε κλικ στο \"Εισαγωγή\" για να ξεκινήσετε την εισαγωγή του αρχείου στο Evolution. "
 
 #: shell/importer/import.glade.h:2
 msgid "Evolution Import Assistant"
@@ -26587,10 +26949,6 @@ msgstr ""
 msgid "Importers"
 msgstr "Εισαγωγείς"
 
-#: shell/importer/intelligent.c:191
-msgid "Import"
-msgstr "Εισαγωγή"
-
 #: shell/importer/intelligent.c:195
 msgid "Don't import"
 msgstr "Όχι εισαγωγή"
@@ -26601,10 +26959,10 @@ msgstr "Να μην ξαναγίνει η ερώτηση"
 
 #: shell/importer/intelligent.c:207
 msgid "Evolution can import data from the following files:"
-msgstr ""
-"Δεν ήταν δυνατό για το Evolution να εισάγει δεδομένα από τα παρακάτω αρχεία:"
+msgstr "Δεν ήταν δυνατό για το Evolution να εισάγει δεδομένα από τα παρακάτω αρχεία:"
 
-#: shell/main.c:112 shell/main.c:574
+#: shell/main.c:112
+#: shell/main.c:574
 msgid "Evolution"
 msgstr "Evolution"
 
@@ -26652,8 +27010,7 @@ msgstr "Δεν ήταν δυνατή η πρόσβαση στο περιβάλλ
 #: shell/main.c:410
 #, c-format
 msgid "Cannot initialize the Ximian Evolution shell: %s"
-msgstr ""
-"Δεν ήταν δυνατή η αρχικοποίηση του περιβάλλοντος του Ximian Evolution: %s"
+msgstr "Δεν ήταν δυνατή η αρχικοποίηση του περιβάλλοντος του Ximian Evolution: %s"
 
 #: shell/main.c:542
 msgid "Disable splash screen"
@@ -26673,8 +27030,7 @@ msgstr ""
 
 #: shell/main.c:552
 msgid "Send the debugging output of all components to a file."
-msgstr ""
-"Αποστολή όλων των εντοπισμένων σφαλμάτων από όλα τα συστατικά σε αρχείο."
+msgstr "Αποστολή όλων των εντοπισμένων σφαλμάτων από όλα τα συστατικά σε αρχείο."
 
 #: shell/main.c:578
 #, c-format
@@ -26740,7 +27096,8 @@ msgstr ""
 msgid "Copy Contact(s) to Another Folder..."
 msgstr "Αντιγραφή επαφών σε άλλο φάκελο..."
 
-#: ui/evolution-addressbook.xml.h:4 ui/evolution-calendar.xml.h:2
+#: ui/evolution-addressbook.xml.h:4
+#: ui/evolution-calendar.xml.h:2
 msgid "Copy the selection"
 msgstr "Αντιγραφή της επιλογής"
 
@@ -26748,7 +27105,8 @@ msgstr "Αντιγραφή της επιλογής"
 msgid "Copy to Folder..."
 msgstr "Αντιγραφή σε Φάκελο..."
 
-#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:3
+#: ui/evolution-addressbook.xml.h:7
+#: ui/evolution-calendar.xml.h:3
 msgid "Cut the selection"
 msgstr "Αποκοπή της επιλογής"
 
@@ -26764,7 +27122,8 @@ msgstr "Μετακίνηση επαφών σε άλλο φάκελο..."
 msgid "Move to Folder..."
 msgstr "Μετακίνηση στο Φάκελο..."
 
-#: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:18
+#: ui/evolution-addressbook.xml.h:14
+#: ui/evolution-calendar.xml.h:17
 msgid "Paste the clipboard"
 msgstr "Επικόλληση του προχείρου"
 
@@ -26772,9 +27131,11 @@ msgstr "Επικόλληση του προχείρου"
 msgid "Previews the contacts to be printed"
 msgstr "Προεπισκόπηση των επαφών προς εκτύπωση"
 
-#: ui/evolution-addressbook.xml.h:17 ui/evolution-calendar.xml.h:20
-#: ui/evolution-comp-editor.xml.h:9 ui/evolution-mail-message.xml.h:73
-#: ui/evolution-tasks.xml.h:13
+#: ui/evolution-addressbook.xml.h:17
+#: ui/evolution-calendar.xml.h:19
+#: ui/evolution-comp-editor.xml.h:9
+#: ui/evolution-mail-message.xml.h:68
+#: ui/evolution-tasks.xml.h:12
 msgid "Print Pre_view"
 msgstr "_Προεπισκόπηση Εκτύπωσης"
 
@@ -26818,21 +27179,24 @@ msgstr "Τερματισμός Φόρτωσης"
 msgid "View the current contact"
 msgstr "Προβολή της τρέχουσας επαφής"
 
-#: ui/evolution-addressbook.xml.h:29 ui/evolution-calendar.xml.h:32
-#: ui/evolution-comp-editor.xml.h:16 ui/evolution-contact-editor.xml.h:13
-#: ui/evolution-contact-list-editor.xml.h:11
-#: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:17
-#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-messagedisplay.xml.h:4
-#: ui/evolution-mail-message.xml.h:99 ui/evolution-task-editor.xml.h:9
-#: ui/evolution-tasks.xml.h:16 ui/evolution.xml.h:42
+#: ui/evolution-addressbook.xml.h:29
+#: ui/evolution-calendar.xml.h:28
+#: ui/evolution-comp-editor.xml.h:17
+#: ui/evolution-contact-editor.xml.h:11
+#: ui/evolution-contact-list-editor.xml.h:10
+#: ui/evolution-event-editor.xml.h:11
+#: ui/evolution-mail-global.xml.h:17
+#: ui/evolution-mail-list.xml.h:23
+#: ui/evolution-mail-message.xml.h:93
+#: ui/evolution-mail-messagedisplay.xml.h:4
+#: ui/evolution-task-editor.xml.h:9
+#: ui/evolution-tasks.xml.h:14
+#: ui/evolution.xml.h:42
 msgid "_Actions"
 msgstr "Ε_νέργειες"
 
-#: ui/evolution-addressbook.xml.h:31
-msgid "_Copy to Folder..."
-msgstr "_Αντιγραφή στο Φάκελο..."
-
-#: ui/evolution-addressbook.xml.h:34 ui/evolution-contact-editor.xml.h:16
+#: ui/evolution-addressbook.xml.h:34
+#: ui/evolution-contact-editor.xml.h:13
 msgid "_Forward Contact..."
 msgstr "_Προώθηση Επαφής..."
 
@@ -26903,61 +27267,48 @@ msgstr "Μετάβαση σε συγκεκριμένη ημερομηνία"
 msgid "Go to today"
 msgstr "Μετάβαση στο σήμερα"
 
-#: ui/evolution-calendar.xml.h:17
+#: ui/evolution-calendar.xml.h:16
 msgid "Month"
 msgstr "Μήνας"
 
-#: ui/evolution-calendar.xml.h:19
+#: ui/evolution-calendar.xml.h:18
 msgid "Previews the calendar to be printed"
 msgstr "Προεπισκόπηση του ημερολογίου προς εκτύπωση"
 
-#: ui/evolution-calendar.xml.h:21
+#: ui/evolution-calendar.xml.h:20
 msgid "Print this calendar"
 msgstr "Εκτύπωση αυτού του ημερολογίου"
 
-#: ui/evolution-calendar.xml.h:22
+#: ui/evolution-calendar.xml.h:21
 msgid "Publish Free/Busy information for this calendar"
 msgstr "Δημοσίευση πληροφοριών Διαθεσιμότητας για αυτό το ημερολόγιο"
 
-#: ui/evolution-calendar.xml.h:23 ui/evolution-tasks.xml.h:15
-#, fuzzy
-msgid "Purg_e"
-msgstr "Μπούρζ"
-
-#: ui/evolution-calendar.xml.h:24
-#, fuzzy
-msgid "Purge old appointments and meetings"
-msgstr "Δημόσιος φάκελος που περιέχει ραντεβού και γεγονότα"
-
-#: ui/evolution-calendar.xml.h:25
-#, fuzzy
-msgid "Show as list"
-msgstr "Εμφάνιση Λεπτομερειών"
-
-#: ui/evolution-calendar.xml.h:26
+#: ui/evolution-calendar.xml.h:22
 msgid "Show one day"
 msgstr "Εμφάνιση μίας ημέρας"
 
-#: ui/evolution-calendar.xml.h:27
+#: ui/evolution-calendar.xml.h:23
 msgid "Show one month"
 msgstr "Εμφάνιση ένας μήνα"
 
-#: ui/evolution-calendar.xml.h:28
+#: ui/evolution-calendar.xml.h:24
 msgid "Show one week"
 msgstr "Εμφάνιση μίας εβδομάδας"
 
-#: ui/evolution-calendar.xml.h:29
+#: ui/evolution-calendar.xml.h:25
 msgid "Show the working week"
 msgstr "Εμφάνιση της εργάσιμης εβδομάδας"
 
-#: ui/evolution-calendar.xml.h:30
+#: ui/evolution-calendar.xml.h:26
 msgid "Week"
 msgstr "Εβδομάδα"
 
-#: ui/evolution-comp-editor.xml.h:2 ui/evolution-contact-editor.xml.h:2
-#: ui/evolution-contact-list-editor.xml.h:2
+#: ui/evolution-comp-editor.xml.h:2
+#: ui/evolution-contact-editor.xml.h:1
+#: ui/evolution-contact-list-editor.xml.h:1
 #: ui/evolution-mail-messagedisplay.xml.h:1
-#: ui/evolution-message-composer.xml.h:3 ui/evolution-signature-editor.xml.h:2
+#: ui/evolution-message-composer.xml.h:3
+#: ui/evolution-signature-editor.xml.h:1
 #: ui/evolution.xml.h:5
 msgid "Close"
 msgstr "Κλείσιμο"
@@ -26966,12 +27317,15 @@ msgstr "Κλείσιμο"
 msgid "Close this item"
 msgstr "Κλείσιμο αυτού του στοιχείου"
 
-#: ui/evolution-comp-editor.xml.h:5 ui/evolution-contact-editor.xml.h:4
+#: ui/evolution-comp-editor.xml.h:5
+#: ui/evolution-contact-editor.xml.h:3
 msgid "Delete this item"
 msgstr "Διαγραφή αυτού του στοιχείου"
 
-#: ui/evolution-comp-editor.xml.h:6 ui/evolution-event-editor.xml.h:5
-#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:18
+#: ui/evolution-comp-editor.xml.h:6
+#: ui/evolution-event-editor.xml.h:5
+#: ui/evolution-mail-messagedisplay.xml.h:3
+#: ui/evolution.xml.h:18
 msgid "Main toolbar"
 msgstr "Κεντρική γραμμή εργαλείων"
 
@@ -26979,58 +27333,53 @@ msgstr "Κεντρική γραμμή εργαλείων"
 msgid "Preview the printed item"
 msgstr "Προεπισκόπηση του εκτυπωμένου στοιχείου"
 
-#: ui/evolution-comp-editor.xml.h:10 ui/evolution-contact-editor.xml.h:7
+#: ui/evolution-comp-editor.xml.h:10
+#: ui/evolution-contact-editor.xml.h:6
 msgid "Print this item"
 msgstr "Εκτύπωση αυτού του στοιχείου"
 
-#: ui/evolution-comp-editor.xml.h:11 ui/evolution-contact-editor.xml.h:8
-#: ui/evolution-contact-list-editor.xml.h:5
-#: ui/evolution-message-composer.xml.h:18
-msgid "Save _As..."
-msgstr "Αποθήκευση _Ως..."
+#: ui/evolution-comp-editor.xml.h:12
+#: ui/evolution-message-composer.xml.h:16
+#: ui/evolution-signature-editor.xml.h:5
+msgid "Save"
+msgstr "Αποθήκευση"
 
-#: ui/evolution-comp-editor.xml.h:12 ui/evolution-contact-editor.xml.h:9
+#: ui/evolution-comp-editor.xml.h:13
+msgid "Save As..."
+msgstr "Αποθήκευση Ως..."
+
+#: ui/evolution-comp-editor.xml.h:14
+#: ui/evolution-contact-editor.xml.h:8
 #: ui/evolution-contact-list-editor.xml.h:6
-#: ui/evolution-signature-editor.xml.h:7
+#: ui/evolution-signature-editor.xml.h:6
 msgid "Save and Close"
 msgstr "Αποθήκευση και Κλείσιμο"
 
-#: ui/evolution-comp-editor.xml.h:13 ui/evolution-contact-editor.xml.h:10
-#: ui/evolution-contact-list-editor.xml.h:7
-#: ui/evolution-signature-editor.xml.h:8
-#, fuzzy
-msgid "Save and _Close"
-msgstr "Αποθήκευση και Κλείσιμο"
-
-#: ui/evolution-comp-editor.xml.h:14
+#: ui/evolution-comp-editor.xml.h:15
 msgid "Save the item and close the dialog box"
 msgstr "Αποθήκευση αυτού του στοιχείου και κλείσιμο της οθόνης διαλόγου"
 
-#: ui/evolution-comp-editor.xml.h:15
+#: ui/evolution-comp-editor.xml.h:16
 msgid "Save this item to disk"
 msgstr "Αποθήκευσης αυτού του στοιχείου στον δίσκο"
 
-#: ui/evolution-comp-editor.xml.h:18 ui/evolution-contact-editor.xml.h:15
-#: ui/evolution-contact-list-editor.xml.h:13
+#: ui/evolution-comp-editor.xml.h:18
+#: ui/evolution-contact-editor.xml.h:12
+#: ui/evolution-contact-list-editor.xml.h:11
 #: ui/evolution-mail-messagedisplay.xml.h:7
 #: ui/evolution-message-composer.xml.h:42
-#: ui/evolution-signature-editor.xml.h:13 ui/evolution-subscribe.xml.h:11
+#: ui/evolution-signature-editor.xml.h:12
+#: ui/evolution-subscribe.xml.h:11
 #: ui/evolution.xml.h:46
 msgid "_File"
 msgstr "_Αρχείο"
 
-#: ui/evolution-comp-editor.xml.h:20 ui/evolution-contact-editor.xml.h:18
-#: ui/evolution-contact-list-editor.xml.h:14
-#: ui/evolution-message-composer.xml.h:47
-#: ui/evolution-signature-editor.xml.h:15
-msgid "_Save"
-msgstr "_Αποθήκευση"
-
 #: ui/evolution-composer-entries.xml.h:1
 msgid "Copy selected text to the clipboard"
 msgstr "Αντιγραφή επιλεγμένου κειμένου στο πρόχειρο"
 
-#: ui/evolution-composer-entries.xml.h:2 ui/evolution-mail-message.xml.h:21
+#: ui/evolution-composer-entries.xml.h:2
+#: ui/evolution-mail-list.xml.h:3
 msgid "Cu_t"
 msgstr "_Αποκοπή"
 
@@ -27043,7 +27392,8 @@ msgstr "Αποκοπή επιλεγμένων μηνυμάτων στο πρόχ
 msgid "Paste text from the clipboard"
 msgstr "Επικόλληση κειμένου από το πρόχειρο"
 
-#: ui/evolution-composer-entries.xml.h:5 ui/evolution-mail-list.xml.h:13
+#: ui/evolution-composer-entries.xml.h:5
+#: ui/evolution-mail-list.xml.h:13
 #: ui/evolution-subscribe.xml.h:6
 msgid "Select _All"
 msgstr "Επιλογή _Όλων"
@@ -27052,39 +27402,51 @@ msgstr "Επιλογή _Όλων"
 msgid "Select all text"
 msgstr "Επιλογή όλου του κειμένου"
 
-#: ui/evolution-contact-editor.xml.h:6
+#: ui/evolution-contact-editor.xml.h:5
 msgid "Print En_velope..."
 msgstr "Εκτύπωση _Φακέλου..."
 
-#: ui/evolution-contact-editor.xml.h:11
+#: ui/evolution-contact-editor.xml.h:7
+#: ui/evolution-contact-list-editor.xml.h:5
+#: ui/evolution-message-composer.xml.h:18
+msgid "Save _As..."
+msgstr "Αποθήκευση _Ως..."
+
+#: ui/evolution-contact-editor.xml.h:9
 msgid "Save the contact and close the dialog box"
 msgstr "Αποθήκευση της επαφής και κλείσιμο της οθόνης διαλόγου"
 
-#: ui/evolution-contact-editor.xml.h:12
+#: ui/evolution-contact-editor.xml.h:10
 msgid "Send _Message to Contact..."
 msgstr "Αποστολή _Μηνύματος σε Επαφή..."
 
-#: ui/evolution-contact-list-editor.xml.h:4
+#: ui/evolution-contact-editor.xml.h:15
+#: ui/evolution-contact-list-editor.xml.h:12
+#: ui/evolution-message-composer.xml.h:47
+#: ui/evolution-signature-editor.xml.h:14
+msgid "_Save"
+msgstr "_Αποθήκευση"
+
+#: ui/evolution-contact-list-editor.xml.h:3
 msgid "Delete this list"
 msgstr "Διαγραφή αυτής της λίστας"
 
-#: ui/evolution-contact-list-editor.xml.h:8
+#: ui/evolution-contact-list-editor.xml.h:4
+msgid "Delete..."
+msgstr "Διαγραφή..."
+
+#: ui/evolution-contact-list-editor.xml.h:7
 msgid "Save the list and close the dialog box"
 msgstr "Αποθήκευση της λίστας και κλείσιμο της οθόνης διαλόγου"
 
-#: ui/evolution-contact-list-editor.xml.h:9
+#: ui/evolution-contact-list-editor.xml.h:8
 msgid "Se_nd list to other..."
 msgstr "Α_ποστολή λίστας σε άλλους..."
 
-#: ui/evolution-contact-list-editor.xml.h:10
+#: ui/evolution-contact-list-editor.xml.h:9
 msgid "Send _message to list..."
 msgstr "Αποστολή _μηνύματος στη λίστα..."
 
-#: ui/evolution-contact-list-editor.xml.h:12
-#, fuzzy
-msgid "_Delete..."
-msgstr "Διαγραφή..."
-
 #: ui/evolution-event-editor.xml.h:1
 msgid "Cancel Mee_ting"
 msgstr "Ακύρωση _Συνάντησης"
@@ -27093,11 +27455,13 @@ msgstr "Ακύρωση _Συνάντησης"
 msgid "Cancel the meeting for this item"
 msgstr "Ακύρωση της συνάντησης για αυτό το στοιχείο"
 
-#: ui/evolution-event-editor.xml.h:3 ui/evolution-task-editor.xml.h:5
+#: ui/evolution-event-editor.xml.h:3
+#: ui/evolution-task-editor.xml.h:5
 msgid "Forward as i_Calendar"
 msgstr "Προώθηση ως i_Calendar"
 
-#: ui/evolution-event-editor.xml.h:4 ui/evolution-task-editor.xml.h:6
+#: ui/evolution-event-editor.xml.h:4
+#: ui/evolution-task-editor.xml.h:6
 msgid "Forward this item via email"
 msgstr "Προώθηση αυτού του στοιχείου μέσω email"
 
@@ -27147,9 +27511,7 @@ msgstr "Ξέχασε τους Κ_ωδικούς Πρόσβασης"
 
 #: ui/evolution-mail-global.xml.h:8
 msgid "Forget remembered passwords so you will be prompted for them again"
-msgstr ""
-"Ξέχασε όλους τους κωδικούς πρόσβασης που υπάρχουν στην μνήμη ώστε να "
-"ξαναζητηθούν"
+msgstr "Ξέχασε όλους τους κωδικούς πρόσβασης που υπάρχουν στην μνήμη ώστε να ξαναζητηθούν"
 
 #: ui/evolution-mail-global.xml.h:9
 msgid "Open a window for composing a mail message"
@@ -27157,12 +27519,10 @@ msgstr "Άνοιγμα παραθύρου για την σύνθεση νέου
 
 #: ui/evolution-mail-global.xml.h:10
 msgid "Permanently remove all deleted messages from all folders"
-msgstr ""
-"Οριστική διαγραφή όλων των διαγραμμένων μηνυμάτων από όλους τους φακέλους"
+msgstr "Οριστική διαγραφή όλων των διαγραμμένων μηνυμάτων από όλους τους φακέλους"
 
 #: ui/evolution-mail-global.xml.h:11
-#, fuzzy
-msgid "Post Ne_w Message"
+msgid "Post New Message"
 msgstr "Αποστολή Νέου Μηνύματος"
 
 #: ui/evolution-mail-global.xml.h:12
@@ -27179,8 +27539,7 @@ msgstr "Εμφάνιση οθόνης προεπισκόπησης"
 
 #: ui/evolution-mail-global.xml.h:15
 msgid "Subscribe or unsubscribe to folders on remote servers"
-msgstr ""
-"Συνδρομή ή κατάργηση συνδρομής σε φακέλους σε απομακρυσμένους διακομιστές"
+msgstr "Συνδρομή ή κατάργηση συνδρομής σε φακέλους σε απομακρυσμένους διακομιστές"
 
 #: ui/evolution-mail-global.xml.h:16
 msgid "Virtual Folder _Editor..."
@@ -27198,19 +27557,14 @@ msgstr "_Οθόνη Προεπισκόπησης"
 msgid "Change the properties of this folder"
 msgstr "Αλλαγή των ιδιοτήτων αυτού του φακέλου"
 
-#: ui/evolution-mail-list.xml.h:2 ui/evolution-mail-message.xml.h:10
+#: ui/evolution-mail-list.xml.h:2
 msgid "Copy selected message(s) to the clipboard"
 msgstr "Αντιγραφή επιλεγμένων μηνυμάτων στο πρόχειρο"
 
-#: ui/evolution-mail-list.xml.h:3 ui/evolution-mail-message.xml.h:22
+#: ui/evolution-mail-list.xml.h:4
 msgid "Cut selected message(s) to the clipboard"
 msgstr "Αποκοπή επιλεγμένων μηνυμάτων στο πρόχειρο"
 
-#: ui/evolution-mail-list.xml.h:4
-#, fuzzy
-msgid "E_xpunge"
-msgstr "_Εξάλειψη"
-
 #: ui/evolution-mail-list.xml.h:5
 msgid "Hide S_elected Messages"
 msgstr "Απόκρυψη Επι_λεγμένων Μηνυμάτων"
@@ -27224,29 +27578,24 @@ msgid "Hide _Read Messages"
 msgstr "Απόκρυψη _Αναγνωσμένων Μηνυμάτων"
 
 #: ui/evolution-mail-list.xml.h:8
-msgid ""
-"Hide deleted messages rather than displaying them with a line through them"
-msgstr ""
-"Απόκρυψη των μηνυμάτων που έχουν διαγραφεί και όχι την εμφάνιση τους με μια "
-"γραμμή στην μέση"
+msgid "Hide deleted messages rather than displaying them with a line through them"
+msgstr "Απόκρυψη των μηνυμάτων που έχουν διαγραφεί και όχι την εμφάνιση τους με μια γραμμή στην μέση"
 
 #: ui/evolution-mail-list.xml.h:9
-#, fuzzy
-msgid "Mark All as _Read"
+msgid "Mark All as R_ead"
 msgstr "Σήμανση Ό_λων ως Αναγνωσμένα"
 
 #: ui/evolution-mail-list.xml.h:10
 msgid "Mark all visible messages as read"
 msgstr "Σήμανση όλων των εμφανών μηνυμάτων ως αναγνωσμένα"
 
-#: ui/evolution-mail-list.xml.h:11 ui/evolution-mail-message.xml.h:66
+#: ui/evolution-mail-list.xml.h:11
 msgid "Paste message(s) from the clipboard"
 msgstr "Επικόλληση μηνύματος από το πρόχειρο"
 
 #: ui/evolution-mail-list.xml.h:12
 msgid "Permanently remove all deleted messages from this folder"
-msgstr ""
-"Μόνιμη διαγραφή όλων των μηνυμάτων που έχουν διαγραφεί από αυτόν τον φάκελο"
+msgstr "Μόνιμη διαγραφή όλων των μηνυμάτων που έχουν διαγραφεί από αυτόν τον φάκελο"
 
 #: ui/evolution-mail-list.xml.h:14
 msgid "Select _Thread"
@@ -27284,37 +27633,29 @@ msgstr "Προσωρινή απόκρυψη των επιλεγμένων μην
 msgid "Threaded Message list"
 msgstr "Λίστα μηνυμάτων κατά θέμα"
 
-#: ui/evolution-mail-list.xml.h:25 ui/evolution.xml.h:47
+#: ui/evolution-mail-list.xml.h:26
+#: ui/evolution-tasks.xml.h:18
+msgid "_Expunge"
+msgstr "_Εξάλειψη"
+
+#: ui/evolution-mail-list.xml.h:27
+#: ui/evolution.xml.h:47
 msgid "_Folder"
 msgstr "_Φάκελος"
 
-#: ui/evolution-mail-list.xml.h:26 ui/evolution-subscribe.xml.h:12
+#: ui/evolution-mail-list.xml.h:28
+#: ui/evolution-subscribe.xml.h:12
 msgid "_Invert Selection"
 msgstr "Αντιστρο_φή Επιλογής"
 
-#: ui/evolution-mail-list.xml.h:27
+#: ui/evolution-mail-list.xml.h:30
 msgid "_Properties..."
 msgstr "_Ιδιότητες..."
 
-#: ui/evolution-mail-list.xml.h:28
+#: ui/evolution-mail-list.xml.h:31
 msgid "_Threaded Message List"
 msgstr "Λίστα Μηνυμάτων κατά _Θέμα"
 
-#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:6
-msgid "Close this window"
-msgstr "Κλείσιμο του παραθύρου"
-
-#: ui/evolution-mail-messagedisplay.xml.h:5
-#: ui/evolution-message-composer.xml.h:39 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:43
-msgid "_Close"
-msgstr "_Κλείσιμο"
-
-#: ui/evolution-mail-messagedisplay.xml.h:8
-#: ui/evolution-message-composer.xml.h:49 ui/evolution.xml.h:64
-msgid "_View"
-msgstr "_Προβολή"
-
 #: ui/evolution-mail-message.xml.h:1
 msgid "A_dd Sender to Addressbook"
 msgstr "Προσ_θήκη Αποστολέα στο Βιβλίο Διευθύνσεων"
@@ -27332,420 +27673,410 @@ msgid "Apply filter rules to the selected messages"
 msgstr "Εφαρμογή φίλτρου στα επιλεγμένα μηνύματα"
 
 #: ui/evolution-mail-message.xml.h:5
-#, fuzzy
-msgid "Caret _Mode"
-msgstr "Μοντέλο Κειμένου"
-
-#: ui/evolution-mail-message.xml.h:6
 msgid "Compose a reply to all of the recipients of the selected message"
 msgstr "Συγγραφή απάντησης σε όλους τους παραλήπτες από αυτό το μήνυμα"
 
-#: ui/evolution-mail-message.xml.h:7
+#: ui/evolution-mail-message.xml.h:6
 msgid "Compose a reply to the mailing list of the selected message"
 msgstr "Συγγραφή απάντησης στη λίστα ταχυδρομείου από αυτό το μήνυμα"
 
-#: ui/evolution-mail-message.xml.h:8
+#: ui/evolution-mail-message.xml.h:7
 msgid "Compose a reply to the sender of the selected message"
 msgstr "Συγγραφή απάντησης στον αποστολέα του επιλεγμένου μηνύματος"
 
-#: ui/evolution-mail-message.xml.h:11
+#: ui/evolution-mail-message.xml.h:9
 msgid "Copy selected messages to another folder"
 msgstr "Αντιγραφή επιλεγμένων μηνυμάτων σε άλλο φάκελο"
 
-#: ui/evolution-mail-message.xml.h:12
+#: ui/evolution-mail-message.xml.h:10
 msgid "Create _Virtual Folder From Message"
 msgstr "Δημιουργία Ει_κονικού Φακέλου Από το Μήνυμα"
 
-#: ui/evolution-mail-message.xml.h:13
+#: ui/evolution-mail-message.xml.h:11
 msgid "Create a rule to filter messages from this sender"
 msgstr "Δημιουργία κανόνα για το φιλτράρισμα μηνυμάτων από αυτόν τον αποστολέα"
 
-#: ui/evolution-mail-message.xml.h:14
+#: ui/evolution-mail-message.xml.h:12
 msgid "Create a rule to filter messages to these recipients"
-msgstr ""
-"Δημιουργία κανόνα για το φιλτράρισμα μηνυμάτων με αυτούς του παραλήπτες"
+msgstr "Δημιουργία κανόνα για το φιλτράρισμα μηνυμάτων με αυτούς του παραλήπτες"
 
-#: ui/evolution-mail-message.xml.h:15
+#: ui/evolution-mail-message.xml.h:13
 msgid "Create a rule to filter messages to this mailing list"
-msgstr ""
-"Δημιουργία κανόνα για το φιλτράρισμα μηνυμάτων για αυτή τη λίστα ταχυδρομείου"
+msgstr "Δημιουργία κανόνα για το φιλτράρισμα μηνυμάτων για αυτή τη λίστα ταχυδρομείου"
 
-#: ui/evolution-mail-message.xml.h:16
+#: ui/evolution-mail-message.xml.h:14
 msgid "Create a rule to filter messages with this subject"
 msgstr "Δημιουργία κανόνα για το φιλτράρισμα μηνυμάτων με αυτό το θέμα"
 
-#: ui/evolution-mail-message.xml.h:17
+#: ui/evolution-mail-message.xml.h:15
 msgid "Create a virtual folder for these recipients"
 msgstr "Δημιουργία εικονικού φακέλου για αυτούς τους παραλήπτες"
 
-#: ui/evolution-mail-message.xml.h:18
+#: ui/evolution-mail-message.xml.h:16
 msgid "Create a virtual folder for this mailing list"
 msgstr "Δημιουργία εικονικού φακέλου για αύτη τη λίστα ταχυδρομείου"
 
-#: ui/evolution-mail-message.xml.h:19
+#: ui/evolution-mail-message.xml.h:17
 msgid "Create a virtual folder for this sender"
 msgstr "Δημιουργία εικονικού φακέλου για αυτόν τον αποστολέα"
 
-#: ui/evolution-mail-message.xml.h:20
+#: ui/evolution-mail-message.xml.h:18
 msgid "Create a virtual folder for this subject"
 msgstr "Δημιουργία εικονικού φακέλου για αυτό το θέμα"
 
-#: ui/evolution-mail-message.xml.h:23
+#: ui/evolution-mail-message.xml.h:19
 msgid "Decrease the text size"
 msgstr "Σμίκρυνση κειμένου"
 
-#: ui/evolution-mail-message.xml.h:25
+#: ui/evolution-mail-message.xml.h:21
 msgid "Display the next important message"
 msgstr "Εμφάνιση επόμενου σημαντικού μηνύματος"
 
-#: ui/evolution-mail-message.xml.h:26
+#: ui/evolution-mail-message.xml.h:22
 msgid "Display the next message"
 msgstr "Εμφάνιση επόμενου μηνύματος"
 
-#: ui/evolution-mail-message.xml.h:27
+#: ui/evolution-mail-message.xml.h:23
 msgid "Display the next unread message"
 msgstr "Εμφάνιση επόμενου μη αναγνωσμένου μηνύματος"
 
-#: ui/evolution-mail-message.xml.h:28
+#: ui/evolution-mail-message.xml.h:24
 msgid "Display the next unread thread"
 msgstr "Εμφάνιση επόμενου μη αναγνωσμένου θέμα"
 
-#: ui/evolution-mail-message.xml.h:29
+#: ui/evolution-mail-message.xml.h:25
 msgid "Display the previous important message"
 msgstr "Εμφάνιση προηγούμενου σημαντικού μηνύματος"
 
-#: ui/evolution-mail-message.xml.h:30
+#: ui/evolution-mail-message.xml.h:26
 msgid "Display the previous message"
 msgstr "Εμφάνιση προηγούμενου μηνύματος"
 
-#: ui/evolution-mail-message.xml.h:31
+#: ui/evolution-mail-message.xml.h:27
 msgid "Display the previous unread message"
 msgstr "Εμφάνιση προηγούμενου μη αναγνωσμένου μηνύματος"
 
-#: ui/evolution-mail-message.xml.h:32
+#: ui/evolution-mail-message.xml.h:28
 msgid "F_orward"
 msgstr "Πρ_οώθηση"
 
-#: ui/evolution-mail-message.xml.h:33
+#: ui/evolution-mail-message.xml.h:29
 msgid "Filter on Mailing _List..."
 msgstr "Φίλτρο βάση Λίστας _Ταχυδρομείου..."
 
-#: ui/evolution-mail-message.xml.h:34
+#: ui/evolution-mail-message.xml.h:30
 msgid "Filter on Se_nder..."
 msgstr "Φίλτρο με βάση τον Αποστο_λέα..."
 
-#: ui/evolution-mail-message.xml.h:35
+#: ui/evolution-mail-message.xml.h:31
 msgid "Filter on _Recipients..."
 msgstr "Φίλτρο βάση _Παραληπτών..."
 
-#: ui/evolution-mail-message.xml.h:36
+#: ui/evolution-mail-message.xml.h:32
 msgid "Filter on _Subject..."
 msgstr "Φίλτρο βάση _Θέματος..."
 
-#: ui/evolution-mail-message.xml.h:37
+#: ui/evolution-mail-message.xml.h:33
 #, fuzzy
 msgid "Flag selected message(s) for follow-up"
 msgstr "Σήμανση των επιλεγμένων μηνυμάτων για διαγραφή"
 
-#: ui/evolution-mail-message.xml.h:38
+#: ui/evolution-mail-message.xml.h:34
 #, fuzzy
 msgid "Follow _Up..."
 msgstr "_Πλήρες Όνομα..."
 
-#: ui/evolution-mail-message.xml.h:39
+#: ui/evolution-mail-message.xml.h:35
 msgid "Force images in HTML mail to be loaded"
 msgstr "Υποχρεωτική φόρτωση των εικόνων στα μηνύματα HTML"
 
-#: ui/evolution-mail-message.xml.h:41
+#: ui/evolution-mail-message.xml.h:37
 msgid "Forward the selected message in the body of a new message"
 msgstr "Προώθηση του επιλεγμένου μηνύματος στο σώμα ενός νέου μηνύματος"
 
-#: ui/evolution-mail-message.xml.h:42
+#: ui/evolution-mail-message.xml.h:38
 msgid "Forward the selected message quoted like a reply"
 msgstr "Προώθηση του επιλεγμένου μηνύματος με αναφορά σαν απάντηση"
 
-#: ui/evolution-mail-message.xml.h:43
+#: ui/evolution-mail-message.xml.h:39
 msgid "Forward the selected message to someone"
 msgstr "Προώθηση του επιλεγμένου μηνύματος σε κάποιον"
 
-#: ui/evolution-mail-message.xml.h:44
+#: ui/evolution-mail-message.xml.h:40
 msgid "Forward the selected message to someone as an attachment"
 msgstr "Προώθηση του επιλεγμένου μηνύματος σε κάποιον ως επισύναψη"
 
-#: ui/evolution-mail-message.xml.h:45
+#: ui/evolution-mail-message.xml.h:41
 msgid "Increase the text size"
 msgstr "Μεγέθυνση του κειμένου"
 
-#: ui/evolution-mail-message.xml.h:46
+#: ui/evolution-mail-message.xml.h:42
 msgid "Load _Images"
 msgstr "Φόρτωση _Εικόνων"
 
-#: ui/evolution-mail-message.xml.h:47
-msgid "Mar_k as Read"
-msgstr "Σήμανση _ως Αναγνωσμένα"
-
-#: ui/evolution-mail-message.xml.h:48
+#: ui/evolution-mail-message.xml.h:44
 msgid "Mark as I_mportant"
 msgstr "Σήμανση ως _Σημαντικό"
 
-#: ui/evolution-mail-message.xml.h:49
+#: ui/evolution-mail-message.xml.h:45
 msgid "Mark as U_nread"
 msgstr "Σήμανση ως _Μη Αναγνωσμένα"
 
-#: ui/evolution-mail-message.xml.h:50
+#: ui/evolution-mail-message.xml.h:46
 msgid "Mark as Unimp_ortant"
 msgstr "Σήμανση ως Ασ_ήμαντο"
 
-#: ui/evolution-mail-message.xml.h:51
+#: ui/evolution-mail-message.xml.h:47
 msgid "Mark the selected message(s) as having been read"
 msgstr "Σήμανση των επιλεγμένων μηνυμάτων ως αναγνωσμένα"
 
-#: ui/evolution-mail-message.xml.h:52
+#: ui/evolution-mail-message.xml.h:48
 msgid "Mark the selected message(s) as important"
 msgstr "Σήμανση των επιλεγμένων μηνυμάτων ως σημαντικά"
 
-#: ui/evolution-mail-message.xml.h:53
+#: ui/evolution-mail-message.xml.h:49
 msgid "Mark the selected message(s) as not having been read"
 msgstr "Σήμανση των επιλεγμένων μηνυμάτων ως μη αναγνωσμένα"
 
-#: ui/evolution-mail-message.xml.h:54
+#: ui/evolution-mail-message.xml.h:50
 msgid "Mark the selected message(s) as unimportant"
 msgstr "Σήμανση των επιλεγμένων μηνυμάτων ως μη σημαντικά"
 
-#: ui/evolution-mail-message.xml.h:55
+#: ui/evolution-mail-message.xml.h:51
 msgid "Mark the selected messages for deletion"
 msgstr "Σήμανση των επιλεγμένων μηνυμάτων για διαγραφή"
 
-#: ui/evolution-mail-message.xml.h:56
+#: ui/evolution-mail-message.xml.h:52
 msgid "Move"
 msgstr "Μετακίνηση"
 
-#: ui/evolution-mail-message.xml.h:57
+#: ui/evolution-mail-message.xml.h:53
 msgid "Move selected message(s) to another folder"
 msgstr "Μετακίνηση επιλεγμένων μηνυμάτων σε άλλο φάκελο"
 
-#: ui/evolution-mail-message.xml.h:58
+#: ui/evolution-mail-message.xml.h:54
 msgid "Next"
 msgstr "Επόμενο"
 
-#: ui/evolution-mail-message.xml.h:59
+#: ui/evolution-mail-message.xml.h:55
 msgid "Next _Important Message"
 msgstr "Επόμενο Σ_ημαντικό Μήνυμα"
 
-#: ui/evolution-mail-message.xml.h:60
+#: ui/evolution-mail-message.xml.h:56
 msgid "Next _Thread"
 msgstr "Επόμενη Α_λληλουχία"
 
-#: ui/evolution-mail-message.xml.h:61
+#: ui/evolution-mail-message.xml.h:57
 msgid "Next _Unread Message"
 msgstr "Επόμενο _Μη Αναγνωσμένο Μήνυμα"
 
-#: ui/evolution-mail-message.xml.h:62
+#: ui/evolution-mail-message.xml.h:58
 msgid "Open the selected message in a new window"
 msgstr "Άνοιγμα επιλεγμένου μηνύματος σε νέο παράθυρο"
 
-#: ui/evolution-mail-message.xml.h:63
+#: ui/evolution-mail-message.xml.h:59
 msgid "Open the selected message in the composer to re-send it"
 msgstr "Άνοιγμα του επιλεγμένου μηνύματος στον επεξεργαστή για να ξανά-σταλεί"
 
-#: ui/evolution-mail-message.xml.h:64
+#: ui/evolution-mail-message.xml.h:60
 msgid "Original Si_ze"
 msgstr "Αρχικό _Μέγεθος"
 
-#: ui/evolution-mail-message.xml.h:65
+#: ui/evolution-mail-message.xml.h:61
 msgid "P_revious Unread Message"
 msgstr "Π_ροηγούμενο μη Αναγνωσμένο Μήνυμα"
 
-#: ui/evolution-mail-message.xml.h:67
-#, fuzzy
-msgid "Post a Repl_y"
+#: ui/evolution-mail-message.xml.h:62
+msgid "Post a Reply"
 msgstr "Αποστολή μιας απάντησης"
 
-#: ui/evolution-mail-message.xml.h:68
+#: ui/evolution-mail-message.xml.h:63
 #, fuzzy
 msgid "Post a reply to a message in a Public folder"
 msgstr "Έλεγχος για νέα μηνύματα σε όλους τους φακέλους"
 
-#: ui/evolution-mail-message.xml.h:69
+#: ui/evolution-mail-message.xml.h:64
 msgid "Pr_evious Important Message"
 msgstr "Πρ_οηγούμενο Σημαντικό Μήνυμα"
 
-#: ui/evolution-mail-message.xml.h:70
+#: ui/evolution-mail-message.xml.h:65
 msgid "Preview the message to be printed"
 msgstr "Προεπισκόπηση του μηνύματος προς εκτύπωση"
 
-#: ui/evolution-mail-message.xml.h:71
+#: ui/evolution-mail-message.xml.h:66
 msgid "Previous"
 msgstr "Προηγούμενο"
 
-#: ui/evolution-mail-message.xml.h:74
+#: ui/evolution-mail-message.xml.h:69
 msgid "Print this message"
 msgstr "Εκτύπωση μηνύματος"
 
-#: ui/evolution-mail-message.xml.h:75
+#: ui/evolution-mail-message.xml.h:70
 msgid "Re_direct"
 msgstr "Ανα_δρομολόγηση"
 
-#: ui/evolution-mail-message.xml.h:76
+#: ui/evolution-mail-message.xml.h:71
 #, fuzzy
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "Προώθηση του επιλεγμένου μηνύματος σε κάποιον"
 
-#: ui/evolution-mail-message.xml.h:79
-msgid "Reply to _All"
-msgstr "Απάντηση σε _Όλους"
-
-#: ui/evolution-mail-message.xml.h:80
-msgid "Reply to _List"
-msgstr "Απάντηση στη _Λίστα"
-
-#: ui/evolution-mail-message.xml.h:81
+#: ui/evolution-mail-message.xml.h:76
 msgid "Reset the text to its original size"
 msgstr "Επαναφορά του κειμένου στο κανονικό μέγεθος"
 
-#: ui/evolution-mail-message.xml.h:82
-#, fuzzy
-msgid "S_earch in Message..."
+#: ui/evolution-mail-message.xml.h:77
+msgid "S_earch Message..."
 msgstr "Ανα_ζήτηση Μηνύματος..."
 
-#: ui/evolution-mail-message.xml.h:83
+#: ui/evolution-mail-message.xml.h:78
 msgid "S_maller"
 msgstr "_Μικρότερο"
 
-#: ui/evolution-mail-message.xml.h:84
+#: ui/evolution-mail-message.xml.h:79
 msgid "Save the message as a text file"
 msgstr "Αποθήκευση του μηνύματος ως αρχείο κειμένου"
 
-#: ui/evolution-mail-message.xml.h:85
+#: ui/evolution-mail-message.xml.h:80
 msgid "Search for text in the body of the displayed message"
 msgstr "Εύρεση κειμένου στο σώμα του μηνύματος που φαίνεται"
 
-#: ui/evolution-mail-message.xml.h:86
+#: ui/evolution-mail-message.xml.h:81
 #, fuzzy
 msgid "Set up the page settings for your current printer"
 msgstr "Ρυθμίστε την διαμόρφωση σελίδας για τον τρέχοντα εκτυπωτή"
 
-#: ui/evolution-mail-message.xml.h:87
+#: ui/evolution-mail-message.xml.h:82
 msgid "Show Email _Source"
 msgstr "Εμφάνιση _Πηγής Μηνύματος"
 
-#: ui/evolution-mail-message.xml.h:88
+#: ui/evolution-mail-message.xml.h:83
 msgid "Show Full _Headers"
 msgstr "Εμφάνιση Όλων των _Επικεφαλίδων"
 
-#: ui/evolution-mail-message.xml.h:89
-#, fuzzy
-msgid "Show a blinking cursor in the body of displayed messages"
-msgstr "Εύρεση κειμένου στο σώμα του μηνύματος που φαίνεται"
-
-#: ui/evolution-mail-message.xml.h:90
+#: ui/evolution-mail-message.xml.h:84
 msgid "Show message in the normal style"
 msgstr "Εμφάνιση μηνύματος σε κανονική μορφή"
 
-#: ui/evolution-mail-message.xml.h:91
+#: ui/evolution-mail-message.xml.h:85
 msgid "Show message with all email headers"
 msgstr "Εμφάνιση μηνύματος με όλες τις επικεφαλίδες ηλεκτρονικού ταχυδρομείου"
 
-#: ui/evolution-mail-message.xml.h:92
+#: ui/evolution-mail-message.xml.h:86
 msgid "Show the raw email source of the message"
 msgstr "Απλή εμφάνιση της πηγής του μηνύματος"
 
-#: ui/evolution-mail-message.xml.h:93
+#: ui/evolution-mail-message.xml.h:87
 msgid "Text Si_ze"
 msgstr "_Μέγεθος Κειμένου"
 
-#: ui/evolution-mail-message.xml.h:94
+#: ui/evolution-mail-message.xml.h:88
 msgid "Un-delete the selected messages"
 msgstr "Ακύρωση διαγραφής των επιλεγμένων μηνυμάτων"
 
-#: ui/evolution-mail-message.xml.h:95
+#: ui/evolution-mail-message.xml.h:89
 msgid "VFolder on Mailing _List..."
 msgstr "ΕΦάκελος στην _Λίστα Ταχυδρομείου..."
 
-#: ui/evolution-mail-message.xml.h:96
+#: ui/evolution-mail-message.xml.h:90
 msgid "VFolder on Se_nder..."
 msgstr "ΕΦάκελος στον _Αποστολέα..."
 
-#: ui/evolution-mail-message.xml.h:97
+#: ui/evolution-mail-message.xml.h:91
 msgid "VFolder on _Recipients..."
 msgstr "ΕΦάκελος στους _Παραλήπτες..."
 
-#: ui/evolution-mail-message.xml.h:98
+#: ui/evolution-mail-message.xml.h:92
 msgid "VFolder on _Subject..."
 msgstr "ΕΦάκελος στο _Θέμα..."
 
-#: ui/evolution-mail-message.xml.h:100
+#: ui/evolution-mail-message.xml.h:94
 msgid "_Attached"
 msgstr "Ε_πισύναψη"
 
-#: ui/evolution-mail-message.xml.h:102
+#: ui/evolution-mail-message.xml.h:95
 msgid "_Copy to Folder"
 msgstr "_Αντιγραφή σε Φάκελο"
 
-#: ui/evolution-mail-message.xml.h:103
+#: ui/evolution-mail-message.xml.h:96
 msgid "_Create Filter From Message"
 msgstr "_Δημιουργία Φίλτρου Από το Μήνυμα"
 
-#: ui/evolution-mail-message.xml.h:105
+#: ui/evolution-mail-message.xml.h:98
 msgid "_Forward Message"
 msgstr "_Προώθηση Μηνύματος"
 
-#: ui/evolution-mail-message.xml.h:106
+#: ui/evolution-mail-message.xml.h:99
 msgid "_Go To"
 msgstr "_Μετάβαση σε"
 
-#: ui/evolution-mail-message.xml.h:107
+#: ui/evolution-mail-message.xml.h:100
 msgid "_Inline"
 msgstr "Μέσα στο _μήνυμα"
 
-#: ui/evolution-mail-message.xml.h:108
+#: ui/evolution-mail-message.xml.h:101
 msgid "_Larger"
 msgstr "_Μεγαλύτερο"
 
-#: ui/evolution-mail-message.xml.h:109
+#: ui/evolution-mail-message.xml.h:102
 msgid "_Message Display"
 msgstr "_Προβολή Μηνύματος"
 
-#: ui/evolution-mail-message.xml.h:110
+#: ui/evolution-mail-message.xml.h:103
 msgid "_Move to Folder"
 msgstr "_Μετακίνηση σε φάκελο"
 
-#: ui/evolution-mail-message.xml.h:111
+#: ui/evolution-mail-message.xml.h:104
 msgid "_Next Message"
 msgstr "Επόμε_νο Μήνυμα"
 
-#: ui/evolution-mail-message.xml.h:112
+#: ui/evolution-mail-message.xml.h:105
 msgid "_Normal Display"
 msgstr "_Κανονική Προβολή"
 
-#: ui/evolution-mail-message.xml.h:113
+#: ui/evolution-mail-message.xml.h:106
 msgid "_Open Message"
 msgstr "_Άνοιγμα Μηνύματος"
 
-#: ui/evolution-mail-message.xml.h:115
+#: ui/evolution-mail-message.xml.h:107
 msgid "_Previous Message"
 msgstr "_Προηγούμενο Μήνυμα"
 
-#: ui/evolution-mail-message.xml.h:117
+#: ui/evolution-mail-message.xml.h:109
 msgid "_Quoted"
 msgstr "Σε παρά_θεση"
 
-#: ui/evolution-mail-message.xml.h:118
-msgid "_Reply to Sender"
-msgstr "_Απάντηση στον Αποστολέα"
-
-#: ui/evolution-mail-message.xml.h:119
+#: ui/evolution-mail-message.xml.h:111
 msgid "_Resend..."
 msgstr "_Αποστολή ξανά..."
 
-#: ui/evolution-mail-message.xml.h:121 ui/evolution.xml.h:63
+#: ui/evolution-mail-message.xml.h:113
+#: ui/evolution.xml.h:63
 msgid "_Tools"
 msgstr "Εργα_λεία"
 
-#: ui/evolution-mail-message.xml.h:122
+#: ui/evolution-mail-message.xml.h:114
 msgid "_Undelete"
 msgstr "Α_ναίρεση Διαγραφής"
 
+#: ui/evolution-mail-messagedisplay.xml.h:2
+#: ui/evolution.xml.h:6
+msgid "Close this window"
+msgstr "Κλείσιμο του παραθύρου"
+
+#: ui/evolution-mail-messagedisplay.xml.h:5
+#: ui/evolution-message-composer.xml.h:39
+#: ui/evolution-signature-editor.xml.h:10
+#: ui/evolution-subscribe.xml.h:9
+#: ui/evolution.xml.h:43
+msgid "_Close"
+msgstr "_Κλείσιμο"
+
+#: ui/evolution-mail-messagedisplay.xml.h:8
+#: ui/evolution-message-composer.xml.h:49
+#: ui/evolution.xml.h:64
+msgid "_View"
+msgstr "_Προβολή"
+
 #: ui/evolution-message-composer.xml.h:1
 msgid "Attach"
 msgstr "Επισύναψη"
@@ -27754,7 +28085,8 @@ msgstr "Επισύναψη"
 msgid "Attach a file"
 msgstr "Επισύναψη αρχείου"
 
-#: ui/evolution-message-composer.xml.h:4 ui/evolution-signature-editor.xml.h:3
+#: ui/evolution-message-composer.xml.h:4
+#: ui/evolution-signature-editor.xml.h:2
 msgid "Close the current file"
 msgstr "Κλείσιμο του τρέχοντος αρχείου"
 
@@ -27768,10 +28100,10 @@ msgstr "Κρυπτογραφήστε αυτό το μήνυμα με PGP"
 
 #: ui/evolution-message-composer.xml.h:7
 msgid "Encrypt this message with your S/MIME Encryption Cetificate"
-msgstr ""
-"Κρυπτογραφήστε αυτό το μήνυμα με την πιστοποιημένη κρυπτογράφηση S/MIME"
+msgstr "Κρυπτογραφήστε αυτό το μήνυμα με την πιστοποιημένη κρυπτογράφηση S/MIME"
 
-#: ui/evolution-message-composer.xml.h:8 ui/evolution-signature-editor.xml.h:4
+#: ui/evolution-message-composer.xml.h:8
+#: ui/evolution-signature-editor.xml.h:3
 msgid "For_mat"
 msgstr "_Μορφή"
 
@@ -27803,11 +28135,6 @@ msgstr "Κρυπτογράφηση S/MIME"
 msgid "S/MIME Sign"
 msgstr "Υπογραφή S/MIME"
 
-#: ui/evolution-message-composer.xml.h:16
-#: ui/evolution-signature-editor.xml.h:6
-msgid "Save"
-msgstr "Αποθήκευση"
-
 #: ui/evolution-message-composer.xml.h:17
 msgid "Save As"
 msgstr "Αποθήκευση Ως"
@@ -27821,7 +28148,7 @@ msgid "Save in folder..."
 msgstr "Αποθήκευση στο φάκελο..."
 
 #: ui/evolution-message-composer.xml.h:21
-#: ui/evolution-signature-editor.xml.h:9
+#: ui/evolution-signature-editor.xml.h:7
 msgid "Save the current file"
 msgstr "Αποθήκευση του παρόντος αρχείου"
 
@@ -27838,7 +28165,7 @@ msgid "Send"
 msgstr "Αποστολή"
 
 #: ui/evolution-message-composer.xml.h:25
-#: ui/evolution-signature-editor.xml.h:11
+#: ui/evolution-signature-editor.xml.h:9
 msgid "Send the mail in HTML format"
 msgstr "Αποστολή του μηνύματος σε μορφή HTML"
 
@@ -27903,7 +28230,7 @@ msgid "_From Field"
 msgstr "Πεδίο _Από"
 
 #: ui/evolution-message-composer.xml.h:44
-#: ui/evolution-signature-editor.xml.h:14
+#: ui/evolution-signature-editor.xml.h:13
 msgid "_Insert"
 msgstr "_Εισαγωγή"
 
@@ -27919,11 +28246,11 @@ msgstr "_Πεδίο Απάντησης"
 msgid "_Security"
 msgstr "_Ασφάλεια"
 
-#: ui/evolution-signature-editor.xml.h:5
+#: ui/evolution-signature-editor.xml.h:4
 msgid "H_TML"
 msgstr "H_TML"
 
-#: ui/evolution-signature-editor.xml.h:10
+#: ui/evolution-signature-editor.xml.h:8
 msgid "Save the current file and close the window"
 msgstr "Αποθήκευση αυτού του αρχείου και κλείσιμο του παραθύρου"
 
@@ -27999,20 +28326,15 @@ msgstr "Διαγραφή επιλεγμένων εργασιών"
 msgid "Mar_k as Complete"
 msgstr "_Σημείωση ως Ολοκληρωμένο"
 
-#: ui/evolution-tasks.xml.h:9
-#, fuzzy
-msgid "Mark selected tasks as complete"
-msgstr "_Σημείωση επιλεγμένων εργασιών ως ολοκληρωμένες"
-
-#: ui/evolution-tasks.xml.h:11
+#: ui/evolution-tasks.xml.h:10
 msgid "Paste task from the clipboard"
 msgstr "Επικόλληση εργασίας από το πρόχειρο"
 
-#: ui/evolution-tasks.xml.h:12
+#: ui/evolution-tasks.xml.h:11
 msgid "Previews the list of tasks to be printed"
 msgstr "Προεπισκόπηση της λίστας εργασιών προς εκτύπωση"
 
-#: ui/evolution-tasks.xml.h:14
+#: ui/evolution-tasks.xml.h:13
 msgid "Print the list of tasks"
 msgstr "Εκτύπωση της λίστας εργασιών"
 
@@ -28262,32 +28584,27 @@ msgid "_Work Week View"
 msgstr "Προ_βολή Εργάσιμων Ημερών"
 
 #: views/mail/galview.xml.h:1
-#, fuzzy
-msgid "As _Sent Folder"
+msgid "As Sent Folder"
 msgstr "Ως φάκελος Απεσταλμένων"
 
 #: views/mail/galview.xml.h:2
-#, fuzzy
-msgid "By S_tatus"
-msgstr "Κατά Κατάσταση"
+msgid "By Follow Up Flag"
+msgstr ""
 
 #: views/mail/galview.xml.h:3
-#, fuzzy
-msgid "By Se_nder"
+msgid "By Sender"
 msgstr "Κατά Αποστολέα"
 
 #: views/mail/galview.xml.h:4
-#, fuzzy
-msgid "By Su_bject"
-msgstr "Κατά Θέμα"
+msgid "By Status"
+msgstr "Κατά Κατάσταση"
 
 #: views/mail/galview.xml.h:5
-msgid "By _Follow Up Flag"
-msgstr ""
+msgid "By Subject"
+msgstr "Κατά Θέμα"
 
 #: views/mail/galview.xml.h:6
-#, fuzzy
-msgid "_Messages"
+msgid "Messages"
 msgstr "Μηνύματα"
 
 #: views/tasks/galview.xml.h:1
@@ -28314,12 +28631,10 @@ msgstr "Ζώνη Αλλαγής Ώρας:"
 #: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:4
 #, fuzzy
 msgid ""
-"Use the left mouse button to zoom in on an area of the map and select a time "
-"zone.\n"
+"Use the left mouse button to zoom in on an area of the map and select a time zone.\n"
 "Use the right mouse button to zoom out."
 msgstr ""
-"Κάντε χρήση του αριστερού πλήκτρου του ποντικιού για να μεγενθύνετε μια "
-"περιοχή στον χάρτη και επιλέξτε μια ζώνη αλλαγής ώρας:\n"
+"Κάντε χρήση του αριστερού πλήκτρου του ποντικιού για να μεγενθύνετε μια περιοχή στον χάρτη και επιλέξτε μια ζώνη αλλαγής ώρας:\n"
 "Με το δεξί πλήκτρο του ποντικιού κάνετε σμίκρυνση του χάρτη."
 
 #: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:6
@@ -28347,20 +28662,22 @@ msgstr "Καθορισμός Προβολών"
 
 #. Translators: These are the first characters of each day of the
 #. week, 'M' for 'Monday', 'T' for Tuesday etc.
-#: widgets/misc/e-calendar-item.c:456
+#: widgets/misc/e-calendar-item.c:427
 msgid "MTWTFSS"
 msgstr "ΔΤΤΠΠΣΚ"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: widgets/misc/e-calendar-item.c:1174
+#: widgets/misc/e-calendar-item.c:1127
 msgid "%B %Y"
 msgstr "%B %Y"
 
-#: widgets/misc/e-cell-date-edit.c:241 widgets/misc/e-dateedit.c:431
+#: widgets/misc/e-cell-date-edit.c:241
+#: widgets/misc/e-dateedit.c:428
 msgid "Now"
 msgstr "Τώρα"
 
-#: widgets/misc/e-cell-date-edit.c:249 widgets/misc/e-dateedit.c:437
+#: widgets/misc/e-cell-date-edit.c:249
+#: widgets/misc/e-dateedit.c:434
 msgid "Today"
 msgstr "Σήμερα"
 
@@ -28417,13 +28734,16 @@ msgstr "Unicode"
 msgid "Western European"
 msgstr "Δυτικής Ευρώπης"
 
-#: widgets/misc/e-charset-picker.c:88 widgets/misc/e-charset-picker.c:89
+#: widgets/misc/e-charset-picker.c:88
+#: widgets/misc/e-charset-picker.c:89
 #: widgets/misc/e-charset-picker.c:90
 msgid "Traditional"
 msgstr "Παραδοσιακά"
 
-#: widgets/misc/e-charset-picker.c:91 widgets/misc/e-charset-picker.c:92
-#: widgets/misc/e-charset-picker.c:93 widgets/misc/e-charset-picker.c:94
+#: widgets/misc/e-charset-picker.c:91
+#: widgets/misc/e-charset-picker.c:92
+#: widgets/misc/e-charset-picker.c:93
+#: widgets/misc/e-charset-picker.c:94
 msgid "Simplified"
 msgstr "Απλοποιημένα"
 
@@ -28440,7 +28760,8 @@ msgstr "Οπτική"
 msgid "Unknown character set: %s"
 msgstr "Άγνωστο σύνολο χαρακτήρων: %s"
 
-#: widgets/misc/e-charset-picker.c:213 widgets/misc/e-charset-picker.c:442
+#: widgets/misc/e-charset-picker.c:213
+#: widgets/misc/e-charset-picker.c:442
 msgid "Character Encoding"
 msgstr "Κωδικοποίηση Χαρακτήρων"
 
@@ -28465,18 +28786,37 @@ msgstr "Επεξεργαστής Αναζήτησης"
 msgid "Save Search"
 msgstr "Αποθήκευση Αναζήτησης"
 
-#: widgets/misc/e-filter-bar.h:91 widgets/misc/e-filter-bar.h:98
+#: widgets/misc/e-filter-bar.h:91
+#: widgets/misc/e-filter-bar.h:98
 msgid "_Save Search..."
 msgstr "_Αποθήκευση Αναζήτησης..."
 
-#: widgets/misc/e-filter-bar.h:92 widgets/misc/e-filter-bar.h:99
+#: widgets/misc/e-filter-bar.h:92
+#: widgets/misc/e-filter-bar.h:99
 msgid "_Edit Saved Searches..."
 msgstr "_Επεξεργασία Αποθηκευμένων  Αναζητήσεων..."
 
-#: widgets/misc/e-filter-bar.h:93 widgets/misc/e-filter-bar.h:100
+#: widgets/misc/e-filter-bar.h:93
+#: widgets/misc/e-filter-bar.h:100
 msgid "_Advanced..."
 msgstr "Για Προ_χωρημένους..."
 
+#: widgets/misc/e-messagebox.c:154
+msgid "Information"
+msgstr "Πληροφορία"
+
+#: widgets/misc/e-messagebox.c:168
+msgid "Error"
+msgstr "Σφάλμα"
+
+#: widgets/misc/e-messagebox.c:175
+msgid "Question"
+msgstr "Ερώτηση"
+
+#: widgets/misc/e-messagebox.c:182
+msgid "Message"
+msgstr "Μήνυμα"
+
 #: widgets/misc/e-search-bar.c:531
 msgid "_Search"
 msgstr "Ανα_ζήτηση"
@@ -28525,539 +28865,3 @@ msgstr "Προβολή iTip/iMip ημερολογίου Evolution"
 msgid "Evolution Addressbook local file backend"
 msgstr "Προβολή μίνι-κάρτας του Βιβλίου Διευθύνσεων του Evolution"
 
-#~ msgid "That person is already attending the meeting!"
-#~ msgstr "Αυτό το άτομο είναι ήδη σε συνάντηση!"
-
-#~ msgid "URL:"
-#~ msgstr "URL:"
-
-#~ msgid "_Save as..."
-#~ msgstr "Αποθήκευ_ση ως..."
-
-#~ msgid "End Date"
-#~ msgstr "Ημερομηνία Λήξης"
-
-#~ msgid "New _Appointment"
-#~ msgstr "Νέο _Ραντεβού"
-
-#~ msgid "Print..."
-#~ msgstr "Εκτύπωση..."
-
-#~ msgid "Chair Persons"
-#~ msgstr "Άτομα Προεδρείου"
-
-#~ msgid "Required Participants"
-#~ msgstr "Απαραίτητοι Συμμετέχοντες"
-
-#~ msgid "Optional Participants"
-#~ msgstr "Προαιρετικοί Συμμετέχοντες"
-
-#~ msgid "Resources"
-#~ msgstr "Πόροι"
-
-#~ msgid "Individual"
-#~ msgstr "Άτομο"
-
-#~ msgid "Group"
-#~ msgstr "Ομάδα"
-
-#~ msgid "Resource"
-#~ msgstr "Πόρος"
-
-#~ msgid "Room"
-#~ msgstr "Αίθουσα"
-
-#~ msgid "Chair"
-#~ msgstr "Προεδρείο"
-
-#~ msgid "Required Participant"
-#~ msgstr "Απαραίτητος Συμμετέχων"
-
-#~ msgid "Optional Participant"
-#~ msgstr "Προαιρετικός Συμμετέχων"
-
-#~ msgid "Non-Participant"
-#~ msgstr "Μη-Συμμετέχων"
-
-#~ msgid "Needs Action"
-#~ msgstr "Απαιτεί Ενέργεια"
-
-#~ msgid "Delegated"
-#~ msgstr "Εξουσιοδοτήθηκε"
-
-#~ msgid "In Process"
-#~ msgstr "Σε Εξέλιξη"
-
-#~ msgid "Properties for \"%s\""
-#~ msgstr "Ιδιότητες για \"%s\""
-
-#~ msgid "Properties"
-#~ msgstr "Ιδιότητες"
-
-#~ msgid "Could not create temporary directory: %s"
-#~ msgstr "Δεν είναι δυνατή η δημιουργία του προσωρινού καταλόγου: %s"
-
-#~ msgid "%d new"
-#~ msgstr "%d νέα"
-
-#~ msgid ", "
-#~ msgstr ", "
-
-#~ msgid "%d hidden"
-#~ msgstr "%d κρυμμένα"
-
-#~ msgid "%d visible"
-#~ msgstr "%d ορατά"
-
-#~ msgid "%d selected"
-#~ msgstr "%d επιλεγμένα"
-
-#~ msgid "%d unsent"
-#~ msgstr "%d μη απεσταλμένα"
-
-#~ msgid "%d sent"
-#~ msgstr "%d απεσταλμένα"
-
-#~ msgid "%d total"
-#~ msgstr "%d συνολικά"
-
-#, fuzzy
-#~ msgid "Create _Virtual Folder From Search..."
-#~ msgstr "Δημιουργία Ει_κονικού Φακέλου Από το Μήνυμα"
-
-#~ msgid "VFolder on _Subject"
-#~ msgstr "ΕΦάκελος στο _Θέμα"
-
-#~ msgid "VFolder on Se_nder"
-#~ msgstr "ΕΦάκελος στον _Αποστολέα"
-
-#~ msgid "VFolder on _Recipients"
-#~ msgstr "ΕΦάκελος στους _Παραλήπτες"
-
-#~ msgid "VFolder on Mailing _List"
-#~ msgstr "ΕΦάκελος στη Λίστα _Ταχυδρομείου"
-
-#~ msgid "Filter on Sub_ject"
-#~ msgstr "Φίλτρο στο _Θέμα"
-
-#~ msgid "Filter on Sen_der"
-#~ msgstr "Φίλτρο στον Α_ποστολέα"
-
-#~ msgid "Filter on Re_cipients"
-#~ msgstr "Φίλτρο στους Παρα_λήπτες"
-
-#~ msgid "Filter on _Mailing List"
-#~ msgstr "Φίλτρο στη Λίστα _Ταχυδρομείου"
-
-#~ msgid "_Edit as New Message..."
-#~ msgstr "_Επεξεργασία ως Νέο Μήνυμα..."
-
-#~ msgid "_Print"
-#~ msgstr "_Εκτύπωση"
-
-#~ msgid "_Forward"
-#~ msgstr "_Προώθηση"
-
-#~ msgid "Fla_g Completed"
-#~ msgstr "Ση_μαία Ολοκληρώθηκε"
-
-#~ msgid "Cl_ear Flag"
-#~ msgstr "Εκκα_θάριση Σημαίας"
-
-#~ msgid "Mark as _Unread"
-#~ msgstr "Σήμανση ως _Μη Αναγνωσμένα"
-
-#~ msgid "Mark as _Important"
-#~ msgstr "Σήμανση ως _Σημαντικά"
-
-#~ msgid "_Mark as Unimportant"
-#~ msgstr "Σή_μανση ως Μη Σημαντικά"
-
-#~ msgid "U_ndelete"
-#~ msgstr "Α_κύρωση Διαγραφής"
-
-#~ msgid "Mo_ve to Folder..."
-#~ msgstr "Με_τακίνηση στο Φάκελο..."
-
-#~ msgid "Add Sender to Address_book"
-#~ msgstr "Προσθήκη Αποστολέα στο _Βιβλίο Διευθύνσεων"
-
-#~ msgid "Appl_y Filters"
-#~ msgstr "Εφαρμο_γή Φίλτρων"
-
-#~ msgid "Crea_te Rule From Message"
-#~ msgstr "Δη_μιουργία Κανόνα Από το Μήνυμα"
-
-#~ msgid "VFolder on M_ailing List"
-#~ msgstr "ΕΦάκελος στη Λίστα Τα_χυδρομείου"
-
-#~ msgid "Filter on _Mailing List (%s)"
-#~ msgstr "Φίλτρο στη Λίστα Τα_χυδρομείου (%s)"
-
-#~ msgid "VFolder on M_ailing List (%s)"
-#~ msgstr "ΕΦάκελος στη Λίστα Τα_χυδρομείου (%s)"
-
-#~ msgid "Don't show this message again."
-#~ msgstr "Να μην ξαναεμφανιστεί αυτό το μήνυμα"
-
-#~ msgid ""
-#~ "You have not configured the mail client.\n"
-#~ "You need to do this before you can send,\n"
-#~ "receive or compose mail.\n"
-#~ "Would you like to configure it now?"
-#~ msgstr ""
-#~ "Δεν έχετε ρυθμίσει το πρόγραμμα ταχυδρομείου\n"
-#~ "Πρέπει πρώτα να γίνει η ρύθμιση πριν την αποστολή\n"
-#~ "ή συγγραφή μηνυμάτων\n"
-#~ "Θέλετε να κάνετε την ρύθμιση τώρα;"
-
-#~ msgid ""
-#~ "You need to configure an identity\n"
-#~ "before you can compose mail."
-#~ msgstr ""
-#~ "Πρέπει να ρυθμίσετε μια ταυτότητα\n"
-#~ "πριν από την συγγραφή μηνύματος"
-
-#~ msgid ""
-#~ "You need to configure a mail transport\n"
-#~ "before you can compose mail."
-#~ msgstr ""
-#~ "Πρέπει να ρυθμίσετε την μεταφορά ταχυδρομείου\n"
-#~ "πριν από την συγγραφή μηνύματος"
-
-#~ msgid ""
-#~ "You are sending an HTML-formatted message. Please make sure that\n"
-#~ "the following recipients are willing and able to receive HTML mail:\n"
-#~ msgstr ""
-#~ "Θα στείλετε μήνυμα σε μορφή HTML. Παρακαλώ βεβαιωθείτε ότι\n"
-#~ " παρακάτω παραλήπτες επιθυμούν μηνύματα σε μορφή HTML:\n"
-
-#~ msgid "Send anyway?"
-#~ msgstr "Να σταλεί οπωσδήποτε;"
-
-#~ msgid ""
-#~ "This message has no subject.\n"
-#~ "Really send?"
-#~ msgstr ""
-#~ "Αυτό το μήνυμα δεν έχει θέμα.\n"
-#~ "Να σταλεί;"
-
-#~ msgid ""
-#~ "Since the contact list you are sending to is configured to hide the "
-#~ "list's addresses, this message will contain only Bcc recipients."
-#~ msgstr ""
-#~ "Μιας και η λίστα επαφών που στέλνετε είναι ρυθμισμένη να αποκρύπτει τις "
-#~ "διευθύνσεις, αυτό το μήνυμα θα περιέχει μόνο παραλήπτες στην Ιδιαίτερη "
-#~ "κοινοποίηση(Bcc)."
-
-#~ msgid "This message contains only Bcc recipients."
-#~ msgstr ""
-#~ "Αυτό το μήνυμα περιέχει μόνο παραλήπτες στο Ιδιαίτερης κοινοποίησηςBcc)."
-
-#~ msgid ""
-#~ "It is possible that the mail server may reveal the recipients by adding "
-#~ "an Apparently-To header.\n"
-#~ "Send anyway?"
-#~ msgstr ""
-#~ "Είναι δυνατό να αποκαλύψει ο διακομιστής ταχυδρομείου τους παραλήπτες με "
-#~ "την προσθήκη μια εμφανή επικεφαλίδα Προς.\n"
-#~ "Να σταλεί ούτως η άλλως;"
-
-#~ msgid "You must specify recipients in order to send this message."
-#~ msgstr ""
-#~ "Πρέπει να ορίσετε παραλήπτες προκειμένου να στείλετε αυτό το μήνυμα."
-
-#~ msgid ""
-#~ "Unable to open the drafts folder for this account.\n"
-#~ "Would you like to use the default drafts folder?"
-#~ msgstr ""
-#~ "Δεν είναι δυνατό το άνοιγμα του προσωρινού φακέλου για αυτόν τον "
-#~ "λογαριασμό.\n"
-#~ "Θέλετε να κάνετε χρήση του εξ' ορισμού προσωρινού φακέλου;"
-
-#~ msgid "an unknown sender"
-#~ msgstr "ένας άγνωστος αποστολέας"
-
-#~ msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
-#~ msgstr "Στις %d/%b/%Y, ημέρα %A και ώρα %H:%M, ο/η %%s έγραψε:"
-
-#~ msgid "Move message(s) to"
-#~ msgstr "Μετακίνηση μηνύματος(ων) στο"
-
-#~ msgid "Copy message(s) to"
-#~ msgstr "Αντιγραφή μηνύματος(ων) στο"
-
-#~ msgid "Are you sure you want to edit all %d messages?"
-#~ msgstr "Είστε βέβαιοι ότι θέλετε να επεξεργαστείτε και τα %d μηνύματα;"
-
-#~ msgid ""
-#~ "You may only edit messages saved\n"
-#~ "in the Drafts folder."
-#~ msgstr ""
-#~ "Επιτρέπεται να επεξεργαστείτε μόνο τα\n"
-#~ "μηνύματα στον Πρόχειρο Φάκελο."
-
-#~ msgid ""
-#~ "You may only resend messages\n"
-#~ "in the Sent folder."
-#~ msgstr ""
-#~ "Επιτρέπεται να ξαναστείλετε μόνο τα\n"
-#~ "μηνύματα από τον φάκελο Απεσταλμένα."
-
-#~ msgid "Are you sure you want to resend all %d messages?"
-#~ msgstr "Είστε βέβαιοι ότι θέλετε να ξαναστείλετε και τα %d μηνύματα;"
-
-#~ msgid "No Message Selected"
-#~ msgstr "Δεν Έχει Επιλεγεί Μήνυμα"
-
-#~ msgid ""
-#~ "Cannot save to `%s'\n"
-#~ " %s"
-#~ msgstr ""
-#~ "Αδυναμία αποθήκευσης σε `%s'\n"
-#~ " %s"
-
-#~ msgid ""
-#~ "`%s' already exists.\n"
-#~ "Overwrite it?"
-#~ msgstr ""
-#~ "Το %s υπάρχει ήδη.\n"
-#~ "Θέλετε να αντικατασταθεί;"
-
-#~ msgid "Save Message As..."
-#~ msgstr "Αποθήκευση Μηνύματος Ως..."
-
-#~ msgid "Save Messages As..."
-#~ msgstr "Αποθήκευση Μηνυμάτων Ως..."
-
-#~ msgid ""
-#~ "This operation will permanently erase all messages marked as\n"
-#~ "deleted. If you continue, you will not be able to recover these "
-#~ "messages.\n"
-#~ "\n"
-#~ "Really erase these messages?"
-#~ msgstr ""
-#~ "Με αυτή την λειτουργία θα διαγράψετε μόνιμα όλα τα μηνύματα που έχετε "
-#~ "σημειώσει ως διαγραμμένα,\n"
-#~ "και δεν θα μπορέσετε να τα ανακτήσετε.\n"
-#~ "\n"
-#~ "Είστε βέβαιοι για την διαγραφή των μηνυμάτων;"
-
-#~ msgid ""
-#~ "Error loading filter information:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Σφάλμα κατά το φόρτωμα των πληροφοριών:\n"
-#~ "%s"
-
-#~ msgid "Filters"
-#~ msgstr "Φίλτρα"
-
-#~ msgid "Page %d of %d"
-#~ msgstr "Σελίδα %d από %d"
-
-#~ msgid "Print Message"
-#~ msgstr "Εκτύπωση Μηνύματος"
-
-#~ msgid "Printing of message failed"
-#~ msgstr "Απέτυχε η εκτύπωση του μηνύματος"
-
-#~ msgid "Are you sure you want to open all %d messages in separate windows?"
-#~ msgstr ""
-#~ "Είστε βέβαιοι ότι θέλετε να ανοίξετε και τα %d μηνύματα σε άλλα παράθυρα;"
-
-#~ msgid "Could not create a S/MIME signature context."
-#~ msgstr "Δεν ήταν δυνατή η δημιουργία περιεχομένων υπογραφής S/MIME."
-
-#~ msgid "Could not create a S/MIME certsonly context."
-#~ msgstr "Αδυναμία δημιουργίας S/MIME certsonly context."
-
-#~ msgid "Could not create a S/MIME encryption context."
-#~ msgstr "Δεν ήταν δυνατή η δημιουργία περιεχομένων κρυπτογράφηση S/MIME."
-
-#~ msgid "Could not create a S/MIME envelope context."
-#~ msgstr "Δεν ήταν δυνατή η δημιουργία περιεχομένων φακέλου S/MIME."
-
-#~ msgid "Could not create a S/MIME decode context."
-#~ msgstr "Δεν ήταν δυνατή η δημιουργία περιεχομένων αποκρυπτογράφηση S/MIME."
-
-#~ msgid ""
-#~ "File `%s' already exists.\n"
-#~ "Overwrite it?"
-#~ msgstr ""
-#~ "Το αρχείο `%s' υπάρχει ήδη\n"
-#~ "Να αντικατασταθεί;"
-
-#~ msgid "Save Attachment"
-#~ msgstr "Αποθήκευση επισύναψης..."
-
-#~ msgid "Could not create temporary file '%s': %s"
-#~ msgstr "Δεν είναι δυνατή η δημιουργία προσωρινού αρχείου '%s': %s"
-
-#~ msgid "Save Attachment..."
-#~ msgstr "Αποθήκευση συνημμένου..."
-
-#~ msgid "View Inline"
-#~ msgstr "Προβολή μέσα στο μήνυμα"
-
-#~ msgid "Open in %s..."
-#~ msgstr "Άνοιγμα με %s..."
-
-#~ msgid "View Inline (via %s)"
-#~ msgstr "Προβολή μέσα στο μήνυμα (μέσω %s)"
-
-#~ msgid "Hide"
-#~ msgstr "Απόκρυψη"
-
-#~ msgid "External Viewer"
-#~ msgstr "Εξωτερικό Πρόγραμμα Προβολής"
-
-#~ msgid "Downloading images"
-#~ msgstr "Μεταφόρτωση εικόνων"
-
-#~ msgid "Loading message content"
-#~ msgstr "Φόρτωμα περιεχόμενα μηνύματος"
-
-#~ msgid "Overdue:"
-#~ msgstr "'Εχουν λήξει:"
-
-#~ msgid "by %B %d, %Y, %l:%M %P"
-#~ msgstr "από %B %d, %Y, %l:%M %P"
-
-#~ msgid "Open Link in Browser"
-#~ msgstr "Άνοιγμα Συνδέσμου στον Περιηγητή"
-
-#~ msgid "Copy Link Location"
-#~ msgstr "Αντιγραφή Θέσης Συντόμευσης"
-
-#~ msgid "Save Link as (FIXME)"
-#~ msgstr "Αποθήκευση δεσμού ως (FIXME)"
-
-#~ msgid "Save Image as..."
-#~ msgstr "Αποθήκευση εικόνας ως..."
-
-#~ msgid "%s attachment"
-#~ msgstr " %s επισύναψη"
-
-#~ msgid "Could not parse MIME message. Displaying as source."
-#~ msgstr "Δεν ήταν δυνατή η ανάλυση του μηνύματος MIME. Προβολή ως πηγή."
-
-#~ msgid "Bad Address"
-#~ msgstr "Εσφαλμένη Διεύθυνση"
-
-#~ msgid "Reply-To"
-#~ msgstr "Απάντηση Σε"
-
-#~ msgid "Cc"
-#~ msgstr "Αντίγραφο:"
-
-#~ msgid "Bcc"
-#~ msgstr "Ιδιαίτερη Κοινοποίηση"
-
-#~ msgid ""
-#~ "This message is digitally signed. Click the lock icon for more "
-#~ "information."
-#~ msgstr ""
-#~ "Αυτό το μήνυμα είναι ψηφιακά υπογεγραμμένο. Κάντε κλικ στο εικονίδιο με "
-#~ "το λουκέτο για περισσότερες πληροφορίες."
-
-#~ msgid "Could not create a PGP verfication context"
-#~ msgstr "Δεν ήταν δυνατή η δημιουργία περιεχομένων επαλήθευσης PGP."
-
-#~ msgid "This message is digitally signed and has been found to be authentic."
-#~ msgstr ""
-#~ "Αυτό το μήνυμα είναι ψηφιακά υπογεγραμμένο και βρέθηκε να είναι αυθεντικό."
-
-#~ msgid ""
-#~ "This message is digitally signed but can not be proven to be authentic."
-#~ msgstr ""
-#~ "Αυτό το μήνυμα είναι ψηφιακά υπογεγραμμένο και δεν βρέθηκε να είναι "
-#~ "αυθεντικό."
-
-#~ msgid "Pointer to FTP site (%s)"
-#~ msgstr "Δείκτης σε σελίδα FTP (%s)"
-
-#~ msgid "Pointer to local file (%s) valid at site \"%s\""
-#~ msgstr "Δείκτης σε τοπικό αρχείο (%s) έγκυρο στην σελίδα \"%s\""
-
-#~ msgid "Pointer to local file (%s)"
-#~ msgstr "Δείκτης σε τοπικό αρχείο (%s)"
-
-#~ msgid "Pointer to remote data (%s)"
-#~ msgstr "Δείκτης σε απομακρυσμένα δεδομένα (%s)"
-
-#~ msgid "Pointer to unknown external data (\"%s\" type)"
-#~ msgstr "Δείκτης σε άγνωστα εξωτερικά δεδομένα (τύπος \"%s\")"
-
-#~ msgid "Malformed external-body part."
-#~ msgstr "Κακοδιατυπωμένο εξωτερικό μέρος μηνύματος."
-
-#~ msgid "However, the message was successfully sent."
-#~ msgstr "Παρ'όλα αυτά το μήνυμα στάλθηκε με επιτυχία."
-
-#~ msgid "(Untitled Message)"
-#~ msgstr "(Μήνυμα Χωρίς Τίτλο)"
-
-#~ msgid "Untitled Message"
-#~ msgstr "Μήνυμα Χωρίς Τίτλο"
-
-#~ msgid "Empty Message"
-#~ msgstr "Κενό Μήνυμα"
-
-#~ msgid "Find in Message"
-#~ msgstr "Εύρεση στο Μήνυμα"
-
-#~ msgid "Case Sensitive"
-#~ msgstr "Διάκριση πεζών κεφαλαίων"
-
-#~ msgid "Search Forward"
-#~ msgstr "Αναζήτηση Προωθημένων"
-
-#~ msgid "Find:"
-#~ msgstr "Εύρεση:"
-
-#~ msgid "Matches:"
-#~ msgstr "Ταιριάζει με:"
-
-#~ msgid "Forwarded Message"
-#~ msgstr "Προωθημένο Μήνυμα"
-
-#~ msgid "(No subject)"
-#~ msgstr "(Χωρίς Θέμα)"
-
-#~ msgid "%s - Message"
-#~ msgstr "%s - Μήνυμα"
-
-#~ msgid "Scanning folders under %s on \"%s\""
-#~ msgstr "Σάρωση φακέλων κάτω από %s στο \"%s\""
-
-#~ msgid "Scanning root-level folders on \"%s\""
-#~ msgstr "Σάρωση των ριζικών φακέλων στο \"%s\""
-
-#~ msgid "Subscribing to folder \"%s\""
-#~ msgstr "Συνδρομή στον φάκελο \"%s\""
-
-#~ msgid "Unsubscribing to folder \"%s\""
-#~ msgstr "Κατάργηση συνδρομής στον φάκελο \"%s\""
-
-#~ msgid "No server has been selected"
-#~ msgstr "Δεν έχει επιλεγεί διακομιστής"
-
-#~ msgid "Please select a server."
-#~ msgstr "Παρακαλώ επιλέξτε διακομιστή."
-
-#, fuzzy
-#~ msgid "Scanning folders ..."
-#~ msgstr "Ανάγνωση φακέλων..."
-
-#~ msgid "Save As..."
-#~ msgstr "Αποθήκευση Ως..."
-
-#~ msgid "Information"
-#~ msgstr "Πληροφορία"
-
-#~ msgid "Question"
-#~ msgstr "Ερώτηση"
-
-#~ msgid "Message"
-#~ msgstr "Μήνυμα"
diff --git a/po/en_AU.po b/po/en_AU.po
index b1a8211d56..372376d4b5 100644
--- a/po/en_AU.po
+++ b/po/en_AU.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 0.6\n"
-"POT-Creation-Date: 2003-10-15 23:45+0200\n"
+"POT-Creation-Date: 2003-06-25 13:24-0400\n"
 "PO-Revision-Date: 2000-10-22 16:19+0100\n"
 "Last-Translator: Michael Zucchi <notzed@ximian.com>\n"
 "Language-Team: \n"
@@ -13,195 +13,66 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: addressbook/backend/ebook/e-card.c:1306
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in.h:1
+msgid "Evolution LDIF importer"
+msgstr ""
+
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in.h:2
+msgid "LDAP Data Interchange Format (.ldif)"
+msgstr ""
+
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:1
+#, fuzzy
+msgid "Evolution VCard Importer"
+msgstr "Cannot initialise Evolution's mail component."
+
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:2
+#, fuzzy
+msgid "Evolution VCard importer"
+msgstr "Cannot initialise Evolution's mail component."
+
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:3
+msgid "VCard (.vcf, .gcrd)"
+msgstr ""
+
 #: addressbook/backend/ebook/e-card-simple.c:60
+#: addressbook/backend/ebook/e-card.c:1306
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:15
 msgid "File As"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:1313
-#: addressbook/gui/contact-editor/fullname.glade.h:4
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:17
-msgid "Full Name"
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:1320
 #: addressbook/backend/ebook/e-card-simple.c:61
-#: addressbook/gui/component/select-names/e-select-names.etspec.h:1
+#: addressbook/backend/ebook/e-card.c:1320
 #: addressbook/gui/component/select-names/e-select-names-section.etspec.h:1
+#: addressbook/gui/component/select-names/e-select-names.etspec.h:1
 #: addressbook/gui/contact-editor/e-contact-editor-fullname.c:89
 #: my-evolution/e-summary-table.c:59
 msgid "Name"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:1326
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:96
-#, fuzzy
-msgid "Address"
-msgstr "Chile"
-
-#: addressbook/backend/ebook/e-card.c:1333
-msgid "Address Label"
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:1340
-msgid "Phone"
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:1347
 #: addressbook/backend/ebook/e-card-simple.c:62
+#: addressbook/backend/ebook/e-card.c:1347
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
 msgid "Email"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:1354
-#, fuzzy
-msgid "Birth date"
-msgstr "_Other Organiser"
-
-#: addressbook/backend/ebook/e-card.c:1360
-#: calendar/gui/e-calendar-table.etspec.h:18
-msgid "URL"
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:1367
-#: addressbook/backend/ebook/e-card-simple.c:69
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
-msgid "Organization"
-msgstr "Organisation"
-
-#: addressbook/backend/ebook/e-card.c:1374
-#, fuzzy
-msgid "Organizational Unit"
-msgstr "Organisation"
-
-#: addressbook/backend/ebook/e-card.c:1381
-#: addressbook/backend/ebook/e-card-simple.c:90
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
-msgid "Office"
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:1388
-#: addressbook/backend/ebook/e-card-simple.c:91
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:39
-msgid "Title"
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:1395
-#: calendar/gui/e-meeting-time-sel.etspec.h:9
-msgid "Role"
+#: addressbook/backend/ebook/e-card-simple.c:63
+#: addressbook/gui/contact-editor/e-contact-editor.c:1752
+msgid "Primary"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:1402
-#: addressbook/backend/ebook/e-card-simple.c:93
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
-msgid "Manager"
+#: addressbook/backend/ebook/e-card-simple.c:63
+msgid "Prim"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:1409
 #: addressbook/backend/ebook/e-card-simple.c:64
 #: addressbook/backend/ebook/e-card-simple.c:94
+#: addressbook/backend/ebook/e-card.c:1409
 #: addressbook/gui/contact-editor/e-contact-editor.c:1737
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:2
 msgid "Assistant"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:1416
-#: addressbook/backend/ebook/e-card-simple.c:95
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-msgid "Nickname"
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:1423
-#: addressbook/backend/ebook/e-card-simple.c:96
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:36
-msgid "Spouse"
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:1430
-#: addressbook/backend/ebook/e-card-simple.c:101
-msgid "Anniversary"
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:1436
-msgid "Mailer"
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:1443
-#: addressbook/backend/ebook/e-card-simple.c:98
-msgid "Calendar URI"
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:1450
-msgid "Free/Busy URL"
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:1457
-msgid "ICS Calendar"
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:1464
-#: addressbook/backend/ebook/e-card-simple.c:97
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
-msgid "Note"
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:1471
-#, fuzzy
-msgid "Related Contacts"
-msgstr "_Other Organiser"
-
-#: addressbook/backend/ebook/e-card.c:1478
-#: addressbook/backend/ebook/e-card-simple.c:105
-#: calendar/gui/e-calendar-table.etspec.h:4
-msgid "Categories"
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:1485
-msgid "Category List"
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:1492
-msgid "Wants HTML"
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:1499
-msgid "Wants HTML set"
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:1506 ui/evolution-calendar.xml.h:16
-msgid "List"
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:1513
-msgid "List Show Addresses"
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:1520
-msgid "Arbitrary"
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:1527
-msgid "ID"
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:1534
-msgid "Last Use"
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:1545
-msgid "Use Score"
-msgstr ""
-
-#: addressbook/backend/ebook/e-card-simple.c:63
-#: addressbook/gui/contact-editor/e-contact-editor.c:1752
-msgid "Primary"
-msgstr ""
-
-#: addressbook/backend/ebook/e-card-simple.c:63
-msgid "Prim"
-msgstr ""
-
 #: addressbook/backend/ebook/e-card-simple.c:65
 #: addressbook/backend/ebook/e-card-simple.c:70
 #: addressbook/gui/contact-editor/e-contact-editor.c:1738
@@ -236,6 +107,12 @@ msgid "Home"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:69
+#: addressbook/backend/ebook/e-card.c:1367
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
+msgid "Organization"
+msgstr "Organisation"
+
+#: addressbook/backend/ebook/e-card-simple.c:69
 msgid "Org"
 msgstr ""
 
@@ -354,9 +231,21 @@ msgid "Dep"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:90
+#: addressbook/backend/ebook/e-card.c:1381
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
+msgid "Office"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card-simple.c:90
 msgid "Off"
 msgstr ""
 
+#: addressbook/backend/ebook/e-card-simple.c:91
+#: addressbook/backend/ebook/e-card.c:1388
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:39
+msgid "Title"
+msgstr ""
+
 #: addressbook/backend/ebook/e-card-simple.c:92
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:34
 msgid "Profession"
@@ -367,6 +256,12 @@ msgid "Prof"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:93
+#: addressbook/backend/ebook/e-card.c:1402
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
+msgid "Manager"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card-simple.c:93
 msgid "Man"
 msgstr ""
 
@@ -375,9 +270,32 @@ msgid "Ass"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:95
+#: addressbook/backend/ebook/e-card.c:1416
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
+msgid "Nickname"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card-simple.c:95
 msgid "Nick"
 msgstr ""
 
+#: addressbook/backend/ebook/e-card-simple.c:96
+#: addressbook/backend/ebook/e-card.c:1423
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:36
+msgid "Spouse"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card-simple.c:97
+#: addressbook/backend/ebook/e-card.c:1464
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
+msgid "Note"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card-simple.c:98
+#: addressbook/backend/ebook/e-card.c:1443
+msgid "Calendar URI"
+msgstr ""
+
 #: addressbook/backend/ebook/e-card-simple.c:98
 msgid "CALUri"
 msgstr ""
@@ -400,6 +318,11 @@ msgid "icsCalendar"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:101
+#: addressbook/backend/ebook/e-card.c:1430
+msgid "Anniversary"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card-simple.c:101
 msgid "Anniv"
 msgstr ""
 
@@ -407,6 +330,12 @@ msgstr ""
 msgid "Birth Date"
 msgstr ""
 
+#: addressbook/backend/ebook/e-card-simple.c:105
+#: addressbook/backend/ebook/e-card.c:1478
+#: calendar/gui/e-calendar-table.etspec.h:4
+msgid "Categories"
+msgstr ""
+
 #: addressbook/backend/ebook/e-card-simple.c:106
 msgid "Family Name"
 msgstr ""
@@ -421,32 +350,110 @@ msgid "%x"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:912
-#: addressbook/backend/ebook/e-destination.c:709
+#: addressbook/backend/ebook/e-destination.c:706
 msgid "Unnamed List"
 msgstr ""
 
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in.h:1
-msgid "Evolution LDIF importer"
+#: addressbook/backend/ebook/e-card.c:1313
+#: addressbook/gui/contact-editor/fullname.glade.h:4
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:17
+msgid "Full Name"
 msgstr ""
 
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in.h:2
-msgid "LDAP Data Interchange Format (.ldif)"
+#: addressbook/backend/ebook/e-card.c:1326
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:96
+#, fuzzy
+msgid "Address"
+msgstr "Chile"
+
+#: addressbook/backend/ebook/e-card.c:1333
+msgid "Address Label"
 msgstr ""
 
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:1
+#: addressbook/backend/ebook/e-card.c:1340
+msgid "Phone"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:1354
 #, fuzzy
-msgid "Evolution VCard Importer"
-msgstr "Cannot initialise Evolution's mail component."
+msgid "Birth date"
+msgstr "_Other Organiser"
 
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:2
+#: addressbook/backend/ebook/e-card.c:1360
+#: calendar/gui/e-calendar-table.etspec.h:19
+msgid "URL"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:1374
 #, fuzzy
-msgid "Evolution VCard importer"
-msgstr "Cannot initialise Evolution's mail component."
+msgid "Organizational Unit"
+msgstr "Organisation"
 
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:3
-msgid "VCard (.vcf, .gcrd)"
+#: addressbook/backend/ebook/e-card.c:1395
+#: calendar/gui/dialogs/meeting-page.etspec.h:9
+#: calendar/gui/e-meeting-time-sel.etspec.h:9
+msgid "Role"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:1436 mail/mail-format.c:963
+msgid "Mailer"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:1450
+msgid "Free/Busy URL"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:1457
+msgid "ICS Calendar"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:1471
+#, fuzzy
+msgid "Related Contacts"
+msgstr "_Other Organiser"
+
+#: addressbook/backend/ebook/e-card.c:1485
+msgid "Category List"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:1492
+msgid "Wants HTML"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:1499
+msgid "Wants HTML set"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:1506
+msgid "List"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:1513
+msgid "List Show Addresses"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:1520
+msgid "Arbitrary"
 msgstr ""
 
+#: addressbook/backend/ebook/e-card.c:1527
+msgid "ID"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:1534
+msgid "Last Use"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:1545
+msgid "Use Score"
+msgstr ""
+
+#: addressbook/backend/ebook/test-client-list.c:15
+#: addressbook/backend/ebook/test-client.c:33
+#: calendar/gui/alarm-notify/notify-main.c:171
+msgid "Could not initialize Bonobo"
+msgstr "Could not initialise Bonobo"
+
 #: addressbook/backend/pas/pas-backend-file.c:464
 #: addressbook/backend/pas/pas-backend-ldap.c:3050
 msgid "Searching..."
@@ -502,14 +509,14 @@ msgid "EBook not loaded\n"
 msgstr ""
 
 #: addressbook/conduit/address-conduit.c:1376
-#: calendar/conduits/calendar/calendar-conduit.c:1351
-#: calendar/conduits/todo/todo-conduit.c:893
+#: calendar/conduits/calendar/calendar-conduit.c:1342
+#: calendar/conduits/todo/todo-conduit.c:884
 msgid "Could not start wombat server"
 msgstr ""
 
 #: addressbook/conduit/address-conduit.c:1377
-#: calendar/conduits/calendar/calendar-conduit.c:1352
-#: calendar/conduits/todo/todo-conduit.c:894
+#: calendar/conduits/calendar/calendar-conduit.c:1343
+#: calendar/conduits/todo/todo-conduit.c:885
 msgid "Could not start wombat"
 msgstr ""
 
@@ -518,6 +525,142 @@ msgstr ""
 msgid "Could not read pilot's Address application block"
 msgstr ""
 
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
+msgid "Configure access to LDAP directory servers here"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
+msgid "Directory Servers"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
+#, fuzzy
+msgid "Evolution Addressbook"
+msgstr "Cannot initialise Evolution's mail component."
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
+#, fuzzy
+msgid "Evolution Addressbook LDAP Configuration Control"
+msgstr "Cannot initialise Evolution's mail component."
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
+msgid "Evolution Addressbook address pop-up"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
+msgid "Evolution Addressbook address viewer"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
+msgid "Evolution Addressbook card viewer"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
+#, fuzzy
+msgid "Evolution Addressbook component"
+msgstr "Cannot initialise Evolution's mail component."
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
+msgid "Evolution Addressbook folder viewer"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-component.c:76
+#: addressbook/gui/component/addressbook-component.c:620
+#: importers/netscape-importer.c:1874 mail/importers/netscape-importer.c:1844
+#: shell/e-local-storage.c:178 shell/e-shortcuts.c:1087
+msgid "Contacts"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-component.c:76
+msgid "Folder containing contact information"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-component.c:78
+msgid "LDAP Server"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-component.c:78
+msgid "LDAP server containing contact information"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-component.c:80
+#, fuzzy
+msgid "Public Contacts"
+msgstr "_Other Organiser"
+
+#: addressbook/gui/component/addressbook-component.c:80
+msgid "Public folder containing contact information"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-component.c:574
+msgid "New Contact"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-component.c:574
+msgid "_Contact"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-component.c:575
+msgid "Create a new contact"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-component.c:578
+msgid "New Contact List"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-component.c:578
+msgid "Contact _List"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-component.c:579
+msgid "Create a new contact list"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:206
+msgid "Failed to connect to LDAP server"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:231
+msgid "Failed to authenticate with LDAP server"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:259
+msgid "Could not perform query on Root DSE"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:682
+msgid "The server responded with no supported search bases"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:1193
+msgid "This server does not support LDAPv3 schema information"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:1215
+msgid "Error retrieving schema information"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:1223
+msgid "Server did not respond with valid schema information"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:1637
+msgid "Account Name"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:1639
+msgid "Server Name"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:1676
+msgid "LDAP was not enabled in this build of Evolution"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-storage.c:178
+#, fuzzy
+msgid "Other Contacts"
+msgstr "_Other Organiser"
+
 #: addressbook/gui/component/addressbook.c:502
 msgid ""
 "We were unable to open this addressbook.  Please check that the\n"
@@ -626,103 +769,6 @@ msgstr ""
 msgid "The URI that the Folder Browser will display"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-component.c:76
-#: addressbook/gui/component/addressbook-component.c:628
-#: importers/netscape-importer.c:1874 mail/importers/netscape-importer.c:1844
-#: shell/e-local-storage.c:178 shell/e-shortcuts.c:1087
-msgid "Contacts"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-component.c:76
-msgid "Folder containing contact information"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-component.c:78
-msgid "LDAP Server"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-component.c:78
-msgid "LDAP server containing contact information"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-component.c:80
-#, fuzzy
-msgid "Public Contacts"
-msgstr "_Other Organiser"
-
-#: addressbook/gui/component/addressbook-component.c:80
-msgid "Public folder containing contact information"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-component.c:582
-msgid "New Contact"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-component.c:582
-msgid "_Contact"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-component.c:583
-msgid "Create a new contact"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-component.c:586
-msgid "New Contact List"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-component.c:586
-msgid "Contact _List"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-component.c:587
-msgid "Create a new contact list"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:206
-msgid "Failed to connect to LDAP server"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:231
-msgid "Failed to authenticate with LDAP server"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:259
-msgid "Could not perform query on Root DSE"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:682
-msgid "The server responded with no supported search bases"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:1193
-msgid "This server does not support LDAPv3 schema information"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:1215
-msgid "Error retrieving schema information"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:1223
-msgid "Server did not respond with valid schema information"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:1637
-msgid "Account Name"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:1639
-msgid "Server Name"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:1676
-msgid "LDAP was not enabled in this build of Evolution"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-storage.c:178
-#, fuzzy
-msgid "Other Contacts"
-msgstr "_Other Organiser"
-
 #.
 #. * This is the code for the UI thingie that lets you manipulate the e-mail
 #. * addresses (and *only* the e-mail addresses) associated with an existing
@@ -751,72 +797,33 @@ msgstr ""
 msgid "Add address to existing contact \"%s\""
 msgstr ""
 
-#: addressbook/gui/component/e-address-popup.c:917
+#: addressbook/gui/component/e-address-popup.c:914
 msgid "Querying Addressbook..."
 msgstr ""
 
-#: addressbook/gui/component/e-address-popup.c:1001
-#: addressbook/gui/component/e-address-widget.c:401
+#: addressbook/gui/component/e-address-popup.c:998
+#: addressbook/gui/component/e-address-widget.c:392
 msgid "Edit Contact Info"
 msgstr ""
 
-#: addressbook/gui/component/e-address-popup.c:1031
-#: addressbook/gui/component/e-address-widget.c:437
+#: addressbook/gui/component/e-address-popup.c:1028
+#: addressbook/gui/component/e-address-widget.c:428
 #: addressbook/gui/component/select-names/e-select-names-popup.c:324
 msgid "Add to Contacts"
 msgstr ""
 
-#: addressbook/gui/component/e-address-popup.c:1056
+#: addressbook/gui/component/e-address-popup.c:1053
 msgid "Merge E-Mail Address"
 msgstr ""
 
-#: addressbook/gui/component/e-address-widget.c:378
+#: addressbook/gui/component/e-address-widget.c:369
 msgid "Disable Queries"
 msgstr ""
 
-#: addressbook/gui/component/e-address-widget.c:378
+#: addressbook/gui/component/e-address-widget.c:369
 msgid "Enable Queries (Dangerous!)"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
-msgid "Configure access to LDAP directory servers here"
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
-msgid "Directory Servers"
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
-#, fuzzy
-msgid "Evolution Addressbook"
-msgstr "Cannot initialise Evolution's mail component."
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
-#, fuzzy
-msgid "Evolution Addressbook LDAP Configuration Control"
-msgstr "Cannot initialise Evolution's mail component."
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-msgid "Evolution Addressbook address pop-up"
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
-msgid "Evolution Addressbook address viewer"
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
-msgid "Evolution Addressbook card viewer"
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
-#, fuzzy
-msgid "Evolution Addressbook component"
-msgstr "Cannot initialise Evolution's mail component."
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
-msgid "Evolution Addressbook folder viewer"
-msgstr ""
-
 #: addressbook/gui/component/ldap-config.glade.h:1
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:1
 #: mail/mail-config.glade.h:1
@@ -956,9 +963,10 @@ msgstr ""
 msgid "S_earch scope: "
 msgstr ""
 
+#. No time range is set, so don't start a query
 #: addressbook/gui/component/ldap-config.glade.h:34
-#: calendar/gui/e-cal-view.c:541 calendar/gui/e-day-view.c:3261
-#: calendar/gui/e-week-view.c:1181 calendar/gui/gnome-cal.c:625
+#: calendar/gui/calendar-model.c:1983 calendar/gui/e-day-view.c:1712
+#: calendar/gui/e-week-view.c:1256
 msgid "Searching"
 msgstr ""
 
@@ -1141,11 +1149,11 @@ msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:85 filter/filter.glade.h:14
 #: mail/mail-config.glade.h:143 ui/evolution-addressbook.xml.h:33
-#: ui/evolution-calendar.xml.h:35 ui/evolution-composer-entries.xml.h:8
-#: ui/evolution-mail-list.xml.h:24 ui/evolution-mail-messagedisplay.xml.h:6
+#: ui/evolution-calendar.xml.h:31 ui/evolution-composer-entries.xml.h:8
+#: ui/evolution-mail-list.xml.h:25 ui/evolution-mail-messagedisplay.xml.h:6
 #: ui/evolution-message-composer.xml.h:41
-#: ui/evolution-signature-editor.xml.h:12 ui/evolution-subscribe.xml.h:10
-#: ui/evolution-tasks.xml.h:19
+#: ui/evolution-signature-editor.xml.h:11 ui/evolution-subscribe.xml.h:10
+#: ui/evolution-tasks.xml.h:17
 msgid "_Edit"
 msgstr ""
 
@@ -1185,24 +1193,20 @@ msgstr ""
 msgid "searching-tab"
 msgstr ""
 
-#: addressbook/gui/component/select-names/e-select-names.c:509
-msgid "Select Contacts from Addressbook"
+#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:1
+msgid "Evolution Addressbook name selection interface"
 msgstr ""
 
-#: addressbook/gui/component/select-names/e-select-names.c:650
-msgid "Find contact in"
+#: addressbook/gui/component/select-names/e-select-names-popup.c:204
+msgid "Remove All"
 msgstr ""
 
-#: addressbook/gui/component/select-names/e-select-names.c:694
 #: addressbook/gui/component/select-names/e-select-names-popup.c:211
-#: composer/e-msg-composer-attachment-bar.c:444
+#: addressbook/gui/component/select-names/e-select-names.c:694
+#: composer/e-msg-composer-attachment-bar.c:507
 msgid "Remove"
 msgstr ""
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:204
-msgid "Remove All"
-msgstr ""
-
 #: addressbook/gui/component/select-names/e-select-names-popup.c:218
 #, fuzzy
 msgid "View Contact List"
@@ -1226,8 +1230,12 @@ msgstr ""
 msgid "Source"
 msgstr ""
 
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:1
-msgid "Evolution Addressbook name selection interface"
+#: addressbook/gui/component/select-names/e-select-names.c:509
+msgid "Select Contacts from Addressbook"
+msgstr ""
+
+#: addressbook/gui/component/select-names/e-select-names.c:650
+msgid "Find contact in"
 msgstr ""
 
 #: addressbook/gui/component/select-names/select-names.glade.h:2
@@ -1300,7 +1308,7 @@ msgid "D_epartment:"
 msgstr ""
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:11
-#: calendar/gui/dialogs/task-editor.c:200
+#: calendar/gui/dialogs/task-editor.c:197
 msgid "Details"
 msgstr ""
 
@@ -1364,13 +1372,11 @@ msgid "_Categories..."
 msgstr ""
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:28
-#: calendar/gui/dialogs/meeting-page.c:634
-#: calendar/gui/e-calendar-table.c:1008 calendar/gui/e-calendar-table.c:1026
-#: calendar/gui/e-cal-view.c:1144 calendar/gui/e-cal-view.c:1176
-#: ui/evolution-addressbook.xml.h:32 ui/evolution-calendar.xml.h:34
-#: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:14
-#: ui/evolution-mail-message.xml.h:104 ui/evolution-tasks.xml.h:18
-#: ui/evolution.xml.h:45
+#: calendar/gui/dialogs/meeting-page.c:717 calendar/gui/e-calendar-table.c:977
+#: calendar/gui/e-day-view.c:3755 calendar/gui/e-week-view.c:3631
+#: mail/folder-browser.c:1790 ui/evolution-addressbook.xml.h:32
+#: ui/evolution-calendar.xml.h:30 ui/evolution-mail-message.xml.h:97
+#: ui/evolution-tasks.xml.h:16 ui/evolution.xml.h:45
 msgid "_Delete"
 msgstr ""
 
@@ -1411,15 +1417,15 @@ msgid "_Web page address:"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:102
-#: addressbook/gui/contact-editor/e-contact-editor.c:184
 #: addressbook/gui/contact-editor/e-contact-editor-fullname.c:95
+#: addressbook/gui/contact-editor/e-contact-editor.c:184
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.c:163
 #: addressbook/gui/widgets/e-addressbook-model.c:318
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:408
-#: addressbook/gui/widgets/e-minicard.c:183
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:393
 #: addressbook/gui/widgets/e-minicard-label.c:164
-#: addressbook/gui/widgets/e-minicard-view.c:478
 #: addressbook/gui/widgets/e-minicard-view-widget.c:120
+#: addressbook/gui/widgets/e-minicard-view.c:478
+#: addressbook/gui/widgets/e-minicard.c:183
 msgid "Editable"
 msgstr ""
 
@@ -2447,17 +2453,17 @@ msgstr ""
 #: addressbook/gui/contact-editor/e-contact-editor.c:156
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.c:142
 #: addressbook/gui/widgets/e-addressbook-model.c:304
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:394
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:379
 #: addressbook/gui/widgets/e-addressbook-view.c:180
-#: addressbook/gui/widgets/e-minicard-view.c:464
 #: addressbook/gui/widgets/e-minicard-view-widget.c:106
+#: addressbook/gui/widgets/e-minicard-view.c:464
 msgid "Book"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor.c:163
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.c:149
-#: addressbook/gui/widgets/e-minicard.c:190
 #: addressbook/gui/widgets/e-minicard-widget.c:93
+#: addressbook/gui/widgets/e-minicard.c:190
 msgid "Card"
 msgstr ""
 
@@ -2674,7 +2680,7 @@ msgstr ""
 msgid "Contact List Editor"
 msgstr ""
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:457
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:456
 msgid "Save List as VCard"
 msgstr ""
 
@@ -2717,7 +2723,7 @@ msgid ""
 msgstr ""
 
 #. FIXME: get the toplevel window...
-#: addressbook/gui/search/e-addressbook-search-dialog.c:116
+#: addressbook/gui/search/e-addressbook-search-dialog.c:117
 #: widgets/misc/e-filter-bar.c:148
 msgid "Advanced Search"
 msgstr ""
@@ -2736,10 +2742,10 @@ msgid "%d cards"
 msgstr ""
 
 #: addressbook/gui/widgets/e-addressbook-model.c:311
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:401
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:386
 #: addressbook/gui/widgets/e-addressbook-view.c:187
-#: addressbook/gui/widgets/e-minicard-view.c:471
 #: addressbook/gui/widgets/e-minicard-view-widget.c:113
+#: addressbook/gui/widgets/e-minicard-view.c:471
 msgid "Query"
 msgstr ""
 
@@ -2747,244 +2753,245 @@ msgstr ""
 msgid "Error getting book view"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:415
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:400
 msgid "Model"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-table-adapter.c:148
-#: addressbook/gui/widgets/e-addressbook-util.c:106
+#: addressbook/gui/widgets/e-addressbook-table-adapter.c:145
+#: addressbook/gui/widgets/e-addressbook-util.c:105
 #: addressbook/gui/widgets/e-minicard.c:531
 msgid "Error modifying card"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:37
-#: shell/evolution-shell-component.c:1183
+#: addressbook/gui/widgets/e-addressbook-util.c:36
+#: shell/evolution-shell-component.c:1180
 msgid "Success"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:38
+#: addressbook/gui/widgets/e-addressbook-util.c:37
 #: camel/providers/imap/camel-imap-command.c:306
 #: camel/providers/imap/camel-imap-command.c:403
 #: camel/providers/pop3/camel-pop3-store.c:526
 #: camel/providers/pop3/camel-pop3-store.c:533 shell/e-shell.c:2077
-#: shell/e-storage.c:598 shell/evolution-shell-component.c:1222
+#: shell/e-storage.c:598 shell/evolution-shell-component.c:1219
 msgid "Unknown error"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:39
+#: addressbook/gui/widgets/e-addressbook-util.c:38
 msgid "Repository offline"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:40 shell/e-storage.c:584
-#: shell/evolution-shell-component.c:1213
+#: addressbook/gui/widgets/e-addressbook-util.c:39 shell/e-storage.c:584
+#: shell/evolution-shell-component.c:1210
 msgid "Permission denied"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:41
+#: addressbook/gui/widgets/e-addressbook-util.c:40
 msgid "Card not found"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:42
+#: addressbook/gui/widgets/e-addressbook-util.c:41
 msgid "Card ID already exists"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:43
+#: addressbook/gui/widgets/e-addressbook-util.c:42
 msgid "Protocol not supported"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:44
+#: addressbook/gui/widgets/e-addressbook-util.c:43
+#: calendar/gui/calendar-model.c:759 calendar/gui/calendar-model.c:1184
 #: calendar/gui/dialogs/task-details-page.glade.h:3
-#: calendar/gui/e-calendar-table.c:479 calendar/gui/e-cal-model-tasks.c:325
-#: calendar/gui/e-cal-model-tasks.c:604 calendar/gui/e-tasks.c:253
-#: calendar/gui/print.c:2314 camel/camel-service.c:733
-#: camel/camel-service.c:771 camel/camel-service.c:855
-#: camel/camel-service.c:895 camel/providers/pop3/camel-pop3-store.c:443
+#: calendar/gui/e-calendar-table.c:477 calendar/gui/print.c:2307
+#: camel/camel-service.c:745 camel/camel-service.c:785
+#: camel/camel-service.c:875 camel/camel-service.c:917
+#: camel/providers/pop3/camel-pop3-store.c:443
 #: camel/providers/pop3/camel-pop3-store.c:520
 msgid "Cancelled"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:45
+#: addressbook/gui/widgets/e-addressbook-util.c:44
 msgid "Authentication Failed"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:46
+#: addressbook/gui/widgets/e-addressbook-util.c:45
 msgid "Authentication Required"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:47
+#: addressbook/gui/widgets/e-addressbook-util.c:46
 msgid "TLS not Available"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:48
+#: addressbook/gui/widgets/e-addressbook-util.c:47
 msgid "Addressbook does not exist"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:49
+#: addressbook/gui/widgets/e-addressbook-util.c:48
 msgid "Other error"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:76
+#: addressbook/gui/widgets/e-addressbook-util.c:75
 msgid "Do you want to save changes?"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:78
+#: addressbook/gui/widgets/e-addressbook-util.c:77
 msgid "_Discard"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:97
+#: addressbook/gui/widgets/e-addressbook-util.c:96
 msgid "Error adding list"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:97
-#: addressbook/gui/widgets/e-addressbook-util.c:273
+#: addressbook/gui/widgets/e-addressbook-util.c:96
+#: addressbook/gui/widgets/e-addressbook-util.c:272
 msgid "Error adding card"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:106
+#: addressbook/gui/widgets/e-addressbook-util.c:105
 msgid "Error modifying list"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:116
+#: addressbook/gui/widgets/e-addressbook-util.c:115
 msgid "Error removing list"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:116
-#: addressbook/gui/widgets/e-addressbook-util.c:231
+#: addressbook/gui/widgets/e-addressbook-util.c:115
+#: addressbook/gui/widgets/e-addressbook-util.c:230
 msgid "Error removing card"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:198
+#: addressbook/gui/widgets/e-addressbook-util.c:197
 #, c-format
 msgid ""
 "Opening %d cards will open %d new windows as well.\n"
 "Do you really want to display all of these cards?"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:329
+#: addressbook/gui/widgets/e-addressbook-util.c:328
 msgid "Move card to"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:331
+#: addressbook/gui/widgets/e-addressbook-util.c:330
 msgid "Copy card to"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:334
+#: addressbook/gui/widgets/e-addressbook-util.c:333
 msgid "Move cards to"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:336
+#: addressbook/gui/widgets/e-addressbook-util.c:335
 msgid "Copy cards to"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:518
+#: addressbook/gui/widgets/e-addressbook-util.c:517
 msgid "Multiple VCards"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:526
+#: addressbook/gui/widgets/e-addressbook-util.c:525
 #, c-format
 msgid "VCard for %s"
 msgstr ""
 
 #: addressbook/gui/widgets/e-addressbook-view.c:194
-#: calendar/gui/e-calendar-table.etspec.h:17
+#: calendar/gui/dialogs/meeting-page.etspec.h:11
+#: calendar/gui/e-calendar-table.etspec.h:18
 #: calendar/gui/e-meeting-time-sel.etspec.h:11
 msgid "Type"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:398
+#: addressbook/gui/widgets/e-addressbook-view.c:394
 #: importers/evolution-gnomecard-importer.c:228 importers/pine-importer.c:642
 #: mail/importers/pine-importer.c:577
 msgid "Addressbook"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:680
-#: addressbook/gui/widgets/e-addressbook-view.c:899
-#: addressbook/gui/widgets/e-addressbook-view.c:1883
+#: addressbook/gui/widgets/e-addressbook-view.c:676
+#: addressbook/gui/widgets/e-addressbook-view.c:895
+#: addressbook/gui/widgets/e-addressbook-view.c:1879
 #: ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:886
+#: addressbook/gui/widgets/e-addressbook-view.c:882
 msgid "New Contact..."
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:887
+#: addressbook/gui/widgets/e-addressbook-view.c:883
 msgid "New Contact List..."
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:890
+#: addressbook/gui/widgets/e-addressbook-view.c:886
 msgid "Go to Folder..."
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:891
+#: addressbook/gui/widgets/e-addressbook-view.c:887
 msgid "Import..."
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:893
+#: addressbook/gui/widgets/e-addressbook-view.c:889
 msgid "Search for Contacts..."
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:894
+#: addressbook/gui/widgets/e-addressbook-view.c:890
 msgid "Addressbook Sources..."
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:896
+#: addressbook/gui/widgets/e-addressbook-view.c:892
 msgid "Pilot Settings..."
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:900
+#: addressbook/gui/widgets/e-addressbook-view.c:896
 #: ui/evolution-addressbook.xml.h:10
 msgid "Forward Contact"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:901
+#: addressbook/gui/widgets/e-addressbook-view.c:897
 msgid "Send Message to Contact"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:902 calendar/gui/print.c:2446
+#: addressbook/gui/widgets/e-addressbook-view.c:898 calendar/gui/print.c:2439
 #: ui/evolution-addressbook.xml.h:16 ui/evolution-comp-editor.xml.h:8
-#: ui/evolution-contact-editor.xml.h:5 ui/evolution-mail-message.xml.h:72
+#: ui/evolution-contact-editor.xml.h:4 ui/evolution-mail-message.xml.h:67
 #: ui/my-evolution.xml.h:1
 msgid "Print"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:904
+#: addressbook/gui/widgets/e-addressbook-view.c:900
 msgid "Print Envelope"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:908
+#: addressbook/gui/widgets/e-addressbook-view.c:904
 msgid "Copy to folder..."
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:909
+#: addressbook/gui/widgets/e-addressbook-view.c:905
 msgid "Move to folder..."
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:912
+#: addressbook/gui/widgets/e-addressbook-view.c:908
 #: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:913
-#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:9
+#: addressbook/gui/widgets/e-addressbook-view.c:909
+#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:8
 #: ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:914
-#: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:10
+#: addressbook/gui/widgets/e-addressbook-view.c:910
+#: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:9
 msgid "Paste"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:915 filter/libfilter-i18n.h:10
+#: addressbook/gui/widgets/e-addressbook-view.c:911 filter/libfilter-i18n.h:11
 #: mail/mail-accounts.c:234 ui/evolution-addressbook.xml.h:8
-#: ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:3
-#: ui/evolution-contact-list-editor.xml.h:3 ui/evolution-mail-message.xml.h:24
+#: ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:2
+#: ui/evolution-contact-list-editor.xml.h:2 ui/evolution-mail-message.xml.h:20
 msgid "Delete"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:919
-#: calendar/gui/e-cal-view.c:1109
+#: addressbook/gui/widgets/e-addressbook-view.c:915
+#: calendar/gui/e-day-view.c:3715 calendar/gui/e-week-view.c:3596
 msgid "Current View"
 msgstr ""
 
@@ -2992,7 +2999,7 @@ msgstr ""
 #. Translators: put here a list of labels you want to see on buttons in
 #. addressbook. You may use any character to separate labels but it must
 #. also be placed at the begining ot the string
-#: addressbook/gui/widgets/e-addressbook-view.c:953
+#: addressbook/gui/widgets/e-addressbook-view.c:949
 msgid ",123,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
 msgstr ""
 
@@ -3000,11 +3007,11 @@ msgstr ""
 #. in addressbook. You may use any character to separate labels but it
 #. must also be placed at the begining ot the string.
 #. Use lower case letters if possible.
-#: addressbook/gui/widgets/e-addressbook-view.c:958
+#: addressbook/gui/widgets/e-addressbook-view.c:954
 msgid ",0,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1356
+#: addressbook/gui/widgets/e-addressbook-view.c:1352
 #, c-format
 msgid ""
 "The addressbook backend for\n"
@@ -3072,29 +3079,6 @@ msgstr ""
 msgid "Primary Phone"
 msgstr ""
 
-#: addressbook/gui/widgets/e-minicard.c:146
-#: addressbook/gui/widgets/e-minicard-label.c:115
-msgid "Width"
-msgstr ""
-
-#: addressbook/gui/widgets/e-minicard.c:153
-#: addressbook/gui/widgets/e-minicard-label.c:122
-msgid "Height"
-msgstr ""
-
-#: addressbook/gui/widgets/e-minicard.c:161
-#: addressbook/gui/widgets/e-minicard-label.c:129
-msgid "Has Focus"
-msgstr ""
-
-#: addressbook/gui/widgets/e-minicard.c:169
-msgid "Selected"
-msgstr ""
-
-#: addressbook/gui/widgets/e-minicard.c:176
-msgid "Has Cursor"
-msgstr ""
-
 #: addressbook/gui/widgets/e-minicard-control.c:204
 #, c-format
 msgid "and %d other cards."
@@ -3108,6 +3092,21 @@ msgstr ""
 msgid "Save in addressbook"
 msgstr ""
 
+#: addressbook/gui/widgets/e-minicard-label.c:115
+#: addressbook/gui/widgets/e-minicard.c:146
+msgid "Width"
+msgstr ""
+
+#: addressbook/gui/widgets/e-minicard-label.c:122
+#: addressbook/gui/widgets/e-minicard.c:153
+msgid "Height"
+msgstr ""
+
+#: addressbook/gui/widgets/e-minicard-label.c:129
+#: addressbook/gui/widgets/e-minicard.c:161
+msgid "Has Focus"
+msgstr ""
+
 #: addressbook/gui/widgets/e-minicard-label.c:136
 msgid "Field"
 msgstr ""
@@ -3124,6 +3123,10 @@ msgstr ""
 msgid "Max field name length"
 msgstr ""
 
+#: addressbook/gui/widgets/e-minicard-view-widget.c:127
+msgid "Column Width"
+msgstr ""
+
 #: addressbook/gui/widgets/e-minicard-view.c:141
 msgid ""
 "\n"
@@ -3144,8 +3147,12 @@ msgstr ""
 msgid "Adapter"
 msgstr ""
 
-#: addressbook/gui/widgets/e-minicard-view-widget.c:127
-msgid "Column Width"
+#: addressbook/gui/widgets/e-minicard.c:169
+msgid "Selected"
+msgstr ""
+
+#: addressbook/gui/widgets/e-minicard.c:176
+msgid "Has Cursor"
 msgstr ""
 
 #: addressbook/gui/widgets/gal-view-factory-minicard.c:24
@@ -3156,18 +3163,18 @@ msgstr ""
 msgid "GTK Tree View"
 msgstr ""
 
-#: addressbook/printing/e-contact-print.c:1158
-msgid "Print cards"
+#: addressbook/printing/e-contact-print-envelope.c:217
+#: addressbook/printing/e-contact-print-envelope.c:238
+msgid "Print envelope"
 msgstr ""
 
-#: addressbook/printing/e-contact-print.c:1224
-#: addressbook/printing/e-contact-print.c:1250
-msgid "Print card"
+#: addressbook/printing/e-contact-print.c:1139
+msgid "Print cards"
 msgstr ""
 
-#: addressbook/printing/e-contact-print-envelope.c:217
-#: addressbook/printing/e-contact-print-envelope.c:238
-msgid "Print envelope"
+#: addressbook/printing/e-contact-print.c:1204
+#: addressbook/printing/e-contact-print.c:1226
+msgid "Print card"
 msgstr ""
 
 #: addressbook/printing/e-contact-print.glade.h:1
@@ -3339,60 +3346,6 @@ msgstr ""
 msgid "_Font..."
 msgstr ""
 
-#: addressbook/tools/evolution-addressbook-export.c:56
-msgid "Specify the output file instead of standard output"
-msgstr ""
-
-#: addressbook/tools/evolution-addressbook-export.c:57
-msgid "OUTPUTFILE"
-msgstr ""
-
-#: addressbook/tools/evolution-addressbook-export.c:58
-msgid "List local addressbook folders"
-msgstr ""
-
-#: addressbook/tools/evolution-addressbook-export.c:60
-msgid "Show cards as vcard or csv file"
-msgstr ""
-
-#: addressbook/tools/evolution-addressbook-export.c:60
-msgid "[vcard|csv]"
-msgstr ""
-
-#: addressbook/tools/evolution-addressbook-export.c:61
-msgid "Export in asynchronous mode "
-msgstr ""
-
-#: addressbook/tools/evolution-addressbook-export.c:63
-msgid ""
-"The number of cards in one output file in asychronous mode,default size 100."
-msgstr ""
-
-#: addressbook/tools/evolution-addressbook-export.c:63
-msgid "NUMBER"
-msgstr ""
-
-#: addressbook/tools/evolution-addressbook-export.c:91
-msgid ""
-"Command line arguments error, please use --help option to see the usage."
-msgstr ""
-
-#: addressbook/tools/evolution-addressbook-export.c:105
-msgid "Only support csv or vcard format."
-msgstr ""
-
-#: addressbook/tools/evolution-addressbook-export.c:114
-msgid "In async mode, output must be file."
-msgstr ""
-
-#: addressbook/tools/evolution-addressbook-export.c:122
-msgid "In normal mode, there should not need size option."
-msgstr ""
-
-#: addressbook/tools/evolution-addressbook-export.c:153
-msgid "Impossible internal error."
-msgstr ""
-
 #: calendar/cal-util/cal-component.c:1218
 msgid "Untitled appointment"
 msgstr ""
@@ -3522,30 +3475,28 @@ msgid "31st"
 msgstr ""
 
 #: calendar/cal-util/cal-util.c:550 calendar/cal-util/cal-util.c:572
-#: calendar/gui/dialogs/task-details-page.glade.h:5
-#: calendar/gui/e-calendar-table.c:403 calendar/gui/e-tasks.c:271
-#: mail/message-list.c:912
+#: calendar/gui/dialogs/task-details-page.glade.h:6
+#: calendar/gui/e-calendar-table.c:401 mail/message-list.c:753
 msgid "High"
 msgstr ""
 
 #: calendar/cal-util/cal-util.c:552 calendar/cal-util/cal-util.c:574
-#: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-calendar-table.c:404 calendar/gui/e-cal-model.c:826
-#: calendar/gui/e-tasks.c:273 mail/message-list.c:911
+#: calendar/gui/calendar-model.c:1709
+#: calendar/gui/dialogs/task-details-page.glade.h:9
+#: calendar/gui/e-calendar-table.c:402 mail/message-list.c:752
 msgid "Normal"
 msgstr ""
 
 #: calendar/cal-util/cal-util.c:554 calendar/cal-util/cal-util.c:576
-#: calendar/gui/dialogs/task-details-page.glade.h:7
-#: calendar/gui/e-calendar-table.c:405 calendar/gui/e-tasks.c:275
-#: mail/message-list.c:910
+#: calendar/gui/dialogs/task-details-page.glade.h:8
+#: calendar/gui/e-calendar-table.c:403 mail/message-list.c:751
 msgid "Low"
 msgstr ""
 
 #. An empty string is the same as 'None'.
 #: calendar/cal-util/cal-util.c:570
-#: calendar/gui/dialogs/task-details-page.glade.h:11
-#: calendar/gui/e-calendar-table.c:406
+#: calendar/gui/dialogs/task-details-page.glade.h:13
+#: calendar/gui/e-calendar-table.c:404
 msgid "Undefined"
 msgstr ""
 
@@ -3553,13 +3504,13 @@ msgstr ""
 msgid "Split Multi-Day Events:"
 msgstr ""
 
-#: calendar/conduits/calendar/calendar-conduit.c:1297
-#: calendar/conduits/todo/todo-conduit.c:838
+#: calendar/conduits/calendar/calendar-conduit.c:1289
+#: calendar/conduits/todo/todo-conduit.c:830
 msgid "Error while communicating with calendar server"
 msgstr ""
 
-#: calendar/conduits/calendar/calendar-conduit.c:1456
-#: calendar/conduits/calendar/calendar-conduit.c:1459
+#: calendar/conduits/calendar/calendar-conduit.c:1440
+#: calendar/conduits/calendar/calendar-conduit.c:1443
 msgid "Could not read pilot's Calendar application block"
 msgstr ""
 
@@ -3567,33 +3518,80 @@ msgstr ""
 msgid "Default Priority:"
 msgstr ""
 
-#: calendar/conduits/todo/todo-conduit.c:970
-#: calendar/conduits/todo/todo-conduit.c:973
+#: calendar/conduits/todo/todo-conduit.c:954
+#: calendar/conduits/todo/todo-conduit.c:957
 msgid "Could not read pilot's ToDo application block"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:213
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
+msgid "Calendar and Tasks"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
+msgid "Configure your timezone, Calendar and Task List here "
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
+#, fuzzy
+msgid "Evolution Calendar and Tasks"
+msgstr "Cannot initialise Evolution's mail component."
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
+#, fuzzy
+msgid "Evolution Calendar and Tasks component"
+msgstr "Cannot initialise Evolution's mail component."
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
+#, fuzzy
+msgid "Evolution Calendar configuration control"
+msgstr "Cannot initialise Evolution's mail component."
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
+msgid "Evolution Calendar scheduling message viewer"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
+#, fuzzy
+msgid "Evolution Calendar viewer"
+msgstr "Cannot initialise Evolution's mail component."
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
+msgid "Evolution Calendar/Task editor"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
+#, fuzzy
+msgid "Evolution Tasks viewer"
+msgstr "Cannot initialise Evolution's mail component."
+
+#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
+msgid "Evolution Calendar alarm notification service"
+msgstr ""
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:212
 msgid "Starting:"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:215
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:214
 msgid "Ending:"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:254
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:227
+msgid "invalid time"
+msgstr ""
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:272
 #, fuzzy
 msgid "Evolution Alarm"
 msgstr "Cannot initialise Evolution's mail component."
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:347
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:365
 #, c-format
 msgid "Alarm on %s"
 msgstr ""
author	Ettore Perazzoli <ettore@src.gnome.org>	2003-10-22 02:28:34 +0800
committer	Ettore Perazzoli <ettore@src.gnome.org>	2003-10-22 02:28:34 +0800
commit	0fb08f3ff81575a4749d851404233f34252dd2f2 (patch)
tree	7e03befedc3a76fd104921dbbc616810d87333be
parent	0e19f2c16de592607a341eb9974d31e4e47e02b5 (diff)
download	gsoc2013-evolution-0fb08f3ff81575a4749d851404233f34252dd2f2.tar.gz gsoc2013-evolution-0fb08f3ff81575a4749d851404233f34252dd2f2.tar.zst gsoc2013-evolution-0fb08f3ff81575a4749d851404233f34252dd2f2.zip