aboutsummaryrefslogtreecommitdiffstats
path: root/po/en_GB.po
diff options
context:
space:
mode:
Diffstat (limited to 'po/en_GB.po')
-rw-r--r--po/en_GB.po892
1 files changed, 511 insertions, 381 deletions
diff --git a/po/en_GB.po b/po/en_GB.po
index 44a45e5946..c777bd8b7c 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -5,14 +5,14 @@
msgid ""
msgstr ""
"Project-Id-Version: evolution 0.6\n"
-"POT-Creation-Date: 2004-08-02 15:35-0400\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2004-08-13 14:55-0400\n"
"PO-Revision-Date: 2004-07-31 10:40-0400\n"
"Last-Translator: Gareth Owen <gowen72@yahoo.com>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Report-Msgid-Bugs-To: \n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: a11y/addressbook/ea-addressbook-view.c:94
@@ -116,6 +116,17 @@ msgid "Could not remove addressbook."
msgstr "Could not remove addressbook."
#. addressbook:remove-addressbook secondary
+#. addressbook:generic-error primary
+#. addressbook:load-error secondary
+#. addressbook:search-error secondary
+#. mail:session-message-info secondary
+#. mail:session-message-info-cancel secondary
+#. mail:session-message-warning secondary
+#. mail:session-message-warning-cancel secondary
+#. mail:session-message-error secondary
+#. mail:session-message-error-cancel secondary
+#. mail:ask-session-password secondary
+#. mail:filter-load-error secondary
#: addressbook/addressbook-errors.xml.h:22
#: addressbook/addressbook-errors.xml.h:26
#: addressbook/addressbook-errors.xml.h:34
@@ -133,6 +144,8 @@ msgid "Category editor not available."
msgstr "Category editor not available."
#. addressbook:generic-error secondary
+#. mail-composer:no-attach secondary
+#. mail:no-save-path secondary
#: addressbook/addressbook-errors.xml.h:28
#: composer/mail-composer-errors.xml.h:4 mail/mail-errors.xml.h:92
msgid "{1}"
@@ -335,6 +348,7 @@ msgid "Migrating `%s':"
msgstr "Migrating `%s':"
#. create the local source group
+#. On This Computer is always first and VFolders is always last
#: addressbook/gui/component/addressbook-migrate.c:493
#: calendar/gui/migration.c:450 calendar/gui/migration.c:532
#: mail/em-folder-tree-model.c:196 mail/em-folder-tree-model.c:198
@@ -343,6 +357,9 @@ msgid "On This Computer"
msgstr "On This Computer"
#. Create the default Person addressbook
+#. Create the default Person calendar
+#. Create the default Person task list
+#. orange
#: addressbook/gui/component/addressbook-migrate.c:501
#: addressbook/gui/contact-editor/contact-editor.glade.h:34
#: calendar/gui/migration.c:458 calendar/gui/migration.c:540
@@ -427,17 +444,17 @@ msgstr "Delete"
msgid "Properties..."
msgstr "Properties..."
-#: addressbook/gui/component/addressbook.c:89
+#: addressbook/gui/component/addressbook.c:98
msgid "Accessing LDAP Server anonymously"
msgstr "Accessing LDAP Server anonymously"
-#: addressbook/gui/component/addressbook.c:173
-#: camel/providers/groupwise/camel-gw-listener.c:417
+#: addressbook/gui/component/addressbook.c:184
+#: camel/providers/groupwise/camel-gw-listener.c:420
msgid "Failed to authenticate.\n"
msgstr "Failed to authenticate.\n"
-#: addressbook/gui/component/addressbook.c:179
-#: camel/providers/groupwise/camel-gw-listener.c:406
+#: addressbook/gui/component/addressbook.c:191
+#: camel/providers/groupwise/camel-gw-listener.c:409
#, c-format
msgid "%sEnter password for %s (user %s)"
msgstr "%sEnter password for %s (user %s)"
@@ -793,7 +810,7 @@ msgid "Send HTML Mail?"
msgstr "Send HTML Mail?"
#: addressbook/gui/component/select-names/e-select-names-popup.c:322
-#: addressbook/gui/widgets/eab-popup-control.c:982
+#: addressbook/gui/widgets/eab-popup-control.c:983
msgid "Add to Contacts"
msgstr "Add to Contacts"
@@ -914,7 +931,7 @@ msgstr "Company:"
#: addressbook/gui/contact-editor/contact-editor.glade.h:19
#: addressbook/gui/contact-editor/e-contact-editor.c:272
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:170
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:172
#: addressbook/gui/contact-list-editor/e-contact-list-editor.etspec.h:1
#: addressbook/gui/widgets/e-minicard.c:181
msgid "Contact"
@@ -1047,7 +1064,7 @@ msgstr "Address"
#: addressbook/gui/contact-editor/e-contact-editor-fullname.c:95
#: addressbook/gui/contact-editor/e-contact-editor-im.c:141
#: addressbook/gui/contact-editor/e-contact-editor.c:293
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:184
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:186
#: addressbook/gui/widgets/e-addressbook-model.c:309
#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:392
#: addressbook/gui/widgets/e-minicard-label.c:164
@@ -2308,7 +2325,7 @@ msgid "Insert email adresses from Adress Book"
msgstr "Insert email adresses from Adress Book"
#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:704
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:714
msgid "Members"
msgstr "Members"
@@ -2337,7 +2354,7 @@ msgstr "_Type an email address or drag a contact into the list below:"
msgid "dialog1"
msgstr "dialogue1"
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:163
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:165
#: addressbook/gui/widgets/e-addressbook-model.c:295
#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:378
#: addressbook/gui/widgets/e-addressbook-view.c:221
@@ -2346,17 +2363,17 @@ msgstr "dialogue1"
msgid "Book"
msgstr "Book"
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:177
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:179
msgid "Is New List"
msgstr "Is New List"
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:726
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:736
#: calendar/gui/e-meeting-list-view.c:60
#: calendar/gui/e-meeting-list-view.c:457
msgid "Required Participants"
msgstr "Required Participants"
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:803
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:813
msgid "Contact List Editor"
msgstr "Contact List Editor"
@@ -2551,7 +2568,7 @@ msgid "Paste"
msgstr "Paste"
#: addressbook/gui/widgets/e-addressbook-view.c:1128
-#: calendar/gui/e-calendar-view.c:1347
+#: calendar/gui/e-calendar-view.c:1418
msgid "Current View"
msgstr "Current View"
@@ -2605,12 +2622,12 @@ msgid "Email"
msgstr "Email"
#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
-#: addressbook/gui/widgets/eab-popup-control.c:441
+#: addressbook/gui/widgets/eab-popup-control.c:442
msgid "Email 2"
msgstr "Email 2"
#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
-#: addressbook/gui/widgets/eab-popup-control.c:451
+#: addressbook/gui/widgets/eab-popup-control.c:452
msgid "Email 3"
msgstr "Email 3"
@@ -3024,7 +3041,7 @@ msgid "Error adding list"
msgstr "Error adding list"
#: addressbook/gui/widgets/eab-gui-util.c:170
-#: addressbook/gui/widgets/eab-gui-util.c:581
+#: addressbook/gui/widgets/eab-gui-util.c:640
msgid "Error adding contact"
msgstr "Error adding contact"
@@ -3041,7 +3058,7 @@ msgid "Error removing list"
msgstr "Error removing list"
#: addressbook/gui/widgets/eab-gui-util.c:193
-#: addressbook/gui/widgets/eab-gui-util.c:539
+#: addressbook/gui/widgets/eab-gui-util.c:598
msgid "Error removing contact"
msgstr "Error removing contact"
@@ -3068,39 +3085,39 @@ msgid "Overwrite"
msgstr "Overwrite"
#. This is a filename. Translators take note.
-#: addressbook/gui/widgets/eab-gui-util.c:366
+#: addressbook/gui/widgets/eab-gui-util.c:383
msgid "card.vcf"
msgstr "card.vcf"
-#: addressbook/gui/widgets/eab-gui-util.c:500
+#: addressbook/gui/widgets/eab-gui-util.c:545
msgid "list"
msgstr "list"
-#: addressbook/gui/widgets/eab-gui-util.c:635
+#: addressbook/gui/widgets/eab-gui-util.c:694
msgid "Move contact to"
msgstr "Move contact to"
-#: addressbook/gui/widgets/eab-gui-util.c:637
+#: addressbook/gui/widgets/eab-gui-util.c:696
msgid "Copy contact to"
msgstr "Copy contact to"
-#: addressbook/gui/widgets/eab-gui-util.c:640
+#: addressbook/gui/widgets/eab-gui-util.c:699
msgid "Move contacts to"
msgstr "Move contacts to"
-#: addressbook/gui/widgets/eab-gui-util.c:642
+#: addressbook/gui/widgets/eab-gui-util.c:701
msgid "Copy contacts to"
msgstr "Copy contacts to"
-#: addressbook/gui/widgets/eab-gui-util.c:645
+#: addressbook/gui/widgets/eab-gui-util.c:704
msgid "Select target addressbook."
msgstr "Select target addressbook."
-#: addressbook/gui/widgets/eab-gui-util.c:868
+#: addressbook/gui/widgets/eab-gui-util.c:927
msgid "Multiple VCards"
msgstr "Multiple VCards"
-#: addressbook/gui/widgets/eab-gui-util.c:871
+#: addressbook/gui/widgets/eab-gui-util.c:930
#, c-format
msgid "VCard for %s"
msgstr "VCard for %s"
@@ -3110,37 +3127,37 @@ msgstr "VCard for %s"
#. * addresses (and *only* the e-mail addresses) associated with an existing
#. * contact.
#.
-#: addressbook/gui/widgets/eab-popup-control.c:198
+#: addressbook/gui/widgets/eab-popup-control.c:199
msgid "(none)"
msgstr "(none)"
-#: addressbook/gui/widgets/eab-popup-control.c:431
+#: addressbook/gui/widgets/eab-popup-control.c:432
msgid "Primary Email"
msgstr "Primary Email"
-#: addressbook/gui/widgets/eab-popup-control.c:567
+#: addressbook/gui/widgets/eab-popup-control.c:568
msgid "Select an Action"
msgstr "Select an Action"
-#: addressbook/gui/widgets/eab-popup-control.c:575
+#: addressbook/gui/widgets/eab-popup-control.c:576
#, c-format
msgid "Create a new contact \"%s\""
msgstr "Create a new contact \"%s\""
-#: addressbook/gui/widgets/eab-popup-control.c:591
+#: addressbook/gui/widgets/eab-popup-control.c:592
#, c-format
msgid "Add address to existing contact \"%s\""
msgstr "Add address to existing contact \"%s\""
-#: addressbook/gui/widgets/eab-popup-control.c:869
+#: addressbook/gui/widgets/eab-popup-control.c:870
msgid "Querying Address Book..."
msgstr "Querying Address Book..."
-#: addressbook/gui/widgets/eab-popup-control.c:952
+#: addressbook/gui/widgets/eab-popup-control.c:953
msgid "Edit Contact Info"
msgstr "Edit Contact Info"
-#: addressbook/gui/widgets/eab-popup-control.c:1007
+#: addressbook/gui/widgets/eab-popup-control.c:1008
msgid "Merge E-Mail Address"
msgstr "Merge E-Mail Address"
@@ -3172,17 +3189,17 @@ msgstr "Card View"
msgid "GTK Tree View"
msgstr "GTK Tree View"
-#: addressbook/gui/widgets/test-reflow.c:106
+#: addressbook/gui/widgets/test-reflow.c:119
msgid "Reflow Test"
msgstr "Reflow Test"
-#: addressbook/gui/widgets/test-reflow.c:107
+#: addressbook/gui/widgets/test-reflow.c:120
#: addressbook/printing/test-contact-print-style-editor.c:54
#: addressbook/printing/test-print.c:53
msgid "Copyright (C) 2000, Ximian, Inc."
msgstr "Copyright (C) 2000, Ximian, Inc."
-#: addressbook/gui/widgets/test-reflow.c:109
+#: addressbook/gui/widgets/test-reflow.c:122
msgid "This should test the reflow canvas item"
msgstr "This should test the reflow canvas item"
@@ -3491,6 +3508,7 @@ msgid "Unnamed List"
msgstr "Unnamed List"
#. calendar:prompt-cancel-meeting primary
+#. calendar:prompt-cancel-task primary
#: calendar/calendar-errors.xml.h:2 calendar/calendar-errors.xml.h:12
msgid "Would you like to send all the participants a cancellation notice?"
msgstr "Would you like to send all the participants a cancellation notice?"
@@ -3505,9 +3523,9 @@ msgstr ""
"the meeting is cancelled."
#: calendar/calendar-errors.xml.h:5 calendar/calendar-errors.xml.h:15
-#: calendar/calendar-errors.xml.h:25 calendar/calendar-errors.xml.h:79
-#: calendar/calendar-errors.xml.h:85 calendar/calendar-errors.xml.h:91
-#: calendar/calendar-errors.xml.h:97
+#: calendar/calendar-errors.xml.h:25 calendar/calendar-errors.xml.h:87
+#: calendar/calendar-errors.xml.h:93 calendar/calendar-errors.xml.h:99
+#: calendar/calendar-errors.xml.h:105
msgid "Don't Send"
msgstr "Don't Send"
@@ -3543,6 +3561,8 @@ msgid "Are you sure you want to delete this task?"
msgstr "Are you sure you want to delete this task?"
#. calendar:prompt-delete-task secondary
+#. calendar:prompt-delete-named-task secondary
+#. calendar:prompt-delete-task secondary
#: calendar/calendar-errors.xml.h:20 calendar/calendar-errors.xml.h:42
#: calendar/calendar-errors.xml.h:46
msgid "All information on this task will be deleted and can not be restored."
@@ -3582,6 +3602,7 @@ msgid "Are you sure you want to delete the appointment titled '{0}'?"
msgstr "Are you sure you want to delete the appointment titled '{0}'?"
#. calendar:prompt-delete-titled-appointment secondary
+#. calendar:prompt-delete-appointment secondary
#: calendar/calendar-errors.xml.h:34 calendar/calendar-errors.xml.h:38
msgid ""
"All information on this appointment will be deleted and can not be restored."
@@ -3604,6 +3625,7 @@ msgid "Are you sure you want to delete the journal entry '{0}'?"
msgstr "Are you sure you want to delete the journal entry '{0}'?"
#. calendar:prompt-delete-named-journal secondary
+#. calendar:prompt-delete-journal secondary
#: calendar/calendar-errors.xml.h:50 calendar/calendar-errors.xml.h:54
msgid ""
"All information in this journal will be deleted and can not be restored."
@@ -3664,39 +3686,58 @@ msgstr "Would you like to save your changes to this appointment?"
msgid "You have made changes to this appointment, but not yet saved them."
msgstr "You have made changes to this appointment, but not yet saved them."
-#: calendar/calendar-errors.xml.h:73 composer/mail-composer-errors.xml.h:33
+#: calendar/calendar-errors.xml.h:73 calendar/calendar-errors.xml.h:81
+#: composer/mail-composer-errors.xml.h:33
msgid "Discard Changes"
msgstr "Discard Changes"
-#: calendar/calendar-errors.xml.h:74
+#: calendar/calendar-errors.xml.h:74 calendar/calendar-errors.xml.h:82
msgid "Save Changes"
msgstr "Save Changes"
-#. calendar:prompt-meeting-invite primary
+#. calendar:prompt-save-task title
#: calendar/calendar-errors.xml.h:76
+#, fuzzy
+msgid "Save Task"
+msgstr "Save As"
+
+#. calendar:prompt-save-task primary
+#: calendar/calendar-errors.xml.h:78
+#, fuzzy
+msgid "Would you like to save your changes to this task?"
+msgstr "Would you like to save your changes to this appointment?"
+
+#. calendar:prompt-save-task secondary
+#: calendar/calendar-errors.xml.h:80
+#, fuzzy
+msgid "You have made changes to this task, but not yet saved them."
+msgstr "You have made changes to this appointment, but not yet saved them."
+
+#. calendar:prompt-meeting-invite primary
+#: calendar/calendar-errors.xml.h:84
msgid "Would you like to send meeting invitations to participants?"
msgstr "Would you like to send meeting invitations to participants?"
#. calendar:prompt-meeting-invite secondary
-#: calendar/calendar-errors.xml.h:78
+#: calendar/calendar-errors.xml.h:86
msgid ""
"Email invitations will be sent to all participants and allow them to RSVP."
msgstr ""
"Email invitations will be sent to all participants and allow them to RSVP."
-#: calendar/calendar-errors.xml.h:80 calendar/calendar-errors.xml.h:86
-#: calendar/calendar-errors.xml.h:92 calendar/calendar-errors.xml.h:98
+#: calendar/calendar-errors.xml.h:88 calendar/calendar-errors.xml.h:94
+#: calendar/calendar-errors.xml.h:100 calendar/calendar-errors.xml.h:106
#: ui/evolution-message-composer.xml.h:24
msgid "Send"
msgstr "Send"
#. calendar:prompt-send-updated-meeting-info primary
-#: calendar/calendar-errors.xml.h:82
+#: calendar/calendar-errors.xml.h:90
msgid "Would you like to send updated meeting information to participants?"
msgstr "Would you like to send updated meeting information to participants?"
#. calendar:prompt-send-updated-meeting-info secondary
-#: calendar/calendar-errors.xml.h:84
+#: calendar/calendar-errors.xml.h:92
msgid ""
"Sending updated information allows other participants to keep their "
"calendars up to date."
@@ -3705,12 +3746,12 @@ msgstr ""
"calendars up to date."
#. calendar:prompt-send-task primary
-#: calendar/calendar-errors.xml.h:88
+#: calendar/calendar-errors.xml.h:96
msgid "Would you like to send this task to participants?"
msgstr "Would you like to send this task to participants?"
#. calendar:prompt-send-task secondary
-#: calendar/calendar-errors.xml.h:90
+#: calendar/calendar-errors.xml.h:98
msgid ""
"Email invitations will be sent to all participants and allow them to accept "
"this task."
@@ -3719,12 +3760,12 @@ msgstr ""
"this task."
#. calendar:prompt-send-updated-task-info primary
-#: calendar/calendar-errors.xml.h:94
+#: calendar/calendar-errors.xml.h:102
msgid "Would you like to send updated task information to participants?"
msgstr "Would you like to send updated task information to participants?"
#. calendar:prompt-send-updated-task-info secondary
-#: calendar/calendar-errors.xml.h:96
+#: calendar/calendar-errors.xml.h:104
msgid ""
"Sending updated information allows other participants to keep their task "
"lists up to date."
@@ -3733,22 +3774,22 @@ msgstr ""
"lists up to date."
#. calendar:tasks-crashed primary
-#: calendar/calendar-errors.xml.h:100
+#: calendar/calendar-errors.xml.h:108
msgid "The Evolution tasks have quit unexpectedly."
msgstr "The Evolution tasks have quit unexpectedly."
#. calendar:tasks-crashed secondary
-#: calendar/calendar-errors.xml.h:102
+#: calendar/calendar-errors.xml.h:110
msgid "Your tasks will not be available until Evolution is restarted."
msgstr "Your tasks will not be available until Evolution is restarted."
#. calendar:calendar-crashed primary
-#: calendar/calendar-errors.xml.h:104
+#: calendar/calendar-errors.xml.h:112
msgid "The Evolution calendar has quit unexpectedly."
msgstr "The Evolution calendar has quit unexpectedly."
#. calendar:calendar-crashed secondary
-#: calendar/calendar-errors.xml.h:106
+#: calendar/calendar-errors.xml.h:114
msgid "Your calendars will not be available until Evolution is restarted."
msgstr "Your calendars will not be available until Evolution is restarted."
@@ -3795,7 +3836,7 @@ msgid "Calendar and Tasks"
msgstr "Calendar and Tasks"
#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
-#: calendar/gui/calendar-component.c:1072
+#: calendar/gui/calendar-component.c:1079
msgid "Calendars"
msgstr "Calendars"
@@ -3829,8 +3870,8 @@ msgstr "Evolution's Tasks component"
#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
#: calendar/gui/e-tasks.c:1198 calendar/gui/print.c:1819
-#: calendar/gui/tasks-component.c:419 calendar/gui/tasks-component.c:884
-#: calendar/gui/tasks-control.c:405 calendar/importers/icalendar-importer.c:83
+#: calendar/gui/tasks-component.c:419 calendar/gui/tasks-component.c:889
+#: calendar/gui/tasks-control.c:408 calendar/importers/icalendar-importer.c:83
#: calendar/importers/icalendar-importer.c:709
msgid "Tasks"
msgstr "Tasks"
@@ -3877,24 +3918,24 @@ msgstr "_Edit appointment"
msgid "_Snooze"
msgstr "_Snooze"
-#: calendar/gui/alarm-notify/alarm-queue.c:881
+#: calendar/gui/alarm-notify/alarm-queue.c:885
#: ui/evolution-message-composer.xml.h:10
msgid "Open"
msgstr "Open"
-#: calendar/gui/alarm-notify/alarm-queue.c:883
+#: calendar/gui/alarm-notify/alarm-queue.c:887
msgid "Dismiss"
msgstr "Dismiss"
-#: calendar/gui/alarm-notify/alarm-queue.c:885
+#: calendar/gui/alarm-notify/alarm-queue.c:889
msgid "Dismiss All"
msgstr "Dismiss All"
-#: calendar/gui/alarm-notify/alarm-queue.c:949
+#: calendar/gui/alarm-notify/alarm-queue.c:954
msgid "No description available."
msgstr "No description available."
-#: calendar/gui/alarm-notify/alarm-queue.c:969
+#: calendar/gui/alarm-notify/alarm-queue.c:974
#, c-format
msgid ""
"Alarm on %s\n"
@@ -3907,12 +3948,12 @@ msgstr ""
"Starting at %s\n"
"Ending at %s"
-#: calendar/gui/alarm-notify/alarm-queue.c:1069
-#: calendar/gui/alarm-notify/alarm-queue.c:1093
+#: calendar/gui/alarm-notify/alarm-queue.c:1074
+#: calendar/gui/alarm-notify/alarm-queue.c:1098
msgid "Warning"
msgstr "Warning"
-#: calendar/gui/alarm-notify/alarm-queue.c:1073
+#: calendar/gui/alarm-notify/alarm-queue.c:1078
msgid ""
"Evolution does not support calendar reminders with\n"
"email notifications yet, but this reminder was\n"
@@ -3924,7 +3965,7 @@ msgstr ""
"configured to send an email. Evolution will display\n"
"a normal reminder dialogue box instead."
-#: calendar/gui/alarm-notify/alarm-queue.c:1099
+#: calendar/gui/alarm-notify/alarm-queue.c:1104
#, c-format
msgid ""
"An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -3941,7 +3982,7 @@ msgstr ""
"\n"
"Are you sure you want to run this program?"
-#: calendar/gui/alarm-notify/alarm-queue.c:1113
+#: calendar/gui/alarm-notify/alarm-queue.c:1118
msgid "Do not ask me about this program again."
msgstr "Do not ask me about this program again."
@@ -4107,7 +4148,7 @@ msgstr "Unmatched"
#: calendar/gui/calendar-commands.c:117 calendar/gui/calendar-component.c:564
#: calendar/gui/dialogs/select-source-dialog.c:112
-#: calendar/gui/gnome-cal.c:1858
+#: calendar/gui/gnome-cal.c:1860
#: camel/providers/groupwise/camel-gw-listener.c:331
#: camel/providers/groupwise/camel-gw-listener.c:361
msgid "Calendar"
@@ -4139,6 +4180,10 @@ msgstr "%A %d %B %Y"
#. strftime format %a = abbreviated weekday name, %d = day of month,
#. %b = abbreviated month name. Don't use any other specifiers.
+#. strftime format %a = abbreviated weekday name,
+#. %d = day of month, %b = abbreviated month name.
+#. You can change the order but don't change the
+#. specifiers or add anything.
#: calendar/gui/calendar-commands.c:435 calendar/gui/calendar-component.c:519
#: calendar/gui/e-day-view-top-item.c:714 calendar/gui/e-day-view.c:1588
#: calendar/gui/e-week-view-main-item.c:329
@@ -4184,6 +4229,9 @@ msgstr "%d %b %Y"
#. strftime format %d = day of month, %b = abbreviated month name.
#. Don't use any other specifiers.
+#. strftime format %d = day of month, %b = abbreviated
+#. month name. You can change the order but don't
+#. change the specifiers or add anything.
#: calendar/gui/calendar-component.c:545
#: calendar/gui/e-day-view-top-item.c:718 calendar/gui/e-day-view.c:1604
#: calendar/gui/e-week-view-main-item.c:343
@@ -4194,60 +4242,60 @@ msgstr "%d %b"
msgid "Failed upgrading calendars."
msgstr "Failed upgrading calendars."
-#: calendar/gui/calendar-component.c:929
+#: calendar/gui/calendar-component.c:931
#, c-format
msgid "Unable to open the calendar '%s' for creating events and meetings"
msgstr "Unable to open the calendar '%s' for creating events and meetings"
-#: calendar/gui/calendar-component.c:941
+#: calendar/gui/calendar-component.c:947
msgid "There is no calendar available for creating events and meetings"
msgstr "There is no calendar available for creating events and meetings"
-#: calendar/gui/calendar-component.c:1238
+#: calendar/gui/calendar-component.c:1245
msgid "New appointment"
msgstr "New appointment"
-#: calendar/gui/calendar-component.c:1239
+#: calendar/gui/calendar-component.c:1246
msgid "_Appointment"
msgstr "_Appointment"
-#: calendar/gui/calendar-component.c:1240
+#: calendar/gui/calendar-component.c:1247
msgid "Create a new appointment"
msgstr "Create a new appointment"
-#: calendar/gui/calendar-component.c:1246
+#: calendar/gui/calendar-component.c:1253
msgid "New meeting"
msgstr "New meeting"
-#: calendar/gui/calendar-component.c:1247
+#: calendar/gui/calendar-component.c:1254
msgid "M_eeting"
msgstr "M_eeting"
-#: calendar/gui/calendar-component.c:1248
+#: calendar/gui/calendar-component.c:1255
msgid "Create a new meeting request"
msgstr "Create a new meeting request"
-#: calendar/gui/calendar-component.c:1254
+#: calendar/gui/calendar-component.c:1261
msgid "New all day appointment"
msgstr "New all day appointment"
-#: calendar/gui/calendar-component.c:1255
+#: calendar/gui/calendar-component.c:1262
msgid "All Day A_ppointment"
msgstr "All Day A_ppointment"
-#: calendar/gui/calendar-component.c:1256
+#: calendar/gui/calendar-component.c:1263
msgid "Create a new all-day appointment"
msgstr "Create a new all-day appointment"
-#: calendar/gui/calendar-component.c:1262
+#: calendar/gui/calendar-component.c:1269
msgid "New calendar"
msgstr "New calendar"
-#: calendar/gui/calendar-component.c:1263
+#: calendar/gui/calendar-component.c:1270
msgid "Cale_ndar"
msgstr "Cale_ndar"
-#: calendar/gui/calendar-component.c:1264
+#: calendar/gui/calendar-component.c:1271
msgid "Create a new calendar"
msgstr "Create a new calendar"
@@ -4519,7 +4567,7 @@ msgstr "Free/Busy Publishing"
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
#: calendar/gui/dialogs/recurrence-page.c:1038
-#: calendar/gui/e-itip-control.c:556
+#: calendar/gui/e-itip-control.c:581
msgid "Friday"
msgstr "Friday"
@@ -4533,7 +4581,7 @@ msgstr "Minutes"
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
#: calendar/gui/dialogs/recurrence-page.c:1034
-#: calendar/gui/e-itip-control.c:552
+#: calendar/gui/e-itip-control.c:577
msgid "Monday"
msgstr "Monday"
@@ -4543,7 +4591,7 @@ msgstr "S_un"
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
#: calendar/gui/dialogs/recurrence-page.c:1039
-#: calendar/gui/e-itip-control.c:557
+#: calendar/gui/e-itip-control.c:582
msgid "Saturday"
msgstr "Saturday"
@@ -4557,7 +4605,7 @@ msgstr "Show week _numbers in date navigator"
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
#: calendar/gui/dialogs/recurrence-page.c:1040
-#: calendar/gui/e-itip-control.c:551
+#: calendar/gui/e-itip-control.c:576
msgid "Sunday"
msgstr "Sunday"
@@ -4571,7 +4619,7 @@ msgstr "T_hu"
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
#: calendar/gui/dialogs/recurrence-page.c:1037
-#: calendar/gui/e-itip-control.c:555
+#: calendar/gui/e-itip-control.c:580
msgid "Thursday"
msgstr "Thursday"
@@ -4585,7 +4633,7 @@ msgstr "Time format:"
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
#: calendar/gui/dialogs/recurrence-page.c:1035
-#: calendar/gui/e-itip-control.c:553
+#: calendar/gui/e-itip-control.c:578
msgid "Tuesday"
msgstr "Tuesday"
@@ -4595,7 +4643,7 @@ msgstr "W_eek starts:"
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
#: calendar/gui/dialogs/recurrence-page.c:1036
-#: calendar/gui/e-itip-control.c:554
+#: calendar/gui/e-itip-control.c:579
msgid "Wednesday"
msgstr "Wednesday"
@@ -4727,8 +4775,9 @@ msgid "_Add Calendar"
msgstr "_Add Calendar"
#: calendar/gui/dialogs/calendar-setup.glade.h:7
-msgid "_Add Group"
-msgstr "_Add Group"
+#, fuzzy
+msgid "_Add Task List"
+msgstr "Add Task List"
#: calendar/gui/dialogs/calendar-setup.glade.h:9
msgid "_Refresh:"
@@ -4978,21 +5027,21 @@ msgstr "End time is wrong"
msgid "Unable to open the calendar '%s'."
msgstr "Unable to open the calendar '%s'."
-#: calendar/gui/dialogs/event-page.c:1799
+#: calendar/gui/dialogs/event-page.c:1804
#, c-format
msgid "%d day before appointment"
msgid_plural "%d days before appointment"
msgstr[0] "%d day before appointment"
msgstr[1] "%d days before appointment"
-#: calendar/gui/dialogs/event-page.c:1807
+#: calendar/gui/dialogs/event-page.c:1812
#, c-format
msgid "%d hour before appointment"
msgid_plural "%d hours before appointment"
msgstr[0] "%d hour before appointment"
msgstr[1] "%d hours before appointment"
-#: calendar/gui/dialogs/event-page.c:1815
+#: calendar/gui/dialogs/event-page.c:1820
#, c-format
msgid "%d minute before appointement"
msgid_plural "%d minutes before appointment"
@@ -5096,9 +5145,14 @@ msgid "_Start time:"
msgstr "_Start time:"
#. an empty string is the same as 'None'
+#. add a "None" option to the stores menu
+#. Put the "None" and "UTC" entries at the top of the combo's list.
+#. When "None" is selected we want the field to be cleared.
+#. Note that we don't show this here, since by default a 'None' date
+#. is not permitted.
#: calendar/gui/dialogs/meeting-page.c:316
#: calendar/gui/dialogs/meeting-page.glade.h:5
-#: calendar/gui/e-cal-model-tasks.c:647 calendar/gui/e-itip-control.c:928
+#: calendar/gui/e-cal-model-tasks.c:647 calendar/gui/e-itip-control.c:953
#: composer/e-msg-composer.c:2097 filter/filter-rule.c:877
#: mail/em-account-prefs.c:427 mail/em-folder-view.c:933
#: mail/mail-account-gui.c:1571 mail/mail-account-gui.c:1967
@@ -5121,11 +5175,11 @@ msgstr "An organiser is required."
msgid "At least one attendee is required."
msgstr "At least one attendee is required."
-#: calendar/gui/dialogs/meeting-page.c:764
+#: calendar/gui/dialogs/meeting-page.c:793
msgid "_Delegate To..."
msgstr "_Delegate To..."
-#: calendar/gui/dialogs/meeting-page.c:768
+#: calendar/gui/dialogs/meeting-page.c:797
#: composer/e-msg-composer-attachment-bar.c:453
msgid "_Remove"
msgstr "_Remove"
@@ -5167,7 +5221,7 @@ msgid "Member"
msgstr "Member"
#: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:1060 calendar/gui/e-meeting-list-view.c:241
+#: calendar/gui/e-itip-control.c:1085 calendar/gui/e-meeting-list-view.c:241
#: calendar/gui/e-meeting-time-sel.etspec.h:8
msgid "RSVP"
msgstr "RSVP"
@@ -5394,7 +5448,7 @@ msgstr "<span weight=\"bold\">Status</span>"
#: calendar/gui/dialogs/task-details-page.glade.h:4
#: calendar/gui/e-cal-component-preview.c:230
#: calendar/gui/e-cal-model-tasks.c:350 calendar/gui/e-cal-model-tasks.c:653
-#: calendar/gui/e-calendar-table.c:472 calendar/gui/e-itip-control.c:720
+#: calendar/gui/e-calendar-table.c:472 calendar/gui/e-itip-control.c:745
#: calendar/gui/e-meeting-store.c:187 calendar/gui/e-meeting-store.c:210
#: calendar/gui/print.c:2346
msgid "Completed"
@@ -5630,7 +5684,7 @@ msgid "Untitled"
msgstr "Untitled"
#: calendar/gui/e-cal-component-preview.c:187
-#: calendar/gui/e-itip-control.c:932 calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-itip-control.c:957 calendar/gui/e-itip-control.glade.h:11
msgid "Summary:"
msgstr "Summary:"
@@ -5645,7 +5699,7 @@ msgstr "Due Date:"
#. write status
#: calendar/gui/e-cal-component-preview.c:223
-#: calendar/gui/e-itip-control.c:956
+#: calendar/gui/e-itip-control.c:981
msgid "Status:"
msgstr "Status:"
@@ -5654,7 +5708,7 @@ msgid "Priority:"
msgstr "Priority:"
#: calendar/gui/e-cal-component-preview.c:268
-#: calendar/gui/e-itip-control.c:988 calendar/gui/e-itip-control.glade.h:6
+#: calendar/gui/e-itip-control.c:1013 calendar/gui/e-itip-control.glade.h:6
#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:71
msgid "Description:"
msgstr "Description:"
@@ -5724,20 +5778,20 @@ msgstr "No"
#. This is the default filename used for temporary file creation
#: calendar/gui/e-cal-model.c:357 calendar/gui/e-cal-model.c:360
-#: calendar/gui/e-itip-control.c:973 calendar/gui/e-itip-control.c:1187
+#: calendar/gui/e-itip-control.c:998 calendar/gui/e-itip-control.c:1212
#: calendar/gui/e-meeting-list-view.c:122
#: calendar/gui/e-meeting-list-view.c:136 calendar/gui/e-meeting-store.c:115
#: calendar/gui/e-meeting-store.c:150 calendar/gui/e-meeting-store.c:215
#: camel/camel-gpg-context.c:1763 camel/camel-gpg-context.c:1814
#: camel/camel-tcp-stream-openssl.c:631
-#: camel/providers/imap4/camel-imap4-engine.c:1382
-#: camel/providers/imap4/camel-imap4-engine.c:1412
-#: camel/providers/imap4/camel-imap4-engine.c:1444
-#: camel/providers/imap4/camel-imap4-engine.c:1486
-#: camel/providers/imap4/camel-imap4-store.c:1222
+#: camel/providers/imap4/camel-imap4-engine.c:1402
+#: camel/providers/imap4/camel-imap4-engine.c:1432
+#: camel/providers/imap4/camel-imap4-engine.c:1464
+#: camel/providers/imap4/camel-imap4-engine.c:1506
+#: camel/providers/imap4/camel-imap4-store.c:1223
#: camel/providers/imap4/camel-imap4-utils.c:457
#: camel/providers/smtp/camel-smtp-transport.c:172
-#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:1123
+#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:1155
#: shell/e-component-registry.c:207 shell/e-component-registry.c:211
#: widgets/misc/e-charset-picker.c:62
msgid "Unknown"
@@ -5804,7 +5858,7 @@ msgid "Updating objects"
msgstr "Updating objects"
#: calendar/gui/e-calendar-table.c:1043 calendar/gui/e-calendar-table.c:1084
-#: calendar/gui/e-calendar-view.c:1360 calendar/gui/e-calendar-view.c:1440
+#: calendar/gui/e-calendar-view.c:1431 calendar/gui/e-calendar-view.c:1512
#: mail/em-folder-view.c:899 ui/evolution-addressbook.xml.h:37
msgid "_Open"
msgstr "_Open"
@@ -5814,15 +5868,15 @@ msgid "Open _Web Page"
msgstr "Open _Web Page"
#: calendar/gui/e-calendar-table.c:1045 calendar/gui/e-calendar-table.c:1090
-#: calendar/gui/e-calendar-view.c:1361 calendar/gui/e-calendar-view.c:1446
+#: calendar/gui/e-calendar-view.c:1432 calendar/gui/e-calendar-view.c:1518
#: mail/em-folder-view.c:901 mail/em-popup.c:691 mail/em-popup.c:807
#: ui/evolution-mail-message.xml.h:128
msgid "_Save As..."
msgstr "_Save As..."
#: calendar/gui/e-calendar-table.c:1046 calendar/gui/e-calendar-table.c:1088
-#: calendar/gui/e-calendar-view.c:1339 calendar/gui/e-calendar-view.c:1362
-#: calendar/gui/e-calendar-view.c:1444 ui/evolution-addressbook.xml.h:40
+#: calendar/gui/e-calendar-view.c:1410 calendar/gui/e-calendar-view.c:1433
+#: calendar/gui/e-calendar-view.c:1516 ui/evolution-addressbook.xml.h:40
#: ui/evolution-calendar.xml.h:44 ui/evolution-comp-editor.xml.h:19
#: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:125
#: ui/evolution-tasks.xml.h:25
@@ -5830,14 +5884,14 @@ msgid "_Print..."
msgstr "_Print..."
#: calendar/gui/e-calendar-table.c:1050 calendar/gui/e-calendar-table.c:1079
-#: calendar/gui/e-calendar-view.c:1367 calendar/gui/e-calendar-view.c:1410
+#: calendar/gui/e-calendar-view.c:1438 calendar/gui/e-calendar-view.c:1482
#: ui/evolution-addressbook.xml.h:1 ui/evolution-calendar.xml.h:1
#: ui/evolution-tasks.xml.h:1
msgid "C_ut"
msgstr "C_ut"
#: calendar/gui/e-calendar-table.c:1051 calendar/gui/e-calendar-table.c:1077
-#: calendar/gui/e-calendar-view.c:1368 calendar/gui/e-calendar-view.c:1408
+#: calendar/gui/e-calendar-view.c:1439 calendar/gui/e-calendar-view.c:1480
#: mail/em-folder-tree.c:965 mail/message-list.c:1702
#: ui/evolution-addressbook.xml.h:31 ui/evolution-calendar.xml.h:39
#: ui/evolution-composer-entries.xml.h:7 ui/evolution-mail-message.xml.h:109
@@ -5846,8 +5900,8 @@ msgid "_Copy"
msgstr "_Copy"
#: calendar/gui/e-calendar-table.c:1052 calendar/gui/e-calendar-table.c:1086
-#: calendar/gui/e-calendar-view.c:1343 calendar/gui/e-calendar-view.c:1369
-#: calendar/gui/e-calendar-view.c:1442 ui/evolution-addressbook.xml.h:38
+#: calendar/gui/e-calendar-view.c:1414 calendar/gui/e-calendar-view.c:1440
+#: calendar/gui/e-calendar-view.c:1514 ui/evolution-addressbook.xml.h:38
#: ui/evolution-calendar.xml.h:43 ui/evolution-composer-entries.xml.h:9
#: ui/evolution-mail-message.xml.h:123 ui/evolution-tasks.xml.h:24
msgid "_Paste"
@@ -5871,7 +5925,7 @@ msgstr "_Mark Selected Tasks as Complete"
#. FIXME: need to disable for undeletable folders
#: calendar/gui/e-calendar-table.c:1063 calendar/gui/e-calendar-table.c:1081
-#: calendar/gui/e-calendar-view.c:1380 calendar/gui/e-calendar-view.c:1412
+#: calendar/gui/e-calendar-view.c:1451 calendar/gui/e-calendar-view.c:1484
#: mail/em-folder-tree.c:2615 mail/em-folder-view.c:924
#: ui/evolution-addressbook.xml.h:33 ui/evolution-calendar.xml.h:40
#: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:14
@@ -5931,77 +5985,90 @@ msgstr "Moving items"
msgid "Copying items"
msgstr "Copying items"
-#: calendar/gui/e-calendar-view.c:1332 calendar/gui/e-calendar-view.c:1420
+#: calendar/gui/e-calendar-view.c:1403 calendar/gui/e-calendar-view.c:1492
msgid "New _Appointment..."
msgstr "New _Appointment..."
-#: calendar/gui/e-calendar-view.c:1333 calendar/gui/e-calendar-view.c:1425
+#: calendar/gui/e-calendar-view.c:1404 calendar/gui/e-calendar-view.c:1497
msgid "New All Day _Event"
msgstr "New All Day _Event"
-#: calendar/gui/e-calendar-view.c:1334 calendar/gui/e-calendar-view.c:1430
+#: calendar/gui/e-calendar-view.c:1405 calendar/gui/e-calendar-view.c:1502
msgid "New Meeting"
msgstr "New Meeting"
-#: calendar/gui/e-calendar-view.c:1335 calendar/gui/e-calendar-view.c:1435
+#: calendar/gui/e-calendar-view.c:1406 calendar/gui/e-calendar-view.c:1507
msgid "New Task"
msgstr "New Task"
-#: calendar/gui/e-calendar-view.c:1349 ui/evolution-calendar.xml.h:26
+#: calendar/gui/e-calendar-view.c:1420 ui/evolution-calendar.xml.h:26
msgid "Select _Today"
msgstr "Select _Today"
-#: calendar/gui/e-calendar-view.c:1350
+#: calendar/gui/e-calendar-view.c:1421
msgid "_Select Date..."
msgstr "_Select Date..."
-#: calendar/gui/e-calendar-view.c:1354 ui/evolution-calendar.xml.h:45
+#: calendar/gui/e-calendar-view.c:1425 ui/evolution-calendar.xml.h:45
msgid "_Publish Free/Busy Information"
msgstr "_Publish Free/Busy Information"
-#: calendar/gui/e-calendar-view.c:1373
+#: calendar/gui/e-calendar-view.c:1444
msgid "Cop_y to Calendar..."
msgstr "Cop_y to Calendar..."
-#: calendar/gui/e-calendar-view.c:1374
+#: calendar/gui/e-calendar-view.c:1445
msgid "Mo_ve to Calendar..."
msgstr "Mo_ve to Calendar..."
-#: calendar/gui/e-calendar-view.c:1375
+#: calendar/gui/e-calendar-view.c:1446
msgid "_Schedule Meeting..."
msgstr "_Schedule Meeting..."
-#: calendar/gui/e-calendar-view.c:1376
+#: calendar/gui/e-calendar-view.c:1447
msgid "_Forward as iCalendar..."
msgstr "_Forward as iCalendar..."
-#: calendar/gui/e-calendar-view.c:1381 calendar/gui/e-calendar-view.c:1413
+#: calendar/gui/e-calendar-view.c:1452
+#, fuzzy
+msgid "Make this Occurrence _Movable"
+msgstr "Delete this Occurrence"
+
+#: calendar/gui/e-calendar-view.c:1453 calendar/gui/e-calendar-view.c:1485
msgid "Delete this _Occurrence"
msgstr "Delete this _Occurrence"
-#: calendar/gui/e-calendar-view.c:1382 calendar/gui/e-calendar-view.c:1414
+#: calendar/gui/e-calendar-view.c:1454 calendar/gui/e-calendar-view.c:1486
msgid "Delete _All Occurrences"
msgstr "Delete _All Occurrences"
-#: calendar/gui/e-calendar-view.c:1416
+#: calendar/gui/e-calendar-view.c:1488
msgid "Go to _Today"
msgstr "Go to _Today"
-#: calendar/gui/e-calendar-view.c:1418
+#: calendar/gui/e-calendar-view.c:1490
msgid "_Go to Date..."
msgstr "_Go to Date..."
-#: calendar/gui/e-calendar-view.c:1448 ui/evolution.xml.h:35
+#: calendar/gui/e-calendar-view.c:1520 ui/evolution.xml.h:35
msgid "_Settings..."
msgstr "_Settings..."
#. strftime format of a weekday, a date and a time, 24-hour.
+#. strptime format of a weekday, a date and a time,
+#. in 24-hour format.
+#. strftime format of a weekday, a date and a
+#. time, in 24-hour format.
#: calendar/gui/e-cell-date-edit-text.c:117 e-util/e-time-utils.c:180
#: e-util/e-time-utils.c:393
msgid "%a %m/%d/%Y %H:%M:%S"
msgstr "%a %d/%m/%Y %H:%M:%S"
#. strftime format of a weekday, a date and a time, 12-hour.
+#. strptime format of a weekday, a date and a time,
+#. in 12-hour format.
+#. strftime format of a weekday, a date and a
+#. time, in 12-hour format.
#: calendar/gui/e-cell-date-edit-text.c:120 e-util/e-time-utils.c:175
#: e-util/e-time-utils.c:402
msgid "%a %m/%d/%Y %I:%M:%S %p"
@@ -6025,6 +6092,10 @@ 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:710 calendar/gui/e-day-view.c:1571
#: calendar/gui/e-week-view-main-item.c:320 calendar/gui/print.c:1514
msgid "%A %d %B"
@@ -6042,98 +6113,98 @@ msgstr "am"
msgid "pm"
msgstr "pm"
-#: calendar/gui/e-itip-control.c:585
+#: calendar/gui/e-itip-control.c:610
msgid "Yes. (Complex Recurrence)"
msgstr "Yes. (Complex Recurrence)"
-#: calendar/gui/e-itip-control.c:596
+#: calendar/gui/e-itip-control.c:621
#, c-format
msgid "Every day"
msgid_plural "Every %d days"
msgstr[0] "Every day"
msgstr[1] "Every %d days"
-#: calendar/gui/e-itip-control.c:601
+#: calendar/gui/e-itip-control.c:626
#, c-format
msgid "Every week"
msgid_plural "Every %d weeks"
msgstr[0] "Every week"
msgstr[1] "Every %d weeks"
-#: calendar/gui/e-itip-control.c:603
+#: calendar/gui/e-itip-control.c:628
#, c-format
msgid "Every week on "
msgid_plural "Every %d weeks on "
msgstr[0] "Every week on "
msgstr[1] "Every %d weeks on "
-#: calendar/gui/e-itip-control.c:611
+#: calendar/gui/e-itip-control.c:636
msgid " and "
msgstr " and "
-#: calendar/gui/e-itip-control.c:618
+#: calendar/gui/e-itip-control.c:643
#, c-format
msgid "The %s day of "
msgstr "The %s day of "
-#: calendar/gui/e-itip-control.c:631
+#: calendar/gui/e-itip-control.c:656
#, c-format
msgid "The %s %s of "
msgstr "The %s %s of "
-#: calendar/gui/e-itip-control.c:638
+#: calendar/gui/e-itip-control.c:663
#, c-format
msgid "every month"
msgid_plural "every %d months"
msgstr[0] "every %d month"
msgstr[1] "every %d month"
-#: calendar/gui/e-itip-control.c:642
+#: calendar/gui/e-itip-control.c:667
#, c-format
msgid "Every year"
msgid_plural "Every %d years"
msgstr[0] "Every %d year"
msgstr[1] "Every %d years"
-#: calendar/gui/e-itip-control.c:653
+#: calendar/gui/e-itip-control.c:678
#, c-format
msgid "a total of %d time"
msgid_plural " a total of %d times"
msgstr[0] " a total of %d time"
msgstr[1] " a total of %d times"
-#: calendar/gui/e-itip-control.c:662
+#: calendar/gui/e-itip-control.c:687
msgid ", ending on "
msgstr ", ending on "
-#: calendar/gui/e-itip-control.c:686
+#: calendar/gui/e-itip-control.c:711
msgid "Starts"
msgstr "Starts"
-#: calendar/gui/e-itip-control.c:699
+#: calendar/gui/e-itip-control.c:724
msgid "Ends"
msgstr "Ends"
-#: calendar/gui/e-itip-control.c:733
+#: calendar/gui/e-itip-control.c:758
msgid "Due"
msgstr "Due"
-#: calendar/gui/e-itip-control.c:773 calendar/gui/e-itip-control.c:830
+#: calendar/gui/e-itip-control.c:798 calendar/gui/e-itip-control.c:855
msgid "iCalendar Information"
msgstr "iCalendar Information"
#. Title
-#: calendar/gui/e-itip-control.c:790
+#: calendar/gui/e-itip-control.c:815
msgid "iCalendar Error"
msgstr "iCalendar Error"
-#: calendar/gui/e-itip-control.c:862 calendar/gui/e-itip-control.c:878
-#: calendar/gui/e-itip-control.c:889 calendar/gui/e-itip-control.c:906
+#: calendar/gui/e-itip-control.c:887 calendar/gui/e-itip-control.c:903
+#: calendar/gui/e-itip-control.c:914 calendar/gui/e-itip-control.c:931
msgid "An unknown person"
msgstr "An unknown person"
#. Describe what the user can do
-#: calendar/gui/e-itip-control.c:913
+#: calendar/gui/e-itip-control.c:938
msgid ""
"<br> Please review the following information, and then select an action from "
"the menu below."
@@ -6141,68 +6212,68 @@ msgstr ""
"<br> Please review the following information, and then select an action from "
"the menu below."
-#: calendar/gui/e-itip-control.c:942
+#: calendar/gui/e-itip-control.c:967
msgid "Location:"
msgstr "Location:"
-#: calendar/gui/e-itip-control.c:961 calendar/gui/e-meeting-list-view.c:158
+#: calendar/gui/e-itip-control.c:986 calendar/gui/e-meeting-list-view.c:158
#: calendar/gui/e-meeting-store.c:179 calendar/gui/e-meeting-store.c:202
#: calendar/gui/itip-utils.c:422
msgid "Accepted"
msgstr "Accepted"
-#: calendar/gui/e-itip-control.c:965 calendar/gui/itip-utils.c:425
+#: calendar/gui/e-itip-control.c:990 calendar/gui/itip-utils.c:425
msgid "Tentatively Accepted"
msgstr "Tentatively Accepted"
-#: calendar/gui/e-itip-control.c:969 calendar/gui/e-meeting-list-view.c:159
+#: calendar/gui/e-itip-control.c:994 calendar/gui/e-meeting-list-view.c:159
#: calendar/gui/e-meeting-store.c:181 calendar/gui/e-meeting-store.c:204
#: calendar/gui/itip-utils.c:428 calendar/gui/itip-utils.c:454
msgid "Declined"
msgstr "Declined"
-#: calendar/gui/e-itip-control.c:1028 calendar/gui/e-itip-control.c:1056
-#: calendar/gui/e-itip-control.c:1082 calendar/gui/e-itip-control.c:1095
-#: calendar/gui/e-itip-control.c:1108 calendar/gui/e-itip-control.c:1133
+#: calendar/gui/e-itip-control.c:1053 calendar/gui/e-itip-control.c:1081
+#: calendar/gui/e-itip-control.c:1107 calendar/gui/e-itip-control.c:1120
+#: calendar/gui/e-itip-control.c:1133 calendar/gui/e-itip-control.c:1158
msgid "Choose an action:"
msgstr "Choose an action:"
-#: calendar/gui/e-itip-control.c:1029
+#: calendar/gui/e-itip-control.c:1054
msgid "Update"
msgstr "Update"
-#: calendar/gui/e-itip-control.c:1030 calendar/gui/e-itip-control.c:1061
-#: calendar/gui/e-itip-control.c:1084 calendar/gui/e-itip-control.c:1097
-#: calendar/gui/e-itip-control.c:1110 calendar/gui/e-itip-control.c:1135
+#: calendar/gui/e-itip-control.c:1055 calendar/gui/e-itip-control.c:1086
+#: calendar/gui/e-itip-control.c:1109 calendar/gui/e-itip-control.c:1122
+#: calendar/gui/e-itip-control.c:1135 calendar/gui/e-itip-control.c:1160
#: shell/e-shell.c:1210 widgets/misc/e-cell-date-edit.c:265
msgid "OK"
msgstr "OK"
-#: calendar/gui/e-itip-control.c:1057
+#: calendar/gui/e-itip-control.c:1082
msgid "Accept"
msgstr "Accept"
-#: calendar/gui/e-itip-control.c:1058
+#: calendar/gui/e-itip-control.c:1083
msgid "Tentatively accept"
msgstr "Tentatively accept"
-#: calendar/gui/e-itip-control.c:1059
+#: calendar/gui/e-itip-control.c:1084
msgid "Decline"
msgstr "Decline"
-#: calendar/gui/e-itip-control.c:1083
+#: calendar/gui/e-itip-control.c:1108
msgid "Send Free/Busy Information"
msgstr "Send Free/Busy Information"
-#: calendar/gui/e-itip-control.c:1096
+#: calendar/gui/e-itip-control.c:1121
msgid "Update respondent status"
msgstr "Update respondent status"
-#: calendar/gui/e-itip-control.c:1109
+#: calendar/gui/e-itip-control.c:1134
msgid "Send Latest Information"
msgstr "Send Latest Information"
-#: calendar/gui/e-itip-control.c:1119
+#: calendar/gui/e-itip-control.c:1144
msgid ""
"The meeting has been cancelled, however it could not be found in your "
"calendars"
@@ -6210,230 +6281,230 @@ msgstr ""
"The meeting has been cancelled, however it could not be found in your "
"calendars"
-#: calendar/gui/e-itip-control.c:1121
+#: calendar/gui/e-itip-control.c:1146
msgid ""
"The task has been cancelled, however it could not be found in your task lists"
msgstr ""
"The task has been cancelled, however it could not be found in your task lists"
-#: calendar/gui/e-itip-control.c:1134 calendar/gui/itip-utils.c:442
+#: calendar/gui/e-itip-control.c:1159 calendar/gui/itip-utils.c:442
#: mail/mail-send-recv.c:410 mail/mail-send-recv.c:464
#: ui/evolution-mail-global.xml.h:1
msgid "Cancel"
msgstr "Cancel"
-#: calendar/gui/e-itip-control.c:1210
+#: calendar/gui/e-itip-control.c:1235
#, c-format
msgid "<b>%s</b> has published meeting information."
msgstr "<b>%s</b> has published meeting information."
-#: calendar/gui/e-itip-control.c:1211
+#: calendar/gui/e-itip-control.c:1236
msgid "Meeting Information"
msgstr "Meeting Information"
-#: calendar/gui/e-itip-control.c:1216
+#: calendar/gui/e-itip-control.c:1241
#, c-format
msgid "<b>%s</b> requests the presence of %s at a meeting."
msgstr "<b>%s</b> requests the presence of %s at a meeting."
-#: calendar/gui/e-itip-control.c:1218
+#: calendar/gui/e-itip-control.c:1243
#, c-format
msgid "<b>%s</b> requests your presence at a meeting."
msgstr "<b>%s</b> requests your presence at a meeting."
-#: calendar/gui/e-itip-control.c:1219
+#: calendar/gui/e-itip-control.c:1244
msgid "Meeting Proposal"
msgstr "Meeting Proposal"
-#: calendar/gui/e-itip-control.c:1253
+#: calendar/gui/e-itip-control.c:1265
#, c-format
msgid "<b>%s</b> wishes to add to an existing meeting."
msgstr "<b>%s</b> wishes to add to an existing meeting."
-#: calendar/gui/e-itip-control.c:1254
+#: calendar/gui/e-itip-control.c:1266
msgid "Meeting Update"
msgstr "Meeting Update"
-#: calendar/gui/e-itip-control.c:1258
+#: calendar/gui/e-itip-control.c:1270
#, c-format
msgid "<b>%s</b> wishes to receive the latest meeting information."
msgstr "<b>%s</b> wishes to receive the latest meeting information."
-#: calendar/gui/e-itip-control.c:1259
+#: calendar/gui/e-itip-control.c:1271
msgid "Meeting Update Request"
msgstr "Meeting Update Request"
-#: calendar/gui/e-itip-control.c:1266
+#: calendar/gui/e-itip-control.c:1278
#, c-format
msgid "<b>%s</b> has replied to a meeting request."
msgstr "<b>%s</b> has replied to a meeting request."
-#: calendar/gui/e-itip-control.c:1267
+#: calendar/gui/e-itip-control.c:1279
msgid "Meeting Reply"
msgstr "Meeting Reply"
-#: calendar/gui/e-itip-control.c:1274
+#: calendar/gui/e-itip-control.c:1286
#, c-format
msgid "<b>%s</b> has cancelled a meeting."
msgstr "<b>%s</b> has cancelled a meeting."
-#: calendar/gui/e-itip-control.c:1275
+#: calendar/gui/e-itip-control.c:1287
msgid "Meeting Cancellation"
msgstr "Meeting Cancellation"
-#: calendar/gui/e-itip-control.c:1282 calendar/gui/e-itip-control.c:1350
-#: calendar/gui/e-itip-control.c:1385
+#: calendar/gui/e-itip-control.c:1294 calendar/gui/e-itip-control.c:1362
+#: calendar/gui/e-itip-control.c:1397
#, c-format
msgid "<b>%s</b> has sent an unintelligible message."
msgstr "<b>%s</b> has sent an unintelligible message."
-#: calendar/gui/e-itip-control.c:1283
+#: calendar/gui/e-itip-control.c:1295
msgid "Bad Meeting Message"
msgstr "Bad Meeting Message"
-#: calendar/gui/e-itip-control.c:1308
+#: calendar/gui/e-itip-control.c:1320
#, c-format
msgid "<b>%s</b> has published task information."
msgstr "<b>%s</b> has published task information."
-#: calendar/gui/e-itip-control.c:1309
+#: calendar/gui/e-itip-control.c:1321
msgid "Task Information"
msgstr "Task Information"
-#: calendar/gui/e-itip-control.c:1314
+#: calendar/gui/e-itip-control.c:1326
#, c-format
msgid "<b>%s</b> requests %s to perform a task."
msgstr "<b>%s</b> requests %s to perform a task."
-#: calendar/gui/e-itip-control.c:1316
+#: calendar/gui/e-itip-control.c:1328
#, c-format
msgid "<b>%s</b> requests you perform a task."
msgstr "<b>%s</b> requests you perform a task."
-#: calendar/gui/e-itip-control.c:1317
+#: calendar/gui/e-itip-control.c:1329
msgid "Task Proposal"
msgstr "Task Proposal"
-#: calendar/gui/e-itip-control.c:1321
+#: calendar/gui/e-itip-control.c:1333
#, c-format
msgid "<b>%s</b> wishes to add to an existing task."
msgstr "<b>%s</b> wishes to add to an existing task."
-#: calendar/gui/e-itip-control.c:1322
+#: calendar/gui/e-itip-control.c:1334
msgid "Task Update"
msgstr "Task Update"
-#: calendar/gui/e-itip-control.c:1326
+#: calendar/gui/e-itip-control.c:1338
#, c-format
msgid "<b>%s</b> wishes to receive the latest task information."
msgstr "<b>%s</b> wishes to receive the latest task information."
-#: calendar/gui/e-itip-control.c:1327
+#: calendar/gui/e-itip-control.c:1339
msgid "Task Update Request"
msgstr "Task Update Request"
-#: calendar/gui/e-itip-control.c:1334
+#: calendar/gui/e-itip-control.c:1346
#, c-format
msgid "<b>%s</b> has replied to a task assignment."
msgstr "<b>%s</b> has replied to a task assignment."
-#: calendar/gui/e-itip-control.c:1335
+#: calendar/gui/e-itip-control.c:1347
msgid "Task Reply"
msgstr "Task Reply"
-#: calendar/gui/e-itip-control.c:1342
+#: calendar/gui/e-itip-control.c:1354
#, c-format
msgid "<b>%s</b> has cancelled a task."
msgstr "<b>%s</b> has cancelled a task."
-#: calendar/gui/e-itip-control.c:1343
+#: calendar/gui/e-itip-control.c:1355
msgid "Task Cancellation"
msgstr "Task Cancellation"
-#: calendar/gui/e-itip-control.c:1351
+#: calendar/gui/e-itip-control.c:1363
msgid "Bad Task Message"
msgstr "Bad Task Message"
-#: calendar/gui/e-itip-control.c:1370
+#: calendar/gui/e-itip-control.c:1382
#, c-format
msgid "<b>%s</b> has published free/busy information."
msgstr "<b>%s</b> has published free/busy information."
-#: calendar/gui/e-itip-control.c:1371
+#: calendar/gui/e-itip-control.c:1383
msgid "Free/Busy Information"
msgstr "Free/Busy Information"
-#: calendar/gui/e-itip-control.c:1375
+#: calendar/gui/e-itip-control.c:1387
#, c-format
msgid "<b>%s</b> requests your free/busy information."
msgstr "<b>%s</b> requests your free/busy information."
-#: calendar/gui/e-itip-control.c:1376
+#: calendar/gui/e-itip-control.c:1388
msgid "Free/Busy Request"
msgstr "Free/Busy Request"
-#: calendar/gui/e-itip-control.c:1380
+#: calendar/gui/e-itip-control.c:1392
#, c-format
msgid "<b>%s</b> has replied to a free/busy request."
msgstr "<b>%s</b> has replied to a free/busy request."
-#: calendar/gui/e-itip-control.c:1381
+#: calendar/gui/e-itip-control.c:1393
msgid "Free/Busy Reply"
msgstr "Free/Busy Reply"
-#: calendar/gui/e-itip-control.c:1386
+#: calendar/gui/e-itip-control.c:1398
msgid "Bad Free/Busy Message"
msgstr "Bad Free/Busy Message"
-#: calendar/gui/e-itip-control.c:1461
+#: calendar/gui/e-itip-control.c:1473
msgid "The message does not appear to be properly formed"
msgstr "The message does not appear to be properly formed"
-#: calendar/gui/e-itip-control.c:1520
+#: calendar/gui/e-itip-control.c:1532
msgid "The message contains only unsupported requests."
msgstr "The message contains only unsupported requests."
-#: calendar/gui/e-itip-control.c:1551
+#: calendar/gui/e-itip-control.c:1563
msgid "The attachment does not contain a valid calendar message"
msgstr "The attachment does not contain a valid calendar message"
-#: calendar/gui/e-itip-control.c:1583
+#: calendar/gui/e-itip-control.c:1595
msgid "The attachment has no viewable calendar items"
msgstr "The attachment has no viewable calendar items"
-#: calendar/gui/e-itip-control.c:1817
+#: calendar/gui/e-itip-control.c:1829
msgid "Update complete\n"
msgstr "Update complete\n"
-#: calendar/gui/e-itip-control.c:1845
+#: calendar/gui/e-itip-control.c:1857
msgid "Object is invalid and cannot be updated\n"
msgstr "Object is invalid and cannot be updated\n"
-#: calendar/gui/e-itip-control.c:1855
+#: calendar/gui/e-itip-control.c:1867
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:1867
+#: calendar/gui/e-itip-control.c:1879
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:1884
+#: calendar/gui/e-itip-control.c:1896
msgid "Attendee status updated\n"
msgstr "Attendee status updated\n"
-#: calendar/gui/e-itip-control.c:1887
+#: calendar/gui/e-itip-control.c:1899
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:1914
+#: calendar/gui/e-itip-control.c:1926
msgid "Removal Complete"
msgstr "Removal Complete"
-#: calendar/gui/e-itip-control.c:1937 calendar/gui/e-itip-control.c:1985
+#: calendar/gui/e-itip-control.c:1949 calendar/gui/e-itip-control.c:1997
msgid "Item sent!\n"
msgstr "Item sent!\n"
-#: calendar/gui/e-itip-control.c:1939 calendar/gui/e-itip-control.c:1989
+#: calendar/gui/e-itip-control.c:1951 calendar/gui/e-itip-control.c:2001
msgid "The item could not be sent!\n"
msgstr "The item could not be sent!\n"
@@ -6554,6 +6625,10 @@ 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.
+#. strptime format of a weekday and a date.
+#. strftime format of a weekday and a date.
#: calendar/gui/e-meeting-time-sel-item.c:456
#: calendar/gui/e-meeting-time-sel.c:2102 e-util/e-time-utils.c:203
#: e-util/e-time-utils.c:296 e-util/e-time-utils.c:384
@@ -6562,6 +6637,10 @@ msgstr "%a %d/%m/%Y"
#. This is a strftime() format string %m = month number,
#. %d = month day, %Y = full year.
+#. strptime format of a weekday and a date.
+#. This is the preferred date format for the locale.
+#. This is a strftime() format for a short date. %m = month,
+#. %d = day of month, %Y = year (all digits).
#: calendar/gui/e-meeting-time-sel-item.c:460 e-util/e-time-utils.c:238
#: e-util/e-time-utils.c:299 widgets/misc/e-dateedit.c:1604
msgid "%m/%d/%Y"
@@ -6624,7 +6703,7 @@ msgstr "Required people and _one resource"
msgid "Enter the password for %s"
msgstr "Enter the password for %s"
-#: calendar/gui/e-tasks.c:744 calendar/gui/gnome-cal.c:2255
+#: calendar/gui/e-tasks.c:744 calendar/gui/gnome-cal.c:2263
#, c-format
msgid ""
"Error on %s:\n"
@@ -6658,22 +6737,22 @@ msgstr "Expunging"
msgid "Updating query"
msgstr "Updating query"
-#: calendar/gui/gnome-cal.c:2038
+#: calendar/gui/gnome-cal.c:2040
#, c-format
msgid "Loading appointments at %s"
msgstr "Loading appointments at %s"
-#: calendar/gui/gnome-cal.c:2057
+#: calendar/gui/gnome-cal.c:2059
#, c-format
msgid "Loading tasks at %s"
msgstr "Loading tasks at %s"
-#: calendar/gui/gnome-cal.c:2144
+#: calendar/gui/gnome-cal.c:2152
#, c-format
msgid "Opening %s"
msgstr "Opening %s"
-#: calendar/gui/gnome-cal.c:3111
+#: calendar/gui/gnome-cal.c:3122
msgid "Purging"
msgstr "Purging"
@@ -7091,52 +7170,52 @@ msgstr[1] ", %d selected"
msgid "Failed upgrading tasks."
msgstr "Failed upgrading tasks."
-#: calendar/gui/tasks-component.c:756
+#: calendar/gui/tasks-component.c:758
#, c-format
msgid "Unable to open the task list '%s' for creating events and meetings"
msgstr "Unable to open the task list '%s' for creating events and meetings"
-#: calendar/gui/tasks-component.c:768
+#: calendar/gui/tasks-component.c:773
msgid "There is no calendar available for creating tasks"
msgstr "There is no calendar available for creating tasks"
-#: calendar/gui/tasks-component.c:1042
+#: calendar/gui/tasks-component.c:1047
msgid "New task"
msgstr "New task"
-#: calendar/gui/tasks-component.c:1043
+#: calendar/gui/tasks-component.c:1048
msgid "_Task"
msgstr "_Task"
-#: calendar/gui/tasks-component.c:1044
+#: calendar/gui/tasks-component.c:1049
msgid "Create a new task"
msgstr "Create a new task"
-#: calendar/gui/tasks-component.c:1050
+#: calendar/gui/tasks-component.c:1055
msgid "New assigned task"
msgstr "New assigned task"
-#: calendar/gui/tasks-component.c:1051
+#: calendar/gui/tasks-component.c:1056
msgid "Assigne_d Task"
msgstr "Assigne_d Task"
-#: calendar/gui/tasks-component.c:1052
+#: calendar/gui/tasks-component.c:1057
msgid "Create a new assigned task"
msgstr "Create a new assigned task"
-#: calendar/gui/tasks-component.c:1058
+#: calendar/gui/tasks-component.c:1063
msgid "New task list"
msgstr "New task list"
-#: calendar/gui/tasks-component.c:1059
+#: calendar/gui/tasks-component.c:1064
msgid "Task l_ist"
msgstr "Task l_ist"
-#: calendar/gui/tasks-component.c:1060
+#: calendar/gui/tasks-component.c:1065
msgid "Create a new task list"
msgstr "Create a new task list"
-#: calendar/gui/tasks-control.c:367
+#: calendar/gui/tasks-control.c:370
msgid ""
"This operation will permanently erase all tasks marked as completed. If you "
"continue, you will not be able to recover these tasks.\n"
@@ -7148,11 +7227,11 @@ msgstr ""
"\n"
"Really erase these tasks?"
-#: calendar/gui/tasks-control.c:370
+#: calendar/gui/tasks-control.c:373
msgid "Do not ask me again."
msgstr "Do not ask me again."
-#: calendar/gui/tasks-control.c:428
+#: calendar/gui/tasks-control.c:431
msgid "Print Tasks"
msgstr "Print Tasks"
@@ -8908,7 +8987,8 @@ msgstr "Invalid arguments to (user-tag)"
msgid "Failed to create create child process '%s': %s"
msgstr "Failed to create create child process '%s': %s"
-#: camel/camel-filter-search.c:670 camel/camel-filter-search.c:678
+#. A filter search is a search through your filters, ie. your filters is the corpus being searched thru.
+#: camel/camel-filter-search.c:671 camel/camel-filter-search.c:679
#, c-format
msgid "Error executing filter search: %s: %s"
msgstr "Error executing filter search: %s: %s"
@@ -9327,16 +9407,16 @@ msgstr "Server response contained incomplete authorisation data\n"
msgid "Server response does not match\n"
msgstr "Server response does not match\n"
-#: camel/camel-sasl-gssapi.c:48
+#: camel/camel-sasl-gssapi.c:52
msgid "GSSAPI"
msgstr "GSSAPI"
-#: camel/camel-sasl-gssapi.c:50
+#: camel/camel-sasl-gssapi.c:54
msgid "This option will connect to the server using Kerberos 5 authentication."
msgstr ""
"This option will connect to the server using Kerberos 5 authentication."
-#: camel/camel-sasl-gssapi.c:148
+#: camel/camel-sasl-gssapi.c:152
msgid ""
"The specified mechanism is not supported by the provided credential, or is "
"unrecognized by the implementation."
@@ -9344,11 +9424,11 @@ msgstr ""
"The specified mechanism is not supported by the provided credential, or is "
"unrecognised by the implementation."
-#: camel/camel-sasl-gssapi.c:153
+#: camel/camel-sasl-gssapi.c:157
msgid "The provided target_name parameter was ill-formed."
msgstr "The provided target_name parameter was ill-formed."
-#: camel/camel-sasl-gssapi.c:156
+#: camel/camel-sasl-gssapi.c:160
msgid ""
"The provided target_name parameter contained an invalid or unsupported type "
"of name."
@@ -9356,7 +9436,7 @@ msgstr ""
"The provided target_name parameter contained an invalid or unsupported type "
"of name."
-#: camel/camel-sasl-gssapi.c:160
+#: camel/camel-sasl-gssapi.c:164
msgid ""
"The input_token contains different channel bindings to those specified via "
"the input_chan_bindings parameter."
@@ -9364,7 +9444,7 @@ msgstr ""
"The input_token contains different channel bindings to those specified via "
"the input_chan_bindings parameter."
-#: camel/camel-sasl-gssapi.c:165
+#: camel/camel-sasl-gssapi.c:169
msgid ""
"The input_token contains an invalid signature, or a signature that could not "
"be verified."
@@ -9372,7 +9452,7 @@ msgstr ""
"The input_token contains an invalid signature, or a signature that could not "
"be verified."
-#: camel/camel-sasl-gssapi.c:169
+#: camel/camel-sasl-gssapi.c:173
msgid ""
"The supplied credentials were not valid for context initiation, or the "
"credential handle did not reference any credentials."
@@ -9380,35 +9460,35 @@ msgstr ""
"The supplied credentials were not valid for context initiation, or the "
"credential handle did not reference any credentials."
-#: camel/camel-sasl-gssapi.c:174
+#: camel/camel-sasl-gssapi.c:178
msgid "The supplied context handle did not refer to a valid context."
msgstr "The supplied context handle did not refer to a valid context."
-#: camel/camel-sasl-gssapi.c:177
+#: camel/camel-sasl-gssapi.c:181
msgid "The consistency checks performed on the input_token failed."
msgstr "The consistency checks performed on the input_token failed."
-#: camel/camel-sasl-gssapi.c:180
+#: camel/camel-sasl-gssapi.c:184
msgid "The consistency checks performed on the credential failed."
msgstr "The consistency checks performed on the credential failed."
-#: camel/camel-sasl-gssapi.c:183
+#: camel/camel-sasl-gssapi.c:187
msgid "The referenced credentials have expired."
msgstr "The referenced credentials have expired."
-#: camel/camel-sasl-gssapi.c:189 camel/camel-sasl-gssapi.c:238
-#: camel/camel-sasl-gssapi.c:274 camel/camel-sasl-gssapi.c:289
+#: camel/camel-sasl-gssapi.c:193 camel/camel-sasl-gssapi.c:242
+#: camel/camel-sasl-gssapi.c:278 camel/camel-sasl-gssapi.c:293
#: camel/camel-sasl-kerberos4.c:219
#: camel/providers/imap/camel-imap-store.c:1236
msgid "Bad authentication response from server."
msgstr "Bad authentication response from server."
-#: camel/camel-sasl-gssapi.c:213
+#: camel/camel-sasl-gssapi.c:217
#, c-format
msgid "Failed to resolve host `%s': %s"
msgstr "Failed to resolve host `%s': %s"
-#: camel/camel-sasl-gssapi.c:299
+#: camel/camel-sasl-gssapi.c:303
msgid "Unsupported security layer."
msgstr "Unsupported security layer."
@@ -10069,7 +10149,8 @@ msgid "Automatically synchronize remote mail locally"
msgstr "Automatically synchronise remote mail locally"
#: camel/providers/groupwise/camel-groupwise-provider.c:69
-msgid "Address Book And Calendar"
+#, fuzzy
+msgid "Address Book and Calendar"
msgstr "Address Book And Calendar"
#: camel/providers/groupwise/camel-groupwise-provider.c:72
@@ -10081,8 +10162,9 @@ msgid "Post Office Agent SOAP Port:"
msgstr "Post Office Agent SOAP Port:"
#: camel/providers/groupwise/camel-groupwise-provider.c:78
-msgid "Use ssl"
-msgstr "Use ssl"
+#, fuzzy
+msgid "Use Secure Connection (SSL)"
+msgstr "_Use Secure Connection (SSL):"
#: camel/providers/groupwise/camel-groupwise-provider.c:92
msgid "Novell GroupWise"
@@ -10128,7 +10210,7 @@ msgstr "Server unexpectedly disconnected: %s"
#: camel/providers/imap/camel-imap-command.c:303
#: camel/providers/imap/camel-imap-command.c:400
-#: camel/providers/imap4/camel-imap4-store.c:282
+#: camel/providers/imap4/camel-imap4-store.c:283
#: camel/providers/pop3/camel-pop3-store.c:543
#: camel/providers/pop3/camel-pop3-store.c:550
#: camel/providers/pop3/camel-pop3-store.c:556 shell/e-shell.c:1220
@@ -10309,21 +10391,21 @@ msgid "For reading and storing mail on IMAP servers."
msgstr "For reading and storing mail on IMAP servers."
#: camel/providers/imap/camel-imap-store.c:424
-#: camel/providers/imap4/camel-imap4-store.c:176
+#: camel/providers/imap4/camel-imap4-store.c:177
#, c-format
msgid "IMAP server %s"
msgstr "IMAP server %s"
#: camel/providers/imap/camel-imap-store.c:426
-#: camel/providers/imap4/camel-imap4-store.c:178
+#: camel/providers/imap4/camel-imap4-store.c:179
#, c-format
msgid "IMAP service for %s on %s"
msgstr "IMAP service for %s on %s"
#: camel/providers/imap/camel-imap-store.c:547
#: camel/providers/imap/camel-imap-store.c:567
-#: camel/providers/imap4/camel-imap4-store.c:213
-#: camel/providers/imap4/camel-imap4-store.c:229
+#: camel/providers/imap4/camel-imap4-store.c:214
+#: camel/providers/imap4/camel-imap4-store.c:230
#: camel/providers/imapp/camel-imapp-store.c:231
#: camel/providers/nntp/camel-nntp-store.c:209
#: camel/providers/pop3/camel-pop3-store.c:175
@@ -10334,7 +10416,7 @@ msgid "Could not connect to %s (port %d): %s"
msgstr "Could not connect to %s (port %d): %s"
#: camel/providers/imap/camel-imap-store.c:549
-#: camel/providers/imap4/camel-imap4-store.c:215
+#: camel/providers/imap4/camel-imap4-store.c:216
#: camel/providers/pop3/camel-pop3-store.c:177
#: camel/providers/smtp/camel-smtp-transport.c:271
msgid "SSL unavailable"
@@ -10342,7 +10424,7 @@ msgstr "SSL unavailable"
#: camel/providers/imap/camel-imap-store.c:564
#: camel/providers/imap/camel-imap-store.c:841
-#: camel/providers/imap4/camel-imap4-store.c:226
+#: camel/providers/imap4/camel-imap4-store.c:227
#: camel/providers/imapp/camel-imapp-store.c:228
#: camel/providers/nntp/camel-nntp-store.c:206
#: camel/providers/nntp/camel-nntp-store.c:224
@@ -10352,7 +10434,7 @@ msgstr "Connection cancelled"
#: camel/providers/imap/camel-imap-store.c:675
#: camel/providers/imap/camel-imap-store.c:706
-#: camel/providers/imap4/camel-imap4-store.c:281
+#: camel/providers/imap4/camel-imap4-store.c:282
#, c-format
msgid "Failed to connect to IMAP server %s in secure mode: %s"
msgstr "Failed to connect to IMAP server %s in secure mode: %s"
@@ -10412,7 +10494,7 @@ msgstr "No such folder %s"
#: camel/providers/imap/camel-imap-store.c:1881
#: camel/providers/imap/camel-imap-store.c:2259
-#: camel/providers/imap4/camel-imap4-store.c:763
+#: camel/providers/imap4/camel-imap4-store.c:764
#, c-format
msgid ""
"The folder name \"%s\" is invalid because it contains the character \"%c\""
@@ -10448,25 +10530,25 @@ msgstr "Failed sending command to IMAP server %s: %s"
msgid "Unexpected response from IMAP4 server %s: %s"
msgstr "Unexpected response from IMAP4 server %s: %s"
-#: camel/providers/imap4/camel-imap4-engine.c:229
+#: camel/providers/imap4/camel-imap4-engine.c:230
#, c-format
msgid "Unexpected greeting from IMAP server %s."
msgstr "Unexpected greeting from IMAP server %s."
-#: camel/providers/imap4/camel-imap4-engine.c:413
+#: camel/providers/imap4/camel-imap4-engine.c:414
#, c-format
msgid "Cannot select folder `%s': Invalid mailbox name"
msgstr "Cannot select folder `%s': Invalid mailbox name"
-#: camel/providers/imap4/camel-imap4-engine.c:419
+#: camel/providers/imap4/camel-imap4-engine.c:420
#, c-format
msgid "Cannot select folder `%s': Bad command"
msgstr "Cannot select folder `%s': Bad command"
-#: camel/providers/imap4/camel-imap4-engine.c:1381
-#: camel/providers/imap4/camel-imap4-engine.c:1411
-#: camel/providers/imap4/camel-imap4-engine.c:1443
-#: camel/providers/imap4/camel-imap4-engine.c:1485
+#: camel/providers/imap4/camel-imap4-engine.c:1401
+#: camel/providers/imap4/camel-imap4-engine.c:1431
+#: camel/providers/imap4/camel-imap4-engine.c:1463
+#: camel/providers/imap4/camel-imap4-engine.c:1505
#, c-format
msgid "IMAP4 server %s unexpectedly disconnected: %s"
msgstr "IMAP4 server %s unexpectedly disconnected: %s"
@@ -10545,7 +10627,7 @@ msgid ""
msgstr ""
"This option will connect to the IMAPv4rev1 server using a plaintext password."
-#: camel/providers/imap4/camel-imap4-store.c:256
+#: camel/providers/imap4/camel-imap4-store.c:257
#, c-format
msgid ""
"Failed to connect to IMAP server %s in secure mode: Server does not support "
@@ -10554,93 +10636,93 @@ msgstr ""
"Failed to connect to IMAP server %s in secure mode: Server does not support "
"STARTTLS"
-#: camel/providers/imap4/camel-imap4-store.c:362
+#: camel/providers/imap4/camel-imap4-store.c:363
#, c-format
msgid ""
"Cannot authenticate to IMAP server %s using the %s authentication mechanism"
msgstr ""
"Cannot authenticate to IMAP server %s using the %s authentication mechanism"
-#: camel/providers/imap4/camel-imap4-store.c:407
+#: camel/providers/imap4/camel-imap4-store.c:408
#, c-format
msgid "%sPlease enter the IMAP password for %s on host %s"
msgstr "%sPlease enter the IMAP password for %s on host %s"
-#: camel/providers/imap4/camel-imap4-store.c:477
+#: camel/providers/imap4/camel-imap4-store.c:478
#, c-format
msgid "Cannot authenticate to IMAP server %s using %s"
msgstr "Cannot authenticate to IMAP server %s using %s"
-#: camel/providers/imap4/camel-imap4-store.c:700
+#: camel/providers/imap4/camel-imap4-store.c:701
#, c-format
msgid "Cannot get folder `%s' on IMAP server %s: Unknown"
msgstr "Cannot get folder `%s' on IMAP server %s: Unknown"
-#: camel/providers/imap4/camel-imap4-store.c:814
+#: camel/providers/imap4/camel-imap4-store.c:815
#, c-format
msgid "Cannot create folder `%s': Invalid mailbox name"
msgstr "Cannot create folder `%s': Invalid mailbox name"
-#: camel/providers/imap4/camel-imap4-store.c:820
+#: camel/providers/imap4/camel-imap4-store.c:821
#, c-format
msgid "Cannot create folder `%s': Bad command"
msgstr "Cannot create folder `%s': Bad command"
-#: camel/providers/imap4/camel-imap4-store.c:851
+#: camel/providers/imap4/camel-imap4-store.c:852
#, c-format
msgid "Cannot delete folder `%s': Special folder"
msgstr "Cannot delete folder `%s': Special folder"
-#: camel/providers/imap4/camel-imap4-store.c:910
+#: camel/providers/imap4/camel-imap4-store.c:911
#, c-format
msgid "Cannot delete folder `%s': Invalid mailbox name"
msgstr "Cannot delete folder `%s': Invalid mailbox name"
-#: camel/providers/imap4/camel-imap4-store.c:915
+#: camel/providers/imap4/camel-imap4-store.c:916
#, c-format
msgid "Cannot delete folder `%s': Bad command"
msgstr "Cannot delete folder `%s': Bad command"
-#: camel/providers/imap4/camel-imap4-store.c:935
+#: camel/providers/imap4/camel-imap4-store.c:936
#, c-format
msgid "Cannot rename folder `%s' to `%s': Special folder"
msgstr "Cannot rename folder `%s' to `%s': Special folder"
-#: camel/providers/imap4/camel-imap4-store.c:967
+#: camel/providers/imap4/camel-imap4-store.c:968
#, c-format
msgid "Cannot rename folder `%s' to `%s': Invalid mailbox name"
msgstr "Cannot rename folder `%s' to `%s': Invalid mailbox name"
-#: camel/providers/imap4/camel-imap4-store.c:972
+#: camel/providers/imap4/camel-imap4-store.c:973
#, c-format
msgid "Cannot rename folder `%s' to `%s': Bad command"
msgstr "Cannot rename folder `%s' to `%s': Bad command"
-#: camel/providers/imap4/camel-imap4-store.c:1220
+#: camel/providers/imap4/camel-imap4-store.c:1221
#, c-format
msgid "Cannot get %s information for pattern `%s' on IMAP server %s: %s"
msgstr "Cannot get %s information for pattern `%s' on IMAP server %s: %s"
-#: camel/providers/imap4/camel-imap4-store.c:1222
+#: camel/providers/imap4/camel-imap4-store.c:1223
msgid "Bad command"
msgstr "Bad command"
-#: camel/providers/imap4/camel-imap4-store.c:1298
+#: camel/providers/imap4/camel-imap4-store.c:1299
#, c-format
msgid "Cannot subscribe to folder `%s': Invalid mailbox name"
msgstr "Cannot subscribe to folder `%s': Invalid mailbox name"
-#: camel/providers/imap4/camel-imap4-store.c:1303
+#: camel/providers/imap4/camel-imap4-store.c:1304
#, c-format
msgid "Cannot subscribe to folder `%s': Bad command"
msgstr "Cannot subscribe to folder `%s': Bad command"
-#: camel/providers/imap4/camel-imap4-store.c:1363
+#: camel/providers/imap4/camel-imap4-store.c:1364
#, c-format
msgid "Cannot unsubscribe from folder `%s': Invalid mailbox name"
msgstr "Cannot unsubscribe from folder `%s': Invalid mailbox name"
-#: camel/providers/imap4/camel-imap4-store.c:1368
+#: camel/providers/imap4/camel-imap4-store.c:1369
#, c-format
msgid "Cannot unsubscribe from folder `%s': Bad command"
msgstr "Cannot unsubscribe from folder `%s': Bad command"
@@ -11900,7 +11982,7 @@ msgstr "%.0fM"
msgid "%.0fG"
msgstr "%.0fG"
-#: composer/e-msg-composer-attachment-bar.c:298 mail/em-utils.c:410
+#: composer/e-msg-composer-attachment-bar.c:298 mail/em-utils.c:436
msgid "attachment"
msgstr "attachment"
@@ -11940,7 +12022,8 @@ msgid "MIME type:"
msgstr "MIME type:"
#: composer/e-msg-composer-attachment.glade.h:6
-#: composer/e-msg-composer-select-file.c:74
+#: composer/e-msg-composer-select-file.c:92
+#: composer/e-msg-composer-select-file.c:111
msgid "Suggest automatic display of attachment"
msgstr "Suggest automatic display of attachment"
@@ -12020,7 +12103,7 @@ msgstr "Post To:"
msgid "Click here to select folders to post to"
msgstr "Click here to select folders to post to"
-#: composer/e-msg-composer-select-file.c:127
+#: composer/e-msg-composer-select-file.c:186
msgid "Attach file(s)"
msgstr "Attach file(s)"
@@ -12133,6 +12216,11 @@ msgid "Could not retrieve messages to attach from {0}."
msgstr "Could not retrieve messages to attach from {0}."
#. mail-composer:attach-nomessages secondary
+#. mail-composer:no-sig-file secondary
+#. mail:no-create-tmp-path secondary
+#. mail:no-delete-folder secondary
+#. system:no-save-file secondary
+#. system:no-load-file secondary
#: composer/mail-composer-errors.xml.h:14
#: composer/mail-composer-errors.xml.h:42 mail/mail-errors.xml.h:100
#: mail/mail-errors.xml.h:112 widgets/misc/e-system-errors.xml.h:11
@@ -12232,6 +12320,7 @@ msgid "You need to configure an account before you can compose mail."
msgstr "You need to configure an account before you can compose mail."
#. mail-composer:no-address-control primary
+#. mail-composer:no-editor-control primary
#: composer/mail-composer-errors.xml.h:48
#: composer/mail-composer-errors.xml.h:52
msgid "Could not create composer window."
@@ -12255,13 +12344,14 @@ msgstr ""
"Please make sure that you have the correct version of gtkhtml and libgtkhtml "
"installed."
-#: data/evolution.desktop.in.in.h:1
-msgid "The Ximian Evolution Groupware Suite"
-msgstr "The Ximian Evolution Groupware Suite"
+#: data/evolution.desktop.in.in.h:1 shell/main.c:503
+msgid "Evolution"
+msgstr "Evolution"
#: data/evolution.desktop.in.in.h:2
-msgid "Ximian Evolution (Unstable)"
-msgstr "Ximian Evolution (Unstable)"
+#, fuzzy
+msgid "The Evolution Groupware Suite"
+msgstr "The Ximian Evolution Groupware Suite"
#: data/evolution.keys.in.in.h:1
msgid "address card"
@@ -12375,7 +12465,7 @@ msgstr ""
"When you receive an email with a read receipt request, what should Evolution "
"do?"
-#: e-util/e-dialog-utils.c:253
+#: e-util/e-dialog-utils.c:265
msgid ""
"A file by that name already exists.\n"
"Overwrite it?"
@@ -12384,26 +12474,30 @@ msgstr ""
"Overwrite it?"
#. system:ask-save-file-exists-overwrite title
-#: e-util/e-dialog-utils.c:255 widgets/misc/e-system-errors.xml.h:2
+#: e-util/e-dialog-utils.c:267 widgets/misc/e-system-errors.xml.h:2
msgid "Overwrite file?"
msgstr "Overwrite file?"
-#: e-util/e-passwords.c:358
-msgid "Remember this password"
-msgstr "Remember this password"
+#: e-util/e-passwords.c:460
+msgid "_Remember this password"
+msgstr "_Remember this password"
-#: e-util/e-passwords.c:360
-msgid "Remember this password for the remainder of this session"
-msgstr "Remember this password for the remainder of this session"
+#: e-util/e-passwords.c:461
+msgid "_Remember this password for the remainder of this session"
+msgstr "_Remember this password for the remainder of this session"
#. strptime format of a weekday, a date and a time,
#. in 12-hour format, without seconds.
+#. strftime format of a weekday, a date and a
+#. time, in 12-hour format, without seconds.
#: e-util/e-time-utils.c:185 e-util/e-time-utils.c:398
msgid "%a %m/%d/%Y %I:%M %p"
msgstr "%a %d/%m/%Y %I:%M %p"
#. strptime format of a weekday, a date and a time,
#. in 24-hour format, without seconds.
+#. strftime format of a weekday, a date and a
+#. time, in 24-hour format, without seconds.
#: e-util/e-time-utils.c:190 e-util/e-time-utils.c:389
msgid "%a %m/%d/%Y %H:%M"
msgstr "%a %d/%m/%Y %H:%M"
@@ -12455,23 +12549,31 @@ msgid "%m/%d/%Y %H"
msgstr "%d/%m/%Y %H"
#. strptime format for a time of day, in 12-hour format.
+#. strftime format of a time in 12-hour format.
#: e-util/e-time-utils.c:339 e-util/e-time-utils.c:438
msgid "%I:%M:%S %p"
msgstr "%I:%M:%S %p"
#. strptime format for a time of day, in 24-hour format.
+#. strftime format of a time in 24-hour format.
#: e-util/e-time-utils.c:343 e-util/e-time-utils.c:430
msgid "%H:%M:%S"
msgstr "%H:%M:%S"
#. strptime format for time of day, without seconds,
#. in 12-hour format.
+#. strftime format of a time in 12-hour format,
+#. without seconds.
+#. This is a strftime() format. %I = hour (1-12), %M = minute, %p = am/pm string.
#: e-util/e-time-utils.c:348 e-util/e-time-utils.c:435
#: widgets/misc/e-dateedit.c:1414 widgets/misc/e-dateedit.c:1639
msgid "%I:%M %p"
msgstr "%I:%M %p"
#. strptime format for time of day, without seconds 24-hour format.
+#. strftime format of a time in 24-hour format,
+#. without seconds.
+#. This is a strftime() format. %H = hour (0-23), %M = minute.
#: e-util/e-time-utils.c:352 e-util/e-time-utils.c:427
#: widgets/misc/e-dateedit.c:1411 widgets/misc/e-dateedit.c:1636
msgid "%H:%M"
@@ -12564,6 +12666,7 @@ msgid "Missing file name."
msgstr "Missing file name."
#. filter:no-file secondary
+#. filter:bad-file secondary
#: filter/filter-errors.xml.h:8 filter/filter-errors.xml.h:12
msgid "You must specify a file name."
msgstr "You must specify a file name."
@@ -12584,6 +12687,7 @@ msgid "Could not compile regular expression \"{1}\"."
msgstr "Could not compile regular expression \"{1}\"."
#. filter:no-name primary
+#. mail:no-name-vfolder primary
#: filter/filter-errors.xml.h:18 mail/mail-errors.xml.h:214
msgid "Missing name."
msgstr "Missing name."
@@ -13481,9 +13585,10 @@ msgid "Unencrypted"
msgstr "Unencrypted"
#: mail/em-format-html-display.c:650
+#, fuzzy
msgid ""
"This message is not encrypted. Its content may be viewed in transit across "
-"The Internet."
+"the Internet."
msgstr ""
"This message is not encrypted. Its content may be viewed in transit across "
"The Internet."
@@ -13630,7 +13735,7 @@ msgid "Bcc"
msgstr "Bcc"
#. pseudo-header
-#: mail/em-format-html.c:1554 mail/em-format-quote.c:312
+#: mail/em-format-html.c:1554 mail/em-format-quote.c:314
#: mail/em-mailer-prefs.c:939
msgid "Mailer"
msgstr "Mailer"
@@ -13645,7 +13750,7 @@ msgstr "<I> (%a, %R %Z)</I>"
msgid "<I> (%R %Z)</I>"
msgstr "<I> (%R %Z)</I>"
-#: mail/em-format-html.c:1594 mail/em-format-quote.c:319 mail/em-format.c:806
+#: mail/em-format-html.c:1594 mail/em-format-quote.c:321 mail/em-format.c:806
#: mail/em-mailer-prefs.c:88 mail/message-list.etspec.h:2
msgid "Date"
msgstr "Date"
@@ -13826,20 +13931,20 @@ msgstr "Don't show this message again."
msgid "Filters"
msgstr "Filters"
-#: mail/em-utils.c:408
+#: mail/em-utils.c:434
msgid "message"
msgstr "message"
-#: mail/em-utils.c:511
+#: mail/em-utils.c:543
msgid "Save Message..."
msgstr "Save Message..."
-#: mail/em-utils.c:560
+#: mail/em-utils.c:592
msgid "Add address"
msgstr "Add address"
#. Drop filename for messages from a mailbox
-#: mail/em-utils.c:1021
+#: mail/em-utils.c:1053
#, c-format
msgid "Messages from %s"
msgstr "Messages from %s"
@@ -15500,6 +15605,7 @@ msgstr ""
"an idea of what your mail is about."
#. mail:ask-send-only-bcc-contact primary
+#. mail:ask-send-only-bcc primary
#: mail/mail-errors.xml.h:22 mail/mail-errors.xml.h:29
msgid "Are you sure you want to send a message with only BCC recipients?"
msgstr "Are you sure you want to send a message with only BCC recipients?"
@@ -15578,6 +15684,7 @@ msgstr ""
"folder \"{0}\"?"
#. mail:ask-expunge secondary
+#. mail:ask-empty-trash secondary
#: mail/mail-errors.xml.h:45 mail/mail-errors.xml.h:50
msgid "If you continue, you will not be able to recover these messages."
msgstr "If you continue, you will not be able to recover these messages."
@@ -15667,6 +15774,8 @@ msgid "Cannot save to directory \"{0}\"."
msgstr "Cannot save to directory \"{0}\"."
#. mail:no-create-path primary
+#. mail:no-write-path-exists primary
+#. mail:no-write-path-notfile primary
#: mail/mail-errors.xml.h:94 mail/mail-errors.xml.h:102
#: mail/mail-errors.xml.h:106
msgid "Cannot save to file \"{0}\"."
@@ -15703,6 +15812,7 @@ msgid "Cannot delete system folder \"{0}\"."
msgstr "Cannot delete system folder \"{0}\"."
#. mail:no-delete-spethal-folder secondary
+#. mail:no-rename-spethal-folder secondary
#: mail/mail-errors.xml.h:116 mail/mail-errors.xml.h:120
msgid ""
"System folders are required for Ximian Evolution to function correctly and "
@@ -15736,11 +15846,13 @@ msgstr ""
"will be deleted permanently."
#. mail:no-rename-folder-exists primary
+#. mail:no-rename-folder primary
#: mail/mail-errors.xml.h:128 mail/mail-errors.xml.h:132
msgid "Cannot rename \"{0}\" to \"{1}\"."
msgstr "Cannot rename \"{0}\" to \"{1}\"."
#. mail:no-rename-folder-exists secondary
+#. mail:vfolder-notunique secondary
#: mail/mail-errors.xml.h:130 mail/mail-errors.xml.h:192
msgid "A folder named \"{1}\" already exists. Please use a different name."
msgstr "A folder named \"{1}\" already exists. Please use a different name."
@@ -15751,21 +15863,25 @@ msgid "Because \"{2}\"."
msgstr "Because \"{2}\"."
#. mail:no-move-folder-nostore primary
+#. mail:no-move-folder-to-nostore primary
#: mail/mail-errors.xml.h:136 mail/mail-errors.xml.h:140
msgid "Cannot move folder \"{0}\" to \"{1}\"."
msgstr "Cannot move folder \"{0}\" to \"{1}\"."
#. mail:no-move-folder-nostore secondary
+#. mail:no-copy-folder-nostore secondary
#: mail/mail-errors.xml.h:138 mail/mail-errors.xml.h:146
msgid "Cannot open source \"{2}\"."
msgstr "Cannot open source \"{2}\"."
#. mail:no-move-folder-to-nostore secondary
+#. mail:no-copy-folder-to-nostore secondary
#: mail/mail-errors.xml.h:142 mail/mail-errors.xml.h:150
msgid "Cannot open target \"{2}\"."
msgstr "Cannot open target \"{2}\"."
#. mail:no-copy-folder-nostore primary
+#. mail:no-copy-folder-to-nostore primary
#: mail/mail-errors.xml.h:144 mail/mail-errors.xml.h:148
msgid "Cannot copy folder \"{0}\" to \"{1}\"."
msgstr "Cannot copy folder \"{0}\" to \"{1}\"."
@@ -15781,6 +15897,7 @@ msgid "Cannot open source \"{1}\""
msgstr "Cannot open source \"{1}\""
#. mail:account-incomplete primary
+#. mail:account-notunique primary
#: mail/mail-errors.xml.h:156 mail/mail-errors.xml.h:160
msgid "Cannot save changes to account."
msgstr "Cannot save changes to account."
@@ -16196,26 +16313,18 @@ msgstr "Updating..."
msgid "Waiting..."
msgstr "Waiting..."
-#: mail/mail-session.c:240
-msgid "User canceled operation."
-msgstr "User cancelled operation."
-
-#: mail/mail-session.c:274
+#: mail/mail-session.c:207
#, c-format
msgid "Enter Password for %s"
msgstr "Enter Password for %s"
-#: mail/mail-session.c:276
+#: mail/mail-session.c:209
msgid "Enter Password"
msgstr "Enter Password"
-#: mail/mail-session.c:304
-msgid "_Remember this password"
-msgstr "_Remember this password"
-
-#: mail/mail-session.c:305
-msgid "_Remember this password for the remainder of this session"
-msgstr "_Remember this password for the remainder of this session"
+#: mail/mail-session.c:238
+msgid "User canceled operation."
+msgstr "User cancelled operation."
#: mail/mail-signature-editor.c:371
msgid "Edit signature"
@@ -16586,7 +16695,7 @@ msgstr ""
msgid "Select importer"
msgstr "Select importer"
-#: shell/e-shell-importer.c:451 shell/e-shell-importer.c:1055
+#: shell/e-shell-importer.c:451 shell/e-shell-importer.c:1056
#, c-format
msgid "File %s does not exist"
msgstr "File %s does not exist"
@@ -16626,19 +16735,19 @@ msgstr "F_ilename:"
msgid "Select a file"
msgstr "Select a file"
-#: shell/e-shell-importer.c:642
+#: shell/e-shell-importer.c:643
msgid "File _type:"
msgstr "File _type:"
-#: shell/e-shell-importer.c:681
+#: shell/e-shell-importer.c:682
msgid "Import data and settings from _older programs"
msgstr "Import data and settings from _older programs"
-#: shell/e-shell-importer.c:684
+#: shell/e-shell-importer.c:685
msgid "Import a _single file"
msgstr "Import a _single file"
-#: shell/e-shell-importer.c:752 shell/e-shell-startup-wizard.c:571
+#: shell/e-shell-importer.c:753 shell/e-shell-startup-wizard.c:571
msgid ""
"Please wait...\n"
"Scanning for existing setups"
@@ -16646,25 +16755,25 @@ msgstr ""
"Please wait...\n"
"Scanning for existing setups"
-#: shell/e-shell-importer.c:756
+#: shell/e-shell-importer.c:757
msgid "Starting Intelligent Importers"
msgstr "Starting Intelligent Importers"
-#: shell/e-shell-importer.c:882 shell/e-shell-startup-wizard.c:698
+#: shell/e-shell-importer.c:883 shell/e-shell-startup-wizard.c:698
#, c-format
msgid "From %s:"
msgstr "From %s:"
-#: shell/e-shell-importer.c:1073
+#: shell/e-shell-importer.c:1074
#, c-format
msgid "No importer available for file %s"
msgstr "No importer available for file %s"
-#: shell/e-shell-importer.c:1085
+#: shell/e-shell-importer.c:1086
msgid "Unable to execute importer"
msgstr "Unable to execute importer"
-#: shell/e-shell-importer.c:1199
+#: shell/e-shell-importer.c:1200
msgid "_Import"
msgstr "_Import"
@@ -16906,7 +17015,7 @@ msgid "Evolution can import data from the following files:"
msgstr "Evolution can import data from the following files:"
#. Preview/Alpha/Beta version warning message
-#: shell/main.c:225
+#: shell/main.c:226
#, no-c-format
msgid ""
"Hi. Thanks for taking the time to download this preview release\n"
@@ -16941,7 +17050,7 @@ msgstr ""
"We hope that you enjoy the results of our hard work, and we\n"
"eagerly await your contributions!\n"
-#: shell/main.c:249
+#: shell/main.c:250
msgid ""
"Thanks\n"
"The Evolution Team\n"
@@ -16949,39 +17058,35 @@ msgstr ""
"Thanks\n"
"The Evolution Team\n"
-#: shell/main.c:256
+#: shell/main.c:257
msgid "Don't tell me again"
msgstr "Don't tell me again"
-#: shell/main.c:461
+#: shell/main.c:462
msgid "Start Evolution activating the specified component"
msgstr "Start Evolution activating the specified component"
-#: shell/main.c:463
+#: shell/main.c:464
msgid "Start in offline mode"
msgstr "Start in offline mode"
-#: shell/main.c:465
+#: shell/main.c:466
msgid "Start in online mode"
msgstr "Start in online mode"
-#: shell/main.c:468
+#: shell/main.c:469
msgid "Forcibly shut down all evolution components"
msgstr "Forcibly shut down all evolution components"
-#: shell/main.c:472
+#: shell/main.c:473
msgid "Forcibly re-migrate from Evolution 1.4"
msgstr "Forcibly re-migrate from Evolution 1.4"
-#: shell/main.c:475
+#: shell/main.c:476
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:502
-msgid "Evolution"
-msgstr "Evolution"
-
-#: shell/main.c:506
+#: shell/main.c:507
#, c-format
msgid ""
"%s: --online and --offline cannot be used together.\n"
@@ -17037,6 +17142,7 @@ msgid "Continue"
msgstr "Continue"
#. shell:upgrade-remove-1-4 title
+#. shell:upgrade-remove-1-4 primary
#: shell/shell-errors.xml.h:17 shell/shell-errors.xml.h:19
msgid "Delete old data from version {0}?"
msgstr ""
@@ -17054,16 +17160,21 @@ msgstr ""
#: shell/shell-errors.xml.h:25
#, fuzzy
-msgid "Keep"
-msgstr "Beep"
+msgid "_Remind Me Later"
+msgstr "Reminder"
+
+#: shell/shell-errors.xml.h:26
+msgid "_Keep Data"
+msgstr ""
#. shell:upgrade-remove-1-4-confirm title
-#: shell/shell-errors.xml.h:27 shell/shell-errors.xml.h:29
+#. shell:upgrade-remove-1-4-confirm primary
+#: shell/shell-errors.xml.h:28 shell/shell-errors.xml.h:30
msgid "Really delete old data?"
msgstr ""
#. shell:upgrade-remove-1-4-confirm secondary
-#: shell/shell-errors.xml.h:31
+#: shell/shell-errors.xml.h:32
msgid ""
"The entire contents of the \"evolution\" directory is about to be be "
"permanently removed.\n"
@@ -17077,17 +17188,19 @@ msgid ""
msgstr ""
#. shell:noshell title
-#: shell/shell-errors.xml.h:38 shell/shell-errors.xml.h:46
+#. shell:noshell-reason title
+#: shell/shell-errors.xml.h:39 shell/shell-errors.xml.h:47
msgid "Cannot start Evolution"
msgstr "Cannot start Evolution"
#. shell:noshell primary
-#: shell/shell-errors.xml.h:40 shell/shell-errors.xml.h:48
+#. shell:noshell-reason primary
+#: shell/shell-errors.xml.h:41 shell/shell-errors.xml.h:49
msgid "Evolution can not start."
msgstr "Evolution can not start."
#. shell:noshell secondary
-#: shell/shell-errors.xml.h:42
+#: shell/shell-errors.xml.h:43
msgid ""
"Your system configuration does not match your Evolution configuration.\n"
"\n"
@@ -17098,7 +17211,7 @@ msgstr ""
"Click help for details"
#. shell:noshell-reason secondary
-#: shell/shell-errors.xml.h:50
+#: shell/shell-errors.xml.h:51
msgid ""
"Your system configuration does not match your Evolution configuration:\n"
"\n"
@@ -17143,30 +17256,31 @@ msgstr ""
"certificate, then you do not trust the authenticity of this certificate "
"unless otherwise indicated here"
-#: smime/gui/certificate-manager.c:130 smime/gui/certificate-manager.c:353
-#: smime/gui/certificate-manager.c:556
+#: smime/gui/certificate-manager.c:134 smime/gui/certificate-manager.c:142
+#: smime/gui/certificate-manager.c:375 smime/gui/certificate-manager.c:383
+#: smime/gui/certificate-manager.c:595 smime/gui/certificate-manager.c:603
msgid "Select a cert to import..."
msgstr "Select a cert to import..."
-#: smime/gui/certificate-manager.c:245 smime/gui/certificate-manager.c:437
-#: smime/gui/certificate-manager.c:638
+#: smime/gui/certificate-manager.c:263 smime/gui/certificate-manager.c:472
+#: smime/gui/certificate-manager.c:690
msgid "Certificate Name"
msgstr "Certificate Name"
-#: smime/gui/certificate-manager.c:254 smime/gui/certificate-manager.c:455
+#: smime/gui/certificate-manager.c:272 smime/gui/certificate-manager.c:490
msgid "Purposes"
msgstr "Purposes"
-#: smime/gui/certificate-manager.c:263 smime/gui/smime-ui.glade.h:36
+#: smime/gui/certificate-manager.c:281 smime/gui/smime-ui.glade.h:36
#: smime/lib/e-cert.c:569
msgid "Serial Number"
msgstr "Serial Number"
-#: smime/gui/certificate-manager.c:271
+#: smime/gui/certificate-manager.c:289
msgid "Expires"
msgstr "Expires"
-#: smime/gui/certificate-manager.c:446
+#: smime/gui/certificate-manager.c:481
msgid "E-Mail Address"
msgstr "E-Mail Address"
@@ -19415,6 +19529,25 @@ msgstr "%s (...)"
msgid "%s (%d%% complete)"
msgstr "%s (%d%% complete)"
+#~ msgid "_Add Group"
+#~ msgstr "_Add Group"
+
+#~ msgid "Use ssl"
+#~ msgstr "Use ssl"
+
+#~ msgid "Ximian Evolution (Unstable)"
+#~ msgstr "Ximian Evolution (Unstable)"
+
+#~ msgid "Remember this password"
+#~ msgstr "Remember this password"
+
+#~ msgid "Remember this password for the remainder of this session"
+#~ msgstr "Remember this password for the remainder of this session"
+
+#, fuzzy
+#~ msgid "Keep"
+#~ msgstr "Beep"
+
#~ msgid "_Add Contacts Group"
#~ msgstr "_Add Contacts Group"
@@ -19560,9 +19693,6 @@ msgstr "%s (%d%% complete)"
#~ msgid "Addressbook..."
#~ msgstr "Addressbook..."
-#~ msgid "Reminder"
-#~ msgstr "Reminder"
-
#~ msgid "B_usy"
#~ msgstr "B_usy"