aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdam Weinberger <adamw@src.gnome.org>2004-08-04 08:29:15 +0800
committerAdam Weinberger <adamw@src.gnome.org>2004-08-04 08:29:15 +0800
commitc7692c5c30e604fd628e319f18d506031a3adc1f (patch)
tree1b5a725d8f213efa317970ebbd2116d5ae6caa1a
parente42af08627db9fd5eed66551e52157bb91c0e642 (diff)
downloadgsoc2013-evolution-c7692c5c30e604fd628e319f18d506031a3adc1f.tar.gz
gsoc2013-evolution-c7692c5c30e604fd628e319f18d506031a3adc1f.tar.zst
gsoc2013-evolution-c7692c5c30e604fd628e319f18d506031a3adc1f.zip
Updated Canadian English translation.
* en_CA.po: Updated Canadian English translation. svn path=/trunk/; revision=26817
-rw-r--r--po/ChangeLog4
-rw-r--r--po/en_CA.po206
2 files changed, 152 insertions, 58 deletions
diff --git a/po/ChangeLog b/po/ChangeLog
index 20f70685c7..7192951830 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,7 @@
+2004-08-03 Adam Weinberger <adamw@gnome.org>
+
+ * en_CA.po: Updated Canadian English translation.
+
2004-08-03 Francisco Javier F. Serrador <serrador@cvs.gnome.org>
* es.po: Updated Spanish translation.
diff --git a/po/en_CA.po b/po/en_CA.po
index 504e62745c..465f2489de 100644
--- a/po/en_CA.po
+++ b/po/en_CA.po
@@ -6,14 +6,14 @@
msgid ""
msgstr ""
"Project-Id-Version: evolution\n"
-"POT-Creation-Date: 2004-08-02 15:35-0400\n"
-"PO-Revision-Date: 2004-08-02 19:18-0700\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2004-08-03 20:27-0400\n"
+"PO-Revision-Date: 2004-08-03 19:18-0700\n"
"Last-Translator: Adam Weinberger <adamw@gnome.org>\n"
"Language-Team: Canadian English <adamw@FreeBSD.org>\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
@@ -913,7 +930,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"
@@ -1046,7 +1063,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
@@ -2307,7 +2324,7 @@ msgid "Insert email adresses from Adress Book"
msgstr "Insert email addresses from Address 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"
@@ -2336,7 +2353,7 @@ msgstr "_Type an email address or drag a contact into the list below:"
msgid "dialog1"
msgstr "dialog1"
-#: 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
@@ -2345,17 +2362,17 @@ msgstr "dialog1"
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"
@@ -3171,17 +3188,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"
@@ -3490,6 +3507,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?"
@@ -3542,6 +3560,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."
@@ -3580,6 +3600,7 @@ msgid "Are you sure you want to delete the appointment titled '{0}'?"
msgstr "Are you sure you want to delete the appointment entitled '{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."
@@ -3602,6 +3623,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."
@@ -4135,6 +4157,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
@@ -4180,6 +4206,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
@@ -5092,6 +5121,11 @@ 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
@@ -5726,11 +5760,11 @@ msgstr "No"
#: 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
@@ -5992,12 +6026,20 @@ 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"
@@ -6021,6 +6063,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"
@@ -6551,6 +6597,10 @@ msgstr "%A, %B %d, %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
@@ -6559,6 +6609,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"
@@ -10125,7 +10179,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
@@ -10306,21 +10360,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
@@ -10331,7 +10385,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"
@@ -10339,7 +10393,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
@@ -10349,7 +10403,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"
@@ -10409,7 +10463,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\""
@@ -10445,25 +10499,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"
@@ -10542,7 +10596,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 "
@@ -10551,93 +10605,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"
@@ -12130,6 +12184,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
@@ -12229,6 +12288,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."
@@ -12395,12 +12455,16 @@ 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"
@@ -12452,23 +12516,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"
@@ -12561,6 +12633,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."
@@ -12581,6 +12654,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."
@@ -15497,6 +15571,7 @@ msgstr ""
"an idea of the topic of your letter."
#. 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?"
@@ -15575,6 +15650,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."
@@ -15664,6 +15740,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}\"."
@@ -15700,6 +15778,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 "
@@ -15733,11 +15812,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."
@@ -15748,21 +15829,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}\"."
@@ -15778,6 +15863,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."
@@ -15977,6 +16063,8 @@ msgid ""
"Could not connect to {0}. Groupwise account setup is incomplete. You may "
"need to setup the account again"
msgstr ""
+"Could not connect to {0}. Groupwise account setup is incomplete. You may "
+"need to set up the account again"
#: mail/mail-folder-cache.c:795
#, c-format
@@ -17034,6 +17122,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 "Delete old data from version {0}?"
@@ -17060,6 +17149,7 @@ msgid "Keep"
msgstr "Keep"
#. shell:upgrade-remove-1-4-confirm title
+#. shell:upgrade-remove-1-4-confirm primary
#: shell/shell-errors.xml.h:27 shell/shell-errors.xml.h:29
msgid "Really delete old data?"
msgstr "Really delete old data?"
@@ -17088,11 +17178,13 @@ msgstr ""
"without manual intervention.\n"
#. shell:noshell title
+#. shell:noshell-reason title
#: shell/shell-errors.xml.h:38 shell/shell-errors.xml.h:46
msgid "Cannot start Evolution"
msgstr "Cannot start Evolution"
#. shell:noshell primary
+#. shell:noshell-reason primary
#: shell/shell-errors.xml.h:40 shell/shell-errors.xml.h:48
msgid "Evolution can not start."
msgstr "Evolution cannot start."
@@ -19356,18 +19448,16 @@ msgid "Choose Image"
msgstr "Choose Image"
#: widgets/misc/e-pilot-settings.c:103
-#, fuzzy
msgid "Sync with:"
-msgstr "ends with"
+msgstr "Sync with:"
#: widgets/misc/e-pilot-settings.c:111
msgid "Sync Private Records:"
-msgstr ""
+msgstr "Sync Private Records:"
#: widgets/misc/e-pilot-settings.c:120
-#, fuzzy
msgid "Sync Categories:"
-msgstr "Categories"
+msgstr "Sync Categories:"
#: widgets/misc/e-search-bar.c:540
msgid "_Search"