aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--po/ChangeLog4
-rw-r--r--po/en_GB.po12083
2 files changed, 6992 insertions, 5095 deletions
diff --git a/po/ChangeLog b/po/ChangeLog
index b17534b806..5f1cbefba2 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,7 @@
+2006-09-10 David Lodge <dave@cirt.net>
+
+ * en_GB.po: Updated English (British) translation.
+
2006-09-09 Jamil Ahmed <jamil@bengalinux.org>
* bn.po: Updated Bengali Translation from bn_IN
diff --git a/po/en_GB.po b/po/en_GB.po
index 936bfaec6c..58639b8254 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: evolution gnome-2.8\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-09-11 17:30+0200\n"
-"PO-Revision-Date: 2006-04-21 23:05-0000\n"
+"POT-Creation-Date: 2006-09-10 09:03+0100\n"
+"PO-Revision-Date: 2006-09-10 09:40-0000\n"
"Last-Translator: David Lodge <dave@cirt.net>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -18,30 +18,29 @@ msgstr ""
#: ../a11y/addressbook/ea-addressbook-view.c:94
#: ../a11y/addressbook/ea-addressbook-view.c:103
-#: ../a11y/addressbook/ea-minicard-view.c:169
+#: ../a11y/addressbook/ea-minicard-view.c:180
msgid "evolution addressbook"
msgstr "evolution addressbook"
#: ../a11y/addressbook/ea-minicard-view.c:34
-#: ../addressbook/gui/component/addressbook-component.c:225
+#: ../addressbook/gui/component/addressbook-component.c:226
msgid "New Contact"
msgstr "New Contact"
#: ../a11y/addressbook/ea-minicard-view.c:35
-#: ../addressbook/gui/component/addressbook-component.c:233
+#: ../addressbook/gui/component/addressbook-component.c:234
msgid "New Contact List"
msgstr "New Contact List"
-#: ../a11y/addressbook/ea-minicard-view.c:152
+#: ../a11y/addressbook/ea-minicard-view.c:163
#, c-format
-msgid "current addressbook folder has %d card"
-msgid_plural "current addressbook folder has %d cards"
-msgstr[0] "current addressbook folder has %d card"
-msgstr[1] "current addressbook folder has %d cards"
+msgid "current address book folder %s has %d card"
+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/addressbook/ea-minicard.c:31
-#: ../calendar/gui/alarm-notify/alarm-queue.c:953
-#: ../ui/evolution-message-composer.xml.h:11
+#: ../ui/evolution-message-composer.xml.h:12
msgid "Open"
msgstr "Open"
@@ -57,53 +56,52 @@ msgstr "Contact: "
msgid "evolution minicard"
msgstr "evolution minicard"
-#: ../a11y/calendar/ea-cal-view-event.c:235
+#: ../a11y/calendar/ea-cal-view-event.c:264
msgid "It has alarms."
msgstr "It has alarms."
-#: ../a11y/calendar/ea-cal-view-event.c:238
+#: ../a11y/calendar/ea-cal-view-event.c:267
msgid "It has recurrences."
msgstr "It has recurrences."
-#: ../a11y/calendar/ea-cal-view-event.c:241
+#: ../a11y/calendar/ea-cal-view-event.c:270
msgid "It is a meeting."
msgstr "It is a meeting."
-#: ../a11y/calendar/ea-cal-view-event.c:247
+#: ../a11y/calendar/ea-cal-view-event.c:276
#, c-format
msgid "Calendar Event: Summary is %s."
msgstr "Calendar Event: Summary is %s."
-#: ../a11y/calendar/ea-cal-view-event.c:249
+#: ../a11y/calendar/ea-cal-view-event.c:278
msgid "Calendar Event: It has no summary."
msgstr "Calendar Event: It has no summary."
-#: ../a11y/calendar/ea-cal-view-event.c:268
+#: ../a11y/calendar/ea-cal-view-event.c:298
msgid "calendar view event"
msgstr "calendar view event"
-#: ../a11y/calendar/ea-cal-view-event.c:485
+#: ../a11y/calendar/ea-cal-view-event.c:527
msgid "Grab Focus"
msgstr "Grab Focus"
-#: ../a11y/calendar/ea-cal-view.c:306
+#: ../a11y/calendar/ea-cal-view.c:302
msgid "New Appointment"
msgstr "New Appointment"
-#: ../a11y/calendar/ea-cal-view.c:307
+#: ../a11y/calendar/ea-cal-view.c:303
msgid "New All Day Event"
msgstr "New All Day Event"
-#: ../a11y/calendar/ea-cal-view.c:308
-#: ../calendar/gui/e-calendar-view.c:1505
+#: ../a11y/calendar/ea-cal-view.c:304
msgid "New Meeting"
msgstr "New Meeting"
-#: ../a11y/calendar/ea-cal-view.c:309
+#: ../a11y/calendar/ea-cal-view.c:305
msgid "Go to Today"
msgstr "Go to Today"
-#: ../a11y/calendar/ea-cal-view.c:310
+#: ../a11y/calendar/ea-cal-view.c:306
msgid "Go to Date"
msgstr "Go to Date"
@@ -112,39 +110,49 @@ msgstr "Go to Date"
msgid "a table to view and select the current time range"
msgstr "a table to view and select the current time range"
-#: ../a11y/calendar/ea-day-view.c:146
-#: ../a11y/calendar/ea-week-view.c:148
+#. To translators: Here, "It" is either like "Work Week View: July
+#. 10th - July 14th, 2006." or "Day View: Thursday July 13th, 2006."
+#: ../a11y/calendar/ea-day-view.c:151
+#: ../a11y/calendar/ea-week-view.c:150
#, c-format
msgid "It has %d event."
msgid_plural "It has %d events."
msgstr[0] "It has %d event."
msgstr[1] "It has %d events."
-#: ../a11y/calendar/ea-day-view.c:148
-#: ../a11y/calendar/ea-week-view.c:150
+#. To translators: Here, "It" is either like "Work Week View: July
+#. 10th - July 14th, 2006." or "Day View: Thursday July 13th, 2006."
+#: ../a11y/calendar/ea-day-view.c:155
+#: ../a11y/calendar/ea-week-view.c:152
msgid "It has no events."
msgstr "It has no events."
-#: ../a11y/calendar/ea-day-view.c:152
+#. To translators: First %s is the week, for example "July 10th -
+#. July 14th, 2006". Second %s is the number of events in this work
+#. week, for example "It has %d event/events." or "It has no events."
+#: ../a11y/calendar/ea-day-view.c:162
#, c-format
msgid "Work Week View: %s. %s"
msgstr "Work Week View: %s. %s"
-#: ../a11y/calendar/ea-day-view.c:155
+#. To translators: First %s is the day, for example "Thursday July
+#. 13th, 2006". Second %s is the number of events on this day, for
+#. example "It has %d event/events." or "It has no events."
+#: ../a11y/calendar/ea-day-view.c:168
#, c-format
msgid "Day View: %s. %s"
msgstr "Day View: %s. %s"
-#: ../a11y/calendar/ea-day-view.c:186
+#: ../a11y/calendar/ea-day-view.c:199
msgid "calendar view for a work week"
msgstr "calendar view for a work week"
-#: ../a11y/calendar/ea-day-view.c:188
+#: ../a11y/calendar/ea-day-view.c:201
msgid "calendar view for one or more days"
msgstr "calendar view for one or more days"
#: ../a11y/calendar/ea-gnome-calendar.c:187
-#: ../calendar/gui/calendar-component.c:660
+#: ../calendar/gui/calendar-component.c:707
msgid "%A %d %b %Y"
msgstr "%A %d %b %Y"
@@ -155,19 +163,20 @@ 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:190
-#: ../calendar/gui/calendar-component.c:663
-#: ../calendar/gui/e-day-view-top-item.c:719
-#: ../calendar/gui/e-day-view.c:1510
-#: ../calendar/gui/e-week-view-main-item.c:321
+#: ../calendar/gui/calendar-component.c:710
+#: ../calendar/gui/e-day-view-top-item.c:1315
+#: ../calendar/gui/e-day-view.c:2104
+#: ../calendar/gui/e-week-view-main-item.c:319
+#: ../calendar/gui/e-week-view-main-item.c:533
msgid "%a %d %b"
msgstr "%a %d %b"
#: ../a11y/calendar/ea-gnome-calendar.c:192
#: ../a11y/calendar/ea-gnome-calendar.c:197
#: ../a11y/calendar/ea-gnome-calendar.c:199
-#: ../calendar/gui/calendar-component.c:665
-#: ../calendar/gui/calendar-component.c:670
-#: ../calendar/gui/calendar-component.c:672
+#: ../calendar/gui/calendar-component.c:712
+#: ../calendar/gui/calendar-component.c:717
+#: ../calendar/gui/calendar-component.c:719
msgid "%a %d %b %Y"
msgstr "%a %d %b %Y"
@@ -175,10 +184,10 @@ msgstr "%a %d %b %Y"
#: ../a11y/calendar/ea-gnome-calendar.c:222
#: ../a11y/calendar/ea-gnome-calendar.c:228
#: ../a11y/calendar/ea-gnome-calendar.c:230
-#: ../calendar/gui/calendar-component.c:684
-#: ../calendar/gui/calendar-component.c:691
-#: ../calendar/gui/calendar-component.c:697
-#: ../calendar/gui/calendar-component.c:699
+#: ../calendar/gui/calendar-component.c:731
+#: ../calendar/gui/calendar-component.c:738
+#: ../calendar/gui/calendar-component.c:744
+#: ../calendar/gui/calendar-component.c:746
msgid "%d %b %Y"
msgstr "%d %b %Y"
@@ -188,16 +197,17 @@ 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:220
-#: ../calendar/gui/calendar-component.c:689
-#: ../calendar/gui/e-day-view-top-item.c:723
-#: ../calendar/gui/e-day-view.c:1526
-#: ../calendar/gui/e-week-view-main-item.c:335
+#: ../calendar/gui/calendar-component.c:736
+#: ../calendar/gui/e-day-view-top-item.c:1319
+#: ../calendar/gui/e-day-view.c:2120
+#: ../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:247
#: ../a11y/calendar/ea-gnome-calendar.c:255
-#: ../calendar/importers/icalendar-importer.c:738
+#: ../calendar/importers/icalendar-importer.c:772
msgid "Gnome Calendar"
msgstr "Gnome Calendar"
@@ -217,21 +227,21 @@ msgstr "Jump button"
msgid "Click here, you can find more events."
msgstr "Click here, you can find more events."
-#: ../a11y/calendar/ea-week-view.c:155
+#: ../a11y/calendar/ea-week-view.c:157
#, c-format
msgid "Month View: %s. %s"
msgstr "Month View: %s. %s"
-#: ../a11y/calendar/ea-week-view.c:159
+#: ../a11y/calendar/ea-week-view.c:161
#, c-format
msgid "Week View: %s. %s"
msgstr "Week View: %s. %s"
-#: ../a11y/calendar/ea-week-view.c:190
+#: ../a11y/calendar/ea-week-view.c:192
msgid "calendar view for a month"
msgstr "calendar view for a month"
-#: ../a11y/calendar/ea-week-view.c:192
+#: ../a11y/calendar/ea-week-view.c:194
msgid "calendar view for one or more weeks"
msgstr "calendar view for one or more weeks"
@@ -283,7 +293,7 @@ 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:575
+#: ../widgets/table/e-table-click-to-add.c:574
msgid "click to add"
msgstr "click to add"
@@ -321,6 +331,14 @@ msgstr "Activate Default"
msgid "Popup Menu"
msgstr "Popup Menu"
+#: ../a11y/widgets/ea-expander.c:40
+msgid "Toggle Attachment Bar"
+msgstr "Toggle Attachment Bar"
+
+#: ../a11y/widgets/ea-expander.c:50
+msgid "activate"
+msgstr "activate"
+
#: ../addressbook/addressbook.error.xml.h:1
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?"
@@ -350,132 +368,148 @@ msgid "Could not remove addressbook."
msgstr "Could not remove addressbook."
#: ../addressbook/addressbook.error.xml.h:8
+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
msgid "Delete address book '{0}'?"
msgstr "Delete address book '{0}'?"
-#: ../addressbook/addressbook.error.xml.h:9
+#: ../addressbook/addressbook.error.xml.h:10
msgid "Error loading addressbook."
msgstr "Error loading addressbook."
-#: ../addressbook/addressbook.error.xml.h:10
+#: ../addressbook/addressbook.error.xml.h:11
msgid "Error saving {0} to {1}: {2}"
msgstr "Error saving {0} to {1}: {2}"
-#: ../addressbook/addressbook.error.xml.h:11
+#: ../addressbook/addressbook.error.xml.h:12
msgid "Failed to authenticate with LDAP server."
msgstr "Failed to authenticate with LDAP server."
-#: ../addressbook/addressbook.error.xml.h:12
+#. Unknown error
+#: ../addressbook/addressbook.error.xml.h:13
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1976
+msgid "Failed to delete contact"
+msgstr "Failed to delete contact"
+
+#: ../addressbook/addressbook.error.xml.h:14
+msgid "GroupWise Address book creation:"
+msgstr "GroupWise Address book creation:"
+
+#: ../addressbook/addressbook.error.xml.h:15
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:13
+#: ../addressbook/addressbook.error.xml.h:16
+msgid "Permission Denied."
+msgstr "Permission Denied."
+
+#: ../addressbook/addressbook.error.xml.h:17
msgid "Server Version"
msgstr "Server Version"
-#: ../addressbook/addressbook.error.xml.h:14
-#: ../calendar/calendar.error.xml.h:44
+#: ../addressbook/addressbook.error.xml.h:18
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:15
+#: ../addressbook/addressbook.error.xml.h:19
msgid "The Evolution addressbook has quit unexpectedly."
msgstr "The Evolution addressbook has quit unexpectedly."
-#: ../addressbook/addressbook.error.xml.h:16
+#: ../addressbook/addressbook.error.xml.h:20
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:17
+#: ../addressbook/addressbook.error.xml.h:21
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:18
+#: ../addressbook/addressbook.error.xml.h:22
msgid "This address book will be removed permanently."
msgstr "This address book will be removed permanently."
-#: ../addressbook/addressbook.error.xml.h:19
+#: ../addressbook/addressbook.error.xml.h:23
msgid "This addressbook could not be opened."
msgstr "This addressbook could not be opened."
-#: ../addressbook/addressbook.error.xml.h:20
+#: ../addressbook/addressbook.error.xml.h:24
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:21
+#: ../addressbook/addressbook.error.xml.h:25
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:22
+#: ../addressbook/addressbook.error.xml.h:26
msgid "This server does not support LDAPv3 schema information."
msgstr "This server does not support LDAPv3 schema information."
-#: ../addressbook/addressbook.error.xml.h:23
+#: ../addressbook/addressbook.error.xml.h:27
msgid "Unable to open addressbook"
msgstr "Unable to open addressbook"
-#: ../addressbook/addressbook.error.xml.h:24
+#: ../addressbook/addressbook.error.xml.h:28
msgid "Unable to perform search."
msgstr "Unable to perform search."
-#: ../addressbook/addressbook.error.xml.h:25
+#: ../addressbook/addressbook.error.xml.h:29
msgid "Unable to save {0}."
msgstr "Unable to save {0}."
-#: ../addressbook/addressbook.error.xml.h:26
+#: ../addressbook/addressbook.error.xml.h:30
msgid "Would you like to save your changes?"
msgstr "Would you like to save your changes?"
-#: ../addressbook/addressbook.error.xml.h:27
+#: ../addressbook/addressbook.error.xml.h:31
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:28
-#: ../calendar/calendar.error.xml.h:59
+#: ../addressbook/addressbook.error.xml.h:32
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:29
+#: ../addressbook/addressbook.error.xml.h:33
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:30
+#: ../addressbook/addressbook.error.xml.h:34
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:31
-#: ../mail/em-vfolder-rule.c:494
+#: ../addressbook/addressbook.error.xml.h:35
+#: ../mail/em-vfolder-rule.c:511
#: ../plugins/groupwise-features/junk-settings.glade.h:4
-#: ../plugins/groupwise-features/properties.glade.h:10
+#: ../plugins/groupwise-features/properties.glade.h:9
#: ../widgets/table/e-table-config.glade.h:15
msgid "_Add"
msgstr "_Add"
-#: ../addressbook/addressbook.error.xml.h:32
+#: ../addressbook/addressbook.error.xml.h:36
msgid "_Discard"
msgstr "_Discard"
-#: ../addressbook/addressbook.error.xml.h:33
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:76
+#: ../addressbook/addressbook.error.xml.h:37
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:79
msgid "{0}"
msgstr "{0}"
-#: ../addressbook/addressbook.error.xml.h:34
+#: ../addressbook/addressbook.error.xml.h:38
msgid "{1}"
msgstr "{1}"
-#: ../addressbook/conduit/address-conduit.c:298
+#: ../addressbook/conduit/address-conduit.c:300
msgid "Default Sync Address:"
msgstr "Default Sync Address:"
-#: ../addressbook/conduit/address-conduit.c:1183
-#: ../addressbook/conduit/address-conduit.c:1184
+#: ../addressbook/conduit/address-conduit.c:1241
+#: ../addressbook/conduit/address-conduit.c:1242
msgid "Could not load addressbook"
msgstr "Could not load addressbook"
-#: ../addressbook/conduit/address-conduit.c:1252
-#: ../addressbook/conduit/address-conduit.c:1255
+#: ../addressbook/conduit/address-conduit.c:1310
+#: ../addressbook/conduit/address-conduit.c:1313
msgid "Could not read pilot's Address application block"
msgstr "Could not read pilot's Address application block"
@@ -497,31 +531,32 @@ 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:1133
-#: ../calendar/gui/calendar-component.c:246
-#: ../calendar/gui/migration.c:388
+#: ../addressbook/gui/component/addressbook-view.c:1332
+#: ../calendar/gui/calendar-component.c:272
+#: ../calendar/gui/migration.c:403
+#: ../plugins/exchange-operations/exchange-folder.c:575
msgid "Contacts"
msgstr "Contacts"
#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
-msgid "Evolution Addressbook"
-msgstr "Evolution Addressbook"
+msgid "Evolution Address Book"
+msgstr "Evolution Address Book"
#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
-msgid "Evolution Addressbook address pop-up"
-msgstr "Evolution Addressbook address pop-up"
+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 Addressbook address viewer"
-msgstr "Evolution Addressbook address viewer"
+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 Addressbook card viewer"
-msgstr "Evolution Addressbook card viewer"
+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 Addressbook component"
-msgstr "Evolution Addressbook component"
+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"
@@ -537,15 +572,17 @@ 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:137
-#: ../addressbook/gui/component/addressbook-migrate.c:502
-#: ../calendar/gui/calendar-component.c:208
-#: ../calendar/gui/migration.c:462
-#: ../calendar/gui/migration.c:555
-#: ../calendar/gui/tasks-component.c:188
-#: ../mail/em-folder-tree-model.c:197
+#: ../addressbook/gui/component/addressbook-component.c:141
+#: ../addressbook/gui/component/addressbook-migrate.c:483
+#: ../calendar/gui/calendar-component.c:231
+#: ../calendar/gui/memos-component.c:195
+#: ../calendar/gui/migration.c:477
+#: ../calendar/gui/migration.c:573
+#: ../calendar/gui/migration.c:1081
+#: ../calendar/gui/tasks-component.c:190
#: ../mail/em-folder-tree-model.c:199
-#: ../mail/mail-component.c:292
+#: ../mail/em-folder-tree-model.c:201
+#: ../mail/mail-component.c:300
#: ../mail/mail-vfolder.c:223
msgid "On This Computer"
msgstr "On This Computer"
@@ -555,140 +592,145 @@ msgstr "On This Computer"
#. Create the default Person task list
#. Create the default Person addressbook
#. orange
-#: ../addressbook/gui/component/addressbook-component.c:145
-#: ../addressbook/gui/component/addressbook-migrate.c:510
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:20
-#: ../calendar/gui/calendar-component.c:216
-#: ../calendar/gui/migration.c:470
-#: ../calendar/gui/migration.c:563
-#: ../calendar/gui/tasks-component.c:196
+#: ../addressbook/gui/component/addressbook-component.c:149
+#: ../addressbook/gui/component/addressbook-migrate.c:491
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:19
+#: ../addressbook/gui/widgets/eab-contact-display.c:602
+#: ../calendar/gui/calendar-component.c:241
+#: ../calendar/gui/memos-component.c:203
+#: ../calendar/gui/migration.c:487
+#: ../calendar/gui/migration.c:581
+#: ../calendar/gui/migration.c:1089
+#: ../calendar/gui/tasks-component.c:198
#: ../filter/filter-label.c:123
-#: ../mail/em-migrate.c:1043
-#: ../mail/mail-config.c:78
+#: ../mail/em-migrate.c:1055
#: ../mail/mail-config.glade.h:104
msgid "Personal"
msgstr "Personal"
#. Create the LDAP source group
-#: ../addressbook/gui/component/addressbook-component.c:155
-#: ../addressbook/gui/component/addressbook-migrate.c:520
+#: ../addressbook/gui/component/addressbook-component.c:159
+#: ../addressbook/gui/component/addressbook-migrate.c:501
msgid "On LDAP Servers"
msgstr "On LDAP Servers"
-#: ../addressbook/gui/component/addressbook-component.c:226
+#: ../addressbook/gui/component/addressbook-component.c:227
msgid "_Contact"
msgstr "_Contact"
-#: ../addressbook/gui/component/addressbook-component.c:227
+#: ../addressbook/gui/component/addressbook-component.c:228
msgid "Create a new contact"
msgstr "Create a new contact"
-#: ../addressbook/gui/component/addressbook-component.c:234
+#: ../addressbook/gui/component/addressbook-component.c:235
msgid "Contact _List"
msgstr "Contact _List"
-#: ../addressbook/gui/component/addressbook-component.c:235
+#: ../addressbook/gui/component/addressbook-component.c:236
msgid "Create a new contact list"
msgstr "Create a new contact list"
-#: ../addressbook/gui/component/addressbook-component.c:241
-#: ../addressbook/gui/component/addressbook-config.c:1118
-#: ../addressbook/gui/component/addressbook-view.c:763
+#: ../addressbook/gui/component/addressbook-component.c:242
+#: ../addressbook/gui/component/addressbook-config.c:1205
msgid "New Address Book"
msgstr "New Address Book"
-#: ../addressbook/gui/component/addressbook-component.c:242
+#: ../addressbook/gui/component/addressbook-component.c:243
msgid "Address _Book"
msgstr "Address _Book"
-#: ../addressbook/gui/component/addressbook-component.c:243
+#: ../addressbook/gui/component/addressbook-component.c:244
msgid "Create a new address book"
msgstr "Create a new address book"
-#: ../addressbook/gui/component/addressbook-component.c:385
-msgid "Failed upgrading Addressbook settings or folders."
-msgstr "Failed upgrading Addressbook settings or folders."
+#: ../addressbook/gui/component/addressbook-component.c:407
+msgid "Failed upgrading Address Book settings or folders."
+msgstr "Failed upgrading Address Book settings or folders."
-#: ../addressbook/gui/component/addressbook-config.c:313
+#: ../addressbook/gui/component/addressbook-config.c:332
msgid "Base"
msgstr "Base"
-#: ../addressbook/gui/component/addressbook-config.c:508
+#: ../addressbook/gui/component/addressbook-config.c:533
#: ../calendar/gui/dialogs/calendar-setup.c:192
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:10
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:9
msgid "_Type:"
msgstr "_Type:"
-#: ../addressbook/gui/component/addressbook-config.c:607
+#: ../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:902
-#: ../addressbook/gui/component/ldap-config.glade.h:23
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
-#: ../calendar/gui/dialogs/calendar-setup.c:366
-#: ../calendar/gui/dialogs/calendar-setup.c:377
-#: ../mail/em-folder-properties.c:215
+#: ../addressbook/gui/component/addressbook-config.c:984
+#: ../addressbook/gui/component/ldap-config.glade.h:22
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
+#: ../calendar/gui/dialogs/calendar-setup.c:368
+#: ../calendar/gui/dialogs/calendar-setup.c:379
+#: ../calendar/gui/dialogs/calendar-setup.c:390
+#: ../mail/em-folder-properties.c:222
#: ../mail/mail-config.glade.h:85
+#: ../plugins/itip-formatter/itip-formatter.c:2051
#: ../smime/gui/smime-ui.glade.h:28
msgid "General"
msgstr "General"
-#: ../addressbook/gui/component/addressbook-config.c:903
-#: ../mail/importers/pine-importer.c:393
-msgid "Addressbook"
-msgstr "Addressbook"
+#: ../addressbook/gui/component/addressbook-config.c:985
+#: ../addressbook/gui/widgets/e-addressbook-view.c:569
+#: ../mail/importers/pine-importer.c:392
+msgid "Address Book"
+msgstr "Address Book"
-#: ../addressbook/gui/component/addressbook-config.c:907
+#: ../addressbook/gui/component/addressbook-config.c:989
msgid "Server Information"
msgstr "Server Information"
-#: ../addressbook/gui/component/addressbook-config.c:909
+#: ../addressbook/gui/component/addressbook-config.c:991
msgid "Authentication"
msgstr "Authentication"
-#: ../addressbook/gui/component/addressbook-config.c:912
-#: ../addressbook/gui/component/ldap-config.glade.h:18
-#: ../mail/mail-dialogs.glade.h:7
+#: ../addressbook/gui/component/addressbook-config.c:994
+#: ../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:913
+#: ../addressbook/gui/component/addressbook-config.c:995
+#: ../mail/em-folder-browser.c:852
msgid "Searching"
msgstr "Searching"
-#: ../addressbook/gui/component/addressbook-config.c:915
+#: ../addressbook/gui/component/addressbook-config.c:997
msgid "Downloading"
msgstr "Downloading"
-#: ../addressbook/gui/component/addressbook-config.c:1116
-#: ../addressbook/gui/component/ldap-config.glade.h:14
+#: ../addressbook/gui/component/addressbook-config.c:1203
+#: ../addressbook/gui/component/ldap-config.glade.h:13
msgid "Address Book Properties"
msgstr "Address Book Properties"
-#: ../addressbook/gui/component/addressbook-migrate.c:72
-#: ../calendar/gui/migration.c:142
-#: ../mail/em-migrate.c:1190
+#: ../addressbook/gui/component/addressbook-migrate.c:73
+#: ../calendar/gui/migration.c:155
+#: ../mail/em-migrate.c:1202
msgid "Migrating..."
msgstr "Migrating..."
-#: ../addressbook/gui/component/addressbook-migrate.c:124
-#: ../calendar/gui/migration.c:189
-#: ../mail/em-migrate.c:1231
+#: ../addressbook/gui/component/addressbook-migrate.c:125
+#: ../calendar/gui/migration.c:202
+#: ../mail/em-migrate.c:1243
#, c-format
msgid "Migrating `%s':"
msgstr "Migrating `%s':"
-#: ../addressbook/gui/component/addressbook-migrate.c:648
+#: ../addressbook/gui/component/addressbook-migrate.c:629
msgid "LDAP Servers"
msgstr "LDAP Servers"
-#: ../addressbook/gui/component/addressbook-migrate.c:763
+#: ../addressbook/gui/component/addressbook-migrate.c:744
msgid "Autocompletion Settings"
msgstr "Autocompletion Settings"
-#: ../addressbook/gui/component/addressbook-migrate.c:1134
+#: ../addressbook/gui/component/addressbook-migrate.c:1119
msgid ""
"The location and hierarchy of the Evolution contact folders has changed since Evolution 1.x.\n"
"\n"
@@ -698,7 +740,7 @@ msgstr ""
"\n"
"Please be patient while Evolution migrates your folders..."
-#: ../addressbook/gui/component/addressbook-migrate.c:1148
+#: ../addressbook/gui/component/addressbook-migrate.c:1133
msgid ""
"The format of mailing list contacts has changed.\n"
"\n"
@@ -708,7 +750,7 @@ msgstr ""
"\n"
"Please be patient while Evolution migrates your folders..."
-#: ../addressbook/gui/component/addressbook-migrate.c:1157
+#: ../addressbook/gui/component/addressbook-migrate.c:1142
msgid ""
"The way Evolution stores some phone numbers has changed.\n"
"\n"
@@ -718,7 +760,7 @@ msgstr ""
"\n"
"Please be patient while Evolution migrates your folders..."
-#: ../addressbook/gui/component/addressbook-migrate.c:1167
+#: ../addressbook/gui/component/addressbook-migrate.c:1152
msgid ""
"Evolution's Palm Sync changelog and map files have changed.\n"
"\n"
@@ -728,25 +770,61 @@ msgstr ""
"\n"
"Please be patient while Evolution migrates your Pilot Sync data..."
-#: ../addressbook/gui/component/addressbook-view.c:764
-#: ../addressbook/gui/widgets/e-addressbook-view.c:952
-#: ../calendar/gui/calendar-component.c:537
-#: ../calendar/gui/tasks-component.c:441
-#: ../mail/em-filter-i18n.h:11
-#: ../ui/evolution-addressbook.xml.h:8
-#: ../ui/evolution-calendar.xml.h:5
-#: ../ui/evolution-mail-message.xml.h:26
-#: ../ui/evolution-tasks.xml.h:6
-msgid "Delete"
-msgstr "Delete"
+#: ../addressbook/gui/component/addressbook-view.c:434
+#: ../mail/em-folder-utils.c:503
+#, c-format
+msgid "Rename the \"%s\" folder to:"
+msgstr "Rename the \"%s\" folder to:"
-#: ../addressbook/gui/component/addressbook-view.c:766
-#: ../calendar/gui/calendar-component.c:538
-#: ../calendar/gui/tasks-component.c:442
-msgid "Properties..."
-msgstr "Properties..."
+#: ../addressbook/gui/component/addressbook-view.c:437
+#: ../mail/em-folder-utils.c:505
+msgid "Rename Folder"
+msgstr "Rename Folder"
+
+#: ../addressbook/gui/component/addressbook-view.c:442
+#: ../mail/em-folder-utils.c:511
+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
+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:985
+#: ../calendar/gui/calendar-component.c:584
+#: ../calendar/gui/e-calendar-table.c:1302
+#: ../calendar/gui/e-calendar-view.c:1720
+#: ../calendar/gui/e-memo-table.c:918
+#: ../calendar/gui/memos-component.c:453
+#: ../calendar/gui/tasks-component.c:443
+#: ../mail/em-folder-tree.c:2077
+#: ../mail/em-folder-view.c:1131
+#: ../ui/evolution-addressbook.xml.h:49
+#: ../ui/evolution-calendar.xml.h:40
+#: ../ui/evolution-mail-list.xml.h:30
+#: ../ui/evolution-memos.xml.h:16
+#: ../ui/evolution-tasks.xml.h:24
+msgid "_Delete"
+msgstr "_Delete"
-#: ../addressbook/gui/component/addressbook-view.c:1144
+#: ../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:444
+msgid "_Properties..."
+msgstr "_Properties..."
+
+#: ../addressbook/gui/component/addressbook-view.c:1343
msgid "Contact Source Selector"
msgstr "Contact Source Selector"
@@ -754,13 +832,13 @@ msgstr "Contact Source Selector"
msgid "Accessing LDAP Server anonymously"
msgstr "Accessing LDAP Server anonymously"
-#: ../addressbook/gui/component/addressbook.c:191
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:485
+#: ../addressbook/gui/component/addressbook.c:197
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:499
msgid "Failed to authenticate.\n"
msgstr "Failed to authenticate.\n"
-#: ../addressbook/gui/component/addressbook.c:198
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:464
+#: ../addressbook/gui/component/addressbook.c:204
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:479
#, c-format
msgid "Enter password for %s (user %s)"
msgstr "Enter password for %s (user %s)"
@@ -798,7 +876,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:9
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:55
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:68
msgid "Vertical pane position"
msgstr "Vertical pane position"
@@ -807,1562 +885,1589 @@ msgid "Whether to show the preview pane."
msgstr "Whether to show the preview pane."
#: ../addressbook/gui/component/ldap-config.glade.h:1
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:1
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:1
-#: ../addressbook/gui/contact-editor/fullname.glade.h:1
-#: ../addressbook/gui/contact-editor/im.glade.h:1
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
-#: ../calendar/gui/dialogs/cal-attachment.glade.h:1
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:1
-#: ../calendar/gui/dialogs/event-page.glade.h:1
-#: ../calendar/gui/dialogs/new-calendar.glade.h:1
-#: ../calendar/gui/dialogs/new-task-list.glade.h:1
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:1
-#: ../composer/e-msg-composer-attachment.glade.h:1
-#: ../mail/message-tags.glade.h:1
-#: ../plugins/exchange-operations/exchange-change-password.glade.h:1
-#: ../plugins/groupwise-features/properties.glade.h:1
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
-#: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:2
-#: ../widgets/menus/gal-view-new-dialog.glade.h:1
-#: ../widgets/misc/e-attachment.glade.h:1
-#: ../widgets/misc/gal-categories.glade.h:1
-msgid "*"
-msgstr "*"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:2
msgid "1"
msgstr "1"
-#: ../addressbook/gui/component/ldap-config.glade.h:3
+#: ../addressbook/gui/component/ldap-config.glade.h:2
msgid "3268"
msgstr "3268"
-#: ../addressbook/gui/component/ldap-config.glade.h:4
+#: ../addressbook/gui/component/ldap-config.glade.h:3
msgid "389"
msgstr "389"
-#: ../addressbook/gui/component/ldap-config.glade.h:5
+#: ../addressbook/gui/component/ldap-config.glade.h:4
msgid "5"
msgstr "5"
-#: ../addressbook/gui/component/ldap-config.glade.h:6
+#: ../addressbook/gui/component/ldap-config.glade.h:5
msgid "636"
msgstr "636"
-#: ../addressbook/gui/component/ldap-config.glade.h:7
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:2
+#: ../addressbook/gui/component/ldap-config.glade.h:6
+#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:1
msgid "<b>Authentication</b>"
msgstr "<b>Authentication</b>"
-#: ../addressbook/gui/component/ldap-config.glade.h:8
+#: ../addressbook/gui/component/ldap-config.glade.h:7
msgid "<b>Display</b>"
msgstr "<b>Display</b>"
-#: ../addressbook/gui/component/ldap-config.glade.h:9
+#: ../addressbook/gui/component/ldap-config.glade.h:8
msgid "<b>Downloading</b>"
msgstr "<b>Downloading</b>"
-#: ../addressbook/gui/component/ldap-config.glade.h:10
+#: ../addressbook/gui/component/ldap-config.glade.h:9
msgid "<b>Searching</b>"
msgstr "<b>Searching</b>"
-#: ../addressbook/gui/component/ldap-config.glade.h:11
+#: ../addressbook/gui/component/ldap-config.glade.h:10
msgid "<b>Server Information</b>"
msgstr "<b>Server Information</b>"
-#: ../addressbook/gui/component/ldap-config.glade.h:12
+#: ../addressbook/gui/component/ldap-config.glade.h:11
msgid "<b>Type:</b>"
msgstr "<b>Type:</b>"
-#: ../addressbook/gui/component/ldap-config.glade.h:13
+#: ../addressbook/gui/component/ldap-config.glade.h:12
msgid "Add Address Book"
msgstr "Add Address Book"
-#: ../addressbook/gui/component/ldap-config.glade.h:15
-#: ../mail/em-account-editor.c:302
-#: ../mail/em-account-editor.c:759
+#: ../addressbook/gui/component/ldap-config.glade.h:14
+#: ../mail/em-account-editor.c:777
msgid "Always"
msgstr "Always"
-#: ../addressbook/gui/component/ldap-config.glade.h:16
+#: ../addressbook/gui/component/ldap-config.glade.h:15
msgid "Anonymously"
msgstr "Anonymously"
-#: ../addressbook/gui/component/ldap-config.glade.h:17
+#: ../addressbook/gui/component/ldap-config.glade.h:16
msgid "Basic"
msgstr "Basic"
-#: ../addressbook/gui/component/ldap-config.glade.h:19
+#: ../addressbook/gui/component/ldap-config.glade.h:18
msgid "Distinguished name"
msgstr "Distinguished name"
-#: ../addressbook/gui/component/ldap-config.glade.h:20
+#: ../addressbook/gui/component/ldap-config.glade.h:19
msgid "Email address"
msgstr "Email address"
-#: ../addressbook/gui/component/ldap-config.glade.h:21
+#: ../addressbook/gui/component/ldap-config.glade.h:20
msgid "Evolution will use this email address to authenticate you with the server."
msgstr "Evolution will use this email address to authenticate you with the server."
-#: ../addressbook/gui/component/ldap-config.glade.h:22
+#: ../addressbook/gui/component/ldap-config.glade.h:21
msgid "Find Possible Search Bases"
msgstr "Find Possible Search Bases"
-#: ../addressbook/gui/component/ldap-config.glade.h:24
+#: ../addressbook/gui/component/ldap-config.glade.h:23
msgid "Lo_gin:"
msgstr "Lo_gin:"
-#: ../addressbook/gui/component/ldap-config.glade.h:25
-#: ../mail/em-account-editor.c:300
-#: ../mail/em-account-editor.c:758
+#: ../addressbook/gui/component/ldap-config.glade.h:24
+#: ../mail/em-account-editor.c:776
msgid "Never"
msgstr "Never"
+#. Translators: This string is a "Use secure connection" option for
+#. the Mailer. It will not use an encrypted connection.
+#: ../addressbook/gui/component/ldap-config.glade.h:25
+#: ../mail/em-account-editor.c:304
+msgid "No encryption"
+msgstr "No encryption"
+
#: ../addressbook/gui/component/ldap-config.glade.h:26
msgid "One"
msgstr "One"
+#. Translators: This string is a "Use secure connection" option for
+#. the Mailer. SSL (Secure Sockets Layer) is commonly known by this
+#. abbreviation.
#: ../addressbook/gui/component/ldap-config.glade.h:27
-msgid "Search _base:"
-msgstr "Search _base:"
+#: ../mail/em-account-editor.c:312
+msgid "SSL encryption"
+msgstr "SSL encryption"
#: ../addressbook/gui/component/ldap-config.glade.h:28
-msgid "Selecting this option means that Evolution will only connect to your LDAP server if your LDAP server supports SSL or TLS."
-msgstr "Selecting this option means that Evolution will only connect to your LDAP server if your LDAP server supports SSL or TLS."
+msgid "Search Filter"
+msgstr "Search Filter"
#: ../addressbook/gui/component/ldap-config.glade.h:29
-msgid "Selecting this option means that Evolution will only try to use SSL/TLS if you are in a insecure environment. For example, if you and your LDAP server are behind a firewall at work, then Evolution doesn't need to use SSL/TLS because your connection is already secure."
-msgstr "Selecting this option means that Evolution will only try to use SSL/TLS if you are in a insecure environment. For example, if you and your LDAP server are behind a firewall at work, then Evolution doesn't need to use SSL/TLS because your connection is already secure."
+msgid "Search _base:"
+msgstr "Search _base:"
#: ../addressbook/gui/component/ldap-config.glade.h:30
-msgid "Selecting this option means that your server does not support either SSL or TLS. This means that your connection will be insecure, and that you will be vulnerable to security exploits. "
-msgstr "Selecting this option means that your server does not support either SSL or TLS. This means that your connection will be insecure, and that you will be vulnerable to security exploits. "
+msgid "Search _filter:"
+msgstr "Search _filter:"
#: ../addressbook/gui/component/ldap-config.glade.h:31
+msgid "Search filter"
+msgstr "Search filter"
+
+#: ../addressbook/gui/component/ldap-config.glade.h:32
+msgid "Search filter is the type of the objects searched for, while performing the search. If this is not modified, by default search will be performed on objectclass of the type \"person\"."
+msgstr "Search filter is the type of object to be searched for. If this is not modified, the default search will be performed on the type \"person\"."
+
+#: ../addressbook/gui/component/ldap-config.glade.h:33
+msgid "Selecting this option means that Evolution will only connect to your LDAP server if your LDAP server supports SSL."
+msgstr "Selecting this option means that Evolution will only connect to your LDAP server if your LDAP server supports SSL."
+
+#: ../addressbook/gui/component/ldap-config.glade.h:34
+msgid "Selecting this option means that Evolution will only connect to your LDAP server if your LDAP server supports TLS."
+msgstr "Selecting this option means that Evolution will only connect to your LDAP server if your LDAP server supports TLS."
+
+#: ../addressbook/gui/component/ldap-config.glade.h:35
+msgid "Selecting this option means that your server does not support either SSL or TLS. This means that your connection will be insecure, and that you will be vulnerable to security exploits."
+msgstr "Selecting this option means that your server does not support either SSL or TLS. This means that your connection will be insecure, and that you will be vulnerable to security exploits."
+
+#: ../addressbook/gui/component/ldap-config.glade.h:36
msgid "Sub"
msgstr "Sub"
-#: ../addressbook/gui/component/ldap-config.glade.h:32
+#: ../addressbook/gui/component/ldap-config.glade.h:37
msgid "Supported Search Bases"
msgstr "Supported Search Bases"
-#: ../addressbook/gui/component/ldap-config.glade.h:33
-msgid "The search base is the distinguished name (DN) of the entry where your searches will begin. If you leave this blank, the search will begin at the root of the directory tree."
-msgstr "The search base is the distinguished name (DN) of the entry where your searches will begin. If you leave this blank, the search will begin at the root of the directory tree."
+#. Translators: This string is a "Use secure connection" option for
+#. the Mailer. TLS (Transport Layer Security) is commonly known by
+#. this abbreviation.
+#: ../addressbook/gui/component/ldap-config.glade.h:38
+#: ../mail/em-account-editor.c:308
+msgid "TLS encryption"
+msgstr "TLS encryption"
-#: ../addressbook/gui/component/ldap-config.glade.h:34
+#: ../addressbook/gui/component/ldap-config.glade.h:39
+msgid "The search base is the distinguished name (DN) of the entry where your searches will begin. If you leave this blank, the search will begin at the root of the directory tree."
+msgstr "The search base is the distinguished name (DN) of the entry where your searches will begin. If you leave this blank, the search will begin at the root of the directory tree."
+
+#: ../addressbook/gui/component/ldap-config.glade.h:40
msgid "The search scope defines how deep you would like the search to extend down the directory tree. A search scope of \"sub\" will include all entries below your search base. A search scope of \"one\" will only include the entries one level beneath your base."
msgstr "The search scope defines how deep you would like the search to extend down the directory tree. A search scope of \"sub\" will include all entries below your search base. A search scope of \"one\" will only include the entries one level beneath your base."
-#: ../addressbook/gui/component/ldap-config.glade.h:35
+#: ../addressbook/gui/component/ldap-config.glade.h:41
msgid "This is the full name of your ldap server. For example, \"ldap.mycompany.com\"."
msgstr "This is the full name of your ldap server. For example, \"ldap.mycompany.com\"."
-#: ../addressbook/gui/component/ldap-config.glade.h:36
+#: ../addressbook/gui/component/ldap-config.glade.h:42
msgid "This is the maximum number of entries to download. Setting this number to be too large will slow down your address book."
msgstr "This is the maximum number of entries to download. Setting this number to be too large will slow down your address book."
-#: ../addressbook/gui/component/ldap-config.glade.h:37
+#: ../addressbook/gui/component/ldap-config.glade.h:43
msgid "This is the method Evolution will use to authenticate you. Note that setting this to \"Email Address\" requires anonymous access to your ldap server."
msgstr "This is the method Evolution will use to authenticate you. Note that setting this to \"Email Address\" requires anonymous access to your ldap server."
-#: ../addressbook/gui/component/ldap-config.glade.h:38
+#: ../addressbook/gui/component/ldap-config.glade.h:44
msgid "This is the name for this server that will appear in your Evolution folder list. It is for display purposes only. "
msgstr "This is the name for this server that will appear in your Evolution folder list. It is for display purposes only. "
-#: ../addressbook/gui/component/ldap-config.glade.h:39
+#: ../addressbook/gui/component/ldap-config.glade.h:45
msgid "This is the port on the LDAP server that Evolution will try to connect to. A list of standard ports has been provided. Ask your system administrator what port you should specify."
msgstr "This is the port on the LDAP server that Evolution will try to connect to. A list of standard ports has been provided. Ask your system administrator what port you should specify."
-#: ../addressbook/gui/component/ldap-config.glade.h:40
+#: ../addressbook/gui/component/ldap-config.glade.h:46
msgid "Using distinguished name (DN)"
msgstr "Using distinguished name (DN)"
-#: ../addressbook/gui/component/ldap-config.glade.h:41
+#: ../addressbook/gui/component/ldap-config.glade.h:47
msgid "Using email address"
msgstr "Using email address"
-#: ../addressbook/gui/component/ldap-config.glade.h:42
-#: ../mail/em-account-editor.c:301
+#: ../addressbook/gui/component/ldap-config.glade.h:48
msgid "Whenever Possible"
msgstr "Whenever Possible"
-#: ../addressbook/gui/component/ldap-config.glade.h:43
+#: ../addressbook/gui/component/ldap-config.glade.h:49
msgid "_Add Address Book"
msgstr "_Add Address Book"
-#: ../addressbook/gui/component/ldap-config.glade.h:44
+#: ../addressbook/gui/component/ldap-config.glade.h:50
msgid "_Download limit:"
msgstr "_Download limit:"
-#: ../addressbook/gui/component/ldap-config.glade.h:45
+#: ../addressbook/gui/component/ldap-config.glade.h:51
msgid "_Find Possible Search Bases"
msgstr "_Find Possible Search Bases"
-#: ../addressbook/gui/component/ldap-config.glade.h:46
+#: ../addressbook/gui/component/ldap-config.glade.h:52
msgid "_Login method:"
msgstr "_Login method:"
-#: ../addressbook/gui/component/ldap-config.glade.h:47
-#: ../calendar/gui/dialogs/calendar-setup.c:244
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:8
-#: ../mail/mail-config.glade.h:164
-#: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:4
+#: ../addressbook/gui/component/ldap-config.glade.h:53
+#: ../calendar/gui/dialogs/calendar-setup.c:245
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:7
+#: ../mail/mail-config.glade.h:163
+#: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:2
msgid "_Name:"
msgstr "_Name:"
-#: ../addressbook/gui/component/ldap-config.glade.h:48
+#: ../addressbook/gui/component/ldap-config.glade.h:54
msgid "_Port:"
msgstr "_Port:"
-#: ../addressbook/gui/component/ldap-config.glade.h:49
+#: ../addressbook/gui/component/ldap-config.glade.h:55
msgid "_Search scope:"
msgstr "_Search scope:"
-#: ../addressbook/gui/component/ldap-config.glade.h:50
-#: ../mail/mail-config.glade.h:171
+#: ../addressbook/gui/component/ldap-config.glade.h:56
+#: ../mail/mail-config.glade.h:170
+#: ../plugins/publish-calendar/publish-calendar.glade.h:26
msgid "_Server:"
msgstr "_Server:"
-#: ../addressbook/gui/component/ldap-config.glade.h:51
+#: ../addressbook/gui/component/ldap-config.glade.h:57
msgid "_Timeout:"
msgstr "_Timeout:"
-#: ../addressbook/gui/component/ldap-config.glade.h:52
+#: ../addressbook/gui/component/ldap-config.glade.h:58
msgid "_Use secure connection:"
msgstr "_Use secure connection:"
-#: ../addressbook/gui/component/ldap-config.glade.h:53
+#: ../addressbook/gui/component/ldap-config.glade.h:59
msgid "cards"
msgstr "cards"
-#: ../addressbook/gui/component/ldap-config.glade.h:54
+#: ../addressbook/gui/component/ldap-config.glade.h:60
#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:8
#: ../calendar/gui/dialogs/alarm-dialog.glade.h:26
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:14
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:13
+#: ../calendar/gui/dialogs/event-page.glade.h:20
#: ../filter/filter.glade.h:16
-#: ../mail/em-account-editor.c:1951
-#: ../plugins/calendar-http/calendar-http.c:263
+#: ../mail/em-account-editor.c:2054
+#: ../plugins/calendar-http/calendar-http.c:286
#: ../plugins/calendar-weather/calendar-weather.c:563
msgid "minutes"
msgstr "minutes"
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:2
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:1
msgid "<b>Email</b>"
msgstr "<b>Email</b>"
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:3
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:2
msgid "<b>Home</b>"
msgstr "<b>Home</b>"
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:4
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:3
msgid "<b>Instant Messaging</b>"
msgstr "<b>Instant Messaging</b>"
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:5
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:4
msgid "<b>Job</b>"
msgstr "<b>Job</b>"
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:6
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:5
msgid "<b>Miscellaneous</b>"
msgstr "<b>Miscellaneous</b>"
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:7
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:6
msgid "<b>Other</b>"
msgstr "<b>Other</b>"
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:8
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:7
msgid "<b>Telephone</b>"
msgstr "<b>Telephone</b>"
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:9
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:8
msgid "<b>Web Addresses</b>"
msgstr "<b>Web Addresses</b>"
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:10
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:9
msgid "<b>Work</b>"
msgstr "<b>Work</b>"
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:11
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:184
-#: ../addressbook/gui/widgets/eab-contact-display.c:348
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:10
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:186
+#: ../addressbook/gui/widgets/eab-contact-display.c:556
msgid "AIM"
msgstr "AIM"
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:12
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:272
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:169
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:11
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:275
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:174
#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.etspec.h:1
-#: ../addressbook/gui/widgets/e-minicard.c:182
+#: ../addressbook/gui/widgets/e-minicard.c:193
msgid "Contact"
msgstr "Contact"
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:13
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:525
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:540
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2353
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:12
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:552
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:567
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2417
msgid "Contact Editor"
msgstr "Contact Editor"
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:14
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:13
msgid "Full _Name..."
msgstr "Full _Name..."
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:15
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:14
msgid "Image"
msgstr "Image"
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:16
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:66
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:15
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:68
msgid "MSN Messenger"
msgstr "MSN Messenger"
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:17
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:16
msgid "Mailing Address"
msgstr "Mailing Address"
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:18
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:17
msgid "Ni_ckname:"
msgstr "Ni_ckname:"
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:19
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:63
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:18
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:64
msgid "Novell Groupwise"
msgstr "Novell Groupwise"
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:21
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:20
msgid "Personal Information"
msgstr "Personal Information"
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:22
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:21
msgid "Telephone"
msgstr "Telephone"
#. red
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:23
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:235
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:201
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:22
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:238
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:204
+#: ../addressbook/gui/widgets/eab-contact-display.c:57
+#: ../addressbook/gui/widgets/eab-contact-display.c:585
#: ../filter/filter-label.c:122
-#: ../mail/em-migrate.c:1042
-#: ../mail/mail-config.c:77
+#: ../mail/em-migrate.c:1054
#: ../mail/mail-config.glade.h:153
msgid "Work"
msgstr "Work"
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:24
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:6
-msgid "_Address:"
-msgstr "_Address:"
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:23
+msgid "_Address: "
+msgstr "_Address: "
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:25
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:24
msgid "_Anniversary:"
msgstr "_Anniversary:"
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:26
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:25
msgid "_Assistant:"
msgstr "_Assistant:"
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:27
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:26
msgid "_Birthday:"
msgstr "_Birthday:"
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:28
-#: ../plugins/itip-formatter/itip-view.c:1662
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:27
+#: ../calendar/gui/dialogs/event-page.c:875
+#: ../calendar/gui/dialogs/event-page.glade.h:15
+#: ../plugins/itip-formatter/itip-view.c:1709
msgid "_Calendar:"
msgstr "_Calendar:"
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:29
-msgid "_Categories"
-msgstr "_Categories"
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:28
+msgid "_Categories..."
+msgstr "_Categories..."
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:30
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:29
msgid "_City:"
msgstr "_City:"
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:31
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:30
msgid "_Company:"
msgstr "_Company:"
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:32
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:31
msgid "_Country:"
msgstr "_Country:"
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:33
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:32
msgid "_Department:"
msgstr "_Department:"
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:34
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:33
msgid "_File under:"
msgstr "_File under:"
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:35
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:34
msgid "_Free/Busy:"
msgstr "_Free/Busy:"
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:36
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:35
msgid "_Home Page:"
msgstr "_Home Page:"
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:37
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:36
msgid "_Manager:"
msgstr "_Manager:"
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:38
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:37
msgid "_Notes:"
msgstr "_Notes:"
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:39
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:38
msgid "_Office:"
msgstr "_Office:"
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:40
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:7
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:39
+#: ../addressbook/gui/contact-editor/fulladdr.glade.h:6
msgid "_PO Box:"
msgstr "_PO Box:"
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:41
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:40
msgid "_Profession:"
msgstr "_Profession:"
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:42
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:41
msgid "_Spouse:"
msgstr "_Spouse:"
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:43
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:8
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:42
+#: ../addressbook/gui/contact-editor/fulladdr.glade.h:7
msgid "_State/Province:"
msgstr "_State/Province/County:"
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:44
-#: ../addressbook/gui/contact-editor/fullname.glade.h:18
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:43
+#: ../addressbook/gui/contact-editor/fullname.glade.h:17
msgid "_Title:"
msgstr "_Title:"
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:45
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:44
msgid "_Video Chat:"
msgstr "_Video Chat:"
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:46
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:45
msgid "_Wants to receive HTML mail"
msgstr "_Wants to receive HTML mail"
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:47
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:46
msgid "_Web Log:"
msgstr "_Web Log:"
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:48
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:13
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:47
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:12
msgid "_Where:"
msgstr "_Where:"
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:49
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:48
msgid "_Zip/Postal Code:"
msgstr "_Zip/Postal Code:"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:96
-#: ../addressbook/gui/widgets/eab-contact-display.c:367
-#: ../addressbook/gui/widgets/eab-contact-display.c:382
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:97
+#: ../addressbook/gui/widgets/eab-contact-display.c:582
+#: ../addressbook/gui/widgets/eab-contact-display.c:597
msgid "Address"
msgstr "Address"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:103
-#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:95
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:141
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:300
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:183
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:104
+#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:96
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:144
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:303
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:188
#: ../addressbook/gui/widgets/e-addressbook-model.c:310
#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:398
#: ../addressbook/gui/widgets/e-minicard-label.c:164
#: ../addressbook/gui/widgets/e-minicard-view-widget.c:121
-#: ../addressbook/gui/widgets/e-minicard-view.c:520
-#: ../addressbook/gui/widgets/e-minicard.c:175
+#: ../addressbook/gui/widgets/e-minicard-view.c:522
+#: ../addressbook/gui/widgets/e-minicard.c:186
#: ../widgets/menus/gal-define-views-model.c:181
-#: ../widgets/table/e-cell-text.c:1768
+#: ../widgets/table/e-cell-text.c:1821
#: ../widgets/text/e-entry.c:1312
#: ../widgets/text/e-entry.c:1313
-#: ../widgets/text/e-text.c:3584
-#: ../widgets/text/e-text.c:3585
+#: ../widgets/text/e-text.c:3625
+#: ../widgets/text/e-text.c:3626
msgid "Editable"
msgstr "Editable"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:136
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:137
msgid "United States"
msgstr "United States"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:137
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:138
msgid "Afghanistan"
msgstr "Afghanistan"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:138
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:139
msgid "Albania"
msgstr "Albania"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:139
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:140
msgid "Algeria"
msgstr "Algeria"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:140
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:141
msgid "American Samoa"
msgstr "American Samoa"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:141
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:142
msgid "Andorra"
msgstr "Andorra"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:142
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:143
msgid "Angola"
msgstr "Angola"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:143
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:144
msgid "Anguilla"
msgstr "Anguilla"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:144
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:145
msgid "Antarctica"
msgstr "Antarctica"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:145
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:146
msgid "Antigua And Barbuda"
msgstr "Antigua And Barbuda"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:146
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:147
msgid "Argentina"
msgstr "Argentina"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:147
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:148
msgid "Armenia"
msgstr "Armenia"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:148
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:149
msgid "Aruba"
msgstr "Aruba"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:149
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:150
msgid "Australia"
msgstr "Australia"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:150
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:151
msgid "Austria"
msgstr "Austria"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:151
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:152
msgid "Azerbaijan"
msgstr "Azerbaijan"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:152
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:153
msgid "Bahamas"
msgstr "Bahamas"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:153
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:154
msgid "Bahrain"
msgstr "Bahrain"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:154
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:155
msgid "Bangladesh"
msgstr "Bangladesh"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:155
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:156
msgid "Barbados"
msgstr "Barbados"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:156
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:157
msgid "Belarus"
msgstr "Belarus"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:157
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:158
msgid "Belgium"
msgstr "Belgium"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:158
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:159
msgid "Belize"
msgstr "Belize"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:159
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:160
msgid "Benin"
msgstr "Benin"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:160
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:161
msgid "Bermuda"
msgstr "Bermuda"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:161
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:162
msgid "Bhutan"
msgstr "Bhutan"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:162
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:163
msgid "Bolivia"
msgstr "Bolivia"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:163
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:164
msgid "Bosnia And Herzegowina"
msgstr "Bosnia And Herzegowina"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:164
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:165
msgid "Botswana"
msgstr "Botswana"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:165
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:166
msgid "Bouvet Island"
msgstr "Bouvet Island"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:166
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:167
msgid "Brazil"
msgstr "Brazil"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:167
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:168
msgid "British Indian Ocean Territory"
msgstr "British Indian Ocean Territory"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:168
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:169
msgid "Brunei Darussalam"
msgstr "Brunei Darussalam"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:169
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:170
msgid "Bulgaria"
msgstr "Bulgaria"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:170
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:171
msgid "Burkina Faso"
msgstr "Burkina Faso"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:171
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:172
msgid "Burundi"
msgstr "Burundi"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:172
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:173
msgid "Cambodia"
msgstr "Cambodia"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:173
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:174
msgid "Cameroon"
msgstr "Cameroon"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:174
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:175
msgid "Canada"
msgstr "Canada"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:175
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:176
msgid "Cape Verde"
msgstr "Cape Verde"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:176
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:177
msgid "Cayman Islands"
msgstr "Cayman Islands"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:177
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:178
msgid "Central African Republic"
msgstr "Central African Republic"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:178
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:179
msgid "Chad"
msgstr "Chad"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:179
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:180
msgid "Chile"
msgstr "Chile"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:180
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:181
msgid "China"
msgstr "China"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:181
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:182
msgid "Christmas Island"
msgstr "Christmas Island"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:182
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:183
msgid "Cocos (Keeling) Islands"
msgstr "Cocos (Keeling) Islands"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:183
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:184
msgid "Colombia"
msgstr "Colombia"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:184
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:185
msgid "Comoros"
msgstr "Comoros"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:185
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:186
msgid "Congo"
msgstr "Congo"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:186
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:187
msgid "Congo, The Democratic Republic Of The"
msgstr "Congo, The Democratic Republic Of The"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:187
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:188
msgid "Cook Islands"
msgstr "Cook Islands"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:188
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:189
msgid "Costa Rica"
msgstr "Costa Rica"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:189
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:190
msgid "Cote d'Ivoire"
msgstr "Cote d'Ivoire"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:190
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:191
msgid "Croatia"
msgstr "Croatia"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:191
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:192
msgid "Cuba"
msgstr "Cuba"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:192
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:193
msgid "Cyprus"
msgstr "Cyprus"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:193
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:194
msgid "Czech Republic"
msgstr "Czech Republic"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:194
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:195
msgid "Denmark"
msgstr "Denmark"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:195
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:196
msgid "Djibouti"
msgstr "Djibouti"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:196
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:197
msgid "Dominica"
msgstr "Dominica"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:197
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:198
msgid "Dominican Republic"
msgstr "Dominican Republic"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:198
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:199
msgid "Ecuador"
msgstr "Ecuador"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:199
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:200
msgid "Egypt"
msgstr "Egypt"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:200
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:201
msgid "El Salvador"
msgstr "El Salvador"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:201
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:202
msgid "Equatorial Guinea"
msgstr "Equatorial Guinea"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:202
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:203
msgid "Eritrea"
msgstr "Eritrea"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:203
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:204
msgid "Estonia"
msgstr "Estonia"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:204
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:205
msgid "Ethiopia"
msgstr "Ethiopia"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:205
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:206
msgid "Falkland Islands"
msgstr "Falkland Islands"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:206
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:207
msgid "Faroe Islands"
msgstr "Faroe Islands"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:207
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:208
msgid "Fiji"
msgstr "Fiji"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:208
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:209
msgid "Finland"
msgstr "Finland"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:209
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:210
msgid "France"
msgstr "France"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:210
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:211
msgid "French Guiana"
msgstr "French Guiana"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:211
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:212
msgid "French Polynesia"
msgstr "French Polynesia"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:212
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:213
msgid "French Southern Territories"
msgstr "French Southern Territories"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:213
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:214
msgid "Gabon"
msgstr "Gabon"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:214
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:215
msgid "Gambia"
msgstr "Gambia"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:215
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:216
msgid "Georgia"
msgstr "Georgia"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:216
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:217
msgid "Germany"
msgstr "Germany"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:217
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:218
msgid "Ghana"
msgstr "Ghana"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:218
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:219
msgid "Gibraltar"
msgstr "Gibraltar"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:219
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:220
msgid "Greece"
msgstr "Greece"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:220
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:221
msgid "Greenland"
msgstr "Greenland"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:221
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:222
msgid "Grenada"
msgstr "Grenada"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:222
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:223
msgid "Guadeloupe"
msgstr "Guadeloupe"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:223
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:224
msgid "Guam"
msgstr "Guam"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:224
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:225
msgid "Guatemala"
msgstr "Guatemala"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:225
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:226
msgid "Guernsey"
msgstr "Guernsey"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:226
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:227
msgid "Guinea"
msgstr "Guinea"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:227
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:228
msgid "Guinea-bissau"
msgstr "Guinea-bissau"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:228
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:229
msgid "Guyana"
msgstr "Guyana"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:229
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:230
msgid "Haiti"
msgstr "Haiti"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:230
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:231
msgid "Heard And McDonald Islands"
msgstr "Heard And McDonald Islands"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:231
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:232
msgid "Holy See"
msgstr "Holy See"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:232
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:233
msgid "Honduras"
msgstr "Honduras"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:233
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:234
msgid "Hong Kong"
msgstr "Hong Kong"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:234
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:235
msgid "Hungary"
msgstr "Hungary"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:235
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:236
msgid "Iceland"
msgstr "Iceland"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:236
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:237
msgid "India"
msgstr "India"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:237
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:238
msgid "Indonesia"
msgstr "Indonesia"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:238
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:239
msgid "Iran"
msgstr "Iran"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:239
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:240
msgid "Iraq"
msgstr "Iraq"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:240
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:241
msgid "Ireland"
msgstr "Ireland"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:241
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:242
msgid "Isle of Man"
msgstr "Isle of Man"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:242
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:243
msgid "Israel"
msgstr "Israel"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:243
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:244
msgid "Italy"
msgstr "Italy"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:244
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:245
msgid "Jamaica"
msgstr "Jamaica"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:245
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:246
msgid "Japan"
msgstr "Japan"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:246
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:247
msgid "Jersey"
msgstr "Jersey"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:247
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:248
msgid "Jordan"
msgstr "Jordan"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:248
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:249
msgid "Kazakhstan"
msgstr "Kazakhstan"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:249
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:250
msgid "Kenya"
msgstr "Kenya"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:250
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:251
msgid "Kiribati"
msgstr "Kiribati"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:251
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:252
msgid "Korea, Democratic People's Republic Of"
msgstr "Korea, Democratic People's Republic Of"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:252
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:253
msgid "Korea, Republic Of"
msgstr "Korea, Republic Of"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:253
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:254
msgid "Kuwait"
msgstr "Kuwait"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:254
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:255
msgid "Kyrgyzstan"
msgstr "Kyrgyzstan"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:255
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:256
msgid "Laos"
msgstr "Laos"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:256
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:257
msgid "Latvia"
msgstr "Latvia"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:257
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:258
msgid "Lebanon"
msgstr "Lebanon"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:258
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:259
msgid "Lesotho"
msgstr "Lesotho"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:259
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:260
msgid "Liberia"
msgstr "Liberia"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:260
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:261
msgid "Libya"
msgstr "Libya"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:261
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:262
msgid "Liechtenstein"
msgstr "Liechtenstein"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:262
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:263
msgid "Lithuania"
msgstr "Lithuania"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:263
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:264
msgid "Luxembourg"
msgstr "Luxembourg"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:264
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:265
msgid "Macao"
msgstr "Macao"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:265
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:266
msgid "Macedonia"
msgstr "Macedonia"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:266
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:267
msgid "Madagascar"
msgstr "Madagascar"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:267
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:268
msgid "Malawi"
msgstr "Malawi"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:268
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:269
msgid "Malaysia"
msgstr "Malaysia"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:269
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:270
msgid "Maldives"
msgstr "Maldives"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:270
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:271
msgid "Mali"
msgstr "Mali"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:271
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:272
msgid "Malta"
msgstr "Malta"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:272
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:273
msgid "Marshall Islands"
msgstr "Marshall Islands"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:273
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:274
msgid "Martinique"
msgstr "Martinique"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:274
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:275
msgid "Mauritania"
msgstr "Mauritania"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:275
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:276
msgid "Mauritius"
msgstr "Mauritius"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:276
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:277
msgid "Mayotte"
msgstr "Mayotte"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:277
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:278
msgid "Mexico"
msgstr "Mexico"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:278
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:279
msgid "Micronesia"
msgstr "Micronesia"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:279
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:280
msgid "Moldova, Republic Of"
msgstr "Moldova, Republic Of"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:280
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:281
msgid "Monaco"
msgstr "Monaco"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:281
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:282
msgid "Mongolia"
msgstr "Mongolia"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:282
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:283
msgid "Montserrat"
msgstr "Montserrat"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:283
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:284
msgid "Morocco"
msgstr "Morocco"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:284
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:285
msgid "Mozambique"
msgstr "Mozambique"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:285
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:286
msgid "Myanmar"
msgstr "Myanmar"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:286
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:287
msgid "Namibia"
msgstr "Namibia"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:287
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:288
msgid "Nauru"
msgstr "Nauru"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:288
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:289
msgid "Nepal"
msgstr "Nepal"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:289
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:290
msgid "Netherlands"
msgstr "Netherlands"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:290
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:291
msgid "Netherlands Antilles"
msgstr "Netherlands Antilles"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:291
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:292
msgid "New Caledonia"
msgstr "New Caledonia"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:292
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:293
msgid "New Zealand"
msgstr "New Zealand"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:293
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:294
msgid "Nicaragua"
msgstr "Nicaragua"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:294
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:295
msgid "Niger"
msgstr "Niger"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:295
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:296
msgid "Nigeria"
msgstr "Nigeria"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:296
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:297
msgid "Niue"
msgstr "Niue"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:297
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:298
msgid "Norfolk Island"
msgstr "Norfolk Island"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:298
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:299
msgid "Northern Mariana Islands"
msgstr "Northern Mariana Islands"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:299
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:300
msgid "Norway"
msgstr "Norway"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:300
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:301
msgid "Oman"
msgstr "Oman"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:301
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:302
msgid "Pakistan"
msgstr "Pakistan"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:302
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:303
msgid "Palau"
msgstr "Palau"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:303
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:304
msgid "Palestinian Territory"
msgstr "Palestinian Territory"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:304
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:305
msgid "Panama"
msgstr "Panama"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:305
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:306
msgid "Papua New Guinea"
msgstr "Papua New Guinea"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:306
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:307
msgid "Paraguay"
msgstr "Paraguay"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:307
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:308
msgid "Peru"
msgstr "Peru"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:308
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:309
msgid "Philippines"
msgstr "Philippines"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:309
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:310
msgid "Pitcairn"
msgstr "Pitcairn"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:310
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:311
msgid "Poland"
msgstr "Poland"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:311
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:312
msgid "Portugal"
msgstr "Portugal"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:312
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:313
msgid "Puerto Rico"
msgstr "Puerto Rico"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:313
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:314
msgid "Qatar"
msgstr "Qatar"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:314
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:315
msgid "Reunion"
msgstr "Reunion"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:315
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:316
msgid "Romania"
msgstr "Romania"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:316
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:317
msgid "Russian Federation"
msgstr "Russian Federation"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:317
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:318
msgid "Rwanda"
msgstr "Rwanda"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:318
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:319
msgid "Saint Kitts And Nevis"
msgstr "Saint Kitts And Nevis"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:319
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:320
msgid "Saint Lucia"
msgstr "Saint Lucia"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:320
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:321
msgid "Saint Vincent And The Grenadines"
msgstr "Saint Vincent And The Grenadines"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:321
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:322
msgid "Samoa"
msgstr "Samoa"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:322
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:323
msgid "San Marino"
msgstr "San Marino"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:323
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:324
msgid "Sao Tome And Principe"
msgstr "Sao Tome And Principe"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:324
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:325
msgid "Saudi Arabia"
msgstr "Saudi Arabia"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:325
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:326
msgid "Senegal"
msgstr "Senegal"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:326
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:327
msgid "Serbia And Montenegro"
msgstr "Serbia And Montenegro"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:327
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:328
msgid "Seychelles"
msgstr "Seychelles"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:328
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:329
msgid "Sierra Leone"
msgstr "Sierra Leone"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:329
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:330
msgid "Singapore"
msgstr "Singapore"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:330
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:331
msgid "Slovakia"
msgstr "Slovakia"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:331
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:332
msgid "Slovenia"
msgstr "Slovenia"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:332
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:333
msgid "Solomon Islands"
msgstr "Solomon Islands"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:333
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:334
msgid "Somalia"
msgstr "Somalia"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:334
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:335
msgid "South Africa"
msgstr "South Africa"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:335
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:336
msgid "South Georgia And The South Sandwich Islands"
msgstr "South Georgia And The South Sandwich Islands"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:336
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:337
msgid "Spain"
msgstr "Spain"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:337
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:338
msgid "Sri Lanka"
msgstr "Sri Lanka"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:338
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:339
msgid "St. Helena"
msgstr "St. Helena"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:339
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:340
msgid "St. Pierre And Miquelon"
msgstr "St. Pierre And Miquelon"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:340
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:341
msgid "Sudan"
msgstr "Sudan"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:341
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:342
msgid "Suriname"
msgstr "Suriname"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:342
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:343
msgid "Svalbard And Jan Mayen Islands"
msgstr "Svalbard And Jan Mayen Islands"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:343
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:344
msgid "Swaziland"
msgstr "Swaziland"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:344
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:345
msgid "Sweden"
msgstr "Sweden"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:345
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:346
msgid "Switzerland"
msgstr "Switzerland"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:346
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:347
msgid "Syria"
msgstr "Syria"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:347
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:348
msgid "Taiwan"
msgstr "Taiwan"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:348
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:349
msgid "Tajikistan"
msgstr "Tajikistan"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:349
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:350
msgid "Tanzania, United Republic Of"
msgstr "Tanzania, United Republic Of"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:350
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:351
msgid "Thailand"
msgstr "Thailand"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:351
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:352
msgid "Timor-Leste"
msgstr "Timor-Leste"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:352
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:353
msgid "Togo"
msgstr "Togo"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:353
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:354
msgid "Tokelau"
msgstr "Tokelau"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:354
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:355
msgid "Tonga"
msgstr "Tonga"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:355
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:356
msgid "Trinidad And Tobago"
msgstr "Trinidad And Tobago"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:356
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:357
msgid "Tunisia"
msgstr "Tunisia"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:357
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:358
msgid "Turkey"
msgstr "Turkey"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:358
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:359
msgid "Turkmenistan"
msgstr "Turkmenistan"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:359
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:360
msgid "Turks And Caicos Islands"
msgstr "Turks And Caicos Islands"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:360
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:361
msgid "Tuvalu"
msgstr "Tuvalu"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:361
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:362
msgid "Uganda"
msgstr "Uganda"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:362
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:363
msgid "Ukraine"
msgstr "Ukraine"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:363
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:364
msgid "United Arab Emirates"
msgstr "United Arab Emirates"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:364
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:365
msgid "United Kingdom"
msgstr "United Kingdom"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:365
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:366
msgid "United States Minor Outlying Islands"
msgstr "United States Minor Outlying Islands"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:366
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:367
msgid "Uruguay"
msgstr "Uruguay"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:367
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:368
msgid "Uzbekistan"
msgstr "Uzbekistan"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:368
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:369
msgid "Vanuatu"
msgstr "Vanuatu"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:369
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:370
msgid "Venezuela"
msgstr "Venezuela"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:370
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:371
msgid "Viet Nam"
msgstr "Viet Nam"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:371
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:372
msgid "Virgin Islands, British"
msgstr "Virgin Islands, British"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:372
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:373
msgid "Virgin Islands, U.S."
msgstr "Virgin Islands, U.S."
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:373
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:374
msgid "Wallis And Futuna Islands"
msgstr "Wallis And Futuna Islands"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:374
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:375
msgid "Western Sahara"
msgstr "Western Sahara"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:375
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:376
msgid "Yemen"
msgstr "Yemen"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:376
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:377
msgid "Zambia"
msgstr "Zambia"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:377
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:378
msgid "Zimbabwe"
msgstr "Zimbabwe"
-#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:89
-#: ../plugins/exchange-operations/exchange-delegates.c:936
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:717
-#: ../plugins/plugin-manager/plugin-manager.c:44
-#: ../plugins/save-attachments/save-attachments.c:362
+#: ../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:42
+#: ../plugins/save-attachments/save-attachments.c:370
#: ../widgets/menus/gal-view-new-dialog.c:73
msgid "Name"
msgstr "Name"
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:62
+#: ../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:64
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:185
-#: ../addressbook/gui/widgets/eab-contact-display.c:351
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:65
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:187
+#: ../addressbook/gui/widgets/eab-contact-display.c:559
msgid "Jabber"
msgstr "Jabber"
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:65
+#: ../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
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:188
-#: ../addressbook/gui/widgets/eab-contact-display.c:350
+msgid "Gadu-Gadu Messenger"
+msgstr "Gadu-Gadu Messenger"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:69
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:191
+#: ../addressbook/gui/widgets/eab-contact-display.c:558
msgid "ICQ"
msgstr "ICQ"
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:118
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:121
msgid "Service"
msgstr "Service"
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:127
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:587
+#: ../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:134
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:137
msgid "Username"
msgstr "Username"
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:231
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:202
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:234
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:205
+#: ../addressbook/gui/widgets/eab-contact-display.c:58
msgid "Home"
msgstr "Home"
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:239
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:203
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:242
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:206
+#: ../addressbook/gui/widgets/eab-contact-display.c:59
msgid "Other"
msgstr "Other"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:186
-#: ../addressbook/gui/widgets/eab-contact-display.c:353
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:188
+#: ../addressbook/gui/widgets/eab-contact-display.c:561
msgid "Yahoo"
msgstr "Yahoo"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:187
-#: ../addressbook/gui/widgets/eab-contact-display.c:352
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:189
+#: ../addressbook/gui/widgets/eab-contact-display.c:562
+msgid "Gadu-Gadu"
+msgstr "Gadu-Gadu"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:190
+#: ../addressbook/gui/widgets/eab-contact-display.c:560
msgid "MSN"
msgstr "MSN"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:189
-#: ../addressbook/gui/widgets/eab-contact-display.c:349
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:192
+#: ../addressbook/gui/widgets/eab-contact-display.c:557
msgid "GroupWise"
msgstr "GroupWise"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:258
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:261
msgid "Source Book"
msgstr "Source Book"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:265
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:268
msgid "Target Book"
msgstr "Target Book"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:279
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:282
msgid "Is New Contact"
msgstr "Is New Contact"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:286
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:289
msgid "Writable Fields"
msgstr "Writable Fields"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:293
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:296
msgid "Required Fields"
msgstr "Required Fields"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:307
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:310
msgid "Changed"
msgstr "Changed"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:535
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2348
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:562
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2412
#, c-format
msgid "Contact Editor - %s"
msgstr "Contact Editor - %s"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2661
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2792
msgid "Please select an image for this contact"
msgstr "Please select an image for this contact"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2662
-msgid "No image"
-msgstr "No image"
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2793
+msgid "_No image"
+msgstr "_No image"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2941
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3097
msgid ""
"The contact data is invalid:\n"
"\n"
@@ -2370,36 +2475,56 @@ msgstr ""
"The contact data is invalid:\n"
"\n"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2993
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3101
+#, c-format
+msgid "'%s' has an invalid format"
+msgstr "'%s' has an invalid format"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3108
+#, c-format
+msgid "%s'%s' has an invalid format"
+msgstr "%s'%s' has an invalid format"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3123
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3134
+#, c-format
+msgid "%s'%s' is empty"
+msgstr "%s'%s' is empty"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3149
msgid "Invalid contact."
msgstr "Invalid contact."
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:277
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:290
msgid "Contact Quick-Add"
msgstr "Contact Quick-Add"
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:280
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:293
msgid "_Edit Full"
msgstr "_Edit Full"
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:306
-msgid "_Full name:"
-msgstr "_Full name:"
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:337
+msgid "_Full name"
+msgstr "_Full name"
+
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:348
+msgid "E_mail"
+msgstr "E_mail"
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:316
-msgid "E-_mail:"
-msgstr "E-_mail:"
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:359
+msgid "_Select Address Book"
+msgstr "_Select Address Book"
-#: ../addressbook/gui/contact-editor/eab-editor.c:323
+#: ../addressbook/gui/contact-editor/eab-editor.c:322
#, c-format
msgid ""
"Are you sure you want\n"
-"to delete contact list (%s) ?"
+"to delete contact list (%s)?"
msgstr ""
"Are you sure you want\n"
-"to delete contact list (%s) ?"
+"to delete contact list (%s)?"
-#: ../addressbook/gui/contact-editor/eab-editor.c:326
+#: ../addressbook/gui/contact-editor/eab-editor.c:325
msgid ""
"Are you sure you want\n"
"to delete these contact lists?"
@@ -2407,16 +2532,16 @@ msgstr ""
"Are you sure you want\n"
"to delete these contact lists?"
-#: ../addressbook/gui/contact-editor/eab-editor.c:331
+#: ../addressbook/gui/contact-editor/eab-editor.c:330
#, c-format
msgid ""
"Are you sure you want\n"
-"to delete contact (%s) ?"
+"to delete contact (%s)?"
msgstr ""
"Are you sure you want\n"
-"to delete contact (%s) ?"
+"to delete contact (%s)?"
-#: ../addressbook/gui/contact-editor/eab-editor.c:334
+#: ../addressbook/gui/contact-editor/eab-editor.c:333
msgid ""
"Are you sure you want\n"
"to delete these contacts?"
@@ -2424,107 +2549,112 @@ msgstr ""
"Are you sure you want\n"
"to delete these contacts?"
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:2
+#: ../addressbook/gui/contact-editor/fulladdr.glade.h:1
msgid "Address _2:"
msgstr "Address _2:"
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:3
+#: ../addressbook/gui/contact-editor/fulladdr.glade.h:2
msgid "Ci_ty:"
msgstr "Ci_ty:"
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:4
+#: ../addressbook/gui/contact-editor/fulladdr.glade.h:3
msgid "Countr_y:"
msgstr "Countr_y:"
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:5
+#: ../addressbook/gui/contact-editor/fulladdr.glade.h:4
msgid "Full Address"
msgstr "Full Address"
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:9
+#: ../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:"
-#: ../addressbook/gui/contact-editor/fullname.glade.h:2
+#: ../addressbook/gui/contact-editor/fullname.glade.h:1
msgid "Dr."
msgstr "Dr."
-#: ../addressbook/gui/contact-editor/fullname.glade.h:3
+#: ../addressbook/gui/contact-editor/fullname.glade.h:2
msgid "Esq."
msgstr "Esq."
-#: ../addressbook/gui/contact-editor/fullname.glade.h:4
+#: ../addressbook/gui/contact-editor/fullname.glade.h:3
#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:15
msgid "Full Name"
msgstr "Full Name"
-#: ../addressbook/gui/contact-editor/fullname.glade.h:5
+#: ../addressbook/gui/contact-editor/fullname.glade.h:4
msgid "I"
msgstr "I"
-#: ../addressbook/gui/contact-editor/fullname.glade.h:6
+#: ../addressbook/gui/contact-editor/fullname.glade.h:5
msgid "II"
msgstr "II"
-#: ../addressbook/gui/contact-editor/fullname.glade.h:7
+#: ../addressbook/gui/contact-editor/fullname.glade.h:6
msgid "III"
msgstr "III"
-#: ../addressbook/gui/contact-editor/fullname.glade.h:8
+#: ../addressbook/gui/contact-editor/fullname.glade.h:7
msgid "Jr."
msgstr "Jr."
-#: ../addressbook/gui/contact-editor/fullname.glade.h:9
+#: ../addressbook/gui/contact-editor/fullname.glade.h:8
msgid "Miss"
msgstr "Miss"
-#: ../addressbook/gui/contact-editor/fullname.glade.h:10
+#: ../addressbook/gui/contact-editor/fullname.glade.h:9
msgid "Mr."
msgstr "Mr."
-#: ../addressbook/gui/contact-editor/fullname.glade.h:11
+#: ../addressbook/gui/contact-editor/fullname.glade.h:10
msgid "Mrs."
msgstr "Mrs."
-#: ../addressbook/gui/contact-editor/fullname.glade.h:12
+#: ../addressbook/gui/contact-editor/fullname.glade.h:11
msgid "Ms."
msgstr "Ms."
-#: ../addressbook/gui/contact-editor/fullname.glade.h:13
+#: ../addressbook/gui/contact-editor/fullname.glade.h:12
msgid "Sr."
msgstr "Sr."
-#: ../addressbook/gui/contact-editor/fullname.glade.h:14
+#: ../addressbook/gui/contact-editor/fullname.glade.h:13
msgid "_First:"
msgstr "_First:"
-#: ../addressbook/gui/contact-editor/fullname.glade.h:15
+#: ../addressbook/gui/contact-editor/fullname.glade.h:14
msgid "_Last:"
msgstr "_Last:"
-#: ../addressbook/gui/contact-editor/fullname.glade.h:16
+#: ../addressbook/gui/contact-editor/fullname.glade.h:15
msgid "_Middle:"
msgstr "_Middle:"
-#: ../addressbook/gui/contact-editor/fullname.glade.h:17
+#: ../addressbook/gui/contact-editor/fullname.glade.h:16
msgid "_Suffix:"
msgstr "_Suffix:"
-#: ../addressbook/gui/contact-editor/im.glade.h:2
+#: ../addressbook/gui/contact-editor/im.glade.h:1
msgid "Add IM Account"
msgstr "Add IM Account"
-#: ../addressbook/gui/contact-editor/im.glade.h:3
+#: ../addressbook/gui/contact-editor/im.glade.h:2
msgid "_Account name:"
msgstr "_Account name:"
-#: ../addressbook/gui/contact-editor/im.glade.h:4
+#: ../addressbook/gui/contact-editor/im.glade.h:3
msgid "_IM Service:"
msgstr "_IM Service:"
-#: ../addressbook/gui/contact-editor/im.glade.h:5
+#: ../addressbook/gui/contact-editor/im.glade.h:4
+#: ../calendar/gui/dialogs/event-page.glade.h:16
#: ../plugins/calendar-weather/calendar-weather.c:409
-#: ../plugins/exchange-operations/exchange-calendar.c:215
-#: ../plugins/exchange-operations/exchange-contacts.c:193
+#: ../plugins/exchange-operations/exchange-calendar.c:242
+#: ../plugins/exchange-operations/exchange-contacts.c:235
msgid "_Location:"
msgstr "_Location:"
@@ -2532,61 +2662,61 @@ msgstr "_Location:"
msgid "\n"
msgstr "\n"
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h: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:5
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:834
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:938
msgid "Contact List Editor"
msgstr "Contact List Editor"
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h: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:7
+#: ../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:8
+#: ../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:9
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8
msgid "_Hide addresses when sending mail to this list"
msgstr "_Hide addresses when sending mail to this list"
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:10
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:9
msgid "_List name:"
msgstr "_List name:"
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:11
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:10
msgid "_Select"
msgstr "_Select"
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:12
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:11
msgid "_Type an email address or drag a contact into the list below:"
msgstr "_Type an email address or drag a contact into the list below:"
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:162
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:167
#: ../addressbook/gui/widgets/e-addressbook-model.c:296
#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:384
-#: ../addressbook/gui/widgets/e-addressbook-view.c:223
+#: ../addressbook/gui/widgets/e-addressbook-view.c:229
#: ../addressbook/gui/widgets/e-minicard-view-widget.c:107
-#: ../addressbook/gui/widgets/e-minicard-view.c:506
+#: ../addressbook/gui/widgets/e-minicard-view.c:508
msgid "Book"
msgstr "Book"
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:176
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:181
msgid "Is New List"
msgstr "Is New List"
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:707
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:759
msgid "_Members"
msgstr "_Members"
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:710
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:762
msgid "Contact List Members"
msgstr "Contact List Members"
@@ -2627,11 +2757,21 @@ msgstr ""
"The name or email address of this contact already exists\n"
"in this folder. Would you like to add it anyway?"
-#. FIXME: get the toplevel window...
-#: ../addressbook/gui/search/e-addressbook-search-dialog.c:160
-#: ../widgets/misc/e-filter-bar.c:156
-msgid "Advanced Search"
-msgstr "Advanced Search"
+#: ../addressbook/gui/widgets/addresstypes.xml.h:1
+#: ../addressbook/gui/widgets/e-addressbook-view.c:178
+#: ../calendar/gui/cal-search-bar.c:58
+msgid "Any field contains"
+msgstr "Any field contains"
+
+#: ../addressbook/gui/widgets/addresstypes.xml.h:2
+#: ../addressbook/gui/widgets/e-addressbook-view.c:177
+msgid "Email begins with"
+msgstr "Email begins with"
+
+#: ../addressbook/gui/widgets/addresstypes.xml.h:3
+#: ../addressbook/gui/widgets/e-addressbook-view.c:176
+msgid "Name begins with"
+msgstr "Name begins with"
#: ../addressbook/gui/widgets/e-addressbook-model.c:148
msgid "No contacts"
@@ -2646,9 +2786,9 @@ msgstr[1] "%d contacts"
#: ../addressbook/gui/widgets/e-addressbook-model.c:303
#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:391
-#: ../addressbook/gui/widgets/e-addressbook-view.c:237
+#: ../addressbook/gui/widgets/e-addressbook-view.c:243
#: ../addressbook/gui/widgets/e-minicard-view-widget.c:114
-#: ../addressbook/gui/widgets/e-minicard-view.c:513
+#: ../addressbook/gui/widgets/e-minicard-view.c:515
msgid "Query"
msgstr "Query"
@@ -2657,14 +2797,14 @@ msgid "Error getting book view"
msgstr "Error getting book view"
#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:405
-#: ../widgets/table/e-table-click-to-add.c:503
+#: ../widgets/table/e-table-click-to-add.c:502
#: ../widgets/table/e-table-selection-model.c:311
-#: ../widgets/table/e-table.c:3344
+#: ../widgets/table/e-table.c:3329
#: ../widgets/table/e-tree-selection-model.c:825
#: ../widgets/text/e-entry.c:1235
#: ../widgets/text/e-entry.c:1236
-#: ../widgets/text/e-text.c:3448
-#: ../widgets/text/e-text.c:3449
+#: ../widgets/text/e-text.c:3489
+#: ../widgets/text/e-text.c:3490
msgid "Model"
msgstr "Model"
@@ -2672,139 +2812,129 @@ msgstr "Model"
msgid "Error modifying card"
msgstr "Error modifying card"
-#: ../addressbook/gui/widgets/e-addressbook-view.c:169
-msgid "Name begins with"
-msgstr "Name begins with"
-
-#: ../addressbook/gui/widgets/e-addressbook-view.c:170
-msgid "Email begins with"
-msgstr "Email begins with"
-
-#: ../addressbook/gui/widgets/e-addressbook-view.c:171
-#: ../calendar/gui/cal-search-bar.c:53
-msgid "Category is"
-msgstr "Category is"
-
-#. We attach subitems below
-#: ../addressbook/gui/widgets/e-addressbook-view.c:172
-#: ../calendar/gui/cal-search-bar.c:48
-msgid "Any field contains"
-msgstr "Any field contains"
-
-#: ../addressbook/gui/widgets/e-addressbook-view.c:173
-#: ../addressbook/gui/widgets/e-addressbook-view.c:178
-msgid "Advanced..."
-msgstr "Advanced..."
-
-#: ../addressbook/gui/widgets/e-addressbook-view.c:230
+#: ../addressbook/gui/widgets/e-addressbook-view.c:236
msgid "Source"
msgstr "Source"
-#: ../addressbook/gui/widgets/e-addressbook-view.c:244
+#: ../addressbook/gui/widgets/e-addressbook-view.c:250
#: ../calendar/gui/dialogs/meeting-page.etspec.h:11
#: ../calendar/gui/e-calendar-table.etspec.h:13
-#: ../calendar/gui/e-meeting-list-view.c:370
+#: ../calendar/gui/e-meeting-list-view.c:487
#: ../calendar/gui/e-meeting-time-sel.etspec.h:11
+#: ../calendar/gui/e-memo-table.etspec.h:6
msgid "Type"
msgstr "Type"
-#: ../addressbook/gui/widgets/e-addressbook-view.c:544
-msgid "Address Book"
-msgstr "Address Book"
-
-#: ../addressbook/gui/widgets/e-addressbook-view.c:807
-#: ../addressbook/gui/widgets/e-addressbook-view.c:936
-#: ../addressbook/gui/widgets/e-addressbook-view.c:2011
-#: ../ui/evolution-addressbook.xml.h:19
+#: ../addressbook/gui/widgets/e-addressbook-view.c:840
+#: ../addressbook/gui/widgets/e-addressbook-view.c:2151
+#: ../ui/evolution-addressbook.xml.h:31
msgid "Save as VCard..."
msgstr "Save as VCard..."
-#: ../addressbook/gui/widgets/e-addressbook-view.c:930
-#: ../calendar/gui/e-calendar-table.c:1154
-#: ../calendar/gui/e-calendar-view.c:1528
-#: ../ui/evolution-addressbook.xml.h:37
+#: ../addressbook/gui/widgets/e-addressbook-view.c:963
+#: ../calendar/gui/dialogs/comp-editor.c:1101
+#: ../calendar/gui/e-calendar-table.c:1280
+#: ../calendar/gui/e-calendar-view.c:1698
+#: ../calendar/gui/e-memo-table.c:901
+#: ../ui/evolution-addressbook.xml.h:56
msgid "_Open"
msgstr "_Open"
-#: ../addressbook/gui/widgets/e-addressbook-view.c:932
-msgid "New Contact..."
-msgstr "New Contact..."
+#: ../addressbook/gui/widgets/e-addressbook-view.c:965
+msgid "_New Contact..."
+msgstr "_New Contact..."
-#: ../addressbook/gui/widgets/e-addressbook-view.c:933
-msgid "New Contact List..."
-msgstr "New Contact List..."
+#: ../addressbook/gui/widgets/e-addressbook-view.c:966
+msgid "New Contact _List..."
+msgstr "New Contact _List..."
-#: ../addressbook/gui/widgets/e-addressbook-view.c:937
-#: ../ui/evolution-addressbook.xml.h:10
-msgid "Forward Contact"
-msgstr "Forward Contact"
+#: ../addressbook/gui/widgets/e-addressbook-view.c:969
+msgid "_Save as VCard..."
+msgstr "_Save as VCard..."
-#: ../addressbook/gui/widgets/e-addressbook-view.c:938
-msgid "Forward Contacts"
-msgstr "Forward Contacts"
+#: ../addressbook/gui/widgets/e-addressbook-view.c:970
+msgid "_Forward Contact"
+msgstr "_Forward Contact"
-#: ../addressbook/gui/widgets/e-addressbook-view.c:939
-msgid "Send Message to Contact"
-msgstr "Send Message to Contact"
+#: ../addressbook/gui/widgets/e-addressbook-view.c:971
+msgid "_Forward Contacts"
+msgstr "_Forward Contacts"
-#: ../addressbook/gui/widgets/e-addressbook-view.c:940
-msgid "Send Message to List"
-msgstr "Send Message to List"
+#: ../addressbook/gui/widgets/e-addressbook-view.c:972
+msgid "Send _Message to Contact"
+msgstr "Send _Message to Contact"
-#: ../addressbook/gui/widgets/e-addressbook-view.c:941
-msgid "Send Message to Contacts"
-msgstr "Send Message to Contacts"
+#: ../addressbook/gui/widgets/e-addressbook-view.c:973
+msgid "Send _Message to List"
+msgstr "Send _Message to List"
-#: ../addressbook/gui/widgets/e-addressbook-view.c:942
-#: ../calendar/gui/calendar-commands.c:119
-#: ../calendar/gui/print.c:2501
-#: ../ui/evolution-addressbook.xml.h:16
-#: ../ui/evolution-calendar.xml.h:19
-#: ../ui/evolution-mail-message.xml.h:77
-#: ../ui/evolution-tasks.xml.h:14
-msgid "Print"
-msgstr "Print"
+#: ../addressbook/gui/widgets/e-addressbook-view.c:974
+msgid "Send _Message to Contacts"
+msgstr "Send _Message to Contacts"
-#: ../addressbook/gui/widgets/e-addressbook-view.c:945
-msgid "Copy to Address Book..."
-msgstr "Copy to Address Book..."
+#: ../addressbook/gui/widgets/e-addressbook-view.c:975
+msgid "_Print"
+msgstr "_Print"
-#: ../addressbook/gui/widgets/e-addressbook-view.c:946
-msgid "Move to Address Book..."
-msgstr "Move to Address Book..."
+#: ../addressbook/gui/widgets/e-addressbook-view.c:978
+msgid "Cop_y to Address Book..."
+msgstr "Cop_y to Address Book..."
-#: ../addressbook/gui/widgets/e-addressbook-view.c:949
-#: ../ui/evolution-addressbook.xml.h:6
-#: ../ui/evolution-tasks.xml.h:4
-msgid "Cut"
-msgstr "Cut"
+#: ../addressbook/gui/widgets/e-addressbook-view.c:979
+msgid "Mo_ve to Address Book..."
+msgstr "Mo_ve to Address Book..."
-#: ../addressbook/gui/widgets/e-addressbook-view.c:950
-#: ../calendar/gui/calendar-component.c:536
-#: ../calendar/gui/tasks-component.c:440
-#: ../ui/evolution-addressbook.xml.h:2
-#: ../ui/evolution-mail-message.xml.h:12
-#: ../ui/evolution-tasks.xml.h:2
-msgid "Copy"
-msgstr "Copy"
+#: ../addressbook/gui/widgets/e-addressbook-view.c:982
+#: ../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:951
-#: ../ui/evolution-addressbook.xml.h:13
-#: ../ui/evolution-tasks.xml.h:11
-msgid "Paste"
-msgstr "Paste"
+#: ../addressbook/gui/widgets/e-addressbook-view.c:983
+#: ../calendar/gui/calendar-component.c:583
+#: ../calendar/gui/dialogs/comp-editor.c:445
+#: ../calendar/gui/e-calendar-table.c:1288
+#: ../calendar/gui/e-calendar-view.c:1705
+#: ../calendar/gui/e-memo-table.c:909
+#: ../calendar/gui/memos-component.c:452
+#: ../calendar/gui/tasks-component.c:442
+#: ../composer/e-msg-composer.c:3152
+#: ../mail/em-folder-tree.c:1002
+#: ../mail/em-folder-view.c:1117
+#: ../mail/message-list.c:1919
+#: ../ui/evolution-addressbook.xml.h:46
+#: ../ui/evolution-calendar.xml.h:39
+#: ../ui/evolution-composer-entries.xml.h:13
+#: ../ui/evolution-editor.xml.h:17
+#: ../ui/evolution-mail-message.xml.h:103
+#: ../ui/evolution-memos.xml.h:15
+#: ../ui/evolution-tasks.xml.h:23
+msgid "_Copy"
+msgstr "_Copy"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.c:984
+msgid "P_aste"
+msgstr "P_aste"
#. All, unmatched, separator
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1562
-#: ../calendar/gui/cal-search-bar.c:346
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1667
+#: ../calendar/gui/cal-search-bar.c:422
msgid "Any Category"
msgstr "Any Category"
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1761
+#. FIXME: Allow range selection in table views, as in minicard view
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1869
msgid "Print cards"
msgstr "Print cards"
+#. E_BOOK_ERROR_OTHER_ERROR
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1976
+#: ../addressbook/gui/widgets/eab-gui-util.c:70
+msgid "Other error"
+msgstr "Other error"
+
#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:1
+#: ../addressbook/gui/widgets/eab-contact-display.c:576
msgid "Assistant"
msgstr "Assistant"
@@ -2833,9 +2963,10 @@ msgid "Car Phone"
msgstr "Car Phone"
#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:8
-#: ../calendar/gui/dialogs/task-page.glade.h:6
+#: ../calendar/gui/dialogs/event-page.glade.h:7
#: ../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"
@@ -2844,18 +2975,16 @@ msgid "Company Phone"
msgstr "Company Phone"
#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:10
-#: ../addressbook/gui/widgets/eab-contact-display.c:564
-#: ../smime/lib/e-cert.c:826
+#: ../addressbook/gui/widgets/eab-contact-display.c:785
+#: ../smime/lib/e-cert.c:827
msgid "Email"
msgstr "Email"
#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:11
-#: ../addressbook/gui/widgets/eab-popup-control.c:441
msgid "Email 2"
msgstr "Email 2"
#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:12
-#: ../addressbook/gui/widgets/eab-popup-control.c:451
msgid "Email 3"
msgstr "Email 3"
@@ -2892,20 +3021,22 @@ msgid "Journal"
msgstr "Journal"
#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:22
+#: ../addressbook/gui/widgets/eab-contact-display.c:575
msgid "Manager"
msgstr "Manager"
#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:23
-#: ../addressbook/gui/widgets/eab-contact-display.c:381
+#: ../addressbook/gui/widgets/eab-contact-display.c:596
msgid "Mobile Phone"
msgstr "Mobile Phone"
#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:24
+#: ../addressbook/gui/widgets/eab-contact-display.c:550
msgid "Nickname"
msgstr "Nickname"
#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-#: ../addressbook/gui/widgets/eab-contact-display.c:392
+#: ../addressbook/gui/widgets/eab-contact-display.c:609
msgid "Note"
msgstr "Note"
@@ -2914,7 +3045,7 @@ msgid "Office"
msgstr "Office"
#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:27
-#: ../addressbook/gui/widgets/eab-contact-display.c:362
+#: ../addressbook/gui/widgets/eab-contact-display.c:571
msgid "Organization"
msgstr "Organisation"
@@ -2940,13 +3071,14 @@ 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:378
+#: ../calendar/gui/e-meeting-list-view.c:498
#: ../calendar/gui/e-meeting-time-sel.etspec.h:9
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:721
+#: ../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:600
msgid "Spouse"
msgstr "Spouse"
@@ -2977,46 +3109,46 @@ msgid "Web Site"
msgstr "Web Site"
#: ../addressbook/gui/widgets/e-minicard-label.c:115
-#: ../addressbook/gui/widgets/e-minicard.c:138
+#: ../addressbook/gui/widgets/e-minicard.c:149
#: ../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/misc/e-reflow.c:1438
-#: ../widgets/table/e-table-click-to-add.c:517
+#: ../widgets/table/e-table-click-to-add.c:516
#: ../widgets/table/e-table-col.c:98
-#: ../widgets/table/e-table-field-chooser-item.c:667
-#: ../widgets/table/e-table-group-container.c:971
-#: ../widgets/table/e-table-group-container.c:972
+#: ../widgets/table/e-table-field-chooser-item.c:656
+#: ../widgets/table/e-table-group-container.c:967
+#: ../widgets/table/e-table-group-container.c:968
#: ../widgets/table/e-table-group-leaf.c:629
#: ../widgets/table/e-table-group-leaf.c:630
-#: ../widgets/table/e-table-item.c:3012
-#: ../widgets/table/e-table-item.c:3013
-#: ../widgets/text/e-text.c:3626
-#: ../widgets/text/e-text.c:3627
+#: ../widgets/table/e-table-item.c:3022
+#: ../widgets/table/e-table-item.c:3023
+#: ../widgets/text/e-text.c:3667
+#: ../widgets/text/e-text.c:3668
msgid "Width"
msgstr "Width"
#: ../addressbook/gui/widgets/e-minicard-label.c:122
-#: ../addressbook/gui/widgets/e-minicard.c:145
+#: ../addressbook/gui/widgets/e-minicard.c:156
#: ../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/misc/e-reflow.c:1446
-#: ../widgets/table/e-table-click-to-add.c:524
-#: ../widgets/table/e-table-field-chooser-item.c:674
-#: ../widgets/table/e-table-group-container.c:964
-#: ../widgets/table/e-table-group-container.c:965
+#: ../widgets/table/e-table-click-to-add.c:523
+#: ../widgets/table/e-table-field-chooser-item.c:663
+#: ../widgets/table/e-table-group-container.c:960
+#: ../widgets/table/e-table-group-container.c:961
#: ../widgets/table/e-table-group-leaf.c:622
#: ../widgets/table/e-table-group-leaf.c:623
-#: ../widgets/table/e-table-item.c:3018
-#: ../widgets/table/e-table-item.c:3019
-#: ../widgets/text/e-text.c:3634
-#: ../widgets/text/e-text.c:3635
+#: ../widgets/table/e-table-item.c:3028
+#: ../widgets/table/e-table-item.c:3029
+#: ../widgets/text/e-text.c:3675
+#: ../widgets/text/e-text.c:3676
msgid "Height"
msgstr "Height"
#: ../addressbook/gui/widgets/e-minicard-label.c:129
-#: ../addressbook/gui/widgets/e-minicard.c:153
+#: ../addressbook/gui/widgets/e-minicard.c:164
msgid "Has Focus"
msgstr "Has Focus"
@@ -3040,7 +3172,7 @@ msgstr "Max field name length"
msgid "Column Width"
msgstr "Column Width"
-#: ../addressbook/gui/widgets/e-minicard-view.c:172
+#: ../addressbook/gui/widgets/e-minicard-view.c:174
msgid ""
"\n"
"\n"
@@ -3054,7 +3186,7 @@ msgstr ""
"\n"
"or double-click here to create a new Contact."
-#: ../addressbook/gui/widgets/e-minicard-view.c:175
+#: ../addressbook/gui/widgets/e-minicard-view.c:177
msgid ""
"\n"
"\n"
@@ -3068,7 +3200,7 @@ msgstr ""
"\n"
"Double-click here to create a new Contact."
-#: ../addressbook/gui/widgets/e-minicard-view.c:180
+#: ../addressbook/gui/widgets/e-minicard-view.c:182
msgid ""
"\n"
"\n"
@@ -3078,7 +3210,7 @@ msgstr ""
"\n"
"Search for the Contact."
-#: ../addressbook/gui/widgets/e-minicard-view.c:182
+#: ../addressbook/gui/widgets/e-minicard-view.c:184
msgid ""
"\n"
"\n"
@@ -3088,204 +3220,263 @@ msgstr ""
"\n"
"There are no items to show in this view."
-#: ../addressbook/gui/widgets/e-minicard-view.c:499
+#: ../addressbook/gui/widgets/e-minicard-view.c:501
msgid "Adapter"
msgstr "Adapter"
-#: ../addressbook/gui/widgets/e-minicard.c:161
+#: ../addressbook/gui/widgets/e-minicard.c:101
+msgid "Work Email"
+msgstr "Work Email"
+
+#: ../addressbook/gui/widgets/e-minicard.c:102
+msgid "Home Email"
+msgstr "Home Email"
+
+#: ../addressbook/gui/widgets/e-minicard.c:103
+msgid "Other Email"
+msgstr "Other Email"
+
+#: ../addressbook/gui/widgets/e-minicard.c:172
msgid "Selected"
msgstr "Selected"
-#: ../addressbook/gui/widgets/e-minicard.c:168
+#: ../addressbook/gui/widgets/e-minicard.c:179
msgid "Has Cursor"
msgstr "Has Cursor"
-#: ../addressbook/gui/widgets/eab-contact-display.c:135
-#: ../addressbook/gui/widgets/eab-contact-display.c:198
+#: ../addressbook/gui/widgets/eab-contact-display.c:174
+#: ../mail/em-popup.c:620
+msgid "_Open Link in Browser"
+msgstr "_Open Link in Browser"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:175
+#: ../mail/em-folder-view.c:2516
+msgid "_Copy Link Location"
+msgstr "_Copy Link Location"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:176
+msgid "_Send New Message To ..."
+msgstr "_Send New Message To ..."
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:177
+#: ../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:301
+#: ../addressbook/gui/widgets/eab-contact-display.c:364
msgid "(map)"
msgstr "(map)"
-#: ../addressbook/gui/widgets/eab-contact-display.c:145
-#: ../addressbook/gui/widgets/eab-contact-display.c:211
+#: ../addressbook/gui/widgets/eab-contact-display.c:311
+#: ../addressbook/gui/widgets/eab-contact-display.c:377
msgid "map"
msgstr "map"
-#: ../addressbook/gui/widgets/eab-contact-display.c:276
-#: ../addressbook/gui/widgets/eab-contact-display.c:545
+#: ../addressbook/gui/widgets/eab-contact-display.c:462
+#: ../addressbook/gui/widgets/eab-contact-display.c:763
msgid "List Members"
msgstr "List Members"
-#: ../addressbook/gui/widgets/eab-contact-display.c:339
-#: ../addressbook/gui/widgets/eab-contact-display.c:341
+#: ../addressbook/gui/widgets/eab-contact-display.c:540
+#: ../addressbook/gui/widgets/eab-contact-display.c:542
msgid "E-mail"
msgstr "E-mail"
-#: ../addressbook/gui/widgets/eab-contact-display.c:363
+#: ../addressbook/gui/widgets/eab-contact-display.c:572
+msgid "Department"
+msgstr "Department"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:573
+msgid "Profession"
+msgstr "Profession"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:574
msgid "Position"
msgstr "Position"
-#: ../addressbook/gui/widgets/eab-contact-display.c:364
-msgid "Video Conferencing"
-msgstr "Video Conferencing"
+#: ../addressbook/gui/widgets/eab-contact-display.c:577
+msgid "Video Chat"
+msgstr "Video Chat"
-#: ../addressbook/gui/widgets/eab-contact-display.c:365
-#: ../addressbook/gui/widgets/eab-contact-display.c:380
+#: ../addressbook/gui/widgets/eab-contact-display.c:578
+#: ../calendar/gui/calendar-commands.c:119
+#: ../calendar/gui/calendar-component.c:755
+#: ../calendar/gui/dialogs/calendar-setup.c:369
+#: ../calendar/gui/gnome-cal.c:2286
+#: ../plugins/exchange-operations/exchange-folder.c:569
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:388
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:419
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:598
+#: ../plugins/hula-account-setup/camel-hula-listener.c:379
+#: ../plugins/hula-account-setup/camel-hula-listener.c:408
+#: ../plugins/publish-calendar/publish-calendar.glade.h:5
+msgid "Calendar"
+msgstr "Calendar"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:579
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
+#: ../calendar/gui/dialogs/event-editor.c:591
+#: ../ui/evolution-event-editor.xml.h:8
+msgid "Free/Busy"
+msgstr "Free/Busy"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:580
+#: ../addressbook/gui/widgets/eab-contact-display.c:595
msgid "Phone"
msgstr "Phone"
-#: ../addressbook/gui/widgets/eab-contact-display.c:366
+#: ../addressbook/gui/widgets/eab-contact-display.c:581
msgid "Fax"
msgstr "Fax"
-#: ../addressbook/gui/widgets/eab-contact-display.c:370
-msgid "work"
-msgstr "work"
+#: ../addressbook/gui/widgets/eab-contact-display.c:592
+msgid "Home Page"
+msgstr "Home Page"
-#: ../addressbook/gui/widgets/eab-contact-display.c:377
-msgid "WWW"
-msgstr "WWW"
+#: ../addressbook/gui/widgets/eab-contact-display.c:593
+msgid "Web Log"
+msgstr "Web Log"
-#: ../addressbook/gui/widgets/eab-contact-display.c:378
-#: ../addressbook/gui/widgets/eab-contact-display.c:599
-msgid "Blog"
-msgstr "Blog"
+#: ../addressbook/gui/widgets/eab-contact-display.c:598
+msgid "Birthday"
+msgstr "Birthday"
-#: ../addressbook/gui/widgets/eab-contact-display.c:385
-msgid "personal"
-msgstr "personal"
+#: ../addressbook/gui/widgets/eab-contact-display.c:599
+msgid "Anniversary"
+msgstr "Anniversary"
-#: ../addressbook/gui/widgets/eab-contact-display.c:560
+#: ../addressbook/gui/widgets/eab-contact-display.c:781
msgid "Job Title"
msgstr "Job Title"
-#: ../addressbook/gui/widgets/eab-contact-display.c:591
+#: ../addressbook/gui/widgets/eab-contact-display.c:812
msgid "Home page"
msgstr "Home page"
+#: ../addressbook/gui/widgets/eab-contact-display.c:820
+msgid "Blog"
+msgstr "Blog"
+
#. E_BOOK_ERROR_OK
-#: ../addressbook/gui/widgets/eab-gui-util.c:49
+#: ../addressbook/gui/widgets/eab-gui-util.c:50
msgid "Success"
msgstr "Success"
#. E_BOOK_ERROR_INVALID_ARG
#. E_BOOK_ERROR_BUSY
-#: ../addressbook/gui/widgets/eab-gui-util.c:51
+#: ../addressbook/gui/widgets/eab-gui-util.c:52
msgid "Backend busy"
msgstr "Backend busy"
#. E_BOOK_ERROR_REPOSITORY_OFFLINE
-#: ../addressbook/gui/widgets/eab-gui-util.c:52
+#: ../addressbook/gui/widgets/eab-gui-util.c:53
msgid "Repository offline"
msgstr "Repository offline"
#. E_BOOK_ERROR_NO_SUCH_BOOK
-#: ../addressbook/gui/widgets/eab-gui-util.c:53
+#: ../addressbook/gui/widgets/eab-gui-util.c:54
msgid "Address Book does not exist"
msgstr "Address Book does not exist"
#. E_BOOK_ERROR_NO_SELF_CONTACT
-#: ../addressbook/gui/widgets/eab-gui-util.c:54
+#: ../addressbook/gui/widgets/eab-gui-util.c:55
msgid "No Self Contact defined"
msgstr "No Self Contact defined"
#. E_BOOK_ERROR_URI_NOT_LOADED
#. E_BOOK_ERROR_URI_ALREADY_LOADED
#. E_BOOK_ERROR_PERMISSION_DENIED
-#: ../addressbook/gui/widgets/eab-gui-util.c:57
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:47
+#: ../addressbook/gui/widgets/eab-gui-util.c:58
+#: ../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:58
+#: ../addressbook/gui/widgets/eab-gui-util.c:59
msgid "Contact not found"
msgstr "Contact not found"
#. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
-#: ../addressbook/gui/widgets/eab-gui-util.c:59
+#: ../addressbook/gui/widgets/eab-gui-util.c:60
msgid "Contact ID already exists"
msgstr "Contact ID already exists"
#. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
-#: ../addressbook/gui/widgets/eab-gui-util.c:60
+#: ../addressbook/gui/widgets/eab-gui-util.c:61
msgid "Protocol not supported"
msgstr "Protocol not supported"
#. E_BOOK_ERROR_CANCELLED
-#: ../addressbook/gui/widgets/eab-gui-util.c:61
+#: ../addressbook/gui/widgets/eab-gui-util.c:62
#: ../calendar/gui/dialogs/task-details-page.glade.h:3
-#: ../calendar/gui/e-cal-component-preview.c:232
-#: ../calendar/gui/e-cal-model-tasks.c:348
-#: ../calendar/gui/e-cal-model-tasks.c:661
-#: ../calendar/gui/e-calendar-table.c:456
-#: ../calendar/gui/print.c:2364
-msgid "Cancelled"
+#: ../calendar/gui/e-cal-component-preview.c:234
+#: ../calendar/gui/e-cal-model-tasks.c:349
+#: ../calendar/gui/e-cal-model-tasks.c:664
+#: ../calendar/gui/e-calendar-table.c:463
+#: ../calendar/gui/print.c:2385
+msgid "Canceled"
msgstr "Cancelled"
#. E_BOOK_ERROR_COULD_NOT_CANCEL
-#: ../addressbook/gui/widgets/eab-gui-util.c:62
+#: ../addressbook/gui/widgets/eab-gui-util.c:63
msgid "Could not cancel"
msgstr "Could not cancel"
#. E_BOOK_ERROR_AUTHENTICATION_FAILED
-#: ../addressbook/gui/widgets/eab-gui-util.c:63
-#: ../calendar/gui/comp-editor-factory.c:438
+#: ../addressbook/gui/widgets/eab-gui-util.c:64
+#: ../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:64
+#: ../addressbook/gui/widgets/eab-gui-util.c:65
msgid "Authentication Required"
msgstr "Authentication Required"
#. E_BOOK_ERROR_TLS_NOT_AVAILABLE
-#: ../addressbook/gui/widgets/eab-gui-util.c:65
+#: ../addressbook/gui/widgets/eab-gui-util.c:66
msgid "TLS not Available"
msgstr "TLS not Available"
#. E_BOOK_ERROR_CORBA_EXCEPTION
#. E_BOOK_ERROR_NO_SUCH_SOURCE
-#: ../addressbook/gui/widgets/eab-gui-util.c:67
+#: ../addressbook/gui/widgets/eab-gui-util.c:68
msgid "No such source"
msgstr "No such source"
#. E_BOOK_ERROR_OFFLINE_UNAVAILABLE
-#: ../addressbook/gui/widgets/eab-gui-util.c:68
+#: ../addressbook/gui/widgets/eab-gui-util.c:69
msgid "Not available in offline mode"
msgstr "Not available in offline mode"
-#. E_BOOK_ERROR_OTHER_ERROR
-#: ../addressbook/gui/widgets/eab-gui-util.c:69
-msgid "Other error"
-msgstr "Other error"
-
#. E_BOOK_ERROR_INVALID_SERVER_VERSION
-#: ../addressbook/gui/widgets/eab-gui-util.c:70
+#: ../addressbook/gui/widgets/eab-gui-util.c:71
msgid "Invalid server version"
msgstr "Invalid server version"
-#: ../addressbook/gui/widgets/eab-gui-util.c:93
+#: ../addressbook/gui/widgets/eab-gui-util.c:94
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:102
+#: ../addressbook/gui/widgets/eab-gui-util.c:103
#, 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:110
+#: ../addressbook/gui/widgets/eab-gui-util.c:112
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:115
+#: ../addressbook/gui/widgets/eab-gui-util.c:117
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:122
+#: ../addressbook/gui/widgets/eab-gui-util.c:124
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:145
+#: ../addressbook/gui/widgets/eab-gui-util.c:147
msgid ""
"More cards matched this query than either the server is \n"
"configured to return or Evolution is configured to display.\n"
@@ -3297,7 +3488,7 @@ msgstr ""
"Please make your search more specific or raise the result limit in\n"
"the directory server preferences for this addressbook."
-#: ../addressbook/gui/widgets/eab-gui-util.c:151
+#: ../addressbook/gui/widgets/eab-gui-util.c:153
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"
@@ -3309,45 +3500,45 @@ msgstr ""
"more specific or raise the time limit in the directory server\n"
"preferences for this addressbook."
-#: ../addressbook/gui/widgets/eab-gui-util.c:157
+#: ../addressbook/gui/widgets/eab-gui-util.c:159
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:160
+#: ../addressbook/gui/widgets/eab-gui-util.c:162
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:163
+#: ../addressbook/gui/widgets/eab-gui-util.c:165
msgid "This query did not complete successfully."
msgstr "This query did not complete successfully."
-#: ../addressbook/gui/widgets/eab-gui-util.c:185
+#: ../addressbook/gui/widgets/eab-gui-util.c:187
msgid "Error adding list"
msgstr "Error adding list"
-#: ../addressbook/gui/widgets/eab-gui-util.c:185
-#: ../addressbook/gui/widgets/eab-gui-util.c:693
+#: ../addressbook/gui/widgets/eab-gui-util.c:187
+#: ../addressbook/gui/widgets/eab-gui-util.c:704
msgid "Error adding contact"
msgstr "Error adding contact"
-#: ../addressbook/gui/widgets/eab-gui-util.c:196
+#: ../addressbook/gui/widgets/eab-gui-util.c:198
msgid "Error modifying list"
msgstr "Error modifying list"
-#: ../addressbook/gui/widgets/eab-gui-util.c:196
+#: ../addressbook/gui/widgets/eab-gui-util.c:198
msgid "Error modifying contact"
msgstr "Error modifying contact"
-#: ../addressbook/gui/widgets/eab-gui-util.c:208
+#: ../addressbook/gui/widgets/eab-gui-util.c:210
msgid "Error removing list"
msgstr "Error removing list"
-#: ../addressbook/gui/widgets/eab-gui-util.c:208
-#: ../addressbook/gui/widgets/eab-gui-util.c:648
+#: ../addressbook/gui/widgets/eab-gui-util.c:210
+#: ../addressbook/gui/widgets/eab-gui-util.c:657
msgid "Error removing contact"
msgstr "Error removing contact"
-#: ../addressbook/gui/widgets/eab-gui-util.c:290
+#: ../addressbook/gui/widgets/eab-gui-util.c:292
#, c-format
msgid ""
"Opening %d contact will open %d new window as well.\n"
@@ -3362,7 +3553,7 @@ msgstr[1] ""
"Opening %d contacts will open %d new windows as well.\n"
"Do you really want to display all of these contacts?"
-#: ../addressbook/gui/widgets/eab-gui-util.c:319
+#: ../addressbook/gui/widgets/eab-gui-util.c:323
#, c-format
msgid ""
"%s already exists\n"
@@ -3371,93 +3562,72 @@ msgstr ""
"%s already exists\n"
"Do you want to overwrite it?"
-#: ../addressbook/gui/widgets/eab-gui-util.c:323
+#: ../addressbook/gui/widgets/eab-gui-util.c:327
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:368
-#: ../addressbook/gui/widgets/eab-gui-util.c:371
+#: ../addressbook/gui/widgets/eab-gui-util.c:374
+#: ../addressbook/gui/widgets/eab-gui-util.c:377
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:418
+#: ../addressbook/gui/widgets/eab-gui-util.c:425
msgid "card.vcf"
msgstr "card.vcf"
-#: ../addressbook/gui/widgets/eab-gui-util.c:594
+#: ../addressbook/gui/widgets/eab-gui-util.c:462
+msgid "Select Address Book"
+msgstr "Select Address Book"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:603
msgid "list"
msgstr "list"
-#: ../addressbook/gui/widgets/eab-gui-util.c:754
+#: ../addressbook/gui/widgets/eab-gui-util.c:765
msgid "Move contact to"
msgstr "Move contact to"
-#: ../addressbook/gui/widgets/eab-gui-util.c:756
+#: ../addressbook/gui/widgets/eab-gui-util.c:767
msgid "Copy contact to"
msgstr "Copy contact to"
-#: ../addressbook/gui/widgets/eab-gui-util.c:759
+#: ../addressbook/gui/widgets/eab-gui-util.c:770
msgid "Move contacts to"
msgstr "Move contacts to"
-#: ../addressbook/gui/widgets/eab-gui-util.c:761
+#: ../addressbook/gui/widgets/eab-gui-util.c:772
msgid "Copy contacts to"
msgstr "Copy contacts to"
-#: ../addressbook/gui/widgets/eab-gui-util.c:764
-msgid "Select target addressbook."
-msgstr "Select target addressbook."
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:987
+#: ../addressbook/gui/widgets/eab-gui-util.c:998
msgid "Multiple VCards"
msgstr "Multiple VCards"
-#: ../addressbook/gui/widgets/eab-gui-util.c:990
+#: ../addressbook/gui/widgets/eab-gui-util.c:1001
#, c-format
msgid "VCard for %s"
msgstr "VCard for %s"
-#.
-#. * This is the code for the UI thingie that lets you manipulate the e-mail
-#. * addresses (and *only* the e-mail addresses) associated with an existing
-#. * contact.
-#.
-#: ../addressbook/gui/widgets/eab-popup-control.c:198
-msgid "(none)"
-msgstr "(none)"
-
-#: ../addressbook/gui/widgets/eab-popup-control.c:431
-msgid "Primary Email"
-msgstr "Primary Email"
+#: ../addressbook/gui/widgets/eab-gui-util.c:1042
+#: ../addressbook/gui/widgets/eab-gui-util.c:1060
+msgid "Contact information"
+msgstr "Contact information"
-#: ../addressbook/gui/widgets/eab-popup-control.c:567
-msgid "Select an Action"
-msgstr "Select an Action"
-
-#: ../addressbook/gui/widgets/eab-popup-control.c:575
-#, c-format
-msgid "Create a new contact \"%s\""
-msgstr "Create a new contact \"%s\""
-
-#: ../addressbook/gui/widgets/eab-popup-control.c:591
+#: ../addressbook/gui/widgets/eab-gui-util.c:1062
#, c-format
-msgid "Add address to existing contact \"%s\""
-msgstr "Add address to existing contact \"%s\""
+msgid "Contact information for %s"
+msgstr "Contact information for %s"
-#: ../addressbook/gui/widgets/eab-popup-control.c:869
+#: ../addressbook/gui/widgets/eab-popup-control.c:289
msgid "Querying Address Book..."
msgstr "Querying Address Book..."
-#: ../addressbook/gui/widgets/eab-popup-control.c:968
-msgid "Merge E-Mail Address"
-msgstr "Merge E-Mail Address"
-
#: ../addressbook/gui/widgets/eab-vcard-control.c:139
#, c-format
msgid "There is one other contact."
@@ -3486,27 +3656,57 @@ msgstr "Card View"
msgid "GTK Tree View"
msgstr "GTK Tree View"
-#: ../addressbook/importers/evolution-ldif-importer.c:486
-#: ../addressbook/importers/evolution-vcard-importer.c:249
-#: ../calendar/importers/icalendar-importer.c:311
-#: ../calendar/importers/icalendar-importer.c:643
+#: ../addressbook/importers/evolution-csv-importer.c:624
+#: ../mail/importers/evolution-outlook-importer.c:264
+#: ../mail/importers/netscape-importer.c:1252
+msgid "Importing..."
+msgstr "Importing..."
+
+#: ../addressbook/importers/evolution-csv-importer.c:826
+msgid "Outlook CSV or Tab (.csv, .tab)"
+msgstr "Outlook CSV or Tab (.csv, .tab)"
+
+#: ../addressbook/importers/evolution-csv-importer.c:827
+msgid "Outlook CSV and Tab Importer"
+msgstr "Outlook CSV and Tab Importer"
+
+#: ../addressbook/importers/evolution-csv-importer.c:835
+msgid "Mozilla CSV or Tab (.csv, .tab)"
+msgstr "Mozilla CSV or Tab (.csv, .tab)"
+
+#: ../addressbook/importers/evolution-csv-importer.c:836
+msgid "Mozilla CSV and Tab Importer"
+msgstr "Mozilla CSV and Tab Importer"
+
+#: ../addressbook/importers/evolution-csv-importer.c:844
+msgid "Evolution CSV or Tab (.csv, .tab)"
+msgstr "Evolution CSV or Tab (.csv, .tab)"
+
+#: ../addressbook/importers/evolution-csv-importer.c:845
+msgid "Evolution CSV and Tab Importer"
+msgstr "Evolution CSV and Tab Importer"
+
+#: ../addressbook/importers/evolution-ldif-importer.c:583
+#: ../addressbook/importers/evolution-vcard-importer.c:250
+#: ../calendar/importers/icalendar-importer.c:312
+#: ../calendar/importers/icalendar-importer.c:677
#: ../shell/shell.error.xml.h:6
msgid "Importing ..."
msgstr "Importing..."
-#: ../addressbook/importers/evolution-ldif-importer.c:652
+#: ../addressbook/importers/evolution-ldif-importer.c:754
msgid "LDAP Data Interchange Format (.ldif)"
msgstr "LDAP Data Interchange Format (.ldif)"
-#: ../addressbook/importers/evolution-ldif-importer.c:653
+#: ../addressbook/importers/evolution-ldif-importer.c:755
msgid "Evolution LDIF importer"
msgstr "Evolution LDIF importer"
-#: ../addressbook/importers/evolution-vcard-importer.c:529
+#: ../addressbook/importers/evolution-vcard-importer.c:547
msgid "VCard (.vcf, .gcrd)"
msgstr "VCard (.vcf, .gcrd)"
-#: ../addressbook/importers/evolution-vcard-importer.c:530
+#: ../addressbook/importers/evolution-vcard-importer.c:548
msgid "Evolution VCard Importer"
msgstr "Evolution VCard Importer"
@@ -3515,12 +3715,12 @@ msgstr "Evolution VCard Importer"
msgid "Print envelope"
msgstr "Print envelope"
-#: ../addressbook/printing/e-contact-print.c:1001
+#: ../addressbook/printing/e-contact-print.c:849
msgid "Print contacts"
msgstr "Print contacts"
-#: ../addressbook/printing/e-contact-print.c:1066
-#: ../addressbook/printing/e-contact-print.c:1093
+#: ../addressbook/printing/e-contact-print.c:939
+#: ../addressbook/printing/e-contact-print.c:967
msgid "Print contact"
msgstr "Print contact"
@@ -3565,11 +3765,11 @@ msgid "Format"
msgstr "Format"
#: ../addressbook/printing/e-contact-print.glade.h:11
-#: ../widgets/table/e-table-click-to-add.c:496
+#: ../widgets/table/e-table-click-to-add.c:495
#: ../widgets/table/e-table-field-chooser-dialog.c:91
-#: ../widgets/table/e-table-field-chooser-item.c:660
-#: ../widgets/table/e-table-field-chooser.c:93
-#: ../widgets/table/e-table-header-item.c:1831
+#: ../widgets/table/e-table-field-chooser-item.c:649
+#: ../widgets/table/e-table-field-chooser.c:91
+#: ../widgets/table/e-table-header-item.c:1913
#: ../widgets/table/e-table-selection-model.c:318
msgid "Header"
msgstr "Header"
@@ -3623,7 +3823,7 @@ msgid "Options"
msgstr "Options"
#: ../addressbook/printing/e-contact-print.glade.h:24
-#: ../e-util/eggtrayicon.c:118
+#: ../e-util/eggtrayicon.c:120
msgid "Orientation"
msgstr "Orientation"
@@ -3673,9 +3873,9 @@ msgstr "Shading"
#. FIXME: Take care of i18n
#: ../addressbook/printing/e-contact-print.glade.h:36
-#: ../plugins/exchange-operations/exchange-account-setup.c:917
-#: ../plugins/exchange-operations/exchange-calendar.c:205
-#: ../plugins/exchange-operations/exchange-contacts.c:176
+#: ../plugins/exchange-operations/exchange-account-setup.c:956
+#: ../plugins/exchange-operations/exchange-calendar.c:231
+#: ../plugins/exchange-operations/exchange-contacts.c:218
msgid "Size:"
msgstr "Size:"
@@ -3725,17 +3925,17 @@ msgstr "Contact Print Test"
msgid "This should test the contact print code"
msgstr "This should test the contact print code"
-#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:664
-#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:700
-#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:49
+#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:667
+#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:703
+#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:50
msgid "Can not open file"
msgstr "Can not open file"
-#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:43
+#: ../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:71
+#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:72
msgid "failed to open book"
msgstr "failed to open book"
@@ -3804,304 +4004,373 @@ msgid "No filename provided."
msgstr "No filename provided."
#: ../calendar/calendar.error.xml.h:1
-msgid " There are few attachments getting downloaded. Saving the appointment will cause the appointment to be saved without those pending attachments "
-msgstr " There are a few attachments getting downloaded. Saving the appointment will cause the appointment to be saved without those pending attachments "
+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
-msgid " There are few attachments getting downloaded. Saving the task will cause the task to be saved without those pending attachments "
-msgstr " There are a few attachments getting downloaded. Saving the task will cause the task to be saved without those pending attachments "
+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 "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: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:5
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:6
+#: ../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:7
+#: ../calendar/calendar.error.xml.h:5
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:8
+#: ../calendar/calendar.error.xml.h:6
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:9
+#: ../calendar/calendar.error.xml.h:7
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:10
+#: ../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:11
+#: ../calendar/calendar.error.xml.h:9
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:12
+#: ../calendar/calendar.error.xml.h:10
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:13
+#: ../calendar/calendar.error.xml.h:11
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:14
+#: ../calendar/calendar.error.xml.h:12
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:15
+#: ../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:16
+#: ../calendar/calendar.error.xml.h:14
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:17
+#: ../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:18
+#: ../calendar/calendar.error.xml.h:16
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:19
+#: ../calendar/calendar.error.xml.h:17
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:20
+#: ../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:21
+#: ../calendar/calendar.error.xml.h:19
+#: ../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:22
+#: ../calendar/calendar.error.xml.h:20
+#: ../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:23
+#: ../calendar/calendar.error.xml.h:21
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:24
+#: ../calendar/calendar.error.xml.h:22
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:25
+#: ../calendar/calendar.error.xml.h:23
+msgid "Cannot create a new event"
+msgstr "Cannot create a new event"
+
+#: ../calendar/calendar.error.xml.h:24
msgid "Delete calendar '{0}'?"
msgstr "Delete calendar '{0}'?"
+#: ../calendar/calendar.error.xml.h:25
+msgid "Delete memo list '{0}'?"
+msgstr "Delete memo list '{0}'?"
+
#: ../calendar/calendar.error.xml.h:26
msgid "Delete task list '{0}'?"
msgstr "Delete task list '{0}'?"
#: ../calendar/calendar.error.xml.h:27
-msgid "Discard Changes"
-msgstr "Discard Changes"
+msgid "Do _not Send"
+msgstr "Do _not Send"
#: ../calendar/calendar.error.xml.h:28
-msgid "Don't Send"
-msgstr "Don't Send"
-
-#: ../calendar/calendar.error.xml.h:29
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:30
+#: ../calendar/calendar.error.xml.h:29
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:31
+#: ../calendar/calendar.error.xml.h:30
msgid "Editor could not be loaded."
msgstr "Editor could not be loaded."
-#: ../calendar/calendar.error.xml.h:32
-msgid "Email invitations will be sent to all participants and allow them to RSVP."
-msgstr "Email invitations will be sent to all participants and allow them to RSVP."
-
-#: ../calendar/calendar.error.xml.h:33
+#: ../calendar/calendar.error.xml.h:31
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:34
+#: ../calendar/calendar.error.xml.h:32
+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
msgid "Error loading calendar"
msgstr "Error loading calendar"
+#: ../calendar/calendar.error.xml.h:34
+msgid "Error loading memo list"
+msgstr "Error loading memo list"
+
#: ../calendar/calendar.error.xml.h:35
msgid "Error loading task list"
msgstr "Error loading task list"
#: ../calendar/calendar.error.xml.h:36
-msgid "If you don't send a cancellation notice, the other participants may not know the journal has been deleted."
-msgstr "If you don't send a cancellation notice, the other participants may not know the journal has been deleted."
+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
-msgid "If you don't send a cancellation notice, the other participants may not know the meeting is canceled."
-msgstr "If you don't send a cancellation notice, the other participants may not know the meeting is cancelled."
+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
-msgid "If you don't send a cancellation notice, the other participants may not know the task has been deleted."
-msgstr "If you don't send a cancellation notice, the other participants may not know the task has been deleted."
+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
-msgid "Save Changes"
-msgstr "Save Changes"
+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
-#: ../ui/evolution-message-composer.xml.h:28
-msgid "Send"
-msgstr "Send"
+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
-msgid "Send Notice"
-msgstr "Send Notice"
+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
-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."
+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
-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."
+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:45
+#: ../calendar/calendar.error.xml.h:44
msgid "The Evolution calendar has quit unexpectedly."
msgstr "The Evolution calendar has quit unexpectedly."
+#: ../calendar/calendar.error.xml.h:45
+msgid "The Evolution memo has quit unexpectedly."
+msgstr "The Evolution memo has quit unexpectedly."
+
#: ../calendar/calendar.error.xml.h:46
msgid "The Evolution tasks have quit unexpectedly."
msgstr "The Evolution tasks have quit unexpectedly."
#: ../calendar/calendar.error.xml.h:47
-msgid "The calendar is not marked for offline usage"
-msgstr "The calendar is not marked for offline usage"
+msgid "The calendar is not marked for offline usage."
+msgstr "The calendar is not marked for offline usage."
#: ../calendar/calendar.error.xml.h:48
-msgid "The task list is not marked for offline usage"
-msgstr "The task list is not marked for offline usage"
+msgid "The memo list is not marked for offline usage"
+msgstr "The memo list is not marked for offline usage"
#: ../calendar/calendar.error.xml.h:49
+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
msgid "This calendar will be removed permanently."
msgstr "This calendar will be removed permanently."
-#: ../calendar/calendar.error.xml.h:50
+#: ../calendar/calendar.error.xml.h:51
+msgid "This memo list will be removed permanently."
+msgstr "This memo list will be removed permanently."
+
+#: ../calendar/calendar.error.xml.h:52
msgid "This task list will be removed permanently."
msgstr "This task list will be removed permanently."
-#: ../calendar/calendar.error.xml.h:51
+#: ../calendar/calendar.error.xml.h:53
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:52
+#: ../calendar/calendar.error.xml.h:54
+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
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:53
-msgid "Would you like to send a cancellation notice for this journal entry?"
+#: ../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:54
-msgid "Would you like to send all the participants a cancellation notice?"
+#: ../calendar/calendar.error.xml.h:57
+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:55
+#: ../calendar/calendar.error.xml.h:58
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:56
+#: ../calendar/calendar.error.xml.h:59
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:57
+#: ../calendar/calendar.error.xml.h:60
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:58
+#: ../calendar/calendar.error.xml.h:61
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:60
-msgid "You have made changes to this appointment, but not yet saved them."
-msgstr "You have made changes to this appointment, but not yet saved them."
+#: ../calendar/calendar.error.xml.h:62
+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
+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:61
-msgid "You have made changes to this task, but not yet saved them."
-msgstr "You have made changes to this task, but not yet saved them."
+#: ../calendar/calendar.error.xml.h:65
+msgid "You have changed this task, but not yet saved it."
+msgstr "You have changed this task, but not yet saved it."
-#: ../calendar/calendar.error.xml.h:62
+# calendar:prompt-save-task secondary
+#: ../calendar/calendar.error.xml.h:66
+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
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:63
+#: ../calendar/calendar.error.xml.h:68
+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
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:64
-#: ../ui/evolution-message-composer.xml.h:51
+#: ../calendar/calendar.error.xml.h:70
+#: ../composer/mail-composer.error.xml.h:27
+msgid "_Discard Changes"
+msgstr "_Discard Changes"
+
+#: ../calendar/calendar.error.xml.h:71
+#: ../ui/evolution-editor.xml.h:23
+#: ../ui/evolution-message-composer.xml.h:53
+#: ../ui/evolution-signature-editor.xml.h:15
msgid "_Save"
msgstr "_Save"
-#: ../calendar/calendar.error.xml.h:65
+#: ../calendar/calendar.error.xml.h:72
+msgid "_Save Changes"
+msgstr "_Save Changes"
+
+#: ../calendar/calendar.error.xml.h:73
#: ../composer/mail-composer.error.xml.h:31
-#: ../mail/mail.error.xml.h:123
+#: ../mail/mail.error.xml.h:132
msgid "_Send"
msgstr "_Send"
-#: ../calendar/calendar.error.xml.h:66
+#: ../calendar/calendar.error.xml.h:74
+msgid "_Send Notice"
+msgstr "_Send Notice"
+
+#: ../calendar/calendar.error.xml.h:75
msgid "{0}."
msgstr "{0}."
#: ../calendar/common/authentication.c:49
-#: ../calendar/gui/e-pub-utils.c:301
-#: ../smime/gui/component.c:48
+#: ../calendar/gui/e-pub-utils.c:323
+#: ../smime/gui/component.c:50
msgid "Enter password"
msgstr "Enter password"
-#: ../calendar/conduits/calendar/calendar-conduit.c:246
+#: ../calendar/conduits/calendar/calendar-conduit.c:255
msgid "Split Multi-Day Events:"
msgstr "Split Multi-Day Events:"
-#: ../calendar/conduits/calendar/calendar-conduit.c:1365
-#: ../calendar/conduits/calendar/calendar-conduit.c:1366
-#: ../calendar/conduits/todo/todo-conduit.c:879
-#: ../calendar/conduits/todo/todo-conduit.c:880
+#: ../calendar/conduits/calendar/calendar-conduit.c:1432
+#: ../calendar/conduits/calendar/calendar-conduit.c:1433
+#: ../calendar/conduits/memo/memo-conduit.c:854
+#: ../calendar/conduits/memo/memo-conduit.c:855
+#: ../calendar/conduits/todo/todo-conduit.c:1038
+#: ../calendar/conduits/todo/todo-conduit.c:1039
msgid "Could not start evolution-data-server"
msgstr "Could not start evolution-data-server"
-#: ../calendar/conduits/calendar/calendar-conduit.c:1474
-#: ../calendar/conduits/calendar/calendar-conduit.c:1477
+#: ../calendar/conduits/calendar/calendar-conduit.c:1529
+#: ../calendar/conduits/calendar/calendar-conduit.c:1532
msgid "Could not read pilot's Calendar application block"
msgstr "Could not read pilot's Calendar application block"
-#: ../calendar/conduits/todo/todo-conduit.c:234
+#: ../calendar/conduits/memo/memo-conduit.c:937
+#: ../calendar/conduits/memo/memo-conduit.c:940
+msgid "Could not read pilot's Memo application block"
+msgstr "Could not read pilot's Memo application block"
+
+#: ../calendar/conduits/memo/memo-conduit.c:976
+#: ../calendar/conduits/memo/memo-conduit.c:979
+msgid "Could not write pilot's Memo application block"
+msgstr "Could not write pilot's Memo application block"
+
+#: ../calendar/conduits/todo/todo-conduit.c:239
msgid "Default Priority:"
msgstr "Default Priority:"
-#: ../calendar/conduits/todo/todo-conduit.c:959
-#: ../calendar/conduits/todo/todo-conduit.c:962
+#: ../calendar/conduits/todo/todo-conduit.c:1112
+#: ../calendar/conduits/todo/todo-conduit.c:1115
msgid "Could not read pilot's ToDo application block"
msgstr "Could not read pilot's ToDo application block"
+#: ../calendar/conduits/todo/todo-conduit.c:1151
+#: ../calendar/conduits/todo/todo-conduit.c:1154
+msgid "Could not write pilot's ToDo application block"
+msgstr "Could not write pilot's ToDo application block"
+
#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
+#: ../plugins/itip-formatter/itip-formatter.c:2042
msgid "Calendar and Tasks"
msgstr "Calendar and Tasks"
#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-#: ../calendar/gui/calendar-component.c:1309
+#: ../calendar/gui/calendar-component.c:1361
msgid "Calendars"
msgstr "Calendars"
@@ -4130,28 +4399,49 @@ 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:10
-#: ../calendar/gui/e-tasks.c:1257
-#: ../calendar/gui/print.c:1822
-#: ../calendar/gui/tasks-component.c:519
-#: ../calendar/gui/tasks-component.c:1006
-#: ../calendar/gui/tasks-control.c:457
-#: ../calendar/importers/icalendar-importer.c:79
-#: ../calendar/importers/icalendar-importer.c:707
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:384
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:582
+#: ../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:323
+#: ../calendar/gui/e-memos.c:1084
+#: ../calendar/gui/gnome-cal.c:1637
+#: ../calendar/gui/memos-component.c:531
+#: ../calendar/gui/memos-component.c:1008
+#: ../calendar/gui/memos-control.c:340
+msgid "Memos"
+msgstr "Memos"
+
+#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
+#: ../calendar/gui/e-calendar-table.c:526
+#: ../calendar/gui/e-tasks.c:1348
+#: ../calendar/gui/gnome-cal.c:1509
+#: ../calendar/gui/print.c:1840
+#: ../calendar/gui/tasks-component.c:521
+#: ../calendar/gui/tasks-component.c:1012
+#: ../calendar/gui/tasks-control.c:483
+#: ../calendar/importers/icalendar-importer.c:80
+#: ../calendar/importers/icalendar-importer.c:741
+#: ../plugins/exchange-operations/exchange-folder.c:581
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:389
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:599
#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:12
msgid "Tasks"
msgstr "Tasks"
-#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
+#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:14
msgid "_Calendars"
msgstr "_Calendars"
-#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
+#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:15
#: ../views/tasks/galview.xml.h:3
msgid "_Tasks"
msgstr "_Tasks"
@@ -4160,25 +4450,29 @@ msgstr "_Tasks"
msgid "Evolution Calendar alarm notification service"
msgstr "Evolution Calendar alarm notification service"
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:115
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:116
msgid "minute"
msgid_plural "minutes"
msgstr[0] "minute"
msgstr[1] "minutes"
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:248
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:131
+#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:6
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:24
+#: ../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
+msgid "hours"
+msgid_plural "hours"
+msgstr[0] "hours"
+msgstr[1] "hours"
+
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:277
msgid "Start time"
msgstr "Start time"
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:347
-#, c-format
-msgid ""
-"<big><b>%s</b></big>\n"
-"%s until %s"
-msgstr ""
-"<big><b>%s</b></big>\n"
-"%s until %s"
-
#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:1
#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:4
msgid "Appointments"
@@ -4186,8 +4480,10 @@ msgstr "Appointments"
#. Location
#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:2
-#: ../calendar/gui/e-itip-control.c:1120
-#: ../plugins/itip-formatter/itip-view.c:884
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1619
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1625
+#: ../calendar/gui/e-itip-control.c:1113
+#: ../plugins/itip-formatter/itip-view.c:936
msgid "Location:"
msgstr "Location:"
@@ -4196,20 +4492,22 @@ msgid "Snooze _time:"
msgstr "Snooze _time:"
#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:4
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:6
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:10
#: ../filter/filter.glade.h:11
#: ../mail/mail-config.glade.h:158
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:13
-#: ../ui/evolution-addressbook.xml.h:34
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:15
+#: ../plugins/publish-calendar/publish-calendar.glade.h:21
+#: ../ui/evolution-addressbook.xml.h:51
#: ../ui/evolution-calendar.xml.h:41
-#: ../ui/evolution-composer-entries.xml.h:8
+#: ../ui/evolution-composer-entries.xml.h:14
+#: ../ui/evolution-editor.xml.h:18
#: ../ui/evolution-mail-messagedisplay.xml.h:5
-#: ../ui/evolution-message-composer.xml.h:44
-#: ../ui/evolution-signature-editor.xml.h:23
+#: ../ui/evolution-memos.xml.h:17
+#: ../ui/evolution-message-composer.xml.h:46
+#: ../ui/evolution-signature-editor.xml.h:13
#: ../ui/evolution-subscribe.xml.h:10
-#: ../ui/evolution-tasks.xml.h:23
-#: ../ui/evolution.xml.h:35
+#: ../ui/evolution-tasks.xml.h:25
+#: ../ui/evolution.xml.h:38
msgid "_Edit"
msgstr "_Edit"
@@ -4217,54 +4515,35 @@ msgstr "_Edit"
msgid "_Snooze"
msgstr "_Snooze"
-#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:6
-msgid "description of appointment"
-msgstr "description of appointment"
-
#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:7
msgid "location of appointment"
msgstr "location of appointment"
-#: ../calendar/gui/alarm-notify/alarm-queue.c:954
-msgid "Dismiss"
-msgstr "Dismiss"
-
-#: ../calendar/gui/alarm-notify/alarm-queue.c:955
-msgid "Dismiss All"
-msgstr "Dismiss All"
-
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1037
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1455
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1601
msgid "No summary available."
msgstr "No summary available."
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1046
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1048
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1464
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1466
msgid "No description available."
msgstr "No description available."
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1056
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1474
msgid "No location information available."
msgstr "No location information available."
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1072
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1533
#, c-format
-msgid ""
-"Alarm on %s\n"
-"%s\n"
-"Starting at %s\n"
-"Ending at %s"
-msgstr ""
-"Alarm on %s\n"
-"%s\n"
-"Starting at %s\n"
-"Ending at %s"
+msgid "You have %d alarms"
+msgstr "You have %d alarms"
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1175
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1199
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1699
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1727
msgid "Warning"
msgstr "Warning"
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1179
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1703
msgid ""
"Evolution does not support calendar reminders with\n"
"email notifications yet, but this reminder was\n"
@@ -4276,7 +4555,7 @@ msgstr ""
"configured to send an email. Evolution will display\n"
"a normal reminder dialogue box instead."
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1205
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1733
#, c-format
msgid ""
"An Evolution Calendar reminder is about to trigger. This reminder is configured to run the following program:\n"
@@ -4291,7 +4570,7 @@ msgstr ""
"\n"
"Are you sure you want to run this program?"
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1219
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1747
msgid "Do not ask me about this program again."
msgstr "Do not ask me about this program again."
@@ -4299,7 +4578,7 @@ msgstr "Do not ask me about this program again."
msgid "Could not initialize Bonobo"
msgstr "Could not initialise Bonobo"
-#: ../calendar/gui/alarm-notify/notify-main.c:151
+#: ../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"
@@ -4307,6 +4586,38 @@ msgstr "Could not create the alarm notify service factory"
msgid "invalid time"
msgstr "invalid time"
+#. Translator: Entire string is like "Pop up an alert %d hours before start of appointment"
+#: ../calendar/gui/alarm-notify/util.c:66
+#: ../calendar/gui/e-alarm-list.c:408
+#: ../calendar/gui/misc.c:113
+#, c-format
+msgid "%d hour"
+msgid_plural "%d hours"
+msgstr[0] "%d hour"
+msgstr[1] "%d hours"
+
+#. Translator: Entire string is like "Pop up an alert %d minutes before start of appointment"
+#: ../calendar/gui/alarm-notify/util.c:72
+#: ../calendar/gui/e-alarm-list.c:414
+#: ../calendar/gui/misc.c:119
+#, c-format
+msgid "%d minute"
+msgid_plural "%d minutes"
+msgstr[0] "%d minute"
+msgstr[1] "%d minutes"
+
+#. TRANSLATORS: here, "second" is the time division (like "minute"), not the ordinal number (like "third")
+#. Translator: Entire string is like "Pop up an alert %d seconds before start of appointment"
+#. TRANSLATORS: here, "second" is the time division (like "minute"), not the ordinal number (like "third")
+#: ../calendar/gui/alarm-notify/util.c:76
+#: ../calendar/gui/e-alarm-list.c:420
+#: ../calendar/gui/misc.c:123
+#, c-format
+msgid "%d second"
+msgid_plural "%d seconds"
+msgstr[0] "%d second"
+msgstr[1] "%d seconds"
+
#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:1
msgid "Alarm programs"
msgstr "Alarm programs"
@@ -4360,370 +4671,462 @@ msgid "Default reminder value"
msgstr "Default reminder value"
#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:14
-msgid "Free/busy server urls"
-msgstr "Free/busy server urls"
+msgid "Event Gradient"
+msgstr "Event Gradient"
#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:15
-msgid "Free/busy template url"
-msgstr "Free/busy template url"
+msgid "Event Transparency"
+msgstr "Event Transparency"
#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:16
+msgid "Free/busy server URLs"
+msgstr "Free/busy server URLs"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:17
+msgid "Free/busy template URL"
+msgstr "Free/busy template URL"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:18
+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:19
msgid "Hide completed tasks"
msgstr "Hide completed tasks"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:17
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:20
msgid "Hide task units"
msgstr "Hide task units"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:18
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:21
msgid "Hide task value"
msgstr "Hide task value"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:19
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:22
msgid "Horizontal pane position"
msgstr "Horizontal pane position"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:20
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:23
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:21
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:24
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:22
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:25
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:23
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:26
msgid "Last alarm time"
msgstr "Last alarm time"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:24
-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:27
+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:25
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:28
msgid "Marcus Bains Line"
msgstr "Marcus Bains Line"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:26
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:29
msgid "Marcus Bains Line Color - Day View"
msgstr "Marcus Bains Line Colour - Day View"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:27
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:30
msgid "Marcus Bains Line Color - Time bar"
msgstr "Marcus Bains Line Colour - Time bar"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:28
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:31
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:29
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:32
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:30
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:33
msgid "Month view horizontal pane position"
msgstr "Month view horizontal pane position"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:31
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:34
msgid "Month view vertical pane position"
msgstr "Month view vertical pane position"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:32
-msgid "Number of units for determining for a default reminder."
-msgstr "Number of units for determining for a default reminder."
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:35
+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:33
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:36
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:34
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:37
msgid "Overdue tasks color"
msgstr "Overdue tasks colour"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:35
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:38
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:36
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:39
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:37
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:40
+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:41
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:38
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:42
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:39
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:43
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:40
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:44
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:41
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:45
+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:46
+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:47
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:42
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:48
+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:49
msgid "Show display alarms in notification tray"
msgstr "Show display alarms in notification tray"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:43
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:50
+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:51
+#: ../mail/evolution-mail.schemas.in.in.h:81
+msgid "Show the \"Preview\" pane"
+msgstr "Show the \"Preview\" pane"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:52
+#: ../mail/evolution-mail.schemas.in.in.h:82
+msgid "Show the \"Preview\" pane."
+msgstr "Show the \"Preview\" pane."
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:53
+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:54
+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:55
msgid "Show week numbers in date navigator"
msgstr "Show week numbers in date navigator"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:44
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:56
msgid "Tasks due today color"
msgstr "Tasks due today colour"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:45
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:57
msgid "Tasks vertical pane position"
msgstr "Tasks vertical pane position"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:46
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:59
+#, 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:60
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:48
-#, 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:49
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:61
msgid "Time divisions"
msgstr "Time divisions"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:50
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:62
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:51
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:63
msgid "Timezone"
msgstr "Timezone"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:52
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:64
+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:65
msgid "Twenty four hour time format"
msgstr "Twenty four hour time format"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:53
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:66
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:54
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:67
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:56
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:69
msgid "Week start"
msgstr "Week start"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:57
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:70
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:58
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:71
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:59
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:72
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:60
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:73
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:61
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:74
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:62
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:75
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:63
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:76
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:64
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:77
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:65
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:78
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:66
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:79
+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:80
+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:81
+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:82
+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:83
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:67
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:84
+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:85
+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:86
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:68
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:87
+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:88
msgid "Work days"
msgstr "Work days"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:69
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:89
msgid "Workday end hour"
msgstr "Workday end hour"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:70
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:90
msgid "Workday end minute"
msgstr "Workday end minute"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:71
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:91
msgid "Workday start hour"
msgstr "Workday start hour"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:72
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:92
msgid "Workday start minute"
msgstr "Workday start minute"
-#: ../calendar/gui/cal-search-bar.c:49
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:93
+msgid "daylight savings time"
+msgstr "daylight savings time"
+
+#: ../calendar/gui/cal-search-bar.c:53
msgid "Summary contains"
msgstr "Summary contains"
-#: ../calendar/gui/cal-search-bar.c:50
+#: ../calendar/gui/cal-search-bar.c:54
msgid "Description contains"
msgstr "Description contains"
-#: ../calendar/gui/cal-search-bar.c:51
+#: ../calendar/gui/cal-search-bar.c:55
+msgid "Category is"
+msgstr "Category is"
+
+#: ../calendar/gui/cal-search-bar.c:56
msgid "Comment contains"
msgstr "Comment contains"
-#: ../calendar/gui/cal-search-bar.c:52
+#: ../calendar/gui/cal-search-bar.c:57
msgid "Location contains"
msgstr "Location contains"
-#: ../calendar/gui/cal-search-bar.c:350
+#: ../calendar/gui/cal-search-bar.c:426
msgid "Unmatched"
msgstr "Unmatched"
#: ../calendar/gui/calendar-commands.c:119
-#: ../calendar/gui/calendar-component.c:708
-#: ../calendar/gui/dialogs/calendar-setup.c:367
-#: ../calendar/gui/gnome-cal.c:2094
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:383
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:413
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:581
-msgid "Calendar"
-msgstr "Calendar"
+#: ../calendar/gui/print.c:2522
+#: ../ui/evolution-addressbook.xml.h:26
+#: ../ui/evolution-calendar.xml.h:20
+#: ../ui/evolution-mail-message.xml.h:74
+#: ../ui/evolution-memos.xml.h:11
+#: ../ui/evolution-tasks.xml.h:14
+msgid "Print"
+msgstr "Print"
-#: ../calendar/gui/calendar-commands.c:354
+#: ../calendar/gui/calendar-commands.c:348
msgid "This operation will permanently erase all events older than the selected amount of time. If you continue, you will not be able to recover these events."
msgstr "This operation will permanently erase all events older than the selected amount of time. If you continue, you will not be able to recover these events."
-#: ../calendar/gui/calendar-commands.c:360
+#: ../calendar/gui/calendar-commands.c:354
msgid "Purge events older than"
msgstr "Purge events older than"
-#: ../calendar/gui/calendar-commands.c:365
+#: ../calendar/gui/calendar-commands.c:359
#: ../calendar/gui/dialogs/alarm-dialog.glade.h:20
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:12
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:11
#: ../filter/filter.glade.h:14
-#: ../plugins/calendar-http/calendar-http.c:265
+#: ../plugins/calendar-http/calendar-http.c:288
#: ../plugins/calendar-weather/calendar-weather.c:565
-#: ../widgets/misc/e-send-options.glade.h:36
+#: ../widgets/misc/e-send-options.glade.h:38
msgid "days"
msgstr "days"
#. Create the On the web source group
+#. Create the LDAP source group
#. Create the Webcal source group
#. Create the LDAP source group
-#: ../calendar/gui/calendar-component.c:234
-#: ../calendar/gui/migration.c:489
-#: ../calendar/gui/migration.c:582
-#: ../calendar/gui/tasks-component.c:215
+#: ../calendar/gui/calendar-component.c:260
+#: ../calendar/gui/memos-component.c:222
+#: ../calendar/gui/migration.c:507
+#: ../calendar/gui/migration.c:600
+#: ../calendar/gui/migration.c:1108
+#: ../calendar/gui/tasks-component.c:217
msgid "On The Web"
msgstr "On The Web"
-#: ../calendar/gui/calendar-component.c:252
-#: ../calendar/gui/migration.c:391
+#: ../calendar/gui/calendar-component.c:278
+#: ../calendar/gui/migration.c:406
msgid "Birthdays & Anniversaries"
msgstr "Birthdays & Anniversaries"
#. Create the weather group
-#: ../calendar/gui/calendar-component.c:258
+#: ../calendar/gui/calendar-component.c:284
#: ../plugins/calendar-weather/calendar-weather.c:100
msgid "Weather"
msgstr "Weather"
-#: ../calendar/gui/calendar-component.c:535
-#: ../calendar/gui/dialogs/calendar-setup.c:449
-msgid "New Calendar"
-msgstr "New Calendar"
+#: ../calendar/gui/calendar-component.c:582
+msgid "_New Calendar"
+msgstr "_New Calendar"
-#: ../calendar/gui/calendar-component.c:858
+#: ../calendar/gui/calendar-component.c:899
msgid "Failed upgrading calendars."
msgstr "Failed upgrading calendars."
-#: ../calendar/gui/calendar-component.c:1154
+#: ../calendar/gui/calendar-component.c:1198
#, 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:1170
+#: ../calendar/gui/calendar-component.c:1214
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:1284
+#: ../calendar/gui/calendar-component.c:1336
msgid "Calendar Source Selector"
msgstr "Calendar Source Selector"
-#: ../calendar/gui/calendar-component.c:1475
+#: ../calendar/gui/calendar-component.c:1544
msgid "New appointment"
msgstr "New appointment"
-#: ../calendar/gui/calendar-component.c:1476
+#: ../calendar/gui/calendar-component.c:1545
msgid "_Appointment"
msgstr "_Appointment"
-#: ../calendar/gui/calendar-component.c:1477
+#: ../calendar/gui/calendar-component.c:1546
msgid "Create a new appointment"
msgstr "Create a new appointment"
-#: ../calendar/gui/calendar-component.c:1483
+#: ../calendar/gui/calendar-component.c:1552
msgid "New meeting"
msgstr "New meeting"
-#: ../calendar/gui/calendar-component.c:1484
+#: ../calendar/gui/calendar-component.c:1553
msgid "M_eeting"
msgstr "M_eeting"
-#: ../calendar/gui/calendar-component.c:1485
+#: ../calendar/gui/calendar-component.c:1554
msgid "Create a new meeting request"
msgstr "Create a new meeting request"
-#: ../calendar/gui/calendar-component.c:1491
+#: ../calendar/gui/calendar-component.c:1560
msgid "New all day appointment"
msgstr "New all day appointment"
-#: ../calendar/gui/calendar-component.c:1492
+#: ../calendar/gui/calendar-component.c:1561
msgid "All Day A_ppointment"
msgstr "All Day A_ppointment"
-#: ../calendar/gui/calendar-component.c:1493
+#: ../calendar/gui/calendar-component.c:1562
msgid "Create a new all-day appointment"
msgstr "Create a new all-day appointment"
-#: ../calendar/gui/calendar-component.c:1499
+#: ../calendar/gui/calendar-component.c:1568
msgid "New calendar"
msgstr "New calendar"
-#: ../calendar/gui/calendar-component.c:1500
+#: ../calendar/gui/calendar-component.c:1569
msgid "Cale_ndar"
msgstr "Cale_ndar"
-#: ../calendar/gui/calendar-component.c:1501
+#: ../calendar/gui/calendar-component.c:1570
msgid "Create a new calendar"
msgstr "Create a new calendar"
@@ -4743,23 +5146,27 @@ msgstr "Week View"
msgid "Month View"
msgstr "Month View"
-#: ../calendar/gui/comp-editor-factory.c:420
+#: ../calendar/gui/comp-editor-factory.c:415
msgid "Error while opening the calendar"
msgstr "Error while opening the calendar"
-#: ../calendar/gui/comp-editor-factory.c:426
+#: ../calendar/gui/comp-editor-factory.c:421
msgid "Method not supported when opening the calendar"
msgstr "Method not supported when opening the calendar"
-#: ../calendar/gui/comp-editor-factory.c:432
+#: ../calendar/gui/comp-editor-factory.c:427
msgid "Permission denied to open the calendar"
msgstr "Permission denied to open the calendar"
-#: ../calendar/gui/comp-editor-factory.c:444
-#: ../shell/e-shell.c:1267
+#: ../calendar/gui/comp-editor-factory.c:439
+#: ../shell/e-shell.c:1272
msgid "Unknown error"
msgstr "Unknown error"
+#: ../calendar/gui/dialogs/alarm-dialog.c:615
+msgid "Edit Alarm"
+msgstr "Edit Alarm"
+
#: ../calendar/gui/dialogs/alarm-dialog.glade.h:1
msgid "<b>Alarm</b>"
msgstr "<b>Alarm</b>"
@@ -4789,17 +5196,17 @@ msgid "Mes_sage:"
msgstr "Mes_sage:"
#: ../calendar/gui/dialogs/alarm-dialog.glade.h:8
-#: ../calendar/gui/e-alarm-list.c:444
+#: ../calendar/gui/e-alarm-list.c:446
msgid "Play a sound"
msgstr "Play a sound"
#: ../calendar/gui/dialogs/alarm-dialog.glade.h:9
-#: ../calendar/gui/e-alarm-list.c:448
+#: ../calendar/gui/e-alarm-list.c:450
msgid "Pop up an alert"
msgstr "Pop up an alert"
#: ../calendar/gui/dialogs/alarm-dialog.glade.h:10
-#: ../calendar/gui/e-alarm-list.c:456
+#: ../calendar/gui/e-alarm-list.c:458
msgid "Run a program"
msgstr "Run a program"
@@ -4808,7 +5215,7 @@ msgid "Send To:"
msgstr "Send To:"
#: ../calendar/gui/dialogs/alarm-dialog.glade.h:12
-#: ../calendar/gui/e-alarm-list.c:452
+#: ../calendar/gui/e-alarm-list.c:454
msgid "Send an email"
msgstr "Send an email"
@@ -4836,8 +5243,10 @@ msgstr "after"
msgid "before"
msgstr "before"
+#. TRANSLATORS: Entire string is for example:
+#. 'This appointment recurs/Every[x][day(s)][for][1]occurrences' (dropdown menu options are in [square brackets])
#: ../calendar/gui/dialogs/alarm-dialog.glade.h:19
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:7
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:13
msgid "day(s)"
msgstr "day(s)"
@@ -4853,14 +5262,6 @@ msgstr "extra times every"
msgid "hour(s)"
msgstr "hour(s)"
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:24
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:13
-#: ../filter/filter.glade.h:15
-#: ../plugins/calendar-http/calendar-http.c:264
-#: ../plugins/calendar-weather/calendar-weather.c:564
-msgid "hours"
-msgstr "hours"
-
#: ../calendar/gui/dialogs/alarm-dialog.glade.h:25
msgid "minute(s)"
msgstr "minute(s)"
@@ -4869,7 +5270,7 @@ msgstr "minute(s)"
msgid "start of appointment"
msgstr "start of appointment"
-#: ../calendar/gui/dialogs/alarm-list-dialog.c:199
+#: ../calendar/gui/dialogs/alarm-list-dialog.c:235
msgid "Action/Trigger"
msgstr "Action/Trigger"
@@ -4878,492 +5279,347 @@ msgid "A_dd"
msgstr "A_dd"
#: ../calendar/gui/dialogs/alarm-list-dialog.glade.h:2
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
+#: ../calendar/gui/dialogs/event-page.glade.h:4
+#: ../ui/evolution-event-editor.xml.h:1
msgid "Alarms"
msgstr "Alarms"
-#: ../calendar/gui/dialogs/cal-attachment-bar.c:110
-#: ../composer/e-msg-composer-attachment-bar.c:105
-#: ../widgets/misc/e-attachment-bar.c:106
-#, c-format
-msgid "%.0fK"
-msgstr "%.0fK"
-
-#: ../calendar/gui/dialogs/cal-attachment-bar.c:113
-#: ../composer/e-msg-composer-attachment-bar.c:108
-#: ../widgets/misc/e-attachment-bar.c:109
-#, c-format
-msgid "%.0fM"
-msgstr "%.0fM"
-
-#: ../calendar/gui/dialogs/cal-attachment-bar.c:116
-#: ../composer/e-msg-composer-attachment-bar.c:111
-#: ../widgets/misc/e-attachment-bar.c:112
-#, c-format
-msgid "%.0fG"
-msgstr "%.0fG"
-
-#: ../calendar/gui/dialogs/cal-attachment-bar.c:311
-#: ../calendar/gui/dialogs/cal-attachment-bar.c:1106
-#: ../calendar/gui/dialogs/comp-editor.c:2440
-#: ../composer/e-msg-composer-attachment-bar.c:307
-#: ../mail/em-utils.c:444
-#: ../mail/em-utils.c:481
-#: ../widgets/misc/e-attachment-bar.c:341
-msgid "attachment"
-msgstr "attachment"
-
-#: ../calendar/gui/dialogs/cal-attachment-bar.c:473
-#: ../calendar/gui/dialogs/comp-editor.c:1083
-#: ../calendar/gui/dialogs/meeting-page.c:887
-#: ../composer/e-msg-composer-attachment-bar.c:470
-#: ../composer/e-msg-composer.c:3400
-#: ../plugins/groupwise-features/junk-settings.glade.h:8
-#: ../plugins/groupwise-features/properties.glade.h:14
-#: ../widgets/table/e-table-config.glade.h:18
-msgid "_Remove"
-msgstr "_Remove"
-
-#: ../calendar/gui/dialogs/cal-attachment-bar.c:474
-#: ../calendar/gui/dialogs/comp-editor.c:1084
-#: ../composer/e-msg-composer-attachment-bar.c:471
-#: ../composer/e-msg-composer.c:3401
-#: ../mail/em-folder-tree.c:2047
-#: ../ui/evolution-mail-list.xml.h:29
-msgid "_Properties"
-msgstr "_Properties"
-
-#: ../calendar/gui/dialogs/cal-attachment-bar.c:476
-#: ../calendar/gui/dialogs/comp-editor.c:1086
-#: ../composer/e-msg-composer-attachment-bar.c:473
-#: ../composer/e-msg-composer.c:3403
-msgid "_Add attachment..."
-msgstr "_Add attachment..."
-
-#: ../calendar/gui/dialogs/cal-attachment-bar.c:736
-#: ../composer/e-msg-composer-attachment-bar.c:740
-#: ../widgets/misc/e-attachment-bar.c:963
-msgid "Attachment Bar"
-msgstr "Attachment Bar"
-
-#: ../calendar/gui/dialogs/cal-attachment-select-file.c:96
-#: ../calendar/gui/dialogs/cal-attachment-select-file.c:115
-#: ../calendar/gui/dialogs/cal-attachment.glade.h:6
-#: ../composer/e-msg-composer-attachment.glade.h:6
-#: ../composer/e-msg-composer-select-file.c:97
-#: ../composer/e-msg-composer-select-file.c:117
-#: ../widgets/misc/e-attachment.glade.h:6
-msgid "Suggest automatic display of attachment"
-msgstr "Suggest automatic display of attachment"
+#: ../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
+msgid "_Suggest automatic display of attachment"
+msgstr "_Suggest automatic display of attachment"
-#: ../calendar/gui/dialogs/cal-attachment-select-file.c:190
-#: ../composer/e-msg-composer-select-file.c:241
+#: ../calendar/gui/dialogs/cal-attachment-select-file.c:191
msgid "Attach file(s)"
msgstr "Attach file(s)"
-#: ../calendar/gui/dialogs/cal-attachment.c:210
-#: ../calendar/gui/dialogs/cal-attachment.c:226
-#: ../calendar/gui/dialogs/cal-attachment.c:319
-#: ../calendar/gui/dialogs/cal-attachment.c:335
-#: ../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:221
-#: ../widgets/misc/e-attachment.c:237
-#: ../widgets/misc/e-attachment.c:425
-#: ../widgets/misc/e-attachment.c:441
-#, c-format
-msgid "Cannot attach file %s: %s"
-msgstr "Cannot attach file %s: %s"
-
-#: ../calendar/gui/dialogs/cal-attachment.c:218
-#: ../calendar/gui/dialogs/cal-attachment.c:327
-#: ../composer/e-msg-composer-attachment.c:195
-#: ../composer/e-msg-composer-attachment.c:305
-#: ../widgets/misc/e-attachment.c:229
-#: ../widgets/misc/e-attachment.c:433
-#, c-format
-msgid "Cannot attach file %s: not a regular file"
-msgstr "Cannot attach file %s: not a regular file"
-
-#: ../calendar/gui/dialogs/cal-attachment.glade.h:2
-#: ../composer/e-msg-composer-attachment.glade.h:2
-#: ../widgets/misc/e-attachment.glade.h:2
-msgid "Attachment Properties"
-msgstr "Attachment Properties"
-
-#: ../calendar/gui/dialogs/cal-attachment.glade.h:3
-#: ../calendar/gui/e-cal-component-preview.c:267
-#: ../calendar/gui/e-itip-control.c:1166
-#: ../calendar/gui/e-itip-control.glade.h:6
-#: ../composer/e-msg-composer-attachment.glade.h:3
-#: ../mail/mail-config.glade.h:69
-#: ../widgets/misc/e-attachment.glade.h:3
-msgid "Description:"
-msgstr "Description:"
-
-#: ../calendar/gui/dialogs/cal-attachment.glade.h:4
-#: ../composer/e-msg-composer-attachment.glade.h:4
-#: ../widgets/misc/e-attachment.glade.h:4
-msgid "File name:"
-msgstr "File name:"
-
-#: ../calendar/gui/dialogs/cal-attachment.glade.h:5
-#: ../composer/e-msg-composer-attachment.glade.h:5
-#: ../widgets/misc/e-attachment.glade.h:5
-msgid "MIME type:"
-msgstr "MIME type:"
-
-#. g_object_set((GObject *)renderer, "activatable", TRUE, NULL);
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:576
-#: ../mail/em-account-prefs.c:504
-#: ../mail/em-composer-prefs.c:891
-#: ../plugins/plugin-manager/plugin-manager.c:213
-msgid "Enabled"
-msgstr "Enabled"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:730
-msgid "Are you sure you want to remove this URL?"
-msgstr "Are you sure you want to remove this URL?"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:733
-msgid "Remove"
-msgstr "Remove"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:738
-msgid "Don't Remove"
-msgstr "Don't Remove"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:787
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:820
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:853
-#: ../mail/em-account-prefs.c:330
-#: ../mail/em-account-prefs.c:375
-#: ../mail/em-account-prefs.c:406
-msgid "Disable"
-msgstr "Disable"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:787
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:820
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:855
-#: ../mail/em-account-prefs.c:330
-#: ../mail/em-account-prefs.c:375
-#: ../mail/em-account-prefs.c:408
-msgid "Enable"
-msgstr "Enable"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:2
-msgid "05 minutes"
-msgstr "05 minutes"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:3
-msgid "10 minutes"
-msgstr "10 minutes"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:4
-msgid "15 minutes"
-msgstr "15 minutes"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:486
+msgid "Selected Calendars for Alarms"
+msgstr "Selected Calendars for Alarms"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:5
-msgid "30 minutes"
-msgstr "30 minutes"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:6
-msgid "60 minutes"
-msgstr "60 minutes"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
+msgid ""
+"60 minutes\n"
+"30 minutes\n"
+"15 minutes\n"
+"10 minutes\n"
+"05 minutes"
+msgstr ""
+"60 minutes\n"
+"30 minutes\n"
+"15 minutes\n"
+"10 minutes\n"
+"05 minutes"
#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
-msgid "<b>Alerts</b>"
-msgstr "<b>Alerts</b>"
+#, no-c-format
+msgid "<i>%u and %d will be replaced by user and domain from the email address.</i>"
+msgstr "<i>%u and %d will be replaced by user and domain from the email address.</i>"
#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
-msgid "<b>Default Free/Busy Server</b>"
-msgstr "<b>Default Free/Busy Server</b>"
+#: ../mail/mail-config.glade.h:8
+msgid "<span weight=\"bold\">Alerts</span>"
+msgstr "<span weight=\"bold\">Alerts</span>"
#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
-msgid "<b>General</b>"
-msgstr "<b>General</b>"
+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
-msgid "<b>Publishing</b>"
-msgstr "<b>Publishing</b>"
+#: ../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>"
#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
-msgid "<b>Task List</b>"
-msgstr "<b>Task List</b>"
+msgid "<span weight=\"bold\">Task List</span>"
+msgstr "<span weight=\"bold\">Task List</span>"
#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-msgid "<b>Time</b>"
-msgstr "<b>Time</b>"
+msgid "<span weight=\"bold\">Time</span>"
+msgstr "<span weight=\"bold\">Time</span>"
#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
-msgid "<b>Work Week</b>"
-msgstr "<b>Work Week</b>"
+msgid "<span weight=\"bold\">Work Week</span>"
+msgstr "<span weight=\"bold\">Work Week</span>"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-#, no-c-format
-msgid "<i>%u and %d will be replaced by user and domain from the email address.</i>"
-msgstr "<i>%u and %d will be replaced by user and domain from the email address.</i>"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
+msgid "Adjust for daylight sa_ving time"
+msgstr "Adjust for daylight sa_ving time"
#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
-msgid "Calendar and Tasks Settings"
-msgstr "Calendar and Tasks Settings"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-msgid "Color for overdue tasks"
-msgstr "Colour for overdue tasks"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-msgid "Color for tasks due today"
-msgstr "Colour for tasks due today"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
msgid "Day _ends:"
msgstr "Day _ends:"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
-msgid "Days"
-msgstr "Days"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
msgid "Display"
msgstr "Display"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
-#: ../mail/mail-config.glade.h:74
-msgid "E_nable"
-msgstr "E_nable"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
-msgid "Free/Busy"
-msgstr "Free/Busy"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-#: ../calendar/gui/dialogs/recurrence-page.c:1048
-#: ../calendar/gui/e-itip-control.c:734
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
+#: ../calendar/gui/dialogs/recurrence-page.c:1088
+#: ../calendar/gui/e-itip-control.c:730
msgid "Friday"
msgstr "Friday"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
-msgid "Hours"
-msgstr "Hours"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
-msgid "Minutes"
-msgstr "Minutes"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
+msgid ""
+"Minutes\n"
+"Hours\n"
+"Days"
+msgstr ""
+"Minutes\n"
+"Hours\n"
+"Days"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
-#: ../calendar/gui/dialogs/recurrence-page.c:1044
-#: ../calendar/gui/e-itip-control.c:730
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
+#: ../calendar/gui/dialogs/recurrence-page.c:1084
+#: ../calendar/gui/e-itip-control.c:726
msgid "Monday"
msgstr "Monday"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
-msgid "Publishing Table"
-msgstr "Publishing Table"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
+msgid ""
+"Monday\n"
+"Tuesday\n"
+"Wednesday\n"
+"Thursday\n"
+"Friday\n"
+"Saturday\n"
+"Sunday"
+msgstr ""
+"Monday\n"
+"Tuesday\n"
+"Wednesday\n"
+"Thursday\n"
+"Friday\n"
+"Saturday\n"
+"Sunday"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:4
+#: ../mail/mail-config.glade.h:105
+msgid "Pick a color"
+msgstr "Pick a colour"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
+#. Sunday
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
msgid "S_un"
msgstr "S_un"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-#: ../calendar/gui/dialogs/recurrence-page.c:1049
-#: ../calendar/gui/e-itip-control.c:735
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+#: ../calendar/gui/dialogs/recurrence-page.c:1089
+#: ../calendar/gui/e-itip-control.c:731
msgid "Saturday"
msgstr "Saturday"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
+msgid "Select the calendars for alarm notification"
+msgstr "Select the calendars for alarm notification"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
msgid "Sh_ow a reminder"
msgstr "Sh_ow a reminder"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
msgid "Show week _numbers in date navigator"
msgstr "Show week _numbers in date navigator"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
-#: ../calendar/gui/dialogs/recurrence-page.c:1050
-#: ../calendar/gui/e-itip-control.c:729
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
+#: ../calendar/gui/dialogs/recurrence-page.c:1090
+#: ../calendar/gui/e-itip-control.c:725
msgid "Sunday"
msgstr "Sunday"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
msgid "T_asks due today:"
msgstr "T_asks due today:"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
+#. Thursday
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
msgid "T_hu"
msgstr "T_hu"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
msgid "Template:"
msgstr "Template:"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
-#: ../calendar/gui/dialogs/recurrence-page.c:1047
-#: ../calendar/gui/e-itip-control.c:733
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
+#: ../calendar/gui/dialogs/recurrence-page.c:1087
+#: ../calendar/gui/e-itip-control.c:729
msgid "Thursday"
msgstr "Thursday"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
+#: ../calendar/gui/dialogs/event-page.glade.h:13
msgid "Time _zone:"
msgstr "Time _zone:"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
msgid "Time format:"
msgstr "Time format:"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
-#: ../calendar/gui/dialogs/recurrence-page.c:1045
-#: ../calendar/gui/e-itip-control.c:731
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
+#: ../calendar/gui/dialogs/recurrence-page.c:1085
+#: ../calendar/gui/e-itip-control.c:727
msgid "Tuesday"
msgstr "Tuesday"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
-msgid "W_eek starts:"
-msgstr "W_eek starts:"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
-#: ../calendar/gui/dialogs/recurrence-page.c:1046
-#: ../calendar/gui/e-itip-control.c:732
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
+#: ../calendar/gui/dialogs/recurrence-page.c:1086
+#: ../calendar/gui/e-itip-control.c:728
msgid "Wednesday"
msgstr "Wednesday"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
+#. A weekday like "Monday" follows
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
+msgid "Wee_k starts on:"
+msgstr "Wee_k starts on:"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
msgid "Work days:"
msgstr "Work days:"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
msgid "_12 hour (AM/PM)"
msgstr "_12 hour (AM/PM)"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
msgid "_24 hour"
msgstr "_24 hour"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
-msgid "_Add URL"
-msgstr "_Add URL"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
msgid "_Ask for confirmation when deleting items"
msgstr "_Ask for confirmation when deleting items"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
msgid "_Compress weekends in month view"
msgstr "_Compress weekends in month view"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
msgid "_Day begins:"
msgstr "_Day begins:"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
+#. Friday
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
msgid "_Fri"
msgstr "_Fri"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:59
msgid "_Hide completed tasks after"
msgstr "_Hide completed tasks after"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
+#. Monday
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:61
msgid "_Mon"
msgstr "_Mon"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:62
msgid "_Overdue tasks:"
msgstr "_Overdue tasks:"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
+#. Saturday
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:64
msgid "_Sat"
msgstr "_Sat"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:57
-msgid "_Show appointment end times in week and month views"
-msgstr "_Show appointment end times in week and month views"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:65
+msgid "_Show appointment end times in week and month view"
+msgstr "_Show appointment end times in week and month view"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:66
msgid "_Time divisions:"
msgstr "_Time divisions:"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:59
+#. Tuesday
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:68
msgid "_Tue"
msgstr "_Tue"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:60
+#. Wednesday
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:70
msgid "_Wed"
msgstr "_Wed"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:61
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:71
msgid "before every appointment"
msgstr "before every appointment"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:62
-msgid "option menu to choose reminder units"
-msgstr "option menu to choose reminder units"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:63
-msgid "option menu to choose time units"
-msgstr "option menu to choose time units"
-
-#: ../calendar/gui/dialogs/calendar-setup.c:287
-msgid "Copy calendar contents locally for offline operation"
-msgstr "Copy calendar contents locally for offline operation"
+#: ../calendar/gui/dialogs/calendar-setup.c:288
+msgid "Cop_y calendar contents locally for offline operation"
+msgstr "Cop_y calendar contents locally for offline operation"
#: ../calendar/gui/dialogs/calendar-setup.c:290
-msgid "Copy task list contents locally for offline operation"
-msgstr "Copy task list contents locally for offline operation"
+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:341
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:4
+#: ../calendar/gui/dialogs/calendar-setup.c:292
+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:343
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:3
msgid "C_olor:"
msgstr "C_olour:"
-#: ../calendar/gui/dialogs/calendar-setup.c:378
-msgid "Tasks List"
-msgstr "Tasks List"
+#: ../calendar/gui/dialogs/calendar-setup.c:380
+msgid "Task List"
+msgstr "Task List"
-#: ../calendar/gui/dialogs/calendar-setup.c:447
+#: ../calendar/gui/dialogs/calendar-setup.c:391
+msgid "Memo List"
+msgstr "Memo List"
+
+#: ../calendar/gui/dialogs/calendar-setup.c:479
msgid "Calendar Properties"
msgstr "Calendar Properties"
-#: ../calendar/gui/dialogs/calendar-setup.c:515
+#: ../calendar/gui/dialogs/calendar-setup.c:481
+msgid "New Calendar"
+msgstr "New Calendar"
+
+#: ../calendar/gui/dialogs/calendar-setup.c:566
msgid "Task List Properties"
msgstr "Task List Properties"
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:2
+#: ../calendar/gui/dialogs/calendar-setup.c:632
+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:3
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:2
msgid "Add Task List"
msgstr "Add Task List"
#: ../calendar/gui/dialogs/calendar-setup.glade.h:5
-#: ../mail/mail-config.glade.h:105
-msgid "Pick a color"
-msgstr "Pick a colour"
-
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:6
msgid "_Add Calendar"
msgstr "_Add Calendar"
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:7
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:6
msgid "_Add Task List"
msgstr "_Add Task List"
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:9
-#: ../plugins/calendar-http/calendar-http.c:248
+#: ../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:11
-#: ../plugins/calendar-http/calendar-http.c:120
+#: ../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:15
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:14
#: ../filter/filter.glade.h:21
-#: ../plugins/calendar-http/calendar-http.c:266
+#: ../plugins/calendar-http/calendar-http.c:289
#: ../plugins/calendar-weather/calendar-weather.c:566
msgid "weeks"
msgstr "weeks"
@@ -5412,147 +5668,180 @@ 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:464
+#: ../calendar/gui/dialogs/comp-editor-page.c:515
#, c-format
msgid "Validation error: %s"
msgstr "Validation error: %s"
#: ../calendar/gui/dialogs/comp-editor-util.c:187
-#: ../calendar/gui/print.c:2261
+#: ../calendar/gui/print.c:2280
msgid " to "
msgstr " to "
#: ../calendar/gui/dialogs/comp-editor-util.c:191
-#: ../calendar/gui/print.c:2265
+#: ../calendar/gui/print.c:2284
msgid " (Completed "
msgstr " (Completed "
#: ../calendar/gui/dialogs/comp-editor-util.c:193
-#: ../calendar/gui/print.c:2267
+#: ../calendar/gui/print.c:2286
msgid "Completed "
msgstr "Completed "
#: ../calendar/gui/dialogs/comp-editor-util.c:198
-#: ../calendar/gui/print.c:2272
+#: ../calendar/gui/print.c:2291
msgid " (Due "
msgstr " (Due "
#: ../calendar/gui/dialogs/comp-editor-util.c:200
-#: ../calendar/gui/print.c:2274
+#: ../calendar/gui/print.c:2293
msgid "Due "
msgstr "Due "
-#: ../calendar/gui/dialogs/comp-editor.c:190
-#: ../composer/e-msg-composer.c:2664
+#: ../calendar/gui/dialogs/comp-editor.c:207
+#: ../composer/e-msg-composer.c:2888
#, c-format
msgid "Attached message - %s"
msgstr "Attached message - %s"
#. translators, this count will always be >1
-#: ../calendar/gui/dialogs/comp-editor.c:195
-#: ../calendar/gui/dialogs/comp-editor.c:365
-#: ../composer/e-msg-composer.c:2669
-#: ../composer/e-msg-composer.c:2846
+#: ../calendar/gui/dialogs/comp-editor.c:212
+#: ../calendar/gui/dialogs/comp-editor.c:382
+#: ../composer/e-msg-composer.c:2893
+#: ../composer/e-msg-composer.c:3089
#, c-format
msgid "Attached message"
msgid_plural "%d attached messages"
msgstr[0] "Attached message"
msgstr[1] "%d attached messages"
-#: ../calendar/gui/dialogs/comp-editor.c:428
-#: ../calendar/gui/e-calendar-table.c:1162
-#: ../calendar/gui/e-calendar-view.c:1535
-#: ../composer/e-msg-composer.c:2911
-#: ../mail/em-folder-tree.c:974
-#: ../mail/em-folder-view.c:1035
-#: ../mail/message-list.c:1708
-#: ../ui/evolution-addressbook.xml.h:31
-#: ../ui/evolution-calendar.xml.h:39
-#: ../ui/evolution-composer-entries.xml.h:7
-#: ../ui/evolution-mail-message.xml.h:103
-#: ../ui/evolution-tasks.xml.h:21
-msgid "_Copy"
-msgstr "_Copy"
-
-#: ../calendar/gui/dialogs/comp-editor.c:429
-#: ../composer/e-msg-composer.c:2912
-#: ../mail/em-folder-tree.c:975
+#: ../calendar/gui/dialogs/comp-editor.c:446
+#: ../composer/e-msg-composer.c:3153
+#: ../mail/em-folder-tree.c:1003
#: ../mail/em-folder-utils.c:368
-#: ../mail/em-folder-view.c:931
-#: ../mail/message-list.c:1709
+#: ../mail/em-folder-view.c:1013
+#: ../mail/message-list.c:1920
msgid "_Move"
msgstr "_Move"
-#: ../calendar/gui/dialogs/comp-editor.c:431
-#: ../composer/e-msg-composer.c:2914
-#: ../mail/em-folder-tree.c:977
-#: ../mail/message-list.c:1711
+#: ../calendar/gui/dialogs/comp-editor.c:448
+#: ../composer/e-msg-composer.c:3155
+#: ../mail/em-folder-tree.c:1005
+#: ../mail/message-list.c:1922
msgid "Cancel _Drag"
msgstr "Cancel _Drag"
-#: ../calendar/gui/dialogs/comp-editor.c:774
+#: ../calendar/gui/dialogs/comp-editor.c:802
msgid "Could not update object"
msgstr "Could not update object"
-#: ../calendar/gui/dialogs/comp-editor.c:977
-#: ../composer/e-msg-composer.c:2318
+#: ../calendar/gui/dialogs/comp-editor.c:948
+#: ../composer/e-msg-composer.c:2501
#, 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:1249
-msgid "_Attachment Bar (drop attachments here)"
-msgstr "_Attachment Bar (drop attachments here)"
+#: ../calendar/gui/dialogs/comp-editor.c:980
+msgid "Hide Attachment _Bar"
+msgstr "Hide Attachment _Bar"
-#: ../calendar/gui/dialogs/comp-editor.c:1850
-#: ../calendar/gui/dialogs/comp-editor.c:1893
+#: ../calendar/gui/dialogs/comp-editor.c:983
+#: ../calendar/gui/dialogs/comp-editor.c:1468
+msgid "Show Attachment _Bar"
+msgstr "Show Attachment _Bar"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1102
+#: ../calendar/gui/dialogs/event-page.c:1896
+#: ../calendar/gui/dialogs/task-page.c:1199
+#: ../composer/e-msg-composer-attachment-bar.c:470
+#: ../composer/e-msg-composer.c:3651
+#: ../plugins/groupwise-features/junk-settings.glade.h:8
+#: ../plugins/groupwise-features/properties.glade.h:13
+#: ../widgets/table/e-table-config.glade.h:18
+msgid "_Remove"
+msgstr "_Remove"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1103
+#: ../composer/e-msg-composer-attachment-bar.c:471
+#: ../composer/e-msg-composer.c:3652
+#: ../mail/em-folder-tree.c:2081
+#: ../ui/evolution-addressbook.xml.h:59
+#: ../ui/evolution-mail-list.xml.h:33
+msgid "_Properties"
+msgstr "_Properties"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1105
+#: ../composer/e-msg-composer-attachment-bar.c:473
+#: ../composer/e-msg-composer.c:3654
+msgid "_Add attachment..."
+msgstr "_Add attachment..."
+
+#: ../calendar/gui/dialogs/comp-editor.c:1492
+#: ../mail/em-format-html-display.c:2266
+msgid "Show Attachments"
+msgstr "Show Attachments"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1493
+msgid "Press space key to toggle attachment bar"
+msgstr "Press space key to toggle attachment bar"
+
+#: ../calendar/gui/dialogs/comp-editor.c:2100
+#: ../calendar/gui/dialogs/comp-editor.c:2143
msgid "Edit Appointment"
msgstr "Edit Appointment"
-#: ../calendar/gui/dialogs/comp-editor.c:1856
-#: ../calendar/gui/dialogs/comp-editor.c:1899
+#: ../calendar/gui/dialogs/comp-editor.c:2106
+#: ../calendar/gui/dialogs/comp-editor.c:2149
#, c-format
msgid "Meeting - %s"
msgstr "Meeting - %s"
-#: ../calendar/gui/dialogs/comp-editor.c:1858
-#: ../calendar/gui/dialogs/comp-editor.c:1901
+#: ../calendar/gui/dialogs/comp-editor.c:2108
+#: ../calendar/gui/dialogs/comp-editor.c:2151
#, c-format
msgid "Appointment - %s"
msgstr "Appointment - %s"
-#: ../calendar/gui/dialogs/comp-editor.c:1862
-#: ../calendar/gui/dialogs/comp-editor.c:1905
+#: ../calendar/gui/dialogs/comp-editor.c:2112
+#: ../calendar/gui/dialogs/comp-editor.c:2155
#, c-format
msgid "Assigned Task - %s"
msgstr "Assigned Task - %s"
-#: ../calendar/gui/dialogs/comp-editor.c:1864
-#: ../calendar/gui/dialogs/comp-editor.c:1907
+#: ../calendar/gui/dialogs/comp-editor.c:2114
+#: ../calendar/gui/dialogs/comp-editor.c:2157
#, c-format
msgid "Task - %s"
msgstr "Task - %s"
-#: ../calendar/gui/dialogs/comp-editor.c:1867
-#: ../calendar/gui/dialogs/comp-editor.c:1910
+#: ../calendar/gui/dialogs/comp-editor.c:2117
+#: ../calendar/gui/dialogs/comp-editor.c:2160
#, c-format
msgid "Journal entry - %s"
msgstr "Journal entry - %s"
-#: ../calendar/gui/dialogs/comp-editor.c:1878
-#: ../calendar/gui/dialogs/comp-editor.c:1920
+#: ../calendar/gui/dialogs/comp-editor.c:2128
+#: ../calendar/gui/dialogs/comp-editor.c:2170
msgid "No summary"
msgstr "No summary"
-#: ../calendar/gui/dialogs/comp-editor.c:2528
-#: ../calendar/gui/dialogs/comp-editor.c:2561
-#: ../calendar/gui/dialogs/comp-editor.c:2585
+#: ../calendar/gui/dialogs/comp-editor.c:2715
+#: ../composer/e-msg-composer-attachment-bar.c:307
+#: ../mail/em-utils.c:518
+#: ../mail/em-utils.c:555
+#: ../widgets/misc/e-attachment-bar.c:365
+msgid "attachment"
+msgstr "attachment"
+
+#: ../calendar/gui/dialogs/comp-editor.c:2804
+#: ../calendar/gui/dialogs/comp-editor.c:2858
+#: ../calendar/gui/dialogs/comp-editor.c:2882
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:2609
+#: ../calendar/gui/dialogs/comp-editor.c:2906
msgid "Unable to use current version!"
msgstr "Unable to use current version!"
@@ -5568,6 +5857,10 @@ msgstr "Could not open destination"
msgid "Destination is read only"
msgstr "Destination is read only"
+#: ../calendar/gui/dialogs/delete-comp.c:206
+msgid "_Delete this item from all other recipient's mailboxes?"
+msgstr "_Delete this item from all other recipient's mailboxes?"
+
#: ../calendar/gui/dialogs/delete-error.c:54
msgid "The event could not be deleted due to a corba error"
msgstr "The event could not be deleted due to a corba error"
@@ -5629,257 +5922,197 @@ msgstr "Delegate To:"
msgid "Enter Delegate"
msgstr "Enter Delegate"
-#: ../calendar/gui/dialogs/event-editor.c:141
-#: ../calendar/gui/print.c:2298
-msgid "Appointment"
-msgstr "Appointment"
+#: ../calendar/gui/dialogs/event-editor.c:564
+msgid "Appoint_ment"
+msgstr "Appoint_ment"
-#: ../calendar/gui/dialogs/event-editor.c:150
+#: ../calendar/gui/dialogs/event-editor.c:568
+#: ../ui/evolution-event-editor.xml.h:14
msgid "Recurrence"
msgstr "Recurrence"
-#: ../calendar/gui/dialogs/event-editor.c:164
-#: ../calendar/gui/dialogs/event-editor.c:248
-#: ../calendar/gui/dialogs/event-editor.c:422
-msgid "Scheduling"
-msgstr "Scheduling"
+#: ../calendar/gui/dialogs/event-page.c:810
+#: ../calendar/gui/dialogs/event-page.c:2717
+msgid "This event has alarms"
+msgstr "This event has alarms"
-#: ../calendar/gui/dialogs/event-editor.c:174
-msgid "Delegatees"
-msgstr "Delegatees"
+#: ../calendar/gui/dialogs/event-page.c:882
+#: ../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-editor.c:178
-msgid "Attendees"
-msgstr "Attendees"
+#: ../calendar/gui/dialogs/event-page.c:920
+msgid "_Delegatees"
+msgstr "_Delegatees"
-#: ../calendar/gui/dialogs/event-editor.c:251
-#: ../calendar/gui/dialogs/event-editor.c:425
-msgid "Invitations"
-msgstr "Invitations"
+#: ../calendar/gui/dialogs/event-page.c:922
+msgid "Atte_ndees"
+msgstr "Atte_ndees"
-#: ../calendar/gui/dialogs/event-page.c:731
+#: ../calendar/gui/dialogs/event-page.c:1087
msgid "Event with no start date"
msgstr "Event with no start date"
-#: ../calendar/gui/dialogs/event-page.c:734
+#: ../calendar/gui/dialogs/event-page.c:1090
msgid "Event with no end date"
msgstr "Event with no end date"
-#: ../calendar/gui/dialogs/event-page.c:900
-#: ../calendar/gui/dialogs/task-page.c:556
+#: ../calendar/gui/dialogs/event-page.c:1259
+#: ../calendar/gui/dialogs/memo-page.c:685
+#: ../calendar/gui/dialogs/task-page.c:849
msgid "Start date is wrong"
msgstr "Start date is wrong"
-#: ../calendar/gui/dialogs/event-page.c:910
+#: ../calendar/gui/dialogs/event-page.c:1269
msgid "End date is wrong"
msgstr "End date is wrong"
-#: ../calendar/gui/dialogs/event-page.c:933
+#: ../calendar/gui/dialogs/event-page.c:1292
msgid "Start time is wrong"
msgstr "Start time is wrong"
-#: ../calendar/gui/dialogs/event-page.c:940
+#: ../calendar/gui/dialogs/event-page.c:1299
msgid "End time is wrong"
msgstr "End time is wrong"
-#: ../calendar/gui/dialogs/event-page.c:1686
+#: ../calendar/gui/dialogs/event-page.c:1454
+#: ../calendar/gui/dialogs/memo-page.c:720
+#: ../calendar/gui/dialogs/task-page.c:906
+msgid "The organizer selected no longer has an account."
+msgstr "The organiser selected no longer has an account."
+
+#: ../calendar/gui/dialogs/event-page.c:1460
+#: ../calendar/gui/dialogs/memo-page.c:726
+#: ../calendar/gui/dialogs/task-page.c:912
+msgid "An organizer is required."
+msgstr "An organiser is required."
+
+#: ../calendar/gui/dialogs/event-page.c:1475
+#: ../calendar/gui/dialogs/task-page.c:927
+msgid "At least one attendee is required."
+msgstr "At least one attendee is required."
+
+#: ../calendar/gui/dialogs/event-page.c:1897
+#: ../calendar/gui/dialogs/task-page.c:1200
+msgid "_Add "
+msgstr "_Add "
+
+#: ../calendar/gui/dialogs/event-page.c:2624
#, c-format
msgid "Unable to open the calendar '%s'."
msgstr "Unable to open the calendar '%s'."
-#: ../calendar/gui/dialogs/event-page.c:1892
+#: ../calendar/gui/dialogs/event-page.c:2928
#, 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:1900
+#: ../calendar/gui/dialogs/event-page.c:2934
#, 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:1908
+#: ../calendar/gui/dialogs/event-page.c:2940
#, c-format
msgid "%d minute before appointement"
msgid_plural "%d minutes before appointment"
msgstr[0] "%d minute before appointment"
msgstr[1] "%d minutes before appointment"
-#: ../calendar/gui/dialogs/event-page.glade.h:2
+#: ../calendar/gui/dialogs/event-page.c:2953
+msgid "Customize"
+msgstr "Customise"
+
+#. an empty string is the same as 'None'
+#: ../calendar/gui/dialogs/event-page.c:2958
+#: ../calendar/gui/dialogs/meeting-page.glade.h:4
+#: ../calendar/gui/e-cal-model-tasks.c:656
+#: ../calendar/gui/e-itip-control.c:1099
+#: ../composer/e-msg-composer.c:2293
+#: ../filter/filter-rule.c:889
+#: ../mail/em-account-editor.c:701
+#: ../mail/em-account-editor.c:1421
+#: ../mail/em-account-prefs.c:475
+#: ../mail/em-junk-hook.c:78
+#: ../plugins/calendar-weather/calendar-weather.c:370
+#: ../plugins/calendar-weather/calendar-weather.c:424
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:9
+#: ../plugins/itip-formatter/itip-formatter.c:1739
+#: ../widgets/misc/e-cell-date-edit.c:249
+#: ../widgets/misc/e-dateedit.c:1507
+#: ../widgets/misc/e-dateedit.c:1721
+msgid "None"
+msgstr "None"
+
+#: ../calendar/gui/dialogs/event-page.glade.h:1
msgid "1 day before appointment"
msgstr "1 day before appointment"
-#: ../calendar/gui/dialogs/event-page.glade.h:3
+#: ../calendar/gui/dialogs/event-page.glade.h:2
msgid "1 hour before appointment"
msgstr "1 hour before appointment"
-#: ../calendar/gui/dialogs/event-page.glade.h:4
+#: ../calendar/gui/dialogs/event-page.glade.h:3
msgid "15 minutes before appointment"
msgstr "15 minutes before appointment"
#: ../calendar/gui/dialogs/event-page.glade.h:5
-#: ../calendar/gui/dialogs/task-page.glade.h:1
-msgid "<b>Basics</b>"
-msgstr "<b>Basics</b>"
+msgid "Attendee_s..."
+msgstr "Attendee_s..."
#: ../calendar/gui/dialogs/event-page.glade.h:6
-#: ../calendar/gui/dialogs/task-page.glade.h:2
-msgid "<b>Date and Time</b>"
-msgstr "<b>Date and Time</b>"
-
-#: ../calendar/gui/dialogs/event-page.glade.h:7
-#: ../calendar/gui/dialogs/task-page.glade.h:3
-msgid "<b>Send Options</b>"
-msgstr "<b>Send Options</b>"
+#: ../calendar/gui/dialogs/memo-page.glade.h:1
+msgid "Ca_tegories..."
+msgstr "Ca_tegories..."
#: ../calendar/gui/dialogs/event-page.glade.h:8
-msgid "A_ll day event"
-msgstr "A_ll day event"
+msgid "Custom Alarm:"
+msgstr "Custom Alarm:"
#: ../calendar/gui/dialogs/event-page.glade.h:9
-#: ../calendar/gui/dialogs/task-page.glade.h:4
-msgid "Ad_vanced send options"
-msgstr "Ad_vanced send options"
+#: ../calendar/gui/dialogs/task-page.glade.h:3
+msgid "D_escription:"
+msgstr "D_escription:"
#: ../calendar/gui/dialogs/event-page.glade.h:10
-msgid "C_ustomize..."
-msgstr "C_ustomise..."
-
-#: ../calendar/gui/dialogs/event-page.glade.h:11
-#: ../calendar/gui/dialogs/task-page.glade.h:5
-msgid "Ca_tegories..."
-msgstr "Ca_tegories..."
-
-#: ../calendar/gui/dialogs/event-page.glade.h:12
-msgid "Cale_ndar:"
-msgstr "Cale_ndar:"
-
-#: ../calendar/gui/dialogs/event-page.glade.h:13
-#: ../calendar/gui/dialogs/task-page.glade.h:7
-msgid "Classi_fication:"
-msgstr "Classi_fication:"
-
-#: ../calendar/gui/dialogs/event-page.glade.h:14
-#: ../calendar/gui/dialogs/task-page.glade.h:8
-#: ../calendar/gui/e-cal-list-view.c:254
-#: ../calendar/gui/e-cal-model.c:325
-#: ../calendar/gui/e-calendar-table.c:360
-msgid "Confidential"
-msgstr "Confidential"
-
-#: ../calendar/gui/dialogs/event-page.glade.h:15
msgid "Event Description"
msgstr "Event Description"
-#: ../calendar/gui/dialogs/event-page.glade.h:16
-msgid "Locat_ion:"
-msgstr "Locat_ion:"
-
-#: ../calendar/gui/dialogs/event-page.glade.h:17
-#: ../calendar/gui/dialogs/task-page.glade.h:10
-#: ../calendar/gui/e-cal-list-view.c:253
-#: ../calendar/gui/e-cal-model.c:323
-#: ../calendar/gui/e-calendar-table.c:359
-msgid "Private"
-msgstr "Private"
-
-#: ../calendar/gui/dialogs/event-page.glade.h:18
-#: ../calendar/gui/dialogs/task-page.glade.h:11
-#: ../calendar/gui/e-cal-list-view.c:252
-#: ../calendar/gui/e-cal-model.c:314
-#: ../calendar/gui/e-cal-model.c:321
-#: ../calendar/gui/e-calendar-table.c:358
-msgid "Public"
-msgstr "Public"
-
-#: ../calendar/gui/dialogs/event-page.glade.h:19
-msgid "Show time as _busy"
-msgstr "Show time as _busy"
-
-#: ../calendar/gui/dialogs/event-page.glade.h:20
-#: ../calendar/gui/dialogs/task-page.glade.h:13
+#: ../calendar/gui/dialogs/event-page.glade.h:12
+#: ../calendar/gui/dialogs/task-page.glade.h:6
msgid "Su_mmary:"
msgstr "Su_mmary:"
-#: ../calendar/gui/dialogs/event-page.glade.h:21
-msgid "This appointment has customized alarms"
-msgstr "This appointment has customized alarms"
-
-#: ../calendar/gui/dialogs/event-page.glade.h:22
+#: ../calendar/gui/dialogs/event-page.glade.h:14
msgid "_Alarm"
msgstr "_Alarm"
-#: ../calendar/gui/dialogs/event-page.glade.h:23
-msgid "_Description:"
-msgstr "_Description:"
-
-#: ../calendar/gui/dialogs/event-page.glade.h:24
-#: ../calendar/gui/e-meeting-time-sel.c:642
-msgid "_End time:"
-msgstr "_End time:"
-
-#: ../calendar/gui/dialogs/event-page.glade.h:25
-#: ../calendar/gui/e-meeting-time-sel.c:615
-msgid "_Start time:"
-msgstr "_Start time:"
-
-#: ../calendar/gui/dialogs/meeting-page.c:303
-msgid "<b>Dele_gatees</b>"
-msgstr "<b>Dele_gatees</b>"
-
-#: ../calendar/gui/dialogs/meeting-page.c:307
-msgid "<b>From:</b>"
-msgstr "<b>From:</b>"
-
-#. an empty string is the same as 'None'
-#. Put the "None" and "UTC" entries at the top of the combo's list.
-#. When "None" is selected we want the field to be cleared.
-#. Note that we don't show this here, since by default a 'None' date
-#. is not permitted.
-#: ../calendar/gui/dialogs/meeting-page.c:313
-#: ../calendar/gui/dialogs/meeting-page.glade.h:4
-#: ../calendar/gui/e-cal-model-tasks.c:653
-#: ../calendar/gui/e-itip-control.c:1106
-#: ../composer/e-msg-composer.c:2122
-#: ../filter/filter-rule.c:881
-#: ../mail/em-account-editor.c:683
-#: ../mail/em-account-editor.c:1348
-#: ../mail/em-account-prefs.c:464
-#: ../mail/em-folder-view.c:1064
-#: ../mail/em-junk-hook.c:78
-#: ../plugins/calendar-weather/calendar-weather.c:370
-#: ../plugins/calendar-weather/calendar-weather.c:424
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:7
-#: ../plugins/itip-formatter/itip-formatter.c:1627
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:190
-#: ../widgets/misc/e-cell-date-edit.c:248
-#: ../widgets/misc/e-dateedit.c:465
-#: ../widgets/misc/e-dateedit.c:1504
-#: ../widgets/misc/e-dateedit.c:1673
-msgid "None"
-msgstr "None"
-
-#: ../calendar/gui/dialogs/meeting-page.c:461
-msgid "The organizer selected no longer has an account."
-msgstr "The organiser selected no longer has an account."
-
-#: ../calendar/gui/dialogs/meeting-page.c:467
-msgid "An organizer is required."
-msgstr "An organiser is required."
+#: ../calendar/gui/dialogs/event-page.glade.h:17
+msgid "_Time:"
+msgstr "_Time:"
-#: ../calendar/gui/dialogs/meeting-page.c:482
-msgid "At least one attendee is required."
-msgstr "At least one attendee is required."
+#. TRANSLATORS: Entire string is for example:
+#. 'This appointment recurs/Every[x][day(s)][for][1]occurrences' (dropdown menu options are in [square brackets])
+#: ../calendar/gui/dialogs/event-page.glade.h:18
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:16
+msgid "for"
+msgstr "for"
-#: ../calendar/gui/dialogs/meeting-page.c:884
-msgid "_Delegate To..."
-msgstr "_Delegate To..."
+#. TRANSLATORS: Entire string is for example:
+#. 'This appointment recurs/Every[x][day(s)][until][2006/01/01]' (dropdown menu options are in [square brackets])
+#: ../calendar/gui/dialogs/event-page.glade.h:21
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:25
+msgid "until"
+msgstr "until"
#: ../calendar/gui/dialogs/meeting-page.etspec.h:1
-#: ../calendar/gui/e-meeting-list-view.c:358
#: ../calendar/gui/e-meeting-time-sel.etspec.h:1
msgid "Attendee"
msgstr "Attendee"
@@ -5914,19 +6147,19 @@ msgstr "Language"
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:386
+#: ../calendar/gui/e-meeting-list-view.c:510
#: ../calendar/gui/e-meeting-time-sel.etspec.h:8
msgid "RSVP"
msgstr "RSVP"
#: ../calendar/gui/dialogs/meeting-page.etspec.h:10
-#: ../calendar/gui/dialogs/task-editor.c:147
#: ../calendar/gui/e-calendar-table.etspec.h:10
-#: ../calendar/gui/e-meeting-list-view.c:394
+#: ../calendar/gui/e-meeting-list-view.c:521
#: ../calendar/gui/e-meeting-time-sel.etspec.h:10
#: ../mail/em-filter-i18n.h:63
-#: ../mail/message-list.etspec.h:12
+#: ../mail/message-list.etspec.h:16
msgid "Status"
msgstr "Status"
@@ -5939,74 +6172,111 @@ msgid "C_hange Organizer"
msgstr "C_hange Organiser"
#: ../calendar/gui/dialogs/meeting-page.glade.h:3
-#: ../calendar/gui/e-meeting-time-sel.c:428
-msgid "Con_tacts..."
-msgstr "Con_tacts..."
-
-#: ../calendar/gui/dialogs/meeting-page.glade.h:5
-msgid "Or_ganizer:"
-msgstr "Or_ganiser:"
+msgid "Co_ntacts..."
+msgstr "Co_ntacts..."
#: ../calendar/gui/dialogs/meeting-page.glade.h:6
msgid "Organizer"
msgstr "Organiser"
#: ../calendar/gui/dialogs/meeting-page.glade.h:7
-#: ../calendar/gui/e-itip-control.glade.h:9
+#: ../calendar/gui/e-itip-control.glade.h:7
msgid "Organizer:"
msgstr "Organiser:"
-#: ../calendar/gui/dialogs/new-calendar.glade.h:2
+#: ../calendar/gui/dialogs/memo-editor.c:220
+#: ../calendar/gui/print.c:2321
+msgid "Memo"
+msgstr "Memo"
+
+#: ../calendar/gui/dialogs/memo-page.c:870
+#, c-format
+msgid "Unable to open memos in '%s'."
+msgstr "Unable to open memos in '%s'."
+
+#: ../calendar/gui/dialogs/memo-page.c:1021
+#: ../mail/em-format-html.c:1489
+#: ../mail/em-format-quote.c:200
+#: ../mail/em-format.c:846
+#: ../mail/em-mailer-prefs.c:87
+#: ../mail/message-list.etspec.h:18
+msgid "To"
+msgstr "To"
+
+#: ../calendar/gui/dialogs/memo-page.glade.h:3
+#: ../calendar/gui/dialogs/task-page.glade.h:5
+msgid "Sta_rt date:"
+msgstr "Sta_rt date:"
+
+#: ../calendar/gui/dialogs/memo-page.glade.h:4
+msgid "Su_mmary"
+msgstr "Su_mmary"
+
+#: ../calendar/gui/dialogs/memo-page.glade.h:5
+msgid "T_o:"
+msgstr "T_o:"
+
+#: ../calendar/gui/dialogs/memo-page.glade.h:6
+#: ../calendar/gui/dialogs/task-page.c:434
+#: ../calendar/gui/dialogs/task-page.glade.h:9
+msgid "_Group:"
+msgstr "_Group:"
+
+#: ../calendar/gui/dialogs/memo-page.glade.h:7
+msgid "_Memo Content:"
+msgstr "_Memo Content:"
+
+#: ../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:3
+#: ../calendar/gui/dialogs/new-calendar.glade.h:2
msgid "Add New Calendar"
msgstr "Add New Calendar"
-#: ../calendar/gui/dialogs/new-calendar.glade.h:4
+#: ../calendar/gui/dialogs/new-calendar.glade.h:3
msgid "Calendar Group"
msgstr "Calendar Group"
-#: ../calendar/gui/dialogs/new-calendar.glade.h:5
+#: ../calendar/gui/dialogs/new-calendar.glade.h:4
msgid "Calendar Location"
msgstr "Calendar Location"
-#: ../calendar/gui/dialogs/new-calendar.glade.h:6
+#: ../calendar/gui/dialogs/new-calendar.glade.h:5
msgid "Calendar Name"
msgstr "Calendar Name"
-#: ../calendar/gui/dialogs/new-task-list.glade.h:2
+#: ../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:3
+#: ../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:4
+#: ../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:5
+#: ../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?"
+msgid "You are modifying a recurring event. What would you like to modify?"
+msgstr "You are modifying a recurring event. What would you like to modify?"
#: ../calendar/gui/dialogs/recur-comp.c:54
-msgid "You are delegating a recurring event, what would like to delegate?"
-msgstr "You are delegating a recurring event, what would like to delegate?"
+msgid "You are delegating a recurring event. What would you like to delegate?"
+msgstr "You are delegating a recurring event. What would you like to delegate?"
#: ../calendar/gui/dialogs/recur-comp.c:58
-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?"
+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 journal entry. What would you like to modify?"
+msgstr "You are modifying a recurring journal entry. What would you like to modify?"
#: ../calendar/gui/dialogs/recur-comp.c:90
msgid "This Instance Only"
@@ -6024,55 +6294,107 @@ msgstr "This and Future Instances"
msgid "All Instances"
msgstr "All Instances"
-#: ../calendar/gui/dialogs/recurrence-page.c:496
+#: ../calendar/gui/dialogs/recurrence-page.c:498
msgid "This appointment contains recurrences that Evolution cannot edit."
msgstr "This appointment contains recurrences that Evolution cannot edit."
-#: ../calendar/gui/dialogs/recurrence-page.c:817
+#: ../calendar/gui/dialogs/recurrence-page.c:819
msgid "Recurrence date is invalid"
msgstr "Recurrence date is invalid"
-#: ../calendar/gui/dialogs/recurrence-page.c:928
+#. 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
msgid "on"
msgstr "on"
-#: ../calendar/gui/dialogs/recurrence-page.c:988
+#. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [first] [Monday] [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:996
msgid "first"
msgstr "first"
-#: ../calendar/gui/dialogs/recurrence-page.c:989
+#. TRANSLATORS: here, "second" is the ordinal number (like "third"), not the time division (like "minute")
+#. * Entire string is for example: This appointment recurs/Every [x] month(s) on the [second] [Monday] [forever]'
+#. * (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
msgid "second"
msgstr "second"
-#: ../calendar/gui/dialogs/recurrence-page.c:990
+#. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [third] [Monday] [forever]'
+#. * (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
msgid "third"
msgstr "third"
-#: ../calendar/gui/dialogs/recurrence-page.c:991
+#. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [fourth] [Monday] [forever]'
+#. * (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
msgid "fourth"
msgstr "fourth"
-#: ../calendar/gui/dialogs/recurrence-page.c:992
+#. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [last] [Monday] [forever]'
+#. * (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
msgid "last"
msgstr "last"
-#: ../calendar/gui/dialogs/recurrence-page.c:1015
+#. 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
msgid "Other Date"
msgstr "Other Date"
-#: ../calendar/gui/dialogs/recurrence-page.c:1043
+#. TRANSLATORS: This is a submenu option string to split the date range into three submenus to choose the exact day of
+#. * 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
+msgid "1st to 10th"
+msgstr "1st to 10th"
+
+#. TRANSLATORS: This is a submenu option string to split the date range into three submenus to choose the exact day of
+#. * 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
+msgid "11th to 20th"
+msgstr "11th to 20th"
+
+#. TRANSLATORS: This is a submenu option string to split the date range into three submenus to choose the exact day of
+#. * 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
+msgid "21st to 31st"
+msgstr "21st to 31st"
+
+#: ../calendar/gui/dialogs/recurrence-page.c:1083
msgid "day"
msgstr "day"
-#: ../calendar/gui/dialogs/recurrence-page.c:1180
+#. 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:1223
msgid "on the"
msgstr "on the"
-#: ../calendar/gui/dialogs/recurrence-page.c:1369
+#: ../calendar/gui/dialogs/recurrence-page.c:1412
msgid "occurrences"
msgstr "occurrences"
-#: ../calendar/gui/dialogs/recurrence-page.c:2325
+#: ../calendar/gui/dialogs/recurrence-page.c:2378
msgid "Date/Time"
msgstr "Date/Time"
@@ -6081,7 +6403,7 @@ msgid "<b>Exceptions</b>"
msgstr "<b>Exceptions</b>"
#: ../calendar/gui/dialogs/recurrence-page.glade.h:2
-#: ../mail/mail-config.glade.h:3
+#: ../mail/mail-config.glade.h:2
msgid "<b>Preview</b>"
msgstr "<b>Preview</b>"
@@ -6089,35 +6411,37 @@ msgstr "<b>Preview</b>"
msgid "<b>Recurrence</b>"
msgstr "<b>Recurrence</b>"
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:4
+#. TRANSLATORS: Entire string is for example:
+#. 'This appointment recurs/Every[x][day(s)][for][1]occurrences' (dropdown menu options are in [square brackets])
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:6
msgid "Every"
msgstr "Every"
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:5
+#. TRANSLATORS: Entire string is for example:
+#. 'This appointment recurs/Every[x][day(s)][for][1]occurrences' (dropdown menu options are in [square brackets])
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:9
msgid "This appointment rec_urs"
msgstr "This appointment rec_urs"
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:8
-msgid "for"
-msgstr "for"
-
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:9
+#. TRANSLATORS: Entire string is for example:
+#. 'This appointment recurs/Every[x][day(s)][forever]' (dropdown menu options are in [square brackets])
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:19
msgid "forever"
msgstr "forever"
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:10
+#. TRANSLATORS: Entire string is for example:
+#. 'This appointment recurs/Every[x][month(s)][for][1]occurrences' (dropdown menu options are in [square brackets])
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:22
msgid "month(s)"
msgstr "month(s)"
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:11
-msgid "until"
-msgstr "until"
-
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:12
+#. TRANSLATORS: Entire string is for example:
+#. 'This appointment recurs/Every[x][week(s)][for][1]occurrences' (dropdown menu options are in [square brackets])
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:28
msgid "week(s)"
msgstr "week(s)"
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:13
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:29
msgid "year(s)"
msgstr "year(s)"
@@ -6126,7 +6450,7 @@ msgstr "year(s)"
msgid "Completed date is wrong"
msgstr "Completed date is wrong"
-#: ../calendar/gui/dialogs/task-details-page.c:522
+#: ../calendar/gui/dialogs/task-details-page.c:517
msgid "Web Page"
msgstr "Web Page"
@@ -6141,56 +6465,56 @@ msgstr "<span weight=\"bold\">Status</span>"
#. Pass TRUE as is_utc, so it gets converted to the current
#. timezone.
#: ../calendar/gui/dialogs/task-details-page.glade.h:4
-#: ../calendar/gui/e-cal-component-preview.c:229
-#: ../calendar/gui/e-cal-model-tasks.c:346
-#: ../calendar/gui/e-cal-model-tasks.c:659
-#: ../calendar/gui/e-calendar-table.c:455
-#: ../calendar/gui/e-itip-control.c:898
-#: ../calendar/gui/e-meeting-store.c:196
-#: ../calendar/gui/e-meeting-store.c:219
-#: ../calendar/gui/print.c:2361
+#: ../calendar/gui/e-cal-component-preview.c:231
+#: ../calendar/gui/e-cal-model-tasks.c:347
+#: ../calendar/gui/e-cal-model-tasks.c:662
+#: ../calendar/gui/e-calendar-table.c:462
+#: ../calendar/gui/e-itip-control.c:891
+#: ../calendar/gui/e-meeting-store.c:194
+#: ../calendar/gui/e-meeting-store.c:217
+#: ../calendar/gui/print.c:2382
#: ../plugins/save-calendar/csv-format.c:390
msgid "Completed"
msgstr "Completed"
#: ../calendar/gui/dialogs/task-details-page.glade.h:5
-#: ../calendar/gui/e-cal-component-preview.c:248
-#: ../calendar/gui/e-calendar-table.c:380
-#: ../mail/message-list.c:1008
+#: ../calendar/gui/e-cal-component-preview.c:250
+#: ../calendar/gui/e-calendar-table.c:387
+#: ../mail/message-list.c:1031
msgid "High"
msgstr "High"
#: ../calendar/gui/dialogs/task-details-page.glade.h:6
-#: ../calendar/gui/e-cal-component-preview.c:226
-#: ../calendar/gui/e-cal-model-tasks.c:344
-#: ../calendar/gui/e-cal-model-tasks.c:657
-#: ../calendar/gui/e-cal-model-tasks.c:732
-#: ../calendar/gui/e-calendar-table.c:454
-#: ../calendar/gui/print.c:2358
+#: ../calendar/gui/e-cal-component-preview.c:228
+#: ../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/e-calendar-table.c:461
+#: ../calendar/gui/print.c:2379
msgid "In Progress"
msgstr "In Progress"
#: ../calendar/gui/dialogs/task-details-page.glade.h:7
-#: ../calendar/gui/e-cal-component-preview.c:252
-#: ../calendar/gui/e-calendar-table.c:382
-#: ../mail/message-list.c:1006
+#: ../calendar/gui/e-cal-component-preview.c:254
+#: ../calendar/gui/e-calendar-table.c:389
+#: ../mail/message-list.c:1029
msgid "Low"
msgstr "Low"
#: ../calendar/gui/dialogs/task-details-page.glade.h:8
-#: ../calendar/gui/e-cal-component-preview.c:250
-#: ../calendar/gui/e-cal-model.c:919
-#: ../calendar/gui/e-calendar-table.c:381
-#: ../mail/message-list.c:1007
+#: ../calendar/gui/e-cal-component-preview.c:252
+#: ../calendar/gui/e-cal-model.c:924
+#: ../calendar/gui/e-calendar-table.c:388
+#: ../mail/message-list.c:1030
msgid "Normal"
msgstr "Normal"
#: ../calendar/gui/dialogs/task-details-page.glade.h:9
-#: ../calendar/gui/e-cal-component-preview.c:236
-#: ../calendar/gui/e-cal-model-tasks.c:342
-#: ../calendar/gui/e-cal-model-tasks.c:655
-#: ../calendar/gui/e-calendar-table.c:453
-#: ../calendar/gui/print.c:2355
+#: ../calendar/gui/e-cal-component-preview.c:238
+#: ../calendar/gui/e-cal-model-tasks.c:343
+#: ../calendar/gui/e-cal-model-tasks.c:658
+#: ../calendar/gui/e-calendar-table.c:460
+#: ../calendar/gui/print.c:2376
msgid "Not Started"
msgstr "Not Started"
@@ -6199,262 +6523,289 @@ msgid "P_ercent complete:"
msgstr "P_ercent complete:"
#: ../calendar/gui/dialogs/task-details-page.glade.h:11
-#: ../calendar/gui/e-calendar-table.c:383
+msgid "Stat_us:"
+msgstr "Stat_us:"
+
+#: ../calendar/gui/dialogs/task-details-page.glade.h:12
+#: ../calendar/gui/e-calendar-table.c:390
msgid "Undefined"
msgstr "Undefined"
-#: ../calendar/gui/dialogs/task-details-page.glade.h:12
+#: ../calendar/gui/dialogs/task-details-page.glade.h:13
msgid "_Date completed:"
msgstr "_Date completed:"
-#: ../calendar/gui/dialogs/task-details-page.glade.h:13
-#: ../widgets/misc/e-send-options.glade.h:31
+#: ../calendar/gui/dialogs/task-details-page.glade.h:14
+#: ../widgets/misc/e-send-options.glade.h:33
msgid "_Priority:"
msgstr "_Priority:"
-#: ../calendar/gui/dialogs/task-details-page.glade.h:14
-msgid "_Status:"
-msgstr "_Status:"
-
#: ../calendar/gui/dialogs/task-details-page.glade.h:15
msgid "_Web Page:"
msgstr "_Web Page:"
-#: ../calendar/gui/dialogs/task-editor.c:138
-#: ../calendar/gui/print.c:2300
-msgid "Task"
-msgstr "Task"
+#: ../calendar/gui/dialogs/task-editor.c:425
+#: ../calendar/gui/tasks-component.c:1171
+msgid "_Task"
+msgstr "_Task"
-#: ../calendar/gui/dialogs/task-editor.c:162
-#: ../calendar/gui/dialogs/task-editor.c:224
-#: ../calendar/gui/dialogs/task-editor.c:378
-msgid "Assignment"
-msgstr "Assignment"
+#: ../calendar/gui/dialogs/task-editor.c:429
+msgid "Task Details"
+msgstr "Task Details"
-#: ../calendar/gui/dialogs/task-page.c:529
+#: ../calendar/gui/dialogs/task-page.c:822
msgid "Due date is wrong"
msgstr "Due date is wrong"
-#: ../calendar/gui/dialogs/task-page.c:873
+#: ../calendar/gui/dialogs/task-page.c:1650
#, c-format
msgid "Unable to open tasks in '%s'."
msgstr "Unable to open tasks in '%s'."
-#: ../calendar/gui/dialogs/task-page.glade.h:9
-msgid "D_escription:"
-msgstr "D_escription:"
+#: ../calendar/gui/dialogs/task-page.glade.h:1
+msgid "Atte_ndees..."
+msgstr "Atte_ndees..."
-#: ../calendar/gui/dialogs/task-page.glade.h:12
-msgid "Sta_rt date:"
-msgstr "Sta_rt date:"
+#: ../calendar/gui/dialogs/task-page.glade.h:2
+msgid "Categor_ies..."
+msgstr "Categor_ies..."
-#: ../calendar/gui/dialogs/task-page.glade.h:14
-msgid "Task Description"
-msgstr "Task Description"
+#: ../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:"
-#: ../calendar/gui/dialogs/task-page.glade.h:15
+#: ../calendar/gui/dialogs/task-page.glade.h:8
msgid "_Due date:"
msgstr "_Due date:"
-#: ../calendar/gui/dialogs/task-page.glade.h:16
-msgid "_Group:"
-msgstr "_Group:"
-
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:3
+#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:2
msgid "<b>Free/Busy C_alendars</b>"
msgstr "<b>Free/Busy C_alendars</b>"
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:4
+#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:3
msgid "<b>Publishing Frequency</b>"
msgstr "<b>Publishing Frequency</b>"
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:5
+#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:4
msgid "<b>Publishing _Location</b>"
msgstr "<b>Publishing _Location</b>"
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:6
+#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:5
msgid "Free/Busy Publishing Settings"
msgstr "Free/Busy Publishing Settings"
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:7
+#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:6
msgid "_Daily"
msgstr "_Daily"
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:8
+#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:7
msgid "_Manual"
msgstr "_Manual"
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:9
+#: ../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:10
+#: ../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:11
+#: ../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:12
+#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:11
msgid "_Weekly"
msgstr "_Weekly"
-#: ../calendar/gui/e-alarm-list.c:395
+#. Translator: Entire string is like "Pop up an alert %d days before start of appointment"
+#: ../calendar/gui/e-alarm-list.c:396
#, c-format
msgid "%d day"
msgid_plural "%d days"
msgstr[0] "%d day"
msgstr[1] "%d days"
-#: ../calendar/gui/e-alarm-list.c:400
+#. Translator: Entire string is like "Pop up an alert %d weeks before start of appointment"
+#: ../calendar/gui/e-alarm-list.c:402
#, c-format
msgid "%d week"
msgid_plural "%d weeks"
msgstr[0] "%d week"
msgstr[1] "%d weeks"
-#: ../calendar/gui/e-alarm-list.c:405
-#, c-format
-msgid "%d hour"
-msgid_plural "%d hours"
-msgstr[0] "%d hour"
-msgstr[1] "%d hours"
-
-#: ../calendar/gui/e-alarm-list.c:410
-#, c-format
-msgid "%d minute"
-msgid_plural "%d minutes"
-msgstr[0] "%d minute"
-msgstr[1] "%d minutes"
-
-#: ../calendar/gui/e-alarm-list.c:415
-#, c-format
-msgid "%d second"
-msgid_plural "%d seconds"
-msgstr[0] "%d second"
-msgstr[1] "%d seconds"
-
-#: ../calendar/gui/e-alarm-list.c:462
+#: ../calendar/gui/e-alarm-list.c:464
msgid "Unknown action to be performed"
msgstr "Unknown action to be performed"
#. Translator: The first %s refers to the base, which would be actions like
#. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
-#: ../calendar/gui/e-alarm-list.c:476
+#: ../calendar/gui/e-alarm-list.c:478
#, c-format
msgid "%s %s before the start of the appointment"
msgstr "%s %s before the start of the appointment"
#. Translator: The first %s refers to the base, which would be actions like
#. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
-#: ../calendar/gui/e-alarm-list.c:481
+#: ../calendar/gui/e-alarm-list.c:483
#, c-format
msgid "%s %s after the start of the appointment"
msgstr "%s %s after the start of the appointment"
#. Translator: The %s refers to the base, which would be actions like
#. * "Play a sound"
-#: ../calendar/gui/e-alarm-list.c:488
+#: ../calendar/gui/e-alarm-list.c:490
#, c-format
msgid "%s at the start of the appointment"
msgstr "%s at the start of the appointment"
-#: ../calendar/gui/e-alarm-list.c:497
+#. Translator: The first %s refers to the base, which would be actions like
+#. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
+#: ../calendar/gui/e-alarm-list.c:501
#, c-format
msgid "%s %s before the end of the appointment"
msgstr "%s %s before the end of the appointment"
-#: ../calendar/gui/e-alarm-list.c:500
+#. Translator: The first %s refers to the base, which would be actions like
+#. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
+#: ../calendar/gui/e-alarm-list.c:506
#, c-format
msgid "%s %s after the end of the appointment"
msgstr "%s %s after the end of the appointment"
-#: ../calendar/gui/e-alarm-list.c:505
+#. Translator: The %s refers to the base, which would be actions like
+#. * "Play a sound"
+#: ../calendar/gui/e-alarm-list.c:513
#, c-format
msgid "%s at the end of the appointment"
msgstr "%s at the end of the appointment"
-#: ../calendar/gui/e-alarm-list.c:527
+#. Translator: The first %s refers to the base, which would be actions like
+#. * "Play a Sound". Second %s is an absolute time, e.g. "10:00AM"
+#: ../calendar/gui/e-alarm-list.c:537
#, c-format
msgid "%s at %s"
msgstr "%s at %s"
-#: ../calendar/gui/e-alarm-list.c:533
+#. Translator: The %s refers to the base, which would be actions like
+#. * "Play a sound". "Trigger types" are absolute or relative dates
+#: ../calendar/gui/e-alarm-list.c:545
#, c-format
msgid "%s for an unknown trigger type"
msgstr "%s for an unknown trigger type"
+#: ../calendar/gui/e-cal-component-memo-preview.c:72
#: ../calendar/gui/e-cal-component-preview.c:70
-#: ../mail/em-folder-view.c:2703
+#: ../mail/em-folder-view.c:2884
#, c-format
msgid "Click to open %s"
msgstr "Click to open %s"
+#: ../calendar/gui/e-cal-component-memo-preview.c:155
#: ../calendar/gui/e-cal-component-preview.c:155
-#: ../filter/filter-rule.c:796
+#: ../filter/filter-rule.c:804
msgid "Untitled"
msgstr "Untitled"
-#: ../calendar/gui/e-cal-component-preview.c:186
-#: ../calendar/gui/e-itip-control.c:1110
-#: ../calendar/gui/e-itip-control.glade.h:11
-msgid "Summary:"
-msgstr "Summary:"
-
-#: ../calendar/gui/e-cal-component-preview.c:193
-#: ../calendar/gui/e-cal-component-preview.c:204
+#: ../calendar/gui/e-cal-component-memo-preview.c:204
+#: ../calendar/gui/e-cal-component-preview.c:195
+#: ../calendar/gui/e-cal-component-preview.c:206
msgid "Start Date:"
msgstr "Start Date:"
-#: ../calendar/gui/e-cal-component-preview.c:215
+#: ../calendar/gui/e-cal-component-memo-preview.c:217
+#: ../calendar/gui/e-cal-component-preview.c:269
+#: ../calendar/gui/e-itip-control.c:1159
+#: ../calendar/gui/e-itip-control.glade.h:4
+#: ../composer/e-msg-composer-attachment.glade.h:2
+#: ../mail/mail-config.glade.h:68
+#: ../widgets/misc/e-attachment.glade.h:2
+msgid "Description:"
+msgstr "Description:"
+
+#: ../calendar/gui/e-cal-component-memo-preview.c:250
+#: ../calendar/gui/e-cal-component-preview.c:301
+msgid "Web Page:"
+msgstr "Web Page:"
+
+#: ../calendar/gui/e-cal-component-preview.c:188
+#: ../calendar/gui/e-itip-control.c:1103
+#: ../calendar/gui/e-itip-control.glade.h:9
+msgid "Summary:"
+msgstr "Summary:"
+
+#: ../calendar/gui/e-cal-component-preview.c:217
msgid "Due Date:"
msgstr "Due Date:"
#. write status
#. Status
-#: ../calendar/gui/e-cal-component-preview.c:222
-#: ../calendar/gui/e-itip-control.c:1134
-#: ../plugins/exchange-operations/exchange-account-setup.c:263
-#: ../plugins/itip-formatter/itip-view.c:909
+#: ../calendar/gui/e-cal-component-preview.c:224
+#: ../calendar/gui/e-itip-control.c:1127
+#: ../plugins/exchange-operations/exchange-account-setup.c:269
+#: ../plugins/itip-formatter/itip-view.c:961
msgid "Status:"
msgstr "Status:"
-#: ../calendar/gui/e-cal-component-preview.c:246
+#: ../calendar/gui/e-cal-component-preview.c:248
msgid "Priority:"
msgstr "Priority:"
-#: ../calendar/gui/e-cal-component-preview.c:299
-msgid "Web Page:"
-msgstr "Web Page:"
+#: ../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-calendar-table.c:365
+msgid "Public"
+msgstr "Public"
+
+#: ../calendar/gui/e-cal-list-view.c:256
+#: ../calendar/gui/e-cal-model.c:323
+#: ../calendar/gui/e-calendar-table.c:366
+msgid "Private"
+msgstr "Private"
+
+#: ../calendar/gui/e-cal-list-view.c:257
+#: ../calendar/gui/e-cal-model.c:325
+#: ../calendar/gui/e-calendar-table.c:367
+msgid "Confidential"
+msgstr "Confidential"
#: ../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"
#: ../calendar/gui/e-cal-list-view.etspec.h:5
#: ../calendar/gui/e-calendar-table.etspec.h:11
-#: ../mail/mail-dialogs.glade.h:16
+#: ../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-cal-model-calendar.c:180
-#: ../calendar/gui/e-calendar-table.c:432
+#: ../calendar/gui/e-cal-model-calendar.c:183
+#: ../calendar/gui/e-calendar-table.c:439
msgid "Free"
msgstr "Free"
-#: ../calendar/gui/e-cal-model-calendar.c:183
-#: ../calendar/gui/e-calendar-table.c:433
+#: ../calendar/gui/e-cal-model-calendar.c:186
+#: ../calendar/gui/e-calendar-table.c:440
#: ../calendar/gui/e-meeting-time-sel.c:412
msgid "Busy"
msgstr "Busy"
-#: ../calendar/gui/e-cal-model-tasks.c:607
+#: ../calendar/gui/e-cal-model-tasks.c:610
msgid ""
"The geographical position must be entered in the format: \n"
"\n"
@@ -6464,192 +6815,237 @@ msgstr ""
"\n"
"45.436845,125.862501"
-#: ../calendar/gui/e-cal-model-tasks.c:1018
-#: ../calendar/gui/e-cal-model.c:925
-#: ../calendar/gui/e-meeting-list-view.c:192
-#: ../calendar/gui/e-meeting-store.c:168
-#: ../calendar/gui/e-meeting-store.c:178
-#: ../calendar/gui/e-meeting-store.c:808
+#: ../calendar/gui/e-cal-model-tasks.c:1012
+#: ../calendar/gui/e-cal-model.c:930
+#: ../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-tasks.c:1018
-#: ../calendar/gui/e-cal-model.c:925
-#: ../calendar/gui/e-meeting-list-view.c:193
-#: ../calendar/gui/e-meeting-store.c:180
+#: ../calendar/gui/e-cal-model-tasks.c:1012
+#: ../calendar/gui/e-cal-model.c:930
+#: ../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"
#. This is the default filename used for temporary file creation
#: ../calendar/gui/e-cal-model.c:327
-#: ../calendar/gui/e-cal-model.c:330
-#: ../calendar/gui/e-itip-control.c:1151
-#: ../calendar/gui/e-itip-control.c:1292
-#: ../calendar/gui/e-meeting-list-view.c:168
-#: ../calendar/gui/e-meeting-list-view.c:182
+#: ../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:1144
+#: ../calendar/gui/e-itip-control.c:1285
+#: ../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:224
-#: ../mail/em-utils.c:1244
+#: ../calendar/gui/e-meeting-store.c:222
+#: ../mail/em-utils.c:1330
#: ../plugins/itip-formatter/itip-formatter.c:240
-#: ../plugins/itip-formatter/itip-formatter.c:1652
-#: ../plugins/plugin-manager/plugin-manager.c:72
-#: ../widgets/misc/e-attachment-bar.c:659
-#: ../widgets/misc/e-charset-picker.c:62
+#: ../plugins/itip-formatter/itip-formatter.c:1764
+#: ../plugins/plugin-manager/plugin-manager.c:68
+#: ../widgets/misc/e-attachment-bar.c:720
+#: ../widgets/misc/e-charset-picker.c:63
msgid "Unknown"
msgstr "Unknown"
-#: ../calendar/gui/e-cal-model.c:921
+#: ../calendar/gui/e-cal-model.c:926
msgid "Recurring"
msgstr "Recurring"
-#: ../calendar/gui/e-cal-model.c:923
+#: ../calendar/gui/e-cal-model.c:928
msgid "Assigned"
msgstr "Assigned"
-#: ../calendar/gui/e-calendar-table.c:402
+#: ../calendar/gui/e-cal-popup.c:177
+#: ../mail/em-popup.c:412
+msgid "Save As..."
+msgstr "Save As..."
+
+#: ../calendar/gui/e-cal-popup.c:193
+#: ../mail/em-format-html-display.c:2112
+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:437
+#, c-format
+msgid "untitled_image.%s"
+msgstr "untitled_image.%s"
+
+#: ../calendar/gui/e-cal-popup.c:276
+#: ../calendar/gui/e-calendar-table.c:1282
+#: ../calendar/gui/e-calendar-view.c:1699
+#: ../calendar/gui/e-memo-table.c:903
+#: ../mail/em-folder-view.c:1127
+#: ../mail/em-popup.c:554
+#: ../mail/em-popup.c:565
+msgid "_Save As..."
+msgstr "_Save As..."
+
+#: ../calendar/gui/e-cal-popup.c:277
+#: ../mail/em-popup.c:555
+#: ../mail/em-popup.c:566
+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:400
+#: ../mail/em-popup.c:776
+#, c-format
+msgid "Open in %s..."
+msgstr "Open in %s..."
+
+#: ../calendar/gui/e-calendar-table.c:409
msgid "0%"
msgstr "0%"
-#: ../calendar/gui/e-calendar-table.c:403
+#: ../calendar/gui/e-calendar-table.c:410
msgid "10%"
msgstr "10%"
-#: ../calendar/gui/e-calendar-table.c:404
+#: ../calendar/gui/e-calendar-table.c:411
msgid "20%"
msgstr "20%"
-#: ../calendar/gui/e-calendar-table.c:405
+#: ../calendar/gui/e-calendar-table.c:412
msgid "30%"
msgstr "30%"
-#: ../calendar/gui/e-calendar-table.c:406
+#: ../calendar/gui/e-calendar-table.c:413
msgid "40%"
msgstr "40%"
-#: ../calendar/gui/e-calendar-table.c:407
+#: ../calendar/gui/e-calendar-table.c:414
msgid "50%"
msgstr "50%"
-#: ../calendar/gui/e-calendar-table.c:408
+#: ../calendar/gui/e-calendar-table.c:415
msgid "60%"
msgstr "60%"
-#: ../calendar/gui/e-calendar-table.c:409
+#: ../calendar/gui/e-calendar-table.c:416
msgid "70%"
msgstr "70%"
-#: ../calendar/gui/e-calendar-table.c:410
+#: ../calendar/gui/e-calendar-table.c:417
msgid "80%"
msgstr "80%"
-#: ../calendar/gui/e-calendar-table.c:411
+#: ../calendar/gui/e-calendar-table.c:418
msgid "90%"
msgstr "90%"
-#: ../calendar/gui/e-calendar-table.c:412
+#: ../calendar/gui/e-calendar-table.c:419
msgid "100%"
msgstr "100%"
-#: ../calendar/gui/e-calendar-table.c:514
-msgid "Task Table"
-msgstr "Task Table"
-
-#: ../calendar/gui/e-calendar-table.c:692
-#: ../calendar/gui/e-calendar-view.c:661
+#: ../calendar/gui/e-calendar-table.c:704
+#: ../calendar/gui/e-calendar-view.c:675
+#: ../calendar/gui/e-memo-table.c:482
msgid "Deleting selected objects"
msgstr "Deleting selected objects"
-#: ../calendar/gui/e-calendar-table.c:871
-#: ../calendar/gui/e-calendar-view.c:789
+#: ../calendar/gui/e-calendar-table.c:957
+#: ../calendar/gui/e-calendar-view.c:803
+#: ../calendar/gui/e-memo-table.c:659
msgid "Updating objects"
msgstr "Updating objects"
-#: ../calendar/gui/e-calendar-table.c:1012
-#: ../calendar/gui/e-calendar-view.c:1105
-#: ../composer/e-msg-composer.c:1243
+#: ../calendar/gui/e-calendar-table.c:1106
+#: ../calendar/gui/e-calendar-view.c:1248
+#: ../calendar/gui/e-memo-table.c:798
+#: ../composer/e-msg-composer.c:1348
msgid "Save as..."
msgstr "Save as..."
-#: ../calendar/gui/e-calendar-table.c:1155
+#: ../calendar/gui/e-calendar-table.c:1277
+#: ../calendar/gui/e-calendar-view.c:1681
+msgid "New _Task"
+msgstr "New _Task"
+
+#: ../calendar/gui/e-calendar-table.c:1281
+#: ../calendar/gui/e-memo-table.c:902
msgid "Open _Web Page"
msgstr "Open _Web Page"
-#: ../calendar/gui/e-calendar-table.c:1156
-#: ../calendar/gui/e-calendar-view.c:1529
-#: ../mail/em-folder-view.c:1045
-#: ../mail/em-popup.c:541
-#: ../mail/em-popup.c:552
-msgid "_Save As..."
-msgstr "_Save As..."
-
-#: ../calendar/gui/e-calendar-table.c:1157
-#: ../calendar/gui/e-calendar-view.c:1509
-#: ../calendar/gui/e-calendar-view.c:1530
-#: ../mail/em-folder-view.c:1046
+#: ../calendar/gui/e-calendar-table.c:1283
+#: ../calendar/gui/e-calendar-view.c:1684
+#: ../calendar/gui/e-calendar-view.c:1700
+#: ../calendar/gui/e-memo-table.c:904
+#: ../mail/em-folder-view.c:1128
#: ../plugins/print-message/org-gnome-print-message.xml.h:3
-#: ../ui/evolution-addressbook.xml.h:40
+#: ../ui/evolution-addressbook.xml.h:58
#: ../ui/evolution-calendar.xml.h:44
-#: ../ui/evolution-mail-message.xml.h:120
-#: ../ui/evolution-tasks.xml.h:27
+#: ../ui/evolution-mail-message.xml.h:123
+#: ../ui/evolution-memos.xml.h:20
+#: ../ui/evolution-tasks.xml.h:29
msgid "_Print..."
msgstr "_Print..."
-#: ../calendar/gui/e-calendar-table.c:1161
-#: ../calendar/gui/e-calendar-view.c:1534
-#: ../ui/evolution-addressbook.xml.h:1
+#: ../calendar/gui/e-calendar-table.c:1287
+#: ../calendar/gui/e-calendar-view.c:1704
+#: ../calendar/gui/e-memo-table.c:908
+#: ../ui/evolution-addressbook.xml.h:2
#: ../ui/evolution-calendar.xml.h:1
+#: ../ui/evolution-memos.xml.h:1
#: ../ui/evolution-tasks.xml.h:1
msgid "C_ut"
msgstr "C_ut"
-#: ../calendar/gui/e-calendar-table.c:1163
-#: ../calendar/gui/e-calendar-view.c:1512
-#: ../calendar/gui/e-calendar-view.c:1536
-#: ../ui/evolution-addressbook.xml.h:38
+#: ../calendar/gui/e-calendar-table.c:1289
+#: ../calendar/gui/e-calendar-view.c:1687
+#: ../calendar/gui/e-calendar-view.c:1706
+#: ../calendar/gui/e-memo-table.c:910
+#: ../ui/evolution-addressbook.xml.h:57
#: ../ui/evolution-calendar.xml.h:43
-#: ../ui/evolution-composer-entries.xml.h:9
-#: ../ui/evolution-tasks.xml.h:26
+#: ../ui/evolution-composer-entries.xml.h:15
+#: ../ui/evolution-editor.xml.h:22
+#: ../ui/evolution-memos.xml.h:19
+#: ../ui/evolution-tasks.xml.h:28
msgid "_Paste"
msgstr "_Paste"
-#: ../calendar/gui/e-calendar-table.c:1167
-#: ../ui/evolution-tasks.xml.h:20
+#: ../calendar/gui/e-calendar-table.c:1293
+#: ../ui/evolution-tasks.xml.h:22
msgid "_Assign Task"
msgstr "_Assign Task"
-#: ../calendar/gui/e-calendar-table.c:1168
-#: ../ui/evolution-tasks.xml.h:24
+#: ../calendar/gui/e-calendar-table.c:1294
+#: ../calendar/gui/e-memo-table.c:914
+#: ../ui/evolution-tasks.xml.h:26
msgid "_Forward as iCalendar"
msgstr "_Forward as iCalendar"
-#: ../calendar/gui/e-calendar-table.c:1169
+#: ../calendar/gui/e-calendar-table.c:1295
msgid "_Mark as Complete"
msgstr "_Mark as Complete"
-#: ../calendar/gui/e-calendar-table.c:1170
+#: ../calendar/gui/e-calendar-table.c:1296
msgid "_Mark Selected Tasks as Complete"
msgstr "_Mark Selected Tasks as Complete"
-#. FIXME: need to disable for undeletable folders
-#: ../calendar/gui/e-calendar-table.c:1174
-#: ../calendar/gui/e-calendar-view.c:1548
-#: ../mail/em-folder-tree.c:2043
-#: ../mail/em-folder-view.c:1049
-#: ../ui/evolution-addressbook.xml.h:33
-#: ../ui/evolution-calendar.xml.h:40
-#: ../ui/evolution-mail-list.xml.h:27
-#: ../ui/evolution-tasks.xml.h:22
-msgid "_Delete"
-msgstr "_Delete"
+#: ../calendar/gui/e-calendar-table.c:1297
+msgid "_Mark as Incomplete"
+msgstr "_Mark as Incomplete"
+
+#: ../calendar/gui/e-calendar-table.c:1298
+msgid "_Mark Selected Tasks as Incomplete"
+msgstr "_Mark Selected Tasks as Incomplete"
-#: ../calendar/gui/e-calendar-table.c:1175
+#: ../calendar/gui/e-calendar-table.c:1303
msgid "_Delete Selected Tasks"
msgstr "_Delete Selected Tasks"
-#: ../calendar/gui/e-calendar-table.c:1326
+#: ../calendar/gui/e-calendar-table.c:1536
#: ../calendar/gui/e-calendar-table.etspec.h:4
msgid "Click to add a task"
msgstr "Click to add a task"
@@ -6660,7 +7056,7 @@ msgid "% Complete"
msgstr "% Complete"
#: ../calendar/gui/e-calendar-table.etspec.h:5
-#: ../mail/mail-send-recv.c:617
+#: ../mail/mail-send-recv.c:656
msgid "Complete"
msgstr "Complete"
@@ -6685,101 +7081,120 @@ msgstr "Start date"
msgid "Task sort"
msgstr "Task sort"
-#: ../calendar/gui/e-calendar-view.c:1231
+#: ../calendar/gui/e-calendar-view.c:1367
msgid "Moving items"
msgstr "Moving items"
-#: ../calendar/gui/e-calendar-view.c:1233
+#: ../calendar/gui/e-calendar-view.c:1369
msgid "Copying items"
msgstr "Copying items"
-#: ../calendar/gui/e-calendar-view.c:1503
+#: ../calendar/gui/e-calendar-view.c:1678
msgid "New _Appointment..."
msgstr "New _Appointment..."
-#: ../calendar/gui/e-calendar-view.c:1504
+#: ../calendar/gui/e-calendar-view.c:1679
msgid "New All Day _Event"
msgstr "New All Day _Event"
-#: ../calendar/gui/e-calendar-view.c:1506
-msgid "New Task"
-msgstr "New Task"
+#: ../calendar/gui/e-calendar-view.c:1680
+msgid "New _Meeting"
+msgstr "New _Meeting"
#. FIXME: hook in this somehow
-#: ../calendar/gui/e-calendar-view.c:1516
-msgid "Current View"
-msgstr "Current View"
+#: ../calendar/gui/e-calendar-view.c:1691
+msgid "_Current View"
+msgstr "_Current View"
-#: ../calendar/gui/e-calendar-view.c:1518
-#: ../ui/evolution-calendar.xml.h:26
-msgid "Select _Today"
-msgstr "Select _Today"
+#: ../calendar/gui/e-calendar-view.c:1693
+msgid "Select T_oday"
+msgstr "Select T_oday"
-#: ../calendar/gui/e-calendar-view.c:1519
+#: ../calendar/gui/e-calendar-view.c:1694
msgid "_Select Date..."
msgstr "_Select Date..."
-#. TODO: Why is this in a context menu when it applies globally?
-#: ../calendar/gui/e-calendar-view.c:1524
-#: ../ui/evolution-calendar.xml.h:45
-msgid "_Publish Free/Busy Information"
-msgstr "_Publish Free/Busy Information"
-
-#: ../calendar/gui/e-calendar-view.c:1540
+#: ../calendar/gui/e-calendar-view.c:1710
msgid "Cop_y to Calendar..."
msgstr "Cop_y to Calendar..."
-#: ../calendar/gui/e-calendar-view.c:1541
+#: ../calendar/gui/e-calendar-view.c:1711
msgid "Mo_ve to Calendar..."
msgstr "Mo_ve to Calendar..."
-#: ../calendar/gui/e-calendar-view.c:1542
+#: ../calendar/gui/e-calendar-view.c:1712
msgid "_Delegate Meeting..."
msgstr "_Delegate Meeting..."
-#: ../calendar/gui/e-calendar-view.c:1543
+#: ../calendar/gui/e-calendar-view.c:1713
msgid "_Schedule Meeting..."
msgstr "_Schedule Meeting..."
-#: ../calendar/gui/e-calendar-view.c:1544
+#: ../calendar/gui/e-calendar-view.c:1714
msgid "_Forward as iCalendar..."
msgstr "_Forward as iCalendar..."
-#: ../calendar/gui/e-calendar-view.c:1549
+#: ../calendar/gui/e-calendar-view.c:1715
+msgid "_Reply"
+msgstr "_Reply"
+
+#: ../calendar/gui/e-calendar-view.c:1716
+#: ../mail/em-folder-view.c:1122
+#: ../mail/em-popup.c:559
+#: ../mail/em-popup.c:570
+#: ../ui/evolution-mail-message.xml.h:81
+msgid "Reply to _All"
+msgstr "Reply to _All"
+
+#: ../calendar/gui/e-calendar-view.c:1721
msgid "Make this Occurrence _Movable"
msgstr "Make this Occurrence _Movable"
-#: ../calendar/gui/e-calendar-view.c:1550
+#: ../calendar/gui/e-calendar-view.c:1722
+#: ../ui/evolution-calendar.xml.h:9
msgid "Delete this _Occurrence"
msgstr "Delete this _Occurrence"
-#: ../calendar/gui/e-calendar-view.c:1551
+#: ../calendar/gui/e-calendar-view.c:1723
msgid "Delete _All Occurrences"
msgstr "Delete _All Occurrences"
+#. To Translators: It will display "Organiser: NameOfTheUser <email@ofuser.com>"
+#: ../calendar/gui/e-calendar-view.c:2175
+#, 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:2179
+#, c-format
+msgid "Organizer: %s"
+msgstr "Organiser: %s"
+
+#. To Translators: It will display "Location: PlaceOfTheMeeting"
+#: ../calendar/gui/e-calendar-view.c:2195
+#: ../calendar/gui/print.c:2349
+#, c-format
+msgid "Location: %s"
+msgstr "Location: %s"
+
+#. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
+#: ../calendar/gui/e-calendar-view.c:2226
+#, c-format
+msgid "Time: %s %s"
+msgstr "Time: %s %s"
+
#. strftime format of a weekday, a date and a time, 24-hour.
-#. strptime format of a weekday, a date and a time,
-#. in 24-hour format.
-#. strftime format of a weekday, a date and a
-#. time, in 24-hour format.
-#: ../calendar/gui/e-cell-date-edit-text.c:115
-#: ../e-util/e-time-utils.c:180
-#: ../e-util/e-time-utils.c:393
+#: ../calendar/gui/e-cell-date-edit-text.c:116
msgid "%a %m/%d/%Y %H:%M:%S"
msgstr "%a %d/%m/%Y %H:%M:%S"
#. strftime format of a weekday, a date and a time, 12-hour.
-#. strptime format of a weekday, a date and a time,
-#. in 12-hour format.
-#. strftime format of a weekday, a date and a
-#. time, in 12-hour format.
-#: ../calendar/gui/e-cell-date-edit-text.c:118
-#: ../e-util/e-time-utils.c:175
-#: ../e-util/e-time-utils.c:402
+#: ../calendar/gui/e-cell-date-edit-text.c:119
msgid "%a %m/%d/%Y %I:%M:%S %p"
msgstr "%a %d/%m/%Y %I:%M:%S %p"
-#: ../calendar/gui/e-cell-date-edit-text.c:123
+#: ../calendar/gui/e-cell-date-edit-text.c:124
#, c-format
msgid ""
"The date must be entered in the format: \n"
@@ -6790,7 +7205,11 @@ msgstr ""
"\n"
"%s"
-#: ../calendar/gui/e-day-view-time-item.c:553
+#. 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:808
#, c-format
msgid "%02i minute divisions"
msgstr "%02i minute divisions"
@@ -6801,488 +7220,476 @@ msgstr "%02i minute divisions"
#. month, %B = full month name. You can change the
#. order but don't change the specifiers or add
#. anything.
-#: ../calendar/gui/e-day-view-top-item.c:715
-#: ../calendar/gui/e-day-view.c:1493
-#: ../calendar/gui/e-week-view-main-item.c:312
-#: ../calendar/gui/print.c:1517
+#: ../calendar/gui/e-day-view-top-item.c:1311
+#: ../calendar/gui/e-day-view.c:2087
+#: ../calendar/gui/e-week-view-main-item.c:310
+#: ../calendar/gui/e-week-view-main-item.c:524
+#: ../calendar/gui/print.c:1538
msgid "%A %d %B"
msgstr "%A %d %B"
#. String to use in 12-hour time format for times in the morning.
-#: ../calendar/gui/e-day-view.c:748
-#: ../calendar/gui/e-week-view.c:512
-#: ../calendar/gui/print.c:841
+#: ../calendar/gui/e-day-view.c:746
+#: ../calendar/gui/e-day-view.c:1087
+#: ../calendar/gui/e-week-view.c:503
+#: ../calendar/gui/print.c:858
msgid "am"
msgstr "am"
#. String to use in 12-hour time format for times in the afternoon.
-#: ../calendar/gui/e-day-view.c:751
-#: ../calendar/gui/e-week-view.c:515
-#: ../calendar/gui/print.c:843
+#: ../calendar/gui/e-day-view.c:749
+#: ../calendar/gui/e-day-view.c:1090
+#: ../calendar/gui/e-week-view.c:506
+#: ../calendar/gui/print.c:860
msgid "pm"
msgstr "pm"
-#: ../calendar/gui/e-itip-control.c:763
+#: ../calendar/gui/e-itip-control.c:759
msgid "Yes. (Complex Recurrence)"
msgstr "Yes. (Complex Recurrence)"
-#: ../calendar/gui/e-itip-control.c:774
+#: ../calendar/gui/e-itip-control.c:770
#, c-format
msgid "Every day"
msgid_plural "Every %d days"
msgstr[0] "Every day"
msgstr[1] "Every %d days"
-#: ../calendar/gui/e-itip-control.c:779
+#: ../calendar/gui/e-itip-control.c:775
#, c-format
msgid "Every week"
msgid_plural "Every %d weeks"
msgstr[0] "Every week"
msgstr[1] "Every time"
-#: ../calendar/gui/e-itip-control.c:781
+#: ../calendar/gui/e-itip-control.c:777
#, c-format
msgid "Every week on "
msgid_plural "Every %d weeks on "
msgstr[0] "Every week on "
msgstr[1] "Every %d weeks on "
-#: ../calendar/gui/e-itip-control.c:789
+#: ../calendar/gui/e-itip-control.c:785
msgid " and "
msgstr " and "
-#: ../calendar/gui/e-itip-control.c:796
+#: ../calendar/gui/e-itip-control.c:792
#, c-format
msgid "The %s day of "
msgstr "The %s day of "
-#: ../calendar/gui/e-itip-control.c:809
+#: ../calendar/gui/e-itip-control.c:805
#, c-format
msgid "The %s %s of "
msgstr "The %s %s of "
-#: ../calendar/gui/e-itip-control.c:816
+#: ../calendar/gui/e-itip-control.c:812
#, c-format
msgid "every month"
msgid_plural "every %d months"
msgstr[0] "every month"
msgstr[1] "every %d months"
-#: ../calendar/gui/e-itip-control.c:820
+#: ../calendar/gui/e-itip-control.c:816
#, c-format
msgid "Every year"
msgid_plural "Every %d years"
msgstr[0] "Every year"
msgstr[1] "Every %d years"
-#: ../calendar/gui/e-itip-control.c:831
+#: ../calendar/gui/e-itip-control.c:827
#, c-format
msgid "a total of %d time"
msgid_plural " a total of %d times"
msgstr[0] "a total of %d time"
msgstr[1] " a total of %d times"
-#: ../calendar/gui/e-itip-control.c:840
+#: ../calendar/gui/e-itip-control.c:836
msgid ", ending on "
msgstr ", ending on "
-#: ../calendar/gui/e-itip-control.c:864
+#: ../calendar/gui/e-itip-control.c:857
msgid "Starts"
msgstr "Starts"
-#: ../calendar/gui/e-itip-control.c:877
+#: ../calendar/gui/e-itip-control.c:870
msgid "Ends"
msgstr "Ends"
-#: ../calendar/gui/e-itip-control.c:911
+#: ../calendar/gui/e-itip-control.c:904
#: ../plugins/save-calendar/csv-format.c:395
msgid "Due"
msgstr "Due"
-#: ../calendar/gui/e-itip-control.c:951
-#: ../calendar/gui/e-itip-control.c:1008
+#: ../calendar/gui/e-itip-control.c:944
+#: ../calendar/gui/e-itip-control.c:1001
msgid "iCalendar Information"
msgstr "iCalendar Information"
#. Title
-#: ../calendar/gui/e-itip-control.c:968
+#: ../calendar/gui/e-itip-control.c:961
msgid "iCalendar Error"
msgstr "iCalendar Error"
-#: ../calendar/gui/e-itip-control.c:1040
-#: ../calendar/gui/e-itip-control.c:1056
-#: ../calendar/gui/e-itip-control.c:1067
-#: ../calendar/gui/e-itip-control.c:1084
-#: ../plugins/itip-formatter/itip-view.c:338
-#: ../plugins/itip-formatter/itip-view.c:339
-#: ../plugins/itip-formatter/itip-view.c:406
-#: ../plugins/itip-formatter/itip-view.c:407
+#: ../calendar/gui/e-itip-control.c:1033
+#: ../calendar/gui/e-itip-control.c:1049
+#: ../calendar/gui/e-itip-control.c:1060
+#: ../calendar/gui/e-itip-control.c:1077
+#: ../plugins/itip-formatter/itip-view.c:342
+#: ../plugins/itip-formatter/itip-view.c:343
+#: ../plugins/itip-formatter/itip-view.c:410
+#: ../plugins/itip-formatter/itip-view.c:411
+#: ../plugins/itip-formatter/itip-view.c:478
+#: ../plugins/itip-formatter/itip-view.c:479
msgid "An unknown person"
msgstr "An unknown person"
#. Describe what the user can do
-#: ../calendar/gui/e-itip-control.c:1091
+#: ../calendar/gui/e-itip-control.c:1084
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:1139
-#: ../calendar/gui/e-meeting-list-view.c:204
-#: ../calendar/gui/e-meeting-store.c:188
-#: ../calendar/gui/e-meeting-store.c:211
-#: ../calendar/gui/itip-utils.c:548
-#: ../plugins/itip-formatter/itip-formatter.c:1640
+#: ../calendar/gui/e-itip-control.c:1132
+#: ../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:685
+#: ../plugins/itip-formatter/itip-formatter.c:1752
msgid "Accepted"
msgstr "Accepted"
-#: ../calendar/gui/e-itip-control.c:1143
-#: ../calendar/gui/itip-utils.c:551
-#: ../plugins/itip-formatter/itip-formatter.c:1643
+#: ../calendar/gui/e-itip-control.c:1136
+#: ../calendar/gui/itip-utils.c:688
+#: ../plugins/itip-formatter/itip-formatter.c:1755
msgid "Tentatively Accepted"
msgstr "Tentatively Accepted"
-#: ../calendar/gui/e-itip-control.c:1147
-#: ../calendar/gui/e-meeting-list-view.c:205
-#: ../calendar/gui/e-meeting-store.c:190
-#: ../calendar/gui/e-meeting-store.c:213
-#: ../calendar/gui/itip-utils.c:554
-#: ../calendar/gui/itip-utils.c:583
-#: ../plugins/itip-formatter/itip-formatter.c:1646
+#: ../calendar/gui/e-itip-control.c:1140
+#: ../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:691
+#: ../calendar/gui/itip-utils.c:720
+#: ../plugins/itip-formatter/itip-formatter.c:1758
msgid "Declined"
msgstr "Declined"
-#: ../calendar/gui/e-itip-control.c:1231
-msgid "The meeting has been cancelled, however it could not be found in your calendars"
+#: ../calendar/gui/e-itip-control.c:1224
+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:1233
-msgid "The task has been cancelled, however it could not be found in your task lists"
+#: ../calendar/gui/e-itip-control.c:1226
+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:1312
+#: ../calendar/gui/e-itip-control.c:1305
#, c-format
msgid "<b>%s</b> has published meeting information."
msgstr "<b>%s</b> has published meeting information."
-#: ../calendar/gui/e-itip-control.c:1313
+#: ../calendar/gui/e-itip-control.c:1306
msgid "Meeting Information"
msgstr "Meeting Information"
-#: ../calendar/gui/e-itip-control.c:1319
+#: ../calendar/gui/e-itip-control.c:1312
#, 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:1321
+#: ../calendar/gui/e-itip-control.c:1314
#, 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:1322
+#: ../calendar/gui/e-itip-control.c:1315
msgid "Meeting Proposal"
msgstr "Meeting Proposal"
#. FIXME Whats going on here?
-#: ../calendar/gui/e-itip-control.c:1328
+#: ../calendar/gui/e-itip-control.c:1321
#, c-format
msgid "<b>%s</b> wishes to add to an existing meeting."
msgstr "<b>%s</b> wishes to add to an existing meeting."
-#: ../calendar/gui/e-itip-control.c:1329
+#: ../calendar/gui/e-itip-control.c:1322
msgid "Meeting Update"
msgstr "Meeting Update"
-#: ../calendar/gui/e-itip-control.c:1333
+#: ../calendar/gui/e-itip-control.c:1326
#, 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:1334
+#: ../calendar/gui/e-itip-control.c:1327
msgid "Meeting Update Request"
msgstr "Meeting Update Request"
-#: ../calendar/gui/e-itip-control.c:1341
+#: ../calendar/gui/e-itip-control.c:1334
#, 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:1342
+#: ../calendar/gui/e-itip-control.c:1335
msgid "Meeting Reply"
msgstr "Meeting Reply"
-#: ../calendar/gui/e-itip-control.c:1349
+#: ../calendar/gui/e-itip-control.c:1342
#, c-format
-msgid "<b>%s</b> has cancelled a meeting."
+msgid "<b>%s</b> has canceled a meeting."
msgstr "<b>%s</b> has cancelled a meeting."
-#: ../calendar/gui/e-itip-control.c:1350
-msgid "Meeting Cancellation"
+#: ../calendar/gui/e-itip-control.c:1343
+msgid "Meeting Cancelation"
msgstr "Meeting Cancellation"
-#: ../calendar/gui/e-itip-control.c:1360
-#: ../calendar/gui/e-itip-control.c:1437
-#: ../calendar/gui/e-itip-control.c:1477
+#: ../calendar/gui/e-itip-control.c:1353
+#: ../calendar/gui/e-itip-control.c:1430
+#: ../calendar/gui/e-itip-control.c:1470
#, 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:1361
+#: ../calendar/gui/e-itip-control.c:1354
msgid "Bad Meeting Message"
msgstr "Bad Meeting Message"
-#: ../calendar/gui/e-itip-control.c:1388
+#: ../calendar/gui/e-itip-control.c:1381
#, c-format
msgid "<b>%s</b> has published task information."
msgstr "<b>%s</b> has published task information."
-#: ../calendar/gui/e-itip-control.c:1389
+#: ../calendar/gui/e-itip-control.c:1382
msgid "Task Information"
msgstr "Task Information"
-#: ../calendar/gui/e-itip-control.c:1396
+#: ../calendar/gui/e-itip-control.c:1389
#, 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:1398
+#: ../calendar/gui/e-itip-control.c:1391
#, 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:1399
+#: ../calendar/gui/e-itip-control.c:1392
msgid "Task Proposal"
msgstr "Task Proposal"
#. FIXME Whats going on here?
-#: ../calendar/gui/e-itip-control.c:1405
+#: ../calendar/gui/e-itip-control.c:1398
#, c-format
msgid "<b>%s</b> wishes to add to an existing task."
msgstr "<b>%s</b> wishes to add to an existing task."
-#: ../calendar/gui/e-itip-control.c:1406
+#: ../calendar/gui/e-itip-control.c:1399
msgid "Task Update"
msgstr "Task Update"
-#: ../calendar/gui/e-itip-control.c:1410
+#: ../calendar/gui/e-itip-control.c:1403
#, 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:1411
+#: ../calendar/gui/e-itip-control.c:1404
msgid "Task Update Request"
msgstr "Task Update Request"
-#: ../calendar/gui/e-itip-control.c:1418
+#: ../calendar/gui/e-itip-control.c:1411
#, 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:1419
+#: ../calendar/gui/e-itip-control.c:1412
msgid "Task Reply"
msgstr "Task Reply"
-#: ../calendar/gui/e-itip-control.c:1426
+#: ../calendar/gui/e-itip-control.c:1419
#, c-format
-msgid "<b>%s</b> has cancelled a task."
+msgid "<b>%s</b> has canceled a task."
msgstr "<b>%s</b> has cancelled a task."
-#: ../calendar/gui/e-itip-control.c:1427
-msgid "Task Cancellation"
+#: ../calendar/gui/e-itip-control.c:1420
+msgid "Task Cancelation"
msgstr "Task Cancellation"
-#: ../calendar/gui/e-itip-control.c:1438
+#: ../calendar/gui/e-itip-control.c:1431
msgid "Bad Task Message"
msgstr "Bad Task Message"
-#: ../calendar/gui/e-itip-control.c:1462
+#: ../calendar/gui/e-itip-control.c:1455
#, 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:1463
+#: ../calendar/gui/e-itip-control.c:1456
msgid "Free/Busy Information"
msgstr "Free/Busy Information"
-#: ../calendar/gui/e-itip-control.c:1467
+#: ../calendar/gui/e-itip-control.c:1460
#, 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:1468
+#: ../calendar/gui/e-itip-control.c:1461
msgid "Free/Busy Request"
msgstr "Free/Busy Request"
-#: ../calendar/gui/e-itip-control.c:1472
+#: ../calendar/gui/e-itip-control.c:1465
#, 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:1473
+#: ../calendar/gui/e-itip-control.c:1466
msgid "Free/Busy Reply"
msgstr "Free/Busy Reply"
-#: ../calendar/gui/e-itip-control.c:1478
+#: ../calendar/gui/e-itip-control.c:1471
msgid "Bad Free/Busy Message"
msgstr "Bad Free/Busy Message"
-#: ../calendar/gui/e-itip-control.c:1553
+#: ../calendar/gui/e-itip-control.c:1546
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:1612
+#: ../calendar/gui/e-itip-control.c:1605
msgid "The message contains only unsupported requests."
msgstr "The message contains only unsupported requests."
-#: ../calendar/gui/e-itip-control.c:1645
+#: ../calendar/gui/e-itip-control.c:1638
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:1677
+#: ../calendar/gui/e-itip-control.c:1670
msgid "The attachment has no viewable calendar items"
msgstr "The attachment has no viewable calendar items"
-#: ../calendar/gui/e-itip-control.c:1911
+#: ../calendar/gui/e-itip-control.c:1904
msgid "Update complete\n"
msgstr "Update complete\n"
-#: ../calendar/gui/e-itip-control.c:1939
+#: ../calendar/gui/e-itip-control.c:1932
msgid "Object is invalid and cannot be updated\n"
msgstr "Object is invalid and cannot be updated\n"
-#: ../calendar/gui/e-itip-control.c:1949
+#: ../calendar/gui/e-itip-control.c:1942
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:1961
+#: ../calendar/gui/e-itip-control.c:1954
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:1978
+#: ../calendar/gui/e-itip-control.c:1971
msgid "Attendee status updated\n"
msgstr "Attendee status updated\n"
-#: ../calendar/gui/e-itip-control.c:1981
-#: ../plugins/itip-formatter/itip-formatter.c:1025
+#: ../calendar/gui/e-itip-control.c:1974
+#: ../plugins/itip-formatter/itip-formatter.c:1104
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:2011
-msgid "Removal Complete"
-msgstr "Removal Complete"
-
-#: ../calendar/gui/e-itip-control.c:2034
-#: ../calendar/gui/e-itip-control.c:2082
+#: ../calendar/gui/e-itip-control.c:1998
+#: ../calendar/gui/e-itip-control.c:2046
msgid "Item sent!\n"
msgstr "Item sent!\n"
-#: ../calendar/gui/e-itip-control.c:2036
-#: ../calendar/gui/e-itip-control.c:2086
+#: ../calendar/gui/e-itip-control.c:2000
+#: ../calendar/gui/e-itip-control.c:2050
msgid "The item could not be sent!\n"
msgstr "The item could not be sent!\n"
-#: ../calendar/gui/e-itip-control.c:2166
+#: ../calendar/gui/e-itip-control.c:2130
msgid "Choose an action:"
msgstr "Choose an action:"
-#: ../calendar/gui/e-itip-control.c:2237
+#: ../calendar/gui/e-itip-control.c:2202
msgid "Update"
msgstr "Update"
-#: ../calendar/gui/e-itip-control.c:2265
+#: ../calendar/gui/e-itip-control.c:2230
#: ../plugins/groupwise-features/process-meeting.c:48
msgid "Accept"
msgstr "Accept"
-#: ../calendar/gui/e-itip-control.c:2266
+#: ../calendar/gui/e-itip-control.c:2231
msgid "Tentatively accept"
msgstr "Tentatively accept"
-#: ../calendar/gui/e-itip-control.c:2267
+#: ../calendar/gui/e-itip-control.c:2232
#: ../plugins/groupwise-features/process-meeting.c:50
msgid "Decline"
msgstr "Decline"
-#: ../calendar/gui/e-itip-control.c:2296
+#: ../calendar/gui/e-itip-control.c:2261
msgid "Send Free/Busy Information"
msgstr "Send Free/Busy Information"
-#: ../calendar/gui/e-itip-control.c:2324
+#: ../calendar/gui/e-itip-control.c:2289
msgid "Update respondent status"
msgstr "Update respondent status"
-#: ../calendar/gui/e-itip-control.c:2352
+#: ../calendar/gui/e-itip-control.c:2317
msgid "Send Latest Information"
msgstr "Send Latest Information"
-#: ../calendar/gui/e-itip-control.c:2380
-#: ../calendar/gui/itip-utils.c:571
-#: ../mail/mail-send-recv.c:414
-#: ../mail/mail-send-recv.c:466
+#: ../calendar/gui/e-itip-control.c:2345
+#: ../calendar/gui/itip-utils.c:708
+#: ../mail/mail-send-recv.c:451
+#: ../mail/mail-send-recv.c:504
#: ../ui/evolution-mail-global.xml.h:1
msgid "Cancel"
msgstr "Cancel"
-#: ../calendar/gui/e-itip-control.glade.h:2
-#, no-c-format
-msgid "%P %%"
-msgstr "%P %%"
-
-#: ../calendar/gui/e-itip-control.glade.h:3
+#: ../calendar/gui/e-itip-control.glade.h:1
msgid "--to--"
msgstr "--to--"
-#: ../calendar/gui/e-itip-control.glade.h:4
+#: ../calendar/gui/e-itip-control.glade.h:2
msgid "Calendar Message"
msgstr "Calendar Message"
-#: ../calendar/gui/e-itip-control.glade.h:5
+#: ../calendar/gui/e-itip-control.glade.h:3
msgid "Date:"
msgstr "Date:"
-#: ../calendar/gui/e-itip-control.glade.h:7
+#: ../calendar/gui/e-itip-control.glade.h:5
msgid "Loading Calendar"
msgstr "Loading Calendar"
-#: ../calendar/gui/e-itip-control.glade.h:8
+#: ../calendar/gui/e-itip-control.glade.h:6
msgid "Loading calendar..."
msgstr "Loading calendar..."
-#: ../calendar/gui/e-itip-control.glade.h:10
+#: ../calendar/gui/e-itip-control.glade.h:8
msgid "Server Message:"
msgstr "Server Message:"
-#: ../calendar/gui/e-itip-control.glade.h:12
-msgid "date-end"
-msgstr "date-end"
-
-#: ../calendar/gui/e-itip-control.glade.h:13
-msgid "date-start"
-msgstr "date-start"
-
-#: ../calendar/gui/e-meeting-list-view.c:69
+#: ../calendar/gui/e-meeting-list-view.c:70
msgid "Chair Persons"
msgstr "Chair Persons"
-#: ../calendar/gui/e-meeting-list-view.c:70
-#: ../calendar/gui/e-meeting-list-view.c:153
+#: ../calendar/gui/e-meeting-list-view.c:71
+#: ../calendar/gui/e-meeting-list-view.c:154
msgid "Required Participants"
msgstr "Required Participants"
-#: ../calendar/gui/e-meeting-list-view.c:71
+#: ../calendar/gui/e-meeting-list-view.c:72
msgid "Optional Participants"
msgstr "Optional Participants"
-#: ../calendar/gui/e-meeting-list-view.c:72
+#: ../calendar/gui/e-meeting-list-view.c:73
msgid "Resources"
msgstr "Resources"
-#: ../calendar/gui/e-meeting-list-view.c:164
+#: ../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:802
+#: ../calendar/gui/e-meeting-store.c:758
msgid "Individual"
msgstr "Individual"
-#: ../calendar/gui/e-meeting-list-view.c:165
+#: ../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-no-group.glade.h:7
@@ -7290,74 +7697,79 @@ msgstr "Individual"
msgid "Group"
msgstr "Group"
-#: ../calendar/gui/e-meeting-list-view.c:166
+#: ../calendar/gui/e-meeting-list-view.c:167
#: ../calendar/gui/e-meeting-store.c:103
#: ../calendar/gui/e-meeting-store.c:120
msgid "Resource"
msgstr "Resource"
-#: ../calendar/gui/e-meeting-list-view.c:167
+#: ../calendar/gui/e-meeting-list-view.c:168
#: ../calendar/gui/e-meeting-store.c:105
#: ../calendar/gui/e-meeting-store.c:122
msgid "Room"
msgstr "Room"
-#: ../calendar/gui/e-meeting-list-view.c:178
+#: ../calendar/gui/e-meeting-list-view.c:179
#: ../calendar/gui/e-meeting-store.c:134
#: ../calendar/gui/e-meeting-store.c:151
msgid "Chair"
msgstr "Chair"
-#: ../calendar/gui/e-meeting-list-view.c:179
+#: ../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:805
+#: ../calendar/gui/e-meeting-store.c:761
msgid "Required Participant"
msgstr "Required Participant"
-#: ../calendar/gui/e-meeting-list-view.c:180
+#: ../calendar/gui/e-meeting-list-view.c:181
#: ../calendar/gui/e-meeting-store.c:138
#: ../calendar/gui/e-meeting-store.c:155
msgid "Optional Participant"
msgstr "Optional Participant"
-#: ../calendar/gui/e-meeting-list-view.c:181
+#: ../calendar/gui/e-meeting-list-view.c:182
#: ../calendar/gui/e-meeting-store.c:140
#: ../calendar/gui/e-meeting-store.c:157
msgid "Non-Participant"
msgstr "Non-Participant"
-#: ../calendar/gui/e-meeting-list-view.c:203
-#: ../calendar/gui/e-meeting-store.c:186
-#: ../calendar/gui/e-meeting-store.c:209
-#: ../calendar/gui/e-meeting-store.c:815
+#: ../calendar/gui/e-meeting-list-view.c:204
+#: ../calendar/gui/e-meeting-store.c:184
+#: ../calendar/gui/e-meeting-store.c:207
+#: ../calendar/gui/e-meeting-store.c:771
msgid "Needs Action"
msgstr "Needs Action"
-#: ../calendar/gui/e-meeting-list-view.c:206
-#: ../calendar/gui/e-meeting-store.c:192
-#: ../calendar/gui/e-meeting-store.c:215
+#: ../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:411
msgid "Tentative"
msgstr "Tentative"
-#: ../calendar/gui/e-meeting-list-view.c:207
-#: ../calendar/gui/e-meeting-store.c:194
-#: ../calendar/gui/e-meeting-store.c:217
-#: ../calendar/gui/itip-utils.c:557
-#: ../plugins/itip-formatter/itip-formatter.c:1649
+#: ../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:694
+#: ../plugins/itip-formatter/itip-formatter.c:1761
msgid "Delegated"
msgstr "Delegated"
-#: ../calendar/gui/e-meeting-store.c:198
-#: ../calendar/gui/e-meeting-store.c:221
+#. The extra space is just a hack to occupy more space for Attendee
+#: ../calendar/gui/e-meeting-list-view.c:471
+msgid "Attendee "
+msgstr "Attendee "
+
+#: ../calendar/gui/e-meeting-store.c:196
+#: ../calendar/gui/e-meeting-store.c:219
msgid "In Process"
msgstr "In Process"
#. This is a strftime() format string %A = full weekday name,
#. %B = full month name, %d = month day, %Y = full year.
-#: ../calendar/gui/e-meeting-time-sel-item.c:444
-#: ../calendar/gui/e-meeting-time-sel.c:2102
+#: ../calendar/gui/e-meeting-time-sel-item.c:464
+#: ../calendar/gui/e-meeting-time-sel.c:2113
msgid "%A, %B %d, %Y"
msgstr "%A, %d %B, %Y"
@@ -7365,26 +7777,14 @@ msgstr "%A, %d %B, %Y"
#. name, %m = month number, %d = month day, %Y = full year.
#. This is a strftime() format string %a = abbreviated weekday name,
#. %m = month number, %d = month day, %Y = full year.
-#. strptime format of a weekday and a date.
-#. strftime format of a weekday and a date.
-#: ../calendar/gui/e-meeting-time-sel-item.c:448
-#: ../calendar/gui/e-meeting-time-sel.c:2135
-#: ../e-util/e-time-utils.c:203
-#: ../e-util/e-time-utils.c:296
-#: ../e-util/e-time-utils.c:384
+#: ../calendar/gui/e-meeting-time-sel-item.c:468
+#: ../calendar/gui/e-meeting-time-sel.c:2146
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.
-#. strptime format of a weekday and a date.
-#. This is the preferred date format for the locale.
-#. This is a strftime() format for a short date. %m = month,
-#. %d = day of month, %Y = year (all digits).
-#: ../calendar/gui/e-meeting-time-sel-item.c:452
-#: ../e-util/e-time-utils.c:238
-#: ../e-util/e-time-utils.c:299
-#: ../widgets/misc/e-dateedit.c:1682
+#: ../calendar/gui/e-meeting-time-sel-item.c:472
msgid "%m/%d/%Y"
msgstr "%d/%m/%Y"
@@ -7397,6 +7797,10 @@ msgstr "Out of Office"
msgid "No Information"
msgstr "No Information"
+#: ../calendar/gui/e-meeting-time-sel.c:428
+msgid "A_ttendees..."
+msgstr "A_ttendees..."
+
#: ../calendar/gui/e-meeting-time-sel.c:445
msgid "O_ptions"
msgstr "O_ptions"
@@ -7441,13 +7845,30 @@ msgstr "_Required people"
msgid "Required people and _one resource"
msgstr "Required people and _one resource"
-#: ../calendar/gui/e-pub-utils.c:300
-#, c-format
-msgid "Enter the password for %s"
-msgstr "Enter the password for %s"
+#: ../calendar/gui/e-meeting-time-sel.c:615
+msgid "_Start time:"
+msgstr "_Start time:"
-#: ../calendar/gui/e-tasks.c:798
-#: ../calendar/gui/gnome-cal.c:2532
+#: ../calendar/gui/e-meeting-time-sel.c:642
+msgid "_End time:"
+msgstr "_End time:"
+
+#: ../calendar/gui/e-memo-table.c:919
+msgid "_Delete Selected Memos"
+msgstr "_Delete Selected Memos"
+
+#: ../calendar/gui/e-memo-table.c:1070
+#: ../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-memos.c:724
+#: ../calendar/gui/e-tasks.c:837
+#: ../calendar/gui/gnome-cal.c:2748
#, c-format
msgid ""
"Error on %s:\n"
@@ -7456,77 +7877,92 @@ msgstr ""
"Error on %s:\n"
" %s"
-#: ../calendar/gui/e-tasks.c:846
+#: ../calendar/gui/e-memos.c:772
+msgid "Loading memos"
+msgstr "Loading memos"
+
+#: ../calendar/gui/e-memos.c:853
+#, c-format
+msgid "Opening memos at %s"
+msgstr "Opening memos at %s"
+
+#: ../calendar/gui/e-memos.c:1026
+#: ../calendar/gui/e-tasks.c:1240
+msgid "Deleting selected objects..."
+msgstr "Deleting selected objects..."
+
+#: ../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:885
msgid "Loading tasks"
msgstr "Loading tasks"
-#: ../calendar/gui/e-tasks.c:930
+#: ../calendar/gui/e-tasks.c:972
#, c-format
msgid "Opening tasks at %s"
msgstr "Opening tasks at %s"
-#: ../calendar/gui/e-tasks.c:1126
+#: ../calendar/gui/e-tasks.c:1217
msgid "Completing tasks..."
msgstr "Completing tasks..."
-#: ../calendar/gui/e-tasks.c:1149
-msgid "Deleting selected objects..."
-msgstr "Deleting selected objects..."
-
-#: ../calendar/gui/e-tasks.c:1176
+#: ../calendar/gui/e-tasks.c:1267
msgid "Expunging"
msgstr "Expunging"
-#: ../calendar/gui/e-timezone-entry.c:133
-msgid "Timezone Button"
-msgstr "Timezone Button"
+#: ../calendar/gui/e-timezone-entry.c:135
+msgid "Select Timezone"
+msgstr "Select Timezone"
#. strftime format %d = day of month, %B = full
#. month name. You can change the order but don't
#. change the specifiers or add anything.
-#: ../calendar/gui/e-week-view-main-item.c:329
-#: ../calendar/gui/print.c:1501
+#: ../calendar/gui/e-week-view-main-item.c:327
+#: ../calendar/gui/e-week-view-main-item.c:541
+#: ../calendar/gui/print.c:1522
msgid "%d %B"
msgstr "%d %B"
-#: ../calendar/gui/gnome-cal.c:789
+#: ../calendar/gui/gnome-cal.c:820
msgid "Updating query"
msgstr "Updating query"
-#. bonobo displays this string so it must be in locale
-#: ../calendar/gui/gnome-cal.c:2209
-#: ../widgets/menus/gal-view-instance.c:585
-#: ../widgets/menus/gal-view-menus.c:350
-msgid "Custom View"
-msgstr "Custom View"
+#: ../calendar/gui/gnome-cal.c:2409
+msgid "_Custom View"
+msgstr "_Custom View"
-#: ../calendar/gui/gnome-cal.c:2210
-#: ../widgets/menus/gal-view-instance.c:586
-msgid "Save Custom View"
-msgstr "Save Custom View"
+#: ../calendar/gui/gnome-cal.c:2410
+msgid "_Save Custom View"
+msgstr "_Save Custom View"
-#: ../calendar/gui/gnome-cal.c:2215
-#: ../widgets/menus/gal-view-instance.c:590
-#: ../widgets/menus/gal-view-menus.c:372
-msgid "Define Views..."
-msgstr "Define Views..."
+#: ../calendar/gui/gnome-cal.c:2415
+msgid "_Define Views..."
+msgstr "_Define Views..."
-#: ../calendar/gui/gnome-cal.c:2378
+#: ../calendar/gui/gnome-cal.c:2579
#, c-format
msgid "Loading appointments at %s"
msgstr "Loading appointments at %s"
-#: ../calendar/gui/gnome-cal.c:2397
+#: ../calendar/gui/gnome-cal.c:2598
#, c-format
msgid "Loading tasks at %s"
msgstr "Loading tasks at %s"
-#: ../calendar/gui/gnome-cal.c:2498
+#: ../calendar/gui/gnome-cal.c:2607
+#, c-format
+msgid "Loading memos at %s"
+msgstr "Loading memos at %s"
+
+#: ../calendar/gui/gnome-cal.c:2713
#, c-format
msgid "Opening %s"
msgstr "Opening %s"
-#: ../calendar/gui/gnome-cal.c:3388
+#: ../calendar/gui/gnome-cal.c:3641
msgid "Purging"
msgstr "Purging"
@@ -7586,66 +8022,143 @@ msgstr "September"
msgid "_Select Today"
msgstr "_Select Today"
-#: ../calendar/gui/itip-utils.c:353
-#: ../calendar/gui/itip-utils.c:402
-#: ../calendar/gui/itip-utils.c:442
+#: ../calendar/gui/itip-utils.c:412
+#: ../calendar/gui/itip-utils.c:461
+#: ../calendar/gui/itip-utils.c:563
msgid "An organizer must be set."
msgstr "An organiser must be set."
-#: ../calendar/gui/itip-utils.c:389
+#: ../calendar/gui/itip-utils.c:448
msgid "At least one attendee is necessary"
msgstr "At least one attendee is necessary"
-#: ../calendar/gui/itip-utils.c:510
-#: ../calendar/gui/itip-utils.c:632
+#: ../calendar/gui/itip-utils.c:647
+#: ../calendar/gui/itip-utils.c:770
msgid "Event information"
msgstr "Event information"
-#: ../calendar/gui/itip-utils.c:512
-#: ../calendar/gui/itip-utils.c:634
+#: ../calendar/gui/itip-utils.c:649
+#: ../calendar/gui/itip-utils.c:772
msgid "Task information"
msgstr "Task information"
-#: ../calendar/gui/itip-utils.c:514
-#: ../calendar/gui/itip-utils.c:636
+#: ../calendar/gui/itip-utils.c:651
+#: ../calendar/gui/itip-utils.c:774
msgid "Journal information"
msgstr "Journal information"
-#: ../calendar/gui/itip-utils.c:516
-#: ../calendar/gui/itip-utils.c:654
+#: ../calendar/gui/itip-utils.c:653
+#: ../calendar/gui/itip-utils.c:792
msgid "Free/Busy information"
msgstr "Free/Busy information"
-#: ../calendar/gui/itip-utils.c:518
+#: ../calendar/gui/itip-utils.c:655
msgid "Calendar information"
msgstr "Calendar information"
-#: ../calendar/gui/itip-utils.c:567
+#: ../calendar/gui/itip-utils.c:704
msgid "Updated"
msgstr "Updated"
-#: ../calendar/gui/itip-utils.c:575
+#: ../calendar/gui/itip-utils.c:712
msgid "Refresh"
msgstr "Refresh"
-#: ../calendar/gui/itip-utils.c:579
+#: ../calendar/gui/itip-utils.c:716
msgid "Counter-proposal"
msgstr "Counter-proposal"
-#: ../calendar/gui/itip-utils.c:650
+#: ../calendar/gui/itip-utils.c:788
#, c-format
msgid "Free/Busy information (%s to %s)"
msgstr "Free/Busy information (%s to %s)"
-#: ../calendar/gui/itip-utils.c:660
+#: ../calendar/gui/itip-utils.c:798
msgid "iCalendar information"
msgstr "iCalendar information"
-#: ../calendar/gui/itip-utils.c:815
+#: ../calendar/gui/itip-utils.c:953
msgid "You must be an attendee of the event."
msgstr "You must be an attendee of the event."
-#: ../calendar/gui/migration.c:151
+#: ../calendar/gui/memos-component.c:451
+msgid "_New Memo List"
+msgstr "_New Memo List"
+
+#: ../calendar/gui/memos-component.c:527
+#, 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:519
+#: ../mail/mail-component.c:563
+#, c-format
+msgid ", %d selected"
+msgid_plural ", %d selected"
+msgstr[0] ". %d selected"
+msgstr[1] ". %d selected"
+
+#: ../calendar/gui/memos-component.c:576
+msgid "Failed upgrading memos."
+msgstr "Failed upgrading memos."
+
+#: ../calendar/gui/memos-component.c:874
+#, 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
+msgid "There is no calendar available for creating memos"
+msgstr "There is no calendar available for creating memos"
+
+#: ../calendar/gui/memos-component.c:983
+msgid "Memo Source Selector"
+msgstr "Memo Source Selector"
+
+#: ../calendar/gui/memos-component.c:1166
+msgid "New memo"
+msgstr "New memo"
+
+#: ../calendar/gui/memos-component.c:1167
+msgid "Mem_o"
+msgstr "Mem_o"
+
+#: ../calendar/gui/memos-component.c:1168
+msgid "Create a new memo"
+msgstr "Create a new memo"
+
+#: ../calendar/gui/memos-component.c:1174
+msgid "New shared memo"
+msgstr "New shared memo"
+
+#: ../calendar/gui/memos-component.c:1175
+msgid "_Shared memo"
+msgstr "_Shared memo"
+
+#: ../calendar/gui/memos-component.c:1176
+msgid "Create a shared new memo"
+msgstr "Create a shared new memo"
+
+#: ../calendar/gui/memos-component.c:1182
+msgid "New memo list"
+msgstr "New memo list"
+
+#: ../calendar/gui/memos-component.c:1183
+msgid "Memo li_st"
+msgstr "Memo li_st"
+
+#: ../calendar/gui/memos-component.c:1184
+msgid "Create a new memo list"
+msgstr "Create a new memo list"
+
+#: ../calendar/gui/memos-control.c:340
+msgid "Print Memos"
+msgstr "Print Memos"
+
+#: ../calendar/gui/migration.c:164
msgid ""
"The location and hierarchy of the Evolution task folders has changed since Evolution 1.x.\n"
"\n"
@@ -7655,7 +8168,7 @@ msgstr ""
"\n"
"Please be patient while Evolution migrates your folders..."
-#: ../calendar/gui/migration.c:155
+#: ../calendar/gui/migration.c:168
msgid ""
"The location and hierarchy of the Evolution calendar folders has changed since Evolution 1.x.\n"
"\n"
@@ -7666,333 +8179,332 @@ msgstr ""
"Please be patient while Evolution migrates your folders..."
#. FIXME: set proper domain/code
-#: ../calendar/gui/migration.c:748
-#: ../calendar/gui/migration.c:915
+#: ../calendar/gui/migration.c:771
+#: ../calendar/gui/migration.c:939
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:777
+#: ../calendar/gui/migration.c:800
#, c-format
msgid "Unable to migrate calendar `%s'"
msgstr "Unable to migrate calendar `%s'"
#. FIXME: domain/code
-#: ../calendar/gui/migration.c:944
+#: ../calendar/gui/migration.c:968
#, c-format
msgid "Unable to migrate tasks `%s'"
msgstr "Unable to migrate tasks `%s'"
-#: ../calendar/gui/print.c:492
+#: ../calendar/gui/migration.c:1212
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:390
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:421
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:600
+msgid "Notes"
+msgstr "Notes"
+
+#: ../calendar/gui/print.c:574
msgid "1st"
msgstr "1st"
-#: ../calendar/gui/print.c:492
+#: ../calendar/gui/print.c:574
msgid "2nd"
msgstr "2nd"
-#: ../calendar/gui/print.c:492
+#: ../calendar/gui/print.c:574
msgid "3rd"
msgstr "3rd"
-#: ../calendar/gui/print.c:492
+#: ../calendar/gui/print.c:574
msgid "4th"
msgstr "4th"
-#: ../calendar/gui/print.c:492
+#: ../calendar/gui/print.c:574
msgid "5th"
msgstr "5th"
-#: ../calendar/gui/print.c:493
+#: ../calendar/gui/print.c:575
msgid "6th"
msgstr "6th"
-#: ../calendar/gui/print.c:493
+#: ../calendar/gui/print.c:575
msgid "7th"
msgstr "7th"
-#: ../calendar/gui/print.c:493
+#: ../calendar/gui/print.c:575
msgid "8th"
msgstr "8th"
-#: ../calendar/gui/print.c:493
+#: ../calendar/gui/print.c:575
msgid "9th"
msgstr "9th"
-#: ../calendar/gui/print.c:493
+#: ../calendar/gui/print.c:575
msgid "10th"
msgstr "10th"
-#: ../calendar/gui/print.c:494
+#: ../calendar/gui/print.c:576
msgid "11th"
msgstr "11th"
-#: ../calendar/gui/print.c:494
+#: ../calendar/gui/print.c:576
msgid "12th"
msgstr "12th"
-#: ../calendar/gui/print.c:494
+#: ../calendar/gui/print.c:576
msgid "13th"
msgstr "13th"
-#: ../calendar/gui/print.c:494
+#: ../calendar/gui/print.c:576
msgid "14th"
msgstr "14th"
-#: ../calendar/gui/print.c:494
+#: ../calendar/gui/print.c:576
msgid "15th"
msgstr "15th"
-#: ../calendar/gui/print.c:495
+#: ../calendar/gui/print.c:577
msgid "16th"
msgstr "16th"
-#: ../calendar/gui/print.c:495
+#: ../calendar/gui/print.c:577
msgid "17th"
msgstr "17th"
-#: ../calendar/gui/print.c:495
+#: ../calendar/gui/print.c:577
msgid "18th"
msgstr "18th"
-#: ../calendar/gui/print.c:495
+#: ../calendar/gui/print.c:577
msgid "19th"
msgstr "19th"
-#: ../calendar/gui/print.c:495
+#: ../calendar/gui/print.c:577
msgid "20th"
msgstr "20th"
-#: ../calendar/gui/print.c:496
+#: ../calendar/gui/print.c:578
msgid "21st"
msgstr "21st"
-#: ../calendar/gui/print.c:496
+#: ../calendar/gui/print.c:578
msgid "22nd"
msgstr "22nd"
-#: ../calendar/gui/print.c:496
+#: ../calendar/gui/print.c:578
msgid "23rd"
msgstr "23rd"
-#: ../calendar/gui/print.c:496
+#: ../calendar/gui/print.c:578
msgid "24th"
msgstr "24th"
-#: ../calendar/gui/print.c:496
+#: ../calendar/gui/print.c:578
msgid "25th"
msgstr "25th"
-#: ../calendar/gui/print.c:497
+#: ../calendar/gui/print.c:579
msgid "26th"
msgstr "26th"
-#: ../calendar/gui/print.c:497
+#: ../calendar/gui/print.c:579
msgid "27th"
msgstr "27th"
-#: ../calendar/gui/print.c:497
+#: ../calendar/gui/print.c:579
msgid "28th"
msgstr "28th"
-#: ../calendar/gui/print.c:497
+#: ../calendar/gui/print.c:579
msgid "29th"
msgstr "29th"
-#: ../calendar/gui/print.c:497
+#: ../calendar/gui/print.c:579
msgid "30th"
msgstr "30th"
-#: ../calendar/gui/print.c:498
+#: ../calendar/gui/print.c:580
msgid "31st"
msgstr "31st"
-#: ../calendar/gui/print.c:573
+#. Translators: These are workday abbreviations, e.g. Su=Sunday and Th=Thursday
+#: ../calendar/gui/print.c:655
msgid "Su"
msgstr "Su"
-#: ../calendar/gui/print.c:573
+#: ../calendar/gui/print.c:655
msgid "Mo"
msgstr "Mo"
-#: ../calendar/gui/print.c:573
+#: ../calendar/gui/print.c:655
msgid "Tu"
msgstr "Tu"
-#: ../calendar/gui/print.c:573
+#: ../calendar/gui/print.c:655
msgid "We"
msgstr "We"
-#: ../calendar/gui/print.c:574
+#: ../calendar/gui/print.c:656
msgid "Th"
msgstr "Th"
-#: ../calendar/gui/print.c:574
+#: ../calendar/gui/print.c:656
msgid "Fr"
msgstr "Fr"
-#: ../calendar/gui/print.c:574
+#: ../calendar/gui/print.c:656
msgid "Sa"
msgstr "Sa"
#. Day
-#: ../calendar/gui/print.c:1917
+#: ../calendar/gui/print.c:1936
msgid "Selected day (%a %b %d %Y)"
msgstr "Selected day (%a %d %b %Y)"
-#: ../calendar/gui/print.c:1942
-#: ../calendar/gui/print.c:1946
+#: ../calendar/gui/print.c:1961
+#: ../calendar/gui/print.c:1965
msgid "%a %b %d"
msgstr "%a %d %b"
-#: ../calendar/gui/print.c:1943
+#: ../calendar/gui/print.c:1962
msgid "%a %d %Y"
msgstr "%a %d %Y"
-#: ../calendar/gui/print.c:1947
-#: ../calendar/gui/print.c:1949
-#: ../calendar/gui/print.c:1950
+#: ../calendar/gui/print.c:1966
+#: ../calendar/gui/print.c:1968
+#: ../calendar/gui/print.c:1969
msgid "%a %b %d %Y"
msgstr "%a %d %b %Y"
-#: ../calendar/gui/print.c:1954
+#: ../calendar/gui/print.c:1973
#, c-format
msgid "Selected week (%s - %s)"
msgstr "Selected week (%s - %s)"
#. Month
-#: ../calendar/gui/print.c:1962
+#: ../calendar/gui/print.c:1981
msgid "Selected month (%b %Y)"
msgstr "Selected month (%b %Y)"
#. Year
-#: ../calendar/gui/print.c:1969
+#: ../calendar/gui/print.c:1988
msgid "Selected year (%Y)"
msgstr "Selected year (%Y)"
-#: ../calendar/gui/print.c:2320
+#: ../calendar/gui/print.c:2317
+msgid "Appointment"
+msgstr "Appointment"
+
+#: ../calendar/gui/print.c:2319
+msgid "Task"
+msgstr "Task"
+
+#: ../calendar/gui/print.c:2341
#, c-format
msgid "Summary: %s"
msgstr "Summary: %s"
-#: ../calendar/gui/print.c:2328
-#, c-format
-msgid "Location: %s"
-msgstr "Location: %s"
-
-#: ../calendar/gui/print.c:2371
+#: ../calendar/gui/print.c:2392
#, c-format
msgid "Status: %s"
msgstr "Status: %s"
-#: ../calendar/gui/print.c:2388
+#: ../calendar/gui/print.c:2409
#, c-format
msgid "Priority: %s"
msgstr "Priority: %s"
-#: ../calendar/gui/print.c:2400
+#: ../calendar/gui/print.c:2421
#, c-format
msgid "Percent Complete: %i"
msgstr "Percent Complete: %i"
-#: ../calendar/gui/print.c:2412
+#: ../calendar/gui/print.c:2433
#, c-format
msgid "URL: %s"
msgstr "URL: %s"
-#: ../calendar/gui/print.c:2426
+#: ../calendar/gui/print.c:2447
#, c-format
msgid "Categories: %s"
msgstr "Categories: %s"
-#: ../calendar/gui/print.c:2437
+#: ../calendar/gui/print.c:2458
msgid "Contacts: "
msgstr "Contacts: "
-#: ../calendar/gui/print.c:2577
-#: ../calendar/gui/print.c:2665
-#: ../calendar/gui/print.c:2791
+#: ../calendar/gui/print.c:2601
+#: ../calendar/gui/print.c:2691
+#: ../calendar/gui/print.c:2820
#: ../mail/em-format-html-print.c:178
msgid "Print Preview"
msgstr "Print Preview"
-#: ../calendar/gui/print.c:2612
+#: ../calendar/gui/print.c:2636
msgid "Print Item"
msgstr "Print Item"
-#: ../calendar/gui/tasks-component.c:439
-msgid "New Task List"
-msgstr "New Task List"
+#: ../calendar/gui/tasks-component.c:441
+msgid "_New Task List"
+msgstr "_New Task List"
-#: ../calendar/gui/tasks-component.c:515
+#: ../calendar/gui/tasks-component.c:517
#, c-format
msgid "%d task"
msgid_plural "%d tasks"
msgstr[0] "%d task"
msgstr[1] "%d tasks"
-#: ../calendar/gui/tasks-component.c:517
-#: ../mail/mail-component.c:548
-#, c-format
-msgid ", %d selected"
-msgid_plural ", %d selected"
-msgstr[0] ". %d selected"
-msgstr[1] ". %d selected"
-
-#: ../calendar/gui/tasks-component.c:564
+#: ../calendar/gui/tasks-component.c:566
msgid "Failed upgrading tasks."
msgstr "Failed upgrading tasks."
-#: ../calendar/gui/tasks-component.c:872
+#: ../calendar/gui/tasks-component.c:877
#, 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:887
+#: ../calendar/gui/tasks-component.c:890
msgid "There is no calendar available for creating tasks"
msgstr "There is no calendar available for creating tasks"
-#: ../calendar/gui/tasks-component.c:981
+#: ../calendar/gui/tasks-component.c:987
msgid "Task Source Selector"
msgstr "Task Source Selector"
-#: ../calendar/gui/tasks-component.c:1164
+#: ../calendar/gui/tasks-component.c:1170
msgid "New task"
msgstr "New task"
-#: ../calendar/gui/tasks-component.c:1165
-msgid "_Task"
-msgstr "_Task"
-
-#: ../calendar/gui/tasks-component.c:1166
+#: ../calendar/gui/tasks-component.c:1172
msgid "Create a new task"
msgstr "Create a new task"
-#: ../calendar/gui/tasks-component.c:1172
+#: ../calendar/gui/tasks-component.c:1178
msgid "New assigned task"
msgstr "New assigned task"
-#: ../calendar/gui/tasks-component.c:1173
+#: ../calendar/gui/tasks-component.c:1179
msgid "Assigne_d Task"
msgstr "Assigne_d Task"
-#: ../calendar/gui/tasks-component.c:1174
+#: ../calendar/gui/tasks-component.c:1180
msgid "Create a new assigned task"
msgstr "Create a new assigned task"
-#: ../calendar/gui/tasks-component.c:1180
+#: ../calendar/gui/tasks-component.c:1186
msgid "New task list"
msgstr "New task list"
-#: ../calendar/gui/tasks-component.c:1181
-msgid "Task l_ist"
-msgstr "Task l_ist"
+#: ../calendar/gui/tasks-component.c:1187
+msgid "Tas_k list"
+msgstr "Tas_k list"
-#: ../calendar/gui/tasks-component.c:1182
+#: ../calendar/gui/tasks-component.c:1188
msgid "Create a new task list"
msgstr "Create a new task list"
-#: ../calendar/gui/tasks-control.c:419
+#: ../calendar/gui/tasks-control.c:446
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"
@@ -8002,11 +8514,11 @@ msgstr ""
"\n"
"Really erase these tasks?"
-#: ../calendar/gui/tasks-control.c:422
+#: ../calendar/gui/tasks-control.c:449
msgid "Do not ask me again."
msgstr "Do not ask me again."
-#: ../calendar/gui/tasks-control.c:457
+#: ../calendar/gui/tasks-control.c:483
msgid "Print Tasks"
msgstr "Print Tasks"
@@ -8015,40 +8527,40 @@ msgstr "Print Tasks"
msgid "SMTWTFS"
msgstr "SMTWTFS"
-#: ../calendar/importers/icalendar-importer.c:78
+#: ../calendar/importers/icalendar-importer.c:79
msgid "Appointments and Meetings"
msgstr "Appointments and Meetings"
-#: ../calendar/importers/icalendar-importer.c:336
-#: ../calendar/importers/icalendar-importer.c:586
+#: ../calendar/importers/icalendar-importer.c:337
+#: ../calendar/importers/icalendar-importer.c:620
msgid "Opening calendar"
msgstr "Opening calendar"
-#: ../calendar/importers/icalendar-importer.c:429
+#: ../calendar/importers/icalendar-importer.c:444
msgid "iCalendar files (.ics)"
msgstr "iCalendar files (.ics)"
-#: ../calendar/importers/icalendar-importer.c:430
+#: ../calendar/importers/icalendar-importer.c:445
msgid "Evolution iCalendar importer"
msgstr "Evolution iCalendar importer"
-#: ../calendar/importers/icalendar-importer.c:494
-msgid "Reminder!!"
-msgstr "Reminder!!"
+#: ../calendar/importers/icalendar-importer.c:521
+msgid "Reminder!"
+msgstr "Reminder!"
-#: ../calendar/importers/icalendar-importer.c:539
+#: ../calendar/importers/icalendar-importer.c:573
msgid "vCalendar files (.vcf)"
msgstr "vCalendar files (.vcf)"
-#: ../calendar/importers/icalendar-importer.c:540
+#: ../calendar/importers/icalendar-importer.c:574
msgid "Evolution vCalendar importer"
msgstr "Evolution vCalendar importer"
-#: ../calendar/importers/icalendar-importer.c:702
+#: ../calendar/importers/icalendar-importer.c:736
msgid "Calendar Events"
msgstr "Calendar Events"
-#: ../calendar/importers/icalendar-importer.c:739
+#: ../calendar/importers/icalendar-importer.c:773
msgid "Evolution Calendar intelligent importer"
msgstr "Evolution Calendar intelligent importer"
@@ -8582,7 +9094,7 @@ msgid "America/Nassau"
msgstr "America/Nassau"
#: ../calendar/zones.h:138
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:4
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:3
msgid "America/New_York"
msgstr "America/New_York"
@@ -9582,15 +10094,73 @@ msgstr "Pacific/Wallis"
msgid "Pacific/Yap"
msgstr "Pacific/Yap"
-#: ../composer/e-msg-composer-hdrs.c:558
+#: ../composer/e-msg-composer-attachment-bar.c:105
+#: ../widgets/misc/e-attachment-bar.c:107
+#, c-format
+msgid "%.0fK"
+msgstr "%.0fK"
+
+#: ../composer/e-msg-composer-attachment-bar.c:108
+#: ../widgets/misc/e-attachment-bar.c:110
+#, c-format
+msgid "%.0fM"
+msgstr "%.0fM"
+
+#: ../composer/e-msg-composer-attachment-bar.c:111
+#: ../widgets/misc/e-attachment-bar.c:113
+#, c-format
+msgid "%.0fG"
+msgstr "%.0fG"
+
+#: ../composer/e-msg-composer-attachment-bar.c:740
+#: ../widgets/misc/e-attachment-bar.c:1027
+msgid "Attachment Bar"
+msgstr "Attachment Bar"
+
+#: ../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"
+
+#: ../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-attachment.glade.h:1
+#: ../widgets/misc/e-attachment.glade.h:1
+msgid "Attachment Properties"
+msgstr "Attachment Properties"
+
+#: ../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-attachment.glade.h:4
+#: ../widgets/misc/e-attachment.glade.h:4
+msgid "MIME type:"
+msgstr "MIME type:"
+
+#: ../composer/e-msg-composer-hdrs.c:570
msgid "Posting destination"
msgstr "Posting destination"
-#: ../composer/e-msg-composer-hdrs.c:559
+#: ../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:593
+#: ../composer/e-msg-composer-hdrs.c:603
msgid "Click here for the address book"
msgstr "Click here for the address book"
@@ -9601,60 +10171,60 @@ msgstr "Click here for the address book"
#. * because that causes from_changed to be called, which
#. * expects the reply_to fields to be initialized.
#.
-#: ../composer/e-msg-composer-hdrs.c:623
+#: ../composer/e-msg-composer-hdrs.c:635
msgid "_Reply-To:"
msgstr "_Reply-To:"
#.
#. * From
#.
-#: ../composer/e-msg-composer-hdrs.c:630
+#: ../composer/e-msg-composer-hdrs.c:642
msgid "Fr_om:"
msgstr "Fr_om:"
#.
#. * Subject
#.
-#: ../composer/e-msg-composer-hdrs.c:637
+#: ../composer/e-msg-composer-hdrs.c:649
msgid "S_ubject:"
msgstr "S_ubject:"
-#: ../composer/e-msg-composer-hdrs.c:646
+#: ../composer/e-msg-composer-hdrs.c:658
msgid "_To:"
msgstr "_To:"
-#: ../composer/e-msg-composer-hdrs.c:647
+#: ../composer/e-msg-composer-hdrs.c:659
msgid "Enter the recipients of the message"
msgstr "Enter the recipients of the message"
-#: ../composer/e-msg-composer-hdrs.c:650
+#: ../composer/e-msg-composer-hdrs.c:662
msgid "_Cc:"
msgstr "_Cc:"
-#: ../composer/e-msg-composer-hdrs.c:651
+#: ../composer/e-msg-composer-hdrs.c:663
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:654
+#: ../composer/e-msg-composer-hdrs.c:666
msgid "_Bcc:"
msgstr "_Bcc:"
-#: ../composer/e-msg-composer-hdrs.c:655
+#: ../composer/e-msg-composer-hdrs.c:667
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:662
+#: ../composer/e-msg-composer-hdrs.c:674
msgid "_Post To:"
msgstr "_Post To:"
-#: ../composer/e-msg-composer-hdrs.c:667
+#: ../composer/e-msg-composer-hdrs.c:679
msgid "Click here to select folders to post to"
msgstr "Click here to select folders to post to"
-#: ../composer/e-msg-composer-hdrs.c:673
+#: ../composer/e-msg-composer-hdrs.c:684
msgid "Post To:"
msgstr "Post To:"
@@ -9662,61 +10232,72 @@ msgstr "Post To:"
msgid "A_ttach"
msgstr "A_ttach"
-#: ../composer/e-msg-composer.c:738
+#: ../composer/e-msg-composer-select-file.c:243
+msgid "Insert Attachment"
+msgstr "Insert Attachment"
+
+#: ../composer/e-msg-composer.c:827
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:745
+#: ../composer/e-msg-composer.c:834
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:1224
-#: ../composer/e-msg-composer.c:1257
+#: ../composer/e-msg-composer.c:1294
+#: ../composer/e-msg-composer.c:2530
+msgid "Hide _Attachment Bar"
+msgstr "Hide _Attachment Bar"
+
+#: ../composer/e-msg-composer.c:1297
+#: ../composer/e-msg-composer.c:2533
+#: ../composer/e-msg-composer.c:3897
+msgid "Show _Attachment Bar"
+msgstr "Show _Attachment Bar"
+
+#: ../composer/e-msg-composer.c:1329
+#: ../composer/e-msg-composer.c:1363
#: ../plugins/mail-remote/e-corba-utils.c:135
msgid "Unknown reason"
msgstr "Unknown reason"
-#: ../composer/e-msg-composer.c:1294
+#: ../composer/e-msg-composer.c:1401
msgid "Could not open file"
msgstr "Could not open file"
-#: ../composer/e-msg-composer.c:1302
+#: ../composer/e-msg-composer.c:1409
msgid "Unable to retrieve message from editor"
msgstr "Unable to retrieve message from editor"
-#: ../composer/e-msg-composer.c:1572
+#: ../composer/e-msg-composer.c:1688
msgid "Untitled Message"
msgstr "Untitled Message"
#. NB: This function is never used anymore
-#: ../composer/e-msg-composer.c:1606
+#: ../composer/e-msg-composer.c:1723
msgid "Open File"
msgstr "Open File"
-#: ../composer/e-msg-composer.c:2006
-#: ../mail/em-account-editor.c:588
-#: ../mail/em-account-editor.c:633
-#: ../mail/em-account-editor.c:700
+#: ../composer/e-msg-composer.c:2173
+#: ../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:2105
+#: ../composer/e-msg-composer.c:2276
msgid "Si_gnature:"
msgstr "Si_gnature:"
-#: ../composer/e-msg-composer.c:2347
-#: ../composer/e-msg-composer.c:3527
-#: ../composer/e-msg-composer.c:3528
-msgid "Compose a message"
-msgstr "Compose a message"
+#: ../composer/e-msg-composer.c:2544
+#: ../composer/e-msg-composer.c:3779
+#: ../composer/e-msg-composer.c:3782
+msgid "Compose Message"
+msgstr "Compose Message"
-#: ../composer/e-msg-composer.c:3643
-msgid "_Attachment Bar"
-msgstr "_Attachment Bar"
-
-#: ../composer/e-msg-composer.c:4718
-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.c:5006
+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/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 "
@@ -9736,7 +10317,7 @@ msgstr "Because &quot;{0}&quot;, you may need to select different mail options."
#: ../composer/mail-composer.error.xml.h:5
#: ../e-util/e-system.error.xml.h:1
-#: ../mail/mail.error.xml.h:17
+#: ../mail/mail.error.xml.h:18
msgid "Because &quot;{1}&quot;."
msgstr "Because &quot;{1}&quot;."
@@ -9773,34 +10354,26 @@ msgid "Do you want to recover unfinished messages?"
msgstr "Do you want to recover unfinished messages?"
#: ../composer/mail-composer.error.xml.h:14
-msgid "Don't Recover"
-msgstr "Don't Recover"
-
-#: ../composer/mail-composer.error.xml.h:15
msgid "Download in progress. Do you want to send the mail?"
msgstr "Download in progress. Do you want to send the mail?"
-#: ../composer/mail-composer.error.xml.h:16
+#: ../composer/mail-composer.error.xml.h:15
msgid "Error saving to autosave because &quot;{1}&quot;."
msgstr "Error saving to autosave because &quot;{1}&quot;."
-#: ../composer/mail-composer.error.xml.h:17
+#: ../composer/mail-composer.error.xml.h:16
msgid "Evolution quit unexpectedly while you were composing a new message. Recovering the message will allow you to continue where you left off."
msgstr "Evolution quit unexpectedly while you were composing a new message. Recovering the message will allow you to continue where you left off."
-#: ../composer/mail-composer.error.xml.h:18
-msgid "Recover"
-msgstr "Recover"
-
-#: ../composer/mail-composer.error.xml.h:19
+#: ../composer/mail-composer.error.xml.h:17
msgid "The file `{0}' is not a regular file and cannot be sent in a message."
msgstr "The file `{0}' is not a regular file and cannot be sent in a message."
-#: ../composer/mail-composer.error.xml.h:20
+#: ../composer/mail-composer.error.xml.h:18
msgid "To attach the contents of this directory, either attach the files in this directory individually, or create an archive of the directory and attach it."
msgstr "To attach the contents of this directory, either attach the files in this directory individually, or create an archive of the directory and attach it."
-#: ../composer/mail-composer.error.xml.h:21
+#: ../composer/mail-composer.error.xml.h:19
msgid ""
"Unable to activate the HTML editor control.\n"
"\n"
@@ -9810,29 +10383,33 @@ msgstr ""
"\n"
"Please make sure that you have the correct version of gtkhtml and libgtkhtml installed."
-#: ../composer/mail-composer.error.xml.h:24
+#: ../composer/mail-composer.error.xml.h:22
msgid "Unable to activate the address selector control."
msgstr "Unable to activate the address selector control."
-#: ../composer/mail-composer.error.xml.h:25
+#: ../composer/mail-composer.error.xml.h:23
msgid "Unfinished messages found"
msgstr "Unfinished messages found"
-#: ../composer/mail-composer.error.xml.h:26
+#: ../composer/mail-composer.error.xml.h:24
msgid "Warning: Modified Message"
msgstr "Warning: Modified Message"
-#: ../composer/mail-composer.error.xml.h:27
+#: ../composer/mail-composer.error.xml.h:25
msgid "You cannot attach the file `{0}' to this message."
msgstr "You cannot attach the file `{0}' to this message."
-#: ../composer/mail-composer.error.xml.h:28
+#: ../composer/mail-composer.error.xml.h:26
msgid "You need to configure an account before you can compose mail."
msgstr "You need to configure an account before you can compose mail."
+#: ../composer/mail-composer.error.xml.h:28
+msgid "_Do not Recover"
+msgstr "_Do not Recover"
+
#: ../composer/mail-composer.error.xml.h:29
-msgid "_Discard Changes"
-msgstr "_Discard Changes"
+msgid "_Recover"
+msgstr "_Recover"
#: ../composer/mail-composer.error.xml.h:30
msgid "_Save Message"
@@ -9840,13 +10417,18 @@ msgstr "_Save Message"
#: ../data/evolution.desktop.in.in.h:1
#: ../plugins/default-mailer/org-gnome-default-mailer.error.xml.h:2
-#: ../shell/main.c:509
+#: ../shell/main.c:523
msgid "Evolution"
msgstr "Evolution"
#: ../data/evolution.desktop.in.in.h:2
-msgid "The Evolution Groupware Suite"
-msgstr "The Evolution Groupware Suite"
+#: ../shell/e-shell-window-commands.c:575
+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"
#: ../data/evolution.keys.in.in.h:1
msgid "address card"
@@ -9857,6 +10439,7 @@ msgid "calendar information"
msgstr "calendar information"
#: ../designs/OOA/ooa.glade.h:1
+#: ../plugins/exchange-operations/exchange-oof.glade.h:1
msgid ""
"<b>Currently, your status is \"Out of the Office\". </b>\n"
"\n"
@@ -9867,14 +10450,17 @@ msgstr ""
"Would you like to change your status to \"In the Office\"? "
#: ../designs/OOA/ooa.glade.h:4
+#: ../plugins/exchange-operations/exchange-oof.glade.h:4
msgid "<b>Out of Office Message:</b>"
msgstr "<b>Out of Office Message:</b>"
#: ../designs/OOA/ooa.glade.h:5
+#: ../plugins/exchange-operations/exchange-oof.glade.h:5
msgid "<b>Status:</b>"
msgstr "<b>Status:</b>"
#: ../designs/OOA/ooa.glade.h:6
+#: ../plugins/exchange-operations/exchange-oof.glade.h:6
msgid ""
"<small>The message specified below will be automatically sent to each person who sends\n"
"mail to you while you are out of the office.</small>"
@@ -9883,38 +10469,38 @@ msgstr ""
"mail to you while you are out of the office.</small>"
#: ../designs/OOA/ooa.glade.h:8
+#: ../plugins/exchange-operations/exchange-oof.glade.h:8
msgid "I am currently in the office"
msgstr "I am currently in the office"
#: ../designs/OOA/ooa.glade.h:9
+#: ../plugins/exchange-operations/exchange-oof.glade.h:9
msgid "I am currently out of the office"
msgstr "I am currently out of the office"
#: ../designs/OOA/ooa.glade.h:10
-msgid "No, Don't Change Status"
-msgstr "No, Don't Change Status"
+msgid "No, Do not Change Status"
+msgstr "No, Do not Change Status"
#: ../designs/OOA/ooa.glade.h:12
+#: ../plugins/exchange-operations/exchange-oof.glade.h:11
msgid "Out of Office Assistant"
msgstr "Out of Office Assistant"
#: ../designs/OOA/ooa.glade.h:13
+#: ../plugins/exchange-operations/exchange-oof.glade.h:12
msgid "Yes, Change Status"
msgstr "Yes, Change Status"
#: ../designs/read_receipts/read.glade.h:1
-msgid " "
-msgstr " "
-
-#: ../designs/read_receipts/read.glade.h:2
msgid "<b>Receiving Email</b>"
msgstr "<b>Receiving Email</b>"
-#: ../designs/read_receipts/read.glade.h:3
+#: ../designs/read_receipts/read.glade.h:2
msgid "<b>Sending Email:</b>"
msgstr "<b>Sending Email:</b>"
-#: ../designs/read_receipts/read.glade.h:4
+#: ../designs/read_receipts/read.glade.h:3
msgid ""
"<small>This page allows you to choose if you want to be notified via a 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>"
@@ -9922,35 +10508,35 @@ msgstr ""
"<small>This page allows you to choose if you want to be notified via a 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>"
-#: ../designs/read_receipts/read.glade.h:6
+#: ../designs/read_receipts/read.glade.h:5
msgid "Always send back a read receipt"
msgstr "Always send back a read receipt"
-#: ../designs/read_receipts/read.glade.h:7
+#: ../designs/read_receipts/read.glade.h:6
msgid "Ask me if I want to send back a read receipt"
msgstr "Ask me if I want to send back a read receipt"
-#: ../designs/read_receipts/read.glade.h:8
+#: ../designs/read_receipts/read.glade.h:7
msgid "Never send back a read receipt"
msgstr "Never send back a read receipt"
-#: ../designs/read_receipts/read.glade.h:9
+#: ../designs/read_receipts/read.glade.h:8
msgid "Read Receipts"
msgstr "Read Receipts"
-#: ../designs/read_receipts/read.glade.h:10
+#: ../designs/read_receipts/read.glade.h:9
msgid "Request a read receipt for all messages I send"
msgstr "Request a read receipt for all messages I send"
-#: ../designs/read_receipts/read.glade.h:11
+#: ../designs/read_receipts/read.glade.h:10
msgid "Unless the message is sent to a mailing list, and not to me personally"
msgstr "Unless the message is sent to a mailing list, and not to me personally"
-#: ../designs/read_receipts/read.glade.h:12
+#: ../designs/read_receipts/read.glade.h:11
msgid "When you receive an email with a read receipt request, what should Evolution do?"
msgstr "When you receive an email with a read receipt request, what should Evolution do?"
-#: ../e-util/e-dialog-utils.c:267
+#: ../e-util/e-dialog-utils.c:283
msgid ""
"A file by that name already exists.\n"
"Overwrite it?"
@@ -9958,36 +10544,36 @@ msgstr ""
"A file by that name already exists.\n"
"Overwrite it?"
-#: ../e-util/e-dialog-utils.c:269
+#: ../e-util/e-dialog-utils.c:285
#: ../e-util/e-system.error.xml.h:6
msgid "Overwrite file?"
msgstr "Overwrite file?"
-#: ../e-util/e-error.c:84
-#: ../e-util/e-error.c:85
-#: ../e-util/e-error.c:127
+#: ../e-util/e-error.c:86
+#: ../e-util/e-error.c:87
+#: ../e-util/e-error.c:129
msgid "Evolution Error"
msgstr "Evolution Error"
-#: ../e-util/e-error.c:86
-#: ../e-util/e-error.c:87
-#: ../e-util/e-error.c:125
+#: ../e-util/e-error.c:88
+#: ../e-util/e-error.c:89
+#: ../e-util/e-error.c:127
msgid "Evolution Warning"
msgstr "Evolution Warning"
-#: ../e-util/e-error.c:124
+#: ../e-util/e-error.c:126
msgid "Evolution Information"
msgstr "Evolution Information"
-#: ../e-util/e-error.c:126
+#: ../e-util/e-error.c:128
msgid "Evolution Query"
msgstr "Evolution Query"
#. setup a dummy error
-#: ../e-util/e-error.c:438
+#: ../e-util/e-error.c:454
#, c-format
-msgid "<span weight=\"bold\">Internal error, unknown error '%s' requested</span>"
-msgstr "<span weight=\"bold\">Internal error, unknown error '%s' requested</span>"
+msgid "Internal error, unknown error '%s' requested"
+msgstr "Internal error, unknown error '%s' requested"
#: ../e-util/e-system.error.xml.h:2
msgid "Cannot open file &quot;{0}&quot;."
@@ -10006,117 +10592,11 @@ msgid "File exists &quot;{0}&quot;."
msgstr "File exists &quot;{0}&quot;."
#: ../e-util/e-system.error.xml.h:7
-#: ../mail/mail.error.xml.h:122
+#: ../mail/mail.error.xml.h:131
msgid "_Overwrite"
msgstr "_Overwrite"
-#. strptime format of a weekday, a date and a time,
-#. in 12-hour format, without seconds.
-#. strftime format of a weekday, a date and a
-#. time, in 12-hour format, without seconds.
-#: ../e-util/e-time-utils.c:185
-#: ../e-util/e-time-utils.c:398
-msgid "%a %m/%d/%Y %I:%M %p"
-msgstr "%a %d/%m/%Y %I:%M %p"
-
-#. strptime format of a weekday, a date and a time,
-#. in 24-hour format, without seconds.
-#. strftime format of a weekday, a date and a
-#. time, in 24-hour format, without seconds.
-#: ../e-util/e-time-utils.c:190
-#: ../e-util/e-time-utils.c:389
-msgid "%a %m/%d/%Y %H:%M"
-msgstr "%a %d/%m/%Y %H:%M"
-
-#. strptime format of a weekday, a date and a time,
-#. in 12-hour format, without minutes or seconds.
-#: ../e-util/e-time-utils.c:195
-msgid "%a %m/%d/%Y %I %p"
-msgstr "%a %d/%m/%Y %I %p"
-
-#. strptime format of a weekday, a date and a time,
-#. in 24-hour format, without minutes or seconds.
-#: ../e-util/e-time-utils.c:200
-msgid "%a %m/%d/%Y %H"
-msgstr "%a %d/%m/%Y %H"
-
-#. strptime format of a date and a time, in 12-hour format.
-#: ../e-util/e-time-utils.c:211
-msgid "%m/%d/%Y %I:%M:%S %p"
-msgstr "%d/%m/%Y %I:%M:%S %p"
-
-#. strptime format of a date and a time, in 24-hour format.
-#: ../e-util/e-time-utils.c:215
-msgid "%m/%d/%Y %H:%M:%S"
-msgstr "%d/%m/%Y %H:%M:%S"
-
-#. strptime format of a date and a time, in 12-hour format,
-#. without seconds.
-#: ../e-util/e-time-utils.c:220
-msgid "%m/%d/%Y %I:%M %p"
-msgstr "%d/%m/%Y %I:%M %p"
-
-#. strptime format of a date and a time, in 24-hour format,
-#. without seconds.
-#: ../e-util/e-time-utils.c:225
-msgid "%m/%d/%Y %H:%M"
-msgstr "%d/%m/%Y %H:%M"
-
-#. strptime format of a date and a time, in 12-hour format,
-#. without minutes or seconds.
-#: ../e-util/e-time-utils.c:230
-msgid "%m/%d/%Y %I %p"
-msgstr "%d/%m/%Y %I %p"
-
-#. strptime format of a date and a time, in 24-hour format,
-#. without minutes or seconds.
-#: ../e-util/e-time-utils.c:235
-msgid "%m/%d/%Y %H"
-msgstr "%d/%m/%Y %H"
-
-#. strptime format for a time of day, in 12-hour format.
-#. strftime format of a time in 12-hour format.
-#: ../e-util/e-time-utils.c:339
-#: ../e-util/e-time-utils.c:438
-msgid "%I:%M:%S %p"
-msgstr "%I:%M:%S %p"
-
-#. strptime format for a time of day, in 24-hour format.
-#. strftime format of a time in 24-hour format.
-#: ../e-util/e-time-utils.c:343
-#: ../e-util/e-time-utils.c:430
-msgid "%H:%M:%S"
-msgstr "%H:%M:%S"
-
-#. strptime format for time of day, without seconds,
-#. in 12-hour format.
-#. strftime format of a time in 12-hour format,
-#. without seconds.
-#. This is a strftime() format. %I = hour (1-12), %M = minute, %p = am/pm string.
-#: ../e-util/e-time-utils.c:348
-#: ../e-util/e-time-utils.c:435
-#: ../widgets/misc/e-dateedit.c:1438
-#: ../widgets/misc/e-dateedit.c:1720
-msgid "%I:%M %p"
-msgstr "%I:%M %p"
-
-#. strptime format for time of day, without seconds 24-hour format.
-#. strftime format of a time in 24-hour format,
-#. without seconds.
-#. This is a strftime() format. %H = hour (0-23), %M = minute.
-#: ../e-util/e-time-utils.c:352
-#: ../e-util/e-time-utils.c:427
-#: ../widgets/misc/e-dateedit.c:1435
-#: ../widgets/misc/e-dateedit.c:1717
-msgid "%H:%M"
-msgstr "%H:%M"
-
-#. strptime format for hour and AM/PM, 12-hour format.
-#: ../e-util/e-time-utils.c:356
-msgid "%I %p"
-msgstr "%I %p"
-
-#: ../e-util/eggtrayicon.c:119
+#: ../e-util/eggtrayicon.c:121
msgid "The orientation of the tray."
msgstr "The orientation of the tray."
@@ -10187,30 +10667,28 @@ msgstr "%d-%b-%Y"
msgid "Select a time to compare against"
msgstr "Select a time to compare against"
-#: ../filter/filter-file.c:288
+#: ../filter/filter-file.c:293
+#: ../filter/filter-file.c:299
msgid "Choose a file"
msgstr "Choose a file"
#: ../filter/filter-label.c:121
#: ../mail/em-filter-i18n.h:26
-#: ../mail/em-migrate.c:1041
-#: ../mail/mail-config.c:76
+#: ../mail/em-migrate.c:1053
#: ../mail/mail-config.glade.h:91
msgid "Important"
msgstr "Important"
#. forest green
#: ../filter/filter-label.c:124
-#: ../mail/em-migrate.c:1044
-#: ../mail/mail-config.c:79
+#: ../mail/em-migrate.c:1056
#: ../mail/mail-config.glade.h:145
msgid "To Do"
msgstr "To Do"
#. blue
#: ../filter/filter-label.c:125
-#: ../mail/em-migrate.c:1045
-#: ../mail/mail-config.c:80
+#: ../mail/em-migrate.c:1057
#: ../mail/mail-config.glade.h:95
msgid "Later"
msgstr "Later"
@@ -10220,50 +10698,54 @@ msgstr "Later"
msgid "Test"
msgstr "Test"
-#: ../filter/filter-rule.c:791
-msgid "_Rule name:"
-msgstr "_Rule name:"
+#: ../filter/filter-rule.c:799
+msgid "_Search name:"
+msgstr "_Search name:"
-#: ../filter/filter-rule.c:819
-msgid "If"
-msgstr "If"
+#: ../filter/filter-rule.c:827
+msgid "Find items that meet the following criteria"
+msgstr "Find items that meet the following criteria"
-#: ../filter/filter-rule.c:858
-msgid "if all criteria are met"
-msgstr "if all criteria are met"
+#: ../filter/filter-rule.c:866
+msgid "If all criteria are met"
+msgstr "If all criteria are met"
-#: ../filter/filter-rule.c:858
-msgid "if any criteria are met"
-msgstr "if any criteria are met"
+#: ../filter/filter-rule.c:866
+msgid "If any criteria are met"
+msgstr "If any criteria are met"
-#: ../filter/filter-rule.c:860
-msgid "Execute actions"
-msgstr "Execute actions"
+#: ../filter/filter-rule.c:868
+msgid "Find items:"
+msgstr "Find items:"
-#: ../filter/filter-rule.c:881
+#: ../filter/filter-rule.c:889
msgid "All related"
msgstr "All related"
-#: ../filter/filter-rule.c:881
+#: ../filter/filter-rule.c:889
msgid "Replies"
msgstr "Replies"
-#: ../filter/filter-rule.c:881
+#: ../filter/filter-rule.c:889
msgid "Replies and parents"
msgstr "Replies and parents"
-#: ../filter/filter-rule.c:883
+#: ../filter/filter-rule.c:889
+msgid "No reply or parent"
+msgstr "No reply or parent"
+
+#: ../filter/filter-rule.c:891
msgid "Include threads"
msgstr "Include threads"
-#: ../filter/filter-rule.c:978
+#: ../filter/filter-rule.c:986
#: ../filter/filter.glade.h:3
-#: ../mail/em-utils.c:291
+#: ../mail/em-utils.c:328
msgid "Incoming"
msgstr "Incoming"
-#: ../filter/filter-rule.c:978
-#: ../mail/em-utils.c:292
+#: ../filter/filter-rule.c:986
+#: ../mail/em-utils.c:329
msgid "Outgoing"
msgstr "Outgoing"
@@ -10288,7 +10770,7 @@ msgid "Missing file name."
msgstr "Missing file name."
#: ../filter/filter.error.xml.h:6
-#: ../mail/mail.error.xml.h:65
+#: ../mail/mail.error.xml.h:71
msgid "Missing name."
msgstr "Missing name."
@@ -10361,7 +10843,7 @@ msgid "months"
msgstr "months"
#: ../filter/filter.glade.h:18
-#: ../mail/mail-config.glade.h:177
+#: ../mail/mail-config.glade.h:179
msgid "seconds"
msgstr "seconds"
@@ -10377,15 +10859,15 @@ msgstr "the time you specify"
msgid "years"
msgstr "years"
-#: ../filter/rule-editor.c:290
+#: ../filter/rule-editor.c:378
msgid "Add Rule"
msgstr "Add Rule"
-#: ../filter/rule-editor.c:366
+#: ../filter/rule-editor.c:454
msgid "Edit Rule"
msgstr "Edit Rule"
-#: ../filter/rule-editor.c:698
+#: ../filter/rule-editor.c:732
msgid "Rule name"
msgstr "Rule name"
@@ -10430,17 +10912,19 @@ msgid "Evolution Mail preferences control"
msgstr "Evolution Mail preferences control"
#: ../mail/GNOME_Evolution_Mail.server.in.in.h:11
-#: ../mail/em-folder-view.c:494
-#: ../mail/importers/elm-importer.c:342
-#: ../mail/importers/netscape-importer.c:1902
-#: ../mail/importers/pine-importer.c:388
-#: ../mail/mail-component.c:561
-#: ../mail/mail-component.c:648
+#: ../mail/em-folder-view.c:522
+#: ../mail/importers/elm-importer.c:341
+#: ../mail/importers/netscape-importer.c:1903
+#: ../mail/importers/pine-importer.c:387
+#: ../mail/mail-component.c:581
+#: ../mail/mail-component.c:582
+#: ../mail/mail-component.c:723
#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:6
msgid "Mail"
msgstr "Mail"
#: ../mail/GNOME_Evolution_Mail.server.in.in.h:12
+#: ../mail/em-account-prefs.c:532
msgid "Mail Accounts"
msgstr "Mail Accounts"
@@ -10453,12 +10937,12 @@ msgstr "Mail Preferences"
msgid "_Mail"
msgstr "_Mail"
-#: ../mail/em-account-editor.c:387
+#: ../mail/em-account-editor.c:403
#, c-format
msgid "%s License Agreement"
msgstr "%s Licence Agreement"
-#: ../mail/em-account-editor.c:394
+#: ../mail/em-account-editor.c:410
#, c-format
msgid ""
"\n"
@@ -10471,120 +10955,136 @@ msgstr ""
"for %s displayed below\n"
"and tick the check box for accepting it\n"
-#: ../mail/em-account-editor.c:464
+#: ../mail/em-account-editor.c:482
#: ../mail/em-filter-folder-element.c:237
-#: ../mail/em-vfolder-rule.c:494
+#: ../mail/em-vfolder-rule.c:511
msgid "Select Folder"
msgstr "Select Folder"
-#: ../mail/em-account-editor.c:760
+#: ../mail/em-account-editor.c:778
msgid "Ask for each message"
msgstr "Ask for each message"
-#: ../mail/em-account-editor.c:1724
+#: ../mail/em-account-editor.c:1812
#: ../mail/mail-config.glade.h:90
msgid "Identity"
msgstr "Identity"
-#: ../mail/em-account-editor.c:1760
+#: ../mail/em-account-editor.c:1861
#: ../mail/mail-config.glade.h:117
msgid "Receiving Email"
msgstr "Receiving Email"
-#: ../mail/em-account-editor.c:1943
+#: ../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:2111
-#: ../mail/mail-config.glade.h:128
+#: ../mail/em-account-editor.c:2227
+#: ../mail/mail-config.glade.h:129
msgid "Sending Email"
msgstr "Sending Email"
-#: ../mail/em-account-editor.c:2162
-#: ../mail/mail-config.glade.h:68
+#: ../mail/em-account-editor.c:2286
+#: ../mail/mail-config.glade.h:67
msgid "Defaults"
msgstr "Defaults"
#. Security settings
-#: ../mail/em-account-editor.c:2223
-#: ../mail/mail-config.glade.h:122
-#: ../plugins/exchange-operations/exchange-account-setup.c:311
+#: ../mail/em-account-editor.c:2352
+#: ../mail/mail-config.glade.h:123
+#: ../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:2260
-#: ../mail/em-account-editor.c:2334
+#: ../mail/em-account-editor.c:2389
+#: ../mail/em-account-editor.c:2480
msgid "Receiving Options"
msgstr "Receiving Options"
-#: ../mail/em-account-editor.c:2261
-#: ../mail/em-account-editor.c:2335
+#: ../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:2659
-#: ../mail/mail-config.glade.h:34
+#: ../mail/em-account-editor.c:2832
+#: ../mail/mail-config.glade.h:33
msgid "Account Editor"
msgstr "Account Editor"
-#: ../mail/em-account-editor.c:2659
-#: ../mail/mail-config.glade.h:80
+#: ../mail/em-account-editor.c:2832
+#: ../mail/mail-config.glade.h:79
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:455
+#: ../mail/em-account-prefs.c:466
msgid "[Default]"
msgstr "[Default]"
-#: ../mail/em-account-prefs.c:510
+#. g_object_set((GObject *)renderer, "activatable", TRUE, NULL);
+#: ../mail/em-account-prefs.c:519
+#: ../mail/em-composer-prefs.c:930
+#: ../plugins/plugin-manager/plugin-manager.c:205
+#: ../plugins/publish-calendar/publish-calendar.c:493
+msgid "Enabled"
+msgstr "Enabled"
+
+#: ../mail/em-account-prefs.c:525
msgid "Account name"
msgstr "Account name"
-#: ../mail/em-account-prefs.c:512
+#: ../mail/em-account-prefs.c:527
msgid "Protocol"
msgstr "Protocol"
-#: ../mail/em-account-prefs.c:517
-msgid "Mail Accounts Table"
-msgstr "Mail Accounts Table"
-
-#: ../mail/em-composer-prefs.c:307
-#: ../mail/em-composer-prefs.c:430
-#: ../mail/mail-config.c:958
+#: ../mail/em-composer-prefs.c:311
+#: ../mail/em-composer-prefs.c:437
+#: ../mail/mail-config.c:999
msgid "Unnamed"
msgstr "Unnamed"
-#: ../mail/em-composer-prefs.c:897
+#: ../mail/em-composer-prefs.c:936
msgid "Language(s)"
msgstr "Language(s)"
-#: ../mail/em-composer-prefs.c:940
+#: ../mail/em-composer-prefs.c:979
msgid "Add signature script"
msgstr "Add signature script"
-#: ../mail/em-composer-prefs.c:960
+#: ../mail/em-composer-prefs.c:999
msgid "Signature(s)"
msgstr "Signature(s)"
-#: ../mail/em-composer-utils.c:853
+#: ../mail/em-composer-utils.c:874
#: ../mail/em-format-quote.c:389
msgid "-------- Forwarded Message --------"
msgstr "-------- Forwarded Message --------"
-#: ../mail/em-composer-utils.c:1648
+#: ../mail/em-composer-utils.c:1665
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:1695
+#: ../mail/em-composer-utils.c:1712
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-filter-editor.c:147
+#: ../mail/em-filter-editor.c:155
msgid "_Filter Rules"
msgstr "_Filter Rules"
@@ -10625,6 +11125,15 @@ msgstr "Date received"
msgid "Date sent"
msgstr "Date sent"
+#: ../mail/em-filter-i18n.h:11
+#: ../ui/evolution-addressbook.xml.h:15
+#: ../ui/evolution-calendar.xml.h:5
+#: ../ui/evolution-mail-message.xml.h:24
+#: ../ui/evolution-memos.xml.h:6
+#: ../ui/evolution-tasks.xml.h:6
+msgid "Delete"
+msgstr "Delete"
+
#: ../mail/em-filter-i18n.h:12
msgid "Deleted"
msgstr "Deleted"
@@ -10715,7 +11224,7 @@ msgstr "is not Flagged"
#: ../mail/em-filter-i18n.h:35
#: ../mail/mail-config.glade.h:93
-#: ../ui/evolution-mail-message.xml.h:48
+#: ../ui/evolution-mail-message.xml.h:47
msgid "Junk"
msgstr "Junk"
@@ -10724,8 +11233,7 @@ msgid "Junk Test"
msgstr "Junk Test"
#: ../mail/em-filter-i18n.h:37
-#: ../mail/em-folder-view.c:1063
-#: ../widgets/misc/e-expander.c:189
+#: ../widgets/misc/e-expander.c:190
msgid "Label"
msgstr "Label"
@@ -10766,11 +11274,12 @@ msgid "Play Sound"
msgstr "Play Sound"
#: ../mail/em-filter-i18n.h:47
-#: ../mail/message-tag-followup.c:80
+#: ../mail/message-tag-followup.c:81
msgid "Read"
msgstr "Read"
#: ../mail/em-filter-i18n.h:48
+#: ../mail/message-list.etspec.h:11
msgid "Recipients"
msgstr "Recipients"
@@ -10799,11 +11308,12 @@ msgid "Run Program"
msgstr "Run Program"
#: ../mail/em-filter-i18n.h:55
-#: ../mail/message-list.etspec.h:10
+#: ../mail/message-list.etspec.h:12
msgid "Score"
msgstr "Score"
#: ../mail/em-filter-i18n.h:56
+#: ../mail/message-list.etspec.h:13
msgid "Sender"
msgstr "Sender"
@@ -10836,14 +11346,14 @@ msgid "Stop Processing"
msgstr "Stop Processing"
#: ../mail/em-filter-i18n.h:65
-#: ../mail/em-format-html.c:1572
+#: ../mail/em-format-html.c:1660
#: ../mail/em-format-quote.c:313
#: ../mail/em-format.c:849
-#: ../mail/em-mailer-prefs.c:88
-#: ../mail/message-list.etspec.h:13
-#: ../mail/message-tag-followup.c:330
-#: ../plugins/groupwise-features/properties.glade.h:7
-#: ../smime/lib/e-cert.c:1131
+#: ../mail/em-mailer-prefs.c:90
+#: ../mail/message-list.etspec.h:17
+#: ../mail/message-tag-followup.c:336
+#: ../plugins/groupwise-features/properties.glade.h:6
+#: ../smime/lib/e-cert.c:1132
msgid "Subject"
msgstr "Subject"
@@ -10856,25 +11366,63 @@ msgstr "Unset Status"
msgid "<b>Then</b>"
msgstr "<b>Then</b>"
-#: ../mail/em-folder-browser.c:134
+#: ../mail/em-folder-browser.c:170
msgid "C_reate Search Folder From Search..."
msgstr "C_reate Search Folder From Search..."
+#: ../mail/em-folder-browser.c:192
+msgid "All Messages"
+msgstr "All Messages"
+
+#: ../mail/em-folder-browser.c:193
+msgid "Unread Messages"
+msgstr "Unread Messages"
+
+#: ../mail/em-folder-browser.c:195
+msgid "No Label"
+msgstr "No Label"
+
+#: ../mail/em-folder-browser.c:202
+msgid "Read Messages"
+msgstr "Read Messages"
+
+#: ../mail/em-folder-browser.c:203
+msgid "Recent Messages"
+msgstr "Recent Messages"
+
+#: ../mail/em-folder-browser.c:204
+msgid "Last 5 Days' Messages"
+msgstr "Last 5 Days' Messages"
+
+#: ../mail/em-folder-browser.c:205
+msgid "Messages with Attachments"
+msgstr "Messages with Attachments"
+
+#: ../mail/em-folder-browser.c:206
+msgid "Important Messages"
+msgstr "Important Messages"
+
+#: ../mail/em-folder-browser.c:207
+msgid "Messages Not Junk"
+msgstr "Messages Not Junk"
+
#. TODO: can this be done in a loop?
-#: ../mail/em-folder-properties.c:144
-msgid "Total message:"
+#. to be on the safe side, ngettext is used here, see e.g. comment #3 at bug 272567
+#: ../mail/em-folder-properties.c:150
+msgid "Total messages:"
msgid_plural "Total messages:"
-msgstr[0] "Total message:"
+msgstr[0] "Total messages:"
msgstr[1] "Total messages:"
-#: ../mail/em-folder-properties.c:156
-msgid "Unread message:"
+#. to be on the safe side, ngettext is used here, see e.g. comment #3 at bug 272567
+#: ../mail/em-folder-properties.c:163
+msgid "Unread messages:"
msgid_plural "Unread messages:"
-msgstr[0] "Unread message:"
+msgstr[0] "Unread messages:"
msgstr[1] "Unread messages:"
-#: ../mail/em-folder-properties.c:278
-#: ../plugins/groupwise-features/properties.glade.h:3
+#: ../mail/em-folder-properties.c:316
+#: ../plugins/groupwise-features/properties.glade.h:2
msgid "Folder Properties"
msgstr "Folder Properties"
@@ -10890,577 +11438,604 @@ msgstr "Create"
msgid "Folder _name:"
msgstr "Folder _name:"
-#: ../mail/em-folder-tree-model.c:201
#: ../mail/em-folder-tree-model.c:203
-#: ../mail/mail-vfolder.c:937
-#: ../mail/mail-vfolder.c:1007
+#: ../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:207
#: ../mail/em-folder-tree-model.c:209
+#: ../mail/em-folder-tree-model.c:211
msgid "UNMATCHED"
msgstr "UNMATCHED"
-#: ../mail/em-folder-tree-model.c:469
-#: ../mail/mail-component.c:144
+#: ../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:472
-#: ../mail/mail-component.c:143
+#: ../mail/em-folder-tree-model.c:487
+#: ../mail/mail-component.c:151
+#: ../plugins/exchange-operations/exchange-folder.c:587
msgid "Inbox"
msgstr "Inbox"
-#: ../mail/em-folder-tree-model.c:475
-#: ../mail/mail-component.c:145
+#: ../mail/em-folder-tree-model.c:490
+#: ../mail/mail-component.c:153
msgid "Outbox"
msgstr "Outbox"
-#: ../mail/em-folder-tree-model.c:477
-#: ../mail/mail-component.c:146
+#: ../mail/em-folder-tree-model.c:492
+#: ../mail/mail-component.c:154
msgid "Sent"
msgstr "Sent"
-#: ../mail/em-folder-tree-model.c:498
-#: ../mail/em-folder-tree-model.c:802
+#: ../mail/em-folder-tree-model.c:514
+#: ../mail/em-folder-tree-model.c:818
msgid "Loading..."
msgstr "Loading..."
-#: ../mail/em-folder-tree.c:689
+#. Translators: This is the string used for displaying the
+#. * folder names in folder trees. "%s" will be replaced by
+#. * the folder's name and "%u" will be replaced with the
+#. * number of unread messages in the folder.
+#. *
+#. * Most languages should translate this as "%s (%u)". The
+#. * languages that use localized digits (like Persian) may
+#. * need to replace "%u" with "%Iu". Right-to-left languages
+#. * (like Arabic and Hebrew) may need to add bidirectional
+#. * formatting codes to take care of the cases the folder
+#. * name appears in either direction.
+#. *
+#. * Do not translate the "folder-display|" part. Remove it
+#. * from your translation.
+#.
+#: ../mail/em-folder-tree.c:366
+#, c-format
+msgid "folder-display|%s (%u)"
+msgstr "%s (%u)"
+
+#: ../mail/em-folder-tree.c:717
msgid "Mail Folder Tree"
msgstr "Mail Folder Tree"
-#: ../mail/em-folder-tree.c:849
+#: ../mail/em-folder-tree.c:877
#, c-format
msgid "Moving folder %s"
msgstr "Moving folder %s"
-#: ../mail/em-folder-tree.c:851
+#: ../mail/em-folder-tree.c:879
#, c-format
msgid "Copying folder %s"
msgstr "Copying folder %s"
-#: ../mail/em-folder-tree.c:858
-#: ../mail/message-list.c:1613
+#: ../mail/em-folder-tree.c:886
+#: ../mail/message-list.c:1824
#, c-format
msgid "Moving messages into folder %s"
msgstr "Moving messages into folder %s"
-#: ../mail/em-folder-tree.c:860
-#: ../mail/message-list.c:1615
+#: ../mail/em-folder-tree.c:888
+#: ../mail/message-list.c:1826
#, c-format
msgid "Copying messages into folder %s"
msgstr "Copying messages into folder %s"
-#: ../mail/em-folder-tree.c:876
+#: ../mail/em-folder-tree.c:904
msgid "Cannot drop message(s) into toplevel store"
msgstr "Cannot drop message(s) into toplevel store"
-#: ../mail/em-folder-tree.c:972
+#: ../mail/em-folder-tree.c:1000
#: ../ui/evolution-mail-message.xml.h:104
msgid "_Copy to Folder"
msgstr "_Copy to Folder"
-#: ../mail/em-folder-tree.c:973
-#: ../ui/evolution-mail-message.xml.h:114
+#: ../mail/em-folder-tree.c:1001
+#: ../ui/evolution-mail-message.xml.h:117
msgid "_Move to Folder"
msgstr "_Move to Folder"
-#: ../mail/em-folder-tree.c:1678
-#: ../mail/mail-ops.c:1057
+#: ../mail/em-folder-tree.c:1706
+#: ../mail/mail-ops.c:1060
#, c-format
msgid "Scanning folders in \"%s\""
msgstr "Scanning folders in \"%s\""
-#: ../mail/em-folder-tree.c:2031
-#: ../ui/evolution-addressbook.xml.h:44
-#: ../ui/evolution-mail-global.xml.h:24
+#: ../mail/em-folder-tree.c:2065
+#: ../ui/evolution-addressbook.xml.h:64
+#: ../ui/evolution-editor.xml.h:24
+#: ../ui/evolution-mail-global.xml.h:27
#: ../ui/evolution-mail-messagedisplay.xml.h:8
-#: ../ui/evolution-message-composer.xml.h:54
-#: ../ui/evolution.xml.h:48
+#: ../ui/evolution-message-composer.xml.h:56
+#: ../ui/evolution-tasks.xml.h:30
+#: ../ui/evolution.xml.h:50
msgid "_View"
msgstr "_View"
-#: ../mail/em-folder-tree.c:2032
+#: ../mail/em-folder-tree.c:2066
msgid "Open in _New Window"
msgstr "Open in _New Window"
-#: ../mail/em-folder-tree.c:2036
+#: ../mail/em-folder-tree.c:2070
msgid "_Copy..."
msgstr "_Copy..."
-#: ../mail/em-folder-tree.c:2037
+#: ../mail/em-folder-tree.c:2071
msgid "_Move..."
msgstr "_Move..."
#. FIXME: need to disable for nochildren folders
-#: ../mail/em-folder-tree.c:2041
+#: ../mail/em-folder-tree.c:2075
msgid "_New Folder..."
msgstr "_New Folder..."
-#: ../mail/em-folder-tree.c:2044
-#: ../ui/evolution-mail-list.xml.h:30
+#: ../mail/em-folder-tree.c:2078
+#: ../ui/evolution-mail-list.xml.h:34
msgid "_Rename..."
msgstr "_Rename..."
+#: ../mail/em-folder-tree.c:2083
+#: ../mail/mail.error.xml.h:128
+msgid "_Empty Trash"
+msgstr "_Empty Wastebasket"
+
#: ../mail/em-folder-utils.c:104
#, c-format
msgid "Copying `%s' to `%s'"
msgstr "Copying `%s' to `%s'"
#: ../mail/em-folder-utils.c:368
-#: ../mail/em-folder-view.c:931
-#: ../mail/em-folder-view.c:946
-#: ../mail/importers/evolution-mbox-importer.c:85
-#: ../mail/importers/evolution-outlook-importer.c:134
+#: ../mail/em-folder-view.c:1013
+#: ../mail/em-folder-view.c:1028
+#: ../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:946
+#: ../mail/em-folder-view.c:1028
msgid "C_opy"
msgstr "C_opy"
-#: ../mail/em-folder-utils.c:503
-#, c-format
-msgid "Rename the \"%s\" folder to:"
-msgstr "Rename the \"%s\" folder to:"
-
-#: ../mail/em-folder-utils.c:505
-msgid "Rename Folder"
-msgstr "Rename Folder"
-
-#: ../mail/em-folder-utils.c:511
-msgid "Folder names cannot contain '/'"
-msgstr "Folder names cannot contain '/'"
-
#: ../mail/em-folder-utils.c:581
-#: ../plugins/groupwise-features/share-folder-common.c:141
+#: ../plugins/groupwise-features/share-folder-common.c:145
#, c-format
msgid "Creating folder `%s'"
msgstr "Creating folder `%s'"
#: ../mail/em-folder-utils.c:730
#: ../plugins/groupwise-features/install-shared.c:164
-#: ../plugins/groupwise-features/share-folder-common.c:387
+#: ../plugins/groupwise-features/share-folder-common.c:388
msgid "Create folder"
msgstr "Create folder"
#: ../mail/em-folder-utils.c:730
#: ../plugins/groupwise-features/install-shared.c:164
-#: ../plugins/groupwise-features/share-folder-common.c:387
+#: ../plugins/groupwise-features/share-folder-common.c:388
msgid "Specify where to create the folder:"
msgstr "Specify where to create the folder:"
-#: ../mail/em-folder-view.c:1039
-#: ../mail/em-popup.c:546
-#: ../mail/em-popup.c:557
-msgid "Reply to _All"
-msgstr "Reply to _All"
-
-#: ../mail/em-folder-view.c:1040
-#: ../ui/evolution-mail-message.xml.h:122
+#: ../mail/em-folder-view.c:1121
+#: ../ui/evolution-mail-message.xml.h:126
msgid "_Reply to Sender"
msgstr "_Reply to Sender"
-#: ../mail/em-folder-view.c:1041
-#: ../mail/em-popup.c:548
-#: ../mail/em-popup.c:559
-#: ../ui/evolution-mail-message.xml.h:108
+#: ../mail/em-folder-view.c:1123
+#: ../mail/em-popup.c:561
+#: ../mail/em-popup.c:572
+#: ../ui/evolution-mail-message.xml.h:109
msgid "_Forward"
msgstr "_Forward"
-#: ../mail/em-folder-view.c:1044
+#: ../mail/em-folder-view.c:1126
#: ../ui/evolution-mail-message.xml.h:106
msgid "_Edit as New Message..."
msgstr "_Edit as New Message..."
-#: ../mail/em-folder-view.c:1050
+#: ../mail/em-folder-view.c:1132
msgid "U_ndelete"
msgstr "U_ndelete"
-#: ../mail/em-folder-view.c:1051
-#: ../ui/evolution-addressbook.xml.h:36
+#: ../mail/em-folder-view.c:1133
msgid "_Move to Folder..."
msgstr "_Move to Folder..."
-#: ../mail/em-folder-view.c:1052
-#: ../ui/evolution-addressbook.xml.h:32
+#: ../mail/em-folder-view.c:1134
msgid "_Copy to Folder..."
msgstr "_Copy to Folder..."
-#: ../mail/em-folder-view.c:1055
+#: ../mail/em-folder-view.c:1137
msgid "Mar_k as Read"
msgstr "Mar_k as Read"
-#: ../mail/em-folder-view.c:1056
+#: ../mail/em-folder-view.c:1138
msgid "Mark as _Unread"
msgstr "Mark as _Unread"
-#: ../mail/em-folder-view.c:1057
+#: ../mail/em-folder-view.c:1139
msgid "Mark as _Important"
msgstr "Mark as _Important"
-#: ../mail/em-folder-view.c:1058
-msgid "_Mark as Unimportant"
-msgstr "_Mark as Unimportant"
+#: ../mail/em-folder-view.c:1140
+msgid "Mark as Un_important"
+msgstr "Mark as Un_important"
-#: ../mail/em-folder-view.c:1059
+#: ../mail/em-folder-view.c:1141
msgid "Mark as _Junk"
msgstr "Mark as _Junk"
-#: ../mail/em-folder-view.c:1060
+#: ../mail/em-folder-view.c:1142
msgid "Mark as _Not Junk"
msgstr "Mark as _Not Junk"
-#: ../mail/em-folder-view.c:1061
+#: ../mail/em-folder-view.c:1143
msgid "Mark for Follo_w Up..."
msgstr "Mark for Follo_w Up..."
-#: ../mail/em-folder-view.c:1069
+#: ../mail/em-folder-view.c:1145
+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:1146
+#: ../widgets/misc/e-dateedit.c:475
+msgid "_None"
+msgstr "_None"
+
+#: ../mail/em-folder-view.c:1151
msgid "Fla_g Completed"
msgstr "Fla_g Completed"
-#: ../mail/em-folder-view.c:1070
+#: ../mail/em-folder-view.c:1152
msgid "Cl_ear Flag"
msgstr "Cl_ear Flag"
-#: ../mail/em-folder-view.c:1073
+#: ../mail/em-folder-view.c:1155
msgid "Crea_te Rule From Message"
msgstr "Crea_te Rule From Message"
-#: ../mail/em-folder-view.c:1074
+#: ../mail/em-folder-view.c:1156
msgid "Search Folder from _Subject"
msgstr "Search Folder from _Subject"
-#: ../mail/em-folder-view.c:1075
+#: ../mail/em-folder-view.c:1157
msgid "Search Folder from Se_nder"
msgstr "Search Folder from Se_nder"
-#: ../mail/em-folder-view.c:1076
+#: ../mail/em-folder-view.c:1158
msgid "Search Folder from _Recipients"
msgstr "Search Folder from _Recipients"
-#: ../mail/em-folder-view.c:1077
+#: ../mail/em-folder-view.c:1159
msgid "Search Folder from Mailing _List"
msgstr "Search Folder from Mailing _List"
-#: ../mail/em-folder-view.c:1081
+#: ../mail/em-folder-view.c:1163
msgid "Filter on Sub_ject"
msgstr "Filter on Sub_ject"
-#: ../mail/em-folder-view.c:1082
+#: ../mail/em-folder-view.c:1164
msgid "Filter on Sen_der"
msgstr "Filter on Sen_der"
-#: ../mail/em-folder-view.c:1083
+#: ../mail/em-folder-view.c:1165
msgid "Filter on Re_cipients"
msgstr "Filter on Re_cipients"
-#: ../mail/em-folder-view.c:1084
+#: ../mail/em-folder-view.c:1166
msgid "Filter on _Mailing List"
msgstr "Filter on _Mailing List"
#. default charset used in mail view
-#: ../mail/em-folder-view.c:1921
-#: ../mail/em-folder-view.c:1965
+#: ../mail/em-folder-view.c:2017
+#: ../mail/em-folder-view.c:2061
msgid "Default"
msgstr "Default"
-#: ../mail/em-folder-view.c:2064
+#: ../mail/em-folder-view.c:2160
#: ../plugins/print-message/org-gnome-print-message.eplug.xml.h:2
#: ../plugins/print-message/print-message.c:87
msgid "Print Message"
msgstr "Print Message"
-#: ../mail/em-folder-view.c:2220
+#: ../mail/em-folder-view.c:2320
msgid "Unable to retrieve message"
msgstr "Unable to retrieve message"
-#: ../mail/em-folder-view.c:2413
-msgid "_Copy Link Location"
-msgstr "_Copy Link Location"
-
-#: ../mail/em-folder-view.c:2415
+#: ../mail/em-folder-view.c:2518
msgid "Create _Search Folder"
msgstr "Create _Search Folder"
-#: ../mail/em-folder-view.c:2416
+#: ../mail/em-folder-view.c:2519
msgid "_From this Address"
msgstr "_From this Address"
-#: ../mail/em-folder-view.c:2417
+#: ../mail/em-folder-view.c:2520
msgid "_To this Address"
msgstr "_To this Address"
-#: ../mail/em-folder-view.c:2698
+#: ../mail/em-folder-view.c:2877
#, c-format
msgid "Click to mail %s"
msgstr "Click to mail %s"
+#: ../mail/em-folder-view.c:2882
+msgid "Click to hide/unhide addresses"
+msgstr "Click to hide/unhide addresses"
+
#. message-search popup match count string
-#: ../mail/em-format-html-display.c:445
+#: ../mail/em-format-html-display.c:503
#, c-format
msgid "Matches: %d"
msgstr "Matches: %d"
-#: ../mail/em-format-html-display.c:696
-#: ../mail/em-format-html.c:597
+#: ../mail/em-format-html-display.c:646
+msgid "Fi_nd:"
+msgstr "Fi_nd:"
+
+#: ../mail/em-format-html-display.c:674
+msgid "Fo_rward"
+msgstr "Fo_rward"
+
+#: ../mail/em-format-html-display.c:679
+msgid "M_atch case"
+msgstr "M_atch case"
+
+#: ../mail/em-format-html-display.c:926
+#: ../mail/em-format-html.c:618
msgid "Unsigned"
msgstr "Unsigned"
-#: ../mail/em-format-html-display.c:696
+#: ../mail/em-format-html-display.c:926
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:697
-#: ../mail/em-format-html.c:598
+#: ../mail/em-format-html-display.c:927
+#: ../mail/em-format-html.c:619
msgid "Valid signature"
msgstr "Valid signature"
-#: ../mail/em-format-html-display.c:697
+#: ../mail/em-format-html-display.c:927
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:698
-#: ../mail/em-format-html.c:599
+#: ../mail/em-format-html-display.c:928
+#: ../mail/em-format-html.c:620
msgid "Invalid signature"
msgstr "Invalid signature"
-#: ../mail/em-format-html-display.c:698
+#: ../mail/em-format-html-display.c:928
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:699
+#: ../mail/em-format-html-display.c:929
msgid "Valid signature, cannot verify sender"
msgstr "Valid signature, cannot verify sender"
-#: ../mail/em-format-html-display.c:699
+#: ../mail/em-format-html-display.c:929
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:705
-#: ../mail/em-format-html.c:606
+#: ../mail/em-format-html-display.c:935
+#: ../mail/em-format-html.c:627
msgid "Unencrypted"
msgstr "Unencrypted"
-#: ../mail/em-format-html-display.c:705
-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:935
+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:706
-#: ../mail/em-format-html.c:607
+#: ../mail/em-format-html-display.c:936
+#: ../mail/em-format-html.c:628
msgid "Encrypted, weak"
msgstr "Encrypted, weak"
-#: ../mail/em-format-html-display.c:706
-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:936
+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:707
-#: ../mail/em-format-html.c:608
+#: ../mail/em-format-html-display.c:937
+#: ../mail/em-format-html.c:629
msgid "Encrypted"
msgstr "Encrypted"
-#: ../mail/em-format-html-display.c:707
+#: ../mail/em-format-html-display.c:937
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:708
-#: ../mail/em-format-html.c:609
+#: ../mail/em-format-html-display.c:938
+#: ../mail/em-format-html.c:630
msgid "Encrypted, strong"
msgstr "Encrypted, strong"
-#: ../mail/em-format-html-display.c:708
-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:938
+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:809
+#: ../mail/em-format-html-display.c:1039
#: ../smime/gui/smime-ui.glade.h:48
msgid "_View Certificate"
msgstr "_View Certificate"
-#: ../mail/em-format-html-display.c:824
+#: ../mail/em-format-html-display.c:1054
msgid "This certificate is not viewable"
msgstr "This certificate is not viewable"
-#: ../mail/em-format-html-display.c:1106
+#: ../mail/em-format-html-display.c:1373
msgid "Completed on %B %d, %Y, %l:%M %p"
msgstr "Completed on %d %B, %Y, %l:%M %p"
-#: ../mail/em-format-html-display.c:1114
+#: ../mail/em-format-html-display.c:1381
msgid "Overdue:"
msgstr "Overdue:"
-#: ../mail/em-format-html-display.c:1117
+#: ../mail/em-format-html-display.c:1384
msgid "by %B %d, %Y, %l:%M %p"
msgstr "by %d %B, %Y, %l:%M %p"
-#: ../mail/em-format-html-display.c:1177
+#: ../mail/em-format-html-display.c:1444
msgid "_View Inline"
msgstr "_View Inline"
-#: ../mail/em-format-html-display.c:1178
+#: ../mail/em-format-html-display.c:1445
msgid "_Hide"
msgstr "_Hide"
-#: ../mail/em-format-html-display.c:1179
+#: ../mail/em-format-html-display.c:1446
msgid "_Fit to Width"
msgstr "_Fit to Width"
-#: ../mail/em-format-html-display.c:1180
+#: ../mail/em-format-html-display.c:1447
msgid "Show _Original Size"
msgstr "Show _Original Size"
-#: ../mail/em-format-html-display.c:1550
-msgid "Attachment Button"
-msgstr "Attachment Button"
+#: ../mail/em-format-html-display.c:1866
+#: ../mail/mail-config.glade.h:44
+#: ../mail/message-list.etspec.h:1
+msgid "Attachment"
+msgstr "Attachment"
-#: ../mail/em-format-html-display.c:1757
+#: ../mail/em-format-html-display.c:2073
msgid "Select folder to save all attachments..."
msgstr "Select folder to save all attachments..."
-#: ../mail/em-format-html-display.c:1796
-msgid "Select folder to save selected attachments..."
-msgstr "Select folder to save selected attachments..."
-
-#: ../mail/em-format-html-display.c:1804
-msgid "Save Selected..."
-msgstr "Save Selected..."
+#: ../mail/em-format-html-display.c:2120
+msgid "_Save Selected..."
+msgstr "_Save Selected..."
#. Cant i put in the number of attachments here ?
-#: ../mail/em-format-html-display.c:1871
+#: ../mail/em-format-html-display.c:2187
#, c-format
-msgid "%d attachment"
-msgid_plural "%d attachments"
-msgstr[0] "%d attachment"
-msgstr[1] "%d attachments"
+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:2194
+#: ../mail/em-format-html-display.c:2272
+msgid "S_ave"
+msgstr "S_ave"
-#: ../mail/em-format-html-display.c:1935
+#: ../mail/em-format-html-display.c:2205
+msgid "S_ave All"
+msgstr "S_ave All"
+
+#: ../mail/em-format-html-display.c:2268
msgid "No Attachment"
msgstr "No Attachment"
-#: ../mail/em-format-html-display.c:1938
-msgid "Save All"
-msgstr "Save All"
-
#: ../mail/em-format-html-print.c:130
#, c-format
msgid "Page %d of %d"
msgstr "Page %d of %d"
-#: ../mail/em-format-html.c:473
-#: ../mail/em-format-html.c:475
+#: ../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:600
+#: ../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:870
+#: ../mail/em-format-html.c:892
msgid "Malformed external-body part."
msgstr "Malformed external-body part."
-#: ../mail/em-format-html.c:900
+#: ../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:911
+#: ../mail/em-format-html.c:933
#, 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:913
+#: ../mail/em-format-html.c:935
#, c-format
msgid "Pointer to local file (%s)"
msgstr "Pointer to local file (%s)"
-#: ../mail/em-format-html.c:934
+#: ../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:945
+#: ../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:1171
+#: ../mail/em-format-html.c:1194
msgid "Formatting message"
msgstr "Formatting message"
-#: ../mail/em-format-html.c:1464
+#: ../mail/em-format-html.c:1489
#: ../mail/em-format-quote.c:200
#: ../mail/em-format.c:844
-#: ../mail/em-mailer-prefs.c:83
+#: ../mail/em-mailer-prefs.c:85
#: ../mail/message-list.etspec.h:7
-#: ../mail/message-tag-followup.c:326
+#: ../mail/message-tag-followup.c:332
msgid "From"
msgstr "From"
-#: ../mail/em-format-html.c:1464
+#: ../mail/em-format-html.c:1489
#: ../mail/em-format-quote.c:200
#: ../mail/em-format.c:845
-#: ../mail/em-mailer-prefs.c:84
+#: ../mail/em-mailer-prefs.c:86
msgid "Reply-To"
msgstr "Reply-To"
-#: ../mail/em-format-html.c:1464
-#: ../mail/em-format-quote.c:200
-#: ../mail/em-format.c:846
-#: ../mail/em-mailer-prefs.c:85
-#: ../mail/message-list.etspec.h:14
-msgid "To"
-msgstr "To"
-
-#: ../mail/em-format-html.c:1464
+#: ../mail/em-format-html.c:1489
#: ../mail/em-format-quote.c:200
#: ../mail/em-format.c:847
-#: ../mail/em-mailer-prefs.c:86
+#: ../mail/em-mailer-prefs.c:88
msgid "Cc"
msgstr "Cc"
-#: ../mail/em-format-html.c:1464
+#: ../mail/em-format-html.c:1489
#: ../mail/em-format-quote.c:200
#: ../mail/em-format.c:848
-#: ../mail/em-mailer-prefs.c:87
+#: ../mail/em-mailer-prefs.c:89
msgid "Bcc"
msgstr "Bcc"
#. pseudo-header
-#: ../mail/em-format-html.c:1576
+#: ../mail/em-format-html.c:1664
#: ../mail/em-format-quote.c:322
-#: ../mail/em-mailer-prefs.c:987
+#: ../mail/em-mailer-prefs.c:1025
msgid "Mailer"
msgstr "Mailer"
#. translators: strftime format for local time equivalent in Date header display, with day
-#: ../mail/em-format-html.c:1603
+#: ../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:1606
+#: ../mail/em-format-html.c:1694
msgid "<I> (%R %Z)</I>"
msgstr "<I> (%R %Z)</I>"
-#: ../mail/em-format-html.c:1616
+#: ../mail/em-format-html.c:1704
#: ../mail/em-format-quote.c:329
#: ../mail/em-format.c:850
-#: ../mail/em-mailer-prefs.c:89
+#: ../mail/em-mailer-prefs.c:91
#: ../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-html.c:1639
+#: ../mail/em-format-html.c:1727
#: ../mail/em-format.c:851
-#: ../mail/em-mailer-prefs.c:90
+#: ../mail/em-mailer-prefs.c:92
msgid "Newsgroups"
msgstr "Newsgroups"
@@ -11470,51 +12045,51 @@ msgid "%s attachment"
msgstr "%s attachment"
#: ../mail/em-format.c:1141
-#: ../mail/em-format.c:1288
-#: ../mail/em-format.c:1575
+#: ../mail/em-format.c:1289
+#: ../mail/em-format.c:1591
msgid "Could not parse S/MIME message: Unknown error"
msgstr "Could not parse S/MIME message: Unknown error"
-#: ../mail/em-format.c:1270
-#: ../mail/em-format.c:1426
+#: ../mail/em-format.c:1271
+#: ../mail/em-format.c:1427
msgid "Could not parse MIME message. Displaying as source."
msgstr "Could not parse MIME message. Displaying as source."
-#: ../mail/em-format.c:1278
+#: ../mail/em-format.c:1279
msgid "Unsupported encryption type for multipart/encrypted"
msgstr "Unsupported encryption type for multipart/encrypted"
-#: ../mail/em-format.c:1445
+#: ../mail/em-format.c:1446
msgid "Unsupported signature format"
msgstr "Unsupported signature format"
-#: ../mail/em-format.c:1453
-#: ../mail/em-format.c:1517
+#: ../mail/em-format.c:1454
+#: ../mail/em-format.c:1520
msgid "Error verifying signature"
msgstr "Error verifying signature"
-#: ../mail/em-format.c:1453
-#: ../mail/em-format.c:1517
+#: ../mail/em-format.c:1454
+#: ../mail/em-format.c:1520
msgid "Unknown error verifying signature"
msgstr "Unknown error verifying signature"
-#: ../mail/em-mailer-prefs.c:101
+#: ../mail/em-mailer-prefs.c:103
msgid "Every time"
msgstr "Every time"
-#: ../mail/em-mailer-prefs.c:102
+#: ../mail/em-mailer-prefs.c:104
msgid "Once per day"
msgstr "Once per day"
-#: ../mail/em-mailer-prefs.c:103
+#: ../mail/em-mailer-prefs.c:105
msgid "Once per week"
msgstr "Once per week"
-#: ../mail/em-mailer-prefs.c:104
+#: ../mail/em-mailer-prefs.c:106
msgid "Once per month"
msgstr "Once per month"
-#: ../mail/em-migrate.c:1198
+#: ../mail/em-migrate.c:1210
msgid ""
"The location and hierarchy of the Evolution mailbox folders has changed since Evolution 1.x.\n"
"\n"
@@ -11524,146 +12099,123 @@ msgstr ""
"\n"
"Please be patient while Evolution migrates your folders..."
-#: ../mail/em-migrate.c:1632
+#: ../mail/em-migrate.c:1649
#, c-format
msgid "Unable to create new folder `%s': %s"
msgstr "Unable to create new folder `%s': %s"
-#: ../mail/em-migrate.c:1658
+#: ../mail/em-migrate.c:1675
#, c-format
msgid "Unable to copy folder `%s' to `%s': %s"
msgstr "Unable to copy folder `%s' to `%s': %s"
-#: ../mail/em-migrate.c:1843
+#: ../mail/em-migrate.c:1860
#, 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:2047
+#: ../mail/em-migrate.c:2064
#, 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:2061
+#: ../mail/em-migrate.c:2078
#, 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:2090
+#: ../mail/em-migrate.c:2107
#, 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:2561
-#: ../mail/em-migrate.c:2573
+#: ../mail/em-migrate.c:2578
+#: ../mail/em-migrate.c:2590
#, c-format
msgid "Failed to create local mail storage `%s': %s"
msgstr "Failed to create local mail storage `%s': %s"
-#: ../mail/em-migrate.c:2693
+#: ../mail/em-migrate.c:2713
#, 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:2711
+#: ../mail/em-migrate.c:2732
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:399
-msgid "Save As..."
-msgstr "Save As..."
-
-#: ../mail/em-popup.c:424
-#, c-format
-msgid "untitled_image.%s"
-msgstr "untitled_image.%s"
-
-#: ../mail/em-popup.c:542
-#: ../mail/em-popup.c:553
-msgid "Set as _Background"
-msgstr "Set as _Background"
-
-#: ../mail/em-popup.c:544
-#: ../mail/em-popup.c:555
+#: ../mail/em-popup.c:557
+#: ../mail/em-popup.c:568
msgid "_Reply to sender"
msgstr "_Reply to sender"
-#: ../mail/em-popup.c:545
-#: ../mail/em-popup.c:556
-#: ../ui/evolution-mail-message.xml.h:84
+#: ../mail/em-popup.c:558
+#: ../mail/em-popup.c:569
+#: ../ui/evolution-mail-message.xml.h:82
msgid "Reply to _List"
msgstr "Reply to _List"
-#: ../mail/em-popup.c:607
-msgid "_Open Link in Browser"
-msgstr "_Open Link in Browser"
-
-#: ../mail/em-popup.c:608
+#: ../mail/em-popup.c:621
msgid "_Send New Message To..."
msgstr "_Send New Message To..."
-#: ../mail/em-popup.c:609
-msgid "_Add to Addressbook"
-msgstr "_Add to Addressbook"
-
-#: ../mail/em-popup.c:762
-#, c-format
-msgid "Open in %s..."
-msgstr "Open in %s..."
+#: ../mail/em-popup.c:622
+msgid "_Add to Address Book"
+msgstr "_Add to Address Book"
-#: ../mail/em-subscribe-editor.c:614
+#: ../mail/em-subscribe-editor.c:582
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:643
+#: ../mail/em-subscribe-editor.c:612
msgid "Subscribed"
msgstr "Subscribed"
-#: ../mail/em-subscribe-editor.c:647
+#: ../mail/em-subscribe-editor.c:616
msgid "Folder"
msgstr "Folder"
#. FIXME: This is just to get the shadow, is there a better way?
-#: ../mail/em-subscribe-editor.c:862
+#: ../mail/em-subscribe-editor.c:814
msgid "Please select a server."
msgstr "Please select a server."
-#: ../mail/em-subscribe-editor.c:883
+#: ../mail/em-subscribe-editor.c:835
msgid "No server has been selected"
msgstr "No server has been selected"
-#: ../mail/em-utils.c:105
-msgid "Don't show this message again."
-msgstr "Don't show this message again."
+#: ../mail/em-utils.c:141
+msgid "Do not show this message again."
+msgstr "Do not show this message again."
-#: ../mail/em-utils.c:299
-msgid "Filters"
-msgstr "Filters"
+#: ../mail/em-utils.c:336
+msgid "Message Filters"
+msgstr "Message Filters"
-#: ../mail/em-utils.c:442
-#: ../mail/em-utils.c:479
+#: ../mail/em-utils.c:516
+#: ../mail/em-utils.c:553
msgid "message"
msgstr "message"
-#: ../mail/em-utils.c:614
+#: ../mail/em-utils.c:688
msgid "Save Message..."
msgstr "Save Message..."
-#: ../mail/em-utils.c:663
+#: ../mail/em-utils.c:737
msgid "Add address"
msgstr "Add address"
#. Drop filename for messages from a mailbox
-#: ../mail/em-utils.c:1142
+#: ../mail/em-utils.c:1221
#, c-format
msgid "Messages from %s"
msgstr "Messages from %s"
-#: ../mail/em-vfolder-editor.c:104
+#: ../mail/em-vfolder-editor.c:112
msgid "Search _Folders"
msgstr "Search _Folders"
-#: ../mail/em-vfolder-rule.c:574
+#: ../mail/em-vfolder-rule.c:591
msgid "Search Folder source"
msgstr "Search Folder source"
@@ -11696,474 +12248,517 @@ msgid "Composer Window default width"
msgstr "Composer Window default width"
#: ../mail/evolution-mail.schemas.in.in.h:8
+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:9
+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:10
msgid "Default charset in which to compose messages"
msgstr "Default charset in which to compose messages"
-#: ../mail/evolution-mail.schemas.in.in.h:9
+#: ../mail/evolution-mail.schemas.in.in.h:11
msgid "Default charset in which to compose messages."
msgstr "Default charset in which to compose messages."
-#: ../mail/evolution-mail.schemas.in.in.h:10
+#: ../mail/evolution-mail.schemas.in.in.h:12
msgid "Default charset in which to display messages"
msgstr "Default charset in which to display messages"
-#: ../mail/evolution-mail.schemas.in.in.h:11
+#: ../mail/evolution-mail.schemas.in.in.h:13
msgid "Default charset in which to display messages."
msgstr "Default charset in which to display messages."
-#: ../mail/evolution-mail.schemas.in.in.h:12
+#: ../mail/evolution-mail.schemas.in.in.h:14
msgid "Default forward style"
msgstr "Default forward style"
-#: ../mail/evolution-mail.schemas.in.in.h:13
+#: ../mail/evolution-mail.schemas.in.in.h:15
msgid "Default height of the Composer Window"
msgstr "Default height of the Composer Window"
-#: ../mail/evolution-mail.schemas.in.in.h:14
+#: ../mail/evolution-mail.schemas.in.in.h:16
msgid "Default height of the Message Window"
msgstr "Default height of the Message Window"
-#: ../mail/evolution-mail.schemas.in.in.h:15
+#: ../mail/evolution-mail.schemas.in.in.h:17
msgid "Default height of the Subscribe dialog"
msgstr "Default height of the Subscribe dialogue"
-#: ../mail/evolution-mail.schemas.in.in.h:16
+#: ../mail/evolution-mail.schemas.in.in.h:18
msgid "Default reply style"
msgstr "Default reply style"
-#: ../mail/evolution-mail.schemas.in.in.h:17
+#: ../mail/evolution-mail.schemas.in.in.h:19
msgid "Default width of the Composer Window"
msgstr "Default width of the Composer Window"
-#: ../mail/evolution-mail.schemas.in.in.h:18
+#: ../mail/evolution-mail.schemas.in.in.h:20
msgid "Default width of the Message Window"
msgstr "Default width of the Message Window"
-#: ../mail/evolution-mail.schemas.in.in.h:19
+#: ../mail/evolution-mail.schemas.in.in.h:21
msgid "Default width of the Subscribe dialog"
msgstr "Default width of the Subscribe dialogue"
-#: ../mail/evolution-mail.schemas.in.in.h:20
+#: ../mail/evolution-mail.schemas.in.in.h:22
msgid "Draw spelling error indicators on words as you type."
msgstr "Draw spelling error indicators on words as you type."
-#: ../mail/evolution-mail.schemas.in.in.h:21
+#: ../mail/evolution-mail.schemas.in.in.h:23
msgid "Empty Trash folders on exit"
msgstr "Empty Trash folders on exit"
-#: ../mail/evolution-mail.schemas.in.in.h:22
+#: ../mail/evolution-mail.schemas.in.in.h:24
msgid "Empty all Trash folders when exiting Evolution."
msgstr "Empty all Trash folders when exiting Evolution."
-#: ../mail/evolution-mail.schemas.in.in.h:23
+#: ../mail/evolution-mail.schemas.in.in.h:25
msgid "Enable caret mode, so that you can see a cursor when reading mail."
msgstr "Enable caret mode, so that you can see a cursor when reading mail."
-#: ../mail/evolution-mail.schemas.in.in.h:24
+#: ../mail/evolution-mail.schemas.in.in.h:26
+msgid "Enable or disable type ahead search feature"
+msgstr "Enable or disable type ahead search feature"
+
+#: ../mail/evolution-mail.schemas.in.in.h:27
+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:28
msgid "Enable/disable caret mode"
msgstr "Enable/disable caret mode"
-#: ../mail/evolution-mail.schemas.in.in.h:25
+#: ../mail/evolution-mail.schemas.in.in.h:29
msgid "Height of the message-list pane"
msgstr "Height of the message-list pane"
-#: ../mail/evolution-mail.schemas.in.in.h:26
+#: ../mail/evolution-mail.schemas.in.in.h:30
msgid "Height of the message-list pane."
msgstr "Height of the message-list pane."
-#: ../mail/evolution-mail.schemas.in.in.h:27
+#: ../mail/evolution-mail.schemas.in.in.h:31
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:28
+#: ../mail/evolution-mail.schemas.in.in.h:32
+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:33
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:29
+#: ../mail/evolution-mail.schemas.in.in.h:34
+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:35
msgid "Last time empty trash was run"
msgstr "Last time empty trash was run"
-#: ../mail/evolution-mail.schemas.in.in.h:30
+#: ../mail/evolution-mail.schemas.in.in.h:36
msgid "List of Labels and their associated colors"
msgstr "List of Labels and their associated colours"
-#: ../mail/evolution-mail.schemas.in.in.h:31
+#: ../mail/evolution-mail.schemas.in.in.h:37
msgid "List of accepted licenses"
msgstr "List of accepted licences"
-#: ../mail/evolution-mail.schemas.in.in.h:32
+#: ../mail/evolution-mail.schemas.in.in.h:38
msgid "List of accounts"
msgstr "List of accounts"
-#: ../mail/evolution-mail.schemas.in.in.h:33
+#: ../mail/evolution-mail.schemas.in.in.h:39
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:34
+#: ../mail/evolution-mail.schemas.in.in.h:40
msgid "List of custom headers and whether they are enabled."
msgstr "List of custom headers and whether they are enabled."
-#: ../mail/evolution-mail.schemas.in.in.h:35
+#: ../mail/evolution-mail.schemas.in.in.h:41
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:36
+#: ../mail/evolution-mail.schemas.in.in.h:42
msgid "List of mime types to check for bonobo component viewers"
msgstr "List of mime types to check for bonobo component viewers"
-#: ../mail/evolution-mail.schemas.in.in.h:37
+#: ../mail/evolution-mail.schemas.in.in.h:43
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:38
+#: ../mail/evolution-mail.schemas.in.in.h:44
msgid "Load images for HTML messages over http"
msgstr "Load images for HTML messages over http"
-#: ../mail/evolution-mail.schemas.in.in.h:39
+#: ../mail/evolution-mail.schemas.in.in.h:45
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.in.h:40
+#: ../mail/evolution-mail.schemas.in.in.h:46
msgid "Log filter actions"
msgstr "Log filter actions"
-#: ../mail/evolution-mail.schemas.in.in.h:41
+#: ../mail/evolution-mail.schemas.in.in.h:47
msgid "Log filter actions to the specified log file."
msgstr "Log filter actions to the specified log file."
-#: ../mail/evolution-mail.schemas.in.in.h:42
+#: ../mail/evolution-mail.schemas.in.in.h:48
msgid "Logfile to log filter actions"
msgstr "Logfile to log filter actions"
-#: ../mail/evolution-mail.schemas.in.in.h:43
+#: ../mail/evolution-mail.schemas.in.in.h:49
msgid "Logfile to log filter actions."
msgstr "Logfile to log filter actions."
-#: ../mail/evolution-mail.schemas.in.in.h:44
+#: ../mail/evolution-mail.schemas.in.in.h:50
msgid "Mark as Seen after specified timeout"
msgstr "Mark as Seen after specified timeout"
-#: ../mail/evolution-mail.schemas.in.in.h:45
+#: ../mail/evolution-mail.schemas.in.in.h:51
msgid "Mark as Seen after specified timeout."
msgstr "Mark as Seen after specified timeout."
-#: ../mail/evolution-mail.schemas.in.in.h:46
+#: ../mail/evolution-mail.schemas.in.in.h:52
msgid "Mark citations in the message \"Preview\""
msgstr "Mark citations in the message \"Preview\""
-#: ../mail/evolution-mail.schemas.in.in.h:47
+#: ../mail/evolution-mail.schemas.in.in.h:53
msgid "Mark citations in the message \"Preview\"."
msgstr "Mark citations in the message \"Preview\"."
-#: ../mail/evolution-mail.schemas.in.in.h:48
+#: ../mail/evolution-mail.schemas.in.in.h:54
msgid "Message Window default height"
msgstr "Message Window default height"
-#: ../mail/evolution-mail.schemas.in.in.h:49
+#: ../mail/evolution-mail.schemas.in.in.h:55
msgid "Message Window default width"
msgstr "Message Window default width"
-#: ../mail/evolution-mail.schemas.in.in.h:50
-msgid "Message-display style (normal, full headers, source)"
-msgstr "Message-display style (normal, full headers, source)"
+#: ../mail/evolution-mail.schemas.in.in.h:56
+msgid "Message-display style (\"normal\", \"full headers\", \"source\")"
+msgstr "Message-display style (\"normal\", \"full headers\", \"source\")"
-#: ../mail/evolution-mail.schemas.in.in.h:51
+#: ../mail/evolution-mail.schemas.in.in.h:57
msgid "Minimum days between emptying the trash on exit"
msgstr "Minimum days between emptying the trash on exit"
-#: ../mail/evolution-mail.schemas.in.in.h:52
+#: ../mail/evolution-mail.schemas.in.in.h:58
msgid "Minimum time between emptying the trash on exit, in days."
msgstr "Minimum time between emptying the trash on exit, in days."
-#: ../mail/evolution-mail.schemas.in.in.h:53
+#: ../mail/evolution-mail.schemas.in.in.h:59
msgid "New Mail Notify sound file"
msgstr "New Mail Notify sound file"
-#: ../mail/evolution-mail.schemas.in.in.h:54
+#: ../mail/evolution-mail.schemas.in.in.h:60
msgid "New Mail Notify type"
msgstr "New Mail Notify type"
-#: ../mail/evolution-mail.schemas.in.in.h:55
+#: ../mail/evolution-mail.schemas.in.in.h:61
+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:62
msgid "Prompt on empty subject"
msgstr "Prompt on empty subject"
-#: ../mail/evolution-mail.schemas.in.in.h:56
+#: ../mail/evolution-mail.schemas.in.in.h:63
msgid "Prompt the user when he or she tries to expunge a folder."
msgstr "Prompt the user when he or she tries to expunge a folder."
-#: ../mail/evolution-mail.schemas.in.in.h:57
+#: ../mail/evolution-mail.schemas.in.in.h:64
msgid "Prompt the user when he or she tries to send a message without a Subject."
msgstr "Prompt the user when he or she tries to send a message without a Subject."
-#: ../mail/evolution-mail.schemas.in.in.h:58
+#: ../mail/evolution-mail.schemas.in.in.h:65
msgid "Prompt when user expunges"
msgstr "Prompt when user expunges"
-#: ../mail/evolution-mail.schemas.in.in.h:59
+#: ../mail/evolution-mail.schemas.in.in.h:66
msgid "Prompt when user only fills Bcc"
msgstr "Prompt when user only fills Bcc"
-#: ../mail/evolution-mail.schemas.in.in.h:60
+#: ../mail/evolution-mail.schemas.in.in.h:67
msgid "Prompt when user tries to open 10 or more messages at once"
msgstr "Prompt when user tries to open 10 or more messages at once"
-#: ../mail/evolution-mail.schemas.in.in.h:61
+#: ../mail/evolution-mail.schemas.in.in.h:68
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:62
+#: ../mail/evolution-mail.schemas.in.in.h:69
msgid "Prompt when user tries to send a message with no To or Cc recipients."
msgstr "Prompt when user tries to send a message with no To or Cc recipients."
-#: ../mail/evolution-mail.schemas.in.in.h:63
+#: ../mail/evolution-mail.schemas.in.in.h:70
msgid "Prompt when user tries to send unwanted HTML"
msgstr "Prompt when user tries to send unwanted HTML"
-#: ../mail/evolution-mail.schemas.in.in.h:64
+#: ../mail/evolution-mail.schemas.in.in.h:71
+msgid "Prompt while marking multiple messages"
+msgstr "Prompt while marking multiple messages"
+
+#: ../mail/evolution-mail.schemas.in.in.h:72
msgid "Recognize links in text and replace them."
msgstr "Recognise links in text and replace them."
-#: ../mail/evolution-mail.schemas.in.in.h:65
+#: ../mail/evolution-mail.schemas.in.in.h:73
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:66
+#: ../mail/evolution-mail.schemas.in.in.h:74
msgid "Run junk test on incoming mail"
msgstr "Run junk test on incoming mail"
-#: ../mail/evolution-mail.schemas.in.in.h:67
+#: ../mail/evolution-mail.schemas.in.in.h:75
msgid "Send HTML mail by default"
msgstr "Send HTML mail by default"
-#: ../mail/evolution-mail.schemas.in.in.h:68
+#: ../mail/evolution-mail.schemas.in.in.h:76
msgid "Send HTML mail by default."
msgstr "Send HTML mail by default."
-#: ../mail/evolution-mail.schemas.in.in.h:69
+#: ../mail/evolution-mail.schemas.in.in.h:77
msgid "Show Animations"
msgstr "Show Animations"
-#: ../mail/evolution-mail.schemas.in.in.h:70
+#: ../mail/evolution-mail.schemas.in.in.h:78
msgid "Show animated images as animations."
msgstr "Show animated images as animations."
-#: ../mail/evolution-mail.schemas.in.in.h:71
+#: ../mail/evolution-mail.schemas.in.in.h:79
msgid "Show deleted messages (with a strike-through) in the message-list."
msgstr "Show deleted messages (with a strike-through) in the message-list."
-#: ../mail/evolution-mail.schemas.in.in.h:72
+#: ../mail/evolution-mail.schemas.in.in.h:80
msgid "Show deleted messages in the message-list"
msgstr "Show deleted messages in the message-list"
-#: ../mail/evolution-mail.schemas.in.in.h:73
-msgid "Show the \"Preview\" pane"
-msgstr "Show the \"Preview\" pane"
+#: ../mail/evolution-mail.schemas.in.in.h:83
+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.in.h:74
-msgid "Show the \"Preview\" pane."
-msgstr "Show the \"Preview\" pane."
+#: ../mail/evolution-mail.schemas.in.in.h:84
+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.in.h:75
+#: ../mail/evolution-mail.schemas.in.in.h:85
msgid "Sound file to play when new mail arrives."
msgstr "Sound file to play when new mail arrives."
-#: ../mail/evolution-mail.schemas.in.in.h:76
+#: ../mail/evolution-mail.schemas.in.in.h:86
msgid "Specifies the type of New Mail Notification the user wishes to use."
msgstr "Specifies the type of New Mail Notification the user wishes to use."
-#: ../mail/evolution-mail.schemas.in.in.h:77
+#: ../mail/evolution-mail.schemas.in.in.h:87
msgid "Spell check inline"
msgstr "Spell check inline"
-#: ../mail/evolution-mail.schemas.in.in.h:78
+#: ../mail/evolution-mail.schemas.in.in.h:88
msgid "Subscribe dialog default height"
msgstr "Subscribe dialogue default height"
-#: ../mail/evolution-mail.schemas.in.in.h:79
+#: ../mail/evolution-mail.schemas.in.in.h:89
msgid "Subscribe dialog default width"
msgstr "Subscribe dialogue default width"
-#: ../mail/evolution-mail.schemas.in.in.h:80
+#: ../mail/evolution-mail.schemas.in.in.h:90
msgid "Terminal font"
msgstr "Terminal font"
-#: ../mail/evolution-mail.schemas.in.in.h:81
+#: ../mail/evolution-mail.schemas.in.in.h:91
msgid "The last time empty trash was run, in days since the epoch."
msgstr "The last time empty trash was run, in days since the epoch."
-#: ../mail/evolution-mail.schemas.in.in.h:82
+#: ../mail/evolution-mail.schemas.in.in.h:92
msgid "The terminal font for mail display"
msgstr "The terminal font for mail display"
-#: ../mail/evolution-mail.schemas.in.in.h:83
+#: ../mail/evolution-mail.schemas.in.in.h:93
msgid "The variable width font for mail display"
msgstr "The variable width font for mail display"
-#: ../mail/evolution-mail.schemas.in.in.h:84
+#: ../mail/evolution-mail.schemas.in.in.h:94
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:85
+#: ../mail/evolution-mail.schemas.in.in.h:95
+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:96
msgid "Thread the message list."
msgstr "Thread the message list."
-#: ../mail/evolution-mail.schemas.in.in.h:86
+#: ../mail/evolution-mail.schemas.in.in.h:97
msgid "Thread the message-list"
msgstr "Thread the message-list"
-#: ../mail/evolution-mail.schemas.in.in.h:87
+#: ../mail/evolution-mail.schemas.in.in.h:98
msgid "Thread the message-list based on Subject"
msgstr "Thread the message-list based on Subject"
-#: ../mail/evolution-mail.schemas.in.in.h:88
+#: ../mail/evolution-mail.schemas.in.in.h:99
msgid "Timeout for marking message as Seen"
msgstr "Timeout for marking message as Seen"
-#: ../mail/evolution-mail.schemas.in.in.h:89
+#: ../mail/evolution-mail.schemas.in.in.h:100
msgid "Timeout for marking message as Seen."
msgstr "Timeout for marking message as Seen."
-#: ../mail/evolution-mail.schemas.in.in.h:90
+#: ../mail/evolution-mail.schemas.in.in.h:101
msgid "UID string of the default account."
msgstr "UID string of the default account."
-#: ../mail/evolution-mail.schemas.in.in.h:91
+#: ../mail/evolution-mail.schemas.in.in.h:102
msgid "Use Spamassassin daemon and client"
msgstr "Use Spamassassin daemon and client"
-#: ../mail/evolution-mail.schemas.in.in.h:92
+#: ../mail/evolution-mail.schemas.in.in.h:103
msgid "Use Spamassassin daemon and client (spamc/spamd)"
msgstr "Use Spamassassin daemon and client (spamc/spamd)"
-#: ../mail/evolution-mail.schemas.in.in.h:93
+#: ../mail/evolution-mail.schemas.in.in.h:104
msgid "Use custom fonts"
msgstr "Use custom fonts"
-#: ../mail/evolution-mail.schemas.in.in.h:94
+#: ../mail/evolution-mail.schemas.in.in.h:105
msgid "Use custom fonts for displaying mail"
msgstr "Use custom fonts for displaying mail"
-#: ../mail/evolution-mail.schemas.in.in.h:95
+#: ../mail/evolution-mail.schemas.in.in.h:106
msgid "Use only local spam tests."
msgstr "Use only local spam tests."
-#: ../mail/evolution-mail.schemas.in.in.h:96
+#: ../mail/evolution-mail.schemas.in.in.h:107
msgid "Use only the local spam tests (no DNS)."
msgstr "Use only the local spam tests (no DNS)."
-#: ../mail/evolution-mail.schemas.in.in.h:97
+#: ../mail/evolution-mail.schemas.in.in.h:108
+msgid "Use side-by-side or wide layout"
+msgstr "Use side-by-side or wide layout"
+
+#: ../mail/evolution-mail.schemas.in.in.h:109
msgid "Variable width font"
msgstr "Variable width font"
-#: ../mail/evolution-mail.schemas.in.in.h:98
+#: ../mail/evolution-mail.schemas.in.in.h:110
msgid "View/Bcc menu item is checked"
msgstr "View/Bcc menu item is checked"
-#: ../mail/evolution-mail.schemas.in.in.h:99
+#: ../mail/evolution-mail.schemas.in.in.h:111
msgid "View/Bcc menu item is checked."
msgstr "View/Bcc menu item is checked."
-#: ../mail/evolution-mail.schemas.in.in.h:100
+#: ../mail/evolution-mail.schemas.in.in.h:112
msgid "View/Cc menu item is checked"
msgstr "View/Cc menu item is checked"
-#: ../mail/evolution-mail.schemas.in.in.h:101
+#: ../mail/evolution-mail.schemas.in.in.h:113
msgid "View/Cc menu item is checked."
msgstr "View/Cc menu item is checked."
-#: ../mail/evolution-mail.schemas.in.in.h:102
+#: ../mail/evolution-mail.schemas.in.in.h:114
msgid "View/From menu item is checked"
msgstr "View/From menu item is checked"
-#: ../mail/evolution-mail.schemas.in.in.h:103
+#: ../mail/evolution-mail.schemas.in.in.h:115
msgid "View/From menu item is checked."
msgstr "View/From menu item is checked."
-#: ../mail/evolution-mail.schemas.in.in.h:104
+#: ../mail/evolution-mail.schemas.in.in.h:116
msgid "View/PostTo menu item is checked"
msgstr "View/PostTo menu item is checked"
-#: ../mail/evolution-mail.schemas.in.in.h:105
+#: ../mail/evolution-mail.schemas.in.in.h:117
msgid "View/PostTo menu item is checked."
msgstr "View/PostTo menu item is checked."
-#: ../mail/evolution-mail.schemas.in.in.h:106
+#: ../mail/evolution-mail.schemas.in.in.h:118
msgid "View/ReplyTo menu item is checked"
msgstr "View/ReplyTo menu item is checked"
-#: ../mail/evolution-mail.schemas.in.in.h:107
+#: ../mail/evolution-mail.schemas.in.in.h:119
msgid "View/ReplyTo menu item is checked."
msgstr "View/ReplyTo menu item is checked."
-#: ../mail/evolution-mail.schemas.in.in.h:108
+#: ../mail/evolution-mail.schemas.in.in.h:120
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/importers/elm-importer.c:193
+#: ../mail/evolution-mail.schemas.in.in.h:121
+msgid "Width of the message-list pane"
+msgstr "Width of the message-list pane"
+
+#: ../mail/evolution-mail.schemas.in.in.h:122
+msgid "Width of the message-list pane."
+msgstr "Width of the message-list pane."
+
+#: ../mail/importers/elm-importer.c:192
msgid "Importing Elm data"
msgstr "Importing Elm data"
-#: ../mail/importers/elm-importer.c:382
+#: ../mail/importers/elm-importer.c:381
msgid "Evolution Elm importer"
msgstr "Evolution Elm importer"
-#: ../mail/importers/elm-importer.c:383
+#: ../mail/importers/elm-importer.c:382
msgid "Import mail from Elm."
msgstr "Import mail from Elm."
-#: ../mail/importers/evolution-mbox-importer.c:82
-#: ../mail/importers/evolution-outlook-importer.c:131
+#: ../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:85
-#: ../mail/importers/evolution-outlook-importer.c:134
+#: ../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"
-#: ../mail/importers/evolution-mbox-importer.c:216
+#: ../mail/importers/evolution-mbox-importer.c:223
msgid "Berkeley Mailbox (mbox)"
msgstr "Berkeley Mailbox (mbox)"
-#: ../mail/importers/evolution-mbox-importer.c:217
+#: ../mail/importers/evolution-mbox-importer.c:224
msgid "Importer Berkeley Mailbox format folders"
msgstr "Importer Berkeley Mailbox format folders"
-#: ../mail/importers/evolution-outlook-importer.c:257
-#: ../mail/importers/mail-importer.c:230
-#: ../shell/e-shell-importer.c:516
+#: ../mail/importers/evolution-outlook-importer.c:262
+#: ../mail/importers/mail-importer.c:233
+#: ../shell/e-shell-importer.c:529
#, c-format
msgid "Importing `%s'"
msgstr "Importing `%s'"
-#: ../mail/importers/evolution-outlook-importer.c:259
-#: ../mail/importers/netscape-importer.c:1251
-msgid "Importing..."
-msgstr "Importing..."
-
-#: ../mail/importers/evolution-outlook-importer.c:261
-#: ../mail/importers/netscape-importer.c:1253
-#: ../plugins/startup-wizard/startup-wizard.c:236
-#: ../shell/e-shell-importer.c:523
+#: ../mail/importers/evolution-outlook-importer.c:266
+#: ../mail/importers/netscape-importer.c:1254
+#: ../plugins/startup-wizard/startup-wizard.c:235
+#: ../shell/e-shell-importer.c:536
msgid "Please wait"
msgstr "Please wait"
-#: ../mail/importers/evolution-outlook-importer.c:305
-#: ../mail/importers/mail-importer.c:144
+#: ../mail/importers/evolution-outlook-importer.c:310
+#: ../mail/importers/mail-importer.c:148
msgid "Importing mailbox"
msgstr "Importing mailbox"
-#: ../mail/importers/mail-importer.c:373
+#: ../mail/importers/mail-importer.c:376
#, c-format
msgid "Scanning %s"
msgstr "Scanning %s"
-#: ../mail/importers/netscape-importer.c:73
+#: ../mail/importers/netscape-importer.c:74
#, c-format
msgid "Priority Filter \"%s\""
msgstr "Priority Filter \"%s\""
-#: ../mail/importers/netscape-importer.c:662
+#: ../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"
@@ -12189,7 +12784,7 @@ msgstr ""
"of priorities. Check the imported filters to make sure\n"
"everything still works as intended."
-#: ../mail/importers/netscape-importer.c:686
+#: ../mail/importers/netscape-importer.c:687
msgid ""
"Some of your Netscape email filters use\n"
"the \"Ignore Thread\" or \"Watch Thread\"\n"
@@ -12201,7 +12796,7 @@ msgstr ""
"feature, which is not supported in Evolution.\n"
"These filters will be dropped."
-#: ../mail/importers/netscape-importer.c:703
+#: ../mail/importers/netscape-importer.c:704
msgid ""
"Some of your Netscape email filters test the\n"
"body of emails for (in)equality to a given string,\n"
@@ -12215,23 +12810,23 @@ msgstr ""
"were modified to test whether that string is or is not\n"
"contained in the message body."
-#: ../mail/importers/netscape-importer.c:1250
+#: ../mail/importers/netscape-importer.c:1251
msgid "Evolution is importing your old Netscape data"
msgstr "Evolution is importing your old Netscape data"
-#: ../mail/importers/netscape-importer.c:1707
+#: ../mail/importers/netscape-importer.c:1708
msgid "Importing Netscape data"
msgstr "Importing Netscape data"
-#: ../mail/importers/netscape-importer.c:1907
+#: ../mail/importers/netscape-importer.c:1908
msgid "Settings"
msgstr "Settings"
-#: ../mail/importers/netscape-importer.c:1912
+#: ../mail/importers/netscape-importer.c:1913
msgid "Mail Filters"
msgstr "Mail Filters"
-#: ../mail/importers/netscape-importer.c:1933
+#: ../mail/importers/netscape-importer.c:1934
msgid ""
"Evolution has found Netscape mail files.\n"
"Would you like them to be imported into Evolution?"
@@ -12239,354 +12834,358 @@ msgstr ""
"Evolution has found Netscape mail files.\n"
"Would you like them to be imported into Evolution?"
-#: ../mail/importers/pine-importer.c:230
+#: ../mail/importers/pine-importer.c:229
msgid "Importing Pine data"
msgstr "Importing Pine data"
-#: ../mail/importers/pine-importer.c:434
+#: ../mail/importers/pine-importer.c:433
msgid "Evolution Pine importer"
msgstr "Evolution Pine importer"
-#: ../mail/importers/pine-importer.c:435
+#: ../mail/importers/pine-importer.c:434
msgid "Import mail from Pine."
msgstr "Import mail from Pine."
-#: ../mail/mail-autofilter.c:78
+#: ../mail/mail-autofilter.c:79
#, c-format
msgid "Mail to %s"
msgstr "Mail to %s"
-#: ../mail/mail-autofilter.c:242
-#: ../mail/mail-autofilter.c:281
+#: ../mail/mail-autofilter.c:243
+#: ../mail/mail-autofilter.c:282
#, c-format
msgid "Mail from %s"
msgstr "Mail from %s"
-#: ../mail/mail-autofilter.c:265
+#: ../mail/mail-autofilter.c:266
#, c-format
msgid "Subject is %s"
msgstr "Subject is %s"
-#: ../mail/mail-autofilter.c:300
+#: ../mail/mail-autofilter.c:301
#, c-format
msgid "%s mailing list"
msgstr "%s mailing list"
-#: ../mail/mail-autofilter.c:369
+#: ../mail/mail-autofilter.c:372
msgid "Add Filter Rule"
msgstr "Add Filter Rule"
-#: ../mail/mail-component.c:509
+#: ../mail/mail-component.c:524
#, c-format
msgid "%d deleted"
msgid_plural "%d deleted"
msgstr[0] "%d deleted"
msgstr[1] "%d deleted"
-#: ../mail/mail-component.c:511
+#: ../mail/mail-component.c:526
#, c-format
msgid "%d junk"
msgid_plural "%d junk"
msgstr[0] "%d junk"
msgstr[1] "%d junk"
-#: ../mail/mail-component.c:534
+#: ../mail/mail-component.c:549
#, c-format
msgid "%d draft"
msgid_plural "%d drafts"
msgstr[0] "%d draft"
msgstr[1] "%d drafts"
-#: ../mail/mail-component.c:536
+#: ../mail/mail-component.c:551
#, c-format
msgid "%d sent"
msgid_plural "%d sent"
msgstr[0] "%d sent"
msgstr[1] "%d sent"
-#: ../mail/mail-component.c:538
+#: ../mail/mail-component.c:553
#, c-format
msgid "%d unsent"
msgid_plural "%d unsent"
msgstr[0] "%d unsent"
msgstr[1] "%d unsent"
-#: ../mail/mail-component.c:542
+#: ../mail/mail-component.c:557
#, c-format
msgid "%d total"
msgid_plural "%d total"
msgstr[0] "%d total"
msgstr[1] "%d total"
-#: ../mail/mail-component.c:544
+#: ../mail/mail-component.c:559
#, c-format
msgid ", %d unread"
msgid_plural ", %d unread"
msgstr[0] ", %d unread"
msgstr[1] ", %d unread"
-#: ../mail/mail-component.c:765
+#: ../mail/mail-component.c:841
msgid "New Mail Message"
msgstr "New Mail Message"
-#: ../mail/mail-component.c:766
+#: ../mail/mail-component.c:842
msgid "_Mail Message"
msgstr "_Mail Message"
-#: ../mail/mail-component.c:767
+#: ../mail/mail-component.c:843
msgid "Compose a new mail message"
msgstr "Compose a new mail message"
-#: ../mail/mail-component.c:773
+#: ../mail/mail-component.c:849
msgid "New Mail Folder"
msgstr "New Mail Folder"
-#: ../mail/mail-component.c:774
+#: ../mail/mail-component.c:850
msgid "Mail _Folder"
msgstr "Mail _Folder"
-#: ../mail/mail-component.c:775
+#: ../mail/mail-component.c:851
msgid "Create a new mail folder"
msgstr "Create a new mail folder"
-#: ../mail/mail-component.c:919
+#: ../mail/mail-component.c:995
msgid "Failed upgrading Mail settings or folders."
msgstr "Failed upgrading Mail settings or folders."
-#: ../mail/mail-config.glade.h:1
-#: ../mail/mail-dialogs.glade.h:1
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:1
-#: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:1
-msgid " "
-msgstr " "
+#: ../mail/mail-config.c:85
+msgid "I_mportant"
+msgstr "I_mportant"
-#: ../mail/mail-config.glade.h:2
+#. red
+#: ../mail/mail-config.c:86
+msgid "_Work"
+msgstr "_Work"
+
+#. orange
+#: ../mail/mail-config.c:87
+msgid "_Personal"
+msgstr "_Personal"
+
+#. forest green
+#: ../mail/mail-config.c:88
+msgid "_To Do"
+msgstr "_To Do"
+
+#. blue
+#: ../mail/mail-config.c:89
+msgid "_Later"
+msgstr "_Later"
+
+#: ../mail/mail-config.glade.h:1
msgid " Ch_eck for Supported Types "
msgstr " Ch_eck for Supported Types "
-#: ../mail/mail-config.glade.h:4
+#: ../mail/mail-config.glade.h:3
msgid "<b>SSL is not supported in this build of Evolution</b>"
msgstr "<b>SSL is not supported in this build of Evolution</b>"
-#: ../mail/mail-config.glade.h:5
-msgid "<b>S_ignatures</b>"
-msgstr "<b>S_ignatures</b>"
+#: ../mail/mail-config.glade.h:4
+msgid "<b>Sig_natures</b>"
+msgstr "<b>Sig_natures</b>"
-#: ../mail/mail-config.glade.h:6
+#: ../mail/mail-config.glade.h:5
msgid "<b>_Languages</b>"
msgstr "<b>_Languages</b>"
-#: ../mail/mail-config.glade.h:7
+#: ../mail/mail-config.glade.h:6
msgid "<small>This will make the the filter more reliable, but slower</small>"
msgstr "<small>This will make the the filter more reliable, but slower</small>"
-#: ../mail/mail-config.glade.h:8
+#: ../mail/mail-config.glade.h:7
msgid "<span weight=\"bold\">Account Information</span>"
msgstr "<span weight=\"bold\">Account Information</span>"
#: ../mail/mail-config.glade.h:9
-msgid "<span weight=\"bold\">Alerts</span>"
-msgstr "<span weight=\"bold\">Alerts</span>"
-
-#: ../mail/mail-config.glade.h:10
msgid "<span weight=\"bold\">Authentication Type</span>"
msgstr "<span weight=\"bold\">Authentication Type</span>"
-#: ../mail/mail-config.glade.h:11
+#: ../mail/mail-config.glade.h:10
msgid "<span weight=\"bold\">Authentication</span>"
msgstr "<span weight=\"bold\">Authentication</span>"
-#: ../mail/mail-config.glade.h:12
+#: ../mail/mail-config.glade.h:11
msgid "<span weight=\"bold\">Composing Messages</span>"
msgstr "<span weight=\"bold\">Composing Messages</span>"
-#: ../mail/mail-config.glade.h:13
+#: ../mail/mail-config.glade.h:12
msgid "<span weight=\"bold\">Configuration</span>"
msgstr "<span weight=\"bold\">Configuration</span>"
-#: ../mail/mail-config.glade.h:14
+#: ../mail/mail-config.glade.h:13
msgid "<span weight=\"bold\">Default Behavior</span>"
msgstr "<span weight=\"bold\">Default Behavior</span>"
-#: ../mail/mail-config.glade.h:15
+#: ../mail/mail-config.glade.h:14
msgid "<span weight=\"bold\">Delete Mail</span>"
msgstr "<span weight=\"bold\">Delete Mail</span>"
-#: ../mail/mail-config.glade.h:16
+#: ../mail/mail-config.glade.h:15
msgid "<span weight=\"bold\">Displayed Mail _Headers</span>"
msgstr "<span weight=\"bold\">Displayed Mail _Headers</span>"
-#: ../mail/mail-config.glade.h:17
+#: ../mail/mail-config.glade.h:16
msgid "<span weight=\"bold\">Filter Options</span>"
msgstr "<span weight=\"bold\">Filter Options</span>"
#: ../mail/mail-config.glade.h:18
-#: ../plugins/itip-formatter/itip-formatter.c:1977
-msgid "<span weight=\"bold\">General</span>"
-msgstr "<span weight=\"bold\">General</span>"
-
-#: ../mail/mail-config.glade.h:19
msgid "<span weight=\"bold\">Labels and Colors</span>"
msgstr "<span weight=\"bold\">Labels and Colours</span>"
-#: ../mail/mail-config.glade.h:20
+#: ../mail/mail-config.glade.h:19
msgid "<span weight=\"bold\">Loading Images</span>"
msgstr "<span weight=\"bold\">Loading Images</span>"
-#: ../mail/mail-config.glade.h:21
+#: ../mail/mail-config.glade.h:20
msgid "<span weight=\"bold\">Message Display</span>"
msgstr "<span weight=\"bold\">Message Display</span>"
-#: ../mail/mail-config.glade.h:22
+#: ../mail/mail-config.glade.h:21
msgid "<span weight=\"bold\">Message Fonts</span>"
msgstr "<span weight=\"bold\">Message Fonts</span>"
-#: ../mail/mail-config.glade.h:23
+#: ../mail/mail-config.glade.h:22
msgid "<span weight=\"bold\">Message Receipts</span>"
msgstr "<span weight=\"bold\">Message Receipts</span>"
-#: ../mail/mail-config.glade.h:24
+#: ../mail/mail-config.glade.h:23
msgid "<span weight=\"bold\">New Mail Notification</span>"
msgstr "<span weight=\"bold\">New Mail Notification</span>"
-#: ../mail/mail-config.glade.h:25
+#: ../mail/mail-config.glade.h:24
+#: ../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:26
+#: ../mail/mail-config.glade.h:25
msgid "<span weight=\"bold\">Options</span>"
msgstr "<span weight=\"bold\">Options</span>"
-#: ../mail/mail-config.glade.h:27
+#: ../mail/mail-config.glade.h:26
msgid "<span weight=\"bold\">Pretty Good Privacy (PGP/GPG)</span>"
msgstr "<span weight=\"bold\">Pretty Good Privacy (PGP/GPG)</span>"
-#: ../mail/mail-config.glade.h:28
+#: ../mail/mail-config.glade.h:27
msgid "<span weight=\"bold\">Printed Fonts</span>"
msgstr "<span weight=\"bold\">Printed Fonts</span>"
-#: ../mail/mail-config.glade.h:29
+#: ../mail/mail-config.glade.h:28
msgid "<span weight=\"bold\">Required Information</span>"
msgstr "<span weight=\"bold\">Required Information</span>"
-#: ../mail/mail-config.glade.h:30
+#: ../mail/mail-config.glade.h:29
msgid "<span weight=\"bold\">Secure MIME (S/MIME)</span>"
msgstr "<span weight=\"bold\">Secure MIME (S/MIME)</span>"
-#: ../mail/mail-config.glade.h:31
+#: ../mail/mail-config.glade.h:30
msgid "<span weight=\"bold\">Security</span>"
msgstr "<span weight=\"bold\">Security</span>"
-#: ../mail/mail-config.glade.h:32
+#: ../mail/mail-config.glade.h:31
msgid "<span weight=\"bold\">Sent and Draft Messages</span>"
msgstr "<span weight=\"bold\">Sent and Draft Messages</span>"
-#: ../mail/mail-config.glade.h:33
+#: ../mail/mail-config.glade.h:32
msgid "<span weight=\"bold\">Server Configuration</span>"
msgstr "<span weight=\"bold\">Server Configuration</span>"
-#: ../mail/mail-config.glade.h:35
+#: ../mail/mail-config.glade.h:34
msgid "Account Management"
msgstr "Account Management"
-#: ../mail/mail-config.glade.h:36
+#: ../mail/mail-config.glade.h:35
msgid "Add Ne_w Signature..."
msgstr "Add Ne_w Signature..."
-#: ../mail/mail-config.glade.h:37
+#: ../mail/mail-config.glade.h:36
msgid "Add _Script"
msgstr "Add _Script"
-#: ../mail/mail-config.glade.h:38
+#: ../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:39
+#: ../mail/mail-config.glade.h:38
msgid "Also encrypt to sel_f when sending encrypted mail"
msgstr "Also encrypt to sel_f when sending encrypted mail"
-#: ../mail/mail-config.glade.h:40
+#: ../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:41
+#: ../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:42
+#: ../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:43
+#: ../mail/mail-config.glade.h:42
msgid "Always encrypt to _myself when sending encrypted mail"
msgstr "Always encrypt to _myself when sending encrypted mail"
-#: ../mail/mail-config.glade.h:44
+#: ../mail/mail-config.glade.h:43
msgid "Attach original message"
msgstr "Attach original message"
#: ../mail/mail-config.glade.h:45
-#: ../mail/message-list.etspec.h:1
-msgid "Attachment"
-msgstr "Attachment"
+msgid "Automatically insert _smiley images"
+msgstr "Automatically insert _smiley images"
#: ../mail/mail-config.glade.h:46
-msgid "Automatically _insert smiley images"
-msgstr "Automatically _insert smiley images"
-
-#: ../mail/mail-config.glade.h:47
msgid "Baltic (ISO-8859-13)"
msgstr "Baltic (ISO-8859-13)"
-#: ../mail/mail-config.glade.h:48
+#: ../mail/mail-config.glade.h:47
msgid "Baltic (ISO-8859-4)"
msgstr "Baltic (ISO-8859-4)"
-#: ../mail/mail-config.glade.h:49
+#: ../mail/mail-config.glade.h:48
msgid "Beep w_hen new mail arrives"
msgstr "Beep w_hen new mail arrives"
-#: ../mail/mail-config.glade.h:50
+#: ../mail/mail-config.glade.h:49
msgid "C_haracter set:"
msgstr "C_haracter set:"
-#: ../mail/mail-config.glade.h:51
+#: ../mail/mail-config.glade.h:50
msgid "Ch_eck for Supported Types "
msgstr "Ch_eck for Supported Types "
-#: ../mail/mail-config.glade.h:52
-msgid "Check _incoming mail for junk"
-msgstr "Check _incoming mail for junk"
+#: ../mail/mail-config.glade.h:51
+msgid "Check in_coming mail for junk"
+msgstr "Check in_coming mail for junk"
-#: ../mail/mail-config.glade.h:53
+#: ../mail/mail-config.glade.h:52
msgid "Check spelling while I _type"
msgstr "Check spelling while I _type"
-#: ../mail/mail-config.glade.h:54
+#: ../mail/mail-config.glade.h:53
msgid "Checks incoming mail messages to be Junk"
msgstr "Checks incoming mail messages to be Junk"
-#: ../mail/mail-config.glade.h:55
+#: ../mail/mail-config.glade.h:54
msgid "Cle_ar"
msgstr "Cle_ar"
-#: ../mail/mail-config.glade.h:56
+#: ../mail/mail-config.glade.h:55
msgid "Clea_r"
msgstr "Clea_r"
-#: ../mail/mail-config.glade.h:57
+#: ../mail/mail-config.glade.h:56
msgid "Color for _misspelled words:"
msgstr "Colour for _misspelled words:"
-#: ../mail/mail-config.glade.h:58
+#: ../mail/mail-config.glade.h:57
msgid "Colors"
msgstr "Colours"
-#: ../mail/mail-config.glade.h:59
+#: ../mail/mail-config.glade.h:58
msgid "Confirm _when expunging a folder"
msgstr "Confirm _when expunging a folder"
-#: ../mail/mail-config.glade.h:60
+#: ../mail/mail-config.glade.h:59
msgid ""
"Congratulations, your mail configuration is complete.\n"
"\n"
@@ -12602,66 +13201,75 @@ msgstr ""
"\n"
"Click \"Apply\" to save your settings."
-#: ../mail/mail-config.glade.h:66
+#: ../mail/mail-config.glade.h:65
msgid "De_fault"
msgstr "De_fault"
-#: ../mail/mail-config.glade.h:67
+#: ../mail/mail-config.glade.h:66
msgid "Default character e_ncoding:"
msgstr "Default character e_ncoding:"
-#: ../mail/mail-config.glade.h:70
+#: ../mail/mail-config.glade.h:69
msgid "Digitally _sign outgoing messages (by default)"
msgstr "Digitally _sign outgoing messages (by default)"
-#: ../mail/mail-config.glade.h:71
+#: ../mail/mail-config.glade.h:70
msgid "Do not quote original message"
msgstr "Do not quote original message"
-#: ../mail/mail-config.glade.h:72
+#: ../mail/mail-config.glade.h:71
msgid "Done"
msgstr "Done"
-#: ../mail/mail-config.glade.h:73
+#: ../mail/mail-config.glade.h:72
msgid "Drafts _Folder:"
msgstr "Drafts _Folder:"
-#: ../mail/mail-config.glade.h:75
+#: ../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
msgid "Email Accounts"
msgstr "Email Accounts"
-#: ../mail/mail-config.glade.h:76
+#: ../mail/mail-config.glade.h:75
msgid "Email _Address:"
msgstr "Email _Address:"
-#: ../mail/mail-config.glade.h:77
+#: ../mail/mail-config.glade.h:76
msgid "Empty trash folders on e_xit"
msgstr "Empty trash folders on e_xit"
-#: ../mail/mail-config.glade.h:78
+#: ../mail/mail-config.glade.h:77
msgid "Encry_ption certificate:"
msgstr "Encry_ption certificate:"
-#: ../mail/mail-config.glade.h:79
+#: ../mail/mail-config.glade.h:78
msgid "Encrypt out_going messages (by default)"
msgstr "Encrypt out_going messages (by default)"
-#: ../mail/mail-config.glade.h:81
-msgid "Execute Command..."
-msgstr "Execute Command..."
+#: ../mail/mail-config.glade.h:80
+msgid "Fi_xed width Font:"
+msgstr "Fi_xed width Font:"
-#: ../mail/mail-config.glade.h:82
+#: ../mail/mail-config.glade.h:81
msgid "Fi_xed-width:"
msgstr "Fi_xed-width:"
-#: ../mail/mail-config.glade.h:83
+#: ../mail/mail-config.glade.h:82
msgid "Font Properties"
msgstr "Font Properties"
-#: ../mail/mail-config.glade.h:84
+#: ../mail/mail-config.glade.h:83
msgid "Format messages in _HTML"
msgstr "Format messages in _HTML"
+#: ../mail/mail-config.glade.h:84
+msgid "Full Nam_e:"
+msgstr "Full Nam_e:"
+
#: ../mail/mail-config.glade.h:86
msgid "HTML Mail"
msgstr "HTML Mail"
@@ -12767,77 +13375,77 @@ msgid "S_elect..."
msgstr "S_elect..."
#: ../mail/mail-config.glade.h:120
+msgid "S_end message receipts:"
+msgstr "S_end message receipts:"
+
+#: ../mail/mail-config.glade.h:121
msgid "S_tandard Font:"
msgstr "S_tandard Font:"
-#: ../mail/mail-config.glade.h:121
+#: ../mail/mail-config.glade.h:122
msgid "Se_lect..."
msgstr "Se_lect..."
-#: ../mail/mail-config.glade.h:123
+#: ../mail/mail-config.glade.h:124
msgid "Select HTML fixed width font"
msgstr "Select HTML fixed width font"
-#: ../mail/mail-config.glade.h:124
+#: ../mail/mail-config.glade.h:125
msgid "Select HTML fixed width font for printing"
msgstr "Select HTML fixed width font for printing"
-#: ../mail/mail-config.glade.h:125
+#: ../mail/mail-config.glade.h:126
msgid "Select HTML variable width font"
msgstr "Select HTML variable width font"
-#: ../mail/mail-config.glade.h:126
+#: ../mail/mail-config.glade.h:127
msgid "Select HTML variable width font for printing"
msgstr "Select HTML variable width font for printing"
-#: ../mail/mail-config.glade.h:127
-msgid "Send message receipts:"
-msgstr "Send message receipts:"
+#: ../mail/mail-config.glade.h:128
+msgid "Select sound file"
+msgstr "Select sound file"
-#: ../mail/mail-config.glade.h:129
+#: ../mail/mail-config.glade.h:130
msgid "Sending Mail"
msgstr "Sending Mail"
-#: ../mail/mail-config.glade.h:130
+#: ../mail/mail-config.glade.h:131
msgid "Sent _Messages Folder:"
msgstr "Sent _Messages Folder:"
-#: ../mail/mail-config.glade.h:131
+#: ../mail/mail-config.glade.h:132
msgid "Ser_ver requires authentication"
msgstr "Ser_ver requires authentication"
-#: ../mail/mail-config.glade.h:132
+#: ../mail/mail-config.glade.h:133
msgid "Server _Type: "
msgstr "Server _Type: "
-#: ../mail/mail-config.glade.h:133
+#: ../mail/mail-config.glade.h:134
msgid "Sig_ning certificate:"
msgstr "Sig_ning certificate:"
-#: ../mail/mail-config.glade.h:134
+#: ../mail/mail-config.glade.h:135
msgid "Signat_ure:"
msgstr "Signat_ure:"
-#: ../mail/mail-config.glade.h:135
+#: ../mail/mail-config.glade.h:136
msgid "Signatures"
msgstr "Signatures"
-#: ../mail/mail-config.glade.h:136
+#: ../mail/mail-config.glade.h:137
msgid "Signatures Table"
msgstr "Signatures Table"
-#: ../mail/mail-config.glade.h:137
+#: ../mail/mail-config.glade.h:138
msgid "Specify _filename:"
msgstr "Specify _filename:"
-#: ../mail/mail-config.glade.h:138
+#: ../mail/mail-config.glade.h:139
msgid "Spell Checking"
msgstr "Spell Checking"
-#: ../mail/mail-config.glade.h:139
-msgid "T_erminal Font:"
-msgstr "T_erminal Font:"
-
#: ../mail/mail-config.glade.h:140
msgid "T_ype: "
msgstr "T_ype: "
@@ -12865,6 +13473,7 @@ msgstr ""
"For example: \"Work\" or \"Personal\""
#: ../mail/mail-config.glade.h:148
+#: ../plugins/caldav/caldav-source.c:282
msgid "User_name:"
msgstr "User_name:"
@@ -12895,73 +13504,82 @@ msgid "_Do not notify me when new mail arrives"
msgstr "_Do not notify me when new mail arrives"
#: ../mail/mail-config.glade.h:157
-msgid "_Don't sign meeting requests (for Outlook compatibility)"
-msgstr "_Don't sign meeting requests (for Outlook compatibility)"
+msgid "_Do not sign meeting requests (for Outlook compatibility)"
+msgstr "_Do not sign meeting requests (for Outlook compatibility)"
#: ../mail/mail-config.glade.h:159
msgid "_Forward style:"
msgstr "_Forward style:"
#: ../mail/mail-config.glade.h:160
-msgid "_Full Name:"
-msgstr "_Full Name:"
-
-#: ../mail/mail-config.glade.h:161
msgid "_Load images in mail from contacts"
msgstr "_Load images in mail from contacts"
-#: ../mail/mail-config.glade.h:162
+#: ../mail/mail-config.glade.h:161
msgid "_Make this my default account"
msgstr "_Make this my default account"
-#: ../mail/mail-config.glade.h:163
+#: ../mail/mail-config.glade.h:162
msgid "_Mark messages as read after"
msgstr "_Mark messages as read after"
-#: ../mail/mail-config.glade.h:165
+#: ../mail/mail-config.glade.h:164
msgid "_Never load images from the Internet"
msgstr "_Never load images from the Internet"
-#: ../mail/mail-config.glade.h:166
+#: ../mail/mail-config.glade.h:165
msgid "_Path:"
msgstr "_Path:"
-#: ../mail/mail-config.glade.h:167
-msgid "_Prompt when sending HTML messages to contacts that don't want them"
-msgstr "_Prompt when sending HTML messages to contacts that don't want them"
+#: ../mail/mail-config.glade.h:166
+msgid "_Prompt when sending HTML messages to contacts that do not want them"
+msgstr "_Prompt when sending HTML messages to contacts that do not want them"
-#: ../mail/mail-config.glade.h:168
+#: ../mail/mail-config.glade.h:167
msgid "_Prompt when sending messages with an empty subject line"
msgstr "_Prompt when sending messages with an empty subject line"
-#: ../mail/mail-config.glade.h:169
+#: ../mail/mail-config.glade.h:168
msgid "_Reply style:"
msgstr "_Reply style:"
-#: ../mail/mail-config.glade.h:170
+#: ../mail/mail-config.glade.h:169
msgid "_Script:"
msgstr "_Script:"
+#. If enabled, show animation; if disabled, only display a static image without any animation
#: ../mail/mail-config.glade.h:172
-msgid "_Show animated images"
-msgstr "_Show animated images"
+msgid "_Show image animations"
+msgstr "_Show image animations"
#: ../mail/mail-config.glade.h:173
+msgid "_Shrink To / Cc / Bcc headers to "
+msgstr "_Shrink To / Cc / Bcc headers to "
+
+#: ../mail/mail-config.glade.h:174
msgid "_Use Secure Connection:"
msgstr "_Use Secure Connection:"
-#: ../mail/mail-config.glade.h:174
+#: ../mail/mail-config.glade.h:175
msgid "_Use the same fonts as other applications"
msgstr "_Use the same fonts as other applications"
-#: ../mail/mail-config.glade.h:175
+#: ../mail/mail-config.glade.h:176
+msgid "addresses"
+msgstr "addresses"
+
+#: ../mail/mail-config.glade.h:177
msgid "color"
msgstr "colour"
-#: ../mail/mail-config.glade.h:176
+#: ../mail/mail-config.glade.h:178
msgid "description"
msgstr "description"
+#: ../mail/mail-dialogs.glade.h:1
+msgid " "
+msgstr " "
+
#: ../mail/mail-dialogs.glade.h:2
msgid "<b>Search Folder Sources</b>"
msgstr "<b>Search Folder Sources</b>"
@@ -12975,50 +13593,66 @@ msgid "<span weight=\"bold\">Encryption</span>"
msgstr "<span weight=\"bold\">Encryption</span>"
#: ../mail/mail-dialogs.glade.h:5
-msgid "Case _Sensitive"
-msgstr "Case _Sensitive"
+msgid "All active remote folders"
+msgstr "All active remote folders"
#: ../mail/mail-dialogs.glade.h:6
-#: ../mail/message-tags.glade.h:2
+msgid "All local and active remote folders"
+msgstr "All local and active remote folders"
+
+#: ../mail/mail-dialogs.glade.h:7
+msgid "All local folders"
+msgstr "All local folders"
+
+#: ../mail/mail-dialogs.glade.h:8
+msgid "Case _sensitive"
+msgstr "Case _sensitive"
+
+#: ../mail/mail-dialogs.glade.h:9
+#: ../mail/message-tags.glade.h:1
msgid "Co_mpleted"
msgstr "Co_mpleted"
-#: ../mail/mail-dialogs.glade.h:8
+#: ../mail/mail-dialogs.glade.h:11
msgid "F_ind:"
msgstr "F_ind:"
-#: ../mail/mail-dialogs.glade.h:9
+#: ../mail/mail-dialogs.glade.h:12
msgid "Find in Message"
msgstr "Find in Message"
-#: ../mail/mail-dialogs.glade.h:10
-#: ../mail/message-tag-followup.c:295
-#: ../mail/message-tags.glade.h:3
+#: ../mail/mail-dialogs.glade.h:13
+#: ../mail/message-tag-followup.c:297
+#: ../mail/message-tags.glade.h:2
msgid "Flag to Follow Up"
msgstr "Flag to Follow Up"
-#: ../mail/mail-dialogs.glade.h:11
+#: ../mail/mail-dialogs.glade.h:14
msgid "Folder Subscriptions"
msgstr "Folder Subscriptions"
-#: ../mail/mail-dialogs.glade.h:12
+#: ../mail/mail-dialogs.glade.h:15
msgid "License Agreement"
msgstr "Licence Agreement"
-#: ../mail/mail-dialogs.glade.h:13
+#: ../mail/mail-dialogs.glade.h:16
msgid "None Selected"
msgstr "None Selected"
-#: ../mail/mail-dialogs.glade.h:14
+#: ../mail/mail-dialogs.glade.h:17
msgid "S_erver:"
msgstr "S_erver:"
-#: ../mail/mail-dialogs.glade.h:15
+#: ../mail/mail-dialogs.glade.h:18
msgid "Security Information"
msgstr "Security Information"
-#: ../mail/mail-dialogs.glade.h:17
-#: ../mail/message-tags.glade.h:4
+#: ../mail/mail-dialogs.glade.h:19
+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."
@@ -13026,70 +13660,45 @@ msgstr ""
"The messages you have selected for follow up are listed below.\n"
"Please select a follow up action from the \"Flag\" menu."
-#: ../mail/mail-dialogs.glade.h:19
+#: ../mail/mail-dialogs.glade.h:23
msgid "_Accept License"
msgstr "_Accept Licence"
-#: ../mail/mail-dialogs.glade.h:20
-#: ../mail/message-tags.glade.h:6
+#: ../mail/mail-dialogs.glade.h:24
+#: ../mail/message-tags.glade.h:5
msgid "_Due By:"
msgstr "_Due By:"
-#: ../mail/mail-dialogs.glade.h:21
-#: ../mail/message-tags.glade.h:7
+#: ../mail/mail-dialogs.glade.h:25
+#: ../mail/message-tags.glade.h:6
msgid "_Flag:"
msgstr "_Flag:"
-#: ../mail/mail-dialogs.glade.h:22
-msgid "_Subscribe"
-msgstr "_Subscribe"
-
-#: ../mail/mail-dialogs.glade.h:23
+#: ../mail/mail-dialogs.glade.h:26
msgid "_Tick this to accept the license agreement"
msgstr "_Tick this to accept the licence agreement"
-#: ../mail/mail-dialogs.glade.h:24
-#: ../plugins/folder-unsubscribe/org-gnome-mail-folder-unsubscribe.eplug.xml.h:3
-msgid "_Unsubscribe"
-msgstr "_Unsubscribe"
-
-#: ../mail/mail-dialogs.glade.h:25
-msgid "specific folders only"
-msgstr "specific folders only"
-
-#: ../mail/mail-dialogs.glade.h:26
-msgid "with all active remote folders"
-msgstr "with all active remote folders"
-
-#: ../mail/mail-dialogs.glade.h:27
-msgid "with all local and active remote folders"
-msgstr "with all local and active remote folders"
-
-#: ../mail/mail-dialogs.glade.h:28
-msgid "with all local folders"
-msgstr "with all local folders"
-
-#: ../mail/mail-folder-cache.c:855
+#: ../mail/mail-folder-cache.c:858
#, c-format
msgid "Pinging %s"
msgstr "Pinging %s"
-#: ../mail/mail-ops.c:102
+#: ../mail/mail-ops.c:105
msgid "Filtering Folder"
msgstr "Filtering Folder"
-#: ../mail/mail-ops.c:263
+#: ../mail/mail-ops.c:266
msgid "Fetching Mail"
msgstr "Fetching Mail"
#. sending mail, filtering failed
-#: ../mail/mail-ops.c:563
+#: ../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:575
-#: ../mail/mail-ops.c:604
+#: ../mail/mail-ops.c:578
+#: ../mail/mail-ops.c:607
#, c-format
msgid ""
"Failed to append to %s: %s\n"
@@ -13098,125 +13707,116 @@ msgstr ""
"Failed to append to %s: %s\n"
"Appending to local `Sent' folder instead."
-#: ../mail/mail-ops.c:621
+#: ../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:733
+#: ../mail/mail-ops.c:736
#, c-format
msgid "Sending message %d of %d"
msgstr "Sending message %d of %d"
-#: ../mail/mail-ops.c:758
+#: ../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:760
-#: ../mail/mail-send-recv.c:613
-msgid "Cancelled."
+#: ../mail/mail-ops.c:763
+#: ../mail/mail-send-recv.c:652
+msgid "Canceled."
msgstr "Cancelled."
-#: ../mail/mail-ops.c:762
+#: ../mail/mail-ops.c:765
msgid "Complete."
msgstr "Complete."
-#: ../mail/mail-ops.c:859
+#: ../mail/mail-ops.c:862
msgid "Saving message to folder"
msgstr "Saving message to folder"
-#: ../mail/mail-ops.c:944
+#: ../mail/mail-ops.c:947
#, c-format
msgid "Moving messages to %s"
msgstr "Moving messages to %s"
-#: ../mail/mail-ops.c:944
+#: ../mail/mail-ops.c:947
#, c-format
msgid "Copying messages to %s"
msgstr "Copying messages to %s"
-#: ../mail/mail-ops.c:1167
+#: ../mail/mail-ops.c:1170
msgid "Forwarded messages"
msgstr "Forwarded messages"
-#: ../mail/mail-ops.c:1210
+#: ../mail/mail-ops.c:1213
#, c-format
msgid "Opening folder %s"
msgstr "Opening folder %s"
-#: ../mail/mail-ops.c:1282
+#: ../mail/mail-ops.c:1285
#, c-format
msgid "Opening store %s"
msgstr "Opening store %s"
-#: ../mail/mail-ops.c:1360
+#: ../mail/mail-ops.c:1363
#, c-format
msgid "Removing folder %s"
msgstr "Removing folder %s"
-#: ../mail/mail-ops.c:1454
+#: ../mail/mail-ops.c:1457
#, c-format
msgid "Storing folder '%s'"
msgstr "Storing folder '%s'"
-#: ../mail/mail-ops.c:1519
+#: ../mail/mail-ops.c:1522
#, c-format
msgid "Expunging and storing account '%s'"
msgstr "Expunging and storing account '%s'"
-#: ../mail/mail-ops.c:1520
+#: ../mail/mail-ops.c:1523
#, c-format
msgid "Storing account '%s'"
msgstr "Storing account '%s'"
-#: ../mail/mail-ops.c:1575
+#: ../mail/mail-ops.c:1578
msgid "Refreshing folder"
msgstr "Refreshing folder"
-#: ../mail/mail-ops.c:1611
-#: ../mail/mail-ops.c:1662
+#: ../mail/mail-ops.c:1614
+#: ../mail/mail-ops.c:1665
msgid "Expunging folder"
msgstr "Expunging folder"
-#: ../mail/mail-ops.c:1659
+#: ../mail/mail-ops.c:1662
#, c-format
msgid "Emptying trash in '%s'"
msgstr "Emptying trash in '%s'"
-#: ../mail/mail-ops.c:1660
+#: ../mail/mail-ops.c:1663
msgid "Local Folders"
msgstr "Local Folders"
-#: ../mail/mail-ops.c:1743
+#: ../mail/mail-ops.c:1746
#, c-format
msgid "Retrieving message %s"
msgstr "Retrieving message %s"
-#: ../mail/mail-ops.c:1853
+#: ../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:1939
+#: ../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:1989
-#, c-format
-msgid ""
-"Unable to create output file: %s\n"
-" %s"
-msgstr ""
-"Unable to create output file: %s\n"
-" %s"
-
-#: ../mail/mail-ops.c:2017
+#: ../mail/mail-ops.c:2013
#, c-format
msgid ""
"Error saving messages to: %s:\n"
@@ -13225,11 +13825,12 @@ msgstr ""
"Error saving messages to: %s:\n"
" %s"
-#: ../mail/mail-ops.c:2088
+#: ../mail/mail-ops.c:2085
msgid "Saving attachment"
msgstr "Saving attachment"
-#: ../mail/mail-ops.c:2100
+#: ../mail/mail-ops.c:2098
+#: ../mail/mail-ops.c:2104
#, c-format
msgid ""
"Cannot create output file: %s:\n"
@@ -13238,111 +13839,106 @@ msgstr ""
"Cannot create output file: %s:\n"
" %s"
-#: ../mail/mail-ops.c:2110
+#: ../mail/mail-ops.c:2114
#, c-format
msgid "Could not write data: %s"
msgstr "Could not write data: %s"
-#: ../mail/mail-ops.c:2260
+#: ../mail/mail-ops.c:2263
#, c-format
msgid "Disconnecting from %s"
msgstr "Disconnecting from %s"
-#: ../mail/mail-ops.c:2260
+#: ../mail/mail-ops.c:2263
#, c-format
msgid "Reconnecting to %s"
msgstr "Reconnecting to %s"
-#: ../mail/mail-ops.c:2376
+#: ../mail/mail-ops.c:2379
msgid "Checking Service"
msgstr "Checking Service"
-#: ../mail/mail-send-recv.c:158
-msgid "Cancelling..."
+#: ../mail/mail-send-recv.c:159
+msgid "Canceling..."
msgstr "Cancelling..."
-#: ../mail/mail-send-recv.c:265
-#, c-format
-msgid "Server: %s, Type: %s"
-msgstr "Server: %s, Type: %s"
-
-#: ../mail/mail-send-recv.c:267
-#, c-format
-msgid "Path: %s, Type: %s"
-msgstr "Path: %s, Type: %s"
-
-#: ../mail/mail-send-recv.c:269
-#, c-format
-msgid "Type: %s"
-msgstr "Type: %s"
-
-#: ../mail/mail-send-recv.c:320
+#: ../mail/mail-send-recv.c:349
msgid "Send & Receive Mail"
msgstr "Send & Receive Mail"
-#: ../mail/mail-send-recv.c:327
+#: ../mail/mail-send-recv.c:356
msgid "Cancel _All"
msgstr "Cancel _All"
-#: ../mail/mail-send-recv.c:416
+#: ../mail/mail-send-recv.c:453
msgid "Updating..."
msgstr "Updating..."
-#: ../mail/mail-send-recv.c:416
-#: ../mail/mail-send-recv.c:468
+#: ../mail/mail-send-recv.c:453
+#: ../mail/mail-send-recv.c:506
msgid "Waiting..."
msgstr "Waiting..."
-#: ../mail/mail-send-recv.c:699
+#: ../mail/mail-send-recv.c:738
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:209
+#: ../mail/mail-session.c:212
msgid "Enter Password"
msgstr "Enter Password"
-#: ../mail/mail-session.c:244
+#: ../mail/mail-session.c:250
msgid "User canceled operation."
msgstr "User cancelled operation."
-#: ../mail/mail-signature-editor.c:372
+#: ../mail/mail-signature-editor.c:384
msgid "Edit signature"
msgstr "Edit signature"
-#: ../mail/mail-signature-editor.c:412
+#: ../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:415
-#: ../plugins/groupwise-features/properties.glade.h:5
+#: ../mail/mail-signature-editor.c:434
+#: ../plugins/groupwise-features/properties.glade.h:4
msgid "Name:"
msgstr "Name:"
-#: ../mail/mail-tools.c:116
+#: ../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:143
+#: ../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:242
+#: ../mail/mail-tools.c:256
#, c-format
msgid "Forwarded message - %s"
msgstr "Forwarded message - %s"
-#: ../mail/mail-tools.c:244
+#: ../mail/mail-tools.c:258
msgid "Forwarded message"
msgstr "Forwarded message"
-#: ../mail/mail-tools.c:284
+#: ../mail/mail-tools.c:298
#, c-format
msgid "Invalid folder: `%s'"
msgstr "Invalid folder: `%s'"
@@ -13362,11 +13958,11 @@ msgstr "Updating Search Folders for '%s:%s'"
msgid "Updating Search Folders for '%s'"
msgstr "Updating Search Folders for '%s'"
-#: ../mail/mail-vfolder.c:1046
+#: ../mail/mail-vfolder.c:1023
msgid "Edit Search Folder"
msgstr "Edit Search Folder"
-#: ../mail/mail-vfolder.c:1130
+#: ../mail/mail-vfolder.c:1107
msgid "New Search Folder"
msgstr "New Search Folder"
@@ -13378,15 +13974,19 @@ msgstr "A folder named &quot;{1}&quot; already exists. Please use a different na
msgid ""
"A non-empty folder at &quot;{1}&quot; already exists.\n"
"\n"
-"You can choose to ignore this folder, overwrite or append its contents, or quit.\n"
+"You can choose to ignore this folder, overwrite or append its contents, or quit."
msgstr ""
"A non-empty folder at &quot;{1}&quot; already exists.\n"
"\n"
-"You can choose to ignore this folder, overwrite or append its contents, or quit.\n"
+"You can choose to ignore this folder, overwrite or append its contents, or quit."
+
+#: ../mail/mail.error.xml.h:5
+msgid "A read receipt notification has been requested for &quot;{1}&quot;. Send the receipt notification to {0}?"
+msgstr "A read receipt notification has been requested for &quot;{1}&quot;. Send the receipt notification to {0}?"
#: ../mail/mail.error.xml.h:6
-msgid "A read receipt notification has been requested for &quot;{1}&quot;. Send the reciept notification to {0}?"
-msgstr "A read receipt notification has been requested for &quot;{1}&quot;. Send the receipt notification to {0}?"
+msgid "A signature already exists with the name &quot;{0}&quot;. Please specify a different name."
+msgstr "A signature already exists with the name &quot;{0}&quot;. Please specify a different name."
#: ../mail/mail.error.xml.h:7
msgid "Adding a meaningful Subject line to your messages will give your recipients an idea of what your mail is about."
@@ -13401,178 +14001,198 @@ msgid "Are you sure you want to delete this account?"
msgstr "Are you sure you want to delete this account?"
#: ../mail/mail.error.xml.h:10
+msgid "Are you sure you want to disable this account and delete all its proxies?"
+msgstr "Are you sure you want to disable this account and delete all its proxies?"
+
+#: ../mail/mail.error.xml.h:11
msgid "Are you sure you want to open {0} messages at once?"
msgstr "Are you sure you want to open {0} messages at once?"
-#: ../mail/mail.error.xml.h:11
+#: ../mail/mail.error.xml.h:12
msgid "Are you sure you want to permanently remove all the deleted messages in all folders?"
msgstr "Are you sure you want to permanently remove all the deleted messages in all folders?"
-#: ../mail/mail.error.xml.h:12
+#: ../mail/mail.error.xml.h:13
msgid "Are you sure you want to permanently remove all the deleted messages in folder &quot;{0}&quot;?"
msgstr "Are you sure you want to permanently remove all the deleted messages in folder &quot;{0}&quot;?"
-#: ../mail/mail.error.xml.h:13
+#: ../mail/mail.error.xml.h:14
msgid "Are you sure you want to send a message in HTML format?"
msgstr "Are you sure you want to send a message in HTML format?"
-#: ../mail/mail.error.xml.h:14
+#: ../mail/mail.error.xml.h:15
msgid "Are you sure you want to send a message with only BCC recipients?"
msgstr "Are you sure you want to send a message with only BCC recipients?"
-#: ../mail/mail.error.xml.h:15
+#: ../mail/mail.error.xml.h:16
msgid "Are you sure you want to send a message without a subject?"
msgstr "Are you sure you want to send a message without a subject?"
-#: ../mail/mail.error.xml.h:16
+#: ../mail/mail.error.xml.h:17
msgid "Because &quot;{0}&quot;."
msgstr "Because &quot;{0}&quot;."
-#: ../mail/mail.error.xml.h:18
+#: ../mail/mail.error.xml.h:19
msgid "Because &quot;{2}&quot;."
msgstr "Because &quot;{2}&quot;."
-#: ../mail/mail.error.xml.h:19
+#: ../mail/mail.error.xml.h:20
+msgid "Blank Signature"
+msgstr "Blank Signature"
+
+#: ../mail/mail.error.xml.h:21
msgid "Cannot add Search Folder &quot;{0}&quot;."
msgstr "Cannot add Search Folder &quot;{0}&quot;."
-#: ../mail/mail.error.xml.h:20
+#: ../mail/mail.error.xml.h:22
msgid "Cannot copy folder &quot;{0}&quot; to &quot;{1}&quot;."
msgstr "Cannot copy folder &quot;{0}&quot; to &quot;{1}&quot;."
-#: ../mail/mail.error.xml.h:21
+#: ../mail/mail.error.xml.h:23
msgid "Cannot create folder &quot;{0}&quot;."
msgstr "Cannot create folder &quot;{0}&quot;."
-#: ../mail/mail.error.xml.h:22
+#: ../mail/mail.error.xml.h:24
msgid "Cannot create temporary save directory."
msgstr "Cannot create temporary save directory."
-#: ../mail/mail.error.xml.h:23
+#: ../mail/mail.error.xml.h:25
msgid "Cannot create the save directory, because &quot;{1}&quot;"
msgstr "Cannot create the save directory, because &quot;{1}&quot;"
-#: ../mail/mail.error.xml.h:24
+#: ../mail/mail.error.xml.h:26
msgid "Cannot delete folder &quot;{0}&quot;."
msgstr "Cannot delete folder &quot;{0}&quot;."
-#: ../mail/mail.error.xml.h:25
+#: ../mail/mail.error.xml.h:27
msgid "Cannot delete system folder &quot;{0}&quot;."
msgstr "Cannot delete system folder &quot;{0}&quot;."
-#: ../mail/mail.error.xml.h:26
+#: ../mail/mail.error.xml.h:28
msgid "Cannot edit Search Folder &quot;{0}&quot; as it does not exist."
msgstr "Cannot edit Search Folder &quot;{0}&quot; as it does not exist."
-#: ../mail/mail.error.xml.h:27
+#: ../mail/mail.error.xml.h:29
msgid "Cannot move folder &quot;{0}&quot; to &quot;{1}&quot;."
msgstr "Cannot move folder &quot;{0}&quot; to &quot;{1}&quot;."
-#: ../mail/mail.error.xml.h:28
+#: ../mail/mail.error.xml.h:30
msgid "Cannot open source &quot;{1}&quot;"
msgstr "Cannot open source &quot;{1}&quot;"
-#: ../mail/mail.error.xml.h:29
+#: ../mail/mail.error.xml.h:31
msgid "Cannot open source &quot;{2}&quot;."
msgstr "Cannot open source &quot;{2}&quot;."
-#: ../mail/mail.error.xml.h:30
+#: ../mail/mail.error.xml.h:32
msgid "Cannot open target &quot;{2}&quot;."
msgstr "Cannot open target &quot;{2}&quot;."
-#: ../mail/mail.error.xml.h:31
-msgid "Cannot read the license file &quot;{0}&quot;, due to an installation problem. You will not be able to use this provider until you can accept its license."
+#: ../mail/mail.error.xml.h:33
+msgid "Cannot read the license file &quot;{0}&quot;, due to an installation problem. You will not be able to use this provider until you can accept its license."
msgstr "Cannot read the licence file &quot;{0}&quot;, due to an installation problem. You will not be able to use this provider until you can accept its licence."
-#: ../mail/mail.error.xml.h:32
+#: ../mail/mail.error.xml.h:34
msgid "Cannot rename &quot;{0}&quot; to &quot;{1}&quot;."
msgstr "Cannot rename &quot;{0}&quot; to &quot;{1}&quot;."
-#: ../mail/mail.error.xml.h:33
+#: ../mail/mail.error.xml.h:35
msgid "Cannot rename or move system folder &quot;{0}&quot;."
msgstr "Cannot rename or move system folder &quot;{0}&quot;."
-#: ../mail/mail.error.xml.h:34
+#: ../mail/mail.error.xml.h:36
msgid "Cannot save changes to account."
msgstr "Cannot save changes to account."
-#: ../mail/mail.error.xml.h:35
+#: ../mail/mail.error.xml.h:37
msgid "Cannot save to directory &quot;{0}&quot;."
msgstr "Cannot save to directory &quot;{0}&quot;."
-#: ../mail/mail.error.xml.h:36
+#: ../mail/mail.error.xml.h:38
msgid "Cannot save to file &quot;{0}&quot;."
msgstr "Cannot save to file &quot;{0}&quot;."
-#: ../mail/mail.error.xml.h:37
+#: ../mail/mail.error.xml.h:39
msgid "Cannot set signature script &quot;{0}&quot;."
msgstr "Cannot set signature script &quot;{0}&quot;."
-#: ../mail/mail.error.xml.h:38
-msgid "Check to make sure your password is spelled correctly. Remember that many passwords are case sensitive; your caps lock might be on."
-msgstr "Check to make sure your password is spelled correctly. Remember that many passwords are case sensitive; your caps lock might be on."
+#: ../mail/mail.error.xml.h:40
+msgid "Check to make sure your password is spelled correctly. Remember that many passwords are case sensitive; your caps lock might be on."
+msgstr "Check to make sure your password is spelt correctly. Remember that many passwords are case sensitive; your caps lock might be on."
-#: ../mail/mail.error.xml.h:39
+#: ../mail/mail.error.xml.h:41
msgid "Could not save signature file."
msgstr "Could not save signature file."
-#: ../mail/mail.error.xml.h:40
+#: ../mail/mail.error.xml.h:42
msgid "Delete &quot;{0}&quot;?"
msgstr "Delete &quot;{0}&quot;?"
-#: ../mail/mail.error.xml.h:41
+#: ../mail/mail.error.xml.h:43
msgid "Delete account?"
msgstr "Delete account?"
-#: ../mail/mail.error.xml.h:42
-msgid "Discard changed?"
-msgstr "Discard changed?"
+#: ../mail/mail.error.xml.h:44
+msgid "Discard changes?"
+msgstr "Discard changes?"
-#: ../mail/mail.error.xml.h:43
+#: ../mail/mail.error.xml.h:45
+msgid "Do not delete"
+msgstr "Do not delete"
+
+#: ../mail/mail.error.xml.h:46
+msgid "Do not disable"
+msgstr "Do not disable"
+
+#: ../mail/mail.error.xml.h:47
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:44
+#: ../mail/mail.error.xml.h:48
+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:49
msgid "Do you wish to save your changes?"
msgstr "Do you wish to save your changes?"
-#: ../mail/mail.error.xml.h:45
-msgid "Don't delete"
-msgstr "Don't delete"
-
-#: ../mail/mail.error.xml.h:46
+#: ../mail/mail.error.xml.h:50
msgid "Enter password."
msgstr "Enter password."
-#: ../mail/mail.error.xml.h:47
+#: ../mail/mail.error.xml.h:51
msgid "Error loading filter definitions."
msgstr "Error loading filter definitions."
-#: ../mail/mail.error.xml.h:48
+#: ../mail/mail.error.xml.h:52
msgid "Error while performing operation."
msgstr "Error while performing operation."
-#: ../mail/mail.error.xml.h:49
+#: ../mail/mail.error.xml.h:53
msgid "Error while {0}."
msgstr "Error while {0}."
-#: ../mail/mail.error.xml.h:50
+#: ../mail/mail.error.xml.h:54
msgid "File exists but cannot overwrite it."
msgstr "File exists but cannot overwrite it."
-#: ../mail/mail.error.xml.h:51
+#: ../mail/mail.error.xml.h:55
msgid "File exists but is not a regular file."
msgstr "File exists but is not a regular file."
-#: ../mail/mail.error.xml.h:52
+#: ../mail/mail.error.xml.h:56
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:53
+#: ../mail/mail.error.xml.h:57
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:54
+#: ../mail/mail.error.xml.h:58
+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:59
msgid ""
"If you proceed, the account information and\n"
"all proxy information will be deleted permanently."
@@ -13580,60 +14200,69 @@ msgstr ""
"If you proceed, the account information and\n"
"all proxy information will be deleted permanently."
-#: ../mail/mail.error.xml.h:56
+#: ../mail/mail.error.xml.h:61
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:57
+#: ../mail/mail.error.xml.h:62
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:58
+#: ../mail/mail.error.xml.h:63
msgid "Ignore"
msgstr "Ignore"
-#: ../mail/mail.error.xml.h:59
+#: ../mail/mail.error.xml.h:64
msgid "Invalid authentication"
msgstr "Invalid authentication"
-#: ../mail/mail.error.xml.h:60
+#: ../mail/mail.error.xml.h:65
msgid "Mail filters automatically updated."
msgstr "Mail filters automatically updated."
-#: ../mail/mail.error.xml.h:61
+#: ../mail/mail.error.xml.h:66
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:62
+#: ../mail/mail.error.xml.h:67
msgid "Mark all messages as read"
msgstr "Mark all messages as read"
-#: ../mail/mail.error.xml.h:63
-msgid "Mark all messages as read in the selected folder"
-msgstr "Mark all messages as read in the selected folder"
+#: ../mail/mail.error.xml.h:68
+msgid "Mark all messages in subfolders as read?"
+msgstr "Mark all messages in subfolders as read?"
-#: ../mail/mail.error.xml.h:64
+#: ../mail/mail.error.xml.h:69
+msgid "Mark as _Read"
+msgstr "Mark as _Read"
+
+#: ../mail/mail.error.xml.h:70
msgid "Missing folder."
msgstr "Missing folder."
-#: ../mail/mail.error.xml.h:66
+#: ../mail/mail.error.xml.h:72
msgid "No sources selected."
msgstr "No sources selected."
-#: ../mail/mail.error.xml.h:67
+#: ../mail/mail.error.xml.h:73
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:68
+#: ../mail/mail.error.xml.h:74
msgid "Please check your account settings and try again."
msgstr "Please check your account settings and try again."
-#: ../mail/mail.error.xml.h:69
+# mail:gw-accountsetup-error secondary
+#: ../mail/mail.error.xml.h:75
+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:76
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:70
+#: ../mail/mail.error.xml.h:77
msgid ""
"Please make sure the following recipients are willing and able to receive HTML email:\n"
"{0}\n"
@@ -13643,43 +14272,51 @@ msgstr ""
"{0}\n"
"Send anyway?"
-#: ../mail/mail.error.xml.h:73
+#: ../mail/mail.error.xml.h:80
+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:81
msgid "Please wait."
msgstr "Please wait."
-#: ../mail/mail.error.xml.h:74
+#: ../mail/mail.error.xml.h:82
msgid "Problem migrating old mail folder &quot;{0}&quot;."
msgstr "Problem migrating old mail folder &quot;{0}&quot;."
-#: ../mail/mail.error.xml.h:75
+#: ../mail/mail.error.xml.h:83
msgid "Querying server"
msgstr "Querying server"
-#: ../mail/mail.error.xml.h:76
+#: ../mail/mail.error.xml.h:84
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:77
+#: ../mail/mail.error.xml.h:85
msgid "Read receipt requested."
msgstr "Read receipt requested."
-#: ../mail/mail.error.xml.h:78
+#: ../mail/mail.error.xml.h:86
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:79
+#: ../mail/mail.error.xml.h:87
msgid "Search Folders automatically updated."
msgstr "Search Folders automatically updated."
-#: ../mail/mail.error.xml.h:80
+#: ../mail/mail.error.xml.h:88
msgid "Send Receipt"
msgstr "Send Receipt"
-#: ../mail/mail.error.xml.h:81
-msgid "System folders are required for Ximian Evolution to function correctly and cannot be renamed, moved, or deleted."
-msgstr "System folders are required for Ximian Evolution to function correctly and cannot be renamed, moved, or deleted."
+#: ../mail/mail.error.xml.h:89
+msgid "Signature Already Exists"
+msgstr "Signature Already Exists"
-#: ../mail/mail.error.xml.h:82
+#: ../mail/mail.error.xml.h:90
+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:91
msgid ""
"The contact list you are sending to is configured to hide list recipients.\n"
"\n"
@@ -13689,7 +14326,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:85
+#: ../mail/mail.error.xml.h:94
msgid ""
"The following Search Folder(s):\n"
"{0}\n"
@@ -13703,7 +14340,7 @@ msgstr ""
" &quot;{1}&quot;\n"
"And have been updated."
-#: ../mail/mail.error.xml.h:90
+#: ../mail/mail.error.xml.h:99
msgid ""
"The following filter rule(s):\n"
"{0}\n"
@@ -13717,19 +14354,11 @@ msgstr ""
" &quot;{1}&quot;\n"
"And have been updated."
-#: ../mail/mail.error.xml.h:95
-msgid ""
-"The message was sent via the &quot;sendmail&quot; external application. Sendmail reports the following error: status 67: mail not sent.\n"
-"The message is stored in the Outbox folder. Check the message for errors and resend."
-msgstr ""
-"The message was sent via the &quot;sendmail&quot; external application. Sendmail reports the following error: status 67: mail not sent.\n"
-"The message is stored in the Outbox folder. Check the message for errors and resend."
-
-#: ../mail/mail.error.xml.h:97
+#: ../mail/mail.error.xml.h:104
msgid "The script file must exist and be executable."
msgstr "The script file must exist and be executable."
-#: ../mail/mail.error.xml.h:98
+#: ../mail/mail.error.xml.h:105
msgid ""
"This folder may have been added implicitly,\n"
"go to the Search Folder editor to add it explicitly, if required."
@@ -13737,60 +14366,68 @@ 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:100
-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:107
+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:101
+#: ../mail/mail.error.xml.h:108
+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:109
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:102
+#: ../mail/mail.error.xml.h:110
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:111
+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:103
+#: ../mail/mail.error.xml.h:112
msgid "Unable to connect to the GroupWise server."
msgstr "Unable to connect to the GroupWise server."
-#: ../mail/mail.error.xml.h:104
-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:113
+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:105
+#: ../mail/mail.error.xml.h:114
msgid "Unable to read license file."
msgstr "Unable to read licence file."
-#: ../mail/mail.error.xml.h:106
+#: ../mail/mail.error.xml.h:115
msgid "Use _Default"
msgstr "Use _Default"
-#: ../mail/mail.error.xml.h:107
+#: ../mail/mail.error.xml.h:116
msgid "Use default drafts folder?"
msgstr "Use default drafts folder?"
-#: ../mail/mail.error.xml.h:108
+#: ../mail/mail.error.xml.h:117
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:109
+#: ../mail/mail.error.xml.h:118
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:110
+#: ../mail/mail.error.xml.h:119
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:111
+#: ../mail/mail.error.xml.h:120
msgid "You must name this Search Folder."
msgstr "You must name this Search Folder."
-#: ../mail/mail.error.xml.h:112
+#: ../mail/mail.error.xml.h:121
msgid "You must specify a folder."
msgstr "You must specify a folder."
-#: ../mail/mail.error.xml.h:113
+#: ../mail/mail.error.xml.h:122
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."
@@ -13798,108 +14435,105 @@ 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:115
+#: ../mail/mail.error.xml.h:124
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:116
-msgid "Your message with the subject &quot;{0}&quot; was not delivered."
-msgstr "Your message with the subject &quot;{0}&quot; was not delivered."
-
-#: ../mail/mail.error.xml.h:117
+#: ../mail/mail.error.xml.h:125
msgid "_Append"
msgstr "_Append"
-#: ../mail/mail.error.xml.h:118
+#: ../mail/mail.error.xml.h:126
msgid "_Discard changes"
msgstr "_Discard changes"
-#: ../mail/mail.error.xml.h:119
-msgid "_Empty Trash"
-msgstr "_Empty Wastebasket"
+#: ../mail/mail.error.xml.h:127
+msgid "_Do not Mark as Read"
+msgstr "_Do not Mark as Read"
-#: ../mail/mail.error.xml.h:120
+#: ../mail/mail.error.xml.h:129
msgid "_Expunge"
msgstr "_Expunge"
-#: ../mail/mail.error.xml.h:121
+#: ../mail/mail.error.xml.h:130
msgid "_Open Messages"
msgstr "_Open Messages"
-#: ../mail/message-list.c:996
+#: ../mail/message-list.c:1019
msgid "Unseen"
msgstr "Unseen"
-#: ../mail/message-list.c:997
+#: ../mail/message-list.c:1020
msgid "Seen"
msgstr "Seen"
-#: ../mail/message-list.c:998
+#: ../mail/message-list.c:1021
msgid "Answered"
msgstr "Answered"
-#: ../mail/message-list.c:999
+#: ../mail/message-list.c:1022
msgid "Multiple Unseen Messages"
msgstr "Multiple Unseen Messages"
-#: ../mail/message-list.c:1000
+#: ../mail/message-list.c:1023
msgid "Multiple Messages"
msgstr "Multiple Messages"
-#: ../mail/message-list.c:1004
+#: ../mail/message-list.c:1027
msgid "Lowest"
msgstr "Lowest"
-#: ../mail/message-list.c:1005
+#: ../mail/message-list.c:1028
msgid "Lower"
msgstr "Lower"
-#: ../mail/message-list.c:1009
+#: ../mail/message-list.c:1032
msgid "Higher"
msgstr "Higher"
-#: ../mail/message-list.c:1010
+#: ../mail/message-list.c:1033
msgid "Highest"
msgstr "Highest"
-#: ../mail/message-list.c:1338
+#: ../mail/message-list.c:1466
#: ../widgets/table/e-cell-date.c:57
msgid "?"
msgstr "?"
#. strftime format of a time,
#. in 12-hour format, without seconds.
-#: ../mail/message-list.c:1345
-#: ../plugins/itip-formatter/itip-view.c:198
+#: ../mail/message-list.c:1473
+#: ../plugins/itip-formatter/itip-view.c:202
#: ../widgets/table/e-cell-date.c:72
msgid "Today %l:%M %p"
msgstr "Today %l:%M %p"
-#: ../mail/message-list.c:1354
+#: ../mail/message-list.c:1482
#: ../widgets/table/e-cell-date.c:82
msgid "Yesterday %l:%M %p"
msgstr "Yesterday %l:%M %p"
-#: ../mail/message-list.c:1366
+#: ../mail/message-list.c:1494
#: ../widgets/table/e-cell-date.c:94
msgid "%a %l:%M %p"
msgstr "%a %l:%M %p"
-#: ../mail/message-list.c:1374
+#: ../mail/message-list.c:1502
#: ../widgets/table/e-cell-date.c:102
msgid "%b %d %l:%M %p"
msgstr "%d %b %l:%M %p"
-#: ../mail/message-list.c:1376
+#: ../mail/message-list.c:1504
#: ../widgets/table/e-cell-date.c:104
msgid "%b %d %Y"
msgstr "%d %b %Y"
-#: ../mail/message-list.c:2042
-msgid "Message List"
-msgstr "Message List"
+#: ../mail/message-list.c:2259
+#: ../mail/message-list.etspec.h:9
+msgid "Messages"
+msgstr "Messages"
-#: ../mail/message-list.c:3387
+#: ../mail/message-list.c:3647
msgid "Generating message list"
msgstr "Generating message list"
@@ -13919,54 +14553,55 @@ msgstr "Flagged"
msgid "Follow Up Flag"
msgstr "Follow Up Flag"
-#: ../mail/message-list.etspec.h:8
-msgid "Original Location"
-msgstr "Original Location"
-
-#: ../mail/message-list.etspec.h:9
+#: ../mail/message-list.etspec.h:10
msgid "Received"
msgstr "Received"
-#: ../mail/message-list.etspec.h:11
+#: ../mail/message-list.etspec.h:14
+msgid "Sent Messages"
+msgstr "Sent Messages"
+
+#: ../mail/message-list.etspec.h:15
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:4
msgid "Size"
msgstr "Size"
-#: ../mail/message-tag-followup.c:74
+#: ../mail/message-tag-followup.c:75
msgid "Call"
msgstr "Call"
-#: ../mail/message-tag-followup.c:75
+#: ../mail/message-tag-followup.c:76
msgid "Do Not Forward"
msgstr "Do Not Forward"
-#: ../mail/message-tag-followup.c:76
+#: ../mail/message-tag-followup.c:77
msgid "Follow-Up"
msgstr "Follow-Up"
-#: ../mail/message-tag-followup.c:77
+#: ../mail/message-tag-followup.c:78
msgid "For Your Information"
msgstr "For Your Information"
-#: ../mail/message-tag-followup.c:78
-#: ../ui/evolution-mail-message.xml.h:42
+#: ../mail/message-tag-followup.c:79
+#: ../ui/evolution-mail-message.xml.h:41
msgid "Forward"
msgstr "Forward"
-#: ../mail/message-tag-followup.c:79
+#: ../mail/message-tag-followup.c:80
msgid "No Response Necessary"
msgstr "No Response Necessary"
-#: ../mail/message-tag-followup.c:81
-#: ../ui/evolution-mail-message.xml.h:82
+#: ../mail/message-tag-followup.c:82
+#: ../ui/evolution-mail-message.xml.h:79
msgid "Reply"
msgstr "Reply"
-#: ../mail/message-tag-followup.c:82
-#: ../ui/evolution-mail-message.xml.h:83
+#: ../mail/message-tag-followup.c:83
+#: ../ui/evolution-mail-message.xml.h:80
msgid "Reply to All"
msgstr "Reply to All"
-#: ../mail/message-tag-followup.c:83
+#: ../mail/message-tag-followup.c:84
msgid "Review"
msgstr "Review"
@@ -13994,6 +14629,14 @@ msgstr "Subject contains"
msgid "Subject or Sender contains"
msgstr "Subject or Sender contains"
+#: ../plugins/addressbook-file/org-gnome-addressbook-file.eplug.xml.h:1
+msgid "Local Address Books"
+msgstr "Local Address Books"
+
+#: ../plugins/addressbook-file/org-gnome-addressbook-file.eplug.xml.h:2
+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."
@@ -14038,8 +14681,7 @@ msgstr "Restart Evolution"
msgid "A plugin for backing up and restore Evolution data and settings."
msgstr "A plugin for backing up and restore Evolution data and settings."
-#. the path to the shared library
-#: ../plugins/backup-restore/org-gnome-backup-restore.eplug.xml.h:3
+#: ../plugins/backup-restore/org-gnome-backup-restore.eplug.xml.h:2
msgid "Backup and restore plugin"
msgstr "Backup and restore plugin"
@@ -14055,45 +14697,56 @@ msgstr "Backup and restore Evolution data and settings"
msgid "Restore Settings..."
msgstr "Restore Settings..."
-#: ../plugins/bbdb/bbdb.c:404
+#: ../plugins/bbdb/bbdb.c:447
+#: ../plugins/bbdb/bbdb.c:456
+#: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:1
msgid "Automatic Contacts"
msgstr "Automatic Contacts"
-#: ../plugins/bbdb/bbdb.c:413
-msgid "<span weight=\"bold\">Automatic Contacts</span>"
-msgstr "<span weight=\"bold\">Automatic Contacts</span>"
-
#. Enable BBDB checkbox
-#: ../plugins/bbdb/bbdb.c:426
+#: ../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:444
-msgid "<span weight=\"bold\">Instant Messaging Contacts</span>"
-msgstr "<span weight=\"bold\">Instant Messaging Contacts</span>"
+#: ../plugins/bbdb/bbdb.c:477
+msgid "Select Address book for Automatic Contacts"
+msgstr "Select Address book for Automatic Contacts"
+
+#: ../plugins/bbdb/bbdb.c:492
+msgid "Instant Messaging Contacts"
+msgstr "Instant Messaging Contacts"
#. Enable Gaim Checkbox
-#: ../plugins/bbdb/bbdb.c:457
-msgid "Periodically synchronize contact information and images from my _instant messenger"
-msgstr "Periodically synchronise contact information and images from my _instant messenger"
+#: ../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:513
+msgid "Select Address book for Gaim buddy list"
+msgstr "Select Address book for Gaim buddy list"
#. Synchronize now button.
-#: ../plugins/bbdb/bbdb.c:464
+#: ../plugins/bbdb/bbdb.c:524
msgid "Synchronize with _buddy list now"
msgstr "Synchronise with _buddy list now"
-#: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:1
-msgid "Automatic contacts"
-msgstr "Automatic contacts"
-
#: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:2
-msgid "Automatically fills your addressbook with names and email addresses as you reply to mails. Also fills in IM contact information from your buddy lists."
-msgstr "Automatically fills your address book with names and email addresses as you reply to mails. Also fills in IM contact information from your buddy lists."
+msgid "Automatically fills your addressbook with names and email addresses as you reply to messages. Also fills in IM contact information from your buddy lists."
+msgstr "Automatically fills your addressbook with names and email addresses as you reply to messages. Also fills in IM contact information from your buddy lists."
#: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:3
msgid "BBDB"
msgstr "BBDB"
+#: ../plugins/caldav/caldav-source.c:64
+#: ../plugins/caldav/caldav-source.c:68
+msgid "CalDAV"
+msgstr "CalDAV"
+
+#: ../plugins/caldav/caldav-source.c:269
+msgid "Use _SSL"
+msgstr "Use _SSL"
+
#: ../plugins/calendar-file/org-gnome-calendar-file.eplug.xml.h:1
msgid "Local Calendars"
msgstr "Local Calendars"
@@ -14102,6 +14755,10 @@ msgstr "Local Calendars"
msgid "Provides core functionality for local calendars."
msgstr "Provides core functionality for local calendars."
+#: ../plugins/calendar-http/calendar-http.c:339
+msgid "_Secure connection"
+msgstr "_Secure connection"
+
#: ../plugins/calendar-http/org-gnome-calendar-http.eplug.xml.h:1
msgid "HTTP Calendars"
msgstr "HTTP Calendars"
@@ -14167,10 +14824,6 @@ msgstr "Weather Calendars"
msgid "A test plugin which demonstrates a popup menu plugin which lets you copy things to the clipboard."
msgstr "A test plugin which demonstrates a pop-up menu plugin which lets you copy things to the clipboard."
-#: ../plugins/copy-tool/org-gnome-copy-tool.eplug.xml.h:2
-msgid "Copy _Email Address"
-msgstr "Copy _Email Address"
-
#: ../plugins/copy-tool/org-gnome-copy-tool.eplug.xml.h:3
msgid "Copy tool"
msgstr "Copy tool"
@@ -14197,8 +14850,16 @@ 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
-msgid "Mark as default folder"
-msgstr "Mark as default folder"
+msgid "Mark as _default folder"
+msgstr "Mark as _default folder"
+
+#: ../plugins/default-source/org-gnome-default-source.eplug.xml.h:1
+msgid "Default Sources"
+msgstr "Default Sources"
+
+#: ../plugins/default-source/org-gnome-default-source.eplug.xml.h:2
+msgid "Provides functionallity for marking a calendar or addressbook as the default one."
+msgstr "Provides functionallity for marking a calendar or addressbook as the default one."
#: ../plugins/exchange-operations/e-foreign-folder-dialog.glade.h:1
msgid "Open Other User's Folder"
@@ -14234,11 +14895,11 @@ msgstr "Plaintext Password"
msgid "This option will connect to the Exchange server using standard plaintext password authentication."
msgstr "This option will connect to the Exchange server using standard plaintext password authentication."
-#: ../plugins/exchange-operations/exchange-account-setup.c:251
+#: ../plugins/exchange-operations/exchange-account-setup.c:257
msgid "Out Of Office"
msgstr "Out Of Office"
-#: ../plugins/exchange-operations/exchange-account-setup.c:258
+#: ../plugins/exchange-operations/exchange-account-setup.c:264
msgid ""
"The message specified below will be automatically sent to \n"
"each person who sends mail to you while you are out of the office."
@@ -14246,69 +14907,79 @@ msgstr ""
"The message specified below will be automatically sent to \n"
"each person who sends mail to you while you are out of the office."
-#: ../plugins/exchange-operations/exchange-account-setup.c:270
-#: ../plugins/exchange-operations/exchange-account-setup.c:275
+#: ../plugins/exchange-operations/exchange-account-setup.c:276
+#: ../plugins/exchange-operations/exchange-account-setup.c:281
msgid "I am out of the office"
msgstr "I am out of the office"
-#: ../plugins/exchange-operations/exchange-account-setup.c:271
-#: ../plugins/exchange-operations/exchange-account-setup.c:274
+#: ../plugins/exchange-operations/exchange-account-setup.c:277
+#: ../plugins/exchange-operations/exchange-account-setup.c:280
msgid "I am in the office"
msgstr "I am in the office"
#. Change Password
-#: ../plugins/exchange-operations/exchange-account-setup.c:321
+#: ../plugins/exchange-operations/exchange-account-setup.c:328
msgid "Change the password for Exchange account"
msgstr "Change the password for Exchange account"
-#: ../plugins/exchange-operations/exchange-account-setup.c:323
-#: ../plugins/exchange-operations/exchange-change-password.glade.h:2
+#: ../plugins/exchange-operations/exchange-account-setup.c:330
+#: ../plugins/exchange-operations/exchange-change-password.glade.h:1
msgid "Change Password"
msgstr "Change Password"
#. Delegation Assistant
-#: ../plugins/exchange-operations/exchange-account-setup.c:327
+#: ../plugins/exchange-operations/exchange-account-setup.c:335
msgid "Manage the delegate settings for Exchange account"
msgstr "Manage the delegate settings for Exchange account"
-#: ../plugins/exchange-operations/exchange-account-setup.c:329
+#: ../plugins/exchange-operations/exchange-account-setup.c:337
msgid "Delegation Assitant"
msgstr "Delegation Assitant"
#. Miscelleneous settings
-#: ../plugins/exchange-operations/exchange-account-setup.c:339
+#: ../plugins/exchange-operations/exchange-account-setup.c:349
msgid "Miscelleneous"
msgstr "Miscelleneous"
#. Folder Size
-#: ../plugins/exchange-operations/exchange-account-setup.c:349
+#: ../plugins/exchange-operations/exchange-account-setup.c:359
msgid "View the size of all Exchange folders"
msgstr "View the size of all Exchange folders"
-#: ../plugins/exchange-operations/exchange-account-setup.c:351
+#: ../plugins/exchange-operations/exchange-account-setup.c:361
msgid "Folders Size"
msgstr "Folders Size"
-#: ../plugins/exchange-operations/exchange-account-setup.c:358
+#: ../plugins/exchange-operations/exchange-account-setup.c:368
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:3
msgid "Exchange Settings"
msgstr "Exchange Settings"
-#: ../plugins/exchange-operations/exchange-account-setup.c:601
-msgid "_OWA Url:"
-msgstr "_OWA Url:"
+#: ../plugins/exchange-operations/exchange-account-setup.c:610
+msgid "_OWA URL:"
+msgstr "_OWA URL:"
-#: ../plugins/exchange-operations/exchange-account-setup.c:626
+#: ../plugins/exchange-operations/exchange-account-setup.c:636
msgid "A_uthenticate"
msgstr "A_uthenticate"
-#: ../plugins/exchange-operations/exchange-account-setup.c:814
+#: ../plugins/exchange-operations/exchange-account-setup.c:829
msgid "Authentication Type"
msgstr "Authentication Type"
-#: ../plugins/exchange-operations/exchange-account-setup.c:828
+#: ../plugins/exchange-operations/exchange-account-setup.c:843
msgid "Ch_eck for Supported Types"
msgstr "Ch_eck for Supported Types"
+#: ../plugins/exchange-operations/exchange-calendar.c:191
+#: ../plugins/exchange-operations/exchange-contacts.c:166
+msgid ""
+"Evolution is in offline mode. You cannot create or modify folders now.\n"
+"Please switch to online mode for such operations."
+msgstr ""
+"Evolution is in offline mode. You cannot create or modify folders now.\n"
+"Please switch to online mode for such operations."
+
#. User entered a wrong existing
#. * password. Prompt him again.
#.
@@ -14320,28 +14991,40 @@ msgstr "The current password does not match the existing password for your accou
msgid "The two passwords do not match. Please re-enter the passwords."
msgstr "The two passwords do not match. Please re-enter the passwords."
-#: ../plugins/exchange-operations/exchange-change-password.glade.h:3
+#: ../plugins/exchange-operations/exchange-change-password.glade.h:2
msgid "Confirm Password:"
msgstr "Confirm Password:"
-#: ../plugins/exchange-operations/exchange-change-password.glade.h:4
+#: ../plugins/exchange-operations/exchange-change-password.glade.h:3
msgid "Current Password:"
msgstr "Current Password:"
-#: ../plugins/exchange-operations/exchange-change-password.glade.h:5
+#: ../plugins/exchange-operations/exchange-change-password.glade.h:4
msgid "New Password:"
msgstr "New Password:"
-#: ../plugins/exchange-operations/exchange-change-password.glade.h:6
+#: ../plugins/exchange-operations/exchange-change-password.glade.h:5
msgid "Your current password has expired. Please change your password now."
msgstr "Your current password has expired. Please change your password now."
+#: ../plugins/exchange-operations/exchange-config-listener.c:663
+#, c-format
+msgid "Your password will expire in the next %d days"
+msgstr "Your password will expire in the next %d days"
+
+#. Custom
#: ../plugins/exchange-operations/exchange-delegates-user.c:144
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:576
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:580
+#: ../widgets/table/e-table-header-item.c:1572
msgid "Custom"
msgstr "Custom"
#: ../plugins/exchange-operations/exchange-delegates-user.c:191
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:6
+msgid "Delegate Permissions"
+msgstr "Delegate Permissions"
+
+#: ../plugins/exchange-operations/exchange-delegates-user.c:202
#: ../plugins/exchange-operations/exchange-permissions-dialog.c:188
#, c-format
msgid "Permissions for %s"
@@ -14356,34 +15039,34 @@ msgstr "Delegate To"
msgid "Remove the delegate %s?"
msgstr "Remove the delegate %s?"
-#: ../plugins/exchange-operations/exchange-delegates.c:679
+#: ../plugins/exchange-operations/exchange-delegates.c:680
msgid "Could not access Active Directory"
msgstr "Could not access Active Directory"
-#: ../plugins/exchange-operations/exchange-delegates.c:694
+#: ../plugins/exchange-operations/exchange-delegates.c:692
msgid "Could not find self in Active Directory"
msgstr "Could not find self in Active Directory"
-#: ../plugins/exchange-operations/exchange-delegates.c:707
+#: ../plugins/exchange-operations/exchange-delegates.c:705
#, 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:719
+#: ../plugins/exchange-operations/exchange-delegates.c:717
#, c-format
msgid "Could not remove delegate %s"
msgstr "Could not remove delegate %s"
-#: ../plugins/exchange-operations/exchange-delegates.c:779
+#: ../plugins/exchange-operations/exchange-delegates.c:777
msgid "Could not update list of delegates."
msgstr "Could not update list of delegates."
-#: ../plugins/exchange-operations/exchange-delegates.c:797
+#: ../plugins/exchange-operations/exchange-delegates.c:795
#, c-format
msgid "Could not add delegate %s"
msgstr "Could not add delegate %s"
-#: ../plugins/exchange-operations/exchange-delegates.c:965
+#: ../plugins/exchange-operations/exchange-delegates.c:963
msgid "Error reading delegates list."
msgstr "Error reading delegates list."
@@ -14391,35 +15074,33 @@ msgstr "Error reading delegates list."
msgid "Author (read, create)"
msgstr "Author (read, create)"
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:2
+#. Translators: This is used for permissions for <user> for the folder Calendar.
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:3
msgid "C_alendar:"
msgstr "C_alendar:"
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:3
+#. Translators: This is used for permissions for <user> for the folder Contacts.
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:5
msgid "Co_ntacts:"
msgstr "Co_ntacts:"
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:4
-msgid "Delegate Permissions"
-msgstr "Delegate Permissions"
-
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:5
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:7
msgid "Delegates"
msgstr "Delegates"
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:6
+#: ../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:8
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:10
msgid "Permissions for"
msgstr "Permissions for"
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:9
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:11
msgid "Reviewer (read-only)"
msgstr "Reviewer (read-only)"
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:10
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:12
msgid ""
"These users will be able to send mail on your behalf\n"
"and access your folders with the permissions you give them."
@@ -14427,15 +15108,17 @@ msgstr ""
"These users will be able to send mail on your behalf\n"
"and access your folders with the permissions you give them."
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:12
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:14
msgid "_Delegate can see private items"
msgstr "_Delegate can see private items"
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:14
+#. Translators: This is used for permissions for <user> for the folder Inbox.
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:17
msgid "_Inbox:"
msgstr "_Inbox:"
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:15
+#. Translators: This is used for permissions for <user> for the folder Tasks.
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:19
msgid "_Tasks:"
msgstr "_Tasks:"
@@ -14444,111 +15127,136 @@ msgstr "_Tasks:"
msgid "Permissions..."
msgstr "Permissions..."
-#: ../plugins/exchange-operations/exchange-folder-size-display.c:136
+#: ../plugins/exchange-operations/exchange-folder-size-display.c:135
msgid "Folder Name"
msgstr "Folder Name"
-#: ../plugins/exchange-operations/exchange-folder-size-display.c:140
+#: ../plugins/exchange-operations/exchange-folder-size-display.c:139
msgid "Folder Size"
msgstr "Folder Size"
+#: ../plugins/exchange-operations/exchange-folder-subscription.c:310
+#: ../plugins/exchange-operations/org-gnome-folder-subscription.xml.h:1
+msgid "Subscribe to Other User's Folder"
+msgstr "Subscribe to Other User's Folder"
+
#: ../plugins/exchange-operations/exchange-folder-tree.glade.h:1
msgid "Exchange Folder Tree"
msgstr "Exchange Folder Tree"
-#: ../plugins/exchange-operations/exchange-folder.c:62
-#: ../plugins/exchange-operations/exchange-folder.c:223
-#: ../plugins/exchange-operations/exchange-folder.c:233
+#: ../plugins/exchange-operations/exchange-folder.c:66
+#: ../plugins/exchange-operations/exchange-folder.c:229
+#: ../plugins/exchange-operations/exchange-folder.c:239
msgid "Unsubscribe Folder..."
msgstr "Unsubscribe Folder..."
-#: ../plugins/exchange-operations/exchange-folder.c:460
-#: ../plugins/exchange-operations/exchange-folder.c:520
+#: ../plugins/exchange-operations/exchange-folder.c:459
+#: ../plugins/exchange-operations/exchange-folder.c:514
#, c-format
msgid "Really unsubscribe from folder \"%s\"?"
msgstr "Really unsubscribe from folder \"%s\"?"
-#: ../plugins/exchange-operations/exchange-folder.c:472
-#: ../plugins/exchange-operations/exchange-folder.c:532
+#: ../plugins/exchange-operations/exchange-folder.c:471
+#: ../plugins/exchange-operations/exchange-folder.c:526
#, c-format
msgid "Unsubscribe from \"%s\""
msgstr "Unsubscribe from \"%s\""
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:301
+#: ../plugins/exchange-operations/exchange-passwd-expiry.glade.h:1
+msgid "Password Expiry Warning..."
+msgstr "Password Expiry Warning..."
+
+#: ../plugins/exchange-operations/exchange-passwd-expiry.glade.h:2
+msgid "Your password will expire in 7 days..."
+msgstr "Your password will expire in 7 days..."
+
+#: ../plugins/exchange-operations/exchange-passwd-expiry.glade.h:3
+msgid "_Change Password"
+msgstr "_Change Password"
+
+#: ../plugins/exchange-operations/exchange-passwd-expiry.glade.h:4
+msgid "ok_button"
+msgstr "ok_button"
+
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:305
msgid "(Permission denied.)"
msgstr "(Permission denied.)"
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:409
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:413
msgid "Add User:"
msgstr "Add User:"
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:409
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:413
msgid "Add User"
msgstr "Add User"
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:2
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:1
msgid "<b>Permissions</b>"
msgstr "<b>Permissions</b>"
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:3
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:2
msgid "Cannot Delete"
msgstr "Cannot Delete"
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:4
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:3
msgid "Cannot Edit"
msgstr "Cannot Edit"
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:5
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:4
msgid "Create items"
msgstr "Create items"
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:6
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:5
msgid "Create subfolders"
msgstr "Create subfolders"
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:7
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:6
msgid "Delete Any Items"
msgstr "Delete Any Items"
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:8
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:7
msgid "Delete Own Items"
msgstr "Delete Own Items"
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:9
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:8
msgid "Edit Any Items"
msgstr "Edit Any Items"
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:10
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:9
msgid "Edit Own Items"
msgstr "Edit Own Items"
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:11
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:10
msgid "Folder contact"
msgstr "Folder contact"
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:12
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:11
msgid "Folder owner"
msgstr "Folder owner"
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:13
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:12
msgid "Folder visible"
msgstr "Folder visible"
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:14
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:13
msgid "Read items"
msgstr "Read items"
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:15
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:14
msgid "Role: "
msgstr "Role: "
+#: ../plugins/exchange-operations/exchange-oof.glade.h:10
+msgid "No, Don't Change Status"
+msgstr "No, Don't Change Status"
+
#: ../plugins/exchange-operations/exchange-user-dialog.c:144
msgid "Select User"
msgstr "Select User"
#: ../plugins/exchange-operations/exchange-user-dialog.c:182
-msgid "Addressbook..."
-msgstr "Address book..."
+msgid "Address Book..."
+msgstr "Address Book..."
#: ../plugins/exchange-operations/org-gnome-exchange-ab-subscription.xml.h:1
msgid "Subscribe to Other User's Contacts"
@@ -14558,6 +15266,14 @@ msgstr "Subscribe to Other User's Contacts"
msgid "Subscribe to Other User's Calendar"
msgstr "Subscribe to Other User's Calendar"
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:1
+msgid "A plugin that handles a collection of Exchange account specific operations and features."
+msgstr "A plugin that handles a collection of Exchange account specific operations and features."
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:2
+msgid "Exchange Operations"
+msgstr "Exchange Operations"
+
#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:1
msgid "Cannot change password due to configuration problems."
msgstr "Cannot change password due to configuration problems."
@@ -14567,18 +15283,22 @@ msgid "Cannot display folders."
msgstr "Cannot display folders."
#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:3
-msgid "Changes to Exchange account configuration will take place after you quit and restart Evolution."
-msgstr "Changes to Exchange account configuration will take place after you quit and restart Evolution."
+msgid "Cannot perform the operation."
+msgstr "Cannot perform the operation."
#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:4
+msgid "Changes to options for Exchange account \"{0}\" will only take effect after restarting Evolution."
+msgstr "Changes to options for Exchange account \"{0}\" will only take effect after restarting Evolution."
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:5
msgid "Could not authenticate to server."
msgstr "Could not authenticate to server."
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:5
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:6
msgid "Could not change password."
msgstr "Could not change password."
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:6
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:7
msgid ""
"Could not configure Exchange account because \n"
"an unknown error occurred. Check the URL, \n"
@@ -14588,172 +15308,180 @@ msgstr ""
"an unknown error occurred. Check the URL, \n"
"username, and password, and try again."
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:9
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:10
+msgid "Could not connect to Exchange server."
+msgstr "Could not connect to Exchange server."
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:11
msgid "Could not connect to server {0}."
msgstr "Could not connect to server {0}."
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:10
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:12
msgid "Could not determine folder permissions for delegates."
msgstr "Could not determine folder permissions for delegates."
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:11
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:13
msgid "Could not find Exchange Web Storage System."
msgstr "Could not find Exchange Web Storage System."
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:12
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:14
msgid "Could not locate server {0}."
msgstr "Could not locate server {0}."
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:13
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:15
msgid "Could not make {0} a delegate"
msgstr "Could not make {0} a delegate"
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:14
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:16
msgid "Could not read folder permissions"
msgstr "Could not read folder permissions"
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:15
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:17
msgid "Could not read folder permissions."
msgstr "Could not read folder permissions."
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:16
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:18
msgid "Could not read out-of-office state"
msgstr "Could not read out-of-office state"
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:17
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:19
msgid "Could not update folder permissions."
msgstr "Could not update folder permissions."
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:18
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:20
msgid "Could not update out-of-office state"
msgstr "Could not update out-of-office state"
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:19
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:21
msgid "Exchange Account is offline."
msgstr "Exchange Account is offline."
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:20
-msgid "Exchange Connector access error."
-msgstr "Exchange Connector access error."
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:21
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:22
msgid ""
"Exchange Connector requires access to certain\n"
"functionality on the Exchange Server that appears\n"
-"to be disabled or blocked. (This is usually \n"
-"unintentional.) Your Exchange Administrator will \n"
+"to be disabled or blocked. (This is usually \n"
+"unintentional.) Your Exchange Administrator will \n"
"need to enable this functionality in order for \n"
-"you to be able to use Ximian Connector.\n"
+"you to be able to use Evolution Exchange Connector.\n"
"\n"
"For information to provide to your Exchange \n"
"administrator, please follow the link below:\n"
"\n"
-"http://support.novell.com/cgi-bin/search/searchtid.cgi?/ximian/ximian328.html\n"
+"{0}\n"
" "
msgstr ""
"Exchange Connector requires access to certain\n"
"functionality on the Exchange Server that appears\n"
-"to be disabled or blocked. (This is usually \n"
-"unintentional). Your Exchange Administrator will \n"
+"to be disabled or blocked. (This is usually \n"
+"unintentional.) Your Exchange Administrator will \n"
"need to enable this functionality in order for \n"
-"you to be able to use Ximian Connector.\n"
+"you to be able to use Evolution Exchange Connector.\n"
"\n"
"For information to provide to your Exchange \n"
"administrator, please follow the link below:\n"
"\n"
-"http://support.novell.com/cgi-bin/search/searchtid.cgi?/ximian/ximian328.html\n"
+"{0}\n"
" "
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:33
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:34
msgid "Failed to update delegates:"
msgstr "Failed to update delegates:"
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:34
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:35
msgid "Folder already exists"
msgstr "Folder already exists"
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:35
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:36
msgid "Folder does not exist"
msgstr "Folder does not exist"
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:36
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:37
msgid "Folder offline"
msgstr "Folder offline"
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:37
-#: ../shell/e-shell.c:1265
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:38
+#: ../shell/e-shell.c:1270
msgid "Generic error"
msgstr "Generic error"
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:38
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:39
+msgid "Global Catalog Server is not reachable"
+msgstr "Global Catalogue Server is not reachable"
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:40
msgid "If OWA is running on a different path, you must specify that in the account configuration dialog."
msgstr "If OWA is running on a different path, you must specify that in the account configuration dialogue."
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:39
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:41
msgid "Mailbox for {0} is not on this server."
msgstr "Mailbox for {0} is not on this server."
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:40
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:42
msgid "Make sure the URL is correct and try again."
msgstr "Make sure the URL is correct and try again."
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:41
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:43
msgid "Make sure the server name is spelled correctly and try again."
msgstr "Make sure the server name is spellt correctly and try again."
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:42
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:44
msgid "Make sure the username and password are correct and try again."
msgstr "Make sure the username and password are correct and try again."
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:43
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:45
msgid "No Global Catalog server configured for this account."
msgstr "No Global Catalog server configured for this account."
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:44
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:46
msgid "No mailbox for user {0} on {1}."
msgstr "No mailbox for user {0} on {1}."
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:45
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:47
msgid "No such user {0}"
msgstr "No such user {0}"
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:46
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:48
msgid "Password successfully changed."
msgstr "Password successfully changed."
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:48
-msgid "Please restart Evolution"
-msgstr "Please restart Evolution"
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:50
+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:49
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:51
+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
msgid "Please select a user."
msgstr "Please select a user."
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:50
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:53
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:51
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:54
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:52
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:55
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:53
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:56
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:54
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:57
msgid ""
-"The server is runinng Exchange 5.5. Exchange Connector \n"
+"The server is running Exchange 5.5. Exchange Connector \n"
"supports Microsoft Exchange 2000 and 2003 only."
msgstr ""
-"The server is runinng Exchange 5.5. Exchange Connector \n"
+"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:56
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:59
msgid ""
"This probably means that your server requires \n"
"you to specify the Windows domain name \n"
@@ -14767,75 +15495,75 @@ msgstr ""
"\n"
"Or you might have just typed your password wrong."
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:61
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:64
msgid "Try again with a different password."
msgstr "Try again with a different password."
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:62
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:65
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:63
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:66
msgid "Unable to edit delegates."
msgstr "Unable to edit delegates."
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:64
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:67
msgid "Unknown error looking up {0}"
msgstr "Unknown error looking up {0}"
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:65
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:68
msgid "Unknown error."
msgstr "Unknown error."
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:66
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:69
msgid "Unknown type"
msgstr "Unknown type"
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:67
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:70
msgid "Unsupported operation"
msgstr "Unsupported operation"
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:68
-msgid "You are nearing your quota available for storing mails on this server."
-msgstr "You are nearing your quota available for storing mails on this server."
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:71
+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:69
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:72
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:70
-msgid "You have exceeded your quota for storing mails on this server."
-msgstr "You have exceeded your quota for storing mails on this server."
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:73
+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:71
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:74
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:72
-msgid "Your current usage is : {0}KB. Try to clear up some space by deleting some mails."
-msgstr "Your current usage is : {0}KB. Try to clear up some space by deleting some mails."
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:75
+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:73
-msgid "Your current usage is : {0}KB. You will not be able to either send or recieve mails now."
-msgstr "Your current usage is : {0}KB. You will not be able to either send or recieve mails now."
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:76
+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:74
-msgid "Your current usage is : {0}KB. You will not be able to send mails till you clear up some space by deleting some mails."
-msgstr "Your current usage is : {0}KB. You will not be able to send mails till you clear up some space by deleting some mails."
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:77
+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:75
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:78
msgid "Your password has expired."
msgstr "Your password has expired."
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:77
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:80
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:78
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:81
msgid "{0} is already a delegate"
msgstr "{0} is already a delegate"
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:79
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:82
msgid "{0} is already in the list"
msgstr "{0} is already in the list"
@@ -14847,10 +15575,6 @@ msgstr "Subscribe to Other User's Tasks"
msgid "Check folder permissions"
msgstr "Check folder permissions"
-#: ../plugins/exchange-operations/org-gnome-folder-subscription.xml.h:1
-msgid "Subscribe to Other User's Folder"
-msgstr "Subscribe to Other User's Folder"
-
#: ../plugins/folder-unsubscribe/folder-unsubscribe.c:57
#, c-format
msgid "Unsubscribing from folder \"%s\""
@@ -14864,7 +15588,11 @@ msgstr "Allows unsubscribing of mail folders in the folder tree context menu."
msgid "Unsubscribe Folders"
msgstr "Unsubscribe Folders"
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:414
+#: ../plugins/folder-unsubscribe/org-gnome-mail-folder-unsubscribe.eplug.xml.h:3
+msgid "_Unsubscribe"
+msgstr "_Unsubscribe"
+
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:420
msgid "Checklist"
msgstr "Checklist"
@@ -14885,8 +15613,8 @@ msgid "Junk Mail Settings..."
msgstr "Junk Mail Settings..."
#: ../plugins/groupwise-features/junk-settings.glade.h:1
-msgid "<b>Junk List :</b>"
-msgstr "<b>Junk List :</b>"
+msgid "<b>Junk List:</b>"
+msgstr "<b>Junk List:</b>"
#: ../plugins/groupwise-features/junk-settings.glade.h:2
msgid "Email:"
@@ -14909,12 +15637,22 @@ msgstr "_Enable"
msgid "_Junk List"
msgstr "_Junk List"
+#: ../plugins/groupwise-features/mail-retract.c:53
+msgid "Message retracted successfully"
+msgstr "Message retracted successfully"
+
+#: ../plugins/groupwise-features/mail-retract.c:60
+msgid "Retract Mail"
+msgstr "Retract Mail"
+
#: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:1
msgid "Add Send Options to groupwise messages"
msgstr "Add Send Options to groupwise messages"
#: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:2
-#: ../widgets/misc/e-send-options.glade.h:17
+#: ../ui/evolution-event-editor.xml.h:15
+#: ../ui/evolution-task-editor.xml.h:8
+#: ../widgets/misc/e-send-options.glade.h:19
msgid "Send Options"
msgstr "Send Options"
@@ -14930,40 +15668,40 @@ msgstr "Groupwise Features"
msgid "Accept Tentatively"
msgstr "Accept Tentatively"
-#: ../plugins/groupwise-features/properties.glade.h:2
-msgid "<b>Users :</b>"
-msgstr "<b>Users :</b>"
+#: ../plugins/groupwise-features/properties.glade.h:1
+msgid "<b>Users:</b>"
+msgstr "<b>Users:</b>"
-#: ../plugins/groupwise-features/properties.glade.h:4
-#: ../widgets/table/e-table-click-to-add.c:510
+#: ../plugins/groupwise-features/properties.glade.h:3
+#: ../widgets/table/e-table-click-to-add.c:509
msgid "Message"
msgstr "Message"
-#: ../plugins/groupwise-features/properties.glade.h:6
+#: ../plugins/groupwise-features/properties.glade.h:5
msgid "Shared Folder Notification"
msgstr "Shared Folder Notification"
-#: ../plugins/groupwise-features/properties.glade.h:8
+#: ../plugins/groupwise-features/properties.glade.h:7
msgid "The participants will receive the following notification.\n"
msgstr "The participants will receive the following notification.\n"
-#: ../plugins/groupwise-features/properties.glade.h:11
+#: ../plugins/groupwise-features/properties.glade.h:10
msgid "_Contacts..."
msgstr "_Contacts..."
-#: ../plugins/groupwise-features/properties.glade.h:12
-msgid "_Cutomize notification message"
-msgstr "_Cutomise notification message"
+#: ../plugins/groupwise-features/properties.glade.h:11
+msgid "_Customize notification message"
+msgstr "_Customise notification message"
-#: ../plugins/groupwise-features/properties.glade.h:13
+#: ../plugins/groupwise-features/properties.glade.h:12
msgid "_Not Shared"
msgstr "_Not Shared"
-#: ../plugins/groupwise-features/properties.glade.h:15
+#: ../plugins/groupwise-features/properties.glade.h:14
msgid "_Shared With ..."
msgstr "_Shared With ..."
-#: ../plugins/groupwise-features/properties.glade.h:16
+#: ../plugins/groupwise-features/properties.glade.h:15
msgid "_Sharing"
msgstr "_Sharing"
@@ -15004,7 +15742,7 @@ 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:121
+#: ../ui/evolution-mail-message.xml.h:125
msgid "_Read"
msgstr "_Read"
@@ -15016,13 +15754,6 @@ msgstr "_Write"
msgid "Proxy"
msgstr "Proxy"
-#: ../plugins/groupwise-features/proxy-listing.glade.h:2
-#: ../smime/gui/smime-ui.glade.h:49
-#: ../widgets/table/e-table-config-no-group.glade.h:20
-#: ../widgets/table/e-table-config.glade.h:21
-msgid "dialog1"
-msgstr "dialogue1"
-
#: ../plugins/groupwise-features/proxy-login-dialog.glade.h:1
msgid "<b>Account Name</b>"
msgstr "<b>Account Name</b>"
@@ -15031,457 +15762,667 @@ msgstr "<b>Account Name</b>"
msgid "Proxy Login"
msgstr "Proxy Login"
-#: ../plugins/groupwise-features/proxy-login.c:219
-#: ../plugins/groupwise-features/proxy-login.c:261
-#: ../plugins/groupwise-features/proxy.c:490
+#: ../plugins/groupwise-features/proxy-login.c:220
+#: ../plugins/groupwise-features/proxy-login.c:263
+#: ../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-login.c:484
+#. 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:517
msgid "_Proxy Login..."
msgstr "_Proxy Login..."
-#: ../plugins/groupwise-features/proxy.c:672
+#: ../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/share-folder-common.c:318
+#: ../plugins/groupwise-features/share-folder-common.c:322
msgid "Users"
msgstr "Users"
-#: ../plugins/groupwise-features/share-folder-common.c:319
+#: ../plugins/groupwise-features/share-folder-common.c:323
msgid "Enter the users and set permissions"
msgstr "Enter the users and set permissions"
-#: ../plugins/groupwise-features/share-folder-common.c:338
+#: ../plugins/groupwise-features/share-folder-common.c:342
msgid "New _Shared Folder..."
msgstr "New _Shared Folder..."
-#: ../plugins/groupwise-features/share-folder-common.c:453
+#: ../plugins/groupwise-features/share-folder-common.c:450
msgid "Sharing"
msgstr "Sharing"
-#: ../plugins/groupwise-features/status-track.c:235
+#: ../plugins/groupwise-features/status-track.c:242
msgid "Track Message Status..."
msgstr "Track Message Status..."
-#: ../plugins/itip-formatter/itip-formatter.c:724
+#: ../plugins/hula-account-setup/org-gnome-evolution-hula-account-setup.eplug.xml.h:1
+msgid "A plugin to setup hula calendar sources."
+msgstr "A plugin to setup hula calendar sources."
+
+#: ../plugins/hula-account-setup/org-gnome-evolution-hula-account-setup.eplug.xml.h:2
+msgid "Hula Account Setup"
+msgstr "Hula Account Setup"
+
+#: ../plugins/import-ics-attachments/icsimporter.c:83
+msgid "_Import to Calendar"
+msgstr "_Import to Calendar"
+
+#: ../plugins/import-ics-attachments/icsimporter.c:88
+msgid "_Import to Tasks"
+msgstr "_Import to Tasks"
+
+#: ../plugins/import-ics-attachments/icsimporter.c:198
+msgid "Import ICS"
+msgstr "Import ICS"
+
+#: ../plugins/import-ics-attachments/icsimporter.c:226
+msgid "Select Task List"
+msgstr "Select Task List"
+
+#: ../plugins/import-ics-attachments/icsimporter.c:230
+msgid "Select Calendar"
+msgstr "Select Calendar"
+
+#: ../plugins/import-ics-attachments/icsimporter.c:261
+#: ../shell/e-shell-importer.c:714
+msgid "_Import"
+msgstr "_Import"
+
+#: ../plugins/ipod-sync/ical-format.c:137
+#: ../plugins/save-calendar/ical-format.c:149
+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"
+
+#: ../plugins/ipod-sync/org-gnome-ipod-sync-evolution.eplug.xml.h:2
+msgid "Synchronize to iPod"
+msgstr "Synchronise to iPod"
+
+#: ../plugins/ipod-sync/org-gnome-ipod-sync-evolution.eplug.xml.h:3
+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
+#, c-format
+msgid "Failed to load the calendar '%s'"
+msgstr "Failed to load the calendar '%s'"
+
+#: ../plugins/itip-formatter/itip-formatter.c:415
+#, 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
+#, 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
+msgid "Unable to find any calendars"
+msgstr "Unable to find any calendars"
+
+#: ../plugins/itip-formatter/itip-formatter.c:524
+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
+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:605
+msgid "Searching for an existing version of this appointment"
+msgstr "Searching for an existing version of this appointment"
+
+#: ../plugins/itip-formatter/itip-formatter.c:800
msgid "Unable to parse item"
msgstr "Unable to parse item"
-#: ../plugins/itip-formatter/itip-formatter.c:780
+#: ../plugins/itip-formatter/itip-formatter.c:857
#, 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:791
+#: ../plugins/itip-formatter/itip-formatter.c:868
#, c-format
msgid "Sent to calendar '%s' as accepted"
msgstr "Sent to calendar '%s' as accepted"
-#: ../plugins/itip-formatter/itip-formatter.c:795
+#: ../plugins/itip-formatter/itip-formatter.c:872
#, c-format
msgid "Sent to calendar '%s' as tentative"
msgstr "Sent to calendar '%s' as tentative"
-#: ../plugins/itip-formatter/itip-formatter.c:800
+#: ../plugins/itip-formatter/itip-formatter.c:877
#, c-format
msgid "Sent to calendar '%s' as declined"
msgstr "Sent to calendar '%s' as declined"
-#: ../plugins/itip-formatter/itip-formatter.c:805
+#: ../plugins/itip-formatter/itip-formatter.c:882
#, c-format
-msgid "Sent to calendar '%s' as cancelled"
+msgid "Sent to calendar '%s' as canceled"
msgstr "Sent to calendar '%s' as cancelled"
-#: ../plugins/itip-formatter/itip-formatter.c:898
+#: ../plugins/itip-formatter/itip-formatter.c:975
#, c-format
msgid "Organizer has removed the delegate %s "
msgstr "Organizer has removed the delegate %s "
-#: ../plugins/itip-formatter/itip-formatter.c:905
-msgid "Sent a cancellation notice to the delegate"
+#: ../plugins/itip-formatter/itip-formatter.c:982
+msgid "Sent a cancelation notice to the delegate"
msgstr "Sent a cancellation notice to the delegate"
-#: ../plugins/itip-formatter/itip-formatter.c:907
-msgid "Could not send the cancellation notice to the delegate"
+#: ../plugins/itip-formatter/itip-formatter.c:984
+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:991
+#: ../plugins/itip-formatter/itip-formatter.c:1069
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:1017
+#: ../plugins/itip-formatter/itip-formatter.c:1096
#, c-format
msgid "Unable to update attendee. %s"
msgstr "Unable to update attendee. %s"
-#: ../plugins/itip-formatter/itip-formatter.c:1021
+#: ../plugins/itip-formatter/itip-formatter.c:1100
msgid "Attendee status updated"
msgstr "Attendee status updated"
-#: ../plugins/itip-formatter/itip-formatter.c:1148
+#: ../plugins/itip-formatter/itip-formatter.c:1227
msgid "The calendar attached is not valid"
msgstr "The calendar attached is not valid"
-#: ../plugins/itip-formatter/itip-formatter.c:1149
-msgid "The message claims to contain a calendar, but the calendar is not valid iCalendar."
-msgstr "The message claims to contain a calendar, but the calendar is not valid iCalendar."
+#: ../plugins/itip-formatter/itip-formatter.c:1228
+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:1183
-#: ../plugins/itip-formatter/itip-formatter.c:1198
-#: ../plugins/itip-formatter/itip-formatter.c:1274
+#: ../plugins/itip-formatter/itip-formatter.c:1263
+#: ../plugins/itip-formatter/itip-formatter.c:1281
+#: ../plugins/itip-formatter/itip-formatter.c:1359
msgid "The item in the calendar is not valid"
msgstr "The item in the calendar is not valid"
-#: ../plugins/itip-formatter/itip-formatter.c:1184
-#: ../plugins/itip-formatter/itip-formatter.c:1199
-#: ../plugins/itip-formatter/itip-formatter.c:1275
+#: ../plugins/itip-formatter/itip-formatter.c:1264
+#: ../plugins/itip-formatter/itip-formatter.c:1282
+#: ../plugins/itip-formatter/itip-formatter.c:1360
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:1209
+#: ../plugins/itip-formatter/itip-formatter.c:1293
msgid "The calendar attached contains multiple items"
msgstr "The calendar attached contains multiple items"
-#: ../plugins/itip-formatter/itip-formatter.c:1210
+#: ../plugins/itip-formatter/itip-formatter.c:1294
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:1968
-msgid "Meetings and Tasks"
-msgstr "Meetings and Tasks"
-
#. Delete message after acting
#. FIXME Need a schema for this
-#: ../plugins/itip-formatter/itip-formatter.c:1991
+#: ../plugins/itip-formatter/itip-formatter.c:2067
msgid "_Delete message after acting"
msgstr "_Delete message after acting"
-#: ../plugins/itip-formatter/itip-formatter.c:2001
-msgid "<span weight=\"bold\">Conflict Search</span>"
-msgstr "<span weight=\"bold\">Conflict Search</span>"
+#: ../plugins/itip-formatter/itip-formatter.c:2077
+#: ../plugins/itip-formatter/itip-formatter.c:2109
+msgid "Conflict Search"
+msgstr "Conflict Search"
#. Source selector
-#: ../plugins/itip-formatter/itip-formatter.c:2014
+#: ../plugins/itip-formatter/itip-formatter.c:2092
msgid "Select the calendars to search for meeting conflicts"
msgstr "Select the calendars to search for meeting conflicts"
-#: ../plugins/itip-formatter/itip-formatter.c:2031
-msgid "Conflict Search Table"
-msgstr "Conflict Search Table"
-
#. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:184
+#: ../plugins/itip-formatter/itip-view.c:188
#: ../ui/evolution-calendar.xml.h:34
-#: ../widgets/misc/e-cell-date-edit.c:240
-#: ../widgets/misc/e-dateedit.c:457
+#: ../widgets/misc/e-cell-date-edit.c:241
msgid "Today"
msgstr "Today"
#. strftime format of a time,
#. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:189
+#: ../plugins/itip-formatter/itip-view.c:193
msgid "Today %H:%M"
msgstr "Today %H:%M"
#. strftime format of a time,
#. in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:193
+#: ../plugins/itip-formatter/itip-view.c:197
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:202
+#: ../plugins/itip-formatter/itip-view.c:206
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:212
+#: ../plugins/itip-formatter/itip-view.c:216
msgid "Tomorrow"
msgstr "Tomorrow"
#. strftime format of a time,
#. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:217
+#: ../plugins/itip-formatter/itip-view.c:221
msgid "Tomorrow %H:%M"
msgstr "Tomorrow %H:%M"
#. strftime format of a time,
#. in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:221
+#: ../plugins/itip-formatter/itip-view.c:225
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:226
+#: ../plugins/itip-formatter/itip-view.c:230
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:230
+#: ../plugins/itip-formatter/itip-view.c:234
msgid "Tomorrow %l:%M:%S %p"
msgstr "Tomorrow %l:%M:%S %p"
#. strftime format of a weekday.
-#: ../plugins/itip-formatter/itip-view.c:249
+#: ../plugins/itip-formatter/itip-view.c:253
#, 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:254
+#: ../plugins/itip-formatter/itip-view.c:258
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:258
+#: ../plugins/itip-formatter/itip-view.c:262
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:263
+#: ../plugins/itip-formatter/itip-view.c:267
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:267
+#: ../plugins/itip-formatter/itip-view.c:271
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:276
+#: ../plugins/itip-formatter/itip-view.c:280
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:282
+#: ../plugins/itip-formatter/itip-view.c:286
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:286
+#: ../plugins/itip-formatter/itip-view.c:290
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:291
+#: ../plugins/itip-formatter/itip-view.c:295
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:295
+#: ../plugins/itip-formatter/itip-view.c:299
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:301
+#: ../plugins/itip-formatter/itip-view.c:305
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:306
+#: ../plugins/itip-formatter/itip-view.c:310
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:310
+#: ../plugins/itip-formatter/itip-view.c:314
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:315
+#: ../plugins/itip-formatter/itip-view.c:319
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:319
+#: ../plugins/itip-formatter/itip-view.c:323
msgid "%A, %B %e, %Y %l:%M:%S %p"
msgstr "%A, %B %e, %Y %l:%M:%S %p"
-#: ../plugins/itip-formatter/itip-view.c:344
+#: ../plugins/itip-formatter/itip-view.c:348
#, 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:346
+#: ../plugins/itip-formatter/itip-view.c:350
#, 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:351
+#: ../plugins/itip-formatter/itip-view.c:355
#, 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:354
+#: ../plugins/itip-formatter/itip-view.c:358
#, 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:356
+#: ../plugins/itip-formatter/itip-view.c:360
#, 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:362
+#: ../plugins/itip-formatter/itip-view.c:366
#, 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:364
+#: ../plugins/itip-formatter/itip-view.c:368
#, 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:367
+#: ../plugins/itip-formatter/itip-view.c:371
#, 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:370
+#: ../plugins/itip-formatter/itip-view.c:374
#, 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:374
+#: ../plugins/itip-formatter/itip-view.c:378
#, c-format
-msgid "<b>%s</b> through %s has cancelled the following meeting:"
+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:376
+#: ../plugins/itip-formatter/itip-view.c:380
#, c-format
-msgid "<b>%s</b> has cancelled the following meeting."
+msgid "<b>%s</b> has canceled the following meeting."
msgstr "<b>%s</b> has cancelled the following meeting."
-#: ../plugins/itip-formatter/itip-view.c:379
+#: ../plugins/itip-formatter/itip-view.c:383
#, 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:383
+#: ../plugins/itip-formatter/itip-view.c:387
#, 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:385
+#: ../plugins/itip-formatter/itip-view.c:389
#, 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:412
+#: ../plugins/itip-formatter/itip-view.c:416
#, 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:414
+#: ../plugins/itip-formatter/itip-view.c:418
#, 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:419
+#: ../plugins/itip-formatter/itip-view.c:423
#, 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:422
+#: ../plugins/itip-formatter/itip-view.c:426
#, 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:424
+#: ../plugins/itip-formatter/itip-view.c:428
#, 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:430
+#: ../plugins/itip-formatter/itip-view.c:434
#, 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:432
+#: ../plugins/itip-formatter/itip-view.c:436
#, 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:435
+#: ../plugins/itip-formatter/itip-view.c:439
#, 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:438
+#: ../plugins/itip-formatter/itip-view.c:442
#, 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:442
+#: ../plugins/itip-formatter/itip-view.c:446
#, c-format
-msgid "<b>%s</b> through %s has cancelled the following assigned task:"
+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:444
+#: ../plugins/itip-formatter/itip-view.c:448
#, c-format
-msgid "<b>%s</b> has cancelled the following assigned task:"
+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:447
+#: ../plugins/itip-formatter/itip-view.c:451
#, 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:451
+#: ../plugins/itip-formatter/itip-view.c:455
#, 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:453
+#: ../plugins/itip-formatter/itip-view.c:457
#, 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:484
+#, 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:486
+#, 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:491
+#, 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:493
+#, 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:497
+#, 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:499
+#, 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:755
+msgid "_Open Calendar"
+msgstr "_Open Calendar"
+
+#: ../plugins/itip-formatter/itip-view.c:761
+#: ../plugins/itip-formatter/itip-view.c:765
+#: ../plugins/itip-formatter/itip-view.c:771
+#: ../plugins/itip-formatter/itip-view.c:788
+#: ../plugins/itip-formatter/itip-view.c:793
+msgid "_Decline"
+msgstr "_Decline"
+
+#: ../plugins/itip-formatter/itip-view.c:762
+#: ../plugins/itip-formatter/itip-view.c:767
+#: ../plugins/itip-formatter/itip-view.c:774
+#: ../plugins/itip-formatter/itip-view.c:790
+#: ../plugins/itip-formatter/itip-view.c:795
+msgid "_Accept"
+msgstr "_Accept"
+
+#: ../plugins/itip-formatter/itip-view.c:765
+msgid "_Decline all"
+msgstr "_Decline all"
+
+#: ../plugins/itip-formatter/itip-view.c:766
+msgid "_Tentative all"
+msgstr "_Tentative all"
+
+#: ../plugins/itip-formatter/itip-view.c:766
+#: ../plugins/itip-formatter/itip-view.c:772
+#: ../plugins/itip-formatter/itip-view.c:789
+#: ../plugins/itip-formatter/itip-view.c:794
+msgid "_Tentative"
+msgstr "_Tentative"
+
+#: ../plugins/itip-formatter/itip-view.c:767
+msgid "_Accept all"
+msgstr "_Accept all"
+
+#. FIXME Is this really the right button?
+#: ../plugins/itip-formatter/itip-view.c:778
+msgid "_Send Information"
+msgstr "_Send Information"
+
+#. FIXME Is this really the right button?
+#: ../plugins/itip-formatter/itip-view.c:782
+msgid "_Update Attendee Status"
+msgstr "_Update Attendee Status"
+
+#: ../plugins/itip-formatter/itip-view.c:785
+msgid "_Update"
+msgstr "_Update"
+
#. Start time
-#: ../plugins/itip-formatter/itip-view.c:892
+#: ../plugins/itip-formatter/itip-view.c:944
msgid "Start time:"
msgstr "Start time:"
#. End time
-#: ../plugins/itip-formatter/itip-view.c:901
+#: ../plugins/itip-formatter/itip-view.c:953
msgid "End time:"
msgstr "End time:"
#. Comment
-#: ../plugins/itip-formatter/itip-view.c:917
-#: ../plugins/itip-formatter/itip-view.c:967
+#: ../plugins/itip-formatter/itip-view.c:969
+#: ../plugins/itip-formatter/itip-view.c:1019
msgid "Comment:"
msgstr "Comment:"
-#: ../plugins/itip-formatter/itip-view.c:981
+#: ../plugins/itip-formatter/itip-view.c:1033
msgid "Send u_pdates to attendees"
msgstr "Send u_pdates to attendees"
-#: ../plugins/itip-formatter/itip-view.c:990
+#: ../plugins/itip-formatter/itip-view.c:1042
msgid "A_pply to all instances"
msgstr "A_pply to all instances"
+#: ../plugins/itip-formatter/itip-view.c:1711
+msgid "_Tasks :"
+msgstr "_Tasks :"
+
+#: ../plugins/itip-formatter/itip-view.c:1713
+msgid "Memos :"
+msgstr "Memos :"
+
#: ../plugins/itip-formatter/org-gnome-itip-formatter.eplug.xml.h:1
msgid "Displays text/calendar parts in messages."
msgstr "Displays text/calendar parts in messages."
@@ -15491,8 +16432,8 @@ msgid "Itip Formatter"
msgstr "Itip Formatter"
#: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:1
-msgid "&quot;{0}&quot; has delegated the meeting. Do you want to add the delegate &quot;{1}&quot; ?"
-msgstr "&quot;{0}&quot; has delegated the meeting. Do you want to add the delegate &quot;{1}&quot; ?"
+msgid "&quot;{0}&quot; has delegated the meeting. Do you want to add the delegate &quot;{1}&quot;?"
+msgstr "&quot;{0}&quot; has delegated the meeting. Do you want to add the delegate &quot;{1}&quot;?"
#: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:3
msgid "This meeting has been delegated"
@@ -15557,6 +16498,7 @@ msgid "A plugin which allows the creation of tasks from the contents of a mail m
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"
@@ -15564,18 +16506,19 @@ msgstr "Con_vert to Task"
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
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:1
msgid "Contact list _owner"
msgstr "Contact list _owner"
#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:2
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:5
msgid "Get list _archive"
msgstr "Get list _archive"
#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:3
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:6
msgid "Get list _usage information"
msgstr "Get list _usage information"
@@ -15593,17 +16536,14 @@ msgid "Provide actions for common mailing list commands (subscribe, unsubscribe,
msgstr "Provide actions for common mailing list commands (subscribe, unsubscribe, ...)."
#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:7
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:11
msgid "_Post message to list"
msgstr "_Post message to list"
#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:8
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:12
msgid "_Subscribe to list"
msgstr "_Subscribe to list"
#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:9
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:13
msgid "_Un-subscribe to list"
msgstr "_Un-subscribe to list"
@@ -15673,15 +16613,27 @@ msgstr "_Edit message"
msgid "_Send message"
msgstr "_Send message"
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:1
+msgid "Contact List _Owner"
+msgstr "Contact List _Owner"
+
#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:2
msgid "Contact the owner of the mailing list this message belongs to"
msgstr "Contact the owner of the mailing list this message belongs to"
#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:3
+msgid "Get List _Archive"
+msgstr "Get List _Archive"
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:4
+msgid "Get List _Usage Information"
+msgstr "Get List _Usage Information"
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:5
msgid "Get an archive of the list this message belongs to"
msgstr "Get an archive of the list this message belongs to"
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:4
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:6
msgid "Get information about the usage of the list this message belongs to"
msgstr "Get information about the usage of the list this message belongs to"
@@ -15697,6 +16649,30 @@ msgstr "Subscribe to the mailing list this message belongs to"
msgid "Unsubscribe to the mailing list this message belongs to"
msgstr "Unsubscribe to the mailing list this message belongs to"
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:11
+msgid "_Post Message to List"
+msgstr "_Post Message to List"
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:12
+msgid "_Subscribe to List"
+msgstr "_Subscribe to List"
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:13
+msgid "_Unsubscribe from List"
+msgstr "_Unsubscribe from List"
+
+#: ../plugins/mark-all-read/org-gnome-mark-all-read.eplug.xml.h:1
+msgid "Mark All Read"
+msgstr "Mark All Read"
+
+#: ../plugins/mark-all-read/org-gnome-mark-all-read.eplug.xml.h:2
+msgid "Mark Me_ssages as Read"
+msgstr "Mark Me_ssages as Read"
+
+#: ../plugins/mark-all-read/org-gnome-mark-all-read.eplug.xml.h:3
+msgid "Used for marking all the messages under a folder as read"
+msgstr "Used for marking all the messages under a folder as read"
+
#: ../plugins/mark-calendar-offline/org-gnome-mark-calendar-offline.eplug.xml.h:1
msgid "Mark calendar offline"
msgstr "Mark calendar offline"
@@ -15737,57 +16713,46 @@ msgstr "New mail notify"
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
-msgid "Plugin manager"
-msgstr "Plugin manager"
+#: ../plugins/plugin-manager/plugin-manager.c:180
+msgid "Plugin Manager"
+msgstr "Plugin Manager"
#: ../plugins/plugin-manager/org-gnome-plugin-manager.xml.h:1
msgid "Enable and disable plugins"
msgstr "Enable and disable plugins"
#: ../plugins/plugin-manager/org-gnome-plugin-manager.xml.h:2
-msgid "Plugins"
-msgstr "Plugins"
+msgid "_Plugins"
+msgstr "_Plugins"
-#: ../plugins/plugin-manager/plugin-manager.c:45
+#: ../plugins/plugin-manager/plugin-manager.c:43
msgid "Author(s)"
msgstr "Author(s)"
-#: ../plugins/plugin-manager/plugin-manager.c:46
-msgid "Id"
-msgstr "Id"
-
-#: ../plugins/plugin-manager/plugin-manager.c:47
-msgid "Path"
-msgstr "Path"
-
-#: ../plugins/plugin-manager/plugin-manager.c:48
+#: ../plugins/plugin-manager/plugin-manager.c:44
#: ../widgets/table/e-table-config-no-group.glade.h:6
#: ../widgets/table/e-table-config.glade.h:5
msgid "Description"
msgstr "Description"
-#. Setup the ui
-#: ../plugins/plugin-manager/plugin-manager.c:188
-msgid "Plugin Manager"
-msgstr "Plugin Manager"
-
-#: ../plugins/plugin-manager/plugin-manager.c:201
+#: ../plugins/plugin-manager/plugin-manager.c:193
msgid "Note: Some changes will not take effect until restart"
msgstr "Note: Some changes will not take effect until restart"
-#: ../plugins/plugin-manager/plugin-manager.c:210
-#: ../plugins/plugin-manager/plugin-manager.c:271
+#: ../plugins/plugin-manager/plugin-manager.c:202
+#: ../plugins/plugin-manager/plugin-manager.c:262
msgid "Plugin"
msgstr "Plugin"
#: ../plugins/prefer-plain/org-gnome-prefer-plain.eplug.xml.h:1
msgid ""
-"A test plugin which demonstrates a formatter plugin which lets you choose to disable HTML mails.\n"
+"A test plugin which demonstrates a formatter plugin which lets you choose to disable HTML messages.\n"
"\n"
"This plugin is unsupported demonstration code only.\n"
msgstr ""
-"A test plugin which demonstrates a formatter plugin which lets you choose to disable HTML mails.\n"
+"A test plugin which demonstrates a formatter plugin which lets you choose to disable HTML messages.\n"
"\n"
"This plugin is unsupported demonstration code only.\n"
@@ -15821,9 +16786,10 @@ msgid "Gives an option to print mail from composer"
msgstr "Gives an option to print mail from composer"
#: ../plugins/print-message/org-gnome-print-message.xml.h:1
-#: ../ui/evolution-addressbook.xml.h:17
-#: ../ui/evolution-calendar.xml.h:20
-#: ../ui/evolution-mail-message.xml.h:78
+#: ../ui/evolution-addressbook.xml.h:27
+#: ../ui/evolution-calendar.xml.h:21
+#: ../ui/evolution-mail-message.xml.h:75
+#: ../ui/evolution-memos.xml.h:12
#: ../ui/evolution-tasks.xml.h:15
msgid "Print Pre_view"
msgstr "Print Pre_view"
@@ -15832,24 +16798,119 @@ msgstr "Print Pre_view"
msgid "Prints the message"
msgstr "Prints the message"
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:98
+#: ../plugins/profiler/org-gnome-evolution-profiler.eplug.xml.h:1
+msgid "Evolution Profiler"
+msgstr "Evolution Profiler"
+
+#: ../plugins/profiler/org-gnome-evolution-profiler.eplug.xml.h:2
+msgid "Writes a log of profiling data events."
+msgstr "Writes a log of profiling data events."
+
+#: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:1
+msgid "Allows calendars to be published to the web"
+msgstr "Allows calendars to be published to the web"
+
+#: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:2
+msgid "Calendar Publishing"
+msgstr "Calendar Publishing"
+
+#: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:3
+msgid "Locations"
+msgstr "Locations"
+
+#: ../plugins/publish-calendar/org-gnome-publish-calendar.xml.h:1
+msgid "_Publish Calendar Information"
+msgstr "_Publish Calendar Information"
+
+#: ../plugins/publish-calendar/publish-calendar.c:399
+msgid "Are you sure you want to remove this URL?"
+msgstr "Are you sure you want to remove this URL?"
+
+#: ../plugins/publish-calendar/publish-calendar.glade.h:2
+msgid "<span weight=\"bold\">Location</span>"
+msgstr "<span weight=\"bold\">Location</span>"
+
+#: ../plugins/publish-calendar/publish-calendar.glade.h:4
+msgid "<span weight=\"bold\">Sources</span>"
+msgstr "<span weight=\"bold\">Sources</span>"
+
+#: ../plugins/publish-calendar/publish-calendar.glade.h:6
+msgid ""
+"Daily\n"
+"Weekly\n"
+"Manual (via Actions menu)"
+msgstr ""
+"Daily\n"
+"Weekly\n"
+"Manual (via Actions menu)"
+
+#: ../plugins/publish-calendar/publish-calendar.glade.h:10
+msgid "P_ort:"
+msgstr "P_ort:"
+
+#: ../plugins/publish-calendar/publish-calendar.glade.h:11
+msgid "Publishing Location"
+msgstr "Publishing Location"
+
+#: ../plugins/publish-calendar/publish-calendar.glade.h:12
+msgid "Publishing _Frequency:"
+msgstr "Publishing _Frequency:"
+
+#: ../plugins/publish-calendar/publish-calendar.glade.h:13
+msgid ""
+"SSH\n"
+"Public FTP\n"
+"FTP (with login)\n"
+"Windows share\n"
+"WebDAV (HTTP)\n"
+"Secure WebDAV (HTTPS)\n"
+"Custom Location"
+msgstr ""
+"SSH\n"
+"Public FTP\n"
+"FTP (with login)\n"
+"Windows share\n"
+"WebDAV (HTTP)\n"
+"Secure WebDAV (HTTPS)\n"
+"Custom Location"
+
+#: ../plugins/publish-calendar/publish-calendar.glade.h:20
+msgid "Service _type:"
+msgstr "Service _type:"
+
+#: ../plugins/publish-calendar/publish-calendar.glade.h:22
+msgid "_File:"
+msgstr "_File:"
+
+#: ../plugins/publish-calendar/publish-calendar.glade.h:24
+msgid "_Publish as:"
+msgstr "_Publish as:"
+
+#: ../plugins/publish-calendar/publish-calendar.glade.h:28
+msgid ""
+"iCal\n"
+"Free/Busy"
+msgstr ""
+"iCal\n"
+"Free/Busy"
+
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:102
msgid "Spamassassin (built-in)"
msgstr "Spamassassin (built-in)"
#: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:1
-msgid "Sa junk-plugin"
-msgstr "Sa junk-plugin"
+msgid "Filters junk messages using Spamassassin. This plugin requires Spamassassin to be installed."
+msgstr "Filters junk messages using Spamassassin. This plugin requires Spamassassin to be installed."
#: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:2
-msgid "learns junk messages using spamd."
-msgstr "learns junk messages using spamd."
+msgid "Spamassassin junk plugin"
+msgstr "Spamassassin junk plugin"
#: ../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."
-#. the path to the shared library
-#: ../plugins/save-attachments/org-gnome-save-attachments.eplug.xml.h:3
+#: ../plugins/save-attachments/org-gnome-save-attachments.eplug.xml.h:2
msgid "Save attachments"
msgstr "Save attachments"
@@ -15861,16 +16922,18 @@ msgstr "Save Attachments ..."
msgid "Save all attachments"
msgstr "Save all attachments"
-#: ../plugins/save-attachments/save-attachments.c:331
+#: ../plugins/save-attachments/save-attachments.c:340
msgid "Select save base name"
msgstr "Select save base name"
-#: ../plugins/save-attachments/save-attachments.c:351
+#: ../plugins/save-attachments/save-attachments.c:359
msgid "MIME Type"
msgstr "MIME Type"
-#: ../plugins/save-attachments/save-attachments.c:359
-#: ../ui/evolution-message-composer.xml.h:18
+#: ../plugins/save-attachments/save-attachments.c:367
+#: ../ui/evolution-editor.xml.h:12
+#: ../ui/evolution-message-composer.xml.h:19
+#: ../ui/evolution-signature-editor.xml.h:7
msgid "Save"
msgstr "Save"
@@ -15883,8 +16946,8 @@ msgid "%F %T"
msgstr "%F %T"
#: ../plugins/save-calendar/csv-format.c:385
-msgid "Uid"
-msgstr "Uid"
+msgid "UID"
+msgstr "UID"
#: ../plugins/save-calendar/csv-format.c:387
msgid "Description List"
@@ -15919,8 +16982,8 @@ msgid "percent Done"
msgstr "percent Done"
#: ../plugins/save-calendar/csv-format.c:398
-msgid "Url"
-msgstr "Url"
+msgid "URL"
+msgstr "URL"
#: ../plugins/save-calendar/csv-format.c:399
msgid "Attendees List"
@@ -15954,23 +17017,19 @@ msgstr "Encapsulate values with:"
msgid "Comma separated value format (.csv)"
msgstr "Comma separated value format (.csv)"
-#: ../plugins/save-calendar/ical-format.c:137
-msgid "iCalendar format (.ics)"
-msgstr "iCalendar format (.ics)"
-
#: ../plugins/save-calendar/org-gnome-save-calendar.eplug.xml.h:1
msgid "Save Selected"
msgstr "Save Selected"
-# calendar:prompt-save-task title
#: ../plugins/save-calendar/org-gnome-save-calendar.eplug.xml.h:2
-msgid "Save to _Disk"
-msgstr "Save to _Disk"
-
-#: ../plugins/save-calendar/org-gnome-save-calendar.eplug.xml.h:3
msgid "Saves selected calendar or tasks list to disk."
msgstr "Saves selected calendar or tasks list to disk."
+# calendar:prompt-save-task title
+#: ../plugins/save-calendar/org-gnome-save-calendar.eplug.xml.h:3
+msgid "_Save to Disk"
+msgstr "_Save to Disk"
+
#.
#. * Translator: the %FT%T is the thirth argument for a strftime function.
#. * It lets you define the formatting of the date in the rdf-file.
@@ -15980,20 +17039,15 @@ msgstr "Saves selected calendar or tasks list to disk."
msgid "%FT%T"
msgstr "%FT%T"
-#: ../plugins/save-calendar/rdf-format.c:396
+#: ../plugins/save-calendar/rdf-format.c:397
msgid "RDF format (.rdf)"
msgstr "RDF format (.rdf)"
-#: ../plugins/save-calendar/save-calendar.c:171
-#: ../plugins/save-calendar/save-calendar.c:181
+#: ../plugins/save-calendar/save-calendar.c:169
+#: ../plugins/save-calendar/save-calendar.c:180
msgid "Select destination file"
msgstr "Select destination file"
-#: ../plugins/save-calendar/save-calendar.c:216
-#, c-format
-msgid "The suggested filename extension of this filetype (%s) is unused in the chosen filename. Do you want to continue?"
-msgstr "The suggested filename extension of this filetype (%s) is unused in the chosen filename. Do you want to continue?"
-
#: ../plugins/select-one-source/org-gnome-select-one-source.eplug.xml.h:1
msgid "Select one source"
msgstr "Select one source"
@@ -16003,14 +17057,18 @@ msgid "Selects a single calendar or task source for viewing."
msgstr "Selects a single calendar or task source for viewing."
#: ../plugins/select-one-source/org-gnome-select-one-source.eplug.xml.h:3
-msgid "_Show only this Calendar"
-msgstr "_Show only this Calendar"
+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 Task List"
-msgstr "_Show only this Task List"
+msgid "Show _only this Task List"
+msgstr "Show _only this Task List"
#: ../plugins/startup-wizard/org-gnome-evolution-startup-wizard.eplug.xml.h:1
+msgid "A plugin that handles the Startup wizard."
+msgstr "A plugin that handles the Startup wizard."
+
+#: ../plugins/startup-wizard/org-gnome-evolution-startup-wizard.eplug.xml.h:2
msgid "Startup wizard"
msgstr "Startup wizard"
@@ -16032,19 +17090,19 @@ msgstr ""
"\n"
"Please click the \"Forward\" button to continue. "
-#: ../plugins/startup-wizard/startup-wizard.c:140
-#: ../shell/e-shell-importer.c:145
+#: ../plugins/startup-wizard/startup-wizard.c:138
+#: ../shell/e-shell-importer.c:149
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:154
-#: ../shell/e-shell-importer.c:398
+#: ../plugins/startup-wizard/startup-wizard.c:153
+#: ../shell/e-shell-importer.c:411
#, c-format
msgid "From %s:"
msgstr "From %s:"
-#: ../plugins/startup-wizard/startup-wizard.c:234
-#: ../shell/e-shell-importer.c:509
+#: ../plugins/startup-wizard/startup-wizard.c:233
+#: ../shell/e-shell-importer.c:522
msgid "Importing data."
msgstr "Importing data."
@@ -16098,83 +17156,107 @@ msgid "Default window height"
msgstr "Default window height"
#: ../shell/apps_evolution_shell.schemas.in.in.h:5
+msgid "Default window state"
+msgstr "Default window state"
+
+#: ../shell/apps_evolution_shell.schemas.in.in.h:6
msgid "Default window width"
msgstr "Default window width"
-#: ../shell/apps_evolution_shell.schemas.in.in.h:6
+#: ../shell/apps_evolution_shell.schemas.in.in.h:7
msgid "ID or alias of the component to be shown by default at start-up."
msgstr "ID or alias of the component to be shown by default at start-up."
-#: ../shell/apps_evolution_shell.schemas.in.in.h:7
+#: ../shell/apps_evolution_shell.schemas.in.in.h:8
msgid "Last upgraded configuration version"
msgstr "Last upgraded configuration version"
-#: ../shell/apps_evolution_shell.schemas.in.in.h:8
+#: ../shell/apps_evolution_shell.schemas.in.in.h:9
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:9
+#: ../shell/apps_evolution_shell.schemas.in.in.h:10
msgid "Printer settings"
msgstr "Printer settings"
-#: ../shell/apps_evolution_shell.schemas.in.in.h:10
+#: ../shell/apps_evolution_shell.schemas.in.in.h:11
+msgid "Sidebar is visible"
+msgstr "Sidebar is visible"
+
+#: ../shell/apps_evolution_shell.schemas.in.in.h:12
msgid "Skip development warning dialog"
msgstr "Skip development warning dialogue"
-#: ../shell/apps_evolution_shell.schemas.in.in.h:11
-#: ../shell/main.c:468
+#: ../shell/apps_evolution_shell.schemas.in.in.h:13
+#: ../shell/main.c:471
msgid "Start in offline mode"
msgstr "Start in offline mode"
-#: ../shell/apps_evolution_shell.schemas.in.in.h:12
-msgid "The configuration version of Evolution, with major/minor/configuration level"
-msgstr "The configuration version of Evolution, with major/minor/configuration level"
+#: ../shell/apps_evolution_shell.schemas.in.in.h:14
+msgid "Statusbar is visible"
+msgstr "Statusbar is visible"
-#: ../shell/apps_evolution_shell.schemas.in.in.h:13
+#: ../shell/apps_evolution_shell.schemas.in.in.h:15
+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:16
msgid "The default height for the main window, in pixels."
msgstr "The default height for the main window, in pixels."
-#: ../shell/apps_evolution_shell.schemas.in.in.h:14
+#: ../shell/apps_evolution_shell.schemas.in.in.h:17
msgid "The default width for the main window, in pixels."
msgstr "The default width for the main window, in pixels."
-#: ../shell/apps_evolution_shell.schemas.in.in.h:15
+#: ../shell/apps_evolution_shell.schemas.in.in.h:18
msgid "The default width for the sidebar, in pixels."
msgstr "The default width for the sidebar, in pixels."
-#: ../shell/apps_evolution_shell.schemas.in.in.h:16
-msgid "The last upgraded configuration version of Evolution, with major/minor/configuration level"
-msgstr "The last upgraded configuration version of Evolution, with major/minor/configuration level"
+#: ../shell/apps_evolution_shell.schemas.in.in.h:19
+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:17
+#: ../shell/apps_evolution_shell.schemas.in.in.h:20
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:18
+#: ../shell/apps_evolution_shell.schemas.in.in.h:21
msgid "Toolbar is visible"
msgstr "Toolbar is visible"
-#: ../shell/apps_evolution_shell.schemas.in.in.h:19
+#: ../shell/apps_evolution_shell.schemas.in.in.h:22
msgid "Whether Evolution will start up in offline mode instead of online mode."
msgstr "Whether Evolution will start up in offline mode instead of online mode."
-#: ../shell/apps_evolution_shell.schemas.in.in.h:20
+#: ../shell/apps_evolution_shell.schemas.in.in.h:23
+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:24
+msgid "Whether the sidebar should be visible."
+msgstr "Whether the sidebar should be visible."
+
+#: ../shell/apps_evolution_shell.schemas.in.in.h:25
+msgid "Whether the status bar should be visible."
+msgstr "Whether the status bar should be visible."
+
+#: ../shell/apps_evolution_shell.schemas.in.in.h:26
msgid "Whether the toolbar should be visible."
msgstr "Whether the toolbar should be visible."
-#: ../shell/apps_evolution_shell.schemas.in.in.h:21
+#: ../shell/apps_evolution_shell.schemas.in.in.h:27
msgid "Whether the warning dialog in development versions of Evolution is skipped."
msgstr "Whether the warning dialogue in development versions of Evolution is skipped."
-#: ../shell/apps_evolution_shell.schemas.in.in.h:22
+#: ../shell/apps_evolution_shell.schemas.in.in.h:28
msgid "Whether the window buttons should be visible."
msgstr "Whether the window buttons should be visible."
-#: ../shell/apps_evolution_shell.schemas.in.in.h:23
+#: ../shell/apps_evolution_shell.schemas.in.in.h:29
msgid "Window button style"
msgstr "Window button style"
-#: ../shell/apps_evolution_shell.schemas.in.in.h:24
+#: ../shell/apps_evolution_shell.schemas.in.in.h:30
msgid "Window buttons are visible"
msgstr "Window buttons are visible"
@@ -16190,16 +17272,16 @@ 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-folder-title-bar.c:586
-#: ../shell/e-shell-folder-title-bar.c:587
+#: ../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:133
+#: ../shell/e-shell-importer.c:137
msgid "Choose the type of importer to run:"
msgstr "Choose the type of importer to run:"
-#: ../shell/e-shell-importer.c:136
+#: ../shell/e-shell-importer.c:140
msgid ""
"Choose the file that you want to import into Evolution, and select what type of file it is from the list.\n"
"\n"
@@ -16209,11 +17291,11 @@ msgstr ""
"\n"
"You can select \"Automatic\" if you do not know, and Evolution will attempt to work it out."
-#: ../shell/e-shell-importer.c:142
+#: ../shell/e-shell-importer.c:146
msgid "Choose the destination for this import"
msgstr "Choose the destination for this import"
-#: ../shell/e-shell-importer.c:148
+#: ../shell/e-shell-importer.c:152
msgid ""
"Evolution checked for settings to import from the following\n"
"applications: Pine, Netscape, Elm, iCalendar. No importable\n"
@@ -16225,33 +17307,30 @@ msgstr ""
"settings found. If you would like to\n"
"try again, please click the \"Back\" button.\n"
-#: ../shell/e-shell-importer.c:283
+#: ../shell/e-shell-importer.c:291
msgid "F_ilename:"
msgstr "F_ilename:"
-#: ../shell/e-shell-importer.c:288
+#: ../shell/e-shell-importer.c:297
+#: ../shell/e-shell-importer.c:300
msgid "Select a file"
msgstr "Select a file"
-#: ../shell/e-shell-importer.c:300
+#: ../shell/e-shell-importer.c:313
msgid "File _type:"
msgstr "File _type:"
-#: ../shell/e-shell-importer.c:336
+#: ../shell/e-shell-importer.c:349
msgid "Import data and settings from _older programs"
msgstr "Import data and settings from _older programs"
-#: ../shell/e-shell-importer.c:339
+#: ../shell/e-shell-importer.c:352
msgid "Import a _single file"
msgstr "Import a _single file"
-#: ../shell/e-shell-importer.c:698
-msgid "_Import"
-msgstr "_Import"
-
#: ../shell/e-shell-settings-dialog.c:318
-msgid "Evolution Settings"
-msgstr "Evolution Settings"
+msgid "Evolution Preferences"
+msgstr "Evolution Preferences"
#: ../shell/e-shell-utils.c:118
msgid "No folder name specified."
@@ -16273,11 +17352,11 @@ msgstr "Folder name cannot contain the character \"#\"."
msgid "'.' and '..' are reserved folder names."
msgstr "'.' and '..' are reserved folder names."
-#: ../shell/e-shell-window-commands.c:70
+#: ../shell/e-shell-window-commands.c:71
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:78
+#: ../shell/e-shell-window-commands.c:79
#, c-format
msgid "Error executing %s."
msgstr "Error executing %s."
@@ -16286,81 +17365,79 @@ msgstr "Error executing %s."
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:130
msgid "Bug buddy could not be run."
msgstr "Bug buddy could not be run."
#. The translator-credits string is for translators to list
#. * per language credits for translation, displayed in the
#. * about box
-#: ../shell/e-shell-window-commands.c:532
+#: ../shell/e-shell-window-commands.c:561
msgid "translator-credits"
msgstr ""
"Gareth Owen <gowen72@yahoo.com>\n"
"David Lodge <dave@cirt.net>"
-#: ../shell/e-shell-window-commands.c:546
-msgid "Groupware Suite"
-msgstr "Groupware Suite"
-
-#: ../shell/e-shell-window-commands.c:774
+#: ../shell/e-shell-window-commands.c:806
msgid "_Work Online"
msgstr "_Work Online"
-#: ../shell/e-shell-window-commands.c:787
-#: ../ui/evolution.xml.h:50
+#: ../shell/e-shell-window-commands.c:819
+#: ../ui/evolution.xml.h:52
msgid "_Work Offline"
msgstr "_Work Offline"
-#: ../shell/e-shell-window-commands.c:800
+#: ../shell/e-shell-window-commands.c:832
msgid "Work Offline"
msgstr "Work Offline"
-#: ../shell/e-shell-window.c:343
-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:371
+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:351
+#: ../shell/e-shell-window.c:379
msgid "Evolution is in the process of going offline."
msgstr "Evolution is in the process of going offline."
-#: ../shell/e-shell-window.c:358
-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:386
+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:724
+#: ../shell/e-shell-window.c:786
#, c-format
msgid "Switch to %s"
msgstr "Switch to %s"
-#: ../shell/e-shell.c:623
+#: ../shell/e-shell.c:634
msgid "Uknown system error."
msgstr "Uknown system error."
-#: ../shell/e-shell.c:825
-#: ../shell/e-shell.c:826
+#: ../shell/e-shell.c:830
+#: ../shell/e-shell.c:831
#, c-format
msgid "%ld KB"
msgstr "%ld KB"
-#: ../shell/e-shell.c:1257
-#: ../widgets/misc/e-cell-date-edit.c:256
+#: ../shell/e-shell.c:1262
+#: ../widgets/misc/e-cell-date-edit.c:257
msgid "OK"
msgstr "OK"
-#: ../shell/e-shell.c:1259
+#: ../shell/e-shell.c:1264
msgid "Invalid arguments"
msgstr "Invalid arguments"
-#: ../shell/e-shell.c:1261
+#: ../shell/e-shell.c:1266
msgid "Cannot register on OAF"
msgstr "Cannot register on OAF"
-#: ../shell/e-shell.c:1263
+#: ../shell/e-shell.c:1268
msgid "Configuration Database not found"
msgstr "Configuration Database not found"
-#: ../shell/e-user-creatable-items-handler.c:685
+#: ../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"
@@ -16415,7 +17492,7 @@ msgstr ""
"importing external files into Evolution."
#. Preview/Alpha/Beta version warning message
-#: ../shell/main.c:230
+#: ../shell/main.c:233
#, no-c-format
msgid ""
"Hi. Thanks for taking the time to download this preview release\n"
@@ -16427,7 +17504,7 @@ msgid ""
"If you want a stable version of Evolution, we urge you to uninstall\n"
"this version, and install version %s instead.\n"
"\n"
-"If you find bugs, please report them to us at bugzilla.ximian.com.\n"
+"If you find bugs, please report them to us at bugzilla.gnome.org.\n"
"This product comes with no warranty and is not intended for\n"
"individuals prone to violent fits of anger.\n"
"\n"
@@ -16443,14 +17520,14 @@ msgstr ""
"If you want a stable version of Evolution, we urge you to uninstall\n"
"this version, and install version %s instead.\n"
"\n"
-"If you find bugs, please report them to us at bugzilla.ximian.com.\n"
+"If you find bugs, please report them to us at bugzilla.gnome.org.\n"
"This product comes with no warranty and is not intended for\n"
"individuals prone to violent fits of anger.\n"
"\n"
"We hope that you enjoy the results of our hard work, and we\n"
"eagerly await your contributions!\n"
-#: ../shell/main.c:254
+#: ../shell/main.c:257
msgid ""
"Thanks\n"
"The Evolution Team\n"
@@ -16458,35 +17535,39 @@ msgstr ""
"Thanks\n"
"The Evolution Team\n"
-#: ../shell/main.c:261
-msgid "Don't tell me again"
-msgstr "Don't tell me again"
+#: ../shell/main.c:264
+msgid "Do not tell me again"
+msgstr "Do not tell me again"
-#: ../shell/main.c:466
+#: ../shell/main.c:469
msgid "Start Evolution activating the specified component"
msgstr "Start Evolution activating the specified component"
-#: ../shell/main.c:470
+#: ../shell/main.c:473
msgid "Start in online mode"
msgstr "Start in online mode"
-#: ../shell/main.c:473
+#: ../shell/main.c:476
msgid "Forcibly shut down all Evolution components"
msgstr "Forcibly shut down all Evolution components"
-#: ../shell/main.c:477
+#: ../shell/main.c:480
msgid "Forcibly re-migrate from Evolution 1.4"
msgstr "Forcibly re-migrate from Evolution 1.4"
-#: ../shell/main.c:480
+#: ../shell/main.c:483
msgid "Send the debugging output of all components to a file."
msgstr "Send the debugging output of all components to a file."
-#: ../shell/main.c:482
+#: ../shell/main.c:485
msgid "Disable loading of any plugins."
msgstr "Disable loading of any plugins."
-#: ../shell/main.c:513
+#: ../shell/main.c:516
+msgid "- The Evolution PIM and Email Client"
+msgstr "- The Evolution PIM and Email Client"
+
+#: ../shell/main.c:527
#, c-format
msgid ""
"%s: --online and --offline cannot be used together.\n"
@@ -16514,8 +17595,8 @@ msgid "Evolution can not start."
msgstr "Evolution can not start."
#: ../shell/shell.error.xml.h:5
-msgid "Forgetting your passwords will clear all remembered passwords. You will be reprompted next time they are needed. "
-msgstr "Forgetting your passwords will clear all remembered passwords. You will be reprompted next time they are needed. "
+msgid "Forgetting your passwords will clear all remembered passwords. You will be reprompted next time they are needed."
+msgstr "Forgetting your passwords will clear all remembered passwords. You will be reprompted next time they are needed."
#: ../shell/shell.error.xml.h:7
msgid "Insufficient disk space for upgrade."
@@ -16530,13 +17611,13 @@ msgstr "Really delete old data?"
# shell:upgrade-remove-1-4-confirm secondary
#: ../shell/shell.error.xml.h:9
msgid ""
-"The entire contents of the &quot;evolution&quot; directory is about to be be permanently removed.\n"
+"The entire contents of the &quot;evolution&quot; directory are about to be permanently removed.\n"
"\n"
"It is suggested you manually verify that all of your mail, contact, and calendar data is present, and that this version of Evolution operates correctly before deleting this old data.\n"
"\n"
"Once deleted, you cannot downgrade to the previous version of Evolution without manual intervention.\n"
msgstr ""
-"The entire contents of the &quot;evolution&quot; directory are about to be be permanently removed.\n"
+"The entire contents of the &quot;evolution&quot; directory are about to be permanently removed.\n"
"\n"
"It is suggested you manually verify that all of your mail, contact, and calendar data is present, and that this version of Evolution operates correctly before deleting this old data.\n"
"\n"
@@ -16547,11 +17628,11 @@ msgstr ""
msgid ""
"The previous version of evolution stored its data in a different location.\n"
"\n"
-"If you choose to remove this data, the entire contents of the &quot;evolution&quot; directory will be removed permanently. If you choose to keep this data, then you may manually remove the contents of &quot;evolution&quot; at your convenience.\n"
+"If you choose to remove this data, the entire contents of the &quot;evolution&quot; directory will be removed permanently. If you choose to keep this data, then you may manually remove the contents of &quot;evolution&quot; at your convenience.\n"
msgstr ""
"The previous version of evolution stored its data in a different location.\n"
"\n"
-"If you choose to remove this data, the entire contents of the &quot;evolution&quot; directory will be removed permanently. If you choose to keep this data, then you may manually remove the contents of &quot;evolution&quot; at your convenience.\n"
+"If you choose to remove this data, the entire contents of the &quot;evolution&quot; directory will be removed permanently. If you choose to keep this data, then you may manually remove the contents of &quot;evolution&quot; at your convenience.\n"
#: ../shell/shell.error.xml.h:19
msgid "Upgrade from previous version failed: {0}"
@@ -16559,11 +17640,11 @@ msgstr "Upgrade from previous version failed: {0}"
#: ../shell/shell.error.xml.h:20
msgid ""
-"Upgrading your data and settings will require upto {0} of disk space, but you only have {1} available.\n"
+"Upgrading your data and settings will require up to {0} of disk space, but you only have {1} available.\n"
"\n"
"You will need to make more space available in your home directory before you can continue."
msgstr ""
-"Upgrading your data and settings will require upto {0} of disk space, but you only have {1} available.\n"
+"Upgrading your data and settings will require up to {0} of disk space, but you only have {1} available.\n"
"\n"
"You will need to make more space available in your home directory before you can continue."
@@ -16613,7 +17694,7 @@ msgstr ""
"\n"
"If you choose to continue, you may not have access to some of your old data.\n"
-#: ../smime/gui/ca-trust-dialog.c:96
+#: ../smime/gui/ca-trust-dialog.c:104
#, c-format
msgid ""
"Certificate '%s' is a CA certificate.\n"
@@ -16624,69 +17705,69 @@ msgstr ""
"\n"
"Edit trust settings:"
-#: ../smime/gui/cert-trust-dialog.c:145
+#: ../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:149
+#: ../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:134
-#: ../smime/gui/certificate-manager.c:142
-#: ../smime/gui/certificate-manager.c:377
-#: ../smime/gui/certificate-manager.c:385
-#: ../smime/gui/certificate-manager.c:597
-#: ../smime/gui/certificate-manager.c:605
+#: ../smime/gui/certificate-manager.c:136
+#: ../smime/gui/certificate-manager.c:144
+#: ../smime/gui/certificate-manager.c:375
+#: ../smime/gui/certificate-manager.c:383
+#: ../smime/gui/certificate-manager.c:595
+#: ../smime/gui/certificate-manager.c:603
msgid "Select a certificate to import..."
msgstr "Select a certificate to import..."
-#: ../smime/gui/certificate-manager.c:265
-#: ../smime/gui/certificate-manager.c:474
-#: ../smime/gui/certificate-manager.c:692
+#: ../smime/gui/certificate-manager.c:267
+#: ../smime/gui/certificate-manager.c:472
+#: ../smime/gui/certificate-manager.c:690
msgid "Certificate Name"
msgstr "Certificate Name"
-#: ../smime/gui/certificate-manager.c:274
-#: ../smime/gui/certificate-manager.c:492
+#: ../smime/gui/certificate-manager.c:276
+#: ../smime/gui/certificate-manager.c:490
msgid "Purposes"
msgstr "Purposes"
-#: ../smime/gui/certificate-manager.c:283
+#: ../smime/gui/certificate-manager.c:285
#: ../smime/gui/smime-ui.glade.h:37
-#: ../smime/lib/e-cert.c:569
+#: ../smime/lib/e-cert.c:570
msgid "Serial Number"
msgstr "Serial Number"
-#: ../smime/gui/certificate-manager.c:291
+#: ../smime/gui/certificate-manager.c:293
msgid "Expires"
msgstr "Expires"
-#: ../smime/gui/certificate-manager.c:483
+#: ../smime/gui/certificate-manager.c:481
msgid "E-Mail Address"
msgstr "E-Mail Address"
-#: ../smime/gui/certificate-viewer.c:334
+#: ../smime/gui/certificate-viewer.c:341
#, c-format
msgid "Certificate Viewer: %s"
msgstr "Certificate Viewer: %s"
-#: ../smime/gui/component.c:45
+#: ../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:68
+#: ../smime/gui/component.c:70
msgid "Enter new password for certificate database"
msgstr "Enter new password for certificate database"
-#: ../smime/gui/component.c:70
+#: ../smime/gui/component.c:72
msgid "Enter new password"
msgstr "Enter new password"
#. FIXME: add serial no, validity date, uses
-#: ../smime/gui/e-cert-selector.c:119
+#: ../smime/gui/e-cert-selector.c:121
#, c-format
msgid ""
"Issued to:\n"
@@ -16695,7 +17776,7 @@ msgstr ""
"Issued to:\n"
" Subject: %s\n"
-#: ../smime/gui/e-cert-selector.c:120
+#: ../smime/gui/e-cert-selector.c:122
#, c-format
msgid ""
"Issued by:\n"
@@ -16704,7 +17785,7 @@ msgstr ""
"Issued by:\n"
" Subject: %s\n"
-#: ../smime/gui/e-cert-selector.c:167
+#: ../smime/gui/e-cert-selector.c:174
msgid "Select certificate"
msgstr "Select certificate"
@@ -16761,7 +17842,7 @@ msgid "Before trusting this CA for any purpose, you should examine its certifica
msgstr "Before trusting this CA for any purpose, you should examine its certificate and its policy and procedures (if available)."
#: ../smime/gui/smime-ui.glade.h:14
-#: ../smime/lib/e-cert.c:1076
+#: ../smime/lib/e-cert.c:1077
msgid "Certificate"
msgstr "Certificate"
@@ -16838,12 +17919,12 @@ msgid "SHA1 Fingerprint"
msgstr "SHA1 Fingerprint"
#: ../smime/gui/smime-ui.glade.h:35
-#: ../smime/lib/e-cert.c:818
+#: ../smime/lib/e-cert.c:819
msgid "SSL Client Certificate"
msgstr "SSL Client Certificate"
#: ../smime/gui/smime-ui.glade.h:36
-#: ../smime/lib/e-cert.c:822
+#: ../smime/lib/e-cert.c:823
msgid "SSL Server Certificate"
msgstr "SSL Server Certificate"
@@ -16888,251 +17969,211 @@ 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:651
+#: ../smime/lib/e-cert-db.c:676
msgid "Certificate already exists"
msgstr "Certificate already exists"
-#: ../smime/lib/e-cert.c:238
-#: ../smime/lib/e-cert.c:248
+#: ../smime/lib/e-cert.c:239
+#: ../smime/lib/e-cert.c:249
msgid "%d/%m/%Y"
msgstr "%d/%m/%Y"
#. x509 certificate usage types
-#: ../smime/lib/e-cert.c:424
+#: ../smime/lib/e-cert.c:425
msgid "Sign"
msgstr "Sign"
-#: ../smime/lib/e-cert.c:425
+#: ../smime/lib/e-cert.c:426
msgid "Encrypt"
msgstr "Encrypt"
-#: ../smime/lib/e-cert.c:530
+#: ../smime/lib/e-cert.c:531
msgid "Version"
msgstr "Version"
-#: ../smime/lib/e-cert.c:545
+#: ../smime/lib/e-cert.c:546
msgid "Version 1"
msgstr "Version 1"
-#: ../smime/lib/e-cert.c:548
+#: ../smime/lib/e-cert.c:549
msgid "Version 2"
msgstr "Version 2"
-#: ../smime/lib/e-cert.c:551
+#: ../smime/lib/e-cert.c:552
msgid "Version 3"
msgstr "Version 3"
-#: ../smime/lib/e-cert.c:633
+#: ../smime/lib/e-cert.c:634
msgid "PKCS #1 MD2 With RSA Encryption"
msgstr "PKCS #1 MD2 With RSA Encryption"
-#: ../smime/lib/e-cert.c:636
+#: ../smime/lib/e-cert.c:637
msgid "PKCS #1 MD5 With RSA Encryption"
msgstr "PKCS #1 MD5 With RSA Encryption"
-#: ../smime/lib/e-cert.c:639
+#: ../smime/lib/e-cert.c:640
msgid "PKCS #1 SHA-1 With RSA Encryption"
msgstr "PKCS #1 SHA-1 With RSA Encryption"
-#: ../smime/lib/e-cert.c:642
-msgid "C"
-msgstr "C"
-
-#: ../smime/lib/e-cert.c:645
-msgid "CN"
-msgstr "CN"
-
-#: ../smime/lib/e-cert.c:648
-msgid "OU"
-msgstr "OU"
-
-#: ../smime/lib/e-cert.c:651
-msgid "O"
-msgstr "O"
-
-#: ../smime/lib/e-cert.c:654
-msgid "L"
-msgstr "L"
-
-#: ../smime/lib/e-cert.c:657
-msgid "DN"
-msgstr "DN"
-
-#: ../smime/lib/e-cert.c:660
-msgid "DC"
-msgstr "DC"
-
-#: ../smime/lib/e-cert.c:663
-msgid "ST"
-msgstr "ST"
-
-#: ../smime/lib/e-cert.c:666
+#: ../smime/lib/e-cert.c:667
msgid "PKCS #1 RSA Encryption"
msgstr "PKCS #1 RSA Encryption"
-#: ../smime/lib/e-cert.c:669
+#: ../smime/lib/e-cert.c:670
msgid "Certificate Key Usage"
msgstr "Certificate Key Usage"
-#: ../smime/lib/e-cert.c:672
+#: ../smime/lib/e-cert.c:673
msgid "Netscape Certificate Type"
msgstr "Netscape Certificate Type"
-#: ../smime/lib/e-cert.c:675
+#: ../smime/lib/e-cert.c:676
msgid "Certificate Authority Key Identifier"
msgstr "Certificate Authority Key Identifier"
-#: ../smime/lib/e-cert.c:678
-msgid "UID"
-msgstr "UID"
-
-#: ../smime/lib/e-cert.c:681
-msgid "E"
-msgstr "E"
-
-#: ../smime/lib/e-cert.c:687
+#: ../smime/lib/e-cert.c:688
#, c-format
msgid "Object Identifier (%s)"
msgstr "Object Identifier (%s)"
-#: ../smime/lib/e-cert.c:738
+#: ../smime/lib/e-cert.c:739
msgid "Algorithm Identifier"
msgstr "Algorithm Identifier"
-#: ../smime/lib/e-cert.c:746
+#: ../smime/lib/e-cert.c:747
msgid "Algorithm Parameters"
msgstr "Algorithm Parameters"
-#: ../smime/lib/e-cert.c:768
+#: ../smime/lib/e-cert.c:769
msgid "Subject Public Key Info"
msgstr "Subject Public Key Info"
-#: ../smime/lib/e-cert.c:773
+#: ../smime/lib/e-cert.c:774
msgid "Subject Public Key Algorithm"
msgstr "Subject Public Key Algorithm"
-#: ../smime/lib/e-cert.c:788
+#: ../smime/lib/e-cert.c:789
msgid "Subject's Public Key"
msgstr "Subject's Public Key"
-#: ../smime/lib/e-cert.c:809
-#: ../smime/lib/e-cert.c:858
+#: ../smime/lib/e-cert.c:810
+#: ../smime/lib/e-cert.c:859
msgid "Error: Unable to process extension"
msgstr "Error: Unable to process extension"
-#: ../smime/lib/e-cert.c:830
-#: ../smime/lib/e-cert.c:842
+#: ../smime/lib/e-cert.c:831
+#: ../smime/lib/e-cert.c:843
msgid "Object Signer"
msgstr "Object Signer"
-#: ../smime/lib/e-cert.c:834
+#: ../smime/lib/e-cert.c:835
msgid "SSL Certificate Authority"
msgstr "SSL Certificate Authority"
-#: ../smime/lib/e-cert.c:838
+#: ../smime/lib/e-cert.c:839
msgid "Email Certificate Authority"
msgstr "Email Certificate Authority"
-#: ../smime/lib/e-cert.c:866
+#: ../smime/lib/e-cert.c:867
msgid "Signing"
msgstr "Signing"
-#: ../smime/lib/e-cert.c:870
+#: ../smime/lib/e-cert.c:871
msgid "Non-repudiation"
msgstr "Non-repudiation"
-#: ../smime/lib/e-cert.c:874
+#: ../smime/lib/e-cert.c:875
msgid "Key Encipherment"
msgstr "Key Encipherment"
-#: ../smime/lib/e-cert.c:878
+#: ../smime/lib/e-cert.c:879
msgid "Data Encipherment"
msgstr "Data Encipherment"
-#: ../smime/lib/e-cert.c:882
+#: ../smime/lib/e-cert.c:883
msgid "Key Agreement"
msgstr "Key Agreement"
-#: ../smime/lib/e-cert.c:886
+#: ../smime/lib/e-cert.c:887
msgid "Certificate Signer"
msgstr "Certificate Signer"
-#: ../smime/lib/e-cert.c:890
+#: ../smime/lib/e-cert.c:891
msgid "CRL Signer"
msgstr "CRL Signer"
-#: ../smime/lib/e-cert.c:938
+#: ../smime/lib/e-cert.c:939
msgid "Critical"
msgstr "Critical"
-#: ../smime/lib/e-cert.c:940
-#: ../smime/lib/e-cert.c:943
+#: ../smime/lib/e-cert.c:941
+#: ../smime/lib/e-cert.c:944
msgid "Not Critical"
msgstr "Not Critical"
-#: ../smime/lib/e-cert.c:964
+#: ../smime/lib/e-cert.c:965
msgid "Extensions"
msgstr "Extensions"
-#: ../smime/lib/e-cert.c:1035
+#: ../smime/lib/e-cert.c:1036
#, c-format
msgid "%s = %s"
msgstr "%s = %s"
-#: ../smime/lib/e-cert.c:1091
-#: ../smime/lib/e-cert.c:1211
+#: ../smime/lib/e-cert.c:1092
+#: ../smime/lib/e-cert.c:1212
msgid "Certificate Signature Algorithm"
msgstr "Certificate Signature Algorithm"
-#: ../smime/lib/e-cert.c:1100
+#: ../smime/lib/e-cert.c:1101
msgid "Issuer"
msgstr "Issuer"
-#: ../smime/lib/e-cert.c:1154
+#: ../smime/lib/e-cert.c:1155
msgid "Issuer Unique ID"
msgstr "Issuer Unique ID"
-#: ../smime/lib/e-cert.c:1173
+#: ../smime/lib/e-cert.c:1174
msgid "Subject Unique ID"
msgstr "Subject Unique ID"
-#: ../smime/lib/e-cert.c:1216
+#: ../smime/lib/e-cert.c:1217
msgid "Certificate Signature Value"
msgstr "Certificate Signature Value"
-#: ../smime/lib/e-pkcs12.c:264
+#: ../smime/lib/e-pkcs12.c:266
msgid "PKCS12 File Password"
msgstr "PKCS12 File Password"
-#: ../smime/lib/e-pkcs12.c:264
+#: ../smime/lib/e-pkcs12.c:266
msgid "Enter password for PKCS12 file:"
msgstr "Enter password for PKCS12 file:"
-#: ../smime/lib/e-pkcs12.c:363
+#: ../smime/lib/e-pkcs12.c:365
msgid "Imported Certificate"
msgstr "Imported Certificate"
-#: ../tools/evolution-launch-composer.c:324
+#: ../tools/evolution-launch-composer.c:321
msgid "An attachment to add."
msgstr "An attachment to add."
-#: ../tools/evolution-launch-composer.c:325
+#: ../tools/evolution-launch-composer.c:322
msgid "Content type of the attachment."
msgstr "Content type of the attachment."
-#: ../tools/evolution-launch-composer.c:326
+#: ../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:327
+#: ../tools/evolution-launch-composer.c:324
msgid "Description of the attachment."
msgstr "Description of the attachment."
-#: ../tools/evolution-launch-composer.c:328
+#: ../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:329
+#: ../tools/evolution-launch-composer.c:326
msgid "Default subject for the message."
msgstr "Default subject for the message."
@@ -17149,113 +18190,227 @@ msgstr "Could not execute '%s': %s\n"
msgid "Shutting down %s (%s)\n"
msgstr "Shutting down %s (%s)\n"
+#: ../ui/evolution-addressbook.xml.h:1
+msgid "Address _Book Properties"
+msgstr "Address _Book Properties"
+
#: ../ui/evolution-addressbook.xml.h:3
+msgid "Change the properties of the selected folder"
+msgstr "Change the properties of the selected folder"
+
+#: ../ui/evolution-addressbook.xml.h:4
+msgid "Co_py All Contacts To..."
+msgstr "Co_py All Contacts To..."
+
+#: ../ui/evolution-addressbook.xml.h:5
+msgid "Contact _Preview"
+msgstr "Contact _Preview"
+
+#: ../ui/evolution-addressbook.xml.h:6
+#: ../ui/evolution-composer-entries.xml.h:1
+#: ../ui/evolution-memos.xml.h:2
+#: ../ui/evolution-tasks.xml.h:2
+msgid "Copy"
+msgstr "Copy"
+
+#: ../ui/evolution-addressbook.xml.h:7
msgid "Copy Selected Contacts to Another Folder..."
msgstr "Copy Selected Contacts to Another Folder..."
-#: ../ui/evolution-addressbook.xml.h:4
+#: ../ui/evolution-addressbook.xml.h:8
+msgid "Copy the contacts of the selected folder into another folder"
+msgstr "Copy the contacts of the selected folder into another folder"
+
+#: ../ui/evolution-addressbook.xml.h:9
#: ../ui/evolution-calendar.xml.h:2
msgid "Copy the selection"
msgstr "Copy the selection"
-#: ../ui/evolution-addressbook.xml.h:5
+#: ../ui/evolution-addressbook.xml.h:10
msgid "Copy to Folder..."
msgstr "Copy to Folder..."
-#: ../ui/evolution-addressbook.xml.h:7
+#: ../ui/evolution-addressbook.xml.h:11
+msgid "Create a new addressbook folder"
+msgstr "Create a new addressbook folder"
+
+#: ../ui/evolution-addressbook.xml.h:12
+#: ../ui/evolution-composer-entries.xml.h:5
+#: ../ui/evolution-memos.xml.h:4
+#: ../ui/evolution-tasks.xml.h:4
+msgid "Cut"
+msgstr "Cut"
+
+#: ../ui/evolution-addressbook.xml.h:13
#: ../ui/evolution-calendar.xml.h:3
msgid "Cut the selection"
msgstr "Cut the selection"
-#: ../ui/evolution-addressbook.xml.h:9
+#: ../ui/evolution-addressbook.xml.h:14
+msgid "Del_ete Address Book"
+msgstr "Del_ete Address Book"
+
+#: ../ui/evolution-addressbook.xml.h:16
msgid "Delete selected contacts"
msgstr "Delete selected contacts"
-#: ../ui/evolution-addressbook.xml.h:11
+#: ../ui/evolution-addressbook.xml.h:17
+msgid "Delete the selected folder"
+msgstr "Delete the selected folder"
+
+#: ../ui/evolution-addressbook.xml.h:18
+msgid "Forward Contact"
+msgstr "Forward Contact"
+
+#: ../ui/evolution-addressbook.xml.h:19
+msgid "Mo_ve All Contacts To..."
+msgstr "Mo_ve All Contacts To..."
+
+#: ../ui/evolution-addressbook.xml.h:20
msgid "Move Selected Contacts to Another Folder..."
msgstr "Move Selected Contacts to Another Folder..."
-#: ../ui/evolution-addressbook.xml.h:12
+#: ../ui/evolution-addressbook.xml.h:21
+msgid "Move the contacts of the selected folder into another folder"
+msgstr "Move the contacts of the selected folder into another folder"
+
+#: ../ui/evolution-addressbook.xml.h:22
msgid "Move to Folder..."
msgstr "Move to Folder..."
-#: ../ui/evolution-addressbook.xml.h:14
-#: ../ui/evolution-calendar.xml.h:16
+#: ../ui/evolution-addressbook.xml.h:23
+#: ../ui/evolution-composer-entries.xml.h:8
+#: ../ui/evolution-memos.xml.h:8
+#: ../ui/evolution-tasks.xml.h:11
+msgid "Paste"
+msgstr "Paste"
+
+#: ../ui/evolution-addressbook.xml.h:24
+#: ../ui/evolution-calendar.xml.h:17
msgid "Paste the clipboard"
msgstr "Paste the clipboard"
-#: ../ui/evolution-addressbook.xml.h:15
+#: ../ui/evolution-addressbook.xml.h:25
msgid "Previews the contacts to be printed"
msgstr "Previews the contacts to be printed"
-#: ../ui/evolution-addressbook.xml.h:18
+#: ../ui/evolution-addressbook.xml.h:28
msgid "Print selected contacts"
msgstr "Print selected contacts"
-#: ../ui/evolution-addressbook.xml.h:20
+#: ../ui/evolution-addressbook.xml.h:29
+msgid "Rename the selected folder"
+msgstr "Rename the selected folder"
+
+#: ../ui/evolution-addressbook.xml.h:30
+msgid "S_ave Address Book As VCard"
+msgstr "S_ave Address Book As VCard"
+
+#: ../ui/evolution-addressbook.xml.h:32
msgid "Save selected contacts as a VCard."
msgstr "Save selected contacts as a VCard."
-#: ../ui/evolution-addressbook.xml.h:21
-#: ../widgets/text/e-text.c:2684
+#: ../ui/evolution-addressbook.xml.h:33
+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
msgid "Select All"
msgstr "Select All"
-#: ../ui/evolution-addressbook.xml.h:22
+#: ../ui/evolution-addressbook.xml.h:35
+#: ../ui/evolution-composer-entries.xml.h:11
+#: ../ui/evolution-editor.xml.h:13
+#: ../ui/evolution-subscribe.xml.h:6
+msgid "Select _All"
+msgstr "Select _All"
+
+#: ../ui/evolution-addressbook.xml.h:36
msgid "Select all contacts"
msgstr "Select all contacts"
-#: ../ui/evolution-addressbook.xml.h:23
+#: ../ui/evolution-addressbook.xml.h:37
msgid "Send a message to the selected contacts."
msgstr "Send a message to the selected contacts."
-#: ../ui/evolution-addressbook.xml.h:24
+#: ../ui/evolution-addressbook.xml.h:38
msgid "Send message to contact"
msgstr "Send message to contact"
-#: ../ui/evolution-addressbook.xml.h:25
+#: ../ui/evolution-addressbook.xml.h:39
msgid "Send selected contacts to another person."
msgstr "Send selected contacts to another person."
-#: ../ui/evolution-addressbook.xml.h:26
+#: ../ui/evolution-addressbook.xml.h:40
msgid "Show contact preview window"
msgstr "Show contact preview window"
-#: ../ui/evolution-addressbook.xml.h:27
+#: ../ui/evolution-addressbook.xml.h:41
+msgid "St_op"
+msgstr "St_op"
+
+#: ../ui/evolution-addressbook.xml.h:42
msgid "Stop"
msgstr "Stop"
-#: ../ui/evolution-addressbook.xml.h:28
+#: ../ui/evolution-addressbook.xml.h:43
msgid "Stop Loading"
msgstr "Stop Loading"
-#: ../ui/evolution-addressbook.xml.h:29
+#: ../ui/evolution-addressbook.xml.h:44
msgid "View the current contact"
msgstr "View the current contact"
-#: ../ui/evolution-addressbook.xml.h:30
+#: ../ui/evolution-addressbook.xml.h:45
#: ../ui/evolution-calendar.xml.h:38
-#: ../ui/evolution-tasks.xml.h:19
+#: ../ui/evolution-mail-list.xml.h:29
+#: ../ui/evolution-tasks.xml.h:21
msgid "_Actions"
msgstr "_Actions"
-#: ../ui/evolution-addressbook.xml.h:35
+#: ../ui/evolution-addressbook.xml.h:47
+msgid "_Copy Contact to..."
+msgstr "_Copy Contact to..."
+
+#: ../ui/evolution-addressbook.xml.h:48
+msgid "_Copy Folder Contacts To"
+msgstr "_Copy Folder Contacts To"
+
+#: ../ui/evolution-addressbook.xml.h:50
+msgid "_Delete Contact"
+msgstr "_Delete Contact"
+
+#: ../ui/evolution-addressbook.xml.h:52
msgid "_Forward Contact..."
msgstr "_Forward Contact..."
-#: ../ui/evolution-addressbook.xml.h:39
-msgid "_Preview Pane"
-msgstr "_Preview Pane"
+#: ../ui/evolution-addressbook.xml.h:53
+msgid "_Move Contact to..."
+msgstr "_Move Contact to..."
-#: ../ui/evolution-addressbook.xml.h:41
-msgid "_Save as VCard..."
-msgstr "_Save as VCard..."
+#: ../ui/evolution-addressbook.xml.h:54
+msgid "_Move Folder Contacts To"
+msgstr "_Move Folder Contacts To"
-#: ../ui/evolution-addressbook.xml.h:42
-msgid "_Select All"
-msgstr "_Select All"
+#: ../ui/evolution-addressbook.xml.h:55
+#: ../ui/evolution.xml.h:44
+msgid "_New"
+msgstr "_New"
-#: ../ui/evolution-addressbook.xml.h:43
+#: ../ui/evolution-addressbook.xml.h:60
+msgid "_Rename"
+msgstr "_Rename"
+
+#: ../ui/evolution-addressbook.xml.h:61
+msgid "_Save Contact as VCard..."
+msgstr "_Save Contact as VCard..."
+
+#: ../ui/evolution-addressbook.xml.h:62
+msgid "_Save Folder Contacts As VCard"
+msgstr "_Save Folder Contacts As VCard"
+
+#: ../ui/evolution-addressbook.xml.h:63
msgid "_Send Message to Contact..."
msgstr "_Send Message to Contact..."
@@ -17264,63 +18419,61 @@ msgid "Day"
msgstr "Day"
#: ../ui/evolution-calendar.xml.h:6
-msgid "Delete All Occurrences"
-msgstr "Delete All Occurrences"
+msgid "Delete _all Occurrences"
+msgstr "Delete _all Occurrences"
#: ../ui/evolution-calendar.xml.h:7
-msgid "Delete the appointment"
-msgstr "Delete the appointment"
+msgid "Delete all occurrences"
+msgstr "Delete all occurrences"
#: ../ui/evolution-calendar.xml.h:8
-msgid "Delete this Occurrence"
-msgstr "Delete this Occurrence"
+msgid "Delete the appointment"
+msgstr "Delete the appointment"
-#: ../ui/evolution-calendar.xml.h:9
+#: ../ui/evolution-calendar.xml.h:10
msgid "Delete this occurrence"
msgstr "Delete this occurrence"
-#: ../ui/evolution-calendar.xml.h:10
+#: ../ui/evolution-calendar.xml.h:11
msgid "Go To"
msgstr "Go To"
-#: ../ui/evolution-calendar.xml.h:11
+#: ../ui/evolution-calendar.xml.h:12
msgid "Go back"
msgstr "Go back"
-#: ../ui/evolution-calendar.xml.h:12
+#: ../ui/evolution-calendar.xml.h:13
msgid "Go forward"
msgstr "Go forward"
-#: ../ui/evolution-calendar.xml.h:13
+#: ../ui/evolution-calendar.xml.h:14
msgid "List"
msgstr "List"
-#: ../ui/evolution-calendar.xml.h:14
+#: ../ui/evolution-calendar.xml.h:15
msgid "Month"
msgstr "Month"
-#: ../ui/evolution-calendar.xml.h:15
-#: ../ui/evolution-mail-message.xml.h:60
+#: ../ui/evolution-calendar.xml.h:16
+#: ../ui/evolution-mail-message.xml.h:57
+#: ../widgets/misc/e-calendar.c:201
msgid "Next"
msgstr "Next"
-#: ../ui/evolution-calendar.xml.h:17
+#: ../ui/evolution-calendar.xml.h:18
msgid "Previews the calendar to be printed"
msgstr "Previews the calendar to be printed"
-#: ../ui/evolution-calendar.xml.h:18
-#: ../ui/evolution-mail-message.xml.h:76
+#: ../ui/evolution-calendar.xml.h:19
+#: ../ui/evolution-mail-message.xml.h:73
+#: ../widgets/misc/e-calendar.c:177
msgid "Previous"
msgstr "Previous"
-#: ../ui/evolution-calendar.xml.h:21
+#: ../ui/evolution-calendar.xml.h:22
msgid "Print this calendar"
msgstr "Print this calendar"
-#: ../ui/evolution-calendar.xml.h:22
-msgid "Publish Free/Busy information for this calendar"
-msgstr "Publish Free/Busy information for this calendar"
-
#: ../ui/evolution-calendar.xml.h:23
#: ../ui/evolution-tasks.xml.h:17
msgid "Purg_e"
@@ -17334,6 +18487,10 @@ msgstr "Purge old appointments and meetings"
msgid "Select _Date"
msgstr "Select _Date"
+#: ../ui/evolution-calendar.xml.h:26
+msgid "Select _Today"
+msgstr "Select _Today"
+
#: ../ui/evolution-calendar.xml.h:27
msgid "Select a specific date"
msgstr "Select a specific date"
@@ -17378,34 +18535,254 @@ msgstr "Work Week"
msgid "_Open Appointment"
msgstr "_Open Appointment"
-#: ../ui/evolution-composer-entries.xml.h:1
+#: ../ui/evolution-composer-entries.xml.h:2
+#: ../ui/evolution-editor.xml.h:7
msgid "Copy selected text to the clipboard"
msgstr "Copy selected text to the clipboard"
-#: ../ui/evolution-composer-entries.xml.h:2
-msgid "Cu_t"
-msgstr "Cu_t"
-
#: ../ui/evolution-composer-entries.xml.h:3
+msgid "Copy selection to clipboard"
+msgstr "Copy selection to clipboard"
+
+#: ../ui/evolution-composer-entries.xml.h:6
+#: ../ui/evolution-editor.xml.h:9
msgid "Cut selected text to the clipboard"
msgstr "Cut selected text to the clipboard"
-#: ../ui/evolution-composer-entries.xml.h:4
+#: ../ui/evolution-composer-entries.xml.h:7
+msgid "Cut selection to clipboard"
+msgstr "Cut selection to clipboard"
+
+#: ../ui/evolution-composer-entries.xml.h:9
+msgid "Paste from clipboard"
+msgstr "Paste from clipboard"
+
+#: ../ui/evolution-composer-entries.xml.h:10
+#: ../ui/evolution-editor.xml.h:11
msgid "Paste text from the clipboard"
msgstr "Paste text from the clipboard"
-#: ../ui/evolution-composer-entries.xml.h:5
-#: ../ui/evolution-subscribe.xml.h:6
-msgid "Select _All"
-msgstr "Select _All"
-
-#: ../ui/evolution-composer-entries.xml.h:6
+#: ../ui/evolution-composer-entries.xml.h:12
+#: ../ui/evolution-editor.xml.h:14
msgid "Select all text"
msgstr "Select all text"
-#: ../ui/evolution-executive-summary.xml.h:1
-msgid "Customize My Evolution"
-msgstr "Customise My Evolution"
+#: ../ui/evolution-editor.xml.h:1
+#: ../ui/evolution-message-composer.xml.h:1
+msgid "Attach"
+msgstr "Attach"
+
+#: ../ui/evolution-editor.xml.h:2
+msgid "Click here to attach a file"
+msgstr "Click here to attach a file"
+
+#: ../ui/evolution-editor.xml.h:3
+msgid "Click here to close the current window"
+msgstr "Click here to close the current window"
+
+#: ../ui/evolution-editor.xml.h:4
+msgid "Click here to save the current window"
+msgstr "Click here to save the current window"
+
+#: ../ui/evolution-editor.xml.h:5
+msgid "Click here to view help available"
+msgstr "Click here to view help available"
+
+#: ../ui/evolution-editor.xml.h:6
+#: ../ui/evolution-mail-messagedisplay.xml.h:1
+#: ../ui/evolution-message-composer.xml.h:3
+#: ../ui/evolution-signature-editor.xml.h:2
+msgid "Close"
+msgstr "Close"
+
+#: ../ui/evolution-editor.xml.h:10
+#: ../ui/evolution-message-composer.xml.h:11
+#: ../ui/evolution-signature-editor.xml.h:6
+msgid "I_nsert"
+msgstr "I_nsert"
+
+#: ../ui/evolution-editor.xml.h:15
+#: ../ui/evolution-message-composer.xml.h:41
+msgid "_Attachment..."
+msgstr "_Attachment..."
+
+#: ../ui/evolution-editor.xml.h:16
+#: ../ui/evolution-mail-messagedisplay.xml.h:4
+#: ../ui/evolution-message-composer.xml.h:44
+#: ../ui/evolution-subscribe.xml.h:9
+msgid "_Close"
+msgstr "_Close"
+
+#: ../ui/evolution-editor.xml.h:19
+#: ../ui/evolution-mail-messagedisplay.xml.h:6
+#: ../ui/evolution-message-composer.xml.h:47
+#: ../ui/evolution-signature-editor.xml.h:14
+#: ../ui/evolution-subscribe.xml.h:11
+#: ../ui/evolution.xml.h:39
+msgid "_File"
+msgstr "_File"
+
+#: ../ui/evolution-editor.xml.h:20
+#: ../ui/evolution.xml.h:41
+msgid "_Help"
+msgstr "_Help"
+
+#: ../ui/evolution-editor.xml.h:21
+msgid "_Options"
+msgstr "_Options"
+
+#: ../ui/evolution-event-editor.xml.h:2
+msgid "All Day Event"
+msgstr "All Day Event"
+
+#: ../ui/evolution-event-editor.xml.h:3
+msgid "All _Day Event"
+msgstr "All _Day Event"
+
+#: ../ui/evolution-event-editor.xml.h:4
+#: ../ui/evolution-memo-editor.xml.h:1
+#: ../ui/evolution-task-editor.xml.h:1
+msgid "Classify as Confidential"
+msgstr "Classify as Confidential"
+
+#: ../ui/evolution-event-editor.xml.h:5
+#: ../ui/evolution-memo-editor.xml.h:2
+#: ../ui/evolution-task-editor.xml.h:2
+msgid "Classify as Private"
+msgstr "Classify as Private"
+
+#: ../ui/evolution-event-editor.xml.h:6
+#: ../ui/evolution-memo-editor.xml.h:3
+#: ../ui/evolution-task-editor.xml.h:3
+msgid "Classify as public"
+msgstr "Classify as public"
+
+#: ../ui/evolution-event-editor.xml.h:7
+msgid "Click here to set or unset alarms for this event"
+msgstr "Click here to set or unset alarms for this event"
+
+#: ../ui/evolution-event-editor.xml.h:9
+#: ../ui/evolution-task-editor.xml.h:5
+msgid "Insert advanced send options"
+msgstr "Insert advanced send options"
+
+#: ../ui/evolution-event-editor.xml.h:10
+msgid "Make this a recurring event"
+msgstr "Make this a recurring event"
+
+#: ../ui/evolution-event-editor.xml.h:11
+#: ../ui/evolution-memo-editor.xml.h:4
+#: ../ui/evolution-task-editor.xml.h:6
+msgid "Pu_blic"
+msgstr "Pu_blic"
+
+#: ../ui/evolution-event-editor.xml.h:12
+msgid "Query free / busy information for the attendees"
+msgstr "Query free / busy information for the attendees"
+
+#: ../ui/evolution-event-editor.xml.h:13
+#: ../ui/evolution-task-editor.xml.h:7
+msgid "R_ole Field"
+msgstr "R_ole Field"
+
+#: ../ui/evolution-event-editor.xml.h:16
+msgid "Show time as _busy"
+msgstr "Show time as _busy"
+
+#: ../ui/evolution-event-editor.xml.h:17
+#: ../ui/evolution-task-editor.xml.h:11
+msgid "Time _Zone"
+msgstr "Time _Zone"
+
+#: ../ui/evolution-event-editor.xml.h:18
+#: ../ui/evolution-task-editor.xml.h:12
+msgid "Toggles whether the Attendee Type field is displayed"
+msgstr "Toggles whether the Attendee Type field is displayed"
+
+#: ../ui/evolution-event-editor.xml.h:19
+#: ../ui/evolution-task-editor.xml.h:13
+msgid "Toggles whether the RSVP field is displayed"
+msgstr "Toggles whether the RSVP field is displayed"
+
+#: ../ui/evolution-event-editor.xml.h:20
+#: ../ui/evolution-task-editor.xml.h:14
+msgid "Toggles whether the Role field is displayed"
+msgstr "Toggles whether the Role field is displayed"
+
+#: ../ui/evolution-event-editor.xml.h:21
+#: ../ui/evolution-task-editor.xml.h:15
+msgid "Toggles whether the Status field is displayed"
+msgstr "Toggles whether the Status field is displayed"
+
+#: ../ui/evolution-event-editor.xml.h:22
+#: ../ui/evolution-task-editor.xml.h:16
+msgid "Toggles whether the time zone is displayed"
+msgstr "Toggles whether the time zone is displayed"
+
+#: ../ui/evolution-event-editor.xml.h:23
+#: ../ui/evolution-memo-editor.xml.h:5
+#: ../ui/evolution-task-editor.xml.h:17
+msgid "Toggles whether to display categories"
+msgstr "Toggles whether to display categories"
+
+#: ../ui/evolution-event-editor.xml.h:24
+msgid "Toggles whether to have All Day Event"
+msgstr "Toggles whether to have All Day Event"
+
+#: ../ui/evolution-event-editor.xml.h:25
+msgid "Toggles whether to show time as busy"
+msgstr "Toggles whether to show time as busy"
+
+#: ../ui/evolution-event-editor.xml.h:26
+msgid "_Alarms"
+msgstr "_Alarms"
+
+#: ../ui/evolution-event-editor.xml.h:27
+#: ../ui/evolution-memo-editor.xml.h:6
+#: ../ui/evolution-task-editor.xml.h:18
+msgid "_Categories"
+msgstr "_Categories"
+
+#: ../ui/evolution-event-editor.xml.h:28
+#: ../ui/evolution-memo-editor.xml.h:7
+#: ../ui/evolution-task-editor.xml.h:19
+msgid "_Classification"
+msgstr "_Classification"
+
+#: ../ui/evolution-event-editor.xml.h:29
+#: ../ui/evolution-memo-editor.xml.h:8
+#: ../ui/evolution-task-editor.xml.h:20
+msgid "_Confidential"
+msgstr "_Confidential"
+
+#: ../ui/evolution-event-editor.xml.h:30
+msgid "_Free/Busy"
+msgstr "_Free/Busy"
+
+#: ../ui/evolution-event-editor.xml.h:31
+#: ../ui/evolution-memo-editor.xml.h:9
+#: ../ui/evolution-task-editor.xml.h:21
+msgid "_Private"
+msgstr "_Private"
+
+#: ../ui/evolution-event-editor.xml.h:32
+#: ../ui/evolution-task-editor.xml.h:22
+msgid "_RSVP"
+msgstr "_RSVP"
+
+#: ../ui/evolution-event-editor.xml.h:33
+msgid "_Recurrence"
+msgstr "_Recurrence"
+
+#: ../ui/evolution-event-editor.xml.h:34
+#: ../ui/evolution-task-editor.xml.h:25
+msgid "_Status Field"
+msgstr "_Status Field"
+
+#: ../ui/evolution-event-editor.xml.h:35
+#: ../ui/evolution-task-editor.xml.h:26
+msgid "_Type Field"
+msgstr "_Type Field"
#: ../ui/evolution-mail-global.xml.h:2
msgid "Cancel the current mail operation"
@@ -17432,59 +18809,83 @@ msgid "Empty _Trash"
msgstr "Empty _Trash"
#: ../ui/evolution-mail-global.xml.h:8
-#: ../ui/evolution-mail-list.xml.h:7
+#: ../ui/evolution-mail-list.xml.h:10
#: ../ui/evolution-subscribe.xml.h:2
msgid "F_older"
msgstr "F_older"
#: ../ui/evolution-mail-global.xml.h:9
-msgid "Message F_ilters"
-msgstr "Message F_ilters"
+msgid "Message _List As"
+msgstr "Message _List As"
#: ../ui/evolution-mail-global.xml.h:10
-msgid "Message _Preview"
-msgstr "Message _Preview"
-
-#: ../ui/evolution-mail-global.xml.h:11
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:13
+#: ../ui/evolution-mail-global.xml.h:11
msgid "Permanently remove all deleted messages from all folders"
msgstr "Permanently remove all deleted messages from all folders"
-#: ../ui/evolution-mail-global.xml.h:14
+#: ../ui/evolution-mail-global.xml.h:12
msgid "Search F_olders"
msgstr "Search F_olders"
+#: ../ui/evolution-mail-global.xml.h:13
+msgid "Show Message _Preview"
+msgstr "Show Message _Preview"
+
+#: ../ui/evolution-mail-global.xml.h:14
+msgid "Show message preview below the message list"
+msgstr "Show message preview below the message list"
+
#: ../ui/evolution-mail-global.xml.h:15
+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:16
msgid "Show message preview window"
msgstr "Show message preview window"
-#: ../ui/evolution-mail-global.xml.h:16
+#: ../ui/evolution-mail-global.xml.h:17
msgid "Subscribe or unsubscribe to folders on remote servers"
msgstr "Subscribe or unsubscribe to folders on remote servers"
-#: ../ui/evolution-mail-global.xml.h:17
+#: ../ui/evolution-mail-global.xml.h:18
+msgid "_Classic View"
+msgstr "_Classic View"
+
+#: ../ui/evolution-mail-global.xml.h:19
msgid "_Copy Folder To..."
msgstr "_Copy Folder To..."
-#: ../ui/evolution-mail-global.xml.h:18
+#: ../ui/evolution-mail-global.xml.h:20
+msgid "_Message Filters"
+msgstr "_Message Filters"
+
+#: ../ui/evolution-mail-global.xml.h:21
msgid "_Move Folder To..."
msgstr "_Move Folder To..."
-#: ../ui/evolution-mail-global.xml.h:19
+#: ../ui/evolution-mail-global.xml.h:22
+msgid "_New Search _Folder (FIXME)"
+msgstr "_New Search _Folder (FIXME)"
+
+#: ../ui/evolution-mail-global.xml.h:23
msgid "_New..."
msgstr "_New..."
-#.
-#. <menuitem name="CreateVFolder" verb="CreateVFolder" _label="_New Search _Folder (FIXME)"/>
-#.
-#: ../ui/evolution-mail-global.xml.h:23
+#: ../ui/evolution-mail-global.xml.h:24
+msgid "_Preview"
+msgstr "_Preview"
+
+#: ../ui/evolution-mail-global.xml.h:25
msgid "_Subscriptions"
msgstr "_Subscriptions"
+#: ../ui/evolution-mail-global.xml.h:26
+msgid "_Vertical View"
+msgstr "_Vertical View"
+
#: ../ui/evolution-mail-list.xml.h:1
msgid "Change the name of this folder"
msgstr "Change the name of this folder"
@@ -17494,99 +18895,111 @@ msgid "Change the properties of this folder"
msgstr "Change the properties of this folder"
#: ../ui/evolution-mail-list.xml.h:3
-#: ../ui/evolution-mail-message.xml.h:13
+msgid "Collapse All _Threads"
+msgstr "Collapse All _Threads"
+
+#: ../ui/evolution-mail-list.xml.h:4
+msgid "Collapse all message threads"
+msgstr "Collapse all message threads"
+
+#: ../ui/evolution-mail-list.xml.h:5
msgid "Copy selected message(s) to the clipboard"
msgstr "Copy selected message(s) to the clipboard"
-#. Alphabetical by name, yo
-#: ../ui/evolution-mail-list.xml.h:5
-#: ../ui/evolution-mail-message.xml.h:24
+#: ../ui/evolution-mail-list.xml.h:6
msgid "Cut selected message(s) to the clipboard"
msgstr "Cut selected message(s) to the clipboard"
-#: ../ui/evolution-mail-list.xml.h:6
-msgid "E_xpunge"
-msgstr "E_xpunge"
+#: ../ui/evolution-mail-list.xml.h:7
+msgid "E_xpand All Threads"
+msgstr "E_xpand All Threads"
#: ../ui/evolution-mail-list.xml.h:8
-msgid "Group By _Threads"
-msgstr "Group By _Threads"
+msgid "E_xpunge"
+msgstr "E_xpunge"
#: ../ui/evolution-mail-list.xml.h:9
+msgid "Expand all message threads"
+msgstr "Expand all message threads"
+
+#: ../ui/evolution-mail-list.xml.h:11
msgid "Hide S_elected Messages"
msgstr "Hide S_elected Messages"
-#: ../ui/evolution-mail-list.xml.h:10
+#: ../ui/evolution-mail-list.xml.h:12
msgid "Hide _Deleted Messages"
msgstr "Hide _Deleted Messages"
-#: ../ui/evolution-mail-list.xml.h:11
+#: ../ui/evolution-mail-list.xml.h:13
msgid "Hide _Read Messages"
msgstr "Hide _Read Messages"
-#: ../ui/evolution-mail-list.xml.h:12
+#: ../ui/evolution-mail-list.xml.h:14
msgid "Hide deleted messages rather than displaying them with a line through them"
msgstr "Hide deleted messages rather than displaying them with a line through them"
-#: ../ui/evolution-mail-list.xml.h:13
-msgid "Mark Me_ssages as Read"
-msgstr "Mark Me_ssages as Read"
+#: ../ui/evolution-mail-list.xml.h:15
+msgid "Mar_k All Messages as Read"
+msgstr "Mar_k All Messages as Read"
-#: ../ui/evolution-mail-list.xml.h:14
-#: ../ui/evolution-mail-message.xml.h:69
+#: ../ui/evolution-mail-list.xml.h:16
msgid "Paste message(s) from the clipboard"
msgstr "Paste message(s) from the clipboard"
-#: ../ui/evolution-mail-list.xml.h:15
+#: ../ui/evolution-mail-list.xml.h:17
msgid "Permanently remove all deleted messages from this folder"
msgstr "Permanently remove all deleted messages from this folder"
-#: ../ui/evolution-mail-list.xml.h:16
+#: ../ui/evolution-mail-list.xml.h:18
msgid "Permanently remove this folder"
msgstr "Permanently remove this folder"
-#: ../ui/evolution-mail-list.xml.h:17
+#: ../ui/evolution-mail-list.xml.h:19
msgid "Select Message _Thread"
msgstr "Select Message _Thread"
-#: ../ui/evolution-mail-list.xml.h:18
+#: ../ui/evolution-mail-list.xml.h:20
msgid "Select _All Messages"
msgstr "Select _All Messages"
-#: ../ui/evolution-mail-list.xml.h:19
+#: ../ui/evolution-mail-list.xml.h:21
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:20
+#: ../ui/evolution-mail-list.xml.h:22
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:21
+#: ../ui/evolution-mail-list.xml.h:23
msgid "Select all visible messages"
msgstr "Select all visible messages"
-#: ../ui/evolution-mail-list.xml.h:22
-msgid "Sh_ow Hidden Messages"
-msgstr "Sh_ow Hidden Messages"
+#: ../ui/evolution-mail-list.xml.h:24
+msgid "Show Hidde_n Messages"
+msgstr "Show Hidde_n Messages"
-#: ../ui/evolution-mail-list.xml.h:23
+#: ../ui/evolution-mail-list.xml.h:25
msgid "Show messages that have been temporarily hidden"
msgstr "Show messages that have been temporarily hidden"
-#: ../ui/evolution-mail-list.xml.h:24
+#: ../ui/evolution-mail-list.xml.h:26
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:25
+#: ../ui/evolution-mail-list.xml.h:27
msgid "Temporarily hide the selected messages"
msgstr "Temporarily hide the selected messages"
-#: ../ui/evolution-mail-list.xml.h:26
+#: ../ui/evolution-mail-list.xml.h:28
msgid "Threaded Message list"
msgstr "Threaded Message list"
-#: ../ui/evolution-mail-list.xml.h:28
-#: ../ui/evolution-mail-message.xml.h:113
+#: ../ui/evolution-mail-list.xml.h:31
+msgid "_Group By Threads"
+msgstr "_Group By Threads"
+
+#: ../ui/evolution-mail-list.xml.h:32
+#: ../ui/evolution-mail-message.xml.h:115
#: ../ui/evolution-mail-messagedisplay.xml.h:7
msgid "_Message"
msgstr "_Message"
@@ -17599,347 +19012,362 @@ msgstr "A_dd Sender to Address Book"
msgid "A_pply Filters"
msgstr "A_pply Filters"
-#. Alphabetical by name, yo
-#: ../ui/evolution-mail-message.xml.h:4
+#: ../ui/evolution-mail-message.xml.h:3
msgid "Add Sender to Address Book"
msgstr "Add Sender to Address Book"
-#: ../ui/evolution-mail-message.xml.h:5
+#: ../ui/evolution-mail-message.xml.h:4
msgid "All Message _Headers"
msgstr "All Message _Headers"
-#: ../ui/evolution-mail-message.xml.h:6
+#: ../ui/evolution-mail-message.xml.h:5
msgid "Apply filter rules to the selected messages"
msgstr "Apply filter rules to the selected messages"
-#: ../ui/evolution-mail-message.xml.h:7
+#: ../ui/evolution-mail-message.xml.h:6
msgid "Check for _Junk"
msgstr "Check for _Junk"
-#: ../ui/evolution-mail-message.xml.h:8
+#: ../ui/evolution-mail-message.xml.h:7
msgid "Compose _New Message"
msgstr "Compose _New Message"
-#: ../ui/evolution-mail-message.xml.h:9
+#: ../ui/evolution-mail-message.xml.h:8
msgid "Compose a reply to all of the recipients of the selected message"
msgstr "Compose a reply to all of the recipients of the selected message"
-#: ../ui/evolution-mail-message.xml.h:10
+#: ../ui/evolution-mail-message.xml.h:9
msgid "Compose a reply to the mailing list of the selected message"
msgstr "Compose a reply to the mailing list of the selected message"
-#: ../ui/evolution-mail-message.xml.h:11
+#: ../ui/evolution-mail-message.xml.h:10
msgid "Compose a reply to the sender of the selected message"
msgstr "Compose a reply to the sender of the selected message"
-#: ../ui/evolution-mail-message.xml.h:14
+#: ../ui/evolution-mail-message.xml.h:11
msgid "Copy selected messages to another folder"
msgstr "Copy selected messages to another folder"
-#: ../ui/evolution-mail-message.xml.h:15
+#: ../ui/evolution-mail-message.xml.h:12
+msgid "Copy selected messages to the clipboard"
+msgstr "Copy selected messages to the clipboard"
+
+#: ../ui/evolution-mail-message.xml.h:13
msgid "Create R_ule"
msgstr "Create R_ule"
-#: ../ui/evolution-mail-message.xml.h:16
+#: ../ui/evolution-mail-message.xml.h:14
msgid "Create a Search Folder for these recipients"
msgstr "Create a Search Folder for these recipients"
-#: ../ui/evolution-mail-message.xml.h:17
+#: ../ui/evolution-mail-message.xml.h:15
msgid "Create a Search Folder for this mailing list"
msgstr "Create a Search Folder for this mailing list"
-#: ../ui/evolution-mail-message.xml.h:18
+#: ../ui/evolution-mail-message.xml.h:16
msgid "Create a Search Folder for this sender"
msgstr "Create a Search Folder for this sender"
-#: ../ui/evolution-mail-message.xml.h:19
+#: ../ui/evolution-mail-message.xml.h:17
msgid "Create a Search Folder for this subject"
msgstr "Create a Search Folder for this subject"
-#: ../ui/evolution-mail-message.xml.h:20
+#: ../ui/evolution-mail-message.xml.h:18
msgid "Create a rule to filter messages from this sender"
msgstr "Create a rule to filter messages from this sender"
-#: ../ui/evolution-mail-message.xml.h:21
+#: ../ui/evolution-mail-message.xml.h:19
msgid "Create a rule to filter messages to these recipients"
msgstr "Create a rule to filter messages to these recipients"
-#: ../ui/evolution-mail-message.xml.h:22
+#: ../ui/evolution-mail-message.xml.h:20
msgid "Create a rule to filter messages to this mailing list"
msgstr "Create a rule to filter messages to this mailing list"
-#: ../ui/evolution-mail-message.xml.h:23
+#: ../ui/evolution-mail-message.xml.h:21
msgid "Create a rule to filter messages with this subject"
msgstr "Create a rule to filter messages with this subject"
-#: ../ui/evolution-mail-message.xml.h:25
+#: ../ui/evolution-mail-message.xml.h:22
+msgid "Cut selected messages to the clipboard"
+msgstr "Cut selected messages to the clipboard"
+
+#: ../ui/evolution-mail-message.xml.h:23
msgid "Decrease the text size"
msgstr "Decrease the text size"
-#: ../ui/evolution-mail-message.xml.h:27
+#: ../ui/evolution-mail-message.xml.h:25
msgid "Display the next important message"
msgstr "Display the next important message"
-#: ../ui/evolution-mail-message.xml.h:28
+#: ../ui/evolution-mail-message.xml.h:26
msgid "Display the next message"
msgstr "Display the next message"
-#: ../ui/evolution-mail-message.xml.h:29
+#: ../ui/evolution-mail-message.xml.h:27
+msgid "Display the next thread"
+msgstr "Display the next thread"
+
+#: ../ui/evolution-mail-message.xml.h:28
msgid "Display the next unread message"
msgstr "Display the next unread message"
-#: ../ui/evolution-mail-message.xml.h:30
-msgid "Display the next unread thread"
-msgstr "Display the next unread thread"
-
-#: ../ui/evolution-mail-message.xml.h:31
+#: ../ui/evolution-mail-message.xml.h:29
msgid "Display the previous important message"
msgstr "Display the previous important message"
-#: ../ui/evolution-mail-message.xml.h:32
+#: ../ui/evolution-mail-message.xml.h:30
msgid "Display the previous message"
msgstr "Display the previous message"
-#: ../ui/evolution-mail-message.xml.h:33
+#: ../ui/evolution-mail-message.xml.h:31
msgid "Display the previous unread message"
msgstr "Display the previous unread message"
-#: ../ui/evolution-mail-message.xml.h:34
+#: ../ui/evolution-mail-message.xml.h:32
+msgid "F_orward As..."
+msgstr "F_orward As..."
+
+#: ../ui/evolution-mail-message.xml.h:33
msgid "Filter on Mailing _List..."
msgstr "Filter on Mailing _List..."
-#: ../ui/evolution-mail-message.xml.h:35
+#: ../ui/evolution-mail-message.xml.h:34
msgid "Filter on Se_nder..."
msgstr "Filter on Se_nder..."
-#: ../ui/evolution-mail-message.xml.h:36
+#: ../ui/evolution-mail-message.xml.h:35
msgid "Filter on _Recipients..."
msgstr "Filter on _Recipients..."
-#: ../ui/evolution-mail-message.xml.h:37
+#: ../ui/evolution-mail-message.xml.h:36
msgid "Filter on _Subject..."
msgstr "Filter on _Subject..."
-#: ../ui/evolution-mail-message.xml.h:38
+#: ../ui/evolution-mail-message.xml.h:37
msgid "Filter the selected messages for junk status"
msgstr "Filter the selected messages for junk status"
-#: ../ui/evolution-mail-message.xml.h:39
-msgid "Flag selected message(s) for follow-up"
-msgstr "Flag selected message(s) for follow-up"
+#: ../ui/evolution-mail-message.xml.h:38
+msgid "Flag selected messages for follow-up"
+msgstr "Flag selected messages for follow-up"
-#: ../ui/evolution-mail-message.xml.h:40
+#: ../ui/evolution-mail-message.xml.h:39
msgid "Follow _Up..."
msgstr "Follow _Up..."
-#: ../ui/evolution-mail-message.xml.h:41
+#: ../ui/evolution-mail-message.xml.h:40
msgid "Force images in HTML mail to be loaded"
msgstr "Force images in HTML mail to be loaded"
-#: ../ui/evolution-mail-message.xml.h:43
+#: ../ui/evolution-mail-message.xml.h:42
msgid "Forward the selected message in the body of a new message"
msgstr "Forward the selected message in the body of a new message"
-#: ../ui/evolution-mail-message.xml.h:44
+#: ../ui/evolution-mail-message.xml.h:43
msgid "Forward the selected message quoted like a reply"
msgstr "Forward the selected message quoted like a reply"
-#: ../ui/evolution-mail-message.xml.h:45
+#: ../ui/evolution-mail-message.xml.h:44
msgid "Forward the selected message to someone"
msgstr "Forward the selected message to someone"
-#: ../ui/evolution-mail-message.xml.h:46
+#: ../ui/evolution-mail-message.xml.h:45
msgid "Forward the selected message to someone as an attachment"
msgstr "Forward the selected message to someone as an attachment"
-#: ../ui/evolution-mail-message.xml.h:47
+#: ../ui/evolution-mail-message.xml.h:46
msgid "Increase the text size"
msgstr "Increase the text size"
-#: ../ui/evolution-mail-message.xml.h:49
+#: ../ui/evolution-mail-message.xml.h:48
msgid "Mar_k as"
msgstr "Mar_k as"
+#: ../ui/evolution-mail-message.xml.h:49
+msgid "Mark the selected messages as having been read"
+msgstr "Mark the selected messages as having been read"
+
#: ../ui/evolution-mail-message.xml.h:50
-msgid "Mark the selected message(s) as having been read"
-msgstr "Mark the selected message(s) as having been read"
+msgid "Mark the selected messages as important"
+msgstr "Mark the selected messages as important"
#: ../ui/evolution-mail-message.xml.h:51
-msgid "Mark the selected message(s) as important"
-msgstr "Mark the selected message(s) as important"
+msgid "Mark the selected messages as junk"
+msgstr "Mark the selected messages as junk"
#: ../ui/evolution-mail-message.xml.h:52
-msgid "Mark the selected message(s) as junk"
-msgstr "Mark the selected message(s) as junk"
+msgid "Mark the selected messages as not being junk"
+msgstr "Mark the selected messages as not being junk"
#: ../ui/evolution-mail-message.xml.h:53
-msgid "Mark the selected message(s) as not being junk"
-msgstr "Mark the selected message(s) as not being junk"
+msgid "Mark the selected messages as not having been read"
+msgstr "Mark the selected messages as not having been read"
#: ../ui/evolution-mail-message.xml.h:54
-msgid "Mark the selected message(s) as not having been read"
-msgstr "Mark the selected message(s) as not having been read"
+msgid "Mark the selected messages as unimportant"
+msgstr "Mark the selected messages as unimportant"
#: ../ui/evolution-mail-message.xml.h:55
-msgid "Mark the selected message(s) as unimportant"
-msgstr "Mark the selected message(s) as unimportant"
-
-#: ../ui/evolution-mail-message.xml.h:56
msgid "Mark the selected messages for deletion"
msgstr "Mark the selected messages for deletion"
-#: ../ui/evolution-mail-message.xml.h:57
-msgid "Message Source"
-msgstr "Message Source"
+#: ../ui/evolution-mail-message.xml.h:56
+msgid "Move selected messages to another folder"
+msgstr "Move selected messages to another folder"
#: ../ui/evolution-mail-message.xml.h:58
-msgid "Move"
-msgstr "Move"
-
-#: ../ui/evolution-mail-message.xml.h:59
-msgid "Move selected message(s) to another folder"
-msgstr "Move selected message(s) to another folder"
-
-#: ../ui/evolution-mail-message.xml.h:61
msgid "Next _Important Message"
msgstr "Next _Important Message"
-#: ../ui/evolution-mail-message.xml.h:62
+#: ../ui/evolution-mail-message.xml.h:59
msgid "Next _Thread"
msgstr "Next _Thread"
-#: ../ui/evolution-mail-message.xml.h:63
+#: ../ui/evolution-mail-message.xml.h:60
msgid "Next _Unread Message"
msgstr "Next _Unread Message"
-#: ../ui/evolution-mail-message.xml.h:64
+#: ../ui/evolution-mail-message.xml.h:61
msgid "Not Junk"
msgstr "Not Junk"
-#: ../ui/evolution-mail-message.xml.h:65
+#: ../ui/evolution-mail-message.xml.h:62
msgid "Open a window for composing a mail message"
msgstr "Open a window for composing a mail message"
-#: ../ui/evolution-mail-message.xml.h:66
-msgid "Open the selected message in a new window"
-msgstr "Open the selected message in a new window"
+#: ../ui/evolution-mail-message.xml.h:63
+msgid "Open the selected messages in a new window"
+msgstr "Open the selected messages in a new window"
-#: ../ui/evolution-mail-message.xml.h:67
-msgid "Open the selected message in the composer for editing"
-msgstr "Open the selected message in the composer for editing"
+#: ../ui/evolution-mail-message.xml.h:64
+msgid "Open the selected messages in the composer for editing"
+msgstr "Open the selected messages in the composer for editing"
-#: ../ui/evolution-mail-message.xml.h:68
+#: ../ui/evolution-mail-message.xml.h:65
msgid "P_revious Unread Message"
msgstr "P_revious Unread Message"
-#: ../ui/evolution-mail-message.xml.h:70
+#: ../ui/evolution-mail-message.xml.h:66
+msgid "Paste messages from the clipboard"
+msgstr "Paste messages from the clipboard"
+
+#: ../ui/evolution-mail-message.xml.h:67
msgid "Pos_t New Message to Folder"
msgstr "Pos_t New Message to Folder"
-#: ../ui/evolution-mail-message.xml.h:71
+#: ../ui/evolution-mail-message.xml.h:68
msgid "Post a Repl_y"
msgstr "Post a Repl_y"
-#: ../ui/evolution-mail-message.xml.h:72
+#: ../ui/evolution-mail-message.xml.h:69
msgid "Post a message to a Public folder"
msgstr "Post a message to a Public folder"
-#: ../ui/evolution-mail-message.xml.h:73
+#: ../ui/evolution-mail-message.xml.h:70
msgid "Post a reply to a message in a Public folder"
msgstr "Post a reply to a message in a Public folder"
-#: ../ui/evolution-mail-message.xml.h:74
+#: ../ui/evolution-mail-message.xml.h:71
msgid "Pr_evious Important Message"
msgstr "Pr_evious Important Message"
-#: ../ui/evolution-mail-message.xml.h:75
+#: ../ui/evolution-mail-message.xml.h:72
msgid "Preview the message to be printed"
msgstr "Preview the message to be printed"
-#: ../ui/evolution-mail-message.xml.h:79
+#: ../ui/evolution-mail-message.xml.h:76
msgid "Print this message"
msgstr "Print this message"
-#: ../ui/evolution-mail-message.xml.h:80
+#: ../ui/evolution-mail-message.xml.h:77
msgid "Re_direct"
msgstr "Re_direct"
-#: ../ui/evolution-mail-message.xml.h:81
+#: ../ui/evolution-mail-message.xml.h:78
msgid "Redirect (bounce) the selected message to someone"
msgstr "Redirect (bounce) the selected message to someone"
-#: ../ui/evolution-mail-message.xml.h:85
+#: ../ui/evolution-mail-message.xml.h:83
msgid "Reset the text to its original size"
msgstr "Reset the text to its original size"
-#: ../ui/evolution-mail-message.xml.h:86
-msgid "Save the message as a text file"
-msgstr "Save the message as a text file"
+#: ../ui/evolution-mail-message.xml.h:84
+msgid "Save the selected messages as a text file"
+msgstr "Save the selected messages as a text file"
-#: ../ui/evolution-mail-message.xml.h:87
+#: ../ui/evolution-mail-message.xml.h:85
msgid "Search Folder from Mailing _List..."
msgstr "Search Folder from Mailing _List..."
-#: ../ui/evolution-mail-message.xml.h:88
+#: ../ui/evolution-mail-message.xml.h:86
msgid "Search Folder from Recipients..."
msgstr "Search Folder from Recipients..."
-#: ../ui/evolution-mail-message.xml.h:89
+#: ../ui/evolution-mail-message.xml.h:87
msgid "Search Folder from S_ubject..."
msgstr "Search Folder from S_ubject..."
-#: ../ui/evolution-mail-message.xml.h:90
+#: ../ui/evolution-mail-message.xml.h:88
msgid "Search Folder from Sen_der..."
msgstr "Search Folder from Sen_der..."
-#: ../ui/evolution-mail-message.xml.h:91
+#: ../ui/evolution-mail-message.xml.h:89
msgid "Search for text in the body of the displayed message"
msgstr "Search for text in the body of the displayed message"
-#: ../ui/evolution-mail-message.xml.h:92
+#: ../ui/evolution-mail-message.xml.h:90
msgid "Select _All Text"
msgstr "Select _All Text"
-#: ../ui/evolution-mail-message.xml.h:93
+#: ../ui/evolution-mail-message.xml.h:91
msgid "Select all the text in a message"
msgstr "Select all the text in a message"
-#: ../ui/evolution-mail-message.xml.h:94
+#: ../ui/evolution-mail-message.xml.h:92
msgid "Set up the page settings for your current printer"
msgstr "Set up the page settings for your current printer"
-#: ../ui/evolution-mail-message.xml.h:95
+#: ../ui/evolution-mail-message.xml.h:93
msgid "Show a blinking cursor in the body of displayed messages"
msgstr "Show a blinking cursor in the body of displayed messages"
-#: ../ui/evolution-mail-message.xml.h:96
-msgid "Show message in the normal style"
-msgstr "Show message in the normal style"
+#: ../ui/evolution-mail-message.xml.h:94
+msgid "Show messages in the normal style"
+msgstr "Show messages in the normal style"
-#: ../ui/evolution-mail-message.xml.h:97
-msgid "Show message with all email headers"
-msgstr "Show message with all email headers"
+#: ../ui/evolution-mail-message.xml.h:95
+msgid "Show messages with all email headers"
+msgstr "Show messages with all email headers"
-#: ../ui/evolution-mail-message.xml.h:98
+#: ../ui/evolution-mail-message.xml.h:96
msgid "Show the raw email source of the message"
msgstr "Show the raw email source of the message"
-#: ../ui/evolution-mail-message.xml.h:99
-msgid "Un-delete the selected messages"
-msgstr "Un-delete the selected messages"
+#: ../ui/evolution-mail-message.xml.h:97
+msgid "Undelete the selected messages"
+msgstr "Undelete the selected messages"
-#: ../ui/evolution-mail-message.xml.h:100
+#: ../ui/evolution-mail-message.xml.h:98
msgid "Uni_mportant"
msgstr "Uni_mportant"
-#: ../ui/evolution-mail-message.xml.h:101
+#: ../ui/evolution-mail-message.xml.h:99
msgid "Zoom _Out"
msgstr "Zoom _Out"
-#: ../ui/evolution-mail-message.xml.h:102
+#: ../ui/evolution-mail-message.xml.h:100
+msgid "_Attached"
+msgstr "_Attached"
+
+#: ../ui/evolution-mail-message.xml.h:101
msgid "_Caret Mode"
msgstr "_Caret Mode"
+#: ../ui/evolution-mail-message.xml.h:102
+msgid "_Clear Flag"
+msgstr "_Clear Flag"
+
#: ../ui/evolution-mail-message.xml.h:105
msgid "_Delete Message"
msgstr "_Delete Message"
@@ -17948,279 +19376,301 @@ msgstr "_Delete Message"
msgid "_Find in Message..."
msgstr "_Find in Message..."
-#: ../ui/evolution-mail-message.xml.h:109
+#: ../ui/evolution-mail-message.xml.h:108
+msgid "_Flag Completed"
+msgstr "_Flag Completed"
+
+#: ../ui/evolution-mail-message.xml.h:110
msgid "_Go To"
msgstr "_Go To"
-#: ../ui/evolution-mail-message.xml.h:110
+#: ../ui/evolution-mail-message.xml.h:111
msgid "_Important"
msgstr "_Important"
-#: ../ui/evolution-mail-message.xml.h:111
+#: ../ui/evolution-mail-message.xml.h:112
+msgid "_Inline"
+msgstr "_Inline"
+
+#: ../ui/evolution-mail-message.xml.h:113
msgid "_Junk"
msgstr "_Junk"
-#: ../ui/evolution-mail-message.xml.h:112
+#: ../ui/evolution-mail-message.xml.h:114
msgid "_Load Images"
msgstr "_Load Images"
-#: ../ui/evolution-mail-message.xml.h:115
+#: ../ui/evolution-mail-message.xml.h:116
+msgid "_Message Source"
+msgstr "_Message Source"
+
+#: ../ui/evolution-mail-message.xml.h:118
msgid "_Next Message"
msgstr "_Next Message"
-#: ../ui/evolution-mail-message.xml.h:116
+#: ../ui/evolution-mail-message.xml.h:119
msgid "_Normal Size"
msgstr "_Normal Size"
-#: ../ui/evolution-mail-message.xml.h:117
+#: ../ui/evolution-mail-message.xml.h:120
msgid "_Not Junk"
msgstr "_Not Junk"
-#: ../ui/evolution-mail-message.xml.h:118
+#: ../ui/evolution-mail-message.xml.h:121
msgid "_Open in New Window"
msgstr "_Open in New Window"
-#: ../ui/evolution-mail-message.xml.h:119
+#: ../ui/evolution-mail-message.xml.h:122
msgid "_Previous Message"
msgstr "_Previous Message"
-#: ../ui/evolution-mail-message.xml.h:123
+#: ../ui/evolution-mail-message.xml.h:124
+msgid "_Quoted"
+msgstr "_Quoted"
+
+#: ../ui/evolution-mail-message.xml.h:127
msgid "_Save Message..."
msgstr "_Save Message..."
-#: ../ui/evolution-mail-message.xml.h:124
+#: ../ui/evolution-mail-message.xml.h:128
msgid "_Undelete Message"
msgstr "_Undelete Message"
-#: ../ui/evolution-mail-message.xml.h:125
+#: ../ui/evolution-mail-message.xml.h:129
msgid "_Unread"
msgstr "_Unread"
-#: ../ui/evolution-mail-message.xml.h:126
+#: ../ui/evolution-mail-message.xml.h:130
+msgid "_Zoom"
+msgstr "_Zoom"
+
+#: ../ui/evolution-mail-message.xml.h:131
msgid "_Zoom In"
msgstr "_Zoom In"
-#.
-#. <cmd name="FileSave" _label="Save"
-#. _tip="Save the current file" pixtype="stock" pixname="Save"
-#. accel="*Ctrl*s"/>
-#.
-#: ../ui/evolution-mail-messagedisplay.xml.h:1
-#: ../ui/evolution-message-composer.xml.h:4
-#: ../ui/evolution-signature-editor.xml.h:7
-msgid "Close"
-msgstr "Close"
-
#: ../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:16
+#: ../ui/evolution.xml.h:18
msgid "Main toolbar"
msgstr "Main toolbar"
-#: ../ui/evolution-mail-messagedisplay.xml.h:4
-#: ../ui/evolution-message-composer.xml.h:42
-#: ../ui/evolution-subscribe.xml.h:9
-msgid "_Close"
-msgstr "_Close"
+#: ../ui/evolution-memos.xml.h:3
+msgid "Copy selected memo"
+msgstr "Copy selected memo"
-#: ../ui/evolution-mail-messagedisplay.xml.h:6
-#: ../ui/evolution-message-composer.xml.h:45
-#: ../ui/evolution-signature-editor.xml.h:24
-#: ../ui/evolution-subscribe.xml.h:11
-#: ../ui/evolution.xml.h:36
-msgid "_File"
-msgstr "_File"
+#: ../ui/evolution-memos.xml.h:5
+msgid "Cut selected memo"
+msgstr "Cut selected memo"
-#: ../ui/evolution-message-composer.xml.h:1
-msgid "Attach"
-msgstr "Attach"
+#: ../ui/evolution-memos.xml.h:7
+msgid "Delete selected memos"
+msgstr "Delete selected memos"
+
+#: ../ui/evolution-memos.xml.h:9
+msgid "Paste memo from the clipboard"
+msgstr "Paste memo from the clipboard"
+
+#: ../ui/evolution-memos.xml.h:10
+msgid "Previews the list of memos to be printed"
+msgstr "Previews the list of memos to be printed"
+
+#: ../ui/evolution-memos.xml.h:13
+msgid "Print the list of memos"
+msgstr "Print the list of memos"
+
+#: ../ui/evolution-memos.xml.h:14
+msgid "View the selected memo"
+msgstr "View the selected memo"
+
+#: ../ui/evolution-memos.xml.h:18
+msgid "_Open Memo"
+msgstr "_Open Memo"
#: ../ui/evolution-message-composer.xml.h:2
msgid "Attach a file"
msgstr "Attach a file"
-#: ../ui/evolution-message-composer.xml.h:3
-msgid "Check to get delivery notification when your message is read"
-msgstr "Check to get delivery notification when your message is read"
-
-#.
-#. <cmd name="FileSave" _label="Save"
-#. _tip="Save the current file" pixtype="stock" pixname="Save"
-#. accel="*Ctrl*s"/>
-#.
-#: ../ui/evolution-message-composer.xml.h:5
-#: ../ui/evolution-signature-editor.xml.h:13
+#: ../ui/evolution-message-composer.xml.h:4
+#: ../ui/evolution-signature-editor.xml.h:3
msgid "Close the current file"
msgstr "Close the current file"
-#: ../ui/evolution-message-composer.xml.h:6
+#: ../ui/evolution-message-composer.xml.h:5
msgid "Delete all but signature"
msgstr "Delete all but signature"
-#: ../ui/evolution-message-composer.xml.h:7
+#: ../ui/evolution-message-composer.xml.h:6
msgid "Encrypt this message with PGP"
msgstr "Encrypt this message with PGP"
-#: ../ui/evolution-message-composer.xml.h:8
+#: ../ui/evolution-message-composer.xml.h:7
msgid "Encrypt this message with your S/MIME Encryption Certificate"
msgstr "Encrypt this message with your S/MIME Encryption Certificate"
-#: ../ui/evolution-message-composer.xml.h:9
-#: ../ui/evolution-signature-editor.xml.h:14
+#: ../ui/evolution-message-composer.xml.h:8
+#: ../ui/evolution-signature-editor.xml.h:4
msgid "For_mat"
msgstr "For_mat"
+#: ../ui/evolution-message-composer.xml.h:9
+msgid "Get delivery notification when your message is read"
+msgstr "Get delivery notification when your message is read"
+
#: ../ui/evolution-message-composer.xml.h:10
msgid "HT_ML"
msgstr "HT_ML"
-#: ../ui/evolution-message-composer.xml.h:12
+#: ../ui/evolution-message-composer.xml.h:13
msgid "Open a file"
msgstr "Open a file"
-#: ../ui/evolution-message-composer.xml.h:13
+#: ../ui/evolution-message-composer.xml.h:14
msgid "PGP Encrypt"
msgstr "PGP Encrypt"
-#: ../ui/evolution-message-composer.xml.h:14
+#: ../ui/evolution-message-composer.xml.h:15
msgid "PGP Sign"
msgstr "PGP Sign"
-#: ../ui/evolution-message-composer.xml.h:15
-msgid "Request read receipt"
-msgstr "Request read receipt"
-
#: ../ui/evolution-message-composer.xml.h:16
+msgid "R_equest Read Receipt"
+msgstr "R_equest Read Receipt"
+
+#: ../ui/evolution-message-composer.xml.h:17
msgid "S/MIME Encrypt"
msgstr "S/MIME Encrypt"
-#: ../ui/evolution-message-composer.xml.h:17
+#: ../ui/evolution-message-composer.xml.h:18
msgid "S/MIME Sign"
msgstr "S/MIME Sign"
-#: ../ui/evolution-message-composer.xml.h:19
+#: ../ui/evolution-message-composer.xml.h:20
msgid "Save As"
msgstr "Save As"
-#: ../ui/evolution-message-composer.xml.h:20
+#: ../ui/evolution-message-composer.xml.h:21
msgid "Save Draft"
msgstr "Save Draft"
-#: ../ui/evolution-message-composer.xml.h:21
+#: ../ui/evolution-message-composer.xml.h:22
msgid "Save _As..."
msgstr "Save _As..."
-#: ../ui/evolution-message-composer.xml.h:22
+#: ../ui/evolution-message-composer.xml.h:23
msgid "Save _Draft"
msgstr "Save _Draft"
-#: ../ui/evolution-message-composer.xml.h:23
+#: ../ui/evolution-message-composer.xml.h:24
msgid "Save as draft"
msgstr "Save as draft"
-#: ../ui/evolution-message-composer.xml.h:24
+#: ../ui/evolution-message-composer.xml.h:25
msgid "Save in folder..."
msgstr "Save in folder..."
-#: ../ui/evolution-message-composer.xml.h:25
+#: ../ui/evolution-message-composer.xml.h:26
+#: ../ui/evolution-signature-editor.xml.h:10
msgid "Save the current file"
msgstr "Save the current file"
-#: ../ui/evolution-message-composer.xml.h:26
+#: ../ui/evolution-message-composer.xml.h:27
msgid "Save the current file with a different name"
msgstr "Save the current file with a different name"
-#: ../ui/evolution-message-composer.xml.h:27
+#: ../ui/evolution-message-composer.xml.h:28
msgid "Save the message in a specified folder"
msgstr "Save the message in a specified folder"
#: ../ui/evolution-message-composer.xml.h:29
-#: ../ui/evolution-signature-editor.xml.h:22
+msgid "Send"
+msgstr "Send"
+
+#: ../ui/evolution-message-composer.xml.h:30
+#: ../ui/evolution-signature-editor.xml.h:12
msgid "Send the mail in HTML format"
msgstr "Send the mail in HTML format"
-#: ../ui/evolution-message-composer.xml.h:30
+#: ../ui/evolution-message-composer.xml.h:31
msgid "Send this message"
msgstr "Send this message"
-#: ../ui/evolution-message-composer.xml.h:31
+#: ../ui/evolution-message-composer.xml.h:32
+msgid "Set the message priority to high"
+msgstr "Set the message priority to high"
+
+#: ../ui/evolution-message-composer.xml.h:33
msgid "Sign this message with your PGP key"
msgstr "Sign this message with your PGP key"
-#: ../ui/evolution-message-composer.xml.h:32
+#: ../ui/evolution-message-composer.xml.h:34
msgid "Sign this message with your S/MIME Signature Certificate"
msgstr "Sign this message with your S/MIME Signature Certificate"
-#: ../ui/evolution-message-composer.xml.h:33
+#: ../ui/evolution-message-composer.xml.h:35
msgid "Toggles whether the BCC field is displayed"
msgstr "Toggles whether the BCC field is displayed"
-#: ../ui/evolution-message-composer.xml.h:34
+#: ../ui/evolution-message-composer.xml.h:36
msgid "Toggles whether the CC field is displayed"
msgstr "Toggles whether the CC field is displayed"
-#: ../ui/evolution-message-composer.xml.h:35
+#: ../ui/evolution-message-composer.xml.h:37
msgid "Toggles whether the From chooser is displayed"
msgstr "Toggles whether the From chooser is displayed"
-#: ../ui/evolution-message-composer.xml.h:36
+#: ../ui/evolution-message-composer.xml.h:38
msgid "Toggles whether the Post-To field is displayed"
msgstr "Toggles whether the Post-To field is displayed"
-#: ../ui/evolution-message-composer.xml.h:37
+#: ../ui/evolution-message-composer.xml.h:39
msgid "Toggles whether the Reply-To field is displayed"
msgstr "Toggles whether the Reply-To field is displayed"
-#: ../ui/evolution-message-composer.xml.h:38
+#: ../ui/evolution-message-composer.xml.h:40
msgid "Toggles whether the To field is displayed"
msgstr "Toggles whether the To field is displayed"
-#: ../ui/evolution-message-composer.xml.h:39
-msgid "_Attachment..."
-msgstr "_Attachment..."
-
-#: ../ui/evolution-message-composer.xml.h:40
+#: ../ui/evolution-message-composer.xml.h:42
msgid "_Bcc Field"
msgstr "_Bcc Field"
-#: ../ui/evolution-message-composer.xml.h:41
+#: ../ui/evolution-message-composer.xml.h:43
msgid "_Cc Field"
msgstr "_Cc Field"
-#: ../ui/evolution-message-composer.xml.h:43
+#: ../ui/evolution-message-composer.xml.h:45
msgid "_Delete all"
msgstr "_Delete all"
-#: ../ui/evolution-message-composer.xml.h:46
+#: ../ui/evolution-message-composer.xml.h:48
msgid "_From Field"
msgstr "_From Field"
-#: ../ui/evolution-message-composer.xml.h:47
-#: ../ui/evolution-signature-editor.xml.h:25
-msgid "_Insert"
-msgstr "_Insert"
-
-#: ../ui/evolution-message-composer.xml.h:48
+#: ../ui/evolution-message-composer.xml.h:49
msgid "_Open..."
msgstr "_Open..."
-#: ../ui/evolution-message-composer.xml.h:49
+#: ../ui/evolution-message-composer.xml.h:50
msgid "_Post-To Field"
msgstr "_Post-To Field"
-#: ../ui/evolution-message-composer.xml.h:50
+#: ../ui/evolution-message-composer.xml.h:51
+msgid "_Prioritize Message"
+msgstr "_Prioritise Message"
+
+#: ../ui/evolution-message-composer.xml.h:52
msgid "_Reply-To Field"
msgstr "_Reply-To Field"
-#: ../ui/evolution-message-composer.xml.h:52
+#: ../ui/evolution-message-composer.xml.h:54
msgid "_Security"
msgstr "_Security"
-#: ../ui/evolution-message-composer.xml.h:53
+#: ../ui/evolution-message-composer.xml.h:55
msgid "_To Field"
msgstr "_To Field"
@@ -18228,22 +19678,19 @@ msgstr "_To Field"
msgid "C_lose"
msgstr "C_lose"
-#: ../ui/evolution-signature-editor.xml.h:15
+#: ../ui/evolution-signature-editor.xml.h:5
msgid "H_TML"
msgstr "H_TML"
-#: ../ui/evolution-signature-editor.xml.h:16
+#: ../ui/evolution-signature-editor.xml.h:8
msgid "Save and Close"
msgstr "Save and Close"
-#.
-#. <menuitem name="FileSave" verb="" _label="_Save"/>
-#.
-#: ../ui/evolution-signature-editor.xml.h:20
+#: ../ui/evolution-signature-editor.xml.h:9
msgid "Save and _Close"
msgstr "Save and _Close"
-#: ../ui/evolution-signature-editor.xml.h:21
+#: ../ui/evolution-signature-editor.xml.h:11
msgid "Save the current file and close the window"
msgstr "Save the current file and close the window"
@@ -18275,13 +19722,33 @@ msgstr "Unsubscribe"
msgid "_Invert Selection"
msgstr "_Invert Selection"
+#: ../ui/evolution-task-editor.xml.h:4
+msgid "Click change / view the status details of the task"
+msgstr "Click change / view the status details of the task"
+
+#: ../ui/evolution-task-editor.xml.h:9
+msgid "Status Details"
+msgstr "Status Details"
+
+#: ../ui/evolution-task-editor.xml.h:10
+msgid "Time Zone"
+msgstr "Time Zone"
+
+#: ../ui/evolution-task-editor.xml.h:23
+msgid "_Send Options"
+msgstr "_Send Options"
+
+#: ../ui/evolution-task-editor.xml.h:24
+msgid "_Status Details"
+msgstr "_Status Details"
+
#: ../ui/evolution-tasks.xml.h:3
-msgid "Copy selected task"
-msgstr "Copy selected task"
+msgid "Copy selected tasks"
+msgstr "Copy selected tasks"
#: ../ui/evolution-tasks.xml.h:5
-msgid "Cut selected task"
-msgstr "Cut selected task"
+msgid "Cut selected tasks"
+msgstr "Cut selected tasks"
#: ../ui/evolution-tasks.xml.h:7
msgid "Delete completed tasks"
@@ -18300,8 +19767,8 @@ msgid "Mark selected tasks as complete"
msgstr "Mark selected tasks as complete"
#: ../ui/evolution-tasks.xml.h:12
-msgid "Paste task from the clipboard"
-msgstr "Paste task from the clipboard"
+msgid "Paste tasks from the clipboard"
+msgstr "Paste tasks from the clipboard"
#: ../ui/evolution-tasks.xml.h:13
msgid "Previews the list of tasks to be printed"
@@ -18312,10 +19779,18 @@ msgid "Print the list of tasks"
msgstr "Print the list of tasks"
#: ../ui/evolution-tasks.xml.h:18
+msgid "Show task preview window"
+msgstr "Show task preview window"
+
+#: ../ui/evolution-tasks.xml.h:19
+msgid "Task _Preview"
+msgstr "Task _Preview"
+
+#: ../ui/evolution-tasks.xml.h:20
msgid "View the selected task"
msgstr "View the selected task"
-#: ../ui/evolution-tasks.xml.h:25
+#: ../ui/evolution-tasks.xml.h:27
msgid "_Open Task"
msgstr "_Open Task"
@@ -18352,12 +19827,12 @@ msgid "Display window buttons with text only"
msgstr "Display window buttons with text only"
#: ../ui/evolution.xml.h:10
-msgid "Exit the program"
-msgstr "Exit the program"
+msgid "Evolution _FAQ"
+msgstr "Evolution _FAQ"
#: ../ui/evolution.xml.h:11
-msgid "Forget _Passwords"
-msgstr "Forget _Passwords"
+msgid "Exit the program"
+msgstr "Exit the program"
#: ../ui/evolution.xml.h:12
msgid "Forget remembered passwords so you will be prompted for them again"
@@ -18368,118 +19843,130 @@ msgid "Hide window buttons"
msgstr "Hide window buttons"
#: ../ui/evolution.xml.h:14
+msgid "I_mport..."
+msgstr "I_mport..."
+
+#: ../ui/evolution.xml.h:15
msgid "Icons _and text"
msgstr "Icons _and text"
-#: ../ui/evolution.xml.h:15
+#: ../ui/evolution.xml.h:16
msgid "Import data from other programs"
msgstr "Import data from other programs"
#: ../ui/evolution.xml.h:17
+msgid "Lay_out"
+msgstr "Lay_out"
+
+#: ../ui/evolution.xml.h:19
msgid "New _Window"
msgstr "New _Window"
-#: ../ui/evolution.xml.h:18
+#: ../ui/evolution.xml.h:20
msgid "Prefere_nces"
msgstr "Prefere_nces"
-#: ../ui/evolution.xml.h:19
+#: ../ui/evolution.xml.h:21
msgid "Send / Receive"
msgstr "Send / Receive"
-#: ../ui/evolution.xml.h:20
+#: ../ui/evolution.xml.h:22
+msgid "Send / _Receive"
+msgstr "Send / _Receive"
+
+#: ../ui/evolution.xml.h:23
msgid "Send queued items and retrieve new items"
msgstr "Send queued items and retrieve new items"
-#: ../ui/evolution.xml.h:21
+#: ../ui/evolution.xml.h:24
msgid "Set up Pilot configuration"
msgstr "Set up Pilot configuration"
-#: ../ui/evolution.xml.h:22
+#: ../ui/evolution.xml.h:25
+msgid "Show Side _Bar"
+msgstr "Show Side _Bar"
+
+#: ../ui/evolution.xml.h:26
+msgid "Show _Status Bar"
+msgstr "Show _Status Bar"
+
+#: ../ui/evolution.xml.h:27
+msgid "Show _Toolbar"
+msgstr "Show _Toolbar"
+
+#: ../ui/evolution.xml.h:28
msgid "Show information about Evolution"
msgstr "Show information about Evolution"
-#: ../ui/evolution.xml.h:23
+#: ../ui/evolution.xml.h:29
msgid "Submit Bug Report"
msgstr "Submit Bug Report"
-#. <menuitem name="HelpFAQ" verb=""
-#. _label="Evolution _FAQ"/>
-#.
-#. <separator/>
-#: ../ui/evolution.xml.h:28
+#: ../ui/evolution.xml.h:30
msgid "Submit _Bug Report"
msgstr "Submit _Bug Report"
-#: ../ui/evolution.xml.h:29
+#: ../ui/evolution.xml.h:31
msgid "Submit a bug report using Bug Buddy"
msgstr "Submit a bug report using Bug Buddy"
-#: ../ui/evolution.xml.h:30
+#: ../ui/evolution.xml.h:32
msgid "Toggle whether we are working offline."
msgstr "Toggle whether we are working offline."
-#: ../ui/evolution.xml.h:31
-msgid "Tool_bar"
-msgstr "Tool_bar"
-
-#: ../ui/evolution.xml.h:32
+#: ../ui/evolution.xml.h:33
msgid "Tool_bar style"
msgstr "Tool_bar style"
-#: ../ui/evolution.xml.h:33
-msgid "_About Evolution..."
-msgstr "_About Evolution..."
-
#: ../ui/evolution.xml.h:34
+msgid "View/Hide the Side Bar"
+msgstr "View/Hide the Side Bar"
+
+#: ../ui/evolution.xml.h:35
+msgid "View/Hide the Status Bar"
+msgstr "View/Hide the Status Bar"
+
+#: ../ui/evolution.xml.h:36
+msgid "_About"
+msgstr "_About"
+
+#: ../ui/evolution.xml.h:37
msgid "_Close Window"
msgstr "_Close Window"
-#: ../ui/evolution.xml.h:37
-msgid "_Help"
-msgstr "_Help"
+#: ../ui/evolution.xml.h:40
+msgid "_Forget Passwords"
+msgstr "_Forget Passwords"
-#: ../ui/evolution.xml.h:38
+#: ../ui/evolution.xml.h:42
msgid "_Hide buttons"
msgstr "_Hide buttons"
-#: ../ui/evolution.xml.h:39
+#: ../ui/evolution.xml.h:43
msgid "_Icons only"
msgstr "_Icons only"
-#: ../ui/evolution.xml.h:40
-msgid "_Import..."
-msgstr "_Import..."
-
-#: ../ui/evolution.xml.h:41
-msgid "_New"
-msgstr "_New"
-
-#: ../ui/evolution.xml.h:42
+#: ../ui/evolution.xml.h:45
msgid "_Quick Reference"
msgstr "_Quick Reference"
-#: ../ui/evolution.xml.h:43
+#: ../ui/evolution.xml.h:46
msgid "_Quit"
msgstr "_Quit"
-#: ../ui/evolution.xml.h:44
-msgid "_Send / Receive"
-msgstr "_Send / Receive"
-
-#: ../ui/evolution.xml.h:45
+#: ../ui/evolution.xml.h:47
msgid "_Switcher Appearance"
msgstr "_Switcher Appearance"
-#: ../ui/evolution.xml.h:46
+#: ../ui/evolution.xml.h:48
msgid "_Synchronization Options..."
msgstr "_Synchronization Options..."
-#: ../ui/evolution.xml.h:47
+#: ../ui/evolution.xml.h:49
msgid "_Text only"
msgstr "_Text only"
-#: ../ui/evolution.xml.h:49
+#: ../ui/evolution.xml.h:51
msgid "_Window"
msgstr "_Window"
@@ -18516,29 +20003,41 @@ 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:2
+#: ../views/mail/galview.xml.h:3
msgid "By S_tatus"
msgstr "By S_tatus"
-#: ../views/mail/galview.xml.h:3
+#: ../views/mail/galview.xml.h:4
msgid "By Se_nder"
msgstr "By Se_nder"
-#: ../views/mail/galview.xml.h:4
+#: ../views/mail/galview.xml.h:5
msgid "By Su_bject"
msgstr "By Su_bject"
-#: ../views/mail/galview.xml.h:5
+#: ../views/mail/galview.xml.h:6
msgid "By _Follow Up Flag"
msgstr "By _Follow Up Flag"
-#: ../views/mail/galview.xml.h:6
+#: ../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"
@@ -18547,28 +20046,32 @@ msgstr "With _Due Date"
msgid "With _Status"
msgstr "With _Status"
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:195
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:637
+#. Put the ""UTC" entry at the top of the combo's list.
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:211
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:402
+#: ../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:757
msgid "UTC"
msgstr "UTC"
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:2
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
msgid "<b>Time Zones</b>"
msgstr "<b>Time Zones</b>"
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:3
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:2
msgid "<b>_Selection</b>"
msgstr "<b>_Selection</b>"
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:5
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:4
msgid "Select a Time Zone"
msgstr "Select a Time Zone"
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:6
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:5
msgid "TimeZone Combobox"
msgstr "TimeZone Combobox"
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:7
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:6
msgid ""
"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."
@@ -18602,9 +20105,9 @@ msgid "_Edit..."
msgstr "_Edit..."
#: ../widgets/menus/gal-view-factory-etable.c:39
-#: ../widgets/table/e-table-header-item.c:1845
-#: ../widgets/table/e-table-scrolled.c:224
-#: ../widgets/table/e-table-scrolled.c:225
+#: ../widgets/table/e-table-header-item.c:1927
+#: ../widgets/table/e-table-scrolled.c:222
+#: ../widgets/table/e-table-scrolled.c:223
msgid "Table"
msgstr "Table"
@@ -18616,17 +20119,32 @@ msgstr "Instance"
msgid "Save Current View"
msgstr "Save Current View"
-#: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:3
+#: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:1
msgid "_Create new view"
msgstr "_Create new view"
-#: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:5
+#: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:3
msgid "_Replace existing view"
msgstr "_Replace existing view"
+#. bonobo displays this string so it must be in locale
+#: ../widgets/menus/gal-view-instance.c:587
+#: ../widgets/menus/gal-view-menus.c:350
+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:372
+msgid "Define Views..."
+msgstr "Define Views..."
+
#: ../widgets/menus/gal-view-menus.c:291
-msgid "_Current View"
-msgstr "_Current View"
+msgid "C_urrent View"
+msgstr "C_urrent View"
#: ../widgets/menus/gal-view-menus.c:359
msgid "Save Custom View..."
@@ -18640,119 +20158,118 @@ msgstr "Factory"
msgid "Define New View"
msgstr "Define New View"
-#: ../widgets/menus/gal-view-new-dialog.glade.h:2
+#: ../widgets/menus/gal-view-new-dialog.glade.h:1
msgid "Name of new view:"
msgstr "Name of new view:"
-#: ../widgets/menus/gal-view-new-dialog.glade.h:3
+#: ../widgets/menus/gal-view-new-dialog.glade.h:2
msgid "Type of View"
msgstr "Type of View"
-#: ../widgets/menus/gal-view-new-dialog.glade.h:4
+#: ../widgets/menus/gal-view-new-dialog.glade.h:3
msgid "Type of view:"
msgstr "Type of view:"
+#: ../widgets/misc/e-attachment.glade.h:5
+msgid "Suggest automatic display of attachment"
+msgstr "Suggest automatic display of attachment"
+
#. Translators: These are the first characters of each day of the
#. week, 'M' for 'Monday', 'T' for Tuesday etc.
-#: ../widgets/misc/e-calendar-item.c:415
+#: ../widgets/misc/e-calendar-item.c:416
msgid "MTWTFSS"
msgstr "MTWTFSS"
#. This is a strftime() format. %B = Month name, %Y = Year.
-#: ../widgets/misc/e-calendar-item.c:1097
+#: ../widgets/misc/e-calendar-item.c:1093
+#: ../widgets/misc/e-calendar-item.c:1747
msgid "%B %Y"
msgstr "%B %Y"
-#: ../widgets/misc/e-calendar.c:177
-#: ../widgets/misc/e-calendar.c:201
-msgid "Previous Button"
-msgstr "Previous Button"
-
#: ../widgets/misc/e-calendar.c:226
msgid "Month Calendar"
msgstr "Month Calendar"
-#: ../widgets/misc/e-canvas-background.c:456
#: ../widgets/misc/e-canvas-background.c:457
+#: ../widgets/misc/e-canvas-background.c:458
#: ../widgets/text/e-entry.c:1284
#: ../widgets/text/e-entry.c:1285
-#: ../widgets/text/e-text.c:3540
-#: ../widgets/text/e-text.c:3541
+#: ../widgets/text/e-text.c:3581
+#: ../widgets/text/e-text.c:3582
msgid "Fill color"
msgstr "Fill colour"
-#: ../widgets/misc/e-canvas-background.c:463
#: ../widgets/misc/e-canvas-background.c:464
-#: ../widgets/misc/e-canvas-background.c:470
+#: ../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:1291
#: ../widgets/text/e-entry.c:1292
#: ../widgets/text/e-entry.c:1298
#: ../widgets/text/e-entry.c:1299
-#: ../widgets/text/e-text.c:3547
-#: ../widgets/text/e-text.c:3548
-#: ../widgets/text/e-text.c:3555
-#: ../widgets/text/e-text.c:3556
+#: ../widgets/text/e-text.c:3588
+#: ../widgets/text/e-text.c:3589
+#: ../widgets/text/e-text.c:3596
+#: ../widgets/text/e-text.c:3597
msgid "GDK fill color"
msgstr "GDK fill colour"
-#: ../widgets/misc/e-canvas-background.c:477
#: ../widgets/misc/e-canvas-background.c:478
+#: ../widgets/misc/e-canvas-background.c:479
#: ../widgets/text/e-entry.c:1305
#: ../widgets/text/e-entry.c:1306
-#: ../widgets/text/e-text.c:3562
-#: ../widgets/text/e-text.c:3563
+#: ../widgets/text/e-text.c:3603
+#: ../widgets/text/e-text.c:3604
msgid "Fill stipple"
msgstr "Fill stipple"
-#: ../widgets/misc/e-canvas-background.c:484
#: ../widgets/misc/e-canvas-background.c:485
+#: ../widgets/misc/e-canvas-background.c:486
msgid "X1"
msgstr "X1"
-#: ../widgets/misc/e-canvas-background.c:491
#: ../widgets/misc/e-canvas-background.c:492
+#: ../widgets/misc/e-canvas-background.c:493
msgid "X2"
msgstr "X2"
-#: ../widgets/misc/e-canvas-background.c:498
#: ../widgets/misc/e-canvas-background.c:499
+#: ../widgets/misc/e-canvas-background.c:500
msgid "Y1"
msgstr "Y1"
-#: ../widgets/misc/e-canvas-background.c:505
#: ../widgets/misc/e-canvas-background.c:506
+#: ../widgets/misc/e-canvas-background.c:507
msgid "Y2"
msgstr "Y2"
#: ../widgets/misc/e-canvas-vbox.c:102
-#: ../widgets/misc/e-reflow.c:1430
-#: ../widgets/table/e-table-group-container.c:978
+#: ../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:3005
+#: ../widgets/table/e-table-item.c:3015
msgid "Minimum width"
msgstr "Minimum width"
#: ../widgets/misc/e-canvas-vbox.c:103
-#: ../widgets/misc/e-reflow.c:1431
-#: ../widgets/table/e-table-group-container.c:979
+#: ../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:3006
+#: ../widgets/table/e-table-item.c:3016
msgid "Minimum Width"
msgstr "Minimum Width"
#: ../widgets/misc/e-canvas-vbox.c:114
#: ../widgets/misc/e-canvas-vbox.c:115
-#: ../widgets/misc/e-expander.c:205
+#: ../widgets/misc/e-expander.c:206
msgid "Spacing"
msgstr "Spacing"
-#: ../widgets/misc/e-cell-date-edit.c:232
-#: ../widgets/misc/e-dateedit.c:451
+#: ../widgets/misc/e-cell-date-edit.c:233
msgid "Now"
msgstr "Now"
-#: ../widgets/misc/e-cell-date-edit.c:801
+#: ../widgets/misc/e-cell-date-edit.c:793
#, c-format
msgid "The time must be in the format: %s"
msgstr "The time must be in the format: %s"
@@ -18761,212 +20278,253 @@ 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:63
+#: ../widgets/misc/e-charset-picker.c:64
msgid "Baltic"
msgstr "Baltic"
-#: ../widgets/misc/e-charset-picker.c:64
+#: ../widgets/misc/e-charset-picker.c:65
msgid "Central European"
msgstr "Central European"
-#: ../widgets/misc/e-charset-picker.c:65
+#: ../widgets/misc/e-charset-picker.c:66
msgid "Chinese"
msgstr "Chinese"
-#: ../widgets/misc/e-charset-picker.c:66
+#: ../widgets/misc/e-charset-picker.c:67
msgid "Cyrillic"
msgstr "Cyrillic"
-#: ../widgets/misc/e-charset-picker.c:67
+#: ../widgets/misc/e-charset-picker.c:68
msgid "Greek"
msgstr "Greek"
-#: ../widgets/misc/e-charset-picker.c:68
+#: ../widgets/misc/e-charset-picker.c:69
msgid "Hebrew"
msgstr "Hebrew"
-#: ../widgets/misc/e-charset-picker.c:69
+#: ../widgets/misc/e-charset-picker.c:70
msgid "Japanese"
msgstr "Japanese"
-#: ../widgets/misc/e-charset-picker.c:70
+#: ../widgets/misc/e-charset-picker.c:71
msgid "Korean"
msgstr "Korean"
-#: ../widgets/misc/e-charset-picker.c:71
+#: ../widgets/misc/e-charset-picker.c:72
+msgid "Thai"
+msgstr "Thai"
+
+#: ../widgets/misc/e-charset-picker.c:73
msgid "Turkish"
msgstr "Turkish"
-#: ../widgets/misc/e-charset-picker.c:72
+#: ../widgets/misc/e-charset-picker.c:74
msgid "Unicode"
msgstr "Unicode"
-#: ../widgets/misc/e-charset-picker.c:73
+#: ../widgets/misc/e-charset-picker.c:75
msgid "Western European"
msgstr "Western European"
-#: ../widgets/misc/e-charset-picker.c:74
+#: ../widgets/misc/e-charset-picker.c:76
msgid "Western European, New"
msgstr "Western European, New"
-#: ../widgets/misc/e-charset-picker.c:91
-#: ../widgets/misc/e-charset-picker.c:92
#: ../widgets/misc/e-charset-picker.c:93
+#: ../widgets/misc/e-charset-picker.c:94
+#: ../widgets/misc/e-charset-picker.c:95
msgid "Traditional"
msgstr "Traditional"
-#: ../widgets/misc/e-charset-picker.c:94
-#: ../widgets/misc/e-charset-picker.c:95
#: ../widgets/misc/e-charset-picker.c:96
#: ../widgets/misc/e-charset-picker.c:97
+#: ../widgets/misc/e-charset-picker.c:98
+#: ../widgets/misc/e-charset-picker.c:99
msgid "Simplified"
msgstr "Simplified"
-#: ../widgets/misc/e-charset-picker.c:100
+#: ../widgets/misc/e-charset-picker.c:102
msgid "Ukrainian"
msgstr "Ukrainian"
-#: ../widgets/misc/e-charset-picker.c:103
+#: ../widgets/misc/e-charset-picker.c:105
msgid "Visual"
msgstr "Visual"
-#: ../widgets/misc/e-charset-picker.c:171
+#: ../widgets/misc/e-charset-picker.c:174
#, c-format
msgid "Unknown character set: %s"
msgstr "Unknown character set: %s"
-#: ../widgets/misc/e-charset-picker.c:216
-#: ../widgets/misc/e-charset-picker.c:479
+#: ../widgets/misc/e-charset-picker.c:219
msgid "Character Encoding"
msgstr "Character Encoding"
-#: ../widgets/misc/e-charset-picker.c:231
+#: ../widgets/misc/e-charset-picker.c:234
msgid "Enter the character set to use"
msgstr "Enter the character set to use"
-#: ../widgets/misc/e-charset-picker.c:338
+#: ../widgets/misc/e-charset-picker.c:341
msgid "Other..."
msgstr "Other..."
+#: ../widgets/misc/e-charset-picker.c:482
+msgid "Ch_aracter Encoding"
+msgstr "Ch_aracter Encoding"
+
#: ../widgets/misc/e-clipped-label.c:111
msgid "..."
msgstr "..."
-#: ../widgets/misc/e-dateedit.c:316
-msgid "Date and Time Entry"
-msgstr "Date and Time Entry"
+#: ../widgets/misc/e-dateedit.c:321
+msgid "Date and Time"
+msgstr "Date and Time"
-#: ../widgets/misc/e-dateedit.c:335
+#: ../widgets/misc/e-dateedit.c:340
msgid "Text entry to input date"
msgstr "Text entry to input date"
-#: ../widgets/misc/e-dateedit.c:336
-msgid "Text Date Entry"
-msgstr "Text Date Entry"
-
-#: ../widgets/misc/e-dateedit.c:353
+#: ../widgets/misc/e-dateedit.c:362
msgid "Click this button to show a calendar"
msgstr "Click this button to show a calendar"
-#: ../widgets/misc/e-dateedit.c:354
-msgid "Date Button"
-msgstr "Date Button"
-
-#: ../widgets/misc/e-dateedit.c:374
+#: ../widgets/misc/e-dateedit.c:384
msgid "Combo box to select time"
msgstr "Combo box to select time"
-#: ../widgets/misc/e-dateedit.c:375
-msgid "Time Combo Box"
-msgstr "Time Combo Box"
+#: ../widgets/misc/e-dateedit.c:385
+msgid "Time"
+msgstr "Time"
+
+#: ../widgets/misc/e-dateedit.c:461
+msgid "No_w"
+msgstr "No_w"
+
+#: ../widgets/misc/e-dateedit.c:467
+msgid "_Today"
+msgstr "_Today"
+
+#. This is a strftime() format. %H = hour (0-23), %M = minute.
+#: ../widgets/misc/e-dateedit.c:1438
+#: ../widgets/misc/e-dateedit.c:1765
+msgid "%H:%M"
+msgstr "%H:%M"
-#: ../widgets/misc/e-expander.c:181
+#. This is a strftime() format. %I = hour (1-12), %M = minute, %p = am/pm string.
+#: ../widgets/misc/e-dateedit.c:1441
+#: ../widgets/misc/e-dateedit.c:1768
+msgid "%I:%M %p"
+msgstr "%I:%M %p"
+
+#: ../widgets/misc/e-expander.c:182
msgid "Expanded"
msgstr "Expanded"
-#: ../widgets/misc/e-expander.c:182
+#: ../widgets/misc/e-expander.c:183
msgid "Whether or not the expander is expanded"
msgstr "Whether or not the expander is expanded"
-#: ../widgets/misc/e-expander.c:190
+#: ../widgets/misc/e-expander.c:191
msgid "Text of the expander's label"
msgstr "Text of the expander's label"
-#: ../widgets/misc/e-expander.c:197
+#: ../widgets/misc/e-expander.c:198
msgid "Use underline"
msgstr "Use underline"
-#: ../widgets/misc/e-expander.c:198
+#: ../widgets/misc/e-expander.c:199
msgid "If set, an underline in the text indicates the next character should be used for the mnemonic accelerator key"
msgstr "If set, an underline in the text indicates the next character should be used for the mnemonic accelerator key"
-#: ../widgets/misc/e-expander.c:206
+#: ../widgets/misc/e-expander.c:207
msgid "Space to put between the label and the child"
msgstr "Space to put between the label and the child"
-#: ../widgets/misc/e-expander.c:215
+#: ../widgets/misc/e-expander.c:216
msgid "Label widget"
msgstr "Label widget"
-#: ../widgets/misc/e-expander.c:216
+#: ../widgets/misc/e-expander.c:217
msgid "A widget to display in place of the usual expander label"
msgstr "A widget to display in place of the usual expander label"
-#: ../widgets/misc/e-expander.c:222
-#: ../widgets/table/e-tree.c:3318
+#: ../widgets/misc/e-expander.c:223
+#: ../widgets/table/e-tree.c:3312
msgid "Expander Size"
msgstr "Expander Size"
-#: ../widgets/misc/e-expander.c:223
-#: ../widgets/table/e-tree.c:3319
+#: ../widgets/misc/e-expander.c:224
+#: ../widgets/table/e-tree.c:3313
msgid "Size of the expander arrow"
msgstr "Size of the expander arrow"
-#: ../widgets/misc/e-expander.c:231
+#: ../widgets/misc/e-expander.c:232
msgid "Indicator Spacing"
msgstr "Indicator Spacing"
-#: ../widgets/misc/e-expander.c:232
+#: ../widgets/misc/e-expander.c:233
msgid "Spacing around expander arrow"
msgstr "Spacing around expander arrow"
-#: ../widgets/misc/e-filter-bar.c:195
-msgid "_Searches"
-msgstr "_Searches"
-
-#: ../widgets/misc/e-filter-bar.c:197
-msgid "Search Editor"
-msgstr "Search Editor"
+#. FIXME: get the toplevel window...
+#: ../widgets/misc/e-filter-bar.c:129
+#: ../widgets/misc/e-filter-bar.c:168
+msgid "Advanced Search"
+msgstr "Advanced Search"
#. FIXME: get the toplevel window...
-#: ../widgets/misc/e-filter-bar.c:220
+#: ../widgets/misc/e-filter-bar.c:216
msgid "Save Search"
msgstr "Save Search"
-#: ../widgets/misc/e-filter-bar.h:92
-#: ../widgets/misc/e-filter-bar.h:99
+#: ../widgets/misc/e-filter-bar.c:249
+msgid "_Searches"
+msgstr "_Searches"
+
+#: ../widgets/misc/e-filter-bar.c:251
+msgid "Searches"
+msgstr "Searches"
+
+#: ../widgets/misc/e-filter-bar.h:100
+#: ../widgets/misc/e-filter-bar.h:111
msgid "_Save Search..."
msgstr "_Save Search..."
-#: ../widgets/misc/e-filter-bar.h:93
-#: ../widgets/misc/e-filter-bar.h:100
+#: ../widgets/misc/e-filter-bar.h:101
+#: ../widgets/misc/e-filter-bar.h:112
msgid "_Edit Saved Searches..."
msgstr "_Edit Saved Searches..."
-#: ../widgets/misc/e-filter-bar.h:94
-#: ../widgets/misc/e-filter-bar.h:101
+#: ../widgets/misc/e-filter-bar.h:102
+#: ../widgets/misc/e-filter-bar.h:113
msgid "_Advanced Search..."
msgstr "_Advanced Search..."
+#: ../widgets/misc/e-filter-bar.h:103
+msgid "All Accounts"
+msgstr "All Accounts"
+
+#: ../widgets/misc/e-filter-bar.h:104
+msgid "Current Account"
+msgstr "Current Account"
+
+#: ../widgets/misc/e-filter-bar.h:105
+msgid "Current Folder"
+msgstr "Current Folder"
+
+#: ../widgets/misc/e-filter-bar.h:106
+msgid "Current Message"
+msgstr "Current Message"
+
#: ../widgets/misc/e-image-chooser.c:172
msgid "Choose Image"
msgstr "Choose Image"
-#: ../widgets/misc/e-map.c:647
+#: ../widgets/misc/e-map.c:629
msgid "World Map"
msgstr "World Map"
-#: ../widgets/misc/e-map.c:649
+#: ../widgets/misc/e-map.c:631
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."
@@ -18982,70 +20540,69 @@ 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:1453
msgid "Empty message"
msgstr "Empty message"
+#: ../widgets/misc/e-reflow.c:1458
#: ../widgets/misc/e-reflow.c:1459
-#: ../widgets/misc/e-reflow.c:1460
msgid "Reflow model"
msgstr "Reflow model"
+#: ../widgets/misc/e-reflow.c:1465
#: ../widgets/misc/e-reflow.c:1466
-#: ../widgets/misc/e-reflow.c:1467
msgid "Column width"
msgstr "Column width"
-#. To translators: This is the accessibility name of
-#. the search bar's text entry widget
-#: ../widgets/misc/e-search-bar.c:345
-msgid "Search Text Entry"
-msgstr "Search Text Entry"
-
-#: ../widgets/misc/e-search-bar.c:549
+#: ../widgets/misc/e-search-bar.c:573
msgid "_Search"
msgstr "_Search"
-#: ../widgets/misc/e-search-bar.c:555
+#: ../widgets/misc/e-search-bar.c:579
msgid "_Find Now"
msgstr "_Find Now"
-#: ../widgets/misc/e-search-bar.c:556
-#: ../widgets/misc/e-search-bar.c:943
+#: ../widgets/misc/e-search-bar.c:580
msgid "_Clear"
msgstr "_Clear"
-#: ../widgets/misc/e-search-bar.c:647
-msgid "Search Type"
-msgstr "Search Type"
-
-#: ../widgets/misc/e-search-bar.c:851
+#: ../widgets/misc/e-search-bar.c:831
msgid "Item ID"
msgstr "Item ID"
-#: ../widgets/misc/e-search-bar.c:858
-msgid "Subitem ID"
-msgstr "Subitem ID"
-
-#: ../widgets/misc/e-search-bar.c:865
+#: ../widgets/misc/e-search-bar.c:838
#: ../widgets/text/e-entry.c:1249
#: ../widgets/text/e-entry.c:1250
-#: ../widgets/text/e-text.c:3462
-#: ../widgets/text/e-text.c:3463
+#: ../widgets/text/e-text.c:3503
+#: ../widgets/text/e-text.c:3504
msgid "Text"
msgstr "Text"
-#: ../widgets/misc/e-search-bar.c:945
-msgid "Find _Now"
-msgstr "Find _Now"
-
-#: ../widgets/misc/e-selection-model-array.c:546
+#. 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:971
+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:988
+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:1000
+msgid " i_n "
+msgstr " i_n "
+
+#: ../widgets/misc/e-selection-model-array.c:547
#: ../widgets/table/e-tree-selection-model.c:811
msgid "Cursor Row"
msgstr "Cursor Row"
-#: ../widgets/misc/e-selection-model-array.c:553
+#: ../widgets/misc/e-selection-model-array.c:554
#: ../widgets/table/e-tree-selection-model.c:818
msgid "Cursor Column"
msgstr "Cursor Column"
@@ -19062,7 +20619,7 @@ msgstr "Selection Mode"
msgid "Cursor Mode"
msgstr "Cursor Mode"
-#: ../widgets/misc/e-send-options.c:521
+#: ../widgets/misc/e-send-options.c:522
msgid "When de_leted:"
msgstr "When de_leted:"
@@ -19087,8 +20644,8 @@ msgid "A_uto-delete sent item"
msgstr "A_uto-delete sent item"
#: ../widgets/misc/e-send-options.glade.h:6
-msgid "C_lassification"
-msgstr "C_lassification"
+msgid "Classification"
+msgstr "Classification"
#: ../widgets/misc/e-send-options.glade.h:7
msgid "Creat_e a sent item to track information"
@@ -19112,23 +20669,29 @@ msgstr ""
#: ../widgets/misc/e-send-options.glade.h:12
msgid ""
-"Public\n"
-"Private\n"
+"Normal\n"
+"Proprietary\n"
"Confidential\n"
+"Secret\n"
+"Top Secret\n"
+"For Your Eyes Only"
msgstr ""
-"Public\n"
-"Private\n"
+"Normal\n"
+"Proprietary\n"
"Confidential\n"
+"Secret\n"
+"Top Secret\n"
+"For Your Eyes Only"
-#: ../widgets/misc/e-send-options.glade.h:16
+#: ../widgets/misc/e-send-options.glade.h:18
msgid "R_eply requested"
msgstr "R_eply requested"
-#: ../widgets/misc/e-send-options.glade.h:18
+#: ../widgets/misc/e-send-options.glade.h:20
msgid "Sta_tus Tracking"
msgstr "Sta_tus Tracking"
-#: ../widgets/misc/e-send-options.glade.h:19
+#: ../widgets/misc/e-send-options.glade.h:21
msgid ""
"Undefined\n"
"High\n"
@@ -19140,51 +20703,51 @@ msgstr ""
"Standard\n"
"Low"
-#: ../widgets/misc/e-send-options.glade.h:23
-msgid "W_ithin"
-msgstr "W_ithin"
-
-#: ../widgets/misc/e-send-options.glade.h:24
+#: ../widgets/misc/e-send-options.glade.h:25
msgid "When acce_pted:"
msgstr "When acce_pted:"
-#: ../widgets/misc/e-send-options.glade.h:25
+#: ../widgets/misc/e-send-options.glade.h:26
msgid "When co_mpleted:"
msgstr "When co_mpleted:"
-#: ../widgets/misc/e-send-options.glade.h:26
+#: ../widgets/misc/e-send-options.glade.h:27
msgid "When decli_ned:"
msgstr "When decli_ned:"
-#: ../widgets/misc/e-send-options.glade.h:27
+#: ../widgets/misc/e-send-options.glade.h:28
+msgid "Wi_thin"
+msgstr "Wi_thin"
+
+#: ../widgets/misc/e-send-options.glade.h:29
msgid "_After:"
msgstr "_After:"
-#: ../widgets/misc/e-send-options.glade.h:28
+#: ../widgets/misc/e-send-options.glade.h:30
msgid "_All information"
msgstr "_All information"
-#: ../widgets/misc/e-send-options.glade.h:29
+#: ../widgets/misc/e-send-options.glade.h:31
msgid "_Delay message delivery"
msgstr "_Delay message delivery"
-#: ../widgets/misc/e-send-options.glade.h:30
+#: ../widgets/misc/e-send-options.glade.h:32
msgid "_Delivered"
msgstr "_Delivered"
-#: ../widgets/misc/e-send-options.glade.h:32
+#: ../widgets/misc/e-send-options.glade.h:34
msgid "_Set expiration date"
msgstr "_Set expiration date"
-#: ../widgets/misc/e-send-options.glade.h:33
+#: ../widgets/misc/e-send-options.glade.h:35
msgid "_Until:"
msgstr "_Until:"
-#: ../widgets/misc/e-send-options.glade.h:34
+#: ../widgets/misc/e-send-options.glade.h:36
msgid "_When convenient"
msgstr "_When convenient"
-#: ../widgets/misc/e-send-options.glade.h:35
+#: ../widgets/misc/e-send-options.glade.h:37
msgid "_When opened:"
msgstr "_When opened:"
@@ -19199,22 +20762,22 @@ msgid "%s (%d%% complete)"
msgstr "%s (%d%% complete)"
#: ../widgets/misc/e-url-entry.c:107
-msgid "click here to go to url"
-msgstr "click here to go to url"
+msgid "Click here to go to URL"
+msgstr "Click here to go to URL"
-#: ../widgets/misc/gal-categories.glade.h:2
+#: ../widgets/misc/gal-categories.glade.h:1
msgid "Edit Master Category List..."
msgstr "Edit Master Category List..."
-#: ../widgets/misc/gal-categories.glade.h:3
+#: ../widgets/misc/gal-categories.glade.h:2
msgid "Item(s) belong to these _categories:"
msgstr "Item(s) belong to these _categories:"
-#: ../widgets/misc/gal-categories.glade.h:4
+#: ../widgets/misc/gal-categories.glade.h:3
msgid "_Available Categories:"
msgstr "_Available Categories:"
-#: ../widgets/misc/gal-categories.glade.h:5
+#: ../widgets/misc/gal-categories.glade.h:4
msgid "categories"
msgstr "categories"
@@ -19238,23 +20801,23 @@ msgstr "Focused Column"
msgid "Unselected Column"
msgstr "Unselected Column"
-#: ../widgets/table/e-cell-text.c:1740
+#: ../widgets/table/e-cell-text.c:1793
msgid "Strikeout Column"
msgstr "Strikeout Column"
-#: ../widgets/table/e-cell-text.c:1747
+#: ../widgets/table/e-cell-text.c:1800
msgid "Underline Column"
msgstr "Underline Column"
-#: ../widgets/table/e-cell-text.c:1754
+#: ../widgets/table/e-cell-text.c:1807
msgid "Bold Column"
msgstr "Bold Column"
-#: ../widgets/table/e-cell-text.c:1761
+#: ../widgets/table/e-cell-text.c:1814
msgid "Color Column"
msgstr "Colour Column"
-#: ../widgets/table/e-cell-text.c:1775
+#: ../widgets/table/e-cell-text.c:1828
msgid "BG Color Column"
msgstr "BG Colour Column"
@@ -19269,6 +20832,7 @@ msgstr "A_vailable Fields:"
#: ../widgets/table/e-table-config-no-group.glade.h:3
#: ../widgets/table/e-table-config.glade.h:2
+#: ../widgets/table/e-table-header-item.c:1593
msgid "Ascending"
msgstr "Ascending"
@@ -19279,6 +20843,7 @@ msgstr "Clear All"
#: ../widgets/table/e-table-config-no-group.glade.h:5
#: ../widgets/table/e-table-config.glade.h:4
+#: ../widgets/table/e-table-header-item.c:1593
msgid "Descending"
msgstr "Descending"
@@ -19376,16 +20941,16 @@ msgid "_Show these fields in order:"
msgstr "_Show these fields in order:"
#: ../widgets/table/e-table-field-chooser-dialog.c:77
-#: ../widgets/table/e-table-field-chooser-item.c:646
-#: ../widgets/table/e-table-field-chooser.c:79
-#: ../widgets/table/e-table-header-item.c:1810
+#: ../widgets/table/e-table-field-chooser-item.c:635
+#: ../widgets/table/e-table-field-chooser.c:77
+#: ../widgets/table/e-table-header-item.c:1892
msgid "DnD code"
msgstr "DnD code"
#: ../widgets/table/e-table-field-chooser-dialog.c:84
-#: ../widgets/table/e-table-field-chooser-item.c:653
-#: ../widgets/table/e-table-field-chooser.c:86
-#: ../widgets/table/e-table-header-item.c:1824
+#: ../widgets/table/e-table-field-chooser-item.c:642
+#: ../widgets/table/e-table-field-chooser.c:84
+#: ../widgets/table/e-table-header-item.c:1906
msgid "Full Header"
msgstr "Full Header"
@@ -19405,220 +20970,215 @@ msgstr ""
"To add a column to your table, drag it into\n"
"the location in which you want it to appear."
-#: ../widgets/table/e-table-group-container.c:350
+#: ../widgets/table/e-table-group-container.c:345
#, c-format
msgid "%s : %s (%d item)"
-msgstr "%s : %s (%d item)"
+msgid_plural "%s : %s (%d items)"
+msgstr[0] "%s : %s (%d item)"
+msgstr[1] "%s : %s (%d items)"
#: ../widgets/table/e-table-group-container.c:351
#, c-format
-msgid "%s : %s (%d items)"
-msgstr "%s : %s (%d items)"
-
-#: ../widgets/table/e-table-group-container.c:356
-#, c-format
msgid "%s (%d item)"
-msgstr "%s (%d item)"
-
-#: ../widgets/table/e-table-group-container.c:357
-#, c-format
-msgid "%s (%d items)"
-msgstr "%s (%d items)"
+msgid_plural "%s (%d items)"
+msgstr[0] "%s (%d item)"
+msgstr[1] "%s (%d items)"
-#: ../widgets/table/e-table-group-container.c:901
-#: ../widgets/table/e-table-group-container.c:902
+#: ../widgets/table/e-table-group-container.c:897
+#: ../widgets/table/e-table-group-container.c:898
#: ../widgets/table/e-table-group-leaf.c:573
#: ../widgets/table/e-table-group-leaf.c:574
-#: ../widgets/table/e-table-item.c:2963
-#: ../widgets/table/e-table-item.c:2964
+#: ../widgets/table/e-table-item.c:2973
+#: ../widgets/table/e-table-item.c:2974
msgid "Alternating Row Colors"
msgstr "Alternating Row Colours"
-#: ../widgets/table/e-table-group-container.c:908
-#: ../widgets/table/e-table-group-container.c:909
+#: ../widgets/table/e-table-group-container.c:904
+#: ../widgets/table/e-table-group-container.c:905
#: ../widgets/table/e-table-group-leaf.c:580
#: ../widgets/table/e-table-group-leaf.c:581
-#: ../widgets/table/e-table-item.c:2970
-#: ../widgets/table/e-table-item.c:2971
-#: ../widgets/table/e-tree.c:3271
-#: ../widgets/table/e-tree.c:3272
+#: ../widgets/table/e-table-item.c:2980
+#: ../widgets/table/e-table-item.c:2981
+#: ../widgets/table/e-tree.c:3265
+#: ../widgets/table/e-tree.c:3266
msgid "Horizontal Draw Grid"
msgstr "Horizontal Draw Grid"
-#: ../widgets/table/e-table-group-container.c:915
-#: ../widgets/table/e-table-group-container.c:916
+#: ../widgets/table/e-table-group-container.c:911
+#: ../widgets/table/e-table-group-container.c:912
#: ../widgets/table/e-table-group-leaf.c:587
#: ../widgets/table/e-table-group-leaf.c:588
-#: ../widgets/table/e-table-item.c:2977
-#: ../widgets/table/e-table-item.c:2978
-#: ../widgets/table/e-tree.c:3277
-#: ../widgets/table/e-tree.c:3278
+#: ../widgets/table/e-table-item.c:2987
+#: ../widgets/table/e-table-item.c:2988
+#: ../widgets/table/e-tree.c:3271
+#: ../widgets/table/e-tree.c:3272
msgid "Vertical Draw Grid"
msgstr "Vertical Draw Grid"
-#: ../widgets/table/e-table-group-container.c:922
-#: ../widgets/table/e-table-group-container.c:923
+#: ../widgets/table/e-table-group-container.c:918
+#: ../widgets/table/e-table-group-container.c:919
#: ../widgets/table/e-table-group-leaf.c:594
#: ../widgets/table/e-table-group-leaf.c:595
-#: ../widgets/table/e-table-item.c:2984
-#: ../widgets/table/e-table-item.c:2985
-#: ../widgets/table/e-tree.c:3283
-#: ../widgets/table/e-tree.c:3284
+#: ../widgets/table/e-table-item.c:2994
+#: ../widgets/table/e-table-item.c:2995
+#: ../widgets/table/e-tree.c:3277
+#: ../widgets/table/e-tree.c:3278
msgid "Draw focus"
msgstr "Draw focus"
-#: ../widgets/table/e-table-group-container.c:929
-#: ../widgets/table/e-table-group-container.c:930
+#: ../widgets/table/e-table-group-container.c:925
+#: ../widgets/table/e-table-group-container.c:926
#: ../widgets/table/e-table-group-leaf.c:601
#: ../widgets/table/e-table-group-leaf.c:602
-#: ../widgets/table/e-table-item.c:2991
-#: ../widgets/table/e-table-item.c:2992
+#: ../widgets/table/e-table-item.c:3001
+#: ../widgets/table/e-table-item.c:3002
msgid "Cursor mode"
msgstr "Cursor mode"
-#: ../widgets/table/e-table-group-container.c:936
-#: ../widgets/table/e-table-group-container.c:937
+#: ../widgets/table/e-table-group-container.c:932
+#: ../widgets/table/e-table-group-container.c:933
#: ../widgets/table/e-table-group-leaf.c:615
#: ../widgets/table/e-table-group-leaf.c:616
-#: ../widgets/table/e-table-item.c:2956
-#: ../widgets/table/e-table-item.c:2957
+#: ../widgets/table/e-table-item.c:2966
+#: ../widgets/table/e-table-item.c:2967
msgid "Selection model"
msgstr "Selection model"
-#: ../widgets/table/e-table-group-container.c:943
-#: ../widgets/table/e-table-group-container.c:944
+#: ../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:2998
-#: ../widgets/table/e-table-item.c:2999
-#: ../widgets/table/e-table.c:3316
-#: ../widgets/table/e-tree.c:3265
-#: ../widgets/table/e-tree.c:3266
+#: ../widgets/table/e-table-item.c:3008
+#: ../widgets/table/e-table-item.c:3009
+#: ../widgets/table/e-table.c:3301
+#: ../widgets/table/e-tree.c:3259
+#: ../widgets/table/e-tree.c:3260
msgid "Length Threshold"
msgstr "Length Threshold"
-#: ../widgets/table/e-table-group-container.c:950
-#: ../widgets/table/e-table-group-container.c:951
+#: ../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:3032
-#: ../widgets/table/e-table-item.c:3033
-#: ../widgets/table/e-table.c:3323
-#: ../widgets/table/e-tree.c:3297
-#: ../widgets/table/e-tree.c:3298
+#: ../widgets/table/e-table-item.c:3042
+#: ../widgets/table/e-table-item.c:3043
+#: ../widgets/table/e-table.c:3308
+#: ../widgets/table/e-tree.c:3291
+#: ../widgets/table/e-tree.c:3292
msgid "Uniform row height"
msgstr "Uniform row height"
-#: ../widgets/table/e-table-group-container.c:957
-#: ../widgets/table/e-table-group-container.c:958
+#: ../widgets/table/e-table-group-container.c:953
+#: ../widgets/table/e-table-group-container.c:954
#: ../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:1472
+#: ../widgets/table/e-table-header-item.c:1471
msgid "Customize Current View"
msgstr "Customise Current View"
-#: ../widgets/table/e-table-header-item.c:1492
+#: ../widgets/table/e-table-header-item.c:1491
msgid "Sort Ascending"
msgstr "Sort Ascending"
-#: ../widgets/table/e-table-header-item.c:1493
+#: ../widgets/table/e-table-header-item.c:1492
msgid "Sort Descending"
msgstr "Sort Descending"
-#: ../widgets/table/e-table-header-item.c:1494
+#: ../widgets/table/e-table-header-item.c:1493
msgid "Unsort"
msgstr "Unsort"
-#: ../widgets/table/e-table-header-item.c:1496
+#: ../widgets/table/e-table-header-item.c:1495
msgid "Group By This Field"
msgstr "Group By This Field"
-#: ../widgets/table/e-table-header-item.c:1497
+#: ../widgets/table/e-table-header-item.c:1496
msgid "Group By Box"
msgstr "Group By Box"
-#: ../widgets/table/e-table-header-item.c:1499
+#: ../widgets/table/e-table-header-item.c:1498
msgid "Remove This Column"
msgstr "Remove This Column"
-#: ../widgets/table/e-table-header-item.c:1500
+#: ../widgets/table/e-table-header-item.c:1499
msgid "Add a Column..."
msgstr "Add a Column..."
-#: ../widgets/table/e-table-header-item.c:1502
+#: ../widgets/table/e-table-header-item.c:1501
msgid "Alignment"
msgstr "Alignment"
-#: ../widgets/table/e-table-header-item.c:1503
+#: ../widgets/table/e-table-header-item.c:1502
msgid "Best Fit"
msgstr "Best Fit"
-#: ../widgets/table/e-table-header-item.c:1504
+#: ../widgets/table/e-table-header-item.c:1503
msgid "Format Columns..."
msgstr "Format Columns..."
-#: ../widgets/table/e-table-header-item.c:1506
+#: ../widgets/table/e-table-header-item.c:1505
msgid "Customize Current View..."
msgstr "Customise Current View..."
-#: ../widgets/table/e-table-header-item.c:1817
+#: ../widgets/table/e-table-header-item.c:1554
+msgid "Sort By"
+msgstr "Sort By"
+
+#: ../widgets/table/e-table-header-item.c:1899
#: ../widgets/text/e-entry.c:1263
#: ../widgets/text/e-entry.c:1264
msgid "Fontset"
msgstr "Fontset"
-#: ../widgets/table/e-table-header-item.c:1838
+#: ../widgets/table/e-table-header-item.c:1920
#: ../widgets/table/e-table-sorter.c:175
msgid "Sort Info"
msgstr "Sort Info"
-#: ../widgets/table/e-table-header-item.c:1852
-#: ../widgets/table/e-tree-scrolled.c:223
-#: ../widgets/table/e-tree-scrolled.c:224
+#: ../widgets/table/e-table-header-item.c:1934
+#: ../widgets/table/e-tree-scrolled.c:221
+#: ../widgets/table/e-tree-scrolled.c:222
msgid "Tree"
msgstr "Tree"
-#: ../widgets/table/e-table-item.c:2942
-#: ../widgets/table/e-table-item.c:2943
+#: ../widgets/table/e-table-item.c:2952
+#: ../widgets/table/e-table-item.c:2953
msgid "Table header"
msgstr "Table header"
-#: ../widgets/table/e-table-item.c:2949
-#: ../widgets/table/e-table-item.c:2950
+#: ../widgets/table/e-table-item.c:2959
+#: ../widgets/table/e-table-item.c:2960
msgid "Table model"
msgstr "Table model"
-#: ../widgets/table/e-table-item.c:3025
-#: ../widgets/table/e-table-item.c:3026
+#: ../widgets/table/e-table-item.c:3035
+#: ../widgets/table/e-table-item.c:3036
msgid "Cursor row"
msgstr "Cursor row"
-#: ../widgets/table/e-table.c:3330
-msgid "Always Search"
-msgstr "Always Search"
+#: ../widgets/table/e-table.c:3315
+#: ../widgets/table/e-tree.c:3298
+#: ../widgets/table/e-tree.c:3299
+msgid "Always search"
+msgstr "Always search"
-#: ../widgets/table/e-table.c:3337
+#: ../widgets/table/e-table.c:3322
msgid "Use click to add"
msgstr "Use click to add"
-#: ../widgets/table/e-tree.c:3290
-#: ../widgets/table/e-tree.c:3291
+#: ../widgets/table/e-tree.c:3284
+#: ../widgets/table/e-tree.c:3285
msgid "ETree table adapter"
msgstr "ETree table adapter"
-#: ../widgets/table/e-tree.c:3304
#: ../widgets/table/e-tree.c:3305
-msgid "Always search"
-msgstr "Always search"
-
-#: ../widgets/table/e-tree.c:3311
msgid "Retro Look"
msgstr "Retro Look"
-#: ../widgets/table/e-tree.c:3312
+#: ../widgets/table/e-tree.c:3306
msgid "Draw lines and +/- expanders."
msgstr "Draw lines and +/- expanders."
@@ -19636,8 +21196,8 @@ msgstr "This should test the minicard canvas item"
#: ../widgets/text/e-entry.c:1242
#: ../widgets/text/e-entry.c:1243
-#: ../widgets/text/e-text.c:3455
-#: ../widgets/text/e-text.c:3456
+#: ../widgets/text/e-text.c:3496
+#: ../widgets/text/e-text.c:3497
msgid "Event Processor"
msgstr "Event Processor"
@@ -19653,78 +21213,78 @@ msgstr "GDKFont"
#: ../widgets/text/e-entry.c:1277
#: ../widgets/text/e-entry.c:1278
-#: ../widgets/text/e-text.c:3491
-#: ../widgets/text/e-text.c:3492
+#: ../widgets/text/e-text.c:3532
+#: ../widgets/text/e-text.c:3533
msgid "Justification"
msgstr "Justification"
#: ../widgets/text/e-entry.c:1319
#: ../widgets/text/e-entry.c:1320
-#: ../widgets/text/e-text.c:3591
-#: ../widgets/text/e-text.c:3592
+#: ../widgets/text/e-text.c:3632
+#: ../widgets/text/e-text.c:3633
msgid "Use ellipsis"
msgstr "Use ellipsis"
#: ../widgets/text/e-entry.c:1326
#: ../widgets/text/e-entry.c:1327
-#: ../widgets/text/e-text.c:3598
-#: ../widgets/text/e-text.c:3599
+#: ../widgets/text/e-text.c:3639
+#: ../widgets/text/e-text.c:3640
msgid "Ellipsis"
msgstr "Ellipsis"
#: ../widgets/text/e-entry.c:1333
#: ../widgets/text/e-entry.c:1334
-#: ../widgets/text/e-text.c:3605
-#: ../widgets/text/e-text.c:3606
+#: ../widgets/text/e-text.c:3646
+#: ../widgets/text/e-text.c:3647
msgid "Line wrap"
msgstr "Line wrap"
#: ../widgets/text/e-entry.c:1340
#: ../widgets/text/e-entry.c:1341
-#: ../widgets/text/e-text.c:3612
-#: ../widgets/text/e-text.c:3613
+#: ../widgets/text/e-text.c:3653
+#: ../widgets/text/e-text.c:3654
msgid "Break characters"
msgstr "Break characters"
#: ../widgets/text/e-entry.c:1347
#: ../widgets/text/e-entry.c:1348
-#: ../widgets/text/e-text.c:3619
-#: ../widgets/text/e-text.c:3620
+#: ../widgets/text/e-text.c:3660
+#: ../widgets/text/e-text.c:3661
msgid "Max lines"
msgstr "Max lines"
#: ../widgets/text/e-entry.c:1354
#: ../widgets/text/e-entry.c:1355
-#: ../widgets/text/e-text.c:3648
-#: ../widgets/text/e-text.c:3649
+#: ../widgets/text/e-text.c:3689
+#: ../widgets/text/e-text.c:3690
msgid "Allow newlines"
msgstr "Allow newlines"
#: ../widgets/text/e-entry.c:1361
#: ../widgets/text/e-entry.c:1362
-#: ../widgets/text/e-text.c:3641
-#: ../widgets/text/e-text.c:3642
+#: ../widgets/text/e-text.c:3682
+#: ../widgets/text/e-text.c:3683
msgid "Draw borders"
msgstr "Draw borders"
#: ../widgets/text/e-entry.c:1368
#: ../widgets/text/e-entry.c:1369
-#: ../widgets/text/e-text.c:3655
-#: ../widgets/text/e-text.c:3656
+#: ../widgets/text/e-text.c:3696
+#: ../widgets/text/e-text.c:3697
msgid "Draw background"
msgstr "Draw background"
#: ../widgets/text/e-entry.c:1375
#: ../widgets/text/e-entry.c:1376
-#: ../widgets/text/e-text.c:3662
-#: ../widgets/text/e-text.c:3663
+#: ../widgets/text/e-text.c:3703
+#: ../widgets/text/e-text.c:3704
msgid "Draw button"
msgstr "Draw button"
#: ../widgets/text/e-entry.c:1382
#: ../widgets/text/e-entry.c:1383
-#: ../widgets/text/e-text.c:3669
-#: ../widgets/text/e-text.c:3670
+#: ../widgets/text/e-text.c:3710
+#: ../widgets/text/e-text.c:3711
msgid "Cursor position"
msgstr "Cursor position"
@@ -19733,72 +21293,405 @@ msgstr "Cursor position"
msgid "Emulate label resize"
msgstr "Emulate label resize"
-#: ../widgets/text/e-text.c:2696
+#: ../widgets/text/e-text.c:2739
msgid "Input Methods"
msgstr "Input Methods"
-#: ../widgets/text/e-text.c:3469
-#: ../widgets/text/e-text.c:3470
+#: ../widgets/text/e-text.c:3510
+#: ../widgets/text/e-text.c:3511
msgid "Bold"
msgstr "Bold"
-#: ../widgets/text/e-text.c:3476
-#: ../widgets/text/e-text.c:3477
+#: ../widgets/text/e-text.c:3517
+#: ../widgets/text/e-text.c:3518
msgid "Strikeout"
msgstr "Strikeout"
-#: ../widgets/text/e-text.c:3483
-#: ../widgets/text/e-text.c:3484
+#: ../widgets/text/e-text.c:3524
+#: ../widgets/text/e-text.c:3525
msgid "Anchor"
msgstr "Anchor"
-#: ../widgets/text/e-text.c:3498
-#: ../widgets/text/e-text.c:3499
+#: ../widgets/text/e-text.c:3539
+#: ../widgets/text/e-text.c:3540
msgid "Clip Width"
msgstr "Clip Width"
-#: ../widgets/text/e-text.c:3505
-#: ../widgets/text/e-text.c:3506
+#: ../widgets/text/e-text.c:3546
+#: ../widgets/text/e-text.c:3547
msgid "Clip Height"
msgstr "Clip Height"
-#: ../widgets/text/e-text.c:3512
-#: ../widgets/text/e-text.c:3513
+#: ../widgets/text/e-text.c:3553
+#: ../widgets/text/e-text.c:3554
msgid "Clip"
msgstr "Clip"
-#: ../widgets/text/e-text.c:3519
-#: ../widgets/text/e-text.c:3520
+#: ../widgets/text/e-text.c:3560
+#: ../widgets/text/e-text.c:3561
msgid "Fill clip rectangle"
msgstr "Fill clip rectangle"
-#: ../widgets/text/e-text.c:3526
-#: ../widgets/text/e-text.c:3527
+#: ../widgets/text/e-text.c:3567
+#: ../widgets/text/e-text.c:3568
msgid "X Offset"
msgstr "X Offset"
-#: ../widgets/text/e-text.c:3533
-#: ../widgets/text/e-text.c:3534
+#: ../widgets/text/e-text.c:3574
+#: ../widgets/text/e-text.c:3575
msgid "Y Offset"
msgstr "Y Offset"
-#: ../widgets/text/e-text.c:3569
-#: ../widgets/text/e-text.c:3570
+#: ../widgets/text/e-text.c:3610
+#: ../widgets/text/e-text.c:3611
msgid "Text width"
msgstr "Text width"
-#: ../widgets/text/e-text.c:3576
-#: ../widgets/text/e-text.c:3577
+#: ../widgets/text/e-text.c:3617
+#: ../widgets/text/e-text.c:3618
msgid "Text height"
msgstr "Text height"
-#: ../widgets/text/e-text.c:3676
-#: ../widgets/text/e-text.c:3677
+#: ../widgets/text/e-text.c:3717
+#: ../widgets/text/e-text.c:3718
msgid "IM Context"
msgstr "IM Context"
-#: ../widgets/text/e-text.c:3683
-#: ../widgets/text/e-text.c:3684
+#: ../widgets/text/e-text.c:3724
+#: ../widgets/text/e-text.c:3725
msgid "Handle Popup"
msgstr "Handle Popup"
+#~ msgid "Addressbook"
+#~ msgstr "Addressbook"
+#~ msgid "*"
+#~ msgstr "*"
+#~ msgid ""
+#~ "Selecting this option means that Evolution will only try to use SSL/TLS "
+#~ "if you are in a insecure environment. For example, if you and your LDAP "
+#~ "server are behind a firewall at work, then Evolution doesn't need to use "
+#~ "SSL/TLS because your connection is already secure."
+#~ msgstr ""
+#~ "Selecting this option means that Evolution will only try to use SSL/TLS "
+#~ "if you are in a insecure environment. For example, if you and your LDAP "
+#~ "server are behind a firewall at work, then Evolution doesn't need to use "
+#~ "SSL/TLS because your connection is already secure."
+#~ msgid "E-_mail:"
+#~ msgstr "E-_mail:"
+#~ msgid "Advanced..."
+#~ msgstr "Advanced..."
+#~ msgid "Video Conferencing"
+#~ msgstr "Video Conferencing"
+#~ msgid "work"
+#~ msgstr "work"
+#~ msgid "WWW"
+#~ msgstr "WWW"
+#~ msgid "personal"
+#~ msgstr "personal"
+#~ msgid "Select target addressbook."
+#~ msgstr "Select target addressbook."
+#~ msgid "(none)"
+#~ msgstr "(none)"
+#~ msgid "Primary Email"
+#~ msgstr "Primary Email"
+#~ msgid "Select an Action"
+#~ msgstr "Select an Action"
+#~ msgid "Create a new contact \"%s\""
+#~ msgstr "Create a new contact \"%s\""
+#~ msgid "Add address to existing contact \"%s\""
+#~ msgstr "Add address to existing contact \"%s\""
+#~ msgid "Merge E-Mail Address"
+#~ msgstr "Merge E-Mail Address"
+#~ msgid "Discard Changes"
+#~ msgstr "Discard Changes"
+#~ msgid ""
+#~ "<big><b>%s</b></big>\n"
+#~ "%s until %s"
+#~ msgstr ""
+#~ "<big><b>%s</b></big>\n"
+#~ "%s until %s"
+#~ msgid "description of appointment"
+#~ msgstr "description of appointment"
+#~ msgid "Dismiss"
+#~ msgstr "Dismiss"
+#~ msgid "Dismiss All"
+#~ msgstr "Dismiss All"
+#~ msgid ""
+#~ "Alarm on %s\n"
+#~ "%s\n"
+#~ "Starting at %s\n"
+#~ "Ending at %s"
+#~ msgstr ""
+#~ "Alarm on %s\n"
+#~ "%s\n"
+#~ "Starting at %s\n"
+#~ "Ending at %s"
+#~ msgid "Remove"
+#~ msgstr "Remove"
+#~ msgid "Don't Remove"
+#~ msgstr "Don't Remove"
+#~ msgid "05 minutes"
+#~ msgstr "05 minutes"
+#~ msgid "10 minutes"
+#~ msgstr "10 minutes"
+#~ msgid "15 minutes"
+#~ msgstr "15 minutes"
+#~ msgid "30 minutes"
+#~ msgstr "30 minutes"
+#~ msgid "60 minutes"
+#~ msgstr "60 minutes"
+#~ msgid "<b>Alerts</b>"
+#~ msgstr "<b>Alerts</b>"
+#~ msgid "<b>Default Free/Busy Server</b>"
+#~ msgstr "<b>Default Free/Busy Server</b>"
+#~ msgid "<b>General</b>"
+#~ msgstr "<b>General</b>"
+#~ msgid "<b>Publishing</b>"
+#~ msgstr "<b>Publishing</b>"
+#~ msgid "<b>Task List</b>"
+#~ msgstr "<b>Task List</b>"
+#~ msgid "<b>Time</b>"
+#~ msgstr "<b>Time</b>"
+#~ msgid "<b>Work Week</b>"
+#~ msgstr "<b>Work Week</b>"
+#~ msgid "Calendar and Tasks Settings"
+#~ msgstr "Calendar and Tasks Settings"
+#~ msgid "Color for overdue tasks"
+#~ msgstr "Colour for overdue tasks"
+#~ msgid "Color for tasks due today"
+#~ msgstr "Colour for tasks due today"
+#~ msgid "Days"
+#~ msgstr "Days"
+#~ msgid "Hours"
+#~ msgstr "Hours"
+#~ msgid "Minutes"
+#~ msgstr "Minutes"
+#~ msgid "_Add URL"
+#~ msgstr "_Add URL"
+#~ msgid "option menu to choose reminder units"
+#~ msgstr "option menu to choose reminder units"
+#~ msgid "option menu to choose time units"
+#~ msgstr "option menu to choose time units"
+#~ msgid "_Attachment Bar (drop attachments here)"
+#~ msgstr "_Attachment Bar (drop attachments here)"
+#~ msgid "Scheduling"
+#~ msgstr "Scheduling"
+#~ msgid "Invitations"
+#~ msgstr "Invitations"
+#~ msgid "<b>Basics</b>"
+#~ msgstr "<b>Basics</b>"
+#~ msgid "<b>Date and Time</b>"
+#~ msgstr "<b>Date and Time</b>"
+#~ msgid "<b>Send Options</b>"
+#~ msgstr "<b>Send Options</b>"
+#~ msgid "A_ll day event"
+#~ msgstr "A_ll day event"
+#~ msgid "Cale_ndar:"
+#~ msgstr "Cale_ndar:"
+#~ msgid "Classi_fication:"
+#~ msgstr "Classi_fication:"
+#~ msgid "Locat_ion:"
+#~ msgstr "Locat_ion:"
+#~ msgid "This appointment has customized alarms"
+#~ msgstr "This appointment has customized alarms"
+#~ msgid "_Description:"
+#~ msgstr "_Description:"
+#~ msgid "<b>Dele_gatees</b>"
+#~ msgstr "<b>Dele_gatees</b>"
+#~ msgid "<b>From:</b>"
+#~ msgstr "<b>From:</b>"
+#~ msgid "_Delegate To..."
+#~ msgstr "_Delegate To..."
+#~ msgid "Con_tacts..."
+#~ msgstr "Con_tacts..."
+#~ msgid "Assignment"
+#~ msgstr "Assignment"
+#~ msgid "Task Table"
+#~ msgstr "Task Table"
+#~ msgid "_Publish Free/Busy Information"
+#~ msgstr "_Publish Free/Busy Information"
+#~ msgid "Removal Complete"
+#~ msgstr "Removal Complete"
+#~ msgid "%P %%"
+#~ msgstr "%P %%"
+#~ msgid "date-end"
+#~ msgstr "date-end"
+#~ msgid "date-start"
+#~ msgstr "date-start"
+#~ msgid "Timezone Button"
+#~ msgstr "Timezone Button"
+#~ msgid "The Evolution Groupware Suite"
+#~ msgstr "The Evolution Groupware Suite"
+#~ msgid " "
+#~ msgstr " "
+#~ msgid "%a %m/%d/%Y %I:%M %p"
+#~ msgstr "%a %d/%m/%Y %I:%M %p"
+#~ msgid "%a %m/%d/%Y %H:%M"
+#~ msgstr "%a %d/%m/%Y %H:%M"
+#~ msgid "%a %m/%d/%Y %I %p"
+#~ msgstr "%a %d/%m/%Y %I %p"
+#~ msgid "%a %m/%d/%Y %H"
+#~ msgstr "%a %d/%m/%Y %H"
+#~ msgid "%m/%d/%Y %I:%M:%S %p"
+#~ msgstr "%d/%m/%Y %I:%M:%S %p"
+#~ msgid "%m/%d/%Y %H:%M:%S"
+#~ msgstr "%d/%m/%Y %H:%M:%S"
+#~ msgid "%m/%d/%Y %I:%M %p"
+#~ msgstr "%d/%m/%Y %I:%M %p"
+#~ msgid "%m/%d/%Y %H:%M"
+#~ msgstr "%d/%m/%Y %H:%M"
+#~ msgid "%m/%d/%Y %I %p"
+#~ msgstr "%d/%m/%Y %I %p"
+#~ msgid "%m/%d/%Y %H"
+#~ msgstr "%d/%m/%Y %H"
+#~ msgid "%I:%M:%S %p"
+#~ msgstr "%I:%M:%S %p"
+#~ msgid "%H:%M:%S"
+#~ msgstr "%H:%M:%S"
+#~ msgid "%I %p"
+#~ msgstr "%I %p"
+#~ msgid "_Rule name:"
+#~ msgstr "_Rule name:"
+#~ msgid "If"
+#~ msgstr "If"
+#~ msgid "Execute actions"
+#~ msgstr "Execute actions"
+#~ msgid "Mail Accounts Table"
+#~ msgstr "Mail Accounts Table"
+#~ msgid "Attachment Button"
+#~ msgstr "Attachment Button"
+#~ msgid "Filters"
+#~ msgstr "Filters"
+#~ msgid "Execute Command..."
+#~ msgstr "Execute Command..."
+#~ msgid "T_erminal Font:"
+#~ msgstr "T_erminal Font:"
+#~ msgid "_Show animated images"
+#~ msgstr "_Show animated images"
+#~ msgid "_Subscribe"
+#~ msgstr "_Subscribe"
+#~ msgid ""
+#~ "Unable to create output file: %s\n"
+#~ " %s"
+#~ msgstr ""
+#~ "Unable to create output file: %s\n"
+#~ " %s"
+#~ msgid "Server: %s, Type: %s"
+#~ msgstr "Server: %s, Type: %s"
+#~ msgid "Path: %s, Type: %s"
+#~ msgstr "Path: %s, Type: %s"
+#~ msgid "Type: %s"
+#~ msgstr "Type: %s"
+#~ msgid ""
+#~ "The message was sent via the &quot;sendmail&quot; external application. "
+#~ "Sendmail reports the following error: status 67: mail not sent.\n"
+#~ "The message is stored in the Outbox folder. Check the message for errors "
+#~ "and resend."
+#~ msgstr ""
+#~ "The message was sent via the &quot;sendmail&quot; external application. "
+#~ "Sendmail reports the following error: status 67: mail not sent.\n"
+#~ "The message is stored in the Outbox folder. Check the message for errors "
+#~ "and resend."
+#~ msgid "Your message with the subject &quot;{0}&quot; was not delivered."
+#~ msgstr "Your message with the subject &quot;{0}&quot; was not delivered."
+#~ msgid "Original Location"
+#~ msgstr "Original Location"
+#~ msgid "<span weight=\"bold\">Automatic Contacts</span>"
+#~ msgstr "<span weight=\"bold\">Automatic Contacts</span>"
+#~ msgid "<span weight=\"bold\">Instant Messaging Contacts</span>"
+#~ msgstr "<span weight=\"bold\">Instant Messaging Contacts</span>"
+#~ msgid "Automatic contacts"
+#~ msgstr "Automatic contacts"
+#~ msgid "Exchange Connector access error."
+#~ msgstr "Exchange Connector access error."
+#~ msgid "dialog1"
+#~ msgstr "dialogue1"
+#~ msgid "Meetings and Tasks"
+#~ msgstr "Meetings and Tasks"
+#~ msgid "<span weight=\"bold\">Conflict Search</span>"
+#~ msgstr "<span weight=\"bold\">Conflict Search</span>"
+#~ msgid "Plugin manager"
+#~ msgstr "Plugin manager"
+#~ msgid "Id"
+#~ msgstr "Id"
+#~ msgid "Path"
+#~ msgstr "Path"
+#~ msgid "Sa junk-plugin"
+#~ msgstr "Sa junk-plugin"
+#~ msgid "learns junk messages using spamd."
+#~ msgstr "learns junk messages using spamd."
+#~ msgid "Uid"
+#~ msgstr "Uid"
+#~ msgid "Url"
+#~ msgstr "Url"
+#~ msgid ""
+#~ "The suggested filename extension of this filetype (%s) is unused in the "
+#~ "chosen filename. Do you want to continue?"
+#~ 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"
+#~ msgstr "OU"
+#~ msgid "O"
+#~ msgstr "O"
+#~ msgid "L"
+#~ msgstr "L"
+#~ msgid "DN"
+#~ msgstr "DN"
+#~ msgid "DC"
+#~ msgstr "DC"
+#~ msgid "ST"
+#~ msgstr "ST"
+#~ msgid "E"
+#~ msgstr "E"
+#~ msgid "_Preview Pane"
+#~ msgstr "_Preview Pane"
+#~ msgid "_Select All"
+#~ msgstr "_Select All"
+#~ msgid "Delete this Occurrence"
+#~ msgstr "Delete this Occurrence"
+#~ msgid "Customize My Evolution"
+#~ msgstr "Customise My Evolution"
+#~ msgid "Move"
+#~ msgstr "Move"
+#~ msgid "_About Evolution..."
+#~ msgstr "_About Evolution..."
+#~ msgid "_Send / Receive"
+#~ msgstr "_Send / Receive"
+#~ msgid "Previous Button"
+#~ msgstr "Previous Button"
+#~ msgid "Text Date Entry"
+#~ msgstr "Text Date Entry"
+#~ msgid "Date Button"
+#~ msgstr "Date Button"
+#~ msgid "Time Combo Box"
+#~ msgstr "Time Combo Box"
+#~ msgid "Search Text Entry"
+#~ msgstr "Search Text Entry"
+#~ msgid "Search Type"
+#~ msgstr "Search Type"
+#~ msgid "Subitem ID"
+#~ msgstr "Subitem ID"
+#~ msgid "Find _Now"
+#~ msgstr "Find _Now"
+#~ msgid ""
+#~ "Public\n"
+#~ "Private\n"
+#~ "Confidential\n"
+#~ msgstr ""
+#~ "Public\n"
+#~ "Private\n"
+#~ "Confidential\n"
+#~ msgid "%s : %s (%d items)"
+#~ msgstr "%s : %s (%d items)"
+#~ msgid "%s (%d items)"
+#~ msgstr "%s (%d items)"
+#~ msgid "Always Search"
+#~ msgstr "Always Search"
+