aboutsummaryrefslogtreecommitdiffstats
path: root/po
diff options
context:
space:
mode:
authorPhilip Withnall <philip@tecnocode.co.uk>2008-09-03 14:48:58 +0800
committerPhilip Withnall <pwithnall@src.gnome.org>2008-09-03 14:48:58 +0800
commit78f4c4b426652b2f8a8197b33dc500b1761765fc (patch)
treeafa687ee86693a0714c36c29a5f2f485c02711ae /po
parent111bb57f0d0b24b1f74c8c05d5d07443454cc74e (diff)
downloadgsoc2013-evolution-78f4c4b426652b2f8a8197b33dc500b1761765fc.tar.gz
gsoc2013-evolution-78f4c4b426652b2f8a8197b33dc500b1761765fc.tar.zst
gsoc2013-evolution-78f4c4b426652b2f8a8197b33dc500b1761765fc.zip
Updated British English translation.
2008-09-03 Philip Withnall <philip@tecnocode.co.uk> * en_GB.po: Updated British English translation. svn path=/trunk/; revision=36252
Diffstat (limited to 'po')
-rw-r--r--po/ChangeLog4
-rw-r--r--po/en_GB.po8448
2 files changed, 4427 insertions, 4025 deletions
diff --git a/po/ChangeLog b/po/ChangeLog
index 81678298ef..16e584f0c6 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,7 @@
+2008-09-03 Philip Withnall <philip@tecnocode.co.uk>
+
+ * en_GB.po: Updated British English translation.
+
2008-08-31 Priit Laes <plaes at svn dot gnome dot org>
* et.po: Translation updated by Ivar Smolin
diff --git a/po/en_GB.po b/po/en_GB.po
index e48855593b..2b55572af7 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -2,12 +2,12 @@
# Robert Brady <rwb197@zepler.org>, 2000.
# Gareth Owen <gowen72@yahoo.com>, David Lodge <dave@cirt.net>, 2004.
#
-#: ../shell/main.c:695
+#: ../shell/main.c:589
msgid ""
msgstr ""
"Project-Id-Version: evolution gnome-2.8\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-05-25 13:54+0100\n"
+"POT-Creation-Date: 2008-09-03 07:48+0100\n"
"PO-Revision-Date: 2008-02-17 10:08-0000\n"
"Last-Translator: David Lodge <dave@cirt.net>\n"
"Language-Team: \n"
@@ -18,21 +18,21 @@ msgstr ""
#: ../a11y/addressbook/ea-addressbook-view.c:94
#: ../a11y/addressbook/ea-addressbook-view.c:103
-#: ../a11y/addressbook/ea-minicard-view.c:179
-msgid "evolution addressbook"
-msgstr "evolution addressbook"
+#: ../a11y/addressbook/ea-minicard-view.c:178
+msgid "evolution address book"
+msgstr "evolution address book"
-#: ../a11y/addressbook/ea-minicard-view.c:33
-#: ../addressbook/gui/component/addressbook-component.c:228
+#: ../a11y/addressbook/ea-minicard-view.c:32
+#: ../addressbook/gui/component/addressbook-component.c:229
msgid "New Contact"
msgstr "New Contact"
-#: ../a11y/addressbook/ea-minicard-view.c:34
-#: ../addressbook/gui/component/addressbook-component.c:236
+#: ../a11y/addressbook/ea-minicard-view.c:33
+#: ../addressbook/gui/component/addressbook-component.c:237
msgid "New Contact List"
msgstr "New Contact List"
-#: ../a11y/addressbook/ea-minicard-view.c:162
+#: ../a11y/addressbook/ea-minicard-view.c:161
#, c-format
msgid "current address book folder %s has %d card"
msgid_plural "current address book folder %s has %d cards"
@@ -55,63 +55,63 @@ msgstr "Contact: "
msgid "evolution minicard"
msgstr "evolution minicard"
-#: ../a11y/calendar/ea-cal-view-event.c:266
+#: ../a11y/calendar/ea-cal-view-event.c:265
msgid "It has alarms."
msgstr "It has alarms."
-#: ../a11y/calendar/ea-cal-view-event.c:269
+#: ../a11y/calendar/ea-cal-view-event.c:268
msgid "It has recurrences."
msgstr "It has recurrences."
-#: ../a11y/calendar/ea-cal-view-event.c:272
+#: ../a11y/calendar/ea-cal-view-event.c:271
msgid "It is a meeting."
msgstr "It is a meeting."
-#: ../a11y/calendar/ea-cal-view-event.c:278
+#: ../a11y/calendar/ea-cal-view-event.c:277
#, c-format
msgid "Calendar Event: Summary is %s."
msgstr "Calendar Event: Summary is %s."
-#: ../a11y/calendar/ea-cal-view-event.c:280
+#: ../a11y/calendar/ea-cal-view-event.c:279
msgid "Calendar Event: It has no summary."
msgstr "Calendar Event: It has no summary."
-#: ../a11y/calendar/ea-cal-view-event.c:300
+#: ../a11y/calendar/ea-cal-view-event.c:299
msgid "calendar view event"
msgstr "calendar view event"
-#: ../a11y/calendar/ea-cal-view-event.c:528
+#: ../a11y/calendar/ea-cal-view-event.c:527
msgid "Grab Focus"
msgstr "Grab Focus"
-#: ../a11y/calendar/ea-cal-view.c:302
+#: ../a11y/calendar/ea-cal-view.c:299
msgid "New Appointment"
msgstr "New Appointment"
-#: ../a11y/calendar/ea-cal-view.c:303
+#: ../a11y/calendar/ea-cal-view.c:300
msgid "New All Day Event"
msgstr "New All Day Event"
-#: ../a11y/calendar/ea-cal-view.c:304
+#: ../a11y/calendar/ea-cal-view.c:301
msgid "New Meeting"
msgstr "New Meeting"
-#: ../a11y/calendar/ea-cal-view.c:305
+#: ../a11y/calendar/ea-cal-view.c:302
msgid "Go to Today"
msgstr "Go to Today"
-#: ../a11y/calendar/ea-cal-view.c:306
+#: ../a11y/calendar/ea-cal-view.c:303
msgid "Go to Date"
msgstr "Go to Date"
-#: ../a11y/calendar/ea-day-view-main-item.c:303
-#: ../a11y/calendar/ea-week-view-main-item.c:301
+#: ../a11y/calendar/ea-day-view-main-item.c:301
+#: ../a11y/calendar/ea-week-view-main-item.c:298
msgid "a table to view and select the current time range"
msgstr "a table to view and select the current time range"
#. To translators: Here, "It" is either like "Work Week View: July
#. 10th - July 14th, 2006." or "Day View: Thursday July 13th, 2006."
-#: ../a11y/calendar/ea-day-view.c:151 ../a11y/calendar/ea-week-view.c:150
+#: ../a11y/calendar/ea-day-view.c:151 ../a11y/calendar/ea-week-view.c:147
#, c-format
msgid "It has %d event."
msgid_plural "It has %d events."
@@ -120,7 +120,7 @@ msgstr[1] "It has %d events."
#. To translators: Here, "It" is either like "Work Week View: July
#. 10th - July 14th, 2006." or "Day View: Thursday July 13th, 2006."
-#: ../a11y/calendar/ea-day-view.c:155 ../a11y/calendar/ea-week-view.c:152
+#: ../a11y/calendar/ea-day-view.c:155 ../a11y/calendar/ea-week-view.c:149
msgid "It has no events."
msgstr "It has no events."
@@ -148,8 +148,8 @@ msgstr "calendar view for a work week"
msgid "calendar view for one or more days"
msgstr "calendar view for one or more days"
-#: ../a11y/calendar/ea-gnome-calendar.c:188
-#: ../calendar/gui/calendar-component.c:747
+#: ../a11y/calendar/ea-gnome-calendar.c:186
+#: ../calendar/gui/calendar-component.c:757
msgid "%A %d %b %Y"
msgstr "%A %d %b %Y"
@@ -159,30 +159,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:191
-#: ../calendar/gui/calendar-component.c:750
-#: ../calendar/gui/e-day-view-top-item.c:856 ../calendar/gui/e-day-view.c:1545
-#: ../calendar/gui/e-week-view-main-item.c:340
+#: ../a11y/calendar/ea-gnome-calendar.c:189
+#: ../calendar/gui/calendar-component.c:760
+#: ../calendar/gui/e-day-view-top-item.c:856 ../calendar/gui/e-day-view.c:1568
+#: ../calendar/gui/e-week-view-main-item.c:339
msgid "%a %d %b"
msgstr "%a %d %b"
-#: ../a11y/calendar/ea-gnome-calendar.c:193
+#: ../a11y/calendar/ea-gnome-calendar.c:191
+#: ../a11y/calendar/ea-gnome-calendar.c:196
#: ../a11y/calendar/ea-gnome-calendar.c:198
-#: ../a11y/calendar/ea-gnome-calendar.c:200
-#: ../calendar/gui/calendar-component.c:752
-#: ../calendar/gui/calendar-component.c:757
-#: ../calendar/gui/calendar-component.c:759
+#: ../calendar/gui/calendar-component.c:762
+#: ../calendar/gui/calendar-component.c:767
+#: ../calendar/gui/calendar-component.c:769
msgid "%a %d %b %Y"
msgstr "%a %d %b %Y"
-#: ../a11y/calendar/ea-gnome-calendar.c:217
-#: ../a11y/calendar/ea-gnome-calendar.c:223
+#: ../a11y/calendar/ea-gnome-calendar.c:215
+#: ../a11y/calendar/ea-gnome-calendar.c:221
+#: ../a11y/calendar/ea-gnome-calendar.c:227
#: ../a11y/calendar/ea-gnome-calendar.c:229
-#: ../a11y/calendar/ea-gnome-calendar.c:231
-#: ../calendar/gui/calendar-component.c:771
-#: ../calendar/gui/calendar-component.c:778
-#: ../calendar/gui/calendar-component.c:784
-#: ../calendar/gui/calendar-component.c:786
+#: ../calendar/gui/calendar-component.c:781
+#: ../calendar/gui/calendar-component.c:788
+#: ../calendar/gui/calendar-component.c:794
+#: ../calendar/gui/calendar-component.c:796
msgid "%d %b %Y"
msgstr "%d %b %Y"
@@ -191,59 +191,59 @@ 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:221
-#: ../calendar/gui/calendar-component.c:776
-#: ../calendar/gui/e-day-view-top-item.c:860 ../calendar/gui/e-day-view.c:1561
-#: ../calendar/gui/e-week-view-main-item.c:354
+#: ../a11y/calendar/ea-gnome-calendar.c:219
+#: ../calendar/gui/calendar-component.c:786
+#: ../calendar/gui/e-day-view-top-item.c:860 ../calendar/gui/e-day-view.c:1584
+#: ../calendar/gui/e-week-view-main-item.c:353
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:772
+#: ../a11y/calendar/ea-gnome-calendar.c:245
+#: ../a11y/calendar/ea-gnome-calendar.c:253
+#: ../calendar/importers/icalendar-importer.c:766
msgid "Gnome Calendar"
msgstr "Gnome Calendar"
-#: ../a11y/calendar/ea-gnome-calendar.c:290
+#: ../a11y/calendar/ea-gnome-calendar.c:288
msgid "search bar"
msgstr "search bar"
-#: ../a11y/calendar/ea-gnome-calendar.c:291
+#: ../a11y/calendar/ea-gnome-calendar.c:289
msgid "evolution calendar search bar"
msgstr "evolution calendar search bar"
-#: ../a11y/calendar/ea-jump-button.c:149
+#: ../a11y/calendar/ea-jump-button.c:147
msgid "Jump button"
msgstr "Jump button"
-#: ../a11y/calendar/ea-jump-button.c:158
+#: ../a11y/calendar/ea-jump-button.c:156
msgid "Click here, you can find more events."
msgstr "Click here, you can find more events."
-#: ../a11y/calendar/ea-week-view.c:157
+#: ../a11y/calendar/ea-week-view.c:154
#, c-format
msgid "Month View: %s. %s"
msgstr "Month View: %s. %s"
-#: ../a11y/calendar/ea-week-view.c:161
+#: ../a11y/calendar/ea-week-view.c:158
#, c-format
msgid "Week View: %s. %s"
msgstr "Week View: %s. %s"
-#: ../a11y/calendar/ea-week-view.c:192
+#: ../a11y/calendar/ea-week-view.c:189
msgid "calendar view for a month"
msgstr "calendar view for a month"
-#: ../a11y/calendar/ea-week-view.c:194
+#: ../a11y/calendar/ea-week-view.c:191
msgid "calendar view for one or more weeks"
msgstr "calendar view for one or more weeks"
-#: ../a11y/e-table/gal-a11y-e-cell-popup.c:124
+#: ../a11y/e-table/gal-a11y-e-cell-popup.c:121
msgid "popup"
msgstr "popup"
#. action name
-#: ../a11y/e-table/gal-a11y-e-cell-popup.c:125
+#: ../a11y/e-table/gal-a11y-e-cell-popup.c:122
msgid "popup a child"
msgstr "pop up a child"
@@ -255,12 +255,12 @@ msgstr "edit"
msgid "begin editing this cell"
msgstr "begin editing this cell"
-#: ../a11y/e-table/gal-a11y-e-cell-toggle.c:151
+#: ../a11y/e-table/gal-a11y-e-cell-toggle.c:172
msgid "toggle"
msgstr "toggle"
#. action name
-#: ../a11y/e-table/gal-a11y-e-cell-toggle.c:152
+#: ../a11y/e-table/gal-a11y-e-cell-toggle.c:173
msgid "toggle the cell"
msgstr "toggle the cell"
@@ -280,47 +280,47 @@ msgstr "collapse"
msgid "collapses the row in the ETree containing this cell"
msgstr "collapses the row in the ETree containing this cell"
-#: ../a11y/e-table/gal-a11y-e-cell.c:107
+#: ../a11y/e-table/gal-a11y-e-cell.c:121
msgid "Table Cell"
msgstr "Table Cell"
-#: ../a11y/e-table/gal-a11y-e-table-click-to-add.c:44
-#: ../a11y/e-table/gal-a11y-e-table-click-to-add.c:119
-#: ../widgets/table/e-table-click-to-add.c:581
+#: ../a11y/e-table/gal-a11y-e-table-click-to-add.c:59
+#: ../a11y/e-table/gal-a11y-e-table-click-to-add.c:134
+#: ../widgets/table/e-table-click-to-add.c:580
msgid "click to add"
msgstr "click to add"
-#: ../a11y/e-table/gal-a11y-e-table-click-to-add.c:53
+#: ../a11y/e-table/gal-a11y-e-table-click-to-add.c:68
msgid "click"
msgstr "click"
-#: ../a11y/e-table/gal-a11y-e-table-column-header.c:135
+#: ../a11y/e-table/gal-a11y-e-table-column-header.c:152
msgid "sort"
msgstr "sort"
-#: ../a11y/widgets/ea-calendar-item.c:298
-#: ../a11y/widgets/ea-calendar-item.c:304
+#: ../a11y/widgets/ea-calendar-item.c:295
+#: ../a11y/widgets/ea-calendar-item.c:301
msgid "%d %B %Y"
msgstr "%d %B %Y"
-#: ../a11y/widgets/ea-calendar-item.c:306
+#: ../a11y/widgets/ea-calendar-item.c:303
#, c-format
msgid "Calendar: from %s to %s"
msgstr "Calendar: from %s to %s"
-#: ../a11y/widgets/ea-calendar-item.c:341
+#: ../a11y/widgets/ea-calendar-item.c:338
msgid "evolution calendar item"
msgstr "evolution calendar item"
-#: ../a11y/widgets/ea-combo-button.c:40
+#: ../a11y/widgets/ea-combo-button.c:56
msgid "Combo Button"
msgstr "Combo Button"
-#: ../a11y/widgets/ea-combo-button.c:50
+#: ../a11y/widgets/ea-combo-button.c:66
msgid "Activate Default"
msgstr "Activate Default"
-#: ../a11y/widgets/ea-combo-button.c:52
+#: ../a11y/widgets/ea-combo-button.c:68
msgid "Popup Menu"
msgstr "Popup Menu"
@@ -335,11 +335,11 @@ msgstr "activate"
#. For Translators: {0} is the name of the address book source
#: ../addressbook/addressbook.error.xml.h:2
msgid ""
-"'{0}' is a read-only address book source. Switch to Contacts View and "
-"highlight an address book that can accept contacts."
+"'{0}' is a read-only address book and cannot be modified. Please select a "
+"different address book from the side bar in the Contacts view."
msgstr ""
-"'{0}' is a read-only address book source. Switch to Contacts View and "
-"highlight an address book that can accept contacts."
+"'{0}' is a read-only address book and cannot be modified. Please select a "
+"different address book from the side bar in the Contacts view."
#: ../addressbook/addressbook.error.xml.h:3
msgid ""
@@ -371,8 +371,8 @@ msgid ""
"a supported login method. Remember that many passwords are case sensitive; "
"your caps lock might be on."
msgstr ""
-"Check to make sure your password is spelt correctly and that you are using "
-"a supported login method. Remember that many passwords are case-sensitive; "
+"Check to make sure your password is spelt correctly and that you are using a "
+"supported login method. Remember that many passwords are case-sensitive; "
"your caps lock might be on."
#: ../addressbook/addressbook.error.xml.h:9
@@ -380,25 +380,25 @@ msgid "Could not get schema information for LDAP server."
msgstr "Could not get schema information for LDAP server."
#: ../addressbook/addressbook.error.xml.h:10
-msgid "Could not remove addressbook."
+msgid "Could not remove address book."
msgstr "Could not remove address book."
#: ../addressbook/addressbook.error.xml.h:11
msgid ""
"Currently you can access only GroupWise System Address Book from Evolution. "
"Please use some other GroupWise mail client once, to get your GroupWise "
-"Frequent Contacts and Groupwise Personal Contacts folders."
+"Frequent Contacts and GroupWise Personal Contacts folders."
msgstr ""
-"Currently you can only access the GroupWise System Address Book from "
-"Evolution. Please use some other GroupWise mail client once to get your "
-"GroupWise Frequent Contacts and Groupwise Personal Contacts folders."
+"Currently you can access only GroupWise System Address Book from Evolution. "
+"Please use some other GroupWise mail client once, to get your GroupWise "
+"Frequent Contacts and GroupWise Personal Contacts folders."
#: ../addressbook/addressbook.error.xml.h:12
msgid "Delete address book '{0}'?"
msgstr "Delete address book '{0}'?"
#: ../addressbook/addressbook.error.xml.h:13
-msgid "Error loading addressbook."
+msgid "Error loading address book."
msgstr "Error loading address book."
#: ../addressbook/addressbook.error.xml.h:14
@@ -411,7 +411,7 @@ msgstr "Failed to authenticate with LDAP server."
#. Unknown error
#: ../addressbook/addressbook.error.xml.h:16
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1730
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1734
msgid "Failed to delete contact"
msgstr "Failed to delete contact"
@@ -432,7 +432,7 @@ msgid "Some features may not work properly with your current server"
msgstr "Some features may not work properly with your current server"
#: ../addressbook/addressbook.error.xml.h:21
-msgid "The Evolution addressbook has quit unexpectedly."
+msgid "The Evolution address book has quit unexpectedly."
msgstr "The Evolution address book has quit unexpectedly."
#: ../addressbook/addressbook.error.xml.h:22
@@ -453,31 +453,31 @@ msgstr ""
"supported search bases."
#: ../addressbook/addressbook.error.xml.h:24
-msgid "This address book will be removed permanently."
-msgstr "This address book will be removed permanently."
-
-#: ../addressbook/addressbook.error.xml.h:25
-msgid "This addressbook could not be opened."
+msgid "This address book could not be opened."
msgstr "This address book could not be opened."
-#: ../addressbook/addressbook.error.xml.h:26
-msgid "This addressbook server does not have any suggested search bases."
+#: ../addressbook/addressbook.error.xml.h:25
+msgid "This address book server does not have any suggested search bases."
msgstr "This address book server does not have any suggested search bases."
-#: ../addressbook/addressbook.error.xml.h:27
+#: ../addressbook/addressbook.error.xml.h:26
msgid ""
-"This addressbook server might be unreachable or the server name may be "
+"This address book server might be unreachable or the server name may be "
"misspelled or your network connection could be down."
msgstr ""
-"This addressbook server might be unreachable or the server name may be "
-"misspelt or your network connection could be down."
+"This address book server might be unreachable, the server name may be "
+"misspelt, or your network connection could be down."
+
+#: ../addressbook/addressbook.error.xml.h:27
+msgid "This address book will be removed permanently."
+msgstr "This address book will be removed permanently."
#: ../addressbook/addressbook.error.xml.h:28
msgid "This server does not support LDAPv3 schema information."
msgstr "This server does not support LDAPv3 schema information."
#: ../addressbook/addressbook.error.xml.h:29
-msgid "Unable to open addressbook"
+msgid "Unable to open address book"
msgstr "Unable to open address book"
#: ../addressbook/addressbook.error.xml.h:30
@@ -494,7 +494,7 @@ msgstr "Would you like to save your changes?"
#: ../addressbook/addressbook.error.xml.h:33
msgid ""
-"You are attempting to move a contact from one addressbook to another but it "
+"You are attempting to move a contact from one address book to another but it "
"cannot be removed from the source. Do you want to save a copy instead?"
msgstr ""
"You are attempting to move a contact from one address book to another but it "
@@ -511,11 +511,8 @@ msgstr ""
"a supported version"
#: ../addressbook/addressbook.error.xml.h:35
-msgid ""
-"You do not have enough permissions to delete contact in this Address Book."
-msgstr ""
-"You do not have enough permissions to delete a contact from this Address "
-"Book."
+msgid "You do not have permission to delete contacts in this address book."
+msgstr "You do not have permission to delete contacts in this address book."
#: ../addressbook/addressbook.error.xml.h:36
msgid ""
@@ -554,9 +551,9 @@ msgstr "_Resize"
msgid "_Use as it is"
msgstr "_Use as it is"
-#. For Translators: {0} is the string describing why the search could not be performed (eg: "The backend for this addressbook was unable to parse this query."
+#. For Translators: {0} is the string describing why the search could not be performed (eg: "The backend for this address book was unable to parse this query."
#: ../addressbook/addressbook.error.xml.h:44 ../mail/mail.error.xml.h:143
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:81
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:82
msgid "{0}"
msgstr "{0}"
@@ -565,17 +562,17 @@ msgstr "{0}"
msgid "{1}"
msgstr "{1}"
-#: ../addressbook/conduit/address-conduit.c:298
+#: ../addressbook/conduit/address-conduit.c:299
msgid "Default Sync Address:"
msgstr "Default Sync Address:"
-#: ../addressbook/conduit/address-conduit.c:1319
#: ../addressbook/conduit/address-conduit.c:1320
-msgid "Could not load addressbook"
+#: ../addressbook/conduit/address-conduit.c:1321
+msgid "Could not load address book"
msgstr "Could not load address book"
-#: ../addressbook/conduit/address-conduit.c:1397
-#: ../addressbook/conduit/address-conduit.c:1400
+#: ../addressbook/conduit/address-conduit.c:1398
+#: ../addressbook/conduit/address-conduit.c:1401
msgid "Could not read pilot's Address application block"
msgstr "Could not read pilot's Address application block"
@@ -597,10 +594,10 @@ 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:1338
-#: ../calendar/gui/calendar-component.c:285 ../calendar/gui/migration.c:401
-#: ../plugins/exchange-operations/exchange-delegates-user.c:88
-#: ../plugins/exchange-operations/exchange-folder.c:581
+#: ../addressbook/gui/component/addressbook-view.c:1326
+#: ../calendar/gui/calendar-component.c:299 ../calendar/gui/migration.c:396
+#: ../plugins/exchange-operations/exchange-delegates-user.c:76
+#: ../plugins/exchange-operations/exchange-folder.c:582
msgid "Contacts"
msgstr "Contacts"
@@ -625,8 +622,8 @@ msgid "Evolution Address Book component"
msgstr "Evolution Address Book component"
#: ../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"
+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
msgid "Evolution folder settings configuration control"
@@ -640,12 +637,13 @@ msgstr "Manage your S/MIME certificates here"
#. On This Computer is always first and Search Folders is always last
#: ../addressbook/gui/component/addressbook-component.c:144
#: ../addressbook/gui/component/addressbook-migrate.c:499
-#: ../calendar/gui/calendar-component.c:237
-#: ../calendar/gui/memos-component.c:200 ../calendar/gui/migration.c:480
-#: ../calendar/gui/migration.c:582 ../calendar/gui/migration.c:1096
-#: ../calendar/gui/tasks-component.c:196 ../mail/em-folder-tree-model.c:200
-#: ../mail/em-folder-tree-model.c:202 ../mail/mail-component.c:308
-#: ../mail/mail-vfolder.c:216 ../mail/message-list.c:1455
+#: ../calendar/gui/calendar-component.c:236
+#: ../calendar/gui/memos-component.c:199 ../calendar/gui/migration.c:475
+#: ../calendar/gui/migration.c:577 ../calendar/gui/migration.c:1091
+#: ../calendar/gui/tasks-component.c:195 ../mail/em-folder-tree-model.c:200
+#: ../mail/em-folder-tree-model.c:202 ../mail/em-migrate.c:2906
+#: ../mail/mail-component.c:312 ../mail/mail-vfolder.c:216
+#: ../mail/message-list.c:1457
msgid "On This Computer"
msgstr "On This Computer"
@@ -658,121 +656,110 @@ msgstr "On This Computer"
#: ../addressbook/gui/component/addressbook-migrate.c:507
#: ../addressbook/gui/contact-editor/contact-editor.glade.h:20
#: ../addressbook/gui/widgets/eab-contact-display.c:660
-#: ../calendar/gui/calendar-component.c:248
-#: ../calendar/gui/memos-component.c:209 ../calendar/gui/migration.c:490
-#: ../calendar/gui/migration.c:590 ../calendar/gui/migration.c:1104
-#: ../calendar/gui/tasks-component.c:205 ../mail/em-migrate.c:1055
+#: ../calendar/gui/calendar-component.c:247 ../calendar/gui/caltypes.xml.h:29
+#: ../calendar/gui/memos-component.c:208 ../calendar/gui/memotypes.xml.h:27
+#: ../calendar/gui/migration.c:485 ../calendar/gui/migration.c:585
+#: ../calendar/gui/migration.c:1099 ../calendar/gui/tasks-component.c:204
+#: ../calendar/gui/tasktypes.xml.h:35 ../mail/em-migrate.c:1058
msgid "Personal"
msgstr "Personal"
#. Create the LDAP source group
-#: ../addressbook/gui/component/addressbook-component.c:162
+#: ../addressbook/gui/component/addressbook-component.c:163
#: ../addressbook/gui/component/addressbook-migrate.c:517
msgid "On LDAP Servers"
msgstr "On LDAP Servers"
-#: ../addressbook/gui/component/addressbook-component.c:229
-msgid "_Contact"
-msgstr "_Contact"
-
-#: ../addressbook/gui/component/addressbook-component.c:230
+#: ../addressbook/gui/component/addressbook-component.c:231
msgid "Create a new contact"
msgstr "Create a new contact"
-#: ../addressbook/gui/component/addressbook-component.c:237
-msgid "Contact _List"
-msgstr "Contact _List"
-
-#: ../addressbook/gui/component/addressbook-component.c:238
+#: ../addressbook/gui/component/addressbook-component.c:239
msgid "Create a new contact list"
msgstr "Create a new contact list"
-#: ../addressbook/gui/component/addressbook-component.c:244
-#: ../addressbook/gui/component/addressbook-config.c:1206
+#: ../addressbook/gui/component/addressbook-component.c:245
+#: ../addressbook/gui/component/addressbook-config.c:1207
msgid "New Address Book"
msgstr "New Address Book"
-#: ../addressbook/gui/component/addressbook-component.c:245
-msgid "Address _Book"
-msgstr "Address _Book"
-
-#: ../addressbook/gui/component/addressbook-component.c:246
+#: ../addressbook/gui/component/addressbook-component.c:247
msgid "Create a new address book"
msgstr "Create a new address book"
-#: ../addressbook/gui/component/addressbook-component.c:409
+#: ../addressbook/gui/component/addressbook-component.c:410
msgid "Failed upgrading Address Book settings or folders."
msgstr "Failed upgrading Address Book settings or folders."
-#: ../addressbook/gui/component/addressbook-config.c:329
+#: ../addressbook/gui/component/addressbook-config.c:316
msgid "Base"
msgstr "Base"
-#: ../addressbook/gui/component/addressbook-config.c:530
-#: ../calendar/gui/dialogs/calendar-setup.c:172
+#: ../addressbook/gui/component/addressbook-config.c:517
+#: ../calendar/gui/dialogs/calendar-setup.c:169
msgid "_Type:"
msgstr "_Type:"
-#: ../addressbook/gui/component/addressbook-config.c:632
+#: ../addressbook/gui/component/addressbook-config.c:619
msgid "Copy _book content locally for offline operation"
msgstr "Copy _book content locally for offline operation"
-#: ../addressbook/gui/component/addressbook-config.c:981
-#: ../addressbook/gui/component/ldap-config.glade.h:20
+#: ../addressbook/gui/component/addressbook-config.c:982
+#: ../addressbook/gui/component/ldap-config.glade.h:22
#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
-#: ../calendar/gui/dialogs/calendar-setup.c:369
-#: ../calendar/gui/dialogs/calendar-setup.c:380
-#: ../calendar/gui/dialogs/calendar-setup.c:391
-#: ../mail/em-folder-properties.c:292 ../mail/mail-config.glade.h:89
-#: ../plugins/itip-formatter/itip-formatter.c:2362
+#: ../calendar/gui/dialogs/calendar-setup.c:366
+#: ../calendar/gui/dialogs/calendar-setup.c:377
+#: ../calendar/gui/dialogs/calendar-setup.c:388
+#: ../mail/em-folder-properties.c:282 ../mail/mail-config.glade.h:89
+#: ../plugins/itip-formatter/itip-formatter.c:2367
#: ../smime/gui/smime-ui.glade.h:28
msgid "General"
msgstr "General"
-#: ../addressbook/gui/component/addressbook-config.c:982
-#: ../addressbook/gui/widgets/e-addressbook-view.c:559
-#: ../mail/importers/pine-importer.c:387
+#: ../addressbook/gui/component/addressbook-config.c:983
+#: ../addressbook/gui/widgets/e-addressbook-view.c:555
+#: ../mail/importers/pine-importer.c:385
msgid "Address Book"
msgstr "Address Book"
-#: ../addressbook/gui/component/addressbook-config.c:986
+#: ../addressbook/gui/component/addressbook-config.c:987
msgid "Server Information"
msgstr "Server Information"
-#: ../addressbook/gui/component/addressbook-config.c:988
+#: ../addressbook/gui/component/addressbook-config.c:989
msgid "Authentication"
msgstr "Authentication"
-#: ../addressbook/gui/component/addressbook-config.c:991
-#: ../addressbook/gui/component/ldap-config.glade.h:15
-#: ../mail/mail-dialogs.glade.h:10 ../smime/gui/smime-ui.glade.h:20
+#: ../addressbook/gui/component/addressbook-config.c:992
+#: ../addressbook/gui/component/ldap-config.glade.h:17
+#: ../smime/gui/smime-ui.glade.h:20
msgid "Details"
msgstr "Details"
-#: ../addressbook/gui/component/addressbook-config.c:992
-#: ../mail/em-folder-browser.c:960
+#: ../addressbook/gui/component/addressbook-config.c:993
+#: ../mail/em-folder-browser.c:983
msgid "Searching"
msgstr "Searching"
-#: ../addressbook/gui/component/addressbook-config.c:994
+#: ../addressbook/gui/component/addressbook-config.c:995
msgid "Downloading"
msgstr "Downloading"
-#: ../addressbook/gui/component/addressbook-config.c:1204
+#: ../addressbook/gui/component/addressbook-config.c:1205
#: ../addressbook/gui/component/ldap-config.glade.h:11
msgid "Address Book Properties"
msgstr "Address Book Properties"
#: ../addressbook/gui/component/addressbook-migrate.c:73
-#: ../calendar/gui/migration.c:153 ../mail/em-migrate.c:1202
+#: ../calendar/gui/migration.c:148 ../mail/em-migrate.c:1207
msgid "Migrating..."
msgstr "Migrating..."
#: ../addressbook/gui/component/addressbook-migrate.c:125
-#: ../calendar/gui/migration.c:200 ../mail/em-migrate.c:1243
+#: ../calendar/gui/migration.c:195 ../mail/em-migrate.c:1247
#, c-format
-msgid "Migrating `%s':"
-msgstr "Migrating `%s':"
+msgid "Migrating '%s':"
+msgstr "Migrating '%s':"
#: ../addressbook/gui/component/addressbook-migrate.c:645
msgid "LDAP Servers"
@@ -824,70 +811,76 @@ msgstr ""
"\n"
"Please be patient while Evolution migrates your Pilot Sync data..."
-#: ../addressbook/gui/component/addressbook-view.c:434
-#: ../mail/em-folder-utils.c:503
+#: ../addressbook/gui/component/addressbook-view.c:425
+#: ../mail/em-folder-utils.c:501
#, c-format
msgid "Rename the \"%s\" folder to:"
msgstr "Rename the \"%s\" folder to:"
-#: ../addressbook/gui/component/addressbook-view.c:437
-#: ../mail/em-folder-utils.c:505
+#: ../addressbook/gui/component/addressbook-view.c:428
+#: ../mail/em-folder-utils.c:503
msgid "Rename Folder"
msgstr "Rename Folder"
-#: ../addressbook/gui/component/addressbook-view.c:442
-#: ../mail/em-folder-utils.c:511
+#: ../addressbook/gui/component/addressbook-view.c:433
+#: ../mail/em-folder-utils.c:509
msgid "Folder names cannot contain '/'"
msgstr "Folder names cannot contain '/'"
-#: ../addressbook/gui/component/addressbook-view.c:954
+#: ../addressbook/gui/component/addressbook-view.c:942
msgid "_New Address Book"
msgstr "_New Address Book"
-#: ../addressbook/gui/component/addressbook-view.c:955
+#: ../addressbook/gui/component/addressbook-view.c:943
msgid "Save As vCard..."
msgstr "Save As vCard..."
-#: ../addressbook/gui/component/addressbook-view.c:958
-#: ../addressbook/gui/widgets/e-addressbook-view.c:959
-#: ../calendar/gui/calendar-component.c:609
-#: ../calendar/gui/e-calendar-table.c:1387
-#: ../calendar/gui/e-calendar-view.c:1709 ../calendar/gui/e-memo-table.c:941
+#: ../addressbook/gui/component/addressbook-view.c:946
+#: ../addressbook/gui/widgets/e-addressbook-view.c:955
+#: ../calendar/gui/calendar-component.c:619
+#: ../calendar/gui/e-calendar-table.c:1596
+#: ../calendar/gui/e-calendar-view.c:1693 ../calendar/gui/e-memo-table.c:941
#: ../calendar/gui/memos-component.c:468 ../calendar/gui/tasks-component.c:459
-#: ../mail/em-folder-tree.c:2092 ../mail/em-folder-view.c:1347
+#: ../mail/em-folder-tree.c:2111 ../mail/em-folder-view.c:1340
#: ../ui/evolution-addressbook.xml.h:49 ../ui/evolution-calendar.xml.h:40
#: ../ui/evolution-mail-list.xml.h:35 ../ui/evolution-memos.xml.h:16
#: ../ui/evolution-tasks.xml.h:24
msgid "_Delete"
msgstr "_Delete"
-#: ../addressbook/gui/component/addressbook-view.c:961
-msgid "_Properties..."
-msgstr "_Properties..."
+#: ../addressbook/gui/component/addressbook-view.c:949
+#: ../calendar/gui/calendar-component.c:622
+#: ../calendar/gui/dialogs/comp-editor.c:2035
+#: ../calendar/gui/memos-component.c:471 ../calendar/gui/tasks-component.c:462
+#: ../composer/e-msg-composer.c:1046 ../mail/em-folder-tree.c:2120
+#: ../ui/evolution-addressbook.xml.h:59 ../ui/evolution-mail-list.xml.h:38
+msgid "_Properties"
+msgstr "_Properties"
-#: ../addressbook/gui/component/addressbook-view.c:1349
+#: ../addressbook/gui/component/addressbook-view.c:1337
msgid "Contact Source Selector"
msgstr "Contact Source Selector"
-#: ../addressbook/gui/component/addressbook.c:99
+#: ../addressbook/gui/component/addressbook.c:102
msgid "Accessing LDAP Server anonymously"
msgstr "Accessing LDAP Server anonymously"
-#: ../addressbook/gui/component/addressbook.c:200
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:536
+#: ../addressbook/gui/component/addressbook.c:207
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:535
msgid "Failed to authenticate.\n"
msgstr "Failed to authenticate.\n"
-#: ../addressbook/gui/component/addressbook.c:207
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:516
+#: ../addressbook/gui/component/addressbook.c:214
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:515
#, c-format
msgid "Enter password for %s (user %s)"
msgstr "Enter password for %s (user %s)"
-#: ../addressbook/gui/component/addressbook.c:215
+#: ../addressbook/gui/component/addressbook.c:222
#: ../calendar/common/authentication.c:51
+#: ../plugins/google-account-setup/google-source.c:444
#: ../plugins/publish-calendar/publish-calendar.c:190
-#: ../smime/gui/component.c:50
+#: ../smime/gui/component.c:49
msgid "Enter password"
msgstr "Enter password"
@@ -981,7 +974,7 @@ msgid "Add Address Book"
msgstr "Add Address Book"
#: ../addressbook/gui/component/ldap-config.glade.h:12
-#: ../mail/em-account-editor.c:777
+#: ../mail/em-account-editor.c:761
msgid "Always"
msgstr "Always"
@@ -989,73 +982,78 @@ msgstr "Always"
msgid "Anonymously"
msgstr "Anonymously"
-#: ../addressbook/gui/component/ldap-config.glade.h:14
+#. To translators: If enabled, addressbook will only fetch contacts from the server until either set time limit or amount of contacts limit reached
+#: ../addressbook/gui/component/ldap-config.glade.h:15
+msgid "B_rowse this book until limit reached"
+msgstr "B_rowse this book until limit reached"
+
+#: ../addressbook/gui/component/ldap-config.glade.h:16
msgid "Basic"
msgstr "Basic"
-#: ../addressbook/gui/component/ldap-config.glade.h:16
+#: ../addressbook/gui/component/ldap-config.glade.h:18
msgid "Distinguished name"
msgstr "Distinguished name"
-#: ../addressbook/gui/component/ldap-config.glade.h:17
+#: ../addressbook/gui/component/ldap-config.glade.h:19
msgid "Email address"
msgstr "E-mail address"
-#: ../addressbook/gui/component/ldap-config.glade.h:18
+#: ../addressbook/gui/component/ldap-config.glade.h:20
msgid ""
"Evolution will use this email address to authenticate you with the server."
msgstr ""
"Evolution will use this e-mail address to authenticate you with the server."
-#: ../addressbook/gui/component/ldap-config.glade.h:19
+#: ../addressbook/gui/component/ldap-config.glade.h:21
msgid "Find Possible Search Bases"
msgstr "Find Possible Search Bases"
-#: ../addressbook/gui/component/ldap-config.glade.h:21
+#: ../addressbook/gui/component/ldap-config.glade.h:23
msgid "Lo_gin:"
msgstr "Lo_gin:"
-#: ../addressbook/gui/component/ldap-config.glade.h:22
-#: ../mail/em-account-editor.c:776
+#: ../addressbook/gui/component/ldap-config.glade.h:24
+#: ../mail/em-account-editor.c:760
msgid "Never"
msgstr "Never"
#. Translators: This string is a "Use secure connection" option for
#. the Mailer. It will not use an encrypted connection.
-#: ../addressbook/gui/component/ldap-config.glade.h:23
-#: ../mail/em-account-editor.c:304
+#: ../addressbook/gui/component/ldap-config.glade.h:25
+#: ../mail/em-account-editor.c:288
msgid "No encryption"
msgstr "No encryption"
-#: ../addressbook/gui/component/ldap-config.glade.h:24
+#: ../addressbook/gui/component/ldap-config.glade.h:26
msgid "One"
msgstr "One"
#. Translators: This string is a "Use secure connection" option for
#. the Mailer. SSL (Secure Sockets Layer) is commonly known by this
#. abbreviation.
-#: ../addressbook/gui/component/ldap-config.glade.h:25
-#: ../mail/em-account-editor.c:312
+#: ../addressbook/gui/component/ldap-config.glade.h:27
+#: ../mail/em-account-editor.c:296
msgid "SSL encryption"
msgstr "SSL encryption"
-#: ../addressbook/gui/component/ldap-config.glade.h:26
+#: ../addressbook/gui/component/ldap-config.glade.h:28
msgid "Search Filter"
msgstr "Search Filter"
-#: ../addressbook/gui/component/ldap-config.glade.h:27
+#: ../addressbook/gui/component/ldap-config.glade.h:29
msgid "Search _base:"
msgstr "Search _base:"
-#: ../addressbook/gui/component/ldap-config.glade.h:28
+#: ../addressbook/gui/component/ldap-config.glade.h:30
msgid "Search _filter:"
msgstr "Search _filter:"
-#: ../addressbook/gui/component/ldap-config.glade.h:29
+#: ../addressbook/gui/component/ldap-config.glade.h:31
msgid "Search filter"
msgstr "Search filter"
-#: ../addressbook/gui/component/ldap-config.glade.h:30
+#: ../addressbook/gui/component/ldap-config.glade.h:32
msgid ""
"Search filter is the type of the objects searched for, while performing the "
"search. If this is not modified, by default search will be performed on "
@@ -1064,7 +1062,7 @@ msgstr ""
"Search filter is the type of object to be searched for. If this is not "
"modified, the default search will be performed on the type \"person\"."
-#: ../addressbook/gui/component/ldap-config.glade.h:31
+#: ../addressbook/gui/component/ldap-config.glade.h:33
msgid ""
"Selecting this option means that Evolution will only connect to your LDAP "
"server if your LDAP server supports SSL."
@@ -1072,7 +1070,7 @@ msgstr ""
"Selecting this option means that Evolution will only connect to your LDAP "
"server if your LDAP server supports SSL."
-#: ../addressbook/gui/component/ldap-config.glade.h:32
+#: ../addressbook/gui/component/ldap-config.glade.h:34
msgid ""
"Selecting this option means that Evolution will only connect to your LDAP "
"server if your LDAP server supports TLS."
@@ -1080,7 +1078,7 @@ msgstr ""
"Selecting this option means that Evolution will only connect to your LDAP "
"server if your LDAP server supports TLS."
-#: ../addressbook/gui/component/ldap-config.glade.h:33
+#: ../addressbook/gui/component/ldap-config.glade.h:35
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 "
@@ -1090,23 +1088,23 @@ 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:34
+#: ../addressbook/gui/component/ldap-config.glade.h:36
msgid "Sub"
msgstr "Sub"
-#: ../addressbook/gui/component/ldap-config.glade.h:35
+#: ../addressbook/gui/component/ldap-config.glade.h:37
msgid "Supported Search Bases"
msgstr "Supported Search Bases"
#. Translators: This string is a "Use secure connection" option for
#. the Mailer. TLS (Transport Layer Security) is commonly known by
#. this abbreviation.
-#: ../addressbook/gui/component/ldap-config.glade.h:36
-#: ../mail/em-account-editor.c:308
+#: ../addressbook/gui/component/ldap-config.glade.h:38
+#: ../mail/em-account-editor.c:292
msgid "TLS encryption"
msgstr "TLS encryption"
-#: ../addressbook/gui/component/ldap-config.glade.h:37
+#: ../addressbook/gui/component/ldap-config.glade.h:39
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 "
@@ -1116,7 +1114,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:38
+#: ../addressbook/gui/component/ldap-config.glade.h:40
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 "
@@ -1128,7 +1126,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:39
+#: ../addressbook/gui/component/ldap-config.glade.h:41
msgid ""
"This is the full name of your ldap server. For example, \"ldap.mycompany.com"
"\"."
@@ -1136,7 +1134,7 @@ msgstr ""
"This is the full name of your LDAP server. For example, \"ldap.mycompany.com"
"\"."
-#: ../addressbook/gui/component/ldap-config.glade.h:40
+#: ../addressbook/gui/component/ldap-config.glade.h:42
msgid ""
"This is the maximum number of entries to download. Setting this number to be "
"too large will slow down your address book."
@@ -1144,7 +1142,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:41
+#: ../addressbook/gui/component/ldap-config.glade.h:43
msgid ""
"This is the method Evolution will use to authenticate you. Note that "
"setting this to \"Email Address\" requires anonymous access to your ldap "
@@ -1154,7 +1152,7 @@ msgstr ""
"setting this to \"E-mail Address\" requires anonymous access to your LDAP "
"server."
-#: ../addressbook/gui/component/ldap-config.glade.h:42
+#: ../addressbook/gui/component/ldap-config.glade.h:44
msgid ""
"This is the name for this server that will appear in your Evolution folder "
"list. It is for display purposes only. "
@@ -1162,7 +1160,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:43
+#: ../addressbook/gui/component/ldap-config.glade.h:45
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 "
@@ -1172,75 +1170,76 @@ msgstr ""
"list of standard ports has been provided. Ask your system administrator what "
"port you should specify."
-#: ../addressbook/gui/component/ldap-config.glade.h:44
+#: ../addressbook/gui/component/ldap-config.glade.h:46
msgid "Using distinguished name (DN)"
msgstr "Using distinguished name (DN)"
-#: ../addressbook/gui/component/ldap-config.glade.h:45
+#: ../addressbook/gui/component/ldap-config.glade.h:47
msgid "Using email address"
msgstr "Using e-mail address"
-#: ../addressbook/gui/component/ldap-config.glade.h:46
+#: ../addressbook/gui/component/ldap-config.glade.h:48
msgid "Whenever Possible"
msgstr "Whenever Possible"
-#: ../addressbook/gui/component/ldap-config.glade.h:47
+#: ../addressbook/gui/component/ldap-config.glade.h:49
msgid "_Add Address Book"
msgstr "_Add Address Book"
-#: ../addressbook/gui/component/ldap-config.glade.h:48
+#: ../addressbook/gui/component/ldap-config.glade.h:50
msgid "_Download limit:"
msgstr "_Download limit:"
-#: ../addressbook/gui/component/ldap-config.glade.h:49
+#: ../addressbook/gui/component/ldap-config.glade.h:51
msgid "_Find Possible Search Bases"
msgstr "_Find Possible Search Bases"
-#: ../addressbook/gui/component/ldap-config.glade.h:50
+#: ../addressbook/gui/component/ldap-config.glade.h:52
msgid "_Login method:"
msgstr "_Login method:"
-#: ../addressbook/gui/component/ldap-config.glade.h:51
-#: ../calendar/gui/dialogs/calendar-setup.c:229
-#: ../mail/mail-config.glade.h:174
+#: ../addressbook/gui/component/ldap-config.glade.h:53
+#: ../calendar/gui/dialogs/calendar-setup.c:226
+#: ../mail/mail-config.glade.h:175
#: ../plugins/groupwise-features/properties.glade.h:11
#: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:2
msgid "_Name:"
msgstr "_Name:"
-#: ../addressbook/gui/component/ldap-config.glade.h:52
+#: ../addressbook/gui/component/ldap-config.glade.h:54
msgid "_Port:"
msgstr "_Port:"
-#: ../addressbook/gui/component/ldap-config.glade.h:53
+#: ../addressbook/gui/component/ldap-config.glade.h:55
msgid "_Search scope:"
msgstr "_Search scope:"
-#: ../addressbook/gui/component/ldap-config.glade.h:54
-#: ../mail/mail-config.glade.h:183
+#: ../addressbook/gui/component/ldap-config.glade.h:56
+#: ../mail/mail-config.glade.h:184
#: ../plugins/publish-calendar/publish-calendar.glade.h:26
msgid "_Server:"
msgstr "_Server:"
-#: ../addressbook/gui/component/ldap-config.glade.h:55
+#: ../addressbook/gui/component/ldap-config.glade.h:57
msgid "_Timeout:"
msgstr "_Timeout:"
-#: ../addressbook/gui/component/ldap-config.glade.h:56
+#: ../addressbook/gui/component/ldap-config.glade.h:58
msgid "_Use secure connection:"
msgstr "_Use secure connection:"
-#: ../addressbook/gui/component/ldap-config.glade.h:57
+#: ../addressbook/gui/component/ldap-config.glade.h:59
msgid "cards"
msgstr "cards"
-#: ../addressbook/gui/component/ldap-config.glade.h:58
+#: ../addressbook/gui/component/ldap-config.glade.h:60
#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:8
#: ../calendar/gui/dialogs/alarm-dialog.glade.h:27
#: ../calendar/gui/dialogs/event-page.glade.h:20 ../filter/filter.glade.h:17
-#: ../plugins/calendar-http/calendar-http.c:288
+#: ../plugins/calendar-http/calendar-http.c:279
#: ../plugins/calendar-weather/calendar-weather.c:561
-#: ../plugins/google-account-setup/google-source.c:395
+#: ../plugins/google-account-setup/google-source.c:662
+#: ../plugins/google-account-setup/google-contacts-source.c:328
msgid "minutes"
msgstr "minutes"
@@ -1281,7 +1280,7 @@ msgid "<b>Work</b>"
msgstr "<b>Work</b>"
#: ../addressbook/gui/contact-editor/contact-editor.glade.h:10
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:183
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:174
#: ../addressbook/gui/widgets/eab-contact-display.c:614
msgid "AIM"
msgstr "AIM"
@@ -1293,16 +1292,16 @@ msgid "Ca_tegories..."
msgstr "Ca_tegories..."
#: ../addressbook/gui/contact-editor/contact-editor.glade.h:12
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:272
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1156
-#: ../addressbook/gui/widgets/e-minicard.c:201
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:263
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1158
+#: ../addressbook/gui/widgets/e-minicard.c:198
msgid "Contact"
msgstr "Contact"
#: ../addressbook/gui/contact-editor/contact-editor.glade.h:13
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:549
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:564
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2429
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:540
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:555
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2420
msgid "Contact Editor"
msgstr "Contact Editor"
@@ -1315,7 +1314,7 @@ msgid "Image"
msgstr "Image"
#: ../addressbook/gui/contact-editor/contact-editor.glade.h:16
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:68
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:59
msgid "MSN Messenger"
msgstr "MSN Messenger"
@@ -1328,7 +1327,7 @@ msgid "Nic_kname:"
msgstr "Nic_kname:"
#: ../addressbook/gui/contact-editor/contact-editor.glade.h:19
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:64
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:55
msgid "Novell Groupwise"
msgstr "Novell Groupwise"
@@ -1342,11 +1341,11 @@ msgstr "Telephone"
#. red
#: ../addressbook/gui/contact-editor/contact-editor.glade.h:23
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:238
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:201
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:230
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:192
#: ../addressbook/gui/widgets/eab-contact-display.c:57
#: ../addressbook/gui/widgets/eab-contact-display.c:643
-#: ../mail/em-migrate.c:1054
+#: ../mail/em-migrate.c:1057
msgid "Work"
msgstr "Work"
@@ -1368,8 +1367,8 @@ msgid "_Birthday:"
msgstr "_Birthday:"
#: ../addressbook/gui/contact-editor/contact-editor.glade.h:28
-#: ../calendar/gui/dialogs/event-page.c:899
-#: ../calendar/gui/dialogs/event-page.glade.h:15
+#: ../calendar/gui/dialogs/event-page.c:787
+#: ../calendar/gui/dialogs/event-page.glade.h:14
#: ../plugins/itip-formatter/itip-view.c:1850
msgid "_Calendar:"
msgstr "_Calendar:"
@@ -1458,1120 +1457,1121 @@ msgstr "_Where:"
msgid "_Zip/Postal Code:"
msgstr "_Zip/Postal Code:"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:97
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:92
#: ../addressbook/gui/widgets/eab-contact-display.c:640
#: ../addressbook/gui/widgets/eab-contact-display.c:655
msgid "Address"
msgstr "Address"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:104
-#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:96
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:144
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:300
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1176
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:99
+#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:92
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:135
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:291
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1178
#: ../addressbook/gui/widgets/e-addressbook-model.c:312
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:404
+#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:424
#: ../addressbook/gui/widgets/e-minicard-label.c:164
-#: ../addressbook/gui/widgets/e-minicard-view-widget.c:130
-#: ../addressbook/gui/widgets/e-minicard-view.c:522
-#: ../addressbook/gui/widgets/e-minicard.c:194
-#: ../widgets/menus/gal-define-views-model.c:179
+#: ../addressbook/gui/widgets/e-minicard-view-widget.c:131
+#: ../addressbook/gui/widgets/e-minicard-view.c:544
+#: ../addressbook/gui/widgets/e-minicard.c:191
+#: ../widgets/menus/gal-define-views-model.c:178
#: ../widgets/table/e-cell-text.c:1836 ../widgets/text/e-text.c:3687
#: ../widgets/text/e-text.c:3688
msgid "Editable"
msgstr "Editable"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:137
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:132
msgid "United States"
msgstr "United States"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:138
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:133
msgid "Afghanistan"
msgstr "Afghanistan"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:139
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:134
msgid "Albania"
msgstr "Albania"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:140
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:135
msgid "Algeria"
msgstr "Algeria"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:141
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:136
msgid "American Samoa"
msgstr "American Samoa"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:142
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:137
msgid "Andorra"
msgstr "Andorra"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:143
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:138
msgid "Angola"
msgstr "Angola"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:144
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:139
msgid "Anguilla"
msgstr "Anguilla"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:145
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:140
msgid "Antarctica"
msgstr "Antarctica"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:146
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:141
msgid "Antigua And Barbuda"
msgstr "Antigua And Barbuda"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:147
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:142
msgid "Argentina"
msgstr "Argentina"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:148
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:143
msgid "Armenia"
msgstr "Armenia"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:149
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:144
msgid "Aruba"
msgstr "Aruba"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:150
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:145
msgid "Australia"
msgstr "Australia"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:151
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:146
msgid "Austria"
msgstr "Austria"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:152
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:147
msgid "Azerbaijan"
msgstr "Azerbaijan"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:153
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:148
msgid "Bahamas"
msgstr "Bahamas"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:154
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:149
msgid "Bahrain"
msgstr "Bahrain"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:155
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:150
msgid "Bangladesh"
msgstr "Bangladesh"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:156
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:151
msgid "Barbados"
msgstr "Barbados"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:157
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:152
msgid "Belarus"
msgstr "Belarus"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:158
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:153
msgid "Belgium"
msgstr "Belgium"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:159
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:154
msgid "Belize"
msgstr "Belize"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:160
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:155
msgid "Benin"
msgstr "Benin"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:161
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:156
msgid "Bermuda"
msgstr "Bermuda"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:162
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:157
msgid "Bhutan"
msgstr "Bhutan"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:163
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:158
msgid "Bolivia"
msgstr "Bolivia"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:164
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:159
msgid "Bosnia And Herzegowina"
msgstr "Bosnia And Herzegowina"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:165
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:160
msgid "Botswana"
msgstr "Botswana"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:166
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:161
msgid "Bouvet Island"
msgstr "Bouvet Island"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:167
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:162
msgid "Brazil"
msgstr "Brazil"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:168
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:163
msgid "British Indian Ocean Territory"
msgstr "British Indian Ocean Territory"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:169
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:164
msgid "Brunei Darussalam"
msgstr "Brunei Darussalam"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:170
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:165
msgid "Bulgaria"
msgstr "Bulgaria"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:171
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:166
msgid "Burkina Faso"
msgstr "Burkina Faso"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:172
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:167
msgid "Burundi"
msgstr "Burundi"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:173
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:168
msgid "Cambodia"
msgstr "Cambodia"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:174
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:169
msgid "Cameroon"
msgstr "Cameroon"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:175
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:170
msgid "Canada"
msgstr "Canada"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:176
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:171
msgid "Cape Verde"
msgstr "Cape Verde"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:177
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:172
msgid "Cayman Islands"
msgstr "Cayman Islands"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:178
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:173
msgid "Central African Republic"
msgstr "Central African Republic"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:179
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:174
msgid "Chad"
msgstr "Chad"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:180
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:175
msgid "Chile"
msgstr "Chile"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:181
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:176
msgid "China"
msgstr "China"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:182
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:177
msgid "Christmas Island"
msgstr "Christmas Island"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:183
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:178
msgid "Cocos (Keeling) Islands"
msgstr "Cocos (Keeling) Islands"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:184
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:179
msgid "Colombia"
msgstr "Colombia"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:185
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:180
msgid "Comoros"
msgstr "Comoros"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:186
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:181
msgid "Congo"
msgstr "Congo"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:187
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:182
msgid "Congo, The Democratic Republic Of The"
msgstr "Congo, The Democratic Republic Of The"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:188
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:183
msgid "Cook Islands"
msgstr "Cook Islands"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:189
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:184
msgid "Costa Rica"
msgstr "Costa Rica"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:190
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:185
msgid "Cote d'Ivoire"
msgstr "Cote d'Ivoire"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:191
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:186
msgid "Croatia"
msgstr "Croatia"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:192
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:187
msgid "Cuba"
msgstr "Cuba"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:193
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:188
msgid "Cyprus"
msgstr "Cyprus"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:194
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:189
msgid "Czech Republic"
msgstr "Czech Republic"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:195
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:190
msgid "Denmark"
msgstr "Denmark"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:196
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:191
msgid "Djibouti"
msgstr "Djibouti"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:197
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:192
msgid "Dominica"
msgstr "Dominica"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:198
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:193
msgid "Dominican Republic"
msgstr "Dominican Republic"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:199
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:194
msgid "Ecuador"
msgstr "Ecuador"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:200
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:195
msgid "Egypt"
msgstr "Egypt"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:201
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:196
msgid "El Salvador"
msgstr "El Salvador"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:202
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:197
msgid "Equatorial Guinea"
msgstr "Equatorial Guinea"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:203
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:198
msgid "Eritrea"
msgstr "Eritrea"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:204
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:199
msgid "Estonia"
msgstr "Estonia"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:205
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:200
msgid "Ethiopia"
msgstr "Ethiopia"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:206
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:201
msgid "Falkland Islands"
msgstr "Falkland Islands"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:207
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:202
msgid "Faroe Islands"
msgstr "Faroe Islands"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:208
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:203
msgid "Fiji"
msgstr "Fiji"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:209
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:204
msgid "Finland"
msgstr "Finland"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:210
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:205
msgid "France"
msgstr "France"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:211
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:206
msgid "French Guiana"
msgstr "French Guiana"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:212
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:207
msgid "French Polynesia"
msgstr "French Polynesia"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:213
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:208
msgid "French Southern Territories"
msgstr "French Southern Territories"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:214
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:209
msgid "Gabon"
msgstr "Gabon"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:215
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:210
msgid "Gambia"
msgstr "Gambia"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:216
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:211
msgid "Georgia"
msgstr "Georgia"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:217
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:212
msgid "Germany"
msgstr "Germany"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:218
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:213
msgid "Ghana"
msgstr "Ghana"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:219
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:214
msgid "Gibraltar"
msgstr "Gibraltar"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:220
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:215
msgid "Greece"
msgstr "Greece"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:221
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:216
msgid "Greenland"
msgstr "Greenland"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:222
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:217
msgid "Grenada"
msgstr "Grenada"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:223
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:218
msgid "Guadeloupe"
msgstr "Guadeloupe"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:224
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:219
msgid "Guam"
msgstr "Guam"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:225
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:220
msgid "Guatemala"
msgstr "Guatemala"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:226
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:221
msgid "Guernsey"
msgstr "Guernsey"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:227
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:222
msgid "Guinea"
msgstr "Guinea"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:228
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:223
msgid "Guinea-Bissau"
msgstr "Guinea-Bissau"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:229
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:224
msgid "Guyana"
msgstr "Guyana"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:230
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:225
msgid "Haiti"
msgstr "Haiti"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:231
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:226
msgid "Heard And McDonald Islands"
msgstr "Heard And McDonald Islands"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:232
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:227
msgid "Holy See"
msgstr "Holy See"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:233
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:228
msgid "Honduras"
msgstr "Honduras"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:234
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:229
msgid "Hong Kong"
msgstr "Hong Kong"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:235
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:230
msgid "Hungary"
msgstr "Hungary"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:236
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:231
msgid "Iceland"
msgstr "Iceland"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:237
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:232
msgid "India"
msgstr "India"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:238
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:233
msgid "Indonesia"
msgstr "Indonesia"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:239
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:234
msgid "Iran"
msgstr "Iran"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:240
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:235
msgid "Iraq"
msgstr "Iraq"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:241
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:236
msgid "Ireland"
msgstr "Ireland"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:242
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:237
msgid "Isle of Man"
msgstr "Isle of Man"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:243
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:238
msgid "Israel"
msgstr "Israel"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:244
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:239
msgid "Italy"
msgstr "Italy"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:245
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:240
msgid "Jamaica"
msgstr "Jamaica"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:246
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:241
msgid "Japan"
msgstr "Japan"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:247
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:242
msgid "Jersey"
msgstr "Jersey"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:248
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:243
msgid "Jordan"
msgstr "Jordan"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:249
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:244
msgid "Kazakhstan"
msgstr "Kazakhstan"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:250
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:245
msgid "Kenya"
msgstr "Kenya"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:251
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:246
msgid "Kiribati"
msgstr "Kiribati"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:252
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:247
msgid "Korea, Democratic People's Republic Of"
msgstr "Korea, Democratic People's Republic Of"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:253
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:248
msgid "Korea, Republic Of"
msgstr "Korea, Republic Of"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:254
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:249
msgid "Kuwait"
msgstr "Kuwait"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:255
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:250
msgid "Kyrgyzstan"
msgstr "Kyrgyzstan"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:256
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:251
msgid "Laos"
msgstr "Laos"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:257
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:252
msgid "Latvia"
msgstr "Latvia"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:258
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:253
msgid "Lebanon"
msgstr "Lebanon"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:259
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:254
msgid "Lesotho"
msgstr "Lesotho"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:260
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:255
msgid "Liberia"
msgstr "Liberia"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:261
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:256
msgid "Libya"
msgstr "Libya"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:262
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:257
msgid "Liechtenstein"
msgstr "Liechtenstein"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:263
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:258
msgid "Lithuania"
msgstr "Lithuania"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:264
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:259
msgid "Luxembourg"
msgstr "Luxembourg"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:265
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:260
msgid "Macao"
msgstr "Macao"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:266
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:261
msgid "Macedonia"
msgstr "Macedonia"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:267
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:262
msgid "Madagascar"
msgstr "Madagascar"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:268
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:263
msgid "Malawi"
msgstr "Malawi"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:269
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:264
msgid "Malaysia"
msgstr "Malaysia"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:270
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:265
msgid "Maldives"
msgstr "Maldives"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:271
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:266
msgid "Mali"
msgstr "Mali"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:272
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:267
msgid "Malta"
msgstr "Malta"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:273
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:268
msgid "Marshall Islands"
msgstr "Marshall Islands"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:274
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:269
msgid "Martinique"
msgstr "Martinique"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:275
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:270
msgid "Mauritania"
msgstr "Mauritania"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:276
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:271
msgid "Mauritius"
msgstr "Mauritius"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:277
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:272
msgid "Mayotte"
msgstr "Mayotte"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:278
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:273
msgid "Mexico"
msgstr "Mexico"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:279
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:274
msgid "Micronesia"
msgstr "Micronesia"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:280
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:275
msgid "Moldova, Republic Of"
msgstr "Moldova, Republic Of"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:281
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:276
msgid "Monaco"
msgstr "Monaco"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:282
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:277
msgid "Mongolia"
msgstr "Mongolia"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:283
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:278
msgid "Montserrat"
msgstr "Montserrat"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:284
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:279
msgid "Morocco"
msgstr "Morocco"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:285
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:280
msgid "Mozambique"
msgstr "Mozambique"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:286
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:281
msgid "Myanmar"
msgstr "Myanmar"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:287
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:282
msgid "Namibia"
msgstr "Namibia"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:288
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:283
msgid "Nauru"
msgstr "Nauru"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:289
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:284
msgid "Nepal"
msgstr "Nepal"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:290
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:285
msgid "Netherlands"
msgstr "Netherlands"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:291
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:286
msgid "Netherlands Antilles"
msgstr "Netherlands Antilles"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:292
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:287
msgid "New Caledonia"
msgstr "New Caledonia"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:293
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:288
msgid "New Zealand"
msgstr "New Zealand"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:294
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:289
msgid "Nicaragua"
msgstr "Nicaragua"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:295
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:290
msgid "Niger"
msgstr "Niger"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:296
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:291
msgid "Nigeria"
msgstr "Nigeria"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:297
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:292
msgid "Niue"
msgstr "Niue"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:298
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:293
msgid "Norfolk Island"
msgstr "Norfolk Island"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:299
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:294
msgid "Northern Mariana Islands"
msgstr "Northern Mariana Islands"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:300
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:295
msgid "Norway"
msgstr "Norway"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:301
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:296
msgid "Oman"
msgstr "Oman"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:302
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:297
msgid "Pakistan"
msgstr "Pakistan"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:303
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:298
msgid "Palau"
msgstr "Palau"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:304
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:299
msgid "Palestinian Territory"
msgstr "Palestinian Territory"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:305
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:300
msgid "Panama"
msgstr "Panama"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:306
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:301
msgid "Papua New Guinea"
msgstr "Papua New Guinea"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:307
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:302
msgid "Paraguay"
msgstr "Paraguay"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:308
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:303
msgid "Peru"
msgstr "Peru"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:309
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:304
msgid "Philippines"
msgstr "Philippines"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:310
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:305
msgid "Pitcairn"
msgstr "Pitcairn"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:311
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:306
msgid "Poland"
msgstr "Poland"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:312
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:307
msgid "Portugal"
msgstr "Portugal"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:313
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:308
msgid "Puerto Rico"
msgstr "Puerto Rico"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:314
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:309
msgid "Qatar"
msgstr "Qatar"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:315
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:310
msgid "Reunion"
msgstr "Reunion"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:316
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:311
msgid "Romania"
msgstr "Romania"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:317
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:312
msgid "Russian Federation"
msgstr "Russian Federation"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:318
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:313
msgid "Rwanda"
msgstr "Rwanda"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:319
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:314
msgid "Saint Kitts And Nevis"
msgstr "Saint Kitts And Nevis"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:320
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:315
msgid "Saint Lucia"
msgstr "Saint Lucia"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:321
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:316
msgid "Saint Vincent And The Grenadines"
msgstr "Saint Vincent And The Grenadines"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:322
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:317
msgid "Samoa"
msgstr "Samoa"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:323
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:318
msgid "San Marino"
msgstr "San Marino"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:324
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:319
msgid "Sao Tome And Principe"
msgstr "Sao Tome And Principe"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:325
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:320
msgid "Saudi Arabia"
msgstr "Saudi Arabia"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:326
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:321
msgid "Senegal"
msgstr "Senegal"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:327
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:322
msgid "Serbia And Montenegro"
msgstr "Serbia And Montenegro"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:328
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:323
msgid "Seychelles"
msgstr "Seychelles"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:329
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:324
msgid "Sierra Leone"
msgstr "Sierra Leone"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:330
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:325
msgid "Singapore"
msgstr "Singapore"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:331
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:326
msgid "Slovakia"
msgstr "Slovakia"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:332
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:327
msgid "Slovenia"
msgstr "Slovenia"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:333
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:328
msgid "Solomon Islands"
msgstr "Solomon Islands"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:334
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:329
msgid "Somalia"
msgstr "Somalia"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:335
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:330
msgid "South Africa"
msgstr "South Africa"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:336
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:331
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:337
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:332
msgid "Spain"
msgstr "Spain"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:338
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:333
msgid "Sri Lanka"
msgstr "Sri Lanka"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:339
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:334
msgid "St. Helena"
msgstr "St. Helena"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:340
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:335
msgid "St. Pierre And Miquelon"
msgstr "St. Pierre And Miquelon"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:341
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:336
msgid "Sudan"
msgstr "Sudan"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:342
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:337
msgid "Suriname"
msgstr "Suriname"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:343
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:338
msgid "Svalbard And Jan Mayen Islands"
msgstr "Svalbard And Jan Mayen Islands"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:344
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:339
msgid "Swaziland"
msgstr "Swaziland"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:345
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:340
msgid "Sweden"
msgstr "Sweden"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:346
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:341
msgid "Switzerland"
msgstr "Switzerland"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:347
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:342
msgid "Syria"
msgstr "Syria"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:348
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:343
msgid "Taiwan"
msgstr "Taiwan"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:349
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:344
msgid "Tajikistan"
msgstr "Tajikistan"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:350
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:345
msgid "Tanzania, United Republic Of"
msgstr "Tanzania, United Republic Of"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:351
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:346
msgid "Thailand"
msgstr "Thailand"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:352
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:347
msgid "Timor-Leste"
msgstr "Timor-Leste"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:353
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:348
msgid "Togo"
msgstr "Togo"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:354
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:349
msgid "Tokelau"
msgstr "Tokelau"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:355
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:350
msgid "Tonga"
msgstr "Tonga"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:356
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:351
msgid "Trinidad And Tobago"
msgstr "Trinidad And Tobago"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:357
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:352
msgid "Tunisia"
msgstr "Tunisia"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:358
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:353
msgid "Turkey"
msgstr "Turkey"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:359
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:354
msgid "Turkmenistan"
msgstr "Turkmenistan"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:360
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:355
msgid "Turks And Caicos Islands"
msgstr "Turks And Caicos Islands"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:361
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:356
msgid "Tuvalu"
msgstr "Tuvalu"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:362
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:357
msgid "Uganda"
msgstr "Uganda"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:363
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:358
msgid "Ukraine"
msgstr "Ukraine"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:364
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:359
msgid "United Arab Emirates"
msgstr "United Arab Emirates"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:365
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:360
msgid "United Kingdom"
msgstr "United Kingdom"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:366
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:361
msgid "United States Minor Outlying Islands"
msgstr "United States Minor Outlying Islands"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:367
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:362
msgid "Uruguay"
msgstr "Uruguay"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:368
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:363
msgid "Uzbekistan"
msgstr "Uzbekistan"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:369
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:364
msgid "Vanuatu"
msgstr "Vanuatu"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:370
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:365
msgid "Venezuela"
msgstr "Venezuela"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:371
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:366
msgid "Viet Nam"
msgstr "Viet Nam"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:372
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:367
msgid "Virgin Islands, British"
msgstr "Virgin Islands, British"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:373
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:368
msgid "Virgin Islands, U.S."
msgstr "Virgin Islands, U.S."
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:374
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:369
msgid "Wallis And Futuna Islands"
msgstr "Wallis And Futuna Islands"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:375
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:370
msgid "Western Sahara"
msgstr "Western Sahara"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:376
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:371
msgid "Yemen"
msgstr "Yemen"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:377
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:372
msgid "Zambia"
msgstr "Zambia"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:378
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:373
msgid "Zimbabwe"
msgstr "Zimbabwe"
-#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:90
-#: ../mail/em-mailer-prefs.c:481
-#: ../plugins/exchange-operations/exchange-delegates.c:958
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:721
-#: ../plugins/plugin-manager/plugin-manager.c:56
-#: ../plugins/save-attachments/save-attachments.c:366
-#: ../widgets/menus/gal-define-views-dialog.c:348
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:93
-#: ../widgets/menus/gal-view-new-dialog.c:65
+#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:86
+#: ../mail/em-mailer-prefs.c:466
+#: ../plugins/exchange-operations/exchange-delegates.c:954
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:711
+#: ../plugins/plugin-manager/plugin-manager.c:41
+#: ../plugins/save-attachments/save-attachments.c:350
+#: ../widgets/menus/gal-define-views-dialog.c:346
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:91
+#: ../widgets/menus/gal-view-new-dialog.c:63
msgid "Name"
msgstr "Name"
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:63
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:54
msgid "AOL Instant Messenger"
msgstr "AOL Instant Messenger"
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:65
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:184
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:56
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:175
#: ../addressbook/gui/widgets/eab-contact-display.c:617
msgid "Jabber"
msgstr "Jabber"
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:66
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:57
msgid "Yahoo Messenger"
msgstr "Yahoo Messenger"
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:67
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:58
msgid "Gadu-Gadu Messenger"
msgstr "Gadu-Gadu Messenger"
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:69
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:188
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:60
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:179
#: ../addressbook/gui/widgets/eab-contact-display.c:616
msgid "ICQ"
msgstr "ICQ"
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:121
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:112
msgid "Service"
msgstr "Service"
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:130
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:121
+#: ../calendar/gui/caltypes.xml.h:25
#: ../calendar/gui/e-cal-list-view.etspec.h:3 ../mail/message-list.etspec.h:9
#: ../plugins/publish-calendar/publish-calendar.c:693
-#: ../plugins/save-calendar/csv-format.c:379
+#: ../plugins/save-calendar/csv-format.c:375
msgid "Location"
msgstr "Location"
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:137
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:128
msgid "Username"
msgstr "Username"
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:234
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:202
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:226
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:193
#: ../addressbook/gui/widgets/eab-contact-display.c:58
msgid "Home"
msgstr "Home"
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:242
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:203
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:234
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:194
#: ../addressbook/gui/widgets/eab-contact-display.c:59
#: ../addressbook/gui/widgets/eab-contact-display.c:528
msgid "Other"
msgstr "Other"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:185
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:176
#: ../addressbook/gui/widgets/eab-contact-display.c:619
msgid "Yahoo"
msgstr "Yahoo"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:186
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:177
#: ../addressbook/gui/widgets/eab-contact-display.c:620
msgid "Gadu-Gadu"
msgstr "Gadu-Gadu"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:187
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:178
#: ../addressbook/gui/widgets/eab-contact-display.c:618
msgid "MSN"
msgstr "MSN"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:189
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:180
#: ../addressbook/gui/widgets/eab-contact-display.c:615
msgid "GroupWise"
msgstr "GroupWise"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:258
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:249
msgid "Source Book"
msgstr "Source Book"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:265
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:256
msgid "Target Book"
msgstr "Target Book"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:279
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:270
msgid "Is New Contact"
msgstr "Is New Contact"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:286
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:277
msgid "Writable Fields"
msgstr "Writable Fields"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:293
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:284
msgid "Required Fields"
msgstr "Required Fields"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:307
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:298
msgid "Changed"
msgstr "Changed"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:559
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2424
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:550
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2415
#, c-format
msgid "Contact Editor - %s"
msgstr "Contact Editor - %s"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2820
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2811
msgid "Please select an image for this contact"
msgstr "Please select an image for this contact"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2821
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2812
msgid "_No image"
msgstr "_No image"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3094
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3085
msgid ""
"The contact data is invalid:\n"
"\n"
@@ -2579,47 +2579,47 @@ msgstr ""
"The contact data is invalid:\n"
"\n"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3098
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3089
#, c-format
msgid "'%s' has an invalid format"
msgstr "'%s' has an invalid format"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3105
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3096
#, c-format
msgid "%s'%s' has an invalid format"
msgstr "%s'%s' has an invalid format"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3120
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3131
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3111
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3122
#, c-format
msgid "%s'%s' is empty"
msgstr "%s'%s' is empty"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3146
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3137
msgid "Invalid contact."
msgstr "Invalid contact."
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:334
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:329
msgid "Contact Quick-Add"
msgstr "Contact Quick-Add"
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:337
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:332
msgid "_Edit Full"
msgstr "_Edit Full"
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:411
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:406
msgid "_Full name"
msgstr "_Full name"
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:422
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:417
msgid "E_mail"
msgstr "E_mail"
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:433
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:428
msgid "_Select Address Book"
msgstr "_Select Address Book"
-#: ../addressbook/gui/contact-editor/eab-editor.c:322
+#: ../addressbook/gui/contact-editor/eab-editor.c:321
#, c-format
msgid ""
"Are you sure you want\n"
@@ -2628,7 +2628,7 @@ msgstr ""
"Are you sure you want\n"
"to delete contact list (%s)?"
-#: ../addressbook/gui/contact-editor/eab-editor.c:325
+#: ../addressbook/gui/contact-editor/eab-editor.c:324
msgid ""
"Are you sure you want\n"
"to delete these contact lists?"
@@ -2636,7 +2636,7 @@ msgstr ""
"Are you sure you want\n"
"to delete these contact lists?"
-#: ../addressbook/gui/contact-editor/eab-editor.c:330
+#: ../addressbook/gui/contact-editor/eab-editor.c:329
#, c-format
msgid ""
"Are you sure you want\n"
@@ -2645,7 +2645,7 @@ msgstr ""
"Are you sure you want\n"
"to delete contact (%s)?"
-#: ../addressbook/gui/contact-editor/eab-editor.c:333
+#: ../addressbook/gui/contact-editor/eab-editor.c:332
msgid ""
"Are you sure you want\n"
"to delete these contacts?"
@@ -2763,7 +2763,7 @@ msgid "<b>Members</b>"
msgstr "<b>Members</b>"
#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:2
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:666
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:668
msgid "Contact List Editor"
msgstr "Contact List Editor"
@@ -2783,25 +2783,25 @@ msgstr "_List name:"
msgid "_Type an email address or drag a contact into the list below:"
msgstr "_Type an e-mail address or drag a contact into the list below:"
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:759
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:761
msgid "Contact List Members"
msgstr "Contact List Members"
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:898
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1237
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:900
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1239
msgid "_Members"
msgstr "_Members"
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1146
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1148
#: ../addressbook/gui/widgets/e-addressbook-model.c:298
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:390
-#: ../addressbook/gui/widgets/e-addressbook-view.c:216
-#: ../addressbook/gui/widgets/e-minicard-view-widget.c:116
-#: ../addressbook/gui/widgets/e-minicard-view.c:508
+#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:410
+#: ../addressbook/gui/widgets/e-addressbook-view.c:212
+#: ../addressbook/gui/widgets/e-minicard-view-widget.c:117
+#: ../addressbook/gui/widgets/e-minicard-view.c:530
msgid "Book"
msgstr "Book"
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1166
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1168
msgid "Is New List"
msgstr "Is New List"
@@ -2842,40 +2842,40 @@ msgstr ""
"The name or e-mail address of this contact already exists\n"
"in this folder. Would you like to add it anyway?"
-#: ../addressbook/gui/merging/eab-contact-merging.c:190
-msgid "Merge Contact"
-msgstr "Merge Contact"
-
-#: ../addressbook/gui/merging/eab-contact-merging.c:205
+#: ../addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:6
+#: ../addressbook/gui/merging/eab-contact-merging.c:214
msgid "_Merge"
msgstr "_Merge"
-#: ../addressbook/gui/merging/eab-contact-merging.c:258
+#: ../addressbook/gui/merging/eab-contact-merging.c:199
+msgid "Merge Contact"
+msgstr "Merge Contact"
+
+#: ../addressbook/gui/merging/eab-contact-merging.c:267
#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:11
#: ../addressbook/gui/widgets/eab-contact-display.c:592
#: ../addressbook/gui/widgets/eab-contact-display.c:597
#: ../addressbook/gui/widgets/eab-contact-display.c:600
#: ../addressbook/gui/widgets/eab-contact-display.c:879
-#: ../plugins/groupwise-features/junk-settings.c:425 ../smime/lib/e-cert.c:827
+#: ../plugins/groupwise-features/junk-settings.c:415 ../smime/lib/e-cert.c:827
msgid "Email"
msgstr "E-mail"
#: ../addressbook/gui/widgets/addresstypes.xml.h:1
-#: ../addressbook/gui/widgets/e-addressbook-view.c:165
-#: ../calendar/gui/cal-search-bar.c:81 ../calendar/gui/caltypes.xml.h:1
-#: ../calendar/gui/memotypes.xml.h:1 ../calendar/gui/tasktypes.xml.h:1
+#: ../addressbook/gui/widgets/e-addressbook-view.c:161
+#: ../calendar/gui/cal-search-bar.c:76 ../calendar/gui/caltypes.xml.h:3
+#: ../calendar/gui/memotypes.xml.h:3 ../calendar/gui/tasktypes.xml.h:5
msgid "Any field contains"
msgstr "Any field contains"
#: ../addressbook/gui/widgets/addresstypes.xml.h:2
-#: ../addressbook/gui/widgets/e-addressbook-view.c:164
+#: ../addressbook/gui/widgets/e-addressbook-view.c:160
msgid "Email begins with"
msgstr "E-mail begins with"
#: ../addressbook/gui/widgets/addresstypes.xml.h:3
-#: ../addressbook/gui/widgets/e-addressbook-view.c:163
-msgid "Name begins with"
-msgstr "Name begins with"
+msgid "Name contains"
+msgstr "Name contains"
#: ../addressbook/gui/widgets/e-addressbook-model.c:150
msgid "No contacts"
@@ -2889,10 +2889,10 @@ msgstr[0] "%d contact"
msgstr[1] "%d contacts"
#: ../addressbook/gui/widgets/e-addressbook-model.c:305
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:397
-#: ../addressbook/gui/widgets/e-addressbook-view.c:230
-#: ../addressbook/gui/widgets/e-minicard-view-widget.c:123
-#: ../addressbook/gui/widgets/e-minicard-view.c:515
+#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:417
+#: ../addressbook/gui/widgets/e-addressbook-view.c:226
+#: ../addressbook/gui/widgets/e-minicard-view-widget.c:124
+#: ../addressbook/gui/widgets/e-minicard-view.c:537
msgid "Query"
msgstr "Query"
@@ -2900,122 +2900,119 @@ msgstr "Query"
msgid "Error getting book view"
msgstr "Error getting book view"
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:411
-#: ../widgets/table/e-table-click-to-add.c:510
-#: ../widgets/table/e-table-selection-model.c:303
-#: ../widgets/table/e-table.c:3335
+#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:431
+#: ../widgets/table/e-table-click-to-add.c:509
+#: ../widgets/table/e-table-selection-model.c:302
+#: ../widgets/table/e-table.c:3353
#: ../widgets/table/e-tree-selection-model.c:821 ../widgets/text/e-text.c:3551
#: ../widgets/text/e-text.c:3552
msgid "Model"
msgstr "Model"
-#: ../addressbook/gui/widgets/e-addressbook-table-adapter.c:131
+#: ../addressbook/gui/widgets/e-addressbook-table-adapter.c:150
msgid "Error modifying card"
msgstr "Error modifying card"
-#: ../addressbook/gui/widgets/e-addressbook-view.c:223
+#: ../addressbook/gui/widgets/e-addressbook-view.c:159
+msgid "Name begins with"
+msgstr "Name begins with"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.c:219
msgid "Source"
msgstr "Source"
-#: ../addressbook/gui/widgets/e-addressbook-view.c:237
+#: ../addressbook/gui/widgets/e-addressbook-view.c:233
#: ../calendar/gui/e-calendar-table.etspec.h:12
-#: ../calendar/gui/e-meeting-list-view.c:509
+#: ../calendar/gui/e-meeting-list-view.c:508
#: ../calendar/gui/e-meeting-time-sel.etspec.h:11
#: ../calendar/gui/e-memo-table.etspec.h:5
msgid "Type"
msgstr "Type"
-#: ../addressbook/gui/widgets/e-addressbook-view.c:816
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1949
+#: ../addressbook/gui/widgets/e-addressbook-view.c:812
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1953
msgid "Save as vCard..."
msgstr "Save as vCard..."
-#: ../addressbook/gui/widgets/e-addressbook-view.c:937
-#: ../calendar/gui/dialogs/comp-editor.c:1126
-#: ../calendar/gui/e-calendar-table.c:1365
-#: ../calendar/gui/e-calendar-view.c:1687 ../calendar/gui/e-memo-table.c:924
+#: ../addressbook/gui/widgets/e-addressbook-view.c:933
+#: ../calendar/gui/dialogs/comp-editor.c:2033
+#: ../calendar/gui/e-calendar-table.c:1574
+#: ../calendar/gui/e-calendar-view.c:1671 ../calendar/gui/e-memo-table.c:924
#: ../ui/evolution-addressbook.xml.h:56
msgid "_Open"
msgstr "_Open"
-#: ../addressbook/gui/widgets/e-addressbook-view.c:939
+#: ../addressbook/gui/widgets/e-addressbook-view.c:935
msgid "_New Contact..."
msgstr "_New Contact..."
-#: ../addressbook/gui/widgets/e-addressbook-view.c:940
+#: ../addressbook/gui/widgets/e-addressbook-view.c:936
msgid "New Contact _List..."
msgstr "New Contact _List..."
-#: ../addressbook/gui/widgets/e-addressbook-view.c:943
+#: ../addressbook/gui/widgets/e-addressbook-view.c:939
msgid "_Save as vCard..."
msgstr "_Save as vCard..."
-#: ../addressbook/gui/widgets/e-addressbook-view.c:944
+#: ../addressbook/gui/widgets/e-addressbook-view.c:940
msgid "_Forward Contact"
msgstr "_Forward Contact"
-#: ../addressbook/gui/widgets/e-addressbook-view.c:945
+#: ../addressbook/gui/widgets/e-addressbook-view.c:941
msgid "_Forward Contacts"
msgstr "_Forward Contacts"
-#: ../addressbook/gui/widgets/e-addressbook-view.c:946
+#: ../addressbook/gui/widgets/e-addressbook-view.c:942
msgid "Send _Message to Contact"
msgstr "Send _Message to Contact"
-#: ../addressbook/gui/widgets/e-addressbook-view.c:947
+#: ../addressbook/gui/widgets/e-addressbook-view.c:943
msgid "Send _Message to List"
msgstr "Send _Message to List"
-#: ../addressbook/gui/widgets/e-addressbook-view.c:948
+#: ../addressbook/gui/widgets/e-addressbook-view.c:944
msgid "Send _Message to Contacts"
msgstr "Send _Message to Contacts"
-#: ../addressbook/gui/widgets/e-addressbook-view.c:949
+#: ../addressbook/gui/widgets/e-addressbook-view.c:945
msgid "_Print"
msgstr "_Print"
-#: ../addressbook/gui/widgets/e-addressbook-view.c:952
+#: ../addressbook/gui/widgets/e-addressbook-view.c:948
msgid "Cop_y to Address Book..."
msgstr "Cop_y to Address Book..."
-#: ../addressbook/gui/widgets/e-addressbook-view.c:953
+#: ../addressbook/gui/widgets/e-addressbook-view.c:949
msgid "Mo_ve to Address Book..."
msgstr "Mo_ve to Address Book..."
-#: ../addressbook/gui/widgets/e-addressbook-view.c:956
-#: ../ui/evolution-editor.xml.h:8
+#: ../addressbook/gui/widgets/e-addressbook-view.c:952
msgid "Cu_t"
msgstr "Cu_t"
-#: ../addressbook/gui/widgets/e-addressbook-view.c:957
-#: ../calendar/gui/dialogs/comp-editor.c:455
-#: ../calendar/gui/e-calendar-table.c:1373
-#: ../calendar/gui/e-calendar-view.c:1694 ../calendar/gui/e-memo-table.c:932
-#: ../composer/e-msg-composer.c:2011 ../mail/em-folder-tree.c:998
-#: ../mail/em-folder-view.c:1332 ../mail/message-list.c:2045
+#: ../addressbook/gui/widgets/e-addressbook-view.c:953
+#: ../calendar/gui/dialogs/comp-editor.c:480
+#: ../calendar/gui/e-calendar-table.c:1582
+#: ../calendar/gui/e-calendar-view.c:1678 ../calendar/gui/e-memo-table.c:932
+#: ../composer/e-msg-composer.c:2057 ../mail/em-folder-tree.c:1005
+#: ../mail/em-folder-view.c:1325 ../mail/message-list.c:2044
#: ../ui/evolution-addressbook.xml.h:46 ../ui/evolution-calendar.xml.h:39
-#: ../ui/evolution-editor.xml.h:17 ../ui/evolution-mail-message.xml.h:104
-#: ../ui/evolution-memos.xml.h:15 ../ui/evolution-tasks.xml.h:23
+#: ../ui/evolution-mail-message.xml.h:103 ../ui/evolution-memos.xml.h:15
+#: ../ui/evolution-tasks.xml.h:23
msgid "_Copy"
msgstr "_Copy"
-#: ../addressbook/gui/widgets/e-addressbook-view.c:958
+#: ../addressbook/gui/widgets/e-addressbook-view.c:954
msgid "P_aste"
msgstr "P_aste"
#. All, unmatched, separator
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1520
-#: ../calendar/gui/cal-search-bar.c:622 ../calendar/gui/cal-search-bar.c:665
-#: ../calendar/gui/cal-search-bar.c:684
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1524
+#: ../calendar/gui/cal-search-bar.c:625 ../calendar/gui/cal-search-bar.c:668
+#: ../calendar/gui/cal-search-bar.c:687
msgid "Any Category"
msgstr "Any Category"
-#. E_BOOK_ERROR_OTHER_ERROR
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1730
-#: ../addressbook/gui/widgets/eab-gui-util.c:77
-msgid "Other error"
-msgstr "Other error"
-
#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:1
#: ../addressbook/gui/widgets/eab-contact-display.c:634
msgid "Assistant"
@@ -3047,7 +3044,7 @@ msgstr "Car Phone"
#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:8
#: ../calendar/gui/dialogs/event-page.glade.h:7
-#: ../calendar/gui/e-cal-component-memo-preview.c:143
+#: ../calendar/gui/e-cal-component-memo-preview.c:144
#: ../calendar/gui/e-cal-list-view.etspec.h:1
#: ../calendar/gui/e-calendar-table.etspec.h:3
#: ../calendar/gui/e-memo-table.etspec.h:1
@@ -3148,9 +3145,9 @@ msgid "Radio"
msgstr "Radio"
#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:33
-#: ../calendar/gui/e-meeting-list-view.c:521
+#: ../calendar/gui/e-meeting-list-view.c:520
#: ../calendar/gui/e-meeting-time-sel.etspec.h:9
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:725
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:715
msgid "Role"
msgstr "Role"
@@ -3186,38 +3183,38 @@ msgid "Web Site"
msgstr "Website"
#: ../addressbook/gui/widgets/e-minicard-label.c:115
-#: ../addressbook/gui/widgets/e-minicard.c:157
-#: ../widgets/misc/e-canvas-vbox.c:86 ../widgets/misc/e-canvas-vbox.c:87
+#: ../addressbook/gui/widgets/e-minicard.c:154
+#: ../widgets/misc/e-canvas-vbox.c:85 ../widgets/misc/e-canvas-vbox.c:86
#: ../widgets/misc/e-reflow.c:1433 ../widgets/misc/e-reflow.c:1434
-#: ../widgets/table/e-table-click-to-add.c:524
+#: ../widgets/table/e-table-click-to-add.c:523
#: ../widgets/table/e-table-col.c:99
#: ../widgets/table/e-table-field-chooser-item.c:655
-#: ../widgets/table/e-table-group-container.c:966
-#: ../widgets/table/e-table-group-container.c:967
-#: ../widgets/table/e-table-group-leaf.c:628
-#: ../widgets/table/e-table-group-leaf.c:629
-#: ../widgets/table/e-table-item.c:3078 ../widgets/table/e-table-item.c:3079
+#: ../widgets/table/e-table-group-container.c:993
+#: ../widgets/table/e-table-group-container.c:994
+#: ../widgets/table/e-table-group-leaf.c:637
+#: ../widgets/table/e-table-group-leaf.c:638
+#: ../widgets/table/e-table-item.c:3081 ../widgets/table/e-table-item.c:3082
#: ../widgets/text/e-text.c:3729 ../widgets/text/e-text.c:3730
msgid "Width"
msgstr "Width"
#: ../addressbook/gui/widgets/e-minicard-label.c:122
-#: ../addressbook/gui/widgets/e-minicard.c:164
-#: ../widgets/misc/e-canvas-vbox.c:98 ../widgets/misc/e-canvas-vbox.c:99
+#: ../addressbook/gui/widgets/e-minicard.c:161
+#: ../widgets/misc/e-canvas-vbox.c:97 ../widgets/misc/e-canvas-vbox.c:98
#: ../widgets/misc/e-reflow.c:1441 ../widgets/misc/e-reflow.c:1442
-#: ../widgets/table/e-table-click-to-add.c:531
+#: ../widgets/table/e-table-click-to-add.c:530
#: ../widgets/table/e-table-field-chooser-item.c:662
-#: ../widgets/table/e-table-group-container.c:959
-#: ../widgets/table/e-table-group-container.c:960
-#: ../widgets/table/e-table-group-leaf.c:621
-#: ../widgets/table/e-table-group-leaf.c:622
-#: ../widgets/table/e-table-item.c:3084 ../widgets/table/e-table-item.c:3085
+#: ../widgets/table/e-table-group-container.c:986
+#: ../widgets/table/e-table-group-container.c:987
+#: ../widgets/table/e-table-group-leaf.c:630
+#: ../widgets/table/e-table-group-leaf.c:631
+#: ../widgets/table/e-table-item.c:3087 ../widgets/table/e-table-item.c:3088
#: ../widgets/text/e-text.c:3737 ../widgets/text/e-text.c:3738
msgid "Height"
msgstr "Height"
#: ../addressbook/gui/widgets/e-minicard-label.c:129
-#: ../addressbook/gui/widgets/e-minicard.c:172
+#: ../addressbook/gui/widgets/e-minicard.c:169
msgid "Has Focus"
msgstr "Has Focus"
@@ -3237,11 +3234,21 @@ msgstr "Text Model"
msgid "Max field name length"
msgstr "Max field name length"
-#: ../addressbook/gui/widgets/e-minicard-view-widget.c:137
+#: ../addressbook/gui/widgets/e-minicard-view-widget.c:138
msgid "Column Width"
msgstr "Column Width"
-#: ../addressbook/gui/widgets/e-minicard-view.c:174
+#: ../addressbook/gui/widgets/e-minicard-view.c:177
+msgid ""
+"\n"
+"\n"
+"Searching for the Contacts..."
+msgstr ""
+"\n"
+"\n"
+"Searching for the Contacts..."
+
+#: ../addressbook/gui/widgets/e-minicard-view.c:180
msgid ""
"\n"
"\n"
@@ -3255,7 +3262,7 @@ msgstr ""
"\n"
"or double-click here to create a new Contact."
-#: ../addressbook/gui/widgets/e-minicard-view.c:177
+#: ../addressbook/gui/widgets/e-minicard-view.c:183
msgid ""
"\n"
"\n"
@@ -3269,7 +3276,7 @@ msgstr ""
"\n"
"Double-click here to create a new Contact."
-#: ../addressbook/gui/widgets/e-minicard-view.c:182
+#: ../addressbook/gui/widgets/e-minicard-view.c:187
msgid ""
"\n"
"\n"
@@ -3279,7 +3286,7 @@ msgstr ""
"\n"
"Search for the Contact."
-#: ../addressbook/gui/widgets/e-minicard-view.c:184
+#: ../addressbook/gui/widgets/e-minicard-view.c:189
msgid ""
"\n"
"\n"
@@ -3289,41 +3296,41 @@ msgstr ""
"\n"
"There are no items to show in this view."
-#: ../addressbook/gui/widgets/e-minicard-view.c:501
+#: ../addressbook/gui/widgets/e-minicard-view.c:523
msgid "Adapter"
msgstr "Adapter"
-#: ../addressbook/gui/widgets/e-minicard.c:102
+#: ../addressbook/gui/widgets/e-minicard.c:99
msgid "Work Email"
msgstr "Work E-mail"
-#: ../addressbook/gui/widgets/e-minicard.c:103
+#: ../addressbook/gui/widgets/e-minicard.c:100
msgid "Home Email"
msgstr "Home E-mail"
-#: ../addressbook/gui/widgets/e-minicard.c:104
-#: ../addressbook/gui/widgets/e-minicard.c:833
+#: ../addressbook/gui/widgets/e-minicard.c:101
+#: ../addressbook/gui/widgets/e-minicard.c:830
msgid "Other Email"
msgstr "Other E-mail"
-#: ../addressbook/gui/widgets/e-minicard.c:180
+#: ../addressbook/gui/widgets/e-minicard.c:177
msgid "Selected"
msgstr "Selected"
-#: ../addressbook/gui/widgets/e-minicard.c:187
+#: ../addressbook/gui/widgets/e-minicard.c:184
msgid "Has Cursor"
msgstr "Has Cursor"
-#: ../addressbook/gui/widgets/eab-contact-display.c:172 ../mail/em-popup.c:638
+#: ../addressbook/gui/widgets/eab-contact-display.c:172 ../mail/em-popup.c:627
msgid "_Open Link in Browser"
msgstr "_Open Link in Browser"
#: ../addressbook/gui/widgets/eab-contact-display.c:173
-#: ../mail/em-folder-view.c:2809
+#: ../mail/em-folder-view.c:2795
msgid "_Copy Link Location"
msgstr "_Copy Link Location"
-#: ../addressbook/gui/widgets/eab-contact-display.c:174 ../mail/em-popup.c:639
+#: ../addressbook/gui/widgets/eab-contact-display.c:174 ../mail/em-popup.c:628
msgid "_Send New Message To..."
msgstr "_Send New Message To..."
@@ -3366,25 +3373,23 @@ msgid "Video Chat"
msgstr "Video Chat"
#: ../addressbook/gui/widgets/eab-contact-display.c:636
-#: ../calendar/gui/calendar-commands.c:99
-#: ../calendar/gui/calendar-component.c:795
-#: ../calendar/gui/dialogs/calendar-setup.c:370
-#: ../calendar/gui/gnome-cal.c:2377
-#: ../plugins/exchange-operations/exchange-delegates-user.c:88
-#: ../plugins/exchange-operations/exchange-folder.c:575
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:425
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:456
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:569
-#: ../plugins/hula-account-setup/camel-hula-listener.c:378
-#: ../plugins/hula-account-setup/camel-hula-listener.c:407
+#: ../calendar/gui/calendar-commands.c:92
+#: ../calendar/gui/dialogs/calendar-setup.c:367
+#: ../calendar/gui/gnome-cal.c:2451
+#: ../plugins/exchange-operations/exchange-delegates-user.c:76
+#: ../plugins/exchange-operations/exchange-folder.c:576
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:424
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:455
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:568
+#: ../plugins/hula-account-setup/camel-hula-listener.c:377
+#: ../plugins/hula-account-setup/camel-hula-listener.c:406
#: ../plugins/publish-calendar/publish-calendar.glade.h:5
msgid "Calendar"
msgstr "Calendar"
#: ../addressbook/gui/widgets/eab-contact-display.c:637
#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-#: ../calendar/gui/dialogs/event-editor.c:369
-#: ../ui/evolution-event-editor.xml.h:8
+#: ../calendar/gui/dialogs/event-editor.c:115
msgid "Free/Busy"
msgstr "Free/Busy"
@@ -3406,12 +3411,14 @@ msgid "Web Log"
msgstr "Web Log"
#: ../addressbook/gui/widgets/eab-contact-display.c:656
-#: ../calendar/gui/e-calendar-view.c:2362
+#: ../calendar/gui/caltypes.xml.h:6 ../calendar/gui/e-calendar-view.c:2343
+#: ../calendar/gui/memotypes.xml.h:5 ../calendar/gui/tasktypes.xml.h:8
msgid "Birthday"
msgstr "Birthday"
#: ../addressbook/gui/widgets/eab-contact-display.c:657
-#: ../calendar/gui/e-calendar-view.c:2363
+#: ../calendar/gui/caltypes.xml.h:1 ../calendar/gui/e-calendar-view.c:2344
+#: ../calendar/gui/memotypes.xml.h:1 ../calendar/gui/tasktypes.xml.h:3
msgid "Anniversary"
msgstr "Anniversary"
@@ -3457,7 +3464,7 @@ msgstr "No Self Contact defined"
#. E_BOOK_ERROR_URI_ALREADY_LOADED
#. E_BOOK_ERROR_PERMISSION_DENIED
#: ../addressbook/gui/widgets/eab-gui-util.c:65
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:49
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:50
msgid "Permission denied"
msgstr "Permission denied"
@@ -3479,11 +3486,11 @@ msgstr "Protocol not supported"
#. E_BOOK_ERROR_CANCELLED
#: ../addressbook/gui/widgets/eab-gui-util.c:69
#: ../calendar/gui/dialogs/task-details-page.glade.h:3
-#: ../calendar/gui/e-cal-component-preview.c:255
+#: ../calendar/gui/e-cal-component-preview.c:256
#: ../calendar/gui/e-cal-model-tasks.c:360
#: ../calendar/gui/e-cal-model-tasks.c:677
-#: ../calendar/gui/e-calendar-table.c:236
-#: ../calendar/gui/e-calendar-table.c:436 ../calendar/gui/print.c:2523
+#: ../calendar/gui/e-calendar-table.c:240
+#: ../calendar/gui/e-calendar-table.c:643 ../calendar/gui/print.c:2555
msgid "Canceled"
msgstr "Cancelled"
@@ -3519,39 +3526,49 @@ msgstr "No such source"
msgid "Not available in offline mode"
msgstr "Not available in offline mode"
+#. E_BOOK_ERROR_OTHER_ERROR
+#: ../addressbook/gui/widgets/eab-gui-util.c:77
+msgid "Other error"
+msgstr "Other error"
+
#. E_BOOK_ERROR_INVALID_SERVER_VERSION
#: ../addressbook/gui/widgets/eab-gui-util.c:78
msgid "Invalid server version"
msgstr "Invalid server version"
-#: ../addressbook/gui/widgets/eab-gui-util.c:101
+#. E_BOOK_ERROR_UNSUPPORTED_AUTHENTICATION_METHOD
+#: ../addressbook/gui/widgets/eab-gui-util.c:79
+msgid "Unsupported authentication method"
+msgstr "Unsupported authentication method"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:107
msgid ""
-"We were unable to open this addressbook. This either means this book is not "
+"We were unable to open this address book. This either means this book is not "
"marked for offline usage or not yet downloaded for offline usage. Please "
-"load the addressbook once in online mode to download its contents"
+"load the address book once in online mode to download its contents"
msgstr ""
"We were unable to open this address book. This either means this book is not "
"marked for offline usage or not yet downloaded for offline usage. Please "
"load the address book once in online mode to download its contents"
-#: ../addressbook/gui/widgets/eab-gui-util.c:110
+#: ../addressbook/gui/widgets/eab-gui-util.c:116
#, c-format
msgid ""
-"We were unable to open this addressbook. Please check that the path %s "
+"We were unable to open this address book. Please check that the path %s "
"exists and that you have permission to access it."
msgstr ""
"We were unable to open this address book. Please check that the path %s "
"exists and that you have permission to access it."
-#: ../addressbook/gui/widgets/eab-gui-util.c:119
+#: ../addressbook/gui/widgets/eab-gui-util.c:125
msgid ""
-"We were unable to open this addressbook. This either means you have entered "
-"an incorrect URI, or the LDAP server is unreachable."
+"We were unable to open this address book. This either means you have "
+"entered an incorrect URI, or the LDAP server is unreachable."
msgstr ""
"We were unable to open this address book. This either means you have "
"entered an incorrect URI, or the LDAP server is unreachable."
-#: ../addressbook/gui/widgets/eab-gui-util.c:124
+#: ../addressbook/gui/widgets/eab-gui-util.c:130
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 "
@@ -3561,77 +3578,81 @@ msgstr ""
"you want to use LDAP in Evolution, you must install an LDAP-enabled "
"Evolution package."
-#: ../addressbook/gui/widgets/eab-gui-util.c:131
+#: ../addressbook/gui/widgets/eab-gui-util.c:137
msgid ""
-"We were unable to open this addressbook. This either means you have entered "
-"an incorrect URI, or the server is unreachable."
+"We were unable to open this address book. This either means you have "
+"entered an incorrect URI, or the server is unreachable."
msgstr ""
"We were unable to open this address book. This either means you have "
"entered an incorrect URI, or the server is unreachable."
-#: ../addressbook/gui/widgets/eab-gui-util.c:154
+#: ../addressbook/gui/widgets/eab-gui-util.c:143
+msgid "Detailed error:"
+msgstr "Detailed error:"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:166
msgid ""
"More cards matched this query than either the server is \n"
"configured to return or Evolution is configured to display.\n"
"Please make your search more specific or raise the result limit in\n"
-"the directory server preferences for this addressbook."
+"the directory server preferences for this address book."
msgstr ""
"More cards matched this query than either the server is \n"
"configured to return or Evolution is configured to display.\n"
"Please make your search more specific or raise the result limit in\n"
"the directory server preferences for this address book."
-#: ../addressbook/gui/widgets/eab-gui-util.c:160
+#: ../addressbook/gui/widgets/eab-gui-util.c:172
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"
+"you have configured for this address book. Please make your search\n"
"more specific or raise the time limit in the directory server\n"
-"preferences for this addressbook."
+"preferences for this address book."
msgstr ""
"The time to execute this query exceeded the server limit or the limit\n"
"you have configured for this address book. Please make your search\n"
"more specific or raise the time limit in the directory server\n"
"preferences for this address book."
-#: ../addressbook/gui/widgets/eab-gui-util.c:166
-msgid "The backend for this addressbook was unable to parse this query."
+#: ../addressbook/gui/widgets/eab-gui-util.c:178
+msgid "The backend for this address book was unable to parse this query."
msgstr "The backend for this address book was unable to parse this query."
-#: ../addressbook/gui/widgets/eab-gui-util.c:169
-msgid "The backend for this addressbook refused to perform this query."
+#: ../addressbook/gui/widgets/eab-gui-util.c:181
+msgid "The backend for this address book refused to perform this query."
msgstr "The backend for this address book refused to perform this query."
-#: ../addressbook/gui/widgets/eab-gui-util.c:172
+#: ../addressbook/gui/widgets/eab-gui-util.c:184
msgid "This query did not complete successfully."
msgstr "This query did not complete successfully."
-#: ../addressbook/gui/widgets/eab-gui-util.c:194
+#: ../addressbook/gui/widgets/eab-gui-util.c:206
msgid "Error adding list"
msgstr "Error adding list"
-#: ../addressbook/gui/widgets/eab-gui-util.c:194
-#: ../addressbook/gui/widgets/eab-gui-util.c:670
+#: ../addressbook/gui/widgets/eab-gui-util.c:206
+#: ../addressbook/gui/widgets/eab-gui-util.c:682
msgid "Error adding contact"
msgstr "Error adding contact"
-#: ../addressbook/gui/widgets/eab-gui-util.c:205
+#: ../addressbook/gui/widgets/eab-gui-util.c:217
msgid "Error modifying list"
msgstr "Error modifying list"
-#: ../addressbook/gui/widgets/eab-gui-util.c:205
+#: ../addressbook/gui/widgets/eab-gui-util.c:217
msgid "Error modifying contact"
msgstr "Error modifying contact"
-#: ../addressbook/gui/widgets/eab-gui-util.c:217
+#: ../addressbook/gui/widgets/eab-gui-util.c:229
msgid "Error removing list"
msgstr "Error removing list"
-#: ../addressbook/gui/widgets/eab-gui-util.c:217
-#: ../addressbook/gui/widgets/eab-gui-util.c:620
+#: ../addressbook/gui/widgets/eab-gui-util.c:229
+#: ../addressbook/gui/widgets/eab-gui-util.c:632
msgid "Error removing contact"
msgstr "Error removing contact"
-#: ../addressbook/gui/widgets/eab-gui-util.c:299
+#: ../addressbook/gui/widgets/eab-gui-util.c:311
#, c-format
msgid ""
"Opening %d contact will open %d new window as well.\n"
@@ -3646,16 +3667,16 @@ 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:307
+#: ../addressbook/gui/widgets/eab-gui-util.c:319
msgid "_Don't Display"
msgstr "_Don't Display"
-#: ../addressbook/gui/widgets/eab-gui-util.c:308
+#: ../addressbook/gui/widgets/eab-gui-util.c:320
msgid "Display _All Contacts"
msgstr "Display _All Contacts"
#. For Translators only: "it" refers to the filename %s.
-#: ../addressbook/gui/widgets/eab-gui-util.c:334
+#: ../addressbook/gui/widgets/eab-gui-util.c:346
#, c-format
msgid ""
"%s already exists\n"
@@ -3664,70 +3685,70 @@ msgstr ""
"%s already exists\n"
"Do you want to overwrite it?"
-#: ../addressbook/gui/widgets/eab-gui-util.c:338
+#: ../addressbook/gui/widgets/eab-gui-util.c:350
msgid "Overwrite"
msgstr "Overwrite"
#. more than one, finding the total number of contacts might
#. * hit performance while saving large number of contacts
#.
-#: ../addressbook/gui/widgets/eab-gui-util.c:379
-#: ../addressbook/gui/widgets/eab-gui-util.c:382
+#: ../addressbook/gui/widgets/eab-gui-util.c:391
+#: ../addressbook/gui/widgets/eab-gui-util.c:394
msgid "contact"
msgid_plural "contacts"
msgstr[0] "contact"
msgstr[1] "contacts"
#. This is a filename. Translators take note.
-#: ../addressbook/gui/widgets/eab-gui-util.c:428
+#: ../addressbook/gui/widgets/eab-gui-util.c:440
msgid "card.vcf"
msgstr "card.vcf"
-#: ../addressbook/gui/widgets/eab-gui-util.c:465
+#: ../addressbook/gui/widgets/eab-gui-util.c:477
msgid "Select Address Book"
msgstr "Select Address Book"
-#: ../addressbook/gui/widgets/eab-gui-util.c:579
+#: ../addressbook/gui/widgets/eab-gui-util.c:591
msgid "list"
msgstr "list"
-#: ../addressbook/gui/widgets/eab-gui-util.c:731
+#: ../addressbook/gui/widgets/eab-gui-util.c:743
msgid "Move contact to"
msgstr "Move contact to"
-#: ../addressbook/gui/widgets/eab-gui-util.c:733
+#: ../addressbook/gui/widgets/eab-gui-util.c:745
msgid "Copy contact to"
msgstr "Copy contact to"
-#: ../addressbook/gui/widgets/eab-gui-util.c:736
+#: ../addressbook/gui/widgets/eab-gui-util.c:748
msgid "Move contacts to"
msgstr "Move contacts to"
-#: ../addressbook/gui/widgets/eab-gui-util.c:738
+#: ../addressbook/gui/widgets/eab-gui-util.c:750
msgid "Copy contacts to"
msgstr "Copy contacts to"
-#: ../addressbook/gui/widgets/eab-gui-util.c:883
+#: ../addressbook/gui/widgets/eab-gui-util.c:895
msgid "Multiple vCards"
msgstr "Multiple vCards"
-#: ../addressbook/gui/widgets/eab-gui-util.c:890
+#: ../addressbook/gui/widgets/eab-gui-util.c:902
#, c-format
msgid "vCard for %s"
msgstr "vCard for %s"
-#: ../addressbook/gui/widgets/eab-gui-util.c:902
-#: ../addressbook/gui/widgets/eab-gui-util.c:928
+#: ../addressbook/gui/widgets/eab-gui-util.c:914
+#: ../addressbook/gui/widgets/eab-gui-util.c:940
#, c-format
msgid "Contact information"
msgstr "Contact information"
-#: ../addressbook/gui/widgets/eab-gui-util.c:930
+#: ../addressbook/gui/widgets/eab-gui-util.c:942
#, c-format
msgid "Contact information for %s"
msgstr "Contact information for %s"
-#: ../addressbook/gui/widgets/eab-popup-control.c:313
+#: ../addressbook/gui/widgets/eab-popup-control.c:301
msgid "Querying Address Book..."
msgstr "Querying Address Book..."
@@ -3748,50 +3769,50 @@ msgid "Show Compact vCard"
msgstr "Show Compact vCard"
#: ../addressbook/gui/widgets/eab-vcard-control.c:284
-msgid "Save in addressbook"
+msgid "Save in address book"
msgstr "Save in address book"
-#: ../addressbook/gui/widgets/gal-view-factory-minicard.c:25
+#: ../addressbook/gui/widgets/gal-view-factory-minicard.c:37
msgid "Card View"
msgstr "Card View"
-#: ../addressbook/importers/evolution-csv-importer.c:624
-#: ../addressbook/importers/evolution-ldif-importer.c:499
+#: ../addressbook/importers/evolution-csv-importer.c:661
+#: ../addressbook/importers/evolution-ldif-importer.c:498
#: ../addressbook/importers/evolution-vcard-importer.c:250
-#: ../calendar/importers/icalendar-importer.c:312
-#: ../calendar/importers/icalendar-importer.c:677 ../shell/shell.error.xml.h:6
+#: ../calendar/importers/icalendar-importer.c:306
+#: ../calendar/importers/icalendar-importer.c:671 ../shell/shell.error.xml.h:6
msgid "Importing..."
msgstr "Importing..."
-#: ../addressbook/importers/evolution-csv-importer.c:826
+#: ../addressbook/importers/evolution-csv-importer.c:863
msgid "Outlook CSV or Tab (.csv, .tab)"
msgstr "Outlook CSV or Tab (.csv, .tab)"
-#: ../addressbook/importers/evolution-csv-importer.c:827
+#: ../addressbook/importers/evolution-csv-importer.c:864
msgid "Outlook CSV and Tab Importer"
msgstr "Outlook CSV and Tab Importer"
-#: ../addressbook/importers/evolution-csv-importer.c:835
+#: ../addressbook/importers/evolution-csv-importer.c:872
msgid "Mozilla CSV or Tab (.csv, .tab)"
msgstr "Mozilla CSV or Tab (.csv, .tab)"
-#: ../addressbook/importers/evolution-csv-importer.c:836
+#: ../addressbook/importers/evolution-csv-importer.c:873
msgid "Mozilla CSV and Tab Importer"
msgstr "Mozilla CSV and Tab Importer"
-#: ../addressbook/importers/evolution-csv-importer.c:844
+#: ../addressbook/importers/evolution-csv-importer.c:881
msgid "Evolution CSV or Tab (.csv, .tab)"
msgstr "Evolution CSV or Tab (.csv, .tab)"
-#: ../addressbook/importers/evolution-csv-importer.c:845
+#: ../addressbook/importers/evolution-csv-importer.c:882
msgid "Evolution CSV and Tab Importer"
msgstr "Evolution CSV and Tab Importer"
-#: ../addressbook/importers/evolution-ldif-importer.c:666
+#: ../addressbook/importers/evolution-ldif-importer.c:665
msgid "LDAP Data Interchange Format (.ldif)"
msgstr "LDAP Data Interchange Format (.ldif)"
-#: ../addressbook/importers/evolution-ldif-importer.c:667
+#: ../addressbook/importers/evolution-ldif-importer.c:666
msgid "Evolution LDIF importer"
msgstr "Evolution LDIF importer"
@@ -3844,12 +3865,12 @@ msgid "Format"
msgstr "Format"
#: ../addressbook/printing/e-contact-print.glade.h:11
-#: ../mail/em-mailer-prefs.c:447 ../widgets/table/e-table-click-to-add.c:503
+#: ../mail/em-mailer-prefs.c:432 ../widgets/table/e-table-click-to-add.c:502
#: ../widgets/table/e-table-field-chooser-dialog.c:81
#: ../widgets/table/e-table-field-chooser-item.c:648
#: ../widgets/table/e-table-field-chooser.c:81
#: ../widgets/table/e-table-header-item.c:1908
-#: ../widgets/table/e-table-selection-model.c:310
+#: ../widgets/table/e-table-selection-model.c:309
msgid "Header"
msgstr "Header"
@@ -3951,7 +3972,7 @@ msgstr "Shading"
#. FIXME: Take care of i18n
#: ../addressbook/printing/e-contact-print.glade.h:36
-#: ../plugins/exchange-operations/exchange-account-setup.c:986
+#: ../plugins/exchange-operations/exchange-account-setup.c:1069
#: ../plugins/exchange-operations/exchange-calendar.c:231
#: ../plugins/exchange-operations/exchange-contacts.c:217
msgid "Size:"
@@ -3970,7 +3991,7 @@ msgid "Top:"
msgstr "Top:"
#: ../addressbook/printing/e-contact-print.glade.h:40
-#: ../calendar/gui/dialogs/calendar-setup.c:156
+#: ../calendar/gui/dialogs/calendar-setup.c:153
msgid "Type:"
msgstr "Type:"
@@ -3982,35 +4003,35 @@ msgstr "Width:"
msgid "_Font..."
msgstr "_Font..."
-#: ../addressbook/printing/test-contact-print-style-editor.c:53
+#: ../addressbook/printing/test-contact-print-style-editor.c:54
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:44
+#: ../addressbook/printing/test-contact-print-style-editor.c:55
+#: ../addressbook/printing/test-print.c:45
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:57
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:43
+#: ../addressbook/printing/test-print.c:44
msgid "Contact Print Test"
msgstr "Contact Print Test"
-#: ../addressbook/printing/test-print.c:46
+#: ../addressbook/printing/test-print.c:47
msgid "This should test the contact print code"
msgstr "This should test the contact print code"
-#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:668
-#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:704
+#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:667
+#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:703
#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:50
msgid "Can not open file"
msgstr "Can not open file"
#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:44
-msgid "Couldn't get list of addressbooks"
+msgid "Couldn't get list of address books"
msgstr "Couldn't get list of address books"
#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:72
@@ -4026,7 +4047,7 @@ msgid "OUTPUTFILE"
msgstr "OUTPUTFILE"
#: ../addressbook/tools/evolution-addressbook-export.c:53
-msgid "List local addressbook folders"
+msgid "List local address book folders"
msgstr "List local address book folders"
#: ../addressbook/tools/evolution-addressbook-export.c:56
@@ -4078,20 +4099,20 @@ msgstr "Unhandled error"
#. For Translators: {0} is the name of the calendar source
#: ../calendar/calendar.error.xml.h:2
msgid ""
-"'{0}' is a read-only calendar source. Change Calendar to one that can accept "
-"appointments."
+"'{0}' is a read-only calendar and cannot be modified. Please select a "
+"different calendar from the side bar in the Calendar view."
msgstr ""
-"'{0}' is a read-only calendar source. Change Calendar to one that can accept "
-"appointments."
+"'{0}' is a read-only calendar and cannot be modified. Please select a "
+"different calendar from the side bar in the Calendar view."
#. For Translators: {0} is the name of the calendar source
#: ../calendar/calendar.error.xml.h:4
msgid ""
-"'{0}' is a read-only calendar source. Switch to Calendar View and highlight "
-"a calendar that can accept appointments."
+"'{0}' is a read-only calendar and cannot be modified. Please select a "
+"different calendar that can accept appointments."
msgstr ""
-"'{0}' is a read-only calendar source. Switch to Calendar View and highlight "
-"a calendar that can accept appointments."
+"'{0}' is a read-only calendar and cannot be modified. Please select a "
+"different calendar that can accept appointments."
#: ../calendar/calendar.error.xml.h:5
msgid ""
@@ -4180,19 +4201,19 @@ msgid "Are you sure you want to delete this appointment?"
msgstr "Are you sure you want to delete this appointment?"
#: ../calendar/calendar.error.xml.h:22
-#: ../calendar/gui/dialogs/delete-comp.c:183
+#: ../calendar/gui/dialogs/delete-comp.c:178
#, c-format
msgid "Are you sure you want to delete this meeting?"
msgstr "Are you sure you want to delete this meeting?"
#: ../calendar/calendar.error.xml.h:23
-#: ../calendar/gui/dialogs/delete-comp.c:189
+#: ../calendar/gui/dialogs/delete-comp.c:184
#, c-format
msgid "Are you sure you want to delete this memo?"
msgstr "Are you sure you want to delete this memo?"
#: ../calendar/calendar.error.xml.h:24
-#: ../calendar/gui/dialogs/delete-comp.c:186
+#: ../calendar/gui/dialogs/delete-comp.c:181
#, c-format
msgid "Are you sure you want to delete this task?"
msgstr "Are you sure you want to delete this task?"
@@ -4348,7 +4369,7 @@ msgid "The calendar is not marked for offline usage."
msgstr "The calendar is not marked for offline usage."
#: ../calendar/calendar.error.xml.h:54
-msgid "The memo list is not marked for offline usage"
+msgid "The memo list is not marked for offline usage."
msgstr "The memo list is not marked for offline usage"
#: ../calendar/calendar.error.xml.h:55
@@ -4442,12 +4463,11 @@ msgid "Your tasks will not be available until Evolution is restarted."
msgstr "Your tasks will not be available until Evolution is restarted."
#: ../calendar/calendar.error.xml.h:75
-#: ../composer/mail-composer.error.xml.h:29
+#: ../composer/mail-composer.error.xml.h:30
msgid "_Discard Changes"
msgstr "_Discard Changes"
-#: ../calendar/calendar.error.xml.h:76 ../composer/e-composer-actions.c:492
-#: ../ui/evolution-editor.xml.h:23
+#: ../calendar/calendar.error.xml.h:76 ../composer/e-composer-actions.c:499
msgid "_Save"
msgstr "_Save"
@@ -4456,8 +4476,8 @@ msgid "_Save Changes"
msgstr "_Save Changes"
#: ../calendar/calendar.error.xml.h:78
-#: ../composer/mail-composer.error.xml.h:33 ../mail/mail.error.xml.h:142
-#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:5
+#: ../composer/mail-composer.error.xml.h:34 ../mail/mail.error.xml.h:142
+#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:6
msgid "_Send"
msgstr "_Send"
@@ -4469,55 +4489,56 @@ msgstr "_Send Notice"
msgid "{0}."
msgstr "{0}."
-#: ../calendar/conduits/calendar/calendar-conduit.c:254
+#: ../calendar/conduits/calendar/calendar-conduit.c:256
msgid "Split Multi-Day Events:"
msgstr "Split Multi-Day Events:"
-#: ../calendar/conduits/calendar/calendar-conduit.c:1519
-#: ../calendar/conduits/calendar/calendar-conduit.c:1520
-#: ../calendar/conduits/memo/memo-conduit.c:818
-#: ../calendar/conduits/memo/memo-conduit.c:819
-#: ../calendar/conduits/todo/todo-conduit.c:1016
-#: ../calendar/conduits/todo/todo-conduit.c:1017
+#: ../calendar/conduits/calendar/calendar-conduit.c:1521
+#: ../calendar/conduits/calendar/calendar-conduit.c:1522
+#: ../calendar/conduits/memo/memo-conduit.c:820
+#: ../calendar/conduits/memo/memo-conduit.c:821
+#: ../calendar/conduits/todo/todo-conduit.c:1018
+#: ../calendar/conduits/todo/todo-conduit.c:1019
msgid "Could not start evolution-data-server"
msgstr "Could not start evolution-data-server"
-#: ../calendar/conduits/calendar/calendar-conduit.c:1627
-#: ../calendar/conduits/calendar/calendar-conduit.c:1630
+#: ../calendar/conduits/calendar/calendar-conduit.c:1629
+#: ../calendar/conduits/calendar/calendar-conduit.c:1632
msgid "Could not read pilot's Calendar application block"
msgstr "Could not read pilot's Calendar application block"
-#: ../calendar/conduits/memo/memo-conduit.c:912
-#: ../calendar/conduits/memo/memo-conduit.c:915
+#: ../calendar/conduits/memo/memo-conduit.c:914
+#: ../calendar/conduits/memo/memo-conduit.c:917
msgid "Could not read pilot's Memo application block"
msgstr "Could not read pilot's Memo application block"
-#: ../calendar/conduits/memo/memo-conduit.c:959
-#: ../calendar/conduits/memo/memo-conduit.c:962
+#: ../calendar/conduits/memo/memo-conduit.c:961
+#: ../calendar/conduits/memo/memo-conduit.c:964
msgid "Could not write pilot's Memo application block"
msgstr "Could not write pilot's Memo application block"
-#: ../calendar/conduits/todo/todo-conduit.c:238
+#: ../calendar/conduits/todo/todo-conduit.c:240
msgid "Default Priority:"
msgstr "Default Priority:"
-#: ../calendar/conduits/todo/todo-conduit.c:1100
-#: ../calendar/conduits/todo/todo-conduit.c:1103
+#: ../calendar/conduits/todo/todo-conduit.c:1102
+#: ../calendar/conduits/todo/todo-conduit.c:1105
msgid "Could not read pilot's ToDo application block"
msgstr "Could not read pilot's ToDo application block"
-#: ../calendar/conduits/todo/todo-conduit.c:1145
-#: ../calendar/conduits/todo/todo-conduit.c:1148
+#: ../calendar/conduits/todo/todo-conduit.c:1147
+#: ../calendar/conduits/todo/todo-conduit.c:1150
msgid "Could not write pilot's ToDo application block"
msgstr "Could not write pilot's ToDo application block"
#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-#: ../plugins/itip-formatter/itip-formatter.c:2353
+#: ../plugins/itip-formatter/itip-formatter.c:2358
msgid "Calendar and Tasks"
msgstr "Calendar and Tasks"
#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-#: ../calendar/gui/calendar-component.c:1392
+#: ../calendar/gui/calendar-component.c:805
+#: ../calendar/gui/calendar-component.c:1402
msgid "Calendars"
msgstr "Calendars"
@@ -4558,25 +4579,25 @@ msgid "Memo_s"
msgstr "Memo_s"
#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: ../calendar/gui/e-memo-table.c:280 ../calendar/gui/e-memos.c:1121
-#: ../calendar/gui/gnome-cal.c:1703 ../calendar/gui/memos-component.c:548
-#: ../calendar/gui/memos-component.c:1101 ../calendar/gui/memos-control.c:356
-#: ../calendar/gui/memos-control.c:372
+#: ../calendar/gui/e-memo-table.c:280 ../calendar/gui/e-memos.c:1120
+#: ../calendar/gui/gnome-cal.c:1774 ../calendar/gui/memos-component.c:548
+#: ../calendar/gui/memos-component.c:1101 ../calendar/gui/memos-control.c:354
+#: ../calendar/gui/memos-control.c:370
msgid "Memos"
msgstr "Memos"
#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
-#: ../calendar/gui/e-calendar-table.c:495 ../calendar/gui/e-tasks.c:1430
-#: ../calendar/gui/gnome-cal.c:1575 ../calendar/gui/print.c:1966
+#: ../calendar/gui/e-calendar-table.c:704 ../calendar/gui/e-tasks.c:1429
+#: ../calendar/gui/gnome-cal.c:1642 ../calendar/gui/print.c:1982
#: ../calendar/gui/tasks-component.c:539
-#: ../calendar/gui/tasks-component.c:1090 ../calendar/gui/tasks-control.c:495
-#: ../calendar/gui/tasks-control.c:511
-#: ../calendar/importers/icalendar-importer.c:80
-#: ../calendar/importers/icalendar-importer.c:741
-#: ../plugins/exchange-operations/exchange-delegates-user.c:88
-#: ../plugins/exchange-operations/exchange-folder.c:587
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:426
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:570
+#: ../calendar/gui/tasks-component.c:1090 ../calendar/gui/tasks-control.c:492
+#: ../calendar/gui/tasks-control.c:508
+#: ../calendar/importers/icalendar-importer.c:74
+#: ../calendar/importers/icalendar-importer.c:735
+#: ../plugins/exchange-operations/exchange-delegates-user.c:76
+#: ../plugins/exchange-operations/exchange-folder.c:588
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:425
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:569
#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:12
msgid "Tasks"
msgstr "Tasks"
@@ -4594,25 +4615,26 @@ msgstr "_Tasks"
msgid "Evolution Calendar alarm notification service"
msgstr "Evolution Calendar alarm notification service"
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:113
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:104
msgid "minute"
msgid_plural "minutes"
msgstr[0] "minute"
msgstr[1] "minutes"
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:128
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:119
#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:6
#: ../calendar/gui/dialogs/alarm-dialog.glade.h:25
#: ../calendar/gui/dialogs/event-page.glade.h:19 ../filter/filter.glade.h:15
-#: ../plugins/calendar-http/calendar-http.c:289
+#: ../plugins/calendar-http/calendar-http.c:280
#: ../plugins/calendar-weather/calendar-weather.c:562
-#: ../plugins/google-account-setup/google-source.c:396
+#: ../plugins/google-account-setup/google-source.c:663
+#: ../plugins/google-account-setup/google-contacts-source.c:329
msgid "hours"
msgid_plural "hours"
msgstr[0] "hours"
msgstr[1] "hours"
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:284
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:273
msgid "Start time"
msgstr "Start time"
@@ -4623,9 +4645,9 @@ msgstr "Appointments"
#. Location
#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:2
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1611
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1617
-#: ../calendar/gui/e-itip-control.c:1155
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1599
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1605
+#: ../calendar/gui/e-itip-control.c:1172
#: ../plugins/itip-formatter/itip-view.c:1004
msgid "Location:"
msgstr "Location:"
@@ -4635,14 +4657,15 @@ msgid "Snooze _time:"
msgstr "Snooze _time:"
#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:4
+#: ../calendar/gui/dialogs/comp-editor.c:1332
#: ../calendar/gui/dialogs/recurrence-page.glade.h:10
-#: ../filter/filter.glade.h:11 ../mail/mail-config.glade.h:166
+#: ../filter/filter.glade.h:11 ../mail/mail-config.glade.h:167
#: ../plugins/exchange-operations/exchange-delegates.glade.h:15
#: ../plugins/publish-calendar/publish-calendar.glade.h:21
#: ../ui/evolution-addressbook.xml.h:51 ../ui/evolution-calendar.xml.h:41
-#: ../ui/evolution-editor.xml.h:18 ../ui/evolution-mail-messagedisplay.xml.h:5
-#: ../ui/evolution-memos.xml.h:17 ../ui/evolution-tasks.xml.h:25
-#: ../ui/evolution.xml.h:41 ../widgets/menus/gal-define-views.glade.h:5
+#: ../ui/evolution-mail-messagedisplay.xml.h:5 ../ui/evolution-memos.xml.h:17
+#: ../ui/evolution-tasks.xml.h:25 ../ui/evolution.xml.h:42
+#: ../widgets/menus/gal-define-views.glade.h:5
msgid "_Edit"
msgstr "_Edit"
@@ -4654,32 +4677,32 @@ msgstr "_Snooze"
msgid "location of appointment"
msgstr "location of appointment"
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1470
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1593
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1457
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1582
msgid "No summary available."
msgstr "No summary available."
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1479
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1481
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1466
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1468
msgid "No description available."
msgstr "No description available."
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1489
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1476
msgid "No location information available."
msgstr "No location information available."
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1533
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1521
#, c-format
msgid "You have %d alarms"
msgstr "You have %d alarms"
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1695
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1723
-#: ../mail/mail-component.c:1536
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1683
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1711
+#: ../mail/mail-component.c:1597
msgid "Warning"
msgstr "Warning"
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1699
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1687
msgid ""
"Evolution does not support calendar reminders with\n"
"email notifications yet, but this reminder was\n"
@@ -4691,7 +4714,7 @@ msgstr ""
"configured to send an e-mail. Evolution will display\n"
"a normal reminder dialogue box instead."
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1729
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1717
#, c-format
msgid ""
"An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -4708,15 +4731,15 @@ msgstr ""
"\n"
"Are you sure you want to run this program?"
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1743
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1731
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:138
msgid "Could not initialize Bonobo"
msgstr "Could not initialise Bonobo"
-#: ../calendar/gui/alarm-notify/notify-main.c:152
+#: ../calendar/gui/alarm-notify/notify-main.c:151
msgid ""
"Could not create the alarm notify service factory, maybe it's already "
"running..."
@@ -4729,7 +4752,7 @@ msgid "invalid time"
msgstr "invalid time"
#. Translator: Entire string is like "Pop up an alert %d hours before start of appointment"
-#: ../calendar/gui/alarm-notify/util.c:66 ../calendar/gui/e-alarm-list.c:408
+#: ../calendar/gui/alarm-notify/util.c:66 ../calendar/gui/e-alarm-list.c:404
#: ../calendar/gui/misc.c:113
#, c-format
msgid "%d hour"
@@ -4738,7 +4761,7 @@ msgstr[0] "%d hour"
msgstr[1] "%d hours"
#. Translator: Entire string is like "Pop up an alert %d minutes before start of appointment"
-#: ../calendar/gui/alarm-notify/util.c:72 ../calendar/gui/e-alarm-list.c:414
+#: ../calendar/gui/alarm-notify/util.c:72 ../calendar/gui/e-alarm-list.c:410
#: ../calendar/gui/misc.c:119
#, c-format
msgid "%d minute"
@@ -4749,7 +4772,7 @@ msgstr[1] "%d minutes"
#. TRANSLATORS: here, "second" is the time division (like "minute"), not the ordinal number (like "third")
#. Translator: Entire string is like "Pop up an alert %d seconds before start of appointment"
#. TRANSLATORS: here, "second" is the time division (like "minute"), not the ordinal number (like "third")
-#: ../calendar/gui/alarm-notify/util.c:76 ../calendar/gui/e-alarm-list.c:420
+#: ../calendar/gui/alarm-notify/util.c:76 ../calendar/gui/e-alarm-list.c:416
#: ../calendar/gui/misc.c:123
#, c-format
msgid "%d second"
@@ -4992,12 +5015,12 @@ msgid "Show status field in the event/task/meeting editor"
msgstr "Show status field in the event/task/meeting editor"
#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:53
-#: ../mail/evolution-mail.schemas.in.h:122
+#: ../mail/evolution-mail.schemas.in.h:124
msgid "Show the \"Preview\" pane"
msgstr "Show the \"Preview\" pane"
#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:54
-#: ../mail/evolution-mail.schemas.in.h:123
+#: ../mail/evolution-mail.schemas.in.h:125
msgid "Show the \"Preview\" pane."
msgstr "Show the \"Preview\" pane."
@@ -5047,7 +5070,7 @@ 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.h:65
-#: ../plugins/startup-wizard/startup-wizard.c:108
+#: ../plugins/startup-wizard/startup-wizard.c:107
msgid "Timezone"
msgstr "Timezone"
@@ -5181,66 +5204,66 @@ msgstr "Workday start minute"
msgid "daylight savings time"
msgstr "daylight savings time"
-#: ../calendar/gui/cal-search-bar.c:76
+#: ../calendar/gui/cal-search-bar.c:71
msgid "Summary contains"
msgstr "Summary contains"
-#: ../calendar/gui/cal-search-bar.c:77
+#: ../calendar/gui/cal-search-bar.c:72
msgid "Description contains"
msgstr "Description contains"
-#: ../calendar/gui/cal-search-bar.c:78
+#: ../calendar/gui/cal-search-bar.c:73
msgid "Category is"
msgstr "Category is"
-#: ../calendar/gui/cal-search-bar.c:79
+#: ../calendar/gui/cal-search-bar.c:74
msgid "Comment contains"
msgstr "Comment contains"
-#: ../calendar/gui/cal-search-bar.c:80
+#: ../calendar/gui/cal-search-bar.c:75
msgid "Location contains"
msgstr "Location contains"
-#: ../calendar/gui/cal-search-bar.c:626 ../calendar/gui/cal-search-bar.c:669
-#: ../calendar/gui/cal-search-bar.c:688
+#: ../calendar/gui/cal-search-bar.c:629 ../calendar/gui/cal-search-bar.c:672
+#: ../calendar/gui/cal-search-bar.c:691
msgid "Unmatched"
msgstr "Unmatched"
-#: ../calendar/gui/cal-search-bar.c:634
+#: ../calendar/gui/cal-search-bar.c:637
msgid "Next 7 Days' Tasks"
msgstr "Next 7 Days' Tasks"
-#: ../calendar/gui/cal-search-bar.c:638
+#: ../calendar/gui/cal-search-bar.c:641
msgid "Active Tasks"
msgstr "Active Tasks"
-#: ../calendar/gui/cal-search-bar.c:642
+#: ../calendar/gui/cal-search-bar.c:645
msgid "Overdue Tasks"
msgstr "Overdue Tasks"
-#: ../calendar/gui/cal-search-bar.c:646
+#: ../calendar/gui/cal-search-bar.c:649
msgid "Completed Tasks"
msgstr "Completed Tasks"
-#: ../calendar/gui/cal-search-bar.c:650
+#: ../calendar/gui/cal-search-bar.c:653
msgid "Tasks with Attachments"
msgstr "Tasks with Attachments"
-#: ../calendar/gui/cal-search-bar.c:696
+#: ../calendar/gui/cal-search-bar.c:699
msgid "Active Appointments"
msgstr "Active Appointments"
-#: ../calendar/gui/cal-search-bar.c:700
+#: ../calendar/gui/cal-search-bar.c:703
msgid "Next 7 Days' Appointments"
msgstr "Next 7 Days' Appointments"
-#: ../calendar/gui/calendar-commands.c:99 ../ui/evolution-addressbook.xml.h:26
+#: ../calendar/gui/calendar-commands.c:92 ../ui/evolution-addressbook.xml.h:26
#: ../ui/evolution-calendar.xml.h:20 ../ui/evolution-mail-message.xml.h:75
#: ../ui/evolution-memos.xml.h:11 ../ui/evolution-tasks.xml.h:14
msgid "Print"
msgstr "Print"
-#: ../calendar/gui/calendar-commands.c:324
+#: ../calendar/gui/calendar-commands.c:317
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 "
@@ -5250,15 +5273,16 @@ msgstr ""
"amount of time. If you continue, you will not be able to recover these "
"events."
-#: ../calendar/gui/calendar-commands.c:330
+#: ../calendar/gui/calendar-commands.c:323
msgid "Purge events older than"
msgstr "Purge events older than"
-#: ../calendar/gui/calendar-commands.c:335
+#: ../calendar/gui/calendar-commands.c:328
#: ../calendar/gui/dialogs/alarm-dialog.glade.h:21 ../filter/filter.glade.h:14
-#: ../plugins/calendar-http/calendar-http.c:290
+#: ../plugins/calendar-http/calendar-http.c:281
#: ../plugins/calendar-weather/calendar-weather.c:563
-#: ../plugins/google-account-setup/google-source.c:397
+#: ../plugins/google-account-setup/google-source.c:664
+#: ../plugins/google-account-setup/google-contacts-source.c:330
#: ../widgets/misc/e-send-options.glade.h:39
msgid "days"
msgstr "days"
@@ -5268,131 +5292,311 @@ msgstr "days"
#. Create the Webcal source group
#. Create the LDAP source group
#: ../calendar/gui/calendar-component.c:273
-#: ../calendar/gui/memos-component.c:235 ../calendar/gui/migration.c:510
-#: ../calendar/gui/migration.c:609 ../calendar/gui/migration.c:1123
+#: ../calendar/gui/memos-component.c:235 ../calendar/gui/migration.c:505
+#: ../calendar/gui/migration.c:604 ../calendar/gui/migration.c:1118
#: ../calendar/gui/tasks-component.c:231
msgid "On The Web"
msgstr "On The Web"
-#: ../calendar/gui/calendar-component.c:296 ../calendar/gui/migration.c:404
+#: ../calendar/gui/calendar-component.c:310 ../calendar/gui/migration.c:399
msgid "Birthdays & Anniversaries"
msgstr "Birthdays & Anniversaries"
#. Create the weather group
-#: ../calendar/gui/calendar-component.c:308
+#: ../calendar/gui/calendar-component.c:323
#: ../plugins/calendar-weather/calendar-weather.c:100
msgid "Weather"
msgstr "Weather"
-#: ../calendar/gui/calendar-component.c:605
+#: ../calendar/gui/calendar-component.c:615
msgid "_New Calendar"
msgstr "_New Calendar"
-#: ../calendar/gui/calendar-component.c:606
+#: ../calendar/gui/calendar-component.c:616
#: ../calendar/gui/memos-component.c:465 ../calendar/gui/tasks-component.c:456
-#: ../mail/em-folder-tree.c:2087
+#: ../mail/em-folder-tree.c:2106
msgid "_Copy..."
msgstr "_Copy..."
-#: ../calendar/gui/calendar-component.c:612
-#: ../calendar/gui/dialogs/comp-editor.c:1128
-#: ../calendar/gui/memos-component.c:471 ../calendar/gui/tasks-component.c:462
-#: ../composer/e-msg-composer.c:1047 ../mail/em-folder-tree.c:2101
-#: ../ui/evolution-addressbook.xml.h:59 ../ui/evolution-mail-list.xml.h:38
-msgid "_Properties"
-msgstr "_Properties"
-
-#: ../calendar/gui/calendar-component.c:939
+#: ../calendar/gui/calendar-component.c:949
msgid "Failed upgrading calendars."
msgstr "Failed upgrading calendars."
-#: ../calendar/gui/calendar-component.c:1238
+#: ../calendar/gui/calendar-component.c:1248
#, 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:1254
+#: ../calendar/gui/calendar-component.c:1264
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:1367
+#: ../calendar/gui/calendar-component.c:1377
msgid "Calendar Source Selector"
msgstr "Calendar Source Selector"
-#: ../calendar/gui/calendar-component.c:1585
+#: ../calendar/gui/calendar-component.c:1596
msgid "New appointment"
msgstr "New appointment"
-#: ../calendar/gui/calendar-component.c:1586
-msgid "_Appointment"
-msgstr "_Appointment"
-
-#: ../calendar/gui/calendar-component.c:1587
+#: ../calendar/gui/calendar-component.c:1598
msgid "Create a new appointment"
msgstr "Create a new appointment"
-#: ../calendar/gui/calendar-component.c:1593
+#: ../calendar/gui/calendar-component.c:1604
msgid "New meeting"
msgstr "New meeting"
-#: ../calendar/gui/calendar-component.c:1594
-msgid "M_eeting"
-msgstr "M_eeting"
-
-#: ../calendar/gui/calendar-component.c:1595
+#: ../calendar/gui/calendar-component.c:1606
msgid "Create a new meeting request"
msgstr "Create a new meeting request"
-#: ../calendar/gui/calendar-component.c:1601
+#: ../calendar/gui/calendar-component.c:1612
msgid "New all day appointment"
msgstr "New all day appointment"
-#: ../calendar/gui/calendar-component.c:1602
-msgid "All Day A_ppointment"
-msgstr "All Day A_ppointment"
-
-#: ../calendar/gui/calendar-component.c:1603
+#: ../calendar/gui/calendar-component.c:1614
msgid "Create a new all-day appointment"
msgstr "Create a new all-day appointment"
-#: ../calendar/gui/calendar-component.c:1609
+#: ../calendar/gui/calendar-component.c:1620
msgid "New calendar"
msgstr "New calendar"
-#: ../calendar/gui/calendar-component.c:1610
-msgid "Cale_ndar"
-msgstr "Cale_ndar"
-
-#: ../calendar/gui/calendar-component.c:1611
+#: ../calendar/gui/calendar-component.c:1622
msgid "Create a new calendar"
msgstr "Create a new calendar"
-#: ../calendar/gui/calendar-view-factory.c:109
+#: ../calendar/gui/calendar-view-factory.c:113
msgid "Day View"
msgstr "Day View"
-#: ../calendar/gui/calendar-view-factory.c:112
+#: ../calendar/gui/calendar-view-factory.c:116
msgid "Work Week View"
msgstr "Work Week View"
-#: ../calendar/gui/calendar-view-factory.c:115
+#: ../calendar/gui/calendar-view-factory.c:119
msgid "Week View"
msgstr "Week View"
-#: ../calendar/gui/calendar-view-factory.c:118
+#: ../calendar/gui/calendar-view-factory.c:122
msgid "Month View"
msgstr "Month View"
#: ../calendar/gui/caltypes.xml.h:2 ../calendar/gui/memotypes.xml.h:2
-#: ../calendar/gui/tasktypes.xml.h:2
+#: ../calendar/gui/tasktypes.xml.h:4
+msgid "Any Field"
+msgstr "Any Field"
+
+#: ../calendar/gui/caltypes.xml.h:4 ../calendar/gui/memotypes.xml.h:4
+#: ../calendar/gui/tasktypes.xml.h:6 ../mail/em-filter-i18n.h:5
+msgid "Attachments"
+msgstr "Attachments"
+
+#: ../calendar/gui/caltypes.xml.h:5
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:1
+#: ../calendar/gui/tasktypes.xml.h:7
+msgid "Attendee"
+msgstr "Attendee"
+
+#: ../calendar/gui/caltypes.xml.h:7 ../calendar/gui/memotypes.xml.h:6
+#: ../calendar/gui/tasktypes.xml.h:9
+msgid "Business"
+msgstr "Business"
+
+#: ../calendar/gui/caltypes.xml.h:8 ../calendar/gui/memotypes.xml.h:7
+#: ../calendar/gui/tasktypes.xml.h:11
+msgid "Category"
+msgstr "Category"
+
+#: ../calendar/gui/caltypes.xml.h:9 ../calendar/gui/memotypes.xml.h:8
+#: ../widgets/misc/e-send-options.glade.h:6
+msgid "Classification"
+msgstr "Classification"
+
+#: ../calendar/gui/caltypes.xml.h:10 ../calendar/gui/memotypes.xml.h:9
+#: ../calendar/gui/tasktypes.xml.h:12
+msgid "Competition"
+msgstr "Competition"
+
+#: ../calendar/gui/caltypes.xml.h:11 ../calendar/gui/e-cal-list-view.c:254
+#: ../calendar/gui/e-cal-model.c:337 ../calendar/gui/e-calendar-table.c:547
+#: ../calendar/gui/memotypes.xml.h:10
+msgid "Confidential"
+msgstr "Confidential"
+
+#: ../calendar/gui/caltypes.xml.h:12 ../calendar/gui/memotypes.xml.h:11
+#: ../calendar/gui/tasktypes.xml.h:14
+#: ../plugins/plugin-manager/plugin-manager.c:43
+#: ../widgets/table/e-table-config.glade.h:6
+msgid "Description"
+msgstr "Description"
+
+#: ../calendar/gui/caltypes.xml.h:13 ../calendar/gui/memotypes.xml.h:12
+#: ../calendar/gui/tasktypes.xml.h:15
msgid "Description Contains"
msgstr "Description Contains"
-#: ../calendar/gui/caltypes.xml.h:3 ../calendar/gui/memotypes.xml.h:3
-#: ../calendar/gui/tasktypes.xml.h:3
+#: ../calendar/gui/caltypes.xml.h:14 ../calendar/gui/memotypes.xml.h:13
+#: ../calendar/gui/tasktypes.xml.h:16 ../mail/em-filter-i18n.h:22
+msgid "Do Not Exist"
+msgstr "Do Not Exist"
+
+#: ../calendar/gui/caltypes.xml.h:15 ../calendar/gui/memotypes.xml.h:14
+#: ../calendar/gui/tasktypes.xml.h:17 ../mail/em-filter-i18n.h:25
+msgid "Exist"
+msgstr "Exist"
+
+#: ../calendar/gui/caltypes.xml.h:16 ../calendar/gui/memotypes.xml.h:15
+#: ../calendar/gui/tasktypes.xml.h:18
+msgid "Favourites"
+msgstr "Favourites"
+
+#: ../calendar/gui/caltypes.xml.h:17 ../calendar/gui/memotypes.xml.h:16
+#: ../calendar/gui/tasktypes.xml.h:19
+msgid "Gifts"
+msgstr "Gifts"
+
+#: ../calendar/gui/caltypes.xml.h:18 ../calendar/gui/memotypes.xml.h:17
+#: ../calendar/gui/tasktypes.xml.h:20
+msgid "Goals/Objectives"
+msgstr "Goals/Objectives"
+
+#: ../calendar/gui/caltypes.xml.h:19 ../calendar/gui/memotypes.xml.h:18
+#: ../calendar/gui/tasktypes.xml.h:22
+msgid "Holiday"
+msgstr "Holiday"
+
+#: ../calendar/gui/caltypes.xml.h:20 ../calendar/gui/memotypes.xml.h:19
+#: ../calendar/gui/tasktypes.xml.h:23
+msgid "Holiday Cards"
+msgstr "Holiday Cards"
+
+#: ../calendar/gui/caltypes.xml.h:21 ../calendar/gui/memotypes.xml.h:20
+#: ../calendar/gui/tasktypes.xml.h:24
+msgid "Hot Contacts"
+msgstr "Hot Contacts"
+
+#: ../calendar/gui/caltypes.xml.h:22 ../calendar/gui/memotypes.xml.h:21
+#: ../calendar/gui/tasktypes.xml.h:25
+msgid "Ideas"
+msgstr "Ideas"
+
+#: ../calendar/gui/caltypes.xml.h:23 ../calendar/gui/memotypes.xml.h:22
+#: ../calendar/gui/tasktypes.xml.h:27
+msgid "International"
+msgstr "International"
+
+#: ../calendar/gui/caltypes.xml.h:24 ../calendar/gui/memotypes.xml.h:23
+#: ../calendar/gui/tasktypes.xml.h:28
+msgid "Key Customer"
+msgstr "Key Customer"
+
+#: ../calendar/gui/caltypes.xml.h:26 ../calendar/gui/memotypes.xml.h:24
+#: ../calendar/gui/tasktypes.xml.h:30
+msgid "Miscellaneous"
+msgstr "Miscellaneous"
+
+#: ../calendar/gui/caltypes.xml.h:27 ../calendar/gui/tasktypes.xml.h:31
+msgid "Next 7 days"
+msgstr "Next 7 days"
+
+#: ../calendar/gui/caltypes.xml.h:28
+#: ../calendar/gui/dialogs/meeting-page.glade.h:6
+#: ../calendar/gui/memotypes.xml.h:26 ../calendar/gui/tasktypes.xml.h:34
+msgid "Organizer"
+msgstr "Organiser"
+
+#: ../calendar/gui/caltypes.xml.h:30 ../calendar/gui/memotypes.xml.h:28
+#: ../calendar/gui/tasktypes.xml.h:36
+msgid "Phone Calls"
+msgstr "Phone Calls"
+
+#: ../calendar/gui/caltypes.xml.h:31 ../calendar/gui/e-cal-list-view.c:253
+#: ../calendar/gui/e-cal-model.c:335 ../calendar/gui/e-calendar-table.c:546
+#: ../calendar/gui/memotypes.xml.h:29
+msgid "Private"
+msgstr "Private"
+
+#: ../calendar/gui/caltypes.xml.h:32 ../calendar/gui/e-cal-list-view.c:252
+#: ../calendar/gui/e-cal-model.c:326 ../calendar/gui/e-cal-model.c:333
+#: ../calendar/gui/e-calendar-table.c:545 ../calendar/gui/memotypes.xml.h:30
+msgid "Public"
+msgstr "Public"
+
+#: ../calendar/gui/caltypes.xml.h:33
+#: ../calendar/gui/dialogs/event-editor.c:299
+msgid "Recurrence"
+msgstr "Recurrence"
+
+#: ../calendar/gui/caltypes.xml.h:34
+#: ../calendar/gui/e-calendar-table.etspec.h:10
+#: ../calendar/gui/e-meeting-list-view.c:545
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:10
+#: ../calendar/gui/memotypes.xml.h:31 ../calendar/gui/tasktypes.xml.h:38
+#: ../mail/em-filter-i18n.h:70 ../mail/message-list.etspec.h:17
+msgid "Status"
+msgstr "Status"
+
+#: ../calendar/gui/caltypes.xml.h:35 ../calendar/gui/memotypes.xml.h:32
+#: ../calendar/gui/tasktypes.xml.h:39
+msgid "Strategies"
+msgstr "Strategies"
+
+#: ../calendar/gui/caltypes.xml.h:36
+#: ../calendar/gui/e-cal-list-view.etspec.h:5
+#: ../calendar/gui/e-calendar-table.etspec.h:11
+#: ../calendar/gui/e-memo-table.etspec.h:4 ../calendar/gui/memotypes.xml.h:33
+#: ../calendar/gui/tasktypes.xml.h:40
+#: ../plugins/save-calendar/csv-format.c:361
+msgid "Summary"
+msgstr "Summary"
+
+#: ../calendar/gui/caltypes.xml.h:37 ../calendar/gui/memotypes.xml.h:34
+#: ../calendar/gui/tasktypes.xml.h:41
msgid "Summary Contains"
msgstr "Summary Contains"
+#: ../calendar/gui/caltypes.xml.h:38 ../calendar/gui/memotypes.xml.h:35
+#: ../calendar/gui/tasktypes.xml.h:42
+msgid "Suppliers"
+msgstr "Suppliers"
+
+#: ../calendar/gui/caltypes.xml.h:39 ../calendar/gui/memotypes.xml.h:36
+#: ../calendar/gui/tasktypes.xml.h:43
+msgid "Time &amp; Expenses"
+msgstr "Time &amp; Expenses"
+
+#: ../calendar/gui/caltypes.xml.h:40 ../calendar/gui/memotypes.xml.h:37
+#: ../calendar/gui/tasktypes.xml.h:45
+msgid "VIP"
+msgstr "VIP"
+
+#: ../calendar/gui/caltypes.xml.h:41 ../calendar/gui/memotypes.xml.h:38
+#: ../calendar/gui/tasktypes.xml.h:46
+msgid "Waiting"
+msgstr "Waiting"
+
+#: ../calendar/gui/caltypes.xml.h:42 ../calendar/gui/memotypes.xml.h:39
+#: ../calendar/gui/tasktypes.xml.h:47 ../mail/em-filter-i18n.h:10
+msgid "contains"
+msgstr "contains"
+
+#: ../calendar/gui/caltypes.xml.h:43 ../calendar/gui/memotypes.xml.h:40
+#: ../calendar/gui/tasktypes.xml.h:48 ../mail/em-filter-i18n.h:16
+msgid "does not contain"
+msgstr "does not contain"
+
+#: ../calendar/gui/caltypes.xml.h:44 ../calendar/gui/memotypes.xml.h:41
+#: ../calendar/gui/tasktypes.xml.h:49 ../mail/em-filter-i18n.h:30
+msgid "is"
+msgstr "is"
+
+#: ../calendar/gui/caltypes.xml.h:45 ../calendar/gui/memotypes.xml.h:42
+#: ../calendar/gui/tasktypes.xml.h:52 ../mail/em-filter-i18n.h:36
+msgid "is not"
+msgstr "is not"
+
#: ../calendar/gui/comp-editor-factory.c:405
msgid "Error while opening the calendar"
msgstr "Error while opening the calendar"
@@ -5405,11 +5609,11 @@ msgstr "Method not supported when opening the calendar"
msgid "Permission denied to open the calendar"
msgstr "Permission denied to open the calendar"
-#: ../calendar/gui/comp-editor-factory.c:429 ../shell/e-shell.c:1290
+#: ../calendar/gui/comp-editor-factory.c:429 ../shell/e-shell.c:1308
msgid "Unknown error"
msgstr "Unknown error"
-#: ../calendar/gui/dialogs/alarm-dialog.c:616
+#: ../calendar/gui/dialogs/alarm-dialog.c:601
msgid "Edit Alarm"
msgstr "Edit Alarm"
@@ -5442,17 +5646,17 @@ msgid "Mes_sage:"
msgstr "Mes_sage:"
#: ../calendar/gui/dialogs/alarm-dialog.glade.h:8
-#: ../calendar/gui/e-alarm-list.c:446
+#: ../calendar/gui/e-alarm-list.c:442
msgid "Play a sound"
msgstr "Play a sound"
#: ../calendar/gui/dialogs/alarm-dialog.glade.h:9
-#: ../calendar/gui/e-alarm-list.c:450
+#: ../calendar/gui/e-alarm-list.c:446
msgid "Pop up an alert"
msgstr "Pop up an alert"
#: ../calendar/gui/dialogs/alarm-dialog.glade.h:10
-#: ../calendar/gui/e-alarm-list.c:458
+#: ../calendar/gui/e-alarm-list.c:454
msgid "Run a program"
msgstr "Run a program"
@@ -5465,7 +5669,7 @@ msgid "Send To:"
msgstr "Send To:"
#: ../calendar/gui/dialogs/alarm-dialog.glade.h:13
-#: ../calendar/gui/e-alarm-list.c:454
+#: ../calendar/gui/e-alarm-list.c:450
msgid "Send an email"
msgstr "Send an e-mail"
@@ -5520,7 +5724,7 @@ msgstr "minute(s)"
msgid "start of appointment"
msgstr "start of appointment"
-#: ../calendar/gui/dialogs/alarm-list-dialog.c:249
+#: ../calendar/gui/dialogs/alarm-list-dialog.c:244
msgid "Action/Trigger"
msgstr "Action/Trigger"
@@ -5531,16 +5735,15 @@ msgstr "A_dd"
#: ../calendar/gui/dialogs/alarm-list-dialog.glade.h:2
#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
#: ../calendar/gui/dialogs/event-page.glade.h:4
-#: ../ui/evolution-event-editor.xml.h:1
msgid "Alarms"
msgstr "Alarms"
-#: ../calendar/gui/dialogs/cal-attachment-select-file.c:92
-#: ../composer/e-composer-actions.c:63
+#: ../calendar/gui/dialogs/cal-attachment-select-file.c:82
+#: ../composer/e-composer-actions.c:64
msgid "_Suggest automatic display of attachment"
msgstr "_Suggest automatic display of attachment"
-#: ../calendar/gui/dialogs/cal-attachment-select-file.c:158
+#: ../calendar/gui/dialogs/cal-attachment-select-file.c:143
msgid "Attach file(s)"
msgstr "Attach file(s)"
@@ -5609,8 +5812,8 @@ msgid "Display"
msgstr "Display"
#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
-#: ../calendar/gui/dialogs/recurrence-page.c:1098
-#: ../calendar/gui/e-itip-control.c:740
+#: ../calendar/gui/dialogs/recurrence-page.c:1087
+#: ../calendar/gui/e-itip-control.c:738
msgid "Friday"
msgstr "Friday"
@@ -5625,8 +5828,8 @@ msgstr ""
"Days"
#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-#: ../calendar/gui/dialogs/recurrence-page.c:1094
-#: ../calendar/gui/e-itip-control.c:736
+#: ../calendar/gui/dialogs/recurrence-page.c:1083
+#: ../calendar/gui/e-itip-control.c:734
msgid "Monday"
msgstr "Monday"
@@ -5649,7 +5852,7 @@ msgstr ""
"Sunday"
#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-#: ../mail/mail-config.glade.h:112
+#: ../mail/mail-config.glade.h:113
msgid "Pick a color"
msgstr "Pick a colour"
@@ -5659,8 +5862,8 @@ msgid "S_un"
msgstr "S_un"
#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
-#: ../calendar/gui/dialogs/recurrence-page.c:1099
-#: ../calendar/gui/e-itip-control.c:741
+#: ../calendar/gui/dialogs/recurrence-page.c:1088
+#: ../calendar/gui/e-itip-control.c:739
msgid "Saturday"
msgstr "Saturday"
@@ -5677,8 +5880,8 @@ msgid "Show week _numbers in date navigator"
msgstr "Show week _numbers in date navigator"
#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
-#: ../calendar/gui/dialogs/recurrence-page.c:1100
-#: ../calendar/gui/e-itip-control.c:735
+#: ../calendar/gui/dialogs/recurrence-page.c:1089
+#: ../calendar/gui/e-itip-control.c:733
msgid "Sunday"
msgstr "Sunday"
@@ -5696,13 +5899,13 @@ msgid "Template:"
msgstr "Template:"
#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-#: ../calendar/gui/dialogs/recurrence-page.c:1097
-#: ../calendar/gui/e-itip-control.c:739
+#: ../calendar/gui/dialogs/recurrence-page.c:1086
+#: ../calendar/gui/e-itip-control.c:737
msgid "Thursday"
msgstr "Thursday"
#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
-#: ../calendar/gui/dialogs/event-page.glade.h:13
+#: ../calendar/gui/dialogs/event-page.glade.h:12
msgid "Time _zone:"
msgstr "Time _zone:"
@@ -5711,14 +5914,14 @@ msgid "Time format:"
msgstr "Time format:"
#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
-#: ../calendar/gui/dialogs/recurrence-page.c:1095
-#: ../calendar/gui/e-itip-control.c:737
+#: ../calendar/gui/dialogs/recurrence-page.c:1084
+#: ../calendar/gui/e-itip-control.c:735
msgid "Tuesday"
msgstr "Tuesday"
#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
-#: ../calendar/gui/dialogs/recurrence-page.c:1096
-#: ../calendar/gui/e-itip-control.c:738
+#: ../calendar/gui/dialogs/recurrence-page.c:1085
+#: ../calendar/gui/e-itip-control.c:736
msgid "Wednesday"
msgstr "Wednesday"
@@ -5796,310 +5999,453 @@ msgstr "_Wed"
msgid "before every appointment"
msgstr "before every appointment"
-#: ../calendar/gui/dialogs/calendar-setup.c:272
+#: ../calendar/gui/dialogs/calendar-setup.c:269
msgid "Cop_y calendar contents locally for offline operation"
msgstr "Cop_y calendar contents locally for offline operation"
-#: ../calendar/gui/dialogs/calendar-setup.c:274
+#: ../calendar/gui/dialogs/calendar-setup.c:271
msgid "Cop_y task list contents locally for offline operation"
msgstr "Cop_y task list contents locally for offline operation"
-#: ../calendar/gui/dialogs/calendar-setup.c:276
+#: ../calendar/gui/dialogs/calendar-setup.c:273
msgid "Cop_y memo list contents locally for offline operation"
msgstr "Cop_y memo list contents locally for offline operation"
-#: ../calendar/gui/dialogs/calendar-setup.c:346
+#: ../calendar/gui/dialogs/calendar-setup.c:343
msgid "Colo_r:"
msgstr "Colou_r:"
-#: ../calendar/gui/dialogs/calendar-setup.c:381
+#: ../calendar/gui/dialogs/calendar-setup.c:378
msgid "Task List"
msgstr "Task List"
-#: ../calendar/gui/dialogs/calendar-setup.c:392
+#: ../calendar/gui/dialogs/calendar-setup.c:389
msgid "Memo List"
msgstr "Memo List"
-#: ../calendar/gui/dialogs/calendar-setup.c:477
+#: ../calendar/gui/dialogs/calendar-setup.c:474
msgid "Calendar Properties"
msgstr "Calendar Properties"
-#: ../calendar/gui/dialogs/calendar-setup.c:477
+#: ../calendar/gui/dialogs/calendar-setup.c:474
msgid "New Calendar"
msgstr "New Calendar"
-#: ../calendar/gui/dialogs/calendar-setup.c:533
+#: ../calendar/gui/dialogs/calendar-setup.c:530
msgid "Task List Properties"
msgstr "Task List Properties"
-#: ../calendar/gui/dialogs/calendar-setup.c:533
+#: ../calendar/gui/dialogs/calendar-setup.c:530
msgid "New Task List"
msgstr "New Task List"
-#: ../calendar/gui/dialogs/calendar-setup.c:589
+#: ../calendar/gui/dialogs/calendar-setup.c:586
msgid "Memo List Properties"
msgstr "Memo List Properties"
-#: ../calendar/gui/dialogs/calendar-setup.c:589
+#: ../calendar/gui/dialogs/calendar-setup.c:586
msgid "New Memo List"
msgstr "New Memo List"
-#: ../calendar/gui/dialogs/changed-comp.c:60
+#: ../calendar/gui/dialogs/changed-comp.c:56
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:60
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:64
msgid "This memo has been deleted."
msgstr "This memo has been deleted."
-#: ../calendar/gui/dialogs/changed-comp.c:77
+#: ../calendar/gui/dialogs/changed-comp.c:73
#, 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:75
#, 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:80
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:84
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:88
msgid "This memo has been changed."
msgstr "This memo has been changed."
-#: ../calendar/gui/dialogs/changed-comp.c:101
+#: ../calendar/gui/dialogs/changed-comp.c:97
#, 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:99
#, 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:518
+#: ../calendar/gui/dialogs/comp-editor-page.c:448
#, c-format
msgid "Validation error: %s"
msgstr "Validation error: %s"
-#: ../calendar/gui/dialogs/comp-editor-util.c:187 ../calendar/gui/print.c:2340
+#: ../calendar/gui/dialogs/comp-editor-util.c:186 ../calendar/gui/print.c:2356
msgid " to "
msgstr " to "
-#: ../calendar/gui/dialogs/comp-editor-util.c:191 ../calendar/gui/print.c:2344
+#: ../calendar/gui/dialogs/comp-editor-util.c:190 ../calendar/gui/print.c:2360
msgid " (Completed "
msgstr " (Completed "
-#: ../calendar/gui/dialogs/comp-editor-util.c:193 ../calendar/gui/print.c:2346
+#: ../calendar/gui/dialogs/comp-editor-util.c:192 ../calendar/gui/print.c:2362
msgid "Completed "
msgstr "Completed "
-#: ../calendar/gui/dialogs/comp-editor-util.c:198 ../calendar/gui/print.c:2351
+#: ../calendar/gui/dialogs/comp-editor-util.c:197 ../calendar/gui/print.c:2367
msgid " (Due "
msgstr " (Due "
-#: ../calendar/gui/dialogs/comp-editor-util.c:200 ../calendar/gui/print.c:2353
+#: ../calendar/gui/dialogs/comp-editor-util.c:199 ../calendar/gui/print.c:2369
msgid "Due "
msgstr "Due "
-#: ../calendar/gui/dialogs/comp-editor.c:207
+#: ../calendar/gui/dialogs/comp-editor.c:232
#, c-format
msgid "Attached message - %s"
msgstr "Attached message - %s"
#. translators, this count will always be >1
-#: ../calendar/gui/dialogs/comp-editor.c:212
-#: ../calendar/gui/dialogs/comp-editor.c:385 ../composer/e-msg-composer.c:1725
-#: ../composer/e-msg-composer.c:1944
+#: ../calendar/gui/dialogs/comp-editor.c:237
+#: ../calendar/gui/dialogs/comp-editor.c:410 ../composer/e-msg-composer.c:1771
+#: ../composer/e-msg-composer.c:1990
#, 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:456 ../composer/e-msg-composer.c:2012
-#: ../mail/em-folder-tree.c:999 ../mail/em-folder-utils.c:366
-#: ../mail/em-folder-view.c:1193 ../mail/message-list.c:2046
+#: ../calendar/gui/dialogs/comp-editor.c:481 ../composer/e-msg-composer.c:2058
+#: ../mail/em-folder-tree.c:1006 ../mail/em-folder-utils.c:364
+#: ../mail/em-folder-view.c:1186 ../mail/message-list.c:2045
msgid "_Move"
msgstr "_Move"
-#: ../calendar/gui/dialogs/comp-editor.c:458 ../composer/e-msg-composer.c:2014
-#: ../mail/em-folder-tree.c:1001 ../mail/message-list.c:2048
+#: ../calendar/gui/dialogs/comp-editor.c:483 ../composer/e-msg-composer.c:2060
+#: ../mail/em-folder-tree.c:1008 ../mail/message-list.c:2047
msgid "Cancel _Drag"
msgstr "Cancel _Drag"
-#: ../calendar/gui/dialogs/comp-editor.c:661
-#: ../calendar/gui/dialogs/comp-editor.c:2856 ../mail/em-utils.c:371
-#: ../plugins/prefer-plain/prefer-plain.c:79
-#: ../widgets/misc/e-attachment-bar.c:378
+#: ../calendar/gui/dialogs/comp-editor.c:616
+#: ../calendar/gui/dialogs/comp-editor.c:3249 ../mail/em-utils.c:371
+#: ../plugins/prefer-plain/prefer-plain.c:91
+#: ../widgets/misc/e-attachment-bar.c:453
msgid "attachment"
msgstr "attachment"
-#: ../calendar/gui/dialogs/comp-editor.c:823
+#: ../calendar/gui/dialogs/comp-editor.c:842
msgid "Could not update object"
msgstr "Could not update object"
-#: ../calendar/gui/dialogs/comp-editor.c:973
+#: ../calendar/gui/dialogs/comp-editor.c:930
+msgid "Edit Appointment"
+msgstr "Edit Appointment"
+
+#: ../calendar/gui/dialogs/comp-editor.c:937
+#, c-format
+msgid "Meeting - %s"
+msgstr "Meeting - %s"
+
+#: ../calendar/gui/dialogs/comp-editor.c:939
+#, c-format
+msgid "Appointment - %s"
+msgstr "Appointment - %s"
+
+#: ../calendar/gui/dialogs/comp-editor.c:945
+#, c-format
+msgid "Assigned Task - %s"
+msgstr "Assigned Task - %s"
+
+#: ../calendar/gui/dialogs/comp-editor.c:947
+#, c-format
+msgid "Task - %s"
+msgstr "Task - %s"
+
+#: ../calendar/gui/dialogs/comp-editor.c:952
+#, c-format
+msgid "Memo - %s"
+msgstr "Memo - %s"
+
+#: ../calendar/gui/dialogs/comp-editor.c:968
+msgid "No Summary"
+msgstr "No Summary"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1262
+msgid "Click here to close the current window"
+msgstr "Click here to close the current window"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1269
+msgid "Copy selected text to the clipboard"
+msgstr "Copy selected text to the clipboard"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1276
+msgid "Cut selected text to the clipboard"
+msgstr "Cut selected text to the clipboard"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1283
+msgid "Click here to view help available"
+msgstr "Click here to view help available"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1290
+msgid "Paste text from the clipboard"
+msgstr "Paste text from the clipboard"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1311
+msgid "Click here to save the current window"
+msgstr "Click here to save the current window"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1318
+msgid "Select all text"
+msgstr "Select all text"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1325
+msgid "_Classification"
+msgstr "_Classification"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1339
+#: ../mail/mail-signature-editor.c:208
+#: ../ui/evolution-mail-messagedisplay.xml.h:6 ../ui/evolution.xml.h:43
+msgid "_File"
+msgstr "_File"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1346
+#: ../ui/evolution-mail-global.xml.h:24 ../ui/evolution.xml.h:46
+msgid "_Help"
+msgstr "_Help"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1353
+msgid "_Insert"
+msgstr "_Insert"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1360
+msgid "_Options"
+msgstr "_Options"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1367 ../mail/em-folder-tree.c:2098
+#: ../ui/evolution-addressbook.xml.h:64 ../ui/evolution-mail-global.xml.h:34
+#: ../ui/evolution-mail-messagedisplay.xml.h:8 ../ui/evolution-tasks.xml.h:30
+#: ../ui/evolution.xml.h:55
+msgid "_View"
+msgstr "_View"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1377
+#: ../composer/e-composer-actions.c:471
+msgid "_Attachment..."
+msgstr "_Attachment..."
+
+#: ../calendar/gui/dialogs/comp-editor.c:1379
+msgid "Click here to attach a file"
+msgstr "Click here to attach a file"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1387
+msgid "_Categories"
+msgstr "_Categories"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1389
+msgid "Toggles whether to display categories"
+msgstr "Toggles whether to display categories"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1395
+msgid "Time _Zone"
+msgstr "Time _Zone"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1397
+msgid "Toggles whether the time zone is displayed"
+msgstr "Toggles whether the time zone is displayed"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1406
+msgid "Pu_blic"
+msgstr "Pu_blic"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1408
+msgid "Classify as public"
+msgstr "Classify as public"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1413
+msgid "_Private"
+msgstr "_Private"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1415
+msgid "Classify as private"
+msgstr "Classify as private"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1420
+msgid "_Confidential"
+msgstr "_Confidential"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1422
+msgid "Classify as confidential"
+msgstr "Classify as confidential"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1430
+msgid "R_ole Field"
+msgstr "R_ole Field"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1432
+msgid "Toggles whether the Role field is displayed"
+msgstr "Toggles whether the Role field is displayed"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1438
+msgid "_RSVP"
+msgstr "_RSVP"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1440
+msgid "Toggles whether the RSVP field is displayed"
+msgstr "Toggles whether the RSVP field is displayed"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1446
+msgid "_Status Field"
+msgstr "_Status Field"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1448
+msgid "Toggles whether the Status field is displayed"
+msgstr "Toggles whether the Status field is displayed"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1454
+msgid "_Type Field"
+msgstr "_Type Field"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1456
+msgid "Toggles whether the Attendee Type is displayed"
+msgstr "Toggles whether the Attendee Type is displayed"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1766
+#: ../widgets/misc/e-attachment-bar.c:1381
+msgid "Recent Docu_ments"
+msgstr "Recent Docu_ments"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1785
+#: ../composer/e-composer-actions.c:699
+msgid "Attach"
+msgstr "Attach"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1880
#, c-format
msgid "<b>%d</b> Attachment"
msgid_plural "<b>%d</b> Attachments"
msgstr[0] "<b>%d</b> Attachment"
msgstr[1] "<b>%d</b> Attachments"
-#: ../calendar/gui/dialogs/comp-editor.c:1005
+#: ../calendar/gui/dialogs/comp-editor.c:1912
msgid "Hide Attachment _Bar"
msgstr "Hide Attachment _Bar"
-#: ../calendar/gui/dialogs/comp-editor.c:1008
-#: ../calendar/gui/dialogs/comp-editor.c:1591
+#: ../calendar/gui/dialogs/comp-editor.c:1915
+#: ../calendar/gui/dialogs/comp-editor.c:2223
msgid "Show Attachment _Bar"
msgstr "Show Attachment _Bar"
-#: ../calendar/gui/dialogs/comp-editor.c:1127
-#: ../calendar/gui/dialogs/event-page.c:1967
-#: ../calendar/gui/dialogs/task-page.c:1266 ../composer/e-msg-composer.c:1046
+#: ../calendar/gui/dialogs/comp-editor.c:2034
+#: ../calendar/gui/dialogs/event-page.c:1871
+#: ../calendar/gui/dialogs/task-page.c:1193 ../composer/e-msg-composer.c:1045
#: ../plugins/groupwise-features/junk-settings.glade.h:8
#: ../plugins/groupwise-features/properties.glade.h:13
#: ../widgets/table/e-table-config.glade.h:21
msgid "_Remove"
msgstr "_Remove"
-#: ../calendar/gui/dialogs/comp-editor.c:1130
-#: ../composer/e-msg-composer.c:1049
+#: ../calendar/gui/dialogs/comp-editor.c:2037
+#: ../composer/e-msg-composer.c:1048
+#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:4
msgid "_Add attachment..."
msgstr "_Add attachment..."
-#: ../calendar/gui/dialogs/comp-editor.c:1615
-#: ../mail/em-format-html-display.c:2218
+#: ../calendar/gui/dialogs/comp-editor.c:2245
+#: ../mail/em-format-html-display.c:2195
msgid "Show Attachments"
msgstr "Show Attachments"
-#: ../calendar/gui/dialogs/comp-editor.c:1616
+#: ../calendar/gui/dialogs/comp-editor.c:2246
msgid "Press space key to toggle attachment bar"
msgstr "Press space key to toggle attachment bar"
-#: ../calendar/gui/dialogs/comp-editor.c:2227
-#: ../calendar/gui/dialogs/comp-editor.c:2270
-msgid "Edit Appointment"
-msgstr "Edit Appointment"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2233
-#: ../calendar/gui/dialogs/comp-editor.c:2276
-#, c-format
-msgid "Meeting - %s"
-msgstr "Meeting - %s"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2235
-#: ../calendar/gui/dialogs/comp-editor.c:2278
-#, c-format
-msgid "Appointment - %s"
-msgstr "Appointment - %s"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2239
-#: ../calendar/gui/dialogs/comp-editor.c:2282
-#, c-format
-msgid "Assigned Task - %s"
-msgstr "Assigned Task - %s"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2241
-#: ../calendar/gui/dialogs/comp-editor.c:2284
-#, c-format
-msgid "Task - %s"
-msgstr "Task - %s"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2244
-#: ../calendar/gui/dialogs/comp-editor.c:2287
-#, c-format
-msgid "Memo - %s"
-msgstr "Memo - %s"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2255
-#: ../calendar/gui/dialogs/comp-editor.c:2297
-msgid "No summary"
-msgstr "No summary"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2945
-#: ../calendar/gui/dialogs/comp-editor.c:2999
-#: ../calendar/gui/dialogs/comp-editor.c:3023
+#: ../calendar/gui/dialogs/comp-editor.c:2390
+#: ../calendar/gui/dialogs/comp-editor.c:2437
+#: ../calendar/gui/dialogs/comp-editor.c:3282
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:3052
+#: ../calendar/gui/dialogs/comp-editor.c:3311
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:60
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:68
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:77
msgid "Destination is read only"
msgstr "Destination is read only"
-#: ../calendar/gui/dialogs/delete-comp.c:206
+#: ../calendar/gui/dialogs/delete-comp.c:201
msgid "_Delete this item from all other recipient's mailboxes?"
msgstr "_Delete this item from all other recipient's mailboxes?"
-#: ../calendar/gui/dialogs/delete-error.c:54
+#: ../calendar/gui/dialogs/delete-error.c:52
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:55
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:58
msgid "The memo could not be deleted due to a corba error"
msgstr "The memo could not be deleted due to a corba error"
-#: ../calendar/gui/dialogs/delete-error.c:63
+#: ../calendar/gui/dialogs/delete-error.c:61
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:68
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:71
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:74
msgid "The memo could not be deleted because permission was denied"
msgstr "The memo could not be deleted because permission was denied"
-#: ../calendar/gui/dialogs/delete-error.c:79
+#: ../calendar/gui/dialogs/delete-error.c:77
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:84
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:87
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:90
msgid "The memo could not be deleted due to an error"
msgstr "The memo could not be deleted due to an error"
-#: ../calendar/gui/dialogs/delete-error.c:95
+#: ../calendar/gui/dialogs/delete-error.c:93
msgid "The item could not be deleted due to an error"
msgstr "The item could not be deleted due to an error"
@@ -6108,7 +6454,7 @@ msgid "Contacts..."
msgstr "Contacts..."
#: ../calendar/gui/dialogs/e-delegate-dialog.glade.h:2
-#: ../plugins/exchange-operations/exchange-delegates.c:421
+#: ../plugins/exchange-operations/exchange-delegates.c:417
msgid "Delegate To:"
msgstr "Delegate To:"
@@ -6116,135 +6462,181 @@ msgstr "Delegate To:"
msgid "Enter Delegate"
msgstr "Enter Delegate"
-#: ../calendar/gui/dialogs/event-editor.c:602
+#: ../calendar/gui/dialogs/event-editor.c:196
+msgid "_Alarms"
+msgstr "_Alarms"
+
+#: ../calendar/gui/dialogs/event-editor.c:198
+msgid "Click here to set or unset alarms for this event"
+msgstr "Click here to set or unset alarms for this event"
+
+#: ../calendar/gui/dialogs/event-editor.c:203
+msgid "_Recurrence"
+msgstr "_Recurrence"
+
+#: ../calendar/gui/dialogs/event-editor.c:205
+msgid "Make this a recurring event"
+msgstr "Make this a recurring event"
+
+#: ../calendar/gui/dialogs/event-editor.c:210
+#: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:2
+#: ../widgets/misc/e-send-options.glade.h:19
+msgid "Send Options"
+msgstr "Send Options"
+
+#: ../calendar/gui/dialogs/event-editor.c:212
+#: ../calendar/gui/dialogs/task-editor.c:125
+msgid "Insert advanced send options"
+msgstr "Insert advanced send options"
+
+#: ../calendar/gui/dialogs/event-editor.c:220
+msgid "All _Day Event"
+msgstr "All _Day Event"
+
+#: ../calendar/gui/dialogs/event-editor.c:222
+msgid "Toggles whether to have All Day Event"
+msgstr "Toggles whether to have All Day Event"
+
+#: ../calendar/gui/dialogs/event-editor.c:228
+msgid "Show Time as _Busy"
+msgstr "Show Time as _Busy"
+
+#: ../calendar/gui/dialogs/event-editor.c:230
+msgid "Toggles whether to show time as busy"
+msgstr "Toggles whether to show time as busy"
+
+#: ../calendar/gui/dialogs/event-editor.c:239
+msgid "_Free/Busy"
+msgstr "_Free/Busy"
+
+#: ../calendar/gui/dialogs/event-editor.c:241
+msgid "Query free / busy information for the attendees"
+msgstr "Query free / busy information for the attendees"
+
+#: ../calendar/gui/dialogs/event-editor.c:296
msgid "Appoint_ment"
msgstr "Appoint_ment"
-#: ../calendar/gui/dialogs/event-editor.c:606
-#: ../ui/evolution-event-editor.xml.h:14
-msgid "Recurrence"
-msgstr "Recurrence"
-
-#: ../calendar/gui/dialogs/event-page.c:826
-#: ../calendar/gui/dialogs/event-page.c:2835
+#: ../calendar/gui/dialogs/event-page.c:731
+#: ../calendar/gui/dialogs/event-page.c:2714
msgid "This event has alarms"
msgstr "This event has alarms"
-#: ../calendar/gui/dialogs/event-page.c:906
-#: ../calendar/gui/dialogs/event-page.glade.h:11
+#: ../calendar/gui/dialogs/event-page.c:794
+#: ../calendar/gui/dialogs/event-page.glade.h:10
#: ../calendar/gui/dialogs/meeting-page.glade.h:5
#: ../calendar/gui/dialogs/memo-page.glade.h:2
msgid "Or_ganizer:"
msgstr "Or_ganiser:"
-#: ../calendar/gui/dialogs/event-page.c:944
+#: ../calendar/gui/dialogs/event-page.c:840
msgid "_Delegatees"
msgstr "_Delegatees"
-#: ../calendar/gui/dialogs/event-page.c:946
+#: ../calendar/gui/dialogs/event-page.c:842
msgid "Atte_ndees"
msgstr "Atte_ndees"
-#: ../calendar/gui/dialogs/event-page.c:1128
+#: ../calendar/gui/dialogs/event-page.c:1026
msgid "Event with no start date"
msgstr "Event with no start date"
-#: ../calendar/gui/dialogs/event-page.c:1131
+#: ../calendar/gui/dialogs/event-page.c:1029
msgid "Event with no end date"
msgstr "Event with no end date"
-#: ../calendar/gui/dialogs/event-page.c:1303
-#: ../calendar/gui/dialogs/memo-page.c:734
-#: ../calendar/gui/dialogs/task-page.c:893
+#: ../calendar/gui/dialogs/event-page.c:1198
+#: ../calendar/gui/dialogs/memo-page.c:636
+#: ../calendar/gui/dialogs/task-page.c:808
msgid "Start date is wrong"
msgstr "Start date is wrong"
-#: ../calendar/gui/dialogs/event-page.c:1313
+#: ../calendar/gui/dialogs/event-page.c:1208
msgid "End date is wrong"
msgstr "End date is wrong"
-#: ../calendar/gui/dialogs/event-page.c:1336
+#: ../calendar/gui/dialogs/event-page.c:1231
msgid "Start time is wrong"
msgstr "Start time is wrong"
-#: ../calendar/gui/dialogs/event-page.c:1343
+#: ../calendar/gui/dialogs/event-page.c:1238
msgid "End time is wrong"
msgstr "End time is wrong"
-#: ../calendar/gui/dialogs/event-page.c:1505
-#: ../calendar/gui/dialogs/memo-page.c:774
-#: ../calendar/gui/dialogs/task-page.c:952
+#: ../calendar/gui/dialogs/event-page.c:1401
+#: ../calendar/gui/dialogs/memo-page.c:677
+#: ../calendar/gui/dialogs/task-page.c:868
msgid "The organizer selected no longer has an account."
msgstr "The organiser selected no longer has an account."
-#: ../calendar/gui/dialogs/event-page.c:1511
-#: ../calendar/gui/dialogs/memo-page.c:780
-#: ../calendar/gui/dialogs/task-page.c:958
+#: ../calendar/gui/dialogs/event-page.c:1407
+#: ../calendar/gui/dialogs/memo-page.c:683
+#: ../calendar/gui/dialogs/task-page.c:874
msgid "An organizer is required."
msgstr "An organiser is required."
-#: ../calendar/gui/dialogs/event-page.c:1536
-#: ../calendar/gui/dialogs/task-page.c:982
+#: ../calendar/gui/dialogs/event-page.c:1432
+#: ../calendar/gui/dialogs/task-page.c:898
msgid "At least one attendee is required."
msgstr "At least one attendee is required."
-#: ../calendar/gui/dialogs/event-page.c:1968
-#: ../calendar/gui/dialogs/task-page.c:1267
+#: ../calendar/gui/dialogs/event-page.c:1872
+#: ../calendar/gui/dialogs/task-page.c:1194
msgid "_Add "
msgstr "_Add "
-#: ../calendar/gui/dialogs/event-page.c:2711
+#: ../calendar/gui/dialogs/event-page.c:2590
#, c-format
msgid "Unable to open the calendar '%s'."
msgstr "Unable to open the calendar '%s'."
-#: ../calendar/gui/dialogs/event-page.c:2755
-#: ../calendar/gui/dialogs/memo-page.c:990
-#: ../calendar/gui/dialogs/task-page.c:1928
+#: ../calendar/gui/dialogs/event-page.c:2634
+#: ../calendar/gui/dialogs/memo-page.c:886
+#: ../calendar/gui/dialogs/task-page.c:1793
#, c-format
msgid "You are acting on behalf of %s"
msgstr "You are acting on behalf of %s"
-#: ../calendar/gui/dialogs/event-page.c:3053
+#: ../calendar/gui/dialogs/event-page.c:2914
#, 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:3059
+#: ../calendar/gui/dialogs/event-page.c:2920
#, 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:3065
+#: ../calendar/gui/dialogs/event-page.c:2926
#, c-format
msgid "%d minute before appointment"
msgid_plural "%d minutes before appointment"
msgstr[0] "%d minute before appointment"
msgstr[1] "%d minutes before appointment"
-#: ../calendar/gui/dialogs/event-page.c:3078
+#: ../calendar/gui/dialogs/event-page.c:2939
msgid "Customize"
msgstr "Customise"
#. an empty string is the same as 'None'
-#: ../calendar/gui/dialogs/event-page.c:3083
+#: ../calendar/gui/dialogs/event-page.c:2944
#: ../calendar/gui/dialogs/meeting-page.glade.h:4
#: ../calendar/gui/e-cal-model-tasks.c:669
-#: ../calendar/gui/e-itip-control.c:1141 ../filter/filter-rule.c:892
-#: ../mail/em-account-editor.c:701 ../mail/em-account-editor.c:1424
-#: ../mail/em-account-prefs.c:445 ../mail/em-junk-hook.c:94
+#: ../calendar/gui/e-itip-control.c:1158 ../filter/filter-rule.c:944
+#: ../mail/em-account-editor.c:685 ../mail/em-account-editor.c:1409
+#: ../mail/em-account-prefs.c:438 ../mail/em-junk-hook.c:93
#: ../plugins/calendar-weather/calendar-weather.c:370
#: ../plugins/calendar-weather/calendar-weather.c:424
-#: ../plugins/exchange-operations/exchange-delegates-user.c:205
+#: ../plugins/exchange-operations/exchange-delegates-user.c:193
#: ../plugins/exchange-operations/exchange-delegates.glade.h:9
-#: ../plugins/itip-formatter/itip-formatter.c:2016
-#: ../widgets/misc/e-cell-date-edit.c:308 ../widgets/misc/e-dateedit.c:1533
-#: ../widgets/misc/e-dateedit.c:1747
-#: ../widgets/misc/e-signature-combo-box.c:69
+#: ../plugins/itip-formatter/itip-formatter.c:2021
+#: ../widgets/misc/e-cell-date-edit.c:306 ../widgets/misc/e-dateedit.c:1517
+#: ../widgets/misc/e-dateedit.c:1731
+#: ../widgets/misc/e-signature-combo-box.c:70
msgid "None"
msgstr "None"
@@ -6269,23 +6661,25 @@ msgid "Custom Alarm:"
msgstr "Custom Alarm:"
#: ../calendar/gui/dialogs/event-page.glade.h:9
-msgid "D_escription:"
-msgstr "D_escription:"
-
-#: ../calendar/gui/dialogs/event-page.glade.h:10
msgid "Event Description"
msgstr "Event Description"
-#: ../calendar/gui/dialogs/event-page.glade.h:12
+#: ../calendar/gui/dialogs/event-page.glade.h:11
#: ../calendar/gui/dialogs/memo-page.glade.h:4
#: ../calendar/gui/dialogs/task-page.glade.h:6
msgid "Su_mmary:"
msgstr "Su_mmary:"
-#: ../calendar/gui/dialogs/event-page.glade.h:14
+#: ../calendar/gui/dialogs/event-page.glade.h:13
msgid "_Alarm"
msgstr "_Alarm"
+#: ../calendar/gui/dialogs/event-page.glade.h:15
+#: ../calendar/gui/dialogs/memo-page.glade.h:6
+#: ../calendar/gui/dialogs/task-page.glade.h:8
+msgid "_Description:"
+msgstr "_Description:"
+
#: ../calendar/gui/dialogs/event-page.glade.h:17
msgid "_Time:"
msgstr "_Time:"
@@ -6316,28 +6710,24 @@ msgstr "C_hange Organiser"
msgid "Co_ntacts..."
msgstr "Co_ntacts..."
-#: ../calendar/gui/dialogs/meeting-page.glade.h:6
-msgid "Organizer"
-msgstr "Organiser"
-
#: ../calendar/gui/dialogs/meeting-page.glade.h:7
#: ../calendar/gui/e-itip-control.glade.h:7
msgid "Organizer:"
msgstr "Organiser:"
-#: ../calendar/gui/dialogs/memo-editor.c:219 ../calendar/gui/print.c:2448
+#: ../calendar/gui/dialogs/memo-editor.c:141 ../calendar/gui/print.c:2476
msgid "Memo"
msgstr "Memo"
-#: ../calendar/gui/dialogs/memo-page.c:952
+#: ../calendar/gui/dialogs/memo-page.c:847
#, c-format
msgid "Unable to open memos in '%s'."
msgstr "Unable to open memos in '%s'."
-#: ../calendar/gui/dialogs/memo-page.c:1136 ../mail/em-format-html.c:1558
-#: ../mail/em-format-html.c:1616 ../mail/em-format-html.c:1642
-#: ../mail/em-format-quote.c:209 ../mail/em-format.c:886
-#: ../mail/em-mailer-prefs.c:92 ../mail/message-list.etspec.h:19
+#: ../calendar/gui/dialogs/memo-page.c:1002 ../mail/em-format-html.c:1562
+#: ../mail/em-format-html.c:1620 ../mail/em-format-html.c:1646
+#: ../mail/em-format-quote.c:210 ../mail/em-format.c:886
+#: ../mail/em-mailer-prefs.c:77 ../mail/message-list.etspec.h:19
msgid "To"
msgstr "To"
@@ -6350,63 +6740,59 @@ msgstr "Sta_rt date:"
msgid "T_o:"
msgstr "T_o:"
-#: ../calendar/gui/dialogs/memo-page.glade.h:6
-msgid "_Description:"
-msgstr "_Description:"
-
#: ../calendar/gui/dialogs/memo-page.glade.h:7
-#: ../calendar/gui/dialogs/task-page.c:451
+#: ../calendar/gui/dialogs/task-page.c:360
#: ../calendar/gui/dialogs/task-page.glade.h:9
msgid "_Group:"
msgstr "_Group:"
-#: ../calendar/gui/dialogs/recur-comp.c:52
+#: ../calendar/gui/dialogs/recur-comp.c:50
#, c-format
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:54
+#: ../calendar/gui/dialogs/recur-comp.c:52
#, c-format
msgid "You are delegating a recurring event. What would you like to delegate?"
msgstr "You are delegating a recurring event. What would you like to delegate?"
-#: ../calendar/gui/dialogs/recur-comp.c:58
+#: ../calendar/gui/dialogs/recur-comp.c:56
#, c-format
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:62
+#: ../calendar/gui/dialogs/recur-comp.c:60
#, c-format
msgid "You are modifying a recurring memo. What would you like to modify?"
msgstr "You are modifying a recurring memo. What would you like to modify?"
-#: ../calendar/gui/dialogs/recur-comp.c:87
+#: ../calendar/gui/dialogs/recur-comp.c:85
msgid "This Instance Only"
msgstr "This Instance Only"
-#: ../calendar/gui/dialogs/recur-comp.c:91
+#: ../calendar/gui/dialogs/recur-comp.c:89
msgid "This and Prior Instances"
msgstr "This and Prior Instances"
-#: ../calendar/gui/dialogs/recur-comp.c:97
+#: ../calendar/gui/dialogs/recur-comp.c:95
msgid "This and Future Instances"
msgstr "This and Future Instances"
-#: ../calendar/gui/dialogs/recur-comp.c:102
+#: ../calendar/gui/dialogs/recur-comp.c:100
msgid "All Instances"
msgstr "All Instances"
-#: ../calendar/gui/dialogs/recurrence-page.c:505
+#: ../calendar/gui/dialogs/recurrence-page.c:560
msgid "This appointment contains recurrences that Evolution cannot edit."
msgstr "This appointment contains recurrences that Evolution cannot edit."
-#: ../calendar/gui/dialogs/recurrence-page.c:826
+#: ../calendar/gui/dialogs/recurrence-page.c:890
msgid "Recurrence date is invalid"
msgstr "Recurrence date is invalid"
#. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] week(s) on [Wednesday] [forever]'
#. * (dropdown menu options are in [square brackets]). This means that after the 'on', name of a week day always follows.
-#: ../calendar/gui/dialogs/recurrence-page.c:939
+#: ../calendar/gui/dialogs/recurrence-page.c:928
msgid "on"
msgstr "on"
@@ -6414,7 +6800,7 @@ msgstr "on"
#. * (dropdown menu options are in [square brackets]). This means that after 'first', either the string 'day' or
#. * the name of a week day (like 'Monday' or 'Friday') always follow.
#.
-#: ../calendar/gui/dialogs/recurrence-page.c:1003
+#: ../calendar/gui/dialogs/recurrence-page.c:992
msgid "first"
msgstr "first"
@@ -6423,7 +6809,7 @@ msgstr "first"
#. * (dropdown menu options are in [square brackets]). This means that after 'second', either the string 'day' or
#. * the name of a week day (like 'Monday' or 'Friday') always follow.
#.
-#: ../calendar/gui/dialogs/recurrence-page.c:1009
+#: ../calendar/gui/dialogs/recurrence-page.c:998
msgid "second"
msgstr "second"
@@ -6431,7 +6817,7 @@ msgstr "second"
#. * (dropdown menu options are in [square brackets]). This means that after 'third', either the string 'day' or
#. * the name of a week day (like 'Monday' or 'Friday') always follow.
#.
-#: ../calendar/gui/dialogs/recurrence-page.c:1014
+#: ../calendar/gui/dialogs/recurrence-page.c:1003
msgid "third"
msgstr "third"
@@ -6439,7 +6825,7 @@ msgstr "third"
#. * (dropdown menu options are in [square brackets]). This means that after 'fourth', either the string 'day' or
#. * the name of a week day (like 'Monday' or 'Friday') always follow.
#.
-#: ../calendar/gui/dialogs/recurrence-page.c:1019
+#: ../calendar/gui/dialogs/recurrence-page.c:1008
msgid "fourth"
msgstr "fourth"
@@ -6447,13 +6833,13 @@ msgstr "fourth"
#. * (dropdown menu options are in [square brackets]). This means that after 'last', either the string 'day' or
#. * the name of a week day (like 'Monday' or 'Friday') always follow.
#.
-#: ../calendar/gui/dialogs/recurrence-page.c:1024
+#: ../calendar/gui/dialogs/recurrence-page.c:1013
msgid "last"
msgstr "last"
#. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [Other date] [11th to 20th] [17th] [forever]'
#. * (dropdown menu options are in [square brackets]).
-#: ../calendar/gui/dialogs/recurrence-page.c:1050
+#: ../calendar/gui/dialogs/recurrence-page.c:1039
msgid "Other Date"
msgstr "Other Date"
@@ -6461,7 +6847,7 @@ msgstr "Other Date"
#. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
#. * on the [Other date] [1st to 10th] [7th] [forever]' (dropdown menu options are in [square brackets]).
#.
-#: ../calendar/gui/dialogs/recurrence-page.c:1058
+#: ../calendar/gui/dialogs/recurrence-page.c:1047
msgid "1st to 10th"
msgstr "1st to 10th"
@@ -6469,7 +6855,7 @@ msgstr "1st to 10th"
#. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
#. * on the [Other date] [11th to 20th] [17th] [forever]' (dropdown menu options are in [square brackets]).
#.
-#: ../calendar/gui/dialogs/recurrence-page.c:1064
+#: ../calendar/gui/dialogs/recurrence-page.c:1053
msgid "11th to 20th"
msgstr "11th to 20th"
@@ -6477,45 +6863,45 @@ msgstr "11th to 20th"
#. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
#. * on the [Other date] [21th to 31th] [27th] [forever]' (dropdown menu options are in [square brackets]).
#.
-#: ../calendar/gui/dialogs/recurrence-page.c:1070
+#: ../calendar/gui/dialogs/recurrence-page.c:1059
msgid "21st to 31st"
msgstr "21st to 31st"
#. For Translator : 'day' is part of the sentence of the form 'appointment recurs/Every [x] month(s) on the [first] [day] [forever]'
#. (dropdown menu options are in [square brackets]). This means that after 'first', either the string 'day' or
#. the name of a week day (like 'Monday' or 'Friday') always follow.
-#: ../calendar/gui/dialogs/recurrence-page.c:1093
+#: ../calendar/gui/dialogs/recurrence-page.c:1082
msgid "day"
msgstr "day"
#. TRANSLATORS: Entire string is for example: 'This appointment recurs/Every [x] month(s) on the [second] [Tuesday] [forever]'
#. * (dropdown menu options are in [square brackets])."
#.
-#: ../calendar/gui/dialogs/recurrence-page.c:1233
+#: ../calendar/gui/dialogs/recurrence-page.c:1208
msgid "on the"
msgstr "on the"
-#: ../calendar/gui/dialogs/recurrence-page.c:1426
+#: ../calendar/gui/dialogs/recurrence-page.c:1384
msgid "occurrences"
msgstr "occurrences"
-#: ../calendar/gui/dialogs/recurrence-page.c:2167
+#: ../calendar/gui/dialogs/recurrence-page.c:2087
msgid "Add exception"
msgstr "Add exception"
-#: ../calendar/gui/dialogs/recurrence-page.c:2210
+#: ../calendar/gui/dialogs/recurrence-page.c:2128
msgid "Could not get a selection to modify."
msgstr "Could not get a selection to modify."
-#: ../calendar/gui/dialogs/recurrence-page.c:2216
+#: ../calendar/gui/dialogs/recurrence-page.c:2134
msgid "Modify exception"
msgstr "Modify exception"
-#: ../calendar/gui/dialogs/recurrence-page.c:2262
+#: ../calendar/gui/dialogs/recurrence-page.c:2178
msgid "Could not get a selection to delete."
msgstr "Could not get a selection to delete."
-#: ../calendar/gui/dialogs/recurrence-page.c:2393
+#: ../calendar/gui/dialogs/recurrence-page.c:2302
msgid "Date/Time"
msgstr "Date/Time"
@@ -6566,12 +6952,12 @@ msgstr "week(s)"
msgid "year(s)"
msgstr "year(s)"
-#: ../calendar/gui/dialogs/task-details-page.c:410
-#: ../calendar/gui/dialogs/task-details-page.c:430
+#: ../calendar/gui/dialogs/task-details-page.c:377
+#: ../calendar/gui/dialogs/task-details-page.c:397
msgid "Completed date is wrong"
msgstr "Completed date is wrong"
-#: ../calendar/gui/dialogs/task-details-page.c:515
+#: ../calendar/gui/dialogs/task-details-page.c:482
msgid "Web Page"
msgstr "Web Page"
@@ -6586,51 +6972,55 @@ 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:252
+#: ../calendar/gui/e-cal-component-preview.c:253
#: ../calendar/gui/e-cal-model-tasks.c:358
#: ../calendar/gui/e-cal-model-tasks.c:675
-#: ../calendar/gui/e-calendar-table.c:234
-#: ../calendar/gui/e-calendar-table.c:435 ../calendar/gui/e-itip-control.c:933
-#: ../calendar/gui/e-meeting-store.c:182 ../calendar/gui/e-meeting-store.c:205
-#: ../calendar/gui/print.c:2520 ../plugins/save-calendar/csv-format.c:369
+#: ../calendar/gui/e-calendar-table.c:238
+#: ../calendar/gui/e-calendar-table.c:642 ../calendar/gui/e-itip-control.c:946
+#: ../calendar/gui/e-meeting-store.c:181 ../calendar/gui/e-meeting-store.c:204
+#: ../calendar/gui/print.c:2552 ../calendar/gui/tasktypes.xml.h:13
+#: ../plugins/save-calendar/csv-format.c:365
msgid "Completed"
msgstr "Completed"
#: ../calendar/gui/dialogs/task-details-page.glade.h:5
-#: ../calendar/gui/e-cal-component-preview.c:271
-#: ../calendar/gui/e-calendar-table.c:360 ../mail/message-list.c:1065
+#: ../calendar/gui/e-cal-component-preview.c:272
+#: ../calendar/gui/e-calendar-table.c:567 ../calendar/gui/tasktypes.xml.h:21
+#: ../mail/message-list.c:1065
msgid "High"
msgstr "High"
#: ../calendar/gui/dialogs/task-details-page.glade.h:6
-#: ../calendar/gui/e-cal-component-preview.c:249
+#: ../calendar/gui/e-cal-component-preview.c:250
#: ../calendar/gui/e-cal-model-tasks.c:356
#: ../calendar/gui/e-cal-model-tasks.c:673
#: ../calendar/gui/e-cal-model-tasks.c:750
-#: ../calendar/gui/e-calendar-table.c:232
-#: ../calendar/gui/e-calendar-table.c:434 ../calendar/gui/print.c:2517
+#: ../calendar/gui/e-calendar-table.c:236
+#: ../calendar/gui/e-calendar-table.c:641 ../calendar/gui/print.c:2549
msgid "In Progress"
msgstr "In Progress"
#: ../calendar/gui/dialogs/task-details-page.glade.h:7
-#: ../calendar/gui/e-cal-component-preview.c:275
-#: ../calendar/gui/e-calendar-table.c:362 ../mail/message-list.c:1063
+#: ../calendar/gui/e-cal-component-preview.c:276
+#: ../calendar/gui/e-calendar-table.c:569 ../calendar/gui/tasktypes.xml.h:29
+#: ../mail/message-list.c:1063
msgid "Low"
msgstr "Low"
#: ../calendar/gui/dialogs/task-details-page.glade.h:8
-#: ../calendar/gui/e-cal-component-preview.c:273
-#: ../calendar/gui/e-cal-model.c:966 ../calendar/gui/e-calendar-table.c:361
-#: ../mail/message-list.c:1064
+#: ../calendar/gui/e-cal-component-preview.c:274
+#: ../calendar/gui/e-cal-model.c:974 ../calendar/gui/e-calendar-table.c:568
+#: ../calendar/gui/tasktypes.xml.h:32 ../mail/message-list.c:1064
msgid "Normal"
msgstr "Normal"
#: ../calendar/gui/dialogs/task-details-page.glade.h:9
-#: ../calendar/gui/e-cal-component-preview.c:259
+#: ../calendar/gui/e-cal-component-preview.c:260
#: ../calendar/gui/e-cal-model-tasks.c:354
#: ../calendar/gui/e-cal-model-tasks.c:671
-#: ../calendar/gui/e-calendar-table.c:230
-#: ../calendar/gui/e-calendar-table.c:433 ../calendar/gui/print.c:2514
+#: ../calendar/gui/e-calendar-table.c:234
+#: ../calendar/gui/e-calendar-table.c:640 ../calendar/gui/print.c:2546
+#: ../calendar/gui/tasktypes.xml.h:33
msgid "Not Started"
msgstr "Not Started"
@@ -6643,7 +7033,7 @@ msgid "Stat_us:"
msgstr "Stat_us:"
#: ../calendar/gui/dialogs/task-details-page.glade.h:12
-#: ../calendar/gui/e-calendar-table.c:363
+#: ../calendar/gui/e-calendar-table.c:570 ../calendar/gui/tasktypes.xml.h:44
msgid "Undefined"
msgstr "Undefined"
@@ -6660,25 +7050,37 @@ msgstr "_Priority:"
msgid "_Web Page:"
msgstr "_Web Page:"
-#: ../calendar/gui/dialogs/task-editor.c:426
-#: ../calendar/gui/tasks-component.c:1327
+#: ../calendar/gui/dialogs/task-editor.c:113
+msgid "_Status Details"
+msgstr "_Status Details"
+
+#: ../calendar/gui/dialogs/task-editor.c:115
+msgid "Click to change or view the status details of the task"
+msgstr "Click to change or view the status details of the task"
+
+#: ../calendar/gui/dialogs/task-editor.c:123
+#: ../composer/e-composer-actions.c:527
+msgid "_Send Options"
+msgstr "_Send Options"
+
+#: ../calendar/gui/dialogs/task-editor.c:318
msgid "_Task"
msgstr "_Task"
-#: ../calendar/gui/dialogs/task-editor.c:430
+#: ../calendar/gui/dialogs/task-editor.c:321
msgid "Task Details"
msgstr "Task Details"
-#: ../calendar/gui/dialogs/task-page.c:459
+#: ../calendar/gui/dialogs/task-page.c:368
#: ../calendar/gui/dialogs/task-page.glade.h:4
msgid "Organi_zer:"
msgstr "Organi_ser:"
-#: ../calendar/gui/dialogs/task-page.c:866
+#: ../calendar/gui/dialogs/task-page.c:781
msgid "Due date is wrong"
msgstr "Due date is wrong"
-#: ../calendar/gui/dialogs/task-page.c:1885
+#: ../calendar/gui/dialogs/task-page.c:1750
#, c-format
msgid "Unable to open tasks in '%s'."
msgstr "Unable to open tasks in '%s'."
@@ -6692,19 +7094,15 @@ msgid "Categor_ies..."
msgstr "Categor_ies..."
#: ../calendar/gui/dialogs/task-page.glade.h:3
-msgid "De_scription:"
-msgstr "De_scription:"
+msgid "D_ue date:"
+msgstr "D_ue date:"
#: ../calendar/gui/dialogs/task-page.glade.h:7
msgid "Time zone:"
msgstr "Time zone:"
-#: ../calendar/gui/dialogs/task-page.glade.h:8
-msgid "_Due date:"
-msgstr "_Due date:"
-
#. Translator: Entire string is like "Pop up an alert %d days before start of appointment"
-#: ../calendar/gui/e-alarm-list.c:396
+#: ../calendar/gui/e-alarm-list.c:392
#, c-format
msgid "%d day"
msgid_plural "%d days"
@@ -6712,142 +7110,126 @@ msgstr[0] "%d day"
msgstr[1] "%d days"
#. Translator: Entire string is like "Pop up an alert %d weeks before start of appointment"
-#: ../calendar/gui/e-alarm-list.c:402
+#: ../calendar/gui/e-alarm-list.c:398
#, c-format
msgid "%d week"
msgid_plural "%d weeks"
msgstr[0] "%d week"
msgstr[1] "%d weeks"
-#: ../calendar/gui/e-alarm-list.c:464
+#: ../calendar/gui/e-alarm-list.c:460
msgid "Unknown action to be performed"
msgstr "Unknown action to be performed"
#. Translator: The first %s refers to the base, which would be actions like
#. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
-#: ../calendar/gui/e-alarm-list.c:478
+#: ../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"
#. Translator: The first %s refers to the base, which would be actions like
#. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
-#: ../calendar/gui/e-alarm-list.c:483
+#: ../calendar/gui/e-alarm-list.c:479
#, c-format
msgid "%s %s after the start of the appointment"
msgstr "%s %s after the start of the appointment"
#. Translator: The %s refers to the base, which would be actions like
#. * "Play a sound"
-#: ../calendar/gui/e-alarm-list.c:490
+#: ../calendar/gui/e-alarm-list.c:486
#, c-format
msgid "%s at the start of the appointment"
msgstr "%s at the start of the appointment"
#. Translator: The first %s refers to the base, which would be actions like
#. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
-#: ../calendar/gui/e-alarm-list.c:501
+#: ../calendar/gui/e-alarm-list.c:497
#, c-format
msgid "%s %s before the end of the appointment"
msgstr "%s %s before the end of the appointment"
#. Translator: The first %s refers to the base, which would be actions like
#. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
-#: ../calendar/gui/e-alarm-list.c:506
+#: ../calendar/gui/e-alarm-list.c:502
#, c-format
msgid "%s %s after the end of the appointment"
msgstr "%s %s after the end of the appointment"
#. Translator: The %s refers to the base, which would be actions like
#. * "Play a sound"
-#: ../calendar/gui/e-alarm-list.c:513
+#: ../calendar/gui/e-alarm-list.c:509
#, c-format
msgid "%s at the end of the appointment"
msgstr "%s at the end of the appointment"
#. Translator: The first %s refers to the base, which would be actions like
#. * "Play a Sound". Second %s is an absolute time, e.g. "10:00AM"
-#: ../calendar/gui/e-alarm-list.c:537
+#: ../calendar/gui/e-alarm-list.c:533
#, c-format
msgid "%s at %s"
msgstr "%s at %s"
#. Translator: The %s refers to the base, which would be actions like
#. * "Play a sound". "Trigger types" are absolute or relative dates
-#: ../calendar/gui/e-alarm-list.c:545
+#: ../calendar/gui/e-alarm-list.c:541
#, c-format
msgid "%s for an unknown trigger type"
msgstr "%s for an unknown trigger type"
-#: ../calendar/gui/e-cal-component-memo-preview.c:74
-#: ../calendar/gui/e-cal-component-preview.c:72 ../mail/em-folder-view.c:3329
+#: ../calendar/gui/e-cal-component-memo-preview.c:75
+#: ../calendar/gui/e-cal-component-preview.c:73 ../mail/em-folder-view.c:3315
#, c-format
msgid "Click to open %s"
msgstr "Click to open %s"
-#: ../calendar/gui/e-cal-component-memo-preview.c:134
-#: ../calendar/gui/e-cal-component-preview.c:176 ../filter/filter-rule.c:805
-#: ../shell/e-shell-folder-title-bar.c:593
+#: ../calendar/gui/e-cal-component-memo-preview.c:135
+#: ../calendar/gui/e-cal-component-preview.c:177 ../filter/filter-rule.c:857
msgid "Untitled"
msgstr "Untitled"
-#: ../calendar/gui/e-cal-component-memo-preview.c:186
-#: ../calendar/gui/e-cal-component-preview.c:216
-#: ../calendar/gui/e-cal-component-preview.c:227
+#: ../calendar/gui/e-cal-component-memo-preview.c:187
+#: ../calendar/gui/e-cal-component-preview.c:217
+#: ../calendar/gui/e-cal-component-preview.c:228
msgid "Start Date:"
msgstr "Start Date:"
-#: ../calendar/gui/e-cal-component-memo-preview.c:199
-#: ../calendar/gui/e-cal-component-preview.c:290
-#: ../calendar/gui/e-itip-control.c:1201
+#: ../calendar/gui/e-cal-component-memo-preview.c:200
+#: ../calendar/gui/e-cal-component-preview.c:291
+#: ../calendar/gui/e-itip-control.c:1218
#: ../calendar/gui/e-itip-control.glade.h:4 ../mail/mail-config.glade.h:69
#: ../widgets/misc/e-attachment.glade.h:2
msgid "Description:"
msgstr "Description:"
-#: ../calendar/gui/e-cal-component-memo-preview.c:235
-#: ../calendar/gui/e-cal-component-preview.c:323
+#: ../calendar/gui/e-cal-component-memo-preview.c:224
+#: ../calendar/gui/e-cal-component-preview.c:315
msgid "Web Page:"
msgstr "Web Page:"
-#: ../calendar/gui/e-cal-component-preview.c:209
-#: ../calendar/gui/e-itip-control.c:1145
+#: ../calendar/gui/e-cal-component-preview.c:210
+#: ../calendar/gui/e-itip-control.c:1162
#: ../calendar/gui/e-itip-control.glade.h:9
msgid "Summary:"
msgstr "Summary:"
-#: ../calendar/gui/e-cal-component-preview.c:238
+#: ../calendar/gui/e-cal-component-preview.c:239
msgid "Due Date:"
msgstr "Due Date:"
#. write status
#. Status
-#: ../calendar/gui/e-cal-component-preview.c:245
-#: ../calendar/gui/e-itip-control.c:1169
-#: ../plugins/exchange-operations/exchange-account-setup.c:268
+#: ../calendar/gui/e-cal-component-preview.c:246
+#: ../calendar/gui/e-itip-control.c:1186
+#: ../plugins/exchange-operations/exchange-account-setup.c:267
#: ../plugins/itip-formatter/itip-view.c:1029
msgid "Status:"
msgstr "Status:"
-#: ../calendar/gui/e-cal-component-preview.c:269
+#: ../calendar/gui/e-cal-component-preview.c:270
msgid "Priority:"
msgstr "Priority:"
-#: ../calendar/gui/e-cal-list-view.c:257 ../calendar/gui/e-cal-model.c:318
-#: ../calendar/gui/e-cal-model.c:325 ../calendar/gui/e-calendar-table.c:338
-msgid "Public"
-msgstr "Public"
-
-#: ../calendar/gui/e-cal-list-view.c:258 ../calendar/gui/e-cal-model.c:327
-#: ../calendar/gui/e-calendar-table.c:339
-msgid "Private"
-msgstr "Private"
-
-#: ../calendar/gui/e-cal-list-view.c:259 ../calendar/gui/e-cal-model.c:329
-#: ../calendar/gui/e-calendar-table.c:340
-msgid "Confidential"
-msgstr "Confidential"
-
#: ../calendar/gui/e-cal-list-view.etspec.h:2
msgid "End Date"
msgstr "End Date"
@@ -6857,21 +7239,14 @@ msgstr "End Date"
msgid "Start Date"
msgstr "Start Date"
-#: ../calendar/gui/e-cal-list-view.etspec.h:5
-#: ../calendar/gui/e-calendar-table.etspec.h:11
-#: ../calendar/gui/e-memo-table.etspec.h:4 ../mail/mail-dialogs.glade.h:20
-#: ../plugins/save-calendar/csv-format.c:365
-msgid "Summary"
-msgstr "Summary"
-
-#: ../calendar/gui/e-cal-model-calendar.c:183
-#: ../calendar/gui/e-calendar-table.c:412
+#: ../calendar/gui/e-cal-model-calendar.c:187
+#: ../calendar/gui/e-calendar-table.c:619
msgid "Free"
msgstr "Free"
-#: ../calendar/gui/e-cal-model-calendar.c:186
-#: ../calendar/gui/e-calendar-table.c:413
-#: ../calendar/gui/e-meeting-time-sel.c:414
+#: ../calendar/gui/e-cal-model-calendar.c:190
+#: ../calendar/gui/e-calendar-table.c:620
+#: ../calendar/gui/e-meeting-time-sel.c:398
msgid "Busy"
msgstr "Busy"
@@ -6885,67 +7260,67 @@ msgstr ""
"\n"
"45.436845,125.862501"
-#: ../calendar/gui/e-cal-model-tasks.c:1025 ../calendar/gui/e-cal-model.c:972
-#: ../calendar/gui/e-meeting-list-view.c:192
-#: ../calendar/gui/e-meeting-store.c:154 ../calendar/gui/e-meeting-store.c:164
-#: ../calendar/gui/e-meeting-store.c:747
+#: ../calendar/gui/e-cal-model-tasks.c:1025 ../calendar/gui/e-cal-model.c:980
+#: ../calendar/gui/e-meeting-list-view.c:191
+#: ../calendar/gui/e-meeting-store.c:153 ../calendar/gui/e-meeting-store.c:163
+#: ../calendar/gui/e-meeting-store.c:746
#: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:5
msgid "Yes"
msgstr "Yes"
-#: ../calendar/gui/e-cal-model-tasks.c:1025 ../calendar/gui/e-cal-model.c:972
-#: ../calendar/gui/e-meeting-list-view.c:193
-#: ../calendar/gui/e-meeting-store.c:166
+#: ../calendar/gui/e-cal-model-tasks.c:1025 ../calendar/gui/e-cal-model.c:980
+#: ../calendar/gui/e-meeting-list-view.c:192
+#: ../calendar/gui/e-meeting-store.c:165
#: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:2
msgid "No"
msgstr "No"
#. This is the default filename used for temporary file creation
-#: ../calendar/gui/e-cal-model.c:331 ../calendar/gui/e-cal-popup.c:105
+#: ../calendar/gui/e-cal-model.c:339 ../calendar/gui/e-cal-popup.c:105
#: ../calendar/gui/e-cal-popup.c:122 ../calendar/gui/e-cal-popup.c:177
-#: ../calendar/gui/e-itip-control.c:1186 ../calendar/gui/e-itip-control.c:1326
-#: ../calendar/gui/e-meeting-list-view.c:168
-#: ../calendar/gui/e-meeting-list-view.c:182
-#: ../calendar/gui/e-meeting-store.c:112 ../calendar/gui/e-meeting-store.c:147
-#: ../calendar/gui/e-meeting-store.c:210 ../calendar/gui/print.c:969
-#: ../calendar/gui/print.c:986 ../mail/em-utils.c:1340
-#: ../plugins/itip-formatter/itip-formatter.c:410
-#: ../plugins/itip-formatter/itip-formatter.c:2041
-#: ../plugins/plugin-manager/plugin-manager.c:84
-#: ../widgets/misc/e-attachment-bar.c:742
+#: ../calendar/gui/e-itip-control.c:1203 ../calendar/gui/e-itip-control.c:1343
+#: ../calendar/gui/e-meeting-list-view.c:167
+#: ../calendar/gui/e-meeting-list-view.c:181
+#: ../calendar/gui/e-meeting-store.c:111 ../calendar/gui/e-meeting-store.c:146
+#: ../calendar/gui/e-meeting-store.c:209 ../calendar/gui/print.c:985
+#: ../calendar/gui/print.c:1002 ../mail/em-utils.c:1340
+#: ../plugins/itip-formatter/itip-formatter.c:409
+#: ../plugins/itip-formatter/itip-formatter.c:2046
+#: ../plugins/plugin-manager/plugin-manager.c:73
+#: ../widgets/misc/e-attachment-bar.c:821
#: ../widgets/misc/e-charset-picker.c:55
msgid "Unknown"
msgstr "Unknown"
-#: ../calendar/gui/e-cal-model.c:968
+#: ../calendar/gui/e-cal-model.c:976
msgid "Recurring"
msgstr "Recurring"
-#: ../calendar/gui/e-cal-model.c:970
+#: ../calendar/gui/e-cal-model.c:978
msgid "Assigned"
msgstr "Assigned"
-#: ../calendar/gui/e-cal-popup.c:183 ../mail/em-popup.c:427
+#: ../calendar/gui/e-cal-popup.c:183 ../mail/em-popup.c:416
msgid "Save As..."
msgstr "Save As..."
-#: ../calendar/gui/e-cal-popup.c:199 ../mail/em-format-html-display.c:2052
+#: ../calendar/gui/e-cal-popup.c:199 ../mail/em-format-html-display.c:2029
msgid "Select folder to save selected attachments..."
msgstr "Select folder to save selected attachments..."
-#: ../calendar/gui/e-cal-popup.c:231 ../mail/em-popup.c:455
+#: ../calendar/gui/e-cal-popup.c:231 ../mail/em-popup.c:444
#, c-format
msgid "untitled_image.%s"
msgstr "untitled_image.%s"
-#: ../calendar/gui/e-cal-popup.c:285 ../calendar/gui/e-calendar-table.c:1367
-#: ../calendar/gui/e-calendar-view.c:1688 ../calendar/gui/e-memo-table.c:926
-#: ../mail/em-folder-view.c:1343 ../mail/em-popup.c:572 ../mail/em-popup.c:583
+#: ../calendar/gui/e-cal-popup.c:285 ../calendar/gui/e-calendar-table.c:1576
+#: ../calendar/gui/e-calendar-view.c:1672 ../calendar/gui/e-memo-table.c:926
+#: ../mail/em-folder-view.c:1336 ../mail/em-popup.c:561 ../mail/em-popup.c:572
msgid "_Save As..."
msgstr "_Save As..."
-#: ../calendar/gui/e-cal-popup.c:286 ../mail/em-popup.c:573
-#: ../mail/em-popup.c:584
+#: ../calendar/gui/e-cal-popup.c:286 ../mail/em-popup.c:562
+#: ../mail/em-popup.c:573
msgid "Set as _Background"
msgstr "Set as _Background"
@@ -6953,131 +7328,157 @@ msgstr "Set as _Background"
msgid "_Save Selected"
msgstr "_Save Selected"
-#: ../calendar/gui/e-cal-popup.c:434 ../mail/em-popup.c:848
+#: ../calendar/gui/e-cal-popup.c:428 ../mail/em-popup.c:831
#, c-format
msgid "Open in %s..."
msgstr "Open in %s..."
-#: ../calendar/gui/e-calendar-table.c:382
+#: ../calendar/gui/e-calendar-table.c:338
+msgid "* No Summary *"
+msgstr "* No Summary *"
+
+#. To Translators: It will display "Organiser: NameOfTheUser <email@ofuser.com>"
+#: ../calendar/gui/e-calendar-table.c:374
+#: ../calendar/gui/e-calendar-view.c:2215
+#, c-format
+msgid "Organizer: %s <%s>"
+msgstr "Organiser: %s <%s>"
+
+#. With SunOne accounts, there may be no ':' in organiser.value
+#. With SunOne accouts, there may be no ':' in organiser.value
+#: ../calendar/gui/e-calendar-table.c:377
+#: ../calendar/gui/e-calendar-view.c:2219
+#, c-format
+msgid "Organizer: %s"
+msgstr "Organiser: %s"
+
+#: ../calendar/gui/e-calendar-table.c:408
+msgid "Start: "
+msgstr "Start: "
+
+#: ../calendar/gui/e-calendar-table.c:420
+msgid "Due: "
+msgstr "Due: "
+
+#: ../calendar/gui/e-calendar-table.c:589
msgid "0%"
msgstr "0%"
-#: ../calendar/gui/e-calendar-table.c:383
+#: ../calendar/gui/e-calendar-table.c:590
msgid "10%"
msgstr "10%"
-#: ../calendar/gui/e-calendar-table.c:384
+#: ../calendar/gui/e-calendar-table.c:591
msgid "20%"
msgstr "20%"
-#: ../calendar/gui/e-calendar-table.c:385
+#: ../calendar/gui/e-calendar-table.c:592
msgid "30%"
msgstr "30%"
-#: ../calendar/gui/e-calendar-table.c:386
+#: ../calendar/gui/e-calendar-table.c:593
msgid "40%"
msgstr "40%"
-#: ../calendar/gui/e-calendar-table.c:387
+#: ../calendar/gui/e-calendar-table.c:594
msgid "50%"
msgstr "50%"
-#: ../calendar/gui/e-calendar-table.c:388
+#: ../calendar/gui/e-calendar-table.c:595
msgid "60%"
msgstr "60%"
-#: ../calendar/gui/e-calendar-table.c:389
+#: ../calendar/gui/e-calendar-table.c:596
msgid "70%"
msgstr "70%"
-#: ../calendar/gui/e-calendar-table.c:390
+#: ../calendar/gui/e-calendar-table.c:597
msgid "80%"
msgstr "80%"
-#: ../calendar/gui/e-calendar-table.c:391
+#: ../calendar/gui/e-calendar-table.c:598
msgid "90%"
msgstr "90%"
-#: ../calendar/gui/e-calendar-table.c:392
+#: ../calendar/gui/e-calendar-table.c:599
msgid "100%"
msgstr "100%"
-#: ../calendar/gui/e-calendar-table.c:670
-#: ../calendar/gui/e-calendar-view.c:681 ../calendar/gui/e-memo-table.c:439
+#: ../calendar/gui/e-calendar-table.c:879
+#: ../calendar/gui/e-calendar-view.c:665 ../calendar/gui/e-memo-table.c:439
msgid "Deleting selected objects"
msgstr "Deleting selected objects"
-#: ../calendar/gui/e-calendar-table.c:954
-#: ../calendar/gui/e-calendar-view.c:811 ../calendar/gui/e-memo-table.c:645
+#: ../calendar/gui/e-calendar-table.c:1163
+#: ../calendar/gui/e-calendar-view.c:795 ../calendar/gui/e-memo-table.c:645
msgid "Updating objects"
msgstr "Updating objects"
-#: ../calendar/gui/e-calendar-table.c:1139
-#: ../calendar/gui/e-calendar-view.c:1237 ../calendar/gui/e-memo-table.c:821
+#: ../calendar/gui/e-calendar-table.c:1348
+#: ../calendar/gui/e-calendar-view.c:1221 ../calendar/gui/e-memo-table.c:821
#: ../composer/e-composer-actions.c:277
msgid "Save as..."
msgstr "Save as..."
-#: ../calendar/gui/e-calendar-table.c:1362
-#: ../calendar/gui/e-calendar-view.c:1670
+#: ../calendar/gui/e-calendar-table.c:1571
+#: ../calendar/gui/e-calendar-view.c:1654
msgid "New _Task"
msgstr "New _Task"
-#: ../calendar/gui/e-calendar-table.c:1366 ../calendar/gui/e-memo-table.c:925
+#: ../calendar/gui/e-calendar-table.c:1575 ../calendar/gui/e-memo-table.c:925
msgid "Open _Web Page"
msgstr "Open _Web Page"
-#: ../calendar/gui/e-calendar-table.c:1368
-#: ../calendar/gui/e-calendar-view.c:1673 ../calendar/gui/e-memo-table.c:927
+#: ../calendar/gui/e-calendar-table.c:1577
+#: ../calendar/gui/e-calendar-view.c:1657 ../calendar/gui/e-memo-table.c:927
msgid "P_rint..."
msgstr "P_rint..."
-#: ../calendar/gui/e-calendar-table.c:1372
-#: ../calendar/gui/e-calendar-view.c:1693 ../calendar/gui/e-memo-table.c:931
+#: ../calendar/gui/e-calendar-table.c:1581
+#: ../calendar/gui/e-calendar-view.c:1677 ../calendar/gui/e-memo-table.c:931
#: ../ui/evolution-addressbook.xml.h:2 ../ui/evolution-calendar.xml.h:1
#: ../ui/evolution-memos.xml.h:1 ../ui/evolution-tasks.xml.h:1
msgid "C_ut"
msgstr "C_ut"
-#: ../calendar/gui/e-calendar-table.c:1374
-#: ../calendar/gui/e-calendar-view.c:1676
-#: ../calendar/gui/e-calendar-view.c:1695 ../calendar/gui/e-memo-table.c:933
+#: ../calendar/gui/e-calendar-table.c:1583
+#: ../calendar/gui/e-calendar-view.c:1660
+#: ../calendar/gui/e-calendar-view.c:1679 ../calendar/gui/e-memo-table.c:933
#: ../ui/evolution-addressbook.xml.h:57 ../ui/evolution-calendar.xml.h:43
-#: ../ui/evolution-editor.xml.h:22 ../ui/evolution-memos.xml.h:19
-#: ../ui/evolution-tasks.xml.h:28
+#: ../ui/evolution-memos.xml.h:19 ../ui/evolution-tasks.xml.h:28
msgid "_Paste"
msgstr "_Paste"
-#: ../calendar/gui/e-calendar-table.c:1378 ../ui/evolution-tasks.xml.h:22
+#: ../calendar/gui/e-calendar-table.c:1587 ../ui/evolution-tasks.xml.h:22
msgid "_Assign Task"
msgstr "_Assign Task"
-#: ../calendar/gui/e-calendar-table.c:1379 ../calendar/gui/e-memo-table.c:937
+#: ../calendar/gui/e-calendar-table.c:1588 ../calendar/gui/e-memo-table.c:937
#: ../ui/evolution-tasks.xml.h:26
msgid "_Forward as iCalendar"
msgstr "_Forward as iCalendar"
-#: ../calendar/gui/e-calendar-table.c:1380
+#: ../calendar/gui/e-calendar-table.c:1589
msgid "_Mark as Complete"
msgstr "_Mark as Complete"
-#: ../calendar/gui/e-calendar-table.c:1381
+#: ../calendar/gui/e-calendar-table.c:1590
msgid "_Mark Selected Tasks as Complete"
msgstr "_Mark Selected Tasks as Complete"
-#: ../calendar/gui/e-calendar-table.c:1382
+#: ../calendar/gui/e-calendar-table.c:1591
msgid "_Mark as Incomplete"
msgstr "_Mark as Incomplete"
-#: ../calendar/gui/e-calendar-table.c:1383
+#: ../calendar/gui/e-calendar-table.c:1592
msgid "_Mark Selected Tasks as Incomplete"
msgstr "_Mark Selected Tasks as Incomplete"
-#: ../calendar/gui/e-calendar-table.c:1388
+#: ../calendar/gui/e-calendar-table.c:1597
msgid "_Delete Selected Tasks"
msgstr "_Delete Selected Tasks"
-#: ../calendar/gui/e-calendar-table.c:1625
+#: ../calendar/gui/e-calendar-table.c:1834
#: ../calendar/gui/e-calendar-table.etspec.h:4
msgid "Click to add a task"
msgstr "Click to add a task"
@@ -7100,7 +7501,8 @@ msgid "Due date"
msgstr "Due date"
#: ../calendar/gui/e-calendar-table.etspec.h:8
-#: ../plugins/save-calendar/csv-format.c:376
+#: ../calendar/gui/tasktypes.xml.h:37
+#: ../plugins/save-calendar/csv-format.c:372
msgid "Priority"
msgstr "Priority"
@@ -7108,127 +7510,108 @@ msgstr "Priority"
msgid "Start date"
msgstr "Start date"
-#: ../calendar/gui/e-calendar-table.etspec.h:10
-#: ../calendar/gui/e-meeting-list-view.c:546
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:10 ../mail/em-filter-i18n.h:70
-#: ../mail/message-list.etspec.h:17
-msgid "Status"
-msgstr "Status"
-
-#: ../calendar/gui/e-calendar-view.c:1356
+#: ../calendar/gui/e-calendar-view.c:1340
msgid "Moving items"
msgstr "Moving items"
-#: ../calendar/gui/e-calendar-view.c:1358
+#: ../calendar/gui/e-calendar-view.c:1342
msgid "Copying items"
msgstr "Copying items"
-#: ../calendar/gui/e-calendar-view.c:1667
+#: ../calendar/gui/e-calendar-view.c:1651
msgid "New _Appointment..."
msgstr "New _Appointment..."
-#: ../calendar/gui/e-calendar-view.c:1668
+#: ../calendar/gui/e-calendar-view.c:1652
msgid "New All Day _Event"
msgstr "New All Day _Event"
-#: ../calendar/gui/e-calendar-view.c:1669
+#: ../calendar/gui/e-calendar-view.c:1653
msgid "New _Meeting"
msgstr "New _Meeting"
#. FIXME: hook in this somehow
-#: ../calendar/gui/e-calendar-view.c:1680
+#: ../calendar/gui/e-calendar-view.c:1664
msgid "_Current View"
msgstr "_Current View"
-#: ../calendar/gui/e-calendar-view.c:1682
+#: ../calendar/gui/e-calendar-view.c:1666
msgid "Select T_oday"
msgstr "Select T_oday"
-#: ../calendar/gui/e-calendar-view.c:1683
+#: ../calendar/gui/e-calendar-view.c:1667
msgid "_Select Date..."
msgstr "_Select Date..."
-#: ../calendar/gui/e-calendar-view.c:1689
+#: ../calendar/gui/e-calendar-view.c:1673
msgid "Pri_nt..."
msgstr "Pri_nt..."
-#: ../calendar/gui/e-calendar-view.c:1699
+#: ../calendar/gui/e-calendar-view.c:1683
msgid "Cop_y to Calendar..."
msgstr "Cop_y to Calendar..."
-#: ../calendar/gui/e-calendar-view.c:1700
+#: ../calendar/gui/e-calendar-view.c:1684
msgid "Mo_ve to Calendar..."
msgstr "Mo_ve to Calendar..."
-#: ../calendar/gui/e-calendar-view.c:1701
+#: ../calendar/gui/e-calendar-view.c:1685
msgid "_Delegate Meeting..."
msgstr "_Delegate Meeting..."
-#: ../calendar/gui/e-calendar-view.c:1702
+#: ../calendar/gui/e-calendar-view.c:1686
msgid "_Schedule Meeting..."
msgstr "_Schedule Meeting..."
-#: ../calendar/gui/e-calendar-view.c:1703
+#: ../calendar/gui/e-calendar-view.c:1687
msgid "_Forward as iCalendar..."
msgstr "_Forward as iCalendar..."
-#: ../calendar/gui/e-calendar-view.c:1704
+#: ../calendar/gui/e-calendar-view.c:1688
msgid "_Reply"
msgstr "_Reply"
-#: ../calendar/gui/e-calendar-view.c:1705 ../mail/em-folder-view.c:1337
-#: ../mail/em-popup.c:577 ../mail/em-popup.c:588
+#: ../calendar/gui/e-calendar-view.c:1689 ../mail/em-folder-view.c:1330
+#: ../mail/em-popup.c:566 ../mail/em-popup.c:577
#: ../ui/evolution-mail-message.xml.h:82
msgid "Reply to _All"
msgstr "Reply to _All"
-#: ../calendar/gui/e-calendar-view.c:1710
+#: ../calendar/gui/e-calendar-view.c:1694
msgid "Make this Occurrence _Movable"
msgstr "Make this Occurrence _Movable"
-#: ../calendar/gui/e-calendar-view.c:1711 ../ui/evolution-calendar.xml.h:9
+#: ../calendar/gui/e-calendar-view.c:1695 ../ui/evolution-calendar.xml.h:9
msgid "Delete this _Occurrence"
msgstr "Delete this _Occurrence"
-#: ../calendar/gui/e-calendar-view.c:1712
+#: ../calendar/gui/e-calendar-view.c:1696
msgid "Delete _All Occurrences"
msgstr "Delete _All Occurrences"
-#. To Translators: It will display "Organiser: NameOfTheUser <email@ofuser.com>"
-#: ../calendar/gui/e-calendar-view.c:2234
-#, c-format
-msgid "Organizer: %s <%s>"
-msgstr "Organiser: %s <%s>"
-
-#. With SunOne accouts, there may be no ':' in organiser.value
-#: ../calendar/gui/e-calendar-view.c:2238
-#, c-format
-msgid "Organizer: %s"
-msgstr "Organiser: %s"
-
#. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:2254 ../calendar/gui/print.c:2477
+#: ../calendar/gui/e-calendar-view.c:2235 ../calendar/gui/print.c:2508
#, c-format
msgid "Location: %s"
msgstr "Location: %s"
#. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
-#: ../calendar/gui/e-calendar-view.c:2288
+#: ../calendar/gui/e-calendar-view.c:2269
#, c-format
msgid "Time: %s %s"
msgstr "Time: %s %s"
#. strftime format of a weekday, a date and a time, 24-hour.
-#: ../calendar/gui/e-cell-date-edit-text.c:116
+#: ../calendar/gui/e-cell-date-edit-text.c:115
msgid "%a %m/%d/%Y %H:%M:%S"
msgstr "%a %d/%m/%Y %H:%M:%S"
#. strftime format of a weekday, a date and a time, 12-hour.
-#: ../calendar/gui/e-cell-date-edit-text.c:119
+#: ../calendar/gui/e-cell-date-edit-text.c:118
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:127
+#: ../calendar/gui/e-cell-date-edit-text.c:126
#, c-format
msgid ""
"The date must be entered in the format: \n"
@@ -7241,7 +7624,7 @@ msgstr ""
#. * to change the length of the time division in the calendar day view, e.g.
#. * a day is displayed in 24 "60 minute divisions" or 48 "30 minute divisions"
#.
-#: ../calendar/gui/e-day-view-time-item.c:592
+#: ../calendar/gui/e-day-view-time-item.c:589
#, c-format
msgid "%02i minute divisions"
msgstr "%02i minute divisions"
@@ -7252,44 +7635,34 @@ 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:852 ../calendar/gui/e-day-view.c:1528
-#: ../calendar/gui/e-week-view-main-item.c:331 ../calendar/gui/print.c:1656
+#: ../calendar/gui/e-day-view-top-item.c:852 ../calendar/gui/e-day-view.c:1551
+#: ../calendar/gui/e-week-view-main-item.c:330 ../calendar/gui/print.c:1672
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:772 ../calendar/gui/e-week-view.c:511
-#: ../calendar/gui/print.c:813
+#: ../calendar/gui/e-day-view.c:791 ../calendar/gui/e-week-view.c:528
+#: ../calendar/gui/print.c:829
msgid "am"
msgstr "am"
#. String to use in 12-hour time format for times in the afternoon.
-#: ../calendar/gui/e-day-view.c:775 ../calendar/gui/e-week-view.c:514
-#: ../calendar/gui/print.c:815
+#: ../calendar/gui/e-day-view.c:794 ../calendar/gui/e-week-view.c:531
+#: ../calendar/gui/print.c:831
msgid "pm"
msgstr "pm"
-#: ../calendar/gui/e-itip-control.c:769
+#: ../calendar/gui/e-itip-control.c:765
msgid "Yes. (Complex Recurrence)"
msgstr "Yes. (Complex Recurrence)"
-#. For Translators: In this can also be translated as "With the period of %d
-#. day/days", where %d is a number. The entire sentence is of the form "Recurring:
-#. Every %d day/days"
-#. For Translators : 'Every day' is event Recurring every day
-#. For Translators : 'Every %d days' is event Recurring every %d days. %d is a digit
-#: ../calendar/gui/e-itip-control.c:785
+#: ../calendar/gui/e-itip-control.c:782
#, c-format
msgid "Every day"
msgid_plural "Every %d days"
msgstr[0] "Every day"
msgstr[1] "Every %d days"
-#. For Translators: In this can also be translated as "With the period of %d
-#. week/weeks", where %d is a number. The entire sentence is of the form "Recurring:
-#. Every %d week/weeks"
-#. For Translators : 'Every week' is event Recurring every week
-#. For Translators : 'Every %d weeks' is event Recurring every %d weeks. %d is a digit
#: ../calendar/gui/e-itip-control.c:795
#, c-format
msgid "Every week"
@@ -7297,9 +7670,7 @@ msgid_plural "Every %d weeks"
msgstr[0] "Every week"
msgstr[1] "Every %d weeks"
-#. For Translators : 'Every week on' is event Recurring every week on (dayname) and (dayname) and (dayname)
-#. For Translators : 'Every %d weeks on' is event Recurring: every %d weeks on (dayname) and (dayname). %d is a digit
-#: ../calendar/gui/e-itip-control.c:799
+#: ../calendar/gui/e-itip-control.c:802
#, c-format
msgid "Every week on "
msgid_plural "Every %d weeks on "
@@ -7307,51 +7678,35 @@ msgstr[0] "Every week on "
msgstr[1] "Every %d weeks on "
#. For Translators : 'and' is part of the sentence 'event recurring every week on (dayname) and (dayname)'
-#: ../calendar/gui/e-itip-control.c:808
+#: ../calendar/gui/e-itip-control.c:813
msgid " and "
msgstr " and "
-#. For Translators : 'The %s day of' is part of the sentence 'event recurring on the (nth) day of every month.'
-#: ../calendar/gui/e-itip-control.c:816
+#: ../calendar/gui/e-itip-control.c:822
#, c-format
msgid "The %s day of "
msgstr "The %s day of "
-#. For Translators : 'The %s %s of' is part of the sentence 'event recurring on the (nth) (dayname) of every month.'
-#. eg,third monday of every month
-#: ../calendar/gui/e-itip-control.c:831
+#: ../calendar/gui/e-itip-control.c:838
#, c-format
msgid "The %s %s of "
msgstr "The %s %s of "
-#. For Translators: In this can also be translated as "With the period of %d
-#. month/months", where %d is a number. The entire sentence is of the form "Recurring:
-#. Every %d month/months"
-#. For Translators : 'every month' is part of the sentence 'event recurring on the (nth) day of every month.'
-#. For Translators : 'every %d months' is part of the sentence 'event recurring on the (nth) day of every %d months.'
-#. %d is a digit
-#: ../calendar/gui/e-itip-control.c:844
+#: ../calendar/gui/e-itip-control.c:849
#, c-format
msgid "every month"
msgid_plural "every %d months"
msgstr[0] "every month"
msgstr[1] "every %d months"
-#. For Translators: In this can also be translated as "With the period of %d
-#. year/years", where %d is a number. The entire sentence is of the form "Recurring:
-#. Every %d year/years"
-#. For Translators : 'Every year' is event Recurring every year
-#. For Translators : 'Every %d years' is event Recurring every %d years. %d is a digit
-#: ../calendar/gui/e-itip-control.c:853
+#: ../calendar/gui/e-itip-control.c:861
#, c-format
msgid "Every year"
msgid_plural "Every %d years"
msgstr[0] "Every year"
msgstr[1] "Every %d years"
-#. For Translators:'a total of %d time' is part of the sentence of the form 'event recurring every day,a total of % time.' %d is a digit
-#. For Translators:'a total of %d times' is part of the sentence of the form 'event recurring every day,a total of % times.' %d is a digit
-#: ../calendar/gui/e-itip-control.c:866
+#: ../calendar/gui/e-itip-control.c:874
#, c-format
msgid "a total of %d time"
msgid_plural " a total of %d times"
@@ -7359,47 +7714,47 @@ msgstr[0] "a total of %d time"
msgstr[1] " a total of %d times"
#. For Translators : ', ending on' is part of the sentence of the form 'event recurring every day, ending on (date).'
-#: ../calendar/gui/e-itip-control.c:876
+#: ../calendar/gui/e-itip-control.c:885
msgid ", ending on "
msgstr ", ending on "
#. For Translators : 'starts' is starts:date implying a task starts on what date
-#: ../calendar/gui/e-itip-control.c:898
+#: ../calendar/gui/e-itip-control.c:907
msgid "Starts"
msgstr "Starts"
#. For Translators : 'ends' is ends:date implying a task ends on what date
-#: ../calendar/gui/e-itip-control.c:912
+#: ../calendar/gui/e-itip-control.c:921
msgid "Ends"
msgstr "Ends"
-#: ../calendar/gui/e-itip-control.c:946
-#: ../plugins/save-calendar/csv-format.c:374
+#: ../calendar/gui/e-itip-control.c:961
+#: ../plugins/save-calendar/csv-format.c:370
msgid "Due"
msgstr "Due"
-#: ../calendar/gui/e-itip-control.c:986 ../calendar/gui/e-itip-control.c:1043
+#: ../calendar/gui/e-itip-control.c:1003 ../calendar/gui/e-itip-control.c:1060
msgid "iCalendar Information"
msgstr "iCalendar Information"
#. Title
-#: ../calendar/gui/e-itip-control.c:1003
+#: ../calendar/gui/e-itip-control.c:1020
msgid "iCalendar Error"
msgstr "iCalendar Error"
-#: ../calendar/gui/e-itip-control.c:1075 ../calendar/gui/e-itip-control.c:1091
-#: ../calendar/gui/e-itip-control.c:1102 ../calendar/gui/e-itip-control.c:1119
-#: ../plugins/itip-formatter/itip-view.c:347
-#: ../plugins/itip-formatter/itip-view.c:348
-#: ../plugins/itip-formatter/itip-view.c:435
-#: ../plugins/itip-formatter/itip-view.c:436
-#: ../plugins/itip-formatter/itip-view.c:523
-#: ../plugins/itip-formatter/itip-view.c:524
+#: ../calendar/gui/e-itip-control.c:1092 ../calendar/gui/e-itip-control.c:1108
+#: ../calendar/gui/e-itip-control.c:1119 ../calendar/gui/e-itip-control.c:1136
+#: ../plugins/itip-formatter/itip-view.c:344
+#: ../plugins/itip-formatter/itip-view.c:345
+#: ../plugins/itip-formatter/itip-view.c:432
+#: ../plugins/itip-formatter/itip-view.c:433
+#: ../plugins/itip-formatter/itip-view.c:520
+#: ../plugins/itip-formatter/itip-view.c:521
msgid "An unknown person"
msgstr "An unknown person"
#. Describe what the user can do
-#: ../calendar/gui/e-itip-control.c:1126
+#: ../calendar/gui/e-itip-control.c:1143
msgid ""
"<br> Please review the following information, and then select an action from "
"the menu below."
@@ -7407,28 +7762,28 @@ msgstr ""
"<br> Please review the following information, and then select an action from "
"the menu below."
-#: ../calendar/gui/e-itip-control.c:1174
-#: ../calendar/gui/e-meeting-list-view.c:204
-#: ../calendar/gui/e-meeting-store.c:174 ../calendar/gui/e-meeting-store.c:197
-#: ../calendar/gui/itip-utils.c:699
-#: ../plugins/itip-formatter/itip-formatter.c:2029
+#: ../calendar/gui/e-itip-control.c:1191
+#: ../calendar/gui/e-meeting-list-view.c:203
+#: ../calendar/gui/e-meeting-store.c:173 ../calendar/gui/e-meeting-store.c:196
+#: ../calendar/gui/itip-utils.c:664
+#: ../plugins/itip-formatter/itip-formatter.c:2034
msgid "Accepted"
msgstr "Accepted"
-#: ../calendar/gui/e-itip-control.c:1178 ../calendar/gui/itip-utils.c:702
-#: ../plugins/itip-formatter/itip-formatter.c:2032
+#: ../calendar/gui/e-itip-control.c:1195 ../calendar/gui/itip-utils.c:667
+#: ../plugins/itip-formatter/itip-formatter.c:2037
msgid "Tentatively Accepted"
msgstr "Tentatively Accepted"
-#: ../calendar/gui/e-itip-control.c:1182
-#: ../calendar/gui/e-meeting-list-view.c:205
-#: ../calendar/gui/e-meeting-store.c:176 ../calendar/gui/e-meeting-store.c:199
-#: ../calendar/gui/itip-utils.c:705 ../calendar/gui/itip-utils.c:734
-#: ../plugins/itip-formatter/itip-formatter.c:2035
+#: ../calendar/gui/e-itip-control.c:1199
+#: ../calendar/gui/e-meeting-list-view.c:204
+#: ../calendar/gui/e-meeting-store.c:175 ../calendar/gui/e-meeting-store.c:198
+#: ../calendar/gui/itip-utils.c:670 ../calendar/gui/itip-utils.c:699
+#: ../plugins/itip-formatter/itip-formatter.c:2040
msgid "Declined"
msgstr "Declined"
-#: ../calendar/gui/e-itip-control.c:1266
+#: ../calendar/gui/e-itip-control.c:1283
msgid ""
"The meeting has been canceled, however it could not be found in your "
"calendars"
@@ -7436,261 +7791,261 @@ msgstr ""
"The meeting has been cancelled, however it could not be found in your "
"calendars"
-#: ../calendar/gui/e-itip-control.c:1268
+#: ../calendar/gui/e-itip-control.c:1285
msgid ""
"The task has been canceled, 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:1346
+#: ../calendar/gui/e-itip-control.c:1363
#, c-format
msgid "<b>%s</b> has published meeting information."
msgstr "<b>%s</b> has published meeting information."
-#: ../calendar/gui/e-itip-control.c:1347
+#: ../calendar/gui/e-itip-control.c:1364
msgid "Meeting Information"
msgstr "Meeting Information"
-#: ../calendar/gui/e-itip-control.c:1353
+#: ../calendar/gui/e-itip-control.c:1370
#, 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:1355
+#: ../calendar/gui/e-itip-control.c:1372
#, 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:1356
+#: ../calendar/gui/e-itip-control.c:1373
msgid "Meeting Proposal"
msgstr "Meeting Proposal"
#. FIXME Whats going on here?
-#: ../calendar/gui/e-itip-control.c:1362
+#: ../calendar/gui/e-itip-control.c:1379
#, c-format
msgid "<b>%s</b> wishes to be added to an existing meeting."
msgstr "<b>%s</b> wishes to be added to an existing meeting."
-#: ../calendar/gui/e-itip-control.c:1363
+#: ../calendar/gui/e-itip-control.c:1380
msgid "Meeting Update"
msgstr "Meeting Update"
-#: ../calendar/gui/e-itip-control.c:1367
+#: ../calendar/gui/e-itip-control.c:1384
#, 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:1368
+#: ../calendar/gui/e-itip-control.c:1385
msgid "Meeting Update Request"
msgstr "Meeting Update Request"
-#: ../calendar/gui/e-itip-control.c:1375
+#: ../calendar/gui/e-itip-control.c:1392
#, 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:1376
+#: ../calendar/gui/e-itip-control.c:1393
msgid "Meeting Reply"
msgstr "Meeting Reply"
-#: ../calendar/gui/e-itip-control.c:1383
+#: ../calendar/gui/e-itip-control.c:1400
#, c-format
msgid "<b>%s</b> has canceled a meeting."
msgstr "<b>%s</b> has cancelled a meeting."
-#: ../calendar/gui/e-itip-control.c:1384
+#: ../calendar/gui/e-itip-control.c:1401
msgid "Meeting Cancelation"
msgstr "Meeting Cancellation"
-#: ../calendar/gui/e-itip-control.c:1394 ../calendar/gui/e-itip-control.c:1471
-#: ../calendar/gui/e-itip-control.c:1511
+#: ../calendar/gui/e-itip-control.c:1411 ../calendar/gui/e-itip-control.c:1488
+#: ../calendar/gui/e-itip-control.c:1528
#, 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:1395
+#: ../calendar/gui/e-itip-control.c:1412
msgid "Bad Meeting Message"
msgstr "Bad Meeting Message"
-#: ../calendar/gui/e-itip-control.c:1422
+#: ../calendar/gui/e-itip-control.c:1439
#, c-format
msgid "<b>%s</b> has published task information."
msgstr "<b>%s</b> has published task information."
-#: ../calendar/gui/e-itip-control.c:1423
+#: ../calendar/gui/e-itip-control.c:1440
msgid "Task Information"
msgstr "Task Information"
-#: ../calendar/gui/e-itip-control.c:1430
+#: ../calendar/gui/e-itip-control.c:1447
#, 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:1432
+#: ../calendar/gui/e-itip-control.c:1449
#, 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:1433
+#: ../calendar/gui/e-itip-control.c:1450
msgid "Task Proposal"
msgstr "Task Proposal"
#. FIXME Whats going on here?
-#: ../calendar/gui/e-itip-control.c:1439
+#: ../calendar/gui/e-itip-control.c:1456
#, c-format
msgid "<b>%s</b> wishes to be added to an existing task."
msgstr "<b>%s</b> wishes to be added to an existing task."
-#: ../calendar/gui/e-itip-control.c:1440
+#: ../calendar/gui/e-itip-control.c:1457
msgid "Task Update"
msgstr "Task Update"
-#: ../calendar/gui/e-itip-control.c:1444
+#: ../calendar/gui/e-itip-control.c:1461
#, 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:1445
+#: ../calendar/gui/e-itip-control.c:1462
msgid "Task Update Request"
msgstr "Task Update Request"
-#: ../calendar/gui/e-itip-control.c:1452
+#: ../calendar/gui/e-itip-control.c:1469
#, 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:1453
+#: ../calendar/gui/e-itip-control.c:1470
msgid "Task Reply"
msgstr "Task Reply"
-#: ../calendar/gui/e-itip-control.c:1460
+#: ../calendar/gui/e-itip-control.c:1477
#, c-format
msgid "<b>%s</b> has canceled a task."
msgstr "<b>%s</b> has cancelled a task."
-#: ../calendar/gui/e-itip-control.c:1461
+#: ../calendar/gui/e-itip-control.c:1478
msgid "Task Cancelation"
msgstr "Task Cancellation"
-#: ../calendar/gui/e-itip-control.c:1472
+#: ../calendar/gui/e-itip-control.c:1489
msgid "Bad Task Message"
msgstr "Bad Task Message"
-#: ../calendar/gui/e-itip-control.c:1496
+#: ../calendar/gui/e-itip-control.c:1513
#, 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:1497
+#: ../calendar/gui/e-itip-control.c:1514
msgid "Free/Busy Information"
msgstr "Free/Busy Information"
-#: ../calendar/gui/e-itip-control.c:1501
+#: ../calendar/gui/e-itip-control.c:1518
#, 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:1502
+#: ../calendar/gui/e-itip-control.c:1519
msgid "Free/Busy Request"
msgstr "Free/Busy Request"
-#: ../calendar/gui/e-itip-control.c:1506
+#: ../calendar/gui/e-itip-control.c:1523
#, 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:1507
+#: ../calendar/gui/e-itip-control.c:1524
msgid "Free/Busy Reply"
msgstr "Free/Busy Reply"
-#: ../calendar/gui/e-itip-control.c:1512
+#: ../calendar/gui/e-itip-control.c:1529
msgid "Bad Free/Busy Message"
msgstr "Bad Free/Busy Message"
-#: ../calendar/gui/e-itip-control.c:1588
+#: ../calendar/gui/e-itip-control.c:1605
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:1647
+#: ../calendar/gui/e-itip-control.c:1664
msgid "The message contains only unsupported requests."
msgstr "The message contains only unsupported requests."
-#: ../calendar/gui/e-itip-control.c:1680
+#: ../calendar/gui/e-itip-control.c:1697
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:1712
+#: ../calendar/gui/e-itip-control.c:1735
msgid "The attachment has no viewable calendar items"
msgstr "The attachment has no viewable calendar items"
-#: ../calendar/gui/e-itip-control.c:1957
+#: ../calendar/gui/e-itip-control.c:1980
msgid "Update complete\n"
msgstr "Update complete\n"
-#: ../calendar/gui/e-itip-control.c:1991
+#: ../calendar/gui/e-itip-control.c:2014
msgid "Object is invalid and cannot be updated\n"
msgstr "Object is invalid and cannot be updated\n"
-#: ../calendar/gui/e-itip-control.c:2008
+#: ../calendar/gui/e-itip-control.c:2031
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:2026
+#: ../calendar/gui/e-itip-control.c:2049
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:2050
+#: ../calendar/gui/e-itip-control.c:2073
msgid "Attendee status updated\n"
msgstr "Attendee status updated\n"
-#: ../calendar/gui/e-itip-control.c:2057
-#: ../plugins/itip-formatter/itip-formatter.c:1254
+#: ../calendar/gui/e-itip-control.c:2080
+#: ../plugins/itip-formatter/itip-formatter.c:1253
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:2088 ../calendar/gui/e-itip-control.c:2145
+#: ../calendar/gui/e-itip-control.c:2111 ../calendar/gui/e-itip-control.c:2168
msgid "Item sent!\n"
msgstr "Item sent!\n"
-#: ../calendar/gui/e-itip-control.c:2094 ../calendar/gui/e-itip-control.c:2153
+#: ../calendar/gui/e-itip-control.c:2117 ../calendar/gui/e-itip-control.c:2176
msgid "The item could not be sent!\n"
msgstr "The item could not be sent!\n"
-#: ../calendar/gui/e-itip-control.c:2233
+#: ../calendar/gui/e-itip-control.c:2256
msgid "Choose an action:"
msgstr "Choose an action:"
-#: ../calendar/gui/e-itip-control.c:2304
+#: ../calendar/gui/e-itip-control.c:2327
msgid "Update"
msgstr "Update"
-#: ../calendar/gui/e-itip-control.c:2332
-#: ../plugins/groupwise-features/process-meeting.c:48
+#: ../calendar/gui/e-itip-control.c:2355
+#: ../plugins/groupwise-features/process-meeting.c:51
msgid "Accept"
msgstr "Accept"
-#: ../calendar/gui/e-itip-control.c:2333
+#: ../calendar/gui/e-itip-control.c:2356
msgid "Tentatively accept"
msgstr "Tentatively accept"
-#: ../calendar/gui/e-itip-control.c:2334
-#: ../plugins/groupwise-features/process-meeting.c:50
+#: ../calendar/gui/e-itip-control.c:2357
+#: ../plugins/groupwise-features/process-meeting.c:53
msgid "Decline"
msgstr "Decline"
-#: ../calendar/gui/e-itip-control.c:2363
+#: ../calendar/gui/e-itip-control.c:2386
msgid "Send Free/Busy Information"
msgstr "Send Free/Busy Information"
-#: ../calendar/gui/e-itip-control.c:2391
+#: ../calendar/gui/e-itip-control.c:2414
msgid "Update respondent status"
msgstr "Update respondent status"
-#: ../calendar/gui/e-itip-control.c:2419
+#: ../calendar/gui/e-itip-control.c:2442
msgid "Send Latest Information"
msgstr "Send Latest Information"
-#: ../calendar/gui/e-itip-control.c:2447 ../calendar/gui/itip-utils.c:722
+#: ../calendar/gui/e-itip-control.c:2470 ../calendar/gui/itip-utils.c:687
#: ../ui/evolution-mail-global.xml.h:1
msgid "Cancel"
msgstr "Cancel"
@@ -7719,112 +8074,112 @@ msgstr "Loading calendar..."
msgid "Server Message:"
msgstr "Server Message:"
-#: ../calendar/gui/e-meeting-list-view.c:69
+#: ../calendar/gui/e-meeting-list-view.c:68
msgid "Chair Persons"
msgstr "Chair Persons"
-#: ../calendar/gui/e-meeting-list-view.c:70
+#: ../calendar/gui/e-meeting-list-view.c:69
msgid "Required Participants"
msgstr "Required Participants"
-#: ../calendar/gui/e-meeting-list-view.c:71
+#: ../calendar/gui/e-meeting-list-view.c:70
msgid "Optional Participants"
msgstr "Optional Participants"
-#: ../calendar/gui/e-meeting-list-view.c:72
+#: ../calendar/gui/e-meeting-list-view.c:71
msgid "Resources"
msgstr "Resources"
-#: ../calendar/gui/e-meeting-list-view.c:153
+#: ../calendar/gui/e-meeting-list-view.c:152
msgid "Attendees"
msgstr "Attendees"
-#: ../calendar/gui/e-meeting-list-view.c:164
-#: ../calendar/gui/e-meeting-store.c:87 ../calendar/gui/e-meeting-store.c:104
-#: ../calendar/gui/e-meeting-store.c:741 ../calendar/gui/print.c:965
+#: ../calendar/gui/e-meeting-list-view.c:163
+#: ../calendar/gui/e-meeting-store.c:86 ../calendar/gui/e-meeting-store.c:103
+#: ../calendar/gui/e-meeting-store.c:740 ../calendar/gui/print.c:981
msgid "Individual"
msgstr "Individual"
-#: ../calendar/gui/e-meeting-list-view.c:165
-#: ../calendar/gui/e-meeting-store.c:89 ../calendar/gui/e-meeting-store.c:106
-#: ../calendar/gui/print.c:966 ../widgets/table/e-table-config.glade.h:7
+#: ../calendar/gui/e-meeting-list-view.c:164
+#: ../calendar/gui/e-meeting-store.c:88 ../calendar/gui/e-meeting-store.c:105
+#: ../calendar/gui/print.c:982 ../widgets/table/e-table-config.glade.h:7
msgid "Group"
msgstr "Group"
-#: ../calendar/gui/e-meeting-list-view.c:166
-#: ../calendar/gui/e-meeting-store.c:91 ../calendar/gui/e-meeting-store.c:108
-#: ../calendar/gui/print.c:967
+#: ../calendar/gui/e-meeting-list-view.c:165
+#: ../calendar/gui/e-meeting-store.c:90 ../calendar/gui/e-meeting-store.c:107
+#: ../calendar/gui/print.c:983
msgid "Resource"
msgstr "Resource"
-#: ../calendar/gui/e-meeting-list-view.c:167
-#: ../calendar/gui/e-meeting-store.c:93 ../calendar/gui/e-meeting-store.c:110
-#: ../calendar/gui/print.c:968
+#: ../calendar/gui/e-meeting-list-view.c:166
+#: ../calendar/gui/e-meeting-store.c:92 ../calendar/gui/e-meeting-store.c:109
+#: ../calendar/gui/print.c:984
msgid "Room"
msgstr "Room"
-#: ../calendar/gui/e-meeting-list-view.c:178
-#: ../calendar/gui/e-meeting-store.c:122 ../calendar/gui/e-meeting-store.c:139
-#: ../calendar/gui/print.c:982
+#: ../calendar/gui/e-meeting-list-view.c:177
+#: ../calendar/gui/e-meeting-store.c:121 ../calendar/gui/e-meeting-store.c:138
+#: ../calendar/gui/print.c:998
msgid "Chair"
msgstr "Chair"
-#: ../calendar/gui/e-meeting-list-view.c:179
-#: ../calendar/gui/e-meeting-store.c:124 ../calendar/gui/e-meeting-store.c:141
-#: ../calendar/gui/e-meeting-store.c:744 ../calendar/gui/print.c:983
+#: ../calendar/gui/e-meeting-list-view.c:178
+#: ../calendar/gui/e-meeting-store.c:123 ../calendar/gui/e-meeting-store.c:140
+#: ../calendar/gui/e-meeting-store.c:743 ../calendar/gui/print.c:999
msgid "Required Participant"
msgstr "Required Participant"
-#: ../calendar/gui/e-meeting-list-view.c:180
-#: ../calendar/gui/e-meeting-store.c:126 ../calendar/gui/e-meeting-store.c:143
-#: ../calendar/gui/print.c:984
+#: ../calendar/gui/e-meeting-list-view.c:179
+#: ../calendar/gui/e-meeting-store.c:125 ../calendar/gui/e-meeting-store.c:142
+#: ../calendar/gui/print.c:1000
msgid "Optional Participant"
msgstr "Optional Participant"
-#: ../calendar/gui/e-meeting-list-view.c:181
-#: ../calendar/gui/e-meeting-store.c:128 ../calendar/gui/e-meeting-store.c:145
-#: ../calendar/gui/print.c:985
+#: ../calendar/gui/e-meeting-list-view.c:180
+#: ../calendar/gui/e-meeting-store.c:127 ../calendar/gui/e-meeting-store.c:144
+#: ../calendar/gui/print.c:1001
msgid "Non-Participant"
msgstr "Non-Participant"
-#: ../calendar/gui/e-meeting-list-view.c:203
-#: ../calendar/gui/e-meeting-store.c:172 ../calendar/gui/e-meeting-store.c:195
-#: ../calendar/gui/e-meeting-store.c:754
+#: ../calendar/gui/e-meeting-list-view.c:202
+#: ../calendar/gui/e-meeting-store.c:171 ../calendar/gui/e-meeting-store.c:194
+#: ../calendar/gui/e-meeting-store.c:753
msgid "Needs Action"
msgstr "Needs Action"
-#: ../calendar/gui/e-meeting-list-view.c:206
-#: ../calendar/gui/e-meeting-store.c:178 ../calendar/gui/e-meeting-store.c:201
-#: ../calendar/gui/e-meeting-time-sel.c:413
+#: ../calendar/gui/e-meeting-list-view.c:205
+#: ../calendar/gui/e-meeting-store.c:177 ../calendar/gui/e-meeting-store.c:200
+#: ../calendar/gui/e-meeting-time-sel.c:397
msgid "Tentative"
msgstr "Tentative"
-#: ../calendar/gui/e-meeting-list-view.c:207
-#: ../calendar/gui/e-meeting-store.c:180 ../calendar/gui/e-meeting-store.c:203
-#: ../calendar/gui/itip-utils.c:708
-#: ../plugins/itip-formatter/itip-formatter.c:2038
+#: ../calendar/gui/e-meeting-list-view.c:206
+#: ../calendar/gui/e-meeting-store.c:179 ../calendar/gui/e-meeting-store.c:202
+#: ../calendar/gui/itip-utils.c:673
+#: ../plugins/itip-formatter/itip-formatter.c:2043
msgid "Delegated"
msgstr "Delegated"
#. The extra space is just a hack to occupy more space for Attendee
-#: ../calendar/gui/e-meeting-list-view.c:492
+#: ../calendar/gui/e-meeting-list-view.c:491
msgid "Attendee "
msgstr "Attendee "
#. To translators: RSVP means "please reply"
-#: ../calendar/gui/e-meeting-list-view.c:534
+#: ../calendar/gui/e-meeting-list-view.c:533
#: ../calendar/gui/e-meeting-time-sel.etspec.h:8
msgid "RSVP"
msgstr "RSVP"
-#: ../calendar/gui/e-meeting-store.c:184 ../calendar/gui/e-meeting-store.c:207
+#: ../calendar/gui/e-meeting-store.c:183 ../calendar/gui/e-meeting-store.c:206
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:473
-#: ../calendar/gui/e-meeting-time-sel.c:2138
+#: ../calendar/gui/e-meeting-time-sel-item.c:472
+#: ../calendar/gui/e-meeting-time-sel.c:2122
msgid "%A, %B %d, %Y"
msgstr "%A, %d %B, %Y"
@@ -7832,85 +8187,81 @@ msgstr "%A, %d %B, %Y"
#. name, %m = month number, %d = month day, %Y = full year.
#. This is a strftime() format string %a = abbreviated weekday name,
#. %m = month number, %d = month day, %Y = full year.
-#: ../calendar/gui/e-meeting-time-sel-item.c:477
-#: ../calendar/gui/e-meeting-time-sel.c:2169
+#: ../calendar/gui/e-meeting-time-sel-item.c:476
+#: ../calendar/gui/e-meeting-time-sel.c:2153
msgid "%a %m/%d/%Y"
msgstr "%a %d/%m/%Y"
#. This is a strftime() format string %m = month number,
#. %d = month day, %Y = full year.
-#: ../calendar/gui/e-meeting-time-sel-item.c:481
+#: ../calendar/gui/e-meeting-time-sel-item.c:480
msgid "%m/%d/%Y"
msgstr "%d/%m/%Y"
-#: ../calendar/gui/e-meeting-time-sel.c:415
+#: ../calendar/gui/e-meeting-time-sel.c:399
msgid "Out of Office"
msgstr "Out of Office"
-#: ../calendar/gui/e-meeting-time-sel.c:416
+#: ../calendar/gui/e-meeting-time-sel.c:400
msgid "No Information"
msgstr "No Information"
-#: ../calendar/gui/e-meeting-time-sel.c:431
+#: ../calendar/gui/e-meeting-time-sel.c:415
msgid "A_ttendees..."
msgstr "A_ttendees..."
-#: ../calendar/gui/e-meeting-time-sel.c:452
+#: ../calendar/gui/e-meeting-time-sel.c:436
msgid "O_ptions"
msgstr "O_ptions"
-#: ../calendar/gui/e-meeting-time-sel.c:469
+#: ../calendar/gui/e-meeting-time-sel.c:453
msgid "Show _only working hours"
msgstr "Show _only working hours"
-#: ../calendar/gui/e-meeting-time-sel.c:479
+#: ../calendar/gui/e-meeting-time-sel.c:463
msgid "Show _zoomed out"
msgstr "Show _zoomed out"
-#: ../calendar/gui/e-meeting-time-sel.c:494
+#: ../calendar/gui/e-meeting-time-sel.c:478
msgid "_Update free/busy"
msgstr "_Update free/busy"
-#: ../calendar/gui/e-meeting-time-sel.c:509
+#: ../calendar/gui/e-meeting-time-sel.c:493
msgid "_<<"
msgstr "_<<"
-#: ../calendar/gui/e-meeting-time-sel.c:527
+#: ../calendar/gui/e-meeting-time-sel.c:511
msgid "_Autopick"
msgstr "_Autopick"
-#: ../calendar/gui/e-meeting-time-sel.c:542
+#: ../calendar/gui/e-meeting-time-sel.c:526
msgid ">_>"
msgstr ">_>"
-#: ../calendar/gui/e-meeting-time-sel.c:559
+#: ../calendar/gui/e-meeting-time-sel.c:543
msgid "_All people and resources"
msgstr "_All people and resources"
-#: ../calendar/gui/e-meeting-time-sel.c:568
+#: ../calendar/gui/e-meeting-time-sel.c:552
msgid "All _people and one resource"
msgstr "All _people and one resource"
-#: ../calendar/gui/e-meeting-time-sel.c:577
+#: ../calendar/gui/e-meeting-time-sel.c:561
msgid "_Required people"
msgstr "_Required people"
-#: ../calendar/gui/e-meeting-time-sel.c:586
+#: ../calendar/gui/e-meeting-time-sel.c:570
msgid "Required people and _one resource"
msgstr "Required people and _one resource"
-#: ../calendar/gui/e-meeting-time-sel.c:622
+#: ../calendar/gui/e-meeting-time-sel.c:606
msgid "_Start time:"
msgstr "_Start time:"
-#: ../calendar/gui/e-meeting-time-sel.c:649
+#: ../calendar/gui/e-meeting-time-sel.c:633
msgid "_End time:"
msgstr "_End time:"
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:1
-msgid "Attendee"
-msgstr "Attendee"
-
#: ../calendar/gui/e-meeting-time-sel.etspec.h:2
msgid "Click here to add an attendee"
msgstr "Click here to add an attendee"
@@ -7943,8 +8294,8 @@ msgstr "_Delete Selected Memos"
msgid "Click to add a memo"
msgstr "Click to add a memo"
-#: ../calendar/gui/e-memos.c:761 ../calendar/gui/e-tasks.c:911
-#: ../calendar/gui/gnome-cal.c:2865
+#: ../calendar/gui/e-memos.c:760 ../calendar/gui/e-tasks.c:910
+#: ../calendar/gui/gnome-cal.c:2961
#, c-format
msgid ""
"Error on %s:\n"
@@ -7953,84 +8304,80 @@ msgstr ""
"Error on %s:\n"
" %s"
-#: ../calendar/gui/e-memos.c:810
+#: ../calendar/gui/e-memos.c:809
msgid "Loading memos"
msgstr "Loading memos"
-#: ../calendar/gui/e-memos.c:891
+#: ../calendar/gui/e-memos.c:890
#, c-format
msgid "Opening memos at %s"
msgstr "Opening memos at %s"
-#: ../calendar/gui/e-memos.c:1063 ../calendar/gui/e-tasks.c:1322
+#: ../calendar/gui/e-memos.c:1062 ../calendar/gui/e-tasks.c:1321
msgid "Deleting selected objects..."
msgstr "Deleting selected objects..."
-#: ../calendar/gui/e-tasks.c:964
+#: ../calendar/gui/e-tasks.c:963
msgid "Loading tasks"
msgstr "Loading tasks"
-#: ../calendar/gui/e-tasks.c:1054
+#: ../calendar/gui/e-tasks.c:1053
#, c-format
msgid "Opening tasks at %s"
msgstr "Opening tasks at %s"
-#: ../calendar/gui/e-tasks.c:1299
+#: ../calendar/gui/e-tasks.c:1298
msgid "Completing tasks..."
msgstr "Completing tasks..."
-#: ../calendar/gui/e-tasks.c:1349
+#: ../calendar/gui/e-tasks.c:1348
msgid "Expunging"
msgstr "Expunging"
-#: ../calendar/gui/e-timezone-entry.c:134
+#: ../calendar/gui/e-timezone-entry.c:129
msgid "Select Timezone"
msgstr "Select Timezone"
#. 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:348 ../calendar/gui/print.c:1637
+#: ../calendar/gui/e-week-view-main-item.c:347 ../calendar/gui/print.c:1653
msgid "%d %B"
msgstr "%d %B"
-#: ../calendar/gui/gnome-cal.c:831
-msgid "Updating query"
-msgstr "Updating query"
-
-#: ../calendar/gui/gnome-cal.c:2502
+#: ../calendar/gui/gnome-cal.c:2576
msgid "_Custom View"
msgstr "_Custom View"
-#: ../calendar/gui/gnome-cal.c:2503
+#: ../calendar/gui/gnome-cal.c:2577
msgid "_Save Custom View"
msgstr "_Save Custom View"
-#: ../calendar/gui/gnome-cal.c:2508
+#: ../calendar/gui/gnome-cal.c:2582
msgid "_Define Views..."
msgstr "_Define Views..."
-#: ../calendar/gui/gnome-cal.c:2689
+#: ../calendar/gui/gnome-cal.c:2791
#, c-format
msgid "Loading appointments at %s"
msgstr "Loading appointments at %s"
-#: ../calendar/gui/gnome-cal.c:2708
+#: ../calendar/gui/gnome-cal.c:2806
#, c-format
msgid "Loading tasks at %s"
msgstr "Loading tasks at %s"
-#: ../calendar/gui/gnome-cal.c:2717
+#: ../calendar/gui/gnome-cal.c:2815
#, c-format
msgid "Loading memos at %s"
msgstr "Loading memos at %s"
-#: ../calendar/gui/gnome-cal.c:2824
+#: ../calendar/gui/gnome-cal.c:2920
#, c-format
msgid "Opening %s"
msgstr "Opening %s"
-#: ../calendar/gui/gnome-cal.c:3780
+#: ../calendar/gui/gnome-cal.c:3874
msgid "Purging"
msgstr "Purging"
@@ -8090,57 +8437,57 @@ msgstr "September"
msgid "_Select Today"
msgstr "_Select Today"
-#: ../calendar/gui/itip-utils.c:439 ../calendar/gui/itip-utils.c:491
-#: ../calendar/gui/itip-utils.c:579
+#: ../calendar/gui/itip-utils.c:404 ../calendar/gui/itip-utils.c:456
+#: ../calendar/gui/itip-utils.c:544
msgid "An organizer must be set."
msgstr "An organiser must be set."
-#: ../calendar/gui/itip-utils.c:483
+#: ../calendar/gui/itip-utils.c:448
msgid "At least one attendee is necessary"
msgstr "At least one attendee is necessary"
-#: ../calendar/gui/itip-utils.c:661 ../calendar/gui/itip-utils.c:776
+#: ../calendar/gui/itip-utils.c:626 ../calendar/gui/itip-utils.c:741
msgid "Event information"
msgstr "Event information"
-#: ../calendar/gui/itip-utils.c:663 ../calendar/gui/itip-utils.c:779
+#: ../calendar/gui/itip-utils.c:628 ../calendar/gui/itip-utils.c:744
msgid "Task information"
msgstr "Task information"
-#: ../calendar/gui/itip-utils.c:665 ../calendar/gui/itip-utils.c:782
+#: ../calendar/gui/itip-utils.c:630 ../calendar/gui/itip-utils.c:747
msgid "Memo information"
msgstr "Memo information"
-#: ../calendar/gui/itip-utils.c:667 ../calendar/gui/itip-utils.c:800
+#: ../calendar/gui/itip-utils.c:632 ../calendar/gui/itip-utils.c:765
msgid "Free/Busy information"
msgstr "Free/Busy information"
-#: ../calendar/gui/itip-utils.c:669
+#: ../calendar/gui/itip-utils.c:634
msgid "Calendar information"
msgstr "Calendar information"
-#: ../calendar/gui/itip-utils.c:718
+#: ../calendar/gui/itip-utils.c:683
msgid "Updated"
msgstr "Updated"
-#: ../calendar/gui/itip-utils.c:726
+#: ../calendar/gui/itip-utils.c:691
msgid "Refresh"
msgstr "Refresh"
-#: ../calendar/gui/itip-utils.c:730
+#: ../calendar/gui/itip-utils.c:695
msgid "Counter-proposal"
msgstr "Counter-proposal"
-#: ../calendar/gui/itip-utils.c:797
+#: ../calendar/gui/itip-utils.c:762
#, c-format
msgid "Free/Busy information (%s to %s)"
msgstr "Free/Busy information (%s to %s)"
-#: ../calendar/gui/itip-utils.c:805
+#: ../calendar/gui/itip-utils.c:770
msgid "iCalendar information"
msgstr "iCalendar information"
-#: ../calendar/gui/itip-utils.c:976
+#: ../calendar/gui/itip-utils.c:941
msgid "You must be an attendee of the event."
msgstr "You must be an attendee of the event."
@@ -8179,47 +8526,39 @@ msgstr "There is no calendar available for creating memos"
msgid "Memo Source Selector"
msgstr "Memo Source Selector"
-#: ../calendar/gui/memos-component.c:1259
+#: ../calendar/gui/memos-component.c:1260
msgid "New memo"
msgstr "New memo"
-#: ../calendar/gui/memos-component.c:1260
-msgid "Mem_o"
-msgstr "Mem_o"
-
-#: ../calendar/gui/memos-component.c:1261
+#: ../calendar/gui/memos-component.c:1262
msgid "Create a new memo"
msgstr "Create a new memo"
-#: ../calendar/gui/memos-component.c:1267
+#: ../calendar/gui/memos-component.c:1268
msgid "New shared memo"
msgstr "New shared memo"
-#: ../calendar/gui/memos-component.c:1268
-msgid "_Shared memo"
-msgstr "_Shared memo"
-
-#: ../calendar/gui/memos-component.c:1269
+#: ../calendar/gui/memos-component.c:1270
msgid "Create a shared new memo"
msgstr "Create a shared new memo"
-#: ../calendar/gui/memos-component.c:1275
+#: ../calendar/gui/memos-component.c:1276
msgid "New memo list"
msgstr "New memo list"
-#: ../calendar/gui/memos-component.c:1276
-msgid "Memo li_st"
-msgstr "Memo li_st"
-
-#: ../calendar/gui/memos-component.c:1277
+#: ../calendar/gui/memos-component.c:1278
msgid "Create a new memo list"
msgstr "Create a new memo list"
-#: ../calendar/gui/memos-control.c:356 ../calendar/gui/memos-control.c:372
+#: ../calendar/gui/memos-control.c:354 ../calendar/gui/memos-control.c:370
msgid "Print Memos"
msgstr "Print Memos"
-#: ../calendar/gui/migration.c:162
+#: ../calendar/gui/memotypes.xml.h:25
+msgid "Next 7 Days"
+msgstr "Next 7 Days"
+
+#: ../calendar/gui/migration.c:157
msgid ""
"The location and hierarchy of the Evolution task folders has changed since "
"Evolution 1.x.\n"
@@ -8231,7 +8570,7 @@ msgstr ""
"\n"
"Please be patient while Evolution migrates your folders..."
-#: ../calendar/gui/migration.c:166
+#: ../calendar/gui/migration.c:161
msgid ""
"The location and hierarchy of the Evolution calendar folders has changed "
"since Evolution 1.x.\n"
@@ -8244,27 +8583,27 @@ msgstr ""
"Please be patient while Evolution migrates your folders..."
#. FIXME: set proper domain/code
-#: ../calendar/gui/migration.c:780 ../calendar/gui/migration.c:948
+#: ../calendar/gui/migration.c:775 ../calendar/gui/migration.c:943
#, c-format
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:809
+#: ../calendar/gui/migration.c:804
#, c-format
msgid "Unable to migrate calendar `%s'"
msgstr "Unable to migrate calendar `%s'"
#. FIXME: domain/code
-#: ../calendar/gui/migration.c:977
+#: ../calendar/gui/migration.c:972
#, c-format
msgid "Unable to migrate tasks `%s'"
msgstr "Unable to migrate tasks `%s'"
-#: ../calendar/gui/migration.c:1232
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:427
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:458
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:571
+#: ../calendar/gui/migration.c:1227
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:426
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:457
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:570
msgid "Notes"
msgstr "Notes"
@@ -8421,57 +8760,52 @@ msgstr "Fr"
msgid "Sa"
msgstr "Sa"
-#: ../calendar/gui/print.c:2444
+#: ../calendar/gui/print.c:2472
msgid "Appointment"
msgstr "Appointment"
-#: ../calendar/gui/print.c:2446
+#: ../calendar/gui/print.c:2474
msgid "Task"
msgstr "Task"
-#: ../calendar/gui/print.c:2468
+#: ../calendar/gui/print.c:2499
#, c-format
msgid "Summary: %s"
msgstr "Summary: %s"
-#: ../calendar/gui/print.c:2490
+#: ../calendar/gui/print.c:2522
msgid "Attendees: "
msgstr "Attendees: "
-#: ../calendar/gui/print.c:2530
+#: ../calendar/gui/print.c:2562
#, c-format
msgid "Status: %s"
msgstr "Status: %s"
-#: ../calendar/gui/print.c:2547
+#: ../calendar/gui/print.c:2579
#, c-format
msgid "Priority: %s"
msgstr "Priority: %s"
-#: ../calendar/gui/print.c:2559
+#: ../calendar/gui/print.c:2591
#, c-format
msgid "Percent Complete: %i"
msgstr "Percent Complete: %i"
-#: ../calendar/gui/print.c:2571
+#: ../calendar/gui/print.c:2603
#, c-format
msgid "URL: %s"
msgstr "URL: %s"
-#: ../calendar/gui/print.c:2584
+#: ../calendar/gui/print.c:2616
#, c-format
msgid "Categories: %s"
msgstr "Categories: %s"
-#: ../calendar/gui/print.c:2595
+#: ../calendar/gui/print.c:2627
msgid "Contacts: "
msgstr "Contacts: "
-#. TODO Allow the user to customize the title.
-#: ../calendar/gui/print.c:2697
-msgid "Upcoming Appointments"
-msgstr "Upcoming Appointments"
-
#: ../calendar/gui/tasks-component.c:455
msgid "_New Task List"
msgstr "_New Task List"
@@ -8500,39 +8834,31 @@ msgstr "There is no calendar available for creating tasks"
msgid "Task Source Selector"
msgstr "Task Source Selector"
-#: ../calendar/gui/tasks-component.c:1326
+#: ../calendar/gui/tasks-component.c:1325
msgid "New task"
msgstr "New task"
-#: ../calendar/gui/tasks-component.c:1328
+#: ../calendar/gui/tasks-component.c:1327
msgid "Create a new task"
msgstr "Create a new task"
-#: ../calendar/gui/tasks-component.c:1334
+#: ../calendar/gui/tasks-component.c:1333
msgid "New assigned task"
msgstr "New assigned task"
#: ../calendar/gui/tasks-component.c:1335
-msgid "Assigne_d Task"
-msgstr "Assigne_d Task"
-
-#: ../calendar/gui/tasks-component.c:1336
msgid "Create a new assigned task"
msgstr "Create a new assigned task"
-#: ../calendar/gui/tasks-component.c:1342
+#: ../calendar/gui/tasks-component.c:1341
msgid "New task list"
msgstr "New task list"
#: ../calendar/gui/tasks-component.c:1343
-msgid "Tas_k list"
-msgstr "Tas_k list"
-
-#: ../calendar/gui/tasks-component.c:1344
msgid "Create a new task list"
msgstr "Create a new task list"
-#: ../calendar/gui/tasks-control.c:455
+#: ../calendar/gui/tasks-control.c:452
msgid ""
"This operation will permanently erase all tasks marked as completed. If you "
"continue, you will not be able to recover these tasks.\n"
@@ -8544,1579 +8870,1619 @@ msgstr ""
"\n"
"Really erase these tasks?"
-#: ../calendar/gui/tasks-control.c:458 ../mail/em-folder-view.c:1133
+#: ../calendar/gui/tasks-control.c:455 ../mail/em-folder-view.c:1126
msgid "Do not ask me again."
msgstr "Do not ask me again."
-#: ../calendar/gui/tasks-control.c:495 ../calendar/gui/tasks-control.c:511
+#: ../calendar/gui/tasks-control.c:492 ../calendar/gui/tasks-control.c:508
msgid "Print Tasks"
msgstr "Print Tasks"
-#: ../calendar/importers/icalendar-importer.c:79
+#: ../calendar/gui/tasktypes.xml.h:2
+#, no-c-format
+msgid "% Completed"
+msgstr "% Completed"
+
+#: ../calendar/gui/tasktypes.xml.h:10
+msgid "Cancelled"
+msgstr "Cancelled"
+
+#: ../calendar/gui/tasktypes.xml.h:26
+msgid "In progress"
+msgstr "In progress"
+
+#: ../calendar/gui/tasktypes.xml.h:50 ../mail/em-filter-i18n.h:34
+msgid "is greater than"
+msgstr "is greater than"
+
+#: ../calendar/gui/tasktypes.xml.h:51 ../mail/em-filter-i18n.h:35
+msgid "is less than"
+msgstr "is less than"
+
+#: ../calendar/importers/icalendar-importer.c:73
msgid "Appointments and Meetings"
msgstr "Appointments and Meetings"
-#: ../calendar/importers/icalendar-importer.c:337
-#: ../calendar/importers/icalendar-importer.c:620
-#: ../plugins/itip-formatter/itip-formatter.c:1573
+#: ../calendar/importers/icalendar-importer.c:331
+#: ../calendar/importers/icalendar-importer.c:614
+#: ../plugins/itip-formatter/itip-formatter.c:1577
msgid "Opening calendar"
msgstr "Opening calendar"
-#: ../calendar/importers/icalendar-importer.c:444
+#: ../calendar/importers/icalendar-importer.c:438
msgid "iCalendar files (.ics)"
msgstr "iCalendar files (.ics)"
-#: ../calendar/importers/icalendar-importer.c:445
+#: ../calendar/importers/icalendar-importer.c:439
msgid "Evolution iCalendar importer"
msgstr "Evolution iCalendar importer"
-#: ../calendar/importers/icalendar-importer.c:521
+#: ../calendar/importers/icalendar-importer.c:515
msgid "Reminder!"
msgstr "Reminder!"
-#: ../calendar/importers/icalendar-importer.c:573
+#: ../calendar/importers/icalendar-importer.c:567
msgid "vCalendar files (.vcf)"
msgstr "vCalendar files (.vcf)"
-#: ../calendar/importers/icalendar-importer.c:574
+#: ../calendar/importers/icalendar-importer.c:568
msgid "Evolution vCalendar importer"
msgstr "Evolution vCalendar importer"
-#: ../calendar/importers/icalendar-importer.c:736
+#: ../calendar/importers/icalendar-importer.c:730
msgid "Calendar Events"
msgstr "Calendar Events"
-#: ../calendar/importers/icalendar-importer.c:773
+#: ../calendar/importers/icalendar-importer.c:767
msgid "Evolution Calendar intelligent importer"
msgstr "Evolution Calendar intelligent importer"
#.
+#. *
+#. * This program is free software; you can redistribute it and/or
+#. * modify it under the terms of the GNU Lesser General Public
+#. * License as published by the Free Software Foundation; either
+#. * version 2 of the License, or (at your option) version 3.
+#. *
+#. * This program is distributed in the hope that it will be useful,
+#. * but WITHOUT ANY WARRANTY; without even the implied warranty of
+#. * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+#. * Lesser General Public License for more details.
+#. *
+#. * You should have received a copy of the GNU Lesser General Public
+#. * License along with the program; if not, see <http://www.gnu.org/licenses/>
+#. *
+#. *
+#. * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+#. *
+#.
+#.
#. * These are the timezone names from the Olson timezone data.
#. * 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:26
msgid "Africa/Abidjan"
msgstr "Africa/Abidjan"
-#: ../calendar/zones.h:8
+#: ../calendar/zones.h:27
msgid "Africa/Accra"
msgstr "Africa/Accra"
-#: ../calendar/zones.h:9
+#: ../calendar/zones.h:28
msgid "Africa/Addis_Ababa"
msgstr "Africa/Addis_Ababa"
-#: ../calendar/zones.h:10
+#: ../calendar/zones.h:29
msgid "Africa/Algiers"
msgstr "Africa/Algiers"
-#: ../calendar/zones.h:11
+#: ../calendar/zones.h:30
msgid "Africa/Asmera"
msgstr "Africa/Asmera"
-#: ../calendar/zones.h:12
+#: ../calendar/zones.h:31
msgid "Africa/Bamako"
msgstr "Africa/Bamako"
-#: ../calendar/zones.h:13
+#: ../calendar/zones.h:32
msgid "Africa/Bangui"
msgstr "Africa/Bangui"
-#: ../calendar/zones.h:14
+#: ../calendar/zones.h:33
msgid "Africa/Banjul"
msgstr "Africa/Banjul"
-#: ../calendar/zones.h:15
+#: ../calendar/zones.h:34
msgid "Africa/Bissau"
msgstr "Africa/Bissau"
-#: ../calendar/zones.h:16
+#: ../calendar/zones.h:35
msgid "Africa/Blantyre"
msgstr "Africa/Blantyre"
-#: ../calendar/zones.h:17
+#: ../calendar/zones.h:36
msgid "Africa/Brazzaville"
msgstr "Africa/Brazzaville"
-#: ../calendar/zones.h:18
+#: ../calendar/zones.h:37
msgid "Africa/Bujumbura"
msgstr "Africa/Bujumbura"
-#: ../calendar/zones.h:19
+#: ../calendar/zones.h:38
msgid "Africa/Cairo"
msgstr "Africa/Cairo"
-#: ../calendar/zones.h:20
+#: ../calendar/zones.h:39
msgid "Africa/Casablanca"
msgstr "Africa/Casablanca"
-#: ../calendar/zones.h:21
+#: ../calendar/zones.h:40
msgid "Africa/Ceuta"
msgstr "Africa/Ceuta"
-#: ../calendar/zones.h:22
+#: ../calendar/zones.h:41
msgid "Africa/Conakry"
msgstr "Africa/Conakry"
-#: ../calendar/zones.h:23
+#: ../calendar/zones.h:42
msgid "Africa/Dakar"
msgstr "Africa/Dakar"
-#: ../calendar/zones.h:24
+#: ../calendar/zones.h:43
msgid "Africa/Dar_es_Salaam"
msgstr "Africa/Dar_es_Salaam"
-#: ../calendar/zones.h:25
+#: ../calendar/zones.h:44
msgid "Africa/Djibouti"
msgstr "Africa/Djibouti"
-#: ../calendar/zones.h:26
+#: ../calendar/zones.h:45
msgid "Africa/Douala"
msgstr "Africa/Douala"
-#: ../calendar/zones.h:27
+#: ../calendar/zones.h:46
msgid "Africa/El_Aaiun"
msgstr "Africa/El_Aaiun"
-#: ../calendar/zones.h:28
+#: ../calendar/zones.h:47
msgid "Africa/Freetown"
msgstr "Africa/Freetown"
-#: ../calendar/zones.h:29
+#: ../calendar/zones.h:48
msgid "Africa/Gaborone"
msgstr "Africa/Gaborone"
-#: ../calendar/zones.h:30
+#: ../calendar/zones.h:49
msgid "Africa/Harare"
msgstr "Africa/Harare"
-#: ../calendar/zones.h:31
+#: ../calendar/zones.h:50
msgid "Africa/Johannesburg"
msgstr "Africa/Johannesburg"
-#: ../calendar/zones.h:32
+#: ../calendar/zones.h:51
msgid "Africa/Kampala"
msgstr "Africa/Kampala"
-#: ../calendar/zones.h:33
+#: ../calendar/zones.h:52
msgid "Africa/Khartoum"
msgstr "Africa/Khartoum"
-#: ../calendar/zones.h:34
+#: ../calendar/zones.h:53
msgid "Africa/Kigali"
msgstr "Africa/Kigali"
-#: ../calendar/zones.h:35
+#: ../calendar/zones.h:54
msgid "Africa/Kinshasa"
msgstr "Africa/Kinshasa"
-#: ../calendar/zones.h:36
+#: ../calendar/zones.h:55
msgid "Africa/Lagos"
msgstr "Africa/Lagos"
-#: ../calendar/zones.h:37
+#: ../calendar/zones.h:56
msgid "Africa/Libreville"
msgstr "Africa/Libreville"
-#: ../calendar/zones.h:38
+#: ../calendar/zones.h:57
msgid "Africa/Lome"
msgstr "Africa/Lome"
-#: ../calendar/zones.h:39
+#: ../calendar/zones.h:58
msgid "Africa/Luanda"
msgstr "Africa/Luanda"
-#: ../calendar/zones.h:40
+#: ../calendar/zones.h:59
msgid "Africa/Lubumbashi"
msgstr "Africa/Lubumbashi"
-#: ../calendar/zones.h:41
+#: ../calendar/zones.h:60
msgid "Africa/Lusaka"
msgstr "Africa/Lusaka"
-#: ../calendar/zones.h:42
+#: ../calendar/zones.h:61
msgid "Africa/Malabo"
msgstr "Africa/Malabo"
-#: ../calendar/zones.h:43
+#: ../calendar/zones.h:62
msgid "Africa/Maputo"
msgstr "Africa/Maputo"
-#: ../calendar/zones.h:44
+#: ../calendar/zones.h:63
msgid "Africa/Maseru"
msgstr "Africa/Maseru"
-#: ../calendar/zones.h:45
+#: ../calendar/zones.h:64
msgid "Africa/Mbabane"
msgstr "Africa/Mbabane"
-#: ../calendar/zones.h:46
+#: ../calendar/zones.h:65
msgid "Africa/Mogadishu"
msgstr "Africa/Mogadishu"
-#: ../calendar/zones.h:47
+#: ../calendar/zones.h:66
msgid "Africa/Monrovia"
msgstr "Africa/Monrovia"
-#: ../calendar/zones.h:48
+#: ../calendar/zones.h:67
msgid "Africa/Nairobi"
msgstr "Africa/Nairobi"
-#: ../calendar/zones.h:49
+#: ../calendar/zones.h:68
msgid "Africa/Ndjamena"
msgstr "Africa/Ndjamena"
-#: ../calendar/zones.h:50
+#: ../calendar/zones.h:69
msgid "Africa/Niamey"
msgstr "Africa/Niamey"
-#: ../calendar/zones.h:51
+#: ../calendar/zones.h:70
msgid "Africa/Nouakchott"
msgstr "Africa/Nouakchott"
-#: ../calendar/zones.h:52
+#: ../calendar/zones.h:71
msgid "Africa/Ouagadougou"
msgstr "Africa/Ouagadougou"
-#: ../calendar/zones.h:53
+#: ../calendar/zones.h:72
msgid "Africa/Porto-Novo"
msgstr "Africa/Porto-Novo"
-#: ../calendar/zones.h:54
+#: ../calendar/zones.h:73
msgid "Africa/Sao_Tome"
msgstr "Africa/Sao_Tome"
-#: ../calendar/zones.h:55
+#: ../calendar/zones.h:74
msgid "Africa/Timbuktu"
msgstr "Africa/Timbuktu"
-#: ../calendar/zones.h:56
+#: ../calendar/zones.h:75
msgid "Africa/Tripoli"
msgstr "Africa/Tripoli"
-#: ../calendar/zones.h:57
+#: ../calendar/zones.h:76
msgid "Africa/Tunis"
msgstr "Africa/Tunis"
-#: ../calendar/zones.h:58
+#: ../calendar/zones.h:77
msgid "Africa/Windhoek"
msgstr "Africa/Windhoek"
-#: ../calendar/zones.h:59
+#: ../calendar/zones.h:78
msgid "America/Adak"
msgstr "America/Adak"
-#: ../calendar/zones.h:60
+#: ../calendar/zones.h:79
msgid "America/Anchorage"
msgstr "America/Anchorage"
-#: ../calendar/zones.h:61
+#: ../calendar/zones.h:80
msgid "America/Anguilla"
msgstr "America/Anguilla"
-#: ../calendar/zones.h:62
+#: ../calendar/zones.h:81
msgid "America/Antigua"
msgstr "America/Antigua"
-#: ../calendar/zones.h:63
+#: ../calendar/zones.h:82
msgid "America/Araguaina"
msgstr "America/Araguaina"
-#: ../calendar/zones.h:64
+#: ../calendar/zones.h:83
msgid "America/Aruba"
msgstr "America/Aruba"
-#: ../calendar/zones.h:65
+#: ../calendar/zones.h:84
msgid "America/Asuncion"
msgstr "America/Asuncion"
-#: ../calendar/zones.h:66
+#: ../calendar/zones.h:85
msgid "America/Barbados"
msgstr "America/Barbados"
-#: ../calendar/zones.h:67
+#: ../calendar/zones.h:86
msgid "America/Belem"
msgstr "America/Belem"
-#: ../calendar/zones.h:68
+#: ../calendar/zones.h:87
msgid "America/Belize"
msgstr "America/Belize"
-#: ../calendar/zones.h:69
+#: ../calendar/zones.h:88
msgid "America/Boa_Vista"
msgstr "America/Boa_Vista"
-#: ../calendar/zones.h:70
+#: ../calendar/zones.h:89
msgid "America/Bogota"
msgstr "America/Bogota"
-#: ../calendar/zones.h:71
+#: ../calendar/zones.h:90
msgid "America/Boise"
msgstr "America/Boise"
-#: ../calendar/zones.h:72
+#: ../calendar/zones.h:91
msgid "America/Buenos_Aires"
msgstr "America/Buenos_Aires"
-#: ../calendar/zones.h:73
+#: ../calendar/zones.h:92
msgid "America/Cambridge_Bay"
msgstr "America/Cambridge_Bay"
-#: ../calendar/zones.h:74
+#: ../calendar/zones.h:93
msgid "America/Cancun"
msgstr "America/Cancun"
-#: ../calendar/zones.h:75
+#: ../calendar/zones.h:94
msgid "America/Caracas"
msgstr "America/Caracas"
-#: ../calendar/zones.h:76
+#: ../calendar/zones.h:95
msgid "America/Catamarca"
msgstr "America/Catamarca"
-#: ../calendar/zones.h:77
+#: ../calendar/zones.h:96
msgid "America/Cayenne"
msgstr "America/Cayenne"
-#: ../calendar/zones.h:78
+#: ../calendar/zones.h:97
msgid "America/Cayman"
msgstr "America/Cayman"
-#: ../calendar/zones.h:79
+#: ../calendar/zones.h:98
msgid "America/Chicago"
msgstr "America/Chicago"
-#: ../calendar/zones.h:80
+#: ../calendar/zones.h:99
msgid "America/Chihuahua"
msgstr "America/Chihuahua"
-#: ../calendar/zones.h:81
+#: ../calendar/zones.h:100
msgid "America/Cordoba"
msgstr "America/Cordoba"
-#: ../calendar/zones.h:82
+#: ../calendar/zones.h:101
msgid "America/Costa_Rica"
msgstr "America/Costa_Rica"
-#: ../calendar/zones.h:83
+#: ../calendar/zones.h:102
msgid "America/Cuiaba"
msgstr "America/Cuiaba"
-#: ../calendar/zones.h:84
+#: ../calendar/zones.h:103
msgid "America/Curacao"
msgstr "America/Curacao"
-#: ../calendar/zones.h:85
+#: ../calendar/zones.h:104
msgid "America/Danmarkshavn"
msgstr "America/Danmarkshavn"
-#: ../calendar/zones.h:86
+#: ../calendar/zones.h:105
msgid "America/Dawson"
msgstr "America/Dawson"
-#: ../calendar/zones.h:87
+#: ../calendar/zones.h:106
msgid "America/Dawson_Creek"
msgstr "America/Dawson_Creek"
-#: ../calendar/zones.h:88
+#: ../calendar/zones.h:107
msgid "America/Denver"
msgstr "America/Denver"
-#: ../calendar/zones.h:89
+#: ../calendar/zones.h:108
msgid "America/Detroit"
msgstr "America/Detroit"
-#: ../calendar/zones.h:90
+#: ../calendar/zones.h:109
msgid "America/Dominica"
msgstr "America/Dominica"
-#: ../calendar/zones.h:91
+#: ../calendar/zones.h:110
msgid "America/Edmonton"
msgstr "America/Edmonton"
-#: ../calendar/zones.h:92
+#: ../calendar/zones.h:111
msgid "America/Eirunepe"
msgstr "America/Eirunepe"
-#: ../calendar/zones.h:93
+#: ../calendar/zones.h:112
msgid "America/El_Salvador"
msgstr "America/El_Salvador"
-#: ../calendar/zones.h:94
+#: ../calendar/zones.h:113
msgid "America/Fortaleza"
msgstr "America/Fortaleza"
-#: ../calendar/zones.h:95
+#: ../calendar/zones.h:114
msgid "America/Glace_Bay"
msgstr "America/Glace_Bay"
-#: ../calendar/zones.h:96
+#: ../calendar/zones.h:115
msgid "America/Godthab"
msgstr "America/Godthab"
-#: ../calendar/zones.h:97
+#: ../calendar/zones.h:116
msgid "America/Goose_Bay"
msgstr "America/Goose_Bay"
-#: ../calendar/zones.h:98
+#: ../calendar/zones.h:117
msgid "America/Grand_Turk"
msgstr "America/Grand_Turk"
-#: ../calendar/zones.h:99
+#: ../calendar/zones.h:118
msgid "America/Grenada"
msgstr "America/Grenada"
-#: ../calendar/zones.h:100
+#: ../calendar/zones.h:119
msgid "America/Guadeloupe"
msgstr "America/Guadeloupe"
-#: ../calendar/zones.h:101
+#: ../calendar/zones.h:120
msgid "America/Guatemala"
msgstr "America/Guatemala"
-#: ../calendar/zones.h:102
+#: ../calendar/zones.h:121
msgid "America/Guayaquil"
msgstr "America/Guayaquil"
-#: ../calendar/zones.h:103
+#: ../calendar/zones.h:122
msgid "America/Guyana"
msgstr "America/Guyana"
-#: ../calendar/zones.h:104
+#: ../calendar/zones.h:123
msgid "America/Halifax"
msgstr "America/Halifax"
-#: ../calendar/zones.h:105
+#: ../calendar/zones.h:124
msgid "America/Havana"
msgstr "America/Havana"
-#: ../calendar/zones.h:106
+#: ../calendar/zones.h:125
msgid "America/Hermosillo"
msgstr "America/Hermosillo"
-#: ../calendar/zones.h:107
+#: ../calendar/zones.h:126
msgid "America/Indiana/Indianapolis"
msgstr "America/Indiana/Indianapolis"
-#: ../calendar/zones.h:108
+#: ../calendar/zones.h:127
msgid "America/Indiana/Knox"
msgstr "America/Indiana/Knox"
-#: ../calendar/zones.h:109
+#: ../calendar/zones.h:128
msgid "America/Indiana/Marengo"
msgstr "America/Indiana/Marengo"
-#: ../calendar/zones.h:110
+#: ../calendar/zones.h:129
msgid "America/Indiana/Vevay"
msgstr "America/Indiana/Vevay"
-#: ../calendar/zones.h:111
+#: ../calendar/zones.h:130
msgid "America/Indianapolis"
msgstr "America/Indianapolis"
-#: ../calendar/zones.h:112
+#: ../calendar/zones.h:131
msgid "America/Inuvik"
msgstr "America/Inuvik"
-#: ../calendar/zones.h:113
+#: ../calendar/zones.h:132
msgid "America/Iqaluit"
msgstr "America/Iqaluit"
-#: ../calendar/zones.h:114
+#: ../calendar/zones.h:133
msgid "America/Jamaica"
msgstr "America/Jamaica"
-#: ../calendar/zones.h:115
+#: ../calendar/zones.h:134
msgid "America/Jujuy"
msgstr "America/Jujuy"
-#: ../calendar/zones.h:116
+#: ../calendar/zones.h:135
msgid "America/Juneau"
msgstr "America/Juneau"
-#: ../calendar/zones.h:117
+#: ../calendar/zones.h:136
msgid "America/Kentucky/Louisville"
msgstr "America/Kentucky/Louisville"
-#: ../calendar/zones.h:118
+#: ../calendar/zones.h:137
msgid "America/Kentucky/Monticello"
msgstr "America/Kentucky/Monticello"
-#: ../calendar/zones.h:119
+#: ../calendar/zones.h:138
msgid "America/La_Paz"
msgstr "America/La_Paz"
-#: ../calendar/zones.h:120
+#: ../calendar/zones.h:139
msgid "America/Lima"
msgstr "America/Lima"
-#: ../calendar/zones.h:121
+#: ../calendar/zones.h:140
msgid "America/Los_Angeles"
msgstr "America/Los_Angeles"
-#: ../calendar/zones.h:122
+#: ../calendar/zones.h:141
msgid "America/Louisville"
msgstr "America/Louisville"
-#: ../calendar/zones.h:123
+#: ../calendar/zones.h:142
msgid "America/Maceio"
msgstr "America/Maceio"
-#: ../calendar/zones.h:124
+#: ../calendar/zones.h:143
msgid "America/Managua"
msgstr "America/Managua"
-#: ../calendar/zones.h:125
+#: ../calendar/zones.h:144
msgid "America/Manaus"
msgstr "America/Manaus"
-#: ../calendar/zones.h:126
+#: ../calendar/zones.h:145
msgid "America/Martinique"
msgstr "America/Martinique"
-#: ../calendar/zones.h:127
+#: ../calendar/zones.h:146
msgid "America/Mazatlan"
msgstr "America/Mazatlan"
-#: ../calendar/zones.h:128
+#: ../calendar/zones.h:147
msgid "America/Mendoza"
msgstr "America/Mendoza"
-#: ../calendar/zones.h:129
+#: ../calendar/zones.h:148
msgid "America/Menominee"
msgstr "America/Menominee"
-#: ../calendar/zones.h:130
+#: ../calendar/zones.h:149
msgid "America/Merida"
msgstr "America/Merida"
-#: ../calendar/zones.h:131
+#: ../calendar/zones.h:150
msgid "America/Mexico_City"
msgstr "America/Mexico_City"
-#: ../calendar/zones.h:132
+#: ../calendar/zones.h:151
msgid "America/Miquelon"
msgstr "America/Miquelon"
-#: ../calendar/zones.h:133
+#: ../calendar/zones.h:152
msgid "America/Monterrey"
msgstr "America/Monterrey"
-#: ../calendar/zones.h:134
+#: ../calendar/zones.h:153
msgid "America/Montevideo"
msgstr "America/Montevideo"
-#: ../calendar/zones.h:135
+#: ../calendar/zones.h:154
msgid "America/Montreal"
msgstr "America/Montreal"
-#: ../calendar/zones.h:136
+#: ../calendar/zones.h:155
msgid "America/Montserrat"
msgstr "America/Montserrat"
-#: ../calendar/zones.h:137
+#: ../calendar/zones.h:156
msgid "America/Nassau"
msgstr "America/Nassau"
-#: ../calendar/zones.h:138
+#: ../calendar/zones.h:157
#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:3
msgid "America/New_York"
msgstr "America/New_York"
-#: ../calendar/zones.h:139
+#: ../calendar/zones.h:158
msgid "America/Nipigon"
msgstr "America/Nipigon"
-#: ../calendar/zones.h:140
+#: ../calendar/zones.h:159
msgid "America/Nome"
msgstr "America/Nome"
-#: ../calendar/zones.h:141
+#: ../calendar/zones.h:160
msgid "America/Noronha"
msgstr "America/Noronha"
-#: ../calendar/zones.h:142
+#: ../calendar/zones.h:161
msgid "America/North_Dakota/Center"
msgstr "America/North_Dakota/Centre"
-#: ../calendar/zones.h:143
+#: ../calendar/zones.h:162
msgid "America/Panama"
msgstr "America/Panama"
-#: ../calendar/zones.h:144
+#: ../calendar/zones.h:163
msgid "America/Pangnirtung"
msgstr "America/Pangnirtung"
-#: ../calendar/zones.h:145
+#: ../calendar/zones.h:164
msgid "America/Paramaribo"
msgstr "America/Paramaribo"
-#: ../calendar/zones.h:146
+#: ../calendar/zones.h:165
msgid "America/Phoenix"
msgstr "America/Phoenix"
-#: ../calendar/zones.h:147
+#: ../calendar/zones.h:166
msgid "America/Port-au-Prince"
msgstr "America/Port-au-Prince"
-#: ../calendar/zones.h:148
+#: ../calendar/zones.h:167
msgid "America/Port_of_Spain"
msgstr "America/Port_of_Spain"
-#: ../calendar/zones.h:149
+#: ../calendar/zones.h:168
msgid "America/Porto_Velho"
msgstr "America/Porto_Velho"
-#: ../calendar/zones.h:150
+#: ../calendar/zones.h:169
msgid "America/Puerto_Rico"
msgstr "America/Puerto_Rico"
-#: ../calendar/zones.h:151
+#: ../calendar/zones.h:170
msgid "America/Rainy_River"
msgstr "America/Rainy_River"
-#: ../calendar/zones.h:152
+#: ../calendar/zones.h:171
msgid "America/Rankin_Inlet"
msgstr "America/Rankin_Inlet"
-#: ../calendar/zones.h:153
+#: ../calendar/zones.h:172
msgid "America/Recife"
msgstr "America/Recife"
-#: ../calendar/zones.h:154
+#: ../calendar/zones.h:173
msgid "America/Regina"
msgstr "America/Regina"
-#: ../calendar/zones.h:155
+#: ../calendar/zones.h:174
msgid "America/Rio_Branco"
msgstr "America/Rio_Branco"
-#: ../calendar/zones.h:156
+#: ../calendar/zones.h:175
msgid "America/Rosario"
msgstr "America/Rosario"
-#: ../calendar/zones.h:157
+#: ../calendar/zones.h:176
msgid "America/Santiago"
msgstr "America/Santiago"
-#: ../calendar/zones.h:158
+#: ../calendar/zones.h:177
msgid "America/Santo_Domingo"
msgstr "America/Santo_Domingo"
-#: ../calendar/zones.h:159
+#: ../calendar/zones.h:178
msgid "America/Sao_Paulo"
msgstr "America/Sao_Paulo"
-#: ../calendar/zones.h:160
+#: ../calendar/zones.h:179
msgid "America/Scoresbysund"
msgstr "America/Scoresbysund"
-#: ../calendar/zones.h:161
+#: ../calendar/zones.h:180
msgid "America/Shiprock"
msgstr "America/Shiprock"
-#: ../calendar/zones.h:162
+#: ../calendar/zones.h:181
msgid "America/St_Johns"
msgstr "America/St_Johns"
-#: ../calendar/zones.h:163
+#: ../calendar/zones.h:182
msgid "America/St_Kitts"
msgstr "America/St_Kitts"
-#: ../calendar/zones.h:164
+#: ../calendar/zones.h:183
msgid "America/St_Lucia"
msgstr "America/St_Lucia"
-#: ../calendar/zones.h:165
+#: ../calendar/zones.h:184
msgid "America/St_Thomas"
msgstr "America/St_Thomas"
-#: ../calendar/zones.h:166
+#: ../calendar/zones.h:185
msgid "America/St_Vincent"
msgstr "America/St_Vincent"
-#: ../calendar/zones.h:167
+#: ../calendar/zones.h:186
msgid "America/Swift_Current"
msgstr "America/Swift_Current"
-#: ../calendar/zones.h:168
+#: ../calendar/zones.h:187
msgid "America/Tegucigalpa"
msgstr "America/Tegucigalpa"
-#: ../calendar/zones.h:169
+#: ../calendar/zones.h:188
msgid "America/Thule"
msgstr "America/Thule"
-#: ../calendar/zones.h:170
+#: ../calendar/zones.h:189
msgid "America/Thunder_Bay"
msgstr "America/Thunder_Bay"
-#: ../calendar/zones.h:171
+#: ../calendar/zones.h:190
msgid "America/Tijuana"
msgstr "America/Tijuana"
-#: ../calendar/zones.h:172
+#: ../calendar/zones.h:191
msgid "America/Tortola"
msgstr "America/Tortola"
-#: ../calendar/zones.h:173
+#: ../calendar/zones.h:192
msgid "America/Vancouver"
msgstr "America/Vancouver"
-#: ../calendar/zones.h:174
+#: ../calendar/zones.h:193
msgid "America/Whitehorse"
msgstr "America/Whitehorse"
-#: ../calendar/zones.h:175
+#: ../calendar/zones.h:194
msgid "America/Winnipeg"
msgstr "America/Winnipeg"
-#: ../calendar/zones.h:176
+#: ../calendar/zones.h:195
msgid "America/Yakutat"
msgstr "America/Yakutat"
-#: ../calendar/zones.h:177
+#: ../calendar/zones.h:196
msgid "America/Yellowknife"
msgstr "America/Yellowknife"
-#: ../calendar/zones.h:178
+#: ../calendar/zones.h:197
msgid "Antarctica/Casey"
msgstr "Antarctica/Casey"
-#: ../calendar/zones.h:179
+#: ../calendar/zones.h:198
msgid "Antarctica/Davis"
msgstr "Antarctica/Davis"
-#: ../calendar/zones.h:180
+#: ../calendar/zones.h:199
msgid "Antarctica/DumontDUrville"
msgstr "Antarctica/DumontDUrville"
-#: ../calendar/zones.h:181
+#: ../calendar/zones.h:200
msgid "Antarctica/Mawson"
msgstr "Antarctica/Mawson"
-#: ../calendar/zones.h:182
+#: ../calendar/zones.h:201
msgid "Antarctica/McMurdo"
msgstr "Antarctica/McMurdo"
-#: ../calendar/zones.h:183
+#: ../calendar/zones.h:202
msgid "Antarctica/Palmer"
msgstr "Antarctica/Palmer"
-#: ../calendar/zones.h:184
+#: ../calendar/zones.h:203
msgid "Antarctica/South_Pole"
msgstr "Antarctica/South_Pole"
-#: ../calendar/zones.h:185
+#: ../calendar/zones.h:204
msgid "Antarctica/Syowa"
msgstr "Antarctica/Syowa"
-#: ../calendar/zones.h:186
+#: ../calendar/zones.h:205
msgid "Antarctica/Vostok"
msgstr "Antarctica/Vostok"
-#: ../calendar/zones.h:187
+#: ../calendar/zones.h:206
msgid "Arctic/Longyearbyen"
msgstr "Arctic/Longyearbyen"
-#: ../calendar/zones.h:188
+#: ../calendar/zones.h:207
msgid "Asia/Aden"
msgstr "Asia/Aden"
-#: ../calendar/zones.h:189
+#: ../calendar/zones.h:208
msgid "Asia/Almaty"
msgstr "Asia/Almaty"
-#: ../calendar/zones.h:190
+#: ../calendar/zones.h:209
msgid "Asia/Amman"
msgstr "Asia/Amman"
-#: ../calendar/zones.h:191
+#: ../calendar/zones.h:210
msgid "Asia/Anadyr"
msgstr "Asia/Anadyr"
-#: ../calendar/zones.h:192
+#: ../calendar/zones.h:211
msgid "Asia/Aqtau"
msgstr "Asia/Aqtau"
-#: ../calendar/zones.h:193
+#: ../calendar/zones.h:212
msgid "Asia/Aqtobe"
msgstr "Asia/Aqtobe"
-#: ../calendar/zones.h:194
+#: ../calendar/zones.h:213
msgid "Asia/Ashgabat"
msgstr "Asia/Ashgabat"
-#: ../calendar/zones.h:195
+#: ../calendar/zones.h:214
msgid "Asia/Baghdad"
msgstr "Asia/Baghdad"
-#: ../calendar/zones.h:196
+#: ../calendar/zones.h:215
msgid "Asia/Bahrain"
msgstr "Asia/Bahrain"
-#: ../calendar/zones.h:197
+#: ../calendar/zones.h:216
msgid "Asia/Baku"
msgstr "Asia/Baku"
-#: ../calendar/zones.h:198
+#: ../calendar/zones.h:217
msgid "Asia/Bangkok"
msgstr "Asia/Bangkok"
-#: ../calendar/zones.h:199
+#: ../calendar/zones.h:218
msgid "Asia/Beirut"
msgstr "Asia/Beirut"
-#: ../calendar/zones.h:200
+#: ../calendar/zones.h:219
msgid "Asia/Bishkek"
msgstr "Asia/Bishkek"
-#: ../calendar/zones.h:201
+#: ../calendar/zones.h:220
msgid "Asia/Brunei"
msgstr "Asia/Brunei"
-#: ../calendar/zones.h:202
+#: ../calendar/zones.h:221
msgid "Asia/Calcutta"
msgstr "Asia/Calcutta"
-#: ../calendar/zones.h:203
+#: ../calendar/zones.h:222
msgid "Asia/Choibalsan"
msgstr "Asia/Choibalsan"
-#: ../calendar/zones.h:204
+#: ../calendar/zones.h:223
msgid "Asia/Chongqing"
msgstr "Asia/Chongqing"
-#: ../calendar/zones.h:205
+#: ../calendar/zones.h:224
msgid "Asia/Colombo"
msgstr "Asia/Colombo"
-#: ../calendar/zones.h:206
+#: ../calendar/zones.h:225
msgid "Asia/Damascus"
msgstr "Asia/Damascus"
-#: ../calendar/zones.h:207
+#: ../calendar/zones.h:226
msgid "Asia/Dhaka"
msgstr "Asia/Dhaka"
-#: ../calendar/zones.h:208
+#: ../calendar/zones.h:227
msgid "Asia/Dili"
msgstr "Asia/Dili"
-#: ../calendar/zones.h:209
+#: ../calendar/zones.h:228
msgid "Asia/Dubai"
msgstr "Asia/Dubai"
-#: ../calendar/zones.h:210
+#: ../calendar/zones.h:229
msgid "Asia/Dushanbe"
msgstr "Asia/Dushanbe"
-#: ../calendar/zones.h:211
+#: ../calendar/zones.h:230
msgid "Asia/Gaza"
msgstr "Asia/Gaza"
-#: ../calendar/zones.h:212
+#: ../calendar/zones.h:231
msgid "Asia/Harbin"
msgstr "Asia/Harbin"
-#: ../calendar/zones.h:213
+#: ../calendar/zones.h:232
msgid "Asia/Hong_Kong"
msgstr "Asia/Hong_Kong"
-#: ../calendar/zones.h:214
+#: ../calendar/zones.h:233
msgid "Asia/Hovd"
msgstr "Asia/Hovd"
-#: ../calendar/zones.h:215
+#: ../calendar/zones.h:234
msgid "Asia/Irkutsk"
msgstr "Asia/Irkutsk"
-#: ../calendar/zones.h:216
+#: ../calendar/zones.h:235
msgid "Asia/Istanbul"
msgstr "Asia/Istanbul"
-#: ../calendar/zones.h:217
+#: ../calendar/zones.h:236
msgid "Asia/Jakarta"
msgstr "Asia/Jakarta"
-#: ../calendar/zones.h:218
+#: ../calendar/zones.h:237
msgid "Asia/Jayapura"
msgstr "Asia/Jayapura"
-#: ../calendar/zones.h:219
+#: ../calendar/zones.h:238
msgid "Asia/Jerusalem"
msgstr "Asia/Jerusalem"
-#: ../calendar/zones.h:220
+#: ../calendar/zones.h:239
msgid "Asia/Kabul"
msgstr "Asia/Kabul"
-#: ../calendar/zones.h:221
+#: ../calendar/zones.h:240
msgid "Asia/Kamchatka"
msgstr "Asia/Kamchatka"
-#: ../calendar/zones.h:222
+#: ../calendar/zones.h:241
msgid "Asia/Karachi"
msgstr "Asia/Karachi"
-#: ../calendar/zones.h:223
+#: ../calendar/zones.h:242
msgid "Asia/Kashgar"
msgstr "Asia/Kashgar"
-#: ../calendar/zones.h:224
+#: ../calendar/zones.h:243
msgid "Asia/Katmandu"
msgstr "Asia/Katmandu"
-#: ../calendar/zones.h:225
+#: ../calendar/zones.h:244
msgid "Asia/Krasnoyarsk"
msgstr "Asia/Krasnoyarsk"
-#: ../calendar/zones.h:226
+#: ../calendar/zones.h:245
msgid "Asia/Kuala_Lumpur"
msgstr "Asia/Kuala_Lumpur"
-#: ../calendar/zones.h:227
+#: ../calendar/zones.h:246
msgid "Asia/Kuching"
msgstr "Asia/Kuching"
-#: ../calendar/zones.h:228
+#: ../calendar/zones.h:247
msgid "Asia/Kuwait"
msgstr "Asia/Kuwait"
-#: ../calendar/zones.h:229
+#: ../calendar/zones.h:248
msgid "Asia/Macao"
msgstr "Asia/Macao"
-#: ../calendar/zones.h:230
+#: ../calendar/zones.h:249
msgid "Asia/Macau"
msgstr "Asia/Macau"
-#: ../calendar/zones.h:231
+#: ../calendar/zones.h:250
msgid "Asia/Magadan"
msgstr "Asia/Magadan"
-#: ../calendar/zones.h:232
+#: ../calendar/zones.h:251
msgid "Asia/Makassar"
msgstr "Asia/Makassar"
-#: ../calendar/zones.h:233
+#: ../calendar/zones.h:252
msgid "Asia/Manila"
msgstr "Asia/Manila"
-#: ../calendar/zones.h:234
+#: ../calendar/zones.h:253
msgid "Asia/Muscat"
msgstr "Asia/Muscat"
-#: ../calendar/zones.h:235
+#: ../calendar/zones.h:254
msgid "Asia/Nicosia"
msgstr "Asia/Nicosia"
-#: ../calendar/zones.h:236
+#: ../calendar/zones.h:255
msgid "Asia/Novosibirsk"
msgstr "Asia/Novosibirsk"
-#: ../calendar/zones.h:237
+#: ../calendar/zones.h:256
msgid "Asia/Omsk"
msgstr "Asia/Omsk"
-#: ../calendar/zones.h:238
+#: ../calendar/zones.h:257
msgid "Asia/Oral"
msgstr "Asia/Oral"
-#: ../calendar/zones.h:239
+#: ../calendar/zones.h:258
msgid "Asia/Phnom_Penh"
msgstr "Asia/Phnom_Penh"
-#: ../calendar/zones.h:240
+#: ../calendar/zones.h:259
msgid "Asia/Pontianak"
msgstr "Asia/Pontianak"
-#: ../calendar/zones.h:241
+#: ../calendar/zones.h:260
msgid "Asia/Pyongyang"
msgstr "Asia/Pyongyang"
-#: ../calendar/zones.h:242
+#: ../calendar/zones.h:261
msgid "Asia/Qatar"
msgstr "Asia/Qatar"
-#: ../calendar/zones.h:243
+#: ../calendar/zones.h:262
msgid "Asia/Qyzylorda"
msgstr "Asia/Qyzylorda"
-#: ../calendar/zones.h:244
+#: ../calendar/zones.h:263
msgid "Asia/Rangoon"
msgstr "Asia/Rangoon"
-#: ../calendar/zones.h:245
+#: ../calendar/zones.h:264
msgid "Asia/Riyadh"
msgstr "Asia/Riyadh"
-#: ../calendar/zones.h:246
+#: ../calendar/zones.h:265
msgid "Asia/Saigon"
msgstr "Asia/Saigon"
-#: ../calendar/zones.h:247
+#: ../calendar/zones.h:266
msgid "Asia/Sakhalin"
msgstr "Asia/Sakhalin"
-#: ../calendar/zones.h:248
+#: ../calendar/zones.h:267
msgid "Asia/Samarkand"
msgstr "Asia/Samarkand"
-#: ../calendar/zones.h:249
+#: ../calendar/zones.h:268
msgid "Asia/Seoul"
msgstr "Asia/Seoul"
-#: ../calendar/zones.h:250
+#: ../calendar/zones.h:269
msgid "Asia/Shanghai"
msgstr "Asia/Shanghai"
-#: ../calendar/zones.h:251
+#: ../calendar/zones.h:270
msgid "Asia/Singapore"
msgstr "Asia/Singapore"
-#: ../calendar/zones.h:252
+#: ../calendar/zones.h:271
msgid "Asia/Taipei"
msgstr "Asia/Taipei"
-#: ../calendar/zones.h:253
+#: ../calendar/zones.h:272
msgid "Asia/Tashkent"
msgstr "Asia/Tashkent"
-#: ../calendar/zones.h:254
+#: ../calendar/zones.h:273
msgid "Asia/Tbilisi"
msgstr "Asia/Tbilisi"
-#: ../calendar/zones.h:255
+#: ../calendar/zones.h:274
msgid "Asia/Tehran"
msgstr "Asia/Tehran"
-#: ../calendar/zones.h:256
+#: ../calendar/zones.h:275
msgid "Asia/Thimphu"
msgstr "Asia/Thimphu"
-#: ../calendar/zones.h:257
+#: ../calendar/zones.h:276
msgid "Asia/Tokyo"
msgstr "Asia/Tokyo"
-#: ../calendar/zones.h:258
+#: ../calendar/zones.h:277
msgid "Asia/Ujung_Pandang"
msgstr "Asia/Ujung_Pandang"
-#: ../calendar/zones.h:259
+#: ../calendar/zones.h:278
msgid "Asia/Ulaanbaatar"
msgstr "Asia/Ulaanbaatar"
-#: ../calendar/zones.h:260
+#: ../calendar/zones.h:279
msgid "Asia/Urumqi"
msgstr "Asia/Urumqi"
-#: ../calendar/zones.h:261
+#: ../calendar/zones.h:280
msgid "Asia/Vientiane"
msgstr "Asia/Vientiane"
-#: ../calendar/zones.h:262
+#: ../calendar/zones.h:281
msgid "Asia/Vladivostok"
msgstr "Asia/Vladivostok"
-#: ../calendar/zones.h:263
+#: ../calendar/zones.h:282
msgid "Asia/Yakutsk"
msgstr "Asia/Yakutsk"
-#: ../calendar/zones.h:264
+#: ../calendar/zones.h:283
msgid "Asia/Yekaterinburg"
msgstr "Asia/Yekaterinburg"
-#: ../calendar/zones.h:265
+#: ../calendar/zones.h:284
msgid "Asia/Yerevan"
msgstr "Asia/Yerevan"
-#: ../calendar/zones.h:266
+#: ../calendar/zones.h:285
msgid "Atlantic/Azores"
msgstr "Atlantic/Azores"
-#: ../calendar/zones.h:267
+#: ../calendar/zones.h:286
msgid "Atlantic/Bermuda"
msgstr "Atlantic/Bermuda"
-#: ../calendar/zones.h:268
+#: ../calendar/zones.h:287
msgid "Atlantic/Canary"
msgstr "Atlantic/Canary"
-#: ../calendar/zones.h:269
+#: ../calendar/zones.h:288
msgid "Atlantic/Cape_Verde"
msgstr "Atlantic/Cape_Verde"
-#: ../calendar/zones.h:270
+#: ../calendar/zones.h:289
msgid "Atlantic/Faeroe"
msgstr "Atlantic/Faeroe"
-#: ../calendar/zones.h:271
+#: ../calendar/zones.h:290
msgid "Atlantic/Jan_Mayen"
msgstr "Atlantic/Jan_Mayen"
-#: ../calendar/zones.h:272
+#: ../calendar/zones.h:291
msgid "Atlantic/Madeira"
msgstr "Atlantic/Madeira"
-#: ../calendar/zones.h:273
+#: ../calendar/zones.h:292
msgid "Atlantic/Reykjavik"
msgstr "Atlantic/Reykjavik"
-#: ../calendar/zones.h:274
+#: ../calendar/zones.h:293
msgid "Atlantic/South_Georgia"
msgstr "Atlantic/South_Georgia"
-#: ../calendar/zones.h:275
+#: ../calendar/zones.h:294
msgid "Atlantic/St_Helena"
msgstr "Atlantic/St_Helena"
-#: ../calendar/zones.h:276
+#: ../calendar/zones.h:295
msgid "Atlantic/Stanley"
msgstr "Atlantic/Stanley"
-#: ../calendar/zones.h:277
+#: ../calendar/zones.h:296
msgid "Australia/Adelaide"
msgstr "Australia/Adelaide"
-#: ../calendar/zones.h:278
+#: ../calendar/zones.h:297
msgid "Australia/Brisbane"
msgstr "Australia/Brisbane"
-#: ../calendar/zones.h:279
+#: ../calendar/zones.h:298
msgid "Australia/Broken_Hill"
msgstr "Australia/Broken_Hill"
-#: ../calendar/zones.h:280
+#: ../calendar/zones.h:299
msgid "Australia/Darwin"
msgstr "Australia/Darwin"
-#: ../calendar/zones.h:281
+#: ../calendar/zones.h:300
msgid "Australia/Hobart"
msgstr "Australia/Hobart"
-#: ../calendar/zones.h:282
+#: ../calendar/zones.h:301
msgid "Australia/Lindeman"
msgstr "Australia/Lindeman"
-#: ../calendar/zones.h:283
+#: ../calendar/zones.h:302
msgid "Australia/Lord_Howe"
msgstr "Australia/Lord_Howe"
-#: ../calendar/zones.h:284
+#: ../calendar/zones.h:303
msgid "Australia/Melbourne"
msgstr "Australia/Melbourne"
-#: ../calendar/zones.h:285
+#: ../calendar/zones.h:304
msgid "Australia/Perth"
msgstr "Australia/Perth"
-#: ../calendar/zones.h:286
+#: ../calendar/zones.h:305
msgid "Australia/Sydney"
msgstr "Australia/Sydney"
-#: ../calendar/zones.h:287
+#: ../calendar/zones.h:306
msgid "Europe/Amsterdam"
msgstr "Europe/Amsterdam"
-#: ../calendar/zones.h:288
+#: ../calendar/zones.h:307
msgid "Europe/Andorra"
msgstr "Europe/Andorra"
-#: ../calendar/zones.h:289
+#: ../calendar/zones.h:308
msgid "Europe/Athens"
msgstr "Europe/Athens"
-#: ../calendar/zones.h:290
+#: ../calendar/zones.h:309
msgid "Europe/Belfast"
msgstr "Europe/Belfast"
-#: ../calendar/zones.h:291
+#: ../calendar/zones.h:310
msgid "Europe/Belgrade"
msgstr "Europe/Belgrade"
-#: ../calendar/zones.h:292
+#: ../calendar/zones.h:311
msgid "Europe/Berlin"
msgstr "Europe/Berlin"
-#: ../calendar/zones.h:293
+#: ../calendar/zones.h:312
msgid "Europe/Bratislava"
msgstr "Europe/Bratislava"
-#: ../calendar/zones.h:294
+#: ../calendar/zones.h:313
msgid "Europe/Brussels"
msgstr "Europe/Brussels"
-#: ../calendar/zones.h:295
+#: ../calendar/zones.h:314
msgid "Europe/Bucharest"
msgstr "Europe/Bucharest"
-#: ../calendar/zones.h:296
+#: ../calendar/zones.h:315
msgid "Europe/Budapest"
msgstr "Europe/Budapest"
-#: ../calendar/zones.h:297
+#: ../calendar/zones.h:316
msgid "Europe/Chisinau"
msgstr "Europe/Chisinau"
-#: ../calendar/zones.h:298
+#: ../calendar/zones.h:317
msgid "Europe/Copenhagen"
msgstr "Europe/Copenhagen"
-#: ../calendar/zones.h:299
+#: ../calendar/zones.h:318
msgid "Europe/Dublin"
msgstr "Europe/Dublin"
-#: ../calendar/zones.h:300
+#: ../calendar/zones.h:319
msgid "Europe/Gibraltar"
msgstr "Europe/Gibraltar"
-#: ../calendar/zones.h:301
+#: ../calendar/zones.h:320
msgid "Europe/Helsinki"
msgstr "Europe/Helsinki"
-#: ../calendar/zones.h:302
+#: ../calendar/zones.h:321
msgid "Europe/Istanbul"
msgstr "Europe/Istanbul"
-#: ../calendar/zones.h:303
+#: ../calendar/zones.h:322
msgid "Europe/Kaliningrad"
msgstr "Europe/Kaliningrad"
-#: ../calendar/zones.h:304
+#: ../calendar/zones.h:323
msgid "Europe/Kiev"
msgstr "Europe/Kiev"
-#: ../calendar/zones.h:305
+#: ../calendar/zones.h:324
msgid "Europe/Lisbon"
msgstr "Europe/Lisbon"
-#: ../calendar/zones.h:306
+#: ../calendar/zones.h:325
msgid "Europe/Ljubljana"
msgstr "Europe/Ljubljana"
-#: ../calendar/zones.h:307
+#: ../calendar/zones.h:326
msgid "Europe/London"
msgstr "Europe/London"
-#: ../calendar/zones.h:308
+#: ../calendar/zones.h:327
msgid "Europe/Luxembourg"
msgstr "Europe/Luxembourg"
-#: ../calendar/zones.h:309
+#: ../calendar/zones.h:328
msgid "Europe/Madrid"
msgstr "Europe/Madrid"
-#: ../calendar/zones.h:310
+#: ../calendar/zones.h:329
msgid "Europe/Malta"
msgstr "Europe/Malta"
-#: ../calendar/zones.h:311
+#: ../calendar/zones.h:330
msgid "Europe/Minsk"
msgstr "Europe/Minsk"
-#: ../calendar/zones.h:312
+#: ../calendar/zones.h:331
msgid "Europe/Monaco"
msgstr "Europe/Monaco"
-#: ../calendar/zones.h:313
+#: ../calendar/zones.h:332
msgid "Europe/Moscow"
msgstr "Europe/Moscow"
-#: ../calendar/zones.h:314
+#: ../calendar/zones.h:333
msgid "Europe/Nicosia"
msgstr "Europe/Nicosia"
-#: ../calendar/zones.h:315
+#: ../calendar/zones.h:334
msgid "Europe/Oslo"
msgstr "Europe/Oslo"
-#: ../calendar/zones.h:316
+#: ../calendar/zones.h:335
msgid "Europe/Paris"
msgstr "Europe/Paris"
-#: ../calendar/zones.h:317
+#: ../calendar/zones.h:336
msgid "Europe/Prague"
msgstr "Europe/Prague"
-#: ../calendar/zones.h:318
+#: ../calendar/zones.h:337
msgid "Europe/Riga"
msgstr "Europe/Riga"
-#: ../calendar/zones.h:319
+#: ../calendar/zones.h:338
msgid "Europe/Rome"
msgstr "Europe/Rome"
-#: ../calendar/zones.h:320
+#: ../calendar/zones.h:339
msgid "Europe/Samara"
msgstr "Europe/Samara"
-#: ../calendar/zones.h:321
+#: ../calendar/zones.h:340
msgid "Europe/San_Marino"
msgstr "Europe/San_Marino"
-#: ../calendar/zones.h:322
+#: ../calendar/zones.h:341
msgid "Europe/Sarajevo"
msgstr "Europe/Sarajevo"
-#: ../calendar/zones.h:323
+#: ../calendar/zones.h:342
msgid "Europe/Simferopol"
msgstr "Europe/Simferopol"
-#: ../calendar/zones.h:324
+#: ../calendar/zones.h:343
msgid "Europe/Skopje"
msgstr "Europe/Skopje"
-#: ../calendar/zones.h:325
+#: ../calendar/zones.h:344
msgid "Europe/Sofia"
msgstr "Europe/Sofia"
-#: ../calendar/zones.h:326
+#: ../calendar/zones.h:345
msgid "Europe/Stockholm"
msgstr "Europe/Stockholm"
-#: ../calendar/zones.h:327
+#: ../calendar/zones.h:346
msgid "Europe/Tallinn"
msgstr "Europe/Tallinn"
-#: ../calendar/zones.h:328
+#: ../calendar/zones.h:347
msgid "Europe/Tirane"
msgstr "Europe/Tirane"
-#: ../calendar/zones.h:329
+#: ../calendar/zones.h:348
msgid "Europe/Uzhgorod"
msgstr "Europe/Uzhgorod"
-#: ../calendar/zones.h:330
+#: ../calendar/zones.h:349
msgid "Europe/Vaduz"
msgstr "Europe/Vaduz"
-#: ../calendar/zones.h:331
+#: ../calendar/zones.h:350
msgid "Europe/Vatican"
msgstr "Europe/Vatican"
-#: ../calendar/zones.h:332
+#: ../calendar/zones.h:351
msgid "Europe/Vienna"
msgstr "Europe/Vienna"
-#: ../calendar/zones.h:333
+#: ../calendar/zones.h:352
msgid "Europe/Vilnius"
msgstr "Europe/Vilnius"
-#: ../calendar/zones.h:334
+#: ../calendar/zones.h:353
msgid "Europe/Warsaw"
msgstr "Europe/Warsaw"
-#: ../calendar/zones.h:335
+#: ../calendar/zones.h:354
msgid "Europe/Zagreb"
msgstr "Europe/Zagreb"
-#: ../calendar/zones.h:336
+#: ../calendar/zones.h:355
msgid "Europe/Zaporozhye"
msgstr "Europe/Zaporozhye"
-#: ../calendar/zones.h:337
+#: ../calendar/zones.h:356
msgid "Europe/Zurich"
msgstr "Europe/Zurich"
-#: ../calendar/zones.h:338
+#: ../calendar/zones.h:357
msgid "Indian/Antananarivo"
msgstr "Indian/Antananarivo"
-#: ../calendar/zones.h:339
+#: ../calendar/zones.h:358
msgid "Indian/Chagos"
msgstr "Indian/Chagos"
-#: ../calendar/zones.h:340
+#: ../calendar/zones.h:359
msgid "Indian/Christmas"
msgstr "Indian/Christmas"
-#: ../calendar/zones.h:341
+#: ../calendar/zones.h:360
msgid "Indian/Cocos"
msgstr "Indian/Cocos"
-#: ../calendar/zones.h:342
+#: ../calendar/zones.h:361
msgid "Indian/Comoro"
msgstr "Indian/Comoro"
-#: ../calendar/zones.h:343
+#: ../calendar/zones.h:362
msgid "Indian/Kerguelen"
msgstr "Indian/Kerguelen"
-#: ../calendar/zones.h:344
+#: ../calendar/zones.h:363
msgid "Indian/Mahe"
msgstr "Indian/Mahe"
-#: ../calendar/zones.h:345
+#: ../calendar/zones.h:364
msgid "Indian/Maldives"
msgstr "Indian/Maldives"
-#: ../calendar/zones.h:346
+#: ../calendar/zones.h:365
msgid "Indian/Mauritius"
msgstr "Indian/Mauritius"
-#: ../calendar/zones.h:347
+#: ../calendar/zones.h:366
msgid "Indian/Mayotte"
msgstr "Indian/Mayotte"
-#: ../calendar/zones.h:348
+#: ../calendar/zones.h:367
msgid "Indian/Reunion"
msgstr "Indian/Reunion"
-#: ../calendar/zones.h:349
+#: ../calendar/zones.h:368
msgid "Pacific/Apia"
msgstr "Pacific/Apia"
-#: ../calendar/zones.h:350
+#: ../calendar/zones.h:369
msgid "Pacific/Auckland"
msgstr "Pacific/Auckland"
-#: ../calendar/zones.h:351
+#: ../calendar/zones.h:370
msgid "Pacific/Chatham"
msgstr "Pacific/Chatham"
-#: ../calendar/zones.h:352
+#: ../calendar/zones.h:371
msgid "Pacific/Easter"
msgstr "Pacific/Easter"
-#: ../calendar/zones.h:353
+#: ../calendar/zones.h:372
msgid "Pacific/Efate"
msgstr "Pacific/Efate"
-#: ../calendar/zones.h:354
+#: ../calendar/zones.h:373
msgid "Pacific/Enderbury"
msgstr "Pacific/Enderbury"
-#: ../calendar/zones.h:355
+#: ../calendar/zones.h:374
msgid "Pacific/Fakaofo"
msgstr "Pacific/Fakaofo"
-#: ../calendar/zones.h:356
+#: ../calendar/zones.h:375
msgid "Pacific/Fiji"
msgstr "Pacific/Fiji"
-#: ../calendar/zones.h:357
+#: ../calendar/zones.h:376
msgid "Pacific/Funafuti"
msgstr "Pacific/Funafuti"
-#: ../calendar/zones.h:358
+#: ../calendar/zones.h:377
msgid "Pacific/Galapagos"
msgstr "Pacific/Galapagos"
-#: ../calendar/zones.h:359
+#: ../calendar/zones.h:378
msgid "Pacific/Gambier"
msgstr "Pacific/Gambier"
-#: ../calendar/zones.h:360
+#: ../calendar/zones.h:379
msgid "Pacific/Guadalcanal"
msgstr "Pacific/Guadalcanal"
-#: ../calendar/zones.h:361
+#: ../calendar/zones.h:380
msgid "Pacific/Guam"
msgstr "Pacific/Guam"
-#: ../calendar/zones.h:362
+#: ../calendar/zones.h:381
msgid "Pacific/Honolulu"
msgstr "Pacific/Honolulu"
-#: ../calendar/zones.h:363
+#: ../calendar/zones.h:382
msgid "Pacific/Johnston"
msgstr "Pacific/Johnston"
-#: ../calendar/zones.h:364
+#: ../calendar/zones.h:383
msgid "Pacific/Kiritimati"
msgstr "Pacific/Kiritimati"
-#: ../calendar/zones.h:365
+#: ../calendar/zones.h:384
msgid "Pacific/Kosrae"
msgstr "Pacific/Kosrae"
-#: ../calendar/zones.h:366
+#: ../calendar/zones.h:385
msgid "Pacific/Kwajalein"
msgstr "Pacific/Kwajalein"
-#: ../calendar/zones.h:367
+#: ../calendar/zones.h:386
msgid "Pacific/Majuro"
msgstr "Pacific/Majuro"
-#: ../calendar/zones.h:368
+#: ../calendar/zones.h:387
msgid "Pacific/Marquesas"
msgstr "Pacific/Marquesas"
-#: ../calendar/zones.h:369
+#: ../calendar/zones.h:388
msgid "Pacific/Midway"
msgstr "Pacific/Midway"
-#: ../calendar/zones.h:370
+#: ../calendar/zones.h:389
msgid "Pacific/Nauru"
msgstr "Pacific/Nauru"
-#: ../calendar/zones.h:371
+#: ../calendar/zones.h:390
msgid "Pacific/Niue"
msgstr "Pacific/Niue"
-#: ../calendar/zones.h:372
+#: ../calendar/zones.h:391
msgid "Pacific/Norfolk"
msgstr "Pacific/Norfolk"
-#: ../calendar/zones.h:373
+#: ../calendar/zones.h:392
msgid "Pacific/Noumea"
msgstr "Pacific/Noumea"
-#: ../calendar/zones.h:374
+#: ../calendar/zones.h:393
msgid "Pacific/Pago_Pago"
msgstr "Pacific/Pago_Pago"
-#: ../calendar/zones.h:375
+#: ../calendar/zones.h:394
msgid "Pacific/Palau"
msgstr "Pacific/Palau"
-#: ../calendar/zones.h:376
+#: ../calendar/zones.h:395
msgid "Pacific/Pitcairn"
msgstr "Pacific/Pitcairn"
-#: ../calendar/zones.h:377
+#: ../calendar/zones.h:396
msgid "Pacific/Ponape"
msgstr "Pacific/Ponape"
-#: ../calendar/zones.h:378
+#: ../calendar/zones.h:397
msgid "Pacific/Port_Moresby"
msgstr "Pacific/Port_Moresby"
-#: ../calendar/zones.h:379
+#: ../calendar/zones.h:398
msgid "Pacific/Rarotonga"
msgstr "Pacific/Rarotonga"
-#: ../calendar/zones.h:380
+#: ../calendar/zones.h:399
msgid "Pacific/Saipan"
msgstr "Pacific/Saipan"
-#: ../calendar/zones.h:381
+#: ../calendar/zones.h:400
msgid "Pacific/Tahiti"
msgstr "Pacific/Tahiti"
-#: ../calendar/zones.h:382
+#: ../calendar/zones.h:401
msgid "Pacific/Tarawa"
msgstr "Pacific/Tarawa"
-#: ../calendar/zones.h:383
+#: ../calendar/zones.h:402
msgid "Pacific/Tongatapu"
msgstr "Pacific/Tongatapu"
-#: ../calendar/zones.h:384
+#: ../calendar/zones.h:403
msgid "Pacific/Truk"
msgstr "Pacific/Truk"
-#: ../calendar/zones.h:385
+#: ../calendar/zones.h:404
msgid "Pacific/Wake"
msgstr "Pacific/Wake"
-#: ../calendar/zones.h:386
+#: ../calendar/zones.h:405
msgid "Pacific/Wallis"
msgstr "Pacific/Wallis"
-#: ../calendar/zones.h:387
+#: ../calendar/zones.h:406
msgid "Pacific/Yap"
msgstr "Pacific/Yap"
@@ -10128,11 +10494,11 @@ msgstr "Could not open autosave file"
msgid "Unable to retrieve message from editor"
msgstr "Unable to retrieve message from editor"
-#: ../composer/e-composer-actions.c:46
+#: ../composer/e-composer-actions.c:47
msgid "Insert Attachment"
msgstr "Insert Attachment"
-#: ../composer/e-composer-actions.c:50
+#: ../composer/e-composer-actions.c:51
msgid "A_ttach"
msgstr "A_ttach"
@@ -10140,188 +10506,184 @@ msgstr "A_ttach"
msgid "Untitled Message"
msgstr "Untitled Message"
-#: ../composer/e-composer-actions.c:464 ../ui/evolution-editor.xml.h:15
-msgid "_Attachment..."
-msgstr "_Attachment..."
-
-#: ../composer/e-composer-actions.c:466
+#: ../composer/e-composer-actions.c:473
msgid "Attach a file"
msgstr "Attach a file"
-#: ../composer/e-composer-actions.c:471 ../mail/mail-signature-editor.c:194
-#: ../ui/evolution-editor.xml.h:16 ../ui/evolution-mail-messagedisplay.xml.h:4
+#: ../composer/e-composer-actions.c:478 ../mail/mail-signature-editor.c:194
+#: ../ui/evolution-mail-messagedisplay.xml.h:4
msgid "_Close"
msgstr "_Close"
-#: ../composer/e-composer-actions.c:473
+#: ../composer/e-composer-actions.c:480
msgid "Close the current file"
msgstr "Close the current file"
-#: ../composer/e-composer-actions.c:478 ../mail/em-folder-view.c:1344
+#: ../composer/e-composer-actions.c:485 ../mail/em-folder-view.c:1337
#: ../ui/evolution-addressbook.xml.h:58 ../ui/evolution-calendar.xml.h:44
-#: ../ui/evolution-mail-message.xml.h:124 ../ui/evolution-memos.xml.h:20
+#: ../ui/evolution-mail-message.xml.h:123 ../ui/evolution-memos.xml.h:20
#: ../ui/evolution-tasks.xml.h:29
msgid "_Print..."
msgstr "_Print..."
-#: ../composer/e-composer-actions.c:485 ../ui/evolution-addressbook.xml.h:27
+#: ../composer/e-composer-actions.c:492 ../ui/evolution-addressbook.xml.h:27
#: ../ui/evolution-calendar.xml.h:21 ../ui/evolution-mail-message.xml.h:76
#: ../ui/evolution-memos.xml.h:12 ../ui/evolution-tasks.xml.h:15
msgid "Print Pre_view"
msgstr "Print Pre_view"
-#: ../composer/e-composer-actions.c:494
+#: ../composer/e-composer-actions.c:501
msgid "Save the current file"
msgstr "Save the current file"
-#: ../composer/e-composer-actions.c:499
+#: ../composer/e-composer-actions.c:506
msgid "Save _As..."
msgstr "Save _As..."
-#: ../composer/e-composer-actions.c:501
+#: ../composer/e-composer-actions.c:508
msgid "Save the current file with a different name"
msgstr "Save the current file with a different name"
-#: ../composer/e-composer-actions.c:506
+#: ../composer/e-composer-actions.c:513
msgid "Save _Draft"
msgstr "Save _Draft"
-#: ../composer/e-composer-actions.c:508
+#: ../composer/e-composer-actions.c:515
msgid "Save as draft"
msgstr "Save as draft"
-#: ../composer/e-composer-actions.c:513
+#: ../composer/e-composer-actions.c:520
msgid "S_end"
msgstr "S_end"
-#: ../composer/e-composer-actions.c:515
+#: ../composer/e-composer-actions.c:522
msgid "Send this message"
msgstr "Send this message"
-#: ../composer/e-composer-actions.c:520 ../ui/evolution-task-editor.xml.h:23
-msgid "_Send Options"
-msgstr "_Send Options"
-
-#: ../composer/e-composer-actions.c:522
+#: ../composer/e-composer-actions.c:529
msgid "Insert Send options"
msgstr "Insert Send options"
-#: ../composer/e-composer-actions.c:529
+#: ../composer/e-composer-actions.c:534
+msgid "New _Message"
+msgstr "New _Message"
+
+#: ../composer/e-composer-actions.c:536
+msgid "Open New Message window"
+msgstr "Open New Message window"
+
+#: ../composer/e-composer-actions.c:543
msgid "Character _Encoding"
msgstr "Character _Encoding"
-#: ../composer/e-composer-actions.c:536
+#: ../composer/e-composer-actions.c:550
msgid "_Security"
msgstr "_Security"
-#: ../composer/e-composer-actions.c:546
+#: ../composer/e-composer-actions.c:560
msgid "PGP _Encrypt"
msgstr "PGP _Encrypt"
-#: ../composer/e-composer-actions.c:548
+#: ../composer/e-composer-actions.c:562
msgid "Encrypt this message with PGP"
msgstr "Encrypt this message with PGP"
-#: ../composer/e-composer-actions.c:554
+#: ../composer/e-composer-actions.c:568
msgid "PGP _Sign"
msgstr "PGP _Sign"
-#: ../composer/e-composer-actions.c:556
+#: ../composer/e-composer-actions.c:570
msgid "Sign this message with your PGP key"
msgstr "Sign this message with your PGP key"
-#: ../composer/e-composer-actions.c:562
+#: ../composer/e-composer-actions.c:576
msgid "_Prioritize Message"
msgstr "_Prioritise Message"
-#: ../composer/e-composer-actions.c:564
+#: ../composer/e-composer-actions.c:578
msgid "Set the message priority to high"
msgstr "Set the message priority to high"
-#: ../composer/e-composer-actions.c:570
+#: ../composer/e-composer-actions.c:584
msgid "Re_quest Read Receipt"
msgstr "Re_quest Read Receipt"
-#: ../composer/e-composer-actions.c:572
+#: ../composer/e-composer-actions.c:586
msgid "Get delivery notification when your message is read"
msgstr "Get delivery notification when your message is read"
-#: ../composer/e-composer-actions.c:578
+#: ../composer/e-composer-actions.c:592
msgid "S/MIME En_crypt"
msgstr "S/MIME En_crypt"
-#: ../composer/e-composer-actions.c:580
+#: ../composer/e-composer-actions.c:594
msgid "Encrypt this message with your S/MIME Encryption Certificate"
msgstr "Encrypt this message with your S/MIME Encryption Certificate"
-#: ../composer/e-composer-actions.c:586
+#: ../composer/e-composer-actions.c:600
msgid "S/MIME Sig_n"
msgstr "S/MIME Sig_n"
-#: ../composer/e-composer-actions.c:588
+#: ../composer/e-composer-actions.c:602
msgid "Sign this message with your S/MIME Signature Certificate"
msgstr "Sign this message with your S/MIME Signature Certificate"
-#: ../composer/e-composer-actions.c:594
+#: ../composer/e-composer-actions.c:608
msgid "_Bcc Field"
msgstr "_Bcc Field"
-#: ../composer/e-composer-actions.c:596
+#: ../composer/e-composer-actions.c:610
msgid "Toggles whether the BCC field is displayed"
msgstr "Toggles whether the BCC field is displayed"
-#: ../composer/e-composer-actions.c:602
+#: ../composer/e-composer-actions.c:616
msgid "_Cc Field"
msgstr "_Cc Field"
-#: ../composer/e-composer-actions.c:604
+#: ../composer/e-composer-actions.c:618
msgid "Toggles whether the CC field is displayed"
msgstr "Toggles whether the CC field is displayed"
-#: ../composer/e-composer-actions.c:610
+#: ../composer/e-composer-actions.c:624
msgid "_From Field"
msgstr "_From Field"
-#: ../composer/e-composer-actions.c:612
+#: ../composer/e-composer-actions.c:626
msgid "Toggles whether the From chooser is displayed"
msgstr "Toggles whether the From chooser is displayed"
-#: ../composer/e-composer-actions.c:618
+#: ../composer/e-composer-actions.c:632
msgid "_Post-To Field"
msgstr "_Post-To Field"
-#: ../composer/e-composer-actions.c:620
+#: ../composer/e-composer-actions.c:634
msgid "Toggles whether the Post-To field is displayed"
msgstr "Toggles whether the Post-To field is displayed"
-#: ../composer/e-composer-actions.c:626
+#: ../composer/e-composer-actions.c:640
msgid "_Reply-To Field"
msgstr "_Reply-To Field"
-#: ../composer/e-composer-actions.c:628
+#: ../composer/e-composer-actions.c:642
msgid "Toggles whether the Reply-To field is displayed"
msgstr "Toggles whether the Reply-To field is displayed"
-#: ../composer/e-composer-actions.c:634
+#: ../composer/e-composer-actions.c:648
msgid "_Subject Field"
msgstr "_Subject Field"
-#: ../composer/e-composer-actions.c:636
+#: ../composer/e-composer-actions.c:650
msgid "Toggles whether the Subject field is displayed"
msgstr "Toggles whether the Subject field is displayed"
-#: ../composer/e-composer-actions.c:642
+#: ../composer/e-composer-actions.c:656
msgid "_To Field"
msgstr "_To Field"
-#: ../composer/e-composer-actions.c:644
+#: ../composer/e-composer-actions.c:658
msgid "Toggles whether the To field is displayed"
msgstr "Toggles whether the To field is displayed"
-#: ../composer/e-composer-actions.c:685 ../ui/evolution-editor.xml.h:1
-msgid "Attach"
-msgstr "Attach"
-
#: ../composer/e-composer-header-table.c:66
msgid "Enter the recipients of the message"
msgstr "Enter the recipients of the message"
@@ -10370,19 +10732,19 @@ msgstr "S_ubject:"
msgid "Si_gnature:"
msgstr "Si_gnature:"
-#: ../composer/e-composer-name-header.c:114
+#: ../composer/e-composer-name-header.c:115
msgid "Click here for the address book"
msgstr "Click here for the address book"
-#: ../composer/e-composer-post-header.c:136
+#: ../composer/e-composer-post-header.c:137
msgid "Posting destination"
msgstr "Posting destination"
-#: ../composer/e-composer-post-header.c:137
+#: ../composer/e-composer-post-header.c:138
msgid "Choose folders to post the message to."
msgstr "Choose folders to post the message to."
-#: ../composer/e-composer-post-header.c:171
+#: ../composer/e-composer-post-header.c:172
msgid "Click here to select folders to post to"
msgstr "Click here to select folders to post to"
@@ -10390,17 +10752,17 @@ msgstr "Click here to select folders to post to"
msgid "Recent _Documents"
msgstr "Recent _Documents"
-#: ../composer/e-composer-private.c:173 ../composer/e-msg-composer.c:1559
+#: ../composer/e-composer-private.c:180 ../composer/e-msg-composer.c:1558
msgid "Show _Attachment Bar"
msgstr "Show _Attachment Bar"
-#: ../composer/e-msg-composer.c:873
+#: ../composer/e-msg-composer.c:872
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:880
+#: ../composer/e-msg-composer.c:879
msgid ""
"Cannot encrypt outgoing message: No encryption certificate set for this "
"account"
@@ -10408,23 +10770,23 @@ msgstr ""
"Cannot encrypt outgoing message: No encryption certificate set for this "
"account"
-#: ../composer/e-msg-composer.c:1501 ../mail/em-format-html-display.c:1936
-#: ../mail/em-format-html-display.c:2426 ../mail/mail-config.glade.h:45
+#: ../composer/e-msg-composer.c:1500 ../mail/em-format-html-display.c:1913
+#: ../mail/em-format-html-display.c:2405 ../mail/mail-config.glade.h:45
#: ../mail/message-list.etspec.h:1
msgid "Attachment"
msgid_plural "Attachments"
msgstr[0] "Attachment"
msgstr[1] "Attachments"
-#: ../composer/e-msg-composer.c:1557
+#: ../composer/e-msg-composer.c:1556
msgid "Hide _Attachment Bar"
msgstr "Hide _Attachment Bar"
-#: ../composer/e-msg-composer.c:1574 ../composer/e-msg-composer.c:2734
+#: ../composer/e-msg-composer.c:1573 ../composer/e-msg-composer.c:2780
msgid "Compose Message"
msgstr "Compose Message"
-#: ../composer/e-msg-composer.c:4009
+#: ../composer/e-msg-composer.c:4055
msgid ""
"<b>(The composer contains a non-text message body, which cannot be edited.)</"
"b>"
@@ -10571,23 +10933,27 @@ msgstr "You cannot attach the file `{0}' to this message."
msgid "You need to configure an account before you can compose mail."
msgstr "You need to configure an account before you can compose mail."
-#: ../composer/mail-composer.error.xml.h:30
+#: ../composer/mail-composer.error.xml.h:29
+msgid "_Continue Editing"
+msgstr "_Continue Editing"
+
+#: ../composer/mail-composer.error.xml.h:31
msgid "_Do not Recover"
msgstr "_Do not Recover"
-#: ../composer/mail-composer.error.xml.h:31 ../shell/main.c:318
+#: ../composer/mail-composer.error.xml.h:32
msgid "_Recover"
msgstr "_Recover"
-#: ../composer/mail-composer.error.xml.h:32
-msgid "_Save Message"
-msgstr "_Save Message"
+#: ../composer/mail-composer.error.xml.h:33
+msgid "_Save Draft"
+msgstr "_Save Draft"
#: ../data/evolution.desktop.in.in.h:1
msgid "Evolution Mail and Calendar"
msgstr "Evolution Mail and Calendar"
-#: ../data/evolution.desktop.in.in.h:2 ../shell/e-shell-window-commands.c:751
+#: ../data/evolution.desktop.in.in.h:2 ../shell/e-shell-window-commands.c:738
msgid "Groupware Suite"
msgstr "Groupware Suite"
@@ -10603,31 +10969,39 @@ msgstr "address card"
msgid "calendar information"
msgstr "calendar information"
-#: ../e-util/e-error.c:86 ../e-util/e-error.c:87 ../e-util/e-error.c:129
+#: ../e-util/e-error.c:77 ../e-util/e-error.c:78 ../e-util/e-error.c:120
msgid "Evolution Error"
msgstr "Evolution Error"
-#: ../e-util/e-error.c:88 ../e-util/e-error.c:89 ../e-util/e-error.c:127
+#: ../e-util/e-error.c:79 ../e-util/e-error.c:80 ../e-util/e-error.c:118
msgid "Evolution Warning"
msgstr "Evolution Warning"
-#: ../e-util/e-error.c:126
+#: ../e-util/e-error.c:117
msgid "Evolution Information"
msgstr "Evolution Information"
-#: ../e-util/e-error.c:128
+#: ../e-util/e-error.c:119
msgid "Evolution Query"
msgstr "Evolution Query"
#. setup a dummy error
-#: ../e-util/e-error.c:458
+#: ../e-util/e-error.c:449
#, c-format
msgid "Internal error, unknown error '%s' requested"
msgstr "Internal error, unknown error '%s' requested"
-#: ../e-util/e-plugin.c:308 ../mail/em-account-prefs.c:489
-#: ../mail/em-composer-prefs.c:979
-#: ../plugins/plugin-manager/plugin-manager.c:331
+#: ../e-util/e-logger.c:156
+msgid "Component"
+msgstr "Component"
+
+#: ../e-util/e-logger.c:157
+msgid "Name of the component being logged"
+msgstr "Name of the component being logged"
+
+#: ../e-util/e-plugin.c:308 ../filter/rule-editor.c:776
+#: ../mail/em-account-prefs.c:482 ../mail/em-composer-prefs.c:988
+#: ../plugins/plugin-manager/plugin-manager.c:339
#: ../plugins/publish-calendar/publish-calendar.c:689
msgid "Enabled"
msgstr "Enabled"
@@ -10636,15 +11010,15 @@ msgstr "Enabled"
msgid "Whether the plugin is enabled"
msgstr "Whether the plugin is enabled"
-#: ../e-util/e-print.c:138
+#: ../e-util/e-print.c:160
msgid "An error occurred while printing"
msgstr "An error occurred while printing"
-#: ../e-util/e-print.c:145
+#: ../e-util/e-print.c:167
msgid "The printing system reported the following details about the error:"
msgstr "The printing system reported the following details about the error:"
-#: ../e-util/e-print.c:151
+#: ../e-util/e-print.c:173
msgid ""
"The printing system did not report any additional details about the error."
msgstr ""
@@ -10678,47 +11052,51 @@ msgstr "Overwrite file?"
msgid "_Overwrite"
msgstr "_Overwrite"
-#: ../e-util/e-util-labels.c:45
+#: ../e-util/e-util.c:97
+msgid "Could not display help for Evolution."
+msgstr "Could not display help for Evolution."
+
+#: ../e-util/e-util-labels.c:37
msgid "I_mportant"
msgstr "I_mportant"
#. red
-#: ../e-util/e-util-labels.c:46
+#: ../e-util/e-util-labels.c:38
msgid "_Work"
msgstr "_Work"
#. orange
-#: ../e-util/e-util-labels.c:47
+#: ../e-util/e-util-labels.c:39
msgid "_Personal"
msgstr "_Personal"
#. green
-#: ../e-util/e-util-labels.c:48
+#: ../e-util/e-util-labels.c:40
msgid "_To Do"
msgstr "_To Do"
#. blue
-#: ../e-util/e-util-labels.c:49
+#: ../e-util/e-util-labels.c:41
msgid "_Later"
msgstr "_Later"
-#: ../e-util/e-util-labels.c:317
+#: ../e-util/e-util-labels.c:309
msgid "Label _Name:"
msgstr "Label _Name:"
-#: ../e-util/e-util-labels.c:340
+#: ../e-util/e-util-labels.c:332
msgid "Edit Label"
msgstr "Edit Label"
-#: ../e-util/e-util-labels.c:340
+#: ../e-util/e-util-labels.c:332
msgid "Add Label"
msgstr "Add Label"
-#: ../e-util/e-util-labels.c:359
+#: ../e-util/e-util-labels.c:351
msgid "Label name cannot be empty."
msgstr "Label name cannot be empty."
-#: ../e-util/e-util-labels.c:364
+#: ../e-util/e-util-labels.c:356
msgid ""
"A label having the same tag already exists on the server. Please rename your "
"label."
@@ -10851,65 +11229,65 @@ msgstr "%d-%b-%Y"
msgid "Select a time to compare against"
msgstr "Select a time to compare against"
-#: ../filter/filter-file.c:288
+#: ../filter/filter-file.c:284
msgid "Choose a file"
msgstr "Choose a file"
-#: ../filter/filter-part.c:533
+#: ../filter/filter-part.c:532
#: ../shell/test/GNOME_Evolution_Test.server.in.in.h:3
msgid "Test"
msgstr "Test"
-#: ../filter/filter-rule.c:800
+#: ../filter/filter-rule.c:852
msgid "R_ule name:"
msgstr "R_ule name:"
-#: ../filter/filter-rule.c:828
+#: ../filter/filter-rule.c:880
msgid "Find items that meet the following criteria"
msgstr "Find items that meet the following criteria"
-#: ../filter/filter-rule.c:862
+#: ../filter/filter-rule.c:914
msgid "A_dd Filter Criteria"
msgstr "A_dd Filter Criteria"
-#: ../filter/filter-rule.c:868
+#: ../filter/filter-rule.c:920
msgid "If all criteria are met"
msgstr "If all criteria are met"
-#: ../filter/filter-rule.c:868
+#: ../filter/filter-rule.c:920
msgid "If any criteria are met"
msgstr "If any criteria are met"
-#: ../filter/filter-rule.c:870
+#: ../filter/filter-rule.c:922
msgid "_Find items:"
msgstr "_Find items:"
-#: ../filter/filter-rule.c:892
+#: ../filter/filter-rule.c:944
msgid "All related"
msgstr "All related"
-#: ../filter/filter-rule.c:892
+#: ../filter/filter-rule.c:944
msgid "Replies"
msgstr "Replies"
-#: ../filter/filter-rule.c:892
+#: ../filter/filter-rule.c:944
msgid "Replies and parents"
msgstr "Replies and parents"
-#: ../filter/filter-rule.c:892
+#: ../filter/filter-rule.c:944
msgid "No reply or parent"
msgstr "No reply or parent"
-#: ../filter/filter-rule.c:894
+#: ../filter/filter-rule.c:946
msgid "I_nclude threads"
msgstr "I_nclude threads"
-#: ../filter/filter-rule.c:990 ../filter/filter.glade.h:3
+#: ../filter/filter-rule.c:1044 ../filter/filter.glade.h:3
#: ../mail/em-utils.c:308
msgid "Incoming"
msgstr "Incoming"
-#: ../filter/filter-rule.c:990 ../mail/em-utils.c:309
+#: ../filter/filter-rule.c:1044 ../mail/em-utils.c:309
msgid "Outgoing"
msgstr "Outgoing"
@@ -11009,7 +11387,7 @@ msgstr "in the future"
msgid "months"
msgstr "months"
-#: ../filter/filter.glade.h:19 ../mail/mail-config.glade.h:194
+#: ../filter/filter.glade.h:19 ../mail/mail-config.glade.h:195
msgid "seconds"
msgstr "seconds"
@@ -11021,9 +11399,10 @@ msgstr "the current time"
msgid "the time you specify"
msgstr "the time you specify"
-#: ../filter/filter.glade.h:22 ../plugins/calendar-http/calendar-http.c:291
+#: ../filter/filter.glade.h:22 ../plugins/calendar-http/calendar-http.c:282
#: ../plugins/calendar-weather/calendar-weather.c:564
-#: ../plugins/google-account-setup/google-source.c:398
+#: ../plugins/google-account-setup/google-source.c:665
+#: ../plugins/google-account-setup/google-contacts-source.c:331
msgid "weeks"
msgstr "weeks"
@@ -11039,7 +11418,7 @@ msgstr "Add Rule"
msgid "Edit Rule"
msgstr "Edit Rule"
-#: ../filter/rule-editor.c:747
+#: ../filter/rule-editor.c:786
msgid "Rule name"
msgstr "Rule name"
@@ -11093,16 +11472,16 @@ msgstr "Evolution Mail preferences control"
msgid "Evolution Network configuration control"
msgstr "Evolution Network configuration control"
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:13 ../mail/em-folder-view.c:612
-#: ../mail/importers/elm-importer.c:329 ../mail/importers/pine-importer.c:382
-#: ../mail/mail-component.c:584 ../mail/mail-component.c:585
-#: ../mail/mail-component.c:749
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:13 ../mail/em-folder-view.c:605
+#: ../mail/importers/elm-importer.c:327 ../mail/importers/pine-importer.c:380
+#: ../mail/mail-component.c:597 ../mail/mail-component.c:598
+#: ../mail/mail-component.c:767
#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:6
msgid "Mail"
msgstr "Mail"
#: ../mail/GNOME_Evolution_Mail.server.in.in.h:14
-#: ../mail/em-account-prefs.c:502
+#: ../mail/em-account-prefs.c:495
msgid "Mail Accounts"
msgstr "Mail Accounts"
@@ -11119,12 +11498,12 @@ msgstr "Network Preferences"
msgid "_Mail"
msgstr "_Mail"
-#: ../mail/em-account-editor.c:403
+#: ../mail/em-account-editor.c:387
#, c-format
msgid "%s License Agreement"
msgstr "%s Licence Agreement"
-#: ../mail/em-account-editor.c:410
+#: ../mail/em-account-editor.c:394
#, c-format
msgid ""
"\n"
@@ -11137,109 +11516,109 @@ msgstr ""
"for %s displayed below\n"
"and tick the check box for accepting it\n"
-#: ../mail/em-account-editor.c:482 ../mail/em-filter-folder-element.c:237
+#: ../mail/em-account-editor.c:466 ../mail/em-filter-folder-element.c:239
#: ../mail/em-vfolder-rule.c:512
msgid "Select Folder"
msgstr "Select Folder"
-#: ../mail/em-account-editor.c:606 ../mail/em-account-editor.c:651
-#: ../mail/em-account-editor.c:718 ../widgets/misc/e-signature-combo-box.c:97
+#: ../mail/em-account-editor.c:590 ../mail/em-account-editor.c:635
+#: ../mail/em-account-editor.c:702 ../widgets/misc/e-signature-combo-box.c:98
msgid "Autogenerated"
msgstr "Autogenerated"
-#: ../mail/em-account-editor.c:778
+#: ../mail/em-account-editor.c:762
msgid "Ask for each message"
msgstr "Ask for each message"
-#: ../mail/em-account-editor.c:1825 ../mail/mail-config.glade.h:94
+#: ../mail/em-account-editor.c:1810 ../mail/mail-config.glade.h:94
msgid "Identity"
msgstr "Identity"
-#: ../mail/em-account-editor.c:1874 ../mail/mail-config.glade.h:123
+#: ../mail/em-account-editor.c:1859 ../mail/mail-config.glade.h:124
msgid "Receiving Email"
msgstr "Receiving E-mail"
-#: ../mail/em-account-editor.c:2056
+#: ../mail/em-account-editor.c:2131
msgid "Check for _new messages every"
msgstr "Check for _new messages every"
-#: ../mail/em-account-editor.c:2064
+#: ../mail/em-account-editor.c:2139
msgid "minu_tes"
msgstr "minu_tes"
-#: ../mail/em-account-editor.c:2238 ../mail/mail-config.glade.h:135
+#: ../mail/em-account-editor.c:2327 ../mail/mail-config.glade.h:136
msgid "Sending Email"
msgstr "Sending E-mail"
-#: ../mail/em-account-editor.c:2297 ../mail/mail-config.glade.h:67
+#: ../mail/em-account-editor.c:2386 ../mail/mail-config.glade.h:67
msgid "Defaults"
msgstr "Defaults"
#. Security settings
-#: ../mail/em-account-editor.c:2363 ../mail/mail-config.glade.h:130
-#: ../plugins/exchange-operations/exchange-account-setup.c:316
+#: ../mail/em-account-editor.c:2452 ../mail/mail-config.glade.h:131
+#: ../plugins/exchange-operations/exchange-account-setup.c:315
msgid "Security"
msgstr "Security"
#. Most sections for this is auto-generated fromt the camel config
-#: ../mail/em-account-editor.c:2400 ../mail/em-account-editor.c:2491
+#: ../mail/em-account-editor.c:2489 ../mail/em-account-editor.c:2580
msgid "Receiving Options"
msgstr "Receiving Options"
-#: ../mail/em-account-editor.c:2401 ../mail/em-account-editor.c:2492
+#: ../mail/em-account-editor.c:2490 ../mail/em-account-editor.c:2581
msgid "Checking for New Messages"
msgstr "Checking for New Messages"
-#: ../mail/em-account-editor.c:2843 ../mail/mail-config.glade.h:34
+#: ../mail/em-account-editor.c:2932 ../mail/mail-config.glade.h:34
msgid "Account Editor"
msgstr "Account Editor"
-#: ../mail/em-account-editor.c:2843 ../mail/mail-config.glade.h:83
+#: ../mail/em-account-editor.c:2932 ../mail/mail-config.glade.h:83
msgid "Evolution Account Assistant"
msgstr "Evolution Account Assistant"
#. translators: default account indicator
-#: ../mail/em-account-prefs.c:436
+#: ../mail/em-account-prefs.c:429
msgid "[Default]"
msgstr "[Default]"
-#: ../mail/em-account-prefs.c:495
+#: ../mail/em-account-prefs.c:488
msgid "Account name"
msgstr "Account name"
-#: ../mail/em-account-prefs.c:497
+#: ../mail/em-account-prefs.c:490
msgid "Protocol"
msgstr "Protocol"
-#: ../mail/em-composer-prefs.c:300 ../mail/em-composer-prefs.c:435
-#: ../mail/mail-config.c:1117 ../mail/mail-signature-editor.c:478
+#: ../mail/em-composer-prefs.c:303 ../mail/em-composer-prefs.c:438
+#: ../mail/mail-config.c:1158 ../mail/mail-signature-editor.c:478
msgid "Unnamed"
msgstr "Unnamed"
-#: ../mail/em-composer-prefs.c:983
+#: ../mail/em-composer-prefs.c:992
msgid "Language(s)"
msgstr "Language(s)"
-#: ../mail/em-composer-prefs.c:1032
+#: ../mail/em-composer-prefs.c:1041
msgid "Add signature script"
msgstr "Add signature script"
-#: ../mail/em-composer-prefs.c:1074
+#: ../mail/em-composer-prefs.c:1083
msgid "Signature(s)"
msgstr "Signature(s)"
-#: ../mail/em-composer-utils.c:938 ../mail/em-format-quote.c:413
+#: ../mail/em-composer-utils.c:1150 ../mail/em-format-quote.c:416
msgid "-------- Forwarded Message --------"
msgstr "-------- Forwarded Message --------"
-#: ../mail/em-composer-utils.c:1754
+#: ../mail/em-composer-utils.c:1962
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:1801
+#: ../mail/em-composer-utils.c:2009
msgid ""
"On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
"${TimeZone}, ${Sender} wrote:"
@@ -11247,11 +11626,11 @@ msgstr ""
"On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
"${TimeZone}, ${Sender} wrote:"
-#: ../mail/em-composer-utils.c:1942
+#: ../mail/em-composer-utils.c:2152
msgid "-----Original Message-----"
msgstr "-----Original Message-----"
-#: ../mail/em-filter-editor.c:155
+#: ../mail/em-filter-editor.c:156
msgid "_Filter Rules"
msgstr "_Filter Rules"
@@ -11268,10 +11647,6 @@ msgstr "Assign Colour"
msgid "Assign Score"
msgstr "Assign Score"
-#: ../mail/em-filter-i18n.h:5
-msgid "Attachments"
-msgstr "Attachments"
-
#: ../mail/em-filter-i18n.h:6
msgid "BCC"
msgstr "BCC"
@@ -11288,10 +11663,6 @@ msgstr "CC"
msgid "Completed On"
msgstr "Completed On"
-#: ../mail/em-filter-i18n.h:10
-msgid "contains"
-msgstr "contains"
-
#: ../mail/em-filter-i18n.h:11
msgid "Copy to Folder"
msgstr "Copy to Folder"
@@ -11305,7 +11676,7 @@ msgid "Date sent"
msgstr "Date sent"
#: ../mail/em-filter-i18n.h:14
-#: ../plugins/groupwise-features/share-folder.c:778
+#: ../plugins/groupwise-features/share-folder.c:767
#: ../ui/evolution-addressbook.xml.h:15 ../ui/evolution-calendar.xml.h:5
#: ../ui/evolution-mail-message.xml.h:25 ../ui/evolution-memos.xml.h:6
#: ../ui/evolution-tasks.xml.h:6
@@ -11316,10 +11687,6 @@ msgstr "Delete"
msgid "Deleted"
msgstr "Deleted"
-#: ../mail/em-filter-i18n.h:16
-msgid "does not contain"
-msgstr "does not contain"
-
#: ../mail/em-filter-i18n.h:17
msgid "does not end with"
msgstr "does not end with"
@@ -11340,10 +11707,6 @@ msgstr "does not sound like"
msgid "does not start with"
msgstr "does not start with"
-#: ../mail/em-filter-i18n.h:22
-msgid "Do Not Exist"
-msgstr "Do Not Exist"
-
#: ../mail/em-filter-i18n.h:23
msgid "Draft"
msgstr "Draft"
@@ -11352,10 +11715,6 @@ msgstr "Draft"
msgid "ends with"
msgstr "ends with"
-#: ../mail/em-filter-i18n.h:25
-msgid "Exist"
-msgstr "Exist"
-
#: ../mail/em-filter-i18n.h:26
msgid "exists"
msgstr "exists"
@@ -11368,14 +11727,10 @@ msgstr "Expression"
msgid "Follow Up"
msgstr "Follow Up"
-#: ../mail/em-filter-i18n.h:29 ../mail/em-migrate.c:1053
+#: ../mail/em-filter-i18n.h:29 ../mail/em-migrate.c:1056
msgid "Important"
msgstr "Important"
-#: ../mail/em-filter-i18n.h:30
-msgid "is"
-msgstr "is"
-
#: ../mail/em-filter-i18n.h:31
msgid "is after"
msgstr "is after"
@@ -11388,18 +11743,6 @@ msgstr "is before"
msgid "is Flagged"
msgstr "is Flagged"
-#: ../mail/em-filter-i18n.h:34
-msgid "is greater than"
-msgstr "is greater than"
-
-#: ../mail/em-filter-i18n.h:35
-msgid "is less than"
-msgstr "is less than"
-
-#: ../mail/em-filter-i18n.h:36
-msgid "is not"
-msgstr "is not"
-
#: ../mail/em-filter-i18n.h:37
msgid "is not Flagged"
msgstr "is not Flagged"
@@ -11421,7 +11764,7 @@ msgstr "Junk"
msgid "Junk Test"
msgstr "Junk Test"
-#: ../mail/em-filter-i18n.h:42 ../widgets/misc/e-expander.c:190
+#: ../mail/em-filter-i18n.h:42 ../widgets/misc/e-expander.c:188
msgid "Label"
msgstr "Label"
@@ -11463,7 +11806,7 @@ msgstr "Play Sound"
#. Translators: "Read" as in "has been read" (em-filter-i18n.h)
#. Translators: "Read" as in "has been read" (message-tag-followup.c)
-#: ../mail/em-filter-i18n.h:53 ../mail/message-tag-followup.c:82
+#: ../mail/em-filter-i18n.h:53 ../mail/message-tag-followup.c:63
msgid "Read"
msgstr "Read"
@@ -11535,9 +11878,9 @@ msgstr "starts with"
msgid "Stop Processing"
msgstr "Stop Processing"
-#: ../mail/em-filter-i18n.h:72 ../mail/em-format-quote.c:341
-#: ../mail/em-format.c:889 ../mail/em-mailer-prefs.c:95
-#: ../mail/message-list.etspec.h:18 ../mail/message-tag-followup.c:337
+#: ../mail/em-filter-i18n.h:72 ../mail/em-format-quote.c:342
+#: ../mail/em-format.c:889 ../mail/em-mailer-prefs.c:80
+#: ../mail/message-list.etspec.h:18 ../mail/message-tag-followup.c:312
#: ../plugins/groupwise-features/properties.glade.h:7
#: ../smime/lib/e-cert.c:1132
msgid "Subject"
@@ -11548,11 +11891,11 @@ msgid "Unset Status"
msgstr "Unset Status"
#. and now for the action area
-#: ../mail/em-filter-rule.c:489
+#: ../mail/em-filter-rule.c:522
msgid "Then"
msgstr "Then"
-#: ../mail/em-filter-rule.c:517
+#: ../mail/em-filter-rule.c:550
msgid "Add Ac_tion"
msgstr "Add Ac_tion"
@@ -11596,16 +11939,16 @@ msgstr "Important Messages"
msgid "Messages Not Junk"
msgstr "Messages Not Junk"
-#: ../mail/em-folder-browser.c:1148
+#: ../mail/em-folder-browser.c:1171
msgid "Account Search"
msgstr "Account Search"
-#: ../mail/em-folder-browser.c:1201
+#: ../mail/em-folder-browser.c:1224
msgid "All Account Search"
msgstr "All Account Search"
#. to be on the safe side, ngettext is used here, see e.g. comment #3 at bug 272567
-#: ../mail/em-folder-properties.c:185
+#: ../mail/em-folder-properties.c:173
msgid "Unread messages:"
msgid_plural "Unread messages:"
msgstr[0] "Unread messages:"
@@ -11613,35 +11956,51 @@ msgstr[1] "Unread messages:"
#. TODO: can this be done in a loop?
#. to be on the safe side, ngettext is used here, see e.g. comment #3 at bug 272567
-#: ../mail/em-folder-properties.c:189
+#: ../mail/em-folder-properties.c:177
msgid "Total messages:"
msgid_plural "Total messages:"
msgstr[0] "Total messages:"
msgstr[1] "Total messages:"
-#: ../mail/em-folder-properties.c:205 ../mail/em-folder-properties.c:207
+#: ../mail/em-folder-properties.c:195
+#, c-format
+msgid "Quota usage (%s):"
+msgstr "Quota usage (%s):"
+
+#: ../mail/em-folder-properties.c:197
+#, c-format
msgid "Quota usage"
msgstr "Quota usage"
-#: ../mail/em-folder-properties.c:397
+#. translators: standard local mailbox names
+#: ../mail/em-folder-properties.c:357 ../mail/em-folder-tree-model.c:507
+#: ../mail/em-folder-tree.c:2556 ../mail/mail-component.c:160
+#: ../mail/mail-component.c:585
+#: ../plugins/exchange-operations/exchange-delegates-user.c:76
+#: ../plugins/exchange-operations/exchange-folder.c:594
+msgid "Inbox"
+msgstr "Inbox"
+
+#: ../mail/em-folder-properties.c:388
#: ../plugins/groupwise-features/properties.glade.h:4
msgid "Folder Properties"
msgstr "Folder Properties"
-#: ../mail/em-folder-selection-button.c:124
+#: ../mail/em-folder-selection-button.c:120
msgid "<click here to select a folder>"
msgstr "<click here to select a folder>"
-#: ../mail/em-folder-selector.c:262
+#: ../mail/em-folder-selector.c:254
msgid "C_reate"
msgstr "C_reate"
-#: ../mail/em-folder-selector.c:266
+#: ../mail/em-folder-selector.c:258
msgid "Folder _name:"
msgstr "Folder _name:"
+#. load store to mail component at the end, when everything is loaded
#: ../mail/em-folder-tree-model.c:204 ../mail/em-folder-tree-model.c:206
-#: ../mail/mail-vfolder.c:935 ../mail/mail-vfolder.c:1020
+#: ../mail/mail-vfolder.c:970 ../mail/mail-vfolder.c:1027
msgid "Search Folders"
msgstr "Search Folders"
@@ -11650,353 +12009,323 @@ msgstr "Search Folders"
msgid "UNMATCHED"
msgstr "UNMATCHED"
-#: ../mail/em-folder-tree-model.c:500 ../mail/mail-component.c:158
+#: ../mail/em-folder-tree-model.c:504 ../mail/mail-component.c:161
msgid "Drafts"
msgstr "Drafts"
-#. translators: standard local mailbox names
-#: ../mail/em-folder-tree-model.c:503 ../mail/em-folder-tree.c:2537
-#: ../mail/mail-component.c:157
-#: ../plugins/exchange-operations/exchange-delegates-user.c:88
-#: ../plugins/exchange-operations/exchange-folder.c:593
-msgid "Inbox"
-msgstr "Inbox"
-
-#: ../mail/em-folder-tree-model.c:506 ../mail/mail-component.c:159
+#: ../mail/em-folder-tree-model.c:510 ../mail/mail-component.c:162
msgid "Outbox"
msgstr "Outbox"
-#: ../mail/em-folder-tree-model.c:508 ../mail/mail-component.c:160
+#: ../mail/em-folder-tree-model.c:512 ../mail/mail-component.c:163
msgid "Sent"
msgstr "Sent"
-#: ../mail/em-folder-tree-model.c:530 ../mail/em-folder-tree-model.c:837
+#: ../mail/em-folder-tree-model.c:534 ../mail/em-folder-tree-model.c:841
msgid "Loading..."
msgstr "Loading..."
-#. Translators: This is the string used for displaying the
-#. * folder names in folder trees. "%s" will be replaced by
-#. * the folder's name and "%u" will be replaced with the
-#. * number of unread messages in the folder.
-#. *
-#. * Most languages should translate this as "%s (%u)". The
-#. * languages that use localized digits (like Persian) may
-#. * need to replace "%u" with "%Iu". Right-to-left languages
-#. * (like Arabic and Hebrew) may need to add bidirectional
-#. * formatting codes to take care of the cases the folder
-#. * name appears in either direction.
-#. *
-#. * Do not translate the "folder-display|" part. Remove it
-#. * from your translation.
-#.
-#: ../mail/em-folder-tree.c:373
-#, c-format
-msgid "folder-display|%s (%u)"
-msgstr "%s (%u)"
-
-#: ../mail/em-folder-tree.c:734
+#: ../mail/em-folder-tree.c:741
msgid "Mail Folder Tree"
msgstr "Mail Folder Tree"
-#: ../mail/em-folder-tree.c:893
+#: ../mail/em-folder-tree.c:900
#, c-format
msgid "Moving folder %s"
msgstr "Moving folder %s"
-#: ../mail/em-folder-tree.c:895
+#: ../mail/em-folder-tree.c:902
#, c-format
msgid "Copying folder %s"
msgstr "Copying folder %s"
-#: ../mail/em-folder-tree.c:902 ../mail/message-list.c:1954
+#: ../mail/em-folder-tree.c:909 ../mail/message-list.c:1953
#, c-format
msgid "Moving messages into folder %s"
msgstr "Moving messages into folder %s"
-#: ../mail/em-folder-tree.c:904 ../mail/message-list.c:1956
+#: ../mail/em-folder-tree.c:911 ../mail/message-list.c:1955
#, c-format
msgid "Copying messages into folder %s"
msgstr "Copying messages into folder %s"
-#: ../mail/em-folder-tree.c:919
+#: ../mail/em-folder-tree.c:926
msgid "Cannot drop message(s) into toplevel store"
msgstr "Cannot drop message(s) into toplevel store"
-#: ../mail/em-folder-tree.c:996 ../ui/evolution-mail-message.xml.h:105
+#: ../mail/em-folder-tree.c:1003 ../ui/evolution-mail-message.xml.h:104
msgid "_Copy to Folder"
msgstr "_Copy to Folder"
-#: ../mail/em-folder-tree.c:997 ../ui/evolution-mail-message.xml.h:118
+#: ../mail/em-folder-tree.c:1004 ../ui/evolution-mail-message.xml.h:117
msgid "_Move to Folder"
msgstr "_Move to Folder"
-#: ../mail/em-folder-tree.c:1706 ../mail/mail-ops.c:1056
+#: ../mail/em-folder-tree.c:1718 ../mail/mail-ops.c:1058
#, c-format
msgid "Scanning folders in \"%s\""
msgstr "Scanning folders in \"%s\""
-#: ../mail/em-folder-tree.c:2079 ../ui/evolution-addressbook.xml.h:64
-#: ../ui/evolution-editor.xml.h:24 ../ui/evolution-mail-global.xml.h:34
-#: ../ui/evolution-mail-messagedisplay.xml.h:8 ../ui/evolution-tasks.xml.h:30
-#: ../ui/evolution.xml.h:54
-msgid "_View"
-msgstr "_View"
-
-#: ../mail/em-folder-tree.c:2080
+#: ../mail/em-folder-tree.c:2099
msgid "Open in _New Window"
msgstr "Open in _New Window"
#. FIXME: need to disable for nochildren folders
-#: ../mail/em-folder-tree.c:2085
+#: ../mail/em-folder-tree.c:2104
msgid "_New Folder..."
msgstr "_New Folder..."
-#: ../mail/em-folder-tree.c:2088
+#: ../mail/em-folder-tree.c:2107
msgid "_Move..."
msgstr "_Move..."
-#: ../mail/em-folder-tree.c:2095 ../ui/evolution-mail-list.xml.h:39
+#: ../mail/em-folder-tree.c:2114 ../ui/evolution-mail-list.xml.h:39
msgid "_Rename..."
msgstr "_Rename..."
-#: ../mail/em-folder-tree.c:2096
+#: ../mail/em-folder-tree.c:2115
msgid "Re_fresh"
msgstr "Re_fresh"
-#: ../mail/em-folder-tree.c:2097
+#: ../mail/em-folder-tree.c:2116
msgid "Fl_ush Outbox"
msgstr "Fl_ush Outbox"
-#: ../mail/em-folder-tree.c:2103 ../mail/mail.error.xml.h:138
+#: ../mail/em-folder-tree.c:2122 ../mail/mail.error.xml.h:138
msgid "_Empty Trash"
msgstr "_Empty Wastebasket"
-#: ../mail/em-folder-utils.c:103
+#: ../mail/em-folder-utils.c:101
#, c-format
msgid "Copying `%s' to `%s'"
msgstr "Copying `%s' to `%s'"
-#: ../mail/em-folder-utils.c:366 ../mail/em-folder-view.c:1193
-#: ../mail/em-folder-view.c:1208
-#: ../mail/importers/evolution-mbox-importer.c:86
+#: ../mail/em-folder-utils.c:364 ../mail/em-folder-view.c:1186
+#: ../mail/em-folder-view.c:1201
+#: ../mail/importers/evolution-mbox-importer.c:83
msgid "Select folder"
msgstr "Select folder"
-#: ../mail/em-folder-utils.c:366 ../mail/em-folder-view.c:1208
+#: ../mail/em-folder-utils.c:364 ../mail/em-folder-view.c:1201
msgid "C_opy"
msgstr "C_opy"
-#: ../mail/em-folder-utils.c:587
-#: ../plugins/groupwise-features/share-folder-common.c:143
+#: ../mail/em-folder-utils.c:585
+#: ../plugins/groupwise-features/share-folder-common.c:145
#, c-format
msgid "Creating folder `%s'"
msgstr "Creating folder `%s'"
-#: ../mail/em-folder-utils.c:745
+#: ../mail/em-folder-utils.c:743
#: ../plugins/groupwise-features/install-shared.c:168
-#: ../plugins/groupwise-features/share-folder-common.c:385
+#: ../plugins/groupwise-features/share-folder-common.c:387
msgid "Create folder"
msgstr "Create folder"
-#: ../mail/em-folder-utils.c:745
+#: ../mail/em-folder-utils.c:743
#: ../plugins/groupwise-features/install-shared.c:168
-#: ../plugins/groupwise-features/share-folder-common.c:385
+#: ../plugins/groupwise-features/share-folder-common.c:387
msgid "Specify where to create the folder:"
msgstr "Specify where to create the folder:"
-#: ../mail/em-folder-view.c:1097 ../mail/mail.error.xml.h:70
+#: ../mail/em-folder-view.c:1090 ../mail/mail.error.xml.h:70
msgid "Mail Deletion Failed"
msgstr "Mail Deletion Failed"
-#: ../mail/em-folder-view.c:1098 ../mail/mail.error.xml.h:126
+#: ../mail/em-folder-view.c:1091 ../mail/mail.error.xml.h:126
msgid "You do not have sufficient permissions to delete this mail."
msgstr "You do not have sufficient permissions to delete this mail."
-#: ../mail/em-folder-view.c:1336 ../ui/evolution-mail-message.xml.h:128
+#: ../mail/em-folder-view.c:1329 ../ui/evolution-mail-message.xml.h:127
msgid "_Reply to Sender"
msgstr "_Reply to Sender"
-#: ../mail/em-folder-view.c:1338 ../mail/em-popup.c:579 ../mail/em-popup.c:590
-#: ../ui/evolution-mail-message.xml.h:110
+#: ../mail/em-folder-view.c:1331 ../mail/em-popup.c:568 ../mail/em-popup.c:579
+#: ../ui/evolution-mail-message.xml.h:109
msgid "_Forward"
msgstr "_Forward"
#. EM_POPUP_EDIT was used here. This is changed to EM_POPUP_SELECT_ONE as Edit-as-new-messaeg need not be restricted to Sent-Items folder alone
-#: ../mail/em-folder-view.c:1342 ../ui/evolution-mail-message.xml.h:107
+#: ../mail/em-folder-view.c:1335 ../ui/evolution-mail-message.xml.h:106
msgid "_Edit as New Message..."
msgstr "_Edit as New Message..."
-#: ../mail/em-folder-view.c:1348
+#: ../mail/em-folder-view.c:1341
msgid "U_ndelete"
msgstr "U_ndelete"
-#: ../mail/em-folder-view.c:1349
+#: ../mail/em-folder-view.c:1342
msgid "_Move to Folder..."
msgstr "_Move to Folder..."
-#: ../mail/em-folder-view.c:1350
+#: ../mail/em-folder-view.c:1343
msgid "_Copy to Folder..."
msgstr "_Copy to Folder..."
-#: ../mail/em-folder-view.c:1353
+#: ../mail/em-folder-view.c:1346
msgid "Mar_k as Read"
msgstr "Mar_k as Read"
-#: ../mail/em-folder-view.c:1354
+#: ../mail/em-folder-view.c:1347
msgid "Mark as _Unread"
msgstr "Mark as _Unread"
-#: ../mail/em-folder-view.c:1355
+#: ../mail/em-folder-view.c:1348
msgid "Mark as _Important"
msgstr "Mark as _Important"
-#: ../mail/em-folder-view.c:1356
+#: ../mail/em-folder-view.c:1349
msgid "Mark as Un_important"
msgstr "Mark as Un_important"
-#: ../mail/em-folder-view.c:1357
+#: ../mail/em-folder-view.c:1350
msgid "Mark as _Junk"
msgstr "Mark as _Junk"
-#: ../mail/em-folder-view.c:1358
+#: ../mail/em-folder-view.c:1351
msgid "Mark as _Not Junk"
msgstr "Mark as _Not Junk"
-#: ../mail/em-folder-view.c:1359
+#: ../mail/em-folder-view.c:1352
msgid "Mark for Follo_w Up..."
msgstr "Mark for Follo_w Up..."
-#: ../mail/em-folder-view.c:1361
+#: ../mail/em-folder-view.c:1354
msgid "_Label"
msgstr "_Label"
#. Note that we don't show this here, since by default a 'None' date
#. is not permitted.
-#: ../mail/em-folder-view.c:1362 ../widgets/misc/e-dateedit.c:500
+#: ../mail/em-folder-view.c:1355 ../widgets/misc/e-dateedit.c:484
msgid "_None"
msgstr "_None"
-#: ../mail/em-folder-view.c:1365
+#: ../mail/em-folder-view.c:1358
msgid "_New Label"
msgstr "_New Label"
-#: ../mail/em-folder-view.c:1369
+#: ../mail/em-folder-view.c:1362
msgid "Fla_g Completed"
msgstr "Fla_g Completed"
-#: ../mail/em-folder-view.c:1370
+#: ../mail/em-folder-view.c:1363
msgid "Cl_ear Flag"
msgstr "Cl_ear Flag"
-#: ../mail/em-folder-view.c:1373
+#: ../mail/em-folder-view.c:1366
msgid "Crea_te Rule From Message"
msgstr "Crea_te Rule From Message"
#. Translators: The following strings are used while creating a new search folder, to specify what parameter the search folder would be based on.
-#: ../mail/em-folder-view.c:1375
+#: ../mail/em-folder-view.c:1368
msgid "Search Folder based on _Subject"
msgstr "Search Folder based on _Subject"
-#: ../mail/em-folder-view.c:1376
+#: ../mail/em-folder-view.c:1369
msgid "Search Folder based on Se_nder"
msgstr "Search Folder based on Se_nder"
-#: ../mail/em-folder-view.c:1377
+#: ../mail/em-folder-view.c:1370
msgid "Search Folder based on _Recipients"
msgstr "Search Folder based on _Recipients"
-#: ../mail/em-folder-view.c:1378
+#: ../mail/em-folder-view.c:1371
msgid "Search Folder based on Mailing _List"
msgstr "Search Folder based on Mailing _List"
#. Translators: The following strings are used while creating a new message filter, to specify what parameter the filter would be based on.
-#: ../mail/em-folder-view.c:1383
+#: ../mail/em-folder-view.c:1376
msgid "Filter based on Sub_ject"
msgstr "Filter based on Sub_ject"
-#: ../mail/em-folder-view.c:1384
+#: ../mail/em-folder-view.c:1377
msgid "Filter based on Sen_der"
msgstr "Filter based on Sen_der"
-#: ../mail/em-folder-view.c:1385
+#: ../mail/em-folder-view.c:1378
msgid "Filter based on Re_cipients"
msgstr "Filter based on Re_cipients"
-#: ../mail/em-folder-view.c:1386
+#: ../mail/em-folder-view.c:1379
msgid "Filter based on _Mailing List"
msgstr "Filter based on _Mailing List"
#. default charset used in mail view
-#: ../mail/em-folder-view.c:2268 ../mail/em-folder-view.c:2312
+#. we changed user, thus reset the chosen calendar combo too, because
+#. other user means other calendars subscribed
+#: ../mail/em-folder-view.c:2255 ../mail/em-folder-view.c:2298
+#: ../plugins/google-account-setup/google-source.c:251
+#: ../plugins/google-account-setup/google-source.c:532
+#: ../plugins/google-account-setup/google-source.c:718
msgid "Default"
msgstr "Default"
-#: ../mail/em-folder-view.c:2530
+#: ../mail/em-folder-view.c:2516
msgid "Unable to retrieve message"
msgstr "Unable to retrieve message"
-#: ../mail/em-folder-view.c:2549
+#: ../mail/em-folder-view.c:2535
msgid "Retrieving Message..."
msgstr "Retrieving Message..."
-#: ../mail/em-folder-view.c:2808
+#: ../mail/em-folder-view.c:2794
msgid "C_all To..."
msgstr "C_all To..."
-#: ../mail/em-folder-view.c:2811
+#: ../mail/em-folder-view.c:2797
msgid "Create _Search Folder"
msgstr "Create _Search Folder"
-#: ../mail/em-folder-view.c:2812
+#: ../mail/em-folder-view.c:2798
msgid "_From this Address"
msgstr "_From this Address"
-#: ../mail/em-folder-view.c:2813
+#: ../mail/em-folder-view.c:2799
msgid "_To this Address"
msgstr "_To this Address"
-#: ../mail/em-folder-view.c:3310
+#: ../mail/em-folder-view.c:3296
#, c-format
msgid "Click to mail %s"
msgstr "Click to mail %s"
-#: ../mail/em-folder-view.c:3322
+#: ../mail/em-folder-view.c:3308
#, c-format
msgid "Click to call %s"
msgstr "Click to call %s"
-#: ../mail/em-folder-view.c:3327
+#: ../mail/em-folder-view.c:3313
msgid "Click to hide/unhide addresses"
msgstr "Click to hide/unhide addresses"
#. message-search popup match count string
-#: ../mail/em-format-html-display.c:494
+#: ../mail/em-format-html-display.c:470
#, c-format
msgid "Matches: %d"
msgstr "Matches: %d"
-#: ../mail/em-format-html-display.c:638
+#: ../mail/em-format-html-display.c:614
msgid "Fin_d:"
msgstr "Fin_d:"
#. gtk_box_pack_start ((GtkBox *)(hbox2), p->search_entry_box, TRUE, TRUE, 5);
-#: ../mail/em-format-html-display.c:662
+#: ../mail/em-format-html-display.c:638
msgid "_Previous"
msgstr "_Previous"
-#: ../mail/em-format-html-display.c:667
+#: ../mail/em-format-html-display.c:643
msgid "_Next"
msgstr "_Next"
-#: ../mail/em-format-html-display.c:672
+#: ../mail/em-format-html-display.c:648
msgid "M_atch case"
msgstr "M_atch case"
-#: ../mail/em-format-html-display.c:971 ../mail/em-format-html.c:647
+#: ../mail/em-format-html-display.c:947 ../mail/em-format-html.c:650
msgid "Unsigned"
msgstr "Unsigned"
-#: ../mail/em-format-html-display.c:971
+#: ../mail/em-format-html-display.c:947
msgid ""
"This message is not signed. There is no guarantee that this message is "
"authentic."
@@ -12004,11 +12333,11 @@ msgstr ""
"This message is not signed. There is no guarantee that this message is "
"authentic."
-#: ../mail/em-format-html-display.c:972 ../mail/em-format-html.c:648
+#: ../mail/em-format-html-display.c:948 ../mail/em-format-html.c:651
msgid "Valid signature"
msgstr "Valid signature"
-#: ../mail/em-format-html-display.c:972
+#: ../mail/em-format-html-display.c:948
msgid ""
"This message is signed and is valid meaning that it is very likely that this "
"message is authentic."
@@ -12016,11 +12345,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:973 ../mail/em-format-html.c:649
+#: ../mail/em-format-html-display.c:949 ../mail/em-format-html.c:652
msgid "Invalid signature"
msgstr "Invalid signature"
-#: ../mail/em-format-html-display.c:973
+#: ../mail/em-format-html-display.c:949
msgid ""
"The signature of this message cannot be verified, it may have been altered "
"in transit."
@@ -12028,11 +12357,11 @@ msgstr ""
"The signature of this message cannot be verified, it may have been altered "
"in transit."
-#: ../mail/em-format-html-display.c:974 ../mail/em-format-html.c:650
+#: ../mail/em-format-html-display.c:950 ../mail/em-format-html.c:653
msgid "Valid signature, but cannot verify sender"
msgstr "Valid signature, but cannot verify sender"
-#: ../mail/em-format-html-display.c:974
+#: ../mail/em-format-html-display.c:950
msgid ""
"This message is signed with a valid signature, but the sender of the message "
"cannot be verified."
@@ -12040,11 +12369,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:975 ../mail/em-format-html.c:651
+#: ../mail/em-format-html-display.c:951 ../mail/em-format-html.c:654
msgid "Signature exists, but need public key"
msgstr "Signature exists, but need public key"
-#: ../mail/em-format-html-display.c:975
+#: ../mail/em-format-html-display.c:951
msgid ""
"This message is signed with a signature, but there is no corresponding "
"public key."
@@ -12052,11 +12381,11 @@ msgstr ""
"This message is signed with a signature, but there is no corresponding "
"public key."
-#: ../mail/em-format-html-display.c:982 ../mail/em-format-html.c:657
+#: ../mail/em-format-html-display.c:958 ../mail/em-format-html.c:660
msgid "Unencrypted"
msgstr "Unencrypted"
-#: ../mail/em-format-html-display.c:982
+#: ../mail/em-format-html-display.c:958
msgid ""
"This message is not encrypted. Its content may be viewed in transit across "
"the Internet."
@@ -12064,11 +12393,11 @@ msgstr ""
"This message is not encrypted. Its content may be viewed in transit across "
"the Internet."
-#: ../mail/em-format-html-display.c:983 ../mail/em-format-html.c:658
+#: ../mail/em-format-html-display.c:959 ../mail/em-format-html.c:661
msgid "Encrypted, weak"
msgstr "Encrypted, weak"
-#: ../mail/em-format-html-display.c:983
+#: ../mail/em-format-html-display.c:959
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 "
@@ -12078,11 +12407,11 @@ msgstr ""
"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:984 ../mail/em-format-html.c:659
+#: ../mail/em-format-html-display.c:960 ../mail/em-format-html.c:662
msgid "Encrypted"
msgstr "Encrypted"
-#: ../mail/em-format-html-display.c:984
+#: ../mail/em-format-html-display.c:960
msgid ""
"This message is encrypted. It would be difficult for an outsider to view "
"the content of this message."
@@ -12090,11 +12419,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:985 ../mail/em-format-html.c:660
+#: ../mail/em-format-html-display.c:961 ../mail/em-format-html.c:663
msgid "Encrypted, strong"
msgstr "Encrypted, strong"
-#: ../mail/em-format-html-display.c:985
+#: ../mail/em-format-html-display.c:961
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 "
@@ -12104,92 +12433,92 @@ 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:1086 ../smime/gui/smime-ui.glade.h:48
+#: ../mail/em-format-html-display.c:1062 ../smime/gui/smime-ui.glade.h:48
msgid "_View Certificate"
msgstr "_View Certificate"
-#: ../mail/em-format-html-display.c:1101
+#: ../mail/em-format-html-display.c:1077
msgid "This certificate is not viewable"
msgstr "This certificate is not viewable"
-#: ../mail/em-format-html-display.c:1394
+#: ../mail/em-format-html-display.c:1371
msgid "Completed on %B %d, %Y, %l:%M %p"
msgstr "Completed on %d %B, %Y, %l:%M %p"
-#: ../mail/em-format-html-display.c:1402
+#: ../mail/em-format-html-display.c:1379
msgid "Overdue:"
msgstr "Overdue:"
-#: ../mail/em-format-html-display.c:1405
+#: ../mail/em-format-html-display.c:1382
msgid "by %B %d, %Y, %l:%M %p"
msgstr "by %d %B, %Y, %l:%M %p"
-#: ../mail/em-format-html-display.c:1483
+#: ../mail/em-format-html-display.c:1460
msgid "_View Inline"
msgstr "_View Inline"
-#: ../mail/em-format-html-display.c:1484
+#: ../mail/em-format-html-display.c:1461
msgid "_Hide"
msgstr "_Hide"
-#: ../mail/em-format-html-display.c:1485
+#: ../mail/em-format-html-display.c:1462
msgid "_Fit to Width"
msgstr "_Fit to Width"
-#: ../mail/em-format-html-display.c:1486
+#: ../mail/em-format-html-display.c:1463
msgid "Show _Original Size"
msgstr "Show _Original Size"
-#: ../mail/em-format-html-display.c:2006
+#: ../mail/em-format-html-display.c:1983
msgid "Save attachment as"
msgstr "Save attachment as"
-#: ../mail/em-format-html-display.c:2010
+#: ../mail/em-format-html-display.c:1987
msgid "Select folder to save all attachments"
msgstr "Select folder to save all attachments"
-#: ../mail/em-format-html-display.c:2061
+#: ../mail/em-format-html-display.c:2038
msgid "_Save Selected..."
msgstr "_Save Selected..."
#. Cant i put in the number of attachments here ?
-#: ../mail/em-format-html-display.c:2128
+#: ../mail/em-format-html-display.c:2105
#, c-format
msgid "%d at_tachment"
msgid_plural "%d at_tachments"
msgstr[0] "%d at_tachment"
msgstr[1] "%d at_tachments"
-#: ../mail/em-format-html-display.c:2135 ../mail/em-format-html-display.c:2224
+#: ../mail/em-format-html-display.c:2112 ../mail/em-format-html-display.c:2201
msgid "S_ave"
msgstr "S_ave"
-#: ../mail/em-format-html-display.c:2146
+#: ../mail/em-format-html-display.c:2123
msgid "S_ave All"
msgstr "S_ave All"
-#: ../mail/em-format-html-display.c:2220
+#: ../mail/em-format-html-display.c:2197
msgid "No Attachment"
msgstr "No Attachment"
-#: ../mail/em-format-html-display.c:2361 ../mail/em-format-html-display.c:2399
+#: ../mail/em-format-html-display.c:2338 ../mail/em-format-html-display.c:2377
msgid "View _Unformatted"
msgstr "View _Unformatted"
-#: ../mail/em-format-html-display.c:2363
+#: ../mail/em-format-html-display.c:2340
msgid "Hide _Unformatted"
msgstr "Hide _Unformatted"
-#: ../mail/em-format-html-display.c:2418
+#: ../mail/em-format-html-display.c:2397
msgid "O_pen With"
msgstr "O_pen With"
-#: ../mail/em-format-html-display.c:2489
+#: ../mail/em-format-html-display.c:2473
msgid ""
-"Evolution cannot render this email as it is too large to handle. You can "
+"Evolution cannot render this email as it is too large to process. You can "
"view it unformatted or with an external text editor."
msgstr ""
-"Evolution cannot render this e-mail as it is too large to handle. You can "
+"Evolution cannot render this e-mail as it is too large to process. You can "
"view it unformatted or with an external text editor."
#: ../mail/em-format-html-print.c:156
@@ -12197,275 +12526,287 @@ msgstr ""
msgid "Page %d of %d"
msgstr "Page %d of %d"
-#: ../mail/em-format-html.c:501 ../mail/em-format-html.c:510
+#: ../mail/em-format-html.c:504 ../mail/em-format-html.c:513
#, c-format
msgid "Retrieving `%s'"
msgstr "Retrieving `%s'"
-#: ../mail/em-format-html.c:922
+#: ../mail/em-format-html.c:925
msgid "Unknown external-body part."
msgstr "Unknown external-body part."
-#: ../mail/em-format-html.c:930
+#: ../mail/em-format-html.c:933
msgid "Malformed external-body part."
msgstr "Malformed external-body part."
-#: ../mail/em-format-html.c:960
+#: ../mail/em-format-html.c:963
#, c-format
msgid "Pointer to FTP site (%s)"
msgstr "Pointer to FTP site (%s)"
-#: ../mail/em-format-html.c:971
+#: ../mail/em-format-html.c:974
#, 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:973
+#: ../mail/em-format-html.c:976
#, c-format
msgid "Pointer to local file (%s)"
msgstr "Pointer to local file (%s)"
-#: ../mail/em-format-html.c:994
+#: ../mail/em-format-html.c:997
#, c-format
msgid "Pointer to remote data (%s)"
msgstr "Pointer to remote data (%s)"
-#: ../mail/em-format-html.c:1005
+#: ../mail/em-format-html.c:1008
#, c-format
msgid "Pointer to unknown external data (\"%s\" type)"
msgstr "Pointer to unknown external data (\"%s\" type)"
-#: ../mail/em-format-html.c:1233
+#: ../mail/em-format-html.c:1236
msgid "Formatting message"
msgstr "Formatting message"
-#: ../mail/em-format-html.c:1407
+#: ../mail/em-format-html.c:1410
msgid "Formatting Message..."
msgstr "Formatting Message..."
-#: ../mail/em-format-html.c:1559 ../mail/em-format-html.c:1623
-#: ../mail/em-format-html.c:1645 ../mail/em-format-quote.c:209
-#: ../mail/em-format.c:887 ../mail/em-mailer-prefs.c:93
+#: ../mail/em-format-html.c:1563 ../mail/em-format-html.c:1627
+#: ../mail/em-format-html.c:1649 ../mail/em-format-quote.c:210
+#: ../mail/em-format.c:887 ../mail/em-mailer-prefs.c:78
msgid "Cc"
msgstr "Cc"
-#: ../mail/em-format-html.c:1560 ../mail/em-format-html.c:1629
-#: ../mail/em-format-html.c:1648 ../mail/em-format-quote.c:209
-#: ../mail/em-format.c:888 ../mail/em-mailer-prefs.c:94
+#: ../mail/em-format-html.c:1564 ../mail/em-format-html.c:1633
+#: ../mail/em-format-html.c:1652 ../mail/em-format-quote.c:210
+#: ../mail/em-format.c:888 ../mail/em-mailer-prefs.c:79
msgid "Bcc"
msgstr "Bcc"
#. pseudo-header
-#: ../mail/em-format-html.c:1740 ../mail/em-format-quote.c:350
-#: ../mail/em-mailer-prefs.c:1465
+#: ../mail/em-format-html.c:1744 ../mail/em-format-quote.c:353
+#: ../mail/em-mailer-prefs.c:1450
msgid "Mailer"
msgstr "Mailer"
#. translators: strftime format for local time equivalent in Date header display, with day
-#: ../mail/em-format-html.c:1767
+#: ../mail/em-format-html.c:1771
msgid " (%a, %R %Z)"
msgstr " (%a, %R %Z)"
#. translators: strftime format for local time equivalent in Date header display, without day
-#: ../mail/em-format-html.c:1772
+#: ../mail/em-format-html.c:1776
msgid " (%R %Z)"
msgstr " (%R %Z)"
#. To translators: This message suggests to the receipients that the sender of the mail is
#. different from the one listed in From field.
#.
-#: ../mail/em-format-html.c:1903
+#: ../mail/em-format-html.c:1907
#, c-format
msgid "This message was sent by <b>%s</b> on behalf of <b>%s</b>"
msgstr "This message was sent by <b>%s</b> on behalf of <b>%s</b>"
-#: ../mail/em-format-quote.c:209 ../mail/em-format.c:884
-#: ../mail/em-mailer-prefs.c:90 ../mail/message-list.etspec.h:7
-#: ../mail/message-tag-followup.c:333
+#: ../mail/em-format-quote.c:210 ../mail/em-format.c:884
+#: ../mail/em-mailer-prefs.c:75 ../mail/message-list.etspec.h:7
+#: ../mail/message-tag-followup.c:308
msgid "From"
msgstr "From"
-#: ../mail/em-format-quote.c:209 ../mail/em-format.c:885
-#: ../mail/em-mailer-prefs.c:91
+#: ../mail/em-format-quote.c:210 ../mail/em-format.c:885
+#: ../mail/em-mailer-prefs.c:76
msgid "Reply-To"
msgstr "Reply-To"
-#: ../mail/em-format.c:890 ../mail/em-mailer-prefs.c:96
-#: ../mail/message-list.etspec.h:2 ../widgets/misc/e-dateedit.c:346
-#: ../widgets/misc/e-dateedit.c:368
+#: ../mail/em-format.c:890 ../mail/em-mailer-prefs.c:81
+#: ../mail/message-list.etspec.h:2 ../widgets/misc/e-dateedit.c:331
+#: ../widgets/misc/e-dateedit.c:353
msgid "Date"
msgstr "Date"
-#: ../mail/em-format.c:891 ../mail/em-mailer-prefs.c:97
+#: ../mail/em-format.c:891 ../mail/em-mailer-prefs.c:82
msgid "Newsgroups"
msgstr "Newsgroups"
-#: ../mail/em-format.c:1156
+#: ../mail/em-format.c:1157
#, c-format
msgid "%s attachment"
msgstr "%s attachment"
-#: ../mail/em-format.c:1196
+#: ../mail/em-format.c:1199
msgid "Could not parse S/MIME message: Unknown error"
msgstr "Could not parse S/MIME message: Unknown error"
-#: ../mail/em-format.c:1333 ../mail/em-format.c:1489
+#: ../mail/em-format.c:1336 ../mail/em-format.c:1492
msgid "Could not parse MIME message. Displaying as source."
msgstr "Could not parse MIME message. Displaying as source."
-#: ../mail/em-format.c:1341
+#: ../mail/em-format.c:1344
msgid "Unsupported encryption type for multipart/encrypted"
msgstr "Unsupported encryption type for multipart/encrypted"
-#: ../mail/em-format.c:1351
+#: ../mail/em-format.c:1354
msgid "Could not parse PGP/MIME message"
msgstr "Could not parse PGP/MIME message"
-#: ../mail/em-format.c:1351
+#: ../mail/em-format.c:1354
msgid "Could not parse PGP/MIME message: Unknown error"
msgstr "Could not parse PGP/MIME message: Unknown error"
-#: ../mail/em-format.c:1508
+#: ../mail/em-format.c:1511
msgid "Unsupported signature format"
msgstr "Unsupported signature format"
-#: ../mail/em-format.c:1516 ../mail/em-format.c:1587
+#: ../mail/em-format.c:1519 ../mail/em-format.c:1590
msgid "Error verifying signature"
msgstr "Error verifying signature"
-#: ../mail/em-format.c:1516 ../mail/em-format.c:1578 ../mail/em-format.c:1587
+#: ../mail/em-format.c:1519 ../mail/em-format.c:1581 ../mail/em-format.c:1590
msgid "Unknown error verifying signature"
msgstr "Unknown error verifying signature"
-#: ../mail/em-format.c:1659
+#: ../mail/em-format.c:1662
msgid "Could not parse PGP message"
msgstr "Could not parse PGP message"
-#: ../mail/em-format.c:1659
+#: ../mail/em-format.c:1662
msgid "Could not parse PGP message: Unknown error"
msgstr "Could not parse PGP message: Unknown error"
-#: ../mail/em-mailer-prefs.c:108
+#: ../mail/em-mailer-prefs.c:93
msgid "Every time"
msgstr "Every time"
-#: ../mail/em-mailer-prefs.c:109
+#: ../mail/em-mailer-prefs.c:94
msgid "Once per day"
msgstr "Once per day"
-#: ../mail/em-mailer-prefs.c:110
+#: ../mail/em-mailer-prefs.c:95
msgid "Once per week"
msgstr "Once per week"
-#: ../mail/em-mailer-prefs.c:111
+#: ../mail/em-mailer-prefs.c:96
msgid "Once per month"
msgstr "Once per month"
-#: ../mail/em-mailer-prefs.c:341
+#: ../mail/em-mailer-prefs.c:326
msgid "Add Custom Junk Header"
msgstr "Add Custom Junk Header"
-#: ../mail/em-mailer-prefs.c:345
+#: ../mail/em-mailer-prefs.c:330
msgid "Header Name:"
msgstr "Header Name:"
-#: ../mail/em-mailer-prefs.c:346
+#: ../mail/em-mailer-prefs.c:331
msgid "Header Value Contains:"
msgstr "Header Value Contains:"
-#: ../mail/em-mailer-prefs.c:451
+#: ../mail/em-mailer-prefs.c:436
msgid "Contains Value"
msgstr "Contains Value"
-#: ../mail/em-mailer-prefs.c:473
+#: ../mail/em-mailer-prefs.c:458
msgid "Color"
msgstr "Colour"
-#: ../mail/em-mailer-prefs.c:476
+#: ../mail/em-mailer-prefs.c:461
msgid "Tag"
msgstr "Tag"
#. May be a better text
-#: ../mail/em-mailer-prefs.c:1093 ../mail/em-mailer-prefs.c:1147
+#: ../mail/em-mailer-prefs.c:1078 ../mail/em-mailer-prefs.c:1132
#, c-format
msgid "%s plugin is available and the binary is installed."
msgstr "%s plugin is available and the binary is installed."
#. May be a better text
-#: ../mail/em-mailer-prefs.c:1101 ../mail/em-mailer-prefs.c:1156
+#: ../mail/em-mailer-prefs.c:1086 ../mail/em-mailer-prefs.c:1141
#, c-format
msgid ""
"%s plugin is not available. Please check whether the package is installed."
msgstr ""
"%s plugin is not available. Please check whether the package is installed."
-#: ../mail/em-mailer-prefs.c:1122
+#: ../mail/em-mailer-prefs.c:1107
msgid "No Junk plugin available"
msgstr "No Junk plugin available"
#. green
-#: ../mail/em-migrate.c:1056
+#: ../mail/em-migrate.c:1059
msgid "To Do"
msgstr "To Do"
#. blue
-#: ../mail/em-migrate.c:1057
+#: ../mail/em-migrate.c:1060
msgid "Later"
msgstr "Later"
-#: ../mail/em-migrate.c:1210
-msgid ""
-"The location and hierarchy of the Evolution mailbox folders has changed "
-"since Evolution 1.x.\n"
-"\n"
-"Please be patient while Evolution migrates your folders..."
-msgstr ""
-"The location and hierarchy of the Evolution mailbox folders has changed "
-"since Evolution 1.x.\n"
-"\n"
-"Please be patient while Evolution migrates your folders..."
-
-#: ../mail/em-migrate.c:1649
+#: ../mail/em-migrate.c:1652
#, c-format
msgid "Unable to create new folder `%s': %s"
msgstr "Unable to create new folder `%s': %s"
-#: ../mail/em-migrate.c:1675
+#: ../mail/em-migrate.c:1678
#, c-format
msgid "Unable to copy folder `%s' to `%s': %s"
msgstr "Unable to copy folder `%s' to `%s': %s"
-#: ../mail/em-migrate.c:1860
+#: ../mail/em-migrate.c:1863
#, 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:2064
+#: ../mail/em-migrate.c:1868
+msgid ""
+"The location and hierarchy of the Evolution mailbox folders has changed "
+"since Evolution 1.x.\n"
+"\n"
+"Please be patient while Evolution migrates your folders..."
+msgstr ""
+"The location and hierarchy of the Evolution mailbox folders has changed "
+"since Evolution 1.x.\n"
+"\n"
+"Please be patient while Evolution migrates your folders..."
+
+#: ../mail/em-migrate.c:2069
#, 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:2078
+#: ../mail/em-migrate.c:2083
#, 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:2107
+#: ../mail/em-migrate.c:2112
#, 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:2578 ../mail/em-migrate.c:2590
+#: ../mail/em-migrate.c:2583 ../mail/em-migrate.c:2595
#, c-format
msgid "Failed to create local mail storage `%s': %s"
msgstr "Failed to create local mail storage `%s': %s"
-#: ../mail/em-migrate.c:2851
+#: ../mail/em-migrate.c:2898
+msgid ""
+"The summary format of the Evolution mailbox folders has been moved to sqlite "
+"since Evolution 2.24.\n"
+"\n"
+"Please be patient while Evolution migrates your folders..."
+msgstr ""
+"The summary format of the Evolution mailbox folders has been moved to SQLite "
+"since Evolution 2.24.\n"
+"\n"
+"Please be patient while Evolution migrates your folders..."
+
+#: ../mail/em-migrate.c:2963
#, 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:2870
+#: ../mail/em-migrate.c:2982
msgid ""
"Unable to read settings from previous Evolution install, `evolution/config."
"xmldb' does not exist or is corrupt."
@@ -12473,43 +12814,44 @@ msgstr ""
"Unable to read settings from previous Evolution install, `evolution/config."
"xmldb' does not exist or is corrupt."
-#: ../mail/em-popup.c:575 ../mail/em-popup.c:586
+#: ../mail/em-popup.c:564 ../mail/em-popup.c:575
msgid "_Reply to sender"
msgstr "_Reply to sender"
-#: ../mail/em-popup.c:576 ../mail/em-popup.c:587
+#: ../mail/em-popup.c:565 ../mail/em-popup.c:576
#: ../ui/evolution-mail-message.xml.h:83
msgid "Reply to _List"
msgstr "Reply to _List"
#. make it first item
-#: ../mail/em-popup.c:640 ../mail/em-popup.c:869
+#: ../mail/em-popup.c:629 ../mail/em-popup.c:852
msgid "_Add to Address Book"
msgstr "_Add to Address Book"
-#: ../mail/em-subscribe-editor.c:596
+#: ../mail/em-subscribe-editor.c:583
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:629
+#: ../mail/em-subscribe-editor.c:616
msgid "Subscribed"
msgstr "Subscribed"
-#: ../mail/em-subscribe-editor.c:633
+#: ../mail/em-subscribe-editor.c:620
msgid "Folder"
msgstr "Folder"
#. FIXME: This is just to get the shadow, is there a better way?
-#: ../mail/em-subscribe-editor.c:835
+#: ../mail/em-subscribe-editor.c:822
msgid "Please select a server."
msgstr "Please select a server."
-#: ../mail/em-subscribe-editor.c:856
+#: ../mail/em-subscribe-editor.c:843
msgid "No server has been selected"
msgstr "No server has been selected"
+#. Check buttons
#: ../mail/em-utils.c:120
-#: ../plugins/attachment-reminder/attachment-reminder.c:125
+#: ../plugins/attachment-reminder/attachment-reminder.c:127
msgid "_Do not show this message again."
msgstr "_Do not show this message again."
@@ -12535,7 +12877,7 @@ msgstr "Add address"
msgid "Messages from %s"
msgstr "Messages from %s"
-#: ../mail/em-vfolder-editor.c:112
+#: ../mail/em-vfolder-editor.c:115
msgid "Search _Folders"
msgstr "Search _Folders"
@@ -12612,10 +12954,18 @@ msgstr ""
"address_count."
#: ../mail/evolution-mail.schemas.in.h:17
+msgid ""
+"Controls how frequently local changes are synchronized with the remote mail "
+"server. The interval must be at least 30 seconds."
+msgstr ""
+"Controls how frequently local changes are synchronised with the remote mail "
+"server. The interval must be at least 30 seconds."
+
+#: ../mail/evolution-mail.schemas.in.h:18
msgid "Custom headers to use while checking for junk."
msgstr "Custom headers to use while checking for junk."
-#: ../mail/evolution-mail.schemas.in.h:18
+#: ../mail/evolution-mail.schemas.in.h:19
msgid ""
"Custom headers to use while checking for junk. The list elements are string "
"in the format \"headername=value\"."
@@ -12623,87 +12973,87 @@ msgstr ""
"Custom headers to use while checking for junk. The list elements are strings "
"in the format \"headername=value\"."
-#: ../mail/evolution-mail.schemas.in.h:19
+#: ../mail/evolution-mail.schemas.in.h:20
msgid "Default charset in which to compose messages"
msgstr "Default charset in which to compose messages"
-#: ../mail/evolution-mail.schemas.in.h:20
+#: ../mail/evolution-mail.schemas.in.h:21
msgid "Default charset in which to compose messages."
msgstr "Default charset in which to compose messages."
-#: ../mail/evolution-mail.schemas.in.h:21
+#: ../mail/evolution-mail.schemas.in.h:22
msgid "Default charset in which to display messages"
msgstr "Default charset in which to display messages"
-#: ../mail/evolution-mail.schemas.in.h:22
+#: ../mail/evolution-mail.schemas.in.h:23
msgid "Default charset in which to display messages."
msgstr "Default charset in which to display messages."
-#: ../mail/evolution-mail.schemas.in.h:23
+#: ../mail/evolution-mail.schemas.in.h:24
msgid "Default forward style"
msgstr "Default forward style"
-#: ../mail/evolution-mail.schemas.in.h:24
+#: ../mail/evolution-mail.schemas.in.h:25
msgid "Default height of the Composer Window."
msgstr "Default height of the Composer Window."
-#: ../mail/evolution-mail.schemas.in.h:25
+#: ../mail/evolution-mail.schemas.in.h:26
msgid "Default height of the message window."
msgstr "Default height of the message window."
-#: ../mail/evolution-mail.schemas.in.h:26
+#: ../mail/evolution-mail.schemas.in.h:27
msgid "Default height of the subscribe dialog."
msgstr "Default height of the subscribe dialogue."
-#: ../mail/evolution-mail.schemas.in.h:27
+#: ../mail/evolution-mail.schemas.in.h:28
msgid "Default reply style"
msgstr "Default reply style"
-#: ../mail/evolution-mail.schemas.in.h:28
+#: ../mail/evolution-mail.schemas.in.h:29
msgid "Default value for thread expand state"
msgstr "Default value for thread expand state"
-#: ../mail/evolution-mail.schemas.in.h:29
+#: ../mail/evolution-mail.schemas.in.h:30
msgid "Default width of the Composer Window."
msgstr "Default width of the Composer Window."
-#: ../mail/evolution-mail.schemas.in.h:30
+#: ../mail/evolution-mail.schemas.in.h:31
msgid "Default width of the message window."
msgstr "Default width of the message window."
-#: ../mail/evolution-mail.schemas.in.h:31
+#: ../mail/evolution-mail.schemas.in.h:32
msgid "Default width of the subscribe dialog."
msgstr "Default width of the subscribe dialogue."
-#: ../mail/evolution-mail.schemas.in.h:32
+#: ../mail/evolution-mail.schemas.in.h:33
msgid ""
-"Determines whether to look up addresses for junk filtering in local "
-"addressbook only"
+"Determines whether to look up addresses for junk filtering in local address "
+"book only"
msgstr ""
-"Determines whether to look up addresses for junk filtering in the local "
-"address book only"
-
-#: ../mail/evolution-mail.schemas.in.h:33
-msgid "Determines whether to lookup in addressbook for sender email"
-msgstr "Determines whether to look up in address book for sender e-mail"
+"Determines whether to look up addresses for junk filtering in local address "
+"book only"
#: ../mail/evolution-mail.schemas.in.h:34
+msgid "Determines whether to lookup in address book for sender email"
+msgstr "Determines whether to lookup in address book for sender e-mail"
+
+#: ../mail/evolution-mail.schemas.in.h:35
msgid ""
-"Determines whether to loopup the sender email in addressbook. If found, it "
+"Determines whether to lookup the sender email in address book. If found, it "
"shouldn't be a spam. It looks up in the books marked for autocompletion. It "
-"can be slow, if remote addressbooks (like ldap) are marked for "
+"can be slow, if remote address books (like LDAP) are marked for "
"autocompletion."
msgstr ""
-"Determines whether to look up the sender e-mail in the address book. If "
-"found, it shouldn't be a spam. It looks up in the books marked for "
-"autocompletion. It can be slow, if remote address books (like LDAP) are "
-"marked for autocompletion."
+"Determines whether to lookup the sender e-mail in address book. If found, it "
+"shouldn't be a spam. It looks up in the books marked for autocompletion. It "
+"can be slow, if remote address books (like LDAP) are marked for "
+"autocompletion."
-#: ../mail/evolution-mail.schemas.in.h:35
+#: ../mail/evolution-mail.schemas.in.h:36
msgid "Determines whether to use custom headers to check for junk"
msgstr "Determines whether to use custom headers to check for junk"
-#: ../mail/evolution-mail.schemas.in.h:36
+#: ../mail/evolution-mail.schemas.in.h:37
msgid ""
"Determines whether to use custom headers to check for junk. If this option "
"is enabled and the headers are mentioned, it will be improve the junk "
@@ -12713,7 +13063,7 @@ msgstr ""
"is enabled and the headers are mentioned, it will be improve the junk "
"checking speed."
-#: ../mail/evolution-mail.schemas.in.h:37
+#: ../mail/evolution-mail.schemas.in.h:38
msgid ""
"Determines whether to use the same fonts for both \"From\" and \"Subject\" "
"lines in the \"Messages\" column in vertical view."
@@ -12721,59 +13071,59 @@ msgstr ""
"Determines whether to use the same fonts for both \"From\" and \"Subject\" "
"lines in the \"Messages\" column in vertical view."
-#: ../mail/evolution-mail.schemas.in.h:38
+#: ../mail/evolution-mail.schemas.in.h:39
msgid "Directory for loading/attaching files to composer."
msgstr "Directory for loading/attaching files to composer."
-#: ../mail/evolution-mail.schemas.in.h:39
+#: ../mail/evolution-mail.schemas.in.h:40
msgid "Directory for saving mail component files."
msgstr "Directory for saving mail component files."
-#: ../mail/evolution-mail.schemas.in.h:40
+#: ../mail/evolution-mail.schemas.in.h:41
msgid "Disable or enable ellipsizing of folder names in folder tree"
msgstr "Disable or enable ellipsizing of folder names in folder tree"
-#: ../mail/evolution-mail.schemas.in.h:41
+#: ../mail/evolution-mail.schemas.in.h:42
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.h:42
+#: ../mail/evolution-mail.schemas.in.h:43
msgid "Empty Junk folders on exit"
msgstr "Empty Junk folders on exit"
-#: ../mail/evolution-mail.schemas.in.h:43
+#: ../mail/evolution-mail.schemas.in.h:44
msgid "Empty Trash folders on exit"
msgstr "Empty Wastebasket folders on exit"
-#: ../mail/evolution-mail.schemas.in.h:44
+#: ../mail/evolution-mail.schemas.in.h:45
msgid "Empty all Junk folders when exiting Evolution."
msgstr "Empty all Junk folders when exiting Evolution."
-#: ../mail/evolution-mail.schemas.in.h:45
+#: ../mail/evolution-mail.schemas.in.h:46
msgid "Empty all Trash folders when exiting Evolution."
msgstr "Empty all Wastebasket folders when exiting Evolution."
-#: ../mail/evolution-mail.schemas.in.h:46
+#: ../mail/evolution-mail.schemas.in.h:47
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.h:47
+#: ../mail/evolution-mail.schemas.in.h:48
msgid "Enable or disable magic space bar"
msgstr "Enable or disable magic space bar"
-#: ../mail/evolution-mail.schemas.in.h:48
+#: ../mail/evolution-mail.schemas.in.h:49
msgid "Enable or disable type ahead search feature"
msgstr "Enable or disable type ahead search feature"
-#: ../mail/evolution-mail.schemas.in.h:49
+#: ../mail/evolution-mail.schemas.in.h:50
msgid "Enable search folders"
msgstr "Enable search folders"
-#: ../mail/evolution-mail.schemas.in.h:50
+#: ../mail/evolution-mail.schemas.in.h:51
msgid "Enable search folders on startup."
msgstr "Enable search folders on startup."
-#: ../mail/evolution-mail.schemas.in.h:51
+#: ../mail/evolution-mail.schemas.in.h:52
msgid ""
"Enable side bar search feature so that you can start interactive searching "
"by typing in the text. Use is that you can easily find a folder in that side "
@@ -12785,7 +13135,7 @@ msgstr ""
"bar by just typing the folder name and the selection jumps automatically to "
"that folder."
-#: ../mail/evolution-mail.schemas.in.h:52
+#: ../mail/evolution-mail.schemas.in.h:53
msgid ""
"Enable this to use Space bar key to scroll in message preview, message list "
"and folders."
@@ -12793,27 +13143,27 @@ msgstr ""
"Enable this to use Space bar key to scroll in message preview, message list "
"and folders."
-#: ../mail/evolution-mail.schemas.in.h:53
+#: ../mail/evolution-mail.schemas.in.h:54
msgid "Enable to render message text part of limited size."
msgstr "Enable to render message text part of limited size."
-#: ../mail/evolution-mail.schemas.in.h:54
+#: ../mail/evolution-mail.schemas.in.h:55
msgid "Enable/disable caret mode"
msgstr "Enable/disable caret mode"
-#: ../mail/evolution-mail.schemas.in.h:55
+#: ../mail/evolution-mail.schemas.in.h:56
msgid "Height of the message-list pane"
msgstr "Height of the message-list pane"
-#: ../mail/evolution-mail.schemas.in.h:56
+#: ../mail/evolution-mail.schemas.in.h:57
msgid "Height of the message-list pane."
msgstr "Height of the message-list pane."
-#: ../mail/evolution-mail.schemas.in.h:57
+#: ../mail/evolution-mail.schemas.in.h:58
msgid "Hides the per-folder preview and removes the selection"
msgstr "Hides the per-folder preview and removes the selection"
-#: ../mail/evolution-mail.schemas.in.h:58
+#: ../mail/evolution-mail.schemas.in.h:59
msgid ""
"If a user tries to open 10 or more messages at one time, ask the user if "
"they really want to do it."
@@ -12821,7 +13171,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.h:59
+#: ../mail/evolution-mail.schemas.in.h:60
msgid ""
"If the \"Preview\" pane is on, then show it side-by-side rather than "
"vertically."
@@ -12829,7 +13179,7 @@ msgstr ""
"If the \"Preview\" pane is on, then show it side-by-side rather than "
"vertically."
-#: ../mail/evolution-mail.schemas.in.h:60
+#: ../mail/evolution-mail.schemas.in.h:61
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 "
@@ -12839,7 +13189,7 @@ 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.h:61
+#: ../mail/evolution-mail.schemas.in.h:62
msgid ""
"Initial height of the \"Send and Receive Mail\" window. The value updates as "
"the user resizes the window vertically."
@@ -12847,7 +13197,7 @@ msgstr ""
"Initial height of the \"Send and Receive Mail\" window. The value updates as "
"the user resizes the window vertically."
-#: ../mail/evolution-mail.schemas.in.h:62
+#: ../mail/evolution-mail.schemas.in.h:63
msgid ""
"Initial maximize state of the \"Send and Receive Mail\" window. The value "
"updates when the user maximizes or unmaximizes the window. Note, this "
@@ -12861,7 +13211,7 @@ msgstr ""
"\" window cannot be maximised. This key exists only as an implementation "
"detail."
-#: ../mail/evolution-mail.schemas.in.h:63
+#: ../mail/evolution-mail.schemas.in.h:64
msgid ""
"Initial width of the \"Send and Receive Mail\" window. The value updates as "
"the user resizes the window horizontally."
@@ -12869,11 +13219,11 @@ msgstr ""
"Initial width of the \"Send and Receive Mail\" window. The value updates as "
"the user resizes the window horizontally."
-#: ../mail/evolution-mail.schemas.in.h:64
+#: ../mail/evolution-mail.schemas.in.h:65
msgid "It disables/enables the prompt while marking multiple messages."
msgstr "Enable or disable the prompt while marking multiple messages."
-#: ../mail/evolution-mail.schemas.in.h:65
+#: ../mail/evolution-mail.schemas.in.h:66
msgid ""
"It disables/enables the repeated prompts to ask if offline sync is required "
"before going into offline mode."
@@ -12881,7 +13231,7 @@ msgstr ""
"It disables/enables the repeated prompts to ask if offline synchronisation "
"is required before going into offline mode."
-#: ../mail/evolution-mail.schemas.in.h:66
+#: ../mail/evolution-mail.schemas.in.h:67
msgid ""
"It disables/enables the repeated prompts to warn that deleting messages from "
"a search folder permanently deletes the message, not simply removing it from "
@@ -12891,31 +13241,31 @@ msgstr ""
"a search folder permanently deletes the message, not simply removing it from "
"the search results."
-#: ../mail/evolution-mail.schemas.in.h:67
+#: ../mail/evolution-mail.schemas.in.h:68
msgid "Last time empty junk was run"
msgstr "Last time empty junk was run"
-#: ../mail/evolution-mail.schemas.in.h:68
+#: ../mail/evolution-mail.schemas.in.h:69
msgid "Last time empty trash was run"
msgstr "Last time empty wastebasket was run"
-#: ../mail/evolution-mail.schemas.in.h:69
+#: ../mail/evolution-mail.schemas.in.h:70
msgid "Level beyond which the message should be logged."
msgstr "Level beyond which the message should be logged."
-#: ../mail/evolution-mail.schemas.in.h:70
+#: ../mail/evolution-mail.schemas.in.h:71
msgid "List of Labels and their associated colors"
msgstr "List of Labels and their associated colours"
-#: ../mail/evolution-mail.schemas.in.h:71
+#: ../mail/evolution-mail.schemas.in.h:72
msgid "List of accepted licenses"
msgstr "List of accepted licences"
-#: ../mail/evolution-mail.schemas.in.h:72
+#: ../mail/evolution-mail.schemas.in.h:73
msgid "List of accounts"
msgstr "List of accounts"
-#: ../mail/evolution-mail.schemas.in.h:73
+#: ../mail/evolution-mail.schemas.in.h:74
msgid ""
"List of accounts known to the mail component of Evolution. The list contains "
"strings naming subdirectories relative to /apps/evolution/mail/accounts."
@@ -12923,15 +13273,15 @@ 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.h:74
+#: ../mail/evolution-mail.schemas.in.h:75
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.h:75
+#: ../mail/evolution-mail.schemas.in.h:76
msgid "List of dictionary language codes used for spell checking."
msgstr "List of dictionary language codes used for spell checking."
-#: ../mail/evolution-mail.schemas.in.h:76
+#: ../mail/evolution-mail.schemas.in.h:77
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."
@@ -12939,127 +13289,127 @@ 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.h:77
+#: ../mail/evolution-mail.schemas.in.h:78
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.h:78
+#: ../mail/evolution-mail.schemas.in.h:79
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.h:79
+#: ../mail/evolution-mail.schemas.in.h:80
msgid "Load images for HTML messages over http"
msgstr "Load images for HTML messages over HTTP"
-#: ../mail/evolution-mail.schemas.in.h:80
+#: ../mail/evolution-mail.schemas.in.h:81
msgid ""
-"Load images for HTML messages over http(s). Possible values are: 0 - Never "
-"load images off the net. 1 - Load images in messages from contacts. 2 - "
-"Always load images off the net."
+"Load images for HTML messages over http(s). Possible values are: \"0\" - "
+"Never load images off the net. \"1\" - Load images in messages from "
+"contacts. \"2\" - Always load images off the net."
msgstr ""
-"Load images for HTML messages over HTTP(S). Possible values are: 0 - Never "
-"load images off the net 1 - Load images in messages from contacts 2 - Always "
-"load images off the net"
+"Load images for HTML messages over HTTP(S). Possible values are: \"0\" - "
+"Never load images off the net. \"1\" - Load images in messages from "
+"contacts. \"2\" - Always load images off the net."
-#: ../mail/evolution-mail.schemas.in.h:81
+#: ../mail/evolution-mail.schemas.in.h:82
msgid "Log filter actions"
msgstr "Log filter actions"
-#: ../mail/evolution-mail.schemas.in.h:82
+#: ../mail/evolution-mail.schemas.in.h:83
msgid "Log filter actions to the specified log file."
msgstr "Log filter actions to the specified log file."
-#: ../mail/evolution-mail.schemas.in.h:83
+#: ../mail/evolution-mail.schemas.in.h:84
msgid "Logfile to log filter actions"
msgstr "Logfile to log filter actions"
-#: ../mail/evolution-mail.schemas.in.h:84
+#: ../mail/evolution-mail.schemas.in.h:85
msgid "Logfile to log filter actions."
msgstr "Logfile to log filter actions."
-#: ../mail/evolution-mail.schemas.in.h:85
+#: ../mail/evolution-mail.schemas.in.h:86
msgid "Mark as Seen after specified timeout"
msgstr "Mark as Seen after specified timeout"
-#: ../mail/evolution-mail.schemas.in.h:86
+#: ../mail/evolution-mail.schemas.in.h:87
msgid "Mark as Seen after specified timeout."
msgstr "Mark as Seen after specified timeout."
-#: ../mail/evolution-mail.schemas.in.h:87
+#: ../mail/evolution-mail.schemas.in.h:88
msgid "Mark citations in the message \"Preview\""
msgstr "Mark citations in the message \"Preview\""
-#: ../mail/evolution-mail.schemas.in.h:88
+#: ../mail/evolution-mail.schemas.in.h:89
msgid "Mark citations in the message \"Preview\"."
msgstr "Mark citations in the message \"Preview\"."
-#: ../mail/evolution-mail.schemas.in.h:89
+#: ../mail/evolution-mail.schemas.in.h:90
msgid "Message Window default height"
msgstr "Message Window default height"
-#: ../mail/evolution-mail.schemas.in.h:90
+#: ../mail/evolution-mail.schemas.in.h:91
msgid "Message Window default width"
msgstr "Message Window default width"
-#: ../mail/evolution-mail.schemas.in.h:91
+#: ../mail/evolution-mail.schemas.in.h:92
msgid "Message-display style (\"normal\", \"full headers\", \"source\")"
msgstr "Message-display style (\"normal\", \"full headers\", \"source\")"
-#: ../mail/evolution-mail.schemas.in.h:92
+#: ../mail/evolution-mail.schemas.in.h:93
msgid "Minimum days between emptying the junk on exit"
msgstr "Minimum days between emptying the junk on exit"
-#: ../mail/evolution-mail.schemas.in.h:93
+#: ../mail/evolution-mail.schemas.in.h:94
msgid "Minimum days between emptying the trash on exit"
msgstr "Minimum number of days between emptying the wastebasket on exit"
-#: ../mail/evolution-mail.schemas.in.h:94
+#: ../mail/evolution-mail.schemas.in.h:95
msgid "Minimum time between emptying the junk on exit, in days."
msgstr "Minimum time between emptying the junk on exit, in days."
-#: ../mail/evolution-mail.schemas.in.h:95
+#: ../mail/evolution-mail.schemas.in.h:96
msgid "Minimum time between emptying the trash on exit, in days."
msgstr "Minimum time between emptying the wastebasket on exit, in days."
-#: ../mail/evolution-mail.schemas.in.h:96
+#: ../mail/evolution-mail.schemas.in.h:97
msgid "Number of addresses to display in TO/CC/BCC"
msgstr "Number of addresses to display in TO/CC/BCC"
-#: ../mail/evolution-mail.schemas.in.h:97
+#: ../mail/evolution-mail.schemas.in.h:98
msgid "Prompt on empty subject"
msgstr "Prompt on empty subject"
-#: ../mail/evolution-mail.schemas.in.h:98
+#: ../mail/evolution-mail.schemas.in.h:99
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.h:99
+#: ../mail/evolution-mail.schemas.in.h:100
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.h:100
+#: ../mail/evolution-mail.schemas.in.h:101
msgid "Prompt to check if the user wants to go offline immediately"
msgstr "Prompt to check if the user wants to go offline immediately"
-#: ../mail/evolution-mail.schemas.in.h:101
+#: ../mail/evolution-mail.schemas.in.h:102
msgid "Prompt when deleting messages in search folder"
msgstr "Prompt when deleting messages in search folder"
-#: ../mail/evolution-mail.schemas.in.h:102
+#: ../mail/evolution-mail.schemas.in.h:103
msgid "Prompt when user expunges"
msgstr "Prompt when user expunges"
-#: ../mail/evolution-mail.schemas.in.h:103
+#: ../mail/evolution-mail.schemas.in.h:104
msgid "Prompt when user only fills Bcc"
msgstr "Prompt when user only fills Bcc"
-#: ../mail/evolution-mail.schemas.in.h:104
+#: ../mail/evolution-mail.schemas.in.h:105
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.h:105
+#: ../mail/evolution-mail.schemas.in.h:106
msgid ""
"Prompt when user tries to send HTML mail to recipients that may not want to "
"receive HTML mail."
@@ -13067,71 +13417,75 @@ msgstr ""
"Prompt when user tries to send HTML mail to recipients that may not want to "
"receive HTML mail."
-#: ../mail/evolution-mail.schemas.in.h:106
+#: ../mail/evolution-mail.schemas.in.h:107
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.h:107
+#: ../mail/evolution-mail.schemas.in.h:108
msgid "Prompt when user tries to send unwanted HTML"
msgstr "Prompt when user tries to send unwanted HTML"
-#: ../mail/evolution-mail.schemas.in.h:108
+#: ../mail/evolution-mail.schemas.in.h:109
msgid "Prompt while marking multiple messages"
msgstr "Prompt while marking multiple messages"
-#: ../mail/evolution-mail.schemas.in.h:109
+#: ../mail/evolution-mail.schemas.in.h:110
msgid "Recognize emoticons in text and replace them with images."
msgstr "Recognise emoticons in text and replace them with images."
-#: ../mail/evolution-mail.schemas.in.h:110
+#: ../mail/evolution-mail.schemas.in.h:111
msgid "Recognize links in text and replace them."
msgstr "Recognise links in text and replace them."
-#: ../mail/evolution-mail.schemas.in.h:111
+#: ../mail/evolution-mail.schemas.in.h:112
msgid "Run junk test on incoming mail."
msgstr "Run junk test on incoming mail."
-#: ../mail/evolution-mail.schemas.in.h:112
+#: ../mail/evolution-mail.schemas.in.h:113
msgid "Save directory"
msgstr "Save directory"
-#: ../mail/evolution-mail.schemas.in.h:113
-msgid "Search for the sender photo in local addressbooks"
+#: ../mail/evolution-mail.schemas.in.h:114
+msgid "Search for the sender photo in local address books"
msgstr "Search for the sender photo in local address books"
-#: ../mail/evolution-mail.schemas.in.h:114
+#: ../mail/evolution-mail.schemas.in.h:115
msgid "Send HTML mail by default"
msgstr "Send HTML mail by default"
-#: ../mail/evolution-mail.schemas.in.h:115
+#: ../mail/evolution-mail.schemas.in.h:116
msgid "Send HTML mail by default."
msgstr "Send HTML mail by default."
-#: ../mail/evolution-mail.schemas.in.h:116
+#: ../mail/evolution-mail.schemas.in.h:117
msgid "Sender email-address column in the message list"
msgstr "Sender e-mail address column in the message list"
-#: ../mail/evolution-mail.schemas.in.h:117
+#: ../mail/evolution-mail.schemas.in.h:118
+msgid "Server synchronization interval"
+msgstr "Server synchronisation interval"
+
+#: ../mail/evolution-mail.schemas.in.h:119
msgid "Show Animations"
msgstr "Show Animations"
-#: ../mail/evolution-mail.schemas.in.h:118
+#: ../mail/evolution-mail.schemas.in.h:120
msgid "Show animated images as animations."
msgstr "Show animated images as animations."
-#: ../mail/evolution-mail.schemas.in.h:119
+#: ../mail/evolution-mail.schemas.in.h:121
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.h:120
+#: ../mail/evolution-mail.schemas.in.h:122
msgid "Show deleted messages in the message-list"
msgstr "Show deleted messages in the message-list"
-#: ../mail/evolution-mail.schemas.in.h:121
+#: ../mail/evolution-mail.schemas.in.h:123
msgid "Show photo of the sender"
msgstr "Show photo of the sender"
-#: ../mail/evolution-mail.schemas.in.h:124
+#: ../mail/evolution-mail.schemas.in.h:126
msgid ""
"Show the email-address of the sender in a separate column in the message "
"list."
@@ -13139,67 +13493,67 @@ msgstr ""
"Show the e-mail address of the sender in a separate column in the message "
"list."
-#: ../mail/evolution-mail.schemas.in.h:125
+#: ../mail/evolution-mail.schemas.in.h:127
msgid "Show the photo of the sender in the message reading pane."
msgstr "Show the photo of the sender in the message reading pane."
-#: ../mail/evolution-mail.schemas.in.h:126
+#: ../mail/evolution-mail.schemas.in.h:128
msgid "Spell check inline"
msgstr "Spell check inline"
-#: ../mail/evolution-mail.schemas.in.h:127
+#: ../mail/evolution-mail.schemas.in.h:129
msgid "Spell checking color"
msgstr "Spell checking colour"
-#: ../mail/evolution-mail.schemas.in.h:128
+#: ../mail/evolution-mail.schemas.in.h:130
msgid "Spell checking languages"
msgstr "Spell checking languages"
-#: ../mail/evolution-mail.schemas.in.h:129
+#: ../mail/evolution-mail.schemas.in.h:131
msgid "Subscribe dialog default height"
msgstr "Subscribe dialogue default height"
-#: ../mail/evolution-mail.schemas.in.h:130
+#: ../mail/evolution-mail.schemas.in.h:132
msgid "Subscribe dialog default width"
msgstr "Subscribe dialogue default width"
-#: ../mail/evolution-mail.schemas.in.h:131
+#: ../mail/evolution-mail.schemas.in.h:133
msgid "Terminal font"
msgstr "Terminal font"
-#: ../mail/evolution-mail.schemas.in.h:132
+#: ../mail/evolution-mail.schemas.in.h:134
msgid "Text message part limit"
msgstr "Text message part limit"
-#: ../mail/evolution-mail.schemas.in.h:133
+#: ../mail/evolution-mail.schemas.in.h:135
msgid "The default plugin for Junk hook"
msgstr "The default plugin for Junk hook"
-#: ../mail/evolution-mail.schemas.in.h:134
+#: ../mail/evolution-mail.schemas.in.h:136
msgid "The last time empty junk was run, in days since the epoch."
msgstr "The last time empty junk was run, in days since the epoch."
-#: ../mail/evolution-mail.schemas.in.h:135
+#: ../mail/evolution-mail.schemas.in.h:137
msgid "The last time empty trash was run, in days since the epoch."
msgstr "The last time empty wastebasket was run, in days since the epoch."
-#: ../mail/evolution-mail.schemas.in.h:136
+#: ../mail/evolution-mail.schemas.in.h:138
msgid "The terminal font for mail display."
msgstr "The terminal font for mail display."
-#: ../mail/evolution-mail.schemas.in.h:137
+#: ../mail/evolution-mail.schemas.in.h:139
msgid "The variable width font for mail display."
msgstr "The variable width font for mail display."
-#: ../mail/evolution-mail.schemas.in.h:138
+#: ../mail/evolution-mail.schemas.in.h:140
msgid ""
-"This can have three possible values. 0 for errors. 1 for warnings. 2 for "
-"debug messages."
+"This can have three possible values. \"0\" for errors. \"1\" for warnings. "
+"\"2\" for debug messages."
msgstr ""
-"This can have three possible values. 0 for errors. 1 for warnings. 2 for "
-"debug messages."
+"This can have three possible values. \"0\" for errors. \"1\" for warnings. "
+"\"2\" for debug messages."
-#: ../mail/evolution-mail.schemas.in.h:139
+#: ../mail/evolution-mail.schemas.in.h:141
msgid ""
"This decides the max size of the text part that can be formatted under "
"evolution. The default is 4MB / 4096 KB and is specified interms of KB."
@@ -13207,7 +13561,7 @@ msgstr ""
"This decides the maximum size of the text part that can be formatted under "
"Evolution. The default is 4MB / 4096 KB and is specified in terms of KB."
-#: ../mail/evolution-mail.schemas.in.h:140
+#: ../mail/evolution-mail.schemas.in.h:142
msgid ""
"This is the default junk plugin, even though there are multiple plugins "
"enabled. If the default listed plugin is disabled, then it won't fall back "
@@ -13217,15 +13571,15 @@ msgstr ""
"enabled. If the default listed plugin is disabled, then it won't fall back "
"to the other available plugins."
-#: ../mail/evolution-mail.schemas.in.h:141
+#: ../mail/evolution-mail.schemas.in.h:143
msgid ""
-"This key is read only once and reset to false after read. This unselects the "
-"mail in the list and removes the preview for that folder."
+"This key is read only once and reset to \"false\" after read. This unselects "
+"the mail in the list and removes the preview for that folder."
msgstr ""
-"This key is read only once and reset to false after read. This unselects the "
-"mail in the list and removes the preview for that folder."
+"This key is read only once and reset to \"false\" after read. This unselects "
+"the mail in the list and removes the preview for that folder."
-#: ../mail/evolution-mail.schemas.in.h:142
+#: ../mail/evolution-mail.schemas.in.h:144
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;"
@@ -13237,21 +13591,21 @@ msgstr ""
"header enabled&gt; - set enabled if the header is to be displayed in the "
"mail view."
-#: ../mail/evolution-mail.schemas.in.h:143
+#: ../mail/evolution-mail.schemas.in.h:145
msgid ""
"This option is related to the key lookup_addressbook and is used to "
-"determine whether to look up addresses in local addressbook only to exclude "
+"determine whether to look up addresses in local address book only to exclude "
"mail sent by known contacts from junk filtering."
msgstr ""
"This option is related to the key lookup_addressbook and is used to "
"determine whether to look up addresses in local address book only to exclude "
"mail sent by known contacts from junk filtering."
-#: ../mail/evolution-mail.schemas.in.h:144
+#: ../mail/evolution-mail.schemas.in.h:146
msgid "This option would help in improving the speed of fetching."
msgstr "This option would help in improving the speed of fetching."
-#: ../mail/evolution-mail.schemas.in.h:145
+#: ../mail/evolution-mail.schemas.in.h:147
msgid ""
"This sets the number of addresses to show in default message list view, "
"beyond which a '...' is shown."
@@ -13259,7 +13613,7 @@ msgstr ""
"This sets the number of addresses to show in default message list view, "
"beyond which a '...' is shown."
-#: ../mail/evolution-mail.schemas.in.h:146
+#: ../mail/evolution-mail.schemas.in.h:148
msgid ""
"This setting specifies whether the threads should be in expanded or "
"collapsed state by default. Evolution requires a restart."
@@ -13267,7 +13621,7 @@ msgstr ""
"This setting specifies whether the threads should be in expanded or "
"collapsed state by default. Evolution requires a restart."
-#: ../mail/evolution-mail.schemas.in.h:147
+#: ../mail/evolution-mail.schemas.in.h:149
msgid ""
"This setting specifies whether the threads should be sorted based on latest "
"message in each thread, rather than by message's date. Evolution requires a "
@@ -13277,115 +13631,115 @@ msgstr ""
"message in each thread, rather than by message's date. Evolution requires a "
"restart."
-#: ../mail/evolution-mail.schemas.in.h:148
+#: ../mail/evolution-mail.schemas.in.h:150
msgid "Thread the message list."
msgstr "Thread the message list."
-#: ../mail/evolution-mail.schemas.in.h:149
+#: ../mail/evolution-mail.schemas.in.h:151
msgid "Thread the message-list"
msgstr "Thread the message-list"
-#: ../mail/evolution-mail.schemas.in.h:150
+#: ../mail/evolution-mail.schemas.in.h:152
msgid "Thread the message-list based on Subject"
msgstr "Thread the message-list based on Subject"
-#: ../mail/evolution-mail.schemas.in.h:151
+#: ../mail/evolution-mail.schemas.in.h:153
msgid "Timeout for marking message as seen"
msgstr "Timeout for marking message as seen"
-#: ../mail/evolution-mail.schemas.in.h:152
+#: ../mail/evolution-mail.schemas.in.h:154
msgid "Timeout for marking message as seen."
msgstr "Timeout for marking message as seen."
-#: ../mail/evolution-mail.schemas.in.h:153
+#: ../mail/evolution-mail.schemas.in.h:155
msgid "UID string of the default account."
msgstr "UID string of the default account."
-#: ../mail/evolution-mail.schemas.in.h:154
+#: ../mail/evolution-mail.schemas.in.h:156
msgid "Underline color for misspelled words when using inline spelling."
msgstr "Underline colour for misspelt words when using inline spelling."
-#: ../mail/evolution-mail.schemas.in.h:155
+#: ../mail/evolution-mail.schemas.in.h:157
msgid "Use SpamAssassin daemon and client"
msgstr "Use SpamAssassin daemon and client"
-#: ../mail/evolution-mail.schemas.in.h:156
+#: ../mail/evolution-mail.schemas.in.h:158
msgid "Use SpamAssassin daemon and client (spamc/spamd)."
msgstr "Use SpamAssassin daemon and client (spamc/spamd)."
-#: ../mail/evolution-mail.schemas.in.h:157
+#: ../mail/evolution-mail.schemas.in.h:159
msgid "Use custom fonts"
msgstr "Use custom fonts"
-#: ../mail/evolution-mail.schemas.in.h:158
+#: ../mail/evolution-mail.schemas.in.h:160
msgid "Use custom fonts for displaying mail."
msgstr "Use custom fonts for displaying mail."
-#: ../mail/evolution-mail.schemas.in.h:159
+#: ../mail/evolution-mail.schemas.in.h:161
msgid "Use only local spam tests."
msgstr "Use only local spam tests."
-#: ../mail/evolution-mail.schemas.in.h:160
+#: ../mail/evolution-mail.schemas.in.h:162
msgid "Use only the local spam tests (no DNS)."
msgstr "Use only the local spam tests (no DNS)."
-#: ../mail/evolution-mail.schemas.in.h:161
+#: ../mail/evolution-mail.schemas.in.h:163
msgid "Use side-by-side or wide layout"
msgstr "Use side-by-side or wide layout"
-#: ../mail/evolution-mail.schemas.in.h:162
+#: ../mail/evolution-mail.schemas.in.h:164
msgid "Variable width font"
msgstr "Variable width font"
-#: ../mail/evolution-mail.schemas.in.h:163
+#: ../mail/evolution-mail.schemas.in.h:165
msgid "View/Bcc menu item is checked"
msgstr "View/Bcc menu item is checked"
-#: ../mail/evolution-mail.schemas.in.h:164
+#: ../mail/evolution-mail.schemas.in.h:166
msgid "View/Bcc menu item is checked."
msgstr "View/Bcc menu item is checked."
-#: ../mail/evolution-mail.schemas.in.h:165
+#: ../mail/evolution-mail.schemas.in.h:167
msgid "View/Cc menu item is checked"
msgstr "View/Cc menu item is checked"
-#: ../mail/evolution-mail.schemas.in.h:166
+#: ../mail/evolution-mail.schemas.in.h:168
msgid "View/Cc menu item is checked."
msgstr "View/Cc menu item is checked."
-#: ../mail/evolution-mail.schemas.in.h:167
+#: ../mail/evolution-mail.schemas.in.h:169
msgid "View/From menu item is checked"
msgstr "View/From menu item is checked"
-#: ../mail/evolution-mail.schemas.in.h:168
+#: ../mail/evolution-mail.schemas.in.h:170
msgid "View/From menu item is checked."
msgstr "View/From menu item is checked."
-#: ../mail/evolution-mail.schemas.in.h:169
+#: ../mail/evolution-mail.schemas.in.h:171
msgid "View/PostTo menu item is checked"
msgstr "View/PostTo menu item is checked"
-#: ../mail/evolution-mail.schemas.in.h:170
+#: ../mail/evolution-mail.schemas.in.h:172
msgid "View/PostTo menu item is checked."
msgstr "View/PostTo menu item is checked."
-#: ../mail/evolution-mail.schemas.in.h:171
+#: ../mail/evolution-mail.schemas.in.h:173
msgid "View/ReplyTo menu item is checked"
msgstr "View/ReplyTo menu item is checked"
-#: ../mail/evolution-mail.schemas.in.h:172
+#: ../mail/evolution-mail.schemas.in.h:174
msgid "View/ReplyTo menu item is checked."
msgstr "View/ReplyTo menu item is checked."
-#: ../mail/evolution-mail.schemas.in.h:173
+#: ../mail/evolution-mail.schemas.in.h:175
msgid "Whether a read receipt request gets added to every message by default."
msgstr "Whether a read receipt request gets added to every message by default."
-#: ../mail/evolution-mail.schemas.in.h:174
+#: ../mail/evolution-mail.schemas.in.h:176
msgid "Whether disable ellipsizing feature of folder names in folder tree."
msgstr "Whether disable ellipsizing feature of folder names in folder tree."
-#: ../mail/evolution-mail.schemas.in.h:175
+#: ../mail/evolution-mail.schemas.in.h:177
msgid ""
"Whether or not to fall back on threading by subjects when the messages do "
"not contain In-Reply-To or References headers."
@@ -13393,43 +13747,43 @@ 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.h:176
+#: ../mail/evolution-mail.schemas.in.h:178
msgid "Whether sort threads based on latest message in that thread"
msgstr "Whether sort threads based on latest message in that thread"
-#: ../mail/evolution-mail.schemas.in.h:177
+#: ../mail/evolution-mail.schemas.in.h:179
msgid "Width of the message-list pane"
msgstr "Width of the message-list pane"
-#: ../mail/evolution-mail.schemas.in.h:178
+#: ../mail/evolution-mail.schemas.in.h:180
msgid "Width of the message-list pane."
msgstr "Width of the message-list pane."
-#: ../mail/importers/elm-importer.c:184
+#: ../mail/importers/elm-importer.c:182
msgid "Importing Elm data"
msgstr "Importing Elm data"
-#: ../mail/importers/elm-importer.c:369
+#: ../mail/importers/elm-importer.c:367
msgid "Evolution Elm importer"
msgstr "Evolution Elm importer"
-#: ../mail/importers/elm-importer.c:370
+#: ../mail/importers/elm-importer.c:368
msgid "Import mail from Elm."
msgstr "Import mail from Elm."
-#: ../mail/importers/evolution-mbox-importer.c:83
+#: ../mail/importers/evolution-mbox-importer.c:80
msgid "Destination folder:"
msgstr "Destination folder:"
-#: ../mail/importers/evolution-mbox-importer.c:86
+#: ../mail/importers/evolution-mbox-importer.c:83
msgid "Select folder to import into"
msgstr "Select folder to import into"
-#: ../mail/importers/evolution-mbox-importer.c:223
+#: ../mail/importers/evolution-mbox-importer.c:220
msgid "Berkeley Mailbox (mbox)"
msgstr "Berkeley Mailbox (mbox)"
-#: ../mail/importers/evolution-mbox-importer.c:224
+#: ../mail/importers/evolution-mbox-importer.c:221
msgid "Importer Berkeley Mailbox format folders"
msgstr "Importer Berkeley Mailbox format folders"
@@ -13437,7 +13791,7 @@ msgstr "Importer Berkeley Mailbox format folders"
msgid "Importing mailbox"
msgstr "Importing mailbox"
-#: ../mail/importers/mail-importer.c:232 ../shell/e-shell-importer.c:518
+#: ../mail/importers/mail-importer.c:232 ../shell/e-shell-importer.c:512
#, c-format
msgid "Importing `%s'"
msgstr "Importing `%s'"
@@ -13447,178 +13801,176 @@ msgstr "Importing `%s'"
msgid "Scanning %s"
msgstr "Scanning %s"
-#: ../mail/importers/pine-importer.c:229
+#: ../mail/importers/pine-importer.c:227
msgid "Importing Pine data"
msgstr "Importing Pine data"
-#: ../mail/importers/pine-importer.c:428
+#: ../mail/importers/pine-importer.c:426
msgid "Evolution Pine importer"
msgstr "Evolution Pine importer"
-#: ../mail/importers/pine-importer.c:429
+#: ../mail/importers/pine-importer.c:427
msgid "Import mail from Pine."
msgstr "Import mail from Pine."
-#: ../mail/mail-autofilter.c:79
+#: ../mail/mail-autofilter.c:78
#, c-format
msgid "Mail to %s"
msgstr "Mail to %s"
-#: ../mail/mail-autofilter.c:243 ../mail/mail-autofilter.c:282
+#: ../mail/mail-autofilter.c:242 ../mail/mail-autofilter.c:281
#, c-format
msgid "Mail from %s"
msgstr "Mail from %s"
-#: ../mail/mail-autofilter.c:266
+#: ../mail/mail-autofilter.c:265
#, c-format
msgid "Subject is %s"
msgstr "Subject is %s"
-#: ../mail/mail-autofilter.c:301
+#: ../mail/mail-autofilter.c:300
#, c-format
msgid "%s mailing list"
msgstr "%s mailing list"
-#: ../mail/mail-autofilter.c:372
+#: ../mail/mail-autofilter.c:371
msgid "Add Filter Rule"
msgstr "Add Filter Rule"
-#: ../mail/mail-component.c:539
+#: ../mail/mail-component.c:164 ../plugins/templates/templates.c:521
+#: ../plugins/templates/templates.c:691 ../plugins/templates/templates.c:726
+#: ../plugins/templates/org-gnome-templates.eplug.xml.h:2
+msgid "Templates"
+msgstr "Templates"
+
+#: ../mail/mail-component.c:550
#, c-format
msgid "%d selected, "
msgid_plural "%d selected, "
msgstr[0] "%d selected, "
msgstr[1] "%d selected, "
-#: ../mail/mail-component.c:543
+#: ../mail/mail-component.c:554
#, c-format
msgid "%d deleted"
msgid_plural "%d deleted"
msgstr[0] "%d deleted"
msgstr[1] "%d deleted"
-#: ../mail/mail-component.c:550
+#: ../mail/mail-component.c:561
#, c-format
msgid "%d junk"
msgid_plural "%d junk"
msgstr[0] "%d junk"
msgstr[1] "%d junk"
-#: ../mail/mail-component.c:553
+#: ../mail/mail-component.c:564
#, c-format
msgid "%d draft"
msgid_plural "%d drafts"
msgstr[0] "%d draft"
msgstr[1] "%d drafts"
-#: ../mail/mail-component.c:555
+#: ../mail/mail-component.c:566
#, c-format
msgid "%d sent"
msgid_plural "%d sent"
msgstr[0] "%d sent"
msgstr[1] "%d sent"
-#: ../mail/mail-component.c:557
+#: ../mail/mail-component.c:568
#, c-format
msgid "%d unsent"
msgid_plural "%d unsent"
msgstr[0] "%d unsent"
msgstr[1] "%d unsent"
-#: ../mail/mail-component.c:563
+#: ../mail/mail-component.c:574
#, c-format
msgid "%d unread, "
msgid_plural "%d unread, "
msgstr[0] "%d unread, "
msgstr[1] "%d unread, "
-#: ../mail/mail-component.c:564
+#: ../mail/mail-component.c:575
#, c-format
msgid "%d total"
msgid_plural "%d total"
msgstr[0] "%d total"
msgstr[1] "%d total"
-#: ../mail/mail-component.c:905
+#: ../mail/mail-component.c:923
msgid "New Mail Message"
msgstr "New Mail Message"
-#: ../mail/mail-component.c:906
-msgid "_Mail Message"
-msgstr "_Mail Message"
-
-#: ../mail/mail-component.c:907
+#: ../mail/mail-component.c:925
msgid "Compose a new mail message"
msgstr "Compose a new mail message"
-#: ../mail/mail-component.c:913
+#: ../mail/mail-component.c:931
msgid "New Mail Folder"
msgstr "New Mail Folder"
-#: ../mail/mail-component.c:914
-msgid "Mail _Folder"
-msgstr "Mail _Folder"
-
-#: ../mail/mail-component.c:915
+#: ../mail/mail-component.c:933
msgid "Create a new mail folder"
msgstr "Create a new mail folder"
-#: ../mail/mail-component.c:1062
+#: ../mail/mail-component.c:1080
msgid "Failed upgrading Mail settings or folders."
msgstr "Failed upgrading Mail settings or folders."
-#: ../mail/mail-component.c:1535
+#: ../mail/mail-component.c:1596
msgid "Error"
msgstr "Error"
-#: ../mail/mail-component.c:1535
+#: ../mail/mail-component.c:1596
msgid "Errors"
msgstr "Errors"
-#: ../mail/mail-component.c:1536
+#: ../mail/mail-component.c:1597
msgid "Warnings and Errors"
msgstr "Warnings and Errors"
-#: ../mail/mail-component.c:1537
+#: ../mail/mail-component.c:1598
msgid "Debug"
msgstr "Debug"
-#: ../mail/mail-component.c:1537
+#: ../mail/mail-component.c:1598
msgid "Error, Warnings and Debug messages"
msgstr "Error, Warnings and Debug messages"
-#: ../mail/mail-component.c:1664
+#: ../mail/mail-component.c:1725
msgid "Debug Logs"
msgstr "Debug Logs"
-#: ../mail/mail-component.c:1678
+#: ../mail/mail-component.c:1739
msgid "Show _errors in the status bar for"
msgstr "Show _errors in the status bar for"
#. Translators: This is the second part of the sentence
#. * "Show _errors in the status bar for" - XXX - "second(s)."
-#: ../mail/mail-component.c:1694
+#: ../mail/mail-component.c:1755
msgid "second(s)."
msgstr "second(s)."
-#: ../mail/mail-component.c:1700
+#: ../mail/mail-component.c:1761
msgid "Log Messages:"
msgstr "Log Messages:"
-#: ../mail/mail-component.c:1741
+#: ../mail/mail-component.c:1802
msgid "Log Level"
msgstr "Log Level"
-#: ../mail/mail-component.c:1750 ../widgets/misc/e-dateedit.c:410
+#: ../mail/mail-component.c:1811 ../widgets/misc/e-dateedit.c:395
msgid "Time"
msgstr "Time"
-#: ../mail/mail-component.c:1760 ../mail/message-list.c:2386
+#: ../mail/mail-component.c:1821 ../mail/message-list.c:2454
#: ../mail/message-list.etspec.h:10
msgid "Messages"
msgstr "Messages"
-#: ../mail/mail-component.c:1769 ../ui/evolution-mail-messagedisplay.xml.h:2
+#: ../mail/mail-component.c:1830 ../ui/evolution-mail-messagedisplay.xml.h:2
#: ../ui/evolution.xml.h:4
msgid "Close this window"
msgstr "Close this window"
@@ -13869,11 +14221,11 @@ msgid "Digitally sign o_utgoing messages (by default)"
msgstr "Digitally sign o_utgoing messages (by default)"
#: ../mail/mail-config.glade.h:71
-msgid "Do not format text contents in messages if the text si_ze exceeds"
-msgstr "Do not format text contents in messages if the text si_ze exceeds"
+msgid "Do not format messages when text si_ze exceeds"
+msgstr "Do not format messages when text si_ze exceeds"
#: ../mail/mail-config.glade.h:72
-msgid "Do not mar_k messages as junk if sender is in my addressbook"
+msgid "Do not mar_k messages as junk if sender is in my address book"
msgstr "Do not mar_k messages as junk if sender is in my address book"
#: ../mail/mail-config.glade.h:73
@@ -14007,18 +14359,22 @@ msgstr ""
"first time"
#: ../mail/mail-config.glade.h:109
+msgid "Option is ignored if a match for custom junk headers is found."
+msgstr "Option is ignored if a match for custom junk headers is found."
+
+#: ../mail/mail-config.glade.h:110
msgid "Or_ganization:"
msgstr "Or_ganisation:"
-#: ../mail/mail-config.glade.h:110
+#: ../mail/mail-config.glade.h:111
msgid "PGP/GPG _Key ID:"
msgstr "PGP/GPG _Key ID:"
-#: ../mail/mail-config.glade.h:111
+#: ../mail/mail-config.glade.h:112
msgid "Pass_word:"
msgstr "Pass_word:"
-#: ../mail/mail-config.glade.h:113
+#: ../mail/mail-config.glade.h:114
msgid ""
"Please enter a descriptive name for this account in the space below.\n"
"This name will be used for display purposes only."
@@ -14026,7 +14382,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:115
+#: ../mail/mail-config.glade.h:116
msgid ""
"Please enter information about the way you will send mail. If you are not "
"sure, ask your system administrator or Internet Service Provider."
@@ -14034,7 +14390,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:116
+#: ../mail/mail-config.glade.h:117
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 "
@@ -14044,111 +14400,115 @@ msgstr ""
"below do not need to be filled in, unless you wish to include this "
"information in e-mail you send."
-#: ../mail/mail-config.glade.h:117
+#: ../mail/mail-config.glade.h:118
msgid "Please select among the following options"
msgstr "Please select among the following options"
-#: ../mail/mail-config.glade.h:118
+#: ../mail/mail-config.glade.h:119
msgid "Port:"
msgstr "Port:"
-#: ../mail/mail-config.glade.h:119
+#: ../mail/mail-config.glade.h:120
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:120
+#: ../mail/mail-config.glade.h:121
msgid "Quoted"
msgstr "Quoted"
-#: ../mail/mail-config.glade.h:121
+#: ../mail/mail-config.glade.h:122
msgid "Re_member password"
msgstr "Re_member password"
-#: ../mail/mail-config.glade.h:122
+#: ../mail/mail-config.glade.h:123
msgid "Re_ply-To:"
msgstr "Re_ply-To:"
-#: ../mail/mail-config.glade.h:124
+#: ../mail/mail-config.glade.h:125
msgid "Remember _password"
msgstr "Remember _password"
-#: ../mail/mail-config.glade.h:125
+#: ../mail/mail-config.glade.h:126
msgid "S_OCKS Host:"
msgstr "S_OCKS Host:"
-#: ../mail/mail-config.glade.h:126
-msgid "S_earch for sender photograph only in local addressbooks"
+#: ../mail/mail-config.glade.h:127
+msgid "S_earch for sender photograph only in local address books"
msgstr "S_earch for sender photograph only in local address books"
-#: ../mail/mail-config.glade.h:127
+#: ../mail/mail-config.glade.h:128
msgid "S_elect..."
msgstr "S_elect..."
-#: ../mail/mail-config.glade.h:128
+#: ../mail/mail-config.glade.h:129
msgid "S_end message receipts:"
msgstr "S_end message receipts:"
-#: ../mail/mail-config.glade.h:129
+#: ../mail/mail-config.glade.h:130
msgid "S_tandard Font:"
msgstr "S_tandard Font:"
-#: ../mail/mail-config.glade.h:131
+#: ../mail/mail-config.glade.h:132
msgid "Select HTML fixed width font"
msgstr "Select HTML fixed width font"
-#: ../mail/mail-config.glade.h:132
+#: ../mail/mail-config.glade.h:133
msgid "Select HTML fixed width font for printing"
msgstr "Select HTML fixed width font for printing"
-#: ../mail/mail-config.glade.h:133
+#: ../mail/mail-config.glade.h:134
msgid "Select HTML variable width font"
msgstr "Select HTML variable width font"
-#: ../mail/mail-config.glade.h:134
+#: ../mail/mail-config.glade.h:135
msgid "Select HTML variable width font for printing"
msgstr "Select HTML variable width font for printing"
-#: ../mail/mail-config.glade.h:136
+#: ../mail/mail-config.glade.h:137
msgid "Sending Mail"
msgstr "Sending Mail"
-#: ../mail/mail-config.glade.h:137
+#: ../mail/mail-config.glade.h:138
msgid "Sent _Messages Folder:"
msgstr "Sent _Messages Folder:"
-#: ../mail/mail-config.glade.h:138
+#: ../mail/mail-config.glade.h:139
msgid "Ser_ver requires authentication"
msgstr "Ser_ver requires authentication"
-#: ../mail/mail-config.glade.h:139
+#: ../mail/mail-config.glade.h:140
msgid "Server _Type: "
msgstr "Server _Type: "
-#: ../mail/mail-config.glade.h:140
+#: ../mail/mail-config.glade.h:141
msgid "Sig_ning certificate:"
msgstr "Sig_ning certificate:"
-#: ../mail/mail-config.glade.h:141
+#: ../mail/mail-config.glade.h:142
msgid "Signat_ure:"
msgstr "Signat_ure:"
-#: ../mail/mail-config.glade.h:142
+#: ../mail/mail-config.glade.h:143
msgid "Signatures"
msgstr "Signatures"
-#: ../mail/mail-config.glade.h:143
+#: ../mail/mail-config.glade.h:144
msgid "Signatures Table"
msgstr "Signatures Table"
-#: ../mail/mail-config.glade.h:144
+#: ../mail/mail-config.glade.h:145
msgid "Spell Checking"
msgstr "Spell Checking"
-#: ../mail/mail-config.glade.h:145
+#: ../mail/mail-config.glade.h:146
+msgid "Start _typing at the bottom on replying"
+msgstr "Start _typing at the bottom on replying"
+
+#: ../mail/mail-config.glade.h:147
msgid "T_ype: "
msgstr "T_ype: "
-#: ../mail/mail-config.glade.h:146
+#: ../mail/mail-config.glade.h:148
msgid ""
"The list of languages here reflects only the languages for which you have a "
"dictionary installed."
@@ -14156,7 +14516,7 @@ msgstr ""
"The list of languages here reflects only the languages for which you have a "
"dictionary installed."
-#: ../mail/mail-config.glade.h:147
+#: ../mail/mail-config.glade.h:149
msgid ""
"The output of this script will be used as your\n"
"signature. The name you specify will be used\n"
@@ -14166,13 +14526,7 @@ msgstr ""
"signature. The name you specify will be used\n"
"for display purposes only. "
-#: ../mail/mail-config.glade.h:150
-msgid ""
-"This option will be overridden if a match for custom junk headers is found."
-msgstr ""
-"This option will be over-ridden if a match for custom junk headers is found."
-
-#: ../mail/mail-config.glade.h:151
+#: ../mail/mail-config.glade.h:152
msgid ""
"Type the name by which you would like to refer to this account.\n"
"For example: \"Work\" or \"Personal\""
@@ -14180,24 +14534,26 @@ 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:153
+#: ../mail/mail-config.glade.h:154
msgid "Us_ername:"
msgstr "Us_ername:"
-#: ../mail/mail-config.glade.h:154
+#: ../mail/mail-config.glade.h:155
msgid "Use Authe_ntication"
msgstr "Use Authe_ntication"
-#: ../mail/mail-config.glade.h:155 ../plugins/caldav/caldav-source.c:282
-#: ../plugins/google-account-setup/google-source.c:358
+#: ../mail/mail-config.glade.h:156 ../plugins/caldav/caldav-source.c:284
+#: ../plugins/google-account-setup/google-source.c:625
+#: ../plugins/google-account-setup/google-contacts-source.c:278
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:323
msgid "User_name:"
msgstr "User_name:"
-#: ../mail/mail-config.glade.h:156
+#: ../mail/mail-config.glade.h:157
msgid "V_ariable-width:"
msgstr "V_ariable-width:"
-#: ../mail/mail-config.glade.h:157
+#: ../mail/mail-config.glade.h:158
msgid ""
"Welcome to the Evolution Mail Configuration Assistant.\n"
"\n"
@@ -14207,124 +14563,124 @@ msgstr ""
"\n"
"Click \"Forward\" to begin. "
-#: ../mail/mail-config.glade.h:160
+#: ../mail/mail-config.glade.h:161
msgid "_Add Signature"
msgstr "_Add Signature"
-#: ../mail/mail-config.glade.h:161
+#: ../mail/mail-config.glade.h:162
msgid "_Always load images from the Internet"
msgstr "_Always load images from the Internet"
-#: ../mail/mail-config.glade.h:162
+#: ../mail/mail-config.glade.h:163
msgid "_Automatic proxy configuration URL:"
msgstr "_Automatic proxy configuration URL:"
-#: ../mail/mail-config.glade.h:163
+#: ../mail/mail-config.glade.h:164
msgid "_Default junk plugin:"
msgstr "_Default junk plugin:"
-#: ../mail/mail-config.glade.h:164
+#: ../mail/mail-config.glade.h:165
msgid "_Direct connection to the Internet"
msgstr "_Direct connection to the Internet"
-#: ../mail/mail-config.glade.h:165
+#: ../mail/mail-config.glade.h:166
msgid "_Do not sign meeting requests (for Outlook compatibility)"
msgstr "_Do not sign meeting requests (for Outlook compatibility)"
-#: ../mail/mail-config.glade.h:167
+#: ../mail/mail-config.glade.h:168
msgid "_Forward style:"
msgstr "_Forward style:"
-#: ../mail/mail-config.glade.h:168
+#: ../mail/mail-config.glade.h:169
msgid "_Keep Signature above the original message on replying"
msgstr "_Keep Signature above the original message on replying"
-#: ../mail/mail-config.glade.h:169
+#: ../mail/mail-config.glade.h:170
msgid "_Load images in messages from contacts"
msgstr "_Load images in messages from contacts"
-#: ../mail/mail-config.glade.h:170
-msgid "_Lookup in local addressbook only"
-msgstr "_Lookup in local address book only"
-
#: ../mail/mail-config.glade.h:171
+msgid "_Lookup in local address book only"
+msgstr "_Look up in local address book only"
+
+#: ../mail/mail-config.glade.h:172
msgid "_Make this my default account"
msgstr "_Make this my default account"
-#: ../mail/mail-config.glade.h:172
+#: ../mail/mail-config.glade.h:173
msgid "_Manual proxy configuration:"
msgstr "_Manual proxy configuration:"
-#: ../mail/mail-config.glade.h:173
+#: ../mail/mail-config.glade.h:174
msgid "_Mark messages as read after"
msgstr "_Mark messages as read after"
-#: ../mail/mail-config.glade.h:175
+#: ../mail/mail-config.glade.h:176
msgid "_Never load images from the Internet"
msgstr "_Never load images from the Internet"
-#: ../mail/mail-config.glade.h:176
+#: ../mail/mail-config.glade.h:177
msgid "_Path:"
msgstr "_Path:"
-#: ../mail/mail-config.glade.h:177
-msgid "_Prompt when sending HTML messages to contacts that do not want them"
-msgstr "_Prompt when sending HTML messages to contacts that do not want them"
-
#: ../mail/mail-config.glade.h:178
+msgid "_Prompt on sending HTML mail to contacts that do not want them"
+msgstr "_Prompt on sending HTML mail to contacts that do not want them"
+
+#: ../mail/mail-config.glade.h:179
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:179
+#: ../mail/mail-config.glade.h:180
msgid "_Reply style:"
msgstr "_Reply style:"
-#: ../mail/mail-config.glade.h:180
+#: ../mail/mail-config.glade.h:181
msgid "_Script:"
msgstr "_Script:"
-#: ../mail/mail-config.glade.h:181
+#: ../mail/mail-config.glade.h:182
msgid "_Secure HTTP Proxy:"
msgstr "_Secure HTTP Proxy:"
-#: ../mail/mail-config.glade.h:182
+#: ../mail/mail-config.glade.h:183
msgid "_Select..."
msgstr "_Select..."
#. If enabled, show animation; if disabled, only display a static image without any animation
-#: ../mail/mail-config.glade.h:185
+#: ../mail/mail-config.glade.h:186
msgid "_Show image animations"
msgstr "_Show image animations"
-#: ../mail/mail-config.glade.h:186
+#: ../mail/mail-config.glade.h:187
msgid "_Show the photograph of sender in the message preview"
msgstr "_Show the photograph of sender in the message preview"
-#: ../mail/mail-config.glade.h:187
+#: ../mail/mail-config.glade.h:188
msgid "_Shrink To / Cc / Bcc headers to "
msgstr "_Shrink To / Cc / Bcc headers to "
-#: ../mail/mail-config.glade.h:188
+#: ../mail/mail-config.glade.h:189
msgid "_Use Secure Connection:"
msgstr "_Use Secure Connection:"
-#: ../mail/mail-config.glade.h:189
+#: ../mail/mail-config.glade.h:190
msgid "_Use system defaults"
msgstr "_Use system defaults"
-#: ../mail/mail-config.glade.h:190
+#: ../mail/mail-config.glade.h:191
msgid "_Use the same fonts as other applications"
msgstr "_Use the same fonts as other applications"
-#: ../mail/mail-config.glade.h:191
+#: ../mail/mail-config.glade.h:192
msgid "addresses"
msgstr "addresses"
-#: ../mail/mail-config.glade.h:192
+#: ../mail/mail-config.glade.h:193
msgid "color"
msgstr "colour"
-#: ../mail/mail-config.glade.h:193
+#: ../mail/mail-config.glade.h:194
msgid "description"
msgstr "description"
@@ -14364,43 +14720,43 @@ msgstr "Case _sensitive"
msgid "Co_mpleted"
msgstr "Co_mpleted"
-#: ../mail/mail-dialogs.glade.h:11
+#: ../mail/mail-dialogs.glade.h:10
msgid "F_ind:"
msgstr "F_ind:"
-#: ../mail/mail-dialogs.glade.h:12
+#: ../mail/mail-dialogs.glade.h:11
msgid "Find in Message"
msgstr "Find in Message"
-#: ../mail/mail-dialogs.glade.h:13 ../mail/message-tag-followup.c:298
+#: ../mail/mail-dialogs.glade.h:12 ../mail/message-tag-followup.c:277
msgid "Flag to Follow Up"
msgstr "Flag to Follow Up"
-#: ../mail/mail-dialogs.glade.h:14
+#: ../mail/mail-dialogs.glade.h:13
msgid "Folder Subscriptions"
msgstr "Folder Subscriptions"
-#: ../mail/mail-dialogs.glade.h:15
+#: ../mail/mail-dialogs.glade.h:14
msgid "License Agreement"
msgstr "Licence Agreement"
-#: ../mail/mail-dialogs.glade.h:16
+#: ../mail/mail-dialogs.glade.h:15
msgid "None Selected"
msgstr "None Selected"
-#: ../mail/mail-dialogs.glade.h:17
+#: ../mail/mail-dialogs.glade.h:16
msgid "S_erver:"
msgstr "S_erver:"
-#: ../mail/mail-dialogs.glade.h:18
+#: ../mail/mail-dialogs.glade.h:17
msgid "Security Information"
msgstr "Security Information"
-#: ../mail/mail-dialogs.glade.h:19
+#: ../mail/mail-dialogs.glade.h:18
msgid "Specific folders"
msgstr "Specific folders"
-#: ../mail/mail-dialogs.glade.h:21
+#: ../mail/mail-dialogs.glade.h:19
msgid ""
"The messages you have selected for follow up are listed below.\n"
"Please select a follow up action from the \"Flag\" menu."
@@ -14408,23 +14764,23 @@ 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:23
+#: ../mail/mail-dialogs.glade.h:21
msgid "_Accept License"
msgstr "_Accept Licence"
-#: ../mail/mail-dialogs.glade.h:24
+#: ../mail/mail-dialogs.glade.h:22
msgid "_Due By:"
msgstr "_Due By:"
-#: ../mail/mail-dialogs.glade.h:25
+#: ../mail/mail-dialogs.glade.h:23
msgid "_Flag:"
msgstr "_Flag:"
-#: ../mail/mail-dialogs.glade.h:26
+#: ../mail/mail-dialogs.glade.h:24
msgid "_Tick this to accept the license agreement"
msgstr "_Tick this to accept the licence agreement"
-#: ../mail/mail-folder-cache.c:832
+#: ../mail/mail-folder-cache.c:845
#, c-format
msgid "Pinging %s"
msgstr "Pinging %s"
@@ -14471,104 +14827,104 @@ msgstr "Sending message %d of %d"
msgid "Failed to send %d of %d messages"
msgstr "Failed to send %d of %d messages"
-#: ../mail/mail-ops.c:763 ../mail/mail-send-recv.c:711
+#: ../mail/mail-ops.c:763 ../mail/mail-send-recv.c:693
msgid "Canceled."
msgstr "Cancelled."
-#: ../mail/mail-ops.c:765 ../mail/mail-send-recv.c:713
+#: ../mail/mail-ops.c:765 ../mail/mail-send-recv.c:695
msgid "Complete."
msgstr "Complete."
-#: ../mail/mail-ops.c:869
+#: ../mail/mail-ops.c:871
msgid "Saving message to folder"
msgstr "Saving message to folder"
-#: ../mail/mail-ops.c:947
+#: ../mail/mail-ops.c:949
#, c-format
msgid "Moving messages to %s"
msgstr "Moving messages to %s"
-#: ../mail/mail-ops.c:947
+#: ../mail/mail-ops.c:949
#, c-format
msgid "Copying messages to %s"
msgstr "Copying messages to %s"
-#: ../mail/mail-ops.c:1164
+#: ../mail/mail-ops.c:1166
msgid "Forwarded messages"
msgstr "Forwarded messages"
-#: ../mail/mail-ops.c:1205
+#: ../mail/mail-ops.c:1207
#, c-format
msgid "Opening folder %s"
msgstr "Opening folder %s"
-#: ../mail/mail-ops.c:1270
+#: ../mail/mail-ops.c:1272
#, c-format
msgid "Retrieving quota information for folder %s"
msgstr "Retrieving quota information for folder %s"
-#: ../mail/mail-ops.c:1339
+#: ../mail/mail-ops.c:1341
#, c-format
msgid "Opening store %s"
msgstr "Opening store %s"
-#: ../mail/mail-ops.c:1410
+#: ../mail/mail-ops.c:1412
#, c-format
msgid "Removing folder %s"
msgstr "Removing folder %s"
-#: ../mail/mail-ops.c:1499
+#: ../mail/mail-ops.c:1501
#, c-format
msgid "Storing folder '%s'"
msgstr "Storing folder '%s'"
-#: ../mail/mail-ops.c:1562
+#: ../mail/mail-ops.c:1564
#, c-format
msgid "Expunging and storing account '%s'"
msgstr "Expunging and storing account '%s'"
-#: ../mail/mail-ops.c:1563
+#: ../mail/mail-ops.c:1565
#, c-format
msgid "Storing account '%s'"
msgstr "Storing account '%s'"
-#: ../mail/mail-ops.c:1617
+#: ../mail/mail-ops.c:1619
msgid "Refreshing folder"
msgstr "Refreshing folder"
-#: ../mail/mail-ops.c:1654 ../mail/mail-ops.c:1704
+#: ../mail/mail-ops.c:1659 ../mail/mail-ops.c:1709
msgid "Expunging folder"
msgstr "Expunging folder"
-#: ../mail/mail-ops.c:1701
+#: ../mail/mail-ops.c:1706
#, c-format
msgid "Emptying trash in '%s'"
msgstr "Emptying wastebasket in '%s'"
-#: ../mail/mail-ops.c:1702
+#: ../mail/mail-ops.c:1707
msgid "Local Folders"
msgstr "Local Folders"
-#: ../mail/mail-ops.c:1783
+#: ../mail/mail-ops.c:1788
#, c-format
msgid "Retrieving message %s"
msgstr "Retrieving message %s"
-#: ../mail/mail-ops.c:1890
+#: ../mail/mail-ops.c:1895
#, c-format
msgid "Retrieving %d message"
msgid_plural "Retrieving %d messages"
msgstr[0] "Retrieving %d message"
msgstr[1] "Retrieving %d messages"
-#: ../mail/mail-ops.c:1975
+#: ../mail/mail-ops.c:1980
#, c-format
msgid "Saving %d message"
-msgid_plural "Saving %d messsages"
+msgid_plural "Saving %d messages"
msgstr[0] "Saving %d message"
msgstr[1] "Saving %d messages"
-#: ../mail/mail-ops.c:2053
+#: ../mail/mail-ops.c:2058
#, c-format
msgid ""
"Error saving messages to: %s:\n"
@@ -14577,11 +14933,11 @@ msgstr ""
"Error saving messages to: %s:\n"
" %s"
-#: ../mail/mail-ops.c:2125
+#: ../mail/mail-ops.c:2130
msgid "Saving attachment"
msgstr "Saving attachment"
-#: ../mail/mail-ops.c:2143 ../mail/mail-ops.c:2151
+#: ../mail/mail-ops.c:2148 ../mail/mail-ops.c:2156
#, c-format
msgid ""
"Cannot create output file: %s:\n"
@@ -14590,51 +14946,51 @@ msgstr ""
"Cannot create output file: %s:\n"
" %s"
-#: ../mail/mail-ops.c:2166
+#: ../mail/mail-ops.c:2171
#, c-format
msgid "Could not write data: %s"
msgstr "Could not write data: %s"
-#: ../mail/mail-ops.c:2312
+#: ../mail/mail-ops.c:2317
#, c-format
msgid "Disconnecting from %s"
msgstr "Disconnecting from %s"
-#: ../mail/mail-ops.c:2312
+#: ../mail/mail-ops.c:2317
#, c-format
msgid "Reconnecting to %s"
msgstr "Reconnecting to %s"
-#: ../mail/mail-ops.c:2408
+#: ../mail/mail-ops.c:2413
#, c-format
msgid "Preparing account '%s' for offline"
msgstr "Preparing account '%s' for offline"
-#: ../mail/mail-ops.c:2494
+#: ../mail/mail-ops.c:2499
msgid "Checking Service"
msgstr "Checking Service"
-#: ../mail/mail-send-recv.c:194
+#: ../mail/mail-send-recv.c:181
msgid "Canceling..."
msgstr "Cancelling..."
-#: ../mail/mail-send-recv.c:397
+#: ../mail/mail-send-recv.c:383
msgid "Send & Receive Mail"
msgstr "Send & Receive Mail"
-#: ../mail/mail-send-recv.c:408
+#: ../mail/mail-send-recv.c:394
msgid "Cancel _All"
msgstr "Cancel _All"
-#: ../mail/mail-send-recv.c:517
+#: ../mail/mail-send-recv.c:498
msgid "Updating..."
msgstr "Updating..."
-#: ../mail/mail-send-recv.c:517 ../mail/mail-send-recv.c:590
+#: ../mail/mail-send-recv.c:498 ../mail/mail-send-recv.c:573
msgid "Waiting..."
msgstr "Waiting..."
-#: ../mail/mail-send-recv.c:817
+#: ../mail/mail-send-recv.c:799
#, c-format
msgid "Checking for new mail"
msgstr "Checking for new mail"
@@ -14649,7 +15005,7 @@ msgid "Enter Passphrase"
msgstr "Enter Passphrase"
#: ../mail/mail-session.c:210
-#: ../plugins/exchange-operations/exchange-config-listener.c:711
+#: ../plugins/exchange-operations/exchange-config-listener.c:713
#, c-format
msgid "Enter Password for %s"
msgstr "Enter Password for %s"
@@ -14666,11 +15022,6 @@ msgstr "User cancelled operation."
msgid "_Save and Close"
msgstr "_Save and Close"
-#: ../mail/mail-signature-editor.c:208 ../ui/evolution-editor.xml.h:19
-#: ../ui/evolution-mail-messagedisplay.xml.h:6 ../ui/evolution.xml.h:42
-msgid "_File"
-msgstr "_File"
-
#: ../mail/mail-signature-editor.c:355
msgid "Edit Signature"
msgstr "Edit Signature"
@@ -14718,11 +15069,11 @@ msgstr "Updating Search Folders for '%s:%s'"
msgid "Updating Search Folders for '%s'"
msgstr "Updating Search Folders for '%s'"
-#: ../mail/mail-vfolder.c:1059
+#: ../mail/mail-vfolder.c:1066
msgid "Edit Search Folder"
msgstr "Edit Search Folder"
-#: ../mail/mail-vfolder.c:1148
+#: ../mail/mail-vfolder.c:1155
msgid "New Search Folder"
msgstr "New Search Folder"
@@ -15343,18 +15694,22 @@ msgstr "_Expunge"
msgid "_Open Messages"
msgstr "_Open Messages"
-#: ../mail/message-list.c:1053
+#: ../mail/message-list.c:1052
msgid "Unseen"
msgstr "Unseen"
-#: ../mail/message-list.c:1054
+#: ../mail/message-list.c:1053
msgid "Seen"
msgstr "Seen"
-#: ../mail/message-list.c:1055
+#: ../mail/message-list.c:1054
msgid "Answered"
msgstr "Answered"
+#: ../mail/message-list.c:1055
+msgid "Forwarded"
+msgstr "Forwarded"
+
#: ../mail/message-list.c:1056
msgid "Multiple Unseen Messages"
msgstr "Multiple Unseen Messages"
@@ -15379,38 +15734,39 @@ msgstr "Higher"
msgid "Highest"
msgstr "Highest"
-#: ../mail/message-list.c:1594 ../widgets/table/e-cell-date.c:55
+#: ../mail/message-list.c:1596 ../widgets/table/e-cell-date.c:55
msgid "?"
msgstr "?"
#. strftime format of a time,
#. in 12-hour format, without seconds.
-#: ../mail/message-list.c:1601 ../plugins/itip-formatter/itip-view.c:206
+#: ../mail/message-list.c:1603 ../plugins/itip-formatter/itip-view.c:203
#: ../widgets/table/e-cell-date.c:70
msgid "Today %l:%M %p"
msgstr "Today %l:%M %p"
-#: ../mail/message-list.c:1610 ../widgets/table/e-cell-date.c:80
+#: ../mail/message-list.c:1612 ../widgets/table/e-cell-date.c:80
msgid "Yesterday %l:%M %p"
msgstr "Yesterday %l:%M %p"
-#: ../mail/message-list.c:1622 ../widgets/table/e-cell-date.c:92
+#: ../mail/message-list.c:1624 ../widgets/table/e-cell-date.c:92
msgid "%a %l:%M %p"
msgstr "%a %l:%M %p"
-#: ../mail/message-list.c:1630 ../widgets/table/e-cell-date.c:100
+#: ../mail/message-list.c:1632 ../widgets/table/e-cell-date.c:100
msgid "%b %d %l:%M %p"
msgstr "%d %b %l:%M %p"
-#: ../mail/message-list.c:1632 ../widgets/table/e-cell-date.c:102
+#: ../mail/message-list.c:1634 ../widgets/table/e-cell-date.c:102
msgid "%b %d %Y"
msgstr "%d %b %Y"
-#: ../mail/message-list.c:3818
+#. there is some info why the message list is empty, let it be something useful
+#: ../mail/message-list.c:3916 ../mail/message-list.c:4376
msgid "Generating message list"
msgstr "Generating message list"
-#: ../mail/message-list.c:4081
+#: ../mail/message-list.c:4224
msgid ""
"No message satisfies your search criteria. Either clear search with Search-"
">Clear menu item or change it."
@@ -15418,7 +15774,7 @@ msgstr ""
"No message satisfies your search criteria. Either clear search with Search-"
">Clear menu item or change it."
-#: ../mail/message-list.c:4083
+#: ../mail/message-list.c:4226
msgid "There are no messages in this folder."
msgstr "There are no messages in this folder."
@@ -15451,39 +15807,39 @@ msgstr "Sent Messages"
msgid "Size"
msgstr "Size"
-#: ../mail/message-tag-followup.c:75
+#: ../mail/message-tag-followup.c:56
msgid "Call"
msgstr "Call"
-#: ../mail/message-tag-followup.c:76
+#: ../mail/message-tag-followup.c:57
msgid "Do Not Forward"
msgstr "Do Not Forward"
-#: ../mail/message-tag-followup.c:77
+#: ../mail/message-tag-followup.c:58
msgid "Follow-Up"
msgstr "Follow-Up"
-#: ../mail/message-tag-followup.c:78
+#: ../mail/message-tag-followup.c:59
msgid "For Your Information"
msgstr "For Your Information"
-#: ../mail/message-tag-followup.c:79 ../ui/evolution-mail-message.xml.h:42
+#: ../mail/message-tag-followup.c:60 ../ui/evolution-mail-message.xml.h:42
msgid "Forward"
msgstr "Forward"
-#: ../mail/message-tag-followup.c:80
+#: ../mail/message-tag-followup.c:61
msgid "No Response Necessary"
msgstr "No Response Necessary"
-#: ../mail/message-tag-followup.c:83 ../ui/evolution-mail-message.xml.h:80
+#: ../mail/message-tag-followup.c:64 ../ui/evolution-mail-message.xml.h:80
msgid "Reply"
msgstr "Reply"
-#: ../mail/message-tag-followup.c:84 ../ui/evolution-mail-message.xml.h:81
+#: ../mail/message-tag-followup.c:65 ../ui/evolution-mail-message.xml.h:81
msgid "Reply to All"
msgstr "Reply to All"
-#: ../mail/message-tag-followup.c:85
+#: ../mail/message-tag-followup.c:66
msgid "Review"
msgstr "Review"
@@ -15508,6 +15864,10 @@ msgid "Subject contains"
msgstr "Subject contains"
#: ../mail/searchtypes.xml.h:6
+msgid "Subject or Recipients contains"
+msgstr "Subject or Recipients contains"
+
+#: ../mail/searchtypes.xml.h:7
msgid "Subject or Sender contains"
msgstr "Subject or Sender contains"
@@ -15535,7 +15895,8 @@ msgstr ""
"List of clues for the attachment reminder plugin to look for in a message "
"body."
-#: ../plugins/attachment-reminder/attachment-reminder.c:469
+#: ../plugins/attachment-reminder/attachment-reminder.c:474
+#: ../plugins/templates/templates.c:394
msgid "Keywords"
msgstr "Keywords"
@@ -15564,7 +15925,7 @@ msgstr ""
msgid "Message has no attachments"
msgstr "Message has no attachments"
-#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:4
+#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:5
msgid "_Edit Message"
msgstr "_Edit Message"
@@ -15580,27 +15941,27 @@ msgstr ""
msgid "Audio inline plugin"
msgstr "Audio inline plugin"
-#: ../plugins/backup-restore/backup-restore.c:107
+#: ../plugins/backup-restore/backup-restore.c:127
msgid "Select name of the Evolution backup file"
msgstr "Select name of the Evolution backup file"
-#: ../plugins/backup-restore/backup-restore.c:136
+#: ../plugins/backup-restore/backup-restore.c:156
msgid "_Restart Evolution after backup"
msgstr "_Restart Evolution after backup"
-#: ../plugins/backup-restore/backup-restore.c:159
+#: ../plugins/backup-restore/backup-restore.c:179
msgid "Select name of the Evolution backup file to restore"
msgstr "Select name of the Evolution backup file to restore"
-#: ../plugins/backup-restore/backup-restore.c:183
+#: ../plugins/backup-restore/backup-restore.c:203
msgid "_Restart Evolution after restore"
msgstr "_Restart Evolution after restore"
-#: ../plugins/backup-restore/backup-restore.c:256
+#: ../plugins/backup-restore/backup-restore.c:276
msgid "Restore from backup"
msgstr "Restore from backup"
-#: ../plugins/backup-restore/backup-restore.c:258
+#: ../plugins/backup-restore/backup-restore.c:278
msgid ""
"You can restore Evolution from your backup. It can restore all the Mails, "
"Calendars, Tasks, Memos, Contacts. \n"
@@ -15610,95 +15971,119 @@ msgstr ""
"Calendars, Tasks, Memos, Contacts. \n"
"It also restores all your personal settings, mail filters etc."
-#: ../plugins/backup-restore/backup-restore.c:264
+#: ../plugins/backup-restore/backup-restore.c:284
msgid "_Restore Evolution from the backup file"
msgstr "_Restore Evolution from the backup file"
-#: ../plugins/backup-restore/backup-restore.c:271
+#: ../plugins/backup-restore/backup-restore.c:291
msgid "Please select an Evolution Archive to restore:"
msgstr "Please select an Evolution Archive to restore:"
-#: ../plugins/backup-restore/backup-restore.c:274
+#: ../plugins/backup-restore/backup-restore.c:294
msgid "Choose a file to restore"
msgstr "Choose a file to restore"
-#: ../plugins/backup-restore/backup.c:40
+#: ../plugins/backup-restore/backup.c:66
msgid "Backup Evolution directory"
msgstr "Backup Evolution directory"
-#: ../plugins/backup-restore/backup.c:42
+#: ../plugins/backup-restore/backup.c:68
msgid "Restore Evolution directory"
msgstr "Restore Evolution directory"
-#: ../plugins/backup-restore/backup.c:44
+#: ../plugins/backup-restore/backup.c:70
msgid "Check Evolution Backup"
msgstr "Check Evolution Backup"
-#: ../plugins/backup-restore/backup.c:46
+#: ../plugins/backup-restore/backup.c:72
msgid "Restart Evolution"
msgstr "Restart Evolution"
-#: ../plugins/backup-restore/backup.c:48
+#: ../plugins/backup-restore/backup.c:74
msgid "With Graphical User Interface"
msgstr "With Graphical User Interface"
-#: ../plugins/backup-restore/backup.c:69
-#: ../plugins/backup-restore/backup.c:110
+#: ../plugins/backup-restore/backup.c:125
+#: ../plugins/backup-restore/backup.c:258
msgid "Shutting down Evolution"
msgstr "Shutting down Evolution"
-#: ../plugins/backup-restore/backup.c:74
+#: ../plugins/backup-restore/backup.c:132
msgid "Backing Evolution accounts and settings"
msgstr "Backing Evolution accounts and settings"
-#: ../plugins/backup-restore/backup.c:78
+#: ../plugins/backup-restore/backup.c:136
msgid "Backing Evolution data (Mails, Contacts, Calendar, Tasks, Memos)"
msgstr "Backing Evolution data (Mails, Contacts, Calendar, Tasks, Memos)"
-#: ../plugins/backup-restore/backup.c:88
+#: ../plugins/backup-restore/backup.c:147
msgid "Backup complete"
msgstr "Backup complete"
-#: ../plugins/backup-restore/backup.c:93
-#: ../plugins/backup-restore/backup.c:136
+#: ../plugins/backup-restore/backup.c:152
+#: ../plugins/backup-restore/backup.c:339
msgid "Restarting Evolution"
msgstr "Restarting Evolution"
-#: ../plugins/backup-restore/backup.c:114
+#: ../plugins/backup-restore/backup.c:262
msgid "Backup current Evolution data"
msgstr "Backup current Evolution data"
-#: ../plugins/backup-restore/backup.c:119
+#: ../plugins/backup-restore/backup.c:267
msgid "Extracting files from backup"
msgstr "Extracting files from backup"
-#: ../plugins/backup-restore/backup.c:125
+#: ../plugins/backup-restore/backup.c:274
msgid "Loading Evolution settings"
msgstr "Loading Evolution settings"
-#: ../plugins/backup-restore/backup.c:129
+#: ../plugins/backup-restore/backup.c:278
msgid "Removing temporary backup files"
msgstr "Removing temporary backup files"
-#: ../plugins/backup-restore/backup.c:249
+#: ../plugins/backup-restore/backup.c:285
+msgid "Ensuring local sources"
+msgstr "Ensuring local sources"
+
+#: ../plugins/backup-restore/backup.c:455
#, c-format
msgid "Backing up to the folder %s"
msgstr "Backing up to the folder %s"
-#: ../plugins/backup-restore/backup.c:254
+#: ../plugins/backup-restore/backup.c:460
#, c-format
msgid "Restoring from the folder %s"
msgstr "Restoring from the folder %s"
#. Backup / Restore only can have GUI. We should restrict the rest
-#: ../plugins/backup-restore/backup.c:270
+#: ../plugins/backup-restore/backup.c:479
msgid "Evolution Backup"
msgstr "Evolution Backup"
-#: ../plugins/backup-restore/backup.c:270
+#: ../plugins/backup-restore/backup.c:479
msgid "Evolution Restore"
msgstr "Evolution Restore"
+#: ../plugins/backup-restore/backup.c:514
+msgid "Backing up Evolution Data"
+msgstr "Backing up Evolution Data"
+
+#: ../plugins/backup-restore/backup.c:515
+msgid "Please wait while Evolution is backing up your data."
+msgstr "Please wait while Evolution backs up your data."
+
+#: ../plugins/backup-restore/backup.c:517
+msgid "Restoring Evolution Data"
+msgstr "Restoring Evolution Data"
+
+#: ../plugins/backup-restore/backup.c:518
+msgid "Please wait while Evolution is restoring your data."
+msgstr "Please wait while Evolution restores your data."
+
+#: ../plugins/backup-restore/backup.c:536
+msgid "This may take a while depending on the amount of data in your account."
+msgstr "This may take a while depending on the amount of data in your account."
+
#: ../plugins/backup-restore/org-gnome-backup-restore.eplug.xml.h:1
msgid "A plugin for backing up and restore Evolution data and settings."
msgstr "A plugin for backing up and restore Evolution data and settings."
@@ -15743,9 +16128,8 @@ msgid "Please select a valid backup file to restore."
msgstr "Please select a valid backup file to restore."
#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:7
-msgid "The selected folder does not have enough permissions to create the file"
-msgstr ""
-"The selected folder does not have enough permissions to create the file"
+msgid "The selected folder is not writable."
+msgstr "The selected folder is not writable."
#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:8
msgid ""
@@ -15773,47 +16157,41 @@ msgstr "R_estore Settings..."
msgid "_Backup Settings..."
msgstr "_Backup Settings..."
-#: ../plugins/bbdb/bbdb.c:541 ../plugins/bbdb/bbdb.c:550
+#: ../plugins/bbdb/bbdb.c:543 ../plugins/bbdb/bbdb.c:552
#: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:1
msgid "Automatic Contacts"
msgstr "Automatic Contacts"
#. Enable BBDB checkbox
-#: ../plugins/bbdb/bbdb.c:565
-msgid ""
-"_Automatically create entries in the addressbook when responding to messages"
-msgstr ""
-"_Automatically create entries in the address book when responding to messages"
+#: ../plugins/bbdb/bbdb.c:567
+msgid "_Auto-create address book entries when replying to messages"
+msgstr "_Auto-create address book entries when replying to messages"
-#: ../plugins/bbdb/bbdb.c:571
+#: ../plugins/bbdb/bbdb.c:573
msgid "Select Address book for Automatic Contacts"
msgstr "Select Address book for Automatic Contacts"
-#: ../plugins/bbdb/bbdb.c:586
+#: ../plugins/bbdb/bbdb.c:588
msgid "Instant Messaging Contacts"
msgstr "Instant Messaging Contacts"
#. Enable Gaim Checkbox
-#: ../plugins/bbdb/bbdb.c:601
-msgid ""
-"Periodically synchronize contact information and images from Pidgin buddy "
-"list"
-msgstr ""
-"Periodically synchronise contact information and images from Pidgin buddy "
-"list"
+#: ../plugins/bbdb/bbdb.c:603
+msgid "Synchronize contact info and images from Pidgin buddy list"
+msgstr "Synchronise contact info and images from Pidgin buddy list"
-#: ../plugins/bbdb/bbdb.c:607
+#: ../plugins/bbdb/bbdb.c:609
msgid "Select Address book for Pidgin buddy list"
msgstr "Select Address book for Pidgin buddy list"
#. Synchronize now button.
-#: ../plugins/bbdb/bbdb.c:618
+#: ../plugins/bbdb/bbdb.c:620
msgid "Synchronize with _buddy list now"
msgstr "Synchronise with _buddy list now"
#: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:2
msgid ""
-"Automatically fills your addressbook with names and email addresses as you "
+"Automatically fills your address book with names and email addresses as you "
"reply to messages. Also fills in IM contact information from your buddy "
"lists."
msgstr ""
@@ -15874,17 +16252,18 @@ msgstr "Bogofilter junk plugin"
msgid "Filters junk messages using Bogofilter."
msgstr "Filters junk messages using Bogofilter."
-#: ../plugins/caldav/caldav-source.c:64 ../plugins/caldav/caldav-source.c:68
+#: ../plugins/caldav/caldav-source.c:66 ../plugins/caldav/caldav-source.c:70
msgid "CalDAV"
msgstr "CalDAV"
-#: ../plugins/caldav/caldav-source.c:247
-#: ../plugins/calendar-http/calendar-http.c:135
+#: ../plugins/caldav/caldav-source.c:249
+#: ../plugins/calendar-http/calendar-http.c:126
msgid "_URL:"
msgstr "_URL:"
-#: ../plugins/caldav/caldav-source.c:269
-#: ../plugins/google-account-setup/google-source.c:351
+#: ../plugins/caldav/caldav-source.c:271
+#: ../plugins/google-account-setup/google-source.c:618
+#: ../plugins/google-account-setup/google-contacts-source.c:301
msgid "Use _SSL"
msgstr "Use _SSL"
@@ -15904,17 +16283,18 @@ msgstr "Local Calendars"
msgid "Provides core functionality for local calendars."
msgstr "Provides core functionality for local calendars."
-#: ../plugins/calendar-http/calendar-http.c:273
+#: ../plugins/calendar-http/calendar-http.c:264
#: ../plugins/calendar-weather/calendar-weather.c:546
-#: ../plugins/google-account-setup/google-source.c:375
+#: ../plugins/google-account-setup/google-source.c:642
+#: ../plugins/google-account-setup/google-contacts-source.c:320
msgid "Re_fresh:"
msgstr "Re_fresh:"
-#: ../plugins/calendar-http/calendar-http.c:341
+#: ../plugins/calendar-http/calendar-http.c:332
msgid "_Secure connection"
msgstr "_Secure connection"
-#: ../plugins/calendar-http/calendar-http.c:406
+#: ../plugins/calendar-http/calendar-http.c:397
msgid "Userna_me:"
msgstr "Userna_me:"
@@ -16014,7 +16394,7 @@ msgid "Do you want to make Evolution your default e-mail client?"
msgstr "Do you want to make Evolution your default e-mail client?"
#: ../plugins/default-mailer/org-gnome-default-mailer.error.xml.h:2
-#: ../shell/main.c:691
+#: ../shell/main.c:585
msgid "Evolution"
msgstr "Evolution"
@@ -16040,21 +16420,35 @@ msgstr "Default Sources"
#: ../plugins/default-source/org-gnome-default-source.eplug.xml.h:2
msgid ""
-"Provides functionality for marking a calendar or an addressbook as the "
+"Provides functionality for marking a calendar or an address book as the "
"default one."
msgstr ""
-"Provides functionallity for marking a calendar or address book as the "
+"Provides functionality for marking a calendar or an address book as the "
"default one."
-#: ../plugins/email-custom-header/email-custom-header.c:541
+#: ../plugins/email-custom-header/email-custom-header.c:558
msgid "_Custom Header"
msgstr "_Custom Header"
-#: ../plugins/email-custom-header/org-gnome-email-custom-header.glade.h:1
-msgid "Custom Header Options"
-msgstr "Custom Header Options"
+#: ../plugins/email-custom-header/email-custom-header.c:879
+msgid "Key"
+msgstr "Key"
+
+#: ../plugins/email-custom-header/email-custom-header.c:890
+#: ../plugins/templates/templates.c:400
+msgid "Values"
+msgstr "Values"
-#: ../plugins/email-custom-header/org-gnome-email-custom-header.glade.h:2
+#. To translators: This string is used while adding a new message header to configuration, to specifying the format of the key values
+#: ../plugins/email-custom-header/email-custom-header.glade.h:2
+msgid ""
+"The format for specifying a Custom Header key value is:\n"
+"Name of the Custom Header key values separated by \";\"."
+msgstr ""
+"The format for specifying a Custom Header key value is:\n"
+"Name of the Custom Header key values separated by \";\"."
+
+#: ../plugins/email-custom-header/org-gnome-email-custom-header.glade.h:1
msgid "Email Custom Header"
msgstr "E-mail Custom Header"
@@ -16068,8 +16462,8 @@ msgid "Custom Header"
msgstr "Custom Header"
#: ../plugins/email-custom-header/apps_evolution_email_custom_header.schemas.in.h:1
-msgid "List of Custom Header"
-msgstr "List of Custom Header"
+msgid "List of Custom Headers"
+msgstr "List of Custom Headers"
#: ../plugins/email-custom-header/apps_evolution_email_custom_header.schemas.in.h:2
msgid ""
@@ -16098,12 +16492,12 @@ msgid "_User:"
msgstr "_User:"
#. i18n: "Secure Password Authentication" is an Outlookism
-#: ../plugins/exchange-operations/exchange-account-setup.c:62
+#: ../plugins/exchange-operations/exchange-account-setup.c:61
msgid "Secure Password"
msgstr "Secure Password"
#. i18n: "NTLM" probably doesn't translate
-#: ../plugins/exchange-operations/exchange-account-setup.c:65
+#: ../plugins/exchange-operations/exchange-account-setup.c:64
msgid ""
"This option will connect to the Exchange server using secure password (NTLM) "
"authentication."
@@ -16111,11 +16505,11 @@ msgstr ""
"This option will connect to the Exchange server using secure password (NTLM) "
"authentication."
-#: ../plugins/exchange-operations/exchange-account-setup.c:73
+#: ../plugins/exchange-operations/exchange-account-setup.c:72
msgid "Plaintext Password"
msgstr "Plaintext Password"
-#: ../plugins/exchange-operations/exchange-account-setup.c:75
+#: ../plugins/exchange-operations/exchange-account-setup.c:74
msgid ""
"This option will connect to the Exchange server using standard plaintext "
"password authentication."
@@ -16123,11 +16517,11 @@ msgstr ""
"This option will connect to the Exchange server using standard plaintext "
"password authentication."
-#: ../plugins/exchange-operations/exchange-account-setup.c:256
+#: ../plugins/exchange-operations/exchange-account-setup.c:255
msgid "Out Of Office"
msgstr "Out Of Office"
-#: ../plugins/exchange-operations/exchange-account-setup.c:263
+#: ../plugins/exchange-operations/exchange-account-setup.c:262
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."
@@ -16135,77 +16529,81 @@ 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-operations/exchange-account-setup.c:275
-#: ../plugins/exchange-operations/exchange-account-setup.c:280
+#: ../plugins/exchange-operations/exchange-account-setup.c:274
+#: ../plugins/exchange-operations/exchange-account-setup.c:279
msgid "I am out of the office"
msgstr "I am out of the office"
-#: ../plugins/exchange-operations/exchange-account-setup.c:276
-#: ../plugins/exchange-operations/exchange-account-setup.c:279
+#: ../plugins/exchange-operations/exchange-account-setup.c:275
+#: ../plugins/exchange-operations/exchange-account-setup.c:278
msgid "I am in the office"
msgstr "I am in the office"
#. Change Password
-#: ../plugins/exchange-operations/exchange-account-setup.c:327
+#: ../plugins/exchange-operations/exchange-account-setup.c:326
msgid "Change the password for Exchange account"
msgstr "Change the password for Exchange account"
-#: ../plugins/exchange-operations/exchange-account-setup.c:329
+#: ../plugins/exchange-operations/exchange-account-setup.c:328
#: ../plugins/exchange-operations/exchange-change-password.glade.h:1
msgid "Change Password"
msgstr "Change Password"
#. Delegation Assistant
-#: ../plugins/exchange-operations/exchange-account-setup.c:334
+#: ../plugins/exchange-operations/exchange-account-setup.c:333
msgid "Manage the delegate settings for Exchange account"
msgstr "Manage the delegate settings for Exchange account"
-#: ../plugins/exchange-operations/exchange-account-setup.c:336
+#: ../plugins/exchange-operations/exchange-account-setup.c:335
msgid "Delegation Assistant"
msgstr "Delegation Assistant"
#. Miscelleneous settings
-#: ../plugins/exchange-operations/exchange-account-setup.c:348
+#: ../plugins/exchange-operations/exchange-account-setup.c:347
msgid "Miscelleneous"
msgstr "Miscelleneous"
#. Folder Size
-#: ../plugins/exchange-operations/exchange-account-setup.c:358
+#: ../plugins/exchange-operations/exchange-account-setup.c:357
msgid "View the size of all Exchange folders"
msgstr "View the size of all Exchange folders"
-#: ../plugins/exchange-operations/exchange-account-setup.c:360
+#: ../plugins/exchange-operations/exchange-account-setup.c:359
msgid "Folders Size"
msgstr "Folders Size"
-#: ../plugins/exchange-operations/exchange-account-setup.c:367
+#: ../plugins/exchange-operations/exchange-account-setup.c:366
#: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:3
msgid "Exchange Settings"
msgstr "Exchange Settings"
-#: ../plugins/exchange-operations/exchange-account-setup.c:624
+#: ../plugins/exchange-operations/exchange-account-setup.c:688
msgid "_OWA URL:"
msgstr "_OWA URL:"
-#: ../plugins/exchange-operations/exchange-account-setup.c:650
+#: ../plugins/exchange-operations/exchange-account-setup.c:714
msgid "A_uthenticate"
msgstr "A_uthenticate"
-#: ../plugins/exchange-operations/exchange-account-setup.c:853
+#: ../plugins/exchange-operations/exchange-account-setup.c:735
+msgid "_Mailbox:"
+msgstr "_Mailbox:"
+
+#: ../plugins/exchange-operations/exchange-account-setup.c:936
msgid "_Authentication Type"
msgstr "_Authentication Type"
-#: ../plugins/exchange-operations/exchange-account-setup.c:867
+#: ../plugins/exchange-operations/exchange-account-setup.c:950
msgid "Ch_eck for Supported Types"
msgstr "Ch_eck for Supported Types"
-#: ../plugins/exchange-operations/exchange-account-setup.c:979
+#: ../plugins/exchange-operations/exchange-account-setup.c:1062
#: ../plugins/exchange-operations/exchange-contacts.c:212
#, c-format
msgid "%s KB"
msgstr "%s KB"
-#: ../plugins/exchange-operations/exchange-account-setup.c:981
+#: ../plugins/exchange-operations/exchange-account-setup.c:1064
#: ../plugins/exchange-operations/exchange-contacts.c:214
#, c-format
msgid "0 KB"
@@ -16223,7 +16621,7 @@ msgstr ""
#. User entered a wrong existing
#. * password. Prompt him again.
#.
-#: ../plugins/exchange-operations/exchange-change-password.c:115
+#: ../plugins/exchange-operations/exchange-change-password.c:114
msgid ""
"The current password does not match the existing password for your account. "
"Please enter the correct password"
@@ -16231,7 +16629,7 @@ msgstr ""
"The current password does not match the existing password for your account. "
"Please enter the correct password"
-#: ../plugins/exchange-operations/exchange-change-password.c:122
+#: ../plugins/exchange-operations/exchange-change-password.c:121
msgid "The two passwords do not match. Please re-enter the passwords."
msgstr "The two passwords do not match. Please re-enter the passwords."
@@ -16251,38 +16649,38 @@ msgstr "New Password:"
msgid "Your current password has expired. Please change your password now."
msgstr "Your current password has expired. Please change your password now."
-#: ../plugins/exchange-operations/exchange-config-listener.c:663
+#: ../plugins/exchange-operations/exchange-config-listener.c:665
#, c-format
msgid "Your password will expire in the next %d days"
msgstr "Your password will expire in the next %d days"
-#: ../plugins/exchange-operations/exchange-delegates-user.c:164
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:580
+#: ../plugins/exchange-operations/exchange-delegates-user.c:152
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:570
msgid "Custom"
msgstr "Custom"
-#: ../plugins/exchange-operations/exchange-delegates-user.c:194
+#: ../plugins/exchange-operations/exchange-delegates-user.c:182
#: ../plugins/exchange-operations/exchange-delegates.glade.h:8
msgid "Editor (read, create, edit)"
msgstr "Editor (read, create, edit)"
-#: ../plugins/exchange-operations/exchange-delegates-user.c:198
+#: ../plugins/exchange-operations/exchange-delegates-user.c:186
#: ../plugins/exchange-operations/exchange-delegates.glade.h:1
msgid "Author (read, create)"
msgstr "Author (read, create)"
-#: ../plugins/exchange-operations/exchange-delegates-user.c:202
+#: ../plugins/exchange-operations/exchange-delegates-user.c:190
#: ../plugins/exchange-operations/exchange-delegates.glade.h:11
msgid "Reviewer (read-only)"
msgstr "Reviewer (read-only)"
-#: ../plugins/exchange-operations/exchange-delegates-user.c:252
+#: ../plugins/exchange-operations/exchange-delegates-user.c:240
#: ../plugins/exchange-operations/exchange-delegates.glade.h:6
msgid "Delegate Permissions"
msgstr "Delegate Permissions"
-#: ../plugins/exchange-operations/exchange-delegates-user.c:263
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:188
+#: ../plugins/exchange-operations/exchange-delegates-user.c:251
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:178
#, c-format
msgid "Permissions for %s"
msgstr "Permissions for %s"
@@ -16290,7 +16688,7 @@ msgstr "Permissions for %s"
#. To translators: This is a part of the message to be sent to the delegatee
#. summarizing the permissions assigned to him.
#.
-#: ../plugins/exchange-operations/exchange-delegates-user.c:353
+#: ../plugins/exchange-operations/exchange-delegates-user.c:341
msgid ""
"This message was sent automatically by Evolution to inform you that you have "
"been designated as a delegate. You can now send messages on my behalf."
@@ -16300,66 +16698,66 @@ msgstr ""
#. To translators: Another chunk of the same message.
#.
-#: ../plugins/exchange-operations/exchange-delegates-user.c:358
+#: ../plugins/exchange-operations/exchange-delegates-user.c:346
msgid "You have been given the following permissions on my folders:"
msgstr "You have been given the following permissions on my folders:"
#. To translators: This message is included if the delegatee has been given access
#. to the private items.
#.
-#: ../plugins/exchange-operations/exchange-delegates-user.c:376
+#: ../plugins/exchange-operations/exchange-delegates-user.c:364
msgid "You are also permitted to see my private items."
msgstr "You are also permitted to see my private items."
#. To translators: This message is included if the delegatee has not been given access
#. to the private items.
#.
-#: ../plugins/exchange-operations/exchange-delegates-user.c:383
+#: ../plugins/exchange-operations/exchange-delegates-user.c:371
msgid "However you are not permitted to see my private items."
msgstr "However you are not permitted to see my private items."
-#: ../plugins/exchange-operations/exchange-delegates-user.c:415
+#: ../plugins/exchange-operations/exchange-delegates-user.c:403
#, c-format
msgid "You have been designated as a delegate for %s"
msgstr "You have been designated as a delegate for %s"
-#: ../plugins/exchange-operations/exchange-delegates.c:421
+#: ../plugins/exchange-operations/exchange-delegates.c:417
msgid "Delegate To"
msgstr "Delegate To"
-#: ../plugins/exchange-operations/exchange-delegates.c:586
+#: ../plugins/exchange-operations/exchange-delegates.c:582
#, c-format
msgid "Remove the delegate %s?"
msgstr "Remove the delegate %s?"
-#: ../plugins/exchange-operations/exchange-delegates.c:704
+#: ../plugins/exchange-operations/exchange-delegates.c:700
msgid "Could not access Active Directory"
msgstr "Could not access Active Directory"
-#: ../plugins/exchange-operations/exchange-delegates.c:716
+#: ../plugins/exchange-operations/exchange-delegates.c:712
msgid "Could not find self in Active Directory"
msgstr "Could not find self in Active Directory"
-#: ../plugins/exchange-operations/exchange-delegates.c:729
+#: ../plugins/exchange-operations/exchange-delegates.c:725
#, c-format
msgid "Could not find delegate %s in Active Directory"
msgstr "Could not find delegate %s in Active Directory"
-#: ../plugins/exchange-operations/exchange-delegates.c:741
+#: ../plugins/exchange-operations/exchange-delegates.c:737
#, c-format
msgid "Could not remove delegate %s"
msgstr "Could not remove delegate %s"
-#: ../plugins/exchange-operations/exchange-delegates.c:801
+#: ../plugins/exchange-operations/exchange-delegates.c:797
msgid "Could not update list of delegates."
msgstr "Could not update list of delegates."
-#: ../plugins/exchange-operations/exchange-delegates.c:819
+#: ../plugins/exchange-operations/exchange-delegates.c:815
#, c-format
msgid "Could not add delegate %s"
msgstr "Could not add delegate %s"
-#: ../plugins/exchange-operations/exchange-delegates.c:987
+#: ../plugins/exchange-operations/exchange-delegates.c:983
msgid "Error reading delegates list."
msgstr "Error reading delegates list."
@@ -16407,25 +16805,25 @@ msgstr "_Summarise permissions"
msgid "_Tasks:"
msgstr "_Tasks:"
-#: ../plugins/exchange-operations/exchange-folder-permission.c:60
+#: ../plugins/exchange-operations/exchange-folder-permission.c:62
#: ../plugins/exchange-operations/org-gnome-folder-permissions.xml.h:2
msgid "Permissions..."
msgstr "Permissions..."
-#: ../plugins/exchange-operations/exchange-folder-size-display.c:133
+#: ../plugins/exchange-operations/exchange-folder-size-display.c:130
msgid "Folder Name"
msgstr "Folder Name"
-#: ../plugins/exchange-operations/exchange-folder-size-display.c:137
+#: ../plugins/exchange-operations/exchange-folder-size-display.c:134
msgid "Folder Size"
msgstr "Folder Size"
#. FIXME Limit to one user
-#: ../plugins/exchange-operations/exchange-folder-subscription.c:75
+#: ../plugins/exchange-operations/exchange-folder-subscription.c:78
msgid "User"
msgstr "User"
-#: ../plugins/exchange-operations/exchange-folder-subscription.c:315
+#: ../plugins/exchange-operations/exchange-folder-subscription.c:321
#: ../plugins/exchange-operations/org-gnome-folder-subscription.xml.h:1
msgid "Subscribe to Other User's Folder"
msgstr "Subscribe to Other User's Folder"
@@ -16434,20 +16832,20 @@ msgstr "Subscribe to Other User's Folder"
msgid "Exchange Folder Tree"
msgstr "Exchange Folder Tree"
-#: ../plugins/exchange-operations/exchange-folder.c:66
-#: ../plugins/exchange-operations/exchange-folder.c:235
-#: ../plugins/exchange-operations/exchange-folder.c:245
+#: ../plugins/exchange-operations/exchange-folder.c:67
+#: ../plugins/exchange-operations/exchange-folder.c:236
+#: ../plugins/exchange-operations/exchange-folder.c:246
msgid "Unsubscribe Folder..."
msgstr "Unsubscribe Folder..."
-#: ../plugins/exchange-operations/exchange-folder.c:465
-#: ../plugins/exchange-operations/exchange-folder.c:520
+#: ../plugins/exchange-operations/exchange-folder.c:466
+#: ../plugins/exchange-operations/exchange-folder.c:521
#, c-format
msgid "Really unsubscribe from folder \"%s\"?"
msgstr "Really unsubscribe from folder \"%s\"?"
-#: ../plugins/exchange-operations/exchange-folder.c:477
-#: ../plugins/exchange-operations/exchange-folder.c:532
+#: ../plugins/exchange-operations/exchange-folder.c:478
+#: ../plugins/exchange-operations/exchange-folder.c:533
#, c-format
msgid "Unsubscribe from \"%s\""
msgstr "Unsubscribe from \"%s\""
@@ -16512,18 +16910,18 @@ msgstr "Your password will expire in 7 days..."
msgid "_Change Password"
msgstr "_Change Password"
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:305
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:295
msgid "(Permission denied.)"
msgstr "(Permission denied.)"
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:413
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:403
msgid "Add User:"
msgstr "Add User:"
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:413
-#: ../plugins/exchange-operations/exchange-send-options.c:417
-#: ../plugins/groupwise-features/proxy.c:946
-#: ../plugins/groupwise-features/share-folder.c:726
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:403
+#: ../plugins/exchange-operations/exchange-send-options.c:410
+#: ../plugins/groupwise-features/proxy.c:934
+#: ../plugins/groupwise-features/share-folder.c:715
msgid "Add User"
msgstr "Add User"
@@ -16641,15 +17039,11 @@ msgstr "_Sensitivity: "
msgid "_User"
msgstr "_User"
-#: ../plugins/exchange-operations/exchange-send-options.glade.h:17
-msgid "button-user"
-msgstr "button-user"
-
-#: ../plugins/exchange-operations/exchange-user-dialog.c:143
+#: ../plugins/exchange-operations/exchange-user-dialog.c:138
msgid "Select User"
msgstr "Select User"
-#: ../plugins/exchange-operations/exchange-user-dialog.c:181
+#: ../plugins/exchange-operations/exchange-user-dialog.c:176
msgid "Address Book..."
msgstr "Address Book..."
@@ -16663,10 +17057,10 @@ msgstr "Subscribe to Other User's Calendar"
#: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:1
msgid ""
-"A plugin that handles a collection of Exchange account specific operations "
+"A plugin that manages a collection of Exchange account specific operations "
"and features."
msgstr ""
-"A plugin that handles a collection of Exchange account specific operations "
+"A plugin that manages a collection of Exchange account-specific operations "
"and features."
#: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:2
@@ -16756,10 +17150,14 @@ msgid "Could not update out-of-office state"
msgstr "Could not update out-of-office state"
#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:21
+msgid "Evolution requires a restart to load the subscribed user's mailbox"
+msgstr "Evolution requires a restart to load the subscribed user's mailbox"
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:22
msgid "Exchange Account is offline."
msgstr "Exchange Account is offline."
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:22
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:23
msgid ""
"Exchange Connector requires access to certain\n"
"functionality on the Exchange Server that appears\n"
@@ -16787,32 +17185,32 @@ msgstr ""
"{0}\n"
" "
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:34
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:35
msgid "Failed to update delegates:"
msgstr "Failed to update delegates:"
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:35
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:36
msgid "Folder already exists"
msgstr "Folder already exists"
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:36
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:37
msgid "Folder does not exist"
msgstr "Folder does not exist"
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:37
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:38
msgid "Folder offline"
msgstr "Folder offline"
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:38
-#: ../shell/e-shell.c:1288
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:39
+#: ../shell/e-shell.c:1306
msgid "Generic error"
msgstr "Generic error"
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:39
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:40
msgid "Global Catalog Server is not reachable"
msgstr "Global Catalogue Server is not reachable"
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:40
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:41
msgid ""
"If OWA is running on a different path, you must specify that in the account "
"configuration dialog."
@@ -16820,72 +17218,72 @@ msgstr ""
"If OWA is running on a different path, you must specify that in the account "
"configuration dialogue."
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:41
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:42
msgid "Mailbox for {0} is not on this server."
msgstr "Mailbox for {0} is not on this server."
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:42
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:43
msgid "Make sure the URL is correct and try again."
msgstr "Make sure the URL is correct and try again."
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:43
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:44
msgid "Make sure the server name is spelled correctly and try again."
msgstr "Make sure the server name is spelt correctly and try again."
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:44
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:45
msgid "Make sure the username and password are correct and try again."
msgstr "Make sure the username and password are correct and try again."
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:45
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:46
msgid "No Global Catalog server configured for this account."
msgstr "No Global Catalogue server configured for this account."
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:46
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:47
msgid "No mailbox for user {0} on {1}."
msgstr "No mailbox for user {0} on {1}."
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:47
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:48
msgid "No such user {0}"
msgstr "No such user {0}"
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:48
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:49
msgid "Password successfully changed."
msgstr "Password successfully changed."
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:50
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:51
msgid "Please enter a Delegate's ID or deselect the Send as a Delegate option."
msgstr ""
"Please enter a Delegate's ID or deselect the Send as a Delegate option."
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:51
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:52
msgid "Please make sure the Global Catalog Server name is correct."
msgstr "Please make sure the name of the Global Catalogue Server is correct."
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:52
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:53
msgid "Please restart Evolution for changes to take effect"
msgstr "Please restart Evolution for changes to take effect"
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:53
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:54
msgid "Please select a user."
msgstr "Please select a user."
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:54
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:55
msgid "Server rejected password because it is too weak."
msgstr "Server rejected password because it is too weak."
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:55
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:56
msgid "The Exchange account will be disabled when you quit Evolution"
msgstr "The Exchange account will be disabled when you quit Evolution"
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:56
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:57
msgid "The Exchange account will be removed when you quit Evolution"
msgstr "The Exchange account will be removed when you quit Evolution"
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:57
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:58
msgid "The Exchange server is not compatible with Exchange Connector."
msgstr "The Exchange server is not compatible with Exchange Connector."
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:58
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:59
msgid ""
"The server is running Exchange 5.5. Exchange Connector \n"
"supports Microsoft Exchange 2000 and 2003 only."
@@ -16893,7 +17291,7 @@ msgstr ""
"The server is running Exchange 5.5. Exchange Connector \n"
"supports Microsoft Exchange 2000 and 2003 only."
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:60
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:61
msgid ""
"This probably means that your server requires \n"
"you to specify the Windows domain name \n"
@@ -16907,39 +17305,40 @@ msgstr ""
"\n"
"Or you might have just typed your password wrong."
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:65
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:66
msgid "Try again with a different password."
msgstr "Try again with a different password."
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:66
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:67
msgid "Unable to add user to access control list:"
msgstr "Unable to add user to access control list:"
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:67
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:68
msgid "Unable to edit delegates."
msgstr "Unable to edit delegates."
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:68
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:69
msgid "Unknown error looking up {0}"
msgstr "Unknown error looking up {0}"
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:69
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:70
+#: ../plugins/google-account-setup/google-source.c:543
msgid "Unknown error."
msgstr "Unknown error."
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:70
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:71
msgid "Unknown type"
msgstr "Unknown type"
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:71
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:72
msgid "Unsupported operation"
msgstr "Unsupported operation"
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:72
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:73
msgid "You are nearing your quota available for storing mail on this server."
msgstr "You are nearing your quota available for storing mail on this server."
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:73
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:74
msgid ""
"You are permitted to send a message on behalf of only one delegator at a "
"time."
@@ -16947,19 +17346,19 @@ msgstr ""
"You are permitted to send a message on behalf of only one delegator at a "
"time."
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:74
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:75
msgid "You cannot make yourself your own delegate"
msgstr "You cannot make yourself your own delegate"
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:75
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:76
msgid "You have exceeded your quota for storing mail on this server."
msgstr "You have exceeded your quota for storing mail on this server."
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:76
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:77
msgid "You may only configure a single Exchange account."
msgstr "You may only configure a single Exchange account."
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:77
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:78
msgid ""
"Your current usage is: {0} KB. Try to clear up some space by deleting some "
"mail."
@@ -16967,7 +17366,7 @@ msgstr ""
"Your current usage is: {0} KB. Try to clear up some space by deleting some "
"mail."
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:78
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:79
msgid ""
"Your current usage is: {0} KB. You will not be able to either send or "
"receive mail now."
@@ -16975,7 +17374,7 @@ msgstr ""
"Your current usage is: {0} KB. You will not be able to either send or "
"receive mail now."
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:79
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:80
msgid ""
"Your current usage is: {0} KB. You will not be able to send mail until you "
"clear up some space by deleting some mail."
@@ -16983,19 +17382,19 @@ msgstr ""
"Your current usage is: {0} KB. You will not be able to send mail until you "
"clear up some space by deleting some mail."
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:80
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:81
msgid "Your password has expired."
msgstr "Your password has expired."
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:82
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:83
msgid "{0} cannot be added to an access control list"
msgstr "{0} cannot be added to an access control list"
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:83
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:84
msgid "{0} is already a delegate"
msgstr "{0} is already a delegate"
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:84
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:85
msgid "{0} is already in the list"
msgstr "{0} is already in the list"
@@ -17053,18 +17452,18 @@ msgstr ""
"setting a different editor."
#: ../plugins/external-editor/org-gnome-external-editor.xml.h:1
-msgid "Compose in External Editor"
-msgstr "Compose in External Editor"
+msgid "Compose in _External Editor"
+msgstr "Compose in _External Editor"
#: ../plugins/external-editor/org-gnome-external-editor.xml.h:2
msgid "Compose messages using an external editor"
msgstr "Compose messages using an external editor"
-#: ../plugins/external-editor/external-editor.c:91
+#: ../plugins/external-editor/external-editor.c:112
msgid "Command to be executed to launch the editor: "
msgstr "Command to be executed to launch the editor: "
-#: ../plugins/external-editor/external-editor.c:92
+#: ../plugins/external-editor/external-editor.c:113
msgid ""
"For Emacs use \"xemacs\"\n"
"For VI use \"gvim\""
@@ -17072,15 +17471,15 @@ msgstr ""
"For Emacs use \"xemacs\"\n"
"For VI use \"gvim\""
-#: ../plugins/face/face.c:58
+#: ../plugins/face/face.c:59
msgid "Select a (48*48) png of size < 700bytes"
msgstr "Select a (48*48) png of size < 700bytes"
-#: ../plugins/face/face.c:68
+#: ../plugins/face/face.c:69
msgid "PNG files"
msgstr "PNG files"
-#: ../plugins/face/face.c:125
+#: ../plugins/face/face.c:126
msgid "_Face"
msgstr "_Face"
@@ -17115,26 +17514,60 @@ msgstr "Unsubscribe Folders"
msgid "_Unsubscribe"
msgstr "_Unsubscribe"
-#: ../plugins/google-account-setup/google-source.c:71
-#: ../plugins/google-account-setup/google-source.c:78
+#: ../plugins/google-account-setup/google-source.c:83
+#: ../plugins/google-account-setup/google-source.c:90
+#: ../plugins/google-account-setup/google-contacts-source.c:52
+#: ../plugins/google-account-setup/google-contacts-source.c:57
+#: ../plugins/google-account-setup/google-contacts-source.c:83
msgid "Google"
msgstr "Google"
+#: ../plugins/google-account-setup/google-source.c:439
+msgid "Please enter user name first."
+msgstr "Please enter user name first."
+
+#: ../plugins/google-account-setup/google-source.c:443
+#, c-format
+msgid "Enter password for user %s to access list of subscribed calendars."
+msgstr "Enter password for user %s to access list of subscribed calendars."
+
+#: ../plugins/google-account-setup/google-source.c:543
+#, c-format
+msgid ""
+"Cannot read data from Google server.\n"
+"%s"
+msgstr ""
+"Cannot read data from Google server.\n"
+"%s"
+
+#: ../plugins/google-account-setup/google-source.c:693
+msgid "Cal_endar:"
+msgstr "Cal_endar:"
+
+#: ../plugins/google-account-setup/google-source.c:728
+msgid "Retrieve _list"
+msgstr "Retrieve _list"
+
+#: ../plugins/google-account-setup/google-contacts-source.c:268
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:300
+msgid "<b>Server</b>"
+msgstr "<b>Server</b>"
+
#: ../plugins/google-account-setup/org-gnome-evolution-google.eplug.xml.h:1
-msgid "A plugin to setup google calendar."
-msgstr "A plugin to setup google calendar."
+msgid "A plugin to setup google calendar and contacts."
+msgstr "A plugin to set up Google Calendar and Contacts."
#: ../plugins/google-account-setup/org-gnome-evolution-google.eplug.xml.h:2
msgid "Google sources"
msgstr "Google sources"
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:457
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:456
msgid "Checklist"
msgstr "Checklist"
#: ../plugins/groupwise-account-setup/org-gnome-gw-account-setup.eplug.xml.h:1
msgid "A plugin to setup groupwise calendar and contacts sources."
-msgstr "A plugin to setup groupwise calendar and contacts sources."
+msgstr "A plugin to setup Groupwise calendar and contacts sources."
#: ../plugins/groupwise-account-setup/org-gnome-gw-account-setup.eplug.xml.h:2
msgid "Groupwise Account Setup"
@@ -17173,16 +17606,16 @@ msgstr "Install the shared folder"
msgid "Shared Folder Installation"
msgstr "Shared Folder Installation"
-#: ../plugins/groupwise-features/junk-mail-settings.c:78
+#: ../plugins/groupwise-features/junk-mail-settings.c:80
msgid "Junk Settings"
msgstr "Junk Settings"
-#: ../plugins/groupwise-features/junk-mail-settings.c:91
+#: ../plugins/groupwise-features/junk-mail-settings.c:93
#: ../plugins/groupwise-features/junk-settings.glade.h:3
msgid "Junk Mail Settings"
msgstr "Junk Mail Settings"
-#: ../plugins/groupwise-features/junk-mail-settings.c:115
+#: ../plugins/groupwise-features/junk-mail-settings.c:117
msgid "Junk Mail Settings..."
msgstr "Junk Mail Settings..."
@@ -17208,10 +17641,22 @@ msgid "_Junk List"
msgstr "_Junk List"
#: ../plugins/groupwise-features/mail-retract.c:53
+msgid "Message Retract"
+msgstr "Message Retract"
+
+#: ../plugins/groupwise-features/mail-retract.c:58
+msgid ""
+"Retracting a message may remove it from the recipient's mailbox. Are you "
+"sure you want to do this ?"
+msgstr ""
+"Retracting a message may remove it from the recipient's mailbox. Are you "
+"sure you want to do this ?"
+
+#: ../plugins/groupwise-features/mail-retract.c:77
msgid "Message retracted successfully"
msgstr "Message retracted successfully"
-#: ../plugins/groupwise-features/mail-retract.c:60
+#: ../plugins/groupwise-features/mail-retract.c:87
msgid "Retract Mail"
msgstr "Retract Mail"
@@ -17219,12 +17664,6 @@ msgstr "Retract Mail"
msgid "Add Send Options to groupwise messages"
msgstr "Add Send Options to groupwise messages"
-#: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:2
-#: ../ui/evolution-event-editor.xml.h:15 ../ui/evolution-task-editor.xml.h:8
-#: ../widgets/misc/e-send-options.glade.h:19
-msgid "Send Options"
-msgstr "Send Options"
-
#: ../plugins/groupwise-features/org-gnome-groupwise-features.eplug.xml.h:1
msgid "A plugin for the features in Groupwise accounts."
msgstr "A plugin for the features in Groupwise accounts."
@@ -17274,29 +17713,33 @@ msgstr "Account Already Exists"
#: ../plugins/groupwise-features/org-gnome-proxy-login-errors.xml.h:4
msgid ""
-"Proxy login as &quot;{0}&quot; was unsuccessful. Please check Email Id and "
-"try again."
+"Proxy login as &quot;{0}&quot; was unsuccessful. Please check your email "
+"address and try again."
msgstr ""
-"Proxy login as &quot;{0}&quot; was unsuccessful. Please check Email Id and "
-"try again."
+"Proxy login as &quot;{0}&quot; was unsuccessful. Please check your e-mail "
+"address and try again."
#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:3
msgid "This is a recurring meeting"
msgstr "This is a recurring meeting"
#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:4
-msgid "What would you like to {0}?"
-msgstr "What would you like to {0}?"
+msgid "Would you like to accept it?"
+msgstr "Would you like to accept it?"
#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:5
+msgid "Would you like to decline it?"
+msgstr "Would you like to decline it?"
+
+#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:6
msgid "You cannot share folder with specified user &quot;{0}&quot;"
msgstr "You cannot share folder with specified user &quot;{0}&quot;"
-#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:6
+#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:7
msgid "You have to specify a user name whom you want to add to the list"
msgstr "You have to specify a user name whom you want to add to the list"
-#: ../plugins/groupwise-features/process-meeting.c:49
+#: ../plugins/groupwise-features/process-meeting.c:52
msgid "Accept Tentatively"
msgstr "Accept Tentatively"
@@ -17313,7 +17756,7 @@ msgid "Con_tacts..."
msgstr "Con_tacts..."
#: ../plugins/groupwise-features/properties.glade.h:5
-#: ../widgets/table/e-table-click-to-add.c:517
+#: ../widgets/table/e-table-click-to-add.c:516
msgid "Message"
msgstr "Message"
@@ -17394,9 +17837,9 @@ msgstr "<b>Account Name</b>"
msgid "Proxy Login"
msgstr "Proxy Login"
-#: ../plugins/groupwise-features/proxy-login.c:220
-#: ../plugins/groupwise-features/proxy-login.c:262
-#: ../plugins/groupwise-features/proxy.c:503
+#: ../plugins/groupwise-features/proxy-login.c:208
+#: ../plugins/groupwise-features/proxy-login.c:250
+#: ../plugins/groupwise-features/proxy.c:491
#: ../plugins/groupwise-features/send-options.c:83
#, c-format
msgid "%sEnter password for %s (user %s)"
@@ -17405,44 +17848,44 @@ msgstr "%sEnter password for %s (user %s)"
#. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a groupwise
#. * feature by which one person can send/read mails/appointments using another person's identity
#. * without knowing his password, for example if that other person is on vacation
-#: ../plugins/groupwise-features/proxy-login.c:521
+#: ../plugins/groupwise-features/proxy-login.c:509
msgid "_Proxy Login..."
msgstr "_Proxy Login..."
-#: ../plugins/groupwise-features/proxy.c:703
+#: ../plugins/groupwise-features/proxy.c:691
msgid "The Proxy tab will be available only when the account is online."
msgstr "The Proxy tab will be available only when the account is online."
-#: ../plugins/groupwise-features/proxy.c:708
+#: ../plugins/groupwise-features/proxy.c:696
msgid "The Proxy tab will be available only when the account is enabled."
msgstr "The Proxy tab will be available only when the account is enabled."
-#: ../plugins/groupwise-features/share-folder-common.c:319
-#: ../plugins/groupwise-features/share-folder.c:761
+#: ../plugins/groupwise-features/share-folder-common.c:321
+#: ../plugins/groupwise-features/share-folder.c:750
msgid "Users"
msgstr "Users"
-#: ../plugins/groupwise-features/share-folder-common.c:320
+#: ../plugins/groupwise-features/share-folder-common.c:322
msgid "Enter the users and set permissions"
msgstr "Enter the users and set permissions"
-#: ../plugins/groupwise-features/share-folder-common.c:339
+#: ../plugins/groupwise-features/share-folder-common.c:341
msgid "New _Shared Folder..."
msgstr "New _Shared Folder..."
-#: ../plugins/groupwise-features/share-folder-common.c:447
+#: ../plugins/groupwise-features/share-folder-common.c:449
msgid "Sharing"
msgstr "Sharing"
-#: ../plugins/groupwise-features/share-folder.c:544
+#: ../plugins/groupwise-features/share-folder.c:533
msgid "Custom Notification"
msgstr "Custom Notification"
-#: ../plugins/groupwise-features/share-folder.c:766
+#: ../plugins/groupwise-features/share-folder.c:755
msgid "Add "
msgstr "Add "
-#: ../plugins/groupwise-features/share-folder.c:772
+#: ../plugins/groupwise-features/share-folder.c:761
msgid "Modify"
msgstr "Modify"
@@ -17507,11 +17950,11 @@ msgstr "A plugin to setup hula calendar sources."
msgid "Hula Account Setup"
msgstr "Hula Account Setup"
-#: ../plugins/imap-features/imap-headers.c:322
+#: ../plugins/imap-features/imap-headers.c:320
msgid "Custom Headers"
msgstr "Custom Headers"
-#: ../plugins/imap-features/imap-headers.c:335
+#: ../plugins/imap-features/imap-headers.c:333
msgid "IMAP Headers"
msgstr "IMAP Headers"
@@ -17585,8 +18028,8 @@ msgstr "Select Task List"
msgid "Select Calendar"
msgstr "Select Calendar"
-#: ../plugins/import-ics-attachments/icsimporter.c:259
-#: ../shell/e-shell-importer.c:703
+#: ../plugins/import-ics-attachments/icsimporter.c:260
+#: ../shell/e-shell-importer.c:696
msgid "_Import"
msgstr "_Import"
@@ -17623,13 +18066,14 @@ msgstr ""
"Evolution could not find an iPod to synchronise with. Either the iPod is not "
"connected to the system or it is not powered on."
-#: ../plugins/ipod-sync/ical-format.c:123
-#: ../plugins/save-calendar/ical-format.c:167
+#: ../plugins/ipod-sync/ical-format.c:118
+#: ../plugins/save-calendar/ical-format.c:163
msgid "iCalendar format (.ics)"
msgstr "iCalendar format (.ics)"
#: ../plugins/ipod-sync/org-gnome-ipod-sync-evolution.eplug.xml.h:1
-msgid "Synchronize the selected task/memo/calendar/addressbook with Apple iPod"
+msgid ""
+"Synchronize the selected task/memo/calendar/address book with Apple iPod"
msgstr ""
"Synchronise the selected task/memo/calendar/address book with an Apple iPod"
@@ -17641,128 +18085,128 @@ msgstr "Synchronise to iPod"
msgid "iPod Synchronization"
msgstr "iPod Synchronisation"
-#: ../plugins/itip-formatter/itip-formatter.c:444
-#: ../plugins/itip-formatter/itip-formatter.c:569
+#: ../plugins/itip-formatter/itip-formatter.c:443
+#: ../plugins/itip-formatter/itip-formatter.c:568
#, c-format
msgid "Failed to load the calendar '%s'"
msgstr "Failed to load the calendar '%s'"
-#: ../plugins/itip-formatter/itip-formatter.c:589
+#: ../plugins/itip-formatter/itip-formatter.c:588
#, c-format
msgid "An appointment in the calendar '%s' conflicts with this meeting"
msgstr "An appointment in the calendar '%s' conflicts with this meeting"
-#: ../plugins/itip-formatter/itip-formatter.c:615
+#: ../plugins/itip-formatter/itip-formatter.c:614
#, c-format
msgid "Found the appointment in the calendar '%s'"
msgstr "Found the appointment in the calendar '%s'"
-#: ../plugins/itip-formatter/itip-formatter.c:691
+#: ../plugins/itip-formatter/itip-formatter.c:690
msgid "Unable to find any calendars"
msgstr "Unable to find any calendars"
-#: ../plugins/itip-formatter/itip-formatter.c:698
+#: ../plugins/itip-formatter/itip-formatter.c:697
msgid "Unable to find this meeting in any calendar"
msgstr "Unable to find this meeting in any calendar"
-#: ../plugins/itip-formatter/itip-formatter.c:702
+#: ../plugins/itip-formatter/itip-formatter.c:701
msgid "Unable to find this task in any task list"
msgstr "Unable to find this task in any task list"
-#: ../plugins/itip-formatter/itip-formatter.c:706
+#: ../plugins/itip-formatter/itip-formatter.c:705
msgid "Unable to find this memo in any memo list"
msgstr "Unable to find this memo in any memo list"
-#: ../plugins/itip-formatter/itip-formatter.c:777
+#: ../plugins/itip-formatter/itip-formatter.c:776
msgid "Searching for an existing version of this appointment"
msgstr "Searching for an existing version of this appointment"
-#: ../plugins/itip-formatter/itip-formatter.c:946
+#: ../plugins/itip-formatter/itip-formatter.c:945
msgid "Unable to parse item"
msgstr "Unable to parse item"
-#: ../plugins/itip-formatter/itip-formatter.c:1004
+#: ../plugins/itip-formatter/itip-formatter.c:1003
#, 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:1016
+#: ../plugins/itip-formatter/itip-formatter.c:1015
#, c-format
msgid "Sent to calendar '%s' as accepted"
msgstr "Sent to calendar '%s' as accepted"
-#: ../plugins/itip-formatter/itip-formatter.c:1020
+#: ../plugins/itip-formatter/itip-formatter.c:1019
#, c-format
msgid "Sent to calendar '%s' as tentative"
msgstr "Sent to calendar '%s' as tentative"
-#: ../plugins/itip-formatter/itip-formatter.c:1025
+#: ../plugins/itip-formatter/itip-formatter.c:1024
#, c-format
msgid "Sent to calendar '%s' as declined"
msgstr "Sent to calendar '%s' as declined"
-#: ../plugins/itip-formatter/itip-formatter.c:1030
+#: ../plugins/itip-formatter/itip-formatter.c:1029
#, c-format
msgid "Sent to calendar '%s' as canceled"
msgstr "Sent to calendar '%s' as cancelled"
-#: ../plugins/itip-formatter/itip-formatter.c:1124
+#: ../plugins/itip-formatter/itip-formatter.c:1123
#, c-format
msgid "Organizer has removed the delegate %s "
msgstr "Organiser has removed the delegate %s "
-#: ../plugins/itip-formatter/itip-formatter.c:1131
+#: ../plugins/itip-formatter/itip-formatter.c:1130
msgid "Sent a cancelation notice to the delegate"
msgstr "Sent a cancellation notice to the delegate"
-#: ../plugins/itip-formatter/itip-formatter.c:1133
+#: ../plugins/itip-formatter/itip-formatter.c:1132
msgid "Could not send the cancelation notice to the delegate"
msgstr "Could not send the cancellation notice to the delegate"
-#: ../plugins/itip-formatter/itip-formatter.c:1219
+#: ../plugins/itip-formatter/itip-formatter.c:1218
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:1246
+#: ../plugins/itip-formatter/itip-formatter.c:1245
#, c-format
msgid "Unable to update attendee. %s"
msgstr "Unable to update attendee. %s"
-#: ../plugins/itip-formatter/itip-formatter.c:1250
+#: ../plugins/itip-formatter/itip-formatter.c:1249
msgid "Attendee status updated"
msgstr "Attendee status updated"
-#: ../plugins/itip-formatter/itip-formatter.c:1276
+#: ../plugins/itip-formatter/itip-formatter.c:1275
msgid "Meeting information sent"
msgstr "Meeting information sent"
-#: ../plugins/itip-formatter/itip-formatter.c:1279
+#: ../plugins/itip-formatter/itip-formatter.c:1278
msgid "Task information sent"
msgstr "Task information sent"
-#: ../plugins/itip-formatter/itip-formatter.c:1282
+#: ../plugins/itip-formatter/itip-formatter.c:1281
msgid "Memo information sent"
msgstr "Memo information sent"
-#: ../plugins/itip-formatter/itip-formatter.c:1291
+#: ../plugins/itip-formatter/itip-formatter.c:1290
msgid "Unable to send meeting information, the meeting does not exist"
msgstr "Unable to send meeting information, the meeting does not exist"
-#: ../plugins/itip-formatter/itip-formatter.c:1294
+#: ../plugins/itip-formatter/itip-formatter.c:1293
msgid "Unable to send task information, the task does not exist"
msgstr "Unable to send task information, the task does not exist"
-#: ../plugins/itip-formatter/itip-formatter.c:1297
+#: ../plugins/itip-formatter/itip-formatter.c:1296
msgid "Unable to send memo information, the memo does not exist"
msgstr "Unable to send memo information, the memo does not exist"
-#: ../plugins/itip-formatter/itip-formatter.c:1366
-#: ../plugins/itip-formatter/itip-formatter.c:1377
+#: ../plugins/itip-formatter/itip-formatter.c:1365
+#: ../plugins/itip-formatter/itip-formatter.c:1376
msgid "The calendar attached is not valid"
msgstr "The calendar attached is not valid"
-#: ../plugins/itip-formatter/itip-formatter.c:1367
-#: ../plugins/itip-formatter/itip-formatter.c:1378
+#: ../plugins/itip-formatter/itip-formatter.c:1366
+#: ../plugins/itip-formatter/itip-formatter.c:1377
msgid ""
"The message claims to contain a calendar, but the calendar is not a valid "
"iCalendar."
@@ -17770,15 +18214,15 @@ msgstr ""
"The message claims to contain a calendar, but the calendar is not a valid "
"iCalendar."
-#: ../plugins/itip-formatter/itip-formatter.c:1413
-#: ../plugins/itip-formatter/itip-formatter.c:1431
-#: ../plugins/itip-formatter/itip-formatter.c:1513
+#: ../plugins/itip-formatter/itip-formatter.c:1417
+#: ../plugins/itip-formatter/itip-formatter.c:1435
+#: ../plugins/itip-formatter/itip-formatter.c:1517
msgid "The item in the calendar is not valid"
msgstr "The item in the calendar is not valid"
-#: ../plugins/itip-formatter/itip-formatter.c:1414
-#: ../plugins/itip-formatter/itip-formatter.c:1432
-#: ../plugins/itip-formatter/itip-formatter.c:1514
+#: ../plugins/itip-formatter/itip-formatter.c:1418
+#: ../plugins/itip-formatter/itip-formatter.c:1436
+#: ../plugins/itip-formatter/itip-formatter.c:1518
msgid ""
"The message does contain a calendar, but the calendar contains no events, "
"tasks or free/busy information"
@@ -17786,11 +18230,11 @@ msgstr ""
"The message does contain a calendar, but the calendar contains no events, "
"tasks or free/busy information"
-#: ../plugins/itip-formatter/itip-formatter.c:1443
+#: ../plugins/itip-formatter/itip-formatter.c:1447
msgid "The calendar attached contains multiple items"
msgstr "The calendar attached contains multiple items"
-#: ../plugins/itip-formatter/itip-formatter.c:1444
+#: ../plugins/itip-formatter/itip-formatter.c:1448
msgid ""
"To process all of these items, the file should be saved and the calendar "
"imported"
@@ -17798,227 +18242,227 @@ msgstr ""
"To process all of these items, the file should be saved and the calendar "
"imported"
-#: ../plugins/itip-formatter/itip-formatter.c:2143
+#: ../plugins/itip-formatter/itip-formatter.c:2148
msgid "This meeting recurs"
msgstr "This meeting recurs"
-#: ../plugins/itip-formatter/itip-formatter.c:2146
+#: ../plugins/itip-formatter/itip-formatter.c:2151
msgid "This task recurs"
msgstr "This task recurs"
-#: ../plugins/itip-formatter/itip-formatter.c:2149
+#: ../plugins/itip-formatter/itip-formatter.c:2154
msgid "This memo recurs"
msgstr "This memo recurs"
#. Delete message after acting
#. FIXME Need a schema for this
-#: ../plugins/itip-formatter/itip-formatter.c:2378
+#: ../plugins/itip-formatter/itip-formatter.c:2383
msgid "_Delete message after acting"
msgstr "_Delete message after acting"
-#: ../plugins/itip-formatter/itip-formatter.c:2388
-#: ../plugins/itip-formatter/itip-formatter.c:2420
+#: ../plugins/itip-formatter/itip-formatter.c:2393
+#: ../plugins/itip-formatter/itip-formatter.c:2425
msgid "Conflict Search"
msgstr "Conflict Search"
#. Source selector
-#: ../plugins/itip-formatter/itip-formatter.c:2403
+#: ../plugins/itip-formatter/itip-formatter.c:2408
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:192 ../ui/evolution-calendar.xml.h:34
-#: ../widgets/misc/e-cell-date-edit.c:300
+#: ../plugins/itip-formatter/itip-view.c:189 ../ui/evolution-calendar.xml.h:34
+#: ../widgets/misc/e-cell-date-edit.c:298
msgid "Today"
msgstr "Today"
#. strftime format of a time,
#. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:197
+#: ../plugins/itip-formatter/itip-view.c:194
msgid "Today %H:%M"
msgstr "Today %H:%M"
#. strftime format of a time,
#. in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:201
+#: ../plugins/itip-formatter/itip-view.c:198
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:210
+#: ../plugins/itip-formatter/itip-view.c:207
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:220
+#: ../plugins/itip-formatter/itip-view.c:217
msgid "Tomorrow"
msgstr "Tomorrow"
#. strftime format of a time,
#. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:225
+#: ../plugins/itip-formatter/itip-view.c:222
msgid "Tomorrow %H:%M"
msgstr "Tomorrow %H:%M"
#. strftime format of a time,
#. in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:229
+#: ../plugins/itip-formatter/itip-view.c:226
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:234
+#: ../plugins/itip-formatter/itip-view.c:231
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:238
+#: ../plugins/itip-formatter/itip-view.c:235
msgid "Tomorrow %l:%M:%S %p"
msgstr "Tomorrow %l:%M:%S %p"
#. strftime format of a weekday.
-#: ../plugins/itip-formatter/itip-view.c:257
+#: ../plugins/itip-formatter/itip-view.c:254
#, 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:262
+#: ../plugins/itip-formatter/itip-view.c:259
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:266
+#: ../plugins/itip-formatter/itip-view.c:263
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:271
+#: ../plugins/itip-formatter/itip-view.c:268
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:275
+#: ../plugins/itip-formatter/itip-view.c:272
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:284
+#: ../plugins/itip-formatter/itip-view.c:281
msgid "%A, %B %e"
msgstr "%A, %B %e"
#. 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:290
+#: ../plugins/itip-formatter/itip-view.c:287
msgid "%A, %B %e %H:%M"
msgstr "%A, %B %e %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:294
+#: ../plugins/itip-formatter/itip-view.c:291
msgid "%A, %B %e %H:%M:%S"
msgstr "%A, %B %e %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:299
+#: ../plugins/itip-formatter/itip-view.c:296
msgid "%A, %B %e %l:%M %p"
msgstr "%A, %B %e %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:303
+#: ../plugins/itip-formatter/itip-view.c:300
msgid "%A, %B %e %l:%M:%S %p"
msgstr "%A, %B %e %l:%M:%S %p"
#. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:309
+#: ../plugins/itip-formatter/itip-view.c:306
msgid "%A, %B %e, %Y"
msgstr "%A, %B %e, %Y"
#. strftime format of a weekday, a date and a
#. time, in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:314
+#: ../plugins/itip-formatter/itip-view.c:311
msgid "%A, %B %e, %Y %H:%M"
msgstr "%A, %B %e, %Y %H:%M"
#. strftime format of a weekday, a date and a
#. time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:318
+#: ../plugins/itip-formatter/itip-view.c:315
msgid "%A, %B %e, %Y %H:%M:%S"
msgstr "%A, %B %e, %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:323
+#: ../plugins/itip-formatter/itip-view.c:320
msgid "%A, %B %e, %Y %l:%M %p"
msgstr "%A, %B %e, %Y %l:%M %p"
#. strftime format of a weekday, a date and a
#. time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:327
+#: ../plugins/itip-formatter/itip-view.c:324
msgid "%A, %B %e, %Y %l:%M:%S %p"
msgstr "%A, %B %e, %Y %l:%M:%S %p"
-#: ../plugins/itip-formatter/itip-view.c:352
-#: ../plugins/itip-formatter/itip-view.c:440
-#: ../plugins/itip-formatter/itip-view.c:528
+#: ../plugins/itip-formatter/itip-view.c:349
+#: ../plugins/itip-formatter/itip-view.c:437
+#: ../plugins/itip-formatter/itip-view.c:525
#, c-format
msgid "Please respond on behalf of <b>%s</b>"
msgstr "Please respond on behalf of <b>%s</b>"
-#: ../plugins/itip-formatter/itip-view.c:354
-#: ../plugins/itip-formatter/itip-view.c:442
-#: ../plugins/itip-formatter/itip-view.c:530
+#: ../plugins/itip-formatter/itip-view.c:351
+#: ../plugins/itip-formatter/itip-view.c:439
+#: ../plugins/itip-formatter/itip-view.c:527
#, c-format
msgid "Received on behalf of <b>%s</b>"
msgstr "Received on behalf of <b>%s</b>"
-#: ../plugins/itip-formatter/itip-view.c:359
+#: ../plugins/itip-formatter/itip-view.c:356
#, 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:361
+#: ../plugins/itip-formatter/itip-view.c:358
#, 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:366
+#: ../plugins/itip-formatter/itip-view.c:363
#, c-format
msgid "<b>%s</b> has delegated the following meeting to you:"
msgstr "<b>%s</b> has delegated the following meeting to you:"
-#: ../plugins/itip-formatter/itip-view.c:369
+#: ../plugins/itip-formatter/itip-view.c:366
#, 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:371
+#: ../plugins/itip-formatter/itip-view.c:368
#, 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:377
+#: ../plugins/itip-formatter/itip-view.c:374
#, 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:379
+#: ../plugins/itip-formatter/itip-view.c:376
#, 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:383
+#: ../plugins/itip-formatter/itip-view.c:380
#, c-format
msgid ""
"<b>%s</b> through %s wishes to receive the latest information for the "
@@ -18027,89 +18471,89 @@ msgstr ""
"<b>%s</b> through %s wishes to receive the latest information for the "
"following meeting:"
-#: ../plugins/itip-formatter/itip-view.c:385
+#: ../plugins/itip-formatter/itip-view.c:382
#, 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:389
+#: ../plugins/itip-formatter/itip-view.c:386
#, c-format
msgid "<b>%s</b> through %s has sent back the following meeting response:"
msgstr "<b>%s</b> through %s has sent back the following meeting response:"
-#: ../plugins/itip-formatter/itip-view.c:391
+#: ../plugins/itip-formatter/itip-view.c:388
#, 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:395
+#: ../plugins/itip-formatter/itip-view.c:392
#, c-format
msgid "<b>%s</b> through %s has canceled the following meeting:"
msgstr "<b>%s</b> through %s has cancelled the following meeting:"
-#: ../plugins/itip-formatter/itip-view.c:397
+#: ../plugins/itip-formatter/itip-view.c:394
#, c-format
msgid "<b>%s</b> has canceled the following meeting."
msgstr "<b>%s</b> has cancelled the following meeting."
-#: ../plugins/itip-formatter/itip-view.c:401
+#: ../plugins/itip-formatter/itip-view.c:398
#, c-format
msgid "<b>%s</b> through %s has proposed the following meeting changes."
msgstr "<b>%s</b> through %s has proposed the following meeting changes."
-#: ../plugins/itip-formatter/itip-view.c:403
+#: ../plugins/itip-formatter/itip-view.c:400
#, 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:407
+#: ../plugins/itip-formatter/itip-view.c:404
#, 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:409
+#: ../plugins/itip-formatter/itip-view.c:406
#, 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:447
+#: ../plugins/itip-formatter/itip-view.c:444
#, 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:449
+#: ../plugins/itip-formatter/itip-view.c:446
#, 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:454
+#: ../plugins/itip-formatter/itip-view.c:451
#, 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:457
+#: ../plugins/itip-formatter/itip-view.c:454
#, 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:459
+#: ../plugins/itip-formatter/itip-view.c:456
#, 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:465
+#: ../plugins/itip-formatter/itip-view.c:462
#, 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:467
+#: ../plugins/itip-formatter/itip-view.c:464
#, 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:471
+#: ../plugins/itip-formatter/itip-view.c:468
#, c-format
msgid ""
"<b>%s</b> through %s wishes to receive the latest information for the "
@@ -18118,7 +18562,7 @@ msgstr ""
"<b>%s</b> through %s wishes to receive the latest information for the "
"following assigned task:"
-#: ../plugins/itip-formatter/itip-view.c:473
+#: ../plugins/itip-formatter/itip-view.c:470
#, c-format
msgid ""
"<b>%s</b> wishes to receive the latest information for the following "
@@ -18127,131 +18571,131 @@ msgstr ""
"<b>%s</b> wishes to receive the latest information for the following "
"assigned task:"
-#: ../plugins/itip-formatter/itip-view.c:477
+#: ../plugins/itip-formatter/itip-view.c:474
#, c-format
msgid ""
"<b>%s</b> through %s has sent back the following assigned task response:"
msgstr ""
"<b>%s</b> through %s has sent back the following assigned task response:"
-#: ../plugins/itip-formatter/itip-view.c:479
+#: ../plugins/itip-formatter/itip-view.c:476
#, 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:483
+#: ../plugins/itip-formatter/itip-view.c:480
#, c-format
msgid "<b>%s</b> through %s has canceled the following assigned task:"
msgstr "<b>%s</b> through %s has cancelled the following assigned task:"
-#: ../plugins/itip-formatter/itip-view.c:485
+#: ../plugins/itip-formatter/itip-view.c:482
#, c-format
msgid "<b>%s</b> has canceled the following assigned task:"
msgstr "<b>%s</b> has cancelled the following assigned task:"
-#: ../plugins/itip-formatter/itip-view.c:489
+#: ../plugins/itip-formatter/itip-view.c:486
#, c-format
msgid ""
"<b>%s</b> through %s has proposed the following task assignment changes:"
msgstr ""
"<b>%s</b> through %s has proposed the following task assignment changes:"
-#: ../plugins/itip-formatter/itip-view.c:491
+#: ../plugins/itip-formatter/itip-view.c:488
#, 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:495
+#: ../plugins/itip-formatter/itip-view.c:492
#, 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:497
+#: ../plugins/itip-formatter/itip-view.c:494
#, c-format
msgid "<b>%s</b> has declined the following assigned task:"
msgstr "<b>%s</b> has declined the following assigned task:"
-#: ../plugins/itip-formatter/itip-view.c:535
+#: ../plugins/itip-formatter/itip-view.c:532
#, c-format
msgid "<b>%s</b> through %s has published the following memo:"
msgstr "<b>%s</b> through %s has published the following memo:"
-#: ../plugins/itip-formatter/itip-view.c:537
+#: ../plugins/itip-formatter/itip-view.c:534
#, c-format
msgid "<b>%s</b> has published the following memo:"
msgstr "<b>%s</b> has published the following memo:"
-#: ../plugins/itip-formatter/itip-view.c:542
+#: ../plugins/itip-formatter/itip-view.c:539
#, c-format
msgid "<b>%s</b> through %s wishes to add to an existing memo:"
msgstr "<b>%s</b> through %s wishes to add to an existing memo:"
-#: ../plugins/itip-formatter/itip-view.c:544
+#: ../plugins/itip-formatter/itip-view.c:541
#, c-format
msgid "<b>%s</b> wishes to add to an existing memo:"
msgstr "<b>%s</b> wishes to add to an existing memo:"
-#: ../plugins/itip-formatter/itip-view.c:548
+#: ../plugins/itip-formatter/itip-view.c:545
#, c-format
msgid "<b>%s</b> through %s has canceled the following shared memo:"
msgstr "<b>%s</b> through %s has cancelled the following shared memo:"
-#: ../plugins/itip-formatter/itip-view.c:550
+#: ../plugins/itip-formatter/itip-view.c:547
#, c-format
msgid "<b>%s</b> has canceled the following shared memo:"
msgstr "<b>%s</b> has cancelled the following shared memo:"
#. Everything gets the open button
-#: ../plugins/itip-formatter/itip-view.c:821
+#: ../plugins/itip-formatter/itip-view.c:818
msgid "_Open Calendar"
msgstr "_Open Calendar"
-#: ../plugins/itip-formatter/itip-view.c:827
-#: ../plugins/itip-formatter/itip-view.c:831
-#: ../plugins/itip-formatter/itip-view.c:837
-#: ../plugins/itip-formatter/itip-view.c:854
-#: ../plugins/itip-formatter/itip-view.c:859
+#: ../plugins/itip-formatter/itip-view.c:824
+#: ../plugins/itip-formatter/itip-view.c:828
+#: ../plugins/itip-formatter/itip-view.c:834
+#: ../plugins/itip-formatter/itip-view.c:851
+#: ../plugins/itip-formatter/itip-view.c:856
msgid "_Decline"
msgstr "_Decline"
-#: ../plugins/itip-formatter/itip-view.c:828
-#: ../plugins/itip-formatter/itip-view.c:833
-#: ../plugins/itip-formatter/itip-view.c:840
-#: ../plugins/itip-formatter/itip-view.c:856
-#: ../plugins/itip-formatter/itip-view.c:861
+#: ../plugins/itip-formatter/itip-view.c:825
+#: ../plugins/itip-formatter/itip-view.c:830
+#: ../plugins/itip-formatter/itip-view.c:837
+#: ../plugins/itip-formatter/itip-view.c:853
+#: ../plugins/itip-formatter/itip-view.c:858
msgid "_Accept"
msgstr "_Accept"
-#: ../plugins/itip-formatter/itip-view.c:831
+#: ../plugins/itip-formatter/itip-view.c:828
msgid "_Decline all"
msgstr "_Decline all"
-#: ../plugins/itip-formatter/itip-view.c:832
+#: ../plugins/itip-formatter/itip-view.c:829
msgid "_Tentative all"
msgstr "_Tentative all"
-#: ../plugins/itip-formatter/itip-view.c:832
-#: ../plugins/itip-formatter/itip-view.c:838
-#: ../plugins/itip-formatter/itip-view.c:855
-#: ../plugins/itip-formatter/itip-view.c:860
+#: ../plugins/itip-formatter/itip-view.c:829
+#: ../plugins/itip-formatter/itip-view.c:835
+#: ../plugins/itip-formatter/itip-view.c:852
+#: ../plugins/itip-formatter/itip-view.c:857
msgid "_Tentative"
msgstr "_Tentative"
-#: ../plugins/itip-formatter/itip-view.c:833
+#: ../plugins/itip-formatter/itip-view.c:830
msgid "_Accept all"
msgstr "_Accept all"
#. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:844
+#: ../plugins/itip-formatter/itip-view.c:841
msgid "_Send Information"
msgstr "_Send Information"
#. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:848
+#: ../plugins/itip-formatter/itip-view.c:845
msgid "_Update Attendee Status"
msgstr "_Update Attendee Status"
-#: ../plugins/itip-formatter/itip-view.c:851
+#: ../plugins/itip-formatter/itip-view.c:848
msgid "_Update"
msgstr "_Update"
@@ -18355,9 +18799,11 @@ msgstr "Generates a D-Bus message when new mail messages arrive."
#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:6
msgid ""
-"If true, then beep, otherwise will play sound file when new messages arrive."
+"If \"true\", then beep, otherwise will play sound file when new messages "
+"arrive."
msgstr ""
-"If true, then beep, otherwise will play sound file when new messages arrive."
+"If \"true\", then beep, otherwise will play sound file when new messages "
+"arrive."
#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:7
msgid "Notify new messages for Inbox only."
@@ -18403,8 +18849,16 @@ msgstr "Whether to notify new messages in Inbox folder only."
msgid "Generate a _D-Bus message"
msgstr "Generate a _D-Bus message"
+#: ../plugins/mail-notification/mail-notification.c:377
+msgid "Evolution's Mail Notification"
+msgstr "Evolution's Mail Notification"
+
+#: ../plugins/mail-notification/mail-notification.c:398
+msgid "Mail Notification Properties"
+msgstr "Mail Notification Properties"
+
#. To translators: '%d' is the number of mails recieved and '%s' is the name of the folder
-#: ../plugins/mail-notification/mail-notification.c:363
+#: ../plugins/mail-notification/mail-notification.c:457
#, c-format
msgid ""
"You have received %d new message\n"
@@ -18419,55 +18873,55 @@ msgstr[1] ""
"You have received %d new messages\n"
"in %s."
-#: ../plugins/mail-notification/mail-notification.c:368
+#: ../plugins/mail-notification/mail-notification.c:462
#, c-format
msgid "You have received %d new message."
msgid_plural "You have received %d new messages."
msgstr[0] "You have received %d new message."
msgstr[1] "You have received %d new messages."
-#: ../plugins/mail-notification/mail-notification.c:380
-#: ../plugins/mail-notification/mail-notification.c:385
+#: ../plugins/mail-notification/mail-notification.c:479
+#: ../plugins/mail-notification/mail-notification.c:484
msgid "New email"
msgstr "New e-mail"
-#: ../plugins/mail-notification/mail-notification.c:440
+#: ../plugins/mail-notification/mail-notification.c:541
msgid "Show icon in _notification area"
msgstr "Show icon in _notification area"
-#: ../plugins/mail-notification/mail-notification.c:443
+#: ../plugins/mail-notification/mail-notification.c:544
msgid "B_link icon in notification area"
msgstr "B_link icon in notification area"
-#: ../plugins/mail-notification/mail-notification.c:445
+#: ../plugins/mail-notification/mail-notification.c:546
msgid "Popup _message together with the icon"
msgstr "Popup _message together with the icon"
-#: ../plugins/mail-notification/mail-notification.c:626
+#: ../plugins/mail-notification/mail-notification.c:727
msgid "_Play sound when new messages arrive"
msgstr "_Play sound when new messages arrive"
-#: ../plugins/mail-notification/mail-notification.c:632
+#: ../plugins/mail-notification/mail-notification.c:733
msgid "_Beep"
msgstr "_Beep"
-#: ../plugins/mail-notification/mail-notification.c:633
+#: ../plugins/mail-notification/mail-notification.c:734
msgid "Play _sound file"
msgstr "Play _sound file"
-#: ../plugins/mail-notification/mail-notification.c:644
+#: ../plugins/mail-notification/mail-notification.c:745
msgid "Specify _filename:"
msgstr "Specify _filename:"
-#: ../plugins/mail-notification/mail-notification.c:645
+#: ../plugins/mail-notification/mail-notification.c:746
msgid "Select sound file"
msgstr "Select sound file"
-#: ../plugins/mail-notification/mail-notification.c:646
+#: ../plugins/mail-notification/mail-notification.c:747
msgid "Pl_ay"
msgstr "Pl_ay"
-#: ../plugins/mail-notification/mail-notification.c:785
+#: ../plugins/mail-notification/mail-notification.c:804
msgid "Notify new messages for _Inbox only"
msgstr "Notify new messages for _Inbox only"
@@ -18499,12 +18953,12 @@ msgstr "Con_vert to Meeting"
msgid "Mail to meeting"
msgstr "Mail to meeting"
-#: ../plugins/mail-to-task/mail-to-task.c:270
+#: ../plugins/mail-to-task/mail-to-task.c:287
#, c-format
msgid "Cannot open calendar. %s"
msgstr "Cannot open calendar. %s"
-#: ../plugins/mail-to-task/mail-to-task.c:275
+#: ../plugins/mail-to-task/mail-to-task.c:292
msgid ""
"Selected source is read only, thus cannot create task there. Select other "
"source, please."
@@ -18617,12 +19071,12 @@ msgstr "Send e-mail message to mailing list?"
#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:10
msgid ""
"The action could not be performed. This means the header for this action did "
-"not contain any action we could handle.\n"
+"not contain any action we could process.\n"
"\n"
"Header: {0}"
msgstr ""
"The action could not be performed. This means the header for this action did "
-"not contain any action we could handle.\n"
+"not contain any action we could process.\n"
"\n"
"Header: {0}"
@@ -18700,23 +19154,23 @@ msgstr "_Subscribe to List"
msgid "_Unsubscribe from List"
msgstr "_Unsubscribe from List"
-#: ../plugins/mark-all-read/mark-all-read.c:37
-msgid "Mark all messages in this folder and subfolders as read?"
-msgstr "Mark all messages in this folder and subfolders as read?"
-
#: ../plugins/mark-all-read/mark-all-read.c:39
-msgid "Do you want the operation to be performed also in the subfolders?"
-msgstr "Do you want the operation to be performed also in the subfolders?"
+msgid "Also mark messages in subfolders?"
+msgstr "Also mark messages in subfolders?"
-#: ../plugins/mark-all-read/mark-all-read.c:85
-msgid "Mark All Messages as Read"
-msgstr "Mark All Messages as Read"
+#: ../plugins/mark-all-read/mark-all-read.c:41
+msgid ""
+"Do you want to mark messages as read in the current folder only, or in the "
+"current folder as well as all subfolders?"
+msgstr ""
+"Do you want to mark messages as read in the current folder only, or in the "
+"current folder as well as all subfolders?"
-#: ../plugins/mark-all-read/mark-all-read.c:162
+#: ../plugins/mark-all-read/mark-all-read.c:164
msgid "Current Folder and _Subfolders"
msgstr "Current Folder and _Subfolders"
-#: ../plugins/mark-all-read/mark-all-read.c:174
+#: ../plugins/mark-all-read/mark-all-read.c:176
msgid "Current _Folder Only"
msgstr "Current _Folder Only"
@@ -18762,7 +19216,7 @@ msgstr "A plugin for managing which plugins are enabled or disabled."
#. Setup the ui
#: ../plugins/plugin-manager/org-gnome-plugin-manager.eplug.xml.h:2
-#: ../plugins/plugin-manager/plugin-manager.c:225
+#: ../plugins/plugin-manager/plugin-manager.c:236
msgid "Plugin Manager"
msgstr "Plugin Manager"
@@ -18774,33 +19228,24 @@ msgstr "Enable and disable plugins"
msgid "_Plugins"
msgstr "_Plugins"
-#: ../plugins/plugin-manager/plugin-manager.c:57
+#: ../plugins/plugin-manager/plugin-manager.c:42
msgid "Author(s)"
msgstr "Author(s)"
-#: ../plugins/plugin-manager/plugin-manager.c:58
-#: ../widgets/table/e-table-config.glade.h:6
-msgid "Description"
-msgstr "Description"
+#: ../plugins/plugin-manager/plugin-manager.c:130
+msgid "Configuration"
+msgstr "Configuration"
-#: ../plugins/plugin-manager/plugin-manager.c:238
+#: ../plugins/plugin-manager/plugin-manager.c:249
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:260
+#: ../plugins/plugin-manager/plugin-manager.c:275
msgid "Overview"
msgstr "Overview"
-#: ../plugins/plugin-manager/plugin-manager.c:261
-msgid "Configuration"
-msgstr "Configuration"
-
-#: ../plugins/plugin-manager/plugin-manager.c:277
-msgid "There is no configuration option for this plugin."
-msgstr "There is no configuration option for this plugin."
-
-#: ../plugins/plugin-manager/plugin-manager.c:338
-#: ../plugins/plugin-manager/plugin-manager.c:400
+#: ../plugins/plugin-manager/plugin-manager.c:346
+#: ../plugins/plugin-manager/plugin-manager.c:408
msgid "Plugin"
msgstr "Plugin"
@@ -18825,19 +19270,19 @@ msgstr "Plain Text Mode"
msgid "Prefer plain-text"
msgstr "Prefer plain-text"
-#: ../plugins/prefer-plain/prefer-plain.c:158
+#: ../plugins/prefer-plain/prefer-plain.c:191
msgid "Show HTML if present"
msgstr "Show HTML if present"
-#: ../plugins/prefer-plain/prefer-plain.c:159
+#: ../plugins/prefer-plain/prefer-plain.c:192
msgid "Prefer PLAIN"
msgstr "Prefer PLAIN"
-#: ../plugins/prefer-plain/prefer-plain.c:160
+#: ../plugins/prefer-plain/prefer-plain.c:193
msgid "Only ever show PLAIN"
msgstr "Only ever show PLAIN"
-#: ../plugins/prefer-plain/prefer-plain.c:203
+#: ../plugins/prefer-plain/prefer-plain.c:236
msgid "HTML _Mode"
msgstr "HTML _Mode"
@@ -18953,6 +19398,30 @@ msgstr ""
"iCal\n"
"Free/Busy"
+#: ../plugins/python/example/org-gnome-hello-python-ui.xml.h:1
+msgid "Hello Python"
+msgstr "Hello Python"
+
+#: ../plugins/python/example/org-gnome-hello-python-ui.xml.h:2
+msgid "Python Plugin Loader tests"
+msgstr "Python Plugin Loader tests"
+
+#: ../plugins/python/example/org-gnome-hello-python.eplug.xml.h:1
+msgid "Python Test Plugin"
+msgstr "Python Test Plugin"
+
+#: ../plugins/python/example/org-gnome-hello-python.eplug.xml.h:2
+msgid "Test Plugin for Python EPlugin loader."
+msgstr "Test Plugin for Python EPlugin loader."
+
+#: ../plugins/python/org-gnome-evolution-python.eplug.xml.h:1
+msgid "A plugin which loads other plugins written using python."
+msgstr "A plugin which loads other plugins written using Python."
+
+#: ../plugins/python/org-gnome-evolution-python.eplug.xml.h:2
+msgid "Python Loader"
+msgstr "Python Loader"
+
#: ../plugins/sa-junk-plugin/em-junk-filter.c:108
msgid "SpamAssassin (built-in)"
msgstr "SpamAssassin (built-in)"
@@ -19023,7 +19492,7 @@ msgstr "A plugin for saving all attachments or parts of a message at once."
#. the path to the shared library
#: ../plugins/save-attachments/org-gnome-save-attachments.eplug.xml.h:3
-#: ../plugins/save-attachments/save-attachments.c:330
+#: ../plugins/save-attachments/save-attachments.c:314
msgid "Save attachments"
msgstr "Save attachments"
@@ -19035,16 +19504,15 @@ msgstr "Save Attachments..."
msgid "Save all attachments"
msgstr "Save all attachments"
-#: ../plugins/save-attachments/save-attachments.c:336
+#: ../plugins/save-attachments/save-attachments.c:320
msgid "Select save base name"
msgstr "Select save base name"
-#: ../plugins/save-attachments/save-attachments.c:355
+#: ../plugins/save-attachments/save-attachments.c:339
msgid "MIME Type"
msgstr "MIME Type"
-#: ../plugins/save-attachments/save-attachments.c:363
-#: ../ui/evolution-editor.xml.h:12
+#: ../plugins/save-attachments/save-attachments.c:347
msgid "Save"
msgstr "Save"
@@ -19052,79 +19520,79 @@ msgstr "Save"
#. * Translator: the %F %T is the thirth argument for a strftime function.
#. * It lets you define the formatting of the date in the csv-file.
#. *
-#: ../plugins/save-calendar/csv-format.c:166
+#: ../plugins/save-calendar/csv-format.c:162
msgid "%F %T"
msgstr "%F %T"
-#: ../plugins/save-calendar/csv-format.c:364
+#: ../plugins/save-calendar/csv-format.c:360
msgid "UID"
msgstr "UID"
-#: ../plugins/save-calendar/csv-format.c:366
+#: ../plugins/save-calendar/csv-format.c:362
msgid "Description List"
msgstr "Description List"
-#: ../plugins/save-calendar/csv-format.c:367
+#: ../plugins/save-calendar/csv-format.c:363
msgid "Categories List"
msgstr "Categories List"
-#: ../plugins/save-calendar/csv-format.c:368
+#: ../plugins/save-calendar/csv-format.c:364
msgid "Comment List"
msgstr "Comment List"
-#: ../plugins/save-calendar/csv-format.c:370
+#: ../plugins/save-calendar/csv-format.c:366
msgid "Created"
msgstr "Created"
-#: ../plugins/save-calendar/csv-format.c:371
+#: ../plugins/save-calendar/csv-format.c:367
msgid "Contact List"
msgstr "Contact List"
-#: ../plugins/save-calendar/csv-format.c:372
+#: ../plugins/save-calendar/csv-format.c:368
msgid "Start"
msgstr "Start"
-#: ../plugins/save-calendar/csv-format.c:373
+#: ../plugins/save-calendar/csv-format.c:369
msgid "End"
msgstr "End"
-#: ../plugins/save-calendar/csv-format.c:375
+#: ../plugins/save-calendar/csv-format.c:371
msgid "percent Done"
msgstr "percent Done"
-#: ../plugins/save-calendar/csv-format.c:377
+#: ../plugins/save-calendar/csv-format.c:373
msgid "URL"
msgstr "URL"
-#: ../plugins/save-calendar/csv-format.c:378
+#: ../plugins/save-calendar/csv-format.c:374
msgid "Attendees List"
msgstr "Attendees List"
-#: ../plugins/save-calendar/csv-format.c:380
+#: ../plugins/save-calendar/csv-format.c:376
msgid "Modified"
msgstr "Modified"
-#: ../plugins/save-calendar/csv-format.c:535
+#: ../plugins/save-calendar/csv-format.c:531
msgid "Advanced options for the CSV format"
msgstr "Advanced options for the CSV format"
-#: ../plugins/save-calendar/csv-format.c:542
+#: ../plugins/save-calendar/csv-format.c:538
msgid "Prepend a header"
msgstr "Prepend a header"
-#: ../plugins/save-calendar/csv-format.c:551
+#: ../plugins/save-calendar/csv-format.c:547
msgid "Value delimiter:"
msgstr "Value delimiter:"
-#: ../plugins/save-calendar/csv-format.c:557
+#: ../plugins/save-calendar/csv-format.c:553
msgid "Record delimiter:"
msgstr "Record delimiter:"
-#: ../plugins/save-calendar/csv-format.c:563
+#: ../plugins/save-calendar/csv-format.c:559
msgid "Encapsulate values with:"
msgstr "Encapsulate values with:"
-#: ../plugins/save-calendar/csv-format.c:585
+#: ../plugins/save-calendar/csv-format.c:581
msgid "Comma separated value format (.csv)"
msgstr "Comma separated value format (.csv)"
@@ -19146,15 +19614,15 @@ msgstr "_Save to Disk"
#. * It lets you define the formatting of the date in the rdf-file.
#. * Also check out http://www.w3.org/2002/12/cal/tzd
#. *
-#: ../plugins/save-calendar/rdf-format.c:153
+#: ../plugins/save-calendar/rdf-format.c:149
msgid "%FT%T"
msgstr "%FT%T"
-#: ../plugins/save-calendar/rdf-format.c:380
+#: ../plugins/save-calendar/rdf-format.c:376
msgid "RDF format (.rdf)"
msgstr "RDF format (.rdf)"
-#: ../plugins/save-calendar/save-calendar.c:165
+#: ../plugins/save-calendar/save-calendar.c:160
msgid "Select destination file"
msgstr "Select destination file"
@@ -19179,22 +19647,22 @@ msgid "Show _only this Task List"
msgstr "Show _only this Task List"
#: ../plugins/startup-wizard/org-gnome-evolution-startup-wizard.eplug.xml.h:1
-msgid "A plugin that handles the Startup wizard."
-msgstr "A plugin that handles the Startup wizard."
+msgid "Guides you through your initial account setup."
+msgstr "Guides you through your initial account setup."
#: ../plugins/startup-wizard/org-gnome-evolution-startup-wizard.eplug.xml.h:2
-msgid "Startup wizard"
-msgstr "Startup wizard"
+msgid "Setup Assistant"
+msgstr "Setup Assistant"
-#: ../plugins/startup-wizard/startup-wizard.c:84
+#: ../plugins/startup-wizard/startup-wizard.c:83
msgid "Evolution Setup Assistant"
msgstr "Evolution Setup Assistant"
-#: ../plugins/startup-wizard/startup-wizard.c:87
+#: ../plugins/startup-wizard/startup-wizard.c:86
msgid "Welcome"
msgstr "Welcome"
-#: ../plugins/startup-wizard/startup-wizard.c:88
+#: ../plugins/startup-wizard/startup-wizard.c:87
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"
@@ -19206,29 +19674,29 @@ msgstr ""
"\n"
"Please click the \"Forward\" button to continue. "
-#: ../plugins/startup-wizard/startup-wizard.c:134
+#: ../plugins/startup-wizard/startup-wizard.c:133
msgid "Importing files"
msgstr "Importing files"
-#: ../plugins/startup-wizard/startup-wizard.c:136
-#: ../shell/e-shell-importer.c:147
+#: ../plugins/startup-wizard/startup-wizard.c:135
+#: ../shell/e-shell-importer.c:141
msgid "Please select the information that you would like to import:"
msgstr "Please select the information that you would like to import:"
-#: ../plugins/startup-wizard/startup-wizard.c:151
-#: ../shell/e-shell-importer.c:400
+#: ../plugins/startup-wizard/startup-wizard.c:150
+#: ../shell/e-shell-importer.c:394
#, c-format
msgid "From %s:"
msgstr "From %s:"
-#: ../plugins/startup-wizard/startup-wizard.c:231
-#: ../shell/e-shell-importer.c:511
+#: ../plugins/startup-wizard/startup-wizard.c:230
+#: ../shell/e-shell-importer.c:505
#, c-format
msgid "Importing data."
msgstr "Importing data."
-#: ../plugins/startup-wizard/startup-wizard.c:233
-#: ../shell/e-shell-importer.c:525
+#: ../plugins/startup-wizard/startup-wizard.c:232
+#: ../shell/e-shell-importer.c:519
msgid "Please wait"
msgstr "Please wait"
@@ -19245,18 +19713,64 @@ msgid "Thread messages by subject"
msgstr "Thread messages by subject"
#. 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:56
msgid "F_all back to threading messages by subject"
msgstr "F_all back to threading messages by subject"
+#: ../plugins/templates/apps-evolution-template-placeholders.schemas.in.h:1
+msgid ""
+"List of keyword/value pairs for the Templates plugin to substitute in a "
+"message body."
+msgstr ""
+"List of keyword/value pairs for the Templates plugin to substitute in a "
+"message body."
+
+#: ../plugins/templates/templates.c:615
+msgid "No title"
+msgstr "No title"
+
+#: ../plugins/templates/templates.c:743
+msgid "Save as _Template"
+msgstr "Save as _Template"
+
+#: ../plugins/templates/templates.c:745
+msgid "Save as Template"
+msgstr "Save as Template"
+
+#: ../plugins/templates/org-gnome-templates.eplug.xml.h:1
+msgid "Drafts based template plugin"
+msgstr "Drafts-based template plugin"
+
#: ../plugins/tnef-attachments/org-gnome-tnef-attachments.eplug.xml.h:1
msgid "A simple plugin which uses ytnef to decode tnef attachments."
-msgstr "A simple plugin which uses ytnef to decode tnef attachments."
+msgstr "A simple plugin which uses ytnef to decode TNEF attachments."
#: ../plugins/tnef-attachments/org-gnome-tnef-attachments.eplug.xml.h:2
msgid "TNEF Attachment decoder"
msgstr "TNEF Attachment decoder"
+#: ../plugins/webdav-account-setup/org-gnome-evolution-webdav.eplug.xml.h:1
+msgid "A plugin to setup WebDAV contacts."
+msgstr "A plugin to set up WebDAV contacts."
+
+#: ../plugins/webdav-account-setup/org-gnome-evolution-webdav.eplug.xml.h:2
+msgid "WebDAV contacts"
+msgstr "WebDAV contacts"
+
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:69
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:74
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:100
+msgid "WebDAV"
+msgstr "WebDAV"
+
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:311
+msgid "URL:"
+msgstr "URL:"
+
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:338
+msgid "_Avoid IfMatch (needed on apache < 2.2.8)"
+msgstr "_Avoid IfMatch (needed on Apache < 2.2.8)"
+
#: ../shell/GNOME_Evolution_Shell.server.in.in.h:1
msgid "Evolution Shell"
msgstr "Evolution Shell"
@@ -19274,116 +19788,110 @@ msgid "Evolution Test component"
msgstr "Evolution Test component"
#: ../shell/apps_evolution_shell.schemas.in.h:1
-msgid "A string description of the current printer settings."
-msgstr "A string description of the current printer settings."
-
-#: ../shell/apps_evolution_shell.schemas.in.h:2
msgid "Authenticate proxy server connections"
msgstr "Authenticate proxy server connections"
-#: ../shell/apps_evolution_shell.schemas.in.h:3
+#: ../shell/apps_evolution_shell.schemas.in.h:2
msgid "Automatic proxy configuration URL"
msgstr "Automatic proxy configuration URL"
-#: ../shell/apps_evolution_shell.schemas.in.h:4
+#: ../shell/apps_evolution_shell.schemas.in.h:3
msgid "Configuration version"
msgstr "Configuration version"
-#: ../shell/apps_evolution_shell.schemas.in.h:5
-msgid "Decides whether the crash detection should be run or not."
-msgstr "Decides whether the crash detection should be run or not."
-
-#: ../shell/apps_evolution_shell.schemas.in.h:6
+#: ../shell/apps_evolution_shell.schemas.in.h:4
msgid "Default sidebar width"
msgstr "Default sidebar width"
-#: ../shell/apps_evolution_shell.schemas.in.h:7
+#: ../shell/apps_evolution_shell.schemas.in.h:5
msgid "Default window height"
msgstr "Default window height"
-#: ../shell/apps_evolution_shell.schemas.in.h:8
+#: ../shell/apps_evolution_shell.schemas.in.h:6
msgid "Default window state"
msgstr "Default window state"
-#: ../shell/apps_evolution_shell.schemas.in.h:9
+#: ../shell/apps_evolution_shell.schemas.in.h:7
msgid "Default window width"
msgstr "Default window width"
-#: ../shell/apps_evolution_shell.schemas.in.h:10
+#: ../shell/apps_evolution_shell.schemas.in.h:8
msgid ""
"Enables the proxy settings when accessing HTTP/Secure HTTP over the Internet."
msgstr ""
"Enables the proxy settings when accessing HTTP/Secure HTTP over the Internet."
-#: ../shell/apps_evolution_shell.schemas.in.h:11
+#: ../shell/apps_evolution_shell.schemas.in.h:9
msgid "HTTP proxy host name"
msgstr "HTTP proxy host name"
-#: ../shell/apps_evolution_shell.schemas.in.h:12
+#: ../shell/apps_evolution_shell.schemas.in.h:10
msgid "HTTP proxy password"
msgstr "HTTP proxy password"
-#: ../shell/apps_evolution_shell.schemas.in.h:13
+#: ../shell/apps_evolution_shell.schemas.in.h:11
msgid "HTTP proxy port"
msgstr "HTTP proxy port"
-#: ../shell/apps_evolution_shell.schemas.in.h:14
+#: ../shell/apps_evolution_shell.schemas.in.h:12
msgid "HTTP proxy username"
msgstr "HTTP proxy username"
-#: ../shell/apps_evolution_shell.schemas.in.h:15
+#: ../shell/apps_evolution_shell.schemas.in.h:13
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.h:16
+#: ../shell/apps_evolution_shell.schemas.in.h:14
msgid ""
"If true, then connections to the proxy server require authentication. The "
-"username/password combo is defined by \"/apps/evolution/shell/network_config/"
-"authentication_user\" and locally stored password in .gnome2_private/."
+"username is retrieved from the \"/apps/evolution/shell/network_config/"
+"authentication_user\" GConf key, and the password is retrieved from either "
+"gnome-keyring or the ~/.gnome2_private/Evolution password file."
msgstr ""
"If true, then connections to the proxy server require authentication. The "
-"username/password combo is defined by \"/apps/evolution/shell/network_config/"
-"authentication_user\" and the locally-stored password in .gnome2_private/."
+"username is retrieved from the \"/apps/evolution/shell/network_config/"
+"authentication_user\" GConf key, and the password is retrieved from either "
+"gnome-keyring or the ~/.gnome2_private/Evolution password file."
-#: ../shell/apps_evolution_shell.schemas.in.h:17
+#: ../shell/apps_evolution_shell.schemas.in.h:15
msgid "Last upgraded configuration version"
msgstr "Last upgraded configuration version"
-#: ../shell/apps_evolution_shell.schemas.in.h:18
+#: ../shell/apps_evolution_shell.schemas.in.h:16
msgid ""
"List of paths for the folders to be synchronized to disk for offline usage"
msgstr ""
"List of paths for the folders to be synchronised to disk for offline usage"
-#: ../shell/apps_evolution_shell.schemas.in.h:19
+#: ../shell/apps_evolution_shell.schemas.in.h:17
msgid "Non-proxy hosts"
msgstr "Non-proxy hosts"
-#: ../shell/apps_evolution_shell.schemas.in.h:20
+#: ../shell/apps_evolution_shell.schemas.in.h:18
msgid "Password to pass as authentication when doing HTTP proxying."
msgstr "Password to pass as authentication when doing HTTP proxying."
-#: ../shell/apps_evolution_shell.schemas.in.h:21
+#: ../shell/apps_evolution_shell.schemas.in.h:19
msgid "Proxy configuration mode"
msgstr "Proxy configuration mode"
-#: ../shell/apps_evolution_shell.schemas.in.h:22
+#: ../shell/apps_evolution_shell.schemas.in.h:20
msgid "SOCKS proxy host name"
msgstr "SOCKS proxy host name"
-#: ../shell/apps_evolution_shell.schemas.in.h:23
+#: ../shell/apps_evolution_shell.schemas.in.h:21
msgid "SOCKS proxy port"
msgstr "SOCKS proxy port"
-#: ../shell/apps_evolution_shell.schemas.in.h:24
+#: ../shell/apps_evolution_shell.schemas.in.h:22
msgid "Secure HTTP proxy host name"
msgstr "Secure HTTP proxy host name"
-#: ../shell/apps_evolution_shell.schemas.in.h:25
+#: ../shell/apps_evolution_shell.schemas.in.h:23
msgid "Secure HTTP proxy port"
msgstr "Secure HTTP proxy port"
-#: ../shell/apps_evolution_shell.schemas.in.h:26
+#: ../shell/apps_evolution_shell.schemas.in.h:24
msgid ""
"Select the proxy configuration mode. Supported values are 0, 1, 2, and 3 "
"representing \"use system settings\", \"no proxy\", \"use manual proxy "
@@ -19395,27 +19903,23 @@ msgstr ""
"configuration\" and \"use proxy configuration provided in the autoconfig URL"
"\" respectively."
-#: ../shell/apps_evolution_shell.schemas.in.h:27
+#: ../shell/apps_evolution_shell.schemas.in.h:25
msgid "Sidebar is visible"
msgstr "Sidebar is visible"
-#: ../shell/apps_evolution_shell.schemas.in.h:28
+#: ../shell/apps_evolution_shell.schemas.in.h:26
msgid "Skip development warning dialog"
msgstr "Skip development warning dialogue"
-#: ../shell/apps_evolution_shell.schemas.in.h:29
-msgid "Skip recovery warning dialog"
-msgstr "Skip recovery warning dialogue"
-
-#: ../shell/apps_evolution_shell.schemas.in.h:30 ../shell/main.c:577
+#: ../shell/apps_evolution_shell.schemas.in.h:27 ../shell/main.c:471
msgid "Start in offline mode"
msgstr "Start in offline mode"
-#: ../shell/apps_evolution_shell.schemas.in.h:31
+#: ../shell/apps_evolution_shell.schemas.in.h:28
msgid "Statusbar is visible"
msgstr "Statusbar is visible"
-#: ../shell/apps_evolution_shell.schemas.in.h:32
+#: ../shell/apps_evolution_shell.schemas.in.h:29
msgid ""
"The configuration version of Evolution, with major/minor/configuration level "
"(for example \"2.6.0\")."
@@ -19423,19 +19927,19 @@ msgstr ""
"The configuration version of Evolution, with major/minor/configuration level "
"(for example \"2.6.0\")."
-#: ../shell/apps_evolution_shell.schemas.in.h:33
+#: ../shell/apps_evolution_shell.schemas.in.h:30
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.h:34
+#: ../shell/apps_evolution_shell.schemas.in.h:31
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.h:35
+#: ../shell/apps_evolution_shell.schemas.in.h:32
msgid "The default width for the sidebar, in pixels."
msgstr "The default width for the sidebar, in pixels."
-#: ../shell/apps_evolution_shell.schemas.in.h:36
+#: ../shell/apps_evolution_shell.schemas.in.h:33
msgid ""
"The last upgraded configuration version of Evolution, with major/minor/"
"configuration level (for example \"2.6.0\")."
@@ -19443,19 +19947,19 @@ msgstr ""
"The last upgraded configuration version of Evolution, with major/minor/"
"configuration level (for example \"2.6.0\")."
-#: ../shell/apps_evolution_shell.schemas.in.h:37
+#: ../shell/apps_evolution_shell.schemas.in.h:34
msgid "The machine name to proxy HTTP through."
msgstr "The machine name to proxy HTTP through."
-#: ../shell/apps_evolution_shell.schemas.in.h:38
+#: ../shell/apps_evolution_shell.schemas.in.h:35
msgid "The machine name to proxy secure HTTP through."
msgstr "The machine name to proxy secure HTTP through."
-#: ../shell/apps_evolution_shell.schemas.in.h:39
+#: ../shell/apps_evolution_shell.schemas.in.h:36
msgid "The machine name to proxy socks through."
msgstr "The machine name to proxy socks through."
-#: ../shell/apps_evolution_shell.schemas.in.h:40
+#: ../shell/apps_evolution_shell.schemas.in.h:37
msgid ""
"The port on the machine defined by \"/apps/evolution/shell/network_config/"
"http_host\" that you proxy through."
@@ -19463,7 +19967,7 @@ msgstr ""
"The port on the machine defined by \"/apps/evolution/shell/network_config/"
"http_host\" that you proxy through."
-#: ../shell/apps_evolution_shell.schemas.in.h:41
+#: ../shell/apps_evolution_shell.schemas.in.h:38
msgid ""
"The port on the machine defined by \"/apps/evolution/shell/network_config/"
"secure_host\" that you proxy through."
@@ -19471,7 +19975,7 @@ msgstr ""
"The port on the machine defined by \"/apps/evolution/shell/network_config/"
"secure_host\" that you proxy through."
-#: ../shell/apps_evolution_shell.schemas.in.h:42
+#: ../shell/apps_evolution_shell.schemas.in.h:39
msgid ""
"The port on the machine defined by \"/apps/evolution/shell/network_config/"
"socks_host\" that you proxy through."
@@ -19479,7 +19983,7 @@ msgstr ""
"The port on the machine defined by \"/apps/evolution/shell/network_config/"
"socks_host\" that you proxy through."
-#: ../shell/apps_evolution_shell.schemas.in.h:43
+#: ../shell/apps_evolution_shell.schemas.in.h:40
msgid ""
"The style of the window buttons. Can be \"text\", \"icons\", \"both\", "
"\"toolbar\". If \"toolbar\" is set, the style of the buttons is determined "
@@ -19489,7 +19993,7 @@ msgstr ""
"\"toolbar\". If \"toolbar\" is set, the style of the buttons is determined "
"by the GNOME toolbar setting."
-#: ../shell/apps_evolution_shell.schemas.in.h:44
+#: ../shell/apps_evolution_shell.schemas.in.h:41
msgid ""
"This key contains a list of hosts which are connected to directly, rather "
"than via the proxy (if it is active). The values can be hostnames, domains "
@@ -19501,66 +20005,58 @@ msgstr ""
"(using an initial wildcard like *.foo.com), IP host addresses (both IPv4 and "
"IPv6) and network addresses with a netmask (something like 192.168.0.0/24)."
-#: ../shell/apps_evolution_shell.schemas.in.h:45
+#: ../shell/apps_evolution_shell.schemas.in.h:42
msgid "Toolbar is visible"
msgstr "Toolbar is visible"
-#: ../shell/apps_evolution_shell.schemas.in.h:46
+#: ../shell/apps_evolution_shell.schemas.in.h:43
msgid "URL that provides proxy configuration values."
msgstr "URL that provides proxy configuration values."
-#: ../shell/apps_evolution_shell.schemas.in.h:47
+#: ../shell/apps_evolution_shell.schemas.in.h:44
msgid "Use HTTP proxy"
msgstr "Use HTTP proxy"
-#: ../shell/apps_evolution_shell.schemas.in.h:48
+#: ../shell/apps_evolution_shell.schemas.in.h:45
msgid "User name to pass as authentication when doing HTTP proxying."
msgstr "Username to pass as authentication when doing HTTP proxying."
-#: ../shell/apps_evolution_shell.schemas.in.h:49
+#: ../shell/apps_evolution_shell.schemas.in.h:46
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.h:50
-msgid "Whether crash detection should be done or not"
-msgstr "Whether crash detection should be done or not"
-
-#: ../shell/apps_evolution_shell.schemas.in.h:51
+#: ../shell/apps_evolution_shell.schemas.in.h:47
msgid "Whether or not the window should be maximized."
msgstr "Whether or not the window should be maximised."
-#: ../shell/apps_evolution_shell.schemas.in.h:52
+#: ../shell/apps_evolution_shell.schemas.in.h:48
msgid "Whether the sidebar should be visible."
msgstr "Whether the sidebar should be visible."
-#: ../shell/apps_evolution_shell.schemas.in.h:53
+#: ../shell/apps_evolution_shell.schemas.in.h:49
msgid "Whether the status bar should be visible."
msgstr "Whether the status bar should be visible."
-#: ../shell/apps_evolution_shell.schemas.in.h:54
+#: ../shell/apps_evolution_shell.schemas.in.h:50
msgid "Whether the toolbar should be visible."
msgstr "Whether the toolbar should be visible."
-#: ../shell/apps_evolution_shell.schemas.in.h:55
+#: ../shell/apps_evolution_shell.schemas.in.h:51
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.h:56
-msgid "Whether the warning dialog in recovery of Evolution is skipped."
-msgstr "Whether the warning dialogue in recovery of Evolution is skipped."
-
-#: ../shell/apps_evolution_shell.schemas.in.h:57
+#: ../shell/apps_evolution_shell.schemas.in.h:52
msgid "Whether the window buttons should be visible."
msgstr "Whether the window buttons should be visible."
-#: ../shell/apps_evolution_shell.schemas.in.h:58
+#: ../shell/apps_evolution_shell.schemas.in.h:53
msgid "Window button style"
msgstr "Window button style"
-#: ../shell/apps_evolution_shell.schemas.in.h:59
+#: ../shell/apps_evolution_shell.schemas.in.h:54
msgid "Window buttons are visible"
msgstr "Window buttons are visible"
@@ -19576,29 +20072,23 @@ msgstr "Active Connections"
msgid "Click OK to close these connections and go offline"
msgstr "Click OK to close these connections and go offline"
-#: ../shell/e-shell-importer.c:135
+#: ../shell/e-shell-importer.c:131
msgid "Choose the type of importer to run:"
msgstr "Choose the type of importer to run:"
-#: ../shell/e-shell-importer.c:138
+#: ../shell/e-shell-importer.c:134
msgid ""
"Choose the file that you want to import into Evolution, and select what type "
-"of file it is from the list.\n"
-"\n"
-"You can select \"Automatic\" if you do not know, and Evolution will attempt "
-"to work it out."
+"of file it is from the list."
msgstr ""
"Choose the file that you want to import into Evolution, and select what type "
-"of file it is from the list.\n"
-"\n"
-"You can select \"Automatic\" if you do not know, and Evolution will attempt "
-"to work it out."
+"of file it is from the list."
-#: ../shell/e-shell-importer.c:144
+#: ../shell/e-shell-importer.c:138
msgid "Choose the destination for this import"
msgstr "Choose the destination for this import"
-#: ../shell/e-shell-importer.c:150
+#: ../shell/e-shell-importer.c:144
msgid ""
"Evolution checked for settings to import from the following\n"
"applications: Pine, Netscape, Elm, iCalendar. No importable\n"
@@ -19610,53 +20100,33 @@ msgstr ""
"settings found. If you would like to\n"
"try again, please click the \"Back\" button.\n"
-#: ../shell/e-shell-importer.c:288
+#: ../shell/e-shell-importer.c:282
msgid "F_ilename:"
msgstr "F_ilename:"
-#: ../shell/e-shell-importer.c:293
+#: ../shell/e-shell-importer.c:287
msgid "Select a file"
msgstr "Select a file"
-#: ../shell/e-shell-importer.c:302
+#: ../shell/e-shell-importer.c:296
msgid "File _type:"
msgstr "File _type:"
-#: ../shell/e-shell-importer.c:338
+#: ../shell/e-shell-importer.c:332
msgid "Import data and settings from _older programs"
msgstr "Import data and settings from _older programs"
-#: ../shell/e-shell-importer.c:341
+#: ../shell/e-shell-importer.c:335
msgid "Import a _single file"
msgstr "Import a _single file"
-#: ../shell/e-shell-settings-dialog.c:313
+#: ../shell/e-shell-settings-dialog.c:314
msgid "Evolution Preferences"
msgstr "Evolution Preferences"
-#: ../shell/e-shell-utils.c:118
-msgid "No folder name specified."
-msgstr "No folder name specified."
-
-#: ../shell/e-shell-utils.c:125
-msgid "Folder name cannot contain the Return character."
-msgstr "Folder name cannot contain the Return character."
-
-#: ../shell/e-shell-utils.c:131
-msgid "Folder name cannot contain the character \"/\"."
-msgstr "Folder name cannot contain the character \"/\"."
-
-#: ../shell/e-shell-utils.c:137
-msgid "Folder name cannot contain the character \"#\"."
-msgstr "Folder name cannot contain the character \"#\"."
-
-#: ../shell/e-shell-utils.c:143
-msgid "'.' and '..' are reserved folder names."
-msgstr "'.' and '..' are reserved folder names."
-
#. To translators: This is the window title and %s is the
#. component name. Most translators will want to keep it as is.
-#: ../shell/e-shell-view.c:50 ../shell/e-shell-window.c:343
+#: ../shell/e-shell-view.c:47 ../shell/e-shell-window.c:332
#, c-format
msgid "%s - Evolution"
msgstr "%s - Evolution"
@@ -19681,71 +20151,79 @@ 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 dialog.
-#: ../shell/e-shell-window-commands.c:742
+#: ../shell/e-shell-window-commands.c:729
msgid "translator-credits"
msgstr ""
"Gareth Owen <gowen72@yahoo.com>\n"
"David Lodge <dave@cirt.net>"
-#: ../shell/e-shell-window-commands.c:753
+#: ../shell/e-shell-window-commands.c:740
msgid "Evolution Website"
msgstr "Evolution Website"
-#: ../shell/e-shell-window-commands.c:771
+#: ../shell/e-shell-window-commands.c:758
msgid "Error opening the FAQ webpage."
msgstr "Error opening the FAQ webpage."
-#: ../shell/e-shell-window-commands.c:968
+#: ../shell/e-shell-window-commands.c:955
msgid "_Work Online"
msgstr "_Work Online"
-#: ../shell/e-shell-window-commands.c:981 ../ui/evolution.xml.h:56
+#: ../shell/e-shell-window-commands.c:968 ../ui/evolution.xml.h:57
msgid "_Work Offline"
msgstr "_Work Offline"
-#: ../shell/e-shell-window-commands.c:994
+#: ../shell/e-shell-window-commands.c:981
msgid "Work Offline"
msgstr "Work Offline"
-#: ../shell/e-shell-window.c:392
-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:381
+msgid ""
+"Evolution is currently online.\n"
+"Click on this button to work offline."
+msgstr ""
+"Evolution is currently online.\n"
+"Click on this button to work offline."
-#: ../shell/e-shell-window.c:399
+#: ../shell/e-shell-window.c:388
msgid "Evolution is in the process of going offline."
msgstr "Evolution is in the process of going offline."
-#: ../shell/e-shell-window.c:406
-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:395
+msgid ""
+"Evolution is currently offline.\n"
+"Click on this button to work online."
+msgstr ""
+"Evolution is currently offline.\n"
+"Click on this button to work online."
-#: ../shell/e-shell-window.c:815
+#: ../shell/e-shell-window.c:786
#, c-format
msgid "Switch to %s"
msgstr "Switch to %s"
-#: ../shell/e-shell.c:640
+#: ../shell/e-shell.c:641
msgid "Unknown system error."
msgstr "Unknown system error."
-#: ../shell/e-shell.c:838 ../shell/e-shell.c:839
+#: ../shell/e-shell.c:839 ../shell/e-shell.c:840
#, c-format
msgid "%ld KB"
msgstr "%ld KB"
-#: ../shell/e-shell.c:1280 ../widgets/misc/e-cell-date-edit.c:316
+#: ../shell/e-shell.c:1298 ../widgets/misc/e-cell-date-edit.c:314
msgid "OK"
msgstr "OK"
-#: ../shell/e-shell.c:1282
+#: ../shell/e-shell.c:1300
msgid "Invalid arguments"
msgstr "Invalid arguments"
-#: ../shell/e-shell.c:1284
+#: ../shell/e-shell.c:1302
msgid "Cannot register on OAF"
msgstr "Cannot register on OAF"
-#: ../shell/e-shell.c:1286
+#: ../shell/e-shell.c:1304
msgid "Configuration Database not found"
msgstr "Configuration Database not found"
@@ -19755,15 +20233,11 @@ msgstr "Configuration Database not found"
msgid "New"
msgstr "New"
-#: ../shell/test/evolution-test-component.c:107
+#: ../shell/test/evolution-test-component.c:105
msgid "New Test"
msgstr "New Test"
-#: ../shell/test/evolution-test-component.c:108
-msgid "_Test"
-msgstr "_Test"
-
-#: ../shell/test/evolution-test-component.c:109
+#: ../shell/test/evolution-test-component.c:107
msgid "Create a new test item"
msgstr "Create a new test item"
@@ -19806,7 +20280,7 @@ msgstr ""
"importing external files into Evolution."
#. Preview/Alpha/Beta version warning message
-#: ../shell/main.c:234
+#: ../shell/main.c:217
#, no-c-format
msgid ""
"Hi. Thanks for taking the time to download this preview release\n"
@@ -19841,7 +20315,7 @@ msgstr ""
"We hope that you enjoy the results of our hard work, and we\n"
"eagerly await your contributions!\n"
-#: ../shell/main.c:258
+#: ../shell/main.c:241
msgid ""
"Thanks\n"
"The Evolution Team\n"
@@ -19849,66 +20323,43 @@ msgstr ""
"Thanks\n"
"The Evolution Team\n"
-#: ../shell/main.c:265
+#: ../shell/main.c:248
msgid "Do not tell me again"
msgstr "Do not tell me again"
-#: ../shell/main.c:315
-msgid "Evolution Crash Detection"
-msgstr "Evolution Crash Detection"
-
-#: ../shell/main.c:317
-msgid "Ig_nore"
-msgstr "Ig_nore"
-
-#: ../shell/main.c:332
-#, no-c-format
-msgid ""
-"Evolution appears to have exited unexpectedly the last time it was\n"
-"run. As a precautionary measure, all preview panes will be hidden.\n"
-"You can restore the preview panes from the View menu.\n"
-msgstr ""
-"Evolution appears to have exited unexpectedly the last time it was\n"
-"run. As a precautionary measure, all preview panes will be hidden.\n"
-"You can restore the preview panes from the View menu.\n"
-
-#: ../shell/main.c:343
-msgid "_Do not show this message again"
-msgstr "_Do not show this message again"
-
-#: ../shell/main.c:575
+#: ../shell/main.c:469
msgid "Start Evolution activating the specified component"
msgstr "Start Evolution activating the specified component"
-#: ../shell/main.c:579
+#: ../shell/main.c:473
msgid "Start in online mode"
msgstr "Start in online mode"
-#: ../shell/main.c:582
+#: ../shell/main.c:476
msgid "Forcibly shut down all Evolution components"
msgstr "Forcibly shut down all Evolution components"
-#: ../shell/main.c:586
+#: ../shell/main.c:480
msgid "Forcibly re-migrate from Evolution 1.4"
msgstr "Forcibly re-migrate from Evolution 1.4"
-#: ../shell/main.c:589
+#: ../shell/main.c:483
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:591
+#: ../shell/main.c:485
msgid "Disable loading of any plugins."
msgstr "Disable loading of any plugins."
-#: ../shell/main.c:593
+#: ../shell/main.c:487
msgid "Disable preview pane of Mail, Contacts and Tasks."
msgstr "Disable preview pane of Mail, Contacts and Tasks."
-#: ../shell/main.c:678
+#: ../shell/main.c:572
msgid "- The Evolution PIM and Email Client"
msgstr "- The Evolution PIM and E-mail Client"
-#: ../shell/main.c:706
+#: ../shell/main.c:600
#, c-format
msgid ""
"%s: --online and --offline cannot be used together.\n"
@@ -20059,7 +20510,7 @@ msgstr ""
"If you choose to continue, you may not have access to some of your old "
"data.\n"
-#: ../smime/gui/ca-trust-dialog.c:104
+#: ../smime/gui/ca-trust-dialog.c:102
#, c-format
msgid ""
"Certificate '%s' is a CA certificate.\n"
@@ -20070,7 +20521,7 @@ msgstr ""
"\n"
"Edit trust settings:"
-#: ../smime/gui/cert-trust-dialog.c:154
+#: ../smime/gui/cert-trust-dialog.c:151
msgid ""
"Because you trust the certificate authority that issued this certificate, "
"then you trust the authenticity of this certificate unless otherwise "
@@ -20080,7 +20531,7 @@ msgstr ""
"then you trust the authenticity of this certificate unless otherwise "
"indicated here"
-#: ../smime/gui/cert-trust-dialog.c:158
+#: ../smime/gui/cert-trust-dialog.c:155
msgid ""
"Because you do not trust the certificate authority that issued this "
"certificate, then you do not trust the authenticity of this certificate "
@@ -20138,27 +20589,27 @@ msgstr "E-Mail Address"
msgid "All CA certificate files"
msgstr "All CA certificate files"
-#: ../smime/gui/certificate-viewer.c:341
+#: ../smime/gui/certificate-viewer.c:338
#, c-format
msgid "Certificate Viewer: %s"
msgstr "Certificate Viewer: %s"
-#: ../smime/gui/component.c:47
+#: ../smime/gui/component.c:46
#, c-format
msgid "Enter the password for `%s'"
msgstr "Enter the password for `%s'"
#. we're setting the password initially
-#: ../smime/gui/component.c:70
+#: ../smime/gui/component.c:69
msgid "Enter new password for certificate database"
msgstr "Enter new password for certificate database"
-#: ../smime/gui/component.c:72
+#: ../smime/gui/component.c:71
msgid "Enter new password"
msgstr "Enter new password"
#. FIXME: add serial no, validity date, uses
-#: ../smime/gui/e-cert-selector.c:121
+#: ../smime/gui/e-cert-selector.c:117
#, c-format
msgid ""
"Issued to:\n"
@@ -20167,7 +20618,7 @@ msgstr ""
"Issued to:\n"
" Subject: %s\n"
-#: ../smime/gui/e-cert-selector.c:122
+#: ../smime/gui/e-cert-selector.c:118
#, c-format
msgid ""
"Issued by:\n"
@@ -20176,7 +20627,7 @@ msgstr ""
"Issued by:\n"
" Subject: %s\n"
-#: ../smime/gui/e-cert-selector.c:174
+#: ../smime/gui/e-cert-selector.c:170
msgid "Select certificate"
msgstr "Select certificate"
@@ -20363,7 +20814,7 @@ msgid "_Edit CA Trust"
msgstr "_Edit CA Trust"
#. XXX we shouldn't be popping up dialogs in this code.
-#: ../smime/lib/e-cert-db.c:673
+#: ../smime/lib/e-cert-db.c:672
msgid "Certificate already exists"
msgstr "Certificate already exists"
@@ -20593,7 +21044,7 @@ msgid "Copy to Folder..."
msgstr "Copy to Folder..."
#: ../ui/evolution-addressbook.xml.h:11
-msgid "Create a new addressbook folder"
+msgid "Create a new address book folder"
msgstr "Create a new address book folder"
#: ../ui/evolution-addressbook.xml.h:12 ../ui/evolution-memos.xml.h:4
@@ -20678,7 +21129,7 @@ msgstr "Save the contacts of the selected folder as VCard"
msgid "Select All"
msgstr "Select All"
-#: ../ui/evolution-addressbook.xml.h:35 ../ui/evolution-editor.xml.h:13
+#: ../ui/evolution-addressbook.xml.h:35
msgid "Select _All"
msgstr "Select _All"
@@ -20747,7 +21198,7 @@ msgstr "_Move Contact to..."
msgid "_Move Folder Contacts To"
msgstr "_Move Folder Contacts To"
-#: ../ui/evolution-addressbook.xml.h:55 ../ui/evolution.xml.h:48
+#: ../ui/evolution-addressbook.xml.h:55 ../ui/evolution.xml.h:49
msgid "_New"
msgstr "_New"
@@ -20808,7 +21259,7 @@ msgid "Month"
msgstr "Month"
#: ../ui/evolution-calendar.xml.h:16 ../ui/evolution-mail-message.xml.h:58
-#: ../widgets/misc/e-calendar.c:201
+#: ../widgets/misc/e-calendar.c:196
msgid "Next"
msgstr "Next"
@@ -20817,7 +21268,7 @@ msgid "Previews the calendar to be printed"
msgstr "Previews the calendar to be printed"
#: ../ui/evolution-calendar.xml.h:19 ../ui/evolution-mail-message.xml.h:74
-#: ../widgets/misc/e-calendar.c:177
+#: ../widgets/misc/e-calendar.c:172
msgid "Previous"
msgstr "Previous"
@@ -20885,192 +21336,6 @@ msgstr "Work Week"
msgid "_Open Appointment"
msgstr "_Open Appointment"
-#: ../ui/evolution-editor.xml.h:2
-msgid "Click here to attach a file"
-msgstr "Click here to attach a file"
-
-#: ../ui/evolution-editor.xml.h:3
-msgid "Click here to close the current window"
-msgstr "Click here to close the current window"
-
-#: ../ui/evolution-editor.xml.h:4
-msgid "Click here to save the current window"
-msgstr "Click here to save the current window"
-
-#: ../ui/evolution-editor.xml.h:5
-msgid "Click here to view help available"
-msgstr "Click here to view help available"
-
-#: ../ui/evolution-editor.xml.h:6 ../ui/evolution-mail-messagedisplay.xml.h:1
-msgid "Close"
-msgstr "Close"
-
-#: ../ui/evolution-editor.xml.h:7
-msgid "Copy selected text to the clipboard"
-msgstr "Copy selected text to the clipboard"
-
-#: ../ui/evolution-editor.xml.h:9
-msgid "Cut selected text to the clipboard"
-msgstr "Cut selected text to the clipboard"
-
-#: ../ui/evolution-editor.xml.h:10
-msgid "I_nsert"
-msgstr "I_nsert"
-
-#: ../ui/evolution-editor.xml.h:11
-msgid "Paste text from the clipboard"
-msgstr "Paste text from the clipboard"
-
-#: ../ui/evolution-editor.xml.h:14
-msgid "Select all text"
-msgstr "Select all text"
-
-#: ../ui/evolution-editor.xml.h:20 ../ui/evolution-mail-global.xml.h:24
-#: ../ui/evolution.xml.h:45
-msgid "_Help"
-msgstr "_Help"
-
-#: ../ui/evolution-editor.xml.h:21
-msgid "_Options"
-msgstr "_Options"
-
-#: ../ui/evolution-event-editor.xml.h:2
-msgid "All Day Event"
-msgstr "All Day Event"
-
-#: ../ui/evolution-event-editor.xml.h:3
-msgid "All _Day Event"
-msgstr "All _Day Event"
-
-#: ../ui/evolution-event-editor.xml.h:4 ../ui/evolution-memo-editor.xml.h:1
-#: ../ui/evolution-task-editor.xml.h:1
-msgid "Classify as Confidential"
-msgstr "Classify as Confidential"
-
-#: ../ui/evolution-event-editor.xml.h:5 ../ui/evolution-memo-editor.xml.h:2
-#: ../ui/evolution-task-editor.xml.h:2
-msgid "Classify as Private"
-msgstr "Classify as Private"
-
-#: ../ui/evolution-event-editor.xml.h:6 ../ui/evolution-memo-editor.xml.h:3
-#: ../ui/evolution-task-editor.xml.h:3
-msgid "Classify as public"
-msgstr "Classify as public"
-
-#: ../ui/evolution-event-editor.xml.h:7
-msgid "Click here to set or unset alarms for this event"
-msgstr "Click here to set or unset alarms for this event"
-
-#: ../ui/evolution-event-editor.xml.h:9 ../ui/evolution-task-editor.xml.h:5
-msgid "Insert advanced send options"
-msgstr "Insert advanced send options"
-
-#: ../ui/evolution-event-editor.xml.h:10
-msgid "Make this a recurring event"
-msgstr "Make this a recurring event"
-
-#: ../ui/evolution-event-editor.xml.h:11 ../ui/evolution-memo-editor.xml.h:4
-#: ../ui/evolution-task-editor.xml.h:6
-msgid "Pu_blic"
-msgstr "Pu_blic"
-
-#: ../ui/evolution-event-editor.xml.h:12
-msgid "Query free / busy information for the attendees"
-msgstr "Query free / busy information for the attendees"
-
-#: ../ui/evolution-event-editor.xml.h:13 ../ui/evolution-task-editor.xml.h:7
-msgid "R_ole Field"
-msgstr "R_ole Field"
-
-#: ../ui/evolution-event-editor.xml.h:16
-msgid "Send _Options"
-msgstr "Send _Options"
-
-#: ../ui/evolution-event-editor.xml.h:17
-msgid "Show time as _busy"
-msgstr "Show time as _busy"
-
-#: ../ui/evolution-event-editor.xml.h:18 ../ui/evolution-task-editor.xml.h:11
-msgid "Time _Zone"
-msgstr "Time _Zone"
-
-#: ../ui/evolution-event-editor.xml.h:19 ../ui/evolution-task-editor.xml.h:12
-msgid "Toggles whether the Attendee Type field is displayed"
-msgstr "Toggles whether the Attendee Type field is displayed"
-
-#: ../ui/evolution-event-editor.xml.h:20 ../ui/evolution-task-editor.xml.h:13
-msgid "Toggles whether the RSVP field is displayed"
-msgstr "Toggles whether the RSVP field is displayed"
-
-#: ../ui/evolution-event-editor.xml.h:21 ../ui/evolution-task-editor.xml.h:14
-msgid "Toggles whether the Role field is displayed"
-msgstr "Toggles whether the Role field is displayed"
-
-#: ../ui/evolution-event-editor.xml.h:22 ../ui/evolution-task-editor.xml.h:15
-msgid "Toggles whether the Status field is displayed"
-msgstr "Toggles whether the Status field is displayed"
-
-#: ../ui/evolution-event-editor.xml.h:23 ../ui/evolution-task-editor.xml.h:16
-msgid "Toggles whether the time zone is displayed"
-msgstr "Toggles whether the time zone is displayed"
-
-#: ../ui/evolution-event-editor.xml.h:24 ../ui/evolution-memo-editor.xml.h:5
-#: ../ui/evolution-task-editor.xml.h:17
-msgid "Toggles whether to display categories"
-msgstr "Toggles whether to display categories"
-
-#: ../ui/evolution-event-editor.xml.h:25
-msgid "Toggles whether to have All Day Event"
-msgstr "Toggles whether to have All Day Event"
-
-#: ../ui/evolution-event-editor.xml.h:26
-msgid "Toggles whether to show time as busy"
-msgstr "Toggles whether to show time as busy"
-
-#: ../ui/evolution-event-editor.xml.h:27
-msgid "_Alarms"
-msgstr "_Alarms"
-
-#: ../ui/evolution-event-editor.xml.h:28 ../ui/evolution-memo-editor.xml.h:6
-#: ../ui/evolution-task-editor.xml.h:18
-msgid "_Categories"
-msgstr "_Categories"
-
-#: ../ui/evolution-event-editor.xml.h:29 ../ui/evolution-memo-editor.xml.h:7
-#: ../ui/evolution-task-editor.xml.h:19
-msgid "_Classification"
-msgstr "_Classification"
-
-#: ../ui/evolution-event-editor.xml.h:30 ../ui/evolution-memo-editor.xml.h:8
-#: ../ui/evolution-task-editor.xml.h:20
-msgid "_Confidential"
-msgstr "_Confidential"
-
-#: ../ui/evolution-event-editor.xml.h:31
-msgid "_Free/Busy"
-msgstr "_Free/Busy"
-
-#: ../ui/evolution-event-editor.xml.h:32 ../ui/evolution-memo-editor.xml.h:9
-#: ../ui/evolution-task-editor.xml.h:21
-msgid "_Private"
-msgstr "_Private"
-
-#: ../ui/evolution-event-editor.xml.h:33 ../ui/evolution-task-editor.xml.h:22
-msgid "_RSVP"
-msgstr "_RSVP"
-
-#: ../ui/evolution-event-editor.xml.h:34
-msgid "_Recurrence"
-msgstr "_Recurrence"
-
-#: ../ui/evolution-event-editor.xml.h:35 ../ui/evolution-task-editor.xml.h:25
-msgid "_Status Field"
-msgstr "_Status Field"
-
-#: ../ui/evolution-event-editor.xml.h:36 ../ui/evolution-task-editor.xml.h:26
-msgid "_Type Field"
-msgstr "_Type Field"
-
#: ../ui/evolution-mail-global.xml.h:2
msgid "Cancel the current mail operation"
msgstr "Cancel the current mail operation"
@@ -21318,7 +21583,7 @@ msgstr "Threaded Message list"
msgid "_Group By Threads"
msgstr "_Group By Threads"
-#: ../ui/evolution-mail-list.xml.h:37 ../ui/evolution-mail-message.xml.h:116
+#: ../ui/evolution-mail-list.xml.h:37 ../ui/evolution-mail-message.xml.h:115
#: ../ui/evolution-mail-messagedisplay.xml.h:7
msgid "_Message"
msgstr "_Message"
@@ -21653,126 +21918,126 @@ 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:95
-msgid "Show messages in the normal style"
-msgstr "Show messages in the normal style"
-
-#: ../ui/evolution-mail-message.xml.h:96
msgid "Show messages with all email headers"
msgstr "Show messages with all e-mail headers"
-#: ../ui/evolution-mail-message.xml.h:97
+#: ../ui/evolution-mail-message.xml.h:96
msgid "Show the raw email source of the message"
msgstr "Show the raw e-mail source of the message"
-#: ../ui/evolution-mail-message.xml.h:98
+#: ../ui/evolution-mail-message.xml.h:97
msgid "Undelete the selected messages"
msgstr "Undelete the selected messages"
-#: ../ui/evolution-mail-message.xml.h:99
+#: ../ui/evolution-mail-message.xml.h:98
msgid "Uni_mportant"
msgstr "Uni_mportant"
-#: ../ui/evolution-mail-message.xml.h:100
+#: ../ui/evolution-mail-message.xml.h:99
msgid "Zoom _Out"
msgstr "Zoom _Out"
-#: ../ui/evolution-mail-message.xml.h:101
+#: ../ui/evolution-mail-message.xml.h:100
msgid "_Attached"
msgstr "_Attached"
-#: ../ui/evolution-mail-message.xml.h:102
+#: ../ui/evolution-mail-message.xml.h:101
msgid "_Caret Mode"
msgstr "_Caret Mode"
-#: ../ui/evolution-mail-message.xml.h:103
+#: ../ui/evolution-mail-message.xml.h:102
msgid "_Clear Flag"
msgstr "_Clear Flag"
-#: ../ui/evolution-mail-message.xml.h:106
+#: ../ui/evolution-mail-message.xml.h:105
msgid "_Delete Message"
msgstr "_Delete Message"
-#: ../ui/evolution-mail-message.xml.h:108
+#: ../ui/evolution-mail-message.xml.h:107
msgid "_Find in Message..."
msgstr "_Find in Message..."
-#: ../ui/evolution-mail-message.xml.h:109
+#: ../ui/evolution-mail-message.xml.h:108
msgid "_Flag Completed"
msgstr "_Flag Completed"
-#: ../ui/evolution-mail-message.xml.h:111
+#: ../ui/evolution-mail-message.xml.h:110
msgid "_Go To"
msgstr "_Go To"
-#: ../ui/evolution-mail-message.xml.h:112
+#: ../ui/evolution-mail-message.xml.h:111
msgid "_Important"
msgstr "_Important"
-#: ../ui/evolution-mail-message.xml.h:113
+#: ../ui/evolution-mail-message.xml.h:112
msgid "_Inline"
msgstr "_Inline"
-#: ../ui/evolution-mail-message.xml.h:114
+#: ../ui/evolution-mail-message.xml.h:113
msgid "_Junk"
msgstr "_Junk"
-#: ../ui/evolution-mail-message.xml.h:115
+#: ../ui/evolution-mail-message.xml.h:114
msgid "_Load Images"
msgstr "_Load Images"
-#: ../ui/evolution-mail-message.xml.h:117
+#: ../ui/evolution-mail-message.xml.h:116
msgid "_Message Source"
msgstr "_Message Source"
-#: ../ui/evolution-mail-message.xml.h:119
+#: ../ui/evolution-mail-message.xml.h:118
msgid "_Next Message"
msgstr "_Next Message"
-#: ../ui/evolution-mail-message.xml.h:120
+#: ../ui/evolution-mail-message.xml.h:119
msgid "_Normal Size"
msgstr "_Normal Size"
-#: ../ui/evolution-mail-message.xml.h:121
+#: ../ui/evolution-mail-message.xml.h:120
msgid "_Not Junk"
msgstr "_Not Junk"
-#: ../ui/evolution-mail-message.xml.h:122
+#: ../ui/evolution-mail-message.xml.h:121
msgid "_Open in New Window"
msgstr "_Open in New Window"
-#: ../ui/evolution-mail-message.xml.h:123
+#: ../ui/evolution-mail-message.xml.h:122
msgid "_Previous Message"
msgstr "_Previous Message"
-#: ../ui/evolution-mail-message.xml.h:125
+#: ../ui/evolution-mail-message.xml.h:124
msgid "_Quoted"
msgstr "_Quoted"
#. Translators: "Read" as in "has been read" (evolution-mail-message.xml)
-#: ../ui/evolution-mail-message.xml.h:127
+#: ../ui/evolution-mail-message.xml.h:126
msgid "_Read"
msgstr "_Read"
-#: ../ui/evolution-mail-message.xml.h:129
+#: ../ui/evolution-mail-message.xml.h:128
msgid "_Save Message..."
msgstr "_Save Message..."
-#: ../ui/evolution-mail-message.xml.h:130
+#: ../ui/evolution-mail-message.xml.h:129
msgid "_Undelete Message"
msgstr "_Undelete Message"
-#: ../ui/evolution-mail-message.xml.h:131
+#: ../ui/evolution-mail-message.xml.h:130
msgid "_Unread"
msgstr "_Unread"
-#: ../ui/evolution-mail-message.xml.h:132
+#: ../ui/evolution-mail-message.xml.h:131
msgid "_Zoom"
msgstr "_Zoom"
-#: ../ui/evolution-mail-message.xml.h:133
+#: ../ui/evolution-mail-message.xml.h:132
msgid "_Zoom In"
msgstr "_Zoom In"
+#: ../ui/evolution-mail-messagedisplay.xml.h:1
+msgid "Close"
+msgstr "Close"
+
#: ../ui/evolution-mail-messagedisplay.xml.h:3 ../ui/evolution.xml.h:18
msgid "Main toolbar"
msgstr "Main toolbar"
@@ -21809,22 +22074,6 @@ msgstr "View the selected memo"
msgid "_Open Memo"
msgstr "_Open Memo"
-#: ../ui/evolution-task-editor.xml.h:4
-msgid "Click change / view the status details of the task"
-msgstr "Click change / view the status details of the task"
-
-#: ../ui/evolution-task-editor.xml.h:9
-msgid "Status Details"
-msgstr "Status Details"
-
-#: ../ui/evolution-task-editor.xml.h:10
-msgid "Time Zone"
-msgstr "Time Zone"
-
-#: ../ui/evolution-task-editor.xml.h:24
-msgid "_Status Details"
-msgstr "_Status Details"
-
#: ../ui/evolution-tasks.xml.h:3
msgid "Copy selected tasks"
msgstr "Copy selected tasks"
@@ -22018,50 +22267,54 @@ msgid "View/Hide the Status Bar"
msgstr "View/Hide the Status Bar"
#: ../ui/evolution.xml.h:39
+msgid "Work _Offline"
+msgstr "Work _Offline"
+
+#: ../ui/evolution.xml.h:40
msgid "_About"
msgstr "_About"
-#: ../ui/evolution.xml.h:40
+#: ../ui/evolution.xml.h:41
msgid "_Close Window"
msgstr "_Close Window"
-#: ../ui/evolution.xml.h:43
+#: ../ui/evolution.xml.h:44
msgid "_Forget Passwords"
msgstr "_Forget Passwords"
-#: ../ui/evolution.xml.h:44
+#: ../ui/evolution.xml.h:45
msgid "_Frequently Asked Questions"
msgstr "_Frequently Asked Questions"
-#: ../ui/evolution.xml.h:46
+#: ../ui/evolution.xml.h:47
msgid "_Hide Buttons"
msgstr "_Hide Buttons"
-#: ../ui/evolution.xml.h:47
+#: ../ui/evolution.xml.h:48
msgid "_Icons Only"
msgstr "_Icons Only"
-#: ../ui/evolution.xml.h:49
+#: ../ui/evolution.xml.h:50
msgid "_Quick Reference"
msgstr "_Quick Reference"
-#: ../ui/evolution.xml.h:50
+#: ../ui/evolution.xml.h:51
msgid "_Quit"
msgstr "_Quit"
-#: ../ui/evolution.xml.h:51
+#: ../ui/evolution.xml.h:52
msgid "_Switcher Appearance"
msgstr "_Switcher Appearance"
-#: ../ui/evolution.xml.h:52
+#: ../ui/evolution.xml.h:53
msgid "_Synchronization Options..."
msgstr "_Synchronisation Options..."
-#: ../ui/evolution.xml.h:53
+#: ../ui/evolution.xml.h:54
msgid "_Text Only"
msgstr "_Text Only"
-#: ../ui/evolution.xml.h:55
+#: ../ui/evolution.xml.h:56
msgid "_Window"
msgstr "_Window"
@@ -22138,11 +22391,11 @@ msgid "With _Status"
msgstr "With _Status"
#. Put the "UTC" entry at the top of the combo's list.
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:241
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:438
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:440
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:442
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:791
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:234
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:431
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:433
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:435
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:784
msgid "UTC"
msgstr "UTC"
@@ -22172,19 +22425,19 @@ msgstr ""
"zone.\n"
"Use the right mouse button to zoom out."
-#: ../widgets/menus/gal-define-views-dialog.c:78
-#: ../widgets/menus/gal-define-views-model.c:186
+#: ../widgets/menus/gal-define-views-dialog.c:76
+#: ../widgets/menus/gal-define-views-model.c:185
msgid "Collection"
msgstr "Collection"
-#: ../widgets/menus/gal-define-views-dialog.c:360
+#: ../widgets/menus/gal-define-views-dialog.c:358
#: ../widgets/menus/gal-define-views.glade.h:4
#, no-c-format
msgid "Define Views for %s"
msgstr "Define Views for %s"
+#: ../widgets/menus/gal-define-views-dialog.c:366
#: ../widgets/menus/gal-define-views-dialog.c:368
-#: ../widgets/menus/gal-define-views-dialog.c:370
msgid "Define Views"
msgstr "Define Views"
@@ -22200,11 +22453,11 @@ msgstr "Define Views for \"%s\""
msgid "Table"
msgstr "Table"
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:228
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:226
msgid "Instance"
msgstr "Instance"
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:286
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:284
msgid "Save Current View"
msgstr "Save Current View"
@@ -22218,7 +22471,7 @@ msgstr "_Replace existing view"
#. bonobo displays this string so it must be in locale
#: ../widgets/menus/gal-view-instance.c:582
-#: ../widgets/menus/gal-view-menus.c:354
+#: ../widgets/menus/gal-view-menus.c:368
msgid "Custom View"
msgstr "Custom View"
@@ -22227,40 +22480,40 @@ msgid "Save Custom View"
msgstr "Save Custom View"
#: ../widgets/menus/gal-view-instance.c:587
-#: ../widgets/menus/gal-view-menus.c:378
+#: ../widgets/menus/gal-view-menus.c:392
msgid "Define Views..."
msgstr "Define Views..."
-#: ../widgets/menus/gal-view-menus.c:291
+#: ../widgets/menus/gal-view-menus.c:305
msgid "C_urrent View"
msgstr "C_urrent View"
-#: ../widgets/menus/gal-view-menus.c:315
+#: ../widgets/menus/gal-view-menus.c:329
#, c-format
msgid "Select View: %s"
msgstr "Select View: %s"
-#: ../widgets/menus/gal-view-menus.c:359
+#: ../widgets/menus/gal-view-menus.c:373
msgid "Current view is a customized view"
msgstr "Current view is a customised view"
-#: ../widgets/menus/gal-view-menus.c:364
+#: ../widgets/menus/gal-view-menus.c:378
msgid "Save Custom View..."
msgstr "Save Custom View..."
-#: ../widgets/menus/gal-view-menus.c:369
+#: ../widgets/menus/gal-view-menus.c:383
msgid "Save current custom view"
msgstr "Save current custom view"
-#: ../widgets/menus/gal-view-menus.c:383
+#: ../widgets/menus/gal-view-menus.c:397
msgid "Create or edit views"
msgstr "Create or edit views"
-#: ../widgets/menus/gal-view-new-dialog.c:72
+#: ../widgets/menus/gal-view-new-dialog.c:70
msgid "Factory"
msgstr "Factory"
-#: ../widgets/menus/gal-view-new-dialog.c:107
+#: ../widgets/menus/gal-view-new-dialog.c:105
msgid "Define New View"
msgstr "Define New View"
@@ -22276,43 +22529,17 @@ msgstr "Type of View"
msgid "Type of view:"
msgstr "Type of view:"
-#: ../widgets/misc/e-attachment-bar.c:103
-#, c-format
-msgid "%u byte"
-msgid_plural "%u bytes"
-msgstr[0] "%u byte"
-msgstr[1] "%u bytes"
-
-#: ../widgets/misc/e-attachment-bar.c:109
-#, c-format
-msgid "%.1f KB"
-msgstr "%.1f KB"
-
-#: ../widgets/misc/e-attachment-bar.c:112
-#, c-format
-msgid "%.1f MB"
-msgstr "%.1f MB"
-
-#: ../widgets/misc/e-attachment-bar.c:115
-#, c-format
-msgid "%.1f GB"
-msgstr "%.1f GB"
-
-#: ../widgets/misc/e-attachment-bar.c:1058
+#: ../widgets/misc/e-attachment-bar.c:1137
msgid "Attachment Bar"
msgstr "Attachment Bar"
-#: ../widgets/misc/e-attachment-bar.c:1304
-msgid "Recent Docu_ments"
-msgstr "Recent Docu_ments"
-
-#: ../widgets/misc/e-attachment.c:296 ../widgets/misc/e-attachment.c:311
-#: ../widgets/misc/e-attachment.c:596 ../widgets/misc/e-attachment.c:613
+#: ../widgets/misc/e-attachment.c:291 ../widgets/misc/e-attachment.c:306
+#: ../widgets/misc/e-attachment.c:591 ../widgets/misc/e-attachment.c:608
#, c-format
msgid "Cannot attach file %s: %s"
msgstr "Cannot attach file %s: %s"
-#: ../widgets/misc/e-attachment.c:304 ../widgets/misc/e-attachment.c:605
+#: ../widgets/misc/e-attachment.c:299 ../widgets/misc/e-attachment.c:600
#, c-format
msgid "Cannot attach file %s: not a regular file"
msgstr "Cannot attach file %s: not a regular file"
@@ -22334,11 +22561,11 @@ msgid "Suggest automatic display of attachment"
msgstr "Suggest automatic display of attachment"
#. This is a strftime() format. %B = Month name, %Y = Year.
-#: ../widgets/misc/e-calendar-item.c:1278
+#: ../widgets/misc/e-calendar-item.c:1273
msgid "%B %Y"
msgstr "%B %Y"
-#: ../widgets/misc/e-calendar.c:226
+#: ../widgets/misc/e-calendar.c:221
msgid "Month Calendar"
msgstr "Month Calendar"
@@ -22383,30 +22610,30 @@ msgstr "Y1"
msgid "Y2"
msgstr "Y2"
-#: ../widgets/misc/e-canvas-vbox.c:92 ../widgets/misc/e-reflow.c:1426
-#: ../widgets/table/e-table-group-container.c:973
-#: ../widgets/table/e-table-group-leaf.c:635
-#: ../widgets/table/e-table-item.c:3071
+#: ../widgets/misc/e-canvas-vbox.c:91 ../widgets/misc/e-reflow.c:1426
+#: ../widgets/table/e-table-group-container.c:1000
+#: ../widgets/table/e-table-group-leaf.c:644
+#: ../widgets/table/e-table-item.c:3074
msgid "Minimum width"
msgstr "Minimum width"
-#: ../widgets/misc/e-canvas-vbox.c:93 ../widgets/misc/e-reflow.c:1427
-#: ../widgets/table/e-table-group-container.c:974
-#: ../widgets/table/e-table-group-leaf.c:636
-#: ../widgets/table/e-table-item.c:3072
+#: ../widgets/misc/e-canvas-vbox.c:92 ../widgets/misc/e-reflow.c:1427
+#: ../widgets/table/e-table-group-container.c:1001
+#: ../widgets/table/e-table-group-leaf.c:645
+#: ../widgets/table/e-table-item.c:3075
msgid "Minimum Width"
msgstr "Minimum Width"
-#: ../widgets/misc/e-canvas-vbox.c:104 ../widgets/misc/e-canvas-vbox.c:105
-#: ../widgets/misc/e-expander.c:206
+#: ../widgets/misc/e-canvas-vbox.c:103 ../widgets/misc/e-canvas-vbox.c:104
+#: ../widgets/misc/e-expander.c:204
msgid "Spacing"
msgstr "Spacing"
-#: ../widgets/misc/e-cell-date-edit.c:292
+#: ../widgets/misc/e-cell-date-edit.c:290
msgid "Now"
msgstr "Now"
-#: ../widgets/misc/e-cell-date-edit.c:849
+#: ../widgets/misc/e-cell-date-edit.c:847
#, c-format
msgid "The time must be in the format: %s"
msgstr "The time must be in the format: %s"
@@ -22510,55 +22737,55 @@ msgstr "Other..."
msgid "Ch_aracter Encoding"
msgstr "Ch_aracter Encoding"
-#: ../widgets/misc/e-dateedit.c:324
+#: ../widgets/misc/e-dateedit.c:309
msgid "Date and Time"
msgstr "Date and Time"
-#: ../widgets/misc/e-dateedit.c:345
+#: ../widgets/misc/e-dateedit.c:330
msgid "Text entry to input date"
msgstr "Text entry to input date"
-#: ../widgets/misc/e-dateedit.c:367
+#: ../widgets/misc/e-dateedit.c:352
msgid "Click this button to show a calendar"
msgstr "Click this button to show a calendar"
-#: ../widgets/misc/e-dateedit.c:409
+#: ../widgets/misc/e-dateedit.c:394
msgid "Drop-down combination box to select time"
msgstr "Drop-down combination box to select time"
-#: ../widgets/misc/e-dateedit.c:486
+#: ../widgets/misc/e-dateedit.c:470
msgid "No_w"
msgstr "No_w"
-#: ../widgets/misc/e-dateedit.c:492
+#: ../widgets/misc/e-dateedit.c:476
msgid "_Today"
msgstr "_Today"
-#: ../widgets/misc/e-dateedit.c:1657
+#: ../widgets/misc/e-dateedit.c:1641
msgid "Invalid Date Value"
msgstr "Invalid Date Value"
-#: ../widgets/misc/e-dateedit.c:1686
+#: ../widgets/misc/e-dateedit.c:1670
msgid "Invalid Time Value"
msgstr "Invalid Time Value"
-#: ../widgets/misc/e-expander.c:182
+#: ../widgets/misc/e-expander.c:180
msgid "Expanded"
msgstr "Expanded"
-#: ../widgets/misc/e-expander.c:183
+#: ../widgets/misc/e-expander.c:181
msgid "Whether or not the expander is expanded"
msgstr "Whether or not the expander is expanded"
-#: ../widgets/misc/e-expander.c:191
+#: ../widgets/misc/e-expander.c:189
msgid "Text of the expander's label"
msgstr "Text of the expander's label"
-#: ../widgets/misc/e-expander.c:198
+#: ../widgets/misc/e-expander.c:196
msgid "Use underline"
msgstr "Use underline"
-#: ../widgets/misc/e-expander.c:199
+#: ../widgets/misc/e-expander.c:197
msgid ""
"If set, an underline in the text indicates the next character should be used "
"for the mnemonic accelerator key"
@@ -22566,82 +22793,82 @@ 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:207
+#: ../widgets/misc/e-expander.c:205
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:216
+#: ../widgets/misc/e-expander.c:214
msgid "Label widget"
msgstr "Label widget"
-#: ../widgets/misc/e-expander.c:217
+#: ../widgets/misc/e-expander.c:215
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:223 ../widgets/table/e-tree.c:3369
+#: ../widgets/misc/e-expander.c:221 ../widgets/table/e-tree.c:3391
msgid "Expander Size"
msgstr "Expander Size"
-#: ../widgets/misc/e-expander.c:224 ../widgets/table/e-tree.c:3370
+#: ../widgets/misc/e-expander.c:222 ../widgets/table/e-tree.c:3392
msgid "Size of the expander arrow"
msgstr "Size of the expander arrow"
-#: ../widgets/misc/e-expander.c:232
+#: ../widgets/misc/e-expander.c:230
msgid "Indicator Spacing"
msgstr "Indicator Spacing"
-#: ../widgets/misc/e-expander.c:233
+#: ../widgets/misc/e-expander.c:231
msgid "Spacing around expander arrow"
msgstr "Spacing around expander arrow"
#. FIXME: get the toplevel window...
-#: ../widgets/misc/e-filter-bar.c:130 ../widgets/misc/e-filter-bar.c:183
-#: ../widgets/misc/e-filter-bar.c:311 ../widgets/misc/e-filter-bar.c:753
+#: ../widgets/misc/e-filter-bar.c:126 ../widgets/misc/e-filter-bar.c:179
+#: ../widgets/misc/e-filter-bar.c:307 ../widgets/misc/e-filter-bar.c:749
msgid "Advanced Search"
msgstr "Advanced Search"
#. FIXME: get the toplevel window...
-#: ../widgets/misc/e-filter-bar.c:234
+#: ../widgets/misc/e-filter-bar.c:230
msgid "Save Search"
msgstr "Save Search"
-#: ../widgets/misc/e-filter-bar.c:271
+#: ../widgets/misc/e-filter-bar.c:267
msgid "_Searches"
msgstr "_Searches"
-#: ../widgets/misc/e-filter-bar.c:273
+#: ../widgets/misc/e-filter-bar.c:269
msgid "Searches"
msgstr "Searches"
-#: ../widgets/misc/e-filter-bar.h:101 ../widgets/misc/e-filter-bar.h:112
+#: ../widgets/misc/e-filter-bar.h:104 ../widgets/misc/e-filter-bar.h:115
msgid "_Save Search..."
msgstr "_Save Search..."
-#: ../widgets/misc/e-filter-bar.h:102 ../widgets/misc/e-filter-bar.h:113
+#: ../widgets/misc/e-filter-bar.h:105 ../widgets/misc/e-filter-bar.h:116
msgid "_Edit Saved Searches..."
msgstr "_Edit Saved Searches..."
-#: ../widgets/misc/e-filter-bar.h:103 ../widgets/misc/e-filter-bar.h:114
+#: ../widgets/misc/e-filter-bar.h:106 ../widgets/misc/e-filter-bar.h:117
msgid "_Advanced Search..."
msgstr "_Advanced Search..."
-#: ../widgets/misc/e-filter-bar.h:104
+#: ../widgets/misc/e-filter-bar.h:107
msgid "All Accounts"
msgstr "All Accounts"
-#: ../widgets/misc/e-filter-bar.h:105
+#: ../widgets/misc/e-filter-bar.h:108
msgid "Current Account"
msgstr "Current Account"
-#: ../widgets/misc/e-filter-bar.h:106
+#: ../widgets/misc/e-filter-bar.h:109
msgid "Current Folder"
msgstr "Current Folder"
-#: ../widgets/misc/e-filter-bar.h:107
+#: ../widgets/misc/e-filter-bar.h:110
msgid "Current Message"
msgstr "Current Message"
-#: ../widgets/misc/e-image-chooser.c:173
+#: ../widgets/misc/e-image-chooser.c:169
msgid "Choose Image"
msgstr "Choose Image"
@@ -22657,15 +22884,23 @@ msgstr ""
"Mouse-based interactive map widget for selecting timezone. Keyboard users "
"should instead select the timezone from the drop-down combination box below."
-#: ../widgets/misc/e-pilot-settings.c:103
+#: ../widgets/misc/e-online-button.c:109
+msgid "Online"
+msgstr "Online"
+
+#: ../widgets/misc/e-online-button.c:110
+msgid "The button state is online"
+msgstr "The button state is online"
+
+#: ../widgets/misc/e-pilot-settings.c:102
msgid "Sync with:"
msgstr "Sync with:"
-#: ../widgets/misc/e-pilot-settings.c:111
+#: ../widgets/misc/e-pilot-settings.c:110
msgid "Sync Private Records:"
msgstr "Sync Private Records:"
-#: ../widgets/misc/e-pilot-settings.c:120
+#: ../widgets/misc/e-pilot-settings.c:119
msgid "Sync Categories:"
msgstr "Sync Categories:"
@@ -22681,74 +22916,74 @@ msgstr "Reflow model"
msgid "Column width"
msgstr "Column width"
-#: ../widgets/misc/e-search-bar.c:350 ../widgets/misc/e-search-bar.c:482
-#: ../widgets/misc/e-search-bar.c:484
+#: ../widgets/misc/e-search-bar.c:340 ../widgets/misc/e-search-bar.c:473
+#: ../widgets/misc/e-search-bar.c:475
msgid "Search"
msgstr "Search"
-#: ../widgets/misc/e-search-bar.c:350 ../widgets/misc/e-search-bar.c:482
-#: ../widgets/misc/e-search-bar.c:484
+#: ../widgets/misc/e-search-bar.c:340 ../widgets/misc/e-search-bar.c:473
+#: ../widgets/misc/e-search-bar.c:475
msgid "Click here to change the search type"
msgstr "Click here to change the search type"
-#: ../widgets/misc/e-search-bar.c:615
+#: ../widgets/misc/e-search-bar.c:606
msgid "_Search"
msgstr "_Search"
-#: ../widgets/misc/e-search-bar.c:621
+#: ../widgets/misc/e-search-bar.c:612
msgid "_Find Now"
msgstr "_Find Now"
-#: ../widgets/misc/e-search-bar.c:622
+#: ../widgets/misc/e-search-bar.c:613
msgid "_Clear"
msgstr "_Clear"
-#: ../widgets/misc/e-search-bar.c:877
+#: ../widgets/misc/e-search-bar.c:868
msgid "Item ID"
msgstr "Item ID"
-#: ../widgets/misc/e-search-bar.c:884 ../widgets/text/e-text.c:3565
+#: ../widgets/misc/e-search-bar.c:875 ../widgets/text/e-text.c:3565
#: ../widgets/text/e-text.c:3566
msgid "Text"
msgstr "Text"
#. To Translators: The "Show: " label is followed by the Quick Search Dropdown Menu where you can choose
#. to display "All Messages", "Unread Messages", "Message with 'Important' Label" and so on...
-#: ../widgets/misc/e-search-bar.c:1018
+#: ../widgets/misc/e-search-bar.c:1006
msgid "Sho_w: "
msgstr "Sho_w: "
#. To Translators: The "Show: " label is followed by the Quick Search Text input field where one enters
#. the term to search for
-#: ../widgets/misc/e-search-bar.c:1035
+#: ../widgets/misc/e-search-bar.c:1023
msgid "Sear_ch: "
msgstr "Sear_ch: "
#. To Translators: The " in " label is part of the Quick Search Bar, example:
#. Search: | <user's_search_term> | in | Current Folder/All Accounts/Current Account
-#: ../widgets/misc/e-search-bar.c:1047
+#: ../widgets/misc/e-search-bar.c:1035
msgid " i_n "
msgstr " i_n "
-#: ../widgets/misc/e-selection-model-array.c:543
+#: ../widgets/misc/e-selection-model-array.c:594
#: ../widgets/table/e-tree-selection-model.c:807
msgid "Cursor Row"
msgstr "Cursor Row"
-#: ../widgets/misc/e-selection-model-array.c:550
+#: ../widgets/misc/e-selection-model-array.c:601
#: ../widgets/table/e-tree-selection-model.c:814
msgid "Cursor Column"
msgstr "Cursor Column"
-#: ../widgets/misc/e-selection-model.c:210
+#: ../widgets/misc/e-selection-model.c:209
msgid "Sorter"
msgstr "Sorter"
-#: ../widgets/misc/e-selection-model.c:217
+#: ../widgets/misc/e-selection-model.c:216
msgid "Selection Mode"
msgstr "Selection Mode"
-#: ../widgets/misc/e-selection-model.c:225
+#: ../widgets/misc/e-selection-model.c:224
msgid "Cursor Mode"
msgstr "Cursor Mode"
@@ -22776,10 +23011,6 @@ msgstr "<b>Status Tracking</b>"
msgid "A_uto-delete sent item"
msgstr "A_uto-delete sent item"
-#: ../widgets/misc/e-send-options.glade.h:6
-msgid "Classification"
-msgstr "Classification"
-
#: ../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"
@@ -22886,19 +23117,19 @@ msgid "_When opened:"
msgstr "_When opened:"
#. For Translator only: %s is status message that is displayed (eg "moving items", "updating objects")
-#: ../widgets/misc/e-task-widget.c:297
+#: ../widgets/misc/e-task-widget.c:255
#, c-format
msgid "%s (...)"
msgstr "%s (...)"
#. For Translator only: %s is status message that is displayed (eg "moving items", "updating objects");
#. %d is a number between 0 and 100, describing the percentage of operation complete
-#: ../widgets/misc/e-task-widget.c:303
+#: ../widgets/misc/e-task-widget.c:261
#, c-format
msgid "%s (%d%% complete)"
msgstr "%s (%d%% complete)"
-#: ../widgets/misc/e-url-entry.c:107
+#: ../widgets/misc/e-url-entry.c:106
msgid "Click here to go to URL"
msgstr "Click here to go to URL"
@@ -23109,81 +23340,81 @@ msgid_plural "%s (%d items)"
msgstr[0] "%s (%d item)"
msgstr[1] "%s (%d items)"
-#: ../widgets/table/e-table-group-container.c:896
-#: ../widgets/table/e-table-group-container.c:897
-#: ../widgets/table/e-table-group-leaf.c:572
-#: ../widgets/table/e-table-group-leaf.c:573
-#: ../widgets/table/e-table-item.c:3029 ../widgets/table/e-table-item.c:3030
+#: ../widgets/table/e-table-group-container.c:923
+#: ../widgets/table/e-table-group-container.c:924
+#: ../widgets/table/e-table-group-leaf.c:581
+#: ../widgets/table/e-table-group-leaf.c:582
+#: ../widgets/table/e-table-item.c:3032 ../widgets/table/e-table-item.c:3033
msgid "Alternating Row Colors"
msgstr "Alternating Row Colours"
-#: ../widgets/table/e-table-group-container.c:903
-#: ../widgets/table/e-table-group-container.c:904
-#: ../widgets/table/e-table-group-leaf.c:579
-#: ../widgets/table/e-table-group-leaf.c:580
-#: ../widgets/table/e-table-item.c:3036 ../widgets/table/e-table-item.c:3037
-#: ../widgets/table/e-tree.c:3322 ../widgets/table/e-tree.c:3323
+#: ../widgets/table/e-table-group-container.c:930
+#: ../widgets/table/e-table-group-container.c:931
+#: ../widgets/table/e-table-group-leaf.c:588
+#: ../widgets/table/e-table-group-leaf.c:589
+#: ../widgets/table/e-table-item.c:3039 ../widgets/table/e-table-item.c:3040
+#: ../widgets/table/e-tree.c:3344 ../widgets/table/e-tree.c:3345
msgid "Horizontal Draw Grid"
msgstr "Horizontal Draw Grid"
-#: ../widgets/table/e-table-group-container.c:910
-#: ../widgets/table/e-table-group-container.c:911
-#: ../widgets/table/e-table-group-leaf.c:586
-#: ../widgets/table/e-table-group-leaf.c:587
-#: ../widgets/table/e-table-item.c:3043 ../widgets/table/e-table-item.c:3044
-#: ../widgets/table/e-tree.c:3328 ../widgets/table/e-tree.c:3329
+#: ../widgets/table/e-table-group-container.c:937
+#: ../widgets/table/e-table-group-container.c:938
+#: ../widgets/table/e-table-group-leaf.c:595
+#: ../widgets/table/e-table-group-leaf.c:596
+#: ../widgets/table/e-table-item.c:3046 ../widgets/table/e-table-item.c:3047
+#: ../widgets/table/e-tree.c:3350 ../widgets/table/e-tree.c:3351
msgid "Vertical Draw Grid"
msgstr "Vertical Draw Grid"
-#: ../widgets/table/e-table-group-container.c:917
-#: ../widgets/table/e-table-group-container.c:918
-#: ../widgets/table/e-table-group-leaf.c:593
-#: ../widgets/table/e-table-group-leaf.c:594
-#: ../widgets/table/e-table-item.c:3050 ../widgets/table/e-table-item.c:3051
-#: ../widgets/table/e-tree.c:3334 ../widgets/table/e-tree.c:3335
+#: ../widgets/table/e-table-group-container.c:944
+#: ../widgets/table/e-table-group-container.c:945
+#: ../widgets/table/e-table-group-leaf.c:602
+#: ../widgets/table/e-table-group-leaf.c:603
+#: ../widgets/table/e-table-item.c:3053 ../widgets/table/e-table-item.c:3054
+#: ../widgets/table/e-tree.c:3356 ../widgets/table/e-tree.c:3357
msgid "Draw focus"
msgstr "Draw focus"
-#: ../widgets/table/e-table-group-container.c:924
-#: ../widgets/table/e-table-group-container.c:925
-#: ../widgets/table/e-table-group-leaf.c:600
-#: ../widgets/table/e-table-group-leaf.c:601
-#: ../widgets/table/e-table-item.c:3057 ../widgets/table/e-table-item.c:3058
+#: ../widgets/table/e-table-group-container.c:951
+#: ../widgets/table/e-table-group-container.c:952
+#: ../widgets/table/e-table-group-leaf.c:609
+#: ../widgets/table/e-table-group-leaf.c:610
+#: ../widgets/table/e-table-item.c:3060 ../widgets/table/e-table-item.c:3061
msgid "Cursor mode"
msgstr "Cursor mode"
-#: ../widgets/table/e-table-group-container.c:931
-#: ../widgets/table/e-table-group-container.c:932
-#: ../widgets/table/e-table-group-leaf.c:614
-#: ../widgets/table/e-table-group-leaf.c:615
-#: ../widgets/table/e-table-item.c:3022 ../widgets/table/e-table-item.c:3023
+#: ../widgets/table/e-table-group-container.c:958
+#: ../widgets/table/e-table-group-container.c:959
+#: ../widgets/table/e-table-group-leaf.c:623
+#: ../widgets/table/e-table-group-leaf.c:624
+#: ../widgets/table/e-table-item.c:3025 ../widgets/table/e-table-item.c:3026
msgid "Selection model"
msgstr "Selection model"
-#: ../widgets/table/e-table-group-container.c:938
-#: ../widgets/table/e-table-group-container.c:939
-#: ../widgets/table/e-table-group-leaf.c:607
-#: ../widgets/table/e-table-group-leaf.c:608
-#: ../widgets/table/e-table-item.c:3064 ../widgets/table/e-table-item.c:3065
-#: ../widgets/table/e-table.c:3307 ../widgets/table/e-tree.c:3316
-#: ../widgets/table/e-tree.c:3317
+#: ../widgets/table/e-table-group-container.c:965
+#: ../widgets/table/e-table-group-container.c:966
+#: ../widgets/table/e-table-group-leaf.c:616
+#: ../widgets/table/e-table-group-leaf.c:617
+#: ../widgets/table/e-table-item.c:3067 ../widgets/table/e-table-item.c:3068
+#: ../widgets/table/e-table.c:3325 ../widgets/table/e-tree.c:3338
+#: ../widgets/table/e-tree.c:3339
msgid "Length Threshold"
msgstr "Length Threshold"
-#: ../widgets/table/e-table-group-container.c:945
-#: ../widgets/table/e-table-group-container.c:946
-#: ../widgets/table/e-table-group-leaf.c:649
-#: ../widgets/table/e-table-group-leaf.c:650
-#: ../widgets/table/e-table-item.c:3098 ../widgets/table/e-table-item.c:3099
-#: ../widgets/table/e-table.c:3314 ../widgets/table/e-tree.c:3348
-#: ../widgets/table/e-tree.c:3349
+#: ../widgets/table/e-table-group-container.c:972
+#: ../widgets/table/e-table-group-container.c:973
+#: ../widgets/table/e-table-group-leaf.c:658
+#: ../widgets/table/e-table-group-leaf.c:659
+#: ../widgets/table/e-table-item.c:3101 ../widgets/table/e-table-item.c:3102
+#: ../widgets/table/e-table.c:3332 ../widgets/table/e-tree.c:3370
+#: ../widgets/table/e-tree.c:3371
msgid "Uniform row height"
msgstr "Uniform row height"
-#: ../widgets/table/e-table-group-container.c:952
-#: ../widgets/table/e-table-group-container.c:953
-#: ../widgets/table/e-table-group-leaf.c:642
-#: ../widgets/table/e-table-group-leaf.c:643
+#: ../widgets/table/e-table-group-container.c:979
+#: ../widgets/table/e-table-group-container.c:980
+#: ../widgets/table/e-table-group-leaf.c:651
+#: ../widgets/table/e-table-group-leaf.c:652
msgid "Frozen"
msgstr "Frozen"
@@ -23249,7 +23480,7 @@ msgid "Font Description"
msgstr "Font Description"
#: ../widgets/table/e-table-header-item.c:1915
-#: ../widgets/table/e-table-sorter.c:173
+#: ../widgets/table/e-table-sorter.c:172
msgid "Sort Info"
msgstr "Sort Info"
@@ -23259,36 +23490,36 @@ msgstr "Sort Info"
msgid "Tree"
msgstr "Tree"
-#: ../widgets/table/e-table-item.c:3008 ../widgets/table/e-table-item.c:3009
+#: ../widgets/table/e-table-item.c:3011 ../widgets/table/e-table-item.c:3012
msgid "Table header"
msgstr "Table header"
-#: ../widgets/table/e-table-item.c:3015 ../widgets/table/e-table-item.c:3016
+#: ../widgets/table/e-table-item.c:3018 ../widgets/table/e-table-item.c:3019
msgid "Table model"
msgstr "Table model"
-#: ../widgets/table/e-table-item.c:3091 ../widgets/table/e-table-item.c:3092
+#: ../widgets/table/e-table-item.c:3094 ../widgets/table/e-table-item.c:3095
msgid "Cursor row"
msgstr "Cursor row"
-#: ../widgets/table/e-table.c:3321 ../widgets/table/e-tree.c:3355
-#: ../widgets/table/e-tree.c:3356
+#: ../widgets/table/e-table.c:3339 ../widgets/table/e-tree.c:3377
+#: ../widgets/table/e-tree.c:3378
msgid "Always search"
msgstr "Always search"
-#: ../widgets/table/e-table.c:3328
+#: ../widgets/table/e-table.c:3346
msgid "Use click to add"
msgstr "Use click to add"
-#: ../widgets/table/e-tree.c:3341 ../widgets/table/e-tree.c:3342
+#: ../widgets/table/e-tree.c:3363 ../widgets/table/e-tree.c:3364
msgid "ETree table adapter"
msgstr "ETree table adapter"
-#: ../widgets/table/e-tree.c:3362
+#: ../widgets/table/e-tree.c:3384
msgid "Retro Look"
msgstr "Retro Look"
-#: ../widgets/table/e-tree.c:3363
+#: ../widgets/table/e-tree.c:3385
msgid "Draw lines and +/- expanders."
msgstr "Draw lines and +/- expanders."
@@ -23396,6 +23627,185 @@ msgstr "IM Context"
msgid "Handle Popup"
msgstr "Handle Popup"
+#~ msgid "_Contact"
+#~ msgstr "_Contact"
+
+#~ msgid "Contact _List"
+#~ msgstr "Contact _List"
+
+#~ msgid "Address _Book"
+#~ msgstr "Address _Book"
+
+#~ msgid "_Properties..."
+#~ msgstr "_Properties..."
+
+#~ msgid ""
+#~ "'{0}' is a read-only calendar source. Change Calendar to one that can "
+#~ "accept appointments."
+#~ msgstr ""
+#~ "'{0}' is a read-only calendar source. Change Calendar to one that can "
+#~ "accept appointments."
+
+#~ msgid "_Appointment"
+#~ msgstr "_Appointment"
+
+#~ msgid "M_eeting"
+#~ msgstr "M_eeting"
+
+#~ msgid "All Day A_ppointment"
+#~ msgstr "All Day A_ppointment"
+
+#~ msgid "Cale_ndar"
+#~ msgstr "Cale_ndar"
+
+#~ msgid "D_escription:"
+#~ msgstr "D_escription:"
+
+#~ msgid "De_scription:"
+#~ msgstr "De_scription:"
+
+#~ msgid "Updating query"
+#~ msgstr "Updating query"
+
+#~ msgid "Mem_o"
+#~ msgstr "Mem_o"
+
+#~ msgid "_Shared memo"
+#~ msgstr "_Shared memo"
+
+#~ msgid "Memo li_st"
+#~ msgstr "Memo li_st"
+
+#~ msgid "Upcoming Appointments"
+#~ msgstr "Upcoming Appointments"
+
+#~ msgid "Assigne_d Task"
+#~ msgstr "Assigne_d Task"
+
+#~ msgid "Tas_k list"
+#~ msgstr "Tas_k list"
+
+#~ msgid "_Save Message"
+#~ msgstr "_Save Message"
+
+#~ msgid "folder-display|%s (%u)"
+#~ msgstr "%s (%u)"
+
+#~ msgid "_Mail Message"
+#~ msgstr "_Mail Message"
+
+#~ msgid "Mail _Folder"
+#~ msgstr "Mail _Folder"
+
+#~ msgid ""
+#~ "The selected folder does not have enough permissions to create the file"
+#~ msgstr ""
+#~ "The selected folder does not have enough permissions to create the file"
+
+#~ msgid "Custom Header Options"
+#~ msgstr "Custom Header Options"
+
+#~ msgid "button-user"
+#~ msgstr "button-user"
+
+#~ msgid "Mark all messages in this folder and subfolders as read?"
+#~ msgstr "Mark all messages in this folder and subfolders as read?"
+
+#~ msgid "Do you want the operation to be performed also in the subfolders?"
+#~ msgstr "Do you want the operation to be performed also in the subfolders?"
+
+#~ msgid "Mark All Messages as Read"
+#~ msgstr "Mark All Messages as Read"
+
+#~ msgid "There is no configuration option for this plugin."
+#~ msgstr "There is no configuration option for this plugin."
+
+#~ msgid "A plugin that handles the Startup wizard."
+#~ msgstr "A plugin that handles the Startup wizard."
+
+#~ msgid "Startup wizard"
+#~ msgstr "Startup wizard"
+
+#~ msgid "A string description of the current printer settings."
+#~ msgstr "A string description of the current printer settings."
+
+#~ msgid "Decides whether the crash detection should be run or not."
+#~ msgstr "Decides whether the crash detection should be run or not."
+
+#~ msgid "Skip recovery warning dialog"
+#~ msgstr "Skip recovery warning dialogue"
+
+#~ msgid "Whether crash detection should be done or not"
+#~ msgstr "Whether crash detection should be done or not"
+
+#~ msgid "Whether the warning dialog in recovery of Evolution is skipped."
+#~ msgstr "Whether the warning dialogue in recovery of Evolution is skipped."
+
+#~ msgid "No folder name specified."
+#~ msgstr "No folder name specified."
+
+#~ msgid "Folder name cannot contain the Return character."
+#~ msgstr "Folder name cannot contain the Return character."
+
+#~ msgid "Folder name cannot contain the character \"/\"."
+#~ msgstr "Folder name cannot contain the character \"/\"."
+
+#~ msgid "Folder name cannot contain the character \"#\"."
+#~ msgstr "Folder name cannot contain the character \"#\"."
+
+#~ msgid "'.' and '..' are reserved folder names."
+#~ msgstr "'.' and '..' are reserved folder names."
+
+#~ msgid "_Test"
+#~ msgstr "_Test"
+
+#~ msgid "Evolution Crash Detection"
+#~ msgstr "Evolution Crash Detection"
+
+#~ msgid "Ig_nore"
+#~ msgstr "Ig_nore"
+
+#~ msgid ""
+#~ "Evolution appears to have exited unexpectedly the last time it was\n"
+#~ "run. As a precautionary measure, all preview panes will be hidden.\n"
+#~ "You can restore the preview panes from the View menu.\n"
+#~ msgstr ""
+#~ "Evolution appears to have exited unexpectedly the last time it was\n"
+#~ "run. As a precautionary measure, all preview panes will be hidden.\n"
+#~ "You can restore the preview panes from the View menu.\n"
+
+#~ msgid "_Do not show this message again"
+#~ msgstr "_Do not show this message again"
+
+#~ msgid "All Day Event"
+#~ msgstr "All Day Event"
+
+#~ msgid "Send _Options"
+#~ msgstr "Send _Options"
+
+#~ msgid "Show messages in the normal style"
+#~ msgstr "Show messages in the normal style"
+
+#~ msgid "Status Details"
+#~ msgstr "Status Details"
+
+#~ msgid "Time Zone"
+#~ msgstr "Time Zone"
+
+#~ msgid "%u byte"
+#~ msgid_plural "%u bytes"
+#~ msgstr[0] "%u byte"
+#~ msgstr[1] "%u bytes"
+
+#~ msgid "%.1f KB"
+#~ msgstr "%.1f KB"
+
+#~ msgid "%.1f MB"
+#~ msgstr "%.1f MB"
+
+#~ msgid "%.1f GB"
+#~ msgstr "%.1f GB"
+
#~ msgid "Permission Denied."
#~ msgstr "Permission Denied."
@@ -23454,9 +23864,6 @@ msgstr "Handle Popup"
#~ msgid "Remind _missing attachments"
#~ msgstr "Remind _missing attachments"
-#~ msgid "_Continue Editing"
-#~ msgstr "_Continue Editing"
-
#~ msgid "_Refresh:"
#~ msgstr "_Refresh:"
@@ -23505,9 +23912,6 @@ msgstr "Handle Popup"
#~ msgid "Save As"
#~ msgstr "Save As"
-#~ msgid "Save Draft"
-#~ msgstr "Save Draft"
-
#~ msgid "Save in folder..."
#~ msgstr "Save in folder..."
@@ -23538,9 +23942,6 @@ msgstr "Handle Popup"
#~ msgid "Save the current file and close the window"
#~ msgstr "Save the current file and close the window"
-#~ msgid "Add folder to your list of subscribed folders"
-#~ msgstr "Add folder to your list of subscribed folders"
-
#~ msgid "Refresh List"
#~ msgstr "Refresh List"
@@ -23983,9 +24384,6 @@ msgstr "Handle Popup"
#~ msgid "Emulate label resize"
#~ msgstr "Emulate label resize"
-#~ msgid "_Phone List"
-#~ msgstr "_Phone List"
-
#~ msgid "Organization"
#~ msgstr "Organisation"