Merge branch 'master' into kill-bonobo

Conflicts:
	addressbook/gui/Makefile.am
	addressbook/gui/widgets/Makefile.am
	addressbook/gui/widgets/eab-popup-control.c
	calendar/gui/e-meeting-time-sel.c
	calendar/gui/migration.c
	calendar/modules/e-memo-shell-module-migrate.h
	e-util/e-logger.c
	mail/e-mail-attachment-bar.c
	mail/em-composer-utils.c
	mail/em-format-html-display.c
	plugins/mail-account-disable/Makefile.am
	plugins/select-one-source/Makefile.am
	po/es.po
	shell/Makefile.am
	shell/e-shell-common.h
	shell/e-shell-nm.c
	shell/e-shell-window-commands.c
	shell/e-shell-window.c
	shell/e-sidebar.c
	shell/e-user-creatable-items-handler.c
	shell/importer/Makefile.am
	shell/test/Makefile.am
	widgets/misc/test-error.c
	widgets/misc/test-info-label.c
	widgets/misc/test-multi-config-dialog.c

1 files changed, 3 insertions, 3 deletions

diff --git a/mail/evolution-mail.schemas.in b/mail/evolution-mail.schemas.in
index 3dca693698..2f6ecfef3c 100644
--- a/mail/evolution-mail.schemas.in
+++ b/mail/evolution-mail.schemas.in
@@ -234,8 +234,8 @@
       <locale name="C">
          <short>Enable or disable type ahead search feature</short>
          <long>
-           Enable side bar search feature so that you can start interactive searching by typing in the text. Use is that you can easily find a folder in that side bar by just typing the folder name and the selection jumps automatically to that folder.
-         </long>
+          Enable the side bar search feature to allow interactive searching of folder names.
+       </long>
       </locale>
     </schema>
 
@@ -969,7 +969,7 @@
       <locale name="C">
          <short>Prompt while marking multiple messages</short>
          <long>
-	 It disables/enables the prompt while marking multiple messages.
+	Enable or disable the prompt whilst marking multiple messages.
          </long>
       </locale>
     </schema>