Updated Canadian English translation.

	* en_CA.po: Updated Canadian English translation.

svn path=/trunk/; revision=29029

2 files changed, 4536 insertions, 4448 deletions

diff --git a/po/ChangeLog b/po/ChangeLog
index 205c954244..cca8728298 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,7 @@
+2005-03-15  Adam Weinberger  <adamw@gnome.org>
+
+	* en_CA.po: Updated Canadian English translation.
+
 2005-03-15  Guilherme de S. Pastore  <gpastore@cvs.gnome.org>
 
 	* pt_BR.po: Fixed a grammar problem with the "Error while"
diff --git a/po/en_CA.po b/po/en_CA.po
index 2b8cbede42..ef8f99c25c 100644
--- a/po/en_CA.po
+++ b/po/en_CA.po
@@ -8,140 +8,141 @@ msgid ""
 msgstr ""
 "Project-Id-Version: evolution\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-02-20 11:21-0500\n"
-"PO-Revision-Date: 2005-02-20 19:18-0400\n"
+"POT-Creation-Date: 2005-03-15 23:18-0500\n"
+"PO-Revision-Date: 2005-03-15 19:18-0400\n"
 "Last-Translator: Adam Weinberger <adamw@gnome.org>\n"
-"Language-Team: Canadian English <adamw@FreeBSD.org>\n"
+"Language-Team: Canadian English <adamw@gnome.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: a11y/addressbook/ea-addressbook-view.c:94
-#: a11y/addressbook/ea-addressbook-view.c:103
-#: a11y/addressbook/ea-minicard-view.c:166
+#: ../a11y/addressbook/ea-addressbook-view.c:94
+#: ../a11y/addressbook/ea-addressbook-view.c:103
+#: ../a11y/addressbook/ea-minicard-view.c:166
 msgid "evolution addressbook"
 msgstr "evolution addressbook"
 
-#: a11y/addressbook/ea-minicard-view.c:34
-#: addressbook/gui/component/addressbook-component.c:182
+#: ../a11y/addressbook/ea-minicard-view.c:34
+#: ../addressbook/gui/component/addressbook-component.c:196
 msgid "New Contact"
 msgstr "New Contact"
 
-#: a11y/addressbook/ea-minicard-view.c:35
-#: addressbook/gui/component/addressbook-component.c:190
+#: ../a11y/addressbook/ea-minicard-view.c:35
+#: ../addressbook/gui/component/addressbook-component.c:204
 msgid "New Contact List"
 msgstr "New Contact List"
 
-#: a11y/addressbook/ea-minicard-view.c:149
+#: ../a11y/addressbook/ea-minicard-view.c:149
 #, c-format
 msgid "current addressbook folder has %d card"
 msgid_plural "current addressbook folder has %d cards"
 msgstr[0] "current addressbook folder has %d card"
 msgstr[1] "current addressbook folder has %d cards"
 
-#: a11y/addressbook/ea-minicard.c:31
-#: calendar/gui/alarm-notify/alarm-queue.c:863
-#: ui/evolution-message-composer.xml.h:10
+#: ../a11y/addressbook/ea-minicard.c:31
+#: ../calendar/gui/alarm-notify/alarm-queue.c:878
+#: ../ui/evolution-message-composer.xml.h:10
 msgid "Open"
 msgstr "Open"
 
-#: a11y/addressbook/ea-minicard.c:138
+#: ../a11y/addressbook/ea-minicard.c:138
 msgid "Contact List: "
 msgstr "Contact List: "
 
-#: a11y/addressbook/ea-minicard.c:139
+#: ../a11y/addressbook/ea-minicard.c:139
 msgid "Contact: "
 msgstr "Contact: "
 
-#: a11y/addressbook/ea-minicard.c:165
+#: ../a11y/addressbook/ea-minicard.c:165
 msgid "evolution minicard"
 msgstr "evolution minicard"
 
-#: a11y/calendar/ea-cal-view-event.c:235
+#: ../a11y/calendar/ea-cal-view-event.c:235
 msgid "It has alarms."
 msgstr "It has alarms."
 
-#: a11y/calendar/ea-cal-view-event.c:238
+#: ../a11y/calendar/ea-cal-view-event.c:238
 msgid "It has recurrences."
 msgstr "It has recurrences."
 
-#: a11y/calendar/ea-cal-view-event.c:241
+#: ../a11y/calendar/ea-cal-view-event.c:241
 msgid "It is a meeting."
 msgstr "It is a meeting."
 
-#: a11y/calendar/ea-cal-view-event.c:247
+#: ../a11y/calendar/ea-cal-view-event.c:247
 #, c-format
 msgid "Calendar Event: Summary is %s."
 msgstr "Calendar Event: Summary is %s."
 
-#: a11y/calendar/ea-cal-view-event.c:249
+#: ../a11y/calendar/ea-cal-view-event.c:249
 msgid "Calendar Event: It has no summary."
 msgstr "Calendar Event: It has no summary."
 
-#: a11y/calendar/ea-cal-view-event.c:268
+#: ../a11y/calendar/ea-cal-view-event.c:268
 msgid "calendar view event"
 msgstr "calendar view event"
 
-#: a11y/calendar/ea-cal-view-event.c:485
+#: ../a11y/calendar/ea-cal-view-event.c:485
 msgid "Grab Focus"
 msgstr "Grab Focus"
 
-#: a11y/calendar/ea-cal-view.c:306
+#: ../a11y/calendar/ea-cal-view.c:306
 msgid "New Appointment"
 msgstr "New Appointment"
 
-#: a11y/calendar/ea-cal-view.c:307
+#: ../a11y/calendar/ea-cal-view.c:307
 msgid "New All Day Event"
 msgstr "New All Day Event"
 
-#: a11y/calendar/ea-cal-view.c:308 calendar/gui/e-calendar-view.c:1372
+#: ../a11y/calendar/ea-cal-view.c:308 ../calendar/gui/e-calendar-view.c:1372
 msgid "New Meeting"
 msgstr "New Meeting"
 
-#: a11y/calendar/ea-cal-view.c:309
+#: ../a11y/calendar/ea-cal-view.c:309
 msgid "Go to Today"
 msgstr "Go to Today"
 
-#: a11y/calendar/ea-cal-view.c:310
+#: ../a11y/calendar/ea-cal-view.c:310
 msgid "Go to Date"
 msgstr "Go to Date"
 
-#: a11y/calendar/ea-day-view-main-item.c:299
-#: a11y/calendar/ea-week-view-main-item.c:301
+#: ../a11y/calendar/ea-day-view-main-item.c:299
+#: ../a11y/calendar/ea-week-view-main-item.c:301
 msgid "a table to view and select the current time range"
 msgstr "a table to view and select the current time range"
 
-#: a11y/calendar/ea-day-view.c:146 a11y/calendar/ea-week-view.c:148
+#: ../a11y/calendar/ea-day-view.c:146 ../a11y/calendar/ea-week-view.c:148
 #, c-format
 msgid "It has %d event."
 msgid_plural "It has %d events."
 msgstr[0] "It has %d event"
 msgstr[1] "It has %d events"
 
-#: a11y/calendar/ea-day-view.c:148 a11y/calendar/ea-week-view.c:150
+#: ../a11y/calendar/ea-day-view.c:148 ../a11y/calendar/ea-week-view.c:150
 msgid "It has no events."
 msgstr "It has no events."
 
-#: a11y/calendar/ea-day-view.c:152
+#: ../a11y/calendar/ea-day-view.c:152
 #, c-format
 msgid "Work Week View: %s. %s"
 msgstr "Work Week View: %s. %s"
 
-#: a11y/calendar/ea-day-view.c:155
+#: ../a11y/calendar/ea-day-view.c:155
 #, c-format
 msgid "Day View: %s. %s"
 msgstr "Day View: %s. %s"
 
-#: a11y/calendar/ea-day-view.c:186
+#: ../a11y/calendar/ea-day-view.c:186
 msgid "calendar view for a work week"
 msgstr "calendar view for a work week"
 
-#: a11y/calendar/ea-day-view.c:188
+#: ../a11y/calendar/ea-day-view.c:188
 msgid "calendar view for one or more days"
 msgstr "calendar view for one or more days"
 
-#: a11y/calendar/ea-gnome-calendar.c:187 calendar/gui/calendar-component.c:520
+#: ../a11y/calendar/ea-gnome-calendar.c:187
+#: ../calendar/gui/calendar-component.c:660
 msgid "%A %d %b %Y"
 msgstr "%A %d %b %Y"
 
@@ -151,22 +152,30 @@ msgstr "%A %d %b %Y"
 #. %d = day of month, %b = abbreviated month name.
 #. You can change the order but don't change the
 #. specifiers or add anything.
-#: a11y/calendar/ea-gnome-calendar.c:190 calendar/gui/calendar-component.c:523
-#: calendar/gui/e-day-view-top-item.c:719 calendar/gui/e-day-view.c:1511
-#: calendar/gui/e-week-view-main-item.c:321
+#: ../a11y/calendar/ea-gnome-calendar.c:190
+#: ../calendar/gui/calendar-component.c:663
+#: ../calendar/gui/e-day-view-top-item.c:719 ../calendar/gui/e-day-view.c:1511
+#: ../calendar/gui/e-week-view-main-item.c:321
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
-#: a11y/calendar/ea-gnome-calendar.c:192 a11y/calendar/ea-gnome-calendar.c:197
-#: a11y/calendar/ea-gnome-calendar.c:199 calendar/gui/calendar-component.c:525
-#: calendar/gui/calendar-component.c:530 calendar/gui/calendar-component.c:532
+#: ../a11y/calendar/ea-gnome-calendar.c:192
+#: ../a11y/calendar/ea-gnome-calendar.c:197
+#: ../a11y/calendar/ea-gnome-calendar.c:199
+#: ../calendar/gui/calendar-component.c:665
+#: ../calendar/gui/calendar-component.c:670
+#: ../calendar/gui/calendar-component.c:672
 msgid "%a %d %b %Y"
 msgstr "%a %d %b %Y"
 
-#: a11y/calendar/ea-gnome-calendar.c:216 a11y/calendar/ea-gnome-calendar.c:222
-#: a11y/calendar/ea-gnome-calendar.c:228 a11y/calendar/ea-gnome-calendar.c:230
-#: calendar/gui/calendar-component.c:544 calendar/gui/calendar-component.c:551
-#: calendar/gui/calendar-component.c:557 calendar/gui/calendar-component.c:559
+#: ../a11y/calendar/ea-gnome-calendar.c:216
+#: ../a11y/calendar/ea-gnome-calendar.c:222
+#: ../a11y/calendar/ea-gnome-calendar.c:228
+#: ../a11y/calendar/ea-gnome-calendar.c:230
+#: ../calendar/gui/calendar-component.c:684
+#: ../calendar/gui/calendar-component.c:691
+#: ../calendar/gui/calendar-component.c:697
+#: ../calendar/gui/calendar-component.c:699
 msgid "%d %b %Y"
 msgstr "%d %b %Y"
 
@@ -175,83 +184,86 @@ msgstr "%d %b %Y"
 #. strftime format %d = day of month, %b = abbreviated
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: a11y/calendar/ea-gnome-calendar.c:220 calendar/gui/calendar-component.c:549
-#: calendar/gui/e-day-view-top-item.c:723 calendar/gui/e-day-view.c:1527
-#: calendar/gui/e-week-view-main-item.c:335
+#: ../a11y/calendar/ea-gnome-calendar.c:220
+#: ../calendar/gui/calendar-component.c:689
+#: ../calendar/gui/e-day-view-top-item.c:723 ../calendar/gui/e-day-view.c:1527
+#: ../calendar/gui/e-week-view-main-item.c:335
 msgid "%d %b"
 msgstr "%d %b"
 
-#: a11y/calendar/ea-gnome-calendar.c:247 a11y/calendar/ea-gnome-calendar.c:255
-#: calendar/importers/icalendar-importer.c:726
+#: ../a11y/calendar/ea-gnome-calendar.c:247
+#: ../a11y/calendar/ea-gnome-calendar.c:255
+#: ../calendar/importers/icalendar-importer.c:726
 msgid "Gnome Calendar"
 msgstr "Gnome Calendar"
 
-#: a11y/calendar/ea-gnome-calendar.c:290
+#: ../a11y/calendar/ea-gnome-calendar.c:290
 msgid "search bar"
 msgstr "search bar"
 
-#: a11y/calendar/ea-gnome-calendar.c:291
+#: ../a11y/calendar/ea-gnome-calendar.c:291
 msgid "evolution calendar search bar"
 msgstr "Evolution calendar search bar"
 
-#: a11y/calendar/ea-jump-button.c:149
+#: ../a11y/calendar/ea-jump-button.c:149
 msgid "Jump button"
 msgstr "Jump button"
 
-#: a11y/calendar/ea-jump-button.c:158
+#: ../a11y/calendar/ea-jump-button.c:158
 msgid "Click here, you can find more events."
 msgstr "Click here to find more events."
 
-#: a11y/calendar/ea-week-view.c:155
+#: ../a11y/calendar/ea-week-view.c:155
 #, c-format
 msgid "Month View: %s. %s"
 msgstr "Month View: %s. %s"
 
-#: a11y/calendar/ea-week-view.c:159
+#: ../a11y/calendar/ea-week-view.c:159
 #, c-format
 msgid "Week View: %s. %s"
 msgstr "Week View: %s. %s"
 
-#: a11y/calendar/ea-week-view.c:190
+#: ../a11y/calendar/ea-week-view.c:190
 msgid "calendar view for a month"
 msgstr "calendar view for a month"
 
-#: a11y/calendar/ea-week-view.c:192
+#: ../a11y/calendar/ea-week-view.c:192
 msgid "calendar view for one or more weeks"
 msgstr "calendar view for one or more weeks"
 
-#: a11y/widgets/ea-calendar-item.c:290 a11y/widgets/ea-calendar-item.c:296
+#: ../a11y/widgets/ea-calendar-item.c:296
+#: ../a11y/widgets/ea-calendar-item.c:302
 msgid "%d %B %Y"
 msgstr "%d %B %Y"
 
-#: a11y/widgets/ea-calendar-item.c:298
+#: ../a11y/widgets/ea-calendar-item.c:304
 #, c-format
 msgid "Calendar: from %s to %s"
 msgstr "Calendar: from %s to %s"
 
-#: a11y/widgets/ea-calendar-item.c:333
+#: ../a11y/widgets/ea-calendar-item.c:339
 msgid "evolution calendar item"
 msgstr "Evolution calendar item"
 
-#: a11y/widgets/ea-combo-button.c:40
+#: ../a11y/widgets/ea-combo-button.c:40
 msgid "Combo Button"
 msgstr "Combo Button"
 
-#: a11y/widgets/ea-combo-button.c:50
+#: ../a11y/widgets/ea-combo-button.c:50
 msgid "Activate Default"
 msgstr "Activate Default"
 
-#: a11y/widgets/ea-combo-button.c:52
+#: ../a11y/widgets/ea-combo-button.c:52
 msgid "Popup Menu"
 msgstr "Popup Menu"
 
 #. addressbook:ldap-init primary
-#: addressbook/addressbook-errors.xml.h:2
+#: ../addressbook/addressbook-errors.xml.h:2
 msgid "This addressbook could not be opened."
 msgstr "This addressbook could not be opened."
 
 #. addressbook:ldap-init secondary
-#: addressbook/addressbook-errors.xml.h:4
+#: ../addressbook/addressbook-errors.xml.h:4
 msgid ""
 "This addressbook server might be unreachable or the server name may be "
 "misspelled or your network connection could be down."
@@ -260,12 +272,12 @@ msgstr ""
 "misspelled or your network connection could be down."
 
 #. addressbook:ldap-auth primary
-#: addressbook/addressbook-errors.xml.h:6
+#: ../addressbook/addressbook-errors.xml.h:6
 msgid "Failed to authenticate with LDAP server."
 msgstr "Failed to authenticate with LDAP server."
 
 #. addressbook:ldap-auth secondary
-#: addressbook/addressbook-errors.xml.h:8
+#: ../addressbook/addressbook-errors.xml.h:8
 msgid ""
 "Check to make sure your password is spelled correctly and that you are using "
 "a supported login method. Remember that many passwords are case sensitive; "
@@ -275,12 +287,12 @@ msgstr ""
 "a supported login method. Remember that many passwords are case sensitive; "
 
 #. addressbook:ldap-search-base primary
-#: addressbook/addressbook-errors.xml.h:10
+#: ../addressbook/addressbook-errors.xml.h:10
 msgid "This addressbook server does not have any suggested search bases."
 msgstr "This addressbook server does not have any suggested search bases."
 
 #. addressbook:ldap-search-base secondary
-#: addressbook/addressbook-errors.xml.h:12
+#: ../addressbook/addressbook-errors.xml.h:12
 msgid ""
 "This LDAP server may use an older version of LDAP, which does not support "
 "this functionality or it may be misconfigured. Ask your administrator for "
@@ -291,37 +303,37 @@ msgstr ""
 "supported search bases."
 
 #. addressbook:ldap-v3-schema primary
-#: addressbook/addressbook-errors.xml.h:14
+#: ../addressbook/addressbook-errors.xml.h:14
 msgid "This server does not support LDAPv3 schema information."
 msgstr "This server does not support LDAPv3 schema information."
 
 #. addressbook:ldap-get-schema primary
-#: addressbook/addressbook-errors.xml.h:16
+#: ../addressbook/addressbook-errors.xml.h:16
 msgid "Could not get schema information for LDAP server."
 msgstr "Could not get schema information for LDAP server."
 
 #. addressbook:ldap-invalid-schema primary
-#: addressbook/addressbook-errors.xml.h:18
+#: ../addressbook/addressbook-errors.xml.h:18
 msgid "LDAP server did not respond with valid schema information."
 msgstr "LDAP server did not respond with valid schema information."
 
 #. addressbook:remove-addressbook primary
-#: addressbook/addressbook-errors.xml.h:20
+#: ../addressbook/addressbook-errors.xml.h:20
 msgid "Could not remove addressbook."
 msgstr "Could not remove addressbook."
 
 #. addressbook:ask-delete-addressbook primary
-#: addressbook/addressbook-errors.xml.h:22
+#: ../addressbook/addressbook-errors.xml.h:22
 msgid "Delete address book '{0}'?"
 msgstr "Delete address book '{0}'?"
 
 #. addressbook:ask-delete-addressbook secondary
-#: addressbook/addressbook-errors.xml.h:24
+#: ../addressbook/addressbook-errors.xml.h:24
 msgid "This address book will be removed permanently."
 msgstr "This address book will be removed permanently."
 
 #. addressbook:edit-categories primary
-#: addressbook/addressbook-errors.xml.h:26
+#: ../addressbook/addressbook-errors.xml.h:26
 msgid "Category editor not available."
 msgstr "Category editor not available."
 
@@ -336,46 +348,46 @@ msgstr "Category editor not available."
 #. mail:session-message-error-cancel secondary
 #. mail:ask-session-password secondary
 #. mail:filter-load-error secondary
-#: addressbook/addressbook-errors.xml.h:28
-#: addressbook/addressbook-errors.xml.h:36
-#: addressbook/addressbook-errors.xml.h:40 mail/mail-errors.xml.h:75
-#: mail/mail-errors.xml.h:77 mail/mail-errors.xml.h:79
-#: mail/mail-errors.xml.h:81 mail/mail-errors.xml.h:83
-#: mail/mail-errors.xml.h:85 mail/mail-errors.xml.h:89
-#: mail/mail-errors.xml.h:93
+#: ../addressbook/addressbook-errors.xml.h:28
+#: ../addressbook/addressbook-errors.xml.h:36
+#: ../addressbook/addressbook-errors.xml.h:40 ../mail/mail-errors.xml.h:75
+#: ../mail/mail-errors.xml.h:77 ../mail/mail-errors.xml.h:79
+#: ../mail/mail-errors.xml.h:81 ../mail/mail-errors.xml.h:83
+#: ../mail/mail-errors.xml.h:85 ../mail/mail-errors.xml.h:89
+#: ../mail/mail-errors.xml.h:93
 msgid "{0}"
 msgstr "{0}"
 
 #. addressbook:generic-error secondary
 #. mail-composer:no-attach secondary
 #. mail:no-save-path secondary
-#: addressbook/addressbook-errors.xml.h:30
-#: composer/mail-composer-errors.xml.h:4 mail/mail-errors.xml.h:97
+#: ../addressbook/addressbook-errors.xml.h:30
+#: ../composer/mail-composer-errors.xml.h:4 ../mail/mail-errors.xml.h:97
 msgid "{1}"
 msgstr "{1}"
 
 #. addressbook:load-error title
-#: addressbook/addressbook-errors.xml.h:32
+#: ../addressbook/addressbook-errors.xml.h:32
 msgid "Unable to open addressbook"
 msgstr "Unable to open addressbook"
 
 #. addressbook:load-error primary
-#: addressbook/addressbook-errors.xml.h:34
+#: ../addressbook/addressbook-errors.xml.h:34
 msgid "Error loading addressbook."
 msgstr "Error loading addressbook."
 
 #. addressbook:search-error primary
-#: addressbook/addressbook-errors.xml.h:38
+#: ../addressbook/addressbook-errors.xml.h:38
 msgid "Unable to perform search."
 msgstr "Unable to perform search."
 
 #. addressbook:prompt-save primary
-#: addressbook/addressbook-errors.xml.h:42
+#: ../addressbook/addressbook-errors.xml.h:42
 msgid "Would you like to save your changes?"
 msgstr "Would you like to save your changes?"
 
 #. addressbook:prompt-save secondary
-#: addressbook/addressbook-errors.xml.h:44
+#: ../addressbook/addressbook-errors.xml.h:44
 msgid ""
 "You have made modifications to this contact. Do you want to save these "
 "changes?"
@@ -383,17 +395,17 @@ msgstr ""
 "You have made modifications to this contact. Do you want to save these "
 "changes?"
 
-#: addressbook/addressbook-errors.xml.h:45
+#: ../addressbook/addressbook-errors.xml.h:45
 msgid "_Discard"
 msgstr "_Discard"
 
 #. addressbook:prompt-move primary
-#: addressbook/addressbook-errors.xml.h:47
+#: ../addressbook/addressbook-errors.xml.h:47
 msgid "Cannot move contact."
 msgstr "Cannot move contact."
 
 #. addressbook:prompt-move secondary
-#: addressbook/addressbook-errors.xml.h:49
+#: ../addressbook/addressbook-errors.xml.h:49
 msgid ""
 "You are attempting to move a contact from one addressbook to another but it "
 "cannot be removed from the source. Do you want to save a copy instead?"
@@ -402,34 +414,34 @@ msgstr ""
 "cannot be removed from the source. Do you want to save a copy instead?"
 
 #. addressbook:save-error primary
-#: addressbook/addressbook-errors.xml.h:51
+#: ../addressbook/addressbook-errors.xml.h:51
 msgid "Unable to save contact(s)."
 msgstr "Unable to save contact(s)."
 
 #. addressbook:save-error secondary
-#: addressbook/addressbook-errors.xml.h:53
+#: ../addressbook/addressbook-errors.xml.h:53
 msgid "Error saving contacts to {0}: {1}"
 msgstr "Error saving contacts to {0}: {1}"
 
 #. addressbook:backend-died primary
-#: addressbook/addressbook-errors.xml.h:55
+#: ../addressbook/addressbook-errors.xml.h:55
 msgid "The Evolution addressbook has quit unexpectedly."
 msgstr "The Evolution addressbook has quit unexpectedly."
 
 #. addressbook:backend-died secondary
-#: addressbook/addressbook-errors.xml.h:57
+#: ../addressbook/addressbook-errors.xml.h:57
 msgid ""
 "Your contacts for {0} will not be available until Evolution is restarted."
 msgstr ""
 "Your contacts for {0} will not be available until Evolution is restarted."
 
 #. addressbook:ask-list-add-exists primary
-#: addressbook/addressbook-errors.xml.h:59
+#: ../addressbook/addressbook-errors.xml.h:59
 msgid "Address '{0}' already exists."
 msgstr "Address '{0}' already exists."
 
 #. addressbook:ask-list-add-exists secondary
-#: addressbook/addressbook-errors.xml.h:61
+#: ../addressbook/addressbook-errors.xml.h:61
 msgid ""
 "A contact already exists with this address.  Would you like to add a new "
 "card with the same address anyway?"
@@ -437,235 +449,241 @@ msgstr ""
 "A contact with this address already exists.  Would you like to add a new "
 "card with the same address anyway?"
 
-#: addressbook/addressbook-errors.xml.h:62 mail/em-vfolder-rule.c:494
-#: plugins/shared-folder/properties.glade.h:10
+#: ../addressbook/addressbook-errors.xml.h:62 ../mail/em-vfolder-rule.c:494
+#: ../plugins/shared-folder/properties.glade.h:10
 msgid "_Add"
 msgstr "_Add"
 
 #. addressbook:server-version title
 #. calendar:server-version title
-#: addressbook/addressbook-errors.xml.h:64 calendar/calendar-errors.xml.h:142
+#: ../addressbook/addressbook-errors.xml.h:64
+#: ../calendar/calendar-errors.xml.h:142
 msgid "Server Version"
 msgstr "Server Version"
 
 #. addressbook:server-version primary
 #. calendar:server-version primary
-#: addressbook/addressbook-errors.xml.h:66 calendar/calendar-errors.xml.h:144
+#: ../addressbook/addressbook-errors.xml.h:66
+#: ../calendar/calendar-errors.xml.h:144
 msgid "Your server needs to be updated"
 msgstr "Your server needs to be updated"
 
 #. addressbook:server-version secondary
-#: addressbook/addressbook-errors.xml.h:68
+#: ../addressbook/addressbook-errors.xml.h:68
 msgid "Some features may not work correctly with your current server version"
 msgstr "Some features may not work correctly with your current server version"
 
-#: addressbook/conduit/address-conduit.c:298
+#: ../addressbook/conduit/address-conduit.c:298
 msgid "Default Sync Address:"
 msgstr "Default Sync Address:"
 
-#: addressbook/conduit/address-conduit.c:1183
-#: addressbook/conduit/address-conduit.c:1184
+#: ../addressbook/conduit/address-conduit.c:1183
+#: ../addressbook/conduit/address-conduit.c:1184
 msgid "Could not load addressbook"
 msgstr "Could not load addressbook"
 
-#: addressbook/conduit/address-conduit.c:1252
-#: addressbook/conduit/address-conduit.c:1255
+#: ../addressbook/conduit/address-conduit.c:1252
+#: ../addressbook/conduit/address-conduit.c:1255
 msgid "Could not read pilot's Address application block"
 msgstr "Could not read pilot's Address application block"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
 msgid "Autocompletion"
 msgstr "Autocompletion"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
 msgid "C_ontacts"
 msgstr "C_ontacts"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
 msgid "Certificates"
 msgstr "Certificates"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
 msgid "Configure autocomplete here"
 msgstr "Configure autocomplete here"
 
 #. Create the contacts group
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-#: addressbook/gui/component/addressbook-view.c:1119
-#: calendar/gui/migration.c:385
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
+#: ../addressbook/gui/component/addressbook-view.c:1119
+#: ../calendar/gui/calendar-component.c:235 ../calendar/gui/migration.c:385
 msgid "Contacts"
 msgstr "Contacts"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
 msgid "Evolution Addressbook"
 msgstr "Evolution Addressbook"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
 msgid "Evolution Addressbook address pop-up"
 msgstr "Evolution Addressbook address pop-up"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
 msgid "Evolution Addressbook address viewer"
 msgstr "Evolution Addressbook address viewer"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
 msgid "Evolution Addressbook card viewer"
 msgstr "Evolution Addressbook card viewer"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
 msgid "Evolution Addressbook component"
 msgstr "Evolution Addressbook component"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
 msgid "Evolution S/Mime Certificate Management Control"
 msgstr "Evolution S/Mime Certificate Management Control"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
 msgid "Evolution folder settings configuration control"
 msgstr "Evolution folder settings configuration control"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
 msgid "Manage your S/MIME certificates here"
 msgstr "Manage your S/MIME certificates here"
 
 #. create the local source group
 #. On This Computer is always first and vFolders is always last
-#: addressbook/gui/component/addressbook-component.c:120
-#: addressbook/gui/component/addressbook-migrate.c:493
-#: calendar/gui/migration.c:459 calendar/gui/migration.c:552
-#: mail/em-folder-tree-model.c:197 mail/em-folder-tree-model.c:199
-#: mail/mail-component.c:270 mail/mail-vfolder.c:222
+#: ../addressbook/gui/component/addressbook-component.c:133
+#: ../addressbook/gui/component/addressbook-migrate.c:493
+#: ../calendar/gui/calendar-component.c:208 ../calendar/gui/migration.c:459
+#: ../calendar/gui/migration.c:552 ../calendar/gui/tasks-component.c:188
+#: ../mail/em-folder-tree-model.c:197 ../mail/em-folder-tree-model.c:199
+#: ../mail/mail-component.c:290 ../mail/mail-vfolder.c:222
 msgid "On This Computer"
 msgstr "On This Computer"
 
 #. Create the default Person addressbook
 #. Create the default Person calendar
 #. Create the default Person task list
+#. Create the default Person addressbook
 #. orange
-#: addressbook/gui/component/addressbook-component.c:128
-#: addressbook/gui/component/addressbook-migrate.c:501
-#: addressbook/gui/contact-editor/contact-editor.glade.h:20
-#: calendar/gui/migration.c:467 calendar/gui/migration.c:560
-#: filter/filter-label.c:123 mail/em-migrate.c:1013 mail/mail-config.c:77
-#: mail/mail-config.glade.h:101
+#: ../addressbook/gui/component/addressbook-component.c:141
+#: ../addressbook/gui/component/addressbook-migrate.c:501
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:20
+#: ../calendar/gui/calendar-component.c:216 ../calendar/gui/migration.c:467
+#: ../calendar/gui/migration.c:560 ../calendar/gui/tasks-component.c:196
+#: ../filter/filter-label.c:123 ../mail/em-migrate.c:1043
+#: ../mail/mail-config.c:78 ../mail/mail-config.glade.h:101
 msgid "Personal"
 msgstr "Personal"
 
 #. Create the LDAP source group
-#: addressbook/gui/component/addressbook-component.c:136
-#: addressbook/gui/component/addressbook-migrate.c:509
+#: ../addressbook/gui/component/addressbook-component.c:149
+#: ../addressbook/gui/component/addressbook-migrate.c:509
 msgid "On LDAP Servers"
 msgstr "On LDAP Servers"
 
-#: addressbook/gui/component/addressbook-component.c:183
+#: ../addressbook/gui/component/addressbook-component.c:197
 msgid "_Contact"
 msgstr "_Contact"
 
-#: addressbook/gui/component/addressbook-component.c:184
+#: ../addressbook/gui/component/addressbook-component.c:198
 msgid "Create a new contact"
 msgstr "Create a new contact"
 
-#: addressbook/gui/component/addressbook-component.c:191
+#: ../addressbook/gui/component/addressbook-component.c:205
 msgid "Contact _List"
 msgstr "Contact _List"
 
-#: addressbook/gui/component/addressbook-component.c:192
+#: ../addressbook/gui/component/addressbook-component.c:206
 msgid "Create a new contact list"
 msgstr "Create a new contact list"
 
-#: addressbook/gui/component/addressbook-component.c:198
-#: addressbook/gui/component/addressbook-config.c:1121
-#: addressbook/gui/component/addressbook-view.c:757
+#: ../addressbook/gui/component/addressbook-component.c:212
+#: ../addressbook/gui/component/addressbook-config.c:1120
+#: ../addressbook/gui/component/addressbook-view.c:757
 msgid "New Address Book"
 msgstr "New Address Book"
 
-#: addressbook/gui/component/addressbook-component.c:199
+#: ../addressbook/gui/component/addressbook-component.c:213
 msgid "Address _Book"
 msgstr "Address _Book"
 
-#: addressbook/gui/component/addressbook-component.c:200
+#: ../addressbook/gui/component/addressbook-component.c:214
 msgid "Create a new address book"
 msgstr "Create a new address book"
 
-#: addressbook/gui/component/addressbook-component.c:273
+#: ../addressbook/gui/component/addressbook-component.c:287
 msgid "Failed upgrading Addressbook settings or folders."
 msgstr "Failed upgrading Addressbook settings or folders."
 
-#: addressbook/gui/component/addressbook-config.c:315
+#: ../addressbook/gui/component/addressbook-config.c:315
 msgid "Base"
 msgstr "Base"
 
-#: addressbook/gui/component/addressbook-config.c:510
-#: calendar/gui/dialogs/calendar-setup.c:191
-#: calendar/gui/dialogs/calendar-setup.glade.h:10
+#: ../addressbook/gui/component/addressbook-config.c:510
+#: ../calendar/gui/dialogs/calendar-setup.c:191
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:10
 msgid "_Type:"
 msgstr "_Type:"
 
-#: addressbook/gui/component/addressbook-config.c:609
+#: ../addressbook/gui/component/addressbook-config.c:609
 msgid "Copy book content locally for offline operation"
 msgstr "Copy book content locally for offline operation"
 
-#: addressbook/gui/component/addressbook-config.c:904
-#: addressbook/gui/component/ldap-config.glade.h:23
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
-#: calendar/gui/dialogs/calendar-setup.c:361
-#: calendar/gui/dialogs/calendar-setup.c:372 mail/em-folder-properties.c:215
-#: mail/mail-config.glade.h:84 smime/gui/smime-ui.glade.h:27
+#: ../addressbook/gui/component/addressbook-config.c:904
+#: ../addressbook/gui/component/ldap-config.glade.h:23
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
+#: ../calendar/gui/dialogs/calendar-setup.c:361
+#: ../calendar/gui/dialogs/calendar-setup.c:372
+#: ../mail/em-folder-properties.c:215 ../mail/mail-config.glade.h:84
+#: ../smime/gui/smime-ui.glade.h:27
 msgid "General"
 msgstr "General"
 
-#: addressbook/gui/component/addressbook-config.c:905
-#: mail/importers/pine-importer.c:479
+#: ../addressbook/gui/component/addressbook-config.c:905
+#: ../mail/importers/pine-importer.c:479
 msgid "Addressbook"
 msgstr "Addressbook"
 
-#: addressbook/gui/component/addressbook-config.c:909
+#: ../addressbook/gui/component/addressbook-config.c:909
 msgid "Server Information"
 msgstr "Server Information"
 
-#: addressbook/gui/component/addressbook-config.c:911
+#: ../addressbook/gui/component/addressbook-config.c:911
 msgid "Authentication"
 msgstr "Authentication"
 
-#: addressbook/gui/component/addressbook-config.c:914
-#: addressbook/gui/component/ldap-config.glade.h:18
-#: mail/mail-dialogs.glade.h:12 smime/gui/smime-ui.glade.h:19
+#: ../addressbook/gui/component/addressbook-config.c:914
+#: ../addressbook/gui/component/ldap-config.glade.h:18
+#: ../mail/mail-dialogs.glade.h:8 ../smime/gui/smime-ui.glade.h:19
 msgid "Details"
 msgstr "Details"
 
-#: addressbook/gui/component/addressbook-config.c:915
+#: ../addressbook/gui/component/addressbook-config.c:915
 msgid "Searching"
 msgstr "Searching"
 
-#: addressbook/gui/component/addressbook-config.c:917
+#: ../addressbook/gui/component/addressbook-config.c:917
 msgid "Downloading"
 msgstr "Downloading"
 
-#: addressbook/gui/component/addressbook-config.c:1119
-#: addressbook/gui/component/ldap-config.glade.h:14
+#: ../addressbook/gui/component/addressbook-config.c:1118
+#: ../addressbook/gui/component/ldap-config.glade.h:14
 msgid "Address Book Properties"
 msgstr "Address Book Properties"
 
-#: addressbook/gui/component/addressbook-migrate.c:72
-#: calendar/gui/migration.c:142 mail/em-migrate.c:1160
+#: ../addressbook/gui/component/addressbook-migrate.c:72
+#: ../calendar/gui/migration.c:142 ../mail/em-migrate.c:1190
 msgid "Migrating..."
 msgstr "Migrating..."
 
-#: addressbook/gui/component/addressbook-migrate.c:124
-#: calendar/gui/migration.c:189 mail/em-migrate.c:1201
+#: ../addressbook/gui/component/addressbook-migrate.c:124
+#: ../calendar/gui/migration.c:189 ../mail/em-migrate.c:1231
 #, c-format
 msgid "Migrating `%s':"
 msgstr "Migrating `%s':"
 
-#: addressbook/gui/component/addressbook-migrate.c:637
+#: ../addressbook/gui/component/addressbook-migrate.c:637
 msgid "LDAP Servers"
 msgstr "LDAP Servers"
 
-#: addressbook/gui/component/addressbook-migrate.c:752
+#: ../addressbook/gui/component/addressbook-migrate.c:752
 msgid "Autocompletion Settings"
 msgstr "Autocompletion Settings"
 
-#: addressbook/gui/component/addressbook-migrate.c:1123
+#: ../addressbook/gui/component/addressbook-migrate.c:1123
 msgid ""
 "The location and hierarchy of the Evolution contact folders has changed "
 "since Evolution 1.x.\n"
@@ -677,7 +695,7 @@ msgstr ""
 "\n"
 "Please be patient while Evolution migrates your folders..."
 
-#: addressbook/gui/component/addressbook-migrate.c:1137
+#: ../addressbook/gui/component/addressbook-migrate.c:1137
 msgid ""
 "The format of mailing list contacts has changed.\n"
 "\n"
@@ -687,7 +705,7 @@ msgstr ""
 "\n"
 "Please be patient while Evolution migrates your folders..."
 
-#: addressbook/gui/component/addressbook-migrate.c:1146
+#: ../addressbook/gui/component/addressbook-migrate.c:1146
 msgid ""
 "The way Evolution stores some phone numbers has changed.\n"
 "\n"
@@ -697,7 +715,7 @@ msgstr ""
 "\n"
 "Please be patient while Evolution migrates your folders..."
 
-#: addressbook/gui/component/addressbook-migrate.c:1156
+#: ../addressbook/gui/component/addressbook-migrate.c:1156
 msgid ""
 "Evolution's Palm Sync changelog and map files have changed.\n"
 "\n"
@@ -707,52 +725,53 @@ msgstr ""
 "\n"
 "Please be patient while Evolution migrates your Pilot Sync data..."
 
-#: addressbook/gui/component/addressbook-view.c:758
-#: addressbook/gui/widgets/e-addressbook-view.c:935
-#: calendar/gui/calendar-component.c:386 calendar/gui/tasks-component.c:330
-#: mail/em-filter-i18n.h:11 ui/evolution-addressbook.xml.h:8
-#: ui/evolution-calendar.xml.h:5 ui/evolution-mail-message.xml.h:24
-#: ui/evolution-tasks.xml.h:6
+#: ../addressbook/gui/component/addressbook-view.c:758
+#: ../addressbook/gui/widgets/e-addressbook-view.c:935
+#: ../calendar/gui/calendar-component.c:526
+#: ../calendar/gui/tasks-component.c:430 ../mail/em-filter-i18n.h:11
+#: ../ui/evolution-addressbook.xml.h:8 ../ui/evolution-calendar.xml.h:5
+#: ../ui/evolution-mail-message.xml.h:24 ../ui/evolution-tasks.xml.h:6
 msgid "Delete"
 msgstr "Delete"
 
-#: addressbook/gui/component/addressbook-view.c:760
-#: calendar/gui/calendar-component.c:387 calendar/gui/tasks-component.c:331
+#: ../addressbook/gui/component/addressbook-view.c:760
+#: ../calendar/gui/calendar-component.c:527
+#: ../calendar/gui/tasks-component.c:431
 msgid "Properties..."
 msgstr "Properties..."
 
-#: addressbook/gui/component/addressbook-view.c:1130
+#: ../addressbook/gui/component/addressbook-view.c:1130
 msgid "Contact Source Selector"
 msgstr "Contact Source Selector"
 
-#: addressbook/gui/component/addressbook.c:98
+#: ../addressbook/gui/component/addressbook.c:98
 msgid "Accessing LDAP Server anonymously"
 msgstr "Accessing LDAP Server anonymously"
 
-#: addressbook/gui/component/addressbook.c:193
-#: plugins/groupwise-account-setup/camel-gw-listener.c:478
+#: ../addressbook/gui/component/addressbook.c:194
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:478
 msgid "Failed to authenticate.\n"
 msgstr "Failed to authenticate.\n"
 
-#: addressbook/gui/component/addressbook.c:200
-#: plugins/groupwise-account-setup/camel-gw-listener.c:461
+#: ../addressbook/gui/component/addressbook.c:201
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:461
 #, c-format
 msgid "Enter password for %s (user %s)"
 msgstr "Enter password for %s (user %s)"
 
-#: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:1
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:1
 msgid "Autocomplete length"
 msgstr "Autocomplete length"
 
-#: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:2
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:2
 msgid "EFolderList XML for the list of completion URIs"
 msgstr "EFolderList XML for the list of completion URIs"
 
-#: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:3
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:3
 msgid "EFolderList XML for the list of completion URIs."
 msgstr "EFolderList XML for the list of completion URIs."
 
-#: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:4
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:4
 msgid ""
 "Position of the vertical pane, between the card and list views and the "
 "preview pane, in pixels."
@@ -760,11 +779,11 @@ msgstr ""
 "Position of the vertical pane, between the card and list views and the "
 "preview pane, in pixels."
 
-#: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:5
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:5
 msgid "Show preview pane"
 msgstr "Show preview pane"
 
-#: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:6
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:6
 msgid ""
 "The number of characters that must be typed before Evolution will attempt to "
 "autocomplete."
@@ -772,141 +791,142 @@ msgstr ""
 "The number of characters that must be typed before Evolution will attempt to "
 "autocomplete."
 
-#: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:7
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:7
 msgid "URI for the folder last used in the select names dialog"
 msgstr "URI for the folder last used in the select names dialogue"
 
-#: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:8
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:8
 msgid "URI for the folder last used in the select names dialog."
 msgstr "URI for the folder last used in the select names dialogue."
 
-#: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:9
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:49
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:9
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:49
 msgid "Vertical pane position"
 msgstr "Vertical pane position"
 
-#: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:10
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:10
 msgid "Whether to show the preview pane."
 msgstr "Whether to show the preview pane."
 
-#: addressbook/gui/component/ldap-config.glade.h:1
-#: addressbook/gui/contact-editor/contact-editor.glade.h:1
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
-#: addressbook/gui/contact-editor/fullname.glade.h:1
-#: addressbook/gui/contact-editor/im.glade.h:1
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
-#: calendar/gui/dialogs/cal-attachment.glade.h:1
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
-#: calendar/gui/dialogs/calendar-setup.glade.h:1
-#: calendar/gui/dialogs/event-page.glade.h:1
-#: calendar/gui/dialogs/meeting-page.glade.h:1
-#: calendar/gui/dialogs/new-calendar.glade.h:1
-#: calendar/gui/dialogs/new-task-list.glade.h:1
-#: calendar/gui/dialogs/url-editor-dialog.glade.h:1
-#: composer/e-msg-composer-attachment.glade.h:1 mail/mail-dialogs.glade.h:6
-#: mail/message-tags.glade.h:1 plugins/shared-folder/properties.glade.h:1
-#: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
+#: ../addressbook/gui/component/ldap-config.glade.h:1
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:1
+#: ../addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: ../addressbook/gui/contact-editor/fullname.glade.h:1
+#: ../addressbook/gui/contact-editor/im.glade.h:1
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
+#: ../calendar/gui/dialogs/cal-attachment.glade.h:1
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:1
+#: ../calendar/gui/dialogs/event-page.glade.h:1
+#: ../calendar/gui/dialogs/meeting-page.glade.h:1
+#: ../calendar/gui/dialogs/new-calendar.glade.h:1
+#: ../calendar/gui/dialogs/new-task-list.glade.h:1
+#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:1
+#: ../composer/e-msg-composer-attachment.glade.h:1
+#: ../mail/mail-dialogs.glade.h:2 ../mail/message-tags.glade.h:1
+#: ../plugins/shared-folder/properties.glade.h:1
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
 msgid "*"
 msgstr "*"
 
-#: addressbook/gui/component/ldap-config.glade.h:2
+#: ../addressbook/gui/component/ldap-config.glade.h:2
 msgid "1"
 msgstr "1"
 
-#: addressbook/gui/component/ldap-config.glade.h:3
+#: ../addressbook/gui/component/ldap-config.glade.h:3
 msgid "3268"
 msgstr "3268"
 
-#: addressbook/gui/component/ldap-config.glade.h:4
+#: ../addressbook/gui/component/ldap-config.glade.h:4
 msgid "389"
 msgstr "389"
 
-#: addressbook/gui/component/ldap-config.glade.h:5
+#: ../addressbook/gui/component/ldap-config.glade.h:5
 msgid "5"
 msgstr "5"
 
-#: addressbook/gui/component/ldap-config.glade.h:6
+#: ../addressbook/gui/component/ldap-config.glade.h:6
 msgid "636"
 msgstr "636"
 
-#: addressbook/gui/component/ldap-config.glade.h:7
-#: calendar/gui/dialogs/url-editor-dialog.glade.h:2
+#: ../addressbook/gui/component/ldap-config.glade.h:7
+#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:2
 msgid "<b>Authentication</b>"
 msgstr "<b>Authentication</b>"
 
-#: addressbook/gui/component/ldap-config.glade.h:8
+#: ../addressbook/gui/component/ldap-config.glade.h:8
 msgid "<b>Display</b>"
 msgstr "<b>Display</b>"
 
-#: addressbook/gui/component/ldap-config.glade.h:9
+#: ../addressbook/gui/component/ldap-config.glade.h:9
 msgid "<b>Downloading</b>"
 msgstr "<b>Downloading</b>"
 
-#: addressbook/gui/component/ldap-config.glade.h:10
+#: ../addressbook/gui/component/ldap-config.glade.h:10
 msgid "<b>Searching</b>"
 msgstr "<b>Searching</b>"
 
-#: addressbook/gui/component/ldap-config.glade.h:11
+#: ../addressbook/gui/component/ldap-config.glade.h:11
 msgid "<b>Server Information</b>"
 msgstr "<b>Server Information</b>"
 
-#: addressbook/gui/component/ldap-config.glade.h:12
+#: ../addressbook/gui/component/ldap-config.glade.h:12
 msgid "<b>Type:</b>"
 msgstr "<b>Type:</b>"
 
-#: addressbook/gui/component/ldap-config.glade.h:13
+#: ../addressbook/gui/component/ldap-config.glade.h:13
 msgid "Add Address Book"
 msgstr "Add Address Book"
 
-#: addressbook/gui/component/ldap-config.glade.h:15
-#: mail/em-account-editor.c:292
+#: ../addressbook/gui/component/ldap-config.glade.h:15
+#: ../mail/em-account-editor.c:302
 msgid "Always"
 msgstr "Always"
 
-#: addressbook/gui/component/ldap-config.glade.h:16
+#: ../addressbook/gui/component/ldap-config.glade.h:16
 msgid "Anonymously"
 msgstr "Anonymously"
 
-#: addressbook/gui/component/ldap-config.glade.h:17
+#: ../addressbook/gui/component/ldap-config.glade.h:17
 msgid "Basic"
 msgstr "Basic"
 
-#: addressbook/gui/component/ldap-config.glade.h:19
+#: ../addressbook/gui/component/ldap-config.glade.h:19
 msgid "Distinguished name"
 msgstr "Distinguished name"
 
-#: addressbook/gui/component/ldap-config.glade.h:20
+#: ../addressbook/gui/component/ldap-config.glade.h:20
 msgid "Email address"
 msgstr "Email address"
 
-#: addressbook/gui/component/ldap-config.glade.h:21
+#: ../addressbook/gui/component/ldap-config.glade.h:21
 msgid ""
 "Evolution will use this email address to authenticate you with the server."
 msgstr ""
 "Evolution will use this email address to authenticate you with the server."
 
-#: addressbook/gui/component/ldap-config.glade.h:22
+#: ../addressbook/gui/component/ldap-config.glade.h:22
 msgid "Find Possible Search Bases"
 msgstr "Find Possible Search Bases"
 
-#: addressbook/gui/component/ldap-config.glade.h:24
+#: ../addressbook/gui/component/ldap-config.glade.h:24
 msgid "Lo_gin:"
 msgstr "Lo_gin:"
 
-#: addressbook/gui/component/ldap-config.glade.h:25
-#: mail/em-account-editor.c:290
+#: ../addressbook/gui/component/ldap-config.glade.h:25
+#: ../mail/em-account-editor.c:300
 msgid "Never"
 msgstr "Never"
 
-#: addressbook/gui/component/ldap-config.glade.h:26
+#: ../addressbook/gui/component/ldap-config.glade.h:26
 msgid "One"
 msgstr "One"
 
-#: addressbook/gui/component/ldap-config.glade.h:27
+#: ../addressbook/gui/component/ldap-config.glade.h:27
 msgid "Search _base:"
 msgstr "Search _base:"
 
-#: addressbook/gui/component/ldap-config.glade.h:28
+#: ../addressbook/gui/component/ldap-config.glade.h:28
 msgid ""
 "Selecting this option means that Evolution will only connect to your LDAP "
 "server if your LDAP server supports SSL or TLS."
@@ -914,7 +934,7 @@ msgstr ""
 "Selecting this option means that Evolution will only connect to your LDAP "
 "server if your LDAP server supports SSL or TLS."
 
-#: addressbook/gui/component/ldap-config.glade.h:29
+#: ../addressbook/gui/component/ldap-config.glade.h:29
 msgid ""
 "Selecting this option means that Evolution will only try to use SSL/TLS if "
 "you are in a insecure environment. For example, if you and your LDAP server "
@@ -926,7 +946,7 @@ msgstr ""
 "are behind a firewall at work, then Evolution doesn't need to use SSL/TLS "
 "because your connection is already secure."
 
-#: addressbook/gui/component/ldap-config.glade.h:30
+#: ../addressbook/gui/component/ldap-config.glade.h:30
 msgid ""
 "Selecting this option means that your server does not support either SSL or "
 "TLS.  This means that your connection will be insecure, and that you will be "
@@ -936,15 +956,15 @@ msgstr ""
 "TLS.  This means that your connection will be insecure, and that you will be "
 "vulnerable to security exploits. "
 
-#: addressbook/gui/component/ldap-config.glade.h:31
+#: ../addressbook/gui/component/ldap-config.glade.h:31
 msgid "Sub"
 msgstr "Sub"
 
-#: addressbook/gui/component/ldap-config.glade.h:32
+#: ../addressbook/gui/component/ldap-config.glade.h:32
 msgid "Supported Search Bases"
 msgstr "Supported Search Bases"
 
-#: addressbook/gui/component/ldap-config.glade.h:33
+#: ../addressbook/gui/component/ldap-config.glade.h:33
 msgid ""
 "The search base is the distinguished name (DN)  of the entry where your "
 "searches will begin. If you leave this blank, the search will begin at the "
@@ -954,7 +974,7 @@ msgstr ""
 "searches will begin. If you leave this blank, the search will begin at the "
 "root of the directory tree."
 
-#: addressbook/gui/component/ldap-config.glade.h:34
+#: ../addressbook/gui/component/ldap-config.glade.h:34
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
 "the directory tree. A search scope of \"sub\" will include all entries below "
@@ -966,7 +986,7 @@ msgstr ""
 "your search base. A search scope of \"one\" will only include the entries "
 "one level beneath your base."
 
-#: addressbook/gui/component/ldap-config.glade.h:35
+#: ../addressbook/gui/component/ldap-config.glade.h:35
 msgid ""
 "This is the full name of your ldap server. For example, \"ldap.mycompany.com"
 "\"."
@@ -974,7 +994,7 @@ msgstr ""
 "This is the full name of your ldap server. For example, \"ldap.mycompany.com"
 "\"."
 
-#: addressbook/gui/component/ldap-config.glade.h:36
+#: ../addressbook/gui/component/ldap-config.glade.h:36
 msgid ""
 "This is the maximum number of entries to download. Setting this number to be "
 "too large will slow down your address book."
@@ -982,7 +1002,7 @@ msgstr ""
 "This is the maximum number of entries to download. Setting this number to be "
 "too large will slow down your address book."
 
-#: addressbook/gui/component/ldap-config.glade.h:37
+#: ../addressbook/gui/component/ldap-config.glade.h:37
 msgid ""
 "This is the method Evolution will use to authenticate you.  Note that "
 "setting this to \"Email Address\" requires anonymous access to your ldap "
@@ -992,7 +1012,7 @@ msgstr ""
 "setting this to \"Email Address\" requires anonymous access to your LDAP "
 "server."
 
-#: addressbook/gui/component/ldap-config.glade.h:38
+#: ../addressbook/gui/component/ldap-config.glade.h:38
 msgid ""
 "This is the name for this server that will appear in your Evolution folder "
 "list. It is for display purposes only. "
@@ -1000,7 +1020,7 @@ msgstr ""
 "This is the name for this server that will appear in your Evolution folder "
 "list. It is for display purposes only. "
 
-#: addressbook/gui/component/ldap-config.glade.h:39
+#: ../addressbook/gui/component/ldap-config.glade.h:39
 msgid ""
 "This is the port on the LDAP server that Evolution will try to connect to. A "
 "list of standard ports has been provided. Ask your system administrator what "
@@ -1010,1368 +1030,1370 @@ msgstr ""
 "list of standard ports has been provided. Ask your system administrator what "
 "port you should specify."
 
-#: addressbook/gui/component/ldap-config.glade.h:40
+#: ../addressbook/gui/component/ldap-config.glade.h:40
 msgid "Using distinguished name (DN)"
 msgstr "Using distinguished name (DN)"
 
-#: addressbook/gui/component/ldap-config.glade.h:41
+#: ../addressbook/gui/component/ldap-config.glade.h:41
 msgid "Using email address"
 msgstr "Using email address"
 
-#: addressbook/gui/component/ldap-config.glade.h:42
-#: mail/em-account-editor.c:291
+#: ../addressbook/gui/component/ldap-config.glade.h:42
+#: ../mail/em-account-editor.c:301
 msgid "Whenever Possible"
 msgstr "Whenever Possible"
 
-#: addressbook/gui/component/ldap-config.glade.h:43
+#: ../addressbook/gui/component/ldap-config.glade.h:43
 msgid "_Add Address Book"
 msgstr "_Add Address Book"
 
-#: addressbook/gui/component/ldap-config.glade.h:44
+#: ../addressbook/gui/component/ldap-config.glade.h:44
 msgid "_Download limit:"
 msgstr "_Download limit:"
 
-#: addressbook/gui/component/ldap-config.glade.h:45
+#: ../addressbook/gui/component/ldap-config.glade.h:45
 msgid "_Find Possible Search Bases"
 msgstr "_Find Possible Search Bases"
 
-#: addressbook/gui/component/ldap-config.glade.h:46
+#: ../addressbook/gui/component/ldap-config.glade.h:46
 msgid "_Log in method:"
 msgstr "_Log in method:"
 
-#: addressbook/gui/component/ldap-config.glade.h:47
-#: calendar/gui/dialogs/calendar-setup.c:243
-#: calendar/gui/dialogs/calendar-setup.glade.h:8 mail/mail-config.glade.h:160
+#: ../addressbook/gui/component/ldap-config.glade.h:47
+#: ../calendar/gui/dialogs/calendar-setup.c:243
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:8
+#: ../mail/mail-config.glade.h:160
 msgid "_Name:"
 msgstr "_Name:"
 
-#: addressbook/gui/component/ldap-config.glade.h:48
+#: ../addressbook/gui/component/ldap-config.glade.h:48
 msgid "_Port:"
 msgstr "_Port:"
 
-#: addressbook/gui/component/ldap-config.glade.h:49
+#: ../addressbook/gui/component/ldap-config.glade.h:49
 msgid "_Search scope:"
 msgstr "_Search scope:"
 
-#: addressbook/gui/component/ldap-config.glade.h:50
+#: ../addressbook/gui/component/ldap-config.glade.h:50
 msgid "_Server:"
 msgstr "_Server:"
 
-#: addressbook/gui/component/ldap-config.glade.h:51
+#: ../addressbook/gui/component/ldap-config.glade.h:51
 msgid "_Timeout:"
 msgstr "_Timeout:"
 
-#: addressbook/gui/component/ldap-config.glade.h:52
+#: ../addressbook/gui/component/ldap-config.glade.h:52
 msgid "_Use secure connection:"
 msgstr "_Use secure connection:"
 
-#: addressbook/gui/component/ldap-config.glade.h:53
+#: ../addressbook/gui/component/ldap-config.glade.h:53
 msgid "cards"
 msgstr "cards"
 
-#: addressbook/gui/component/ldap-config.glade.h:54
-#: calendar/gui/alarm-notify/alarm-notify.glade.h:12
-#: calendar/gui/dialogs/alarm-dialog.glade.h:26
-#: calendar/gui/dialogs/calendar-setup.glade.h:14 filter/filter.glade.h:16
-#: mail/em-account-editor.c:1825 plugins/calendar-http/calendar-http.c:263
-#: plugins/calendar-weather/calendar-weather.c:564
+#: ../addressbook/gui/component/ldap-config.glade.h:54
+#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:12
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:26
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:14
+#: ../filter/filter.glade.h:16 ../mail/em-account-editor.c:1882
+#: ../plugins/calendar-http/calendar-http.c:263
+#: ../plugins/calendar-weather/calendar-weather.c:564
 msgid "minutes"
 msgstr "minutes"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:2
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:2
 msgid "<b>Email</b>"
 msgstr "<b>Email</b>"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:3
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:3
 msgid "<b>Home</b>"
 msgstr "<b>Home</b>"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:4
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:4
 msgid "<b>Instant Messaging</b>"
 msgstr "<b>Instant Messaging</b>"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:5
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:5
 msgid "<b>Job</b>"
 msgstr "<b>Job</b>"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:6
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:6
 msgid "<b>Miscellaneous</b>"
 msgstr "<b>Miscellaneous</b>"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:7
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:7
 msgid "<b>Other</b>"
 msgstr "<b>Other</b>"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:8
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:8
 msgid "<b>Telephone</b>"
 msgstr "<b>Telephone</b>"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:9
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:9
 msgid "<b>Web Addresses</b>"
 msgstr "<b>Web Addresses</b>"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:10
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:10
 msgid "<b>Work</b>"
 msgstr "<b>Work</b>"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:11
-#: addressbook/gui/contact-editor/e-contact-editor.c:182
-#: addressbook/gui/widgets/eab-contact-display.c:346
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:11
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:182
+#: ../addressbook/gui/widgets/eab-contact-display.c:346
 msgid "AIM"
 msgstr "AIM"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:12
-#: addressbook/gui/contact-editor/e-contact-editor.c:270
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:169
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.etspec.h:1
-#: addressbook/gui/widgets/e-minicard.c:181
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:12
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:270
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:169
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.etspec.h:1
+#: ../addressbook/gui/widgets/e-minicard.c:181
 msgid "Contact"
 msgstr "Contact"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:13
-#: addressbook/gui/contact-editor/e-contact-editor.c:531
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:13
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:531
 msgid "Contact Editor"
 msgstr "Contact Editor"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:14
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:14
 msgid "Full _Name..."
 msgstr "Full _Name..."
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:15
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:15
 msgid "Image"
 msgstr "Image"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:16
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:66
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:16
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:66
 msgid "MSN Messenger"
 msgstr "MSN Messenger"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:17
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:17
 msgid "Mailing Address"
 msgstr "Mailing Address"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:18
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:18
 msgid "Ni_ckname:"
 msgstr "Ni_ckname:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:19
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:63
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:19
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:63
 msgid "Novell Groupwise"
 msgstr "Novell Groupwise"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:21
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:21
 msgid "Personal Information"
 msgstr "Personal information"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:22
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:22
 msgid "Telephone"
 msgstr "Telephone"
 
 #. red
-#: addressbook/gui/contact-editor/contact-editor.glade.h:23
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:235
-#: addressbook/gui/contact-editor/e-contact-editor.c:199
-#: filter/filter-label.c:122 mail/em-migrate.c:1012 mail/mail-config.c:76
-#: mail/mail-config.glade.h:148
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:23
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:235
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:199
+#: ../filter/filter-label.c:122 ../mail/em-migrate.c:1042
+#: ../mail/mail-config.c:77 ../mail/mail-config.glade.h:148
 msgid "Work"
 msgstr "Work"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:24
-#: addressbook/gui/contact-editor/fulladdr.glade.h:6
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:24
+#: ../addressbook/gui/contact-editor/fulladdr.glade.h:6
 msgid "_Address:"
 msgstr "_Address:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:25
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:25
 msgid "_Anniversary:"
 msgstr "_Anniversary:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:26
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:26
 msgid "_Assistant:"
 msgstr "_Assistant:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:27
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:27
 msgid "_Birthday:"
 msgstr "_Birthday:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:28
-#: plugins/itip-formatter/itip-view.c:1619
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:28
+#: ../plugins/itip-formatter/itip-view.c:1619
 msgid "_Calendar:"
 msgstr "_Calendar:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:29
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:29
 msgid "_Categories"
 msgstr "_Categories"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:30
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:30
 msgid "_City:"
 msgstr "_City:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:31
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:31
 msgid "_Company:"
 msgstr "_Company:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:32
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:32
 msgid "_Country:"
 msgstr "_Country:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:33
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:33
 msgid "_Department:"
 msgstr "_Department:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:34
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:34
 msgid "_File under:"
 msgstr "_File under:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:35
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:35
 msgid "_Free/Busy:"
 msgstr "_Free/Busy:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:36
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:36
 msgid "_Home Page:"
 msgstr "_Home Page:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:37
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:37
 msgid "_Manager:"
 msgstr "_Manager:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:38
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:38
 msgid "_Notes:"
 msgstr "_Notes:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:39
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:39
 msgid "_Office:"
 msgstr "_Office:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:40
-#: addressbook/gui/contact-editor/fulladdr.glade.h:7
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:40
+#: ../addressbook/gui/contact-editor/fulladdr.glade.h:7
 msgid "_PO Box:"
 msgstr "_PO Box:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:41
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:41
 msgid "_Profession:"
 msgstr "_Profession:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:42
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:42
 msgid "_Spouse:"
 msgstr "_Spouse:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:43
-#: addressbook/gui/contact-editor/fulladdr.glade.h:8
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:43
+#: ../addressbook/gui/contact-editor/fulladdr.glade.h:8
 msgid "_State/Province:"
 msgstr "_State/Province:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:44
-#: addressbook/gui/contact-editor/fullname.glade.h:18
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:44
+#: ../addressbook/gui/contact-editor/fullname.glade.h:18
 msgid "_Title:"
 msgstr "_Title:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:45
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:45
 msgid "_Video Chat:"
 msgstr "_Video Chat:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:46
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:46
 msgid "_Wants to receive HTML mail"
 msgstr "_Wants to receive HTML mail"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:47
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:47
 msgid "_Web Log:"
 msgstr "_Web Log:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:48
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:13
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:48
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:13
 msgid "_Where:"
 msgstr "_Where:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:49
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:49
 msgid "_Zip/Postal Code:"
 msgstr "_Zip/Postal Code:"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:96
-#: addressbook/gui/widgets/eab-contact-display.c:365
-#: addressbook/gui/widgets/eab-contact-display.c:380
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:96
+#: ../addressbook/gui/widgets/eab-contact-display.c:365
+#: ../addressbook/gui/widgets/eab-contact-display.c:380
 msgid "Address"
 msgstr "Address"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:103
-#: addressbook/gui/contact-editor/e-contact-editor-fullname.c:95
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:141
-#: addressbook/gui/contact-editor/e-contact-editor.c:298
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:183
-#: addressbook/gui/widgets/e-addressbook-model.c:310
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:398
-#: addressbook/gui/widgets/e-minicard-label.c:164
-#: addressbook/gui/widgets/e-minicard-view-widget.c:119
-#: addressbook/gui/widgets/e-minicard-view.c:519
-#: addressbook/gui/widgets/e-minicard.c:174
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:103
+#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:95
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:141
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:298
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:183
+#: ../addressbook/gui/widgets/e-addressbook-model.c:310
+#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:398
+#: ../addressbook/gui/widgets/e-minicard-label.c:164
+#: ../addressbook/gui/widgets/e-minicard-view-widget.c:119
+#: ../addressbook/gui/widgets/e-minicard-view.c:519
+#: ../addressbook/gui/widgets/e-minicard.c:174
 msgid "Editable"
 msgstr "Editable"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:136
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:136
 msgid "United States"
 msgstr "United States"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:137
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:137
 msgid "Afghanistan"
 msgstr "Afghanistan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:138
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:138
 msgid "Albania"
 msgstr "Albania"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:139
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:139
 msgid "Algeria"
 msgstr "Algeria"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:140
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:140
 msgid "American Samoa"
 msgstr "American Samoa"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:141
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:141
 msgid "Andorra"
 msgstr "Andorra"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:142
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:142
 msgid "Angola"
 msgstr "Angola"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:143
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:143
 msgid "Anguilla"
 msgstr "Anguilla"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:144
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:144
 msgid "Antarctica"
 msgstr "Antarctica"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:145
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:145
 msgid "Antigua And Barbuda"
 msgstr "Antigua And Barbuda"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:146
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:146
 msgid "Argentina"
 msgstr "Argentina"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:147
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:147
 msgid "Armenia"
 msgstr "Armenia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:148
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:148
 msgid "Aruba"
 msgstr "Aruba"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:149
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:149
 msgid "Australia"
 msgstr "Australia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:150
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:150
 msgid "Austria"
 msgstr "Austria"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:151
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:151
 msgid "Azerbaijan"
 msgstr "Azerbaijan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:152
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:152
 msgid "Bahamas"
 msgstr "Bahamas"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:153
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:153
 msgid "Bahrain"
 msgstr "Bahrain"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:154
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:154
 msgid "Bangladesh"
 msgstr "Bangladesh"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:155
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:155
 msgid "Barbados"
 msgstr "Barbados"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:156
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:156
 msgid "Belarus"
 msgstr "Belarus"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:157
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:157
 msgid "Belgium"
 msgstr "Belgium"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:158
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:158
 msgid "Belize"
 msgstr "Belize"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:159
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:159
 msgid "Benin"
 msgstr "Benin"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:160
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:160
 msgid "Bermuda"
 msgstr "Bermuda"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:161
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:161
 msgid "Bhutan"
 msgstr "Bhutan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:162
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:162
 msgid "Bolivia"
 msgstr "Bolivia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:163
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:163
 msgid "Bosnia And Herzegowina"
 msgstr "Bosnia And Herzegowina"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:164
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:164
 msgid "Botswana"
 msgstr "Botswana"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:165
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:165
 msgid "Bouvet Island"
 msgstr "Bouvet Island"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:166
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:166
 msgid "Brazil"
 msgstr "Brazil"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:167
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:167
 msgid "British Indian Ocean Territory"
 msgstr "British Indian Ocean Territory"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:168
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:168
 msgid "Brunei Darussalam"
 msgstr "Brunei Darussalam"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:169
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:169
 msgid "Bulgaria"
 msgstr "Bulgaria"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:170
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:170
 msgid "Burkina Faso"
 msgstr "Burkina Faso"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:171
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:171
 msgid "Burundi"
 msgstr "Burundi"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:172
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:172
 msgid "Cambodia"
 msgstr "Cambodia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:173
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:173
 msgid "Cameroon"
 msgstr "Cameroon"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:174
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:174
 msgid "Canada"
 msgstr "Canada"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:175
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:175
 msgid "Cape Verde"
 msgstr "Cape Verde"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:176
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:176
 msgid "Cayman Islands"
 msgstr "Cayman Islands"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:177
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:177
 msgid "Central African Republic"
 msgstr "Central African Republic"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:178
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:178
 msgid "Chad"
 msgstr "Chad"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:179
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:179
 msgid "Chile"
 msgstr "Chile"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:180
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:180
 msgid "China"
 msgstr "China"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:181
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:181
 msgid "Christmas Island"
 msgstr "Christmas Island"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:182
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:182
 msgid "Cocos (Keeling) Islands"
 msgstr "Cocos (Keeling) Islands"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:183
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:183
 msgid "Colombia"
 msgstr "Colombia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:184
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:184
 msgid "Comoros"
 msgstr "Comoros"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:185
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:185
 msgid "Congo"
 msgstr "Congo"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:186
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:186
 msgid "Congo, The Democratic Republic Of The"
 msgstr "Congo, The Democratic Republic Of The"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:187
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:187
 msgid "Cook Islands"
 msgstr "Cook Islands"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:188
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:188
 msgid "Costa Rica"
 msgstr "Costa Rica"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:189
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:189
 msgid "Cote d'Ivoire"
 msgstr "Cote d'Ivoire"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:190
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:190
 msgid "Croatia"
 msgstr "Croatia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:191
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:191
 msgid "Cuba"
 msgstr "Cuba"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:192
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:192
 msgid "Cyprus"
 msgstr "Cyprus"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:193
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:193
 msgid "Czech Republic"
 msgstr "Czech Republic"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:194
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:194
 msgid "Denmark"
 msgstr "Denmark"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:195
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:195
 msgid "Djibouti"
 msgstr "Djibouti"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:196
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:196
 msgid "Dominica"
 msgstr "Dominica"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:197
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:197
 msgid "Dominican Republic"
 msgstr "Dominican Republic"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:198
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:198
 msgid "Ecuador"
 msgstr "Ecuador"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:199
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:199
 msgid "Egypt"
 msgstr "Egypt"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:200
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:200
 msgid "El Salvador"
 msgstr "El Salvador"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:201
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:201
 msgid "Equatorial Guinea"
 msgstr "Equatorial Guinea"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:202
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:202
 msgid "Eritrea"
 msgstr "Eritrea"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:203
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:203
 msgid "Estonia"
 msgstr "Estonia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:204
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:204
 msgid "Ethiopia"
 msgstr "Ethiopia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:205
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:205
 msgid "Falkland Islands"
 msgstr "Falkland Islands"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:206
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:206
 msgid "Faroe Islands"
 msgstr "Faroe Islands"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:207
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:207
 msgid "Fiji"
 msgstr "Fiji"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:208
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:208
 msgid "Finland"
 msgstr "Finland"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:209
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:209
 msgid "France"
 msgstr "France"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:210
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:210
 msgid "French Guiana"
 msgstr "French Guiana"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:211
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:211
 msgid "French Polynesia"
 msgstr "French Polynesia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:212
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:212
 msgid "French Southern Territories"
 msgstr "French Southern Territories"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:213
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:213
 msgid "Gabon"
 msgstr "Gabon"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:214
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:214
 msgid "Gambia"
 msgstr "Gambia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:215
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:215
 msgid "Georgia"
 msgstr "Georgia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:216
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:216
 msgid "Germany"
 msgstr "Germany"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:217
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:217
 msgid "Ghana"
 msgstr "Ghana"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:218
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:218
 msgid "Gibraltar"
 msgstr "Gibraltar"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:219
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:219
 msgid "Greece"
 msgstr "Greece"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:220
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:220
 msgid "Greenland"
 msgstr "Greenland"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:221
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:221
 msgid "Grenada"
 msgstr "Grenada"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:222
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:222
 msgid "Guadeloupe"
 msgstr "Guadeloupe"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:223
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:223
 msgid "Guam"
 msgstr "Guam"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:224
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:224
 msgid "Guatemala"
 msgstr "Guatemala"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:225
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:225
 msgid "Guernsey"
 msgstr "Guernsey"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:226
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:226
 msgid "Guinea"
 msgstr "Guinea"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:227
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:227
 msgid "Guinea-bissau"
 msgstr "Guinea-bissau"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:228
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:228
 msgid "Guyana"
 msgstr "Guyana"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:229
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:229
 msgid "Haiti"
 msgstr "Haiti"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:230
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:230
 msgid "Heard And McDonald Islands"
 msgstr "Heard And McDonald Islands"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:231
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:231
 msgid "Holy See"
 msgstr "Holy See"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:232
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:232
 msgid "Honduras"
 msgstr "Honduras"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:233
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:233
 msgid "Hong Kong"
 msgstr "Hong Kong"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:234
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:234
 msgid "Hungary"
 msgstr "Hungary"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:235
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:235
 msgid "Iceland"
 msgstr "Iceland"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:236
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:236
 msgid "India"
 msgstr "India"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:237
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:237
 msgid "Indonesia"
 msgstr "Indonesia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:238
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:238
 msgid "Iran"
 msgstr "Iran"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:239
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:239
 msgid "Iraq"
 msgstr "Iraq"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:240
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:240
 msgid "Ireland"
 msgstr "Ireland"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:241
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:241
 msgid "Isle of Man"
 msgstr "Isle of Man"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:242
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:242
 msgid "Israel"
 msgstr "Israel"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:243
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:243
 msgid "Italy"
 msgstr "Italy"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:244
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:244
 msgid "Jamaica"
 msgstr "Jamaica"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:245
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:245
 msgid "Japan"
 msgstr "Japan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:246
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:246
 msgid "Jersey"
 msgstr "Jersey"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:247
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:247
 msgid "Jordan"
 msgstr "Jordan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:248
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:248
 msgid "Kazakhstan"
 msgstr "Kazakhstan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:249
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:249
 msgid "Kenya"
 msgstr "Kenya"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:250
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:250
 msgid "Kiribati"
 msgstr "Kiribati"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:251
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:251
 msgid "Korea, Democratic People's Republic Of"
 msgstr "Korea, Democratic People's Republic Of"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:252
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:252
 msgid "Korea, Republic Of"
 msgstr "Korea, Republic Of"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:253
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:253
 msgid "Kuwait"
 msgstr "Kuwait"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:254
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:254
 msgid "Kyrgyzstan"
 msgstr "Kyrgyzstan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:255
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:255
 msgid "Laos"
 msgstr "Laos"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:256
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:256
 msgid "Latvia"
 msgstr "Latvia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:257
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:257
 msgid "Lebanon"
 msgstr "Lebanon"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:258
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:258
 msgid "Lesotho"
 msgstr "Lesotho"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:259
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:259
 msgid "Liberia"
 msgstr "Liberia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:260
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:260
 msgid "Libya"
 msgstr "Libya"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:261
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:261
 msgid "Liechtenstein"
 msgstr "Liechtenstein"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:262
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:262
 msgid "Lithuania"
 msgstr "Lithuania"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:263
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:263
 msgid "Luxembourg"
 msgstr "Luxembourg"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:264
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:264
 msgid "Macao"
 msgstr "Macao"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:265
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:265
 msgid "Macedonia"
 msgstr "Macedonia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:266
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:266
 msgid "Madagascar"
 msgstr "Madagascar"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:267
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:267
 msgid "Malawi"
 msgstr "Malawi"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:268
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:268
 msgid "Malaysia"
 msgstr "Malaysia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:269
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:269
 msgid "Maldives"
 msgstr "Maldives"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:270
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:270
 msgid "Mali"
 msgstr "Mali"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:271
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:271
 msgid "Malta"
 msgstr "Malta"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:272
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:272
 msgid "Marshall Islands"
 msgstr "Marshall Islands"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:273
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:273
 msgid "Martinique"
 msgstr "Martinique"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:274
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:274
 msgid "Mauritania"
 msgstr "Mauritania"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:275
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:275
 msgid "Mauritius"
 msgstr "Mauritius"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:276
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:276
 msgid "Mayotte"
 msgstr "Mayotte"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:277
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:277
 msgid "Mexico"
 msgstr "Mexico"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:278
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:278
 msgid "Micronesia"
 msgstr "Micronesia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:279
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:279
 msgid "Moldova, Republic Of"
 msgstr "Moldova, Republic Of"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:280
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:280
 msgid "Monaco"
 msgstr "Monaco"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:281
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:281
 msgid "Mongolia"
 msgstr "Mongolia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:282
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:282
 msgid "Montserrat"
 msgstr "Montserrat"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:283
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:283
 msgid "Morocco"
 msgstr "Morocco"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:284
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:284
 msgid "Mozambique"
 msgstr "Mozambique"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:285
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:285
 msgid "Myanmar"
 msgstr "Myanmar"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:286
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:286
 msgid "Namibia"
 msgstr "Namibia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:287
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:287
 msgid "Nauru"
 msgstr "Nauru"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:288
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:288
 msgid "Nepal"
 msgstr "Nepal"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:289
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:289
 msgid "Netherlands"
 msgstr "Netherlands"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:290
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:290
 msgid "Netherlands Antilles"
 msgstr "Netherlands Antilles"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:291
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:291
 msgid "New Caledonia"
 msgstr "New Caledonia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:292
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:292
 msgid "New Zealand"
 msgstr "New Zealand"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:293
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:293
 msgid "Nicaragua"
 msgstr "Nicaragua"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:294
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:294
 msgid "Niger"
 msgstr "Niger"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:295
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:295
 msgid "Nigeria"
 msgstr "Nigeria"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:296
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:296
 msgid "Niue"
 msgstr "Niue"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:297
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:297
 msgid "Norfolk Island"
 msgstr "Norfolk Island"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:298
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:298
 msgid "Northern Mariana Islands"
 msgstr "Northern Mariana Islands"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:299
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:299
 msgid "Norway"
 msgstr "Norway"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:300
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:300
 msgid "Oman"
 msgstr "Oman"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:301
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:301
 msgid "Pakistan"
 msgstr "Pakistan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:302
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:302
 msgid "Palau"
 msgstr "Palau"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:303
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:303
 msgid "Palestinian Territory"
 msgstr "Palestinian Territory"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:304
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:304
 msgid "Panama"
 msgstr "Panama"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:305
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:305
 msgid "Papua New Guinea"
 msgstr "Papua New Guinea"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:306
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:306
 msgid "Paraguay"
 msgstr "Paraguay"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:307
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:307
 msgid "Peru"
 msgstr "Peru"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:308
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:308
 msgid "Philippines"
 msgstr "Philippines"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:309
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:309
 msgid "Pitcairn"
 msgstr "Pitcairn"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:310
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:310
 msgid "Poland"
 msgstr "Poland"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:311
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:311
 msgid "Portugal"
 msgstr "Portugal"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:312
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:312
 msgid "Puerto Rico"
 msgstr "Puerto Rico"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:313
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:313
 msgid "Qatar"
 msgstr "Qatar"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:314
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:314
 msgid "Reunion"
 msgstr "Reunion"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:315
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:315
 msgid "Romania"
 msgstr "Romania"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:316
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:316
 msgid "Russian Federation"
 msgstr "Russian Federation"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:317
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:317
 msgid "Rwanda"
 msgstr "Rwanda"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:318
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:318
 msgid "Saint Kitts And Nevis"
 msgstr "Saint Kitts And Nevis"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:319
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:319
 msgid "Saint Lucia"
 msgstr "Saint Lucia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:320
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:320
 msgid "Saint Vincent And The Grenadines"
 msgstr "Saint Vincent And The Grenadines"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:321
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:321
 msgid "Samoa"
 msgstr "Samoa"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:322
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:322
 msgid "San Marino"
 msgstr "San Marino"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:323
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:323
 msgid "Sao Tome And Principe"
 msgstr "Sao Tome And Principe"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:324
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:324
 msgid "Saudi Arabia"
 msgstr "Saudi Arabia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:325
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:325
 msgid "Senegal"
 msgstr "Senegal"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:326
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:326
 msgid "Serbia And Montenegro"
 msgstr "Serbia And Montenegro"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:327
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:327
 msgid "Seychelles"
 msgstr "Seychelles"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:328
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:328
 msgid "Sierra Leone"
 msgstr "Sierra Leone"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:329
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:329
 msgid "Singapore"
 msgstr "Singapore"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:330
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:330
 msgid "Slovakia"
 msgstr "Slovakia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:331
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:331
 msgid "Slovenia"
 msgstr "Slovenia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:332
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:332
 msgid "Solomon Islands"
 msgstr "Solomon Islands"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:333
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:333
 msgid "Somalia"
 msgstr "Somalia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:334
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:334
 msgid "South Africa"
 msgstr "South Africa"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:335
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:335
 msgid "South Georgia And The South Sandwich Islands"
 msgstr "South Georgia And The South Sandwich Islands"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:336
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:336
 msgid "Spain"
 msgstr "Spain"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:337
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:337
 msgid "Sri Lanka"
 msgstr "Sri Lanka"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:338
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:338
 msgid "St. Helena"
 msgstr "St. Helena"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:339
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:339
 msgid "St. Pierre And Miquelon"
 msgstr "St. Pierre And Miquelon"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:340
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:340
 msgid "Sudan"
 msgstr "Sudan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:341
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:341
 msgid "Suriname"
 msgstr "Suriname"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:342
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:342
 msgid "Svalbard And Jan Mayen Islands"
 msgstr "Svalbard And Jan Mayen Islands"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:343
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:343
 msgid "Swaziland"
 msgstr "Swaziland"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:344
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:344
 msgid "Sweden"
 msgstr "Sweden"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:345
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:345
 msgid "Switzerland"
 msgstr "Switzerland"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:346
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:346
 msgid "Syria"
 msgstr "Syria"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:347
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:347
 msgid "Taiwan"
 msgstr "Taiwan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:348
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:348
 msgid "Tajikistan"
 msgstr "Tajikistan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:349
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:349
 msgid "Tanzania, United Republic Of"
 msgstr "Tanzania, United Republic Of"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:350
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:350
 msgid "Thailand"
 msgstr "Thailand"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:351
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:351
 msgid "Timor-Leste"
 msgstr "Timor-Leste"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:352
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:352
 msgid "Togo"
 msgstr "Togo"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:353
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:353
 msgid "Tokelau"
 msgstr "Tokelau"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:354
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:354
 msgid "Tonga"
 msgstr "Tonga"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:355
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:355
 msgid "Trinidad And Tobago"
 msgstr "Trinidad And Tobago"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:356
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:356
 msgid "Tunisia"
 msgstr "Tunisia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:357
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:357
 msgid "Turkey"
 msgstr "Turkey"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:358
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:358
 msgid "Turkmenistan"
 msgstr "Turkmenistan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:359
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:359
 msgid "Turks And Caicos Islands"
 msgstr "Turks And Caicos Islands"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:360
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:360
 msgid "Tuvalu"
 msgstr "Tuvalu"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:361
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:361
 msgid "Uganda"
 msgstr "Uganda"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:362
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:362
 msgid "Ukraine"
 msgstr "Ukraine"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:363
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:363
 msgid "United Arab Emirates"
 msgstr "United Arab Emirates"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:364
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:364
 msgid "United Kingdom"
 msgstr "United Kingdom"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:365
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:365
 msgid "United States Minor Outlying Islands"
 msgstr "United States Minor Outlying Islands"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:366
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:366
 msgid "Uruguay"
 msgstr "Uruguay"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:367
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:367
 msgid "Uzbekistan"
 msgstr "Uzbekistan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:368
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:368
 msgid "Vanuatu"
 msgstr "Vanuatu"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:369
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:369
 msgid "Venezuela"
 msgstr "Venezuela"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:370
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:370
 msgid "Viet Nam"
 msgstr "Viet Nam"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:371
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:371
 msgid "Virgin Islands, British"
 msgstr "Virgin Islands, British"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:372
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:372
 msgid "Virgin Islands, U.S."
 msgstr "Virgin Islands, U.S."
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:373
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:373
 msgid "Wallis And Futuna Islands"
 msgstr "Wallis And Futuna Islands"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:374
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:374
 msgid "Western Sahara"
 msgstr "Western Sahara"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:375
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:375
 msgid "Yemen"
 msgstr "Yemen"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:376
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:376
 msgid "Zambia"
 msgstr "Zambia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:377
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:377
 msgid "Zimbabwe"
 msgstr "Zimbabwe"
 
-#: addressbook/gui/contact-editor/e-contact-editor-fullname.c:89
-#: plugins/plugin-manager/plugin-manager.c:44
-#: plugins/save-attachments/save-attachments.c:362
+#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:89
+#: ../plugins/plugin-manager/plugin-manager.c:44
+#: ../plugins/save-attachments/save-attachments.c:362
 msgid "Name"
 msgstr "Name"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:62
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:62
 msgid "AOL Instant Messenger"
 msgstr "AOL Instant Messenger"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:64
-#: addressbook/gui/contact-editor/e-contact-editor.c:183
-#: addressbook/gui/widgets/eab-contact-display.c:349
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:64
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:183
+#: ../addressbook/gui/widgets/eab-contact-display.c:349
 msgid "Jabber"
 msgstr "Jabber"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:65
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:65
 msgid "Yahoo Messenger"
 msgstr "Yahoo Messenger"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:67
-#: addressbook/gui/contact-editor/e-contact-editor.c:186
-#: addressbook/gui/widgets/eab-contact-display.c:348
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:67
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:186
+#: ../addressbook/gui/widgets/eab-contact-display.c:348
 msgid "ICQ"
 msgstr "ICQ"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:118
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:118
 msgid "Service"
 msgstr "Service"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:127
-#: calendar/gui/dialogs/cal-prefs-dialog.c:587
-#: calendar/gui/e-cal-list-view.etspec.h:3
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:127
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:587
+#: ../calendar/gui/e-cal-list-view.etspec.h:3
 msgid "Location"
 msgstr "Location"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:134
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:134
 msgid "Username"
 msgstr "Username"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:231
-#: addressbook/gui/contact-editor/e-contact-editor.c:200
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:231
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:200
 msgid "Home"
 msgstr "Home"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:239
-#: addressbook/gui/contact-editor/e-contact-editor.c:201
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:239
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:201
 msgid "Other"
 msgstr "Other"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:184
-#: addressbook/gui/widgets/eab-contact-display.c:351
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:184
+#: ../addressbook/gui/widgets/eab-contact-display.c:351
 msgid "Yahoo"
 msgstr "Yahoo"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:185
-#: addressbook/gui/widgets/eab-contact-display.c:350
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:185
+#: ../addressbook/gui/widgets/eab-contact-display.c:350
 msgid "MSN"
 msgstr "MSN"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:187
-#: addressbook/gui/widgets/eab-contact-display.c:347
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:187
+#: ../addressbook/gui/widgets/eab-contact-display.c:347
 msgid "GroupWise"
 msgstr "GroupWise"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:256
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:256
 msgid "Source Book"
 msgstr "Source Book"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:263
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:263
 msgid "Target Book"
 msgstr "Target Book"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:277
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:277
 msgid "Is New Contact"
 msgstr "Is New Contact"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:284
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:284
 msgid "Writable Fields"
 msgstr "Writable Fields"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:291
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:291
 msgid "Required Fields"
 msgstr "Required Fields"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:305
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:305
 msgid "Changed"
 msgstr "Changed"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2578
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2578
 msgid "Please select an image for this contact"
 msgstr "Please select an image for this contact"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2579
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2579
 msgid "No image"
 msgstr "No image"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2855
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2855
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -2379,27 +2401,27 @@ msgstr ""
 "The contact data is invalid:\n"
 "\n"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2907
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2907
 msgid "Invalid contact."
 msgstr "Invalid contact."
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:277
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:277
 msgid "Contact Quick-Add"
 msgstr "Contact Quick-Add"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:280
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:280
 msgid "_Edit Full"
 msgstr "_Edit Full"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:306
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:306
 msgid "_Full name:"
 msgstr "_Full name:"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:316
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:316
 msgid "E-_mail:"
 msgstr "E-_mail:"
 
-#: addressbook/gui/contact-editor/eab-editor.c:319
+#: ../addressbook/gui/contact-editor/eab-editor.c:326
 msgid ""
 "Are you sure you want\n"
 "to delete these contacts?"
@@ -2407,7 +2429,7 @@ msgstr ""
 "Are you sure you want\n"
 "to delete these contacts?"
 
-#: addressbook/gui/contact-editor/eab-editor.c:322
+#: ../addressbook/gui/contact-editor/eab-editor.c:329
 msgid ""
 "Are you sure you want\n"
 "to delete this contact?"
@@ -2415,184 +2437,184 @@ msgstr ""
 "Are you sure you want\n"
 "to delete this contact?"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:2
+#: ../addressbook/gui/contact-editor/fulladdr.glade.h:2
 msgid "Address _2:"
 msgstr "Address _2:"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:3
+#: ../addressbook/gui/contact-editor/fulladdr.glade.h:3
 msgid "Ci_ty:"
 msgstr "Ci_ty:"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:4
+#: ../addressbook/gui/contact-editor/fulladdr.glade.h:4
 msgid "Countr_y:"
 msgstr "Countr_y:"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:5
+#: ../addressbook/gui/contact-editor/fulladdr.glade.h:5
 msgid "Full Address"
 msgstr "Full Address"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:9
+#: ../addressbook/gui/contact-editor/fulladdr.glade.h:9
 msgid "_ZIP Code:"
 msgstr "_Postal Code:"
 
-#: addressbook/gui/contact-editor/fullname.glade.h:2
+#: ../addressbook/gui/contact-editor/fullname.glade.h:2
 msgid "Dr."
 msgstr "Dr."
 
-#: addressbook/gui/contact-editor/fullname.glade.h:3
+#: ../addressbook/gui/contact-editor/fullname.glade.h:3
 msgid "Esq."
 msgstr "Esq."
 
-#: addressbook/gui/contact-editor/fullname.glade.h:4
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:15
+#: ../addressbook/gui/contact-editor/fullname.glade.h:4
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:15
 msgid "Full Name"
 msgstr "Full Name"
 
-#: addressbook/gui/contact-editor/fullname.glade.h:5
+#: ../addressbook/gui/contact-editor/fullname.glade.h:5
 msgid "I"
 msgstr "I"
 
-#: addressbook/gui/contact-editor/fullname.glade.h:6
+#: ../addressbook/gui/contact-editor/fullname.glade.h:6
 msgid "II"
 msgstr "II"
 
-#: addressbook/gui/contact-editor/fullname.glade.h:7
+#: ../addressbook/gui/contact-editor/fullname.glade.h:7
 msgid "III"
 msgstr "III"
 
-#: addressbook/gui/contact-editor/fullname.glade.h:8
+#: ../addressbook/gui/contact-editor/fullname.glade.h:8
 msgid "Jr."
 msgstr "Jr."
 
-#: addressbook/gui/contact-editor/fullname.glade.h:9
+#: ../addressbook/gui/contact-editor/fullname.glade.h:9
 msgid "Miss"
 msgstr "Miss"
 
-#: addressbook/gui/contact-editor/fullname.glade.h:10
+#: ../addressbook/gui/contact-editor/fullname.glade.h:10
 msgid "Mr."
 msgstr "Mr."
 
-#: addressbook/gui/contact-editor/fullname.glade.h:11
+#: ../addressbook/gui/contact-editor/fullname.glade.h:11
 msgid "Mrs."
 msgstr "Mrs."
 
-#: addressbook/gui/contact-editor/fullname.glade.h:12
+#: ../addressbook/gui/contact-editor/fullname.glade.h:12
 msgid "Ms."
 msgstr "Ms."
 
-#: addressbook/gui/contact-editor/fullname.glade.h:13
+#: ../addressbook/gui/contact-editor/fullname.glade.h:13
 msgid "Sr."
 msgstr "Sr."
 
-#: addressbook/gui/contact-editor/fullname.glade.h:14
+#: ../addressbook/gui/contact-editor/fullname.glade.h:14
 msgid "_First:"
 msgstr "_First:"
 
-#: addressbook/gui/contact-editor/fullname.glade.h:15
+#: ../addressbook/gui/contact-editor/fullname.glade.h:15
 msgid "_Last:"
 msgstr "_Last:"
 
-#: addressbook/gui/contact-editor/fullname.glade.h:16
+#: ../addressbook/gui/contact-editor/fullname.glade.h:16
 msgid "_Middle:"
 msgstr "_Middle:"
 
-#: addressbook/gui/contact-editor/fullname.glade.h:17
+#: ../addressbook/gui/contact-editor/fullname.glade.h:17
 msgid "_Suffix:"
 msgstr "_Suffix:"
 
-#: addressbook/gui/contact-editor/im.glade.h:2
+#: ../addressbook/gui/contact-editor/im.glade.h:2
 msgid "Add IM Account"
 msgstr "Add IM Account"
 
-#: addressbook/gui/contact-editor/im.glade.h:3
+#: ../addressbook/gui/contact-editor/im.glade.h:3
 msgid "_Account name:"
 msgstr "_Account name:"
 
-#: addressbook/gui/contact-editor/im.glade.h:4
+#: ../addressbook/gui/contact-editor/im.glade.h:4
 msgid "_IM Service:"
 msgstr "_IM Service:"
 
-#: addressbook/gui/contact-editor/im.glade.h:5
-#: plugins/calendar-weather/calendar-weather.c:410
+#: ../addressbook/gui/contact-editor/im.glade.h:5
+#: ../plugins/calendar-weather/calendar-weather.c:410
 msgid "_Location:"
 msgstr "_Location:"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:1
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:1
 msgid "\n"
 msgstr "\n"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
 msgid "Add an email to the List"
 msgstr "Add an email to the List"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:820
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:817
 msgid "Contact List Editor"
 msgstr "Contact List Editor"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
 msgid "Insert email adresses from Adress Book"
 msgstr "Insert email addresses from Address Book"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
 msgid "Members"
 msgstr "Members"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8
 msgid "Remove an email address from the List"
 msgstr "Remove an email address from the List"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:9
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:9
 msgid "_Hide addresses when sending mail to this list"
 msgstr "_Hide addresses when sending mail to this list"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:10
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:10
 msgid "_List name:"
 msgstr "_List name:"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:11
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:11
 msgid "_Select"
 msgstr "_Select"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:12
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:12
 msgid "_Type an email address or drag a contact into the list below:"
 msgstr "_Type an email address or drag a contact into the list below:"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:162
-#: addressbook/gui/widgets/e-addressbook-model.c:296
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:384
-#: addressbook/gui/widgets/e-addressbook-view.c:223
-#: addressbook/gui/widgets/e-minicard-view-widget.c:105
-#: addressbook/gui/widgets/e-minicard-view.c:505
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:162
+#: ../addressbook/gui/widgets/e-addressbook-model.c:296
+#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:384
+#: ../addressbook/gui/widgets/e-addressbook-view.c:223
+#: ../addressbook/gui/widgets/e-minicard-view-widget.c:105
+#: ../addressbook/gui/widgets/e-minicard-view.c:505
 msgid "Book"
 msgstr "Book"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:176
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:176
 msgid "Is New List"
 msgstr "Is New List"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:710
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:707
 msgid "_Members"
 msgstr "_Members"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:713
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:710
 msgid "Contact List Members"
 msgstr "Contact List Members"
 
-#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:1
+#: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:1
 msgid "Changed Contact:"
 msgstr "Changed Contact:"
 
-#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:2
+#: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:2
 msgid "Conflicting Contact:"
 msgstr "Conflicting Contact:"
 
-#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:3
-#: addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:1
+#: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:3
+#: ../addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:1
 msgid "Duplicate Contact Detected"
 msgstr "Duplicate Contact Detected"
 
-#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:4
+#: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:4
 msgid ""
 "The changed email or name of this contact already\n"
 "exists in this folder.  Would you like to add it anyway?"
@@ -2600,15 +2622,15 @@ msgstr ""
 "The changed email or name of this contact already\n"
 "exists in this folder.  Would you like to add it anyway?"
 
-#: addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:2
+#: ../addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:2
 msgid "New Contact:"
 msgstr "New Contact:"
 
-#: addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:3
+#: ../addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:3
 msgid "Original Contact:"
 msgstr "Original Contact:"
 
-#: addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:4
+#: ../addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:4
 msgid ""
 "The name or email address of this contact already exists\n"
 "in this folder.  Would you like to add it anyway?"
@@ -2617,289 +2639,290 @@ msgstr ""
 "in this folder.  Would you like to add it anyway?"
 
 #. FIXME: get the toplevel window...
-#: addressbook/gui/search/e-addressbook-search-dialog.c:160
-#: widgets/misc/e-filter-bar.c:156
+#: ../addressbook/gui/search/e-addressbook-search-dialog.c:160
+#: ../widgets/misc/e-filter-bar.c:156
 msgid "Advanced Search"
 msgstr "Advanced Search"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:148
+#: ../addressbook/gui/widgets/e-addressbook-model.c:148
 msgid "No contacts"
 msgstr "No contacts"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:151
+#: ../addressbook/gui/widgets/e-addressbook-model.c:151
 #, c-format
 msgid "%d contact"
 msgid_plural "%d contacts"
 msgstr[0] "%d contact"
 msgstr[1] "%d contacts"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:303
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:391
-#: addressbook/gui/widgets/e-addressbook-view.c:237
-#: addressbook/gui/widgets/e-minicard-view-widget.c:112
-#: addressbook/gui/widgets/e-minicard-view.c:512
+#: ../addressbook/gui/widgets/e-addressbook-model.c:303
+#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:391
+#: ../addressbook/gui/widgets/e-addressbook-view.c:237
+#: ../addressbook/gui/widgets/e-minicard-view-widget.c:112
+#: ../addressbook/gui/widgets/e-minicard-view.c:512
 msgid "Query"
 msgstr "Query"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:446
+#: ../addressbook/gui/widgets/e-addressbook-model.c:446
 msgid "Error getting book view"
 msgstr "Error getting book view"
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:405
+#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:405
 msgid "Model"
 msgstr "Model"
 
-#: addressbook/gui/widgets/e-addressbook-table-adapter.c:103
+#: ../addressbook/gui/widgets/e-addressbook-table-adapter.c:103
 msgid "Error modifying card"
 msgstr "Error modifying card"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:169
+#: ../addressbook/gui/widgets/e-addressbook-view.c:169
 msgid "Name begins with"
 msgstr "Name begins with"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:170
+#: ../addressbook/gui/widgets/e-addressbook-view.c:170
 msgid "Email begins with"
 msgstr "Email begins with"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:171
-#: calendar/gui/cal-search-bar.c:53
+#: ../addressbook/gui/widgets/e-addressbook-view.c:171
+#: ../calendar/gui/cal-search-bar.c:53
 msgid "Category is"
 msgstr "Category is"
 
 #. We attach subitems below
-#: addressbook/gui/widgets/e-addressbook-view.c:172
-#: calendar/gui/cal-search-bar.c:48
+#: ../addressbook/gui/widgets/e-addressbook-view.c:172
+#: ../calendar/gui/cal-search-bar.c:48
 msgid "Any field contains"
 msgstr "Any field contains"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:173
-#: addressbook/gui/widgets/e-addressbook-view.c:178
+#: ../addressbook/gui/widgets/e-addressbook-view.c:173
+#: ../addressbook/gui/widgets/e-addressbook-view.c:178
 msgid "Advanced..."
 msgstr "Advanced..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:230
+#: ../addressbook/gui/widgets/e-addressbook-view.c:230
 msgid "Source"
 msgstr "Source"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:244
-#: calendar/gui/dialogs/meeting-page.etspec.h:11
-#: calendar/gui/e-calendar-table.etspec.h:13
-#: calendar/gui/e-meeting-list-view.c:244
-#: calendar/gui/e-meeting-time-sel.etspec.h:11
+#: ../addressbook/gui/widgets/e-addressbook-view.c:244
+#: ../calendar/gui/dialogs/meeting-page.etspec.h:11
+#: ../calendar/gui/e-calendar-table.etspec.h:13
+#: ../calendar/gui/e-meeting-list-view.c:319
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:11
 msgid "Type"
 msgstr "Type"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:541
+#: ../addressbook/gui/widgets/e-addressbook-view.c:541
 msgid "Address Book"
 msgstr "Address Book"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:804
-#: addressbook/gui/widgets/e-addressbook-view.c:922
-#: addressbook/gui/widgets/e-addressbook-view.c:1982
-#: ui/evolution-addressbook.xml.h:19
+#: ../addressbook/gui/widgets/e-addressbook-view.c:804
+#: ../addressbook/gui/widgets/e-addressbook-view.c:922
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1982
+#: ../ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard..."
 msgstr "Save as VCard..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:918
+#: ../addressbook/gui/widgets/e-addressbook-view.c:918
 msgid "New Contact..."
 msgstr "New Contact..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:919
+#: ../addressbook/gui/widgets/e-addressbook-view.c:919
 msgid "New Contact List..."
 msgstr "New Contact List..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:923
-#: ui/evolution-addressbook.xml.h:10
+#: ../addressbook/gui/widgets/e-addressbook-view.c:923
+#: ../ui/evolution-addressbook.xml.h:10
 msgid "Forward Contact"
 msgstr "Forward Contact"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:924
+#: ../addressbook/gui/widgets/e-addressbook-view.c:924
 msgid "Send Message to Contact"
 msgstr "Send Message to Contact"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:925
-#: calendar/gui/calendar-commands.c:120 calendar/gui/print.c:2489
-#: ui/evolution-addressbook.xml.h:16 ui/evolution-calendar.xml.h:19
-#: ui/evolution-mail-message.xml.h:80 ui/evolution-tasks.xml.h:14
+#: ../addressbook/gui/widgets/e-addressbook-view.c:925
+#: ../calendar/gui/calendar-commands.c:120 ../calendar/gui/print.c:2489
+#: ../ui/evolution-addressbook.xml.h:16 ../ui/evolution-calendar.xml.h:19
+#: ../ui/evolution-mail-message.xml.h:80 ../ui/evolution-tasks.xml.h:14
 msgid "Print"
 msgstr "Print"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:928
+#: ../addressbook/gui/widgets/e-addressbook-view.c:928
 msgid "Copy to Address Book..."
 msgstr "Copy to Address Book..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:929
+#: ../addressbook/gui/widgets/e-addressbook-view.c:929
 msgid "Move to Address Book..."
 msgstr "Move to Address Book..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:932
-#: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
+#: ../addressbook/gui/widgets/e-addressbook-view.c:932
+#: ../ui/evolution-addressbook.xml.h:6 ../ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "Cut"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:933
-#: calendar/gui/calendar-component.c:385 calendar/gui/tasks-component.c:329
-#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:9
-#: ui/evolution-tasks.xml.h:2
+#: ../addressbook/gui/widgets/e-addressbook-view.c:933
+#: ../calendar/gui/calendar-component.c:525
+#: ../calendar/gui/tasks-component.c:429 ../ui/evolution-addressbook.xml.h:2
+#: ../ui/evolution-mail-message.xml.h:9 ../ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr "Copy"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:934
-#: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:11
+#: ../addressbook/gui/widgets/e-addressbook-view.c:934
+#: ../ui/evolution-addressbook.xml.h:13 ../ui/evolution-tasks.xml.h:11
 msgid "Paste"
 msgstr "Paste"
 
 #. All, unmatched, separator
-#: addressbook/gui/widgets/e-addressbook-view.c:1537
-#: calendar/gui/cal-search-bar.c:346
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1537
+#: ../calendar/gui/cal-search-bar.c:346
 msgid "Any Category"
 msgstr "Any Category"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1750
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1750
 msgid "Print cards"
 msgstr "Print cards"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:1
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:1
 msgid "Assistant"
 msgstr "Assistant"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:2
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:2
 msgid "Assistant Phone"
 msgstr "Assistant Phone"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:3
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:3
 msgid "Business Fax"
 msgstr "Business Fax"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:4
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:4
 msgid "Business Phone"
 msgstr "Business Phone"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:5
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:5
 msgid "Business Phone 2"
 msgstr "Business Phone 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:6
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:6
 msgid "Callback Phone"
 msgstr "Callback Phone"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:7
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:7
 msgid "Car Phone"
 msgstr "Car Phone"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:8
-#: calendar/gui/dialogs/task-page.glade.h:6
-#: calendar/gui/e-cal-list-view.etspec.h:1
-#: calendar/gui/e-calendar-table.etspec.h:3
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:8
+#: ../calendar/gui/dialogs/task-page.glade.h:6
+#: ../calendar/gui/e-cal-list-view.etspec.h:1
+#: ../calendar/gui/e-calendar-table.etspec.h:3
 msgid "Categories"
 msgstr "Categories"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:9
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:9
 msgid "Company Phone"
 msgstr "Company Phone"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
-#: addressbook/gui/widgets/eab-contact-display.c:560 smime/lib/e-cert.c:826
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:10
+#: ../addressbook/gui/widgets/eab-contact-display.c:560
+#: ../smime/lib/e-cert.c:826
 msgid "Email"
 msgstr "Email"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
-#: addressbook/gui/widgets/eab-popup-control.c:441
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:11
+#: ../addressbook/gui/widgets/eab-popup-control.c:441
 msgid "Email 2"
 msgstr "Email 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
-#: addressbook/gui/widgets/eab-popup-control.c:451
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:12
+#: ../addressbook/gui/widgets/eab-popup-control.c:451
 msgid "Email 3"
 msgstr "Email 3"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:13
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:13
 msgid "Family Name"
 msgstr "Family Name"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:14
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:14
 msgid "File As"
 msgstr "File As"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:16
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:16
 msgid "Given Name"
 msgstr "Given Name"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:17
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:17
 msgid "Home Fax"
 msgstr "Home Fax"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:18
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:18
 msgid "Home Phone"
 msgstr "Home Phone"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:19
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:19
 msgid "Home Phone 2"
 msgstr "Home Phone 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:20
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:20
 msgid "ISDN Phone"
 msgstr "ISDN Phone"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:21
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:21
 msgid "Journal"
 msgstr "Journal"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:22
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:22
 msgid "Manager"
 msgstr "Manager"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
-#: addressbook/gui/widgets/eab-contact-display.c:379
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:23
+#: ../addressbook/gui/widgets/eab-contact-display.c:379
 msgid "Mobile Phone"
 msgstr "Mobile Phone"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:24
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:24
 msgid "Nickname"
 msgstr "Nickname"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-#: addressbook/gui/widgets/eab-contact-display.c:390
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:25
+#: ../addressbook/gui/widgets/eab-contact-display.c:390
 msgid "Note"
 msgstr "Note"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:26
 msgid "Office"
 msgstr "Office"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
-#: addressbook/gui/widgets/eab-contact-display.c:360
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:27
+#: ../addressbook/gui/widgets/eab-contact-display.c:360
 msgid "Organization"
 msgstr "Organization"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:28
 msgid "Other Fax"
 msgstr "Other Fax"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:29
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:29
 msgid "Other Phone"
 msgstr "Other Phone"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:30
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:30
 msgid "Pager"
 msgstr "Pager"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:31
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:31
 msgid "Primary Phone"
 msgstr "Primary Phone"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:32
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:32
 msgid "Radio"
 msgstr "Radio"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:33
-#: calendar/gui/dialogs/meeting-page.etspec.h:9
-#: calendar/gui/e-meeting-list-view.c:251
-#: calendar/gui/e-meeting-time-sel.etspec.h:9
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:33
+#: ../calendar/gui/dialogs/meeting-page.etspec.h:9
+#: ../calendar/gui/e-meeting-list-view.c:326
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:9
 msgid "Role"
 msgstr "Role"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:34
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:34
 msgid "Spouse"
 msgstr "Spouse"
 
@@ -2909,62 +2932,62 @@ msgstr "Spouse"
 #. Device for Deaf". However, you probably want to leave this
 #. abbreviation unchanged unless you know that there is actually a
 #. different and established translation for this in your language.
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:41
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:41
 msgid "TTYTDD"
 msgstr "TTYTDD"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:42
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:42
 msgid "Telex"
 msgstr "Telex"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:43
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:43
 msgid "Title"
 msgstr "Title"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:44
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:44
 msgid "Unit"
 msgstr "Unit"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:45
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:45
 msgid "Web Site"
 msgstr "Web Site"
 
-#: addressbook/gui/widgets/e-minicard-label.c:115
-#: addressbook/gui/widgets/e-minicard.c:137
+#: ../addressbook/gui/widgets/e-minicard-label.c:115
+#: ../addressbook/gui/widgets/e-minicard.c:137
 msgid "Width"
 msgstr "Width"
 
-#: addressbook/gui/widgets/e-minicard-label.c:122
-#: addressbook/gui/widgets/e-minicard.c:144
+#: ../addressbook/gui/widgets/e-minicard-label.c:122
+#: ../addressbook/gui/widgets/e-minicard.c:144
 msgid "Height"
 msgstr "Height"
 
-#: addressbook/gui/widgets/e-minicard-label.c:129
-#: addressbook/gui/widgets/e-minicard.c:152
+#: ../addressbook/gui/widgets/e-minicard-label.c:129
+#: ../addressbook/gui/widgets/e-minicard.c:152
 msgid "Has Focus"
 msgstr "Has Focus"
 
-#: addressbook/gui/widgets/e-minicard-label.c:136
+#: ../addressbook/gui/widgets/e-minicard-label.c:136
 msgid "Field"
 msgstr "Field"
 
-#: addressbook/gui/widgets/e-minicard-label.c:143
+#: ../addressbook/gui/widgets/e-minicard-label.c:143
 msgid "Field Name"
 msgstr "Field Name"
 
-#: addressbook/gui/widgets/e-minicard-label.c:150
+#: ../addressbook/gui/widgets/e-minicard-label.c:150
 msgid "Text Model"
 msgstr "Text Model"
 
-#: addressbook/gui/widgets/e-minicard-label.c:157
+#: ../addressbook/gui/widgets/e-minicard-label.c:157
 msgid "Max field name length"
 msgstr "Max field name length"
 
-#: addressbook/gui/widgets/e-minicard-view-widget.c:126
+#: ../addressbook/gui/widgets/e-minicard-view-widget.c:126
 msgid "Column Width"
 msgstr "Column Width"
 
-#: addressbook/gui/widgets/e-minicard-view.c:171
+#: ../addressbook/gui/widgets/e-minicard-view.c:171
 msgid ""
 "\n"
 "\n"
@@ -2978,7 +3001,7 @@ msgstr ""
 "\n"
 "or double-click here to create a new Contact."
 
-#: addressbook/gui/widgets/e-minicard-view.c:174
+#: ../addressbook/gui/widgets/e-minicard-view.c:174
 msgid ""
 "\n"
 "\n"
@@ -2992,7 +3015,7 @@ msgstr ""
 "\n"
 "Double-click here to create a new Contact."
 
-#: addressbook/gui/widgets/e-minicard-view.c:179
+#: ../addressbook/gui/widgets/e-minicard-view.c:179
 msgid ""
 "\n"
 "\n"
@@ -3002,7 +3025,7 @@ msgstr ""
 "\n"
 "Search for the Contact."
 
-#: addressbook/gui/widgets/e-minicard-view.c:181
+#: ../addressbook/gui/widgets/e-minicard-view.c:181
 msgid ""
 "\n"
 "\n"
@@ -3012,170 +3035,171 @@ msgstr ""
 "\n"
 "There are no items to show in this view."
 
-#: addressbook/gui/widgets/e-minicard-view.c:498
+#: ../addressbook/gui/widgets/e-minicard-view.c:498
 msgid "Adapter"
 msgstr "Adapter"
 
-#: addressbook/gui/widgets/e-minicard.c:160
+#: ../addressbook/gui/widgets/e-minicard.c:160
 msgid "Selected"
 msgstr "Selected"
 
-#: addressbook/gui/widgets/e-minicard.c:167
+#: ../addressbook/gui/widgets/e-minicard.c:167
 msgid "Has Cursor"
 msgstr "Has Cursor"
 
-#: addressbook/gui/widgets/eab-contact-display.c:133
-#: addressbook/gui/widgets/eab-contact-display.c:196
+#: ../addressbook/gui/widgets/eab-contact-display.c:133
+#: ../addressbook/gui/widgets/eab-contact-display.c:196
 msgid "(map)"
 msgstr "(map)"
 
-#: addressbook/gui/widgets/eab-contact-display.c:143
-#: addressbook/gui/widgets/eab-contact-display.c:209
+#: ../addressbook/gui/widgets/eab-contact-display.c:143
+#: ../addressbook/gui/widgets/eab-contact-display.c:209
 msgid "map"
 msgstr "map"
 
-#: addressbook/gui/widgets/eab-contact-display.c:274
-#: addressbook/gui/widgets/eab-contact-display.c:541
+#: ../addressbook/gui/widgets/eab-contact-display.c:274
+#: ../addressbook/gui/widgets/eab-contact-display.c:541
 msgid "List Members"
 msgstr "List Members"
 
-#: addressbook/gui/widgets/eab-contact-display.c:337
-#: addressbook/gui/widgets/eab-contact-display.c:339
+#: ../addressbook/gui/widgets/eab-contact-display.c:337
+#: ../addressbook/gui/widgets/eab-contact-display.c:339
 msgid "E-mail"
 msgstr "E-mail"
 
-#: addressbook/gui/widgets/eab-contact-display.c:361
+#: ../addressbook/gui/widgets/eab-contact-display.c:361
 msgid "Position"
 msgstr "Position"
 
-#: addressbook/gui/widgets/eab-contact-display.c:362
+#: ../addressbook/gui/widgets/eab-contact-display.c:362
 msgid "Video Conferencing"
 msgstr "Video Conferencing"
 
-#: addressbook/gui/widgets/eab-contact-display.c:363
-#: addressbook/gui/widgets/eab-contact-display.c:378
+#: ../addressbook/gui/widgets/eab-contact-display.c:363
+#: ../addressbook/gui/widgets/eab-contact-display.c:378
 msgid "Phone"
 msgstr "Phone"
 
-#: addressbook/gui/widgets/eab-contact-display.c:364
+#: ../addressbook/gui/widgets/eab-contact-display.c:364
 msgid "Fax"
 msgstr "Fax"
 
-#: addressbook/gui/widgets/eab-contact-display.c:368
+#: ../addressbook/gui/widgets/eab-contact-display.c:368
 msgid "work"
 msgstr "work"
 
-#: addressbook/gui/widgets/eab-contact-display.c:375
+#: ../addressbook/gui/widgets/eab-contact-display.c:375
 msgid "WWW"
 msgstr "WWW"
 
-#: addressbook/gui/widgets/eab-contact-display.c:376
-#: addressbook/gui/widgets/eab-contact-display.c:595
+#: ../addressbook/gui/widgets/eab-contact-display.c:376
+#: ../addressbook/gui/widgets/eab-contact-display.c:595
 msgid "Blog"
 msgstr "Blog"
 
-#: addressbook/gui/widgets/eab-contact-display.c:383
+#: ../addressbook/gui/widgets/eab-contact-display.c:383
 msgid "personal"
 msgstr "personal"
 
-#: addressbook/gui/widgets/eab-contact-display.c:556
+#: ../addressbook/gui/widgets/eab-contact-display.c:556
 msgid "Job Title"
 msgstr "Job Title"
 
-#: addressbook/gui/widgets/eab-contact-display.c:587
+#: ../addressbook/gui/widgets/eab-contact-display.c:587
 msgid "Home page"
 msgstr "Home page"
 
 #. E_BOOK_ERROR_OK
-#: addressbook/gui/widgets/eab-gui-util.c:49
+#: ../addressbook/gui/widgets/eab-gui-util.c:49
 msgid "Success"
 msgstr "Success"
 
 #. E_BOOK_ERROR_INVALID_ARG
 #. E_BOOK_ERROR_BUSY
-#: addressbook/gui/widgets/eab-gui-util.c:51
+#: ../addressbook/gui/widgets/eab-gui-util.c:51
 msgid "Backend busy"
 msgstr "Backend busy"
 
 #. E_BOOK_ERROR_REPOSITORY_OFFLINE
-#: addressbook/gui/widgets/eab-gui-util.c:52
+#: ../addressbook/gui/widgets/eab-gui-util.c:52
 msgid "Repository offline"
 msgstr "Repository offline"
 
 #. E_BOOK_ERROR_NO_SUCH_BOOK
-#: addressbook/gui/widgets/eab-gui-util.c:53
+#: ../addressbook/gui/widgets/eab-gui-util.c:53
 msgid "Address Book does not exist"
 msgstr "Address Book does not exist"
 
 #. E_BOOK_ERROR_NO_SELF_CONTACT
-#: addressbook/gui/widgets/eab-gui-util.c:54
+#: ../addressbook/gui/widgets/eab-gui-util.c:54
 msgid "No Self Contact defined"
 msgstr "No Self Contact defined"
 
 #. E_BOOK_ERROR_URI_NOT_LOADED
 #. E_BOOK_ERROR_URI_ALREADY_LOADED
 #. E_BOOK_ERROR_PERMISSION_DENIED
-#: addressbook/gui/widgets/eab-gui-util.c:57
+#: ../addressbook/gui/widgets/eab-gui-util.c:57
 msgid "Permission denied"
 msgstr "Permission denied"
 
 #. E_BOOK_ERROR_CONTACT_NOT_FOUND
-#: addressbook/gui/widgets/eab-gui-util.c:58
+#: ../addressbook/gui/widgets/eab-gui-util.c:58
 msgid "Contact not found"
 msgstr "Contact not found"
 
 #. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
-#: addressbook/gui/widgets/eab-gui-util.c:59
+#: ../addressbook/gui/widgets/eab-gui-util.c:59
 msgid "Contact ID already exists"
 msgstr "Contact ID already exists"
 
 #. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
-#: addressbook/gui/widgets/eab-gui-util.c:60
+#: ../addressbook/gui/widgets/eab-gui-util.c:60
 msgid "Protocol not supported"
 msgstr "Protocol not supported"
 
 #. E_BOOK_ERROR_CANCELLED
-#: addressbook/gui/widgets/eab-gui-util.c:61
-#: calendar/gui/dialogs/task-details-page.glade.h:3
-#: calendar/gui/e-cal-component-preview.c:232
-#: calendar/gui/e-cal-model-tasks.c:347 calendar/gui/e-cal-model-tasks.c:660
-#: calendar/gui/e-calendar-table.c:458 calendar/gui/print.c:2352
+#: ../addressbook/gui/widgets/eab-gui-util.c:61
+#: ../calendar/gui/dialogs/task-details-page.glade.h:3
+#: ../calendar/gui/e-cal-component-preview.c:232
+#: ../calendar/gui/e-cal-model-tasks.c:347
+#: ../calendar/gui/e-cal-model-tasks.c:660
+#: ../calendar/gui/e-calendar-table.c:458 ../calendar/gui/print.c:2352
 msgid "Cancelled"
 msgstr "Cancelled"
 
 #. E_BOOK_ERROR_COULD_NOT_CANCEL
-#: addressbook/gui/widgets/eab-gui-util.c:62
+#: ../addressbook/gui/widgets/eab-gui-util.c:62
 msgid "Could not cancel"
 msgstr "Could not cancel"
 
 #. E_BOOK_ERROR_AUTHENTICATION_FAILED
-#: addressbook/gui/widgets/eab-gui-util.c:63
-#: calendar/gui/comp-editor-factory.c:431
+#: ../addressbook/gui/widgets/eab-gui-util.c:63
+#: ../calendar/gui/comp-editor-factory.c:431
 msgid "Authentication Failed"
 msgstr "Authentication Failed"
 
 #. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
-#: addressbook/gui/widgets/eab-gui-util.c:64
+#: ../addressbook/gui/widgets/eab-gui-util.c:64
 msgid "Authentication Required"
 msgstr "Authentication Required"
 
 #. E_BOOK_ERROR_TLS_NOT_AVAILABLE
-#: addressbook/gui/widgets/eab-gui-util.c:65
+#: ../addressbook/gui/widgets/eab-gui-util.c:65
 msgid "TLS not Available"
 msgstr "TLS not Available"
 
 #. E_BOOK_ERROR_CORBA_EXCEPTION
 #. E_BOOK_ERROR_NO_SUCH_SOURCE
-#: addressbook/gui/widgets/eab-gui-util.c:67
+#: ../addressbook/gui/widgets/eab-gui-util.c:67
 msgid "No such source"
 msgstr "No such source"
 
 #. E_BOOK_ERROR_OTHER_ERROR
-#: addressbook/gui/widgets/eab-gui-util.c:68
+#: ../addressbook/gui/widgets/eab-gui-util.c:68
 msgid "Other error"
 msgstr "Other error"
 
-#: addressbook/gui/widgets/eab-gui-util.c:90
+#: ../addressbook/gui/widgets/eab-gui-util.c:90
 msgid ""
 "We were unable to open this addressbook. This either means this book is not "
 "marked for offline usage or not yet downloaded for offline usage. Please "
@@ -3185,7 +3209,7 @@ msgstr ""
 "marked for offline usage or not yet downloaded for offline usage. Please "
 "load the addressbook once in online mode to download its contents"
 
-#: addressbook/gui/widgets/eab-gui-util.c:98
+#: ../addressbook/gui/widgets/eab-gui-util.c:98
 msgid ""
 "We were unable to open this addressbook.  Please check that the path exists "
 "and that you have permission to access it."
@@ -3193,7 +3217,7 @@ msgstr ""
 "We were unable to open this addressbook.  Please check that the path exists "
 "and that you have permission to access it."
 
-#: addressbook/gui/widgets/eab-gui-util.c:105
+#: ../addressbook/gui/widgets/eab-gui-util.c:105
 msgid ""
 "We were unable to open this addressbook.  This either means you have entered "
 "an incorrect URI, or the LDAP server is unreachable."
@@ -3201,7 +3225,7 @@ msgstr ""
 "We were unable to open this addressbook.  This either means you have entered "
 "an incorrect URI, or the LDAP server is unreachable."
 
-#: addressbook/gui/widgets/eab-gui-util.c:110
+#: ../addressbook/gui/widgets/eab-gui-util.c:110
 msgid ""
 "This version of Evolution does not have LDAP support compiled in to it.  If "
 "you want to use LDAP in Evolution, you must install an LDAP-enabled "
@@ -3211,7 +3235,7 @@ msgstr ""
 "you want to use LDAP in Evolution, you must install an LDAP-enabled "
 "Evolution package."
 
-#: addressbook/gui/widgets/eab-gui-util.c:117
+#: ../addressbook/gui/widgets/eab-gui-util.c:117
 msgid ""
 "We were unable to open this addressbook.  This either means you have entered "
 "an incorrect URI, or the server is unreachable."
@@ -3219,7 +3243,7 @@ msgstr ""
 "We were unable to open this addressbook.  This either means you have entered "
 "an incorrect URI, or the server is unreachable."
 
-#: addressbook/gui/widgets/eab-gui-util.c:137
+#: ../addressbook/gui/widgets/eab-gui-util.c:137
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -3231,7 +3255,7 @@ msgstr ""
 "Please make your search more specific or raise the result limit in\n"
 "the directory server preferences for this addressbook."
 
-#: addressbook/gui/widgets/eab-gui-util.c:143
+#: ../addressbook/gui/widgets/eab-gui-util.c:143
 msgid ""
 "The time to execute this query exceeded the server limit or the limit\n"
 "you have configured for this addressbook.  Please make your search\n"
@@ -3243,45 +3267,45 @@ msgstr ""
 "more specific or raise the time limit in the directory server\n"
 "preferences for this addressbook."
 
-#: addressbook/gui/widgets/eab-gui-util.c:149
+#: ../addressbook/gui/widgets/eab-gui-util.c:149
 msgid "The backend for this addressbook was unable to parse this query."
 msgstr "The backend for this addressbook was unable to parse this query."
 
-#: addressbook/gui/widgets/eab-gui-util.c:152
+#: ../addressbook/gui/widgets/eab-gui-util.c:152
 msgid "The backend for this addressbook refused to perform this query."
 msgstr "The backend for this addressbook refused to perform this query."
 
-#: addressbook/gui/widgets/eab-gui-util.c:155
+#: ../addressbook/gui/widgets/eab-gui-util.c:155
 msgid "This query did not complete successfully."
 msgstr "This query did not complete successfully."
 
-#: addressbook/gui/widgets/eab-gui-util.c:177
+#: ../addressbook/gui/widgets/eab-gui-util.c:177
 msgid "Error adding list"
 msgstr "Error adding list"
 
-#: addressbook/gui/widgets/eab-gui-util.c:177
-#: addressbook/gui/widgets/eab-gui-util.c:650
+#: ../addressbook/gui/widgets/eab-gui-util.c:177
+#: ../addressbook/gui/widgets/eab-gui-util.c:650
 msgid "Error adding contact"
 msgstr "Error adding contact"
 
-#: addressbook/gui/widgets/eab-gui-util.c:188
+#: ../addressbook/gui/widgets/eab-gui-util.c:188
 msgid "Error modifying list"
 msgstr "Error modifying list"
 
-#: addressbook/gui/widgets/eab-gui-util.c:188
+#: ../addressbook/gui/widgets/eab-gui-util.c:188
 msgid "Error modifying contact"
 msgstr "Error modifying contact"
 
-#: addressbook/gui/widgets/eab-gui-util.c:200
+#: ../addressbook/gui/widgets/eab-gui-util.c:200
 msgid "Error removing list"
 msgstr "Error removing list"
 
-#: addressbook/gui/widgets/eab-gui-util.c:200
-#: addressbook/gui/widgets/eab-gui-util.c:608
+#: ../addressbook/gui/widgets/eab-gui-util.c:200
+#: ../addressbook/gui/widgets/eab-gui-util.c:608
 msgid "Error removing contact"
 msgstr "Error removing contact"
 
-#: addressbook/gui/widgets/eab-gui-util.c:282
+#: ../addressbook/gui/widgets/eab-gui-util.c:282
 #, c-format
 msgid ""
 "Opening %d contact will open %d new window as well.\n"
@@ -3296,7 +3320,7 @@ msgstr[1] ""
 "Opening %d contacts will open %d new windows as well.\n"
 "Do you really want to display all of these contacts?"
 
-#: addressbook/gui/widgets/eab-gui-util.c:311
+#: ../addressbook/gui/widgets/eab-gui-util.c:311
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -3305,44 +3329,44 @@ msgstr ""
 "%s already exists\n"
 "Do you want to overwrite it?"
 
-#: addressbook/gui/widgets/eab-gui-util.c:315
+#: ../addressbook/gui/widgets/eab-gui-util.c:315
 msgid "Overwrite"
 msgstr "Overwrite"
 
 #. This is a filename. Translators take note.
-#: addressbook/gui/widgets/eab-gui-util.c:393
+#: ../addressbook/gui/widgets/eab-gui-util.c:393
 msgid "card.vcf"
 msgstr "card.vcf"
 
-#: addressbook/gui/widgets/eab-gui-util.c:555
+#: ../addressbook/gui/widgets/eab-gui-util.c:555
 msgid "list"
 msgstr "list"
 
-#: addressbook/gui/widgets/eab-gui-util.c:704
+#: ../addressbook/gui/widgets/eab-gui-util.c:704
 msgid "Move contact to"
 msgstr "Move contact to"
 
-#: addressbook/gui/widgets/eab-gui-util.c:706
+#: ../addressbook/gui/widgets/eab-gui-util.c:706
 msgid "Copy contact to"
 msgstr "Copy contact to"
 
-#: addressbook/gui/widgets/eab-gui-util.c:709
+#: ../addressbook/gui/widgets/eab-gui-util.c:709
 msgid "Move contacts to"
 msgstr "Move contacts to"
 
-#: addressbook/gui/widgets/eab-gui-util.c:711
+#: ../addressbook/gui/widgets/eab-gui-util.c:711
 msgid "Copy contacts to"
 msgstr "Copy contacts to"
 
-#: addressbook/gui/widgets/eab-gui-util.c:714
+#: ../addressbook/gui/widgets/eab-gui-util.c:714
 msgid "Select target addressbook."
 msgstr "Select target addressbook."
 
-#: addressbook/gui/widgets/eab-gui-util.c:937
+#: ../addressbook/gui/widgets/eab-gui-util.c:937
 msgid "Multiple VCards"
 msgstr "Multiple VCards"
 
-#: addressbook/gui/widgets/eab-gui-util.c:940
+#: ../addressbook/gui/widgets/eab-gui-util.c:940
 #, c-format
 msgid "VCard for %s"
 msgstr "VCard for %s"
@@ -3352,374 +3376,375 @@ msgstr "VCard for %s"
 #. * addresses (and *only* the e-mail addresses) associated with an existing
 #. * contact.
 #.
-#: addressbook/gui/widgets/eab-popup-control.c:198
+#: ../addressbook/gui/widgets/eab-popup-control.c:198
 msgid "(none)"
 msgstr "(none)"
 
-#: addressbook/gui/widgets/eab-popup-control.c:431
+#: ../addressbook/gui/widgets/eab-popup-control.c:431
 msgid "Primary Email"
 msgstr "Primary Email"
 
-#: addressbook/gui/widgets/eab-popup-control.c:567
+#: ../addressbook/gui/widgets/eab-popup-control.c:567
 msgid "Select an Action"
 msgstr "Select an Action"
 
-#: addressbook/gui/widgets/eab-popup-control.c:575
+#: ../addressbook/gui/widgets/eab-popup-control.c:575
 #, c-format
 msgid "Create a new contact \"%s\""
 msgstr "Create a new contact \"%s\""
 
-#: addressbook/gui/widgets/eab-popup-control.c:591
+#: ../addressbook/gui/widgets/eab-popup-control.c:591
 #, c-format
 msgid "Add address to existing contact \"%s\""
 msgstr "Add address to existing contact \"%s\""
 
-#: addressbook/gui/widgets/eab-popup-control.c:869
+#: ../addressbook/gui/widgets/eab-popup-control.c:869
 msgid "Querying Address Book..."
 msgstr "Querying Address Book..."
 
-#: addressbook/gui/widgets/eab-popup-control.c:970
+#: ../addressbook/gui/widgets/eab-popup-control.c:970
 msgid "Merge E-Mail Address"
 msgstr "Merge E-Mail Address"
 
-#: addressbook/gui/widgets/eab-vcard-control.c:139
+#: ../addressbook/gui/widgets/eab-vcard-control.c:139
 #, c-format
 msgid "There is one other contact."
 msgid_plural "There are %d other contacts."
 msgstr[0] "There is one other contact."
 msgstr[1] "There are %d other contacts."
 
-#: addressbook/gui/widgets/eab-vcard-control.c:223
-#: addressbook/gui/widgets/eab-vcard-control.c:272
+#: ../addressbook/gui/widgets/eab-vcard-control.c:223
+#: ../addressbook/gui/widgets/eab-vcard-control.c:272
 msgid "Show Full VCard"
 msgstr "Show Full VCard"
 
-#: addressbook/gui/widgets/eab-vcard-control.c:227
+#: ../addressbook/gui/widgets/eab-vcard-control.c:227
 msgid "Show Compact VCard"
 msgstr "Show Compact VCard"
 
-#: addressbook/gui/widgets/eab-vcard-control.c:277
+#: ../addressbook/gui/widgets/eab-vcard-control.c:277
 msgid "Save in addressbook"
 msgstr "Save in addressbook"
 
-#: addressbook/gui/widgets/gal-view-factory-minicard.c:25
+#: ../addressbook/gui/widgets/gal-view-factory-minicard.c:25
 msgid "Card View"
 msgstr "Card View"
 
-#: addressbook/gui/widgets/gal-view-factory-treeview.c:26
+#: ../addressbook/gui/widgets/gal-view-factory-treeview.c:26
 msgid "GTK Tree View"
 msgstr "GTK Tree View"
 
-#: addressbook/importers/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in.h:1
+#: ../addressbook/importers/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in.h:1
 msgid "Evolution LDIF importer"
 msgstr "Evolution LDIF importer"
 
-#: addressbook/importers/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in.h:2
+#: ../addressbook/importers/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in.h:2
 msgid "LDAP Data Interchange Format (.ldif)"
 msgstr "LDAP Data Interchange Format (.ldif)"
 
-#: addressbook/importers/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:1
+#: ../addressbook/importers/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:1
 msgid "Evolution VCard Importer"
 msgstr "Evolution VCard Importer"
 
-#: addressbook/importers/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:2
+#: ../addressbook/importers/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:2
 msgid "VCard (.vcf, .gcrd)"
 msgstr "VCard (.vcf, .gcrd)"
 
-#: addressbook/printing/e-contact-print-envelope.c:213
-#: addressbook/printing/e-contact-print-envelope.c:234
+#: ../addressbook/printing/e-contact-print-envelope.c:213
+#: ../addressbook/printing/e-contact-print-envelope.c:234
 msgid "Print envelope"
 msgstr "Print envelope"
 
-#: addressbook/printing/e-contact-print.c:1001
+#: ../addressbook/printing/e-contact-print.c:1001
 msgid "Print contacts"
 msgstr "Print contacts"
 
-#: addressbook/printing/e-contact-print.c:1066
-#: addressbook/printing/e-contact-print.c:1093
+#: ../addressbook/printing/e-contact-print.c:1066
+#: ../addressbook/printing/e-contact-print.c:1093
 msgid "Print contact"
 msgstr "Print contact"
 
-#: addressbook/printing/e-contact-print.glade.h:1
+#: ../addressbook/printing/e-contact-print.glade.h:1
 msgid "10 pt. Tahoma"
 msgstr "10 pt. Tahoma"
 
-#: addressbook/printing/e-contact-print.glade.h:2
+#: ../addressbook/printing/e-contact-print.glade.h:2
 msgid "8 pt. Tahoma"
 msgstr "8 pt. Tahoma"
 
-#: addressbook/printing/e-contact-print.glade.h:3
+#: ../addressbook/printing/e-contact-print.glade.h:3
 msgid "Blank forms at end:"
 msgstr "Blank forms at end:"
 
-#: addressbook/printing/e-contact-print.glade.h:4
+#: ../addressbook/printing/e-contact-print.glade.h:4
 msgid "Body"
 msgstr "Body"
 
-#: addressbook/printing/e-contact-print.glade.h:5
+#: ../addressbook/printing/e-contact-print.glade.h:5
 msgid "Bottom:"
 msgstr "Bottom:"
 
-#: addressbook/printing/e-contact-print.glade.h:6
+#: ../addressbook/printing/e-contact-print.glade.h:6
 msgid "Dimensions:"
 msgstr "Dimensions:"
 
-#: addressbook/printing/e-contact-print.glade.h:7
+#: ../addressbook/printing/e-contact-print.glade.h:7
 msgid "F_ont..."
 msgstr "F_ont..."
 
-#: addressbook/printing/e-contact-print.glade.h:8
+#: ../addressbook/printing/e-contact-print.glade.h:8
 msgid "Fonts"
 msgstr "Fonts"
 
-#: addressbook/printing/e-contact-print.glade.h:9
+#: ../addressbook/printing/e-contact-print.glade.h:9
 msgid "Footer:"
 msgstr "Footer:"
 
-#: addressbook/printing/e-contact-print.glade.h:10
+#: ../addressbook/printing/e-contact-print.glade.h:10
 msgid "Format"
 msgstr "Format"
 
-#: addressbook/printing/e-contact-print.glade.h:11
+#: ../addressbook/printing/e-contact-print.glade.h:11
 msgid "Header"
 msgstr "Header"
 
-#: addressbook/printing/e-contact-print.glade.h:12
+#: ../addressbook/printing/e-contact-print.glade.h:12
 msgid "Header/Footer"
 msgstr "Header/Footer"
 
-#: addressbook/printing/e-contact-print.glade.h:13
+#: ../addressbook/printing/e-contact-print.glade.h:13
 msgid "Headings"
 msgstr "Headings"
 
-#: addressbook/printing/e-contact-print.glade.h:14
+#: ../addressbook/printing/e-contact-print.glade.h:14
 msgid "Headings for each letter"
 msgstr "Headings for each letter"
 
-#: addressbook/printing/e-contact-print.glade.h:15
+#: ../addressbook/printing/e-contact-print.glade.h:15
 msgid "Height:"
 msgstr "Height:"
 
-#: addressbook/printing/e-contact-print.glade.h:16
+#: ../addressbook/printing/e-contact-print.glade.h:16
 msgid "Immediately follow each other"
 msgstr "Immediately follow each other"
 
-#: addressbook/printing/e-contact-print.glade.h:17
+#: ../addressbook/printing/e-contact-print.glade.h:17
 msgid "Include:"
 msgstr "Include:"
 
-#: addressbook/printing/e-contact-print.glade.h:18
+#: ../addressbook/printing/e-contact-print.glade.h:18
 msgid "Landscape"
 msgstr "Landscape"
 
-#: addressbook/printing/e-contact-print.glade.h:19
+#: ../addressbook/printing/e-contact-print.glade.h:19
 msgid "Left:"
 msgstr "Left:"
 
-#: addressbook/printing/e-contact-print.glade.h:20
+#: ../addressbook/printing/e-contact-print.glade.h:20
 msgid "Letter tabs on side"
 msgstr "Letter tabs on side"
 
-#: addressbook/printing/e-contact-print.glade.h:21
+#: ../addressbook/printing/e-contact-print.glade.h:21
 msgid "Margins"
 msgstr "Margins"
 
-#: addressbook/printing/e-contact-print.glade.h:22
+#: ../addressbook/printing/e-contact-print.glade.h:22
 msgid "Number of columns:"
 msgstr "Number of columns:"
 
-#: addressbook/printing/e-contact-print.glade.h:23
+#: ../addressbook/printing/e-contact-print.glade.h:23
 msgid "Options"
 msgstr "Options"
 
-#: addressbook/printing/e-contact-print.glade.h:24 e-util/eggtrayicon.c:118
+#: ../addressbook/printing/e-contact-print.glade.h:24
+#: ../e-util/eggtrayicon.c:118
 msgid "Orientation"
 msgstr "Orientation"
 
-#: addressbook/printing/e-contact-print.glade.h:25
+#: ../addressbook/printing/e-contact-print.glade.h:25
 msgid "Page"
 msgstr "Page"
 
-#: addressbook/printing/e-contact-print.glade.h:26
+#: ../addressbook/printing/e-contact-print.glade.h:26
 msgid "Page Setup:"
 msgstr "Page Setup:"
 
-#: addressbook/printing/e-contact-print.glade.h:27
+#: ../addressbook/printing/e-contact-print.glade.h:27
 msgid "Paper"
 msgstr "Paper"
 
-#: addressbook/printing/e-contact-print.glade.h:28
+#: ../addressbook/printing/e-contact-print.glade.h:28
 msgid "Paper source:"
 msgstr "Paper source:"
 
-#: addressbook/printing/e-contact-print.glade.h:29
+#: ../addressbook/printing/e-contact-print.glade.h:29
 msgid "Portrait"
 msgstr "Portrait"
 
-#: addressbook/printing/e-contact-print.glade.h:30
+#: ../addressbook/printing/e-contact-print.glade.h:30
 msgid "Preview:"
 msgstr "Preview:"
 
-#: addressbook/printing/e-contact-print.glade.h:31
+#: ../addressbook/printing/e-contact-print.glade.h:31
 msgid "Print using gray shading"
 msgstr "Print using gray shading"
 
-#: addressbook/printing/e-contact-print.glade.h:32
+#: ../addressbook/printing/e-contact-print.glade.h:32
 msgid "Reverse on even pages"
 msgstr "Reverse on even pages"
 
-#: addressbook/printing/e-contact-print.glade.h:33
+#: ../addressbook/printing/e-contact-print.glade.h:33
 msgid "Right:"
 msgstr "Right:"
 
-#: addressbook/printing/e-contact-print.glade.h:34
+#: ../addressbook/printing/e-contact-print.glade.h:34
 msgid "Sections:"
 msgstr "Sections:"
 
-#: addressbook/printing/e-contact-print.glade.h:35
+#: ../addressbook/printing/e-contact-print.glade.h:35
 msgid "Shading"
 msgstr "Shading"
 
-#: addressbook/printing/e-contact-print.glade.h:36
+#: ../addressbook/printing/e-contact-print.glade.h:36
 msgid "Size:"
 msgstr "Size:"
 
-#: addressbook/printing/e-contact-print.glade.h:37
+#: ../addressbook/printing/e-contact-print.glade.h:37
 msgid "Start on a new page"
 msgstr "Start on a new page"
 
-#: addressbook/printing/e-contact-print.glade.h:38
+#: ../addressbook/printing/e-contact-print.glade.h:38
 msgid "Style name:"
 msgstr "Style name:"
 
-#: addressbook/printing/e-contact-print.glade.h:39
+#: ../addressbook/printing/e-contact-print.glade.h:39
 msgid "Top:"
 msgstr "Top:"
 
-#: addressbook/printing/e-contact-print.glade.h:40
-#: calendar/gui/dialogs/calendar-setup.c:175
+#: ../addressbook/printing/e-contact-print.glade.h:40
+#: ../calendar/gui/dialogs/calendar-setup.c:175
 msgid "Type:"
 msgstr "Type:"
 
-#: addressbook/printing/e-contact-print.glade.h:41
+#: ../addressbook/printing/e-contact-print.glade.h:41
 msgid "Width:"
 msgstr "Width:"
 
-#: addressbook/printing/e-contact-print.glade.h:42
+#: ../addressbook/printing/e-contact-print.glade.h:42
 msgid "_Font..."
 msgstr "_Font..."
 
-#: addressbook/printing/test-contact-print-style-editor.c:53
+#: ../addressbook/printing/test-contact-print-style-editor.c:53
 msgid "Contact Print Style Editor Test"
 msgstr "Contact Print Style Editor Test"
 
-#: addressbook/printing/test-contact-print-style-editor.c:54
-#: addressbook/printing/test-print.c:53
+#: ../addressbook/printing/test-contact-print-style-editor.c:54
+#: ../addressbook/printing/test-print.c:53
 msgid "Copyright (C) 2000, Ximian, Inc."
 msgstr "Copyright (C) 2000, Ximian, Inc."
 
-#: addressbook/printing/test-contact-print-style-editor.c:56
+#: ../addressbook/printing/test-contact-print-style-editor.c:56
 msgid "This should test the contact print style editor widget"
 msgstr "This should test the contact print style editor widget"
 
-#: addressbook/printing/test-print.c:52
+#: ../addressbook/printing/test-print.c:52
 msgid "Contact Print Test"
 msgstr "Contact Print Test"
 
-#: addressbook/printing/test-print.c:55
+#: ../addressbook/printing/test-print.c:55
 msgid "This should test the contact print code"
 msgstr "This should test the contact print code"
 
-#: addressbook/tools/evolution-addressbook-export-list-cards.c:657
-#: addressbook/tools/evolution-addressbook-export-list-cards.c:693
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:49
+#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:657
+#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:693
+#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:49
 msgid "Can not open file"
 msgstr "Can not open file"
 
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:43
+#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:43
 msgid "Couldn't get list of addressbooks"
 msgstr "Couldn't get list of addressbooks"
 
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:71
+#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:71
 msgid "failed to open book"
 msgstr "failed to open book"
 
-#: addressbook/tools/evolution-addressbook-export.c:56
+#: ../addressbook/tools/evolution-addressbook-export.c:56
 msgid "Specify the output file instead of standard output"
 msgstr "Specify the output file instead of standard output"
 
-#: addressbook/tools/evolution-addressbook-export.c:57
+#: ../addressbook/tools/evolution-addressbook-export.c:57
 msgid "OUTPUTFILE"
 msgstr "OUTPUTFILE"
 
-#: addressbook/tools/evolution-addressbook-export.c:58
+#: ../addressbook/tools/evolution-addressbook-export.c:58
 msgid "List local addressbook folders"
 msgstr "List local addressbook folders"
 
-#: addressbook/tools/evolution-addressbook-export.c:60
+#: ../addressbook/tools/evolution-addressbook-export.c:60
 msgid "Show cards as vcard or csv file"
 msgstr "Show cards as vcard or csv file"
 
-#: addressbook/tools/evolution-addressbook-export.c:60
+#: ../addressbook/tools/evolution-addressbook-export.c:60
 msgid "[vcard|csv]"
 msgstr "[vcard|csv]"
 
-#: addressbook/tools/evolution-addressbook-export.c:61
+#: ../addressbook/tools/evolution-addressbook-export.c:61
 msgid "Export in asynchronous mode"
 msgstr "Export in asynchronous mode"
 
-#: addressbook/tools/evolution-addressbook-export.c:63
+#: ../addressbook/tools/evolution-addressbook-export.c:63
 msgid ""
 "The number of cards in one output file in asychronous mode, default size 100."
 msgstr ""
 "The number of cards in one output file in asychronous mode, default size 100."
 
-#: addressbook/tools/evolution-addressbook-export.c:63
+#: ../addressbook/tools/evolution-addressbook-export.c:63
 msgid "NUMBER"
 msgstr "NUMBER"
 
-#: addressbook/tools/evolution-addressbook-export.c:91
+#: ../addressbook/tools/evolution-addressbook-export.c:91
 msgid ""
 "Command line arguments error, please use --help option to see the usage."
 msgstr ""
 "Command line arguments error, please use --help option to see the usage."
 
-#: addressbook/tools/evolution-addressbook-export.c:105
+#: ../addressbook/tools/evolution-addressbook-export.c:105
 msgid "Only support csv or vcard format."
 msgstr "Only support csv or vcard format."
 
-#: addressbook/tools/evolution-addressbook-export.c:114
+#: ../addressbook/tools/evolution-addressbook-export.c:114
 msgid "In async mode, output must be file."
 msgstr "In async mode, output must be file."
 
-#: addressbook/tools/evolution-addressbook-export.c:122
+#: ../addressbook/tools/evolution-addressbook-export.c:122
 msgid "In normal mode, there is no need for the size option."
 msgstr "In normal mode, there is no need for the size option."
 
-#: addressbook/tools/evolution-addressbook-export.c:153
+#: ../addressbook/tools/evolution-addressbook-export.c:153
 msgid "Unhandled error"
 msgstr "Unhandled error"
 
-#: addressbook/tools/evolution-addressbook-import.c:46
+#: ../addressbook/tools/evolution-addressbook-import.c:46
 msgid "Error loading default addressbook."
 msgstr "Error loading default addressbook."
 
-#: addressbook/tools/evolution-addressbook-import.c:67
+#: ../addressbook/tools/evolution-addressbook-import.c:67
 msgid "Input File"
 msgstr "Input File"
 
-#: addressbook/tools/evolution-addressbook-import.c:82
+#: ../addressbook/tools/evolution-addressbook-import.c:82
 msgid "No filename provided."
 msgstr "No filename provided."
 
 #. calendar:prompt-cancel-meeting primary
 #. calendar:prompt-cancel-task primary
-#: calendar/calendar-errors.xml.h:2 calendar/calendar-errors.xml.h:12
+#: ../calendar/calendar-errors.xml.h:2 ../calendar/calendar-errors.xml.h:12
 msgid "Would you like to send all the participants a cancellation notice?"
 msgstr "Would you like to send all the participants a cancelation notice?"
 
 #. calendar:prompt-cancel-meeting secondary
-#: calendar/calendar-errors.xml.h:4
+#: ../calendar/calendar-errors.xml.h:4
 msgid ""
 "If you don't send a cancellation notice, the other participants may not know "
 "the meeting is canceled."
@@ -3727,32 +3752,32 @@ msgstr ""
 "If you do not send a cancelation notice, the other participants may not know "
 "the meeting is cancelled."
 
-#: calendar/calendar-errors.xml.h:5 calendar/calendar-errors.xml.h:15
-#: calendar/calendar-errors.xml.h:25 calendar/calendar-errors.xml.h:87
-#: calendar/calendar-errors.xml.h:93 calendar/calendar-errors.xml.h:99
-#: calendar/calendar-errors.xml.h:105
+#: ../calendar/calendar-errors.xml.h:5 ../calendar/calendar-errors.xml.h:15
+#: ../calendar/calendar-errors.xml.h:25 ../calendar/calendar-errors.xml.h:87
+#: ../calendar/calendar-errors.xml.h:93 ../calendar/calendar-errors.xml.h:99
+#: ../calendar/calendar-errors.xml.h:105
 msgid "Don't Send"
 msgstr "Don't Send"
 
-#: calendar/calendar-errors.xml.h:6 calendar/calendar-errors.xml.h:16
-#: calendar/calendar-errors.xml.h:26
+#: ../calendar/calendar-errors.xml.h:6 ../calendar/calendar-errors.xml.h:16
+#: ../calendar/calendar-errors.xml.h:26
 msgid "Send Notice"
 msgstr "Send Notice"
 
 #. calendar:prompt-delete-meeting primary
-#: calendar/calendar-errors.xml.h:8
+#: ../calendar/calendar-errors.xml.h:8
 msgid "Are you sure you want to delete this meeting?"
 msgstr "Are you sure you want to delete this meeting?"
 
 #. calendar:prompt-delete-meeting secondary
-#: calendar/calendar-errors.xml.h:10
+#: ../calendar/calendar-errors.xml.h:10
 msgid ""
 "All information on this meeting will be deleted and can not be restored."
 msgstr ""
 "All information on this meeting will be deleted and cannot be restored."
 
 #. calendar:prompt-cancel-task secondary
-#: calendar/calendar-errors.xml.h:14
+#: ../calendar/calendar-errors.xml.h:14
 msgid ""
 "If you don't send a cancellation notice, the other participants may not know "
 "the task has been deleted."
@@ -3761,25 +3786,25 @@ msgstr ""
 "the task has been deleted."
 
 #. calendar:prompt-delete-task primary
-#: calendar/calendar-errors.xml.h:18 calendar/calendar-errors.xml.h:44
+#: ../calendar/calendar-errors.xml.h:18 ../calendar/calendar-errors.xml.h:44
 msgid "Are you sure you want to delete this task?"
 msgstr "Are you sure you want to delete this task?"
 
 #. calendar:prompt-delete-task secondary
 #. calendar:prompt-delete-named-task secondary
 #. calendar:prompt-delete-task secondary
-#: calendar/calendar-errors.xml.h:20 calendar/calendar-errors.xml.h:42
-#: calendar/calendar-errors.xml.h:46
+#: ../calendar/calendar-errors.xml.h:20 ../calendar/calendar-errors.xml.h:42
+#: ../calendar/calendar-errors.xml.h:46
 msgid "All information on this task will be deleted and can not be restored."
 msgstr "All information on this task will be deleted and cannot be restored."
 
 #. calendar:prompt-cancel-journal primary
-#: calendar/calendar-errors.xml.h:22
+#: ../calendar/calendar-errors.xml.h:22
 msgid "Would you like to send a cancellation notice for this journal entry?"
 msgstr "Would you like to send a cancelation notice for this journal entry?"
 
 #. calendar:prompt-cancel-journal secondary
-#: calendar/calendar-errors.xml.h:24
+#: ../calendar/calendar-errors.xml.h:24
 msgid ""
 "If you don't send a cancellation notice, the other participants may not know "
 "the journal has been deleted."
@@ -3788,12 +3813,12 @@ msgstr ""
 "the journal has been deleted."
 
 #. calendar:prompt-delete-journal primary
-#: calendar/calendar-errors.xml.h:28 calendar/calendar-errors.xml.h:52
+#: ../calendar/calendar-errors.xml.h:28 ../calendar/calendar-errors.xml.h:52
 msgid "Are you sure you want to delete this journal entry?"
 msgstr "Are you sure you want to delete this journal entry?"
 
 #. calendar:prompt-delete-journal secondary
-#: calendar/calendar-errors.xml.h:30
+#: ../calendar/calendar-errors.xml.h:30
 msgid ""
 "All information on this journal entry will be deleted and can not be "
 "restored."
@@ -3801,48 +3826,48 @@ msgstr ""
 "All information on this journal entry will be deleted and cannot be restored."
 
 #. calendar:prompt-delete-titled-appointment primary
-#: calendar/calendar-errors.xml.h:32
+#: ../calendar/calendar-errors.xml.h:32
 msgid "Are you sure you want to delete the appointment titled '{0}'?"
 msgstr "Are you sure you want to delete the appointment entitled '{0}'?"
 
 #. calendar:prompt-delete-titled-appointment secondary
 #. calendar:prompt-delete-appointment secondary
-#: calendar/calendar-errors.xml.h:34 calendar/calendar-errors.xml.h:38
+#: ../calendar/calendar-errors.xml.h:34 ../calendar/calendar-errors.xml.h:38
 msgid ""
 "All information on this appointment will be deleted and can not be restored."
 msgstr ""
 "All information on this appointment will be deleted and cannot be restored."
 
 #. calendar:prompt-delete-appointment primary
-#: calendar/calendar-errors.xml.h:36
+#: ../calendar/calendar-errors.xml.h:36
 msgid "Are you sure you want to delete this appointment?"
 msgstr "Are you sure you want to delete this appointment?"
 
 #. calendar:prompt-delete-named-task primary
-#: calendar/calendar-errors.xml.h:40
+#: ../calendar/calendar-errors.xml.h:40
 msgid "Are you sure you want to delete the '{0}' task?"
 msgstr "Are you sure you want to delete the '{0}' task?"
 
 #. calendar:prompt-delete-named-journal primary
-#: calendar/calendar-errors.xml.h:48
+#: ../calendar/calendar-errors.xml.h:48
 msgid "Are you sure you want to delete the journal entry '{0}'?"
 msgstr "Are you sure you want to delete the journal entry '{0}'?"
 
 #. calendar:prompt-delete-named-journal secondary
 #. calendar:prompt-delete-journal secondary
-#: calendar/calendar-errors.xml.h:50 calendar/calendar-errors.xml.h:54
+#: ../calendar/calendar-errors.xml.h:50 ../calendar/calendar-errors.xml.h:54
 msgid ""
 "All information in this journal will be deleted and can not be restored."
 msgstr ""
 "All information in this journal will be deleted and cannot be restored."
 
 #. calendar:prompt-delete-appointments primary
-#: calendar/calendar-errors.xml.h:56
+#: ../calendar/calendar-errors.xml.h:56
 msgid "Are you sure you want to delete these {0} appointments?"
 msgstr "Are you sure you want to delete these {0} appointments?"
 
 #. calendar:prompt-delete-appointments secondary
-#: calendar/calendar-errors.xml.h:58
+#: ../calendar/calendar-errors.xml.h:58
 msgid ""
 "All information on these appointments will be deleted and can not be "
 "restored."
@@ -3850,22 +3875,22 @@ msgstr ""
 "All information on these appointments will be deleted and cannot be restored."
 
 #. calendar:prompt-delete-tasks primary
-#: calendar/calendar-errors.xml.h:60
+#: ../calendar/calendar-errors.xml.h:60
 msgid "Are you sure you want to delete these {0} tasks?"
 msgstr "Are you sure you want to delete these {0} tasks?"
 
 #. calendar:prompt-delete-tasks secondary
-#: calendar/calendar-errors.xml.h:62
+#: ../calendar/calendar-errors.xml.h:62
 msgid "All information on these tasks will be deleted and can not be restored."
 msgstr "All information on these tasks will be deleted and cannot be restored."
 
 #. calendar:prompt-delete-journals primary
-#: calendar/calendar-errors.xml.h:64
+#: ../calendar/calendar-errors.xml.h:64
 msgid "Are you sure you want to delete these {0} journal entries?"
 msgstr "Are you sure you want to delete these {0} journal entries?"
 
 #. calendar:prompt-delete-journals secondary
-#: calendar/calendar-errors.xml.h:66
+#: ../calendar/calendar-errors.xml.h:66
 msgid ""
 "All information in these journal entries will be deleted and can not be "
 "restored."
@@ -3874,68 +3899,68 @@ msgstr ""
 "restored."
 
 #. calendar:prompt-save-appointment title
-#: calendar/calendar-errors.xml.h:68
+#: ../calendar/calendar-errors.xml.h:68
 msgid "Save Appointment"
 msgstr "Save Appointment"
 
 #. calendar:prompt-save-appointment primary
-#: calendar/calendar-errors.xml.h:70
+#: ../calendar/calendar-errors.xml.h:70
 msgid "Would you like to save your changes to this appointment?"
 msgstr "Would you like to save your changes to this appointment?"
 
 #. calendar:prompt-save-appointment secondary
-#: calendar/calendar-errors.xml.h:72
+#: ../calendar/calendar-errors.xml.h:72
 msgid "You have made changes to this appointment, but not yet saved them."
 msgstr "You have made changes to this appointment, but not yet saved them."
 
-#: calendar/calendar-errors.xml.h:73 calendar/calendar-errors.xml.h:81
+#: ../calendar/calendar-errors.xml.h:73 ../calendar/calendar-errors.xml.h:81
 msgid "Discard Changes"
 msgstr "Discard Changes"
 
-#: calendar/calendar-errors.xml.h:74 calendar/calendar-errors.xml.h:82
+#: ../calendar/calendar-errors.xml.h:74 ../calendar/calendar-errors.xml.h:82
 msgid "Save Changes"
 msgstr "Save Changes"
 
 #. calendar:prompt-save-task title
-#: calendar/calendar-errors.xml.h:76
+#: ../calendar/calendar-errors.xml.h:76
 msgid "Save Task"
 msgstr "Save Task"
 
 #. calendar:prompt-save-task primary
-#: calendar/calendar-errors.xml.h:78
+#: ../calendar/calendar-errors.xml.h:78
 msgid "Would you like to save your changes to this task?"
 msgstr "Would you like to save your changes to this task?"
 
 #. calendar:prompt-save-task secondary
-#: calendar/calendar-errors.xml.h:80
+#: ../calendar/calendar-errors.xml.h:80
 msgid "You have made changes to this task, but not yet saved them."
 msgstr "You have made changes to this task, but not yet saved them."
 
 #. calendar:prompt-meeting-invite primary
-#: calendar/calendar-errors.xml.h:84
+#: ../calendar/calendar-errors.xml.h:84
 msgid "Would you like to send meeting invitations to participants?"
 msgstr "Would you like to send meeting invitations to participants?"
 
 #. calendar:prompt-meeting-invite secondary
-#: calendar/calendar-errors.xml.h:86
+#: ../calendar/calendar-errors.xml.h:86
 msgid ""
 "Email invitations will be sent to all participants and allow them to RSVP."
 msgstr ""
 "Email invitations will be sent to all participants and allow them to RSVP."
 
-#: calendar/calendar-errors.xml.h:88 calendar/calendar-errors.xml.h:94
-#: calendar/calendar-errors.xml.h:100 calendar/calendar-errors.xml.h:106
-#: ui/evolution-message-composer.xml.h:24
+#: ../calendar/calendar-errors.xml.h:88 ../calendar/calendar-errors.xml.h:94
+#: ../calendar/calendar-errors.xml.h:100 ../calendar/calendar-errors.xml.h:106
+#: ../ui/evolution-message-composer.xml.h:24
 msgid "Send"
 msgstr "Send"
 
 #. calendar:prompt-send-updated-meeting-info primary
-#: calendar/calendar-errors.xml.h:90
+#: ../calendar/calendar-errors.xml.h:90
 msgid "Would you like to send updated meeting information to participants?"
 msgstr "Would you like to send updated meeting information to participants?"
 
 #. calendar:prompt-send-updated-meeting-info secondary
-#: calendar/calendar-errors.xml.h:92
+#: ../calendar/calendar-errors.xml.h:92
 msgid ""
 "Sending updated information allows other participants to keep their "
 "calendars up to date."
@@ -3944,12 +3969,12 @@ msgstr ""
 "calendars up to date."
 
 #. calendar:prompt-send-task primary
-#: calendar/calendar-errors.xml.h:96
+#: ../calendar/calendar-errors.xml.h:96
 msgid "Would you like to send this task to participants?"
 msgstr "Would you like to send this task to participants?"
 
 #. calendar:prompt-send-task secondary
-#: calendar/calendar-errors.xml.h:98
+#: ../calendar/calendar-errors.xml.h:98
 msgid ""
 "Email invitations will be sent to all participants and allow them to accept "
 "this task."
@@ -3958,12 +3983,12 @@ msgstr ""
 "this task."
 
 #. calendar:prompt-send-updated-task-info primary
-#: calendar/calendar-errors.xml.h:102
+#: ../calendar/calendar-errors.xml.h:102
 msgid "Would you like to send updated task information to participants?"
 msgstr "Would you like to send updated task information to participants?"
 
 #. calendar:prompt-send-updated-task-info secondary
-#: calendar/calendar-errors.xml.h:104
+#: ../calendar/calendar-errors.xml.h:104
 msgid ""
 "Sending updated information allows other participants to keep their task "
 "lists up to date."
@@ -3972,52 +3997,52 @@ msgstr ""
 "lists up to date."
 
 #. calendar:tasks-crashed primary
-#: calendar/calendar-errors.xml.h:108
+#: ../calendar/calendar-errors.xml.h:108
 msgid "The Evolution tasks have quit unexpectedly."
 msgstr "The Evolution tasks have quit unexpectedly."
 
 #. calendar:tasks-crashed secondary
-#: calendar/calendar-errors.xml.h:110
+#: ../calendar/calendar-errors.xml.h:110
 msgid "Your tasks will not be available until Evolution is restarted."
 msgstr "Your tasks will not be available until Evolution is restarted."
 
 #. calendar:calendar-crashed primary
-#: calendar/calendar-errors.xml.h:112
+#: ../calendar/calendar-errors.xml.h:112
 msgid "The Evolution calendar has quit unexpectedly."
 msgstr "The Evolution calendar has quit unexpectedly."
 
 #. calendar:calendar-crashed secondary
-#: calendar/calendar-errors.xml.h:114
+#: ../calendar/calendar-errors.xml.h:114
 msgid "Your calendars will not be available until Evolution is restarted."
 msgstr "Your calendars will not be available until Evolution is restarted."
 
 #. calendar:prompt-delete-calendar primary
-#: calendar/calendar-errors.xml.h:116
+#: ../calendar/calendar-errors.xml.h:116
 msgid "Delete calendar '{0}'?"
 msgstr "Delete calendar '{0}'?"
 
 #. calendar:prompt-delete-calendar secondary
-#: calendar/calendar-errors.xml.h:118
+#: ../calendar/calendar-errors.xml.h:118
 msgid "This calendar will be removed permanently."
 msgstr "This calendar will be removed permanently."
 
 #. calendar:prompt-delete-task-list primary
-#: calendar/calendar-errors.xml.h:120
+#: ../calendar/calendar-errors.xml.h:120
 msgid "Delete task list '{0}'?"
 msgstr "Delete task list '{0}'?"
 
 #. calendar:prompt-delete-task-list secondary
-#: calendar/calendar-errors.xml.h:122
+#: ../calendar/calendar-errors.xml.h:122
 msgid "This task list will be removed permanently."
 msgstr "This task list will be removed permanently."
 
 #. calendar:prompt-send-no-subject-calendar primary
-#: calendar/calendar-errors.xml.h:124
+#: ../calendar/calendar-errors.xml.h:124
 msgid "Are you sure you want to send the appointment without a summary?"
 msgstr "Are you sure you want to send the appointment without a summary?"
 
 #. calendar:prompt-send-no-subject-calendar secondary
-#: calendar/calendar-errors.xml.h:126
+#: ../calendar/calendar-errors.xml.h:126
 msgid ""
 "Adding a meaningful Summary to your appointment will give your recipients an "
 "idea of what your appointment is about."
@@ -4025,19 +4050,19 @@ msgstr ""
 "Adding a meaningful Summary to your appointment will give your recipients an "
 "idea of what your appointment is about."
 
-#: calendar/calendar-errors.xml.h:127 calendar/calendar-errors.xml.h:132
-#: mail/mail-errors.xml.h:15 mail/mail-errors.xml.h:20
-#: mail/mail-errors.xml.h:27 mail/mail-errors.xml.h:32
+#: ../calendar/calendar-errors.xml.h:127 ../calendar/calendar-errors.xml.h:132
+#: ../mail/mail-errors.xml.h:15 ../mail/mail-errors.xml.h:20
+#: ../mail/mail-errors.xml.h:27 ../mail/mail-errors.xml.h:32
 msgid "_Send"
 msgstr "_Send"
 
 #. calendar:prompt-send-no-subject-task primary
-#: calendar/calendar-errors.xml.h:129
+#: ../calendar/calendar-errors.xml.h:129
 msgid "Are you sure you want to send the task without a summary?"
 msgstr "Are you sure you want to send the task without a summary?"
 
 #. calendar:prompt-send-no-subject-task secondary
-#: calendar/calendar-errors.xml.h:131
+#: ../calendar/calendar-errors.xml.h:131
 msgid ""
 "Adding a meaningful Summary to your task will give your recipients an idea "
 "of what your task is about."
@@ -4046,210 +4071,214 @@ msgstr ""
 "of what your task is about."
 
 #. calendar:prompt-no-contents-offline-calendar primary
-#: calendar/calendar-errors.xml.h:134
+#: ../calendar/calendar-errors.xml.h:134
 msgid "Error loading calendar"
 msgstr "Error loading calendar"
 
 #. calendar:prompt-no-contents-offline-calendar secondary
-#: calendar/calendar-errors.xml.h:136
+#: ../calendar/calendar-errors.xml.h:136
 msgid "The calendar is not marked for offline usage"
 msgstr "The calendar is not marked for offline usage"
 
 #. calendar:prompt-no-contents-offline-tasks primary
-#: calendar/calendar-errors.xml.h:138
+#: ../calendar/calendar-errors.xml.h:138
 msgid "Error loading task list"
 msgstr "Error loading task list"
 
 #. calendar:prompt-no-contents-offline-tasks secondary
-#: calendar/calendar-errors.xml.h:140
+#: ../calendar/calendar-errors.xml.h:140
 msgid "The task list is not marked for offline usage"
 msgstr "The task list is not marked for offline usage"
 
 #. calendar:server-version secondary
-#: calendar/calendar-errors.xml.h:146
-msgid " Some features may not work correctly with your current server version"
-msgstr " Some features may not work correctly with your current server version"
+#: ../calendar/calendar-errors.xml.h:146
+msgid " Some features may not work correctly with your current server version "
+msgstr " Some features may not work correctly with your current server version "
 
-#: calendar/common/authentication.c:49 calendar/gui/e-pub-utils.c:301
-#: smime/gui/component.c:48
+#: ../calendar/common/authentication.c:49 ../calendar/gui/e-pub-utils.c:301
+#: ../smime/gui/component.c:48
 msgid "Enter password"
 msgstr "Enter password"
 
-#: calendar/conduits/calendar/calendar-conduit.c:246
+#: ../calendar/conduits/calendar/calendar-conduit.c:246
 msgid "Split Multi-Day Events:"
 msgstr "Split Multi-Day Events:"
 
-#: calendar/conduits/calendar/calendar-conduit.c:1359
-#: calendar/conduits/calendar/calendar-conduit.c:1360
-#: calendar/conduits/todo/todo-conduit.c:879
-#: calendar/conduits/todo/todo-conduit.c:880
+#: ../calendar/conduits/calendar/calendar-conduit.c:1359
+#: ../calendar/conduits/calendar/calendar-conduit.c:1360
+#: ../calendar/conduits/todo/todo-conduit.c:879
+#: ../calendar/conduits/todo/todo-conduit.c:880
 msgid "Could not start evolution-data-server"
 msgstr "Could not start evolution-data-server"
 
-#: calendar/conduits/calendar/calendar-conduit.c:1468
-#: calendar/conduits/calendar/calendar-conduit.c:1471
+#: ../calendar/conduits/calendar/calendar-conduit.c:1468
+#: ../calendar/conduits/calendar/calendar-conduit.c:1471
 msgid "Could not read pilot's Calendar application block"
 msgstr "Could not read pilot's Calendar application block"
 
-#: calendar/conduits/todo/todo-conduit.c:234
+#: ../calendar/conduits/todo/todo-conduit.c:234
 msgid "Default Priority:"
 msgstr "Default Priority:"
 
-#: calendar/conduits/todo/todo-conduit.c:959
-#: calendar/conduits/todo/todo-conduit.c:962
+#: ../calendar/conduits/todo/todo-conduit.c:959
+#: ../calendar/conduits/todo/todo-conduit.c:962
 msgid "Could not read pilot's ToDo application block"
 msgstr "Could not read pilot's ToDo application block"
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
+#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
 msgid "Calendar and Tasks"
 msgstr "Calendar and Tasks"
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-#: calendar/gui/calendar-component.c:1150
+#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
+#: ../calendar/gui/calendar-component.c:1290
 msgid "Calendars"
 msgstr "Calendars"
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
+#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
 msgid "Configure your timezone, Calendar and Task List here "
 msgstr "Configure your timezone, Calendar and Task List here "
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
+#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
 msgid "Evolution Calendar and Tasks"
 msgstr "Evolution Calendar and Tasks"
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
+#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
 msgid "Evolution Calendar configuration control"
 msgstr "Evolution Calendar configuration control"
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
+#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
 msgid "Evolution Calendar scheduling message viewer"
 msgstr "Evolution Calendar scheduling message viewer"
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
+#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
 msgid "Evolution Calendar/Task editor"
 msgstr "Evolution Calendar/Task editor"
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
+#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
 msgid "Evolution's Calendar component"
 msgstr "Evolution's Calendar component"
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
+#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
 msgid "Evolution's Tasks component"
 msgstr "Evolution's Tasks component"
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
-#: calendar/gui/e-tasks.c:1219 calendar/gui/print.c:1822
-#: calendar/gui/tasks-component.c:408 calendar/gui/tasks-component.c:881
-#: calendar/gui/tasks-control.c:408 calendar/importers/icalendar-importer.c:83
-#: calendar/importers/icalendar-importer.c:701
-#: plugins/groupwise-account-setup/camel-gw-listener.c:383
+#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
+#: ../calendar/gui/e-tasks.c:1219 ../calendar/gui/print.c:1822
+#: ../calendar/gui/tasks-component.c:508 ../calendar/gui/tasks-component.c:981
+#: ../calendar/gui/tasks-control.c:408
+#: ../calendar/importers/icalendar-importer.c:83
+#: ../calendar/importers/icalendar-importer.c:701
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:383
 msgid "Tasks"
 msgstr "Tasks"
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
+#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
 msgid "_Calendars"
 msgstr "_Calendars"
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: views/tasks/galview.xml.h:3
+#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
+#: ../views/tasks/galview.xml.h:3
 msgid "_Tasks"
 msgstr "_Tasks"
 
-#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
+#: ../calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
 msgid "Evolution Calendar alarm notification service"
 msgstr "Evolution Calendar alarm notification service"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:79
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:79
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "minute"
 msgstr[1] "minutes"
 
-#: calendar/gui/alarm-notify/alarm-notify.glade.h:1
-#: calendar/gui/dialogs/event-editor.c:140 calendar/gui/print.c:2298
+#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:1
+#: ../calendar/gui/dialogs/event-editor.c:140 ../calendar/gui/print.c:2298
 msgid "Appointment"
 msgstr "Appointment"
 
-#: calendar/gui/alarm-notify/alarm-notify.glade.h:2
+#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:2
 msgid "Appointment Title"
 msgstr "Appointment Title"
 
 #. End time
-#: calendar/gui/alarm-notify/alarm-notify.glade.h:3
-#: plugins/itip-formatter/itip-view.c:876
+#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:3
+#: ../plugins/itip-formatter/itip-view.c:876
 msgid "End time:"
 msgstr "End time:"
 
 #. Location
-#: calendar/gui/alarm-notify/alarm-notify.glade.h:4
-#: calendar/gui/e-itip-control.c:1118 plugins/itip-formatter/itip-view.c:859
+#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:4
+#: ../calendar/gui/e-itip-control.c:1118
+#: ../plugins/itip-formatter/itip-view.c:859
 msgid "Location:"
 msgstr "Location:"
 
-#: calendar/gui/alarm-notify/alarm-notify.glade.h:5
+#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:5
 msgid "Snooze _time:"
 msgstr "Snooze _time:"
 
 #. Start time
-#: calendar/gui/alarm-notify/alarm-notify.glade.h:6
-#: plugins/itip-formatter/itip-view.c:867
+#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:6
+#: ../plugins/itip-formatter/itip-view.c:867
 msgid "Start time:"
 msgstr "Start time:"
 
-#: calendar/gui/alarm-notify/alarm-notify.glade.h:7
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
-#: calendar/gui/dialogs/recurrence-page.glade.h:6 filter/filter.glade.h:11
-#: mail/mail-config.glade.h:153 ui/evolution-addressbook.xml.h:34
-#: ui/evolution-calendar.xml.h:41 ui/evolution-composer-entries.xml.h:8
-#: ui/evolution-mail-list.xml.h:24 ui/evolution-mail-messagedisplay.xml.h:6
-#: ui/evolution-message-composer.xml.h:43
-#: ui/evolution-signature-editor.xml.h:12 ui/evolution-subscribe.xml.h:10
-#: ui/evolution-tasks.xml.h:22 ui/evolution.xml.h:38
+#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:7
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:6
+#: ../filter/filter.glade.h:11 ../mail/mail-config.glade.h:153
+#: ../ui/evolution-addressbook.xml.h:34 ../ui/evolution-calendar.xml.h:41
+#: ../ui/evolution-composer-entries.xml.h:8 ../ui/evolution-mail-list.xml.h:24
+#: ../ui/evolution-mail-messagedisplay.xml.h:6
+#: ../ui/evolution-message-composer.xml.h:43
+#: ../ui/evolution-signature-editor.xml.h:12
+#: ../ui/evolution-subscribe.xml.h:10 ../ui/evolution-tasks.xml.h:22
+#: ../ui/evolution.xml.h:38
 msgid "_Edit"
 msgstr "_Edit"
 
-#: calendar/gui/alarm-notify/alarm-notify.glade.h:8
+#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:8
 msgid "_Snooze"
 msgstr "_Snooze"
 
-#: calendar/gui/alarm-notify/alarm-notify.glade.h:9
+#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:9
 msgid "description of appointment"
 msgstr "description of appointment"
 
-#: calendar/gui/alarm-notify/alarm-notify.glade.h:10
+#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:10
 msgid "end-time"
 msgstr "end-time"
 
-#: calendar/gui/alarm-notify/alarm-notify.glade.h:11
+#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:11
 msgid "location"
 msgstr "location"
 
-#: calendar/gui/alarm-notify/alarm-notify.glade.h:13
+#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:13
 msgid "start-time"
 msgstr "start-time"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:864
+#: ../calendar/gui/alarm-notify/alarm-queue.c:879
 msgid "Dismiss"
 msgstr "Dismiss"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:865
+#: ../calendar/gui/alarm-notify/alarm-queue.c:880
 msgid "Dismiss All"
 msgstr "Dismiss All"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:947
+#: ../calendar/gui/alarm-notify/alarm-queue.c:962
 msgid "No summary available."
 msgstr "No summary available."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:956
-#: calendar/gui/alarm-notify/alarm-queue.c:958
+#: ../calendar/gui/alarm-notify/alarm-queue.c:971
+#: ../calendar/gui/alarm-notify/alarm-queue.c:973
 msgid "No description available."
 msgstr "No description available."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:966
+#: ../calendar/gui/alarm-notify/alarm-queue.c:981
 msgid "No location information available."
 msgstr "No location information available."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:982
+#: ../calendar/gui/alarm-notify/alarm-queue.c:997
 #, c-format
 msgid ""
 "Alarm on %s\n"
@@ -4262,12 +4291,12 @@ msgstr ""
 "Starting at %s\n"
 "Ending at %s"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1084
-#: calendar/gui/alarm-notify/alarm-queue.c:1108
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1099
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1123
 msgid "Warning"
 msgstr "Warning"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1088
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1103
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -4279,7 +4308,7 @@ msgstr ""
 "configured to send an email.  Evolution will display\n"
 "a normal reminder dialogue box instead."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1114
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1129
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -4296,135 +4325,135 @@ msgstr ""
 "\n"
 "Are you sure you want to run this program?"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1128
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1143
 msgid "Do not ask me about this program again."
 msgstr "Do not ask me about this program again."
 
-#: calendar/gui/alarm-notify/notify-main.c:139
+#: ../calendar/gui/alarm-notify/notify-main.c:139
 msgid "Could not initialize Bonobo"
 msgstr "Could not initialize Bonobo"
 
-#: calendar/gui/alarm-notify/notify-main.c:150
+#: ../calendar/gui/alarm-notify/notify-main.c:150
 msgid "Could not create the alarm notify service factory"
 msgstr "Could not create the alarm notify service factory"
 
-#: calendar/gui/alarm-notify/util.c:41
+#: ../calendar/gui/alarm-notify/util.c:41
 msgid "invalid time"
 msgstr "invalid time"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:1
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:1
 msgid "Alarm programs"
 msgstr "Alarm programs"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:2
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:2
 msgid "Ask for confirmation when deleting items"
 msgstr "Ask for confirmation when deleting items"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:3
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:3
 msgid "Background color of tasks that are due today, in \"#rrggbb\" format."
 msgstr "Background colour of tasks that are due today, in \"#rrggbb\" format."
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:4
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:4
 msgid "Background color of tasks that are overdue, in \"#rrggbb\" format."
 msgstr "Background colour of tasks that are overdue, in \"#rrggbb\" format."
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:5
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:5
 msgid "Calendars to run alarms for"
 msgstr "Calendars to run alarms for"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:6
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:6
 msgid "Compress weekends in month view"
 msgstr "Compress weekends in month view"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:7
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:7
 msgid "Confirm expunge"
 msgstr "Confirm expunge"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:8
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:8
 msgid "Days on which the start and end of work hours should be indicated."
 msgstr "Days on which the start and end of work hours should be indicated."
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:9
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:9
 msgid "Default appointment reminder"
 msgstr "Default appointment reminder"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:10
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:10
 msgid "Default reminder units"
 msgstr "Default reminder units"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:11
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:11
 msgid "Default reminder value"
 msgstr "Default reminder value"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:12
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:12
 msgid "Free/busy server urls"
 msgstr "Free/busy server URLs"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:13
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:13
 msgid "Free/busy template url"
 msgstr "Free/busy template URL"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:14
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:14
 msgid "Hide completed tasks"
 msgstr "Hide completed tasks"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:15
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:15
 msgid "Hide task units"
 msgstr "Hide task units"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:16
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:16
 msgid "Hide task value"
 msgstr "Hide task value"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:17
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:17
 msgid "Horizontal pane position"
 msgstr "Horizontal pane position"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:18
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:18
 msgid "Hour the workday ends on, in twenty four hour format, 0 to 23."
 msgstr "Hour the workday ends on, in 24-hour format, 0 to 23."
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:19
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:19
 msgid "Hour the workday starts on, in twenty four hour format, 0 to 23."
 msgstr "Hour the workday starts on, in 24-hour format, 0 to 23."
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:20
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:20
 msgid "Last alarm time"
 msgstr "Last alarm time"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:21
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:21
 msgid "List of server urls for free/busy publishing."
 msgstr "List of server URLs for free/busy publishing."
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:22
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:22
 msgid "Minute the workday ends on, 0 to 59"
 msgstr "Minute the workday ends on, 0 to 59"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:23
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:23
 msgid "Minute the workday starts on, 0 to 59."
 msgstr "Minute the workday starts on, 0 to 59."
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:24
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:24
 msgid "Month view horizontal pane position"
 msgstr "Month view horizontal pane position"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:25
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:25
 msgid "Month view vertical pane position"
 msgstr "Month view vertical pane position"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:26
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:26
 msgid "Number of units for determining for a default reminder."
 msgstr "Number of units for determining for a default reminder."
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:27
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:27
 msgid "Number of units for determining when to hide tasks."
 msgstr "Number of units for determining when to hide tasks."
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:28
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:28
 msgid "Overdue tasks color"
 msgstr "Overdue tasks colour"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:29
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:29
 msgid ""
 "Position of the horizontal pane, between the date navigator calendar and the "
 "task list when not in the month view, in pixels."
@@ -4432,7 +4461,7 @@ msgstr ""
 "Position of the horizontal pane, between the date navigator calendar and the "
 "task list when not in the month view, in pixels."
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:30
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:30
 msgid ""
 "Position of the horizontal pane, between the view and the date navigator "
 "calendar and task list in the month view, in pixels."
@@ -4440,7 +4469,7 @@ msgstr ""
 "Position of the horizontal pane, between the view and the date navigator "
 "calendar and task list in the month view, in pixels."
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:31
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:31
 msgid ""
 "Position of the vertical pane, between task list and the task preview pane, "
 "in pixels."
@@ -4448,7 +4477,7 @@ msgstr ""
 "Position of the vertical pane, between task list and the task preview pane, "
 "in pixels."
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:32
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:32
 msgid ""
 "Position of the vertical pane, between the view and the date navigator "
 "calendar and task list in the month view, in pixels."
@@ -4456,7 +4485,7 @@ msgstr ""
 "Position of the vertical pane, between the view and the date navigator "
 "calendar and task list in the month view, in pixels."
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:33
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:33
 msgid ""
 "Position of the vertical pane, between the view and the date navigator "
 "calendar and task list when not in the month view, in pixels."
@@ -4464,31 +4493,31 @@ msgstr ""
 "Position of the vertical pane, between the view and the date navigator "
 "calendar and task list when not in the month view, in pixels."
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:34
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:34
 msgid "Programs that are allowed to be run by alarms."
 msgstr "Programs that are allowed to be run by alarms."
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:35
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:35
 msgid "Show appointment end times in week and month views"
 msgstr "Show appointment end times in week and month views"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:36
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:36
 msgid "Show display alarms in notification tray"
 msgstr "Show display alarms in notification tray"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:37
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:37
 msgid "Show week numbers in date navigator"
 msgstr "Show week numbers in date navigator"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:38
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:38
 msgid "Tasks due today color"
 msgstr "Tasks due today colour"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:39
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:39
 msgid "Tasks vertical pane position"
 msgstr "Tasks vertical pane position"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:40
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:40
 msgid ""
 "The default timezone to use for dates and times in the calendar, as an "
 "untranslated Olsen timezone database location like \"America/New York\"."
@@ -4496,7 +4525,7 @@ msgstr ""
 "The default timezone to use for dates and times in the calendar, as an "
 "untranslated Olsen timezone database location like \"America/New York\"."
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:42
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:42
 #, no-c-format
 msgid ""
 "The url template to use as a free/busy data fallback, %u is replaced by the "
@@ -4505,7 +4534,7 @@ msgstr ""
 "The URL template to use as a free/busy data fallback, %u is replaced by the "
 "user part of the mail address and %d is replaced by the domain."
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:43
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:43
 msgid ""
 "Time divisions</short> <short>Intervals shown in Day and Work Week views, in "
 "minutes."
@@ -4513,49 +4542,49 @@ msgstr ""
 "Time divisions</short> <short>Intervals shown in Day and Work Week views, in "
 "minutes."
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:44
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:44
 msgid "Time the last alarm ran, in time_t."
 msgstr "Time the last alarm ran, in time_t."
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:45
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:45
 msgid "Timezone"
 msgstr "Timezone"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:46
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:46
 msgid "Twenty four hour time format"
 msgstr "24-hour time format"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:47
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:47
 msgid "Units for a default reminder, \"minutes\", \"hours\" or \"days\"."
 msgstr "Units for a default reminder, \"minutes\", \"hours\" or \"days\"."
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:48
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:48
 msgid ""
 "Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days\"."
 msgstr ""
 "Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days\"."
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:50
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:50
 msgid "Week start"
 msgstr "Week start"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:51
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:51
 msgid "Weekday the week starts on, from Sunday (0) to Saturday (6)."
 msgstr "Weekday the week starts on, from Sunday (0) to Saturday (6)."
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:52
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:52
 msgid "Whether or not to use the notification tray for display alarms."
 msgstr "Whether or not to use the notification tray for displaying alarms."
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:53
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:53
 msgid "Whether to ask for confirmation when deleting an appointment or task."
 msgstr "Whether to ask for confirmation when deleting an appointment or task."
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:54
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:54
 msgid "Whether to ask for confirmation when expunging appointments and tasks."
 msgstr "Whether to ask for confirmation when expunging appointments and tasks."
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:55
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:55
 msgid ""
 "Whether to compress weekends in the month view, which puts Saturday and "
 "Sunday in the space of one weekday."
@@ -4563,75 +4592,77 @@ msgstr ""
 "Whether to compress weekends in the month view, which puts Saturday and "
 "Sunday in the space of one weekday."
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:56
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:56
 msgid "Whether to display the end time of events in the week and month views."
 msgstr "Whether to display the end time of events in the week and month views."
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:57
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:57
 msgid "Whether to hide completed tasks in the tasks view."
 msgstr "Whether to hide completed tasks in the tasks view."
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:58
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:58
 msgid "Whether to set a default reminder for appointments."
 msgstr "Whether to set a default reminder for appointments."
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:59
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:59
 msgid ""
 "Whether to show times in twenty four hour format instead of using am/pm."
 msgstr "Whether to show times in 24-hour format instead of using am/pm."
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:60
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:60
 msgid "Whether to show week numbers in the date navigator."
 msgstr "Whether to show week numbers in the date navigator."
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:61
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:61
 msgid "Work days"
 msgstr "Work days"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:62
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:62
 msgid "Workday end hour"
 msgstr "Workday end hour"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:63
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:63
 msgid "Workday end minute"
 msgstr "Workday end minute"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:64
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:64
 msgid "Workday start hour"
 msgstr "Workday start hour"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:65
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:65
 msgid "Workday start minute"
 msgstr "Workday start minute"
 
-#: calendar/gui/cal-search-bar.c:49
+#: ../calendar/gui/cal-search-bar.c:49
 msgid "Summary contains"
 msgstr "Summary contains"
 
-#: calendar/gui/cal-search-bar.c:50
+#: ../calendar/gui/cal-search-bar.c:50
 msgid "Description contains"
 msgstr "Description contains"
 
-#: calendar/gui/cal-search-bar.c:51
+#: ../calendar/gui/cal-search-bar.c:51
 msgid "Comment contains"
 msgstr "Comment contains"
 
-#: calendar/gui/cal-search-bar.c:52
+#: ../calendar/gui/cal-search-bar.c:52
 msgid "Location contains"
 msgstr "Location contains"
 
-#: calendar/gui/cal-search-bar.c:350
+#: ../calendar/gui/cal-search-bar.c:350
 msgid "Unmatched"
 msgstr "Unmatched"
 
-#: calendar/gui/calendar-commands.c:120 calendar/gui/calendar-component.c:568
-#: calendar/gui/dialogs/calendar-setup.c:362 calendar/gui/gnome-cal.c:1942
-#: plugins/groupwise-account-setup/camel-gw-listener.c:382
-#: plugins/groupwise-account-setup/camel-gw-listener.c:412
+#: ../calendar/gui/calendar-commands.c:120
+#: ../calendar/gui/calendar-component.c:708
+#: ../calendar/gui/dialogs/calendar-setup.c:362
+#: ../calendar/gui/gnome-cal.c:1942
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:382
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:412
 msgid "Calendar"
 msgstr "Calendar"
 
-#: calendar/gui/calendar-commands.c:355
+#: ../calendar/gui/calendar-commands.c:355
 msgid ""
 "This operation will permanently erase all events older than the selected "
 "amount of time. If you continue, you will not be able to recover these "
@@ -4641,1102 +4672,1131 @@ msgstr ""
 "amount of time. If you continue, you will not be able to recover these "
 "events."
 
-#: calendar/gui/calendar-commands.c:361
+#: ../calendar/gui/calendar-commands.c:361
 msgid "Purge events older than"
 msgstr "Purge events older than"
 
-#: calendar/gui/calendar-commands.c:366
-#: calendar/gui/dialogs/alarm-dialog.glade.h:20
-#: calendar/gui/dialogs/calendar-setup.glade.h:12 filter/filter.glade.h:14
-#: plugins/calendar-http/calendar-http.c:265
-#: plugins/calendar-weather/calendar-weather.c:566
-#: widgets/misc/e-send-options.glade.h:39
+#: ../calendar/gui/calendar-commands.c:366
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:20
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:12
+#: ../filter/filter.glade.h:14 ../plugins/calendar-http/calendar-http.c:265
+#: ../plugins/calendar-weather/calendar-weather.c:566
+#: ../widgets/misc/e-send-options.glade.h:39
 msgid "days"
 msgstr "days"
 
-#: calendar/gui/calendar-component.c:384
-#: calendar/gui/dialogs/calendar-setup.c:442
+#. Create the On the web source group
+#. Create the Webcal source group
+#. Create the LDAP source group
+#: ../calendar/gui/calendar-component.c:223 ../calendar/gui/migration.c:486
+#: ../calendar/gui/migration.c:579 ../calendar/gui/tasks-component.c:204
+msgid "On The Web"
+msgstr "On The Web"
+
+#: ../calendar/gui/calendar-component.c:241 ../calendar/gui/migration.c:388
+msgid "Birthdays & Anniversaries"
+msgstr "Birthdays & Anniversaries"
+
+#. Create the weather group
+#: ../calendar/gui/calendar-component.c:247
+#: ../plugins/calendar-weather/calendar-weather.c:100
+msgid "Weather"
+msgstr "Weather"
+
+#: ../calendar/gui/calendar-component.c:524
+#: ../calendar/gui/dialogs/calendar-setup.c:442
 msgid "New Calendar"
 msgstr "New Calendar"
 
-#: calendar/gui/calendar-component.c:703
+#: ../calendar/gui/calendar-component.c:843
 msgid "Failed upgrading calendars."
 msgstr "Failed upgrading calendars."
 
-#: calendar/gui/calendar-component.c:999
+#: ../calendar/gui/calendar-component.c:1139
 #, c-format
 msgid "Unable to open the calendar '%s' for creating events and meetings"
 msgstr "Unable to open the calendar '%s' for creating events and meetings"
 
-#: calendar/gui/calendar-component.c:1015
+#: ../calendar/gui/calendar-component.c:1155
 msgid "There is no calendar available for creating events and meetings"
 msgstr "There is no calendar available for creating events and meetings"
 
-#: calendar/gui/calendar-component.c:1125
+#: ../calendar/gui/calendar-component.c:1265
 msgid "Calendar Source Selector"
 msgstr "Calendar Source Selector"
 
-#: calendar/gui/calendar-component.c:1316
+#: ../calendar/gui/calendar-component.c:1456
 msgid "New appointment"
 msgstr "New appointment"
 
-#: calendar/gui/calendar-component.c:1317
+#: ../calendar/gui/calendar-component.c:1457
 msgid "_Appointment"
 msgstr "_Appointment"
 
-#: calendar/gui/calendar-component.c:1318
+#: ../calendar/gui/calendar-component.c:1458
 msgid "Create a new appointment"
 msgstr "Create a new appointment"
 
-#: calendar/gui/calendar-component.c:1324
+#: ../calendar/gui/calendar-component.c:1464
 msgid "New meeting"
 msgstr "New meeting"
 
-#: calendar/gui/calendar-component.c:1325
+#: ../calendar/gui/calendar-component.c:1465
 msgid "M_eeting"
 msgstr "M_eeting"
 
-#: calendar/gui/calendar-component.c:1326
+#: ../calendar/gui/calendar-component.c:1466
 msgid "Create a new meeting request"
 msgstr "Create a new meeting request"
 
-#: calendar/gui/calendar-component.c:1332
+#: ../calendar/gui/calendar-component.c:1472
 msgid "New all day appointment"
 msgstr "New all day appointment"
 
-#: calendar/gui/calendar-component.c:1333
+#: ../calendar/gui/calendar-component.c:1473
 msgid "All Day A_ppointment"
 msgstr "All Day A_ppointment"
 
-#: calendar/gui/calendar-component.c:1334
+#: ../calendar/gui/calendar-component.c:1474
 msgid "Create a new all-day appointment"
 msgstr "Create a new all-day appointment"
 
-#: calendar/gui/calendar-component.c:1340
+#: ../calendar/gui/calendar-component.c:1480
 msgid "New calendar"
 msgstr "New calendar"
 
-#: calendar/gui/calendar-component.c:1341
+#: ../calendar/gui/calendar-component.c:1481
 msgid "Cale_ndar"
 msgstr "Cale_ndar"
 
-#: calendar/gui/calendar-component.c:1342
+#: ../calendar/gui/calendar-component.c:1482
 msgid "Create a new calendar"
 msgstr "Create a new calendar"
 
-#: calendar/gui/calendar-view-factory.c:109
+#: ../calendar/gui/calendar-view-factory.c:109
 msgid "Day View"
 msgstr "Day View"
 
-#: calendar/gui/calendar-view-factory.c:112
+#: ../calendar/gui/calendar-view-factory.c:112
 msgid "Work Week View"
 msgstr "Work Week View"
 
-#: calendar/gui/calendar-view-factory.c:115
+#: ../calendar/gui/calendar-view-factory.c:115
 msgid "Week View"
 msgstr "Week View"
 
-#: calendar/gui/calendar-view-factory.c:118
+#: ../calendar/gui/calendar-view-factory.c:118
 msgid "Month View"
 msgstr "Month View"
 
-#: calendar/gui/comp-editor-factory.c:413
+#: ../calendar/gui/comp-editor-factory.c:413
 msgid "Error while opening the calendar"
 msgstr "Error while opening the calendar"
 
-#: calendar/gui/comp-editor-factory.c:419
+#: ../calendar/gui/comp-editor-factory.c:419
 msgid "Method not supported when opening the calendar"
 msgstr "Method not supported when opening the calendar"
 
-#: calendar/gui/comp-editor-factory.c:425
+#: ../calendar/gui/comp-editor-factory.c:425
 msgid "Permission denied to open the calendar"
 msgstr "Permission denied to open the calendar"
 
-#: calendar/gui/comp-editor-factory.c:437 shell/e-shell.c:1259
+#: ../calendar/gui/comp-editor-factory.c:437 ../shell/e-shell.c:1264
 msgid "Unknown error"
 msgstr "Unknown error"
 
-#: calendar/gui/dialogs/alarm-dialog.glade.h:1
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:1
 msgid "<b>Alarm</b>"
 msgstr "<b>Alarm</b>"
 
-#: calendar/gui/dialogs/alarm-dialog.glade.h:2
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:2
 msgid "<b>Options</b>"
 msgstr "<b>Options</b>"
 
-#: calendar/gui/dialogs/alarm-dialog.glade.h:3
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:3
 msgid "<b>Repeat</b>"
 msgstr "<b>Repeat</b>"
 
-#: calendar/gui/dialogs/alarm-dialog.glade.h:4
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:4
 msgid "Add Alarm"
 msgstr "Add Alarm"
 
-#: calendar/gui/dialogs/alarm-dialog.glade.h:5
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:5
 msgid "Custom _message"
 msgstr "Custom _message"
 
-#: calendar/gui/dialogs/alarm-dialog.glade.h:6
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:6
 msgid "Custom alarm sound"
 msgstr "Custom alarm sound"
 
-#: calendar/gui/dialogs/alarm-dialog.glade.h:7
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:7
 msgid "Mes_sage:"
 msgstr "Mes_sage:"
 
-#: calendar/gui/dialogs/alarm-dialog.glade.h:8 calendar/gui/e-alarm-list.c:444
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:8
+#: ../calendar/gui/e-alarm-list.c:444
 msgid "Play a sound"
 msgstr "Play a sound"
 
-#: calendar/gui/dialogs/alarm-dialog.glade.h:9 calendar/gui/e-alarm-list.c:448
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:9
+#: ../calendar/gui/e-alarm-list.c:448
 msgid "Pop up an alert"
 msgstr "Pop up an alert"
 
-#: calendar/gui/dialogs/alarm-dialog.glade.h:10
-#: calendar/gui/e-alarm-list.c:456
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:10
+#: ../calendar/gui/e-alarm-list.c:456
 msgid "Run a program"
 msgstr "Run a program"
 
-#: calendar/gui/dialogs/alarm-dialog.glade.h:11
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:11
 msgid "Send To:"
 msgstr "Send To:"
 
-#: calendar/gui/dialogs/alarm-dialog.glade.h:12
-#: calendar/gui/e-alarm-list.c:452
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:12
+#: ../calendar/gui/e-alarm-list.c:452
 msgid "Send an email"
 msgstr "Send an email"
 
-#: calendar/gui/dialogs/alarm-dialog.glade.h:13
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:13
 msgid "_Arguments:"
 msgstr "_Arguments:"
 
-#: calendar/gui/dialogs/alarm-dialog.glade.h:14
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:14
 msgid "_Program:"
 msgstr "_Program:"
 
-#: calendar/gui/dialogs/alarm-dialog.glade.h:15
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:15
 msgid "_Repeat the alarm"
 msgstr "_Repeat the alarm"
 
-#: calendar/gui/dialogs/alarm-dialog.glade.h:16
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:16
 msgid "_Sound:"
 msgstr "_Sound:"
 
-#: calendar/gui/dialogs/alarm-dialog.glade.h:17
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:17
 msgid "after"
 msgstr "after"
 
-#: calendar/gui/dialogs/alarm-dialog.glade.h:18
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:18
 msgid "before"
 msgstr "before"
 
-#: calendar/gui/dialogs/alarm-dialog.glade.h:19
-#: calendar/gui/dialogs/recurrence-page.glade.h:7
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:19
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:7
 msgid "day(s)"
 msgstr "day(s)"
 
-#: calendar/gui/dialogs/alarm-dialog.glade.h:21
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:21
 msgid "end of appointment"
 msgstr "end of appointment"
 
-#: calendar/gui/dialogs/alarm-dialog.glade.h:22
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:22
 msgid "extra times every"
 msgstr "extra times every"
 
-#: calendar/gui/dialogs/alarm-dialog.glade.h:23
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:23
 msgid "hour(s)"
 msgstr "hour(s)"
 
-#: calendar/gui/dialogs/alarm-dialog.glade.h:24
-#: calendar/gui/dialogs/calendar-setup.glade.h:13 filter/filter.glade.h:15
-#: plugins/calendar-http/calendar-http.c:264
-#: plugins/calendar-weather/calendar-weather.c:565
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:24
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:13
+#: ../filter/filter.glade.h:15 ../plugins/calendar-http/calendar-http.c:264
+#: ../plugins/calendar-weather/calendar-weather.c:565
 msgid "hours"
 msgstr "hours"
 
-#: calendar/gui/dialogs/alarm-dialog.glade.h:25
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:25
 msgid "minute(s)"
 msgstr "minute(s)"
 
-#: calendar/gui/dialogs/alarm-dialog.glade.h:27
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:27
 msgid "start of appointment"
 msgstr "start of appointment"
 
-#: calendar/gui/dialogs/alarm-list-dialog.c:199
+#: ../calendar/gui/dialogs/alarm-list-dialog.c:199
 msgid "Action/Trigger"
 msgstr "Action/Trigger"
 
-#: calendar/gui/dialogs/alarm-list-dialog.glade.h:1
+#: ../calendar/gui/dialogs/alarm-list-dialog.glade.h:1
 msgid "A_dd"
 msgstr "A_dd"
 
-#: calendar/gui/dialogs/alarm-list-dialog.glade.h:2
+#: ../calendar/gui/dialogs/alarm-list-dialog.glade.h:2
 msgid "Alarms"
 msgstr "Alarms"
 
-#: calendar/gui/dialogs/cal-attachment-bar.c:108
-#: composer/e-msg-composer-attachment-bar.c:103
+#: ../calendar/gui/dialogs/cal-attachment-bar.c:108
+#: ../composer/e-msg-composer-attachment-bar.c:103
 #, c-format
 msgid "%.0fK"
 msgstr "%.0fK"
 
-#: calendar/gui/dialogs/cal-attachment-bar.c:111
-#: composer/e-msg-composer-attachment-bar.c:106
+#: ../calendar/gui/dialogs/cal-attachment-bar.c:111
+#: ../composer/e-msg-composer-attachment-bar.c:106
 #, c-format
 msgid "%.0fM"
 msgstr "%.0fM"
 
-#: calendar/gui/dialogs/cal-attachment-bar.c:114
-#: composer/e-msg-composer-attachment-bar.c:109
+#: ../calendar/gui/dialogs/cal-attachment-bar.c:114
+#: ../composer/e-msg-composer-attachment-bar.c:109
 #, c-format
 msgid "%.0fG"
 msgstr "%.0fG"
 
-#: calendar/gui/dialogs/cal-attachment-bar.c:298
-#: calendar/gui/dialogs/cal-attachment-bar.c:913
-#: composer/e-msg-composer-attachment-bar.c:295 mail/em-utils.c:436
+#: ../calendar/gui/dialogs/cal-attachment-bar.c:298
+#: ../calendar/gui/dialogs/cal-attachment-bar.c:922
+#: ../composer/e-msg-composer-attachment-bar.c:295 ../mail/em-utils.c:438
 msgid "attachment"
 msgstr "attachment"
 
-#: calendar/gui/dialogs/cal-attachment-bar.c:439
-#: calendar/gui/dialogs/meeting-page.c:781
-#: composer/e-msg-composer-attachment-bar.c:437
-#: plugins/shared-folder/properties.glade.h:14
+#: ../calendar/gui/dialogs/cal-attachment-bar.c:439
+#: ../calendar/gui/dialogs/meeting-page.c:781
+#: ../composer/e-msg-composer-attachment-bar.c:437
+#: ../plugins/shared-folder/properties.glade.h:14
 msgid "_Remove"
 msgstr "_Remove"
 
-#: calendar/gui/dialogs/cal-attachment-bar.c:440
-#: composer/e-msg-composer-attachment-bar.c:438 mail/em-folder-tree.c:2818
-#: ui/evolution-mail-list.xml.h:27
+#: ../calendar/gui/dialogs/cal-attachment-bar.c:440
+#: ../composer/e-msg-composer-attachment-bar.c:438
+#: ../mail/em-folder-tree.c:2819 ../ui/evolution-mail-list.xml.h:27
 msgid "_Properties"
 msgstr "_Properties"
 
-#: calendar/gui/dialogs/cal-attachment-bar.c:442
-#: composer/e-msg-composer-attachment-bar.c:440
+#: ../calendar/gui/dialogs/cal-attachment-bar.c:442
+#: ../composer/e-msg-composer-attachment-bar.c:440
 msgid "_Add attachment..."
 msgstr "_Add attachment..."
 
-#: calendar/gui/dialogs/cal-attachment-bar.c:699
-#: composer/e-msg-composer-attachment-bar.c:703
+#: ../calendar/gui/dialogs/cal-attachment-bar.c:699
+#: ../composer/e-msg-composer-attachment-bar.c:703
 msgid "Attachment Bar"
 msgstr "Attachment Bar"
 
-#: calendar/gui/dialogs/cal-attachment-select-file.c:96
-#: calendar/gui/dialogs/cal-attachment-select-file.c:115
-#: calendar/gui/dialogs/cal-attachment.glade.h:6
-#: composer/e-msg-composer-attachment.glade.h:6
-#: composer/e-msg-composer-select-file.c:95
-#: composer/e-msg-composer-select-file.c:115
+#: ../calendar/gui/dialogs/cal-attachment-select-file.c:96
+#: ../calendar/gui/dialogs/cal-attachment-select-file.c:115
+#: ../calendar/gui/dialogs/cal-attachment.glade.h:6
+#: ../composer/e-msg-composer-attachment.glade.h:6
+#: ../composer/e-msg-composer-select-file.c:95
+#: ../composer/e-msg-composer-select-file.c:115
 msgid "Suggest automatic display of attachment"
 msgstr "Suggest automatic display of attachment"
 
-#: calendar/gui/dialogs/cal-attachment-select-file.c:190
-#: composer/e-msg-composer-select-file.c:231
+#: ../calendar/gui/dialogs/cal-attachment-select-file.c:190
+#: ../composer/e-msg-composer-select-file.c:231
 msgid "Attach file(s)"
 msgstr "Attach file(s)"
 
-#: calendar/gui/dialogs/cal-attachment.c:197
-#: calendar/gui/dialogs/cal-attachment.c:213
-#: composer/e-msg-composer-attachment.c:174
-#: composer/e-msg-composer-attachment.c:190
+#: ../calendar/gui/dialogs/cal-attachment.c:197
+#: ../calendar/gui/dialogs/cal-attachment.c:213
+#: ../composer/e-msg-composer-attachment.c:174
+#: ../composer/e-msg-composer-attachment.c:190
 #, c-format
 msgid "Cannot attach file %s: %s"
 msgstr "Cannot attach file %s: %s"
 
-#: calendar/gui/dialogs/cal-attachment.c:205
-#: composer/e-msg-composer-attachment.c:182
+#: ../calendar/gui/dialogs/cal-attachment.c:205
+#: ../composer/e-msg-composer-attachment.c:182
 #, c-format
 msgid "Cannot attach file %s: not a regular file"
 msgstr "Cannot attach file %s: not a regular file"
 
-#: calendar/gui/dialogs/cal-attachment.glade.h:2
-#: composer/e-msg-composer-attachment.glade.h:2
+#: ../calendar/gui/dialogs/cal-attachment.glade.h:2
+#: ../composer/e-msg-composer-attachment.glade.h:2
 msgid "Attachment Properties"
 msgstr "Attachment Properties"
 
-#: calendar/gui/dialogs/cal-attachment.glade.h:3
-#: calendar/gui/e-cal-component-preview.c:267
-#: calendar/gui/e-itip-control.c:1164 calendar/gui/e-itip-control.glade.h:6
-#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:68
+#: ../calendar/gui/dialogs/cal-attachment.glade.h:3
+#: ../calendar/gui/e-cal-component-preview.c:267
+#: ../calendar/gui/e-itip-control.c:1164
+#: ../calendar/gui/e-itip-control.glade.h:6
+#: ../composer/e-msg-composer-attachment.glade.h:3
+#: ../mail/mail-config.glade.h:68
 msgid "Description:"
 msgstr "Description:"
 
-#: calendar/gui/dialogs/cal-attachment.glade.h:4
-#: composer/e-msg-composer-attachment.glade.h:4
+#: ../calendar/gui/dialogs/cal-attachment.glade.h:4
+#: ../composer/e-msg-composer-attachment.glade.h:4
 msgid "File name:"
 msgstr "File name:"
 
-#: calendar/gui/dialogs/cal-attachment.glade.h:5
-#: composer/e-msg-composer-attachment.glade.h:5
+#: ../calendar/gui/dialogs/cal-attachment.glade.h:5
+#: ../composer/e-msg-composer-attachment.glade.h:5
 msgid "MIME type:"
 msgstr "MIME type:"
 
 #. g_object_set((GObject *)renderer, "activatable", TRUE, NULL);
-#: calendar/gui/dialogs/cal-prefs-dialog.c:576 mail/em-account-prefs.c:460
-#: mail/em-composer-prefs.c:888 plugins/plugin-manager/plugin-manager.c:213
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:576
+#: ../mail/em-account-prefs.c:476 ../mail/em-composer-prefs.c:888
+#: ../plugins/plugin-manager/plugin-manager.c:213
 msgid "Enabled"
 msgstr "Enabled"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.c:730
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:730
 msgid "Are you sure you want to remove this URL?"
 msgstr "Are you sure you want to remove this URL?"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.c:733
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:733
 msgid "Remove"
 msgstr "Remove"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.c:738
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:738
 msgid "Don't Remove"
 msgstr "Don't Remove"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.c:787
-#: calendar/gui/dialogs/cal-prefs-dialog.c:820
-#: calendar/gui/dialogs/cal-prefs-dialog.c:853 mail/em-account-prefs.c:307
-#: mail/em-account-prefs.c:335 mail/em-account-prefs.c:366
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:787
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:820
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:853
+#: ../mail/em-account-prefs.c:323 ../mail/em-account-prefs.c:351
+#: ../mail/em-account-prefs.c:382
 msgid "Disable"
 msgstr "Disable"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.c:787
-#: calendar/gui/dialogs/cal-prefs-dialog.c:820
-#: calendar/gui/dialogs/cal-prefs-dialog.c:855 mail/em-account-prefs.c:307
-#: mail/em-account-prefs.c:335 mail/em-account-prefs.c:368
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:787
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:820
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:855
+#: ../mail/em-account-prefs.c:323 ../mail/em-account-prefs.c:351
+#: ../mail/em-account-prefs.c:384
 msgid "Enable"
 msgstr "Enable"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:2
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:2
 msgid "05 minutes"
 msgstr "05 minutes"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:3
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:3
 msgid "10 minutes"
 msgstr "10 minutes"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:4
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:4
 msgid "15 minutes"
 msgstr "15 minutes"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:5
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:5
 msgid "30 minutes"
 msgstr "30 minutes"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:6
 msgid "60 minutes"
 msgstr "60 minutes"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
 msgid "<b>Alerts</b>"
 msgstr "<b>Alerts</b>"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
 msgid "<b>Default Free/Busy Server</b>"
 msgstr "<b>Default Free/Busy Server</b>"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
 msgid "<b>General</b>"
 msgstr "<b>General</b>"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
 msgid "<b>Publishing</b>"
 msgstr "<b>Publishing</b>"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
 msgid "<b>Task List</b>"
 msgstr "<b>Task List</b>"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
 msgid "<b>Time</b>"
 msgstr "<b>Time</b>"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
 msgid "<b>Work Week</b>"
 msgstr "<b>Work Week</b>"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
 #, no-c-format
 msgid ""
 "<i>%u and %d will be replaced by user and domain from the email address.</i>"
 msgstr ""
 "<i>%u and %d will be replaced by user and domain from the email address.</i>"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
 msgid "Calendar and Tasks Settings"
 msgstr "Calendar and Tasks Settings"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
 msgid "Color for overdue tasks"
 msgstr "Colour for overdue tasks"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
 msgid "Color for tasks due today"
 msgstr "Colour for tasks due today"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
 msgid "Day _ends:"
 msgstr "Day _ends:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
 msgid "Days"
 msgstr "Days"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
 msgid "Display"
 msgstr "Display"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
-#: mail/mail-config.glade.h:73
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
+#: ../mail/mail-config.glade.h:73
 msgid "E_nable"
 msgstr "E_nable"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
 msgid "Free/Busy"
 msgstr "Free/Busy"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-#: calendar/gui/dialogs/recurrence-page.c:1044
-#: calendar/gui/e-itip-control.c:732
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
+#: ../calendar/gui/dialogs/recurrence-page.c:1044
+#: ../calendar/gui/e-itip-control.c:732
 msgid "Friday"
 msgstr "Friday"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
 msgid "Hours"
 msgstr "Hours"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
 msgid "Minutes"
 msgstr "Minutes"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
-#: calendar/gui/dialogs/recurrence-page.c:1040
-#: calendar/gui/e-itip-control.c:728
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
+#: ../calendar/gui/dialogs/recurrence-page.c:1040
+#: ../calendar/gui/e-itip-control.c:728
 msgid "Monday"
 msgstr "Monday"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
 msgid "S_un"
 msgstr "S_un"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
-#: calendar/gui/dialogs/recurrence-page.c:1045
-#: calendar/gui/e-itip-control.c:733
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
+#: ../calendar/gui/dialogs/recurrence-page.c:1045
+#: ../calendar/gui/e-itip-control.c:733
 msgid "Saturday"
 msgstr "Saturday"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
 msgid "Sh_ow a reminder"
 msgstr "Sh_ow a reminder"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
 msgid "Show week _numbers in date navigator"
 msgstr "Show week _numbers in date navigator"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
-#: calendar/gui/dialogs/recurrence-page.c:1046
-#: calendar/gui/e-itip-control.c:727
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
+#: ../calendar/gui/dialogs/recurrence-page.c:1046
+#: ../calendar/gui/e-itip-control.c:727
 msgid "Sunday"
 msgstr "Sunday"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
 msgid "T_asks due today:"
 msgstr "T_asks due today:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
 msgid "T_hu"
 msgstr "T_hu"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
 msgid "Template:"
 msgstr "Template:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
-#: calendar/gui/dialogs/recurrence-page.c:1043
-#: calendar/gui/e-itip-control.c:731
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#: ../calendar/gui/dialogs/recurrence-page.c:1043
+#: ../calendar/gui/e-itip-control.c:731
 msgid "Thursday"
 msgstr "Thursday"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
 msgid "Time _zone:"
 msgstr "Time _zone:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
 msgid "Time format:"
 msgstr "Time format:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-#: calendar/gui/dialogs/recurrence-page.c:1041
-#: calendar/gui/e-itip-control.c:729
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
+#: ../calendar/gui/dialogs/recurrence-page.c:1041
+#: ../calendar/gui/e-itip-control.c:729
 msgid "Tuesday"
 msgstr "Tuesday"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
 msgid "W_eek starts:"
 msgstr "W_eek starts:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
-#: calendar/gui/dialogs/recurrence-page.c:1042
-#: calendar/gui/e-itip-control.c:730
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
+#: ../calendar/gui/dialogs/recurrence-page.c:1042
+#: ../calendar/gui/e-itip-control.c:730
 msgid "Wednesday"
 msgstr "Wednesday"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
 msgid "Work days:"
 msgstr "Work days:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
 msgid "_12 hour (AM/PM)"
 msgstr "_12 hour (AM/PM)"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
 msgid "_24 hour"
 msgstr "_24 hour"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
 msgid "_Add URL"
 msgstr "_Add URL"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
 msgid "_Ask for confirmation when deleting items"
 msgstr "_Ask for confirmation when deleting items"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
 msgid "_Compress weekends in month view"
 msgstr "_Compress weekends in month view"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
 msgid "_Day begins:"
 msgstr "_Day begins:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
 msgid "_Fri"
 msgstr "_Fri"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
 msgid "_Hide completed tasks after"
 msgstr "_Hide completed tasks after"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
 msgid "_Mon"
 msgstr "_Mon"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
 msgid "_Overdue tasks:"
 msgstr "_Overdue tasks:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
 msgid "_Sat"
 msgstr "_Sat"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
 msgid "_Show appointment end times in week and month views"
 msgstr "_Show appointment end times in week and month views"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:57
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:57
 msgid "_Time divisions:"
 msgstr "_Time divisions:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
 msgid "_Tue"
 msgstr "_Tue"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:59
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:59
 msgid "_Wed"
 msgstr "_Wed"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:60
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:60
 msgid "before every appointment"
 msgstr "before every appointment"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:61
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:61
 msgid "option menu to choose reminder units"
 msgstr "option menu to choose reminder units"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:62
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:62
 msgid "option menu to choose time units"
 msgstr "option menu to choose time units"
 
-#: calendar/gui/dialogs/calendar-setup.c:284
+#: ../calendar/gui/dialogs/calendar-setup.c:284
 msgid "Copy calendar contents locally for offline operation"
 msgstr "Copy calendar contents locally for offline operation"
 
-#: calendar/gui/dialogs/calendar-setup.c:336
-#: calendar/gui/dialogs/calendar-setup.glade.h:4
+#: ../calendar/gui/dialogs/calendar-setup.c:336
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:4
 msgid "C_olor:"
 msgstr "C_olour:"
 
-#: calendar/gui/dialogs/calendar-setup.c:373
+#: ../calendar/gui/dialogs/calendar-setup.c:373
 msgid "Tasks List"
 msgstr "Tasks List"
 
-#: calendar/gui/dialogs/calendar-setup.c:440
+#: ../calendar/gui/dialogs/calendar-setup.c:440
 msgid "Calendar Properties"
 msgstr "Calendar Properties"
 
-#: calendar/gui/dialogs/calendar-setup.c:506
+#: ../calendar/gui/dialogs/calendar-setup.c:506
 msgid "Task List Properties"
 msgstr "Task List Properties"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:2
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:2
 msgid "Add Calendar"
 msgstr "Add Calendar"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:3
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:3
 msgid "Add Task List"
 msgstr "Add Task List"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:5 mail/mail-config.glade.h:102
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:5
+#: ../mail/mail-config.glade.h:102
 msgid "Pick a color"
 msgstr "Pick a colour"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:6
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:6
 msgid "_Add Calendar"
 msgstr "_Add Calendar"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:7
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:7
 msgid "_Add Task List"
 msgstr "_Add Task List"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:9
-#: plugins/calendar-http/calendar-http.c:248
-#: plugins/calendar-weather/calendar-weather.c:549
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:9
+#: ../plugins/calendar-http/calendar-http.c:248
+#: ../plugins/calendar-weather/calendar-weather.c:549
 msgid "_Refresh:"
 msgstr "_Refresh:"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:11
-#: plugins/calendar-http/calendar-http.c:120
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:11
+#: ../plugins/calendar-http/calendar-http.c:120
 msgid "_URL:"
 msgstr "_URL:"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:15 filter/filter.glade.h:21
-#: plugins/calendar-http/calendar-http.c:266
-#: plugins/calendar-weather/calendar-weather.c:567
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:15
+#: ../filter/filter.glade.h:21 ../plugins/calendar-http/calendar-http.c:266
+#: ../plugins/calendar-weather/calendar-weather.c:567
 msgid "weeks"
 msgstr "weeks"
 
-#: calendar/gui/dialogs/changed-comp.c:60
+#: ../calendar/gui/dialogs/changed-comp.c:60
 msgid "This event has been deleted."
 msgstr "This event has been deleted."
 
-#: calendar/gui/dialogs/changed-comp.c:64
+#: ../calendar/gui/dialogs/changed-comp.c:64
 msgid "This task has been deleted."
 msgstr "This task has been deleted."
 
-#: calendar/gui/dialogs/changed-comp.c:68
+#: ../calendar/gui/dialogs/changed-comp.c:68
 msgid "This journal entry has been deleted."
 msgstr "This journal entry has been deleted."
 
-#: calendar/gui/dialogs/changed-comp.c:77
+#: ../calendar/gui/dialogs/changed-comp.c:77
 #, c-format
 msgid "%s  You have made changes. Forget those changes and close the editor?"
 msgstr "%s  You have made changes. Forget those changes and close the editor?"
 
-#: calendar/gui/dialogs/changed-comp.c:79
+#: ../calendar/gui/dialogs/changed-comp.c:79
 #, c-format
 msgid "%s  You have made no changes, close the editor?"
 msgstr "%s  You have made no changes, close the editor?"
 
-#: calendar/gui/dialogs/changed-comp.c:84
+#: ../calendar/gui/dialogs/changed-comp.c:84
 msgid "This event has been changed."
 msgstr "This event has been changed."
 
-#: calendar/gui/dialogs/changed-comp.c:88
+#: ../calendar/gui/dialogs/changed-comp.c:88
 msgid "This task has been changed."
 msgstr "This task has been changed."
 
-#: calendar/gui/dialogs/changed-comp.c:92
+#: ../calendar/gui/dialogs/changed-comp.c:92
 msgid "This journal entry has been changed."
 msgstr "This journal entry has been changed."
 
-#: calendar/gui/dialogs/changed-comp.c:101
+#: ../calendar/gui/dialogs/changed-comp.c:101
 #, c-format
 msgid "%s  You have made changes. Forget those changes and update the editor?"
 msgstr "%s  You have made changes. Forget those changes and update the editor?"
 
-#: calendar/gui/dialogs/changed-comp.c:103
+#: ../calendar/gui/dialogs/changed-comp.c:103
 #, c-format
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  You have made no changes, update the editor?"
 
-#: calendar/gui/dialogs/comp-editor-page.c:464
+#: ../calendar/gui/dialogs/comp-editor-page.c:464
 #, c-format
 msgid "Validation error: %s"
 msgstr "Validation error: %s"
 
-#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2261
+#: ../calendar/gui/dialogs/comp-editor-util.c:187 ../calendar/gui/print.c:2261
 msgid " to "
 msgstr " to "
 
-#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2265
+#: ../calendar/gui/dialogs/comp-editor-util.c:191 ../calendar/gui/print.c:2265
 msgid " (Completed "
 msgstr " (Completed "
 
-#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2267
+#: ../calendar/gui/dialogs/comp-editor-util.c:193 ../calendar/gui/print.c:2267
 msgid "Completed "
 msgstr "Completed "
 
-#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2272
+#: ../calendar/gui/dialogs/comp-editor-util.c:198 ../calendar/gui/print.c:2272
 msgid " (Due "
 msgstr " (Due "
 
-#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2274
+#: ../calendar/gui/dialogs/comp-editor-util.c:200 ../calendar/gui/print.c:2274
 msgid "Due "
 msgstr "Due "
 
-#: calendar/gui/dialogs/comp-editor.c:181 composer/e-msg-composer.c:2676
+#: ../calendar/gui/dialogs/comp-editor.c:181 ../composer/e-msg-composer.c:2676
 #, c-format
 msgid "Attached message - %s"
 msgstr "Attached message - %s"
 
 #. translators, this count will always be >1
-#: calendar/gui/dialogs/comp-editor.c:186
-#: calendar/gui/dialogs/comp-editor.c:349 composer/e-msg-composer.c:2681
-#: composer/e-msg-composer.c:2844
+#: ../calendar/gui/dialogs/comp-editor.c:186
+#: ../calendar/gui/dialogs/comp-editor.c:349 ../composer/e-msg-composer.c:2681
+#: ../composer/e-msg-composer.c:2844
 #, c-format
 msgid "Attached message"
 msgid_plural "%d attached messages"
 msgstr[0] "Attached message"
 msgstr[1] "%d attached messages"
 
-#: calendar/gui/dialogs/comp-editor.c:412 calendar/gui/e-calendar-table.c:1164
-#: calendar/gui/e-calendar-view.c:1402 composer/e-msg-composer.c:2906
-#: mail/em-folder-tree.c:1046 mail/em-folder-view.c:972
-#: mail/message-list.c:1712 ui/evolution-addressbook.xml.h:31
-#: ui/evolution-calendar.xml.h:39 ui/evolution-composer-entries.xml.h:7
-#: ui/evolution-mail-message.xml.h:105 ui/evolution-tasks.xml.h:20
+#: ../calendar/gui/dialogs/comp-editor.c:412
+#: ../calendar/gui/e-calendar-table.c:1164
+#: ../calendar/gui/e-calendar-view.c:1402 ../composer/e-msg-composer.c:2906
+#: ../mail/em-folder-tree.c:1047 ../mail/em-folder-view.c:966
+#: ../mail/message-list.c:1707 ../ui/evolution-addressbook.xml.h:31
+#: ../ui/evolution-calendar.xml.h:39 ../ui/evolution-composer-entries.xml.h:7
+#: ../ui/evolution-mail-message.xml.h:105 ../ui/evolution-tasks.xml.h:20
 msgid "_Copy"
 msgstr "_Copy"
 
-#: calendar/gui/dialogs/comp-editor.c:413 composer/e-msg-composer.c:2907
-#: mail/em-folder-tree.c:1047 mail/em-folder-tree.c:2311
-#: mail/em-folder-view.c:868 mail/message-list.c:1713
+#: ../calendar/gui/dialogs/comp-editor.c:413 ../composer/e-msg-composer.c:2907
+#: ../mail/em-folder-tree.c:1048 ../mail/em-folder-tree.c:2312
+#: ../mail/em-folder-view.c:862 ../mail/message-list.c:1708
 msgid "_Move"
 msgstr "_Move"
 
-#: calendar/gui/dialogs/comp-editor.c:415 composer/e-msg-composer.c:2909
-#: mail/em-folder-tree.c:1049 mail/message-list.c:1715
+#: ../calendar/gui/dialogs/comp-editor.c:415 ../composer/e-msg-composer.c:2909
+#: ../mail/em-folder-tree.c:1050 ../mail/message-list.c:1710
 msgid "Cancel _Drag"
 msgstr "Cancel _Drag"
 
-#: calendar/gui/dialogs/comp-editor.c:659
+#: ../calendar/gui/dialogs/comp-editor.c:682
 msgid "Could not update object"
 msgstr "Could not update object"
 
-#: calendar/gui/dialogs/comp-editor.c:820 composer/e-msg-composer.c:2310
+#: ../calendar/gui/dialogs/comp-editor.c:843 ../composer/e-msg-composer.c:2310
 #, c-format
 msgid "<b>%d</b> File Attached"
 msgid_plural "<b>%d</b> Files Attached"
 msgstr[0] "<b>%d</b> File Attached"
 msgstr[1] "<b>%d</b> Files Attached"
 
-#: calendar/gui/dialogs/comp-editor.c:873 composer/e-msg-composer.c:2339
+#: ../calendar/gui/dialogs/comp-editor.c:900 ../composer/e-msg-composer.c:2339
 msgid "Hide _Attachment Bar (drop attachments here)"
 msgstr "Hide _Attachment Bar (drop attachments here)"
 
-#: calendar/gui/dialogs/comp-editor.c:876
-#: calendar/gui/dialogs/comp-editor.c:928 composer/e-msg-composer.c:2342
-#: composer/e-msg-composer.c:3471
+#: ../calendar/gui/dialogs/comp-editor.c:903
+#: ../calendar/gui/dialogs/comp-editor.c:955 ../composer/e-msg-composer.c:2342
+#: ../composer/e-msg-composer.c:3487
 msgid "Show _Attachment Bar (drop attachments here)"
 msgstr "Show _Attachment Bar (drop attachments here)"
 
-#: calendar/gui/dialogs/comp-editor.c:952 composer/e-msg-composer.c:3493
+#: ../calendar/gui/dialogs/comp-editor.c:979 ../composer/e-msg-composer.c:3509
 msgid "Attachment Button: Press space key to toggle attachment bar"
 msgstr "Attachment Button: Press space key to toggle attachment bar"
 
-#: calendar/gui/dialogs/comp-editor.c:1499
-#: calendar/gui/dialogs/comp-editor.c:1542
+#: ../calendar/gui/dialogs/comp-editor.c:1526
+#: ../calendar/gui/dialogs/comp-editor.c:1569
 msgid "Edit Appointment"
 msgstr "Edit Appointment"
 
-#: calendar/gui/dialogs/comp-editor.c:1505
-#: calendar/gui/dialogs/comp-editor.c:1548
+#: ../calendar/gui/dialogs/comp-editor.c:1532
+#: ../calendar/gui/dialogs/comp-editor.c:1575
 #, c-format
 msgid "Meeting - %s"
 msgstr "Meeting - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:1507
-#: calendar/gui/dialogs/comp-editor.c:1550
+#: ../calendar/gui/dialogs/comp-editor.c:1534
+#: ../calendar/gui/dialogs/comp-editor.c:1577
 #, c-format
 msgid "Appointment - %s"
 msgstr "Appointment - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:1511
-#: calendar/gui/dialogs/comp-editor.c:1554
+#: ../calendar/gui/dialogs/comp-editor.c:1538
+#: ../calendar/gui/dialogs/comp-editor.c:1581
 #, c-format
 msgid "Assigned Task - %s"
 msgstr "Assigned Task - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:1513
-#: calendar/gui/dialogs/comp-editor.c:1556
+#: ../calendar/gui/dialogs/comp-editor.c:1540
+#: ../calendar/gui/dialogs/comp-editor.c:1583
 #, c-format
 msgid "Task - %s"
 msgstr "Task - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:1516
-#: calendar/gui/dialogs/comp-editor.c:1559
+#: ../calendar/gui/dialogs/comp-editor.c:1543
+#: ../calendar/gui/dialogs/comp-editor.c:1586
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Journal entry - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:1527
-#: calendar/gui/dialogs/comp-editor.c:1569
+#: ../calendar/gui/dialogs/comp-editor.c:1554
+#: ../calendar/gui/dialogs/comp-editor.c:1596
 msgid "No summary"
 msgstr "No summary"
 
-#: calendar/gui/dialogs/comp-editor.c:2001
-#: calendar/gui/dialogs/comp-editor.c:2034
-#: calendar/gui/dialogs/comp-editor.c:2058
+#: ../calendar/gui/dialogs/comp-editor.c:2033
+#: ../calendar/gui/dialogs/comp-editor.c:2066
+#: ../calendar/gui/dialogs/comp-editor.c:2090
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr "Changes made to this item may be discarded if an update arrives"
 
-#: calendar/gui/dialogs/comp-editor.c:2082
+#: ../calendar/gui/dialogs/comp-editor.c:2114
 msgid "Unable to use current version!"
 msgstr "Unable to use current version!"
 
-#: calendar/gui/dialogs/copy-source-dialog.c:61
+#: ../calendar/gui/dialogs/copy-source-dialog.c:61
 msgid "Could not open source"
 msgstr "Could not open source"
 
-#: calendar/gui/dialogs/copy-source-dialog.c:69
+#: ../calendar/gui/dialogs/copy-source-dialog.c:69
 msgid "Could not open destination"
 msgstr "Could not open destination"
 
-#: calendar/gui/dialogs/copy-source-dialog.c:78
+#: ../calendar/gui/dialogs/copy-source-dialog.c:78
 msgid "Destination is read only"
 msgstr "Destination is read only"
 
-#: calendar/gui/dialogs/delete-error.c:54
+#: ../calendar/gui/dialogs/delete-error.c:54
 msgid "The event could not be deleted due to a corba error"
 msgstr "The event could not be deleted due to a corba error"
 
-#: calendar/gui/dialogs/delete-error.c:57
+#: ../calendar/gui/dialogs/delete-error.c:57
 msgid "The task could not be deleted due to a corba error"
 msgstr "The task could not be deleted due to a corba error"
 
-#: calendar/gui/dialogs/delete-error.c:60
+#: ../calendar/gui/dialogs/delete-error.c:60
 msgid "The journal entry could not be deleted due to a corba error"
 msgstr "The journal entry could not be deleted due to a corba error"
 
-#: calendar/gui/dialogs/delete-error.c:63
+#: ../calendar/gui/dialogs/delete-error.c:63
 msgid "The item could not be deleted due to a corba error"
 msgstr "The item could not be deleted due to a corba error"
 
-#: calendar/gui/dialogs/delete-error.c:70
+#: ../calendar/gui/dialogs/delete-error.c:70
 msgid "The event could not be deleted because permission was denied"
 msgstr "The event could not be deleted because permission was denied"
 
-#: calendar/gui/dialogs/delete-error.c:73
+#: ../calendar/gui/dialogs/delete-error.c:73
 msgid "The task could not be deleted because permission was denied"
 msgstr "The task could not be deleted because permission was denied"
 
-#: calendar/gui/dialogs/delete-error.c:76
+#: ../calendar/gui/dialogs/delete-error.c:76
 msgid "The journal entry could not be deleted because permission was denied"
 msgstr "The journal entry could not be deleted because permission was denied"
 
-#: calendar/gui/dialogs/delete-error.c:79
+#: ../calendar/gui/dialogs/delete-error.c:79
 msgid "The item could not be deleted because permission was denied"
 msgstr "The item could not be deleted because permission was denied"
 
-#: calendar/gui/dialogs/delete-error.c:86
+#: ../calendar/gui/dialogs/delete-error.c:86
 msgid "The event could not be deleted due to an error"
 msgstr "The event could not be deleted due to an error"
 
-#: calendar/gui/dialogs/delete-error.c:89
+#: ../calendar/gui/dialogs/delete-error.c:89
 msgid "The task could not be deleted due to an error"
 msgstr "The task could not be deleted due to an error"
 
-#: calendar/gui/dialogs/delete-error.c:92
+#: ../calendar/gui/dialogs/delete-error.c:92
 msgid "The journal entry could not be deleted due to an error"
 msgstr "The journal entry could not be deleted due to an error"
 
-#: calendar/gui/dialogs/delete-error.c:95
+#: ../calendar/gui/dialogs/delete-error.c:95
 msgid "The item could not be deleted due to an error"
 msgstr "The item could not be deleted due to an error"
 
-#: calendar/gui/dialogs/e-delegate-dialog.glade.h:1
+#: ../calendar/gui/dialogs/e-delegate-dialog.glade.h:1
 msgid "Contacts..."
 msgstr "Contacts..."
 
-#: calendar/gui/dialogs/e-delegate-dialog.glade.h:2
+#: ../calendar/gui/dialogs/e-delegate-dialog.glade.h:2
 msgid "Delegate To:"
 msgstr "Delegate To:"
 
-#: calendar/gui/dialogs/e-delegate-dialog.glade.h:3
+#: ../calendar/gui/dialogs/e-delegate-dialog.glade.h:3
 msgid "Enter Delegate"
 msgstr "Enter Delegate"
 
-#: calendar/gui/dialogs/event-editor.c:149
+#: ../calendar/gui/dialogs/event-editor.c:149
 msgid "Recurrence"
 msgstr "Recurrence"
 
-#: calendar/gui/dialogs/event-editor.c:161
-#: calendar/gui/dialogs/event-editor.c:233
-#: calendar/gui/dialogs/event-editor.c:379
+#: ../calendar/gui/dialogs/event-editor.c:161
+#: ../calendar/gui/dialogs/event-editor.c:233
+#: ../calendar/gui/dialogs/event-editor.c:379
 msgid "Scheduling"
 msgstr "Scheduling"
 
-#: calendar/gui/dialogs/event-editor.c:168
-#: calendar/gui/dialogs/event-editor.c:236
-#: calendar/gui/dialogs/event-editor.c:382
+#: ../calendar/gui/dialogs/event-editor.c:168
+#: ../calendar/gui/dialogs/event-editor.c:236
+#: ../calendar/gui/dialogs/event-editor.c:382
 msgid "Invitations"
 msgstr "Invitations"
 
-#: calendar/gui/dialogs/event-page.c:725
+#: ../calendar/gui/dialogs/event-page.c:721
 msgid "Event with no start date"
 msgstr "Event with no start date"
 
-#: calendar/gui/dialogs/event-page.c:728
+#: ../calendar/gui/dialogs/event-page.c:724
 msgid "Event with no end date"
 msgstr "Event with no end date"
 
-#: calendar/gui/dialogs/event-page.c:894 calendar/gui/dialogs/task-page.c:561
+#: ../calendar/gui/dialogs/event-page.c:890
+#: ../calendar/gui/dialogs/task-page.c:557
 msgid "Start date is wrong"
 msgstr "Start date is wrong"
 
-#: calendar/gui/dialogs/event-page.c:904
+#: ../calendar/gui/dialogs/event-page.c:900
 msgid "End date is wrong"
 msgstr "End date is wrong"
 
-#: calendar/gui/dialogs/event-page.c:927
+#: ../calendar/gui/dialogs/event-page.c:923
 msgid "Start time is wrong"
 msgstr "Start time is wrong"
 
-#: calendar/gui/dialogs/event-page.c:934
+#: ../calendar/gui/dialogs/event-page.c:930
 msgid "End time is wrong"
 msgstr "End time is wrong"
 
-#: calendar/gui/dialogs/event-page.c:1675
+#: ../calendar/gui/dialogs/event-page.c:1676
 #, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "Unable to open the calendar '%s'."
 
-#: calendar/gui/dialogs/event-page.c:1881
+#: ../calendar/gui/dialogs/event-page.c:1882
 #, c-format
 msgid "%d day before appointment"
 msgid_plural "%d days before appointment"
 msgstr[0] "%d day before appointment"
 msgstr[1] "%d days before appointment"
 
-#: calendar/gui/dialogs/event-page.c:1889
+#: ../calendar/gui/dialogs/event-page.c:1890
 #, c-format
 msgid "%d hour before appointment"
 msgid_plural "%d hours before appointment"
 msgstr[0] "%d hour before appointment"
 msgstr[1] "%d hours before appointment"
 
-#: calendar/gui/dialogs/event-page.c:1897
+#: ../calendar/gui/dialogs/event-page.c:1898
 #, c-format
 msgid "%d minute before appointement"
 msgid_plural "%d minutes before appointment"
 msgstr[0] "%d minute before appointment"
 msgstr[1] "%d minutes before appointment"
 
-#: calendar/gui/dialogs/event-page.glade.h:2
+#: ../calendar/gui/dialogs/event-page.glade.h:2
 msgid "1 day before appointment"
 msgstr "1 day before appointment"
 
-#: calendar/gui/dialogs/event-page.glade.h:3
+#: ../calendar/gui/dialogs/event-page.glade.h:3
 msgid "1 hour before appointment"
 msgstr "1 hour before appointment"
 
-#: calendar/gui/dialogs/event-page.glade.h:4
+#: ../calendar/gui/dialogs/event-page.glade.h:4
 msgid "15 minutes before appointment"
 msgstr "15 minutes before appointment"
 
-#: calendar/gui/dialogs/event-page.glade.h:5
-#: calendar/gui/dialogs/task-page.glade.h:1
+#: ../calendar/gui/dialogs/event-page.glade.h:5
+#: ../calendar/gui/dialogs/task-page.glade.h:1
 msgid "<b>Basics</b>"
 msgstr "<b>Basics</b>"
 
-#: calendar/gui/dialogs/event-page.glade.h:6
-#: calendar/gui/dialogs/task-page.glade.h:2
+#: ../calendar/gui/dialogs/event-page.glade.h:6
+#: ../calendar/gui/dialogs/task-page.glade.h:2
 msgid "<b>Date and Time</b>"
 msgstr "<b>Date and Time</b>"
 
-#: calendar/gui/dialogs/event-page.glade.h:7
-#: calendar/gui/dialogs/task-page.glade.h:3
+#: ../calendar/gui/dialogs/event-page.glade.h:7
+#: ../calendar/gui/dialogs/task-page.glade.h:3
 msgid "<b>Send Options</b>"
 msgstr "<b>Send Options</b>"
 
-#: calendar/gui/dialogs/event-page.glade.h:8
+#: ../calendar/gui/dialogs/event-page.glade.h:8
 msgid "A_ll day event"
 msgstr "A_ll day event"
 
-#: calendar/gui/dialogs/event-page.glade.h:9
+#: ../calendar/gui/dialogs/event-page.glade.h:9
 msgid "Ad_vanced  send options"
 msgstr "Ad_vanced  send options"
 
-#: calendar/gui/dialogs/event-page.glade.h:10
+#: ../calendar/gui/dialogs/event-page.glade.h:10
 msgid "C_ustomize..."
 msgstr "C_ustomize..."
 
-#: calendar/gui/dialogs/event-page.glade.h:11
-#: calendar/gui/dialogs/task-page.glade.h:5
+#: ../calendar/gui/dialogs/event-page.glade.h:11
+#: ../calendar/gui/dialogs/task-page.glade.h:5
 msgid "Ca_tegories..."
 msgstr "Ca_tegories..."
 
-#: calendar/gui/dialogs/event-page.glade.h:12
+#: ../calendar/gui/dialogs/event-page.glade.h:12
 msgid "Cale_ndar:"
 msgstr "Cale_ndar:"
 
-#: calendar/gui/dialogs/event-page.glade.h:13
-#: calendar/gui/dialogs/task-page.glade.h:7
+#: ../calendar/gui/dialogs/event-page.glade.h:13
+#: ../calendar/gui/dialogs/task-page.glade.h:7
 msgid "Classi_fication:"
 msgstr "Classi_fication:"
 
-#: calendar/gui/dialogs/event-page.glade.h:14
-#: calendar/gui/dialogs/task-page.glade.h:8 calendar/gui/e-cal-list-view.c:255
-#: calendar/gui/e-cal-model.c:305 calendar/gui/e-calendar-table.c:362
+#: ../calendar/gui/dialogs/event-page.glade.h:14
+#: ../calendar/gui/dialogs/task-page.glade.h:8
+#: ../calendar/gui/e-cal-list-view.c:255 ../calendar/gui/e-cal-model.c:305
+#: ../calendar/gui/e-calendar-table.c:362
 msgid "Confidential"
 msgstr "Confidential"
 
-#: calendar/gui/dialogs/event-page.glade.h:15
+#: ../calendar/gui/dialogs/event-page.glade.h:15
 msgid "Event Description"
 msgstr "Event Description"
 
-#: calendar/gui/dialogs/event-page.glade.h:16
+#: ../calendar/gui/dialogs/event-page.glade.h:16
 msgid "Locat_ion:"
 msgstr "Locat_ion:"
 
-#: calendar/gui/dialogs/event-page.glade.h:17
-#: calendar/gui/dialogs/task-page.glade.h:10
-#: calendar/gui/e-cal-list-view.c:254 calendar/gui/e-cal-model.c:303
-#: calendar/gui/e-calendar-table.c:361
+#: ../calendar/gui/dialogs/event-page.glade.h:17
+#: ../calendar/gui/dialogs/task-page.glade.h:10
+#: ../calendar/gui/e-cal-list-view.c:254 ../calendar/gui/e-cal-model.c:303
+#: ../calendar/gui/e-calendar-table.c:361
 msgid "Private"
 msgstr "Private"
 
-#: calendar/gui/dialogs/event-page.glade.h:18
-#: calendar/gui/dialogs/task-page.glade.h:11
-#: calendar/gui/e-cal-list-view.c:253 calendar/gui/e-cal-model.c:294
-#: calendar/gui/e-cal-model.c:301 calendar/gui/e-calendar-table.c:360
+#: ../calendar/gui/dialogs/event-page.glade.h:18
+#: ../calendar/gui/dialogs/task-page.glade.h:11
+#: ../calendar/gui/e-cal-list-view.c:253 ../calendar/gui/e-cal-model.c:294
+#: ../calendar/gui/e-cal-model.c:301 ../calendar/gui/e-calendar-table.c:360
 msgid "Public"
 msgstr "Public"
 
-#: calendar/gui/dialogs/event-page.glade.h:19
+#: ../calendar/gui/dialogs/event-page.glade.h:19
 msgid "Show time as _busy"
 msgstr "Show time as _busy"
 
-#: calendar/gui/dialogs/event-page.glade.h:20
-#: calendar/gui/dialogs/task-page.glade.h:13
+#: ../calendar/gui/dialogs/event-page.glade.h:20
+#: ../calendar/gui/dialogs/task-page.glade.h:13
 msgid "Su_mmary:"
 msgstr "Su_mmary:"
 
-#: calendar/gui/dialogs/event-page.glade.h:21
+#: ../calendar/gui/dialogs/event-page.glade.h:21
 msgid "This appointment has customized alarms"
 msgstr "This appointment has customized alarms"
 
-#: calendar/gui/dialogs/event-page.glade.h:22
+#: ../calendar/gui/dialogs/event-page.glade.h:22
 msgid "_Alarm"
 msgstr "_Alarm"
 
-#: calendar/gui/dialogs/event-page.glade.h:23
+#: ../calendar/gui/dialogs/event-page.glade.h:23
 msgid "_Description:"
 msgstr "_Description:"
 
-#: calendar/gui/dialogs/event-page.glade.h:24
-#: calendar/gui/e-meeting-time-sel.c:642
+#: ../calendar/gui/dialogs/event-page.glade.h:24
+#: ../calendar/gui/e-meeting-time-sel.c:642
 msgid "_End time:"
 msgstr "_End time:"
 
-#: calendar/gui/dialogs/event-page.glade.h:25
-#: calendar/gui/e-meeting-time-sel.c:615
+#: ../calendar/gui/dialogs/event-page.glade.h:25
+#: ../calendar/gui/e-meeting-time-sel.c:615
 msgid "_Start time:"
 msgstr "_Start time:"
 
@@ -5745,605 +5805,615 @@ msgstr "_Start time:"
 #. When "None" is selected we want the field to be cleared.
 #. Note that we don't show this here, since by default a 'None' date
 #. is not permitted.
-#: calendar/gui/dialogs/meeting-page.c:296
-#: calendar/gui/dialogs/meeting-page.glade.h:5
-#: calendar/gui/e-cal-model-tasks.c:652 calendar/gui/e-itip-control.c:1104
-#: composer/e-msg-composer.c:2117 filter/filter-rule.c:878
-#: mail/em-account-editor.c:675 mail/em-account-editor.c:1273
-#: mail/em-account-prefs.c:421 mail/em-folder-view.c:999
-#: plugins/calendar-weather/calendar-weather.c:371
-#: plugins/calendar-weather/calendar-weather.c:425
-#: plugins/itip-formatter/itip-formatter.c:1376
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:190
-#: widgets/misc/e-cell-date-edit.c:248 widgets/misc/e-dateedit.c:458
-#: widgets/misc/e-dateedit.c:1497 widgets/misc/e-dateedit.c:1651
+#: ../calendar/gui/dialogs/meeting-page.c:296
+#: ../calendar/gui/dialogs/meeting-page.glade.h:5
+#: ../calendar/gui/e-cal-model-tasks.c:652
+#: ../calendar/gui/e-itip-control.c:1104 ../composer/e-msg-composer.c:2117
+#: ../filter/filter-rule.c:878 ../mail/em-account-editor.c:683
+#: ../mail/em-account-editor.c:1288 ../mail/em-account-prefs.c:437
+#: ../mail/em-folder-view.c:993
+#: ../plugins/calendar-weather/calendar-weather.c:371
+#: ../plugins/calendar-weather/calendar-weather.c:425
+#: ../plugins/itip-formatter/itip-formatter.c:1390
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:190
+#: ../widgets/misc/e-cell-date-edit.c:248 ../widgets/misc/e-dateedit.c:458
+#: ../widgets/misc/e-dateedit.c:1497 ../widgets/misc/e-dateedit.c:1651
 msgid "None"
 msgstr "None"
 
-#: calendar/gui/dialogs/meeting-page.c:432
+#: ../calendar/gui/dialogs/meeting-page.c:432
 msgid "The organizer selected no longer has an account."
 msgstr "The organizer selected no longer has an account."
 
-#: calendar/gui/dialogs/meeting-page.c:438
+#: ../calendar/gui/dialogs/meeting-page.c:438
 msgid "An organizer is required."
 msgstr "An organizer is required."
 
-#: calendar/gui/dialogs/meeting-page.c:453
+#: ../calendar/gui/dialogs/meeting-page.c:453
 msgid "At least one attendee is required."
 msgstr "At least one attendee is required."
 
-#: calendar/gui/dialogs/meeting-page.c:778
+#: ../calendar/gui/dialogs/meeting-page.c:778
 msgid "_Delegate To..."
 msgstr "_Delegate To..."
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:1
-#: calendar/gui/e-meeting-list-view.c:235
-#: calendar/gui/e-meeting-time-sel.etspec.h:1
+#: ../calendar/gui/dialogs/meeting-page.etspec.h:1
+#: ../calendar/gui/e-meeting-list-view.c:308
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:1
 msgid "Attendee"
 msgstr "Attendee"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:2
-#: calendar/gui/e-meeting-time-sel.etspec.h:2
+#: ../calendar/gui/dialogs/meeting-page.etspec.h:2
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:2
 msgid "Click here to add an attendee"
 msgstr "Click here to add an attendee"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:3
-#: calendar/gui/e-meeting-time-sel.etspec.h:3
+#: ../calendar/gui/dialogs/meeting-page.etspec.h:3
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:3
 msgid "Common Name"
 msgstr "Common Name"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:4
-#: calendar/gui/e-meeting-time-sel.etspec.h:4
+#: ../calendar/gui/dialogs/meeting-page.etspec.h:4
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:4
 msgid "Delegated From"
 msgstr "Delegated From"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:5
-#: calendar/gui/e-meeting-time-sel.etspec.h:5
+#: ../calendar/gui/dialogs/meeting-page.etspec.h:5
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:5
 msgid "Delegated To"
 msgstr "Delegated To"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:6
-#: calendar/gui/e-meeting-time-sel.etspec.h:6
+#: ../calendar/gui/dialogs/meeting-page.etspec.h:6
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:6
 msgid "Language"
 msgstr "Language"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:7
-#: calendar/gui/e-meeting-time-sel.etspec.h:7
+#: ../calendar/gui/dialogs/meeting-page.etspec.h:7
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:7
 msgid "Member"
 msgstr "Member"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-meeting-list-view.c:258
-#: calendar/gui/e-meeting-time-sel.etspec.h:8
+#: ../calendar/gui/dialogs/meeting-page.etspec.h:8
+#: ../calendar/gui/e-meeting-list-view.c:333
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "RSVP"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:10
-#: calendar/gui/dialogs/task-editor.c:146
-#: calendar/gui/e-calendar-table.etspec.h:10
-#: calendar/gui/e-meeting-list-view.c:265
-#: calendar/gui/e-meeting-time-sel.etspec.h:10 mail/em-filter-i18n.h:63
-#: mail/message-list.etspec.h:12
+#: ../calendar/gui/dialogs/meeting-page.etspec.h:10
+#: ../calendar/gui/dialogs/task-editor.c:146
+#: ../calendar/gui/e-calendar-table.etspec.h:10
+#: ../calendar/gui/e-meeting-list-view.c:340
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:10 ../mail/em-filter-i18n.h:63
+#: ../mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "Status"
 
-#: calendar/gui/dialogs/meeting-page.glade.h:2
+#: ../calendar/gui/dialogs/meeting-page.glade.h:2
 msgid "<b>Att_endees</b>"
 msgstr "<b>Att_endees</b>"
 
-#: calendar/gui/dialogs/meeting-page.glade.h:3
+#: ../calendar/gui/dialogs/meeting-page.glade.h:3
 msgid "C_hange Organizer"
 msgstr "C_hange Organizer"
 
-#: calendar/gui/dialogs/meeting-page.glade.h:4
-#: calendar/gui/e-meeting-time-sel.c:428
+#: ../calendar/gui/dialogs/meeting-page.glade.h:4
+#: ../calendar/gui/e-meeting-time-sel.c:428
 msgid "Con_tacts..."
 msgstr "Con_tacts..."
 
-#: calendar/gui/dialogs/meeting-page.glade.h:6
+#: ../calendar/gui/dialogs/meeting-page.glade.h:6
 msgid "Or_ganizer:"
 msgstr "Or_ganizer:"
 
-#: calendar/gui/dialogs/meeting-page.glade.h:7
+#: ../calendar/gui/dialogs/meeting-page.glade.h:7
 msgid "Organizer"
 msgstr "Organizer"
 
-#: calendar/gui/dialogs/meeting-page.glade.h:8
-#: calendar/gui/e-itip-control.glade.h:9
+#: ../calendar/gui/dialogs/meeting-page.glade.h:8
+#: ../calendar/gui/e-itip-control.glade.h:9
 msgid "Organizer:"
 msgstr "Organizer:"
 
-#: calendar/gui/dialogs/new-calendar.glade.h:2
+#: ../calendar/gui/dialogs/new-calendar.glade.h:2
 msgid "<b>Calendar options</b>"
 msgstr "<b>Calendar options</b>"
 
-#: calendar/gui/dialogs/new-calendar.glade.h:3
+#: ../calendar/gui/dialogs/new-calendar.glade.h:3
 msgid "Add New Calendar"
 msgstr "Add New Calendar"
 
-#: calendar/gui/dialogs/new-calendar.glade.h:4
+#: ../calendar/gui/dialogs/new-calendar.glade.h:4
 msgid "Calendar Group"
 msgstr "Calendar Group"
 
-#: calendar/gui/dialogs/new-calendar.glade.h:5
+#: ../calendar/gui/dialogs/new-calendar.glade.h:5
 msgid "Calendar Location"
 msgstr "Calendar Location"
 
-#: calendar/gui/dialogs/new-calendar.glade.h:6
+#: ../calendar/gui/dialogs/new-calendar.glade.h:6
 msgid "Calendar Name"
 msgstr "Calendar Name"
 
-#: calendar/gui/dialogs/new-task-list.glade.h:2
+#: ../calendar/gui/dialogs/new-task-list.glade.h:2
 msgid "<b>Task List Options</b>"
 msgstr "<b>Task List Options</b>"
 
-#: calendar/gui/dialogs/new-task-list.glade.h:3
+#: ../calendar/gui/dialogs/new-task-list.glade.h:3
 msgid "Add New Task List"
 msgstr "Add New Task List"
 
-#: calendar/gui/dialogs/new-task-list.glade.h:4
+#: ../calendar/gui/dialogs/new-task-list.glade.h:4
 msgid "Task List Group"
 msgstr "Task List Group"
 
-#: calendar/gui/dialogs/new-task-list.glade.h:5
+#: ../calendar/gui/dialogs/new-task-list.glade.h:5
 msgid "Task List Name"
 msgstr "Task List Name"
 
-#: calendar/gui/dialogs/recur-comp.c:51
+#: ../calendar/gui/dialogs/recur-comp.c:52
 msgid "You are modifying a recurring event, what would you like to modify?"
 msgstr "You are modifying a recurring event, what would you like to modify?"
 
-#: calendar/gui/dialogs/recur-comp.c:55
+#: ../calendar/gui/dialogs/recur-comp.c:56
 msgid "You are modifying a recurring task, what would you like to modify?"
 msgstr "You are modifying a recurring task, what would you like to modify?"
 
-#: calendar/gui/dialogs/recur-comp.c:59
+#: ../calendar/gui/dialogs/recur-comp.c:60
 msgid ""
 "You are modifying a recurring journal entry, what would you like to modify?"
 msgstr ""
 "You are modifying a recurring journal entry, what would you like to modify?"
 
-#: calendar/gui/dialogs/recur-comp.c:87
+#: ../calendar/gui/dialogs/recur-comp.c:88
 msgid "This Instance Only"
 msgstr "This Instance Only"
 
-#: calendar/gui/dialogs/recur-comp.c:91
+#: ../calendar/gui/dialogs/recur-comp.c:92
 msgid "This and Prior Instances"
 msgstr "This and Prior Instances"
 
-#: calendar/gui/dialogs/recur-comp.c:97
+#: ../calendar/gui/dialogs/recur-comp.c:98
 msgid "This and Future Instances"
 msgstr "This and Future Instances"
 
-#: calendar/gui/dialogs/recur-comp.c:102
+#: ../calendar/gui/dialogs/recur-comp.c:103
 msgid "All Instances"
 msgstr "All Instances"
 
-#: calendar/gui/dialogs/recurrence-page.c:493
+#: ../calendar/gui/dialogs/recurrence-page.c:493
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr "This appointment contains recurrences that Evolution cannot edit."
 
-#: calendar/gui/dialogs/recurrence-page.c:812
+#: ../calendar/gui/dialogs/recurrence-page.c:812
 msgid "Recurrence date is invalid"
 msgstr "Recurrence date is invalid"
 
-#: calendar/gui/dialogs/recurrence-page.c:923
+#: ../calendar/gui/dialogs/recurrence-page.c:923
 msgid "on"
 msgstr "on"
 
-#: calendar/gui/dialogs/recurrence-page.c:984
+#: ../calendar/gui/dialogs/recurrence-page.c:984
 msgid "first"
 msgstr "first"
 
-#: calendar/gui/dialogs/recurrence-page.c:985
+#: ../calendar/gui/dialogs/recurrence-page.c:985
 msgid "second"
 msgstr "second"
 
-#: calendar/gui/dialogs/recurrence-page.c:986
+#: ../calendar/gui/dialogs/recurrence-page.c:986
 msgid "third"
 msgstr "third"
 
-#: calendar/gui/dialogs/recurrence-page.c:987
+#: ../calendar/gui/dialogs/recurrence-page.c:987
 msgid "fourth"
 msgstr "fourth"
 
-#: calendar/gui/dialogs/recurrence-page.c:988
+#: ../calendar/gui/dialogs/recurrence-page.c:988
 msgid "last"
 msgstr "last"
 
-#: calendar/gui/dialogs/recurrence-page.c:1011
+#: ../calendar/gui/dialogs/recurrence-page.c:1011
 msgid "Other Date"
 msgstr "Other Date"
 
-#: calendar/gui/dialogs/recurrence-page.c:1039
+#: ../calendar/gui/dialogs/recurrence-page.c:1039
 msgid "day"
 msgstr "day"
 
-#: calendar/gui/dialogs/recurrence-page.c:1176
+#: ../calendar/gui/dialogs/recurrence-page.c:1176
 msgid "on the"
 msgstr "on the"
 
-#: calendar/gui/dialogs/recurrence-page.c:1362
+#: ../calendar/gui/dialogs/recurrence-page.c:1362
 msgid "occurrences"
 msgstr "occurrences"
 
-#: calendar/gui/dialogs/recurrence-page.c:2315
+#: ../calendar/gui/dialogs/recurrence-page.c:2315
 msgid "Date/Time"
 msgstr "Date/Time"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:1
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:1
 msgid "<b>Exceptions</b>"
 msgstr "<b>Exceptions</b>"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:2 mail/mail-config.glade.h:3
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:2
+#: ../mail/mail-config.glade.h:3
 msgid "<b>Preview</b>"
 msgstr "<b>Preview</b>"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:3
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:3
 msgid "<b>Recurrence</b>"
 msgstr "<b>Recurrence</b>"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:4
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:4
 msgid "Every"
 msgstr "Every"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:5
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:5
 msgid "This appointment rec_urs"
 msgstr "This appointment rec_urs"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:8
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:8
 msgid "for"
 msgstr "for"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:9
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:9
 msgid "forever"
 msgstr "forever"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:10
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:10
 msgid "month(s)"
 msgstr "month(s)"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:11
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:11
 msgid "until"
 msgstr "until"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:12
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:12
 msgid "week(s)"
 msgstr "week(s)"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:13
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:13
 msgid "year(s)"
 msgstr "year(s)"
 
-#: calendar/gui/dialogs/task-details-page.c:410
-#: calendar/gui/dialogs/task-details-page.c:429
+#: ../calendar/gui/dialogs/task-details-page.c:410
+#: ../calendar/gui/dialogs/task-details-page.c:429
 msgid "Completed date is wrong"
 msgstr "Completed date is wrong"
 
-#: calendar/gui/dialogs/task-details-page.c:522
+#: ../calendar/gui/dialogs/task-details-page.c:522
 msgid "Web Page"
 msgstr "Web Page"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:1
+#: ../calendar/gui/dialogs/task-details-page.glade.h:1
 msgid "<span weight=\"bold\">Miscellaneous</span>"
 msgstr "<span weight=\"bold\">Miscellaneous</span>"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:2
+#: ../calendar/gui/dialogs/task-details-page.glade.h:2
 msgid "<span weight=\"bold\">Status</span>"
 msgstr "<span weight=\"bold\">Status</span>"
 
 #. Pass TRUE as is_utc, so it gets converted to the current
 #. timezone.
-#: calendar/gui/dialogs/task-details-page.glade.h:4
-#: calendar/gui/e-cal-component-preview.c:229
-#: calendar/gui/e-cal-model-tasks.c:345 calendar/gui/e-cal-model-tasks.c:658
-#: calendar/gui/e-calendar-table.c:457 calendar/gui/e-itip-control.c:896
-#: calendar/gui/e-meeting-store.c:196 calendar/gui/e-meeting-store.c:219
-#: calendar/gui/print.c:2349
+#: ../calendar/gui/dialogs/task-details-page.glade.h:4
+#: ../calendar/gui/e-cal-component-preview.c:229
+#: ../calendar/gui/e-cal-model-tasks.c:345
+#: ../calendar/gui/e-cal-model-tasks.c:658
+#: ../calendar/gui/e-calendar-table.c:457 ../calendar/gui/e-itip-control.c:896
+#: ../calendar/gui/e-meeting-store.c:196 ../calendar/gui/e-meeting-store.c:219
+#: ../calendar/gui/print.c:2349
 msgid "Completed"
 msgstr "Completed"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:5
-#: calendar/gui/e-cal-component-preview.c:248
-#: calendar/gui/e-calendar-table.c:382 mail/message-list.c:1011
+#: ../calendar/gui/dialogs/task-details-page.glade.h:5
+#: ../calendar/gui/e-cal-component-preview.c:248
+#: ../calendar/gui/e-calendar-table.c:382 ../mail/message-list.c:1007
 msgid "High"
 msgstr "High"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:6
-#: calendar/gui/e-cal-component-preview.c:226
-#: calendar/gui/e-cal-model-tasks.c:343 calendar/gui/e-cal-model-tasks.c:656
-#: calendar/gui/e-cal-model-tasks.c:731 calendar/gui/e-calendar-table.c:456
-#: calendar/gui/print.c:2346
+#: ../calendar/gui/dialogs/task-details-page.glade.h:6
+#: ../calendar/gui/e-cal-component-preview.c:226
+#: ../calendar/gui/e-cal-model-tasks.c:343
+#: ../calendar/gui/e-cal-model-tasks.c:656
+#: ../calendar/gui/e-cal-model-tasks.c:731
+#: ../calendar/gui/e-calendar-table.c:456 ../calendar/gui/print.c:2346
 msgid "In Progress"
 msgstr "In Progress"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:7
-#: calendar/gui/e-cal-component-preview.c:252
-#: calendar/gui/e-calendar-table.c:384 mail/message-list.c:1009
+#: ../calendar/gui/dialogs/task-details-page.glade.h:7
+#: ../calendar/gui/e-cal-component-preview.c:252
+#: ../calendar/gui/e-calendar-table.c:384 ../mail/message-list.c:1005
 msgid "Low"
 msgstr "Low"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-cal-component-preview.c:250 calendar/gui/e-cal-model.c:899
-#: calendar/gui/e-calendar-table.c:383 mail/message-list.c:1010
+#: ../calendar/gui/dialogs/task-details-page.glade.h:8
+#: ../calendar/gui/e-cal-component-preview.c:250
+#: ../calendar/gui/e-cal-model.c:899 ../calendar/gui/e-calendar-table.c:383
+#: ../mail/message-list.c:1006
 msgid "Normal"
 msgstr "Normal"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:9
-#: calendar/gui/e-cal-component-preview.c:236
-#: calendar/gui/e-cal-model-tasks.c:341 calendar/gui/e-cal-model-tasks.c:654
-#: calendar/gui/e-calendar-table.c:455 calendar/gui/print.c:2343
+#: ../calendar/gui/dialogs/task-details-page.glade.h:9
+#: ../calendar/gui/e-cal-component-preview.c:236
+#: ../calendar/gui/e-cal-model-tasks.c:341
+#: ../calendar/gui/e-cal-model-tasks.c:654
+#: ../calendar/gui/e-calendar-table.c:455 ../calendar/gui/print.c:2343
 msgid "Not Started"
 msgstr "Not Started"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:10
+#: ../calendar/gui/dialogs/task-details-page.glade.h:10
 msgid "P_ercent complete:"
 msgstr "P_ercent complete:"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:11
-#: calendar/gui/e-calendar-table.c:385
+#: ../calendar/gui/dialogs/task-details-page.glade.h:11
+#: ../calendar/gui/e-calendar-table.c:385
 msgid "Undefined"
 msgstr "Undefined"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:12
+#: ../calendar/gui/dialogs/task-details-page.glade.h:12
 msgid "_Date completed:"
 msgstr "_Date completed:"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:13
-#: widgets/misc/e-send-options.glade.h:34
+#: ../calendar/gui/dialogs/task-details-page.glade.h:13
+#: ../widgets/misc/e-send-options.glade.h:34
 msgid "_Priority:"
 msgstr "_Priority:"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:14
+#: ../calendar/gui/dialogs/task-details-page.glade.h:14
 msgid "_Status:"
 msgstr "_Status:"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:15
+#: ../calendar/gui/dialogs/task-details-page.glade.h:15
 msgid "_Web Page:"
 msgstr "_Web Page:"
 
-#: calendar/gui/dialogs/task-editor.c:137 calendar/gui/print.c:2300
+#: ../calendar/gui/dialogs/task-editor.c:137 ../calendar/gui/print.c:2300
 msgid "Task"
 msgstr "Task"
 
-#: calendar/gui/dialogs/task-editor.c:157
-#: calendar/gui/dialogs/task-editor.c:219
-#: calendar/gui/dialogs/task-editor.c:359
+#: ../calendar/gui/dialogs/task-editor.c:157
+#: ../calendar/gui/dialogs/task-editor.c:219
+#: ../calendar/gui/dialogs/task-editor.c:359
 msgid "Assignment"
 msgstr "Assignment"
 
-#: calendar/gui/dialogs/task-page.c:534
+#: ../calendar/gui/dialogs/task-page.c:530
 msgid "Due date is wrong"
 msgstr "Due date is wrong"
 
-#: calendar/gui/dialogs/task-page.c:878
+#: ../calendar/gui/dialogs/task-page.c:874
 #, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "Unable to open tasks in '%s'."
 
-#: calendar/gui/dialogs/task-page.glade.h:4
+#: ../calendar/gui/dialogs/task-page.glade.h:4
 msgid "Ad_vanced send options"
 msgstr "Ad_vanced send options"
 
-#: calendar/gui/dialogs/task-page.glade.h:9
+#: ../calendar/gui/dialogs/task-page.glade.h:9
 msgid "D_escription:"
 msgstr "D_escription:"
 
-#: calendar/gui/dialogs/task-page.glade.h:12
+#: ../calendar/gui/dialogs/task-page.glade.h:12
 msgid "Sta_rt date:"
 msgstr "Sta_rt date:"
 
-#: calendar/gui/dialogs/task-page.glade.h:14
+#: ../calendar/gui/dialogs/task-page.glade.h:14
 msgid "Task Description"
 msgstr "Task Description"
 
-#: calendar/gui/dialogs/task-page.glade.h:15
+#: ../calendar/gui/dialogs/task-page.glade.h:15
 msgid "_Due date:"
 msgstr "_Due date:"
 
-#: calendar/gui/dialogs/task-page.glade.h:16
+#: ../calendar/gui/dialogs/task-page.glade.h:16
 msgid "_Group:"
 msgstr "_Group:"
 
-#: calendar/gui/dialogs/url-editor-dialog.glade.h:3
+#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:3
 msgid "<b>Free/Busy C_alendars</b>"
 msgstr "<b>Free/Busy C_alendars</b>"
 
-#: calendar/gui/dialogs/url-editor-dialog.glade.h:4
+#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:4
 msgid "<b>Publishing Frequency</b>"
 msgstr "<b>Publishing Frequency</b>"
 
-#: calendar/gui/dialogs/url-editor-dialog.glade.h:5
+#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:5
 msgid "<b>Publishing _Location</b>"
 msgstr "<b>Publishing _Location</b>"
 
-#: calendar/gui/dialogs/url-editor-dialog.glade.h:6
+#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:6
 msgid "Free/Busy Publishing Settings"
 msgstr "Free/Busy Publishing Settings"
 
-#: calendar/gui/dialogs/url-editor-dialog.glade.h:7
+#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:7
 msgid "_Daily"
 msgstr "_Daily"
 
-#: calendar/gui/dialogs/url-editor-dialog.glade.h:8
+#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:8
 msgid "_Manual"
 msgstr "_Manual"
 
-#: calendar/gui/dialogs/url-editor-dialog.glade.h:9
+#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:9
 msgid "_Password:"
 msgstr "_Password:"
 
-#: calendar/gui/dialogs/url-editor-dialog.glade.h:10
+#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:10
 msgid "_Remember password"
 msgstr "_Remember password"
 
-#: calendar/gui/dialogs/url-editor-dialog.glade.h:11
+#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:11
 msgid "_Username:"
 msgstr "_Username:"
 
-#: calendar/gui/dialogs/url-editor-dialog.glade.h:12
+#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:12
 msgid "_Weekly"
 msgstr "_Weekly"
 
-#: calendar/gui/e-alarm-list.c:395
+#: ../calendar/gui/e-alarm-list.c:395
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] "%d day"
 msgstr[1] "%d days"
 
-#: calendar/gui/e-alarm-list.c:400
+#: ../calendar/gui/e-alarm-list.c:400
 #, c-format
 msgid "%d week"
 msgid_plural "%d weeks"
 msgstr[0] "%d week"
 msgstr[1] "%d weeks"
 
-#: calendar/gui/e-alarm-list.c:405
+#: ../calendar/gui/e-alarm-list.c:405
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d hour"
 msgstr[1] "%d hours"
 
-#: calendar/gui/e-alarm-list.c:410
+#: ../calendar/gui/e-alarm-list.c:410
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d minute"
 msgstr[1] "%d minutes"
 
-#: calendar/gui/e-alarm-list.c:415
+#: ../calendar/gui/e-alarm-list.c:415
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] "%d second"
 msgstr[1] "%d seconds"
 
-#: calendar/gui/e-alarm-list.c:462
+#: ../calendar/gui/e-alarm-list.c:462
 msgid "Unknown action to be performed"
 msgstr "Unknown action to be performed"
 
-#: calendar/gui/e-alarm-list.c:474
+#: ../calendar/gui/e-alarm-list.c:474
 #, c-format
 msgid "%s %s before the start of the appointment"
 msgstr "%s %s before the start of the appointment"
 
-#: calendar/gui/e-alarm-list.c:477
+#: ../calendar/gui/e-alarm-list.c:477
 #, c-format
 msgid "%s %s after the start of the appointment"
 msgstr "%s %s after the start of the appointment"
 
-#: calendar/gui/e-alarm-list.c:482
+#: ../calendar/gui/e-alarm-list.c:482
 #, c-format
 msgid "%s at the start of the appointment"
 msgstr "%s at the start of the appointment"
 
-#: calendar/gui/e-alarm-list.c:491
+#: ../calendar/gui/e-alarm-list.c:491
 #, c-format
 msgid "%s %s before the end of the appointment"
 msgstr "%s %s before the end of the appointment"
 
-#: calendar/gui/e-alarm-list.c:494
+#: ../calendar/gui/e-alarm-list.c:494
 #, c-format
 msgid "%s %s after the end of the appointment"
 msgstr "%s %s after the end of the appointment"
 
-#: calendar/gui/e-alarm-list.c:499
+#: ../calendar/gui/e-alarm-list.c:499
 #, c-format
 msgid "%s at the end of the appointment"
 msgstr "%s at the end of the appointment"
 
-#: calendar/gui/e-alarm-list.c:521
+#: ../calendar/gui/e-alarm-list.c:521
 #, c-format
 msgid "%s at %s"
 msgstr "%s at %s"
 
-#: calendar/gui/e-alarm-list.c:527
+#: ../calendar/gui/e-alarm-list.c:527
 #, c-format
 msgid "%s for an unknown trigger type"
 msgstr "%s for an unknown trigger type"
 
-#: calendar/gui/e-cal-component-preview.c:70 mail/em-folder-view.c:2587
+#: ../calendar/gui/e-cal-component-preview.c:70 ../mail/em-folder-view.c:2573
 #, c-format
 msgid "Click to open %s"
 msgstr "Click to open %s"
 
-#: calendar/gui/e-cal-component-preview.c:155 filter/filter-rule.c:795
+#: ../calendar/gui/e-cal-component-preview.c:155 ../filter/filter-rule.c:795
 msgid "Untitled"
 msgstr "Untitled"
 
-#: calendar/gui/e-cal-component-preview.c:186
-#: calendar/gui/e-itip-control.c:1108 calendar/gui/e-itip-control.glade.h:11
+#: ../calendar/gui/e-cal-component-preview.c:186
+#: ../calendar/gui/e-itip-control.c:1108
+#: ../calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "Summary:"
 
-#: calendar/gui/e-cal-component-preview.c:193
-#: calendar/gui/e-cal-component-preview.c:204
+#: ../calendar/gui/e-cal-component-preview.c:193
+#: ../calendar/gui/e-cal-component-preview.c:204
 msgid "Start Date:"
 msgstr "Start Date:"
 
-#: calendar/gui/e-cal-component-preview.c:215
+#: ../calendar/gui/e-cal-component-preview.c:215
 msgid "Due Date:"
 msgstr "Due Date:"
 
 #. write status
 #. translators: exchange out of office status header
 #. Status
-#: calendar/gui/e-cal-component-preview.c:222
-#: calendar/gui/e-itip-control.c:1132
-#: plugins/exchange-account-setup/exchange-account-setup.c:129
-#: plugins/itip-formatter/itip-view.c:884
+#: ../calendar/gui/e-cal-component-preview.c:222
+#: ../calendar/gui/e-itip-control.c:1132
+#: ../plugins/exchange-account-setup/exchange-account-setup.c:209
+#: ../plugins/itip-formatter/itip-view.c:884
 msgid "Status:"
 msgstr "Status:"
 
-#: calendar/gui/e-cal-component-preview.c:246
+#: ../calendar/gui/e-cal-component-preview.c:246
 msgid "Priority:"
 msgstr "Priority:"
 
-#: calendar/gui/e-cal-component-preview.c:299
+#: ../calendar/gui/e-cal-component-preview.c:299
 msgid "Web Page:"
 msgstr "Web Page:"
 
-#: calendar/gui/e-cal-list-view.etspec.h:2
+#: ../calendar/gui/e-cal-list-view.etspec.h:2
 msgid "End Date"
 msgstr "End Date"
 
-#: calendar/gui/e-cal-list-view.etspec.h:4
+#: ../calendar/gui/e-cal-list-view.etspec.h:4
 msgid "Start Date"
 msgstr "Start Date"
 
-#: calendar/gui/e-cal-list-view.etspec.h:5
-#: calendar/gui/e-calendar-table.etspec.h:11 mail/mail-dialogs.glade.h:21
+#: ../calendar/gui/e-cal-list-view.etspec.h:5
+#: ../calendar/gui/e-calendar-table.etspec.h:11
+#: ../mail/mail-dialogs.glade.h:17
 msgid "Summary"
 msgstr "Summary"
 
-#: calendar/gui/e-cal-model-calendar.c:179 calendar/gui/e-calendar-table.c:434
+#: ../calendar/gui/e-cal-model-calendar.c:179
+#: ../calendar/gui/e-calendar-table.c:434
 msgid "Free"
 msgstr "Free"
 
-#: calendar/gui/e-cal-model-calendar.c:182 calendar/gui/e-calendar-table.c:435
-#: calendar/gui/e-meeting-time-sel.c:412
+#: ../calendar/gui/e-cal-model-calendar.c:182
+#: ../calendar/gui/e-calendar-table.c:435
+#: ../calendar/gui/e-meeting-time-sel.c:412
 msgid "Busy"
 msgstr "Busy"
 
-#: calendar/gui/e-cal-model-tasks.c:297
+#: ../calendar/gui/e-cal-model-tasks.c:297
 msgid "N"
 msgstr "N"
 
-#: calendar/gui/e-cal-model-tasks.c:297
+#: ../calendar/gui/e-cal-model-tasks.c:297
 msgid "S"
 msgstr "S"
 
-#: calendar/gui/e-cal-model-tasks.c:299 smime/lib/e-cert.c:681
+#: ../calendar/gui/e-cal-model-tasks.c:299 ../smime/lib/e-cert.c:681
 msgid "E"
 msgstr "E"
 
-#: calendar/gui/e-cal-model-tasks.c:299
+#: ../calendar/gui/e-cal-model-tasks.c:299
 msgid "W"
 msgstr "W"
 
-#: calendar/gui/e-cal-model-tasks.c:606
+#: ../calendar/gui/e-cal-model-tasks.c:606
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -6353,259 +6423,268 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: calendar/gui/e-cal-model-tasks.c:1017 calendar/gui/e-cal-model.c:905
-#: calendar/gui/e-meeting-list-view.c:163 calendar/gui/e-meeting-store.c:168
-#: calendar/gui/e-meeting-store.c:178 calendar/gui/e-meeting-store.c:808
+#: ../calendar/gui/e-cal-model-tasks.c:1017 ../calendar/gui/e-cal-model.c:905
+#: ../calendar/gui/e-meeting-list-view.c:163
+#: ../calendar/gui/e-meeting-store.c:168 ../calendar/gui/e-meeting-store.c:178
+#: ../calendar/gui/e-meeting-store.c:808
 msgid "Yes"
 msgstr "Yes"
 
-#: calendar/gui/e-cal-model-tasks.c:1017 calendar/gui/e-cal-model.c:905
-#: calendar/gui/e-meeting-list-view.c:164 calendar/gui/e-meeting-store.c:180
+#: ../calendar/gui/e-cal-model-tasks.c:1017 ../calendar/gui/e-cal-model.c:905
+#: ../calendar/gui/e-meeting-list-view.c:164
+#: ../calendar/gui/e-meeting-store.c:180
 msgid "No"
 msgstr "No"
 
 #. This is the default filename used for temporary file creation
-#: calendar/gui/e-cal-model.c:307 calendar/gui/e-cal-model.c:310
-#: calendar/gui/e-itip-control.c:1149 calendar/gui/e-itip-control.c:1290
-#: calendar/gui/e-meeting-list-view.c:139
-#: calendar/gui/e-meeting-list-view.c:153 calendar/gui/e-meeting-store.c:124
-#: calendar/gui/e-meeting-store.c:159 calendar/gui/e-meeting-store.c:224
-#: mail/em-utils.c:1157 plugins/itip-formatter/itip-formatter.c:251
-#: plugins/itip-formatter/itip-formatter.c:1398
-#: plugins/plugin-manager/plugin-manager.c:72 shell/e-component-registry.c:201
-#: shell/e-component-registry.c:205 widgets/misc/e-charset-picker.c:62
+#: ../calendar/gui/e-cal-model.c:307 ../calendar/gui/e-cal-model.c:310
+#: ../calendar/gui/e-itip-control.c:1149 ../calendar/gui/e-itip-control.c:1290
+#: ../calendar/gui/e-meeting-list-view.c:139
+#: ../calendar/gui/e-meeting-list-view.c:153
+#: ../calendar/gui/e-meeting-store.c:124 ../calendar/gui/e-meeting-store.c:159
+#: ../calendar/gui/e-meeting-store.c:224 ../mail/em-utils.c:1175
+#: ../plugins/itip-formatter/itip-formatter.c:251
+#: ../plugins/itip-formatter/itip-formatter.c:1412
+#: ../plugins/plugin-manager/plugin-manager.c:72
+#: ../shell/e-component-registry.c:201 ../shell/e-component-registry.c:205
+#: ../widgets/misc/e-charset-picker.c:62
 msgid "Unknown"
 msgstr "Unknown"
 
-#: calendar/gui/e-cal-model.c:901
+#: ../calendar/gui/e-cal-model.c:901
 msgid "Recurring"
 msgstr "Recurring"
 
-#: calendar/gui/e-cal-model.c:903
+#: ../calendar/gui/e-cal-model.c:903
 msgid "Assigned"
 msgstr "Assigned"
 
-#: calendar/gui/e-calendar-table.c:404
+#: ../calendar/gui/e-calendar-table.c:404
 msgid "0%"
 msgstr "0%"
 
-#: calendar/gui/e-calendar-table.c:405
+#: ../calendar/gui/e-calendar-table.c:405
 msgid "10%"
 msgstr "10%"
 
-#: calendar/gui/e-calendar-table.c:406
+#: ../calendar/gui/e-calendar-table.c:406
 msgid "20%"
 msgstr "20%"
 
-#: calendar/gui/e-calendar-table.c:407
+#: ../calendar/gui/e-calendar-table.c:407
 msgid "30%"
 msgstr "30%"
 
-#: calendar/gui/e-calendar-table.c:408
+#: ../calendar/gui/e-calendar-table.c:408
 msgid "40%"
 msgstr "40%"
 
-#: calendar/gui/e-calendar-table.c:409
+#: ../calendar/gui/e-calendar-table.c:409
 msgid "50%"
 msgstr "50%"
 
-#: calendar/gui/e-calendar-table.c:410
+#: ../calendar/gui/e-calendar-table.c:410
 msgid "60%"
 msgstr "60%"
 
-#: calendar/gui/e-calendar-table.c:411
+#: ../calendar/gui/e-calendar-table.c:411
 msgid "70%"
 msgstr "70%"
 
-#: calendar/gui/e-calendar-table.c:412
+#: ../calendar/gui/e-calendar-table.c:412
 msgid "80%"
 msgstr "80%"
 
-#: calendar/gui/e-calendar-table.c:413
+#: ../calendar/gui/e-calendar-table.c:413
 msgid "90%"
 msgstr "90%"
 
-#: calendar/gui/e-calendar-table.c:414
+#: ../calendar/gui/e-calendar-table.c:414
 msgid "100%"
 msgstr "100%"
 
-#: calendar/gui/e-calendar-table.c:516
+#: ../calendar/gui/e-calendar-table.c:516
 msgid "Task Table"
 msgstr "Task Table"
 
-#: calendar/gui/e-calendar-table.c:694 calendar/gui/e-calendar-view.c:652
+#: ../calendar/gui/e-calendar-table.c:694
+#: ../calendar/gui/e-calendar-view.c:652
 msgid "Deleting selected objects"
 msgstr "Deleting selected objects"
 
-#: calendar/gui/e-calendar-table.c:873 calendar/gui/e-calendar-view.c:756
+#: ../calendar/gui/e-calendar-table.c:873
+#: ../calendar/gui/e-calendar-view.c:756
 msgid "Updating objects"
 msgstr "Updating objects"
 
-#: calendar/gui/e-calendar-table.c:1014 calendar/gui/e-calendar-view.c:1064
-#: composer/e-msg-composer.c:1241
+#: ../calendar/gui/e-calendar-table.c:1014
+#: ../calendar/gui/e-calendar-view.c:1064 ../composer/e-msg-composer.c:1241
 msgid "Save as..."
 msgstr "Save as..."
 
-#: calendar/gui/e-calendar-table.c:1156 calendar/gui/e-calendar-view.c:1395
-#: ui/evolution-addressbook.xml.h:37
+#: ../calendar/gui/e-calendar-table.c:1156
+#: ../calendar/gui/e-calendar-view.c:1395 ../ui/evolution-addressbook.xml.h:37
 msgid "_Open"
 msgstr "_Open"
 
-#: calendar/gui/e-calendar-table.c:1157
+#: ../calendar/gui/e-calendar-table.c:1157
 msgid "Open _Web Page"
 msgstr "Open _Web Page"
 
-#: calendar/gui/e-calendar-table.c:1158 calendar/gui/e-calendar-view.c:1396
-#: mail/em-folder-view.c:982 mail/em-popup.c:493
-#: ui/evolution-mail-message.xml.h:124
+#: ../calendar/gui/e-calendar-table.c:1158
+#: ../calendar/gui/e-calendar-view.c:1396 ../mail/em-folder-view.c:976
+#: ../mail/em-popup.c:494 ../ui/evolution-mail-message.xml.h:124
 msgid "_Save As..."
 msgstr "_Save As..."
 
-#: calendar/gui/e-calendar-table.c:1159 calendar/gui/e-calendar-view.c:1376
-#: calendar/gui/e-calendar-view.c:1397 ui/evolution-addressbook.xml.h:40
-#: ui/evolution-calendar.xml.h:44 ui/evolution-mail-message.xml.h:121
-#: ui/evolution-tasks.xml.h:25
+#: ../calendar/gui/e-calendar-table.c:1159
+#: ../calendar/gui/e-calendar-view.c:1376
+#: ../calendar/gui/e-calendar-view.c:1397 ../ui/evolution-addressbook.xml.h:40
+#: ../ui/evolution-calendar.xml.h:44 ../ui/evolution-mail-message.xml.h:121
+#: ../ui/evolution-tasks.xml.h:25
 msgid "_Print..."
 msgstr "_Print..."
 
-#: calendar/gui/e-calendar-table.c:1163 calendar/gui/e-calendar-view.c:1401
-#: ui/evolution-addressbook.xml.h:1 ui/evolution-calendar.xml.h:1
-#: ui/evolution-tasks.xml.h:1
+#: ../calendar/gui/e-calendar-table.c:1163
+#: ../calendar/gui/e-calendar-view.c:1401 ../ui/evolution-addressbook.xml.h:1
+#: ../ui/evolution-calendar.xml.h:1 ../ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "C_ut"
 
-#: calendar/gui/e-calendar-table.c:1165 calendar/gui/e-calendar-view.c:1379
-#: calendar/gui/e-calendar-view.c:1403 ui/evolution-addressbook.xml.h:38
-#: ui/evolution-calendar.xml.h:43 ui/evolution-composer-entries.xml.h:9
-#: ui/evolution-mail-message.xml.h:119 ui/evolution-tasks.xml.h:24
+#: ../calendar/gui/e-calendar-table.c:1165
+#: ../calendar/gui/e-calendar-view.c:1379
+#: ../calendar/gui/e-calendar-view.c:1403 ../ui/evolution-addressbook.xml.h:38
+#: ../ui/evolution-calendar.xml.h:43 ../ui/evolution-composer-entries.xml.h:9
+#: ../ui/evolution-mail-message.xml.h:119 ../ui/evolution-tasks.xml.h:24
 msgid "_Paste"
 msgstr "_Paste"
 
-#: calendar/gui/e-calendar-table.c:1169
+#: ../calendar/gui/e-calendar-table.c:1169
 msgid "_Assign Task"
 msgstr "_Assign Task"
 
-#: calendar/gui/e-calendar-table.c:1170
+#: ../calendar/gui/e-calendar-table.c:1170
 msgid "_Forward as iCalendar"
 msgstr "_Forward as iCalendar"
 
-#: calendar/gui/e-calendar-table.c:1171
+#: ../calendar/gui/e-calendar-table.c:1171
 msgid "_Mark as Complete"
 msgstr "_Mark as Complete"
 
-#: calendar/gui/e-calendar-table.c:1172
+#: ../calendar/gui/e-calendar-table.c:1172
 msgid "_Mark Selected Tasks as Complete"
 msgstr "_Mark Selected Tasks as Complete"
 
 #. FIXME: need to disable for undeletable folders
-#: calendar/gui/e-calendar-table.c:1176 calendar/gui/e-calendar-view.c:1414
-#: mail/em-folder-tree.c:2814 mail/em-folder-view.c:986
-#: ui/evolution-addressbook.xml.h:33 ui/evolution-calendar.xml.h:40
-#: ui/evolution-mail-message.xml.h:108 ui/evolution-tasks.xml.h:21
+#: ../calendar/gui/e-calendar-table.c:1176
+#: ../calendar/gui/e-calendar-view.c:1414 ../mail/em-folder-tree.c:2815
+#: ../mail/em-folder-view.c:980 ../ui/evolution-addressbook.xml.h:33
+#: ../ui/evolution-calendar.xml.h:40 ../ui/evolution-mail-message.xml.h:108
+#: ../ui/evolution-tasks.xml.h:21
 msgid "_Delete"
 msgstr "_Delete"
 
-#: calendar/gui/e-calendar-table.c:1177
+#: ../calendar/gui/e-calendar-table.c:1177
 msgid "_Delete Selected Tasks"
 msgstr "_Delete Selected Tasks"
 
-#: calendar/gui/e-calendar-table.c:1328
-#: calendar/gui/e-calendar-table.etspec.h:4
+#: ../calendar/gui/e-calendar-table.c:1328
+#: ../calendar/gui/e-calendar-table.etspec.h:4
 msgid "Click to add a task"
 msgstr "Click to add a task"
 
-#: calendar/gui/e-calendar-table.etspec.h:2
+#: ../calendar/gui/e-calendar-table.etspec.h:2
 #, no-c-format
 msgid "% Complete"
 msgstr "% Complete"
 
-#: calendar/gui/e-calendar-table.etspec.h:5 mail/mail-send-recv.c:617
+#: ../calendar/gui/e-calendar-table.etspec.h:5 ../mail/mail-send-recv.c:617
 msgid "Complete"
 msgstr "Complete"
 
-#: calendar/gui/e-calendar-table.etspec.h:6
+#: ../calendar/gui/e-calendar-table.etspec.h:6
 msgid "Completion date"
 msgstr "Completion date"
 
-#: calendar/gui/e-calendar-table.etspec.h:7
+#: ../calendar/gui/e-calendar-table.etspec.h:7
 msgid "Due date"
 msgstr "Due date"
 
-#: calendar/gui/e-calendar-table.etspec.h:8
+#: ../calendar/gui/e-calendar-table.etspec.h:8
 msgid "Priority"
 msgstr "Priority"
 
-#: calendar/gui/e-calendar-table.etspec.h:9
+#: ../calendar/gui/e-calendar-table.etspec.h:9
 msgid "Start date"
 msgstr "Start date"
 
-#: calendar/gui/e-calendar-table.etspec.h:12
+#: ../calendar/gui/e-calendar-table.etspec.h:12
 msgid "Task sort"
 msgstr "Task sort"
 
-#: calendar/gui/e-calendar-view.c:1185
+#: ../calendar/gui/e-calendar-view.c:1185
 msgid "Moving items"
 msgstr "Moving items"
 
-#: calendar/gui/e-calendar-view.c:1187
+#: ../calendar/gui/e-calendar-view.c:1187
 msgid "Copying items"
 msgstr "Copying items"
 
-#: calendar/gui/e-calendar-view.c:1370
+#: ../calendar/gui/e-calendar-view.c:1370
 msgid "New _Appointment..."
 msgstr "New _Appointment..."
 
-#: calendar/gui/e-calendar-view.c:1371
+#: ../calendar/gui/e-calendar-view.c:1371
 msgid "New All Day _Event"
 msgstr "New All Day _Event"
 
-#: calendar/gui/e-calendar-view.c:1373
+#: ../calendar/gui/e-calendar-view.c:1373
 msgid "New Task"
 msgstr "New Task"
 
 #. FIXME: hook in this somehow
-#: calendar/gui/e-calendar-view.c:1383
+#: ../calendar/gui/e-calendar-view.c:1383
 msgid "Current View"
 msgstr "Current View"
 
-#: calendar/gui/e-calendar-view.c:1385 ui/evolution-calendar.xml.h:26
+#: ../calendar/gui/e-calendar-view.c:1385 ../ui/evolution-calendar.xml.h:26
 msgid "Select _Today"
 msgstr "Select _Today"
 
-#: calendar/gui/e-calendar-view.c:1386
+#: ../calendar/gui/e-calendar-view.c:1386
 msgid "_Select Date..."
 msgstr "_Select Date..."
 
 #. TODO: Why is this in a context menu when it applies globally?
-#: calendar/gui/e-calendar-view.c:1391 ui/evolution-calendar.xml.h:45
+#: ../calendar/gui/e-calendar-view.c:1391 ../ui/evolution-calendar.xml.h:45
 msgid "_Publish Free/Busy Information"
 msgstr "_Publish Free/Busy Information"
 
-#: calendar/gui/e-calendar-view.c:1407
+#: ../calendar/gui/e-calendar-view.c:1407
 msgid "Cop_y to Calendar..."
 msgstr "Cop_y to Calendar..."
 
-#: calendar/gui/e-calendar-view.c:1408
+#: ../calendar/gui/e-calendar-view.c:1408
 msgid "Mo_ve to Calendar..."
 msgstr "Mo_ve to Calendar..."
 
-#: calendar/gui/e-calendar-view.c:1409
+#: ../calendar/gui/e-calendar-view.c:1409
 msgid "_Schedule Meeting..."
 msgstr "_Schedule Meeting..."
 
-#: calendar/gui/e-calendar-view.c:1410
+#: ../calendar/gui/e-calendar-view.c:1410
 msgid "_Forward as iCalendar..."
 msgstr "_Forward as iCalendar..."
 
-#: calendar/gui/e-calendar-view.c:1415
+#: ../calendar/gui/e-calendar-view.c:1415
 msgid "Make this Occurrence _Movable"
 msgstr "Make this Occurrence _Movable"
 
-#: calendar/gui/e-calendar-view.c:1416
+#: ../calendar/gui/e-calendar-view.c:1416
 msgid "Delete this _Occurrence"
 msgstr "Delete this _Occurrence"
 
-#: calendar/gui/e-calendar-view.c:1417
+#: ../calendar/gui/e-calendar-view.c:1417
 msgid "Delete _All Occurrences"
 msgstr "Delete _All Occurrences"
 
@@ -6614,8 +6693,8 @@ msgstr "Delete _All Occurrences"
 #. in 24-hour format.
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format.
-#: calendar/gui/e-cell-date-edit-text.c:115 e-util/e-time-utils.c:180
-#: e-util/e-time-utils.c:393
+#: ../calendar/gui/e-cell-date-edit-text.c:115 ../e-util/e-time-utils.c:180
+#: ../e-util/e-time-utils.c:393
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%a %d/%m/%Y %H:%M:%S"
 
@@ -6624,12 +6703,12 @@ msgstr "%a %d/%m/%Y %H:%M:%S"
 #. in 12-hour format.
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format.
-#: calendar/gui/e-cell-date-edit-text.c:118 e-util/e-time-utils.c:175
-#: e-util/e-time-utils.c:402
+#: ../calendar/gui/e-cell-date-edit-text.c:118 ../e-util/e-time-utils.c:175
+#: ../e-util/e-time-utils.c:402
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %d/%m/%Y %I:%M:%S %p"
 
-#: calendar/gui/e-cell-date-edit-text.c:123
+#: ../calendar/gui/e-cell-date-edit-text.c:123
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -6640,7 +6719,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: calendar/gui/e-day-view-time-item.c:527
+#: ../calendar/gui/e-day-view-time-item.c:527
 #, c-format
 msgid "%02i minute divisions"
 msgstr "%02i minute divisions"
@@ -6651,119 +6730,119 @@ msgstr "%02i minute divisions"
 #. month, %B = full month name. You can change the
 #. order but don't change the specifiers or add
 #. anything.
-#: calendar/gui/e-day-view-top-item.c:715 calendar/gui/e-day-view.c:1494
-#: calendar/gui/e-week-view-main-item.c:312 calendar/gui/print.c:1517
+#: ../calendar/gui/e-day-view-top-item.c:715 ../calendar/gui/e-day-view.c:1494
+#: ../calendar/gui/e-week-view-main-item.c:312 ../calendar/gui/print.c:1517
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
 #. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:748 calendar/gui/e-week-view.c:512
-#: calendar/gui/print.c:841
+#: ../calendar/gui/e-day-view.c:748 ../calendar/gui/e-week-view.c:512
+#: ../calendar/gui/print.c:841
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:751 calendar/gui/e-week-view.c:515
-#: calendar/gui/print.c:843
+#: ../calendar/gui/e-day-view.c:751 ../calendar/gui/e-week-view.c:515
+#: ../calendar/gui/print.c:843
 msgid "pm"
 msgstr "pm"
 
-#: calendar/gui/e-itip-control.c:761
+#: ../calendar/gui/e-itip-control.c:761
 msgid "Yes. (Complex Recurrence)"
 msgstr "Yes. (Complex Recurrence)"
 
-#: calendar/gui/e-itip-control.c:772
+#: ../calendar/gui/e-itip-control.c:772
 #, c-format
 msgid "Every day"
 msgid_plural "Every %d days"
 msgstr[0] "Every day"
 msgstr[1] "Every day"
 
-#: calendar/gui/e-itip-control.c:777
+#: ../calendar/gui/e-itip-control.c:777
 #, c-format
 msgid "Every week"
 msgid_plural "Every %d weeks"
 msgstr[0] "Every week"
 msgstr[1] "Every week"
 
-#: calendar/gui/e-itip-control.c:779
+#: ../calendar/gui/e-itip-control.c:779
 #, c-format
 msgid "Every week on "
 msgid_plural "Every %d weeks on "
 msgstr[0] "Every week on "
 msgstr[1] "Every week on "
 
-#: calendar/gui/e-itip-control.c:787
+#: ../calendar/gui/e-itip-control.c:787
 msgid " and "
 msgstr " and "
 
-#: calendar/gui/e-itip-control.c:794
+#: ../calendar/gui/e-itip-control.c:794
 #, c-format
 msgid "The %s day of "
 msgstr "The %s day of "
 
-#: calendar/gui/e-itip-control.c:807
+#: ../calendar/gui/e-itip-control.c:807
 #, c-format
 msgid "The %s %s of "
 msgstr "The %s %s of "
 
-#: calendar/gui/e-itip-control.c:814
+#: ../calendar/gui/e-itip-control.c:814
 #, c-format
 msgid "every month"
 msgid_plural "every %d months"
 msgstr[0] "every month"
 msgstr[1] "every month"
 
-#: calendar/gui/e-itip-control.c:818
+#: ../calendar/gui/e-itip-control.c:818
 #, c-format
 msgid "Every year"
 msgid_plural "Every %d years"
 msgstr[0] "Every year"
 msgstr[1] "Every year"
 
-#: calendar/gui/e-itip-control.c:829
+#: ../calendar/gui/e-itip-control.c:829
 #, c-format
 msgid "a total of %d time"
 msgid_plural " a total of %d times"
 msgstr[0] "a total of %d time"
 msgstr[1] " a total of %d times"
 
-#: calendar/gui/e-itip-control.c:838
+#: ../calendar/gui/e-itip-control.c:838
 msgid ", ending on "
 msgstr ", ending on "
 
-#: calendar/gui/e-itip-control.c:862
+#: ../calendar/gui/e-itip-control.c:862
 msgid "Starts"
 msgstr "Starts"
 
-#: calendar/gui/e-itip-control.c:875
+#: ../calendar/gui/e-itip-control.c:875
 msgid "Ends"
 msgstr "Ends"
 
-#: calendar/gui/e-itip-control.c:909
+#: ../calendar/gui/e-itip-control.c:909
 msgid "Due"
 msgstr "Due"
 
-#: calendar/gui/e-itip-control.c:949 calendar/gui/e-itip-control.c:1006
+#: ../calendar/gui/e-itip-control.c:949 ../calendar/gui/e-itip-control.c:1006
 msgid "iCalendar Information"
 msgstr "iCalendar Information"
 
 #. Title
-#: calendar/gui/e-itip-control.c:966
+#: ../calendar/gui/e-itip-control.c:966
 msgid "iCalendar Error"
 msgstr "iCalendar Error"
 
-#: calendar/gui/e-itip-control.c:1038 calendar/gui/e-itip-control.c:1054
-#: calendar/gui/e-itip-control.c:1065 calendar/gui/e-itip-control.c:1082
-#: plugins/itip-formatter/itip-view.c:329
-#: plugins/itip-formatter/itip-view.c:330
-#: plugins/itip-formatter/itip-view.c:397
-#: plugins/itip-formatter/itip-view.c:398
+#: ../calendar/gui/e-itip-control.c:1038 ../calendar/gui/e-itip-control.c:1054
+#: ../calendar/gui/e-itip-control.c:1065 ../calendar/gui/e-itip-control.c:1082
+#: ../plugins/itip-formatter/itip-view.c:329
+#: ../plugins/itip-formatter/itip-view.c:330
+#: ../plugins/itip-formatter/itip-view.c:397
+#: ../plugins/itip-formatter/itip-view.c:398
 msgid "An unknown person"
 msgstr "An unknown person"
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:1089
+#: ../calendar/gui/e-itip-control.c:1089
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
@@ -6771,25 +6850,28 @@ msgstr ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
 
-#: calendar/gui/e-itip-control.c:1137 calendar/gui/e-meeting-list-view.c:175
-#: calendar/gui/e-meeting-store.c:188 calendar/gui/e-meeting-store.c:211
-#: calendar/gui/itip-utils.c:422 plugins/itip-formatter/itip-formatter.c:1389
+#: ../calendar/gui/e-itip-control.c:1137
+#: ../calendar/gui/e-meeting-list-view.c:175
+#: ../calendar/gui/e-meeting-store.c:188 ../calendar/gui/e-meeting-store.c:211
+#: ../calendar/gui/itip-utils.c:421
+#: ../plugins/itip-formatter/itip-formatter.c:1403
 msgid "Accepted"
 msgstr "Accepted"
 
-#: calendar/gui/e-itip-control.c:1141 calendar/gui/itip-utils.c:425
-#: plugins/itip-formatter/itip-formatter.c:1392
+#: ../calendar/gui/e-itip-control.c:1141 ../calendar/gui/itip-utils.c:424
+#: ../plugins/itip-formatter/itip-formatter.c:1406
 msgid "Tentatively Accepted"
 msgstr "Tentatively Accepted"
 
-#: calendar/gui/e-itip-control.c:1145 calendar/gui/e-meeting-list-view.c:176
-#: calendar/gui/e-meeting-store.c:190 calendar/gui/e-meeting-store.c:213
-#: calendar/gui/itip-utils.c:428 calendar/gui/itip-utils.c:454
-#: plugins/itip-formatter/itip-formatter.c:1395
+#: ../calendar/gui/e-itip-control.c:1145
+#: ../calendar/gui/e-meeting-list-view.c:176
+#: ../calendar/gui/e-meeting-store.c:190 ../calendar/gui/e-meeting-store.c:213
+#: ../calendar/gui/itip-utils.c:427 ../calendar/gui/itip-utils.c:453
+#: ../plugins/itip-formatter/itip-formatter.c:1409
 msgid "Declined"
 msgstr "Declined"
 
-#: calendar/gui/e-itip-control.c:1229
+#: ../calendar/gui/e-itip-control.c:1229
 msgid ""
 "The meeting has been cancelled, however it could not be found in your "
 "calendars"
@@ -6797,386 +6879,390 @@ msgstr ""
 "The meeting has been cancelled. However, it could not be found in your "
 "calendars"
 
-#: calendar/gui/e-itip-control.c:1231
+#: ../calendar/gui/e-itip-control.c:1231
 msgid ""
 "The task has been cancelled, however it could not be found in your task lists"
 msgstr ""
 "The task has been cancelled. However, it could not be found in your task "
 "lists"
 
-#: calendar/gui/e-itip-control.c:1310
+#: ../calendar/gui/e-itip-control.c:1310
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "<b>%s</b> has published meeting information."
 
-#: calendar/gui/e-itip-control.c:1311
+#: ../calendar/gui/e-itip-control.c:1311
 msgid "Meeting Information"
 msgstr "Meeting Information"
 
-#: calendar/gui/e-itip-control.c:1317
+#: ../calendar/gui/e-itip-control.c:1317
 #, c-format
 msgid "<b>%s</b> requests the presence of %s at a meeting."
 msgstr "<b>%s</b> requests the presence of %s at a meeting."
 
-#: calendar/gui/e-itip-control.c:1319
+#: ../calendar/gui/e-itip-control.c:1319
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr "<b>%s</b> requests your presence at a meeting."
 
-#: calendar/gui/e-itip-control.c:1320
+#: ../calendar/gui/e-itip-control.c:1320
 msgid "Meeting Proposal"
 msgstr "Meeting Proposal"
 
 #. FIXME Whats going on here?
-#: calendar/gui/e-itip-control.c:1326
+#: ../calendar/gui/e-itip-control.c:1326
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr "<b>%s</b> wishes to add to an existing meeting."
 
-#: calendar/gui/e-itip-control.c:1327
+#: ../calendar/gui/e-itip-control.c:1327
 msgid "Meeting Update"
 msgstr "Meeting Update"
 
-#: calendar/gui/e-itip-control.c:1331
+#: ../calendar/gui/e-itip-control.c:1331
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr "<b>%s</b> wishes to receive the latest meeting information."
 
-#: calendar/gui/e-itip-control.c:1332
+#: ../calendar/gui/e-itip-control.c:1332
 msgid "Meeting Update Request"
 msgstr "Meeting Update Request"
 
-#: calendar/gui/e-itip-control.c:1339
+#: ../calendar/gui/e-itip-control.c:1339
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr "<b>%s</b> has replied to a meeting request."
 
-#: calendar/gui/e-itip-control.c:1340
+#: ../calendar/gui/e-itip-control.c:1340
 msgid "Meeting Reply"
 msgstr "Meeting Reply"
 
-#: calendar/gui/e-itip-control.c:1347
+#: ../calendar/gui/e-itip-control.c:1347
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr "<b>%s</b> has cancelled a meeting."
 
-#: calendar/gui/e-itip-control.c:1348
+#: ../calendar/gui/e-itip-control.c:1348
 msgid "Meeting Cancellation"
 msgstr "Meeting Cancelation"
 
-#: calendar/gui/e-itip-control.c:1358 calendar/gui/e-itip-control.c:1435
-#: calendar/gui/e-itip-control.c:1475
+#: ../calendar/gui/e-itip-control.c:1358 ../calendar/gui/e-itip-control.c:1435
+#: ../calendar/gui/e-itip-control.c:1475
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr "<b>%s</b> has sent an unintelligible message."
 
-#: calendar/gui/e-itip-control.c:1359
+#: ../calendar/gui/e-itip-control.c:1359
 msgid "Bad Meeting Message"
 msgstr "Bad Meeting Message"
 
-#: calendar/gui/e-itip-control.c:1386
+#: ../calendar/gui/e-itip-control.c:1386
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr "<b>%s</b> has published task information."
 
-#: calendar/gui/e-itip-control.c:1387
+#: ../calendar/gui/e-itip-control.c:1387
 msgid "Task Information"
 msgstr "Task Information"
 
-#: calendar/gui/e-itip-control.c:1394
+#: ../calendar/gui/e-itip-control.c:1394
 #, c-format
 msgid "<b>%s</b> requests %s to perform a task."
 msgstr "<b>%s</b> requests %s to perform a task."
 
-#: calendar/gui/e-itip-control.c:1396
+#: ../calendar/gui/e-itip-control.c:1396
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr "<b>%s</b> requests you perform a task."
 
-#: calendar/gui/e-itip-control.c:1397
+#: ../calendar/gui/e-itip-control.c:1397
 msgid "Task Proposal"
 msgstr "Task Proposal"
 
 #. FIXME Whats going on here?
-#: calendar/gui/e-itip-control.c:1403
+#: ../calendar/gui/e-itip-control.c:1403
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task."
 msgstr "<b>%s</b> wishes to add to an existing task."
 
-#: calendar/gui/e-itip-control.c:1404
+#: ../calendar/gui/e-itip-control.c:1404
 msgid "Task Update"
 msgstr "Task Update"
 
-#: calendar/gui/e-itip-control.c:1408
+#: ../calendar/gui/e-itip-control.c:1408
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr "<b>%s</b> wishes to receive the latest task information."
 
-#: calendar/gui/e-itip-control.c:1409
+#: ../calendar/gui/e-itip-control.c:1409
 msgid "Task Update Request"
 msgstr "Task Update Request"
 
-#: calendar/gui/e-itip-control.c:1416
+#: ../calendar/gui/e-itip-control.c:1416
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr "<b>%s</b> has replied to a task assignment."
 
-#: calendar/gui/e-itip-control.c:1417
+#: ../calendar/gui/e-itip-control.c:1417
 msgid "Task Reply"
 msgstr "Task Reply"
 
-#: calendar/gui/e-itip-control.c:1424
+#: ../calendar/gui/e-itip-control.c:1424
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr "<b>%s</b> has cancelled a task."
 
-#: calendar/gui/e-itip-control.c:1425
+#: ../calendar/gui/e-itip-control.c:1425
 msgid "Task Cancellation"
 msgstr "Task Cancelation"
 
-#: calendar/gui/e-itip-control.c:1436
+#: ../calendar/gui/e-itip-control.c:1436
 msgid "Bad Task Message"
 msgstr "Bad Task Message"
 
-#: calendar/gui/e-itip-control.c:1460
+#: ../calendar/gui/e-itip-control.c:1460
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr "<b>%s</b> has published free/busy information."
 
-#: calendar/gui/e-itip-control.c:1461
+#: ../calendar/gui/e-itip-control.c:1461
 msgid "Free/Busy Information"
 msgstr "Free/Busy Information"
 
-#: calendar/gui/e-itip-control.c:1465
+#: ../calendar/gui/e-itip-control.c:1465
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr "<b>%s</b> requests your free/busy information."
 
-#: calendar/gui/e-itip-control.c:1466
+#: ../calendar/gui/e-itip-control.c:1466
 msgid "Free/Busy Request"
 msgstr "Free/Busy Request"
 
-#: calendar/gui/e-itip-control.c:1470
+#: ../calendar/gui/e-itip-control.c:1470
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr "<b>%s</b> has replied to a free/busy request."
 
-#: calendar/gui/e-itip-control.c:1471
+#: ../calendar/gui/e-itip-control.c:1471
 msgid "Free/Busy Reply"
 msgstr "Free/Busy Reply"
 
-#: calendar/gui/e-itip-control.c:1476
+#: ../calendar/gui/e-itip-control.c:1476
 msgid "Bad Free/Busy Message"
 msgstr "Bad Free/Busy Message"
 
-#: calendar/gui/e-itip-control.c:1551
+#: ../calendar/gui/e-itip-control.c:1551
 msgid "The message does not appear to be properly formed"
 msgstr "The message does not appear to be properly formed"
 
-#: calendar/gui/e-itip-control.c:1610
+#: ../calendar/gui/e-itip-control.c:1610
 msgid "The message contains only unsupported requests."
 msgstr "The message contains only unsupported requests."
 
-#: calendar/gui/e-itip-control.c:1643
+#: ../calendar/gui/e-itip-control.c:1643
 msgid "The attachment does not contain a valid calendar message"
 msgstr "The attachment does not contain a valid calendar message"
 
-#: calendar/gui/e-itip-control.c:1675
+#: ../calendar/gui/e-itip-control.c:1675
 msgid "The attachment has no viewable calendar items"
 msgstr "The attachment has no viewable calendar items"
 
-#: calendar/gui/e-itip-control.c:1909
+#: ../calendar/gui/e-itip-control.c:1909
 msgid "Update complete\n"
 msgstr "Update complete\n"
 
-#: calendar/gui/e-itip-control.c:1937
+#: ../calendar/gui/e-itip-control.c:1937
 msgid "Object is invalid and cannot be updated\n"
 msgstr "Object is invalid and cannot be updated\n"
 
-#: calendar/gui/e-itip-control.c:1947
+#: ../calendar/gui/e-itip-control.c:1947
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr "This response is not from a current attendee.  Add as an attendee?"
 
-#: calendar/gui/e-itip-control.c:1959
+#: ../calendar/gui/e-itip-control.c:1959
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr "Attendee status could not be updated because of an invalid status!\n"
 
-#: calendar/gui/e-itip-control.c:1976
+#: ../calendar/gui/e-itip-control.c:1976
 msgid "Attendee status updated\n"
 msgstr "Attendee status updated\n"
 
-#: calendar/gui/e-itip-control.c:1979
-#: plugins/itip-formatter/itip-formatter.c:852
+#: ../calendar/gui/e-itip-control.c:1979
+#: ../plugins/itip-formatter/itip-formatter.c:852
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr "Attendee status can not be updated because the item no longer exists"
 
-#: calendar/gui/e-itip-control.c:2006
+#: ../calendar/gui/e-itip-control.c:2006
 msgid "Removal Complete"
 msgstr "Removal Complete"
 
-#: calendar/gui/e-itip-control.c:2029 calendar/gui/e-itip-control.c:2077
+#: ../calendar/gui/e-itip-control.c:2029 ../calendar/gui/e-itip-control.c:2077
 msgid "Item sent!\n"
 msgstr "Item sent!\n"
 
-#: calendar/gui/e-itip-control.c:2031 calendar/gui/e-itip-control.c:2081
+#: ../calendar/gui/e-itip-control.c:2031 ../calendar/gui/e-itip-control.c:2081
 msgid "The item could not be sent!\n"
 msgstr "The item could not be sent!\n"
 
-#: calendar/gui/e-itip-control.c:2161
+#: ../calendar/gui/e-itip-control.c:2161
 msgid "Choose an action:"
 msgstr "Choose an action:"
 
-#: calendar/gui/e-itip-control.c:2232
+#: ../calendar/gui/e-itip-control.c:2232
 msgid "Update"
 msgstr "Update"
 
-#: calendar/gui/e-itip-control.c:2260
+#: ../calendar/gui/e-itip-control.c:2260
 msgid "Accept"
 msgstr "Accept"
 
-#: calendar/gui/e-itip-control.c:2261
+#: ../calendar/gui/e-itip-control.c:2261
 msgid "Tentatively accept"
 msgstr "Tentatively accept"
 
-#: calendar/gui/e-itip-control.c:2262
+#: ../calendar/gui/e-itip-control.c:2262
 msgid "Decline"
 msgstr "Decline"
 
-#: calendar/gui/e-itip-control.c:2291
+#: ../calendar/gui/e-itip-control.c:2291
 msgid "Send Free/Busy Information"
 msgstr "Send Free/Busy Information"
 
-#: calendar/gui/e-itip-control.c:2319
+#: ../calendar/gui/e-itip-control.c:2319
 msgid "Update respondent status"
 msgstr "Update respondent status"
 
-#: calendar/gui/e-itip-control.c:2347
+#: ../calendar/gui/e-itip-control.c:2347
 msgid "Send Latest Information"
 msgstr "Send Latest Information"
 
-#: calendar/gui/e-itip-control.c:2375 calendar/gui/itip-utils.c:442
-#: mail/mail-send-recv.c:414 mail/mail-send-recv.c:466
-#: ui/evolution-mail-global.xml.h:1
+#: ../calendar/gui/e-itip-control.c:2375 ../calendar/gui/itip-utils.c:441
+#: ../mail/mail-send-recv.c:414 ../mail/mail-send-recv.c:466
+#: ../ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Cancel"
 
-#: calendar/gui/e-itip-control.glade.h:2
+#: ../calendar/gui/e-itip-control.glade.h:2
 #, no-c-format
 msgid "%P %%"
 msgstr "%P %%"
 
-#: calendar/gui/e-itip-control.glade.h:3
+#: ../calendar/gui/e-itip-control.glade.h:3
 msgid "--to--"
 msgstr "--to--"
 
-#: calendar/gui/e-itip-control.glade.h:4
+#: ../calendar/gui/e-itip-control.glade.h:4
 msgid "Calendar Message"
 msgstr "Calendar Message"
 
-#: calendar/gui/e-itip-control.glade.h:5
+#: ../calendar/gui/e-itip-control.glade.h:5
 msgid "Date:"
 msgstr "Date:"
 
-#: calendar/gui/e-itip-control.glade.h:7
+#: ../calendar/gui/e-itip-control.glade.h:7
 msgid "Loading Calendar"
 msgstr "Loading Calendar"
 
-#: calendar/gui/e-itip-control.glade.h:8
+#: ../calendar/gui/e-itip-control.glade.h:8
 msgid "Loading calendar..."
 msgstr "Loading calendar..."
 
-#: calendar/gui/e-itip-control.glade.h:10
+#: ../calendar/gui/e-itip-control.glade.h:10
 msgid "Server Message:"
 msgstr "Server Message:"
 
-#: calendar/gui/e-itip-control.glade.h:12
+#: ../calendar/gui/e-itip-control.glade.h:12
 msgid "date-end"
 msgstr "date-end"
 
-#: calendar/gui/e-itip-control.glade.h:13
+#: ../calendar/gui/e-itip-control.glade.h:13
 msgid "date-start"
 msgstr "date-start"
 
-#: calendar/gui/e-meeting-list-view.c:59
+#: ../calendar/gui/e-meeting-list-view.c:59
 msgid "Chair Persons"
 msgstr "Chair Persons"
 
-#: calendar/gui/e-meeting-list-view.c:60
-#: calendar/gui/e-meeting-list-view.c:124
+#: ../calendar/gui/e-meeting-list-view.c:60
+#: ../calendar/gui/e-meeting-list-view.c:124
 msgid "Required Participants"
 msgstr "Required Participants"
 
-#: calendar/gui/e-meeting-list-view.c:61
+#: ../calendar/gui/e-meeting-list-view.c:61
 msgid "Optional Participants"
 msgstr "Optional Participants"
 
-#: calendar/gui/e-meeting-list-view.c:62
+#: ../calendar/gui/e-meeting-list-view.c:62
 msgid "Resources"
 msgstr "Resources"
 
-#: calendar/gui/e-meeting-list-view.c:135 calendar/gui/e-meeting-store.c:99
-#: calendar/gui/e-meeting-store.c:116 calendar/gui/e-meeting-store.c:802
+#: ../calendar/gui/e-meeting-list-view.c:135
+#: ../calendar/gui/e-meeting-store.c:99 ../calendar/gui/e-meeting-store.c:116
+#: ../calendar/gui/e-meeting-store.c:802
 msgid "Individual"
 msgstr "Individual"
 
-#: calendar/gui/e-meeting-list-view.c:136 calendar/gui/e-meeting-store.c:101
-#: calendar/gui/e-meeting-store.c:118
+#: ../calendar/gui/e-meeting-list-view.c:136
+#: ../calendar/gui/e-meeting-store.c:101 ../calendar/gui/e-meeting-store.c:118
 msgid "Group"
 msgstr "Group"
 
-#: calendar/gui/e-meeting-list-view.c:137 calendar/gui/e-meeting-store.c:103
-#: calendar/gui/e-meeting-store.c:120
+#: ../calendar/gui/e-meeting-list-view.c:137
+#: ../calendar/gui/e-meeting-store.c:103 ../calendar/gui/e-meeting-store.c:120
 msgid "Resource"
 msgstr "Resource"
 
-#: calendar/gui/e-meeting-list-view.c:138 calendar/gui/e-meeting-store.c:105
-#: calendar/gui/e-meeting-store.c:122
+#: ../calendar/gui/e-meeting-list-view.c:138
+#: ../calendar/gui/e-meeting-store.c:105 ../calendar/gui/e-meeting-store.c:122
 msgid "Room"
 msgstr "Room"
 
-#: calendar/gui/e-meeting-list-view.c:149 calendar/gui/e-meeting-store.c:134
-#: calendar/gui/e-meeting-store.c:151
+#: ../calendar/gui/e-meeting-list-view.c:149
+#: ../calendar/gui/e-meeting-store.c:134 ../calendar/gui/e-meeting-store.c:151
 msgid "Chair"
 msgstr "Chair"
 
-#: calendar/gui/e-meeting-list-view.c:150 calendar/gui/e-meeting-store.c:136
-#: calendar/gui/e-meeting-store.c:153 calendar/gui/e-meeting-store.c:805
+#: ../calendar/gui/e-meeting-list-view.c:150
+#: ../calendar/gui/e-meeting-store.c:136 ../calendar/gui/e-meeting-store.c:153
+#: ../calendar/gui/e-meeting-store.c:805
 msgid "Required Participant"
 msgstr "Required Participant"
 
-#: calendar/gui/e-meeting-list-view.c:151 calendar/gui/e-meeting-store.c:138
-#: calendar/gui/e-meeting-store.c:155
+#: ../calendar/gui/e-meeting-list-view.c:151
+#: ../calendar/gui/e-meeting-store.c:138 ../calendar/gui/e-meeting-store.c:155
 msgid "Optional Participant"
 msgstr "Optional Participant"
 
-#: calendar/gui/e-meeting-list-view.c:152 calendar/gui/e-meeting-store.c:140
-#: calendar/gui/e-meeting-store.c:157
+#: ../calendar/gui/e-meeting-list-view.c:152
+#: ../calendar/gui/e-meeting-store.c:140 ../calendar/gui/e-meeting-store.c:157
 msgid "Non-Participant"
 msgstr "Non-Participant"
 
-#: calendar/gui/e-meeting-list-view.c:174 calendar/gui/e-meeting-store.c:186
-#: calendar/gui/e-meeting-store.c:209 calendar/gui/e-meeting-store.c:815
+#: ../calendar/gui/e-meeting-list-view.c:174
+#: ../calendar/gui/e-meeting-store.c:186 ../calendar/gui/e-meeting-store.c:209
+#: ../calendar/gui/e-meeting-store.c:815
 msgid "Needs Action"
 msgstr "Needs Action"
 
-#: calendar/gui/e-meeting-list-view.c:177 calendar/gui/e-meeting-store.c:192
-#: calendar/gui/e-meeting-store.c:215 calendar/gui/e-meeting-time-sel.c:411
+#: ../calendar/gui/e-meeting-list-view.c:177
+#: ../calendar/gui/e-meeting-store.c:192 ../calendar/gui/e-meeting-store.c:215
+#: ../calendar/gui/e-meeting-time-sel.c:411
 msgid "Tentative"
 msgstr "Tentative"
 
-#: calendar/gui/e-meeting-list-view.c:178 calendar/gui/e-meeting-store.c:194
-#: calendar/gui/e-meeting-store.c:217
+#: ../calendar/gui/e-meeting-list-view.c:178
+#: ../calendar/gui/e-meeting-store.c:194 ../calendar/gui/e-meeting-store.c:217
 msgid "Delegated"
 msgstr "Delegated"
 
-#: calendar/gui/e-meeting-store.c:198 calendar/gui/e-meeting-store.c:221
+#: ../calendar/gui/e-meeting-store.c:198 ../calendar/gui/e-meeting-store.c:221
 msgid "In Process"
 msgstr "In Process"
 
 #. This is a strftime() format string %A = full weekday name,
 #. %B = full month name, %d = month day, %Y = full year.
-#: calendar/gui/e-meeting-time-sel-item.c:444
-#: calendar/gui/e-meeting-time-sel.c:2104
+#: ../calendar/gui/e-meeting-time-sel-item.c:444
+#: ../calendar/gui/e-meeting-time-sel.c:2104
 msgid "%A, %B %d, %Y"
 msgstr "%A, %B %d, %Y"
 
@@ -7186,9 +7272,9 @@ msgstr "%A, %B %d, %Y"
 #. %m = month number, %d = month day, %Y = full year.
 #. strptime format of a weekday and a date.
 #. strftime format of a weekday and a date.
-#: calendar/gui/e-meeting-time-sel-item.c:448
-#: calendar/gui/e-meeting-time-sel.c:2137 e-util/e-time-utils.c:203
-#: e-util/e-time-utils.c:296 e-util/e-time-utils.c:384
+#: ../calendar/gui/e-meeting-time-sel-item.c:448
+#: ../calendar/gui/e-meeting-time-sel.c:2137 ../e-util/e-time-utils.c:203
+#: ../e-util/e-time-utils.c:296 ../e-util/e-time-utils.c:384
 msgid "%a %m/%d/%Y"
 msgstr "%a %d/%m/%Y"
 
@@ -7198,69 +7284,69 @@ msgstr "%a %d/%m/%Y"
 #. This is the preferred date format for the locale.
 #. This is a strftime() format for a short date. %m = month,
 #. %d = day of month, %Y = year (all digits).
-#: calendar/gui/e-meeting-time-sel-item.c:452 e-util/e-time-utils.c:238
-#: e-util/e-time-utils.c:299 widgets/misc/e-dateedit.c:1660
+#: ../calendar/gui/e-meeting-time-sel-item.c:452 ../e-util/e-time-utils.c:238
+#: ../e-util/e-time-utils.c:299 ../widgets/misc/e-dateedit.c:1660
 msgid "%m/%d/%Y"
 msgstr "%d/%m/%Y"
 
-#: calendar/gui/e-meeting-time-sel.c:413 designs/OOA/ooa.glade.h:11
+#: ../calendar/gui/e-meeting-time-sel.c:413 ../designs/OOA/ooa.glade.h:11
 msgid "Out of Office"
 msgstr "Out of Office"
 
-#: calendar/gui/e-meeting-time-sel.c:414
+#: ../calendar/gui/e-meeting-time-sel.c:414
 msgid "No Information"
 msgstr "No Information"
 
-#: calendar/gui/e-meeting-time-sel.c:445
+#: ../calendar/gui/e-meeting-time-sel.c:445
 msgid "O_ptions"
 msgstr "O_ptions"
 
-#: calendar/gui/e-meeting-time-sel.c:462
+#: ../calendar/gui/e-meeting-time-sel.c:462
 msgid "Show _only working hours"
 msgstr "Show _only working hours"
 
-#: calendar/gui/e-meeting-time-sel.c:472
+#: ../calendar/gui/e-meeting-time-sel.c:472
 msgid "Show _zoomed out"
 msgstr "Show _zoomed out"
 
-#: calendar/gui/e-meeting-time-sel.c:487
+#: ../calendar/gui/e-meeting-time-sel.c:487
 msgid "_Update free/busy"
 msgstr "_Update free/busy"
 
-#: calendar/gui/e-meeting-time-sel.c:502
+#: ../calendar/gui/e-meeting-time-sel.c:502
 msgid "_<<"
 msgstr "_<<"
 
-#: calendar/gui/e-meeting-time-sel.c:520
+#: ../calendar/gui/e-meeting-time-sel.c:520
 msgid "_Autopick"
 msgstr "_Autopick"
 
-#: calendar/gui/e-meeting-time-sel.c:535
+#: ../calendar/gui/e-meeting-time-sel.c:535
 msgid ">_>"
 msgstr ">_>"
 
-#: calendar/gui/e-meeting-time-sel.c:552
+#: ../calendar/gui/e-meeting-time-sel.c:552
 msgid "_All people and resources"
 msgstr "_All people and resources"
 
-#: calendar/gui/e-meeting-time-sel.c:561
+#: ../calendar/gui/e-meeting-time-sel.c:561
 msgid "All _people and one resource"
 msgstr "All _people and one resource"
 
-#: calendar/gui/e-meeting-time-sel.c:570
+#: ../calendar/gui/e-meeting-time-sel.c:570
 msgid "_Required people"
 msgstr "_Required people"
 
-#: calendar/gui/e-meeting-time-sel.c:579
+#: ../calendar/gui/e-meeting-time-sel.c:579
 msgid "Required people and _one resource"
 msgstr "Required people and _one resource"
 
-#: calendar/gui/e-pub-utils.c:300
+#: ../calendar/gui/e-pub-utils.c:300
 #, c-format
 msgid "Enter the password for %s"
 msgstr "Enter the password for %s"
 
-#: calendar/gui/e-tasks.c:763 calendar/gui/gnome-cal.c:2372
+#: ../calendar/gui/e-tasks.c:763 ../calendar/gui/gnome-cal.c:2372
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -7269,185 +7355,185 @@ msgstr ""
 "Error on %s:\n"
 " %s"
 
-#: calendar/gui/e-tasks.c:811
+#: ../calendar/gui/e-tasks.c:811
 msgid "Loading tasks"
 msgstr "Loading tasks"
 
-#: calendar/gui/e-tasks.c:895
+#: ../calendar/gui/e-tasks.c:895
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Opening tasks at %s"
 
-#: calendar/gui/e-tasks.c:1091
+#: ../calendar/gui/e-tasks.c:1091
 msgid "Completing tasks..."
 msgstr "Completing tasks..."
 
-#: calendar/gui/e-tasks.c:1114
+#: ../calendar/gui/e-tasks.c:1114
 msgid "Deleting selected objects..."
 msgstr "Deleting selected objects..."
 
-#: calendar/gui/e-tasks.c:1141
+#: ../calendar/gui/e-tasks.c:1141
 msgid "Expunging"
 msgstr "Expunging"
 
-#: calendar/gui/e-timezone-entry.c:133
+#: ../calendar/gui/e-timezone-entry.c:133
 msgid "Timezone Button"
 msgstr "Timezone Button"
 
 #. strftime format %d = day of month, %B = full
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: calendar/gui/e-week-view-main-item.c:329 calendar/gui/print.c:1501
+#: ../calendar/gui/e-week-view-main-item.c:329 ../calendar/gui/print.c:1501
 msgid "%d %B"
 msgstr "%d %B"
 
-#: calendar/gui/gnome-cal.c:718
+#: ../calendar/gui/gnome-cal.c:718
 msgid "Updating query"
 msgstr "Updating query"
 
 #. bonobo displays this string so it must be in locale
-#: calendar/gui/gnome-cal.c:2057 widgets/menus/gal-view-menus.c:351
+#: ../calendar/gui/gnome-cal.c:2057 ../widgets/menus/gal-view-menus.c:350
 msgid "Custom View"
 msgstr "Custom View"
 
-#: calendar/gui/gnome-cal.c:2058
+#: ../calendar/gui/gnome-cal.c:2058
 msgid "Save Custom View"
 msgstr "Save Custom View"
 
-#: calendar/gui/gnome-cal.c:2063 widgets/menus/gal-view-menus.c:373
+#: ../calendar/gui/gnome-cal.c:2063 ../widgets/menus/gal-view-menus.c:372
 msgid "Define Views..."
 msgstr "Define Views..."
 
-#: calendar/gui/gnome-cal.c:2222
+#: ../calendar/gui/gnome-cal.c:2222
 #, c-format
 msgid "Loading appointments at %s"
 msgstr "Loading appointments at %s"
 
-#: calendar/gui/gnome-cal.c:2241
+#: ../calendar/gui/gnome-cal.c:2241
 #, c-format
 msgid "Loading tasks at %s"
 msgstr "Loading tasks at %s"
 
-#: calendar/gui/gnome-cal.c:2338
+#: ../calendar/gui/gnome-cal.c:2338
 #, c-format
 msgid "Opening %s"
 msgstr "Opening %s"
 
-#: calendar/gui/gnome-cal.c:3228
+#: ../calendar/gui/gnome-cal.c:3228
 msgid "Purging"
 msgstr "Purging"
 
-#: calendar/gui/goto-dialog.glade.h:1
+#: ../calendar/gui/goto-dialog.glade.h:1
 msgid "April"
 msgstr "April"
 
-#: calendar/gui/goto-dialog.glade.h:2
+#: ../calendar/gui/goto-dialog.glade.h:2
 msgid "August"
 msgstr "August"
 
-#: calendar/gui/goto-dialog.glade.h:3
+#: ../calendar/gui/goto-dialog.glade.h:3
 msgid "December"
 msgstr "December"
 
-#: calendar/gui/goto-dialog.glade.h:4
+#: ../calendar/gui/goto-dialog.glade.h:4
 msgid "February"
 msgstr "February"
 
-#: calendar/gui/goto-dialog.glade.h:5
+#: ../calendar/gui/goto-dialog.glade.h:5
 msgid "January"
 msgstr "January"
 
-#: calendar/gui/goto-dialog.glade.h:6
+#: ../calendar/gui/goto-dialog.glade.h:6
 msgid "July"
 msgstr "July"
 
-#: calendar/gui/goto-dialog.glade.h:7
+#: ../calendar/gui/goto-dialog.glade.h:7
 msgid "June"
 msgstr "June"
 
-#: calendar/gui/goto-dialog.glade.h:8
+#: ../calendar/gui/goto-dialog.glade.h:8
 msgid "March"
 msgstr "March"
 
-#: calendar/gui/goto-dialog.glade.h:9
+#: ../calendar/gui/goto-dialog.glade.h:9
 msgid "May"
 msgstr "May"
 
-#: calendar/gui/goto-dialog.glade.h:10
+#: ../calendar/gui/goto-dialog.glade.h:10
 msgid "November"
 msgstr "November"
 
-#: calendar/gui/goto-dialog.glade.h:11
+#: ../calendar/gui/goto-dialog.glade.h:11
 msgid "October"
 msgstr "October"
 
-#: calendar/gui/goto-dialog.glade.h:12
+#: ../calendar/gui/goto-dialog.glade.h:12
 msgid "Select Date"
 msgstr "Select Date"
 
-#: calendar/gui/goto-dialog.glade.h:13
+#: ../calendar/gui/goto-dialog.glade.h:13
 msgid "September"
 msgstr "September"
 
-#: calendar/gui/goto-dialog.glade.h:14
+#: ../calendar/gui/goto-dialog.glade.h:14
 msgid "_Select Today"
 msgstr "_Select Today"
 
-#: calendar/gui/itip-utils.c:271 calendar/gui/itip-utils.c:319
-#: calendar/gui/itip-utils.c:351
+#: ../calendar/gui/itip-utils.c:270 ../calendar/gui/itip-utils.c:318
+#: ../calendar/gui/itip-utils.c:350
 msgid "An organizer must be set."
 msgstr "An organizer must be set."
 
-#: calendar/gui/itip-utils.c:306
+#: ../calendar/gui/itip-utils.c:305
 msgid "At least one attendee is necessary"
 msgstr "At least one attendee is necessary"
 
-#: calendar/gui/itip-utils.c:394 calendar/gui/itip-utils.c:503
+#: ../calendar/gui/itip-utils.c:393 ../calendar/gui/itip-utils.c:502
 msgid "Event information"
 msgstr "Event information"
 
-#: calendar/gui/itip-utils.c:396 calendar/gui/itip-utils.c:505
+#: ../calendar/gui/itip-utils.c:395 ../calendar/gui/itip-utils.c:504
 msgid "Task information"
 msgstr "Task information"
 
-#: calendar/gui/itip-utils.c:398 calendar/gui/itip-utils.c:507
+#: ../calendar/gui/itip-utils.c:397 ../calendar/gui/itip-utils.c:506
 msgid "Journal information"
 msgstr "Journal information"
 
-#: calendar/gui/itip-utils.c:400 calendar/gui/itip-utils.c:525
+#: ../calendar/gui/itip-utils.c:399 ../calendar/gui/itip-utils.c:524
 msgid "Free/Busy information"
 msgstr "Free/Busy information"
 
-#: calendar/gui/itip-utils.c:402
+#: ../calendar/gui/itip-utils.c:401
 msgid "Calendar information"
 msgstr "Calendar information"
 
-#: calendar/gui/itip-utils.c:438
+#: ../calendar/gui/itip-utils.c:437
 msgid "Updated"
 msgstr "Updated"
 
-#: calendar/gui/itip-utils.c:446
+#: ../calendar/gui/itip-utils.c:445
 msgid "Refresh"
 msgstr "Refresh"
 
-#: calendar/gui/itip-utils.c:450
+#: ../calendar/gui/itip-utils.c:449
 msgid "Counter-proposal"
 msgstr "Counter-proposal"
 
-#: calendar/gui/itip-utils.c:521
+#: ../calendar/gui/itip-utils.c:520
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "Free/Busy information (%s to %s)"
 
-#: calendar/gui/itip-utils.c:531
+#: ../calendar/gui/itip-utils.c:530
 msgid "iCalendar information"
 msgstr "iCalendar information"
 
-#: calendar/gui/itip-utils.c:673
+#: ../calendar/gui/itip-utils.c:672
 msgid "You must be an attendee of the event."
 msgstr "You must be an attendee of the event."
 
-#: calendar/gui/migration.c:151
+#: ../calendar/gui/migration.c:151
 msgid ""
 "The location and hierarchy of the Evolution task folders has changed since "
 "Evolution 1.x.\n"
@@ -7459,7 +7545,7 @@ msgstr ""
 "\n"
 "Please be patient while Evolution migrates your folders..."
 
-#: calendar/gui/migration.c:155
+#: ../calendar/gui/migration.c:155
 msgid ""
 "The location and hierarchy of the Evolution calendar folders has changed "
 "since Evolution 1.x.\n"
@@ -7471,327 +7557,318 @@ msgstr ""
 "\n"
 "Please be patient while Evolution migrates your folders..."
 
-#: calendar/gui/migration.c:388
-msgid "Birthdays & Anniversaries"
-msgstr "Birthdays & Anniversaries"
-
-#. Create the Webcal source group
-#: calendar/gui/migration.c:486 calendar/gui/migration.c:579
-msgid "On The Web"
-msgstr "On The Web"
-
 #. FIXME: set proper domain/code
-#: calendar/gui/migration.c:745 calendar/gui/migration.c:912
+#: ../calendar/gui/migration.c:745 ../calendar/gui/migration.c:912
 msgid "Unable to migrate old settings from evolution/config.xmldb"
 msgstr "Unable to migrate old settings from evolution/config.xmldb"
 
 #. FIXME: domain/code
-#: calendar/gui/migration.c:774
+#: ../calendar/gui/migration.c:774
 #, c-format
 msgid "Unable to migrate calendar `%s'"
 msgstr "Unable to migrate calendar `%s'"
 
 #. FIXME: domain/code
-#: calendar/gui/migration.c:941
+#: ../calendar/gui/migration.c:941
 #, c-format
 msgid "Unable to migrate tasks `%s'"
 msgstr "Unable to migrate tasks `%s'"
 
-#: calendar/gui/print.c:492
+#: ../calendar/gui/print.c:492
 msgid "1st"
 msgstr "1st"
 
-#: calendar/gui/print.c:492
+#: ../calendar/gui/print.c:492
 msgid "2nd"
 msgstr "2nd"
 
-#: calendar/gui/print.c:492
+#: ../calendar/gui/print.c:492
 msgid "3rd"
 msgstr "3rd"
 
-#: calendar/gui/print.c:492
+#: ../calendar/gui/print.c:492
 msgid "4th"
 msgstr "4th"
 
-#: calendar/gui/print.c:492
+#: ../calendar/gui/print.c:492
 msgid "5th"
 msgstr "5th"
 
-#: calendar/gui/print.c:493
+#: ../calendar/gui/print.c:493
 msgid "6th"
 msgstr "6th"
 
-#: calendar/gui/print.c:493
+#: ../calendar/gui/print.c:493
 msgid "7th"
 msgstr "7th"
 
-#: calendar/gui/print.c:493
+#: ../calendar/gui/print.c:493
 msgid "8th"
 msgstr "8th"
 
-#: calendar/gui/print.c:493
+#: ../calendar/gui/print.c:493
 msgid "9th"
 msgstr "9th"
 
-#: calendar/gui/print.c:493
+#: ../calendar/gui/print.c:493
 msgid "10th"
 msgstr "10th"
 
-#: calendar/gui/print.c:494
+#: ../calendar/gui/print.c:494
 msgid "11th"
 msgstr "11th"
 
-#: calendar/gui/print.c:494
+#: ../calendar/gui/print.c:494
 msgid "12th"
 msgstr "12th"
 
-#: calendar/gui/print.c:494
+#: ../calendar/gui/print.c:494
 msgid "13th"
 msgstr "13th"
 
-#: calendar/gui/print.c:494
+#: ../calendar/gui/print.c:494
 msgid "14th"
 msgstr "14th"
 
-#: calendar/gui/print.c:494
+#: ../calendar/gui/print.c:494
 msgid "15th"
 msgstr "15th"
 
-#: calendar/gui/print.c:495
+#: ../calendar/gui/print.c:495
 msgid "16th"
 msgstr "16th"
 
-#: calendar/gui/print.c:495
+#: ../calendar/gui/print.c:495
 msgid "17th"
 msgstr "17th"
 
-#: calendar/gui/print.c:495
+#: ../calendar/gui/print.c:495
 msgid "18th"
 msgstr "18th"
 
-#: calendar/gui/print.c:495
+#: ../calendar/gui/print.c:495
 msgid "19th"
 msgstr "19th"
 
-#: calendar/gui/print.c:495
+#: ../calendar/gui/print.c:495
 msgid "20th"
 msgstr "20th"
 
-#: calendar/gui/print.c:496
+#: ../calendar/gui/print.c:496
 msgid "21st"
 msgstr "21st"
 
-#: calendar/gui/print.c:496
+#: ../calendar/gui/print.c:496
 msgid "22nd"
 msgstr "22nd"
 
-#: calendar/gui/print.c:496
+#: ../calendar/gui/print.c:496
 msgid "23rd"
 msgstr "23rd"
 
-#: calendar/gui/print.c:496
+#: ../calendar/gui/print.c:496
 msgid "24th"
 msgstr "24th"
 
-#: calendar/gui/print.c:496
+#: ../calendar/gui/print.c:496
 msgid "25th"
 msgstr "25th"
 
-#: calendar/gui/print.c:497
+#: ../calendar/gui/print.c:497
 msgid "26th"
 msgstr "26th"
 
-#: calendar/gui/print.c:497
+#: ../calendar/gui/print.c:497
 msgid "27th"
 msgstr "27th"
 
-#: calendar/gui/print.c:497
+#: ../calendar/gui/print.c:497
 msgid "28th"
 msgstr "28th"
 
-#: calendar/gui/print.c:497
+#: ../calendar/gui/print.c:497
 msgid "29th"
 msgstr "29th"
 
-#: calendar/gui/print.c:497
+#: ../calendar/gui/print.c:497
 msgid "30th"
 msgstr "30th"
 
-#: calendar/gui/print.c:498
+#: ../calendar/gui/print.c:498
 msgid "31st"
 msgstr "31st"
 
-#: calendar/gui/print.c:573
+#: ../calendar/gui/print.c:573
 msgid "Su"
 msgstr "Su"
 
-#: calendar/gui/print.c:573
+#: ../calendar/gui/print.c:573
 msgid "Mo"
 msgstr "Mo"
 
-#: calendar/gui/print.c:573
+#: ../calendar/gui/print.c:573
 msgid "Tu"
 msgstr "Tu"
 
-#: calendar/gui/print.c:573
+#: ../calendar/gui/print.c:573
 msgid "We"
 msgstr "We"
 
-#: calendar/gui/print.c:574
+#: ../calendar/gui/print.c:574
 msgid "Th"
 msgstr "Th"
 
-#: calendar/gui/print.c:574
+#: ../calendar/gui/print.c:574
 msgid "Fr"
 msgstr "Fr"
 
-#: calendar/gui/print.c:574
+#: ../calendar/gui/print.c:574
 msgid "Sa"
 msgstr "Sa"
 
 #. Day
-#: calendar/gui/print.c:1917
+#: ../calendar/gui/print.c:1917
 msgid "Selected day (%a %b %d %Y)"
 msgstr "Selected day (%a %b %d %Y)"
 
-#: calendar/gui/print.c:1942 calendar/gui/print.c:1946
+#: ../calendar/gui/print.c:1942 ../calendar/gui/print.c:1946
 msgid "%a %b %d"
 msgstr "%a %b %d"
 
-#: calendar/gui/print.c:1943
+#: ../calendar/gui/print.c:1943
 msgid "%a %d %Y"
 msgstr "%a %d %Y"
 
-#: calendar/gui/print.c:1947 calendar/gui/print.c:1949
-#: calendar/gui/print.c:1950
+#: ../calendar/gui/print.c:1947 ../calendar/gui/print.c:1949
+#: ../calendar/gui/print.c:1950
 msgid "%a %b %d %Y"
 msgstr "%a %b %d %Y"
 
-#: calendar/gui/print.c:1954
+#: ../calendar/gui/print.c:1954
 #, c-format
 msgid "Selected week (%s - %s)"
 msgstr "Selected week (%s - %s)"
 
 #. Month
-#: calendar/gui/print.c:1962
+#: ../calendar/gui/print.c:1962
 msgid "Selected month (%b %Y)"
 msgstr "Selected month (%b %Y)"
 
 #. Year
-#: calendar/gui/print.c:1969
+#: ../calendar/gui/print.c:1969
 msgid "Selected year (%Y)"
 msgstr "Selected year (%Y)"
 
-#: calendar/gui/print.c:2359
+#: ../calendar/gui/print.c:2359
 #, c-format
 msgid "Status: %s"
 msgstr "Status: %s"
 
-#: calendar/gui/print.c:2376
+#: ../calendar/gui/print.c:2376
 #, c-format
 msgid "Priority: %s"
 msgstr "Priority: %s"
 
-#: calendar/gui/print.c:2388
+#: ../calendar/gui/print.c:2388
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "Percent Complete: %i"
 
-#: calendar/gui/print.c:2400
+#: ../calendar/gui/print.c:2400
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: calendar/gui/print.c:2414
+#: ../calendar/gui/print.c:2414
 #, c-format
 msgid "Categories: %s"
 msgstr "Categories: %s"
 
-#: calendar/gui/print.c:2425
+#: ../calendar/gui/print.c:2425
 msgid "Contacts: "
 msgstr "Contacts: "
 
-#: calendar/gui/print.c:2565 calendar/gui/print.c:2653
-#: calendar/gui/print.c:2779 mail/em-format-html-print.c:178
+#: ../calendar/gui/print.c:2565 ../calendar/gui/print.c:2653
+#: ../calendar/gui/print.c:2779 ../mail/em-format-html-print.c:178
 msgid "Print Preview"
 msgstr "Print Preview"
 
-#: calendar/gui/print.c:2600
+#: ../calendar/gui/print.c:2600
 msgid "Print Item"
 msgstr "Print Item"
 
-#: calendar/gui/tasks-component.c:328
+#: ../calendar/gui/tasks-component.c:428
 msgid "New Task List"
 msgstr "New Task List"
 
-#: calendar/gui/tasks-component.c:404
+#: ../calendar/gui/tasks-component.c:504
 #, c-format
 msgid "%d task"
 msgid_plural "%d tasks"
 msgstr[0] "%d task"
 msgstr[1] "%d tasks"
 
-#: calendar/gui/tasks-component.c:406 mail/mail-component.c:523
+#: ../calendar/gui/tasks-component.c:506 ../mail/mail-component.c:544
 #, c-format
 msgid ", %d selected"
 msgid_plural ", %d selected"
 msgstr[0] ", %d selected"
 msgstr[1] ", %d selected"
 
-#: calendar/gui/tasks-component.c:453
+#: ../calendar/gui/tasks-component.c:553
 msgid "Failed upgrading tasks."
 msgstr "Failed upgrading tasks."
 
-#: calendar/gui/tasks-component.c:747
+#: ../calendar/gui/tasks-component.c:847
 #, c-format
 msgid "Unable to open the task list '%s' for creating events and meetings"
 msgstr "Unable to open the task list '%s' for creating events and meetings"
 
-#: calendar/gui/tasks-component.c:762
+#: ../calendar/gui/tasks-component.c:862
 msgid "There is no calendar available for creating tasks"
 msgstr "There is no calendar available for creating tasks"
 
-#: calendar/gui/tasks-component.c:856
+#: ../calendar/gui/tasks-component.c:956
 msgid "Task Source Selector"
 msgstr "Task Source Selector"
 
-#: calendar/gui/tasks-component.c:1039
+#: ../calendar/gui/tasks-component.c:1139
 msgid "New task"
 msgstr "New task"
 
-#: calendar/gui/tasks-component.c:1040
+#: ../calendar/gui/tasks-component.c:1140
 msgid "_Task"
 msgstr "_Task"
 
-#: calendar/gui/tasks-component.c:1041
+#: ../calendar/gui/tasks-component.c:1141
 msgid "Create a new task"
 msgstr "Create a new task"
 
-#: calendar/gui/tasks-component.c:1047
+#: ../calendar/gui/tasks-component.c:1147
 msgid "New assigned task"
 msgstr "New assigned task"
 
-#: calendar/gui/tasks-component.c:1048
+#: ../calendar/gui/tasks-component.c:1148
 msgid "Assigne_d Task"
 msgstr "Assigne_d Task"
 
-#: calendar/gui/tasks-component.c:1049
+#: ../calendar/gui/tasks-component.c:1149
 msgid "Create a new assigned task"
 msgstr "Create a new assigned task"
 
-#: calendar/gui/tasks-component.c:1055
+#: ../calendar/gui/tasks-component.c:1155
 msgid "New task list"
 msgstr "New task list"
 
-#: calendar/gui/tasks-component.c:1056
+#: ../calendar/gui/tasks-component.c:1156
 msgid "Task l_ist"
 msgstr "Task l_ist"
 
-#: calendar/gui/tasks-component.c:1057
+#: ../calendar/gui/tasks-component.c:1157
 msgid "Create a new task list"
 msgstr "Create a new task list"
 
-#: calendar/gui/tasks-control.c:370
+#: ../calendar/gui/tasks-control.c:370
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
 "continue, you will not be able to recover these tasks.\n"
@@ -7803,52 +7880,52 @@ msgstr ""
 "\n"
 "Really erase these tasks?"
 
-#: calendar/gui/tasks-control.c:373
+#: ../calendar/gui/tasks-control.c:373
 msgid "Do not ask me again."
 msgstr "Do not ask me again."
 
-#: calendar/gui/tasks-control.c:408
+#: ../calendar/gui/tasks-control.c:408
 msgid "Print Tasks"
 msgstr "Print Tasks"
 
 #. The first letter of each day of the week starting with Sunday
-#: calendar/gui/weekday-picker.c:319
+#: ../calendar/gui/weekday-picker.c:319
 msgid "SMTWTFS"
 msgstr "SMTWTFS"
 
-#: calendar/importers/GNOME_Evolution_Calendar_Importer.server.in.in.h:1
+#: ../calendar/importers/GNOME_Evolution_Calendar_Importer.server.in.in.h:1
 msgid "Evolution Calendar intelligent importer"
 msgstr "Evolution Calendar intelligent importer"
 
-#: calendar/importers/GNOME_Evolution_Calendar_Importer.server.in.in.h:2
+#: ../calendar/importers/GNOME_Evolution_Calendar_Importer.server.in.in.h:2
 msgid "Evolution iCalendar importer"
 msgstr "Evolution iCalendar importer"
 
-#: calendar/importers/GNOME_Evolution_Calendar_Importer.server.in.in.h:3
+#: ../calendar/importers/GNOME_Evolution_Calendar_Importer.server.in.in.h:3
 msgid "Evolution vCalendar importer"
 msgstr "Evolution vCalendar importer"
 
-#: calendar/importers/GNOME_Evolution_Calendar_Importer.server.in.in.h:4
+#: ../calendar/importers/GNOME_Evolution_Calendar_Importer.server.in.in.h:4
 msgid "iCalendar files (.ics)"
 msgstr "iCalendar files (.ics)"
 
-#: calendar/importers/GNOME_Evolution_Calendar_Importer.server.in.in.h:5
+#: ../calendar/importers/GNOME_Evolution_Calendar_Importer.server.in.in.h:5
 msgid "vCalendar files (.vcf)"
 msgstr "vCalendar files (.vcf)"
 
-#: calendar/importers/icalendar-importer.c:82
+#: ../calendar/importers/icalendar-importer.c:82
 msgid "Appointments and Meetings"
 msgstr "Appointments and Meetings"
 
-#: calendar/importers/icalendar-importer.c:486
+#: ../calendar/importers/icalendar-importer.c:486
 msgid "Reminder!!"
 msgstr "Reminder!!"
 
-#: calendar/importers/icalendar-importer.c:694
+#: ../calendar/importers/icalendar-importer.c:694
 msgid "Calendar Events"
 msgstr "Calendar Events"
 
-#: calendar/importers/icalendar-importer.c:719
+#: ../calendar/importers/icalendar-importer.c:719
 msgid ""
 "Evolution has found Gnome Calendar files.\n"
 "Would you like to import them into Evolution?"
@@ -7861,1539 +7938,1540 @@ msgstr ""
 #. * We only place them here so gettext picks them up for translation.
 #. * Don't include in any C files.
 #.
-#: calendar/zones.h:7
+#: ../calendar/zones.h:7
 msgid "Africa/Abidjan"
 msgstr "Africa/Abidjan"
 
-#: calendar/zones.h:8
+#: ../calendar/zones.h:8
 msgid "Africa/Accra"
 msgstr "Africa/Accra"
 
-#: calendar/zones.h:9
+#: ../calendar/zones.h:9
 msgid "Africa/Addis_Ababa"
 msgstr "Africa/Addis_Ababa"
 
-#: calendar/zones.h:10
+#: ../calendar/zones.h:10
 msgid "Africa/Algiers"
 msgstr "Africa/Algiers"
 
-#: calendar/zones.h:11
+#: ../calendar/zones.h:11
 msgid "Africa/Asmera"
 msgstr "Africa/Asmera"
 
-#: calendar/zones.h:12
+#: ../calendar/zones.h:12
 msgid "Africa/Bamako"
 msgstr "Africa/Bamako"
 
-#: calendar/zones.h:13
+#: ../calendar/zones.h:13
 msgid "Africa/Bangui"
 msgstr "Africa/Bangui"
 
-#: calendar/zones.h:14
+#: ../calendar/zones.h:14
 msgid "Africa/Banjul"
 msgstr "Africa/Banjul"
 
-#: calendar/zones.h:15
+#: ../calendar/zones.h:15
 msgid "Africa/Bissau"
 msgstr "Africa/Bissau"
 
-#: calendar/zones.h:16
+#: ../calendar/zones.h:16
 msgid "Africa/Blantyre"
 msgstr "Africa/Blantyre"
 
-#: calendar/zones.h:17
+#: ../calendar/zones.h:17
 msgid "Africa/Brazzaville"
 msgstr "Africa/Brazzaville"
 
-#: calendar/zones.h:18
+#: ../calendar/zones.h:18
 msgid "Africa/Bujumbura"
 msgstr "Africa/Bujumbura"
 
-#: calendar/zones.h:19
+#: ../calendar/zones.h:19
 msgid "Africa/Cairo"
 msgstr "Africa/Cairo"
 
-#: calendar/zones.h:20
+#: ../calendar/zones.h:20
 msgid "Africa/Casablanca"
 msgstr "Africa/Casablanca"
 
-#: calendar/zones.h:21
+#: ../calendar/zones.h:21
 msgid "Africa/Ceuta"
 msgstr "Africa/Ceuta"
 
-#: calendar/zones.h:22
+#: ../calendar/zones.h:22
 msgid "Africa/Conakry"
 msgstr "Africa/Conakry"
 
-#: calendar/zones.h:23
+#: ../calendar/zones.h:23
 msgid "Africa/Dakar"
 msgstr "Africa/Dakar"
 
-#: calendar/zones.h:24
+#: ../calendar/zones.h:24
 msgid "Africa/Dar_es_Salaam"
 msgstr "Africa/Dar_es_Salaam"
 
-#: calendar/zones.h:25
+#: ../calendar/zones.h:25
 msgid "Africa/Djibouti"
 msgstr "Africa/Djibouti"
 
-#: calendar/zones.h:26
+#: ../calendar/zones.h:26
 msgid "Africa/Douala"
 msgstr "Africa/Douala"
 
-#: calendar/zones.h:27
+#: ../calendar/zones.h:27
 msgid "Africa/El_Aaiun"
 msgstr "Africa/El_Aaiun"
 
-#: calendar/zones.h:28
+#: ../calendar/zones.h:28
 msgid "Africa/Freetown"
 msgstr "Africa/Freetown"
 
-#: calendar/zones.h:29
+#: ../calendar/zones.h:29
 msgid "Africa/Gaborone"
 msgstr "Africa/Gaborone"
 
-#: calendar/zones.h:30
+#: ../calendar/zones.h:30
 msgid "Africa/Harare"
 msgstr "Africa/Harare"
 
-#: calendar/zones.h:31
+#: ../calendar/zones.h:31
 msgid "Africa/Johannesburg"
 msgstr "Africa/Johannesburg"
 
-#: calendar/zones.h:32
+#: ../calendar/zones.h:32
 msgid "Africa/Kampala"
 msgstr "Africa/Kampala"
 
-#: calendar/zones.h:33
+#: ../calendar/zones.h:33
 msgid "Africa/Khartoum"
 msgstr "Africa/Khartoum"
 
-#: calendar/zones.h:34
+#: ../calendar/zones.h:34
 msgid "Africa/Kigali"
 msgstr "Africa/Kigali"
 
-#: calendar/zones.h:35
+#: ../calendar/zones.h:35
 msgid "Africa/Kinshasa"
 msgstr "Africa/Kinshasa"
 
-#: calendar/zones.h:36
+#: ../calendar/zones.h:36
 msgid "Africa/Lagos"
 msgstr "Africa/Lagos"
 
-#: calendar/zones.h:37
+#: ../calendar/zones.h:37
 msgid "Africa/Libreville"
 msgstr "Africa/Libreville"
 
-#: calendar/zones.h:38
+#: ../calendar/zones.h:38
 msgid "Africa/Lome"
 msgstr "Africa/Lome"
 
-#: calendar/zones.h:39
+#: ../calendar/zones.h:39
 msgid "Africa/Luanda"
 msgstr "Africa/Luanda"
 
-#: calendar/zones.h:40
+#: ../calendar/zones.h:40
 msgid "Africa/Lubumbashi"
 msgstr "Africa/Lubumbashi"
 
-#: calendar/zones.h:41
+#: ../calendar/zones.h:41
 msgid "Africa/Lusaka"
 msgstr "Africa/Lusaka"
 
-#: calendar/zones.h:42
+#: ../calendar/zones.h:42
 msgid "Africa/Malabo"
 msgstr "Africa/Malabo"
 
-#: calendar/zones.h:43
+#: ../calendar/zones.h:43
 msgid "Africa/Maputo"
 msgstr "Africa/Maputo"
 
-#: calendar/zones.h:44
+#: ../calendar/zones.h:44
 msgid "Africa/Maseru"
 msgstr "Africa/Maseru"
 
-#: calendar/zones.h:45
+#: ../calendar/zones.h:45
 msgid "Africa/Mbabane"
 msgstr "Africa/Mbabane"
 
-#: calendar/zones.h:46
+#: ../calendar/zones.h:46
 msgid "Africa/Mogadishu"
 msgstr "Africa/Mogadishu"
 
-#: calendar/zones.h:47
+#: ../calendar/zones.h:47
 msgid "Africa/Monrovia"
 msgstr "Africa/Monrovia"
 
-#: calendar/zones.h:48
+#: ../calendar/zones.h:48
 msgid "Africa/Nairobi"
 msgstr "Africa/Nairobi"
 
-#: calendar/zones.h:49
+#: ../calendar/zones.h:49
 msgid "Africa/Ndjamena"
 msgstr "Africa/Ndjamena"
 
-#: calendar/zones.h:50
+#: ../calendar/zones.h:50
 msgid "Africa/Niamey"
 msgstr "Africa/Niamey"
 
-#: calendar/zones.h:51
+#: ../calendar/zones.h:51
 msgid "Africa/Nouakchott"
 msgstr "Africa/Nouakchott"
 
-#: calendar/zones.h:52
+#: ../calendar/zones.h:52
 msgid "Africa/Ouagadougou"
 msgstr "Africa/Ouagadougou"
 
-#: calendar/zones.h:53
+#: ../calendar/zones.h:53
 msgid "Africa/Porto-Novo"
 msgstr "Africa/Porto-Novo"
 
-#: calendar/zones.h:54
+#: ../calendar/zones.h:54
 msgid "Africa/Sao_Tome"
 msgstr "Africa/Sao_Tome"
 
-#: calendar/zones.h:55
+#: ../calendar/zones.h:55
 msgid "Africa/Timbuktu"
 msgstr "Africa/Timbuktu"
 
-#: calendar/zones.h:56
+#: ../calendar/zones.h:56
 msgid "Africa/Tripoli"
 msgstr "Africa/Tripoli"
 
-#: calendar/zones.h:57
+#: ../calendar/zones.h:57
 msgid "Africa/Tunis"
 msgstr "Africa/Tunis"
 
-#: calendar/zones.h:58
+#: ../calendar/zones.h:58
 msgid "Africa/Windhoek"
 msgstr "Africa/Windhoek"
 
-#: calendar/zones.h:59
+#: ../calendar/zones.h:59
 msgid "America/Adak"
 msgstr "America/Adak"
 
-#: calendar/zones.h:60
+#: ../calendar/zones.h:60
 msgid "America/Anchorage"
 msgstr "America/Anchorage"
 
-#: calendar/zones.h:61
+#: ../calendar/zones.h:61
 msgid "America/Anguilla"
 msgstr "America/Anguilla"
 
-#: calendar/zones.h:62
+#: ../calendar/zones.h:62
 msgid "America/Antigua"
 msgstr "America/Antigua"
 
-#: calendar/zones.h:63
+#: ../calendar/zones.h:63
 msgid "America/Araguaina"
 msgstr "America/Araguaina"
 
-#: calendar/zones.h:64
+#: ../calendar/zones.h:64
 msgid "America/Aruba"
 msgstr "America/Aruba"
 
-#: calendar/zones.h:65
+#: ../calendar/zones.h:65
 msgid "America/Asuncion"
 msgstr "America/Asuncion"
 
-#: calendar/zones.h:66
+#: ../calendar/zones.h:66
 msgid "America/Barbados"
 msgstr "America/Barbados"
 
-#: calendar/zones.h:67
+#: ../calendar/zones.h:67
 msgid "America/Belem"
 msgstr "America/Belem"
 
-#: calendar/zones.h:68
+#: ../calendar/zones.h:68
 msgid "America/Belize"
 msgstr "America/Belize"
 
-#: calendar/zones.h:69
+#: ../calendar/zones.h:69
 msgid "America/Boa_Vista"
 msgstr "America/Boa_Vista"
 
-#: calendar/zones.h:70
+#: ../calendar/zones.h:70
 msgid "America/Bogota"
 msgstr "America/Bogota"
 
-#: calendar/zones.h:71
+#: ../calendar/zones.h:71
 msgid "America/Boise"
 msgstr "America/Boise"
 
-#: calendar/zones.h:72
+#: ../calendar/zones.h:72
 msgid "America/Buenos_Aires"
 msgstr "America/Buenos_Aires"
 
-#: calendar/zones.h:73
+#: ../calendar/zones.h:73
 msgid "America/Cambridge_Bay"
 msgstr "America/Cambridge_Bay"
 
-#: calendar/zones.h:74
+#: ../calendar/zones.h:74
 msgid "America/Cancun"
 msgstr "America/Cancun"
 
-#: calendar/zones.h:75
+#: ../calendar/zones.h:75
 msgid "America/Caracas"
 msgstr "America/Caracas"
 
-#: calendar/zones.h:76
+#: ../calendar/zones.h:76
 msgid "America/Catamarca"
 msgstr "America/Catamarca"
 
-#: calendar/zones.h:77
+#: ../calendar/zones.h:77
 msgid "America/Cayenne"
 msgstr "America/Cayenne"
 
-#: calendar/zones.h:78
+#: ../calendar/zones.h:78
 msgid "America/Cayman"
 msgstr "America/Cayman"
 
-#: calendar/zones.h:79
+#: ../calendar/zones.h:79
 msgid "America/Chicago"
 msgstr "America/Chicago"
 
-#: calendar/zones.h:80
+#: ../calendar/zones.h:80
 msgid "America/Chihuahua"
 msgstr "America/Chihuahua"
 
-#: calendar/zones.h:81
+#: ../calendar/zones.h:81
 msgid "America/Cordoba"
 msgstr "America/Cordoba"
 
-#: calendar/zones.h:82
+#: ../calendar/zones.h:82
 msgid "America/Costa_Rica"
 msgstr "America/Costa_Rica"
 
-#: calendar/zones.h:83
+#: ../calendar/zones.h:83
 msgid "America/Cuiaba"
 msgstr "America/Cuiaba"
 
-#: calendar/zones.h:84
+#: ../calendar/zones.h:84
 msgid "America/Curacao"
 msgstr "America/Curacao"
 
-#: calendar/zones.h:85
+#: ../calendar/zones.h:85
 msgid "America/Danmarkshavn"
 msgstr "America/Danmarkshavn"
 
-#: calendar/zones.h:86
+#: ../calendar/zones.h:86
 msgid "America/Dawson"
 msgstr "America/Dawson"
 
-#: calendar/zones.h:87
+#: ../calendar/zones.h:87
 msgid "America/Dawson_Creek"
 msgstr "America/Dawson_Creek"
 
-#: calendar/zones.h:88
+#: ../calendar/zones.h:88
 msgid "America/Denver"
 msgstr "America/Denver"
 
-#: calendar/zones.h:89
+#: ../calendar/zones.h:89
 msgid "America/Detroit"
 msgstr "America/Detroit"
 
-#: calendar/zones.h:90
+#: ../calendar/zones.h:90
 msgid "America/Dominica"
 msgstr "America/Dominica"
 
-#: calendar/zones.h:91
+#: ../calendar/zones.h:91
 msgid "America/Edmonton"
 msgstr "America/Edmonton"
 
-#: calendar/zones.h:92
+#: ../calendar/zones.h:92
 msgid "America/Eirunepe"
 msgstr "America/Eirunepe"
 
-#: calendar/zones.h:93
+#: ../calendar/zones.h:93
 msgid "America/El_Salvador"
 msgstr "America/El_Salvador"
 
-#: calendar/zones.h:94
+#: ../calendar/zones.h:94
 msgid "America/Fortaleza"
 msgstr "America/Fortaleza"
 
-#: calendar/zones.h:95
+#: ../calendar/zones.h:95
 msgid "America/Glace_Bay"
 msgstr "America/Glace_Bay"
 
-#: calendar/zones.h:96
+#: ../calendar/zones.h:96
 msgid "America/Godthab"
 msgstr "America/Godthab"
 
-#: calendar/zones.h:97
+#: ../calendar/zones.h:97
 msgid "America/Goose_Bay"
 msgstr "America/Goose_Bay"
 
-#: calendar/zones.h:98
+#: ../calendar/zones.h:98
 msgid "America/Grand_Turk"
 msgstr "America/Grand_Turk"
 
-#: calendar/zones.h:99
+#: ../calendar/zones.h:99
 msgid "America/Grenada"
 msgstr "America/Grenada"
 
-#: calendar/zones.h:100
+#: ../calendar/zones.h:100
 msgid "America/Guadeloupe"
 msgstr "America/Guadeloupe"
 
-#: calendar/zones.h:101
+#: ../calendar/zones.h:101
 msgid "America/Guatemala"
 msgstr "America/Guatemala"
 
-#: calendar/zones.h:102
+#: ../calendar/zones.h:102
 msgid "America/Guayaquil"
 msgstr "America/Guayaquil"
 
-#: calendar/zones.h:103
+#: ../calendar/zones.h:103
 msgid "America/Guyana"
 msgstr "America/Guyana"
 
-#: calendar/zones.h:104
+#: ../calendar/zones.h:104
 msgid "America/Halifax"
 msgstr "America/Halifax"
 
-#: calendar/zones.h:105
+#: ../calendar/zones.h:105
 msgid "America/Havana"
 msgstr "America/Havana"
 
-#: calendar/zones.h:106
+#: ../calendar/zones.h:106
 msgid "America/Hermosillo"
 msgstr "America/Hermosillo"
 
-#: calendar/zones.h:107
+#: ../calendar/zones.h:107
 msgid "America/Indiana/Indianapolis"
 msgstr "America/Indiana/Indianapolis"
 
-#: calendar/zones.h:108
+#: ../calendar/zones.h:108
 msgid "America/Indiana/Knox"
 msgstr "America/Indiana/Knox"
 
-#: calendar/zones.h:109
+#: ../calendar/zones.h:109
 msgid "America/Indiana/Marengo"
 msgstr "America/Indiana/Marengo"
 
-#: calendar/zones.h:110
+#: ../calendar/zones.h:110
 msgid "America/Indiana/Vevay"
 msgstr "America/Indiana/Vevay"
 
-#: calendar/zones.h:111
+#: ../calendar/zones.h:111
 msgid "America/Indianapolis"
 msgstr "America/Indianapolis"
 
-#: calendar/zones.h:112
+#: ../calendar/zones.h:112
 msgid "America/Inuvik"
 msgstr "America/Inuvik"
 
-#: calendar/zones.h:113
+#: ../calendar/zones.h:113
 msgid "America/Iqaluit"
 msgstr "America/Iqaluit"
 
-#: calendar/zones.h:114
+#: ../calendar/zones.h:114
 msgid "America/Jamaica"
 msgstr "America/Jamaica"
 
-#: calendar/zones.h:115
+#: ../calendar/zones.h:115
 msgid "America/Jujuy"
 msgstr "America/Jujuy"
 
-#: calendar/zones.h:116
+#: ../calendar/zones.h:116
 msgid "America/Juneau"
 msgstr "America/Juneau"
 
-#: calendar/zones.h:117
+#: ../calendar/zones.h:117
 msgid "America/Kentucky/Louisville"
 msgstr "America/Kentucky/Louisville"
 
-#: calendar/zones.h:118
+#: ../calendar/zones.h:118
 msgid "America/Kentucky/Monticello"
 msgstr "America/Kentucky/Monticello"
 
-#: calendar/zones.h:119
+#: ../calendar/zones.h:119
 msgid "America/La_Paz"
 msgstr "America/La_Paz"
 
-#: calendar/zones.h:120
+#: ../calendar/zones.h:120
 msgid "America/Lima"
 msgstr "America/Lima"
 
-#: calendar/zones.h:121
+#: ../calendar/zones.h:121
 msgid "America/Los_Angeles"
 msgstr "America/Los_Angeles"
 
-#: calendar/zones.h:122
+#: ../calendar/zones.h:122
 msgid "America/Louisville"
 msgstr "America/Louisville"
 
-#: calendar/zones.h:123
+#: ../calendar/zones.h:123
 msgid "America/Maceio"
 msgstr "America/Maceio"
 
-#: calendar/zones.h:124
+#: ../calendar/zones.h:124
 msgid "America/Managua"
 msgstr "America/Managua"
 
-#: calendar/zones.h:125
+#: ../calendar/zones.h:125
 msgid "America/Manaus"
 msgstr "America/Manaus"
 
-#: calendar/zones.h:126
+#: ../calendar/zones.h:126
 msgid "America/Martinique"
 msgstr "America/Martinique"
 
-#: calendar/zones.h:127
+#: ../calendar/zones.h:127
 msgid "America/Mazatlan"
 msgstr "America/Mazatlan"
 
-#: calendar/zones.h:128
+#: ../calendar/zones.h:128
 msgid "America/Mendoza"
 msgstr "America/Mendoza"
 
-#: calendar/zones.h:129
+#: ../calendar/zones.h:129
 msgid "America/Menominee"
 msgstr "America/Menominee"
 
-#: calendar/zones.h:130
+#: ../calendar/zones.h:130
 msgid "America/Merida"
 msgstr "America/Merida"
 
-#: calendar/zones.h:131
+#: ../calendar/zones.h:131
 msgid "America/Mexico_City"
 msgstr "America/Mexico_City"
 
-#: calendar/zones.h:132
+#: ../calendar/zones.h:132
 msgid "America/Miquelon"
 msgstr "America/Miquelon"
 
-#: calendar/zones.h:133
+#: ../calendar/zones.h:133
 msgid "America/Monterrey"
 msgstr "America/Monterrey"
 
-#: calendar/zones.h:134
+#: ../calendar/zones.h:134
 msgid "America/Montevideo"
 msgstr "America/Montevideo"
 
-#: calendar/zones.h:135
+#: ../calendar/zones.h:135
 msgid "America/Montreal"
 msgstr "America/Montreal"
 
-#: calendar/zones.h:136
+#: ../calendar/zones.h:136
 msgid "America/Montserrat"
 msgstr "America/Montserrat"
 
-#: calendar/zones.h:137
+#: ../calendar/zones.h:137
 msgid "America/Nassau"
 msgstr "America/Nassau"
 
-#: calendar/zones.h:138 widgets/e-timezone-dialog/e-timezone-dialog.glade.h:4
+#: ../calendar/zones.h:138
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:4
 msgid "America/New_York"
 msgstr "America/New_York"
 
-#: calendar/zones.h:139
+#: ../calendar/zones.h:139
 msgid "America/Nipigon"
 msgstr "America/Nipigon"
 
-#: calendar/zones.h:140
+#: ../calendar/zones.h:140
 msgid "America/Nome"
 msgstr "America/Nome"
 
-#: calendar/zones.h:141
+#: ../calendar/zones.h:141
 msgid "America/Noronha"
 msgstr "America/Noronha"
 
-#: calendar/zones.h:142
+#: ../calendar/zones.h:142
 msgid "America/North_Dakota/Center"
 msgstr "America/North_Dakota/Centre"
 
-#: calendar/zones.h:143
+#: ../calendar/zones.h:143
 msgid "America/Panama"
 msgstr "America/Panama"
 
-#: calendar/zones.h:144
+#: ../calendar/zones.h:144
 msgid "America/Pangnirtung"
 msgstr "America/Pangnirtung"
 
-#: calendar/zones.h:145
+#: ../calendar/zones.h:145
 msgid "America/Paramaribo"
 msgstr "America/Paramaribo"
 
-#: calendar/zones.h:146
+#: ../calendar/zones.h:146
 msgid "America/Phoenix"
 msgstr "America/Phoenix"
 
-#: calendar/zones.h:147
+#: ../calendar/zones.h:147
 msgid "America/Port-au-Prince"
 msgstr "America/Port-au-Prince"
 
-#: calendar/zones.h:148
+#: ../calendar/zones.h:148
 msgid "America/Port_of_Spain"
 msgstr "America/Port_of_Spain"
 
-#: calendar/zones.h:149
+#: ../calendar/zones.h:149
 msgid "America/Porto_Velho"
 msgstr "America/Porto_Velho"
 
-#: calendar/zones.h:150
+#: ../calendar/zones.h:150
 msgid "America/Puerto_Rico"
 msgstr "America/Puerto_Rico"
 
-#: calendar/zones.h:151
+#: ../calendar/zones.h:151
 msgid "America/Rainy_River"
 msgstr "America/Rainy_River"
 
-#: calendar/zones.h:152
+#: ../calendar/zones.h:152
 msgid "America/Rankin_Inlet"
 msgstr "America/Rankin_Inlet"
 
-#: calendar/zones.h:153
+#: ../calendar/zones.h:153
 msgid "America/Recife"
 msgstr "America/Recife"
 
-#: calendar/zones.h:154
+#: ../calendar/zones.h:154
 msgid "America/Regina"
 msgstr "America/Regina"
 
-#: calendar/zones.h:155
+#: ../calendar/zones.h:155
 msgid "America/Rio_Branco"
 msgstr "America/Rio_Branco"
 
-#: calendar/zones.h:156
+#: ../calendar/zones.h:156
 msgid "America/Rosario"
 msgstr "America/Rosario"
 
-#: calendar/zones.h:157
+#: ../calendar/zones.h:157
 msgid "America/Santiago"
 msgstr "America/Santiago"
 
-#: calendar/zones.h:158
+#: ../calendar/zones.h:158
 msgid "America/Santo_Domingo"
 msgstr "America/Santo_Domingo"
 
-#: calendar/zones.h:159
+#: ../calendar/zones.h:159
 msgid "America/Sao_Paulo"
 msgstr "America/Sao_Paulo"
 
-#: calendar/zones.h:160
+#: ../calendar/zones.h:160
 msgid "America/Scoresbysund"
 msgstr "America/Scoresbysund"
 
-#: calendar/zones.h:161
+#: ../calendar/zones.h:161
 msgid "America/Shiprock"
 msgstr "America/Shiprock"
 
-#: calendar/zones.h:162
+#: ../calendar/zones.h:162
 msgid "America/St_Johns"
 msgstr "America/St_Johns"
 
-#: calendar/zones.h:163
+#: ../calendar/zones.h:163
 msgid "America/St_Kitts"
 msgstr "America/St_Kitts"
 
-#: calendar/zones.h:164
+#: ../calendar/zones.h:164
 msgid "America/St_Lucia"
 msgstr "America/St_Lucia"
 
-#: calendar/zones.h:165
+#: ../calendar/zones.h:165
 msgid "America/St_Thomas"
 msgstr "America/St_Thomas"
 
-#: calendar/zones.h:166
+#: ../calendar/zones.h:166
 msgid "America/St_Vincent"
 msgstr "America/St_Vincent"
 
-#: calendar/zones.h:167
+#: ../calendar/zones.h:167
 msgid "America/Swift_Current"
 msgstr "America/Swift_Current"
 
-#: calendar/zones.h:168
+#: ../calendar/zones.h:168
 msgid "America/Tegucigalpa"
 msgstr "America/Tegucigalpa"
 
-#: calendar/zones.h:169
+#: ../calendar/zones.h:169
 msgid "America/Thule"
 msgstr "America/Thule"
 
-#: calendar/zones.h:170
+#: ../calendar/zones.h:170
 msgid "America/Thunder_Bay"
 msgstr "America/Thunder_Bay"
 
-#: calendar/zones.h:171
+#: ../calendar/zones.h:171
 msgid "America/Tijuana"
 msgstr "America/Tijuana"
 
-#: calendar/zones.h:172
+#: ../calendar/zones.h:172
 msgid "America/Tortola"
 msgstr "America/Tortola"
 
-#: calendar/zones.h:173
+#: ../calendar/zones.h:173
 msgid "America/Vancouver"
 msgstr "America/Vancouver"
 
-#: calendar/zones.h:174
+#: ../calendar/zones.h:174
 msgid "America/Whitehorse"
 msgstr "America/Whitehorse"
 
-#: calendar/zones.h:175
+#: ../calendar/zones.h:175
 msgid "America/Winnipeg"
 msgstr "America/Winnipeg"
 
-#: calendar/zones.h:176
+#: ../calendar/zones.h:176
 msgid "America/Yakutat"
 msgstr "America/Yakutat"
 
-#: calendar/zones.h:177
+#: ../calendar/zones.h:177
 msgid "America/Yellowknife"
 msgstr "America/Yellowknife"
 
-#: calendar/zones.h:178
+#: ../calendar/zones.h:178
 msgid "Antarctica/Casey"
 msgstr "Antarctica/Casey"
 
-#: calendar/zones.h:179
+#: ../calendar/zones.h:179
 msgid "Antarctica/Davis"
 msgstr "Antarctica/Davis"
 
-#: calendar/zones.h:180
+#: ../calendar/zones.h:180
 msgid "Antarctica/DumontDUrville"
 msgstr "Antarctica/DumontDUrville"
 
-#: calendar/zones.h:181
+#: ../calendar/zones.h:181
 msgid "Antarctica/Mawson"
 msgstr "Antarctica/Mawson"
 
-#: calendar/zones.h:182
+#: ../calendar/zones.h:182
 msgid "Antarctica/McMurdo"
 msgstr "Antarctica/McMurdo"
 
-#: calendar/zones.h:183
+#: ../calendar/zones.h:183
 msgid "Antarctica/Palmer"
 msgstr "Antarctica/Palmer"
 
-#: calendar/zones.h:184
+#: ../calendar/zones.h:184
 msgid "Antarctica/South_Pole"
 msgstr "Antarctica/South_Pole"
 
-#: calendar/zones.h:185
+#: ../calendar/zones.h:185
 msgid "Antarctica/Syowa"
 msgstr "Antarctica/Syowa"
 
-#: calendar/zones.h:186
+#: ../calendar/zones.h:186
 msgid "Antarctica/Vostok"
 msgstr "Antarctica/Vostok"
 
-#: calendar/zones.h:187
+#: ../calendar/zones.h:187
 msgid "Arctic/Longyearbyen"
 msgstr "Arctic/Longyearbyen"
 
-#: calendar/zones.h:188
+#: ../calendar/zones.h:188
 msgid "Asia/Aden"
 msgstr "Asia/Aden"
 
-#: calendar/zones.h:189
+#: ../calendar/zones.h:189
 msgid "Asia/Almaty"
 msgstr "Asia/Almaty"
 
-#: calendar/zones.h:190
+#: ../calendar/zones.h:190
 msgid "Asia/Amman"
 msgstr "Asia/Amman"
 
-#: calendar/zones.h:191
+#: ../calendar/zones.h:191
 msgid "Asia/Anadyr"
 msgstr "Asia/Anadyr"
 
-#: calendar/zones.h:192
+#: ../calendar/zones.h:192
 msgid "Asia/Aqtau"
 msgstr "Asia/Aqtau"
 
-#: calendar/zones.h:193
+#: ../calendar/zones.h:193
 msgid "Asia/Aqtobe"
 msgstr "Asia/Aqtobe"
 
-#: calendar/zones.h:194
+#: ../calendar/zones.h:194
 msgid "Asia/Ashgabat"
 msgstr "Asia/Ashgabat"
 
-#: calendar/zones.h:195
+#: ../calendar/zones.h:195
 msgid "Asia/Baghdad"
 msgstr "Asia/Baghdad"
 
-#: calendar/zones.h:196
+#: ../calendar/zones.h:196
 msgid "Asia/Bahrain"
 msgstr "Asia/Bahrain"
 
-#: calendar/zones.h:197
+#: ../calendar/zones.h:197
 msgid "Asia/Baku"
 msgstr "Asia/Baku"
 
-#: calendar/zones.h:198
+#: ../calendar/zones.h:198
 msgid "Asia/Bangkok"
 msgstr "Asia/Bangkok"
 
-#: calendar/zones.h:199
+#: ../calendar/zones.h:199
 msgid "Asia/Beirut"
 msgstr "Asia/Beirut"
 
-#: calendar/zones.h:200
+#: ../calendar/zones.h:200
 msgid "Asia/Bishkek"
 msgstr "Asia/Bishkek"
 
-#: calendar/zones.h:201
+#: ../calendar/zones.h:201
 msgid "Asia/Brunei"
 msgstr "Asia/Brunei"
 
-#: calendar/zones.h:202
+#: ../calendar/zones.h:202
 msgid "Asia/Calcutta"
 msgstr "Asia/Calcutta"
 
-#: calendar/zones.h:203
+#: ../calendar/zones.h:203
 msgid "Asia/Choibalsan"
 msgstr "Asia/Choibalsan"
 
-#: calendar/zones.h:204
+#: ../calendar/zones.h:204
 msgid "Asia/Chongqing"
 msgstr "Asia/Chongqing"
 
-#: calendar/zones.h:205
+#: ../calendar/zones.h:205
 msgid "Asia/Colombo"
 msgstr "Asia/Colombo"
 
-#: calendar/zones.h:206
+#: ../calendar/zones.h:206
 msgid "Asia/Damascus"
 msgstr "Asia/Damascus"
 
-#: calendar/zones.h:207
+#: ../calendar/zones.h:207
 msgid "Asia/Dhaka"
 msgstr "Asia/Dhaka"
 
-#: calendar/zones.h:208
+#: ../calendar/zones.h:208
 msgid "Asia/Dili"
 msgstr "Asia/Dili"
 
-#: calendar/zones.h:209
+#: ../calendar/zones.h:209
 msgid "Asia/Dubai"
 msgstr "Asia/Dubai"
 
-#: calendar/zones.h:210
+#: ../calendar/zones.h:210
 msgid "Asia/Dushanbe"
 msgstr "Asia/Dushanbe"
 
-#: calendar/zones.h:211
+#: ../calendar/zones.h:211
 msgid "Asia/Gaza"
 msgstr "Asia/Gaza"
 
-#: calendar/zones.h:212
+#: ../calendar/zones.h:212
 msgid "Asia/Harbin"
 msgstr "Asia/Harbin"
 
-#: calendar/zones.h:213
+#: ../calendar/zones.h:213
 msgid "Asia/Hong_Kong"
 msgstr "Asia/Hong_Kong"
 
-#: calendar/zones.h:214
+#: ../calendar/zones.h:214
 msgid "Asia/Hovd"
 msgstr "Asia/Hovd"
 
-#: calendar/zones.h:215
+#: ../calendar/zones.h:215
 msgid "Asia/Irkutsk"
 msgstr "Asia/Irkutsk"
 
-#: calendar/zones.h:216
+#: ../calendar/zones.h:216
 msgid "Asia/Istanbul"
 msgstr "Asia/Istanbul"
 
-#: calendar/zones.h:217
+#: ../calendar/zones.h:217
 msgid "Asia/Jakarta"
 msgstr "Asia/Jakarta"
 
-#: calendar/zones.h:218
+#: ../calendar/zones.h:218
 msgid "Asia/Jayapura"
 msgstr "Asia/Jayapura"
 
-#: calendar/zones.h:219
+#: ../calendar/zones.h:219
 msgid "Asia/Jerusalem"
 msgstr "Asia/Jerusalem"
 
-#: calendar/zones.h:220
+#: ../calendar/zones.h:220
 msgid "Asia/Kabul"
 msgstr "Asia/Kabul"
 
-#: calendar/zones.h:221
+#: ../calendar/zones.h:221
 msgid "Asia/Kamchatka"
 msgstr "Asia/Kamchatka"
 
-#: calendar/zones.h:222
+#: ../calendar/zones.h:222
 msgid "Asia/Karachi"
 msgstr "Asia/Karachi"
 
-#: calendar/zones.h:223
+#: ../calendar/zones.h:223
 msgid "Asia/Kashgar"
 msgstr "Asia/Kashgar"
 
-#: calendar/zones.h:224
+#: ../calendar/zones.h:224
 msgid "Asia/Katmandu"
 msgstr "Asia/Katmandu"
 
-#: calendar/zones.h:225
+#: ../calendar/zones.h:225
 msgid "Asia/Krasnoyarsk"
 msgstr "Asia/Krasnoyarsk"
 
-#: calendar/zones.h:226
+#: ../calendar/zones.h:226
 msgid "Asia/Kuala_Lumpur"
 msgstr "Asia/Kuala_Lumpur"
 
-#: calendar/zones.h:227
+#: ../calendar/zones.h:227
 msgid "Asia/Kuching"
 msgstr "Asia/Kuching"
 
-#: calendar/zones.h:228
+#: ../calendar/zones.h:228
 msgid "Asia/Kuwait"
 msgstr "Asia/Kuwait"
 
-#: calendar/zones.h:229
+#: ../calendar/zones.h:229
 msgid "Asia/Macao"
 msgstr "Asia/Macao"
 
-#: calendar/zones.h:230
+#: ../calendar/zones.h:230
 msgid "Asia/Macau"
 msgstr "Asia/Macau"
 
-#: calendar/zones.h:231
+#: ../calendar/zones.h:231
 msgid "Asia/Magadan"
 msgstr "Asia/Magadan"
 
-#: calendar/zones.h:232
+#: ../calendar/zones.h:232
 msgid "Asia/Makassar"
 msgstr "Asia/Makassar"
 
-#: calendar/zones.h:233
+#: ../calendar/zones.h:233
 msgid "Asia/Manila"
 msgstr "Asia/Manila"
 
-#: calendar/zones.h:234
+#: ../calendar/zones.h:234
 msgid "Asia/Muscat"
 msgstr "Asia/Muscat"
 
-#: calendar/zones.h:235
+#: ../calendar/zones.h:235
 msgid "Asia/Nicosia"
 msgstr "Asia/Nicosia"
 
-#: calendar/zones.h:236
+#: ../calendar/zones.h:236
 msgid "Asia/Novosibirsk"
 msgstr "Asia/Novosibirsk"
 
-#: calendar/zones.h:237
+#: ../calendar/zones.h:237
 msgid "Asia/Omsk"
 msgstr "Asia/Omsk"
 
-#: calendar/zones.h:238
+#: ../calendar/zones.h:238
 msgid "Asia/Oral"
 msgstr "Asia/Oral"
 
-#: calendar/zones.h:239
+#: ../calendar/zones.h:239
 msgid "Asia/Phnom_Penh"
 msgstr "Asia/Phnom_Penh"
 
-#: calendar/zones.h:240
+#: ../calendar/zones.h:240
 msgid "Asia/Pontianak"
 msgstr "Asia/Pontianak"
 
-#: calendar/zones.h:241
+#: ../calendar/zones.h:241
 msgid "Asia/Pyongyang"
 msgstr "Asia/Pyongyang"
 
-#: calendar/zones.h:242
+#: ../calendar/zones.h:242
 msgid "Asia/Qatar"
 msgstr "Asia/Qatar"
 
-#: calendar/zones.h:243
+#: ../calendar/zones.h:243
 msgid "Asia/Qyzylorda"
 msgstr "Asia/Qyzylorda"
 
-#: calendar/zones.h:244
+#: ../calendar/zones.h:244
 msgid "Asia/Rangoon"
 msgstr "Asia/Rangoon"
 
-#: calendar/zones.h:245
+#: ../calendar/zones.h:245
 msgid "Asia/Riyadh"
 msgstr "Asia/Riyadh"
 
-#: calendar/zones.h:246
+#: ../calendar/zones.h:246
 msgid "Asia/Saigon"
 msgstr "Asia/Saigon"
 
-#: calendar/zones.h:247
+#: ../calendar/zones.h:247
 msgid "Asia/Sakhalin"
 msgstr "Asia/Sakhalin"
 
-#: calendar/zones.h:248
+#: ../calendar/zones.h:248
 msgid "Asia/Samarkand"
 msgstr "Asia/Samarkand"
 
-#: calendar/zones.h:249
+#: ../calendar/zones.h:249
 msgid "Asia/Seoul"
 msgstr "Asia/Seoul"
 
-#: calendar/zones.h:250
+#: ../calendar/zones.h:250
 msgid "Asia/Shanghai"
 msgstr "Asia/Shanghai"
 
-#: calendar/zones.h:251
+#: ../calendar/zones.h:251
 msgid "Asia/Singapore"
 msgstr "Asia/Singapore"
 
-#: calendar/zones.h:252
+#: ../calendar/zones.h:252
 msgid "Asia/Taipei"
 msgstr "Asia/Taipei"
 
-#: calendar/zones.h:253
+#: ../calendar/zones.h:253
 msgid "Asia/Tashkent"
 msgstr "Asia/Tashkent"
 
-#: calendar/zones.h:254
+#: ../calendar/zones.h:254
 msgid "Asia/Tbilisi"
 msgstr "Asia/Tbilisi"
 
-#: calendar/zones.h:255
+#: ../calendar/zones.h:255
 msgid "Asia/Tehran"
 msgstr "Asia/Tehran"
 
-#: calendar/zones.h:256
+#: ../calendar/zones.h:256
 msgid "Asia/Thimphu"
 msgstr "Asia/Thimphu"
 
-#: calendar/zones.h:257
+#: ../calendar/zones.h:257
 msgid "Asia/Tokyo"
 msgstr "Asia/Tokyo"
 
-#: calendar/zones.h:258
+#: ../calendar/zones.h:258
 msgid "Asia/Ujung_Pandang"
 msgstr "Asia/Ujung_Pandang"
 
-#: calendar/zones.h:259
+#: ../calendar/zones.h:259
 msgid "Asia/Ulaanbaatar"
 msgstr "Asia/Ulaanbaatar"
 
-#: calendar/zones.h:260
+#: ../calendar/zones.h:260
 msgid "Asia/Urumqi"
 msgstr "Asia/Urumqi"
 
-#: calendar/zones.h:261
+#: ../calendar/zones.h:261
 msgid "Asia/Vientiane"
 msgstr "Asia/Vientiane"
 
-#: calendar/zones.h:262
+#: ../calendar/zones.h:262
 msgid "Asia/Vladivostok"
 msgstr "Asia/Vladivostok"
 
-#: calendar/zones.h:263
+#: ../calendar/zones.h:263
 msgid "Asia/Yakutsk"
 msgstr "Asia/Yakutsk"
 
-#: calendar/zones.h:264
+#: ../calendar/zones.h:264
 msgid "Asia/Yekaterinburg"
 msgstr "Asia/Yekaterinburg"
 
-#: calendar/zones.h:265
+#: ../calendar/zones.h:265
 msgid "Asia/Yerevan"
 msgstr "Asia/Yerevan"
 
-#: calendar/zones.h:266
+#: ../calendar/zones.h:266
 msgid "Atlantic/Azores"
 msgstr "Atlantic/Azores"
 
-#: calendar/zones.h:267
+#: ../calendar/zones.h:267
 msgid "Atlantic/Bermuda"
 msgstr "Atlantic/Bermuda"
 
-#: calendar/zones.h:268
+#: ../calendar/zones.h:268
 msgid "Atlantic/Canary"
 msgstr "Atlantic/Canary"
 
-#: calendar/zones.h:269
+#: ../calendar/zones.h:269
 msgid "Atlantic/Cape_Verde"
 msgstr "Atlantic/Cape_Verde"
 
-#: calendar/zones.h:270
+#: ../calendar/zones.h:270
 msgid "Atlantic/Faeroe"
 msgstr "Atlantic/Faeroe"
 
-#: calendar/zones.h:271
+#: ../calendar/zones.h:271
 msgid "Atlantic/Jan_Mayen"
 msgstr "Atlantic/Jan_Mayen"
 
-#: calendar/zones.h:272
+#: ../calendar/zones.h:272
 msgid "Atlantic/Madeira"
 msgstr "Atlantic/Madeira"
 
-#: calendar/zones.h:273
+#: ../calendar/zones.h:273
 msgid "Atlantic/Reykjavik"
 msgstr "Atlantic/Reykjavik"
 
-#: calendar/zones.h:274
+#: ../calendar/zones.h:274
 msgid "Atlantic/South_Georgia"
 msgstr "Atlantic/South_Georgia"
 
-#: calendar/zones.h:275
+#: ../calendar/zones.h:275
 msgid "Atlantic/St_Helena"
 msgstr "Atlantic/St_Helena"
 
-#: calendar/zones.h:276
+#: ../calendar/zones.h:276
 msgid "Atlantic/Stanley"
 msgstr "Atlantic/Stanley"
 
-#: calendar/zones.h:277
+#: ../calendar/zones.h:277
 msgid "Australia/Adelaide"
 msgstr "Australia/Adelaide"
 
-#: calendar/zones.h:278
+#: ../calendar/zones.h:278
 msgid "Australia/Brisbane"
 msgstr "Australia/Brisbane"
 
-#: calendar/zones.h:279
+#: ../calendar/zones.h:279
 msgid "Australia/Broken_Hill"
 msgstr "Australia/Broken_Hill"
 
-#: calendar/zones.h:280
+#: ../calendar/zones.h:280
 msgid "Australia/Darwin"
 msgstr "Australia/Darwin"
 
-#: calendar/zones.h:281
+#: ../calendar/zones.h:281
 msgid "Australia/Hobart"
 msgstr "Australia/Hobart"
 
-#: calendar/zones.h:282
+#: ../calendar/zones.h:282
 msgid "Australia/Lindeman"
 msgstr "Australia/Lindeman"
 
-#: calendar/zones.h:283
+#: ../calendar/zones.h:283
 msgid "Australia/Lord_Howe"
 msgstr "Australia/Lord_Howe"
 
-#: calendar/zones.h:284
+#: ../calendar/zones.h:284
 msgid "Australia/Melbourne"
 msgstr "Australia/Melbourne"
 
-#: calendar/zones.h:285
+#: ../calendar/zones.h:285
 msgid "Australia/Perth"
 msgstr "Australia/Perth"
 
-#: calendar/zones.h:286
+#: ../calendar/zones.h:286
 msgid "Australia/Sydney"
 msgstr "Australia/Sydney"
 
-#: calendar/zones.h:287
+#: ../calendar/zones.h:287
 msgid "Europe/Amsterdam"
 msgstr "Europe/Amsterdam"
 
-#: calendar/zones.h:288
+#: ../calendar/zones.h:288
 msgid "Europe/Andorra"
 msgstr "Europe/Andorra"
 
-#: calendar/zones.h:289
+#: ../calendar/zones.h:289
 msgid "Europe/Athens"
 msgstr "Europe/Athens"
 
-#: calendar/zones.h:290
+#: ../calendar/zones.h:290
 msgid "Europe/Belfast"
 msgstr "Europe/Belfast"
 
-#: calendar/zones.h:291
+#: ../calendar/zones.h:291
 msgid "Europe/Belgrade"
 msgstr "Europe/Belgrade"
 
-#: calendar/zones.h:292
+#: ../calendar/zones.h:292
 msgid "Europe/Berlin"
 msgstr "Europe/Berlin"
 
-#: calendar/zones.h:293
+#: ../calendar/zones.h:293
 msgid "Europe/Bratislava"
 msgstr "Europe/Bratislava"
 
-#: calendar/zones.h:294
+#: ../calendar/zones.h:294
 msgid "Europe/Brussels"
 msgstr "Europe/Brussels"
 
-#: calendar/zones.h:295
+#: ../calendar/zones.h:295
 msgid "Europe/Bucharest"
 msgstr "Europe/Bucharest"
 
-#: calendar/zones.h:296
+#: ../calendar/zones.h:296
 msgid "Europe/Budapest"
 msgstr "Europe/Budapest"
 
-#: calendar/zones.h:297
+#: ../calendar/zones.h:297
 msgid "Europe/Chisinau"
 msgstr "Europe/Chisinau"
 
-#: calendar/zones.h:298
+#: ../calendar/zones.h:298
 msgid "Europe/Copenhagen"
 msgstr "Europe/Copenhagen"
 
-#: calendar/zones.h:299
+#: ../calendar/zones.h:299
 msgid "Europe/Dublin"
 msgstr "Europe/Dublin"
 
-#: calendar/zones.h:300
+#: ../calendar/zones.h:300
 msgid "Europe/Gibraltar"
 msgstr "Europe/Gibraltar"
 
-#: calendar/zones.h:301
+#: ../calendar/zones.h:301
 msgid "Europe/Helsinki"
 msgstr "Europe/Helsinki"
 
-#: calendar/zones.h:302
+#: ../calendar/zones.h:302
 msgid "Europe/Istanbul"
 msgstr "Europe/Istanbul"
 
-#: calendar/zones.h:303
+#: ../calendar/zones.h:303
 msgid "Europe/Kaliningrad"
 msgstr "Europe/Kaliningrad"
 
-#: calendar/zones.h:304
+#: ../calendar/zones.h:304
 msgid "Europe/Kiev"
 msgstr "Europe/Kiev"
 
-#: calendar/zones.h:305
+#: ../calendar/zones.h:305
 msgid "Europe/Lisbon"
 msgstr "Europe/Lisbon"
 
-#: calendar/zones.h:306
+#: ../calendar/zones.h:306
 msgid "Europe/Ljubljana"
 msgstr "Europe/Ljubljana"
 
-#: calendar/zones.h:307
+#: ../calendar/zones.h:307
 msgid "Europe/London"
 msgstr "Europe/London"
 
-#: calendar/zones.h:308
+#: ../calendar/zones.h:308
 msgid "Europe/Luxembourg"
 msgstr "Europe/Luxembourg"
 
-#: calendar/zones.h:309
+#: ../calendar/zones.h:309
 msgid "Europe/Madrid"
 msgstr "Europe/Madrid"
 
-#: calendar/zones.h:310
+#: ../calendar/zones.h:310
 msgid "Europe/Malta"
 msgstr "Europe/Malta"
 
-#: calendar/zones.h:311
+#: ../calendar/zones.h:311
 msgid "Europe/Minsk"
 msgstr "Europe/Minsk"
 
-#: calendar/zones.h:312
+#: ../calendar/zones.h:312
 msgid "Europe/Monaco"
 msgstr "Europe/Monaco"
 
-#: calendar/zones.h:313
+#: ../calendar/zones.h:313
 msgid "Europe/Moscow"
 msgstr "Europe/Moscow"
 
-#: calendar/zones.h:314
+#: ../calendar/zones.h:314
 msgid "Europe/Nicosia"
 msgstr "Europe/Nicosia"
 
-#: calendar/zones.h:315
+#: ../calendar/zones.h:315
 msgid "Europe/Oslo"
 msgstr "Europe/Oslo"
 
-#: calendar/zones.h:316
+#: ../calendar/zones.h:316
 msgid "Europe/Paris"
 msgstr "Europe/Paris"
 
-#: calendar/zones.h:317
+#: ../calendar/zones.h:317
 msgid "Europe/Prague"
 msgstr "Europe/Prague"
 
-#: calendar/zones.h:318
+#: ../calendar/zones.h:318
 msgid "Europe/Riga"
 msgstr "Europe/Riga"
 
-#: calendar/zones.h:319
+#: ../calendar/zones.h:319
 msgid "Europe/Rome"
 msgstr "Europe/Rome"
 
-#: calendar/zones.h:320
+#: ../calendar/zones.h:320
 msgid "Europe/Samara"
 msgstr "Europe/Samara"
 
-#: calendar/zones.h:321
+#: ../calendar/zones.h:321
 msgid "Europe/San_Marino"
 msgstr "Europe/San_Marino"
 
-#: calendar/zones.h:322
+#: ../calendar/zones.h:322
 msgid "Europe/Sarajevo"
 msgstr "Europe/Sarajevo"
 
-#: calendar/zones.h:323
+#: ../calendar/zones.h:323
 msgid "Europe/Simferopol"
 msgstr "Europe/Simferopol"
 
-#: calendar/zones.h:324
+#: ../calendar/zones.h:324
 msgid "Europe/Skopje"
 msgstr "Europe/Skopje"
 
-#: calendar/zones.h:325
+#: ../calendar/zones.h:325
 msgid "Europe/Sofia"
 msgstr "Europe/Sofia"
 
-#: calendar/zones.h:326
+#: ../calendar/zones.h:326
 msgid "Europe/Stockholm"
 msgstr "Europe/Stockholm"
 
-#: calendar/zones.h:327
+#: ../calendar/zones.h:327
 msgid "Europe/Tallinn"
 msgstr "Europe/Tallinn"
 
-#: calendar/zones.h:328
+#: ../calendar/zones.h:328
 msgid "Europe/Tirane"
 msgstr "Europe/Tirane"
 
-#: calendar/zones.h:329
+#: ../calendar/zones.h:329
 msgid "Europe/Uzhgorod"
 msgstr "Europe/Uzhgorod"
 
-#: calendar/zones.h:330
+#: ../calendar/zones.h:330
 msgid "Europe/Vaduz"
 msgstr "Europe/Vaduz"
 
-#: calendar/zones.h:331
+#: ../calendar/zones.h:331
 msgid "Europe/Vatican"
 msgstr "Europe/Vatican"
 
-#: calendar/zones.h:332
+#: ../calendar/zones.h:332
 msgid "Europe/Vienna"
 msgstr "Europe/Vienna"
 
-#: calendar/zones.h:333
+#: ../calendar/zones.h:333
 msgid "Europe/Vilnius"
 msgstr "Europe/Vilnius"
 
-#: calendar/zones.h:334
+#: ../calendar/zones.h:334
 msgid "Europe/Warsaw"
 msgstr "Europe/Warsaw"
 
-#: calendar/zones.h:335
+#: ../calendar/zones.h:335
 msgid "Europe/Zagreb"
 msgstr "Europe/Zagreb"
 
-#: calendar/zones.h:336
+#: ../calendar/zones.h:336
 msgid "Europe/Zaporozhye"
 msgstr "Europe/Zaporozhye"
 
-#: calendar/zones.h:337
+#: ../calendar/zones.h:337
 msgid "Europe/Zurich"
 msgstr "Europe/Zurich"
 
-#: calendar/zones.h:338
+#: ../calendar/zones.h:338
 msgid "Indian/Antananarivo"
 msgstr "Indian/Antananarivo"
 
-#: calendar/zones.h:339
+#: ../calendar/zones.h:339
 msgid "Indian/Chagos"
 msgstr "Indian/Chagos"
 
-#: calendar/zones.h:340
+#: ../calendar/zones.h:340
 msgid "Indian/Christmas"
 msgstr "Indian/Christmas"
 
-#: calendar/zones.h:341
+#: ../calendar/zones.h:341
 msgid "Indian/Cocos"
 msgstr "Indian/Cocos"
 
-#: calendar/zones.h:342
+#: ../calendar/zones.h:342
 msgid "Indian/Comoro"
 msgstr "Indian/Comoro"
 
-#: calendar/zones.h:343
+#: ../calendar/zones.h:343
 msgid "Indian/Kerguelen"
 msgstr "Indian/Kerguelen"
 
-#: calendar/zones.h:344
+#: ../calendar/zones.h:344
 msgid "Indian/Mahe"
 msgstr "Indian/Mahe"
 
-#: calendar/zones.h:345
+#: ../calendar/zones.h:345
 msgid "Indian/Maldives"
 msgstr "Indian/Maldives"
 
-#: calendar/zones.h:346
+#: ../calendar/zones.h:346
 msgid "Indian/Mauritius"
 msgstr "Indian/Mauritius"
 
-#: calendar/zones.h:347
+#: ../calendar/zones.h:347
 msgid "Indian/Mayotte"
 msgstr "Indian/Mayotte"
 
-#: calendar/zones.h:348
+#: ../calendar/zones.h:348
 msgid "Indian/Reunion"
 msgstr "Indian/Reunion"
 
-#: calendar/zones.h:349
+#: ../calendar/zones.h:349
 msgid "Pacific/Apia"
 msgstr "Pacific/Apia"
 
-#: calendar/zones.h:350
+#: ../calendar/zones.h:350
 msgid "Pacific/Auckland"
 msgstr "Pacific/Auckland"
 
-#: calendar/zones.h:351
+#: ../calendar/zones.h:351
 msgid "Pacific/Chatham"
 msgstr "Pacific/Chatham"
 
-#: calendar/zones.h:352
+#: ../calendar/zones.h:352
 msgid "Pacific/Easter"
 msgstr "Pacific/Easter"
 
-#: calendar/zones.h:353
+#: ../calendar/zones.h:353
 msgid "Pacific/Efate"
 msgstr "Pacific/Efate"
 
-#: calendar/zones.h:354
+#: ../calendar/zones.h:354
 msgid "Pacific/Enderbury"
 msgstr "Pacific/Enderbury"
 
-#: calendar/zones.h:355
+#: ../calendar/zones.h:355
 msgid "Pacific/Fakaofo"
 msgstr "Pacific/Fakaofo"
 
-#: calendar/zones.h:356
+#: ../calendar/zones.h:356
 msgid "Pacific/Fiji"
 msgstr "Pacific/Fiji"
 
-#: calendar/zones.h:357
+#: ../calendar/zones.h:357
 msgid "Pacific/Funafuti"
 msgstr "Pacific/Funafuti"
 
-#: calendar/zones.h:358
+#: ../calendar/zones.h:358
 msgid "Pacific/Galapagos"
 msgstr "Pacific/Galapagos"
 
-#: calendar/zones.h:359
+#: ../calendar/zones.h:359
 msgid "Pacific/Gambier"
 msgstr "Pacific/Gambier"
 
-#: calendar/zones.h:360
+#: ../calendar/zones.h:360
 msgid "Pacific/Guadalcanal"
 msgstr "Pacific/Guadalcanal"
 
-#: calendar/zones.h:361
+#: ../calendar/zones.h:361
 msgid "Pacific/Guam"
 msgstr "Pacific/Guam"
 
-#: calendar/zones.h:362
+#: ../calendar/zones.h:362
 msgid "Pacific/Honolulu"
 msgstr "Pacific/Honolulu"
 
-#: calendar/zones.h:363
+#: ../calendar/zones.h:363
 msgid "Pacific/Johnston"
 msgstr "Pacific/Johnston"
 
-#: calendar/zones.h:364
+#: ../calendar/zones.h:364
 msgid "Pacific/Kiritimati"
 msgstr "Pacific/Kiritimati"
 
-#: calendar/zones.h:365
+#: ../calendar/zones.h:365
 msgid "Pacific/Kosrae"
 msgstr "Pacific/Kosrae"
 
-#: calendar/zones.h:366
+#: ../calendar/zones.h:366
 msgid "Pacific/Kwajalein"
 msgstr "Pacific/Kwajalein"
 
-#: calendar/zones.h:367
+#: ../calendar/zones.h:367
 msgid "Pacific/Majuro"
 msgstr "Pacific/Majuro"
 
-#: calendar/zones.h:368
+#: ../calendar/zones.h:368
 msgid "Pacific/Marquesas"
 msgstr "Pacific/Marquesas"
 
-#: calendar/zones.h:369
+#: ../calendar/zones.h:369
 msgid "Pacific/Midway"
 msgstr "Pacific/Midway"
 
-#: calendar/zones.h:370
+#: ../calendar/zones.h:370
 msgid "Pacific/Nauru"
 msgstr "Pacific/Nauru"
 
-#: calendar/zones.h:371
+#: ../calendar/zones.h:371
 msgid "Pacific/Niue"
 msgstr "Pacific/Niue"
 
-#: calendar/zones.h:372
+#: ../calendar/zones.h:372
 msgid "Pacific/Norfolk"
 msgstr "Pacific/Norfolk"
 
-#: calendar/zones.h:373
+#: ../calendar/zones.h:373
 msgid "Pacific/Noumea"
 msgstr "Pacific/Noumea"
 
-#: calendar/zones.h:374
+#: ../calendar/zones.h:374
 msgid "Pacific/Pago_Pago"
 msgstr "Pacific/Pago_Pago"
 
-#: calendar/zones.h:375
+#: ../calendar/zones.h:375
 msgid "Pacific/Palau"
 msgstr "Pacific/Palau"
 
-#: calendar/zones.h:376
+#: ../calendar/zones.h:376
 msgid "Pacific/Pitcairn"
 msgstr "Pacific/Pitcairn"
 
-#: calendar/zones.h:377
+#: ../calendar/zones.h:377
 msgid "Pacific/Ponape"
 msgstr "Pacific/Ponape"
 
-#: calendar/zones.h:378
+#: ../calendar/zones.h:378
 msgid "Pacific/Port_Moresby"
 msgstr "Pacific/Port_Moresby"
 
-#: calendar/zones.h:379
+#: ../calendar/zones.h:379
 msgid "Pacific/Rarotonga"
 msgstr "Pacific/Rarotonga"
 
-#: calendar/zones.h:380
+#: ../calendar/zones.h:380
 msgid "Pacific/Saipan"
 msgstr "Pacific/Saipan"
 
-#: calendar/zones.h:381
+#: ../calendar/zones.h:381
 msgid "Pacific/Tahiti"
 msgstr "Pacific/Tahiti"
 
-#: calendar/zones.h:382
+#: ../calendar/zones.h:382
 msgid "Pacific/Tarawa"
 msgstr "Pacific/Tarawa"
 
-#: calendar/zones.h:383
+#: ../calendar/zones.h:383
 msgid "Pacific/Tongatapu"
 msgstr "Pacific/Tongatapu"
 
-#: calendar/zones.h:384
+#: ../calendar/zones.h:384
 msgid "Pacific/Truk"
 msgstr "Pacific/Truk"
 
-#: calendar/zones.h:385
+#: ../calendar/zones.h:385
 msgid "Pacific/Wake"
 msgstr "Pacific/Wake"
 
-#: calendar/zones.h:386
+#: ../calendar/zones.h:386
 msgid "Pacific/Wallis"
 msgstr "Pacific/Wallis"
 
-#: calendar/zones.h:387
+#: ../calendar/zones.h:387
 msgid "Pacific/Yap"
 msgstr "Pacific/Yap"
 
-#: composer/e-msg-composer-hdrs.c:519
+#: ../composer/e-msg-composer-hdrs.c:520
 msgid "Posting destination"
 msgstr "Posting destination"
 
-#: composer/e-msg-composer-hdrs.c:520
+#: ../composer/e-msg-composer-hdrs.c:521
 msgid "Choose folders to post the message to."
 msgstr "Choose folders to post the message to."
 
-#: composer/e-msg-composer-hdrs.c:554
+#: ../composer/e-msg-composer-hdrs.c:555
 msgid "Click here for the address book"
 msgstr "Click here for the address book"
 
@@ -9404,45 +9482,45 @@ msgstr "Click here for the address book"
 #. * because that causes from_changed to be called, which
 #. * expects the reply_to fields to be initialized.
 #.
-#: composer/e-msg-composer-hdrs.c:584
+#: ../composer/e-msg-composer-hdrs.c:585
 msgid "_Reply-To:"
 msgstr "_Reply-To:"
 
 #.
 #. * From
 #.
-#: composer/e-msg-composer-hdrs.c:591
+#: ../composer/e-msg-composer-hdrs.c:592
 msgid "Fr_om:"
 msgstr "Fr_om:"
 
 #.
 #. * Subject
 #.
-#: composer/e-msg-composer-hdrs.c:598
+#: ../composer/e-msg-composer-hdrs.c:599
 msgid "S_ubject:"
 msgstr "S_ubject:"
 
-#: composer/e-msg-composer-hdrs.c:608
+#: ../composer/e-msg-composer-hdrs.c:609
 msgid "_To:"
 msgstr "_To:"
 
-#: composer/e-msg-composer-hdrs.c:609
+#: ../composer/e-msg-composer-hdrs.c:610
 msgid "Enter the recipients of the message"
 msgstr "Enter the recipients of the message"
 
-#: composer/e-msg-composer-hdrs.c:612
+#: ../composer/e-msg-composer-hdrs.c:613
 msgid "_Cc:"
 msgstr "_Cc:"
 
-#: composer/e-msg-composer-hdrs.c:613
+#: ../composer/e-msg-composer-hdrs.c:614
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "Enter the addresses that will receive a carbon copy of the message"
 
-#: composer/e-msg-composer-hdrs.c:616
+#: ../composer/e-msg-composer-hdrs.c:617
 msgid "_Bcc:"
 msgstr "_Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:617
+#: ../composer/e-msg-composer-hdrs.c:618
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -9453,25 +9531,25 @@ msgstr ""
 #.
 #. * Post-To
 #.
-#: composer/e-msg-composer-hdrs.c:624
+#: ../composer/e-msg-composer-hdrs.c:625
 msgid "_Post To:"
 msgstr "_Post To:"
 
-#: composer/e-msg-composer-hdrs.c:629
+#: ../composer/e-msg-composer-hdrs.c:630
 msgid "Click here to select folders to post to"
 msgstr "Click here to select folders to post to"
 
-#: composer/e-msg-composer-hdrs.c:635
+#: ../composer/e-msg-composer-hdrs.c:636
 msgid "Post To:"
 msgstr "Post To:"
 
-#: composer/e-msg-composer.c:730
+#: ../composer/e-msg-composer.c:730
 msgid ""
 "Cannot sign outgoing message: No signing certificate set for this account"
 msgstr ""
 "Cannot sign outgoing message: No signing certificate set for this account"
 
-#: composer/e-msg-composer.c:737
+#: ../composer/e-msg-composer.c:737
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for this "
 "account"
@@ -9479,42 +9557,42 @@ msgstr ""
 "Cannot encrypt outgoing message: No encryption certificate set for this "
 "account"
 
-#: composer/e-msg-composer.c:1222 composer/e-msg-composer.c:1255
+#: ../composer/e-msg-composer.c:1222 ../composer/e-msg-composer.c:1255
 msgid "Unknown reason"
 msgstr "Unknown reason"
 
-#: composer/e-msg-composer.c:1292
+#: ../composer/e-msg-composer.c:1292
 msgid "Could not open file"
 msgstr "Could not open file"
 
-#: composer/e-msg-composer.c:1300
+#: ../composer/e-msg-composer.c:1300
 msgid "Unable to retrieve message from editor"
 msgstr "Unable to retrieve message from editor"
 
-#: composer/e-msg-composer.c:1570
+#: ../composer/e-msg-composer.c:1570
 msgid "Untitled Message"
 msgstr "Untitled Message"
 
 #. NB: This function is never used anymore
-#: composer/e-msg-composer.c:1604
+#: ../composer/e-msg-composer.c:1604
 msgid "Open File"
 msgstr "Open File"
 
-#: composer/e-msg-composer.c:2001 mail/em-account-editor.c:578
-#: mail/em-account-editor.c:623 mail/em-account-editor.c:690
+#: ../composer/e-msg-composer.c:2001 ../mail/em-account-editor.c:588
+#: ../mail/em-account-editor.c:633 ../mail/em-account-editor.c:698
 msgid "Autogenerated"
 msgstr "Autogenerated"
 
-#: composer/e-msg-composer.c:2100
+#: ../composer/e-msg-composer.c:2100
 msgid "Si_gnature:"
 msgstr "Si_gnature:"
 
-#: composer/e-msg-composer.c:2359 composer/e-msg-composer.c:3360
-#: composer/e-msg-composer.c:3361
+#: ../composer/e-msg-composer.c:2359 ../composer/e-msg-composer.c:3376
+#: ../composer/e-msg-composer.c:3377
 msgid "Compose a message"
 msgstr "Compose a message"
 
-#: composer/e-msg-composer.c:4542
+#: ../composer/e-msg-composer.c:4570
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)"
 "<b>"
@@ -9523,22 +9601,22 @@ msgstr ""
 "<b>"
 
 #. mail-composer:no-attach primary
-#: composer/mail-composer-errors.xml.h:2
+#: ../composer/mail-composer-errors.xml.h:2
 msgid "You cannot attach the file `{0}' to this message."
 msgstr "You cannot attach the file `{0}' to this message."
 
 #. mail-composer:attach-notfile primary
-#: composer/mail-composer-errors.xml.h:6
+#: ../composer/mail-composer-errors.xml.h:6
 msgid "The file `{0}' is not a regular file and cannot be sent in a message."
 msgstr "The file `{0}' is not a regular file and cannot be sent in a message."
 
 #. mail-composer:attach-directory primary
-#: composer/mail-composer-errors.xml.h:8
+#: ../composer/mail-composer-errors.xml.h:8
 msgid "Directories can not be attached to Messages."
 msgstr "Directories can not be attached to Messages."
 
 #. mail-composer:attach-directory secondary
-#: composer/mail-composer-errors.xml.h:10
+#: ../composer/mail-composer-errors.xml.h:10
 msgid ""
 "To attach the contents of this directory, either attach the files in this "
 "directory individually, or create an archive of the directory and attach it."
@@ -9547,7 +9625,7 @@ msgstr ""
 "directory individually, or create an archive of the directory and attach it."
 
 #. mail-composer:attach-nomessages primary
-#: composer/mail-composer-errors.xml.h:12
+#: ../composer/mail-composer-errors.xml.h:12
 msgid "Could not retrieve messages to attach from {0}."
 msgstr "Could not retrieve messages to attach from {0}."
 
@@ -9557,25 +9635,25 @@ msgstr "Could not retrieve messages to attach from {0}."
 #. mail:no-delete-folder secondary
 #. system:no-save-file secondary
 #. system:no-load-file secondary
-#: composer/mail-composer-errors.xml.h:14
-#: composer/mail-composer-errors.xml.h:42 mail/mail-errors.xml.h:105
-#: mail/mail-errors.xml.h:117 widgets/misc/e-system-errors.xml.h:11
-#: widgets/misc/e-system-errors.xml.h:15
+#: ../composer/mail-composer-errors.xml.h:14
+#: ../composer/mail-composer-errors.xml.h:42 ../mail/mail-errors.xml.h:105
+#: ../mail/mail-errors.xml.h:117 ../widgets/misc/e-system-errors.xml.h:11
+#: ../widgets/misc/e-system-errors.xml.h:15
 msgid "Because \"{1}\"."
 msgstr "Because \"{1}\"."
 
 #. mail-composer:recover-autosave title
-#: composer/mail-composer-errors.xml.h:16
+#: ../composer/mail-composer-errors.xml.h:16
 msgid "Unfinished messages found"
 msgstr "Unfinished messages found"
 
 #. mail-composer:recover-autosave primary
-#: composer/mail-composer-errors.xml.h:18
+#: ../composer/mail-composer-errors.xml.h:18
 msgid "Do you want to recover unfinished messages?"
 msgstr "Do you want to recover unfinished messages?"
 
 #. mail-composer:recover-autosave secondary
-#: composer/mail-composer-errors.xml.h:20
+#: ../composer/mail-composer-errors.xml.h:20
 msgid ""
 "Evolution quit unexpectedly while you were composing a new message. "
 "Recovering the message will allow you to continue where you left off."
@@ -9583,31 +9661,31 @@ msgstr ""
 "Evolution quit unexpectedly while you were composing a new message. "
 "Recovering the message will allow you to continue where you left off."
 
-#: composer/mail-composer-errors.xml.h:21
+#: ../composer/mail-composer-errors.xml.h:21
 msgid "Don't Recover"
 msgstr "Don't Recover"
 
-#: composer/mail-composer-errors.xml.h:22
+#: ../composer/mail-composer-errors.xml.h:22
 msgid "Recover"
 msgstr "Recover"
 
 #. mail-composer:no-autosave primary
-#: composer/mail-composer-errors.xml.h:24
+#: ../composer/mail-composer-errors.xml.h:24
 msgid "Could not save to autosave file \"{0}\"."
 msgstr "Could not save to autosave file \"{0}\"."
 
 #. mail-composer:no-autosave secondary
-#: composer/mail-composer-errors.xml.h:26
+#: ../composer/mail-composer-errors.xml.h:26
 msgid "Error saving to autosave because \"{1}\"."
 msgstr "Error saving to autosave because \"{1}\"."
 
 #. mail-composer:exit-unsaved title
-#: composer/mail-composer-errors.xml.h:28
+#: ../composer/mail-composer-errors.xml.h:28
 msgid "Warning: Modified Message"
 msgstr "Warning: Modified Message"
 
 #. mail-composer:exit-unsaved primary
-#: composer/mail-composer-errors.xml.h:30
+#: ../composer/mail-composer-errors.xml.h:30
 msgid ""
 "Are you sure you want to discard the message, titled '{0}', you are "
 "composing?"
@@ -9616,7 +9694,7 @@ msgstr ""
 "composing?"
 
 #. mail-composer:exit-unsaved secondary
-#: composer/mail-composer-errors.xml.h:32
+#: ../composer/mail-composer-errors.xml.h:32
 msgid ""
 "Closing this composer window will discard the message permanently, unless "
 "you choose to save the message in your Drafts folder. This will allow you to "
@@ -9626,53 +9704,53 @@ msgstr ""
 "you choose to save the message in your Drafts folder. This will allow you to "
 "continue the message at a later date."
 
-#: composer/mail-composer-errors.xml.h:33
+#: ../composer/mail-composer-errors.xml.h:33
 msgid "_Discard Changes"
 msgstr "_Discard Changes"
 
-#: composer/mail-composer-errors.xml.h:34
+#: ../composer/mail-composer-errors.xml.h:34
 msgid "_Save Message"
 msgstr "_Save Message"
 
 #. mail-composer:no-build-message primary
-#: composer/mail-composer-errors.xml.h:36
+#: ../composer/mail-composer-errors.xml.h:36
 msgid "Could not create message."
 msgstr "Could not create message."
 
 #. mail-composer:no-build-message secondary
-#: composer/mail-composer-errors.xml.h:38
+#: ../composer/mail-composer-errors.xml.h:38
 msgid "Because \"{0}\", you may need to select different mail options."
 msgstr "Because \"{0}\", you may need to select different mail options."
 
 #. mail-composer:no-sig-file primary
-#: composer/mail-composer-errors.xml.h:40
+#: ../composer/mail-composer-errors.xml.h:40
 msgid "Could not read signature file \"{0}\"."
 msgstr "Could not read signature file \"{0}\"."
 
 #. mail-composer:all-accounts-deleted primary
-#: composer/mail-composer-errors.xml.h:44
+#: ../composer/mail-composer-errors.xml.h:44
 msgid "All accounts have been removed."
 msgstr "All accounts have been removed."
 
 #. mail-composer:all-accounts-deleted secondary
-#: composer/mail-composer-errors.xml.h:46
+#: ../composer/mail-composer-errors.xml.h:46
 msgid "You need to configure an account before you can compose mail."
 msgstr "You need to configure an account before you can compose mail."
 
 #. mail-composer:no-address-control primary
 #. mail-composer:no-editor-control primary
-#: composer/mail-composer-errors.xml.h:48
-#: composer/mail-composer-errors.xml.h:52
+#: ../composer/mail-composer-errors.xml.h:48
+#: ../composer/mail-composer-errors.xml.h:52
 msgid "Could not create composer window."
 msgstr "Could not create composer window."
 
 #. mail-composer:no-address-control secondary
-#: composer/mail-composer-errors.xml.h:50
+#: ../composer/mail-composer-errors.xml.h:50
 msgid "Unable to activate the address selector control."
 msgstr "Unable to activate the address selector control."
 
 #. mail-composer:no-editor-control secondary
-#: composer/mail-composer-errors.xml.h:54
+#: ../composer/mail-composer-errors.xml.h:54
 msgid ""
 "Unable to activate the HTML editor control.\n"
 "\n"
@@ -9684,23 +9762,23 @@ msgstr ""
 "Please make sure that you have the correct version of gtkhtml and libgtkhtml "
 "installed."
 
-#: data/evolution.desktop.in.in.h:1 shell/main.c:520
+#: ../data/evolution.desktop.in.in.h:1 ../shell/main.c:521
 msgid "Evolution"
 msgstr "Evolution"
 
-#: data/evolution.desktop.in.in.h:2
+#: ../data/evolution.desktop.in.in.h:2
 msgid "The Evolution Groupware Suite"
 msgstr "The Evolution Groupware Suite"
 
-#: data/evolution.keys.in.in.h:1
+#: ../data/evolution.keys.in.in.h:1
 msgid "address card"
 msgstr "address card"
 
-#: data/evolution.keys.in.in.h:2
+#: ../data/evolution.keys.in.in.h:2
 msgid "calendar information"
 msgstr "calendar information"
 
-#: designs/OOA/ooa.glade.h:1
+#: ../designs/OOA/ooa.glade.h:1
 msgid ""
 "<b>Currently, your status is \"Out of the Office\". </b>\n"
 "\n"
@@ -9710,15 +9788,15 @@ msgstr ""
 "\n"
 "Would you like to change your status to \"In the Office\"? "
 
-#: designs/OOA/ooa.glade.h:4
+#: ../designs/OOA/ooa.glade.h:4
 msgid "<b>Out of Office Message:</b>"
 msgstr "<b>Out of Office Message:</b>"
 
-#: designs/OOA/ooa.glade.h:5
+#: ../designs/OOA/ooa.glade.h:5
 msgid "<b>Status:</b>"
 msgstr "<b>Status:</b>"
 
-#: designs/OOA/ooa.glade.h:6
+#: ../designs/OOA/ooa.glade.h:6
 msgid ""
 "<small>The message specified below will be automatically sent to each person "
 "who sends\n"
@@ -9728,39 +9806,39 @@ msgstr ""
 "who sends\n"
 "mail to you while you are out of the office.</small>"
 
-#: designs/OOA/ooa.glade.h:8
+#: ../designs/OOA/ooa.glade.h:8
 msgid "I am currently in the office"
 msgstr "I am currently in the office"
 
-#: designs/OOA/ooa.glade.h:9
+#: ../designs/OOA/ooa.glade.h:9
 msgid "I am currently out of the office"
 msgstr "I am currently out of the office"
 
-#: designs/OOA/ooa.glade.h:10
+#: ../designs/OOA/ooa.glade.h:10
 msgid "No, Don't Change Status"
 msgstr "No, Don't Change Status"
 
-#: designs/OOA/ooa.glade.h:12
+#: ../designs/OOA/ooa.glade.h:12
 msgid "Out of Office Assistant"
 msgstr "Out of Office Assistant"
 
-#: designs/OOA/ooa.glade.h:13
+#: ../designs/OOA/ooa.glade.h:13
 msgid "Yes, Change Status"
 msgstr "Yes, Change Status"
 
-#: designs/read_receipts/read.glade.h:1
+#: ../designs/read_receipts/read.glade.h:1
 msgid "      "
 msgstr "      "
 
-#: designs/read_receipts/read.glade.h:2
+#: ../designs/read_receipts/read.glade.h:2
 msgid "<b>Receiving Email</b>"
 msgstr "<b>Receiving Email</b>"
 
-#: designs/read_receipts/read.glade.h:3
+#: ../designs/read_receipts/read.glade.h:3
 msgid "<b>Sending Email:</b>"
 msgstr "<b>Sending Email:</b>"
 
-#: designs/read_receipts/read.glade.h:4
+#: ../designs/read_receipts/read.glade.h:4
 msgid ""
 "<small>This page allows you to choose if you want to be notified via a read "
 "receipt when a message you\n"
@@ -9772,31 +9850,31 @@ msgstr ""
 "sent is read, and to specify what Evolution should do when someone requests "
 "a receipt from you.</small>"
 
-#: designs/read_receipts/read.glade.h:6
+#: ../designs/read_receipts/read.glade.h:6
 msgid "Always send back a read reciept"
 msgstr "Always send back a read reciept"
 
-#: designs/read_receipts/read.glade.h:7
+#: ../designs/read_receipts/read.glade.h:7
 msgid "Ask me if I want to send back a read receipt"
 msgstr "Ask me if I want to send back a read receipt"
 
-#: designs/read_receipts/read.glade.h:8
+#: ../designs/read_receipts/read.glade.h:8
 msgid "Never send back a read receipt"
 msgstr "Never send back a read receipt"
 
-#: designs/read_receipts/read.glade.h:9
+#: ../designs/read_receipts/read.glade.h:9
 msgid "Read Receipts"
 msgstr "Read Receipts"
 
-#: designs/read_receipts/read.glade.h:10
+#: ../designs/read_receipts/read.glade.h:10
 msgid "Request a read receipt for all messages I send"
 msgstr "Request a read receipt for all messages I send"
 
-#: designs/read_receipts/read.glade.h:11
+#: ../designs/read_receipts/read.glade.h:11
 msgid "Unless the message is sent to a mailing list, and not to me personally"
 msgstr "Unless the message is sent to a mailing list, and not to me personally"
 
-#: designs/read_receipts/read.glade.h:12
+#: ../designs/read_receipts/read.glade.h:12
 msgid ""
 "When you receive an email with a read receipt request, what should Evolution "
 "do?"
@@ -9804,7 +9882,7 @@ msgstr ""
 "When you receive an email with a read receipt request, what should Evolution "
 "do?"
 
-#: e-util/e-dialog-utils.c:267
+#: ../e-util/e-dialog-utils.c:267
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
@@ -9813,23 +9891,15 @@ msgstr ""
 "Overwrite it?"
 
 #. system:ask-save-file-exists-overwrite title
-#: e-util/e-dialog-utils.c:269 widgets/misc/e-system-errors.xml.h:2
+#: ../e-util/e-dialog-utils.c:269 ../widgets/misc/e-system-errors.xml.h:2
 msgid "Overwrite file?"
 msgstr "Overwrite file?"
 
-#: e-util/e-passwords.c:472
-msgid "_Remember this password"
-msgstr "_Remember this password"
-
-#: e-util/e-passwords.c:473
-msgid "_Remember this password for the remainder of this session"
-msgstr "_Remember this password for the remainder of this session"
-
 #. strptime format of a weekday, a date and a time,
 #. in 12-hour format, without seconds.
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format, without seconds.
-#: e-util/e-time-utils.c:185 e-util/e-time-utils.c:398
+#: ../e-util/e-time-utils.c:185 ../e-util/e-time-utils.c:398
 msgid "%a %m/%d/%Y %I:%M %p"
 msgstr "%a %d/%m/%Y %I:%M %p"
 
@@ -9837,65 +9907,65 @@ msgstr "%a %d/%m/%Y %I:%M %p"
 #. in 24-hour format, without seconds.
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format, without seconds.
-#: e-util/e-time-utils.c:190 e-util/e-time-utils.c:389
+#: ../e-util/e-time-utils.c:190 ../e-util/e-time-utils.c:389
 msgid "%a %m/%d/%Y %H:%M"
 msgstr "%a %d/%m/%Y %H:%M"
 
 #. strptime format of a weekday, a date and a time,
 #. in 12-hour format, without minutes or seconds.
-#: e-util/e-time-utils.c:195
+#: ../e-util/e-time-utils.c:195
 msgid "%a %m/%d/%Y %I %p"
 msgstr "%a %d/%m/%Y %I %p"
 
 #. strptime format of a weekday, a date and a time,
 #. in 24-hour format, without minutes or seconds.
-#: e-util/e-time-utils.c:200
+#: ../e-util/e-time-utils.c:200
 msgid "%a %m/%d/%Y %H"
 msgstr "%a %d/%m/%Y %H"
 
 #. strptime format of a date and a time, in 12-hour format.
-#: e-util/e-time-utils.c:211
+#: ../e-util/e-time-utils.c:211
 msgid "%m/%d/%Y %I:%M:%S %p"
 msgstr "%d/%m/%Y %I:%M:%S %p"
 
 #. strptime format of a date and a time, in 24-hour format.
-#: e-util/e-time-utils.c:215
+#: ../e-util/e-time-utils.c:215
 msgid "%m/%d/%Y %H:%M:%S"
 msgstr "%d/%m/%Y %H:%M:%S"
 
 #. strptime format of a date and a time, in 12-hour format,
 #. without seconds.
-#: e-util/e-time-utils.c:220
+#: ../e-util/e-time-utils.c:220
 msgid "%m/%d/%Y %I:%M %p"
 msgstr "%d/%m/%Y %I:%M %p"
 
 #. strptime format of a date and a time, in 24-hour format,
 #. without seconds.
-#: e-util/e-time-utils.c:225
+#: ../e-util/e-time-utils.c:225
 msgid "%m/%d/%Y %H:%M"
 msgstr "%d/%m/%Y %H:%M"
 
 #. strptime format of a date and a time, in 12-hour format,
 #. without minutes or seconds.
-#: e-util/e-time-utils.c:230
+#: ../e-util/e-time-utils.c:230
 msgid "%m/%d/%Y %I %p"
 msgstr "%d/%m/%Y %I %p"
 
 #. strptime format of a date and a time, in 24-hour format,
 #. without minutes or seconds.
-#: e-util/e-time-utils.c:235
+#: ../e-util/e-time-utils.c:235
 msgid "%m/%d/%Y %H"
 msgstr "%d/%m/%Y %H"
 
 #. strptime format for a time of day, in 12-hour format.
 #. strftime format of a time in 12-hour format.
-#: e-util/e-time-utils.c:339 e-util/e-time-utils.c:438
+#: ../e-util/e-time-utils.c:339 ../e-util/e-time-utils.c:438
 msgid "%I:%M:%S %p"
 msgstr "%I:%M:%S %p"
 
 #. strptime format for a time of day, in 24-hour format.
 #. strftime format of a time in 24-hour format.
-#: e-util/e-time-utils.c:343 e-util/e-time-utils.c:430
+#: ../e-util/e-time-utils.c:343 ../e-util/e-time-utils.c:430
 msgid "%H:%M:%S"
 msgstr "%H:%M:%S"
 
@@ -9904,8 +9974,8 @@ msgstr "%H:%M:%S"
 #. strftime format of a time in 12-hour format,
 #. without seconds.
 #. This is a strftime() format. %I = hour (1-12), %M = minute, %p = am/pm string.
-#: e-util/e-time-utils.c:348 e-util/e-time-utils.c:435
-#: widgets/misc/e-dateedit.c:1431 widgets/misc/e-dateedit.c:1697
+#: ../e-util/e-time-utils.c:348 ../e-util/e-time-utils.c:435
+#: ../widgets/misc/e-dateedit.c:1431 ../widgets/misc/e-dateedit.c:1697
 msgid "%I:%M %p"
 msgstr "%I:%M %p"
 
@@ -9913,225 +9983,226 @@ msgstr "%I:%M %p"
 #. strftime format of a time in 24-hour format,
 #. without seconds.
 #. This is a strftime() format. %H = hour (0-23), %M = minute.
-#: e-util/e-time-utils.c:352 e-util/e-time-utils.c:427
-#: widgets/misc/e-dateedit.c:1428 widgets/misc/e-dateedit.c:1694
+#: ../e-util/e-time-utils.c:352 ../e-util/e-time-utils.c:427
+#: ../widgets/misc/e-dateedit.c:1428 ../widgets/misc/e-dateedit.c:1694
 msgid "%H:%M"
 msgstr "%H:%M"
 
 #. strptime format for hour and AM/PM, 12-hour format.
-#: e-util/e-time-utils.c:356
+#: ../e-util/e-time-utils.c:356
 msgid "%I %p"
 msgstr "%I %p"
 
-#: e-util/eggtrayicon.c:119
+#: ../e-util/eggtrayicon.c:119
 msgid "The orientation of the tray."
 msgstr "The orientation of the tray."
 
-#: filter/filter-datespec.c:73
+#: ../filter/filter-datespec.c:73
 #, c-format
 msgid "1 second ago"
 msgid_plural "%d seconds ago"
 msgstr[0] "1 second ago"
 msgstr[1] "1 second ago"
 
-#: filter/filter-datespec.c:74
+#: ../filter/filter-datespec.c:74
 #, c-format
 msgid "1 minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "1 minute ago"
 msgstr[1] "1 minute ago"
 
-#: filter/filter-datespec.c:75
+#: ../filter/filter-datespec.c:75
 #, c-format
 msgid "1 hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "1 hour ago"
 msgstr[1] "1 hour ago"
 
-#: filter/filter-datespec.c:76
+#: ../filter/filter-datespec.c:76
 #, c-format
 msgid "1 day ago"
 msgid_plural "%d days ago"
 msgstr[0] "1 day ago"
 msgstr[1] "1 day ago"
 
-#: filter/filter-datespec.c:77
+#: ../filter/filter-datespec.c:77
 #, c-format
 msgid "1 week ago"
 msgid_plural "%d weeks ago"
 msgstr[0] "1 week ago"
 msgstr[1] "1 week ago"
 
-#: filter/filter-datespec.c:78
+#: ../filter/filter-datespec.c:78
 #, c-format
 msgid "1 month ago"
 msgid_plural "%d months ago"
 msgstr[0] "1 month ago"
 msgstr[1] "1 month ago"
 
-#: filter/filter-datespec.c:79
+#: ../filter/filter-datespec.c:79
 #, c-format
 msgid "1 year ago"
 msgid_plural "%d years ago"
 msgstr[0] "1 year ago"
 msgstr[1] "1 year ago"
 
-#: filter/filter-datespec.c:280
+#: ../filter/filter-datespec.c:280
 msgid "<click here to select a date>"
 msgstr "<click here to select a date>"
 
-#: filter/filter-datespec.c:283 filter/filter-datespec.c:294
+#: ../filter/filter-datespec.c:283 ../filter/filter-datespec.c:294
 msgid "now"
 msgstr "now"
 
 #. strftime for date filter display, only needs to show a day date (i.e. no time)
-#: filter/filter-datespec.c:290
+#: ../filter/filter-datespec.c:290
 msgid "%d-%b-%Y"
 msgstr "%d-%b-%Y"
 
-#: filter/filter-datespec.c:406
+#: ../filter/filter-datespec.c:406
 msgid "Select a time to compare against"
 msgstr "Select a time to compare against"
 
 #. filter:no-date primary
-#: filter/filter-errors.xml.h:2
+#: ../filter/filter-errors.xml.h:2
 msgid "Missing date."
 msgstr "Missing date."
 
 #. filter:no-date secondary
-#: filter/filter-errors.xml.h:4
+#: ../filter/filter-errors.xml.h:4
 msgid "You must choose a date."
 msgstr "You must choose a date."
 
 #. filter:no-file primary
-#: filter/filter-errors.xml.h:6
+#: ../filter/filter-errors.xml.h:6
 msgid "Missing file name."
 msgstr "Missing file name."
 
 #. filter:no-file secondary
 #. filter:bad-file secondary
-#: filter/filter-errors.xml.h:8 filter/filter-errors.xml.h:12
+#: ../filter/filter-errors.xml.h:8 ../filter/filter-errors.xml.h:12
 msgid "You must specify a file name."
 msgstr "You must specify a file name."
 
 #. filter:bad-file primary
-#: filter/filter-errors.xml.h:10
+#: ../filter/filter-errors.xml.h:10
 msgid "File \"{0}\" does not exist or is not a regular file."
 msgstr "File \"{0}\" does not exist or is not a regular file."
 
 #. filter:bad-regexp primary
-#: filter/filter-errors.xml.h:14
+#: ../filter/filter-errors.xml.h:14
 msgid "Bad regular expression \"{0}\"."
 msgstr "Bad regular expression \"{0}\"."
 
 #. filter:bad-regexp secondary
-#: filter/filter-errors.xml.h:16
+#: ../filter/filter-errors.xml.h:16
 msgid "Could not compile regular expression \"{1}\"."
 msgstr "Could not compile regular expression \"{1}\"."
 
 #. filter:no-name primary
 #. mail:no-name-vfolder primary
-#: filter/filter-errors.xml.h:18 mail/mail-errors.xml.h:219
+#: ../filter/filter-errors.xml.h:18 ../mail/mail-errors.xml.h:219
 msgid "Missing name."
 msgstr "Missing name."
 
 #. filter:no-name secondary
-#: filter/filter-errors.xml.h:20
+#: ../filter/filter-errors.xml.h:20
 msgid "You must name this filter."
 msgstr "You must name this filter."
 
 #. filter:bad-name-notunique primary
-#: filter/filter-errors.xml.h:22
+#: ../filter/filter-errors.xml.h:22
 msgid "Name \"{0}\" already used."
 msgstr "Name \"{0}\" already used."
 
 #. filter:bad-name-notunique secondary
-#: filter/filter-errors.xml.h:24
+#: ../filter/filter-errors.xml.h:24
 msgid "Please choose another name."
 msgstr "Please choose another name."
 
-#: filter/filter-file.c:288
+#: ../filter/filter-file.c:288
 msgid "Choose a file"
 msgstr "Choose a file"
 
-#: filter/filter-label.c:121 mail/em-filter-i18n.h:26 mail/em-migrate.c:1011
-#: mail/mail-config.c:75 mail/mail-config.glade.h:90
+#: ../filter/filter-label.c:121 ../mail/em-filter-i18n.h:26
+#: ../mail/em-migrate.c:1041 ../mail/mail-config.c:76
+#: ../mail/mail-config.glade.h:90
 msgid "Important"
 msgstr "Important"
 
 #. forest green
-#: filter/filter-label.c:124 mail/em-migrate.c:1014 mail/mail-config.c:78
-#: mail/mail-config.glade.h:140
+#: ../filter/filter-label.c:124 ../mail/em-migrate.c:1044
+#: ../mail/mail-config.c:79 ../mail/mail-config.glade.h:140
 msgid "To Do"
 msgstr "To Do"
 
 #. blue
-#: filter/filter-label.c:125 mail/em-migrate.c:1015 mail/mail-config.c:79
-#: mail/mail-config.glade.h:93
+#: ../filter/filter-label.c:125 ../mail/em-migrate.c:1045
+#: ../mail/mail-config.c:80 ../mail/mail-config.glade.h:93
 msgid "Later"
 msgstr "Later"
 
-#: filter/filter-part.c:532 shell/GNOME_Evolution_Test.server.in.in.h:3
+#: ../filter/filter-part.c:532 ../shell/GNOME_Evolution_Test.server.in.in.h:3
 msgid "Test"
 msgstr "Test"
 
-#: filter/filter-rule.c:790
+#: ../filter/filter-rule.c:790
 msgid "_Rule name:"
 msgstr "_Rule name:"
 
-#: filter/filter-rule.c:818
+#: ../filter/filter-rule.c:818
 msgid "<b>If</b>"
 msgstr "<b>If</b>"
 
-#: filter/filter-rule.c:855
+#: ../filter/filter-rule.c:855
 msgid "if all criteria are met"
 msgstr "if all criteria are met"
 
-#: filter/filter-rule.c:855
+#: ../filter/filter-rule.c:855
 msgid "if any criteria are met"
 msgstr "if any criteria are met"
 
-#: filter/filter-rule.c:857
+#: ../filter/filter-rule.c:857
 msgid "Execute actions"
 msgstr "Execute actions"
 
-#: filter/filter-rule.c:878
+#: ../filter/filter-rule.c:878
 msgid "All related"
 msgstr "All related"
 
-#: filter/filter-rule.c:878
+#: ../filter/filter-rule.c:878
 msgid "Replies"
 msgstr "Replies"
 
-#: filter/filter-rule.c:878
+#: ../filter/filter-rule.c:878
 msgid "Replies and parents"
 msgstr "Replies and parents"
 
-#: filter/filter-rule.c:880
+#: ../filter/filter-rule.c:880
 msgid "Include threads"
 msgstr "Include threads"
 
-#: filter/filter-rule.c:975 filter/filter.glade.h:3
+#: ../filter/filter-rule.c:975 ../filter/filter.glade.h:3
 msgid "Incoming"
 msgstr "Incoming"
 
-#: filter/filter-rule.c:975
+#: ../filter/filter-rule.c:975
 msgid "Outgoing"
 msgstr "Outgoing"
 
-#: filter/filter.glade.h:1
+#: ../filter/filter.glade.h:1
 msgid "<b>_Filter Rules</b>"
 msgstr "<b>_Filter Rules</b>"
 
-#: filter/filter.glade.h:2
+#: ../filter/filter.glade.h:2
 msgid "Compare against"
 msgstr "Compare against"
 
-#: filter/filter.glade.h:4
+#: ../filter/filter.glade.h:4
 msgid "Show filters for mail:"
 msgstr "Show filters for mail:"
 
-#: filter/filter.glade.h:5
+#: ../filter/filter.glade.h:5
 msgid ""
 "The message's date will be compared against\n"
 "12:00am of the date specified."
@@ -10139,7 +10210,7 @@ msgstr ""
 "The message's date will be compared against\n"
 "12:00am of the date specified."
 
-#: filter/filter.glade.h:7
+#: ../filter/filter.glade.h:7
 msgid ""
 "The message's date will be compared against\n"
 "a time relative to when filtering occurs."
@@ -10147,7 +10218,7 @@ msgstr ""
 "The message's date will be compared against\n"
 "a time relative to when filtering occurs."
 
-#: filter/filter.glade.h:9
+#: ../filter/filter.glade.h:9
 msgid ""
 "The message's date will be compared against\n"
 "the current time when filtering occurs."
@@ -10155,113 +10226,115 @@ msgstr ""
 "The message's date will be compared against\n"
 "the current time when filtering occurs."
 
-#: filter/filter.glade.h:12
+#: ../filter/filter.glade.h:12
 msgid "a time relative to the current time"
 msgstr "a time relative to the current time"
 
-#: filter/filter.glade.h:13
+#: ../filter/filter.glade.h:13
 msgid "ago"
 msgstr "ago"
 
-#: filter/filter.glade.h:17
+#: ../filter/filter.glade.h:17
 msgid "months"
 msgstr "months"
 
-#: filter/filter.glade.h:18 mail/mail-config.glade.h:172
+#: ../filter/filter.glade.h:18 ../mail/mail-config.glade.h:172
 msgid "seconds"
 msgstr "seconds"
 
-#: filter/filter.glade.h:19
+#: ../filter/filter.glade.h:19
 msgid "the current time"
 msgstr "the current time"
 
-#: filter/filter.glade.h:20
+#: ../filter/filter.glade.h:20
 msgid "the time you specify"
 msgstr "the time you specify"
 
-#: filter/filter.glade.h:22
+#: ../filter/filter.glade.h:22
 msgid "years"
 msgstr "years"
 
-#: filter/rule-editor.c:285
+#: ../filter/rule-editor.c:285
 msgid "Add Rule"
 msgstr "Add Rule"
 
-#: filter/rule-editor.c:361
+#: ../filter/rule-editor.c:361
 msgid "Edit Rule"
 msgstr "Edit Rule"
 
-#: filter/rule-editor.c:693
+#: ../filter/rule-editor.c:693
 msgid "Rule name"
 msgstr "Rule name"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:1
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:1
 msgid "Composer Preferences"
 msgstr "Composer Preferences"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:2
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:2
 msgid ""
 "Configure mail preferences, including security and message display, here"
 msgstr ""
 "Configure mail preferences, including security and message display, here"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:3
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:3
 msgid "Configure spell-checking, signatures, and the message composer here"
 msgstr "Configure spell-checking, signatures, and the message composer here"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:4
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:4
 msgid "Configure your email accounts here"
 msgstr "Configure your email accounts here"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:5
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:5
 msgid "Evolution Mail"
 msgstr "Evolution Mail"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:6
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:6
 msgid "Evolution Mail accounts configuration control"
 msgstr "Evolution Mail accounts configuration control"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:7
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:7
 msgid "Evolution Mail component"
 msgstr "Evolution Mail component"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:8
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:8
 msgid "Evolution Mail composer"
 msgstr "Evolution Mail composer"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:9
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:9
 msgid "Evolution Mail composer configuration control"
 msgstr "Evolution Mail composer configuration control"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:10
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:10
 msgid "Evolution Mail preferences control"
 msgstr "Evolution Mail preferences control"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:11 mail/em-folder-view.c:472
-#: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1902
-#: mail/importers/pine-importer.c:474 mail/mail-component.c:536
-#: mail/mail-component.c:587
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:11 ../mail/em-folder-view.c:469
+#: ../mail/importers/elm-importer.c:418
+#: ../mail/importers/netscape-importer.c:1902
+#: ../mail/importers/pine-importer.c:474 ../mail/mail-component.c:557
+#: ../mail/mail-component.c:608
 msgid "Mail"
 msgstr "Mail"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:12
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:12
 msgid "Mail Accounts"
 msgstr "Mail Accounts"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:13 mail/mail-config.glade.h:95
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:13
+#: ../mail/mail-config.glade.h:95
 msgid "Mail Preferences"
 msgstr "Mail Preferences"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:14
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:14
 msgid "_Mail"
 msgstr "_Mail"
 
-#: mail/em-account-editor.c:377
+#: ../mail/em-account-editor.c:387
 #, c-format
 msgid "%s License Agreement"
 msgstr "%s Licence Agreement"
 
-#: mail/em-account-editor.c:384
+#: ../mail/em-account-editor.c:394
 #, c-format
 msgid ""
 "\n"
@@ -10274,74 +10347,94 @@ msgstr ""
 "for %s displayed below\n"
 "and tick the check box for accepting it\n"
 
-#: mail/em-account-editor.c:454 mail/em-filter-folder-element.c:237
-#: mail/em-vfolder-rule.c:494
+#: ../mail/em-account-editor.c:464 ../mail/em-filter-folder-element.c:237
+#: ../mail/em-vfolder-rule.c:494
 msgid "Select Folder"
 msgstr "Select Folder"
 
-#: mail/em-account-editor.c:1817
+#: ../mail/em-account-editor.c:1661 ../mail/mail-config.glade.h:89
+msgid "Identity"
+msgstr "Identity"
+
+#: ../mail/em-account-editor.c:1697 ../mail/mail-config.glade.h:114
+msgid "Receiving Email"
+msgstr "Receiving Email"
+
+#: ../mail/em-account-editor.c:1874
 msgid "Automatically check for _new mail every"
 msgstr "Automatically check for _new mail every"
 
+#: ../mail/em-account-editor.c:2042 ../mail/mail-config.glade.h:124
+msgid "Sending Email"
+msgstr "Sending Email"
+
+#: ../mail/em-account-editor.c:2086 ../mail/mail-config.glade.h:67
+msgid "Defaults"
+msgstr "Defaults"
+
+#: ../mail/em-account-editor.c:2145 ../mail/mail-config.glade.h:119
+msgid "Security"
+msgstr "Security"
+
 #. Most sections for this is auto-generated fromt the camel config
-#: mail/em-account-editor.c:2086 mail/em-account-editor.c:2164
+#: ../mail/em-account-editor.c:2182 ../mail/em-account-editor.c:2256
 msgid "Receiving Options"
 msgstr "Receiving Options"
 
-#: mail/em-account-editor.c:2087 mail/em-account-editor.c:2165
+#: ../mail/em-account-editor.c:2183 ../mail/em-account-editor.c:2257
 msgid "Checking for New Mail"
 msgstr "Checking for New Mail"
 
-#: mail/em-account-editor.c:2509 mail/mail-config.glade.h:33
+#: ../mail/em-account-editor.c:2581 ../mail/mail-config.glade.h:33
 msgid "Account Editor"
 msgstr "Account Editor"
 
-#: mail/em-account-editor.c:2509 mail/mail-config.glade.h:79
+#: ../mail/em-account-editor.c:2581 ../mail/mail-config.glade.h:79
 msgid "Evolution Account Assistant"
 msgstr "Evolution Account Assistant"
 
 #. translators: default account indicator
-#: mail/em-account-prefs.c:412
+#: ../mail/em-account-prefs.c:428
 msgid "[Default]"
 msgstr "[Default]"
 
-#: mail/em-account-prefs.c:466
+#: ../mail/em-account-prefs.c:482
 msgid "Account name"
 msgstr "Account name"
 
-#: mail/em-account-prefs.c:468
+#: ../mail/em-account-prefs.c:484
 msgid "Protocol"
 msgstr "Protocol"
 
-#: mail/em-composer-prefs.c:306 mail/em-composer-prefs.c:429
-#: mail/mail-config.c:934
+#: ../mail/em-composer-prefs.c:306 ../mail/em-composer-prefs.c:429
+#: ../mail/mail-config.c:935
 msgid "Unnamed"
 msgstr "Unnamed"
 
-#: mail/em-composer-prefs.c:894
+#: ../mail/em-composer-prefs.c:894
 msgid "Language(s)"
 msgstr "Language(s)"
 
-#: mail/em-composer-prefs.c:937
+#: ../mail/em-composer-prefs.c:937
 msgid "Add signature script"
 msgstr "Add signature script"
 
-#: mail/em-composer-prefs.c:957
+#: ../mail/em-composer-prefs.c:957
 msgid "Signature(s)"
 msgstr "Signature(s)"
 
-#: mail/em-composer-utils.c:910
+#: ../mail/em-composer-utils.c:849
 msgid "-------- Forwarded Message --------"
 msgstr "-------- Forwarded Message --------"
 
-#: mail/em-composer-utils.c:1526
+#: ../mail/em-composer-utils.c:1459
 msgid "an unknown sender"
 msgstr "an unknown sender"
 
 #. Note to translators: this is the attribution string used when quoting messages.
 #. * each ${Variable} gets replaced with a value. To see a full list of available
 #. * variables, see em-composer-utils.c:1514
-#: mail/em-composer-utils.c:1573
+#: ../mail/em-composer-utils.c:1506
 msgid ""
 "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} wrote:"
@@ -10349,590 +10442,594 @@ msgstr ""
 "On ${AbbrevWeekdayName}, ${Year}-${Day}-${Month} at ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} wrote:"
 
-#: mail/em-filter-editor.c:147
+#: ../mail/em-filter-editor.c:147
 msgid "_Filter Rules"
 msgstr "_Filter Rules"
 
 #. Automatically generated. Do not edit.
-#: mail/em-filter-i18n.h:2
+#: ../mail/em-filter-i18n.h:2
 msgid "Adjust Score"
 msgstr "Adjust Score"
 
-#: mail/em-filter-i18n.h:3
+#: ../mail/em-filter-i18n.h:3
 msgid "Assign Color"
 msgstr "Assign Colour"
 
-#: mail/em-filter-i18n.h:4
+#: ../mail/em-filter-i18n.h:4
 msgid "Assign Score"
 msgstr "Assign Score"
 
-#: mail/em-filter-i18n.h:5
+#: ../mail/em-filter-i18n.h:5
 msgid "Attachments"
 msgstr "Attachments"
 
-#: mail/em-filter-i18n.h:6
+#: ../mail/em-filter-i18n.h:6
 msgid "Beep"
 msgstr "Beep"
 
-#: mail/em-filter-i18n.h:7
+#: ../mail/em-filter-i18n.h:7
 msgid "contains"
 msgstr "contains"
 
-#: mail/em-filter-i18n.h:8
+#: ../mail/em-filter-i18n.h:8
 msgid "Copy to Folder"
 msgstr "Copy to Folder"
 
-#: mail/em-filter-i18n.h:9
+#: ../mail/em-filter-i18n.h:9
 msgid "Date received"
 msgstr "Date received"
 
-#: mail/em-filter-i18n.h:10
+#: ../mail/em-filter-i18n.h:10
 msgid "Date sent"
 msgstr "Date sent"
 
-#: mail/em-filter-i18n.h:12
+#: ../mail/em-filter-i18n.h:12
 msgid "Deleted"
 msgstr "Deleted"
 
-#: mail/em-filter-i18n.h:13
+#: ../mail/em-filter-i18n.h:13
 msgid "does not contain"
 msgstr "does not contain"
 
-#: mail/em-filter-i18n.h:14
+#: ../mail/em-filter-i18n.h:14
 msgid "does not end with"
 msgstr "does not end with"
 
-#: mail/em-filter-i18n.h:15
+#: ../mail/em-filter-i18n.h:15
 msgid "does not exist"
 msgstr "does not exist"
 
-#: mail/em-filter-i18n.h:16
+#: ../mail/em-filter-i18n.h:16
 msgid "does not return"
 msgstr "does not return"
 
-#: mail/em-filter-i18n.h:17
+#: ../mail/em-filter-i18n.h:17
 msgid "does not sound like"
 msgstr "does not sound like"
 
-#: mail/em-filter-i18n.h:18
+#: ../mail/em-filter-i18n.h:18
 msgid "does not start with"
 msgstr "does not start with"
 
-#: mail/em-filter-i18n.h:19
+#: ../mail/em-filter-i18n.h:19
 msgid "Do Not Exist"
 msgstr "Do Not Exist"
 
-#: mail/em-filter-i18n.h:20
+#: ../mail/em-filter-i18n.h:20
 msgid "Draft"
 msgstr "Draft"
 
-#: mail/em-filter-i18n.h:21
+#: ../mail/em-filter-i18n.h:21
 msgid "ends with"
 msgstr "ends with"
 
-#: mail/em-filter-i18n.h:22
+#: ../mail/em-filter-i18n.h:22
 msgid "Exist"
 msgstr "Exist"
 
-#: mail/em-filter-i18n.h:23
+#: ../mail/em-filter-i18n.h:23
 msgid "exists"
 msgstr "exists"
 
-#: mail/em-filter-i18n.h:24
+#: ../mail/em-filter-i18n.h:24
 msgid "Expression"
 msgstr "Expression"
 
-#: mail/em-filter-i18n.h:25
+#: ../mail/em-filter-i18n.h:25
 msgid "Follow Up"
 msgstr "Follow Up"
 
-#: mail/em-filter-i18n.h:27
+#: ../mail/em-filter-i18n.h:27
 msgid "is"
 msgstr "is"
 
-#: mail/em-filter-i18n.h:28
+#: ../mail/em-filter-i18n.h:28
 msgid "is after"
 msgstr "is after"
 
-#: mail/em-filter-i18n.h:29
+#: ../mail/em-filter-i18n.h:29
 msgid "is before"
 msgstr "is before"
 
-#: mail/em-filter-i18n.h:30
+#: ../mail/em-filter-i18n.h:30
 msgid "is Flagged"
 msgstr "is Flagged"
 
-#: mail/em-filter-i18n.h:31
+#: ../mail/em-filter-i18n.h:31
 msgid "is greater than"
 msgstr "is greater than"
 
-#: mail/em-filter-i18n.h:32
+#: ../mail/em-filter-i18n.h:32
 msgid "is less than"
 msgstr "is less than"
 
-#: mail/em-filter-i18n.h:33
+#: ../mail/em-filter-i18n.h:33
 msgid "is not"
 msgstr "is not"
 
-#: mail/em-filter-i18n.h:34
+#: ../mail/em-filter-i18n.h:34
 msgid "is not Flagged"
 msgstr "is not Flagged"
 
-#: mail/em-filter-i18n.h:35 mail/mail-config.glade.h:92
-#: ui/evolution-mail-message.xml.h:48
+#: ../mail/em-filter-i18n.h:35 ../mail/mail-config.glade.h:92
+#: ../ui/evolution-mail-message.xml.h:48
 msgid "Junk"
 msgstr "Junk"
 
-#: mail/em-filter-i18n.h:36
+#: ../mail/em-filter-i18n.h:36
 msgid "Junk Test"
 msgstr "Junk Test"
 
-#: mail/em-filter-i18n.h:37 mail/em-folder-view.c:998
-#: widgets/misc/e-expander.c:189
+#: ../mail/em-filter-i18n.h:37 ../mail/em-folder-view.c:992
+#: ../widgets/misc/e-expander.c:189
 msgid "Label"
 msgstr "Label"
 
-#: mail/em-filter-i18n.h:38
+#: ../mail/em-filter-i18n.h:38
 msgid "Mailing list"
 msgstr "Mailing list"
 
-#: mail/em-filter-i18n.h:39
+#: ../mail/em-filter-i18n.h:39
 msgid "Match All"
 msgstr "Match All"
 
-#: mail/em-filter-i18n.h:40
+#: ../mail/em-filter-i18n.h:40
 msgid "Message Body"
 msgstr "Message Body"
 
-#: mail/em-filter-i18n.h:41
+#: ../mail/em-filter-i18n.h:41
 msgid "Message Header"
 msgstr "Message Header"
 
-#: mail/em-filter-i18n.h:42
+#: ../mail/em-filter-i18n.h:42
 msgid "Message is Junk"
 msgstr "Message is Junk"
 
-#: mail/em-filter-i18n.h:43
+#: ../mail/em-filter-i18n.h:43
 msgid "Message is not Junk"
 msgstr "Message is not Junk"
 
-#: mail/em-filter-i18n.h:44
+#: ../mail/em-filter-i18n.h:44
 msgid "Move to Folder"
 msgstr "Move to Folder"
 
-#: mail/em-filter-i18n.h:45
+#: ../mail/em-filter-i18n.h:45
 msgid "Pipe to Program"
 msgstr "Pipe to Program"
 
-#: mail/em-filter-i18n.h:46
+#: ../mail/em-filter-i18n.h:46
 msgid "Play Sound"
 msgstr "Play Sound"
 
-#: mail/em-filter-i18n.h:47 mail/message-tag-followup.c:80
+#: ../mail/em-filter-i18n.h:47 ../mail/message-tag-followup.c:80
 msgid "Read"
 msgstr "Read"
 
-#: mail/em-filter-i18n.h:48
+#: ../mail/em-filter-i18n.h:48
 msgid "Recipients"
 msgstr "Recipients"
 
-#: mail/em-filter-i18n.h:49
+#: ../mail/em-filter-i18n.h:49
 msgid "Regex Match"
 msgstr "Regex Match"
 
-#: mail/em-filter-i18n.h:50
+#: ../mail/em-filter-i18n.h:50
 msgid "Replied to"
 msgstr "Replied to"
 
-#: mail/em-filter-i18n.h:51
+#: ../mail/em-filter-i18n.h:51
 msgid "returns"
 msgstr "returns"
 
-#: mail/em-filter-i18n.h:52
+#: ../mail/em-filter-i18n.h:52
 msgid "returns greater than"
 msgstr "returns greater than"
 
-#: mail/em-filter-i18n.h:53
+#: ../mail/em-filter-i18n.h:53
 msgid "returns less than"
 msgstr "returns less than"
 
-#: mail/em-filter-i18n.h:54
+#: ../mail/em-filter-i18n.h:54
 msgid "Run Program"
 msgstr "Run Program"
 
-#: mail/em-filter-i18n.h:55 mail/message-list.etspec.h:10
+#: ../mail/em-filter-i18n.h:55 ../mail/message-list.etspec.h:10
 msgid "Score"
 msgstr "Score"
 
-#: mail/em-filter-i18n.h:56
+#: ../mail/em-filter-i18n.h:56
 msgid "Sender"
 msgstr "Sender"
 
-#: mail/em-filter-i18n.h:57
+#: ../mail/em-filter-i18n.h:57
 msgid "Set Status"
 msgstr "Set Status"
 
-#: mail/em-filter-i18n.h:58
+#: ../mail/em-filter-i18n.h:58
 msgid "Size (kB)"
 msgstr "Size (kB)"
 
-#: mail/em-filter-i18n.h:59
+#: ../mail/em-filter-i18n.h:59
 msgid "sounds like"
 msgstr "sounds like"
 
-#: mail/em-filter-i18n.h:60
+#: ../mail/em-filter-i18n.h:60
 msgid "Source Account"
 msgstr "Source Account"
 
-#: mail/em-filter-i18n.h:61
+#: ../mail/em-filter-i18n.h:61
 msgid "Specific header"
 msgstr "Specific header"
 
-#: mail/em-filter-i18n.h:62
+#: ../mail/em-filter-i18n.h:62
 msgid "starts with"
 msgstr "starts with"
 
-#: mail/em-filter-i18n.h:64
+#: ../mail/em-filter-i18n.h:64
 msgid "Stop Processing"
 msgstr "Stop Processing"
 
-#: mail/em-filter-i18n.h:65 mail/em-format-html.c:1533
-#: mail/em-format-quote.c:306 mail/em-format.c:853 mail/em-mailer-prefs.c:88
-#: mail/message-list.etspec.h:13 mail/message-tag-followup.c:330
-#: plugins/shared-folder/properties.glade.h:7 smime/lib/e-cert.c:1131
+#: ../mail/em-filter-i18n.h:65 ../mail/em-format-html.c:1532
+#: ../mail/em-format-quote.c:306 ../mail/em-format.c:853
+#: ../mail/em-mailer-prefs.c:88 ../mail/message-list.etspec.h:13
+#: ../mail/message-tag-followup.c:330
+#: ../plugins/shared-folder/properties.glade.h:7 ../smime/lib/e-cert.c:1131
 msgid "Subject"
 msgstr "Subject"
 
-#: mail/em-filter-i18n.h:66
+#: ../mail/em-filter-i18n.h:66
 msgid "Unset Status"
 msgstr "Unset Status"
 
 #. and now for the action area
-#: mail/em-filter-rule.c:488
+#: ../mail/em-filter-rule.c:488
 msgid "<b>Then</b>"
 msgstr "<b>Then</b>"
 
-#: mail/em-folder-browser.c:133
+#: ../mail/em-folder-browser.c:133
 msgid "Create _vFolder From Search..."
 msgstr "Create _vFolder From Search..."
 
 #. TODO: can this be done in a loop?
-#: mail/em-folder-properties.c:144
+#: ../mail/em-folder-properties.c:144
 msgid "Total message:"
 msgid_plural "Total messages:"
 msgstr[0] "Total message:"
 msgstr[1] "Total messages:"
 
-#: mail/em-folder-properties.c:156
+#: ../mail/em-folder-properties.c:156
 msgid "Unread message:"
 msgid_plural "Unread messages:"
 msgstr[0] "Unread message:"
 msgstr[1] "Unread messages:"
 
-#: mail/em-folder-properties.c:278 plugins/shared-folder/properties.glade.h:3
+#: ../mail/em-folder-properties.c:278
+#: ../plugins/shared-folder/properties.glade.h:3
 msgid "Folder Properties"
 msgstr "Folder Properties"
 
-#: mail/em-folder-selection-button.c:123
+#: ../mail/em-folder-selection-button.c:123
 msgid "<click here to select a folder>"
 msgstr "<click here to select a folder>"
 
-#: mail/em-folder-selector.c:166
+#: ../mail/em-folder-selector.c:166
 msgid "Create New Folder"
 msgstr "Create New Folder"
 
-#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2527
-#: mail/mail-component.c:739 plugins/shared-folder/install-shared.c:144
-#: plugins/shared-folder/share-folder-common.c:345
+#: ../mail/em-folder-selector.c:166 ../mail/em-folder-tree.c:2528
+#: ../mail/mail-component.c:770 ../plugins/shared-folder/install-shared.c:144
+#: ../plugins/shared-folder/share-folder-common.c:345
 msgid "Specify where to create the folder:"
 msgstr "Specify where to create the folder:"
 
-#: mail/em-folder-selector.c:304
+#: ../mail/em-folder-selector.c:304
 msgid "Create"
 msgstr "Create"
 
-#: mail/em-folder-selector.c:308
+#: ../mail/em-folder-selector.c:308
 msgid "Folder _name:"
 msgstr "Folder _name:"
 
-#: mail/em-folder-tree-model.c:201 mail/em-folder-tree-model.c:203
-#: mail/mail-vfolder.c:899 mail/mail-vfolder.c:969
+#: ../mail/em-folder-tree-model.c:201 ../mail/em-folder-tree-model.c:203
+#: ../mail/mail-vfolder.c:899 ../mail/mail-vfolder.c:969
 msgid "vFolders"
 msgstr "vFolders"
 
 #. UNMATCHED is always last
-#: mail/em-folder-tree-model.c:207 mail/em-folder-tree-model.c:209
+#: ../mail/em-folder-tree-model.c:207 ../mail/em-folder-tree-model.c:209
 msgid "UNMATCHED"
 msgstr "UNMATCHED"
 
-#: mail/em-folder-tree-model.c:468 mail/mail-component.c:139
+#: ../mail/em-folder-tree-model.c:468 ../mail/mail-component.c:142
 msgid "Drafts"
 msgstr "Drafts"
 
 #. translators: standard local mailbox names
-#: mail/em-folder-tree-model.c:471 mail/mail-component.c:138
+#: ../mail/em-folder-tree-model.c:471 ../mail/mail-component.c:141
 msgid "Inbox"
 msgstr "Inbox"
 
-#: mail/em-folder-tree-model.c:474 mail/mail-component.c:140
+#: ../mail/em-folder-tree-model.c:474 ../mail/mail-component.c:143
 msgid "Outbox"
 msgstr "Outbox"
 
-#: mail/em-folder-tree-model.c:476 mail/mail-component.c:141
+#: ../mail/em-folder-tree-model.c:476 ../mail/mail-component.c:144
 msgid "Sent"
 msgstr "Sent"
 
-#: mail/em-folder-tree-model.c:495 mail/em-folder-tree-model.c:799
+#: ../mail/em-folder-tree-model.c:495 ../mail/em-folder-tree-model.c:799
 msgid "Loading..."
 msgstr "Loading..."
 
-#: mail/em-folder-tree.c:688
+#: ../mail/em-folder-tree.c:689
 msgid "Mail Folder Tree"
 msgstr "Mail Folder Tree"
 
-#: mail/em-folder-tree.c:921
+#: ../mail/em-folder-tree.c:922
 #, c-format
 msgid "Moving folder %s"
 msgstr "Moving folder %s"
 
-#: mail/em-folder-tree.c:923
+#: ../mail/em-folder-tree.c:924
 #, c-format
 msgid "Copying folder %s"
 msgstr "Copying folder %s"
 
-#: mail/em-folder-tree.c:930 mail/message-list.c:1617
+#: ../mail/em-folder-tree.c:931 ../mail/message-list.c:1612
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "Moving messages into folder %s"
 
-#: mail/em-folder-tree.c:932 mail/message-list.c:1619
+#: ../mail/em-folder-tree.c:933 ../mail/message-list.c:1614
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "Copying messages into folder %s"
 
-#: mail/em-folder-tree.c:948
+#: ../mail/em-folder-tree.c:949
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "Cannot drop message(s) into toplevel store"
 
-#: mail/em-folder-tree.c:1044 ui/evolution-mail-message.xml.h:106
+#: ../mail/em-folder-tree.c:1045 ../ui/evolution-mail-message.xml.h:106
 msgid "_Copy to Folder"
 msgstr "_Copy to Folder"
 
-#: mail/em-folder-tree.c:1045 ui/evolution-mail-message.xml.h:115
+#: ../mail/em-folder-tree.c:1046 ../ui/evolution-mail-message.xml.h:115
 msgid "_Move to Folder"
 msgstr "_Move to Folder"
 
-#: mail/em-folder-tree.c:1750 mail/mail-ops.c:1026
+#: ../mail/em-folder-tree.c:1751 ../mail/mail-ops.c:1051
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Scanning folders in \"%s\""
 
-#: mail/em-folder-tree.c:2023
+#: ../mail/em-folder-tree.c:2024
 #, c-format
 msgid "Copying `%s' to `%s'"
 msgstr "Copying `%s' to `%s'"
 
-#: mail/em-folder-tree.c:2297 mail/em-folder-tree.c:2311
-#: mail/em-folder-view.c:868 mail/em-folder-view.c:883
-#: mail/importers/evolution-mbox-importer.c:120
-#: mail/importers/evolution-outlook-importer.c:134
+#: ../mail/em-folder-tree.c:2298 ../mail/em-folder-tree.c:2312
+#: ../mail/em-folder-view.c:862 ../mail/em-folder-view.c:877
+#: ../mail/importers/evolution-mbox-importer.c:120
+#: ../mail/importers/evolution-outlook-importer.c:134
 msgid "Select folder"
 msgstr "Select folder"
 
-#: mail/em-folder-tree.c:2297 mail/em-folder-view.c:883
+#: ../mail/em-folder-tree.c:2298 ../mail/em-folder-view.c:877
 msgid "C_opy"
 msgstr "C_opy"
 
-#: mail/em-folder-tree.c:2338 plugins/shared-folder/share-folder-common.c:138
+#: ../mail/em-folder-tree.c:2339
+#: ../plugins/shared-folder/share-folder-common.c:138
 #, c-format
 msgid "Creating folder `%s'"
 msgstr "Creating folder `%s'"
 
-#: mail/em-folder-tree.c:2527 mail/mail-component.c:739
-#: plugins/shared-folder/install-shared.c:144
-#: plugins/shared-folder/share-folder-common.c:345
+#: ../mail/em-folder-tree.c:2528 ../mail/mail-component.c:770
+#: ../plugins/shared-folder/install-shared.c:144
+#: ../plugins/shared-folder/share-folder-common.c:345
 msgid "Create folder"
 msgstr "Create folder"
 
-#: mail/em-folder-tree.c:2720
+#: ../mail/em-folder-tree.c:2721
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "Rename the \"%s\" folder to:"
 
-#: mail/em-folder-tree.c:2722
+#: ../mail/em-folder-tree.c:2723
 msgid "Rename Folder"
 msgstr "Rename Folder"
 
-#: mail/em-folder-tree.c:2728
+#: ../mail/em-folder-tree.c:2729
 msgid "Folder names cannot contain '/'"
 msgstr "Folder names cannot contain '/'"
 
-#: mail/em-folder-tree.c:2802 ui/evolution-addressbook.xml.h:44
-#: ui/evolution-mail-global.xml.h:17 ui/evolution-mail-messagedisplay.xml.h:8
-#: ui/evolution-message-composer.xml.h:53 ui/evolution.xml.h:49
+#: ../mail/em-folder-tree.c:2803 ../ui/evolution-addressbook.xml.h:44
+#: ../ui/evolution-mail-global.xml.h:17
+#: ../ui/evolution-mail-messagedisplay.xml.h:8
+#: ../ui/evolution-message-composer.xml.h:53 ../ui/evolution.xml.h:49
 msgid "_View"
 msgstr "_View"
 
-#: mail/em-folder-tree.c:2803
+#: ../mail/em-folder-tree.c:2804
 msgid "Open in _New Window"
 msgstr "Open in _New Window"
 
-#: mail/em-folder-tree.c:2807
+#: ../mail/em-folder-tree.c:2808
 msgid "_Copy..."
 msgstr "_Copy..."
 
-#: mail/em-folder-tree.c:2808
+#: ../mail/em-folder-tree.c:2809
 msgid "_Move..."
 msgstr "_Move..."
 
 #. FIXME: need to disable for nochildren folders
-#: mail/em-folder-tree.c:2812
+#: ../mail/em-folder-tree.c:2813
 msgid "_New Folder..."
 msgstr "_New Folder..."
 
-#: mail/em-folder-tree.c:2815
+#: ../mail/em-folder-tree.c:2816
 msgid "_Rename..."
 msgstr "_Rename..."
 
-#: mail/em-folder-view.c:976 mail/em-popup.c:498
-#: ui/evolution-mail-message.xml.h:87
+#: ../mail/em-folder-view.c:970 ../mail/em-popup.c:499
+#: ../ui/evolution-mail-message.xml.h:87
 msgid "Reply to _All"
 msgstr "Reply to _All"
 
-#: mail/em-folder-view.c:977 ui/evolution-mail-message.xml.h:123
+#: ../mail/em-folder-view.c:971 ../ui/evolution-mail-message.xml.h:123
 msgid "_Reply to Sender"
 msgstr "_Reply to Sender"
 
-#: mail/em-folder-view.c:978 mail/em-popup.c:500
-#: ui/evolution-mail-message.xml.h:110
+#: ../mail/em-folder-view.c:972 ../mail/em-popup.c:501
+#: ../ui/evolution-mail-message.xml.h:110
 msgid "_Forward"
 msgstr "_Forward"
 
-#: mail/em-folder-view.c:981 ui/evolution-mail-message.xml.h:109
+#: ../mail/em-folder-view.c:975 ../ui/evolution-mail-message.xml.h:109
 msgid "_Edit as New Message..."
 msgstr "_Edit as New Message..."
 
-#: mail/em-folder-view.c:983
+#: ../mail/em-folder-view.c:977
 msgid "_Print"
 msgstr "_Print"
 
-#: mail/em-folder-view.c:987
+#: ../mail/em-folder-view.c:981
 msgid "U_ndelete"
 msgstr "U_ndelete"
 
-#: mail/em-folder-view.c:988
+#: ../mail/em-folder-view.c:982
 msgid "Mo_ve to Folder..."
 msgstr "Mo_ve to Folder..."
 
-#: mail/em-folder-view.c:989 ui/evolution-addressbook.xml.h:32
+#: ../mail/em-folder-view.c:983 ../ui/evolution-addressbook.xml.h:32
 msgid "_Copy to Folder..."
 msgstr "_Copy to Folder..."
 
-#: mail/em-folder-view.c:992
+#: ../mail/em-folder-view.c:986
 msgid "Mark as _Important"
 msgstr "Mark as _Important"
 
-#: mail/em-folder-view.c:993
+#: ../mail/em-folder-view.c:987
 msgid "_Mark as Unimportant"
 msgstr "_Mark as Unimportant"
 
-#: mail/em-folder-view.c:994 ui/evolution-mail-message.xml.h:54
+#: ../mail/em-folder-view.c:988 ../ui/evolution-mail-message.xml.h:54
 msgid "Mark as _Junk"
 msgstr "Mark as _Junk"
 
-#: mail/em-folder-view.c:995 ui/evolution-mail-message.xml.h:55
+#: ../mail/em-folder-view.c:989 ../ui/evolution-mail-message.xml.h:55
 msgid "Mark as _Not Junk"
 msgstr "Mark as _Not Junk"
 
-#: mail/em-folder-view.c:996
+#: ../mail/em-folder-view.c:990
 msgid "Mark for Follo_w Up..."
 msgstr "Mark for Follo_w Up..."
 
-#: mail/em-folder-view.c:1004
+#: ../mail/em-folder-view.c:998
 msgid "Fla_g Completed"
 msgstr "Fla_g Completed"
 
-#: mail/em-folder-view.c:1005
+#: ../mail/em-folder-view.c:999
 msgid "Cl_ear Flag"
 msgstr "Cl_ear Flag"
 
-#: mail/em-folder-view.c:1008
+#: ../mail/em-folder-view.c:1002
 msgid "Crea_te Rule From Message"
 msgstr "Crea_te Rule From Message"
 
-#: mail/em-folder-view.c:1009
+#: ../mail/em-folder-view.c:1003
 msgid "vFolder on _Subject"
 msgstr "vFolder on _Subject"
 
-#: mail/em-folder-view.c:1010
+#: ../mail/em-folder-view.c:1004
 msgid "vFolder on Se_nder"
 msgstr "vFolder on Se_nder"
 
-#: mail/em-folder-view.c:1011
+#: ../mail/em-folder-view.c:1005
 msgid "vFolder on _Recipients"
 msgstr "vFolder on _Recipients"
 
-#: mail/em-folder-view.c:1012
+#: ../mail/em-folder-view.c:1006
 msgid "vFolder on Mailing _List"
 msgstr "vFolder on Mailing _List"
 
-#: mail/em-folder-view.c:1016
+#: ../mail/em-folder-view.c:1010
 msgid "Filter on Sub_ject"
 msgstr "Filter on Sub_ject"
 
-#: mail/em-folder-view.c:1017
+#: ../mail/em-folder-view.c:1011
 msgid "Filter on Sen_der"
 msgstr "Filter on Sen_der"
 
-#: mail/em-folder-view.c:1018
+#: ../mail/em-folder-view.c:1012
 msgid "Filter on Re_cipients"
 msgstr "Filter on Re_cipients"
 
-#: mail/em-folder-view.c:1019
+#: ../mail/em-folder-view.c:1013
 msgid "Filter on _Mailing List"
 msgstr "Filter on _Mailing List"
 
 #. default charset used in mail view
-#: mail/em-folder-view.c:1850 mail/em-folder-view.c:1894
+#: ../mail/em-folder-view.c:1844 ../mail/em-folder-view.c:1888
 msgid "Default"
 msgstr "Default"
 
-#: mail/em-folder-view.c:1993
+#: ../mail/em-folder-view.c:1987
 msgid "Print Message"
 msgstr "Print Message"
 
-#: mail/em-folder-view.c:2292
+#: ../mail/em-folder-view.c:2295
 msgid "_Copy Link Location"
 msgstr "_Copy Link Location"
 
-#: mail/em-folder-view.c:2294
+#: ../mail/em-folder-view.c:2297
 msgid "Create _vFolder"
 msgstr "Create _vFolder"
 
-#: mail/em-folder-view.c:2295
+#: ../mail/em-folder-view.c:2298
 msgid "_From this Address"
 msgstr "_From this Address"
 
-#: mail/em-folder-view.c:2296
+#: ../mail/em-folder-view.c:2299
 msgid "_To this Address"
 msgstr "_To this Address"
 
-#: mail/em-folder-view.c:2582
+#: ../mail/em-folder-view.c:2568
 #, c-format
 msgid "Click to mail %s"
 msgstr "Click to mail %s"
 
 #. message-search popup match count string
-#: mail/em-format-html-display.c:412
+#: ../mail/em-format-html-display.c:412
 #, c-format
 msgid "Matches: %d"
 msgstr "Matches: %d"
 
-#: mail/em-format-html-display.c:680 mail/em-format-html.c:579
+#: ../mail/em-format-html-display.c:680 ../mail/em-format-html.c:579
 msgid "Unsigned"
 msgstr "Unsigned"
 
-#: mail/em-format-html-display.c:680
+#: ../mail/em-format-html-display.c:680
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
@@ -10940,11 +11037,11 @@ msgstr ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
 
-#: mail/em-format-html-display.c:681 mail/em-format-html.c:580
+#: ../mail/em-format-html-display.c:681 ../mail/em-format-html.c:580
 msgid "Valid signature"
 msgstr "Valid signature"
 
-#: mail/em-format-html-display.c:681
+#: ../mail/em-format-html-display.c:681
 msgid ""
 "This message is signed and is valid meaning that it is very likely that this "
 "message is authentic."
@@ -10952,11 +11049,11 @@ msgstr ""
 "This message is signed and is valid meaning that it is very likely that this "
 "message is authentic."
 
-#: mail/em-format-html-display.c:682 mail/em-format-html.c:581
+#: ../mail/em-format-html-display.c:682 ../mail/em-format-html.c:581
 msgid "Invalid signature"
 msgstr "Invalid signature"
 
-#: mail/em-format-html-display.c:682
+#: ../mail/em-format-html-display.c:682
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
@@ -10964,11 +11061,11 @@ msgstr ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
 
-#: mail/em-format-html-display.c:683
+#: ../mail/em-format-html-display.c:683
 msgid "Valid signature, cannot verify sender"
 msgstr "Valid signature, cannot verify sender"
 
-#: mail/em-format-html-display.c:683
+#: ../mail/em-format-html-display.c:683
 msgid ""
 "This message is signed with a valid signature, but the sender of the message "
 "cannot be verified."
@@ -10976,11 +11073,11 @@ msgstr ""
 "This message is signed with a valid signature, but the sender of the message "
 "cannot be verified."
 
-#: mail/em-format-html-display.c:689 mail/em-format-html.c:588
+#: ../mail/em-format-html-display.c:689 ../mail/em-format-html.c:588
 msgid "Unencrypted"
 msgstr "Unencrypted"
 
-#: mail/em-format-html-display.c:689
+#: ../mail/em-format-html-display.c:689
 msgid ""
 "This message is not encrypted.  Its content may be viewed in transit across "
 "the Internet."
@@ -10988,11 +11085,11 @@ msgstr ""
 "This message is not encrypted.  Its content may be viewed in transit across "
 "the Internet."
 
-#: mail/em-format-html-display.c:690 mail/em-format-html.c:589
+#: ../mail/em-format-html-display.c:690 ../mail/em-format-html.c:589
 msgid "Encrypted, weak"
 msgstr "Encrypted, weak"
 
-#: mail/em-format-html-display.c:690
+#: ../mail/em-format-html-display.c:690
 msgid ""
 "This message is encrypted, but with a weak encryption algorithm.  It would "
 "be difficult, but not impossible for an outsider to view the content of this "
@@ -11002,11 +11099,11 @@ msgstr ""
 "be difficult, but not impossible for an outsider to view the content of this "
 "message in a practical amount of time."
 
-#: mail/em-format-html-display.c:691 mail/em-format-html.c:590
+#: ../mail/em-format-html-display.c:691 ../mail/em-format-html.c:590
 msgid "Encrypted"
 msgstr "Encrypted"
 
-#: mail/em-format-html-display.c:691
+#: ../mail/em-format-html-display.c:691
 msgid ""
 "This message is encrypted.  It would be difficult for an outsider to view "
 "the content of this message."
@@ -11014,11 +11111,11 @@ msgstr ""
 "This message is encrypted.  It would be difficult for an outsider to view "
 "the content of this message."
 
-#: mail/em-format-html-display.c:692 mail/em-format-html.c:591
+#: ../mail/em-format-html-display.c:692 ../mail/em-format-html.c:591
 msgid "Encrypted, strong"
 msgstr "Encrypted, strong"
 
-#: mail/em-format-html-display.c:692
+#: ../mail/em-format-html-display.c:692
 msgid ""
 "This message is encrypted, with a strong encryption algorithm.  It would be "
 "very difficult for an outsider to view the content of this message in a "
@@ -11028,186 +11125,189 @@ msgstr ""
 "very difficult for an outsider to view the content of this message in a "
 "practical amount of time."
 
-#: mail/em-format-html-display.c:793 smime/gui/smime-ui.glade.h:47
+#: ../mail/em-format-html-display.c:793 ../smime/gui/smime-ui.glade.h:47
 msgid "_View Certificate"
 msgstr "_View Certificate"
 
-#: mail/em-format-html-display.c:808
+#: ../mail/em-format-html-display.c:808
 msgid "This certificate is not viewable"
 msgstr "This certificate is not viewable"
 
-#: mail/em-format-html-display.c:1037
+#: ../mail/em-format-html-display.c:1037
 msgid "Completed on %B %d, %Y, %l:%M %p"
 msgstr "Completed on %B %d, %Y, %l:%M %p"
 
-#: mail/em-format-html-display.c:1045
+#: ../mail/em-format-html-display.c:1045
 msgid "Overdue:"
 msgstr "Overdue:"
 
-#: mail/em-format-html-display.c:1048
+#: ../mail/em-format-html-display.c:1048
 msgid "by %B %d, %Y, %l:%M %p"
 msgstr "by %B %d, %Y, %l:%M %p"
 
-#: mail/em-format-html-display.c:1095
+#: ../mail/em-format-html-display.c:1095
 msgid "_View Inline"
 msgstr "_View Inline"
 
-#: mail/em-format-html-display.c:1096
+#: ../mail/em-format-html-display.c:1096
 msgid "_Hide"
 msgstr "_Hide"
 
-#: mail/em-format-html-display.c:1340
+#: ../mail/em-format-html-display.c:1340
 msgid "Attachment Button"
 msgstr "Attachment Button"
 
-#: mail/em-format-html-print.c:130
+#: ../mail/em-format-html-print.c:130
 #, c-format
 msgid "Page %d of %d"
 msgstr "Page %d of %d"
 
-#: mail/em-format-html.c:472 mail/em-format-html.c:474
+#: ../mail/em-format-html.c:472 ../mail/em-format-html.c:474
 #, c-format
 msgid "Retrieving `%s'"
 msgstr "Retrieving `%s'"
 
-#: mail/em-format-html.c:582
+#: ../mail/em-format-html.c:582
 msgid "Valid signature but cannot verify sender"
 msgstr "Valid signature but cannot verify sender"
 
-#: mail/em-format-html.c:840
+#: ../mail/em-format-html.c:840
 msgid "Malformed external-body part."
 msgstr "Malformed external-body part."
 
-#: mail/em-format-html.c:870
+#: ../mail/em-format-html.c:870
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Pointer to FTP site (%s)"
 
-#: mail/em-format-html.c:881
+#: ../mail/em-format-html.c:881
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "Pointer to local file (%s) valid at site \"%s\""
 
-#: mail/em-format-html.c:883
+#: ../mail/em-format-html.c:883
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Pointer to local file (%s)"
 
-#: mail/em-format-html.c:904
+#: ../mail/em-format-html.c:904
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Pointer to remote data (%s)"
 
-#: mail/em-format-html.c:915
+#: ../mail/em-format-html.c:915
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Pointer to unknown external data (\"%s\" type)"
 
-#: mail/em-format-html.c:1137
+#: ../mail/em-format-html.c:1137
 msgid "Formatting message"
 msgstr "Formatting message"
 
-#: mail/em-format-html.c:1424 mail/em-format-quote.c:193 mail/em-format.c:848
-#: mail/em-mailer-prefs.c:83 mail/message-list.etspec.h:7
-#: mail/message-tag-followup.c:326
+#: ../mail/em-format-html.c:1424 ../mail/em-format-quote.c:193
+#: ../mail/em-format.c:848 ../mail/em-mailer-prefs.c:83
+#: ../mail/message-list.etspec.h:7 ../mail/message-tag-followup.c:326
 msgid "From"
 msgstr "From"
 
-#: mail/em-format-html.c:1424 mail/em-format-quote.c:193 mail/em-format.c:849
-#: mail/em-mailer-prefs.c:84
+#: ../mail/em-format-html.c:1424 ../mail/em-format-quote.c:193
+#: ../mail/em-format.c:849 ../mail/em-mailer-prefs.c:84
 msgid "Reply-To"
 msgstr "Reply-To"
 
-#: mail/em-format-html.c:1424 mail/em-format-quote.c:193 mail/em-format.c:850
-#: mail/em-mailer-prefs.c:85 mail/message-list.etspec.h:14
+#: ../mail/em-format-html.c:1424 ../mail/em-format-quote.c:193
+#: ../mail/em-format.c:850 ../mail/em-mailer-prefs.c:85
+#: ../mail/message-list.etspec.h:14
 msgid "To"
 msgstr "To"
 
-#: mail/em-format-html.c:1424 mail/em-format-quote.c:193 mail/em-format.c:851
-#: mail/em-mailer-prefs.c:86
+#: ../mail/em-format-html.c:1424 ../mail/em-format-quote.c:193
+#: ../mail/em-format.c:851 ../mail/em-mailer-prefs.c:86
 msgid "Cc"
 msgstr "Cc"
 
-#: mail/em-format-html.c:1424 mail/em-format-quote.c:193 mail/em-format.c:852
-#: mail/em-mailer-prefs.c:87
+#: ../mail/em-format-html.c:1424 ../mail/em-format-quote.c:193
+#: ../mail/em-format.c:852 ../mail/em-mailer-prefs.c:87
 msgid "Bcc"
 msgstr "Bcc"
 
 #. pseudo-header
-#: mail/em-format-html.c:1537 mail/em-format-quote.c:315
-#: mail/em-mailer-prefs.c:986
+#: ../mail/em-format-html.c:1536 ../mail/em-format-quote.c:315
+#: ../mail/em-mailer-prefs.c:986
 msgid "Mailer"
 msgstr "Mailer"
 
 #. translators: strftime format for local time equivalent in Date header display, with day
-#: mail/em-format-html.c:1564
+#: ../mail/em-format-html.c:1563
 msgid "<I> (%a, %R %Z)</I>"
 msgstr "<I> (%a, %R %Z)</I>"
 
 #. translators: strftime format for local time equivalent in Date header display, without day
-#: mail/em-format-html.c:1567
+#: ../mail/em-format-html.c:1566
 msgid "<I> (%R %Z)</I>"
 msgstr "<I> (%R %Z)</I>"
 
-#: mail/em-format-html.c:1577 mail/em-format-quote.c:322 mail/em-format.c:854
-#: mail/em-mailer-prefs.c:89 mail/message-list.etspec.h:2
+#: ../mail/em-format-html.c:1576 ../mail/em-format-quote.c:322
+#: ../mail/em-format.c:854 ../mail/em-mailer-prefs.c:89
+#: ../mail/message-list.etspec.h:2
 msgid "Date"
 msgstr "Date"
 
-#: mail/em-format-html.c:1600 mail/em-format.c:855 mail/em-mailer-prefs.c:90
+#: ../mail/em-format-html.c:1599 ../mail/em-format.c:855
+#: ../mail/em-mailer-prefs.c:90
 msgid "Newsgroups"
 msgstr "Newsgroups"
 
-#: mail/em-format.c:1104
+#: ../mail/em-format.c:1104
 #, c-format
 msgid "%s attachment"
 msgstr "%s attachment"
 
-#: mail/em-format.c:1143 mail/em-format.c:1276
+#: ../mail/em-format.c:1143 ../mail/em-format.c:1276
 msgid "Could not parse S/MIME message: Unknown error"
 msgstr "Could not parse S/MIME message: Unknown error"
 
-#: mail/em-format.c:1266
+#: ../mail/em-format.c:1266
 msgid "Unsupported encryption type for multipart/encrypted"
 msgstr "Unsupported encryption type for multipart/encrypted"
 
-#: mail/em-format.c:1414
+#: ../mail/em-format.c:1414
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "Could not parse MIME message. Displaying as source."
 
-#: mail/em-format.c:1433
+#: ../mail/em-format.c:1433
 msgid "Unsupported signature format"
 msgstr "Unsupported signature format"
 
-#: mail/em-format.c:1441
+#: ../mail/em-format.c:1441
 msgid "Error verifying signature"
 msgstr "Error verifying signature"
 
-#: mail/em-format.c:1441
+#: ../mail/em-format.c:1441
 msgid "Unknown error verifying signature"
 msgstr "Unknown error verifying signature"
 
-#: mail/em-junk-filter.c:111
+#: ../mail/em-junk-filter.c:111
 msgid "Spamassassin (built-in)"
 msgstr "Spamassassin (built-in)"
 
-#: mail/em-mailer-prefs.c:101
+#: ../mail/em-mailer-prefs.c:101
 msgid "Every time"
 msgstr "Every time"
 
-#: mail/em-mailer-prefs.c:102
+#: ../mail/em-mailer-prefs.c:102
 msgid "Once per day"
 msgstr "Once per day"
 
-#: mail/em-mailer-prefs.c:103
+#: ../mail/em-mailer-prefs.c:103
 msgid "Once per week"
 msgstr "Once per week"
 
-#: mail/em-mailer-prefs.c:104
+#: ../mail/em-mailer-prefs.c:104
 msgid "Once per month"
 msgstr "Once per month"
 
-#: mail/em-migrate.c:1168
+#: ../mail/em-migrate.c:1198
 msgid ""
 "The location and hierarchy of the Evolution mailbox folders has changed "
 "since Evolution 1.x.\n"
@@ -11219,47 +11319,47 @@ msgstr ""
 "\n"
 "Please be patient while Evolution migrates your folders..."
 
-#: mail/em-migrate.c:1602
+#: ../mail/em-migrate.c:1632
 #, c-format
 msgid "Unable to create new folder `%s': %s"
 msgstr "Unable to create new folder `%s': %s"
 
-#: mail/em-migrate.c:1628
+#: ../mail/em-migrate.c:1658
 #, c-format
 msgid "Unable to copy folder `%s' to `%s': %s"
 msgstr "Unable to copy folder `%s' to `%s': %s"
 
-#: mail/em-migrate.c:1813
+#: ../mail/em-migrate.c:1843
 #, c-format
 msgid "Unable to scan for existing mailboxes at `%s': %s"
 msgstr "Unable to scan for existing mailboxes at `%s': %s"
 
-#: mail/em-migrate.c:2017
+#: ../mail/em-migrate.c:2047
 #, c-format
 msgid "Unable to open old POP keep-on-server data `%s': %s"
 msgstr "Unable to open old POP keep-on-server data `%s': %s"
 
-#: mail/em-migrate.c:2031
+#: ../mail/em-migrate.c:2061
 #, c-format
 msgid "Unable to create POP3 keep-on-server data directory `%s': %s"
 msgstr "Unable to create POP3 keep-on-server data directory `%s': %s"
 
-#: mail/em-migrate.c:2060
+#: ../mail/em-migrate.c:2090
 #, c-format
 msgid "Unable to copy POP3 keep-on-server data `%s': %s"
 msgstr "Unable to copy POP3 keep-on-server data `%s': %s"
 
-#: mail/em-migrate.c:2494 mail/em-migrate.c:2506
+#: ../mail/em-migrate.c:2561 ../mail/em-migrate.c:2573
 #, c-format
 msgid "Failed to create local mail storage `%s': %s"
 msgstr "Failed to create local mail storage `%s': %s"
 
-#: mail/em-migrate.c:2657
+#: ../mail/em-migrate.c:2693
 #, c-format
 msgid "Unable to create local mail folders at `%s': %s"
 msgstr "Unable to create local mail folders at `%s': %s"
 
-#: mail/em-migrate.c:2675
+#: ../mail/em-migrate.c:2711
 msgid ""
 "Unable to read settings from previous Evolution install, `evolution/config."
 "xmldb' does not exist or is corrupt."
@@ -11267,204 +11367,204 @@ msgstr ""
 "Unable to read settings from previous Evolution install, `evolution/config."
 "xmldb' does not exist or is corrupt."
 
-#: mail/em-popup.c:381
+#: ../mail/em-popup.c:382
 msgid "Save As..."
 msgstr "Save As..."
 
-#: mail/em-popup.c:400
+#: ../mail/em-popup.c:401
 #, c-format
 msgid "untitled_image.%s"
 msgstr "untitled_image.%s"
 
-#: mail/em-popup.c:494
+#: ../mail/em-popup.c:495
 msgid "Set as _Background"
 msgstr "Set as _Background"
 
-#: mail/em-popup.c:496
+#: ../mail/em-popup.c:497
 msgid "_Reply to sender"
 msgstr "_Reply to sender"
 
-#: mail/em-popup.c:497 ui/evolution-mail-message.xml.h:88
+#: ../mail/em-popup.c:498 ../ui/evolution-mail-message.xml.h:88
 msgid "Reply to _List"
 msgstr "Reply to _List"
 
-#: mail/em-popup.c:548
+#: ../mail/em-popup.c:549
 msgid "_Open Link in Browser"
 msgstr "_Open Link in Browser"
 
-#: mail/em-popup.c:549
+#: ../mail/em-popup.c:550
 msgid "_Send New Message To..."
 msgstr "_Send New Message To..."
 
-#: mail/em-popup.c:550
+#: ../mail/em-popup.c:551
 msgid "_Add to Addressbook"
 msgstr "_Add to Addressbook"
 
-#: mail/em-popup.c:681
+#: ../mail/em-popup.c:666
 #, c-format
 msgid "Open in %s..."
 msgstr "Open in %s..."
 
-#: mail/em-subscribe-editor.c:611
+#: ../mail/em-subscribe-editor.c:611
 msgid "This store does not support subscriptions, or they are not enabled."
 msgstr "This store does not support subscriptions, or they are not enabled."
 
-#: mail/em-subscribe-editor.c:640
+#: ../mail/em-subscribe-editor.c:640
 msgid "Subscribed"
 msgstr "Subscribed"
 
-#: mail/em-subscribe-editor.c:644
+#: ../mail/em-subscribe-editor.c:644
 msgid "Folder"
 msgstr "Folder"
 
 #. FIXME: This is just to get the shadow, is there a better way?
-#: mail/em-subscribe-editor.c:859
+#: ../mail/em-subscribe-editor.c:859
 msgid "Please select a server."
 msgstr "Please select a server."
 
-#: mail/em-subscribe-editor.c:880
+#: ../mail/em-subscribe-editor.c:880
 msgid "No server has been selected"
 msgstr "No server has been selected"
 
-#: mail/em-utils.c:105
+#: ../mail/em-utils.c:105
 msgid "Don't show this message again."
 msgstr "Don't show this message again."
 
-#: mail/em-utils.c:294
+#: ../mail/em-utils.c:294
 msgid "Filters"
 msgstr "Filters"
 
-#: mail/em-utils.c:434
+#: ../mail/em-utils.c:436
 msgid "message"
 msgstr "message"
 
-#: mail/em-utils.c:543
+#: ../mail/em-utils.c:545
 msgid "Save Message..."
 msgstr "Save Message..."
 
-#: mail/em-utils.c:592
+#: ../mail/em-utils.c:594
 msgid "Add address"
 msgstr "Add address"
 
 #. Drop filename for messages from a mailbox
-#: mail/em-utils.c:1055
+#: ../mail/em-utils.c:1073
 #, c-format
 msgid "Messages from %s"
 msgstr "Messages from %s"
 
-#: mail/em-vfolder-editor.c:104
+#: ../mail/em-vfolder-editor.c:104
 msgid "v_Folders"
 msgstr "v_Folders"
 
-#: mail/em-vfolder-rule.c:574
+#: ../mail/em-vfolder-rule.c:574
 msgid "vFolder source"
 msgstr "vFolder source"
 
-#: mail/evolution-mail.schemas.in.in.h:1
+#: ../mail/evolution-mail.schemas.in.in.h:1
 msgid "Automatic link recognition"
 msgstr "Automatic link recognition"
 
-#: mail/evolution-mail.schemas.in.in.h:2
+#: ../mail/evolution-mail.schemas.in.in.h:2
 msgid "Automatic smiley recognition"
 msgstr "Automatic smiley recognition"
 
-#: mail/evolution-mail.schemas.in.in.h:3
+#: ../mail/evolution-mail.schemas.in.in.h:3
 msgid "Check incoming mail being junk"
 msgstr "Check incoming mail being junk"
 
-#: mail/evolution-mail.schemas.in.in.h:4
+#: ../mail/evolution-mail.schemas.in.in.h:4
 msgid "Citation highlight color"
 msgstr "Citation highlight colour"
 
-#: mail/evolution-mail.schemas.in.in.h:5
+#: ../mail/evolution-mail.schemas.in.in.h:5
 msgid "Citation highlight color."
 msgstr "Citation highlight colour."
 
-#: mail/evolution-mail.schemas.in.in.h:6
+#: ../mail/evolution-mail.schemas.in.in.h:6
 msgid "Composer Window default height"
 msgstr "Composer Window default height"
 
-#: mail/evolution-mail.schemas.in.in.h:7
+#: ../mail/evolution-mail.schemas.in.in.h:7
 msgid "Composer Window default width"
 msgstr "Composer Window default width"
 
-#: mail/evolution-mail.schemas.in.in.h:8
+#: ../mail/evolution-mail.schemas.in.in.h:8
 msgid "Default charset in which to compose messages"
 msgstr "Default charset in which to compose messages"
 
-#: mail/evolution-mail.schemas.in.in.h:9
+#: ../mail/evolution-mail.schemas.in.in.h:9
 msgid "Default charset in which to compose messages."
 msgstr "Default charset in which to compose messages."
 
-#: mail/evolution-mail.schemas.in.in.h:10
+#: ../mail/evolution-mail.schemas.in.in.h:10
 msgid "Default charset in which to display messages"
 msgstr "Default charset in which to display messages"
 
-#: mail/evolution-mail.schemas.in.in.h:11
+#: ../mail/evolution-mail.schemas.in.in.h:11
 msgid "Default charset in which to display messages."
 msgstr "Default charset in which to display messages."
 
-#: mail/evolution-mail.schemas.in.in.h:12
+#: ../mail/evolution-mail.schemas.in.in.h:12
 msgid "Default forward style"
 msgstr "Default forward style"
 
-#: mail/evolution-mail.schemas.in.in.h:13
+#: ../mail/evolution-mail.schemas.in.in.h:13
 msgid "Default height of the Composer Window"
 msgstr "Default height of the Composer Window"
 
-#: mail/evolution-mail.schemas.in.in.h:14
+#: ../mail/evolution-mail.schemas.in.in.h:14
 msgid "Default height of the Message Window"
 msgstr "Default height of the Message Window"
 
-#: mail/evolution-mail.schemas.in.in.h:15
+#: ../mail/evolution-mail.schemas.in.in.h:15
 msgid "Default height of the Subscribe dialog"
 msgstr "Default height of the Subscribe dialogue"
 
-#: mail/evolution-mail.schemas.in.in.h:16
+#: ../mail/evolution-mail.schemas.in.in.h:16
 msgid "Default reply style"
 msgstr "Default reply style"
 
-#: mail/evolution-mail.schemas.in.in.h:17
+#: ../mail/evolution-mail.schemas.in.in.h:17
 msgid "Default width of the Composer Window"
 msgstr "Default width of the Composer Window"
 
-#: mail/evolution-mail.schemas.in.in.h:18
+#: ../mail/evolution-mail.schemas.in.in.h:18
 msgid "Default width of the Message Window"
 msgstr "Default width of the Message Window"
 
-#: mail/evolution-mail.schemas.in.in.h:19
+#: ../mail/evolution-mail.schemas.in.in.h:19
 msgid "Default width of the Subscribe dialog"
 msgstr "Default width of the Subscribe dialogue"
 
-#: mail/evolution-mail.schemas.in.in.h:20
+#: ../mail/evolution-mail.schemas.in.in.h:20
 msgid "Draw spelling error indicators on words as you type."
 msgstr "Draw spelling error indicators on words as you type."
 
-#: mail/evolution-mail.schemas.in.in.h:21
+#: ../mail/evolution-mail.schemas.in.in.h:21
 msgid "Empty Trash folders on exit"
 msgstr "Empty Trash folders on exit"
 
-#: mail/evolution-mail.schemas.in.in.h:22
+#: ../mail/evolution-mail.schemas.in.in.h:22
 msgid "Empty all Trash folders when exiting Evolution."
 msgstr "Empty all Trash folders when exiting Evolution."
 
-#: mail/evolution-mail.schemas.in.in.h:23
+#: ../mail/evolution-mail.schemas.in.in.h:23
 msgid "Enable caret mode, so that you can see a cursor when reading mail."
 msgstr "Enable caret mode, so that you can see a cursor when reading mail."
 
-#: mail/evolution-mail.schemas.in.in.h:24
+#: ../mail/evolution-mail.schemas.in.in.h:24
 msgid "Enable/disable caret mode"
 msgstr "Enable/disable caret mode"
 
-#: mail/evolution-mail.schemas.in.in.h:25
+#: ../mail/evolution-mail.schemas.in.in.h:25
 msgid "Height of the message-list pane"
 msgstr "Height of the message-list pane"
 
-#: mail/evolution-mail.schemas.in.in.h:26
+#: ../mail/evolution-mail.schemas.in.in.h:26
 msgid "Height of the message-list pane."
 msgstr "Height of the message-list pane."
 
-#: mail/evolution-mail.schemas.in.in.h:27
+#: ../mail/evolution-mail.schemas.in.in.h:27
 msgid ""
 "If a user tries to open 10 or more messages at one time, ask the user if "
 "they really want to do it."
@@ -11472,7 +11572,7 @@ msgstr ""
 "If a user tries to open 10 or more messages at one time, ask the user if "
 "they really want to do it."
 
-#: mail/evolution-mail.schemas.in.in.h:28
+#: ../mail/evolution-mail.schemas.in.in.h:28
 msgid ""
 "If there isn't a builtin viewer for a particular mime-type inside Evolution, "
 "any mime-types appearing in this list which map to a bonobo-component viewer "
@@ -11482,23 +11582,23 @@ msgstr ""
 "any mime-types appearing in this list which map to a bonobo-component viewer "
 "in GNOME's mime-type database may be used for displaying content."
 
-#: mail/evolution-mail.schemas.in.in.h:29
+#: ../mail/evolution-mail.schemas.in.in.h:29
 msgid "Last time empty trash was run"
 msgstr "Last time empty trash was run"
 
-#: mail/evolution-mail.schemas.in.in.h:30
+#: ../mail/evolution-mail.schemas.in.in.h:30
 msgid "List of Labels and their associated colors"
 msgstr "List of Labels and their associated colours"
 
-#: mail/evolution-mail.schemas.in.in.h:31
+#: ../mail/evolution-mail.schemas.in.in.h:31
 msgid "List of accepted licenses"
 msgstr "List of accepted licences"
 
-#: mail/evolution-mail.schemas.in.in.h:32
+#: ../mail/evolution-mail.schemas.in.in.h:32
 msgid "List of accounts"
 msgstr "List of accounts"
 
-#: mail/evolution-mail.schemas.in.in.h:33
+#: ../mail/evolution-mail.schemas.in.in.h:33
 msgid ""
 "List of accounts known to the mail component of Evolution. The list contains "
 "strings naming subdirectories relative to /apps/evolution/mail/accounts."
@@ -11506,11 +11606,11 @@ msgstr ""
 "List of accounts known to the mail component of Evolution. The list contains "
 "strings naming subdirectories relative to /apps/evolution/mail/accounts."
 
-#: mail/evolution-mail.schemas.in.in.h:34
+#: ../mail/evolution-mail.schemas.in.in.h:34
 msgid "List of custom headers and whether they are enabled."
 msgstr "List of custom headers and whether they are enabled."
 
-#: mail/evolution-mail.schemas.in.in.h:35
+#: ../mail/evolution-mail.schemas.in.in.h:35
 msgid ""
 "List of labels known to the mail component of Evolution. The list contains "
 "strings containing name:color where color uses the HTML hex encoding."
@@ -11518,19 +11618,19 @@ msgstr ""
 "List of labels known to the mail component of Evolution. The list contains "
 "strings containing name:colour where colour uses the HTML hex encoding."
 
-#: mail/evolution-mail.schemas.in.in.h:36
+#: ../mail/evolution-mail.schemas.in.in.h:36
 msgid "List of mime types to check for bonobo component viewers"
 msgstr "List of mime types to check for bonobo component viewers"
 
-#: mail/evolution-mail.schemas.in.in.h:37
+#: ../mail/evolution-mail.schemas.in.in.h:37
 msgid "List of protocol names whose license has been accepted."
 msgstr "List of protocol names whose licence has been accepted."
 
-#: mail/evolution-mail.schemas.in.in.h:38
+#: ../mail/evolution-mail.schemas.in.in.h:38
 msgid "Load images for HTML messages over http"
 msgstr "Load images for HTML messages over http"
 
-#: mail/evolution-mail.schemas.in.in.h:39
+#: ../mail/evolution-mail.schemas.in.in.h:39
 msgid ""
 "Load images for HTML messages over http(s). Possible values are: 0 - Never "
 "load images off the net 1 - Load images if sender is in the addressbook 2 - "
@@ -11540,93 +11640,93 @@ msgstr ""
 "load images off the net 1 - Load images if sender is in the addressbook 2 - "
 "Always load images off the net"
 
-#: mail/evolution-mail.schemas.in.in.h:40
+#: ../mail/evolution-mail.schemas.in.in.h:40
 msgid "Log filter actions"
 msgstr "Log filter actions"
 
-#: mail/evolution-mail.schemas.in.in.h:41
+#: ../mail/evolution-mail.schemas.in.in.h:41
 msgid "Log filter actions to the specified log file."
 msgstr "Log filter actions to the specified log file."
 
-#: mail/evolution-mail.schemas.in.in.h:42
+#: ../mail/evolution-mail.schemas.in.in.h:42
 msgid "Logfile to log filter actions"
 msgstr "Logfile to log filter actions"
 
-#: mail/evolution-mail.schemas.in.in.h:43
+#: ../mail/evolution-mail.schemas.in.in.h:43
 msgid "Logfile to log filter actions."
 msgstr "Logfile to log filter actions."
 
-#: mail/evolution-mail.schemas.in.in.h:44
+#: ../mail/evolution-mail.schemas.in.in.h:44
 msgid "Mark as Seen after specified timeout"
 msgstr "Mark as Seen after specified timeout"
 
-#: mail/evolution-mail.schemas.in.in.h:45
+#: ../mail/evolution-mail.schemas.in.in.h:45
 msgid "Mark as Seen after specified timeout."
 msgstr "Mark as Seen after specified timeout."
 
-#: mail/evolution-mail.schemas.in.in.h:46
+#: ../mail/evolution-mail.schemas.in.in.h:46
 msgid "Mark citations in the message \"Preview\""
 msgstr "Mark citations in the message \"Preview\""
 
-#: mail/evolution-mail.schemas.in.in.h:47
+#: ../mail/evolution-mail.schemas.in.in.h:47
 msgid "Mark citations in the message \"Preview\"."
 msgstr "Mark citations in the message \"Preview\"."
 
-#: mail/evolution-mail.schemas.in.in.h:48
+#: ../mail/evolution-mail.schemas.in.in.h:48
 msgid "Message Window default height"
 msgstr "Message Window default height"
 
-#: mail/evolution-mail.schemas.in.in.h:49
+#: ../mail/evolution-mail.schemas.in.in.h:49
 msgid "Message Window default width"
 msgstr "Message Window default width"
 
-#: mail/evolution-mail.schemas.in.in.h:50
+#: ../mail/evolution-mail.schemas.in.in.h:50
 msgid "Message-display style (normal, full headers, source)"
 msgstr "Message-display style (normal, full headers, source)"
 
-#: mail/evolution-mail.schemas.in.in.h:51
+#: ../mail/evolution-mail.schemas.in.in.h:51
 msgid "Minimum days between emptying the trash on exit"
 msgstr "Minimum days between emptying the trash on exit"
 
-#: mail/evolution-mail.schemas.in.in.h:52
+#: ../mail/evolution-mail.schemas.in.in.h:52
 msgid "Minimum time between emptying the trash on exit, in days."
 msgstr "Minimum time between emptying the trash on exit, in days."
 
-#: mail/evolution-mail.schemas.in.in.h:53
+#: ../mail/evolution-mail.schemas.in.in.h:53
 msgid "New Mail Notify sound file"
 msgstr "New Mail Notify sound file"
 
-#: mail/evolution-mail.schemas.in.in.h:54
+#: ../mail/evolution-mail.schemas.in.in.h:54
 msgid "New Mail Notify type"
 msgstr "New Mail Notify type"
 
-#: mail/evolution-mail.schemas.in.in.h:55
+#: ../mail/evolution-mail.schemas.in.in.h:55
 msgid "Prompt on empty subject"
 msgstr "Prompt on empty subject"
 
-#: mail/evolution-mail.schemas.in.in.h:56
+#: ../mail/evolution-mail.schemas.in.in.h:56
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr "Prompt the user when he or she tries to expunge a folder."
 
-#: mail/evolution-mail.schemas.in.in.h:57
+#: ../mail/evolution-mail.schemas.in.in.h:57
 msgid ""
 "Prompt the user when he or she tries to send a message without a Subject."
 msgstr ""
 "Prompt the user when he or she tries to send a message without a Subject."
 
-#: mail/evolution-mail.schemas.in.in.h:58
+#: ../mail/evolution-mail.schemas.in.in.h:58
 msgid "Prompt when user expunges"
 msgstr "Prompt when user expunges"
 
-#: mail/evolution-mail.schemas.in.in.h:59
+#: ../mail/evolution-mail.schemas.in.in.h:59
 msgid "Prompt when user only fills Bcc"
 msgstr "Prompt when user only fills Bcc"
 
-#: mail/evolution-mail.schemas.in.in.h:60
+#: ../mail/evolution-mail.schemas.in.in.h:60
 msgid "Prompt when user tries to open 10 or more messages at once"
 msgstr "Prompt when user tries to open 10 or more messages at once"
 
-#: mail/evolution-mail.schemas.in.in.h:61
+#: ../mail/evolution-mail.schemas.in.in.h:61
 msgid ""
 "Prompt when user tries to send HTML mail to recipients that may not want to "
 "receive HTML mail."
@@ -11634,95 +11734,95 @@ msgstr ""
 "Prompt when user tries to send HTML mail to recipients that may not want to "
 "receive HTML mail."
 
-#: mail/evolution-mail.schemas.in.in.h:62
+#: ../mail/evolution-mail.schemas.in.in.h:62
 msgid "Prompt when user tries to send a message with no To or Cc recipients."
 msgstr "Prompt when user tries to send a message with no To or Cc recipients."
 
-#: mail/evolution-mail.schemas.in.in.h:63
+#: ../mail/evolution-mail.schemas.in.in.h:63
 msgid "Prompt when user tries to send unwanted HTML"
 msgstr "Prompt when user tries to send unwanted HTML"
 
-#: mail/evolution-mail.schemas.in.in.h:64
+#: ../mail/evolution-mail.schemas.in.in.h:64
 msgid "Recognize links in text and replace them."
 msgstr "Recognize links in text and replace them."
 
-#: mail/evolution-mail.schemas.in.in.h:65
+#: ../mail/evolution-mail.schemas.in.in.h:65
 msgid "Recognize smileys in text and replace them with images."
 msgstr "Recognize smileys in text and replace them with images."
 
-#: mail/evolution-mail.schemas.in.in.h:66
+#: ../mail/evolution-mail.schemas.in.in.h:66
 msgid "Run junk test on incoming mail"
 msgstr "Run junk test on incoming mail"
 
-#: mail/evolution-mail.schemas.in.in.h:67
+#: ../mail/evolution-mail.schemas.in.in.h:67
 msgid "Send HTML mail by default"
 msgstr "Send HTML mail by default"
 
-#: mail/evolution-mail.schemas.in.in.h:68
+#: ../mail/evolution-mail.schemas.in.in.h:68
 msgid "Send HTML mail by default."
 msgstr "Send HTML mail by default."
 
-#: mail/evolution-mail.schemas.in.in.h:69
+#: ../mail/evolution-mail.schemas.in.in.h:69
 msgid "Show Animations"
 msgstr "Show Animations"
 
-#: mail/evolution-mail.schemas.in.in.h:70
+#: ../mail/evolution-mail.schemas.in.in.h:70
 msgid "Show animated images as animations."
 msgstr "Show animated images as animations."
 
-#: mail/evolution-mail.schemas.in.in.h:71
+#: ../mail/evolution-mail.schemas.in.in.h:71
 msgid "Show deleted messages (with a strike-through) in the message-list."
 msgstr "Show deleted messages (with a strike-through) in the message-list."
 
-#: mail/evolution-mail.schemas.in.in.h:72
+#: ../mail/evolution-mail.schemas.in.in.h:72
 msgid "Show deleted messages in the message-list"
 msgstr "Show deleted messages in the message-list"
 
-#: mail/evolution-mail.schemas.in.in.h:73
+#: ../mail/evolution-mail.schemas.in.in.h:73
 msgid "Show the \"Preview\" pane"
 msgstr "Show the \"Preview\" pane"
 
-#: mail/evolution-mail.schemas.in.in.h:74
+#: ../mail/evolution-mail.schemas.in.in.h:74
 msgid "Show the \"Preview\" pane."
 msgstr "Show the \"Preview\" pane."
 
-#: mail/evolution-mail.schemas.in.in.h:75
+#: ../mail/evolution-mail.schemas.in.in.h:75
 msgid "Sound file to play when new mail arrives."
 msgstr "Sound file to play when new mail arrives."
 
-#: mail/evolution-mail.schemas.in.in.h:76
+#: ../mail/evolution-mail.schemas.in.in.h:76
 msgid "Specifies the type of New Mail Notification the user wishes to use."
 msgstr "Specifies the type of New Mail Notification the user wishes to use."
 
-#: mail/evolution-mail.schemas.in.in.h:77
+#: ../mail/evolution-mail.schemas.in.in.h:77
 msgid "Spell check inline"
 msgstr "Spell check inline"
 
-#: mail/evolution-mail.schemas.in.in.h:78
+#: ../mail/evolution-mail.schemas.in.in.h:78
 msgid "Subscribe dialog default height"
 msgstr "Subscribe dialogue default height"
 
-#: mail/evolution-mail.schemas.in.in.h:79
+#: ../mail/evolution-mail.schemas.in.in.h:79
 msgid "Subscribe dialog default width"
 msgstr "Subscribe dialogue default width"
 
-#: mail/evolution-mail.schemas.in.in.h:80
+#: ../mail/evolution-mail.schemas.in.in.h:80
 msgid "Terminal font"
 msgstr "Terminal font"
 
-#: mail/evolution-mail.schemas.in.in.h:81
+#: ../mail/evolution-mail.schemas.in.in.h:81
 msgid "The last time empty trash was run, in days since the epoch."
 msgstr "The last time empty trash was run, in days since the epoch."
 
-#: mail/evolution-mail.schemas.in.in.h:82
+#: ../mail/evolution-mail.schemas.in.in.h:82
 msgid "The terminal font for mail display"
 msgstr "The terminal font for mail display"
 
-#: mail/evolution-mail.schemas.in.in.h:83
+#: ../mail/evolution-mail.schemas.in.in.h:83
 msgid "The variable width font for mail display"
 msgstr "The variable width font for mail display"
 
-#: mail/evolution-mail.schemas.in.in.h:84
+#: ../mail/evolution-mail.schemas.in.in.h:84
 msgid ""
 "This key should contain a list of XML structures specifying custom headers, "
 "and whether they are to be displayed. The format of the XML structure is &lt;"
@@ -11734,99 +11834,99 @@ msgstr ""
 "header enabled&gt; - set enabled if the header is to be displayed in the "
 "mail view."
 
-#: mail/evolution-mail.schemas.in.in.h:85
+#: ../mail/evolution-mail.schemas.in.in.h:85
 msgid "Thread the message list."
 msgstr "Thread the message list."
 
-#: mail/evolution-mail.schemas.in.in.h:86
+#: ../mail/evolution-mail.schemas.in.in.h:86
 msgid "Thread the message-list"
 msgstr "Thread the message-list"
 
-#: mail/evolution-mail.schemas.in.in.h:87
+#: ../mail/evolution-mail.schemas.in.in.h:87
 msgid "Thread the message-list based on Subject"
 msgstr "Thread the message-list based on Subject"
 
-#: mail/evolution-mail.schemas.in.in.h:88
+#: ../mail/evolution-mail.schemas.in.in.h:88
 msgid "Timeout for marking message as Seen"
 msgstr "Timeout for marking message as Seen"
 
-#: mail/evolution-mail.schemas.in.in.h:89
+#: ../mail/evolution-mail.schemas.in.in.h:89
 msgid "Timeout for marking message as Seen."
 msgstr "Timeout for marking message as Seen."
 
-#: mail/evolution-mail.schemas.in.in.h:90
+#: ../mail/evolution-mail.schemas.in.in.h:90
 msgid "UID string of the default account."
 msgstr "UID string of the default account."
 
-#: mail/evolution-mail.schemas.in.in.h:91
+#: ../mail/evolution-mail.schemas.in.in.h:91
 msgid "Use Spamassassin daemon and client"
 msgstr "Use Spamassassin daemon and client"
 
-#: mail/evolution-mail.schemas.in.in.h:92
+#: ../mail/evolution-mail.schemas.in.in.h:92
 msgid "Use Spamassassin daemon and client (spamc/spamd)"
 msgstr "Use Spamassassin daemon and client (spamc/spamd)"
 
-#: mail/evolution-mail.schemas.in.in.h:93
+#: ../mail/evolution-mail.schemas.in.in.h:93
 msgid "Use custom fonts"
 msgstr "Use custom fonts"
 
-#: mail/evolution-mail.schemas.in.in.h:94
+#: ../mail/evolution-mail.schemas.in.in.h:94
 msgid "Use custom fonts for displaying mail"
 msgstr "Use custom fonts for displaying mail"
 
-#: mail/evolution-mail.schemas.in.in.h:95
+#: ../mail/evolution-mail.schemas.in.in.h:95
 msgid "Use only local spam tests."
 msgstr "Use only local spam tests."
 
-#: mail/evolution-mail.schemas.in.in.h:96
+#: ../mail/evolution-mail.schemas.in.in.h:96
 msgid "Use only the local spam tests (no DNS)."
 msgstr "Use only the local spam tests (no DNS)."
 
-#: mail/evolution-mail.schemas.in.in.h:97
+#: ../mail/evolution-mail.schemas.in.in.h:97
 msgid "Variable width font"
 msgstr "Variable width font"
 
-#: mail/evolution-mail.schemas.in.in.h:98
+#: ../mail/evolution-mail.schemas.in.in.h:98
 msgid "View/Bcc menu item is checked"
 msgstr "View/Bcc menu item is checked"
 
-#: mail/evolution-mail.schemas.in.in.h:99
+#: ../mail/evolution-mail.schemas.in.in.h:99
 msgid "View/Bcc menu item is checked."
 msgstr "View/Bcc menu item is checked."
 
-#: mail/evolution-mail.schemas.in.in.h:100
+#: ../mail/evolution-mail.schemas.in.in.h:100
 msgid "View/Cc menu item is checked"
 msgstr "View/Cc menu item is checked"
 
-#: mail/evolution-mail.schemas.in.in.h:101
+#: ../mail/evolution-mail.schemas.in.in.h:101
 msgid "View/Cc menu item is checked."
 msgstr "View/Cc menu item is checked."
 
-#: mail/evolution-mail.schemas.in.in.h:102
+#: ../mail/evolution-mail.schemas.in.in.h:102
 msgid "View/From menu item is checked"
 msgstr "View/From menu item is checked"
 
-#: mail/evolution-mail.schemas.in.in.h:103
+#: ../mail/evolution-mail.schemas.in.in.h:103
 msgid "View/From menu item is checked."
 msgstr "View/From menu item is checked."
 
-#: mail/evolution-mail.schemas.in.in.h:104
+#: ../mail/evolution-mail.schemas.in.in.h:104
 msgid "View/PostTo menu item is checked"
 msgstr "View/PostTo menu item is checked"
 
-#: mail/evolution-mail.schemas.in.in.h:105
+#: ../mail/evolution-mail.schemas.in.in.h:105
 msgid "View/PostTo menu item is checked."
 msgstr "View/PostTo menu item is checked."
 
-#: mail/evolution-mail.schemas.in.in.h:106
+#: ../mail/evolution-mail.schemas.in.in.h:106
 msgid "View/ReplyTo menu item is checked"
 msgstr "View/ReplyTo menu item is checked"
 
-#: mail/evolution-mail.schemas.in.in.h:107
+#: ../mail/evolution-mail.schemas.in.in.h:107
 msgid "View/ReplyTo menu item is checked."
 msgstr "View/ReplyTo menu item is checked."
 
-#: mail/evolution-mail.schemas.in.in.h:108
+#: ../mail/evolution-mail.schemas.in.in.h:108
 msgid ""
 "Whether or not to fall back on threading by subjects when the messages do "
 "not contain In-Reply-To or References headers."
@@ -11834,65 +11934,67 @@ msgstr ""
 "Whether or not to fall back on threading by subjects when the messages do "
 "not contain In-Reply-To or References headers."
 
-#: mail/evolution-mail.schemas.in.in.h:109
+#: ../mail/evolution-mail.schemas.in.in.h:109
 msgid "port for starting user runned spamd"
 msgstr "port for starting user runned spamd"
 
-#: mail/evolution-mail.schemas.in.in.h:110
+#: ../mail/evolution-mail.schemas.in.in.h:110
 msgid "spamd port"
 msgstr "spamd port"
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:1
+#: ../mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:1
 msgid "Evolution Elm importer"
 msgstr "Evolution Elm importer"
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:2
+#: ../mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:2
 msgid "Evolution Netscape Mail importer"
 msgstr "Evolution Netscape Mail importer"
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:3
+#: ../mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:3
 msgid "Evolution Outlook Express 4 importer"
 msgstr "Evolution Outlook Express 4 importer"
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:4
+#: ../mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:4
 msgid "Evolution Pine importer"
 msgstr "Evolution Pine importer"
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:5
+#: ../mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:5
 msgid "Evolution mbox importer"
 msgstr "Evolution mbox importer"
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:6
+#: ../mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:6
 msgid "MBox (mbox)"
 msgstr "MBox (mbox)"
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:7
+#: ../mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:7
 msgid "Outlook Express 4 (.mbx)"
 msgstr "Outlook Express 4 (.mbx)"
 
-#: mail/importers/elm-importer.c:88
+#: ../mail/importers/elm-importer.c:88
 msgid "Evolution is importing your old Elm mail"
 msgstr "Evolution is importing your old Elm mail"
 
-#: mail/importers/elm-importer.c:89
-#: mail/importers/evolution-mbox-importer.c:225
-#: mail/importers/evolution-outlook-importer.c:259
-#: mail/importers/netscape-importer.c:1251 mail/importers/pine-importer.c:117
+#: ../mail/importers/elm-importer.c:89
+#: ../mail/importers/evolution-mbox-importer.c:225
+#: ../mail/importers/evolution-outlook-importer.c:259
+#: ../mail/importers/netscape-importer.c:1251
+#: ../mail/importers/pine-importer.c:117
 msgid "Importing..."
 msgstr "Importing..."
 
-#: mail/importers/elm-importer.c:91
-#: mail/importers/evolution-mbox-importer.c:227
-#: mail/importers/evolution-outlook-importer.c:261
-#: mail/importers/netscape-importer.c:1253 mail/importers/pine-importer.c:119
+#: ../mail/importers/elm-importer.c:91
+#: ../mail/importers/evolution-mbox-importer.c:227
+#: ../mail/importers/evolution-outlook-importer.c:261
+#: ../mail/importers/netscape-importer.c:1253
+#: ../mail/importers/pine-importer.c:119
 msgid "Please wait"
 msgstr "Please wait"
 
-#: mail/importers/elm-importer.c:244
+#: ../mail/importers/elm-importer.c:244
 msgid "Importing Elm data"
 msgstr "Importing Elm data"
 
-#: mail/importers/elm-importer.c:436
+#: ../mail/importers/elm-importer.c:436
 msgid ""
 "Evolution has found Elm mail files\n"
 "Would you like to import them into Evolution?"
@@ -11900,43 +12002,43 @@ msgstr ""
 "Evolution has found Elm mail files\n"
 "Would you like to import them into Evolution?"
 
-#: mail/importers/elm-importer.c:444
+#: ../mail/importers/elm-importer.c:444
 msgid "Elm"
 msgstr "Elm"
 
-#: mail/importers/evolution-mbox-importer.c:117
-#: mail/importers/evolution-outlook-importer.c:131
+#: ../mail/importers/evolution-mbox-importer.c:117
+#: ../mail/importers/evolution-outlook-importer.c:131
 msgid "Destination folder:"
 msgstr "Destination folder:"
 
-#: mail/importers/evolution-mbox-importer.c:120
-#: mail/importers/evolution-outlook-importer.c:134
+#: ../mail/importers/evolution-mbox-importer.c:120
+#: ../mail/importers/evolution-outlook-importer.c:134
 msgid "Select folder to import into"
 msgstr "Select folder to import into"
 
-#: mail/importers/evolution-mbox-importer.c:223
-#: mail/importers/evolution-outlook-importer.c:257
-#: mail/importers/mail-importer.c:226
+#: ../mail/importers/evolution-mbox-importer.c:223
+#: ../mail/importers/evolution-outlook-importer.c:257
+#: ../mail/importers/mail-importer.c:226
 #, c-format
 msgid "Importing `%s'"
 msgstr "Importing `%s'"
 
-#: mail/importers/evolution-outlook-importer.c:305
-#: mail/importers/mail-importer.c:140
+#: ../mail/importers/evolution-outlook-importer.c:305
+#: ../mail/importers/mail-importer.c:140
 msgid "Importing mailbox"
 msgstr "Importing mailbox"
 
-#: mail/importers/mail-importer.c:363
+#: ../mail/importers/mail-importer.c:363
 #, c-format
 msgid "Scanning %s"
 msgstr "Scanning %s"
 
-#: mail/importers/netscape-importer.c:73
+#: ../mail/importers/netscape-importer.c:73
 #, c-format
 msgid "Priority Filter \"%s\""
 msgstr "Priority Filter \"%s\""
 
-#: mail/importers/netscape-importer.c:662
+#: ../mail/importers/netscape-importer.c:662
 msgid ""
 "Some of your Netscape email filters are based on\n"
 "email priorities, which are not used in Evolution.\n"
@@ -11962,7 +12064,7 @@ msgstr ""
 "of priorities. Check the imported filters to make sure\n"
 "everything still works as intended."
 
-#: mail/importers/netscape-importer.c:686
+#: ../mail/importers/netscape-importer.c:686
 msgid ""
 "Some of your Netscape email filters use\n"
 "the \"Ignore Thread\" or \"Watch Thread\"\n"
@@ -11974,7 +12076,7 @@ msgstr ""
 "feature, which is not supported in Evolution.\n"
 "These filters will be dropped."
 
-#: mail/importers/netscape-importer.c:703
+#: ../mail/importers/netscape-importer.c:703
 msgid ""
 "Some of your Netscape email filters test the\n"
 "body of emails for (in)equality to a given string,\n"
@@ -11988,23 +12090,23 @@ msgstr ""
 "were modified to test whether that string is or is not\n"
 "contained in the message body."
 
-#: mail/importers/netscape-importer.c:1250
+#: ../mail/importers/netscape-importer.c:1250
 msgid "Evolution is importing your old Netscape data"
 msgstr "Evolution is importing your old Netscape data"
 
-#: mail/importers/netscape-importer.c:1707
+#: ../mail/importers/netscape-importer.c:1707
 msgid "Importing Netscape data"
 msgstr "Importing Netscape data"
 
-#: mail/importers/netscape-importer.c:1907
+#: ../mail/importers/netscape-importer.c:1907
 msgid "Settings"
 msgstr "Settings"
 
-#: mail/importers/netscape-importer.c:1912
+#: ../mail/importers/netscape-importer.c:1912
 msgid "Mail Filters"
 msgstr "Mail Filters"
 
-#: mail/importers/netscape-importer.c:1933
+#: ../mail/importers/netscape-importer.c:1933
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
@@ -12012,15 +12114,15 @@ msgstr ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
 
-#: mail/importers/pine-importer.c:116
+#: ../mail/importers/pine-importer.c:116
 msgid "Evolution is importing your old Pine data"
 msgstr "Evolution is importing your old Pine data"
 
-#: mail/importers/pine-importer.c:314
+#: ../mail/importers/pine-importer.c:314
 msgid "Importing Pine data"
 msgstr "Importing Pine data"
 
-#: mail/importers/pine-importer.c:498
+#: ../mail/importers/pine-importer.c:498
 msgid ""
 "Evolution has found Pine mail files.\n"
 "Would you like to import them into Evolution?"
@@ -12028,336 +12130,337 @@ msgstr ""
 "Evolution has found Pine mail files.\n"
 "Would you like to import them into Evolution?"
 
-#: mail/importers/pine-importer.c:506
+#: ../mail/importers/pine-importer.c:506
 msgid "Pine"
 msgstr "Pine"
 
-#: mail/mail-autofilter.c:74
+#: ../mail/mail-autofilter.c:75
 #, c-format
 msgid "Mail to %s"
 msgstr "Mail to %s"
 
-#: mail/mail-autofilter.c:238 mail/mail-autofilter.c:277
+#: ../mail/mail-autofilter.c:239 ../mail/mail-autofilter.c:278
 #, c-format
 msgid "Mail from %s"
 msgstr "Mail from %s"
 
-#: mail/mail-autofilter.c:261
+#: ../mail/mail-autofilter.c:262
 #, c-format
 msgid "Subject is %s"
 msgstr "Subject is %s"
 
-#: mail/mail-autofilter.c:296
+#: ../mail/mail-autofilter.c:297
 #, c-format
 msgid "%s mailing list"
 msgstr "%s mailing list"
 
-#: mail/mail-autofilter.c:365
+#: ../mail/mail-autofilter.c:366
 msgid "Add Filter Rule"
 msgstr "Add Filter Rule"
 
-#: mail/mail-component.c:484
+#: ../mail/mail-component.c:505
 #, c-format
 msgid "%d deleted"
 msgid_plural "%d deleted"
 msgstr[0] "%d deleted"
 msgstr[1] "%d deleted"
 
-#: mail/mail-component.c:486
+#: ../mail/mail-component.c:507
 #, c-format
 msgid "%d junk"
 msgid_plural "%d junk"
 msgstr[0] "%d junk"
 msgstr[1] "%d junk"
 
-#: mail/mail-component.c:509
+#: ../mail/mail-component.c:530
 #, c-format
 msgid "%d draft"
 msgid_plural "%d drafts"
 msgstr[0] "%d draft"
 msgstr[1] "%d drafts"
 
-#: mail/mail-component.c:511
+#: ../mail/mail-component.c:532
 #, c-format
 msgid "%d sent"
 msgid_plural "%d sent"
 msgstr[0] "%d sent"
 msgstr[1] "%d sent"
 
-#: mail/mail-component.c:513
+#: ../mail/mail-component.c:534
 #, c-format
 msgid "%d unsent"
 msgid_plural "%d unsent"
 msgstr[0] "%d unsent"
 msgstr[1] "%d unsent"
 
-#: mail/mail-component.c:517
+#: ../mail/mail-component.c:538
 #, c-format
 msgid "%d total"
 msgid_plural "%d total"
 msgstr[0] "%d total"
 msgstr[1] "%d total"
 
-#: mail/mail-component.c:519
+#: ../mail/mail-component.c:540
 #, c-format
 msgid ", %d unread"
 msgid_plural ", %d unread"
 msgstr[0] ", %d unread"
 msgstr[1] ", %d unread"
 
-#: mail/mail-component.c:691
+#: ../mail/mail-component.c:722
 msgid "New Mail Message"
 msgstr "New Mail Message"
 
-#: mail/mail-component.c:692
+#: ../mail/mail-component.c:723
 msgid "_Mail Message"
 msgstr "_Mail Message"
 
-#: mail/mail-component.c:693
+#: ../mail/mail-component.c:724
 msgid "Compose a new mail message"
 msgstr "Compose a new mail message"
 
-#: mail/mail-component.c:699
+#: ../mail/mail-component.c:730
 msgid "New Mail Folder"
 msgstr "New Mail Folder"
 
-#: mail/mail-component.c:700
+#: ../mail/mail-component.c:731
 msgid "Mail _Folder"
 msgstr "Mail _Folder"
 
-#: mail/mail-component.c:701
+#: ../mail/mail-component.c:732
 msgid "Create a new mail folder"
 msgstr "Create a new mail folder"
 
-#: mail/mail-component.c:848
+#: ../mail/mail-component.c:879
 msgid "Failed upgrading Mail settings or folders."
 msgstr "Failed upgrading Mail settings or folders."
 
-#: mail/mail-config.glade.h:1 mail/mail-dialogs.glade.h:5
+#: ../mail/mail-config.glade.h:1 ../mail/mail-dialogs.glade.h:1
 msgid "    "
 msgstr "    "
 
-#: mail/mail-config.glade.h:2
+#: ../mail/mail-config.glade.h:2
 msgid " Ch_eck for Supported Types "
 msgstr " Ch_eck for Supported Types "
 
-#: mail/mail-config.glade.h:4
+#: ../mail/mail-config.glade.h:4
 msgid "<b>SSL is not supported in this build of Evolution</b>"
 msgstr "<b>SSL is not supported in this build of Evolution</b>"
 
-#: mail/mail-config.glade.h:5
+#: ../mail/mail-config.glade.h:5
 msgid "<b>S_ignatures</b>"
 msgstr "<b>S_ignatures</b>"
 
-#: mail/mail-config.glade.h:6
+#: ../mail/mail-config.glade.h:6
 msgid "<b>_Languages</b>"
 msgstr "<b>_Languages</b>"
 
-#: mail/mail-config.glade.h:7
+#: ../mail/mail-config.glade.h:7
 msgid "<small>This will make the the filter more reliable, but slower</small>"
 msgstr "<small>This will make the the filter more reliable, but slower</small>"
 
-#: mail/mail-config.glade.h:8
+#: ../mail/mail-config.glade.h:8
 msgid "<span weight=\"bold\">Account Information</span>"
 msgstr "<span weight=\"bold\">Account Information</span>"
 
-#: mail/mail-config.glade.h:9
+#: ../mail/mail-config.glade.h:9
 msgid "<span weight=\"bold\">Alerts</span>"
 msgstr "<span weight=\"bold\">Alerts</span>"
 
-#: mail/mail-config.glade.h:10
+#: ../mail/mail-config.glade.h:10
 msgid "<span weight=\"bold\">Authentication Type</span>"
 msgstr "<span weight=\"bold\">Authentication Type</span>"
 
-#: mail/mail-config.glade.h:11
+#: ../mail/mail-config.glade.h:11
 msgid "<span weight=\"bold\">Authentication</span>"
 msgstr "<span weight=\"bold\">Authentication</span>"
 
-#: mail/mail-config.glade.h:12
+#: ../mail/mail-config.glade.h:12
 msgid "<span weight=\"bold\">Composing Messages</span>"
 msgstr "<span weight=\"bold\">Composing Messages</span>"
 
-#: mail/mail-config.glade.h:13
+#: ../mail/mail-config.glade.h:13
 msgid "<span weight=\"bold\">Configuration</span>"
 msgstr "<span weight=\"bold\">Configuration</span>"
 
-#: mail/mail-config.glade.h:14
+#: ../mail/mail-config.glade.h:14
 msgid "<span weight=\"bold\">Default Behavior</span>"
 msgstr "<span weight=\"bold\">Default Behaviour</span>"
 
-#: mail/mail-config.glade.h:15
+#: ../mail/mail-config.glade.h:15
 msgid "<span weight=\"bold\">Delete Mail</span>"
 msgstr "<span weight=\"bold\">Delete Mail</span>"
 
-#: mail/mail-config.glade.h:16
+#: ../mail/mail-config.glade.h:16
 msgid "<span weight=\"bold\">Displayed Mail _Headers</span>"
 msgstr "<span weight=\"bold\">Displayed Mail _Headers</span>"
 
-#: mail/mail-config.glade.h:17
+#: ../mail/mail-config.glade.h:17
 msgid "<span weight=\"bold\">Filter Options</span>"
 msgstr "<span weight=\"bold\">Filter Options</span>"
 
-#: mail/mail-config.glade.h:18 plugins/itip-formatter/itip-formatter.c:1667
+#: ../mail/mail-config.glade.h:18
+#: ../plugins/itip-formatter/itip-formatter.c:1681
 msgid "<span weight=\"bold\">General</span>"
 msgstr "<span weight=\"bold\">General</span>"
 
-#: mail/mail-config.glade.h:19
+#: ../mail/mail-config.glade.h:19
 msgid "<span weight=\"bold\">Labels and Colors</span>"
 msgstr "<span weight=\"bold\">Labels and Colours</span>"
 
-#: mail/mail-config.glade.h:20
+#: ../mail/mail-config.glade.h:20
 msgid "<span weight=\"bold\">Loading Images</span>"
 msgstr "<span weight=\"bold\">Loading Images</span>"
 
-#: mail/mail-config.glade.h:21
+#: ../mail/mail-config.glade.h:21
 msgid "<span weight=\"bold\">Message Display</span>"
 msgstr "<span weight=\"bold\">Message Display</span>"
 
-#: mail/mail-config.glade.h:22
+#: ../mail/mail-config.glade.h:22
 msgid "<span weight=\"bold\">Message Fonts</span>"
 msgstr "<span weight=\"bold\">Message Fonts</span>"
 
-#: mail/mail-config.glade.h:23
+#: ../mail/mail-config.glade.h:23
 msgid "<span weight=\"bold\">New Mail Notification</span>"
 msgstr "<span weight=\"bold\">New Mail Notification</span>"
 
-#: mail/mail-config.glade.h:24
+#: ../mail/mail-config.glade.h:24
 msgid "<span weight=\"bold\">Optional Information</span>"
 msgstr "<span weight=\"bold\">Optional Information</span>"
 
-#: mail/mail-config.glade.h:25
+#: ../mail/mail-config.glade.h:25
 msgid "<span weight=\"bold\">Options</span>"
 msgstr "<span weight=\"bold\">Options</span>"
 
-#: mail/mail-config.glade.h:26
+#: ../mail/mail-config.glade.h:26
 msgid "<span weight=\"bold\">Pretty Good Privacy (PGP/GPG)</span>"
 msgstr "<span weight=\"bold\">Pretty Good Privacy (PGP/GPG)</span>"
 
-#: mail/mail-config.glade.h:27
+#: ../mail/mail-config.glade.h:27
 msgid "<span weight=\"bold\">Printed Fonts</span>"
 msgstr "<span weight=\"bold\">Printed Fonts</span>"
 
-#: mail/mail-config.glade.h:28
+#: ../mail/mail-config.glade.h:28
 msgid "<span weight=\"bold\">Required Information</span>"
 msgstr "<span weight=\"bold\">Required Information</span>"
 
-#: mail/mail-config.glade.h:29
+#: ../mail/mail-config.glade.h:29
 msgid "<span weight=\"bold\">Secure MIME (S/MIME)</span>"
 msgstr "<span weight=\"bold\">Secure MIME (S/MIME)</span>"
 
-#: mail/mail-config.glade.h:30
+#: ../mail/mail-config.glade.h:30
 msgid "<span weight=\"bold\">Security</span>"
 msgstr "<span weight=\"bold\">Security</span>"
 
-#: mail/mail-config.glade.h:31
+#: ../mail/mail-config.glade.h:31
 msgid "<span weight=\"bold\">Sent and Draft Messages</span>"
 msgstr "<span weight=\"bold\">Sent and Draft Messages</span>"
 
-#: mail/mail-config.glade.h:32
+#: ../mail/mail-config.glade.h:32
 msgid "<span weight=\"bold\">Server Configuration</span>"
 msgstr "<span weight=\"bold\">Server Configuration</span>"
 
-#: mail/mail-config.glade.h:34
+#: ../mail/mail-config.glade.h:34
 msgid "Account Management"
 msgstr "Account Management"
 
-#: mail/mail-config.glade.h:35
+#: ../mail/mail-config.glade.h:35
 msgid "Add Ne_w Signature..."
 msgstr "Add Ne_w Signature..."
 
-#: mail/mail-config.glade.h:36
+#: ../mail/mail-config.glade.h:36
 msgid "Add _Script"
 msgstr "Add _Script"
 
-#: mail/mail-config.glade.h:37
+#: ../mail/mail-config.glade.h:37
 msgid "Al_ways sign outgoing messages when using this account"
 msgstr "Al_ways sign outgoing messages when using this account"
 
-#: mail/mail-config.glade.h:38
+#: ../mail/mail-config.glade.h:38
 msgid "Also encrypt to sel_f when sending encrypted mail"
 msgstr "Also encrypt to sel_f when sending encrypted mail"
 
-#: mail/mail-config.glade.h:39
+#: ../mail/mail-config.glade.h:39
 msgid "Alway_s carbon-copy (cc) to:"
 msgstr "Alway_s carbon-copy (cc) to:"
 
-#: mail/mail-config.glade.h:40
+#: ../mail/mail-config.glade.h:40
 msgid "Always _blind carbon-copy (bcc) to:"
 msgstr "Always _blind carbon-copy (bcc) to:"
 
-#: mail/mail-config.glade.h:41
+#: ../mail/mail-config.glade.h:41
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr "Always _trust keys in my keyring when encrypting"
 
-#: mail/mail-config.glade.h:42
+#: ../mail/mail-config.glade.h:42
 msgid "Always encrypt to _myself when sending encrypted mail"
 msgstr "Always encrypt to _myself when sending encrypted mail"
 
-#: mail/mail-config.glade.h:43
+#: ../mail/mail-config.glade.h:43
 msgid "Attach original message"
 msgstr "Attach original message"
 
-#: mail/mail-config.glade.h:44 mail/message-list.etspec.h:1
+#: ../mail/mail-config.glade.h:44 ../mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "Attachment"
 
-#: mail/mail-config.glade.h:45
+#: ../mail/mail-config.glade.h:45
 msgid "Automatically _insert smiley images"
 msgstr "Automatically _insert smiley images"
 
-#: mail/mail-config.glade.h:46
+#: ../mail/mail-config.glade.h:46
 msgid "Baltic (ISO-8859-13)"
 msgstr "Baltic (ISO-8859-13)"
 
-#: mail/mail-config.glade.h:47
+#: ../mail/mail-config.glade.h:47
 msgid "Baltic (ISO-8859-4)"
 msgstr "Baltic (ISO-8859-4)"
 
-#: mail/mail-config.glade.h:48
+#: ../mail/mail-config.glade.h:48
 msgid "Beep w_hen new mail arrives"
 msgstr "Beep w_hen new mail arrives"
 
-#: mail/mail-config.glade.h:49
+#: ../mail/mail-config.glade.h:49
 msgid "C_haracter set:"
 msgstr "C_haracter set:"
 
-#: mail/mail-config.glade.h:50
+#: ../mail/mail-config.glade.h:50
 msgid "Ch_eck for Supported Types "
 msgstr "Ch_eck for Supported Types "
 
-#: mail/mail-config.glade.h:51
+#: ../mail/mail-config.glade.h:51
 msgid "Check _incoming mail for junk"
 msgstr "Check _incoming mail for junk"
 
-#: mail/mail-config.glade.h:52
+#: ../mail/mail-config.glade.h:52
 msgid "Check spelling while I _type"
 msgstr "Check spelling while I _type"
 
-#: mail/mail-config.glade.h:53
+#: ../mail/mail-config.glade.h:53
 msgid "Checks incoming mail messages to be Junk"
 msgstr "Checks incoming mail messages to be Junk"
 
-#: mail/mail-config.glade.h:54
+#: ../mail/mail-config.glade.h:54
 msgid "Cle_ar"
 msgstr "Cle_ar"
 
-#: mail/mail-config.glade.h:55
+#: ../mail/mail-config.glade.h:55
 msgid "Clea_r"
 msgstr "Clea_r"
 
-#: mail/mail-config.glade.h:56
+#: ../mail/mail-config.glade.h:56
 msgid "Color for _misspelled words:"
 msgstr "Colour for _misspelled words:"
 
-#: mail/mail-config.glade.h:57
+#: ../mail/mail-config.glade.h:57
 msgid "Colors"
 msgstr "Colours"
 
-#: mail/mail-config.glade.h:58
+#: ../mail/mail-config.glade.h:58
 msgid "Confirm _when expunging a folder"
 msgstr "Confirm _when expunging a folder"
 
-#: mail/mail-config.glade.h:59
+#: ../mail/mail-config.glade.h:59
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -12373,107 +12476,99 @@ msgstr ""
 "\n"
 "Click \"Apply\" to save your settings."
 
-#: mail/mail-config.glade.h:65
+#: ../mail/mail-config.glade.h:65
 msgid "De_fault"
 msgstr "De_fault"
 
-#: mail/mail-config.glade.h:66
+#: ../mail/mail-config.glade.h:66
 msgid "Default character e_ncoding:"
 msgstr "Default character e_ncoding:"
 
-#: mail/mail-config.glade.h:67
-msgid "Defaults"
-msgstr "Defaults"
-
-#: mail/mail-config.glade.h:69
+#: ../mail/mail-config.glade.h:69
 msgid "Digitally _sign outgoing messages (by default)"
 msgstr "Digitally _sign outgoing messages (by default)"
 
-#: mail/mail-config.glade.h:70
+#: ../mail/mail-config.glade.h:70
 msgid "Do not quote original message"
 msgstr "Do not quote original message"
 
-#: mail/mail-config.glade.h:71 shell/evolution-startup-wizard.glade.h:1
+#: ../mail/mail-config.glade.h:71 ../shell/evolution-startup-wizard.glade.h:1
 msgid "Done"
 msgstr "Done"
 
-#: mail/mail-config.glade.h:72
+#: ../mail/mail-config.glade.h:72
 msgid "Drafts _Folder:"
 msgstr "Drafts _Folder:"
 
-#: mail/mail-config.glade.h:74
+#: ../mail/mail-config.glade.h:74
 msgid "Email Accounts"
 msgstr "Email Accounts"
 
-#: mail/mail-config.glade.h:75
+#: ../mail/mail-config.glade.h:75
 msgid "Email _Address:"
 msgstr "Email _Address:"
 
-#: mail/mail-config.glade.h:76
+#: ../mail/mail-config.glade.h:76
 msgid "Empty trash folders on e_xit"
 msgstr "Empty trash folders on e_xit"
 
-#: mail/mail-config.glade.h:77
+#: ../mail/mail-config.glade.h:77
 msgid "Encry_ption certificate:"
 msgstr "Encry_ption certificate:"
 
-#: mail/mail-config.glade.h:78
+#: ../mail/mail-config.glade.h:78
 msgid "Encrypt out_going messages (by default)"
 msgstr "Encrypt out_going messages (by default)"
 
-#: mail/mail-config.glade.h:80
+#: ../mail/mail-config.glade.h:80
 msgid "Execute Command..."
 msgstr "Execute Command..."
 
-#: mail/mail-config.glade.h:81
+#: ../mail/mail-config.glade.h:81
 msgid "Fi_xed-width:"
 msgstr "Fi_xed-width:"
 
-#: mail/mail-config.glade.h:82
+#: ../mail/mail-config.glade.h:82
 msgid "Font Properties"
 msgstr "Font Properties"
 
-#: mail/mail-config.glade.h:83
+#: ../mail/mail-config.glade.h:83
 msgid "Format messages in _HTML"
 msgstr "Format messages in _HTML"
 
-#: mail/mail-config.glade.h:85
+#: ../mail/mail-config.glade.h:85
 msgid "HTML Mail"
 msgstr "HTML Mail"
 
-#: mail/mail-config.glade.h:86
+#: ../mail/mail-config.glade.h:86
 msgid "Headers"
 msgstr "Headers"
 
-#: mail/mail-config.glade.h:87
+#: ../mail/mail-config.glade.h:87
 msgid "Highlight _quotations with"
 msgstr "Highlight _quotations with"
 
-#: mail/mail-config.glade.h:88
+#: ../mail/mail-config.glade.h:88
 msgid "I_nclude remote tests"
 msgstr "I_nclude remote tests"
 
-#: mail/mail-config.glade.h:89
-msgid "Identity"
-msgstr "Identity"
-
-#: mail/mail-config.glade.h:91
+#: ../mail/mail-config.glade.h:91
 msgid "Inline"
 msgstr "Inline"
 
-#: mail/mail-config.glade.h:94
+#: ../mail/mail-config.glade.h:94
 msgid "Mail Configuration"
 msgstr "Mail Configuration"
 
-#: mail/mail-config.glade.h:96
+#: ../mail/mail-config.glade.h:96
 msgid "Mailbox location"
 msgstr "Mailbox location"
 
-#: mail/mail-config.glade.h:97
+#: ../mail/mail-config.glade.h:97
 msgid "Message Composer"
 msgstr "Message Composer"
 
-#: mail/mail-config.glade.h:98
+#: ../mail/mail-config.glade.h:98
 msgid ""
 "Note: you will not be prompted for a password until you connect for the "
 "first time"
@@ -12481,19 +12576,19 @@ msgstr ""
 "Note: you will not be prompted for a password until you connect for the "
 "first time"
 
-#: mail/mail-config.glade.h:99
+#: ../mail/mail-config.glade.h:99
 msgid "Or_ganization:"
 msgstr "Or_ganization:"
 
-#: mail/mail-config.glade.h:100
+#: ../mail/mail-config.glade.h:100
 msgid "PGP/GPG _Key ID:"
 msgstr "PGP/GPG _Key ID:"
 
-#: mail/mail-config.glade.h:103
+#: ../mail/mail-config.glade.h:103
 msgid "Play sound file when new mail arri_ves"
 msgstr "Play sound file when new mail arri_ves"
 
-#: mail/mail-config.glade.h:104
+#: ../mail/mail-config.glade.h:104
 msgid ""
 "Please enter a descriptive name for this account in the space below.\n"
 "This name will be used for display purposes only."
@@ -12501,7 +12596,7 @@ msgstr ""
 "Please enter a descriptive name for this account in the space below.\n"
 "This name will be used for display purposes only."
 
-#: mail/mail-config.glade.h:106
+#: ../mail/mail-config.glade.h:106
 msgid ""
 "Please enter information about the way you will send mail. If you are not "
 "sure, ask your system administrator or Internet Service Provider."
@@ -12509,7 +12604,7 @@ msgstr ""
 "Please enter information about the way you will send mail. If you are not "
 "sure, ask your system administrator or Internet Service Provider."
 
-#: mail/mail-config.glade.h:107
+#: ../mail/mail-config.glade.h:107
 msgid ""
 "Please enter your name and email address below. The \"optional\" fields "
 "below do not need to be filled in, unless you wish to include this "
@@ -12519,119 +12614,107 @@ msgstr ""
 "below do not need to be filled in, unless you wish to include this "
 "information in email you send."
 
-#: mail/mail-config.glade.h:108
+#: ../mail/mail-config.glade.h:108
 msgid "Please select among the following options"
 msgstr "Please select among the following options"
 
-#: mail/mail-config.glade.h:109
+#: ../mail/mail-config.glade.h:109
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr "Pr_ompt when sending messages with only Bcc recipients defined"
 
-#: mail/mail-config.glade.h:110
+#: ../mail/mail-config.glade.h:110
 msgid "Quote original message"
 msgstr "Quote original message"
 
-#: mail/mail-config.glade.h:111
+#: ../mail/mail-config.glade.h:111
 msgid "Quoted"
 msgstr "Quoted"
 
-#: mail/mail-config.glade.h:112
+#: ../mail/mail-config.glade.h:112
 msgid "Re_member password"
 msgstr "Re_member password"
 
-#: mail/mail-config.glade.h:113
+#: ../mail/mail-config.glade.h:113
 msgid "Re_ply-To:"
 msgstr "Re_ply-To:"
 
-#: mail/mail-config.glade.h:114
-msgid "Receiving Email"
-msgstr "Receiving Email"
-
-#: mail/mail-config.glade.h:115
+#: ../mail/mail-config.glade.h:115
 msgid "Remember _password"
 msgstr "Remember _password"
 
-#: mail/mail-config.glade.h:116
+#: ../mail/mail-config.glade.h:116
 msgid "S_elect..."
 msgstr "S_elect..."
 
-#: mail/mail-config.glade.h:117
+#: ../mail/mail-config.glade.h:117
 msgid "S_tandard Font:"
 msgstr "S_tandard Font:"
 
-#: mail/mail-config.glade.h:118
+#: ../mail/mail-config.glade.h:118
 msgid "Se_lect..."
 msgstr "Se_lect..."
 
-#: mail/mail-config.glade.h:119
-msgid "Security"
-msgstr "Security"
-
-#: mail/mail-config.glade.h:120
+#: ../mail/mail-config.glade.h:120
 msgid "Select HTML fixed width font"
 msgstr "Select HTML fixed width font"
 
-#: mail/mail-config.glade.h:121
+#: ../mail/mail-config.glade.h:121
 msgid "Select HTML fixed width font for printing"
 msgstr "Select HTML fixed width font for printing"
 
-#: mail/mail-config.glade.h:122
+#: ../mail/mail-config.glade.h:122
 msgid "Select HTML variable width font"
 msgstr "Select HTML variable width font"
 
-#: mail/mail-config.glade.h:123
+#: ../mail/mail-config.glade.h:123
 msgid "Select HTML variable width font for printing"
 msgstr "Select HTML variable width font for printing"
 
-#: mail/mail-config.glade.h:124
-msgid "Sending Email"
-msgstr "Sending Email"
-
-#: mail/mail-config.glade.h:125
+#: ../mail/mail-config.glade.h:125
 msgid "Sending Mail"
 msgstr "Sending Mail"
 
-#: mail/mail-config.glade.h:126
+#: ../mail/mail-config.glade.h:126
 msgid "Sent _Messages Folder:"
 msgstr "Sent _Messages Folder:"
 
-#: mail/mail-config.glade.h:127
+#: ../mail/mail-config.glade.h:127
 msgid "Ser_ver requires authentication"
 msgstr "Ser_ver requires authentication"
 
-#: mail/mail-config.glade.h:128
+#: ../mail/mail-config.glade.h:128
 msgid "Server _Type: "
 msgstr "Server _Type: "
 
-#: mail/mail-config.glade.h:129
+#: ../mail/mail-config.glade.h:129
 msgid "Sig_ning certificate:"
 msgstr "Sig_ning certificate:"
 
-#: mail/mail-config.glade.h:130
+#: ../mail/mail-config.glade.h:130
 msgid "Signat_ure:"
 msgstr "Signat_ure:"
 
-#: mail/mail-config.glade.h:131
+#: ../mail/mail-config.glade.h:131
 msgid "Signatures"
 msgstr "Signatures"
 
-#: mail/mail-config.glade.h:132
+#: ../mail/mail-config.glade.h:132
 msgid "Specify _filename:"
 msgstr "Specify _filename:"
 
-#: mail/mail-config.glade.h:133
+#: ../mail/mail-config.glade.h:133
 msgid "Spell Checking"
 msgstr "Spell Checking"
 
-#: mail/mail-config.glade.h:134
+#: ../mail/mail-config.glade.h:134
 msgid "T_erminal Font:"
 msgstr "T_erminal Font:"
 
-#: mail/mail-config.glade.h:135
+#: ../mail/mail-config.glade.h:135
 msgid "T_ype: "
 msgstr "T_ype: "
 
-#: mail/mail-config.glade.h:136
+#: ../mail/mail-config.glade.h:136
 msgid ""
 "The list of languages here reflects only the languages for which you have a "
 "dictionary installed."
@@ -12639,7 +12722,7 @@ msgstr ""
 "The list of languages here reflects only the languages for which you have a "
 "dictionary installed."
 
-#: mail/mail-config.glade.h:137
+#: ../mail/mail-config.glade.h:137
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
@@ -12649,7 +12732,7 @@ msgstr ""
 "signature. The name you specify will be used\n"
 "for display purposes only. "
 
-#: mail/mail-config.glade.h:141
+#: ../mail/mail-config.glade.h:141
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
@@ -12657,15 +12740,15 @@ msgstr ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
 
-#: mail/mail-config.glade.h:143
+#: ../mail/mail-config.glade.h:143
 msgid "User_name:"
 msgstr "User_name:"
 
-#: mail/mail-config.glade.h:144
+#: ../mail/mail-config.glade.h:144
 msgid "V_ariable-width:"
 msgstr "V_ariable-width:"
 
-#: mail/mail-config.glade.h:145
+#: ../mail/mail-config.glade.h:145
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -12675,154 +12758,144 @@ msgstr ""
 "\n"
 "Click \"Forward\" to begin. "
 
-#: mail/mail-config.glade.h:149
+#: ../mail/mail-config.glade.h:149
 msgid "_Add Signature"
 msgstr "_Add Signature"
 
-#: mail/mail-config.glade.h:150
+#: ../mail/mail-config.glade.h:150
 msgid "_Always load images from the Internet"
 msgstr "_Always load images from the Internet"
 
-#: mail/mail-config.glade.h:151
+#: ../mail/mail-config.glade.h:151
 msgid "_Do not notify me when new mail arrives"
 msgstr "_Do not notify me when new mail arrives"
 
-#: mail/mail-config.glade.h:152
+#: ../mail/mail-config.glade.h:152
 msgid "_Don't sign meeting requests (for Outlook compatibility)"
 msgstr "_Don't sign meeting requests (for Outlook compatibility)"
 
-#: mail/mail-config.glade.h:154
+#: ../mail/mail-config.glade.h:154
 msgid "_Forward style:"
 msgstr "_Forward style:"
 
-#: mail/mail-config.glade.h:155
+#: ../mail/mail-config.glade.h:155
 msgid "_Full Name:"
 msgstr "_Full Name:"
 
-#: mail/mail-config.glade.h:156
+#: ../mail/mail-config.glade.h:156
 msgid "_Host:"
 msgstr "_Host:"
 
-#: mail/mail-config.glade.h:157
+#: ../mail/mail-config.glade.h:157
 msgid "_Load images if sender is in address book"
 msgstr "_Load images if sender is in address book"
 
-#: mail/mail-config.glade.h:158
+#: ../mail/mail-config.glade.h:158
 msgid "_Make this my default account"
 msgstr "_Make this my default account"
 
-#: mail/mail-config.glade.h:159
+#: ../mail/mail-config.glade.h:159
 msgid "_Mark messages as read after"
 msgstr "_Mark messages as read after"
 
-#: mail/mail-config.glade.h:161
+#: ../mail/mail-config.glade.h:161
 msgid "_Never load images from the Internet"
 msgstr "_Never load images from the Internet"
 
-#: mail/mail-config.glade.h:162
+#: ../mail/mail-config.glade.h:162
 msgid "_Path:"
 msgstr "_Path:"
 
-#: mail/mail-config.glade.h:163
+#: ../mail/mail-config.glade.h:163
 msgid "_Prompt when sending HTML messages to contacts that don't want them"
 msgstr "_Prompt when sending HTML messages to contacts that don't want them"
 
-#: mail/mail-config.glade.h:164
+#: ../mail/mail-config.glade.h:164
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "_Prompt when sending messages with an empty subject line"
 
-#: mail/mail-config.glade.h:165
+#: ../mail/mail-config.glade.h:165
 msgid "_Reply style:"
 msgstr "_Reply style:"
 
-#: mail/mail-config.glade.h:166
+#: ../mail/mail-config.glade.h:166
 msgid "_Script:"
 msgstr "_Script:"
 
-#: mail/mail-config.glade.h:167
+#: ../mail/mail-config.glade.h:167
 msgid "_Show animated images"
 msgstr "_Show animated images"
 
-#: mail/mail-config.glade.h:168
+#: ../mail/mail-config.glade.h:168
 msgid "_Use Secure Connection:"
 msgstr "_Use Secure Connection:"
 
-#: mail/mail-config.glade.h:169
+#: ../mail/mail-config.glade.h:169
 msgid "_Use the same fonts as other applications"
 msgstr "_Use the same fonts as other applications"
 
-#: mail/mail-config.glade.h:170
+#: ../mail/mail-config.glade.h:170
 msgid "color"
 msgstr "colour"
 
-#: mail/mail-config.glade.h:171
+#: ../mail/mail-config.glade.h:171
 msgid "description"
 msgstr "description"
 
-#: mail/mail-dialogs.glade.h:1
-msgid ""
-"\n"
-" Please read carefully the license agreement displayed\n"
-" below and tick the check box for accepting it\n"
-msgstr ""
-"\n"
-" Please read carefully the licence agreement displayed\n"
-" below and tick the check box for accepting it\n"
-
-#: mail/mail-dialogs.glade.h:7
+#: ../mail/mail-dialogs.glade.h:3
 msgid "<b>vFolder Sources</b>"
 msgstr "<b>vFolder Sources</b>"
 
-#: mail/mail-dialogs.glade.h:8
+#: ../mail/mail-dialogs.glade.h:4
 msgid "<span weight=\"bold\">Digital Signature</span>"
 msgstr "<span weight=\"bold\">Digital Signature</span>"
 
-#: mail/mail-dialogs.glade.h:9
+#: ../mail/mail-dialogs.glade.h:5
 msgid "<span weight=\"bold\">Encryption</span>"
 msgstr "<span weight=\"bold\">Encryption</span>"
 
-#: mail/mail-dialogs.glade.h:10
+#: ../mail/mail-dialogs.glade.h:6
 msgid "Case _Sensitive"
 msgstr "Case _Sensitive"
 
-#: mail/mail-dialogs.glade.h:11 mail/message-tags.glade.h:2
+#: ../mail/mail-dialogs.glade.h:7 ../mail/message-tags.glade.h:2
 msgid "Co_mpleted"
 msgstr "Co_mpleted"
 
-#: mail/mail-dialogs.glade.h:13
+#: ../mail/mail-dialogs.glade.h:9
 msgid "F_ind:"
 msgstr "F_ind:"
 
-#: mail/mail-dialogs.glade.h:14
+#: ../mail/mail-dialogs.glade.h:10
 msgid "Find in Message"
 msgstr "Find in Message"
 
-#: mail/mail-dialogs.glade.h:15 mail/message-tag-followup.c:295
-#: mail/message-tags.glade.h:3
+#: ../mail/mail-dialogs.glade.h:11 ../mail/message-tag-followup.c:295
+#: ../mail/message-tags.glade.h:3
 msgid "Flag to Follow Up"
 msgstr "Flag to Follow Up"
 
-#: mail/mail-dialogs.glade.h:16
+#: ../mail/mail-dialogs.glade.h:12
 msgid "Folder Subscriptions"
 msgstr "Folder Subscriptions"
 
-#: mail/mail-dialogs.glade.h:17
+#: ../mail/mail-dialogs.glade.h:13
 msgid "License Agreement"
 msgstr "Licence Agreement"
 
-#: mail/mail-dialogs.glade.h:18
+#: ../mail/mail-dialogs.glade.h:14
 msgid "None Selected"
 msgstr "None Selected"
 
-#: mail/mail-dialogs.glade.h:19
+#: ../mail/mail-dialogs.glade.h:15
 msgid "S_erver:"
 msgstr "S_erver:"
 
-#: mail/mail-dialogs.glade.h:20
+#: ../mail/mail-dialogs.glade.h:16
 msgid "Security Information"
 msgstr "Security Information"
 
-#: mail/mail-dialogs.glade.h:22 mail/message-tags.glade.h:4
+#: ../mail/mail-dialogs.glade.h:18 ../mail/message-tags.glade.h:4
 msgid ""
 "The messages you have selected for follow up are listed below.\n"
 "Please select a follow up action from the \"Flag\" menu."
@@ -12830,53 +12903,53 @@ msgstr ""
 "The messages you have selected for follow up are listed below.\n"
 "Please select a follow up action from the \"Flag\" menu."
 
-#: mail/mail-dialogs.glade.h:24
+#: ../mail/mail-dialogs.glade.h:20
 msgid "_Accept License"
 msgstr "_Accept Licence"
 
-#: mail/mail-dialogs.glade.h:25 mail/message-tags.glade.h:6
+#: ../mail/mail-dialogs.glade.h:21 ../mail/message-tags.glade.h:6
 msgid "_Due By:"
 msgstr "_Due By:"
 
-#: mail/mail-dialogs.glade.h:26 mail/message-tags.glade.h:7
+#: ../mail/mail-dialogs.glade.h:22 ../mail/message-tags.glade.h:7
 msgid "_Flag:"
 msgstr "_Flag:"
 
-#: mail/mail-dialogs.glade.h:27
+#: ../mail/mail-dialogs.glade.h:23
 msgid "_Subscribe"
 msgstr "_Subscribe"
 
-#: mail/mail-dialogs.glade.h:28
+#: ../mail/mail-dialogs.glade.h:24
 msgid "_Tick this to accept the license agreement"
 msgstr "_Check this to accept the licence agreement"
 
-#: mail/mail-dialogs.glade.h:29
+#: ../mail/mail-dialogs.glade.h:25
 msgid "_Unsubscribe"
 msgstr "_Unsubscribe"
 
-#: mail/mail-dialogs.glade.h:30
+#: ../mail/mail-dialogs.glade.h:26
 msgid "specific folders only"
 msgstr "specific folders only"
 
-#: mail/mail-dialogs.glade.h:31
+#: ../mail/mail-dialogs.glade.h:27
 msgid "with all active remote folders"
 msgstr "with all active remote folders"
 
-#: mail/mail-dialogs.glade.h:32
+#: ../mail/mail-dialogs.glade.h:28
 msgid "with all local and active remote folders"
 msgstr "with all local and active remote folders"
 
-#: mail/mail-dialogs.glade.h:33
+#: ../mail/mail-dialogs.glade.h:29
 msgid "with all local folders"
 msgstr "with all local folders"
 
 #. mail:camel-service-auth-invalid primary
-#: mail/mail-errors.xml.h:2
+#: ../mail/mail-errors.xml.h:2
 msgid "Invalid authentication"
 msgstr "Invalid authentication"
 
 #. mail:camel-service-auth-invalid secondary
-#: mail/mail-errors.xml.h:4
+#: ../mail/mail-errors.xml.h:4
 msgid ""
 "This server does not support this type of authentication and may not support "
 "authentication at all."
@@ -12885,12 +12958,12 @@ msgstr ""
 "authentication at all."
 
 #. mail:camel-service-auth-failed primary
-#: mail/mail-errors.xml.h:6
+#: ../mail/mail-errors.xml.h:6
 msgid "Your login to your server \"{0}\" as \"{0}\" failed."
 msgstr "Your login to your server \"{0}\" as \"{0}\" failed."
 
 #. mail:camel-service-auth-failed secondary
-#: mail/mail-errors.xml.h:8
+#: ../mail/mail-errors.xml.h:8
 msgid ""
 "Check to make sure your password is spelled correctly.  Remember that many "
 "passwords are case sensitive; your caps lock might be on."
@@ -12899,12 +12972,12 @@ msgstr ""
 "passwords are case sensitive; your caps lock might be on."
 
 #. mail:ask-send-html primary
-#: mail/mail-errors.xml.h:10
+#: ../mail/mail-errors.xml.h:10
 msgid "Are you sure you want to send a message in HTML format?"
 msgstr "Are you sure you want to send a message in HTML format?"
 
 #. mail:ask-send-html secondary
-#: mail/mail-errors.xml.h:12
+#: ../mail/mail-errors.xml.h:12
 msgid ""
 "Please make sure the following recipients are willing and able to receive "
 "HTML email:\n"
@@ -12917,12 +12990,12 @@ msgstr ""
 "Send anyway?"
 
 #. mail:ask-send-no-subject primary
-#: mail/mail-errors.xml.h:17
+#: ../mail/mail-errors.xml.h:17
 msgid "Are you sure you want to send a message without a subject?"
 msgstr "Are you sure you want to send a message without a subject?"
 
 #. mail:ask-send-no-subject secondary
-#: mail/mail-errors.xml.h:19
+#: ../mail/mail-errors.xml.h:19
 msgid ""
 "Adding a meaningful Subject line to your messages will give your recipients "
 "an idea of what your mail is about."
@@ -12932,12 +13005,12 @@ msgstr ""
 
 #. mail:ask-send-only-bcc-contact primary
 #. mail:ask-send-only-bcc primary
-#: mail/mail-errors.xml.h:22 mail/mail-errors.xml.h:29
+#: ../mail/mail-errors.xml.h:22 ../mail/mail-errors.xml.h:29
 msgid "Are you sure you want to send a message with only BCC recipients?"
 msgstr "Are you sure you want to send a message with only BCC recipients?"
 
 #. mail:ask-send-only-bcc-contact secondary
-#: mail/mail-errors.xml.h:24
+#: ../mail/mail-errors.xml.h:24
 msgid ""
 "The contact list you are sending to is configured to hide list recipients.\n"
 "\n"
@@ -12954,7 +13027,7 @@ msgstr ""
 "recipient. "
 
 #. mail:ask-send-only-bcc secondary
-#: mail/mail-errors.xml.h:31
+#: ../mail/mail-errors.xml.h:31
 msgid ""
 "Many email systems add an Apparently-To header to messages that only have "
 "BCC recipients. This header, if added, will list all of your recipients to "
@@ -12967,14 +13040,14 @@ msgstr ""
 "recipient."
 
 #. mail:send-no-recipients primary
-#: mail/mail-errors.xml.h:34
+#: ../mail/mail-errors.xml.h:34
 msgid ""
 "This message cannot be sent because you have not specified any Recipients"
 msgstr ""
 "This message cannot be sent because you have not specified any Recipients"
 
 #. mail:send-no-recipients secondary
-#: mail/mail-errors.xml.h:36
+#: ../mail/mail-errors.xml.h:36
 msgid ""
 "Please enter a valid email address in the To: field. You can search for "
 "email addresses by clicking on the To: button next to the entry box."
@@ -12983,12 +13056,12 @@ msgstr ""
 "email addresses by clicking on the To: button next to the entry box."
 
 #. mail:ask-default-drafts primary
-#: mail/mail-errors.xml.h:38
+#: ../mail/mail-errors.xml.h:38
 msgid "Use default drafts folder?"
 msgstr "Use default drafts folder?"
 
 #. mail:ask-default-drafts secondary
-#: mail/mail-errors.xml.h:40
+#: ../mail/mail-errors.xml.h:40
 msgid ""
 "Unable to open the drafts folder for this account.  Use the system drafts "
 "folder instead?"
@@ -12996,12 +13069,12 @@ msgstr ""
 "Unable to open the drafts folder for this account.  Use the system drafts "
 "folder instead?"
 
-#: mail/mail-errors.xml.h:41
+#: ../mail/mail-errors.xml.h:41
 msgid "Use _Default"
 msgstr "Use _Default"
 
 #. mail:ask-expunge primary
-#: mail/mail-errors.xml.h:43
+#: ../mail/mail-errors.xml.h:43
 msgid ""
 "Are you sure you want to permanently remove all the deleted message in "
 "folder \"{0}\"?"
@@ -13011,16 +13084,16 @@ msgstr ""
 
 #. mail:ask-expunge secondary
 #. mail:ask-empty-trash secondary
-#: mail/mail-errors.xml.h:45 mail/mail-errors.xml.h:50
+#: ../mail/mail-errors.xml.h:45 ../mail/mail-errors.xml.h:50
 msgid "If you continue, you will not be able to recover these messages."
 msgstr "If you continue, you will not be able to recover these messages."
 
-#: mail/mail-errors.xml.h:46
+#: ../mail/mail-errors.xml.h:46
 msgid "_Expunge"
 msgstr "_Expunge"
 
 #. mail:ask-empty-trash primary
-#: mail/mail-errors.xml.h:48
+#: ../mail/mail-errors.xml.h:48
 msgid ""
 "Are you sure you want to permanently remove all the deleted messages in all "
 "folders?"
@@ -13028,31 +13101,31 @@ msgstr ""
 "Are you sure you want to permanently remove all the deleted messages in all "
 "folders?"
 
-#: mail/mail-errors.xml.h:51
+#: ../mail/mail-errors.xml.h:51
 msgid "_Empty Trash"
 msgstr "_Empty Trash"
 
 #. mail:ask-open-many primary
-#: mail/mail-errors.xml.h:53
+#: ../mail/mail-errors.xml.h:53
 msgid "Are you sure you want to open {0} messages at once?"
 msgstr "Are you sure you want to open {0} messages at once?"
 
 #. mail:ask-open-many secondary
-#: mail/mail-errors.xml.h:55
+#: ../mail/mail-errors.xml.h:55
 msgid "Opening too many messages at once may take a long time."
 msgstr "Opening too many messages at once may take a long time."
 
-#: mail/mail-errors.xml.h:56
+#: ../mail/mail-errors.xml.h:56
 msgid "_Open Messages"
 msgstr "_Open Messages"
 
 #. mail:exit-unsaved primary
-#: mail/mail-errors.xml.h:58
+#: ../mail/mail-errors.xml.h:58
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr "You have unsent messages, do you wish to quit anyway?"
 
 #. mail:exit-unsaved secondary
-#: mail/mail-errors.xml.h:60
+#: ../mail/mail-errors.xml.h:60
 msgid ""
 "If you quit, these messages will not be sent until Evolution is started "
 "again."
@@ -13061,12 +13134,12 @@ msgstr ""
 "again."
 
 #. mail:camel-exception primary
-#: mail/mail-errors.xml.h:62
+#: ../mail/mail-errors.xml.h:62
 msgid "Your message with the subject \"{0}\" was not delivered."
 msgstr "Your message with the subject \"{0}\" was not delivered."
 
 #. mail:camel-exception secondary
-#: mail/mail-errors.xml.h:64
+#: ../mail/mail-errors.xml.h:64
 msgid ""
 "The message was sent via the \"sendmail\" external application.  Sendmail "
 "reports the following error: status 67: mail not sent.\n"
@@ -13079,81 +13152,81 @@ msgstr ""
 "and resend."
 
 #. mail:async-error primary
-#: mail/mail-errors.xml.h:67
+#: ../mail/mail-errors.xml.h:67
 msgid "Error while {0}."
 msgstr "Error while {0}."
 
 #. mail:async-error secondary
-#: mail/mail-errors.xml.h:69
+#: ../mail/mail-errors.xml.h:69
 msgid "{1}."
 msgstr "{1}."
 
 #. mail:async-error-nodescribe primary
-#: mail/mail-errors.xml.h:71
+#: ../mail/mail-errors.xml.h:71
 msgid "Error while performing operation."
 msgstr "Error while performing operation."
 
 #. mail:async-error-nodescribe secondary
-#: mail/mail-errors.xml.h:73
+#: ../mail/mail-errors.xml.h:73
 msgid "{0}."
 msgstr "{0}."
 
 #. mail:ask-session-password primary
-#: mail/mail-errors.xml.h:87
+#: ../mail/mail-errors.xml.h:87
 msgid "Enter password."
 msgstr "Enter password."
 
 #. mail:filter-load-error primary
-#: mail/mail-errors.xml.h:91
+#: ../mail/mail-errors.xml.h:91
 msgid "Error loading filter definitions."
 msgstr "Error loading filter definitions."
 
 #. mail:no-save-path primary
-#: mail/mail-errors.xml.h:95
+#: ../mail/mail-errors.xml.h:95
 msgid "Cannot save to directory \"{0}\"."
 msgstr "Cannot save to directory \"{0}\"."
 
 #. mail:no-create-path primary
 #. mail:no-write-path-exists primary
 #. mail:no-write-path-notfile primary
-#: mail/mail-errors.xml.h:99 mail/mail-errors.xml.h:107
-#: mail/mail-errors.xml.h:111
+#: ../mail/mail-errors.xml.h:99 ../mail/mail-errors.xml.h:107
+#: ../mail/mail-errors.xml.h:111
 msgid "Cannot save to file \"{0}\"."
 msgstr "Cannot save to file \"{0}\"."
 
 #. mail:no-create-path secondary
-#: mail/mail-errors.xml.h:101
+#: ../mail/mail-errors.xml.h:101
 msgid "Cannot create the save directory, because \"{1}\""
 msgstr "Cannot create the save directory, because \"{1}\""
 
 #. mail:no-create-tmp-path primary
-#: mail/mail-errors.xml.h:103
+#: ../mail/mail-errors.xml.h:103
 msgid "Cannot create temporary save directory."
 msgstr "Cannot create temporary save directory."
 
 #. mail:no-write-path-exists secondary
-#: mail/mail-errors.xml.h:109
+#: ../mail/mail-errors.xml.h:109
 msgid "File exists but cannot overwrite it."
 msgstr "File exists but cannot be overwritten."
 
 #. mail:no-write-path-notfile secondary
-#: mail/mail-errors.xml.h:113
+#: ../mail/mail-errors.xml.h:113
 msgid "File exists but is not a regular file."
 msgstr "File exists but is not a regular file."
 
 #. mail:no-delete-folder primary
-#: mail/mail-errors.xml.h:115
+#: ../mail/mail-errors.xml.h:115
 msgid "Cannot delete folder \"{0}\"."
 msgstr "Cannot delete folder \"{0}\"."
 
 #. mail:no-delete-special-folder primary
-#: mail/mail-errors.xml.h:119
+#: ../mail/mail-errors.xml.h:119
 msgid "Cannot delete system folder \"{0}\"."
 msgstr "Cannot delete system folder \"{0}\"."
 
 #. mail:no-delete-special-folder secondary
 #. mail:no-rename-special-folder secondary
-#: mail/mail-errors.xml.h:121 mail/mail-errors.xml.h:125
+#: ../mail/mail-errors.xml.h:121 ../mail/mail-errors.xml.h:125
 msgid ""
 "System folders are required for Ximian Evolution to function correctly and "
 "cannot be renamed, moved, or deleted."
@@ -13162,22 +13235,22 @@ msgstr ""
 "cannot be renamed, moved, or deleted."
 
 #. mail:no-rename-special-folder primary
-#: mail/mail-errors.xml.h:123
+#: ../mail/mail-errors.xml.h:123
 msgid "Cannot rename or move system folder \"{0}\"."
 msgstr "Cannot rename or move system folder \"{0}\"."
 
 #. mail:ask-delete-folder title
-#: mail/mail-errors.xml.h:127
+#: ../mail/mail-errors.xml.h:127
 msgid "Delete \"{0}\"?"
 msgstr "Delete \"{0}\"?"
 
 #. mail:ask-delete-folder primary
-#: mail/mail-errors.xml.h:129
+#: ../mail/mail-errors.xml.h:129
 msgid "Really delete folder \"{0}\" and all of its subfolders?"
 msgstr "Really delete folder \"{0}\" and all of its subfolders?"
 
 #. mail:ask-delete-folder secondary
-#: mail/mail-errors.xml.h:131
+#: ../mail/mail-errors.xml.h:131
 msgid ""
 "If you delete the folder, all of its contents and its subfolders contents "
 "will be deleted permanently."
@@ -13187,136 +13260,136 @@ msgstr ""
 
 #. mail:no-rename-folder-exists primary
 #. mail:no-rename-folder primary
-#: mail/mail-errors.xml.h:133 mail/mail-errors.xml.h:137
+#: ../mail/mail-errors.xml.h:133 ../mail/mail-errors.xml.h:137
 msgid "Cannot rename \"{0}\" to \"{1}\"."
 msgstr "Cannot rename \"{0}\" to \"{1}\"."
 
 #. mail:no-rename-folder-exists secondary
 #. mail:vfolder-notunique secondary
-#: mail/mail-errors.xml.h:135 mail/mail-errors.xml.h:197
+#: ../mail/mail-errors.xml.h:135 ../mail/mail-errors.xml.h:197
 msgid "A folder named \"{1}\" already exists. Please use a different name."
 msgstr "A folder named \"{1}\" already exists. Please use a different name."
 
 #. mail:no-rename-folder secondary
-#: mail/mail-errors.xml.h:139
+#: ../mail/mail-errors.xml.h:139
 msgid "Because \"{2}\"."
 msgstr "Because \"{2}\"."
 
 #. mail:no-move-folder-nostore primary
 #. mail:no-move-folder-to-nostore primary
-#: mail/mail-errors.xml.h:141 mail/mail-errors.xml.h:145
+#: ../mail/mail-errors.xml.h:141 ../mail/mail-errors.xml.h:145
 msgid "Cannot move folder \"{0}\" to \"{1}\"."
 msgstr "Cannot move folder \"{0}\" to \"{1}\"."
 
 #. mail:no-move-folder-nostore secondary
 #. mail:no-copy-folder-nostore secondary
-#: mail/mail-errors.xml.h:143 mail/mail-errors.xml.h:151
+#: ../mail/mail-errors.xml.h:143 ../mail/mail-errors.xml.h:151
 msgid "Cannot open source \"{2}\"."
 msgstr "Cannot open source \"{2}\"."
 
 #. mail:no-move-folder-to-nostore secondary
 #. mail:no-copy-folder-to-nostore secondary
-#: mail/mail-errors.xml.h:147 mail/mail-errors.xml.h:155
+#: ../mail/mail-errors.xml.h:147 ../mail/mail-errors.xml.h:155
 msgid "Cannot open target \"{2}\"."
 msgstr "Cannot open target \"{2}\"."
 
 #. mail:no-copy-folder-nostore primary
 #. mail:no-copy-folder-to-nostore primary
-#: mail/mail-errors.xml.h:149 mail/mail-errors.xml.h:153
+#: ../mail/mail-errors.xml.h:149 ../mail/mail-errors.xml.h:153
 msgid "Cannot copy folder \"{0}\" to \"{1}\"."
 msgstr "Cannot copy folder \"{0}\" to \"{1}\"."
 
 #. mail:no-create-folder-nostore primary
-#: mail/mail-errors.xml.h:157
+#: ../mail/mail-errors.xml.h:157
 msgid "Cannot create folder \"{0}\"."
 msgstr "Cannot create folder \"{0}\"."
 
 #. mail:no-create-folder-nostore secondary
-#: mail/mail-errors.xml.h:159
+#: ../mail/mail-errors.xml.h:159
 msgid "Cannot open source \"{1}\""
 msgstr "Cannot open source \"{1}\""
 
 #. mail:account-incomplete primary
 #. mail:account-notunique primary
-#: mail/mail-errors.xml.h:161 mail/mail-errors.xml.h:165
+#: ../mail/mail-errors.xml.h:161 ../mail/mail-errors.xml.h:165
 msgid "Cannot save changes to account."
 msgstr "Cannot save changes to account."
 
 #. mail:account-incomplete secondary
-#: mail/mail-errors.xml.h:163
+#: ../mail/mail-errors.xml.h:163
 msgid "You have not filled in all of the required information."
 msgstr "You have not filled in all of the required information."
 
 #. mail:account-notunique secondary
-#: mail/mail-errors.xml.h:167
+#: ../mail/mail-errors.xml.h:167
 msgid "You may not create two accounts with the same name."
 msgstr "You may not create two accounts with the same name."
 
 #. mail:ask-delete-account title
-#: mail/mail-errors.xml.h:169
+#: ../mail/mail-errors.xml.h:169
 msgid "Delete account?"
 msgstr "Delete account?"
 
 #. mail:ask-delete-account primary
-#: mail/mail-errors.xml.h:171
+#: ../mail/mail-errors.xml.h:171
 msgid "Are you sure you want to delete this account?"
 msgstr "Are you sure you want to delete this account?"
 
 #. mail:ask-delete-account secondary
-#: mail/mail-errors.xml.h:173
+#: ../mail/mail-errors.xml.h:173
 msgid "If you proceed, the account information will be deleted permanently."
 msgstr "If you proceed, the account information will be deleted permanently."
 
-#: mail/mail-errors.xml.h:174
+#: ../mail/mail-errors.xml.h:174
 msgid "Don't delete"
 msgstr "Don't delete"
 
 #. mail:no-save-signature primary
-#: mail/mail-errors.xml.h:176
+#: ../mail/mail-errors.xml.h:176
 msgid "Could not save signature file."
 msgstr "Could not save signature file."
 
 #. mail:no-save-signature secondary
-#: mail/mail-errors.xml.h:178
+#: ../mail/mail-errors.xml.h:178
 msgid "Because \"{0}\"."
 msgstr "Because \"{0}\"."
 
 #. mail:signature-notscript primary
-#: mail/mail-errors.xml.h:180
+#: ../mail/mail-errors.xml.h:180
 msgid "Cannot set signature script \"{0}\"."
 msgstr "Cannot set signature script \"{0}\"."
 
 #. mail:signature-notscript secondary
-#: mail/mail-errors.xml.h:182
+#: ../mail/mail-errors.xml.h:182
 msgid "The script file must exist and be executable."
 msgstr "The script file must exist and be executable."
 
 #. mail:ask-signature-changed title
-#: mail/mail-errors.xml.h:184
+#: ../mail/mail-errors.xml.h:184
 msgid "Discard changed?"
 msgstr "Discard changes?"
 
 #. mail:ask-signature-changed primary
-#: mail/mail-errors.xml.h:186
+#: ../mail/mail-errors.xml.h:186
 msgid "Do you wish to save your changes?"
 msgstr "Do you wish to save your changes?"
 
 #. mail:ask-signature-changed secondary
-#: mail/mail-errors.xml.h:188
+#: ../mail/mail-errors.xml.h:188
 msgid "This signature has been changed, but has not been saved."
 msgstr "This signature has been changed, but has not been saved."
 
-#: mail/mail-errors.xml.h:189
+#: ../mail/mail-errors.xml.h:189
 msgid "_Discard changes"
 msgstr "_Discard changes"
 
 #. mail:vfolder-notexist primary
-#: mail/mail-errors.xml.h:191
+#: ../mail/mail-errors.xml.h:191
 msgid "Cannot edit vFolder \"{0}\" as it does not exist."
 msgstr "Cannot edit vFolder \"{0}\" as it does not exist."
 
 #. mail:vfolder-notexist secondary
-#: mail/mail-errors.xml.h:193
+#: ../mail/mail-errors.xml.h:193
 msgid ""
 "This folder may have been added implicitly, go to the vFolder editor to add "
 "it explicitly, if required."
@@ -13325,17 +13398,17 @@ msgstr ""
 "it explicitly, if required."
 
 #. mail:vfolder-notunique primary
-#: mail/mail-errors.xml.h:195
+#: ../mail/mail-errors.xml.h:195
 msgid "Cannot add vFolder \"{0}\"."
 msgstr "Cannot add vFolder \"{0}\"."
 
 #. mail:vfolder-updated primary
-#: mail/mail-errors.xml.h:199
+#: ../mail/mail-errors.xml.h:199
 msgid "vFolders automatically updated."
 msgstr "vFolders automatically updated."
 
 #. mail:vfolder-updated secondary
-#: mail/mail-errors.xml.h:201
+#: ../mail/mail-errors.xml.h:201
 msgid ""
 "The following vFolder(s):\n"
 "{0}\n"
@@ -13350,12 +13423,12 @@ msgstr ""
 "And have been updated."
 
 #. mail:filter-updated primary
-#: mail/mail-errors.xml.h:207
+#: ../mail/mail-errors.xml.h:207
 msgid "Mail filters automatically updated."
 msgstr "Mail filters automatically updated."
 
 #. mail:filter-updated secondary
-#: mail/mail-errors.xml.h:209
+#: ../mail/mail-errors.xml.h:209
 msgid ""
 "The following filter rule(s):\n"
 "{0}\n"
@@ -13370,27 +13443,27 @@ msgstr ""
 "And have been updated."
 
 #. mail:no-folder primary
-#: mail/mail-errors.xml.h:215
+#: ../mail/mail-errors.xml.h:215
 msgid "Missing folder."
 msgstr "Missing folder."
 
 #. mail:no-folder secondary
-#: mail/mail-errors.xml.h:217
+#: ../mail/mail-errors.xml.h:217
 msgid "You must specify a folder."
 msgstr "You must specify a folder."
 
 #. mail:no-name-vfolder secondary
-#: mail/mail-errors.xml.h:221
+#: ../mail/mail-errors.xml.h:221
 msgid "You must name this vFolder."
 msgstr "You must name this vFolder."
 
 #. mail:vfolder-no-source primary
-#: mail/mail-errors.xml.h:223
+#: ../mail/mail-errors.xml.h:223
 msgid "No sources selected."
 msgstr "No sources selected."
 
 #. mail:vfolder-no-source secondary
-#: mail/mail-errors.xml.h:225
+#: ../mail/mail-errors.xml.h:225
 msgid ""
 "You must specify at least one folder as a source.\n"
 "Either by selecting the folders individually, and/or by selecting\n"
@@ -13402,12 +13475,12 @@ msgstr ""
 "local folders."
 
 #. mail:ask-migrate-existing primary
-#: mail/mail-errors.xml.h:229
+#: ../mail/mail-errors.xml.h:229
 msgid "Problem migrating old mail folder \"{0}\"."
 msgstr "Problem migrating old mail folder \"{0}\"."
 
 #. mail:ask-migrate-existing secondary
-#: mail/mail-errors.xml.h:231
+#: ../mail/mail-errors.xml.h:231
 msgid ""
 "A non-empty folder at \"{1}\" already exists.\n"
 "\n"
@@ -13419,25 +13492,25 @@ msgstr ""
 "You can choose to ignore this folder, overwrite or append its contents, or "
 "quit.\n"
 
-#: mail/mail-errors.xml.h:235
+#: ../mail/mail-errors.xml.h:235
 msgid "Ignore"
 msgstr "Ignore"
 
-#: mail/mail-errors.xml.h:236 widgets/misc/e-system-errors.xml.h:7
+#: ../mail/mail-errors.xml.h:236 ../widgets/misc/e-system-errors.xml.h:7
 msgid "_Overwrite"
 msgstr "_Overwrite"
 
-#: mail/mail-errors.xml.h:237
+#: ../mail/mail-errors.xml.h:237
 msgid "_Append"
 msgstr "_Append"
 
 #. mail:no-load-license primary
-#: mail/mail-errors.xml.h:239
+#: ../mail/mail-errors.xml.h:239
 msgid "Unable to read license file."
 msgstr "Unable to read licence file."
 
 #. mail:no-load-license secondary
-#: mail/mail-errors.xml.h:241
+#: ../mail/mail-errors.xml.h:241
 msgid ""
 "Cannot read the license file \"{0}\", due to an\n"
 "      installation problem.  You will not be able to use this provider "
@@ -13450,22 +13523,22 @@ msgstr ""
 "      you can accept its licence."
 
 #. mail:checking-service title
-#: mail/mail-errors.xml.h:245
+#: ../mail/mail-errors.xml.h:245
 msgid "Querying server"
 msgstr "Querying server"
 
 #. mail:checking-service primary
-#: mail/mail-errors.xml.h:247
+#: ../mail/mail-errors.xml.h:247
 msgid "Please wait."
 msgstr "Please wait."
 
 #. mail:checking-service secondary
-#: mail/mail-errors.xml.h:249
+#: ../mail/mail-errors.xml.h:249
 msgid "Querying server for a list of supported authentication mechanisms."
 msgstr "Querying server for a list of supported authentication mechanisms."
 
 #. mail:gw-accountsetup-error primary
-#: mail/mail-errors.xml.h:251
+#: ../mail/mail-errors.xml.h:251
 msgid ""
 "Unable to connect to the GroupWise\n"
 "server."
@@ -13474,7 +13547,7 @@ msgstr ""
 "server."
 
 #. mail:gw-accountsetup-error secondary
-#: mail/mail-errors.xml.h:254
+#: ../mail/mail-errors.xml.h:254
 msgid ""
 "\n"
 "Please check your account settings and try again.\n"
@@ -13482,20 +13555,20 @@ msgstr ""
 "\n"
 "Please check your account settings and try again.\n"
 
-#: mail/mail-folder-cache.c:813
+#: ../mail/mail-folder-cache.c:813
 #, c-format
 msgid "Pinging %s"
 msgstr "Pinging %s"
 
-#: mail/mail-ops.c:101
+#: ../mail/mail-ops.c:101
 msgid "Filtering Folder"
 msgstr "Filtering Folder"
 
-#: mail/mail-ops.c:262
+#: ../mail/mail-ops.c:262
 msgid "Fetching Mail"
 msgstr "Fetching Mail"
 
-#: mail/mail-ops.c:542 mail/mail-ops.c:585
+#: ../mail/mail-ops.c:556 ../mail/mail-ops.c:598
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
@@ -13505,119 +13578,119 @@ msgstr ""
 "Appending to local `Sent' folder instead."
 
 #. sending mail, filtering failed
-#: mail/mail-ops.c:564
+#: ../mail/mail-ops.c:577
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "Failed to apply outgoing filters: %s"
 
-#: mail/mail-ops.c:602
+#: ../mail/mail-ops.c:615
 #, c-format
 msgid "Failed to append to local `Sent' folder: %s"
 msgstr "Failed to append to local `Sent' folder: %s"
 
-#: mail/mail-ops.c:702
+#: ../mail/mail-ops.c:727
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Sending message %d of %d"
 
-#: mail/mail-ops.c:727
+#: ../mail/mail-ops.c:752
 #, c-format
 msgid "Failed to send %d of %d messages"
 msgstr "Failed to send %d of %d messages"
 
-#: mail/mail-ops.c:729 mail/mail-send-recv.c:613
+#: ../mail/mail-ops.c:754 ../mail/mail-send-recv.c:613
 msgid "Cancelled."
 msgstr "Cancelled."
 
-#: mail/mail-ops.c:731
+#: ../mail/mail-ops.c:756
 msgid "Complete."
 msgstr "Complete."
 
-#: mail/mail-ops.c:828
+#: ../mail/mail-ops.c:853
 msgid "Saving message to folder"
 msgstr "Saving message to folder"
 
-#: mail/mail-ops.c:913
+#: ../mail/mail-ops.c:938
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Moving messages to %s"
 
-#: mail/mail-ops.c:913
+#: ../mail/mail-ops.c:938
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Copying messages to %s"
 
-#: mail/mail-ops.c:1139
+#: ../mail/mail-ops.c:1164
 msgid "Forwarded messages"
 msgstr "Forwarded messages"
 
-#: mail/mail-ops.c:1182
+#: ../mail/mail-ops.c:1207
 #, c-format
 msgid "Opening folder %s"
 msgstr "Opening folder %s"
 
-#: mail/mail-ops.c:1254
+#: ../mail/mail-ops.c:1279
 #, c-format
 msgid "Opening store %s"
 msgstr "Opening store %s"
 
-#: mail/mail-ops.c:1332
+#: ../mail/mail-ops.c:1357
 #, c-format
 msgid "Removing folder %s"
 msgstr "Removing folder %s"
 
-#: mail/mail-ops.c:1426
+#: ../mail/mail-ops.c:1451
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Storing folder '%s'"
 
-#: mail/mail-ops.c:1491
+#: ../mail/mail-ops.c:1516
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr "Expunging and storing account '%s'"
 
-#: mail/mail-ops.c:1492
+#: ../mail/mail-ops.c:1517
 #, c-format
 msgid "Storing account '%s'"
 msgstr "Storing account '%s'"
 
-#: mail/mail-ops.c:1547
+#: ../mail/mail-ops.c:1572
 msgid "Refreshing folder"
 msgstr "Refreshing folder"
 
-#: mail/mail-ops.c:1583 mail/mail-ops.c:1634
+#: ../mail/mail-ops.c:1608 ../mail/mail-ops.c:1659
 msgid "Expunging folder"
 msgstr "Expunging folder"
 
-#: mail/mail-ops.c:1631
+#: ../mail/mail-ops.c:1656
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "Emptying trash in '%s'"
 
-#: mail/mail-ops.c:1632
+#: ../mail/mail-ops.c:1657
 msgid "Local Folders"
 msgstr "Local Folders"
 
-#: mail/mail-ops.c:1715
+#: ../mail/mail-ops.c:1740
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Retrieving message %s"
 
-#: mail/mail-ops.c:1787
+#: ../mail/mail-ops.c:1812
 #, c-format
 msgid "Retrieving %d message"
 msgid_plural "Retrieving %d messages"
 msgstr[0] "Retrieving %d message"
 msgstr[1] "Retrieving %d message(s)"
 
-#: mail/mail-ops.c:1873
+#: ../mail/mail-ops.c:1898
 #, c-format
 msgid "Saving %d message"
 msgid_plural "Saving %d messsages"
 msgstr[0] "Saving %d message"
 msgstr[1] "Saving %d messsage(s)"
 
-#: mail/mail-ops.c:1923
+#: ../mail/mail-ops.c:1948
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -13626,7 +13699,7 @@ msgstr ""
 "Unable to create output file: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1951
+#: ../mail/mail-ops.c:1976
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -13635,11 +13708,11 @@ msgstr ""
 "Error saving messages to: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2022
+#: ../mail/mail-ops.c:2047
 msgid "Saving attachment"
 msgstr "Saving attachment"
 
-#: mail/mail-ops.c:2034
+#: ../mail/mail-ops.c:2059
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -13648,355 +13721,356 @@ msgstr ""
 "Cannot create output file: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2044
+#: ../mail/mail-ops.c:2069
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Could not write data: %s"
 
-#: mail/mail-ops.c:2194
+#: ../mail/mail-ops.c:2219
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Disconnecting from %s"
 
-#: mail/mail-ops.c:2194
+#: ../mail/mail-ops.c:2219
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Reconnecting to %s"
 
-#: mail/mail-ops.c:2310
+#: ../mail/mail-ops.c:2335
 msgid "Checking Service"
 msgstr "Checking Service"
 
-#: mail/mail-send-recv.c:158
+#: ../mail/mail-send-recv.c:158
 msgid "Cancelling..."
 msgstr "Canceling..."
 
-#: mail/mail-send-recv.c:265
+#: ../mail/mail-send-recv.c:265
 #, c-format
 msgid "Server: %s, Type: %s"
 msgstr "Server: %s, Type: %s"
 
-#: mail/mail-send-recv.c:267
+#: ../mail/mail-send-recv.c:267
 #, c-format
 msgid "Path: %s, Type: %s"
 msgstr "Path: %s, Type: %s"
 
-#: mail/mail-send-recv.c:269
+#: ../mail/mail-send-recv.c:269
 #, c-format
 msgid "Type: %s"
 msgstr "Type: %s"
 
-#: mail/mail-send-recv.c:320
+#: ../mail/mail-send-recv.c:320
 msgid "Send & Receive Mail"
 msgstr "Send & Receive Mail"
 
-#: mail/mail-send-recv.c:327
+#: ../mail/mail-send-recv.c:327
 msgid "Cancel _All"
 msgstr "Cancel _All"
 
-#: mail/mail-send-recv.c:416
+#: ../mail/mail-send-recv.c:416
 msgid "Updating..."
 msgstr "Updating..."
 
-#: mail/mail-send-recv.c:416 mail/mail-send-recv.c:468
+#: ../mail/mail-send-recv.c:416 ../mail/mail-send-recv.c:468
 msgid "Waiting..."
 msgstr "Waiting..."
 
-#: mail/mail-session.c:208
+#: ../mail/mail-session.c:208
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Enter Password for %s"
 
-#: mail/mail-session.c:210
+#: ../mail/mail-session.c:210
 msgid "Enter Password"
 msgstr "Enter Password"
 
-#: mail/mail-session.c:239
+#: ../mail/mail-session.c:239
 msgid "User canceled operation."
 msgstr "User cancelled operation."
 
-#: mail/mail-signature-editor.c:372
+#: ../mail/mail-signature-editor.c:372
 msgid "Edit signature"
 msgstr "Edit signature"
 
-#: mail/mail-signature-editor.c:412
+#: ../mail/mail-signature-editor.c:412
 msgid "Enter a name for this signature."
 msgstr "Enter a name for this signature."
 
-#: mail/mail-signature-editor.c:415 plugins/shared-folder/properties.glade.h:5
+#: ../mail/mail-signature-editor.c:415
+#: ../plugins/shared-folder/properties.glade.h:5
 msgid "Name:"
 msgstr "Name:"
 
-#: mail/mail-tools.c:115
+#: ../mail/mail-tools.c:115
 #, c-format
 msgid "Could not create spool directory `%s': %s"
 msgstr "Could not create spool directory `%s': %s"
 
-#: mail/mail-tools.c:142
+#: ../mail/mail-tools.c:142
 #, c-format
 msgid "Trying to movemail a non-mbox source `%s'"
 msgstr "Trying to movemail a non-mbox source `%s'"
 
-#: mail/mail-tools.c:277
+#: ../mail/mail-tools.c:241
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "Forwarded message - %s"
 
-#: mail/mail-tools.c:279
+#: ../mail/mail-tools.c:243
 msgid "Forwarded message"
 msgstr "Forwarded message"
 
-#: mail/mail-tools.c:320
+#: ../mail/mail-tools.c:283
 #, c-format
 msgid "Invalid folder: `%s'"
 msgstr "Invalid folder: `%s'"
 
-#: mail/mail-vfolder.c:90
+#: ../mail/mail-vfolder.c:90
 #, c-format
 msgid "Setting up vFolder: %s"
 msgstr "Setting up vFolder: %s"
 
-#: mail/mail-vfolder.c:239
+#: ../mail/mail-vfolder.c:239
 #, c-format
 msgid "Updating vFolders for '%s:%s'"
 msgstr "Updating vFolders for '%s:%s'"
 
-#: mail/mail-vfolder.c:246
+#: ../mail/mail-vfolder.c:246
 #, c-format
 msgid "Updating vFolders for '%s'"
 msgstr "Updating vFolders for '%s'"
 
-#: mail/mail-vfolder.c:1008
+#: ../mail/mail-vfolder.c:1008
 msgid "Edit vFolder"
 msgstr "Edit vFolder"
 
-#: mail/mail-vfolder.c:1092
+#: ../mail/mail-vfolder.c:1092
 msgid "New vFolder"
 msgstr "New vFolder"
 
-#: mail/message-list.c:999
+#: ../mail/message-list.c:995
 msgid "Unseen"
 msgstr "Unseen"
 
-#: mail/message-list.c:1000
+#: ../mail/message-list.c:996
 msgid "Seen"
 msgstr "Seen"
 
-#: mail/message-list.c:1001
+#: ../mail/message-list.c:997
 msgid "Answered"
 msgstr "Answered"
 
-#: mail/message-list.c:1002
+#: ../mail/message-list.c:998
 msgid "Multiple Unseen Messages"
 msgstr "Multiple Unseen Messages"
 
-#: mail/message-list.c:1003
+#: ../mail/message-list.c:999
 msgid "Multiple Messages"
 msgstr "Multiple Messages"
 
-#: mail/message-list.c:1007
+#: ../mail/message-list.c:1003
 msgid "Lowest"
 msgstr "Lowest"
 
-#: mail/message-list.c:1008
+#: ../mail/message-list.c:1004
 msgid "Lower"
 msgstr "Lower"
 
-#: mail/message-list.c:1012
+#: ../mail/message-list.c:1008
 msgid "Higher"
 msgstr "Higher"
 
-#: mail/message-list.c:1013
+#: ../mail/message-list.c:1009
 msgid "Highest"
 msgstr "Highest"
 
-#: mail/message-list.c:1341
+#: ../mail/message-list.c:1337
 msgid "?"
 msgstr "?"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: mail/message-list.c:1348 plugins/itip-formatter/itip-view.c:189
+#: ../mail/message-list.c:1344 ../plugins/itip-formatter/itip-view.c:189
 msgid "Today %l:%M %p"
 msgstr "Today %l:%M %p"
 
-#: mail/message-list.c:1357
+#: ../mail/message-list.c:1353
 msgid "Yesterday %l:%M %p"
 msgstr "Yesterday %l:%M %p"
 
-#: mail/message-list.c:1369
+#: ../mail/message-list.c:1365
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: mail/message-list.c:1377
+#: ../mail/message-list.c:1373
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %l:%M %p"
 
-#: mail/message-list.c:1379
+#: ../mail/message-list.c:1375
 msgid "%b %d %Y"
 msgstr "%d %b %Y"
 
-#: mail/message-list.c:2046
+#: ../mail/message-list.c:2041
 msgid "Message List"
 msgstr "Message List"
 
-#: mail/message-list.c:3386
+#: ../mail/message-list.c:3386
 msgid "Generating message list"
 msgstr "Generating message list"
 
-#: mail/message-list.etspec.h:3
+#: ../mail/message-list.etspec.h:3
 msgid "Due By"
 msgstr "Due By"
 
-#: mail/message-list.etspec.h:4
+#: ../mail/message-list.etspec.h:4
 msgid "Flag Status"
 msgstr "Flag Status"
 
-#: mail/message-list.etspec.h:5
+#: ../mail/message-list.etspec.h:5
 msgid "Flagged"
 msgstr "Flagged"
 
-#: mail/message-list.etspec.h:6
+#: ../mail/message-list.etspec.h:6
 msgid "Follow Up Flag"
 msgstr "Follow Up Flag"
 
-#: mail/message-list.etspec.h:8
+#: ../mail/message-list.etspec.h:8
 msgid "Original Location"
 msgstr "Original Location"
 
-#: mail/message-list.etspec.h:9
+#: ../mail/message-list.etspec.h:9
 msgid "Received"
 msgstr "Received"
 
-#: mail/message-list.etspec.h:11
+#: ../mail/message-list.etspec.h:11
 msgid "Size"
 msgstr "Size"
 
-#: mail/message-tag-followup.c:74
+#: ../mail/message-tag-followup.c:74
 msgid "Call"
 msgstr "Call"
 
-#: mail/message-tag-followup.c:75
+#: ../mail/message-tag-followup.c:75
 msgid "Do Not Forward"
 msgstr "Do Not Forward"
 
-#: mail/message-tag-followup.c:76
+#: ../mail/message-tag-followup.c:76
 msgid "Follow-Up"
 msgstr "Follow-Up"
 
-#: mail/message-tag-followup.c:77
+#: ../mail/message-tag-followup.c:77
 msgid "For Your Information"
 msgstr "For Your Information"
 
-#: mail/message-tag-followup.c:78 ui/evolution-mail-message.xml.h:42
+#: ../mail/message-tag-followup.c:78 ../ui/evolution-mail-message.xml.h:42
 msgid "Forward"
 msgstr "Forward"
 
-#: mail/message-tag-followup.c:79
+#: ../mail/message-tag-followup.c:79
 msgid "No Response Necessary"
 msgstr "No Response Necessary"
 
-#: mail/message-tag-followup.c:81 ui/evolution-mail-message.xml.h:85
+#: ../mail/message-tag-followup.c:81 ../ui/evolution-mail-message.xml.h:85
 msgid "Reply"
 msgstr "Reply"
 
-#: mail/message-tag-followup.c:82 ui/evolution-mail-message.xml.h:86
+#: ../mail/message-tag-followup.c:82 ../ui/evolution-mail-message.xml.h:86
 msgid "Reply to All"
 msgstr "Reply to All"
 
-#: mail/message-tag-followup.c:83
+#: ../mail/message-tag-followup.c:83
 msgid "Review"
 msgstr "Review"
 
-#: mail/searchtypes.xml.h:1
+#: ../mail/searchtypes.xml.h:1
 msgid "Body contains"
 msgstr "Body contains"
 
-#: mail/searchtypes.xml.h:2
+#: ../mail/searchtypes.xml.h:2
 msgid "Message contains"
 msgstr "Message contains"
 
-#: mail/searchtypes.xml.h:3
+#: ../mail/searchtypes.xml.h:3
 msgid "Recipients contain"
 msgstr "Recipients contain"
 
-#: mail/searchtypes.xml.h:4
+#: ../mail/searchtypes.xml.h:4
 msgid "Sender contains"
 msgstr "Sender contains"
 
-#: mail/searchtypes.xml.h:5
+#: ../mail/searchtypes.xml.h:5
 msgid "Subject contains"
 msgstr "Subject contains"
 
-#: mail/searchtypes.xml.h:6
+#: ../mail/searchtypes.xml.h:6
 msgid "Subject or Sender contains"
 msgstr "Subject or Sender contains"
 
-#: plugins/backup-restore/backup-restore.c:51
+#: ../plugins/backup-restore/backup-restore.c:51
 msgid "Select name of Evolution archive"
 msgstr "Select name of Evolution archive"
 
-#: plugins/backup-restore/backup-restore.c:61
+#: ../plugins/backup-restore/backup-restore.c:61
 msgid "_Restart Evolution after backup"
 msgstr "_Restart Evolution after backup"
 
-#: plugins/backup-restore/backup-restore.c:89
+#: ../plugins/backup-restore/backup-restore.c:89
 msgid "Select Evolution archive to restore"
 msgstr "Select Evolution archive to restore"
 
-#: plugins/backup-restore/backup-restore.c:97
+#: ../plugins/backup-restore/backup-restore.c:97
 msgid "_Restart Evolution after restore"
 msgstr "_Restart Evolution after restore"
 
-#: plugins/backup-restore/backup.c:109
+#: ../plugins/backup-restore/backup.c:109
 msgid "Backup Evolution directory"
 msgstr "Back up Evolution directory"
 
-#: plugins/backup-restore/backup.c:111
+#: ../plugins/backup-restore/backup.c:111
 msgid "Restore Evolution directory"
 msgstr "Restore Evolution directory"
 
-#: plugins/backup-restore/backup.c:113
+#: ../plugins/backup-restore/backup.c:113
 msgid "Check Evolution archive"
 msgstr "Check Evolution archive"
 
-#: plugins/backup-restore/backup.c:115
+#: ../plugins/backup-restore/backup.c:115
 msgid "Restart Evolution"
 msgstr "Restart Evolution"
 
-#: plugins/backup-restore/org-gnome-backup-restore.xml.h:1
+#: ../plugins/backup-restore/org-gnome-backup-restore.xml.h:1
 msgid "Backup Settings..."
 msgstr "Back Up Settings..."
 
-#: plugins/backup-restore/org-gnome-backup-restore.xml.h:2
+#: ../plugins/backup-restore/org-gnome-backup-restore.xml.h:2
 msgid "Backup and restore Evolution data and settings"
 msgstr "Back up and restore Evolution data and settings"
 
-#: plugins/backup-restore/org-gnome-backup-restore.xml.h:3
+#: ../plugins/backup-restore/org-gnome-backup-restore.xml.h:3
 msgid "Restore Settings..."
 msgstr "Restore Settings..."
 
-#: plugins/bbdb/bbdb.c:388
+#: ../plugins/bbdb/bbdb.c:388
 msgid "Automatic Contacts"
 msgstr "Automatic Contacts"
 
-#: plugins/bbdb/bbdb.c:397
+#: ../plugins/bbdb/bbdb.c:397
 msgid "<span weight=\"bold\">Automatic Contacts</span>"
 msgstr "<span weight=\"bold\">Automatic Contacts</span>"
 
 #. Enable BBDB checkbox
-#: plugins/bbdb/bbdb.c:410
+#: ../plugins/bbdb/bbdb.c:410
 msgid ""
 "_Automatically create entries in the addressbook when responding to mail"
 msgstr ""
 "_Automatically create entries in the addressbook when responding to mail"
 
-#: plugins/bbdb/bbdb.c:428
+#: ../plugins/bbdb/bbdb.c:428
 msgid "<span weight=\"bold\">Instant Messaging Contacts</span>"
 msgstr "<span weight=\"bold\">Instant Messaging Contacts</span>"
 
 #. Enable Gaim Checkbox
-#: plugins/bbdb/bbdb.c:441
+#: ../plugins/bbdb/bbdb.c:441
 msgid ""
 "Periodically synchronize contact information and images from my _instant "
 "messenger"
@@ -14005,74 +14079,70 @@ msgstr ""
 "messenger"
 
 #. Synchronize now button.
-#: plugins/bbdb/bbdb.c:448
+#: ../plugins/bbdb/bbdb.c:448
 msgid "Synchronize with _buddy list now"
 msgstr "Synchronize with _buddy list now"
 
-#: plugins/calendar-weather/calendar-weather.c:54
-#: plugins/calendar-weather/calendar-weather.c:60
+#: ../plugins/calendar-weather/calendar-weather.c:54
+#: ../plugins/calendar-weather/calendar-weather.c:60
 msgid "Weather: Cloudy"
 msgstr "Weather: Cloudy"
 
-#: plugins/calendar-weather/calendar-weather.c:61
+#: ../plugins/calendar-weather/calendar-weather.c:61
 msgid "Weather: Fog"
 msgstr "Weather: Foggy"
 
-#: plugins/calendar-weather/calendar-weather.c:62
+#: ../plugins/calendar-weather/calendar-weather.c:62
 msgid "Weather: Partly Cloudy"
 msgstr "Weather: Partly Cloudy"
 
-#: plugins/calendar-weather/calendar-weather.c:63
+#: ../plugins/calendar-weather/calendar-weather.c:63
 msgid "Weather: Rain"
 msgstr "Weather: Rain"
 
-#: plugins/calendar-weather/calendar-weather.c:64
+#: ../plugins/calendar-weather/calendar-weather.c:64
 msgid "Weather: Snow"
 msgstr "Weather: Snow"
 
-#: plugins/calendar-weather/calendar-weather.c:65
+#: ../plugins/calendar-weather/calendar-weather.c:65
 msgid "Weather: Sunny"
 msgstr "Weather: Sunny"
 
-#: plugins/calendar-weather/calendar-weather.c:66
+#: ../plugins/calendar-weather/calendar-weather.c:66
 msgid "Weather: Thunderstorms"
 msgstr "Weather: Thunderstorms"
 
-#: plugins/calendar-weather/calendar-weather.c:100
-msgid "Weather"
-msgstr "Weather"
-
-#: plugins/calendar-weather/calendar-weather.c:268
+#: ../plugins/calendar-weather/calendar-weather.c:268
 msgid "Select a location"
 msgstr "Select a location"
 
-#: plugins/calendar-weather/calendar-weather.c:655
+#: ../plugins/calendar-weather/calendar-weather.c:655
 msgid "_Units:"
 msgstr "_Units:"
 
-#: plugins/calendar-weather/calendar-weather.c:662
+#: ../plugins/calendar-weather/calendar-weather.c:662
 msgid "Metric (Celsius, cm, etc)"
 msgstr "Metric (Celsius, cm, etc)"
 
-#: plugins/calendar-weather/calendar-weather.c:663
+#: ../plugins/calendar-weather/calendar-weather.c:663
 msgid "Imperial (Fahrenheit, inches, etc)"
 msgstr "Imperial (Fahrenheit, inches, etc)"
 
-#: plugins/default-source/default-source.c:82
+#: ../plugins/default-source/default-source.c:82
 msgid "Mark  as default folder"
 msgstr "Mark as default folder"
 
-#: plugins/default-source/default-source.c:108
+#: ../plugins/default-source/default-source.c:108
 msgid "Mark as default folder"
 msgstr "Mark as default folder"
 
 #. i18n: "Secure Password Authentication" is an Outlookism
-#: plugins/exchange-account-setup/exchange-account-setup.c:53
+#: ../plugins/exchange-account-setup/exchange-account-setup.c:59
 msgid "Secure Password"
 msgstr "Secure Password"
 
 #. i18n: "NTLM" probably doesn't translate
-#: plugins/exchange-account-setup/exchange-account-setup.c:56
+#: ../plugins/exchange-account-setup/exchange-account-setup.c:62
 msgid ""
 "This option will connect to the Exchange server using secure password (NTLM) "
 "authentication."
@@ -14080,11 +14150,11 @@ msgstr ""
 "This option will connect to the Exchange server using secure password (NTLM) "
 "authentication."
 
-#: plugins/exchange-account-setup/exchange-account-setup.c:64
+#: ../plugins/exchange-account-setup/exchange-account-setup.c:70
 msgid "Plaintext Password"
 msgstr "Plaintext Password"
 
-#: plugins/exchange-account-setup/exchange-account-setup.c:66
+#: ../plugins/exchange-account-setup/exchange-account-setup.c:72
 msgid ""
 "This option will connect to the Exchange server using standard plaintext "
 "password authentication."
@@ -14093,7 +14163,7 @@ msgstr ""
 "password authentication."
 
 #. Description section
-#: plugins/exchange-account-setup/exchange-account-setup.c:113
+#: ../plugins/exchange-account-setup/exchange-account-setup.c:193
 msgid ""
 "The message specified below will be automatically sent to \n"
 "each person who sends mail to you while you are out of the office."
@@ -14101,105 +14171,107 @@ msgstr ""
 "The message specified below will be automatically sent to \n"
 "each person who sends mail to you while you are out of the office."
 
-#: plugins/exchange-account-setup/exchange-account-setup.c:140
-msgid "I am in the office"
-msgstr "I am in the office"
-
-#: plugins/exchange-account-setup/exchange-account-setup.c:154
+#: ../plugins/exchange-account-setup/exchange-account-setup.c:221
+#: ../plugins/exchange-account-setup/exchange-account-setup.c:231
 msgid "I am out of the office"
 msgstr "I am out of the office"
 
-#: plugins/exchange-account-setup/exchange-account-setup.c:168
+#: ../plugins/exchange-account-setup/exchange-account-setup.c:224
+#: ../plugins/exchange-account-setup/exchange-account-setup.c:228
+msgid "I am in the office"
+msgstr "I am in the office"
+
+#: ../plugins/exchange-account-setup/exchange-account-setup.c:257
 msgid "Out of office Message:"
 msgstr "Out of office Message:"
 
-#: plugins/exchange-account-setup/exchange-account-setup.c:194
+#: ../plugins/exchange-account-setup/exchange-account-setup.c:302
 msgid "Exchange Settings"
 msgstr "Exchange Settings"
 
-#: plugins/exchange-account-setup/exchange-account-setup.c:332
-#: plugins/exchange-account-setup/exchange-ask-password.c:200
+#: ../plugins/exchange-account-setup/exchange-account-setup.c:448
+#: ../plugins/exchange-account-setup/exchange-ask-password.c:200
 msgid "_OWA Url:"
 msgstr "_OWA URL:"
 
-#: plugins/exchange-account-setup/exchange-account-setup.c:340
-#: plugins/exchange-account-setup/exchange-ask-password.c:193
+#: ../plugins/exchange-account-setup/exchange-account-setup.c:456
+#: ../plugins/exchange-account-setup/exchange-ask-password.c:193
 msgid "A_uthenticate"
 msgstr "A_uthenticate"
 
-#: plugins/exchange-account-setup/exchange-account-setup.c:457
+#: ../plugins/exchange-account-setup/exchange-account-setup.c:664
 msgid "Authentication Type"
 msgstr "Authentication Type"
 
-#: plugins/exchange-account-setup/exchange-account-setup.c:471
+#: ../plugins/exchange-account-setup/exchange-account-setup.c:678
 msgid "Ch_eck for Supported Types"
 msgstr "Ch_eck for Supported Types"
 
-#: plugins/folder-unsubscribe/folder-unsubscribe.c:57
+#: ../plugins/folder-unsubscribe/folder-unsubscribe.c:57
 #, c-format
 msgid "Unsubscribing from folder \"%s\""
 msgstr "Unsubscribing from folder \"%s\""
 
-#: plugins/groupwise-account-setup/camel-gw-listener.c:413
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:413
 msgid "Checklist"
 msgstr "Checklist"
 
-#: plugins/groupwise-send-options/org-gnome-compose-send-options.xml.h:1
+#: ../plugins/groupwise-send-options/org-gnome-compose-send-options.xml.h:1
 msgid "Add Send Options to groupwise messages"
 msgstr "Add Send Options to groupwise messages"
 
-#: plugins/groupwise-send-options/org-gnome-compose-send-options.xml.h:2
-#: widgets/misc/e-send-options.glade.h:20
+#: ../plugins/groupwise-send-options/org-gnome-compose-send-options.xml.h:2
+#: ../widgets/misc/e-send-options.glade.h:20
 msgid "Send Options"
 msgstr "Send Options"
 
-#: plugins/itip-formatter/itip-formatter.c:704
+#: ../plugins/itip-formatter/itip-formatter.c:704
 msgid "Unable to parse item"
 msgstr "Unable to parse item"
 
-#: plugins/itip-formatter/itip-formatter.c:757
+#: ../plugins/itip-formatter/itip-formatter.c:757
 #, c-format
 msgid "Unable to send item to calendar '%s'.  %s"
 msgstr "Unable to send item to calendar '%s'.  %s"
 
-#: plugins/itip-formatter/itip-formatter.c:768
+#: ../plugins/itip-formatter/itip-formatter.c:768
 #, c-format
 msgid "Sent to calendar '%s' as accepted"
 msgstr "Sent to calendar '%s' as accepted"
 
-#: plugins/itip-formatter/itip-formatter.c:772
+#: ../plugins/itip-formatter/itip-formatter.c:772
 #, c-format
 msgid "Sent to calendar '%s' as tentative"
 msgstr "Sent to calendar '%s' as tentative"
 
-#: plugins/itip-formatter/itip-formatter.c:777
+#: ../plugins/itip-formatter/itip-formatter.c:777
 #, c-format
 msgid "Sent to calendar '%s' as declined"
 msgstr "Sent to calendar '%s' as declined"
 
-#: plugins/itip-formatter/itip-formatter.c:782
+#: ../plugins/itip-formatter/itip-formatter.c:782
 #, c-format
 msgid "Sent to calendar '%s' as cancelled"
 msgstr "Sent to calendar '%s' as cancelled"
 
-#: plugins/itip-formatter/itip-formatter.c:833
+#: ../plugins/itip-formatter/itip-formatter.c:833
 msgid "Attendee status could not be updated because the status is invalid"
 msgstr "Attendee status could not be updated because the status is invalid"
 
-#: plugins/itip-formatter/itip-formatter.c:844
+#: ../plugins/itip-formatter/itip-formatter.c:844
 #, c-format
 msgid "Unable to update attendee. %s"
 msgstr "Unable to update attendee. %s"
 
-#: plugins/itip-formatter/itip-formatter.c:848
+#: ../plugins/itip-formatter/itip-formatter.c:848
 msgid "Attendee status updated"
 msgstr "Attendee status updated"
 
-#: plugins/itip-formatter/itip-formatter.c:973
+#: ../plugins/itip-formatter/itip-formatter.c:973
 msgid "The calendar attached is not valid"
 msgstr "The calendar attached is not valid"
 
-#: plugins/itip-formatter/itip-formatter.c:974
+#: ../plugins/itip-formatter/itip-formatter.c:974
 msgid ""
 "The message claims to contain a calendar, but the calendar is not valid "
 "iCalendar."
@@ -14207,13 +14279,15 @@ msgstr ""
 "The message claims to contain a calendar, but the calendar is not valid "
 "iCalendar."
 
-#: plugins/itip-formatter/itip-formatter.c:1008
-#: plugins/itip-formatter/itip-formatter.c:1064
+#: ../plugins/itip-formatter/itip-formatter.c:1008
+#: ../plugins/itip-formatter/itip-formatter.c:1023
+#: ../plugins/itip-formatter/itip-formatter.c:1078
 msgid "The item in the calendar is not valid"
 msgstr "The item in the calendar is not valid"
 
-#: plugins/itip-formatter/itip-formatter.c:1009
-#: plugins/itip-formatter/itip-formatter.c:1065
+#: ../plugins/itip-formatter/itip-formatter.c:1009
+#: ../plugins/itip-formatter/itip-formatter.c:1024
+#: ../plugins/itip-formatter/itip-formatter.c:1079
 msgid ""
 "The message does contain a calendar, but the calendar contains no events, "
 "tasks or free/busy information"
@@ -14221,11 +14295,11 @@ msgstr ""
 "The message contains a calendar, but the calendar contains no events, tasks "
 "or free/busy information"
 
-#: plugins/itip-formatter/itip-formatter.c:1020
+#: ../plugins/itip-formatter/itip-formatter.c:1034
 msgid "The calendar attached contains multiple items"
 msgstr "The calendar attached contains multiple items"
 
-#: plugins/itip-formatter/itip-formatter.c:1021
+#: ../plugins/itip-formatter/itip-formatter.c:1035
 msgid ""
 "To process all of these items, the file should be saved and the calendar "
 "imported"
@@ -14233,276 +14307,276 @@ msgstr ""
 "To process all of these items, the file should be saved and the calendar "
 "imported"
 
-#: plugins/itip-formatter/itip-formatter.c:1658
+#: ../plugins/itip-formatter/itip-formatter.c:1672
 msgid "Meetings and Tasks"
 msgstr "Meetings and Tasks"
 
 #. Delete message after acting
 #. FIXME Need a schema for this
-#: plugins/itip-formatter/itip-formatter.c:1681
+#: ../plugins/itip-formatter/itip-formatter.c:1695
 msgid "_Delete message after acting"
 msgstr "_Delete message after acting"
 
-#: plugins/itip-formatter/itip-formatter.c:1691
+#: ../plugins/itip-formatter/itip-formatter.c:1705
 msgid "<span weight=\"bold\">Conflict Search</span>"
 msgstr "<span weight=\"bold\">Conflict Search</span>"
 
 #. Source selector
-#: plugins/itip-formatter/itip-formatter.c:1704
+#: ../plugins/itip-formatter/itip-formatter.c:1718
 msgid "Select the calendars to search for meeting conflicts"
 msgstr "Select the calendars to search for meeting conflicts"
 
 #. strftime format of a weekday and a date.
-#: plugins/itip-formatter/itip-view.c:175 ui/evolution-calendar.xml.h:34
-#: widgets/misc/e-cell-date-edit.c:240 widgets/misc/e-dateedit.c:450
+#: ../plugins/itip-formatter/itip-view.c:175 ../ui/evolution-calendar.xml.h:34
+#: ../widgets/misc/e-cell-date-edit.c:240 ../widgets/misc/e-dateedit.c:450
 msgid "Today"
 msgstr "Today"
 
 #. strftime format of a time,
 #. in 24-hour format, without seconds.
-#: plugins/itip-formatter/itip-view.c:180
+#: ../plugins/itip-formatter/itip-view.c:180
 msgid "Today %H:%M"
 msgstr "Today %H:%M"
 
 #. strftime format of a time,
 #. in 24-hour format.
-#: plugins/itip-formatter/itip-view.c:184
+#: ../plugins/itip-formatter/itip-view.c:184
 msgid "Today %H:%M:%S"
 msgstr "Today %H:%M:%S"
 
 #. strftime format of a time,
 #. in 12-hour format.
-#: plugins/itip-formatter/itip-view.c:193
+#: ../plugins/itip-formatter/itip-view.c:193
 msgid "Today %l:%M:%S %p"
 msgstr "Today %l:%M:%S %p"
 
 #. strftime format of a weekday and a date.
-#: plugins/itip-formatter/itip-view.c:203
+#: ../plugins/itip-formatter/itip-view.c:203
 msgid "Tomorrow"
 msgstr "Tomorrow"
 
 #. strftime format of a time,
 #. in 24-hour format, without seconds.
-#: plugins/itip-formatter/itip-view.c:208
+#: ../plugins/itip-formatter/itip-view.c:208
 msgid "Tomorrow %H:%M"
 msgstr "Tomorrow %H:%M"
 
 #. strftime format of a time,
 #. in 24-hour format.
-#: plugins/itip-formatter/itip-view.c:212
+#: ../plugins/itip-formatter/itip-view.c:212
 msgid "Tomorrow %H:%M:%S"
 msgstr "Tomorrow %H:%M:%S"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: plugins/itip-formatter/itip-view.c:217
+#: ../plugins/itip-formatter/itip-view.c:217
 msgid "Tomorrow %l:%M %p"
 msgstr "Tomorrow %l:%M %p"
 
 #. strftime format of a time,
 #. in 12-hour format.
-#: plugins/itip-formatter/itip-view.c:221
+#: ../plugins/itip-formatter/itip-view.c:221
 msgid "Tomorrow %l:%M:%S %p"
 msgstr "Tomorrow %l:%M:%S %p"
 
 #. strftime format of a weekday.
-#: plugins/itip-formatter/itip-view.c:240
+#: ../plugins/itip-formatter/itip-view.c:240
 #, c-format
 msgid "%A"
 msgstr "%A"
 
 #. strftime format of a weekday and a
 #. time, in 24-hour format, without seconds.
-#: plugins/itip-formatter/itip-view.c:245
+#: ../plugins/itip-formatter/itip-view.c:245
 msgid "%A %H:%M"
 msgstr "%A %H:%M"
 
 #. strftime format of a weekday and a
 #. time, in 24-hour format.
-#: plugins/itip-formatter/itip-view.c:249
+#: ../plugins/itip-formatter/itip-view.c:249
 msgid "%A %H:%M:%S"
 msgstr "%A %H:%M:%S"
 
 #. strftime format of a weekday and a
 #. time, in 12-hour format, without seconds.
-#: plugins/itip-formatter/itip-view.c:254
+#: ../plugins/itip-formatter/itip-view.c:254
 msgid "%A %l:%M %p"
 msgstr "%A %l:%M %p"
 
 #. strftime format of a weekday and a
 #. time, in 12-hour format.
-#: plugins/itip-formatter/itip-view.c:258
+#: ../plugins/itip-formatter/itip-view.c:258
 msgid "%A %l:%M:%S %p"
 msgstr "%A %l:%M:%S %p"
 
 #. strftime format of a weekday and a date
 #. without a year.
-#: plugins/itip-formatter/itip-view.c:267
+#: ../plugins/itip-formatter/itip-view.c:267
 msgid "%A, %B %e"
 msgstr "%A, %e %B"
 
 #. strftime format of a weekday, a date
 #. without a year and a time,
 #. in 24-hour format, without seconds.
-#: plugins/itip-formatter/itip-view.c:273
+#: ../plugins/itip-formatter/itip-view.c:273
 msgid "%A, %B %e %H:%M"
 msgstr "%A, %e %B %H:%M"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 24-hour format.
-#: plugins/itip-formatter/itip-view.c:277
+#: ../plugins/itip-formatter/itip-view.c:277
 msgid "%A, %B %e %H:%M:%S"
 msgstr "%A, %e %B %H:%M:%S"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 12-hour format, without seconds.
-#: plugins/itip-formatter/itip-view.c:282
+#: ../plugins/itip-formatter/itip-view.c:282
 msgid "%A, %B %e %l:%M %p"
 msgstr "%A, %e %B %l:%M %p"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 12-hour format.
-#: plugins/itip-formatter/itip-view.c:286
+#: ../plugins/itip-formatter/itip-view.c:286
 msgid "%A, %B %e %l:%M:%S %p"
 msgstr "%A, %e %B %l:%M:%S %p"
 
 #. strftime format of a weekday and a date.
-#: plugins/itip-formatter/itip-view.c:292
+#: ../plugins/itip-formatter/itip-view.c:292
 msgid "%A, %B %e, %Y"
 msgstr "%A, %e %B, %Y"
 
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format, without seconds.
-#: plugins/itip-formatter/itip-view.c:297
+#: ../plugins/itip-formatter/itip-view.c:297
 msgid "%A, %B %e, %Y %H:%M"
 msgstr "%A, %e %B, %Y %H:%M"
 
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format.
-#: plugins/itip-formatter/itip-view.c:301
+#: ../plugins/itip-formatter/itip-view.c:301
 msgid "%A, %B %e, %Y %H:%M:%S"
 msgstr "%A, %e %B, %Y %H:%M:%S"
 
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format, without seconds.
-#: plugins/itip-formatter/itip-view.c:306
+#: ../plugins/itip-formatter/itip-view.c:306
 msgid "%A, %B %e, %Y %l:%M %p"
 msgstr "%A, %e %B, %Y %l:%M %p"
 
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format.
-#: plugins/itip-formatter/itip-view.c:310
+#: ../plugins/itip-formatter/itip-view.c:310
 msgid "%A, %B %e, %Y %l:%M:%S %p"
 msgstr "%A, %e %B, %Y %l:%M:%S %p"
 
-#: plugins/itip-formatter/itip-view.c:335
+#: ../plugins/itip-formatter/itip-view.c:335
 #, c-format
 msgid "<b>%s</b> through %s has published the following meeting information:"
 msgstr "<b>%s</b> through %s has published the following meeting information:"
 
-#: plugins/itip-formatter/itip-view.c:337
+#: ../plugins/itip-formatter/itip-view.c:337
 #, c-format
 msgid "<b>%s</b> has published the following meeting information:"
 msgstr "<b>%s</b> has published the following meeting information:"
 
-#: plugins/itip-formatter/itip-view.c:342
+#: ../plugins/itip-formatter/itip-view.c:342
 #, c-format
 msgid "<b>%s</b> requests the presence of %s at the following meeting:"
 msgstr "<b>%s</b> requests the presence of %s at the following meeting:"
 
-#: plugins/itip-formatter/itip-view.c:345
+#: ../plugins/itip-formatter/itip-view.c:345
 #, c-format
 msgid "<b>%s</b> through %s requests your presence at the following meeting:"
 msgstr "<b>%s</b> through %s requests your presence at the following meeting:"
 
-#: plugins/itip-formatter/itip-view.c:347
+#: ../plugins/itip-formatter/itip-view.c:347
 #, c-format
 msgid "<b>%s</b> requests your presence at the following meeting:"
 msgstr "<b>%s</b> requests your presence at the following meeting:"
 
-#: plugins/itip-formatter/itip-view.c:353
+#: ../plugins/itip-formatter/itip-view.c:353
 #, c-format
 msgid "<b>%s</b> through %s wishes to add to an existing meeting:"
 msgstr "<b>%s</b> through %s wishes to add to an existing meeting:"
 
-#: plugins/itip-formatter/itip-view.c:355
+#: ../plugins/itip-formatter/itip-view.c:355
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting:"
 msgstr "<b>%s</b> wishes to add to an existing meeting:"
 
-#: plugins/itip-formatter/itip-view.c:358
+#: ../plugins/itip-formatter/itip-view.c:358
 #, c-format
 msgid ""
 "<b>%s</b> wishes to receive the latest information for the following meeting:"
 msgstr ""
 "<b>%s</b> wishes to receive the latest information for the following meeting:"
 
-#: plugins/itip-formatter/itip-view.c:361
+#: ../plugins/itip-formatter/itip-view.c:361
 #, c-format
 msgid "<b>%s</b> has sent back the following meeting response:"
 msgstr "<b>%s</b> has sent back the following meeting response:"
 
-#: plugins/itip-formatter/itip-view.c:365
+#: ../plugins/itip-formatter/itip-view.c:365
 #, c-format
 msgid "<b>%s</b> through %s has cancelled the following meeting:"
 msgstr "<b>%s</b> through %s has cancelled the following meeting:"
 
-#: plugins/itip-formatter/itip-view.c:367
+#: ../plugins/itip-formatter/itip-view.c:367
 #, c-format
 msgid "<b>%s</b> has cancelled the following meeting."
 msgstr "<b>%s</b> has cancelled the following meeting."
 
-#: plugins/itip-formatter/itip-view.c:370
+#: ../plugins/itip-formatter/itip-view.c:370
 #, c-format
 msgid "<b>%s</b> has proposed the following meeting changes."
 msgstr "<b>%s</b> has proposed the following meeting changes."
 
-#: plugins/itip-formatter/itip-view.c:374
+#: ../plugins/itip-formatter/itip-view.c:374
 #, c-format
 msgid "<b>%s</b> through %s has declined the following meeting changes:"
 msgstr "<b>%s</b> through %s has declined the following meeting changes:"
 
-#: plugins/itip-formatter/itip-view.c:376
+#: ../plugins/itip-formatter/itip-view.c:376
 #, c-format
 msgid "<b>%s</b> has declined the following meeting changes."
 msgstr "<b>%s</b> has declined the following meeting changes."
 
-#: plugins/itip-formatter/itip-view.c:403
+#: ../plugins/itip-formatter/itip-view.c:403
 #, c-format
 msgid "<b>%s</b> through %s has published the following task:"
 msgstr "<b>%s</b> through %s has published the following task:"
 
-#: plugins/itip-formatter/itip-view.c:405
+#: ../plugins/itip-formatter/itip-view.c:405
 #, c-format
 msgid "<b>%s</b> has published the following task:"
 msgstr "<b>%s</b> has published the following task:"
 
-#: plugins/itip-formatter/itip-view.c:410
+#: ../plugins/itip-formatter/itip-view.c:410
 #, c-format
 msgid "<b>%s</b> requests the assignment of %s to the following task:"
 msgstr "<b>%s</b> requests the assignment of %s to the following task:"
 
-#: plugins/itip-formatter/itip-view.c:413
+#: ../plugins/itip-formatter/itip-view.c:413
 #, c-format
 msgid "<b>%s</b> through %s has assigned you a task:"
 msgstr "<b>%s</b> through %s has assigned you a task:"
 
-#: plugins/itip-formatter/itip-view.c:415
+#: ../plugins/itip-formatter/itip-view.c:415
 #, c-format
 msgid "<b>%s</b> has assigned you a task:"
 msgstr "<b>%s</b> has assigned you a task:"
 
-#: plugins/itip-formatter/itip-view.c:421
+#: ../plugins/itip-formatter/itip-view.c:421
 #, c-format
 msgid "<b>%s</b> through %s wishes to add to an existing task:"
 msgstr "<b>%s</b> through %s wishes to add to an existing task:"
 
-#: plugins/itip-formatter/itip-view.c:423
+#: ../plugins/itip-formatter/itip-view.c:423
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task:"
 msgstr "<b>%s</b> wishes to add to an existing task:"
 
-#: plugins/itip-formatter/itip-view.c:426
+#: ../plugins/itip-formatter/itip-view.c:426
 #, c-format
 msgid ""
 "<b>%s</b> wishes to receive the latest information for the following "
@@ -14511,49 +14585,49 @@ msgstr ""
 "<b>%s</b> wishes to receive the latest information for the following "
 "assigned task:"
 
-#: plugins/itip-formatter/itip-view.c:429
+#: ../plugins/itip-formatter/itip-view.c:429
 #, c-format
 msgid "<b>%s</b> has sent back the following assigned task response:"
 msgstr "<b>%s</b> has sent back the following assigned task response:"
 
-#: plugins/itip-formatter/itip-view.c:433
+#: ../plugins/itip-formatter/itip-view.c:433
 #, c-format
 msgid "<b>%s</b> through %s has cancelled the following assigned task:"
 msgstr "<b>%s</b> through %s has cancelled the following assigned task:"
 
-#: plugins/itip-formatter/itip-view.c:435
+#: ../plugins/itip-formatter/itip-view.c:435
 #, c-format
 msgid "<b>%s</b> has cancelled the following assigned task:"
 msgstr "<b>%s</b> has cancelled the following assigned task:"
 
-#: plugins/itip-formatter/itip-view.c:438
+#: ../plugins/itip-formatter/itip-view.c:438
 #, c-format
 msgid "<b>%s</b> has proposed the following task assignment changes:"
 msgstr "<b>%s</b> has proposed the following task assignment changes:"
 
-#: plugins/itip-formatter/itip-view.c:442
+#: ../plugins/itip-formatter/itip-view.c:442
 #, c-format
 msgid "<b>%s</b> through %s has declined the following assigned task:"
 msgstr "<b>%s</b> through %s has declined the following assigned task:"
 
-#: plugins/itip-formatter/itip-view.c:444
+#: ../plugins/itip-formatter/itip-view.c:444
 #, c-format
 msgid "<b>%s</b> has declined the following assigned task:"
 msgstr "<b>%s</b> has declined the following assigned task:"
 
 #. Comment
-#: plugins/itip-formatter/itip-view.c:892
-#: plugins/itip-formatter/itip-view.c:942
+#: ../plugins/itip-formatter/itip-view.c:892
+#: ../plugins/itip-formatter/itip-view.c:942
 msgid "Comment:"
 msgstr "Comment:"
 
 #. org.gnome.mailing-list-actions:no-header primary
-#: plugins/mailing-list-actions/org-gnome-mailing-list-actions-errors.xml.h:2
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions-errors.xml.h:2
 msgid "Action not available"
 msgstr "Action not available"
 
 #. org.gnome.mailing-list-actions:no-header secondary
-#: plugins/mailing-list-actions/org-gnome-mailing-list-actions-errors.xml.h:4
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions-errors.xml.h:4
 msgid ""
 "This message does not contain the header information required for this "
 "action."
@@ -14562,12 +14636,12 @@ msgstr ""
 "action."
 
 #. org.gnome.mailing-list-actions:posting-not-allowed primary
-#: plugins/mailing-list-actions/org-gnome-mailing-list-actions-errors.xml.h:6
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions-errors.xml.h:6
 msgid "Posting not allowed"
 msgstr "Posting not allowed"
 
 #. org.gnome.mailing-list-actions:posting-not-allowed secondary
-#: plugins/mailing-list-actions/org-gnome-mailing-list-actions-errors.xml.h:8
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions-errors.xml.h:8
 msgid ""
 "Posting to this mailing list is not allowed. Possibly, this is a read-only "
 "mailing list. Contact the list owner for details."
@@ -14576,12 +14650,12 @@ msgstr ""
 "mailing list. Contact the list owner for details."
 
 #. org.gnome.mailing-list-actions:ask-send-message primary
-#: plugins/mailing-list-actions/org-gnome-mailing-list-actions-errors.xml.h:10
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions-errors.xml.h:10
 msgid "Send e-mail message to mailing list?"
 msgstr "Send e-mail message to mailing list?"
 
 #. org.gnome.mailing-list-actions:ask-send-message secondary
-#: plugins/mailing-list-actions/org-gnome-mailing-list-actions-errors.xml.h:12
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions-errors.xml.h:12
 msgid ""
 "An e-mail message will be sent to the URL \"{0}\". You can either send the "
 "message automatically, or see and change it first.\n"
@@ -14595,21 +14669,21 @@ msgstr ""
 "You should receive an answer from the mailing list shortly after the message "
 "has been sent."
 
-#: plugins/mailing-list-actions/org-gnome-mailing-list-actions-errors.xml.h:15
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions-errors.xml.h:15
 msgid "_Send message"
 msgstr "_Send message"
 
-#: plugins/mailing-list-actions/org-gnome-mailing-list-actions-errors.xml.h:16
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions-errors.xml.h:16
 msgid "_Edit message"
 msgstr "_Edit message"
 
 #. org.gnome.mailing-list-actions:malformed-header primary
-#: plugins/mailing-list-actions/org-gnome-mailing-list-actions-errors.xml.h:18
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions-errors.xml.h:18
 msgid "Malformed header"
 msgstr "Malformed header"
 
 #. org.gnome.mailing-list-actions:malformed-header secondary
-#: plugins/mailing-list-actions/org-gnome-mailing-list-actions-errors.xml.h:20
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions-errors.xml.h:20
 msgid ""
 "The {0} header of this message is malformed and could not be processed.\n"
 "\n"
@@ -14620,12 +14694,12 @@ msgstr ""
 "Header: {1}"
 
 #. org.gnome.mailing-list-actions:no-action primary
-#: plugins/mailing-list-actions/org-gnome-mailing-list-actions-errors.xml.h:24
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions-errors.xml.h:24
 msgid "No e-mail action"
 msgstr "No e-mail action"
 
 #. org.gnome.mailing-list-actions:no-action secondary
-#: plugins/mailing-list-actions/org-gnome-mailing-list-actions-errors.xml.h:26
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions-errors.xml.h:26
 msgid ""
 "The action could not be performed. This means the header for this action did "
 "not contain any action we could handle.\n"
@@ -14638,91 +14712,91 @@ msgstr ""
 "Header: {0}"
 
 #. Create the checkbox we will display, complete with mnemonic that is unique in the dialog
-#: plugins/new-mail-notify/new-mail-notify.c:66
+#: ../plugins/new-mail-notify/new-mail-notify.c:66
 msgid "_Generates a D-BUS message when new mail arrives"
 msgstr "_Generates a D-BUS message when new mail arrives"
 
-#: plugins/plugin-manager/org-gnome-plugin-manager.xml.h:1
+#: ../plugins/plugin-manager/org-gnome-plugin-manager.xml.h:1
 msgid "Enable and disable plugins"
 msgstr "Enable and disable plugins"
 
-#: plugins/plugin-manager/org-gnome-plugin-manager.xml.h:2
+#: ../plugins/plugin-manager/org-gnome-plugin-manager.xml.h:2
 msgid "Manage Plugins..."
 msgstr "Manage Plugins..."
 
-#: plugins/plugin-manager/plugin-manager.c:45
+#: ../plugins/plugin-manager/plugin-manager.c:45
 msgid "Author(s)"
 msgstr "Author(s)"
 
-#: plugins/plugin-manager/plugin-manager.c:46
+#: ../plugins/plugin-manager/plugin-manager.c:46
 msgid "Id"
 msgstr "ID"
 
-#: plugins/plugin-manager/plugin-manager.c:47
+#: ../plugins/plugin-manager/plugin-manager.c:47
 msgid "Path"
 msgstr "Path"
 
-#: plugins/plugin-manager/plugin-manager.c:48
+#: ../plugins/plugin-manager/plugin-manager.c:48
 msgid "Description"
 msgstr "Description"
 
 #. Setup the ui
-#: plugins/plugin-manager/plugin-manager.c:188
+#: ../plugins/plugin-manager/plugin-manager.c:188
 msgid "Plugin Manager"
 msgstr "Plugin Manager"
 
-#: plugins/plugin-manager/plugin-manager.c:201
+#: ../plugins/plugin-manager/plugin-manager.c:201
 msgid "Note: Some changes will not take effect until restart"
 msgstr "Note: Some changes will not take effect until restart"
 
-#: plugins/plugin-manager/plugin-manager.c:210
+#: ../plugins/plugin-manager/plugin-manager.c:210
 msgid "Plugin"
 msgstr "Plugin"
 
-#: plugins/prefer-plain/prefer-plain.c:105
+#: ../plugins/prefer-plain/prefer-plain.c:105
 msgid "Show HTML if present"
 msgstr "Show HTML if present"
 
-#: plugins/prefer-plain/prefer-plain.c:106
+#: ../plugins/prefer-plain/prefer-plain.c:106
 msgid "Prefer PLAIN"
 msgstr "Prefer PLAIN"
 
-#: plugins/prefer-plain/prefer-plain.c:107
+#: ../plugins/prefer-plain/prefer-plain.c:107
 msgid "Only ever show PLAIN"
 msgstr "Only ever show PLAIN"
 
-#: plugins/prefer-plain/prefer-plain.c:150
+#: ../plugins/prefer-plain/prefer-plain.c:150
 msgid "HTML Mode"
 msgstr "HTML Mode"
 
-#: plugins/save-attachments/org-gnome-save-attachments.xml.h:1
+#: ../plugins/save-attachments/org-gnome-save-attachments.xml.h:1
 msgid "Save Attachments ..."
 msgstr "Save Attachments ..."
 
-#: plugins/save-attachments/org-gnome-save-attachments.xml.h:2
+#: ../plugins/save-attachments/org-gnome-save-attachments.xml.h:2
 msgid "Save all attachments"
 msgstr "Save all attachments"
 
-#: plugins/save-attachments/save-attachments.c:331
+#: ../plugins/save-attachments/save-attachments.c:331
 msgid "Select save base name"
 msgstr "Select save base name"
 
-#: plugins/save-attachments/save-attachments.c:351
+#: ../plugins/save-attachments/save-attachments.c:351
 msgid "MIME Type"
 msgstr "MIME Type"
 
-#: plugins/save-attachments/save-attachments.c:359
-#: ui/evolution-message-composer.xml.h:16
-#: ui/evolution-signature-editor.xml.h:6
+#: ../plugins/save-attachments/save-attachments.c:359
+#: ../ui/evolution-message-composer.xml.h:16
+#: ../ui/evolution-signature-editor.xml.h:6
 msgid "Save"
 msgstr "Save"
 
-#: plugins/save-calendar/csv-format.c:167
+#: ../plugins/save-calendar/csv-format.c:167
 #, c-format
 msgid "%s%d/%s%d/%s%d %s%d:%s%d:%s%d"
 msgstr "%s%d/%s%d/%s%d %s%d:%s%d:%s%d"
 
-#: plugins/save-calendar/csv-format.c:370
+#: ../plugins/save-calendar/csv-format.c:370
 #, c-format
 msgid ""
 "Uid%sSummary%sDescription List%sCategories List%sComment List%sCompleted%"
@@ -14733,44 +14807,44 @@ msgstr ""
 "sCreated%sContact List%sStart%sEnd%sDue%sPercent Done%sPriority%sURL%"
 "sAttendees List%sLocation%sModified%s"
 
-#: plugins/save-calendar/csv-format.c:519
+#: ../plugins/save-calendar/csv-format.c:519
 msgid "Advanced options for the CSV format"
 msgstr "Advanced options for the CSV format"
 
-#: plugins/save-calendar/csv-format.c:526
+#: ../plugins/save-calendar/csv-format.c:526
 msgid "Prepend a header"
 msgstr "Prepend a header"
 
-#: plugins/save-calendar/csv-format.c:535
+#: ../plugins/save-calendar/csv-format.c:535
 msgid "Value delimiter:"
 msgstr "Value delimiter:"
 
-#: plugins/save-calendar/csv-format.c:541
+#: ../plugins/save-calendar/csv-format.c:541
 msgid "Record delimiter:"
 msgstr "Record delimiter:"
 
-#: plugins/save-calendar/csv-format.c:547
+#: ../plugins/save-calendar/csv-format.c:547
 msgid "Encapsulate values with:"
 msgstr "Encapsulate values with:"
 
-#: plugins/save-calendar/csv-format.c:569
+#: ../plugins/save-calendar/csv-format.c:569
 msgid "Comma separated value format (.csv)"
 msgstr "Comma separated value format (.csv)"
 
-#: plugins/save-calendar/ical-format.c:120
+#: ../plugins/save-calendar/ical-format.c:136
 msgid "iCalendar format (.ics)"
 msgstr "iCalendar format (.ics)"
 
-#: plugins/save-calendar/rdf-format.c:390
+#: ../plugins/save-calendar/rdf-format.c:390
 msgid "RDF format (.rdf)"
 msgstr "RDF format (.rdf)"
 
-#: plugins/save-calendar/save-calendar.c:172
-#: plugins/save-calendar/save-calendar.c:182
+#: ../plugins/save-calendar/save-calendar.c:171
+#: ../plugins/save-calendar/save-calendar.c:181
 msgid "Select destination file"
 msgstr "Select destination file"
 
-#: plugins/save-calendar/save-calendar.c:217
+#: ../plugins/save-calendar/save-calendar.c:216
 #, c-format
 msgid ""
 "The suggested filename extension of this filetype (%s) is unused in the "
@@ -14779,18 +14853,18 @@ msgstr ""
 "The suggested filename extension of this filetype (%s) is unused in the "
 "chosen filename. Do you want to continue?"
 
-#: plugins/send-options/send-options.c:82
+#: ../plugins/send-options/send-options.c:82
 #, c-format
 msgid "%sEnter password for %s (user %s)"
 msgstr "%sEnter password for %s (user %s)"
 
 #. org.gnome.evolution.mail_shared_folder:invalid-user primary
-#: plugins/shared-folder/org-gnome-shared-folder-errors.xml.h:2
+#: ../plugins/shared-folder/org-gnome-shared-folder-errors.xml.h:2
 msgid "Invalid user"
 msgstr "Invalid user"
 
 #. org.gnome.evolution.mail_shared_folder:invalid-user secondary
-#: plugins/shared-folder/org-gnome-shared-folder-errors.xml.h:4
+#: ../plugins/shared-folder/org-gnome-shared-folder-errors.xml.h:4
 msgid ""
 "\n"
 "You cannot share folder with specified user \"{0}\" \n"
@@ -14799,12 +14873,12 @@ msgstr ""
 "You cannot share folder with specified user \"{0}\" \n"
 
 #. org.gnome.evolution.mail_shared_folder:no-user primary
-#: plugins/shared-folder/org-gnome-shared-folder-errors.xml.h:8
+#: ../plugins/shared-folder/org-gnome-shared-folder-errors.xml.h:8
 msgid "Specify User"
 msgstr "Specify User"
 
 #. org.gnome.evolution.mail_shared_folder:no-user secondary
-#: plugins/shared-folder/org-gnome-shared-folder-errors.xml.h:10
+#: ../plugins/shared-folder/org-gnome-shared-folder-errors.xml.h:10
 msgid ""
 "\n"
 "\tYou have to specify a user name whom you want to add to the list \n"
@@ -14812,136 +14886,136 @@ msgstr ""
 "\n"
 "\tYou have to specify a user name that you want to add to the list \n"
 
-#: plugins/shared-folder/properties.glade.h:2
+#: ../plugins/shared-folder/properties.glade.h:2
 msgid "<b>Users :</b>"
 msgstr "<b>Users:</b>"
 
-#: plugins/shared-folder/properties.glade.h:4
+#: ../plugins/shared-folder/properties.glade.h:4
 msgid "Message"
 msgstr "Message"
 
-#: plugins/shared-folder/properties.glade.h:6
+#: ../plugins/shared-folder/properties.glade.h:6
 msgid "Shared Folder Notification"
 msgstr "Shared Folder Notification"
 
-#: plugins/shared-folder/properties.glade.h:8
+#: ../plugins/shared-folder/properties.glade.h:8
 msgid "The participants will receive the following notification.\n"
 msgstr "The participants will receive the following notification.\n"
 
-#: plugins/shared-folder/properties.glade.h:11
+#: ../plugins/shared-folder/properties.glade.h:11
 msgid "_Contacts..."
 msgstr "_Contacts..."
 
-#: plugins/shared-folder/properties.glade.h:12
+#: ../plugins/shared-folder/properties.glade.h:12
 msgid "_Cutomize notification message"
 msgstr "_Cutomize notification message"
 
-#: plugins/shared-folder/properties.glade.h:13
+#: ../plugins/shared-folder/properties.glade.h:13
 msgid "_Not Shared"
 msgstr "_Not Shared"
 
-#: plugins/shared-folder/properties.glade.h:15
+#: ../plugins/shared-folder/properties.glade.h:15
 msgid "_Shared With ..."
 msgstr "_Shared With ..."
 
-#: plugins/shared-folder/properties.glade.h:16
+#: ../plugins/shared-folder/properties.glade.h:16
 msgid "_Sharing"
 msgstr "_Sharing"
 
-#: plugins/shared-folder/share-folder-common.c:315
+#: ../plugins/shared-folder/share-folder-common.c:315
 msgid "Users"
 msgstr "Users"
 
-#: plugins/shared-folder/share-folder-common.c:316
+#: ../plugins/shared-folder/share-folder-common.c:316
 msgid "Enter the users and set permissions"
 msgstr "Enter the users and set permissions"
 
-#: plugins/shared-folder/share-folder-common.c:401
+#: ../plugins/shared-folder/share-folder-common.c:403
 msgid "Sharing"
 msgstr "Sharing"
 
 #. Create the checkbox we will display, complete with mnemonic that is unique in the dialog
-#: plugins/subject-thread/subject-thread.c:54
+#: ../plugins/subject-thread/subject-thread.c:54
 msgid "Fall back to threading messages by sub_ject"
 msgstr "Fall back to threading messages by sub_ject"
 
-#: shell/GNOME_Evolution_Shell.server.in.in.h:1
+#: ../shell/GNOME_Evolution_Shell.server.in.in.h:1
 msgid "Evolution Shell"
 msgstr "Evolution Shell"
 
-#: shell/GNOME_Evolution_Test.server.in.in.h:1
+#: ../shell/GNOME_Evolution_Test.server.in.in.h:1
 msgid "Evolution Test"
 msgstr "Evolution Test"
 
-#: shell/GNOME_Evolution_Test.server.in.in.h:2
+#: ../shell/GNOME_Evolution_Test.server.in.in.h:2
 msgid "Evolution Test component"
 msgstr "Evolution Test component"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:1
+#: ../shell/apps_evolution_shell.schemas.in.in.h:1
 msgid "A GNOME Print description of the current printer settings"
 msgstr "A GNOME Print description of the current printer settings"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:2
+#: ../shell/apps_evolution_shell.schemas.in.in.h:2
 msgid "Configuration version"
 msgstr "Configuration version"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:3
+#: ../shell/apps_evolution_shell.schemas.in.in.h:3
 msgid "Default sidebar width"
 msgstr "Default sidebar width"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:4
+#: ../shell/apps_evolution_shell.schemas.in.in.h:4
 msgid "Default window height"
 msgstr "Default window height"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:5
+#: ../shell/apps_evolution_shell.schemas.in.in.h:5
 msgid "Default window width"
 msgstr "Default window width"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:6
+#: ../shell/apps_evolution_shell.schemas.in.in.h:6
 msgid "ID or alias of the component to be shown by default at start-up."
 msgstr "ID or alias of the component to be shown by default at start-up."
 
-#: shell/apps_evolution_shell.schemas.in.in.h:7
+#: ../shell/apps_evolution_shell.schemas.in.in.h:7
 msgid "Last upgraded configuration version"
 msgstr "Last upgraded configuration version"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:8
+#: ../shell/apps_evolution_shell.schemas.in.in.h:8
 msgid ""
 "List of paths for the folders to be synchronized to disk for offline usage"
 msgstr ""
 "List of paths for the folders to be synchronized to disk for offline usage"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:9
+#: ../shell/apps_evolution_shell.schemas.in.in.h:9
 msgid "Printer settings"
 msgstr "Printer settings"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:10
+#: ../shell/apps_evolution_shell.schemas.in.in.h:10
 msgid "Skip development warning dialog"
 msgstr "Skip development warning dialogue"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:11 shell/main.c:475
+#: ../shell/apps_evolution_shell.schemas.in.in.h:11 ../shell/main.c:476
 msgid "Start in offline mode"
 msgstr "Start in offline mode"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:12
+#: ../shell/apps_evolution_shell.schemas.in.in.h:12
 msgid ""
 "The configuration version of Evolution, with major/minor/configuration level"
 msgstr ""
 "The configuration version of Evolution, with major/minor/configuration level"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:13
+#: ../shell/apps_evolution_shell.schemas.in.in.h:13
 msgid "The default height for the main window, in pixels."
 msgstr "The default height for the main window, in pixels."
 
-#: shell/apps_evolution_shell.schemas.in.in.h:14
+#: ../shell/apps_evolution_shell.schemas.in.in.h:14
 msgid "The default width for the main window, in pixels."
 msgstr "The default width for the main window, in pixels."
 
-#: shell/apps_evolution_shell.schemas.in.in.h:15
+#: ../shell/apps_evolution_shell.schemas.in.in.h:15
 msgid "The default width for the sidebar, in pixels."
 msgstr "The default width for the sidebar, in pixels."
 
-#: shell/apps_evolution_shell.schemas.in.in.h:16
+#: ../shell/apps_evolution_shell.schemas.in.in.h:16
 msgid ""
 "The last upgraded configuration version of Evolution, with major/minor/"
 "configuration level"
@@ -14949,7 +15023,7 @@ msgstr ""
 "The last upgraded configuration version of Evolution, with major/minor/"
 "configuration level"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:17
+#: ../shell/apps_evolution_shell.schemas.in.in.h:17
 msgid ""
 "The style of the window buttons. Can be \"text\", \"icons\", \"both\", "
 "\"toolbar\". If \"toolbar\" is set, the style of the buutons is determined "
@@ -14959,58 +15033,59 @@ msgstr ""
 "\"toolbar\". If \"toolbar\" is set, the style of the buttons is determined "
 "by the GNOME toolbar setting."
 
-#: shell/apps_evolution_shell.schemas.in.in.h:18
+#: ../shell/apps_evolution_shell.schemas.in.in.h:18
 msgid "Toolbar is visible"
 msgstr "Toolbar is visible"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:19
+#: ../shell/apps_evolution_shell.schemas.in.in.h:19
 msgid "Whether Evolution will start up in offline mode instead of online mode."
 msgstr ""
 "Whether Evolution will start up in offline mode instead of online mode."
 
-#: shell/apps_evolution_shell.schemas.in.in.h:20
+#: ../shell/apps_evolution_shell.schemas.in.in.h:20
 msgid "Whether the toolbar should be visible."
 msgstr "Whether the toolbar should be visible."
 
-#: shell/apps_evolution_shell.schemas.in.in.h:21
+#: ../shell/apps_evolution_shell.schemas.in.in.h:21
 msgid ""
 "Whether the warning dialog in development versions of Evolution is skipped."
 msgstr ""
 "Whether the warning dialogue in development versions of Evolution is skipped."
 
-#: shell/apps_evolution_shell.schemas.in.in.h:22
+#: ../shell/apps_evolution_shell.schemas.in.in.h:22
 msgid "Whether the window buttons should be visible."
 msgstr "Whether the window buttons should be visible."
 
-#: shell/apps_evolution_shell.schemas.in.in.h:23
+#: ../shell/apps_evolution_shell.schemas.in.in.h:23
 msgid "Window button style"
 msgstr "Window button style"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:24
+#: ../shell/apps_evolution_shell.schemas.in.in.h:24
 msgid "Window buttons are visible"
 msgstr "Window buttons are visible"
 
-#: shell/e-active-connection-dialog.glade.h:1
+#: ../shell/e-active-connection-dialog.glade.h:1
 msgid "<b>Active Connections</b>"
 msgstr "<b>Active Connections</b>"
 
-#: shell/e-active-connection-dialog.glade.h:2
+#: ../shell/e-active-connection-dialog.glade.h:2
 msgid "Active Connections"
 msgstr "Active Connections"
 
-#: shell/e-active-connection-dialog.glade.h:3
+#: ../shell/e-active-connection-dialog.glade.h:3
 msgid "Click OK to close these connections and go offline"
 msgstr "Click OK to close these connections and go offline"
 
-#: shell/e-shell-folder-title-bar.c:586 shell/e-shell-folder-title-bar.c:587
+#: ../shell/e-shell-folder-title-bar.c:586
+#: ../shell/e-shell-folder-title-bar.c:587
 msgid "(Untitled)"
 msgstr "(Untitled)"
 
-#: shell/e-shell-importer.c:147
+#: ../shell/e-shell-importer.c:147
 msgid "Choose the type of importer to run:"
 msgstr "Choose the type of importer to run:"
 
-#: shell/e-shell-importer.c:150
+#: ../shell/e-shell-importer.c:150
 msgid ""
 "Choose the file that you want to import into Evolution, and select what type "
 "of file it is from the list.\n"
@@ -15024,15 +15099,15 @@ msgstr ""
 "You can select \"Automatic\" if you do not know, and Evolution will attempt "
 "to work it out."
 
-#: shell/e-shell-importer.c:156
+#: ../shell/e-shell-importer.c:156
 msgid "Choose the destination for this import"
 msgstr "Choose the destination for this import"
 
-#: shell/e-shell-importer.c:159 shell/e-shell-startup-wizard.c:750
+#: ../shell/e-shell-importer.c:159 ../shell/e-shell-startup-wizard.c:750
 msgid "Please select the information that you would like to import:"
 msgstr "Please select the information that you would like to import:"
 
-#: shell/e-shell-importer.c:162
+#: ../shell/e-shell-importer.c:162
 msgid ""
 "Evolution checked for settings to import from the following\n"
 "applications: Pine, Netscape, Elm, iCalendar. No settings\n"
@@ -15044,7 +15119,7 @@ msgstr ""
 "that could be imported where found. If you would like to\n"
 "try again, please click the \"Back\" button.\n"
 
-#: shell/e-shell-importer.c:233 shell/e-shell-importer.c:267
+#: ../shell/e-shell-importer.c:233 ../shell/e-shell-importer.c:267
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -15053,30 +15128,30 @@ msgstr ""
 "Importing %s\n"
 "Importing item %d."
 
-#: shell/e-shell-importer.c:341
+#: ../shell/e-shell-importer.c:341
 msgid "Select importer"
 msgstr "Select importer"
 
-#: shell/e-shell-importer.c:462 shell/e-shell-importer.c:1086
+#: ../shell/e-shell-importer.c:462 ../shell/e-shell-importer.c:1086
 #, c-format
 msgid "File %s does not exist"
 msgstr "File %s does not exist"
 
-#: shell/e-shell-importer.c:470
+#: ../shell/e-shell-importer.c:470
 msgid "Importing"
 msgstr "Importing"
 
-#: shell/e-shell-importer.c:478
+#: ../shell/e-shell-importer.c:478
 #, c-format
 msgid "Importing %s.\n"
 msgstr "Importing %s.\n"
 
-#: shell/e-shell-importer.c:488 shell/e-shell-importer.c:489
+#: ../shell/e-shell-importer.c:488 ../shell/e-shell-importer.c:489
 #, c-format
 msgid "Error loading %s"
 msgstr "Error loading %s"
 
-#: shell/e-shell-importer.c:507
+#: ../shell/e-shell-importer.c:507
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -15085,31 +15160,31 @@ msgstr ""
 "Importing %s\n"
 "Importing item 1."
 
-#: shell/e-shell-importer.c:583
+#: ../shell/e-shell-importer.c:583
 msgid "Automatic"
 msgstr "Automatic"
 
-#: shell/e-shell-importer.c:639
+#: ../shell/e-shell-importer.c:639
 msgid "F_ilename:"
 msgstr "F_ilename:"
 
-#: shell/e-shell-importer.c:644
+#: ../shell/e-shell-importer.c:644
 msgid "Select a file"
 msgstr "Select a file"
 
-#: shell/e-shell-importer.c:656
+#: ../shell/e-shell-importer.c:656
 msgid "File _type:"
 msgstr "File _type:"
 
-#: shell/e-shell-importer.c:695
+#: ../shell/e-shell-importer.c:695
 msgid "Import data and settings from _older programs"
 msgstr "Import data and settings from _older programs"
 
-#: shell/e-shell-importer.c:698
+#: ../shell/e-shell-importer.c:698
 msgid "Import a _single file"
 msgstr "Import a _single file"
 
-#: shell/e-shell-importer.c:766 shell/e-shell-startup-wizard.c:571
+#: ../shell/e-shell-importer.c:766 ../shell/e-shell-startup-wizard.c:571
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
@@ -15117,41 +15192,41 @@ msgstr ""
 "Please wait...\n"
 "Scanning for existing setups"
 
-#: shell/e-shell-importer.c:773
+#: ../shell/e-shell-importer.c:773
 msgid "Starting Intelligent Importers"
 msgstr "Starting Intelligent Importers"
 
-#: shell/e-shell-importer.c:899 shell/e-shell-startup-wizard.c:700
+#: ../shell/e-shell-importer.c:899 ../shell/e-shell-startup-wizard.c:700
 #, c-format
 msgid "From %s:"
 msgstr "From %s:"
 
-#: shell/e-shell-importer.c:1105
+#: ../shell/e-shell-importer.c:1105
 #, c-format
 msgid "No importer available for file %s"
 msgstr "No importer available for file %s"
 
-#: shell/e-shell-importer.c:1119
+#: ../shell/e-shell-importer.c:1119
 msgid "Unable to execute importer"
 msgstr "Unable to execute importer"
 
-#: shell/e-shell-importer.c:1235
+#: ../shell/e-shell-importer.c:1235
 msgid "_Import"
 msgstr "_Import"
 
-#: shell/e-shell-offline-handler.c:589
+#: ../shell/e-shell-offline-handler.c:589
 msgid "Closing connections..."
 msgstr "Closing connections..."
 
-#: shell/e-shell-settings-dialog.c:318
+#: ../shell/e-shell-settings-dialog.c:318
 msgid "Evolution Settings"
 msgstr "Evolution Settings"
 
-#: shell/e-shell-startup-wizard.c:577
+#: ../shell/e-shell-startup-wizard.c:577
 msgid "Starting import"
 msgstr "Starting import"
 
-#: shell/e-shell-startup-wizard.c:797
+#: ../shell/e-shell-startup-wizard.c:797
 msgid ""
 "If you quit the Evolution Setup Assistant now, all of the information that "
 "you have entered will be forgotten. You will need to run this assistant "
@@ -15165,133 +15240,133 @@ msgstr ""
 "\n"
 "Do you want to quit using the Assistant now?"
 
-#: shell/e-shell-utils.c:116
+#: ../shell/e-shell-utils.c:116
 msgid "No folder name specified."
 msgstr "No folder name specified."
 
-#: shell/e-shell-utils.c:123
+#: ../shell/e-shell-utils.c:123
 msgid "Folder name cannot contain the Return character."
 msgstr "Folder name cannot contain the Return character."
 
-#: shell/e-shell-utils.c:129
+#: ../shell/e-shell-utils.c:129
 msgid "Folder name cannot contain the character \"/\"."
 msgstr "Folder name cannot contain the character \"/\"."
 
-#: shell/e-shell-utils.c:135
+#: ../shell/e-shell-utils.c:135
 msgid "Folder name cannot contain the character \"#\"."
 msgstr "Folder name cannot contain the character \"#\"."
 
-#: shell/e-shell-utils.c:141
+#: ../shell/e-shell-utils.c:141
 msgid "'.' and '..' are reserved folder names."
 msgstr "'.' and '..' are reserved folder names."
 
-#: shell/e-shell-window-commands.c:67
+#: ../shell/e-shell-window-commands.c:69
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr "The GNOME Pilot tools do not appear to be installed on this system."
 
-#: shell/e-shell-window-commands.c:75
+#: ../shell/e-shell-window-commands.c:77
 #, c-format
 msgid "Error executing %s."
 msgstr "Error executing %s."
 
-#: shell/e-shell-window-commands.c:124
+#: ../shell/e-shell-window-commands.c:126
 msgid "Bug buddy is not installed."
 msgstr "Bug buddy is not installed."
 
-#: shell/e-shell-window-commands.c:132
+#: ../shell/e-shell-window-commands.c:134
 msgid "Bug buddy could not be run."
 msgstr "Bug buddy could not be run."
 
 #. The translator-credits string is for translators to list
 #. * per language credits for translation, displayed in the
 #. * about box
-#: shell/e-shell-window-commands.c:426
+#: ../shell/e-shell-window-commands.c:501
 msgid "translator-credits"
 msgstr "Adam Weinberger <adamw@FreeBSD.org>"
 
-#: shell/e-shell-window-commands.c:440
+#: ../shell/e-shell-window-commands.c:515
 msgid "Groupware Suite"
 msgstr "Groupware Suite"
 
-#: shell/e-shell-window-commands.c:681
+#: ../shell/e-shell-window-commands.c:742
 msgid "_Work Online"
 msgstr "_Work Online"
 
-#: shell/e-shell-window-commands.c:694 ui/evolution.xml.h:51
+#: ../shell/e-shell-window-commands.c:755 ../ui/evolution.xml.h:51
 msgid "_Work Offline"
 msgstr "_Work Offline"
 
-#: shell/e-shell-window-commands.c:707 ui/evolution.xml.h:34
+#: ../shell/e-shell-window-commands.c:768 ../ui/evolution.xml.h:34
 msgid "Work Offline"
 msgstr "Work Offline"
 
-#: shell/e-shell-window.c:341
+#: ../shell/e-shell-window.c:341
 msgid "Evolution is currently online.  Click on this button to work offline."
 msgstr "Evolution is currently online.  Click on this button to work offline."
 
-#: shell/e-shell-window.c:349
+#: ../shell/e-shell-window.c:349
 msgid "Evolution is in the process of going offline."
 msgstr "Evolution is in the process of going offline."
 
-#: shell/e-shell-window.c:356
+#: ../shell/e-shell-window.c:356
 msgid "Evolution is currently offline.  Click on this button to work online."
 msgstr "Evolution is currently offline.  Click on this button to work online."
 
-#: shell/e-shell-window.c:708
+#: ../shell/e-shell-window.c:713
 #, c-format
 msgid "Switch to %s"
 msgstr "Switch to %s"
 
-#: shell/e-shell.c:597
+#: ../shell/e-shell.c:598
 msgid "Uknown system error."
 msgstr "Uknown system error."
 
-#: shell/e-shell.c:805 shell/e-shell.c:806
+#: ../shell/e-shell.c:800 ../shell/e-shell.c:801
 #, c-format
 msgid "%ld KB"
 msgstr "%ld KB"
 
-#: shell/e-shell.c:1249 widgets/misc/e-cell-date-edit.c:256
+#: ../shell/e-shell.c:1254 ../widgets/misc/e-cell-date-edit.c:256
 msgid "OK"
 msgstr "OK"
 
-#: shell/e-shell.c:1251
+#: ../shell/e-shell.c:1256
 msgid "Invalid arguments"
 msgstr "Invalid arguments"
 
-#: shell/e-shell.c:1253
+#: ../shell/e-shell.c:1258
 msgid "Cannot register on OAF"
 msgstr "Cannot register on OAF"
 
-#: shell/e-shell.c:1255
+#: ../shell/e-shell.c:1260
 msgid "Configuration Database not found"
 msgstr "Configuration Database not found"
 
-#: shell/e-shell.c:1257
+#: ../shell/e-shell.c:1262
 msgid "Generic error"
 msgstr "Generic error"
 
-#: shell/e-user-creatable-items-handler.c:685
+#: ../shell/e-user-creatable-items-handler.c:685
 msgid "New"
 msgstr "New"
 
-#: shell/evolution-startup-wizard.glade.h:2
+#: ../shell/evolution-startup-wizard.glade.h:2
 msgid "Evolution Setup Assistant"
 msgstr "Evolution Setup Assistant"
 
-#: shell/evolution-startup-wizard.glade.h:3
+#: ../shell/evolution-startup-wizard.glade.h:3
 msgid "Importing Files"
 msgstr "Importing Files"
 
-#: shell/evolution-startup-wizard.glade.h:4
+#: ../shell/evolution-startup-wizard.glade.h:4
 msgid "Timezone "
 msgstr "Timezone "
 
-#: shell/evolution-startup-wizard.glade.h:5
+#: ../shell/evolution-startup-wizard.glade.h:5
 msgid "Welcome"
 msgstr "Welcome"
 
-#: shell/evolution-startup-wizard.glade.h:6
+#: ../shell/evolution-startup-wizard.glade.h:6
 msgid ""
 "Welcome to Evolution. The next few screens will allow Evolution to connect "
 "to your email accounts, and to import files from other applications. \n"
@@ -15303,7 +15378,7 @@ msgstr ""
 "\n"
 "Please click the \"Forward\" button to continue. "
 
-#: shell/evolution-startup-wizard.glade.h:9
+#: ../shell/evolution-startup-wizard.glade.h:9
 msgid ""
 "You have successfully entered all of the information needed to set up "
 "Evolution. \n"
@@ -15315,47 +15390,47 @@ msgstr ""
 "\n"
 "Click the \"Apply\" button to save your settings. "
 
-#: shell/evolution-test-component.c:140
+#: ../shell/evolution-test-component.c:140
 msgid "New Test"
 msgstr "New Test"
 
-#: shell/evolution-test-component.c:141
+#: ../shell/evolution-test-component.c:141
 msgid "_Test"
 msgstr "_Test"
 
-#: shell/evolution-test-component.c:142
+#: ../shell/evolution-test-component.c:142
 msgid "Create a new test item"
 msgstr "Create a new test item"
 
-#: shell/importer/import.glade.h:1
+#: ../shell/importer/import.glade.h:1
 msgid "Click \"Import\" to begin importing the file into Evolution. "
 msgstr "Click \"Import\" to begin importing the file into Evolution. "
 
-#: shell/importer/import.glade.h:2
+#: ../shell/importer/import.glade.h:2
 msgid "Evolution Import Assistant"
 msgstr "Evolution Import Assistant"
 
-#: shell/importer/import.glade.h:3
+#: ../shell/importer/import.glade.h:3
 msgid "Import File"
 msgstr "Import File"
 
-#: shell/importer/import.glade.h:4
+#: ../shell/importer/import.glade.h:4
 msgid "Import Location"
 msgstr "Import Location"
 
-#: shell/importer/import.glade.h:5
+#: ../shell/importer/import.glade.h:5
 msgid "Importer Type"
 msgstr "Importer Type"
 
-#: shell/importer/import.glade.h:6
+#: ../shell/importer/import.glade.h:6
 msgid "Select Importers"
 msgstr "Select Importers"
 
-#: shell/importer/import.glade.h:7
+#: ../shell/importer/import.glade.h:7
 msgid "Select a File"
 msgstr "Select a File"
 
-#: shell/importer/import.glade.h:8
+#: ../shell/importer/import.glade.h:8
 msgid ""
 "Welcome to the Evolution Import Assistant.\n"
 "With this assistant you will be guided through the process of\n"
@@ -15365,28 +15440,28 @@ msgstr ""
 "With this assistant you will be guided through the process of\n"
 "importing external files into Evolution."
 
-#: shell/importer/intelligent.c:193
+#: ../shell/importer/intelligent.c:193
 msgid "Importers"
 msgstr "Importers"
 
-#: shell/importer/intelligent.c:195 smime/gui/smime-ui.glade.h:28
+#: ../shell/importer/intelligent.c:195 ../smime/gui/smime-ui.glade.h:28
 msgid "Import"
 msgstr "Import"
 
-#: shell/importer/intelligent.c:199
+#: ../shell/importer/intelligent.c:199
 msgid "Don't import"
 msgstr "Don't import"
 
-#: shell/importer/intelligent.c:203
+#: ../shell/importer/intelligent.c:203
 msgid "Don't ask me again"
 msgstr "Don't ask me again"
 
-#: shell/importer/intelligent.c:211
+#: ../shell/importer/intelligent.c:211
 msgid "Evolution can import data from the following files:"
 msgstr "Evolution can import data from the following files:"
 
 #. Preview/Alpha/Beta version warning message
-#: shell/main.c:237
+#: ../shell/main.c:238
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -15421,7 +15496,7 @@ msgstr ""
 "We hope that you enjoy the results of our hard work, and we\n"
 "eagerly await your contributions!\n"
 
-#: shell/main.c:261
+#: ../shell/main.c:262
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -15429,39 +15504,39 @@ msgstr ""
 "Thanks\n"
 "The Evolution Team\n"
 
-#: shell/main.c:268
+#: ../shell/main.c:269
 msgid "Don't tell me again"
 msgstr "Don't tell me again"
 
-#: shell/main.c:473
+#: ../shell/main.c:474
 msgid "Start Evolution activating the specified component"
 msgstr "Start Evolution activating the specified component"
 
-#: shell/main.c:477
+#: ../shell/main.c:478
 msgid "Start in online mode"
 msgstr "Start in online mode"
 
-#: shell/main.c:480
+#: ../shell/main.c:481
 msgid "Forcibly shut down all Evolution components"
 msgstr "Forcibly shut down all Evolution components"
 
-#: shell/main.c:484
+#: ../shell/main.c:485
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr "Forcibly re-migrate from Evolution 1.4"
 
-#: shell/main.c:487
+#: ../shell/main.c:488
 msgid "Send the debugging output of all components to a file."
 msgstr "Send the debugging output of all components to a file."
 
-#: shell/main.c:490
+#: ../shell/main.c:491
 msgid "Disable the mono plugin environment."
 msgstr "Disable the mono plugin environment."
 
-#: shell/main.c:493
+#: ../shell/main.c:494
 msgid "Disable loading of any plugins."
 msgstr "Disable loading of any plugins."
 
-#: shell/main.c:524
+#: ../shell/main.c:525
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -15471,12 +15546,12 @@ msgstr ""
 "  Use %s --help for more information.\n"
 
 #. shell:upgrade-nospace primary
-#: shell/shell-errors.xml.h:2
+#: ../shell/shell-errors.xml.h:2
 msgid "Insufficient disk space for upgrade."
 msgstr "Insufficient disk space for upgrade."
 
 #. shell:upgrade-nospace secondary
-#: shell/shell-errors.xml.h:4
+#: ../shell/shell-errors.xml.h:4
 msgid ""
 "Upgrading your data and settings will require upto {0} of disk space, but "
 "you only have {1} available.\n"
@@ -15491,7 +15566,7 @@ msgstr ""
 "can continue."
 
 #. shell:upgrade-failed primary
-#: shell/shell-errors.xml.h:8
+#: ../shell/shell-errors.xml.h:8
 msgid ""
 "Upgrade from previous version failed:\n"
 "{0}"
@@ -15500,7 +15575,7 @@ msgstr ""
 "{0}"
 
 #. shell:upgrade-failed secondary
-#: shell/shell-errors.xml.h:11
+#: ../shell/shell-errors.xml.h:11
 msgid ""
 "{1}\n"
 "\n"
@@ -15512,18 +15587,18 @@ msgstr ""
 "If you choose to continue, you may not have access to some of your old "
 "data.\n"
 
-#: shell/shell-errors.xml.h:15
+#: ../shell/shell-errors.xml.h:15
 msgid "Continue"
 msgstr "Continue"
 
 #. shell:upgrade-remove-1-4 title
 #. shell:upgrade-remove-1-4 primary
-#: shell/shell-errors.xml.h:17 shell/shell-errors.xml.h:19
+#: ../shell/shell-errors.xml.h:17 ../shell/shell-errors.xml.h:19
 msgid "Delete old data from version {0}?"
 msgstr "Delete old data from version {0}?"
 
 #. shell:upgrade-remove-1-4 secondary
-#: shell/shell-errors.xml.h:21
+#: ../shell/shell-errors.xml.h:21
 msgid ""
 "The previous version of evolution stored its data in a different location.\n"
 "\n"
@@ -15539,22 +15614,22 @@ msgstr ""
 "then you may manually remove the contents of \"evolution\" at your "
 "convenience.\n"
 
-#: shell/shell-errors.xml.h:25
+#: ../shell/shell-errors.xml.h:25
 msgid "_Remind Me Later"
 msgstr "_Remind Me Later"
 
-#: shell/shell-errors.xml.h:26
+#: ../shell/shell-errors.xml.h:26
 msgid "_Keep Data"
 msgstr "_Keep Data"
 
 #. shell:upgrade-remove-1-4-confirm title
 #. shell:upgrade-remove-1-4-confirm primary
-#: shell/shell-errors.xml.h:28 shell/shell-errors.xml.h:30
+#: ../shell/shell-errors.xml.h:28 ../shell/shell-errors.xml.h:30
 msgid "Really delete old data?"
 msgstr "Really delete old data?"
 
 #. shell:upgrade-remove-1-4-confirm secondary
-#: shell/shell-errors.xml.h:32
+#: ../shell/shell-errors.xml.h:32
 msgid ""
 "The entire contents of the \"evolution\" directory is about to be be "
 "permanently removed.\n"
@@ -15578,18 +15653,18 @@ msgstr ""
 
 #. shell:noshell title
 #. shell:noshell-reason title
-#: shell/shell-errors.xml.h:39 shell/shell-errors.xml.h:47
+#: ../shell/shell-errors.xml.h:39 ../shell/shell-errors.xml.h:47
 msgid "Cannot start Evolution"
 msgstr "Cannot start Evolution"
 
 #. shell:noshell primary
 #. shell:noshell-reason primary
-#: shell/shell-errors.xml.h:41 shell/shell-errors.xml.h:49
+#: ../shell/shell-errors.xml.h:41 ../shell/shell-errors.xml.h:49
 msgid "Evolution can not start."
 msgstr "Evolution cannot start."
 
 #. shell:noshell secondary
-#: shell/shell-errors.xml.h:43
+#: ../shell/shell-errors.xml.h:43
 msgid ""
 "Your system configuration does not match your Evolution configuration.\n"
 "\n"
@@ -15600,7 +15675,7 @@ msgstr ""
 "Click help for details"
 
 #. shell:noshell-reason secondary
-#: shell/shell-errors.xml.h:51
+#: ../shell/shell-errors.xml.h:51
 msgid ""
 "Your system configuration does not match your Evolution configuration:\n"
 "\n"
@@ -15614,7 +15689,7 @@ msgstr ""
 "\n"
 "Click help for details."
 
-#: smime/gui/ca-trust-dialog.c:96
+#: ../smime/gui/ca-trust-dialog.c:96
 #, c-format
 msgid ""
 "Certificate '%s' is a CA certificate.\n"
@@ -15625,7 +15700,7 @@ msgstr ""
 "\n"
 "Edit trust settings:"
 
-#: smime/gui/cert-trust-dialog.c:145
+#: ../smime/gui/cert-trust-dialog.c:145
 msgid ""
 "Because you trust the certificate authority that issued this certificate, "
 "then you trust the authenticity of this certificate unless otherwise "
@@ -15635,7 +15710,7 @@ msgstr ""
 "you then trust the authenticity of this certificate unless otherwise "
 "indicated here"
 
-#: smime/gui/cert-trust-dialog.c:149
+#: ../smime/gui/cert-trust-dialog.c:149
 msgid ""
 "Because you do not trust the certificate authority that issued this "
 "certificate, then you do not trust the authenticity of this certificate "
@@ -15645,55 +15720,60 @@ msgstr ""
 "certificate, you then do not trust the authenticity of this certificate "
 "unless otherwise indicated here"
 
-#: smime/gui/certificate-manager.c:134 smime/gui/certificate-manager.c:142
-#: smime/gui/certificate-manager.c:375 smime/gui/certificate-manager.c:383
-#: smime/gui/certificate-manager.c:595 smime/gui/certificate-manager.c:603
+#: ../smime/gui/certificate-manager.c:134
+#: ../smime/gui/certificate-manager.c:142
+#: ../smime/gui/certificate-manager.c:377
+#: ../smime/gui/certificate-manager.c:385
+#: ../smime/gui/certificate-manager.c:597
+#: ../smime/gui/certificate-manager.c:605
 msgid "Select a cert to import..."
 msgstr "Select a cert to import..."
 
-#: smime/gui/certificate-manager.c:263 smime/gui/certificate-manager.c:472
-#: smime/gui/certificate-manager.c:690
+#: ../smime/gui/certificate-manager.c:265
+#: ../smime/gui/certificate-manager.c:474
+#: ../smime/gui/certificate-manager.c:692
 msgid "Certificate Name"
 msgstr "Certificate Name"
 
-#: smime/gui/certificate-manager.c:272 smime/gui/certificate-manager.c:490
+#: ../smime/gui/certificate-manager.c:274
+#: ../smime/gui/certificate-manager.c:492
 msgid "Purposes"
 msgstr "Purposes"
 
-#: smime/gui/certificate-manager.c:281 smime/gui/smime-ui.glade.h:36
-#: smime/lib/e-cert.c:569
+#: ../smime/gui/certificate-manager.c:283 ../smime/gui/smime-ui.glade.h:36
+#: ../smime/lib/e-cert.c:569
 msgid "Serial Number"
 msgstr "Serial Number"
 
-#: smime/gui/certificate-manager.c:289
+#: ../smime/gui/certificate-manager.c:291
 msgid "Expires"
 msgstr "Expires"
 
-#: smime/gui/certificate-manager.c:481
+#: ../smime/gui/certificate-manager.c:483
 msgid "E-Mail Address"
 msgstr "E-Mail Address"
 
-#: smime/gui/certificate-viewer.c:334
+#: ../smime/gui/certificate-viewer.c:334
 #, c-format
 msgid "Certificate Viewer: %s"
 msgstr "Certificate Viewer: %s"
 
-#: smime/gui/component.c:45
+#: ../smime/gui/component.c:45
 #, c-format
 msgid "Enter the password for `%s'"
 msgstr "Enter the password for `%s'"
 
 #. we're setting the password initially
-#: smime/gui/component.c:68
+#: ../smime/gui/component.c:68
 msgid "Enter new password for certificate database"
 msgstr "Enter new password for certificate database"
 
-#: smime/gui/component.c:70
+#: ../smime/gui/component.c:70
 msgid "Enter new password"
 msgstr "Enter new password"
 
 #. FIXME: add serial no, validity date, uses
-#: smime/gui/e-cert-selector.c:119
+#: ../smime/gui/e-cert-selector.c:119
 #, c-format
 msgid ""
 "Issued to:\n"
@@ -15702,7 +15782,7 @@ msgstr ""
 "Issued to:\n"
 "  Subject: %s\n"
 
-#: smime/gui/e-cert-selector.c:120
+#: ../smime/gui/e-cert-selector.c:120
 #, c-format
 msgid ""
 "Issued by:\n"
@@ -15711,59 +15791,59 @@ msgstr ""
 "Issued by:\n"
 "  Subject: %s\n"
 
-#: smime/gui/e-cert-selector.c:167
+#: ../smime/gui/e-cert-selector.c:167
 msgid "Select certificate"
 msgstr "Select certificate"
 
-#: smime/gui/smime-ui.glade.h:1
+#: ../smime/gui/smime-ui.glade.h:1
 msgid "<Not Part of Certificate>"
 msgstr "<Not Part of Certificate>"
 
-#: smime/gui/smime-ui.glade.h:2
+#: ../smime/gui/smime-ui.glade.h:2
 msgid "<b>Certificate Fields</b>"
 msgstr "<b>Certificate Fields</b>"
 
-#: smime/gui/smime-ui.glade.h:3
+#: ../smime/gui/smime-ui.glade.h:3
 msgid "<b>Certificate Hierarchy</b>"
 msgstr "<b>Certificate Hierarchy</b>"
 
-#: smime/gui/smime-ui.glade.h:4
+#: ../smime/gui/smime-ui.glade.h:4
 msgid "<b>Field Value</b>"
 msgstr "<b>Field Value</b>"
 
-#: smime/gui/smime-ui.glade.h:5
+#: ../smime/gui/smime-ui.glade.h:5
 msgid "<b>Fingerprints</b>"
 msgstr "<b>Fingerprints</b>"
 
-#: smime/gui/smime-ui.glade.h:6
+#: ../smime/gui/smime-ui.glade.h:6
 msgid "<b>Issued By</b>"
 msgstr "<b>Issued By</b>"
 
-#: smime/gui/smime-ui.glade.h:7
+#: ../smime/gui/smime-ui.glade.h:7
 msgid "<b>Issued To</b>"
 msgstr "<b>Issued To</b>"
 
-#: smime/gui/smime-ui.glade.h:8
+#: ../smime/gui/smime-ui.glade.h:8
 msgid "<b>This certificate has been verified for the following uses:</b>"
 msgstr "<b>This certificate has been verified for the following uses:</b>"
 
-#: smime/gui/smime-ui.glade.h:9
+#: ../smime/gui/smime-ui.glade.h:9
 msgid "<b>Validity</b>"
 msgstr "<b>Validity</b>"
 
-#: smime/gui/smime-ui.glade.h:10
+#: ../smime/gui/smime-ui.glade.h:10
 msgid "Authorities"
 msgstr "Authorities"
 
-#: smime/gui/smime-ui.glade.h:11
+#: ../smime/gui/smime-ui.glade.h:11
 msgid "Backup"
 msgstr "Backup"
 
-#: smime/gui/smime-ui.glade.h:12
+#: ../smime/gui/smime-ui.glade.h:12
 msgid "Backup All"
 msgstr "Backup All"
 
-#: smime/gui/smime-ui.glade.h:13
+#: ../smime/gui/smime-ui.glade.h:13
 msgid ""
 "Before trusting this CA for any purpose, you should examine its certificate "
 "and its policy and procedures (if available)."
@@ -15771,1750 +15851,1753 @@ msgstr ""
 "Before trusting this CA for any purpose, you should examine its certificate "
 "and its policy and procedures (if available)."
 
-#: smime/gui/smime-ui.glade.h:14 smime/lib/e-cert.c:1076
+#: ../smime/gui/smime-ui.glade.h:14 ../smime/lib/e-cert.c:1076
 msgid "Certificate"
 msgstr "Certificate"
 
-#: smime/gui/smime-ui.glade.h:15
+#: ../smime/gui/smime-ui.glade.h:15
 msgid "Certificate Authority Trust"
 msgstr "Certificate Authority Trust"
 
-#: smime/gui/smime-ui.glade.h:16
+#: ../smime/gui/smime-ui.glade.h:16
 msgid "Certificate details"
 msgstr "Certificate details"
 
-#: smime/gui/smime-ui.glade.h:17
+#: ../smime/gui/smime-ui.glade.h:17
 msgid "Common Name (CN)"
 msgstr "Common Name (CN)"
 
-#: smime/gui/smime-ui.glade.h:18
+#: ../smime/gui/smime-ui.glade.h:18
 msgid "Contact Certificates"
 msgstr "Contact Certificates"
 
-#: smime/gui/smime-ui.glade.h:20
+#: ../smime/gui/smime-ui.glade.h:20
 msgid "Do not trust the authenticity of this certificate"
 msgstr "Do not trust the authenticity of this certificate"
 
-#: smime/gui/smime-ui.glade.h:21
+#: ../smime/gui/smime-ui.glade.h:21
 msgid "Dummy window only"
 msgstr "Dummy window only"
 
-#: smime/gui/smime-ui.glade.h:22
+#: ../smime/gui/smime-ui.glade.h:22
 msgid "Edit"
 msgstr "Edit"
 
-#: smime/gui/smime-ui.glade.h:23
+#: ../smime/gui/smime-ui.glade.h:23
 msgid "Email Certificate Trust Settings"
 msgstr "Email Certificate Trust Settings"
 
-#: smime/gui/smime-ui.glade.h:24
+#: ../smime/gui/smime-ui.glade.h:24
 msgid "Email Recipient Certificate"
 msgstr "Email Recipient Certificate"
 
-#: smime/gui/smime-ui.glade.h:25
+#: ../smime/gui/smime-ui.glade.h:25
 msgid "Email Signer Certificate"
 msgstr "Email Signer Certificate"
 
-#: smime/gui/smime-ui.glade.h:26
+#: ../smime/gui/smime-ui.glade.h:26
 msgid "Expires On"
 msgstr "Expires On"
 
-#: smime/gui/smime-ui.glade.h:29
+#: ../smime/gui/smime-ui.glade.h:29
 msgid "Issued On"
 msgstr "Issued On"
 
-#: smime/gui/smime-ui.glade.h:30
+#: ../smime/gui/smime-ui.glade.h:30
 msgid "MD5 Fingerprint"
 msgstr "MD5 Fingerprint"
 
-#: smime/gui/smime-ui.glade.h:31
+#: ../smime/gui/smime-ui.glade.h:31
 msgid "Organization (O)"
 msgstr "Organization (O)"
 
-#: smime/gui/smime-ui.glade.h:32
+#: ../smime/gui/smime-ui.glade.h:32
 msgid "Organizational Unit (OU)"
 msgstr "Organizational Unit (OU)"
 
-#: smime/gui/smime-ui.glade.h:33
+#: ../smime/gui/smime-ui.glade.h:33
 msgid "SHA1 Fingerprint"
 msgstr "SHA1 Fingerprint"
 
-#: smime/gui/smime-ui.glade.h:34 smime/lib/e-cert.c:818
+#: ../smime/gui/smime-ui.glade.h:34 ../smime/lib/e-cert.c:818
 msgid "SSL Client Certificate"
 msgstr "SSL Client Certificate"
 
-#: smime/gui/smime-ui.glade.h:35 smime/lib/e-cert.c:822
+#: ../smime/gui/smime-ui.glade.h:35 ../smime/lib/e-cert.c:822
 msgid "SSL Server Certificate"
 msgstr "SSL Server Certificate"
 
-#: smime/gui/smime-ui.glade.h:37
+#: ../smime/gui/smime-ui.glade.h:37
 msgid "Trust the authenticity of this certificate"
 msgstr "Trust the authenticity of this certificate"
 
-#: smime/gui/smime-ui.glade.h:38
+#: ../smime/gui/smime-ui.glade.h:38
 msgid "Trust this CA to identify email users."
 msgstr "Trust this CA to identify email users."
 
-#: smime/gui/smime-ui.glade.h:39
+#: ../smime/gui/smime-ui.glade.h:39
 msgid "Trust this CA to identify software developers."
 msgstr "Trust this CA to identify software developers."
 
-#: smime/gui/smime-ui.glade.h:40
+#: ../smime/gui/smime-ui.glade.h:40
 msgid "Trust this CA to identify web sites."
 msgstr "Trust this CA to identify web sites."
 
-#: smime/gui/smime-ui.glade.h:41
+#: ../smime/gui/smime-ui.glade.h:41
 msgid "View"
 msgstr "View"
 
-#: smime/gui/smime-ui.glade.h:42
+#: ../smime/gui/smime-ui.glade.h:42
 msgid "You have certificates from these organizations that identify you:"
 msgstr "You have certificates from these organizations that identify you:"
 
-#: smime/gui/smime-ui.glade.h:43
+#: ../smime/gui/smime-ui.glade.h:43
 msgid ""
 "You have certificates on file that identify these certificate authorities:"
 msgstr ""
 "You have certificates on file that identify these certificate authorities:"
 
-#: smime/gui/smime-ui.glade.h:44
+#: ../smime/gui/smime-ui.glade.h:44
 msgid "You have certificates on file that identify these people:"
 msgstr "You have certificates on file that identify these people:"
 
-#: smime/gui/smime-ui.glade.h:45
+#: ../smime/gui/smime-ui.glade.h:45
 msgid "Your Certificates"
 msgstr "Your Certificates"
 
-#: smime/gui/smime-ui.glade.h:46
+#: ../smime/gui/smime-ui.glade.h:46
 msgid "_Edit CA Trust"
 msgstr "_Edit CA Trust"
 
-#: smime/gui/smime-ui.glade.h:48
+#: ../smime/gui/smime-ui.glade.h:48
 msgid "dialog1"
 msgstr "dialogue1"
 
 #. XXX we shouldn't be popping up dialogs in this code.
-#: smime/lib/e-cert-db.c:612
+#: ../smime/lib/e-cert-db.c:612
 msgid "Certificate already exists"
 msgstr "Certificate already exists"
 
-#: smime/lib/e-cert.c:238 smime/lib/e-cert.c:248
+#: ../smime/lib/e-cert.c:238 ../smime/lib/e-cert.c:248
 msgid "%d/%m/%Y"
 msgstr "%d/%m/%Y"
 
 #. x509 certificate usage types
-#: smime/lib/e-cert.c:424
+#: ../smime/lib/e-cert.c:424
 msgid "Sign"
 msgstr "Sign"
 
-#: smime/lib/e-cert.c:425
+#: ../smime/lib/e-cert.c:425
 msgid "Encrypt"
 msgstr "Encrypt"
 
-#: smime/lib/e-cert.c:530
+#: ../smime/lib/e-cert.c:530
 msgid "Version"
 msgstr "Version"
 
-#: smime/lib/e-cert.c:545
+#: ../smime/lib/e-cert.c:545
 msgid "Version 1"
 msgstr "Version 1"
 
-#: smime/lib/e-cert.c:548
+#: ../smime/lib/e-cert.c:548
 msgid "Version 2"
 msgstr "Version 2"
 
-#: smime/lib/e-cert.c:551
+#: ../smime/lib/e-cert.c:551
 msgid "Version 3"
 msgstr "Version 3"
 
-#: smime/lib/e-cert.c:633
+#: ../smime/lib/e-cert.c:633
 msgid "PKCS #1 MD2 With RSA Encryption"
 msgstr "PKCS #1 MD2 With RSA Encryption"
 
-#: smime/lib/e-cert.c:636
+#: ../smime/lib/e-cert.c:636
 msgid "PKCS #1 MD5 With RSA Encryption"
 msgstr "PKCS #1 MD5 With RSA Encryption"
 
-#: smime/lib/e-cert.c:639
+#: ../smime/lib/e-cert.c:639
 msgid "PKCS #1 SHA-1 With RSA Encryption"
 msgstr "PKCS #1 SHA-1 With RSA Encryption"
 
-#: smime/lib/e-cert.c:642
+#: ../smime/lib/e-cert.c:642
 msgid "C"
 msgstr "C"
 
-#: smime/lib/e-cert.c:645
+#: ../smime/lib/e-cert.c:645
 msgid "CN"
 msgstr "CN"
 
-#: smime/lib/e-cert.c:648
+#: ../smime/lib/e-cert.c:648
 msgid "OU"
 msgstr "OU"
 
-#: smime/lib/e-cert.c:651
+#: ../smime/lib/e-cert.c:651
 msgid "O"
 msgstr "O"
 
-#: smime/lib/e-cert.c:654
+#: ../smime/lib/e-cert.c:654
 msgid "L"
 msgstr "L"
 
-#: smime/lib/e-cert.c:657
+#: ../smime/lib/e-cert.c:657
 msgid "DN"
 msgstr "DN"
 
-#: smime/lib/e-cert.c:660
+#: ../smime/lib/e-cert.c:660
 msgid "DC"
 msgstr "DC"
 
-#: smime/lib/e-cert.c:663
+#: ../smime/lib/e-cert.c:663
 msgid "ST"
 msgstr "ST"
 
-#: smime/lib/e-cert.c:666
+#: ../smime/lib/e-cert.c:666
 msgid "PKCS #1 RSA Encryption"
 msgstr "PKCS #1 RSA Encryption"
 
-#: smime/lib/e-cert.c:669
+#: ../smime/lib/e-cert.c:669
 msgid "Certificate Key Usage"
 msgstr "Certificate Key Usage"
 
-#: smime/lib/e-cert.c:672
+#: ../smime/lib/e-cert.c:672
 msgid "Netscape Certificate Type"
 msgstr "Netscape Certificate Type"
 
-#: smime/lib/e-cert.c:675
+#: ../smime/lib/e-cert.c:675
 msgid "Certificate Authority Key Identifier"
 msgstr "Certificate Authority Key Identifier"
 
-#: smime/lib/e-cert.c:678
+#: ../smime/lib/e-cert.c:678
 msgid "UID"
 msgstr "UID"
 
-#: smime/lib/e-cert.c:687
+#: ../smime/lib/e-cert.c:687
 #, c-format
 msgid "Object Identifier (%s)"
 msgstr "Object Identifier (%s)"
 
-#: smime/lib/e-cert.c:738
+#: ../smime/lib/e-cert.c:738
 msgid "Algorithm Identifier"
 msgstr "Algorithm Identifier"
 
-#: smime/lib/e-cert.c:746
+#: ../smime/lib/e-cert.c:746
 msgid "Algorithm Parameters"
 msgstr "Algorithm Parameters"
 
-#: smime/lib/e-cert.c:768
+#: ../smime/lib/e-cert.c:768
 msgid "Subject Public Key Info"
 msgstr "Subject Public Key Info"
 
-#: smime/lib/e-cert.c:773
+#: ../smime/lib/e-cert.c:773
 msgid "Subject Public Key Algorithm"
 msgstr "Subject Public Key Algorithm"
 
-#: smime/lib/e-cert.c:788
+#: ../smime/lib/e-cert.c:788
 msgid "Subject's Public Key"
 msgstr "Subject's Public Key"
 
-#: smime/lib/e-cert.c:809 smime/lib/e-cert.c:858
+#: ../smime/lib/e-cert.c:809 ../smime/lib/e-cert.c:858
 msgid "Error: Unable to process extension"
 msgstr "Error: Unable to process extension"
 
-#: smime/lib/e-cert.c:830 smime/lib/e-cert.c:842
+#: ../smime/lib/e-cert.c:830 ../smime/lib/e-cert.c:842
 msgid "Object Signer"
 msgstr "Object Signer"
 
-#: smime/lib/e-cert.c:834
+#: ../smime/lib/e-cert.c:834
 msgid "SSL Certificate Authority"
 msgstr "SSL Certificate Authority"
 
-#: smime/lib/e-cert.c:838
+#: ../smime/lib/e-cert.c:838
 msgid "Email Certificate Authority"
 msgstr "Email Certificate Authority"
 
-#: smime/lib/e-cert.c:866
+#: ../smime/lib/e-cert.c:866
 msgid "Signing"
 msgstr "Signing"
 
-#: smime/lib/e-cert.c:870
+#: ../smime/lib/e-cert.c:870
 msgid "Non-repudiation"
 msgstr "Non-repudiation"
 
-#: smime/lib/e-cert.c:874
+#: ../smime/lib/e-cert.c:874
 msgid "Key Encipherment"
 msgstr "Key Encipherment"
 
-#: smime/lib/e-cert.c:878
+#: ../smime/lib/e-cert.c:878
 msgid "Data Encipherment"
 msgstr "Data Encipherment"
 
-#: smime/lib/e-cert.c:882
+#: ../smime/lib/e-cert.c:882
 msgid "Key Agreement"
 msgstr "Key Agreement"
 
-#: smime/lib/e-cert.c:886
+#: ../smime/lib/e-cert.c:886
 msgid "Certificate Signer"
 msgstr "Certificate Signer"
 
-#: smime/lib/e-cert.c:890
+#: ../smime/lib/e-cert.c:890
 msgid "CRL Signer"
 msgstr "CRL Signer"
 
-#: smime/lib/e-cert.c:938
+#: ../smime/lib/e-cert.c:938
 msgid "Critical"
 msgstr "Critical"
 
-#: smime/lib/e-cert.c:940 smime/lib/e-cert.c:943
+#: ../smime/lib/e-cert.c:940 ../smime/lib/e-cert.c:943
 msgid "Not Critical"
 msgstr "Not Critical"
 
-#: smime/lib/e-cert.c:964
+#: ../smime/lib/e-cert.c:964
 msgid "Extensions"
 msgstr "Extensions"
 
-#: smime/lib/e-cert.c:1035
+#: ../smime/lib/e-cert.c:1035
 #, c-format
 msgid "%s = %s"
 msgstr "%s = %s"
 
-#: smime/lib/e-cert.c:1091 smime/lib/e-cert.c:1211
+#: ../smime/lib/e-cert.c:1091 ../smime/lib/e-cert.c:1211
 msgid "Certificate Signature Algorithm"
 msgstr "Certificate Signature Algorithm"
 
-#: smime/lib/e-cert.c:1100
+#: ../smime/lib/e-cert.c:1100
 msgid "Issuer"
 msgstr "Issuer"
 
-#: smime/lib/e-cert.c:1154
+#: ../smime/lib/e-cert.c:1154
 msgid "Issuer Unique ID"
 msgstr "Issuer Unique ID"
 
-#: smime/lib/e-cert.c:1173
+#: ../smime/lib/e-cert.c:1173
 msgid "Subject Unique ID"
 msgstr "Subject Unique ID"
 
-#: smime/lib/e-cert.c:1216
+#: ../smime/lib/e-cert.c:1216
 msgid "Certificate Signature Value"
 msgstr "Certificate Signature Value"
 
-#: smime/lib/e-pkcs12.c:264
+#: ../smime/lib/e-pkcs12.c:264
 msgid "PKCS12 File Password"
 msgstr "PKCS12 File Password"
 
-#: smime/lib/e-pkcs12.c:264
+#: ../smime/lib/e-pkcs12.c:264
 msgid "Enter password for PKCS12 file:"
 msgstr "Enter password for PKCS12 file:"
 
-#: smime/lib/e-pkcs12.c:363
+#: ../smime/lib/e-pkcs12.c:363
 msgid "Imported Certificate"
 msgstr "Imported Certificate"
 
-#: tools/evolution-launch-composer.c:324
+#: ../tools/evolution-launch-composer.c:324
 msgid "An attachment to add."
 msgstr "An attachment to add."
 
-#: tools/evolution-launch-composer.c:325
+#: ../tools/evolution-launch-composer.c:325
 msgid "Content type of the attachment."
 msgstr "Content type of the attachment."
 
-#: tools/evolution-launch-composer.c:326
+#: ../tools/evolution-launch-composer.c:326
 msgid "The filename to display in the mail."
 msgstr "The filename to display in the mail."
 
-#: tools/evolution-launch-composer.c:327
+#: ../tools/evolution-launch-composer.c:327
 msgid "Description of the attachment."
 msgstr "Description of the attachment."
 
-#: tools/evolution-launch-composer.c:328
+#: ../tools/evolution-launch-composer.c:328
 msgid "Mark attachment to be shown inline by default."
 msgstr "Mark attachment to be shown inline by default."
 
-#: tools/evolution-launch-composer.c:329
+#: ../tools/evolution-launch-composer.c:329
 msgid "Default subject for the message."
 msgstr "Default subject for the message."
 
 #. This most likely means that KILL_PROCESS_CMD wasn't
 #. * found, so just bail completely.
 #.
-#: tools/killev.c:61
+#: ../tools/killev.c:61
 #, c-format
 msgid "Could not execute '%s': %s\n"
 msgstr "Could not execute '%s': %s\n"
 
-#: tools/killev.c:76
+#: ../tools/killev.c:76
 #, c-format
 msgid "Shutting down %s (%s)\n"
 msgstr "Shutting down %s (%s)\n"
 
-#: ui/evolution-addressbook.xml.h:3
+#: ../ui/evolution-addressbook.xml.h:3
 msgid "Copy Contact(s) to Another Folder..."
 msgstr "Copy Contact(s) to Another Folder..."
 
-#: ui/evolution-addressbook.xml.h:4 ui/evolution-calendar.xml.h:2
+#: ../ui/evolution-addressbook.xml.h:4 ../ui/evolution-calendar.xml.h:2
 msgid "Copy the selection"
 msgstr "Copy the selection"
 
-#: ui/evolution-addressbook.xml.h:5
+#: ../ui/evolution-addressbook.xml.h:5
 msgid "Copy to Folder..."
 msgstr "Copy to Folder..."
 
-#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:3
+#: ../ui/evolution-addressbook.xml.h:7 ../ui/evolution-calendar.xml.h:3
 msgid "Cut the selection"
 msgstr "Cut the selection"
 
-#: ui/evolution-addressbook.xml.h:9
+#: ../ui/evolution-addressbook.xml.h:9
 msgid "Delete selected contacts"
 msgstr "Delete selected contacts"
 
-#: ui/evolution-addressbook.xml.h:11
+#: ../ui/evolution-addressbook.xml.h:11
 msgid "Move Contact(s) to Another Folder..."
 msgstr "Move Contact(s) to Another Folder..."
 
-#: ui/evolution-addressbook.xml.h:12
+#: ../ui/evolution-addressbook.xml.h:12
 msgid "Move to Folder..."
 msgstr "Move to Folder..."
 
-#: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:16
+#: ../ui/evolution-addressbook.xml.h:14 ../ui/evolution-calendar.xml.h:16
 msgid "Paste the clipboard"
 msgstr "Paste the clipboard"
 
-#: ui/evolution-addressbook.xml.h:15
+#: ../ui/evolution-addressbook.xml.h:15
 msgid "Previews the contacts to be printed"
 msgstr "Previews the contacts to be printed"
 
-#: ui/evolution-addressbook.xml.h:17 ui/evolution-calendar.xml.h:20
-#: ui/evolution-mail-message.xml.h:81 ui/evolution-tasks.xml.h:15
+#: ../ui/evolution-addressbook.xml.h:17 ../ui/evolution-calendar.xml.h:20
+#: ../ui/evolution-mail-message.xml.h:81 ../ui/evolution-tasks.xml.h:15
 msgid "Print Pre_view"
 msgstr "Print Pre_view"
 
-#: ui/evolution-addressbook.xml.h:18
+#: ../ui/evolution-addressbook.xml.h:18
 msgid "Print selected contacts"
 msgstr "Print selected contacts"
 
-#: ui/evolution-addressbook.xml.h:20
+#: ../ui/evolution-addressbook.xml.h:20
 msgid "Save selected contacts as a VCard."
 msgstr "Save selected contacts as a VCard."
 
-#: ui/evolution-addressbook.xml.h:21
+#: ../ui/evolution-addressbook.xml.h:21
 msgid "Select All"
 msgstr "Select All"
 
-#: ui/evolution-addressbook.xml.h:22
+#: ../ui/evolution-addressbook.xml.h:22
 msgid "Select all contacts"
 msgstr "Select all contacts"
 
-#: ui/evolution-addressbook.xml.h:23
+#: ../ui/evolution-addressbook.xml.h:23
 msgid "Send a message to the selected contacts."
 msgstr "Send a message to the selected contacts."
 
-#: ui/evolution-addressbook.xml.h:24
+#: ../ui/evolution-addressbook.xml.h:24
 msgid "Send message to contact"
 msgstr "Send message to contact"
 
-#: ui/evolution-addressbook.xml.h:25
+#: ../ui/evolution-addressbook.xml.h:25
 msgid "Send selected contacts to another person."
 msgstr "Send selected contacts to another person."
 
-#: ui/evolution-addressbook.xml.h:26
+#: ../ui/evolution-addressbook.xml.h:26
 msgid "Show contact preview window"
 msgstr "Show contact preview window"
 
-#: ui/evolution-addressbook.xml.h:27
+#: ../ui/evolution-addressbook.xml.h:27
 msgid "Stop"
 msgstr "Stop"
 
-#: ui/evolution-addressbook.xml.h:28
+#: ../ui/evolution-addressbook.xml.h:28
 msgid "Stop Loading"
 msgstr "Stop Loading"
 
-#: ui/evolution-addressbook.xml.h:29
+#: ../ui/evolution-addressbook.xml.h:29
 msgid "View the current contact"
 msgstr "View the current contact"
 
-#: ui/evolution-addressbook.xml.h:30 ui/evolution-calendar.xml.h:38
-#: ui/evolution-mail-global.xml.h:14 ui/evolution-mail-list.xml.h:23
-#: ui/evolution-mail-message.xml.h:103
-#: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-tasks.xml.h:19
-#: ui/evolution.xml.h:36
+#: ../ui/evolution-addressbook.xml.h:30 ../ui/evolution-calendar.xml.h:38
+#: ../ui/evolution-mail-global.xml.h:14 ../ui/evolution-mail-list.xml.h:23
+#: ../ui/evolution-mail-message.xml.h:103
+#: ../ui/evolution-mail-messagedisplay.xml.h:4 ../ui/evolution-tasks.xml.h:19
+#: ../ui/evolution.xml.h:36
 msgid "_Actions"
 msgstr "_Actions"
 
-#: ui/evolution-addressbook.xml.h:35
+#: ../ui/evolution-addressbook.xml.h:35
 msgid "_Forward Contact..."
 msgstr "_Forward Contact..."
 
-#: ui/evolution-addressbook.xml.h:36
+#: ../ui/evolution-addressbook.xml.h:36
 msgid "_Move to Folder..."
 msgstr "_Move to Folder..."
 
-#: ui/evolution-addressbook.xml.h:39 ui/evolution-mail-global.xml.h:16
+#: ../ui/evolution-addressbook.xml.h:39 ../ui/evolution-mail-global.xml.h:16
 msgid "_Preview Pane"
 msgstr "_Preview Pane"
 
-#: ui/evolution-addressbook.xml.h:41
+#: ../ui/evolution-addressbook.xml.h:41
 msgid "_Save as VCard..."
 msgstr "_Save as VCard..."
 
-#: ui/evolution-addressbook.xml.h:42
+#: ../ui/evolution-addressbook.xml.h:42
 msgid "_Select All"
 msgstr "_Select All"
 
-#: ui/evolution-addressbook.xml.h:43
+#: ../ui/evolution-addressbook.xml.h:43
 msgid "_Send Message to Contact..."
 msgstr "_Send Message to Contact..."
 
-#: ui/evolution-calendar.xml.h:4
+#: ../ui/evolution-calendar.xml.h:4
 msgid "Day"
 msgstr "Day"
 
-#: ui/evolution-calendar.xml.h:6
+#: ../ui/evolution-calendar.xml.h:6
 msgid "Delete All Occurrences"
 msgstr "Delete All Occurrences"
 
-#: ui/evolution-calendar.xml.h:7
+#: ../ui/evolution-calendar.xml.h:7
 msgid "Delete the appointment"
 msgstr "Delete the appointment"
 
-#: ui/evolution-calendar.xml.h:8
+#: ../ui/evolution-calendar.xml.h:8
 msgid "Delete this Occurrence"
 msgstr "Delete this Occurrence"
 
-#: ui/evolution-calendar.xml.h:9
+#: ../ui/evolution-calendar.xml.h:9
 msgid "Delete this occurrence"
 msgstr "Delete this occurrence"
 
-#: ui/evolution-calendar.xml.h:10
+#: ../ui/evolution-calendar.xml.h:10
 msgid "Go To"
 msgstr "Go To"
 
-#: ui/evolution-calendar.xml.h:11
+#: ../ui/evolution-calendar.xml.h:11
 msgid "Go back"
 msgstr "Go back"
 
-#: ui/evolution-calendar.xml.h:12
+#: ../ui/evolution-calendar.xml.h:12
 msgid "Go forward"
 msgstr "Go forward"
 
-#: ui/evolution-calendar.xml.h:13
+#: ../ui/evolution-calendar.xml.h:13
 msgid "List"
 msgstr "List"
 
-#: ui/evolution-calendar.xml.h:14
+#: ../ui/evolution-calendar.xml.h:14
 msgid "Month"
 msgstr "Month"
 
-#: ui/evolution-calendar.xml.h:15 ui/evolution-mail-message.xml.h:65
+#: ../ui/evolution-calendar.xml.h:15 ../ui/evolution-mail-message.xml.h:65
 msgid "Next"
 msgstr "Next"
 
-#: ui/evolution-calendar.xml.h:17
+#: ../ui/evolution-calendar.xml.h:17
 msgid "Previews the calendar to be printed"
 msgstr "Previews the calendar to be printed"
 
-#: ui/evolution-calendar.xml.h:18 ui/evolution-mail-message.xml.h:79
+#: ../ui/evolution-calendar.xml.h:18 ../ui/evolution-mail-message.xml.h:79
 msgid "Previous"
 msgstr "Previous"
 
-#: ui/evolution-calendar.xml.h:21
+#: ../ui/evolution-calendar.xml.h:21
 msgid "Print this calendar"
 msgstr "Print this calendar"
 
-#: ui/evolution-calendar.xml.h:22
+#: ../ui/evolution-calendar.xml.h:22
 msgid "Publish Free/Busy information for this calendar"
 msgstr "Publish Free/Busy information for this calendar"
 
-#: ui/evolution-calendar.xml.h:23 ui/evolution-tasks.xml.h:17
+#: ../ui/evolution-calendar.xml.h:23 ../ui/evolution-tasks.xml.h:17
 msgid "Purg_e"
 msgstr "Purg_e"
 
-#: ui/evolution-calendar.xml.h:24
+#: ../ui/evolution-calendar.xml.h:24
 msgid "Purge old appointments and meetings"
 msgstr "Purge old appointments and meetings"
 
-#: ui/evolution-calendar.xml.h:25
+#: ../ui/evolution-calendar.xml.h:25
 msgid "Select _Date"
 msgstr "Select _Date"
 
-#: ui/evolution-calendar.xml.h:27
+#: ../ui/evolution-calendar.xml.h:27
 msgid "Select a specific date"
 msgstr "Select a specific date"
 
-#: ui/evolution-calendar.xml.h:28
+#: ../ui/evolution-calendar.xml.h:28
 msgid "Select today"
 msgstr "Select today"
 
-#: ui/evolution-calendar.xml.h:29
+#: ../ui/evolution-calendar.xml.h:29
 msgid "Show as list"
 msgstr "Show as list"
 
-#: ui/evolution-calendar.xml.h:30
+#: ../ui/evolution-calendar.xml.h:30
 msgid "Show one day"
 msgstr "Show one day"
 
-#: ui/evolution-calendar.xml.h:31
+#: ../ui/evolution-calendar.xml.h:31
 msgid "Show one month"
 msgstr "Show one month"
 
-#: ui/evolution-calendar.xml.h:32
+#: ../ui/evolution-calendar.xml.h:32
 msgid "Show one week"
 msgstr "Show one week"
 
-#: ui/evolution-calendar.xml.h:33
+#: ../ui/evolution-calendar.xml.h:33
 msgid "Show the working week"
 msgstr "Show the working week"
 
-#: ui/evolution-calendar.xml.h:35
+#: ../ui/evolution-calendar.xml.h:35
 msgid "View the current appointment"
 msgstr "View the current appointment"
 
-#: ui/evolution-calendar.xml.h:36
+#: ../ui/evolution-calendar.xml.h:36
 msgid "Week"
 msgstr "Week"
 
-#: ui/evolution-calendar.xml.h:37
+#: ../ui/evolution-calendar.xml.h:37
 msgid "Work Week"
 msgstr "Work Week"
 
-#: ui/evolution-calendar.xml.h:42
+#: ../ui/evolution-calendar.xml.h:42
 msgid "_Open Appointment"
 msgstr "_Open Appointment"
 
-#: ui/evolution-composer-entries.xml.h:1
+#: ../ui/evolution-composer-entries.xml.h:1
 msgid "Copy selected text to the clipboard"
 msgstr "Copy selected text to the clipboard"
 
-#: ui/evolution-composer-entries.xml.h:2 ui/evolution-mail-message.xml.h:21
+#: ../ui/evolution-composer-entries.xml.h:2
+#: ../ui/evolution-mail-message.xml.h:21
 msgid "Cu_t"
 msgstr "Cu_t"
 
-#: ui/evolution-composer-entries.xml.h:3
+#: ../ui/evolution-composer-entries.xml.h:3
 msgid "Cut selected text to the clipboard"
 msgstr "Cut selected text to the clipboard"
 
-#: ui/evolution-composer-entries.xml.h:4
+#: ../ui/evolution-composer-entries.xml.h:4
 msgid "Paste text from the clipboard"
 msgstr "Paste text from the clipboard"
 
-#: ui/evolution-composer-entries.xml.h:5 ui/evolution-mail-list.xml.h:13
-#: ui/evolution-subscribe.xml.h:6
+#: ../ui/evolution-composer-entries.xml.h:5 ../ui/evolution-mail-list.xml.h:13
+#: ../ui/evolution-subscribe.xml.h:6
 msgid "Select _All"
 msgstr "Select _All"
 
-#: ui/evolution-composer-entries.xml.h:6
+#: ../ui/evolution-composer-entries.xml.h:6
 msgid "Select all text"
 msgstr "Select all text"
 
-#: ui/evolution-executive-summary.xml.h:1
+#: ../ui/evolution-executive-summary.xml.h:1
 msgid "Customize My Evolution"
 msgstr "Customize My Evolution"
 
-#: ui/evolution-mail-global.xml.h:2
+#: ../ui/evolution-mail-global.xml.h:2
 msgid "Cancel the current mail operation"
 msgstr "Cancel the current mail operation"
 
-#: ui/evolution-mail-global.xml.h:3
+#: ../ui/evolution-mail-global.xml.h:3
 msgid "Compose _New Message"
 msgstr "Compose _New Message"
 
-#: ui/evolution-mail-global.xml.h:4
+#: ../ui/evolution-mail-global.xml.h:4
 msgid "Create or edit rules for filtering new mail"
 msgstr "Create or edit rules for filtering new mail"
 
-#: ui/evolution-mail-global.xml.h:5
+#: ../ui/evolution-mail-global.xml.h:5
 msgid "Create or edit vFolder definitions"
 msgstr "Create or edit vFolder definitions"
 
-#: ui/evolution-mail-global.xml.h:6
+#: ../ui/evolution-mail-global.xml.h:6
 msgid "Empty _Trash"
 msgstr "Empty _Trash"
 
-#: ui/evolution-mail-global.xml.h:7
+#: ../ui/evolution-mail-global.xml.h:7
 msgid "Open a window for composing a mail message"
 msgstr "Open a window for composing a mail message"
 
-#: ui/evolution-mail-global.xml.h:8
+#: ../ui/evolution-mail-global.xml.h:8
 msgid "Permanently remove all deleted messages from all folders"
 msgstr "Permanently remove all deleted messages from all folders"
 
-#: ui/evolution-mail-global.xml.h:9
+#: ../ui/evolution-mail-global.xml.h:9
 msgid "Post Ne_w Message"
 msgstr "Post Ne_w Message"
 
-#: ui/evolution-mail-global.xml.h:10
+#: ../ui/evolution-mail-global.xml.h:10
 msgid "Post a message to a Public folder"
 msgstr "Post a message to a Public folder"
 
-#: ui/evolution-mail-global.xml.h:11
+#: ../ui/evolution-mail-global.xml.h:11
 msgid "S_ubscribe to Folders..."
 msgstr "S_ubscribe to Folders..."
 
-#: ui/evolution-mail-global.xml.h:12
+#: ../ui/evolution-mail-global.xml.h:12
 msgid "Show message preview window"
 msgstr "Show message preview window"
 
-#: ui/evolution-mail-global.xml.h:13
+#: ../ui/evolution-mail-global.xml.h:13
 msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr "Subscribe or unsubscribe to folders on remote servers"
 
-#: ui/evolution-mail-global.xml.h:15
+#: ../ui/evolution-mail-global.xml.h:15
 msgid "_Filters..."
 msgstr "_Filters..."
 
-#: ui/evolution-mail-global.xml.h:18
+#: ../ui/evolution-mail-global.xml.h:18
 msgid "vFolder _Editor..."
 msgstr "vFolder _Editor..."
 
-#: ui/evolution-mail-list.xml.h:1
+#: ../ui/evolution-mail-list.xml.h:1
 msgid "Change the properties of this folder"
 msgstr "Change the properties of this folder"
 
-#: ui/evolution-mail-list.xml.h:2 ui/evolution-mail-message.xml.h:10
+#: ../ui/evolution-mail-list.xml.h:2 ../ui/evolution-mail-message.xml.h:10
 msgid "Copy selected message(s) to the clipboard"
 msgstr "Copy selected message(s) to the clipboard"
 
-#: ui/evolution-mail-list.xml.h:3 ui/evolution-mail-message.xml.h:22
+#: ../ui/evolution-mail-list.xml.h:3 ../ui/evolution-mail-message.xml.h:22
 msgid "Cut selected message(s) to the clipboard"
 msgstr "Cut selected message(s) to the clipboard"
 
-#: ui/evolution-mail-list.xml.h:4
+#: ../ui/evolution-mail-list.xml.h:4
 msgid "E_xpunge"
 msgstr "E_xpunge"
 
-#: ui/evolution-mail-list.xml.h:5
+#: ../ui/evolution-mail-list.xml.h:5
 msgid "Hide S_elected Messages"
 msgstr "Hide S_elected Messages"
 
-#: ui/evolution-mail-list.xml.h:6
+#: ../ui/evolution-mail-list.xml.h:6
 msgid "Hide _Deleted Messages"
 msgstr "Hide _Deleted Messages"
 
-#: ui/evolution-mail-list.xml.h:7
+#: ../ui/evolution-mail-list.xml.h:7
 msgid "Hide _Read Messages"
 msgstr "Hide _Read Messages"
 
-#: ui/evolution-mail-list.xml.h:8
+#: ../ui/evolution-mail-list.xml.h:8
 msgid ""
 "Hide deleted messages rather than displaying them with a line through them"
 msgstr ""
 "Hide deleted messages rather than displaying them with a line through them"
 
-#: ui/evolution-mail-list.xml.h:9
+#: ../ui/evolution-mail-list.xml.h:9
 msgid "Mark All as _Read"
 msgstr "Mark All as _Read"
 
-#: ui/evolution-mail-list.xml.h:10
+#: ../ui/evolution-mail-list.xml.h:10
 msgid "Mark all visible messages as read"
 msgstr "Mark all visible messages as read"
 
-#: ui/evolution-mail-list.xml.h:11 ui/evolution-mail-message.xml.h:74
+#: ../ui/evolution-mail-list.xml.h:11 ../ui/evolution-mail-message.xml.h:74
 msgid "Paste message(s) from the clipboard"
 msgstr "Paste message(s) from the clipboard"
 
-#: ui/evolution-mail-list.xml.h:12
+#: ../ui/evolution-mail-list.xml.h:12
 msgid "Permanently remove all deleted messages from this folder"
 msgstr "Permanently remove all deleted messages from this folder"
 
-#: ui/evolution-mail-list.xml.h:14
+#: ../ui/evolution-mail-list.xml.h:14
 msgid "Select _Thread"
 msgstr "Select _Thread"
 
-#: ui/evolution-mail-list.xml.h:15
+#: ../ui/evolution-mail-list.xml.h:15
 msgid "Select all and only the messages that are not currently selected"
 msgstr "Select all and only the messages that are not currently selected"
 
-#: ui/evolution-mail-list.xml.h:16
+#: ../ui/evolution-mail-list.xml.h:16
 msgid "Select all messages in the same thread as the selected message"
 msgstr "Select all messages in the same thread as the selected message"
 
-#: ui/evolution-mail-list.xml.h:17
+#: ../ui/evolution-mail-list.xml.h:17
 msgid "Select all visible messages"
 msgstr "Select all visible messages"
 
-#: ui/evolution-mail-list.xml.h:18
+#: ../ui/evolution-mail-list.xml.h:18
 msgid "Sh_ow Hidden Messages"
 msgstr "Sh_ow Hidden Messages"
 
-#: ui/evolution-mail-list.xml.h:19
+#: ../ui/evolution-mail-list.xml.h:19
 msgid "Show messages that have been temporarily hidden"
 msgstr "Show messages that have been temporarily hidden"
 
-#: ui/evolution-mail-list.xml.h:20
+#: ../ui/evolution-mail-list.xml.h:20
 msgid "Temporarily hide all messages that have already been read"
 msgstr "Temporarily hide all messages that have already been read"
 
-#: ui/evolution-mail-list.xml.h:21
+#: ../ui/evolution-mail-list.xml.h:21
 msgid "Temporarily hide the selected messages"
 msgstr "Temporarily hide the selected messages"
 
-#: ui/evolution-mail-list.xml.h:22
+#: ../ui/evolution-mail-list.xml.h:22
 msgid "Threaded Message list"
 msgstr "Threaded Message list"
 
-#: ui/evolution-mail-list.xml.h:25
+#: ../ui/evolution-mail-list.xml.h:25
 msgid "_Folder"
 msgstr "_Folder"
 
-#: ui/evolution-mail-list.xml.h:26 ui/evolution-subscribe.xml.h:12
+#: ../ui/evolution-mail-list.xml.h:26 ../ui/evolution-subscribe.xml.h:12
 msgid "_Invert Selection"
 msgstr "_Invert Selection"
 
-#: ui/evolution-mail-list.xml.h:28
+#: ../ui/evolution-mail-list.xml.h:28
 msgid "_Threaded Message List"
 msgstr "_Threaded Message List"
 
-#: ui/evolution-mail-message.xml.h:1
+#: ../ui/evolution-mail-message.xml.h:1
 msgid "A_dd Sender to Address Book"
 msgstr "A_dd Sender to Address Book"
 
-#: ui/evolution-mail-message.xml.h:2
+#: ../ui/evolution-mail-message.xml.h:2
 msgid "A_pply Filters"
 msgstr "A_pply Filters"
 
-#: ui/evolution-mail-message.xml.h:3
+#: ../ui/evolution-mail-message.xml.h:3
 msgid "Add Sender to Address Book"
 msgstr "Add Sender to Address Book"
 
-#: ui/evolution-mail-message.xml.h:4
+#: ../ui/evolution-mail-message.xml.h:4
 msgid "Apply filter rules to the selected messages"
 msgstr "Apply filter rules to the selected messages"
 
-#: ui/evolution-mail-message.xml.h:5
+#: ../ui/evolution-mail-message.xml.h:5
 msgid "Caret _Mode"
 msgstr "Caret _Mode"
 
-#: ui/evolution-mail-message.xml.h:6
+#: ../ui/evolution-mail-message.xml.h:6
 msgid "Compose a reply to all of the recipients of the selected message"
 msgstr "Compose a reply to all of the recipients of the selected message"
 
-#: ui/evolution-mail-message.xml.h:7
+#: ../ui/evolution-mail-message.xml.h:7
 msgid "Compose a reply to the mailing list of the selected message"
 msgstr "Compose a reply to the mailing list of the selected message"
 
-#: ui/evolution-mail-message.xml.h:8
+#: ../ui/evolution-mail-message.xml.h:8
 msgid "Compose a reply to the sender of the selected message"
 msgstr "Compose a reply to the sender of the selected message"
 
-#: ui/evolution-mail-message.xml.h:11
+#: ../ui/evolution-mail-message.xml.h:11
 msgid "Copy selected messages to another folder"
 msgstr "Copy selected messages to another folder"
 
-#: ui/evolution-mail-message.xml.h:12
+#: ../ui/evolution-mail-message.xml.h:12
 msgid "Create _vFolder From Message"
 msgstr "Create _vFolder From Message"
 
-#: ui/evolution-mail-message.xml.h:13
+#: ../ui/evolution-mail-message.xml.h:13
 msgid "Create a rule to filter messages from this sender"
 msgstr "Create a rule to filter messages from this sender"
 
-#: ui/evolution-mail-message.xml.h:14
+#: ../ui/evolution-mail-message.xml.h:14
 msgid "Create a rule to filter messages to these recipients"
 msgstr "Create a rule to filter messages to these recipients"
 
-#: ui/evolution-mail-message.xml.h:15
+#: ../ui/evolution-mail-message.xml.h:15
 msgid "Create a rule to filter messages to this mailing list"
 msgstr "Create a rule to filter messages to this mailing list"
 
-#: ui/evolution-mail-message.xml.h:16
+#: ../ui/evolution-mail-message.xml.h:16
 msgid "Create a rule to filter messages with this subject"
 msgstr "Create a rule to filter messages with this subject"
 
-#: ui/evolution-mail-message.xml.h:17
+#: ../ui/evolution-mail-message.xml.h:17
 msgid "Create a vFolder for these recipients"
 msgstr "Create a vFolder for these recipients"
 
-#: ui/evolution-mail-message.xml.h:18
+#: ../ui/evolution-mail-message.xml.h:18
 msgid "Create a vFolder for this mailing list"
 msgstr "Create a vFolder for this mailing list"
 
-#: ui/evolution-mail-message.xml.h:19
+#: ../ui/evolution-mail-message.xml.h:19
 msgid "Create a vFolder for this sender"
 msgstr "Create a vFolder for this sender"
 
-#: ui/evolution-mail-message.xml.h:20
+#: ../ui/evolution-mail-message.xml.h:20
 msgid "Create a vFolder for this subject"
 msgstr "Create a vFolder for this subject"
 
-#: ui/evolution-mail-message.xml.h:23
+#: ../ui/evolution-mail-message.xml.h:23
 msgid "Decrease the text size"
 msgstr "Decrease the text size"
 
-#: ui/evolution-mail-message.xml.h:25
+#: ../ui/evolution-mail-message.xml.h:25
 msgid "Display the next important message"
 msgstr "Display the next important message"
 
-#: ui/evolution-mail-message.xml.h:26
+#: ../ui/evolution-mail-message.xml.h:26
 msgid "Display the next message"
 msgstr "Display the next message"
 
-#: ui/evolution-mail-message.xml.h:27
+#: ../ui/evolution-mail-message.xml.h:27
 msgid "Display the next unread message"
 msgstr "Display the next unread message"
 
-#: ui/evolution-mail-message.xml.h:28
+#: ../ui/evolution-mail-message.xml.h:28
 msgid "Display the next unread thread"
 msgstr "Display the next unread thread"
 
-#: ui/evolution-mail-message.xml.h:29
+#: ../ui/evolution-mail-message.xml.h:29
 msgid "Display the previous important message"
 msgstr "Display the previous important message"
 
-#: ui/evolution-mail-message.xml.h:30
+#: ../ui/evolution-mail-message.xml.h:30
 msgid "Display the previous message"
 msgstr "Display the previous message"
 
-#: ui/evolution-mail-message.xml.h:31
+#: ../ui/evolution-mail-message.xml.h:31
 msgid "Display the previous unread message"
 msgstr "Display the previous unread message"
 
-#: ui/evolution-mail-message.xml.h:32
+#: ../ui/evolution-mail-message.xml.h:32
 msgid "F_orward As..."
 msgstr "F_orward As..."
 
-#: ui/evolution-mail-message.xml.h:33
+#: ../ui/evolution-mail-message.xml.h:33
 msgid "Filter _Junk"
 msgstr "Filter _Junk"
 
-#: ui/evolution-mail-message.xml.h:34
+#: ../ui/evolution-mail-message.xml.h:34
 msgid "Filter on Mailing _List..."
 msgstr "Filter on Mailing _List..."
 
-#: ui/evolution-mail-message.xml.h:35
+#: ../ui/evolution-mail-message.xml.h:35
 msgid "Filter on Se_nder..."
 msgstr "Filter on Se_nder..."
 
-#: ui/evolution-mail-message.xml.h:36
+#: ../ui/evolution-mail-message.xml.h:36
 msgid "Filter on _Recipients..."
 msgstr "Filter on _Recipients..."
 
-#: ui/evolution-mail-message.xml.h:37
+#: ../ui/evolution-mail-message.xml.h:37
 msgid "Filter on _Subject..."
 msgstr "Filter on _Subject..."
 
-#: ui/evolution-mail-message.xml.h:38
+#: ../ui/evolution-mail-message.xml.h:38
 msgid "Filter the selected messages for junk status"
 msgstr "Filter the selected messages for junk status"
 
-#: ui/evolution-mail-message.xml.h:39
+#: ../ui/evolution-mail-message.xml.h:39
 msgid "Flag selected message(s) for follow-up"
 msgstr "Flag selected message(s) for follow-up"
 
-#: ui/evolution-mail-message.xml.h:40
+#: ../ui/evolution-mail-message.xml.h:40
 msgid "Follow _Up..."
 msgstr "Follow _Up..."
 
-#: ui/evolution-mail-message.xml.h:41
+#: ../ui/evolution-mail-message.xml.h:41
 msgid "Force images in HTML mail to be loaded"
 msgstr "Force images in HTML mail to be loaded"
 
-#: ui/evolution-mail-message.xml.h:43
+#: ../ui/evolution-mail-message.xml.h:43
 msgid "Forward the selected message in the body of a new message"
 msgstr "Forward the selected message in the body of a new message"
 
-#: ui/evolution-mail-message.xml.h:44
+#: ../ui/evolution-mail-message.xml.h:44
 msgid "Forward the selected message quoted like a reply"
 msgstr "Forward the selected message quoted like a reply"
 
-#: ui/evolution-mail-message.xml.h:45
+#: ../ui/evolution-mail-message.xml.h:45
 msgid "Forward the selected message to someone"
 msgstr "Forward the selected message to someone"
 
-#: ui/evolution-mail-message.xml.h:46
+#: ../ui/evolution-mail-message.xml.h:46
 msgid "Forward the selected message to someone as an attachment"
 msgstr "Forward the selected message to someone as an attachment"
 
-#: ui/evolution-mail-message.xml.h:47
+#: ../ui/evolution-mail-message.xml.h:47
 msgid "Increase the text size"
 msgstr "Increase the text size"
 
-#: ui/evolution-mail-message.xml.h:49
+#: ../ui/evolution-mail-message.xml.h:49
 msgid "Load _Images"
 msgstr "Load _Images"
 
-#: ui/evolution-mail-message.xml.h:50
+#: ../ui/evolution-mail-message.xml.h:50
 msgid "Mar_k as Read"
 msgstr "Mar_k as Read"
 
-#: ui/evolution-mail-message.xml.h:51
+#: ../ui/evolution-mail-message.xml.h:51
 msgid "Mark as I_mportant"
 msgstr "Mark as I_mportant"
 
-#: ui/evolution-mail-message.xml.h:52
+#: ../ui/evolution-mail-message.xml.h:52
 msgid "Mark as U_nread"
 msgstr "Mark as U_nread"
 
-#: ui/evolution-mail-message.xml.h:53
+#: ../ui/evolution-mail-message.xml.h:53
 msgid "Mark as Unimp_ortant"
 msgstr "Mark as Unimp_ortant"
 
-#: ui/evolution-mail-message.xml.h:56
+#: ../ui/evolution-mail-message.xml.h:56
 msgid "Mark the selected message(s) as having been read"
 msgstr "Mark the selected message(s) as having been read"
 
-#: ui/evolution-mail-message.xml.h:57
+#: ../ui/evolution-mail-message.xml.h:57
 msgid "Mark the selected message(s) as important"
 msgstr "Mark the selected message(s) as important"
 
-#: ui/evolution-mail-message.xml.h:58
+#: ../ui/evolution-mail-message.xml.h:58
 msgid "Mark the selected message(s) as junk"
 msgstr "Mark the selected message(s) as junk"
 
-#: ui/evolution-mail-message.xml.h:59
+#: ../ui/evolution-mail-message.xml.h:59
 msgid "Mark the selected message(s) as not being junk"
 msgstr "Mark the selected message(s) as not being junk"
 
-#: ui/evolution-mail-message.xml.h:60
+#: ../ui/evolution-mail-message.xml.h:60
 msgid "Mark the selected message(s) as not having been read"
 msgstr "Mark the selected message(s) as not having been read"
 
-#: ui/evolution-mail-message.xml.h:61
+#: ../ui/evolution-mail-message.xml.h:61
 msgid "Mark the selected message(s) as unimportant"
 msgstr "Mark the selected message(s) as unimportant"
 
-#: ui/evolution-mail-message.xml.h:62
+#: ../ui/evolution-mail-message.xml.h:62
 msgid "Mark the selected messages for deletion"
 msgstr "Mark the selected messages for deletion"
 
-#: ui/evolution-mail-message.xml.h:63
+#: ../ui/evolution-mail-message.xml.h:63
 msgid "Move"
 msgstr "Move"
 
-#: ui/evolution-mail-message.xml.h:64
+#: ../ui/evolution-mail-message.xml.h:64
 msgid "Move selected message(s) to another folder"
 msgstr "Move selected message(s) to another folder"
 
-#: ui/evolution-mail-message.xml.h:66
+#: ../ui/evolution-mail-message.xml.h:66
 msgid "Next _Important Message"
 msgstr "Next _Important Message"
 
-#: ui/evolution-mail-message.xml.h:67
+#: ../ui/evolution-mail-message.xml.h:67
 msgid "Next _Thread"
 msgstr "Next _Thread"
 
-#: ui/evolution-mail-message.xml.h:68
+#: ../ui/evolution-mail-message.xml.h:68
 msgid "Next _Unread Message"
 msgstr "Next _Unread Message"
 
-#: ui/evolution-mail-message.xml.h:69
+#: ../ui/evolution-mail-message.xml.h:69
 msgid "Not Junk"
 msgstr "Not Junk"
 
-#: ui/evolution-mail-message.xml.h:70
+#: ../ui/evolution-mail-message.xml.h:70
 msgid "Open the selected message in a new window"
 msgstr "Open the selected message in a new window"
 
-#: ui/evolution-mail-message.xml.h:71
+#: ../ui/evolution-mail-message.xml.h:71
 msgid "Open the selected message in the composer for editing"
 msgstr "Open the selected message in the composer for editing"
 
-#: ui/evolution-mail-message.xml.h:72
+#: ../ui/evolution-mail-message.xml.h:72
 msgid "Original Si_ze"
 msgstr "Original Si_ze"
 
-#: ui/evolution-mail-message.xml.h:73
+#: ../ui/evolution-mail-message.xml.h:73
 msgid "P_revious Unread Message"
 msgstr "P_revious Unread Message"
 
-#: ui/evolution-mail-message.xml.h:75
+#: ../ui/evolution-mail-message.xml.h:75
 msgid "Post a Repl_y"
 msgstr "Post a Repl_y"
 
-#: ui/evolution-mail-message.xml.h:76
+#: ../ui/evolution-mail-message.xml.h:76
 msgid "Post a reply to a message in a Public folder"
 msgstr "Post a reply to a message in a Public folder"
 
-#: ui/evolution-mail-message.xml.h:77
+#: ../ui/evolution-mail-message.xml.h:77
 msgid "Pr_evious Important Message"
 msgstr "Pr_evious Important Message"
 
-#: ui/evolution-mail-message.xml.h:78
+#: ../ui/evolution-mail-message.xml.h:78
 msgid "Preview the message to be printed"
 msgstr "Preview the message to be printed"
 
-#: ui/evolution-mail-message.xml.h:82
+#: ../ui/evolution-mail-message.xml.h:82
 msgid "Print this message"
 msgstr "Print this message"
 
-#: ui/evolution-mail-message.xml.h:83
+#: ../ui/evolution-mail-message.xml.h:83
 msgid "Re_direct"
 msgstr "Re_direct"
 
-#: ui/evolution-mail-message.xml.h:84
+#: ../ui/evolution-mail-message.xml.h:84
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "Redirect (bounce) the selected message to someone"
 
-#: ui/evolution-mail-message.xml.h:89
+#: ../ui/evolution-mail-message.xml.h:89
 msgid "Reset the text to its original size"
 msgstr "Reset the text to its original size"
 
-#: ui/evolution-mail-message.xml.h:90
+#: ../ui/evolution-mail-message.xml.h:90
 msgid "S_earch in Message..."
 msgstr "S_earch in Message..."
 
-#: ui/evolution-mail-message.xml.h:91
+#: ../ui/evolution-mail-message.xml.h:91
 msgid "S_maller"
 msgstr "S_maller"
 
-#: ui/evolution-mail-message.xml.h:92
+#: ../ui/evolution-mail-message.xml.h:92
 msgid "Save the message as a text file"
 msgstr "Save the message as a text file"
 
-#: ui/evolution-mail-message.xml.h:93
+#: ../ui/evolution-mail-message.xml.h:93
 msgid "Search for text in the body of the displayed message"
 msgstr "Search for text in the body of the displayed message"
 
-#: ui/evolution-mail-message.xml.h:94
+#: ../ui/evolution-mail-message.xml.h:94
 msgid "Set up the page settings for your current printer"
 msgstr "Set up the page settings for your current printer"
 
-#: ui/evolution-mail-message.xml.h:95
+#: ../ui/evolution-mail-message.xml.h:95
 msgid "Show Email _Source"
 msgstr "Show Email _Source"
 
-#: ui/evolution-mail-message.xml.h:96
+#: ../ui/evolution-mail-message.xml.h:96
 msgid "Show Full _Headers"
 msgstr "Show Full _Headers"
 
-#: ui/evolution-mail-message.xml.h:97
+#: ../ui/evolution-mail-message.xml.h:97
 msgid "Show a blinking cursor in the body of displayed messages"
 msgstr "Show a blinking cursor in the body of displayed messages"
 
-#: ui/evolution-mail-message.xml.h:98
+#: ../ui/evolution-mail-message.xml.h:98
 msgid "Show message in the normal style"
 msgstr "Show message in the normal style"
 
-#: ui/evolution-mail-message.xml.h:99
+#: ../ui/evolution-mail-message.xml.h:99
 msgid "Show message with all email headers"
 msgstr "Show message with all email headers"
 
-#: ui/evolution-mail-message.xml.h:100
+#: ../ui/evolution-mail-message.xml.h:100
 msgid "Show the raw email source of the message"
 msgstr "Show the raw email source of the message"
 
-#: ui/evolution-mail-message.xml.h:101
+#: ../ui/evolution-mail-message.xml.h:101
 msgid "Text Si_ze"
 msgstr "Text Si_ze"
 
-#: ui/evolution-mail-message.xml.h:102
+#: ../ui/evolution-mail-message.xml.h:102
 msgid "Un-delete the selected messages"
 msgstr "Un-delete the selected messages"
 
-#: ui/evolution-mail-message.xml.h:104
+#: ../ui/evolution-mail-message.xml.h:104
 msgid "_Attached"
 msgstr "_Attached"
 
-#: ui/evolution-mail-message.xml.h:107
+#: ../ui/evolution-mail-message.xml.h:107
 msgid "_Create Filter From Message"
 msgstr "_Create Filter From Message"
 
-#: ui/evolution-mail-message.xml.h:111
+#: ../ui/evolution-mail-message.xml.h:111
 msgid "_Go To"
 msgstr "_Go To"
 
-#: ui/evolution-mail-message.xml.h:112
+#: ../ui/evolution-mail-message.xml.h:112
 msgid "_Inline"
 msgstr "_Inline"
 
-#: ui/evolution-mail-message.xml.h:113
+#: ../ui/evolution-mail-message.xml.h:113
 msgid "_Larger"
 msgstr "_Larger"
 
-#: ui/evolution-mail-message.xml.h:114
+#: ../ui/evolution-mail-message.xml.h:114
 msgid "_Message Display"
 msgstr "_Message Display"
 
-#: ui/evolution-mail-message.xml.h:116
+#: ../ui/evolution-mail-message.xml.h:116
 msgid "_Next Message"
 msgstr "_Next Message"
 
-#: ui/evolution-mail-message.xml.h:117
+#: ../ui/evolution-mail-message.xml.h:117
 msgid "_Normal Display"
 msgstr "_Normal Display"
 
-#: ui/evolution-mail-message.xml.h:118
+#: ../ui/evolution-mail-message.xml.h:118
 msgid "_Open Message"
 msgstr "_Open Message"
 
-#: ui/evolution-mail-message.xml.h:120
+#: ../ui/evolution-mail-message.xml.h:120
 msgid "_Previous Message"
 msgstr "_Previous Message"
 
-#: ui/evolution-mail-message.xml.h:122
+#: ../ui/evolution-mail-message.xml.h:122
 msgid "_Quoted"
 msgstr "_Quoted"
 
-#: ui/evolution-mail-message.xml.h:125 ui/evolution.xml.h:48
+#: ../ui/evolution-mail-message.xml.h:125 ../ui/evolution.xml.h:48
 msgid "_Tools"
 msgstr "_Tools"
 
-#: ui/evolution-mail-message.xml.h:126
+#: ../ui/evolution-mail-message.xml.h:126
 msgid "_Undelete"
 msgstr "_Undelete"
 
-#: ui/evolution-mail-message.xml.h:127
+#: ../ui/evolution-mail-message.xml.h:127
 msgid "vFolder on Mailing _List..."
 msgstr "vFolder on Mailing _List..."
 
-#: ui/evolution-mail-message.xml.h:128
+#: ../ui/evolution-mail-message.xml.h:128
 msgid "vFolder on Se_nder..."
 msgstr "vFolder on Se_nder..."
 
-#: ui/evolution-mail-message.xml.h:129
+#: ../ui/evolution-mail-message.xml.h:129
 msgid "vFolder on _Recipients..."
 msgstr "vFolder on _Recipients..."
 
-#: ui/evolution-mail-message.xml.h:130
+#: ../ui/evolution-mail-message.xml.h:130
 msgid "vFolder on _Subject..."
 msgstr "vFolder on _Subject..."
 
-#: ui/evolution-mail-messagedisplay.xml.h:1
-#: ui/evolution-message-composer.xml.h:3 ui/evolution-signature-editor.xml.h:2
-#: ui/evolution.xml.h:4
+#: ../ui/evolution-mail-messagedisplay.xml.h:1
+#: ../ui/evolution-message-composer.xml.h:3
+#: ../ui/evolution-signature-editor.xml.h:2 ../ui/evolution.xml.h:4
 msgid "Close"
 msgstr "Close"
 
-#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
+#: ../ui/evolution-mail-messagedisplay.xml.h:2 ../ui/evolution.xml.h:5
 msgid "Close this window"
 msgstr "Close this window"
 
-#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:19
+#: ../ui/evolution-mail-messagedisplay.xml.h:3 ../ui/evolution.xml.h:19
 msgid "Main toolbar"
 msgstr "Main toolbar"
 
-#: ui/evolution-mail-messagedisplay.xml.h:5
-#: ui/evolution-message-composer.xml.h:41 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:37
+#: ../ui/evolution-mail-messagedisplay.xml.h:5
+#: ../ui/evolution-message-composer.xml.h:41 ../ui/evolution-subscribe.xml.h:9
+#: ../ui/evolution.xml.h:37
 msgid "_Close"
 msgstr "_Close"
 
-#: ui/evolution-mail-messagedisplay.xml.h:7
-#: ui/evolution-message-composer.xml.h:44
-#: ui/evolution-signature-editor.xml.h:13 ui/evolution-subscribe.xml.h:11
-#: ui/evolution.xml.h:39
+#: ../ui/evolution-mail-messagedisplay.xml.h:7
+#: ../ui/evolution-message-composer.xml.h:44
+#: ../ui/evolution-signature-editor.xml.h:13
+#: ../ui/evolution-subscribe.xml.h:11 ../ui/evolution.xml.h:39
 msgid "_File"
 msgstr "_File"
 
-#: ui/evolution-message-composer.xml.h:1
+#: ../ui/evolution-message-composer.xml.h:1
 msgid "Attach"
 msgstr "Attach"
 
-#: ui/evolution-message-composer.xml.h:2
+#: ../ui/evolution-message-composer.xml.h:2
 msgid "Attach a file"
 msgstr "Attach a file"
 
-#: ui/evolution-message-composer.xml.h:4 ui/evolution-signature-editor.xml.h:3
+#: ../ui/evolution-message-composer.xml.h:4
+#: ../ui/evolution-signature-editor.xml.h:3
 msgid "Close the current file"
 msgstr "Close the current file"
 
-#: ui/evolution-message-composer.xml.h:5
+#: ../ui/evolution-message-composer.xml.h:5
 msgid "Delete all but signature"
 msgstr "Delete all but signature"
 
-#: ui/evolution-message-composer.xml.h:6
+#: ../ui/evolution-message-composer.xml.h:6
 msgid "Encrypt this message with PGP"
 msgstr "Encrypt this message with PGP"
 
-#: ui/evolution-message-composer.xml.h:7
+#: ../ui/evolution-message-composer.xml.h:7
 msgid "Encrypt this message with your S/MIME Encryption Cetificate"
 msgstr "Encrypt this message with your S/MIME Encryption Cetificate"
 
-#: ui/evolution-message-composer.xml.h:8 ui/evolution-signature-editor.xml.h:4
+#: ../ui/evolution-message-composer.xml.h:8
+#: ../ui/evolution-signature-editor.xml.h:4
 msgid "For_mat"
 msgstr "For_mat"
 
-#: ui/evolution-message-composer.xml.h:9
+#: ../ui/evolution-message-composer.xml.h:9
 msgid "HT_ML"
 msgstr "HT_ML"
 
-#: ui/evolution-message-composer.xml.h:11
+#: ../ui/evolution-message-composer.xml.h:11
 msgid "Open a file"
 msgstr "Open a file"
 
-#: ui/evolution-message-composer.xml.h:12
+#: ../ui/evolution-message-composer.xml.h:12
 msgid "PGP Encrypt"
 msgstr "PGP Encrypt"
 
-#: ui/evolution-message-composer.xml.h:13
+#: ../ui/evolution-message-composer.xml.h:13
 msgid "PGP Sign"
 msgstr "PGP Sign"
 
-#: ui/evolution-message-composer.xml.h:14
+#: ../ui/evolution-message-composer.xml.h:14
 msgid "S/MIME Encrypt"
 msgstr "S/MIME Encrypt"
 
-#: ui/evolution-message-composer.xml.h:15
+#: ../ui/evolution-message-composer.xml.h:15
 msgid "S/MIME Sign"
 msgstr "S/MIME Sign"
 
-#: ui/evolution-message-composer.xml.h:17
+#: ../ui/evolution-message-composer.xml.h:17
 msgid "Save As"
 msgstr "Save As"
 
-#: ui/evolution-message-composer.xml.h:18
+#: ../ui/evolution-message-composer.xml.h:18
 msgid "Save _As..."
 msgstr "Save _As..."
 
-#: ui/evolution-message-composer.xml.h:19
+#: ../ui/evolution-message-composer.xml.h:19
 msgid "Save _Draft"
 msgstr "Save _Draft"
 
-#: ui/evolution-message-composer.xml.h:20
+#: ../ui/evolution-message-composer.xml.h:20
 msgid "Save in folder..."
 msgstr "Save in folder..."
 
-#: ui/evolution-message-composer.xml.h:21
-#: ui/evolution-signature-editor.xml.h:9
+#: ../ui/evolution-message-composer.xml.h:21
+#: ../ui/evolution-signature-editor.xml.h:9
 msgid "Save the current file"
 msgstr "Save the current file"
 
-#: ui/evolution-message-composer.xml.h:22
+#: ../ui/evolution-message-composer.xml.h:22
 msgid "Save the current file with a different name"
 msgstr "Save the current file with a different name"
 
-#: ui/evolution-message-composer.xml.h:23
+#: ../ui/evolution-message-composer.xml.h:23
 msgid "Save the message in a specified folder"
 msgstr "Save the message in a specified folder"
 
-#: ui/evolution-message-composer.xml.h:25
-#: ui/evolution-signature-editor.xml.h:11
+#: ../ui/evolution-message-composer.xml.h:25
+#: ../ui/evolution-signature-editor.xml.h:11
 msgid "Send the mail in HTML format"
 msgstr "Send the mail in HTML format"
 
-#: ui/evolution-message-composer.xml.h:26
+#: ../ui/evolution-message-composer.xml.h:26
 msgid "Send this message"
 msgstr "Send this message"
 
-#: ui/evolution-message-composer.xml.h:27
+#: ../ui/evolution-message-composer.xml.h:27
 msgid "Show / hide attachments"
 msgstr "Show / hide attachments"
 
-#: ui/evolution-message-composer.xml.h:28
+#: ../ui/evolution-message-composer.xml.h:28
 msgid "Show _attachments"
 msgstr "Show _attachments"
 
-#: ui/evolution-message-composer.xml.h:29
+#: ../ui/evolution-message-composer.xml.h:29
 msgid "Show attachments"
 msgstr "Show attachments"
 
-#: ui/evolution-message-composer.xml.h:30
+#: ../ui/evolution-message-composer.xml.h:30
 msgid "Sign this message with your PGP key"
 msgstr "Sign this message with your PGP key"
 
-#: ui/evolution-message-composer.xml.h:31
+#: ../ui/evolution-message-composer.xml.h:31
 msgid "Sign this message with your S/MIME Signature Certificate"
 msgstr "Sign this message with your S/MIME Signature Certificate"
 
-#: ui/evolution-message-composer.xml.h:32
+#: ../ui/evolution-message-composer.xml.h:32
 msgid "Toggles whether the BCC field is displayed"
 msgstr "Toggles whether the BCC field is displayed"
 
-#: ui/evolution-message-composer.xml.h:33
+#: ../ui/evolution-message-composer.xml.h:33
 msgid "Toggles whether the CC field is displayed"
 msgstr "Toggles whether the CC field is displayed"
 
-#: ui/evolution-message-composer.xml.h:34
+#: ../ui/evolution-message-composer.xml.h:34
 msgid "Toggles whether the From chooser is displayed"
 msgstr "Toggles whether the From chooser is displayed"
 
-#: ui/evolution-message-composer.xml.h:35
+#: ../ui/evolution-message-composer.xml.h:35
 msgid "Toggles whether the Post-To field is displayed"
 msgstr "Toggles whether the Post-To field is displayed"
 
-#: ui/evolution-message-composer.xml.h:36
+#: ../ui/evolution-message-composer.xml.h:36
 msgid "Toggles whether the Reply-To field is displayed"
 msgstr "Toggles whether the Reply-To field is displayed"
 
-#: ui/evolution-message-composer.xml.h:37
+#: ../ui/evolution-message-composer.xml.h:37
 msgid "Toggles whether the To field is displayed"
 msgstr "Toggles whether the To field is displayed"
 
-#: ui/evolution-message-composer.xml.h:38
+#: ../ui/evolution-message-composer.xml.h:38
 msgid "_Attachment..."
 msgstr "_Attachment..."
 
-#: ui/evolution-message-composer.xml.h:39
+#: ../ui/evolution-message-composer.xml.h:39
 msgid "_Bcc Field"
 msgstr "_Bcc Field"
 
-#: ui/evolution-message-composer.xml.h:40
+#: ../ui/evolution-message-composer.xml.h:40
 msgid "_Cc Field"
 msgstr "_Cc Field"
 
-#: ui/evolution-message-composer.xml.h:42
+#: ../ui/evolution-message-composer.xml.h:42
 msgid "_Delete all"
 msgstr "_Delete all"
 
-#: ui/evolution-message-composer.xml.h:45
+#: ../ui/evolution-message-composer.xml.h:45
 msgid "_From Field"
 msgstr "_From Field"
 
-#: ui/evolution-message-composer.xml.h:46
-#: ui/evolution-signature-editor.xml.h:14
+#: ../ui/evolution-message-composer.xml.h:46
+#: ../ui/evolution-signature-editor.xml.h:14
 msgid "_Insert"
 msgstr "_Insert"
 
-#: ui/evolution-message-composer.xml.h:47
+#: ../ui/evolution-message-composer.xml.h:47
 msgid "_Open..."
 msgstr "_Open..."
 
-#: ui/evolution-message-composer.xml.h:48
+#: ../ui/evolution-message-composer.xml.h:48
 msgid "_Post-To Field"
 msgstr "_Post-To Field"
 
-#: ui/evolution-message-composer.xml.h:49
+#: ../ui/evolution-message-composer.xml.h:49
 msgid "_Reply-To Field"
 msgstr "_Reply-To Field"
 
-#: ui/evolution-message-composer.xml.h:50
-#: ui/evolution-signature-editor.xml.h:15
+#: ../ui/evolution-message-composer.xml.h:50
+#: ../ui/evolution-signature-editor.xml.h:15
 msgid "_Save"
 msgstr "_Save"
 
-#: ui/evolution-message-composer.xml.h:51
+#: ../ui/evolution-message-composer.xml.h:51
 msgid "_Security"
 msgstr "_Security"
 
-#: ui/evolution-message-composer.xml.h:52
+#: ../ui/evolution-message-composer.xml.h:52
 msgid "_To Field"
 msgstr "_To Field"
 
-#: ui/evolution-signature-editor.xml.h:1
+#: ../ui/evolution-signature-editor.xml.h:1
 msgid "C_lose"
 msgstr "C_lose"
 
-#: ui/evolution-signature-editor.xml.h:5
+#: ../ui/evolution-signature-editor.xml.h:5
 msgid "H_TML"
 msgstr "H_TML"
 
-#: ui/evolution-signature-editor.xml.h:7
+#: ../ui/evolution-signature-editor.xml.h:7
 msgid "Save and Close"
 msgstr "Save and Close"
 
-#: ui/evolution-signature-editor.xml.h:8
+#: ../ui/evolution-signature-editor.xml.h:8
 msgid "Save and _Close"
 msgstr "Save and _Close"
 
-#: ui/evolution-signature-editor.xml.h:10
+#: ../ui/evolution-signature-editor.xml.h:10
 msgid "Save the current file and close the window"
 msgstr "Save the current file and close the window"
 
-#: ui/evolution-subscribe.xml.h:1
+#: ../ui/evolution-subscribe.xml.h:1
 msgid "Add folder to your list of subscribed folders"
 msgstr "Add folder to your list of subscribed folders"
 
-#: ui/evolution-subscribe.xml.h:2
+#: ../ui/evolution-subscribe.xml.h:2
 msgid "F_older"
 msgstr "F_older"
 
-#: ui/evolution-subscribe.xml.h:3
+#: ../ui/evolution-subscribe.xml.h:3
 msgid "Refresh List"
 msgstr "Refresh List"
 
-#: ui/evolution-subscribe.xml.h:4
+#: ../ui/evolution-subscribe.xml.h:4
 msgid "Refresh List of Folders"
 msgstr "Refresh List of Folders"
 
-#: ui/evolution-subscribe.xml.h:5
+#: ../ui/evolution-subscribe.xml.h:5
 msgid "Remove folder from your list of subscribed folders"
 msgstr "Remove folder from your list of subscribed folders"
 
-#: ui/evolution-subscribe.xml.h:7
+#: ../ui/evolution-subscribe.xml.h:7
 msgid "Subscribe"
 msgstr "Subscribe"
 
-#: ui/evolution-subscribe.xml.h:8
+#: ../ui/evolution-subscribe.xml.h:8
 msgid "Unsubscribe"
 msgstr "Unsubscribe"
 
-#: ui/evolution-tasks.xml.h:3
+#: ../ui/evolution-tasks.xml.h:3
 msgid "Copy selected task"
 msgstr "Copy selected task"
 
-#: ui/evolution-tasks.xml.h:5
+#: ../ui/evolution-tasks.xml.h:5
 msgid "Cut selected task"
 msgstr "Cut selected task"
 
-#: ui/evolution-tasks.xml.h:7
+#: ../ui/evolution-tasks.xml.h:7
 msgid "Delete completed tasks"
 msgstr "Delete completed tasks"
 
-#: ui/evolution-tasks.xml.h:8
+#: ../ui/evolution-tasks.xml.h:8
 msgid "Delete selected tasks"
 msgstr "Delete selected tasks"
 
-#: ui/evolution-tasks.xml.h:9
+#: ../ui/evolution-tasks.xml.h:9
 msgid "Mar_k as Complete"
 msgstr "Mar_k as Complete"
 
-#: ui/evolution-tasks.xml.h:10
+#: ../ui/evolution-tasks.xml.h:10
 msgid "Mark selected tasks as complete"
 msgstr "Mark selected tasks as complete"
 
-#: ui/evolution-tasks.xml.h:12
+#: ../ui/evolution-tasks.xml.h:12
 msgid "Paste task from the clipboard"
 msgstr "Paste task from the clipboard"
 
-#: ui/evolution-tasks.xml.h:13
+#: ../ui/evolution-tasks.xml.h:13
 msgid "Previews the list of tasks to be printed"
 msgstr "Previews the list of tasks to be printed"
 
-#: ui/evolution-tasks.xml.h:16
+#: ../ui/evolution-tasks.xml.h:16
 msgid "Print the list of tasks"
 msgstr "Print the list of tasks"
 
-#: ui/evolution-tasks.xml.h:18
+#: ../ui/evolution-tasks.xml.h:18
 msgid "View the selected task"
 msgstr "View the selected task"
 
-#: ui/evolution-tasks.xml.h:23
+#: ../ui/evolution-tasks.xml.h:23
 msgid "_Open Task"
 msgstr "_Open Task"
 
-#: ui/evolution.xml.h:1
+#: ../ui/evolution.xml.h:1
 msgid "About Evolution..."
 msgstr "About Evolution..."
 
-#: ui/evolution.xml.h:2
+#: ../ui/evolution.xml.h:2
 msgid "Change Evolution's settings"
 msgstr "Change Evolution's settings"
 
-#: ui/evolution.xml.h:3
+#: ../ui/evolution.xml.h:3
 msgid "Change the visibility of the toolbar"
 msgstr "Change the visibility of the toolbar"
 
-#: ui/evolution.xml.h:6
+#: ../ui/evolution.xml.h:6
 msgid "Create a new window displaying this folder"
 msgstr "Create a new window displaying this folder"
 
-#: ui/evolution.xml.h:7
+#: ../ui/evolution.xml.h:7
 msgid "Display window buttons using the desktop toolbar setting"
 msgstr "Display window buttons using the desktop toolbar setting"
 
-#: ui/evolution.xml.h:8
+#: ../ui/evolution.xml.h:8
 msgid "Display window buttons with icons and text"
 msgstr "Display window buttons with icons and text"
 
-#: ui/evolution.xml.h:9
+#: ../ui/evolution.xml.h:9
 msgid "Display window buttons with icons only"
 msgstr "Display window buttons with icons only"
 
-#: ui/evolution.xml.h:10
+#: ../ui/evolution.xml.h:10
 msgid "Display window buttons with text only"
 msgstr "Display window buttons with text only"
 
-#: ui/evolution.xml.h:11
+#: ../ui/evolution.xml.h:11
 msgid "E_xit"
 msgstr "E_xit"
 
-#: ui/evolution.xml.h:12
+#: ../ui/evolution.xml.h:12
 msgid "Evolution _FAQ"
 msgstr "Evolution _FAQ"
 
-#: ui/evolution.xml.h:13
+#: ../ui/evolution.xml.h:13
 msgid "Exit the program"
 msgstr "Exit the program"
 
-#: ui/evolution.xml.h:14
+#: ../ui/evolution.xml.h:14
 msgid "Forget _Passwords"
 msgstr "Forget _Passwords"
 
-#: ui/evolution.xml.h:15
+#: ../ui/evolution.xml.h:15
 msgid "Forget remembered passwords so you will be prompted for them again"
 msgstr "Forget remembered passwords so you will be prompted for them again"
 
-#: ui/evolution.xml.h:16
+#: ../ui/evolution.xml.h:16
 msgid "Hide window buttons"
 msgstr "Hide window buttons"
 
-#: ui/evolution.xml.h:17
+#: ../ui/evolution.xml.h:17
 msgid "Icons _and text"
 msgstr "Icons _and text"
 
-#: ui/evolution.xml.h:18
+#: ../ui/evolution.xml.h:18
 msgid "Import data from other programs"
 msgstr "Import data from other programs"
 
-#: ui/evolution.xml.h:20
+#: ../ui/evolution.xml.h:20
 msgid "New _Window"
 msgstr "New _Window"
 
-#: ui/evolution.xml.h:21
+#: ../ui/evolution.xml.h:21
 msgid "Pi_lot Settings..."
 msgstr "Pi_lot Settings..."
 
-#: ui/evolution.xml.h:22
+#: ../ui/evolution.xml.h:22
 msgid "Prefere_nces"
 msgstr "Prefere_nces"
 
-#: ui/evolution.xml.h:23
+#: ../ui/evolution.xml.h:23
 msgid "Send / Receive"
 msgstr "Send / Receive"
 
-#: ui/evolution.xml.h:24
+#: ../ui/evolution.xml.h:24
 msgid "Send queued items and retrieve new items"
 msgstr "Send queued items and retrieve new items"
 
-#: ui/evolution.xml.h:25
+#: ../ui/evolution.xml.h:25
 msgid "Set up Pilot configuration"
 msgstr "Set up Pilot configuration"
 
-#: ui/evolution.xml.h:26
+#: ../ui/evolution.xml.h:26
 msgid "Show information about Evolution"
 msgstr "Show information about Evolution"
 
-#: ui/evolution.xml.h:27
+#: ../ui/evolution.xml.h:27
 msgid "Submit Bug Report"
 msgstr "Submit Bug Report"
 
-#: ui/evolution.xml.h:28
+#: ../ui/evolution.xml.h:28
 msgid "Submit _Bug Report"
 msgstr "Submit _Bug Report"
 
-#: ui/evolution.xml.h:29
+#: ../ui/evolution.xml.h:29
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Submit a bug report using Bug Buddy"
 
-#: ui/evolution.xml.h:30
+#: ../ui/evolution.xml.h:30
 msgid "Toggle whether we are working offline."
 msgstr "Toggle whether we are working offline."
 
-#: ui/evolution.xml.h:31
+#: ../ui/evolution.xml.h:31
 msgid "Tool_bar"
 msgstr "Tool_bar"
 
-#: ui/evolution.xml.h:32
+#: ../ui/evolution.xml.h:32
 msgid "Tool_bar style"
 msgstr "Tool_bar style"
 
-#: ui/evolution.xml.h:33
+#: ../ui/evolution.xml.h:33
 msgid "Window B_uttons"
 msgstr "Window B_uttons"
 
-#: ui/evolution.xml.h:35
+#: ../ui/evolution.xml.h:35
 msgid "_About Evolution..."
 msgstr "_About Evolution..."
 
-#: ui/evolution.xml.h:40
+#: ../ui/evolution.xml.h:40
 msgid "_Help"
 msgstr "_Help"
 
-#: ui/evolution.xml.h:41
+#: ../ui/evolution.xml.h:41
 msgid "_Hide buttons"
 msgstr "_Hide buttons"
 
-#: ui/evolution.xml.h:42
+#: ../ui/evolution.xml.h:42
 msgid "_Icons only"
 msgstr "_Icons only"
 
-#: ui/evolution.xml.h:43
+#: ../ui/evolution.xml.h:43
 msgid "_Import..."
 msgstr "_Import..."
 
-#: ui/evolution.xml.h:44
+#: ../ui/evolution.xml.h:44
 msgid "_New"
 msgstr "_New"
 
-#: ui/evolution.xml.h:45
+#: ../ui/evolution.xml.h:45
 msgid "_Quick Reference"
 msgstr "_Quick Reference"
 
-#: ui/evolution.xml.h:46
+#: ../ui/evolution.xml.h:46
 msgid "_Send / Receive"
 msgstr "_Send / Receive"
 
-#: ui/evolution.xml.h:47
+#: ../ui/evolution.xml.h:47
 msgid "_Text only"
 msgstr "_Text only"
 
-#: ui/evolution.xml.h:50
+#: ../ui/evolution.xml.h:50
 msgid "_Window"
 msgstr "_Window"
 
-#: views/addressbook/galview.xml.h:1
+#: ../views/addressbook/galview.xml.h:1
 msgid "By _Company"
 msgstr "By _Company"
 
-#: views/addressbook/galview.xml.h:2
+#: ../views/addressbook/galview.xml.h:2
 msgid "_Address Cards"
 msgstr "_Address Cards"
 
-#: views/addressbook/galview.xml.h:3
+#: ../views/addressbook/galview.xml.h:3
 msgid "_Phone List"
 msgstr "_Phone List"
 
-#: views/calendar/galview.xml.h:1
+#: ../views/calendar/galview.xml.h:1
 msgid "W_eek View"
 msgstr "W_eek View"
 
-#: views/calendar/galview.xml.h:2
+#: ../views/calendar/galview.xml.h:2
 msgid "_Day View"
 msgstr "_Day View"
 
-#: views/calendar/galview.xml.h:3
+#: ../views/calendar/galview.xml.h:3
 msgid "_List View"
 msgstr "_List View"
 
-#: views/calendar/galview.xml.h:4
+#: ../views/calendar/galview.xml.h:4
 msgid "_Month View"
 msgstr "_Month View"
 
-#: views/calendar/galview.xml.h:5
+#: ../views/calendar/galview.xml.h:5
 msgid "_Work Week View"
 msgstr "_Work Week View"
 
-#: views/mail/galview.xml.h:1
+#: ../views/mail/galview.xml.h:1
 msgid "As _Sent Folder"
 msgstr "As _Sent Folder"
 
-#: views/mail/galview.xml.h:2
+#: ../views/mail/galview.xml.h:2
 msgid "By S_tatus"
 msgstr "By S_tatus"
 
-#: views/mail/galview.xml.h:3
+#: ../views/mail/galview.xml.h:3
 msgid "By Se_nder"
 msgstr "By Se_nder"
 
-#: views/mail/galview.xml.h:4
+#: ../views/mail/galview.xml.h:4
 msgid "By Su_bject"
 msgstr "By Su_bject"
 
-#: views/mail/galview.xml.h:5
+#: ../views/mail/galview.xml.h:5
 msgid "By _Follow Up Flag"
 msgstr "By _Follow Up Flag"
 
-#: views/mail/galview.xml.h:6
+#: ../views/mail/galview.xml.h:6
 msgid "_Messages"
 msgstr "_Messages"
 
-#: views/tasks/galview.xml.h:1
+#: ../views/tasks/galview.xml.h:1
 msgid "With _Due Date"
 msgstr "With _Due Date"
 
-#: views/tasks/galview.xml.h:2
+#: ../views/tasks/galview.xml.h:2
 msgid "With _Status"
 msgstr "With _Status"
 
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:195
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:637
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:195
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:637
 msgid "UTC"
 msgstr "UTC"
 
-#: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:2
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:2
 msgid "<b>Time Zones</b>"
 msgstr "<b>Time Zones</b>"
 
-#: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:3
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:3
 msgid "<b>_Selection</b>"
 msgstr "<b>_Selection:</b>"
 
-#: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:5
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:5
 msgid "Select a Time Zone"
 msgstr "Select a Time Zone"
 
-#: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:6
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:6
 msgid "TimeZone Combobox"
 msgstr "TimeZone Combobox"
 
-#: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:7
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:7
 msgid ""
 "Use the left mouse button to zoom in on an area of the map and select a time "
 "zone.\n"
@@ -17524,204 +17607,205 @@ msgstr ""
 "zone.\n"
 "Use the right mouse button to zoom out."
 
-#: widgets/menus/gal-view-menus.c:292
+#: ../widgets/menus/gal-view-menus.c:291
 msgid "_Current View"
 msgstr "_Current View"
 
-#: widgets/menus/gal-view-menus.c:360
+#: ../widgets/menus/gal-view-menus.c:359
 msgid "Save Custom View..."
 msgstr "Save Custom View..."
 
 #. Translators: These are the first characters of each day of the
 #. week, 'M' for 'Monday', 'T' for Tuesday etc.
-#: widgets/misc/e-calendar-item.c:415
+#: ../widgets/misc/e-calendar-item.c:415
 msgid "MTWTFSS"
 msgstr "MTWTFSS"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: widgets/misc/e-calendar-item.c:1123
+#: ../widgets/misc/e-calendar-item.c:1123
 msgid "%B %Y"
 msgstr "%B %Y"
 
-#: widgets/misc/e-calendar.c:177 widgets/misc/e-calendar.c:201
+#: ../widgets/misc/e-calendar.c:177 ../widgets/misc/e-calendar.c:201
 msgid "Previous Button"
 msgstr "Previous Button"
 
-#: widgets/misc/e-calendar.c:226
+#: ../widgets/misc/e-calendar.c:226
 msgid "Month Calendar"
 msgstr "Month Calendar"
 
-#: widgets/misc/e-cell-date-edit.c:232 widgets/misc/e-dateedit.c:444
+#: ../widgets/misc/e-cell-date-edit.c:232 ../widgets/misc/e-dateedit.c:444
 msgid "Now"
 msgstr "Now"
 
-#: widgets/misc/e-cell-date-edit.c:801
+#: ../widgets/misc/e-cell-date-edit.c:801
 #, c-format
 msgid "The time must be in the format: %s"
 msgstr "The time must be in the format: %s"
 
-#: widgets/misc/e-cell-percent.c:76
+#: ../widgets/misc/e-cell-percent.c:76
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "The percent value must be between 0 and 100, inclusive"
 
-#: widgets/misc/e-charset-picker.c:63
+#: ../widgets/misc/e-charset-picker.c:63
 msgid "Baltic"
 msgstr "Baltic"
 
-#: widgets/misc/e-charset-picker.c:64
+#: ../widgets/misc/e-charset-picker.c:64
 msgid "Central European"
 msgstr "Central European"
 
-#: widgets/misc/e-charset-picker.c:65
+#: ../widgets/misc/e-charset-picker.c:65
 msgid "Chinese"
 msgstr "Chinese"
 
-#: widgets/misc/e-charset-picker.c:66
+#: ../widgets/misc/e-charset-picker.c:66
 msgid "Cyrillic"
 msgstr "Cyrillic"
 
-#: widgets/misc/e-charset-picker.c:67
+#: ../widgets/misc/e-charset-picker.c:67
 msgid "Greek"
 msgstr "Greek"
 
-#: widgets/misc/e-charset-picker.c:68
+#: ../widgets/misc/e-charset-picker.c:68
 msgid "Hebrew"
 msgstr "Hebrew"
 
-#: widgets/misc/e-charset-picker.c:69
+#: ../widgets/misc/e-charset-picker.c:69
 msgid "Japanese"
 msgstr "Japanese"
 
-#: widgets/misc/e-charset-picker.c:70
+#: ../widgets/misc/e-charset-picker.c:70
 msgid "Korean"
 msgstr "Korean"
 
-#: widgets/misc/e-charset-picker.c:71
+#: ../widgets/misc/e-charset-picker.c:71
 msgid "Turkish"
 msgstr "Turkish"
 
-#: widgets/misc/e-charset-picker.c:72
+#: ../widgets/misc/e-charset-picker.c:72
 msgid "Unicode"
 msgstr "Unicode"
 
-#: widgets/misc/e-charset-picker.c:73
+#: ../widgets/misc/e-charset-picker.c:73
 msgid "Western European"
 msgstr "Western European"
 
-#: widgets/misc/e-charset-picker.c:74
+#: ../widgets/misc/e-charset-picker.c:74
 msgid "Western European, New"
 msgstr "Western European, New"
 
-#: widgets/misc/e-charset-picker.c:91 widgets/misc/e-charset-picker.c:92
-#: widgets/misc/e-charset-picker.c:93
+#: ../widgets/misc/e-charset-picker.c:91 ../widgets/misc/e-charset-picker.c:92
+#: ../widgets/misc/e-charset-picker.c:93
 msgid "Traditional"
 msgstr "Traditional"
 
-#: widgets/misc/e-charset-picker.c:94 widgets/misc/e-charset-picker.c:95
-#: widgets/misc/e-charset-picker.c:96 widgets/misc/e-charset-picker.c:97
+#: ../widgets/misc/e-charset-picker.c:94 ../widgets/misc/e-charset-picker.c:95
+#: ../widgets/misc/e-charset-picker.c:96 ../widgets/misc/e-charset-picker.c:97
 msgid "Simplified"
 msgstr "Simplified"
 
-#: widgets/misc/e-charset-picker.c:100
+#: ../widgets/misc/e-charset-picker.c:100
 msgid "Ukrainian"
 msgstr "Ukrainian"
 
-#: widgets/misc/e-charset-picker.c:103
+#: ../widgets/misc/e-charset-picker.c:103
 msgid "Visual"
 msgstr "Visual"
 
-#: widgets/misc/e-charset-picker.c:171
+#: ../widgets/misc/e-charset-picker.c:171
 #, c-format
 msgid "Unknown character set: %s"
 msgstr "Unknown character set: %s"
 
-#: widgets/misc/e-charset-picker.c:216 widgets/misc/e-charset-picker.c:479
+#: ../widgets/misc/e-charset-picker.c:216
+#: ../widgets/misc/e-charset-picker.c:479
 msgid "Character Encoding"
 msgstr "Character Encoding"
 
-#: widgets/misc/e-charset-picker.c:231
+#: ../widgets/misc/e-charset-picker.c:231
 msgid "Enter the character set to use"
 msgstr "Enter the character set to use"
 
-#: widgets/misc/e-charset-picker.c:338
+#: ../widgets/misc/e-charset-picker.c:338
 msgid "Other..."
 msgstr "Other..."
 
-#: widgets/misc/e-clipped-label.c:111
+#: ../widgets/misc/e-clipped-label.c:111
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-dateedit.c:313
+#: ../widgets/misc/e-dateedit.c:313
 msgid "Date and Time Entry"
 msgstr "Date and Time Entry"
 
-#: widgets/misc/e-dateedit.c:332
+#: ../widgets/misc/e-dateedit.c:332
 msgid "Text entry to input date"
 msgstr "Text entry to input date"
 
-#: widgets/misc/e-dateedit.c:333
+#: ../widgets/misc/e-dateedit.c:333
 msgid "Text Date Entry"
 msgstr "Text Date Entry"
 
-#: widgets/misc/e-dateedit.c:350
+#: ../widgets/misc/e-dateedit.c:350
 msgid "Click this button to show a calendar"
 msgstr "Click this button to show a calendar"
 
-#: widgets/misc/e-dateedit.c:351
+#: ../widgets/misc/e-dateedit.c:351
 msgid "Date Button"
 msgstr "Date Button"
 
-#: widgets/misc/e-dateedit.c:371
+#: ../widgets/misc/e-dateedit.c:371
 msgid "Combo box to select time"
 msgstr "Combo box to select time"
 
-#: widgets/misc/e-dateedit.c:372
+#: ../widgets/misc/e-dateedit.c:372
 msgid "Time Combo Box"
 msgstr "Time Combo Box"
 
-#: widgets/misc/e-error.c:84 widgets/misc/e-error.c:85
-#: widgets/misc/e-error.c:127
+#: ../widgets/misc/e-error.c:84 ../widgets/misc/e-error.c:85
+#: ../widgets/misc/e-error.c:127
 msgid "Evolution Error"
 msgstr "Evolution Error"
 
-#: widgets/misc/e-error.c:86 widgets/misc/e-error.c:87
-#: widgets/misc/e-error.c:125
+#: ../widgets/misc/e-error.c:86 ../widgets/misc/e-error.c:87
+#: ../widgets/misc/e-error.c:125
 msgid "Evolution Warning"
 msgstr "Evolution Warning"
 
-#: widgets/misc/e-error.c:124
+#: ../widgets/misc/e-error.c:124
 msgid "Evolution Information"
 msgstr "Evolution Information"
 
-#: widgets/misc/e-error.c:126
+#: ../widgets/misc/e-error.c:126
 msgid "Evolution Query"
 msgstr "Evolution Query"
 
 #. setup a dummy error
-#: widgets/misc/e-error.c:438
+#: ../widgets/misc/e-error.c:438
 #, c-format
 msgid ""
 "<span weight=\"bold\">Internal error, unknown error '%s' requested</span>"
 msgstr ""
 "<span weight=\"bold\">Internal error, unknown error '%s' requested</span>"
 
-#: widgets/misc/e-expander.c:181
+#: ../widgets/misc/e-expander.c:181
 msgid "Expanded"
 msgstr "Expanded"
 
-#: widgets/misc/e-expander.c:182
+#: ../widgets/misc/e-expander.c:182
 msgid "Whether or not the expander is expanded"
 msgstr "Whether or not the expander is expanded"
 
-#: widgets/misc/e-expander.c:190
+#: ../widgets/misc/e-expander.c:190
 msgid "Text of the expander's label"
 msgstr "Text of the expander's label"
 
-#: widgets/misc/e-expander.c:197
+#: ../widgets/misc/e-expander.c:197
 msgid "Use underline"
 msgstr "Use underline"
 
-#: widgets/misc/e-expander.c:198
+#: ../widgets/misc/e-expander.c:198
 msgid ""
 "If set, an underline in the text indicates the next character should be used "
 "for the mnemonic accelerator key"
@@ -17729,72 +17813,72 @@ msgstr ""
 "If set, an underline in the text indicates the next character should be used "
 "for the mnemonic accelerator key"
 
-#: widgets/misc/e-expander.c:205
+#: ../widgets/misc/e-expander.c:205
 msgid "Spacing"
 msgstr "Spacing"
 
-#: widgets/misc/e-expander.c:206
+#: ../widgets/misc/e-expander.c:206
 msgid "Space to put between the label and the child"
 msgstr "Space to put between the label and the child"
 
-#: widgets/misc/e-expander.c:215
+#: ../widgets/misc/e-expander.c:215
 msgid "Label widget"
 msgstr "Label widget"
 
-#: widgets/misc/e-expander.c:216
+#: ../widgets/misc/e-expander.c:216
 msgid "A widget to display in place of the usual expander label"
 msgstr "A widget to display in place of the usual expander label"
 
-#: widgets/misc/e-expander.c:222
+#: ../widgets/misc/e-expander.c:222
 msgid "Expander Size"
 msgstr "Expander Size"
 
-#: widgets/misc/e-expander.c:223
+#: ../widgets/misc/e-expander.c:223
 msgid "Size of the expander arrow"
 msgstr "Size of the expander arrow"
 
-#: widgets/misc/e-expander.c:231
+#: ../widgets/misc/e-expander.c:231
 msgid "Indicator Spacing"
 msgstr "Indicator Spacing"
 
-#: widgets/misc/e-expander.c:232
+#: ../widgets/misc/e-expander.c:232
 msgid "Spacing around expander arrow"
 msgstr "Spacing around expander arrow"
 
-#: widgets/misc/e-filter-bar.c:195
+#: ../widgets/misc/e-filter-bar.c:195
 msgid "_Searches"
 msgstr "_Searches"
 
-#: widgets/misc/e-filter-bar.c:197
+#: ../widgets/misc/e-filter-bar.c:197
 msgid "Search Editor"
 msgstr "Search Editor"
 
 #. FIXME: get the toplevel window...
-#: widgets/misc/e-filter-bar.c:220
+#: ../widgets/misc/e-filter-bar.c:220
 msgid "Save Search"
 msgstr "Save Search"
 
-#: widgets/misc/e-filter-bar.h:92 widgets/misc/e-filter-bar.h:99
+#: ../widgets/misc/e-filter-bar.h:92 ../widgets/misc/e-filter-bar.h:99
 msgid "_Save Search..."
 msgstr "_Save Search..."
 
-#: widgets/misc/e-filter-bar.h:93 widgets/misc/e-filter-bar.h:100
+#: ../widgets/misc/e-filter-bar.h:93 ../widgets/misc/e-filter-bar.h:100
 msgid "_Edit Saved Searches..."
 msgstr "_Edit Saved Searches..."
 
-#: widgets/misc/e-filter-bar.h:94 widgets/misc/e-filter-bar.h:101
+#: ../widgets/misc/e-filter-bar.h:94 ../widgets/misc/e-filter-bar.h:101
 msgid "_Advanced..."
 msgstr "_Advanced..."
 
-#: widgets/misc/e-image-chooser.c:172
+#: ../widgets/misc/e-image-chooser.c:172
 msgid "Choose Image"
 msgstr "Choose Image"
 
-#: widgets/misc/e-map.c:647
+#: ../widgets/misc/e-map.c:647
 msgid "World Map"
 msgstr "World Map"
 
-#: widgets/misc/e-map.c:649
+#: ../widgets/misc/e-map.c:649
 msgid ""
 "Mouse-based interactive map widget for selecting timezone. Keyboard users "
 "should select the timezone from the below combo box instead."
@@ -17802,97 +17886,97 @@ msgstr ""
 "Mouse-based interactive map widget for selecting timezone. Keyboard users "
 "should select the timezone from the below combo box instead."
 
-#: widgets/misc/e-pilot-settings.c:103
+#: ../widgets/misc/e-pilot-settings.c:103
 msgid "Sync with:"
 msgstr "Sync with:"
 
-#: widgets/misc/e-pilot-settings.c:111
+#: ../widgets/misc/e-pilot-settings.c:111
 msgid "Sync Private Records:"
 msgstr "Sync Private Records:"
 
-#: widgets/misc/e-pilot-settings.c:120
+#: ../widgets/misc/e-pilot-settings.c:120
 msgid "Sync Categories:"
 msgstr "Sync Categories:"
 
 #. To translators: This is the accessibility name of
 #. the search bar's text entry widget
-#: widgets/misc/e-search-bar.c:343
+#: ../widgets/misc/e-search-bar.c:345
 msgid "Search Text Entry"
 msgstr "Search Text Entry"
 
-#: widgets/misc/e-search-bar.c:547
+#: ../widgets/misc/e-search-bar.c:549
 msgid "_Search"
 msgstr "_Search"
 
-#: widgets/misc/e-search-bar.c:553
+#: ../widgets/misc/e-search-bar.c:555
 msgid "_Find Now"
 msgstr "_Find Now"
 
-#: widgets/misc/e-search-bar.c:554 widgets/misc/e-search-bar.c:941
+#: ../widgets/misc/e-search-bar.c:556 ../widgets/misc/e-search-bar.c:943
 msgid "_Clear"
 msgstr "_Clear"
 
-#: widgets/misc/e-search-bar.c:645
+#: ../widgets/misc/e-search-bar.c:647
 msgid "Search Type"
 msgstr "Search Type"
 
-#: widgets/misc/e-search-bar.c:849
+#: ../widgets/misc/e-search-bar.c:851
 msgid "Item ID"
 msgstr "Item ID"
 
-#: widgets/misc/e-search-bar.c:856
+#: ../widgets/misc/e-search-bar.c:858
 msgid "Subitem ID"
 msgstr "Subitem ID"
 
-#: widgets/misc/e-search-bar.c:863
+#: ../widgets/misc/e-search-bar.c:865
 msgid "Text"
 msgstr "Text"
 
-#: widgets/misc/e-search-bar.c:943
+#: ../widgets/misc/e-search-bar.c:945
 msgid "Find _Now"
 msgstr "Find _Now"
 
-#: widgets/misc/e-send-options.c:505
+#: ../widgets/misc/e-send-options.c:506
 msgid "When de_leted:"
 msgstr "When de_leted:"
 
-#: widgets/misc/e-send-options.glade.h:1
+#: ../widgets/misc/e-send-options.glade.h:1
 msgid "<b>Delivery Options</b>"
 msgstr "<b>Delivery Options</b>"
 
-#: widgets/misc/e-send-options.glade.h:2
+#: ../widgets/misc/e-send-options.glade.h:2
 msgid "<b>Replies</b>"
 msgstr "<b>Replies</b>"
 
-#: widgets/misc/e-send-options.glade.h:3
+#: ../widgets/misc/e-send-options.glade.h:3
 msgid "<b>Return Notification</b>"
 msgstr "<b>Return Notification</b>"
 
-#: widgets/misc/e-send-options.glade.h:4
+#: ../widgets/misc/e-send-options.glade.h:4
 msgid "<b>Status Tracking</b>"
 msgstr "<b>Status Tracking</b>"
 
-#: widgets/misc/e-send-options.glade.h:5
+#: ../widgets/misc/e-send-options.glade.h:5
 msgid "A_uto-delete sent item"
 msgstr "A_uto-delete sent item"
 
-#: widgets/misc/e-send-options.glade.h:6
+#: ../widgets/misc/e-send-options.glade.h:6
 msgid "C_lassification"
 msgstr "C_lassification"
 
-#: widgets/misc/e-send-options.glade.h:7
+#: ../widgets/misc/e-send-options.glade.h:7
 msgid "Creat_e a sent item to track information"
 msgstr "Creat_e a sent item to track information"
 
-#: widgets/misc/e-send-options.glade.h:8
+#: ../widgets/misc/e-send-options.glade.h:8
 msgid "Deli_vered and opened"
 msgstr "Deli_vered and opened"
 
-#: widgets/misc/e-send-options.glade.h:9
+#: ../widgets/misc/e-send-options.glade.h:9
 msgid "Gene_ral Options"
 msgstr "Gene_ral Options"
 
-#: widgets/misc/e-send-options.glade.h:10
+#: ../widgets/misc/e-send-options.glade.h:10
 msgid ""
 "None\n"
 "Mail Receipt"
@@ -17900,7 +17984,7 @@ msgstr ""
 "None\n"
 "Mail Receipt"
 
-#: widgets/misc/e-send-options.glade.h:12
+#: ../widgets/misc/e-send-options.glade.h:12
 msgid ""
 "None\n"
 "Mail Receipt\n"
@@ -17908,7 +17992,7 @@ msgstr ""
 "None\n"
 "Mail Receipt\n"
 
-#: widgets/misc/e-send-options.glade.h:15
+#: ../widgets/misc/e-send-options.glade.h:15
 msgid ""
 "Public\n"
 "Private\n"
@@ -17918,15 +18002,15 @@ msgstr ""
 "Private\n"
 "Confidential\n"
 
-#: widgets/misc/e-send-options.glade.h:19
+#: ../widgets/misc/e-send-options.glade.h:19
 msgid "R_eply requested"
 msgstr "R_eply requested"
 
-#: widgets/misc/e-send-options.glade.h:21
+#: ../widgets/misc/e-send-options.glade.h:21
 msgid "Sta_tus  Tracking"
 msgstr "Sta_tus Tracking"
 
-#: widgets/misc/e-send-options.glade.h:22
+#: ../widgets/misc/e-send-options.glade.h:22
 msgid ""
 "Undefined\n"
 "High\n"
@@ -17938,84 +18022,84 @@ msgstr ""
 "Standard\n"
 "Low"
 
-#: widgets/misc/e-send-options.glade.h:26
+#: ../widgets/misc/e-send-options.glade.h:26
 msgid "W_ithin"
 msgstr "W_ithin"
 
-#: widgets/misc/e-send-options.glade.h:27
+#: ../widgets/misc/e-send-options.glade.h:27
 msgid "When acce_pted: "
 msgstr "When acce_pted: "
 
-#: widgets/misc/e-send-options.glade.h:28
+#: ../widgets/misc/e-send-options.glade.h:28
 msgid "When co_mpleted:"
 msgstr "When co_mpleted:"
 
-#: widgets/misc/e-send-options.glade.h:29
+#: ../widgets/misc/e-send-options.glade.h:29
 msgid "When decli_ned:    "
 msgstr "When decli_ned:    "
 
-#: widgets/misc/e-send-options.glade.h:30
+#: ../widgets/misc/e-send-options.glade.h:30
 msgid "_After:"
 msgstr "_After:"
 
-#: widgets/misc/e-send-options.glade.h:31
+#: ../widgets/misc/e-send-options.glade.h:31
 msgid "_All information"
 msgstr "_All information"
 
-#: widgets/misc/e-send-options.glade.h:32
+#: ../widgets/misc/e-send-options.glade.h:32
 msgid "_Delay message delivery"
 msgstr "_Delay message delivery"
 
-#: widgets/misc/e-send-options.glade.h:33
+#: ../widgets/misc/e-send-options.glade.h:33
 msgid "_Delivered"
 msgstr "_Delivered"
 
-#: widgets/misc/e-send-options.glade.h:35
+#: ../widgets/misc/e-send-options.glade.h:35
 msgid "_Set expiration  date"
 msgstr "_Set expiration  date"
 
-#: widgets/misc/e-send-options.glade.h:36
+#: ../widgets/misc/e-send-options.glade.h:36
 msgid "_Until:"
 msgstr "_Until:"
 
-#: widgets/misc/e-send-options.glade.h:37
+#: ../widgets/misc/e-send-options.glade.h:37
 msgid "_When convenient"
 msgstr "_When convenient"
 
-#: widgets/misc/e-send-options.glade.h:38
+#: ../widgets/misc/e-send-options.glade.h:38
 msgid "_When opened:     "
 msgstr "_When opened:     "
 
 #. system:ask-save-file-exists-overwrite primary
-#: widgets/misc/e-system-errors.xml.h:4
+#: ../widgets/misc/e-system-errors.xml.h:4
 msgid "File exists \"{0}\"."
 msgstr "File exists \"{0}\"."
 
 #. system:ask-save-file-exists-overwrite secondary
-#: widgets/misc/e-system-errors.xml.h:6
+#: ../widgets/misc/e-system-errors.xml.h:6
 msgid "Do you wish to overwrite it?"
 msgstr "Do you wish to overwrite it?"
 
 #. system:no-save-file primary
-#: widgets/misc/e-system-errors.xml.h:9
+#: ../widgets/misc/e-system-errors.xml.h:9
 msgid "Cannot save file \"{0}\"."
 msgstr "Cannot save file \"{0}\"."
 
 #. system:no-load-file primary
-#: widgets/misc/e-system-errors.xml.h:13
+#: ../widgets/misc/e-system-errors.xml.h:13
 msgid "Cannot open file \"{0}\"."
 msgstr "Cannot open file \"{0}\"."
 
-#: widgets/misc/e-task-widget.c:208
+#: ../widgets/misc/e-task-widget.c:208
 #, c-format
 msgid "%s (...)"
 msgstr "%s (...)"
 
-#: widgets/misc/e-task-widget.c:213
+#: ../widgets/misc/e-task-widget.c:213
 #, c-format
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% complete)"
 
-#: widgets/misc/e-url-entry.c:107
+#: ../widgets/misc/e-url-entry.c:107
 msgid "click here to go to url"
 msgstr "Click here to go to URL"