aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--po/ChangeLog4
-rw-r--r--po/en_GB.po7190
2 files changed, 3700 insertions, 3494 deletions
diff --git a/po/ChangeLog b/po/ChangeLog
index 633ea897de..256821cf70 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,7 @@
+2007-04-22 David Lodge <dave@cirt.net>
+
+ * en_GB.po: Updated British English translation
+
2007-04-22 Yair Hershkovitz <yairh@gmail.com>
* he.po: Updated Hebrew translation
diff --git a/po/en_GB.po b/po/en_GB.po
index f9c0025440..c25b6725d5 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: 2007-03-02 07:31+0000\n"
-"PO-Revision-Date: 2007-03-02 07:31-0000\n"
+"POT-Creation-Date: 2007-04-22 20:24+0100\n"
+"PO-Revision-Date: 2007-04-22 20:25-0000\n"
"Last-Translator: David Lodge <dave@cirt.net>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -18,27 +18,10 @@ msgstr ""
#: ../a11y/addressbook/ea-addressbook-view.c:94
#: ../a11y/addressbook/ea-addressbook-view.c:103
-#: ../a11y/addressbook/ea-minicard-view.c:180
+#: ../a11y/addressbook/ea-minicard-view.c:179
msgid "evolution addressbook"
msgstr "evolution addressbook"
-#: ../a11y/addressbook/ea-minicard-view.c:34
-#: ../addressbook/gui/component/addressbook-component.c:224
-msgid "New Contact"
-msgstr "New Contact"
-
-#: ../a11y/addressbook/ea-minicard-view.c:35
-#: ../addressbook/gui/component/addressbook-component.c:232
-msgid "New Contact List"
-msgstr "New Contact List"
-
-#: ../a11y/addressbook/ea-minicard-view.c:163
-#, c-format
-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
#: ../ui/evolution-message-composer.xml.h:13
msgid "Open"
@@ -56,6 +39,43 @@ msgstr "Contact: "
msgid "evolution minicard"
msgstr "evolution minicard"
+#: ../a11y/addressbook/ea-minicard-view.c:33
+#: ../addressbook/gui/component/addressbook-component.c:223
+msgid "New Contact"
+msgstr "New Contact"
+
+#: ../a11y/addressbook/ea-minicard-view.c:34
+#: ../addressbook/gui/component/addressbook-component.c:231
+msgid "New Contact List"
+msgstr "New Contact List"
+
+#: ../a11y/addressbook/ea-minicard-view.c:162
+#, c-format
+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/calendar/ea-cal-view.c:302
+msgid "New Appointment"
+msgstr "New Appointment"
+
+#: ../a11y/calendar/ea-cal-view.c:303
+msgid "New All Day Event"
+msgstr "New All Day Event"
+
+#: ../a11y/calendar/ea-cal-view.c:304
+msgid "New Meeting"
+msgstr "New Meeting"
+
+#: ../a11y/calendar/ea-cal-view.c:305
+msgid "Go to Today"
+msgstr "Go to Today"
+
+#: ../a11y/calendar/ea-cal-view.c:306
+msgid "Go to Date"
+msgstr "Go to Date"
+
#: ../a11y/calendar/ea-cal-view-event.c:266
msgid "It has alarms."
msgstr "It has alarms."
@@ -85,31 +105,6 @@ msgstr "calendar view event"
msgid "Grab Focus"
msgstr "Grab Focus"
-#: ../a11y/calendar/ea-cal-view.c:302
-msgid "New Appointment"
-msgstr "New Appointment"
-
-#: ../a11y/calendar/ea-cal-view.c:303
-msgid "New All Day Event"
-msgstr "New All Day Event"
-
-#: ../a11y/calendar/ea-cal-view.c:304
-msgid "New Meeting"
-msgstr "New Meeting"
-
-#: ../a11y/calendar/ea-cal-view.c:305
-msgid "Go to Today"
-msgstr "Go to Today"
-
-#: ../a11y/calendar/ea-cal-view.c:306
-msgid "Go to Date"
-msgstr "Go to Date"
-
-#: ../a11y/calendar/ea-day-view-main-item.c:299
-#: ../a11y/calendar/ea-week-view-main-item.c:301
-msgid "a table to view and select the current time range"
-msgstr "a table to view and select the current time range"
-
#. 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
@@ -151,6 +146,11 @@ msgstr "calendar view for a work week"
msgid "calendar view for one or more days"
msgstr "calendar view for one or more days"
+#: ../a11y/calendar/ea-day-view-main-item.c:299
+#: ../a11y/calendar/ea-week-view-main-item.c:301
+msgid "a table to view and select the current time range"
+msgstr "a table to view and select the current time range"
+
#: ../a11y/calendar/ea-gnome-calendar.c:188
#: ../calendar/gui/calendar-component.c:707
msgid "%A %d %b %Y"
@@ -164,8 +164,8 @@ msgstr "%A %d %b %Y"
#. specifiers or add anything.
#: ../a11y/calendar/ea-gnome-calendar.c:191
#: ../calendar/gui/calendar-component.c:710
-#: ../calendar/gui/e-day-view-top-item.c:1315
#: ../calendar/gui/e-day-view.c:2106
+#: ../calendar/gui/e-day-view-top-item.c:1315
#: ../calendar/gui/e-week-view-main-item.c:319
#: ../calendar/gui/e-week-view-main-item.c:533
msgid "%a %d %b"
@@ -198,8 +198,8 @@ msgstr "%d %b %Y"
#. change the specifiers or add anything.
#: ../a11y/calendar/ea-gnome-calendar.c:221
#: ../calendar/gui/calendar-component.c:736
-#: ../calendar/gui/e-day-view-top-item.c:1319
#: ../calendar/gui/e-day-view.c:2122
+#: ../calendar/gui/e-day-view-top-item.c:1319
#: ../calendar/gui/e-week-view-main-item.c:333
#: ../calendar/gui/e-week-view-main-item.c:547
msgid "%d %b"
@@ -245,6 +245,10 @@ msgstr "calendar view for a month"
msgid "calendar view for one or more weeks"
msgstr "calendar view for one or more weeks"
+#: ../a11y/e-table/gal-a11y-e-cell.c:107
+msgid "Table Cell"
+msgstr "Table Cell"
+
#: ../a11y/e-table/gal-a11y-e-cell-popup.c:124
msgid "popup"
msgstr "popup"
@@ -254,11 +258,11 @@ msgstr "popup"
msgid "popup a child"
msgstr "popup a child"
-#: ../a11y/e-table/gal-a11y-e-cell-text.c:612
+#: ../a11y/e-table/gal-a11y-e-cell-text.c:614
msgid "edit"
msgstr "edit"
-#: ../a11y/e-table/gal-a11y-e-cell-text.c:613
+#: ../a11y/e-table/gal-a11y-e-cell-text.c:615
msgid "begin editing this cell"
msgstr "begin editing this cell"
@@ -287,10 +291,6 @@ msgstr "collapse"
msgid "collapses the row in the ETree containing this cell"
msgstr "collapses the row in the ETree containing this cell"
-#: ../a11y/e-table/gal-a11y-e-cell.c:107
-msgid "Table Cell"
-msgstr "Table Cell"
-
#: ../a11y/e-table/gal-a11y-e-table-click-to-add.c:44
#: ../a11y/e-table/gal-a11y-e-table-click-to-add.c:119
#: ../widgets/table/e-table-click-to-add.c:574
@@ -305,17 +305,17 @@ msgstr "click"
msgid "sort"
msgstr "sort"
-#: ../a11y/widgets/ea-calendar-item.c:296
-#: ../a11y/widgets/ea-calendar-item.c:302
+#: ../a11y/widgets/ea-calendar-item.c:298
+#: ../a11y/widgets/ea-calendar-item.c:304
msgid "%d %B %Y"
msgstr "%d %B %Y"
-#: ../a11y/widgets/ea-calendar-item.c:304
+#: ../a11y/widgets/ea-calendar-item.c:306
#, c-format
msgid "Calendar: from %s to %s"
msgstr "Calendar: from %s to %s"
-#: ../a11y/widgets/ea-calendar-item.c:339
+#: ../a11y/widgets/ea-calendar-item.c:341
msgid "evolution calendar item"
msgstr "evolution calendar item"
@@ -389,7 +389,7 @@ msgstr "Failed to authenticate with LDAP server."
#. Unknown error
#: ../addressbook/addressbook.error.xml.h:13
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1961
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1854
msgid "Failed to delete contact"
msgstr "Failed to delete contact"
@@ -479,7 +479,7 @@ msgid "Your contacts for {0} will not be available until Evolution is restarted.
msgstr "Your contacts for {0} will not be available until Evolution is restarted."
#: ../addressbook/addressbook.error.xml.h:35
-#: ../mail/em-vfolder-rule.c:511
+#: ../mail/em-vfolder-rule.c:510
#: ../plugins/groupwise-features/junk-settings.glade.h:4
#: ../plugins/groupwise-features/properties.glade.h:9
#: ../widgets/table/e-table-config.glade.h:15
@@ -513,76 +513,34 @@ msgstr "{0}"
msgid "{1}"
msgstr "{1}"
-#: ../addressbook/conduit/address-conduit.c:300
+#: ../addressbook/conduit/address-conduit.c:298
msgid "Default Sync Address:"
msgstr "Default Sync Address:"
-#: ../addressbook/conduit/address-conduit.c:1317
-#: ../addressbook/conduit/address-conduit.c:1318
+#: ../addressbook/conduit/address-conduit.c:1315
+#: ../addressbook/conduit/address-conduit.c:1316
msgid "Could not load addressbook"
msgstr "Could not load addressbook"
-#: ../addressbook/conduit/address-conduit.c:1395
-#: ../addressbook/conduit/address-conduit.c:1398
+#: ../addressbook/conduit/address-conduit.c:1393
+#: ../addressbook/conduit/address-conduit.c:1396
msgid "Could not read pilot's Address application block"
msgstr "Could not read pilot's Address application block"
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
-msgid "Autocompletion"
-msgstr "Autocompletion"
-
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
-msgid "C_ontacts"
-msgstr "C_ontacts"
-
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
-msgid "Certificates"
-msgstr "Certificates"
-
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
-msgid "Configure autocomplete here"
-msgstr "Configure autocomplete here"
-
-#. Create the contacts group
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-#: ../addressbook/gui/component/addressbook-view.c:1332
-#: ../calendar/gui/calendar-component.c:272
-#: ../calendar/gui/migration.c:402
-#: ../plugins/exchange-operations/exchange-folder.c:575
-msgid "Contacts"
-msgstr "Contacts"
-
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
-msgid "Evolution Address Book"
-msgstr "Evolution Address Book"
-
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
-msgid "Evolution Address Book address pop-up"
-msgstr "Evolution Address Book address pop-up"
-
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
-msgid "Evolution Address Book address viewer"
-msgstr "Evolution Address Book address viewer"
-
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
-msgid "Evolution Address Book card viewer"
-msgstr "Evolution Address Book card viewer"
-
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
-msgid "Evolution Address Book component"
-msgstr "Evolution Address Book component"
-
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
-msgid "Evolution S/Mime Certificate Management Control"
-msgstr "Evolution S/Mime Certificate Management Control"
+#: ../addressbook/gui/component/addressbook.c:99
+msgid "Accessing LDAP Server anonymously"
+msgstr "Accessing LDAP Server anonymously"
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
-msgid "Evolution folder settings configuration control"
-msgstr "Evolution folder settings configuration control"
+#: ../addressbook/gui/component/addressbook.c:197
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:511
+msgid "Failed to authenticate.\n"
+msgstr "Failed to authenticate.\n"
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
-msgid "Manage your S/MIME certificates here"
-msgstr "Manage your S/MIME certificates here"
+#: ../addressbook/gui/component/addressbook.c:204
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:491
+#, c-format
+msgid "Enter password for %s (user %s)"
+msgstr "Enter password for %s (user %s)"
#. create the local source group
#. On This Computer is always first and Search Folders is always last
@@ -609,16 +567,16 @@ msgstr "On This Computer"
#: ../addressbook/gui/component/addressbook-component.c:147
#: ../addressbook/gui/component/addressbook-migrate.c:491
#: ../addressbook/gui/contact-editor/contact-editor.glade.h:19
-#: ../addressbook/gui/widgets/eab-contact-display.c:602
+#: ../addressbook/gui/widgets/eab-contact-display.c:597
#: ../calendar/gui/calendar-component.c:241
#: ../calendar/gui/memos-component.c:203
#: ../calendar/gui/migration.c:486
#: ../calendar/gui/migration.c:580
#: ../calendar/gui/migration.c:1088
#: ../calendar/gui/tasks-component.c:199
-#: ../filter/filter-label.c:123
+#: ../filter/filter-label.c:122
#: ../mail/em-migrate.c:1055
-#: ../mail/mail-config.glade.h:106
+#: ../mail/mail-config.glade.h:104
msgid "Personal"
msgstr "Personal"
@@ -628,36 +586,36 @@ msgstr "Personal"
msgid "On LDAP Servers"
msgstr "On LDAP Servers"
-#: ../addressbook/gui/component/addressbook-component.c:225
+#: ../addressbook/gui/component/addressbook-component.c:224
msgid "_Contact"
msgstr "_Contact"
-#: ../addressbook/gui/component/addressbook-component.c:226
+#: ../addressbook/gui/component/addressbook-component.c:225
msgid "Create a new contact"
msgstr "Create a new contact"
-#: ../addressbook/gui/component/addressbook-component.c:233
+#: ../addressbook/gui/component/addressbook-component.c:232
msgid "Contact _List"
msgstr "Contact _List"
-#: ../addressbook/gui/component/addressbook-component.c:234
+#: ../addressbook/gui/component/addressbook-component.c:233
msgid "Create a new contact list"
msgstr "Create a new contact list"
-#: ../addressbook/gui/component/addressbook-component.c:240
-#: ../addressbook/gui/component/addressbook-config.c:1205
+#: ../addressbook/gui/component/addressbook-component.c:239
+#: ../addressbook/gui/component/addressbook-config.c:1208
msgid "New Address Book"
msgstr "New Address Book"
-#: ../addressbook/gui/component/addressbook-component.c:241
+#: ../addressbook/gui/component/addressbook-component.c:240
msgid "Address _Book"
msgstr "Address _Book"
-#: ../addressbook/gui/component/addressbook-component.c:242
+#: ../addressbook/gui/component/addressbook-component.c:241
msgid "Create a new address book"
msgstr "Create a new address book"
-#: ../addressbook/gui/component/addressbook-component.c:405
+#: ../addressbook/gui/component/addressbook-component.c:404
msgid "Failed upgrading Address Book settings or folders."
msgstr "Failed upgrading Address Book settings or folders."
@@ -666,7 +624,7 @@ msgid "Base"
msgstr "Base"
#: ../addressbook/gui/component/addressbook-config.c:533
-#: ../calendar/gui/dialogs/calendar-setup.c:192
+#: ../calendar/gui/dialogs/calendar-setup.c:172
#: ../calendar/gui/dialogs/calendar-setup.glade.h:9
msgid "_Type:"
msgstr "_Type:"
@@ -677,19 +635,19 @@ msgstr "Copy book content locally for offline operation"
#: ../addressbook/gui/component/addressbook-config.c:984
#: ../addressbook/gui/component/ldap-config.glade.h:22
+#: ../calendar/gui/dialogs/calendar-setup.c:365
+#: ../calendar/gui/dialogs/calendar-setup.c:376
+#: ../calendar/gui/dialogs/calendar-setup.c:387
#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
-#: ../calendar/gui/dialogs/calendar-setup.c: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:86
+#: ../mail/mail-config.glade.h:85
#: ../plugins/itip-formatter/itip-formatter.c:2087
#: ../smime/gui/smime-ui.glade.h:28
msgid "General"
msgstr "General"
#: ../addressbook/gui/component/addressbook-config.c:985
-#: ../addressbook/gui/widgets/e-addressbook-view.c:572
+#: ../addressbook/gui/widgets/e-addressbook-view.c:565
#: ../mail/importers/pine-importer.c:392
msgid "Address Book"
msgstr "Address Book"
@@ -718,7 +676,7 @@ msgstr "Searching"
msgid "Downloading"
msgstr "Downloading"
-#: ../addressbook/gui/component/addressbook-config.c:1203
+#: ../addressbook/gui/component/addressbook-config.c:1206
#: ../addressbook/gui/component/ldap-config.glade.h:13
msgid "Address Book Properties"
msgstr "Address Book Properties"
@@ -810,14 +768,14 @@ 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:990
+#: ../addressbook/gui/widgets/e-addressbook-view.c:979
#: ../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/e-calendar-table.c:1303
+#: ../calendar/gui/e-calendar-view.c:1701
+#: ../calendar/gui/e-memo-table.c:919
#: ../calendar/gui/memos-component.c:453
#: ../calendar/gui/tasks-component.c:444
-#: ../mail/em-folder-tree.c:2077
+#: ../mail/em-folder-tree.c:2103
#: ../mail/em-folder-view.c:1148
#: ../ui/evolution-addressbook.xml.h:49
#: ../ui/evolution-calendar.xml.h:40
@@ -838,25 +796,19 @@ msgstr "Save As Vcard..."
msgid "_Properties..."
msgstr "_Properties..."
-#: ../addressbook/gui/component/addressbook-view.c:1343
+#. Create the contacts group
+#: ../addressbook/gui/component/addressbook-view.c:1334
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
+#: ../calendar/gui/calendar-component.c:272
+#: ../calendar/gui/migration.c:402
+#: ../plugins/exchange-operations/exchange-folder.c:575
+msgid "Contacts"
+msgstr "Contacts"
+
+#: ../addressbook/gui/component/addressbook-view.c:1345
msgid "Contact Source Selector"
msgstr "Contact Source Selector"
-#: ../addressbook/gui/component/addressbook.c:99
-msgid "Accessing LDAP Server anonymously"
-msgstr "Accessing LDAP Server anonymously"
-
-#: ../addressbook/gui/component/addressbook.c:197
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:513
-msgid "Failed to authenticate.\n"
-msgstr "Failed to authenticate.\n"
-
-#: ../addressbook/gui/component/addressbook.c:204
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:493
-#, c-format
-msgid "Enter password for %s (user %s)"
-msgstr "Enter password for %s (user %s)"
-
#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:1
msgid "Autocomplete length"
msgstr "Autocomplete length"
@@ -898,6 +850,54 @@ msgstr "Vertical pane position"
msgid "Whether to show the preview pane."
msgstr "Whether to show the preview pane."
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
+msgid "Autocompletion"
+msgstr "Autocompletion"
+
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
+msgid "C_ontacts"
+msgstr "C_ontacts"
+
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
+msgid "Certificates"
+msgstr "Certificates"
+
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
+msgid "Configure autocomplete here"
+msgstr "Configure autocomplete here"
+
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
+msgid "Evolution Address Book"
+msgstr "Evolution Address Book"
+
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
+msgid "Evolution Address Book address pop-up"
+msgstr "Evolution Address Book address pop-up"
+
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
+msgid "Evolution Address Book address viewer"
+msgstr "Evolution Address Book address viewer"
+
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
+msgid "Evolution Address Book card viewer"
+msgstr "Evolution Address Book card viewer"
+
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
+msgid "Evolution Address Book component"
+msgstr "Evolution Address Book component"
+
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
+msgid "Evolution S/Mime Certificate Management Control"
+msgstr "Evolution S/Mime Certificate Management Control"
+
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
+msgid "Evolution folder settings configuration control"
+msgstr "Evolution folder settings configuration control"
+
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
+msgid "Manage your S/MIME certificates here"
+msgstr "Manage your S/MIME certificates here"
+
#: ../addressbook/gui/component/ldap-config.glade.h:1
msgid "1"
msgstr "1"
@@ -1109,9 +1109,9 @@ msgid "_Login method:"
msgstr "_Login method:"
#: ../addressbook/gui/component/ldap-config.glade.h:53
-#: ../calendar/gui/dialogs/calendar-setup.c:245
+#: ../calendar/gui/dialogs/calendar-setup.c:225
#: ../calendar/gui/dialogs/calendar-setup.glade.h:7
-#: ../mail/mail-config.glade.h:165
+#: ../mail/mail-config.glade.h:164
#: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:2
msgid "_Name:"
msgstr "_Name:"
@@ -1125,7 +1125,7 @@ msgid "_Search scope:"
msgstr "_Search scope:"
#: ../addressbook/gui/component/ldap-config.glade.h:56
-#: ../mail/mail-config.glade.h:172
+#: ../mail/mail-config.glade.h:171
#: ../plugins/publish-calendar/publish-calendar.glade.h:26
msgid "_Server:"
msgstr "_Server:"
@@ -1144,7 +1144,7 @@ msgstr "cards"
#: ../addressbook/gui/component/ldap-config.glade.h:60
#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:8
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:26
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:27
#: ../calendar/gui/dialogs/calendar-setup.glade.h:13
#: ../calendar/gui/dialogs/event-page.glade.h:20
#: ../filter/filter.glade.h:16
@@ -1192,7 +1192,7 @@ msgstr "<b>Work</b>"
#: ../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
+#: ../addressbook/gui/widgets/eab-contact-display.c:551
msgid "AIM"
msgstr "AIM"
@@ -1207,7 +1207,7 @@ msgstr "Contact"
#: ../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:2423
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2420
msgid "Contact Editor"
msgstr "Contact Editor"
@@ -1247,13 +1247,13 @@ msgstr "Telephone"
#. red
#: ../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/contact-editor/e-contact-editor-im.c:238
#: ../addressbook/gui/widgets/eab-contact-display.c:57
-#: ../addressbook/gui/widgets/eab-contact-display.c:585
-#: ../filter/filter-label.c:122
+#: ../addressbook/gui/widgets/eab-contact-display.c:580
+#: ../filter/filter-label.c:121
#: ../mail/em-migrate.c:1054
-#: ../mail/mail-config.glade.h:155
+#: ../mail/mail-config.glade.h:153
msgid "Work"
msgstr "Work"
@@ -1276,7 +1276,7 @@ msgstr "_Birthday:"
#: ../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
+#: ../plugins/itip-formatter/itip-view.c:1716
msgid "_Calendar:"
msgstr "_Calendar:"
@@ -1368,27 +1368,61 @@ msgstr "_Where:"
msgid "_Zip/Postal Code:"
msgstr "_Zip/Postal Code:"
+#: ../addressbook/gui/contact-editor/eab-editor.c:322
+#, c-format
+msgid ""
+"Are you sure you want\n"
+"to delete contact list (%s)?"
+msgstr ""
+"Are you sure you want\n"
+"to delete contact list (%s)?"
+
+#: ../addressbook/gui/contact-editor/eab-editor.c:325
+msgid ""
+"Are you sure you want\n"
+"to delete these contact lists?"
+msgstr ""
+"Are you sure you want\n"
+"to delete these contact lists?"
+
+#: ../addressbook/gui/contact-editor/eab-editor.c:330
+#, c-format
+msgid ""
+"Are you sure you want\n"
+"to delete contact (%s)?"
+msgstr ""
+"Are you sure you want\n"
+"to delete contact (%s)?"
+
+#: ../addressbook/gui/contact-editor/eab-editor.c:333
+msgid ""
+"Are you sure you want\n"
+"to delete these contacts?"
+msgstr ""
+"Are you sure you want\n"
+"to delete these contacts?"
+
#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:97
-#: ../addressbook/gui/widgets/eab-contact-display.c:582
-#: ../addressbook/gui/widgets/eab-contact-display.c:597
+#: ../addressbook/gui/widgets/eab-contact-display.c:577
+#: ../addressbook/gui/widgets/eab-contact-display.c:592
msgid "Address"
msgstr "Address"
#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:104
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:303
#: ../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-model.c:312
#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:398
+#: ../addressbook/gui/widgets/e-minicard.c:187
#: ../addressbook/gui/widgets/e-minicard-label.c:164
-#: ../addressbook/gui/widgets/e-minicard-view-widget.c:121
#: ../addressbook/gui/widgets/e-minicard-view.c:522
-#: ../addressbook/gui/widgets/e-minicard.c:187
+#: ../addressbook/gui/widgets/e-minicard-view-widget.c:121
#: ../widgets/menus/gal-define-views-model.c:181
-#: ../widgets/table/e-cell-text.c:1833
-#: ../widgets/text/e-entry.c:1265
-#: ../widgets/text/e-entry.c:1266
+#: ../widgets/table/e-cell-text.c:1830
+#: ../widgets/text/e-entry.c:1263
+#: ../widgets/text/e-entry.c:1264
#: ../widgets/text/e-text.c:3625
#: ../widgets/text/e-text.c:3626
msgid "Editable"
@@ -2362,87 +2396,50 @@ msgstr "Zambia"
msgid "Zimbabwe"
msgstr "Zimbabwe"
-#: ../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:63
-msgid "AOL Instant Messenger"
-msgstr "AOL Instant Messenger"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:65
#: ../addressbook/gui/contact-editor/e-contact-editor.c:187
-#: ../addressbook/gui/widgets/eab-contact-display.c:559
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:65
+#: ../addressbook/gui/widgets/eab-contact-display.c:554
msgid "Jabber"
msgstr "Jabber"
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:66
-msgid "Yahoo Messenger"
-msgstr "Yahoo Messenger"
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:188
+#: ../addressbook/gui/widgets/eab-contact-display.c:556
+msgid "Yahoo"
+msgstr "Yahoo"
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:67
-msgid "Gadu-Gadu Messenger"
-msgstr "Gadu-Gadu Messenger"
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:189
+#: ../addressbook/gui/widgets/eab-contact-display.c:557
+msgid "Gadu-Gadu"
+msgstr "Gadu-Gadu"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:190
+#: ../addressbook/gui/widgets/eab-contact-display.c:555
+msgid "MSN"
+msgstr "MSN"
-#: ../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
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:69
+#: ../addressbook/gui/widgets/eab-contact-display.c:553
msgid "ICQ"
msgstr "ICQ"
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:121
-msgid "Service"
-msgstr "Service"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:130
-#: ../calendar/gui/e-cal-list-view.etspec.h:3
-#: ../mail/message-list.etspec.h:8
-#: ../plugins/publish-calendar/publish-calendar.c:497
-#: ../plugins/save-calendar/csv-format.c:400
-msgid "Location"
-msgstr "Location"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:137
-msgid "Username"
-msgstr "Username"
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:192
+#: ../addressbook/gui/widgets/eab-contact-display.c:552
+msgid "GroupWise"
+msgstr "GroupWise"
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:234
#: ../addressbook/gui/contact-editor/e-contact-editor.c:205
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:234
#: ../addressbook/gui/widgets/eab-contact-display.c:58
msgid "Home"
msgstr "Home"
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:242
#: ../addressbook/gui/contact-editor/e-contact-editor.c:206
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:242
#: ../addressbook/gui/widgets/eab-contact-display.c:59
msgid "Other"
msgstr "Other"
-#: ../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: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:192
-#: ../addressbook/gui/widgets/eab-contact-display.c:557
-msgid "GroupWise"
-msgstr "GroupWise"
-
#: ../addressbook/gui/contact-editor/e-contact-editor.c:261
msgid "Source Book"
msgstr "Source Book"
@@ -2468,20 +2465,20 @@ msgid "Changed"
msgstr "Changed"
#: ../addressbook/gui/contact-editor/e-contact-editor.c:562
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2418
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2415
#, c-format
msgid "Contact Editor - %s"
msgstr "Contact Editor - %s"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2798
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2795
msgid "Please select an image for this contact"
msgstr "Please select an image for this contact"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2799
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2796
msgid "_No image"
msgstr "_No image"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3103
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3097
msgid ""
"The contact data is invalid:\n"
"\n"
@@ -2489,80 +2486,83 @@ msgstr ""
"The contact data is invalid:\n"
"\n"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3107
+#: ../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:3114
+#: ../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:3129
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3140
+#: ../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:3155
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3149
msgid "Invalid contact."
msgstr "Invalid contact."
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:290
+#: ../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:366
+#: ../widgets/menus/gal-view-new-dialog.c:73
+msgid "Name"
+msgstr "Name"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:63
+msgid "AOL Instant Messenger"
+msgstr "AOL Instant Messenger"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:66
+msgid "Yahoo Messenger"
+msgstr "Yahoo Messenger"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:67
+msgid "Gadu-Gadu Messenger"
+msgstr "Gadu-Gadu Messenger"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:121
+msgid "Service"
+msgstr "Service"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:130
+#: ../calendar/gui/e-cal-list-view.etspec.h:3
+#: ../mail/message-list.etspec.h:8
+#: ../plugins/publish-calendar/publish-calendar.c:497
+#: ../plugins/save-calendar/csv-format.c:400
+msgid "Location"
+msgstr "Location"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:137
+msgid "Username"
+msgstr "Username"
+
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:292
msgid "Contact Quick-Add"
msgstr "Contact Quick-Add"
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:293
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:295
msgid "_Edit Full"
msgstr "_Edit Full"
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:337
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:336
msgid "_Full name"
msgstr "_Full name"
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:348
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:347
msgid "E_mail"
msgstr "E_mail"
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:359
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:358
msgid "_Select Address Book"
msgstr "_Select Address Book"
-#: ../addressbook/gui/contact-editor/eab-editor.c:322
-#, c-format
-msgid ""
-"Are you sure you want\n"
-"to delete contact list (%s)?"
-msgstr ""
-"Are you sure you want\n"
-"to delete contact list (%s)?"
-
-#: ../addressbook/gui/contact-editor/eab-editor.c:325
-msgid ""
-"Are you sure you want\n"
-"to delete these contact lists?"
-msgstr ""
-"Are you sure you want\n"
-"to delete these contact lists?"
-
-#: ../addressbook/gui/contact-editor/eab-editor.c:330
-#, c-format
-msgid ""
-"Are you sure you want\n"
-"to delete contact (%s)?"
-msgstr ""
-"Are you sure you want\n"
-"to delete contact (%s)?"
-
-#: ../addressbook/gui/contact-editor/eab-editor.c:333
-msgid ""
-"Are you sure you want\n"
-"to delete these contacts?"
-msgstr ""
-"Are you sure you want\n"
-"to delete these contacts?"
-
#: ../addressbook/gui/contact-editor/fulladdr.glade.h:1
msgid "Address _2:"
msgstr "Address _2:"
@@ -2668,7 +2668,7 @@ msgstr "_IM Service:"
#: ../calendar/gui/dialogs/event-page.glade.h:16
#: ../plugins/calendar-weather/calendar-weather.c:409
#: ../plugins/exchange-operations/exchange-calendar.c:242
-#: ../plugins/exchange-operations/exchange-contacts.c:235
+#: ../plugins/exchange-operations/exchange-contacts.c:234
msgid "_Location:"
msgstr "_Location:"
@@ -2714,11 +2714,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:167
-#: ../addressbook/gui/widgets/e-addressbook-model.c:296
+#: ../addressbook/gui/widgets/e-addressbook-model.c:298
#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:384
-#: ../addressbook/gui/widgets/e-addressbook-view.c:232
-#: ../addressbook/gui/widgets/e-minicard-view-widget.c:107
+#: ../addressbook/gui/widgets/e-addressbook-view.c:225
#: ../addressbook/gui/widgets/e-minicard-view.c:508
+#: ../addressbook/gui/widgets/e-minicard-view-widget.c:107
msgid "Book"
msgstr "Book"
@@ -2771,66 +2771,526 @@ msgstr ""
"The name or email address of this contact already exists\n"
"in this folder. Would you like to add it anyway?"
+#: ../addressbook/gui/merging/eab-contact-merging.c:189
+msgid "Merge Contact"
+msgstr "Merge Contact"
+
+#: ../addressbook/gui/merging/eab-contact-merging.c:204
+msgid "Merge"
+msgstr "Merge"
+
+#: ../addressbook/gui/merging/eab-contact-merging.c:257
+#: ../addressbook/gui/widgets/eab-contact-display.c:535
+#: ../addressbook/gui/widgets/eab-contact-display.c:537
+#: ../addressbook/gui/widgets/eab-contact-display.c:780
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:10
+#: ../plugins/groupwise-features/junk-settings.c:425
+#: ../smime/lib/e-cert.c:827
+msgid "Email"
+msgstr "Email"
+
#: ../addressbook/gui/widgets/addresstypes.xml.h:1
-#: ../addressbook/gui/widgets/e-addressbook-view.c:180
+#: ../addressbook/gui/widgets/e-addressbook-view.c:173
#: ../calendar/gui/cal-search-bar.c:60
msgid "Any field contains"
msgstr "Any field contains"
#: ../addressbook/gui/widgets/addresstypes.xml.h:2
-#: ../addressbook/gui/widgets/e-addressbook-view.c:179
+#: ../addressbook/gui/widgets/e-addressbook-view.c:172
msgid "Email begins with"
msgstr "Email begins with"
#: ../addressbook/gui/widgets/addresstypes.xml.h:3
-#: ../addressbook/gui/widgets/e-addressbook-view.c:178
+#: ../addressbook/gui/widgets/e-addressbook-view.c:171
msgid "Name begins with"
msgstr "Name begins with"
-#: ../addressbook/gui/widgets/e-addressbook-model.c:148
+#: ../addressbook/gui/widgets/eab-contact-display.c:172
+#: ../mail/em-popup.c:620
+msgid "_Open Link in Browser"
+msgstr "_Open Link in Browser"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:173
+#: ../mail/em-folder-view.c:2529
+msgid "_Copy Link Location"
+msgstr "_Copy Link Location"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:174
+#: ../mail/em-popup.c:621
+msgid "_Send New Message To..."
+msgstr "_Send New Message To..."
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:175
+#: ../plugins/copy-tool/org-gnome-copy-tool.eplug.xml.h:2
+msgid "Copy _Email Address"
+msgstr "Copy _Email Address"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:296
+#: ../addressbook/gui/widgets/eab-contact-display.c:359
+msgid "(map)"
+msgstr "(map)"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:306
+#: ../addressbook/gui/widgets/eab-contact-display.c:372
+msgid "map"
+msgstr "map"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:456
+#: ../addressbook/gui/widgets/eab-contact-display.c:758
+msgid "List Members"
+msgstr "List Members"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:545
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:24
+msgid "Nickname"
+msgstr "Nickname"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:566
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:27
+msgid "Organization"
+msgstr "Organisation"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:567
+msgid "Department"
+msgstr "Department"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:568
+msgid "Profession"
+msgstr "Profession"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:569
+msgid "Position"
+msgstr "Position"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:570
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:22
+msgid "Manager"
+msgstr "Manager"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:571
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:1
+msgid "Assistant"
+msgstr "Assistant"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:572
+msgid "Video Chat"
+msgstr "Video Chat"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:573
+#: ../calendar/gui/calendar-commands.c:99
+#: ../calendar/gui/calendar-component.c:755
+#: ../calendar/gui/dialogs/calendar-setup.c:366
+#: ../calendar/gui/gnome-cal.c:2306
+#: ../plugins/exchange-operations/exchange-folder.c:569
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:400
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:431
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:544
+#: ../plugins/hula-account-setup/camel-hula-listener.c:381
+#: ../plugins/hula-account-setup/camel-hula-listener.c:410
+#: ../plugins/publish-calendar/publish-calendar.glade.h:5
+msgid "Calendar"
+msgstr "Calendar"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:574
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
+#: ../calendar/gui/dialogs/event-editor.c:370
+#: ../ui/evolution-event-editor.xml.h:8
+msgid "Free/Busy"
+msgstr "Free/Busy"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:575
+#: ../addressbook/gui/widgets/eab-contact-display.c:590
+msgid "Phone"
+msgstr "Phone"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:576
+msgid "Fax"
+msgstr "Fax"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:587
+msgid "Home Page"
+msgstr "Home Page"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:588
+msgid "Web Log"
+msgstr "Web Log"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:591
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:23
+msgid "Mobile Phone"
+msgstr "Mobile Phone"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:593
+msgid "Birthday"
+msgstr "Birthday"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:594
+msgid "Anniversary"
+msgstr "Anniversary"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:595
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:34
+msgid "Spouse"
+msgstr "Spouse"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:604
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:25
+msgid "Note"
+msgstr "Note"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:776
+msgid "Job Title"
+msgstr "Job Title"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:807
+msgid "Home page"
+msgstr "Home page"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:815
+msgid "Blog"
+msgstr "Blog"
+
+#. E_BOOK_ERROR_OK
+#: ../addressbook/gui/widgets/eab-gui-util.c:51
+msgid "Success"
+msgstr "Success"
+
+#. E_BOOK_ERROR_INVALID_ARG
+#. E_BOOK_ERROR_BUSY
+#: ../addressbook/gui/widgets/eab-gui-util.c:53
+msgid "Backend busy"
+msgstr "Backend busy"
+
+#. E_BOOK_ERROR_REPOSITORY_OFFLINE
+#: ../addressbook/gui/widgets/eab-gui-util.c:54
+msgid "Repository offline"
+msgstr "Repository offline"
+
+#. E_BOOK_ERROR_NO_SUCH_BOOK
+#: ../addressbook/gui/widgets/eab-gui-util.c:55
+msgid "Address Book does not exist"
+msgstr "Address Book does not exist"
+
+#. E_BOOK_ERROR_NO_SELF_CONTACT
+#: ../addressbook/gui/widgets/eab-gui-util.c:56
+msgid "No Self Contact defined"
+msgstr "No Self Contact defined"
+
+#. E_BOOK_ERROR_URI_NOT_LOADED
+#. E_BOOK_ERROR_URI_ALREADY_LOADED
+#. E_BOOK_ERROR_PERMISSION_DENIED
+#: ../addressbook/gui/widgets/eab-gui-util.c:59
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:49
+msgid "Permission denied"
+msgstr "Permission denied"
+
+#. E_BOOK_ERROR_CONTACT_NOT_FOUND
+#: ../addressbook/gui/widgets/eab-gui-util.c:60
+msgid "Contact not found"
+msgstr "Contact not found"
+
+#. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
+#: ../addressbook/gui/widgets/eab-gui-util.c:61
+msgid "Contact ID already exists"
+msgstr "Contact ID already exists"
+
+#. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
+#: ../addressbook/gui/widgets/eab-gui-util.c:62
+msgid "Protocol not supported"
+msgstr "Protocol not supported"
+
+#. E_BOOK_ERROR_CANCELLED
+#: ../addressbook/gui/widgets/eab-gui-util.c:63
+#: ../calendar/gui/dialogs/task-details-page.glade.h:3
+#: ../calendar/gui/e-cal-component-preview.c:236
+#: ../calendar/gui/e-calendar-table.c:464
+#: ../calendar/gui/e-cal-model-tasks.c:349
+#: ../calendar/gui/e-cal-model-tasks.c:664
+#: ../calendar/gui/print.c:2351
+msgid "Canceled"
+msgstr "Cancelled"
+
+#. E_BOOK_ERROR_COULD_NOT_CANCEL
+#: ../addressbook/gui/widgets/eab-gui-util.c:64
+msgid "Could not cancel"
+msgstr "Could not cancel"
+
+#. E_BOOK_ERROR_AUTHENTICATION_FAILED
+#: ../addressbook/gui/widgets/eab-gui-util.c:65
+#: ../calendar/gui/comp-editor-factory.c:433
+msgid "Authentication Failed"
+msgstr "Authentication Failed"
+
+#. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
+#: ../addressbook/gui/widgets/eab-gui-util.c:66
+msgid "Authentication Required"
+msgstr "Authentication Required"
+
+#. E_BOOK_ERROR_TLS_NOT_AVAILABLE
+#: ../addressbook/gui/widgets/eab-gui-util.c:67
+msgid "TLS not Available"
+msgstr "TLS not Available"
+
+#. E_BOOK_ERROR_CORBA_EXCEPTION
+#. E_BOOK_ERROR_NO_SUCH_SOURCE
+#: ../addressbook/gui/widgets/eab-gui-util.c:69
+msgid "No such source"
+msgstr "No such source"
+
+#. E_BOOK_ERROR_OFFLINE_UNAVAILABLE
+#: ../addressbook/gui/widgets/eab-gui-util.c:70
+msgid "Not available in offline mode"
+msgstr "Not available in offline mode"
+
+#. E_BOOK_ERROR_OTHER_ERROR
+#: ../addressbook/gui/widgets/eab-gui-util.c:71
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1854
+msgid "Other error"
+msgstr "Other error"
+
+#. E_BOOK_ERROR_INVALID_SERVER_VERSION
+#: ../addressbook/gui/widgets/eab-gui-util.c:72
+msgid "Invalid server version"
+msgstr "Invalid server version"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:95
+msgid "We were unable to open this addressbook. This either means this book is not marked for offline usage or not yet downloaded for offline usage. Please load the addressbook once in online mode to download its contents"
+msgstr "We were unable to open this addressbook. This either means this book is not marked for offline usage or not yet downloaded for offline usage. Please load the addressbook once in online mode to download its contents"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:104
+#, c-format
+msgid "We were unable to open this addressbook. Please check that the path %s exists and that you have permission to access it."
+msgstr "We were unable to open this addressbook. Please check that the path %s exists and that you have permission to access it."
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:113
+msgid "We were unable to open this addressbook. This either means you have entered an incorrect URI, or the LDAP server is unreachable."
+msgstr "We were unable to open this addressbook. This either means you have entered an incorrect URI, or the LDAP server is unreachable."
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:118
+msgid "This version of Evolution does not have LDAP support compiled in to it. If you want to use LDAP in Evolution, you must install an LDAP-enabled Evolution package."
+msgstr "This version of Evolution does not have LDAP support compiled in to it. If you want to use LDAP in Evolution, you must install an LDAP-enabled Evolution package."
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:125
+msgid "We were unable to open this addressbook. This either means you have entered an incorrect URI, or the server is unreachable."
+msgstr "We were unable to open this addressbook. This either means you have entered an incorrect URI, or the server is unreachable."
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:148
+msgid ""
+"More cards matched this query than either the server is \n"
+"configured to return or Evolution is configured to display.\n"
+"Please make your search more specific or raise the result limit in\n"
+"the directory server preferences for this addressbook."
+msgstr ""
+"More cards matched this query than either the server is \n"
+"configured to return or Evolution is configured to display.\n"
+"Please make your search more specific or raise the result limit in\n"
+"the directory server preferences for this addressbook."
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:154
+msgid ""
+"The time to execute this query exceeded the server limit or the limit\n"
+"you have configured for this addressbook. Please make your search\n"
+"more specific or raise the time limit in the directory server\n"
+"preferences for this addressbook."
+msgstr ""
+"The time to execute this query exceeded the server limit or the limit\n"
+"you have configured for this addressbook. Please make your search\n"
+"more specific or raise the time limit in the directory server\n"
+"preferences for this addressbook."
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:160
+msgid "The backend for this addressbook was unable to parse this query."
+msgstr "The backend for this addressbook was unable to parse this query."
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:163
+msgid "The backend for this addressbook refused to perform this query."
+msgstr "The backend for this addressbook refused to perform this query."
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:166
+msgid "This query did not complete successfully."
+msgstr "This query did not complete successfully."
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:188
+msgid "Error adding list"
+msgstr "Error adding list"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:188
+#: ../addressbook/gui/widgets/eab-gui-util.c:710
+msgid "Error adding contact"
+msgstr "Error adding contact"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:199
+msgid "Error modifying list"
+msgstr "Error modifying list"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:199
+msgid "Error modifying contact"
+msgstr "Error modifying contact"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:211
+msgid "Error removing list"
+msgstr "Error removing list"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:211
+#: ../addressbook/gui/widgets/eab-gui-util.c:660
+msgid "Error removing contact"
+msgstr "Error removing contact"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:293
+#, c-format
+msgid ""
+"Opening %d contact will open %d new window as well.\n"
+"Do you really want to display this contact?"
+msgid_plural ""
+"Opening %d contacts will open %d new windows as well.\n"
+"Do you really want to display all of these contacts?"
+msgstr[0] ""
+"Opening %d contact will open %d new window as well.\n"
+"Do you really want to display this contact?"
+msgstr[1] ""
+"Opening %d contacts will open %d new windows as well.\n"
+"Do you really want to display all of these contacts?"
+
+#. For Translators only: "it" refers to the filename %s.
+#: ../addressbook/gui/widgets/eab-gui-util.c:325
+#, c-format
+msgid ""
+"%s already exists\n"
+"Do you want to overwrite it?"
+msgstr ""
+"%s already exists\n"
+"Do you want to overwrite it?"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:329
+msgid "Overwrite"
+msgstr "Overwrite"
+
+#. more than one, finding the total number of contacts might
+#. * hit performance while saving large number of contacts
+#.
+#: ../addressbook/gui/widgets/eab-gui-util.c:376
+#: ../addressbook/gui/widgets/eab-gui-util.c:379
+msgid "contact"
+msgid_plural "contacts"
+msgstr[0] "contact"
+msgstr[1] "contacts"
+
+#. This is a filename. Translators take note.
+#: ../addressbook/gui/widgets/eab-gui-util.c:427
+msgid "card.vcf"
+msgstr "card.vcf"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:464
+msgid "Select Address Book"
+msgstr "Select Address Book"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:605
+msgid "list"
+msgstr "list"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:771
+msgid "Move contact to"
+msgstr "Move contact to"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:773
+msgid "Copy contact to"
+msgstr "Copy contact to"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:776
+msgid "Move contacts to"
+msgstr "Move contacts to"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:778
+msgid "Copy contacts to"
+msgstr "Copy contacts to"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:1004
+msgid "Multiple VCards"
+msgstr "Multiple VCards"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:1007
+#, c-format
+msgid "VCard for %s"
+msgstr "VCard for %s"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:1048
+#: ../addressbook/gui/widgets/eab-gui-util.c:1066
+msgid "Contact information"
+msgstr "Contact information"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:1068
+#, c-format
+msgid "Contact information for %s"
+msgstr "Contact information for %s"
+
+#: ../addressbook/gui/widgets/eab-popup-control.c:289
+msgid "Querying Address Book..."
+msgstr "Querying Address Book..."
+
+#: ../addressbook/gui/widgets/eab-vcard-control.c:143
+#, c-format
+msgid "There is one other contact."
+msgid_plural "There are %d other contacts."
+msgstr[0] "There is one other contact."
+msgstr[1] "There are %d other contacts."
+
+#: ../addressbook/gui/widgets/eab-vcard-control.c:228
+#: ../addressbook/gui/widgets/eab-vcard-control.c:281
+msgid "Show Full VCard"
+msgstr "Show Full VCard"
+
+#: ../addressbook/gui/widgets/eab-vcard-control.c:232
+msgid "Show Compact VCard"
+msgstr "Show Compact VCard"
+
+#: ../addressbook/gui/widgets/eab-vcard-control.c:286
+msgid "Save in addressbook"
+msgstr "Save in addressbook"
+
+#: ../addressbook/gui/widgets/e-addressbook-model.c:150
msgid "No contacts"
msgstr "No contacts"
-#: ../addressbook/gui/widgets/e-addressbook-model.c:151
+#: ../addressbook/gui/widgets/e-addressbook-model.c:153
#, c-format
msgid "%d contact"
msgid_plural "%d contacts"
msgstr[0] "%d contact"
msgstr[1] "%d contacts"
-#: ../addressbook/gui/widgets/e-addressbook-model.c:303
+#: ../addressbook/gui/widgets/e-addressbook-model.c:305
#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:391
-#: ../addressbook/gui/widgets/e-addressbook-view.c:246
-#: ../addressbook/gui/widgets/e-minicard-view-widget.c:114
+#: ../addressbook/gui/widgets/e-addressbook-view.c:239
#: ../addressbook/gui/widgets/e-minicard-view.c:515
+#: ../addressbook/gui/widgets/e-minicard-view-widget.c:114
msgid "Query"
msgstr "Query"
-#: ../addressbook/gui/widgets/e-addressbook-model.c:446
+#: ../addressbook/gui/widgets/e-addressbook-model.c:448
msgid "Error getting book view"
msgstr "Error getting book view"
#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:405
+#: ../widgets/table/e-table.c:3340
#: ../widgets/table/e-table-click-to-add.c:502
#: ../widgets/table/e-table-selection-model.c:311
-#: ../widgets/table/e-table.c:3337
#: ../widgets/table/e-tree-selection-model.c:825
-#: ../widgets/text/e-entry.c:1209
-#: ../widgets/text/e-entry.c:1210
+#: ../widgets/text/e-entry.c:1207
+#: ../widgets/text/e-entry.c:1208
#: ../widgets/text/e-text.c:3489
#: ../widgets/text/e-text.c:3490
msgid "Model"
msgstr "Model"
-#: ../addressbook/gui/widgets/e-addressbook-table-adapter.c:103
+#: ../addressbook/gui/widgets/e-addressbook-table-adapter.c:104
msgid "Error modifying card"
msgstr "Error modifying card"
-#: ../addressbook/gui/widgets/e-addressbook-view.c:239
+#: ../addressbook/gui/widgets/e-addressbook-view.c:232
msgid "Source"
msgstr "Source"
-#: ../addressbook/gui/widgets/e-addressbook-view.c:253
+#: ../addressbook/gui/widgets/e-addressbook-view.c:246
#: ../calendar/gui/dialogs/meeting-page.etspec.h:11
#: ../calendar/gui/e-calendar-table.etspec.h:13
#: ../calendar/gui/e-meeting-list-view.c:500
@@ -2839,81 +3299,81 @@ msgstr "Source"
msgid "Type"
msgstr "Type"
-#: ../addressbook/gui/widgets/e-addressbook-view.c:843
-#: ../addressbook/gui/widgets/e-addressbook-view.c:2178
+#: ../addressbook/gui/widgets/e-addressbook-view.c:836
+#: ../addressbook/gui/widgets/e-addressbook-view.c:2073
#: ../ui/evolution-addressbook.xml.h:31
msgid "Save as VCard..."
msgstr "Save as VCard..."
-#: ../addressbook/gui/widgets/e-addressbook-view.c:968
-#: ../calendar/gui/dialogs/comp-editor.c:1119
-#: ../calendar/gui/e-calendar-table.c:1280
-#: ../calendar/gui/e-calendar-view.c:1698
-#: ../calendar/gui/e-memo-table.c:901
+#: ../addressbook/gui/widgets/e-addressbook-view.c:957
+#: ../calendar/gui/dialogs/comp-editor.c:1121
+#: ../calendar/gui/e-calendar-table.c:1281
+#: ../calendar/gui/e-calendar-view.c:1679
+#: ../calendar/gui/e-memo-table.c:902
#: ../ui/evolution-addressbook.xml.h:56
msgid "_Open"
msgstr "_Open"
-#: ../addressbook/gui/widgets/e-addressbook-view.c:970
+#: ../addressbook/gui/widgets/e-addressbook-view.c:959
msgid "_New Contact..."
msgstr "_New Contact..."
-#: ../addressbook/gui/widgets/e-addressbook-view.c:971
+#: ../addressbook/gui/widgets/e-addressbook-view.c:960
msgid "New Contact _List..."
msgstr "New Contact _List..."
-#: ../addressbook/gui/widgets/e-addressbook-view.c:974
+#: ../addressbook/gui/widgets/e-addressbook-view.c:963
msgid "_Save as VCard..."
msgstr "_Save as VCard..."
-#: ../addressbook/gui/widgets/e-addressbook-view.c:975
+#: ../addressbook/gui/widgets/e-addressbook-view.c:964
msgid "_Forward Contact"
msgstr "_Forward Contact"
-#: ../addressbook/gui/widgets/e-addressbook-view.c:976
+#: ../addressbook/gui/widgets/e-addressbook-view.c:965
msgid "_Forward Contacts"
msgstr "_Forward Contacts"
-#: ../addressbook/gui/widgets/e-addressbook-view.c:977
+#: ../addressbook/gui/widgets/e-addressbook-view.c:966
msgid "Send _Message to Contact"
msgstr "Send _Message to Contact"
-#: ../addressbook/gui/widgets/e-addressbook-view.c:978
+#: ../addressbook/gui/widgets/e-addressbook-view.c:967
msgid "Send _Message to List"
msgstr "Send _Message to List"
-#: ../addressbook/gui/widgets/e-addressbook-view.c:979
+#: ../addressbook/gui/widgets/e-addressbook-view.c:968
msgid "Send _Message to Contacts"
msgstr "Send _Message to Contacts"
-#: ../addressbook/gui/widgets/e-addressbook-view.c:980
+#: ../addressbook/gui/widgets/e-addressbook-view.c:969
msgid "_Print"
msgstr "_Print"
-#: ../addressbook/gui/widgets/e-addressbook-view.c:983
+#: ../addressbook/gui/widgets/e-addressbook-view.c:972
msgid "Cop_y to Address Book..."
msgstr "Cop_y to Address Book..."
-#: ../addressbook/gui/widgets/e-addressbook-view.c:984
+#: ../addressbook/gui/widgets/e-addressbook-view.c:973
msgid "Mo_ve to Address Book..."
msgstr "Mo_ve to Address Book..."
-#: ../addressbook/gui/widgets/e-addressbook-view.c:987
+#: ../addressbook/gui/widgets/e-addressbook-view.c:976
#: ../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:988
+#: ../addressbook/gui/widgets/e-addressbook-view.c:977
#: ../calendar/gui/calendar-component.c:583
#: ../calendar/gui/dialogs/comp-editor.c:463
-#: ../calendar/gui/e-calendar-table.c:1288
-#: ../calendar/gui/e-calendar-view.c:1705
-#: ../calendar/gui/e-memo-table.c:909
+#: ../calendar/gui/e-calendar-table.c:1289
+#: ../calendar/gui/e-calendar-view.c:1686
+#: ../calendar/gui/e-memo-table.c:910
#: ../calendar/gui/memos-component.c:452
#: ../calendar/gui/tasks-component.c:443
-#: ../composer/e-msg-composer.c:3185
-#: ../mail/em-folder-tree.c:1002
+#: ../composer/e-msg-composer.c:3177
+#: ../mail/em-folder-tree.c:1004
#: ../mail/em-folder-view.c:1134
#: ../mail/message-list.c:1922
#: ../ui/evolution-addressbook.xml.h:46
@@ -2926,33 +3386,16 @@ msgstr "Cu_t"
msgid "_Copy"
msgstr "_Copy"
-#: ../addressbook/gui/widgets/e-addressbook-view.c:989
+#: ../addressbook/gui/widgets/e-addressbook-view.c:978
msgid "P_aste"
msgstr "P_aste"
#. All, unmatched, separator
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1671
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1660
#: ../calendar/gui/cal-search-bar.c:428
msgid "Any Category"
msgstr "Any Category"
-#. FIXME: Allow range selection in table views, as in minicard view
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1871
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1927
-msgid "Print cards"
-msgstr "Print cards"
-
-#. E_BOOK_ERROR_OTHER_ERROR
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1961
-#: ../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"
-
#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:2
msgid "Assistant Phone"
msgstr "Assistant Phone"
@@ -2979,8 +3422,8 @@ msgstr "Car Phone"
#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:8
#: ../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-cal-list-view.etspec.h:1
#: ../calendar/gui/e-memo-table.etspec.h:1
msgid "Categories"
msgstr "Categories"
@@ -2989,13 +3432,6 @@ msgstr "Categories"
msgid "Company Phone"
msgstr "Company Phone"
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:10
-#: ../addressbook/gui/widgets/eab-contact-display.c:785
-#: ../plugins/groupwise-features/junk-settings.c:425
-#: ../smime/lib/e-cert.c:827
-msgid "Email"
-msgstr "Email"
-
#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:11
msgid "Email 2"
msgstr "Email 2"
@@ -3036,35 +3472,10 @@ msgstr "ISDN Phone"
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: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:609
-msgid "Note"
-msgstr "Note"
-
#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:26
msgid "Office"
msgstr "Office"
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:27
-#: ../addressbook/gui/widgets/eab-contact-display.c:571
-msgid "Organization"
-msgstr "Organisation"
-
#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:28
msgid "Other Fax"
msgstr "Other Fax"
@@ -3093,11 +3504,6 @@ msgstr "Radio"
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"
-
#. Translators: This is a vcard standard and stands for the type of
#. phone used by the hearing impaired. TTY stands for "teletype"
#. (familiar from Unix device names), and TDD is "Telecommunications
@@ -3124,8 +3530,20 @@ msgstr "Unit"
msgid "Web Site"
msgstr "Web Site"
-#: ../addressbook/gui/widgets/e-minicard-label.c:115
+#: ../addressbook/gui/widgets/e-minicard.c:102
+msgid "Work Email"
+msgstr "Work Email"
+
+#: ../addressbook/gui/widgets/e-minicard.c:103
+msgid "Home Email"
+msgstr "Home Email"
+
+#: ../addressbook/gui/widgets/e-minicard.c:104
+msgid "Other Email"
+msgstr "Other Email"
+
#: ../addressbook/gui/widgets/e-minicard.c:150
+#: ../addressbook/gui/widgets/e-minicard-label.c:115
#: ../widgets/misc/e-canvas-vbox.c:96
#: ../widgets/misc/e-canvas-vbox.c:97
#: ../widgets/misc/e-reflow.c:1436
@@ -3144,8 +3562,8 @@ msgstr "Web Site"
msgid "Width"
msgstr "Width"
-#: ../addressbook/gui/widgets/e-minicard-label.c:122
#: ../addressbook/gui/widgets/e-minicard.c:157
+#: ../addressbook/gui/widgets/e-minicard-label.c:122
#: ../widgets/misc/e-canvas-vbox.c:108
#: ../widgets/misc/e-canvas-vbox.c:109
#: ../widgets/misc/e-reflow.c:1444
@@ -3163,11 +3581,19 @@ msgstr "Width"
msgid "Height"
msgstr "Height"
-#: ../addressbook/gui/widgets/e-minicard-label.c:129
#: ../addressbook/gui/widgets/e-minicard.c:165
+#: ../addressbook/gui/widgets/e-minicard-label.c:129
msgid "Has Focus"
msgstr "Has Focus"
+#: ../addressbook/gui/widgets/e-minicard.c:173
+msgid "Selected"
+msgstr "Selected"
+
+#: ../addressbook/gui/widgets/e-minicard.c:180
+msgid "Has Cursor"
+msgstr "Has Cursor"
+
#: ../addressbook/gui/widgets/e-minicard-label.c:136
msgid "Field"
msgstr "Field"
@@ -3184,10 +3610,6 @@ msgstr "Text Model"
msgid "Max field name length"
msgstr "Max field name length"
-#: ../addressbook/gui/widgets/e-minicard-view-widget.c:128
-msgid "Column Width"
-msgstr "Column Width"
-
#: ../addressbook/gui/widgets/e-minicard-view.c:174
msgid ""
"\n"
@@ -3240,431 +3662,9 @@ msgstr ""
msgid "Adapter"
msgstr "Adapter"
-#: ../addressbook/gui/widgets/e-minicard.c:102
-msgid "Work Email"
-msgstr "Work Email"
-
-#: ../addressbook/gui/widgets/e-minicard.c:103
-msgid "Home Email"
-msgstr "Home Email"
-
-#: ../addressbook/gui/widgets/e-minicard.c:104
-msgid "Other Email"
-msgstr "Other Email"
-
-#: ../addressbook/gui/widgets/e-minicard.c:173
-msgid "Selected"
-msgstr "Selected"
-
-#: ../addressbook/gui/widgets/e-minicard.c:180
-msgid "Has Cursor"
-msgstr "Has Cursor"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c: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:2545
-msgid "_Copy Link Location"
-msgstr "_Copy Link Location"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:176
-#: ../mail/em-popup.c:621
-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:311
-#: ../addressbook/gui/widgets/eab-contact-display.c:377
-msgid "map"
-msgstr "map"
-
-#: ../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:540
-#: ../addressbook/gui/widgets/eab-contact-display.c:542
-msgid "E-mail"
-msgstr "E-mail"
-
-#: ../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:577
-msgid "Video Chat"
-msgstr "Video Chat"
-
-#: ../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:2305
-#: ../plugins/exchange-operations/exchange-folder.c:569
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:402
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:433
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:546
-#: ../plugins/hula-account-setup/camel-hula-listener.c:381
-#: ../plugins/hula-account-setup/camel-hula-listener.c:410
-#: ../plugins/publish-calendar/publish-calendar.glade.h:5
-msgid "Calendar"
-msgstr "Calendar"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c: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:581
-msgid "Fax"
-msgstr "Fax"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:592
-msgid "Home Page"
-msgstr "Home Page"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:593
-msgid "Web Log"
-msgstr "Web Log"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:598
-msgid "Birthday"
-msgstr "Birthday"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:599
-msgid "Anniversary"
-msgstr "Anniversary"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:781
-msgid "Job Title"
-msgstr "Job Title"
-
-#: ../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:50
-msgid "Success"
-msgstr "Success"
-
-#. E_BOOK_ERROR_INVALID_ARG
-#. E_BOOK_ERROR_BUSY
-#: ../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:53
-msgid "Repository offline"
-msgstr "Repository offline"
-
-#. E_BOOK_ERROR_NO_SUCH_BOOK
-#: ../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: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: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:59
-msgid "Contact not found"
-msgstr "Contact not found"
-
-#. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
-#: ../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:61
-msgid "Protocol not supported"
-msgstr "Protocol not supported"
-
-#. E_BOOK_ERROR_CANCELLED
-#: ../addressbook/gui/widgets/eab-gui-util.c:62
-#: ../calendar/gui/dialogs/task-details-page.glade.h:3
-#: ../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:2516
-msgid "Canceled"
-msgstr "Cancelled"
-
-#. E_BOOK_ERROR_COULD_NOT_CANCEL
-#: ../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: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:65
-msgid "Authentication Required"
-msgstr "Authentication Required"
-
-#. E_BOOK_ERROR_TLS_NOT_AVAILABLE
-#: ../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:68
-msgid "No such source"
-msgstr "No such source"
-
-#. E_BOOK_ERROR_OFFLINE_UNAVAILABLE
-#: ../addressbook/gui/widgets/eab-gui-util.c:69
-msgid "Not available in offline mode"
-msgstr "Not available in offline mode"
-
-#. E_BOOK_ERROR_INVALID_SERVER_VERSION
-#: ../addressbook/gui/widgets/eab-gui-util.c:71
-msgid "Invalid server version"
-msgstr "Invalid server version"
-
-#: ../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: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: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: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: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:147
-msgid ""
-"More cards matched this query than either the server is \n"
-"configured to return or Evolution is configured to display.\n"
-"Please make your search more specific or raise the result limit in\n"
-"the directory server preferences for this addressbook."
-msgstr ""
-"More cards matched this query than either the server is \n"
-"configured to return or Evolution is configured to display.\n"
-"Please make your search more specific or raise the result limit in\n"
-"the directory server preferences for this addressbook."
-
-#: ../addressbook/gui/widgets/eab-gui-util.c: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"
-"more specific or raise the time limit in the directory server\n"
-"preferences for this addressbook."
-msgstr ""
-"The time to execute this query exceeded the server limit or the limit\n"
-"you have configured for this addressbook. Please make your search\n"
-"more specific or raise the time limit in the directory server\n"
-"preferences for this addressbook."
-
-#: ../addressbook/gui/widgets/eab-gui-util.c: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: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:165
-msgid "This query did not complete successfully."
-msgstr "This query did not complete successfully."
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:187
-msgid "Error adding list"
-msgstr "Error adding list"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:187
-#: ../addressbook/gui/widgets/eab-gui-util.c:707
-msgid "Error adding contact"
-msgstr "Error adding contact"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:198
-msgid "Error modifying list"
-msgstr "Error modifying list"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:198
-msgid "Error modifying contact"
-msgstr "Error modifying contact"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:210
-msgid "Error removing list"
-msgstr "Error removing list"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:210
-#: ../addressbook/gui/widgets/eab-gui-util.c:659
-msgid "Error removing contact"
-msgstr "Error removing contact"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:292
-#, c-format
-msgid ""
-"Opening %d contact will open %d new window as well.\n"
-"Do you really want to display this contact?"
-msgid_plural ""
-"Opening %d contacts will open %d new windows as well.\n"
-"Do you really want to display all of these contacts?"
-msgstr[0] ""
-"Opening %d contact will open %d new window as well.\n"
-"Do you really want to display this contact?"
-msgstr[1] ""
-"Opening %d contacts will open %d new windows as well.\n"
-"Do you really want to display all of these contacts?"
-
-#. For Translators only: "it" refers to the filename %s.
-#: ../addressbook/gui/widgets/eab-gui-util.c:324
-#, c-format
-msgid ""
-"%s already exists\n"
-"Do you want to overwrite it?"
-msgstr ""
-"%s already exists\n"
-"Do you want to overwrite it?"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:328
-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:375
-#: ../addressbook/gui/widgets/eab-gui-util.c:378
-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:426
-msgid "card.vcf"
-msgstr "card.vcf"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:463
-msgid "Select Address Book"
-msgstr "Select Address Book"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:604
-msgid "list"
-msgstr "list"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:768
-msgid "Move contact to"
-msgstr "Move contact to"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:770
-msgid "Copy contact to"
-msgstr "Copy contact to"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:773
-msgid "Move contacts to"
-msgstr "Move contacts to"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:775
-msgid "Copy contacts to"
-msgstr "Copy contacts to"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:1001
-msgid "Multiple VCards"
-msgstr "Multiple VCards"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:1004
-#, c-format
-msgid "VCard for %s"
-msgstr "VCard for %s"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:1045
-#: ../addressbook/gui/widgets/eab-gui-util.c:1063
-msgid "Contact information"
-msgstr "Contact information"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:1065
-#, c-format
-msgid "Contact information for %s"
-msgstr "Contact information for %s"
-
-#: ../addressbook/gui/widgets/eab-popup-control.c:289
-msgid "Querying Address Book..."
-msgstr "Querying Address Book..."
-
-#: ../addressbook/gui/widgets/eab-vcard-control.c:139
-#, c-format
-msgid "There is one other contact."
-msgid_plural "There are %d other contacts."
-msgstr[0] "There is one other contact."
-msgstr[1] "There are %d other contacts."
-
-#: ../addressbook/gui/widgets/eab-vcard-control.c:223
-#: ../addressbook/gui/widgets/eab-vcard-control.c:272
-msgid "Show Full VCard"
-msgstr "Show Full VCard"
-
-#: ../addressbook/gui/widgets/eab-vcard-control.c:227
-msgid "Show Compact VCard"
-msgstr "Show Compact VCard"
-
-#: ../addressbook/gui/widgets/eab-vcard-control.c:277
-msgid "Save in addressbook"
-msgstr "Save in addressbook"
+#: ../addressbook/gui/widgets/e-minicard-view-widget.c:128
+msgid "Column Width"
+msgstr "Column Width"
#: ../addressbook/gui/widgets/gal-view-factory-minicard.c:25
msgid "Card View"
@@ -3725,20 +3725,6 @@ msgstr "VCard (.vcf, .gcrd)"
msgid "Evolution VCard Importer"
msgstr "Evolution VCard Importer"
-#: ../addressbook/printing/e-contact-print-envelope.c:213
-#: ../addressbook/printing/e-contact-print-envelope.c:234
-msgid "Print envelope"
-msgstr "Print envelope"
-
-#: ../addressbook/printing/e-contact-print.c:856
-msgid "Print contacts"
-msgstr "Print contacts"
-
-#: ../addressbook/printing/e-contact-print.c:882
-#: ../addressbook/printing/e-contact-print.c:909
-msgid "Print contact"
-msgstr "Print contact"
-
#: ../addressbook/printing/e-contact-print.glade.h:1
msgid "10 pt. Tahoma"
msgstr "10 pt. Tahoma"
@@ -3781,10 +3767,10 @@ msgstr "Format"
#: ../addressbook/printing/e-contact-print.glade.h:11
#: ../widgets/table/e-table-click-to-add.c:495
+#: ../widgets/table/e-table-field-chooser.c:91
#: ../widgets/table/e-table-field-chooser-dialog.c:91
#: ../widgets/table/e-table-field-chooser-item.c:651
-#: ../widgets/table/e-table-field-chooser.c:91
-#: ../widgets/table/e-table-header-item.c:1895
+#: ../widgets/table/e-table-header-item.c:1893
#: ../widgets/table/e-table-selection-model.c:318
msgid "Header"
msgstr "Header"
@@ -3890,7 +3876,7 @@ msgstr "Shading"
#: ../addressbook/printing/e-contact-print.glade.h:36
#: ../plugins/exchange-operations/exchange-account-setup.c:956
#: ../plugins/exchange-operations/exchange-calendar.c:231
-#: ../plugins/exchange-operations/exchange-contacts.c:218
+#: ../plugins/exchange-operations/exchange-contacts.c:217
msgid "Size:"
msgstr "Size:"
@@ -3907,7 +3893,7 @@ msgid "Top:"
msgstr "Top:"
#: ../addressbook/printing/e-contact-print.glade.h:40
-#: ../calendar/gui/dialogs/calendar-setup.c:176
+#: ../calendar/gui/dialogs/calendar-setup.c:156
msgid "Type:"
msgstr "Type:"
@@ -3924,7 +3910,7 @@ msgid "Contact Print Style Editor Test"
msgstr "Contact Print Style Editor Test"
#: ../addressbook/printing/test-contact-print-style-editor.c:54
-#: ../addressbook/printing/test-print.c:53
+#: ../addressbook/printing/test-print.c:47
msgid "Copyright (C) 2000, Ximian, Inc."
msgstr "Copyright (C) 2000, Ximian, Inc."
@@ -3932,80 +3918,80 @@ msgstr "Copyright (C) 2000, Ximian, Inc."
msgid "This should test the contact print style editor widget"
msgstr "This should test the contact print style editor widget"
-#: ../addressbook/printing/test-print.c:52
+#: ../addressbook/printing/test-print.c:46
msgid "Contact Print Test"
msgstr "Contact Print Test"
-#: ../addressbook/printing/test-print.c:55
+#: ../addressbook/printing/test-print.c:49
msgid "This should test the contact print code"
msgstr "This should test the contact print code"
-#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:667
-#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:703
-#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:50
-msgid "Can not open file"
-msgstr "Can not open file"
-
-#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:44
-msgid "Couldn't get list of addressbooks"
-msgstr "Couldn't get list of addressbooks"
-
-#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:72
-msgid "failed to open book"
-msgstr "failed to open book"
-
-#: ../addressbook/tools/evolution-addressbook-export.c:56
+#: ../addressbook/tools/evolution-addressbook-export.c:49
msgid "Specify the output file instead of standard output"
msgstr "Specify the output file instead of standard output"
-#: ../addressbook/tools/evolution-addressbook-export.c:57
+#: ../addressbook/tools/evolution-addressbook-export.c:50
msgid "OUTPUTFILE"
msgstr "OUTPUTFILE"
-#: ../addressbook/tools/evolution-addressbook-export.c:58
+#: ../addressbook/tools/evolution-addressbook-export.c:53
msgid "List local addressbook folders"
msgstr "List local addressbook folders"
-#: ../addressbook/tools/evolution-addressbook-export.c:60
+#: ../addressbook/tools/evolution-addressbook-export.c:56
msgid "Show cards as vcard or csv file"
msgstr "Show cards as vcard or csv file"
-#: ../addressbook/tools/evolution-addressbook-export.c:60
+#: ../addressbook/tools/evolution-addressbook-export.c:57
msgid "[vcard|csv]"
msgstr "[vcard|csv]"
-#: ../addressbook/tools/evolution-addressbook-export.c:61
+#: ../addressbook/tools/evolution-addressbook-export.c:60
msgid "Export in asynchronous mode"
msgstr "Export in asynchronous mode"
#: ../addressbook/tools/evolution-addressbook-export.c:63
-msgid "The number of cards in one output file in asychronous mode, default size 100."
-msgstr "The number of cards in one output file in asychronous mode, default size 100."
+msgid "The number of cards in out output file in asynchronous mode, default size 100."
+msgstr "The number of cards in out output file in asynchronous mode, default size 100."
-#: ../addressbook/tools/evolution-addressbook-export.c:63
+#: ../addressbook/tools/evolution-addressbook-export.c:65
msgid "NUMBER"
msgstr "NUMBER"
-#: ../addressbook/tools/evolution-addressbook-export.c:91
+#: ../addressbook/tools/evolution-addressbook-export.c:102
msgid "Command line arguments error, please use --help option to see the usage."
msgstr "Command line arguments error, please use --help option to see the usage."
-#: ../addressbook/tools/evolution-addressbook-export.c:105
+#: ../addressbook/tools/evolution-addressbook-export.c:116
msgid "Only support csv or vcard format."
msgstr "Only support csv or vcard format."
-#: ../addressbook/tools/evolution-addressbook-export.c:114
+#: ../addressbook/tools/evolution-addressbook-export.c:125
msgid "In async mode, output must be file."
msgstr "In async mode, output must be file."
-#: ../addressbook/tools/evolution-addressbook-export.c:122
+#: ../addressbook/tools/evolution-addressbook-export.c:133
msgid "In normal mode, there is no need for the size option."
msgstr "In normal mode, there is no need for the size option."
-#: ../addressbook/tools/evolution-addressbook-export.c:153
+#: ../addressbook/tools/evolution-addressbook-export.c:164
msgid "Unhandled error"
msgstr "Unhandled error"
+#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:667
+#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:703
+#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:50
+msgid "Can not open file"
+msgstr "Can not open file"
+
+#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:44
+msgid "Couldn't get list of addressbooks"
+msgstr "Couldn't get list of addressbooks"
+
+#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:72
+msgid "failed to open book"
+msgstr "failed to open book"
+
#: ../addressbook/tools/evolution-addressbook-import.c:46
msgid "Error loading default addressbook."
msgstr "Error loading default addressbook."
@@ -4336,134 +4322,48 @@ msgstr "{0}."
msgid "Enter password"
msgstr "Enter password"
-#: ../calendar/conduits/calendar/calendar-conduit.c:255
+#: ../calendar/conduits/calendar/calendar-conduit.c:253
msgid "Split Multi-Day Events:"
msgstr "Split Multi-Day Events:"
-#: ../calendar/conduits/calendar/calendar-conduit.c:1506
-#: ../calendar/conduits/calendar/calendar-conduit.c:1507
-#: ../calendar/conduits/memo/memo-conduit.c:932
-#: ../calendar/conduits/memo/memo-conduit.c:933
-#: ../calendar/conduits/todo/todo-conduit.c:1108
-#: ../calendar/conduits/todo/todo-conduit.c:1109
+#: ../calendar/conduits/calendar/calendar-conduit.c:1504
+#: ../calendar/conduits/calendar/calendar-conduit.c:1505
+#: ../calendar/conduits/memo/memo-conduit.c:930
+#: ../calendar/conduits/memo/memo-conduit.c:931
+#: ../calendar/conduits/todo/todo-conduit.c:1106
+#: ../calendar/conduits/todo/todo-conduit.c:1107
msgid "Could not start evolution-data-server"
msgstr "Could not start evolution-data-server"
-#: ../calendar/conduits/calendar/calendar-conduit.c:1614
-#: ../calendar/conduits/calendar/calendar-conduit.c:1617
+#: ../calendar/conduits/calendar/calendar-conduit.c:1612
+#: ../calendar/conduits/calendar/calendar-conduit.c:1615
msgid "Could not read pilot's Calendar application block"
msgstr "Could not read pilot's Calendar application block"
-#: ../calendar/conduits/memo/memo-conduit.c:1026
-#: ../calendar/conduits/memo/memo-conduit.c:1029
+#: ../calendar/conduits/memo/memo-conduit.c:1024
+#: ../calendar/conduits/memo/memo-conduit.c:1027
msgid "Could not read pilot's Memo application block"
msgstr "Could not read pilot's Memo application block"
-#: ../calendar/conduits/memo/memo-conduit.c:1073
-#: ../calendar/conduits/memo/memo-conduit.c:1076
+#: ../calendar/conduits/memo/memo-conduit.c:1071
+#: ../calendar/conduits/memo/memo-conduit.c:1074
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
+#: ../calendar/conduits/todo/todo-conduit.c:237
msgid "Default Priority:"
msgstr "Default Priority:"
-#: ../calendar/conduits/todo/todo-conduit.c:1192
-#: ../calendar/conduits/todo/todo-conduit.c:1195
+#: ../calendar/conduits/todo/todo-conduit.c:1190
+#: ../calendar/conduits/todo/todo-conduit.c:1193
msgid "Could not read pilot's ToDo application block"
msgstr "Could not read pilot's ToDo application block"
-#: ../calendar/conduits/todo/todo-conduit.c:1237
-#: ../calendar/conduits/todo/todo-conduit.c:1240
+#: ../calendar/conduits/todo/todo-conduit.c:1235
+#: ../calendar/conduits/todo/todo-conduit.c:1238
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:2078
-msgid "Calendar and Tasks"
-msgstr "Calendar and Tasks"
-
-#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-#: ../calendar/gui/calendar-component.c:1361
-msgid "Calendars"
-msgstr "Calendars"
-
-#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
-msgid "Configure your timezone, Calendar and Task List here "
-msgstr "Configure your timezone, Calendar and Task List here "
-
-#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
-msgid "Evolution Calendar and Tasks"
-msgstr "Evolution Calendar and Tasks"
-
-#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
-msgid "Evolution Calendar configuration control"
-msgstr "Evolution Calendar configuration control"
-
-#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
-msgid "Evolution Calendar scheduling message viewer"
-msgstr "Evolution Calendar scheduling message viewer"
-
-#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
-msgid "Evolution Calendar/Task editor"
-msgstr "Evolution Calendar/Task editor"
-
-#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
-msgid "Evolution's Calendar component"
-msgstr "Evolution's Calendar component"
-
-#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
-msgid "Evolution's Memos component"
-msgstr "Evolution's Memos component"
-
-#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
-msgid "Evolution's Tasks component"
-msgstr "Evolution's Tasks component"
-
-#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
-msgid "Memo_s"
-msgstr "Memo_s"
-
-#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: ../calendar/gui/e-memo-table.c: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:1949
-#: ../calendar/gui/tasks-component.c:522
-#: ../calendar/gui/tasks-component.c:1013
-#: ../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:403
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:547
-#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:12
-msgid "Tasks"
-msgstr "Tasks"
-
-#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:14
-msgid "_Calendars"
-msgstr "_Calendars"
-
-#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:15
-#: ../views/tasks/galview.xml.h:3
-msgid "_Tasks"
-msgstr "_Tasks"
-
-#: ../calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
-msgid "Evolution Calendar alarm notification service"
-msgstr "Evolution Calendar alarm notification service"
-
#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:116
msgid "minute"
msgid_plural "minutes"
@@ -4472,7 +4372,7 @@ msgstr[1] "minutes"
#: ../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/alarm-dialog.glade.h:25
#: ../calendar/gui/dialogs/calendar-setup.glade.h:12
#: ../calendar/gui/dialogs/event-page.glade.h:19
#: ../filter/filter.glade.h:15
@@ -4494,10 +4394,10 @@ msgstr "Appointments"
#. Location
#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:2
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1619
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1625
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1622
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1628
#: ../calendar/gui/e-itip-control.c:1145
-#: ../plugins/itip-formatter/itip-view.c:936
+#: ../plugins/itip-formatter/itip-view.c:943
msgid "Location:"
msgstr "Location:"
@@ -4508,7 +4408,7 @@ msgstr "Snooze _time:"
#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:4
#: ../calendar/gui/dialogs/recurrence-page.glade.h:10
#: ../filter/filter.glade.h:11
-#: ../mail/mail-config.glade.h:160
+#: ../mail/mail-config.glade.h:159
#: ../plugins/exchange-operations/exchange-delegates.glade.h:15
#: ../plugins/publish-calendar/publish-calendar.glade.h:21
#: ../ui/evolution-addressbook.xml.h:51
@@ -4533,31 +4433,31 @@ msgstr "_Snooze"
msgid "location of appointment"
msgstr "location of appointment"
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1455
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1601
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1457
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1604
msgid "No summary available."
msgstr "No summary available."
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1464
#: ../calendar/gui/alarm-notify/alarm-queue.c:1466
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1468
msgid "No description available."
msgstr "No description available."
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1474
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1476
msgid "No location information available."
msgstr "No location information available."
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1533
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1535
#, c-format
msgid "You have %d alarms"
msgstr "You have %d alarms"
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1703
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1731
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1706
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1734
msgid "Warning"
msgstr "Warning"
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1707
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1710
msgid ""
"Evolution does not support calendar reminders with\n"
"email notifications yet, but this reminder was\n"
@@ -4569,7 +4469,7 @@ msgstr ""
"configured to send an email. Evolution will display\n"
"a normal reminder dialogue box instead."
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1737
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1740
#, c-format
msgid ""
"An Evolution Calendar reminder is about to trigger. This reminder is configured to run the following program:\n"
@@ -4584,10 +4484,14 @@ msgstr ""
"\n"
"Are you sure you want to run this program?"
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1751
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1754
msgid "Do not ask me about this program again."
msgstr "Do not ask me about this program again."
+#: ../calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
+msgid "Evolution Calendar alarm notification service"
+msgstr "Evolution Calendar alarm notification service"
+
#: ../calendar/gui/alarm-notify/notify-main.c:140
msgid "Could not initialize Bonobo"
msgstr "Could not initialise Bonobo"
@@ -4841,12 +4745,12 @@ msgid "Show status field in the event/task/meeting editor"
msgstr "Show status field in the event/task/meeting editor"
#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:53
-#: ../mail/evolution-mail.schemas.in.in.h:85
+#: ../mail/evolution-mail.schemas.in.in.h:90
msgid "Show the \"Preview\" pane"
msgstr "Show the \"Preview\" pane"
#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:54
-#: ../mail/evolution-mail.schemas.in.in.h:86
+#: ../mail/evolution-mail.schemas.in.in.h:91
msgid "Show the \"Preview\" pane."
msgstr "Show the \"Preview\" pane."
@@ -4888,7 +4792,7 @@ msgid "Time the last alarm ran, in time_t."
msgstr "Time the last alarm ran, in time_t."
#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:65
-#: ../plugins/startup-wizard/startup-wizard.c:110
+#: ../plugins/startup-wizard/startup-wizard.c:108
msgid "Timezone"
msgstr "Timezone"
@@ -5008,31 +4912,7 @@ msgstr "Workday start minute"
msgid "daylight savings time"
msgstr "daylight savings time"
-#: ../calendar/gui/cal-search-bar.c:55
-msgid "Summary contains"
-msgstr "Summary contains"
-
-#: ../calendar/gui/cal-search-bar.c:56
-msgid "Description contains"
-msgstr "Description contains"
-
-#: ../calendar/gui/cal-search-bar.c:57
-msgid "Category is"
-msgstr "Category is"
-
-#: ../calendar/gui/cal-search-bar.c:58
-msgid "Comment contains"
-msgstr "Comment contains"
-
-#: ../calendar/gui/cal-search-bar.c:59
-msgid "Location contains"
-msgstr "Location contains"
-
-#: ../calendar/gui/cal-search-bar.c:432
-msgid "Unmatched"
-msgstr "Unmatched"
-
-#: ../calendar/gui/calendar-commands.c:119
+#: ../calendar/gui/calendar-commands.c:99
#: ../ui/evolution-addressbook.xml.h:26
#: ../ui/evolution-calendar.xml.h:20
#: ../ui/evolution-mail-message.xml.h:75
@@ -5041,16 +4921,16 @@ msgstr "Unmatched"
msgid "Print"
msgstr "Print"
-#: ../calendar/gui/calendar-commands.c:348
+#: ../calendar/gui/calendar-commands.c:324
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:354
+#: ../calendar/gui/calendar-commands.c:330
msgid "Purge events older than"
msgstr "Purge events older than"
-#: ../calendar/gui/calendar-commands.c:359
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:20
+#: ../calendar/gui/calendar-commands.c:335
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:21
#: ../calendar/gui/dialogs/calendar-setup.glade.h:11
#: ../filter/filter.glade.h:14
#: ../plugins/calendar-http/calendar-http.c:288
@@ -5104,6 +4984,11 @@ msgstr "There is no calendar available for creating events and meetings"
msgid "Calendar Source Selector"
msgstr "Calendar Source Selector"
+#: ../calendar/gui/calendar-component.c:1361
+#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
+msgid "Calendars"
+msgstr "Calendars"
+
#: ../calendar/gui/calendar-component.c:1544
msgid "New appointment"
msgstr "New appointment"
@@ -5168,6 +5053,30 @@ msgstr "Week View"
msgid "Month View"
msgstr "Month View"
+#: ../calendar/gui/cal-search-bar.c:55
+msgid "Summary contains"
+msgstr "Summary contains"
+
+#: ../calendar/gui/cal-search-bar.c:56
+msgid "Description contains"
+msgstr "Description contains"
+
+#: ../calendar/gui/cal-search-bar.c:57
+msgid "Category is"
+msgstr "Category is"
+
+#: ../calendar/gui/cal-search-bar.c:58
+msgid "Comment contains"
+msgstr "Comment contains"
+
+#: ../calendar/gui/cal-search-bar.c:59
+msgid "Location contains"
+msgstr "Location contains"
+
+#: ../calendar/gui/cal-search-bar.c:432
+msgid "Unmatched"
+msgstr "Unmatched"
+
#: ../calendar/gui/comp-editor-factory.c:415
msgid "Error while opening the calendar"
msgstr "Error while opening the calendar"
@@ -5181,7 +5090,7 @@ msgid "Permission denied to open the calendar"
msgstr "Permission denied to open the calendar"
#: ../calendar/gui/comp-editor-factory.c:439
-#: ../shell/e-shell.c:1273
+#: ../shell/e-shell.c:1274
msgid "Unknown error"
msgstr "Unknown error"
@@ -5233,62 +5142,66 @@ msgid "Run a program"
msgstr "Run a program"
#: ../calendar/gui/dialogs/alarm-dialog.glade.h:11
+msgid "Select A File"
+msgstr "Select A File"
+
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:12
msgid "Send To:"
msgstr "Send To:"
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:12
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:13
#: ../calendar/gui/e-alarm-list.c:454
msgid "Send an email"
msgstr "Send an email"
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:13
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:14
msgid "_Arguments:"
msgstr "_Arguments:"
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:14
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:15
msgid "_Program:"
msgstr "_Program:"
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:15
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:16
msgid "_Repeat the alarm"
msgstr "_Repeat the alarm"
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:16
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:17
msgid "_Sound:"
msgstr "_Sound:"
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:17
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:18
msgid "after"
msgstr "after"
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:18
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:19
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/alarm-dialog.glade.h:20
#: ../calendar/gui/dialogs/recurrence-page.glade.h:13
msgid "day(s)"
msgstr "day(s)"
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:21
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:22
msgid "end of appointment"
msgstr "end of appointment"
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:22
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:23
msgid "extra times every"
msgstr "extra times every"
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:23
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:24
msgid "hour(s)"
msgstr "hour(s)"
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:25
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:26
msgid "minute(s)"
msgstr "minute(s)"
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:27
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:28
msgid "start of appointment"
msgstr "start of appointment"
@@ -5319,7 +5232,89 @@ msgstr "_Suggest automatic display of attachment"
msgid "Attach file(s)"
msgstr "Attach file(s)"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:498
+#: ../calendar/gui/dialogs/calendar-setup.c:268
+msgid "Cop_y calendar contents locally for offline operation"
+msgstr "Cop_y calendar contents locally for offline operation"
+
+#: ../calendar/gui/dialogs/calendar-setup.c:270
+msgid "Cop_y task list contents locally for offline operation"
+msgstr "Cop_y task list contents locally for offline operation"
+
+#: ../calendar/gui/dialogs/calendar-setup.c:272
+msgid "Cop_y memo list contents locally for offline operation"
+msgstr "Cop_y memo list contents locally for offline operation"
+
+#: ../calendar/gui/dialogs/calendar-setup.c:342
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:3
+msgid "C_olor:"
+msgstr "C_olour:"
+
+#: ../calendar/gui/dialogs/calendar-setup.c:377
+msgid "Task List"
+msgstr "Task List"
+
+#: ../calendar/gui/dialogs/calendar-setup.c:388
+msgid "Memo List"
+msgstr "Memo List"
+
+#: ../calendar/gui/dialogs/calendar-setup.c:477
+msgid "Calendar Properties"
+msgstr "Calendar Properties"
+
+#: ../calendar/gui/dialogs/calendar-setup.c:479
+msgid "New Calendar"
+msgstr "New Calendar"
+
+#: ../calendar/gui/dialogs/calendar-setup.c:564
+msgid "Task List Properties"
+msgstr "Task List Properties"
+
+#: ../calendar/gui/dialogs/calendar-setup.c:630
+msgid "New Memo List"
+msgstr "New Memo List"
+
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:1
+msgid "Add Calendar"
+msgstr "Add Calendar"
+
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:2
+msgid "Add Task List"
+msgstr "Add Task List"
+
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:4
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
+#: ../mail/mail-config.glade.h:105
+msgid "Pick a color"
+msgstr "Pick a colour"
+
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:5
+msgid "_Add Calendar"
+msgstr "_Add Calendar"
+
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:6
+msgid "_Add Task List"
+msgstr "_Add Task List"
+
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:8
+#: ../plugins/calendar-http/calendar-http.c:271
+#: ../plugins/calendar-weather/calendar-weather.c:548
+msgid "_Refresh:"
+msgstr "_Refresh:"
+
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:10
+#: ../plugins/caldav/caldav-source.c:247
+#: ../plugins/calendar-http/calendar-http.c:133
+msgid "_URL:"
+msgstr "_URL:"
+
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:14
+#: ../filter/filter.glade.h:21
+#: ../plugins/calendar-http/calendar-http.c:289
+#: ../plugins/calendar-weather/calendar-weather.c:566
+msgid "weeks"
+msgstr "weeks"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:479
msgid "Selected Calendars for Alarms"
msgstr "Selected Calendars for Alarms"
@@ -5343,7 +5338,7 @@ msgid "<i>%u and %d will be replaced by user and domain from the email address.<
msgstr "<i>%u and %d will be replaced by user and domain from the email address.</i>"
#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
-#: ../mail/mail-config.glade.h:8
+#: ../mail/mail-config.glade.h:7
msgid "<span weight=\"bold\">Alerts</span>"
msgstr "<span weight=\"bold\">Alerts</span>"
@@ -5352,7 +5347,7 @@ msgid "<span weight=\"bold\">Default Free/Busy Server</span>"
msgstr "<span weight=\"bold\">Default Free/Busy Server</span>"
#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
-#: ../mail/mail-config.glade.h:17
+#: ../mail/mail-config.glade.h:15
#: ../plugins/publish-calendar/publish-calendar.glade.h:1
msgid "<span weight=\"bold\">General</span>"
msgstr "<span weight=\"bold\">General</span>"
@@ -5421,12 +5416,6 @@ msgstr ""
"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:107
-msgid "Pick a color"
-msgstr "Pick a colour"
-
#. Sunday
#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
msgid "S_un"
@@ -5570,82 +5559,6 @@ msgstr "_Wed"
msgid "before every appointment"
msgstr "before every appointment"
-#: ../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 "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: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:380
-msgid "Task List"
-msgstr "Task List"
-
-#: ../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: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.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:2
-msgid "Add Task List"
-msgstr "Add Task List"
-
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:5
-msgid "_Add Calendar"
-msgstr "_Add Calendar"
-
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:6
-msgid "_Add Task List"
-msgstr "_Add Task List"
-
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:8
-#: ../plugins/calendar-http/calendar-http.c:271
-#: ../plugins/calendar-weather/calendar-weather.c:548
-msgid "_Refresh:"
-msgstr "_Refresh:"
-
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:10
-#: ../plugins/caldav/caldav-source.c:247
-#: ../plugins/calendar-http/calendar-http.c:133
-msgid "_URL:"
-msgstr "_URL:"
-
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:14
-#: ../filter/filter.glade.h:21
-#: ../plugins/calendar-http/calendar-http.c:289
-#: ../plugins/calendar-weather/calendar-weather.c:566
-msgid "weeks"
-msgstr "weeks"
-
#: ../calendar/gui/dialogs/changed-comp.c:60
msgid "This event has been deleted."
msgstr "This event has been deleted."
@@ -5690,38 +5603,8 @@ 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:515
-#, c-format
-msgid "Validation error: %s"
-msgstr "Validation error: %s"
-
-#: ../calendar/gui/dialogs/comp-editor-util.c:187
-#: ../calendar/gui/print.c:2392
-msgid " to "
-msgstr " to "
-
-#: ../calendar/gui/dialogs/comp-editor-util.c:191
-#: ../calendar/gui/print.c:2396
-msgid " (Completed "
-msgstr " (Completed "
-
-#: ../calendar/gui/dialogs/comp-editor-util.c:193
-#: ../calendar/gui/print.c:2398
-msgid "Completed "
-msgstr "Completed "
-
-#: ../calendar/gui/dialogs/comp-editor-util.c:198
-#: ../calendar/gui/print.c:2403
-msgid " (Due "
-msgstr " (Due "
-
-#: ../calendar/gui/dialogs/comp-editor-util.c:200
-#: ../calendar/gui/print.c:2405
-msgid "Due "
-msgstr "Due "
-
#: ../calendar/gui/dialogs/comp-editor.c:209
-#: ../composer/e-msg-composer.c:2921
+#: ../composer/e-msg-composer.c:2914
#, c-format
msgid "Attached message - %s"
msgstr "Attached message - %s"
@@ -5729,8 +5612,8 @@ msgstr "Attached message - %s"
#. translators, this count will always be >1
#: ../calendar/gui/dialogs/comp-editor.c:214
#: ../calendar/gui/dialogs/comp-editor.c:393
-#: ../composer/e-msg-composer.c:2926
-#: ../composer/e-msg-composer.c:3122
+#: ../composer/e-msg-composer.c:2919
+#: ../composer/e-msg-composer.c:3114
#, c-format
msgid "Attached message"
msgid_plural "%d attached messages"
@@ -5738,8 +5621,8 @@ msgstr[0] "Attached message"
msgstr[1] "%d attached messages"
#: ../calendar/gui/dialogs/comp-editor.c:464
-#: ../composer/e-msg-composer.c:3186
-#: ../mail/em-folder-tree.c:1003
+#: ../composer/e-msg-composer.c:3178
+#: ../mail/em-folder-tree.c:1005
#: ../mail/em-folder-utils.c:368
#: ../mail/em-folder-view.c:1030
#: ../mail/message-list.c:1923
@@ -5747,126 +5630,155 @@ msgid "_Move"
msgstr "_Move"
#: ../calendar/gui/dialogs/comp-editor.c:466
-#: ../composer/e-msg-composer.c:3188
-#: ../mail/em-folder-tree.c:1005
+#: ../composer/e-msg-composer.c:3180
+#: ../mail/em-folder-tree.c:1007
#: ../mail/message-list.c:1925
msgid "Cancel _Drag"
msgstr "Cancel _Drag"
-#: ../calendar/gui/dialogs/comp-editor.c:820
+#: ../calendar/gui/dialogs/comp-editor.c:824
msgid "Could not update object"
msgstr "Could not update object"
-#: ../calendar/gui/dialogs/comp-editor.c:966
-#: ../composer/e-msg-composer.c:2534
+#: ../calendar/gui/dialogs/comp-editor.c:968
+#: ../composer/e-msg-composer.c:2530
#, 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:998
+#: ../calendar/gui/dialogs/comp-editor.c:1000
msgid "Hide Attachment _Bar"
msgstr "Hide Attachment _Bar"
-#: ../calendar/gui/dialogs/comp-editor.c:1001
-#: ../calendar/gui/dialogs/comp-editor.c:1530
+#: ../calendar/gui/dialogs/comp-editor.c:1003
+#: ../calendar/gui/dialogs/comp-editor.c:1532
msgid "Show Attachment _Bar"
msgstr "Show Attachment _Bar"
-#: ../calendar/gui/dialogs/comp-editor.c:1120
-#: ../calendar/gui/dialogs/event-page.c:1896
+#: ../calendar/gui/dialogs/comp-editor.c:1122
+#: ../calendar/gui/dialogs/event-page.c:1898
#: ../calendar/gui/dialogs/task-page.c:1199
#: ../composer/e-msg-composer-attachment-bar.c:470
-#: ../composer/e-msg-composer.c:3693
+#: ../composer/e-msg-composer.c:3685
#: ../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:1121
+#: ../calendar/gui/dialogs/comp-editor.c:1123
#: ../composer/e-msg-composer-attachment-bar.c:471
-#: ../composer/e-msg-composer.c:3694
-#: ../mail/em-folder-tree.c:2081
+#: ../composer/e-msg-composer.c:3686
+#: ../mail/em-folder-tree.c:2107
#: ../ui/evolution-addressbook.xml.h:59
#: ../ui/evolution-mail-list.xml.h:33
msgid "_Properties"
msgstr "_Properties"
-#: ../calendar/gui/dialogs/comp-editor.c:1123
+#: ../calendar/gui/dialogs/comp-editor.c:1125
#: ../composer/e-msg-composer-attachment-bar.c:473
-#: ../composer/e-msg-composer.c:3696
+#: ../composer/e-msg-composer.c:3688
msgid "_Add attachment..."
msgstr "_Add attachment..."
-#: ../calendar/gui/dialogs/comp-editor.c:1554
-#: ../mail/em-format-html-display.c:2300
+#: ../calendar/gui/dialogs/comp-editor.c:1556
+#: ../mail/em-format-html-display.c:2314
msgid "Show Attachments"
msgstr "Show Attachments"
-#: ../calendar/gui/dialogs/comp-editor.c:1555
+#: ../calendar/gui/dialogs/comp-editor.c:1557
msgid "Press space key to toggle attachment bar"
msgstr "Press space key to toggle attachment bar"
-#: ../calendar/gui/dialogs/comp-editor.c:2162
-#: ../calendar/gui/dialogs/comp-editor.c:2205
+#: ../calendar/gui/dialogs/comp-editor.c:2164
+#: ../calendar/gui/dialogs/comp-editor.c:2207
msgid "Edit Appointment"
msgstr "Edit Appointment"
-#: ../calendar/gui/dialogs/comp-editor.c:2168
-#: ../calendar/gui/dialogs/comp-editor.c:2211
+#: ../calendar/gui/dialogs/comp-editor.c:2170
+#: ../calendar/gui/dialogs/comp-editor.c:2213
#, c-format
msgid "Meeting - %s"
msgstr "Meeting - %s"
-#: ../calendar/gui/dialogs/comp-editor.c:2170
-#: ../calendar/gui/dialogs/comp-editor.c:2213
+#: ../calendar/gui/dialogs/comp-editor.c:2172
+#: ../calendar/gui/dialogs/comp-editor.c:2215
#, c-format
msgid "Appointment - %s"
msgstr "Appointment - %s"
-#: ../calendar/gui/dialogs/comp-editor.c:2174
-#: ../calendar/gui/dialogs/comp-editor.c:2217
+#: ../calendar/gui/dialogs/comp-editor.c:2176
+#: ../calendar/gui/dialogs/comp-editor.c:2219
#, c-format
msgid "Assigned Task - %s"
msgstr "Assigned Task - %s"
-#: ../calendar/gui/dialogs/comp-editor.c:2176
-#: ../calendar/gui/dialogs/comp-editor.c:2219
+#: ../calendar/gui/dialogs/comp-editor.c:2178
+#: ../calendar/gui/dialogs/comp-editor.c:2221
#, c-format
msgid "Task - %s"
msgstr "Task - %s"
-#: ../calendar/gui/dialogs/comp-editor.c:2179
-#: ../calendar/gui/dialogs/comp-editor.c:2222
+#: ../calendar/gui/dialogs/comp-editor.c:2181
+#: ../calendar/gui/dialogs/comp-editor.c:2224
#, c-format
msgid "Journal entry - %s"
msgstr "Journal entry - %s"
-#: ../calendar/gui/dialogs/comp-editor.c:2190
-#: ../calendar/gui/dialogs/comp-editor.c:2232
+#: ../calendar/gui/dialogs/comp-editor.c:2192
+#: ../calendar/gui/dialogs/comp-editor.c:2234
msgid "No summary"
msgstr "No summary"
-#: ../calendar/gui/dialogs/comp-editor.c:2777
+#: ../calendar/gui/dialogs/comp-editor.c:2780
#: ../composer/e-msg-composer-attachment-bar.c:307
-#: ../mail/em-utils.c:406
-#: ../mail/em-utils.c:438
+#: ../mail/em-utils.c:370
#: ../widgets/misc/e-attachment-bar.c:350
msgid "attachment"
msgstr "attachment"
-#: ../calendar/gui/dialogs/comp-editor.c:2866
-#: ../calendar/gui/dialogs/comp-editor.c:2920
-#: ../calendar/gui/dialogs/comp-editor.c:2944
+#: ../calendar/gui/dialogs/comp-editor.c:2869
+#: ../calendar/gui/dialogs/comp-editor.c:2923
+#: ../calendar/gui/dialogs/comp-editor.c:2947
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:2968
+#: ../calendar/gui/dialogs/comp-editor.c:2976
msgid "Unable to use current version!"
msgstr "Unable to use current version!"
+#: ../calendar/gui/dialogs/comp-editor-page.c:519
+#, c-format
+msgid "Validation error: %s"
+msgstr "Validation error: %s"
+
+#: ../calendar/gui/dialogs/comp-editor-util.c:187
+#: ../calendar/gui/print.c:2179
+msgid " to "
+msgstr " to "
+
+#: ../calendar/gui/dialogs/comp-editor-util.c:191
+#: ../calendar/gui/print.c:2183
+msgid " (Completed "
+msgstr " (Completed "
+
+#: ../calendar/gui/dialogs/comp-editor-util.c:193
+#: ../calendar/gui/print.c:2185
+msgid "Completed "
+msgstr "Completed "
+
+#: ../calendar/gui/dialogs/comp-editor-util.c:198
+#: ../calendar/gui/print.c:2190
+msgid " (Due "
+msgstr " (Due "
+
+#: ../calendar/gui/dialogs/comp-editor-util.c:200
+#: ../calendar/gui/print.c:2192
+msgid "Due "
+msgstr "Due "
+
#: ../calendar/gui/dialogs/copy-source-dialog.c:61
msgid "Could not open source"
msgstr "Could not open source"
@@ -5944,11 +5856,11 @@ msgstr "Delegate To:"
msgid "Enter Delegate"
msgstr "Enter Delegate"
-#: ../calendar/gui/dialogs/event-editor.c:564
+#: ../calendar/gui/dialogs/event-editor.c:602
msgid "Appoint_ment"
msgstr "Appoint_ment"
-#: ../calendar/gui/dialogs/event-editor.c:568
+#: ../calendar/gui/dialogs/event-editor.c:606
#: ../ui/evolution-event-editor.xml.h:14
msgid "Recurrence"
msgstr "Recurrence"
@@ -6000,24 +5912,24 @@ msgstr "Start time is wrong"
msgid "End time is wrong"
msgstr "End time is wrong"
-#: ../calendar/gui/dialogs/event-page.c:1454
+#: ../calendar/gui/dialogs/event-page.c:1456
#: ../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/event-page.c:1462
#: ../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/event-page.c:1477
#: ../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/event-page.c:1899
#: ../calendar/gui/dialogs/task-page.c:1200
msgid "_Add "
msgstr "_Add "
@@ -6057,7 +5969,7 @@ msgstr "Customise"
#: ../calendar/gui/dialogs/meeting-page.glade.h:4
#: ../calendar/gui/e-cal-model-tasks.c:656
#: ../calendar/gui/e-itip-control.c:1131
-#: ../composer/e-msg-composer.c:2318
+#: ../composer/e-msg-composer.c:2314
#: ../filter/filter-rule.c:890
#: ../mail/em-account-editor.c:701
#: ../mail/em-account-editor.c:1421
@@ -6067,9 +5979,9 @@ msgstr "Customise"
#: ../plugins/calendar-weather/calendar-weather.c:424
#: ../plugins/exchange-operations/exchange-delegates.glade.h:9
#: ../plugins/itip-formatter/itip-formatter.c:1775
-#: ../widgets/misc/e-cell-date-edit.c:249
-#: ../widgets/misc/e-dateedit.c:1507
-#: ../widgets/misc/e-dateedit.c:1721
+#: ../widgets/misc/e-cell-date-edit.c:247
+#: ../widgets/misc/e-dateedit.c:1503
+#: ../widgets/misc/e-dateedit.c:1717
msgid "None"
msgstr "None"
@@ -6207,21 +6119,21 @@ msgstr "Organiser"
msgid "Organizer:"
msgstr "Organiser:"
-#: ../calendar/gui/dialogs/memo-editor.c:220
-#: ../calendar/gui/print.c:2452
+#: ../calendar/gui/dialogs/memo-editor.c:219
+#: ../calendar/gui/print.c:2287
msgid "Memo"
msgstr "Memo"
-#: ../calendar/gui/dialogs/memo-page.c:870
+#: ../calendar/gui/dialogs/memo-page.c:868
#, 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:1490
+#: ../calendar/gui/dialogs/memo-page.c:1019
+#: ../mail/em-format.c:849
+#: ../mail/em-format-html.c:1489
#: ../mail/em-format-quote.c:200
-#: ../mail/em-format.c:850
-#: ../mail/em-mailer-prefs.c:87
+#: ../mail/em-mailer-prefs.c:91
#: ../mail/message-list.etspec.h:18
msgid "To"
msgstr "To"
@@ -6416,23 +6328,23 @@ msgstr "on the"
msgid "occurrences"
msgstr "occurrences"
-#: ../calendar/gui/dialogs/recurrence-page.c:2159
+#: ../calendar/gui/dialogs/recurrence-page.c:2157
msgid "Add exception"
msgstr "Add exception"
-#: ../calendar/gui/dialogs/recurrence-page.c:2202
+#: ../calendar/gui/dialogs/recurrence-page.c:2200
msgid "Could not get a selection to modify."
msgstr "Could not get a selection to modify."
-#: ../calendar/gui/dialogs/recurrence-page.c:2208
+#: ../calendar/gui/dialogs/recurrence-page.c:2206
msgid "Modify exception"
msgstr "Modify exception"
-#: ../calendar/gui/dialogs/recurrence-page.c:2254
+#: ../calendar/gui/dialogs/recurrence-page.c:2252
msgid "Could not get a selection to delete."
msgstr "Could not get a selection to delete."
-#: ../calendar/gui/dialogs/recurrence-page.c:2385
+#: ../calendar/gui/dialogs/recurrence-page.c:2383
msgid "Date/Time"
msgstr "Date/Time"
@@ -6488,7 +6400,7 @@ msgstr "year(s)"
msgid "Completed date is wrong"
msgstr "Completed date is wrong"
-#: ../calendar/gui/dialogs/task-details-page.c:517
+#: ../calendar/gui/dialogs/task-details-page.c:515
msgid "Web Page"
msgstr "Web Page"
@@ -6503,56 +6415,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:231
+#: ../calendar/gui/e-cal-component-preview.c:233
+#: ../calendar/gui/e-calendar-table.c:463
#: ../calendar/gui/e-cal-model-tasks.c:347
#: ../calendar/gui/e-cal-model-tasks.c:662
-#: ../calendar/gui/e-calendar-table.c:462
#: ../calendar/gui/e-itip-control.c:923
#: ../calendar/gui/e-meeting-store.c:194
#: ../calendar/gui/e-meeting-store.c:217
-#: ../calendar/gui/print.c:2513
+#: ../calendar/gui/print.c:2348
#: ../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:250
-#: ../calendar/gui/e-calendar-table.c:387
+#: ../calendar/gui/e-cal-component-preview.c:252
+#: ../calendar/gui/e-calendar-table.c:388
#: ../mail/message-list.c:1034
msgid "High"
msgstr "High"
#: ../calendar/gui/dialogs/task-details-page.glade.h:6
-#: ../calendar/gui/e-cal-component-preview.c:228
+#: ../calendar/gui/e-cal-component-preview.c:230
+#: ../calendar/gui/e-calendar-table.c:462
#: ../calendar/gui/e-cal-model-tasks.c:345
#: ../calendar/gui/e-cal-model-tasks.c:660
#: ../calendar/gui/e-cal-model-tasks.c:735
-#: ../calendar/gui/e-calendar-table.c:461
-#: ../calendar/gui/print.c:2510
+#: ../calendar/gui/print.c:2345
msgid "In Progress"
msgstr "In Progress"
#: ../calendar/gui/dialogs/task-details-page.glade.h:7
-#: ../calendar/gui/e-cal-component-preview.c:254
-#: ../calendar/gui/e-calendar-table.c:389
+#: ../calendar/gui/e-cal-component-preview.c:256
+#: ../calendar/gui/e-calendar-table.c:390
#: ../mail/message-list.c:1032
msgid "Low"
msgstr "Low"
#: ../calendar/gui/dialogs/task-details-page.glade.h:8
-#: ../calendar/gui/e-cal-component-preview.c:252
+#: ../calendar/gui/e-cal-component-preview.c:254
+#: ../calendar/gui/e-calendar-table.c:389
#: ../calendar/gui/e-cal-model.c:924
-#: ../calendar/gui/e-calendar-table.c:388
#: ../mail/message-list.c:1033
msgid "Normal"
msgstr "Normal"
#: ../calendar/gui/dialogs/task-details-page.glade.h:9
-#: ../calendar/gui/e-cal-component-preview.c:238
+#: ../calendar/gui/e-cal-component-preview.c:240
+#: ../calendar/gui/e-calendar-table.c:461
#: ../calendar/gui/e-cal-model-tasks.c:343
#: ../calendar/gui/e-cal-model-tasks.c:658
-#: ../calendar/gui/e-calendar-table.c:460
-#: ../calendar/gui/print.c:2507
+#: ../calendar/gui/print.c:2342
msgid "Not Started"
msgstr "Not Started"
@@ -6565,7 +6477,7 @@ msgid "Stat_us:"
msgstr "Stat_us:"
#: ../calendar/gui/dialogs/task-details-page.glade.h:12
-#: ../calendar/gui/e-calendar-table.c:390
+#: ../calendar/gui/e-calendar-table.c:391
msgid "Undefined"
msgstr "Undefined"
@@ -6582,12 +6494,12 @@ msgstr "_Priority:"
msgid "_Web Page:"
msgstr "_Web Page:"
-#: ../calendar/gui/dialogs/task-editor.c:425
+#: ../calendar/gui/dialogs/task-editor.c:424
#: ../calendar/gui/tasks-component.c:1245
msgid "_Task"
msgstr "_Task"
-#: ../calendar/gui/dialogs/task-editor.c:429
+#: ../calendar/gui/dialogs/task-editor.c:428
msgid "Task Details"
msgstr "Task Details"
@@ -6595,7 +6507,7 @@ msgstr "Task Details"
msgid "Due date is wrong"
msgstr "Due date is wrong"
-#: ../calendar/gui/dialogs/task-page.c:1650
+#: ../calendar/gui/dialogs/task-page.c:1648
#, c-format
msgid "Unable to open tasks in '%s'."
msgstr "Unable to open tasks in '%s'."
@@ -6739,286 +6651,198 @@ msgstr "%s at %s"
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:2913
+#: ../calendar/gui/e-cal-component-memo-preview.c:74
+#: ../calendar/gui/e-cal-component-preview.c:72
+#: ../mail/em-folder-view.c:2897
#, 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
+#: ../calendar/gui/e-cal-component-memo-preview.c:157
+#: ../calendar/gui/e-cal-component-preview.c:157
#: ../filter/filter-rule.c:804
msgid "Untitled"
msgstr "Untitled"
-#: ../calendar/gui/e-cal-component-memo-preview.c:206
-#: ../calendar/gui/e-cal-component-preview.c:195
-#: ../calendar/gui/e-cal-component-preview.c:206
+#: ../calendar/gui/e-cal-component-memo-preview.c:208
+#: ../calendar/gui/e-cal-component-preview.c:197
+#: ../calendar/gui/e-cal-component-preview.c:208
msgid "Start Date:"
msgstr "Start Date:"
-#: ../calendar/gui/e-cal-component-memo-preview.c:219
-#: ../calendar/gui/e-cal-component-preview.c:269
+#: ../calendar/gui/e-cal-component-memo-preview.c:221
+#: ../calendar/gui/e-cal-component-preview.c:271
#: ../calendar/gui/e-itip-control.c:1191
#: ../calendar/gui/e-itip-control.glade.h:4
#: ../composer/e-msg-composer-attachment.glade.h:2
-#: ../mail/mail-config.glade.h:68
+#: ../mail/mail-config.glade.h:67
#: ../widgets/misc/e-attachment.glade.h:2
msgid "Description:"
msgstr "Description:"
-#: ../calendar/gui/e-cal-component-memo-preview.c:252
-#: ../calendar/gui/e-cal-component-preview.c:301
+#: ../calendar/gui/e-cal-component-memo-preview.c:254
+#: ../calendar/gui/e-cal-component-preview.c:303
msgid "Web Page:"
msgstr "Web Page:"
-#: ../calendar/gui/e-cal-component-preview.c:188
+#: ../calendar/gui/e-cal-component-preview.c:190
#: ../calendar/gui/e-itip-control.c:1135
#: ../calendar/gui/e-itip-control.glade.h:9
msgid "Summary:"
msgstr "Summary:"
-#: ../calendar/gui/e-cal-component-preview.c:217
+#: ../calendar/gui/e-cal-component-preview.c:219
msgid "Due Date:"
msgstr "Due Date:"
#. write status
#. Status
-#: ../calendar/gui/e-cal-component-preview.c:224
+#: ../calendar/gui/e-cal-component-preview.c:226
#: ../calendar/gui/e-itip-control.c:1159
#: ../plugins/exchange-operations/exchange-account-setup.c:269
-#: ../plugins/itip-formatter/itip-view.c:961
+#: ../plugins/itip-formatter/itip-view.c:968
msgid "Status:"
msgstr "Status:"
-#: ../calendar/gui/e-cal-component-preview.c:248
+#: ../calendar/gui/e-cal-component-preview.c:250
msgid "Priority:"
msgstr "Priority:"
+#: ../calendar/gui/e-calendar-table.c:366
#: ../calendar/gui/e-cal-list-view.c:255
#: ../calendar/gui/e-cal-model.c:314
#: ../calendar/gui/e-cal-model.c:321
-#: ../calendar/gui/e-calendar-table.c:365
msgid "Public"
msgstr "Public"
+#: ../calendar/gui/e-calendar-table.c:367
#: ../calendar/gui/e-cal-list-view.c:256
#: ../calendar/gui/e-cal-model.c:323
-#: ../calendar/gui/e-calendar-table.c:366
msgid "Private"
msgstr "Private"
+#: ../calendar/gui/e-calendar-table.c:368
#: ../calendar/gui/e-cal-list-view.c:257
#: ../calendar/gui/e-cal-model.c:325
-#: ../calendar/gui/e-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
-#: ../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:183
-#: ../calendar/gui/e-calendar-table.c:439
-msgid "Free"
-msgstr "Free"
-
-#: ../calendar/gui/e-cal-model-calendar.c:186
-#: ../calendar/gui/e-calendar-table.c:440
-#: ../calendar/gui/e-meeting-time-sel.c:411
-msgid "Busy"
-msgstr "Busy"
-
-#: ../calendar/gui/e-cal-model-tasks.c:610
-msgid ""
-"The geographical position must be entered in the format: \n"
-"\n"
-"45.436845,125.862501"
-msgstr ""
-"The geographical position must be entered in the format: \n"
-"\n"
-"45.436845,125.862501"
-
-#: ../calendar/gui/e-cal-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: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-popup.c:107
-#: ../calendar/gui/e-cal-popup.c:124
-#: ../calendar/gui/e-cal-popup.c:171
-#: ../calendar/gui/e-itip-control.c:1176
-#: ../calendar/gui/e-itip-control.c:1317
-#: ../calendar/gui/e-meeting-list-view.c:169
-#: ../calendar/gui/e-meeting-list-view.c:183
-#: ../calendar/gui/e-meeting-store.c:124
-#: ../calendar/gui/e-meeting-store.c:159
-#: ../calendar/gui/e-meeting-store.c:222
-#: ../mail/em-utils.c:1213
-#: ../plugins/itip-formatter/itip-formatter.c:240
-#: ../plugins/itip-formatter/itip-formatter.c:1800
-#: ../plugins/plugin-manager/plugin-manager.c:68
-#: ../widgets/misc/e-attachment-bar.c:710
-#: ../widgets/misc/e-charset-picker.c:63
-msgid "Unknown"
-msgstr "Unknown"
-
-#: ../calendar/gui/e-cal-model.c:926
-msgid "Recurring"
-msgstr "Recurring"
-
-#: ../calendar/gui/e-cal-model.c:928
-msgid "Assigned"
-msgstr "Assigned"
-
-#: ../calendar/gui/e-cal-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:2146
-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:1144
-#: ../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:399
-#: ../mail/em-popup.c:776
-#, c-format
-msgid "Open in %s..."
-msgstr "Open in %s..."
-
-#: ../calendar/gui/e-calendar-table.c:409
+#: ../calendar/gui/e-calendar-table.c:410
msgid "0%"
msgstr "0%"
-#: ../calendar/gui/e-calendar-table.c:410
+#: ../calendar/gui/e-calendar-table.c:411
msgid "10%"
msgstr "10%"
-#: ../calendar/gui/e-calendar-table.c:411
+#: ../calendar/gui/e-calendar-table.c:412
msgid "20%"
msgstr "20%"
-#: ../calendar/gui/e-calendar-table.c:412
+#: ../calendar/gui/e-calendar-table.c:413
msgid "30%"
msgstr "30%"
-#: ../calendar/gui/e-calendar-table.c:413
+#: ../calendar/gui/e-calendar-table.c:414
msgid "40%"
msgstr "40%"
-#: ../calendar/gui/e-calendar-table.c:414
+#: ../calendar/gui/e-calendar-table.c:415
msgid "50%"
msgstr "50%"
-#: ../calendar/gui/e-calendar-table.c:415
+#: ../calendar/gui/e-calendar-table.c:416
msgid "60%"
msgstr "60%"
-#: ../calendar/gui/e-calendar-table.c:416
+#: ../calendar/gui/e-calendar-table.c:417
msgid "70%"
msgstr "70%"
-#: ../calendar/gui/e-calendar-table.c:417
+#: ../calendar/gui/e-calendar-table.c:418
msgid "80%"
msgstr "80%"
-#: ../calendar/gui/e-calendar-table.c:418
+#: ../calendar/gui/e-calendar-table.c:419
msgid "90%"
msgstr "90%"
-#: ../calendar/gui/e-calendar-table.c:419
+#: ../calendar/gui/e-calendar-table.c:420
msgid "100%"
msgstr "100%"
-#: ../calendar/gui/e-calendar-table.c:704
+#: ../calendar/gui/e-calendar-table.c:440
+#: ../calendar/gui/e-cal-model-calendar.c:183
+msgid "Free"
+msgstr "Free"
+
+#: ../calendar/gui/e-calendar-table.c:441
+#: ../calendar/gui/e-cal-model-calendar.c:186
+#: ../calendar/gui/e-meeting-time-sel.c:411
+msgid "Busy"
+msgstr "Busy"
+
+#: ../calendar/gui/e-calendar-table.c:527
+#: ../calendar/gui/e-tasks.c:1357
+#: ../calendar/gui/gnome-cal.c:1509
+#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
+#: ../calendar/gui/print.c:1809
+#: ../calendar/gui/tasks-component.c:522
+#: ../calendar/gui/tasks-component.c:1013
+#: ../calendar/gui/tasks-control.c:478
+#: ../calendar/gui/tasks-control.c:494
+#: ../calendar/importers/icalendar-importer.c:80
+#: ../calendar/importers/icalendar-importer.c:741
+#: ../plugins/exchange-operations/exchange-folder.c:581
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:401
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:545
+#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:12
+msgid "Tasks"
+msgstr "Tasks"
+
+#: ../calendar/gui/e-calendar-table.c:705
#: ../calendar/gui/e-calendar-view.c:675
-#: ../calendar/gui/e-memo-table.c:482
+#: ../calendar/gui/e-memo-table.c:483
msgid "Deleting selected objects"
msgstr "Deleting selected objects"
-#: ../calendar/gui/e-calendar-table.c:957
+#: ../calendar/gui/e-calendar-table.c:958
#: ../calendar/gui/e-calendar-view.c:803
-#: ../calendar/gui/e-memo-table.c:659
+#: ../calendar/gui/e-memo-table.c:660
msgid "Updating objects"
msgstr "Updating objects"
-#: ../calendar/gui/e-calendar-table.c:1106
-#: ../calendar/gui/e-calendar-view.c:1248
-#: ../calendar/gui/e-memo-table.c:798
+#: ../calendar/gui/e-calendar-table.c:1107
+#: ../calendar/gui/e-calendar-view.c:1229
+#: ../calendar/gui/e-memo-table.c:799
#: ../composer/e-msg-composer.c:1351
msgid "Save as..."
msgstr "Save as..."
-#: ../calendar/gui/e-calendar-table.c:1277
-#: ../calendar/gui/e-calendar-view.c:1681
+#: ../calendar/gui/e-calendar-table.c:1278
+#: ../calendar/gui/e-calendar-view.c:1662
msgid "New _Task"
msgstr "New _Task"
-#: ../calendar/gui/e-calendar-table.c:1281
-#: ../calendar/gui/e-memo-table.c:902
+#: ../calendar/gui/e-calendar-table.c:1282
+#: ../calendar/gui/e-memo-table.c:903
msgid "Open _Web Page"
msgstr "Open _Web Page"
#: ../calendar/gui/e-calendar-table.c:1283
-#: ../calendar/gui/e-calendar-view.c:1684
-#: ../calendar/gui/e-calendar-view.c:1700
+#: ../calendar/gui/e-calendar-view.c:1680
+#: ../calendar/gui/e-cal-popup.c:276
#: ../calendar/gui/e-memo-table.c:904
+#: ../mail/em-folder-view.c:1144
+#: ../mail/em-popup.c:554
+#: ../mail/em-popup.c:565
+msgid "_Save As..."
+msgstr "_Save As..."
+
+#: ../calendar/gui/e-calendar-table.c:1284
+#: ../calendar/gui/e-calendar-view.c:1665
+#: ../calendar/gui/e-calendar-view.c:1681
+#: ../calendar/gui/e-memo-table.c:905
#: ../mail/em-folder-view.c:1145
#: ../plugins/print-message/org-gnome-print-message.xml.h:3
#: ../ui/evolution-addressbook.xml.h:58
@@ -7029,9 +6853,9 @@ msgstr "Open _Web Page"
msgid "_Print..."
msgstr "_Print..."
-#: ../calendar/gui/e-calendar-table.c:1287
-#: ../calendar/gui/e-calendar-view.c:1704
-#: ../calendar/gui/e-memo-table.c:908
+#: ../calendar/gui/e-calendar-table.c:1288
+#: ../calendar/gui/e-calendar-view.c:1685
+#: ../calendar/gui/e-memo-table.c:909
#: ../ui/evolution-addressbook.xml.h:2
#: ../ui/evolution-calendar.xml.h:1
#: ../ui/evolution-memos.xml.h:1
@@ -7039,10 +6863,10 @@ msgstr "_Print..."
msgid "C_ut"
msgstr "C_ut"
-#: ../calendar/gui/e-calendar-table.c:1289
+#: ../calendar/gui/e-calendar-table.c:1290
+#: ../calendar/gui/e-calendar-view.c:1668
#: ../calendar/gui/e-calendar-view.c:1687
-#: ../calendar/gui/e-calendar-view.c:1706
-#: ../calendar/gui/e-memo-table.c:910
+#: ../calendar/gui/e-memo-table.c:911
#: ../ui/evolution-addressbook.xml.h:57
#: ../ui/evolution-calendar.xml.h:43
#: ../ui/evolution-composer-entries.xml.h:15
@@ -7052,38 +6876,38 @@ msgstr "C_ut"
msgid "_Paste"
msgstr "_Paste"
-#: ../calendar/gui/e-calendar-table.c:1293
+#: ../calendar/gui/e-calendar-table.c:1294
#: ../ui/evolution-tasks.xml.h:22
msgid "_Assign Task"
msgstr "_Assign Task"
-#: ../calendar/gui/e-calendar-table.c:1294
-#: ../calendar/gui/e-memo-table.c:914
+#: ../calendar/gui/e-calendar-table.c:1295
+#: ../calendar/gui/e-memo-table.c:915
#: ../ui/evolution-tasks.xml.h:26
msgid "_Forward as iCalendar"
msgstr "_Forward as iCalendar"
-#: ../calendar/gui/e-calendar-table.c:1295
+#: ../calendar/gui/e-calendar-table.c:1296
msgid "_Mark as Complete"
msgstr "_Mark as Complete"
-#: ../calendar/gui/e-calendar-table.c:1296
+#: ../calendar/gui/e-calendar-table.c:1297
msgid "_Mark Selected Tasks as Complete"
msgstr "_Mark Selected Tasks as Complete"
-#: ../calendar/gui/e-calendar-table.c:1297
+#: ../calendar/gui/e-calendar-table.c:1298
msgid "_Mark as Incomplete"
msgstr "_Mark as Incomplete"
-#: ../calendar/gui/e-calendar-table.c:1298
+#: ../calendar/gui/e-calendar-table.c:1299
msgid "_Mark Selected Tasks as Incomplete"
msgstr "_Mark Selected Tasks as Incomplete"
-#: ../calendar/gui/e-calendar-table.c:1303
+#: ../calendar/gui/e-calendar-table.c:1304
msgid "_Delete Selected Tasks"
msgstr "_Delete Selected Tasks"
-#: ../calendar/gui/e-calendar-table.c:1536
+#: ../calendar/gui/e-calendar-table.c:1537
#: ../calendar/gui/e-calendar-table.etspec.h:4
msgid "Click to add a task"
msgstr "Click to add a task"
@@ -7094,7 +6918,7 @@ msgid "% Complete"
msgstr "% Complete"
#: ../calendar/gui/e-calendar-table.etspec.h:5
-#: ../mail/mail-send-recv.c:656
+#: ../mail/mail-send-recv.c:705
msgid "Complete"
msgstr "Complete"
@@ -7115,68 +6939,76 @@ msgstr "Priority"
msgid "Start date"
msgstr "Start date"
+#: ../calendar/gui/e-calendar-table.etspec.h:11
+#: ../calendar/gui/e-cal-list-view.etspec.h:5
+#: ../calendar/gui/e-memo-table.etspec.h:5
+#: ../mail/mail-dialogs.glade.h:20
+#: ../plugins/save-calendar/csv-format.c:386
+msgid "Summary"
+msgstr "Summary"
+
#: ../calendar/gui/e-calendar-table.etspec.h:12
msgid "Task sort"
msgstr "Task sort"
-#: ../calendar/gui/e-calendar-view.c:1367
+#: ../calendar/gui/e-calendar-view.c:1348
msgid "Moving items"
msgstr "Moving items"
-#: ../calendar/gui/e-calendar-view.c:1369
+#: ../calendar/gui/e-calendar-view.c:1350
msgid "Copying items"
msgstr "Copying items"
-#: ../calendar/gui/e-calendar-view.c:1678
+#: ../calendar/gui/e-calendar-view.c:1659
msgid "New _Appointment..."
msgstr "New _Appointment..."
-#: ../calendar/gui/e-calendar-view.c:1679
+#: ../calendar/gui/e-calendar-view.c:1660
msgid "New All Day _Event"
msgstr "New All Day _Event"
-#: ../calendar/gui/e-calendar-view.c:1680
+#: ../calendar/gui/e-calendar-view.c:1661
msgid "New _Meeting"
msgstr "New _Meeting"
#. FIXME: hook in this somehow
-#: ../calendar/gui/e-calendar-view.c:1691
+#: ../calendar/gui/e-calendar-view.c:1672
msgid "_Current View"
msgstr "_Current View"
-#: ../calendar/gui/e-calendar-view.c:1693
+#: ../calendar/gui/e-calendar-view.c:1674
msgid "Select T_oday"
msgstr "Select T_oday"
-#: ../calendar/gui/e-calendar-view.c:1694
+#: ../calendar/gui/e-calendar-view.c:1675
msgid "_Select Date..."
msgstr "_Select Date..."
-#: ../calendar/gui/e-calendar-view.c:1710
+#: ../calendar/gui/e-calendar-view.c:1691
msgid "Cop_y to Calendar..."
msgstr "Cop_y to Calendar..."
-#: ../calendar/gui/e-calendar-view.c:1711
+#: ../calendar/gui/e-calendar-view.c:1692
msgid "Mo_ve to Calendar..."
msgstr "Mo_ve to Calendar..."
-#: ../calendar/gui/e-calendar-view.c:1712
+#: ../calendar/gui/e-calendar-view.c:1693
msgid "_Delegate Meeting..."
msgstr "_Delegate Meeting..."
-#: ../calendar/gui/e-calendar-view.c:1713
+#: ../calendar/gui/e-calendar-view.c:1694
msgid "_Schedule Meeting..."
msgstr "_Schedule Meeting..."
-#: ../calendar/gui/e-calendar-view.c:1714
+#: ../calendar/gui/e-calendar-view.c:1695
msgid "_Forward as iCalendar..."
msgstr "_Forward as iCalendar..."
-#: ../calendar/gui/e-calendar-view.c:1715
+#: ../calendar/gui/e-calendar-view.c:1696
msgid "_Reply"
msgstr "_Reply"
-#: ../calendar/gui/e-calendar-view.c:1716
+#: ../calendar/gui/e-calendar-view.c:1697
#: ../mail/em-folder-view.c:1139
#: ../mail/em-popup.c:559
#: ../mail/em-popup.c:570
@@ -7184,44 +7016,142 @@ msgstr "_Reply"
msgid "Reply to _All"
msgstr "Reply to _All"
-#: ../calendar/gui/e-calendar-view.c:1721
+#: ../calendar/gui/e-calendar-view.c:1702
msgid "Make this Occurrence _Movable"
msgstr "Make this Occurrence _Movable"
-#: ../calendar/gui/e-calendar-view.c:1722
+#: ../calendar/gui/e-calendar-view.c:1703
#: ../ui/evolution-calendar.xml.h:9
msgid "Delete this _Occurrence"
msgstr "Delete this _Occurrence"
-#: ../calendar/gui/e-calendar-view.c:1723
+#: ../calendar/gui/e-calendar-view.c:1704
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
+#: ../calendar/gui/e-calendar-view.c:2156
#, 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
+#: ../calendar/gui/e-calendar-view.c:2160
#, 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:2481
+#: ../calendar/gui/e-calendar-view.c:2176
+#: ../calendar/gui/print.c:2316
#, c-format
msgid "Location: %s"
msgstr "Location: %s"
#. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
-#: ../calendar/gui/e-calendar-view.c:2226
+#: ../calendar/gui/e-calendar-view.c:2207
#, c-format
msgid "Time: %s %s"
msgstr "Time: %s %s"
+#: ../calendar/gui/e-cal-list-view.etspec.h:2
+msgid "End Date"
+msgstr "End Date"
+
+#: ../calendar/gui/e-cal-list-view.etspec.h:4
+#: ../calendar/gui/e-memo-table.etspec.h:4
+msgid "Start Date"
+msgstr "Start Date"
+
+#. This is the default filename used for temporary file creation
+#: ../calendar/gui/e-cal-model.c:327
+#: ../calendar/gui/e-cal-popup.c:107
+#: ../calendar/gui/e-cal-popup.c:124
+#: ../calendar/gui/e-cal-popup.c:171
+#: ../calendar/gui/e-itip-control.c:1176
+#: ../calendar/gui/e-itip-control.c:1317
+#: ../calendar/gui/e-meeting-list-view.c:169
+#: ../calendar/gui/e-meeting-list-view.c:183
+#: ../calendar/gui/e-meeting-store.c:124
+#: ../calendar/gui/e-meeting-store.c:159
+#: ../calendar/gui/e-meeting-store.c:222
+#: ../mail/em-utils.c:1199
+#: ../plugins/itip-formatter/itip-formatter.c:240
+#: ../plugins/itip-formatter/itip-formatter.c:1800
+#: ../plugins/plugin-manager/plugin-manager.c:68
+#: ../widgets/misc/e-attachment-bar.c:710
+#: ../widgets/misc/e-charset-picker.c:63
+msgid "Unknown"
+msgstr "Unknown"
+
+#: ../calendar/gui/e-cal-model.c:926
+msgid "Recurring"
+msgstr "Recurring"
+
+#: ../calendar/gui/e-cal-model.c:928
+msgid "Assigned"
+msgstr "Assigned"
+
+#: ../calendar/gui/e-cal-model.c:930
+#: ../calendar/gui/e-cal-model-tasks.c:1012
+#: ../calendar/gui/e-meeting-list-view.c:193
+#: ../calendar/gui/e-meeting-store.c:166
+#: ../calendar/gui/e-meeting-store.c:176
+#: ../calendar/gui/e-meeting-store.c:764
+#: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:5
+msgid "Yes"
+msgstr "Yes"
+
+#: ../calendar/gui/e-cal-model.c:930
+#: ../calendar/gui/e-cal-model-tasks.c:1012
+#: ../calendar/gui/e-meeting-list-view.c:194
+#: ../calendar/gui/e-meeting-store.c:178
+#: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:2
+msgid "No"
+msgstr "No"
+
+#: ../calendar/gui/e-cal-model-tasks.c:610
+msgid ""
+"The geographical position must be entered in the format: \n"
+"\n"
+"45.436845,125.862501"
+msgstr ""
+"The geographical position must be entered in the format: \n"
+"\n"
+"45.436845,125.862501"
+
+#: ../calendar/gui/e-cal-popup.c:177
+#: ../mail/em-popup.c:412
+msgid "Save As..."
+msgstr "Save As..."
+
+#: ../calendar/gui/e-cal-popup.c:193
+#: ../mail/em-format-html-display.c:2159
+msgid "Select folder to save selected attachments..."
+msgstr "Select folder to save selected attachments..."
+
+#: ../calendar/gui/e-cal-popup.c:222
+#: ../mail/em-popup.c:437
+#, c-format
+msgid "untitled_image.%s"
+msgstr "untitled_image.%s"
+
+#: ../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:399
+#: ../mail/em-popup.c:776
+#, c-format
+msgid "Open in %s..."
+msgstr "Open in %s..."
+
#. strftime format of a weekday, a date and a time, 24-hour.
#: ../calendar/gui/e-cell-date-edit-text.c:116
msgid "%a %m/%d/%Y %H:%M:%S"
@@ -7232,45 +7162,20 @@ msgstr "%a %d/%m/%Y %H:%M:%S"
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:124
+#: ../calendar/gui/e-cell-date-edit-text.c:127
#, c-format
msgid ""
"The date must be entered in the format: \n"
-"\n"
"%s"
msgstr ""
"The date must be entered in the format: \n"
-"\n"
"%s"
-#. TO TRANSLATORS: %02i is the number of minutes; this is a context menu entry
-#. * to change the length of the time division in the calendar day view, e.g.
-#. * a day is displayed in 24 "60 minute divisions" or 48 "30 minute divisions"
-#.
-#: ../calendar/gui/e-day-view-time-item.c:807
-#, c-format
-msgid "%02i minute divisions"
-msgstr "%02i minute divisions"
-
-#. strftime format %A = full weekday name, %d = day of month,
-#. %B = full month name. Don't use any other specifiers.
-#. strftime format %A = full weekday name, %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-day-view-top-item.c:1311
-#: ../calendar/gui/e-day-view.c:2089
-#: ../calendar/gui/e-week-view-main-item.c:310
-#: ../calendar/gui/e-week-view-main-item.c:524
-#: ../calendar/gui/print.c:1643
-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:746
#: ../calendar/gui/e-day-view.c:1089
#: ../calendar/gui/e-week-view.c:503
-#: ../calendar/gui/print.c:952
+#: ../calendar/gui/print.c:811
msgid "am"
msgstr "am"
@@ -7278,10 +7183,33 @@ msgstr "am"
#: ../calendar/gui/e-day-view.c:749
#: ../calendar/gui/e-day-view.c:1092
#: ../calendar/gui/e-week-view.c:506
-#: ../calendar/gui/print.c:954
+#: ../calendar/gui/print.c:813
msgid "pm"
msgstr "pm"
+#. strftime format %A = full weekday name, %d = day of month,
+#. %B = full month name. Don't use any other specifiers.
+#. strftime format %A = full weekday name, %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-day-view.c:2089
+#: ../calendar/gui/e-day-view-top-item.c:1311
+#: ../calendar/gui/e-week-view-main-item.c:310
+#: ../calendar/gui/e-week-view-main-item.c:524
+#: ../calendar/gui/print.c:1503
+msgid "%A %d %B"
+msgstr "%A %d %B"
+
+#. TO TRANSLATORS: %02i is the number of minutes; this is a context menu entry
+#. * to change the length of the time division in the calendar day view, e.g.
+#. * a day is displayed in 24 "60 minute divisions" or 48 "30 minute divisions"
+#.
+#: ../calendar/gui/e-day-view-time-item.c:807
+#, c-format
+msgid "%02i minute divisions"
+msgstr "%02i minute divisions"
+
#: ../calendar/gui/e-itip-control.c:759
msgid "Yes. (Complex Recurrence)"
msgstr "Yes. (Complex Recurrence)"
@@ -7405,12 +7333,12 @@ msgstr "iCalendar Error"
#: ../calendar/gui/e-itip-control.c:1081
#: ../calendar/gui/e-itip-control.c:1092
#: ../calendar/gui/e-itip-control.c:1109
+#: ../plugins/itip-formatter/itip-view.c:341
#: ../plugins/itip-formatter/itip-view.c:342
-#: ../plugins/itip-formatter/itip-view.c:343
+#: ../plugins/itip-formatter/itip-view.c:409
#: ../plugins/itip-formatter/itip-view.c:410
-#: ../plugins/itip-formatter/itip-view.c:411
+#: ../plugins/itip-formatter/itip-view.c:477
#: ../plugins/itip-formatter/itip-view.c:478
-#: ../plugins/itip-formatter/itip-view.c:479
msgid "An unknown person"
msgstr "An unknown person"
@@ -7634,79 +7562,77 @@ msgstr "The attachment does not contain a valid calendar message"
msgid "The attachment has no viewable calendar items"
msgstr "The attachment has no viewable calendar items"
-#: ../calendar/gui/e-itip-control.c:1936
+#: ../calendar/gui/e-itip-control.c:1944
msgid "Update complete\n"
msgstr "Update complete\n"
-#: ../calendar/gui/e-itip-control.c:1964
+#: ../calendar/gui/e-itip-control.c:1977
msgid "Object is invalid and cannot be updated\n"
msgstr "Object is invalid and cannot be updated\n"
-#: ../calendar/gui/e-itip-control.c:1974
+#: ../calendar/gui/e-itip-control.c:1994
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:1986
+#: ../calendar/gui/e-itip-control.c:2012
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:2003
+#: ../calendar/gui/e-itip-control.c:2036
msgid "Attendee status updated\n"
msgstr "Attendee status updated\n"
-#: ../calendar/gui/e-itip-control.c:2006
+#: ../calendar/gui/e-itip-control.c:2043
#: ../plugins/itip-formatter/itip-formatter.c:1108
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:2030
-#: ../calendar/gui/e-itip-control.c:2078
+#: ../calendar/gui/e-itip-control.c:2074
+#: ../calendar/gui/e-itip-control.c:2131
msgid "Item sent!\n"
msgstr "Item sent!\n"
-#: ../calendar/gui/e-itip-control.c:2032
-#: ../calendar/gui/e-itip-control.c:2082
+#: ../calendar/gui/e-itip-control.c:2080
+#: ../calendar/gui/e-itip-control.c:2139
msgid "The item could not be sent!\n"
msgstr "The item could not be sent!\n"
-#: ../calendar/gui/e-itip-control.c:2162
+#: ../calendar/gui/e-itip-control.c:2220
msgid "Choose an action:"
msgstr "Choose an action:"
-#: ../calendar/gui/e-itip-control.c:2234
+#: ../calendar/gui/e-itip-control.c:2292
msgid "Update"
msgstr "Update"
-#: ../calendar/gui/e-itip-control.c:2262
+#: ../calendar/gui/e-itip-control.c:2320
#: ../plugins/groupwise-features/process-meeting.c:48
msgid "Accept"
msgstr "Accept"
-#: ../calendar/gui/e-itip-control.c:2263
+#: ../calendar/gui/e-itip-control.c:2321
msgid "Tentatively accept"
msgstr "Tentatively accept"
-#: ../calendar/gui/e-itip-control.c:2264
+#: ../calendar/gui/e-itip-control.c:2322
#: ../plugins/groupwise-features/process-meeting.c:50
msgid "Decline"
msgstr "Decline"
-#: ../calendar/gui/e-itip-control.c:2293
+#: ../calendar/gui/e-itip-control.c:2351
msgid "Send Free/Busy Information"
msgstr "Send Free/Busy Information"
-#: ../calendar/gui/e-itip-control.c:2321
+#: ../calendar/gui/e-itip-control.c:2379
msgid "Update respondent status"
msgstr "Update respondent status"
-#: ../calendar/gui/e-itip-control.c:2349
+#: ../calendar/gui/e-itip-control.c:2407
msgid "Send Latest Information"
msgstr "Send Latest Information"
-#: ../calendar/gui/e-itip-control.c:2377
+#: ../calendar/gui/e-itip-control.c:2435
#: ../calendar/gui/itip-utils.c:710
-#: ../mail/mail-send-recv.c:451
-#: ../mail/mail-send-recv.c:504
#: ../ui/evolution-mail-global.xml.h:1
msgid "Cancel"
msgstr "Cancel"
@@ -7765,8 +7691,8 @@ msgstr "Individual"
#: ../calendar/gui/e-meeting-list-view.c:166
#: ../calendar/gui/e-meeting-store.c:101
#: ../calendar/gui/e-meeting-store.c:118
-#: ../widgets/table/e-table-config-no-group.glade.h:7
#: ../widgets/table/e-table-config.glade.h:6
+#: ../widgets/table/e-table-config-no-group.glade.h:7
msgid "Group"
msgstr "Group"
@@ -7839,28 +7765,6 @@ msgstr "Attendee "
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:464
-#: ../calendar/gui/e-meeting-time-sel.c:2111
-msgid "%A, %B %d, %Y"
-msgstr "%A, %d %B, %Y"
-
-#. This is a strftime() format string %a = abbreviated weekday
-#. name, %m = month number, %d = month day, %Y = full year.
-#. This is a strftime() format string %a = abbreviated weekday name,
-#. %m = month number, %d = month day, %Y = full year.
-#: ../calendar/gui/e-meeting-time-sel-item.c:468
-#: ../calendar/gui/e-meeting-time-sel.c:2144
-msgid "%a %m/%d/%Y"
-msgstr "%a %d/%m/%Y"
-
-#. This is a strftime() format string %m = month number,
-#. %d = month day, %Y = full year.
-#: ../calendar/gui/e-meeting-time-sel-item.c:472
-msgid "%m/%d/%Y"
-msgstr "%d/%m/%Y"
-
#: ../calendar/gui/e-meeting-time-sel.c:412
#: ../designs/OOA/ooa.glade.h:11
msgid "Out of Office"
@@ -7870,78 +7774,87 @@ msgstr "Out of Office"
msgid "No Information"
msgstr "No Information"
-#: ../calendar/gui/e-meeting-time-sel.c:427
+#: ../calendar/gui/e-meeting-time-sel.c:428
msgid "A_ttendees..."
msgstr "A_ttendees..."
-#: ../calendar/gui/e-meeting-time-sel.c:444
+#: ../calendar/gui/e-meeting-time-sel.c:449
msgid "O_ptions"
msgstr "O_ptions"
-#: ../calendar/gui/e-meeting-time-sel.c:461
+#: ../calendar/gui/e-meeting-time-sel.c:466
msgid "Show _only working hours"
msgstr "Show _only working hours"
-#: ../calendar/gui/e-meeting-time-sel.c:471
+#: ../calendar/gui/e-meeting-time-sel.c:476
msgid "Show _zoomed out"
msgstr "Show _zoomed out"
-#: ../calendar/gui/e-meeting-time-sel.c:486
+#: ../calendar/gui/e-meeting-time-sel.c:491
msgid "_Update free/busy"
msgstr "_Update free/busy"
-#: ../calendar/gui/e-meeting-time-sel.c:501
+#: ../calendar/gui/e-meeting-time-sel.c:506
msgid "_<<"
msgstr "_<<"
-#: ../calendar/gui/e-meeting-time-sel.c:519
+#: ../calendar/gui/e-meeting-time-sel.c:524
msgid "_Autopick"
msgstr "_Autopick"
-#: ../calendar/gui/e-meeting-time-sel.c:534
+#: ../calendar/gui/e-meeting-time-sel.c:539
msgid ">_>"
msgstr ">_>"
-#: ../calendar/gui/e-meeting-time-sel.c:551
+#: ../calendar/gui/e-meeting-time-sel.c:556
msgid "_All people and resources"
msgstr "_All people and resources"
-#: ../calendar/gui/e-meeting-time-sel.c:560
+#: ../calendar/gui/e-meeting-time-sel.c:565
msgid "All _people and one resource"
msgstr "All _people and one resource"
-#: ../calendar/gui/e-meeting-time-sel.c:569
+#: ../calendar/gui/e-meeting-time-sel.c:574
msgid "_Required people"
msgstr "_Required people"
-#: ../calendar/gui/e-meeting-time-sel.c:578
+#: ../calendar/gui/e-meeting-time-sel.c:583
msgid "Required people and _one resource"
msgstr "Required people and _one resource"
-#: ../calendar/gui/e-meeting-time-sel.c:614
+#: ../calendar/gui/e-meeting-time-sel.c:619
msgid "_Start time:"
msgstr "_Start time:"
-#: ../calendar/gui/e-meeting-time-sel.c:641
+#: ../calendar/gui/e-meeting-time-sel.c:646
msgid "_End time:"
msgstr "_End time:"
-#: ../calendar/gui/e-memo-table.c:919
-msgid "_Delete Selected Memos"
-msgstr "_Delete Selected Memos"
+#. This is a strftime() format string %A = full weekday name,
+#. %B = full month name, %d = month day, %Y = full year.
+#: ../calendar/gui/e-meeting-time-sel.c:2116
+#: ../calendar/gui/e-meeting-time-sel-item.c:464
+msgid "%A, %B %d, %Y"
+msgstr "%A, %d %B, %Y"
-#: ../calendar/gui/e-memo-table.c:1070
-#: ../calendar/gui/e-memo-table.etspec.h:2
-msgid "Click to add a memo"
-msgstr "Click to add a memo"
+#. This is a strftime() format string %a = abbreviated weekday name,
+#. %m = month number, %d = month day, %Y = full year.
+#. This is a strftime() format string %a = abbreviated weekday
+#. name, %m = month number, %d = month day, %Y = full year.
+#: ../calendar/gui/e-meeting-time-sel.c:2149
+#: ../calendar/gui/e-meeting-time-sel-item.c:468
+msgid "%a %m/%d/%Y"
+msgstr "%a %d/%m/%Y"
-#: ../calendar/gui/e-memo-table.etspec.h:3
-msgid "Memo sort"
-msgstr "Memo sort"
+#. This is a strftime() format string %m = month number,
+#. %d = month day, %Y = full year.
+#: ../calendar/gui/e-meeting-time-sel-item.c:472
+msgid "%m/%d/%Y"
+msgstr "%d/%m/%Y"
-#: ../calendar/gui/e-memos.c:724
-#: ../calendar/gui/e-tasks.c:837
-#: ../calendar/gui/gnome-cal.c:2771
+#: ../calendar/gui/e-memos.c:733
+#: ../calendar/gui/e-tasks.c:844
+#: ../calendar/gui/gnome-cal.c:2778
#, c-format
msgid ""
"Error on %s:\n"
@@ -7950,39 +7863,63 @@ msgstr ""
"Error on %s:\n"
" %s"
-#: ../calendar/gui/e-memos.c:772
+#: ../calendar/gui/e-memos.c:782
msgid "Loading memos"
msgstr "Loading memos"
-#: ../calendar/gui/e-memos.c:853
+#: ../calendar/gui/e-memos.c:863
#, c-format
msgid "Opening memos at %s"
msgstr "Opening memos at %s"
-#: ../calendar/gui/e-memos.c:1026
-#: ../calendar/gui/e-tasks.c:1240
+#: ../calendar/gui/e-memos.c:1036
+#: ../calendar/gui/e-tasks.c:1249
msgid "Deleting selected objects..."
msgstr "Deleting selected objects..."
+#: ../calendar/gui/e-memos.c:1094
+#: ../calendar/gui/e-memo-table.c:324
+#: ../calendar/gui/gnome-cal.c:1637
+#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
+#: ../calendar/gui/memos-component.c:531
+#: ../calendar/gui/memos-component.c:1008
+#: ../calendar/gui/memos-control.c:336
+#: ../calendar/gui/memos-control.c:352
+msgid "Memos"
+msgstr "Memos"
+
+#: ../calendar/gui/e-memo-table.c:920
+msgid "_Delete Selected Memos"
+msgstr "_Delete Selected Memos"
+
+#: ../calendar/gui/e-memo-table.c:1071
+#: ../calendar/gui/e-memo-table.etspec.h:2
+msgid "Click to add a memo"
+msgstr "Click to add a memo"
+
+#: ../calendar/gui/e-memo-table.etspec.h:3
+msgid "Memo sort"
+msgstr "Memo sort"
+
#: ../calendar/gui/e-pub-utils.c:322
#, c-format
msgid "Enter the password for %s"
msgstr "Enter the password for %s"
-#: ../calendar/gui/e-tasks.c:885
+#: ../calendar/gui/e-tasks.c:894
msgid "Loading tasks"
msgstr "Loading tasks"
-#: ../calendar/gui/e-tasks.c:972
+#: ../calendar/gui/e-tasks.c:981
#, c-format
msgid "Opening tasks at %s"
msgstr "Opening tasks at %s"
-#: ../calendar/gui/e-tasks.c:1217
+#: ../calendar/gui/e-tasks.c:1226
msgid "Completing tasks..."
msgstr "Completing tasks..."
-#: ../calendar/gui/e-tasks.c:1267
+#: ../calendar/gui/e-tasks.c:1276
msgid "Expunging"
msgstr "Expunging"
@@ -7995,7 +7932,7 @@ msgstr "Select Timezone"
#. change the specifiers or add anything.
#: ../calendar/gui/e-week-view-main-item.c:327
#: ../calendar/gui/e-week-view-main-item.c:541
-#: ../calendar/gui/print.c:1624
+#: ../calendar/gui/print.c:1484
msgid "%d %B"
msgstr "%d %B"
@@ -8003,42 +7940,92 @@ msgstr "%d %B"
msgid "Updating query"
msgstr "Updating query"
-#: ../calendar/gui/gnome-cal.c:2428
+#: ../calendar/gui/gnome-cal.c:2429
msgid "_Custom View"
msgstr "_Custom View"
-#: ../calendar/gui/gnome-cal.c:2429
+#: ../calendar/gui/gnome-cal.c:2430
msgid "_Save Custom View"
msgstr "_Save Custom View"
-#: ../calendar/gui/gnome-cal.c:2434
+#: ../calendar/gui/gnome-cal.c:2435
msgid "_Define Views..."
msgstr "_Define Views..."
-#: ../calendar/gui/gnome-cal.c:2600
+#: ../calendar/gui/gnome-cal.c:2601
#, c-format
msgid "Loading appointments at %s"
msgstr "Loading appointments at %s"
-#: ../calendar/gui/gnome-cal.c:2619
+#: ../calendar/gui/gnome-cal.c:2620
#, c-format
msgid "Loading tasks at %s"
msgstr "Loading tasks at %s"
-#: ../calendar/gui/gnome-cal.c:2628
+#: ../calendar/gui/gnome-cal.c:2629
#, c-format
msgid "Loading memos at %s"
msgstr "Loading memos at %s"
-#: ../calendar/gui/gnome-cal.c:2736
+#: ../calendar/gui/gnome-cal.c:2737
#, c-format
msgid "Opening %s"
msgstr "Opening %s"
-#: ../calendar/gui/gnome-cal.c:3664
+#: ../calendar/gui/gnome-cal.c:3673
msgid "Purging"
msgstr "Purging"
+#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
+#: ../plugins/itip-formatter/itip-formatter.c:2078
+msgid "Calendar and Tasks"
+msgstr "Calendar and Tasks"
+
+#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
+msgid "Configure your timezone, Calendar and Task List here "
+msgstr "Configure your timezone, Calendar and Task List here "
+
+#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
+msgid "Evolution Calendar and Tasks"
+msgstr "Evolution Calendar and Tasks"
+
+#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
+msgid "Evolution Calendar configuration control"
+msgstr "Evolution Calendar configuration control"
+
+#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
+msgid "Evolution Calendar scheduling message viewer"
+msgstr "Evolution Calendar scheduling message viewer"
+
+#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
+msgid "Evolution Calendar/Task editor"
+msgstr "Evolution Calendar/Task editor"
+
+#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
+msgid "Evolution's Calendar component"
+msgstr "Evolution's Calendar component"
+
+#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
+msgid "Evolution's Memos component"
+msgstr "Evolution's Memos component"
+
+#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
+msgid "Evolution's Tasks component"
+msgstr "Evolution's Tasks component"
+
+#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
+msgid "Memo_s"
+msgstr "Memo_s"
+
+#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:14
+msgid "_Calendars"
+msgstr "_Calendars"
+
+#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:15
+#: ../views/tasks/galview.xml.h:3
+msgid "_Tasks"
+msgstr "_Tasks"
+
#: ../calendar/gui/goto-dialog.glade.h:1
msgid "April"
msgstr "April"
@@ -8167,7 +8154,6 @@ msgstr[1] "%d memos"
#: ../calendar/gui/memos-component.c:529
#: ../calendar/gui/tasks-component.c:520
-#: ../mail/mail-component.c:562
#, c-format
msgid ", %d selected"
msgid_plural ", %d selected"
@@ -8227,7 +8213,8 @@ msgstr "Memo li_st"
msgid "Create a new memo list"
msgstr "Create a new memo list"
-#: ../calendar/gui/memos-control.c:340
+#: ../calendar/gui/memos-control.c:336
+#: ../calendar/gui/memos-control.c:352
msgid "Print Memos"
msgstr "Print Memos"
@@ -8270,246 +8257,211 @@ msgid "Unable to migrate tasks `%s'"
msgstr "Unable to migrate tasks `%s'"
#: ../calendar/gui/migration.c:1211
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:404
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:435
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:548
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:402
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:433
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:546
msgid "Notes"
msgstr "Notes"
-#: ../calendar/gui/print.c:654
+#: ../calendar/gui/print.c:513
msgid "1st"
msgstr "1st"
-#: ../calendar/gui/print.c:654
+#: ../calendar/gui/print.c:513
msgid "2nd"
msgstr "2nd"
-#: ../calendar/gui/print.c:654
+#: ../calendar/gui/print.c:513
msgid "3rd"
msgstr "3rd"
-#: ../calendar/gui/print.c:654
+#: ../calendar/gui/print.c:513
msgid "4th"
msgstr "4th"
-#: ../calendar/gui/print.c:654
+#: ../calendar/gui/print.c:513
msgid "5th"
msgstr "5th"
-#: ../calendar/gui/print.c:655
+#: ../calendar/gui/print.c:514
msgid "6th"
msgstr "6th"
-#: ../calendar/gui/print.c:655
+#: ../calendar/gui/print.c:514
msgid "7th"
msgstr "7th"
-#: ../calendar/gui/print.c:655
+#: ../calendar/gui/print.c:514
msgid "8th"
msgstr "8th"
-#: ../calendar/gui/print.c:655
+#: ../calendar/gui/print.c:514
msgid "9th"
msgstr "9th"
-#: ../calendar/gui/print.c:655
+#: ../calendar/gui/print.c:514
msgid "10th"
msgstr "10th"
-#: ../calendar/gui/print.c:656
+#: ../calendar/gui/print.c:515
msgid "11th"
msgstr "11th"
-#: ../calendar/gui/print.c:656
+#: ../calendar/gui/print.c:515
msgid "12th"
msgstr "12th"
-#: ../calendar/gui/print.c:656
+#: ../calendar/gui/print.c:515
msgid "13th"
msgstr "13th"
-#: ../calendar/gui/print.c:656
+#: ../calendar/gui/print.c:515
msgid "14th"
msgstr "14th"
-#: ../calendar/gui/print.c:656
+#: ../calendar/gui/print.c:515
msgid "15th"
msgstr "15th"
-#: ../calendar/gui/print.c:657
+#: ../calendar/gui/print.c:516
msgid "16th"
msgstr "16th"
-#: ../calendar/gui/print.c:657
+#: ../calendar/gui/print.c:516
msgid "17th"
msgstr "17th"
-#: ../calendar/gui/print.c:657
+#: ../calendar/gui/print.c:516
msgid "18th"
msgstr "18th"
-#: ../calendar/gui/print.c:657
+#: ../calendar/gui/print.c:516
msgid "19th"
msgstr "19th"
-#: ../calendar/gui/print.c:657
+#: ../calendar/gui/print.c:516
msgid "20th"
msgstr "20th"
-#: ../calendar/gui/print.c:658
+#: ../calendar/gui/print.c:517
msgid "21st"
msgstr "21st"
-#: ../calendar/gui/print.c:658
+#: ../calendar/gui/print.c:517
msgid "22nd"
msgstr "22nd"
-#: ../calendar/gui/print.c:658
+#: ../calendar/gui/print.c:517
msgid "23rd"
msgstr "23rd"
-#: ../calendar/gui/print.c:658
+#: ../calendar/gui/print.c:517
msgid "24th"
msgstr "24th"
-#: ../calendar/gui/print.c:658
+#: ../calendar/gui/print.c:517
msgid "25th"
msgstr "25th"
-#: ../calendar/gui/print.c:659
+#: ../calendar/gui/print.c:518
msgid "26th"
msgstr "26th"
-#: ../calendar/gui/print.c:659
+#: ../calendar/gui/print.c:518
msgid "27th"
msgstr "27th"
-#: ../calendar/gui/print.c:659
+#: ../calendar/gui/print.c:518
msgid "28th"
msgstr "28th"
-#: ../calendar/gui/print.c:659
+#: ../calendar/gui/print.c:518
msgid "29th"
msgstr "29th"
-#: ../calendar/gui/print.c:659
+#: ../calendar/gui/print.c:518
msgid "30th"
msgstr "30th"
-#: ../calendar/gui/print.c:660
+#: ../calendar/gui/print.c:519
msgid "31st"
msgstr "31st"
-#. Translators: These are workday abbreviations, e.g. Su=Sunday and Th=Thursday
-#: ../calendar/gui/print.c:735
+#. Translators: These are workday abbreviations, e.g. Su=Sunday and Th=thursday
+#: ../calendar/gui/print.c:594
msgid "Su"
msgstr "Su"
-#: ../calendar/gui/print.c:735
+#: ../calendar/gui/print.c:594
msgid "Mo"
msgstr "Mo"
-#: ../calendar/gui/print.c:735
+#: ../calendar/gui/print.c:594
msgid "Tu"
msgstr "Tu"
-#: ../calendar/gui/print.c:735
+#: ../calendar/gui/print.c:594
msgid "We"
msgstr "We"
-#: ../calendar/gui/print.c:736
+#: ../calendar/gui/print.c:595
msgid "Th"
msgstr "Th"
-#: ../calendar/gui/print.c:736
+#: ../calendar/gui/print.c:595
msgid "Fr"
msgstr "Fr"
-#: ../calendar/gui/print.c:736
+#: ../calendar/gui/print.c:595
msgid "Sa"
msgstr "Sa"
-#. Day
-#: ../calendar/gui/print.c:2047
-msgid "Selected day (%a %b %d %Y)"
-msgstr "Selected day (%a %d %b %Y)"
-
-#: ../calendar/gui/print.c:2072
-#: ../calendar/gui/print.c:2076
-msgid "%a %b %d"
-msgstr "%a %d %b"
-
-#: ../calendar/gui/print.c:2073
-msgid "%a %d %Y"
-msgstr "%a %d %Y"
-
-#: ../calendar/gui/print.c:2077
-#: ../calendar/gui/print.c:2079
-#: ../calendar/gui/print.c:2080
-msgid "%a %b %d %Y"
-msgstr "%a %d %b %Y"
-
-#: ../calendar/gui/print.c:2084
-#, c-format
-msgid "Selected week (%s - %s)"
-msgstr "Selected week (%s - %s)"
-
-#. Month
-#: ../calendar/gui/print.c:2092
-msgid "Selected month (%b %Y)"
-msgstr "Selected month (%b %Y)"
-
-#. Year
-#: ../calendar/gui/print.c:2099
-msgid "Selected year (%Y)"
-msgstr "Selected year (%Y)"
-
-#: ../calendar/gui/print.c:2448
+#: ../calendar/gui/print.c:2283
msgid "Appointment"
msgstr "Appointment"
-#: ../calendar/gui/print.c:2450
+#: ../calendar/gui/print.c:2285
msgid "Task"
msgstr "Task"
-#: ../calendar/gui/print.c:2472
+#: ../calendar/gui/print.c:2307
#, c-format
msgid "Summary: %s"
msgstr "Summary: %s"
-#: ../calendar/gui/print.c:2523
+#: ../calendar/gui/print.c:2358
#, c-format
msgid "Status: %s"
msgstr "Status: %s"
-#: ../calendar/gui/print.c:2540
+#: ../calendar/gui/print.c:2375
#, c-format
msgid "Priority: %s"
msgstr "Priority: %s"
-#: ../calendar/gui/print.c:2552
+#: ../calendar/gui/print.c:2387
#, c-format
msgid "Percent Complete: %i"
msgstr "Percent Complete: %i"
-#: ../calendar/gui/print.c:2564
+#: ../calendar/gui/print.c:2399
#, c-format
msgid "URL: %s"
msgstr "URL: %s"
-#: ../calendar/gui/print.c:2577
+#: ../calendar/gui/print.c:2412
#, c-format
msgid "Categories: %s"
msgstr "Categories: %s"
-#: ../calendar/gui/print.c:2588
+#: ../calendar/gui/print.c:2423
msgid "Contacts: "
msgstr "Contacts: "
-#: ../calendar/gui/print.c:2654
-#: ../calendar/gui/print.c:2723
-msgid "Print Item"
-msgstr "Print Item"
+#. TODO Allow the user to customize the title.
+#: ../calendar/gui/print.c:2524
+msgid "Upcoming Appointments"
+msgstr "Upcoming Appointments"
#: ../calendar/gui/tasks-component.c:442
msgid "_New Task List"
@@ -8571,7 +8523,7 @@ msgstr "Tas_k list"
msgid "Create a new task list"
msgstr "Create a new task list"
-#: ../calendar/gui/tasks-control.c:446
+#: ../calendar/gui/tasks-control.c:438
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"
@@ -8581,11 +8533,12 @@ msgstr ""
"\n"
"Really erase these tasks?"
-#: ../calendar/gui/tasks-control.c:449
+#: ../calendar/gui/tasks-control.c:441
msgid "Do not ask me again."
msgstr "Do not ask me again."
-#: ../calendar/gui/tasks-control.c:483
+#: ../calendar/gui/tasks-control.c:478
+#: ../calendar/gui/tasks-control.c:494
msgid "Print Tasks"
msgstr "Print Tasks"
@@ -10216,6 +10169,69 @@ msgstr "File name:"
msgid "MIME type:"
msgstr "MIME type:"
+#: ../composer/e-msg-composer.c:830
+msgid "Cannot sign outgoing message: No signing certificate set for this account"
+msgstr "Cannot sign outgoing message: No signing certificate set for this account"
+
+#: ../composer/e-msg-composer.c:837
+msgid "Cannot encrypt outgoing message: No encryption certificate set for this account"
+msgstr "Cannot encrypt outgoing message: No encryption certificate set for this account"
+
+#: ../composer/e-msg-composer.c:1297
+#: ../composer/e-msg-composer.c:2559
+msgid "Hide _Attachment Bar"
+msgstr "Hide _Attachment Bar"
+
+#: ../composer/e-msg-composer.c:1300
+#: ../composer/e-msg-composer.c:2562
+#: ../composer/e-msg-composer.c:3931
+msgid "Show _Attachment Bar"
+msgstr "Show _Attachment Bar"
+
+#: ../composer/e-msg-composer.c:1332
+#: ../composer/e-msg-composer.c:1366
+#: ../plugins/mail-remote/e-corba-utils.c:135
+msgid "Unknown reason"
+msgstr "Unknown reason"
+
+#: ../composer/e-msg-composer.c:1404
+msgid "Could not open file"
+msgstr "Could not open file"
+
+#: ../composer/e-msg-composer.c:1412
+msgid "Unable to retrieve message from editor"
+msgstr "Unable to retrieve message from editor"
+
+#: ../composer/e-msg-composer.c:1697
+msgid "Untitled Message"
+msgstr "Untitled Message"
+
+#. NB: This function is never used anymore
+#: ../composer/e-msg-composer.c:1732
+msgid "Open File"
+msgstr "Open File"
+
+#: ../composer/e-msg-composer.c:2194
+#: ../mail/em-account-editor.c:606
+#: ../mail/em-account-editor.c:651
+#: ../mail/em-account-editor.c:718
+msgid "Autogenerated"
+msgstr "Autogenerated"
+
+#: ../composer/e-msg-composer.c:2297
+msgid "Si_gnature:"
+msgstr "Si_gnature:"
+
+#: ../composer/e-msg-composer.c:2573
+#: ../composer/e-msg-composer.c:3813
+#: ../composer/e-msg-composer.c:3816
+msgid "Compose Message"
+msgstr "Compose Message"
+
+#: ../composer/e-msg-composer.c:5041
+msgid "<b>(The composer contains a non-text message body, which cannot be edited.)</b>"
+msgstr "<b>(The composer contains a non-text message body, which cannot be edited.)</b>"
+
#: ../composer/e-msg-composer-hdrs.c:570
msgid "Posting destination"
msgstr "Posting destination"
@@ -10224,7 +10240,7 @@ msgstr "Posting destination"
msgid "Choose folders to post the message to."
msgstr "Choose folders to post the message to."
-#: ../composer/e-msg-composer-hdrs.c:603
+#: ../composer/e-msg-composer-hdrs.c:602
msgid "Click here for the address book"
msgstr "Click here for the address book"
@@ -10235,60 +10251,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:635
+#: ../composer/e-msg-composer-hdrs.c:634
msgid "_Reply-To:"
msgstr "_Reply-To:"
#.
#. * From
#.
-#: ../composer/e-msg-composer-hdrs.c:642
+#: ../composer/e-msg-composer-hdrs.c:641
msgid "Fr_om:"
msgstr "Fr_om:"
#.
#. * Subject
#.
-#: ../composer/e-msg-composer-hdrs.c:649
+#: ../composer/e-msg-composer-hdrs.c:648
msgid "S_ubject:"
msgstr "S_ubject:"
-#: ../composer/e-msg-composer-hdrs.c:658
+#: ../composer/e-msg-composer-hdrs.c:657
msgid "_To:"
msgstr "_To:"
-#: ../composer/e-msg-composer-hdrs.c:659
+#: ../composer/e-msg-composer-hdrs.c:658
msgid "Enter the recipients of the message"
msgstr "Enter the recipients of the message"
-#: ../composer/e-msg-composer-hdrs.c:662
+#: ../composer/e-msg-composer-hdrs.c:661
msgid "_Cc:"
msgstr "_Cc:"
-#: ../composer/e-msg-composer-hdrs.c:663
+#: ../composer/e-msg-composer-hdrs.c:662
msgid "Enter the addresses that will receive a carbon copy of the message"
msgstr "Enter the addresses that will receive a carbon copy of the message"
-#: ../composer/e-msg-composer-hdrs.c:666
+#: ../composer/e-msg-composer-hdrs.c:665
msgid "_Bcc:"
msgstr "_Bcc:"
-#: ../composer/e-msg-composer-hdrs.c:667
+#: ../composer/e-msg-composer-hdrs.c:666
msgid "Enter the addresses that will receive a carbon copy of the message without appearing in the recipient list of the message."
msgstr "Enter the addresses that will receive a carbon copy of the message without appearing in the recipient list of the message."
#.
#. * Post-To
#.
-#: ../composer/e-msg-composer-hdrs.c:674
+#: ../composer/e-msg-composer-hdrs.c:673
msgid "_Post To:"
msgstr "_Post To:"
-#: ../composer/e-msg-composer-hdrs.c:679
+#: ../composer/e-msg-composer-hdrs.c:678
msgid "Click here to select folders to post to"
msgstr "Click here to select folders to post to"
-#: ../composer/e-msg-composer-hdrs.c:684
+#: ../composer/e-msg-composer-hdrs.c:683
msgid "Post To:"
msgstr "Post To:"
@@ -10300,69 +10316,6 @@ msgstr "A_ttach"
msgid "Insert Attachment"
msgstr "Insert Attachment"
-#: ../composer/e-msg-composer.c:830
-msgid "Cannot sign outgoing message: No signing certificate set for this account"
-msgstr "Cannot sign outgoing message: No signing certificate set for this account"
-
-#: ../composer/e-msg-composer.c:837
-msgid "Cannot encrypt outgoing message: No encryption certificate set for this account"
-msgstr "Cannot encrypt outgoing message: No encryption certificate set for this account"
-
-#: ../composer/e-msg-composer.c:1297
-#: ../composer/e-msg-composer.c:2563
-msgid "Hide _Attachment Bar"
-msgstr "Hide _Attachment Bar"
-
-#: ../composer/e-msg-composer.c:1300
-#: ../composer/e-msg-composer.c:2566
-#: ../composer/e-msg-composer.c:3939
-msgid "Show _Attachment Bar"
-msgstr "Show _Attachment Bar"
-
-#: ../composer/e-msg-composer.c:1332
-#: ../composer/e-msg-composer.c:1366
-#: ../plugins/mail-remote/e-corba-utils.c:135
-msgid "Unknown reason"
-msgstr "Unknown reason"
-
-#: ../composer/e-msg-composer.c:1404
-msgid "Could not open file"
-msgstr "Could not open file"
-
-#: ../composer/e-msg-composer.c:1412
-msgid "Unable to retrieve message from editor"
-msgstr "Unable to retrieve message from editor"
-
-#: ../composer/e-msg-composer.c:1697
-msgid "Untitled Message"
-msgstr "Untitled Message"
-
-#. NB: This function is never used anymore
-#: ../composer/e-msg-composer.c:1732
-msgid "Open File"
-msgstr "Open File"
-
-#: ../composer/e-msg-composer.c:2198
-#: ../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:2301
-msgid "Si_gnature:"
-msgstr "Si_gnature:"
-
-#: ../composer/e-msg-composer.c:2577
-#: ../composer/e-msg-composer.c:3821
-#: ../composer/e-msg-composer.c:3824
-msgid "Compose Message"
-msgstr "Compose Message"
-
-#: ../composer/e-msg-composer.c:5048
-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 "
msgstr " There are a few attachments getting downloaded. Sending the mail will cause the mail to be sent without those pending attachments "
@@ -10489,12 +10442,12 @@ msgstr "_Save Message"
#: ../data/evolution.desktop.in.in.h:1
#: ../plugins/default-mailer/org-gnome-default-mailer.error.xml.h:2
-#: ../shell/main.c:523
+#: ../shell/main.c:506
msgid "Evolution"
msgstr "Evolution"
#: ../data/evolution.desktop.in.in.h:2
-#: ../shell/e-shell-window-commands.c:574
+#: ../shell/e-shell-window-commands.c:584
msgid "Groupware Suite"
msgstr "Groupware Suite"
@@ -10634,6 +10587,22 @@ msgstr "Evolution Query"
msgid "Internal error, unknown error '%s' requested"
msgstr "Internal error, unknown error '%s' requested"
+#: ../e-util/eggtrayicon.c:121
+msgid "The orientation of the tray."
+msgstr "The orientation of the tray."
+
+#: ../e-util/e-print.c:115
+msgid "An error occurred while printing"
+msgstr "An error occurred whilst printing"
+
+#: ../e-util/e-print.c:122
+msgid "The printing system reported the following details about the error:"
+msgstr "The printing system reported the following details about the error:"
+
+#: ../e-util/e-print.c:128
+msgid "The printing system did not report any additional details about the error."
+msgstr "The printing system did not report any additional details about the error."
+
#: ../e-util/e-system.error.xml.h:2
msgid "Cannot open file &quot;{0}&quot;."
msgstr "Cannot open file &quot;{0}&quot;."
@@ -10659,10 +10628,6 @@ msgstr "Overwrite file?"
msgid "_Overwrite"
msgstr "_Overwrite"
-#: ../e-util/eggtrayicon.c:121
-msgid "The orientation of the tray."
-msgstr "The orientation of the tray."
-
#: ../filter/filter-datespec.c:78
#, c-format
msgid "1 second ago"
@@ -10730,88 +10695,6 @@ msgstr "%d-%b-%Y"
msgid "Select a time to compare against"
msgstr "Select a time to compare against"
-#: ../filter/filter-file.c:296
-#: ../filter/filter-file.c:302
-msgid "Choose a file"
-msgstr "Choose a file"
-
-#: ../filter/filter-label.c:121
-#: ../mail/em-filter-i18n.h:26
-#: ../mail/em-migrate.c:1053
-#: ../mail/mail-config.glade.h:92
-msgid "Important"
-msgstr "Important"
-
-#. forest green
-#: ../filter/filter-label.c:124
-#: ../mail/em-migrate.c:1056
-#: ../mail/mail-config.glade.h:147
-msgid "To Do"
-msgstr "To Do"
-
-#. blue
-#: ../filter/filter-label.c:125
-#: ../mail/em-migrate.c:1057
-#: ../mail/mail-config.glade.h:97
-msgid "Later"
-msgstr "Later"
-
-#: ../filter/filter-part.c:532
-#: ../shell/GNOME_Evolution_Test.server.in.in.h:3
-msgid "Test"
-msgstr "Test"
-
-#: ../filter/filter-rule.c:799
-msgid "_Search name:"
-msgstr "_Search name:"
-
-#: ../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:866
-msgid "If all criteria are met"
-msgstr "If all criteria are met"
-
-#: ../filter/filter-rule.c:866
-msgid "If any criteria are met"
-msgstr "If any criteria are met"
-
-#: ../filter/filter-rule.c:868
-msgid "_Find items:"
-msgstr "_Find items:"
-
-#: ../filter/filter-rule.c:890
-msgid "All related"
-msgstr "All related"
-
-#: ../filter/filter-rule.c:890
-msgid "Replies"
-msgstr "Replies"
-
-#: ../filter/filter-rule.c:890
-msgid "Replies and parents"
-msgstr "Replies and parents"
-
-#: ../filter/filter-rule.c:890
-msgid "No reply or parent"
-msgstr "No reply or parent"
-
-#: ../filter/filter-rule.c:892
-msgid "Include threads"
-msgstr "Include threads"
-
-#: ../filter/filter-rule.c:987
-#: ../filter/filter.glade.h:3
-#: ../mail/em-utils.c:311
-msgid "Incoming"
-msgstr "Incoming"
-
-#: ../filter/filter-rule.c:987
-#: ../mail/em-utils.c:312
-msgid "Outgoing"
-msgstr "Outgoing"
-
#: ../filter/filter.error.xml.h:1
msgid "Bad regular expression &quot;{0}&quot;."
msgstr "Bad regular expression &quot;{0}&quot;."
@@ -10857,6 +10740,11 @@ msgstr "You must name this filter."
msgid "You must specify a file name."
msgstr "You must specify a file name."
+#: ../filter/filter-file.c:296
+#: ../filter/filter-file.c:302
+msgid "Choose a file"
+msgstr "Choose a file"
+
#: ../filter/filter.glade.h:1
msgid "<b>_Filter Rules</b>"
msgstr "<b>_Filter Rules</b>"
@@ -10865,6 +10753,12 @@ msgstr "<b>_Filter Rules</b>"
msgid "Compare against"
msgstr "Compare against"
+#: ../filter/filter.glade.h:3
+#: ../filter/filter-rule.c:988
+#: ../mail/em-utils.c:307
+msgid "Incoming"
+msgstr "Incoming"
+
#: ../filter/filter.glade.h:4
msgid "Show filters for mail:"
msgstr "Show filters for mail:"
@@ -10906,7 +10800,7 @@ msgid "months"
msgstr "months"
#: ../filter/filter.glade.h:18
-#: ../mail/mail-config.glade.h:181
+#: ../mail/mail-config.glade.h:180
msgid "seconds"
msgstr "seconds"
@@ -10922,83 +10816,88 @@ msgstr "the time you specify"
msgid "years"
msgstr "years"
-#: ../filter/rule-editor.c:378
-msgid "Add Rule"
-msgstr "Add Rule"
+#: ../filter/filter-label.c:120
+#: ../mail/em-filter-i18n.h:26
+#: ../mail/em-migrate.c:1053
+#: ../mail/mail-config.glade.h:90
+msgid "Important"
+msgstr "Important"
-#: ../filter/rule-editor.c:454
-msgid "Edit Rule"
-msgstr "Edit Rule"
+#. forest green
+#: ../filter/filter-label.c:123
+#: ../mail/em-migrate.c:1056
+#: ../mail/mail-config.glade.h:145
+msgid "To Do"
+msgstr "To Do"
-#: ../filter/rule-editor.c:732
-msgid "Rule name"
-msgstr "Rule name"
+#. blue
+#: ../filter/filter-label.c:124
+#: ../mail/em-migrate.c:1057
+#: ../mail/mail-config.glade.h:95
+msgid "Later"
+msgstr "Later"
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:1
-msgid "Composer Preferences"
-msgstr "Composer Preferences"
+#: ../filter/filter-part.c:532
+#: ../shell/GNOME_Evolution_Test.server.in.in.h:3
+msgid "Test"
+msgstr "Test"
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:2
-msgid "Configure mail preferences, including security and message display, here"
-msgstr "Configure mail preferences, including security and message display, here"
+#: ../filter/filter-rule.c:799
+msgid "_Search name:"
+msgstr "_Search name:"
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:3
-msgid "Configure spell-checking, signatures, and the message composer here"
-msgstr "Configure spell-checking, signatures, and the message composer here"
+#: ../filter/filter-rule.c:827
+msgid "Find items that meet the following criteria"
+msgstr "Find items that meet the following criteria"
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:4
-msgid "Configure your email accounts here"
-msgstr "Configure your email accounts here"
+#: ../filter/filter-rule.c:866
+msgid "If all criteria are met"
+msgstr "If all criteria are met"
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:5
-msgid "Evolution Mail"
-msgstr "Evolution Mail"
+#: ../filter/filter-rule.c:866
+msgid "If any criteria are met"
+msgstr "If any criteria are met"
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:6
-msgid "Evolution Mail accounts configuration control"
-msgstr "Evolution Mail accounts configuration control"
+#: ../filter/filter-rule.c:868
+msgid "_Find items:"
+msgstr "_Find items:"
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:7
-msgid "Evolution Mail component"
-msgstr "Evolution Mail component"
+#: ../filter/filter-rule.c:890
+msgid "All related"
+msgstr "All related"
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:8
-msgid "Evolution Mail composer"
-msgstr "Evolution Mail composer"
+#: ../filter/filter-rule.c:890
+msgid "Replies"
+msgstr "Replies"
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:9
-msgid "Evolution Mail composer configuration control"
-msgstr "Evolution Mail composer configuration control"
+#: ../filter/filter-rule.c:890
+msgid "Replies and parents"
+msgstr "Replies and parents"
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:10
-msgid "Evolution Mail preferences control"
-msgstr "Evolution Mail preferences control"
+#: ../filter/filter-rule.c:890
+msgid "No reply or parent"
+msgstr "No reply or parent"
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:11
-#: ../mail/em-folder-view.c:523
-#: ../mail/importers/elm-importer.c:341
-#: ../mail/importers/netscape-importer.c:1903
-#: ../mail/importers/pine-importer.c:387
-#: ../mail/mail-component.c:580
-#: ../mail/mail-component.c:581
-#: ../mail/mail-component.c:722
-#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:6
-msgid "Mail"
-msgstr "Mail"
+#: ../filter/filter-rule.c:892
+msgid "I_nclude threads"
+msgstr "I_nclude threads"
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:12
-#: ../mail/em-account-prefs.c:532
-msgid "Mail Accounts"
-msgstr "Mail Accounts"
+#: ../filter/filter-rule.c:988
+#: ../mail/em-utils.c:308
+msgid "Outgoing"
+msgstr "Outgoing"
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:13
-#: ../mail/mail-config.glade.h:100
-msgid "Mail Preferences"
-msgstr "Mail Preferences"
+#: ../filter/rule-editor.c:378
+msgid "Add Rule"
+msgstr "Add Rule"
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:14
-msgid "_Mail"
-msgstr "_Mail"
+#: ../filter/rule-editor.c:454
+msgid "Edit Rule"
+msgstr "Edit Rule"
+
+#: ../filter/rule-editor.c:732
+msgid "Rule name"
+msgstr "Rule name"
#: ../mail/em-account-editor.c:403
#, c-format
@@ -11020,7 +10919,7 @@ msgstr ""
#: ../mail/em-account-editor.c:482
#: ../mail/em-filter-folder-element.c:237
-#: ../mail/em-vfolder-rule.c:511
+#: ../mail/em-vfolder-rule.c:510
msgid "Select Folder"
msgstr "Select Folder"
@@ -11029,12 +10928,12 @@ msgid "Ask for each message"
msgstr "Ask for each message"
#: ../mail/em-account-editor.c:1812
-#: ../mail/mail-config.glade.h:91
+#: ../mail/mail-config.glade.h:89
msgid "Identity"
msgstr "Identity"
#: ../mail/em-account-editor.c:1861
-#: ../mail/mail-config.glade.h:119
+#: ../mail/mail-config.glade.h:117
msgid "Receiving Email"
msgstr "Receiving Email"
@@ -11043,18 +10942,18 @@ msgid "Automatically check for _new mail every"
msgstr "Automatically check for _new mail every"
#: ../mail/em-account-editor.c:2227
-#: ../mail/mail-config.glade.h:131
+#: ../mail/mail-config.glade.h:129
msgid "Sending Email"
msgstr "Sending Email"
#: ../mail/em-account-editor.c:2286
-#: ../mail/mail-config.glade.h:67
+#: ../mail/mail-config.glade.h:65
msgid "Defaults"
msgstr "Defaults"
#. Security settings
#: ../mail/em-account-editor.c:2352
-#: ../mail/mail-config.glade.h:125
+#: ../mail/mail-config.glade.h:123
#: ../plugins/exchange-operations/exchange-account-setup.c:317
msgid "Security"
msgstr "Security"
@@ -11071,12 +10970,12 @@ msgid "Checking for New Mail"
msgstr "Checking for New Mail"
#: ../mail/em-account-editor.c:2832
-#: ../mail/mail-config.glade.h:33
+#: ../mail/mail-config.glade.h:31
msgid "Account Editor"
msgstr "Account Editor"
#: ../mail/em-account-editor.c:2832
-#: ../mail/mail-config.glade.h:80
+#: ../mail/mail-config.glade.h:79
msgid "Evolution Account Assistant"
msgstr "Evolution Account Assistant"
@@ -11099,7 +10998,7 @@ msgstr "[Default]"
#. g_object_set((GObject *)renderer, "activatable", TRUE, NULL);
#: ../mail/em-account-prefs.c:519
-#: ../mail/em-composer-prefs.c:930
+#: ../mail/em-composer-prefs.c:945
#: ../plugins/plugin-manager/plugin-manager.c:205
#: ../plugins/publish-calendar/publish-calendar.c:493
msgid "Enabled"
@@ -11113,21 +11012,26 @@ msgstr "Account name"
msgid "Protocol"
msgstr "Protocol"
-#: ../mail/em-composer-prefs.c:311
-#: ../mail/em-composer-prefs.c:437
-#: ../mail/mail-config.c:1033
+#: ../mail/em-account-prefs.c:532
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:12
+msgid "Mail Accounts"
+msgstr "Mail Accounts"
+
+#: ../mail/em-composer-prefs.c:310
+#: ../mail/em-composer-prefs.c:436
+#: ../mail/mail-config.c:1029
msgid "Unnamed"
msgstr "Unnamed"
-#: ../mail/em-composer-prefs.c:936
+#: ../mail/em-composer-prefs.c:951
msgid "Language(s)"
msgstr "Language(s)"
-#: ../mail/em-composer-prefs.c:979
+#: ../mail/em-composer-prefs.c:994
msgid "Add signature script"
msgstr "Add signature script"
-#: ../mail/em-composer-prefs.c:999
+#: ../mail/em-composer-prefs.c:1014
msgid "Signature(s)"
msgstr "Signature(s)"
@@ -11287,7 +11191,7 @@ msgid "is not Flagged"
msgstr "is not Flagged"
#: ../mail/em-filter-i18n.h:35
-#: ../mail/mail-config.glade.h:94
+#: ../mail/mail-config.glade.h:92
#: ../ui/evolution-mail-message.xml.h:48
msgid "Junk"
msgstr "Junk"
@@ -11410,10 +11314,10 @@ msgid "Stop Processing"
msgstr "Stop Processing"
#: ../mail/em-filter-i18n.h:65
-#: ../mail/em-format-html.c:1661
+#: ../mail/em-format.c:852
+#: ../mail/em-format-html.c:1660
#: ../mail/em-format-quote.c:313
-#: ../mail/em-format.c:853
-#: ../mail/em-mailer-prefs.c:90
+#: ../mail/em-mailer-prefs.c:94
#: ../mail/message-list.etspec.h:17
#: ../mail/message-tag-followup.c:336
#: ../plugins/groupwise-features/properties.glade.h:6
@@ -11478,22 +11382,22 @@ msgstr "Account Search"
msgid "All Account Search"
msgstr "All Account Search"
+#. to be on the safe side, ngettext is used here, see e.g. comment #3 at bug 272567
+#: ../mail/em-folder-properties.c:149
+msgid "Unread messages:"
+msgid_plural "Unread messages:"
+msgstr[0] "Unread messages:"
+msgstr[1] "Unread messages:"
+
#. TODO: can this be done in a loop?
#. to be on the safe side, ngettext is used here, see e.g. comment #3 at bug 272567
-#: ../mail/em-folder-properties.c:150
+#: ../mail/em-folder-properties.c:163
msgid "Total messages:"
msgid_plural "Total messages:"
msgstr[0] "Total messages:"
msgstr[1] "Total messages:"
-#. 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 messages:"
-msgstr[1] "Unread messages:"
-
-#: ../mail/em-folder-properties.c:316
+#: ../mail/em-folder-properties.c:323
#: ../plugins/groupwise-features/properties.glade.h:2
msgid "Folder Properties"
msgstr "Folder Properties"
@@ -11510,46 +11414,6 @@ msgstr "Create"
msgid "Folder _name:"
msgstr "Folder _name:"
-#: ../mail/em-folder-tree-model.c:203
-#: ../mail/em-folder-tree-model.c:205
-#: ../mail/mail-vfolder.c:911
-#: ../mail/mail-vfolder.c:984
-msgid "Search Folders"
-msgstr "Search Folders"
-
-#. UNMATCHED is always last
-#: ../mail/em-folder-tree-model.c:209
-#: ../mail/em-folder-tree-model.c:211
-msgid "UNMATCHED"
-msgstr "UNMATCHED"
-
-#: ../mail/em-folder-tree-model.c:484
-#: ../mail/mail-component.c:152
-msgid "Drafts"
-msgstr "Drafts"
-
-#. translators: standard local mailbox names
-#: ../mail/em-folder-tree-model.c:487
-#: ../mail/mail-component.c:151
-#: ../plugins/exchange-operations/exchange-folder.c:587
-msgid "Inbox"
-msgstr "Inbox"
-
-#: ../mail/em-folder-tree-model.c:490
-#: ../mail/mail-component.c:153
-msgid "Outbox"
-msgstr "Outbox"
-
-#: ../mail/em-folder-tree-model.c:492
-#: ../mail/mail-component.c:154
-msgid "Sent"
-msgstr "Sent"
-
-#: ../mail/em-folder-tree-model.c:514
-#: ../mail/em-folder-tree-model.c:818
-msgid "Loading..."
-msgstr "Loading..."
-
#. 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
@@ -11565,58 +11429,58 @@ msgstr "Loading..."
#. * Do not translate the "folder-display|" part. Remove it
#. * from your translation.
#.
-#: ../mail/em-folder-tree.c:366
+#: ../mail/em-folder-tree.c:367
#, c-format
msgid "folder-display|%s (%u)"
msgstr "%s (%u)"
-#: ../mail/em-folder-tree.c:717
+#: ../mail/em-folder-tree.c:719
msgid "Mail Folder Tree"
msgstr "Mail Folder Tree"
-#: ../mail/em-folder-tree.c:877
+#: ../mail/em-folder-tree.c:879
#, c-format
msgid "Moving folder %s"
msgstr "Moving folder %s"
-#: ../mail/em-folder-tree.c:879
+#: ../mail/em-folder-tree.c:881
#, c-format
msgid "Copying folder %s"
msgstr "Copying folder %s"
-#: ../mail/em-folder-tree.c:886
+#: ../mail/em-folder-tree.c:888
#: ../mail/message-list.c:1827
#, c-format
msgid "Moving messages into folder %s"
msgstr "Moving messages into folder %s"
-#: ../mail/em-folder-tree.c:888
+#: ../mail/em-folder-tree.c:890
#: ../mail/message-list.c:1829
#, c-format
msgid "Copying messages into folder %s"
msgstr "Copying messages into folder %s"
-#: ../mail/em-folder-tree.c:904
+#: ../mail/em-folder-tree.c:906
msgid "Cannot drop message(s) into toplevel store"
msgstr "Cannot drop message(s) into toplevel store"
-#: ../mail/em-folder-tree.c:1000
+#: ../mail/em-folder-tree.c:1002
#: ../ui/evolution-mail-message.xml.h:105
msgid "_Copy to Folder"
msgstr "_Copy to Folder"
-#: ../mail/em-folder-tree.c:1001
+#: ../mail/em-folder-tree.c:1003
#: ../ui/evolution-mail-message.xml.h:118
msgid "_Move to Folder"
msgstr "_Move to Folder"
-#: ../mail/em-folder-tree.c:1706
+#: ../mail/em-folder-tree.c:1708
#: ../mail/mail-ops.c:1060
#, c-format
msgid "Scanning folders in \"%s\""
msgstr "Scanning folders in \"%s\""
-#: ../mail/em-folder-tree.c:2065
+#: ../mail/em-folder-tree.c:2091
#: ../ui/evolution-addressbook.xml.h:64
#: ../ui/evolution-editor.xml.h:24
#: ../ui/evolution-mail-global.xml.h:29
@@ -11627,33 +11491,73 @@ msgstr "Scanning folders in \"%s\""
msgid "_View"
msgstr "_View"
-#: ../mail/em-folder-tree.c:2066
+#: ../mail/em-folder-tree.c:2092
msgid "Open in _New Window"
msgstr "Open in _New Window"
-#: ../mail/em-folder-tree.c:2070
+#: ../mail/em-folder-tree.c:2096
msgid "_Copy..."
msgstr "_Copy..."
-#: ../mail/em-folder-tree.c:2071
+#: ../mail/em-folder-tree.c:2097
msgid "_Move..."
msgstr "_Move..."
#. FIXME: need to disable for nochildren folders
-#: ../mail/em-folder-tree.c:2075
+#: ../mail/em-folder-tree.c:2101
msgid "_New Folder..."
msgstr "_New Folder..."
-#: ../mail/em-folder-tree.c:2078
+#: ../mail/em-folder-tree.c:2104
#: ../ui/evolution-mail-list.xml.h:34
msgid "_Rename..."
msgstr "_Rename..."
-#: ../mail/em-folder-tree.c:2083
+#: ../mail/em-folder-tree.c:2109
#: ../mail/mail.error.xml.h:131
msgid "_Empty Trash"
msgstr "_Empty Wastebasket"
+#: ../mail/em-folder-tree-model.c:203
+#: ../mail/em-folder-tree-model.c:205
+#: ../mail/mail-vfolder.c:911
+#: ../mail/mail-vfolder.c:984
+msgid "Search Folders"
+msgstr "Search Folders"
+
+#. UNMATCHED is always last
+#: ../mail/em-folder-tree-model.c:209
+#: ../mail/em-folder-tree-model.c:211
+msgid "UNMATCHED"
+msgstr "UNMATCHED"
+
+#: ../mail/em-folder-tree-model.c:484
+#: ../mail/mail-component.c:152
+msgid "Drafts"
+msgstr "Drafts"
+
+#. translators: standard local mailbox names
+#: ../mail/em-folder-tree-model.c:487
+#: ../mail/mail-component.c:151
+#: ../plugins/exchange-operations/exchange-folder.c:587
+msgid "Inbox"
+msgstr "Inbox"
+
+#: ../mail/em-folder-tree-model.c:490
+#: ../mail/mail-component.c:153
+msgid "Outbox"
+msgstr "Outbox"
+
+#: ../mail/em-folder-tree-model.c:492
+#: ../mail/mail-component.c:154
+msgid "Sent"
+msgstr "Sent"
+
+#: ../mail/em-folder-tree-model.c:514
+#: ../mail/em-folder-tree-model.c:818
+msgid "Loading..."
+msgstr "Loading..."
+
#: ../mail/em-folder-utils.c:104
#, c-format
msgid "Copying `%s' to `%s'"
@@ -11690,6 +11594,18 @@ msgstr "Create folder"
msgid "Specify where to create the folder:"
msgstr "Specify where to create the folder:"
+#: ../mail/em-folder-view.c:523
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:11
+#: ../mail/importers/elm-importer.c:341
+#: ../mail/importers/netscape-importer.c:1903
+#: ../mail/importers/pine-importer.c:387
+#: ../mail/mail-component.c:581
+#: ../mail/mail-component.c:582
+#: ../mail/mail-component.c:724
+#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:6
+msgid "Mail"
+msgstr "Mail"
+
#: ../mail/em-folder-view.c:966
#: ../mail/mail.error.xml.h:66
msgid "Mail Deletion Failed"
@@ -11764,7 +11680,7 @@ msgstr "_Label"
#. Note that we don't show this here, since by default a 'None' date
#. is not permitted.
#: ../mail/em-folder-view.c:1163
-#: ../widgets/misc/e-dateedit.c:475
+#: ../widgets/misc/e-dateedit.c:473
msgid "_None"
msgstr "_None"
@@ -11818,38 +11734,214 @@ msgstr "Filter on _Mailing List"
msgid "Default"
msgstr "Default"
-#: ../mail/em-folder-view.c:2185
-#: ../mail/em-folder-view.c:2190
-#: ../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:2349
+#: ../mail/em-folder-view.c:2293
msgid "Unable to retrieve message"
msgstr "Unable to retrieve message"
-#: ../mail/em-folder-view.c:2547
+#: ../mail/em-folder-view.c:2314
+msgid "<b>Retrieving Message...</b>"
+msgstr "<b>Retrieving Message...</b>"
+
+#: ../mail/em-folder-view.c:2353
+msgid "Retrieving Message"
+msgstr "Retrieving Message"
+
+#: ../mail/em-folder-view.c:2531
msgid "Create _Search Folder"
msgstr "Create _Search Folder"
-#: ../mail/em-folder-view.c:2548
+#: ../mail/em-folder-view.c:2532
msgid "_From this Address"
msgstr "_From this Address"
-#: ../mail/em-folder-view.c:2549
+#: ../mail/em-folder-view.c:2533
msgid "_To this Address"
msgstr "_To this Address"
-#: ../mail/em-folder-view.c:2906
+#: ../mail/em-folder-view.c:2890
#, c-format
msgid "Click to mail %s"
msgstr "Click to mail %s"
-#: ../mail/em-folder-view.c:2911
+#: ../mail/em-folder-view.c:2895
msgid "Click to hide/unhide addresses"
msgstr "Click to hide/unhide addresses"
+#: ../mail/em-format.c:847
+#: ../mail/em-format-html.c:1489
+#: ../mail/em-format-quote.c:200
+#: ../mail/em-mailer-prefs.c:89
+#: ../mail/message-list.etspec.h:7
+#: ../mail/message-tag-followup.c:332
+msgid "From"
+msgstr "From"
+
+#: ../mail/em-format.c:848
+#: ../mail/em-format-html.c:1489
+#: ../mail/em-format-quote.c:200
+#: ../mail/em-mailer-prefs.c:90
+msgid "Reply-To"
+msgstr "Reply-To"
+
+#: ../mail/em-format.c:850
+#: ../mail/em-format-html.c:1489
+#: ../mail/em-format-quote.c:200
+#: ../mail/em-mailer-prefs.c:92
+msgid "Cc"
+msgstr "Cc"
+
+#: ../mail/em-format.c:851
+#: ../mail/em-format-html.c:1489
+#: ../mail/em-format-quote.c:200
+#: ../mail/em-mailer-prefs.c:93
+msgid "Bcc"
+msgstr "Bcc"
+
+#: ../mail/em-format.c:853
+#: ../mail/em-format-html.c:1704
+#: ../mail/em-format-quote.c:329
+#: ../mail/em-mailer-prefs.c:95
+#: ../mail/message-list.etspec.h:2
+#: ../widgets/misc/e-dateedit.c:341
+#: ../widgets/misc/e-dateedit.c:363
+msgid "Date"
+msgstr "Date"
+
+#: ../mail/em-format.c:854
+#: ../mail/em-format-html.c:1727
+#: ../mail/em-mailer-prefs.c:96
+msgid "Newsgroups"
+msgstr "Newsgroups"
+
+#: ../mail/em-format.c:1118
+#, c-format
+msgid "%s attachment"
+msgstr "%s attachment"
+
+#: ../mail/em-format.c:1157
+#: ../mail/em-format.c:1308
+#: ../mail/em-format.c:1610
+msgid "Could not parse S/MIME message: Unknown error"
+msgstr "Could not parse S/MIME message: Unknown error"
+
+#: ../mail/em-format.c:1290
+#: ../mail/em-format.c:1446
+msgid "Could not parse MIME message. Displaying as source."
+msgstr "Could not parse MIME message. Displaying as source."
+
+#: ../mail/em-format.c:1298
+msgid "Unsupported encryption type for multipart/encrypted"
+msgstr "Unsupported encryption type for multipart/encrypted"
+
+#: ../mail/em-format.c:1465
+msgid "Unsupported signature format"
+msgstr "Unsupported signature format"
+
+#: ../mail/em-format.c:1473
+#: ../mail/em-format.c:1539
+msgid "Error verifying signature"
+msgstr "Error verifying signature"
+
+#: ../mail/em-format.c:1473
+#: ../mail/em-format.c:1539
+msgid "Unknown error verifying signature"
+msgstr "Unknown error verifying signature"
+
+#: ../mail/em-format-html.c:483
+#: ../mail/em-format-html.c:485
+#, c-format
+msgid "Retrieving `%s'"
+msgstr "Retrieving `%s'"
+
+#: ../mail/em-format-html.c:618
+#: ../mail/em-format-html-display.c:937
+msgid "Unsigned"
+msgstr "Unsigned"
+
+#: ../mail/em-format-html.c:619
+#: ../mail/em-format-html-display.c:938
+msgid "Valid signature"
+msgstr "Valid signature"
+
+#: ../mail/em-format-html.c:620
+#: ../mail/em-format-html-display.c:939
+msgid "Invalid signature"
+msgstr "Invalid signature"
+
+#: ../mail/em-format-html.c:621
+msgid "Valid signature but cannot verify sender"
+msgstr "Valid signature but cannot verify sender"
+
+#: ../mail/em-format-html.c:627
+#: ../mail/em-format-html-display.c:946
+msgid "Unencrypted"
+msgstr "Unencrypted"
+
+#: ../mail/em-format-html.c:628
+#: ../mail/em-format-html-display.c:947
+msgid "Encrypted, weak"
+msgstr "Encrypted, weak"
+
+#: ../mail/em-format-html.c:629
+#: ../mail/em-format-html-display.c:948
+msgid "Encrypted"
+msgstr "Encrypted"
+
+#: ../mail/em-format-html.c:630
+#: ../mail/em-format-html-display.c:949
+msgid "Encrypted, strong"
+msgstr "Encrypted, strong"
+
+#: ../mail/em-format-html.c:892
+msgid "Malformed external-body part."
+msgstr "Malformed external-body part."
+
+#: ../mail/em-format-html.c:922
+#, c-format
+msgid "Pointer to FTP site (%s)"
+msgstr "Pointer to FTP site (%s)"
+
+#: ../mail/em-format-html.c:933
+#, c-format
+msgid "Pointer to local file (%s) valid at site \"%s\""
+msgstr "Pointer to local file (%s) valid at site \"%s\""
+
+#: ../mail/em-format-html.c:935
+#, c-format
+msgid "Pointer to local file (%s)"
+msgstr "Pointer to local file (%s)"
+
+#: ../mail/em-format-html.c:956
+#, c-format
+msgid "Pointer to remote data (%s)"
+msgstr "Pointer to remote data (%s)"
+
+#: ../mail/em-format-html.c:967
+#, c-format
+msgid "Pointer to unknown external data (\"%s\" type)"
+msgstr "Pointer to unknown external data (\"%s\" type)"
+
+#: ../mail/em-format-html.c:1194
+msgid "Formatting message"
+msgstr "Formatting message"
+
+#. pseudo-header
+#: ../mail/em-format-html.c:1664
+#: ../mail/em-format-quote.c:322
+#: ../mail/em-mailer-prefs.c:1174
+msgid "Mailer"
+msgstr "Mailer"
+
+#. translators: strftime format for local time equivalent in Date header display, with day
+#: ../mail/em-format-html.c:1691
+msgid "<I> (%a, %R %Z)</I>"
+msgstr "<I> (%a, %R %Z)</I>"
+
+#. translators: strftime format for local time equivalent in Date header display, without day
+#: ../mail/em-format-html.c:1694
+msgid "<I> (%R %Z)</I>"
+msgstr "<I> (%R %Z)</I>"
+
#. message-search popup match count string
#: ../mail/em-format-html-display.c:514
#, c-format
@@ -11873,328 +11965,161 @@ msgstr "_Next"
msgid "M_atch case"
msgstr "M_atch case"
-#: ../mail/em-format-html-display.c:938
-#: ../mail/em-format-html.c:619
-msgid "Unsigned"
-msgstr "Unsigned"
-
-#: ../mail/em-format-html-display.c:938
+#: ../mail/em-format-html-display.c:937
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:939
-#: ../mail/em-format-html.c:620
-msgid "Valid signature"
-msgstr "Valid signature"
-
-#: ../mail/em-format-html-display.c:939
+#: ../mail/em-format-html-display.c:938
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:940
-#: ../mail/em-format-html.c:621
-msgid "Invalid signature"
-msgstr "Invalid signature"
-
-#: ../mail/em-format-html-display.c:940
+#: ../mail/em-format-html-display.c:939
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:941
+#: ../mail/em-format-html-display.c:940
msgid "Valid signature, cannot verify sender"
msgstr "Valid signature, cannot verify sender"
-#: ../mail/em-format-html-display.c:941
+#: ../mail/em-format-html-display.c:940
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:947
-#: ../mail/em-format-html.c:628
-msgid "Unencrypted"
-msgstr "Unencrypted"
-
-#: ../mail/em-format-html-display.c:947
+#: ../mail/em-format-html-display.c:946
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:948
-#: ../mail/em-format-html.c:629
-msgid "Encrypted, weak"
-msgstr "Encrypted, weak"
-
-#: ../mail/em-format-html-display.c:948
+#: ../mail/em-format-html-display.c:947
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:949
-#: ../mail/em-format-html.c:630
-msgid "Encrypted"
-msgstr "Encrypted"
-
-#: ../mail/em-format-html-display.c:949
+#: ../mail/em-format-html-display.c:948
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:950
-#: ../mail/em-format-html.c:631
-msgid "Encrypted, strong"
-msgstr "Encrypted, strong"
-
-#: ../mail/em-format-html-display.c:950
+#: ../mail/em-format-html-display.c:949
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:1051
+#: ../mail/em-format-html-display.c:1050
#: ../smime/gui/smime-ui.glade.h:48
msgid "_View Certificate"
msgstr "_View Certificate"
-#: ../mail/em-format-html-display.c:1066
+#: ../mail/em-format-html-display.c:1065
msgid "This certificate is not viewable"
msgstr "This certificate is not viewable"
-#: ../mail/em-format-html-display.c:1385
+#: ../mail/em-format-html-display.c:1384
msgid "Completed on %B %d, %Y, %l:%M %p"
msgstr "Completed on %d %B, %Y, %l:%M %p"
-#: ../mail/em-format-html-display.c:1393
+#: ../mail/em-format-html-display.c:1392
msgid "Overdue:"
msgstr "Overdue:"
-#: ../mail/em-format-html-display.c:1396
+#: ../mail/em-format-html-display.c:1395
msgid "by %B %d, %Y, %l:%M %p"
msgstr "by %d %B, %Y, %l:%M %p"
-#: ../mail/em-format-html-display.c:1456
+#: ../mail/em-format-html-display.c:1455
msgid "_View Inline"
msgstr "_View Inline"
-#: ../mail/em-format-html-display.c:1457
+#: ../mail/em-format-html-display.c:1456
msgid "_Hide"
msgstr "_Hide"
-#: ../mail/em-format-html-display.c:1458
+#: ../mail/em-format-html-display.c:1457
msgid "_Fit to Width"
msgstr "_Fit to Width"
-#: ../mail/em-format-html-display.c:1459
+#: ../mail/em-format-html-display.c:1458
msgid "Show _Original Size"
msgstr "Show _Original Size"
-#: ../mail/em-format-html-display.c:1900
-#: ../mail/em-format-html-display.c:2505
-#: ../mail/mail-config.glade.h:44
+#: ../mail/em-format-html-display.c:1899
+#: ../mail/em-format-html-display.c:2510
+#: ../mail/mail-config.glade.h:42
#: ../mail/message-list.etspec.h:1
msgid "Attachment"
msgstr "Attachment"
-#: ../mail/em-format-html-display.c:2107
-msgid "Select folder to save all attachments..."
-msgstr "Select folder to save all attachments..."
+#: ../mail/em-format-html-display.c:2113
+msgid "Save attachment as"
+msgstr "Save attachment as"
+
+#: ../mail/em-format-html-display.c:2117
+msgid "Select folder to save all attachments"
+msgstr "Select folder to save all attachments"
-#: ../mail/em-format-html-display.c:2154
+#: ../mail/em-format-html-display.c:2168
msgid "_Save Selected..."
msgstr "_Save Selected..."
#. Cant i put in the number of attachments here ?
-#: ../mail/em-format-html-display.c:2221
+#: ../mail/em-format-html-display.c:2235
#, c-format
msgid "%d at_tachment"
msgid_plural "%d at_tachments"
msgstr[0] "%d at_tachment"
msgstr[1] "%d at_tachments"
-#: ../mail/em-format-html-display.c:2228
-#: ../mail/em-format-html-display.c:2306
+#: ../mail/em-format-html-display.c:2242
+#: ../mail/em-format-html-display.c:2320
msgid "S_ave"
msgstr "S_ave"
-#: ../mail/em-format-html-display.c:2239
+#: ../mail/em-format-html-display.c:2253
msgid "S_ave All"
msgstr "S_ave All"
-#: ../mail/em-format-html-display.c:2302
+#: ../mail/em-format-html-display.c:2316
msgid "No Attachment"
msgstr "No Attachment"
-#: ../mail/em-format-html-display.c:2433
-#: ../mail/em-format-html-display.c:2478
+#: ../mail/em-format-html-display.c:2447
+#: ../mail/em-format-html-display.c:2483
msgid "View _Unformatted"
msgstr "View _Unformatted"
-#: ../mail/em-format-html-display.c:2435
+#: ../mail/em-format-html-display.c:2449
msgid "Hide _Unformatted"
msgstr "Hide _Unformatted"
-#: ../mail/em-format-html-display.c:2497
+#: ../mail/em-format-html-display.c:2502
msgid "O_pen With"
msgstr "O_pen With"
-#: ../mail/em-format-html-display.c:2566
+#: ../mail/em-format-html-display.c:2571
msgid "Evolution cannot render this email as it is too large to handle. You can view it unformatted or with an external text editor."
msgstr "Evolution cannot render this email as it is too large to handle. You can view it unformatted or with an external text editor."
-#: ../mail/em-format-html-print.c:141
+#: ../mail/em-format-html-print.c:128
#, c-format
msgid "Page %d of %d"
msgstr "Page %d of %d"
-#: ../mail/em-format-html.c:484
-#: ../mail/em-format-html.c:486
-#, c-format
-msgid "Retrieving `%s'"
-msgstr "Retrieving `%s'"
-
-#: ../mail/em-format-html.c:622
-msgid "Valid signature but cannot verify sender"
-msgstr "Valid signature but cannot verify sender"
-
-#: ../mail/em-format-html.c:893
-msgid "Malformed external-body part."
-msgstr "Malformed external-body part."
-
-#: ../mail/em-format-html.c:923
-#, c-format
-msgid "Pointer to FTP site (%s)"
-msgstr "Pointer to FTP site (%s)"
-
-#: ../mail/em-format-html.c:934
-#, 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:936
-#, c-format
-msgid "Pointer to local file (%s)"
-msgstr "Pointer to local file (%s)"
-
-#: ../mail/em-format-html.c:957
-#, c-format
-msgid "Pointer to remote data (%s)"
-msgstr "Pointer to remote data (%s)"
-
-#: ../mail/em-format-html.c:968
-#, c-format
-msgid "Pointer to unknown external data (\"%s\" type)"
-msgstr "Pointer to unknown external data (\"%s\" type)"
-
-#: ../mail/em-format-html.c:1195
-msgid "Formatting message"
-msgstr "Formatting message"
-
-#: ../mail/em-format-html.c:1490
-#: ../mail/em-format-quote.c:200
-#: ../mail/em-format.c:848
-#: ../mail/em-mailer-prefs.c:85
-#: ../mail/message-list.etspec.h:7
-#: ../mail/message-tag-followup.c:332
-msgid "From"
-msgstr "From"
-
-#: ../mail/em-format-html.c:1490
-#: ../mail/em-format-quote.c:200
-#: ../mail/em-format.c:849
-#: ../mail/em-mailer-prefs.c:86
-msgid "Reply-To"
-msgstr "Reply-To"
-
-#: ../mail/em-format-html.c:1490
-#: ../mail/em-format-quote.c:200
-#: ../mail/em-format.c:851
-#: ../mail/em-mailer-prefs.c:88
-msgid "Cc"
-msgstr "Cc"
-
-#: ../mail/em-format-html.c:1490
-#: ../mail/em-format-quote.c:200
-#: ../mail/em-format.c:852
-#: ../mail/em-mailer-prefs.c:89
-msgid "Bcc"
-msgstr "Bcc"
-
-#. pseudo-header
-#: ../mail/em-format-html.c:1665
-#: ../mail/em-format-quote.c:322
-#: ../mail/em-mailer-prefs.c:1045
-msgid "Mailer"
-msgstr "Mailer"
-
-#. translators: strftime format for local time equivalent in Date header display, with day
-#: ../mail/em-format-html.c:1692
-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:1695
-msgid "<I> (%R %Z)</I>"
-msgstr "<I> (%R %Z)</I>"
-
-#: ../mail/em-format-html.c:1705
-#: ../mail/em-format-quote.c:329
-#: ../mail/em-format.c:854
-#: ../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:1728
-#: ../mail/em-format.c:855
-#: ../mail/em-mailer-prefs.c:92
-msgid "Newsgroups"
-msgstr "Newsgroups"
-
-#: ../mail/em-format.c:1119
-#, c-format
-msgid "%s attachment"
-msgstr "%s attachment"
-
-#: ../mail/em-format.c:1158
-#: ../mail/em-format.c:1306
-#: ../mail/em-format.c:1608
-msgid "Could not parse S/MIME message: Unknown error"
-msgstr "Could not parse S/MIME message: Unknown error"
-
-#: ../mail/em-format.c:1288
-#: ../mail/em-format.c:1444
-msgid "Could not parse MIME message. Displaying as source."
-msgstr "Could not parse MIME message. Displaying as source."
-
-#: ../mail/em-format.c:1296
-msgid "Unsupported encryption type for multipart/encrypted"
-msgstr "Unsupported encryption type for multipart/encrypted"
-
-#: ../mail/em-format.c:1463
-msgid "Unsupported signature format"
-msgstr "Unsupported signature format"
-
-#: ../mail/em-format.c:1471
-#: ../mail/em-format.c:1537
-msgid "Error verifying signature"
-msgstr "Error verifying signature"
-
-#: ../mail/em-format.c:1471
-#: ../mail/em-format.c:1537
-msgid "Unknown error verifying signature"
-msgstr "Unknown error verifying signature"
-
-#: ../mail/em-mailer-prefs.c:103
+#: ../mail/em-mailer-prefs.c:107
msgid "Every time"
msgstr "Every time"
-#: ../mail/em-mailer-prefs.c:104
+#: ../mail/em-mailer-prefs.c:108
msgid "Once per day"
msgstr "Once per day"
-#: ../mail/em-mailer-prefs.c:105
+#: ../mail/em-mailer-prefs.c:109
msgid "Once per week"
msgstr "Once per week"
-#: ../mail/em-mailer-prefs.c:106
+#: ../mail/em-mailer-prefs.c:110
msgid "Once per month"
msgstr "Once per month"
+#: ../mail/em-mailer-prefs.c:807
+msgid "No Junk plugin available"
+msgstr "No Junk plugin available"
+
#: ../mail/em-migrate.c:1210
msgid ""
"The location and hierarchy of the Evolution mailbox folders has changed since Evolution 1.x.\n"
@@ -12241,12 +12166,12 @@ msgstr "Unable to copy POP3 keep-on-server data `%s': %s"
msgid "Failed to create local mail storage `%s': %s"
msgstr "Failed to create local mail storage `%s': %s"
-#: ../mail/em-migrate.c:2713
+#: ../mail/em-migrate.c:2709
#, 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:2732
+#: ../mail/em-migrate.c:2728
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."
@@ -12286,29 +12211,28 @@ msgstr "Please select a server."
msgid "No server has been selected"
msgstr "No server has been selected"
-#: ../mail/em-utils.c:124
+#: ../mail/em-utils.c:120
msgid "Do not show this message again."
msgstr "Do not show this message again."
-#: ../mail/em-utils.c:319
+#: ../mail/em-utils.c:315
msgid "Message Filters"
msgstr "Message Filters"
-#: ../mail/em-utils.c:404
-#: ../mail/em-utils.c:436
+#: ../mail/em-utils.c:368
msgid "message"
msgstr "message"
-#: ../mail/em-utils.c:571
+#: ../mail/em-utils.c:557
msgid "Save Message..."
msgstr "Save Message..."
-#: ../mail/em-utils.c:620
+#: ../mail/em-utils.c:606
msgid "Add address"
msgstr "Add address"
#. Drop filename for messages from a mailbox
-#: ../mail/em-utils.c:1104
+#: ../mail/em-utils.c:1090
#, c-format
msgid "Messages from %s"
msgstr "Messages from %s"
@@ -12317,7 +12241,7 @@ msgstr "Messages from %s"
msgid "Search _Folders"
msgstr "Search _Folders"
-#: ../mail/em-vfolder-rule.c:591
+#: ../mail/em-vfolder-rule.c:590
msgid "Search Folder source"
msgstr "Search Folder source"
@@ -12418,413 +12342,494 @@ msgid "Draw spelling error indicators on words as you type."
msgstr "Draw spelling error indicators on words as you type."
#: ../mail/evolution-mail.schemas.in.in.h:25
+msgid "Empty Junk folders on exit"
+msgstr "Empty Junk folders on exit"
+
+#: ../mail/evolution-mail.schemas.in.in.h:26
msgid "Empty Trash folders on exit"
msgstr "Empty Trash folders on exit"
-#: ../mail/evolution-mail.schemas.in.in.h:26
+#: ../mail/evolution-mail.schemas.in.in.h:27
+msgid "Empty all Junk folders when exiting Evolution."
+msgstr "Empty all Junk folders when exiting Evolution."
+
+#: ../mail/evolution-mail.schemas.in.in.h:28
msgid "Empty all Trash folders when exiting Evolution."
msgstr "Empty all Trash folders when exiting Evolution."
-#: ../mail/evolution-mail.schemas.in.in.h:27
+#: ../mail/evolution-mail.schemas.in.in.h:29
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:28
+#: ../mail/evolution-mail.schemas.in.in.h:30
msgid "Enable or disable type ahead search feature"
msgstr "Enable or disable type ahead search feature"
-#: ../mail/evolution-mail.schemas.in.in.h:29
+#: ../mail/evolution-mail.schemas.in.in.h:31
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:30
+#: ../mail/evolution-mail.schemas.in.in.h:32
msgid "Enable to render message text part of limited size."
msgstr "Enable to render message text part of limited size."
-#: ../mail/evolution-mail.schemas.in.in.h:31
+#: ../mail/evolution-mail.schemas.in.in.h:33
msgid "Enable/disable caret mode"
msgstr "Enable/disable caret mode"
-#: ../mail/evolution-mail.schemas.in.in.h:32
+#: ../mail/evolution-mail.schemas.in.in.h:34
msgid "Height of the message-list pane"
msgstr "Height of the message-list pane"
-#: ../mail/evolution-mail.schemas.in.in.h:33
+#: ../mail/evolution-mail.schemas.in.in.h:35
msgid "Height of the message-list pane."
msgstr "Height of the message-list pane."
-#: ../mail/evolution-mail.schemas.in.in.h:34
+#: ../mail/evolution-mail.schemas.in.in.h:36
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:35
+#: ../mail/evolution-mail.schemas.in.in.h:37
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:36
+#: ../mail/evolution-mail.schemas.in.in.h:38
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:37
+#: ../mail/evolution-mail.schemas.in.in.h:39
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:38
+#: ../mail/evolution-mail.schemas.in.in.h:40
+msgid "Last time empty junk was run"
+msgstr "Last time empty junk was run"
+
+#: ../mail/evolution-mail.schemas.in.in.h:41
msgid "Last time empty trash was run"
msgstr "Last time empty trash was run"
-#: ../mail/evolution-mail.schemas.in.in.h:39
+#: ../mail/evolution-mail.schemas.in.in.h:42
msgid "List of Labels and their associated colors"
msgstr "List of Labels and their associated colours"
-#: ../mail/evolution-mail.schemas.in.in.h:40
+#: ../mail/evolution-mail.schemas.in.in.h:43
msgid "List of accepted licenses"
msgstr "List of accepted licences"
-#: ../mail/evolution-mail.schemas.in.in.h:41
+#: ../mail/evolution-mail.schemas.in.in.h:44
msgid "List of accounts"
msgstr "List of accounts"
-#: ../mail/evolution-mail.schemas.in.in.h:42
+#: ../mail/evolution-mail.schemas.in.in.h:45
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:43
+#: ../mail/evolution-mail.schemas.in.in.h:46
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:44
+#: ../mail/evolution-mail.schemas.in.in.h:47
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:45
+#: ../mail/evolution-mail.schemas.in.in.h:48
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:46
+#: ../mail/evolution-mail.schemas.in.in.h:49
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:47
+#: ../mail/evolution-mail.schemas.in.in.h:50
msgid "Load images for HTML messages over http"
msgstr "Load images for HTML messages over http"
-#: ../mail/evolution-mail.schemas.in.in.h:48
+#: ../mail/evolution-mail.schemas.in.in.h:51
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:49
+#: ../mail/evolution-mail.schemas.in.in.h:52
msgid "Log filter actions"
msgstr "Log filter actions"
-#: ../mail/evolution-mail.schemas.in.in.h:50
+#: ../mail/evolution-mail.schemas.in.in.h:53
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:51
+#: ../mail/evolution-mail.schemas.in.in.h:54
msgid "Logfile to log filter actions"
msgstr "Logfile to log filter actions"
-#: ../mail/evolution-mail.schemas.in.in.h:52
+#: ../mail/evolution-mail.schemas.in.in.h:55
msgid "Logfile to log filter actions."
msgstr "Logfile to log filter actions."
-#: ../mail/evolution-mail.schemas.in.in.h:53
+#: ../mail/evolution-mail.schemas.in.in.h:56
msgid "Mark as Seen after specified timeout"
msgstr "Mark as Seen after specified timeout"
-#: ../mail/evolution-mail.schemas.in.in.h:54
+#: ../mail/evolution-mail.schemas.in.in.h:57
msgid "Mark as Seen after specified timeout."
msgstr "Mark as Seen after specified timeout."
-#: ../mail/evolution-mail.schemas.in.in.h:55
+#: ../mail/evolution-mail.schemas.in.in.h:58
msgid "Mark citations in the message \"Preview\""
msgstr "Mark citations in the message \"Preview\""
-#: ../mail/evolution-mail.schemas.in.in.h:56
+#: ../mail/evolution-mail.schemas.in.in.h:59
msgid "Mark citations in the message \"Preview\"."
msgstr "Mark citations in the message \"Preview\"."
-#: ../mail/evolution-mail.schemas.in.in.h:57
+#: ../mail/evolution-mail.schemas.in.in.h:60
msgid "Message Window default height"
msgstr "Message Window default height"
-#: ../mail/evolution-mail.schemas.in.in.h:58
+#: ../mail/evolution-mail.schemas.in.in.h:61
msgid "Message Window default width"
msgstr "Message Window default width"
-#: ../mail/evolution-mail.schemas.in.in.h:59
+#: ../mail/evolution-mail.schemas.in.in.h:62
msgid "Message-display style (\"normal\", \"full headers\", \"source\")"
msgstr "Message-display style (\"normal\", \"full headers\", \"source\")"
-#: ../mail/evolution-mail.schemas.in.in.h:60
+#: ../mail/evolution-mail.schemas.in.in.h:63
+msgid "Minimum days between emptying the junk on exit"
+msgstr "Minimum days between emptying the junk on exit"
+
+#: ../mail/evolution-mail.schemas.in.in.h:64
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:61
+#: ../mail/evolution-mail.schemas.in.in.h:65
+msgid "Minimum time between emptying the junk on exit, in days."
+msgstr "Minimum time between emptying the junk on exit, in days."
+
+#: ../mail/evolution-mail.schemas.in.in.h:66
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:62
+#: ../mail/evolution-mail.schemas.in.in.h:67
msgid "New Mail Notify sound file"
msgstr "New Mail Notify sound file"
-#: ../mail/evolution-mail.schemas.in.in.h:63
+#: ../mail/evolution-mail.schemas.in.in.h:68
msgid "New Mail Notify type"
msgstr "New Mail Notify type"
-#: ../mail/evolution-mail.schemas.in.in.h:64
+#: ../mail/evolution-mail.schemas.in.in.h:69
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:65
+#: ../mail/evolution-mail.schemas.in.in.h:70
msgid "Prompt on empty subject"
msgstr "Prompt on empty subject"
-#: ../mail/evolution-mail.schemas.in.in.h:66
+#: ../mail/evolution-mail.schemas.in.in.h:71
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:67
+#: ../mail/evolution-mail.schemas.in.in.h:72
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:68
+#: ../mail/evolution-mail.schemas.in.in.h:73
msgid "Prompt when user expunges"
msgstr "Prompt when user expunges"
-#: ../mail/evolution-mail.schemas.in.in.h:69
+#: ../mail/evolution-mail.schemas.in.in.h:74
msgid "Prompt when user only fills Bcc"
msgstr "Prompt when user only fills Bcc"
-#: ../mail/evolution-mail.schemas.in.in.h:70
+#: ../mail/evolution-mail.schemas.in.in.h:75
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:71
+#: ../mail/evolution-mail.schemas.in.in.h:76
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:72
+#: ../mail/evolution-mail.schemas.in.in.h:77
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:73
+#: ../mail/evolution-mail.schemas.in.in.h:78
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:74
+#: ../mail/evolution-mail.schemas.in.in.h:79
msgid "Prompt while marking multiple messages"
msgstr "Prompt while marking multiple messages"
-#: ../mail/evolution-mail.schemas.in.in.h:75
+#: ../mail/evolution-mail.schemas.in.in.h:80
msgid "Recognize links in text and replace them."
msgstr "Recognise links in text and replace them."
-#: ../mail/evolution-mail.schemas.in.in.h:76
+#: ../mail/evolution-mail.schemas.in.in.h:81
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:77
+#: ../mail/evolution-mail.schemas.in.in.h:82
msgid "Run junk test on incoming mail"
msgstr "Run junk test on incoming mail"
-#: ../mail/evolution-mail.schemas.in.in.h:78
+#: ../mail/evolution-mail.schemas.in.in.h:83
msgid "Save directory"
msgstr "Save directory"
-#: ../mail/evolution-mail.schemas.in.in.h:79
+#: ../mail/evolution-mail.schemas.in.in.h:84
msgid "Send HTML mail by default"
msgstr "Send HTML mail by default"
-#: ../mail/evolution-mail.schemas.in.in.h:80
+#: ../mail/evolution-mail.schemas.in.in.h:85
msgid "Send HTML mail by default."
msgstr "Send HTML mail by default."
-#: ../mail/evolution-mail.schemas.in.in.h:81
+#: ../mail/evolution-mail.schemas.in.in.h:86
msgid "Show Animations"
msgstr "Show Animations"
-#: ../mail/evolution-mail.schemas.in.in.h:82
+#: ../mail/evolution-mail.schemas.in.in.h:87
msgid "Show animated images as animations."
msgstr "Show animated images as animations."
-#: ../mail/evolution-mail.schemas.in.in.h:83
+#: ../mail/evolution-mail.schemas.in.in.h:88
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:84
+#: ../mail/evolution-mail.schemas.in.in.h:89
msgid "Show deleted messages in the message-list"
msgstr "Show deleted messages in the message-list"
-#: ../mail/evolution-mail.schemas.in.in.h:87
+#: ../mail/evolution-mail.schemas.in.in.h:92
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:88
+#: ../mail/evolution-mail.schemas.in.in.h:93
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:89
+#: ../mail/evolution-mail.schemas.in.in.h:94
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:90
+#: ../mail/evolution-mail.schemas.in.in.h:95
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:91
+#: ../mail/evolution-mail.schemas.in.in.h:96
msgid "Spell check inline"
msgstr "Spell check inline"
-#: ../mail/evolution-mail.schemas.in.in.h:92
+#: ../mail/evolution-mail.schemas.in.in.h:97
msgid "Subscribe dialog default height"
msgstr "Subscribe dialogue default height"
-#: ../mail/evolution-mail.schemas.in.in.h:93
+#: ../mail/evolution-mail.schemas.in.in.h:98
msgid "Subscribe dialog default width"
msgstr "Subscribe dialogue default width"
-#: ../mail/evolution-mail.schemas.in.in.h:94
+#: ../mail/evolution-mail.schemas.in.in.h:99
msgid "Terminal font"
msgstr "Terminal font"
-#: ../mail/evolution-mail.schemas.in.in.h:95
+#: ../mail/evolution-mail.schemas.in.in.h:100
msgid "Text message part limit"
msgstr "Text message part limit"
-#: ../mail/evolution-mail.schemas.in.in.h:96
+#: ../mail/evolution-mail.schemas.in.in.h:101
+msgid "The default plugin for Junk hook"
+msgstr "The default plugin for Junk hook"
+
+#: ../mail/evolution-mail.schemas.in.in.h:102
+msgid "The last time empty junk was run, in days since the epoch."
+msgstr "The last time empty junk was run, in days since the epoch."
+
+#: ../mail/evolution-mail.schemas.in.in.h:103
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:97
+#: ../mail/evolution-mail.schemas.in.in.h:104
msgid "The terminal font for mail display"
msgstr "The terminal font for mail display"
-#: ../mail/evolution-mail.schemas.in.in.h:98
+#: ../mail/evolution-mail.schemas.in.in.h:105
msgid "The variable width font for mail display"
msgstr "The variable width font for mail display"
-#: ../mail/evolution-mail.schemas.in.in.h:99
+#: ../mail/evolution-mail.schemas.in.in.h:106
msgid "This decides the max size of the text part that can be formatted under evolution. The default is 4MB / 4096 KB and is specified interms of KB."
msgstr "This decides the max size of the text part that can be formatted under evolution. The default is 4MB / 4096 KB and is specified in terms of KB."
-#: ../mail/evolution-mail.schemas.in.in.h:100
+#: ../mail/evolution-mail.schemas.in.in.h:107
+msgid "This is the default junk plugin, even though there are multiple plugins enabled. If the default listed plugin is disabled, then it wont fall back to the other available plugins."
+msgstr "This is the default junk plugin, even though there are multiple plugins enabled. If the default listed plugin is disabled, then it wont fall back to the other available plugins."
+
+#: ../mail/evolution-mail.schemas.in.in.h:108
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:101
+#: ../mail/evolution-mail.schemas.in.in.h:109
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:102
+#: ../mail/evolution-mail.schemas.in.in.h:110
msgid "Thread the message list."
msgstr "Thread the message list."
-#: ../mail/evolution-mail.schemas.in.in.h:103
+#: ../mail/evolution-mail.schemas.in.in.h:111
msgid "Thread the message-list"
msgstr "Thread the message-list"
-#: ../mail/evolution-mail.schemas.in.in.h:104
+#: ../mail/evolution-mail.schemas.in.in.h:112
msgid "Thread the message-list based on Subject"
msgstr "Thread the message-list based on Subject"
-#: ../mail/evolution-mail.schemas.in.in.h:105
+#: ../mail/evolution-mail.schemas.in.in.h:113
msgid "Timeout for marking message as Seen"
msgstr "Timeout for marking message as Seen"
-#: ../mail/evolution-mail.schemas.in.in.h:106
+#: ../mail/evolution-mail.schemas.in.in.h:114
msgid "Timeout for marking message as Seen."
msgstr "Timeout for marking message as Seen."
-#: ../mail/evolution-mail.schemas.in.in.h:107
+#: ../mail/evolution-mail.schemas.in.in.h:115
msgid "UID string of the default account."
msgstr "UID string of the default account."
-#: ../mail/evolution-mail.schemas.in.in.h:108
-msgid "Use Spamassassin daemon and client"
-msgstr "Use Spamassassin daemon and client"
+#: ../mail/evolution-mail.schemas.in.in.h:116
+msgid "Use SpamAssassin daemon and client"
+msgstr "Use SpamAssassin daemon and client"
-#: ../mail/evolution-mail.schemas.in.in.h:109
-msgid "Use Spamassassin daemon and client (spamc/spamd)"
-msgstr "Use Spamassassin daemon and client (spamc/spamd)"
+#: ../mail/evolution-mail.schemas.in.in.h:117
+msgid "Use SpamAssassin daemon and client (spamc/spamd)"
+msgstr "Use SpamAssassin daemon and client (spamc/spamd)"
-#: ../mail/evolution-mail.schemas.in.in.h:110
+#: ../mail/evolution-mail.schemas.in.in.h:118
msgid "Use custom fonts"
msgstr "Use custom fonts"
-#: ../mail/evolution-mail.schemas.in.in.h:111
+#: ../mail/evolution-mail.schemas.in.in.h:119
msgid "Use custom fonts for displaying mail"
msgstr "Use custom fonts for displaying mail"
-#: ../mail/evolution-mail.schemas.in.in.h:112
+#: ../mail/evolution-mail.schemas.in.in.h:120
msgid "Use only local spam tests."
msgstr "Use only local spam tests."
-#: ../mail/evolution-mail.schemas.in.in.h:113
+#: ../mail/evolution-mail.schemas.in.in.h:121
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:114
+#: ../mail/evolution-mail.schemas.in.in.h:122
msgid "Use side-by-side or wide layout"
msgstr "Use side-by-side or wide layout"
-#: ../mail/evolution-mail.schemas.in.in.h:115
+#: ../mail/evolution-mail.schemas.in.in.h:123
msgid "Variable width font"
msgstr "Variable width font"
-#: ../mail/evolution-mail.schemas.in.in.h:116
+#: ../mail/evolution-mail.schemas.in.in.h:124
msgid "View/Bcc menu item is checked"
msgstr "View/Bcc menu item is checked"
-#: ../mail/evolution-mail.schemas.in.in.h:117
+#: ../mail/evolution-mail.schemas.in.in.h:125
msgid "View/Bcc menu item is checked."
msgstr "View/Bcc menu item is checked."
-#: ../mail/evolution-mail.schemas.in.in.h:118
+#: ../mail/evolution-mail.schemas.in.in.h:126
msgid "View/Cc menu item is checked"
msgstr "View/Cc menu item is checked"
-#: ../mail/evolution-mail.schemas.in.in.h:119
+#: ../mail/evolution-mail.schemas.in.in.h:127
msgid "View/Cc menu item is checked."
msgstr "View/Cc menu item is checked."
-#: ../mail/evolution-mail.schemas.in.in.h:120
+#: ../mail/evolution-mail.schemas.in.in.h:128
msgid "View/From menu item is checked"
msgstr "View/From menu item is checked"
-#: ../mail/evolution-mail.schemas.in.in.h:121
+#: ../mail/evolution-mail.schemas.in.in.h:129
msgid "View/From menu item is checked."
msgstr "View/From menu item is checked."
-#: ../mail/evolution-mail.schemas.in.in.h:122
+#: ../mail/evolution-mail.schemas.in.in.h:130
msgid "View/PostTo menu item is checked"
msgstr "View/PostTo menu item is checked"
-#: ../mail/evolution-mail.schemas.in.in.h:123
+#: ../mail/evolution-mail.schemas.in.in.h:131
msgid "View/PostTo menu item is checked."
msgstr "View/PostTo menu item is checked."
-#: ../mail/evolution-mail.schemas.in.in.h:124
+#: ../mail/evolution-mail.schemas.in.in.h:132
msgid "View/ReplyTo menu item is checked"
msgstr "View/ReplyTo menu item is checked"
-#: ../mail/evolution-mail.schemas.in.in.h:125
+#: ../mail/evolution-mail.schemas.in.in.h:133
msgid "View/ReplyTo menu item is checked."
msgstr "View/ReplyTo menu item is checked."
-#: ../mail/evolution-mail.schemas.in.in.h:126
+#: ../mail/evolution-mail.schemas.in.in.h:134
msgid "Whether or not to fall back on threading by subjects when the messages do not contain In-Reply-To or References headers."
msgstr "Whether or not to fall back on threading by subjects when the messages do not contain In-Reply-To or References headers."
-#: ../mail/evolution-mail.schemas.in.in.h:127
+#: ../mail/evolution-mail.schemas.in.in.h:135
msgid "Width of the message-list pane"
msgstr "Width of the message-list pane"
-#: ../mail/evolution-mail.schemas.in.in.h:128
+#: ../mail/evolution-mail.schemas.in.in.h:136
msgid "Width of the message-list pane."
msgstr "Width of the message-list pane."
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:1
+msgid "Composer Preferences"
+msgstr "Composer Preferences"
+
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:2
+msgid "Configure mail preferences, including security and message display, here"
+msgstr "Configure mail preferences, including security and message display, here"
+
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:3
+msgid "Configure spell-checking, signatures, and the message composer here"
+msgstr "Configure spell-checking, signatures, and the message composer here"
+
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:4
+msgid "Configure your email accounts here"
+msgstr "Configure your email accounts here"
+
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:5
+msgid "Evolution Mail"
+msgstr "Evolution Mail"
+
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:6
+msgid "Evolution Mail accounts configuration control"
+msgstr "Evolution Mail accounts configuration control"
+
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:7
+msgid "Evolution Mail component"
+msgstr "Evolution Mail component"
+
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:8
+msgid "Evolution Mail composer"
+msgstr "Evolution Mail composer"
+
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:9
+msgid "Evolution Mail composer configuration control"
+msgstr "Evolution Mail composer configuration control"
+
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:10
+msgid "Evolution Mail preferences control"
+msgstr "Evolution Mail preferences control"
+
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:13
+#: ../mail/mail-config.glade.h:98
+msgid "Mail Preferences"
+msgstr "Mail Preferences"
+
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:14
+msgid "_Mail"
+msgstr "_Mail"
+
#: ../mail/importers/elm-importer.c:192
msgid "Importing Elm data"
msgstr "Importing Elm data"
@@ -12857,15 +12862,15 @@ msgstr "Importer Berkeley Mailbox format folders"
#: ../mail/importers/evolution-outlook-importer.c:262
#: ../mail/importers/mail-importer.c:233
-#: ../shell/e-shell-importer.c:529
+#: ../shell/e-shell-importer.c:515
#, c-format
msgid "Importing `%s'"
msgstr "Importing `%s'"
#: ../mail/importers/evolution-outlook-importer.c:266
#: ../mail/importers/netscape-importer.c:1254
-#: ../plugins/startup-wizard/startup-wizard.c:235
-#: ../shell/e-shell-importer.c:536
+#: ../plugins/startup-wizard/startup-wizard.c:233
+#: ../shell/e-shell-importer.c:522
msgid "Please wait"
msgstr "Please wait"
@@ -13013,88 +13018,95 @@ msgstr[1] "%d junk"
#: ../mail/mail-component.c:548
#, c-format
+msgid "%d selected, "
+msgid_plural "%d selected, "
+msgstr[0] "%d selected, "
+msgstr[1] "%d selected, "
+
+#: ../mail/mail-component.c:551
+#, c-format
msgid "%d draft"
msgid_plural "%d drafts"
msgstr[0] "%d draft"
msgstr[1] "%d drafts"
-#: ../mail/mail-component.c:550
+#: ../mail/mail-component.c:553
#, c-format
msgid "%d sent"
msgid_plural "%d sent"
msgstr[0] "%d sent"
msgstr[1] "%d sent"
-#: ../mail/mail-component.c:552
+#: ../mail/mail-component.c:555
#, c-format
msgid "%d unsent"
msgid_plural "%d unsent"
msgstr[0] "%d unsent"
msgstr[1] "%d unsent"
-#: ../mail/mail-component.c:556
+#: ../mail/mail-component.c:560
+#, c-format
+msgid "%d unread, "
+msgid_plural "%d unread, "
+msgstr[0] "%d unread, "
+msgstr[1] "%d unread, "
+
+#: ../mail/mail-component.c:561
#, c-format
msgid "%d total"
msgid_plural "%d total"
msgstr[0] "%d total"
msgstr[1] "%d total"
-#: ../mail/mail-component.c:558
-#, c-format
-msgid ", %d unread"
-msgid_plural ", %d unread"
-msgstr[0] ", %d unread"
-msgstr[1] ", %d unread"
-
-#: ../mail/mail-component.c:840
+#: ../mail/mail-component.c:871
msgid "New Mail Message"
msgstr "New Mail Message"
-#: ../mail/mail-component.c:841
+#: ../mail/mail-component.c:872
msgid "_Mail Message"
msgstr "_Mail Message"
-#: ../mail/mail-component.c:842
+#: ../mail/mail-component.c:873
msgid "Compose a new mail message"
msgstr "Compose a new mail message"
-#: ../mail/mail-component.c:848
+#: ../mail/mail-component.c:879
msgid "New Mail Folder"
msgstr "New Mail Folder"
-#: ../mail/mail-component.c:849
+#: ../mail/mail-component.c:880
msgid "Mail _Folder"
msgstr "Mail _Folder"
-#: ../mail/mail-component.c:850
+#: ../mail/mail-component.c:881
msgid "Create a new mail folder"
msgstr "Create a new mail folder"
-#: ../mail/mail-component.c:996
+#: ../mail/mail-component.c:1027
msgid "Failed upgrading Mail settings or folders."
msgstr "Failed upgrading Mail settings or folders."
-#: ../mail/mail-config.c:85
+#: ../mail/mail-config.c:81
msgid "I_mportant"
msgstr "I_mportant"
#. red
-#: ../mail/mail-config.c:86
+#: ../mail/mail-config.c:82
msgid "_Work"
msgstr "_Work"
#. orange
-#: ../mail/mail-config.c:87
+#: ../mail/mail-config.c:83
msgid "_Personal"
msgstr "_Personal"
#. forest green
-#: ../mail/mail-config.c:88
+#: ../mail/mail-config.c:84
msgid "_To Do"
msgstr "_To Do"
#. blue
-#: ../mail/mail-config.c:89
+#: ../mail/mail-config.c:85
msgid "_Later"
msgstr "_Later"
@@ -13115,203 +13127,195 @@ msgid "<b>_Languages</b>"
msgstr "<b>_Languages</b>"
#: ../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:7
msgid "<span weight=\"bold\">Account Information</span>"
msgstr "<span weight=\"bold\">Account Information</span>"
-#: ../mail/mail-config.glade.h:9
+#: ../mail/mail-config.glade.h:8
msgid "<span weight=\"bold\">Authentication Type</span>"
msgstr "<span weight=\"bold\">Authentication Type</span>"
-#: ../mail/mail-config.glade.h:10
+#: ../mail/mail-config.glade.h:9
msgid "<span weight=\"bold\">Authentication</span>"
msgstr "<span weight=\"bold\">Authentication</span>"
-#: ../mail/mail-config.glade.h:11
+#: ../mail/mail-config.glade.h:10
msgid "<span weight=\"bold\">Composing Messages</span>"
msgstr "<span weight=\"bold\">Composing Messages</span>"
-#: ../mail/mail-config.glade.h:12
+#: ../mail/mail-config.glade.h:11
msgid "<span weight=\"bold\">Configuration</span>"
msgstr "<span weight=\"bold\">Configuration</span>"
-#: ../mail/mail-config.glade.h:13
+#: ../mail/mail-config.glade.h:12
msgid "<span weight=\"bold\">Default Behavior</span>"
msgstr "<span weight=\"bold\">Default Behavior</span>"
-#: ../mail/mail-config.glade.h:14
+#: ../mail/mail-config.glade.h:13
msgid "<span weight=\"bold\">Delete Mail</span>"
msgstr "<span weight=\"bold\">Delete Mail</span>"
-#: ../mail/mail-config.glade.h:15
+#: ../mail/mail-config.glade.h:14
msgid "<span weight=\"bold\">Displayed Mail _Headers</span>"
msgstr "<span weight=\"bold\">Displayed Mail _Headers</span>"
#: ../mail/mail-config.glade.h:16
-msgid "<span weight=\"bold\">Filter Options</span>"
-msgstr "<span weight=\"bold\">Filter Options</span>"
-
-#: ../mail/mail-config.glade.h:18
msgid "<span weight=\"bold\">Labels and Colors</span>"
msgstr "<span weight=\"bold\">Labels and Colours</span>"
-#: ../mail/mail-config.glade.h:19
+#: ../mail/mail-config.glade.h:17
msgid "<span weight=\"bold\">Loading Images</span>"
msgstr "<span weight=\"bold\">Loading Images</span>"
-#: ../mail/mail-config.glade.h:20
+#: ../mail/mail-config.glade.h:18
msgid "<span weight=\"bold\">Message Display</span>"
msgstr "<span weight=\"bold\">Message Display</span>"
-#: ../mail/mail-config.glade.h:21
+#: ../mail/mail-config.glade.h:19
msgid "<span weight=\"bold\">Message Fonts</span>"
msgstr "<span weight=\"bold\">Message Fonts</span>"
-#: ../mail/mail-config.glade.h:22
+#: ../mail/mail-config.glade.h:20
msgid "<span weight=\"bold\">Message Receipts</span>"
msgstr "<span weight=\"bold\">Message Receipts</span>"
-#: ../mail/mail-config.glade.h:23
+#: ../mail/mail-config.glade.h:21
msgid "<span weight=\"bold\">New Mail Notification</span>"
msgstr "<span weight=\"bold\">New Mail Notification</span>"
-#: ../mail/mail-config.glade.h:24
+#: ../mail/mail-config.glade.h:22
#: ../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:25
+#: ../mail/mail-config.glade.h:23
msgid "<span weight=\"bold\">Options</span>"
msgstr "<span weight=\"bold\">Options</span>"
-#: ../mail/mail-config.glade.h:26
+#: ../mail/mail-config.glade.h:24
msgid "<span weight=\"bold\">Pretty Good Privacy (PGP/GPG)</span>"
msgstr "<span weight=\"bold\">Pretty Good Privacy (PGP/GPG)</span>"
-#: ../mail/mail-config.glade.h:27
+#: ../mail/mail-config.glade.h:25
msgid "<span weight=\"bold\">Printed Fonts</span>"
msgstr "<span weight=\"bold\">Printed Fonts</span>"
-#: ../mail/mail-config.glade.h:28
+#: ../mail/mail-config.glade.h:26
msgid "<span weight=\"bold\">Required Information</span>"
msgstr "<span weight=\"bold\">Required Information</span>"
-#: ../mail/mail-config.glade.h:29
+#: ../mail/mail-config.glade.h:27
msgid "<span weight=\"bold\">Secure MIME (S/MIME)</span>"
msgstr "<span weight=\"bold\">Secure MIME (S/MIME)</span>"
-#: ../mail/mail-config.glade.h:30
+#: ../mail/mail-config.glade.h:28
msgid "<span weight=\"bold\">Security</span>"
msgstr "<span weight=\"bold\">Security</span>"
-#: ../mail/mail-config.glade.h:31
+#: ../mail/mail-config.glade.h:29
msgid "<span weight=\"bold\">Sent and Draft Messages</span>"
msgstr "<span weight=\"bold\">Sent and Draft Messages</span>"
-#: ../mail/mail-config.glade.h:32
+#: ../mail/mail-config.glade.h:30
msgid "<span weight=\"bold\">Server Configuration</span>"
msgstr "<span weight=\"bold\">Server Configuration</span>"
-#: ../mail/mail-config.glade.h:34
+#: ../mail/mail-config.glade.h:32
msgid "Account Management"
msgstr "Account Management"
-#: ../mail/mail-config.glade.h:35
+#: ../mail/mail-config.glade.h:33
msgid "Add Ne_w Signature..."
msgstr "Add Ne_w Signature..."
-#: ../mail/mail-config.glade.h:36
+#: ../mail/mail-config.glade.h:34
msgid "Add _Script"
msgstr "Add _Script"
-#: ../mail/mail-config.glade.h:37
+#: ../mail/mail-config.glade.h:35
msgid "Al_ways sign outgoing messages when using this account"
msgstr "Al_ways sign outgoing messages when using this account"
-#: ../mail/mail-config.glade.h:38
+#: ../mail/mail-config.glade.h:36
msgid "Also encrypt to sel_f when sending encrypted mail"
msgstr "Also encrypt to sel_f when sending encrypted mail"
-#: ../mail/mail-config.glade.h:39
+#: ../mail/mail-config.glade.h:37
msgid "Alway_s carbon-copy (cc) to:"
msgstr "Alway_s carbon-copy (cc) to:"
-#: ../mail/mail-config.glade.h:40
+#: ../mail/mail-config.glade.h:38
msgid "Always _blind carbon-copy (bcc) to:"
msgstr "Always _blind carbon-copy (bcc) to:"
-#: ../mail/mail-config.glade.h:41
+#: ../mail/mail-config.glade.h:39
msgid "Always _trust keys in my keyring when encrypting"
msgstr "Always _trust keys in my keyring when encrypting"
-#: ../mail/mail-config.glade.h:42
+#: ../mail/mail-config.glade.h:40
msgid "Always encrypt to _myself when sending encrypted mail"
msgstr "Always encrypt to _myself when sending encrypted mail"
-#: ../mail/mail-config.glade.h:43
+#: ../mail/mail-config.glade.h:41
msgid "Attach original message"
msgstr "Attach original message"
-#: ../mail/mail-config.glade.h:45
+#: ../mail/mail-config.glade.h:43
msgid "Automatically insert _smiley images"
msgstr "Automatically insert _smiley images"
-#: ../mail/mail-config.glade.h:46
+#: ../mail/mail-config.glade.h:44
msgid "Baltic (ISO-8859-13)"
msgstr "Baltic (ISO-8859-13)"
-#: ../mail/mail-config.glade.h:47
+#: ../mail/mail-config.glade.h:45
msgid "Baltic (ISO-8859-4)"
msgstr "Baltic (ISO-8859-4)"
-#: ../mail/mail-config.glade.h:48
+#: ../mail/mail-config.glade.h:46
msgid "Beep w_hen new mail arrives"
msgstr "Beep w_hen new mail arrives"
-#: ../mail/mail-config.glade.h:49
+#: ../mail/mail-config.glade.h:47
msgid "C_haracter set:"
msgstr "C_haracter set:"
-#: ../mail/mail-config.glade.h:50
+#: ../mail/mail-config.glade.h:48
msgid "Ch_eck for Supported Types "
msgstr "Ch_eck for Supported Types "
-#: ../mail/mail-config.glade.h:51
+#: ../mail/mail-config.glade.h:49
msgid "Check in_coming mail for junk"
msgstr "Check in_coming mail for junk"
-#: ../mail/mail-config.glade.h:52
+#: ../mail/mail-config.glade.h:50
msgid "Check spelling while I _type"
msgstr "Check spelling while I _type"
-#: ../mail/mail-config.glade.h:53
+#: ../mail/mail-config.glade.h:51
msgid "Checks incoming mail messages to be Junk"
msgstr "Checks incoming mail messages to be Junk"
-#: ../mail/mail-config.glade.h:54
+#: ../mail/mail-config.glade.h:52
msgid "Cle_ar"
msgstr "Cle_ar"
-#: ../mail/mail-config.glade.h:55
+#: ../mail/mail-config.glade.h:53
msgid "Clea_r"
msgstr "Clea_r"
-#: ../mail/mail-config.glade.h:56
+#: ../mail/mail-config.glade.h:54
msgid "Color for _misspelled words:"
msgstr "Colour for _misspelled words:"
-#: ../mail/mail-config.glade.h:57
+#: ../mail/mail-config.glade.h:55
msgid "Colors"
msgstr "Colours"
-#: ../mail/mail-config.glade.h:58
+#: ../mail/mail-config.glade.h:56
msgid "Confirm _when expunging a folder"
msgstr "Confirm _when expunging a folder"
-#: ../mail/mail-config.glade.h:59
+#: ../mail/mail-config.glade.h:57
msgid ""
"Congratulations, your mail configuration is complete.\n"
"\n"
@@ -13327,140 +13331,140 @@ msgstr ""
"\n"
"Click \"Apply\" to save your settings."
-#: ../mail/mail-config.glade.h:65
+#: ../mail/mail-config.glade.h:63
msgid "De_fault"
msgstr "De_fault"
-#: ../mail/mail-config.glade.h:66
+#: ../mail/mail-config.glade.h:64
msgid "Default character e_ncoding:"
msgstr "Default character e_ncoding:"
-#: ../mail/mail-config.glade.h:69
+#: ../mail/mail-config.glade.h:66
+msgid "Delete junk mails on e_xit"
+msgstr "Delete junk mails on e_xit"
+
+#: ../mail/mail-config.glade.h:68
msgid "Digitally _sign outgoing messages (by default)"
msgstr "Digitally _sign outgoing messages (by default)"
-#: ../mail/mail-config.glade.h:70
+#: ../mail/mail-config.glade.h:69
msgid "Do not format text contents in mails if the text si_ze exceeds"
msgstr "Do not format text contents in mails if the text si_ze exceeds"
-#: ../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:74
+#: ../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:75
+#: ../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
+#: ../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:85
+#: ../mail/mail-config.glade.h:84
msgid "Full Nam_e:"
msgstr "Full Nam_e:"
-#: ../mail/mail-config.glade.h:87
+#: ../mail/mail-config.glade.h:86
msgid "HTML Mail"
msgstr "HTML Mail"
-#: ../mail/mail-config.glade.h:88
+#: ../mail/mail-config.glade.h:87
msgid "Headers"
msgstr "Headers"
-#: ../mail/mail-config.glade.h:89
+#: ../mail/mail-config.glade.h:88
msgid "Highlight _quotations with"
msgstr "Highlight _quotations with"
-#: ../mail/mail-config.glade.h:90
-msgid "I_nclude remote tests"
-msgstr "I_nclude remote tests"
-
-#: ../mail/mail-config.glade.h:93
+#: ../mail/mail-config.glade.h:91
msgid "Inline"
msgstr "Inline"
-#: ../mail/mail-config.glade.h:95
+#: ../mail/mail-config.glade.h:93
msgid "KB"
msgstr "KB"
-#: ../mail/mail-config.glade.h:96
+#: ../mail/mail-config.glade.h:94
msgid "Languages Table"
msgstr "Languages Table"
-#: ../mail/mail-config.glade.h:98
+#: ../mail/mail-config.glade.h:96
msgid "Mail Configuration"
msgstr "Mail Configuration"
-#: ../mail/mail-config.glade.h:99
+#: ../mail/mail-config.glade.h:97
msgid "Mail Headers Table"
msgstr "Mail Headers Table"
-#: ../mail/mail-config.glade.h:101
+#: ../mail/mail-config.glade.h:99
msgid "Mailbox location"
msgstr "Mailbox location"
-#: ../mail/mail-config.glade.h:102
+#: ../mail/mail-config.glade.h:100
msgid "Message Composer"
msgstr "Message Composer"
-#: ../mail/mail-config.glade.h:103
+#: ../mail/mail-config.glade.h:101
msgid "Note: you will not be prompted for a password until you connect for the first time"
msgstr "Note: you will not be prompted for a password until you connect for the first time"
-#: ../mail/mail-config.glade.h:104
+#: ../mail/mail-config.glade.h:102
msgid "Or_ganization:"
msgstr "Or_ganisation:"
-#: ../mail/mail-config.glade.h:105
+#: ../mail/mail-config.glade.h:103
msgid "PGP/GPG _Key ID:"
msgstr "PGP/GPG _Key ID:"
-#: ../mail/mail-config.glade.h:108
+#: ../mail/mail-config.glade.h:106
msgid "Play sound file when new mail arri_ves"
msgstr "Play sound file when new mail arri_ves"
-#: ../mail/mail-config.glade.h:109
+#: ../mail/mail-config.glade.h:107
msgid ""
"Please enter a descriptive name for this account in the space below.\n"
"This name will be used for display purposes only."
@@ -13468,127 +13472,127 @@ msgstr ""
"Please enter a descriptive name for this account in the space below.\n"
"This name will be used for display purposes only."
-#: ../mail/mail-config.glade.h:111
+#: ../mail/mail-config.glade.h:109
msgid "Please enter information about the way you will send mail. If you are not sure, ask your system administrator or Internet Service Provider."
msgstr "Please enter information about the way you will send mail. If you are not sure, ask your system administrator or Internet Service Provider."
-#: ../mail/mail-config.glade.h:112
+#: ../mail/mail-config.glade.h:110
msgid "Please enter your name and email address below. The \"optional\" fields below do not need to be filled in, unless you wish to include this information in email you send."
msgstr "Please enter your name and email address below. The \"optional\" fields below do not need to be filled in, unless you wish to include this information in email you send."
-#: ../mail/mail-config.glade.h:113
+#: ../mail/mail-config.glade.h:111
msgid "Please select among the following options"
msgstr "Please select among the following options"
-#: ../mail/mail-config.glade.h:114
+#: ../mail/mail-config.glade.h:112
msgid "Pr_ompt when sending messages with only Bcc recipients defined"
msgstr "Pr_ompt when sending messages with only Bcc recipients defined"
-#: ../mail/mail-config.glade.h:115
+#: ../mail/mail-config.glade.h:113
msgid "Quote original message"
msgstr "Quote original message"
-#: ../mail/mail-config.glade.h:116
+#: ../mail/mail-config.glade.h:114
msgid "Quoted"
msgstr "Quoted"
-#: ../mail/mail-config.glade.h:117
+#: ../mail/mail-config.glade.h:115
msgid "Re_member password"
msgstr "Re_member password"
-#: ../mail/mail-config.glade.h:118
+#: ../mail/mail-config.glade.h:116
msgid "Re_ply-To:"
msgstr "Re_ply-To:"
-#: ../mail/mail-config.glade.h:120
+#: ../mail/mail-config.glade.h:118
msgid "Remember _password"
msgstr "Remember _password"
-#: ../mail/mail-config.glade.h:121
+#: ../mail/mail-config.glade.h:119
msgid "S_elect..."
msgstr "S_elect..."
-#: ../mail/mail-config.glade.h:122
+#: ../mail/mail-config.glade.h:120
msgid "S_end message receipts:"
msgstr "S_end message receipts:"
-#: ../mail/mail-config.glade.h:123
+#: ../mail/mail-config.glade.h:121
msgid "S_tandard Font:"
msgstr "S_tandard Font:"
-#: ../mail/mail-config.glade.h:124
+#: ../mail/mail-config.glade.h:122
msgid "Se_lect..."
msgstr "Se_lect..."
-#: ../mail/mail-config.glade.h:126
+#: ../mail/mail-config.glade.h:124
msgid "Select HTML fixed width font"
msgstr "Select HTML fixed width font"
-#: ../mail/mail-config.glade.h:127
+#: ../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:128
+#: ../mail/mail-config.glade.h:126
msgid "Select HTML variable width font"
msgstr "Select HTML variable width font"
-#: ../mail/mail-config.glade.h:129
+#: ../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:130
+#: ../mail/mail-config.glade.h:128
msgid "Select sound file"
msgstr "Select sound file"
-#: ../mail/mail-config.glade.h:132
+#: ../mail/mail-config.glade.h:130
msgid "Sending Mail"
msgstr "Sending Mail"
-#: ../mail/mail-config.glade.h:133
+#: ../mail/mail-config.glade.h:131
msgid "Sent _Messages Folder:"
msgstr "Sent _Messages Folder:"
-#: ../mail/mail-config.glade.h:134
+#: ../mail/mail-config.glade.h:132
msgid "Ser_ver requires authentication"
msgstr "Ser_ver requires authentication"
-#: ../mail/mail-config.glade.h:135
+#: ../mail/mail-config.glade.h:133
msgid "Server _Type: "
msgstr "Server _Type: "
-#: ../mail/mail-config.glade.h:136
+#: ../mail/mail-config.glade.h:134
msgid "Sig_ning certificate:"
msgstr "Sig_ning certificate:"
-#: ../mail/mail-config.glade.h:137
+#: ../mail/mail-config.glade.h:135
msgid "Signat_ure:"
msgstr "Signat_ure:"
-#: ../mail/mail-config.glade.h:138
+#: ../mail/mail-config.glade.h:136
msgid "Signatures"
msgstr "Signatures"
-#: ../mail/mail-config.glade.h:139
+#: ../mail/mail-config.glade.h:137
msgid "Signatures Table"
msgstr "Signatures Table"
-#: ../mail/mail-config.glade.h:140
+#: ../mail/mail-config.glade.h:138
msgid "Specify _filename:"
msgstr "Specify _filename:"
-#: ../mail/mail-config.glade.h:141
+#: ../mail/mail-config.glade.h:139
msgid "Spell Checking"
msgstr "Spell Checking"
-#: ../mail/mail-config.glade.h:142
+#: ../mail/mail-config.glade.h:140
msgid "T_ype: "
msgstr "T_ype: "
-#: ../mail/mail-config.glade.h:143
+#: ../mail/mail-config.glade.h:141
msgid "The list of languages here reflects only the languages for which you have a dictionary installed."
msgstr "The list of languages here reflects only the languages for which you have a dictionary installed."
-#: ../mail/mail-config.glade.h:144
+#: ../mail/mail-config.glade.h:142
msgid ""
"The output of this script will be used as your\n"
"signature. The name you specify will be used\n"
@@ -13598,7 +13602,7 @@ msgstr ""
"signature. The name you specify will be used\n"
"for display purposes only. "
-#: ../mail/mail-config.glade.h:148
+#: ../mail/mail-config.glade.h:146
msgid ""
"Type the name by which you would like to refer to this account.\n"
"For example: \"Work\" or \"Personal\""
@@ -13606,16 +13610,16 @@ msgstr ""
"Type the name by which you would like to refer to this account.\n"
"For example: \"Work\" or \"Personal\""
-#: ../mail/mail-config.glade.h:150
+#: ../mail/mail-config.glade.h:148
#: ../plugins/caldav/caldav-source.c:282
msgid "User_name:"
msgstr "User_name:"
-#: ../mail/mail-config.glade.h:151
+#: ../mail/mail-config.glade.h:149
msgid "V_ariable-width:"
msgstr "V_ariable-width:"
-#: ../mail/mail-config.glade.h:152
+#: ../mail/mail-config.glade.h:150
msgid ""
"Welcome to the Evolution Mail Configuration Assistant.\n"
"\n"
@@ -13625,88 +13629,92 @@ msgstr ""
"\n"
"Click \"Forward\" to begin. "
-#: ../mail/mail-config.glade.h:156
+#: ../mail/mail-config.glade.h:154
msgid "_Add Signature"
msgstr "_Add Signature"
-#: ../mail/mail-config.glade.h:157
+#: ../mail/mail-config.glade.h:155
msgid "_Always load images from the Internet"
msgstr "_Always load images from the Internet"
-#: ../mail/mail-config.glade.h:158
+#: ../mail/mail-config.glade.h:156
+msgid "_Default junk plugin:"
+msgstr "_Default junk plugin:"
+
+#: ../mail/mail-config.glade.h:157
msgid "_Do not notify me when new mail arrives"
msgstr "_Do not notify me when new mail arrives"
-#: ../mail/mail-config.glade.h:159
+#: ../mail/mail-config.glade.h:158
msgid "_Do not sign meeting requests (for Outlook compatibility)"
msgstr "_Do not sign meeting requests (for Outlook compatibility)"
-#: ../mail/mail-config.glade.h:161
+#: ../mail/mail-config.glade.h:160
msgid "_Forward style:"
msgstr "_Forward style:"
-#: ../mail/mail-config.glade.h:162
+#: ../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:163
+#: ../mail/mail-config.glade.h:162
msgid "_Make this my default account"
msgstr "_Make this my default account"
-#: ../mail/mail-config.glade.h:164
+#: ../mail/mail-config.glade.h:163
msgid "_Mark messages as read after"
msgstr "_Mark messages as read after"
-#: ../mail/mail-config.glade.h:166
+#: ../mail/mail-config.glade.h:165
msgid "_Never load images from the Internet"
msgstr "_Never load images from the Internet"
-#: ../mail/mail-config.glade.h:167
+#: ../mail/mail-config.glade.h:166
msgid "_Path:"
msgstr "_Path:"
-#: ../mail/mail-config.glade.h:168
+#: ../mail/mail-config.glade.h:167
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:169
+#: ../mail/mail-config.glade.h:168
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:170
+#: ../mail/mail-config.glade.h:169
msgid "_Reply style:"
msgstr "_Reply style:"
-#: ../mail/mail-config.glade.h:171
+#: ../mail/mail-config.glade.h:170
msgid "_Script:"
msgstr "_Script:"
#. If enabled, show animation; if disabled, only display a static image without any animation
-#: ../mail/mail-config.glade.h:174
+#: ../mail/mail-config.glade.h:173
msgid "_Show image animations"
msgstr "_Show image animations"
-#: ../mail/mail-config.glade.h:175
+#: ../mail/mail-config.glade.h:174
msgid "_Shrink To / Cc / Bcc headers to "
msgstr "_Shrink To / Cc / Bcc headers to "
-#: ../mail/mail-config.glade.h:176
+#: ../mail/mail-config.glade.h:175
msgid "_Use Secure Connection:"
msgstr "_Use Secure Connection:"
-#: ../mail/mail-config.glade.h:177
+#: ../mail/mail-config.glade.h:176
msgid "_Use the same fonts as other applications"
msgstr "_Use the same fonts as other applications"
-#: ../mail/mail-config.glade.h:178
+#: ../mail/mail-config.glade.h:177
msgid "addresses"
msgstr "addresses"
-#: ../mail/mail-config.glade.h:179
+#: ../mail/mail-config.glade.h:178
msgid "color"
msgstr "colour"
-#: ../mail/mail-config.glade.h:180
+#: ../mail/mail-config.glade.h:179
msgid "description"
msgstr "description"
@@ -13812,294 +13820,6 @@ msgstr "_Flag:"
msgid "_Tick this to accept the license agreement"
msgstr "_Tick this to accept the licence agreement"
-#: ../mail/mail-folder-cache.c:858
-#, c-format
-msgid "Pinging %s"
-msgstr "Pinging %s"
-
-#: ../mail/mail-ops.c:105
-msgid "Filtering Selected Messages"
-msgstr "Filtering Selected Messages"
-
-#: ../mail/mail-ops.c:266
-msgid "Fetching Mail"
-msgstr "Fetching Mail"
-
-#. sending mail, filtering failed
-#: ../mail/mail-ops.c:566
-#, c-format
-msgid "Failed to apply outgoing filters: %s"
-msgstr "Failed to apply outgoing filters: %s"
-
-#: ../mail/mail-ops.c:578
-#: ../mail/mail-ops.c:607
-#, c-format
-msgid ""
-"Failed to append to %s: %s\n"
-"Appending to local `Sent' folder instead."
-msgstr ""
-"Failed to append to %s: %s\n"
-"Appending to local `Sent' folder instead."
-
-#: ../mail/mail-ops.c:624
-#, c-format
-msgid "Failed to append to local `Sent' folder: %s"
-msgstr "Failed to append to local `Sent' folder: %s"
-
-#: ../mail/mail-ops.c:736
-#, c-format
-msgid "Sending message %d of %d"
-msgstr "Sending message %d of %d"
-
-#: ../mail/mail-ops.c:761
-#, c-format
-msgid "Failed to send %d of %d messages"
-msgstr "Failed to send %d of %d messages"
-
-#: ../mail/mail-ops.c:763
-#: ../mail/mail-send-recv.c:652
-msgid "Canceled."
-msgstr "Cancelled."
-
-#: ../mail/mail-ops.c:765
-msgid "Complete."
-msgstr "Complete."
-
-#: ../mail/mail-ops.c:862
-msgid "Saving message to folder"
-msgstr "Saving message to folder"
-
-#: ../mail/mail-ops.c:947
-#, c-format
-msgid "Moving messages to %s"
-msgstr "Moving messages to %s"
-
-#: ../mail/mail-ops.c:947
-#, c-format
-msgid "Copying messages to %s"
-msgstr "Copying messages to %s"
-
-#: ../mail/mail-ops.c:1170
-msgid "Forwarded messages"
-msgstr "Forwarded messages"
-
-#: ../mail/mail-ops.c:1213
-#, c-format
-msgid "Opening folder %s"
-msgstr "Opening folder %s"
-
-#: ../mail/mail-ops.c:1285
-#, c-format
-msgid "Opening store %s"
-msgstr "Opening store %s"
-
-#: ../mail/mail-ops.c:1363
-#, c-format
-msgid "Removing folder %s"
-msgstr "Removing folder %s"
-
-#: ../mail/mail-ops.c:1457
-#, c-format
-msgid "Storing folder '%s'"
-msgstr "Storing folder '%s'"
-
-#: ../mail/mail-ops.c:1522
-#, c-format
-msgid "Expunging and storing account '%s'"
-msgstr "Expunging and storing account '%s'"
-
-#: ../mail/mail-ops.c:1523
-#, c-format
-msgid "Storing account '%s'"
-msgstr "Storing account '%s'"
-
-#: ../mail/mail-ops.c:1578
-msgid "Refreshing folder"
-msgstr "Refreshing folder"
-
-#: ../mail/mail-ops.c:1614
-#: ../mail/mail-ops.c:1665
-msgid "Expunging folder"
-msgstr "Expunging folder"
-
-#: ../mail/mail-ops.c:1662
-#, c-format
-msgid "Emptying trash in '%s'"
-msgstr "Emptying trash in '%s'"
-
-#: ../mail/mail-ops.c:1663
-msgid "Local Folders"
-msgstr "Local Folders"
-
-#: ../mail/mail-ops.c:1746
-#, c-format
-msgid "Retrieving message %s"
-msgstr "Retrieving message %s"
-
-#: ../mail/mail-ops.c:1856
-#, c-format
-msgid "Retrieving %d message"
-msgid_plural "Retrieving %d messages"
-msgstr[0] "Retrieving %d message"
-msgstr[1] "Retrieving %d messages"
-
-#: ../mail/mail-ops.c:1942
-#, c-format
-msgid "Saving %d message"
-msgid_plural "Saving %d messsages"
-msgstr[0] "Saving %d message"
-msgstr[1] "Saving %d messages"
-
-#: ../mail/mail-ops.c:2013
-#, c-format
-msgid ""
-"Error saving messages to: %s:\n"
-" %s"
-msgstr ""
-"Error saving messages to: %s:\n"
-" %s"
-
-#: ../mail/mail-ops.c:2085
-msgid "Saving attachment"
-msgstr "Saving attachment"
-
-#: ../mail/mail-ops.c:2098
-#: ../mail/mail-ops.c:2104
-#, c-format
-msgid ""
-"Cannot create output file: %s:\n"
-" %s"
-msgstr ""
-"Cannot create output file: %s:\n"
-" %s"
-
-#: ../mail/mail-ops.c:2114
-#, c-format
-msgid "Could not write data: %s"
-msgstr "Could not write data: %s"
-
-#: ../mail/mail-ops.c:2263
-#, c-format
-msgid "Disconnecting from %s"
-msgstr "Disconnecting from %s"
-
-#: ../mail/mail-ops.c:2263
-#, c-format
-msgid "Reconnecting to %s"
-msgstr "Reconnecting to %s"
-
-#: ../mail/mail-ops.c:2379
-msgid "Checking Service"
-msgstr "Checking Service"
-
-#: ../mail/mail-send-recv.c:159
-msgid "Canceling..."
-msgstr "Cancelling..."
-
-#: ../mail/mail-send-recv.c:349
-msgid "Send & Receive Mail"
-msgstr "Send & Receive Mail"
-
-#: ../mail/mail-send-recv.c:356
-msgid "Cancel _All"
-msgstr "Cancel _All"
-
-#: ../mail/mail-send-recv.c:453
-msgid "Updating..."
-msgstr "Updating..."
-
-#: ../mail/mail-send-recv.c:453
-#: ../mail/mail-send-recv.c:506
-msgid "Waiting..."
-msgstr "Waiting..."
-
-#: ../mail/mail-send-recv.c:738
-msgid "Checking for new mail"
-msgstr "Checking for new mail"
-
-#: ../mail/mail-session.c:198
-#, c-format
-msgid "Enter Passphrase for %s"
-msgstr "Enter Passphrase for %s"
-
-#: ../mail/mail-session.c:200
-msgid "Enter Passphrase"
-msgstr "Enter Passphrase"
-
-#: ../mail/mail-session.c:203
-#: ../plugins/exchange-operations/exchange-config-listener.c:711
-#, c-format
-msgid "Enter Password for %s"
-msgstr "Enter Password for %s"
-
-#: ../mail/mail-session.c:205
-msgid "Enter Password"
-msgstr "Enter Password"
-
-#: ../mail/mail-session.c:243
-msgid "User canceled operation."
-msgstr "User cancelled operation."
-
-#: ../mail/mail-signature-editor.c:384
-msgid "Edit signature"
-msgstr "Edit signature"
-
-#: ../mail/mail-signature-editor.c:431
-msgid "Enter a name for this signature."
-msgstr "Enter a name for this signature."
-
-#: ../mail/mail-signature-editor.c:434
-#: ../plugins/groupwise-features/properties.glade.h:4
-msgid "Name:"
-msgstr "Name:"
-
-#: ../mail/mail-tools.c:120
-#, c-format
-msgid "Could not create spool directory `%s': %s"
-msgstr "Could not create spool directory `%s': %s"
-
-#: ../mail/mail-tools.c:150
-#, c-format
-msgid "Trying to movemail a non-mbox source `%s'"
-msgstr "Trying to movemail a non-mbox source `%s'"
-
-#: ../mail/mail-tools.c:256
-#, c-format
-msgid "Forwarded message - %s"
-msgstr "Forwarded message - %s"
-
-#: ../mail/mail-tools.c:258
-msgid "Forwarded message"
-msgstr "Forwarded message"
-
-#: ../mail/mail-tools.c:298
-#, c-format
-msgid "Invalid folder: `%s'"
-msgstr "Invalid folder: `%s'"
-
-#: ../mail/mail-vfolder.c:91
-#, c-format
-msgid "Setting up Search Folder: %s"
-msgstr "Setting up Search Folder: %s"
-
-#: ../mail/mail-vfolder.c:240
-#, c-format
-msgid "Updating Search Folders for '%s:%s'"
-msgstr "Updating Search Folders for '%s:%s'"
-
-#: ../mail/mail-vfolder.c:247
-#, c-format
-msgid "Updating Search Folders for '%s'"
-msgstr "Updating Search Folders for '%s'"
-
-#: ../mail/mail-vfolder.c:1023
-msgid "Edit Search Folder"
-msgstr "Edit Search Folder"
-
-#: ../mail/mail-vfolder.c:1107
-msgid "New Search Folder"
-msgstr "New Search Folder"
-
#: ../mail/mail.error.xml.h:1
msgid "A folder named &quot;{0}&quot; already exists. Please use a different name."
msgstr "A folder named &quot;{0}&quot; already exists. Please use a different name."
@@ -14597,6 +14317,294 @@ msgstr "_Expunge"
msgid "_Open Messages"
msgstr "_Open Messages"
+#: ../mail/mail-folder-cache.c:858
+#, c-format
+msgid "Pinging %s"
+msgstr "Pinging %s"
+
+#: ../mail/mail-ops.c:105
+msgid "Filtering Selected Messages"
+msgstr "Filtering Selected Messages"
+
+#: ../mail/mail-ops.c:266
+msgid "Fetching Mail"
+msgstr "Fetching Mail"
+
+#. sending mail, filtering failed
+#: ../mail/mail-ops.c:566
+#, c-format
+msgid "Failed to apply outgoing filters: %s"
+msgstr "Failed to apply outgoing filters: %s"
+
+#: ../mail/mail-ops.c:578
+#: ../mail/mail-ops.c:607
+#, c-format
+msgid ""
+"Failed to append to %s: %s\n"
+"Appending to local `Sent' folder instead."
+msgstr ""
+"Failed to append to %s: %s\n"
+"Appending to local `Sent' folder instead."
+
+#: ../mail/mail-ops.c:624
+#, c-format
+msgid "Failed to append to local `Sent' folder: %s"
+msgstr "Failed to append to local `Sent' folder: %s"
+
+#: ../mail/mail-ops.c:736
+#, c-format
+msgid "Sending message %d of %d"
+msgstr "Sending message %d of %d"
+
+#: ../mail/mail-ops.c:761
+#, c-format
+msgid "Failed to send %d of %d messages"
+msgstr "Failed to send %d of %d messages"
+
+#: ../mail/mail-ops.c:763
+#: ../mail/mail-send-recv.c:703
+msgid "Canceled."
+msgstr "Cancelled."
+
+#: ../mail/mail-ops.c:765
+msgid "Complete."
+msgstr "Complete."
+
+#: ../mail/mail-ops.c:862
+msgid "Saving message to folder"
+msgstr "Saving message to folder"
+
+#: ../mail/mail-ops.c:947
+#, c-format
+msgid "Moving messages to %s"
+msgstr "Moving messages to %s"
+
+#: ../mail/mail-ops.c:947
+#, c-format
+msgid "Copying messages to %s"
+msgstr "Copying messages to %s"
+
+#: ../mail/mail-ops.c:1170
+msgid "Forwarded messages"
+msgstr "Forwarded messages"
+
+#: ../mail/mail-ops.c:1213
+#, c-format
+msgid "Opening folder %s"
+msgstr "Opening folder %s"
+
+#: ../mail/mail-ops.c:1285
+#, c-format
+msgid "Opening store %s"
+msgstr "Opening store %s"
+
+#: ../mail/mail-ops.c:1363
+#, c-format
+msgid "Removing folder %s"
+msgstr "Removing folder %s"
+
+#: ../mail/mail-ops.c:1457
+#, c-format
+msgid "Storing folder '%s'"
+msgstr "Storing folder '%s'"
+
+#: ../mail/mail-ops.c:1522
+#, c-format
+msgid "Expunging and storing account '%s'"
+msgstr "Expunging and storing account '%s'"
+
+#: ../mail/mail-ops.c:1523
+#, c-format
+msgid "Storing account '%s'"
+msgstr "Storing account '%s'"
+
+#: ../mail/mail-ops.c:1578
+msgid "Refreshing folder"
+msgstr "Refreshing folder"
+
+#: ../mail/mail-ops.c:1614
+#: ../mail/mail-ops.c:1665
+msgid "Expunging folder"
+msgstr "Expunging folder"
+
+#: ../mail/mail-ops.c:1662
+#, c-format
+msgid "Emptying trash in '%s'"
+msgstr "Emptying trash in '%s'"
+
+#: ../mail/mail-ops.c:1663
+msgid "Local Folders"
+msgstr "Local Folders"
+
+#: ../mail/mail-ops.c:1746
+#, c-format
+msgid "Retrieving message %s"
+msgstr "Retrieving message %s"
+
+#: ../mail/mail-ops.c:1856
+#, c-format
+msgid "Retrieving %d message"
+msgid_plural "Retrieving %d messages"
+msgstr[0] "Retrieving %d message"
+msgstr[1] "Retrieving %d messages"
+
+#: ../mail/mail-ops.c:1942
+#, c-format
+msgid "Saving %d message"
+msgid_plural "Saving %d messsages"
+msgstr[0] "Saving %d message"
+msgstr[1] "Saving %d messages"
+
+#: ../mail/mail-ops.c:2013
+#, c-format
+msgid ""
+"Error saving messages to: %s:\n"
+" %s"
+msgstr ""
+"Error saving messages to: %s:\n"
+" %s"
+
+#: ../mail/mail-ops.c:2085
+msgid "Saving attachment"
+msgstr "Saving attachment"
+
+#: ../mail/mail-ops.c:2098
+#: ../mail/mail-ops.c:2104
+#, c-format
+msgid ""
+"Cannot create output file: %s:\n"
+" %s"
+msgstr ""
+"Cannot create output file: %s:\n"
+" %s"
+
+#: ../mail/mail-ops.c:2114
+#, c-format
+msgid "Could not write data: %s"
+msgstr "Could not write data: %s"
+
+#: ../mail/mail-ops.c:2263
+#, c-format
+msgid "Disconnecting from %s"
+msgstr "Disconnecting from %s"
+
+#: ../mail/mail-ops.c:2263
+#, c-format
+msgid "Reconnecting to %s"
+msgstr "Reconnecting to %s"
+
+#: ../mail/mail-ops.c:2379
+msgid "Checking Service"
+msgstr "Checking Service"
+
+#: ../mail/mail-send-recv.c:161
+msgid "Canceling..."
+msgstr "Cancelling..."
+
+#: ../mail/mail-send-recv.c:403
+msgid "Send & Receive Mail"
+msgstr "Send & Receive Mail"
+
+#: ../mail/mail-send-recv.c:410
+msgid "Cancel _All"
+msgstr "Cancel _All"
+
+#: ../mail/mail-send-recv.c:516
+msgid "Updating..."
+msgstr "Updating..."
+
+#: ../mail/mail-send-recv.c:516
+#: ../mail/mail-send-recv.c:583
+msgid "Waiting..."
+msgstr "Waiting..."
+
+#: ../mail/mail-send-recv.c:791
+msgid "Checking for new mail"
+msgstr "Checking for new mail"
+
+#: ../mail/mail-session.c:200
+#, c-format
+msgid "Enter Passphrase for %s"
+msgstr "Enter Passphrase for %s"
+
+#: ../mail/mail-session.c:202
+msgid "Enter Passphrase"
+msgstr "Enter Passphrase"
+
+#: ../mail/mail-session.c:205
+#: ../plugins/exchange-operations/exchange-config-listener.c:711
+#, c-format
+msgid "Enter Password for %s"
+msgstr "Enter Password for %s"
+
+#: ../mail/mail-session.c:207
+msgid "Enter Password"
+msgstr "Enter Password"
+
+#: ../mail/mail-session.c:245
+msgid "User canceled operation."
+msgstr "User cancelled operation."
+
+#: ../mail/mail-signature-editor.c:384
+msgid "Edit signature"
+msgstr "Edit signature"
+
+#: ../mail/mail-signature-editor.c:431
+msgid "Enter a name for this signature."
+msgstr "Enter a name for this signature."
+
+#: ../mail/mail-signature-editor.c:434
+#: ../plugins/groupwise-features/properties.glade.h:4
+msgid "Name:"
+msgstr "Name:"
+
+#: ../mail/mail-tools.c:120
+#, c-format
+msgid "Could not create spool directory `%s': %s"
+msgstr "Could not create spool directory `%s': %s"
+
+#: ../mail/mail-tools.c:150
+#, c-format
+msgid "Trying to movemail a non-mbox source `%s'"
+msgstr "Trying to movemail a non-mbox source `%s'"
+
+#: ../mail/mail-tools.c:256
+#, c-format
+msgid "Forwarded message - %s"
+msgstr "Forwarded message - %s"
+
+#: ../mail/mail-tools.c:258
+msgid "Forwarded message"
+msgstr "Forwarded message"
+
+#: ../mail/mail-tools.c:298
+#, c-format
+msgid "Invalid folder: `%s'"
+msgstr "Invalid folder: `%s'"
+
+#: ../mail/mail-vfolder.c:91
+#, c-format
+msgid "Setting up Search Folder: %s"
+msgstr "Setting up Search Folder: %s"
+
+#: ../mail/mail-vfolder.c:240
+#, c-format
+msgid "Updating Search Folders for '%s:%s'"
+msgstr "Updating Search Folders for '%s:%s'"
+
+#: ../mail/mail-vfolder.c:247
+#, c-format
+msgid "Updating Search Folders for '%s'"
+msgstr "Updating Search Folders for '%s'"
+
+#: ../mail/mail-vfolder.c:1023
+msgid "Edit Search Folder"
+msgstr "Edit Search Folder"
+
+#: ../mail/mail-vfolder.c:1107
+msgid "New Search Folder"
+msgstr "New Search Folder"
+
#: ../mail/message-list.c:1022
msgid "Unseen"
msgstr "Unseen"
@@ -14641,7 +14649,7 @@ msgstr "?"
#. strftime format of a time,
#. in 12-hour format, without seconds.
#: ../mail/message-list.c:1476
-#: ../plugins/itip-formatter/itip-view.c:202
+#: ../plugins/itip-formatter/itip-view.c:201
#: ../widgets/table/e-cell-date.c:72
msgid "Today %l:%M %p"
msgstr "Today %l:%M %p"
@@ -14666,12 +14674,12 @@ msgstr "%d %b %l:%M %p"
msgid "%b %d %Y"
msgstr "%d %b %Y"
-#: ../mail/message-list.c:2263
+#: ../mail/message-list.c:2262
#: ../mail/message-list.etspec.h:9
msgid "Messages"
msgstr "Messages"
-#: ../mail/message-list.c:3654
+#: ../mail/message-list.c:3708
msgid "Generating message list"
msgstr "Generating message list"
@@ -14783,38 +14791,123 @@ msgstr "A formatter plugin which displays audio attachments inline and allows yo
msgid "Audio inline plugin"
msgstr "Audio inline plugin"
-#: ../plugins/backup-restore/backup-restore.c:51
-msgid "Select name of Evolution archive"
-msgstr "Select name of Evolution archive"
+#: ../plugins/backup-restore/backup.c:50
+#: ../plugins/backup-restore/backup.c:90
+msgid "Shutting down Evolution"
+msgstr "Shutting down Evolution"
-#: ../plugins/backup-restore/backup-restore.c:61
-msgid "_Restart Evolution after backup"
-msgstr "_Restart Evolution after backup"
+#: ../plugins/backup-restore/backup.c:55
+msgid "Backing Evolution accounts and settings"
+msgstr "Backing Evolution accounts and settings"
-#: ../plugins/backup-restore/backup-restore.c:89
-msgid "Select Evolution archive to restore"
-msgstr "Select Evolution archive to restore"
+#: ../plugins/backup-restore/backup.c:60
+msgid "Backing Evolution data (Mails, Contacts, Calendar, Tasks, Memos)"
+msgstr "Backing Evolution data (Mails, Contacts, Calendar, Tasks, Memos)"
-#: ../plugins/backup-restore/backup-restore.c:97
-msgid "_Restart Evolution after restore"
-msgstr "_Restart Evolution after restore"
+#: ../plugins/backup-restore/backup.c:70
+msgid "Backup complete"
+msgstr "Backup complete"
+
+#: ../plugins/backup-restore/backup.c:75
+#: ../plugins/backup-restore/backup.c:116
+msgid "Restarting Evolution"
+msgstr "Restarting Evolution"
+
+#: ../plugins/backup-restore/backup.c:94
+msgid "Backup current Evolution data"
+msgstr "Backup current Evolution data"
+
+#: ../plugins/backup-restore/backup.c:99
+msgid "Extracting files from the archive"
+msgstr "Extracting files from the archive"
+
+#: ../plugins/backup-restore/backup.c:105
+msgid "Loading Evolution settings"
+msgstr "Loading Evolution settings"
#: ../plugins/backup-restore/backup.c:109
+msgid "Removing temporary backup files"
+msgstr "Removing temporary backup files"
+
+#: ../plugins/backup-restore/backup.c:214
msgid "Backup Evolution directory"
msgstr "Backup Evolution directory"
-#: ../plugins/backup-restore/backup.c:111
+#: ../plugins/backup-restore/backup.c:216
msgid "Restore Evolution directory"
msgstr "Restore Evolution directory"
-#: ../plugins/backup-restore/backup.c:113
+#: ../plugins/backup-restore/backup.c:218
msgid "Check Evolution archive"
msgstr "Check Evolution archive"
-#: ../plugins/backup-restore/backup.c:115
+#: ../plugins/backup-restore/backup.c:220
msgid "Restart Evolution"
msgstr "Restart Evolution"
+#: ../plugins/backup-restore/backup.c:222
+msgid "With GUI"
+msgstr "With GUI"
+
+#: ../plugins/backup-restore/backup.c:247
+#, c-format
+msgid "Backing up to %s"
+msgstr "Backing up to %s"
+
+#: ../plugins/backup-restore/backup.c:252
+#, c-format
+msgid "Restoring from %s"
+msgstr "Restoring from %s"
+
+#. Backup / Restore only can have GUI. We should restrict the rest
+#: ../plugins/backup-restore/backup.c:268
+msgid "Evolution Backup"
+msgstr "Evolution Backup"
+
+#: ../plugins/backup-restore/backup.c:268
+msgid "Evolution Restore"
+msgstr "Evolution Restore"
+
+#: ../plugins/backup-restore/backup-restore.c:96
+msgid "Select name of the Evolution archive"
+msgstr "Select name of the Evolution archive"
+
+#: ../plugins/backup-restore/backup-restore.c:120
+msgid "_Restart Evolution after backup"
+msgstr "_Restart Evolution after backup"
+
+#: ../plugins/backup-restore/backup-restore.c:139
+msgid "Select name of the Evolution archive to restore"
+msgstr "Select name of the Evolution archive to restore"
+
+#: ../plugins/backup-restore/backup-restore.c:163
+msgid "_Restart Evolution after restore"
+msgstr "_Restart Evolution after restore"
+
+#: ../plugins/backup-restore/backup-restore.c:236
+msgid "Restore from backup"
+msgstr "Restore from backup"
+
+#: ../plugins/backup-restore/backup-restore.c:238
+msgid ""
+"You can restore Evolution from your archive. It can restore all the Mails/Calendars/Tasks/Memos/Addressbook. \n"
+"It also restores all your personal settings, mail filters etc."
+msgstr ""
+"You can restore Evolution from your archive. It can restore all the Mails/Calendars/Tasks/Memos/Addressbook. \n"
+"It also restores all your personal settings, mail filters etc."
+
+#: ../plugins/backup-restore/backup-restore.c:244
+msgid "_Restore Evolution from the backup archive"
+msgstr "_Restore Evolution from the backup archive"
+
+#: ../plugins/backup-restore/backup-restore.c:251
+msgid "Please select an Evolution Archive to restore:"
+msgstr "Please select an Evolution Archive to restore:"
+
+#: ../plugins/backup-restore/backup-restore.c:254
+msgid "Choose a file to restore"
+msgstr "Choose a file to restore"
+
#: ../plugins/backup-restore/org-gnome-backup-restore.eplug.xml.h:1
msgid "A plugin for backing up and restore Evolution data and settings."
msgstr "A plugin for backing up and restore Evolution data and settings."
@@ -14824,17 +14917,41 @@ msgstr "A plugin for backing up and restore Evolution data and settings."
msgid "Backup and restore plugin"
msgstr "Backup and restore plugin"
-#: ../plugins/backup-restore/org-gnome-backup-restore.xml.h:1
-msgid "Backup Settings..."
-msgstr "Backup Settings..."
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:1
+msgid "Are you sure you want to close Evolution?"
+msgstr "Are you sure you want to close Evolution?"
-#: ../plugins/backup-restore/org-gnome-backup-restore.xml.h:2
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:2
+msgid "Are you sure you want to restore Evolution from the selected archive?"
+msgstr "Are you sure you want to restore Evolution from the selected archive?"
+
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:3
+msgid "Evolution backup can start only when Evolution is not running. Please make sure that you save and close all your unsaved windows before proceeding. If you want Evolution to restart automatically after backup, please enable the toggle button."
+msgstr "Evolution backup can start only when Evolution is not running. Please make sure that you save and close all your unsaved windows before proceeding. If you want Evolution to restart automatically after backup, please enable the toggle button."
+
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:4
+msgid "Invalid Evolution archive"
+msgstr "Invalid Evolution archive"
+
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:5
+msgid "Please select a valid archive file to restore."
+msgstr "Please select a valid archive file to restore."
+
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:6
+msgid "This will delete all your current Evolution data and settings and restore them from your backup. Evolution restore can start only when Evolution is not running. Please make sure that you close all your unsaved windows before you proceed. If you want Evolution to restart automatically restart after restore, please enable the toggle button."
+msgstr "This will delete all your current Evolution data and settings and restore them from your backup. Evolution restore can start only when Evolution is not running. Please make sure that you close all your unsaved windows before you proceed. If you want Evolution to restart automatically restart after restore, please enable the toggle button."
+
+#: ../plugins/backup-restore/org-gnome-backup-restore.xml.h:1
msgid "Backup and restore Evolution data and settings"
msgstr "Backup and restore Evolution data and settings"
+#: ../plugins/backup-restore/org-gnome-backup-restore.xml.h:2
+msgid "R_estore Settings..."
+msgstr "R_estore Settings..."
+
#: ../plugins/backup-restore/org-gnome-backup-restore.xml.h:3
-msgid "Restore Settings..."
-msgstr "Restore Settings..."
+msgid "_Backup Settings..."
+msgstr "_Backup Settings..."
#: ../plugins/bbdb/bbdb.c:447
#: ../plugins/bbdb/bbdb.c:456
@@ -14877,6 +14994,18 @@ msgstr "Automatically fills your addressbook with names and email addresses as y
msgid "BBDB"
msgstr "BBDB"
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:292
+msgid "Convert mail text to _Unicode"
+msgstr "Convert mail text to _Unicode"
+
+#: ../plugins/bogo-junk-plugin/bogo-junk-plugin.schemas.in.in.h:1
+msgid "Convert mail text to Unicode"
+msgstr "Convert mail text to Unicode"
+
+#: ../plugins/bogo-junk-plugin/bogo-junk-plugin.schemas.in.in.h:2
+msgid "Convert message text to Unicode UTF-8 to unify spam/ham tokens coming from different character sets."
+msgstr "Convert message text to Unicode UTF-8 to unify spam/ham tokens coming from different character sets."
+
#: ../plugins/caldav/caldav-source.c:64
#: ../plugins/caldav/caldav-source.c:68
msgid "CalDAV"
@@ -15080,8 +15209,8 @@ msgid "Manage the delegate settings for Exchange account"
msgstr "Manage the delegate settings for Exchange account"
#: ../plugins/exchange-operations/exchange-account-setup.c:337
-msgid "Delegation Assitant"
-msgstr "Delegation Assitant"
+msgid "Delegation Assistant"
+msgstr "Delegation Assistant"
#. Miscelleneous settings
#: ../plugins/exchange-operations/exchange-account-setup.c:349
@@ -15119,18 +15248,18 @@ msgid "Ch_eck for Supported Types"
msgstr "Ch_eck for Supported Types"
#: ../plugins/exchange-operations/exchange-account-setup.c:949
-#: ../plugins/exchange-operations/exchange-contacts.c:213
+#: ../plugins/exchange-operations/exchange-contacts.c:212
#, c-format
msgid "%s KB"
msgstr "%s KB"
#: ../plugins/exchange-operations/exchange-account-setup.c:951
-#: ../plugins/exchange-operations/exchange-contacts.c:215
+#: ../plugins/exchange-operations/exchange-contacts.c:214
msgid "0 KB"
msgstr "0 KB"
#: ../plugins/exchange-operations/exchange-calendar.c:191
-#: ../plugins/exchange-operations/exchange-contacts.c:166
+#: ../plugins/exchange-operations/exchange-contacts.c:165
msgid ""
"Evolution is in offline mode. You cannot create or modify folders now.\n"
"Please switch to online mode for such operations."
@@ -15170,24 +15299,6 @@ msgstr "Your current password has expired. Please change your password now."
msgid "Your password will expire in the next %d days"
msgstr "Your password will expire in the next %d days"
-#. Custom
-#: ../plugins/exchange-operations/exchange-delegates-user.c:144
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:580
-#: ../widgets/table/e-table-header-item.c:1554
-msgid "Custom"
-msgstr "Custom"
-
-#: ../plugins/exchange-operations/exchange-delegates-user.c: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"
-msgstr "Permissions for %s"
-
#: ../plugins/exchange-operations/exchange-delegates.c:421
msgid "Delegate To"
msgstr "Delegate To"
@@ -15242,6 +15353,11 @@ msgstr "C_alendar:"
msgid "Co_ntacts:"
msgstr "Co_ntacts:"
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:6
+#: ../plugins/exchange-operations/exchange-delegates-user.c:190
+msgid "Delegate Permissions"
+msgstr "Delegate Permissions"
+
#: ../plugins/exchange-operations/exchange-delegates.glade.h:7
msgid "Delegates"
msgstr "Delegates"
@@ -15280,6 +15396,37 @@ msgstr "_Inbox:"
msgid "_Tasks:"
msgstr "_Tasks:"
+#. Custom
+#: ../plugins/exchange-operations/exchange-delegates-user.c:143
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:580
+#: ../widgets/table/e-table-header-item.c:1554
+msgid "Custom"
+msgstr "Custom"
+
+#: ../plugins/exchange-operations/exchange-delegates-user.c:201
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:188
+#, c-format
+msgid "Permissions for %s"
+msgstr "Permissions for %s"
+
+#: ../plugins/exchange-operations/exchange-folder.c:66
+#: ../plugins/exchange-operations/exchange-folder.c:229
+#: ../plugins/exchange-operations/exchange-folder.c:239
+msgid "Unsubscribe Folder..."
+msgstr "Unsubscribe Folder..."
+
+#: ../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:471
+#: ../plugins/exchange-operations/exchange-folder.c:526
+#, c-format
+msgid "Unsubscribe from \"%s\""
+msgstr "Unsubscribe from \"%s\""
+
#: ../plugins/exchange-operations/exchange-folder-permission.c:61
#: ../plugins/exchange-operations/org-gnome-folder-permissions.xml.h:2
msgid "Permissions..."
@@ -15302,23 +15449,9 @@ msgstr "Subscribe to Other User's Folder"
msgid "Exchange Folder Tree"
msgstr "Exchange Folder Tree"
-#: ../plugins/exchange-operations/exchange-folder.c:66
-#: ../plugins/exchange-operations/exchange-folder.c:229
-#: ../plugins/exchange-operations/exchange-folder.c:239
-msgid "Unsubscribe Folder..."
-msgstr "Unsubscribe Folder..."
-
-#: ../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:471
-#: ../plugins/exchange-operations/exchange-folder.c:526
-#, c-format
-msgid "Unsubscribe from \"%s\""
-msgstr "Unsubscribe from \"%s\""
+#: ../plugins/exchange-operations/exchange-oof.glade.h:10
+msgid "No, Don't Change Status"
+msgstr "No, Don't Change Status"
#: ../plugins/exchange-operations/exchange-passwd-expiry.glade.h:1
msgid "Password Expiry Warning..."
@@ -15400,10 +15533,6 @@ msgstr "Read items"
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-send-options.glade.h:1
msgid "<b>Message Settings</b>"
msgstr "<b>Message Settings</b>"
@@ -15454,11 +15583,11 @@ msgstr "Request a _read receipt for this message"
msgid "_Sensitivity: "
msgstr "_Sensitivity: "
-#: ../plugins/exchange-operations/exchange-user-dialog.c:144
+#: ../plugins/exchange-operations/exchange-user-dialog.c:143
msgid "Select User"
msgstr "Select User"
-#: ../plugins/exchange-operations/exchange-user-dialog.c:182
+#: ../plugins/exchange-operations/exchange-user-dialog.c:181
msgid "Address Book..."
msgstr "Address Book..."
@@ -15605,7 +15734,7 @@ msgid "Folder offline"
msgstr "Folder offline"
#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:38
-#: ../shell/e-shell.c:1271
+#: ../shell/e-shell.c:1272
msgid "Generic error"
msgstr "Generic error"
@@ -15796,7 +15925,7 @@ msgstr "Unsubscribe Folders"
msgid "_Unsubscribe"
msgstr "_Unsubscribe"
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:434
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:432
msgid "Checklist"
msgstr "Checklist"
@@ -15991,26 +16120,26 @@ msgstr "_Read"
msgid "_Write"
msgstr "_Write"
-#: ../plugins/groupwise-features/proxy-listing.glade.h:1
-msgid "Proxy"
-msgstr "Proxy"
-
-#: ../plugins/groupwise-features/proxy-login-dialog.glade.h:1
-msgid "<b>Account Name</b>"
-msgstr "<b>Account Name</b>"
-
-#: ../plugins/groupwise-features/proxy-login-dialog.glade.h:2
-msgid "Proxy Login"
-msgstr "Proxy Login"
-
+#: ../plugins/groupwise-features/proxy.c:503
#: ../plugins/groupwise-features/proxy-login.c:220
#: ../plugins/groupwise-features/proxy-login.c:262
-#: ../plugins/groupwise-features/proxy.c:503
#: ../plugins/groupwise-features/send-options.c:83
#, c-format
msgid "%sEnter password for %s (user %s)"
msgstr "%sEnter password for %s (user %s)"
+#: ../plugins/groupwise-features/proxy.c:697
+msgid "The Proxy tab will be available only when the account is online."
+msgstr "The Proxy tab will be available only when the account is online."
+
+#: ../plugins/groupwise-features/proxy.c:702
+msgid "The Proxy tab will be available only when the account is enabled."
+msgstr "The Proxy tab will be available only when the account is enabled."
+
+#: ../plugins/groupwise-features/proxy-listing.glade.h:1
+msgid "Proxy"
+msgstr "Proxy"
+
#. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a groupwise
#. * feature by which one person can send/read mails/appointments using another person's identity
#. * without knowing his password, for example if that other person is on vacation
@@ -16018,19 +16147,27 @@ msgstr "%sEnter password for %s (user %s)"
msgid "_Proxy Login..."
msgstr "_Proxy Login..."
-#: ../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-login-dialog.glade.h:1
+msgid "<b>Account Name</b>"
+msgstr "<b>Account Name</b>"
-#: ../plugins/groupwise-features/proxy.c:702
-msgid "The Proxy tab will be available only when the account is enabled."
-msgstr "The Proxy tab will be available only when the account is enabled."
+#: ../plugins/groupwise-features/proxy-login-dialog.glade.h:2
+msgid "Proxy Login"
+msgstr "Proxy Login"
-#: ../plugins/groupwise-features/share-folder-common.c:322
#: ../plugins/groupwise-features/share-folder.c:760
+#: ../plugins/groupwise-features/share-folder-common.c:322
msgid "Users"
msgstr "Users"
+#: ../plugins/groupwise-features/share-folder.c:765
+msgid "Add "
+msgstr "Add "
+
+#: ../plugins/groupwise-features/share-folder.c:771
+msgid "Modify"
+msgstr "Modify"
+
#: ../plugins/groupwise-features/share-folder-common.c:323
msgid "Enter the users and set permissions"
msgstr "Enter the users and set permissions"
@@ -16043,44 +16180,56 @@ msgstr "New _Shared Folder..."
msgid "Sharing"
msgstr "Sharing"
-#: ../plugins/groupwise-features/share-folder.c:765
-msgid "Add "
-msgstr "Add "
-
-#: ../plugins/groupwise-features/share-folder.c:771
-msgid "Modify"
-msgstr "Modify"
-
-#: ../plugins/groupwise-features/status-track.c:118
+#: ../plugins/groupwise-features/status-track.c:103
msgid "Message Status"
msgstr "Message Status"
#. Subject
-#: ../plugins/groupwise-features/status-track.c:132
+#: ../plugins/groupwise-features/status-track.c:117
msgid "<b>Subject</b> :"
msgstr "<b>Subject</b> :"
-#: ../plugins/groupwise-features/status-track.c:144
+#: ../plugins/groupwise-features/status-track.c:129
msgid "<b>From</b> :"
msgstr "<b>From</b> :"
-#: ../plugins/groupwise-features/status-track.c:157
+#: ../plugins/groupwise-features/status-track.c:142
msgid "<b>Creation date</b> :"
msgstr "<b>Creation date</b> :"
-#: ../plugins/groupwise-features/status-track.c:177
-msgid "<b>Recipients </b>"
-msgstr "<b>Recipients </b>"
-
-#: ../plugins/groupwise-features/status-track.c:181
-msgid "<b>Action</b>"
-msgstr "<b>Action</b>"
+#: ../plugins/groupwise-features/status-track.c:178
+msgid "Recipient: "
+msgstr "Recipient: "
#: ../plugins/groupwise-features/status-track.c:185
-msgid "<b>Date and Time</b>"
-msgstr "<b>Date and Time</b>"
+msgid "Delivered: "
+msgstr "Delivered: "
+
+#: ../plugins/groupwise-features/status-track.c:191
+msgid "Opened: "
+msgstr "Opened: "
+
+#: ../plugins/groupwise-features/status-track.c:196
+msgid "Accepted: "
+msgstr "Accepted: "
+
+#: ../plugins/groupwise-features/status-track.c:201
+msgid "Deleted: "
+msgstr "Deleted: "
-#: ../plugins/groupwise-features/status-track.c:242
+#: ../plugins/groupwise-features/status-track.c:206
+msgid "Declined: "
+msgstr "Declined: "
+
+#: ../plugins/groupwise-features/status-track.c:211
+msgid "Completed: "
+msgstr "Completed: "
+
+#: ../plugins/groupwise-features/status-track.c:216
+msgid "Un-delivered: "
+msgstr "Un-delivered: "
+
+#: ../plugins/groupwise-features/status-track.c:241
msgid "Track Message Status..."
msgstr "Track Message Status..."
@@ -16160,20 +16309,20 @@ msgstr "_Import to Calendar"
msgid "_Import to Tasks"
msgstr "_Import to Tasks"
-#: ../plugins/import-ics-attachments/icsimporter.c:203
+#: ../plugins/import-ics-attachments/icsimporter.c:206
msgid "Import ICS"
msgstr "Import ICS"
-#: ../plugins/import-ics-attachments/icsimporter.c:231
+#: ../plugins/import-ics-attachments/icsimporter.c:233
msgid "Select Task List"
msgstr "Select Task List"
-#: ../plugins/import-ics-attachments/icsimporter.c:235
+#: ../plugins/import-ics-attachments/icsimporter.c:237
msgid "Select Calendar"
msgstr "Select Calendar"
-#: ../plugins/import-ics-attachments/icsimporter.c:266
-#: ../shell/e-shell-importer.c:714
+#: ../plugins/import-ics-attachments/icsimporter.c:267
+#: ../shell/e-shell-importer.c:700
msgid "_Import"
msgstr "_Import"
@@ -16188,13 +16337,13 @@ msgstr "Imports ICS attachments to calendar."
#: ../plugins/ipod-sync/evolution-ipod-sync.c:62
msgid ""
-"<span weight=\"bold\" size=\"larger\">Search for a iPod failed</span>\n"
+"<span weight=\"bold\" size=\"larger\">Search for an iPod failed</span>\n"
"\n"
-"Evolution could not find a iPod to synchronize with.Either it is not connected to the system or it is not powered on."
+"Evolution could not find an iPod to synchronize with. Either the iPod is not connected to the system or it is not powered on."
msgstr ""
"<span weight=\"bold\" size=\"larger\">Search for an iPod failed</span>\n"
"\n"
-"Evolution could not find an iPod to synchronise with; either the iPod is not connected to the system or it is not powered on."
+"Evolution could not find an iPod to synchronise with. Either the iPod is not connected to the system or it is not powered on."
#: ../plugins/ipod-sync/ical-format.c:137
#: ../plugins/save-calendar/ical-format.c:194
@@ -16382,402 +16531,402 @@ msgid "Select the calendars to search for meeting conflicts"
msgstr "Select the calendars to search for meeting conflicts"
#. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:188
+#: ../plugins/itip-formatter/itip-view.c:187
#: ../ui/evolution-calendar.xml.h:34
-#: ../widgets/misc/e-cell-date-edit.c:241
+#: ../widgets/misc/e-cell-date-edit.c:239
msgid "Today"
msgstr "Today"
#. strftime format of a time,
#. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:193
+#: ../plugins/itip-formatter/itip-view.c:192
msgid "Today %H:%M"
msgstr "Today %H:%M"
#. strftime format of a time,
#. in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:197
+#: ../plugins/itip-formatter/itip-view.c:196
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:206
+#: ../plugins/itip-formatter/itip-view.c:205
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:216
+#: ../plugins/itip-formatter/itip-view.c:215
msgid "Tomorrow"
msgstr "Tomorrow"
#. strftime format of a time,
#. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:221
+#: ../plugins/itip-formatter/itip-view.c:220
msgid "Tomorrow %H:%M"
msgstr "Tomorrow %H:%M"
#. strftime format of a time,
#. in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:225
+#: ../plugins/itip-formatter/itip-view.c:224
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:230
+#: ../plugins/itip-formatter/itip-view.c:229
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:234
+#: ../plugins/itip-formatter/itip-view.c:233
msgid "Tomorrow %l:%M:%S %p"
msgstr "Tomorrow %l:%M:%S %p"
#. strftime format of a weekday.
-#: ../plugins/itip-formatter/itip-view.c:253
+#: ../plugins/itip-formatter/itip-view.c:252
#, 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:258
+#: ../plugins/itip-formatter/itip-view.c:257
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:262
+#: ../plugins/itip-formatter/itip-view.c:261
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:267
+#: ../plugins/itip-formatter/itip-view.c:266
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:271
+#: ../plugins/itip-formatter/itip-view.c:270
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:280
+#: ../plugins/itip-formatter/itip-view.c:279
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:286
+#: ../plugins/itip-formatter/itip-view.c:285
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:290
+#: ../plugins/itip-formatter/itip-view.c:289
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:295
+#: ../plugins/itip-formatter/itip-view.c:294
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:299
+#: ../plugins/itip-formatter/itip-view.c:298
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:305
+#: ../plugins/itip-formatter/itip-view.c:304
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:310
+#: ../plugins/itip-formatter/itip-view.c:309
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:314
+#: ../plugins/itip-formatter/itip-view.c:313
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:319
+#: ../plugins/itip-formatter/itip-view.c:318
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:323
+#: ../plugins/itip-formatter/itip-view.c:322
msgid "%A, %B %e, %Y %l:%M:%S %p"
msgstr "%A, %B %e, %Y %l:%M:%S %p"
-#: ../plugins/itip-formatter/itip-view.c:348
+#: ../plugins/itip-formatter/itip-view.c:347
#, 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:350
+#: ../plugins/itip-formatter/itip-view.c:349
#, 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:355
+#: ../plugins/itip-formatter/itip-view.c:354
#, 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:358
+#: ../plugins/itip-formatter/itip-view.c:357
#, 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:360
+#: ../plugins/itip-formatter/itip-view.c:359
#, 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:366
+#: ../plugins/itip-formatter/itip-view.c:365
#, 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:368
+#: ../plugins/itip-formatter/itip-view.c:367
#, 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:371
+#: ../plugins/itip-formatter/itip-view.c:370
#, 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:374
+#: ../plugins/itip-formatter/itip-view.c:373
#, 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:378
+#: ../plugins/itip-formatter/itip-view.c:377
#, c-format
msgid "<b>%s</b> through %s has canceled the following meeting:"
msgstr "<b>%s</b> through %s has cancelled the following meeting:"
-#: ../plugins/itip-formatter/itip-view.c:380
+#: ../plugins/itip-formatter/itip-view.c:379
#, c-format
msgid "<b>%s</b> has canceled the following meeting."
msgstr "<b>%s</b> has cancelled the following meeting."
-#: ../plugins/itip-formatter/itip-view.c:383
+#: ../plugins/itip-formatter/itip-view.c:382
#, 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:387
+#: ../plugins/itip-formatter/itip-view.c:386
#, 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:389
+#: ../plugins/itip-formatter/itip-view.c:388
#, 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:416
+#: ../plugins/itip-formatter/itip-view.c:415
#, 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:418
+#: ../plugins/itip-formatter/itip-view.c:417
#, 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:423
+#: ../plugins/itip-formatter/itip-view.c:422
#, 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:426
+#: ../plugins/itip-formatter/itip-view.c:425
#, 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:428
+#: ../plugins/itip-formatter/itip-view.c:427
#, 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:434
+#: ../plugins/itip-formatter/itip-view.c:433
#, 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:436
+#: ../plugins/itip-formatter/itip-view.c:435
#, 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:439
+#: ../plugins/itip-formatter/itip-view.c:438
#, 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:442
+#: ../plugins/itip-formatter/itip-view.c:441
#, 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:446
+#: ../plugins/itip-formatter/itip-view.c:445
#, c-format
msgid "<b>%s</b> through %s has canceled the following assigned task:"
msgstr "<b>%s</b> through %s has cancelled the following assigned task:"
-#: ../plugins/itip-formatter/itip-view.c:448
+#: ../plugins/itip-formatter/itip-view.c:447
#, c-format
msgid "<b>%s</b> has canceled the following assigned task:"
msgstr "<b>%s</b> has cancelled the following assigned task:"
-#: ../plugins/itip-formatter/itip-view.c:451
+#: ../plugins/itip-formatter/itip-view.c:450
#, 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:455
+#: ../plugins/itip-formatter/itip-view.c:454
#, 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:457
+#: ../plugins/itip-formatter/itip-view.c:456
#, 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
+#: ../plugins/itip-formatter/itip-view.c:483
#, 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
+#: ../plugins/itip-formatter/itip-view.c:485
#, 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
+#: ../plugins/itip-formatter/itip-view.c:490
#, 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
+#: ../plugins/itip-formatter/itip-view.c:492
#, 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
+#: ../plugins/itip-formatter/itip-view.c:496
#, 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
+#: ../plugins/itip-formatter/itip-view.c:498
#, 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
+#: ../plugins/itip-formatter/itip-view.c:762
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
+#: ../plugins/itip-formatter/itip-view.c:768
+#: ../plugins/itip-formatter/itip-view.c:772
+#: ../plugins/itip-formatter/itip-view.c:778
+#: ../plugins/itip-formatter/itip-view.c:795
+#: ../plugins/itip-formatter/itip-view.c:800
msgid "_Decline"
msgstr "_Decline"
-#: ../plugins/itip-formatter/itip-view.c:762
-#: ../plugins/itip-formatter/itip-view.c:767
+#: ../plugins/itip-formatter/itip-view.c:769
#: ../plugins/itip-formatter/itip-view.c:774
-#: ../plugins/itip-formatter/itip-view.c:790
-#: ../plugins/itip-formatter/itip-view.c:795
+#: ../plugins/itip-formatter/itip-view.c:781
+#: ../plugins/itip-formatter/itip-view.c:797
+#: ../plugins/itip-formatter/itip-view.c:802
msgid "_Accept"
msgstr "_Accept"
-#: ../plugins/itip-formatter/itip-view.c:765
+#: ../plugins/itip-formatter/itip-view.c:772
msgid "_Decline all"
msgstr "_Decline all"
-#: ../plugins/itip-formatter/itip-view.c:766
+#: ../plugins/itip-formatter/itip-view.c:773
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
+#: ../plugins/itip-formatter/itip-view.c:773
+#: ../plugins/itip-formatter/itip-view.c:779
+#: ../plugins/itip-formatter/itip-view.c:796
+#: ../plugins/itip-formatter/itip-view.c:801
msgid "_Tentative"
msgstr "_Tentative"
-#: ../plugins/itip-formatter/itip-view.c:767
+#: ../plugins/itip-formatter/itip-view.c:774
msgid "_Accept all"
msgstr "_Accept all"
#. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:778
+#: ../plugins/itip-formatter/itip-view.c:785
msgid "_Send Information"
msgstr "_Send Information"
#. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:782
+#: ../plugins/itip-formatter/itip-view.c:789
msgid "_Update Attendee Status"
msgstr "_Update Attendee Status"
-#: ../plugins/itip-formatter/itip-view.c:785
+#: ../plugins/itip-formatter/itip-view.c:792
msgid "_Update"
msgstr "_Update"
#. Start time
-#: ../plugins/itip-formatter/itip-view.c:944
+#: ../plugins/itip-formatter/itip-view.c:951
msgid "Start time:"
msgstr "Start time:"
#. End time
-#: ../plugins/itip-formatter/itip-view.c:953
+#: ../plugins/itip-formatter/itip-view.c:960
msgid "End time:"
msgstr "End time:"
#. Comment
-#: ../plugins/itip-formatter/itip-view.c:969
-#: ../plugins/itip-formatter/itip-view.c:1019
+#: ../plugins/itip-formatter/itip-view.c:976
+#: ../plugins/itip-formatter/itip-view.c:1026
msgid "Comment:"
msgstr "Comment:"
-#: ../plugins/itip-formatter/itip-view.c:1033
+#: ../plugins/itip-formatter/itip-view.c:1040
msgid "Send u_pdates to attendees"
msgstr "Send u_pdates to attendees"
-#: ../plugins/itip-formatter/itip-view.c:1042
+#: ../plugins/itip-formatter/itip-view.c:1049
msgid "A_pply to all instances"
msgstr "A_pply to all instances"
-#: ../plugins/itip-formatter/itip-view.c:1711
+#: ../plugins/itip-formatter/itip-view.c:1718
msgid "_Tasks :"
msgstr "_Tasks :"
-#: ../plugins/itip-formatter/itip-view.c:1713
+#: ../plugins/itip-formatter/itip-view.c:1720
msgid "Memos :"
msgstr "Memos :"
@@ -16813,61 +16962,6 @@ msgstr "Allows disabling of accounts."
msgid "Disable Account"
msgstr "Disable Account"
-#: ../plugins/mail-remote/client.c:30
-#, c-format
-msgid "System error: %s"
-msgstr "System error: %s"
-
-#: ../plugins/mail-remote/client.c:32
-#, c-format
-msgid "Camel error: %s"
-msgstr "Camel error: %s"
-
-#: ../plugins/mail-remote/evolution-mail-store.c:476
-msgid "Account cannot send e-mail"
-msgstr "Account cannot send e-mail"
-
-#: ../plugins/mail-remote/evolution-mail-store.c:605
-msgid "No store available"
-msgstr "No store available"
-
-#: ../plugins/mail-remote/org-gnome-evolution-mail-remote.eplug.xml.h:1
-msgid "A plugin which implements a CORBA interface for accessing mail data remotely."
-msgstr "A plugin which implements a CORBA interface for accessing mail data remotely."
-
-#: ../plugins/mail-remote/org-gnome-evolution-mail-remote.eplug.xml.h:2
-msgid "Mail Remote"
-msgstr "Mail Remote"
-
-#: ../plugins/mail-to-meeting/org-gnome-mail-to-meeting.eplug.xml.h:1
-msgid "A plugin which allows the creation of meetings from the contents of a mail message."
-msgstr "A plugin which allows the creation of meetings from the contents of a mail message."
-
-#: ../plugins/mail-to-meeting/org-gnome-mail-to-meeting.eplug.xml.h:2
-msgid "Con_vert to Meeting"
-msgstr "Con_vert to Meeting"
-
-#: ../plugins/mail-to-meeting/org-gnome-mail-to-meeting.eplug.xml.h:3
-msgid "Mail to meeting"
-msgstr "Mail to meeting"
-
-#: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:1
-msgid "A plugin which allows the creation of tasks from the contents of a mail message."
-msgstr "A plugin which allows the creation of tasks from the contents of a mail message."
-
-#: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:2
-#: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:1
-msgid "Con_vert to Task"
-msgstr "Con_vert to Task"
-
-#: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:3
-msgid "Mail to task"
-msgstr "Mail to task"
-
-#: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:2
-msgid "Convert the selected message to a new task"
-msgstr "Convert the selected message to a new task"
-
#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:1
msgid "Contact list _owner"
msgstr "Contact list _owner"
@@ -17019,6 +17113,61 @@ msgstr "_Subscribe to List"
msgid "_Unsubscribe from List"
msgstr "_Unsubscribe from List"
+#: ../plugins/mail-remote/client.c:30
+#, c-format
+msgid "System error: %s"
+msgstr "System error: %s"
+
+#: ../plugins/mail-remote/client.c:32
+#, c-format
+msgid "Camel error: %s"
+msgstr "Camel error: %s"
+
+#: ../plugins/mail-remote/evolution-mail-store.c:476
+msgid "Account cannot send e-mail"
+msgstr "Account cannot send e-mail"
+
+#: ../plugins/mail-remote/evolution-mail-store.c:605
+msgid "No store available"
+msgstr "No store available"
+
+#: ../plugins/mail-remote/org-gnome-evolution-mail-remote.eplug.xml.h:1
+msgid "A plugin which implements a CORBA interface for accessing mail data remotely."
+msgstr "A plugin which implements a CORBA interface for accessing mail data remotely."
+
+#: ../plugins/mail-remote/org-gnome-evolution-mail-remote.eplug.xml.h:2
+msgid "Mail Remote"
+msgstr "Mail Remote"
+
+#: ../plugins/mail-to-meeting/org-gnome-mail-to-meeting.eplug.xml.h:1
+msgid "A plugin which allows the creation of meetings from the contents of a mail message."
+msgstr "A plugin which allows the creation of meetings from the contents of a mail message."
+
+#: ../plugins/mail-to-meeting/org-gnome-mail-to-meeting.eplug.xml.h:2
+msgid "Con_vert to Meeting"
+msgstr "Con_vert to Meeting"
+
+#: ../plugins/mail-to-meeting/org-gnome-mail-to-meeting.eplug.xml.h:3
+msgid "Mail to meeting"
+msgstr "Mail to meeting"
+
+#: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:1
+msgid "A plugin which allows the creation of tasks from the contents of a mail message."
+msgstr "A plugin which allows the creation of tasks from the contents of a mail message."
+
+#: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:2
+#: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:1
+msgid "Con_vert to Task"
+msgstr "Con_vert to Task"
+
+#: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:3
+msgid "Mail to task"
+msgstr "Mail to task"
+
+#: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:2
+msgid "Convert the selected message to a new task"
+msgstr "Convert the selected message to a new task"
+
#: ../plugins/mark-all-read/org-gnome-mark-all-read.eplug.xml.h:1
msgid "Mark All Read"
msgstr "Mark All Read"
@@ -17090,8 +17239,8 @@ msgid "Author(s)"
msgstr "Author(s)"
#: ../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
+#: ../widgets/table/e-table-config-no-group.glade.h:6
msgid "Description"
msgstr "Description"
@@ -17143,6 +17292,10 @@ msgstr "HTML Mode"
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.eplug.xml.h:2
+msgid "Print Message"
+msgstr "Print Message"
+
#: ../plugins/print-message/org-gnome-print-message.xml.h:1
#: ../ui/evolution-addressbook.xml.h:27
#: ../ui/evolution-calendar.xml.h:21
@@ -17252,17 +17405,25 @@ 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/em-junk-filter.c:107
+msgid "SpamAssassin (built-in)"
+msgstr "SpamAssassin (built-in)"
+
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:841
+msgid "This will make Spamassasin more reliable, but slower"
+msgstr "This will make Spamassasin more reliable, but slower"
+
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:847
+msgid "I_nclude remote tests"
+msgstr "I_nclude remote tests"
#: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:1
-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."
+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 "Spamassassin junk plugin"
-msgstr "Spamassassin junk plugin"
+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."
@@ -17270,7 +17431,7 @@ msgstr "A plugin for saving all attachments or parts of a message at once."
#. the path to the shared library
#: ../plugins/save-attachments/org-gnome-save-attachments.eplug.xml.h:3
-#: ../plugins/save-attachments/save-attachments.c:334
+#: ../plugins/save-attachments/save-attachments.c:330
msgid "Save attachments"
msgstr "Save attachments"
@@ -17282,15 +17443,15 @@ msgstr "Save Attachments..."
msgid "Save all attachments"
msgstr "Save all attachments"
-#: ../plugins/save-attachments/save-attachments.c:340
+#: ../plugins/save-attachments/save-attachments.c:336
msgid "Select save base name"
msgstr "Select save base name"
-#: ../plugins/save-attachments/save-attachments.c:359
+#: ../plugins/save-attachments/save-attachments.c:355
msgid "MIME Type"
msgstr "MIME Type"
-#: ../plugins/save-attachments/save-attachments.c:367
+#: ../plugins/save-attachments/save-attachments.c:363
#: ../ui/evolution-editor.xml.h:12
#: ../ui/evolution-message-composer.xml.h:20
msgid "Save"
@@ -17431,15 +17592,15 @@ msgstr "A plugin that handles the Startup wizard."
msgid "Startup wizard"
msgstr "Startup wizard"
-#: ../plugins/startup-wizard/startup-wizard.c:85
+#: ../plugins/startup-wizard/startup-wizard.c:84
msgid "Evolution Setup Assistant"
msgstr "Evolution Setup Assistant"
-#: ../plugins/startup-wizard/startup-wizard.c:88
+#: ../plugins/startup-wizard/startup-wizard.c:87
msgid "Welcome"
msgstr "Welcome"
-#: ../plugins/startup-wizard/startup-wizard.c:89
+#: ../plugins/startup-wizard/startup-wizard.c:88
msgid ""
"Welcome to Evolution. The next few screens will allow Evolution to connect to your email accounts, and to import files from other applications. \n"
"\n"
@@ -17449,23 +17610,23 @@ msgstr ""
"\n"
"Please click the \"Forward\" button to continue. "
-#: ../plugins/startup-wizard/startup-wizard.c:136
+#: ../plugins/startup-wizard/startup-wizard.c:134
msgid "Importing files"
msgstr "Importing files"
-#: ../plugins/startup-wizard/startup-wizard.c:138
-#: ../shell/e-shell-importer.c:149
+#: ../plugins/startup-wizard/startup-wizard.c:136
+#: ../shell/e-shell-importer.c:147
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:153
-#: ../shell/e-shell-importer.c:411
+#: ../plugins/startup-wizard/startup-wizard.c:151
+#: ../shell/e-shell-importer.c:397
#, c-format
msgid "From %s:"
msgstr "From %s:"
-#: ../plugins/startup-wizard/startup-wizard.c:233
-#: ../shell/e-shell-importer.c:522
+#: ../plugins/startup-wizard/startup-wizard.c:231
+#: ../shell/e-shell-importer.c:508
msgid "Importing data."
msgstr "Importing data."
@@ -17486,22 +17647,6 @@ msgstr "Thread messages by subject"
msgid "Fall back to threading messages by sub_ject"
msgstr "Fall back to threading messages by sub_ject"
-#: ../shell/GNOME_Evolution_Shell.server.in.in.h:1
-msgid "Evolution Shell"
-msgstr "Evolution Shell"
-
-#: ../shell/GNOME_Evolution_Shell.server.in.in.h:2
-msgid "Evolution Shell Config factory"
-msgstr "Evolution Shell Config factory"
-
-#: ../shell/GNOME_Evolution_Test.server.in.in.h:1
-msgid "Evolution Test"
-msgstr "Evolution Test"
-
-#: ../shell/GNOME_Evolution_Test.server.in.in.h:2
-msgid "Evolution Test component"
-msgstr "Evolution Test component"
-
#: ../shell/apps_evolution_shell.schemas.in.in.h:1
msgid "A string description of the current printer settings"
msgstr "A string description of the current printer settings"
@@ -17547,7 +17692,7 @@ msgid "Skip development warning dialog"
msgstr "Skip development warning dialogue"
#: ../shell/apps_evolution_shell.schemas.in.in.h:12
-#: ../shell/main.c:472
+#: ../shell/main.c:456
msgid "Start in offline mode"
msgstr "Start in offline mode"
@@ -17631,16 +17776,43 @@ msgstr "Active Connections"
msgid "Click OK to close these connections and go offline"
msgstr "Click OK to close these connections and go offline"
+#: ../shell/e-shell.c:636
+msgid "Uknown system error."
+msgstr "Uknown system error."
+
+#: ../shell/e-shell.c:832
+#: ../shell/e-shell.c:833
+#, c-format
+msgid "%ld KB"
+msgstr "%ld KB"
+
+#: ../shell/e-shell.c:1264
+#: ../widgets/misc/e-cell-date-edit.c:255
+msgid "OK"
+msgstr "OK"
+
+#: ../shell/e-shell.c:1266
+msgid "Invalid arguments"
+msgstr "Invalid arguments"
+
+#: ../shell/e-shell.c:1268
+msgid "Cannot register on OAF"
+msgstr "Cannot register on OAF"
+
+#: ../shell/e-shell.c:1270
+msgid "Configuration Database not found"
+msgstr "Configuration Database not found"
+
#: ../shell/e-shell-folder-title-bar.c:584
#: ../shell/e-shell-folder-title-bar.c:585
msgid "(Untitled)"
msgstr "(Untitled)"
-#: ../shell/e-shell-importer.c:137
+#: ../shell/e-shell-importer.c:135
msgid "Choose the type of importer to run:"
msgstr "Choose the type of importer to run:"
-#: ../shell/e-shell-importer.c:140
+#: ../shell/e-shell-importer.c:138
msgid ""
"Choose the file that you want to import into Evolution, and select what type of file it is from the list.\n"
"\n"
@@ -17650,11 +17822,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:146
+#: ../shell/e-shell-importer.c:144
msgid "Choose the destination for this import"
msgstr "Choose the destination for this import"
-#: ../shell/e-shell-importer.c:152
+#: ../shell/e-shell-importer.c:150
msgid ""
"Evolution checked for settings to import from the following\n"
"applications: Pine, Netscape, Elm, iCalendar. No importable\n"
@@ -17666,28 +17838,27 @@ msgstr ""
"settings found. If you would like to\n"
"try again, please click the \"Back\" button.\n"
-#: ../shell/e-shell-importer.c:291
+#: ../shell/e-shell-importer.c:285
msgid "F_ilename:"
msgstr "F_ilename:"
-#: ../shell/e-shell-importer.c:297
-#: ../shell/e-shell-importer.c:300
+#: ../shell/e-shell-importer.c:290
msgid "Select a file"
msgstr "Select a file"
-#: ../shell/e-shell-importer.c:313
+#: ../shell/e-shell-importer.c:299
msgid "File _type:"
msgstr "File _type:"
-#: ../shell/e-shell-importer.c:349
+#: ../shell/e-shell-importer.c:335
msgid "Import data and settings from _older programs"
msgstr "Import data and settings from _older programs"
-#: ../shell/e-shell-importer.c:352
+#: ../shell/e-shell-importer.c:338
msgid "Import a _single file"
msgstr "Import a _single file"
-#: ../shell/e-shell-settings-dialog.c:318
+#: ../shell/e-shell-settings-dialog.c:319
msgid "Evolution Preferences"
msgstr "Evolution Preferences"
@@ -17711,6 +17882,23 @@ msgstr "Folder name cannot contain the character \"#\"."
msgid "'.' and '..' are reserved folder names."
msgstr "'.' and '..' are reserved folder names."
+#: ../shell/e-shell-window.c:381
+msgid "Evolution is currently online. Click on this button to work offline."
+msgstr "Evolution is currently online. Click on this button to work offline."
+
+#: ../shell/e-shell-window.c:389
+msgid "Evolution is in the process of going offline."
+msgstr "Evolution is in the process of going offline."
+
+#: ../shell/e-shell-window.c:396
+msgid "Evolution is currently offline. Click on this button to work online."
+msgstr "Evolution is currently offline. Click on this button to work online."
+
+#: ../shell/e-shell-window.c:820
+#, c-format
+msgid "Switch to %s"
+msgstr "Switch to %s"
+
#: ../shell/e-shell-window-commands.c:76
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."
@@ -17731,73 +17919,29 @@ msgstr "Bug buddy could not be run."
#. The translator-credits string is for translators to list
#. * per-language credits for translation, displayed in the
#. * about dialog.
-#: ../shell/e-shell-window-commands.c:565
+#: ../shell/e-shell-window-commands.c:575
msgid "translator-credits"
msgstr ""
"Gareth Owen <gowen72@yahoo.com>\n"
"David Lodge <dave@cirt.net>"
-#: ../shell/e-shell-window-commands.c:576
+#: ../shell/e-shell-window-commands.c:586
msgid "Evolution Website"
msgstr "Evolution Website"
-#: ../shell/e-shell-window-commands.c:782
+#: ../shell/e-shell-window-commands.c:793
msgid "_Work Online"
msgstr "_Work Online"
-#: ../shell/e-shell-window-commands.c:795
+#: ../shell/e-shell-window-commands.c:806
#: ../ui/evolution.xml.h:55
msgid "_Work Offline"
msgstr "_Work Offline"
-#: ../shell/e-shell-window-commands.c:808
+#: ../shell/e-shell-window-commands.c:819
msgid "Work Offline"
msgstr "Work Offline"
-#: ../shell/e-shell-window.c:381
-msgid "Evolution is currently online. Click on this button to work offline."
-msgstr "Evolution is currently online. Click on this button to work offline."
-
-#: ../shell/e-shell-window.c:389
-msgid "Evolution is in the process of going offline."
-msgstr "Evolution is in the process of going offline."
-
-#: ../shell/e-shell-window.c:396
-msgid "Evolution is currently offline. Click on this button to work online."
-msgstr "Evolution is currently offline. Click on this button to work online."
-
-#: ../shell/e-shell-window.c:796
-#, c-format
-msgid "Switch to %s"
-msgstr "Switch to %s"
-
-#: ../shell/e-shell.c:635
-msgid "Uknown system error."
-msgstr "Uknown system error."
-
-#: ../shell/e-shell.c:831
-#: ../shell/e-shell.c:832
-#, c-format
-msgid "%ld KB"
-msgstr "%ld KB"
-
-#: ../shell/e-shell.c:1263
-#: ../widgets/misc/e-cell-date-edit.c:257
-msgid "OK"
-msgstr "OK"
-
-#: ../shell/e-shell.c:1265
-msgid "Invalid arguments"
-msgstr "Invalid arguments"
-
-#: ../shell/e-shell.c:1267
-msgid "Cannot register on OAF"
-msgstr "Cannot register on OAF"
-
-#: ../shell/e-shell.c:1269
-msgid "Configuration Database not found"
-msgstr "Configuration Database not found"
-
#: ../shell/e-user-creatable-items-handler.c:678
#: ../shell/e-user-creatable-items-handler.c:688
#: ../shell/e-user-creatable-items-handler.c:693
@@ -17816,6 +17960,22 @@ msgstr "_Test"
msgid "Create a new test item"
msgstr "Create a new test item"
+#: ../shell/GNOME_Evolution_Shell.server.in.in.h:1
+msgid "Evolution Shell"
+msgstr "Evolution Shell"
+
+#: ../shell/GNOME_Evolution_Shell.server.in.in.h:2
+msgid "Evolution Shell Config factory"
+msgstr "Evolution Shell Config factory"
+
+#: ../shell/GNOME_Evolution_Test.server.in.in.h:1
+msgid "Evolution Test"
+msgstr "Evolution Test"
+
+#: ../shell/GNOME_Evolution_Test.server.in.in.h:2
+msgid "Evolution Test component"
+msgstr "Evolution Test component"
+
#: ../shell/import.glade.h:1
msgid "Click \"Import\" to begin importing the file into Evolution. "
msgstr "Click \"Import\" to begin importing the file into Evolution. "
@@ -17855,7 +18015,7 @@ msgstr ""
"importing external files into Evolution."
#. Preview/Alpha/Beta version warning message
-#: ../shell/main.c:234
+#: ../shell/main.c:217
#, no-c-format
msgid ""
"Hi. Thanks for taking the time to download this preview release\n"
@@ -17890,7 +18050,7 @@ msgstr ""
"We hope that you enjoy the results of our hard work, and we\n"
"eagerly await your contributions!\n"
-#: ../shell/main.c:258
+#: ../shell/main.c:241
msgid ""
"Thanks\n"
"The Evolution Team\n"
@@ -17898,39 +18058,39 @@ msgstr ""
"Thanks\n"
"The Evolution Team\n"
-#: ../shell/main.c:265
+#: ../shell/main.c:248
msgid "Do not tell me again"
msgstr "Do not tell me again"
-#: ../shell/main.c:470
+#: ../shell/main.c:454
msgid "Start Evolution activating the specified component"
msgstr "Start Evolution activating the specified component"
-#: ../shell/main.c:474
+#: ../shell/main.c:458
msgid "Start in online mode"
msgstr "Start in online mode"
-#: ../shell/main.c:477
+#: ../shell/main.c:461
msgid "Forcibly shut down all Evolution components"
msgstr "Forcibly shut down all Evolution components"
-#: ../shell/main.c:481
+#: ../shell/main.c:465
msgid "Forcibly re-migrate from Evolution 1.4"
msgstr "Forcibly re-migrate from Evolution 1.4"
-#: ../shell/main.c:484
+#: ../shell/main.c:468
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:486
+#: ../shell/main.c:470
msgid "Disable loading of any plugins."
msgstr "Disable loading of any plugins."
-#: ../shell/main.c:516
+#: ../shell/main.c:499
msgid "- The Evolution PIM and Email Client"
msgstr "- The Evolution PIM and Email Client"
-#: ../shell/main.c:527
+#: ../shell/main.c:510
#, c-format
msgid ""
"%s: --online and --offline cannot be used together.\n"
@@ -18068,53 +18228,71 @@ msgstr ""
"\n"
"Edit trust settings:"
-#: ../smime/gui/cert-trust-dialog.c:154
-msgid "Because you trust the certificate authority that issued this certificate, then you trust the authenticity of this certificate unless otherwise indicated here"
-msgstr "Because you trust the certificate authority that issued this certificate, then you trust the authenticity of this certificate unless otherwise indicated here"
-
-#: ../smime/gui/cert-trust-dialog.c:158
-msgid "Because you do not trust the certificate authority that issued this certificate, then you do not trust the authenticity of this certificate unless otherwise indicated here"
-msgstr "Because you do not trust the certificate authority that issued this certificate, then you do not trust the authenticity of this certificate unless otherwise indicated here"
-
-#: ../smime/gui/certificate-manager.c: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
+#: ../smime/gui/certificate-manager.c:138
+#: ../smime/gui/certificate-manager.c:156
+#: ../smime/gui/certificate-manager.c:389
+#: ../smime/gui/certificate-manager.c:407
+#: ../smime/gui/certificate-manager.c:621
+#: ../smime/gui/certificate-manager.c:639
msgid "Select a certificate to import..."
msgstr "Select a certificate to import..."
-#: ../smime/gui/certificate-manager.c:267
-#: ../smime/gui/certificate-manager.c:472
-#: ../smime/gui/certificate-manager.c:690
+#: ../smime/gui/certificate-manager.c:147
+msgid "All PKCS12 files"
+msgstr "All PKCS12 files"
+
+#: ../smime/gui/certificate-manager.c:152
+#: ../smime/gui/certificate-manager.c:403
+#: ../smime/gui/certificate-manager.c:635
+msgid "All files"
+msgstr "All files"
+
+#: ../smime/gui/certificate-manager.c:279
+#: ../smime/gui/certificate-manager.c:496
+#: ../smime/gui/certificate-manager.c:726
msgid "Certificate Name"
msgstr "Certificate Name"
-#: ../smime/gui/certificate-manager.c:276
-#: ../smime/gui/certificate-manager.c:490
+#: ../smime/gui/certificate-manager.c:288
+#: ../smime/gui/certificate-manager.c:514
msgid "Purposes"
msgstr "Purposes"
-#: ../smime/gui/certificate-manager.c:285
+#: ../smime/gui/certificate-manager.c:297
#: ../smime/gui/smime-ui.glade.h:37
#: ../smime/lib/e-cert.c:570
msgid "Serial Number"
msgstr "Serial Number"
-#: ../smime/gui/certificate-manager.c:293
+#: ../smime/gui/certificate-manager.c:305
msgid "Expires"
msgstr "Expires"
-#: ../smime/gui/certificate-manager.c:481
+#: ../smime/gui/certificate-manager.c:398
+msgid "All email certificate files"
+msgstr "All email certificate files"
+
+#: ../smime/gui/certificate-manager.c:505
msgid "E-Mail Address"
msgstr "E-Mail Address"
+#: ../smime/gui/certificate-manager.c:630
+msgid "All CA certificate files"
+msgstr "All CA certificate files"
+
#: ../smime/gui/certificate-viewer.c:341
#, c-format
msgid "Certificate Viewer: %s"
msgstr "Certificate Viewer: %s"
+#: ../smime/gui/cert-trust-dialog.c:154
+msgid "Because you trust the certificate authority that issued this certificate, then you trust the authenticity of this certificate unless otherwise indicated here"
+msgstr "Because you trust the certificate authority that issued this certificate, then you trust the authenticity of this certificate unless otherwise indicated here"
+
+#: ../smime/gui/cert-trust-dialog.c:158
+msgid "Because you do not trust the certificate authority that issued this certificate, then you do not trust the authenticity of this certificate unless otherwise indicated here"
+msgstr "Because you do not trust the certificate authority that issued this certificate, then you do not trust the authenticity of this certificate unless otherwise indicated here"
+
#: ../smime/gui/component.c:47
#, c-format
msgid "Enter the password for `%s'"
@@ -18331,11 +18509,6 @@ msgstr "Your Certificates"
msgid "_Edit CA Trust"
msgstr "_Edit CA Trust"
-#. XXX we shouldn't be popping up dialogs in this code.
-#: ../smime/lib/e-cert-db.c:676
-msgid "Certificate already exists"
-msgstr "Certificate already exists"
-
#: ../smime/lib/e-cert.c:239
#: ../smime/lib/e-cert.c:249
msgid "%d/%m/%Y"
@@ -18504,6 +18677,11 @@ msgstr "Subject Unique ID"
msgid "Certificate Signature Value"
msgstr "Certificate Signature Value"
+#. XXX we shouldn't be popping up dialogs in this code.
+#: ../smime/lib/e-cert-db.c:676
+msgid "Certificate already exists"
+msgstr "Certificate already exists"
+
#: ../smime/lib/e-pkcs12.c:266
msgid "PKCS12 File Password"
msgstr "PKCS12 File Password"
@@ -19363,11 +19541,21 @@ msgid "_Group By Threads"
msgstr "_Group By Threads"
#: ../ui/evolution-mail-list.xml.h:32
-#: ../ui/evolution-mail-message.xml.h:116
#: ../ui/evolution-mail-messagedisplay.xml.h:7
+#: ../ui/evolution-mail-message.xml.h:116
msgid "_Message"
msgstr "_Message"
+#: ../ui/evolution-mail-messagedisplay.xml.h:2
+#: ../ui/evolution.xml.h:4
+msgid "Close this window"
+msgstr "Close this window"
+
+#: ../ui/evolution-mail-messagedisplay.xml.h:3
+#: ../ui/evolution.xml.h:17
+msgid "Main toolbar"
+msgstr "Main toolbar"
+
#: ../ui/evolution-mail-message.xml.h:1
msgid "A_dd Sender to Address Book"
msgstr "A_dd Sender to Address Book"
@@ -19813,16 +20001,6 @@ msgstr "_Zoom"
msgid "_Zoom In"
msgstr "_Zoom In"
-#: ../ui/evolution-mail-messagedisplay.xml.h:2
-#: ../ui/evolution.xml.h:4
-msgid "Close this window"
-msgstr "Close this window"
-
-#: ../ui/evolution-mail-messagedisplay.xml.h:3
-#: ../ui/evolution.xml.h:17
-msgid "Main toolbar"
-msgstr "Main toolbar"
-
#: ../ui/evolution-memos.xml.h:3
msgid "Copy selected memo"
msgstr "Copy selected memo"
@@ -20347,88 +20525,12 @@ msgstr "_Text only"
msgid "_Window"
msgstr "_Window"
-#: ../views/addressbook/galview.xml.h:1
-msgid "By _Company"
-msgstr "By _Company"
-
-#: ../views/addressbook/galview.xml.h:2
-msgid "_Address Cards"
-msgstr "_Address Cards"
-
-#: ../views/addressbook/galview.xml.h:3
-msgid "_Phone List"
-msgstr "_Phone List"
-
-#: ../views/calendar/galview.xml.h:1
-msgid "W_eek View"
-msgstr "W_eek View"
-
-#: ../views/calendar/galview.xml.h:2
-msgid "_Day View"
-msgstr "_Day View"
-
-#: ../views/calendar/galview.xml.h:3
-msgid "_List View"
-msgstr "_List View"
-
-#: ../views/calendar/galview.xml.h:4
-msgid "_Month View"
-msgstr "_Month View"
-
-#: ../views/calendar/galview.xml.h:5
-msgid "_Work Week View"
-msgstr "_Work Week View"
-
-#: ../views/mail/galview.xml.h:1
-msgid "As Sent Folder for Wi_de View"
-msgstr "As Sent Folder for Wi_de View"
-
-#: ../views/mail/galview.xml.h:2
-msgid "As _Sent Folder"
-msgstr "As _Sent Folder"
-
-#: ../views/mail/galview.xml.h:3
-msgid "By S_tatus"
-msgstr "By S_tatus"
-
-#: ../views/mail/galview.xml.h:4
-msgid "By Se_nder"
-msgstr "By Se_nder"
-
-#: ../views/mail/galview.xml.h:5
-msgid "By Su_bject"
-msgstr "By Su_bject"
-
-#: ../views/mail/galview.xml.h:6
-msgid "By _Follow Up Flag"
-msgstr "By _Follow Up Flag"
-
-#: ../views/mail/galview.xml.h:7
-msgid "For _Wide View"
-msgstr "For _Wide View"
-
-#: ../views/mail/galview.xml.h:8
-msgid "_Messages"
-msgstr "_Messages"
-
-#: ../views/memos/galview.xml.h:1
-msgid "_Memos"
-msgstr "_Memos"
-
-#: ../views/tasks/galview.xml.h:1
-msgid "With _Due Date"
-msgstr "With _Due Date"
-
-#: ../views/tasks/galview.xml.h:2
-msgid "With _Status"
-msgstr "With _Status"
-
#. Put the ""UTC" entry at the top of the combo's list.
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:211
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:402
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:213
#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:404
#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:406
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:757
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:408
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:759
msgid "UTC"
msgstr "UTC"
@@ -20482,12 +20584,27 @@ msgid "_Edit..."
msgstr "_Edit..."
#: ../widgets/menus/gal-view-factory-etable.c:39
-#: ../widgets/table/e-table-header-item.c:1909
+#: ../widgets/table/e-table-header-item.c:1907
#: ../widgets/table/e-table-scrolled.c:222
#: ../widgets/table/e-table-scrolled.c:223
msgid "Table"
msgstr "Table"
+#. bonobo displays this string so it must be in locale
+#: ../widgets/menus/gal-view-instance.c:587
+#: ../widgets/menus/gal-view-menus.c: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-instance-save-as-dialog.c:182
msgid "Instance"
msgstr "Instance"
@@ -20504,21 +20621,6 @@ msgstr "_Create new view"
msgid "_Replace existing view"
msgstr "_Replace existing view"
-#. bonobo displays this string so it must be in locale
-#: ../widgets/menus/gal-view-instance.c: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 "C_urrent View"
msgstr "C_urrent View"
@@ -20551,6 +20653,10 @@ msgstr "Type of view:"
msgid "Suggest automatic display of attachment"
msgstr "Suggest automatic display of attachment"
+#: ../widgets/misc/e-calendar.c:226
+msgid "Month Calendar"
+msgstr "Month Calendar"
+
#. Translators: These are the first characters of each day of the
#. week, 'M' for 'Monday', 'T' for Tuesday etc.
#: ../widgets/misc/e-calendar-item.c:416
@@ -20558,19 +20664,15 @@ msgid "MTWTFSS"
msgstr "MTWTFSS"
#. This is a strftime() format. %B = Month name, %Y = Year.
-#: ../widgets/misc/e-calendar-item.c:1089
-#: ../widgets/misc/e-calendar-item.c:1743
+#: ../widgets/misc/e-calendar-item.c:1088
+#: ../widgets/misc/e-calendar-item.c:1742
msgid "%B %Y"
msgstr "%B %Y"
-#: ../widgets/misc/e-calendar.c:226
-msgid "Month Calendar"
-msgstr "Month Calendar"
-
#: ../widgets/misc/e-canvas-background.c:457
#: ../widgets/misc/e-canvas-background.c:458
-#: ../widgets/text/e-entry.c:1237
-#: ../widgets/text/e-entry.c:1238
+#: ../widgets/text/e-entry.c:1235
+#: ../widgets/text/e-entry.c:1236
#: ../widgets/text/e-text.c:3581
#: ../widgets/text/e-text.c:3582
msgid "Fill color"
@@ -20580,10 +20682,10 @@ msgstr "Fill colour"
#: ../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:1244
-#: ../widgets/text/e-entry.c:1245
-#: ../widgets/text/e-entry.c:1251
-#: ../widgets/text/e-entry.c:1252
+#: ../widgets/text/e-entry.c:1242
+#: ../widgets/text/e-entry.c:1243
+#: ../widgets/text/e-entry.c:1249
+#: ../widgets/text/e-entry.c:1250
#: ../widgets/text/e-text.c:3588
#: ../widgets/text/e-text.c:3589
#: ../widgets/text/e-text.c:3596
@@ -20593,8 +20695,8 @@ msgstr "GDK fill colour"
#: ../widgets/misc/e-canvas-background.c:478
#: ../widgets/misc/e-canvas-background.c:479
-#: ../widgets/text/e-entry.c:1258
-#: ../widgets/text/e-entry.c:1259
+#: ../widgets/text/e-entry.c:1256
+#: ../widgets/text/e-entry.c:1257
#: ../widgets/text/e-text.c:3603
#: ../widgets/text/e-text.c:3604
msgid "Fill stipple"
@@ -20642,16 +20744,16 @@ msgstr "Minimum Width"
msgid "Spacing"
msgstr "Spacing"
-#: ../widgets/misc/e-cell-date-edit.c:233
+#: ../widgets/misc/e-cell-date-edit.c:231
msgid "Now"
msgstr "Now"
-#: ../widgets/misc/e-cell-date-edit.c:793
+#: ../widgets/misc/e-cell-date-edit.c:795
#, c-format
msgid "The time must be in the format: %s"
msgstr "The time must be in the format: %s"
-#: ../widgets/misc/e-cell-percent.c:76
+#: ../widgets/misc/e-cell-percent.c:79
msgid "The percent value must be between 0 and 100, inclusive"
msgstr "The percent value must be between 0 and 100, inclusive"
@@ -20773,31 +20875,19 @@ msgstr "Combo box to select time"
msgid "Time"
msgstr "Time"
-#: ../widgets/misc/e-dateedit.c:461
+#: ../widgets/misc/e-dateedit.c:459
msgid "No_w"
msgstr "No_w"
-#: ../widgets/misc/e-dateedit.c:467
+#: ../widgets/misc/e-dateedit.c:465
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"
-
-#. 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-dateedit.c:1634
+#: ../widgets/misc/e-dateedit.c:1630
msgid "Invalid Date Value"
msgstr "Invalid Date Value"
-#: ../widgets/misc/e-dateedit.c:1660
+#: ../widgets/misc/e-dateedit.c:1656
msgid "Invalid Time Value"
msgstr "Invalid Time Value"
@@ -20834,12 +20924,12 @@ msgid "A widget to display in place of the usual expander label"
msgstr "A widget to display in place of the usual expander label"
#: ../widgets/misc/e-expander.c:223
-#: ../widgets/table/e-tree.c:3312
+#: ../widgets/table/e-tree.c:3316
msgid "Expander Size"
msgstr "Expander Size"
#: ../widgets/misc/e-expander.c:224
-#: ../widgets/table/e-tree.c:3313
+#: ../widgets/table/e-tree.c:3317
msgid "Size of the expander arrow"
msgstr "Size of the expander arrow"
@@ -20854,8 +20944,8 @@ msgstr "Spacing around expander arrow"
#. FIXME: get the toplevel window...
#: ../widgets/misc/e-filter-bar.c:129
#: ../widgets/misc/e-filter-bar.c:170
-#: ../widgets/misc/e-filter-bar.c:291
-#: ../widgets/misc/e-filter-bar.c:727
+#: ../widgets/misc/e-filter-bar.c:292
+#: ../widgets/misc/e-filter-bar.c:728
msgid "Advanced Search"
msgstr "Advanced Search"
@@ -20864,11 +20954,11 @@ msgstr "Advanced Search"
msgid "Save Search"
msgstr "Save Search"
-#: ../widgets/misc/e-filter-bar.c:251
+#: ../widgets/misc/e-filter-bar.c:252
msgid "_Searches"
msgstr "_Searches"
-#: ../widgets/misc/e-filter-bar.c:253
+#: ../widgets/misc/e-filter-bar.c:254
msgid "Searches"
msgstr "Searches"
@@ -20907,11 +20997,11 @@ msgstr "Current Message"
msgid "Choose Image"
msgstr "Choose Image"
-#: ../widgets/misc/e-map.c:629
+#: ../widgets/misc/e-map.c:627
msgid "World Map"
msgstr "World Map"
-#: ../widgets/misc/e-map.c:631
+#: ../widgets/misc/e-map.c:629
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."
@@ -20942,25 +21032,25 @@ msgstr "Reflow model"
msgid "Column width"
msgstr "Column width"
-#: ../widgets/misc/e-search-bar.c:597
+#: ../widgets/misc/e-search-bar.c:598
msgid "_Search"
msgstr "_Search"
-#: ../widgets/misc/e-search-bar.c:603
+#: ../widgets/misc/e-search-bar.c:604
msgid "_Find Now"
msgstr "_Find Now"
-#: ../widgets/misc/e-search-bar.c:604
+#: ../widgets/misc/e-search-bar.c:605
msgid "_Clear"
msgstr "_Clear"
-#: ../widgets/misc/e-search-bar.c:855
+#: ../widgets/misc/e-search-bar.c:856
msgid "Item ID"
msgstr "Item ID"
-#: ../widgets/misc/e-search-bar.c:862
-#: ../widgets/text/e-entry.c:1223
-#: ../widgets/text/e-entry.c:1224
+#: ../widgets/misc/e-search-bar.c:863
+#: ../widgets/text/e-entry.c:1221
+#: ../widgets/text/e-entry.c:1222
#: ../widgets/text/e-text.c:3503
#: ../widgets/text/e-text.c:3504
msgid "Text"
@@ -20968,19 +21058,19 @@ msgstr "Text"
#. To Translators: The "Show: " label is followed by the Quick Search Dropdown Menu where you can choose
#. to display "All Messages", "Unread Messages", "Message with 'Important' Label" and so on...
-#: ../widgets/misc/e-search-bar.c:996
+#: ../widgets/misc/e-search-bar.c:997
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:1013
+#: ../widgets/misc/e-search-bar.c:1014
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:1025
+#: ../widgets/misc/e-search-bar.c:1026
msgid " i_n "
msgstr " i_n "
@@ -21139,14 +21229,14 @@ msgid "_When opened:"
msgstr "_When opened:"
#. For Translator only: %s is status message that is displayed (eg "moving items", "updating objects")
-#: ../widgets/misc/e-task-widget.c:209
+#: ../widgets/misc/e-task-widget.c:212
#, c-format
msgid "%s (...)"
msgstr "%s (...)"
#. For Translator only: %s is status message that is displayed (eg "moving items", "updating objects");
#. %d is a number between 0 and 100, describing the percentage of operation complete
-#: ../widgets/misc/e-task-widget.c:215
+#: ../widgets/misc/e-task-widget.c:218
#, c-format
msgid "%s (%d%% complete)"
msgstr "%s (%d%% complete)"
@@ -21179,149 +21269,166 @@ msgstr "popup list"
msgid "%l:%M %p"
msgstr "%l:%M %p"
-#: ../widgets/table/e-cell-pixbuf.c:398
+#: ../widgets/table/e-cell-pixbuf.c:387
msgid "Selected Column"
msgstr "Selected Column"
-#: ../widgets/table/e-cell-pixbuf.c:405
+#: ../widgets/table/e-cell-pixbuf.c:394
msgid "Focused Column"
msgstr "Focused Column"
-#: ../widgets/table/e-cell-pixbuf.c:412
+#: ../widgets/table/e-cell-pixbuf.c:401
msgid "Unselected Column"
msgstr "Unselected Column"
-#: ../widgets/table/e-cell-text.c:1805
+#: ../widgets/table/e-cell-text.c:1802
msgid "Strikeout Column"
msgstr "Strikeout Column"
-#: ../widgets/table/e-cell-text.c:1812
+#: ../widgets/table/e-cell-text.c:1809
msgid "Underline Column"
msgstr "Underline Column"
-#: ../widgets/table/e-cell-text.c:1819
+#: ../widgets/table/e-cell-text.c:1816
msgid "Bold Column"
msgstr "Bold Column"
-#: ../widgets/table/e-cell-text.c:1826
+#: ../widgets/table/e-cell-text.c:1823
msgid "Color Column"
msgstr "Colour Column"
-#: ../widgets/table/e-cell-text.c:1840
+#: ../widgets/table/e-cell-text.c:1837
msgid "BG Color Column"
msgstr "BG Colour Column"
-#: ../widgets/table/e-table-config-no-group.glade.h:1
-msgid "<- _Remove"
-msgstr "<- _Remove"
+#: ../widgets/table/e-table.c:3312
+#: ../widgets/table/e-table-group-container.c:939
+#: ../widgets/table/e-table-group-container.c:940
+#: ../widgets/table/e-table-group-leaf.c:608
+#: ../widgets/table/e-table-group-leaf.c:609
+#: ../widgets/table/e-table-item.c:3010
+#: ../widgets/table/e-table-item.c:3011
+#: ../widgets/table/e-tree.c:3263
+#: ../widgets/table/e-tree.c:3264
+msgid "Length Threshold"
+msgstr "Length Threshold"
+
+#: ../widgets/table/e-table.c:3319
+#: ../widgets/table/e-table-group-container.c:946
+#: ../widgets/table/e-table-group-container.c:947
+#: ../widgets/table/e-table-group-leaf.c:650
+#: ../widgets/table/e-table-group-leaf.c:651
+#: ../widgets/table/e-table-item.c:3044
+#: ../widgets/table/e-table-item.c:3045
+#: ../widgets/table/e-tree.c:3295
+#: ../widgets/table/e-tree.c:3296
+msgid "Uniform row height"
+msgstr "Uniform row height"
+
+#: ../widgets/table/e-table.c:3326
+#: ../widgets/table/e-tree.c:3302
+#: ../widgets/table/e-tree.c:3303
+msgid "Always search"
+msgstr "Always search"
+
+#: ../widgets/table/e-table.c:3333
+msgid "Use click to add"
+msgstr "Use click to add"
+
+#: ../widgets/table/e-table-config.c:149
+msgid "State"
+msgstr "State"
+
+#: ../widgets/table/e-table-config.c:306
+#: ../widgets/table/e-table-config.c:348
+msgid "(Ascending)"
+msgstr "(Ascending)"
+
+#: ../widgets/table/e-table-config.c:306
+#: ../widgets/table/e-table-config.c:348
+msgid "(Descending)"
+msgstr "(Descending)"
+
+#: ../widgets/table/e-table-config.c:313
+msgid "Not sorted"
+msgstr "Not sorted"
+
+#: ../widgets/table/e-table-config.c:354
+msgid "No grouping"
+msgstr "No grouping"
+
+#: ../widgets/table/e-table-config.c:562
+#: ../widgets/table/e-table-config.glade.h:10
+#: ../widgets/table/e-table-config-no-group.glade.h:12
+msgid "Show Fields"
+msgstr "Show Fields"
+
+#: ../widgets/table/e-table-config.c:583
+msgid "Available Fields"
+msgstr "Available Fields"
-#: ../widgets/table/e-table-config-no-group.glade.h:2
#: ../widgets/table/e-table-config.glade.h:1
+#: ../widgets/table/e-table-config-no-group.glade.h:2
msgid "A_vailable Fields:"
msgstr "A_vailable Fields:"
-#: ../widgets/table/e-table-config-no-group.glade.h:3
#: ../widgets/table/e-table-config.glade.h:2
+#: ../widgets/table/e-table-config-no-group.glade.h:3
#: ../widgets/table/e-table-header-item.c:1575
msgid "Ascending"
msgstr "Ascending"
-#: ../widgets/table/e-table-config-no-group.glade.h:4
#: ../widgets/table/e-table-config.glade.h:3
+#: ../widgets/table/e-table-config-no-group.glade.h:4
msgid "Clear All"
msgstr "Clear All"
-#: ../widgets/table/e-table-config-no-group.glade.h:5
#: ../widgets/table/e-table-config.glade.h:4
+#: ../widgets/table/e-table-config-no-group.glade.h:5
#: ../widgets/table/e-table-header-item.c:1575
msgid "Descending"
msgstr "Descending"
-#: ../widgets/table/e-table-config-no-group.glade.h:8
#: ../widgets/table/e-table-config.glade.h:7
+#: ../widgets/table/e-table-config-no-group.glade.h:8
msgid "Group Items By"
msgstr "Group Items By"
-#: ../widgets/table/e-table-config-no-group.glade.h:9
#: ../widgets/table/e-table-config.glade.h:8
+#: ../widgets/table/e-table-config-no-group.glade.h:9
msgid "Move _Down"
msgstr "Move _Down"
-#: ../widgets/table/e-table-config-no-group.glade.h:10
#: ../widgets/table/e-table-config.glade.h:9
+#: ../widgets/table/e-table-config-no-group.glade.h:10
msgid "Move _Up"
msgstr "Move _Up"
-#: ../widgets/table/e-table-config-no-group.glade.h:11
-msgid "Sh_ow these fields in order:"
-msgstr "Sh_ow these fields in order:"
-
-#: ../widgets/table/e-table-config-no-group.glade.h:12
-#: ../widgets/table/e-table-config.c:563
-#: ../widgets/table/e-table-config.glade.h:10
-msgid "Show Fields"
-msgstr "Show Fields"
-
-#: ../widgets/table/e-table-config-no-group.glade.h:13
#: ../widgets/table/e-table-config.glade.h:11
+#: ../widgets/table/e-table-config-no-group.glade.h:13
msgid "Show field in View"
msgstr "Show field in View"
-#: ../widgets/table/e-table-config-no-group.glade.h:14
#: ../widgets/table/e-table-config.glade.h:12
+#: ../widgets/table/e-table-config-no-group.glade.h:14
msgid "Sort"
msgstr "Sort"
-#: ../widgets/table/e-table-config-no-group.glade.h:15
#: ../widgets/table/e-table-config.glade.h:13
+#: ../widgets/table/e-table-config-no-group.glade.h:15
msgid "Sort Items By"
msgstr "Sort Items By"
-#: ../widgets/table/e-table-config-no-group.glade.h:16
#: ../widgets/table/e-table-config.glade.h:14
+#: ../widgets/table/e-table-config-no-group.glade.h:16
msgid "Then By"
msgstr "Then By"
-#: ../widgets/table/e-table-config-no-group.glade.h:17
-msgid "_Add ->"
-msgstr "_Add ->"
-
-#: ../widgets/table/e-table-config-no-group.glade.h:18
#: ../widgets/table/e-table-config.glade.h:16
+#: ../widgets/table/e-table-config-no-group.glade.h:18
msgid "_Fields Shown..."
msgstr "_Fields Shown..."
-#: ../widgets/table/e-table-config-no-group.glade.h:19
-#: ../widgets/table/e-table-config.glade.h:20
-msgid "_Sort..."
-msgstr "_Sort..."
-
-#: ../widgets/table/e-table-config.c:150
-msgid "State"
-msgstr "State"
-
-#: ../widgets/table/e-table-config.c:307
-#: ../widgets/table/e-table-config.c:349
-msgid "(Ascending)"
-msgstr "(Ascending)"
-
-#: ../widgets/table/e-table-config.c:307
-#: ../widgets/table/e-table-config.c:349
-msgid "(Descending)"
-msgstr "(Descending)"
-
-#: ../widgets/table/e-table-config.c:314
-msgid "Not sorted"
-msgstr "Not sorted"
-
-#: ../widgets/table/e-table-config.c:355
-msgid "No grouping"
-msgstr "No grouping"
-
-#: ../widgets/table/e-table-config.c:584
-msgid "Available Fields"
-msgstr "Available Fields"
-
#: ../widgets/table/e-table-config.glade.h:17
msgid "_Group By..."
msgstr "_Group By..."
@@ -21330,17 +21437,34 @@ msgstr "_Group By..."
msgid "_Show these fields in order:"
msgstr "_Show these fields in order:"
+#: ../widgets/table/e-table-config.glade.h:20
+#: ../widgets/table/e-table-config-no-group.glade.h:19
+msgid "_Sort..."
+msgstr "_Sort..."
+
+#: ../widgets/table/e-table-config-no-group.glade.h:1
+msgid "<- _Remove"
+msgstr "<- _Remove"
+
+#: ../widgets/table/e-table-config-no-group.glade.h:11
+msgid "Sh_ow these fields in order:"
+msgstr "Sh_ow these fields in order:"
+
+#: ../widgets/table/e-table-config-no-group.glade.h:17
+msgid "_Add ->"
+msgstr "_Add ->"
+
+#: ../widgets/table/e-table-field-chooser.c:77
#: ../widgets/table/e-table-field-chooser-dialog.c:77
#: ../widgets/table/e-table-field-chooser-item.c:637
-#: ../widgets/table/e-table-field-chooser.c:77
-#: ../widgets/table/e-table-header-item.c:1874
+#: ../widgets/table/e-table-header-item.c:1872
msgid "DnD code"
msgstr "DnD code"
+#: ../widgets/table/e-table-field-chooser.c:84
#: ../widgets/table/e-table-field-chooser-dialog.c:84
#: ../widgets/table/e-table-field-chooser-item.c:644
-#: ../widgets/table/e-table-field-chooser.c:84
-#: ../widgets/table/e-table-header-item.c:1888
+#: ../widgets/table/e-table-header-item.c:1886
msgid "Full Header"
msgstr "Full Header"
@@ -21389,8 +21513,8 @@ msgstr "Alternating Row Colours"
#: ../widgets/table/e-table-group-leaf.c:581
#: ../widgets/table/e-table-item.c:2982
#: ../widgets/table/e-table-item.c:2983
-#: ../widgets/table/e-tree.c:3265
-#: ../widgets/table/e-tree.c:3266
+#: ../widgets/table/e-tree.c:3269
+#: ../widgets/table/e-tree.c:3270
msgid "Horizontal Draw Grid"
msgstr "Horizontal Draw Grid"
@@ -21400,8 +21524,8 @@ msgstr "Horizontal Draw Grid"
#: ../widgets/table/e-table-group-leaf.c:588
#: ../widgets/table/e-table-item.c:2989
#: ../widgets/table/e-table-item.c:2990
-#: ../widgets/table/e-tree.c:3271
-#: ../widgets/table/e-tree.c:3272
+#: ../widgets/table/e-tree.c:3275
+#: ../widgets/table/e-tree.c:3276
msgid "Vertical Draw Grid"
msgstr "Vertical Draw Grid"
@@ -21411,8 +21535,8 @@ msgstr "Vertical Draw Grid"
#: ../widgets/table/e-table-group-leaf.c:595
#: ../widgets/table/e-table-item.c:2996
#: ../widgets/table/e-table-item.c:2997
-#: ../widgets/table/e-tree.c:3277
-#: ../widgets/table/e-tree.c:3278
+#: ../widgets/table/e-tree.c:3281
+#: ../widgets/table/e-tree.c:3282
msgid "Draw focus"
msgstr "Draw focus"
@@ -21434,30 +21558,6 @@ msgstr "Cursor mode"
msgid "Selection model"
msgstr "Selection model"
-#: ../widgets/table/e-table-group-container.c:939
-#: ../widgets/table/e-table-group-container.c:940
-#: ../widgets/table/e-table-group-leaf.c:608
-#: ../widgets/table/e-table-group-leaf.c:609
-#: ../widgets/table/e-table-item.c:3010
-#: ../widgets/table/e-table-item.c:3011
-#: ../widgets/table/e-table.c:3309
-#: ../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:946
-#: ../widgets/table/e-table-group-container.c:947
-#: ../widgets/table/e-table-group-leaf.c:650
-#: ../widgets/table/e-table-group-leaf.c:651
-#: ../widgets/table/e-table-item.c:3044
-#: ../widgets/table/e-table-item.c:3045
-#: ../widgets/table/e-table.c:3316
-#: ../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:953
#: ../widgets/table/e-table-group-container.c:954
#: ../widgets/table/e-table-group-leaf.c:643
@@ -21517,16 +21617,16 @@ msgstr "Customise Current View..."
msgid "Sort By"
msgstr "Sort By"
-#: ../widgets/table/e-table-header-item.c:1881
+#: ../widgets/table/e-table-header-item.c:1879
msgid "Font Description"
msgstr "Font Description"
-#: ../widgets/table/e-table-header-item.c:1902
+#: ../widgets/table/e-table-header-item.c:1900
#: ../widgets/table/e-table-sorter.c:175
msgid "Sort Info"
msgstr "Sort Info"
-#: ../widgets/table/e-table-header-item.c:1916
+#: ../widgets/table/e-table-header-item.c:1914
#: ../widgets/table/e-tree-scrolled.c:221
#: ../widgets/table/e-tree-scrolled.c:222
msgid "Tree"
@@ -21547,130 +21647,120 @@ msgstr "Table model"
msgid "Cursor row"
msgstr "Cursor row"
-#: ../widgets/table/e-table.c:3323
-#: ../widgets/table/e-tree.c:3298
-#: ../widgets/table/e-tree.c:3299
-msgid "Always search"
-msgstr "Always search"
-
-#: ../widgets/table/e-table.c:3330
-msgid "Use click to add"
-msgstr "Use click to add"
-
-#: ../widgets/table/e-tree.c:3284
-#: ../widgets/table/e-tree.c:3285
+#: ../widgets/table/e-tree.c:3288
+#: ../widgets/table/e-tree.c:3289
msgid "ETree table adapter"
msgstr "ETree table adapter"
-#: ../widgets/table/e-tree.c:3305
+#: ../widgets/table/e-tree.c:3309
msgid "Retro Look"
msgstr "Retro Look"
-#: ../widgets/table/e-tree.c:3306
+#: ../widgets/table/e-tree.c:3310
msgid "Draw lines and +/- expanders."
msgstr "Draw lines and +/- expanders."
-#: ../widgets/text/e-entry-test.c:49
-msgid "Minicard Test"
-msgstr "Minicard Test"
-
-#: ../widgets/text/e-entry-test.c:50
-msgid "Copyright (C) 2000, Helix Code, Inc."
-msgstr "Copyright (C) 2000, Helix Code, Inc."
-
-#: ../widgets/text/e-entry-test.c:52
-msgid "This should test the minicard canvas item"
-msgstr "This should test the minicard canvas item"
-
-#: ../widgets/text/e-entry.c:1216
-#: ../widgets/text/e-entry.c:1217
+#: ../widgets/text/e-entry.c:1214
+#: ../widgets/text/e-entry.c:1215
#: ../widgets/text/e-text.c:3496
#: ../widgets/text/e-text.c:3497
msgid "Event Processor"
msgstr "Event Processor"
-#: ../widgets/text/e-entry.c:1230
-#: ../widgets/text/e-entry.c:1231
+#: ../widgets/text/e-entry.c:1228
+#: ../widgets/text/e-entry.c:1229
#: ../widgets/text/e-text.c:3532
#: ../widgets/text/e-text.c:3533
msgid "Justification"
msgstr "Justification"
-#: ../widgets/text/e-entry.c:1272
-#: ../widgets/text/e-entry.c:1273
+#: ../widgets/text/e-entry.c:1270
+#: ../widgets/text/e-entry.c:1271
#: ../widgets/text/e-text.c:3632
#: ../widgets/text/e-text.c:3633
msgid "Use ellipsis"
msgstr "Use ellipsis"
-#: ../widgets/text/e-entry.c:1279
-#: ../widgets/text/e-entry.c:1280
+#: ../widgets/text/e-entry.c:1277
+#: ../widgets/text/e-entry.c:1278
#: ../widgets/text/e-text.c:3639
#: ../widgets/text/e-text.c:3640
msgid "Ellipsis"
msgstr "Ellipsis"
-#: ../widgets/text/e-entry.c:1286
-#: ../widgets/text/e-entry.c:1287
+#: ../widgets/text/e-entry.c:1284
+#: ../widgets/text/e-entry.c:1285
#: ../widgets/text/e-text.c:3646
#: ../widgets/text/e-text.c:3647
msgid "Line wrap"
msgstr "Line wrap"
-#: ../widgets/text/e-entry.c:1293
-#: ../widgets/text/e-entry.c:1294
+#: ../widgets/text/e-entry.c:1291
+#: ../widgets/text/e-entry.c:1292
#: ../widgets/text/e-text.c:3653
#: ../widgets/text/e-text.c:3654
msgid "Break characters"
msgstr "Break characters"
-#: ../widgets/text/e-entry.c:1300
-#: ../widgets/text/e-entry.c:1301
+#: ../widgets/text/e-entry.c:1298
+#: ../widgets/text/e-entry.c:1299
#: ../widgets/text/e-text.c:3660
#: ../widgets/text/e-text.c:3661
msgid "Max lines"
msgstr "Max lines"
-#: ../widgets/text/e-entry.c:1307
-#: ../widgets/text/e-entry.c:1308
+#: ../widgets/text/e-entry.c:1305
+#: ../widgets/text/e-entry.c:1306
#: ../widgets/text/e-text.c:3689
#: ../widgets/text/e-text.c:3690
msgid "Allow newlines"
msgstr "Allow newlines"
-#: ../widgets/text/e-entry.c:1314
-#: ../widgets/text/e-entry.c:1315
+#: ../widgets/text/e-entry.c:1312
+#: ../widgets/text/e-entry.c:1313
#: ../widgets/text/e-text.c:3682
#: ../widgets/text/e-text.c:3683
msgid "Draw borders"
msgstr "Draw borders"
-#: ../widgets/text/e-entry.c:1321
-#: ../widgets/text/e-entry.c:1322
+#: ../widgets/text/e-entry.c:1319
+#: ../widgets/text/e-entry.c:1320
#: ../widgets/text/e-text.c:3696
#: ../widgets/text/e-text.c:3697
msgid "Draw background"
msgstr "Draw background"
-#: ../widgets/text/e-entry.c:1328
-#: ../widgets/text/e-entry.c:1329
+#: ../widgets/text/e-entry.c:1326
+#: ../widgets/text/e-entry.c:1327
#: ../widgets/text/e-text.c:3703
#: ../widgets/text/e-text.c:3704
msgid "Draw button"
msgstr "Draw button"
-#: ../widgets/text/e-entry.c:1335
-#: ../widgets/text/e-entry.c:1336
+#: ../widgets/text/e-entry.c:1333
+#: ../widgets/text/e-entry.c:1334
#: ../widgets/text/e-text.c:3710
#: ../widgets/text/e-text.c:3711
msgid "Cursor position"
msgstr "Cursor position"
-#: ../widgets/text/e-entry.c:1342
-#: ../widgets/text/e-entry.c:1343
+#: ../widgets/text/e-entry.c:1340
+#: ../widgets/text/e-entry.c:1341
msgid "Emulate label resize"
msgstr "Emulate label resize"
+#: ../widgets/text/e-entry-test.c:49
+msgid "Minicard Test"
+msgstr "Minicard Test"
+
+#: ../widgets/text/e-entry-test.c:50
+msgid "Copyright (C) 2000, Helix Code, Inc."
+msgstr "Copyright (C) 2000, Helix Code, Inc."
+
+#: ../widgets/text/e-entry-test.c:52
+msgid "This should test the minicard canvas item"
+msgstr "This should test the minicard canvas item"
+
#: ../widgets/text/e-text.c:2739
msgid "Input Methods"
msgstr "Input Methods"
@@ -21740,6 +21830,120 @@ msgstr "IM Context"
msgid "Handle Popup"
msgstr "Handle Popup"
+#: ../views/addressbook/galview.xml.h:1
+msgid "By _Company"
+msgstr "By _Company"
+
+#: ../views/addressbook/galview.xml.h:2
+msgid "_Address Cards"
+msgstr "_Address Cards"
+
+#: ../views/addressbook/galview.xml.h:3
+msgid "_Phone List"
+msgstr "_Phone List"
+
+#: ../views/calendar/galview.xml.h:1
+msgid "W_eek View"
+msgstr "W_eek View"
+
+#: ../views/calendar/galview.xml.h:2
+msgid "_Day View"
+msgstr "_Day View"
+
+#: ../views/calendar/galview.xml.h:3
+msgid "_List View"
+msgstr "_List View"
+
+#: ../views/calendar/galview.xml.h:4
+msgid "_Month View"
+msgstr "_Month View"
+
+#: ../views/calendar/galview.xml.h:5
+msgid "_Work Week View"
+msgstr "_Work Week View"
+
+#: ../views/mail/galview.xml.h:1
+msgid "As Sent Folder for Wi_de View"
+msgstr "As Sent Folder for Wi_de View"
+
+#: ../views/mail/galview.xml.h:2
+msgid "As _Sent Folder"
+msgstr "As _Sent Folder"
+
+#: ../views/mail/galview.xml.h:3
+msgid "By S_tatus"
+msgstr "By S_tatus"
+
+#: ../views/mail/galview.xml.h:4
+msgid "By Se_nder"
+msgstr "By Se_nder"
+
+#: ../views/mail/galview.xml.h:5
+msgid "By Su_bject"
+msgstr "By Su_bject"
+
+#: ../views/mail/galview.xml.h:6
+msgid "By _Follow Up Flag"
+msgstr "By _Follow Up Flag"
+
+#: ../views/mail/galview.xml.h:7
+msgid "For _Wide View"
+msgstr "For _Wide View"
+
+#: ../views/mail/galview.xml.h:8
+msgid "_Messages"
+msgstr "_Messages"
+
+#: ../views/memos/galview.xml.h:1
+msgid "_Memos"
+msgstr "_Memos"
+
+#: ../views/tasks/galview.xml.h:1
+msgid "With _Due Date"
+msgstr "With _Due Date"
+
+#: ../views/tasks/galview.xml.h:2
+msgid "With _Status"
+msgstr "With _Status"
+
+#~ msgid "Print cards"
+#~ msgstr "Print cards"
+#~ msgid "E-mail"
+#~ msgstr "E-mail"
+#~ msgid "Print envelope"
+#~ msgstr "Print envelope"
+#~ msgid "Print contacts"
+#~ msgstr "Print contacts"
+#~ msgid "Print contact"
+#~ msgstr "Print contact"
+#~ msgid "Selected day (%a %b %d %Y)"
+#~ msgstr "Selected day (%a %d %b %Y)"
+#~ msgid "%a %b %d"
+#~ msgstr "%a %d %b"
+#~ msgid "%a %d %Y"
+#~ msgstr "%a %d %Y"
+#~ msgid "%a %b %d %Y"
+#~ msgstr "%a %d %b %Y"
+#~ msgid "Selected week (%s - %s)"
+#~ msgstr "Selected week (%s - %s)"
+#~ msgid "Selected month (%b %Y)"
+#~ msgstr "Selected month (%b %Y)"
+#~ msgid "Selected year (%Y)"
+#~ msgstr "Selected year (%Y)"
+#~ msgid "Print Item"
+#~ msgstr "Print Item"
+#~ msgid "<span weight=\"bold\">Filter Options</span>"
+#~ msgstr "<span weight=\"bold\">Filter Options</span>"
+#~ msgid "<b>Recipients </b>"
+#~ msgstr "<b>Recipients </b>"
+#~ msgid "<b>Action</b>"
+#~ msgstr "<b>Action</b>"
+#~ msgid "<b>Date and Time</b>"
+#~ msgstr "<b>Date and Time</b>"
+#~ msgid "%H:%M"
+#~ msgstr "%H:%M"
+#~ msgid "%I:%M %p"
+#~ msgstr "%I:%M %p"
#~ msgid "ebby"
#~ msgstr "ebby"
#~ msgid "range"
@@ -22026,8 +22230,6 @@ msgstr "Handle Popup"
#~ 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"