Merge lp:~jelmer/ubuntu/natty/evolution-mapi/newer-openchange into lp:ubuntu/natty/evolution-mapi

[Jelmer Vernooij]

This fixes the dependency on libexchangemapi-1.0-0 in debian/rules (bug 693573) and fixes compatibility with the newer version of OpenChange that's in natty.

[Jelmer Vernooij (jelmer)]

Please note that evolution-data-server is currently uninstallable on natty because it has a dependency on libgdata7 which is only in maverick, not natty. (see bug 709751)

[Martin Pitt (pitti)]

Thank you!

review: Approve

=== modified file 'NEWS'
--- NEWS	2010-10-19 15:03:33 +0000
+++ NEWS	2011-01-29 12:46:35 +0000
@@ -1,3 +1,33 @@
+evolution-mapi 0.32.1 2010-11-15
+---------------------------------
+
+Bug Fixes:
+	Bug #608388 - Copying a mail from another account loses 
+		      headers (Milan Crha)
+	Bug #629481 - Critical warning from mapi_sync function (Milan Crha)
+	Bug #629484 - Do not refresh 'Favourites' folder itself (Milan Crha)
+	Bug #629492 - Messages can be without recipients (Milan Crha)
+	Bug #629499 - Runs incoming filters in all folders (Milan Crha)
+	Bug #629507 - Gal re-fetches itself (Milan Crha)
+	Bug #629603 - Allow calendar refresh on demand (Milan Crha)
+	Bug #629836 - Crash on an event fetching (Milan Crha)
+	Bug #630698 - Cannot remove just created folder (Punit Jain)
+	Bug #630712 - Crash in add_cal_esource (Milan Crha)
+	Bug #631496 - Crash fetching property unsupported by 
+		      cast_mapi_SPropValue (Milan Crha)
+	Bug #631621 - Cannot connect after update (Milan Crha)
+	Bug #632449 - Copy message to Inbox tries to send it (Milan Crha)
+	Bug #633182 - Meeting invites sent also to organiser (Milan Crha)
+	Bug #633185 - Can't handle Birthdays before 01/01/1970 (Milan Crha)
+
+Misc:
+	Unable to send mail after fix for bug #608388 (Milan Crha)
+
+Translations:
+	Carles Ferrando (ca@valencia)
+	Gil Forcada (ca)
+	Inaki Larranaga Murgoitio (eu)
+
 evolution-mapi 0.32.0 2010-09-27
 ---------------------------------
 

=== modified file 'configure'
--- configure	2010-11-03 16:33:05 +0000
+++ configure	2011-01-29 12:46:35 +0000
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.65 for evolution-mapi 0.32.0.
+# Generated by GNU Autoconf 2.65 for evolution-mapi 0.32.1.
 #
 # Report bugs to <http://bugzilla.gnome.org/browse.cgi?product=evolution-mapi>.
 #
@@ -702,8 +702,8 @@
 # Identity of this package.
 PACKAGE_NAME='evolution-mapi'
 PACKAGE_TARNAME='evolution-mapi'
-PACKAGE_VERSION='0.32.0'
-PACKAGE_STRING='evolution-mapi 0.32.0'
+PACKAGE_VERSION='0.32.1'
+PACKAGE_STRING='evolution-mapi 0.32.1'
 PACKAGE_BUGREPORT='http://bugzilla.gnome.org/browse.cgi?product=evolution-mapi'
 PACKAGE_URL=''
 
@@ -1544,7 +1544,7 @@
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures evolution-mapi 0.32.0 to adapt to many kinds of systems.
+\`configure' configures evolution-mapi 0.32.1 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1614,7 +1614,7 @@
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of evolution-mapi 0.32.0:";;
+     short | recursive ) echo "Configuration of evolution-mapi 0.32.1:";;
    esac
   cat <<\_ACEOF
 
@@ -1768,7 +1768,7 @@
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-evolution-mapi configure 0.32.0
+evolution-mapi configure 0.32.1
 generated by GNU Autoconf 2.65
 
 Copyright (C) 2009 Free Software Foundation, Inc.
@@ -2139,7 +2139,7 @@
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by evolution-mapi $as_me 0.32.0, which was
+It was created by evolution-mapi $as_me 0.32.1, which was
 generated by GNU Autoconf 2.65.  Invocation command line was
 
   $ $0 $@
@@ -2947,7 +2947,7 @@
 
 # Define the identity of the package.
  PACKAGE='evolution-mapi'
- VERSION='0.32.0'
+ VERSION='0.32.1'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -14140,7 +14140,7 @@
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by evolution-mapi $as_me 0.32.0, which was
+This file was extended by evolution-mapi $as_me 0.32.1, which was
 generated by GNU Autoconf 2.65.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -14206,7 +14206,7 @@
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-evolution-mapi config.status 0.32.0
+evolution-mapi config.status 0.32.1
 configured by $0, generated by GNU Autoconf 2.65,
   with options \\"\$ac_cs_config\\"
 

=== modified file 'configure.ac'
--- configure.ac	2010-11-03 16:33:05 +0000
+++ configure.ac	2011-01-29 12:46:35 +0000
@@ -3,7 +3,7 @@
 dnl Modified for GNOME Evolution MAPI Provider by Johnny Jacob <[e-mail]>
 
 AC_PREREQ(2.58)
-AC_INIT([evolution-mapi], [0.32.0], [http://bugzilla.gnome.org/browse.cgi?product=evolution-mapi])
+AC_INIT([evolution-mapi], [0.32.1], [http://bugzilla.gnome.org/browse.cgi?product=evolution-mapi])
 AM_INIT_AUTOMAKE([gnu 1.9])
 AC_CONFIG_SRCDIR(README)
 AC_CONFIG_HEADERS(config.h)

=== modified file 'debian/changelog'
--- debian/changelog	2010-11-03 16:33:05 +0000
+++ debian/changelog	2011-01-29 12:46:35 +0000
@@ -1,3 +1,13 @@
+evolution-mapi (0.32.1-0ubuntu1) natty; urgency=low
+
+  * New upstream release.
+  * Update watch file for 0.32.
+  * 01_openchange_compat: Add patch to fix compatibility with current
+    OpenChange.
+  * Fix library dependencies. LP: #693573
+
+ -- Jelmer Vernooij <[e-mail]>  Sat, 29 Jan 2011 13:07:06 +0100
+
 evolution-mapi (0.32.0-0ubuntu1) natty; urgency=low
 
   * New upstream release.

=== modified file 'debian/control'
--- debian/control	2010-11-03 16:33:05 +0000
+++ debian/control	2011-01-29 12:46:35 +0000
@@ -29,9 +29,11 @@
                libedata-book1.2-dev (>= 2.31.6),
                libcamel1.2-dev (>= 2.31.6),
                evolution-dev (>= 2.31.1),
-               libmapi-dev (>= 1:0.9), samba4-dev,
+               libmapi-dev (>= 1:0.11~bzr1932),
+               samba4-dev,
                libgtk2.0-dev (>= 2.20.0),
-               gtk-doc-tools (>= 1.9)
+               gtk-doc-tools (>= 1.9),
+               dh-autoreconf
 
 Package: evolution-mapi
 Architecture: any
@@ -61,7 +63,7 @@
  Evolution MAPI provider.
 
 Package: libexchangemapi1.0-0
-Depends: libexchangemapi-1.0-0
+Depends: libexchangemapi-1.0-0, ${misc:Depends}
 Architecture: all
 Section: oldlibs
 Description: transitional dummy package for exchangemapi
@@ -88,7 +90,7 @@
  for using libexchangemapi.
 
 Package: libexchangemapi1.0-dev
-Depends: libexchangemapi-1.0-dev
+Depends: libexchangemapi-1.0-dev, ${misc:Depends}
 Architecture: all
 Section: oldlibs
 Description: transitional dummy package for exchangemapi - dev files

=== added directory 'debian/patches'
=== added file 'debian/patches/01_openchange_compat'
--- debian/patches/01_openchange_compat	1970-01-01 00:00:00 +0000
+++ debian/patches/01_openchange_compat	2011-01-29 12:46:35 +0000
@@ -0,0 +1,247 @@
+=== modified file 'configure.ac'
+--- old/configure.ac	2010-09-27 10:28:11 +0000
++++ new/configure.ac	2011-01-25 18:44:56 +0000
+@@ -253,6 +253,20 @@
+ fi
+ 
+ dnl ****************************
++dnl Check for MAPIInitialize function with two params
++dnl ****************************
++AC_MSG_CHECKING([libmapi MAPIInitialize function with two params])
++save_cflags=$CFLAGS; CFLAGS=$LIBMAPI_CFLAGS
++save_libs=$LIBS; LIBS="$LIBMAPI_LIBS"
++AC_LINK_IFELSE([AC_LANG_PROGRAM(
++	[[#include <libmapi/libmapi.h>]],
++	[[MAPIInitialize (NULL, NULL)]])],
++	[AC_DEFINE(HAVE_LIBMAPI_CONTEXT_PARAM, 1, [libmapi uses context parameters]) ac_cv_have_lcp=yes],[ac_cv_have_lcp=no])
++CFLAGS=$save_cflags
++LIBS=$save_libs
++AC_MSG_RESULT([$ac_cv_have_lcp])
++
++dnl ****************************
+ dnl Expose version information
+ dnl ****************************
+ API_VERSION=$EDS_PACKAGE
+
+=== modified file 'src/libexchangemapi/exchange-mapi-connection.c'
+--- old/src/libexchangemapi/exchange-mapi-connection.c	2010-10-19 10:33:25 +0000
++++ new/src/libexchangemapi/exchange-mapi-connection.c	2011-01-25 19:24:59 +0000
+@@ -143,6 +143,10 @@
+ 	g_propagate_error (perror, error);
+ }
+ 
++#ifdef HAVE_LIBMAPI_CONTEXT_PARAM
++struct mapi_context *mapi_ctx = NULL;
++#endif
++
+ typedef struct _ExchangeMapiConnectionPrivate ExchangeMapiConnectionPrivate;
+ 
+ struct _ExchangeMapiConnectionPrivate {
+@@ -2808,7 +2812,11 @@
+ 
+ 	mapi_object_init(&obj_folder_src);
+ 	mapi_object_init(&obj_folder_dst);
+-	mapi_id_array_init(&msg_id_array);
++	mapi_id_array_init (
++		#ifdef HAVE_LIBMAPI_CONTEXT_PARAM
++		mapi_ctx,
++		#endif
++		&msg_id_array);
+ 
+ 	for (l = mid_list; l != NULL; l = g_slist_next (l))
+ 		mapi_id_array_add_id (&msg_id_array, *((mapi_id_t *)l->data));
+@@ -3602,7 +3610,11 @@
+ 		}
+ 	}
+ 
+-	ms = MAPIInitialize (profpath);
++	ms = MAPIInitialize (
++		#ifdef HAVE_LIBMAPI_CONTEXT_PARAM
++		&mapi_ctx,
++		#endif
++		profpath);
+ 	if (ms == MAPI_E_SESSION_LIMIT) {
+ 		/* do nothing, the profile store is already initialized */
+ 		/* but this shouldn't happen */
+@@ -3664,15 +3676,31 @@
+ 	/* Initialize libmapi logger*/
+ 	if (g_getenv ("MAPI_DEBUG")) {
+ 		debug_log_level = atoi (g_getenv ("MAPI_DEBUG"));
+-		SetMAPIDumpData(TRUE);
+-		SetMAPIDebugLevel(debug_log_level);
++		SetMAPIDumpData (
++			#ifdef HAVE_LIBMAPI_CONTEXT_PARAM
++			mapi_ctx,
++			#endif
++			TRUE);
++		SetMAPIDebugLevel (
++			#ifdef HAVE_LIBMAPI_CONTEXT_PARAM
++			mapi_ctx,
++			#endif
++			debug_log_level);
+ 	}
+ 
+ 	g_debug("Loading profile %s ", profname);
+ 
+-	ms = MapiLogonEx (&session, profname, password);
++	ms = MapiLogonEx (
++		#ifdef HAVE_LIBMAPI_CONTEXT_PARAM
++		mapi_ctx,
++		#endif
++		&session, profname, password);
+ 	if (ms == MAPI_E_NOT_FOUND && try_create_profile (profname, password))
+-		ms = MapiLogonEx (&session, profname, password);
++		ms = MapiLogonEx (
++			#ifdef HAVE_LIBMAPI_CONTEXT_PARAM
++			mapi_ctx,
++			#endif
++			&session, profname, password);
+ 
+ 	if (ms != MAPI_E_SUCCESS) {
+ 		make_mapi_error (perror, "MapiLogonEx", ms);
+@@ -3717,34 +3745,60 @@
+ 	profname = exchange_mapi_util_profile_name (username, domain, server, TRUE);
+ 
+ 	/* Delete any existing profiles with the same profilename */
+-	ms = DeleteProfile (profname);
++	ms = DeleteProfile (
++		#ifdef HAVE_LIBMAPI_CONTEXT_PARAM
++		mapi_ctx,
++		#endif
++		profname);
+ 	/* don't bother to check error - it would be valid if we got an error */
+ 
+-	ms = CreateProfile (profname, username, password, OC_PROFILE_NOPASSWORD);
++	ms = CreateProfile (
++		#ifdef HAVE_LIBMAPI_CONTEXT_PARAM
++		mapi_ctx,
++		#endif
++		profname, username, password, OC_PROFILE_NOPASSWORD);
+ 	if (ms != MAPI_E_SUCCESS) {
+ 		make_mapi_error (perror, "CreateProfile", ms);
+ 		goto cleanup;
+ 	}
+ 
+-	mapi_profile_add_string_attr(profname, "binding", server);
+-	mapi_profile_add_string_attr(profname, "workstation", workstation);
+-	mapi_profile_add_string_attr(profname, "domain", domain);
++	#ifdef HAVE_LIBMAPI_CONTEXT_PARAM
++	#define add_string_attr(_prof,_aname,_val)				\
++		mapi_profile_add_string_attr (mapi_ctx, _prof, _aname, _val)
++	#else
++	#define add_string_attr(_prof,_aname,_val)				\
++		mapi_profile_add_string_attr (_prof, _aname, _val)
++	#endif
++
++	add_string_attr (profname, "binding", server);
++	add_string_attr (profname, "workstation", workstation);
++	add_string_attr (profname, "domain", domain);
+ 
+ 	if ((flags & CREATE_PROFILE_FLAG_USE_SSL) != 0)
+-		mapi_profile_add_string_attr (profname, "seal", "true");
++		add_string_attr (profname, "seal", "true");
+ 
+ 	/* This is only convenient here and should be replaced at some point */
+-	mapi_profile_add_string_attr(profname, "codepage", "0x4e4");
+-	mapi_profile_add_string_attr(profname, "language", "0x409");
+-	mapi_profile_add_string_attr(profname, "method", "0x409");
++	add_string_attr (profname, "codepage", "0x4e4");
++	add_string_attr (profname, "language", "0x409");
++	add_string_attr (profname, "method", "0x409");
++
++	#undef add_string_attr
+ 
+ 	/* Login now */
+ 	g_debug("Logging into the server... ");
+-	ms = MapiLogonProvider (&session, profname, password, PROVIDER_ID_NSPI);
++	ms = MapiLogonProvider (
++		#ifdef HAVE_LIBMAPI_CONTEXT_PARAM
++		mapi_ctx,
++		#endif
++		&session, profname, password, PROVIDER_ID_NSPI);
+ 	if (ms != MAPI_E_SUCCESS) {
+ 		make_mapi_error (perror, "MapiLogonProvider", ms);
+ 		g_debug ("Deleting profile %s ", profname);
+-		DeleteProfile (profname);
++		DeleteProfile (
++			#ifdef HAVE_LIBMAPI_CONTEXT_PARAM
++			mapi_ctx,
++			#endif
++			profname);
+ 		goto cleanup;
+ 	}
+ 	g_debug("MapiLogonProvider : succeeded \n");
+@@ -3753,7 +3807,11 @@
+ 	if (ms != MAPI_E_SUCCESS) {
+ 		make_mapi_error (perror, "ProcessNetworkProfile", ms);
+ 		g_debug ("Deleting profile %s ", profname);
+-		DeleteProfile (profname);
++		DeleteProfile (
++			#ifdef HAVE_LIBMAPI_CONTEXT_PARAM
++			mapi_ctx,
++			#endif
++			profname);
+ 		goto cleanup;
+ 	}
+ 	g_debug("ProcessNetworkProfile : succeeded \n");
+@@ -3807,7 +3865,11 @@
+ 
+ 		g_debug ("Deleting profile %s ", profile);
+ 
+-		ms = DeleteProfile (profile);
++		ms = DeleteProfile (
++			#ifdef HAVE_LIBMAPI_CONTEXT_PARAM
++			mapi_ctx,
++			#endif
++			profile);
+ 		if (ms == MAPI_E_SUCCESS) {
+ 			result = TRUE;
+ 		} else {
+@@ -3820,4 +3882,21 @@
+ 	return result;
+ }
+ 
++void
++exchange_mapi_rename_profile (const gchar *old_name, const gchar *new_name)
++{
++	g_return_if_fail (old_name != NULL);
++	g_return_if_fail (new_name != NULL);
++
++	g_static_rec_mutex_lock (&profile_mutex);
++
++	RenameProfile (
++		#ifdef HAVE_LIBMAPI_CONTEXT_PARAM
++		mapi_ctx,
++		#endif
++		old_name, new_name);
++
++	g_static_rec_mutex_unlock (&profile_mutex);
++}
++
+ /* profile related functions - end */
+
+=== modified file 'src/libexchangemapi/exchange-mapi-connection.h'
+--- old/src/libexchangemapi/exchange-mapi-connection.h	2010-08-02 22:02:21 +0000
++++ new/src/libexchangemapi/exchange-mapi-connection.h	2011-01-25 18:44:56 +0000
+@@ -240,6 +240,7 @@
+ 				       mapi_profile_callback_t cb, gpointer data, GError **perror);
+ 
+ gboolean		exchange_mapi_delete_profile (const gchar *profile, GError **perror);
++void			exchange_mapi_rename_profile (const gchar *old_name, const gchar *new_name);
+ 
+ /* utility functions */
+ 
+
+=== modified file 'src/libexchangemapi/exchange-mapi-utils.c'
+--- old/src/libexchangemapi/exchange-mapi-utils.c	2010-11-02 17:03:41 +0000
++++ new/src/libexchangemapi/exchange-mapi-utils.c	2011-01-25 18:44:56 +0000
+@@ -947,7 +947,7 @@
+ 		old_name = g_strdup_printf ("%s@%s", username, domain);
+ 		old_name = g_strcanon (old_name, "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789@", '_');
+ 
+-		RenameProfile (old_name, res);
++		exchange_mapi_rename_profile (old_name, res);
+ 
+ 		g_free (old_name);
+ 	}
+

=== added file 'debian/patches/series'
--- debian/patches/series	1970-01-01 00:00:00 +0000
+++ debian/patches/series	2011-01-29 12:46:35 +0000
@@ -0,0 +1,1 @@
+01_openchange_compat

=== modified file 'debian/rules'
--- debian/rules	2010-09-14 20:50:55 +0000
+++ debian/rules	2011-01-29 12:46:35 +0000
@@ -2,6 +2,7 @@
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/gnome.mk
+include /usr/share/cdbs/1/rules/autoreconf.mk
 
 DEB_DH_MAKESHLIBS_ARGS_evolution-mapi += --no-act
-DEB_DH_MAKESHLIBS_ARGS_libexchangemapi-1.0-0 += -V 'libexchangemapi-1.0-0 (>= 0.30), libexchangemapi-1.0-0 (<< 0.31)'
+DEB_DH_MAKESHLIBS_ARGS_libexchangemapi-1.0-0 += -V 'libexchangemapi-1.0-0 (>= 0.32), libexchangemapi-1.0-0 (<< 0.33)'

=== modified file 'debian/watch'
--- debian/watch	2010-09-14 20:50:55 +0000
+++ debian/watch	2011-01-29 12:46:35 +0000
@@ -1,2 +1,2 @@
 version=3
-http://ftp.gnome.org/pub/GNOME/sources/evolution-mapi/([\d\.]+)[02468]/evolution-mapi-([\d\.]+)\.tar\.gz	debian	uupdate
+http://ftp.gnome.org/pub/GNOME/sources/evolution-mapi/0.32/evolution-mapi-([\d\.]+)\.tar\.gz	debian	uupdate

=== modified file 'po/ca.po'
--- po/ca.po	2010-09-14 20:50:55 +0000
+++ po/ca.po	2011-01-29 12:46:35 +0000
@@ -8,16 +8,21 @@
 msgstr ""
 "Project-Id-Version: evolution-mapi\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-03-10 08:54+0100\n"
-"PO-Revision-Date: 2010-02-28 20:25+0100\n"
+"POT-Creation-Date: 2010-10-10 22:53+0200\n"
+"PO-Revision-Date: 2010-09-29 16:18+0200\n"
 "Last-Translator: David Planella <[e-mail]>\n"
 "Language-Team: Catalan <[e-mail]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../src/account-setup-eplugin/exchange-mapi-account-listener.c:624
-#: ../src/account-setup-eplugin/exchange-mapi-account-setup.c:226
+#: ../src/account-setup-eplugin/exchange-mapi-account-listener.c:684
+#: ../src/account-setup-eplugin/exchange-mapi-account-listener.c:686
+msgid "Global Address List"
+msgstr "Llista d'adreces global"
+
+#: ../src/account-setup-eplugin/exchange-mapi-account-listener.c:1001
+#: ../src/account-setup-eplugin/exchange-mapi-account-setup.c:229
 #, c-format
 msgid "Enter Password for %s@%s"
 msgstr "Introduïu la contrasenya per a %s@%s"
@@ -26,19 +31,19 @@
 #. using GtkEntryCompletion in the username gtkentry. But plugins
 #. as of now does not have access to it
 #. TODO : Fix strings
-#: ../src/account-setup-eplugin/exchange-mapi-account-setup.c:135
+#: ../src/account-setup-eplugin/exchange-mapi-account-setup.c:133
 msgid "Select username"
 msgstr "Seleccioneu el nom d'usuari"
 
-#: ../src/account-setup-eplugin/exchange-mapi-account-setup.c:145
+#: ../src/account-setup-eplugin/exchange-mapi-account-setup.c:143
 msgid "Full name"
 msgstr "Nom complet"
 
-#: ../src/account-setup-eplugin/exchange-mapi-account-setup.c:150
-msgid "User name"
+#: ../src/account-setup-eplugin/exchange-mapi-account-setup.c:148
+msgid "Username"
 msgstr "Nom d'usuari"
 
-#: ../src/account-setup-eplugin/exchange-mapi-account-setup.c:215
+#: ../src/account-setup-eplugin/exchange-mapi-account-setup.c:217
 msgid ""
 "Server, username and domain name cannot be empty. Please fill them with "
 "correct values."
@@ -46,126 +51,199 @@
 "El servidor, el nom d'usuari i el nom del domini no poden ser buits. Hauríeu "
 "d'escriure-hi valors correctes."
 
-#: ../src/account-setup-eplugin/exchange-mapi-account-setup.c:253
+#: ../src/account-setup-eplugin/exchange-mapi-account-setup.c:273
 msgid "Authentication finished successfully."
 msgstr "Ha finalitzat satisfactòriament l'autenticació."
 
-#: ../src/account-setup-eplugin/exchange-mapi-account-setup.c:259
-#: ../src/account-setup-eplugin/exchange-mapi-account-setup.c:269
+#: ../src/account-setup-eplugin/exchange-mapi-account-setup.c:279
+#: ../src/account-setup-eplugin/exchange-mapi-account-setup.c:290
 msgid "Authentication failed."
 msgstr "Ha fallat l'autenticació."
 
-#: ../src/account-setup-eplugin/exchange-mapi-account-setup.c:324
+#: ../src/account-setup-eplugin/exchange-mapi-account-setup.c:368
 msgid "_Domain name:"
 msgstr "Nom del _domini:"
 
-#: ../src/account-setup-eplugin/exchange-mapi-account-setup.c:334
+#: ../src/account-setup-eplugin/exchange-mapi-account-setup.c:378
 msgid "_Authenticate"
 msgstr "_Autentica"
 
-#: ../src/account-setup-eplugin/exchange-mapi-account-setup.c:436
+#: ../src/account-setup-eplugin/exchange-mapi-account-setup.c:388
+msgid "_Use secure connection"
+msgstr "_Utilitza una connexió segura"
+
+#: ../src/account-setup-eplugin/exchange-mapi-account-setup.c:523
 msgid "Personal Folders"
 msgstr "Carpetes personals"
 
-#: ../src/account-setup-eplugin/exchange-mapi-account-setup.c:498
+#: ../src/account-setup-eplugin/exchange-mapi-account-setup.c:658
 msgid "_Location:"
 msgstr "_Ubicació:"
 
-#: ../src/account-setup-eplugin/exchange-mapi-account-settings.c:101
+#: ../src/account-setup-eplugin/exchange-mapi-account-setup.c:775
+#, c-format
+msgid "Failed to create address book '%s': %s"
+msgstr "No s'ha pogut crear la llibreta d'adreces «%s»: %s"
+
+#: ../src/account-setup-eplugin/exchange-mapi-account-setup.c:778
+#, c-format
+msgid "Failed to create address book '%s'"
+msgstr "No s'ha pogut crear la llibreta d'adreces «%s»"
+
+#: ../src/account-setup-eplugin/exchange-mapi-account-setup.c:882
+#, c-format
+msgid "Failed to create calendar '%s': %s"
+msgstr "No s'ha pogut crear el calendari «%s»: %s"
+
+#: ../src/account-setup-eplugin/exchange-mapi-account-setup.c:885
+#, c-format
+msgid "Failed to create calendar '%s'"
+msgstr "No s'ha pogut crear el calendari «%s»"
+
+#: ../src/account-setup-eplugin/exchange-mapi-account-settings.c:100
 msgid "Folder"
 msgstr "Carpeta"
 
-#: ../src/account-setup-eplugin/exchange-mapi-account-settings.c:106
+#: ../src/account-setup-eplugin/exchange-mapi-account-settings.c:105
 msgid "Size"
 msgstr "Mida"
 
-#: ../src/account-setup-eplugin/exchange-mapi-account-settings.c:126
+#: ../src/account-setup-eplugin/exchange-mapi-account-settings.c:128
 msgid "Unable to retrieve folder size information"
 msgstr "No s'ha pogut obtenir la informació sobre la mida de la carpeta"
 
-#: ../src/account-setup-eplugin/exchange-mapi-account-settings.c:147
+#: ../src/account-setup-eplugin/exchange-mapi-account-settings.c:169
+#: ../src/account-setup-eplugin/exchange-mapi-account-settings.c:371
 msgid "Folder Size"
 msgstr "Mida de la carpeta"
 
-#: ../src/account-setup-eplugin/exchange-mapi-account-settings.c:156
-msgid "Fetching folder list ..."
-msgstr "S'està recollint la llista de carpetes..."
+#: ../src/account-setup-eplugin/exchange-mapi-account-settings.c:180
+msgid "Fetching folder list…"
+msgstr "S'està recollint la llista de carpetes…"
 
 #. Miscellaneous settings
-#: ../src/account-setup-eplugin/exchange-mapi-account-settings.c:270
+#: ../src/account-setup-eplugin/exchange-mapi-account-settings.c:356
 msgid "Miscellaneous"
 msgstr "Miscel·lània"
 
-#: ../src/account-setup-eplugin/exchange-mapi-account-settings.c:283
+#: ../src/account-setup-eplugin/exchange-mapi-account-settings.c:369
 msgid "View the size of all Exchange folders"
 msgstr "Mostra la mida de totes les carpetes de l'Exchange"
 
-#: ../src/account-setup-eplugin/exchange-mapi-account-settings.c:285
-msgid "Folders Size"
-msgstr "Mida de les carpetes"
-
-#: ../src/account-setup-eplugin/exchange-mapi-account-settings.c:296
+#: ../src/account-setup-eplugin/exchange-mapi-account-settings.c:382
 #: ../src/account-setup-eplugin/org-gnome-exchange-mapi.eplug.xml.h:1
 msgid "Exchange Settings"
 msgstr "Paràmetres de l'Exchange"
 
-#: ../src/account-setup-eplugin/exchange-mapi-account-settings.c:305
+#: ../src/account-setup-eplugin/exchange-mapi-account-settings.c:391
 msgid "Folder size"
 msgstr "Mida de la carpeta"
 
-#. To translators : This is used to cache the downloaded contacts from GAL.
-#. First %d : Number of contacts cached till now.
-#. Second %d : Total number of contacts which need to be cached.
-#. So (%d/%d) displays the progress.
-#. Example: Caching the GAL entries (1200/50000)...
-#.
-#: ../src/addressbook/e-book-backend-mapi-gal.c:223
-#, c-format
-msgid "Caching the GAL entries (%d/%d)... "
-msgstr ""
-"S'estan carregant les entrades de la llista d'adreces global (GAL) a la "
-"memòria cau (%d de %d)..."
-
-#. To translators : Here Evolution MAPI downloads the entries from the GAL server
-#: ../src/addressbook/e-book-backend-mapi-gal.c:795
-msgid "Downloading GAL entries from server..."
-msgstr ""
-"S'estan baixant les entrades de la llista d'adreces global (GAL) del "
-"servidor..."
-
-#: ../src/calendar/e-cal-backend-mapi.c:116
-#: ../src/calendar/e-cal-backend-mapi.c:1143
-#: ../src/camel/camel-mapi-store.c:568
-msgid "Authentication failed"
-msgstr "Ha fallat l'autenticació"
+#: ../src/addressbook/e-book-backend-mapi.c:555
+msgid "Cannot connect"
+msgstr "No s'ha pogut connectar"
+
+#: ../src/addressbook/e-book-backend-mapi.c:698
+msgid "Searching"
+msgstr "S'està cercant"
+
+#: ../src/addressbook/e-book-backend-mapi.c:2022
+#: ../src/calendar/e-cal-backend-mapi.c:133
+#: ../src/camel/camel-mapi-folder.c:1543 ../src/camel/camel-mapi-folder.c:1564
+msgid "Unknown error"
+msgstr "S'ha produït un error desconegut"
+
+#: ../src/addressbook/e-book-backend-mapi-contacts.c:713
+#: ../src/calendar/e-cal-backend-mapi.c:331
+msgid "Failed to remove public folder"
+msgstr "No s'ha pogut suprimir el directori públic"
+
+#: ../src/addressbook/e-book-backend-mapi-contacts.c:770
+#: ../src/calendar/e-cal-backend-mapi.c:1775
+#: ../src/calendar/e-cal-backend-mapi.c:2267
+msgid "Failed to create item on a server"
+msgstr "No s'ha pogut crear l'element al servidor"
+
+#: ../src/addressbook/e-book-backend-mapi-contacts.c:896
+#: ../src/calendar/e-cal-backend-mapi.c:2008
+msgid "Failed to modify item on a server"
+msgstr "No s'ha pogut modificar l'element en el servidor"
+
+#: ../src/addressbook/e-book-backend-mapi-contacts.c:1043
+#: ../src/addressbook/e-book-backend-mapi-contacts.c:1109
+#: ../src/addressbook/e-book-backend-mapi-contacts.c:1160
+#: ../src/calendar/e-cal-backend-mapi.c:1301
+#: ../src/calendar/e-cal-backend-mapi.c:1322
+msgid "Failed to fetch items from a server"
+msgstr "No s'ha pogut recollir els elements del servidor"
+
+#. Translators : This is used to cache the downloaded contacts from a server.
+#. %d is an index of the contact.
+#: ../src/addressbook/e-book-backend-mapi-contacts.c:1061
+#, c-format
+msgid "Caching contact %d"
+msgstr "S'està desant a la memòria intermèdia el contacte %d"
+
+#. Translators : This is used to cache the downloaded contacts from a server.
+#. The first %d is an index of the contact,
+#. the second %d is total count of conacts on the server.
+#: ../src/addressbook/e-book-backend-mapi-contacts.c:1065
+#, c-format
+msgid "Caching contact %d/%d"
+msgstr "S'està desant a la memòria intermèdia el contacte %d/%d"
+
+#. Translators : This is used to cache the downloaded contacts from GAL.
+#. %d is an index of the GAL entry.
+#: ../src/addressbook/e-book-backend-mapi-gal.c:127
+#, c-format
+msgid "Caching GAL contact %d"
+msgstr "S'està desant a la memòria intermèdia el contacte de la LAG %d"
+
+#. Translators : This is used to cache the downloaded contacts from GAL.
+#. The first %d is an index of the GAL entry,
+#. the second %d is total count of entries in GAL.
+#: ../src/addressbook/e-book-backend-mapi-gal.c:131
+#, c-format
+msgid "Caching GAL contact %d/%d"
+msgstr "S'està desant a la memòria intermèdia el contacte de la LAG %d/%d"
+
+#: ../src/addressbook/e-book-backend-mapi-gal.c:181
+#: ../src/addressbook/e-book-backend-mapi-gal.c:228
+msgid "Failed to fetch GAL entries"
+msgstr "No s'han pogut aconseguir les entrades de la LAG"
 
 #. To translators: This message is displayed on the status bar when calendar/tasks/memo items are being fetched from the server.
-#: ../src/calendar/e-cal-backend-mapi.c:392
+#: ../src/calendar/e-cal-backend-mapi.c:376
 #, c-format
 msgid "Loading items in folder %s"
 msgstr "S'estan carregant els elements a la carpeta %s"
 
-#. FIXME: String : We need to restart evolution-data-server
-#: ../src/calendar/e-cal-backend-mapi.c:624
-#: ../src/calendar/e-cal-backend-mapi.c:635
-#: ../src/calendar/e-cal-backend-mapi.c:663
-#: ../src/calendar/e-cal-backend-mapi.c:725
-#: ../src/calendar/e-cal-backend-mapi.c:735
-msgid "Error fetching changes from the server."
-msgstr "S'ha produït un error en recollir els canvis del servidor."
-
-#: ../src/calendar/e-cal-backend-mapi.c:1063
-#: ../src/calendar/e-cal-backend-mapi.c:1073
-#: ../src/calendar/e-cal-backend-mapi.c:1178
-#: ../src/calendar/e-cal-backend-mapi.c:1260
+#: ../src/calendar/e-cal-backend-mapi.c:766
+#: ../src/calendar/e-cal-backend-mapi.c:792
+#: ../src/calendar/e-cal-backend-mapi.c:839
+#: ../src/calendar/e-cal-backend-mapi.c:918
+#: ../src/calendar/e-cal-backend-mapi.c:941
+#, c-format
+msgid "Failed to fetch changes from a server: %s"
+msgstr "No s'han pogut recollir els canvis del servidor: %s"
+
+#: ../src/calendar/e-cal-backend-mapi.c:771
+#: ../src/calendar/e-cal-backend-mapi.c:797
+#: ../src/calendar/e-cal-backend-mapi.c:844
+#: ../src/calendar/e-cal-backend-mapi.c:923
+#: ../src/calendar/e-cal-backend-mapi.c:946
+msgid "Failed to fetch changes from a server"
+msgstr "No s'han pogut recollir els canvis del servidor"
+
+#: ../src/calendar/e-cal-backend-mapi.c:1435
+msgid "Could not create thread for populating cache"
+msgstr "No s'ha pogut crear el fil per emplenar la memòria cau"
+
+#: ../src/calendar/e-cal-backend-mapi.c:1497
 msgid "Could not create cache file"
 msgstr "No s'ha pogut crear el fitxer de memòria cau"
 
-#: ../src/calendar/e-cal-backend-mapi.c:1189
-msgid "Could not create thread for populating cache"
-msgstr "No s'ha pogut crear el fil per emplenar la memòria cau"
-
-#: ../src/calendar/e-cal-backend-mapi.c:1610
+#: ../src/calendar/e-cal-backend-mapi.c:1902
 msgid ""
 "Support for modifying single instances of a recurring appointment is not yet "
 "implemented. No change was made to the appointment on the server."
@@ -174,140 +252,148 @@
 "individuals d'una cita periòdica. No s'ha fet cap canvi a la cita al "
 "servidor."
 
-#: ../src/camel/camel-mapi-folder.c:493
+#: ../src/calendar/e-cal-backend-mapi.c:2515
+msgid "Failed to get Free/Busy data"
+msgstr "No s'ha pogut obtenir les dades de lliure/ocupat"
+
+#: ../src/camel/camel-mapi-folder.c:356
 #, c-format
 msgid "Updating local summary cache for new messages in %s"
 msgstr ""
 "S'està actualitzant la memòria cau del resum local dels missatges nous a %s"
 
-#: ../src/camel/camel-mapi-folder.c:725
+#: ../src/camel/camel-mapi-folder.c:592
 #, c-format
 msgid "Retrieving message IDs from server for %s"
 msgstr ""
 "S'estan obtenint els identificadors dels missatges del servidor per a %s"
 
-#: ../src/camel/camel-mapi-folder.c:747
+#: ../src/camel/camel-mapi-folder.c:622
 #, c-format
 msgid "Removing deleted messages from cache in %s"
 msgstr "S'estan eliminant els missatges suprimits de la memòria cau a %s"
 
 #. TODO : Check for online state
-#: ../src/camel/camel-mapi-folder.c:1018
-msgid "Fetching summary information for new messages in"
-msgstr "S'està recollint la informació de resum dels missatges nous a"
+#: ../src/camel/camel-mapi-folder.c:952
+#, c-format
+msgid "Fetching summary information for new messages in %s"
+msgstr "S'està recollint la informació de resum dels missatges nous a %s"
 
-#: ../src/camel/camel-mapi-folder.c:1120 ../src/camel/camel-mapi-folder.c:1884
-#: ../src/camel/camel-mapi-folder.c:1892
+#: ../src/camel/camel-mapi-folder.c:1075 ../src/camel/camel-mapi-folder.c:1210
+#: ../src/camel/camel-mapi-folder.c:1220
+#, c-format
 msgid "This message is not available in offline mode."
 msgstr "Aquest missatge no està disponible en mode fora de línia."
 
-#: ../src/camel/camel-mapi-folder.c:1133
+#: ../src/camel/camel-mapi-folder.c:1092
+#, c-format
+msgid "Fetching items failed: %s"
+msgstr "Ha fallat la recol·lecció dels elements: %s"
+
+#: ../src/camel/camel-mapi-folder.c:1097
 msgid "Fetching items failed"
 msgstr "Ha fallat la recol·lecció d'elements"
 
-#: ../src/camel/camel-mapi-folder.c:1848
+#: ../src/camel/camel-mapi-folder.c:1170
 #, c-format
-msgid ""
-"Cannot get message: %s\n"
-"  %s"
-msgstr ""
-"No s'ha pogut obtenir el missatge: %s\n"
-"  %s"
+msgid "Cannot get message %s: %s"
+msgstr "No s'ha pogut obtenir el missatge %s: %s"
 
-#: ../src/camel/camel-mapi-folder.c:1848
+#: ../src/camel/camel-mapi-folder.c:1171
 msgid "No such message"
 msgstr "No hi ha tal missatge"
 
-#: ../src/camel/camel-mapi-folder.c:1860
-msgid "Message fetching cancelled by user."
-msgstr "L'usuari ha cancel·lat la recollida del missatge."
-
-#: ../src/camel/camel-mapi-folder.c:1867
-#, c-format
-msgid "Cannot get message %s: %s"
-msgstr "No s'ha pogut obtenir el missatge %s: %s"
-
-#: ../src/camel/camel-mapi-folder.c:1915 ../src/camel/camel-mapi-folder.c:1924
+#: ../src/camel/camel-mapi-folder.c:1246
+#, c-format
+msgid "Could not get message: %s"
+msgstr "No s'ha pogut obtenir el missatge: %s"
+
+#: ../src/camel/camel-mapi-folder.c:1252 ../src/camel/camel-mapi-folder.c:1265
+#, c-format
 msgid "Could not get message"
 msgstr "No s'ha pogut obtenir el missatge"
 
-#: ../src/camel/camel-mapi-folder.c:2210
+#: ../src/camel/camel-mapi-folder.c:1402
+#, c-format
+msgid "Failed to empty Trash: %s"
+msgstr "No s'ha pogut buidar la paperera: %s"
+
+#: ../src/camel/camel-mapi-folder.c:1407
+msgid "Failed to empty Trash"
+msgstr "No s'ha pogut buidar la paperera"
+
+#: ../src/camel/camel-mapi-folder.c:1626
 #, c-format
 msgid "Cannot append message to folder '%s'"
 msgstr "No es pot afegir el missatge a la carpeta «%s»"
 
-#: ../src/camel/camel-mapi-folder.c:2217
+#: ../src/camel/camel-mapi-folder.c:1634 ../src/camel/camel-mapi-folder.c:1659
+#, c-format
 msgid "Offline."
 msgstr "Fora de línia."
 
-#: ../src/camel/camel-mapi-folder.c:2337
+#: ../src/camel/camel-mapi-folder.c:1804
 #, c-format
 msgid "Could not load summary for %s"
 msgstr "No s'ha pogut carregar el resum per a %s"
 
-#: ../src/camel/camel-mapi-provider.c:51
+#: ../src/camel/camel-mapi-provider.c:44
 msgid "Checking for new mail"
 msgstr "S'està comprovant si hi ha correu nou"
 
-#: ../src/camel/camel-mapi-provider.c:53
+#: ../src/camel/camel-mapi-provider.c:46
 msgid "C_heck for new messages in all folders"
 msgstr "_Comprova si hi ha correu nou a totes les carpetes"
 
-#: ../src/camel/camel-mapi-provider.c:57
+#: ../src/camel/camel-mapi-provider.c:50
 msgid "Options"
 msgstr "Opcions"
 
-#: ../src/camel/camel-mapi-provider.c:59
+#: ../src/camel/camel-mapi-provider.c:52
 msgid "Automatically synchroni_ze account locally"
 msgstr "Sincronit_za el compte localment de manera automàtica"
 
 #. i18n: copy from evolution:camel-imap-provider.c
-#: ../src/camel/camel-mapi-provider.c:62
+#: ../src/camel/camel-mapi-provider.c:55
 msgid "_Apply filters to new messages in Inbox on this server"
 msgstr ""
 "_Aplica els filtres als missatges nous de la safata d'entrada en aquest "
 "servidor"
 
-#: ../src/camel/camel-mapi-provider.c:64
+#: ../src/camel/camel-mapi-provider.c:57
 msgid "Check new messages for _Junk contents"
 msgstr "Comprova si els missatges són _brossa"
 
-#: ../src/camel/camel-mapi-provider.c:66
+#: ../src/camel/camel-mapi-provider.c:59
 msgid "Only check for Junk messag_es in the Inbox folder"
 msgstr "Només comprova el corre_u brossa a la safata d'entrada"
 
-#: ../src/camel/camel-mapi-provider.c:78
-msgid "For accessing Microsoft Exchange / OpenChange servers using MAPI"
+#: ../src/camel/camel-mapi-provider.c:70
+msgid "For accessing Microsoft Exchange/OpenChange servers using MAPI"
 msgstr ""
-"Per accedir a servidors Exchange de Microsoft / OpenChange a través del MAPI"
+"Per accedir a servidors Exchange de Microsoft/OpenChange a través del MAPI"
 
-#: ../src/camel/camel-mapi-provider.c:93
+#: ../src/camel/camel-mapi-provider.c:85
 msgid "Password"
 msgstr "Contrasenya"
 
-#: ../src/camel/camel-mapi-provider.c:94
+#: ../src/camel/camel-mapi-provider.c:86
 msgid ""
-"This option will connect to the Openchange server using a plaintext password."
+"This option will connect to the OpenChange server using a plaintext password."
 msgstr ""
-"Aquesta opció us connectarà al servidor OpenChange a través d'una "
-"contrasenya de text pla."
-
-#: ../src/camel/camel-mapi-store.c:63
-msgid "Favorites"
-msgstr "Preferits"
-
-#: ../src/camel/camel-mapi-store.c:64
-msgid "All Public Folders"
-msgstr "Totes les carpetes públiques"
-
-#: ../src/camel/camel-mapi-store.c:313 ../src/camel/camel-mapi-transport.c:128
+"Aquesta opció us connectarà al servidor OpenChange amb una contrasenya de "
+"text pla."
+
+#. Translators: The %s is replaced with a server's host name
+#: ../src/camel/camel-mapi-store.c:315 ../src/camel/camel-mapi-transport.c:133
 #, c-format
 msgid "Exchange MAPI server %s"
 msgstr "Servidor MAPI Exchange %s"
 
 #. To translators : Example string : Exchange MAPI service for
 #. _username_ on _server host name__
-#: ../src/camel/camel-mapi-store.c:317 ../src/camel/camel-mapi-transport.c:130
+#. Translators: The first %s is replaced with a user name, the second with a server's host name
+#: ../src/camel/camel-mapi-store.c:319 ../src/camel/camel-mapi-transport.c:136
 #, c-format
 msgid "Exchange MAPI service for %s on %s"
 msgstr "Servei MAPI Exchange per a %s a %s"
@@ -316,57 +402,188 @@
 #. for prompting the user if it is available.
 #. Second %s is : Username.
 #. Third %s is : Server host name.
-#: ../src/camel/camel-mapi-store.c:355
+#: ../src/camel/camel-mapi-store.c:361
 #, c-format
 msgid "%s Please enter the MAPI password for %s@%s"
 msgstr "%s Introduïu la contrasenya MAPI per a %s@%s"
 
-#: ../src/camel/camel-mapi-store.c:368
+#: ../src/camel/camel-mapi-store.c:376
+#, c-format
 msgid "You did not enter a password."
 msgstr "No heu introduït cap contrasenya."
 
-#: ../src/camel/camel-mapi-store.c:376
-#, c-format
-msgid "Unable to authenticate to Exchange MAPI server."
-msgstr "No s'ha pogut autenticar al servidor MAPI Exchange."
-
-#: ../src/camel/camel-mapi-store.c:552
+#: ../src/camel/camel-mapi-store.c:384
+#, c-format
+msgid "Unable to authenticate to Exchange MAPI server: %s"
+msgstr "No s'ha pogut autenticar al servidor MAPI Exchange: %s"
+
+#: ../src/camel/camel-mapi-store.c:387
+msgid "Unable to authenticate to Exchange MAPI server"
+msgstr "No s'ha pogut autenticar al servidor MAPI Exchange"
+
+#: ../src/camel/camel-mapi-store.c:564
+#, c-format
 msgid "Cannot create MAPI folders in offline mode."
 msgstr "No es poden crear carpetes MAPI en mode fora de línia."
 
-#: ../src/camel/camel-mapi-store.c:557
+#: ../src/camel/camel-mapi-store.c:571
 #, c-format
-msgid "Cannot create new folder `%s'"
+msgid "Cannot create new folder '%s'"
 msgstr "No s'ha pogut crear la carpeta nova «%s»"
 
-#: ../src/camel/camel-mapi-store.c:692
-#, c-format
-msgid "Cannot rename MAPI folder `%s'. Folder does not exist."
+#: ../src/camel/camel-mapi-store.c:585
+#, c-format
+msgid "Authentication failed"
+msgstr "Ha fallat l'autenticació"
+
+#: ../src/camel/camel-mapi-store.c:610
+#, c-format
+msgid "Cannot create folder '%s': %s"
+msgstr "No s'ha pogut crear la carpeta «%s»: %s"
+
+#: ../src/camel/camel-mapi-store.c:615
+#, c-format
+msgid "Cannot create folder '%s'"
+msgstr "No s'ha pogut crear la carpeta «%s»"
+
+#: ../src/camel/camel-mapi-store.c:708
+#, c-format
+msgid "Cannot remove folder '%s': %s"
+msgstr "No es pot suprimir la carpeta «%s»: %s"
+
+#: ../src/camel/camel-mapi-store.c:715
+#, c-format
+msgid "Cannot remove folder '%s'"
+msgstr "No es pot suprimir la carpeta «%s»"
+
+#: ../src/camel/camel-mapi-store.c:805
+#, c-format
+msgid "Cannot rename MAPI folder '%s'. Folder does not exist."
 msgstr ""
 "No es pot canviar el nom de la carpeta MAPI «%s». No existeix la carpeta."
 
-#: ../src/camel/camel-mapi-store.c:703
+#: ../src/camel/camel-mapi-store.c:817
 #, c-format
-msgid "Cannot rename MAPI default folder `%s' to `%s'."
+msgid "Cannot rename MAPI default folder '%s' to '%s'."
 msgstr "No es pot canviar el nom de la carpeta MAPI predeterminada «%s» a «%s»."
 
-#: ../src/camel/camel-mapi-store.c:727 ../src/camel/camel-mapi-store.c:742
-#: ../src/camel/camel-mapi-store.c:791
+#. Translators: '%s to %s' is current name of the folder and new name of the folder.
+#: ../src/camel/camel-mapi-store.c:844 ../src/camel/camel-mapi-store.c:869
+#: ../src/camel/camel-mapi-store.c:931
 #, c-format
-msgid "Cannot rename MAPI folder `%s' to `%s'"
+msgid "Cannot rename MAPI folder '%s' to '%s'"
 msgstr "No es pot canviar el nom de la carpeta MAPI «%s» a «%s»"
 
-#: ../src/camel/camel-mapi-store.c:1367
+#. Translators: '%s to %s' is current name of the folder and new name of the folder.
+#. The last '%s' is a detailed error message.
+#: ../src/camel/camel-mapi-store.c:862 ../src/camel/camel-mapi-store.c:925
+#, c-format
+msgid "Cannot rename MAPI folder '%s' to '%s': %s"
+msgstr "No es pot canviar el nom de la carpeta MAPI «%s» a «%s»: %s"
+
+#: ../src/camel/camel-mapi-store.c:1494
+#, c-format
 msgid "Folder list not available in offline mode."
 msgstr "La llista de carpetes no està disponible en mode fora de línia."
 
-#. Fixme : Set a better error message. Would be helful in troubleshooting.
-#: ../src/camel/camel-mapi-transport.c:116
+#: ../src/camel/camel-mapi-transport.c:99
+#: ../src/camel/camel-mapi-transport.c:120
+#, c-format
 msgid "Could not send message."
 msgstr "No s'ha pogut enviar el missatge."
 
-#~ msgid "Global Address List / Active Directory"
-#~ msgstr "Global Address List / Active Directory"
+#: ../src/camel/camel-mapi-transport.c:115
+#, c-format
+msgid "Could not send message: %s"
+msgstr "No s'ha pogut enviar el missatge: %s"
+
+#: ../src/libexchangemapi/exchange-mapi-connection.c:107
+msgid "Failed to login into the server"
+msgstr "No s'ha pogut autenticar al servidor"
+
+#: ../src/libexchangemapi/exchange-mapi-connection.c:108
+msgid "Cannot create more sessions, session limit was reached"
+msgstr ""
+"No s'ha pogut crear més sessions, s'ha arribat al límit de sessions permeses"
+
+#: ../src/libexchangemapi/exchange-mapi-connection.c:109
+msgid "User cancelled operation"
+msgstr "L'usuari ha cancel·lat l'operació"
+
+#: ../src/libexchangemapi/exchange-mapi-connection.c:110
+msgid "Unable to abort"
+msgstr "No s'ha pogut avortar"
+
+#: ../src/libexchangemapi/exchange-mapi-connection.c:111
+msgid "Network error"
+msgstr "S'ha produït un error de xarxa"
+
+#: ../src/libexchangemapi/exchange-mapi-connection.c:112
+msgid "Disk error"
+msgstr "S'ha produït un error de disc"
+
+#: ../src/libexchangemapi/exchange-mapi-connection.c:113
+msgid "Password change required"
+msgstr "Cal canviar la contrasenya"
+
+#: ../src/libexchangemapi/exchange-mapi-connection.c:114
+msgid "Password expired"
+msgstr "La contrasenya ha expirat"
+
+#: ../src/libexchangemapi/exchange-mapi-connection.c:115
+msgid "Invalid workstation account"
+msgstr "El compte de l'estació de treball no és vàlid"
+
+#: ../src/libexchangemapi/exchange-mapi-connection.c:116
+msgid "Invalid access time"
+msgstr "L'hora d'accés no és vàlida"
+
+#: ../src/libexchangemapi/exchange-mapi-connection.c:117
+msgid "Account is disabled"
+msgstr "El compte està inhabilitat"
+
+#: ../src/libexchangemapi/exchange-mapi-connection.c:118
+msgid "End of session"
+msgstr "S'ha finalitzat la sessió"
+
+#: ../src/libexchangemapi/exchange-mapi-connection.c:126
+#, c-format
+msgid "MAPI error %s (0x%x) occurred"
+msgstr "S'ha produït l'error %s (0x%x) de MAPI"
+
+#. Translators: The first '%s' is replaced with an error context,
+#. aka where the error occurred, the second '%s' is replaced with
+#. the error message.
+#: ../src/libexchangemapi/exchange-mapi-connection.c:136
+#, c-format
+msgctxt "EXCHANGEMAPI_ERROR"
+msgid "%s: %s"
+msgstr "%s: %s"
+
+#: ../src/libexchangemapi/exchange-mapi-connection.c:3282
+msgid "All Public Folders"
+msgstr "Totes les carpetes públiques"
+
+#~ msgid "Folders Size"
+#~ msgstr "Mida de les carpetes"
+
+#~ msgid "Downloading GAL entries from server..."
+#~ msgstr ""
+#~ "S'estan baixant les entrades de la llista d'adreces global (GAL) del "
+#~ "servidor..."
+
+#~ msgid ""
+#~ "Cannot get message: %s\n"
+#~ "  %s"
+#~ msgstr ""
+#~ "No s'ha pogut obtenir el missatge: %s\n"
+#~ "  %s"
+
+#~ msgid "Message fetching cancelled by user."
+#~ msgstr "L'usuari ha cancel·lat la recollida del missatge."
+
+#~ msgid "Favorites"
+#~ msgstr "Preferits"
 
 #~ msgid "_Global Catalog server name:"
 #~ msgstr "Nom del servidor del _Global Catalog"

=== modified file 'po/[e-mail]'
--- po/[e-mail]	2010-09-14 20:50:55 +0000
+++ po/[e-mail]	2011-01-29 12:46:35 +0000
@@ -8,16 +8,23 @@
 msgstr ""
 "Project-Id-Version: evolution-mapi\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-22 00:00+0200\n"
+"POT-Creation-Date: 2010-10-26 11:01+0200\n"
 "PO-Revision-Date: 2010-02-28 20:25+0100\n"
 "Last-Translator: David Planella <[e-mail]>\n"
 "Language-Team: Catalan <[e-mail]>\n"
+"Language: ca\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../src/account-setup-eplugin/exchange-mapi-account-listener.c:632
-#: ../src/account-setup-eplugin/exchange-mapi-account-setup.c:233
+#: ../src/account-setup-eplugin/exchange-mapi-account-listener.c:685
+#: ../src/account-setup-eplugin/exchange-mapi-account-listener.c:687
+#, fuzzy
+msgid "Global Address List"
+msgstr "Global Address List / Active Directory"
+
+#: ../src/account-setup-eplugin/exchange-mapi-account-listener.c:1003
+#: ../src/account-setup-eplugin/exchange-mapi-account-setup.c:229
 #, c-format
 msgid "Enter Password for %s@%s"
 msgstr "Introduïu la contrasenya per a %s@%s"
@@ -26,19 +33,20 @@
 #. using GtkEntryCompletion in the username gtkentry. But plugins
 #. as of now does not have access to it
 #. TODO : Fix strings
-#: ../src/account-setup-eplugin/exchange-mapi-account-setup.c:138
+#: ../src/account-setup-eplugin/exchange-mapi-account-setup.c:133
 msgid "Select username"
 msgstr "Seleccioneu el nom d'usuari"
 
-#: ../src/account-setup-eplugin/exchange-mapi-account-setup.c:148
+#: ../src/account-setup-eplugin/exchange-mapi-account-setup.c:143
 msgid "Full name"
 msgstr "Nom complet"
 
-#: ../src/account-setup-eplugin/exchange-mapi-account-setup.c:153
-msgid "User name"
+#: ../src/account-setup-eplugin/exchange-mapi-account-setup.c:148
+#, fuzzy
+msgid "Username"
 msgstr "Nom d'usuari"
 
-#: ../src/account-setup-eplugin/exchange-mapi-account-setup.c:222
+#: ../src/account-setup-eplugin/exchange-mapi-account-setup.c:217
 msgid ""
 "Server, username and domain name cannot be empty. Please fill them with "
 "correct values."
@@ -46,126 +54,205 @@
 "El servidor, el nom d'usuari i el nom del domini no poden ser buits. Hauríeu "
 "d'escriure-hi valors correctes."
 
-#: ../src/account-setup-eplugin/exchange-mapi-account-setup.c:260
+#: ../src/account-setup-eplugin/exchange-mapi-account-setup.c:273
 msgid "Authentication finished successfully."
 msgstr "Ha finalitzat satisfactòriament l'autenticació."
 
-#: ../src/account-setup-eplugin/exchange-mapi-account-setup.c:266
-#: ../src/account-setup-eplugin/exchange-mapi-account-setup.c:276
+#: ../src/account-setup-eplugin/exchange-mapi-account-setup.c:279
+#: ../src/account-setup-eplugin/exchange-mapi-account-setup.c:290
 msgid "Authentication failed."
 msgstr "Ha fallat l'autenticació."
 
-#: ../src/account-setup-eplugin/exchange-mapi-account-setup.c:331
+#: ../src/account-setup-eplugin/exchange-mapi-account-setup.c:368
 msgid "_Domain name:"
 msgstr "Nom del _domini:"
 
-#: ../src/account-setup-eplugin/exchange-mapi-account-setup.c:341
+#: ../src/account-setup-eplugin/exchange-mapi-account-setup.c:378
 msgid "_Authenticate"
 msgstr "_Autentica"
 
-#: ../src/account-setup-eplugin/exchange-mapi-account-setup.c:479
+#: ../src/account-setup-eplugin/exchange-mapi-account-setup.c:388
+msgid "_Use secure connection"
+msgstr ""
+
+#: ../src/account-setup-eplugin/exchange-mapi-account-setup.c:523
 msgid "Personal Folders"
 msgstr "Carpetes personals"
 
-#: ../src/account-setup-eplugin/exchange-mapi-account-setup.c:599
+#: ../src/account-setup-eplugin/exchange-mapi-account-setup.c:658
 msgid "_Location:"
 msgstr "_Ubicació:"
 
-#: ../src/account-setup-eplugin/exchange-mapi-account-settings.c:101
+#: ../src/account-setup-eplugin/exchange-mapi-account-setup.c:775
+#, c-format
+msgid "Failed to create address book '%s': %s"
+msgstr ""
+
+#: ../src/account-setup-eplugin/exchange-mapi-account-setup.c:778
+#, c-format
+msgid "Failed to create address book '%s'"
+msgstr ""
+
+#: ../src/account-setup-eplugin/exchange-mapi-account-setup.c:882
+#, c-format
+msgid "Failed to create calendar '%s': %s"
+msgstr ""
+
+#: ../src/account-setup-eplugin/exchange-mapi-account-setup.c:885
+#, c-format
+msgid "Failed to create calendar '%s'"
+msgstr ""
+
+#: ../src/account-setup-eplugin/exchange-mapi-account-settings.c:100
 msgid "Folder"
 msgstr "Carpeta"
 
-#: ../src/account-setup-eplugin/exchange-mapi-account-settings.c:106
+#: ../src/account-setup-eplugin/exchange-mapi-account-settings.c:105
 msgid "Size"
 msgstr "Mida"
 
-#: ../src/account-setup-eplugin/exchange-mapi-account-settings.c:126
+#: ../src/account-setup-eplugin/exchange-mapi-account-settings.c:128
 msgid "Unable to retrieve folder size information"
 msgstr "No s'ha pogut obtindre la informació sobre la mida de la carpeta"
 
-#: ../src/account-setup-eplugin/exchange-mapi-account-settings.c:147
+#: ../src/account-setup-eplugin/exchange-mapi-account-settings.c:169
+#: ../src/account-setup-eplugin/exchange-mapi-account-settings.c:371
 msgid "Folder Size"
 msgstr "Mida de la carpeta"
 
-#: ../src/account-setup-eplugin/exchange-mapi-account-settings.c:156
-msgid "Fetching folder list ..."
+#: ../src/account-setup-eplugin/exchange-mapi-account-settings.c:180
+#, fuzzy
+msgid "Fetching folder list…"
 msgstr "S'està recollint la llista de carpetes..."
 
 #. Miscellaneous settings
-#: ../src/account-setup-eplugin/exchange-mapi-account-settings.c:275
+#: ../src/account-setup-eplugin/exchange-mapi-account-settings.c:356
 msgid "Miscellaneous"
 msgstr "Miscel·lània"
 
-#: ../src/account-setup-eplugin/exchange-mapi-account-settings.c:288
+#: ../src/account-setup-eplugin/exchange-mapi-account-settings.c:369
 msgid "View the size of all Exchange folders"
 msgstr "Mostra la mida de totes les carpetes de l'Exchange"
 
-#: ../src/account-setup-eplugin/exchange-mapi-account-settings.c:290
-msgid "Folders Size"
-msgstr "Mida de les carpetes"
-
-#: ../src/account-setup-eplugin/exchange-mapi-account-settings.c:301
+#: ../src/account-setup-eplugin/exchange-mapi-account-settings.c:382
 #: ../src/account-setup-eplugin/org-gnome-exchange-mapi.eplug.xml.h:1
 msgid "Exchange Settings"
 msgstr "Paràmetres de l'Exchange"
 
-#: ../src/account-setup-eplugin/exchange-mapi-account-settings.c:310
+#: ../src/account-setup-eplugin/exchange-mapi-account-settings.c:391
 msgid "Folder size"
 msgstr "Mida de la carpeta"
 
-#. To translators : This is used to cache the downloaded contacts from GAL.
-#. First %d : Number of contacts cached till now.
-#. Second %d : Total number of contacts which need to be cached.
-#. So (%d/%d) displays the progress.
-#. Example: Caching the GAL entries (1200/50000)...
-#.
-#: ../src/addressbook/e-book-backend-mapi-gal.c:221
-#, c-format
-msgid "Caching the GAL entries (%d/%d)... "
+#: ../src/addressbook/e-book-backend-mapi.c:555
+msgid "Cannot connect"
+msgstr ""
+
+#: ../src/addressbook/e-book-backend-mapi.c:698
+msgid "Searching"
+msgstr ""
+
+#: ../src/addressbook/e-book-backend-mapi.c:2022
+#: ../src/calendar/e-cal-backend-mapi.c:133
+#: ../src/camel/camel-mapi-folder.c:1543 ../src/camel/camel-mapi-folder.c:1564
+msgid "Unknown error"
+msgstr ""
+
+#: ../src/addressbook/e-book-backend-mapi-contacts.c:713
+#: ../src/calendar/e-cal-backend-mapi.c:331
+msgid "Failed to remove public folder"
+msgstr ""
+
+#: ../src/addressbook/e-book-backend-mapi-contacts.c:770
+#: ../src/calendar/e-cal-backend-mapi.c:1775
+#: ../src/calendar/e-cal-backend-mapi.c:2267
+#, fuzzy
+msgid "Failed to create item on a server"
+msgstr "No s'ha pogut autenticar al servidor MAPI Exchange."
+
+#: ../src/addressbook/e-book-backend-mapi-contacts.c:896
+#: ../src/calendar/e-cal-backend-mapi.c:2008
+msgid "Failed to modify item on a server"
+msgstr ""
+
+#: ../src/addressbook/e-book-backend-mapi-contacts.c:1043
+#: ../src/addressbook/e-book-backend-mapi-contacts.c:1109
+#: ../src/addressbook/e-book-backend-mapi-contacts.c:1160
+#: ../src/calendar/e-cal-backend-mapi.c:1301
+#: ../src/calendar/e-cal-backend-mapi.c:1322
+#, fuzzy
+msgid "Failed to fetch items from a server"
+msgstr "S'ha produït un error en recollir els canvis del servidor."
+
+#. Translators : This is used to cache the downloaded contacts from a server.
+#. %d is an index of the contact.
+#: ../src/addressbook/e-book-backend-mapi-contacts.c:1061
+#, c-format
+msgid "Caching contact %d"
+msgstr ""
+
+#. Translators : This is used to cache the downloaded contacts from a server.
+#. The first %d is an index of the contact,
+#. the second %d is total count of conacts on the server.
+#: ../src/addressbook/e-book-backend-mapi-contacts.c:1065
+#, c-format
+msgid "Caching contact %d/%d"
+msgstr ""
+
+#. Translators : This is used to cache the downloaded contacts from GAL.
+#. %d is an index of the GAL entry.
+#: ../src/addressbook/e-book-backend-mapi-gal.c:127
+#, c-format
+msgid "Caching GAL contact %d"
+msgstr ""
+
+#. Translators : This is used to cache the downloaded contacts from GAL.
+#. The first %d is an index of the GAL entry,
+#. the second %d is total count of entries in GAL.
+#: ../src/addressbook/e-book-backend-mapi-gal.c:131
+#, fuzzy, c-format
+msgid "Caching GAL contact %d/%d"
 msgstr ""
 "S'estan carregant les entrades de la llista d'adreces global (GAL) a la "
 "memòria cau (%d de %d)..."
 
-#. To translators : Here Evolution MAPI downloads the entries from the GAL server
-#: ../src/addressbook/e-book-backend-mapi-gal.c:793
-msgid "Downloading GAL entries from server..."
+#: ../src/addressbook/e-book-backend-mapi-gal.c:181
+#: ../src/addressbook/e-book-backend-mapi-gal.c:228
+msgid "Failed to fetch GAL entries"
 msgstr ""
-"S'estan baixant les entrades de la llista d'adreces global (GAL) del "
-"servidor..."
-
-#: ../src/calendar/e-cal-backend-mapi.c:191
-#: ../src/calendar/e-cal-backend-mapi.c:1218
-#: ../src/camel/camel-mapi-store.c:568
-msgid "Authentication failed"
-msgstr "Ha fallat l'autenticació"
 
 #. To translators: This message is displayed on the status bar when calendar/tasks/memo items are being fetched from the server.
-#: ../src/calendar/e-cal-backend-mapi.c:467
+#: ../src/calendar/e-cal-backend-mapi.c:376
 #, c-format
 msgid "Loading items in folder %s"
 msgstr "S'estan carregant els elements a la carpeta %s"
 
-#. FIXME: String : We need to restart evolution-data-server
-#: ../src/calendar/e-cal-backend-mapi.c:699
-#: ../src/calendar/e-cal-backend-mapi.c:710
-#: ../src/calendar/e-cal-backend-mapi.c:738
-#: ../src/calendar/e-cal-backend-mapi.c:800
-#: ../src/calendar/e-cal-backend-mapi.c:810
-msgid "Error fetching changes from the server."
-msgstr "S'ha produït un error en recollir els canvis del servidor."
-
-#: ../src/calendar/e-cal-backend-mapi.c:1138
-#: ../src/calendar/e-cal-backend-mapi.c:1148
-#: ../src/calendar/e-cal-backend-mapi.c:1253
-#: ../src/calendar/e-cal-backend-mapi.c:1335
+#: ../src/calendar/e-cal-backend-mapi.c:766
+#: ../src/calendar/e-cal-backend-mapi.c:792
+#: ../src/calendar/e-cal-backend-mapi.c:839
+#: ../src/calendar/e-cal-backend-mapi.c:918
+#: ../src/calendar/e-cal-backend-mapi.c:941
+#, fuzzy, c-format
+msgid "Failed to fetch changes from a server: %s"
+msgstr "S'ha produït un error en recollir els canvis del servidor."
+
+#: ../src/calendar/e-cal-backend-mapi.c:771
+#: ../src/calendar/e-cal-backend-mapi.c:797
+#: ../src/calendar/e-cal-backend-mapi.c:844
+#: ../src/calendar/e-cal-backend-mapi.c:923
+#: ../src/calendar/e-cal-backend-mapi.c:946
+#, fuzzy
+msgid "Failed to fetch changes from a server"
+msgstr "S'ha produït un error en recollir els canvis del servidor."
+
+#: ../src/calendar/e-cal-backend-mapi.c:1435
+msgid "Could not create thread for populating cache"
+msgstr "No s'ha pogut crear el fil per emplenar la memòria cau"
+
+#: ../src/calendar/e-cal-backend-mapi.c:1497
 msgid "Could not create cache file"
 msgstr "No s'ha pogut crear el fitxer de memòria cau"
 
-#: ../src/calendar/e-cal-backend-mapi.c:1264
-msgid "Could not create thread for populating cache"
-msgstr "No s'ha pogut crear el fil per emplenar la memòria cau"
-
-#: ../src/calendar/e-cal-backend-mapi.c:1698
+#: ../src/calendar/e-cal-backend-mapi.c:1902
 msgid ""
 "Support for modifying single instances of a recurring appointment is not yet "
 "implemented. No change was made to the appointment on the server."
@@ -174,140 +261,150 @@
 "individuals d'una cita periòdica. No s'ha fet cap canvi a la cita al "
 "servidor."
 
-#: ../src/camel/camel-mapi-folder.c:493
+#: ../src/calendar/e-cal-backend-mapi.c:2515
+msgid "Failed to get Free/Busy data"
+msgstr ""
+
+#: ../src/camel/camel-mapi-folder.c:356
 #, c-format
 msgid "Updating local summary cache for new messages in %s"
 msgstr ""
 "S'està actualitzant la memòria cau del resum local dels missatges nous a %s"
 
-#: ../src/camel/camel-mapi-folder.c:723
+#: ../src/camel/camel-mapi-folder.c:592
 #, c-format
 msgid "Retrieving message IDs from server for %s"
 msgstr ""
 "S'estan obtenint els identificadors dels missatges del servidor per a %s"
 
-#: ../src/camel/camel-mapi-folder.c:745
+#: ../src/camel/camel-mapi-folder.c:622
 #, c-format
 msgid "Removing deleted messages from cache in %s"
 msgstr "S'estan eliminant els missatges suprimits de la memòria cau a %s"
 
 #. TODO : Check for online state
-#: ../src/camel/camel-mapi-folder.c:1013
-msgid "Fetching summary information for new messages in"
+#: ../src/camel/camel-mapi-folder.c:952
+#, fuzzy, c-format
+msgid "Fetching summary information for new messages in %s"
 msgstr "S'està recollint la informació de resum dels missatges nous a"
 
-#: ../src/camel/camel-mapi-folder.c:1115 ../src/camel/camel-mapi-folder.c:1869
-#: ../src/camel/camel-mapi-folder.c:1877
+#: ../src/camel/camel-mapi-folder.c:1075 ../src/camel/camel-mapi-folder.c:1210
+#: ../src/camel/camel-mapi-folder.c:1220
+#, c-format
 msgid "This message is not available in offline mode."
 msgstr "Este missatge no està disponible en mode fora de línia."
 
-#: ../src/camel/camel-mapi-folder.c:1128
+#: ../src/camel/camel-mapi-folder.c:1092
+#, fuzzy, c-format
+msgid "Fetching items failed: %s"
+msgstr "Ha fallat la recol·lecció d'elements"
+
+#: ../src/camel/camel-mapi-folder.c:1097
 msgid "Fetching items failed"
 msgstr "Ha fallat la recol·lecció d'elements"
 
-#: ../src/camel/camel-mapi-folder.c:1833
+#: ../src/camel/camel-mapi-folder.c:1170
 #, c-format
-msgid ""
-"Cannot get message: %s\n"
-"  %s"
-msgstr ""
-"No s'ha pogut obtindre el missatge: %s\n"
-"  %s"
+msgid "Cannot get message %s: %s"
+msgstr "No s'ha pogut obtindre el missatge %s: %s"
 
-#: ../src/camel/camel-mapi-folder.c:1833
+#: ../src/camel/camel-mapi-folder.c:1171
 msgid "No such message"
 msgstr "No hi ha tal missatge"
 
-#: ../src/camel/camel-mapi-folder.c:1845
-msgid "Message fetching cancelled by user."
-msgstr "L'usuari ha cancel·lat la recollida del missatge."
+#: ../src/camel/camel-mapi-folder.c:1246
+#, fuzzy, c-format
+msgid "Could not get message: %s"
+msgstr "No s'ha pogut obtindre el missatge"
 
-#: ../src/camel/camel-mapi-folder.c:1852
+#: ../src/camel/camel-mapi-folder.c:1252 ../src/camel/camel-mapi-folder.c:1265
 #, c-format
-msgid "Cannot get message %s: %s"
-msgstr "No s'ha pogut obtindre el missatge %s: %s"
-
-#: ../src/camel/camel-mapi-folder.c:1900 ../src/camel/camel-mapi-folder.c:1909
 msgid "Could not get message"
 msgstr "No s'ha pogut obtindre el missatge"
 
-#: ../src/camel/camel-mapi-folder.c:2195
+#: ../src/camel/camel-mapi-folder.c:1402
+#, c-format
+msgid "Failed to empty Trash: %s"
+msgstr ""
+
+#: ../src/camel/camel-mapi-folder.c:1407
+msgid "Failed to empty Trash"
+msgstr ""
+
+#: ../src/camel/camel-mapi-folder.c:1626
 #, c-format
 msgid "Cannot append message to folder '%s'"
 msgstr "No es pot afegir el missatge a la carpeta «%s»"
 
-#: ../src/camel/camel-mapi-folder.c:2202
+#: ../src/camel/camel-mapi-folder.c:1634 ../src/camel/camel-mapi-folder.c:1659
+#, c-format
 msgid "Offline."
 msgstr "Fora de línia."
 
-#: ../src/camel/camel-mapi-folder.c:2322
+#: ../src/camel/camel-mapi-folder.c:1804
 #, c-format
 msgid "Could not load summary for %s"
 msgstr "No s'ha pogut carregar el resum per a %s"
 
-#: ../src/camel/camel-mapi-provider.c:51
+#: ../src/camel/camel-mapi-provider.c:44
 msgid "Checking for new mail"
 msgstr "S'està comprovant si hi ha correu nou"
 
-#: ../src/camel/camel-mapi-provider.c:53
+#: ../src/camel/camel-mapi-provider.c:46
 msgid "C_heck for new messages in all folders"
 msgstr "_Comprova si hi ha correu nou a totes les carpetes"
 
-#: ../src/camel/camel-mapi-provider.c:57
+#: ../src/camel/camel-mapi-provider.c:50
 msgid "Options"
 msgstr "Opcions"
 
-#: ../src/camel/camel-mapi-provider.c:59
+#: ../src/camel/camel-mapi-provider.c:52
 msgid "Automatically synchroni_ze account locally"
 msgstr "Sincronit_za el compte localment de manera automàtica"
 
 #. i18n: copy from evolution:camel-imap-provider.c
-#: ../src/camel/camel-mapi-provider.c:62
+#: ../src/camel/camel-mapi-provider.c:55
 msgid "_Apply filters to new messages in Inbox on this server"
 msgstr ""
 "_Aplica els filtres als missatges nous de la safata d'entrada en este "
 "servidor"
 
-#: ../src/camel/camel-mapi-provider.c:64
+#: ../src/camel/camel-mapi-provider.c:57
 msgid "Check new messages for _Junk contents"
 msgstr "Comprova si els missatges són _brossa"
 
-#: ../src/camel/camel-mapi-provider.c:66
+#: ../src/camel/camel-mapi-provider.c:59
 msgid "Only check for Junk messag_es in the Inbox folder"
 msgstr "Només comprova el corre_u brossa a la safata d'entrada"
 
-#: ../src/camel/camel-mapi-provider.c:78
-msgid "For accessing Microsoft Exchange / OpenChange servers using MAPI"
+#: ../src/camel/camel-mapi-provider.c:70
+#, fuzzy
+msgid "For accessing Microsoft Exchange/OpenChange servers using MAPI"
 msgstr ""
 "Per accedir a servidors Exchange de Microsoft / OpenChange a través del MAPI"
 
-#: ../src/camel/camel-mapi-provider.c:93
+#: ../src/camel/camel-mapi-provider.c:85
 msgid "Password"
 msgstr "Contrasenya"
 
-#: ../src/camel/camel-mapi-provider.c:94
+#: ../src/camel/camel-mapi-provider.c:86
+#, fuzzy
 msgid ""
-"This option will connect to the Openchange server using a plaintext password."
+"This option will connect to the OpenChange server using a plaintext password."
 msgstr ""
 "Esta opció vos connectarà al servidor OpenChange a través d'una contrasenya "
 "de text pla."
 
-#: ../src/camel/camel-mapi-store.c:63
-msgid "Favorites"
-msgstr "Preferits"
-
-#: ../src/camel/camel-mapi-store.c:64
-msgid "All Public Folders"
-msgstr "Totes les carpetes públiques"
-
-#: ../src/camel/camel-mapi-store.c:313 ../src/camel/camel-mapi-transport.c:128
+#. Translators: The %s is replaced with a server's host name
+#: ../src/camel/camel-mapi-store.c:315 ../src/camel/camel-mapi-transport.c:143
 #, c-format
 msgid "Exchange MAPI server %s"
 msgstr "Servidor MAPI Exchange %s"
 
 #. To translators : Example string : Exchange MAPI service for
 #. _username_ on _server host name__
-#: ../src/camel/camel-mapi-store.c:317 ../src/camel/camel-mapi-transport.c:130
+#. Translators: The first %s is replaced with a user name, the second with a server's host name
+#: ../src/camel/camel-mapi-store.c:319 ../src/camel/camel-mapi-transport.c:146
 #, c-format
 msgid "Exchange MAPI service for %s on %s"
 msgstr "Servei MAPI Exchange per a %s a %s"
@@ -316,57 +413,190 @@
 #. for prompting the user if it is available.
 #. Second %s is : Username.
 #. Third %s is : Server host name.
-#: ../src/camel/camel-mapi-store.c:355
+#: ../src/camel/camel-mapi-store.c:361
 #, c-format
 msgid "%s Please enter the MAPI password for %s@%s"
 msgstr "%s Introduïu la contrasenya MAPI per a %s@%s"
 
-#: ../src/camel/camel-mapi-store.c:368
+#: ../src/camel/camel-mapi-store.c:376
+#, c-format
 msgid "You did not enter a password."
 msgstr "No heu introduït cap contrasenya."
 
-#: ../src/camel/camel-mapi-store.c:376
+#: ../src/camel/camel-mapi-store.c:384
+#, fuzzy, c-format
+msgid "Unable to authenticate to Exchange MAPI server: %s"
+msgstr "No s'ha pogut autenticar al servidor MAPI Exchange."
+
+#: ../src/camel/camel-mapi-store.c:387
+#, fuzzy
+msgid "Unable to authenticate to Exchange MAPI server"
+msgstr "No s'ha pogut autenticar al servidor MAPI Exchange."
+
+#: ../src/camel/camel-mapi-store.c:564
 #, c-format
-msgid "Unable to authenticate to Exchange MAPI server."
-msgstr "No s'ha pogut autenticar al servidor MAPI Exchange."
-
-#: ../src/camel/camel-mapi-store.c:552
 msgid "Cannot create MAPI folders in offline mode."
 msgstr "No es poden crear carpetes MAPI en mode fora de línia."
 
-#: ../src/camel/camel-mapi-store.c:557
-#, c-format
-msgid "Cannot create new folder `%s'"
-msgstr "No s'ha pogut crear la carpeta nova «%s»"
-
-#: ../src/camel/camel-mapi-store.c:741
-#, c-format
-msgid "Cannot rename MAPI folder `%s'. Folder does not exist."
+#: ../src/camel/camel-mapi-store.c:571
+#, fuzzy, c-format
+msgid "Cannot create new folder '%s'"
+msgstr "No s'ha pogut crear la carpeta nova «%s»"
+
+#: ../src/camel/camel-mapi-store.c:585
+#, c-format
+msgid "Authentication failed"
+msgstr "Ha fallat l'autenticació"
+
+#: ../src/camel/camel-mapi-store.c:610
+#, fuzzy, c-format
+msgid "Cannot create folder '%s': %s"
+msgstr "No s'ha pogut crear la carpeta nova «%s»"
+
+#: ../src/camel/camel-mapi-store.c:615
+#, fuzzy, c-format
+msgid "Cannot create folder '%s'"
+msgstr "No s'ha pogut crear la carpeta nova «%s»"
+
+#: ../src/camel/camel-mapi-store.c:708
+#, fuzzy, c-format
+msgid "Cannot remove folder '%s': %s"
+msgstr "No es pot canviar el nom de la carpeta MAPI «%s» a «%s»"
+
+#: ../src/camel/camel-mapi-store.c:715
+#, fuzzy, c-format
+msgid "Cannot remove folder '%s'"
+msgstr "No s'ha pogut crear la carpeta nova «%s»"
+
+#: ../src/camel/camel-mapi-store.c:805
+#, fuzzy, c-format
+msgid "Cannot rename MAPI folder '%s'. Folder does not exist."
 msgstr ""
 "No es pot canviar el nom de la carpeta MAPI «%s». No existeix la carpeta."
 
-#: ../src/camel/camel-mapi-store.c:752
-#, c-format
-msgid "Cannot rename MAPI default folder `%s' to `%s'."
-msgstr "No es pot canviar el nom de la carpeta MAPI predeterminada «%s» a «%s»."
-
-#: ../src/camel/camel-mapi-store.c:776 ../src/camel/camel-mapi-store.c:791
-#: ../src/camel/camel-mapi-store.c:842
-#, c-format
-msgid "Cannot rename MAPI folder `%s' to `%s'"
-msgstr "No es pot canviar el nom de la carpeta MAPI «%s» a «%s»"
-
-#: ../src/camel/camel-mapi-store.c:1381
+#: ../src/camel/camel-mapi-store.c:817
+#, fuzzy, c-format
+msgid "Cannot rename MAPI default folder '%s' to '%s'."
+msgstr ""
+"No es pot canviar el nom de la carpeta MAPI predeterminada «%s» a «%s»."
+
+#. Translators: '%s to %s' is current name of the folder and new name of the folder.
+#: ../src/camel/camel-mapi-store.c:844 ../src/camel/camel-mapi-store.c:869
+#: ../src/camel/camel-mapi-store.c:931
+#, fuzzy, c-format
+msgid "Cannot rename MAPI folder '%s' to '%s'"
+msgstr "No es pot canviar el nom de la carpeta MAPI «%s» a «%s»"
+
+#. Translators: '%s to %s' is current name of the folder and new name of the folder.
+#. The last '%s' is a detailed error message.
+#: ../src/camel/camel-mapi-store.c:862 ../src/camel/camel-mapi-store.c:925
+#, fuzzy, c-format
+msgid "Cannot rename MAPI folder '%s' to '%s': %s"
+msgstr "No es pot canviar el nom de la carpeta MAPI «%s» a «%s»"
+
+#: ../src/camel/camel-mapi-store.c:1494
+#, c-format
 msgid "Folder list not available in offline mode."
 msgstr "La llista de carpetes no està disponible en mode fora de línia."
 
-#. Fixme : Set a better error message. Would be helful in troubleshooting.
-#: ../src/camel/camel-mapi-transport.c:116
+#: ../src/camel/camel-mapi-transport.c:109
+#: ../src/camel/camel-mapi-transport.c:130
+#, c-format
 msgid "Could not send message."
 msgstr "No s'ha pogut enviar el missatge."
 
-#~ msgid "Global Address List / Active Directory"
-#~ msgstr "Global Address List / Active Directory"
+#: ../src/camel/camel-mapi-transport.c:125
+#, fuzzy, c-format
+msgid "Could not send message: %s"
+msgstr "No s'ha pogut enviar el missatge."
+
+#: ../src/libexchangemapi/exchange-mapi-connection.c:107
+msgid "Failed to login into the server"
+msgstr ""
+
+#: ../src/libexchangemapi/exchange-mapi-connection.c:108
+msgid "Cannot create more sessions, session limit was reached"
+msgstr ""
+
+#: ../src/libexchangemapi/exchange-mapi-connection.c:109
+msgid "User cancelled operation"
+msgstr ""
+
+#: ../src/libexchangemapi/exchange-mapi-connection.c:110
+msgid "Unable to abort"
+msgstr ""
+
+#: ../src/libexchangemapi/exchange-mapi-connection.c:111
+msgid "Network error"
+msgstr ""
+
+#: ../src/libexchangemapi/exchange-mapi-connection.c:112
+msgid "Disk error"
+msgstr ""
+
+#: ../src/libexchangemapi/exchange-mapi-connection.c:113
+msgid "Password change required"
+msgstr ""
+
+#: ../src/libexchangemapi/exchange-mapi-connection.c:114
+#, fuzzy
+msgid "Password expired"
+msgstr "Contrasenya"
+
+#: ../src/libexchangemapi/exchange-mapi-connection.c:115
+msgid "Invalid workstation account"
+msgstr ""
+
+#: ../src/libexchangemapi/exchange-mapi-connection.c:116
+msgid "Invalid access time"
+msgstr ""
+
+#: ../src/libexchangemapi/exchange-mapi-connection.c:117
+msgid "Account is disabled"
+msgstr ""
+
+#: ../src/libexchangemapi/exchange-mapi-connection.c:118
+msgid "End of session"
+msgstr ""
+
+#: ../src/libexchangemapi/exchange-mapi-connection.c:126
+#, c-format
+msgid "MAPI error %s (0x%x) occurred"
+msgstr ""
+
+#. Translators: The first '%s' is replaced with an error context,
+#. aka where the error occurred, the second '%s' is replaced with
+#. the error message.
+#: ../src/libexchangemapi/exchange-mapi-connection.c:136
+#, c-format
+msgctxt "EXCHANGEMAPI_ERROR"
+msgid "%s: %s"
+msgstr ""
+
+#: ../src/libexchangemapi/exchange-mapi-connection.c:3308
+msgid "All Public Folders"
+msgstr "Totes les carpetes públiques"
+
+#~ msgid "Folders Size"
+#~ msgstr "Mida de les carpetes"
+
+#~ msgid "Downloading GAL entries from server..."
+#~ msgstr ""
+#~ "S'estan baixant les entrades de la llista d'adreces global (GAL) del "
+#~ "servidor..."
+
+#~ msgid ""
+#~ "Cannot get message: %s\n"
+#~ "  %s"
+#~ msgstr ""
+#~ "No s'ha pogut obtenir el missatge: %s\n"
+#~ "  %s"
+
+#~ msgid "Message fetching cancelled by user."
+#~ msgstr "L'usuari ha cancel·lat la recollida del missatge."
+
+#~ msgid "Favorites"
+#~ msgstr "Preferits"
 
 #~ msgid "_Global Catalog server name:"
 #~ msgstr "Nom del servidor del _Global Catalog"

=== modified file 'po/eu.po'
--- po/eu.po	2010-11-03 16:33:05 +0000
+++ po/eu.po	2011-01-29 12:46:35 +0000
@@ -1,14 +1,14 @@
-# translation of eu_to_be_translate.po to Basque
+# translation of eu.po to Basque
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 #
 # Iñaki Larrañaga Murgoitio <[e-mail]>, 2009, 2010.
 msgid ""
 msgstr ""
-"Project-Id-Version: eu_to_be_translate\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-23 19:40+0200\n"
-"PO-Revision-Date: 2010-09-23 20:41+0200\n"
+"Project-Id-Version: eu\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=evolution-mapi\n"
+"POT-Creation-Date: 2010-10-04 13:55+0000\n"
+"PO-Revision-Date: 2010-10-05 22:22+0200\n"
 "Last-Translator: Iñaki Larrañaga Murgoitio <[e-mail]>\n"
 "Language-Team: Basque <[e-mail]>\n"
 "MIME-Version: 1.0\n"
@@ -140,41 +140,41 @@
 msgid "Folder size"
 msgstr "Karpetaren tamaina"
 
-#: ../src/addressbook/e-book-backend-mapi.c:549
+#: ../src/addressbook/e-book-backend-mapi.c:555
 msgid "Cannot connect"
 msgstr "Ezin da konektatu"
 
-#: ../src/addressbook/e-book-backend-mapi.c:692
+#: ../src/addressbook/e-book-backend-mapi.c:698
 msgid "Searching"
 msgstr "Bilaketa"
 
-#: ../src/addressbook/e-book-backend-mapi.c:1960
-#: ../src/calendar/e-cal-backend-mapi.c:132
-#: ../src/camel/camel-mapi-folder.c:1539 ../src/camel/camel-mapi-folder.c:1560
+#: ../src/addressbook/e-book-backend-mapi.c:2022
+#: ../src/calendar/e-cal-backend-mapi.c:133
+#: ../src/camel/camel-mapi-folder.c:1543 ../src/camel/camel-mapi-folder.c:1564
 msgid "Unknown error"
 msgstr "Errore ezezaguna"
 
 #: ../src/addressbook/e-book-backend-mapi-contacts.c:713
-#: ../src/calendar/e-cal-backend-mapi.c:322
+#: ../src/calendar/e-cal-backend-mapi.c:331
 msgid "Failed to remove public folder"
 msgstr "Huts egin du karpeta publikoa kentzean"
 
 #: ../src/addressbook/e-book-backend-mapi-contacts.c:770
-#: ../src/calendar/e-cal-backend-mapi.c:1767
-#: ../src/calendar/e-cal-backend-mapi.c:2259
+#: ../src/calendar/e-cal-backend-mapi.c:1775
+#: ../src/calendar/e-cal-backend-mapi.c:2267
 msgid "Failed to create item on a server"
 msgstr "Huts egin du elementua sortzean zerbitzarian"
 
 #: ../src/addressbook/e-book-backend-mapi-contacts.c:896
-#: ../src/calendar/e-cal-backend-mapi.c:2000
+#: ../src/calendar/e-cal-backend-mapi.c:2008
 msgid "Failed to modify item on a server"
 msgstr "Huts egin du elementua aldatzean zerbitzarian"
 
 #: ../src/addressbook/e-book-backend-mapi-contacts.c:1043
 #: ../src/addressbook/e-book-backend-mapi-contacts.c:1109
 #: ../src/addressbook/e-book-backend-mapi-contacts.c:1160
-#: ../src/calendar/e-cal-backend-mapi.c:1293
-#: ../src/calendar/e-cal-backend-mapi.c:1314
+#: ../src/calendar/e-cal-backend-mapi.c:1301
+#: ../src/calendar/e-cal-backend-mapi.c:1322
 msgid "Failed to fetch items from a server"
 msgstr "Huts egin du elementuak zerbitzaritik eskuratzean"
 
@@ -208,43 +208,43 @@
 msgid "Caching GAL contact %d/%d"
 msgstr "GAL kontaktuak cachean gordetzen (%d / %d)"
 
-#: ../src/addressbook/e-book-backend-mapi-gal.c:162
-#: ../src/addressbook/e-book-backend-mapi-gal.c:197
+#: ../src/addressbook/e-book-backend-mapi-gal.c:181
+#: ../src/addressbook/e-book-backend-mapi-gal.c:228
 msgid "Failed to fetch GAL entries"
 msgstr "Huts egin du GAL sarrerak lortzean"
 
 #. To translators: This message is displayed on the status bar when calendar/tasks/memo items are being fetched from the server.
-#: ../src/calendar/e-cal-backend-mapi.c:367
+#: ../src/calendar/e-cal-backend-mapi.c:376
 #, c-format
 msgid "Loading items in folder %s"
 msgstr "Elementuak kargatzen %s karpetan"
 
-#: ../src/calendar/e-cal-backend-mapi.c:758
-#: ../src/calendar/e-cal-backend-mapi.c:784
-#: ../src/calendar/e-cal-backend-mapi.c:831
-#: ../src/calendar/e-cal-backend-mapi.c:910
-#: ../src/calendar/e-cal-backend-mapi.c:933
+#: ../src/calendar/e-cal-backend-mapi.c:766
+#: ../src/calendar/e-cal-backend-mapi.c:792
+#: ../src/calendar/e-cal-backend-mapi.c:839
+#: ../src/calendar/e-cal-backend-mapi.c:918
+#: ../src/calendar/e-cal-backend-mapi.c:941
 #, c-format
 msgid "Failed to fetch changes from a server: %s"
 msgstr "Huts egin du aldaketak eskuratzean zerbitzaritik: %s"
 
-#: ../src/calendar/e-cal-backend-mapi.c:763
-#: ../src/calendar/e-cal-backend-mapi.c:789
-#: ../src/calendar/e-cal-backend-mapi.c:836
-#: ../src/calendar/e-cal-backend-mapi.c:915
-#: ../src/calendar/e-cal-backend-mapi.c:938
+#: ../src/calendar/e-cal-backend-mapi.c:771
+#: ../src/calendar/e-cal-backend-mapi.c:797
+#: ../src/calendar/e-cal-backend-mapi.c:844
+#: ../src/calendar/e-cal-backend-mapi.c:923
+#: ../src/calendar/e-cal-backend-mapi.c:946
 msgid "Failed to fetch changes from a server"
 msgstr "Huts egin du aldaketak zerbitzaritik eskuratzean"
 
-#: ../src/calendar/e-cal-backend-mapi.c:1427
+#: ../src/calendar/e-cal-backend-mapi.c:1435
 msgid "Could not create thread for populating cache"
 msgstr "Ezin izan da haririk sortu cachea betetzeko"
 
-#: ../src/calendar/e-cal-backend-mapi.c:1489
+#: ../src/calendar/e-cal-backend-mapi.c:1497
 msgid "Could not create cache file"
 msgstr "Ezin izan da cacheko fitxategia sortu"
 
-#: ../src/calendar/e-cal-backend-mapi.c:1894
+#: ../src/calendar/e-cal-backend-mapi.c:1902
 msgid ""
 "Support for modifying single instances of a recurring appointment is not yet "
 "implemented. No change was made to the appointment on the server."
@@ -252,85 +252,85 @@
 "Hitzordu errepikakor baten instantzia eraldatzea ez dago oraindik "
 "inplementatuta. Ez da hitzorduaren aldaketarik egin zerbitzarian."
 
-#: ../src/calendar/e-cal-backend-mapi.c:2507
+#: ../src/calendar/e-cal-backend-mapi.c:2515
 msgid "Failed to get Free/Busy data"
 msgstr "Huts egin du Libre/Lanpetuta datuak lortzean"
 
-#: ../src/camel/camel-mapi-folder.c:357
+#: ../src/camel/camel-mapi-folder.c:356
 #, c-format
 msgid "Updating local summary cache for new messages in %s"
 msgstr "Lokaleko laburpenaren cachea eguneratzen mezu berrientzako %s(e)n"
 
-#: ../src/camel/camel-mapi-folder.c:593
+#: ../src/camel/camel-mapi-folder.c:592
 #, c-format
 msgid "Retrieving message IDs from server for %s"
 msgstr "Mezuen IDak eskuratzen zerbitzaritik %s(r)entzako"
 
-#: ../src/camel/camel-mapi-folder.c:623
+#: ../src/camel/camel-mapi-folder.c:622
 #, c-format
 msgid "Removing deleted messages from cache in %s"
 msgstr "Ezabatutako mezuak kentzen cachetik %s(e)n"
 
 #. TODO : Check for online state
-#: ../src/camel/camel-mapi-folder.c:948
+#: ../src/camel/camel-mapi-folder.c:952
 #, c-format
 msgid "Fetching summary information for new messages in %s"
 msgstr "Laburpenaren informazioa eskuratzen mezu berrientzako %s(e)n"
 
-#: ../src/camel/camel-mapi-folder.c:1071 ../src/camel/camel-mapi-folder.c:1206
-#: ../src/camel/camel-mapi-folder.c:1216
+#: ../src/camel/camel-mapi-folder.c:1075 ../src/camel/camel-mapi-folder.c:1210
+#: ../src/camel/camel-mapi-folder.c:1220
 #, c-format
 msgid "This message is not available in offline mode."
 msgstr "Mezu hau ez dago eskuragarri lineaz kanpoko moduan."
 
-#: ../src/camel/camel-mapi-folder.c:1088
+#: ../src/camel/camel-mapi-folder.c:1092
 #, c-format
 msgid "Fetching items failed: %s"
 msgstr "Huts egin du elementuak eskuratzean: %s"
 
-#: ../src/camel/camel-mapi-folder.c:1093
+#: ../src/camel/camel-mapi-folder.c:1097
 msgid "Fetching items failed"
 msgstr "Huts egin du elementuak eskuratzean"
 
-#: ../src/camel/camel-mapi-folder.c:1166
+#: ../src/camel/camel-mapi-folder.c:1170
 #, c-format
 msgid "Cannot get message %s: %s"
 msgstr "Ezin da %s mezua eskuratu: %s"
 
-#: ../src/camel/camel-mapi-folder.c:1167
+#: ../src/camel/camel-mapi-folder.c:1171
 msgid "No such message"
 msgstr "Ez dago halako mezurik"
 
-#: ../src/camel/camel-mapi-folder.c:1242
+#: ../src/camel/camel-mapi-folder.c:1246
 #, c-format
 msgid "Could not get message: %s"
 msgstr "Ezin izan da mezua eskuratu: %s"
 
-#: ../src/camel/camel-mapi-folder.c:1248 ../src/camel/camel-mapi-folder.c:1261
+#: ../src/camel/camel-mapi-folder.c:1252 ../src/camel/camel-mapi-folder.c:1265
 #, c-format
 msgid "Could not get message"
 msgstr "Ezin izan da mezua eskuratu"
 
-#: ../src/camel/camel-mapi-folder.c:1398
+#: ../src/camel/camel-mapi-folder.c:1402
 #, c-format
 msgid "Failed to empty Trash: %s"
 msgstr "Huts egin du Zakarrontzia hustutzean: %s"
 
-#: ../src/camel/camel-mapi-folder.c:1403
+#: ../src/camel/camel-mapi-folder.c:1407
 msgid "Failed to empty Trash"
 msgstr "Huts egin du Zakarrontzia hustutzean"
 
-#: ../src/camel/camel-mapi-folder.c:1622
+#: ../src/camel/camel-mapi-folder.c:1626
 #, c-format
 msgid "Cannot append message to folder '%s'"
 msgstr "Ezin zaio mezua '%s' karpetari erantsi"
 
-#: ../src/camel/camel-mapi-folder.c:1630 ../src/camel/camel-mapi-folder.c:1655
+#: ../src/camel/camel-mapi-folder.c:1634 ../src/camel/camel-mapi-folder.c:1659
 #, c-format
 msgid "Offline."
 msgstr "Lineaz kanpo."
 
-#: ../src/camel/camel-mapi-folder.c:1801
+#: ../src/camel/camel-mapi-folder.c:1804
 #, c-format
 msgid "Could not load summary for %s"
 msgstr "Ezin izan da %s(r)en laburpena kargatu"
@@ -373,8 +373,7 @@
 msgstr "Pasahitza"
 
 #: ../src/camel/camel-mapi-provider.c:86
-msgid ""
-"This option will connect to the OpenChange server using a plaintext password."
+msgid "This option will connect to the OpenChange server using a plaintext password."
 msgstr ""
 "Aukera honek OpenChange zerbitzariarekin konektatuko zaitu testu arrunteko "
 "pasahitzaren bidez."
@@ -544,25 +543,16 @@
 msgid "MAPI error %s (0x%x) occurred"
 msgstr "MAPIren %s (Ox%x) errorea gertatu da"
 
-#: ../src/libexchangemapi/exchange-mapi-connection.c:3244
+#. Translators: The first '%s' is replaced with an error context,
+#. aka where the error occurred, the second '%s' is replaced with
+#. the error message.
+#: ../src/libexchangemapi/exchange-mapi-connection.c:132
+#, c-format
+msgctxt "EXCHANGEMAPI_ERROR"
+msgid "%s: %s"
+msgstr "%s: %s"
+
+#: ../src/libexchangemapi/exchange-mapi-connection.c:3278
 msgid "All Public Folders"
 msgstr "Karpeta publiko guztiak"
 
-#~ msgid "Folders Size"
-#~ msgstr "Karpeten tamaina"
-
-#~ msgid "Downloading GAL entries from server..."
-#~ msgstr "GAL sarrerak deskargatzen zerbitzaritik..."
-
-#~ msgid ""
-#~ "Cannot get message: %s\n"
-#~ "  %s"
-#~ msgstr ""
-#~ "Ezin da mezua lortu: %s\n"
-#~ "  %s"
-
-#~ msgid "Message fetching cancelled by user."
-#~ msgstr "Erabiltzaileak bertan behera utzi du mezua eskuratzea."
-
-#~ msgid "Favorites"
-#~ msgstr "Gogokoak"

=== modified file 'src/account-setup-eplugin/exchange-mapi-account-listener.c'
--- src/account-setup-eplugin/exchange-mapi-account-listener.c	2010-10-19 15:03:33 +0000
+++ src/account-setup-eplugin/exchange-mapi-account-listener.c	2011-01-29 12:46:35 +0000
@@ -314,7 +314,8 @@
 			ESource *source = temp_list->data;
 
 			if (source && E_IS_SOURCE (source)) {
-				if (strcmp (e_source_get_property (source, "public"), "yes") != 0)
+				if (!e_source_get_property (source, "public") ||
+				    strcmp (e_source_get_property (source, "public"), "yes") != 0)
 					e_source_group_remove_source (group, source);
 			}
 		}
@@ -714,7 +715,8 @@
 			ESource *source = temp_list->data;
 
 			if (source && E_IS_SOURCE (source)) {
-				if (strcmp(e_source_get_property(source, "public"), "yes") != 0)
+				if (!e_source_get_property (source, "public") ||
+				    strcmp (e_source_get_property (source, "public"), "yes") != 0)
 					e_source_group_remove_source (group, source);
 			}
 		}

=== modified file 'src/addressbook/e-book-backend-mapi-contacts.c'
--- src/addressbook/e-book-backend-mapi-contacts.c	2010-10-19 15:03:33 +0000
+++ src/addressbook/e-book-backend-mapi-contacts.c	2011-01-29 12:46:35 +0000
@@ -451,19 +451,14 @@
 	/* BDAY AND ANNV */
 	if (e_contact_get (mcd->contact, E_CONTACT_BIRTH_DATE)) {
 		EContactDate *date = e_contact_get (mcd->contact, E_CONTACT_BIRTH_DATE);
-		struct tm tmtime;
-		time_t lt;
-		NTTIME nt;
+		struct tm tmtime = { 0 };
 		struct FILETIME t;
 
 		tmtime.tm_mday = date->day;
 		tmtime.tm_mon = date->month - 1;
 		tmtime.tm_year = date->year - 1900;
 
-		lt = mktime (&tmtime);
-		unix_to_nt_time (&nt, lt);
-		t.dwLowDateTime = (nt << 32) >> 32;
-		t.dwHighDateTime = (nt >> 32);
+		exchange_mapi_util_time_t_to_filetime (mktime (&tmtime) + (24 * 60 * 60), &t);
 
 		if (!exchange_mapi_utils_add_spropvalue (mem_ctx, values, n_values, PR_BIRTHDAY, &t))
 			return FALSE;
@@ -471,19 +466,14 @@
 
 	if (e_contact_get (mcd->contact, E_CONTACT_ANNIVERSARY)) {
 		EContactDate *date = e_contact_get (mcd->contact, E_CONTACT_ANNIVERSARY);
-		struct tm tmtime;
-		time_t lt;
-		NTTIME nt;
+		struct tm tmtime = { 0 };
 		struct FILETIME t;
 
 		tmtime.tm_mday = date->day;
 		tmtime.tm_mon = date->month - 1;
 		tmtime.tm_year = date->year - 1900;
 
-		lt = mktime (&tmtime);
-		unix_to_nt_time (&nt, lt);
-		t.dwLowDateTime = (nt << 32) >> 32;
-		t.dwHighDateTime = (nt >> 32);
+		exchange_mapi_util_time_t_to_filetime (mktime (&tmtime) + (24 * 60 * 60), &t);
 
 		if (!exchange_mapi_utils_add_spropvalue (mem_ctx, values, n_values, PR_WEDDING_ANNIVERSARY, &t))
 			return FALSE;
@@ -762,7 +752,7 @@
 
 	mid = exchange_mapi_connection_create_item (conn, olFolderContacts, priv->fid,
 		mapi_book_write_props, &mcd,
-		NULL, NULL, NULL, priv->is_public_folder ? MAPI_OPTIONS_USE_PFSTORE : 0, &mapi_error);
+		NULL, NULL, NULL, MAPI_OPTIONS_DONT_SUBMIT | (priv->is_public_folder ? MAPI_OPTIONS_USE_PFSTORE : 0), &mapi_error);
 
 	e_book_backend_mapi_unlock_connection (ebma);
 

=== modified file 'src/addressbook/e-book-backend-mapi-gal.c'
--- src/addressbook/e-book-backend-mapi-gal.c	2010-10-19 15:03:33 +0000
+++ src/addressbook/e-book-backend-mapi-gal.c	2011-01-29 12:46:35 +0000
@@ -138,6 +138,8 @@
 	GError *mapi_error = NULL;
 	struct FetchGalData fgd = { 0 };
 	ExchangeMapiConnection *conn;
+	gchar *last_fetch;
+	gboolean fetch_successful;
 
 	e_book_backend_mapi_lock_connection (ebma);
 
@@ -145,22 +147,51 @@
 	if (!conn) {
 		e_book_backend_mapi_unlock_connection (ebma);
 		g_propagate_error (error, EDB_ERROR (REPOSITORY_OFFLINE));
-
 		return;
 	}
 
+	/* GAL doesn't use restrictions yet, thus just fetches all items always */
+	last_fetch = e_book_backend_mapi_cache_get (ebma, "gal-last-update");
+	if (last_fetch) {
+		GTimeVal last_tv = { 0 }, now = { 0 };
+
+		g_get_current_time (&now);
+
+		/* refetch gal only once per week */
+		if (g_time_val_from_iso8601 (last_fetch, &last_tv) && now.tv_sec - last_tv.tv_sec <= 60 * 60 * 24 * 7) {
+			g_set_error_literal (error, G_IO_ERROR, G_IO_ERROR_CANCELLED, "Cancelled");
+			g_free (last_fetch);
+			e_book_backend_mapi_unlock_connection (ebma);
+			return;
+		}
+
+		g_free (last_fetch);
+	}
+
 	fgd.ebma = ebma;
 	fgd.book_view = book_view;
 	fgd.notify_contact_data = notify_contact_data;
 	fgd.fid = exchange_mapi_connection_get_default_folder_id (conn, olFolderContacts, NULL);
 
-	exchange_mapi_connection_fetch_gal (conn, restriction,
+	fetch_successful = exchange_mapi_connection_fetch_gal (conn, restriction,
 		mapi_book_utils_get_prop_list, GET_ALL_KNOWN_IDS,
 		fetch_gal_cb, &fgd, &mapi_error);
 
 	if (mapi_error) {
 		mapi_error_to_edb_error (error, mapi_error, E_DATA_BOOK_STATUS_OTHER_ERROR, _("Failed to fetch GAL entries"));
 		g_error_free (mapi_error);
+	} else if (!fetch_successful) {
+		g_set_error_literal (error, G_IO_ERROR, G_IO_ERROR_CANCELLED, "Cancelled");
+	} else {
+		GTimeVal now = { 0 };
+
+		g_get_current_time (&now);
+
+		last_fetch = g_time_val_to_iso8601 (&now);
+		if (last_fetch && *last_fetch)
+			e_book_backend_mapi_cache_set (ebma, "gal-last-update", last_fetch);
+
+		g_free (last_fetch);
 	}
 
 	e_book_backend_mapi_unlock_connection (ebma);

=== modified file 'src/addressbook/e-book-backend-mapi.c'
--- src/addressbook/e-book-backend-mapi.c	2010-10-19 15:03:33 +0000
+++ src/addressbook/e-book-backend-mapi.c	2011-01-29 12:46:35 +0000
@@ -299,6 +299,7 @@
 	EBookBackendMAPIClass *ebmac;
 	glong last_modification_secs = 0;
 	EDataBookView *book_view;
+	GError *error = NULL;
 
 	g_return_val_if_fail (ebma != NULL, NULL);
 	g_return_val_if_fail (E_IS_BOOK_BACKEND_MAPI (ebma), NULL);
@@ -324,14 +325,17 @@
 		if (!ebbm_get_cache_time (ebma, &last_modification_secs))
 			last_modification_secs = 0;
 
-		ebbm_fetch_contacts (ebma, restriction, NULL, &last_modification_secs, NULL);
+		ebbm_fetch_contacts (ebma, restriction, NULL, &last_modification_secs, &error);
+		if (!error)
+			e_book_backend_cache_set_populated (priv->cache);
+		else
+			e_file_cache_remove_object (E_FILE_CACHE (priv->cache), "populated");
 
 		talloc_free (mem_ctx);
 	}
 
-	if (!g_cancellable_is_cancelled (priv->update_cache) && ebmac->op_fetch_known_uids) {
+	if (!error && !g_cancellable_is_cancelled (priv->update_cache) && ebmac->op_fetch_known_uids) {
 		GHashTable *uids = g_hash_table_new_full (g_str_hash, g_str_equal, (GDestroyNotify) g_free, NULL);
-		GError *error = NULL;
 
 		ebmac->op_fetch_known_uids (ebma, priv->update_cache, uids, &error);
 
@@ -347,7 +351,8 @@
 
 				if (!uid || g_hash_table_lookup (uids, uid)
 				    || g_str_equal (uid, "populated")
-				    || g_str_equal (uid, "last_update_time"))
+				    || g_str_equal (uid, "last_update_time")
+				    || g_str_has_prefix (uid, "key:"))
 					continue;
 
 				/* uid is hold by a cache, thus make a copy before remove */
@@ -366,10 +371,11 @@
 		}
 
 		g_hash_table_destroy (uids);
-		if (error)
-			g_error_free (error);
 	}
 
+	if (error)
+		g_error_free (error);
+
 	book_view = ebbm_pick_book_view (ebma);
 	if (book_view)
 		e_data_book_view_notify_complete (book_view, NULL);
@@ -693,7 +699,7 @@
 
 	e_book_backend_mapi_update_view_by_cache (bvtd->ebma, bvtd->book_view, &error);
 
-	if (!error && priv && priv->conn && !priv->update_cache_thread
+	if (!error && priv && priv->conn && (!priv->update_cache_thread || g_cancellable_is_cancelled (priv->update_cache))
 	    && e_book_backend_mapi_book_view_is_running (bvtd->ebma, bvtd->book_view)) {
 		EBookBackendMAPIClass *ebmac;
 
@@ -701,12 +707,20 @@
 		if (ebmac && ebmac->op_book_view_thread)
 			ebmac->op_book_view_thread (bvtd->ebma, bvtd->book_view, &error);
 
-		if (!error && !priv->marked_for_offline) {
+		if (!error && !e_book_backend_cache_is_populated (priv->cache)) {
 			/* todo: create restriction based on the book_view */
+			g_cancellable_reset (priv->update_cache);
 			ebbm_fetch_contacts (bvtd->ebma, NULL, bvtd->book_view, NULL, &error);
+			g_cancellable_cancel (priv->update_cache);
+
+			if (!error)
+				e_book_backend_cache_set_populated (priv->cache);
 		}
 	}
 
+	if (error && g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED))
+		g_clear_error (&error);
+
 	/* do not stop book view when filling cache */
 	if (e_book_backend_mapi_book_view_is_running (bvtd->ebma, bvtd->book_view)
 	    && (!priv->update_cache_thread || g_cancellable_is_cancelled (priv->update_cache)))
@@ -1624,6 +1638,54 @@
 	e_book_backend_notify_remove (E_BOOK_BACKEND (ebma), uid);
 }
 
+static gchar *
+create_cache_key (const gchar *key)
+{
+	g_return_val_if_fail (key != NULL, NULL);
+
+	return g_strconcat ("key:", key, NULL);
+}
+
+void
+e_book_backend_mapi_cache_set (EBookBackendMAPI *ebma, const gchar *key, const gchar *value)
+{
+	gchar *real_key;
+
+	g_return_if_fail (ebma != NULL);
+	g_return_if_fail (E_IS_BOOK_BACKEND_MAPI (ebma));
+	g_return_if_fail (ebma->priv != NULL);
+	g_return_if_fail (ebma->priv->cache != NULL);
+	g_return_if_fail (key != NULL);
+
+	real_key = create_cache_key (key);
+	g_return_if_fail (real_key != NULL);
+
+	if (!e_file_cache_add_object (E_FILE_CACHE (ebma->priv->cache), real_key, value))
+		e_file_cache_replace_object (E_FILE_CACHE (ebma->priv->cache), real_key, value);
+
+	g_free (real_key);
+}
+
+gchar *
+e_book_backend_mapi_cache_get (EBookBackendMAPI *ebma, const gchar *key)
+{
+	gchar *real_key, *res;
+
+	g_return_val_if_fail (ebma != NULL, NULL);
+	g_return_val_if_fail (E_IS_BOOK_BACKEND_MAPI (ebma), NULL);
+	g_return_val_if_fail (ebma->priv != NULL, NULL);
+	g_return_val_if_fail (ebma->priv->cache != NULL, NULL);
+	g_return_val_if_fail (key != NULL, NULL);
+
+	real_key = create_cache_key (key);
+	g_return_val_if_fail (real_key != NULL, NULL);
+
+	res = g_strdup (e_file_cache_get_object (E_FILE_CACHE (ebma->priv->cache), real_key));
+	g_free (real_key);
+
+	return res;
+}
+
 /* utility functions/macros */
 
 /* 'data' is one of GET_ALL_KNOWN_IDS or GET_UIDS_ONLY */
@@ -1852,15 +1914,10 @@
 				e_contact_set (contact, mappings[i].field_id, value);
 		} else if (contact_type == ELEMENT_TYPE_SIMPLE) {
 			if (value && mappings[i].element_type == PT_SYSTIME) {
-				struct FILETIME *t = value;
-				time_t time;
-				NTTIME nt;
+				const struct FILETIME *t = value;
 				gchar buff[129];
+				time_t time = exchange_mapi_util_filetime_to_time_t (t);
 
-				nt = t->dwHighDateTime;
-				nt = nt << 32;
-				nt |= t->dwLowDateTime;
-				time = nt_time_to_unix (nt);
 				e_contact_set (contact, mappings[i].field_id, ctime_r (&time, buff));
 			}
 		} else if (contact_type == ELEMENT_TYPE_COMPLEX) {
@@ -1872,18 +1929,15 @@
 				g_list_free (list);
 			} else if (mappings[i].field_id == E_CONTACT_BIRTH_DATE
 				   || mappings[i].field_id == E_CONTACT_ANNIVERSARY) {
-				struct FILETIME *t = value;
+				const struct FILETIME *t = value;
 				time_t time;
-				NTTIME nt;
 				struct tm * tmtime;
 				if (value) {
 					EContactDate date = {0};
-					nt = t->dwHighDateTime;
-					nt = nt << 32;
-					nt |= t->dwLowDateTime;
-					time = nt_time_to_unix (nt);
+
+					time = exchange_mapi_util_filetime_to_time_t (t);
 					tmtime = gmtime (&time);
-					//FIXME: Move to new libmapi api to get string dates.
+
 					date.day = tmtime->tm_mday;
 					date.month = tmtime->tm_mon + 1;
 					date.year = tmtime->tm_year + 1900;

=== modified file 'src/addressbook/e-book-backend-mapi.h'
--- src/addressbook/e-book-backend-mapi.h	2010-10-19 15:03:33 +0000
+++ src/addressbook/e-book-backend-mapi.h	2011-01-29 12:46:35 +0000
@@ -105,6 +105,8 @@
 gboolean e_book_backend_mapi_is_marked_for_offline (EBookBackendMAPI *ebma);
 gboolean e_book_backend_mapi_notify_contact_update (EBookBackendMAPI *ebma, EDataBookView *book_view, EContact *contact, const struct timeval *pr_last_modification_time, gint index, gint total, gpointer notify_contact_data);
 void e_book_backend_mapi_notify_contact_removed (EBookBackendMAPI *ebma, const gchar *uid);
+void   e_book_backend_mapi_cache_set (EBookBackendMAPI *ebma, const gchar *key, const gchar *value);
+gchar *e_book_backend_mapi_cache_get (EBookBackendMAPI *ebma, const gchar *key);
 
 /* utility functions/macros */
 

=== modified file 'src/calendar/e-cal-backend-mapi.c'
--- src/calendar/e-cal-backend-mapi.c	2010-11-03 16:33:05 +0000
+++ src/calendar/e-cal-backend-mapi.c	2011-01-29 12:46:35 +0000
@@ -92,6 +92,7 @@
 	gboolean		mode_changed;
 	icaltimezone		*default_zone;
 	gboolean		populating_cache; /* whether in populate_cache */
+	GMutex			*updating_mutex;
 
 	/* timeout handler for syncing sendoptions */
 	guint			sendoptions_sync_timeout;
@@ -290,13 +291,21 @@
 //				CAL_STATIC_CAPABILITY_DELEGATE_SUPPORTED ","
 //				CAL_STATIC_CAPABILITY_NO_ORGANIZER ","
 //				CAL_STATIC_CAPABILITY_DELEGATE_TO_MANY ","
-				CAL_STATIC_CAPABILITY_HAS_UNACCEPTED_MEETING
+				CAL_STATIC_CAPABILITY_HAS_UNACCEPTED_MEETING ","
+				CAL_STATIC_CAPABILITY_REFRESH_SUPPORTED
 				  );
 }
 static void
 ecbm_refresh (ECalBackend *backend, EDataCal *cal, GError **perror)
 {
-	g_propagate_error (perror, EDC_ERROR (NotSupported));
+	ECalBackendMAPI *cbmapi;
+	ECalBackendMAPIPrivate *priv;
+
+	cbmapi = E_CAL_BACKEND_MAPI (backend);
+	priv = cbmapi->priv;
+
+	if (priv && priv->dlock && priv->dlock->cond)
+		g_cond_signal (priv->dlock->cond);
 }
 
 static void
@@ -681,7 +690,6 @@
 	ECalBackendMAPI *cbmapi;
 	ECalBackendMAPIPrivate *priv;
 	icalcomponent_kind kind;
-	static GStaticMutex updating = G_STATIC_MUTEX_INIT;
 	icaltimetype itt_current, itt_cache = icaltime_null_time();
 	time_t current_time;
 	struct tm tm;
@@ -708,7 +716,7 @@
 	if (priv->mode == CAL_MODE_LOCAL)
 		return FALSE;
 
-	g_static_mutex_lock (&updating);
+	g_mutex_lock (priv->updating_mutex);
 
 	serv_time = e_cal_backend_store_get_key_value (priv->store, SERVER_UTC_TIME);
 	if (serv_time)
@@ -764,7 +772,7 @@
 			}
 
 //			e_file_cache_thaw_changes (E_FILE_CACHE (priv->cache));
-			g_static_mutex_unlock (&updating);
+			g_mutex_unlock (priv->updating_mutex);
 			if (mem_ctx)
 				talloc_free (mem_ctx);
 			return FALSE;
@@ -790,7 +798,7 @@
 			}
 
 			//e_file_cache_thaw_changes (E_FILE_CACHE (priv->cache));
-			g_static_mutex_unlock (&updating);
+			g_mutex_unlock (priv->updating_mutex);
 			if (mem_ctx)
 				talloc_free (mem_ctx);
 			return FALSE;
@@ -838,7 +846,7 @@
 
 		g_slist_foreach (did.cache_ids, (GFunc) g_free, NULL);
 		g_slist_free (did.cache_ids);
-		g_static_mutex_unlock (&updating);
+		g_mutex_unlock (priv->updating_mutex);
 		return FALSE;
 	}
 
@@ -915,7 +923,7 @@
 					e_cal_backend_notify_error (E_CAL_BACKEND (cbmapi), _("Failed to fetch changes from a server"));
 				}
 
-				g_static_mutex_unlock (&updating);
+				g_mutex_unlock (priv->updating_mutex);
 				g_free (or_res);
 				return FALSE;
 			}
@@ -939,14 +947,14 @@
 				}
 
 				g_free (or_res);
-				g_static_mutex_unlock (&updating);
+				g_mutex_unlock (priv->updating_mutex);
 				return FALSE;
 			}
 		}
 		g_free (or_res);
 	}
 
-	g_static_mutex_unlock (&updating);
+	g_mutex_unlock (priv->updating_mutex);
 	return TRUE;
 }
 
@@ -3603,6 +3611,11 @@
 		priv->mutex = NULL;
 	}
 
+	if (priv->updating_mutex) {
+		g_mutex_free (priv->updating_mutex);
+		priv->updating_mutex = NULL;
+	}
+
 	if (priv->store) {
 		g_object_unref (priv->store);
 		priv->store = NULL;
@@ -3729,6 +3742,7 @@
 
 	/* create the mutex for thread safety */
 	priv->mutex = g_mutex_new ();
+	priv->updating_mutex = g_mutex_new ();
 	priv->populating_cache = FALSE;
 	priv->op_queue = em_operation_queue_new ((EMOperationQueueFunc) ecbm_operation_cb, cbmapi);
 

=== modified file 'src/camel/camel-mapi-folder.c'
--- src/camel/camel-mapi-folder.c	2010-11-03 16:33:05 +0000
+++ src/camel/camel-mapi-folder.c	2011-01-29 12:46:35 +0000
@@ -56,7 +56,6 @@
 
 //#ifdef ENABLE_THREADS
 	GStaticMutex search_lock;	/* for locking the search object */
-	GStaticRecMutex cache_lock;	/* for locking the cache object */
 //#endif
 
 };
@@ -162,7 +161,6 @@
 	struct timeval item_modification_time = { 0 };
 	struct timeval fi_data_mod_time = { 0 };
 	guint32 j = 0;
-	NTTIME ntdate;
 
 	MailItem *item = g_new0(MailItem , 1);
 
@@ -201,17 +199,12 @@
 	/* item->header.from = camel_internet_address_format_address (from_name, from_email); */
 
 	if (delivery_date) {
-		ntdate = delivery_date->dwHighDateTime;
-		ntdate = ntdate << 32;
-		ntdate |= delivery_date->dwLowDateTime;
-		item->header.recieved_time = nt_time_to_unix(ntdate);
+		item->header.recieved_time = exchange_mapi_util_filetime_to_time_t (delivery_date);
 	}
 
 	if (last_modification_time) {
-		ntdate = last_modification_time->dwHighDateTime;
-		ntdate = ntdate << 32;
-		ntdate |= last_modification_time->dwLowDateTime;
-		nttime_to_timeval (&item_modification_time, ntdate);
+		item_modification_time.tv_sec = exchange_mapi_util_filetime_to_time_t (last_modification_time);
+		item_modification_time.tv_usec = 0;
 	}
 
 	fi_data_mod_time.tv_sec = fi_data->last_modification_time.tv_sec;
@@ -501,11 +494,11 @@
 			camel_folder_change_info_change_uid (changes, mi->info.uid);
 			camel_message_info_free (pmi);
 		} else {
-			CAMEL_MAPI_FOLDER_REC_LOCK (folder, cache_lock);
+			camel_folder_summary_lock (folder->summary, CAMEL_FOLDER_SUMMARY_SUMMARY_LOCK);
 			camel_folder_summary_add (folder->summary,(CamelMessageInfo *)mi);
 			camel_folder_change_info_add_uid (changes, mi->info.uid);
 			camel_folder_change_info_recent_uid (changes, mi->info.uid);
-			CAMEL_MAPI_FOLDER_REC_UNLOCK (folder, cache_lock);
+			camel_folder_summary_unlock (folder->summary, CAMEL_FOLDER_SUMMARY_SUMMARY_LOCK);
 		}
 
 		/********************* Summary ends *************************/
@@ -641,11 +634,11 @@
 
 		/* If it is not in server list, clean our cache */
 		if (!msg_flags) {
-			CAMEL_MAPI_FOLDER_REC_LOCK (m->folder, cache_lock);
+			camel_folder_summary_lock (m->folder->summary, CAMEL_FOLDER_SUMMARY_SUMMARY_LOCK);
 			camel_folder_summary_remove_uid (m->folder->summary, uid);
 			camel_data_cache_remove (mapi_folder->cache, "cache", uid, NULL);
 			camel_folder_change_info_remove_uid (changes, uid);
-			CAMEL_MAPI_FOLDER_REC_UNLOCK (m->folder, cache_lock);
+			camel_folder_summary_unlock (m->folder->summary, CAMEL_FOLDER_SUMMARY_SUMMARY_LOCK);
 		} else {
 			CamelMapiMessageInfo *mapi_info = (CamelMapiMessageInfo *) info;
 
@@ -765,8 +758,10 @@
 
 	is_junk_folder = (mapi_folder->type & CAMEL_FOLDER_TYPE_MASK) == CAMEL_FOLDER_TYPE_JUNK;
 
+	camel_folder_summary_lock (folder->summary, CAMEL_FOLDER_SUMMARY_SUMMARY_LOCK);
+	camel_folder_summary_prepare_fetch_all (folder->summary, NULL);
+
 	count = camel_folder_summary_count (folder->summary);
-	CAMEL_MAPI_FOLDER_REC_LOCK (folder, cache_lock);
 	for (i=0; i < count; i++) {
 		info = camel_folder_summary_index (folder->summary, i);
 		mapi_info = (CamelMapiMessageInfo *) info;
@@ -783,6 +778,7 @@
 
 			/* Why are we getting so much noise here :-/ */
 			if (!exchange_mapi_util_mapi_ids_from_uid (uid, &temp_fid, mid)) {
+				camel_message_info_free (info);
 				g_free (mid);
 				continue;
 			}
@@ -819,10 +815,12 @@
 
 			mapi_info->server_flags = mapi_info->info.flags;
 		}
-		camel_message_info_free (info);
+
+		if (info)
+			camel_message_info_free (info);
 	}
 
-	CAMEL_MAPI_FOLDER_REC_UNLOCK (folder, cache_lock);
+	camel_folder_summary_unlock (folder->summary, CAMEL_FOLDER_SUMMARY_SUMMARY_LOCK);
 
 	/*
 	   Sync up the READ changes before deleting the message.
@@ -884,10 +882,10 @@
 	for (l = deleted_items; l; l = l->next) {
 		gchar * deleted_msg_uid = g_strdup_printf ("%016" G_GINT64_MODIFIER "X%016" G_GINT64_MODIFIER "X", fid, *(mapi_id_t *)l->data);
 
-		CAMEL_MAPI_FOLDER_REC_LOCK (folder, cache_lock);
+		camel_folder_summary_lock (folder->summary, CAMEL_FOLDER_SUMMARY_SUMMARY_LOCK);
 		camel_folder_summary_remove_uid (folder->summary, deleted_msg_uid);
 		camel_data_cache_remove(mapi_folder->cache, "cache", deleted_msg_uid, NULL);
-		CAMEL_MAPI_FOLDER_REC_UNLOCK (folder, cache_lock);
+		camel_folder_summary_unlock (folder->summary, CAMEL_FOLDER_SUMMARY_SUMMARY_LOCK);
 	}
 
 	g_slist_free (read_items);
@@ -1265,7 +1263,7 @@
 	}
 
 	/* add to cache */
-	CAMEL_MAPI_FOLDER_REC_LOCK (folder, cache_lock);
+	camel_folder_summary_lock (folder->summary, CAMEL_FOLDER_SUMMARY_SUMMARY_LOCK);
 	if ((cache_stream = camel_data_cache_add (mapi_folder->cache, "cache", uid, NULL))) {
 		if (camel_data_wrapper_write_to_stream ((CamelDataWrapper *) msg, cache_stream, NULL) == -1
 				|| camel_stream_flush (cache_stream, NULL) == -1) {
@@ -1289,7 +1287,7 @@
 		g_object_unref (cache_stream);
 	}
 
-	CAMEL_MAPI_FOLDER_REC_UNLOCK (folder, cache_lock);
+	camel_folder_summary_unlock (folder->summary, CAMEL_FOLDER_SUMMARY_SUMMARY_LOCK);
 
 	camel_message_info_free (&mi->info);
 
@@ -1444,11 +1442,11 @@
 		if (status) {
 			while (deleted_items_uid) {
 				const gchar *uid = (gchar *)deleted_items_uid->data;
-				CAMEL_MAPI_FOLDER_REC_LOCK (folder, cache_lock);
+				camel_folder_summary_lock (folder->summary, CAMEL_FOLDER_SUMMARY_SUMMARY_LOCK);
 				camel_folder_change_info_remove_uid (changes, uid);
 				camel_folder_summary_remove_uid (folder->summary, uid);
 				camel_data_cache_remove(mapi_folder->cache, "cache", uid, NULL);
-				CAMEL_MAPI_FOLDER_REC_UNLOCK (folder, cache_lock);
+				camel_folder_summary_unlock (folder->summary, CAMEL_FOLDER_SUMMARY_SUMMARY_LOCK);
 				deleted_items_uid = g_slist_next (deleted_items_uid);
 			}
 		}
@@ -1638,14 +1636,14 @@
 	/* Convert MIME to Item */
 	from = (CamelAddress *) camel_mime_message_get_from (message);
 
-	item = camel_mapi_utils_mime_to_item (message, from, error);
+	item = camel_mapi_utils_mime_to_item (message, info ? camel_message_info_flags (info) : 0, from, error);
 	if (item == NULL)
 		return FALSE;
 
 	mid = exchange_mapi_connection_create_item (camel_mapi_store_get_exchange_connection (mapi_store), -1, fid,
 					 camel_mapi_utils_create_item_build_props, item,
 					 item->recipients, item->attachments,
-					 item->generic_streams, 0, &mapi_error);
+					 item->generic_streams, MAPI_OPTIONS_DONT_SUBMIT, &mapi_error);
 
 	if (!mid) {
 		if (mapi_error) {
@@ -1757,7 +1755,6 @@
 
 #ifdef ENABLE_THREADS
 	g_static_mutex_init(&mapi_folder->priv->search_lock);
-	g_static_rec_mutex_init(&mapi_folder->priv->cache_lock);
 #endif
 
 	mapi_folder->need_rescan = TRUE;
@@ -1825,8 +1822,18 @@
 /*		return NULL; */
 /*	} */
 
-	if (camel_url_get_param (((CamelService *) store)->url, "filter"))
-		folder->folder_flags |= CAMEL_FOLDER_FILTER_RECENT;
+	if ((store->flags & CAMEL_STORE_FILTER_INBOX) != 0) {
+		CamelFolderInfo *fi;
+
+		fi = camel_store_get_folder_info (store, folder_name, 0, NULL);
+		if (fi) {
+			if ((fi->flags & CAMEL_FOLDER_TYPE_MASK) == CAMEL_FOLDER_TYPE_INBOX) {
+				folder->folder_flags |= CAMEL_FOLDER_FILTER_RECENT;
+			}
+
+			camel_store_free_folder_info (store, fi);
+		}
+	}
 
 	mapi_folder->search = camel_folder_search_new ();
 	if (!mapi_folder->search) {

=== modified file 'src/camel/camel-mapi-private.h'
--- src/camel/camel-mapi-private.h	2010-10-19 15:03:33 +0000
+++ src/camel/camel-mapi-private.h	2011-01-29 12:46:35 +0000
@@ -36,10 +36,6 @@
 	(g_static_mutex_lock(&((CamelMapiFolder *)f)->priv->l))
 #define CAMEL_MAPI_FOLDER_UNLOCK(f, l) \
 	(g_static_mutex_unlock(&((CamelMapiFolder *)f)->priv->l))
-#define CAMEL_MAPI_FOLDER_REC_LOCK(f, l) \
-	(g_static_rec_mutex_lock(&((CamelMapiFolder *)f)->priv->l))
-#define CAMEL_MAPI_FOLDER_REC_UNLOCK(f, l) \
-	(g_static_rec_mutex_unlock(&((CamelMapiFolder *)f)->priv->l))
 //#else
 #define MAPI_FOLDER_LOCK(f, l)
 #define MAPI_FOLDER_UNLOCK(f, l)

=== modified file 'src/camel/camel-mapi-store.c'
--- src/camel/camel-mapi-store.c	2010-10-19 15:03:33 +0000
+++ src/camel/camel-mapi-store.c	2011-01-29 12:46:35 +0000
@@ -1963,6 +1963,10 @@
 static gboolean
 mapi_can_refresh_folder (CamelStore *store, CamelFolderInfo *info, GError **error)
 {
+	/* skip unselectable folders from automatic refresh */
+	if (info && (info->flags & CAMEL_FOLDER_NOSELECT) != 0)
+		return FALSE;
+
 	return CAMEL_STORE_CLASS(camel_mapi_store_parent_class)->can_refresh_folder (store, info, error) ||
 	      (camel_url_get_param (((CamelService *)store)->url, "check_all") != NULL);
 }

=== modified file 'src/camel/camel-mapi-transport.c'
--- src/camel/camel-mapi-transport.c	2010-10-19 15:03:33 +0000
+++ src/camel/camel-mapi-transport.c	2011-01-29 12:46:35 +0000
@@ -63,6 +63,16 @@
 	guint64 fid = 0;
 	mapi_id_t mid = 0;
 
+	#define unset(x) g_free (x); x = NULL
+
+	item->header.flags = MSGFLAG_UNSENT;
+	unset (item->header.from);
+	unset (item->header.from_email);
+	unset (item->header.transport_headers);
+	item->header.recieved_time = 0;
+
+	#undef unset
+
 	mid = exchange_mapi_connection_create_item (conn, olFolderSentMail, fid,
 					 camel_mapi_utils_create_item_build_props, item,
 					 item->recipients, item->attachments, item->generic_streams, MAPI_OPTIONS_DELETE_ON_SUBMIT_FAILURE, perror);
@@ -101,7 +111,7 @@
 	}
 
 	/* Convert MIME to MailItem, attacment lists and recipient list.*/
-	item = camel_mapi_utils_mime_to_item (message, from, NULL);
+	item = camel_mapi_utils_mime_to_item (message, 0, from, NULL);
 
 	/* send */
 	st = mapi_message_item_send (conn, item, error);

=== modified file 'src/camel/camel-mapi-utils.c'
--- src/camel/camel-mapi-utils.c	2010-11-03 16:33:05 +0000
+++ src/camel/camel-mapi-utils.c	2011-01-29 12:46:35 +0000
@@ -98,12 +98,15 @@
 }
 
 static void
-mail_item_set_from(MailItem *item, const gchar *from)
+mail_item_set_from(MailItem *item, const gchar *from_name, const gchar *from_email)
 {
 	if (item->header.from)
 		g_free (item->header.from);
+	if (item->header.from_email)
+		g_free (item->header.from_email);
 
-	item->header.from = g_strdup (from);
+	item->header.from = g_strdup (from_name);
+	item->header.from_email = g_strdup (from_email);
 }
 
 static void
@@ -310,8 +313,21 @@
 	return TRUE;
 }
 
+static void
+mail_item_set_time (time_t *item_time, time_t camel_time, gint camel_offset)
+{
+	if (camel_time == CAMEL_MESSAGE_DATE_CURRENT) {
+		*item_time = 0;
+	} else {
+		/* Convert to UTC */
+		/*camel_time -= (camel_offset / 100) * 60 * 60;
+		camel_time -= (camel_offset % 100) * 60;*/
+		*item_time = camel_time;
+	}
+}
+
 MailItem *
-camel_mapi_utils_mime_to_item (CamelMimeMessage *message, CamelAddress *from, GError **error)
+camel_mapi_utils_mime_to_item (CamelMimeMessage *message, gint32 message_camel_flags, CamelAddress *from, GError **error)
 {
 	CamelDataWrapper *dw = NULL;
 	CamelContentType *type;
@@ -319,9 +335,12 @@
 	CamelMultipart *multipart;
 	CamelInternetAddress *to, *cc, *bcc;
 	MailItem *item = g_new0 (MailItem, 1);
-	const gchar *namep;
-	const gchar *addressp;
+	const gchar *namep = NULL;
+	const gchar *addressp = NULL;
 	const gchar *content_type;
+	time_t msg_time = 0;
+	gint msg_time_offset = 0;
+	GArray *headers;
 
 	gssize	content_size;
 	GSList *recipient_list = NULL;
@@ -340,7 +359,18 @@
 		namep = NULL;
 	}
 
-	mail_item_set_from (item, namep);
+	item->header.flags = 0;
+	if (message_camel_flags & CAMEL_MESSAGE_SEEN)
+		item->header.flags |= MSGFLAG_READ;
+	if (message_camel_flags & CAMEL_MESSAGE_ATTACHMENTS)
+		item->header.flags |= MSGFLAG_HASATTACH;
+
+	mail_item_set_from (item, namep, addressp);
+
+	msg_time = camel_mime_message_get_date (message, &msg_time_offset);
+	if (msg_time == CAMEL_MESSAGE_DATE_CURRENT)
+		msg_time = camel_mime_message_get_date_received (message, &msg_time_offset);
+	mail_item_set_time (&item->header.recieved_time, msg_time, msg_time_offset);
 
 	to = camel_mime_message_get_recipients(message, CAMEL_RECIPIENT_TYPE_TO);
 	for (i = 0; to && camel_internet_address_get (to, i, &namep, &addressp); i++) {
@@ -361,6 +391,25 @@
 		mail_item_set_subject(item, camel_mime_message_get_subject(message));
 	}
 
+	headers = camel_medium_get_headers (CAMEL_MEDIUM (message));
+	if (headers) {
+		GString *hstr = g_string_new ("");
+		gint i;
+
+		for (i = 0; i < headers->len; i++) {
+			CamelMediumHeader *h = &g_array_index (headers, CamelMediumHeader, i);
+
+			if (!h->name || !*h->name || g_ascii_strncasecmp (h->name, "X-Evolution", 11) == 0)
+				continue;
+
+			g_string_append_printf (hstr, "%s: %s\n", h->name, h->value ? h->value : "");
+		}
+
+		camel_medium_free_headers (CAMEL_MEDIUM (message), headers);
+
+		item->header.transport_headers = g_string_free (hstr, hstr->len == 0);
+	}
+
 	/*Add message threading properties */
 	item->header.references = g_strdup (camel_medium_get_header ((CamelMedium *) message, "References"));
 	item->header.in_reply_to = g_strdup (camel_medium_get_header ((CamelMedium *) message, "In-Reply-To"));
@@ -398,7 +447,6 @@
 	MailItem *item = (MailItem *) data;
 	GSList *l;
 	bool send_rich_info;
-	uint32_t msgflag;
 	uint32_t cpid;
 
 	#define set_value(hex, val) G_STMT_START { \
@@ -415,8 +463,26 @@
 	send_rich_info = false;
 	set_value (PR_SEND_RICH_INFO, &send_rich_info);
 
-	msgflag = MSGFLAG_UNSENT;
-	set_value (PR_MESSAGE_FLAGS, &msgflag);
+	set_value (PR_MESSAGE_FLAGS, &item->header.flags);
+
+	if (item->header.from && *item->header.from)
+		set_value (PR_SENT_REPRESENTING_NAME_UNICODE, item->header.from);
+
+	if (item->header.from_email && *item->header.from_email) {
+		set_value (PR_SENT_REPRESENTING_ADDRTYPE_UNICODE, "SMTP");
+		set_value (PR_SENT_REPRESENTING_EMAIL_ADDRESS_UNICODE, item->header.from_email);
+	}
+
+	if (item->header.recieved_time != 0) {
+		struct FILETIME msg_date = { 0 };
+
+		exchange_mapi_util_time_t_to_filetime (item->header.recieved_time, &msg_date);
+
+		set_value (PR_MESSAGE_DELIVERY_TIME, &msg_date);
+	}
+
+	if (item->header.transport_headers && *item->header.transport_headers)
+		set_value (PR_TRANSPORT_MESSAGE_HEADERS_UNICODE, item->header.transport_headers);
 
 	/* Message threading information */
 	if (item->header.references)

=== modified file 'src/camel/camel-mapi-utils.h'
--- src/camel/camel-mapi-utils.h	2010-11-03 16:33:05 +0000
+++ src/camel/camel-mapi-utils.h	2011-01-29 12:46:35 +0000
@@ -31,7 +31,7 @@
 #include <camel/camel.h>
 
 MailItem *
-camel_mapi_utils_mime_to_item (CamelMimeMessage *message, CamelAddress *from, GError **error);
+camel_mapi_utils_mime_to_item (CamelMimeMessage *message, gint32 message_camel_flags, CamelAddress *from, GError **error);
 
 gboolean
 camel_mapi_utils_create_item_build_props (ExchangeMapiConnection *conn, mapi_id_t fid, TALLOC_CTX *mem_ctx, struct SPropValue **values, uint32_t *n_values, gpointer data);

=== modified file 'src/libexchangemapi/exchange-mapi-cal-utils.c'
--- src/libexchangemapi/exchange-mapi-cal-utils.c	2010-11-03 16:33:05 +0000
+++ src/libexchangemapi/exchange-mapi-cal-utils.c	2011-01-29 12:46:35 +0000
@@ -368,9 +368,14 @@
 		const gchar *str = NULL;
 		icalparameter *param;
 
-		recipient = g_new0 (ExchangeMAPIRecipient, 1);
-
 		str = icalproperty_get_attendee (att_prop);
+		if (!str || g_ascii_strcasecmp (str, org) == 0) {
+			att_prop = icalcomponent_get_next_property (icalcomp, ICAL_ATTENDEE_PROPERTY);
+			continue;
+		}
+
+		recipient = g_new0 (ExchangeMAPIRecipient, 1);
+
 		if (!g_ascii_strncasecmp (str, "mailto:", 7))
 			recipient->email_id = (str) + 7;
 		else
@@ -1239,7 +1244,7 @@
 	struct icaltimetype dtstart, dtend, utc_dtstart, utc_dtend;
 	const icaltimezone *utc_zone;
 	const gchar *dtstart_tz_location, *dtend_tz_location, *text = NULL;
-	struct timeval t;
+	time_t tt;
 
 	g_return_val_if_fail (conn != NULL, FALSE);
 	g_return_val_if_fail (mem_ctx != NULL, FALSE);
@@ -1275,12 +1280,8 @@
 
 	#define set_datetime_value(hex, dtval) G_STMT_START {		\
 		struct FILETIME	filetime;				\
-		NTTIME		nttime;					\
-									\
-		nttime = timeval_to_nttime(dtval);				\
-									\
-		filetime.dwLowDateTime = (nttime << 32) >> 32;		\
-		filetime.dwHighDateTime = nttime >> 32;			\
+									\
+		exchange_mapi_util_time_t_to_filetime (dtval, &filetime); \
 									\
 		if (!exchange_mapi_utils_add_spropvalue (mem_ctx, values, n_values, hex, &filetime)) \
 			return FALSE;	\
@@ -1288,12 +1289,8 @@
 
 	#define set_named_datetime_value(named_id, dtval) G_STMT_START { \
 		struct FILETIME	filetime;				\
-		NTTIME		nttime;					\
-									\
-		nttime = timeval_to_nttime(dtval);				\
-									\
-		filetime.dwLowDateTime = (nttime << 32) >> 32;		\
-		filetime.dwHighDateTime = nttime >> 32;			\
+									\
+		exchange_mapi_util_time_t_to_filetime (dtval, &filetime); \
 									\
 		if (!exchange_mapi_utils_add_spropvalue_named_id (conn, fid, mem_ctx, values, n_values, named_id, &filetime)) \
 			return FALSE;	\
@@ -1393,13 +1390,11 @@
 		}
 	set_named_value (PidLidReminderSet, &b);
 	set_named_value (PidLidReminderDelta, &flag32);
-	t.tv_sec = icaltime_as_timet (utc_dtstart);
-	t.tv_usec = 0;
-	set_named_datetime_value (PidLidReminderTime, &t);
-	t.tv_sec = icaltime_as_timet (utc_dtstart) - (flag32 * SECS_IN_MINUTE);
-	t.tv_usec = 0;
+	tt = icaltime_as_timet (utc_dtstart);
+	set_named_datetime_value (PidLidReminderTime, tt);
+	tt = icaltime_as_timet (utc_dtstart) - (flag32 * SECS_IN_MINUTE);
 	/* ReminderNextTime: FIXME for recurrence */
-	set_named_datetime_value (PidLidReminderSignalTime, &t);
+	set_named_datetime_value (PidLidReminderSignalTime, tt);
 
 	/* Sensitivity, Private */
 	flag32 = olNormal;	/* default */
@@ -1412,15 +1407,13 @@
 	set_value (PR_SENSITIVITY, &flag32);
 	set_named_value (PidLidPrivate, &b);
 
-	t.tv_sec = icaltime_as_timet (utc_dtstart);
-	t.tv_usec = 0;
-	set_named_datetime_value (PidLidCommonStart, &t);
-	set_datetime_value (PR_START_DATE, &t);
+	tt = icaltime_as_timet (utc_dtstart);
+	set_named_datetime_value (PidLidCommonStart, tt);
+	set_datetime_value (PR_START_DATE, tt);
 
-	t.tv_sec = icaltime_as_timet (utc_dtend);
-	t.tv_usec = 0;
-	set_named_datetime_value (PidLidCommonEnd, &t);
-	set_datetime_value (PR_END_DATE, &t);
+	tt = icaltime_as_timet (utc_dtend);
+	set_named_datetime_value (PidLidCommonEnd, tt);
+	set_datetime_value (PR_END_DATE, tt);
 
 	b = 1;
 	set_value (PR_RESPONSE_REQUESTED, &b);
@@ -1467,11 +1460,10 @@
 		set_named_value (PidLidAutoFillLocation, &b);
 
 		/* Start */
-		t.tv_sec = icaltime_as_timet (utc_dtstart);
-		t.tv_usec = 0;
-		set_named_datetime_value (PidLidAppointmentStartWhole, &t);
+		tt = icaltime_as_timet (utc_dtstart);
+		set_named_datetime_value (PidLidAppointmentStartWhole, tt);
 		/* FIXME: for recurrence */
-		set_named_datetime_value (PidLidClipStart, &t);
+		set_named_datetime_value (PidLidClipStart, tt);
 
 		/* Start TZ */
 		mapi_tzid = exchange_mapi_cal_tz_util_get_mapi_equivalent ((dtstart_tz_location && *dtstart_tz_location) ? dtstart_tz_location : "UTC");
@@ -1481,11 +1473,10 @@
 		}
 
 		/* End */
-		t.tv_sec = icaltime_as_timet (utc_dtend);
-		t.tv_usec = 0;
-		set_named_datetime_value (PidLidAppointmentEndWhole, &t);
+		tt = icaltime_as_timet (utc_dtend);
+		set_named_datetime_value (PidLidAppointmentEndWhole, tt);
 		/* FIXME: for recurrence */
-		set_named_datetime_value (PidLidClipEnd, &t);
+		set_named_datetime_value (PidLidClipEnd, tt);
 
 		/* End TZ */
 		mapi_tzid = exchange_mapi_cal_tz_util_get_mapi_equivalent ((dtend_tz_location && *dtend_tz_location) ? dtend_tz_location : "UTC");
@@ -1726,25 +1717,22 @@
 			completed = icalproperty_get_completed (prop);
 
 			completed.hour = completed.minute = completed.second = 0; completed.is_date = completed.is_utc = 1;
-			t.tv_sec = icaltime_as_timet (completed);
-			t.tv_usec = 0;
-			set_named_datetime_value (PidLidTaskDateCompleted, &t);
+			tt = icaltime_as_timet (completed);
+			set_named_datetime_value (PidLidTaskDateCompleted, tt);
 		}
 
 		/* Start */
 		dtstart.hour = dtstart.minute = dtstart.second = 0; dtstart.is_date = dtstart.is_utc = 1;
-		t.tv_sec = icaltime_as_timet (dtstart);
-		t.tv_usec = 0;
+		tt = icaltime_as_timet (dtstart);
 		if (!icaltime_is_null_time (dtstart)) {
-			set_named_datetime_value (PidLidTaskStartDate, &t);
+			set_named_datetime_value (PidLidTaskStartDate, tt);
 		}
 
 		/* Due */
 		dtend.hour = dtend.minute = dtend.second = 0; dtend.is_date = dtend.is_utc = 1;
-		t.tv_sec = icaltime_as_timet (dtend);
-		t.tv_usec = 0;
+		tt = icaltime_as_timet (dtend);
 		if (!icaltime_is_null_time (dtend)) {
-			set_named_datetime_value (PidLidTaskDueDate, &t);
+			set_named_datetime_value (PidLidTaskDueDate, tt);
 		}
 
 		/* FIXME: Evolution does not support recurring tasks */

=== modified file 'src/libexchangemapi/exchange-mapi-connection.c'
--- src/libexchangemapi/exchange-mapi-connection.c	2010-11-03 16:33:05 +0000
+++ src/libexchangemapi/exchange-mapi-connection.c	2011-01-29 12:46:35 +0000
@@ -28,7 +28,10 @@
 
 #include <glib/gi18n-lib.h>
 #include <camel/camel.h>
+#include <libedataserver/e-account.h>
+#include <libedataserver/e-account-list.h>
 #include <libedataserver/e-data-server-util.h>
+#include <libedataserver/e-flag.h>
 
 #include "exchange-mapi-connection.h"
 #include "exchange-mapi-folder.h"
@@ -40,6 +43,7 @@
 
 static void register_connection (ExchangeMapiConnection *conn);
 static void unregister_connection (ExchangeMapiConnection *conn);
+static gboolean mapi_profile_create (const gchar *username, const gchar *password, const gchar *domain, const gchar *server, guint32 flags, mapi_profile_callback_t callback, gpointer data, GError **perror, gboolean use_locking);
 static struct mapi_session *mapi_profile_load (const gchar *profname, const gchar *password, GError **perror);
 static void ema_global_lock (void);
 static void ema_global_unlock (void);
@@ -917,6 +921,38 @@
 	return res;
 }
 
+static gboolean
+may_skip_property (uint32_t proptag)
+{
+	/* skip all "strange" properties */
+	gboolean skip = TRUE;
+
+	switch (proptag & 0xFFFF) {
+	case PT_BOOLEAN:
+	case PT_I2:
+	case PT_LONG:
+	case PT_DOUBLE:
+	case PT_I8:
+	case PT_STRING8:
+	case PT_UNICODE:
+	case PT_SYSTIME:
+	case PT_BINARY:
+	case PT_ERROR:
+	case PT_CLSID:
+	case PT_SVREID:
+	case PT_MV_STRING8:
+	case PT_MV_UNICODE:
+	case PT_MV_BINARY:
+	case PT_MV_LONG:
+		skip = FALSE;
+		break;
+	default:
+		break;
+	}
+
+	return skip;
+}
+
 /* Returns TRUE if all attachments were read succcesfully, else returns FALSE */
 static gboolean
 exchange_mapi_util_get_attachments (ExchangeMapiConnection *conn, mapi_id_t fid, mapi_object_t *obj_message, GSList **attach_list, GError **perror)
@@ -974,7 +1010,7 @@
 		struct mapi_SPropValue_array properties;
 		const uint32_t	*ui32;
 		mapi_object_t	obj_attach;
-		uint32_t	z;
+		uint32_t	z, az;
 
 		mapi_object_init(&obj_attach);
 
@@ -992,33 +1028,41 @@
 			goto loop_cleanup;
 		}
 
+		mapi_SPropValue_array_named (&obj_attach, &properties);
+
+		az = 0;
 		attachment = g_new0 (ExchangeMAPIAttachment, 1);
 		attachment->cValues = properties.cValues;
 		attachment->lpProps = g_new0 (struct SPropValue, attachment->cValues + 1);
 		for (z=0; z < properties.cValues; z++) {
+			if (may_skip_property (properties.lpProps[z].ulPropTag)) {
+				attachment->cValues--;
+				continue;
+			}
+
 			cast_SPropValue (
 				#ifdef HAVE_MEMCTX_ON_CAST_SPROPVALUE
 				mem_ctx,
 				#endif
-				&properties.lpProps[z], &(attachment->lpProps[z]));
+				&properties.lpProps[z], &(attachment->lpProps[az]));
 
-			if ((attachment->lpProps[z].ulPropTag & 0xFFFF) == PT_STRING8) {
+			if ((attachment->lpProps[az].ulPropTag & 0xFFFF) == PT_STRING8) {
 				struct SPropValue *lpProps;
 				struct SPropTagArray *tags;
 				uint32_t prop_count = 0;
 
 				/* prefer unicode strings, if available */
-				tags = set_SPropTagArray (mem_ctx, 0x1, (attachment->lpProps[z].ulPropTag & 0xFFFF0000) | PT_UNICODE);
+				tags = set_SPropTagArray (mem_ctx, 0x1, (attachment->lpProps[az].ulPropTag & 0xFFFF0000) | PT_UNICODE);
 				if (MAPI_E_SUCCESS == GetProps (&obj_attach, tags, &lpProps, &prop_count) && prop_count == 1 && lpProps) {
 					if ((lpProps->ulPropTag & 0xFFFF) == PT_UNICODE)
-						attachment->lpProps[z] = *lpProps;
+						attachment->lpProps[az] = *lpProps;
 				}
 				MAPIFreeBuffer (tags);
 			}
+
+			az++;
 		}
 
-		mapi_SPropValue_array_named (&obj_attach, &properties);
-
 		/* just to get all the other streams */
 		for (z = 0; z < properties.cValues; z++) {
 			if ((properties.lpProps[z].ulPropTag & 0xFFFF) == PT_BINARY) {
@@ -1331,7 +1375,7 @@
 	/* Modify the recipient table */
 	ms = ModifyRecipients (obj_message, SRowSet);
 	if (ms != MAPI_E_SUCCESS) {
-		make_mapi_error (perror, "ModifyRecpients", ms);
+		make_mapi_error (perror, "ModifyRecipients", ms);
 		goto cleanup;
 	}
 
@@ -1602,7 +1646,7 @@
 			if (propsTagArray && propsTagArray->cValues) {
 				struct SPropValue *lpProps;
 				struct SPropTagArray *tags;
-				uint32_t prop_count = 0, k;
+				uint32_t prop_count = 0, k, ll;
 				/* we need to make a local copy of the tag array
 				 * since GetProps will modify the array on any
 				 * errors */
@@ -1618,23 +1662,26 @@
 				properties_array.lpProps = talloc_zero_array (mem_ctx, struct mapi_SPropValue,
 									 prop_count + 1);
 				properties_array.cValues = prop_count;
-				for (k = 0; k < prop_count; k++) {
+				for (k = 0, ll = 0; k < prop_count; k++, ll++) {
 					if ((lpProps[k].ulPropTag & 0xFFFF) == PT_MV_BINARY) {
 						uint32_t ci;
 
-						properties_array.lpProps[k].ulPropTag = lpProps[k].ulPropTag;
-						properties_array.lpProps[k].value.MVbin.cValues = lpProps[k].value.MVbin.cValues;
-						properties_array.lpProps[k].value.MVbin.bin = (struct SBinary_short *) talloc_array (mem_ctx, struct Binary_r, properties_array.lpProps[k].value.MVbin.cValues);
-						for (ci = 0; ci < properties_array.lpProps[k].value.MVbin.cValues; ci++) {
-							properties_array.lpProps[k].value.MVbin.bin[ci].cb = lpProps[k].value.MVbin.lpbin[ci].cb;
-							properties_array.lpProps[k].value.MVbin.bin[ci].lpb = lpProps[k].value.MVbin.lpbin[ci].lpb;
+						properties_array.lpProps[ll].ulPropTag = lpProps[k].ulPropTag;
+						properties_array.lpProps[ll].value.MVbin.cValues = lpProps[k].value.MVbin.cValues;
+						properties_array.lpProps[ll].value.MVbin.bin = (struct SBinary_short *) talloc_array (mem_ctx, struct Binary_r, properties_array.lpProps[ll].value.MVbin.cValues);
+						for (ci = 0; ci < properties_array.lpProps[ll].value.MVbin.cValues; ci++) {
+							properties_array.lpProps[ll].value.MVbin.bin[ci].cb = lpProps[k].value.MVbin.lpbin[ci].cb;
+							properties_array.lpProps[ll].value.MVbin.bin[ci].lpb = lpProps[k].value.MVbin.lpbin[ci].lpb;
 						}
+					} else if (may_skip_property (lpProps[k].ulPropTag)) {
+						ll--;
+						properties_array.cValues--;
 					} else {
 						cast_mapi_SPropValue (
 							#ifdef HAVE_MEMCTX_ON_CAST_MAPI_SPROPVALUE
 							mem_ctx,
 							#endif
-							&properties_array.lpProps[k], &lpProps[k]);
+							&properties_array.lpProps[ll], &lpProps[k]);
 					}
 				}
 			} else {
@@ -1765,7 +1812,7 @@
 
 	if (propsTagArray && propsTagArray->cValues) {
 		struct SPropValue *lpProps;
-		uint32_t prop_count = 0, k;
+		uint32_t prop_count = 0, k, ll;
 
 		lpProps = talloc_zero(mem_ctx, struct SPropValue);
 
@@ -1776,12 +1823,18 @@
 		/* Conversion from SPropValue to mapi_SPropValue. (no padding here) */
 		properties_array.cValues = prop_count;
 		properties_array.lpProps = talloc_zero_array (mem_ctx, struct mapi_SPropValue, prop_count + 1);
-		for (k=0; k < prop_count; k++)
-			cast_mapi_SPropValue (
-				#ifdef HAVE_MEMCTX_ON_CAST_MAPI_SPROPVALUE
-				mem_ctx,
-				#endif
-				&properties_array.lpProps[k], &lpProps[k]);
+		for (k = 0, ll = 0; k < prop_count; k++, ll++) {
+			if (may_skip_property (lpProps[k].ulPropTag)) {
+				ll--;
+				properties_array.cValues--;
+			} else {
+				cast_mapi_SPropValue (
+					#ifdef HAVE_MEMCTX_ON_CAST_MAPI_SPROPVALUE
+					mem_ctx,
+					#endif
+					&properties_array.lpProps[ll], &lpProps[k]);
+			}
+		}
 	} else {
 		ms = GetPropsAll (obj_message, &properties_array);
 		if (ms != MAPI_E_SUCCESS)
@@ -1974,6 +2027,14 @@
 
 	fid = mapi_object_get_id (&obj_folder);
 	g_debug("Folder %s created with id %016" G_GINT64_MODIFIER "X ", name, fid);
+	
+	/* we should also update folder list locally */
+	if (fid != 0 && priv->folders != NULL) {
+		ExchangeMAPIFolder *folder = NULL;
+		folder = exchange_mapi_folder_new (name, type, MAPI_PERSONAL_FOLDER, fid, pfid, 0, 0, 0);
+		if (folder)
+			priv->folders = g_slist_append (priv->folders, folder);
+	}
 
 cleanup:
 	mapi_object_release(&obj_folder);
@@ -2041,13 +2102,16 @@
 	CHECK_CORRECT_CONN_AND_GET_PRIV (conn, FALSE);
 	e_return_val_mapi_error_if_fail (priv->session != NULL, MAPI_E_INVALID_PARAMETER, FALSE);
 
+	g_return_val_if_fail (fid != 0, FALSE);
+
 	g_debug("%s: Entering %s ", G_STRLOC, G_STRFUNC);
 
 	folder = NULL;
-	for (l = exchange_mapi_connection_peek_folders_list (conn); l && !folder; l = l->next) {
+	for (l = exchange_mapi_connection_peek_folders_list (conn); l; l = l->next) {
 		folder = l->data;
-
-		if (!folder || !folder->folder_id || folder->folder_id != fid)
+		if (folder && folder->folder_id == fid)
+			break;
+		else
 			folder = NULL;
 	}
 
@@ -3413,6 +3477,89 @@
 
 /* profile related functions - begin */
 
+struct tcp_data
+{
+	const gchar *profname;
+	const gchar *password;
+	EFlag *eflag;
+	gboolean has_profile;
+};
+
+static gboolean
+try_create_profile_main_thread_cb (struct tcp_data *data)
+{
+	EAccountList *accounts;
+	EIterator *iter;
+	GConfClient *gconf;
+
+	g_return_val_if_fail (data != NULL, FALSE);
+
+	gconf = gconf_client_get_default ();
+	accounts = e_account_list_new (gconf);
+	for (iter = e_list_get_iterator (E_LIST (accounts)); e_iterator_is_valid (iter); e_iterator_next (iter)) {
+		EAccount *account = E_ACCOUNT (e_iterator_get (iter));
+		if (account && account->source && account->source->url && g_ascii_strncasecmp (account->source->url, "mapi://", 7) == 0) {
+			CamelURL *url = camel_url_new (e_account_get_string (account, E_ACCOUNT_SOURCE_URL), NULL);
+			const gchar *domain_name;
+
+			domain_name = camel_url_get_param (url, "domain");
+			if (data->password && *data->password && domain_name && *domain_name && url->user && *url->user && url->host && *url->host) {
+				gchar *profname = exchange_mapi_util_profile_name (url->user, domain_name, url->host, FALSE);
+
+				if (profname && g_str_equal (profname, data->profname)) {
+					guint32 cp_flags = (camel_url_get_param (url, "ssl") && g_str_equal (camel_url_get_param (url, "ssl"), "1")) ? CREATE_PROFILE_FLAG_USE_SSL : CREATE_PROFILE_FLAG_NONE;
+
+					/* do not use locking here, because when this is called then other thread is holding the lock */
+					data->has_profile = mapi_profile_create (url->user, data->password, domain_name, url->host, cp_flags, NULL, NULL, NULL, FALSE);
+
+					g_free (profname);
+					camel_url_free (url);
+					break;
+				}
+
+				g_free (profname);
+			}
+
+			camel_url_free (url);
+		}
+	}
+
+	g_object_unref (accounts);
+	g_object_unref (gconf);
+
+	e_flag_set (data->eflag);
+
+	return FALSE;
+}
+
+static gboolean
+try_create_profile (const gchar *profname, const gchar *password)
+{
+	struct tcp_data data;
+
+	g_return_val_if_fail (profname != NULL, FALSE);
+	g_return_val_if_fail (*profname != 0, FALSE);
+	g_return_val_if_fail (password != NULL, FALSE);
+	g_return_val_if_fail (*password != 0, FALSE);
+
+	data.profname = profname;
+	data.password = password;
+	data.eflag = e_flag_new ();
+	data.has_profile = FALSE;
+
+	if (!g_main_context_is_owner (g_main_context_default ())) {
+		/* function called from other than main thread */
+		g_timeout_add (10, (GSourceFunc) try_create_profile_main_thread_cb, &data);
+		e_flag_wait (data.eflag);
+	} else {
+		try_create_profile_main_thread_cb (&data);
+	}
+
+	e_flag_free (data.eflag);
+
+	return data.has_profile;
+}
+
 static void
 mapi_debug_logger (const gchar * domain, GLogLevelFlags level, const gchar * message, gpointer data)
 {
@@ -3524,6 +3671,9 @@
 	g_debug("Loading profile %s ", profname);
 
 	ms = MapiLogonEx (&session, profname, password);
+	if (ms == MAPI_E_NOT_FOUND && try_create_profile (profname, password))
+		ms = MapiLogonEx (&session, profname, password);
+
 	if (ms != MAPI_E_SUCCESS) {
 		make_mapi_error (perror, "MapiLogonEx", ms);
 		goto cleanup;
@@ -3536,11 +3686,12 @@
 	return session;
 }
 
-gboolean
-exchange_mapi_create_profile (const gchar *username, const gchar *password, const gchar *domain,
-			      const gchar *server, guint32 flags,
-			      mapi_profile_callback_t callback, gpointer data,
-			      GError **perror)
+static gboolean
+mapi_profile_create (const gchar *username, const gchar *password, const gchar *domain,
+		     const gchar *server, guint32 flags,
+		     mapi_profile_callback_t callback, gpointer data,
+		     GError **perror,
+		     gboolean use_locking)
 {
 	enum MAPISTATUS	ms;
 	gboolean result = FALSE;
@@ -3552,12 +3703,14 @@
 	e_return_val_mapi_error_if_fail (username && *username && password && *password &&
 			      domain && *domain && server && *server, MAPI_E_INVALID_PARAMETER, FALSE);
 
-	g_static_rec_mutex_lock (&profile_mutex);
+	if (use_locking)
+		g_static_rec_mutex_lock (&profile_mutex);
 
 	g_debug ("Create profile with %s %s %s\n", username, domain, server);
 
 	if (!ensure_mapi_init_called (perror)) {
-		g_static_rec_mutex_unlock (&profile_mutex);
+		if (use_locking)
+			g_static_rec_mutex_unlock (&profile_mutex);
 		return FALSE;
 	}
 
@@ -3627,12 +3780,22 @@
 		mapi_object_release (&msg_store);
 	}*/
 
-	g_static_rec_mutex_unlock (&profile_mutex);
+	if (use_locking)
+		g_static_rec_mutex_unlock (&profile_mutex);
 
 	return result;
 }
 
 gboolean
+exchange_mapi_create_profile (const gchar *username, const gchar *password, const gchar *domain,
+			      const gchar *server, guint32 flags,
+			      mapi_profile_callback_t callback, gpointer data,
+			      GError **perror)
+{
+	return mapi_profile_create (username, password, domain, server, flags, callback, data, perror, TRUE);
+}
+
+gboolean
 exchange_mapi_delete_profile (const gchar *profile, GError **perror)
 {
 	gboolean result = FALSE;

=== modified file 'src/libexchangemapi/exchange-mapi-mail-utils.c'
--- src/libexchangemapi/exchange-mapi-mail-utils.c	2010-10-19 15:03:33 +0000
+++ src/libexchangemapi/exchange-mapi-mail-utils.c	2011-01-29 12:46:35 +0000
@@ -135,12 +135,7 @@
 	}
 
 	if (delivery_date) {
-		NTTIME ntdate = { 0 };
-
-		ntdate = delivery_date->dwHighDateTime;
-		ntdate = ntdate << 32;
-		ntdate |= delivery_date->dwLowDateTime;
-		item->header.recieved_time = nt_time_to_unix(ntdate);
+		item->header.recieved_time = exchange_mapi_util_filetime_to_time_t (delivery_date);
 	}
 
 	if (flags && (*flags & MSGFLAG_READ) != 0)
@@ -304,7 +299,8 @@
 	GSList *l = NULL;
 	CamelInternetAddress *to_addr, *cc_addr, *bcc_addr;
 
-	g_return_if_fail (item->recipients != NULL);
+	if (!item->recipients || item->header.transport_headers)
+		return;
 
 	to_addr = camel_internet_address_new ();
 	cc_addr = camel_internet_address_new ();
@@ -360,7 +356,9 @@
 		camel_mime_message_set_recipients(msg, "Bcc", bcc_addr);
 	}
 
-	/*TODO : Unref *_addr ? */
+	g_object_unref (to_addr);
+	g_object_unref (cc_addr);
+	g_object_unref (bcc_addr);
 }
 
 static void
@@ -404,6 +402,10 @@
 
 		g_object_unref (parser);
 		g_object_unref (part);
+	} else {
+		recieved_time = item->header.recieved_time;
+		actual_time = camel_header_decode_date (ctime(&recieved_time), &offset);
+		camel_mime_message_set_date (msg, actual_time, offset);
 	}
 
 	/* Overwrite headers if we have specific properties available*/
@@ -411,11 +413,6 @@
 	if (temp_str)
 		camel_mime_message_set_subject (msg, temp_str);
 
-	recieved_time = item->header.recieved_time;
-
-	actual_time = camel_header_decode_date (ctime(&recieved_time), &offset);
-	/* camel_mime_message_set_date (msg, actual_time, offset); */
-
 	if (item->header.from) {
 		if ((item->header.from_type != NULL) && !g_utf8_collate (item->header.from_type, "EX")) {
 			gchar *from_email;

=== modified file 'src/libexchangemapi/exchange-mapi-utils.c'
--- src/libexchangemapi/exchange-mapi-utils.c	2010-10-19 15:03:33 +0000
+++ src/libexchangemapi/exchange-mapi-utils.c	2011-01-29 12:46:35 +0000
@@ -1136,3 +1136,37 @@
 	g_free (bin->lpb);
 	g_free (bin);
 }
+
+time_t
+exchange_mapi_util_filetime_to_time_t (const struct FILETIME *filetime)
+{
+	NTTIME nt;
+
+	if (!filetime)
+		return (time_t) -1;
+
+	nt = filetime->dwHighDateTime;
+	nt = nt << 32;
+	nt |= filetime->dwLowDateTime;
+
+	nt /=  10 * 1000 * 1000;
+	nt -= 11644473600LL;
+
+	return (time_t) nt;
+}
+
+void
+exchange_mapi_util_time_t_to_filetime (const time_t tt, struct FILETIME *filetime)
+{
+	NTTIME nt;
+
+	g_return_if_fail (filetime != NULL);
+
+	nt = tt;
+	nt += 11644473600LL;
+	nt *=  10 * 1000 * 1000;
+
+	filetime->dwLowDateTime = nt & 0xFFFFFFFF;
+	nt = nt >> 32;
+	filetime->dwHighDateTime = nt & 0xFFFFFFFF;
+}

=== modified file 'src/libexchangemapi/exchange-mapi-utils.h'
--- src/libexchangemapi/exchange-mapi-utils.h	2010-10-19 15:03:33 +0000
+++ src/libexchangemapi/exchange-mapi-utils.h	2011-01-29 12:46:35 +0000
@@ -83,4 +83,7 @@
 struct Binary_r *exchange_mapi_util_copy_binary_r (const struct Binary_r *bin);
 void exchange_mapi_util_free_binary_r (struct Binary_r *bin);
 
+time_t exchange_mapi_util_filetime_to_time_t (const struct FILETIME *filetime);
+void exchange_mapi_util_time_t_to_filetime (const time_t tt, struct FILETIME *filetime);
+
 #endif