aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--po/ChangeLog4
-rw-r--r--po/en_GB.po12429
2 files changed, 6616 insertions, 5817 deletions
diff --git a/po/ChangeLog b/po/ChangeLog
index 6e3e0c63ff..da826c8273 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,7 @@
+2008-02-17 David Lodge <dave@cirt.net>
+
+ * en_GB.po: Updated British English translation
+
2008-02-16 Inaki Larranaga Murgoitio <dooteo@euskalgnu.org>
* eu.po: Updated Basque translation.
diff --git a/po/en_GB.po b/po/en_GB.po
index 9db277cdca..a36e575331 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: evolution gnome-2.8\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-05-15 22:18+0100\n"
-"PO-Revision-Date: 2007-05-15 22:21-0000\n"
+"POT-Creation-Date: 2008-02-17 09:59+0000\n"
+"PO-Revision-Date: 2008-02-17 10:08-0000\n"
"Last-Translator: David Lodge <dave@cirt.net>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -21,30 +21,13 @@ msgstr ""
msgid "evolution addressbook"
msgstr "evolution addressbook"
-#: ../a11y/addressbook/ea-minicard.c:31
-#: ../ui/evolution-message-composer.xml.h:13
-msgid "Open"
-msgstr "Open"
-
-#: ../a11y/addressbook/ea-minicard.c:141
-msgid "Contact List: "
-msgstr "Contact List: "
-
-#: ../a11y/addressbook/ea-minicard.c:142
-msgid "Contact: "
-msgstr "Contact: "
-
-#: ../a11y/addressbook/ea-minicard.c:168
-msgid "evolution minicard"
-msgstr "evolution minicard"
-
#: ../a11y/addressbook/ea-minicard-view.c:33
-#: ../addressbook/gui/component/addressbook-component.c:223
+#: ../addressbook/gui/component/addressbook-component.c:228
msgid "New Contact"
msgstr "New Contact"
#: ../a11y/addressbook/ea-minicard-view.c:34
-#: ../addressbook/gui/component/addressbook-component.c:231
+#: ../addressbook/gui/component/addressbook-component.c:236
msgid "New Contact List"
msgstr "New Contact List"
@@ -55,25 +38,22 @@ msgid_plural "current address book folder %s has %d cards"
msgstr[0] "current address book folder %s has %d card"
msgstr[1] "current address book folder %s has %d cards"
-#: ../a11y/calendar/ea-cal-view.c:302
-msgid "New Appointment"
-msgstr "New Appointment"
-
-#: ../a11y/calendar/ea-cal-view.c:303
-msgid "New All Day Event"
-msgstr "New All Day Event"
+#: ../a11y/addressbook/ea-minicard.c:31
+#: ../ui/evolution-message-composer.xml.h:13
+msgid "Open"
+msgstr "Open"
-#: ../a11y/calendar/ea-cal-view.c:304
-msgid "New Meeting"
-msgstr "New Meeting"
+#: ../a11y/addressbook/ea-minicard.c:141
+msgid "Contact List: "
+msgstr "Contact List: "
-#: ../a11y/calendar/ea-cal-view.c:305
-msgid "Go to Today"
-msgstr "Go to Today"
+#: ../a11y/addressbook/ea-minicard.c:142
+msgid "Contact: "
+msgstr "Contact: "
-#: ../a11y/calendar/ea-cal-view.c:306
-msgid "Go to Date"
-msgstr "Go to Date"
+#: ../a11y/addressbook/ea-minicard.c:168
+msgid "evolution minicard"
+msgstr "evolution minicard"
#: ../a11y/calendar/ea-cal-view-event.c:266
msgid "It has alarms."
@@ -100,10 +80,35 @@ msgstr "Calendar Event: It has no summary."
msgid "calendar view event"
msgstr "calendar view event"
-#: ../a11y/calendar/ea-cal-view-event.c:529
+#: ../a11y/calendar/ea-cal-view-event.c:528
msgid "Grab Focus"
msgstr "Grab Focus"
+#: ../a11y/calendar/ea-cal-view.c:302
+msgid "New Appointment"
+msgstr "New Appointment"
+
+#: ../a11y/calendar/ea-cal-view.c:303
+msgid "New All Day Event"
+msgstr "New All Day Event"
+
+#: ../a11y/calendar/ea-cal-view.c:304
+msgid "New Meeting"
+msgstr "New Meeting"
+
+#: ../a11y/calendar/ea-cal-view.c:305
+msgid "Go to Today"
+msgstr "Go to Today"
+
+#: ../a11y/calendar/ea-cal-view.c:306
+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
+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
@@ -145,13 +150,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-day-view-main-item.c:299
-#: ../a11y/calendar/ea-week-view-main-item.c:301
-msgid "a table to view and select the current time range"
-msgstr "a table to view and select the current time range"
-
#: ../a11y/calendar/ea-gnome-calendar.c:188
-#: ../calendar/gui/calendar-component.c:707
+#: ../calendar/gui/calendar-component.c:747
msgid "%A %d %b %Y"
msgstr "%A %d %b %Y"
@@ -162,9 +162,9 @@ msgstr "%A %d %b %Y"
#. 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:710
-#: ../calendar/gui/e-day-view.c:2106
-#: ../calendar/gui/e-day-view-top-item.c:1315
+#: ../calendar/gui/calendar-component.c:750
+#: ../calendar/gui/e-day-view-top-item.c:1358
+#: ../calendar/gui/e-day-view.c:2158
#: ../calendar/gui/e-week-view-main-item.c:319
#: ../calendar/gui/e-week-view-main-item.c:533
msgid "%a %d %b"
@@ -173,9 +173,9 @@ msgstr "%a %d %b"
#: ../a11y/calendar/ea-gnome-calendar.c:193
#: ../a11y/calendar/ea-gnome-calendar.c:198
#: ../a11y/calendar/ea-gnome-calendar.c:200
-#: ../calendar/gui/calendar-component.c:712
-#: ../calendar/gui/calendar-component.c:717
-#: ../calendar/gui/calendar-component.c:719
+#: ../calendar/gui/calendar-component.c:752
+#: ../calendar/gui/calendar-component.c:757
+#: ../calendar/gui/calendar-component.c:759
msgid "%a %d %b %Y"
msgstr "%a %d %b %Y"
@@ -183,10 +183,10 @@ msgstr "%a %d %b %Y"
#: ../a11y/calendar/ea-gnome-calendar.c:223
#: ../a11y/calendar/ea-gnome-calendar.c:229
#: ../a11y/calendar/ea-gnome-calendar.c:231
-#: ../calendar/gui/calendar-component.c:731
-#: ../calendar/gui/calendar-component.c:738
-#: ../calendar/gui/calendar-component.c:744
-#: ../calendar/gui/calendar-component.c:746
+#: ../calendar/gui/calendar-component.c:771
+#: ../calendar/gui/calendar-component.c:778
+#: ../calendar/gui/calendar-component.c:784
+#: ../calendar/gui/calendar-component.c:786
msgid "%d %b %Y"
msgstr "%d %b %Y"
@@ -196,25 +196,25 @@ msgstr "%d %b %Y"
#. 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:736
-#: ../calendar/gui/e-day-view.c:2122
-#: ../calendar/gui/e-day-view-top-item.c:1319
+#: ../calendar/gui/calendar-component.c:776
+#: ../calendar/gui/e-day-view-top-item.c:1362
+#: ../calendar/gui/e-day-view.c:2174
#: ../calendar/gui/e-week-view-main-item.c:333
#: ../calendar/gui/e-week-view-main-item.c:547
msgid "%d %b"
msgstr "%d %b"
-#: ../a11y/calendar/ea-gnome-calendar.c:248
-#: ../a11y/calendar/ea-gnome-calendar.c:256
+#: ../a11y/calendar/ea-gnome-calendar.c:247
+#: ../a11y/calendar/ea-gnome-calendar.c:255
#: ../calendar/importers/icalendar-importer.c:772
msgid "Gnome Calendar"
msgstr "Gnome Calendar"
-#: ../a11y/calendar/ea-gnome-calendar.c:291
+#: ../a11y/calendar/ea-gnome-calendar.c:290
msgid "search bar"
msgstr "search bar"
-#: ../a11y/calendar/ea-gnome-calendar.c:292
+#: ../a11y/calendar/ea-gnome-calendar.c:291
msgid "evolution calendar search bar"
msgstr "evolution calendar search bar"
@@ -244,10 +244,6 @@ msgstr "calendar view for a month"
msgid "calendar view for one or more weeks"
msgstr "calendar view for one or more weeks"
-#: ../a11y/e-table/gal-a11y-e-cell.c:107
-msgid "Table Cell"
-msgstr "Table Cell"
-
#: ../a11y/e-table/gal-a11y-e-cell-popup.c:124
msgid "popup"
msgstr "popup"
@@ -274,25 +270,29 @@ msgstr "toggle"
msgid "toggle the cell"
msgstr "toggle the cell"
-#: ../a11y/e-table/gal-a11y-e-cell-tree.c:192
+#: ../a11y/e-table/gal-a11y-e-cell-tree.c:194
msgid "expand"
msgstr "expand"
-#: ../a11y/e-table/gal-a11y-e-cell-tree.c:193
+#: ../a11y/e-table/gal-a11y-e-cell-tree.c:195
msgid "expands the row in the ETree containing this cell"
msgstr "expands the row in the ETree containing this cell"
-#: ../a11y/e-table/gal-a11y-e-cell-tree.c:198
+#: ../a11y/e-table/gal-a11y-e-cell-tree.c:200
msgid "collapse"
msgstr "collapse"
-#: ../a11y/e-table/gal-a11y-e-cell-tree.c:199
+#: ../a11y/e-table/gal-a11y-e-cell-tree.c:201
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
+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:574
+#: ../widgets/table/e-table-click-to-add.c:581
msgid "click to add"
msgstr "click to add"
@@ -338,177 +338,186 @@ msgstr "Toggle Attachment Bar"
msgid "activate"
msgstr "activate"
-#: ../addressbook/addressbook.error.xml.h:1
+#. 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."
+msgstr "'{0}' is a read-only address book source. Switch to Contacts View and highlight an address book that can accept contacts."
+
+#: ../addressbook/addressbook.error.xml.h:3
msgid "A contact already exists with this address. Would you like to add a new card with the same address anyway?"
msgstr "A contact already exists with this address. Would you like to add a new card with the same address anyway?"
-#: ../addressbook/addressbook.error.xml.h:2
+#: ../addressbook/addressbook.error.xml.h:4
msgid "Address '{0}' already exists."
msgstr "Address '{0}' already exists."
-#: ../addressbook/addressbook.error.xml.h:3
+#: ../addressbook/addressbook.error.xml.h:5
+msgid "Cannot add new contact"
+msgstr "Cannot add new contact"
+
+#: ../addressbook/addressbook.error.xml.h:6
msgid "Cannot move contact."
msgstr "Cannot move contact."
-#: ../addressbook/addressbook.error.xml.h:4
+#: ../addressbook/addressbook.error.xml.h:7
msgid "Category editor not available."
msgstr "Category editor not available."
-#: ../addressbook/addressbook.error.xml.h:5
+#: ../addressbook/addressbook.error.xml.h:8
msgid "Check to make sure your password is spelled correctly and that you are using a supported login method. Remember that many passwords are case sensitive; your caps lock might be on."
msgstr "Check to make sure your password is spelled correctly and that you are using a supported login method. Remember that many passwords are case sensitive; your caps lock might be on."
-#: ../addressbook/addressbook.error.xml.h:6
+#: ../addressbook/addressbook.error.xml.h:9
msgid "Could not get schema information for LDAP server."
msgstr "Could not get schema information for LDAP server."
-#: ../addressbook/addressbook.error.xml.h:7
+#: ../addressbook/addressbook.error.xml.h:10
msgid "Could not remove addressbook."
msgstr "Could not remove addressbook."
-#: ../addressbook/addressbook.error.xml.h:8
+#: ../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."
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."
-#: ../addressbook/addressbook.error.xml.h:9
+#: ../addressbook/addressbook.error.xml.h:12
msgid "Delete address book '{0}'?"
msgstr "Delete address book '{0}'?"
-#: ../addressbook/addressbook.error.xml.h:10
+#: ../addressbook/addressbook.error.xml.h:13
msgid "Error loading addressbook."
msgstr "Error loading addressbook."
-#: ../addressbook/addressbook.error.xml.h:11
+#: ../addressbook/addressbook.error.xml.h:14
msgid "Error saving {0} to {1}: {2}"
msgstr "Error saving {0} to {1}: {2}"
-#: ../addressbook/addressbook.error.xml.h:12
+#: ../addressbook/addressbook.error.xml.h:15
msgid "Failed to authenticate with LDAP server."
msgstr "Failed to authenticate with LDAP server."
#. Unknown error
-#: ../addressbook/addressbook.error.xml.h:13
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1853
+#: ../addressbook/addressbook.error.xml.h:16
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1716
msgid "Failed to delete contact"
msgstr "Failed to delete contact"
-#: ../addressbook/addressbook.error.xml.h:14
+#: ../addressbook/addressbook.error.xml.h:17
msgid "GroupWise Address book creation:"
msgstr "GroupWise Address book creation:"
-#: ../addressbook/addressbook.error.xml.h:15
+#: ../addressbook/addressbook.error.xml.h:18
msgid "LDAP server did not respond with valid schema information."
msgstr "LDAP server did not respond with valid schema information."
-#: ../addressbook/addressbook.error.xml.h:16
+#: ../addressbook/addressbook.error.xml.h:19
msgid "Permission Denied."
msgstr "Permission Denied."
-#: ../addressbook/addressbook.error.xml.h:17
+#: ../addressbook/addressbook.error.xml.h:20
msgid "Server Version"
msgstr "Server Version"
-#: ../addressbook/addressbook.error.xml.h:18
+#: ../addressbook/addressbook.error.xml.h:21
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:19
+#: ../addressbook/addressbook.error.xml.h:22
msgid "The Evolution addressbook has quit unexpectedly."
msgstr "The Evolution addressbook has quit unexpectedly."
-#: ../addressbook/addressbook.error.xml.h:20
+#: ../addressbook/addressbook.error.xml.h:23
msgid "The image you have selected is large. Do you want to resize and store it?"
msgstr "The image you have selected is large. Do you want to resize and store it?"
# addressbook:ldap-search-base secondary
-#: ../addressbook/addressbook.error.xml.h:21
+#: ../addressbook/addressbook.error.xml.h:24
msgid "This LDAP server may use an older version of LDAP, which does not support this functionality or it may be misconfigured. Ask your administrator for supported search bases."
msgstr "This LDAP server may use an older version of LDAP, which does not support this functionality or it may be misconfigured. Ask your administrator for supported search bases."
-#: ../addressbook/addressbook.error.xml.h:22
+#: ../addressbook/addressbook.error.xml.h:25
msgid "This address book will be removed permanently."
msgstr "This address book will be removed permanently."
-#: ../addressbook/addressbook.error.xml.h:23
+#: ../addressbook/addressbook.error.xml.h:26
msgid "This addressbook could not be opened."
msgstr "This addressbook could not be opened."
-#: ../addressbook/addressbook.error.xml.h:24
+#: ../addressbook/addressbook.error.xml.h:27
msgid "This addressbook server does not have any suggested search bases."
msgstr "This addressbook server does not have any suggested search bases."
-#: ../addressbook/addressbook.error.xml.h:25
+#: ../addressbook/addressbook.error.xml.h:28
msgid "This addressbook 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."
-#: ../addressbook/addressbook.error.xml.h:26
+#: ../addressbook/addressbook.error.xml.h:29
msgid "This server does not support LDAPv3 schema information."
msgstr "This server does not support LDAPv3 schema information."
-#: ../addressbook/addressbook.error.xml.h:27
+#: ../addressbook/addressbook.error.xml.h:30
msgid "Unable to open addressbook"
msgstr "Unable to open addressbook"
-#: ../addressbook/addressbook.error.xml.h:28
+#: ../addressbook/addressbook.error.xml.h:31
msgid "Unable to perform search."
msgstr "Unable to perform search."
-#: ../addressbook/addressbook.error.xml.h:29
+#: ../addressbook/addressbook.error.xml.h:32
msgid "Unable to save {0}."
msgstr "Unable to save {0}."
-#: ../addressbook/addressbook.error.xml.h:30
+#: ../addressbook/addressbook.error.xml.h:33
msgid "Would you like to save your changes?"
msgstr "Would you like to save your changes?"
-#: ../addressbook/addressbook.error.xml.h:31
+#: ../addressbook/addressbook.error.xml.h:34
msgid "You are attempting to move a contact from one addressbook to another but it cannot be removed from the source. Do you want to save a copy instead?"
msgstr "You are attempting to move a contact from one addressbook to another but it cannot be removed from the source. Do you want to save a copy instead?"
-#: ../addressbook/addressbook.error.xml.h:32
+#: ../addressbook/addressbook.error.xml.h:35
msgid "You are connecting to an unsupported GroupWise server and may encounter problems using Evolution. For best results the server should be upgraded to a supported version"
msgstr "You are connecting to an unsupported GroupWise server and may encounter problems using Evolution. For best results the server should be upgraded to a supported version"
-#: ../addressbook/addressbook.error.xml.h:33
+#: ../addressbook/addressbook.error.xml.h:36
msgid "You have made modifications to this contact. Do you want to save these changes?"
msgstr "You have made modifications to this contact. Do you want to save these changes?"
-#: ../addressbook/addressbook.error.xml.h:34
+#: ../addressbook/addressbook.error.xml.h:37
msgid "Your contacts for {0} will not be available until Evolution is restarted."
msgstr "Your contacts for {0} will not be available until Evolution is restarted."
-#: ../addressbook/addressbook.error.xml.h:35
-#: ../mail/em-vfolder-rule.c:510
+#: ../addressbook/addressbook.error.xml.h:38
+#: ../mail/em-vfolder-rule.c:512
#: ../plugins/groupwise-features/junk-settings.glade.h:4
-#: ../plugins/groupwise-features/properties.glade.h:9
-#: ../widgets/table/e-table-config.glade.h:15
+#: ../plugins/groupwise-features/properties.glade.h:10
+#: ../widgets/table/e-table-config.glade.h:18
msgid "_Add"
msgstr "_Add"
-#: ../addressbook/addressbook.error.xml.h:36
+#: ../addressbook/addressbook.error.xml.h:39
msgid "_Discard"
msgstr "_Discard"
-#: ../addressbook/addressbook.error.xml.h:37
+#: ../addressbook/addressbook.error.xml.h:40
msgid "_Do not save"
msgstr "_Do not save"
-#: ../addressbook/addressbook.error.xml.h:38
+#: ../addressbook/addressbook.error.xml.h:41
msgid "_Resize"
msgstr "_Resize"
-#: ../addressbook/addressbook.error.xml.h:39
+#: ../addressbook/addressbook.error.xml.h:42
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."
-#: ../addressbook/addressbook.error.xml.h:41
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:79
+#: ../addressbook/addressbook.error.xml.h:44
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:81
msgid "{0}"
msgstr "{0}"
#. For Translators: {1} is the error status string (eg: "E_BOOK_ERROR_NO_SELF_CONTACT")
-#: ../addressbook/addressbook.error.xml.h:43
+#: ../addressbook/addressbook.error.xml.h:46
msgid "{1}"
msgstr "{1}"
@@ -516,45 +525,88 @@ msgstr "{1}"
msgid "Default Sync Address:"
msgstr "Default Sync Address:"
-#: ../addressbook/conduit/address-conduit.c:1315
-#: ../addressbook/conduit/address-conduit.c:1316
+#: ../addressbook/conduit/address-conduit.c:1319
+#: ../addressbook/conduit/address-conduit.c:1320
msgid "Could not load addressbook"
msgstr "Could not load addressbook"
-#: ../addressbook/conduit/address-conduit.c:1393
-#: ../addressbook/conduit/address-conduit.c:1396
+#: ../addressbook/conduit/address-conduit.c:1397
+#: ../addressbook/conduit/address-conduit.c:1400
msgid "Could not read pilot's Address application block"
msgstr "Could not read pilot's Address application block"
-#: ../addressbook/gui/component/addressbook.c:99
-msgid "Accessing LDAP Server anonymously"
-msgstr "Accessing LDAP Server anonymously"
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
+msgid "Autocompletion"
+msgstr "Autocompletion"
-#: ../addressbook/gui/component/addressbook.c:197
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:511
-msgid "Failed to authenticate.\n"
-msgstr "Failed to authenticate.\n"
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
+msgid "C_ontacts"
+msgstr "C_ontacts"
-#: ../addressbook/gui/component/addressbook.c:204
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:491
-#, c-format
-msgid "Enter password for %s (user %s)"
-msgstr "Enter password for %s (user %s)"
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
+msgid "Certificates"
+msgstr "Certificates"
+
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
+msgid "Configure autocomplete here"
+msgstr "Configure autocomplete here"
+
+#. Create the contacts group
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
+#: ../addressbook/gui/component/addressbook-view.c:1338
+#: ../calendar/gui/calendar-component.c:285
+#: ../calendar/gui/migration.c:402
+#: ../plugins/exchange-operations/exchange-delegates-user.c:83
+#: ../plugins/exchange-operations/exchange-folder.c:581
+msgid "Contacts"
+msgstr "Contacts"
+
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
+msgid "Evolution Address Book"
+msgstr "Evolution Address Book"
+
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
+msgid "Evolution Address Book address pop-up"
+msgstr "Evolution Address Book address pop-up"
+
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
+msgid "Evolution Address Book address viewer"
+msgstr "Evolution Address Book address viewer"
+
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
+msgid "Evolution Address Book card viewer"
+msgstr "Evolution Address Book card viewer"
+
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
+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"
+
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
+msgid "Evolution folder settings configuration control"
+msgstr "Evolution folder settings configuration control"
+
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
+msgid "Manage your S/MIME certificates here"
+msgstr "Manage your S/MIME certificates here"
#. create the local source group
#. On This Computer is always first and Search Folders is always last
-#: ../addressbook/gui/component/addressbook-component.c:139
-#: ../addressbook/gui/component/addressbook-migrate.c:483
-#: ../calendar/gui/calendar-component.c:231
-#: ../calendar/gui/memos-component.c:195
-#: ../calendar/gui/migration.c:476
-#: ../calendar/gui/migration.c:572
-#: ../calendar/gui/migration.c:1080
-#: ../calendar/gui/tasks-component.c:191
-#: ../mail/em-folder-tree-model.c:199
-#: ../mail/em-folder-tree-model.c:201
-#: ../mail/mail-component.c:300
-#: ../mail/mail-vfolder.c:223
+#: ../addressbook/gui/component/addressbook-component.c:144
+#: ../addressbook/gui/component/addressbook-migrate.c:497
+#: ../calendar/gui/calendar-component.c:237
+#: ../calendar/gui/memos-component.c:200
+#: ../calendar/gui/migration.c:481
+#: ../calendar/gui/migration.c:582
+#: ../calendar/gui/migration.c:1095
+#: ../calendar/gui/tasks-component.c:196
+#: ../mail/em-folder-tree-model.c:200
+#: ../mail/em-folder-tree-model.c:202
+#: ../mail/mail-component.c:305
+#: ../mail/mail-vfolder.c:216
msgid "On This Computer"
msgstr "On This Computer"
@@ -563,145 +615,142 @@ msgstr "On This Computer"
#. Create the default Person task list
#. Create the default Person addressbook
#. orange
-#: ../addressbook/gui/component/addressbook-component.c:147
-#: ../addressbook/gui/component/addressbook-migrate.c:491
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:19
-#: ../addressbook/gui/widgets/eab-contact-display.c:597
-#: ../calendar/gui/calendar-component.c:241
-#: ../calendar/gui/memos-component.c:203
-#: ../calendar/gui/migration.c:486
-#: ../calendar/gui/migration.c:580
-#: ../calendar/gui/migration.c:1088
-#: ../calendar/gui/tasks-component.c:199
-#: ../filter/filter-label.c:122
-#: ../mail/em-migrate.c:1055
-#: ../mail/mail-config.glade.h:104
+#: ../addressbook/gui/component/addressbook-component.c:152
+#: ../addressbook/gui/component/addressbook-migrate.c:505
+#: ../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:491
+#: ../calendar/gui/migration.c:590
+#: ../calendar/gui/migration.c:1103
+#: ../calendar/gui/tasks-component.c:205
+#: ../mail/em-migrate.c:1056
msgid "Personal"
msgstr "Personal"
#. Create the LDAP source group
-#: ../addressbook/gui/component/addressbook-component.c:157
-#: ../addressbook/gui/component/addressbook-migrate.c:501
+#: ../addressbook/gui/component/addressbook-component.c:162
+#: ../addressbook/gui/component/addressbook-migrate.c:515
msgid "On LDAP Servers"
msgstr "On LDAP Servers"
-#: ../addressbook/gui/component/addressbook-component.c:224
+#: ../addressbook/gui/component/addressbook-component.c:229
msgid "_Contact"
msgstr "_Contact"
-#: ../addressbook/gui/component/addressbook-component.c:225
+#: ../addressbook/gui/component/addressbook-component.c:230
msgid "Create a new contact"
msgstr "Create a new contact"
-#: ../addressbook/gui/component/addressbook-component.c:232
+#: ../addressbook/gui/component/addressbook-component.c:237
msgid "Contact _List"
msgstr "Contact _List"
-#: ../addressbook/gui/component/addressbook-component.c:233
+#: ../addressbook/gui/component/addressbook-component.c:238
msgid "Create a new contact list"
msgstr "Create a new contact list"
-#: ../addressbook/gui/component/addressbook-component.c:239
-#: ../addressbook/gui/component/addressbook-config.c:1208
+#: ../addressbook/gui/component/addressbook-component.c:244
+#: ../addressbook/gui/component/addressbook-config.c:1206
msgid "New Address Book"
msgstr "New Address Book"
-#: ../addressbook/gui/component/addressbook-component.c:240
+#: ../addressbook/gui/component/addressbook-component.c:245
msgid "Address _Book"
msgstr "Address _Book"
-#: ../addressbook/gui/component/addressbook-component.c:241
+#: ../addressbook/gui/component/addressbook-component.c:246
msgid "Create a new address book"
msgstr "Create a new address book"
-#: ../addressbook/gui/component/addressbook-component.c:404
+#: ../addressbook/gui/component/addressbook-component.c:409
msgid "Failed upgrading Address Book settings or folders."
msgstr "Failed upgrading Address Book settings or folders."
-#: ../addressbook/gui/component/addressbook-config.c:332
+#: ../addressbook/gui/component/addressbook-config.c:329
msgid "Base"
msgstr "Base"
-#: ../addressbook/gui/component/addressbook-config.c:533
+#: ../addressbook/gui/component/addressbook-config.c:530
#: ../calendar/gui/dialogs/calendar-setup.c:172
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:9
msgid "_Type:"
msgstr "_Type:"
-#: ../addressbook/gui/component/addressbook-config.c:635
-msgid "Copy book content locally for offline operation"
-msgstr "Copy book content locally for offline operation"
+#: ../addressbook/gui/component/addressbook-config.c:632
+msgid "Copy _book content locally for offline operation"
+msgstr "Copy _book content locally for offline operation"
-#: ../addressbook/gui/component/addressbook-config.c:984
+#: ../addressbook/gui/component/addressbook-config.c:981
#: ../addressbook/gui/component/ldap-config.glade.h:22
-#: ../calendar/gui/dialogs/calendar-setup.c:365
-#: ../calendar/gui/dialogs/calendar-setup.c:376
-#: ../calendar/gui/dialogs/calendar-setup.c:387
#: ../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:222
-#: ../mail/mail-config.glade.h:85
-#: ../plugins/itip-formatter/itip-formatter.c:2087
+#: ../mail/mail-config.glade.h:89
+#: ../plugins/itip-formatter/itip-formatter.c:2338
#: ../smime/gui/smime-ui.glade.h:28
msgid "General"
msgstr "General"
-#: ../addressbook/gui/component/addressbook-config.c:985
-#: ../addressbook/gui/widgets/e-addressbook-view.c:564
-#: ../mail/importers/pine-importer.c:392
+#: ../addressbook/gui/component/addressbook-config.c:982
+#: ../addressbook/gui/widgets/e-addressbook-view.c:557
+#: ../mail/importers/pine-importer.c:387
msgid "Address Book"
msgstr "Address Book"
-#: ../addressbook/gui/component/addressbook-config.c:989
+#: ../addressbook/gui/component/addressbook-config.c:986
msgid "Server Information"
msgstr "Server Information"
-#: ../addressbook/gui/component/addressbook-config.c:991
+#: ../addressbook/gui/component/addressbook-config.c:988
msgid "Authentication"
msgstr "Authentication"
-#: ../addressbook/gui/component/addressbook-config.c:994
+#: ../addressbook/gui/component/addressbook-config.c:991
#: ../addressbook/gui/component/ldap-config.glade.h:17
#: ../mail/mail-dialogs.glade.h:10
#: ../smime/gui/smime-ui.glade.h:20
msgid "Details"
msgstr "Details"
-#: ../addressbook/gui/component/addressbook-config.c:995
-#: ../mail/em-folder-browser.c:853
+#: ../addressbook/gui/component/addressbook-config.c:992
+#: ../mail/em-folder-browser.c:935
msgid "Searching"
msgstr "Searching"
-#: ../addressbook/gui/component/addressbook-config.c:997
+#: ../addressbook/gui/component/addressbook-config.c:994
msgid "Downloading"
msgstr "Downloading"
-#: ../addressbook/gui/component/addressbook-config.c:1206
+#: ../addressbook/gui/component/addressbook-config.c:1204
#: ../addressbook/gui/component/ldap-config.glade.h:13
msgid "Address Book Properties"
msgstr "Address Book Properties"
#: ../addressbook/gui/component/addressbook-migrate.c:73
#: ../calendar/gui/migration.c:155
-#: ../mail/em-migrate.c:1202
+#: ../mail/em-migrate.c:1203
msgid "Migrating..."
msgstr "Migrating..."
#: ../addressbook/gui/component/addressbook-migrate.c:125
#: ../calendar/gui/migration.c:202
-#: ../mail/em-migrate.c:1243
+#: ../mail/em-migrate.c:1244
#, c-format
msgid "Migrating `%s':"
msgstr "Migrating `%s':"
-#: ../addressbook/gui/component/addressbook-migrate.c:629
+#: ../addressbook/gui/component/addressbook-migrate.c:643
msgid "LDAP Servers"
msgstr "LDAP Servers"
-#: ../addressbook/gui/component/addressbook-migrate.c:744
+#: ../addressbook/gui/component/addressbook-migrate.c:758
msgid "Autocompletion Settings"
msgstr "Autocompletion Settings"
-#: ../addressbook/gui/component/addressbook-migrate.c:1119
+#: ../addressbook/gui/component/addressbook-migrate.c:1134
msgid ""
"The location and hierarchy of the Evolution contact folders has changed since Evolution 1.x.\n"
"\n"
@@ -711,7 +760,7 @@ msgstr ""
"\n"
"Please be patient while Evolution migrates your folders..."
-#: ../addressbook/gui/component/addressbook-migrate.c:1133
+#: ../addressbook/gui/component/addressbook-migrate.c:1148
msgid ""
"The format of mailing list contacts has changed.\n"
"\n"
@@ -721,7 +770,7 @@ msgstr ""
"\n"
"Please be patient while Evolution migrates your folders..."
-#: ../addressbook/gui/component/addressbook-migrate.c:1142
+#: ../addressbook/gui/component/addressbook-migrate.c:1157
msgid ""
"The way Evolution stores some phone numbers has changed.\n"
"\n"
@@ -731,7 +780,7 @@ msgstr ""
"\n"
"Please be patient while Evolution migrates your folders..."
-#: ../addressbook/gui/component/addressbook-migrate.c:1152
+#: ../addressbook/gui/component/addressbook-migrate.c:1167
msgid ""
"Evolution's Palm Sync changelog and map files have changed.\n"
"\n"
@@ -757,146 +806,103 @@ msgstr "Rename Folder"
msgid "Folder names cannot contain '/'"
msgstr "Folder names cannot contain '/'"
-#: ../addressbook/gui/component/addressbook-view.c:445
-msgid "A Folder with this name already exists"
-msgstr "A Folder with this name already exists"
-
-#: ../addressbook/gui/component/addressbook-view.c:956
+#: ../addressbook/gui/component/addressbook-view.c:954
msgid "_New Address Book"
msgstr "_New Address Book"
-#. FIXME: need to disable for undeletable folders
-#: ../addressbook/gui/component/addressbook-view.c:957
-#: ../addressbook/gui/widgets/e-addressbook-view.c:978
-#: ../calendar/gui/calendar-component.c:584
-#: ../calendar/gui/e-calendar-table.c:1303
-#: ../calendar/gui/e-calendar-view.c:1701
-#: ../calendar/gui/e-memo-table.c:919
-#: ../calendar/gui/memos-component.c:453
-#: ../calendar/gui/tasks-component.c:444
-#: ../mail/em-folder-tree.c:2120
-#: ../mail/em-folder-view.c:1151
+#: ../addressbook/gui/component/addressbook-view.c:955
+msgid "Save As vCard..."
+msgstr "Save As vCard..."
+
+#: ../addressbook/gui/component/addressbook-view.c:958
+#: ../addressbook/gui/widgets/e-addressbook-view.c:957
+#: ../calendar/gui/calendar-component.c:609
+#: ../calendar/gui/e-calendar-table.c:1384
+#: ../calendar/gui/e-calendar-view.c:1699
+#: ../calendar/gui/e-memo-table.c:938
+#: ../calendar/gui/memos-component.c:468
+#: ../calendar/gui/tasks-component.c:459
+#: ../mail/em-folder-tree.c:2107
+#: ../mail/em-folder-view.c:1345
#: ../ui/evolution-addressbook.xml.h:49
#: ../ui/evolution-calendar.xml.h:40
-#: ../ui/evolution-mail-list.xml.h:32
+#: ../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:959
-msgid "Save As Vcard..."
-msgstr "Save As Vcard..."
-
#: ../addressbook/gui/component/addressbook-view.c:961
-#: ../calendar/gui/calendar-component.c:585
-#: ../calendar/gui/memos-component.c:454
-#: ../calendar/gui/tasks-component.c:445
msgid "_Properties..."
msgstr "_Properties..."
-#. Create the contacts group
-#: ../addressbook/gui/component/addressbook-view.c:1338
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-#: ../calendar/gui/calendar-component.c:272
-#: ../calendar/gui/migration.c:402
-#: ../plugins/exchange-operations/exchange-folder.c:581
-msgid "Contacts"
-msgstr "Contacts"
-
#: ../addressbook/gui/component/addressbook-view.c:1349
msgid "Contact Source Selector"
msgstr "Contact Source Selector"
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:1
+#: ../addressbook/gui/component/addressbook.c:99
+msgid "Accessing LDAP Server anonymously"
+msgstr "Accessing LDAP Server anonymously"
+
+#: ../addressbook/gui/component/addressbook.c:200
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:511
+msgid "Failed to authenticate.\n"
+msgstr "Failed to authenticate.\n"
+
+#: ../addressbook/gui/component/addressbook.c:207
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:491
+#, c-format
+msgid "Enter password for %s (user %s)"
+msgstr "Enter password for %s (user %s)"
+
+#: ../addressbook/gui/component/addressbook.c:215
+#: ../calendar/common/authentication.c:50
+#: ../plugins/publish-calendar/publish-calendar.c:93
+#: ../smime/gui/component.c:50
+msgid "Enter password"
+msgstr "Enter password"
+
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:1
msgid "Autocomplete length"
msgstr "Autocomplete length"
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:2
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:2
msgid "EFolderList XML for the list of completion URIs"
msgstr "EFolderList XML for the list of completion URIs"
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:3
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:3
msgid "EFolderList XML for the list of completion URIs."
msgstr "EFolderList XML for the list of completion URIs."
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:4
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:4
msgid "Position of the vertical pane, between the card and list views and the preview pane, in pixels."
msgstr "Position of the vertical pane, between the card and list views and the preview pane, in pixels."
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:5
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:5
msgid "Show preview pane"
msgstr "Show preview pane"
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:6
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:6
msgid "The number of characters that must be typed before Evolution will attempt to autocomplete."
msgstr "The number of characters that must be typed before Evolution will attempt to autocomplete."
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:7
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:7
msgid "URI for the folder last used in the select names dialog"
msgstr "URI for the folder last used in the select names dialogue"
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:8
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:8
msgid "URI for the folder last used in the select names dialog."
msgstr "URI for the folder last used in the select names dialogue."
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:9
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:70
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:9
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:70
msgid "Vertical pane position"
msgstr "Vertical pane position"
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:10
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:10
msgid "Whether to show the preview pane."
msgstr "Whether to show the preview pane."
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
-msgid "Autocompletion"
-msgstr "Autocompletion"
-
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
-msgid "C_ontacts"
-msgstr "C_ontacts"
-
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
-msgid "Certificates"
-msgstr "Certificates"
-
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
-msgid "Configure autocomplete here"
-msgstr "Configure autocomplete here"
-
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
-msgid "Evolution Address Book"
-msgstr "Evolution Address Book"
-
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
-msgid "Evolution Address Book address pop-up"
-msgstr "Evolution Address Book address pop-up"
-
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
-msgid "Evolution Address Book address viewer"
-msgstr "Evolution Address Book address viewer"
-
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
-msgid "Evolution Address Book card viewer"
-msgstr "Evolution Address Book card viewer"
-
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
-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"
-
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
-msgid "Evolution folder settings configuration control"
-msgstr "Evolution folder settings configuration control"
-
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
-msgid "Manage your S/MIME certificates here"
-msgstr "Manage your S/MIME certificates here"
-
#: ../addressbook/gui/component/ldap-config.glade.h:1
msgid "1"
msgstr "1"
@@ -918,7 +924,6 @@ msgid "636"
msgstr "636"
#: ../addressbook/gui/component/ldap-config.glade.h:6
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:1
msgid "<b>Authentication</b>"
msgstr "<b>Authentication</b>"
@@ -1108,9 +1113,9 @@ msgid "_Login method:"
msgstr "_Login method:"
#: ../addressbook/gui/component/ldap-config.glade.h:53
-#: ../calendar/gui/dialogs/calendar-setup.c:225
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:7
+#: ../calendar/gui/dialogs/calendar-setup.c:229
#: ../mail/mail-config.glade.h:164
+#: ../plugins/groupwise-features/properties.glade.h:11
#: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:2
msgid "_Name:"
msgstr "_Name:"
@@ -1124,7 +1129,7 @@ msgid "_Search scope:"
msgstr "_Search scope:"
#: ../addressbook/gui/component/ldap-config.glade.h:56
-#: ../mail/mail-config.glade.h:171
+#: ../mail/mail-config.glade.h:172
#: ../plugins/publish-calendar/publish-calendar.glade.h:26
msgid "_Server:"
msgstr "_Server:"
@@ -1144,12 +1149,11 @@ msgstr "cards"
#: ../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/calendar-setup.glade.h:13
#: ../calendar/gui/dialogs/event-page.glade.h:20
#: ../filter/filter.glade.h:17
-#: ../mail/em-account-editor.c:2054
-#: ../plugins/calendar-http/calendar-http.c:286
-#: ../plugins/calendar-weather/calendar-weather.c:563
+#: ../plugins/calendar-http/calendar-http.c:288
+#: ../plugins/calendar-weather/calendar-weather.c:561
+#: ../plugins/google-account-setup/google-source.c:395
msgid "minutes"
msgstr "minutes"
@@ -1190,99 +1194,99 @@ 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:185
-#: ../addressbook/gui/widgets/eab-contact-display.c:551
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:184
+#: ../addressbook/gui/widgets/eab-contact-display.c:614
msgid "AIM"
msgstr "AIM"
#: ../addressbook/gui/contact-editor/contact-editor.glade.h:11
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:274
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:174
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.etspec.h:1
+#: ../calendar/gui/dialogs/event-page.glade.h:6
+#: ../calendar/gui/dialogs/memo-page.glade.h:1
+msgid "Ca_tegories..."
+msgstr "Ca_tegories..."
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:12
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:273
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1156
#: ../addressbook/gui/widgets/e-minicard.c:194
msgid "Contact"
msgstr "Contact"
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:12
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:551
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:566
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2419
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:13
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:550
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:565
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2430
msgid "Contact Editor"
msgstr "Contact Editor"
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:13
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:14
msgid "Full _Name..."
msgstr "Full _Name..."
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:14
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:15
msgid "Image"
msgstr "Image"
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:15
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:16
#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:68
msgid "MSN Messenger"
msgstr "MSN Messenger"
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:16
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:17
msgid "Mailing Address"
msgstr "Mailing Address"
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:17
-msgid "Ni_ckname:"
-msgstr "Ni_ckname:"
-
#: ../addressbook/gui/contact-editor/contact-editor.glade.h:18
+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
msgid "Novell Groupwise"
msgstr "Novell Groupwise"
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:20
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:21
msgid "Personal Information"
msgstr "Personal Information"
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:21
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:22
msgid "Telephone"
msgstr "Telephone"
#. red
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:22
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:203
+#: ../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:202
#: ../addressbook/gui/widgets/eab-contact-display.c:57
-#: ../addressbook/gui/widgets/eab-contact-display.c:580
-#: ../filter/filter-label.c:121
-#: ../mail/em-migrate.c:1054
-#: ../mail/mail-config.glade.h:153
+#: ../addressbook/gui/widgets/eab-contact-display.c:643
+#: ../mail/em-migrate.c:1055
msgid "Work"
msgstr "Work"
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:23
-msgid "_Address: "
-msgstr "_Address: "
-
#: ../addressbook/gui/contact-editor/contact-editor.glade.h:24
+#: ../addressbook/gui/contact-editor/fulladdr.glade.h:5
+msgid "_Address:"
+msgstr "_Address:"
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:25
msgid "_Anniversary:"
msgstr "_Anniversary:"
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:25
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:26
msgid "_Assistant:"
msgstr "_Assistant:"
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:26
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:27
msgid "_Birthday:"
msgstr "_Birthday:"
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:27
-#: ../calendar/gui/dialogs/event-page.c:879
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:28
+#: ../calendar/gui/dialogs/event-page.c:899
#: ../calendar/gui/dialogs/event-page.glade.h:15
-#: ../plugins/itip-formatter/itip-view.c:1716
+#: ../plugins/itip-formatter/itip-view.c:1850
msgid "_Calendar:"
msgstr "_Calendar:"
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:28
-msgid "_Categories..."
-msgstr "_Categories..."
-
#: ../addressbook/gui/contact-editor/contact-editor.glade.h:29
msgid "_City:"
msgstr "_City:"
@@ -1359,7 +1363,7 @@ msgid "_Web Log:"
msgstr "_Web Log:"
#: ../addressbook/gui/contact-editor/contact-editor.glade.h:47
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:12
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
msgid "_Where:"
msgstr "_Where:"
@@ -1367,63 +1371,27 @@ msgstr "_Where:"
msgid "_Zip/Postal Code:"
msgstr "_Zip/Postal Code:"
-#: ../addressbook/gui/contact-editor/eab-editor.c:322
-#, c-format
-msgid ""
-"Are you sure you want\n"
-"to delete contact list (%s)?"
-msgstr ""
-"Are you sure you want\n"
-"to delete contact list (%s)?"
-
-#: ../addressbook/gui/contact-editor/eab-editor.c:325
-msgid ""
-"Are you sure you want\n"
-"to delete these contact lists?"
-msgstr ""
-"Are you sure you want\n"
-"to delete these contact lists?"
-
-#: ../addressbook/gui/contact-editor/eab-editor.c:330
-#, c-format
-msgid ""
-"Are you sure you want\n"
-"to delete contact (%s)?"
-msgstr ""
-"Are you sure you want\n"
-"to delete contact (%s)?"
-
-#: ../addressbook/gui/contact-editor/eab-editor.c:333
-msgid ""
-"Are you sure you want\n"
-"to delete these contacts?"
-msgstr ""
-"Are you sure you want\n"
-"to delete these contacts?"
-
#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:97
-#: ../addressbook/gui/widgets/eab-contact-display.c:577
-#: ../addressbook/gui/widgets/eab-contact-display.c:592
+#: ../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.c:302
#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:96
#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:144
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:188
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:301
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1176
#: ../addressbook/gui/widgets/e-addressbook-model.c:312
#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:397
-#: ../addressbook/gui/widgets/e-minicard.c:187
#: ../addressbook/gui/widgets/e-minicard-label.c:164
-#: ../addressbook/gui/widgets/e-minicard-view.c:522
#: ../addressbook/gui/widgets/e-minicard-view-widget.c:121
-#: ../widgets/menus/gal-define-views-model.c:181
-#: ../widgets/table/e-cell-text.c:1830
-#: ../widgets/text/e-entry.c:1263
-#: ../widgets/text/e-entry.c:1264
-#: ../widgets/text/e-text.c:3625
-#: ../widgets/text/e-text.c:3626
+#: ../addressbook/gui/widgets/e-minicard-view.c:522
+#: ../addressbook/gui/widgets/e-minicard.c:187
+#: ../widgets/menus/gal-define-views-model.c:179
+#: ../widgets/table/e-cell-text.c:1835
+#: ../widgets/text/e-text.c:3686
+#: ../widgets/text/e-text.c:3687
msgid "Editable"
msgstr "Editable"
@@ -2395,89 +2363,129 @@ msgstr "Zambia"
msgid "Zimbabwe"
msgstr "Zimbabwe"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:186
+#: ../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
+msgid "Name"
+msgstr "Name"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:63
+msgid "AOL Instant Messenger"
+msgstr "AOL Instant Messenger"
+
#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:65
-#: ../addressbook/gui/widgets/eab-contact-display.c:554
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:185
+#: ../addressbook/gui/widgets/eab-contact-display.c:617
msgid "Jabber"
msgstr "Jabber"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:187
-#: ../addressbook/gui/widgets/eab-contact-display.c:556
-msgid "Yahoo"
-msgstr "Yahoo"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:188
-#: ../addressbook/gui/widgets/eab-contact-display.c:557
-msgid "Gadu-Gadu"
-msgstr "Gadu-Gadu"
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:66
+msgid "Yahoo Messenger"
+msgstr "Yahoo Messenger"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:189
-#: ../addressbook/gui/widgets/eab-contact-display.c:555
-msgid "MSN"
-msgstr "MSN"
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:67
+msgid "Gadu-Gadu Messenger"
+msgstr "Gadu-Gadu Messenger"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:190
#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:69
-#: ../addressbook/gui/widgets/eab-contact-display.c:553
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:189
+#: ../addressbook/gui/widgets/eab-contact-display.c:616
msgid "ICQ"
msgstr "ICQ"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:191
-#: ../addressbook/gui/widgets/eab-contact-display.c:552
-msgid "GroupWise"
-msgstr "GroupWise"
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:121
+msgid "Service"
+msgstr "Service"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:130
+#: ../calendar/gui/e-cal-list-view.etspec.h:3
+#: ../mail/message-list.etspec.h:9
+#: ../plugins/publish-calendar/publish-calendar.c:514
+#: ../plugins/save-calendar/csv-format.c:396
+msgid "Location"
+msgstr "Location"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:137
+msgid "Username"
+msgstr "Username"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:204
#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:234
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:203
#: ../addressbook/gui/widgets/eab-contact-display.c:58
msgid "Home"
msgstr "Home"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:205
#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:242
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:204
#: ../addressbook/gui/widgets/eab-contact-display.c:59
msgid "Other"
msgstr "Other"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:260
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:186
+#: ../addressbook/gui/widgets/eab-contact-display.c:619
+msgid "Yahoo"
+msgstr "Yahoo"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:187
+#: ../addressbook/gui/widgets/eab-contact-display.c:620
+msgid "Gadu-Gadu"
+msgstr "Gadu-Gadu"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:188
+#: ../addressbook/gui/widgets/eab-contact-display.c:618
+msgid "MSN"
+msgstr "MSN"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:190
+#: ../addressbook/gui/widgets/eab-contact-display.c:615
+msgid "GroupWise"
+msgstr "GroupWise"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:259
msgid "Source Book"
msgstr "Source Book"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:267
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:266
msgid "Target Book"
msgstr "Target Book"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:281
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:280
msgid "Is New Contact"
msgstr "Is New Contact"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:288
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:287
msgid "Writable Fields"
msgstr "Writable Fields"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:295
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:294
msgid "Required Fields"
msgstr "Required Fields"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:309
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:308
msgid "Changed"
msgstr "Changed"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:561
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2414
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:560
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2425
#, c-format
msgid "Contact Editor - %s"
msgstr "Contact Editor - %s"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2794
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2821
msgid "Please select an image for this contact"
msgstr "Please select an image for this contact"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2795
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2822
msgid "_No image"
msgstr "_No image"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3096
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3095
msgid ""
"The contact data is invalid:\n"
"\n"
@@ -2485,83 +2493,80 @@ msgstr ""
"The contact data is invalid:\n"
"\n"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3100
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3099
#, c-format
msgid "'%s' has an invalid format"
msgstr "'%s' has an invalid format"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3107
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3106
#, c-format
msgid "%s'%s' has an invalid format"
msgstr "%s'%s' has an invalid format"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3122
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3133
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3121
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3132
#, c-format
msgid "%s'%s' is empty"
msgstr "%s'%s' is empty"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3148
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3147
msgid "Invalid contact."
msgstr "Invalid contact."
-#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:90
-#: ../plugins/exchange-operations/exchange-delegates.c:934
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:721
-#: ../plugins/plugin-manager/plugin-manager.c:52
-#: ../plugins/save-attachments/save-attachments.c:366
-#: ../widgets/menus/gal-view-new-dialog.c:73
-msgid "Name"
-msgstr "Name"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:63
-msgid "AOL Instant Messenger"
-msgstr "AOL Instant Messenger"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:66
-msgid "Yahoo Messenger"
-msgstr "Yahoo Messenger"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:67
-msgid "Gadu-Gadu Messenger"
-msgstr "Gadu-Gadu Messenger"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:121
-msgid "Service"
-msgstr "Service"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:130
-#: ../calendar/gui/e-cal-list-view.etspec.h:3
-#: ../mail/message-list.etspec.h:8
-#: ../plugins/publish-calendar/publish-calendar.c:497
-#: ../plugins/save-calendar/csv-format.c:400
-msgid "Location"
-msgstr "Location"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:137
-msgid "Username"
-msgstr "Username"
-
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:292
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:322
msgid "Contact Quick-Add"
msgstr "Contact Quick-Add"
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:295
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:325
msgid "_Edit Full"
msgstr "_Edit Full"
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:336
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:394
msgid "_Full name"
msgstr "_Full name"
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:347
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:405
msgid "E_mail"
msgstr "E_mail"
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:358
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:416
msgid "_Select Address Book"
msgstr "_Select Address Book"
+#: ../addressbook/gui/contact-editor/eab-editor.c:322
+#, c-format
+msgid ""
+"Are you sure you want\n"
+"to delete contact list (%s)?"
+msgstr ""
+"Are you sure you want\n"
+"to delete contact list (%s)?"
+
+#: ../addressbook/gui/contact-editor/eab-editor.c:325
+msgid ""
+"Are you sure you want\n"
+"to delete these contact lists?"
+msgstr ""
+"Are you sure you want\n"
+"to delete these contact lists?"
+
+#: ../addressbook/gui/contact-editor/eab-editor.c:330
+#, c-format
+msgid ""
+"Are you sure you want\n"
+"to delete contact (%s)?"
+msgstr ""
+"Are you sure you want\n"
+"to delete contact (%s)?"
+
+#: ../addressbook/gui/contact-editor/eab-editor.c:333
+msgid ""
+"Are you sure you want\n"
+"to delete these contacts?"
+msgstr ""
+"Are you sure you want\n"
+"to delete these contacts?"
+
#: ../addressbook/gui/contact-editor/fulladdr.glade.h:1
msgid "Address _2:"
msgstr "Address _2:"
@@ -2578,10 +2583,6 @@ msgstr "Countr_y:"
msgid "Full Address"
msgstr "Full Address"
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:5
-msgid "_Address:"
-msgstr "_Address:"
-
#: ../addressbook/gui/contact-editor/fulladdr.glade.h:8
msgid "_ZIP Code:"
msgstr "Post _Code:"
@@ -2672,67 +2673,51 @@ msgid "_Location:"
msgstr "_Location:"
#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:1
-msgid "\n"
-msgstr "\n"
+msgid "<b>Members</b>"
+msgstr "<b>Members</b>"
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
-msgid "Add an email to the List"
-msgstr "Add an email to the List"
-
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:938
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:2
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:666
msgid "Contact List Editor"
msgstr "Contact List Editor"
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5
-msgid "Insert email addresses from Address Book"
-msgstr "Insert email addresses from Address Book"
-
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
-msgid "Members"
-msgstr "Members"
-
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
-msgid "Remove an email address from the List"
-msgstr "Remove an email address from the List"
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
+msgid "Select..."
+msgstr "Select..."
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
msgid "_Hide addresses when sending mail to this list"
msgstr "_Hide addresses when sending mail to this list"
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:9
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5
msgid "_List name:"
msgstr "_List name:"
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:10
-msgid "_Select"
-msgstr "_Select"
-
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:11
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
msgid "_Type an email address or drag a contact into the list below:"
msgstr "_Type an email address or drag a contact into the list below:"
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:167
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:759
+msgid "Contact List Members"
+msgstr "Contact List Members"
+
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1146
#: ../addressbook/gui/widgets/e-addressbook-model.c:298
#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:383
-#: ../addressbook/gui/widgets/e-addressbook-view.c:224
-#: ../addressbook/gui/widgets/e-minicard-view.c:508
+#: ../addressbook/gui/widgets/e-addressbook-view.c:217
#: ../addressbook/gui/widgets/e-minicard-view-widget.c:107
+#: ../addressbook/gui/widgets/e-minicard-view.c:508
msgid "Book"
msgstr "Book"
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:181
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1166
msgid "Is New List"
msgstr "Is New List"
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:759
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1237
msgid "_Members"
msgstr "_Members"
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:762
-msgid "Contact List Members"
-msgstr "Contact List Members"
-
#: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:1
msgid "Changed Contact:"
msgstr "Changed Contact:"
@@ -2747,12 +2732,8 @@ msgid "Duplicate Contact Detected"
msgstr "Duplicate Contact Detected"
#: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:4
-msgid ""
-"The changed email or name of this contact already\n"
-"exists in this folder. Would you like to add it anyway?"
-msgstr ""
-"The changed email or name of this contact already\n"
-"exists in this folder. Would you like to add it anyway?"
+msgid "The name or email of this contact already exists in this folder. Would you like to add it anyway?"
+msgstr "The name or email of this contact already exists in this folder. Would you like to add it anyway?"
#: ../addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:2
msgid "New Contact:"
@@ -2770,482 +2751,44 @@ msgstr ""
"The name or email address of this contact already exists\n"
"in this folder. Would you like to add it anyway?"
-#: ../addressbook/gui/merging/eab-contact-merging.c:189
+#: ../addressbook/gui/merging/eab-contact-merging.c:190
msgid "Merge Contact"
msgstr "Merge Contact"
-#: ../addressbook/gui/merging/eab-contact-merging.c:204
-msgid "Merge"
-msgstr "Merge"
+#: ../addressbook/gui/merging/eab-contact-merging.c:205
+msgid "_Merge"
+msgstr "_Merge"
-#: ../addressbook/gui/merging/eab-contact-merging.c:257
-#: ../addressbook/gui/widgets/eab-contact-display.c:535
-#: ../addressbook/gui/widgets/eab-contact-display.c:537
-#: ../addressbook/gui/widgets/eab-contact-display.c:780
+#: ../addressbook/gui/merging/eab-contact-merging.c:258
#: ../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:860
#: ../plugins/groupwise-features/junk-settings.c:425
#: ../smime/lib/e-cert.c:827
msgid "Email"
msgstr "Email"
#: ../addressbook/gui/widgets/addresstypes.xml.h:1
-#: ../addressbook/gui/widgets/e-addressbook-view.c:172
-#: ../calendar/gui/cal-search-bar.c:60
+#: ../addressbook/gui/widgets/e-addressbook-view.c:165
+#: ../calendar/gui/cal-search-bar.c:78
+#: ../calendar/gui/caltypes.xml.h:1
+#: ../calendar/gui/memotypes.xml.h:1
+#: ../calendar/gui/tasktypes.xml.h:1
msgid "Any field contains"
msgstr "Any field contains"
#: ../addressbook/gui/widgets/addresstypes.xml.h:2
-#: ../addressbook/gui/widgets/e-addressbook-view.c:171
+#: ../addressbook/gui/widgets/e-addressbook-view.c:164
msgid "Email begins with"
msgstr "Email begins with"
#: ../addressbook/gui/widgets/addresstypes.xml.h:3
-#: ../addressbook/gui/widgets/e-addressbook-view.c:170
+#: ../addressbook/gui/widgets/e-addressbook-view.c:163
msgid "Name begins with"
msgstr "Name begins with"
-#: ../addressbook/gui/widgets/eab-contact-display.c:172
-#: ../mail/em-popup.c:625
-msgid "_Open Link in Browser"
-msgstr "_Open Link in Browser"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:173
-#: ../mail/em-folder-view.c:2548
-msgid "_Copy Link Location"
-msgstr "_Copy Link Location"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:174
-#: ../mail/em-popup.c:626
-msgid "_Send New Message To..."
-msgstr "_Send New Message To..."
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:175
-#: ../plugins/copy-tool/org-gnome-copy-tool.eplug.xml.h:2
-msgid "Copy _Email Address"
-msgstr "Copy _Email Address"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:296
-#: ../addressbook/gui/widgets/eab-contact-display.c:359
-msgid "(map)"
-msgstr "(map)"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:306
-#: ../addressbook/gui/widgets/eab-contact-display.c:372
-msgid "map"
-msgstr "map"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:456
-#: ../addressbook/gui/widgets/eab-contact-display.c:758
-msgid "List Members"
-msgstr "List Members"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:545
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-msgid "Nickname"
-msgstr "Nickname"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:566
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:9
-msgid "Company"
-msgstr "Company"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:567
-msgid "Department"
-msgstr "Department"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:568
-msgid "Profession"
-msgstr "Profession"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:569
-msgid "Position"
-msgstr "Position"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:570
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:23
-msgid "Manager"
-msgstr "Manager"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:571
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:1
-msgid "Assistant"
-msgstr "Assistant"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:572
-msgid "Video Chat"
-msgstr "Video Chat"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:573
-#: ../calendar/gui/calendar-commands.c:99
-#: ../calendar/gui/calendar-component.c:755
-#: ../calendar/gui/dialogs/calendar-setup.c:366
-#: ../calendar/gui/gnome-cal.c:2306
-#: ../plugins/exchange-operations/exchange-folder.c:575
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:400
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:431
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:544
-#: ../plugins/hula-account-setup/camel-hula-listener.c:381
-#: ../plugins/hula-account-setup/camel-hula-listener.c:410
-#: ../plugins/publish-calendar/publish-calendar.glade.h:5
-msgid "Calendar"
-msgstr "Calendar"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:574
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-#: ../calendar/gui/dialogs/event-editor.c:370
-#: ../ui/evolution-event-editor.xml.h:8
-msgid "Free/Busy"
-msgstr "Free/Busy"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:575
-#: ../addressbook/gui/widgets/eab-contact-display.c:590
-msgid "Phone"
-msgstr "Phone"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:576
-msgid "Fax"
-msgstr "Fax"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:587
-msgid "Home Page"
-msgstr "Home Page"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:588
-msgid "Web Log"
-msgstr "Web Log"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:591
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:24
-msgid "Mobile Phone"
-msgstr "Mobile Phone"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:593
-msgid "Birthday"
-msgstr "Birthday"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:594
-msgid "Anniversary"
-msgstr "Anniversary"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:595
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:34
-msgid "Spouse"
-msgstr "Spouse"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:604
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:26
-msgid "Note"
-msgstr "Note"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:776
-msgid "Job Title"
-msgstr "Job Title"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:807
-msgid "Home page"
-msgstr "Home page"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:815
-msgid "Blog"
-msgstr "Blog"
-
-#. E_BOOK_ERROR_OK
-#: ../addressbook/gui/widgets/eab-gui-util.c:51
-msgid "Success"
-msgstr "Success"
-
-#. E_BOOK_ERROR_INVALID_ARG
-#. E_BOOK_ERROR_BUSY
-#: ../addressbook/gui/widgets/eab-gui-util.c:53
-msgid "Backend busy"
-msgstr "Backend busy"
-
-#. E_BOOK_ERROR_REPOSITORY_OFFLINE
-#: ../addressbook/gui/widgets/eab-gui-util.c:54
-msgid "Repository offline"
-msgstr "Repository offline"
-
-#. E_BOOK_ERROR_NO_SUCH_BOOK
-#: ../addressbook/gui/widgets/eab-gui-util.c:55
-msgid "Address Book does not exist"
-msgstr "Address Book does not exist"
-
-#. E_BOOK_ERROR_NO_SELF_CONTACT
-#: ../addressbook/gui/widgets/eab-gui-util.c:56
-msgid "No Self Contact defined"
-msgstr "No Self Contact defined"
-
-#. E_BOOK_ERROR_URI_NOT_LOADED
-#. E_BOOK_ERROR_URI_ALREADY_LOADED
-#. E_BOOK_ERROR_PERMISSION_DENIED
-#: ../addressbook/gui/widgets/eab-gui-util.c:59
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:49
-msgid "Permission denied"
-msgstr "Permission denied"
-
-#. E_BOOK_ERROR_CONTACT_NOT_FOUND
-#: ../addressbook/gui/widgets/eab-gui-util.c:60
-msgid "Contact not found"
-msgstr "Contact not found"
-
-#. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
-#: ../addressbook/gui/widgets/eab-gui-util.c:61
-msgid "Contact ID already exists"
-msgstr "Contact ID already exists"
-
-#. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
-#: ../addressbook/gui/widgets/eab-gui-util.c:62
-msgid "Protocol not supported"
-msgstr "Protocol not supported"
-
-#. E_BOOK_ERROR_CANCELLED
-#: ../addressbook/gui/widgets/eab-gui-util.c:63
-#: ../calendar/gui/dialogs/task-details-page.glade.h:3
-#: ../calendar/gui/e-cal-component-preview.c:236
-#: ../calendar/gui/e-calendar-table.c:464
-#: ../calendar/gui/e-cal-model-tasks.c:349
-#: ../calendar/gui/e-cal-model-tasks.c:664
-#: ../calendar/gui/print.c:2351
-msgid "Canceled"
-msgstr "Cancelled"
-
-#. E_BOOK_ERROR_COULD_NOT_CANCEL
-#: ../addressbook/gui/widgets/eab-gui-util.c:64
-msgid "Could not cancel"
-msgstr "Could not cancel"
-
-#. E_BOOK_ERROR_AUTHENTICATION_FAILED
-#: ../addressbook/gui/widgets/eab-gui-util.c:65
-#: ../calendar/gui/comp-editor-factory.c:433
-msgid "Authentication Failed"
-msgstr "Authentication Failed"
-
-#. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
-#: ../addressbook/gui/widgets/eab-gui-util.c:66
-msgid "Authentication Required"
-msgstr "Authentication Required"
-
-#. E_BOOK_ERROR_TLS_NOT_AVAILABLE
-#: ../addressbook/gui/widgets/eab-gui-util.c:67
-msgid "TLS not Available"
-msgstr "TLS not Available"
-
-#. E_BOOK_ERROR_CORBA_EXCEPTION
-#. E_BOOK_ERROR_NO_SUCH_SOURCE
-#: ../addressbook/gui/widgets/eab-gui-util.c:69
-msgid "No such source"
-msgstr "No such source"
-
-#. E_BOOK_ERROR_OFFLINE_UNAVAILABLE
-#: ../addressbook/gui/widgets/eab-gui-util.c:70
-msgid "Not available in offline mode"
-msgstr "Not available in offline mode"
-
-#. E_BOOK_ERROR_OTHER_ERROR
-#: ../addressbook/gui/widgets/eab-gui-util.c:71
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1853
-msgid "Other error"
-msgstr "Other error"
-
-#. E_BOOK_ERROR_INVALID_SERVER_VERSION
-#: ../addressbook/gui/widgets/eab-gui-util.c:72
-msgid "Invalid server version"
-msgstr "Invalid server version"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:95
-msgid "We were unable to open this addressbook. This either means this book is not marked for offline usage or not yet downloaded for offline usage. Please load the addressbook once in online mode to download its contents"
-msgstr "We were unable to open this addressbook. This either means this book is not marked for offline usage or not yet downloaded for offline usage. Please load the addressbook once in online mode to download its contents"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:104
-#, c-format
-msgid "We were unable to open this addressbook. Please check that the path %s exists and that you have permission to access it."
-msgstr "We were unable to open this addressbook. Please check that the path %s exists and that you have permission to access it."
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:113
-msgid "We were unable to open this addressbook. This either means you have entered an incorrect URI, or the LDAP server is unreachable."
-msgstr "We were unable to open this addressbook. This either means you have entered an incorrect URI, or the LDAP server is unreachable."
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:118
-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 Evolution package."
-msgstr "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 Evolution package."
-
-#: ../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 server is unreachable."
-msgstr "We were unable to open this addressbook. This either means you have entered an incorrect URI, or the server is unreachable."
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:148
-msgid ""
-"More cards matched this query than either the server is \n"
-"configured to return or Evolution is configured to display.\n"
-"Please make your search more specific or raise the result limit in\n"
-"the directory server preferences for this addressbook."
-msgstr ""
-"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."
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:154
-msgid ""
-"The time to execute this query exceeded the server limit or the limit\n"
-"you have configured for this addressbook. Please make your search\n"
-"more specific or raise the time limit in the directory server\n"
-"preferences for this addressbook."
-msgstr ""
-"The time to execute this query exceeded the server limit or the limit\n"
-"you have configured for this addressbook. Please make your search\n"
-"more specific or raise the time limit in the directory server\n"
-"preferences for this addressbook."
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:160
-msgid "The backend for this addressbook was unable to parse this query."
-msgstr "The backend for this addressbook was unable to parse this query."
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:163
-msgid "The backend for this addressbook refused to perform this query."
-msgstr "The backend for this addressbook refused to perform this query."
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:166
-msgid "This query did not complete successfully."
-msgstr "This query did not complete successfully."
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:188
-msgid "Error adding list"
-msgstr "Error adding list"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:188
-#: ../addressbook/gui/widgets/eab-gui-util.c:710
-msgid "Error adding contact"
-msgstr "Error adding contact"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:199
-msgid "Error modifying list"
-msgstr "Error modifying list"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:199
-msgid "Error modifying contact"
-msgstr "Error modifying contact"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:211
-msgid "Error removing list"
-msgstr "Error removing list"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:211
-#: ../addressbook/gui/widgets/eab-gui-util.c:660
-msgid "Error removing contact"
-msgstr "Error removing contact"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:293
-#, c-format
-msgid ""
-"Opening %d contact will open %d new window as well.\n"
-"Do you really want to display this contact?"
-msgid_plural ""
-"Opening %d contacts will open %d new windows as well.\n"
-"Do you really want to display all of these contacts?"
-msgstr[0] ""
-"Opening %d contact will open %d new window as well.\n"
-"Do you really want to display this contact?"
-msgstr[1] ""
-"Opening %d contacts will open %d new windows as well.\n"
-"Do you really want to display all of these contacts?"
-
-#. For Translators only: "it" refers to the filename %s.
-#: ../addressbook/gui/widgets/eab-gui-util.c:325
-#, c-format
-msgid ""
-"%s already exists\n"
-"Do you want to overwrite it?"
-msgstr ""
-"%s already exists\n"
-"Do you want to overwrite it?"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:329
-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:376
-#: ../addressbook/gui/widgets/eab-gui-util.c:379
-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:427
-msgid "card.vcf"
-msgstr "card.vcf"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:464
-msgid "Select Address Book"
-msgstr "Select Address Book"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:605
-msgid "list"
-msgstr "list"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:771
-msgid "Move contact to"
-msgstr "Move contact to"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:773
-msgid "Copy contact to"
-msgstr "Copy contact to"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:776
-msgid "Move contacts to"
-msgstr "Move contacts to"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:778
-msgid "Copy contacts to"
-msgstr "Copy contacts to"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:1004
-msgid "Multiple VCards"
-msgstr "Multiple VCards"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:1007
-#, c-format
-msgid "VCard for %s"
-msgstr "VCard for %s"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:1048
-#: ../addressbook/gui/widgets/eab-gui-util.c:1066
-msgid "Contact information"
-msgstr "Contact information"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:1068
-#, c-format
-msgid "Contact information for %s"
-msgstr "Contact information for %s"
-
-#: ../addressbook/gui/widgets/eab-popup-control.c:289
-msgid "Querying Address Book..."
-msgstr "Querying Address Book..."
-
-#: ../addressbook/gui/widgets/eab-vcard-control.c:143
-#, c-format
-msgid "There is one other contact."
-msgid_plural "There are %d other contacts."
-msgstr[0] "There is one other contact."
-msgstr[1] "There are %d other contacts."
-
-#: ../addressbook/gui/widgets/eab-vcard-control.c:228
-#: ../addressbook/gui/widgets/eab-vcard-control.c:281
-msgid "Show Full VCard"
-msgstr "Show Full VCard"
-
-#: ../addressbook/gui/widgets/eab-vcard-control.c:232
-msgid "Show Compact VCard"
-msgstr "Show Compact VCard"
-
-#: ../addressbook/gui/widgets/eab-vcard-control.c:286
-msgid "Save in addressbook"
-msgstr "Save in addressbook"
-
#: ../addressbook/gui/widgets/e-addressbook-model.c:150
msgid "No contacts"
msgstr "No contacts"
@@ -3259,9 +2802,9 @@ msgstr[1] "%d contacts"
#: ../addressbook/gui/widgets/e-addressbook-model.c:305
#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:390
-#: ../addressbook/gui/widgets/e-addressbook-view.c:238
-#: ../addressbook/gui/widgets/e-minicard-view.c:515
+#: ../addressbook/gui/widgets/e-addressbook-view.c:231
#: ../addressbook/gui/widgets/e-minicard-view-widget.c:114
+#: ../addressbook/gui/widgets/e-minicard-view.c:515
msgid "Query"
msgstr "Query"
@@ -3270,111 +2813,104 @@ msgid "Error getting book view"
msgstr "Error getting book view"
#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:404
-#: ../widgets/table/e-table.c:3340
-#: ../widgets/table/e-table-click-to-add.c:502
-#: ../widgets/table/e-table-selection-model.c:311
-#: ../widgets/table/e-tree-selection-model.c:825
-#: ../widgets/text/e-entry.c:1207
-#: ../widgets/text/e-entry.c:1208
-#: ../widgets/text/e-text.c:3489
-#: ../widgets/text/e-text.c:3490
+#: ../widgets/table/e-table-click-to-add.c:510
+#: ../widgets/table/e-table-selection-model.c:303
+#: ../widgets/table/e-table.c:3335
+#: ../widgets/table/e-tree-selection-model.c:821
+#: ../widgets/text/e-text.c:3550
+#: ../widgets/text/e-text.c:3551
msgid "Model"
msgstr "Model"
-#: ../addressbook/gui/widgets/e-addressbook-table-adapter.c:104
+#: ../addressbook/gui/widgets/e-addressbook-table-adapter.c:131
msgid "Error modifying card"
msgstr "Error modifying card"
-#: ../addressbook/gui/widgets/e-addressbook-view.c:231
+#: ../addressbook/gui/widgets/e-addressbook-view.c:224
msgid "Source"
msgstr "Source"
-#: ../addressbook/gui/widgets/e-addressbook-view.c:245
-#: ../calendar/gui/dialogs/meeting-page.etspec.h:11
-#: ../calendar/gui/e-calendar-table.etspec.h:13
-#: ../calendar/gui/e-meeting-list-view.c:500
+#: ../addressbook/gui/widgets/e-addressbook-view.c:238
+#: ../calendar/gui/e-calendar-table.etspec.h:12
+#: ../calendar/gui/e-meeting-list-view.c:501
#: ../calendar/gui/e-meeting-time-sel.etspec.h:11
-#: ../calendar/gui/e-memo-table.etspec.h:6
+#: ../calendar/gui/e-memo-table.etspec.h:5
msgid "Type"
msgstr "Type"
-#: ../addressbook/gui/widgets/e-addressbook-view.c:835
-#: ../addressbook/gui/widgets/e-addressbook-view.c:2072
-#: ../ui/evolution-addressbook.xml.h:31
-msgid "Save as VCard..."
-msgstr "Save as VCard..."
+#: ../addressbook/gui/widgets/e-addressbook-view.c:814
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1935
+msgid "Save as vCard..."
+msgstr "Save as vCard..."
-#: ../addressbook/gui/widgets/e-addressbook-view.c:956
-#: ../calendar/gui/dialogs/comp-editor.c:1121
-#: ../calendar/gui/e-calendar-table.c:1281
-#: ../calendar/gui/e-calendar-view.c:1679
-#: ../calendar/gui/e-memo-table.c:902
+#: ../addressbook/gui/widgets/e-addressbook-view.c:935
+#: ../calendar/gui/dialogs/comp-editor.c:1134
+#: ../calendar/gui/e-calendar-table.c:1362
+#: ../calendar/gui/e-calendar-view.c:1677
+#: ../calendar/gui/e-memo-table.c:921
#: ../ui/evolution-addressbook.xml.h:56
msgid "_Open"
msgstr "_Open"
-#: ../addressbook/gui/widgets/e-addressbook-view.c:958
+#: ../addressbook/gui/widgets/e-addressbook-view.c:937
msgid "_New Contact..."
msgstr "_New Contact..."
-#: ../addressbook/gui/widgets/e-addressbook-view.c:959
+#: ../addressbook/gui/widgets/e-addressbook-view.c:938
msgid "New Contact _List..."
msgstr "New Contact _List..."
-#: ../addressbook/gui/widgets/e-addressbook-view.c:962
-msgid "_Save as VCard..."
-msgstr "_Save as VCard..."
+#: ../addressbook/gui/widgets/e-addressbook-view.c:941
+msgid "_Save as vCard..."
+msgstr "_Save as vCard..."
-#: ../addressbook/gui/widgets/e-addressbook-view.c:963
+#: ../addressbook/gui/widgets/e-addressbook-view.c:942
msgid "_Forward Contact"
msgstr "_Forward Contact"
-#: ../addressbook/gui/widgets/e-addressbook-view.c:964
+#: ../addressbook/gui/widgets/e-addressbook-view.c:943
msgid "_Forward Contacts"
msgstr "_Forward Contacts"
-#: ../addressbook/gui/widgets/e-addressbook-view.c:965
+#: ../addressbook/gui/widgets/e-addressbook-view.c:944
msgid "Send _Message to Contact"
msgstr "Send _Message to Contact"
-#: ../addressbook/gui/widgets/e-addressbook-view.c:966
+#: ../addressbook/gui/widgets/e-addressbook-view.c:945
msgid "Send _Message to List"
msgstr "Send _Message to List"
-#: ../addressbook/gui/widgets/e-addressbook-view.c:967
+#: ../addressbook/gui/widgets/e-addressbook-view.c:946
msgid "Send _Message to Contacts"
msgstr "Send _Message to Contacts"
-#: ../addressbook/gui/widgets/e-addressbook-view.c:968
+#: ../addressbook/gui/widgets/e-addressbook-view.c:947
msgid "_Print"
msgstr "_Print"
-#: ../addressbook/gui/widgets/e-addressbook-view.c:971
+#: ../addressbook/gui/widgets/e-addressbook-view.c:950
msgid "Cop_y to Address Book..."
msgstr "Cop_y to Address Book..."
-#: ../addressbook/gui/widgets/e-addressbook-view.c:972
+#: ../addressbook/gui/widgets/e-addressbook-view.c:951
msgid "Mo_ve to Address Book..."
msgstr "Mo_ve to Address Book..."
-#: ../addressbook/gui/widgets/e-addressbook-view.c:975
+#: ../addressbook/gui/widgets/e-addressbook-view.c:954
#: ../ui/evolution-composer-entries.xml.h:4
#: ../ui/evolution-editor.xml.h:8
msgid "Cu_t"
msgstr "Cu_t"
-#: ../addressbook/gui/widgets/e-addressbook-view.c:976
-#: ../calendar/gui/calendar-component.c:583
+#: ../addressbook/gui/widgets/e-addressbook-view.c:955
#: ../calendar/gui/dialogs/comp-editor.c:463
-#: ../calendar/gui/e-calendar-table.c:1289
-#: ../calendar/gui/e-calendar-view.c:1686
-#: ../calendar/gui/e-memo-table.c:910
-#: ../calendar/gui/memos-component.c:452
-#: ../calendar/gui/tasks-component.c:443
-#: ../composer/e-msg-composer.c:3177
-#: ../mail/em-folder-tree.c:1005
-#: ../mail/em-folder-view.c:1136
-#: ../mail/message-list.c:1922
+#: ../calendar/gui/e-calendar-table.c:1370
+#: ../calendar/gui/e-calendar-view.c:1684
+#: ../calendar/gui/e-memo-table.c:929
+#: ../composer/e-msg-composer.c:3103
+#: ../mail/em-folder-tree.c:1013
+#: ../mail/em-folder-view.c:1330
+#: ../mail/message-list.c:2062
#: ../ui/evolution-addressbook.xml.h:46
#: ../ui/evolution-calendar.xml.h:39
#: ../ui/evolution-composer-entries.xml.h:13
@@ -3385,16 +2921,29 @@ msgstr "Cu_t"
msgid "_Copy"
msgstr "_Copy"
-#: ../addressbook/gui/widgets/e-addressbook-view.c:977
+#: ../addressbook/gui/widgets/e-addressbook-view.c:956
msgid "P_aste"
msgstr "P_aste"
#. All, unmatched, separator
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1659
-#: ../calendar/gui/cal-search-bar.c:428
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1511
+#: ../calendar/gui/cal-search-bar.c:619
+#: ../calendar/gui/cal-search-bar.c:662
+#: ../calendar/gui/cal-search-bar.c:681
msgid "Any Category"
msgstr "Any Category"
+#. E_BOOK_ERROR_OTHER_ERROR
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1716
+#: ../addressbook/gui/widgets/eab-gui-util.c:75
+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"
+msgstr "Assistant"
+
#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:2
msgid "Assistant Phone"
msgstr "Assistant Phone"
@@ -3421,12 +2970,18 @@ msgstr "Car Phone"
#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:8
#: ../calendar/gui/dialogs/event-page.glade.h:7
-#: ../calendar/gui/e-calendar-table.etspec.h:3
+#: ../calendar/gui/e-cal-component-memo-preview.c:169
#: ../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
msgid "Categories"
msgstr "Categories"
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:9
+#: ../addressbook/gui/widgets/eab-contact-display.c:629
+msgid "Company"
+msgstr "Company"
+
#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:10
msgid "Company Phone"
msgstr "Company Phone"
@@ -3471,6 +3026,26 @@ msgstr "ISDN Phone"
msgid "Journal"
msgstr "Journal"
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:23
+#: ../addressbook/gui/widgets/eab-contact-display.c:633
+msgid "Manager"
+msgstr "Manager"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:24
+#: ../addressbook/gui/widgets/eab-contact-display.c:654
+msgid "Mobile Phone"
+msgstr "Mobile Phone"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:25
+#: ../addressbook/gui/widgets/eab-contact-display.c:608
+msgid "Nickname"
+msgstr "Nickname"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:26
+#: ../addressbook/gui/widgets/eab-contact-display.c:667
+msgid "Note"
+msgstr "Note"
+
#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:27
msgid "Office"
msgstr "Office"
@@ -3496,13 +3071,17 @@ msgid "Radio"
msgstr "Radio"
#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:33
-#: ../calendar/gui/dialogs/meeting-page.etspec.h:9
-#: ../calendar/gui/e-meeting-list-view.c:511
+#: ../calendar/gui/e-meeting-list-view.c:513
#: ../calendar/gui/e-meeting-time-sel.etspec.h:9
#: ../plugins/exchange-operations/exchange-permissions-dialog.c:725
msgid "Role"
msgstr "Role"
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:34
+#: ../addressbook/gui/widgets/eab-contact-display.c:658
+msgid "Spouse"
+msgstr "Spouse"
+
#. Translators: This is a vcard standard and stands for the type of
#. phone used by the hearing impaired. TTY stands for "teletype"
#. (familiar from Unix device names), and TDD is "Telecommunications
@@ -3529,70 +3108,50 @@ msgstr "Unit"
msgid "Web Site"
msgstr "Web Site"
-#: ../addressbook/gui/widgets/e-minicard.c:102
-msgid "Work Email"
-msgstr "Work Email"
-
-#: ../addressbook/gui/widgets/e-minicard.c:103
-msgid "Home Email"
-msgstr "Home Email"
-
-#: ../addressbook/gui/widgets/e-minicard.c:104
-msgid "Other Email"
-msgstr "Other Email"
-
-#: ../addressbook/gui/widgets/e-minicard.c:150
#: ../addressbook/gui/widgets/e-minicard-label.c:115
-#: ../widgets/misc/e-canvas-vbox.c:96
-#: ../widgets/misc/e-canvas-vbox.c:97
-#: ../widgets/misc/e-reflow.c:1436
-#: ../widgets/misc/e-reflow.c:1437
-#: ../widgets/table/e-table-click-to-add.c:516
-#: ../widgets/table/e-table-col.c:98
-#: ../widgets/table/e-table-field-chooser-item.c:658
+#: ../addressbook/gui/widgets/e-minicard.c:150
+#: ../widgets/misc/e-canvas-vbox.c:86
+#: ../widgets/misc/e-canvas-vbox.c:87
+#: ../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-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-container.c:968
+#: ../widgets/table/e-table-group-leaf.c:628
#: ../widgets/table/e-table-group-leaf.c:629
-#: ../widgets/table/e-table-group-leaf.c:630
-#: ../widgets/table/e-table-item.c:3024
-#: ../widgets/table/e-table-item.c:3025
-#: ../widgets/text/e-text.c:3667
-#: ../widgets/text/e-text.c:3668
+#: ../widgets/table/e-table-item.c:3069
+#: ../widgets/table/e-table-item.c:3070
+#: ../widgets/text/e-text.c:3728
+#: ../widgets/text/e-text.c:3729
msgid "Width"
msgstr "Width"
-#: ../addressbook/gui/widgets/e-minicard.c:157
#: ../addressbook/gui/widgets/e-minicard-label.c:122
-#: ../widgets/misc/e-canvas-vbox.c:108
-#: ../widgets/misc/e-canvas-vbox.c:109
-#: ../widgets/misc/e-reflow.c:1444
-#: ../widgets/misc/e-reflow.c:1445
-#: ../widgets/table/e-table-click-to-add.c:523
-#: ../widgets/table/e-table-field-chooser-item.c:665
+#: ../addressbook/gui/widgets/e-minicard.c:157
+#: ../widgets/misc/e-canvas-vbox.c:98
+#: ../widgets/misc/e-canvas-vbox.c:99
+#: ../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-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-container.c:961
+#: ../widgets/table/e-table-group-leaf.c:621
#: ../widgets/table/e-table-group-leaf.c:622
-#: ../widgets/table/e-table-group-leaf.c:623
-#: ../widgets/table/e-table-item.c:3030
-#: ../widgets/table/e-table-item.c:3031
-#: ../widgets/text/e-text.c:3675
-#: ../widgets/text/e-text.c:3676
+#: ../widgets/table/e-table-item.c:3075
+#: ../widgets/table/e-table-item.c:3076
+#: ../widgets/text/e-text.c:3736
+#: ../widgets/text/e-text.c:3737
msgid "Height"
msgstr "Height"
-#: ../addressbook/gui/widgets/e-minicard.c:165
#: ../addressbook/gui/widgets/e-minicard-label.c:129
+#: ../addressbook/gui/widgets/e-minicard.c:165
msgid "Has Focus"
msgstr "Has Focus"
-#: ../addressbook/gui/widgets/e-minicard.c:173
-msgid "Selected"
-msgstr "Selected"
-
-#: ../addressbook/gui/widgets/e-minicard.c:180
-msgid "Has Cursor"
-msgstr "Has Cursor"
-
#: ../addressbook/gui/widgets/e-minicard-label.c:136
msgid "Field"
msgstr "Field"
@@ -3609,6 +3168,10 @@ msgstr "Text Model"
msgid "Max field name length"
msgstr "Max field name length"
+#: ../addressbook/gui/widgets/e-minicard-view-widget.c:128
+msgid "Column Width"
+msgstr "Column Width"
+
#: ../addressbook/gui/widgets/e-minicard-view.c:174
msgid ""
"\n"
@@ -3661,25 +3224,450 @@ msgstr ""
msgid "Adapter"
msgstr "Adapter"
-#: ../addressbook/gui/widgets/e-minicard-view-widget.c:128
-msgid "Column Width"
-msgstr "Column Width"
+#: ../addressbook/gui/widgets/e-minicard.c:102
+msgid "Work Email"
+msgstr "Work Email"
+
+#: ../addressbook/gui/widgets/e-minicard.c:103
+msgid "Home Email"
+msgstr "Home Email"
+
+#: ../addressbook/gui/widgets/e-minicard.c:104
+msgid "Other Email"
+msgstr "Other Email"
+
+#: ../addressbook/gui/widgets/e-minicard.c:173
+msgid "Selected"
+msgstr "Selected"
+
+#: ../addressbook/gui/widgets/e-minicard.c:180
+msgid "Has Cursor"
+msgstr "Has Cursor"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:172
+#: ../mail/em-popup.c:637
+msgid "_Open Link in Browser"
+msgstr "_Open Link in Browser"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:173
+#: ../mail/em-folder-view.c:2807
+msgid "_Copy Link Location"
+msgstr "_Copy Link Location"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:174
+#: ../mail/em-popup.c:638
+msgid "_Send New Message To..."
+msgstr "_Send New Message To..."
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:175
+#: ../plugins/copy-tool/org-gnome-copy-tool.eplug.xml.h:2
+msgid "Copy _Email Address"
+msgstr "Copy _Email Address"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:296
+#: ../addressbook/gui/widgets/eab-contact-display.c:370
+#: ../addressbook/gui/widgets/eab-contact-display.c:372
+msgid "(map)"
+msgstr "(map)"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:306
+#: ../addressbook/gui/widgets/eab-contact-display.c:390
+#: ../addressbook/gui/widgets/eab-contact-display.c:402
+msgid "map"
+msgstr "map"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:487
+#: ../addressbook/gui/widgets/eab-contact-display.c:827
+msgid "List Members"
+msgstr "List Members"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:630
+msgid "Department"
+msgstr "Department"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:631
+msgid "Profession"
+msgstr "Profession"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:632
+msgid "Position"
+msgstr "Position"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:635
+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:2383
+#: ../plugins/exchange-operations/exchange-delegates-user.c:83
+#: ../plugins/exchange-operations/exchange-folder.c:575
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:400
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:431
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:544
+#: ../plugins/hula-account-setup/camel-hula-listener.c:378
+#: ../plugins/hula-account-setup/camel-hula-listener.c:407
+#: ../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
+msgid "Free/Busy"
+msgstr "Free/Busy"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:638
+#: ../addressbook/gui/widgets/eab-contact-display.c:653
+msgid "Phone"
+msgstr "Phone"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:639
+msgid "Fax"
+msgstr "Fax"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:650
+msgid "Home Page"
+msgstr "Home Page"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:651
+msgid "Web Log"
+msgstr "Web Log"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:656
+#: ../calendar/gui/e-calendar-view.c:2327
+msgid "Birthday"
+msgstr "Birthday"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:657
+#: ../calendar/gui/e-calendar-view.c:2328
+msgid "Anniversary"
+msgstr "Anniversary"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:845
+msgid "Job Title"
+msgstr "Job Title"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:881
+msgid "Home page"
+msgstr "Home page"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:889
+msgid "Blog"
+msgstr "Blog"
+
+#. E_BOOK_ERROR_OK
+#: ../addressbook/gui/widgets/eab-gui-util.c:55
+msgid "Success"
+msgstr "Success"
+
+#. E_BOOK_ERROR_INVALID_ARG
+#. E_BOOK_ERROR_BUSY
+#: ../addressbook/gui/widgets/eab-gui-util.c:57
+msgid "Backend busy"
+msgstr "Backend busy"
+
+#. E_BOOK_ERROR_REPOSITORY_OFFLINE
+#: ../addressbook/gui/widgets/eab-gui-util.c:58
+msgid "Repository offline"
+msgstr "Repository offline"
+
+#. E_BOOK_ERROR_NO_SUCH_BOOK
+#: ../addressbook/gui/widgets/eab-gui-util.c:59
+msgid "Address Book does not exist"
+msgstr "Address Book does not exist"
+
+#. E_BOOK_ERROR_NO_SELF_CONTACT
+#: ../addressbook/gui/widgets/eab-gui-util.c:60
+msgid "No Self Contact defined"
+msgstr "No Self Contact defined"
+
+#. E_BOOK_ERROR_URI_NOT_LOADED
+#. E_BOOK_ERROR_URI_ALREADY_LOADED
+#. E_BOOK_ERROR_PERMISSION_DENIED
+#: ../addressbook/gui/widgets/eab-gui-util.c:63
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:49
+msgid "Permission denied"
+msgstr "Permission denied"
+
+#. E_BOOK_ERROR_CONTACT_NOT_FOUND
+#: ../addressbook/gui/widgets/eab-gui-util.c:64
+msgid "Contact not found"
+msgstr "Contact not found"
+
+#. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
+#: ../addressbook/gui/widgets/eab-gui-util.c:65
+msgid "Contact ID already exists"
+msgstr "Contact ID already exists"
+
+#. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
+#: ../addressbook/gui/widgets/eab-gui-util.c:66
+msgid "Protocol not supported"
+msgstr "Protocol not supported"
+
+#. E_BOOK_ERROR_CANCELLED
+#: ../addressbook/gui/widgets/eab-gui-util.c:67
+#: ../calendar/gui/dialogs/task-details-page.glade.h:3
+#: ../calendar/gui/e-cal-component-preview.c:239
+#: ../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:2521
+msgid "Canceled"
+msgstr "Cancelled"
+
+#. E_BOOK_ERROR_COULD_NOT_CANCEL
+#: ../addressbook/gui/widgets/eab-gui-util.c:68
+msgid "Could not cancel"
+msgstr "Could not cancel"
+
+#. E_BOOK_ERROR_AUTHENTICATION_FAILED
+#: ../addressbook/gui/widgets/eab-gui-util.c:69
+#: ../calendar/gui/comp-editor-factory.c:422
+msgid "Authentication Failed"
+msgstr "Authentication Failed"
+
+#. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
+#: ../addressbook/gui/widgets/eab-gui-util.c:70
+msgid "Authentication Required"
+msgstr "Authentication Required"
+
+#. E_BOOK_ERROR_TLS_NOT_AVAILABLE
+#: ../addressbook/gui/widgets/eab-gui-util.c:71
+msgid "TLS not Available"
+msgstr "TLS not Available"
+
+#. E_BOOK_ERROR_CORBA_EXCEPTION
+#. E_BOOK_ERROR_NO_SUCH_SOURCE
+#: ../addressbook/gui/widgets/eab-gui-util.c:73
+msgid "No such source"
+msgstr "No such source"
+
+#. E_BOOK_ERROR_OFFLINE_UNAVAILABLE
+#: ../addressbook/gui/widgets/eab-gui-util.c:74
+msgid "Not available in offline mode"
+msgstr "Not available in offline mode"
+
+#. E_BOOK_ERROR_INVALID_SERVER_VERSION
+#: ../addressbook/gui/widgets/eab-gui-util.c:76
+msgid "Invalid server version"
+msgstr "Invalid server version"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:99
+msgid "We were unable to open this addressbook. This either means this book is not marked for offline usage or not yet downloaded for offline usage. Please load the addressbook once in online mode to download its contents"
+msgstr "We were unable to open this addressbook. This either means this book is not marked for offline usage or not yet downloaded for offline usage. Please load the addressbook once in online mode to download its contents"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:108
+#, c-format
+msgid "We were unable to open this addressbook. Please check that the path %s exists and that you have permission to access it."
+msgstr "We were unable to open this addressbook. Please check that the path %s exists and that you have permission to access it."
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:117
+msgid "We were unable to open this addressbook. This either means you have entered an incorrect URI, or the LDAP server is unreachable."
+msgstr "We were unable to open this addressbook. This either means you have entered an incorrect URI, or the LDAP server is unreachable."
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:122
+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 Evolution package."
+msgstr "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 Evolution package."
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:129
+msgid "We were unable to open this addressbook. This either means you have entered an incorrect URI, or the server is unreachable."
+msgstr "We were unable to open this addressbook. This either means you have entered an incorrect URI, or the server is unreachable."
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:152
+msgid ""
+"More cards matched this query than either the server is \n"
+"configured to return or Evolution is configured to display.\n"
+"Please make your search more specific or raise the result limit in\n"
+"the directory server preferences for this addressbook."
+msgstr ""
+"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."
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:158
+msgid ""
+"The time to execute this query exceeded the server limit or the limit\n"
+"you have configured for this addressbook. Please make your search\n"
+"more specific or raise the time limit in the directory server\n"
+"preferences for this addressbook."
+msgstr ""
+"The time to execute this query exceeded the server limit or the limit\n"
+"you have configured for this addressbook. Please make your search\n"
+"more specific or raise the time limit in the directory server\n"
+"preferences for this addressbook."
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:164
+msgid "The backend for this addressbook was unable to parse this query."
+msgstr "The backend for this addressbook was unable to parse this query."
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:167
+msgid "The backend for this addressbook refused to perform this query."
+msgstr "The backend for this addressbook refused to perform this query."
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:170
+msgid "This query did not complete successfully."
+msgstr "This query did not complete successfully."
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:192
+msgid "Error adding list"
+msgstr "Error adding list"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:192
+#: ../addressbook/gui/widgets/eab-gui-util.c:670
+msgid "Error adding contact"
+msgstr "Error adding contact"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:203
+msgid "Error modifying list"
+msgstr "Error modifying list"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:203
+msgid "Error modifying contact"
+msgstr "Error modifying contact"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:215
+msgid "Error removing list"
+msgstr "Error removing list"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:215
+#: ../addressbook/gui/widgets/eab-gui-util.c:620
+msgid "Error removing contact"
+msgstr "Error removing contact"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:297
+#, c-format
+msgid ""
+"Opening %d contact will open %d new window as well.\n"
+"Do you really want to display this contact?"
+msgid_plural ""
+"Opening %d contacts will open %d new windows as well.\n"
+"Do you really want to display all of these contacts?"
+msgstr[0] ""
+"Opening %d contact will open %d new window as well.\n"
+"Do you really want to display this contact?"
+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:305
+msgid "_Don't Display"
+msgstr "_Don't Display"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:306
+msgid "Display _All Contacts"
+msgstr "Display _All Contacts"
+
+#. For Translators only: "it" refers to the filename %s.
+#: ../addressbook/gui/widgets/eab-gui-util.c:332
+#, c-format
+msgid ""
+"%s already exists\n"
+"Do you want to overwrite it?"
+msgstr ""
+"%s already exists\n"
+"Do you want to overwrite it?"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:336
+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
+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
+msgid "card.vcf"
+msgstr "card.vcf"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:465
+msgid "Select Address Book"
+msgstr "Select Address Book"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:579
+msgid "list"
+msgstr "list"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:731
+msgid "Move contact to"
+msgstr "Move contact to"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:733
+msgid "Copy contact to"
+msgstr "Copy contact to"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:736
+msgid "Move contacts to"
+msgstr "Move contacts to"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:738
+msgid "Copy contacts to"
+msgstr "Copy contacts to"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:983
+msgid "Multiple vCards"
+msgstr "Multiple vCards"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:986
+#, c-format
+msgid "vCard for %s"
+msgstr "vCard for %s"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:1027
+#: ../addressbook/gui/widgets/eab-gui-util.c:1052
+msgid "Contact information"
+msgstr "Contact information"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:1054
+#, c-format
+msgid "Contact information for %s"
+msgstr "Contact information for %s"
+
+#: ../addressbook/gui/widgets/eab-popup-control.c:289
+msgid "Querying Address Book..."
+msgstr "Querying Address Book..."
+
+#: ../addressbook/gui/widgets/eab-vcard-control.c:143
+#, c-format
+msgid "There is one other contact."
+msgid_plural "There are %d other contacts."
+msgstr[0] "There is one other contact."
+msgstr[1] "There are %d other contacts."
+
+#: ../addressbook/gui/widgets/eab-vcard-control.c:228
+#: ../addressbook/gui/widgets/eab-vcard-control.c:279
+msgid "Show Full vCard"
+msgstr "Show Full vCard"
+
+#: ../addressbook/gui/widgets/eab-vcard-control.c:232
+msgid "Show Compact vCard"
+msgstr "Show Compact vCard"
+
+#: ../addressbook/gui/widgets/eab-vcard-control.c:284
+msgid "Save in addressbook"
+msgstr "Save in addressbook"
#: ../addressbook/gui/widgets/gal-view-factory-minicard.c:25
msgid "Card View"
msgstr "Card View"
-#: ../addressbook/gui/widgets/gal-view-factory-treeview.c:26
-msgid "GTK Tree View"
-msgstr "GTK Tree View"
-
#: ../addressbook/importers/evolution-csv-importer.c:624
-#: ../addressbook/importers/evolution-ldif-importer.c:583
+#: ../addressbook/importers/evolution-ldif-importer.c:499
#: ../addressbook/importers/evolution-vcard-importer.c:250
#: ../calendar/importers/icalendar-importer.c:312
#: ../calendar/importers/icalendar-importer.c:677
-#: ../mail/importers/evolution-outlook-importer.c:264
-#: ../mail/importers/netscape-importer.c:1252
#: ../shell/shell.error.xml.h:6
msgid "Importing..."
msgstr "Importing..."
@@ -3708,21 +3696,21 @@ msgstr "Evolution CSV or Tab (.csv, .tab)"
msgid "Evolution CSV and Tab Importer"
msgstr "Evolution CSV and Tab Importer"
-#: ../addressbook/importers/evolution-ldif-importer.c:754
+#: ../addressbook/importers/evolution-ldif-importer.c:666
msgid "LDAP Data Interchange Format (.ldif)"
msgstr "LDAP Data Interchange Format (.ldif)"
-#: ../addressbook/importers/evolution-ldif-importer.c:755
+#: ../addressbook/importers/evolution-ldif-importer.c:667
msgid "Evolution LDIF importer"
msgstr "Evolution LDIF importer"
#: ../addressbook/importers/evolution-vcard-importer.c:547
-msgid "VCard (.vcf, .gcrd)"
-msgstr "VCard (.vcf, .gcrd)"
+msgid "vCard (.vcf, .gcrd)"
+msgstr "vCard (.vcf, .gcrd)"
#: ../addressbook/importers/evolution-vcard-importer.c:548
-msgid "Evolution VCard Importer"
-msgstr "Evolution VCard Importer"
+msgid "Evolution vCard Importer"
+msgstr "Evolution vCard Importer"
#: ../addressbook/printing/e-contact-print.glade.h:1
msgid "10 pt. Tahoma"
@@ -3765,12 +3753,13 @@ msgid "Format"
msgstr "Format"
#: ../addressbook/printing/e-contact-print.glade.h:11
-#: ../widgets/table/e-table-click-to-add.c:495
-#: ../widgets/table/e-table-field-chooser.c:91
-#: ../widgets/table/e-table-field-chooser-dialog.c:91
-#: ../widgets/table/e-table-field-chooser-item.c:651
-#: ../widgets/table/e-table-header-item.c:1893
-#: ../widgets/table/e-table-selection-model.c:318
+#: ../mail/em-mailer-prefs.c:447
+#: ../widgets/table/e-table-click-to-add.c:503
+#: ../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:1907
+#: ../widgets/table/e-table-selection-model.c:310
msgid "Header"
msgstr "Header"
@@ -3823,7 +3812,6 @@ msgid "Options"
msgstr "Options"
#: ../addressbook/printing/e-contact-print.glade.h:24
-#: ../e-util/eggtrayicon.c:120
msgid "Orientation"
msgstr "Orientation"
@@ -3873,7 +3861,7 @@ msgstr "Shading"
#. FIXME: Take care of i18n
#: ../addressbook/printing/e-contact-print.glade.h:36
-#: ../plugins/exchange-operations/exchange-account-setup.c:956
+#: ../plugins/exchange-operations/exchange-account-setup.c:981
#: ../plugins/exchange-operations/exchange-calendar.c:231
#: ../plugins/exchange-operations/exchange-contacts.c:217
msgid "Size:"
@@ -3909,7 +3897,7 @@ 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:47
+#: ../addressbook/printing/test-print.c:44
msgid "Copyright (C) 2000, Ximian, Inc."
msgstr "Copyright (C) 2000, Ximian, Inc."
@@ -3917,14 +3905,28 @@ msgstr "Copyright (C) 2000, Ximian, Inc."
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:46
+#: ../addressbook/printing/test-print.c:43
msgid "Contact Print Test"
msgstr "Contact Print Test"
-#: ../addressbook/printing/test-print.c:49
+#: ../addressbook/printing/test-print.c:46
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-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"
+msgstr "Couldn't get list of addressbooks"
+
+#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:72
+msgid "failed to open book"
+msgstr "failed to open book"
+
#: ../addressbook/tools/evolution-addressbook-export.c:49
msgid "Specify the output file instead of standard output"
msgstr "Specify the output file instead of standard output"
@@ -3950,8 +3952,8 @@ msgid "Export in asynchronous mode"
msgstr "Export in asynchronous mode"
#: ../addressbook/tools/evolution-addressbook-export.c:63
-msgid "The number of cards in out output file in asynchronous mode, default size 100."
-msgstr "The number of cards in out output file in asynchronous mode, default size 100."
+msgid "The number of cards in one output file in asynchronous mode, default size 100."
+msgstr "The number of cards in one output file in asynchronous mode, default size 100."
#: ../addressbook/tools/evolution-addressbook-export.c:65
msgid "NUMBER"
@@ -3977,406 +3979,469 @@ msgstr "In normal mode, there is no need for the size option."
msgid "Unhandled error"
msgstr "Unhandled error"
-#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:668
-#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:704
-#: ../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"
-msgstr "Couldn't get list of addressbooks"
-
-#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:72
-msgid "failed to open book"
-msgstr "failed to open book"
-
-#: ../addressbook/tools/evolution-addressbook-import.c:46
-msgid "Error loading default addressbook."
-msgstr "Error loading default addressbook."
-
-#: ../addressbook/tools/evolution-addressbook-import.c:67
-msgid "Input File"
-msgstr "Input File"
-
-#: ../addressbook/tools/evolution-addressbook-import.c:82
-msgid "No filename provided."
-msgstr "No filename provided."
+#. For Translators: {0} is the name of the calendar source
+#: ../calendar/calendar.error.xml.h:2
+msgid "'{0}' is a read-only calendar source. Switch to Calendar View and highlight a 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."
-#: ../calendar/calendar.error.xml.h:1
+#: ../calendar/calendar.error.xml.h:3
msgid "Adding a meaningful summary to your appointment will give your recipients an idea of what your appointment is about."
msgstr "Adding a meaningful summary to your appointment will give your recipients an idea of what your appointment is about."
-#: ../calendar/calendar.error.xml.h:2
+#: ../calendar/calendar.error.xml.h:4
msgid "Adding a meaningful summary to your task will give your recipients an idea of what your task is about."
msgstr "Adding a meaningful summary to your task will give your recipients an idea of what your task is about."
-#: ../calendar/calendar.error.xml.h:3
-msgid "All information in these journal entries will be deleted and can not be restored."
-msgstr "All information in these journal entries will be deleted and can not be restored."
+#: ../calendar/calendar.error.xml.h:5
+msgid "All information in these memos will be deleted and can not be restored."
+msgstr "All information in these memos will be deleted and can not be restored."
-#: ../calendar/calendar.error.xml.h:4
-msgid "All information in this journal will be deleted and can not be restored."
-msgstr "All information in this journal will be deleted and can not be restored."
+#: ../calendar/calendar.error.xml.h:6
+msgid "All information in this memo will be deleted and can not be restored."
+msgstr "All information in this memo will be deleted and can not be restored."
-#: ../calendar/calendar.error.xml.h:5
+#: ../calendar/calendar.error.xml.h:7
msgid "All information on these appointments will be deleted and can not be restored."
msgstr "All information on these appointments will be deleted and can not be restored."
-#: ../calendar/calendar.error.xml.h:6
+#: ../calendar/calendar.error.xml.h:8
msgid "All information on these tasks will be deleted and can not be restored."
msgstr "All information on these tasks will be deleted and can not be restored."
-#: ../calendar/calendar.error.xml.h:7
+#: ../calendar/calendar.error.xml.h:9
msgid "All information on this appointment will be deleted and can not be restored."
msgstr "All information on this appointment will be deleted and can not be restored."
-#: ../calendar/calendar.error.xml.h:8
-msgid "All information on this journal entry will be deleted and can not be restored."
-msgstr "All information on this journal entry will be deleted and can not be restored."
-
-#: ../calendar/calendar.error.xml.h:9
+#: ../calendar/calendar.error.xml.h:10
msgid "All information on this meeting will be deleted and can not be restored."
msgstr "All information on this meeting will be deleted and can not be restored."
-#: ../calendar/calendar.error.xml.h:10
+#: ../calendar/calendar.error.xml.h:11
+msgid "All information on this memo will be deleted and can not be restored."
+msgstr "All information on this memo will be deleted and can not be restored."
+
+#: ../calendar/calendar.error.xml.h:12
msgid "All information on this task will be deleted and can not be restored."
msgstr "All information on this task will be deleted and can not be restored."
-#: ../calendar/calendar.error.xml.h:11
+#: ../calendar/calendar.error.xml.h:13
msgid "Are you sure you want to delete the '{0}' task?"
msgstr "Are you sure you want to delete the '{0}' task?"
-#: ../calendar/calendar.error.xml.h:12
+#: ../calendar/calendar.error.xml.h:14
msgid "Are you sure you want to delete the appointment titled '{0}'?"
msgstr "Are you sure you want to delete the appointment titled '{0}'?"
-#: ../calendar/calendar.error.xml.h:13
-msgid "Are you sure you want to delete the journal entry '{0}'?"
-msgstr "Are you sure you want to delete the journal entry '{0}'?"
+#: ../calendar/calendar.error.xml.h:15
+msgid "Are you sure you want to delete the memo '{0}'?"
+msgstr "Are you sure you want to delete the memo '{0}'?"
-#: ../calendar/calendar.error.xml.h:14
+#: ../calendar/calendar.error.xml.h:16
msgid "Are you sure you want to delete these {0} appointments?"
msgstr "Are you sure you want to delete these {0} appointments?"
-#: ../calendar/calendar.error.xml.h:15
-msgid "Are you sure you want to delete these {0} journal entries?"
-msgstr "Are you sure you want to delete these {0} journal entries?"
+#: ../calendar/calendar.error.xml.h:17
+msgid "Are you sure you want to delete these {0} memos?"
+msgstr "Are you sure you want to delete these {0} memos?"
-#: ../calendar/calendar.error.xml.h:16
+#: ../calendar/calendar.error.xml.h:18
msgid "Are you sure you want to delete these {0} tasks?"
msgstr "Are you sure you want to delete these {0} tasks?"
-#: ../calendar/calendar.error.xml.h:17
+#: ../calendar/calendar.error.xml.h: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:18
-#: ../calendar/gui/dialogs/delete-comp.c:189
-msgid "Are you sure you want to delete this journal entry?"
-msgstr "Are you sure you want to delete this journal entry?"
-
-#: ../calendar/calendar.error.xml.h:19
+#: ../calendar/calendar.error.xml.h:20
#: ../calendar/gui/dialogs/delete-comp.c:183
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:20
+#: ../calendar/calendar.error.xml.h:21
+#: ../calendar/gui/dialogs/delete-comp.c:189
+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:22
#: ../calendar/gui/dialogs/delete-comp.c:186
msgid "Are you sure you want to delete this task?"
msgstr "Are you sure you want to delete this task?"
-#: ../calendar/calendar.error.xml.h:21
+#: ../calendar/calendar.error.xml.h:23
+msgid "Are you sure you want to save the memo without a summary?"
+msgstr "Are you sure you want to save the memo without a summary?"
+
+#: ../calendar/calendar.error.xml.h:24
msgid "Are you sure you want to send the appointment without a summary?"
msgstr "Are you sure you want to send the appointment without a summary?"
-#: ../calendar/calendar.error.xml.h:22
+#: ../calendar/calendar.error.xml.h:25
msgid "Are you sure you want to send the task without a summary?"
msgstr "Are you sure you want to send the task without a summary?"
-#: ../calendar/calendar.error.xml.h:23
+#: ../calendar/calendar.error.xml.h:26
msgid "Cannot create a new event"
msgstr "Cannot create a new event"
-#: ../calendar/calendar.error.xml.h:24
+#: ../calendar/calendar.error.xml.h:27
msgid "Delete calendar '{0}'?"
msgstr "Delete calendar '{0}'?"
-#: ../calendar/calendar.error.xml.h:25
+#: ../calendar/calendar.error.xml.h:28
msgid "Delete memo list '{0}'?"
msgstr "Delete memo list '{0}'?"
-#: ../calendar/calendar.error.xml.h:26
+#: ../calendar/calendar.error.xml.h:29
msgid "Delete task list '{0}'?"
msgstr "Delete task list '{0}'?"
-#: ../calendar/calendar.error.xml.h:27
+#: ../calendar/calendar.error.xml.h:30
msgid "Do _not Send"
msgstr "Do _not Send"
-#: ../calendar/calendar.error.xml.h:28
+#: ../calendar/calendar.error.xml.h:31
msgid "Download in progress. Do you want to save the appointment?"
msgstr "Download in progress. Do you want to save the appointment?"
-#: ../calendar/calendar.error.xml.h:29
+#: ../calendar/calendar.error.xml.h:32
msgid "Download in progress. Do you want to save the task?"
msgstr "Download in progress. Do you want to save the task?"
-#: ../calendar/calendar.error.xml.h:30
+#: ../calendar/calendar.error.xml.h:33
msgid "Editor could not be loaded."
msgstr "Editor could not be loaded."
-#: ../calendar/calendar.error.xml.h:31
+#: ../calendar/calendar.error.xml.h:34
msgid "Email invitations will be sent to all participants and allow them to accept this task."
msgstr "Email invitations will be sent to all participants and allow them to accept this task."
-#: ../calendar/calendar.error.xml.h:32
+#: ../calendar/calendar.error.xml.h:35
msgid "Email invitations will be sent to all participants and allow them to reply."
msgstr "Email invitations will be sent to all participants and allow them to reply."
-#: ../calendar/calendar.error.xml.h:33
+#: ../calendar/calendar.error.xml.h:36
msgid "Error loading calendar"
msgstr "Error loading calendar"
-#: ../calendar/calendar.error.xml.h:34
+#: ../calendar/calendar.error.xml.h:37
msgid "Error loading memo list"
msgstr "Error loading memo list"
-#: ../calendar/calendar.error.xml.h:35
+#: ../calendar/calendar.error.xml.h:38
msgid "Error loading task list"
msgstr "Error loading task list"
-#: ../calendar/calendar.error.xml.h:36
-msgid "If you do not send a cancelation notice, the other participants may not know the journal has been deleted."
-msgstr "If you do not send a cancellation notice, the other participants may not know the journal has been deleted."
-
-#: ../calendar/calendar.error.xml.h:37
+#: ../calendar/calendar.error.xml.h:39
msgid "If you do not send a cancelation notice, the other participants may not know the meeting is canceled."
msgstr "If you do not send a cancellation notice, the other participants may not know the meeting is canceled."
-#: ../calendar/calendar.error.xml.h:38
+#: ../calendar/calendar.error.xml.h:40
+msgid "If you do not send a cancelation notice, the other participants may not know the memo has been deleted."
+msgstr "If you do not send a cancellation notice, the other participants may not know the memo has been deleted."
+
+#: ../calendar/calendar.error.xml.h:41
msgid "If you do not send a cancelation notice, the other participants may not know the task has been deleted."
msgstr "If you do not send a cancellation notice, the other participants may not know the task has been deleted."
-#: ../calendar/calendar.error.xml.h:39
+#: ../calendar/calendar.error.xml.h:42
msgid "Sending updated information allows other participants to keep their calendars up to date."
msgstr "Sending updated information allows other participants to keep their calendars up to date."
-#: ../calendar/calendar.error.xml.h:40
+#: ../calendar/calendar.error.xml.h:43
msgid "Sending updated information allows other participants to keep their task lists up to date."
msgstr "Sending updated information allows other participants to keep their task lists up to date."
-#: ../calendar/calendar.error.xml.h:41
+#: ../calendar/calendar.error.xml.h:44
msgid "Some attachments are being downloaded. Saving the appointment would result in the loss of these attachments."
msgstr "Some attachments are being downloaded. Saving the appointment would result in the loss of these attachments."
-#: ../calendar/calendar.error.xml.h:42
+#: ../calendar/calendar.error.xml.h:45
msgid "Some attachments are being downloaded. Saving the task would result in the loss of these attachments."
msgstr "Some attachments are being downloaded. Saving the task would result in the loss of these attachments."
-#: ../calendar/calendar.error.xml.h:43
+#: ../calendar/calendar.error.xml.h:46
msgid "Some features may not work properly with your current server."
msgstr "Some features may not work properly with your current server."
-#: ../calendar/calendar.error.xml.h:44
+#: ../calendar/calendar.error.xml.h:47
msgid "The Evolution calendar has quit unexpectedly."
msgstr "The Evolution calendar has quit unexpectedly."
-#: ../calendar/calendar.error.xml.h:45
+#: ../calendar/calendar.error.xml.h:48
msgid "The Evolution memo has quit unexpectedly."
msgstr "The Evolution memo has quit unexpectedly."
-#: ../calendar/calendar.error.xml.h:46
+#: ../calendar/calendar.error.xml.h:49
msgid "The Evolution tasks have quit unexpectedly."
msgstr "The Evolution tasks have quit unexpectedly."
-#: ../calendar/calendar.error.xml.h:47
+#: ../calendar/calendar.error.xml.h:50
msgid "The calendar is not marked for offline usage."
msgstr "The calendar is not marked for offline usage."
-#: ../calendar/calendar.error.xml.h:48
+#: ../calendar/calendar.error.xml.h:51
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:49
+#: ../calendar/calendar.error.xml.h:52
msgid "The task list is not marked for offline usage."
msgstr "The task list is not marked for offline usage."
-#: ../calendar/calendar.error.xml.h:50
+#: ../calendar/calendar.error.xml.h:53
msgid "This calendar will be removed permanently."
msgstr "This calendar will be removed permanently."
-#: ../calendar/calendar.error.xml.h:51
+#: ../calendar/calendar.error.xml.h:54
msgid "This memo list will be removed permanently."
msgstr "This memo list will be removed permanently."
-#: ../calendar/calendar.error.xml.h:52
+#: ../calendar/calendar.error.xml.h:55
msgid "This task list will be removed permanently."
msgstr "This task list will be removed permanently."
-#: ../calendar/calendar.error.xml.h:53
+#: ../calendar/calendar.error.xml.h:56
msgid "Would you like to save your changes to this appointment?"
msgstr "Would you like to save your changes to this appointment?"
# calendar:prompt-save-task primary
-#: ../calendar/calendar.error.xml.h:54
+#: ../calendar/calendar.error.xml.h:57
msgid "Would you like to save your changes to this memo?"
msgstr "Would you like to save your changes to this memo?"
# calendar:prompt-save-task primary
-#: ../calendar/calendar.error.xml.h:55
+#: ../calendar/calendar.error.xml.h:58
msgid "Would you like to save your changes to this task?"
msgstr "Would you like to save your changes to this task?"
-#: ../calendar/calendar.error.xml.h:56
-msgid "Would you like to send a cancelation notice for this journal entry?"
-msgstr "Would you like to send a cancellation notice for this journal entry?"
+#: ../calendar/calendar.error.xml.h:59
+msgid "Would you like to send a cancelation notice for this memo?"
+msgstr "Would you like to send a cancellation notice for this memo?"
-#: ../calendar/calendar.error.xml.h:57
+#: ../calendar/calendar.error.xml.h:60
msgid "Would you like to send all the participants a cancelation notice?"
msgstr "Would you like to send all the participants a cancellation notice?"
-#: ../calendar/calendar.error.xml.h:58
+#: ../calendar/calendar.error.xml.h:61
msgid "Would you like to send meeting invitations to participants?"
msgstr "Would you like to send meeting invitations to participants?"
-#: ../calendar/calendar.error.xml.h:59
+#: ../calendar/calendar.error.xml.h:62
msgid "Would you like to send this task to participants?"
msgstr "Would you like to send this task to participants?"
-#: ../calendar/calendar.error.xml.h:60
+#: ../calendar/calendar.error.xml.h:63
msgid "Would you like to send updated meeting information to participants?"
msgstr "Would you like to send updated meeting information to participants?"
-#: ../calendar/calendar.error.xml.h:61
+#: ../calendar/calendar.error.xml.h:64
msgid "Would you like to send updated task information to participants?"
msgstr "Would you like to send updated task information to participants?"
-#: ../calendar/calendar.error.xml.h:62
+#: ../calendar/calendar.error.xml.h:65
msgid "You are connecting to an unsupported GroupWise server and may encounter problems using Evolution. For best results, the server should be upgraded to a supported version."
msgstr "You are connecting to an unsupported GroupWise server and may encounter problems using Evolution. For best results, the server should be upgraded to a supported version."
-#: ../calendar/calendar.error.xml.h:63
-msgid "You have a read-only calendar source selected. Change to Calendar View and highlight a calendar that can accept appointments."
-msgstr "You have a read-only calendar source selected. Change to Calendar View and highlight a calendar that can accept appointments."
-
-#: ../calendar/calendar.error.xml.h:64
+#: ../calendar/calendar.error.xml.h:66
msgid "You have changed this appointment, but not yet saved it."
msgstr "You have changed this appointment, but not yet saved it."
# calendar:prompt-save-task secondary
-#: ../calendar/calendar.error.xml.h:65
+#: ../calendar/calendar.error.xml.h:67
msgid "You have changed this task, but not yet saved it."
msgstr "You have changed this task, but not yet saved it."
# calendar:prompt-save-task secondary
-#: ../calendar/calendar.error.xml.h:66
+#: ../calendar/calendar.error.xml.h:68
msgid "You have made changes to this memo, but not yet saved them."
msgstr "You have made changes to this memo, but not yet saved them."
-#: ../calendar/calendar.error.xml.h:67
+#: ../calendar/calendar.error.xml.h:69
msgid "Your calendars will not be available until Evolution is restarted."
msgstr "Your calendars will not be available until Evolution is restarted."
-#: ../calendar/calendar.error.xml.h:68
+#: ../calendar/calendar.error.xml.h:70
msgid "Your memos will not be available until Evolution is restarted."
msgstr "Your memos will not be available until Evolution is restarted."
-#: ../calendar/calendar.error.xml.h:69
+#: ../calendar/calendar.error.xml.h:71
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:70
+#: ../calendar/calendar.error.xml.h:72
#: ../composer/mail-composer.error.xml.h:29
msgid "_Discard Changes"
msgstr "_Discard Changes"
-#: ../calendar/calendar.error.xml.h:71
+#: ../calendar/calendar.error.xml.h:73
#: ../ui/evolution-editor.xml.h:23
#: ../ui/evolution-message-composer.xml.h:59
msgid "_Save"
msgstr "_Save"
-#: ../calendar/calendar.error.xml.h:72
+#: ../calendar/calendar.error.xml.h:74
msgid "_Save Changes"
msgstr "_Save Changes"
-#: ../calendar/calendar.error.xml.h:73
+#: ../calendar/calendar.error.xml.h:75
#: ../composer/mail-composer.error.xml.h:33
-#: ../mail/mail.error.xml.h:139
+#: ../mail/mail.error.xml.h:142
+#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:5
msgid "_Send"
msgstr "_Send"
-#: ../calendar/calendar.error.xml.h:74
+#: ../calendar/calendar.error.xml.h:76
msgid "_Send Notice"
msgstr "_Send Notice"
-#: ../calendar/calendar.error.xml.h:75
+#: ../calendar/calendar.error.xml.h:77
msgid "{0}."
msgstr "{0}."
-#: ../calendar/common/authentication.c:49
-#: ../calendar/gui/e-pub-utils.c:323
-#: ../smime/gui/component.c:50
-msgid "Enter password"
-msgstr "Enter password"
-
-#: ../calendar/conduits/calendar/calendar-conduit.c:253
+#: ../calendar/conduits/calendar/calendar-conduit.c:254
msgid "Split Multi-Day Events:"
msgstr "Split Multi-Day Events:"
-#: ../calendar/conduits/calendar/calendar-conduit.c:1504
-#: ../calendar/conduits/calendar/calendar-conduit.c:1505
-#: ../calendar/conduits/memo/memo-conduit.c:930
-#: ../calendar/conduits/memo/memo-conduit.c:931
-#: ../calendar/conduits/todo/todo-conduit.c:1106
-#: ../calendar/conduits/todo/todo-conduit.c:1107
+#: ../calendar/conduits/calendar/calendar-conduit.c:1515
+#: ../calendar/conduits/calendar/calendar-conduit.c:1516
+#: ../calendar/conduits/memo/memo-conduit.c:816
+#: ../calendar/conduits/memo/memo-conduit.c:817
+#: ../calendar/conduits/todo/todo-conduit.c:1014
+#: ../calendar/conduits/todo/todo-conduit.c:1015
msgid "Could not start evolution-data-server"
msgstr "Could not start evolution-data-server"
-#: ../calendar/conduits/calendar/calendar-conduit.c:1612
-#: ../calendar/conduits/calendar/calendar-conduit.c:1615
+#: ../calendar/conduits/calendar/calendar-conduit.c:1623
+#: ../calendar/conduits/calendar/calendar-conduit.c:1626
msgid "Could not read pilot's Calendar application block"
msgstr "Could not read pilot's Calendar application block"
-#: ../calendar/conduits/memo/memo-conduit.c:1024
-#: ../calendar/conduits/memo/memo-conduit.c:1027
+#: ../calendar/conduits/memo/memo-conduit.c:910
+#: ../calendar/conduits/memo/memo-conduit.c:913
msgid "Could not read pilot's Memo application block"
msgstr "Could not read pilot's Memo application block"
-#: ../calendar/conduits/memo/memo-conduit.c:1071
-#: ../calendar/conduits/memo/memo-conduit.c:1074
+#: ../calendar/conduits/memo/memo-conduit.c:957
+#: ../calendar/conduits/memo/memo-conduit.c:960
msgid "Could not write pilot's Memo application block"
msgstr "Could not write pilot's Memo application block"
-#: ../calendar/conduits/todo/todo-conduit.c:237
+#: ../calendar/conduits/todo/todo-conduit.c:238
msgid "Default Priority:"
msgstr "Default Priority:"
-#: ../calendar/conduits/todo/todo-conduit.c:1190
-#: ../calendar/conduits/todo/todo-conduit.c:1193
+#: ../calendar/conduits/todo/todo-conduit.c:1098
+#: ../calendar/conduits/todo/todo-conduit.c:1101
msgid "Could not read pilot's ToDo application block"
msgstr "Could not read pilot's ToDo application block"
-#: ../calendar/conduits/todo/todo-conduit.c:1235
-#: ../calendar/conduits/todo/todo-conduit.c:1238
+#: ../calendar/conduits/todo/todo-conduit.c:1143
+#: ../calendar/conduits/todo/todo-conduit.c:1146
msgid "Could not write pilot's ToDo application block"
msgstr "Could not write pilot's ToDo application block"
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:116
+#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
+#: ../plugins/itip-formatter/itip-formatter.c:2329
+msgid "Calendar and Tasks"
+msgstr "Calendar and Tasks"
+
+#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
+#: ../calendar/gui/calendar-component.c:1392
+msgid "Calendars"
+msgstr "Calendars"
+
+#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
+msgid "Configure your timezone, Calendar and Task List here "
+msgstr "Configure your timezone, Calendar and Task List here "
+
+#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
+msgid "Evolution Calendar and Tasks"
+msgstr "Evolution Calendar and Tasks"
+
+#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
+msgid "Evolution Calendar configuration control"
+msgstr "Evolution Calendar configuration control"
+
+#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
+msgid "Evolution Calendar scheduling message viewer"
+msgstr "Evolution Calendar scheduling message viewer"
+
+#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
+msgid "Evolution Calendar/Task editor"
+msgstr "Evolution Calendar/Task editor"
+
+#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
+msgid "Evolution's Calendar component"
+msgstr "Evolution's Calendar component"
+
+#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
+msgid "Evolution's Memos component"
+msgstr "Evolution's Memos component"
+
+#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
+msgid "Evolution's Tasks component"
+msgstr "Evolution's Tasks component"
+
+#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
+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:1151
+#: ../calendar/gui/gnome-cal.c:1701
+#: ../calendar/gui/memos-component.c:548
+#: ../calendar/gui/memos-component.c:1101
+#: ../calendar/gui/memos-control.c:356
+#: ../calendar/gui/memos-control.c:372
+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:1435
+#: ../calendar/gui/gnome-cal.c:1573
+#: ../calendar/gui/print.c:1966
+#: ../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:83
+#: ../plugins/exchange-operations/exchange-folder.c:587
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:401
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:545
+#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:12
+msgid "Tasks"
+msgstr "Tasks"
+
+#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:14
+msgid "_Calendars"
+msgstr "_Calendars"
+
+#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:15
+#: ../views/tasks/galview.xml.h:3
+msgid "_Tasks"
+msgstr "_Tasks"
+
+#: ../calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
+msgid "Evolution Calendar alarm notification service"
+msgstr "Evolution Calendar alarm notification service"
+
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:112
msgid "minute"
msgid_plural "minutes"
msgstr[0] "minute"
msgstr[1] "minutes"
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:131
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:127
#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:6
#: ../calendar/gui/dialogs/alarm-dialog.glade.h:25
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:12
#: ../calendar/gui/dialogs/event-page.glade.h:19
#: ../filter/filter.glade.h:15
-#: ../plugins/calendar-http/calendar-http.c:287
-#: ../plugins/calendar-weather/calendar-weather.c:564
+#: ../plugins/calendar-http/calendar-http.c:289
+#: ../plugins/calendar-weather/calendar-weather.c:562
+#: ../plugins/google-account-setup/google-source.c:396
msgid "hours"
msgid_plural "hours"
msgstr[0] "hours"
@@ -4393,10 +4458,10 @@ msgstr "Appointments"
#. Location
#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:2
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1641
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1647
-#: ../calendar/gui/e-itip-control.c:1145
-#: ../plugins/itip-formatter/itip-view.c:943
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1611
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1617
+#: ../calendar/gui/e-itip-control.c:1155
+#: ../plugins/itip-formatter/itip-view.c:1004
msgid "Location:"
msgstr "Location:"
@@ -4407,7 +4472,7 @@ msgstr "Snooze _time:"
#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:4
#: ../calendar/gui/dialogs/recurrence-page.glade.h:10
#: ../filter/filter.glade.h:11
-#: ../mail/mail-config.glade.h:159
+#: ../mail/mail-config.glade.h:158
#: ../plugins/exchange-operations/exchange-delegates.glade.h:15
#: ../plugins/publish-calendar/publish-calendar.glade.h:21
#: ../ui/evolution-addressbook.xml.h:51
@@ -4421,6 +4486,7 @@ msgstr "Snooze _time:"
#: ../ui/evolution-subscribe.xml.h:10
#: ../ui/evolution-tasks.xml.h:25
#: ../ui/evolution.xml.h:41
+#: ../widgets/menus/gal-define-views.glade.h:5
msgid "_Edit"
msgstr "_Edit"
@@ -4432,31 +4498,32 @@ msgstr "_Snooze"
msgid "location of appointment"
msgstr "location of appointment"
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1473
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1623
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1470
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1593
msgid "No summary available."
msgstr "No summary available."
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1482
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1484
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1479
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1481
msgid "No description available."
msgstr "No description available."
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1492
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1489
msgid "No location information available."
msgstr "No location information available."
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1554
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1533
#, c-format
msgid "You have %d alarms"
msgstr "You have %d alarms"
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1725
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1753
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1695
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1723
+#: ../mail/mail-component.c:1517
msgid "Warning"
msgstr "Warning"
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1729
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1699
msgid ""
"Evolution does not support calendar reminders with\n"
"email notifications yet, but this reminder was\n"
@@ -4468,7 +4535,7 @@ msgstr ""
"configured to send an email. Evolution will display\n"
"a normal reminder dialogue box instead."
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1759
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1729
#, c-format
msgid ""
"An Evolution Calendar reminder is about to trigger. This reminder is configured to run the following program:\n"
@@ -4483,21 +4550,17 @@ msgstr ""
"\n"
"Are you sure you want to run this program?"
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1773
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1743
msgid "Do not ask me about this program again."
msgstr "Do not ask me about this program again."
-#: ../calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
-msgid "Evolution Calendar alarm notification service"
-msgstr "Evolution Calendar alarm notification service"
-
#: ../calendar/gui/alarm-notify/notify-main.c:140
msgid "Could not initialize Bonobo"
msgstr "Could not initialise Bonobo"
#: ../calendar/gui/alarm-notify/notify-main.c:153
-msgid "Could not create the alarm notify service factory"
-msgstr "Could not create the alarm notify service factory"
+msgid "Could not create the alarm notify service factory, maybe it's already running..."
+msgstr "Could not create the alarm notify service factory, maybe it's already running..."
#: ../calendar/gui/alarm-notify/util.c:41
msgid "invalid time"
@@ -4535,382 +4598,436 @@ msgid_plural "%d seconds"
msgstr[0] "%d second"
msgstr[1] "%d seconds"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:1
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:1
msgid "Alarm programs"
msgstr "Alarm programs"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:2
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:2
msgid "Ask for confirmation when deleting items"
msgstr "Ask for confirmation when deleting items"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:3
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:3
msgid "Background color of tasks that are due today, in \"#rrggbb\" format."
msgstr "Background colour of tasks that are due today, in \"#rrggbb\" format."
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:4
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:4
msgid "Background color of tasks that are overdue, in \"#rrggbb\" format."
msgstr "Background colour of tasks that are overdue, in \"#rrggbb\" format."
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:5
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:5
msgid "Calendars to run alarms for"
msgstr "Calendars to run alarms for"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:6
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:6
msgid "Color to draw the Marcus Bains Line in the Time bar (empty for default)."
msgstr "Colour to draw the Marcus Bains Line in the Time bar (empty for default)."
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:7
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:7
msgid "Color to draw the Marcus Bains line in the Day View."
msgstr "Colour to draw the Marcus Bains line in the Day View."
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:8
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:8
msgid "Compress weekends in month view"
msgstr "Compress weekends in month view"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:9
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:9
msgid "Confirm expunge"
msgstr "Confirm expunge"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:10
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:10
msgid "Days on which the start and end of work hours should be indicated."
msgstr "Days on which the start and end of work hours should be indicated."
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:11
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:11
msgid "Default appointment reminder"
msgstr "Default appointment reminder"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:12
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:12
msgid "Default reminder units"
msgstr "Default reminder units"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:13
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:13
msgid "Default reminder value"
msgstr "Default reminder value"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:14
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:14
msgid "Directory for saving alarm audio files"
msgstr "Directory for saving alarm audio files"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:15
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:15
msgid "Event Gradient"
msgstr "Event Gradient"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:16
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:16
msgid "Event Transparency"
msgstr "Event Transparency"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:17
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:17
msgid "Free/busy server URLs"
msgstr "Free/busy server URLs"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:18
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:18
msgid "Free/busy template URL"
msgstr "Free/busy template URL"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:19
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:19
msgid "Gradient of the events in calendar views."
msgstr "Gradient of the events in calendar views."
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:20
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:20
msgid "Hide completed tasks"
msgstr "Hide completed tasks"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:21
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:21
msgid "Hide task units"
msgstr "Hide task units"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:22
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:22
msgid "Hide task value"
msgstr "Hide task value"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:23
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:23
msgid "Horizontal pane position"
msgstr "Horizontal pane position"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:24
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:24
msgid "Hour the workday ends on, in twenty four hour format, 0 to 23."
msgstr "Hour the workday ends on, in twenty four hour format, 0 to 23."
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:25
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:25
msgid "Hour the workday starts on, in twenty four hour format, 0 to 23."
msgstr "Hour the workday starts on, in twenty four hour format, 0 to 23."
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:26
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:26
msgid "Intervals shown in Day and Work Week views, in minutes."
msgstr "Intervals shown in Day and Work Week views, in minutes."
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:27
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:27
msgid "Last alarm time"
msgstr "Last alarm time"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:28
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:28
msgid "List of server URLs for free/busy publishing."
msgstr "List of server URLs for free/busy publishing."
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:29
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:29
msgid "Marcus Bains Line"
msgstr "Marcus Bains Line"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:30
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:30
msgid "Marcus Bains Line Color - Day View"
msgstr "Marcus Bains Line Colour - Day View"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:31
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:31
msgid "Marcus Bains Line Color - Time bar"
msgstr "Marcus Bains Line Colour - Time bar"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:32
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:32
msgid "Minute the workday ends on, 0 to 59."
msgstr "Minute the workday ends on, 0 to 59."
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:33
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:33
msgid "Minute the workday starts on, 0 to 59."
msgstr "Minute the workday starts on, 0 to 59."
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:34
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:34
msgid "Month view horizontal pane position"
msgstr "Month view horizontal pane position"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:35
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:35
msgid "Month view vertical pane position"
msgstr "Month view vertical pane position"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:36
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:36
msgid "Number of units for determining a default reminder."
msgstr "Number of units for determining a default reminder."
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:37
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:37
msgid "Number of units for determining when to hide tasks."
msgstr "Number of units for determining when to hide tasks."
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:38
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:38
msgid "Overdue tasks color"
msgstr "Overdue tasks colour"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:39
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:39
msgid "Position of the horizontal pane, between the date navigator calendar and the task list when not in the month view, in pixels."
msgstr "Position of the horizontal pane, between the date navigator calendar and the task list when not in the month view, in pixels."
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:40
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:40
msgid "Position of the horizontal pane, between the view and the date navigator calendar and task list in the month view, in pixels."
msgstr "Position of the horizontal pane, between the view and the date navigator calendar and task list in the month view, in pixels."
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:41
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:41
msgid "Position of the vertical pane, between the calendar lists and the date navigator calendar."
msgstr "Position of the vertical pane, between the calendar lists and the date navigator calendar."
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:42
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:42
msgid "Position of the vertical pane, between the task list and the task preview pane, in pixels."
msgstr "Position of the vertical pane, between the task list and the task preview pane, in pixels."
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:43
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:43
msgid "Position of the vertical pane, between the view and the date navigator calendar and task list in the month view, in pixels."
msgstr "Position of the vertical pane, between the view and the date navigator calendar and task list in the month view, in pixels."
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:44
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:44
msgid "Position of the vertical pane, between the view and the date navigator calendar and task list when not in the month view, in pixels."
msgstr "Position of the vertical pane, between the view and the date navigator calendar and task list when not in the month view, in pixels."
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:45
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:45
msgid "Programs that are allowed to be run by alarms."
msgstr "Programs that are allowed to be run by alarms."
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:46
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:46
msgid "Save directory for alarm audio"
msgstr "Save directory for alarm audio"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:47
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:47
msgid "Show RSVP field in the event/task/meeting editor"
msgstr "Show RSVP field in the event/task/meeting editor"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:48
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:48
msgid "Show Role field in the event/task/meeting editor"
msgstr "Show Role field in the event/task/meeting editor"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:49
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:49
msgid "Show appointment end times in week and month views"
msgstr "Show appointment end times in week and month views"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:50
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:50
msgid "Show categories field in the event/meeting/task editor"
msgstr "Show categories field in the event/meeting/task editor"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:51
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:51
msgid "Show display alarms in notification tray"
msgstr "Show display alarms in notification tray"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:52
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:52
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.in.h:53
-#: ../mail/evolution-mail.schemas.in.in.h:92
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:53
+#: ../mail/evolution-mail.schemas.in.h:111
msgid "Show the \"Preview\" pane"
msgstr "Show the \"Preview\" pane"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:54
-#: ../mail/evolution-mail.schemas.in.in.h:93
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:54
+#: ../mail/evolution-mail.schemas.in.h:112
msgid "Show the \"Preview\" pane."
msgstr "Show the \"Preview\" pane."
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:55
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:55
msgid "Show timezone field in the event/meeting editor"
msgstr "Show timezone field in the event/meeting editor"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:56
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:56
msgid "Show type field in the event/task/meeting editor"
msgstr "Show type field in the event/task/meeting editor"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:57
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:57
msgid "Show week numbers in date navigator"
msgstr "Show week numbers in date navigator"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:58
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:58
msgid "Tasks due today color"
msgstr "Tasks due today colour"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:59
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:59
msgid "Tasks vertical pane position"
msgstr "Tasks vertical pane position"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:61
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:61
#, no-c-format
msgid "The URL template to use as a free/busy data fallback, %u is replaced by the user part of the mail address and %d is replaced by the domain."
msgstr "The URL template to use as a free/busy data fallback, %u is replaced by the user part of the mail address and %d is replaced by the domain."
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:62
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:62
msgid "The default timezone to use for dates and times in the calendar, as an untranslated Olsen timezone database location like \"America/New York\"."
msgstr "The default timezone to use for dates and times in the calendar, as an untranslated Olsen timezone database location like \"America/New York\"."
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:63
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:63
msgid "Time divisions"
msgstr "Time divisions"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:64
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:64
msgid "Time the last alarm ran, in time_t."
msgstr "Time the last alarm ran, in time_t."
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:65
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:65
#: ../plugins/startup-wizard/startup-wizard.c:108
msgid "Timezone"
msgstr "Timezone"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:66
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:66
msgid "Transparency of the events in calendar views, a value between 0 (transparent) and 1 (opaque)."
msgstr "Transparency of the events in calendar views, a value between 0 (transparent) and 1 (opaque)."
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:67
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:67
msgid "Twenty four hour time format"
msgstr "Twenty four hour time format"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:68
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:68
msgid "Units for a default reminder, \"minutes\", \"hours\" or \"days\"."
msgstr "Units for a default reminder, \"minutes\", \"hours\" or \"days\"."
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:69
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:69
msgid "Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days\"."
msgstr "Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days\"."
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:71
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:71
msgid "Week start"
msgstr "Week start"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:72
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:72
msgid "Weekday the week starts on, from Sunday (0) to Saturday (6)."
msgstr "Weekday the week starts on, from Sunday (0) to Saturday (6)."
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:73
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:73
msgid "Whether or not to use the notification tray for display alarms."
msgstr "Whether or not to use the notification tray for display alarms."
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:74
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:74
msgid "Whether to ask for confirmation when deleting an appointment or task."
msgstr "Whether to ask for confirmation when deleting an appointment or task."
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:75
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:75
msgid "Whether to ask for confirmation when expunging appointments and tasks."
msgstr "Whether to ask for confirmation when expunging appointments and tasks."
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:76
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:76
msgid "Whether to compress weekends in the month view, which puts Saturday and Sunday in the space of one weekday."
msgstr "Whether to compress weekends in the month view, which puts Saturday and Sunday in the space of one weekday."
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:77
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:77
msgid "Whether to display the end time of events in the week and month views."
msgstr "Whether to display the end time of events in the week and month views."
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:78
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:78
msgid "Whether to draw the Marcus Bains Line (line at current time) in the calendar."
msgstr "Whether to draw the Marcus Bains Line (line at current time) in the calendar."
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:79
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:79
msgid "Whether to hide completed tasks in the tasks view."
msgstr "Whether to hide completed tasks in the tasks view."
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:80
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:80
msgid "Whether to set a default reminder for appointments."
msgstr "Whether to set a default reminder for appointments."
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:81
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:81
msgid "Whether to show RSVP field in the event/task/meeting editor"
msgstr "Whether to show RSVP field in the event/task/meeting editor"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:82
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:82
msgid "Whether to show categories field in the event/meeting editor"
msgstr "Whether to show categories field in the event/meeting editor"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:83
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:83
msgid "Whether to show role field in the event/task/meeting editor"
msgstr "Whether to show role field in the event/task/meeting editor"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:84
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:84
msgid "Whether to show status field in the event/task/meeting editor"
msgstr "Whether to show status field in the event/task/meeting editor"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:85
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:85
msgid "Whether to show times in twenty four hour format instead of using am/pm."
msgstr "Whether to show times in twenty four hour format instead of using am/pm."
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:86
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:86
msgid "Whether to show timezone field in the event/meeting editor"
msgstr "Whether to show timezone field in the event/meeting editor"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:87
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:87
msgid "Whether to show type field in the event/task/meeting editor"
msgstr "Whether to show type field in the event/task/meeting editor"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:88
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:88
msgid "Whether to show week numbers in the date navigator."
msgstr "Whether to show week numbers in the date navigator."
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:89
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:89
msgid "Whether to use daylight savings time while displaying events."
msgstr "Whether to use daylight savings time while displaying events."
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:90
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:90
msgid "Work days"
msgstr "Work days"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:91
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:91
msgid "Workday end hour"
msgstr "Workday end hour"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:92
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:92
msgid "Workday end minute"
msgstr "Workday end minute"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:93
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:93
msgid "Workday start hour"
msgstr "Workday start hour"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:94
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:94
msgid "Workday start minute"
msgstr "Workday start minute"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:95
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:95
msgid "daylight savings time"
msgstr "daylight savings time"
+#: ../calendar/gui/cal-search-bar.c:73
+msgid "Summary contains"
+msgstr "Summary contains"
+
+#: ../calendar/gui/cal-search-bar.c:74
+msgid "Description contains"
+msgstr "Description contains"
+
+#: ../calendar/gui/cal-search-bar.c:75
+msgid "Category is"
+msgstr "Category is"
+
+#: ../calendar/gui/cal-search-bar.c:76
+msgid "Comment contains"
+msgstr "Comment contains"
+
+#: ../calendar/gui/cal-search-bar.c:77
+msgid "Location contains"
+msgstr "Location contains"
+
+#: ../calendar/gui/cal-search-bar.c:623
+#: ../calendar/gui/cal-search-bar.c:666
+#: ../calendar/gui/cal-search-bar.c:685
+msgid "Unmatched"
+msgstr "Unmatched"
+
+#: ../calendar/gui/cal-search-bar.c:631
+msgid "Next 7 Days' Tasks"
+msgstr "Next 7 Days' Tasks"
+
+#: ../calendar/gui/cal-search-bar.c:635
+msgid "Active Tasks"
+msgstr "Active Tasks"
+
+#: ../calendar/gui/cal-search-bar.c:639
+msgid "Overdue Tasks"
+msgstr "Overdue Tasks"
+
+#: ../calendar/gui/cal-search-bar.c:643
+msgid "Completed Tasks"
+msgstr "Completed Tasks"
+
+#: ../calendar/gui/cal-search-bar.c:647
+msgid "Tasks with Attachments"
+msgstr "Tasks with Attachments"
+
+#: ../calendar/gui/cal-search-bar.c:693
+msgid "Active Appointments"
+msgstr "Active Appointments"
+
+#: ../calendar/gui/cal-search-bar.c:697
+msgid "Next 7 Days' Appointments"
+msgstr "Next 7 Days' Appointments"
+
#: ../calendar/gui/calendar-commands.c:99
#: ../ui/evolution-addressbook.xml.h:26
#: ../ui/evolution-calendar.xml.h:20
@@ -4930,10 +5047,10 @@ msgstr "Purge events older than"
#: ../calendar/gui/calendar-commands.c:335
#: ../calendar/gui/dialogs/alarm-dialog.glade.h:21
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:11
#: ../filter/filter.glade.h:14
-#: ../plugins/calendar-http/calendar-http.c:288
-#: ../plugins/calendar-weather/calendar-weather.c:565
+#: ../plugins/calendar-http/calendar-http.c:290
+#: ../plugins/calendar-weather/calendar-weather.c:563
+#: ../plugins/google-account-setup/google-source.c:397
#: ../widgets/misc/e-send-options.glade.h:38
msgid "days"
msgstr "days"
@@ -4942,97 +5059,110 @@ msgstr "days"
#. Create the LDAP source group
#. Create the Webcal source group
#. Create the LDAP source group
-#: ../calendar/gui/calendar-component.c:260
-#: ../calendar/gui/memos-component.c:222
-#: ../calendar/gui/migration.c:506
-#: ../calendar/gui/migration.c:599
-#: ../calendar/gui/migration.c:1107
-#: ../calendar/gui/tasks-component.c:218
+#: ../calendar/gui/calendar-component.c:273
+#: ../calendar/gui/memos-component.c:235
+#: ../calendar/gui/migration.c:511
+#: ../calendar/gui/migration.c:609
+#: ../calendar/gui/migration.c:1122
+#: ../calendar/gui/tasks-component.c:231
msgid "On The Web"
msgstr "On The Web"
-#: ../calendar/gui/calendar-component.c:278
+#: ../calendar/gui/calendar-component.c:296
#: ../calendar/gui/migration.c:405
msgid "Birthdays & Anniversaries"
msgstr "Birthdays & Anniversaries"
#. Create the weather group
-#: ../calendar/gui/calendar-component.c:284
+#: ../calendar/gui/calendar-component.c:308
#: ../plugins/calendar-weather/calendar-weather.c:100
msgid "Weather"
msgstr "Weather"
-#: ../calendar/gui/calendar-component.c:582
+#: ../calendar/gui/calendar-component.c:605
msgid "_New Calendar"
msgstr "_New Calendar"
-#: ../calendar/gui/calendar-component.c:899
+#: ../calendar/gui/calendar-component.c:606
+#: ../calendar/gui/memos-component.c:465
+#: ../calendar/gui/tasks-component.c:456
+#: ../mail/em-folder-tree.c:2102
+msgid "_Copy..."
+msgstr "_Copy..."
+
+#: ../calendar/gui/calendar-component.c:612
+#: ../calendar/gui/dialogs/comp-editor.c:1136
+#: ../calendar/gui/memos-component.c:471
+#: ../calendar/gui/tasks-component.c:462
+#: ../composer/e-msg-composer.c:3634
+#: ../mail/em-folder-tree.c:2116
+#: ../ui/evolution-addressbook.xml.h:59
+#: ../ui/evolution-mail-list.xml.h:38
+msgid "_Properties"
+msgstr "_Properties"
+
+#: ../calendar/gui/calendar-component.c:939
msgid "Failed upgrading calendars."
msgstr "Failed upgrading calendars."
-#: ../calendar/gui/calendar-component.c:1198
+#: ../calendar/gui/calendar-component.c:1238
#, 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:1214
+#: ../calendar/gui/calendar-component.c:1254
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:1336
+#: ../calendar/gui/calendar-component.c:1367
msgid "Calendar Source Selector"
msgstr "Calendar Source Selector"
-#: ../calendar/gui/calendar-component.c:1361
-#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-msgid "Calendars"
-msgstr "Calendars"
-
-#: ../calendar/gui/calendar-component.c:1544
+#: ../calendar/gui/calendar-component.c:1585
msgid "New appointment"
msgstr "New appointment"
-#: ../calendar/gui/calendar-component.c:1545
+#: ../calendar/gui/calendar-component.c:1586
msgid "_Appointment"
msgstr "_Appointment"
-#: ../calendar/gui/calendar-component.c:1546
+#: ../calendar/gui/calendar-component.c:1587
msgid "Create a new appointment"
msgstr "Create a new appointment"
-#: ../calendar/gui/calendar-component.c:1552
+#: ../calendar/gui/calendar-component.c:1593
msgid "New meeting"
msgstr "New meeting"
-#: ../calendar/gui/calendar-component.c:1553
+#: ../calendar/gui/calendar-component.c:1594
msgid "M_eeting"
msgstr "M_eeting"
-#: ../calendar/gui/calendar-component.c:1554
+#: ../calendar/gui/calendar-component.c:1595
msgid "Create a new meeting request"
msgstr "Create a new meeting request"
-#: ../calendar/gui/calendar-component.c:1560
+#: ../calendar/gui/calendar-component.c:1601
msgid "New all day appointment"
msgstr "New all day appointment"
-#: ../calendar/gui/calendar-component.c:1561
+#: ../calendar/gui/calendar-component.c:1602
msgid "All Day A_ppointment"
msgstr "All Day A_ppointment"
-#: ../calendar/gui/calendar-component.c:1562
+#: ../calendar/gui/calendar-component.c:1603
msgid "Create a new all-day appointment"
msgstr "Create a new all-day appointment"
-#: ../calendar/gui/calendar-component.c:1568
+#: ../calendar/gui/calendar-component.c:1609
msgid "New calendar"
msgstr "New calendar"
-#: ../calendar/gui/calendar-component.c:1569
+#: ../calendar/gui/calendar-component.c:1610
msgid "Cale_ndar"
msgstr "Cale_ndar"
-#: ../calendar/gui/calendar-component.c:1570
+#: ../calendar/gui/calendar-component.c:1611
msgid "Create a new calendar"
msgstr "Create a new calendar"
@@ -5052,48 +5182,36 @@ msgstr "Week View"
msgid "Month View"
msgstr "Month View"
-#: ../calendar/gui/cal-search-bar.c:55
-msgid "Summary contains"
-msgstr "Summary contains"
-
-#: ../calendar/gui/cal-search-bar.c:56
-msgid "Description contains"
-msgstr "Description contains"
-
-#: ../calendar/gui/cal-search-bar.c:57
-msgid "Category is"
-msgstr "Category is"
+#: ../calendar/gui/caltypes.xml.h:2
+#: ../calendar/gui/memotypes.xml.h:2
+#: ../calendar/gui/tasktypes.xml.h:2
+msgid "Description Contains"
+msgstr "Description Contains"
-#: ../calendar/gui/cal-search-bar.c:58
-msgid "Comment contains"
-msgstr "Comment contains"
+#: ../calendar/gui/caltypes.xml.h:3
+#: ../calendar/gui/memotypes.xml.h:3
+#: ../calendar/gui/tasktypes.xml.h:3
+msgid "Summary Contains"
+msgstr "Summary Contains"
-#: ../calendar/gui/cal-search-bar.c:59
-msgid "Location contains"
-msgstr "Location contains"
-
-#: ../calendar/gui/cal-search-bar.c:432
-msgid "Unmatched"
-msgstr "Unmatched"
-
-#: ../calendar/gui/comp-editor-factory.c:415
+#: ../calendar/gui/comp-editor-factory.c:404
msgid "Error while opening the calendar"
msgstr "Error while opening the calendar"
-#: ../calendar/gui/comp-editor-factory.c:421
+#: ../calendar/gui/comp-editor-factory.c:410
msgid "Method not supported when opening the calendar"
msgstr "Method not supported when opening the calendar"
-#: ../calendar/gui/comp-editor-factory.c:427
+#: ../calendar/gui/comp-editor-factory.c:416
msgid "Permission denied to open the calendar"
msgstr "Permission denied to open the calendar"
-#: ../calendar/gui/comp-editor-factory.c:439
-#: ../shell/e-shell.c:1274
+#: ../calendar/gui/comp-editor-factory.c:428
+#: ../shell/e-shell.c:1290
msgid "Unknown error"
msgstr "Unknown error"
-#: ../calendar/gui/dialogs/alarm-dialog.c:615
+#: ../calendar/gui/dialogs/alarm-dialog.c:616
msgid "Edit Alarm"
msgstr "Edit Alarm"
@@ -5204,7 +5322,7 @@ msgstr "minute(s)"
msgid "start of appointment"
msgstr "start of appointment"
-#: ../calendar/gui/dialogs/alarm-list-dialog.c:235
+#: ../calendar/gui/dialogs/alarm-list-dialog.c:249
msgid "Action/Trigger"
msgstr "Action/Trigger"
@@ -5219,101 +5337,16 @@ msgstr "A_dd"
msgid "Alarms"
msgstr "Alarms"
-#: ../calendar/gui/dialogs/cal-attachment-select-file.c:97
-#: ../calendar/gui/dialogs/cal-attachment-select-file.c:116
-#: ../composer/e-msg-composer-attachment.glade.h:5
-#: ../composer/e-msg-composer-select-file.c:98
-#: ../composer/e-msg-composer-select-file.c:118
+#: ../calendar/gui/dialogs/cal-attachment-select-file.c:92
+#: ../composer/e-msg-composer-select-file.c:93
msgid "_Suggest automatic display of attachment"
msgstr "_Suggest automatic display of attachment"
-#: ../calendar/gui/dialogs/cal-attachment-select-file.c:191
+#: ../calendar/gui/dialogs/cal-attachment-select-file.c:158
msgid "Attach file(s)"
msgstr "Attach file(s)"
-#: ../calendar/gui/dialogs/calendar-setup.c:268
-msgid "Cop_y calendar contents locally for offline operation"
-msgstr "Cop_y calendar contents locally for offline operation"
-
-#: ../calendar/gui/dialogs/calendar-setup.c:270
-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:272
-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:342
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:3
-msgid "C_olor:"
-msgstr "C_olour:"
-
-#: ../calendar/gui/dialogs/calendar-setup.c:377
-msgid "Task List"
-msgstr "Task List"
-
-#: ../calendar/gui/dialogs/calendar-setup.c:388
-msgid "Memo List"
-msgstr "Memo List"
-
-#: ../calendar/gui/dialogs/calendar-setup.c:477
-msgid "Calendar Properties"
-msgstr "Calendar Properties"
-
-#: ../calendar/gui/dialogs/calendar-setup.c:479
-msgid "New Calendar"
-msgstr "New Calendar"
-
-#: ../calendar/gui/dialogs/calendar-setup.c:564
-msgid "Task List Properties"
-msgstr "Task List Properties"
-
-#: ../calendar/gui/dialogs/calendar-setup.c:630
-msgid "New Memo List"
-msgstr "New Memo List"
-
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:1
-msgid "Add Calendar"
-msgstr "Add Calendar"
-
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:2
-msgid "Add Task List"
-msgstr "Add Task List"
-
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:4
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-#: ../mail/mail-config.glade.h:105
-msgid "Pick a color"
-msgstr "Pick a colour"
-
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:5
-msgid "_Add Calendar"
-msgstr "_Add Calendar"
-
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:6
-msgid "_Add Task List"
-msgstr "_Add Task List"
-
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:8
-#: ../plugins/calendar-http/calendar-http.c:271
-#: ../plugins/calendar-weather/calendar-weather.c:548
-msgid "_Refresh:"
-msgstr "_Refresh:"
-
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:10
-#: ../plugins/caldav/caldav-source.c:247
-#: ../plugins/calendar-http/calendar-http.c:133
-msgid "_URL:"
-msgstr "_URL:"
-
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:14
-#: ../filter/filter.glade.h:22
-#: ../plugins/calendar-http/calendar-http.c:289
-#: ../plugins/calendar-weather/calendar-weather.c:566
-msgid "weeks"
-msgstr "weeks"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:479
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:485
msgid "Selected Calendars for Alarms"
msgstr "Selected Calendars for Alarms"
@@ -5337,7 +5370,7 @@ msgid "<i>%u and %d will be replaced by user and domain from the email address.<
msgstr "<i>%u and %d will be replaced by user and domain from the email address.</i>"
#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
-#: ../mail/mail-config.glade.h:7
+#: ../mail/mail-config.glade.h:10
msgid "<span weight=\"bold\">Alerts</span>"
msgstr "<span weight=\"bold\">Alerts</span>"
@@ -5346,7 +5379,7 @@ msgid "<span weight=\"bold\">Default Free/Busy Server</span>"
msgstr "<span weight=\"bold\">Default Free/Busy Server</span>"
#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
-#: ../mail/mail-config.glade.h:15
+#: ../mail/mail-config.glade.h:17
#: ../plugins/publish-calendar/publish-calendar.glade.h:1
msgid "<span weight=\"bold\">General</span>"
msgstr "<span weight=\"bold\">General</span>"
@@ -5376,8 +5409,8 @@ msgid "Display"
msgstr "Display"
#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
-#: ../calendar/gui/dialogs/recurrence-page.c:1091
-#: ../calendar/gui/e-itip-control.c:730
+#: ../calendar/gui/dialogs/recurrence-page.c:1098
+#: ../calendar/gui/e-itip-control.c:740
msgid "Friday"
msgstr "Friday"
@@ -5392,8 +5425,8 @@ msgstr ""
"Days"
#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-#: ../calendar/gui/dialogs/recurrence-page.c:1087
-#: ../calendar/gui/e-itip-control.c:726
+#: ../calendar/gui/dialogs/recurrence-page.c:1094
+#: ../calendar/gui/e-itip-control.c:736
msgid "Monday"
msgstr "Monday"
@@ -5415,14 +5448,19 @@ msgstr ""
"Saturday\n"
"Sunday"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
+#: ../mail/mail-config.glade.h:109
+msgid "Pick a color"
+msgstr "Pick a colour"
+
#. Sunday
#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
msgid "S_un"
msgstr "S_un"
#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
-#: ../calendar/gui/dialogs/recurrence-page.c:1092
-#: ../calendar/gui/e-itip-control.c:731
+#: ../calendar/gui/dialogs/recurrence-page.c:1099
+#: ../calendar/gui/e-itip-control.c:741
msgid "Saturday"
msgstr "Saturday"
@@ -5439,8 +5477,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:1093
-#: ../calendar/gui/e-itip-control.c:725
+#: ../calendar/gui/dialogs/recurrence-page.c:1100
+#: ../calendar/gui/e-itip-control.c:735
msgid "Sunday"
msgstr "Sunday"
@@ -5458,8 +5496,8 @@ msgid "Template:"
msgstr "Template:"
#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-#: ../calendar/gui/dialogs/recurrence-page.c:1090
-#: ../calendar/gui/e-itip-control.c:729
+#: ../calendar/gui/dialogs/recurrence-page.c:1097
+#: ../calendar/gui/e-itip-control.c:739
msgid "Thursday"
msgstr "Thursday"
@@ -5473,14 +5511,14 @@ msgid "Time format:"
msgstr "Time format:"
#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
-#: ../calendar/gui/dialogs/recurrence-page.c:1088
-#: ../calendar/gui/e-itip-control.c:727
+#: ../calendar/gui/dialogs/recurrence-page.c:1095
+#: ../calendar/gui/e-itip-control.c:737
msgid "Tuesday"
msgstr "Tuesday"
#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
-#: ../calendar/gui/dialogs/recurrence-page.c:1089
-#: ../calendar/gui/e-itip-control.c:728
+#: ../calendar/gui/dialogs/recurrence-page.c:1096
+#: ../calendar/gui/e-itip-control.c:738
msgid "Wednesday"
msgstr "Wednesday"
@@ -5558,6 +5596,46 @@ msgstr "_Wed"
msgid "before every appointment"
msgstr "before every appointment"
+#: ../calendar/gui/dialogs/calendar-setup.c:272
+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
+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
+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
+msgid "C_olor:"
+msgstr "C_olour:"
+
+#: ../calendar/gui/dialogs/calendar-setup.c:381
+msgid "Task List"
+msgstr "Task List"
+
+#: ../calendar/gui/dialogs/calendar-setup.c:392
+msgid "Memo List"
+msgstr "Memo List"
+
+#: ../calendar/gui/dialogs/calendar-setup.c:478
+msgid "Calendar Properties"
+msgstr "Calendar Properties"
+
+#: ../calendar/gui/dialogs/calendar-setup.c:480
+msgid "New Calendar"
+msgstr "New Calendar"
+
+#: ../calendar/gui/dialogs/calendar-setup.c:536
+msgid "Task List Properties"
+msgstr "Task List Properties"
+
+#: ../calendar/gui/dialogs/calendar-setup.c:592
+msgid "New Memo List"
+msgstr "New Memo List"
+
#: ../calendar/gui/dialogs/changed-comp.c:60
msgid "This event has been deleted."
msgstr "This event has been deleted."
@@ -5567,8 +5645,8 @@ msgid "This task has been deleted."
msgstr "This task has been deleted."
#: ../calendar/gui/dialogs/changed-comp.c:68
-msgid "This journal entry has been deleted."
-msgstr "This journal entry has been deleted."
+msgid "This memo has been deleted."
+msgstr "This memo has been deleted."
#: ../calendar/gui/dialogs/changed-comp.c:77
#, c-format
@@ -5589,8 +5667,8 @@ msgid "This task has been changed."
msgstr "This task has been changed."
#: ../calendar/gui/dialogs/changed-comp.c:92
-msgid "This journal entry has been changed."
-msgstr "This journal entry has been changed."
+msgid "This memo has been changed."
+msgstr "This memo has been changed."
#: ../calendar/gui/dialogs/changed-comp.c:101
#, c-format
@@ -5602,8 +5680,38 @@ msgstr "%s You have made changes. Forget those changes and update the editor?"
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:519
+#, c-format
+msgid "Validation error: %s"
+msgstr "Validation error: %s"
+
+#: ../calendar/gui/dialogs/comp-editor-util.c:187
+#: ../calendar/gui/print.c:2338
+msgid " to "
+msgstr " to "
+
+#: ../calendar/gui/dialogs/comp-editor-util.c:191
+#: ../calendar/gui/print.c:2342
+msgid " (Completed "
+msgstr " (Completed "
+
+#: ../calendar/gui/dialogs/comp-editor-util.c:193
+#: ../calendar/gui/print.c:2344
+msgid "Completed "
+msgstr "Completed "
+
+#: ../calendar/gui/dialogs/comp-editor-util.c:198
+#: ../calendar/gui/print.c:2349
+msgid " (Due "
+msgstr " (Due "
+
+#: ../calendar/gui/dialogs/comp-editor-util.c:200
+#: ../calendar/gui/print.c:2351
+msgid "Due "
+msgstr "Due "
+
#: ../calendar/gui/dialogs/comp-editor.c:209
-#: ../composer/e-msg-composer.c:2914
+#: ../composer/e-msg-composer.c:2850
#, c-format
msgid "Attached message - %s"
msgstr "Attached message - %s"
@@ -5611,8 +5719,8 @@ msgstr "Attached message - %s"
#. translators, this count will always be >1
#: ../calendar/gui/dialogs/comp-editor.c:214
#: ../calendar/gui/dialogs/comp-editor.c:393
-#: ../composer/e-msg-composer.c:2919
-#: ../composer/e-msg-composer.c:3114
+#: ../composer/e-msg-composer.c:2855
+#: ../composer/e-msg-composer.c:3040
#, c-format
msgid "Attached message"
msgid_plural "%d attached messages"
@@ -5620,164 +5728,124 @@ msgstr[0] "Attached message"
msgstr[1] "%d attached messages"
#: ../calendar/gui/dialogs/comp-editor.c:464
-#: ../composer/e-msg-composer.c:3178
-#: ../mail/em-folder-tree.c:1006
-#: ../mail/em-folder-utils.c:368
-#: ../mail/em-folder-view.c:1032
-#: ../mail/message-list.c:1923
+#: ../composer/e-msg-composer.c:3104
+#: ../mail/em-folder-tree.c:1014
+#: ../mail/em-folder-utils.c:366
+#: ../mail/em-folder-view.c:1191
+#: ../mail/message-list.c:2063
msgid "_Move"
msgstr "_Move"
#: ../calendar/gui/dialogs/comp-editor.c:466
-#: ../composer/e-msg-composer.c:3180
-#: ../mail/em-folder-tree.c:1008
-#: ../mail/message-list.c:1925
+#: ../composer/e-msg-composer.c:3106
+#: ../mail/em-folder-tree.c:1016
+#: ../mail/message-list.c:2065
msgid "Cancel _Drag"
msgstr "Cancel _Drag"
-#: ../calendar/gui/dialogs/comp-editor.c:824
+#: ../calendar/gui/dialogs/comp-editor.c:669
+#: ../calendar/gui/dialogs/comp-editor.c:2827
+#: ../mail/em-utils.c:372
+#: ../plugins/prefer-plain/prefer-plain.c:79
+#: ../widgets/misc/e-attachment-bar.c:359
+msgid "attachment"
+msgstr "attachment"
+
+#: ../calendar/gui/dialogs/comp-editor.c:831
msgid "Could not update object"
msgstr "Could not update object"
-#: ../calendar/gui/dialogs/comp-editor.c:968
-#: ../composer/e-msg-composer.c:2530
+#: ../calendar/gui/dialogs/comp-editor.c:981
+#: ../composer/e-msg-composer.c:2487
#, 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:1000
+#: ../calendar/gui/dialogs/comp-editor.c:1013
msgid "Hide Attachment _Bar"
msgstr "Hide Attachment _Bar"
-#: ../calendar/gui/dialogs/comp-editor.c:1003
-#: ../calendar/gui/dialogs/comp-editor.c:1532
+#: ../calendar/gui/dialogs/comp-editor.c:1016
+#: ../calendar/gui/dialogs/comp-editor.c:1564
msgid "Show Attachment _Bar"
msgstr "Show Attachment _Bar"
-#: ../calendar/gui/dialogs/comp-editor.c:1122
-#: ../calendar/gui/dialogs/event-page.c:1902
-#: ../calendar/gui/dialogs/task-page.c:1199
-#: ../composer/e-msg-composer-attachment-bar.c:470
-#: ../composer/e-msg-composer.c:3685
+#: ../calendar/gui/dialogs/comp-editor.c:1135
+#: ../calendar/gui/dialogs/event-page.c:1967
+#: ../calendar/gui/dialogs/task-page.c:1266
+#: ../composer/e-msg-composer.c:3633
#: ../plugins/groupwise-features/junk-settings.glade.h:8
#: ../plugins/groupwise-features/properties.glade.h:13
-#: ../widgets/table/e-table-config.glade.h:18
+#: ../widgets/table/e-table-config.glade.h:21
msgid "_Remove"
msgstr "_Remove"
-#: ../calendar/gui/dialogs/comp-editor.c:1123
-#: ../composer/e-msg-composer-attachment-bar.c:471
-#: ../composer/e-msg-composer.c:3686
-#: ../mail/em-folder-tree.c:2127
-#: ../ui/evolution-addressbook.xml.h:59
-#: ../ui/evolution-mail-list.xml.h:35
-msgid "_Properties"
-msgstr "_Properties"
-
-#: ../calendar/gui/dialogs/comp-editor.c:1125
-#: ../composer/e-msg-composer-attachment-bar.c:473
-#: ../composer/e-msg-composer.c:3688
+#: ../calendar/gui/dialogs/comp-editor.c:1138
+#: ../composer/e-msg-composer.c:3636
msgid "_Add attachment..."
msgstr "_Add attachment..."
-#: ../calendar/gui/dialogs/comp-editor.c:1556
-#: ../mail/em-format-html-display.c:2314
+#: ../calendar/gui/dialogs/comp-editor.c:1588
+#: ../mail/em-format-html-display.c:2374
msgid "Show Attachments"
msgstr "Show Attachments"
-#: ../calendar/gui/dialogs/comp-editor.c:1557
+#: ../calendar/gui/dialogs/comp-editor.c:1589
msgid "Press space key to toggle attachment bar"
msgstr "Press space key to toggle attachment bar"
-#: ../calendar/gui/dialogs/comp-editor.c:2164
-#: ../calendar/gui/dialogs/comp-editor.c:2207
+#: ../calendar/gui/dialogs/comp-editor.c:2195
+#: ../calendar/gui/dialogs/comp-editor.c:2238
msgid "Edit Appointment"
msgstr "Edit Appointment"
-#: ../calendar/gui/dialogs/comp-editor.c:2170
-#: ../calendar/gui/dialogs/comp-editor.c:2213
+#: ../calendar/gui/dialogs/comp-editor.c:2201
+#: ../calendar/gui/dialogs/comp-editor.c:2244
#, c-format
msgid "Meeting - %s"
msgstr "Meeting - %s"
-#: ../calendar/gui/dialogs/comp-editor.c:2172
-#: ../calendar/gui/dialogs/comp-editor.c:2215
+#: ../calendar/gui/dialogs/comp-editor.c:2203
+#: ../calendar/gui/dialogs/comp-editor.c:2246
#, c-format
msgid "Appointment - %s"
msgstr "Appointment - %s"
-#: ../calendar/gui/dialogs/comp-editor.c:2176
-#: ../calendar/gui/dialogs/comp-editor.c:2219
+#: ../calendar/gui/dialogs/comp-editor.c:2207
+#: ../calendar/gui/dialogs/comp-editor.c:2250
#, c-format
msgid "Assigned Task - %s"
msgstr "Assigned Task - %s"
-#: ../calendar/gui/dialogs/comp-editor.c:2178
-#: ../calendar/gui/dialogs/comp-editor.c:2221
+#: ../calendar/gui/dialogs/comp-editor.c:2209
+#: ../calendar/gui/dialogs/comp-editor.c:2252
#, c-format
msgid "Task - %s"
msgstr "Task - %s"
-#: ../calendar/gui/dialogs/comp-editor.c:2181
-#: ../calendar/gui/dialogs/comp-editor.c:2224
+#: ../calendar/gui/dialogs/comp-editor.c:2212
+#: ../calendar/gui/dialogs/comp-editor.c:2255
#, c-format
-msgid "Journal entry - %s"
-msgstr "Journal entry - %s"
+msgid "Memo - %s"
+msgstr "Memo - %s"
-#: ../calendar/gui/dialogs/comp-editor.c:2192
-#: ../calendar/gui/dialogs/comp-editor.c:2234
+#: ../calendar/gui/dialogs/comp-editor.c:2223
+#: ../calendar/gui/dialogs/comp-editor.c:2265
msgid "No summary"
msgstr "No summary"
-#: ../calendar/gui/dialogs/comp-editor.c:2780
-#: ../composer/e-msg-composer-attachment-bar.c:307
-#: ../mail/em-utils.c:370
-#: ../widgets/misc/e-attachment-bar.c:350
-msgid "attachment"
-msgstr "attachment"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2869
-#: ../calendar/gui/dialogs/comp-editor.c:2923
-#: ../calendar/gui/dialogs/comp-editor.c:2947
+#: ../calendar/gui/dialogs/comp-editor.c:2916
+#: ../calendar/gui/dialogs/comp-editor.c:2970
+#: ../calendar/gui/dialogs/comp-editor.c:2994
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:2976
+#: ../calendar/gui/dialogs/comp-editor.c:3023
msgid "Unable to use current version!"
msgstr "Unable to use current version!"
-#: ../calendar/gui/dialogs/comp-editor-page.c:519
-#, c-format
-msgid "Validation error: %s"
-msgstr "Validation error: %s"
-
-#: ../calendar/gui/dialogs/comp-editor-util.c:187
-#: ../calendar/gui/print.c:2179
-msgid " to "
-msgstr " to "
-
-#: ../calendar/gui/dialogs/comp-editor-util.c:191
-#: ../calendar/gui/print.c:2183
-msgid " (Completed "
-msgstr " (Completed "
-
-#: ../calendar/gui/dialogs/comp-editor-util.c:193
-#: ../calendar/gui/print.c:2185
-msgid "Completed "
-msgstr "Completed "
-
-#: ../calendar/gui/dialogs/comp-editor-util.c:198
-#: ../calendar/gui/print.c:2190
-msgid " (Due "
-msgstr " (Due "
-
-#: ../calendar/gui/dialogs/comp-editor-util.c:200
-#: ../calendar/gui/print.c:2192
-msgid "Due "
-msgstr "Due "
-
#: ../calendar/gui/dialogs/copy-source-dialog.c:61
msgid "Could not open source"
msgstr "Could not open source"
@@ -5803,8 +5871,8 @@ 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
-msgid "The journal entry could not be deleted due to a corba error"
-msgstr "The journal entry could not be deleted due to a corba error"
+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
msgid "The item could not be deleted due to a corba error"
@@ -5819,8 +5887,8 @@ 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
-msgid "The journal entry could not be deleted because permission was denied"
-msgstr "The journal entry could not be deleted because permission was denied"
+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
msgid "The item could not be deleted because permission was denied"
@@ -5835,8 +5903,8 @@ 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
-msgid "The journal entry could not be deleted due to an error"
-msgstr "The journal entry could not be deleted due to an error"
+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
msgid "The item could not be deleted due to an error"
@@ -5864,123 +5932,130 @@ msgstr "Appoint_ment"
msgid "Recurrence"
msgstr "Recurrence"
-#: ../calendar/gui/dialogs/event-page.c:814
-#: ../calendar/gui/dialogs/event-page.c:2721
+#: ../calendar/gui/dialogs/event-page.c:826
+#: ../calendar/gui/dialogs/event-page.c:2835
msgid "This event has alarms"
msgstr "This event has alarms"
-#: ../calendar/gui/dialogs/event-page.c:886
+#: ../calendar/gui/dialogs/event-page.c:906
#: ../calendar/gui/dialogs/event-page.glade.h:11
#: ../calendar/gui/dialogs/meeting-page.glade.h:5
#: ../calendar/gui/dialogs/memo-page.glade.h:2
-#: ../calendar/gui/dialogs/task-page.c:441
msgid "Or_ganizer:"
msgstr "Or_ganiser:"
-#: ../calendar/gui/dialogs/event-page.c:924
+#: ../calendar/gui/dialogs/event-page.c:944
msgid "_Delegatees"
msgstr "_Delegatees"
-#: ../calendar/gui/dialogs/event-page.c:926
+#: ../calendar/gui/dialogs/event-page.c:946
msgid "Atte_ndees"
msgstr "Atte_ndees"
-#: ../calendar/gui/dialogs/event-page.c:1091
+#: ../calendar/gui/dialogs/event-page.c:1128
msgid "Event with no start date"
msgstr "Event with no start date"
-#: ../calendar/gui/dialogs/event-page.c:1094
+#: ../calendar/gui/dialogs/event-page.c:1131
msgid "Event with no end date"
msgstr "Event with no end date"
-#: ../calendar/gui/dialogs/event-page.c:1263
-#: ../calendar/gui/dialogs/memo-page.c:685
-#: ../calendar/gui/dialogs/task-page.c:849
+#: ../calendar/gui/dialogs/event-page.c:1303
+#: ../calendar/gui/dialogs/memo-page.c:734
+#: ../calendar/gui/dialogs/task-page.c:893
msgid "Start date is wrong"
msgstr "Start date is wrong"
-#: ../calendar/gui/dialogs/event-page.c:1273
+#: ../calendar/gui/dialogs/event-page.c:1313
msgid "End date is wrong"
msgstr "End date is wrong"
-#: ../calendar/gui/dialogs/event-page.c:1296
+#: ../calendar/gui/dialogs/event-page.c:1336
msgid "Start time is wrong"
msgstr "Start time is wrong"
-#: ../calendar/gui/dialogs/event-page.c:1303
+#: ../calendar/gui/dialogs/event-page.c:1343
msgid "End time is wrong"
msgstr "End time is wrong"
-#: ../calendar/gui/dialogs/event-page.c:1460
-#: ../calendar/gui/dialogs/memo-page.c:720
-#: ../calendar/gui/dialogs/task-page.c:906
+#: ../calendar/gui/dialogs/event-page.c:1505
+#: ../calendar/gui/dialogs/memo-page.c:774
+#: ../calendar/gui/dialogs/task-page.c:952
msgid "The organizer selected no longer has an account."
msgstr "The organiser selected no longer has an account."
-#: ../calendar/gui/dialogs/event-page.c:1466
-#: ../calendar/gui/dialogs/memo-page.c:726
-#: ../calendar/gui/dialogs/task-page.c:912
+#: ../calendar/gui/dialogs/event-page.c:1511
+#: ../calendar/gui/dialogs/memo-page.c:780
+#: ../calendar/gui/dialogs/task-page.c:958
msgid "An organizer is required."
msgstr "An organiser is required."
-#: ../calendar/gui/dialogs/event-page.c:1481
-#: ../calendar/gui/dialogs/task-page.c:927
+#: ../calendar/gui/dialogs/event-page.c:1536
+#: ../calendar/gui/dialogs/task-page.c:982
msgid "At least one attendee is required."
msgstr "At least one attendee is required."
-#: ../calendar/gui/dialogs/event-page.c:1903
-#: ../calendar/gui/dialogs/task-page.c:1200
+#: ../calendar/gui/dialogs/event-page.c:1968
+#: ../calendar/gui/dialogs/task-page.c:1267
msgid "_Add "
msgstr "_Add "
-#: ../calendar/gui/dialogs/event-page.c:2628
+#: ../calendar/gui/dialogs/event-page.c:2711
#, c-format
msgid "Unable to open the calendar '%s'."
msgstr "Unable to open the calendar '%s'."
-#: ../calendar/gui/dialogs/event-page.c:2934
+#: ../calendar/gui/dialogs/event-page.c:2755
+#: ../calendar/gui/dialogs/memo-page.c:990
+#: ../calendar/gui/dialogs/task-page.c:1928
+#, 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
#, 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:2940
+#: ../calendar/gui/dialogs/event-page.c:3059
#, 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:2946
+#: ../calendar/gui/dialogs/event-page.c:3065
#, 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:2959
+#: ../calendar/gui/dialogs/event-page.c:3078
msgid "Customize"
msgstr "Customise"
#. an empty string is the same as 'None'
-#: ../calendar/gui/dialogs/event-page.c:2964
+#: ../calendar/gui/dialogs/event-page.c:3083
#: ../calendar/gui/dialogs/meeting-page.glade.h:4
-#: ../calendar/gui/e-cal-model-tasks.c:656
-#: ../calendar/gui/e-itip-control.c:1131
-#: ../composer/e-msg-composer.c:2314
-#: ../filter/filter-rule.c:890
+#: ../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:1421
-#: ../mail/em-account-prefs.c:475
-#: ../mail/em-junk-hook.c:78
+#: ../mail/em-account-prefs.c:445
+#: ../mail/em-junk-hook.c:83
#: ../plugins/calendar-weather/calendar-weather.c:370
#: ../plugins/calendar-weather/calendar-weather.c:424
+#: ../plugins/exchange-operations/exchange-delegates-user.c:200
#: ../plugins/exchange-operations/exchange-delegates.glade.h:9
-#: ../plugins/itip-formatter/itip-formatter.c:1775
+#: ../plugins/itip-formatter/itip-formatter.c:2006
#: ../widgets/misc/e-cell-date-edit.c:247
-#: ../widgets/misc/e-dateedit.c:1503
-#: ../widgets/misc/e-dateedit.c:1717
+#: ../widgets/misc/e-dateedit.c:1531
+#: ../widgets/misc/e-dateedit.c:1745
+#: ../widgets/misc/e-signature-combo-box.c:50
msgid "None"
msgstr "None"
@@ -6000,11 +6075,6 @@ msgstr "15 minutes before appointment"
msgid "Attendee_s..."
msgstr "Attendee_s..."
-#: ../calendar/gui/dialogs/event-page.glade.h:6
-#: ../calendar/gui/dialogs/memo-page.glade.h:1
-msgid "Ca_tegories..."
-msgstr "Ca_tegories..."
-
#: ../calendar/gui/dialogs/event-page.glade.h:8
msgid "Custom Alarm:"
msgstr "Custom Alarm:"
@@ -6045,57 +6115,6 @@ msgstr "for"
msgid "until"
msgstr "until"
-#: ../calendar/gui/dialogs/meeting-page.etspec.h:1
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:1
-msgid "Attendee"
-msgstr "Attendee"
-
-#: ../calendar/gui/dialogs/meeting-page.etspec.h:2
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:2
-msgid "Click here to add an attendee"
-msgstr "Click here to add an attendee"
-
-#: ../calendar/gui/dialogs/meeting-page.etspec.h:3
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:3
-msgid "Common Name"
-msgstr "Common Name"
-
-#: ../calendar/gui/dialogs/meeting-page.etspec.h:4
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:4
-msgid "Delegated From"
-msgstr "Delegated From"
-
-#: ../calendar/gui/dialogs/meeting-page.etspec.h:5
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:5
-msgid "Delegated To"
-msgstr "Delegated To"
-
-#: ../calendar/gui/dialogs/meeting-page.etspec.h:6
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:6
-msgid "Language"
-msgstr "Language"
-
-#: ../calendar/gui/dialogs/meeting-page.etspec.h:7
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:7
-msgid "Member"
-msgstr "Member"
-
-#. To translators: RSVP means "please reply"
-#: ../calendar/gui/dialogs/meeting-page.etspec.h:8
-#: ../calendar/gui/e-meeting-list-view.c:523
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:8
-msgid "RSVP"
-msgstr "RSVP"
-
-#: ../calendar/gui/dialogs/meeting-page.etspec.h:10
-#: ../calendar/gui/e-calendar-table.etspec.h:10
-#: ../calendar/gui/e-meeting-list-view.c:534
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:10
-#: ../mail/em-filter-i18n.h:63
-#: ../mail/message-list.etspec.h:16
-msgid "Status"
-msgstr "Status"
-
#: ../calendar/gui/dialogs/meeting-page.glade.h:1
msgid "<b>Att_endees</b>"
msgstr "<b>Att_endees</b>"
@@ -6118,21 +6137,23 @@ msgid "Organizer:"
msgstr "Organiser:"
#: ../calendar/gui/dialogs/memo-editor.c:219
-#: ../calendar/gui/print.c:2287
+#: ../calendar/gui/print.c:2446
msgid "Memo"
msgstr "Memo"
-#: ../calendar/gui/dialogs/memo-page.c:868
+#: ../calendar/gui/dialogs/memo-page.c:952
#, c-format
msgid "Unable to open memos in '%s'."
msgstr "Unable to open memos in '%s'."
-#: ../calendar/gui/dialogs/memo-page.c:1019
-#: ../mail/em-format.c:849
-#: ../mail/em-format-html.c:1489
-#: ../mail/em-format-quote.c:200
-#: ../mail/em-mailer-prefs.c:91
-#: ../mail/message-list.etspec.h:18
+#: ../calendar/gui/dialogs/memo-page.c:1136
+#: ../mail/em-format-html.c:1545
+#: ../mail/em-format-html.c:1603
+#: ../mail/em-format-html.c:1629
+#: ../mail/em-format-quote.c:207
+#: ../mail/em-format.c:888
+#: ../mail/em-mailer-prefs.c:92
+#: ../mail/message-list.etspec.h:19
msgid "To"
msgstr "To"
@@ -6150,47 +6171,11 @@ msgid "_Description:"
msgstr "_Description:"
#: ../calendar/gui/dialogs/memo-page.glade.h:7
-#: ../calendar/gui/dialogs/task-page.c:434
+#: ../calendar/gui/dialogs/task-page.c:451
#: ../calendar/gui/dialogs/task-page.glade.h:9
msgid "_Group:"
msgstr "_Group:"
-#: ../calendar/gui/dialogs/new-calendar.glade.h:1
-msgid "<b>Calendar options</b>"
-msgstr "<b>Calendar options</b>"
-
-#: ../calendar/gui/dialogs/new-calendar.glade.h:2
-msgid "Add New Calendar"
-msgstr "Add New Calendar"
-
-#: ../calendar/gui/dialogs/new-calendar.glade.h:3
-msgid "Calendar Group"
-msgstr "Calendar Group"
-
-#: ../calendar/gui/dialogs/new-calendar.glade.h:4
-msgid "Calendar Location"
-msgstr "Calendar Location"
-
-#: ../calendar/gui/dialogs/new-calendar.glade.h:5
-msgid "Calendar Name"
-msgstr "Calendar Name"
-
-#: ../calendar/gui/dialogs/new-task-list.glade.h:1
-msgid "<b>Task List Options</b>"
-msgstr "<b>Task List Options</b>"
-
-#: ../calendar/gui/dialogs/new-task-list.glade.h:2
-msgid "Add New Task List"
-msgstr "Add New Task List"
-
-#: ../calendar/gui/dialogs/new-task-list.glade.h:3
-msgid "Task List Group"
-msgstr "Task List Group"
-
-#: ../calendar/gui/dialogs/new-task-list.glade.h:4
-msgid "Task List Name"
-msgstr "Task List Name"
-
#: ../calendar/gui/dialogs/recur-comp.c:52
msgid "You are modifying a recurring event. What would you like to modify?"
msgstr "You are modifying a recurring event. What would you like to modify?"
@@ -6204,36 +6189,36 @@ 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
-msgid "You are modifying a recurring journal entry. What would you like to modify?"
-msgstr "You are modifying a recurring journal entry. What would you like to modify?"
+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:90
+#: ../calendar/gui/dialogs/recur-comp.c:87
msgid "This Instance Only"
msgstr "This Instance Only"
-#: ../calendar/gui/dialogs/recur-comp.c:94
+#: ../calendar/gui/dialogs/recur-comp.c:91
msgid "This and Prior Instances"
msgstr "This and Prior Instances"
-#: ../calendar/gui/dialogs/recur-comp.c:100
+#: ../calendar/gui/dialogs/recur-comp.c:97
msgid "This and Future Instances"
msgstr "This and Future Instances"
-#: ../calendar/gui/dialogs/recur-comp.c:105
+#: ../calendar/gui/dialogs/recur-comp.c:102
msgid "All Instances"
msgstr "All Instances"
-#: ../calendar/gui/dialogs/recurrence-page.c:498
+#: ../calendar/gui/dialogs/recurrence-page.c:505
msgid "This appointment contains recurrences that Evolution cannot edit."
msgstr "This appointment contains recurrences that Evolution cannot edit."
-#: ../calendar/gui/dialogs/recurrence-page.c:819
+#: ../calendar/gui/dialogs/recurrence-page.c:826
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:932
+#: ../calendar/gui/dialogs/recurrence-page.c:939
msgid "on"
msgstr "on"
@@ -6241,7 +6226,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:996
+#: ../calendar/gui/dialogs/recurrence-page.c:1003
msgid "first"
msgstr "first"
@@ -6250,7 +6235,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:1002
+#: ../calendar/gui/dialogs/recurrence-page.c:1009
msgid "second"
msgstr "second"
@@ -6258,7 +6243,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:1007
+#: ../calendar/gui/dialogs/recurrence-page.c:1014
msgid "third"
msgstr "third"
@@ -6266,7 +6251,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:1012
+#: ../calendar/gui/dialogs/recurrence-page.c:1019
msgid "fourth"
msgstr "fourth"
@@ -6274,13 +6259,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:1017
+#: ../calendar/gui/dialogs/recurrence-page.c:1024
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:1043
+#: ../calendar/gui/dialogs/recurrence-page.c:1050
msgid "Other Date"
msgstr "Other Date"
@@ -6288,7 +6273,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:1051
+#: ../calendar/gui/dialogs/recurrence-page.c:1058
msgid "1st to 10th"
msgstr "1st to 10th"
@@ -6296,7 +6281,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:1057
+#: ../calendar/gui/dialogs/recurrence-page.c:1064
msgid "11th to 20th"
msgstr "11th to 20th"
@@ -6304,45 +6289,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:1063
+#: ../calendar/gui/dialogs/recurrence-page.c:1070
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:1086
+#: ../calendar/gui/dialogs/recurrence-page.c:1093
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:1226
+#: ../calendar/gui/dialogs/recurrence-page.c:1233
msgid "on the"
msgstr "on the"
-#: ../calendar/gui/dialogs/recurrence-page.c:1419
+#: ../calendar/gui/dialogs/recurrence-page.c:1426
msgid "occurrences"
msgstr "occurrences"
-#: ../calendar/gui/dialogs/recurrence-page.c:2157
+#: ../calendar/gui/dialogs/recurrence-page.c:2167
msgid "Add exception"
msgstr "Add exception"
-#: ../calendar/gui/dialogs/recurrence-page.c:2200
+#: ../calendar/gui/dialogs/recurrence-page.c:2210
msgid "Could not get a selection to modify."
msgstr "Could not get a selection to modify."
-#: ../calendar/gui/dialogs/recurrence-page.c:2206
+#: ../calendar/gui/dialogs/recurrence-page.c:2216
msgid "Modify exception"
msgstr "Modify exception"
-#: ../calendar/gui/dialogs/recurrence-page.c:2252
+#: ../calendar/gui/dialogs/recurrence-page.c:2262
msgid "Could not get a selection to delete."
msgstr "Could not get a selection to delete."
-#: ../calendar/gui/dialogs/recurrence-page.c:2383
+#: ../calendar/gui/dialogs/recurrence-page.c:2393
msgid "Date/Time"
msgstr "Date/Time"
@@ -6351,7 +6336,7 @@ msgid "<b>Exceptions</b>"
msgstr "<b>Exceptions</b>"
#: ../calendar/gui/dialogs/recurrence-page.glade.h:2
-#: ../mail/mail-config.glade.h:2
+#: ../mail/mail-config.glade.h:3
msgid "<b>Preview</b>"
msgstr "<b>Preview</b>"
@@ -6413,56 +6398,59 @@ 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:233
-#: ../calendar/gui/e-calendar-table.c:463
-#: ../calendar/gui/e-cal-model-tasks.c:347
-#: ../calendar/gui/e-cal-model-tasks.c:662
-#: ../calendar/gui/e-itip-control.c:923
-#: ../calendar/gui/e-meeting-store.c:194
-#: ../calendar/gui/e-meeting-store.c:217
-#: ../calendar/gui/print.c:2348
-#: ../plugins/save-calendar/csv-format.c:390
+#: ../calendar/gui/e-cal-component-preview.c:236
+#: ../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:184
+#: ../calendar/gui/e-meeting-store.c:207
+#: ../calendar/gui/print.c:2518
+#: ../plugins/save-calendar/csv-format.c:386
msgid "Completed"
msgstr "Completed"
#: ../calendar/gui/dialogs/task-details-page.glade.h:5
-#: ../calendar/gui/e-cal-component-preview.c:252
-#: ../calendar/gui/e-calendar-table.c:388
-#: ../mail/message-list.c:1034
+#: ../calendar/gui/e-cal-component-preview.c:255
+#: ../calendar/gui/e-calendar-table.c:360
+#: ../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:230
-#: ../calendar/gui/e-calendar-table.c:462
-#: ../calendar/gui/e-cal-model-tasks.c:345
-#: ../calendar/gui/e-cal-model-tasks.c:660
-#: ../calendar/gui/e-cal-model-tasks.c:735
-#: ../calendar/gui/print.c:2345
+#: ../calendar/gui/e-cal-component-preview.c:233
+#: ../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:2515
msgid "In Progress"
msgstr "In Progress"
#: ../calendar/gui/dialogs/task-details-page.glade.h:7
-#: ../calendar/gui/e-cal-component-preview.c:256
-#: ../calendar/gui/e-calendar-table.c:390
-#: ../mail/message-list.c:1032
+#: ../calendar/gui/e-cal-component-preview.c:259
+#: ../calendar/gui/e-calendar-table.c:362
+#: ../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:254
-#: ../calendar/gui/e-calendar-table.c:389
-#: ../calendar/gui/e-cal-model.c:924
-#: ../mail/message-list.c:1033
+#: ../calendar/gui/e-cal-component-preview.c:257
+#: ../calendar/gui/e-cal-model.c:965
+#: ../calendar/gui/e-calendar-table.c:361
+#: ../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:240
-#: ../calendar/gui/e-calendar-table.c:461
-#: ../calendar/gui/e-cal-model-tasks.c:343
-#: ../calendar/gui/e-cal-model-tasks.c:658
-#: ../calendar/gui/print.c:2342
+#: ../calendar/gui/e-cal-component-preview.c:243
+#: ../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:2512
msgid "Not Started"
msgstr "Not Started"
@@ -6475,7 +6463,7 @@ msgid "Stat_us:"
msgstr "Stat_us:"
#: ../calendar/gui/dialogs/task-details-page.glade.h:12
-#: ../calendar/gui/e-calendar-table.c:391
+#: ../calendar/gui/e-calendar-table.c:363
msgid "Undefined"
msgstr "Undefined"
@@ -6492,20 +6480,25 @@ msgstr "_Priority:"
msgid "_Web Page:"
msgstr "_Web Page:"
-#: ../calendar/gui/dialogs/task-editor.c:424
-#: ../calendar/gui/tasks-component.c:1245
+#: ../calendar/gui/dialogs/task-editor.c:426
+#: ../calendar/gui/tasks-component.c:1322
msgid "_Task"
msgstr "_Task"
-#: ../calendar/gui/dialogs/task-editor.c:428
+#: ../calendar/gui/dialogs/task-editor.c:430
msgid "Task Details"
msgstr "Task Details"
-#: ../calendar/gui/dialogs/task-page.c:822
+#: ../calendar/gui/dialogs/task-page.c:459
+#: ../calendar/gui/dialogs/task-page.glade.h:4
+msgid "Organi_zer:"
+msgstr "Organi_ser:"
+
+#: ../calendar/gui/dialogs/task-page.c:866
msgid "Due date is wrong"
msgstr "Due date is wrong"
-#: ../calendar/gui/dialogs/task-page.c:1648
+#: ../calendar/gui/dialogs/task-page.c:1885
#, c-format
msgid "Unable to open tasks in '%s'."
msgstr "Unable to open tasks in '%s'."
@@ -6522,10 +6515,6 @@ msgstr "Categor_ies..."
msgid "De_scription:"
msgstr "De_scription:"
-#: ../calendar/gui/dialogs/task-page.glade.h:4
-msgid "Or_ganiser:"
-msgstr "Or_ganiser:"
-
#: ../calendar/gui/dialogs/task-page.glade.h:7
msgid "Time zone:"
msgstr "Time zone:"
@@ -6534,49 +6523,6 @@ msgstr "Time zone:"
msgid "_Due date:"
msgstr "_Due date:"
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:2
-msgid "<b>Free/Busy C_alendars</b>"
-msgstr "<b>Free/Busy C_alendars</b>"
-
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:3
-msgid "<b>Publishing Frequency</b>"
-msgstr "<b>Publishing Frequency</b>"
-
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:4
-msgid "<b>Publishing _Location</b>"
-msgstr "<b>Publishing _Location</b>"
-
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:5
-msgid "Free/Busy Publishing Settings"
-msgstr "Free/Busy Publishing Settings"
-
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:6
-msgid "_Daily"
-msgstr "_Daily"
-
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:7
-msgid "_Manual"
-msgstr "_Manual"
-
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:8
-#: ../plugins/publish-calendar/publish-calendar.glade.h:23
-msgid "_Password:"
-msgstr "_Password:"
-
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:9
-#: ../plugins/publish-calendar/publish-calendar.glade.h:25
-msgid "_Remember password"
-msgstr "_Remember password"
-
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:10
-#: ../plugins/publish-calendar/publish-calendar.glade.h:27
-msgid "_Username:"
-msgstr "_Username:"
-
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:11
-msgid "_Weekly"
-msgstr "_Weekly"
-
#. Translator: Entire string is like "Pop up an alert %d days before start of appointment"
#: ../calendar/gui/e-alarm-list.c:396
#, c-format
@@ -6655,209 +6601,291 @@ 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:2916
+#: ../mail/em-folder-view.c:3327
#, c-format
msgid "Click to open %s"
msgstr "Click to open %s"
-#: ../calendar/gui/e-cal-component-memo-preview.c:157
-#: ../calendar/gui/e-cal-component-preview.c:157
-#: ../filter/filter-rule.c:804
+#: ../calendar/gui/e-cal-component-memo-preview.c:160
+#: ../calendar/gui/e-cal-component-preview.c:160
+#: ../filter/filter-rule.c:805
+#: ../shell/e-shell-folder-title-bar.c:593
msgid "Untitled"
msgstr "Untitled"
-#: ../calendar/gui/e-cal-component-memo-preview.c:208
-#: ../calendar/gui/e-cal-component-preview.c:197
-#: ../calendar/gui/e-cal-component-preview.c:208
+#: ../calendar/gui/e-cal-component-memo-preview.c:212
+#: ../calendar/gui/e-cal-component-preview.c:200
+#: ../calendar/gui/e-cal-component-preview.c:211
msgid "Start Date:"
msgstr "Start Date:"
-#: ../calendar/gui/e-cal-component-memo-preview.c:221
-#: ../calendar/gui/e-cal-component-preview.c:271
-#: ../calendar/gui/e-itip-control.c:1191
+#: ../calendar/gui/e-cal-component-memo-preview.c:225
+#: ../calendar/gui/e-cal-component-preview.c:274
+#: ../calendar/gui/e-itip-control.c:1201
#: ../calendar/gui/e-itip-control.glade.h:4
-#: ../composer/e-msg-composer-attachment.glade.h:2
-#: ../mail/mail-config.glade.h:67
+#: ../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:254
-#: ../calendar/gui/e-cal-component-preview.c:304
+#: ../calendar/gui/e-cal-component-memo-preview.c:261
+#: ../calendar/gui/e-cal-component-preview.c:307
msgid "Web Page:"
msgstr "Web Page:"
-#: ../calendar/gui/e-cal-component-preview.c:190
-#: ../calendar/gui/e-itip-control.c:1135
+#: ../calendar/gui/e-cal-component-preview.c:193
+#: ../calendar/gui/e-itip-control.c:1145
#: ../calendar/gui/e-itip-control.glade.h:9
msgid "Summary:"
msgstr "Summary:"
-#: ../calendar/gui/e-cal-component-preview.c:219
+#: ../calendar/gui/e-cal-component-preview.c:222
msgid "Due Date:"
msgstr "Due Date:"
#. write status
#. Status
-#: ../calendar/gui/e-cal-component-preview.c:226
-#: ../calendar/gui/e-itip-control.c:1159
+#: ../calendar/gui/e-cal-component-preview.c:229
+#: ../calendar/gui/e-itip-control.c:1169
#: ../plugins/exchange-operations/exchange-account-setup.c:269
-#: ../plugins/itip-formatter/itip-view.c:968
+#: ../plugins/itip-formatter/itip-view.c:1029
msgid "Status:"
msgstr "Status:"
-#: ../calendar/gui/e-cal-component-preview.c:250
+#: ../calendar/gui/e-cal-component-preview.c:253
msgid "Priority:"
msgstr "Priority:"
-#: ../calendar/gui/e-calendar-table.c:366
-#: ../calendar/gui/e-cal-list-view.c:255
-#: ../calendar/gui/e-cal-model.c:314
-#: ../calendar/gui/e-cal-model.c:321
+#: ../calendar/gui/e-cal-list-view.c:257
+#: ../calendar/gui/e-cal-model.c:317
+#: ../calendar/gui/e-cal-model.c:324
+#: ../calendar/gui/e-calendar-table.c:338
msgid "Public"
msgstr "Public"
-#: ../calendar/gui/e-calendar-table.c:367
-#: ../calendar/gui/e-cal-list-view.c:256
-#: ../calendar/gui/e-cal-model.c:323
+#: ../calendar/gui/e-cal-list-view.c:258
+#: ../calendar/gui/e-cal-model.c:326
+#: ../calendar/gui/e-calendar-table.c:339
msgid "Private"
msgstr "Private"
-#: ../calendar/gui/e-calendar-table.c:368
-#: ../calendar/gui/e-cal-list-view.c:257
-#: ../calendar/gui/e-cal-model.c:325
+#: ../calendar/gui/e-cal-list-view.c:259
+#: ../calendar/gui/e-cal-model.c:328
+#: ../calendar/gui/e-calendar-table.c:340
msgid "Confidential"
msgstr "Confidential"
-#: ../calendar/gui/e-calendar-table.c:410
+#: ../calendar/gui/e-cal-list-view.etspec.h:2
+msgid "End Date"
+msgstr "End Date"
+
+#: ../calendar/gui/e-cal-list-view.etspec.h:4
+#: ../calendar/gui/e-memo-table.etspec.h:3
+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:382
+msgid "Summary"
+msgstr "Summary"
+
+#: ../calendar/gui/e-cal-model-calendar.c:183
+#: ../calendar/gui/e-calendar-table.c:412
+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:413
+msgid "Busy"
+msgstr "Busy"
+
+#: ../calendar/gui/e-cal-model-tasks.c:623
+msgid ""
+"The geographical position must be entered in the format: \n"
+"\n"
+"45.436845,125.862501"
+msgstr ""
+"The geographical position must be entered in the format: \n"
+"\n"
+"45.436845,125.862501"
+
+#: ../calendar/gui/e-cal-model-tasks.c:1025
+#: ../calendar/gui/e-cal-model.c:971
+#: ../calendar/gui/e-meeting-list-view.c:193
+#: ../calendar/gui/e-meeting-store.c:156
+#: ../calendar/gui/e-meeting-store.c:166
+#: ../calendar/gui/e-meeting-store.c:749
+#: ../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:971
+#: ../calendar/gui/e-meeting-list-view.c:194
+#: ../calendar/gui/e-meeting-store.c:168
+#: ../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:330
+#: ../calendar/gui/e-cal-popup.c:107
+#: ../calendar/gui/e-cal-popup.c:124
+#: ../calendar/gui/e-cal-popup.c:171
+#: ../calendar/gui/e-itip-control.c:1186
+#: ../calendar/gui/e-itip-control.c:1326
+#: ../calendar/gui/e-meeting-list-view.c:169
+#: ../calendar/gui/e-meeting-list-view.c:183
+#: ../calendar/gui/e-meeting-store.c:114
+#: ../calendar/gui/e-meeting-store.c:149
+#: ../calendar/gui/e-meeting-store.c:212
+#: ../calendar/gui/print.c:969
+#: ../calendar/gui/print.c:986
+#: ../mail/em-utils.c:1294
+#: ../plugins/itip-formatter/itip-formatter.c:405
+#: ../plugins/itip-formatter/itip-formatter.c:2031
+#: ../plugins/plugin-manager/plugin-manager.c:84
+#: ../widgets/misc/e-attachment-bar.c:721
+#: ../widgets/misc/e-charset-picker.c:64
+msgid "Unknown"
+msgstr "Unknown"
+
+#: ../calendar/gui/e-cal-model.c:967
+msgid "Recurring"
+msgstr "Recurring"
+
+#: ../calendar/gui/e-cal-model.c:969
+msgid "Assigned"
+msgstr "Assigned"
+
+#: ../calendar/gui/e-cal-popup.c:177
+#: ../mail/em-popup.c:426
+msgid "Save As..."
+msgstr "Save As..."
+
+#: ../calendar/gui/e-cal-popup.c:193
+#: ../mail/em-format-html-display.c:2219
+msgid "Select folder to save selected attachments..."
+msgstr "Select folder to save selected attachments..."
+
+#: ../calendar/gui/e-cal-popup.c:225
+#: ../mail/em-popup.c:454
+#, c-format
+msgid "untitled_image.%s"
+msgstr "untitled_image.%s"
+
+#: ../calendar/gui/e-cal-popup.c:279
+#: ../calendar/gui/e-calendar-table.c:1364
+#: ../calendar/gui/e-calendar-view.c:1678
+#: ../calendar/gui/e-memo-table.c:923
+#: ../mail/em-folder-view.c:1341
+#: ../mail/em-popup.c:571
+#: ../mail/em-popup.c:582
+msgid "_Save As..."
+msgstr "_Save As..."
+
+#: ../calendar/gui/e-cal-popup.c:280
+#: ../mail/em-popup.c:572
+#: ../mail/em-popup.c:583
+msgid "Set as _Background"
+msgstr "Set as _Background"
+
+#: ../calendar/gui/e-cal-popup.c:281
+msgid "_Save Selected"
+msgstr "_Save Selected"
+
+#: ../calendar/gui/e-cal-popup.c:402
+#: ../mail/em-popup.c:790
+#, c-format
+msgid "Open in %s..."
+msgstr "Open in %s..."
+
+#: ../calendar/gui/e-calendar-table.c:382
msgid "0%"
msgstr "0%"
-#: ../calendar/gui/e-calendar-table.c:411
+#: ../calendar/gui/e-calendar-table.c:383
msgid "10%"
msgstr "10%"
-#: ../calendar/gui/e-calendar-table.c:412
+#: ../calendar/gui/e-calendar-table.c:384
msgid "20%"
msgstr "20%"
-#: ../calendar/gui/e-calendar-table.c:413
+#: ../calendar/gui/e-calendar-table.c:385
msgid "30%"
msgstr "30%"
-#: ../calendar/gui/e-calendar-table.c:414
+#: ../calendar/gui/e-calendar-table.c:386
msgid "40%"
msgstr "40%"
-#: ../calendar/gui/e-calendar-table.c:415
+#: ../calendar/gui/e-calendar-table.c:387
msgid "50%"
msgstr "50%"
-#: ../calendar/gui/e-calendar-table.c:416
+#: ../calendar/gui/e-calendar-table.c:388
msgid "60%"
msgstr "60%"
-#: ../calendar/gui/e-calendar-table.c:417
+#: ../calendar/gui/e-calendar-table.c:389
msgid "70%"
msgstr "70%"
-#: ../calendar/gui/e-calendar-table.c:418
+#: ../calendar/gui/e-calendar-table.c:390
msgid "80%"
msgstr "80%"
-#: ../calendar/gui/e-calendar-table.c:419
+#: ../calendar/gui/e-calendar-table.c:391
msgid "90%"
msgstr "90%"
-#: ../calendar/gui/e-calendar-table.c:420
+#: ../calendar/gui/e-calendar-table.c:392
msgid "100%"
msgstr "100%"
-#: ../calendar/gui/e-calendar-table.c:440
-#: ../calendar/gui/e-cal-model-calendar.c:183
-msgid "Free"
-msgstr "Free"
-
-#: ../calendar/gui/e-calendar-table.c:441
-#: ../calendar/gui/e-cal-model-calendar.c:186
-#: ../calendar/gui/e-meeting-time-sel.c:411
-msgid "Busy"
-msgstr "Busy"
-
-#: ../calendar/gui/e-calendar-table.c:527
-#: ../calendar/gui/e-tasks.c:1357
-#: ../calendar/gui/gnome-cal.c:1509
-#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
-#: ../calendar/gui/print.c:1809
-#: ../calendar/gui/tasks-component.c:522
-#: ../calendar/gui/tasks-component.c:1013
-#: ../calendar/gui/tasks-control.c:478
-#: ../calendar/gui/tasks-control.c:494
-#: ../calendar/importers/icalendar-importer.c:80
-#: ../calendar/importers/icalendar-importer.c:741
-#: ../plugins/exchange-operations/exchange-folder.c:587
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:401
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:545
-#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:12
-msgid "Tasks"
-msgstr "Tasks"
-
-#: ../calendar/gui/e-calendar-table.c:705
-#: ../calendar/gui/e-calendar-view.c:675
-#: ../calendar/gui/e-memo-table.c:483
+#: ../calendar/gui/e-calendar-table.c:670
+#: ../calendar/gui/e-calendar-view.c:677
+#: ../calendar/gui/e-memo-table.c:439
msgid "Deleting selected objects"
msgstr "Deleting selected objects"
-#: ../calendar/gui/e-calendar-table.c:958
-#: ../calendar/gui/e-calendar-view.c:803
-#: ../calendar/gui/e-memo-table.c:660
+#: ../calendar/gui/e-calendar-table.c:952
+#: ../calendar/gui/e-calendar-view.c:805
+#: ../calendar/gui/e-memo-table.c:643
msgid "Updating objects"
msgstr "Updating objects"
-#: ../calendar/gui/e-calendar-table.c:1107
-#: ../calendar/gui/e-calendar-view.c:1229
-#: ../calendar/gui/e-memo-table.c:799
-#: ../composer/e-msg-composer.c:1351
+#: ../calendar/gui/e-calendar-table.c:1136
+#: ../calendar/gui/e-calendar-view.c:1227
+#: ../calendar/gui/e-memo-table.c:818
+#: ../composer/e-msg-composer.c:1472
msgid "Save as..."
msgstr "Save as..."
-#: ../calendar/gui/e-calendar-table.c:1278
-#: ../calendar/gui/e-calendar-view.c:1662
+#: ../calendar/gui/e-calendar-table.c:1359
+#: ../calendar/gui/e-calendar-view.c:1660
msgid "New _Task"
msgstr "New _Task"
-#: ../calendar/gui/e-calendar-table.c:1282
-#: ../calendar/gui/e-memo-table.c:903
+#: ../calendar/gui/e-calendar-table.c:1363
+#: ../calendar/gui/e-memo-table.c:922
msgid "Open _Web Page"
msgstr "Open _Web Page"
-#: ../calendar/gui/e-calendar-table.c:1283
-#: ../calendar/gui/e-calendar-view.c:1680
-#: ../calendar/gui/e-cal-popup.c:276
-#: ../calendar/gui/e-memo-table.c:904
-#: ../mail/em-folder-view.c:1147
-#: ../mail/em-popup.c:559
-#: ../mail/em-popup.c:570
-msgid "_Save As..."
-msgstr "_Save As..."
-
-#: ../calendar/gui/e-calendar-table.c:1284
-#: ../calendar/gui/e-calendar-view.c:1665
-#: ../calendar/gui/e-calendar-view.c:1681
-#: ../calendar/gui/e-memo-table.c:905
-#: ../mail/em-folder-view.c:1148
-#: ../plugins/print-message/org-gnome-print-message.xml.h:3
-#: ../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-tasks.xml.h:29
-msgid "_Print..."
-msgstr "_Print..."
+#: ../calendar/gui/e-calendar-table.c:1365
+#: ../calendar/gui/e-calendar-view.c:1663
+#: ../calendar/gui/e-memo-table.c:924
+msgid "P_rint..."
+msgstr "P_rint..."
-#: ../calendar/gui/e-calendar-table.c:1288
-#: ../calendar/gui/e-calendar-view.c:1685
-#: ../calendar/gui/e-memo-table.c:909
+#: ../calendar/gui/e-calendar-table.c:1369
+#: ../calendar/gui/e-calendar-view.c:1683
+#: ../calendar/gui/e-memo-table.c:928
#: ../ui/evolution-addressbook.xml.h:2
#: ../ui/evolution-calendar.xml.h:1
#: ../ui/evolution-memos.xml.h:1
@@ -6865,10 +6893,10 @@ msgstr "_Print..."
msgid "C_ut"
msgstr "C_ut"
-#: ../calendar/gui/e-calendar-table.c:1290
-#: ../calendar/gui/e-calendar-view.c:1668
-#: ../calendar/gui/e-calendar-view.c:1687
-#: ../calendar/gui/e-memo-table.c:911
+#: ../calendar/gui/e-calendar-table.c:1371
+#: ../calendar/gui/e-calendar-view.c:1666
+#: ../calendar/gui/e-calendar-view.c:1685
+#: ../calendar/gui/e-memo-table.c:930
#: ../ui/evolution-addressbook.xml.h:57
#: ../ui/evolution-calendar.xml.h:43
#: ../ui/evolution-composer-entries.xml.h:15
@@ -6878,38 +6906,38 @@ msgstr "C_ut"
msgid "_Paste"
msgstr "_Paste"
-#: ../calendar/gui/e-calendar-table.c:1294
+#: ../calendar/gui/e-calendar-table.c:1375
#: ../ui/evolution-tasks.xml.h:22
msgid "_Assign Task"
msgstr "_Assign Task"
-#: ../calendar/gui/e-calendar-table.c:1295
-#: ../calendar/gui/e-memo-table.c:915
+#: ../calendar/gui/e-calendar-table.c:1376
+#: ../calendar/gui/e-memo-table.c:934
#: ../ui/evolution-tasks.xml.h:26
msgid "_Forward as iCalendar"
msgstr "_Forward as iCalendar"
-#: ../calendar/gui/e-calendar-table.c:1296
+#: ../calendar/gui/e-calendar-table.c:1377
msgid "_Mark as Complete"
msgstr "_Mark as Complete"
-#: ../calendar/gui/e-calendar-table.c:1297
+#: ../calendar/gui/e-calendar-table.c:1378
msgid "_Mark Selected Tasks as Complete"
msgstr "_Mark Selected Tasks as Complete"
-#: ../calendar/gui/e-calendar-table.c:1298
+#: ../calendar/gui/e-calendar-table.c:1379
msgid "_Mark as Incomplete"
msgstr "_Mark as Incomplete"
-#: ../calendar/gui/e-calendar-table.c:1299
+#: ../calendar/gui/e-calendar-table.c:1380
msgid "_Mark Selected Tasks as Incomplete"
msgstr "_Mark Selected Tasks as Incomplete"
-#: ../calendar/gui/e-calendar-table.c:1304
+#: ../calendar/gui/e-calendar-table.c:1385
msgid "_Delete Selected Tasks"
msgstr "_Delete Selected Tasks"
-#: ../calendar/gui/e-calendar-table.c:1537
+#: ../calendar/gui/e-calendar-table.c:1622
#: ../calendar/gui/e-calendar-table.etspec.h:4
msgid "Click to add a task"
msgstr "Click to add a task"
@@ -6920,7 +6948,6 @@ msgid "% Complete"
msgstr "% Complete"
#: ../calendar/gui/e-calendar-table.etspec.h:5
-#: ../mail/mail-send-recv.c:705
msgid "Complete"
msgstr "Complete"
@@ -6933,7 +6960,7 @@ msgid "Due date"
msgstr "Due date"
#: ../calendar/gui/e-calendar-table.etspec.h:8
-#: ../plugins/save-calendar/csv-format.c:397
+#: ../plugins/save-calendar/csv-format.c:393
msgid "Priority"
msgstr "Priority"
@@ -6941,219 +6968,121 @@ msgstr "Priority"
msgid "Start date"
msgstr "Start date"
-#: ../calendar/gui/e-calendar-table.etspec.h:11
-#: ../calendar/gui/e-cal-list-view.etspec.h:5
-#: ../calendar/gui/e-memo-table.etspec.h:5
-#: ../mail/mail-dialogs.glade.h:20
-#: ../plugins/save-calendar/csv-format.c:386
-msgid "Summary"
-msgstr "Summary"
-
-#: ../calendar/gui/e-calendar-table.etspec.h:12
-msgid "Task sort"
-msgstr "Task sort"
+#: ../calendar/gui/e-calendar-table.etspec.h:10
+#: ../calendar/gui/e-meeting-list-view.c:538
+#: ../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:1348
+#: ../calendar/gui/e-calendar-view.c:1346
msgid "Moving items"
msgstr "Moving items"
-#: ../calendar/gui/e-calendar-view.c:1350
+#: ../calendar/gui/e-calendar-view.c:1348
msgid "Copying items"
msgstr "Copying items"
-#: ../calendar/gui/e-calendar-view.c:1659
+#: ../calendar/gui/e-calendar-view.c:1657
msgid "New _Appointment..."
msgstr "New _Appointment..."
-#: ../calendar/gui/e-calendar-view.c:1660
+#: ../calendar/gui/e-calendar-view.c:1658
msgid "New All Day _Event"
msgstr "New All Day _Event"
-#: ../calendar/gui/e-calendar-view.c:1661
+#: ../calendar/gui/e-calendar-view.c:1659
msgid "New _Meeting"
msgstr "New _Meeting"
#. FIXME: hook in this somehow
-#: ../calendar/gui/e-calendar-view.c:1672
+#: ../calendar/gui/e-calendar-view.c:1670
msgid "_Current View"
msgstr "_Current View"
-#: ../calendar/gui/e-calendar-view.c:1674
+#: ../calendar/gui/e-calendar-view.c:1672
msgid "Select T_oday"
msgstr "Select T_oday"
-#: ../calendar/gui/e-calendar-view.c:1675
+#: ../calendar/gui/e-calendar-view.c:1673
msgid "_Select Date..."
msgstr "_Select Date..."
-#: ../calendar/gui/e-calendar-view.c:1691
+#: ../calendar/gui/e-calendar-view.c:1679
+msgid "Pri_nt..."
+msgstr "Pri_nt..."
+
+#: ../calendar/gui/e-calendar-view.c:1689
msgid "Cop_y to Calendar..."
msgstr "Cop_y to Calendar..."
-#: ../calendar/gui/e-calendar-view.c:1692
+#: ../calendar/gui/e-calendar-view.c:1690
msgid "Mo_ve to Calendar..."
msgstr "Mo_ve to Calendar..."
-#: ../calendar/gui/e-calendar-view.c:1693
+#: ../calendar/gui/e-calendar-view.c:1691
msgid "_Delegate Meeting..."
msgstr "_Delegate Meeting..."
-#: ../calendar/gui/e-calendar-view.c:1694
+#: ../calendar/gui/e-calendar-view.c:1692
msgid "_Schedule Meeting..."
msgstr "_Schedule Meeting..."
-#: ../calendar/gui/e-calendar-view.c:1695
+#: ../calendar/gui/e-calendar-view.c:1693
msgid "_Forward as iCalendar..."
msgstr "_Forward as iCalendar..."
-#: ../calendar/gui/e-calendar-view.c:1696
+#: ../calendar/gui/e-calendar-view.c:1694
msgid "_Reply"
msgstr "_Reply"
-#: ../calendar/gui/e-calendar-view.c:1697
-#: ../mail/em-folder-view.c:1141
-#: ../mail/em-popup.c:564
-#: ../mail/em-popup.c:575
+#: ../calendar/gui/e-calendar-view.c:1695
+#: ../mail/em-folder-view.c:1335
+#: ../mail/em-popup.c:576
+#: ../mail/em-popup.c:587
#: ../ui/evolution-mail-message.xml.h:82
msgid "Reply to _All"
msgstr "Reply to _All"
-#: ../calendar/gui/e-calendar-view.c:1702
+#: ../calendar/gui/e-calendar-view.c:1700
msgid "Make this Occurrence _Movable"
msgstr "Make this Occurrence _Movable"
-#: ../calendar/gui/e-calendar-view.c:1703
+#: ../calendar/gui/e-calendar-view.c:1701
#: ../ui/evolution-calendar.xml.h:9
msgid "Delete this _Occurrence"
msgstr "Delete this _Occurrence"
-#: ../calendar/gui/e-calendar-view.c:1704
+#: ../calendar/gui/e-calendar-view.c:1702
msgid "Delete _All Occurrences"
msgstr "Delete _All Occurrences"
#. To Translators: It will display "Organiser: NameOfTheUser <email@ofuser.com>"
-#: ../calendar/gui/e-calendar-view.c:2156
+#: ../calendar/gui/e-calendar-view.c:2202
#, 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:2160
+#: ../calendar/gui/e-calendar-view.c:2206
#, c-format
msgid "Organizer: %s"
msgstr "Organiser: %s"
#. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:2176
-#: ../calendar/gui/print.c:2316
+#: ../calendar/gui/e-calendar-view.c:2222
+#: ../calendar/gui/print.c:2475
#, c-format
msgid "Location: %s"
msgstr "Location: %s"
#. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
-#: ../calendar/gui/e-calendar-view.c:2207
+#: ../calendar/gui/e-calendar-view.c:2256
#, c-format
msgid "Time: %s %s"
msgstr "Time: %s %s"
-#: ../calendar/gui/e-cal-list-view.etspec.h:2
-msgid "End Date"
-msgstr "End Date"
-
-#: ../calendar/gui/e-cal-list-view.etspec.h:4
-#: ../calendar/gui/e-memo-table.etspec.h:4
-msgid "Start Date"
-msgstr "Start Date"
-
-#. This is the default filename used for temporary file creation
-#: ../calendar/gui/e-cal-model.c:327
-#: ../calendar/gui/e-cal-popup.c:107
-#: ../calendar/gui/e-cal-popup.c:124
-#: ../calendar/gui/e-cal-popup.c:171
-#: ../calendar/gui/e-itip-control.c:1176
-#: ../calendar/gui/e-itip-control.c:1317
-#: ../calendar/gui/e-meeting-list-view.c:169
-#: ../calendar/gui/e-meeting-list-view.c:183
-#: ../calendar/gui/e-meeting-store.c:124
-#: ../calendar/gui/e-meeting-store.c:159
-#: ../calendar/gui/e-meeting-store.c:222
-#: ../mail/em-utils.c:1199
-#: ../plugins/itip-formatter/itip-formatter.c:240
-#: ../plugins/itip-formatter/itip-formatter.c:1800
-#: ../plugins/plugin-manager/plugin-manager.c:77
-#: ../widgets/misc/e-attachment-bar.c:712
-#: ../widgets/misc/e-charset-picker.c:63
-msgid "Unknown"
-msgstr "Unknown"
-
-#: ../calendar/gui/e-cal-model.c:926
-msgid "Recurring"
-msgstr "Recurring"
-
-#: ../calendar/gui/e-cal-model.c:928
-msgid "Assigned"
-msgstr "Assigned"
-
-#: ../calendar/gui/e-cal-model.c:930
-#: ../calendar/gui/e-cal-model-tasks.c:1012
-#: ../calendar/gui/e-meeting-list-view.c:193
-#: ../calendar/gui/e-meeting-store.c:166
-#: ../calendar/gui/e-meeting-store.c:176
-#: ../calendar/gui/e-meeting-store.c:764
-#: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:5
-msgid "Yes"
-msgstr "Yes"
-
-#: ../calendar/gui/e-cal-model.c:930
-#: ../calendar/gui/e-cal-model-tasks.c:1012
-#: ../calendar/gui/e-meeting-list-view.c:194
-#: ../calendar/gui/e-meeting-store.c:178
-#: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:2
-msgid "No"
-msgstr "No"
-
-#: ../calendar/gui/e-cal-model-tasks.c:610
-msgid ""
-"The geographical position must be entered in the format: \n"
-"\n"
-"45.436845,125.862501"
-msgstr ""
-"The geographical position must be entered in the format: \n"
-"\n"
-"45.436845,125.862501"
-
-#: ../calendar/gui/e-cal-popup.c:177
-#: ../mail/em-popup.c:417
-msgid "Save As..."
-msgstr "Save As..."
-
-#: ../calendar/gui/e-cal-popup.c:193
-#: ../mail/em-format-html-display.c:2159
-msgid "Select folder to save selected attachments..."
-msgstr "Select folder to save selected attachments..."
-
-#: ../calendar/gui/e-cal-popup.c:222
-#: ../mail/em-popup.c:442
-#, c-format
-msgid "untitled_image.%s"
-msgstr "untitled_image.%s"
-
-#: ../calendar/gui/e-cal-popup.c:277
-#: ../mail/em-popup.c:560
-#: ../mail/em-popup.c:571
-msgid "Set as _Background"
-msgstr "Set as _Background"
-
-#: ../calendar/gui/e-cal-popup.c:278
-msgid "_Save Selected"
-msgstr "_Save Selected"
-
-#: ../calendar/gui/e-cal-popup.c:399
-#: ../mail/em-popup.c:781
-#, c-format
-msgid "Open in %s..."
-msgstr "Open in %s..."
-
#. strftime format of a weekday, a date and a time, 24-hour.
#: ../calendar/gui/e-cell-date-edit-text.c:116
msgid "%a %m/%d/%Y %H:%M:%S"
@@ -7173,21 +7102,14 @@ msgstr ""
"The date must be entered in the format: \n"
"%s"
-#. String to use in 12-hour time format for times in the morning.
-#: ../calendar/gui/e-day-view.c:746
-#: ../calendar/gui/e-day-view.c:1089
-#: ../calendar/gui/e-week-view.c:503
-#: ../calendar/gui/print.c:811
-msgid "am"
-msgstr "am"
-
-#. String to use in 12-hour time format for times in the afternoon.
-#: ../calendar/gui/e-day-view.c:749
-#: ../calendar/gui/e-day-view.c:1092
-#: ../calendar/gui/e-week-view.c:506
-#: ../calendar/gui/print.c:813
-msgid "pm"
-msgstr "pm"
+#. TO TRANSLATORS: %02i is the number of minutes; this is a context menu entry
+#. * 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:807
+#, c-format
+msgid "%02i minute divisions"
+msgstr "%02i minute divisions"
#. strftime format %A = full weekday name, %d = day of month,
#. %B = full month name. Don't use any other specifiers.
@@ -7195,24 +7117,31 @@ msgstr "pm"
#. month, %B = full month name. You can change the
#. order but don't change the specifiers or add
#. anything.
-#: ../calendar/gui/e-day-view.c:2089
-#: ../calendar/gui/e-day-view-top-item.c:1311
+#: ../calendar/gui/e-day-view-top-item.c:1354
+#: ../calendar/gui/e-day-view.c:2141
#: ../calendar/gui/e-week-view-main-item.c:310
#: ../calendar/gui/e-week-view-main-item.c:524
-#: ../calendar/gui/print.c:1503
+#: ../calendar/gui/print.c:1656
msgid "%A %d %B"
msgstr "%A %d %B"
-#. TO TRANSLATORS: %02i is the number of minutes; this is a context menu entry
-#. * 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:807
-#, c-format
-msgid "%02i minute divisions"
-msgstr "%02i minute divisions"
+#. String to use in 12-hour time format for times in the morning.
+#: ../calendar/gui/e-day-view.c:766
+#: ../calendar/gui/e-day-view.c:1119
+#: ../calendar/gui/e-week-view.c:507
+#: ../calendar/gui/print.c:813
+msgid "am"
+msgstr "am"
-#: ../calendar/gui/e-itip-control.c:759
+#. String to use in 12-hour time format for times in the afternoon.
+#: ../calendar/gui/e-day-view.c:769
+#: ../calendar/gui/e-day-view.c:1122
+#: ../calendar/gui/e-week-view.c:510
+#: ../calendar/gui/print.c:815
+msgid "pm"
+msgstr "pm"
+
+#: ../calendar/gui/e-itip-control.c:769
msgid "Yes. (Complex Recurrence)"
msgstr "Yes. (Complex Recurrence)"
@@ -7221,7 +7150,7 @@ msgstr "Yes. (Complex Recurrence)"
#. 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:775
+#: ../calendar/gui/e-itip-control.c:785
#, c-format
msgid "Every day"
msgid_plural "Every %d days"
@@ -7233,16 +7162,16 @@ msgstr[1] "Every %d days"
#. 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:785
+#: ../calendar/gui/e-itip-control.c:795
#, c-format
msgid "Every week"
msgid_plural "Every %d weeks"
msgstr[0] "Every week"
-msgstr[1] "Every time"
+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:789
+#: ../calendar/gui/e-itip-control.c:799
#, c-format
msgid "Every week on "
msgid_plural "Every %d weeks on "
@@ -7250,19 +7179,19 @@ 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:798
+#: ../calendar/gui/e-itip-control.c:808
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:806
+#: ../calendar/gui/e-itip-control.c:816
#, 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:821
+#: ../calendar/gui/e-itip-control.c:831
#, c-format
msgid "The %s %s of "
msgstr "The %s %s of "
@@ -7273,7 +7202,7 @@ msgstr "The %s %s of "
#. 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:834
+#: ../calendar/gui/e-itip-control.c:844
#, c-format
msgid "every month"
msgid_plural "every %d months"
@@ -7285,7 +7214,7 @@ msgstr[1] "every %d months"
#. 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:843
+#: ../calendar/gui/e-itip-control.c:853
#, c-format
msgid "Every year"
msgid_plural "Every %d years"
@@ -7294,7 +7223,7 @@ 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:856
+#: ../calendar/gui/e-itip-control.c:866
#, c-format
msgid "a total of %d time"
msgid_plural " a total of %d times"
@@ -7302,339 +7231,339 @@ 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:866
+#: ../calendar/gui/e-itip-control.c:876
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:888
+#: ../calendar/gui/e-itip-control.c:898
msgid "Starts"
msgstr "Starts"
#. For Translators : 'ends' is ends:date implying a task ends on what date
-#: ../calendar/gui/e-itip-control.c:902
+#: ../calendar/gui/e-itip-control.c:912
msgid "Ends"
msgstr "Ends"
-#: ../calendar/gui/e-itip-control.c:936
-#: ../plugins/save-calendar/csv-format.c:395
+#: ../calendar/gui/e-itip-control.c:946
+#: ../plugins/save-calendar/csv-format.c:391
msgid "Due"
msgstr "Due"
-#: ../calendar/gui/e-itip-control.c:976
-#: ../calendar/gui/e-itip-control.c:1033
+#: ../calendar/gui/e-itip-control.c:986
+#: ../calendar/gui/e-itip-control.c:1043
msgid "iCalendar Information"
msgstr "iCalendar Information"
#. Title
-#: ../calendar/gui/e-itip-control.c:993
+#: ../calendar/gui/e-itip-control.c:1003
msgid "iCalendar Error"
msgstr "iCalendar Error"
-#: ../calendar/gui/e-itip-control.c:1065
-#: ../calendar/gui/e-itip-control.c:1081
-#: ../calendar/gui/e-itip-control.c:1092
-#: ../calendar/gui/e-itip-control.c:1109
-#: ../plugins/itip-formatter/itip-view.c:341
-#: ../plugins/itip-formatter/itip-view.c:342
-#: ../plugins/itip-formatter/itip-view.c:409
-#: ../plugins/itip-formatter/itip-view.c:410
-#: ../plugins/itip-formatter/itip-view.c:477
-#: ../plugins/itip-formatter/itip-view.c:478
+#: ../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
msgid "An unknown person"
msgstr "An unknown person"
#. Describe what the user can do
-#: ../calendar/gui/e-itip-control.c:1116
+#: ../calendar/gui/e-itip-control.c:1126
msgid "<br> Please review the following information, and then select an action from the menu below."
msgstr "<br> Please review the following information, and then select an action from the menu below."
-#: ../calendar/gui/e-itip-control.c:1164
+#: ../calendar/gui/e-itip-control.c:1174
#: ../calendar/gui/e-meeting-list-view.c:205
-#: ../calendar/gui/e-meeting-store.c:186
-#: ../calendar/gui/e-meeting-store.c:209
-#: ../calendar/gui/itip-utils.c:687
-#: ../plugins/itip-formatter/itip-formatter.c:1788
+#: ../calendar/gui/e-meeting-store.c:176
+#: ../calendar/gui/e-meeting-store.c:199
+#: ../calendar/gui/itip-utils.c:728
+#: ../plugins/itip-formatter/itip-formatter.c:2019
msgid "Accepted"
msgstr "Accepted"
-#: ../calendar/gui/e-itip-control.c:1168
-#: ../calendar/gui/itip-utils.c:690
-#: ../plugins/itip-formatter/itip-formatter.c:1791
+#: ../calendar/gui/e-itip-control.c:1178
+#: ../calendar/gui/itip-utils.c:731
+#: ../plugins/itip-formatter/itip-formatter.c:2022
msgid "Tentatively Accepted"
msgstr "Tentatively Accepted"
-#: ../calendar/gui/e-itip-control.c:1172
+#: ../calendar/gui/e-itip-control.c:1182
#: ../calendar/gui/e-meeting-list-view.c:206
-#: ../calendar/gui/e-meeting-store.c:188
-#: ../calendar/gui/e-meeting-store.c:211
-#: ../calendar/gui/itip-utils.c:693
-#: ../calendar/gui/itip-utils.c:722
-#: ../plugins/itip-formatter/itip-formatter.c:1794
+#: ../calendar/gui/e-meeting-store.c:178
+#: ../calendar/gui/e-meeting-store.c:201
+#: ../calendar/gui/itip-utils.c:734
+#: ../calendar/gui/itip-utils.c:763
+#: ../plugins/itip-formatter/itip-formatter.c:2025
msgid "Declined"
msgstr "Declined"
-#: ../calendar/gui/e-itip-control.c:1256
+#: ../calendar/gui/e-itip-control.c:1266
msgid "The meeting has been canceled, however it could not be found in your calendars"
msgstr "The meeting has been cancelled, however it could not be found in your calendars"
-#: ../calendar/gui/e-itip-control.c:1258
+#: ../calendar/gui/e-itip-control.c:1268
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:1337
+#: ../calendar/gui/e-itip-control.c:1346
#, c-format
msgid "<b>%s</b> has published meeting information."
msgstr "<b>%s</b> has published meeting information."
-#: ../calendar/gui/e-itip-control.c:1338
+#: ../calendar/gui/e-itip-control.c:1347
msgid "Meeting Information"
msgstr "Meeting Information"
-#: ../calendar/gui/e-itip-control.c:1344
+#: ../calendar/gui/e-itip-control.c:1353
#, 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:1346
+#: ../calendar/gui/e-itip-control.c:1355
#, 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:1347
+#: ../calendar/gui/e-itip-control.c:1356
msgid "Meeting Proposal"
msgstr "Meeting Proposal"
#. FIXME Whats going on here?
-#: ../calendar/gui/e-itip-control.c:1353
+#: ../calendar/gui/e-itip-control.c:1362
#, 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:1354
+#: ../calendar/gui/e-itip-control.c:1363
msgid "Meeting Update"
msgstr "Meeting Update"
-#: ../calendar/gui/e-itip-control.c:1358
+#: ../calendar/gui/e-itip-control.c:1367
#, 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:1359
+#: ../calendar/gui/e-itip-control.c:1368
msgid "Meeting Update Request"
msgstr "Meeting Update Request"
-#: ../calendar/gui/e-itip-control.c:1366
+#: ../calendar/gui/e-itip-control.c:1375
#, 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:1367
+#: ../calendar/gui/e-itip-control.c:1376
msgid "Meeting Reply"
msgstr "Meeting Reply"
-#: ../calendar/gui/e-itip-control.c:1374
+#: ../calendar/gui/e-itip-control.c:1383
#, c-format
msgid "<b>%s</b> has canceled a meeting."
msgstr "<b>%s</b> has cancelled a meeting."
-#: ../calendar/gui/e-itip-control.c:1375
+#: ../calendar/gui/e-itip-control.c:1384
msgid "Meeting Cancelation"
msgstr "Meeting Cancellation"
-#: ../calendar/gui/e-itip-control.c:1385
-#: ../calendar/gui/e-itip-control.c:1462
-#: ../calendar/gui/e-itip-control.c:1502
+#: ../calendar/gui/e-itip-control.c:1394
+#: ../calendar/gui/e-itip-control.c:1471
+#: ../calendar/gui/e-itip-control.c:1511
#, 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:1386
+#: ../calendar/gui/e-itip-control.c:1395
msgid "Bad Meeting Message"
msgstr "Bad Meeting Message"
-#: ../calendar/gui/e-itip-control.c:1413
+#: ../calendar/gui/e-itip-control.c:1422
#, c-format
msgid "<b>%s</b> has published task information."
msgstr "<b>%s</b> has published task information."
-#: ../calendar/gui/e-itip-control.c:1414
+#: ../calendar/gui/e-itip-control.c:1423
msgid "Task Information"
msgstr "Task Information"
-#: ../calendar/gui/e-itip-control.c:1421
+#: ../calendar/gui/e-itip-control.c:1430
#, 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:1423
+#: ../calendar/gui/e-itip-control.c:1432
#, 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:1424
+#: ../calendar/gui/e-itip-control.c:1433
msgid "Task Proposal"
msgstr "Task Proposal"
#. FIXME Whats going on here?
-#: ../calendar/gui/e-itip-control.c:1430
+#: ../calendar/gui/e-itip-control.c:1439
#, 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:1431
+#: ../calendar/gui/e-itip-control.c:1440
msgid "Task Update"
msgstr "Task Update"
-#: ../calendar/gui/e-itip-control.c:1435
+#: ../calendar/gui/e-itip-control.c:1444
#, 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:1436
+#: ../calendar/gui/e-itip-control.c:1445
msgid "Task Update Request"
msgstr "Task Update Request"
-#: ../calendar/gui/e-itip-control.c:1443
+#: ../calendar/gui/e-itip-control.c:1452
#, 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:1444
+#: ../calendar/gui/e-itip-control.c:1453
msgid "Task Reply"
msgstr "Task Reply"
-#: ../calendar/gui/e-itip-control.c:1451
+#: ../calendar/gui/e-itip-control.c:1460
#, c-format
msgid "<b>%s</b> has canceled a task."
msgstr "<b>%s</b> has cancelled a task."
-#: ../calendar/gui/e-itip-control.c:1452
+#: ../calendar/gui/e-itip-control.c:1461
msgid "Task Cancelation"
msgstr "Task Cancellation"
-#: ../calendar/gui/e-itip-control.c:1463
+#: ../calendar/gui/e-itip-control.c:1472
msgid "Bad Task Message"
msgstr "Bad Task Message"
-#: ../calendar/gui/e-itip-control.c:1487
+#: ../calendar/gui/e-itip-control.c:1496
#, 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:1488
+#: ../calendar/gui/e-itip-control.c:1497
msgid "Free/Busy Information"
msgstr "Free/Busy Information"
-#: ../calendar/gui/e-itip-control.c:1492
+#: ../calendar/gui/e-itip-control.c:1501
#, 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:1493
+#: ../calendar/gui/e-itip-control.c:1502
msgid "Free/Busy Request"
msgstr "Free/Busy Request"
-#: ../calendar/gui/e-itip-control.c:1497
+#: ../calendar/gui/e-itip-control.c:1506
#, 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:1498
+#: ../calendar/gui/e-itip-control.c:1507
msgid "Free/Busy Reply"
msgstr "Free/Busy Reply"
-#: ../calendar/gui/e-itip-control.c:1503
+#: ../calendar/gui/e-itip-control.c:1512
msgid "Bad Free/Busy Message"
msgstr "Bad Free/Busy Message"
-#: ../calendar/gui/e-itip-control.c:1578
+#: ../calendar/gui/e-itip-control.c:1588
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:1637
+#: ../calendar/gui/e-itip-control.c:1647
msgid "The message contains only unsupported requests."
msgstr "The message contains only unsupported requests."
-#: ../calendar/gui/e-itip-control.c:1670
+#: ../calendar/gui/e-itip-control.c:1680
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:1702
+#: ../calendar/gui/e-itip-control.c:1712
msgid "The attachment has no viewable calendar items"
msgstr "The attachment has no viewable calendar items"
-#: ../calendar/gui/e-itip-control.c:1944
+#: ../calendar/gui/e-itip-control.c:1954
msgid "Update complete\n"
msgstr "Update complete\n"
-#: ../calendar/gui/e-itip-control.c:1977
+#: ../calendar/gui/e-itip-control.c:1988
msgid "Object is invalid and cannot be updated\n"
msgstr "Object is invalid and cannot be updated\n"
-#: ../calendar/gui/e-itip-control.c:1994
+#: ../calendar/gui/e-itip-control.c:2005
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:2012
+#: ../calendar/gui/e-itip-control.c:2023
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:2036
+#: ../calendar/gui/e-itip-control.c:2047
msgid "Attendee status updated\n"
msgstr "Attendee status updated\n"
-#: ../calendar/gui/e-itip-control.c:2043
-#: ../plugins/itip-formatter/itip-formatter.c:1108
+#: ../calendar/gui/e-itip-control.c:2054
+#: ../plugins/itip-formatter/itip-formatter.c:1242
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:2074
-#: ../calendar/gui/e-itip-control.c:2131
+#: ../calendar/gui/e-itip-control.c:2085
+#: ../calendar/gui/e-itip-control.c:2142
msgid "Item sent!\n"
msgstr "Item sent!\n"
-#: ../calendar/gui/e-itip-control.c:2080
-#: ../calendar/gui/e-itip-control.c:2139
+#: ../calendar/gui/e-itip-control.c:2091
+#: ../calendar/gui/e-itip-control.c:2150
msgid "The item could not be sent!\n"
msgstr "The item could not be sent!\n"
-#: ../calendar/gui/e-itip-control.c:2220
+#: ../calendar/gui/e-itip-control.c:2230
msgid "Choose an action:"
msgstr "Choose an action:"
-#: ../calendar/gui/e-itip-control.c:2292
+#: ../calendar/gui/e-itip-control.c:2301
msgid "Update"
msgstr "Update"
-#: ../calendar/gui/e-itip-control.c:2320
+#: ../calendar/gui/e-itip-control.c:2329
#: ../plugins/groupwise-features/process-meeting.c:48
msgid "Accept"
msgstr "Accept"
-#: ../calendar/gui/e-itip-control.c:2321
+#: ../calendar/gui/e-itip-control.c:2330
msgid "Tentatively accept"
msgstr "Tentatively accept"
-#: ../calendar/gui/e-itip-control.c:2322
+#: ../calendar/gui/e-itip-control.c:2331
#: ../plugins/groupwise-features/process-meeting.c:50
msgid "Decline"
msgstr "Decline"
-#: ../calendar/gui/e-itip-control.c:2351
+#: ../calendar/gui/e-itip-control.c:2360
msgid "Send Free/Busy Information"
msgstr "Send Free/Busy Information"
-#: ../calendar/gui/e-itip-control.c:2379
+#: ../calendar/gui/e-itip-control.c:2388
msgid "Update respondent status"
msgstr "Update respondent status"
-#: ../calendar/gui/e-itip-control.c:2407
+#: ../calendar/gui/e-itip-control.c:2416
msgid "Send Latest Information"
msgstr "Send Latest Information"
-#: ../calendar/gui/e-itip-control.c:2435
-#: ../calendar/gui/itip-utils.c:710
+#: ../calendar/gui/e-itip-control.c:2444
+#: ../calendar/gui/itip-utils.c:751
#: ../ui/evolution-mail-global.xml.h:1
msgid "Cancel"
msgstr "Cancel"
@@ -7684,76 +7613,83 @@ msgid "Attendees"
msgstr "Attendees"
#: ../calendar/gui/e-meeting-list-view.c:165
-#: ../calendar/gui/e-meeting-store.c:99
-#: ../calendar/gui/e-meeting-store.c:116
-#: ../calendar/gui/e-meeting-store.c:758
+#: ../calendar/gui/e-meeting-store.c:89
+#: ../calendar/gui/e-meeting-store.c:106
+#: ../calendar/gui/e-meeting-store.c:743
+#: ../calendar/gui/print.c:965
msgid "Individual"
msgstr "Individual"
#: ../calendar/gui/e-meeting-list-view.c:166
-#: ../calendar/gui/e-meeting-store.c:101
-#: ../calendar/gui/e-meeting-store.c:118
-#: ../widgets/table/e-table-config.glade.h:6
-#: ../widgets/table/e-table-config-no-group.glade.h:7
+#: ../calendar/gui/e-meeting-store.c:91
+#: ../calendar/gui/e-meeting-store.c:108
+#: ../calendar/gui/print.c:966
+#: ../widgets/table/e-table-config.glade.h:7
msgid "Group"
msgstr "Group"
#: ../calendar/gui/e-meeting-list-view.c:167
-#: ../calendar/gui/e-meeting-store.c:103
-#: ../calendar/gui/e-meeting-store.c:120
+#: ../calendar/gui/e-meeting-store.c:93
+#: ../calendar/gui/e-meeting-store.c:110
+#: ../calendar/gui/print.c:967
msgid "Resource"
msgstr "Resource"
#: ../calendar/gui/e-meeting-list-view.c:168
-#: ../calendar/gui/e-meeting-store.c:105
-#: ../calendar/gui/e-meeting-store.c:122
+#: ../calendar/gui/e-meeting-store.c:95
+#: ../calendar/gui/e-meeting-store.c:112
+#: ../calendar/gui/print.c:968
msgid "Room"
msgstr "Room"
#: ../calendar/gui/e-meeting-list-view.c:179
-#: ../calendar/gui/e-meeting-store.c:134
-#: ../calendar/gui/e-meeting-store.c:151
+#: ../calendar/gui/e-meeting-store.c:124
+#: ../calendar/gui/e-meeting-store.c:141
+#: ../calendar/gui/print.c:982
msgid "Chair"
msgstr "Chair"
#: ../calendar/gui/e-meeting-list-view.c:180
-#: ../calendar/gui/e-meeting-store.c:136
-#: ../calendar/gui/e-meeting-store.c:153
-#: ../calendar/gui/e-meeting-store.c:761
+#: ../calendar/gui/e-meeting-store.c:126
+#: ../calendar/gui/e-meeting-store.c:143
+#: ../calendar/gui/e-meeting-store.c:746
+#: ../calendar/gui/print.c:983
msgid "Required Participant"
msgstr "Required Participant"
#: ../calendar/gui/e-meeting-list-view.c:181
-#: ../calendar/gui/e-meeting-store.c:138
-#: ../calendar/gui/e-meeting-store.c:155
+#: ../calendar/gui/e-meeting-store.c:128
+#: ../calendar/gui/e-meeting-store.c:145
+#: ../calendar/gui/print.c:984
msgid "Optional Participant"
msgstr "Optional Participant"
#: ../calendar/gui/e-meeting-list-view.c:182
-#: ../calendar/gui/e-meeting-store.c:140
-#: ../calendar/gui/e-meeting-store.c:157
+#: ../calendar/gui/e-meeting-store.c:130
+#: ../calendar/gui/e-meeting-store.c:147
+#: ../calendar/gui/print.c:985
msgid "Non-Participant"
msgstr "Non-Participant"
#: ../calendar/gui/e-meeting-list-view.c:204
-#: ../calendar/gui/e-meeting-store.c:184
-#: ../calendar/gui/e-meeting-store.c:207
-#: ../calendar/gui/e-meeting-store.c:771
+#: ../calendar/gui/e-meeting-store.c:174
+#: ../calendar/gui/e-meeting-store.c:197
+#: ../calendar/gui/e-meeting-store.c:756
msgid "Needs Action"
msgstr "Needs Action"
#: ../calendar/gui/e-meeting-list-view.c:207
-#: ../calendar/gui/e-meeting-store.c:190
-#: ../calendar/gui/e-meeting-store.c:213
-#: ../calendar/gui/e-meeting-time-sel.c:410
+#: ../calendar/gui/e-meeting-store.c:180
+#: ../calendar/gui/e-meeting-store.c:203
+#: ../calendar/gui/e-meeting-time-sel.c:412
msgid "Tentative"
msgstr "Tentative"
#: ../calendar/gui/e-meeting-list-view.c:208
-#: ../calendar/gui/e-meeting-store.c:192
-#: ../calendar/gui/e-meeting-store.c:215
-#: ../calendar/gui/itip-utils.c:696
-#: ../plugins/itip-formatter/itip-formatter.c:1797
+#: ../calendar/gui/e-meeting-store.c:182
+#: ../calendar/gui/e-meeting-store.c:205
+#: ../calendar/gui/itip-utils.c:737
+#: ../plugins/itip-formatter/itip-formatter.c:2028
msgid "Delegated"
msgstr "Delegated"
@@ -7762,100 +7698,143 @@ msgstr "Delegated"
msgid "Attendee "
msgstr "Attendee "
-#: ../calendar/gui/e-meeting-store.c:196
-#: ../calendar/gui/e-meeting-store.c:219
+#. To translators: RSVP means "please reply"
+#: ../calendar/gui/e-meeting-list-view.c:526
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:8
+msgid "RSVP"
+msgstr "RSVP"
+
+#: ../calendar/gui/e-meeting-store.c:186
+#: ../calendar/gui/e-meeting-store.c:209
msgid "In Process"
msgstr "In Process"
-#: ../calendar/gui/e-meeting-time-sel.c:412
+#. 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:464
+#: ../calendar/gui/e-meeting-time-sel.c:2137
+msgid "%A, %B %d, %Y"
+msgstr "%A, %d %B, %Y"
+
+#. This is a strftime() format string %a = abbreviated weekday
+#. name, %m = month number, %d = month day, %Y = full year.
+#. 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:468
+#: ../calendar/gui/e-meeting-time-sel.c:2168
+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:472
+msgid "%m/%d/%Y"
+msgstr "%d/%m/%Y"
+
+#: ../calendar/gui/e-meeting-time-sel.c:414
msgid "Out of Office"
msgstr "Out of Office"
-#: ../calendar/gui/e-meeting-time-sel.c:413
+#: ../calendar/gui/e-meeting-time-sel.c:415
msgid "No Information"
msgstr "No Information"
-#: ../calendar/gui/e-meeting-time-sel.c:428
+#: ../calendar/gui/e-meeting-time-sel.c:430
msgid "A_ttendees..."
msgstr "A_ttendees..."
-#: ../calendar/gui/e-meeting-time-sel.c:449
+#: ../calendar/gui/e-meeting-time-sel.c:451
msgid "O_ptions"
msgstr "O_ptions"
-#: ../calendar/gui/e-meeting-time-sel.c:466
+#: ../calendar/gui/e-meeting-time-sel.c:468
msgid "Show _only working hours"
msgstr "Show _only working hours"
-#: ../calendar/gui/e-meeting-time-sel.c:476
+#: ../calendar/gui/e-meeting-time-sel.c:478
msgid "Show _zoomed out"
msgstr "Show _zoomed out"
-#: ../calendar/gui/e-meeting-time-sel.c:491
+#: ../calendar/gui/e-meeting-time-sel.c:493
msgid "_Update free/busy"
msgstr "_Update free/busy"
-#: ../calendar/gui/e-meeting-time-sel.c:506
+#: ../calendar/gui/e-meeting-time-sel.c:508
msgid "_<<"
msgstr "_<<"
-#: ../calendar/gui/e-meeting-time-sel.c:524
+#: ../calendar/gui/e-meeting-time-sel.c:526
msgid "_Autopick"
msgstr "_Autopick"
-#: ../calendar/gui/e-meeting-time-sel.c:539
+#: ../calendar/gui/e-meeting-time-sel.c:541
msgid ">_>"
msgstr ">_>"
-#: ../calendar/gui/e-meeting-time-sel.c:556
+#: ../calendar/gui/e-meeting-time-sel.c:558
msgid "_All people and resources"
msgstr "_All people and resources"
-#: ../calendar/gui/e-meeting-time-sel.c:565
+#: ../calendar/gui/e-meeting-time-sel.c:567
msgid "All _people and one resource"
msgstr "All _people and one resource"
-#: ../calendar/gui/e-meeting-time-sel.c:574
+#: ../calendar/gui/e-meeting-time-sel.c:576
msgid "_Required people"
msgstr "_Required people"
-#: ../calendar/gui/e-meeting-time-sel.c:583
+#: ../calendar/gui/e-meeting-time-sel.c:585
msgid "Required people and _one resource"
msgstr "Required people and _one resource"
-#: ../calendar/gui/e-meeting-time-sel.c:619
+#: ../calendar/gui/e-meeting-time-sel.c:621
msgid "_Start time:"
msgstr "_Start time:"
-#: ../calendar/gui/e-meeting-time-sel.c:646
+#: ../calendar/gui/e-meeting-time-sel.c:648
msgid "_End time:"
msgstr "_End time:"
-#. This is a strftime() format string %A = full weekday name,
-#. %B = full month name, %d = month day, %Y = full year.
-#: ../calendar/gui/e-meeting-time-sel.c:2116
-#: ../calendar/gui/e-meeting-time-sel-item.c:464
-msgid "%A, %B %d, %Y"
-msgstr "%A, %d %B, %Y"
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:1
+msgid "Attendee"
+msgstr "Attendee"
-#. This is a strftime() format string %a = abbreviated weekday 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.c:2149
-#: ../calendar/gui/e-meeting-time-sel-item.c:468
-msgid "%a %m/%d/%Y"
-msgstr "%a %d/%m/%Y"
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:2
+msgid "Click here to add an attendee"
+msgstr "Click here to add an attendee"
-#. This is a strftime() format string %m = month number,
-#. %d = month day, %Y = full year.
-#: ../calendar/gui/e-meeting-time-sel-item.c:472
-msgid "%m/%d/%Y"
-msgstr "%d/%m/%Y"
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:3
+msgid "Common Name"
+msgstr "Common Name"
+
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:4
+msgid "Delegated From"
+msgstr "Delegated From"
+
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:5
+msgid "Delegated To"
+msgstr "Delegated To"
+
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:6
+msgid "Language"
+msgstr "Language"
+
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:7
+msgid "Member"
+msgstr "Member"
+
+#: ../calendar/gui/e-memo-table.c:939
+msgid "_Delete Selected Memos"
+msgstr "_Delete Selected Memos"
+
+#: ../calendar/gui/e-memo-table.c:1090
+#: ../calendar/gui/e-memo-table.etspec.h:2
+msgid "Click to add a memo"
+msgstr "Click to add a memo"
-#: ../calendar/gui/e-memos.c:733
-#: ../calendar/gui/e-tasks.c:844
-#: ../calendar/gui/gnome-cal.c:2778
+#: ../calendar/gui/e-memos.c:790
+#: ../calendar/gui/e-tasks.c:922
+#: ../calendar/gui/gnome-cal.c:2867
#, c-format
msgid ""
"Error on %s:\n"
@@ -7864,63 +7843,34 @@ msgstr ""
"Error on %s:\n"
" %s"
-#: ../calendar/gui/e-memos.c:782
+#: ../calendar/gui/e-memos.c:839
msgid "Loading memos"
msgstr "Loading memos"
-#: ../calendar/gui/e-memos.c:863
+#: ../calendar/gui/e-memos.c:920
#, c-format
msgid "Opening memos at %s"
msgstr "Opening memos at %s"
-#: ../calendar/gui/e-memos.c:1036
-#: ../calendar/gui/e-tasks.c:1249
+#: ../calendar/gui/e-memos.c:1093
+#: ../calendar/gui/e-tasks.c:1327
msgid "Deleting selected objects..."
msgstr "Deleting selected objects..."
-#: ../calendar/gui/e-memos.c:1094
-#: ../calendar/gui/e-memo-table.c:324
-#: ../calendar/gui/gnome-cal.c:1637
-#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: ../calendar/gui/memos-component.c:531
-#: ../calendar/gui/memos-component.c:1008
-#: ../calendar/gui/memos-control.c:336
-#: ../calendar/gui/memos-control.c:352
-msgid "Memos"
-msgstr "Memos"
-
-#: ../calendar/gui/e-memo-table.c:920
-msgid "_Delete Selected Memos"
-msgstr "_Delete Selected Memos"
-
-#: ../calendar/gui/e-memo-table.c:1071
-#: ../calendar/gui/e-memo-table.etspec.h:2
-msgid "Click to add a memo"
-msgstr "Click to add a memo"
-
-#: ../calendar/gui/e-memo-table.etspec.h:3
-msgid "Memo sort"
-msgstr "Memo sort"
-
-#: ../calendar/gui/e-pub-utils.c:322
-#, c-format
-msgid "Enter the password for %s"
-msgstr "Enter the password for %s"
-
-#: ../calendar/gui/e-tasks.c:894
+#: ../calendar/gui/e-tasks.c:972
msgid "Loading tasks"
msgstr "Loading tasks"
-#: ../calendar/gui/e-tasks.c:981
+#: ../calendar/gui/e-tasks.c:1059
#, c-format
msgid "Opening tasks at %s"
msgstr "Opening tasks at %s"
-#: ../calendar/gui/e-tasks.c:1226
+#: ../calendar/gui/e-tasks.c:1304
msgid "Completing tasks..."
msgstr "Completing tasks..."
-#: ../calendar/gui/e-tasks.c:1276
+#: ../calendar/gui/e-tasks.c:1354
msgid "Expunging"
msgstr "Expunging"
@@ -7933,100 +7883,50 @@ msgstr "Select Timezone"
#. change the specifiers or add anything.
#: ../calendar/gui/e-week-view-main-item.c:327
#: ../calendar/gui/e-week-view-main-item.c:541
-#: ../calendar/gui/print.c:1484
+#: ../calendar/gui/print.c:1637
msgid "%d %B"
msgstr "%d %B"
-#: ../calendar/gui/gnome-cal.c:820
+#: ../calendar/gui/gnome-cal.c:828
msgid "Updating query"
msgstr "Updating query"
-#: ../calendar/gui/gnome-cal.c:2429
+#: ../calendar/gui/gnome-cal.c:2508
msgid "_Custom View"
msgstr "_Custom View"
-#: ../calendar/gui/gnome-cal.c:2430
+#: ../calendar/gui/gnome-cal.c:2509
msgid "_Save Custom View"
msgstr "_Save Custom View"
-#: ../calendar/gui/gnome-cal.c:2435
+#: ../calendar/gui/gnome-cal.c:2514
msgid "_Define Views..."
msgstr "_Define Views..."
-#: ../calendar/gui/gnome-cal.c:2601
+#: ../calendar/gui/gnome-cal.c:2691
#, c-format
msgid "Loading appointments at %s"
msgstr "Loading appointments at %s"
-#: ../calendar/gui/gnome-cal.c:2620
+#: ../calendar/gui/gnome-cal.c:2710
#, c-format
msgid "Loading tasks at %s"
msgstr "Loading tasks at %s"
-#: ../calendar/gui/gnome-cal.c:2629
+#: ../calendar/gui/gnome-cal.c:2719
#, c-format
msgid "Loading memos at %s"
msgstr "Loading memos at %s"
-#: ../calendar/gui/gnome-cal.c:2737
+#: ../calendar/gui/gnome-cal.c:2826
#, c-format
msgid "Opening %s"
msgstr "Opening %s"
-#: ../calendar/gui/gnome-cal.c:3673
+#: ../calendar/gui/gnome-cal.c:3783
msgid "Purging"
msgstr "Purging"
-#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-#: ../plugins/itip-formatter/itip-formatter.c:2078
-msgid "Calendar and Tasks"
-msgstr "Calendar and Tasks"
-
-#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
-msgid "Configure your timezone, Calendar and Task List here "
-msgstr "Configure your timezone, Calendar and Task List here "
-
-#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
-msgid "Evolution Calendar and Tasks"
-msgstr "Evolution Calendar and Tasks"
-
-#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
-msgid "Evolution Calendar configuration control"
-msgstr "Evolution Calendar configuration control"
-
-#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
-msgid "Evolution Calendar scheduling message viewer"
-msgstr "Evolution Calendar scheduling message viewer"
-
-#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
-msgid "Evolution Calendar/Task editor"
-msgstr "Evolution Calendar/Task editor"
-
-#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
-msgid "Evolution's Calendar component"
-msgstr "Evolution's Calendar component"
-
-#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
-msgid "Evolution's Memos component"
-msgstr "Evolution's Memos component"
-
-#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
-msgid "Evolution's Tasks component"
-msgstr "Evolution's Tasks component"
-
-#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
-msgid "Memo_s"
-msgstr "Memo_s"
-
-#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:14
-msgid "_Calendars"
-msgstr "_Calendars"
-
-#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:15
-#: ../views/tasks/galview.xml.h:3
-msgid "_Tasks"
-msgstr "_Tasks"
-
#: ../calendar/gui/goto-dialog.glade.h:1
msgid "April"
msgstr "April"
@@ -8083,139 +7983,139 @@ msgstr "September"
msgid "_Select Today"
msgstr "_Select Today"
-#: ../calendar/gui/itip-utils.c:412
-#: ../calendar/gui/itip-utils.c:461
-#: ../calendar/gui/itip-utils.c:563
+#: ../calendar/gui/itip-utils.c:449
+#: ../calendar/gui/itip-utils.c:498
+#: ../calendar/gui/itip-utils.c:604
msgid "An organizer must be set."
msgstr "An organiser must be set."
-#: ../calendar/gui/itip-utils.c:448
+#: ../calendar/gui/itip-utils.c:485
msgid "At least one attendee is necessary"
msgstr "At least one attendee is necessary"
-#: ../calendar/gui/itip-utils.c:649
-#: ../calendar/gui/itip-utils.c:772
+#: ../calendar/gui/itip-utils.c:690
+#: ../calendar/gui/itip-utils.c:813
msgid "Event information"
msgstr "Event information"
-#: ../calendar/gui/itip-utils.c:651
-#: ../calendar/gui/itip-utils.c:774
+#: ../calendar/gui/itip-utils.c:692
+#: ../calendar/gui/itip-utils.c:815
msgid "Task information"
msgstr "Task information"
-#: ../calendar/gui/itip-utils.c:653
-#: ../calendar/gui/itip-utils.c:776
-msgid "Journal information"
-msgstr "Journal information"
+#: ../calendar/gui/itip-utils.c:694
+#: ../calendar/gui/itip-utils.c:817
+msgid "Memo information"
+msgstr "Memo information"
-#: ../calendar/gui/itip-utils.c:655
-#: ../calendar/gui/itip-utils.c:794
+#: ../calendar/gui/itip-utils.c:696
+#: ../calendar/gui/itip-utils.c:835
msgid "Free/Busy information"
msgstr "Free/Busy information"
-#: ../calendar/gui/itip-utils.c:657
+#: ../calendar/gui/itip-utils.c:698
msgid "Calendar information"
msgstr "Calendar information"
-#: ../calendar/gui/itip-utils.c:706
+#: ../calendar/gui/itip-utils.c:747
msgid "Updated"
msgstr "Updated"
-#: ../calendar/gui/itip-utils.c:714
+#: ../calendar/gui/itip-utils.c:755
msgid "Refresh"
msgstr "Refresh"
-#: ../calendar/gui/itip-utils.c:718
+#: ../calendar/gui/itip-utils.c:759
msgid "Counter-proposal"
msgstr "Counter-proposal"
-#: ../calendar/gui/itip-utils.c:790
+#: ../calendar/gui/itip-utils.c:831
#, c-format
msgid "Free/Busy information (%s to %s)"
msgstr "Free/Busy information (%s to %s)"
-#: ../calendar/gui/itip-utils.c:800
+#: ../calendar/gui/itip-utils.c:841
msgid "iCalendar information"
msgstr "iCalendar information"
-#: ../calendar/gui/itip-utils.c:955
+#: ../calendar/gui/itip-utils.c:1008
msgid "You must be an attendee of the event."
msgstr "You must be an attendee of the event."
-#: ../calendar/gui/memos-component.c:451
+#: ../calendar/gui/memos-component.c:464
msgid "_New Memo List"
msgstr "_New Memo List"
-#: ../calendar/gui/memos-component.c:527
+#: ../calendar/gui/memos-component.c:544
#, c-format
msgid "%d memo"
msgid_plural "%d memos"
msgstr[0] "%d memo"
msgstr[1] "%d memos"
-#: ../calendar/gui/memos-component.c:529
-#: ../calendar/gui/tasks-component.c:520
+#: ../calendar/gui/memos-component.c:546
+#: ../calendar/gui/tasks-component.c:537
#, c-format
msgid ", %d selected"
msgid_plural ", %d selected"
msgstr[0] ". %d selected"
msgstr[1] ". %d selected"
-#: ../calendar/gui/memos-component.c:576
+#: ../calendar/gui/memos-component.c:593
msgid "Failed upgrading memos."
msgstr "Failed upgrading memos."
-#: ../calendar/gui/memos-component.c:874
+#: ../calendar/gui/memos-component.c:953
#, c-format
msgid "Unable to open the memo list '%s' for creating events and meetings"
msgstr "Unable to open the memo list '%s' for creating events and meetings"
-#: ../calendar/gui/memos-component.c:887
+#: ../calendar/gui/memos-component.c:966
msgid "There is no calendar available for creating memos"
msgstr "There is no calendar available for creating memos"
-#: ../calendar/gui/memos-component.c:983
+#: ../calendar/gui/memos-component.c:1076
msgid "Memo Source Selector"
msgstr "Memo Source Selector"
-#: ../calendar/gui/memos-component.c:1166
+#: ../calendar/gui/memos-component.c:1259
msgid "New memo"
msgstr "New memo"
-#: ../calendar/gui/memos-component.c:1167
+#: ../calendar/gui/memos-component.c:1260
msgid "Mem_o"
msgstr "Mem_o"
-#: ../calendar/gui/memos-component.c:1168
+#: ../calendar/gui/memos-component.c:1261
msgid "Create a new memo"
msgstr "Create a new memo"
-#: ../calendar/gui/memos-component.c:1174
+#: ../calendar/gui/memos-component.c:1267
msgid "New shared memo"
msgstr "New shared memo"
-#: ../calendar/gui/memos-component.c:1175
+#: ../calendar/gui/memos-component.c:1268
msgid "_Shared memo"
msgstr "_Shared memo"
-#: ../calendar/gui/memos-component.c:1176
+#: ../calendar/gui/memos-component.c:1269
msgid "Create a shared new memo"
msgstr "Create a shared new memo"
-#: ../calendar/gui/memos-component.c:1182
+#: ../calendar/gui/memos-component.c:1275
msgid "New memo list"
msgstr "New memo list"
-#: ../calendar/gui/memos-component.c:1183
+#: ../calendar/gui/memos-component.c:1276
msgid "Memo li_st"
msgstr "Memo li_st"
-#: ../calendar/gui/memos-component.c:1184
+#: ../calendar/gui/memos-component.c:1277
msgid "Create a new memo list"
msgstr "Create a new memo list"
-#: ../calendar/gui/memos-control.c:336
-#: ../calendar/gui/memos-control.c:352
+#: ../calendar/gui/memos-control.c:356
+#: ../calendar/gui/memos-control.c:372
msgid "Print Memos"
msgstr "Print Memos"
@@ -8240,291 +8140,295 @@ msgstr ""
"Please be patient while Evolution migrates your folders..."
#. FIXME: set proper domain/code
-#: ../calendar/gui/migration.c:770
-#: ../calendar/gui/migration.c:938
+#: ../calendar/gui/migration.c:780
+#: ../calendar/gui/migration.c:948
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:799
+#: ../calendar/gui/migration.c:809
#, c-format
msgid "Unable to migrate calendar `%s'"
msgstr "Unable to migrate calendar `%s'"
#. FIXME: domain/code
-#: ../calendar/gui/migration.c:967
+#: ../calendar/gui/migration.c:977
#, c-format
msgid "Unable to migrate tasks `%s'"
msgstr "Unable to migrate tasks `%s'"
-#: ../calendar/gui/migration.c:1211
+#: ../calendar/gui/migration.c:1226
#: ../plugins/groupwise-account-setup/camel-gw-listener.c:402
#: ../plugins/groupwise-account-setup/camel-gw-listener.c:433
#: ../plugins/groupwise-account-setup/camel-gw-listener.c:546
msgid "Notes"
msgstr "Notes"
-#: ../calendar/gui/print.c:513
+#: ../calendar/gui/print.c:515
msgid "1st"
msgstr "1st"
-#: ../calendar/gui/print.c:513
+#: ../calendar/gui/print.c:515
msgid "2nd"
msgstr "2nd"
-#: ../calendar/gui/print.c:513
+#: ../calendar/gui/print.c:515
msgid "3rd"
msgstr "3rd"
-#: ../calendar/gui/print.c:513
+#: ../calendar/gui/print.c:515
msgid "4th"
msgstr "4th"
-#: ../calendar/gui/print.c:513
+#: ../calendar/gui/print.c:515
msgid "5th"
msgstr "5th"
-#: ../calendar/gui/print.c:514
+#: ../calendar/gui/print.c:516
msgid "6th"
msgstr "6th"
-#: ../calendar/gui/print.c:514
+#: ../calendar/gui/print.c:516
msgid "7th"
msgstr "7th"
-#: ../calendar/gui/print.c:514
+#: ../calendar/gui/print.c:516
msgid "8th"
msgstr "8th"
-#: ../calendar/gui/print.c:514
+#: ../calendar/gui/print.c:516
msgid "9th"
msgstr "9th"
-#: ../calendar/gui/print.c:514
+#: ../calendar/gui/print.c:516
msgid "10th"
msgstr "10th"
-#: ../calendar/gui/print.c:515
+#: ../calendar/gui/print.c:517
msgid "11th"
msgstr "11th"
-#: ../calendar/gui/print.c:515
+#: ../calendar/gui/print.c:517
msgid "12th"
msgstr "12th"
-#: ../calendar/gui/print.c:515
+#: ../calendar/gui/print.c:517
msgid "13th"
msgstr "13th"
-#: ../calendar/gui/print.c:515
+#: ../calendar/gui/print.c:517
msgid "14th"
msgstr "14th"
-#: ../calendar/gui/print.c:515
+#: ../calendar/gui/print.c:517
msgid "15th"
msgstr "15th"
-#: ../calendar/gui/print.c:516
+#: ../calendar/gui/print.c:518
msgid "16th"
msgstr "16th"
-#: ../calendar/gui/print.c:516
+#: ../calendar/gui/print.c:518
msgid "17th"
msgstr "17th"
-#: ../calendar/gui/print.c:516
+#: ../calendar/gui/print.c:518
msgid "18th"
msgstr "18th"
-#: ../calendar/gui/print.c:516
+#: ../calendar/gui/print.c:518
msgid "19th"
msgstr "19th"
-#: ../calendar/gui/print.c:516
+#: ../calendar/gui/print.c:518
msgid "20th"
msgstr "20th"
-#: ../calendar/gui/print.c:517
+#: ../calendar/gui/print.c:519
msgid "21st"
msgstr "21st"
-#: ../calendar/gui/print.c:517
+#: ../calendar/gui/print.c:519
msgid "22nd"
msgstr "22nd"
-#: ../calendar/gui/print.c:517
+#: ../calendar/gui/print.c:519
msgid "23rd"
msgstr "23rd"
-#: ../calendar/gui/print.c:517
+#: ../calendar/gui/print.c:519
msgid "24th"
msgstr "24th"
-#: ../calendar/gui/print.c:517
+#: ../calendar/gui/print.c:519
msgid "25th"
msgstr "25th"
-#: ../calendar/gui/print.c:518
+#: ../calendar/gui/print.c:520
msgid "26th"
msgstr "26th"
-#: ../calendar/gui/print.c:518
+#: ../calendar/gui/print.c:520
msgid "27th"
msgstr "27th"
-#: ../calendar/gui/print.c:518
+#: ../calendar/gui/print.c:520
msgid "28th"
msgstr "28th"
-#: ../calendar/gui/print.c:518
+#: ../calendar/gui/print.c:520
msgid "29th"
msgstr "29th"
-#: ../calendar/gui/print.c:518
+#: ../calendar/gui/print.c:520
msgid "30th"
msgstr "30th"
-#: ../calendar/gui/print.c:519
+#: ../calendar/gui/print.c:521
msgid "31st"
msgstr "31st"
#. Translators: These are workday abbreviations, e.g. Su=Sunday and Th=thursday
-#: ../calendar/gui/print.c:594
+#: ../calendar/gui/print.c:596
msgid "Su"
msgstr "Su"
-#: ../calendar/gui/print.c:594
+#: ../calendar/gui/print.c:596
msgid "Mo"
msgstr "Mo"
-#: ../calendar/gui/print.c:594
+#: ../calendar/gui/print.c:596
msgid "Tu"
msgstr "Tu"
-#: ../calendar/gui/print.c:594
+#: ../calendar/gui/print.c:596
msgid "We"
msgstr "We"
-#: ../calendar/gui/print.c:595
+#: ../calendar/gui/print.c:597
msgid "Th"
msgstr "Th"
-#: ../calendar/gui/print.c:595
+#: ../calendar/gui/print.c:597
msgid "Fr"
msgstr "Fr"
-#: ../calendar/gui/print.c:595
+#: ../calendar/gui/print.c:597
msgid "Sa"
msgstr "Sa"
-#: ../calendar/gui/print.c:2283
+#: ../calendar/gui/print.c:2442
msgid "Appointment"
msgstr "Appointment"
-#: ../calendar/gui/print.c:2285
+#: ../calendar/gui/print.c:2444
msgid "Task"
msgstr "Task"
-#: ../calendar/gui/print.c:2307
+#: ../calendar/gui/print.c:2466
#, c-format
msgid "Summary: %s"
msgstr "Summary: %s"
-#: ../calendar/gui/print.c:2358
+#: ../calendar/gui/print.c:2488
+msgid "Attendees: "
+msgstr "Attendees: "
+
+#: ../calendar/gui/print.c:2528
#, c-format
msgid "Status: %s"
msgstr "Status: %s"
-#: ../calendar/gui/print.c:2375
+#: ../calendar/gui/print.c:2545
#, c-format
msgid "Priority: %s"
msgstr "Priority: %s"
-#: ../calendar/gui/print.c:2387
+#: ../calendar/gui/print.c:2557
#, c-format
msgid "Percent Complete: %i"
msgstr "Percent Complete: %i"
-#: ../calendar/gui/print.c:2399
+#: ../calendar/gui/print.c:2569
#, c-format
msgid "URL: %s"
msgstr "URL: %s"
-#: ../calendar/gui/print.c:2412
+#: ../calendar/gui/print.c:2582
#, c-format
msgid "Categories: %s"
msgstr "Categories: %s"
-#: ../calendar/gui/print.c:2423
+#: ../calendar/gui/print.c:2593
msgid "Contacts: "
msgstr "Contacts: "
#. TODO Allow the user to customize the title.
-#: ../calendar/gui/print.c:2524
+#: ../calendar/gui/print.c:2695
msgid "Upcoming Appointments"
msgstr "Upcoming Appointments"
-#: ../calendar/gui/tasks-component.c:442
+#: ../calendar/gui/tasks-component.c:455
msgid "_New Task List"
msgstr "_New Task List"
-#: ../calendar/gui/tasks-component.c:518
+#: ../calendar/gui/tasks-component.c:535
#, c-format
msgid "%d task"
msgid_plural "%d tasks"
msgstr[0] "%d task"
msgstr[1] "%d tasks"
-#: ../calendar/gui/tasks-component.c:567
+#: ../calendar/gui/tasks-component.c:584
msgid "Failed upgrading tasks."
msgstr "Failed upgrading tasks."
-#: ../calendar/gui/tasks-component.c:878
+#: ../calendar/gui/tasks-component.c:941
#, c-format
msgid "Unable to open the task list '%s' for creating events and meetings"
msgstr "Unable to open the task list '%s' for creating events and meetings"
-#: ../calendar/gui/tasks-component.c:891
+#: ../calendar/gui/tasks-component.c:954
msgid "There is no calendar available for creating tasks"
msgstr "There is no calendar available for creating tasks"
-#: ../calendar/gui/tasks-component.c:988
+#: ../calendar/gui/tasks-component.c:1065
msgid "Task Source Selector"
msgstr "Task Source Selector"
-#: ../calendar/gui/tasks-component.c:1244
+#: ../calendar/gui/tasks-component.c:1321
msgid "New task"
msgstr "New task"
-#: ../calendar/gui/tasks-component.c:1246
+#: ../calendar/gui/tasks-component.c:1323
msgid "Create a new task"
msgstr "Create a new task"
-#: ../calendar/gui/tasks-component.c:1252
+#: ../calendar/gui/tasks-component.c:1329
msgid "New assigned task"
msgstr "New assigned task"
-#: ../calendar/gui/tasks-component.c:1253
+#: ../calendar/gui/tasks-component.c:1330
msgid "Assigne_d Task"
msgstr "Assigne_d Task"
-#: ../calendar/gui/tasks-component.c:1254
+#: ../calendar/gui/tasks-component.c:1331
msgid "Create a new assigned task"
msgstr "Create a new assigned task"
-#: ../calendar/gui/tasks-component.c:1260
+#: ../calendar/gui/tasks-component.c:1337
msgid "New task list"
msgstr "New task list"
-#: ../calendar/gui/tasks-component.c:1261
+#: ../calendar/gui/tasks-component.c:1338
msgid "Tas_k list"
msgstr "Tas_k list"
-#: ../calendar/gui/tasks-component.c:1262
+#: ../calendar/gui/tasks-component.c:1339
msgid "Create a new task list"
msgstr "Create a new task list"
-#: ../calendar/gui/tasks-control.c:438
+#: ../calendar/gui/tasks-control.c:455
msgid ""
"This operation will permanently erase all tasks marked as completed. If you continue, you will not be able to recover these tasks.\n"
"\n"
@@ -8534,26 +8438,23 @@ msgstr ""
"\n"
"Really erase these tasks?"
-#: ../calendar/gui/tasks-control.c:441
+#: ../calendar/gui/tasks-control.c:458
+#: ../mail/em-folder-view.c:1131
msgid "Do not ask me again."
msgstr "Do not ask me again."
-#: ../calendar/gui/tasks-control.c:478
-#: ../calendar/gui/tasks-control.c:494
+#: ../calendar/gui/tasks-control.c:495
+#: ../calendar/gui/tasks-control.c:511
msgid "Print Tasks"
msgstr "Print Tasks"
-#. The first letter of each day of the week starting with Sunday
-#: ../calendar/gui/weekday-picker.c:319
-msgid "SMTWTFS"
-msgstr "SMTWTFS"
-
#: ../calendar/importers/icalendar-importer.c:79
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:1570
msgid "Opening calendar"
msgstr "Opening calendar"
@@ -10115,208 +10016,126 @@ msgstr "Pacific/Wallis"
msgid "Pacific/Yap"
msgstr "Pacific/Yap"
-#: ../composer/e-msg-composer-attachment-bar.c:105
-#, c-format
-msgid "%.0fK"
-msgstr "%.0fK"
+#: ../composer/e-composer-name-header.c:95
+msgid "Click here for the address book"
+msgstr "Click here for the address book"
-#: ../composer/e-msg-composer-attachment-bar.c:108
-#, c-format
-msgid "%.0fM"
-msgstr "%.0fM"
+#: ../composer/e-composer-post-header.c:117
+msgid "Posting destination"
+msgstr "Posting destination"
-#: ../composer/e-msg-composer-attachment-bar.c:111
-#, c-format
-msgid "%.0fG"
-msgstr "%.0fG"
+#: ../composer/e-composer-post-header.c:118
+msgid "Choose folders to post the message to."
+msgstr "Choose folders to post the message to."
-#: ../composer/e-msg-composer-attachment-bar.c:740
-#: ../widgets/misc/e-attachment-bar.c:1019
-msgid "Attachment Bar"
-msgstr "Attachment Bar"
+#: ../composer/e-composer-post-header.c:152
+msgid "Click here to select folders to post to"
+msgstr "Click here to select folders to post to"
-#: ../composer/e-msg-composer-attachment.c:187
-#: ../composer/e-msg-composer-attachment.c:203
-#: ../composer/e-msg-composer-attachment.c:297
-#: ../composer/e-msg-composer-attachment.c:313
-#: ../widgets/misc/e-attachment.c:241
-#: ../widgets/misc/e-attachment.c:256
-#: ../widgets/misc/e-attachment.c:439
-#: ../widgets/misc/e-attachment.c:456
-#, c-format
-msgid "Cannot attach file %s: %s"
-msgstr "Cannot attach file %s: %s"
+#. Now add the signature stuff.
+#: ../composer/e-msg-composer-hdrs.c:221
+msgid "Si_gnature:"
+msgstr "Si_gnature:"
-#: ../composer/e-msg-composer-attachment.c:195
-#: ../composer/e-msg-composer-attachment.c:305
-#: ../widgets/misc/e-attachment.c:249
-#: ../widgets/misc/e-attachment.c:448
-#, c-format
-msgid "Cannot attach file %s: not a regular file"
-msgstr "Cannot attach file %s: not a regular file"
+#: ../composer/e-msg-composer-hdrs.c:326
+msgid "Fr_om:"
+msgstr "Fr_om:"
-#: ../composer/e-msg-composer-attachment.glade.h:1
-#: ../widgets/misc/e-attachment.glade.h:1
-msgid "Attachment Properties"
-msgstr "Attachment Properties"
+#: ../composer/e-msg-composer-hdrs.c:332
+msgid "_Reply-To:"
+msgstr "_Reply-To:"
-#: ../composer/e-msg-composer-attachment.glade.h:3
-#: ../widgets/misc/e-attachment.glade.h:3
-msgid "File name:"
-msgstr "File name:"
+#: ../composer/e-msg-composer-hdrs.c:335
+msgid "_To:"
+msgstr "_To:"
-#: ../composer/e-msg-composer-attachment.glade.h:4
-#: ../widgets/misc/e-attachment.glade.h:4
-msgid "MIME type:"
-msgstr "MIME type:"
+#: ../composer/e-msg-composer-hdrs.c:337
+msgid "Enter the recipients of the message"
+msgstr "Enter the recipients of the message"
+
+#: ../composer/e-msg-composer-hdrs.c:340
+msgid "_Cc:"
+msgstr "_Cc:"
+
+#: ../composer/e-msg-composer-hdrs.c:342
+msgid "Enter the addresses that will receive a carbon copy of the message"
+msgstr "Enter the addresses that will receive a carbon copy of the message"
-#: ../composer/e-msg-composer.c:830
+#: ../composer/e-msg-composer-hdrs.c:346
+msgid "_Bcc:"
+msgstr "_Bcc:"
+
+#: ../composer/e-msg-composer-hdrs.c:348
+msgid "Enter the addresses that will receive a carbon copy of the message without appearing in the recipient list of the message"
+msgstr "Enter the addresses that will receive a carbon copy of the message without appearing in the recipient list of the message"
+
+#: ../composer/e-msg-composer-hdrs.c:353
+msgid "_Post To:"
+msgstr "_Post To:"
+
+#: ../composer/e-msg-composer-hdrs.c:356
+msgid "S_ubject:"
+msgstr "S_ubject:"
+
+#: ../composer/e-msg-composer-select-file.c:77
+msgid "A_ttach"
+msgstr "A_ttach"
+
+#: ../composer/e-msg-composer-select-file.c:198
+msgid "Insert Attachment"
+msgstr "Insert Attachment"
+
+#: ../composer/e-msg-composer.c:819
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:837
+#: ../composer/e-msg-composer.c:826
msgid "Cannot encrypt outgoing message: No encryption certificate set for this account"
msgstr "Cannot encrypt outgoing message: No encryption certificate set for this account"
-#: ../composer/e-msg-composer.c:1297
-#: ../composer/e-msg-composer.c:2559
+#: ../composer/e-msg-composer.c:1418
+#: ../composer/e-msg-composer.c:2516
msgid "Hide _Attachment Bar"
msgstr "Hide _Attachment Bar"
-#: ../composer/e-msg-composer.c:1300
-#: ../composer/e-msg-composer.c:2562
-#: ../composer/e-msg-composer.c:3931
+#: ../composer/e-msg-composer.c:1421
+#: ../composer/e-msg-composer.c:2519
+#: ../composer/e-msg-composer.c:3881
msgid "Show _Attachment Bar"
msgstr "Show _Attachment Bar"
-#: ../composer/e-msg-composer.c:1332
-#: ../composer/e-msg-composer.c:1366
-#: ../plugins/mail-remote/e-corba-utils.c:135
+#: ../composer/e-msg-composer.c:1453
+#: ../composer/e-msg-composer.c:1487
msgid "Unknown reason"
msgstr "Unknown reason"
-#: ../composer/e-msg-composer.c:1404
+#: ../composer/e-msg-composer.c:1525
msgid "Could not open file"
msgstr "Could not open file"
-#: ../composer/e-msg-composer.c:1412
+#: ../composer/e-msg-composer.c:1533
msgid "Unable to retrieve message from editor"
msgstr "Unable to retrieve message from editor"
-#: ../composer/e-msg-composer.c:1697
+#: ../composer/e-msg-composer.c:1820
msgid "Untitled Message"
msgstr "Untitled Message"
#. NB: This function is never used anymore
-#: ../composer/e-msg-composer.c:1732
+#: ../composer/e-msg-composer.c:1856
msgid "Open File"
msgstr "Open File"
-#: ../composer/e-msg-composer.c:2194
-#: ../mail/em-account-editor.c:606
-#: ../mail/em-account-editor.c:651
-#: ../mail/em-account-editor.c:718
-msgid "Autogenerated"
-msgstr "Autogenerated"
-
-#: ../composer/e-msg-composer.c:2297
-msgid "Si_gnature:"
-msgstr "Si_gnature:"
-
-#: ../composer/e-msg-composer.c:2573
-#: ../composer/e-msg-composer.c:3813
-#: ../composer/e-msg-composer.c:3816
+#: ../composer/e-msg-composer.c:2530
+#: ../composer/e-msg-composer.c:3761
+#: ../composer/e-msg-composer.c:3764
msgid "Compose Message"
msgstr "Compose Message"
-#: ../composer/e-msg-composer.c:5041
+#: ../composer/e-msg-composer.c:5034
msgid "<b>(The composer contains a non-text message body, which cannot be edited.)</b>"
msgstr "<b>(The composer contains a non-text message body, which cannot be edited.)</b>"
-#: ../composer/e-msg-composer-hdrs.c:570
-msgid "Posting destination"
-msgstr "Posting destination"
-
-#: ../composer/e-msg-composer-hdrs.c:571
-msgid "Choose folders to post the message to."
-msgstr "Choose folders to post the message to."
-
-#: ../composer/e-msg-composer-hdrs.c:602
-msgid "Click here for the address book"
-msgstr "Click here for the address book"
-
-#.
-#. * Reply-To:
-#. *
-#. * Create this before we call create_from_optionmenu,
-#. * because that causes from_changed to be called, which
-#. * expects the reply_to fields to be initialized.
-#.
-#: ../composer/e-msg-composer-hdrs.c:634
-msgid "_Reply-To:"
-msgstr "_Reply-To:"
-
-#.
-#. * From
-#.
-#: ../composer/e-msg-composer-hdrs.c:641
-msgid "Fr_om:"
-msgstr "Fr_om:"
-
-#.
-#. * Subject
-#.
-#: ../composer/e-msg-composer-hdrs.c:648
-msgid "S_ubject:"
-msgstr "S_ubject:"
-
-#: ../composer/e-msg-composer-hdrs.c:657
-msgid "_To:"
-msgstr "_To:"
-
-#: ../composer/e-msg-composer-hdrs.c:658
-msgid "Enter the recipients of the message"
-msgstr "Enter the recipients of the message"
-
-#: ../composer/e-msg-composer-hdrs.c:661
-msgid "_Cc:"
-msgstr "_Cc:"
-
-#: ../composer/e-msg-composer-hdrs.c:662
-msgid "Enter the addresses that will receive a carbon copy of the message"
-msgstr "Enter the addresses that will receive a carbon copy of the message"
-
-#: ../composer/e-msg-composer-hdrs.c:665
-msgid "_Bcc:"
-msgstr "_Bcc:"
-
-#: ../composer/e-msg-composer-hdrs.c:666
-msgid "Enter the addresses that will receive a carbon copy of the message without appearing in the recipient list of the message."
-msgstr "Enter the addresses that will receive a carbon copy of the message without appearing in the recipient list of the message."
-
-#.
-#. * Post-To
-#.
-#: ../composer/e-msg-composer-hdrs.c:673
-msgid "_Post To:"
-msgstr "_Post To:"
-
-#: ../composer/e-msg-composer-hdrs.c:678
-msgid "Click here to select folders to post to"
-msgstr "Click here to select folders to post to"
-
-#: ../composer/e-msg-composer-hdrs.c:683
-msgid "Post To:"
-msgstr "Post To:"
-
-#: ../composer/e-msg-composer-select-file.c:82
-msgid "A_ttach"
-msgstr "A_ttach"
-
-#: ../composer/e-msg-composer-select-file.c:243
-msgid "Insert Attachment"
-msgstr "Insert Attachment"
-
#: ../composer/mail-composer.error.xml.h:1
msgid " There are few attachments getting downloaded. Sending the mail will cause the mail to be sent without those pending attachments "
msgstr " There are a few attachments getting downloaded. Sending the mail will cause the mail to be sent without those pending attachments "
@@ -10434,6 +10253,7 @@ msgid "_Do not Recover"
msgstr "_Do not Recover"
#: ../composer/mail-composer.error.xml.h:31
+#: ../shell/main.c:312
msgid "_Recover"
msgstr "_Recover"
@@ -10442,19 +10262,17 @@ msgid "_Save Message"
msgstr "_Save Message"
#: ../data/evolution.desktop.in.in.h:1
-#: ../plugins/default-mailer/org-gnome-default-mailer.error.xml.h:2
-#: ../shell/main.c:508
-msgid "Evolution"
-msgstr "Evolution"
+msgid "Evolution Mail and Calendar"
+msgstr "Evolution Mail and Calendar"
#: ../data/evolution.desktop.in.in.h:2
-#: ../shell/e-shell-window-commands.c:584
+#: ../shell/e-shell-window-commands.c:672
msgid "Groupware Suite"
msgstr "Groupware Suite"
#: ../data/evolution.desktop.in.in.h:3
-msgid "The Evolution PIM and Email Client"
-msgstr "The Evolution PIM and Email Client"
+msgid "Manage your email, contacts and schedule"
+msgstr "Manage your email, contacts and schedule"
#: ../data/evolution.keys.in.in.h:1
msgid "address card"
@@ -10490,19 +10308,15 @@ msgstr "Evolution Query"
msgid "Internal error, unknown error '%s' requested"
msgstr "Internal error, unknown error '%s' requested"
-#: ../e-util/eggtrayicon.c:121
-msgid "The orientation of the tray."
-msgstr "The orientation of the tray."
-
-#: ../e-util/e-print.c:115
+#: ../e-util/e-print.c:138
msgid "An error occurred while printing"
msgstr "An error occurred whilst printing"
-#: ../e-util/e-print.c:122
+#: ../e-util/e-print.c:145
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:128
+#: ../e-util/e-print.c:151
msgid "The printing system did not report any additional details about the error."
msgstr "The printing system did not report any additional details about the error."
@@ -10527,10 +10341,54 @@ msgid "Overwrite file?"
msgstr "Overwrite file?"
#: ../e-util/e-system.error.xml.h:7
-#: ../mail/mail.error.xml.h:138
+#: ../mail/mail.error.xml.h:141
msgid "_Overwrite"
msgstr "_Overwrite"
+#: ../e-util/e-util-labels.c:45
+msgid "I_mportant"
+msgstr "I_mportant"
+
+#. red
+#: ../e-util/e-util-labels.c:46
+msgid "_Work"
+msgstr "_Work"
+
+#. orange
+#: ../e-util/e-util-labels.c:47
+msgid "_Personal"
+msgstr "_Personal"
+
+#. green
+#: ../e-util/e-util-labels.c:48
+msgid "_To Do"
+msgstr "_To Do"
+
+#. blue
+#: ../e-util/e-util-labels.c:49
+msgid "_Later"
+msgstr "_Later"
+
+#: ../e-util/e-util-labels.c:317
+msgid "Label _Name:"
+msgstr "Label _Name:"
+
+#: ../e-util/e-util-labels.c:339
+msgid "Edit Label"
+msgstr "Edit Label"
+
+#: ../e-util/e-util-labels.c:339
+msgid "Add Label"
+msgstr "Add Label"
+
+#: ../e-util/e-util-labels.c:357
+msgid "Label name cannot be empty."
+msgstr "Label name cannot be empty."
+
+#: ../e-util/e-util-labels.c:362
+msgid "Label with same tag already exists. Rename your label please."
+msgstr "Label with same tag already exists. Rename your label please."
+
#: ../filter/filter-datespec.c:80
#, c-format
msgid "1 second ago"
@@ -10644,10 +10502,74 @@ msgstr "now"
msgid "%d-%b-%Y"
msgstr "%d-%b-%Y"
-#: ../filter/filter-datespec.c:449
+#: ../filter/filter-datespec.c:451
msgid "Select a time to compare against"
msgstr "Select a time to compare against"
+#: ../filter/filter-file.c:288
+msgid "Choose a file"
+msgstr "Choose a file"
+
+#: ../filter/filter-part.c:533
+#: ../shell/test/GNOME_Evolution_Test.server.in.in.h:3
+msgid "Test"
+msgstr "Test"
+
+#: ../filter/filter-rule.c:800
+msgid "R_ule name:"
+msgstr "R_ule name:"
+
+#: ../filter/filter-rule.c:828
+msgid "Find items that meet the following criteria"
+msgstr "Find items that meet the following criteria"
+
+#: ../filter/filter-rule.c:862
+msgid "A_dd Filter Criteria"
+msgstr "A_dd Filter Criteria"
+
+#: ../filter/filter-rule.c:868
+msgid "If all criteria are met"
+msgstr "If all criteria are met"
+
+#: ../filter/filter-rule.c:868
+msgid "If any criteria are met"
+msgstr "If any criteria are met"
+
+#: ../filter/filter-rule.c:870
+msgid "_Find items:"
+msgstr "_Find items:"
+
+#: ../filter/filter-rule.c:892
+msgid "All related"
+msgstr "All related"
+
+#: ../filter/filter-rule.c:892
+msgid "Replies"
+msgstr "Replies"
+
+#: ../filter/filter-rule.c:892
+msgid "Replies and parents"
+msgstr "Replies and parents"
+
+#: ../filter/filter-rule.c:892
+msgid "No reply or parent"
+msgstr "No reply or parent"
+
+#: ../filter/filter-rule.c:894
+msgid "I_nclude threads"
+msgstr "I_nclude threads"
+
+#: ../filter/filter-rule.c:990
+#: ../filter/filter.glade.h:3
+#: ../mail/em-utils.c:309
+msgid "Incoming"
+msgstr "Incoming"
+
+#: ../filter/filter-rule.c:990
+#: ../mail/em-utils.c:310
+msgid "Outgoing"
+msgstr "Outgoing"
+
#: ../filter/filter.error.xml.h:1
msgid "Bad regular expression &quot;{0}&quot;."
msgstr "Bad regular expression &quot;{0}&quot;."
@@ -10669,7 +10591,7 @@ msgid "Missing file name."
msgstr "Missing file name."
#: ../filter/filter.error.xml.h:6
-#: ../mail/mail.error.xml.h:74
+#: ../mail/mail.error.xml.h:76
msgid "Missing name."
msgstr "Missing name."
@@ -10693,11 +10615,6 @@ msgstr "You must name this filter."
msgid "You must specify a file name."
msgstr "You must specify a file name."
-#: ../filter/filter-file.c:296
-#: ../filter/filter-file.c:302
-msgid "Choose a file"
-msgstr "Choose a file"
-
#: ../filter/filter.glade.h:1
msgid "<b>_Filter Rules</b>"
msgstr "<b>_Filter Rules</b>"
@@ -10706,12 +10623,6 @@ msgstr "<b>_Filter Rules</b>"
msgid "Compare against"
msgstr "Compare against"
-#: ../filter/filter.glade.h:3
-#: ../filter/filter-rule.c:988
-#: ../mail/em-utils.c:307
-msgid "Incoming"
-msgstr "Incoming"
-
#: ../filter/filter.glade.h:4
msgid "Show filters for mail:"
msgstr "Show filters for mail:"
@@ -10757,7 +10668,7 @@ msgid "months"
msgstr "months"
#: ../filter/filter.glade.h:19
-#: ../mail/mail-config.glade.h:180
+#: ../mail/mail-config.glade.h:182
msgid "seconds"
msgstr "seconds"
@@ -10769,92 +10680,93 @@ 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
+#: ../plugins/calendar-weather/calendar-weather.c:564
+#: ../plugins/google-account-setup/google-source.c:398
+msgid "weeks"
+msgstr "weeks"
+
#: ../filter/filter.glade.h:23
msgid "years"
msgstr "years"
-#: ../filter/filter-label.c:120
-#: ../mail/em-filter-i18n.h:26
-#: ../mail/em-migrate.c:1053
-#: ../mail/mail-config.glade.h:90
-msgid "Important"
-msgstr "Important"
-
-#. forest green
-#: ../filter/filter-label.c:123
-#: ../mail/em-migrate.c:1056
-#: ../mail/mail-config.glade.h:145
-msgid "To Do"
-msgstr "To Do"
+#: ../filter/rule-editor.c:380
+msgid "Add Rule"
+msgstr "Add Rule"
-#. blue
-#: ../filter/filter-label.c:124
-#: ../mail/em-migrate.c:1057
-#: ../mail/mail-config.glade.h:95
-msgid "Later"
-msgstr "Later"
+#: ../filter/rule-editor.c:459
+msgid "Edit Rule"
+msgstr "Edit Rule"
-#: ../filter/filter-part.c:532
-#: ../shell/GNOME_Evolution_Test.server.in.in.h:3
-msgid "Test"
-msgstr "Test"
+#: ../filter/rule-editor.c:747
+msgid "Rule name"
+msgstr "Rule name"
-#: ../filter/filter-rule.c:799
-msgid "_Search name:"
-msgstr "_Search name:"
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:1
+msgid "Composer Preferences"
+msgstr "Composer Preferences"
-#: ../filter/filter-rule.c:827
-msgid "Find items that meet the following criteria"
-msgstr "Find items that meet the following criteria"
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:2
+msgid "Configure mail preferences, including security and message display, here"
+msgstr "Configure mail preferences, including security and message display, here"
-#: ../filter/filter-rule.c:866
-msgid "If all criteria are met"
-msgstr "If all criteria are met"
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:3
+msgid "Configure spell-checking, signatures, and the message composer here"
+msgstr "Configure spell-checking, signatures, and the message composer here"
-#: ../filter/filter-rule.c:866
-msgid "If any criteria are met"
-msgstr "If any criteria are met"
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:4
+msgid "Configure your email accounts here"
+msgstr "Configure your email accounts here"
-#: ../filter/filter-rule.c:868
-msgid "_Find items:"
-msgstr "_Find items:"
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:5
+msgid "Evolution Mail"
+msgstr "Evolution Mail"
-#: ../filter/filter-rule.c:890
-msgid "All related"
-msgstr "All related"
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:6
+msgid "Evolution Mail accounts configuration control"
+msgstr "Evolution Mail accounts configuration control"
-#: ../filter/filter-rule.c:890
-msgid "Replies"
-msgstr "Replies"
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:7
+msgid "Evolution Mail component"
+msgstr "Evolution Mail component"
-#: ../filter/filter-rule.c:890
-msgid "Replies and parents"
-msgstr "Replies and parents"
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:8
+msgid "Evolution Mail composer"
+msgstr "Evolution Mail composer"
-#: ../filter/filter-rule.c:890
-msgid "No reply or parent"
-msgstr "No reply or parent"
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:9
+msgid "Evolution Mail composer configuration control"
+msgstr "Evolution Mail composer configuration control"
-#: ../filter/filter-rule.c:892
-msgid "I_nclude threads"
-msgstr "I_nclude threads"
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:10
+msgid "Evolution Mail preferences control"
+msgstr "Evolution Mail preferences control"
-#: ../filter/filter-rule.c:988
-#: ../mail/em-utils.c:308
-msgid "Outgoing"
-msgstr "Outgoing"
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:11
+#: ../mail/em-folder-view.c:611
+#: ../mail/importers/elm-importer.c:329
+#: ../mail/importers/pine-importer.c:382
+#: ../mail/mail-component.c:572
+#: ../mail/mail-component.c:573
+#: ../mail/mail-component.c:737
+#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:6
+msgid "Mail"
+msgstr "Mail"
-#: ../filter/rule-editor.c:378
-msgid "Add Rule"
-msgstr "Add Rule"
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:12
+#: ../mail/em-account-prefs.c:502
+msgid "Mail Accounts"
+msgstr "Mail Accounts"
-#: ../filter/rule-editor.c:454
-msgid "Edit Rule"
-msgstr "Edit Rule"
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:13
+#: ../mail/mail-config.glade.h:102
+msgid "Mail Preferences"
+msgstr "Mail Preferences"
-#: ../filter/rule-editor.c:732
-msgid "Rule name"
-msgstr "Rule name"
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:14
+msgid "_Mail"
+msgstr "_Mail"
#: ../mail/em-account-editor.c:403
#, c-format
@@ -10876,137 +10788,135 @@ msgstr ""
#: ../mail/em-account-editor.c:482
#: ../mail/em-filter-folder-element.c:237
-#: ../mail/em-vfolder-rule.c:510
+#: ../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:78
+msgid "Autogenerated"
+msgstr "Autogenerated"
+
#: ../mail/em-account-editor.c:778
msgid "Ask for each message"
msgstr "Ask for each message"
-#: ../mail/em-account-editor.c:1812
-#: ../mail/mail-config.glade.h:89
+#: ../mail/em-account-editor.c:1822
+#: ../mail/mail-config.glade.h:93
msgid "Identity"
msgstr "Identity"
-#: ../mail/em-account-editor.c:1861
-#: ../mail/mail-config.glade.h:117
+#: ../mail/em-account-editor.c:1871
+#: ../mail/mail-config.glade.h:120
msgid "Receiving Email"
msgstr "Receiving Email"
-#: ../mail/em-account-editor.c:2046
-msgid "Automatically check for _new mail every"
-msgstr "Automatically check for _new mail every"
+#: ../mail/em-account-editor.c:2053
+msgid "Check for _new messages every"
+msgstr "Check for _new messages every"
-#: ../mail/em-account-editor.c:2227
-#: ../mail/mail-config.glade.h:129
+#: ../mail/em-account-editor.c:2061
+msgid "minu_tes"
+msgstr "minu_tes"
+
+#: ../mail/em-account-editor.c:2235
+#: ../mail/mail-config.glade.h:131
msgid "Sending Email"
msgstr "Sending Email"
-#: ../mail/em-account-editor.c:2286
-#: ../mail/mail-config.glade.h:65
+#: ../mail/em-account-editor.c:2294
+#: ../mail/mail-config.glade.h:67
msgid "Defaults"
msgstr "Defaults"
#. Security settings
-#: ../mail/em-account-editor.c:2352
-#: ../mail/mail-config.glade.h:123
+#: ../mail/em-account-editor.c:2360
+#: ../mail/mail-config.glade.h:126
#: ../plugins/exchange-operations/exchange-account-setup.c:317
msgid "Security"
msgstr "Security"
#. Most sections for this is auto-generated fromt the camel config
-#: ../mail/em-account-editor.c:2389
-#: ../mail/em-account-editor.c:2480
+#: ../mail/em-account-editor.c:2397
+#: ../mail/em-account-editor.c:2488
msgid "Receiving Options"
msgstr "Receiving Options"
-#: ../mail/em-account-editor.c:2390
-#: ../mail/em-account-editor.c:2481
-msgid "Checking for New Mail"
-msgstr "Checking for New Mail"
+#: ../mail/em-account-editor.c:2398
+#: ../mail/em-account-editor.c:2489
+msgid "Checking for New Messages"
+msgstr "Checking for New Messages"
-#: ../mail/em-account-editor.c:2832
-#: ../mail/mail-config.glade.h:31
+#: ../mail/em-account-editor.c:2840
+#: ../mail/mail-config.glade.h:33
msgid "Account Editor"
msgstr "Account Editor"
-#: ../mail/em-account-editor.c:2832
-#: ../mail/mail-config.glade.h:79
+#: ../mail/em-account-editor.c:2840
+#: ../mail/mail-config.glade.h:83
msgid "Evolution Account Assistant"
msgstr "Evolution Account Assistant"
-#: ../mail/em-account-prefs.c:331
-#: ../mail/em-account-prefs.c:376
-#: ../mail/em-account-prefs.c:409
-msgid "Disable"
-msgstr "Disable"
-
-#: ../mail/em-account-prefs.c:331
-#: ../mail/em-account-prefs.c:376
-#: ../mail/em-account-prefs.c:411
-msgid "Enable"
-msgstr "Enable"
-
#. translators: default account indicator
-#: ../mail/em-account-prefs.c:466
+#: ../mail/em-account-prefs.c:436
msgid "[Default]"
msgstr "[Default]"
-#: ../mail/em-account-prefs.c:519
-#: ../mail/em-composer-prefs.c:945
-#: ../plugins/plugin-manager/plugin-manager.c:261
-#: ../plugins/publish-calendar/publish-calendar.c:493
+#: ../mail/em-account-prefs.c:489
+#: ../mail/em-composer-prefs.c:947
+#: ../plugins/plugin-manager/plugin-manager.c:323
+#: ../plugins/publish-calendar/publish-calendar.c:510
msgid "Enabled"
msgstr "Enabled"
-#: ../mail/em-account-prefs.c:525
+#: ../mail/em-account-prefs.c:495
msgid "Account name"
msgstr "Account name"
-#: ../mail/em-account-prefs.c:527
+#: ../mail/em-account-prefs.c:497
msgid "Protocol"
msgstr "Protocol"
-#: ../mail/em-account-prefs.c:532
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:12
-msgid "Mail Accounts"
-msgstr "Mail Accounts"
-
-#: ../mail/em-composer-prefs.c:310
-#: ../mail/em-composer-prefs.c:436
-#: ../mail/mail-config.c:1029
+#: ../mail/em-composer-prefs.c:304
+#: ../mail/em-composer-prefs.c:430
+#: ../mail/mail-config.c:1062
msgid "Unnamed"
msgstr "Unnamed"
-#: ../mail/em-composer-prefs.c:951
+#: ../mail/em-composer-prefs.c:953
msgid "Language(s)"
msgstr "Language(s)"
-#: ../mail/em-composer-prefs.c:994
+#: ../mail/em-composer-prefs.c:996
msgid "Add signature script"
msgstr "Add signature script"
-#: ../mail/em-composer-prefs.c:1014
+#: ../mail/em-composer-prefs.c:1016
msgid "Signature(s)"
msgstr "Signature(s)"
-#: ../mail/em-composer-utils.c:874
-#: ../mail/em-format-quote.c:389
+#: ../mail/em-composer-utils.c:897
+#: ../mail/em-format-quote.c:399
msgid "-------- Forwarded Message --------"
msgstr "-------- Forwarded Message --------"
-#: ../mail/em-composer-utils.c:1665
+#: ../mail/em-composer-utils.c:1702
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:1712
+#: ../mail/em-composer-utils.c:1749
msgid "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} ${TimeZone}, ${Sender} wrote:"
msgstr "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} ${TimeZone}, ${Sender} wrote:"
+#: ../mail/em-composer-utils.c:1890
+msgid "-----Original Message-----"
+msgstr "-----Original Message-----"
+
#: ../mail/em-filter-editor.c:155
msgid "_Filter Rules"
msgstr "_Filter Rules"
@@ -11029,27 +10939,39 @@ msgid "Attachments"
msgstr "Attachments"
#: ../mail/em-filter-i18n.h:6
+msgid "BCC"
+msgstr "BCC"
+
+#: ../mail/em-filter-i18n.h:7
msgid "Beep"
msgstr "Beep"
-#: ../mail/em-filter-i18n.h:7
+#: ../mail/em-filter-i18n.h:8
+msgid "CC"
+msgstr "CC"
+
+#: ../mail/em-filter-i18n.h:9
+msgid "Completed On"
+msgstr "Completed On"
+
+#: ../mail/em-filter-i18n.h:10
msgid "contains"
msgstr "contains"
-#: ../mail/em-filter-i18n.h:8
+#: ../mail/em-filter-i18n.h:11
msgid "Copy to Folder"
msgstr "Copy to Folder"
-#: ../mail/em-filter-i18n.h:9
+#: ../mail/em-filter-i18n.h:12
msgid "Date received"
msgstr "Date received"
-#: ../mail/em-filter-i18n.h:10
+#: ../mail/em-filter-i18n.h:13
msgid "Date sent"
msgstr "Date sent"
-#: ../mail/em-filter-i18n.h:11
-#: ../plugins/groupwise-features/share-folder.c:777
+#: ../mail/em-filter-i18n.h:14
+#: ../plugins/groupwise-features/share-folder.c:778
#: ../ui/evolution-addressbook.xml.h:15
#: ../ui/evolution-calendar.xml.h:5
#: ../ui/evolution-mail-message.xml.h:25
@@ -11058,283 +10980,306 @@ msgstr "Date sent"
msgid "Delete"
msgstr "Delete"
-#: ../mail/em-filter-i18n.h:12
+#: ../mail/em-filter-i18n.h:15
msgid "Deleted"
msgstr "Deleted"
-#: ../mail/em-filter-i18n.h:13
+#: ../mail/em-filter-i18n.h:16
msgid "does not contain"
msgstr "does not contain"
-#: ../mail/em-filter-i18n.h:14
+#: ../mail/em-filter-i18n.h:17
msgid "does not end with"
msgstr "does not end with"
-#: ../mail/em-filter-i18n.h:15
+#: ../mail/em-filter-i18n.h:18
msgid "does not exist"
msgstr "does not exist"
-#: ../mail/em-filter-i18n.h:16
+#: ../mail/em-filter-i18n.h:19
msgid "does not return"
msgstr "does not return"
-#: ../mail/em-filter-i18n.h:17
+#: ../mail/em-filter-i18n.h:20
msgid "does not sound like"
msgstr "does not sound like"
-#: ../mail/em-filter-i18n.h:18
+#: ../mail/em-filter-i18n.h:21
msgid "does not start with"
msgstr "does not start with"
-#: ../mail/em-filter-i18n.h:19
+#: ../mail/em-filter-i18n.h:22
msgid "Do Not Exist"
msgstr "Do Not Exist"
-#: ../mail/em-filter-i18n.h:20
+#: ../mail/em-filter-i18n.h:23
msgid "Draft"
msgstr "Draft"
-#: ../mail/em-filter-i18n.h:21
+#: ../mail/em-filter-i18n.h:24
msgid "ends with"
msgstr "ends with"
-#: ../mail/em-filter-i18n.h:22
+#: ../mail/em-filter-i18n.h:25
msgid "Exist"
msgstr "Exist"
-#: ../mail/em-filter-i18n.h:23
+#: ../mail/em-filter-i18n.h:26
msgid "exists"
msgstr "exists"
-#: ../mail/em-filter-i18n.h:24
+#: ../mail/em-filter-i18n.h:27
msgid "Expression"
msgstr "Expression"
-#: ../mail/em-filter-i18n.h:25
+#: ../mail/em-filter-i18n.h:28
msgid "Follow Up"
msgstr "Follow Up"
-#: ../mail/em-filter-i18n.h:27
+#: ../mail/em-filter-i18n.h:29
+#: ../mail/em-migrate.c:1054
+msgid "Important"
+msgstr "Important"
+
+#: ../mail/em-filter-i18n.h:30
msgid "is"
msgstr "is"
-#: ../mail/em-filter-i18n.h:28
+#: ../mail/em-filter-i18n.h:31
msgid "is after"
msgstr "is after"
-#: ../mail/em-filter-i18n.h:29
+#: ../mail/em-filter-i18n.h:32
msgid "is before"
msgstr "is before"
-#: ../mail/em-filter-i18n.h:30
+#: ../mail/em-filter-i18n.h:33
msgid "is Flagged"
msgstr "is Flagged"
-#: ../mail/em-filter-i18n.h:31
+#: ../mail/em-filter-i18n.h:34
msgid "is greater than"
msgstr "is greater than"
-#: ../mail/em-filter-i18n.h:32
+#: ../mail/em-filter-i18n.h:35
msgid "is less than"
msgstr "is less than"
-#: ../mail/em-filter-i18n.h:33
+#: ../mail/em-filter-i18n.h:36
msgid "is not"
msgstr "is not"
-#: ../mail/em-filter-i18n.h:34
+#: ../mail/em-filter-i18n.h:37
msgid "is not Flagged"
msgstr "is not Flagged"
-#: ../mail/em-filter-i18n.h:35
-#: ../mail/mail-config.glade.h:92
+#: ../mail/em-filter-i18n.h:38
+msgid "is not set"
+msgstr "is not set"
+
+#: ../mail/em-filter-i18n.h:39
+msgid "is set"
+msgstr "is set"
+
+#: ../mail/em-filter-i18n.h:40
+#: ../mail/mail-config.glade.h:96
#: ../ui/evolution-mail-message.xml.h:48
msgid "Junk"
msgstr "Junk"
-#: ../mail/em-filter-i18n.h:36
+#: ../mail/em-filter-i18n.h:41
msgid "Junk Test"
msgstr "Junk Test"
-#: ../mail/em-filter-i18n.h:37
+#: ../mail/em-filter-i18n.h:42
#: ../widgets/misc/e-expander.c:190
msgid "Label"
msgstr "Label"
-#: ../mail/em-filter-i18n.h:38
+#: ../mail/em-filter-i18n.h:43
msgid "Mailing list"
msgstr "Mailing list"
-#: ../mail/em-filter-i18n.h:39
+#: ../mail/em-filter-i18n.h:44
msgid "Match All"
msgstr "Match All"
-#: ../mail/em-filter-i18n.h:40
+#: ../mail/em-filter-i18n.h:45
msgid "Message Body"
msgstr "Message Body"
-#: ../mail/em-filter-i18n.h:41
+#: ../mail/em-filter-i18n.h:46
msgid "Message Header"
msgstr "Message Header"
-#: ../mail/em-filter-i18n.h:42
+#: ../mail/em-filter-i18n.h:47
msgid "Message is Junk"
msgstr "Message is Junk"
-#: ../mail/em-filter-i18n.h:43
+#: ../mail/em-filter-i18n.h:48
msgid "Message is not Junk"
msgstr "Message is not Junk"
-#: ../mail/em-filter-i18n.h:44
+#: ../mail/em-filter-i18n.h:49
msgid "Move to Folder"
msgstr "Move to Folder"
-#: ../mail/em-filter-i18n.h:45
+#: ../mail/em-filter-i18n.h:50
msgid "Pipe to Program"
msgstr "Pipe to Program"
-#: ../mail/em-filter-i18n.h:46
+#: ../mail/em-filter-i18n.h:51
msgid "Play Sound"
msgstr "Play Sound"
-#: ../mail/em-filter-i18n.h:47
-#: ../mail/message-tag-followup.c:81
+#. 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
msgid "Read"
msgstr "Read"
-#: ../mail/em-filter-i18n.h:48
-#: ../mail/message-list.etspec.h:11
+#: ../mail/em-filter-i18n.h:54
+#: ../mail/message-list.etspec.h:12
msgid "Recipients"
msgstr "Recipients"
-#: ../mail/em-filter-i18n.h:49
+#: ../mail/em-filter-i18n.h:55
msgid "Regex Match"
msgstr "Regex Match"
-#: ../mail/em-filter-i18n.h:50
+#: ../mail/em-filter-i18n.h:56
msgid "Replied to"
msgstr "Replied to"
-#: ../mail/em-filter-i18n.h:51
+#: ../mail/em-filter-i18n.h:57
msgid "returns"
msgstr "returns"
-#: ../mail/em-filter-i18n.h:52
+#: ../mail/em-filter-i18n.h:58
msgid "returns greater than"
msgstr "returns greater than"
-#: ../mail/em-filter-i18n.h:53
+#: ../mail/em-filter-i18n.h:59
msgid "returns less than"
msgstr "returns less than"
-#: ../mail/em-filter-i18n.h:54
+#: ../mail/em-filter-i18n.h:60
msgid "Run Program"
msgstr "Run Program"
-#: ../mail/em-filter-i18n.h:55
-#: ../mail/message-list.etspec.h:12
+#: ../mail/em-filter-i18n.h:61
+#: ../mail/message-list.etspec.h:13
msgid "Score"
msgstr "Score"
-#: ../mail/em-filter-i18n.h:56
-#: ../mail/message-list.etspec.h:13
+#: ../mail/em-filter-i18n.h:62
+#: ../mail/message-list.etspec.h:14
msgid "Sender"
msgstr "Sender"
-#: ../mail/em-filter-i18n.h:57
+#: ../mail/em-filter-i18n.h:63
+msgid "Set Label"
+msgstr "Set Label"
+
+#: ../mail/em-filter-i18n.h:64
msgid "Set Status"
msgstr "Set Status"
-#: ../mail/em-filter-i18n.h:58
+#: ../mail/em-filter-i18n.h:65
msgid "Size (kB)"
msgstr "Size (kB)"
-#: ../mail/em-filter-i18n.h:59
+#: ../mail/em-filter-i18n.h:66
msgid "sounds like"
msgstr "sounds like"
-#: ../mail/em-filter-i18n.h:60
+#: ../mail/em-filter-i18n.h:67
msgid "Source Account"
msgstr "Source Account"
-#: ../mail/em-filter-i18n.h:61
+#: ../mail/em-filter-i18n.h:68
msgid "Specific header"
msgstr "Specific header"
-#: ../mail/em-filter-i18n.h:62
+#: ../mail/em-filter-i18n.h:69
msgid "starts with"
msgstr "starts with"
-#: ../mail/em-filter-i18n.h:64
+#: ../mail/em-filter-i18n.h:71
msgid "Stop Processing"
msgstr "Stop Processing"
-#: ../mail/em-filter-i18n.h:65
-#: ../mail/em-format.c:852
-#: ../mail/em-format-html.c:1660
-#: ../mail/em-format-quote.c:313
-#: ../mail/em-mailer-prefs.c:94
-#: ../mail/message-list.etspec.h:17
-#: ../mail/message-tag-followup.c:336
-#: ../plugins/groupwise-features/properties.glade.h:6
+#: ../mail/em-filter-i18n.h:72
+#: ../mail/em-format-html.c:1702
+#: ../mail/em-format-quote.c:320
+#: ../mail/em-format.c:891
+#: ../mail/em-mailer-prefs.c:95
+#: ../mail/message-list.etspec.h:18
+#: ../mail/message-tag-followup.c:337
+#: ../plugins/groupwise-features/properties.glade.h:7
#: ../smime/lib/e-cert.c:1132
msgid "Subject"
msgstr "Subject"
-#: ../mail/em-filter-i18n.h:66
+#: ../mail/em-filter-i18n.h:73
msgid "Unset Status"
msgstr "Unset Status"
#. and now for the action area
-#: ../mail/em-filter-rule.c:488
-msgid "<b>Then</b>"
-msgstr "<b>Then</b>"
+#: ../mail/em-filter-rule.c:489
+msgid "Then"
+msgstr "Then"
-#: ../mail/em-folder-browser.c:169
+#: ../mail/em-filter-rule.c:517
+msgid "Add Ac_tion"
+msgstr "Add Ac_tion"
+
+#: ../mail/em-folder-browser.c:189
msgid "C_reate Search Folder From Search..."
msgstr "C_reate Search Folder From Search..."
-#: ../mail/em-folder-browser.c:191
+#: ../mail/em-folder-browser.c:214
msgid "All Messages"
msgstr "All Messages"
-#: ../mail/em-folder-browser.c:192
+#: ../mail/em-folder-browser.c:215
msgid "Unread Messages"
msgstr "Unread Messages"
-#: ../mail/em-folder-browser.c:194
+#: ../mail/em-folder-browser.c:217
msgid "No Label"
msgstr "No Label"
-#: ../mail/em-folder-browser.c:201
+#: ../mail/em-folder-browser.c:224
msgid "Read Messages"
msgstr "Read Messages"
-#: ../mail/em-folder-browser.c:202
+#: ../mail/em-folder-browser.c:225
msgid "Recent Messages"
msgstr "Recent Messages"
-#: ../mail/em-folder-browser.c:203
+#: ../mail/em-folder-browser.c:226
msgid "Last 5 Days' Messages"
msgstr "Last 5 Days' Messages"
-#: ../mail/em-folder-browser.c:204
+#: ../mail/em-folder-browser.c:227
msgid "Messages with Attachments"
msgstr "Messages with Attachments"
-#: ../mail/em-folder-browser.c:205
+#: ../mail/em-folder-browser.c:228
msgid "Important Messages"
msgstr "Important Messages"
-#: ../mail/em-folder-browser.c:206
+#: ../mail/em-folder-browser.c:229
msgid "Messages Not Junk"
msgstr "Messages Not Junk"
-#: ../mail/em-folder-browser.c:1029
+#: ../mail/em-folder-browser.c:1123
msgid "Account Search"
msgstr "Account Search"
-#: ../mail/em-folder-browser.c:1073
+#: ../mail/em-folder-browser.c:1176
msgid "All Account Search"
msgstr "All Account Search"
@@ -11354,22 +11299,64 @@ msgstr[0] "Total messages:"
msgstr[1] "Total messages:"
#: ../mail/em-folder-properties.c:323
-#: ../plugins/groupwise-features/properties.glade.h:2
+#: ../plugins/groupwise-features/properties.glade.h:4
msgid "Folder Properties"
msgstr "Folder Properties"
-#: ../mail/em-folder-selection-button.c:123
+#: ../mail/em-folder-selection-button.c:124
msgid "<click here to select a folder>"
msgstr "<click here to select a folder>"
-#: ../mail/em-folder-selector.c:261
-msgid "Create"
-msgstr "Create"
+#: ../mail/em-folder-selector.c:262
+msgid "C_reate"
+msgstr "C_reate"
-#: ../mail/em-folder-selector.c:265
+#: ../mail/em-folder-selector.c:266
msgid "Folder _name:"
msgstr "Folder _name:"
+#: ../mail/em-folder-tree-model.c:204
+#: ../mail/em-folder-tree-model.c:206
+#: ../mail/mail-vfolder.c:935
+#: ../mail/mail-vfolder.c:1020
+msgid "Search Folders"
+msgstr "Search Folders"
+
+#. UNMATCHED is always last
+#: ../mail/em-folder-tree-model.c:210
+#: ../mail/em-folder-tree-model.c:212
+msgid "UNMATCHED"
+msgstr "UNMATCHED"
+
+#: ../mail/em-folder-tree-model.c:494
+#: ../mail/mail-component.c:157
+msgid "Drafts"
+msgstr "Drafts"
+
+#. translators: standard local mailbox names
+#: ../mail/em-folder-tree-model.c:497
+#: ../mail/em-folder-tree.c:2552
+#: ../mail/mail-component.c:156
+#: ../plugins/exchange-operations/exchange-delegates-user.c:83
+#: ../plugins/exchange-operations/exchange-folder.c:593
+msgid "Inbox"
+msgstr "Inbox"
+
+#: ../mail/em-folder-tree-model.c:500
+#: ../mail/mail-component.c:158
+msgid "Outbox"
+msgstr "Outbox"
+
+#: ../mail/em-folder-tree-model.c:502
+#: ../mail/mail-component.c:159
+msgid "Sent"
+msgstr "Sent"
+
+#: ../mail/em-folder-tree-model.c:524
+#: ../mail/em-folder-tree-model.c:831
+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
@@ -11385,707 +11372,758 @@ msgstr "Folder _name:"
#. * Do not translate the "folder-display|" part. Remove it
#. * from your translation.
#.
-#: ../mail/em-folder-tree.c:368
+#: ../mail/em-folder-tree.c:372
#, c-format
msgid "folder-display|%s (%u)"
msgstr "%s (%u)"
-#: ../mail/em-folder-tree.c:720
+#: ../mail/em-folder-tree.c:732
msgid "Mail Folder Tree"
msgstr "Mail Folder Tree"
-#: ../mail/em-folder-tree.c:880
+#: ../mail/em-folder-tree.c:891
#, c-format
msgid "Moving folder %s"
msgstr "Moving folder %s"
-#: ../mail/em-folder-tree.c:882
+#: ../mail/em-folder-tree.c:893
#, c-format
msgid "Copying folder %s"
msgstr "Copying folder %s"
-#: ../mail/em-folder-tree.c:889
-#: ../mail/message-list.c:1827
+#: ../mail/em-folder-tree.c:900
+#: ../mail/message-list.c:1971
#, c-format
msgid "Moving messages into folder %s"
msgstr "Moving messages into folder %s"
-#: ../mail/em-folder-tree.c:891
-#: ../mail/message-list.c:1829
+#: ../mail/em-folder-tree.c:902
+#: ../mail/message-list.c:1973
#, c-format
msgid "Copying messages into folder %s"
msgstr "Copying messages into folder %s"
-#: ../mail/em-folder-tree.c:907
+#: ../mail/em-folder-tree.c:917
msgid "Cannot drop message(s) into toplevel store"
msgstr "Cannot drop message(s) into toplevel store"
-#: ../mail/em-folder-tree.c:1003
+#: ../mail/em-folder-tree.c:1011
#: ../ui/evolution-mail-message.xml.h:105
msgid "_Copy to Folder"
msgstr "_Copy to Folder"
-#: ../mail/em-folder-tree.c:1004
+#: ../mail/em-folder-tree.c:1012
#: ../ui/evolution-mail-message.xml.h:118
msgid "_Move to Folder"
msgstr "_Move to Folder"
-#: ../mail/em-folder-tree.c:1709
-#: ../mail/mail-ops.c:1060
+#: ../mail/em-folder-tree.c:1721
+#: ../mail/mail-ops.c:1055
#, c-format
msgid "Scanning folders in \"%s\""
msgstr "Scanning folders in \"%s\""
-#: ../mail/em-folder-tree.c:2108
+#: ../mail/em-folder-tree.c:2094
#: ../ui/evolution-addressbook.xml.h:64
#: ../ui/evolution-editor.xml.h:24
-#: ../ui/evolution-mail-global.xml.h:32
+#: ../ui/evolution-mail-global.xml.h:34
#: ../ui/evolution-mail-messagedisplay.xml.h:8
#: ../ui/evolution-message-composer.xml.h:63
#: ../ui/evolution-tasks.xml.h:30
-#: ../ui/evolution.xml.h:53
+#: ../ui/evolution.xml.h:54
msgid "_View"
msgstr "_View"
-#: ../mail/em-folder-tree.c:2109
+#: ../mail/em-folder-tree.c:2095
msgid "Open in _New Window"
msgstr "Open in _New Window"
-#: ../mail/em-folder-tree.c:2113
-msgid "_Copy..."
-msgstr "_Copy..."
-
-#: ../mail/em-folder-tree.c:2114
-msgid "_Move..."
-msgstr "_Move..."
-
#. FIXME: need to disable for nochildren folders
-#: ../mail/em-folder-tree.c:2118
+#: ../mail/em-folder-tree.c:2100
msgid "_New Folder..."
msgstr "_New Folder..."
-#: ../mail/em-folder-tree.c:2121
-#: ../ui/evolution-mail-list.xml.h:36
+#: ../mail/em-folder-tree.c:2103
+msgid "_Move..."
+msgstr "_Move..."
+
+#: ../mail/em-folder-tree.c:2110
+#: ../ui/evolution-mail-list.xml.h:39
msgid "_Rename..."
msgstr "_Rename..."
-#: ../mail/em-folder-tree.c:2122
+#: ../mail/em-folder-tree.c:2111
msgid "Re_fresh"
msgstr "Re_fresh"
-#: ../mail/em-folder-tree.c:2123
+#: ../mail/em-folder-tree.c:2112
msgid "Fl_ush Outbox"
msgstr "Fl_ush Outbox"
-#: ../mail/em-folder-tree.c:2129
-#: ../mail/mail.error.xml.h:135
+#: ../mail/em-folder-tree.c:2118
+#: ../mail/mail.error.xml.h:138
msgid "_Empty Trash"
msgstr "_Empty Wastebasket"
-#: ../mail/em-folder-tree-model.c:203
-#: ../mail/em-folder-tree-model.c:205
-#: ../mail/mail-vfolder.c:911
-#: ../mail/mail-vfolder.c:984
-msgid "Search Folders"
-msgstr "Search Folders"
-
-#. UNMATCHED is always last
-#: ../mail/em-folder-tree-model.c:209
-#: ../mail/em-folder-tree-model.c:211
-msgid "UNMATCHED"
-msgstr "UNMATCHED"
-
-#: ../mail/em-folder-tree-model.c:484
-#: ../mail/mail-component.c:152
-msgid "Drafts"
-msgstr "Drafts"
-
-#. translators: standard local mailbox names
-#: ../mail/em-folder-tree-model.c:487
-#: ../mail/mail-component.c:151
-#: ../plugins/exchange-operations/exchange-folder.c:593
-msgid "Inbox"
-msgstr "Inbox"
-
-#: ../mail/em-folder-tree-model.c:490
-#: ../mail/mail-component.c:153
-msgid "Outbox"
-msgstr "Outbox"
-
-#: ../mail/em-folder-tree-model.c:492
-#: ../mail/mail-component.c:154
-msgid "Sent"
-msgstr "Sent"
-
-#: ../mail/em-folder-tree-model.c:514
-#: ../mail/em-folder-tree-model.c:818
-msgid "Loading..."
-msgstr "Loading..."
-
-#: ../mail/em-folder-utils.c:104
+#: ../mail/em-folder-utils.c:103
#, c-format
msgid "Copying `%s' to `%s'"
msgstr "Copying `%s' to `%s'"
-#: ../mail/em-folder-utils.c:368
-#: ../mail/em-folder-view.c:1032
-#: ../mail/em-folder-view.c:1047
+#: ../mail/em-folder-utils.c:366
+#: ../mail/em-folder-view.c:1191
+#: ../mail/em-folder-view.c:1206
#: ../mail/importers/evolution-mbox-importer.c:86
-#: ../mail/importers/evolution-outlook-importer.c:139
msgid "Select folder"
msgstr "Select folder"
-#: ../mail/em-folder-utils.c:368
-#: ../mail/em-folder-view.c:1047
+#: ../mail/em-folder-utils.c:366
+#: ../mail/em-folder-view.c:1206
msgid "C_opy"
msgstr "C_opy"
-#: ../mail/em-folder-utils.c:581
-#: ../plugins/groupwise-features/share-folder-common.c:145
+#: ../mail/em-folder-utils.c:587
+#: ../plugins/groupwise-features/share-folder-common.c:143
#, c-format
msgid "Creating folder `%s'"
msgstr "Creating folder `%s'"
-#: ../mail/em-folder-utils.c:730
+#: ../mail/em-folder-utils.c:745
#: ../plugins/groupwise-features/install-shared.c:164
-#: ../plugins/groupwise-features/share-folder-common.c:388
+#: ../plugins/groupwise-features/share-folder-common.c:385
msgid "Create folder"
msgstr "Create folder"
-#: ../mail/em-folder-utils.c:730
+#: ../mail/em-folder-utils.c:745
#: ../plugins/groupwise-features/install-shared.c:164
-#: ../plugins/groupwise-features/share-folder-common.c:388
+#: ../plugins/groupwise-features/share-folder-common.c:385
msgid "Specify where to create the folder:"
msgstr "Specify where to create the folder:"
-#: ../mail/em-folder-view.c:525
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:11
-#: ../mail/importers/elm-importer.c:341
-#: ../mail/importers/netscape-importer.c:1903
-#: ../mail/importers/pine-importer.c:387
-#: ../mail/mail-component.c:582
-#: ../mail/mail-component.c:583
-#: ../mail/mail-component.c:738
-#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:6
-msgid "Mail"
-msgstr "Mail"
-
-#: ../mail/em-folder-view.c:968
-#: ../mail/mail.error.xml.h:67
+#: ../mail/em-folder-view.c:1095
+#: ../mail/mail.error.xml.h:70
msgid "Mail Deletion Failed"
msgstr "Mail Deletion Failed"
-#: ../mail/em-folder-view.c:969
-#: ../mail/mail.error.xml.h:122
+#: ../mail/em-folder-view.c:1096
+#: ../mail/mail.error.xml.h:126
msgid "You do not have sufficient permissions to delete this mail."
msgstr "You do not have sufficient permission to delete this mail."
-#: ../mail/em-folder-view.c:1140
-#: ../ui/evolution-mail-message.xml.h:127
+#: ../mail/em-folder-view.c:1334
+#: ../ui/evolution-mail-message.xml.h:128
msgid "_Reply to Sender"
msgstr "_Reply to Sender"
-#: ../mail/em-folder-view.c:1142
-#: ../mail/em-popup.c:566
-#: ../mail/em-popup.c:577
+#: ../mail/em-folder-view.c:1336
+#: ../mail/em-popup.c:578
+#: ../mail/em-popup.c:589
#: ../ui/evolution-mail-message.xml.h:110
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:1146
+#: ../mail/em-folder-view.c:1340
#: ../ui/evolution-mail-message.xml.h:107
msgid "_Edit as New Message..."
msgstr "_Edit as New Message..."
-#: ../mail/em-folder-view.c:1152
+#: ../mail/em-folder-view.c:1342
+#: ../plugins/print-message/org-gnome-print-message.xml.h:3
+#: ../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-tasks.xml.h:29
+msgid "_Print..."
+msgstr "_Print..."
+
+#: ../mail/em-folder-view.c:1346
msgid "U_ndelete"
msgstr "U_ndelete"
-#: ../mail/em-folder-view.c:1153
+#: ../mail/em-folder-view.c:1347
msgid "_Move to Folder..."
msgstr "_Move to Folder..."
-#: ../mail/em-folder-view.c:1154
+#: ../mail/em-folder-view.c:1348
msgid "_Copy to Folder..."
msgstr "_Copy to Folder..."
-#: ../mail/em-folder-view.c:1157
+#: ../mail/em-folder-view.c:1351
msgid "Mar_k as Read"
msgstr "Mar_k as Read"
-#: ../mail/em-folder-view.c:1158
+#: ../mail/em-folder-view.c:1352
msgid "Mark as _Unread"
msgstr "Mark as _Unread"
-#: ../mail/em-folder-view.c:1159
+#: ../mail/em-folder-view.c:1353
msgid "Mark as _Important"
msgstr "Mark as _Important"
-#: ../mail/em-folder-view.c:1160
+#: ../mail/em-folder-view.c:1354
msgid "Mark as Un_important"
msgstr "Mark as Un_important"
-#: ../mail/em-folder-view.c:1161
+#: ../mail/em-folder-view.c:1355
msgid "Mark as _Junk"
msgstr "Mark as _Junk"
-#: ../mail/em-folder-view.c:1162
+#: ../mail/em-folder-view.c:1356
msgid "Mark as _Not Junk"
msgstr "Mark as _Not Junk"
-#: ../mail/em-folder-view.c:1163
+#: ../mail/em-folder-view.c:1357
msgid "Mark for Follo_w Up..."
msgstr "Mark for Follo_w Up..."
-#: ../mail/em-folder-view.c:1165
+#: ../mail/em-folder-view.c:1359
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:1166
-#: ../widgets/misc/e-dateedit.c:473
+#: ../mail/em-folder-view.c:1360
+#: ../widgets/misc/e-dateedit.c:498
msgid "_None"
msgstr "_None"
-#: ../mail/em-folder-view.c:1171
+#: ../mail/em-folder-view.c:1363
+msgid "_New Label"
+msgstr "_New Label"
+
+#: ../mail/em-folder-view.c:1367
msgid "Fla_g Completed"
msgstr "Fla_g Completed"
-#: ../mail/em-folder-view.c:1172
+#: ../mail/em-folder-view.c:1368
msgid "Cl_ear Flag"
msgstr "Cl_ear Flag"
-#: ../mail/em-folder-view.c:1175
+#: ../mail/em-folder-view.c:1371
msgid "Crea_te Rule From Message"
msgstr "Crea_te Rule From Message"
-#: ../mail/em-folder-view.c:1176
-msgid "Search Folder from _Subject"
-msgstr "Search Folder from _Subject"
+#. 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:1373
+msgid "Search Folder based on _Subject"
+msgstr "Search Folder based on _Subject"
-#: ../mail/em-folder-view.c:1177
-msgid "Search Folder from Se_nder"
-msgstr "Search Folder from Se_nder"
+#: ../mail/em-folder-view.c:1374
+msgid "Search Folder based on Se_nder"
+msgstr "Search Folder based on Se_nder"
-#: ../mail/em-folder-view.c:1178
-msgid "Search Folder from _Recipients"
-msgstr "Search Folder from _Recipients"
+#: ../mail/em-folder-view.c:1375
+msgid "Search Folder based on _Recipients"
+msgstr "Search Folder based on _Recipients"
-#: ../mail/em-folder-view.c:1179
-msgid "Search Folder from Mailing _List"
-msgstr "Search Folder from Mailing _List"
+#: ../mail/em-folder-view.c:1376
+msgid "Search Folder based on Mailing _List"
+msgstr "Search Folder based on Mailing _List"
-#: ../mail/em-folder-view.c:1183
-msgid "Filter on Sub_ject"
-msgstr "Filter on Sub_ject"
+#. 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:1381
+msgid "Filter based on Sub_ject"
+msgstr "Filter based on Sub_ject"
-#: ../mail/em-folder-view.c:1184
-msgid "Filter on Sen_der"
-msgstr "Filter on Sen_der"
+#: ../mail/em-folder-view.c:1382
+msgid "Filter based on Sen_der"
+msgstr "Filter based on Sen_der"
-#: ../mail/em-folder-view.c:1185
-msgid "Filter on Re_cipients"
-msgstr "Filter on Re_cipients"
+#: ../mail/em-folder-view.c:1383
+msgid "Filter based on Re_cipients"
+msgstr "Filter based on Re_cipients"
-#: ../mail/em-folder-view.c:1186
-msgid "Filter on _Mailing List"
-msgstr "Filter on _Mailing List"
+#: ../mail/em-folder-view.c:1384
+msgid "Filter based on _Mailing List"
+msgstr "Filter based on _Mailing List"
#. default charset used in mail view
-#: ../mail/em-folder-view.c:2055
-#: ../mail/em-folder-view.c:2099
+#: ../mail/em-folder-view.c:2266
+#: ../mail/em-folder-view.c:2310
msgid "Default"
msgstr "Default"
-#: ../mail/em-folder-view.c:2312
+#: ../mail/em-folder-view.c:2528
msgid "Unable to retrieve message"
msgstr "Unable to retrieve message"
-#: ../mail/em-folder-view.c:2333
-msgid "<b>Retrieving Message...</b>"
-msgstr "<b>Retrieving Message...</b>"
+#: ../mail/em-folder-view.c:2547
+msgid "Retrieving Message..."
+msgstr "Retrieving Message..."
-#: ../mail/em-folder-view.c:2372
-msgid "Retrieving Message"
-msgstr "Retrieving Message"
+#: ../mail/em-folder-view.c:2806
+msgid "C_all To..."
+msgstr "C_all To..."
-#: ../mail/em-folder-view.c:2550
+#: ../mail/em-folder-view.c:2809
msgid "Create _Search Folder"
msgstr "Create _Search Folder"
-#: ../mail/em-folder-view.c:2551
+#: ../mail/em-folder-view.c:2810
msgid "_From this Address"
msgstr "_From this Address"
-#: ../mail/em-folder-view.c:2552
+#: ../mail/em-folder-view.c:2811
msgid "_To this Address"
msgstr "_To this Address"
-#: ../mail/em-folder-view.c:2909
+#: ../mail/em-folder-view.c:3308
#, c-format
msgid "Click to mail %s"
msgstr "Click to mail %s"
-#: ../mail/em-folder-view.c:2914
-msgid "Click to hide/unhide addresses"
-msgstr "Click to hide/unhide addresses"
-
-#: ../mail/em-format.c:847
-#: ../mail/em-format-html.c:1489
-#: ../mail/em-format-quote.c:200
-#: ../mail/em-mailer-prefs.c:89
-#: ../mail/message-list.etspec.h:7
-#: ../mail/message-tag-followup.c:332
-msgid "From"
-msgstr "From"
-
-#: ../mail/em-format.c:848
-#: ../mail/em-format-html.c:1489
-#: ../mail/em-format-quote.c:200
-#: ../mail/em-mailer-prefs.c:90
-msgid "Reply-To"
-msgstr "Reply-To"
-
-#: ../mail/em-format.c:850
-#: ../mail/em-format-html.c:1489
-#: ../mail/em-format-quote.c:200
-#: ../mail/em-mailer-prefs.c:92
-msgid "Cc"
-msgstr "Cc"
-
-#: ../mail/em-format.c:851
-#: ../mail/em-format-html.c:1489
-#: ../mail/em-format-quote.c:200
-#: ../mail/em-mailer-prefs.c:93
-msgid "Bcc"
-msgstr "Bcc"
-
-#: ../mail/em-format.c:853
-#: ../mail/em-format-html.c:1704
-#: ../mail/em-format-quote.c:329
-#: ../mail/em-mailer-prefs.c:95
-#: ../mail/message-list.etspec.h:2
-#: ../widgets/misc/e-dateedit.c:341
-#: ../widgets/misc/e-dateedit.c:363
-msgid "Date"
-msgstr "Date"
-
-#: ../mail/em-format.c:854
-#: ../mail/em-format-html.c:1727
-#: ../mail/em-mailer-prefs.c:96
-msgid "Newsgroups"
-msgstr "Newsgroups"
-
-#: ../mail/em-format.c:1118
-#, c-format
-msgid "%s attachment"
-msgstr "%s attachment"
-
-#: ../mail/em-format.c:1157
-#: ../mail/em-format.c:1308
-#: ../mail/em-format.c:1610
-msgid "Could not parse S/MIME message: Unknown error"
-msgstr "Could not parse S/MIME message: Unknown error"
-
-#: ../mail/em-format.c:1290
-#: ../mail/em-format.c:1446
-msgid "Could not parse MIME message. Displaying as source."
-msgstr "Could not parse MIME message. Displaying as source."
-
-#: ../mail/em-format.c:1298
-msgid "Unsupported encryption type for multipart/encrypted"
-msgstr "Unsupported encryption type for multipart/encrypted"
-
-#: ../mail/em-format.c:1465
-msgid "Unsupported signature format"
-msgstr "Unsupported signature format"
-
-#: ../mail/em-format.c:1473
-#: ../mail/em-format.c:1539
-msgid "Error verifying signature"
-msgstr "Error verifying signature"
-
-#: ../mail/em-format.c:1473
-#: ../mail/em-format.c:1539
-msgid "Unknown error verifying signature"
-msgstr "Unknown error verifying signature"
-
-#: ../mail/em-format-html.c:483
-#: ../mail/em-format-html.c:485
-#, c-format
-msgid "Retrieving `%s'"
-msgstr "Retrieving `%s'"
-
-#: ../mail/em-format-html.c:618
-#: ../mail/em-format-html-display.c:937
-msgid "Unsigned"
-msgstr "Unsigned"
-
-#: ../mail/em-format-html.c:619
-#: ../mail/em-format-html-display.c:938
-msgid "Valid signature"
-msgstr "Valid signature"
-
-#: ../mail/em-format-html.c:620
-#: ../mail/em-format-html-display.c:939
-msgid "Invalid signature"
-msgstr "Invalid signature"
-
-#: ../mail/em-format-html.c:621
-msgid "Valid signature but cannot verify sender"
-msgstr "Valid signature but cannot verify sender"
-
-#: ../mail/em-format-html.c:627
-#: ../mail/em-format-html-display.c:946
-msgid "Unencrypted"
-msgstr "Unencrypted"
-
-#: ../mail/em-format-html.c:628
-#: ../mail/em-format-html-display.c:947
-msgid "Encrypted, weak"
-msgstr "Encrypted, weak"
-
-#: ../mail/em-format-html.c:629
-#: ../mail/em-format-html-display.c:948
-msgid "Encrypted"
-msgstr "Encrypted"
-
-#: ../mail/em-format-html.c:630
-#: ../mail/em-format-html-display.c:949
-msgid "Encrypted, strong"
-msgstr "Encrypted, strong"
-
-#: ../mail/em-format-html.c:892
-msgid "Malformed external-body part."
-msgstr "Malformed external-body part."
-
-#: ../mail/em-format-html.c:922
-#, c-format
-msgid "Pointer to FTP site (%s)"
-msgstr "Pointer to FTP site (%s)"
-
-#: ../mail/em-format-html.c:933
+#: ../mail/em-folder-view.c:3320
#, 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:935
-#, c-format
-msgid "Pointer to local file (%s)"
-msgstr "Pointer to local file (%s)"
+msgid "Click to call %s"
+msgstr "Click to call %s"
-#: ../mail/em-format-html.c:956
-#, c-format
-msgid "Pointer to remote data (%s)"
-msgstr "Pointer to remote data (%s)"
-
-#: ../mail/em-format-html.c:967
-#, c-format
-msgid "Pointer to unknown external data (\"%s\" type)"
-msgstr "Pointer to unknown external data (\"%s\" type)"
-
-#: ../mail/em-format-html.c:1194
-msgid "Formatting message"
-msgstr "Formatting message"
-
-#. pseudo-header
-#: ../mail/em-format-html.c:1664
-#: ../mail/em-format-quote.c:322
-#: ../mail/em-mailer-prefs.c:1174
-msgid "Mailer"
-msgstr "Mailer"
-
-#. translators: strftime format for local time equivalent in Date header display, with day
-#: ../mail/em-format-html.c:1691
-msgid "<I> (%a, %R %Z)</I>"
-msgstr "<I> (%a, %R %Z)</I>"
-
-#. translators: strftime format for local time equivalent in Date header display, without day
-#: ../mail/em-format-html.c:1694
-msgid "<I> (%R %Z)</I>"
-msgstr "<I> (%R %Z)</I>"
+#: ../mail/em-folder-view.c:3325
+msgid "Click to hide/unhide addresses"
+msgstr "Click to hide/unhide addresses"
#. message-search popup match count string
-#: ../mail/em-format-html-display.c:514
+#: ../mail/em-format-html-display.c:515
#, c-format
msgid "Matches: %d"
msgstr "Matches: %d"
-#: ../mail/em-format-html-display.c:657
-msgid "Fi_nd:"
-msgstr "Fi_nd:"
+#: ../mail/em-format-html-display.c:659
+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:681
+#: ../mail/em-format-html-display.c:683
msgid "_Previous"
msgstr "_Previous"
-#: ../mail/em-format-html-display.c:686
+#: ../mail/em-format-html-display.c:688
msgid "_Next"
msgstr "_Next"
-#: ../mail/em-format-html-display.c:691
+#: ../mail/em-format-html-display.c:693
msgid "M_atch case"
msgstr "M_atch case"
-#: ../mail/em-format-html-display.c:937
+#: ../mail/em-format-html-display.c:992
+#: ../mail/em-format-html.c:641
+msgid "Unsigned"
+msgstr "Unsigned"
+
+#: ../mail/em-format-html-display.c:992
msgid "This message is not signed. There is no guarantee that this message is authentic."
msgstr "This message is not signed. There is no guarantee that this message is authentic."
-#: ../mail/em-format-html-display.c:938
+#: ../mail/em-format-html-display.c:993
+#: ../mail/em-format-html.c:642
+msgid "Valid signature"
+msgstr "Valid signature"
+
+#: ../mail/em-format-html-display.c:993
msgid "This message is signed and is valid meaning that it is very likely that this message is authentic."
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:939
+#: ../mail/em-format-html-display.c:994
+#: ../mail/em-format-html.c:643
+msgid "Invalid signature"
+msgstr "Invalid signature"
+
+#: ../mail/em-format-html-display.c:994
msgid "The signature of this message cannot be verified, it may have been altered in transit."
msgstr "The signature of this message cannot be verified, it may have been altered in transit."
-#: ../mail/em-format-html-display.c:940
-msgid "Valid signature, cannot verify sender"
-msgstr "Valid signature, cannot verify sender"
+#: ../mail/em-format-html-display.c:995
+#: ../mail/em-format-html.c:644
+msgid "Valid signature, but cannot verify sender"
+msgstr "Valid signature, but cannot verify sender"
-#: ../mail/em-format-html-display.c:940
+#: ../mail/em-format-html-display.c:995
msgid "This message is signed with a valid signature, but the sender of the message cannot be verified."
msgstr "This message is signed with a valid signature, but the sender of the message cannot be verified."
-#: ../mail/em-format-html-display.c:946
+#: ../mail/em-format-html-display.c:996
+#: ../mail/em-format-html.c:645
+msgid "Signature exists, but need public key"
+msgstr "Signature exists, but need public key"
+
+#: ../mail/em-format-html-display.c:996
+msgid "This message is signed with a signature, but there is no corresponding public key."
+msgstr "This message is signed with a signature, but there is no corresponding public key."
+
+#: ../mail/em-format-html-display.c:1003
+#: ../mail/em-format-html.c:651
+msgid "Unencrypted"
+msgstr "Unencrypted"
+
+#: ../mail/em-format-html-display.c:1003
msgid "This message is not encrypted. Its content may be viewed in transit across the Internet."
msgstr "This message is not encrypted. Its content may be viewed in transit across the Internet."
-#: ../mail/em-format-html-display.c:947
+#: ../mail/em-format-html-display.c:1004
+#: ../mail/em-format-html.c:652
+msgid "Encrypted, weak"
+msgstr "Encrypted, weak"
+
+#: ../mail/em-format-html-display.c:1004
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 message in a practical amount of time."
msgstr "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 message in a practical amount of time."
-#: ../mail/em-format-html-display.c:948
+#: ../mail/em-format-html-display.c:1005
+#: ../mail/em-format-html.c:653
+msgid "Encrypted"
+msgstr "Encrypted"
+
+#: ../mail/em-format-html-display.c:1005
msgid "This message is encrypted. It would be difficult for an outsider to view the content of this message."
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:949
+#: ../mail/em-format-html-display.c:1006
+#: ../mail/em-format-html.c:654
+msgid "Encrypted, strong"
+msgstr "Encrypted, strong"
+
+#: ../mail/em-format-html-display.c:1006
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 practical amount of time."
msgstr "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 practical amount of time."
-#: ../mail/em-format-html-display.c:1050
+#: ../mail/em-format-html-display.c:1107
#: ../smime/gui/smime-ui.glade.h:48
msgid "_View Certificate"
msgstr "_View Certificate"
-#: ../mail/em-format-html-display.c:1065
+#: ../mail/em-format-html-display.c:1122
msgid "This certificate is not viewable"
msgstr "This certificate is not viewable"
-#: ../mail/em-format-html-display.c:1384
+#: ../mail/em-format-html-display.c:1441
msgid "Completed on %B %d, %Y, %l:%M %p"
msgstr "Completed on %d %B, %Y, %l:%M %p"
-#: ../mail/em-format-html-display.c:1392
+#: ../mail/em-format-html-display.c:1449
msgid "Overdue:"
msgstr "Overdue:"
-#: ../mail/em-format-html-display.c:1395
+#: ../mail/em-format-html-display.c:1452
msgid "by %B %d, %Y, %l:%M %p"
msgstr "by %d %B, %Y, %l:%M %p"
-#: ../mail/em-format-html-display.c:1455
+#: ../mail/em-format-html-display.c:1512
msgid "_View Inline"
msgstr "_View Inline"
-#: ../mail/em-format-html-display.c:1456
+#: ../mail/em-format-html-display.c:1513
msgid "_Hide"
msgstr "_Hide"
-#: ../mail/em-format-html-display.c:1457
+#: ../mail/em-format-html-display.c:1514
msgid "_Fit to Width"
msgstr "_Fit to Width"
-#: ../mail/em-format-html-display.c:1458
+#: ../mail/em-format-html-display.c:1515
msgid "Show _Original Size"
msgstr "Show _Original Size"
-#: ../mail/em-format-html-display.c:1899
-#: ../mail/em-format-html-display.c:2510
-#: ../mail/mail-config.glade.h:42
+#: ../mail/em-format-html-display.c:1959
+#: ../mail/em-format-html-display.c:2572
+#: ../mail/mail-config.glade.h:45
#: ../mail/message-list.etspec.h:1
msgid "Attachment"
msgstr "Attachment"
-#: ../mail/em-format-html-display.c:2113
+#: ../mail/em-format-html-display.c:2173
msgid "Save attachment as"
msgstr "Save attachment as"
-#: ../mail/em-format-html-display.c:2117
+#: ../mail/em-format-html-display.c:2177
msgid "Select folder to save all attachments"
msgstr "Select folder to save all attachments"
-#: ../mail/em-format-html-display.c:2168
+#: ../mail/em-format-html-display.c:2228
msgid "_Save Selected..."
msgstr "_Save Selected..."
#. Cant i put in the number of attachments here ?
-#: ../mail/em-format-html-display.c:2235
+#: ../mail/em-format-html-display.c:2295
#, 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:2242
-#: ../mail/em-format-html-display.c:2320
+#: ../mail/em-format-html-display.c:2302
+#: ../mail/em-format-html-display.c:2380
msgid "S_ave"
msgstr "S_ave"
-#: ../mail/em-format-html-display.c:2253
+#: ../mail/em-format-html-display.c:2313
msgid "S_ave All"
msgstr "S_ave All"
-#: ../mail/em-format-html-display.c:2316
+#: ../mail/em-format-html-display.c:2376
msgid "No Attachment"
msgstr "No Attachment"
-#: ../mail/em-format-html-display.c:2447
-#: ../mail/em-format-html-display.c:2483
+#: ../mail/em-format-html-display.c:2507
+#: ../mail/em-format-html-display.c:2545
msgid "View _Unformatted"
msgstr "View _Unformatted"
-#: ../mail/em-format-html-display.c:2449
+#: ../mail/em-format-html-display.c:2509
msgid "Hide _Unformatted"
msgstr "Hide _Unformatted"
-#: ../mail/em-format-html-display.c:2502
+#: ../mail/em-format-html-display.c:2564
msgid "O_pen With"
msgstr "O_pen With"
-#: ../mail/em-format-html-display.c:2571
+#: ../mail/em-format-html-display.c:2635
msgid "Evolution cannot render this email as it is too large to handle. You can view it unformatted or with an external text editor."
msgstr "Evolution cannot render this email as it is too large to handle. You can view it unformatted or with an external text editor."
-#: ../mail/em-format-html-print.c:128
+#: ../mail/em-format-html-print.c:156
#, c-format
msgid "Page %d of %d"
msgstr "Page %d of %d"
-#: ../mail/em-mailer-prefs.c:107
+#: ../mail/em-format-html.c:495
+#: ../mail/em-format-html.c:504
+#, c-format
+msgid "Retrieving `%s'"
+msgstr "Retrieving `%s'"
+
+#: ../mail/em-format-html.c:916
+msgid "Unknown external-body part."
+msgstr "Unknown external-body part."
+
+#: ../mail/em-format-html.c:924
+msgid "Malformed external-body part."
+msgstr "Malformed external-body part."
+
+#: ../mail/em-format-html.c:954
+#, c-format
+msgid "Pointer to FTP site (%s)"
+msgstr "Pointer to FTP site (%s)"
+
+#: ../mail/em-format-html.c:965
+#, 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:967
+#, c-format
+msgid "Pointer to local file (%s)"
+msgstr "Pointer to local file (%s)"
+
+#: ../mail/em-format-html.c:988
+#, c-format
+msgid "Pointer to remote data (%s)"
+msgstr "Pointer to remote data (%s)"
+
+#: ../mail/em-format-html.c:999
+#, c-format
+msgid "Pointer to unknown external data (\"%s\" type)"
+msgstr "Pointer to unknown external data (\"%s\" type)"
+
+#: ../mail/em-format-html.c:1227
+msgid "Formatting message"
+msgstr "Formatting message"
+
+#: ../mail/em-format-html.c:1394
+msgid "Formatting Message..."
+msgstr "Formatting Message..."
+
+#: ../mail/em-format-html.c:1546
+#: ../mail/em-format-html.c:1610
+#: ../mail/em-format-html.c:1632
+#: ../mail/em-format-quote.c:207
+#: ../mail/em-format.c:889
+#: ../mail/em-mailer-prefs.c:93
+msgid "Cc"
+msgstr "Cc"
+
+#: ../mail/em-format-html.c:1547
+#: ../mail/em-format-html.c:1616
+#: ../mail/em-format-html.c:1635
+#: ../mail/em-format-quote.c:207
+#: ../mail/em-format.c:890
+#: ../mail/em-mailer-prefs.c:94
+msgid "Bcc"
+msgstr "Bcc"
+
+#. pseudo-header
+#: ../mail/em-format-html.c:1706
+#: ../mail/em-format-quote.c:329
+#: ../mail/em-mailer-prefs.c:1458
+msgid "Mailer"
+msgstr "Mailer"
+
+#. translators: strftime format for local time equivalent in Date header display, with day
+#: ../mail/em-format-html.c:1733
+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:1738
+msgid " (%R %Z)"
+msgstr " (%R %Z)"
+
+#: ../mail/em-format-html.c:1750
+#: ../mail/em-format-quote.c:336
+#: ../mail/em-format.c:892
+#: ../mail/em-mailer-prefs.c:96
+#: ../mail/message-list.etspec.h:2
+#: ../widgets/misc/e-dateedit.c:346
+#: ../widgets/misc/e-dateedit.c:368
+msgid "Date"
+msgstr "Date"
+
+#: ../mail/em-format-html.c:1773
+#: ../mail/em-format.c:893
+#: ../mail/em-mailer-prefs.c:97
+msgid "Newsgroups"
+msgstr "Newsgroups"
+
+#. 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:1866
+#, 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:207
+#: ../mail/em-format.c:886
+#: ../mail/em-mailer-prefs.c:90
+#: ../mail/message-list.etspec.h:7
+#: ../mail/message-tag-followup.c:333
+msgid "From"
+msgstr "From"
+
+#: ../mail/em-format-quote.c:207
+#: ../mail/em-format.c:887
+#: ../mail/em-mailer-prefs.c:91
+msgid "Reply-To"
+msgstr "Reply-To"
+
+#: ../mail/em-format.c:1157
+#, c-format
+msgid "%s attachment"
+msgstr "%s attachment"
+
+#: ../mail/em-format.c:1196
+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
+msgid "Could not parse MIME message. Displaying as source."
+msgstr "Could not parse MIME message. Displaying as source."
+
+#: ../mail/em-format.c:1341
+msgid "Unsupported encryption type for multipart/encrypted"
+msgstr "Unsupported encryption type for multipart/encrypted"
+
+#: ../mail/em-format.c:1351
+msgid "Could not parse PGP/MIME message"
+msgstr "Could not parse PGP/MIME message"
+
+#: ../mail/em-format.c:1351
+msgid "Could not parse PGP/MIME message: Unknown error"
+msgstr "Could not parse PGP/MIME message: Unknown error"
+
+#: ../mail/em-format.c:1508
+msgid "Unsupported signature format"
+msgstr "Unsupported signature format"
+
+#: ../mail/em-format.c:1516
+#: ../mail/em-format.c:1587
+msgid "Error verifying signature"
+msgstr "Error verifying signature"
+
+#: ../mail/em-format.c:1516
+#: ../mail/em-format.c:1578
+#: ../mail/em-format.c:1587
+msgid "Unknown error verifying signature"
+msgstr "Unknown error verifying signature"
+
+#: ../mail/em-format.c:1659
+msgid "Could not parse PGP message"
+msgstr "Could not parse PGP message"
+
+#: ../mail/em-format.c:1659
+msgid "Could not parse PGP message: Unknown error"
+msgstr "Could not parse PGP message: Unknown error"
+
+#: ../mail/em-mailer-prefs.c:108
msgid "Every time"
msgstr "Every time"
-#: ../mail/em-mailer-prefs.c:108
+#: ../mail/em-mailer-prefs.c:109
msgid "Once per day"
msgstr "Once per day"
-#: ../mail/em-mailer-prefs.c:109
+#: ../mail/em-mailer-prefs.c:110
msgid "Once per week"
msgstr "Once per week"
-#: ../mail/em-mailer-prefs.c:110
+#: ../mail/em-mailer-prefs.c:111
msgid "Once per month"
msgstr "Once per month"
-#: ../mail/em-mailer-prefs.c:807
+#: ../mail/em-mailer-prefs.c:341
+msgid "Add Custom Junk Header"
+msgstr "Add Custom Junk Header"
+
+#: ../mail/em-mailer-prefs.c:345
+msgid "Header Name:"
+msgstr "Header Name:"
+
+#: ../mail/em-mailer-prefs.c:346
+msgid "Header Value Contains:"
+msgstr "Header Value Contains:"
+
+#: ../mail/em-mailer-prefs.c:451
+msgid "Contains Value"
+msgstr "Contains Value"
+
+#: ../mail/em-mailer-prefs.c:473
+msgid "Color"
+msgstr "Colour"
+
+#: ../mail/em-mailer-prefs.c:476
+msgid "Tag"
+msgstr "Tag"
+
+#. May be a better text
+#: ../mail/em-mailer-prefs.c:1086
+#: ../mail/em-mailer-prefs.c:1140
+#, 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:1094
+#: ../mail/em-mailer-prefs.c:1149
+#, 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:1115
msgid "No Junk plugin available"
msgstr "No Junk plugin available"
-#: ../mail/em-migrate.c:1210
+#. green
+#: ../mail/em-migrate.c:1057
+msgid "To Do"
+msgstr "To Do"
+
+#. blue
+#: ../mail/em-migrate.c:1058
+msgid "Later"
+msgstr "Later"
+
+#: ../mail/em-migrate.c:1211
msgid ""
"The location and hierarchy of the Evolution mailbox folders has changed since Evolution 1.x.\n"
"\n"
@@ -12095,109 +12133,109 @@ msgstr ""
"\n"
"Please be patient while Evolution migrates your folders..."
-#: ../mail/em-migrate.c:1649
+#: ../mail/em-migrate.c:1650
#, 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:1676
#, 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:1861
#, 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:2065
#, 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:2079
#, 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:2108
#, 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:2579
+#: ../mail/em-migrate.c:2591
#, c-format
msgid "Failed to create local mail storage `%s': %s"
msgstr "Failed to create local mail storage `%s': %s"
-#: ../mail/em-migrate.c:2709
+#: ../mail/em-migrate.c:2827
#, 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:2728
+#: ../mail/em-migrate.c:2846
msgid "Unable to read settings from previous Evolution install, `evolution/config.xmldb' does not exist or is corrupt."
msgstr "Unable to read settings from previous Evolution install, `evolution/config.xmldb' does not exist or is corrupt."
-#: ../mail/em-popup.c:562
-#: ../mail/em-popup.c:573
+#: ../mail/em-popup.c:574
+#: ../mail/em-popup.c:585
msgid "_Reply to sender"
msgstr "_Reply to sender"
-#: ../mail/em-popup.c:563
-#: ../mail/em-popup.c:574
+#: ../mail/em-popup.c:575
+#: ../mail/em-popup.c:586
#: ../ui/evolution-mail-message.xml.h:83
msgid "Reply to _List"
msgstr "Reply to _List"
-#: ../mail/em-popup.c:627
+#: ../mail/em-popup.c:639
msgid "_Add to Address Book"
msgstr "_Add to Address Book"
-#: ../mail/em-subscribe-editor.c:603
+#: ../mail/em-subscribe-editor.c:595
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:633
+#: ../mail/em-subscribe-editor.c:628
msgid "Subscribed"
msgstr "Subscribed"
-#: ../mail/em-subscribe-editor.c:637
+#: ../mail/em-subscribe-editor.c:632
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:834
msgid "Please select a server."
msgstr "Please select a server."
-#: ../mail/em-subscribe-editor.c:856
+#: ../mail/em-subscribe-editor.c:855
msgid "No server has been selected"
msgstr "No server has been selected"
-#: ../mail/em-utils.c:120
-msgid "Do not show this message again."
-msgstr "Do not show this message again."
+#: ../mail/em-utils.c:121
+msgid "_Do not show this message again."
+msgstr "_Do not show this message again."
-#: ../mail/em-utils.c:315
+#: ../mail/em-utils.c:317
msgid "Message Filters"
msgstr "Message Filters"
-#: ../mail/em-utils.c:368
+#: ../mail/em-utils.c:370
msgid "message"
msgstr "message"
-#: ../mail/em-utils.c:557
+#: ../mail/em-utils.c:645
msgid "Save Message..."
msgstr "Save Message..."
-#: ../mail/em-utils.c:606
+#: ../mail/em-utils.c:694
msgid "Add address"
msgstr "Add address"
#. Drop filename for messages from a mailbox
-#: ../mail/em-utils.c:1090
+#: ../mail/em-utils.c:1178
#, c-format
msgid "Messages from %s"
msgstr "Messages from %s"
@@ -12206,622 +12244,675 @@ msgstr "Messages from %s"
msgid "Search _Folders"
msgstr "Search _Folders"
-#: ../mail/em-vfolder-rule.c:590
+#: ../mail/em-vfolder-rule.c:592
msgid "Search Folder source"
msgstr "Search Folder source"
-#: ../mail/evolution-mail.schemas.in.in.h:1
+#: ../mail/evolution-mail.schemas.in.h:1
msgid "Allows evolution to display text part of limited size"
msgstr "Allows evolution to display text part of limited size"
-#: ../mail/evolution-mail.schemas.in.in.h:2
+#: ../mail/evolution-mail.schemas.in.h:2
+msgid "Always request read receipt"
+msgstr "Always request read receipt"
+
+#: ../mail/evolution-mail.schemas.in.h:3
+msgid "Amount of time in seconds the error should be shown on the status bar."
+msgstr "Amount of time in seconds the error should be shown on the status bar."
+
+#: ../mail/evolution-mail.schemas.in.h:4
+msgid "Automatic emoticon recognition"
+msgstr "Automatic emoticon recognition"
+
+#: ../mail/evolution-mail.schemas.in.h:5
msgid "Automatic link recognition"
msgstr "Automatic link recognition"
-#: ../mail/evolution-mail.schemas.in.in.h:3
-msgid "Automatic smiley recognition"
-msgstr "Automatic smiley recognition"
-
-#: ../mail/evolution-mail.schemas.in.in.h:4
+#: ../mail/evolution-mail.schemas.in.h:6
msgid "Check incoming mail being junk"
msgstr "Check incoming mail being junk"
-#: ../mail/evolution-mail.schemas.in.in.h:5
+#: ../mail/evolution-mail.schemas.in.h:7
msgid "Citation highlight color"
msgstr "Citation highlight colour"
-#: ../mail/evolution-mail.schemas.in.in.h:6
+#: ../mail/evolution-mail.schemas.in.h:8
msgid "Citation highlight color."
msgstr "Citation highlight colour."
-#: ../mail/evolution-mail.schemas.in.in.h:7
+#: ../mail/evolution-mail.schemas.in.h:9
msgid "Composer Window default height"
msgstr "Composer Window default height"
-#: ../mail/evolution-mail.schemas.in.in.h:8
+#: ../mail/evolution-mail.schemas.in.h:10
msgid "Composer Window default width"
msgstr "Composer Window default width"
-#: ../mail/evolution-mail.schemas.in.in.h:9
+#: ../mail/evolution-mail.schemas.in.h:11
+msgid "Composer load/attach directory"
+msgstr "Composer load/attach directory"
+
+#: ../mail/evolution-mail.schemas.in.h:12
msgid "Compress display of addresses in TO/CC/BCC"
msgstr "Compress display of addresses in TO/CC/BCC"
-#: ../mail/evolution-mail.schemas.in.in.h:10
+#: ../mail/evolution-mail.schemas.in.h:13
msgid "Compress display of addresses in TO/CC/BCC to the number specified in address_count."
msgstr "Compress display of addresses in TO/CC/BCC to the number specified in address_count."
-#: ../mail/evolution-mail.schemas.in.in.h:11
+#: ../mail/evolution-mail.schemas.in.h:14
msgid "Default charset in which to compose messages"
msgstr "Default charset in which to compose messages"
-#: ../mail/evolution-mail.schemas.in.in.h:12
+#: ../mail/evolution-mail.schemas.in.h:15
msgid "Default charset in which to compose messages."
msgstr "Default charset in which to compose messages."
-#: ../mail/evolution-mail.schemas.in.in.h:13
+#: ../mail/evolution-mail.schemas.in.h:16
msgid "Default charset in which to display messages"
msgstr "Default charset in which to display messages"
-#: ../mail/evolution-mail.schemas.in.in.h:14
+#: ../mail/evolution-mail.schemas.in.h:17
msgid "Default charset in which to display messages."
msgstr "Default charset in which to display messages."
-#: ../mail/evolution-mail.schemas.in.in.h:15
+#: ../mail/evolution-mail.schemas.in.h:18
msgid "Default forward style"
msgstr "Default forward style"
-#: ../mail/evolution-mail.schemas.in.in.h:16
-msgid "Default height of the Composer Window"
-msgstr "Default height of the Composer Window"
+#: ../mail/evolution-mail.schemas.in.h:19
+msgid "Default height of the Composer Window."
+msgstr "Default height of the Composer Window."
-#: ../mail/evolution-mail.schemas.in.in.h:17
-msgid "Default height of the Message Window"
-msgstr "Default height of the Message Window"
+#: ../mail/evolution-mail.schemas.in.h:20
+msgid "Default height of the message window."
+msgstr "Default height of the message window."
-#: ../mail/evolution-mail.schemas.in.in.h:18
-msgid "Default height of the Subscribe dialog"
-msgstr "Default height of the Subscribe dialogue"
+#: ../mail/evolution-mail.schemas.in.h:21
+msgid "Default height of the subscribe dialog."
+msgstr "Default height of the subscribe dialogue."
-#: ../mail/evolution-mail.schemas.in.in.h:19
+#: ../mail/evolution-mail.schemas.in.h:22
msgid "Default reply style"
msgstr "Default reply style"
-#: ../mail/evolution-mail.schemas.in.in.h:20
-msgid "Default width of the Composer Window"
-msgstr "Default width of the Composer Window"
+#: ../mail/evolution-mail.schemas.in.h:23
+msgid "Default value for thread expand state"
+msgstr "Default value for thread expand state"
+
+#: ../mail/evolution-mail.schemas.in.h:24
+msgid "Default width of the Composer Window."
+msgstr "Default width of the Composer Window."
+
+#: ../mail/evolution-mail.schemas.in.h:25
+msgid "Default width of the message window."
+msgstr "Default width of the message window."
+
+#: ../mail/evolution-mail.schemas.in.h:26
+msgid "Default width of the subscribe dialog."
+msgstr "Default width of the subscribe dialogue."
+
+#: ../mail/evolution-mail.schemas.in.h:27
+msgid "Determines whether to lookup in addressbook for sender email"
+msgstr "Determines whether to look up in address book for sender email"
-#: ../mail/evolution-mail.schemas.in.in.h:21
-msgid "Default width of the Message Window"
-msgstr "Default width of the Message Window"
+#: ../mail/evolution-mail.schemas.in.h:28
+msgid "Determines whether to loopup the sender email in addressbook. 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 autocompletion."
+msgstr "Determines whether to look up the sender email 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."
-#: ../mail/evolution-mail.schemas.in.in.h:22
-msgid "Default width of the Subscribe dialog"
-msgstr "Default width of the Subscribe dialogue"
+#: ../mail/evolution-mail.schemas.in.h:29
+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.in.h:23
-msgid "Directory for saving mail component files"
-msgstr "Directory for saving mail component files"
+#: ../mail/evolution-mail.schemas.in.h:30
+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 checking speed."
+msgstr "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 checking speed."
-#: ../mail/evolution-mail.schemas.in.in.h:24
+#: ../mail/evolution-mail.schemas.in.h:31
+msgid "Determines whether to use the same fonts for both \"From\" and \"Subject\" lines in the \"Messages\" column in vertical view."
+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:32
+msgid "Directory for loading/attaching files to composer."
+msgstr "Directory for loading/attaching files to composer."
+
+#: ../mail/evolution-mail.schemas.in.h:33
+msgid "Directory for saving mail component files."
+msgstr "Directory for saving mail component files."
+
+#: ../mail/evolution-mail.schemas.in.h:34
msgid "Draw spelling error indicators on words as you type."
msgstr "Draw spelling error indicators on words as you type."
-#: ../mail/evolution-mail.schemas.in.in.h:25
+#: ../mail/evolution-mail.schemas.in.h:35
msgid "Empty Junk folders on exit"
msgstr "Empty Junk folders on exit"
-#: ../mail/evolution-mail.schemas.in.in.h:26
+#: ../mail/evolution-mail.schemas.in.h:36
msgid "Empty Trash folders on exit"
msgstr "Empty Trash folders on exit"
-#: ../mail/evolution-mail.schemas.in.in.h:27
+#: ../mail/evolution-mail.schemas.in.h:37
msgid "Empty all Junk folders when exiting Evolution."
msgstr "Empty all Junk folders when exiting Evolution."
-#: ../mail/evolution-mail.schemas.in.in.h:28
+#: ../mail/evolution-mail.schemas.in.h:38
msgid "Empty all Trash folders when exiting Evolution."
msgstr "Empty all Trash folders when exiting Evolution."
-#: ../mail/evolution-mail.schemas.in.in.h:29
+#: ../mail/evolution-mail.schemas.in.h:39
msgid "Enable caret mode, so that you can see a cursor when reading mail."
msgstr "Enable caret mode, so that you can see a cursor when reading mail."
-#: ../mail/evolution-mail.schemas.in.in.h:30
+#: ../mail/evolution-mail.schemas.in.h:40
+msgid "Enable or disable magic space bar"
+msgstr "Enable or disable magic space bar"
+
+#: ../mail/evolution-mail.schemas.in.h:41
msgid "Enable or disable type ahead search feature"
msgstr "Enable or disable type ahead search feature"
-#: ../mail/evolution-mail.schemas.in.in.h:31
+#: ../mail/evolution-mail.schemas.in.h:42
+msgid "Enable search folders"
+msgstr "Enable search folders"
+
+#: ../mail/evolution-mail.schemas.in.h:43
+msgid "Enable search folders on startup."
+msgstr "Enable search folders on startup."
+
+#: ../mail/evolution-mail.schemas.in.h:44
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 bar by just typing the folder name and the selection jumps automatically to that folder."
msgstr "Enable the side bar search feature to allow interactive searching of folder names."
-#: ../mail/evolution-mail.schemas.in.in.h:32
+#: ../mail/evolution-mail.schemas.in.h:45
+msgid "Enable this to use Space bar key to scroll in message preview, message list and folders."
+msgstr "Enable this to use Space bar key to scroll in message preview, message list and folders."
+
+#: ../mail/evolution-mail.schemas.in.h:46
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.in.h:33
+#: ../mail/evolution-mail.schemas.in.h:47
msgid "Enable/disable caret mode"
msgstr "Enable/disable caret mode"
-#: ../mail/evolution-mail.schemas.in.in.h:34
+#: ../mail/evolution-mail.schemas.in.h:48
msgid "Height of the message-list pane"
msgstr "Height of the message-list pane"
-#: ../mail/evolution-mail.schemas.in.in.h:35
+#: ../mail/evolution-mail.schemas.in.h:49
msgid "Height of the message-list pane."
msgstr "Height of the message-list pane."
-#: ../mail/evolution-mail.schemas.in.in.h:36
+#: ../mail/evolution-mail.schemas.in.h:50
+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:51
msgid "If a user tries to open 10 or more messages at one time, ask the user if they really want to do it."
msgstr "If a user tries to open 10 or more messages at one time, ask the user if they really want to do it."
-#: ../mail/evolution-mail.schemas.in.in.h:37
+#: ../mail/evolution-mail.schemas.in.h:52
msgid "If the \"Preview\" pane is on, then show it side-by-side rather than vertically."
msgstr "If the \"Preview\" pane is on, then show it side-by-side rather than vertically."
-#: ../mail/evolution-mail.schemas.in.in.h:38
+#: ../mail/evolution-mail.schemas.in.h:53
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 in GNOME's mime-type database may be used for displaying content."
msgstr "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 in GNOME's mime-type database may be used for displaying content."
-#: ../mail/evolution-mail.schemas.in.in.h:39
-msgid "It disables the feature where repeated prompts to ask if offline sync is required."
-msgstr "It disables the feature where repeated prompts to ask if offline sync is required."
-
-#: ../mail/evolution-mail.schemas.in.in.h:40
+#: ../mail/evolution-mail.schemas.in.h:54
msgid "It disables/enables the prompt while marking multiple messages."
msgstr "Enable or disable the prompt whilst marking multiple messages."
-#: ../mail/evolution-mail.schemas.in.in.h:41
+#: ../mail/evolution-mail.schemas.in.h:55
+msgid "It disables/enables the repeated prompts to ask if offline sync is required before going into offline mode."
+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:56
+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 the search results."
+msgstr "It disables/enables the repeated prompts to warn that deleting messages from a search folder permanently deletes the message, not simply removing it from the search results."
+
+#: ../mail/evolution-mail.schemas.in.h:57
msgid "Last time empty junk was run"
msgstr "Last time empty junk was run"
-#: ../mail/evolution-mail.schemas.in.in.h:42
+#: ../mail/evolution-mail.schemas.in.h:58
msgid "Last time empty trash was run"
msgstr "Last time empty trash was run"
-#: ../mail/evolution-mail.schemas.in.in.h:43
+#: ../mail/evolution-mail.schemas.in.h:59
+msgid "Level beyond which the message should be logged."
+msgstr "Level beyond which the message should be logged."
+
+#: ../mail/evolution-mail.schemas.in.h:60
msgid "List of Labels and their associated colors"
msgstr "List of Labels and their associated colours"
-#: ../mail/evolution-mail.schemas.in.in.h:44
+#: ../mail/evolution-mail.schemas.in.h:61
msgid "List of accepted licenses"
msgstr "List of accepted licences"
-#: ../mail/evolution-mail.schemas.in.in.h:45
+#: ../mail/evolution-mail.schemas.in.h:62
msgid "List of accounts"
msgstr "List of accounts"
-#: ../mail/evolution-mail.schemas.in.in.h:46
+#: ../mail/evolution-mail.schemas.in.h:63
msgid "List of accounts known to the mail component of Evolution. The list contains strings naming subdirectories relative to /apps/evolution/mail/accounts."
msgstr "List of accounts known to the mail component of Evolution. The list contains strings naming subdirectories relative to /apps/evolution/mail/accounts."
-#: ../mail/evolution-mail.schemas.in.in.h:47
+#: ../mail/evolution-mail.schemas.in.h:64
msgid "List of custom headers and whether they are enabled."
msgstr "List of custom headers and whether they are enabled."
-#: ../mail/evolution-mail.schemas.in.in.h:48
+#: ../mail/evolution-mail.schemas.in.h:65
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."
msgstr "List of labels known to the mail component of Evolution. The list contains strings containing name:colour where colour uses the HTML hex encoding."
-#: ../mail/evolution-mail.schemas.in.in.h:49
+#: ../mail/evolution-mail.schemas.in.h:66
msgid "List of mime types to check for bonobo component viewers"
msgstr "List of mime types to check for bonobo component viewers"
-#: ../mail/evolution-mail.schemas.in.in.h:50
+#: ../mail/evolution-mail.schemas.in.h:67
msgid "List of protocol names whose license has been accepted."
msgstr "List of protocol names whose license has been accepted."
-#: ../mail/evolution-mail.schemas.in.in.h:51
+#: ../mail/evolution-mail.schemas.in.h:68
msgid "Load images for HTML messages over http"
msgstr "Load images for HTML messages over http"
-#: ../mail/evolution-mail.schemas.in.in.h:52
-msgid "Load images for HTML messages over http(s). Possible values are: 0 - Never load images off the net 1 - Load images in mail 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 mail from contacts 2 - Always load images off the net"
+#: ../mail/evolution-mail.schemas.in.h:69
+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."
+msgstr "Load images for HTML messages over HTTP(S). Possible values are: 0 - Never load images off the net 1 - Load images in mail from contacts 2 - Always load images off the net"
-#: ../mail/evolution-mail.schemas.in.in.h:53
+#: ../mail/evolution-mail.schemas.in.h:70
msgid "Log filter actions"
msgstr "Log filter actions"
-#: ../mail/evolution-mail.schemas.in.in.h:54
+#: ../mail/evolution-mail.schemas.in.h:71
msgid "Log filter actions to the specified log file."
msgstr "Log filter actions to the specified log file."
-#: ../mail/evolution-mail.schemas.in.in.h:55
+#: ../mail/evolution-mail.schemas.in.h:72
msgid "Logfile to log filter actions"
msgstr "Logfile to log filter actions"
-#: ../mail/evolution-mail.schemas.in.in.h:56
+#: ../mail/evolution-mail.schemas.in.h:73
msgid "Logfile to log filter actions."
msgstr "Logfile to log filter actions."
-#: ../mail/evolution-mail.schemas.in.in.h:57
+#: ../mail/evolution-mail.schemas.in.h:74
msgid "Mark as Seen after specified timeout"
msgstr "Mark as Seen after specified timeout"
-#: ../mail/evolution-mail.schemas.in.in.h:58
+#: ../mail/evolution-mail.schemas.in.h:75
msgid "Mark as Seen after specified timeout."
msgstr "Mark as Seen after specified timeout."
-#: ../mail/evolution-mail.schemas.in.in.h:59
+#: ../mail/evolution-mail.schemas.in.h:76
msgid "Mark citations in the message \"Preview\""
msgstr "Mark citations in the message \"Preview\""
-#: ../mail/evolution-mail.schemas.in.in.h:60
+#: ../mail/evolution-mail.schemas.in.h:77
msgid "Mark citations in the message \"Preview\"."
msgstr "Mark citations in the message \"Preview\"."
-#: ../mail/evolution-mail.schemas.in.in.h:61
+#: ../mail/evolution-mail.schemas.in.h:78
msgid "Message Window default height"
msgstr "Message Window default height"
-#: ../mail/evolution-mail.schemas.in.in.h:62
+#: ../mail/evolution-mail.schemas.in.h:79
msgid "Message Window default width"
msgstr "Message Window default width"
-#: ../mail/evolution-mail.schemas.in.in.h:63
+#: ../mail/evolution-mail.schemas.in.h:80
msgid "Message-display style (\"normal\", \"full headers\", \"source\")"
msgstr "Message-display style (\"normal\", \"full headers\", \"source\")"
-#: ../mail/evolution-mail.schemas.in.in.h:64
+#: ../mail/evolution-mail.schemas.in.h:81
msgid "Minimum days between emptying the junk on exit"
msgstr "Minimum days between emptying the junk on exit"
-#: ../mail/evolution-mail.schemas.in.in.h:65
+#: ../mail/evolution-mail.schemas.in.h:82
msgid "Minimum days between emptying the trash on exit"
msgstr "Minimum days between emptying the trash on exit"
-#: ../mail/evolution-mail.schemas.in.in.h:66
+#: ../mail/evolution-mail.schemas.in.h:83
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.in.h:67
+#: ../mail/evolution-mail.schemas.in.h:84
msgid "Minimum time between emptying the trash on exit, in days."
msgstr "Minimum time between emptying the trash on exit, in days."
-#: ../mail/evolution-mail.schemas.in.in.h:68
-msgid "New Mail Notify sound file"
-msgstr "New Mail Notify sound file"
-
-#: ../mail/evolution-mail.schemas.in.in.h:69
-msgid "New Mail Notify type"
-msgstr "New Mail Notify type"
-
-#: ../mail/evolution-mail.schemas.in.in.h:70
+#: ../mail/evolution-mail.schemas.in.h:85
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.in.h:71
+#: ../mail/evolution-mail.schemas.in.h:86
msgid "Prompt on empty subject"
msgstr "Prompt on empty subject"
-#: ../mail/evolution-mail.schemas.in.in.h:72
+#: ../mail/evolution-mail.schemas.in.h:87
msgid "Prompt the user when he or she tries to expunge a folder."
msgstr "Prompt the user when he or she tries to expunge a folder."
-#: ../mail/evolution-mail.schemas.in.in.h:73
+#: ../mail/evolution-mail.schemas.in.h:88
msgid "Prompt the user when he or she tries to send a message without a Subject."
msgstr "Prompt the user when he or she tries to send a message without a Subject."
-#: ../mail/evolution-mail.schemas.in.in.h:74
+#: ../mail/evolution-mail.schemas.in.h:89
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.in.h:75
+#: ../mail/evolution-mail.schemas.in.h:90
+msgid "Prompt when deleting messages in search folder"
+msgstr "Prompt when deleting messages in search folder"
+
+#: ../mail/evolution-mail.schemas.in.h:91
msgid "Prompt when user expunges"
msgstr "Prompt when user expunges"
-#: ../mail/evolution-mail.schemas.in.in.h:76
+#: ../mail/evolution-mail.schemas.in.h:92
msgid "Prompt when user only fills Bcc"
msgstr "Prompt when user only fills Bcc"
-#: ../mail/evolution-mail.schemas.in.in.h:77
+#: ../mail/evolution-mail.schemas.in.h:93
msgid "Prompt when user tries to open 10 or more messages at once"
msgstr "Prompt when user tries to open 10 or more messages at once"
-#: ../mail/evolution-mail.schemas.in.in.h:78
+#: ../mail/evolution-mail.schemas.in.h:94
msgid "Prompt when user tries to send HTML mail to recipients that may not want to receive HTML mail."
msgstr "Prompt when user tries to send HTML mail to recipients that may not want to receive HTML mail."
-#: ../mail/evolution-mail.schemas.in.in.h:79
+#: ../mail/evolution-mail.schemas.in.h:95
msgid "Prompt when user tries to send a message with no To or Cc recipients."
msgstr "Prompt when user tries to send a message with no To or Cc recipients."
-#: ../mail/evolution-mail.schemas.in.in.h:80
+#: ../mail/evolution-mail.schemas.in.h:96
msgid "Prompt when user tries to send unwanted HTML"
msgstr "Prompt when user tries to send unwanted HTML"
-#: ../mail/evolution-mail.schemas.in.in.h:81
+#: ../mail/evolution-mail.schemas.in.h:97
msgid "Prompt while marking multiple messages"
msgstr "Prompt while marking multiple messages"
-#: ../mail/evolution-mail.schemas.in.in.h:82
+#: ../mail/evolution-mail.schemas.in.h:98
+msgid "Recognize emoticons in text and replace them with images."
+msgstr "Recognize emoticons in text and replace them with images."
+
+#: ../mail/evolution-mail.schemas.in.h:99
msgid "Recognize links in text and replace them."
msgstr "Recognise links in text and replace them."
-#: ../mail/evolution-mail.schemas.in.in.h:83
-msgid "Recognize smileys in text and replace them with images."
-msgstr "Recognise smileys in text and replace them with images."
-
-#: ../mail/evolution-mail.schemas.in.in.h:84
-msgid "Run junk test on incoming mail"
-msgstr "Run junk test on incoming mail"
+#: ../mail/evolution-mail.schemas.in.h:100
+msgid "Run junk test on incoming mail."
+msgstr "Run junk test on incoming mail."
-#: ../mail/evolution-mail.schemas.in.in.h:85
+#: ../mail/evolution-mail.schemas.in.h:101
msgid "Save directory"
msgstr "Save directory"
-#: ../mail/evolution-mail.schemas.in.in.h:86
+#: ../mail/evolution-mail.schemas.in.h:102
+msgid "Search for the sender photo in local addressbooks"
+msgstr "Search for the sender photo in local addressbooks"
+
+#: ../mail/evolution-mail.schemas.in.h:103
msgid "Send HTML mail by default"
msgstr "Send HTML mail by default"
-#: ../mail/evolution-mail.schemas.in.in.h:87
+#: ../mail/evolution-mail.schemas.in.h:104
msgid "Send HTML mail by default."
msgstr "Send HTML mail by default."
-#: ../mail/evolution-mail.schemas.in.in.h:88
+#: ../mail/evolution-mail.schemas.in.h:105
+msgid "Sender email-address column in the message list"
+msgstr "Sender email address column in the message list"
+
+#: ../mail/evolution-mail.schemas.in.h:106
msgid "Show Animations"
msgstr "Show Animations"
-#: ../mail/evolution-mail.schemas.in.in.h:89
+#: ../mail/evolution-mail.schemas.in.h:107
msgid "Show animated images as animations."
msgstr "Show animated images as animations."
-#: ../mail/evolution-mail.schemas.in.in.h:90
+#: ../mail/evolution-mail.schemas.in.h:108
msgid "Show deleted messages (with a strike-through) in the message-list."
msgstr "Show deleted messages (with a strike-through) in the message-list."
-#: ../mail/evolution-mail.schemas.in.in.h:91
+#: ../mail/evolution-mail.schemas.in.h:109
msgid "Show deleted messages in the message-list"
msgstr "Show deleted messages in the message-list"
-#: ../mail/evolution-mail.schemas.in.in.h:94
-msgid "Show the email of the sender in the messages composite column in the message list"
-msgstr "Show the email of the sender in the messages composite column in the message list"
+#: ../mail/evolution-mail.schemas.in.h:110
+msgid "Show photo of the sender"
+msgstr "Show photo of the sender"
+
+#: ../mail/evolution-mail.schemas.in.h:113
+msgid "Show the email-address of the sender in a separate column in the message list."
+msgstr "Show the email address of the sender in a separate column in the message list."
-#: ../mail/evolution-mail.schemas.in.in.h:95
-msgid "Show the sender email in the messages column in the message list"
-msgstr "Show the sender email in the messages column in the message list"
+#: ../mail/evolution-mail.schemas.in.h:114
+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.in.h:96
-msgid "Sound file to play when new mail arrives."
-msgstr "Sound file to play when new mail arrives."
+#: ../mail/evolution-mail.schemas.in.h:115
+msgid "Specifies the header to check for junk."
+msgstr "Specifies the header to check for junk."
-#: ../mail/evolution-mail.schemas.in.in.h:97
-msgid "Specifies the type of New Mail Notification the user wishes to use."
-msgstr "Specifies the type of New Mail Notification the user wishes to use."
+#: ../mail/evolution-mail.schemas.in.h:116
+msgid "Specifies the header to check for junk. The format is headername=value in gconf."
+msgstr "Specifies the header to check for junk. The format is headername=value in gconf."
-#: ../mail/evolution-mail.schemas.in.in.h:98
+#: ../mail/evolution-mail.schemas.in.h:117
msgid "Spell check inline"
msgstr "Spell check inline"
-#: ../mail/evolution-mail.schemas.in.in.h:99
+#: ../mail/evolution-mail.schemas.in.h:118
msgid "Subscribe dialog default height"
msgstr "Subscribe dialogue default height"
-#: ../mail/evolution-mail.schemas.in.in.h:100
+#: ../mail/evolution-mail.schemas.in.h:119
msgid "Subscribe dialog default width"
msgstr "Subscribe dialogue default width"
-#: ../mail/evolution-mail.schemas.in.in.h:101
+#: ../mail/evolution-mail.schemas.in.h:120
msgid "Terminal font"
msgstr "Terminal font"
-#: ../mail/evolution-mail.schemas.in.in.h:102
+#: ../mail/evolution-mail.schemas.in.h:121
msgid "Text message part limit"
msgstr "Text message part limit"
-#: ../mail/evolution-mail.schemas.in.in.h:103
+#: ../mail/evolution-mail.schemas.in.h:122
msgid "The default plugin for Junk hook"
msgstr "The default plugin for Junk hook"
-#: ../mail/evolution-mail.schemas.in.in.h:104
+#: ../mail/evolution-mail.schemas.in.h:123
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.in.h:105
+#: ../mail/evolution-mail.schemas.in.h:124
msgid "The last time empty trash was run, in days since the epoch."
msgstr "The last time empty trash was run, in days since the epoch."
-#: ../mail/evolution-mail.schemas.in.in.h:106
-msgid "The terminal font for mail display"
-msgstr "The terminal font for mail display"
+#: ../mail/evolution-mail.schemas.in.h:125
+msgid "The terminal font for mail display."
+msgstr "The terminal font for mail display."
-#: ../mail/evolution-mail.schemas.in.in.h:107
-msgid "The variable width font for mail display"
-msgstr "The variable width font for mail display"
+#: ../mail/evolution-mail.schemas.in.h:126
+msgid "The variable width font for mail display."
+msgstr "The variable width font for mail display."
-#: ../mail/evolution-mail.schemas.in.in.h:108
+#: ../mail/evolution-mail.schemas.in.h:127
+msgid "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."
+
+#: ../mail/evolution-mail.schemas.in.h:128
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."
msgstr "This decides the max 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.in.h:109
-msgid "This is the default junk plugin, even though there are multiple plugins enabled. If the default listed plugin is disabled, then it wont fall back to the other available plugins."
-msgstr "This is the default junk plugin, even though there are multiple plugins enabled. If the default listed plugin is disabled, then it wont fall back to the other available plugins."
+#: ../mail/evolution-mail.schemas.in.h:129
+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 to the other available plugins."
+msgstr "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 to the other available plugins."
+
+#: ../mail/evolution-mail.schemas.in.h:130
+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."
+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."
-#: ../mail/evolution-mail.schemas.in.in.h:110
+#: ../mail/evolution-mail.schemas.in.h:131
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;header enabled&gt; - set enabled if the header is to be displayed in the mail view."
msgstr "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;header enabled&gt; - set enabled if the header is to be displayed in the mail view."
-#: ../mail/evolution-mail.schemas.in.in.h:111
+#: ../mail/evolution-mail.schemas.in.h:132
+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:133
msgid "This sets the number of addresses to show in default message list view, beyond which a '...' is shown."
msgstr "This sets the number of addresses to show in default message list view, beyond which a '...' is shown."
-#: ../mail/evolution-mail.schemas.in.in.h:112
+#: ../mail/evolution-mail.schemas.in.h:134
+msgid "This setting specifies whether the threads should be in expanded or collapsed state by default. Evolution requires a restart."
+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:135
+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 restart."
+msgstr "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 restart."
+
+#: ../mail/evolution-mail.schemas.in.h:136
msgid "Thread the message list."
msgstr "Thread the message list."
-#: ../mail/evolution-mail.schemas.in.in.h:113
+#: ../mail/evolution-mail.schemas.in.h:137
msgid "Thread the message-list"
msgstr "Thread the message-list"
-#: ../mail/evolution-mail.schemas.in.in.h:114
+#: ../mail/evolution-mail.schemas.in.h:138
msgid "Thread the message-list based on Subject"
msgstr "Thread the message-list based on Subject"
-#: ../mail/evolution-mail.schemas.in.in.h:115
-msgid "Timeout for marking message as Seen"
-msgstr "Timeout for marking message as Seen"
+#: ../mail/evolution-mail.schemas.in.h:139
+msgid "Timeout for marking message as seen"
+msgstr "Timeout for marking message as seen"
-#: ../mail/evolution-mail.schemas.in.in.h:116
-msgid "Timeout for marking message as Seen."
-msgstr "Timeout for marking message as Seen."
+#: ../mail/evolution-mail.schemas.in.h:140
+msgid "Timeout for marking message as seen."
+msgstr "Timeout for marking message as seen."
-#: ../mail/evolution-mail.schemas.in.in.h:117
+#: ../mail/evolution-mail.schemas.in.h:141
msgid "UID string of the default account."
msgstr "UID string of the default account."
-#: ../mail/evolution-mail.schemas.in.in.h:118
+#: ../mail/evolution-mail.schemas.in.h:142
msgid "Use SpamAssassin daemon and client"
msgstr "Use SpamAssassin daemon and client"
-#: ../mail/evolution-mail.schemas.in.in.h:119
-msgid "Use SpamAssassin daemon and client (spamc/spamd)"
-msgstr "Use SpamAssassin daemon and client (spamc/spamd)"
+#: ../mail/evolution-mail.schemas.in.h:143
+msgid "Use SpamAssassin daemon and client (spamc/spamd)."
+msgstr "Use SpamAssassin daemon and client (spamc/spamd)."
-#: ../mail/evolution-mail.schemas.in.in.h:120
+#: ../mail/evolution-mail.schemas.in.h:144
msgid "Use custom fonts"
msgstr "Use custom fonts"
-#: ../mail/evolution-mail.schemas.in.in.h:121
-msgid "Use custom fonts for displaying mail"
-msgstr "Use custom fonts for displaying mail"
+#: ../mail/evolution-mail.schemas.in.h:145
+msgid "Use custom fonts for displaying mail."
+msgstr "Use custom fonts for displaying mail."
-#: ../mail/evolution-mail.schemas.in.in.h:122
+#: ../mail/evolution-mail.schemas.in.h:146
msgid "Use only local spam tests."
msgstr "Use only local spam tests."
-#: ../mail/evolution-mail.schemas.in.in.h:123
+#: ../mail/evolution-mail.schemas.in.h:147
msgid "Use only the local spam tests (no DNS)."
msgstr "Use only the local spam tests (no DNS)."
-#: ../mail/evolution-mail.schemas.in.in.h:124
+#: ../mail/evolution-mail.schemas.in.h:148
msgid "Use side-by-side or wide layout"
msgstr "Use side-by-side or wide layout"
-#: ../mail/evolution-mail.schemas.in.in.h:125
+#: ../mail/evolution-mail.schemas.in.h:149
msgid "Variable width font"
msgstr "Variable width font"
-#: ../mail/evolution-mail.schemas.in.in.h:126
+#: ../mail/evolution-mail.schemas.in.h:150
msgid "View/Bcc menu item is checked"
msgstr "View/Bcc menu item is checked"
-#: ../mail/evolution-mail.schemas.in.in.h:127
+#: ../mail/evolution-mail.schemas.in.h:151
msgid "View/Bcc menu item is checked."
msgstr "View/Bcc menu item is checked."
-#: ../mail/evolution-mail.schemas.in.in.h:128
+#: ../mail/evolution-mail.schemas.in.h:152
msgid "View/Cc menu item is checked"
msgstr "View/Cc menu item is checked"
-#: ../mail/evolution-mail.schemas.in.in.h:129
+#: ../mail/evolution-mail.schemas.in.h:153
msgid "View/Cc menu item is checked."
msgstr "View/Cc menu item is checked."
-#: ../mail/evolution-mail.schemas.in.in.h:130
+#: ../mail/evolution-mail.schemas.in.h:154
msgid "View/From menu item is checked"
msgstr "View/From menu item is checked"
-#: ../mail/evolution-mail.schemas.in.in.h:131
+#: ../mail/evolution-mail.schemas.in.h:155
msgid "View/From menu item is checked."
msgstr "View/From menu item is checked."
-#: ../mail/evolution-mail.schemas.in.in.h:132
+#: ../mail/evolution-mail.schemas.in.h:156
msgid "View/PostTo menu item is checked"
msgstr "View/PostTo menu item is checked"
-#: ../mail/evolution-mail.schemas.in.in.h:133
+#: ../mail/evolution-mail.schemas.in.h:157
msgid "View/PostTo menu item is checked."
msgstr "View/PostTo menu item is checked."
-#: ../mail/evolution-mail.schemas.in.in.h:134
+#: ../mail/evolution-mail.schemas.in.h:158
msgid "View/ReplyTo menu item is checked"
msgstr "View/ReplyTo menu item is checked"
-#: ../mail/evolution-mail.schemas.in.in.h:135
+#: ../mail/evolution-mail.schemas.in.h:159
msgid "View/ReplyTo menu item is checked."
msgstr "View/ReplyTo menu item is checked."
-#: ../mail/evolution-mail.schemas.in.in.h:136
+#: ../mail/evolution-mail.schemas.in.h:160
+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:161
msgid "Whether or not to fall back on threading by subjects when the messages do not contain In-Reply-To or References headers."
msgstr "Whether or not to fall back on threading by subjects when the messages do not contain In-Reply-To or References headers."
-#: ../mail/evolution-mail.schemas.in.in.h:137
+#: ../mail/evolution-mail.schemas.in.h:162
+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:163
msgid "Width of the message-list pane"
msgstr "Width of the message-list pane"
-#: ../mail/evolution-mail.schemas.in.in.h:138
+#: ../mail/evolution-mail.schemas.in.h:164
msgid "Width of the message-list pane."
msgstr "Width of the message-list pane."
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:1
-msgid "Composer Preferences"
-msgstr "Composer Preferences"
-
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:2
-msgid "Configure mail preferences, including security and message display, here"
-msgstr "Configure mail preferences, including security and message display, here"
-
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:3
-msgid "Configure spell-checking, signatures, and the message composer here"
-msgstr "Configure spell-checking, signatures, and the message composer here"
-
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:4
-msgid "Configure your email accounts here"
-msgstr "Configure your email accounts here"
-
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:5
-msgid "Evolution Mail"
-msgstr "Evolution Mail"
-
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:6
-msgid "Evolution Mail accounts configuration control"
-msgstr "Evolution Mail accounts configuration control"
-
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:7
-msgid "Evolution Mail component"
-msgstr "Evolution Mail component"
-
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:8
-msgid "Evolution Mail composer"
-msgstr "Evolution Mail composer"
-
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:9
-msgid "Evolution Mail composer configuration control"
-msgstr "Evolution Mail composer configuration control"
-
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:10
-msgid "Evolution Mail preferences control"
-msgstr "Evolution Mail preferences control"
-
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:13
-#: ../mail/mail-config.glade.h:98
-msgid "Mail Preferences"
-msgstr "Mail Preferences"
-
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:14
-msgid "_Mail"
-msgstr "_Mail"
-
-#: ../mail/importers/elm-importer.c:192
+#: ../mail/importers/elm-importer.c:184
msgid "Importing Elm data"
msgstr "Importing Elm data"
-#: ../mail/importers/elm-importer.c:381
+#: ../mail/importers/elm-importer.c:369
msgid "Evolution Elm importer"
msgstr "Evolution Elm importer"
-#: ../mail/importers/elm-importer.c:382
+#: ../mail/importers/elm-importer.c:370
msgid "Import mail from Elm."
msgstr "Import mail from Elm."
#: ../mail/importers/evolution-mbox-importer.c:83
-#: ../mail/importers/evolution-outlook-importer.c:136
msgid "Destination folder:"
msgstr "Destination folder:"
#: ../mail/importers/evolution-mbox-importer.c:86
-#: ../mail/importers/evolution-outlook-importer.c:139
msgid "Select folder to import into"
msgstr "Select folder to import into"
@@ -12833,120 +12924,30 @@ msgstr "Berkeley Mailbox (mbox)"
msgid "Importer Berkeley Mailbox format folders"
msgstr "Importer Berkeley Mailbox format folders"
-#: ../mail/importers/evolution-outlook-importer.c:262
-#: ../mail/importers/mail-importer.c:233
-#: ../shell/e-shell-importer.c:515
-#, c-format
-msgid "Importing `%s'"
-msgstr "Importing `%s'"
-
-#: ../mail/importers/evolution-outlook-importer.c:266
-#: ../mail/importers/netscape-importer.c:1254
-#: ../plugins/startup-wizard/startup-wizard.c:233
-#: ../shell/e-shell-importer.c:522
-msgid "Please wait"
-msgstr "Please wait"
-
-#: ../mail/importers/evolution-outlook-importer.c:310
#: ../mail/importers/mail-importer.c:148
msgid "Importing mailbox"
msgstr "Importing mailbox"
-#: ../mail/importers/mail-importer.c:376
+#: ../mail/importers/mail-importer.c:232
+#: ../shell/e-shell-importer.c:518
#, c-format
-msgid "Scanning %s"
-msgstr "Scanning %s"
+msgid "Importing `%s'"
+msgstr "Importing `%s'"
-#: ../mail/importers/netscape-importer.c:74
+#: ../mail/importers/mail-importer.c:372
#, c-format
-msgid "Priority Filter \"%s\""
-msgstr "Priority Filter \"%s\""
-
-#: ../mail/importers/netscape-importer.c:663
-msgid ""
-"Some of your Netscape email filters are based on\n"
-"email priorities, which are not used in Evolution.\n"
-"Instead, Evolution provides scores in the range of\n"
-"-3 to 3 that can be assigned to emails and filtered\n"
-"accordingly.\n"
-"\n"
-"As a workaround, a set of filters called \"Priority Filter\"\n"
-"was added that converts Netscape's email priorities into\n"
-"Evolution's scores, and the affected filters use scores instead\n"
-"of priorities. Check the imported filters to make sure\n"
-"everything still works as intended."
-msgstr ""
-"Some of your Netscape email filters are based on\n"
-"email priorities, which are not used in Evolution.\n"
-"Instead, Evolution provides scores in the range of\n"
-"-3 to 3 that can be assigned to emails and filtered\n"
-"accordingly.\n"
-"\n"
-"As a workaround, a set of filters called \"Priority Filter\"\n"
-"was added that converts Netscape's email priorities into\n"
-"Evolution's scores, and the affected filters use scores instead\n"
-"of priorities. Check the imported filters to make sure\n"
-"everything still works as intended."
-
-#: ../mail/importers/netscape-importer.c:687
-msgid ""
-"Some of your Netscape email filters use\n"
-"the \"Ignore Thread\" or \"Watch Thread\"\n"
-"feature, which is not supported in Evolution.\n"
-"These filters will be dropped."
-msgstr ""
-"Some of your Netscape email filters use\n"
-"the \"Ignore Thread\" or \"Watch Thread\"\n"
-"feature, which is not supported in Evolution.\n"
-"These filters will be dropped."
-
-#: ../mail/importers/netscape-importer.c:704
-msgid ""
-"Some of your Netscape email filters test the\n"
-"body of emails for (in)equality to a given string,\n"
-"which is not supported in Evolution. Those filters\n"
-"were modified to test whether that string is or is not\n"
-"contained in the message body."
-msgstr ""
-"Some of your Netscape email filters test the\n"
-"body of emails for (in)equality to a given string,\n"
-"which is not supported in Evolution. Those filters\n"
-"were modified to test whether that string is or is not\n"
-"contained in the message body."
-
-#: ../mail/importers/netscape-importer.c:1251
-msgid "Evolution is importing your old Netscape data"
-msgstr "Evolution is importing your old Netscape data"
-
-#: ../mail/importers/netscape-importer.c:1708
-msgid "Importing Netscape data"
-msgstr "Importing Netscape data"
-
-#: ../mail/importers/netscape-importer.c:1908
-msgid "Settings"
-msgstr "Settings"
-
-#: ../mail/importers/netscape-importer.c:1913
-msgid "Mail Filters"
-msgstr "Mail Filters"
-
-#: ../mail/importers/netscape-importer.c:1934
-msgid ""
-"Evolution has found Netscape mail files.\n"
-"Would you like them to be imported into Evolution?"
-msgstr ""
-"Evolution has found Netscape mail files.\n"
-"Would you like them to be imported into Evolution?"
+msgid "Scanning %s"
+msgstr "Scanning %s"
#: ../mail/importers/pine-importer.c:229
msgid "Importing Pine data"
msgstr "Importing Pine data"
-#: ../mail/importers/pine-importer.c:433
+#: ../mail/importers/pine-importer.c:428
msgid "Evolution Pine importer"
msgstr "Evolution Pine importer"
-#: ../mail/importers/pine-importer.c:434
+#: ../mail/importers/pine-importer.c:429
msgid "Import mail from Pine."
msgstr "Import mail from Pine."
@@ -12975,320 +12976,355 @@ msgstr "%s mailing list"
msgid "Add Filter Rule"
msgstr "Add Filter Rule"
-#: ../mail/mail-component.c:524
+#: ../mail/mail-component.c:533
+#, c-format
+msgid "%d selected, "
+msgid_plural "%d selected, "
+msgstr[0] "%d selected, "
+msgstr[1] "%d selected, "
+
+#: ../mail/mail-component.c:537
#, c-format
msgid "%d deleted"
msgid_plural "%d deleted"
msgstr[0] "%d deleted"
msgstr[1] "%d deleted"
-#: ../mail/mail-component.c:526
+#: ../mail/mail-component.c:539
#, c-format
msgid "%d junk"
msgid_plural "%d junk"
msgstr[0] "%d junk"
msgstr[1] "%d junk"
-#: ../mail/mail-component.c:549
-#, c-format
-msgid "%d selected, "
-msgid_plural "%d selected, "
-msgstr[0] "%d selected, "
-msgstr[1] "%d selected, "
-
-#: ../mail/mail-component.c:552
+#: ../mail/mail-component.c:542
#, c-format
msgid "%d draft"
msgid_plural "%d drafts"
msgstr[0] "%d draft"
msgstr[1] "%d drafts"
-#: ../mail/mail-component.c:554
+#: ../mail/mail-component.c:544
#, c-format
msgid "%d sent"
msgid_plural "%d sent"
msgstr[0] "%d sent"
msgstr[1] "%d sent"
-#: ../mail/mail-component.c:556
+#: ../mail/mail-component.c:546
#, c-format
msgid "%d unsent"
msgid_plural "%d unsent"
msgstr[0] "%d unsent"
msgstr[1] "%d unsent"
-#: ../mail/mail-component.c:561
+#: ../mail/mail-component.c:552
#, c-format
msgid "%d unread, "
msgid_plural "%d unread, "
msgstr[0] "%d unread, "
msgstr[1] "%d unread, "
-#: ../mail/mail-component.c:562
+#: ../mail/mail-component.c:553
#, c-format
msgid "%d total"
msgid_plural "%d total"
msgstr[0] "%d total"
msgstr[1] "%d total"
-#: ../mail/mail-component.c:889
+#: ../mail/mail-component.c:890
msgid "New Mail Message"
msgstr "New Mail Message"
-#: ../mail/mail-component.c:890
+#: ../mail/mail-component.c:891
msgid "_Mail Message"
msgstr "_Mail Message"
-#: ../mail/mail-component.c:891
+#: ../mail/mail-component.c:892
msgid "Compose a new mail message"
msgstr "Compose a new mail message"
-#: ../mail/mail-component.c:897
+#: ../mail/mail-component.c:898
msgid "New Mail Folder"
msgstr "New Mail Folder"
-#: ../mail/mail-component.c:898
+#: ../mail/mail-component.c:899
msgid "Mail _Folder"
msgstr "Mail _Folder"
-#: ../mail/mail-component.c:899
+#: ../mail/mail-component.c:900
msgid "Create a new mail folder"
msgstr "Create a new mail folder"
-#: ../mail/mail-component.c:1045
+#: ../mail/mail-component.c:1047
msgid "Failed upgrading Mail settings or folders."
msgstr "Failed upgrading Mail settings or folders."
-#: ../mail/mail-config.c:81
-msgid "I_mportant"
-msgstr "I_mportant"
+#: ../mail/mail-component.c:1516
+msgid "Error"
+msgstr "Error"
-#. red
-#: ../mail/mail-config.c:82
-msgid "_Work"
-msgstr "_Work"
+#: ../mail/mail-component.c:1516
+msgid "Errors"
+msgstr "Errors"
-#. orange
-#: ../mail/mail-config.c:83
-msgid "_Personal"
-msgstr "_Personal"
+#: ../mail/mail-component.c:1517
+msgid "Warnings and Errors"
+msgstr "Warnings and Errors"
-#. forest green
-#: ../mail/mail-config.c:84
-msgid "_To Do"
-msgstr "_To Do"
+#: ../mail/mail-component.c:1518
+msgid "Debug"
+msgstr "Debug"
-#. blue
-#: ../mail/mail-config.c:85
-msgid "_Later"
-msgstr "_Later"
+#: ../mail/mail-component.c:1518
+msgid "Error, Warnings and Debug messages"
+msgstr "Error, Warnings and Debug messages"
+
+#: ../mail/mail-component.c:1628
+msgid "Debug Logs"
+msgstr "Debug Logs"
+
+#: ../mail/mail-component.c:1632
+msgid "Show _errors in the status bar for"
+msgstr "Show _errors in the status bar for"
+
+#: ../mail/mail-component.c:1639
+msgid "seconds."
+msgstr "seconds."
+
+#: ../mail/mail-component.c:1649
+msgid "Log Messages:"
+msgstr "Log Messages:"
+
+#: ../mail/mail-component.c:1701
+msgid "Log Level"
+msgstr "Log Level"
+
+#: ../mail/mail-component.c:1708
+#: ../widgets/misc/e-dateedit.c:410
+msgid "Time"
+msgstr "Time"
+
+#: ../mail/mail-component.c:1715
+#: ../mail/message-list.c:2403
+#: ../mail/message-list.etspec.h:10
+msgid "Messages"
+msgstr "Messages"
#: ../mail/mail-config.glade.h:1
msgid " Ch_eck for Supported Types "
msgstr " Ch_eck for Supported Types "
-#: ../mail/mail-config.glade.h:3
+#: ../mail/mail-config.glade.h:2
+msgid "(Note: Requires restart of the application)"
+msgstr "(Note: Requires restart of the application)"
+
+#: ../mail/mail-config.glade.h:4
msgid "<b>SSL is not supported in this build of Evolution</b>"
msgstr "<b>SSL is not supported in this build of Evolution</b>"
-#: ../mail/mail-config.glade.h:4
+#: ../mail/mail-config.glade.h:5
+msgid "<b>Sender Photograph</b>"
+msgstr "<b>Sender Photograph</b>"
+
+#: ../mail/mail-config.glade.h:6
msgid "<b>Sig_natures</b>"
msgstr "<b>Sig_natures</b>"
-#: ../mail/mail-config.glade.h:5
+#: ../mail/mail-config.glade.h:7
+msgid "<b>Top Posting Option</b> (Not Recommended)"
+msgstr "<b>Top Posting Option</b> (Not Recommended)"
+
+#: ../mail/mail-config.glade.h:8
msgid "<b>_Languages</b>"
msgstr "<b>_Languages</b>"
-#: ../mail/mail-config.glade.h:6
+#: ../mail/mail-config.glade.h:9
msgid "<span weight=\"bold\">Account Information</span>"
msgstr "<span weight=\"bold\">Account Information</span>"
-#: ../mail/mail-config.glade.h:8
-msgid "<span weight=\"bold\">Authentication Type</span>"
-msgstr "<span weight=\"bold\">Authentication Type</span>"
-
-#: ../mail/mail-config.glade.h:9
+#: ../mail/mail-config.glade.h:11
msgid "<span weight=\"bold\">Authentication</span>"
msgstr "<span weight=\"bold\">Authentication</span>"
-#: ../mail/mail-config.glade.h:10
+#: ../mail/mail-config.glade.h:12
msgid "<span weight=\"bold\">Composing Messages</span>"
msgstr "<span weight=\"bold\">Composing Messages</span>"
-#: ../mail/mail-config.glade.h:11
+#: ../mail/mail-config.glade.h:13
msgid "<span weight=\"bold\">Configuration</span>"
msgstr "<span weight=\"bold\">Configuration</span>"
-#: ../mail/mail-config.glade.h:12
+#: ../mail/mail-config.glade.h:14
msgid "<span weight=\"bold\">Default Behavior</span>"
msgstr "<span weight=\"bold\">Default Behavior</span>"
-#: ../mail/mail-config.glade.h:13
+#: ../mail/mail-config.glade.h:15
msgid "<span weight=\"bold\">Delete Mail</span>"
msgstr "<span weight=\"bold\">Delete Mail</span>"
-#: ../mail/mail-config.glade.h:14
-msgid "<span weight=\"bold\">Displayed Mail _Headers</span>"
-msgstr "<span weight=\"bold\">Displayed Mail _Headers</span>"
-
#: ../mail/mail-config.glade.h:16
-msgid "<span weight=\"bold\">Labels and Colors</span>"
-msgstr "<span weight=\"bold\">Labels and Colours</span>"
+msgid "<span weight=\"bold\">Displayed Message _Headers</span>"
+msgstr "<span weight=\"bold\">Displayed Message _Headers</span>"
-#: ../mail/mail-config.glade.h:17
+#: ../mail/mail-config.glade.h:18
+msgid "<span weight=\"bold\">Labels</span>"
+msgstr "<span weight=\"bold\">Labels</span>"
+
+#: ../mail/mail-config.glade.h:19
msgid "<span weight=\"bold\">Loading Images</span>"
msgstr "<span weight=\"bold\">Loading Images</span>"
-#: ../mail/mail-config.glade.h:18
+#: ../mail/mail-config.glade.h:20
msgid "<span weight=\"bold\">Message Display</span>"
msgstr "<span weight=\"bold\">Message Display</span>"
-#: ../mail/mail-config.glade.h:19
+#: ../mail/mail-config.glade.h:21
msgid "<span weight=\"bold\">Message Fonts</span>"
msgstr "<span weight=\"bold\">Message Fonts</span>"
-#: ../mail/mail-config.glade.h:20
+#: ../mail/mail-config.glade.h:22
msgid "<span weight=\"bold\">Message Receipts</span>"
msgstr "<span weight=\"bold\">Message Receipts</span>"
-#: ../mail/mail-config.glade.h:21
-msgid "<span weight=\"bold\">New Mail Notification</span>"
-msgstr "<span weight=\"bold\">New Mail Notification</span>"
-
-#: ../mail/mail-config.glade.h:22
+#: ../mail/mail-config.glade.h:23
#: ../plugins/publish-calendar/publish-calendar.glade.h:3
msgid "<span weight=\"bold\">Optional Information</span>"
msgstr "<span weight=\"bold\">Optional Information</span>"
-#: ../mail/mail-config.glade.h:23
+#: ../mail/mail-config.glade.h:24
msgid "<span weight=\"bold\">Options</span>"
msgstr "<span weight=\"bold\">Options</span>"
-#: ../mail/mail-config.glade.h:24
+#: ../mail/mail-config.glade.h:25
msgid "<span weight=\"bold\">Pretty Good Privacy (PGP/GPG)</span>"
msgstr "<span weight=\"bold\">Pretty Good Privacy (PGP/GPG)</span>"
-#: ../mail/mail-config.glade.h:25
+#: ../mail/mail-config.glade.h:26
msgid "<span weight=\"bold\">Printed Fonts</span>"
msgstr "<span weight=\"bold\">Printed Fonts</span>"
-#: ../mail/mail-config.glade.h:26
+#: ../mail/mail-config.glade.h:27
msgid "<span weight=\"bold\">Required Information</span>"
msgstr "<span weight=\"bold\">Required Information</span>"
-#: ../mail/mail-config.glade.h:27
+#: ../mail/mail-config.glade.h:28
msgid "<span weight=\"bold\">Secure MIME (S/MIME)</span>"
msgstr "<span weight=\"bold\">Secure MIME (S/MIME)</span>"
-#: ../mail/mail-config.glade.h:28
+#: ../mail/mail-config.glade.h:29
msgid "<span weight=\"bold\">Security</span>"
msgstr "<span weight=\"bold\">Security</span>"
-#: ../mail/mail-config.glade.h:29
+#: ../mail/mail-config.glade.h:30
msgid "<span weight=\"bold\">Sent and Draft Messages</span>"
msgstr "<span weight=\"bold\">Sent and Draft Messages</span>"
-#: ../mail/mail-config.glade.h:30
+#: ../mail/mail-config.glade.h:31
msgid "<span weight=\"bold\">Server Configuration</span>"
msgstr "<span weight=\"bold\">Server Configuration</span>"
#: ../mail/mail-config.glade.h:32
+msgid "<span weight=\"bold\">_Authentication Type</span>"
+msgstr "<span weight=\"bold\">_Authentication Type</span>"
+
+#: ../mail/mail-config.glade.h:34
msgid "Account Management"
msgstr "Account Management"
-#: ../mail/mail-config.glade.h:33
+#: ../mail/mail-config.glade.h:35
msgid "Add Ne_w Signature..."
msgstr "Add Ne_w Signature..."
-#: ../mail/mail-config.glade.h:34
+#: ../mail/mail-config.glade.h:36
msgid "Add _Script"
msgstr "Add _Script"
-#: ../mail/mail-config.glade.h:35
+#: ../mail/mail-config.glade.h:37
msgid "Al_ways sign outgoing messages when using this account"
msgstr "Al_ways sign outgoing messages when using this account"
-#: ../mail/mail-config.glade.h:36
-msgid "Also encrypt to sel_f when sending encrypted mail"
-msgstr "Also encrypt to sel_f when sending encrypted mail"
+#: ../mail/mail-config.glade.h:38
+msgid "Also encrypt to sel_f when sending encrypted messages"
+msgstr "Also encrypt to sel_f when sending encrypted messages"
-#: ../mail/mail-config.glade.h:37
+#: ../mail/mail-config.glade.h:39
msgid "Alway_s carbon-copy (cc) to:"
msgstr "Alway_s carbon-copy (cc) to:"
-#: ../mail/mail-config.glade.h:38
+#: ../mail/mail-config.glade.h:40
msgid "Always _blind carbon-copy (bcc) to:"
msgstr "Always _blind carbon-copy (bcc) to:"
-#: ../mail/mail-config.glade.h:39
+#: ../mail/mail-config.glade.h:41
msgid "Always _trust keys in my keyring when encrypting"
msgstr "Always _trust keys in my keyring when encrypting"
-#: ../mail/mail-config.glade.h:40
-msgid "Always encrypt to _myself when sending encrypted mail"
-msgstr "Always encrypt to _myself when sending encrypted mail"
+#: ../mail/mail-config.glade.h:42
+msgid "Always encrypt to _myself when sending encrypted messages"
+msgstr "Always encrypt to _myself when sending encrypted messages"
-#: ../mail/mail-config.glade.h:41
+#: ../mail/mail-config.glade.h:43
+msgid "Always request rea_d receipt"
+msgstr "Always request rea_d receipt"
+
+#: ../mail/mail-config.glade.h:44
msgid "Attach original message"
msgstr "Attach original message"
-#: ../mail/mail-config.glade.h:43
-msgid "Automatically insert _smiley images"
-msgstr "Automatically insert _smiley images"
+#: ../mail/mail-config.glade.h:46
+msgid "Automatically insert _emoticon images"
+msgstr "Automatically insert _emoticon images"
-#: ../mail/mail-config.glade.h:44
+#: ../mail/mail-config.glade.h:47
msgid "Baltic (ISO-8859-13)"
msgstr "Baltic (ISO-8859-13)"
-#: ../mail/mail-config.glade.h:45
+#: ../mail/mail-config.glade.h:48
msgid "Baltic (ISO-8859-4)"
msgstr "Baltic (ISO-8859-4)"
-#: ../mail/mail-config.glade.h:46
-msgid "Beep w_hen new mail arrives"
-msgstr "Beep w_hen new mail arrives"
-
-#: ../mail/mail-config.glade.h:47
+#: ../mail/mail-config.glade.h:49
msgid "C_haracter set:"
msgstr "C_haracter set:"
-#: ../mail/mail-config.glade.h:48
+#: ../mail/mail-config.glade.h:50
+msgid "C_heck custom headers for junk"
+msgstr "C_heck custom headers for junk"
+
+#: ../mail/mail-config.glade.h:51
msgid "Ch_eck for Supported Types "
msgstr "Ch_eck for Supported Types "
-#: ../mail/mail-config.glade.h:49
-msgid "Check in_coming mail for junk"
-msgstr "Check in_coming mail for junk"
+#: ../mail/mail-config.glade.h:52
+msgid "Check incoming _messages for junk"
+msgstr "Check incoming _messages for junk"
-#: ../mail/mail-config.glade.h:50
+#: ../mail/mail-config.glade.h:53
msgid "Check spelling while I _type"
msgstr "Check spelling while I _type"
-#: ../mail/mail-config.glade.h:51
+#: ../mail/mail-config.glade.h:54
msgid "Checks incoming mail messages to be Junk"
msgstr "Checks incoming mail messages to be Junk"
-#: ../mail/mail-config.glade.h:52
+#: ../mail/mail-config.glade.h:55
msgid "Cle_ar"
msgstr "Cle_ar"
-#: ../mail/mail-config.glade.h:53
+#: ../mail/mail-config.glade.h:56
msgid "Clea_r"
msgstr "Clea_r"
-#: ../mail/mail-config.glade.h:54
+#: ../mail/mail-config.glade.h:57
msgid "Color for _misspelled words:"
msgstr "Colour for _misspelled words:"
-#: ../mail/mail-config.glade.h:55
-msgid "Colors"
-msgstr "Colours"
-
-#: ../mail/mail-config.glade.h:56
+#: ../mail/mail-config.glade.h:58
msgid "Confirm _when expunging a folder"
msgstr "Confirm _when expunging a folder"
-#: ../mail/mail-config.glade.h:57
+#: ../mail/mail-config.glade.h:59
msgid ""
"Congratulations, your mail configuration is complete.\n"
"\n"
@@ -13304,140 +13340,156 @@ msgstr ""
"\n"
"Click \"Apply\" to save your settings."
-#: ../mail/mail-config.glade.h:63
+#: ../mail/mail-config.glade.h:65
msgid "De_fault"
msgstr "De_fault"
-#: ../mail/mail-config.glade.h:64
+#: ../mail/mail-config.glade.h:66
msgid "Default character e_ncoding:"
msgstr "Default character e_ncoding:"
-#: ../mail/mail-config.glade.h:66
-msgid "Delete junk mails on e_xit"
-msgstr "Delete junk mails on e_xit"
-
#: ../mail/mail-config.glade.h:68
-msgid "Digitally _sign outgoing messages (by default)"
-msgstr "Digitally _sign outgoing messages (by default)"
-
-#: ../mail/mail-config.glade.h:69
-msgid "Do not format text contents in mails if the text si_ze exceeds"
-msgstr "Do not format text contents in mails if the text si_ze exceeds"
+msgid "Delete junk messages on e_xit"
+msgstr "Delete junk messages on e_xit"
#: ../mail/mail-config.glade.h:70
+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 mark messages as junk if sender is in my addressbook"
+msgstr "Do _not mark messages as junk if sender is in my addressbook"
+
+#: ../mail/mail-config.glade.h:72
+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"
+
+#: ../mail/mail-config.glade.h:73
msgid "Do not quote original message"
msgstr "Do not quote original message"
-#: ../mail/mail-config.glade.h:71
+#: ../mail/mail-config.glade.h:74
msgid "Done"
msgstr "Done"
-#: ../mail/mail-config.glade.h:72
+#: ../mail/mail-config.glade.h:75
msgid "Drafts _Folder:"
msgstr "Drafts _Folder:"
-#: ../mail/mail-config.glade.h:73
-#: ../plugins/publish-calendar/publish-calendar.glade.h:9
-msgid "E_nable"
-msgstr "E_nable"
-
-#: ../mail/mail-config.glade.h:74
+#: ../mail/mail-config.glade.h:76
msgid "Email Accounts"
msgstr "Email Accounts"
-#: ../mail/mail-config.glade.h:75
+#: ../mail/mail-config.glade.h:77
msgid "Email _Address:"
msgstr "Email _Address:"
-#: ../mail/mail-config.glade.h:76
+#: ../mail/mail-config.glade.h:78
msgid "Empty trash folders on e_xit"
msgstr "Empty trash folders on e_xit"
-#: ../mail/mail-config.glade.h:77
+#: ../mail/mail-config.glade.h:79
+msgid "Enable Magic S_pacebar "
+msgstr "Enable Magic S_pacebar "
+
+#: ../mail/mail-config.glade.h:80
+msgid "Enable Sea_rch Folders"
+msgstr "Enable Sea_rch Folders"
+
+#: ../mail/mail-config.glade.h:81
msgid "Encry_ption certificate:"
msgstr "Encry_ption certificate:"
-#: ../mail/mail-config.glade.h:78
+#: ../mail/mail-config.glade.h:82
msgid "Encrypt out_going messages (by default)"
msgstr "Encrypt out_going messages (by default)"
-#: ../mail/mail-config.glade.h:80
-msgid "Fi_xed width Font:"
-msgstr "Fi_xed width Font:"
-
-#: ../mail/mail-config.glade.h:81
+#: ../mail/mail-config.glade.h:84
msgid "Fi_xed-width:"
msgstr "Fi_xed-width:"
-#: ../mail/mail-config.glade.h:82
+#: ../mail/mail-config.glade.h:85
+msgid "Fix_ed width Font:"
+msgstr "Fix_ed width Font:"
+
+#: ../mail/mail-config.glade.h:86
msgid "Font Properties"
msgstr "Font Properties"
-#: ../mail/mail-config.glade.h:83
+#: ../mail/mail-config.glade.h:87
msgid "Format messages in _HTML"
msgstr "Format messages in _HTML"
-#: ../mail/mail-config.glade.h:84
+#: ../mail/mail-config.glade.h:88
msgid "Full Nam_e:"
msgstr "Full Nam_e:"
-#: ../mail/mail-config.glade.h:86
-msgid "HTML Mail"
-msgstr "HTML Mail"
+#: ../mail/mail-config.glade.h:90
+msgid "HTML Messages"
+msgstr "HTML Messages"
-#: ../mail/mail-config.glade.h:87
+#: ../mail/mail-config.glade.h:91
msgid "Headers"
msgstr "Headers"
-#: ../mail/mail-config.glade.h:88
+#: ../mail/mail-config.glade.h:92
msgid "Highlight _quotations with"
msgstr "Highlight _quotations with"
-#: ../mail/mail-config.glade.h:91
+#: ../mail/mail-config.glade.h:94
msgid "Inline"
msgstr "Inline"
-#: ../mail/mail-config.glade.h:93
+#: ../mail/mail-config.glade.h:95
+msgid "Inline original message (Outlook style)"
+msgstr "Inline original message (Outlook style)"
+
+#: ../mail/mail-config.glade.h:97
msgid "KB"
msgstr "KB"
-#: ../mail/mail-config.glade.h:94
+#: ../mail/mail-config.glade.h:98
+#: ../mail/message-list.etspec.h:8
+msgid "Labels"
+msgstr "Labels"
+
+#: ../mail/mail-config.glade.h:99
msgid "Languages Table"
msgstr "Languages Table"
-#: ../mail/mail-config.glade.h:96
+#: ../mail/mail-config.glade.h:100
msgid "Mail Configuration"
msgstr "Mail Configuration"
-#: ../mail/mail-config.glade.h:97
+#: ../mail/mail-config.glade.h:101
msgid "Mail Headers Table"
msgstr "Mail Headers Table"
-#: ../mail/mail-config.glade.h:99
+#: ../mail/mail-config.glade.h:103
msgid "Mailbox location"
msgstr "Mailbox location"
-#: ../mail/mail-config.glade.h:100
+#: ../mail/mail-config.glade.h:104
msgid "Message Composer"
msgstr "Message Composer"
-#: ../mail/mail-config.glade.h:101
+#: ../mail/mail-config.glade.h:105
+msgid "Note: Underscore in the label name is used as mnemonic identifier in menu."
+msgstr "Note: Underscore in the label name is used as mnemonic identifier in menu."
+
+#: ../mail/mail-config.glade.h:106
msgid "Note: you will not be prompted for a password until you connect for the first time"
msgstr "Note: you will not be prompted for a password until you connect for the first time"
-#: ../mail/mail-config.glade.h:102
+#: ../mail/mail-config.glade.h:107
msgid "Or_ganization:"
msgstr "Or_ganisation:"
-#: ../mail/mail-config.glade.h:103
+#: ../mail/mail-config.glade.h:108
msgid "PGP/GPG _Key ID:"
msgstr "PGP/GPG _Key ID:"
-#: ../mail/mail-config.glade.h:106
-msgid "Play sound file when new mail arri_ves"
-msgstr "Play sound file when new mail arri_ves"
-
-#: ../mail/mail-config.glade.h:107
+#: ../mail/mail-config.glade.h:110
msgid ""
"Please enter a descriptive name for this account in the space below.\n"
"This name will be used for display purposes only."
@@ -13445,127 +13497,119 @@ 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:109
+#: ../mail/mail-config.glade.h:112
msgid "Please enter information about the way you will send mail. If you are not sure, ask your system administrator or Internet Service Provider."
msgstr "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:110
+#: ../mail/mail-config.glade.h:113
msgid "Please enter your name and email address below. The \"optional\" fields below do not need to be filled in, unless you wish to include this information in email you send."
msgstr "Please enter your name and email address below. The \"optional\" fields below do not need to be filled in, unless you wish to include this information in email you send."
-#: ../mail/mail-config.glade.h:111
+#: ../mail/mail-config.glade.h:114
msgid "Please select among the following options"
msgstr "Please select among the following options"
-#: ../mail/mail-config.glade.h:112
+#: ../mail/mail-config.glade.h:115
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:113
+#: ../mail/mail-config.glade.h:116
msgid "Quote original message"
msgstr "Quote original message"
-#: ../mail/mail-config.glade.h:114
+#: ../mail/mail-config.glade.h:117
msgid "Quoted"
msgstr "Quoted"
-#: ../mail/mail-config.glade.h:115
+#: ../mail/mail-config.glade.h:118
msgid "Re_member password"
msgstr "Re_member password"
-#: ../mail/mail-config.glade.h:116
+#: ../mail/mail-config.glade.h:119
msgid "Re_ply-To:"
msgstr "Re_ply-To:"
-#: ../mail/mail-config.glade.h:118
+#: ../mail/mail-config.glade.h:121
msgid "Remember _password"
msgstr "Remember _password"
-#: ../mail/mail-config.glade.h:119
+#: ../mail/mail-config.glade.h:122
+msgid "S_earch for sender photograph only in local addressbooks"
+msgstr "S_earch for sender photograph only in local addressbooks"
+
+#: ../mail/mail-config.glade.h:123
msgid "S_elect..."
msgstr "S_elect..."
-#: ../mail/mail-config.glade.h:120
+#: ../mail/mail-config.glade.h:124
msgid "S_end message receipts:"
msgstr "S_end message receipts:"
-#: ../mail/mail-config.glade.h:121
+#: ../mail/mail-config.glade.h:125
msgid "S_tandard Font:"
msgstr "S_tandard Font:"
-#: ../mail/mail-config.glade.h:122
-msgid "Se_lect..."
-msgstr "Se_lect..."
-
-#: ../mail/mail-config.glade.h:124
+#: ../mail/mail-config.glade.h:127
msgid "Select HTML fixed width font"
msgstr "Select HTML fixed width font"
-#: ../mail/mail-config.glade.h:125
+#: ../mail/mail-config.glade.h:128
msgid "Select HTML fixed width font for printing"
msgstr "Select HTML fixed width font for printing"
-#: ../mail/mail-config.glade.h:126
+#: ../mail/mail-config.glade.h:129
msgid "Select HTML variable width font"
msgstr "Select HTML variable width font"
-#: ../mail/mail-config.glade.h:127
+#: ../mail/mail-config.glade.h:130
msgid "Select HTML variable width font for printing"
msgstr "Select HTML variable width font for printing"
-#: ../mail/mail-config.glade.h:128
-msgid "Select sound file"
-msgstr "Select sound file"
-
-#: ../mail/mail-config.glade.h:130
+#: ../mail/mail-config.glade.h:132
msgid "Sending Mail"
msgstr "Sending Mail"
-#: ../mail/mail-config.glade.h:131
+#: ../mail/mail-config.glade.h:133
msgid "Sent _Messages Folder:"
msgstr "Sent _Messages Folder:"
-#: ../mail/mail-config.glade.h:132
+#: ../mail/mail-config.glade.h:134
msgid "Ser_ver requires authentication"
msgstr "Ser_ver requires authentication"
-#: ../mail/mail-config.glade.h:133
+#: ../mail/mail-config.glade.h:135
msgid "Server _Type: "
msgstr "Server _Type: "
-#: ../mail/mail-config.glade.h:134
+#: ../mail/mail-config.glade.h:136
msgid "Sig_ning certificate:"
msgstr "Sig_ning certificate:"
-#: ../mail/mail-config.glade.h:135
+#: ../mail/mail-config.glade.h:137
msgid "Signat_ure:"
msgstr "Signat_ure:"
-#: ../mail/mail-config.glade.h:136
+#: ../mail/mail-config.glade.h:138
msgid "Signatures"
msgstr "Signatures"
-#: ../mail/mail-config.glade.h:137
+#: ../mail/mail-config.glade.h:139
msgid "Signatures Table"
msgstr "Signatures Table"
-#: ../mail/mail-config.glade.h:138
-msgid "Specify _filename:"
-msgstr "Specify _filename:"
-
-#: ../mail/mail-config.glade.h:139
+#: ../mail/mail-config.glade.h:140
msgid "Spell Checking"
msgstr "Spell Checking"
-#: ../mail/mail-config.glade.h:140
+#: ../mail/mail-config.glade.h:141
msgid "T_ype: "
msgstr "T_ype: "
-#: ../mail/mail-config.glade.h:141
+#: ../mail/mail-config.glade.h:142
msgid "The list of languages here reflects only the languages for which you have a dictionary installed."
msgstr "The list of languages here reflects only the languages for which you have a dictionary installed."
-#: ../mail/mail-config.glade.h:142
+#: ../mail/mail-config.glade.h:143
msgid ""
"The output of this script will be used as your\n"
"signature. The name you specify will be used\n"
@@ -13576,6 +13620,10 @@ msgstr ""
"for display purposes only. "
#: ../mail/mail-config.glade.h:146
+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:147
msgid ""
"Type the name by which you would like to refer to this account.\n"
"For example: \"Work\" or \"Personal\""
@@ -13583,16 +13631,17 @@ 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:148
+#: ../mail/mail-config.glade.h:149
#: ../plugins/caldav/caldav-source.c:282
+#: ../plugins/google-account-setup/google-source.c:358
msgid "User_name:"
msgstr "User_name:"
-#: ../mail/mail-config.glade.h:149
+#: ../mail/mail-config.glade.h:150
msgid "V_ariable-width:"
msgstr "V_ariable-width:"
-#: ../mail/mail-config.glade.h:150
+#: ../mail/mail-config.glade.h:151
msgid ""
"Welcome to the Evolution Mail Configuration Assistant.\n"
"\n"
@@ -13615,20 +13664,20 @@ msgid "_Default junk plugin:"
msgstr "_Default junk plugin:"
#: ../mail/mail-config.glade.h:157
-msgid "_Do not notify me when new mail arrives"
-msgstr "_Do not notify me when new mail arrives"
-
-#: ../mail/mail-config.glade.h:158
msgid "_Do not sign meeting requests (for Outlook compatibility)"
msgstr "_Do not sign meeting requests (for Outlook compatibility)"
-#: ../mail/mail-config.glade.h:160
+#: ../mail/mail-config.glade.h:159
msgid "_Forward style:"
msgstr "_Forward style:"
+#: ../mail/mail-config.glade.h:160
+msgid "_Keep Signature above the original message on replying"
+msgstr "_Keep Signature above the original message on replying"
+
#: ../mail/mail-config.glade.h:161
-msgid "_Load images in mail from contacts"
-msgstr "_Load images in mail from contacts"
+msgid "_Load images in messages from contacts"
+msgstr "_Load images in messages from contacts"
#: ../mail/mail-config.glade.h:162
msgid "_Make this my default account"
@@ -13662,32 +13711,40 @@ msgstr "_Reply style:"
msgid "_Script:"
msgstr "_Script:"
+#: ../mail/mail-config.glade.h:171
+msgid "_Select..."
+msgstr "_Select..."
+
#. If enabled, show animation; if disabled, only display a static image without any animation
-#: ../mail/mail-config.glade.h:173
+#: ../mail/mail-config.glade.h:174
msgid "_Show image animations"
msgstr "_Show image animations"
-#: ../mail/mail-config.glade.h:174
+#: ../mail/mail-config.glade.h:175
+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:176
msgid "_Shrink To / Cc / Bcc headers to "
msgstr "_Shrink To / Cc / Bcc headers to "
-#: ../mail/mail-config.glade.h:175
+#: ../mail/mail-config.glade.h:177
msgid "_Use Secure Connection:"
msgstr "_Use Secure Connection:"
-#: ../mail/mail-config.glade.h:176
+#: ../mail/mail-config.glade.h:178
msgid "_Use the same fonts as other applications"
msgstr "_Use the same fonts as other applications"
-#: ../mail/mail-config.glade.h:177
+#: ../mail/mail-config.glade.h:179
msgid "addresses"
msgstr "addresses"
-#: ../mail/mail-config.glade.h:178
+#: ../mail/mail-config.glade.h:180
msgid "color"
msgstr "colour"
-#: ../mail/mail-config.glade.h:179
+#: ../mail/mail-config.glade.h:181
msgid "description"
msgstr "description"
@@ -13724,7 +13781,6 @@ msgid "Case _sensitive"
msgstr "Case _sensitive"
#: ../mail/mail-dialogs.glade.h:9
-#: ../mail/message-tags.glade.h:1
msgid "Co_mpleted"
msgstr "Co_mpleted"
@@ -13737,8 +13793,7 @@ msgid "Find in Message"
msgstr "Find in Message"
#: ../mail/mail-dialogs.glade.h:13
-#: ../mail/message-tag-followup.c:297
-#: ../mail/message-tags.glade.h:2
+#: ../mail/message-tag-followup.c:298
msgid "Flag to Follow Up"
msgstr "Flag to Follow Up"
@@ -13767,7 +13822,6 @@ msgid "Specific folders"
msgstr "Specific folders"
#: ../mail/mail-dialogs.glade.h:21
-#: ../mail/message-tags.glade.h:3
msgid ""
"The messages you have selected for follow up are listed below.\n"
"Please select a follow up action from the \"Flag\" menu."
@@ -13780,12 +13834,10 @@ msgid "_Accept License"
msgstr "_Accept Licence"
#: ../mail/mail-dialogs.glade.h:24
-#: ../mail/message-tags.glade.h:5
msgid "_Due By:"
msgstr "_Due By:"
#: ../mail/mail-dialogs.glade.h:25
-#: ../mail/message-tags.glade.h:6
msgid "_Flag:"
msgstr "_Flag:"
@@ -13793,6 +13845,303 @@ msgstr "_Flag:"
msgid "_Tick this to accept the license agreement"
msgstr "_Tick this to accept the licence agreement"
+#: ../mail/mail-folder-cache.c:823
+#, c-format
+msgid "Pinging %s"
+msgstr "Pinging %s"
+
+#: ../mail/mail-ops.c:105
+msgid "Filtering Selected Messages"
+msgstr "Filtering Selected Messages"
+
+#: ../mail/mail-ops.c:264
+msgid "Fetching Mail"
+msgstr "Fetching Mail"
+
+#. sending mail, filtering failed
+#: ../mail/mail-ops.c:560
+#, c-format
+msgid "Failed to apply outgoing filters: %s"
+msgstr "Failed to apply outgoing filters: %s"
+
+#: ../mail/mail-ops.c:572
+#: ../mail/mail-ops.c:601
+#, c-format
+msgid ""
+"Failed to append to %s: %s\n"
+"Appending to local `Sent' folder instead."
+msgstr ""
+"Failed to append to %s: %s\n"
+"Appending to local `Sent' folder instead."
+
+#: ../mail/mail-ops.c:618
+#, c-format
+msgid "Failed to append to local `Sent' folder: %s"
+msgstr "Failed to append to local `Sent' folder: %s"
+
+#: ../mail/mail-ops.c:724
+msgid "Sending message"
+msgstr "Sending message"
+
+#: ../mail/mail-ops.c:734
+#, c-format
+msgid "Sending message %d of %d"
+msgstr "Sending message %d of %d"
+
+#: ../mail/mail-ops.c:761
+#, c-format
+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:704
+msgid "Canceled."
+msgstr "Cancelled."
+
+#: ../mail/mail-ops.c:765
+#: ../mail/mail-send-recv.c:706
+msgid "Complete."
+msgstr "Complete."
+
+#: ../mail/mail-ops.c:869
+msgid "Saving message to folder"
+msgstr "Saving message to folder"
+
+#: ../mail/mail-ops.c:947
+#, c-format
+msgid "Moving messages to %s"
+msgstr "Moving messages to %s"
+
+#: ../mail/mail-ops.c:947
+#, c-format
+msgid "Copying messages to %s"
+msgstr "Copying messages to %s"
+
+#: ../mail/mail-ops.c:1161
+msgid "Forwarded messages"
+msgstr "Forwarded messages"
+
+#: ../mail/mail-ops.c:1202
+#, c-format
+msgid "Opening folder %s"
+msgstr "Opening folder %s"
+
+#: ../mail/mail-ops.c:1267
+#, c-format
+msgid "Opening store %s"
+msgstr "Opening store %s"
+
+#: ../mail/mail-ops.c:1338
+#, c-format
+msgid "Removing folder %s"
+msgstr "Removing folder %s"
+
+#: ../mail/mail-ops.c:1427
+#, c-format
+msgid "Storing folder '%s'"
+msgstr "Storing folder '%s'"
+
+#: ../mail/mail-ops.c:1490
+#, c-format
+msgid "Expunging and storing account '%s'"
+msgstr "Expunging and storing account '%s'"
+
+#: ../mail/mail-ops.c:1491
+#, c-format
+msgid "Storing account '%s'"
+msgstr "Storing account '%s'"
+
+#: ../mail/mail-ops.c:1545
+msgid "Refreshing folder"
+msgstr "Refreshing folder"
+
+#: ../mail/mail-ops.c:1582
+#: ../mail/mail-ops.c:1632
+msgid "Expunging folder"
+msgstr "Expunging folder"
+
+#: ../mail/mail-ops.c:1629
+#, c-format
+msgid "Emptying trash in '%s'"
+msgstr "Emptying trash in '%s'"
+
+#: ../mail/mail-ops.c:1630
+msgid "Local Folders"
+msgstr "Local Folders"
+
+#: ../mail/mail-ops.c:1711
+#, c-format
+msgid "Retrieving message %s"
+msgstr "Retrieving message %s"
+
+#: ../mail/mail-ops.c:1818
+#, 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:1903
+#, c-format
+msgid "Saving %d message"
+msgid_plural "Saving %d messsages"
+msgstr[0] "Saving %d message"
+msgstr[1] "Saving %d messages"
+
+#: ../mail/mail-ops.c:1973
+#, c-format
+msgid ""
+"Error saving messages to: %s:\n"
+" %s"
+msgstr ""
+"Error saving messages to: %s:\n"
+" %s"
+
+#: ../mail/mail-ops.c:2045
+msgid "Saving attachment"
+msgstr "Saving attachment"
+
+#: ../mail/mail-ops.c:2057
+#: ../mail/mail-ops.c:2063
+#, c-format
+msgid ""
+"Cannot create output file: %s:\n"
+" %s"
+msgstr ""
+"Cannot create output file: %s:\n"
+" %s"
+
+#: ../mail/mail-ops.c:2073
+#, c-format
+msgid "Could not write data: %s"
+msgstr "Could not write data: %s"
+
+#: ../mail/mail-ops.c:2219
+#, c-format
+msgid "Disconnecting from %s"
+msgstr "Disconnecting from %s"
+
+#: ../mail/mail-ops.c:2219
+#, c-format
+msgid "Reconnecting to %s"
+msgstr "Reconnecting to %s"
+
+#: ../mail/mail-ops.c:2315
+#, c-format
+msgid "Preparing account '%s' for offline"
+msgstr "Preparing account '%s' for offline"
+
+#: ../mail/mail-ops.c:2401
+msgid "Checking Service"
+msgstr "Checking Service"
+
+#: ../mail/mail-send-recv.c:190
+msgid "Canceling..."
+msgstr "Cancelling..."
+
+#: ../mail/mail-send-recv.c:393
+msgid "Send & Receive Mail"
+msgstr "Send & Receive Mail"
+
+#: ../mail/mail-send-recv.c:400
+msgid "Cancel _All"
+msgstr "Cancel _All"
+
+#: ../mail/mail-send-recv.c:510
+msgid "Updating..."
+msgstr "Updating..."
+
+#: ../mail/mail-send-recv.c:510
+#: ../mail/mail-send-recv.c:583
+msgid "Waiting..."
+msgstr "Waiting..."
+
+#: ../mail/mail-send-recv.c:792
+msgid "Checking for new mail"
+msgstr "Checking for new mail"
+
+#: ../mail/mail-session.c:205
+#, c-format
+msgid "Enter Passphrase for %s"
+msgstr "Enter Passphrase for %s"
+
+#: ../mail/mail-session.c:207
+msgid "Enter Passphrase"
+msgstr "Enter Passphrase"
+
+#: ../mail/mail-session.c:210
+#: ../plugins/exchange-operations/exchange-config-listener.c:711
+#, c-format
+msgid "Enter Password for %s"
+msgstr "Enter Password for %s"
+
+#: ../mail/mail-session.c:212
+msgid "Enter Password"
+msgstr "Enter Password"
+
+#: ../mail/mail-session.c:254
+msgid "User canceled operation."
+msgstr "User cancelled operation."
+
+#: ../mail/mail-signature-editor.c:384
+msgid "Edit signature"
+msgstr "Edit signature"
+
+#: ../mail/mail-signature-editor.c:431
+msgid "Enter a name for this signature."
+msgstr "Enter a name for this signature."
+
+#: ../mail/mail-signature-editor.c:434
+msgid "Name:"
+msgstr "Name:"
+
+#: ../mail/mail-tools.c:120
+#, c-format
+msgid "Could not create spool directory `%s': %s"
+msgstr "Could not create spool directory `%s': %s"
+
+#: ../mail/mail-tools.c:150
+#, c-format
+msgid "Trying to movemail a non-mbox source `%s'"
+msgstr "Trying to movemail a non-mbox source `%s'"
+
+#: ../mail/mail-tools.c:256
+#, c-format
+msgid "Forwarded message - %s"
+msgstr "Forwarded message - %s"
+
+#: ../mail/mail-tools.c:258
+msgid "Forwarded message"
+msgstr "Forwarded message"
+
+#: ../mail/mail-tools.c:298
+#, c-format
+msgid "Invalid folder: `%s'"
+msgstr "Invalid folder: `%s'"
+
+#: ../mail/mail-vfolder.c:89
+#, c-format
+msgid "Setting up Search Folder: %s"
+msgstr "Setting up Search Folder: %s"
+
+#: ../mail/mail-vfolder.c:233
+#, c-format
+msgid "Updating Search Folders for '%s:%s'"
+msgstr "Updating Search Folders for '%s:%s'"
+
+#: ../mail/mail-vfolder.c:240
+#, c-format
+msgid "Updating Search Folders for '%s'"
+msgstr "Updating Search Folders for '%s'"
+
+#: ../mail/mail-vfolder.c:1059
+msgid "Edit Search Folder"
+msgstr "Edit Search Folder"
+
+#: ../mail/mail-vfolder.c:1148
+msgid "New Search Folder"
+msgstr "New Search Folder"
+
#: ../mail/mail.error.xml.h:1
msgid "A folder named &quot;{0}&quot; already exists. Please use a different name."
msgstr "A folder named &quot;{0}&quot; already exists. Please use a different name."
@@ -13964,70 +14313,82 @@ msgid "Delete account?"
msgstr "Delete account?"
#: ../mail/mail.error.xml.h:45
+msgid "Delete messages in Search Folder &quot;{0}&quot;?"
+msgstr "Delete messages in Search Folder &quot;{0}&quot;?"
+
+#: ../mail/mail.error.xml.h:46
+msgid "Delete messages in Search Folder?"
+msgstr "Delete messages in Search Folder?"
+
+#: ../mail/mail.error.xml.h:47
msgid "Discard changes?"
msgstr "Discard changes?"
-#: ../mail/mail.error.xml.h:46
+#: ../mail/mail.error.xml.h:48
+msgid "Do not d_elete"
+msgstr "Do not d_elete"
+
+#: ../mail/mail.error.xml.h:49
msgid "Do not delete"
msgstr "Do not delete"
-#: ../mail/mail.error.xml.h:47
+#: ../mail/mail.error.xml.h:50
msgid "Do not disable"
msgstr "Do not disable"
-#: ../mail/mail.error.xml.h:48
-msgid "Do you want the operation to be performed in the subfolders?"
-msgstr "Do you want the operation to be performed in the subfolders?"
+#: ../mail/mail.error.xml.h:51
+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?"
-#: ../mail/mail.error.xml.h:49
+#: ../mail/mail.error.xml.h:52
msgid "Do you want to locally synchronize the folders that are marked for offline usage?"
msgstr "Do you want to locally synchronise the folders that are marked for offline usage?"
-#: ../mail/mail.error.xml.h:50
+#: ../mail/mail.error.xml.h:53
msgid "Do you want to mark all messages as read?"
msgstr "Do you want to mark all messages as read?"
-#: ../mail/mail.error.xml.h:51
+#: ../mail/mail.error.xml.h:54
msgid "Do you wish to save your changes?"
msgstr "Do you wish to save your changes?"
-#: ../mail/mail.error.xml.h:52
+#: ../mail/mail.error.xml.h:55
msgid "Enter password."
msgstr "Enter password."
-#: ../mail/mail.error.xml.h:53
+#: ../mail/mail.error.xml.h:56
msgid "Error loading filter definitions."
msgstr "Error loading filter definitions."
-#: ../mail/mail.error.xml.h:54
+#: ../mail/mail.error.xml.h:57
msgid "Error while performing operation."
msgstr "Error while performing operation."
-#: ../mail/mail.error.xml.h:55
+#: ../mail/mail.error.xml.h:58
msgid "Error while {0}."
msgstr "Error while {0}."
-#: ../mail/mail.error.xml.h:56
+#: ../mail/mail.error.xml.h:59
msgid "File exists but cannot overwrite it."
msgstr "File exists but cannot overwrite it."
-#: ../mail/mail.error.xml.h:57
+#: ../mail/mail.error.xml.h:60
msgid "File exists but is not a regular file."
msgstr "File exists but is not a regular file."
-#: ../mail/mail.error.xml.h:58
+#: ../mail/mail.error.xml.h:61
msgid "If you continue, you will not be able to recover these messages."
msgstr "If you continue, you will not be able to recover these messages."
-#: ../mail/mail.error.xml.h:59
+#: ../mail/mail.error.xml.h:62
msgid "If you delete the folder, all of its contents and its subfolders contents will be deleted permanently."
msgstr "If you delete the folder, all of its contents and its subfolders contents will be deleted permanently."
-#: ../mail/mail.error.xml.h:60
+#: ../mail/mail.error.xml.h:63
msgid "If you proceed, all proxy accounts will be deleted permanently."
msgstr "If you proceed, all proxy accounts will be deleted permanently."
-#: ../mail/mail.error.xml.h:61
+#: ../mail/mail.error.xml.h:64
msgid ""
"If you proceed, the account information and\n"
"all proxy information will be deleted permanently."
@@ -14035,131 +14396,129 @@ msgstr ""
"If you proceed, the account information and\n"
"all proxy information will be deleted permanently."
-#: ../mail/mail.error.xml.h:63
+#: ../mail/mail.error.xml.h:66
msgid "If you proceed, the account information will be deleted permanently."
msgstr "If you proceed, the account information will be deleted permanently."
-#: ../mail/mail.error.xml.h:64
+#: ../mail/mail.error.xml.h:67
msgid "If you quit, these messages will not be sent until Evolution is started again."
msgstr "If you quit, these messages will not be sent until Evolution is started again."
-#: ../mail/mail.error.xml.h:65
+#: ../mail/mail.error.xml.h:68
msgid "Ignore"
msgstr "Ignore"
-#: ../mail/mail.error.xml.h:66
+#: ../mail/mail.error.xml.h:69
msgid "Invalid authentication"
msgstr "Invalid authentication"
-#: ../mail/mail.error.xml.h:68
+#: ../mail/mail.error.xml.h:71
msgid "Mail filters automatically updated."
msgstr "Mail filters automatically updated."
-#: ../mail/mail.error.xml.h:69
+#: ../mail/mail.error.xml.h:72
msgid "Many email systems add an Apparently-To header to messages that only have BCC recipients. This header, if added, will list all of your recipients to your message anyway. To avoid this, you should add at least one To: or CC: recipient."
msgstr "Many email systems add an Apparently-To header to messages that only have BCC recipients. This header, if added, will list all of your recipients to your message anyway. To avoid this, you should add at least one To: or CC: recipient."
-#: ../mail/mail.error.xml.h:70
+#: ../mail/mail.error.xml.h:73
msgid "Mark all messages as read"
msgstr "Mark all messages as read"
-#: ../mail/mail.error.xml.h:71
-msgid "Mark all messages in subfolders as read?"
-msgstr "Mark all messages in subfolders as read?"
-
-#: ../mail/mail.error.xml.h:72
-msgid "Mark as _Read"
-msgstr "Mark as _Read"
+#: ../mail/mail.error.xml.h:74
+msgid "Mark all messages in this folder and subfolders as read?"
+msgstr "Mark all messages in this folder and subfolders as read?"
-#: ../mail/mail.error.xml.h:73
+#: ../mail/mail.error.xml.h:75
msgid "Missing folder."
msgstr "Missing folder."
-#: ../mail/mail.error.xml.h:75
+#: ../mail/mail.error.xml.h:77
msgid "No sources selected."
msgstr "No sources selected."
-#: ../mail/mail.error.xml.h:76
+#: ../mail/mail.error.xml.h:78
+msgid "Only on _Current Folder"
+msgstr "Only on _Current Folder"
+
+#: ../mail/mail.error.xml.h:79
msgid "Opening too many messages at once may take a long time."
msgstr "Opening too many messages at once may take a long time."
# mail:gw-accountsetup-error secondary
-#: ../mail/mail.error.xml.h:77
+#: ../mail/mail.error.xml.h:80
msgid "Please check your account settings and try again."
msgstr "Please check your account settings and try again."
# mail:gw-accountsetup-error secondary
-#: ../mail/mail.error.xml.h:78
+#: ../mail/mail.error.xml.h:81
msgid "Please enable the account or send using another account."
msgstr "Please enable the account or send using another account."
-#: ../mail/mail.error.xml.h:79
+#: ../mail/mail.error.xml.h:82
msgid "Please enter a valid email address in the To: field. You can search for email addresses by clicking on the To: button next to the entry box."
msgstr "Please enter a valid email address in the To: field. You can search for email addresses by clicking on the To: button next to the entry box."
-#: ../mail/mail.error.xml.h:80
+#: ../mail/mail.error.xml.h:83
msgid ""
"Please make sure the following recipients are willing and able to receive HTML email:\n"
-"{0}\n"
-"Send anyway?"
+"{0}"
msgstr ""
"Please make sure the following recipients are willing and able to receive HTML email:\n"
-"{0}\n"
-"Send anyway?"
+"{0}"
-#: ../mail/mail.error.xml.h:83
+#: ../mail/mail.error.xml.h:85
msgid "Please provide an unique name to identify this signature."
msgstr "Please provide an unique name to identify this signature."
-#: ../mail/mail.error.xml.h:84
+#: ../mail/mail.error.xml.h:86
msgid "Please wait."
msgstr "Please wait."
-#: ../mail/mail.error.xml.h:85
+#: ../mail/mail.error.xml.h:87
msgid "Problem migrating old mail folder &quot;{0}&quot;."
msgstr "Problem migrating old mail folder &quot;{0}&quot;."
-#: ../mail/mail.error.xml.h:86
+#: ../mail/mail.error.xml.h:88
msgid "Querying server"
msgstr "Querying server"
-#: ../mail/mail.error.xml.h:87
+#: ../mail/mail.error.xml.h:89
msgid "Querying server for a list of supported authentication mechanisms."
msgstr "Querying server for a list of supported authentication mechanisms."
-#: ../mail/mail.error.xml.h:88
+#: ../mail/mail.error.xml.h:90
msgid "Read receipt requested."
msgstr "Read receipt requested."
-#: ../mail/mail.error.xml.h:89
+#: ../mail/mail.error.xml.h:91
msgid "Really delete folder &quot;{0}&quot; and all of its subfolders?"
msgstr "Really delete folder &quot;{0}&quot; and all of its subfolders?"
-#: ../mail/mail.error.xml.h:90
+#: ../mail/mail.error.xml.h:92
msgid "Search Folders automatically updated."
msgstr "Search Folders automatically updated."
-#: ../mail/mail.error.xml.h:91
+#: ../mail/mail.error.xml.h:93
msgid "Send Receipt"
msgstr "Send Receipt"
-#: ../mail/mail.error.xml.h:92
+#: ../mail/mail.error.xml.h:94
msgid "Signature Already Exists"
msgstr "Signature Already Exists"
-#: ../mail/mail.error.xml.h:93
+#: ../mail/mail.error.xml.h:95
msgid "Synchronize"
msgstr "Synchronise"
-#: ../mail/mail.error.xml.h:94
+#: ../mail/mail.error.xml.h:96
msgid "Synchronize folders locally for offline usage?"
msgstr "Synchronise folders locally for offline usage?"
-#: ../mail/mail.error.xml.h:95
+#: ../mail/mail.error.xml.h:97
msgid "System folders are required for Evolution to function correctly and cannot be renamed, moved, or deleted."
msgstr "System folders are required for Evolution to function correctly and cannot be renamed, moved, or deleted."
-#: ../mail/mail.error.xml.h:96
+#: ../mail/mail.error.xml.h:98
msgid ""
"The contact list you are sending to is configured to hide list recipients.\n"
"\n"
@@ -14169,7 +14528,7 @@ msgstr ""
"\n"
"Many email systems add an Apparently-To header to messages that only have BCC recipients. This header, if added, will list all of your recipients in your message. To avoid this, you should add at least one To: or CC: recipient. "
-#: ../mail/mail.error.xml.h:99
+#: ../mail/mail.error.xml.h:101
msgid ""
"The following Search Folder(s):\n"
"{0}\n"
@@ -14183,7 +14542,7 @@ msgstr ""
" &quot;{1}&quot;\n"
"And have been updated."
-#: ../mail/mail.error.xml.h:104
+#: ../mail/mail.error.xml.h:106
msgid ""
"The following filter rule(s):\n"
"{0}\n"
@@ -14197,11 +14556,11 @@ msgstr ""
" &quot;{1}&quot;\n"
"And have been updated."
-#: ../mail/mail.error.xml.h:109
+#: ../mail/mail.error.xml.h:111
msgid "The script file must exist and be executable."
msgstr "The script file must exist and be executable."
-#: ../mail/mail.error.xml.h:110
+#: ../mail/mail.error.xml.h:112
msgid ""
"This folder may have been added implicitly,\n"
"go to the Search Folder editor to add it explicitly, if required."
@@ -14209,68 +14568,76 @@ msgstr ""
"This folder may have been added implicitly,\n"
"go to the Search Folder editor to add it explicitly, if required."
-#: ../mail/mail.error.xml.h:112
+#: ../mail/mail.error.xml.h:114
msgid "This message cannot be sent because the account you chose to send with is not enabled"
msgstr "This message cannot be sent because the account you chose to send with is not enabled"
-#: ../mail/mail.error.xml.h:113
+#: ../mail/mail.error.xml.h:115
msgid "This message cannot be sent because you have not specified any recipients"
msgstr "This message cannot be sent because you have not specified any recipients"
-#: ../mail/mail.error.xml.h:114
+#: ../mail/mail.error.xml.h:116
msgid "This server does not support this type of authentication and may not support authentication at all."
msgstr "This server does not support this type of authentication and may not support authentication at all."
-#: ../mail/mail.error.xml.h:115
+#: ../mail/mail.error.xml.h:117
msgid "This signature has been changed, but has not been saved."
msgstr "This signature has been changed, but has not been saved."
-#: ../mail/mail.error.xml.h:116
+#: ../mail/mail.error.xml.h:118
msgid "This will mark all messages as read in the selected folder and its subfolders."
msgstr "This will mark all messages as read in the selected folder and its subfolders."
# mail:gw-accountsetup-error primary
-#: ../mail/mail.error.xml.h:117
+#: ../mail/mail.error.xml.h:119
msgid "Unable to connect to the GroupWise server."
msgstr "Unable to connect to the GroupWise server."
-#: ../mail/mail.error.xml.h:118
+#: ../mail/mail.error.xml.h:120
msgid "Unable to open the drafts folder for this account. Use the system drafts folder instead?"
msgstr "Unable to open the drafts folder for this account. Use the system drafts folder instead?"
-#: ../mail/mail.error.xml.h:119
+#: ../mail/mail.error.xml.h:121
msgid "Unable to read license file."
msgstr "Unable to read licence file."
-#: ../mail/mail.error.xml.h:120
+#: ../mail/mail.error.xml.h:122
msgid "Use _Default"
msgstr "Use _Default"
-#: ../mail/mail.error.xml.h:121
+#: ../mail/mail.error.xml.h:123
msgid "Use default drafts folder?"
msgstr "Use default drafts folder?"
-#: ../mail/mail.error.xml.h:123
+#: ../mail/mail.error.xml.h:124
+msgid ""
+"Warning: Deleting messages from a Search Folder will delete the actual message from one of your local or remote folders.\n"
+"Do you really want to do this?"
+msgstr ""
+"Warning: Deleting messages from a Search Folder will delete the actual message from one of your local or remote folders.\n"
+"Do you really want to do this?"
+
+#: ../mail/mail.error.xml.h:127
msgid "You have not filled in all of the required information."
msgstr "You have not filled in all of the required information."
-#: ../mail/mail.error.xml.h:124
+#: ../mail/mail.error.xml.h:128
msgid "You have unsent messages, do you wish to quit anyway?"
msgstr "You have unsent messages, do you wish to quit anyway?"
-#: ../mail/mail.error.xml.h:125
+#: ../mail/mail.error.xml.h:129
msgid "You may not create two accounts with the same name."
msgstr "You may not create two accounts with the same name."
-#: ../mail/mail.error.xml.h:126
+#: ../mail/mail.error.xml.h:130
msgid "You must name this Search Folder."
msgstr "You must name this Search Folder."
-#: ../mail/mail.error.xml.h:127
+#: ../mail/mail.error.xml.h:131
msgid "You must specify a folder."
msgstr "You must specify a folder."
-#: ../mail/mail.error.xml.h:128
+#: ../mail/mail.error.xml.h:132
msgid ""
"You must specify at least one folder as a source.\n"
"Either by selecting the folders individually, and/or by selecting all local folders, all remote folders, or both."
@@ -14278,402 +14645,104 @@ msgstr ""
"You must specify at least one folder as a source.\n"
"Either by selecting the folders individually, and/or by selecting all local folders, all remote folders, or both."
-#: ../mail/mail.error.xml.h:130
+#: ../mail/mail.error.xml.h:134
msgid "Your login to your server &quot;{0}&quot; as &quot;{0}&quot; failed."
msgstr "Your login to your server &quot;{0}&quot; as &quot;{0}&quot; failed."
-#: ../mail/mail.error.xml.h:131
+#: ../mail/mail.error.xml.h:135
msgid "_Append"
msgstr "_Append"
-#: ../mail/mail.error.xml.h:132
+#: ../mail/mail.error.xml.h:136
msgid "_Discard changes"
msgstr "_Discard changes"
-#: ../mail/mail.error.xml.h:133
-msgid "_Do not Mark as Read"
-msgstr "_Do not Mark as Read"
-
-#: ../mail/mail.error.xml.h:134
+#: ../mail/mail.error.xml.h:137
msgid "_Do not Synchronize"
msgstr "_Do not Synchronise"
-#: ../mail/mail.error.xml.h:136
+#: ../mail/mail.error.xml.h:139
msgid "_Expunge"
msgstr "_Expunge"
-#: ../mail/mail.error.xml.h:137
+#: ../mail/mail.error.xml.h:140
msgid "_Open Messages"
msgstr "_Open Messages"
-#: ../mail/mail-folder-cache.c:859
-#, c-format
-msgid "Pinging %s"
-msgstr "Pinging %s"
-
-#: ../mail/mail-ops.c:105
-msgid "Filtering Selected Messages"
-msgstr "Filtering Selected Messages"
-
-#: ../mail/mail-ops.c:266
-msgid "Fetching Mail"
-msgstr "Fetching Mail"
-
-#. sending mail, filtering failed
-#: ../mail/mail-ops.c:566
-#, c-format
-msgid "Failed to apply outgoing filters: %s"
-msgstr "Failed to apply outgoing filters: %s"
-
-#: ../mail/mail-ops.c:578
-#: ../mail/mail-ops.c:607
-#, c-format
-msgid ""
-"Failed to append to %s: %s\n"
-"Appending to local `Sent' folder instead."
-msgstr ""
-"Failed to append to %s: %s\n"
-"Appending to local `Sent' folder instead."
-
-#: ../mail/mail-ops.c:624
-#, c-format
-msgid "Failed to append to local `Sent' folder: %s"
-msgstr "Failed to append to local `Sent' folder: %s"
-
-#: ../mail/mail-ops.c:736
-#, c-format
-msgid "Sending message %d of %d"
-msgstr "Sending message %d of %d"
-
-#: ../mail/mail-ops.c:761
-#, c-format
-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:703
-msgid "Canceled."
-msgstr "Cancelled."
-
-#: ../mail/mail-ops.c:765
-msgid "Complete."
-msgstr "Complete."
-
-#: ../mail/mail-ops.c:862
-msgid "Saving message to folder"
-msgstr "Saving message to folder"
-
-#: ../mail/mail-ops.c:947
-#, c-format
-msgid "Moving messages to %s"
-msgstr "Moving messages to %s"
-
-#: ../mail/mail-ops.c:947
-#, c-format
-msgid "Copying messages to %s"
-msgstr "Copying messages to %s"
-
-#: ../mail/mail-ops.c:1170
-msgid "Forwarded messages"
-msgstr "Forwarded messages"
-
-#: ../mail/mail-ops.c:1213
-#, c-format
-msgid "Opening folder %s"
-msgstr "Opening folder %s"
-
-#: ../mail/mail-ops.c:1285
-#, c-format
-msgid "Opening store %s"
-msgstr "Opening store %s"
-
-#: ../mail/mail-ops.c:1363
-#, c-format
-msgid "Removing folder %s"
-msgstr "Removing folder %s"
-
-#: ../mail/mail-ops.c:1457
-#, c-format
-msgid "Storing folder '%s'"
-msgstr "Storing folder '%s'"
-
-#: ../mail/mail-ops.c:1522
-#, c-format
-msgid "Expunging and storing account '%s'"
-msgstr "Expunging and storing account '%s'"
-
-#: ../mail/mail-ops.c:1523
-#, c-format
-msgid "Storing account '%s'"
-msgstr "Storing account '%s'"
-
-#: ../mail/mail-ops.c:1578
-msgid "Refreshing folder"
-msgstr "Refreshing folder"
-
-#: ../mail/mail-ops.c:1614
-#: ../mail/mail-ops.c:1665
-msgid "Expunging folder"
-msgstr "Expunging folder"
-
-#: ../mail/mail-ops.c:1662
-#, c-format
-msgid "Emptying trash in '%s'"
-msgstr "Emptying trash in '%s'"
-
-#: ../mail/mail-ops.c:1663
-msgid "Local Folders"
-msgstr "Local Folders"
-
-#: ../mail/mail-ops.c:1746
-#, c-format
-msgid "Retrieving message %s"
-msgstr "Retrieving message %s"
-
-#: ../mail/mail-ops.c:1856
-#, 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:1942
-#, c-format
-msgid "Saving %d message"
-msgid_plural "Saving %d messsages"
-msgstr[0] "Saving %d message"
-msgstr[1] "Saving %d messages"
-
-#: ../mail/mail-ops.c:2013
-#, c-format
-msgid ""
-"Error saving messages to: %s:\n"
-" %s"
-msgstr ""
-"Error saving messages to: %s:\n"
-" %s"
-
-#: ../mail/mail-ops.c:2085
-msgid "Saving attachment"
-msgstr "Saving attachment"
-
-#: ../mail/mail-ops.c:2098
-#: ../mail/mail-ops.c:2104
-#, c-format
-msgid ""
-"Cannot create output file: %s:\n"
-" %s"
-msgstr ""
-"Cannot create output file: %s:\n"
-" %s"
-
-#: ../mail/mail-ops.c:2114
-#, c-format
-msgid "Could not write data: %s"
-msgstr "Could not write data: %s"
-
-#: ../mail/mail-ops.c:2263
-#, c-format
-msgid "Disconnecting from %s"
-msgstr "Disconnecting from %s"
-
-#: ../mail/mail-ops.c:2263
-#, c-format
-msgid "Reconnecting to %s"
-msgstr "Reconnecting to %s"
-
-#: ../mail/mail-ops.c:2361
-#, c-format
-msgid "Preparing account '%s' for offline"
-msgstr "Preparing account '%s' for offline"
-
-#: ../mail/mail-ops.c:2444
-msgid "Checking Service"
-msgstr "Checking Service"
-
-#: ../mail/mail-send-recv.c:161
-msgid "Canceling..."
-msgstr "Cancelling..."
-
-#: ../mail/mail-send-recv.c:403
-msgid "Send & Receive Mail"
-msgstr "Send & Receive Mail"
-
-#: ../mail/mail-send-recv.c:410
-msgid "Cancel _All"
-msgstr "Cancel _All"
-
-#: ../mail/mail-send-recv.c:516
-msgid "Updating..."
-msgstr "Updating..."
-
-#: ../mail/mail-send-recv.c:516
-#: ../mail/mail-send-recv.c:583
-msgid "Waiting..."
-msgstr "Waiting..."
-
-#: ../mail/mail-send-recv.c:791
-msgid "Checking for new mail"
-msgstr "Checking for new mail"
-
-#: ../mail/mail-session.c:200
-#, c-format
-msgid "Enter Passphrase for %s"
-msgstr "Enter Passphrase for %s"
-
-#: ../mail/mail-session.c:202
-msgid "Enter Passphrase"
-msgstr "Enter Passphrase"
-
-#: ../mail/mail-session.c:205
-#: ../plugins/exchange-operations/exchange-config-listener.c:711
-#, c-format
-msgid "Enter Password for %s"
-msgstr "Enter Password for %s"
-
-#: ../mail/mail-session.c:207
-msgid "Enter Password"
-msgstr "Enter Password"
-
-#: ../mail/mail-session.c:245
-msgid "User canceled operation."
-msgstr "User cancelled operation."
-
-#: ../mail/mail-signature-editor.c:384
-msgid "Edit signature"
-msgstr "Edit signature"
-
-#: ../mail/mail-signature-editor.c:431
-msgid "Enter a name for this signature."
-msgstr "Enter a name for this signature."
-
-#: ../mail/mail-signature-editor.c:434
-#: ../plugins/groupwise-features/properties.glade.h:4
-msgid "Name:"
-msgstr "Name:"
-
-#: ../mail/mail-tools.c:120
-#, c-format
-msgid "Could not create spool directory `%s': %s"
-msgstr "Could not create spool directory `%s': %s"
-
-#: ../mail/mail-tools.c:150
-#, c-format
-msgid "Trying to movemail a non-mbox source `%s'"
-msgstr "Trying to movemail a non-mbox source `%s'"
-
-#: ../mail/mail-tools.c:256
-#, c-format
-msgid "Forwarded message - %s"
-msgstr "Forwarded message - %s"
-
-#: ../mail/mail-tools.c:258
-msgid "Forwarded message"
-msgstr "Forwarded message"
-
-#: ../mail/mail-tools.c:298
-#, c-format
-msgid "Invalid folder: `%s'"
-msgstr "Invalid folder: `%s'"
-
-#: ../mail/mail-vfolder.c:91
-#, c-format
-msgid "Setting up Search Folder: %s"
-msgstr "Setting up Search Folder: %s"
-
-#: ../mail/mail-vfolder.c:240
-#, c-format
-msgid "Updating Search Folders for '%s:%s'"
-msgstr "Updating Search Folders for '%s:%s'"
-
-#: ../mail/mail-vfolder.c:247
-#, c-format
-msgid "Updating Search Folders for '%s'"
-msgstr "Updating Search Folders for '%s'"
-
-#: ../mail/mail-vfolder.c:1023
-msgid "Edit Search Folder"
-msgstr "Edit Search Folder"
-
-#: ../mail/mail-vfolder.c:1107
-msgid "New Search Folder"
-msgstr "New Search Folder"
+#: ../mail/mail.error.xml.h:143
+msgid "on Current Folder and _Subfolders"
+msgstr "on Current Folder and _Subfolders"
-#: ../mail/message-list.c:1022
+#: ../mail/message-list.c:1053
msgid "Unseen"
msgstr "Unseen"
-#: ../mail/message-list.c:1023
+#: ../mail/message-list.c:1054
msgid "Seen"
msgstr "Seen"
-#: ../mail/message-list.c:1024
+#: ../mail/message-list.c:1055
msgid "Answered"
msgstr "Answered"
-#: ../mail/message-list.c:1025
+#: ../mail/message-list.c:1056
msgid "Multiple Unseen Messages"
msgstr "Multiple Unseen Messages"
-#: ../mail/message-list.c:1026
+#: ../mail/message-list.c:1057
msgid "Multiple Messages"
msgstr "Multiple Messages"
-#: ../mail/message-list.c:1030
+#: ../mail/message-list.c:1061
msgid "Lowest"
msgstr "Lowest"
-#: ../mail/message-list.c:1031
+#: ../mail/message-list.c:1062
msgid "Lower"
msgstr "Lower"
-#: ../mail/message-list.c:1035
+#: ../mail/message-list.c:1066
msgid "Higher"
msgstr "Higher"
-#: ../mail/message-list.c:1036
+#: ../mail/message-list.c:1067
msgid "Highest"
msgstr "Highest"
-#: ../mail/message-list.c:1469
-#: ../widgets/table/e-cell-date.c:57
+#: ../mail/message-list.c:1611
+#: ../widgets/table/e-cell-date.c:55
msgid "?"
msgstr "?"
#. strftime format of a time,
#. in 12-hour format, without seconds.
-#: ../mail/message-list.c:1476
-#: ../plugins/itip-formatter/itip-view.c:201
-#: ../widgets/table/e-cell-date.c:72
+#: ../mail/message-list.c:1618
+#: ../plugins/itip-formatter/itip-view.c:206
+#: ../widgets/table/e-cell-date.c:70
msgid "Today %l:%M %p"
msgstr "Today %l:%M %p"
-#: ../mail/message-list.c:1485
-#: ../widgets/table/e-cell-date.c:82
+#: ../mail/message-list.c:1627
+#: ../widgets/table/e-cell-date.c:80
msgid "Yesterday %l:%M %p"
msgstr "Yesterday %l:%M %p"
-#: ../mail/message-list.c:1497
-#: ../widgets/table/e-cell-date.c:94
+#: ../mail/message-list.c:1639
+#: ../widgets/table/e-cell-date.c:92
msgid "%a %l:%M %p"
msgstr "%a %l:%M %p"
-#: ../mail/message-list.c:1505
-#: ../widgets/table/e-cell-date.c:102
+#: ../mail/message-list.c:1647
+#: ../widgets/table/e-cell-date.c:100
msgid "%b %d %l:%M %p"
msgstr "%d %b %l:%M %p"
-#: ../mail/message-list.c:1507
-#: ../widgets/table/e-cell-date.c:104
+#: ../mail/message-list.c:1649
+#: ../widgets/table/e-cell-date.c:102
msgid "%b %d %Y"
msgstr "%d %b %Y"
-#: ../mail/message-list.c:2262
-#: ../mail/message-list.etspec.h:9
-msgid "Messages"
-msgstr "Messages"
-
-#: ../mail/message-list.c:3708
+#: ../mail/message-list.c:3846
msgid "Generating message list"
msgstr "Generating message list"
@@ -14693,15 +14762,15 @@ msgstr "Flagged"
msgid "Follow Up Flag"
msgstr "Follow Up Flag"
-#: ../mail/message-list.etspec.h:10
+#: ../mail/message-list.etspec.h:11
msgid "Received"
msgstr "Received"
-#: ../mail/message-list.etspec.h:14
+#: ../mail/message-list.etspec.h:15
msgid "Sent Messages"
msgstr "Sent Messages"
-#: ../mail/message-list.etspec.h:15
+#: ../mail/message-list.etspec.h:16
#: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:4
msgid "Size"
msgstr "Size"
@@ -14731,17 +14800,17 @@ msgstr "Forward"
msgid "No Response Necessary"
msgstr "No Response Necessary"
-#: ../mail/message-tag-followup.c:82
+#: ../mail/message-tag-followup.c:83
#: ../ui/evolution-mail-message.xml.h:80
msgid "Reply"
msgstr "Reply"
-#: ../mail/message-tag-followup.c:83
+#: ../mail/message-tag-followup.c:84
#: ../ui/evolution-mail-message.xml.h:81
msgid "Reply to All"
msgstr "Reply to All"
-#: ../mail/message-tag-followup.c:84
+#: ../mail/message-tag-followup.c:85
msgid "Review"
msgstr "Review"
@@ -14777,102 +14846,70 @@ msgstr "Local Address Books"
msgid "Provides core functionality for local address books."
msgstr "Provides core functionality for local address books."
-#: ../plugins/audio-inline/org-gnome-audio-inline.eplug.xml.h:1
-msgid "A formatter plugin which displays audio attachments inline and allows you to play them directly from evolution."
-msgstr "A formatter plugin which displays audio attachments inline and allows you to play them directly from evolution."
-
-#: ../plugins/audio-inline/org-gnome-audio-inline.eplug.xml.h:2
-msgid "Audio inline plugin"
-msgstr "Audio inline plugin"
-
-#: ../plugins/backup-restore/backup.c:50
-#: ../plugins/backup-restore/backup.c:90
-msgid "Shutting down Evolution"
-msgstr "Shutting down Evolution"
-
-#: ../plugins/backup-restore/backup.c:55
-msgid "Backing Evolution accounts and settings"
-msgstr "Backing Evolution accounts and settings"
-
-#: ../plugins/backup-restore/backup.c:60
-msgid "Backing Evolution data (Mails, Contacts, Calendar, Tasks, Memos)"
-msgstr "Backing Evolution data (Mails, Contacts, Calendar, Tasks, Memos)"
-
-#: ../plugins/backup-restore/backup.c:70
-msgid "Backup complete"
-msgstr "Backup complete"
-
-#: ../plugins/backup-restore/backup.c:75
-#: ../plugins/backup-restore/backup.c:116
-msgid "Restarting Evolution"
-msgstr "Restarting Evolution"
+#: ../plugins/attachment-reminder/apps-evolution-attachment-reminder.schemas.in.h:1
+msgid "Enable attachment reminder plugin"
+msgstr "Enable attachment reminder plugin"
-#: ../plugins/backup-restore/backup.c:94
-msgid "Backup current Evolution data"
-msgstr "Backup current Evolution data"
+#: ../plugins/attachment-reminder/apps-evolution-attachment-reminder.schemas.in.h:2
+msgid "Enable attachment reminder plugin."
+msgstr "Enable attachment reminder plugin."
-#: ../plugins/backup-restore/backup.c:99
-msgid "Extracting files from the archive"
-msgstr "Extracting files from the archive"
+#: ../plugins/attachment-reminder/apps-evolution-attachment-reminder.schemas.in.h:3
+msgid "List of clues for the attachment reminder plugin to look for in a message body"
+msgstr "List of clues for the attachment reminder plugin to look for in a message body"
-#: ../plugins/backup-restore/backup.c:105
-msgid "Loading Evolution settings"
-msgstr "Loading Evolution settings"
+#: ../plugins/attachment-reminder/apps-evolution-attachment-reminder.schemas.in.h:4
+msgid "List of clues for the attachment reminder plugin to look for in a message body."
+msgstr "List of clues for the attachment reminder plugin to look for in a message body."
-#: ../plugins/backup-restore/backup.c:109
-msgid "Removing temporary backup files"
-msgstr "Removing temporary backup files"
+#: ../plugins/attachment-reminder/attachment-reminder.c:475
+msgid "Keywords"
+msgstr "Keywords"
-#: ../plugins/backup-restore/backup.c:214
-msgid "Backup Evolution directory"
-msgstr "Backup Evolution directory"
+#: ../plugins/attachment-reminder/attachment-reminder.glade.h:1
+msgid "Remind _missing attachments"
+msgstr "Remind _missing attachments"
-#: ../plugins/backup-restore/backup.c:216
-msgid "Restore Evolution directory"
-msgstr "Restore Evolution directory"
+#: ../plugins/attachment-reminder/org-gnome-evolution-attachment-reminder.eplug.xml.h:1
+#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:1
+msgid "Attachment Reminder"
+msgstr "Attachment Reminder"
-#: ../plugins/backup-restore/backup.c:218
-msgid "Check Evolution archive"
-msgstr "Check Evolution archive"
+#: ../plugins/attachment-reminder/org-gnome-evolution-attachment-reminder.eplug.xml.h:2
+msgid "Looks for clues in a message for mention of attachments and warns if the attachment is missing"
+msgstr "Looks for clues in a message for mention of attachments and warns if the attachment is missing"
-#: ../plugins/backup-restore/backup.c:220
-msgid "Restart Evolution"
-msgstr "Restart Evolution"
-
-#: ../plugins/backup-restore/backup.c:222
-msgid "With GUI"
-msgstr "With GUI"
+#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:2
+msgid "Evolution has found some keywords that suggest that this message should contain an attachment, but cannot find one."
+msgstr "Evolution has found some keywords that suggest that this message should contain an attachment, but cannot find one."
-#: ../plugins/backup-restore/backup.c:247
-#, c-format
-msgid "Backing up to %s"
-msgstr "Backing up to %s"
+#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:3
+msgid "Message has no attachments"
+msgstr "Message has no attachments"
-#: ../plugins/backup-restore/backup.c:252
-#, c-format
-msgid "Restoring from %s"
-msgstr "Restoring from %s"
+#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:4
+msgid "_Continue Editing"
+msgstr "_Continue Editing"
-#. Backup / Restore only can have GUI. We should restrict the rest
-#: ../plugins/backup-restore/backup.c:268
-msgid "Evolution Backup"
-msgstr "Evolution Backup"
+#: ../plugins/audio-inline/org-gnome-audio-inline.eplug.xml.h:1
+msgid "A formatter plugin which displays audio attachments inline and allows you to play them directly from evolution."
+msgstr "A formatter plugin which displays audio attachments inline and allows you to play them directly from evolution."
-#: ../plugins/backup-restore/backup.c:268
-msgid "Evolution Restore"
-msgstr "Evolution Restore"
+#: ../plugins/audio-inline/org-gnome-audio-inline.eplug.xml.h:2
+msgid "Audio inline plugin"
+msgstr "Audio inline plugin"
#: ../plugins/backup-restore/backup-restore.c:96
-msgid "Select name of the Evolution archive"
-msgstr "Select name of the Evolution archive"
+msgid "Select name of the Evolution backup file"
+msgstr "Select name of the Evolution backup file"
#: ../plugins/backup-restore/backup-restore.c:120
msgid "_Restart Evolution after backup"
msgstr "_Restart Evolution after backup"
#: ../plugins/backup-restore/backup-restore.c:139
-msgid "Select name of the Evolution archive to restore"
-msgstr "Select name of the Evolution archive to restore"
+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:163
msgid "_Restart Evolution after restore"
@@ -14884,15 +14921,15 @@ msgstr "Restore from backup"
#: ../plugins/backup-restore/backup-restore.c:238
msgid ""
-"You can restore Evolution from your archive. It can restore all the Mails/Calendars/Tasks/Memos/Addressbook. \n"
+"You can restore Evolution from your backup. It can restore all the Mails, Calendars, Tasks, Memos, Contacts. \n"
"It also restores all your personal settings, mail filters etc."
msgstr ""
-"You can restore Evolution from your archive. It can restore all the Mails/Calendars/Tasks/Memos/Addressbook. \n"
+"You can restore Evolution from your backup. It can restore all the Mails, Calendars, Tasks, Memos, Contacts. \n"
"It also restores all your personal settings, mail filters etc."
#: ../plugins/backup-restore/backup-restore.c:244
-msgid "_Restore Evolution from the backup archive"
-msgstr "_Restore Evolution from the backup archive"
+msgid "_Restore Evolution from the backup file"
+msgstr "_Restore Evolution from the backup file"
#: ../plugins/backup-restore/backup-restore.c:251
msgid "Please select an Evolution Archive to restore:"
@@ -14902,6 +14939,83 @@ msgstr "Please select an Evolution Archive to restore:"
msgid "Choose a file to restore"
msgstr "Choose a file to restore"
+#: ../plugins/backup-restore/backup.c:40
+msgid "Backup Evolution directory"
+msgstr "Backup Evolution directory"
+
+#: ../plugins/backup-restore/backup.c:42
+msgid "Restore Evolution directory"
+msgstr "Restore Evolution directory"
+
+#: ../plugins/backup-restore/backup.c:44
+msgid "Check Evolution Backup"
+msgstr "Check Evolution Backup"
+
+#: ../plugins/backup-restore/backup.c:46
+msgid "Restart Evolution"
+msgstr "Restart Evolution"
+
+#: ../plugins/backup-restore/backup.c:48
+msgid "With Graphical User Interface"
+msgstr "With Graphical User Interface"
+
+#: ../plugins/backup-restore/backup.c:69
+#: ../plugins/backup-restore/backup.c:110
+msgid "Shutting down Evolution"
+msgstr "Shutting down Evolution"
+
+#: ../plugins/backup-restore/backup.c:74
+msgid "Backing Evolution accounts and settings"
+msgstr "Backing Evolution accounts and settings"
+
+#: ../plugins/backup-restore/backup.c:78
+msgid "Backing Evolution data (Mails, Contacts, Calendar, Tasks, Memos)"
+msgstr "Backing Evolution data (Mails, Contacts, Calendar, Tasks, Memos)"
+
+#: ../plugins/backup-restore/backup.c:88
+msgid "Backup complete"
+msgstr "Backup complete"
+
+#: ../plugins/backup-restore/backup.c:93
+#: ../plugins/backup-restore/backup.c:136
+msgid "Restarting Evolution"
+msgstr "Restarting Evolution"
+
+#: ../plugins/backup-restore/backup.c:114
+msgid "Backup current Evolution data"
+msgstr "Backup current Evolution data"
+
+#: ../plugins/backup-restore/backup.c:119
+msgid "Extracting files from backup"
+msgstr "Extracting files from backup"
+
+#: ../plugins/backup-restore/backup.c:125
+msgid "Loading Evolution settings"
+msgstr "Loading Evolution settings"
+
+#: ../plugins/backup-restore/backup.c:129
+msgid "Removing temporary backup files"
+msgstr "Removing temporary backup files"
+
+#: ../plugins/backup-restore/backup.c:249
+#, c-format
+msgid "Backing up to the folder %s"
+msgstr "Backing up to the folder %s"
+
+#: ../plugins/backup-restore/backup.c:254
+#, 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
+msgid "Evolution Backup"
+msgstr "Evolution Backup"
+
+#: ../plugins/backup-restore/backup.c:270
+msgid "Evolution Restore"
+msgstr "Evolution Restore"
+
#: ../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."
@@ -14916,20 +15030,20 @@ msgid "Are you sure you want to close Evolution?"
msgstr "Are you sure you want to close Evolution?"
#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:2
-msgid "Are you sure you want to restore Evolution from the selected archive?"
-msgstr "Are you sure you want to restore Evolution from the selected archive?"
+msgid "Are you sure you want to restore Evolution from the selected backup file?"
+msgstr "Are you sure you want to restore Evolution from the selected backup file?"
#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:3
msgid "Evolution backup can start only when Evolution is not running. Please make sure that you save and close all your unsaved windows before proceeding. If you want Evolution to restart automatically after backup, please enable the toggle button."
msgstr "Evolution backup can start only when Evolution is not running. Please make sure that you save and close all your unsaved windows before proceeding. If you want Evolution to restart automatically after backup, please enable the toggle button."
#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:4
-msgid "Invalid Evolution archive"
-msgstr "Invalid Evolution archive"
+msgid "Invalid Evolution backup file"
+msgstr "Invalid Evolution backup file"
#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:5
-msgid "Please select a valid archive file to restore."
-msgstr "Please select a valid archive file to restore."
+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:6
msgid "This will delete all your current Evolution data and settings and restore them from your backup. Evolution restore can start only when Evolution is not running. Please make sure that you close all your unsaved windows before you proceed. If you want Evolution to restart automatically restart after restore, please enable the toggle button."
@@ -14947,36 +15061,36 @@ msgstr "R_estore Settings..."
msgid "_Backup Settings..."
msgstr "_Backup Settings..."
-#: ../plugins/bbdb/bbdb.c:447
-#: ../plugins/bbdb/bbdb.c:456
+#: ../plugins/bbdb/bbdb.c:541
+#: ../plugins/bbdb/bbdb.c:550
#: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:1
msgid "Automatic Contacts"
msgstr "Automatic Contacts"
#. Enable BBDB checkbox
-#: ../plugins/bbdb/bbdb.c:471
-msgid "_Automatically create entries in the addressbook when responding to mail"
-msgstr "_Automatically create entries in the addressbook when responding to mail"
+#: ../plugins/bbdb/bbdb.c:565
+msgid "_Automatically create entries in the addressbook when responding to messages"
+msgstr "_Automatically create entries in the addressbook when responding to messages"
-#: ../plugins/bbdb/bbdb.c:477
+#: ../plugins/bbdb/bbdb.c:571
msgid "Select Address book for Automatic Contacts"
msgstr "Select Address book for Automatic Contacts"
-#: ../plugins/bbdb/bbdb.c:492
+#: ../plugins/bbdb/bbdb.c:586
msgid "Instant Messaging Contacts"
msgstr "Instant Messaging Contacts"
#. Enable Gaim Checkbox
-#: ../plugins/bbdb/bbdb.c:507
-msgid "Periodically synchronize contact information and images from gaim buddy list"
-msgstr "Periodically synchronise contact information and images from gaim buddy list"
+#: ../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:513
-msgid "Select Address book for Gaim buddy list"
-msgstr "Select Address book for Gaim buddy list"
+#: ../plugins/bbdb/bbdb.c:607
+msgid "Select Address book for Pidgin buddy list"
+msgstr "Select Address book for Pidgin buddy list"
#. Synchronize now button.
-#: ../plugins/bbdb/bbdb.c:524
+#: ../plugins/bbdb/bbdb.c:618
msgid "Synchronize with _buddy list now"
msgstr "Synchronise with _buddy list now"
@@ -14988,24 +15102,38 @@ msgstr "Automatically fills your addressbook with names and email addresses as y
msgid "BBDB"
msgstr "BBDB"
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:302
-msgid "Convert mail text to _Unicode"
-msgstr "Convert mail text to _Unicode"
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:303
+msgid "Convert message text to _Unicode"
+msgstr "Convert message text to _Unicode"
-#: ../plugins/bogo-junk-plugin/bogo-junk-plugin.schemas.in.in.h:1
-msgid "Convert mail text to Unicode"
-msgstr "Convert mail text to Unicode"
+#: ../plugins/bogo-junk-plugin/bogo-junk-plugin.schemas.in.h:1
+msgid "Convert mail messages to Unicode"
+msgstr "Convert mail messages to Unicode"
-#: ../plugins/bogo-junk-plugin/bogo-junk-plugin.schemas.in.in.h:2
+#: ../plugins/bogo-junk-plugin/bogo-junk-plugin.schemas.in.h:2
msgid "Convert message text to Unicode UTF-8 to unify spam/ham tokens coming from different character sets."
msgstr "Convert message text to Unicode UTF-8 to unify spam/ham tokens coming from different character sets."
+#: ../plugins/bogo-junk-plugin/org-gnome-bogo-junk-plugin.eplug.xml.h:1
+msgid "Bogofilter Options"
+msgstr "Bogofilter Options"
+
+#: ../plugins/bogo-junk-plugin/org-gnome-bogo-junk-plugin.eplug.xml.h:2
+msgid "Filters junk messages using Bogofilter."
+msgstr "Filters junk messages using Bogofilter."
+
#: ../plugins/caldav/caldav-source.c:64
#: ../plugins/caldav/caldav-source.c:68
msgid "CalDAV"
msgstr "CalDAV"
+#: ../plugins/caldav/caldav-source.c:247
+#: ../plugins/calendar-http/calendar-http.c:135
+msgid "_URL:"
+msgstr "_URL:"
+
#: ../plugins/caldav/caldav-source.c:269
+#: ../plugins/google-account-setup/google-source.c:351
msgid "Use _SSL"
msgstr "Use _SSL"
@@ -15025,10 +15153,20 @@ msgstr "Local Calendars"
msgid "Provides core functionality for local calendars."
msgstr "Provides core functionality for local calendars."
-#: ../plugins/calendar-http/calendar-http.c:339
+#: ../plugins/calendar-http/calendar-http.c:273
+#: ../plugins/calendar-weather/calendar-weather.c:546
+#: ../plugins/google-account-setup/google-source.c:375
+msgid "_Refresh:"
+msgstr "_Refresh:"
+
+#: ../plugins/calendar-http/calendar-http.c:341
msgid "_Secure connection"
msgstr "_Secure connection"
+#: ../plugins/calendar-http/calendar-http.c:406
+msgid "Userna_me:"
+msgstr "Userna_me:"
+
#: ../plugins/calendar-http/org-gnome-calendar-http.eplug.xml.h:1
msgid "HTTP Calendars"
msgstr "HTTP Calendars"
@@ -15070,15 +15208,15 @@ msgstr "Weather: Thunderstorms"
msgid "Select a location"
msgstr "Select a location"
-#: ../plugins/calendar-weather/calendar-weather.c:654
+#: ../plugins/calendar-weather/calendar-weather.c:652
msgid "_Units:"
msgstr "_Units:"
-#: ../plugins/calendar-weather/calendar-weather.c:661
+#: ../plugins/calendar-weather/calendar-weather.c:659
msgid "Metric (Celsius, cm, etc)"
msgstr "Metric (Celsius, cm, etc)"
-#: ../plugins/calendar-weather/calendar-weather.c:662
+#: ../plugins/calendar-weather/calendar-weather.c:660
msgid "Imperial (Fahrenheit, inches, etc)"
msgstr "Imperial (Fahrenheit, inches, etc)"
@@ -15098,11 +15236,11 @@ msgstr "A test plugin which demonstrates a pop-up menu plugin which lets you cop
msgid "Copy tool"
msgstr "Copy tool"
-#: ../plugins/default-mailer/apps-evolution-mail-prompts-checkdefault.schemas.in.in.h:1
+#: ../plugins/default-mailer/apps-evolution-mail-prompts-checkdefault.schemas.in.h:1
msgid "Check whether Evolution is the default mailer"
msgstr "Check whether Evolution is the default mailer"
-#: ../plugins/default-mailer/apps-evolution-mail-prompts-checkdefault.schemas.in.in.h:2
+#: ../plugins/default-mailer/apps-evolution-mail-prompts-checkdefault.schemas.in.h:2
msgid "Every time Evolution starts, check whether or not it is the default mailer."
msgstr "Every time Evolution starts, check whether or not it is the default mailer."
@@ -15118,8 +15256,13 @@ msgstr "Default Mail Client "
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-source/default-source.c:82
-#: ../plugins/default-source/default-source.c:109
+#: ../plugins/default-mailer/org-gnome-default-mailer.error.xml.h:2
+#: ../shell/main.c:626
+msgid "Evolution"
+msgstr "Evolution"
+
+#: ../plugins/default-source/default-source.c:81
+#: ../plugins/default-source/default-source.c:108
msgid "Mark as _default folder"
msgstr "Mark as _default folder"
@@ -15225,29 +15368,29 @@ msgstr "Folders Size"
msgid "Exchange Settings"
msgstr "Exchange Settings"
-#: ../plugins/exchange-operations/exchange-account-setup.c:610
+#: ../plugins/exchange-operations/exchange-account-setup.c:625
msgid "_OWA URL:"
msgstr "_OWA URL:"
-#: ../plugins/exchange-operations/exchange-account-setup.c:636
+#: ../plugins/exchange-operations/exchange-account-setup.c:651
msgid "A_uthenticate"
msgstr "A_uthenticate"
-#: ../plugins/exchange-operations/exchange-account-setup.c:829
-msgid "Authentication Type"
-msgstr "Authentication Type"
+#: ../plugins/exchange-operations/exchange-account-setup.c:854
+msgid "_Authentication Type"
+msgstr "_Authentication Type"
-#: ../plugins/exchange-operations/exchange-account-setup.c:843
+#: ../plugins/exchange-operations/exchange-account-setup.c:868
msgid "Ch_eck for Supported Types"
msgstr "Ch_eck for Supported Types"
-#: ../plugins/exchange-operations/exchange-account-setup.c:949
+#: ../plugins/exchange-operations/exchange-account-setup.c:974
#: ../plugins/exchange-operations/exchange-contacts.c:212
#, c-format
msgid "%s KB"
msgstr "%s KB"
-#: ../plugins/exchange-operations/exchange-account-setup.c:951
+#: ../plugins/exchange-operations/exchange-account-setup.c:976
#: ../plugins/exchange-operations/exchange-contacts.c:214
msgid "0 KB"
msgstr "0 KB"
@@ -15293,50 +15436,109 @@ msgstr "Your current password has expired. Please change your password now."
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:159
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:580
+msgid "Custom"
+msgstr "Custom"
+
+#: ../plugins/exchange-operations/exchange-delegates-user.c:189
+#: ../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:193
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:1
+msgid "Author (read, create)"
+msgstr "Author (read, create)"
+
+#: ../plugins/exchange-operations/exchange-delegates-user.c:197
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:11
+msgid "Reviewer (read-only)"
+msgstr "Reviewer (read-only)"
+
+#: ../plugins/exchange-operations/exchange-delegates-user.c:247
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:6
+msgid "Delegate Permissions"
+msgstr "Delegate Permissions"
+
+#: ../plugins/exchange-operations/exchange-delegates-user.c:258
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:188
+#, c-format
+msgid "Permissions for %s"
+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:348
+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."
+msgstr "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."
+
+#. To translators: Another chunk of the same message.
+#.
+#: ../plugins/exchange-operations/exchange-delegates-user.c:353
+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:371
+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:378
+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:410
+#, 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
msgid "Delegate To"
msgstr "Delegate To"
-#: ../plugins/exchange-operations/exchange-delegates.c:562
+#: ../plugins/exchange-operations/exchange-delegates.c:586
#, c-format
msgid "Remove the delegate %s?"
msgstr "Remove the delegate %s?"
-#: ../plugins/exchange-operations/exchange-delegates.c:680
+#: ../plugins/exchange-operations/exchange-delegates.c:704
msgid "Could not access Active Directory"
msgstr "Could not access Active Directory"
-#: ../plugins/exchange-operations/exchange-delegates.c:692
+#: ../plugins/exchange-operations/exchange-delegates.c:716
msgid "Could not find self in Active Directory"
msgstr "Could not find self in Active Directory"
-#: ../plugins/exchange-operations/exchange-delegates.c:705
+#: ../plugins/exchange-operations/exchange-delegates.c:729
#, 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:717
+#: ../plugins/exchange-operations/exchange-delegates.c:741
#, c-format
msgid "Could not remove delegate %s"
msgstr "Could not remove delegate %s"
-#: ../plugins/exchange-operations/exchange-delegates.c:777
+#: ../plugins/exchange-operations/exchange-delegates.c:801
msgid "Could not update list of delegates."
msgstr "Could not update list of delegates."
-#: ../plugins/exchange-operations/exchange-delegates.c:795
+#: ../plugins/exchange-operations/exchange-delegates.c:819
#, c-format
msgid "Could not add delegate %s"
msgstr "Could not add delegate %s"
-#: ../plugins/exchange-operations/exchange-delegates.c:963
+#: ../plugins/exchange-operations/exchange-delegates.c:987
msgid "Error reading delegates list."
msgstr "Error reading delegates list."
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:1
-msgid "Author (read, create)"
-msgstr "Author (read, create)"
-
#. Translators: This is used for permissions for <user> for the folder Calendar.
#: ../plugins/exchange-operations/exchange-delegates.glade.h:3
msgid "C_alendar:"
@@ -15347,27 +15549,14 @@ msgstr "C_alendar:"
msgid "Co_ntacts:"
msgstr "Co_ntacts:"
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:6
-#: ../plugins/exchange-operations/exchange-delegates-user.c:190
-msgid "Delegate Permissions"
-msgstr "Delegate Permissions"
-
#: ../plugins/exchange-operations/exchange-delegates.glade.h:7
msgid "Delegates"
msgstr "Delegates"
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:8
-msgid "Editor (read, create, edit)"
-msgstr "Editor (read, create, edit)"
-
#: ../plugins/exchange-operations/exchange-delegates.glade.h:10
msgid "Permissions for"
msgstr "Permissions for"
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:11
-msgid "Reviewer (read-only)"
-msgstr "Reviewer (read-only)"
-
#: ../plugins/exchange-operations/exchange-delegates.glade.h:12
msgid ""
"These users will be able to send mail on your behalf\n"
@@ -15385,52 +15574,25 @@ msgstr "_Delegate can see private items"
msgid "_Inbox:"
msgstr "_Inbox:"
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:18
+msgid "_Summarize permissions"
+msgstr "_Summarise permissions"
+
#. Translators: This is used for permissions for <user> for the folder Tasks.
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:19
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:20
msgid "_Tasks:"
msgstr "_Tasks:"
-#. Custom
-#: ../plugins/exchange-operations/exchange-delegates-user.c:143
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:580
-#: ../widgets/table/e-table-header-item.c:1554
-msgid "Custom"
-msgstr "Custom"
-
-#: ../plugins/exchange-operations/exchange-delegates-user.c:201
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:188
-#, c-format
-msgid "Permissions for %s"
-msgstr "Permissions for %s"
-
-#: ../plugins/exchange-operations/exchange-folder.c:66
-#: ../plugins/exchange-operations/exchange-folder.c:235
-#: ../plugins/exchange-operations/exchange-folder.c:245
-msgid "Unsubscribe Folder..."
-msgstr "Unsubscribe Folder..."
-
-#: ../plugins/exchange-operations/exchange-folder.c:465
-#: ../plugins/exchange-operations/exchange-folder.c:520
-#, 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
-#, c-format
-msgid "Unsubscribe from \"%s\""
-msgstr "Unsubscribe from \"%s\""
-
#: ../plugins/exchange-operations/exchange-folder-permission.c:61
#: ../plugins/exchange-operations/org-gnome-folder-permissions.xml.h:2
msgid "Permissions..."
msgstr "Permissions..."
-#: ../plugins/exchange-operations/exchange-folder-size-display.c:135
+#: ../plugins/exchange-operations/exchange-folder-size-display.c:133
msgid "Folder Name"
msgstr "Folder Name"
-#: ../plugins/exchange-operations/exchange-folder-size-display.c:139
+#: ../plugins/exchange-operations/exchange-folder-size-display.c:137
msgid "Folder Size"
msgstr "Folder Size"
@@ -15443,6 +15605,24 @@ 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
+msgid "Unsubscribe Folder..."
+msgstr "Unsubscribe Folder..."
+
+#: ../plugins/exchange-operations/exchange-folder.c:465
+#: ../plugins/exchange-operations/exchange-folder.c:520
+#, 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
+#, c-format
+msgid "Unsubscribe from \"%s\""
+msgstr "Unsubscribe from \"%s\""
+
#: ../plugins/exchange-operations/exchange-oof.glade.h:1
msgid ""
"<b>Currently, your status is \"Out of the Office\". </b>\n"
@@ -15616,9 +15796,21 @@ msgid "Request a _read receipt for this message"
msgstr "Request a _read receipt for this message"
#: ../plugins/exchange-operations/exchange-send-options.glade.h:14
+msgid "Send as Delegate"
+msgstr "Send as Delegate"
+
+#: ../plugins/exchange-operations/exchange-send-options.glade.h:15
msgid "_Sensitivity: "
msgstr "_Sensitivity: "
+#: ../plugins/exchange-operations/exchange-send-options.glade.h:16
+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
msgid "Select User"
msgstr "Select User"
@@ -15770,7 +15962,7 @@ msgid "Folder offline"
msgstr "Folder offline"
#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:38
-#: ../shell/e-shell.c:1272
+#: ../shell/e-shell.c:1288
msgid "Generic error"
msgstr "Generic error"
@@ -15815,34 +16007,38 @@ msgid "Password successfully changed."
msgstr "Password successfully changed."
#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:50
+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
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:51
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:52
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:52
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:53
msgid "Please select a user."
msgstr "Please select a user."
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:53
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:54
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:54
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:55
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:55
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:56
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:56
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:57
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:57
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:58
msgid ""
"The server is running Exchange 5.5. Exchange Connector \n"
"supports Microsoft Exchange 2000 and 2003 only."
@@ -15850,7 +16046,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:59
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:60
msgid ""
"This probably means that your server requires \n"
"you to specify the Windows domain name \n"
@@ -15864,75 +16060,79 @@ msgstr ""
"\n"
"Or you might have just typed your password wrong."
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:64
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:65
msgid "Try again with a different password."
msgstr "Try again with a different password."
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:65
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:66
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:66
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:67
msgid "Unable to edit delegates."
msgstr "Unable to edit delegates."
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:67
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:68
msgid "Unknown error looking up {0}"
msgstr "Unknown error looking up {0}"
-#: ../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."
msgstr "Unknown error."
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:69
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:70
msgid "Unknown type"
msgstr "Unknown type"
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:70
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:71
msgid "Unsupported operation"
msgstr "Unsupported operation"
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:71
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:72
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:72
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:73
+msgid "You are permitted to send a message on behalf of only one delegator at a time."
+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
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:73
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:75
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:74
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:76
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:75
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:77
msgid "Your current usage is: {0} KB. Try to clear up some space by deleting some mail."
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:76
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:78
msgid "Your current usage is: {0} KB. You will not be able to either send or receive mail now."
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:77
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:79
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."
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:78
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:80
msgid "Your password has expired."
msgstr "Your password has expired."
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:80
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:82
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:81
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:83
msgid "{0} is already a delegate"
msgstr "{0} is already a delegate"
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:82
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:84
msgid "{0} is already in the list"
msgstr "{0} is already in the list"
@@ -15944,7 +16144,44 @@ msgstr "Subscribe to Other User's Tasks"
msgid "Check folder permissions"
msgstr "Check folder permissions"
-#: ../plugins/folder-unsubscribe/folder-unsubscribe.c:57
+#: ../plugins/external-editor/org-gnome-external-editor.eplug.xml.h:1
+msgid "A plugin for using an external editor as the composer. You can send only plain-text messages."
+msgstr "A plugin for using an external editor as the composer. You can send only plain-text messages."
+
+#. the path to the shared library
+#: ../plugins/external-editor/org-gnome-external-editor.eplug.xml.h:3
+msgid "External Editor"
+msgstr "External Editor"
+
+#: ../plugins/external-editor/org-gnome-external-editor.xml.h:1
+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/face/face.c:57
+msgid "Select a (48*48) png of size < 700bytes"
+msgstr "Select a (48*48) png of size < 700bytes"
+
+#: ../plugins/face/face.c:67
+msgid "PNG files"
+msgstr "PNG files"
+
+#: ../plugins/face/org-gnome-face-ui.xml.h:1
+msgid "_Face"
+msgstr "_Face"
+
+#: ../plugins/face/org-gnome-face.eplug.xml.h:1
+msgid "Attach Face header to outgoing messages. First time the user needs to configure a 48*48 png image. It is base64 encoded and stored in ~/.evolution/faces This will be used in messages that are sent further."
+msgstr "Attach Face header to outgoing messages. First time the user needs to configure a 48*48 png image. It is base64 encoded and stored in ~/.evolution/faces This will be used in messages that are sent further."
+
+#: ../plugins/face/org-gnome-face.eplug.xml.h:2
+msgid "Face"
+msgstr "Face"
+
+#: ../plugins/folder-unsubscribe/folder-unsubscribe.c:56
#, c-format
msgid "Unsubscribing from folder \"%s\""
msgstr "Unsubscribing from folder \"%s\""
@@ -15961,6 +16198,19 @@ msgstr "Unsubscribe Folders"
msgid "_Unsubscribe"
msgstr "_Unsubscribe"
+#: ../plugins/google-account-setup/google-source.c:71
+#: ../plugins/google-account-setup/google-source.c:78
+msgid "Google"
+msgstr "Google"
+
+#: ../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."
+
+#: ../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:432
msgid "Checklist"
msgstr "Checklist"
@@ -16006,15 +16256,16 @@ msgstr "Install the shared folder"
msgid "Shared Folder Installation"
msgstr "Shared Folder Installation"
-#: ../plugins/groupwise-features/junk-mail-settings.c:77
+#: ../plugins/groupwise-features/junk-mail-settings.c:78
msgid "Junk Settings"
msgstr "Junk Settings"
-#: ../plugins/groupwise-features/junk-mail-settings.c:90
-msgid "<b>Junk Mail Settings</b>"
-msgstr "<b>Junk Mail Settings</b>"
+#: ../plugins/groupwise-features/junk-mail-settings.c:91
+#: ../plugins/groupwise-features/junk-settings.glade.h:3
+msgid "Junk Mail Settings"
+msgstr "Junk Mail Settings"
-#: ../plugins/groupwise-features/junk-mail-settings.c:112
+#: ../plugins/groupwise-features/junk-mail-settings.c:115
msgid "Junk Mail Settings..."
msgstr "Junk Mail Settings..."
@@ -16026,10 +16277,6 @@ msgstr "<b>Junk List:</b>"
msgid "Email:"
msgstr "Email:"
-#: ../plugins/groupwise-features/junk-settings.glade.h:3
-msgid "Junk Mail Settings"
-msgstr "Junk Mail Settings"
-
#: ../plugins/groupwise-features/junk-settings.glade.h:5
#: ../plugins/mail-account-disable/mail-account-disable.c:46
msgid "_Disable"
@@ -16078,27 +16325,27 @@ msgstr "Accept Tentatively"
msgid "<b>Users:</b>"
msgstr "<b>Users:</b>"
+#: ../plugins/groupwise-features/properties.glade.h:2
+msgid "C_ustomize notification message"
+msgstr "C_ustomise notification message"
+
#: ../plugins/groupwise-features/properties.glade.h:3
-#: ../widgets/table/e-table-click-to-add.c:509
+msgid "Con_tacts..."
+msgstr "Con_tacts..."
+
+#: ../plugins/groupwise-features/properties.glade.h:5
+#: ../widgets/table/e-table-click-to-add.c:517
msgid "Message"
msgstr "Message"
-#: ../plugins/groupwise-features/properties.glade.h:5
+#: ../plugins/groupwise-features/properties.glade.h:6
msgid "Shared Folder Notification"
msgstr "Shared Folder Notification"
-#: ../plugins/groupwise-features/properties.glade.h:7
+#: ../plugins/groupwise-features/properties.glade.h:8
msgid "The participants will receive the following notification.\n"
msgstr "The participants will receive the following notification.\n"
-#: ../plugins/groupwise-features/properties.glade.h:10
-msgid "_Contacts..."
-msgstr "_Contacts..."
-
-#: ../plugins/groupwise-features/properties.glade.h:11
-msgid "_Customize notification message"
-msgstr "_Customise notification message"
-
#: ../plugins/groupwise-features/properties.glade.h:12
msgid "_Not Shared"
msgstr "_Not Shared"
@@ -16148,124 +16395,124 @@ msgid "Subscribe to my _notifications"
msgstr "Subscribe to my _notifications"
#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:13
-#: ../ui/evolution-mail-message.xml.h:126
-msgid "_Read"
-msgstr "_Read"
-
-#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:14
msgid "_Write"
msgstr "_Write"
-#: ../plugins/groupwise-features/proxy.c:503
+#. To Translators: strip the part in front of the | and the | itself
+#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:15
+msgid "permission to read|_Read"
+msgstr "_Read"
+
+#: ../plugins/groupwise-features/proxy-listing.glade.h:1
+msgid "Proxy"
+msgstr "Proxy"
+
+#: ../plugins/groupwise-features/proxy-login-dialog.glade.h:1
+msgid "<b>Account Name</b>"
+msgstr "<b>Account Name</b>"
+
+#: ../plugins/groupwise-features/proxy-login-dialog.glade.h:2
+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/send-options.c:83
#, c-format
msgid "%sEnter password for %s (user %s)"
msgstr "%sEnter password for %s (user %s)"
-#: ../plugins/groupwise-features/proxy.c:697
-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:702
-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/proxy-listing.glade.h:1
-msgid "Proxy"
-msgstr "Proxy"
-
#. 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:516
+#: ../plugins/groupwise-features/proxy-login.c:521
msgid "_Proxy Login..."
msgstr "_Proxy Login..."
-#: ../plugins/groupwise-features/proxy-login-dialog.glade.h:1
-msgid "<b>Account Name</b>"
-msgstr "<b>Account Name</b>"
+#: ../plugins/groupwise-features/proxy.c:701
+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-login-dialog.glade.h:2
-msgid "Proxy Login"
-msgstr "Proxy Login"
+#: ../plugins/groupwise-features/proxy.c:706
+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.c:760
-#: ../plugins/groupwise-features/share-folder-common.c:322
+#: ../plugins/groupwise-features/share-folder-common.c:319
+#: ../plugins/groupwise-features/share-folder.c:761
msgid "Users"
msgstr "Users"
-#: ../plugins/groupwise-features/share-folder.c:765
-msgid "Add "
-msgstr "Add "
-
-#: ../plugins/groupwise-features/share-folder.c:771
-msgid "Modify"
-msgstr "Modify"
-
-#: ../plugins/groupwise-features/share-folder-common.c:323
+#: ../plugins/groupwise-features/share-folder-common.c:320
msgid "Enter the users and set permissions"
msgstr "Enter the users and set permissions"
-#: ../plugins/groupwise-features/share-folder-common.c:342
+#: ../plugins/groupwise-features/share-folder-common.c:339
msgid "New _Shared Folder..."
msgstr "New _Shared Folder..."
-#: ../plugins/groupwise-features/share-folder-common.c:450
+#: ../plugins/groupwise-features/share-folder-common.c:447
msgid "Sharing"
msgstr "Sharing"
-#: ../plugins/groupwise-features/status-track.c:103
+#: ../plugins/groupwise-features/share-folder.c:766
+msgid "Add "
+msgstr "Add "
+
+#: ../plugins/groupwise-features/share-folder.c:772
+msgid "Modify"
+msgstr "Modify"
+
+#: ../plugins/groupwise-features/status-track.c:105
msgid "Message Status"
msgstr "Message Status"
#. Subject
-#: ../plugins/groupwise-features/status-track.c:117
-msgid "<b>Subject</b> :"
-msgstr "<b>Subject</b> :"
+#: ../plugins/groupwise-features/status-track.c:119
+msgid "Subject:"
+msgstr "Subject:"
-#: ../plugins/groupwise-features/status-track.c:129
-msgid "<b>From</b> :"
-msgstr "<b>From</b> :"
+#: ../plugins/groupwise-features/status-track.c:133
+msgid "From:"
+msgstr "From:"
-#: ../plugins/groupwise-features/status-track.c:142
-msgid "<b>Creation date</b> :"
-msgstr "<b>Creation date</b> :"
+#: ../plugins/groupwise-features/status-track.c:148
+msgid "Creation date:"
+msgstr "Creation date:"
-#: ../plugins/groupwise-features/status-track.c:178
+#: ../plugins/groupwise-features/status-track.c:187
msgid "Recipient: "
msgstr "Recipient: "
-#: ../plugins/groupwise-features/status-track.c:185
+#: ../plugins/groupwise-features/status-track.c:194
msgid "Delivered: "
msgstr "Delivered: "
-#: ../plugins/groupwise-features/status-track.c:191
+#: ../plugins/groupwise-features/status-track.c:200
msgid "Opened: "
msgstr "Opened: "
-#: ../plugins/groupwise-features/status-track.c:196
+#: ../plugins/groupwise-features/status-track.c:205
msgid "Accepted: "
msgstr "Accepted: "
-#: ../plugins/groupwise-features/status-track.c:201
+#: ../plugins/groupwise-features/status-track.c:210
msgid "Deleted: "
msgstr "Deleted: "
-#: ../plugins/groupwise-features/status-track.c:206
+#: ../plugins/groupwise-features/status-track.c:215
msgid "Declined: "
msgstr "Declined: "
-#: ../plugins/groupwise-features/status-track.c:211
+#: ../plugins/groupwise-features/status-track.c:220
msgid "Completed: "
msgstr "Completed: "
-#: ../plugins/groupwise-features/status-track.c:216
-msgid "Un-delivered: "
-msgstr "Un-delivered: "
+#: ../plugins/groupwise-features/status-track.c:225
+msgid "Undelivered: "
+msgstr "Undelivered: "
-#: ../plugins/groupwise-features/status-track.c:241
+#: ../plugins/groupwise-features/status-track.c:249
msgid "Track Message Status..."
msgstr "Track Message Status..."
@@ -16277,15 +16524,11 @@ msgstr "A plugin to setup hula calendar sources."
msgid "Hula Account Setup"
msgstr "Hula Account Setup"
-#: ../plugins/imap-features/imap-headers.c:133
-msgid "Custom Header"
-msgstr "Custom Header"
-
-#: ../plugins/imap-features/imap-headers.c:245
+#: ../plugins/imap-features/imap-headers.c:322
msgid "Custom Headers"
msgstr "Custom Headers"
-#: ../plugins/imap-features/imap-headers.c:252
+#: ../plugins/imap-features/imap-headers.c:335
msgid "IMAP Headers"
msgstr "IMAP Headers"
@@ -16294,8 +16537,8 @@ msgid "<b>Custom Headers</b>"
msgstr "<b>Custom Headers</b>"
#: ../plugins/imap-features/imap-headers.glade.h:2
-msgid "<b>IMAP Headers </b>"
-msgstr "<b>IMAP Headers </b>"
+msgid "<b>IMAP Headers</b>"
+msgstr "<b>IMAP Headers</b>"
#: ../plugins/imap-features/imap-headers.glade.h:3
msgid "Basic and _Mailing List Headers (Default)"
@@ -16337,28 +16580,28 @@ msgstr "A plugin for the features in the IMAP accounts."
msgid "IMAP Features"
msgstr "IMAP Features"
-#: ../plugins/import-ics-attachments/icsimporter.c:83
+#: ../plugins/import-ics-attachments/icsimporter.c:82
msgid "_Import to Calendar"
msgstr "_Import to Calendar"
-#: ../plugins/import-ics-attachments/icsimporter.c:88
+#: ../plugins/import-ics-attachments/icsimporter.c:87
msgid "_Import to Tasks"
msgstr "_Import to Tasks"
-#: ../plugins/import-ics-attachments/icsimporter.c:206
+#: ../plugins/import-ics-attachments/icsimporter.c:205
msgid "Import ICS"
msgstr "Import ICS"
-#: ../plugins/import-ics-attachments/icsimporter.c:233
+#: ../plugins/import-ics-attachments/icsimporter.c:228
msgid "Select Task List"
msgstr "Select Task List"
-#: ../plugins/import-ics-attachments/icsimporter.c:237
+#: ../plugins/import-ics-attachments/icsimporter.c:232
msgid "Select Calendar"
msgstr "Select Calendar"
-#: ../plugins/import-ics-attachments/icsimporter.c:267
-#: ../shell/e-shell-importer.c:700
+#: ../plugins/import-ics-attachments/icsimporter.c:262
+#: ../shell/e-shell-importer.c:703
msgid "_Import"
msgstr "_Import"
@@ -16371,24 +16614,30 @@ msgstr "Import to Calendar"
msgid "Imports ICS attachments to calendar."
msgstr "Imports ICS attachments to calendar."
-#: ../plugins/ipod-sync/evolution-ipod-sync.c:62
-msgid ""
-"<span weight=\"bold\" size=\"larger\">Search for an iPod failed</span>\n"
-"\n"
-"Evolution could not find an iPod to synchronize with. Either the iPod is not connected to the system or it is not powered on."
-msgstr ""
-"<span weight=\"bold\" size=\"larger\">Search for an iPod failed</span>\n"
-"\n"
-"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/evolution-ipod-sync.c:34
+msgid "Hardware Abstraction Layer not loaded"
+msgstr "Hardware Abstraction Layer not loaded"
-#: ../plugins/ipod-sync/ical-format.c:137
-#: ../plugins/save-calendar/ical-format.c:194
+#: ../plugins/ipod-sync/evolution-ipod-sync.c:35
+msgid "The \"hald\" service is required but not currently running. Please enable the service and rerun this program, or contact your system administrator."
+msgstr "The \"hald\" service is required but not currently running. Please enable the service and rerun this program, or contact your system administrator."
+
+#: ../plugins/ipod-sync/evolution-ipod-sync.c:68
+msgid "Search for an iPod failed"
+msgstr "Search for an iPod failed"
+
+#: ../plugins/ipod-sync/evolution-ipod-sync.c:69
+msgid "Evolution could not find an iPod to synchronize with. Either the iPod is not connected to the system or it is not powered on."
+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:133
+#: ../plugins/save-calendar/ical-format.c:190
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/calendar/addressbook with Apple iPod"
-msgstr "Synchronise the selected task/calendar/addressbook with Apple iPod"
+msgid "Synchronize the selected task/memo/calendar/addressbook with Apple iPod"
+msgstr "Synchronise the selected task/memo/calendar/addressbook with an Apple iPod"
#: ../plugins/ipod-sync/org-gnome-ipod-sync-evolution.eplug.xml.h:2
msgid "Synchronize to iPod"
@@ -16398,176 +16647,181 @@ msgstr "Synchronise to iPod"
msgid "iPod Synchronization"
msgstr "iPod Synchronisation"
-#: ../plugins/ipod-sync/sync.c:158
-msgid "No output directory!"
-msgstr "No output directory!"
-
-#: ../plugins/ipod-sync/sync.c:159
-msgid "The output directory was not found on iPod! Please ensure that iPod has been correctly set up and try again."
-msgstr "The output directory was not found on the iPod! Please ensure that the iPod has been correctly set up and try again."
-
-#: ../plugins/ipod-sync/sync.c:174
-#: ../plugins/ipod-sync/sync.c:202
-msgid "Could not export data!"
-msgstr "Could not export data!"
-
-#: ../plugins/ipod-sync/sync.c:203
-msgid "Exporting data failed."
-msgstr "Exporting data failed."
-
-#: ../plugins/ipod-sync/sync.c:231
-msgid "Could not open addressbook!"
-msgstr "Could not open addressbook!"
-
-#: ../plugins/ipod-sync/sync.c:232
-msgid "Could not open the Evolution addressbook to export data."
-msgstr "Could not open the Evolution addressbook to export data."
-
-#: ../plugins/ipod-sync/sync.c:291
-msgid "Could not open calendar/todo!"
-msgstr "Could not open calendar/todo!"
-
-#: ../plugins/ipod-sync/sync.c:292
-msgid "Could not open the Evolution calendar/todo list to export data."
-msgstr "Could not open the Evolution calendar/todo list to export data."
-
-#: ../plugins/itip-formatter/itip-formatter.c:274
-#: ../plugins/itip-formatter/itip-formatter.c:395
+#: ../plugins/itip-formatter/itip-formatter.c:439
+#: ../plugins/itip-formatter/itip-formatter.c:564
#, c-format
msgid "Failed to load the calendar '%s'"
msgstr "Failed to load the calendar '%s'"
-#: ../plugins/itip-formatter/itip-formatter.c:415
+#: ../plugins/itip-formatter/itip-formatter.c:584
#, 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:441
+#: ../plugins/itip-formatter/itip-formatter.c:610
#, c-format
msgid "Found the appointment in the calendar '%s'"
msgstr "Found the appointment in the calendar '%s'"
-#: ../plugins/itip-formatter/itip-formatter.c:517
+#: ../plugins/itip-formatter/itip-formatter.c:686
msgid "Unable to find any calendars"
msgstr "Unable to find any calendars"
-#: ../plugins/itip-formatter/itip-formatter.c:524
+#: ../plugins/itip-formatter/itip-formatter.c:693
msgid "Unable to find this meeting in any calendar"
msgstr "Unable to find this meeting in any calendar"
-#: ../plugins/itip-formatter/itip-formatter.c:528
+#: ../plugins/itip-formatter/itip-formatter.c:697
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:532
-msgid "Unable to find this journal entry in any journal"
-msgstr "Unable to find this journal entry in any journal"
+#: ../plugins/itip-formatter/itip-formatter.c:701
+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:605
+#: ../plugins/itip-formatter/itip-formatter.c:772
msgid "Searching for an existing version of this appointment"
msgstr "Searching for an existing version of this appointment"
-#: ../plugins/itip-formatter/itip-formatter.c:801
+#: ../plugins/itip-formatter/itip-formatter.c:935
msgid "Unable to parse item"
msgstr "Unable to parse item"
-#: ../plugins/itip-formatter/itip-formatter.c:859
+#: ../plugins/itip-formatter/itip-formatter.c:993
#, 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:871
+#: ../plugins/itip-formatter/itip-formatter.c:1005
#, c-format
msgid "Sent to calendar '%s' as accepted"
msgstr "Sent to calendar '%s' as accepted"
-#: ../plugins/itip-formatter/itip-formatter.c:875
+#: ../plugins/itip-formatter/itip-formatter.c:1009
#, c-format
msgid "Sent to calendar '%s' as tentative"
msgstr "Sent to calendar '%s' as tentative"
-#: ../plugins/itip-formatter/itip-formatter.c:880
+#: ../plugins/itip-formatter/itip-formatter.c:1014
#, c-format
msgid "Sent to calendar '%s' as declined"
msgstr "Sent to calendar '%s' as declined"
-#: ../plugins/itip-formatter/itip-formatter.c:885
+#: ../plugins/itip-formatter/itip-formatter.c:1019
#, c-format
msgid "Sent to calendar '%s' as canceled"
msgstr "Sent to calendar '%s' as cancelled"
-#: ../plugins/itip-formatter/itip-formatter.c:979
+#: ../plugins/itip-formatter/itip-formatter.c:1113
#, c-format
msgid "Organizer has removed the delegate %s "
msgstr "Organizer has removed the delegate %s "
-#: ../plugins/itip-formatter/itip-formatter.c:986
+#: ../plugins/itip-formatter/itip-formatter.c:1120
msgid "Sent a cancelation notice to the delegate"
msgstr "Sent a cancellation notice to the delegate"
-#: ../plugins/itip-formatter/itip-formatter.c:988
+#: ../plugins/itip-formatter/itip-formatter.c:1122
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:1073
+#: ../plugins/itip-formatter/itip-formatter.c:1207
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:1100
+#: ../plugins/itip-formatter/itip-formatter.c:1234
#, c-format
msgid "Unable to update attendee. %s"
msgstr "Unable to update attendee. %s"
-#: ../plugins/itip-formatter/itip-formatter.c:1104
+#: ../plugins/itip-formatter/itip-formatter.c:1238
msgid "Attendee status updated"
msgstr "Attendee status updated"
-#: ../plugins/itip-formatter/itip-formatter.c:1231
+#: ../plugins/itip-formatter/itip-formatter.c:1263
+msgid "Meeting information sent"
+msgstr "Meeting information sent"
+
+#: ../plugins/itip-formatter/itip-formatter.c:1266
+msgid "Task information sent"
+msgstr "Task information sent"
+
+#: ../plugins/itip-formatter/itip-formatter.c:1269
+msgid "Memo information sent"
+msgstr "Memo information sent"
+
+#: ../plugins/itip-formatter/itip-formatter.c:1278
+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:1281
+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:1284
+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:1359
+#: ../plugins/itip-formatter/itip-formatter.c:1374
msgid "The calendar attached is not valid"
msgstr "The calendar attached is not valid"
-#: ../plugins/itip-formatter/itip-formatter.c:1232
+#: ../plugins/itip-formatter/itip-formatter.c:1360
+#: ../plugins/itip-formatter/itip-formatter.c:1375
msgid "The message claims to contain a calendar, but the calendar is not a valid iCalendar."
msgstr "The message claims to contain a calendar, but the calendar is not a valid iCalendar."
-#: ../plugins/itip-formatter/itip-formatter.c:1267
-#: ../plugins/itip-formatter/itip-formatter.c:1285
-#: ../plugins/itip-formatter/itip-formatter.c:1363
+#: ../plugins/itip-formatter/itip-formatter.c:1410
+#: ../plugins/itip-formatter/itip-formatter.c:1428
+#: ../plugins/itip-formatter/itip-formatter.c:1510
msgid "The item in the calendar is not valid"
msgstr "The item in the calendar is not valid"
-#: ../plugins/itip-formatter/itip-formatter.c:1268
-#: ../plugins/itip-formatter/itip-formatter.c:1286
-#: ../plugins/itip-formatter/itip-formatter.c:1364
+#: ../plugins/itip-formatter/itip-formatter.c:1411
+#: ../plugins/itip-formatter/itip-formatter.c:1429
+#: ../plugins/itip-formatter/itip-formatter.c:1511
msgid "The message does contain a calendar, but the calendar contains no events, tasks or free/busy information"
msgstr "The message does contain a calendar, but the calendar contains no events, tasks or free/busy information"
-#: ../plugins/itip-formatter/itip-formatter.c:1297
+#: ../plugins/itip-formatter/itip-formatter.c:1440
msgid "The calendar attached contains multiple items"
msgstr "The calendar attached contains multiple items"
-#: ../plugins/itip-formatter/itip-formatter.c:1298
+#: ../plugins/itip-formatter/itip-formatter.c:1441
msgid "To process all of these items, the file should be saved and the calendar imported"
msgstr "To process all of these items, the file should be saved and the calendar imported"
+#: ../plugins/itip-formatter/itip-formatter.c:2133
+msgid "This meeting recurs"
+msgstr "This meeting recurs"
+
+#: ../plugins/itip-formatter/itip-formatter.c:2136
+msgid "This task recurs"
+msgstr "This task recurs"
+
+#: ../plugins/itip-formatter/itip-formatter.c:2139
+msgid "This memo recurs"
+msgstr "This memo recurs"
+
#. Delete message after acting
#. FIXME Need a schema for this
-#: ../plugins/itip-formatter/itip-formatter.c:2103
+#: ../plugins/itip-formatter/itip-formatter.c:2354
msgid "_Delete message after acting"
msgstr "_Delete message after acting"
-#: ../plugins/itip-formatter/itip-formatter.c:2113
-#: ../plugins/itip-formatter/itip-formatter.c:2145
+#: ../plugins/itip-formatter/itip-formatter.c:2364
+#: ../plugins/itip-formatter/itip-formatter.c:2396
msgid "Conflict Search"
msgstr "Conflict Search"
#. Source selector
-#: ../plugins/itip-formatter/itip-formatter.c:2128
+#: ../plugins/itip-formatter/itip-formatter.c:2379
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:187
+#: ../plugins/itip-formatter/itip-view.c:192
#: ../ui/evolution-calendar.xml.h:34
#: ../widgets/misc/e-cell-date-edit.c:239
msgid "Today"
@@ -16575,394 +16829,446 @@ msgstr "Today"
#. strftime format of a time,
#. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:192
+#: ../plugins/itip-formatter/itip-view.c:197
msgid "Today %H:%M"
msgstr "Today %H:%M"
#. strftime format of a time,
#. in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:196
+#: ../plugins/itip-formatter/itip-view.c:201
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:205
+#: ../plugins/itip-formatter/itip-view.c:210
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:215
+#: ../plugins/itip-formatter/itip-view.c:220
msgid "Tomorrow"
msgstr "Tomorrow"
#. strftime format of a time,
#. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:220
+#: ../plugins/itip-formatter/itip-view.c:225
msgid "Tomorrow %H:%M"
msgstr "Tomorrow %H:%M"
#. strftime format of a time,
#. in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:224
+#: ../plugins/itip-formatter/itip-view.c:229
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:229
+#: ../plugins/itip-formatter/itip-view.c:234
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:233
+#: ../plugins/itip-formatter/itip-view.c:238
msgid "Tomorrow %l:%M:%S %p"
msgstr "Tomorrow %l:%M:%S %p"
#. strftime format of a weekday.
-#: ../plugins/itip-formatter/itip-view.c:252
+#: ../plugins/itip-formatter/itip-view.c:257
#, 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:257
+#: ../plugins/itip-formatter/itip-view.c:262
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:261
+#: ../plugins/itip-formatter/itip-view.c:266
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:266
+#: ../plugins/itip-formatter/itip-view.c:271
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:270
+#: ../plugins/itip-formatter/itip-view.c:275
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:279
+#: ../plugins/itip-formatter/itip-view.c:284
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:285
+#: ../plugins/itip-formatter/itip-view.c:290
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:289
+#: ../plugins/itip-formatter/itip-view.c:294
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:294
+#: ../plugins/itip-formatter/itip-view.c:299
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:298
+#: ../plugins/itip-formatter/itip-view.c:303
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:304
+#: ../plugins/itip-formatter/itip-view.c:309
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:309
+#: ../plugins/itip-formatter/itip-view.c:314
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:313
+#: ../plugins/itip-formatter/itip-view.c:318
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:318
+#: ../plugins/itip-formatter/itip-view.c:323
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:322
+#: ../plugins/itip-formatter/itip-view.c:327
msgid "%A, %B %e, %Y %l:%M:%S %p"
msgstr "%A, %B %e, %Y %l:%M:%S %p"
-#: ../plugins/itip-formatter/itip-view.c:347
+#: ../plugins/itip-formatter/itip-view.c:352
+#: ../plugins/itip-formatter/itip-view.c:440
+#: ../plugins/itip-formatter/itip-view.c:528
+#, 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
+#, 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
#, 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:349
+#: ../plugins/itip-formatter/itip-view.c:361
#, 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:354
+#: ../plugins/itip-formatter/itip-view.c:366
#, 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:357
+#: ../plugins/itip-formatter/itip-view.c:369
#, 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:359
+#: ../plugins/itip-formatter/itip-view.c:371
#, 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:365
+#: ../plugins/itip-formatter/itip-view.c:377
#, 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:367
+#: ../plugins/itip-formatter/itip-view.c:379
#, 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:370
+#: ../plugins/itip-formatter/itip-view.c:383
+#, c-format
+msgid "<b>%s</b> through %s wishes to receive the latest information for the following meeting:"
+msgstr "<b>%s</b> through %s wishes to receive the latest information for the following meeting:"
+
+#: ../plugins/itip-formatter/itip-view.c:385
#, 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:373
+#: ../plugins/itip-formatter/itip-view.c:389
+#, 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
#, 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:377
+#: ../plugins/itip-formatter/itip-view.c:395
#, 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:379
+#: ../plugins/itip-formatter/itip-view.c:397
#, 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:382
+#: ../plugins/itip-formatter/itip-view.c:401
+#, 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
#, 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:386
+#: ../plugins/itip-formatter/itip-view.c:407
#, 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:388
+#: ../plugins/itip-formatter/itip-view.c:409
#, 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:415
+#: ../plugins/itip-formatter/itip-view.c:447
#, 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:417
+#: ../plugins/itip-formatter/itip-view.c:449
#, 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:422
+#: ../plugins/itip-formatter/itip-view.c:454
#, 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:425
+#: ../plugins/itip-formatter/itip-view.c:457
#, 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:427
+#: ../plugins/itip-formatter/itip-view.c:459
#, 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:433
+#: ../plugins/itip-formatter/itip-view.c:465
#, 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:435
+#: ../plugins/itip-formatter/itip-view.c:467
#, 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:438
+#: ../plugins/itip-formatter/itip-view.c:471
+#, c-format
+msgid "<b>%s</b> through %s wishes to receive the latest information for the following assigned task:"
+msgstr "<b>%s</b> through %s wishes to receive the latest information for the following assigned task:"
+
+#: ../plugins/itip-formatter/itip-view.c:473
#, c-format
msgid "<b>%s</b> wishes to receive the latest information for the following assigned task:"
msgstr "<b>%s</b> wishes to receive the latest information for the following assigned task:"
-#: ../plugins/itip-formatter/itip-view.c:441
+#: ../plugins/itip-formatter/itip-view.c:477
+#, 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
#, 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:445
+#: ../plugins/itip-formatter/itip-view.c:483
#, 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:447
+#: ../plugins/itip-formatter/itip-view.c:485
#, 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:450
+#: ../plugins/itip-formatter/itip-view.c:489
+#, 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
#, 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:454
+#: ../plugins/itip-formatter/itip-view.c:495
#, 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:456
+#: ../plugins/itip-formatter/itip-view.c:497
#, 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:483
+#: ../plugins/itip-formatter/itip-view.c:535
#, 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:485
+#: ../plugins/itip-formatter/itip-view.c:537
#, 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:490
+#: ../plugins/itip-formatter/itip-view.c:542
#, 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:492
+#: ../plugins/itip-formatter/itip-view.c:544
#, 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:496
+#: ../plugins/itip-formatter/itip-view.c:548
#, 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:498
+#: ../plugins/itip-formatter/itip-view.c:550
#, 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:762
+#: ../plugins/itip-formatter/itip-view.c:821
msgid "_Open Calendar"
msgstr "_Open Calendar"
-#: ../plugins/itip-formatter/itip-view.c:768
-#: ../plugins/itip-formatter/itip-view.c:772
-#: ../plugins/itip-formatter/itip-view.c:778
-#: ../plugins/itip-formatter/itip-view.c:795
-#: ../plugins/itip-formatter/itip-view.c:800
+#: ../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
msgid "_Decline"
msgstr "_Decline"
-#: ../plugins/itip-formatter/itip-view.c:769
-#: ../plugins/itip-formatter/itip-view.c:774
-#: ../plugins/itip-formatter/itip-view.c:781
-#: ../plugins/itip-formatter/itip-view.c:797
-#: ../plugins/itip-formatter/itip-view.c:802
+#: ../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
msgid "_Accept"
msgstr "_Accept"
-#: ../plugins/itip-formatter/itip-view.c:772
+#: ../plugins/itip-formatter/itip-view.c:831
msgid "_Decline all"
msgstr "_Decline all"
-#: ../plugins/itip-formatter/itip-view.c:773
+#: ../plugins/itip-formatter/itip-view.c:832
msgid "_Tentative all"
msgstr "_Tentative all"
-#: ../plugins/itip-formatter/itip-view.c:773
-#: ../plugins/itip-formatter/itip-view.c:779
-#: ../plugins/itip-formatter/itip-view.c:796
-#: ../plugins/itip-formatter/itip-view.c:801
+#: ../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
msgid "_Tentative"
msgstr "_Tentative"
-#: ../plugins/itip-formatter/itip-view.c:774
+#: ../plugins/itip-formatter/itip-view.c:833
msgid "_Accept all"
msgstr "_Accept all"
#. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:785
+#: ../plugins/itip-formatter/itip-view.c:844
msgid "_Send Information"
msgstr "_Send Information"
#. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:789
+#: ../plugins/itip-formatter/itip-view.c:848
msgid "_Update Attendee Status"
msgstr "_Update Attendee Status"
-#: ../plugins/itip-formatter/itip-view.c:792
+#: ../plugins/itip-formatter/itip-view.c:851
msgid "_Update"
msgstr "_Update"
#. Start time
-#: ../plugins/itip-formatter/itip-view.c:951
+#: ../plugins/itip-formatter/itip-view.c:1012
msgid "Start time:"
msgstr "Start time:"
#. End time
-#: ../plugins/itip-formatter/itip-view.c:960
+#: ../plugins/itip-formatter/itip-view.c:1021
msgid "End time:"
msgstr "End time:"
#. Comment
-#: ../plugins/itip-formatter/itip-view.c:976
-#: ../plugins/itip-formatter/itip-view.c:1026
+#: ../plugins/itip-formatter/itip-view.c:1037
+#: ../plugins/itip-formatter/itip-view.c:1087
msgid "Comment:"
msgstr "Comment:"
-#: ../plugins/itip-formatter/itip-view.c:1040
-msgid "Send u_pdates to attendees"
-msgstr "Send u_pdates to attendees"
+#: ../plugins/itip-formatter/itip-view.c:1073
+msgid "Send _reply to sender"
+msgstr "Send _reply to sender"
-#: ../plugins/itip-formatter/itip-view.c:1049
-msgid "A_pply to all instances"
-msgstr "A_pply to all instances"
+#: ../plugins/itip-formatter/itip-view.c:1101
+msgid "Send _updates to attendees"
+msgstr "Send _updates to attendees"
-#: ../plugins/itip-formatter/itip-view.c:1718
+#: ../plugins/itip-formatter/itip-view.c:1110
+msgid "_Apply to all instances"
+msgstr "_Apply to all instances"
+
+#: ../plugins/itip-formatter/itip-view.c:1119
+msgid "Show time as _free"
+msgstr "Show time as _free"
+
+#: ../plugins/itip-formatter/itip-view.c:1852
msgid "_Tasks :"
msgstr "_Tasks :"
-#: ../plugins/itip-formatter/itip-view.c:1720
+#: ../plugins/itip-formatter/itip-view.c:1854
msgid "Memos :"
msgstr "Memos :"
@@ -16998,6 +17304,188 @@ msgstr "Allows disabling of accounts."
msgid "Disable Account"
msgstr "Disable Account"
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:1
+msgid "Beep or play sound file."
+msgstr "Beep or play sound file."
+
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:2
+msgid "Blink icon in notification area."
+msgstr "Blink icon in notification area."
+
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:3
+msgid "Enable D-Bus messages."
+msgstr "Enable D-Bus messages."
+
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:4
+msgid "Enable icon in notification area."
+msgstr "Enable icon in notification area."
+
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:5
+msgid "Generates a D-Bus message when new mail messages arrive."
+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."
+msgstr "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."
+msgstr "Notify new messages for Inbox only."
+
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:8
+msgid "Play sound when new messages arrive."
+msgstr "Play sound when new messages arrive."
+
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:9
+msgid "Popup message together with the icon."
+msgstr "Pop-up message together with the icon."
+
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:10
+msgid "Show new mail icon in notification area when new messages arrive."
+msgstr "Show new mail icon in notification area when new messages arrive."
+
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:11
+msgid "Sound file name to be played."
+msgstr "Sound file name to be played."
+
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:12
+msgid "Sound file to be played when new messages arrive, if not in beep mode."
+msgstr "Sound file to be played when new messages arrive, if not in beep mode."
+
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:13
+msgid "Whether play sound or beep when new messages arrive."
+msgstr "Whether play sound or beep when new messages arrive."
+
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:14
+msgid "Whether show message over the icon when new messages arrive."
+msgstr "Whether show message over the icon when new messages arrive."
+
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:15
+msgid "Whether the icon should blink or not."
+msgstr "Whether the icon should blink or not."
+
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:16
+msgid "Whether to notify new messages in Inbox folder only."
+msgstr "Whether to notify new messages in Inbox folder only."
+
+#: ../plugins/mail-notification/mail-notification.c:254
+msgid "Generate a _D-Bus message"
+msgstr "Generate a _D-Bus message"
+
+#. To translators: '%d' is the number of mails recieved and '%s' is the name of the folder
+#: ../plugins/mail-notification/mail-notification.c:363
+#, c-format
+msgid ""
+"You have received %d new message\n"
+"in %s."
+msgid_plural ""
+"You have received %d new messages\n"
+"in %s."
+msgstr[0] ""
+"You have received %d new message\n"
+"in %s."
+msgstr[1] ""
+"You have received %d new messages\n"
+"in %s."
+
+#: ../plugins/mail-notification/mail-notification.c:368
+#, 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
+msgid "New email"
+msgstr "New email"
+
+#: ../plugins/mail-notification/mail-notification.c:440
+msgid "Show icon in _notification area"
+msgstr "Show icon in _notification area"
+
+#: ../plugins/mail-notification/mail-notification.c:443
+msgid "B_link icon in notification area"
+msgstr "B_link icon in notification area"
+
+#: ../plugins/mail-notification/mail-notification.c:445
+msgid "Popup _message together with the icon"
+msgstr "Popup _message together with the icon"
+
+#: ../plugins/mail-notification/mail-notification.c:626
+msgid "_Play sound when new messages arrive"
+msgstr "_Play sound when new messages arrive"
+
+#: ../plugins/mail-notification/mail-notification.c:632
+msgid "_Beep"
+msgstr "_Beep"
+
+#: ../plugins/mail-notification/mail-notification.c:633
+msgid "Play _sound file"
+msgstr "Play _sound file"
+
+#: ../plugins/mail-notification/mail-notification.c:644
+msgid "Specify _filename:"
+msgstr "Specify _filename:"
+
+#: ../plugins/mail-notification/mail-notification.c:645
+msgid "Select sound file"
+msgstr "Select sound file"
+
+#: ../plugins/mail-notification/mail-notification.c:646
+msgid "Pl_ay"
+msgstr "Pl_ay"
+
+#: ../plugins/mail-notification/mail-notification.c:785
+msgid "Notify new messages for _Inbox only"
+msgstr "Notify new messages for _Inbox only"
+
+#: ../plugins/mail-notification/org-gnome-mail-notification.eplug.xml.h:1
+msgid "Generates a D-Bus message or notifies the user with an icon in notification area and a notification message whenever a new message has arrived."
+msgstr "Generates a D-Bus message or notifies the user with an icon in notification area and a notification message whenever a new message has arrived."
+
+#: ../plugins/mail-notification/org-gnome-mail-notification.eplug.xml.h:2
+msgid "Mail Notification"
+msgstr "Mail Notification"
+
+#: ../plugins/mail-to-meeting/org-gnome-mail-to-meeting.eplug.xml.h:1
+msgid "A plugin which allows the creation of meetings from the contents of a mail message."
+msgstr "A plugin which allows the creation of meetings from the contents of a mail message."
+
+#: ../plugins/mail-to-meeting/org-gnome-mail-to-meeting.eplug.xml.h:2
+msgid "Con_vert to Meeting"
+msgstr "Con_vert to Meeting"
+
+#: ../plugins/mail-to-meeting/org-gnome-mail-to-meeting.eplug.xml.h:3
+msgid "Mail to meeting"
+msgstr "Mail to meeting"
+
+#: ../plugins/mail-to-task/mail-to-task.c:270
+#, c-format
+msgid "Cannot open calendar. %s"
+msgstr "Cannot open calendar. %s"
+
+#: ../plugins/mail-to-task/mail-to-task.c:275
+msgid "Selected source is read only, thus cannot create task there. Select other source, please."
+msgstr "Selected source is read only, thus cannot create task there. Select other source, please."
+
+#: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:1
+msgid "A plugin which allows the creation of tasks from the contents of a mail message."
+msgstr "A plugin which allows the creation of tasks from the contents of a mail message."
+
+#: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:2
+#: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:1
+msgid "Con_vert to Task"
+msgstr "Con_vert to Task"
+
+#: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:3
+msgid "Mail to task"
+msgstr "Mail to task"
+
+#: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:2
+msgid "Convert the selected message to a new task"
+msgstr "Convert the selected message to a new task"
+
#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:1
msgid "Contact list _owner"
msgstr "Contact list _owner"
@@ -17149,74 +17637,6 @@ msgstr "_Subscribe to List"
msgid "_Unsubscribe from List"
msgstr "_Unsubscribe from List"
-#: ../plugins/mail-notification/mail-notification.c:100
-#, c-format
-msgid "You have received %d new messages in %s."
-msgstr "You have received %d new messages in %s."
-
-#: ../plugins/mail-notification/org-gnome-mail-notification.eplug.xml.h:1
-msgid "Mail Notification"
-msgstr "Mail Notification"
-
-#: ../plugins/mail-notification/org-gnome-mail-notification.eplug.xml.h:2
-msgid "Notifies the user with tray icon and a notify message whenever a new message is arrived."
-msgstr "Notifies the user with tray icon and a notify message whenever a new message is arrived."
-
-#: ../plugins/mail-remote/client.c:30
-#, c-format
-msgid "System error: %s"
-msgstr "System error: %s"
-
-#: ../plugins/mail-remote/client.c:32
-#, c-format
-msgid "Camel error: %s"
-msgstr "Camel error: %s"
-
-#: ../plugins/mail-remote/evolution-mail-store.c:476
-msgid "Account cannot send e-mail"
-msgstr "Account cannot send e-mail"
-
-#: ../plugins/mail-remote/evolution-mail-store.c:605
-msgid "No store available"
-msgstr "No store available"
-
-#: ../plugins/mail-remote/org-gnome-evolution-mail-remote.eplug.xml.h:1
-msgid "A plugin which implements a CORBA interface for accessing mail data remotely."
-msgstr "A plugin which implements a CORBA interface for accessing mail data remotely."
-
-#: ../plugins/mail-remote/org-gnome-evolution-mail-remote.eplug.xml.h:2
-msgid "Mail Remote"
-msgstr "Mail Remote"
-
-#: ../plugins/mail-to-meeting/org-gnome-mail-to-meeting.eplug.xml.h:1
-msgid "A plugin which allows the creation of meetings from the contents of a mail message."
-msgstr "A plugin which allows the creation of meetings from the contents of a mail message."
-
-#: ../plugins/mail-to-meeting/org-gnome-mail-to-meeting.eplug.xml.h:2
-msgid "Con_vert to Meeting"
-msgstr "Con_vert to Meeting"
-
-#: ../plugins/mail-to-meeting/org-gnome-mail-to-meeting.eplug.xml.h:3
-msgid "Mail to meeting"
-msgstr "Mail to meeting"
-
-#: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:1
-msgid "A plugin which allows the creation of tasks from the contents of a mail message."
-msgstr "A plugin which allows the creation of tasks from the contents of a mail message."
-
-#: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:2
-#: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:1
-msgid "Con_vert to Task"
-msgstr "Con_vert to Task"
-
-#: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:3
-msgid "Mail to task"
-msgstr "Mail to task"
-
-#: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:2
-msgid "Convert the selected message to a new task"
-msgstr "Convert the selected message to a new task"
-
#: ../plugins/mark-all-read/org-gnome-mark-all-read.eplug.xml.h:1
msgid "Mark All Read"
msgstr "Mark All Read"
@@ -17238,12 +17658,12 @@ msgid "Marks the selected calendar for offline viewing."
msgstr "Marks the selected calendar for offline viewing."
#: ../plugins/mark-calendar-offline/org-gnome-mark-calendar-offline.eplug.xml.h:3
-msgid "_Do not make this available offline"
-msgstr "_Do not make this available offline"
+msgid "_Do not make available for offline use"
+msgstr "_Do not make available for offline use"
#: ../plugins/mark-calendar-offline/org-gnome-mark-calendar-offline.eplug.xml.h:4
-msgid "_Mark Calendar for offline use"
-msgstr "_Mark Calendar for offline use"
+msgid "_Make available for offline use"
+msgstr "_Make available for offline use"
#: ../plugins/mono/org-gnome-evolution-mono.eplug.xml.h:1
msgid "A plugin which implements mono plugins."
@@ -17253,21 +17673,13 @@ msgstr "A plugin which implements mono plugins."
msgid "Mono Loader"
msgstr "Mono Loader"
-#: ../plugins/new-mail-notify/org-gnome-new-mail-notify.eplug.xml.h:1
-msgid "Generates a D-BUS message when new mail arrives."
-msgstr "Generates a D-BUS message when new mail arrives."
-
-#: ../plugins/new-mail-notify/org-gnome-new-mail-notify.eplug.xml.h:2
-msgid "New Mail Notification"
-msgstr "New Mail Notification"
-
#: ../plugins/plugin-manager/org-gnome-plugin-manager.eplug.xml.h:1
msgid "A plugin for managing which plugins are enabled or disabled."
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:202
+#: ../plugins/plugin-manager/plugin-manager.c:225
msgid "Plugin Manager"
msgstr "Plugin Manager"
@@ -17279,22 +17691,33 @@ msgstr "Enable and disable plugins"
msgid "_Plugins"
msgstr "_Plugins"
-#: ../plugins/plugin-manager/plugin-manager.c:53
+#: ../plugins/plugin-manager/plugin-manager.c:57
msgid "Author(s)"
msgstr "Author(s)"
-#: ../plugins/plugin-manager/plugin-manager.c:54
-#: ../widgets/table/e-table-config.glade.h:5
-#: ../widgets/table/e-table-config-no-group.glade.h:6
+#: ../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:215
+#: ../plugins/plugin-manager/plugin-manager.c:238
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:268
-#: ../plugins/plugin-manager/plugin-manager.c:327
+#: ../plugins/plugin-manager/plugin-manager.c:260
+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:330
+#: ../plugins/plugin-manager/plugin-manager.c:392
msgid "Plugin"
msgstr "Plugin"
@@ -17317,25 +17740,25 @@ msgstr "Plain Text Mode"
msgid "Prefer plain-text"
msgstr "Prefer plain-text"
-#: ../plugins/prefer-plain/prefer-plain.c:105
+#: ../plugins/prefer-plain/prefer-plain.c:139
msgid "Show HTML if present"
msgstr "Show HTML if present"
-#: ../plugins/prefer-plain/prefer-plain.c:106
+#: ../plugins/prefer-plain/prefer-plain.c:140
msgid "Prefer PLAIN"
msgstr "Prefer PLAIN"
-#: ../plugins/prefer-plain/prefer-plain.c:107
+#: ../plugins/prefer-plain/prefer-plain.c:141
msgid "Only ever show PLAIN"
msgstr "Only ever show PLAIN"
-#: ../plugins/prefer-plain/prefer-plain.c:150
-msgid "HTML Mode"
-msgstr "HTML Mode"
+#: ../plugins/prefer-plain/prefer-plain.c:184
+msgid "HTML _Mode"
+msgstr "HTML _Mode"
#: ../plugins/print-message/org-gnome-print-message.eplug.xml.h:1
-msgid "Gives an option to print mail from composer"
-msgstr "Gives an option to print mail from composer"
+msgid "Gives an option to print from the composer."
+msgstr "Gives an option to print from the composer."
#: ../plugins/print-message/org-gnome-print-message.eplug.xml.h:2
msgid "Print Message"
@@ -17378,7 +17801,13 @@ msgstr "Locations"
msgid "_Publish Calendar Information"
msgstr "_Publish Calendar Information"
-#: ../plugins/publish-calendar/publish-calendar.c:399
+#: ../plugins/publish-calendar/publish-calendar.c:91
+#: ../smime/gui/component.c:47
+#, c-format
+msgid "Enter the password for `%s'"
+msgstr "Enter the password for `%s'"
+
+#: ../plugins/publish-calendar/publish-calendar.c:416
msgid "Are you sure you want to remove this URL?"
msgstr "Are you sure you want to remove this URL?"
@@ -17400,6 +17829,10 @@ msgstr ""
"Weekly\n"
"Manual (via Actions menu)"
+#: ../plugins/publish-calendar/publish-calendar.glade.h:9
+msgid "E_nable"
+msgstr "E_nable"
+
#: ../plugins/publish-calendar/publish-calendar.glade.h:10
msgid "P_ort:"
msgstr "P_ort:"
@@ -17438,10 +17871,22 @@ msgstr "Service _type:"
msgid "_File:"
msgstr "_File:"
+#: ../plugins/publish-calendar/publish-calendar.glade.h:23
+msgid "_Password:"
+msgstr "_Password:"
+
#: ../plugins/publish-calendar/publish-calendar.glade.h:24
msgid "_Publish as:"
msgstr "_Publish as:"
+#: ../plugins/publish-calendar/publish-calendar.glade.h:25
+msgid "_Remember password"
+msgstr "_Remember password"
+
+#: ../plugins/publish-calendar/publish-calendar.glade.h:27
+msgid "_Username:"
+msgstr "_Username:"
+
#: ../plugins/publish-calendar/publish-calendar.glade.h:28
msgid ""
"iCal\n"
@@ -17470,6 +17915,10 @@ msgstr "Filters junk messages using SpamAssassin. This plugin requires SpamAssas
msgid "SpamAssassin junk plugin"
msgstr "SpamAssassin junk plugin"
+#: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:3
+msgid "Spamassassin Options"
+msgstr "Spamassassin Options"
+
#: ../plugins/save-attachments/org-gnome-save-attachments.eplug.xml.h:1
msgid "A plugin for saving all attachments or parts of a message at once."
msgstr "A plugin for saving all attachments or parts of a message at once."
@@ -17506,79 +17955,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:171
+#: ../plugins/save-calendar/csv-format.c:167
msgid "%F %T"
msgstr "%F %T"
-#: ../plugins/save-calendar/csv-format.c:385
+#: ../plugins/save-calendar/csv-format.c:381
msgid "UID"
msgstr "UID"
-#: ../plugins/save-calendar/csv-format.c:387
+#: ../plugins/save-calendar/csv-format.c:383
msgid "Description List"
msgstr "Description List"
-#: ../plugins/save-calendar/csv-format.c:388
+#: ../plugins/save-calendar/csv-format.c:384
msgid "Categories List"
msgstr "Categories List"
-#: ../plugins/save-calendar/csv-format.c:389
+#: ../plugins/save-calendar/csv-format.c:385
msgid "Comment List"
msgstr "Comment List"
-#: ../plugins/save-calendar/csv-format.c:391
+#: ../plugins/save-calendar/csv-format.c:387
msgid "Created"
msgstr "Created"
-#: ../plugins/save-calendar/csv-format.c:392
+#: ../plugins/save-calendar/csv-format.c:388
msgid "Contact List"
msgstr "Contact List"
-#: ../plugins/save-calendar/csv-format.c:393
+#: ../plugins/save-calendar/csv-format.c:389
msgid "Start"
msgstr "Start"
-#: ../plugins/save-calendar/csv-format.c:394
+#: ../plugins/save-calendar/csv-format.c:390
msgid "End"
msgstr "End"
-#: ../plugins/save-calendar/csv-format.c:396
+#: ../plugins/save-calendar/csv-format.c:392
msgid "percent Done"
msgstr "percent Done"
-#: ../plugins/save-calendar/csv-format.c:398
+#: ../plugins/save-calendar/csv-format.c:394
msgid "URL"
msgstr "URL"
-#: ../plugins/save-calendar/csv-format.c:399
+#: ../plugins/save-calendar/csv-format.c:395
msgid "Attendees List"
msgstr "Attendees List"
-#: ../plugins/save-calendar/csv-format.c:401
+#: ../plugins/save-calendar/csv-format.c:397
msgid "Modified"
msgstr "Modified"
-#: ../plugins/save-calendar/csv-format.c:552
+#: ../plugins/save-calendar/csv-format.c:545
msgid "Advanced options for the CSV format"
msgstr "Advanced options for the CSV format"
-#: ../plugins/save-calendar/csv-format.c:559
+#: ../plugins/save-calendar/csv-format.c:552
msgid "Prepend a header"
msgstr "Prepend a header"
-#: ../plugins/save-calendar/csv-format.c:568
+#: ../plugins/save-calendar/csv-format.c:561
msgid "Value delimiter:"
msgstr "Value delimiter:"
-#: ../plugins/save-calendar/csv-format.c:574
+#: ../plugins/save-calendar/csv-format.c:567
msgid "Record delimiter:"
msgstr "Record delimiter:"
-#: ../plugins/save-calendar/csv-format.c:580
+#: ../plugins/save-calendar/csv-format.c:573
msgid "Encapsulate values with:"
msgstr "Encapsulate values with:"
-#: ../plugins/save-calendar/csv-format.c:602
+#: ../plugins/save-calendar/csv-format.c:595
msgid "Comma separated value format (.csv)"
msgstr "Comma separated value format (.csv)"
@@ -17600,16 +18049,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:158
+#: ../plugins/save-calendar/rdf-format.c:154
msgid "%FT%T"
msgstr "%FT%T"
-#: ../plugins/save-calendar/rdf-format.c:397
+#: ../plugins/save-calendar/rdf-format.c:390
msgid "RDF format (.rdf)"
msgstr "RDF format (.rdf)"
-#: ../plugins/save-calendar/save-calendar.c:169
-#: ../plugins/save-calendar/save-calendar.c:180
+#: ../plugins/save-calendar/save-calendar.c:164
msgid "Select destination file"
msgstr "Select destination file"
@@ -17626,6 +18074,10 @@ msgid "Show _only this Calendar"
msgstr "Show _only this Calendar"
#: ../plugins/select-one-source/org-gnome-select-one-source.eplug.xml.h:4
+msgid "Show _only this Memo List"
+msgstr "Show _only this Memo List"
+
+#: ../plugins/select-one-source/org-gnome-select-one-source.eplug.xml.h:5
msgid "Show _only this Task List"
msgstr "Show _only this Task List"
@@ -17665,16 +18117,21 @@ 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:397
+#: ../shell/e-shell-importer.c:400
#, c-format
msgid "From %s:"
msgstr "From %s:"
#: ../plugins/startup-wizard/startup-wizard.c:231
-#: ../shell/e-shell-importer.c:508
+#: ../shell/e-shell-importer.c:511
msgid "Importing data."
msgstr "Importing data."
+#: ../plugins/startup-wizard/startup-wizard.c:233
+#: ../shell/e-shell-importer.c:525
+msgid "Please wait"
+msgstr "Please wait"
+
#: ../plugins/subject-thread/org-gnome-subject-thread.eplug.xml.h:1
msgid "Indicates if threading of messages should fall back to subject."
msgstr "Indicates if threading of messages should fall back to subject."
@@ -17689,123 +18146,163 @@ 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
-msgid "Fall back to threading messages by sub_ject"
-msgstr "Fall back to threading messages by sub_ject"
+msgid "F_all back to threading messages by subject"
+msgstr "F_all back to threading messages by subject"
+
+#: ../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."
+
+#: ../plugins/tnef-attachments/org-gnome-tnef-attachments.eplug.xml.h:2
+msgid "TNEF Attachment decoder"
+msgstr "TNEF Attachment decoder"
+
+#: ../shell/GNOME_Evolution_Shell.server.in.in.h:1
+msgid "Evolution Shell"
+msgstr "Evolution Shell"
+
+#: ../shell/GNOME_Evolution_Shell.server.in.in.h:2
+msgid "Evolution Shell Config factory"
+msgstr "Evolution Shell Config factory"
+
+#: ../shell/test/GNOME_Evolution_Test.server.in.in.h:1
+msgid "Evolution Test"
+msgstr "Evolution Test"
+
+#: ../shell/test/GNOME_Evolution_Test.server.in.in.h:2
+msgid "Evolution Test component"
+msgstr "Evolution Test component"
-#: ../shell/apps_evolution_shell.schemas.in.in.h:1
-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: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.in.h:2
+#: ../shell/apps_evolution_shell.schemas.in.h:2
msgid "Configuration version"
msgstr "Configuration version"
-#: ../shell/apps_evolution_shell.schemas.in.in.h:3
+#: ../shell/apps_evolution_shell.schemas.in.h:3
+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:4
msgid "Default sidebar width"
msgstr "Default sidebar width"
-#: ../shell/apps_evolution_shell.schemas.in.in.h:4
+#: ../shell/apps_evolution_shell.schemas.in.h:5
msgid "Default window height"
msgstr "Default window height"
-#: ../shell/apps_evolution_shell.schemas.in.in.h:5
+#: ../shell/apps_evolution_shell.schemas.in.h:6
msgid "Default window state"
msgstr "Default window state"
-#: ../shell/apps_evolution_shell.schemas.in.in.h:6
+#: ../shell/apps_evolution_shell.schemas.in.h:7
msgid "Default window width"
msgstr "Default window width"
-#: ../shell/apps_evolution_shell.schemas.in.in.h:7
+#: ../shell/apps_evolution_shell.schemas.in.h:8
msgid "ID or alias of the component to be shown by default at start-up."
msgstr "ID or alias of the component to be shown by default at start-up."
-#: ../shell/apps_evolution_shell.schemas.in.in.h:8
+#: ../shell/apps_evolution_shell.schemas.in.h:9
msgid "Last upgraded configuration version"
msgstr "Last upgraded configuration version"
-#: ../shell/apps_evolution_shell.schemas.in.in.h:9
+#: ../shell/apps_evolution_shell.schemas.in.h:10
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.in.h:10
+#: ../shell/apps_evolution_shell.schemas.in.h:11
msgid "Sidebar is visible"
msgstr "Sidebar is visible"
-#: ../shell/apps_evolution_shell.schemas.in.in.h:11
+#: ../shell/apps_evolution_shell.schemas.in.h:12
msgid "Skip development warning dialog"
msgstr "Skip development warning dialogue"
-#: ../shell/apps_evolution_shell.schemas.in.in.h:12
-#: ../shell/main.c:458
+#: ../shell/apps_evolution_shell.schemas.in.h:13
+msgid "Skip recovery warning dialog"
+msgstr "Skip recovery warning dialogue"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:14
+#: ../shell/main.c:571
msgid "Start in offline mode"
msgstr "Start in offline mode"
-#: ../shell/apps_evolution_shell.schemas.in.in.h:13
+#: ../shell/apps_evolution_shell.schemas.in.h:15
msgid "Statusbar is visible"
msgstr "Statusbar is visible"
-#: ../shell/apps_evolution_shell.schemas.in.in.h:14
+#: ../shell/apps_evolution_shell.schemas.in.h:16
msgid "The configuration version of Evolution, with major/minor/configuration level (for example \"2.6.0\")."
msgstr "The configuration version of Evolution, with major/minor/configuration level (for example \"2.6.0\")."
-#: ../shell/apps_evolution_shell.schemas.in.in.h:15
+#: ../shell/apps_evolution_shell.schemas.in.h:17
msgid "The default height for the main window, in pixels."
msgstr "The default height for the main window, in pixels."
-#: ../shell/apps_evolution_shell.schemas.in.in.h:16
+#: ../shell/apps_evolution_shell.schemas.in.h:18
msgid "The default width for the main window, in pixels."
msgstr "The default width for the main window, in pixels."
-#: ../shell/apps_evolution_shell.schemas.in.in.h:17
+#: ../shell/apps_evolution_shell.schemas.in.h:19
msgid "The default width for the sidebar, in pixels."
msgstr "The default width for the sidebar, in pixels."
-#: ../shell/apps_evolution_shell.schemas.in.in.h:18
+#: ../shell/apps_evolution_shell.schemas.in.h:20
msgid "The last upgraded configuration version of Evolution, with major/minor/configuration level (for example \"2.6.0\")."
msgstr "The last upgraded configuration version of Evolution, with major/minor/configuration level (for example \"2.6.0\")."
-#: ../shell/apps_evolution_shell.schemas.in.in.h:19
+#: ../shell/apps_evolution_shell.schemas.in.h:21
msgid "The style of the window buttons. Can be \"text\", \"icons\", \"both\", \"toolbar\". If \"toolbar\" is set, the style of the buttons is determined by the GNOME toolbar setting."
msgstr "The style of the window buttons. Can be \"text\", \"icons\", \"both\", \"toolbar\". If \"toolbar\" is set, the style of the buttons is determined by the GNOME toolbar setting."
-#: ../shell/apps_evolution_shell.schemas.in.in.h:20
+#: ../shell/apps_evolution_shell.schemas.in.h:22
msgid "Toolbar is visible"
msgstr "Toolbar is visible"
-#: ../shell/apps_evolution_shell.schemas.in.in.h:21
+#: ../shell/apps_evolution_shell.schemas.in.h:23
msgid "Whether Evolution will start up in offline mode instead of online mode."
msgstr "Whether Evolution will start up in offline mode instead of online mode."
-#: ../shell/apps_evolution_shell.schemas.in.in.h:22
+#: ../shell/apps_evolution_shell.schemas.in.h:24
+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:25
msgid "Whether or not the window should be maximized."
msgstr "Whether or not the window should be maximised."
-#: ../shell/apps_evolution_shell.schemas.in.in.h:23
+#: ../shell/apps_evolution_shell.schemas.in.h:26
msgid "Whether the sidebar should be visible."
msgstr "Whether the sidebar should be visible."
-#: ../shell/apps_evolution_shell.schemas.in.in.h:24
+#: ../shell/apps_evolution_shell.schemas.in.h:27
msgid "Whether the status bar should be visible."
msgstr "Whether the status bar should be visible."
-#: ../shell/apps_evolution_shell.schemas.in.in.h:25
+#: ../shell/apps_evolution_shell.schemas.in.h:28
msgid "Whether the toolbar should be visible."
msgstr "Whether the toolbar should be visible."
-#: ../shell/apps_evolution_shell.schemas.in.in.h:26
+#: ../shell/apps_evolution_shell.schemas.in.h:29
msgid "Whether the warning dialog in development versions of Evolution is skipped."
msgstr "Whether the warning dialogue in development versions of Evolution is skipped."
-#: ../shell/apps_evolution_shell.schemas.in.in.h:27
+#: ../shell/apps_evolution_shell.schemas.in.h:30
+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:31
msgid "Whether the window buttons should be visible."
msgstr "Whether the window buttons should be visible."
-#: ../shell/apps_evolution_shell.schemas.in.in.h:28
+#: ../shell/apps_evolution_shell.schemas.in.h:32
msgid "Window button style"
msgstr "Window button style"
-#: ../shell/apps_evolution_shell.schemas.in.in.h:29
+#: ../shell/apps_evolution_shell.schemas.in.h:33
msgid "Window buttons are visible"
msgstr "Window buttons are visible"
@@ -17821,38 +18318,6 @@ 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.c:636
-msgid "Uknown system error."
-msgstr "Uknown system error."
-
-#: ../shell/e-shell.c:832
-#: ../shell/e-shell.c:833
-#, c-format
-msgid "%ld KB"
-msgstr "%ld KB"
-
-#: ../shell/e-shell.c:1264
-#: ../widgets/misc/e-cell-date-edit.c:255
-msgid "OK"
-msgstr "OK"
-
-#: ../shell/e-shell.c:1266
-msgid "Invalid arguments"
-msgstr "Invalid arguments"
-
-#: ../shell/e-shell.c:1268
-msgid "Cannot register on OAF"
-msgstr "Cannot register on OAF"
-
-#: ../shell/e-shell.c:1270
-msgid "Configuration Database not found"
-msgstr "Configuration Database not found"
-
-#: ../shell/e-shell-folder-title-bar.c:584
-#: ../shell/e-shell-folder-title-bar.c:585
-msgid "(Untitled)"
-msgstr "(Untitled)"
-
#: ../shell/e-shell-importer.c:135
msgid "Choose the type of importer to run:"
msgstr "Choose the type of importer to run:"
@@ -17883,27 +18348,27 @@ msgstr ""
"settings found. If you would like to\n"
"try again, please click the \"Back\" button.\n"
-#: ../shell/e-shell-importer.c:285
+#: ../shell/e-shell-importer.c:288
msgid "F_ilename:"
msgstr "F_ilename:"
-#: ../shell/e-shell-importer.c:290
+#: ../shell/e-shell-importer.c:293
msgid "Select a file"
msgstr "Select a file"
-#: ../shell/e-shell-importer.c:299
+#: ../shell/e-shell-importer.c:302
msgid "File _type:"
msgstr "File _type:"
-#: ../shell/e-shell-importer.c:335
+#: ../shell/e-shell-importer.c:338
msgid "Import data and settings from _older programs"
msgstr "Import data and settings from _older programs"
-#: ../shell/e-shell-importer.c:338
+#: ../shell/e-shell-importer.c:341
msgid "Import a _single file"
msgstr "Import a _single file"
-#: ../shell/e-shell-settings-dialog.c:319
+#: ../shell/e-shell-settings-dialog.c:313
msgid "Evolution Preferences"
msgstr "Evolution Preferences"
@@ -17927,100 +18392,123 @@ msgstr "Folder name cannot contain the character \"#\"."
msgid "'.' and '..' are reserved folder names."
msgstr "'.' and '..' are reserved folder names."
-#: ../shell/e-shell-window.c:381
-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:389
-msgid "Evolution is in the process of going offline."
-msgstr "Evolution is in the process of going offline."
-
-#: ../shell/e-shell-window.c:396
-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:820
+#. 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:342
#, c-format
-msgid "Switch to %s"
-msgstr "Switch to %s"
+msgid "%s - Evolution"
+msgstr "%s - Evolution"
-#: ../shell/e-shell-window-commands.c:76
+#: ../shell/e-shell-window-commands.c:77
msgid "The GNOME Pilot tools do not appear to be installed on this system."
msgstr "The GNOME Pilot tools do not appear to be installed on this system."
-#: ../shell/e-shell-window-commands.c:84
+#: ../shell/e-shell-window-commands.c:85
#, c-format
msgid "Error executing %s."
msgstr "Error executing %s."
-#: ../shell/e-shell-window-commands.c:132
+#: ../shell/e-shell-window-commands.c:141
msgid "Bug buddy is not installed."
msgstr "Bug buddy is not installed."
-#: ../shell/e-shell-window-commands.c:135
+#: ../shell/e-shell-window-commands.c:144
msgid "Bug buddy could not be run."
msgstr "Bug buddy could not be run."
#. The translator-credits string is for translators to list
#. * per-language credits for translation, displayed in the
#. * about dialog.
-#: ../shell/e-shell-window-commands.c:575
+#: ../shell/e-shell-window-commands.c:663
msgid "translator-credits"
msgstr ""
"Gareth Owen <gowen72@yahoo.com>\n"
"David Lodge <dave@cirt.net>"
-#: ../shell/e-shell-window-commands.c:586
+#: ../shell/e-shell-window-commands.c:674
msgid "Evolution Website"
msgstr "Evolution Website"
-#: ../shell/e-shell-window-commands.c:793
+#: ../shell/e-shell-window-commands.c:692
+msgid "Error opening the FAQ webpage."
+msgstr "Error opening the FAQ webpage."
+
+#: ../shell/e-shell-window-commands.c:889
msgid "_Work Online"
msgstr "_Work Online"
-#: ../shell/e-shell-window-commands.c:806
-#: ../ui/evolution.xml.h:55
+#: ../shell/e-shell-window-commands.c:902
+#: ../ui/evolution.xml.h:56
msgid "_Work Offline"
msgstr "_Work Offline"
-#: ../shell/e-shell-window-commands.c:819
+#: ../shell/e-shell-window-commands.c:915
msgid "Work Offline"
msgstr "Work Offline"
+#: ../shell/e-shell-window.c:382
+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:389
+msgid "Evolution is in the process of going offline."
+msgstr "Evolution is in the process of going offline."
+
+#: ../shell/e-shell-window.c:396
+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:805
+#, c-format
+msgid "Switch to %s"
+msgstr "Switch to %s"
+
+#: ../shell/e-shell.c:640
+msgid "Unknown system error."
+msgstr "Unknown system error."
+
+#: ../shell/e-shell.c:838
+#: ../shell/e-shell.c:839
+#, c-format
+msgid "%ld KB"
+msgstr "%ld KB"
+
+#: ../shell/e-shell.c:1280
+#: ../widgets/misc/e-cell-date-edit.c:255
+msgid "OK"
+msgstr "OK"
+
+#: ../shell/e-shell.c:1282
+msgid "Invalid arguments"
+msgstr "Invalid arguments"
+
+#: ../shell/e-shell.c:1284
+msgid "Cannot register on OAF"
+msgstr "Cannot register on OAF"
+
+#: ../shell/e-shell.c:1286
+msgid "Configuration Database not found"
+msgstr "Configuration Database not found"
+
#: ../shell/e-user-creatable-items-handler.c:678
#: ../shell/e-user-creatable-items-handler.c:688
#: ../shell/e-user-creatable-items-handler.c:693
msgid "New"
msgstr "New"
-#: ../shell/evolution-test-component.c:140
+#: ../shell/test/evolution-test-component.c:107
msgid "New Test"
msgstr "New Test"
-#: ../shell/evolution-test-component.c:141
+#: ../shell/test/evolution-test-component.c:108
msgid "_Test"
msgstr "_Test"
-#: ../shell/evolution-test-component.c:142
+#: ../shell/test/evolution-test-component.c:109
msgid "Create a new test item"
msgstr "Create a new test item"
-#: ../shell/GNOME_Evolution_Shell.server.in.in.h:1
-msgid "Evolution Shell"
-msgstr "Evolution Shell"
-
-#: ../shell/GNOME_Evolution_Shell.server.in.in.h:2
-msgid "Evolution Shell Config factory"
-msgstr "Evolution Shell Config factory"
-
-#: ../shell/GNOME_Evolution_Test.server.in.in.h:1
-msgid "Evolution Test"
-msgstr "Evolution Test"
-
-#: ../shell/GNOME_Evolution_Test.server.in.in.h:2
-msgid "Evolution Test component"
-msgstr "Evolution Test component"
-
#: ../shell/import.glade.h:1
msgid "Click \"Import\" to begin importing the file into Evolution. "
msgstr "Click \"Import\" to begin importing the file into Evolution. "
@@ -18060,7 +18548,7 @@ msgstr ""
"importing external files into Evolution."
#. Preview/Alpha/Beta version warning message
-#: ../shell/main.c:219
+#: ../shell/main.c:228
#, no-c-format
msgid ""
"Hi. Thanks for taking the time to download this preview release\n"
@@ -18095,7 +18583,7 @@ msgstr ""
"We hope that you enjoy the results of our hard work, and we\n"
"eagerly await your contributions!\n"
-#: ../shell/main.c:243
+#: ../shell/main.c:252
msgid ""
"Thanks\n"
"The Evolution Team\n"
@@ -18103,39 +18591,66 @@ msgstr ""
"Thanks\n"
"The Evolution Team\n"
-#: ../shell/main.c:250
+#: ../shell/main.c:259
msgid "Do not tell me again"
msgstr "Do not tell me again"
-#: ../shell/main.c:456
+#: ../shell/main.c:309
+msgid "Evolution Crash Detection"
+msgstr "Evolution Crash Detection"
+
+#: ../shell/main.c:311
+msgid "Ig_nore"
+msgstr "Ig_nore"
+
+#: ../shell/main.c:326
+#, 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:337
+msgid "_Do not show this message again"
+msgstr "_Do not show this message again"
+
+#: ../shell/main.c:569
msgid "Start Evolution activating the specified component"
msgstr "Start Evolution activating the specified component"
-#: ../shell/main.c:460
+#: ../shell/main.c:573
msgid "Start in online mode"
msgstr "Start in online mode"
-#: ../shell/main.c:463
+#: ../shell/main.c:576
msgid "Forcibly shut down all Evolution components"
msgstr "Forcibly shut down all Evolution components"
-#: ../shell/main.c:467
+#: ../shell/main.c:580
msgid "Forcibly re-migrate from Evolution 1.4"
msgstr "Forcibly re-migrate from Evolution 1.4"
-#: ../shell/main.c:470
+#: ../shell/main.c:583
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:472
+#: ../shell/main.c:585
msgid "Disable loading of any plugins."
msgstr "Disable loading of any plugins."
-#: ../shell/main.c:501
+#: ../shell/main.c:587
+msgid "Disable preview pane of Mail, Contacts and Tasks."
+msgstr "Disable preview pane of Mail, Contacts and Tasks."
+
+#: ../shell/main.c:617
msgid "- The Evolution PIM and Email Client"
msgstr "- The Evolution PIM and Email Client"
-#: ../shell/main.c:512
+#: ../shell/main.c:630
#, c-format
msgid ""
"%s: --online and --offline cannot be used together.\n"
@@ -18273,55 +18788,60 @@ msgstr ""
"\n"
"Edit trust settings:"
-#: ../smime/gui/certificate-manager.c:138
-#: ../smime/gui/certificate-manager.c:156
-#: ../smime/gui/certificate-manager.c:389
-#: ../smime/gui/certificate-manager.c:407
-#: ../smime/gui/certificate-manager.c:621
-#: ../smime/gui/certificate-manager.c:639
+#: ../smime/gui/cert-trust-dialog.c:154
+msgid "Because you trust the certificate authority that issued this certificate, then you trust the authenticity of this certificate unless otherwise indicated here"
+msgstr "Because you trust the certificate authority that issued this certificate, then you trust the authenticity of this certificate unless otherwise indicated here"
+
+#: ../smime/gui/cert-trust-dialog.c:158
+msgid "Because you do not trust the certificate authority that issued this certificate, then you do not trust the authenticity of this certificate unless otherwise indicated here"
+msgstr "Because you do not trust the certificate authority that issued this certificate, then you do not trust the authenticity of this certificate unless otherwise indicated here"
+
+#: ../smime/gui/certificate-manager.c:137
+#: ../smime/gui/certificate-manager.c:380
+#: ../smime/gui/certificate-manager.c:604
msgid "Select a certificate to import..."
msgstr "Select a certificate to import..."
-#: ../smime/gui/certificate-manager.c:147
+#: ../smime/gui/certificate-manager.c:146
msgid "All PKCS12 files"
msgstr "All PKCS12 files"
-#: ../smime/gui/certificate-manager.c:152
-#: ../smime/gui/certificate-manager.c:403
-#: ../smime/gui/certificate-manager.c:635
+#: ../smime/gui/certificate-manager.c:151
+#: ../smime/gui/certificate-manager.c:394
+#: ../smime/gui/certificate-manager.c:618
msgid "All files"
msgstr "All files"
-#: ../smime/gui/certificate-manager.c:279
-#: ../smime/gui/certificate-manager.c:496
-#: ../smime/gui/certificate-manager.c:726
+#: ../smime/gui/certificate-manager.c:271
+#: ../smime/gui/certificate-manager.c:480
+#: ../smime/gui/certificate-manager.c:702
msgid "Certificate Name"
msgstr "Certificate Name"
-#: ../smime/gui/certificate-manager.c:288
-#: ../smime/gui/certificate-manager.c:514
+#: ../smime/gui/certificate-manager.c:280
+#: ../smime/gui/certificate-manager.c:498
msgid "Purposes"
msgstr "Purposes"
-#: ../smime/gui/certificate-manager.c:297
+#: ../smime/gui/certificate-manager.c:289
#: ../smime/gui/smime-ui.glade.h:37
#: ../smime/lib/e-cert.c:570
msgid "Serial Number"
msgstr "Serial Number"
-#: ../smime/gui/certificate-manager.c:305
+#: ../smime/gui/certificate-manager.c:297
msgid "Expires"
msgstr "Expires"
-#: ../smime/gui/certificate-manager.c:398
+#: ../smime/gui/certificate-manager.c:389
msgid "All email certificate files"
msgstr "All email certificate files"
-#: ../smime/gui/certificate-manager.c:505
+#: ../smime/gui/certificate-manager.c:489
msgid "E-Mail Address"
msgstr "E-Mail Address"
-#: ../smime/gui/certificate-manager.c:630
+#: ../smime/gui/certificate-manager.c:613
msgid "All CA certificate files"
msgstr "All CA certificate files"
@@ -18330,19 +18850,6 @@ msgstr "All CA certificate files"
msgid "Certificate Viewer: %s"
msgstr "Certificate Viewer: %s"
-#: ../smime/gui/cert-trust-dialog.c:154
-msgid "Because you trust the certificate authority that issued this certificate, then you trust the authenticity of this certificate unless otherwise indicated here"
-msgstr "Because you trust the certificate authority that issued this certificate, then you trust the authenticity of this certificate unless otherwise indicated here"
-
-#: ../smime/gui/cert-trust-dialog.c:158
-msgid "Because you do not trust the certificate authority that issued this certificate, then you do not trust the authenticity of this certificate unless otherwise indicated here"
-msgstr "Because you do not trust the certificate authority that issued this certificate, then you do not trust the authenticity of this certificate unless otherwise indicated here"
-
-#: ../smime/gui/component.c:47
-#, 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
msgid "Enter new password for certificate database"
@@ -18554,6 +19061,11 @@ msgstr "Your Certificates"
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:679
+msgid "Certificate already exists"
+msgstr "Certificate already exists"
+
#: ../smime/lib/e-cert.c:239
#: ../smime/lib/e-cert.c:249
msgid "%d/%m/%Y"
@@ -18722,11 +19234,6 @@ msgstr "Subject Unique ID"
msgid "Certificate Signature Value"
msgstr "Certificate Signature Value"
-#. XXX we shouldn't be popping up dialogs in this code.
-#: ../smime/lib/e-cert-db.c:676
-msgid "Certificate already exists"
-msgstr "Certificate already exists"
-
#: ../smime/lib/e-pkcs12.c:266
msgid "PKCS12 File Password"
msgstr "PKCS12 File Password"
@@ -18739,30 +19246,6 @@ msgstr "Enter password for PKCS12 file:"
msgid "Imported Certificate"
msgstr "Imported Certificate"
-#: ../tools/evolution-launch-composer.c:321
-msgid "An attachment to add."
-msgstr "An attachment to add."
-
-#: ../tools/evolution-launch-composer.c:322
-msgid "Content type of the attachment."
-msgstr "Content type of the attachment."
-
-#: ../tools/evolution-launch-composer.c:323
-msgid "The filename to display in the mail."
-msgstr "The filename to display in the mail."
-
-#: ../tools/evolution-launch-composer.c:324
-msgid "Description of the attachment."
-msgstr "Description of the attachment."
-
-#: ../tools/evolution-launch-composer.c:325
-msgid "Mark attachment to be shown inline by default."
-msgstr "Mark attachment to be shown inline by default."
-
-#: ../tools/evolution-launch-composer.c:326
-msgid "Default subject for the message."
-msgstr "Default subject for the message."
-
#. This most likely means that KILL_PROCESS_CMD wasn't
#. * found, so just bail completely.
#.
@@ -18892,6 +19375,10 @@ msgstr "Rename the selected folder"
msgid "S_ave Address Book As VCard"
msgstr "S_ave Address Book As VCard"
+#: ../ui/evolution-addressbook.xml.h:31
+msgid "Save as VCard..."
+msgstr "Save as VCard..."
+
#: ../ui/evolution-addressbook.xml.h:32
msgid "Save selected contacts as a VCard."
msgstr "Save selected contacts as a VCard."
@@ -18901,7 +19388,7 @@ msgid "Save the contacts of the selected folder as VCard"
msgstr "Save the contacts of the selected folder as VCard"
#: ../ui/evolution-addressbook.xml.h:34
-#: ../widgets/text/e-text.c:2727
+#: ../widgets/text/e-text.c:2722
msgid "Select All"
msgstr "Select All"
@@ -18979,7 +19466,7 @@ msgid "_Move Folder Contacts To"
msgstr "_Move Folder Contacts To"
#: ../ui/evolution-addressbook.xml.h:55
-#: ../ui/evolution.xml.h:47
+#: ../ui/evolution.xml.h:48
msgid "_New"
msgstr "_New"
@@ -19213,7 +19700,8 @@ msgid "_File"
msgstr "_File"
#: ../ui/evolution-editor.xml.h:20
-#: ../ui/evolution.xml.h:44
+#: ../ui/evolution-mail-global.xml.h:24
+#: ../ui/evolution.xml.h:45
msgid "_Help"
msgstr "_Help"
@@ -19399,92 +19887,96 @@ msgid "Create or edit rules for filtering new mail"
msgstr "Create or edit rules for filtering new mail"
#: ../ui/evolution-mail-global.xml.h:7
-msgid "Download messages for Offline"
-msgstr "Download messages for Offline"
-
-#: ../ui/evolution-mail-global.xml.h:8
-msgid "Download messages for offline"
-msgstr "Download messages for offline"
-
-#: ../ui/evolution-mail-global.xml.h:9
msgid "Download messages of accounts/folders marked for offline"
msgstr "Download messages of accounts/folders marked for offline"
-#: ../ui/evolution-mail-global.xml.h:10
+#: ../ui/evolution-mail-global.xml.h:8
msgid "Empty _Trash"
msgstr "Empty _Trash"
-#: ../ui/evolution-mail-global.xml.h:11
+#: ../ui/evolution-mail-global.xml.h:9
#: ../ui/evolution-mail-list.xml.h:11
#: ../ui/evolution-subscribe.xml.h:2
msgid "F_older"
msgstr "F_older"
-#: ../ui/evolution-mail-global.xml.h:12
+#: ../ui/evolution-mail-global.xml.h:10
msgid "Move the selected folder into another folder"
msgstr "Move the selected folder into another folder"
#. Alphabetical by name, yo
-#: ../ui/evolution-mail-global.xml.h:14
+#: ../ui/evolution-mail-global.xml.h:12
msgid "Permanently remove all deleted messages from all folders"
msgstr "Permanently remove all deleted messages from all folders"
-#: ../ui/evolution-mail-global.xml.h:15
+#: ../ui/evolution-mail-global.xml.h:13
msgid "Search F_olders"
msgstr "Search F_olders"
-#: ../ui/evolution-mail-global.xml.h:16
+#: ../ui/evolution-mail-global.xml.h:14
msgid "Show Message _Preview"
msgstr "Show Message _Preview"
-#: ../ui/evolution-mail-global.xml.h:17
+#: ../ui/evolution-mail-global.xml.h:15
msgid "Show message preview below the message list"
msgstr "Show message preview below the message list"
-#: ../ui/evolution-mail-global.xml.h:18
+#: ../ui/evolution-mail-global.xml.h:16
msgid "Show message preview side-by-side with the message list"
msgstr "Show message preview side-by-side with the message list"
-#: ../ui/evolution-mail-global.xml.h:19
+#: ../ui/evolution-mail-global.xml.h:17
msgid "Show message preview window"
msgstr "Show message preview window"
-#: ../ui/evolution-mail-global.xml.h:20
+#: ../ui/evolution-mail-global.xml.h:18
msgid "Subscribe or unsubscribe to folders on remote servers"
msgstr "Subscribe or unsubscribe to folders on remote servers"
-#: ../ui/evolution-mail-global.xml.h:21
+#: ../ui/evolution-mail-global.xml.h:19
+msgid "View the debug console for log messages"
+msgstr "View the debug console for log messages"
+
+#: ../ui/evolution-mail-global.xml.h:20
msgid "_Classic View"
msgstr "_Classic View"
-#: ../ui/evolution-mail-global.xml.h:22
+#: ../ui/evolution-mail-global.xml.h:21
msgid "_Copy Folder To..."
msgstr "_Copy Folder To..."
+#: ../ui/evolution-mail-global.xml.h:22
+msgid "_Debug Logs"
+msgstr "_Debug Logs"
+
#: ../ui/evolution-mail-global.xml.h:23
+msgid "_Download Messages for Offline Usage"
+msgstr "_Download Messages for Offline Usage"
+
+#: ../ui/evolution-mail-global.xml.h:25
msgid "_Message Filters"
msgstr "_Message Filters"
-#: ../ui/evolution-mail-global.xml.h:24
+#: ../ui/evolution-mail-global.xml.h:26
msgid "_Move Folder To..."
msgstr "_Move Folder To..."
-#: ../ui/evolution-mail-global.xml.h:25
+#: ../ui/evolution-mail-global.xml.h:27
msgid "_New..."
msgstr "_New..."
-#: ../ui/evolution-mail-global.xml.h:26
+#: ../ui/evolution-mail-global.xml.h:28
msgid "_Preview"
msgstr "_Preview"
#.
#. <menuitem name="CreateVFolder" verb="CreateVFolder" _label="_New Search _Folder (FIXME)"/>
#.
-#: ../ui/evolution-mail-global.xml.h:30
+#: ../ui/evolution-mail-global.xml.h:32
msgid "_Subscriptions"
msgstr "_Subscriptions"
-#: ../ui/evolution-mail-global.xml.h:31
+#: ../ui/evolution-mail-global.xml.h:33
msgid "_Vertical View"
msgstr "_Vertical View"
@@ -19546,85 +20038,87 @@ msgid "Mar_k All Messages as Read"
msgstr "Mar_k All Messages as Read"
#: ../ui/evolution-mail-list.xml.h:17
+msgid "Mark all messages in the folder as read"
+msgstr "Mark all messages in the folder as read"
+
+#: ../ui/evolution-mail-list.xml.h:18
msgid "Paste message(s) from the clipboard"
msgstr "Paste message(s) from the clipboard"
-#: ../ui/evolution-mail-list.xml.h:18
+#: ../ui/evolution-mail-list.xml.h:19
msgid "Permanently remove all deleted messages from this folder"
msgstr "Permanently remove all deleted messages from this folder"
-#: ../ui/evolution-mail-list.xml.h:19
+#: ../ui/evolution-mail-list.xml.h:20
msgid "Permanently remove this folder"
msgstr "Permanently remove this folder"
-#: ../ui/evolution-mail-list.xml.h:20
+#: ../ui/evolution-mail-list.xml.h:21
msgid "Re_fresh..."
msgstr "Re_fresh..."
-#: ../ui/evolution-mail-list.xml.h:21
+#: ../ui/evolution-mail-list.xml.h:22
msgid "Refresh the folder"
msgstr "Refresh the folder"
-#: ../ui/evolution-mail-list.xml.h:22
+#: ../ui/evolution-mail-list.xml.h:23
+msgid "Select Message S_ubthread"
+msgstr "Select Message S_ubthread"
+
+#: ../ui/evolution-mail-list.xml.h:24
msgid "Select Message _Thread"
msgstr "Select Message _Thread"
-#: ../ui/evolution-mail-list.xml.h:23
+#: ../ui/evolution-mail-list.xml.h:25
msgid "Select _All Messages"
msgstr "Select _All Messages"
-#: ../ui/evolution-mail-list.xml.h:24
+#: ../ui/evolution-mail-list.xml.h:26
msgid "Select all and only the messages that are not currently selected"
msgstr "Select all and only the messages that are not currently selected"
-#: ../ui/evolution-mail-list.xml.h:25
+#: ../ui/evolution-mail-list.xml.h:27
msgid "Select all messages in the same thread as the selected message"
msgstr "Select all messages in the same thread as the selected message"
-#: ../ui/evolution-mail-list.xml.h:26
+#: ../ui/evolution-mail-list.xml.h:28
+msgid "Select all replies to the currently selected message"
+msgstr "Select all replies to the currently selected message"
+
+#: ../ui/evolution-mail-list.xml.h:29
msgid "Select all visible messages"
msgstr "Select all visible messages"
-#: ../ui/evolution-mail-list.xml.h:27
+#: ../ui/evolution-mail-list.xml.h:30
msgid "Show Hidde_n Messages"
msgstr "Show Hidde_n Messages"
-#: ../ui/evolution-mail-list.xml.h:28
+#: ../ui/evolution-mail-list.xml.h:31
msgid "Show messages that have been temporarily hidden"
msgstr "Show messages that have been temporarily hidden"
-#: ../ui/evolution-mail-list.xml.h:29
+#: ../ui/evolution-mail-list.xml.h:32
msgid "Temporarily hide all messages that have already been read"
msgstr "Temporarily hide all messages that have already been read"
-#: ../ui/evolution-mail-list.xml.h:30
+#: ../ui/evolution-mail-list.xml.h:33
msgid "Temporarily hide the selected messages"
msgstr "Temporarily hide the selected messages"
-#: ../ui/evolution-mail-list.xml.h:31
+#: ../ui/evolution-mail-list.xml.h:34
msgid "Threaded Message list"
msgstr "Threaded Message list"
-#: ../ui/evolution-mail-list.xml.h:33
+#: ../ui/evolution-mail-list.xml.h:36
msgid "_Group By Threads"
msgstr "_Group By Threads"
-#: ../ui/evolution-mail-list.xml.h:34
-#: ../ui/evolution-mail-messagedisplay.xml.h:7
+#: ../ui/evolution-mail-list.xml.h:37
#: ../ui/evolution-mail-message.xml.h:116
+#: ../ui/evolution-mail-messagedisplay.xml.h:7
msgid "_Message"
msgstr "_Message"
-#: ../ui/evolution-mail-messagedisplay.xml.h:2
-#: ../ui/evolution.xml.h:4
-msgid "Close this window"
-msgstr "Close this window"
-
-#: ../ui/evolution-mail-messagedisplay.xml.h:3
-#: ../ui/evolution.xml.h:17
-msgid "Main toolbar"
-msgstr "Main toolbar"
-
#: ../ui/evolution-mail-message.xml.h:1
msgid "A_dd Sender to Address Book"
msgstr "A_dd Sender to Address Book"
@@ -19947,6 +20441,7 @@ msgid "Select all the text in a message"
msgstr "Select all the text in a message"
#: ../ui/evolution-mail-message.xml.h:93
+#: ../ui/evolution.xml.h:27
msgid "Set up the page settings for your current printer"
msgstr "Set up the page settings for your current printer"
@@ -20050,26 +20545,41 @@ msgstr "_Previous Message"
msgid "_Quoted"
msgstr "_Quoted"
-#: ../ui/evolution-mail-message.xml.h:128
+#. Translators: "Read" as in "has been read" (evolution-mail-message.xml)
+#: ../ui/evolution-mail-message.xml.h:127
+msgid "_Read"
+msgstr "_Read"
+
+#: ../ui/evolution-mail-message.xml.h:129
msgid "_Save Message..."
msgstr "_Save Message..."
-#: ../ui/evolution-mail-message.xml.h:129
+#: ../ui/evolution-mail-message.xml.h:130
msgid "_Undelete Message"
msgstr "_Undelete Message"
-#: ../ui/evolution-mail-message.xml.h:130
+#: ../ui/evolution-mail-message.xml.h:131
msgid "_Unread"
msgstr "_Unread"
-#: ../ui/evolution-mail-message.xml.h:131
+#: ../ui/evolution-mail-message.xml.h:132
msgid "_Zoom"
msgstr "_Zoom"
-#: ../ui/evolution-mail-message.xml.h:132
+#: ../ui/evolution-mail-message.xml.h:133
msgid "_Zoom In"
msgstr "_Zoom In"
+#: ../ui/evolution-mail-messagedisplay.xml.h:2
+#: ../ui/evolution.xml.h:4
+msgid "Close this window"
+msgstr "Close this window"
+
+#: ../ui/evolution-mail-messagedisplay.xml.h:3
+#: ../ui/evolution.xml.h:18
+msgid "Main toolbar"
+msgstr "Main toolbar"
+
#: ../ui/evolution-memos.xml.h:3
msgid "Copy selected memo"
msgstr "Copy selected memo"
@@ -20471,81 +20981,89 @@ msgid "Display window buttons with text only"
msgstr "Display window buttons with text only"
#: ../ui/evolution.xml.h:10
+msgid "Evolution _FAQ"
+msgstr "Evolution _FAQ"
+
+#: ../ui/evolution.xml.h:11
msgid "Exit the program"
msgstr "Exit the program"
-#: ../ui/evolution.xml.h:11
+#: ../ui/evolution.xml.h:12
msgid "Forget remembered passwords so you will be prompted for them again"
msgstr "Forget remembered passwords so you will be prompted for them again"
-#: ../ui/evolution.xml.h:12
+#: ../ui/evolution.xml.h:13
msgid "Hide window buttons"
msgstr "Hide window buttons"
-#: ../ui/evolution.xml.h:13
+#: ../ui/evolution.xml.h:14
msgid "I_mport..."
msgstr "I_mport..."
-#: ../ui/evolution.xml.h:14
-msgid "Icons _and text"
-msgstr "Icons _and text"
-
#: ../ui/evolution.xml.h:15
+msgid "Icons _and Text"
+msgstr "Icons _and Text"
+
+#: ../ui/evolution.xml.h:16
msgid "Import data from other programs"
msgstr "Import data from other programs"
-#: ../ui/evolution.xml.h:16
+#: ../ui/evolution.xml.h:17
msgid "Lay_out"
msgstr "Lay_out"
-#: ../ui/evolution.xml.h:18
+#: ../ui/evolution.xml.h:19
msgid "New _Window"
msgstr "New _Window"
-#: ../ui/evolution.xml.h:19
+#: ../ui/evolution.xml.h:20
+msgid "Open the Frequently Asked Questions webpage"
+msgstr "Open the Frequently Asked Questions webpage"
+
+#: ../ui/evolution.xml.h:21
+msgid "Page Set_up..."
+msgstr "Page Set_up..."
+
+#: ../ui/evolution.xml.h:22
msgid "Prefere_nces"
msgstr "Prefere_nces"
-#: ../ui/evolution.xml.h:20
+#: ../ui/evolution.xml.h:23
msgid "Send / Receive"
msgstr "Send / Receive"
-#: ../ui/evolution.xml.h:21
+#: ../ui/evolution.xml.h:24
msgid "Send / _Receive"
msgstr "Send / _Receive"
-#: ../ui/evolution.xml.h:22
+#: ../ui/evolution.xml.h:25
msgid "Send queued items and retrieve new items"
msgstr "Send queued items and retrieve new items"
-#: ../ui/evolution.xml.h:23
+#: ../ui/evolution.xml.h:26
msgid "Set up Pilot configuration"
msgstr "Set up Pilot configuration"
-#: ../ui/evolution.xml.h:24
+#: ../ui/evolution.xml.h:28
msgid "Show Side _Bar"
msgstr "Show Side _Bar"
-#: ../ui/evolution.xml.h:25
+#: ../ui/evolution.xml.h:29
msgid "Show _Status Bar"
msgstr "Show _Status Bar"
-#: ../ui/evolution.xml.h:26
+#: ../ui/evolution.xml.h:30
msgid "Show _Toolbar"
msgstr "Show _Toolbar"
-#: ../ui/evolution.xml.h:27
+#: ../ui/evolution.xml.h:31
msgid "Show information about Evolution"
msgstr "Show information about Evolution"
-#: ../ui/evolution.xml.h:28
+#: ../ui/evolution.xml.h:32
msgid "Submit Bug Report"
msgstr "Submit Bug Report"
-#. <menuitem name="HelpFAQ" verb=""
-#. _label="Evolution _FAQ"/>
-#.
-#. <separator/>
#: ../ui/evolution.xml.h:33
msgid "Submit _Bug Report"
msgstr "Submit _Bug Report"
@@ -20559,8 +21077,8 @@ msgid "Toggle whether we are working offline."
msgstr "Toggle whether we are working offline."
#: ../ui/evolution.xml.h:36
-msgid "Tool_bar style"
-msgstr "Tool_bar style"
+msgid "Tool_bar Style"
+msgstr "Tool_bar Style"
#: ../ui/evolution.xml.h:37
msgid "View/Hide the Side Bar"
@@ -20582,43 +21100,120 @@ msgstr "_Close Window"
msgid "_Forget Passwords"
msgstr "_Forget Passwords"
-#: ../ui/evolution.xml.h:45
-msgid "_Hide buttons"
-msgstr "_Hide buttons"
+#: ../ui/evolution.xml.h:44
+msgid "_Frequently Asked Questions"
+msgstr "_Frequently Asked Questions"
#: ../ui/evolution.xml.h:46
-msgid "_Icons only"
-msgstr "_Icons only"
+msgid "_Hide Buttons"
+msgstr "_Hide Buttons"
-#: ../ui/evolution.xml.h:48
+#: ../ui/evolution.xml.h:47
+msgid "_Icons Only"
+msgstr "_Icons Only"
+
+#: ../ui/evolution.xml.h:49
msgid "_Quick Reference"
msgstr "_Quick Reference"
-#: ../ui/evolution.xml.h:49
+#: ../ui/evolution.xml.h:50
msgid "_Quit"
msgstr "_Quit"
-#: ../ui/evolution.xml.h:50
+#: ../ui/evolution.xml.h:51
msgid "_Switcher Appearance"
msgstr "_Switcher Appearance"
-#: ../ui/evolution.xml.h:51
+#: ../ui/evolution.xml.h:52
msgid "_Synchronization Options..."
msgstr "_Synchronisation Options..."
-#: ../ui/evolution.xml.h:52
-msgid "_Text only"
-msgstr "_Text only"
+#: ../ui/evolution.xml.h:53
+msgid "_Text Only"
+msgstr "_Text Only"
-#: ../ui/evolution.xml.h:54
+#: ../ui/evolution.xml.h:55
msgid "_Window"
msgstr "_Window"
+#: ../views/addressbook/galview.xml.h:1
+msgid "By _Company"
+msgstr "By _Company"
+
+#: ../views/addressbook/galview.xml.h:2
+msgid "_Address Cards"
+msgstr "_Address Cards"
+
+#: ../views/addressbook/galview.xml.h:3
+#: ../views/calendar/galview.xml.h:3
+msgid "_List View"
+msgstr "_List View"
+
+#: ../views/calendar/galview.xml.h:1
+msgid "W_eek View"
+msgstr "W_eek View"
+
+#: ../views/calendar/galview.xml.h:2
+msgid "_Day View"
+msgstr "_Day View"
+
+#: ../views/calendar/galview.xml.h:4
+msgid "_Month View"
+msgstr "_Month View"
+
+#: ../views/calendar/galview.xml.h:5
+msgid "_Work Week View"
+msgstr "_Work Week View"
+
+#: ../views/mail/galview.xml.h:1
+msgid "As Sent Folder for Wi_de View"
+msgstr "As Sent Folder for Wi_de View"
+
+#: ../views/mail/galview.xml.h:2
+msgid "As _Sent Folder"
+msgstr "As _Sent Folder"
+
+#: ../views/mail/galview.xml.h:3
+msgid "By S_tatus"
+msgstr "By S_tatus"
+
+#: ../views/mail/galview.xml.h:4
+msgid "By Se_nder"
+msgstr "By Se_nder"
+
+#: ../views/mail/galview.xml.h:5
+msgid "By Su_bject"
+msgstr "By Su_bject"
+
+#: ../views/mail/galview.xml.h:6
+msgid "By _Follow Up Flag"
+msgstr "By _Follow Up Flag"
+
+#: ../views/mail/galview.xml.h:7
+msgid "For _Wide View"
+msgstr "For _Wide View"
+
+#: ../views/mail/galview.xml.h:8
+msgid "_Messages"
+msgstr "_Messages"
+
+#: ../views/memos/galview.xml.h:1
+msgid "_Memos"
+msgstr "_Memos"
+
+#: ../views/tasks/galview.xml.h:1
+msgid "With _Due Date"
+msgstr "With _Due Date"
+
+#: ../views/tasks/galview.xml.h:2
+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:213
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:404
#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:406
#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:408
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:410
#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:759
msgid "UTC"
msgstr "UTC"
@@ -20647,19 +21242,19 @@ msgstr ""
"Use the left mouse button to zoom in on an area of the map and select a time zone.\n"
"Use the right mouse button to zoom out."
-#: ../widgets/menus/gal-define-views-dialog.c:76
-#: ../widgets/menus/gal-define-views-model.c:188
+#: ../widgets/menus/gal-define-views-dialog.c:78
+#: ../widgets/menus/gal-define-views-model.c:186
msgid "Collection"
msgstr "Collection"
-#: ../widgets/menus/gal-define-views-dialog.c:325
+#: ../widgets/menus/gal-define-views-dialog.c:360
#: ../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:333
-#: ../widgets/menus/gal-define-views-dialog.c:335
+#: ../widgets/menus/gal-define-views-dialog.c:368
+#: ../widgets/menus/gal-define-views-dialog.c:370
msgid "Define Views"
msgstr "Define Views"
@@ -20668,37 +21263,18 @@ msgstr "Define Views"
msgid "Define Views for \"%s\""
msgstr "Define Views for \"%s\""
-#: ../widgets/menus/gal-define-views.glade.h:5
-msgid "_Edit..."
-msgstr "_Edit..."
-
-#: ../widgets/menus/gal-view-factory-etable.c:39
-#: ../widgets/table/e-table-header-item.c:1907
-#: ../widgets/table/e-table-scrolled.c:222
-#: ../widgets/table/e-table-scrolled.c:223
+#: ../widgets/menus/gal-view-factory-etable.c:37
+#: ../widgets/table/e-table-header-item.c:1921
+#: ../widgets/table/e-table-scrolled.c:216
+#: ../widgets/table/e-table-scrolled.c:217
msgid "Table"
msgstr "Table"
-#. bonobo displays this string so it must be in locale
-#: ../widgets/menus/gal-view-instance.c:587
-#: ../widgets/menus/gal-view-menus.c:354
-msgid "Custom View"
-msgstr "Custom View"
-
-#: ../widgets/menus/gal-view-instance.c:588
-msgid "Save Custom View"
-msgstr "Save Custom View"
-
-#: ../widgets/menus/gal-view-instance.c:592
-#: ../widgets/menus/gal-view-menus.c:378
-msgid "Define Views..."
-msgstr "Define Views..."
-
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:182
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:228
msgid "Instance"
msgstr "Instance"
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:232
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:286
msgid "Save Current View"
msgstr "Save Current View"
@@ -20710,6 +21286,21 @@ msgstr "_Create new view"
msgid "_Replace existing view"
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
+msgid "Custom View"
+msgstr "Custom View"
+
+#: ../widgets/menus/gal-view-instance.c:583
+msgid "Save Custom View"
+msgstr "Save Custom View"
+
+#: ../widgets/menus/gal-view-instance.c:587
+#: ../widgets/menus/gal-view-menus.c:378
+msgid "Define Views..."
+msgstr "Define Views..."
+
#: ../widgets/menus/gal-view-menus.c:291
msgid "C_urrent View"
msgstr "C_urrent View"
@@ -20735,11 +21326,11 @@ msgstr "Save current custom view"
msgid "Create or edit views"
msgstr "Create or edit views"
-#: ../widgets/menus/gal-view-new-dialog.c:80
+#: ../widgets/menus/gal-view-new-dialog.c:72
msgid "Factory"
msgstr "Factory"
-#: ../widgets/menus/gal-view-new-dialog.c:115
+#: ../widgets/menus/gal-view-new-dialog.c:107
msgid "Define New View"
msgstr "Define New View"
@@ -20755,97 +21346,113 @@ msgstr "Type of View"
msgid "Type of view:"
msgstr "Type of view:"
+#: ../widgets/misc/e-attachment-bar.c:1028
+msgid "Attachment Bar"
+msgstr "Attachment Bar"
+
+#: ../widgets/misc/e-attachment.c:306
+#: ../widgets/misc/e-attachment.c:321
+#: ../widgets/misc/e-attachment.c:522
+#: ../widgets/misc/e-attachment.c:539
+#, c-format
+msgid "Cannot attach file %s: %s"
+msgstr "Cannot attach file %s: %s"
+
+#: ../widgets/misc/e-attachment.c:314
+#: ../widgets/misc/e-attachment.c:531
+#, c-format
+msgid "Cannot attach file %s: not a regular file"
+msgstr "Cannot attach file %s: not a regular file"
+
+#: ../widgets/misc/e-attachment.glade.h:1
+msgid "Attachment Properties"
+msgstr "Attachment Properties"
+
+#: ../widgets/misc/e-attachment.glade.h:3
+msgid "File name:"
+msgstr "File name:"
+
+#: ../widgets/misc/e-attachment.glade.h:4
+msgid "MIME type:"
+msgstr "MIME type:"
+
#: ../widgets/misc/e-attachment.glade.h:5
msgid "Suggest automatic display of attachment"
msgstr "Suggest automatic display of attachment"
-#: ../widgets/misc/e-calendar.c:226
-msgid "Month Calendar"
-msgstr "Month Calendar"
-
-#. Translators: These are the first characters of each day of the
-#. week, 'M' for 'Monday', 'T' for Tuesday etc.
-#: ../widgets/misc/e-calendar-item.c:416
-msgid "MTWTFSS"
-msgstr "MTWTFSS"
-
#. This is a strftime() format. %B = Month name, %Y = Year.
-#: ../widgets/misc/e-calendar-item.c:1088
-#: ../widgets/misc/e-calendar-item.c:1742
+#: ../widgets/misc/e-calendar-item.c:1077
+#: ../widgets/misc/e-calendar-item.c:1724
msgid "%B %Y"
msgstr "%B %Y"
-#: ../widgets/misc/e-canvas-background.c:457
-#: ../widgets/misc/e-canvas-background.c:458
-#: ../widgets/text/e-entry.c:1235
-#: ../widgets/text/e-entry.c:1236
-#: ../widgets/text/e-text.c:3581
-#: ../widgets/text/e-text.c:3582
+#: ../widgets/misc/e-calendar.c:226
+msgid "Month Calendar"
+msgstr "Month Calendar"
+
+#: ../widgets/misc/e-canvas-background.c:453
+#: ../widgets/misc/e-canvas-background.c:454
+#: ../widgets/text/e-text.c:3642
+#: ../widgets/text/e-text.c:3643
msgid "Fill color"
msgstr "Fill colour"
-#: ../widgets/misc/e-canvas-background.c:464
-#: ../widgets/misc/e-canvas-background.c:465
-#: ../widgets/misc/e-canvas-background.c:471
-#: ../widgets/misc/e-canvas-background.c:472
-#: ../widgets/text/e-entry.c:1242
-#: ../widgets/text/e-entry.c:1243
-#: ../widgets/text/e-entry.c:1249
-#: ../widgets/text/e-entry.c:1250
-#: ../widgets/text/e-text.c:3588
-#: ../widgets/text/e-text.c:3589
-#: ../widgets/text/e-text.c:3596
-#: ../widgets/text/e-text.c:3597
+#: ../widgets/misc/e-canvas-background.c:460
+#: ../widgets/misc/e-canvas-background.c:461
+#: ../widgets/misc/e-canvas-background.c:467
+#: ../widgets/misc/e-canvas-background.c:468
+#: ../widgets/text/e-text.c:3649
+#: ../widgets/text/e-text.c:3650
+#: ../widgets/text/e-text.c:3657
+#: ../widgets/text/e-text.c:3658
msgid "GDK fill color"
msgstr "GDK fill colour"
-#: ../widgets/misc/e-canvas-background.c:478
-#: ../widgets/misc/e-canvas-background.c:479
-#: ../widgets/text/e-entry.c:1256
-#: ../widgets/text/e-entry.c:1257
-#: ../widgets/text/e-text.c:3603
-#: ../widgets/text/e-text.c:3604
+#: ../widgets/misc/e-canvas-background.c:474
+#: ../widgets/misc/e-canvas-background.c:475
+#: ../widgets/text/e-text.c:3664
+#: ../widgets/text/e-text.c:3665
msgid "Fill stipple"
msgstr "Fill stipple"
-#: ../widgets/misc/e-canvas-background.c:485
-#: ../widgets/misc/e-canvas-background.c:486
+#: ../widgets/misc/e-canvas-background.c:481
+#: ../widgets/misc/e-canvas-background.c:482
msgid "X1"
msgstr "X1"
-#: ../widgets/misc/e-canvas-background.c:492
-#: ../widgets/misc/e-canvas-background.c:493
+#: ../widgets/misc/e-canvas-background.c:488
+#: ../widgets/misc/e-canvas-background.c:489
msgid "X2"
msgstr "X2"
-#: ../widgets/misc/e-canvas-background.c:499
-#: ../widgets/misc/e-canvas-background.c:500
+#: ../widgets/misc/e-canvas-background.c:495
+#: ../widgets/misc/e-canvas-background.c:496
msgid "Y1"
msgstr "Y1"
-#: ../widgets/misc/e-canvas-background.c:506
-#: ../widgets/misc/e-canvas-background.c:507
+#: ../widgets/misc/e-canvas-background.c:502
+#: ../widgets/misc/e-canvas-background.c:503
msgid "Y2"
msgstr "Y2"
-#: ../widgets/misc/e-canvas-vbox.c:102
-#: ../widgets/misc/e-reflow.c:1429
-#: ../widgets/table/e-table-group-container.c:974
-#: ../widgets/table/e-table-group-leaf.c:636
-#: ../widgets/table/e-table-item.c:3017
+#: ../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:3062
msgid "Minimum width"
msgstr "Minimum width"
-#: ../widgets/misc/e-canvas-vbox.c:103
-#: ../widgets/misc/e-reflow.c:1430
-#: ../widgets/table/e-table-group-container.c:975
-#: ../widgets/table/e-table-group-leaf.c:637
-#: ../widgets/table/e-table-item.c:3018
+#: ../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:3063
msgid "Minimum Width"
msgstr "Minimum Width"
-#: ../widgets/misc/e-canvas-vbox.c:114
-#: ../widgets/misc/e-canvas-vbox.c:115
+#: ../widgets/misc/e-canvas-vbox.c:104
+#: ../widgets/misc/e-canvas-vbox.c:105
#: ../widgets/misc/e-expander.c:206
msgid "Spacing"
msgstr "Spacing"
@@ -20863,140 +21470,133 @@ msgstr "The time must be in the format: %s"
msgid "The percent value must be between 0 and 100, inclusive"
msgstr "The percent value must be between 0 and 100, inclusive"
-#: ../widgets/misc/e-charset-picker.c:64
+#: ../widgets/misc/e-charset-picker.c:65
+msgid "Arabic"
+msgstr "Arabic"
+
+#: ../widgets/misc/e-charset-picker.c:66
msgid "Baltic"
msgstr "Baltic"
-#: ../widgets/misc/e-charset-picker.c:65
+#: ../widgets/misc/e-charset-picker.c:67
msgid "Central European"
msgstr "Central European"
-#: ../widgets/misc/e-charset-picker.c:66
+#: ../widgets/misc/e-charset-picker.c:68
msgid "Chinese"
msgstr "Chinese"
-#: ../widgets/misc/e-charset-picker.c:67
+#: ../widgets/misc/e-charset-picker.c:69
msgid "Cyrillic"
msgstr "Cyrillic"
-#: ../widgets/misc/e-charset-picker.c:68
+#: ../widgets/misc/e-charset-picker.c:70
msgid "Greek"
msgstr "Greek"
-#: ../widgets/misc/e-charset-picker.c:69
+#: ../widgets/misc/e-charset-picker.c:71
msgid "Hebrew"
msgstr "Hebrew"
-#: ../widgets/misc/e-charset-picker.c:70
+#: ../widgets/misc/e-charset-picker.c:72
msgid "Japanese"
msgstr "Japanese"
-#: ../widgets/misc/e-charset-picker.c:71
+#: ../widgets/misc/e-charset-picker.c:73
msgid "Korean"
msgstr "Korean"
-#: ../widgets/misc/e-charset-picker.c:72
+#: ../widgets/misc/e-charset-picker.c:74
msgid "Thai"
msgstr "Thai"
-#: ../widgets/misc/e-charset-picker.c:73
+#: ../widgets/misc/e-charset-picker.c:75
msgid "Turkish"
msgstr "Turkish"
-#: ../widgets/misc/e-charset-picker.c:74
+#: ../widgets/misc/e-charset-picker.c:76
msgid "Unicode"
msgstr "Unicode"
-#: ../widgets/misc/e-charset-picker.c:75
+#: ../widgets/misc/e-charset-picker.c:77
msgid "Western European"
msgstr "Western European"
-#: ../widgets/misc/e-charset-picker.c:76
+#: ../widgets/misc/e-charset-picker.c:78
msgid "Western European, New"
msgstr "Western European, New"
-#: ../widgets/misc/e-charset-picker.c:94
-#: ../widgets/misc/e-charset-picker.c:95
-#: ../widgets/misc/e-charset-picker.c:96
-msgid "Traditional"
-msgstr "Traditional"
-
#: ../widgets/misc/e-charset-picker.c:97
#: ../widgets/misc/e-charset-picker.c:98
#: ../widgets/misc/e-charset-picker.c:99
+msgid "Traditional"
+msgstr "Traditional"
+
#: ../widgets/misc/e-charset-picker.c:100
+#: ../widgets/misc/e-charset-picker.c:101
+#: ../widgets/misc/e-charset-picker.c:102
+#: ../widgets/misc/e-charset-picker.c:103
msgid "Simplified"
msgstr "Simplified"
-#: ../widgets/misc/e-charset-picker.c:103
+#: ../widgets/misc/e-charset-picker.c:106
msgid "Ukrainian"
msgstr "Ukrainian"
-#: ../widgets/misc/e-charset-picker.c:106
+#: ../widgets/misc/e-charset-picker.c:109
msgid "Visual"
msgstr "Visual"
-#: ../widgets/misc/e-charset-picker.c:175
+#: ../widgets/misc/e-charset-picker.c:178
#, c-format
msgid "Unknown character set: %s"
msgstr "Unknown character set: %s"
-#: ../widgets/misc/e-charset-picker.c:220
+#: ../widgets/misc/e-charset-picker.c:223
msgid "Character Encoding"
msgstr "Character Encoding"
-#: ../widgets/misc/e-charset-picker.c:235
+#: ../widgets/misc/e-charset-picker.c:238
msgid "Enter the character set to use"
msgstr "Enter the character set to use"
-#: ../widgets/misc/e-charset-picker.c:342
+#: ../widgets/misc/e-charset-picker.c:345
msgid "Other..."
msgstr "Other..."
-#: ../widgets/misc/e-charset-picker.c:483
+#: ../widgets/misc/e-charset-picker.c:486
msgid "Ch_aracter Encoding"
msgstr "Ch_aracter Encoding"
-#. Translators: This is the string to draw when the label
-#. * of a fixed-size button is clipped, e.g. '...'.
-#.
-#: ../widgets/misc/e-clipped-label.c:114
-msgid "..."
-msgstr "..."
-
-#: ../widgets/misc/e-dateedit.c:321
+#: ../widgets/misc/e-dateedit.c:324
msgid "Date and Time"
msgstr "Date and Time"
-#: ../widgets/misc/e-dateedit.c:340
+#: ../widgets/misc/e-dateedit.c:345
msgid "Text entry to input date"
msgstr "Text entry to input date"
-#: ../widgets/misc/e-dateedit.c:362
+#: ../widgets/misc/e-dateedit.c:367
msgid "Click this button to show a calendar"
msgstr "Click this button to show a calendar"
-#: ../widgets/misc/e-dateedit.c:384
+#: ../widgets/misc/e-dateedit.c:409
msgid "Combo box to select time"
msgstr "Combo box to select time"
-#: ../widgets/misc/e-dateedit.c:385
-msgid "Time"
-msgstr "Time"
-
-#: ../widgets/misc/e-dateedit.c:459
+#: ../widgets/misc/e-dateedit.c:484
msgid "No_w"
msgstr "No_w"
-#: ../widgets/misc/e-dateedit.c:465
+#: ../widgets/misc/e-dateedit.c:490
msgid "_Today"
msgstr "_Today"
-#: ../widgets/misc/e-dateedit.c:1630
+#: ../widgets/misc/e-dateedit.c:1655
msgid "Invalid Date Value"
msgstr "Invalid Date Value"
-#: ../widgets/misc/e-dateedit.c:1656
+#: ../widgets/misc/e-dateedit.c:1684
msgid "Invalid Time Value"
msgstr "Invalid Time Value"
@@ -21033,12 +21633,12 @@ 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:3316
+#: ../widgets/table/e-tree.c:3356
msgid "Expander Size"
msgstr "Expander Size"
#: ../widgets/misc/e-expander.c:224
-#: ../widgets/table/e-tree.c:3317
+#: ../widgets/table/e-tree.c:3357
msgid "Size of the expander arrow"
msgstr "Size of the expander arrow"
@@ -21051,66 +21651,66 @@ msgid "Spacing around expander arrow"
msgstr "Spacing around expander arrow"
#. FIXME: get the toplevel window...
-#: ../widgets/misc/e-filter-bar.c:129
-#: ../widgets/misc/e-filter-bar.c:170
-#: ../widgets/misc/e-filter-bar.c:292
-#: ../widgets/misc/e-filter-bar.c:728
+#: ../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:748
msgid "Advanced Search"
msgstr "Advanced Search"
#. FIXME: get the toplevel window...
-#: ../widgets/misc/e-filter-bar.c:218
+#: ../widgets/misc/e-filter-bar.c:234
msgid "Save Search"
msgstr "Save Search"
-#: ../widgets/misc/e-filter-bar.c:252
+#: ../widgets/misc/e-filter-bar.c:271
msgid "_Searches"
msgstr "_Searches"
-#: ../widgets/misc/e-filter-bar.c:254
+#: ../widgets/misc/e-filter-bar.c:273
msgid "Searches"
msgstr "Searches"
-#: ../widgets/misc/e-filter-bar.h:100
-#: ../widgets/misc/e-filter-bar.h:111
+#: ../widgets/misc/e-filter-bar.h:101
+#: ../widgets/misc/e-filter-bar.h:112
msgid "_Save Search..."
msgstr "_Save Search..."
-#: ../widgets/misc/e-filter-bar.h:101
-#: ../widgets/misc/e-filter-bar.h:112
+#: ../widgets/misc/e-filter-bar.h:102
+#: ../widgets/misc/e-filter-bar.h:113
msgid "_Edit Saved Searches..."
msgstr "_Edit Saved Searches..."
-#: ../widgets/misc/e-filter-bar.h:102
-#: ../widgets/misc/e-filter-bar.h:113
+#: ../widgets/misc/e-filter-bar.h:103
+#: ../widgets/misc/e-filter-bar.h:114
msgid "_Advanced Search..."
msgstr "_Advanced Search..."
-#: ../widgets/misc/e-filter-bar.h:103
+#: ../widgets/misc/e-filter-bar.h:104
msgid "All Accounts"
msgstr "All Accounts"
-#: ../widgets/misc/e-filter-bar.h:104
+#: ../widgets/misc/e-filter-bar.h:105
msgid "Current Account"
msgstr "Current Account"
-#: ../widgets/misc/e-filter-bar.h:105
+#: ../widgets/misc/e-filter-bar.h:106
msgid "Current Folder"
msgstr "Current Folder"
-#: ../widgets/misc/e-filter-bar.h:106
+#: ../widgets/misc/e-filter-bar.h:107
msgid "Current Message"
msgstr "Current Message"
-#: ../widgets/misc/e-image-chooser.c:172
+#: ../widgets/misc/e-image-chooser.c:173
msgid "Choose Image"
msgstr "Choose Image"
-#: ../widgets/misc/e-map.c:627
+#: ../widgets/misc/e-map.c:626
msgid "World Map"
msgstr "World Map"
-#: ../widgets/misc/e-map.c:629
+#: ../widgets/misc/e-map.c:628
msgid "Mouse-based interactive map widget for selecting timezone. Keyboard users should select the timezone from the below combo box instead."
msgstr "Mouse-based interactive map widget for selecting timezone. Keyboard users should select the timezone from the below combo box instead."
@@ -21126,82 +21726,92 @@ msgstr "Sync Private Records:"
msgid "Sync Categories:"
msgstr "Sync Categories:"
-#: ../widgets/misc/e-reflow.c:1451
-#: ../widgets/misc/e-reflow.c:1452
+#: ../widgets/misc/e-reflow.c:1448
+#: ../widgets/misc/e-reflow.c:1449
msgid "Empty message"
msgstr "Empty message"
-#: ../widgets/misc/e-reflow.c:1458
-#: ../widgets/misc/e-reflow.c:1459
+#: ../widgets/misc/e-reflow.c:1455
+#: ../widgets/misc/e-reflow.c:1456
msgid "Reflow model"
msgstr "Reflow model"
-#: ../widgets/misc/e-reflow.c:1465
-#: ../widgets/misc/e-reflow.c:1466
+#: ../widgets/misc/e-reflow.c:1462
+#: ../widgets/misc/e-reflow.c:1463
msgid "Column width"
msgstr "Column width"
-#: ../widgets/misc/e-search-bar.c:598
+#: ../widgets/misc/e-search-bar.c:349
+#: ../widgets/misc/e-search-bar.c:478
+#: ../widgets/misc/e-search-bar.c:480
+msgid "Search"
+msgstr "Search"
+
+#: ../widgets/misc/e-search-bar.c:349
+#: ../widgets/misc/e-search-bar.c:478
+#: ../widgets/misc/e-search-bar.c:480
+msgid "Click here to change the search type"
+msgstr "Click here to change the search type"
+
+#: ../widgets/misc/e-search-bar.c:610
msgid "_Search"
msgstr "_Search"
-#: ../widgets/misc/e-search-bar.c:604
+#: ../widgets/misc/e-search-bar.c:616
msgid "_Find Now"
msgstr "_Find Now"
-#: ../widgets/misc/e-search-bar.c:605
+#: ../widgets/misc/e-search-bar.c:617
msgid "_Clear"
msgstr "_Clear"
-#: ../widgets/misc/e-search-bar.c:856
+#: ../widgets/misc/e-search-bar.c:872
msgid "Item ID"
msgstr "Item ID"
-#: ../widgets/misc/e-search-bar.c:863
-#: ../widgets/text/e-entry.c:1221
-#: ../widgets/text/e-entry.c:1222
-#: ../widgets/text/e-text.c:3503
-#: ../widgets/text/e-text.c:3504
+#: ../widgets/misc/e-search-bar.c:879
+#: ../widgets/text/e-text.c:3564
+#: ../widgets/text/e-text.c:3565
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:997
+#: ../widgets/misc/e-search-bar.c:1013
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:1014
+#: ../widgets/misc/e-search-bar.c:1030
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:1026
+#: ../widgets/misc/e-search-bar.c:1042
msgid " i_n "
msgstr " i_n "
-#: ../widgets/misc/e-selection-model-array.c:547
-#: ../widgets/table/e-tree-selection-model.c:811
+#: ../widgets/misc/e-selection-model-array.c:543
+#: ../widgets/table/e-tree-selection-model.c:807
msgid "Cursor Row"
msgstr "Cursor Row"
-#: ../widgets/misc/e-selection-model-array.c:554
-#: ../widgets/table/e-tree-selection-model.c:818
+#: ../widgets/misc/e-selection-model-array.c:550
+#: ../widgets/table/e-tree-selection-model.c:814
msgid "Cursor Column"
msgstr "Cursor Column"
-#: ../widgets/misc/e-selection-model.c:214
+#: ../widgets/misc/e-selection-model.c:210
msgid "Sorter"
msgstr "Sorter"
-#: ../widgets/misc/e-selection-model.c:221
+#: ../widgets/misc/e-selection-model.c:217
msgid "Selection Mode"
msgstr "Selection Mode"
-#: ../widgets/misc/e-selection-model.c:229
+#: ../widgets/misc/e-selection-model.c:225
msgid "Cursor Mode"
msgstr "Cursor Mode"
@@ -21338,14 +21948,14 @@ 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:213
+#: ../widgets/misc/e-task-widget.c:297
#, 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:219
+#: ../widgets/misc/e-task-widget.c:303
#, c-format
msgid "%s (%d%% complete)"
msgstr "%s (%d%% complete)"
@@ -21370,214 +21980,170 @@ msgstr "_Available Categories:"
msgid "categories"
msgstr "categories"
-#: ../widgets/table/e-cell-combo.c:177
+#: ../widgets/table/e-cell-combo.c:169
msgid "popup list"
msgstr "popup list"
-#: ../widgets/table/e-cell-date.c:64
+#: ../widgets/table/e-cell-date.c:62
msgid "%l:%M %p"
msgstr "%l:%M %p"
-#: ../widgets/table/e-cell-pixbuf.c:387
+#: ../widgets/table/e-cell-pixbuf.c:360
msgid "Selected Column"
msgstr "Selected Column"
-#: ../widgets/table/e-cell-pixbuf.c:394
+#: ../widgets/table/e-cell-pixbuf.c:367
msgid "Focused Column"
msgstr "Focused Column"
-#: ../widgets/table/e-cell-pixbuf.c:401
+#: ../widgets/table/e-cell-pixbuf.c:374
msgid "Unselected Column"
msgstr "Unselected Column"
-#: ../widgets/table/e-cell-text.c:1802
+#: ../widgets/table/e-cell-text.c:1807
msgid "Strikeout Column"
msgstr "Strikeout Column"
-#: ../widgets/table/e-cell-text.c:1809
+#: ../widgets/table/e-cell-text.c:1814
msgid "Underline Column"
msgstr "Underline Column"
-#: ../widgets/table/e-cell-text.c:1816
+#: ../widgets/table/e-cell-text.c:1821
msgid "Bold Column"
msgstr "Bold Column"
-#: ../widgets/table/e-cell-text.c:1823
+#: ../widgets/table/e-cell-text.c:1828
msgid "Color Column"
msgstr "Colour Column"
-#: ../widgets/table/e-cell-text.c:1837
+#: ../widgets/table/e-cell-text.c:1842
msgid "BG Color Column"
msgstr "BG Colour Column"
-#: ../widgets/table/e-table.c:3312
-#: ../widgets/table/e-table-group-container.c:939
-#: ../widgets/table/e-table-group-container.c:940
-#: ../widgets/table/e-table-group-leaf.c:608
-#: ../widgets/table/e-table-group-leaf.c:609
-#: ../widgets/table/e-table-item.c:3010
-#: ../widgets/table/e-table-item.c:3011
-#: ../widgets/table/e-tree.c:3263
-#: ../widgets/table/e-tree.c:3264
-msgid "Length Threshold"
-msgstr "Length Threshold"
-
-#: ../widgets/table/e-table.c:3319
-#: ../widgets/table/e-table-group-container.c:946
-#: ../widgets/table/e-table-group-container.c:947
-#: ../widgets/table/e-table-group-leaf.c:650
-#: ../widgets/table/e-table-group-leaf.c:651
-#: ../widgets/table/e-table-item.c:3044
-#: ../widgets/table/e-table-item.c:3045
-#: ../widgets/table/e-tree.c:3295
-#: ../widgets/table/e-tree.c:3296
-msgid "Uniform row height"
-msgstr "Uniform row height"
-
-#: ../widgets/table/e-table.c:3326
-#: ../widgets/table/e-tree.c:3302
-#: ../widgets/table/e-tree.c:3303
-msgid "Always search"
-msgstr "Always search"
-
-#: ../widgets/table/e-table.c:3333
-msgid "Use click to add"
-msgstr "Use click to add"
-
-#: ../widgets/table/e-table-config.c:149
+#: ../widgets/table/e-table-config.c:152
msgid "State"
msgstr "State"
-#: ../widgets/table/e-table-config.c:306
-#: ../widgets/table/e-table-config.c:348
+#: ../widgets/table/e-table-config.c:385
+#: ../widgets/table/e-table-config.c:427
msgid "(Ascending)"
msgstr "(Ascending)"
-#: ../widgets/table/e-table-config.c:306
-#: ../widgets/table/e-table-config.c:348
+#: ../widgets/table/e-table-config.c:385
+#: ../widgets/table/e-table-config.c:427
msgid "(Descending)"
msgstr "(Descending)"
-#: ../widgets/table/e-table-config.c:313
+#: ../widgets/table/e-table-config.c:392
msgid "Not sorted"
msgstr "Not sorted"
-#: ../widgets/table/e-table-config.c:354
+#: ../widgets/table/e-table-config.c:433
msgid "No grouping"
msgstr "No grouping"
-#: ../widgets/table/e-table-config.c:562
-#: ../widgets/table/e-table-config.glade.h:10
-#: ../widgets/table/e-table-config-no-group.glade.h:12
+#: ../widgets/table/e-table-config.c:643
+#: ../widgets/table/e-table-config.glade.h:11
msgid "Show Fields"
msgstr "Show Fields"
-#: ../widgets/table/e-table-config.c:583
+#: ../widgets/table/e-table-config.c:664
msgid "Available Fields"
msgstr "Available Fields"
#: ../widgets/table/e-table-config.glade.h:1
-#: ../widgets/table/e-table-config-no-group.glade.h:2
msgid "A_vailable Fields:"
msgstr "A_vailable Fields:"
#: ../widgets/table/e-table-config.glade.h:2
-#: ../widgets/table/e-table-config-no-group.glade.h:3
-#: ../widgets/table/e-table-header-item.c:1575
+#: ../widgets/table/e-table-header-item.c:1582
msgid "Ascending"
msgstr "Ascending"
#: ../widgets/table/e-table-config.glade.h:3
-#: ../widgets/table/e-table-config-no-group.glade.h:4
msgid "Clear All"
msgstr "Clear All"
#: ../widgets/table/e-table-config.glade.h:4
-#: ../widgets/table/e-table-config-no-group.glade.h:5
-#: ../widgets/table/e-table-header-item.c:1575
+msgid "Clear _All"
+msgstr "Clear _All"
+
+#: ../widgets/table/e-table-config.glade.h:5
+#: ../widgets/table/e-table-header-item.c:1582
msgid "Descending"
msgstr "Descending"
-#: ../widgets/table/e-table-config.glade.h:7
-#: ../widgets/table/e-table-config-no-group.glade.h:8
+#: ../widgets/table/e-table-config.glade.h:8
msgid "Group Items By"
msgstr "Group Items By"
-#: ../widgets/table/e-table-config.glade.h:8
-#: ../widgets/table/e-table-config-no-group.glade.h:9
+#: ../widgets/table/e-table-config.glade.h:9
msgid "Move _Down"
msgstr "Move _Down"
-#: ../widgets/table/e-table-config.glade.h:9
-#: ../widgets/table/e-table-config-no-group.glade.h:10
+#: ../widgets/table/e-table-config.glade.h:10
msgid "Move _Up"
msgstr "Move _Up"
-#: ../widgets/table/e-table-config.glade.h:11
-#: ../widgets/table/e-table-config-no-group.glade.h:13
-msgid "Show field in View"
-msgstr "Show field in View"
-
#: ../widgets/table/e-table-config.glade.h:12
-#: ../widgets/table/e-table-config-no-group.glade.h:14
+msgid "Show _field in View"
+msgstr "Show _field in View"
+
+#: ../widgets/table/e-table-config.glade.h:13
+msgid "Show field i_n View"
+msgstr "Show field i_n View"
+
+#: ../widgets/table/e-table-config.glade.h:14
+msgid "Show field in _View"
+msgstr "Show field in _View"
+
+#: ../widgets/table/e-table-config.glade.h:15
msgid "Sort"
msgstr "Sort"
-#: ../widgets/table/e-table-config.glade.h:13
-#: ../widgets/table/e-table-config-no-group.glade.h:15
+#: ../widgets/table/e-table-config.glade.h:16
msgid "Sort Items By"
msgstr "Sort Items By"
-#: ../widgets/table/e-table-config.glade.h:14
-#: ../widgets/table/e-table-config-no-group.glade.h:16
+#: ../widgets/table/e-table-config.glade.h:17
msgid "Then By"
msgstr "Then By"
-#: ../widgets/table/e-table-config.glade.h:16
-#: ../widgets/table/e-table-config-no-group.glade.h:18
+#: ../widgets/table/e-table-config.glade.h:19
msgid "_Fields Shown..."
msgstr "_Fields Shown..."
-#: ../widgets/table/e-table-config.glade.h:17
+#: ../widgets/table/e-table-config.glade.h:20
msgid "_Group By..."
msgstr "_Group By..."
-#: ../widgets/table/e-table-config.glade.h:19
+#: ../widgets/table/e-table-config.glade.h:22
+msgid "_Show field in View"
+msgstr "_Show field in View"
+
+#: ../widgets/table/e-table-config.glade.h:23
msgid "_Show these fields in order:"
msgstr "_Show these fields in order:"
-#: ../widgets/table/e-table-config.glade.h:20
-#: ../widgets/table/e-table-config-no-group.glade.h:19
+#: ../widgets/table/e-table-config.glade.h:24
msgid "_Sort..."
msgstr "_Sort..."
-#: ../widgets/table/e-table-config-no-group.glade.h:1
-msgid "<- _Remove"
-msgstr "<- _Remove"
-
-#: ../widgets/table/e-table-config-no-group.glade.h:11
-msgid "Sh_ow these fields in order:"
-msgstr "Sh_ow these fields in order:"
-
-#: ../widgets/table/e-table-config-no-group.glade.h:17
-msgid "_Add ->"
-msgstr "_Add ->"
-
-#: ../widgets/table/e-table-field-chooser.c:77
-#: ../widgets/table/e-table-field-chooser-dialog.c:77
-#: ../widgets/table/e-table-field-chooser-item.c:637
-#: ../widgets/table/e-table-header-item.c:1872
+#: ../widgets/table/e-table-field-chooser-dialog.c:67
+#: ../widgets/table/e-table-field-chooser-item.c:634
+#: ../widgets/table/e-table-field-chooser.c:67
+#: ../widgets/table/e-table-header-item.c:1886
msgid "DnD code"
msgstr "DnD code"
-#: ../widgets/table/e-table-field-chooser.c:84
-#: ../widgets/table/e-table-field-chooser-dialog.c:84
-#: ../widgets/table/e-table-field-chooser-item.c:644
-#: ../widgets/table/e-table-header-item.c:1886
+#: ../widgets/table/e-table-field-chooser-dialog.c:74
+#: ../widgets/table/e-table-field-chooser-item.c:641
+#: ../widgets/table/e-table-field-chooser.c:74
+#: ../widgets/table/e-table-header-item.c:1900
msgid "Full Header"
msgstr "Full Header"
-#: ../widgets/table/e-table-field-chooser-dialog.c:126
+#: ../widgets/table/e-table-field-chooser-dialog.c:116
msgid "Add a column..."
msgstr "Add a column..."
@@ -21607,402 +22173,651 @@ 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-container.c:898
+#: ../widgets/table/e-table-group-leaf.c:572
#: ../widgets/table/e-table-group-leaf.c:573
-#: ../widgets/table/e-table-group-leaf.c:574
-#: ../widgets/table/e-table-item.c:2975
-#: ../widgets/table/e-table-item.c:2976
+#: ../widgets/table/e-table-item.c:3020
+#: ../widgets/table/e-table-item.c:3021
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-container.c:905
+#: ../widgets/table/e-table-group-leaf.c:579
#: ../widgets/table/e-table-group-leaf.c:580
-#: ../widgets/table/e-table-group-leaf.c:581
-#: ../widgets/table/e-table-item.c:2982
-#: ../widgets/table/e-table-item.c:2983
-#: ../widgets/table/e-tree.c:3269
-#: ../widgets/table/e-tree.c:3270
+#: ../widgets/table/e-table-item.c:3027
+#: ../widgets/table/e-table-item.c:3028
+#: ../widgets/table/e-tree.c:3309
+#: ../widgets/table/e-tree.c:3310
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-container.c:912
+#: ../widgets/table/e-table-group-leaf.c:586
#: ../widgets/table/e-table-group-leaf.c:587
-#: ../widgets/table/e-table-group-leaf.c:588
-#: ../widgets/table/e-table-item.c:2989
-#: ../widgets/table/e-table-item.c:2990
-#: ../widgets/table/e-tree.c:3275
-#: ../widgets/table/e-tree.c:3276
+#: ../widgets/table/e-table-item.c:3034
+#: ../widgets/table/e-table-item.c:3035
+#: ../widgets/table/e-tree.c:3315
+#: ../widgets/table/e-tree.c:3316
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-container.c:919
+#: ../widgets/table/e-table-group-leaf.c:593
#: ../widgets/table/e-table-group-leaf.c:594
-#: ../widgets/table/e-table-group-leaf.c:595
-#: ../widgets/table/e-table-item.c:2996
-#: ../widgets/table/e-table-item.c:2997
-#: ../widgets/table/e-tree.c:3281
-#: ../widgets/table/e-tree.c:3282
+#: ../widgets/table/e-table-item.c:3041
+#: ../widgets/table/e-table-item.c:3042
+#: ../widgets/table/e-tree.c:3321
+#: ../widgets/table/e-tree.c:3322
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-container.c:926
+#: ../widgets/table/e-table-group-leaf.c:600
#: ../widgets/table/e-table-group-leaf.c:601
-#: ../widgets/table/e-table-group-leaf.c:602
-#: ../widgets/table/e-table-item.c:3003
-#: ../widgets/table/e-table-item.c:3004
+#: ../widgets/table/e-table-item.c:3048
+#: ../widgets/table/e-table-item.c:3049
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-container.c:933
+#: ../widgets/table/e-table-group-leaf.c:614
#: ../widgets/table/e-table-group-leaf.c:615
-#: ../widgets/table/e-table-group-leaf.c:616
-#: ../widgets/table/e-table-item.c:2968
-#: ../widgets/table/e-table-item.c:2969
+#: ../widgets/table/e-table-item.c:3013
+#: ../widgets/table/e-table-item.c:3014
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:3055
+#: ../widgets/table/e-table-item.c:3056
+#: ../widgets/table/e-table.c:3307
+#: ../widgets/table/e-tree.c:3303
+#: ../widgets/table/e-tree.c:3304
+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:3089
+#: ../widgets/table/e-table-item.c:3090
+#: ../widgets/table/e-table.c:3314
+#: ../widgets/table/e-tree.c:3335
+#: ../widgets/table/e-tree.c:3336
+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-container.c:954
+#: ../widgets/table/e-table-group-leaf.c:642
#: ../widgets/table/e-table-group-leaf.c:643
-#: ../widgets/table/e-table-group-leaf.c:644
msgid "Frozen"
msgstr "Frozen"
-#: ../widgets/table/e-table-header-item.c:1453
+#: ../widgets/table/e-table-header-item.c:1452
msgid "Customize Current View"
msgstr "Customise Current View"
-#: ../widgets/table/e-table-header-item.c:1473
+#: ../widgets/table/e-table-header-item.c:1472
msgid "Sort _Ascending"
msgstr "Sort _Ascending"
-#: ../widgets/table/e-table-header-item.c:1474
+#: ../widgets/table/e-table-header-item.c:1473
msgid "Sort _Descending"
msgstr "Sort _Descending"
-#: ../widgets/table/e-table-header-item.c:1475
+#: ../widgets/table/e-table-header-item.c:1474
msgid "_Unsort"
msgstr "_Unsort"
-#: ../widgets/table/e-table-header-item.c:1477
+#: ../widgets/table/e-table-header-item.c:1476
msgid "Group By This _Field"
msgstr "Group By This _Field"
-#: ../widgets/table/e-table-header-item.c:1478
+#: ../widgets/table/e-table-header-item.c:1477
msgid "Group By _Box"
msgstr "Group By _Box"
-#: ../widgets/table/e-table-header-item.c:1480
+#: ../widgets/table/e-table-header-item.c:1479
msgid "Remove This _Column"
msgstr "Remove This _Column"
-#: ../widgets/table/e-table-header-item.c:1481
+#: ../widgets/table/e-table-header-item.c:1480
msgid "Add a C_olumn..."
msgstr "Add a C_olumn..."
-#: ../widgets/table/e-table-header-item.c:1483
+#: ../widgets/table/e-table-header-item.c:1482
msgid "A_lignment"
msgstr "A_lignment"
-#: ../widgets/table/e-table-header-item.c:1484
+#: ../widgets/table/e-table-header-item.c:1483
msgid "B_est Fit"
msgstr "B_est Fit"
-#: ../widgets/table/e-table-header-item.c:1485
+#: ../widgets/table/e-table-header-item.c:1484
msgid "Format Column_s..."
msgstr "Format Column_s..."
-#: ../widgets/table/e-table-header-item.c:1487
+#: ../widgets/table/e-table-header-item.c:1486
msgid "Custo_mize Current View..."
msgstr "Custo_mise Current View..."
-#: ../widgets/table/e-table-header-item.c:1536
-msgid "Sort By"
-msgstr "Sort By"
+#: ../widgets/table/e-table-header-item.c:1542
+msgid "_Sort By"
+msgstr "_Sort By"
+
+#. Custom
+#: ../widgets/table/e-table-header-item.c:1560
+msgid "_Custom"
+msgstr "_Custom"
-#: ../widgets/table/e-table-header-item.c:1879
+#: ../widgets/table/e-table-header-item.c:1893
msgid "Font Description"
msgstr "Font Description"
-#: ../widgets/table/e-table-header-item.c:1900
-#: ../widgets/table/e-table-sorter.c:175
+#: ../widgets/table/e-table-header-item.c:1914
+#: ../widgets/table/e-table-sorter.c:173
msgid "Sort Info"
msgstr "Sort Info"
-#: ../widgets/table/e-table-header-item.c:1914
-#: ../widgets/table/e-tree-scrolled.c:221
-#: ../widgets/table/e-tree-scrolled.c:222
+#: ../widgets/table/e-table-header-item.c:1928
+#: ../widgets/table/e-tree-scrolled.c:225
+#: ../widgets/table/e-tree-scrolled.c:226
msgid "Tree"
msgstr "Tree"
-#: ../widgets/table/e-table-item.c:2954
-#: ../widgets/table/e-table-item.c:2955
+#: ../widgets/table/e-table-item.c:2999
+#: ../widgets/table/e-table-item.c:3000
msgid "Table header"
msgstr "Table header"
-#: ../widgets/table/e-table-item.c:2961
-#: ../widgets/table/e-table-item.c:2962
+#: ../widgets/table/e-table-item.c:3006
+#: ../widgets/table/e-table-item.c:3007
msgid "Table model"
msgstr "Table model"
-#: ../widgets/table/e-table-item.c:3037
-#: ../widgets/table/e-table-item.c:3038
+#: ../widgets/table/e-table-item.c:3082
+#: ../widgets/table/e-table-item.c:3083
msgid "Cursor row"
msgstr "Cursor row"
-#: ../widgets/table/e-tree.c:3288
-#: ../widgets/table/e-tree.c:3289
+#: ../widgets/table/e-table.c:3321
+#: ../widgets/table/e-tree.c:3342
+#: ../widgets/table/e-tree.c:3343
+msgid "Always search"
+msgstr "Always search"
+
+#: ../widgets/table/e-table.c:3328
+msgid "Use click to add"
+msgstr "Use click to add"
+
+#: ../widgets/table/e-tree.c:3328
+#: ../widgets/table/e-tree.c:3329
msgid "ETree table adapter"
msgstr "ETree table adapter"
-#: ../widgets/table/e-tree.c:3309
+#: ../widgets/table/e-tree.c:3349
msgid "Retro Look"
msgstr "Retro Look"
-#: ../widgets/table/e-tree.c:3310
+#: ../widgets/table/e-tree.c:3350
msgid "Draw lines and +/- expanders."
msgstr "Draw lines and +/- expanders."
-#: ../widgets/text/e-entry.c:1214
-#: ../widgets/text/e-entry.c:1215
-#: ../widgets/text/e-text.c:3496
-#: ../widgets/text/e-text.c:3497
-msgid "Event Processor"
-msgstr "Event Processor"
-
-#: ../widgets/text/e-entry.c:1228
-#: ../widgets/text/e-entry.c:1229
-#: ../widgets/text/e-text.c:3532
-#: ../widgets/text/e-text.c:3533
-msgid "Justification"
-msgstr "Justification"
-
-#: ../widgets/text/e-entry.c:1270
-#: ../widgets/text/e-entry.c:1271
-#: ../widgets/text/e-text.c:3632
-#: ../widgets/text/e-text.c:3633
-msgid "Use ellipsis"
-msgstr "Use ellipsis"
-
-#: ../widgets/text/e-entry.c:1277
-#: ../widgets/text/e-entry.c:1278
-#: ../widgets/text/e-text.c:3639
-#: ../widgets/text/e-text.c:3640
-msgid "Ellipsis"
-msgstr "Ellipsis"
-
-#: ../widgets/text/e-entry.c:1284
-#: ../widgets/text/e-entry.c:1285
-#: ../widgets/text/e-text.c:3646
-#: ../widgets/text/e-text.c:3647
-msgid "Line wrap"
-msgstr "Line wrap"
-
-#: ../widgets/text/e-entry.c:1291
-#: ../widgets/text/e-entry.c:1292
-#: ../widgets/text/e-text.c:3653
-#: ../widgets/text/e-text.c:3654
-msgid "Break characters"
-msgstr "Break characters"
-
-#: ../widgets/text/e-entry.c:1298
-#: ../widgets/text/e-entry.c:1299
-#: ../widgets/text/e-text.c:3660
-#: ../widgets/text/e-text.c:3661
-msgid "Max lines"
-msgstr "Max lines"
-
-#: ../widgets/text/e-entry.c:1305
-#: ../widgets/text/e-entry.c:1306
-#: ../widgets/text/e-text.c:3689
-#: ../widgets/text/e-text.c:3690
-msgid "Allow newlines"
-msgstr "Allow newlines"
-
-#: ../widgets/text/e-entry.c:1312
-#: ../widgets/text/e-entry.c:1313
-#: ../widgets/text/e-text.c:3682
-#: ../widgets/text/e-text.c:3683
-msgid "Draw borders"
-msgstr "Draw borders"
-
-#: ../widgets/text/e-entry.c:1319
-#: ../widgets/text/e-entry.c:1320
-#: ../widgets/text/e-text.c:3696
-#: ../widgets/text/e-text.c:3697
-msgid "Draw background"
-msgstr "Draw background"
-
-#: ../widgets/text/e-entry.c:1326
-#: ../widgets/text/e-entry.c:1327
-#: ../widgets/text/e-text.c:3703
-#: ../widgets/text/e-text.c:3704
-msgid "Draw button"
-msgstr "Draw button"
-
-#: ../widgets/text/e-entry.c:1333
-#: ../widgets/text/e-entry.c:1334
-#: ../widgets/text/e-text.c:3710
-#: ../widgets/text/e-text.c:3711
-msgid "Cursor position"
-msgstr "Cursor position"
-
-#: ../widgets/text/e-entry.c:1340
-#: ../widgets/text/e-entry.c:1341
-msgid "Emulate label resize"
-msgstr "Emulate label resize"
-
-#: ../widgets/text/e-text.c:2739
+#: ../widgets/text/e-text.c:2734
msgid "Input Methods"
msgstr "Input Methods"
-#: ../widgets/text/e-text.c:3510
-#: ../widgets/text/e-text.c:3511
+#: ../widgets/text/e-text.c:3557
+#: ../widgets/text/e-text.c:3558
+msgid "Event Processor"
+msgstr "Event Processor"
+
+#: ../widgets/text/e-text.c:3571
+#: ../widgets/text/e-text.c:3572
msgid "Bold"
msgstr "Bold"
-#: ../widgets/text/e-text.c:3517
-#: ../widgets/text/e-text.c:3518
+#: ../widgets/text/e-text.c:3578
+#: ../widgets/text/e-text.c:3579
msgid "Strikeout"
msgstr "Strikeout"
-#: ../widgets/text/e-text.c:3524
-#: ../widgets/text/e-text.c:3525
+#: ../widgets/text/e-text.c:3585
+#: ../widgets/text/e-text.c:3586
msgid "Anchor"
msgstr "Anchor"
-#: ../widgets/text/e-text.c:3539
-#: ../widgets/text/e-text.c:3540
+#: ../widgets/text/e-text.c:3593
+#: ../widgets/text/e-text.c:3594
+msgid "Justification"
+msgstr "Justification"
+
+#: ../widgets/text/e-text.c:3600
+#: ../widgets/text/e-text.c:3601
msgid "Clip Width"
msgstr "Clip Width"
-#: ../widgets/text/e-text.c:3546
-#: ../widgets/text/e-text.c:3547
+#: ../widgets/text/e-text.c:3607
+#: ../widgets/text/e-text.c:3608
msgid "Clip Height"
msgstr "Clip Height"
-#: ../widgets/text/e-text.c:3553
-#: ../widgets/text/e-text.c:3554
+#: ../widgets/text/e-text.c:3614
+#: ../widgets/text/e-text.c:3615
msgid "Clip"
msgstr "Clip"
-#: ../widgets/text/e-text.c:3560
-#: ../widgets/text/e-text.c:3561
+#: ../widgets/text/e-text.c:3621
+#: ../widgets/text/e-text.c:3622
msgid "Fill clip rectangle"
msgstr "Fill clip rectangle"
-#: ../widgets/text/e-text.c:3567
-#: ../widgets/text/e-text.c:3568
+#: ../widgets/text/e-text.c:3628
+#: ../widgets/text/e-text.c:3629
msgid "X Offset"
msgstr "X Offset"
-#: ../widgets/text/e-text.c:3574
-#: ../widgets/text/e-text.c:3575
+#: ../widgets/text/e-text.c:3635
+#: ../widgets/text/e-text.c:3636
msgid "Y Offset"
msgstr "Y Offset"
-#: ../widgets/text/e-text.c:3610
-#: ../widgets/text/e-text.c:3611
+#: ../widgets/text/e-text.c:3671
+#: ../widgets/text/e-text.c:3672
msgid "Text width"
msgstr "Text width"
-#: ../widgets/text/e-text.c:3617
-#: ../widgets/text/e-text.c:3618
+#: ../widgets/text/e-text.c:3678
+#: ../widgets/text/e-text.c:3679
msgid "Text height"
msgstr "Text height"
-#: ../widgets/text/e-text.c:3717
-#: ../widgets/text/e-text.c:3718
-msgid "IM Context"
-msgstr "IM Context"
-
-#: ../widgets/text/e-text.c:3724
-#: ../widgets/text/e-text.c:3725
-msgid "Handle Popup"
-msgstr "Handle Popup"
-
-#: ../views/addressbook/galview.xml.h:1
-msgid "By _Company"
-msgstr "By _Company"
-
-#: ../views/addressbook/galview.xml.h:2
-msgid "_Address Cards"
-msgstr "_Address Cards"
-
-#: ../views/addressbook/galview.xml.h:3
-msgid "_Phone List"
-msgstr "_Phone List"
-
-#: ../views/calendar/galview.xml.h:1
-msgid "W_eek View"
-msgstr "W_eek View"
-
-#: ../views/calendar/galview.xml.h:2
-msgid "_Day View"
-msgstr "_Day View"
-
-#: ../views/calendar/galview.xml.h:3
-msgid "_List View"
-msgstr "_List View"
-
-#: ../views/calendar/galview.xml.h:4
-msgid "_Month View"
-msgstr "_Month View"
-
-#: ../views/calendar/galview.xml.h:5
-msgid "_Work Week View"
-msgstr "_Work Week View"
+#: ../widgets/text/e-text.c:3693
+#: ../widgets/text/e-text.c:3694
+msgid "Use ellipsis"
+msgstr "Use ellipsis"
-#: ../views/mail/galview.xml.h:1
-msgid "As Sent Folder for Wi_de View"
-msgstr "As Sent Folder for Wi_de View"
+#: ../widgets/text/e-text.c:3700
+#: ../widgets/text/e-text.c:3701
+msgid "Ellipsis"
+msgstr "Ellipsis"
-#: ../views/mail/galview.xml.h:2
-msgid "As _Sent Folder"
-msgstr "As _Sent Folder"
+#: ../widgets/text/e-text.c:3707
+#: ../widgets/text/e-text.c:3708
+msgid "Line wrap"
+msgstr "Line wrap"
-#: ../views/mail/galview.xml.h:3
-msgid "By S_tatus"
-msgstr "By S_tatus"
+#: ../widgets/text/e-text.c:3714
+#: ../widgets/text/e-text.c:3715
+msgid "Break characters"
+msgstr "Break characters"
-#: ../views/mail/galview.xml.h:4
-msgid "By Se_nder"
-msgstr "By Se_nder"
+#: ../widgets/text/e-text.c:3721
+#: ../widgets/text/e-text.c:3722
+msgid "Max lines"
+msgstr "Max lines"
-#: ../views/mail/galview.xml.h:5
-msgid "By Su_bject"
-msgstr "By Su_bject"
+#: ../widgets/text/e-text.c:3743
+#: ../widgets/text/e-text.c:3744
+msgid "Draw borders"
+msgstr "Draw borders"
-#: ../views/mail/galview.xml.h:6
-msgid "By _Follow Up Flag"
-msgstr "By _Follow Up Flag"
+#: ../widgets/text/e-text.c:3750
+#: ../widgets/text/e-text.c:3751
+msgid "Allow newlines"
+msgstr "Allow newlines"
-#: ../views/mail/galview.xml.h:7
-msgid "For _Wide View"
-msgstr "For _Wide View"
+#: ../widgets/text/e-text.c:3757
+#: ../widgets/text/e-text.c:3758
+msgid "Draw background"
+msgstr "Draw background"
-#: ../views/mail/galview.xml.h:8
-msgid "_Messages"
-msgstr "_Messages"
+#: ../widgets/text/e-text.c:3764
+#: ../widgets/text/e-text.c:3765
+msgid "Draw button"
+msgstr "Draw button"
-#: ../views/memos/galview.xml.h:1
-msgid "_Memos"
-msgstr "_Memos"
+#: ../widgets/text/e-text.c:3771
+#: ../widgets/text/e-text.c:3772
+msgid "Cursor position"
+msgstr "Cursor position"
-#: ../views/tasks/galview.xml.h:1
-msgid "With _Due Date"
-msgstr "With _Due Date"
+#: ../widgets/text/e-text.c:3778
+#: ../widgets/text/e-text.c:3779
+msgid "IM Context"
+msgstr "IM Context"
-#: ../views/tasks/galview.xml.h:2
-msgid "With _Status"
-msgstr "With _Status"
+#: ../widgets/text/e-text.c:3785
+#: ../widgets/text/e-text.c:3786
+msgid "Handle Popup"
+msgstr "Handle Popup"
+#~ msgid "A Folder with this name already exists"
+#~ msgstr "A Folder with this name already exists"
+#~ msgid "_Address: "
+#~ msgstr "_Address: "
+#~ msgid "_Categories..."
+#~ msgstr "_Categories..."
+#~ msgid "\n"
+#~ msgstr "\n"
+#~ msgid "Add an email to the List"
+#~ msgstr "Add an email to the List"
+#~ msgid "Insert email addresses from Address Book"
+#~ msgstr "Insert email addresses from Address Book"
+#~ msgid "Members"
+#~ msgstr "Members"
+#~ msgid "Remove an email address from the List"
+#~ msgstr "Remove an email address from the List"
+#~ msgid "_Select"
+#~ msgstr "_Select"
+#~ msgid ""
+#~ "The changed email or name of this contact already\n"
+#~ "exists in this folder. Would you like to add it anyway?"
+#~ msgstr ""
+#~ "The changed email or name of this contact already\n"
+#~ "exists in this folder. Would you like to add it anyway?"
+#~ msgid "GTK Tree View"
+#~ msgstr "GTK Tree View"
+#~ msgid "Error loading default addressbook."
+#~ msgstr "Error loading default addressbook."
+#~ msgid "Input File"
+#~ msgstr "Input File"
+#~ msgid ""
+#~ "All information in these journal entries will be deleted and can not be "
+#~ "restored."
+#~ msgstr ""
+#~ "All information in these journal entries will be deleted and can not be "
+#~ "restored."
+#~ msgid ""
+#~ "All information on this journal entry will be deleted and can not be "
+#~ "restored."
+#~ msgstr ""
+#~ "All information on this journal entry will be deleted and can not be "
+#~ "restored."
+#~ msgid "Are you sure you want to delete the journal entry '{0}'?"
+#~ msgstr "Are you sure you want to delete the journal entry '{0}'?"
+#~ msgid "Are you sure you want to delete these {0} journal entries?"
+#~ msgstr "Are you sure you want to delete these {0} journal entries?"
+#~ msgid "Are you sure you want to delete this journal entry?"
+#~ msgstr "Are you sure you want to delete this journal entry?"
+#~ msgid ""
+#~ "If you do not send a cancelation notice, the other participants may not "
+#~ "know the journal has been deleted."
+#~ msgstr ""
+#~ "If you do not send a cancellation notice, the other participants may not "
+#~ "know the journal has been deleted."
+#~ msgid "Add Calendar"
+#~ msgstr "Add Calendar"
+#~ msgid "Add Task List"
+#~ msgstr "Add Task List"
+#~ msgid "_Add Calendar"
+#~ msgstr "_Add Calendar"
+#~ msgid "_Add Task List"
+#~ msgstr "_Add Task List"
+#~ msgid "This journal entry has been deleted."
+#~ msgstr "This journal entry has been deleted."
+#~ msgid "This journal entry has been changed."
+#~ msgstr "This journal entry has been changed."
+#~ msgid "Journal entry - %s"
+#~ msgstr "Journal entry - %s"
+#~ msgid "The journal entry could not be deleted due to a corba error"
+#~ msgstr "The journal entry could not be deleted due to a corba error"
+#~ msgid "The journal entry could not be deleted because permission was denied"
+#~ msgstr ""
+#~ "The journal entry could not be deleted because permission was denied"
+#~ msgid "The journal entry could not be deleted due to an error"
+#~ msgstr "The journal entry could not be deleted due to an error"
+#~ msgid "<b>Calendar options</b>"
+#~ msgstr "<b>Calendar options</b>"
+#~ msgid "Add New Calendar"
+#~ msgstr "Add New Calendar"
+#~ msgid "Calendar Group"
+#~ msgstr "Calendar Group"
+#~ msgid "Calendar Location"
+#~ msgstr "Calendar Location"
+#~ msgid "Calendar Name"
+#~ msgstr "Calendar Name"
+#~ msgid "<b>Task List Options</b>"
+#~ msgstr "<b>Task List Options</b>"
+#~ msgid "Add New Task List"
+#~ msgstr "Add New Task List"
+#~ msgid "Task List Group"
+#~ msgstr "Task List Group"
+#~ msgid "Task List Name"
+#~ msgstr "Task List Name"
+#~ msgid ""
+#~ "You are modifying a recurring journal entry. What would you like to "
+#~ "modify?"
+#~ msgstr ""
+#~ "You are modifying a recurring journal entry. What would you like to "
+#~ "modify?"
+#~ msgid "Or_ganiser:"
+#~ msgstr "Or_ganiser:"
+#~ msgid "<b>Free/Busy C_alendars</b>"
+#~ msgstr "<b>Free/Busy C_alendars</b>"
+#~ msgid "<b>Publishing Frequency</b>"
+#~ msgstr "<b>Publishing Frequency</b>"
+#~ msgid "<b>Publishing _Location</b>"
+#~ msgstr "<b>Publishing _Location</b>"
+#~ msgid "Free/Busy Publishing Settings"
+#~ msgstr "Free/Busy Publishing Settings"
+#~ msgid "_Daily"
+#~ msgstr "_Daily"
+#~ msgid "_Manual"
+#~ msgstr "_Manual"
+#~ msgid "_Weekly"
+#~ msgstr "_Weekly"
+#~ msgid "Task sort"
+#~ msgstr "Task sort"
+#~ msgid "Memo sort"
+#~ msgstr "Memo sort"
+#~ msgid "Enter the password for %s"
+#~ msgstr "Enter the password for %s"
+#~ msgid "Journal information"
+#~ msgstr "Journal information"
+#~ msgid "SMTWTFS"
+#~ msgstr "SMTWTFS"
+#~ msgid "%.0fK"
+#~ msgstr "%.0fK"
+#~ msgid "%.0fM"
+#~ msgstr "%.0fM"
+#~ msgid "%.0fG"
+#~ msgstr "%.0fG"
+#~ msgid "Post To:"
+#~ msgstr "Post To:"
+#~ msgid "The Evolution PIM and Email Client"
+#~ msgstr "The Evolution PIM and Email Client"
+#~ msgid "The orientation of the tray."
+#~ msgstr "The orientation of the tray."
+#~ msgid "_Search name:"
+#~ msgstr "_Search name:"
+#~ msgid "Disable"
+#~ msgstr "Disable"
+#~ msgid "Enable"
+#~ msgstr "Enable"
+#~ msgid "<b>Then</b>"
+#~ msgstr "<b>Then</b>"
+#~ msgid "<b>Retrieving Message...</b>"
+#~ msgstr "<b>Retrieving Message...</b>"
+#~ msgid "Valid signature, cannot verify sender"
+#~ msgstr "Valid signature, cannot verify sender"
+#~ msgid "Automatic smiley recognition"
+#~ msgstr "Automatic smiley recognition"
+#~ msgid "New Mail Notify sound file"
+#~ msgstr "New Mail Notify sound file"
+#~ msgid "New Mail Notify type"
+#~ msgstr "New Mail Notify type"
+#~ msgid "Specifies the type of New Mail Notification the user wishes to use."
+#~ msgstr "Specifies the type of New Mail Notification the user wishes to use."
+#~ msgid "Priority Filter \"%s\""
+#~ msgstr "Priority Filter \"%s\""
+#~ msgid ""
+#~ "Some of your Netscape email filters are based on\n"
+#~ "email priorities, which are not used in Evolution.\n"
+#~ "Instead, Evolution provides scores in the range of\n"
+#~ "-3 to 3 that can be assigned to emails and filtered\n"
+#~ "accordingly.\n"
+#~ "\n"
+#~ "As a workaround, a set of filters called \"Priority Filter\"\n"
+#~ "was added that converts Netscape's email priorities into\n"
+#~ "Evolution's scores, and the affected filters use scores instead\n"
+#~ "of priorities. Check the imported filters to make sure\n"
+#~ "everything still works as intended."
+#~ msgstr ""
+#~ "Some of your Netscape email filters are based on\n"
+#~ "email priorities, which are not used in Evolution.\n"
+#~ "Instead, Evolution provides scores in the range of\n"
+#~ "-3 to 3 that can be assigned to emails and filtered\n"
+#~ "accordingly.\n"
+#~ "\n"
+#~ "As a workaround, a set of filters called \"Priority Filter\"\n"
+#~ "was added that converts Netscape's email priorities into\n"
+#~ "Evolution's scores, and the affected filters use scores instead\n"
+#~ "of priorities. Check the imported filters to make sure\n"
+#~ "everything still works as intended."
+#~ msgid ""
+#~ "Some of your Netscape email filters use\n"
+#~ "the \"Ignore Thread\" or \"Watch Thread\"\n"
+#~ "feature, which is not supported in Evolution.\n"
+#~ "These filters will be dropped."
+#~ msgstr ""
+#~ "Some of your Netscape email filters use\n"
+#~ "the \"Ignore Thread\" or \"Watch Thread\"\n"
+#~ "feature, which is not supported in Evolution.\n"
+#~ "These filters will be dropped."
+#~ msgid ""
+#~ "Some of your Netscape email filters test the\n"
+#~ "body of emails for (in)equality to a given string,\n"
+#~ "which is not supported in Evolution. Those filters\n"
+#~ "were modified to test whether that string is or is not\n"
+#~ "contained in the message body."
+#~ msgstr ""
+#~ "Some of your Netscape email filters test the\n"
+#~ "body of emails for (in)equality to a given string,\n"
+#~ "which is not supported in Evolution. Those filters\n"
+#~ "were modified to test whether that string is or is not\n"
+#~ "contained in the message body."
+#~ msgid "Evolution is importing your old Netscape data"
+#~ msgstr "Evolution is importing your old Netscape data"
+#~ msgid "Importing Netscape data"
+#~ msgstr "Importing Netscape data"
+#~ msgid "Settings"
+#~ msgstr "Settings"
+#~ msgid "Mail Filters"
+#~ msgstr "Mail Filters"
+#~ msgid ""
+#~ "Evolution has found Netscape mail files.\n"
+#~ "Would you like them to be imported into Evolution?"
+#~ msgstr ""
+#~ "Evolution has found Netscape mail files.\n"
+#~ "Would you like them to be imported into Evolution?"
+#~ msgid "<span weight=\"bold\">Labels and Colors</span>"
+#~ msgstr "<span weight=\"bold\">Labels and Colours</span>"
+#~ msgid "<span weight=\"bold\">New Mail Notification</span>"
+#~ msgstr "<span weight=\"bold\">New Mail Notification</span>"
+#~ msgid "Beep w_hen new mail arrives"
+#~ msgstr "Beep w_hen new mail arrives"
+#~ msgid "HTML Mail"
+#~ msgstr "HTML Mail"
+#~ msgid "Se_lect..."
+#~ msgstr "Se_lect..."
+#~ msgid "_Do not notify me when new mail arrives"
+#~ msgstr "_Do not notify me when new mail arrives"
+#~ msgid "Mark as _Read"
+#~ msgstr "Mark as _Read"
+#~ msgid "_Do not Mark as Read"
+#~ msgstr "_Do not Mark as Read"
+#~ msgid "Check Evolution archive"
+#~ msgstr "Check Evolution archive"
+#~ msgid "With GUI"
+#~ msgstr "With GUI"
+#~ msgid "<b>Junk Mail Settings</b>"
+#~ msgstr "<b>Junk Mail Settings</b>"
+#~ msgid "_Contacts..."
+#~ msgstr "_Contacts..."
+#~ msgid "<b>Subject</b> :"
+#~ msgstr "<b>Subject</b> :"
+#~ msgid "<b>From</b> :"
+#~ msgstr "<b>From</b> :"
+#~ msgid ""
+#~ "The output directory was not found on iPod! Please ensure that iPod has "
+#~ "been correctly set up and try again."
+#~ msgstr ""
+#~ "The output directory was not found on the iPod! Please ensure that the "
+#~ "iPod has been correctly set up and try again."
+#~ msgid "Could not export data!"
+#~ msgstr "Could not export data!"
+#~ msgid "Exporting data failed."
+#~ msgstr "Exporting data failed."
+#~ msgid "Could not open addressbook!"
+#~ msgstr "Could not open addressbook!"
+#~ msgid "Could not open the Evolution addressbook to export data."
+#~ msgstr "Could not open the Evolution addressbook to export data."
+#~ msgid "Could not open calendar/todo!"
+#~ msgstr "Could not open calendar/todo!"
+#~ msgid "Could not open the Evolution calendar/todo list to export data."
+#~ msgstr "Could not open the Evolution calendar/todo list to export data."
+#~ msgid "Unable to find this journal entry in any journal"
+#~ msgstr "Unable to find this journal entry in any journal"
+#~ msgid "System error: %s"
+#~ msgstr "System error: %s"
+#~ msgid "Camel error: %s"
+#~ msgstr "Camel error: %s"
+#~ msgid "Account cannot send e-mail"
+#~ msgstr "Account cannot send e-mail"
+#~ msgid "No store available"
+#~ msgstr "No store available"
+#~ msgid ""
+#~ "A plugin which implements a CORBA interface for accessing mail data "
+#~ "remotely."
+#~ msgstr ""
+#~ "A plugin which implements a CORBA interface for accessing mail data "
+#~ "remotely."
+#~ msgid "Mail Remote"
+#~ msgstr "Mail Remote"
+#~ msgid "New Mail Notification"
+#~ msgstr "New Mail Notification"
+#~ msgid "(Untitled)"
+#~ msgstr "(Untitled)"
+#~ msgid "An attachment to add."
+#~ msgstr "An attachment to add."
+#~ msgid "Content type of the attachment."
+#~ msgstr "Content type of the attachment."
+#~ msgid "The filename to display in the mail."
+#~ msgstr "The filename to display in the mail."
+#~ msgid "Description of the attachment."
+#~ msgstr "Description of the attachment."
+#~ msgid "Mark attachment to be shown inline by default."
+#~ msgstr "Mark attachment to be shown inline by default."
+#~ msgid "Download messages for offline"
+#~ msgstr "Download messages for offline"
+#~ msgid "_Edit..."
+#~ msgstr "_Edit..."
+#~ msgid "MTWTFSS"
+#~ msgstr "MTWTFSS"
+#~ msgid "..."
+#~ msgstr "..."
+#~ msgid "<- _Remove"
+#~ msgstr "<- _Remove"
+#~ msgid "Sh_ow these fields in order:"
+#~ msgstr "Sh_ow these fields in order:"
+#~ msgid "_Add ->"
+#~ msgstr "_Add ->"
+#~ msgid "Emulate label resize"
+#~ msgstr "Emulate label resize"
+#~ msgid "_Phone List"
+#~ msgstr "_Phone List"
#~ msgid "Organization"
#~ msgstr "Organisation"
#~ msgid "No, Do not Change Status"
@@ -22021,8 +22836,6 @@ msgstr "With _Status"
#~ "read receipt when a message you\n"
#~ "sent is read, and to specify what Evolution should do when someone "
#~ "requests a receipt from you.</small>"
-#~ msgid "Always send back a read receipt"
-#~ msgstr "Always send back a read receipt"
#~ msgid "Ask me if I want to send back a read receipt"
#~ msgstr "Ask me if I want to send back a read receipt"
#~ msgid "Never send back a read receipt"
@@ -22119,14 +22932,10 @@ msgstr "With _Status"
#~ "Overwrite it?"
#~ msgid "Filtering Folder"
#~ msgstr "Filtering Folder"
-#~ msgid "ok_button"
-#~ msgstr "ok_button"
#~ msgid "Message _List As"
#~ msgstr "Message _List As"
#~ msgid "_New Search _Folder (FIXME)"
#~ msgstr "_New Search _Folder (FIXME)"
-#~ msgid "Evolution _FAQ"
-#~ msgstr "Evolution _FAQ"
#~ msgid "Addressbook"
#~ msgstr "Addressbook"
#~ msgid "*"
@@ -22243,8 +23052,6 @@ msgstr "With _Status"
#~ msgstr "Invitations"
#~ msgid "<b>Basics</b>"
#~ msgstr "<b>Basics</b>"
-#~ msgid "<b>Send Options</b>"
-#~ msgstr "<b>Send Options</b>"
#~ msgid "A_ll day event"
#~ msgstr "A_ll day event"
#~ msgid "Cale_ndar:"
@@ -22257,10 +23064,6 @@ msgstr "With _Status"
#~ msgstr "This appointment has customized alarms"
#~ msgid "<b>Dele_gatees</b>"
#~ msgstr "<b>Dele_gatees</b>"
-#~ msgid "_Delegate To..."
-#~ msgstr "_Delegate To..."
-#~ msgid "Con_tacts..."
-#~ msgstr "Con_tacts..."
#~ msgid "Assignment"
#~ msgstr "Assignment"
#~ msgid "Task Table"
@@ -22307,8 +23110,6 @@ msgstr "With _Status"
#~ msgstr "%H:%M:%S"
#~ msgid "%I %p"
#~ msgstr "%I %p"
-#~ msgid "_Rule name:"
-#~ msgstr "_Rule name:"
#~ msgid "If"
#~ msgstr "If"
#~ msgid "Execute actions"
@@ -22373,8 +23174,6 @@ msgstr "With _Status"
#~ msgstr "Id"
#~ msgid "Path"
#~ msgstr "Path"
-#~ msgid "learns junk messages using spamd."
-#~ msgstr "learns junk messages using spamd."
#~ msgid "Uid"
#~ msgstr "Uid"
#~ msgid "Url"
@@ -22385,10 +23184,6 @@ msgstr "With _Status"
#~ msgstr ""
#~ "The suggested filename extension of this filetype (%s) is unused in the "
#~ "chosen filename. Do you want to continue?"
-#~ msgid "Evolution Settings"
-#~ msgstr "Evolution Settings"
-#~ msgid "C"
-#~ msgstr "C"
#~ msgid "CN"
#~ msgstr "CN"
#~ msgid "OU"