aboutsummaryrefslogtreecommitdiffstats
path: root/po/is.po
diff options
context:
space:
mode:
authorJP Rosevear <jpr@src.gnome.org>2004-04-20 03:52:05 +0800
committerJP Rosevear <jpr@src.gnome.org>2004-04-20 03:52:05 +0800
commitd0d8d568ad9a830e50845f3d86fb30105b37d319 (patch)
treea709afbfd097e0601a0e9c7ec05e0b6b05af431e /po/is.po
parentd812fc96ba5647aebc61789855f498f17d689456 (diff)
downloadgsoc2013-evolution-d0d8d568ad9a830e50845f3d86fb30105b37d319.tar
gsoc2013-evolution-d0d8d568ad9a830e50845f3d86fb30105b37d319.tar.gz
gsoc2013-evolution-d0d8d568ad9a830e50845f3d86fb30105b37d319.tar.bz2
gsoc2013-evolution-d0d8d568ad9a830e50845f3d86fb30105b37d319.tar.lz
gsoc2013-evolution-d0d8d568ad9a830e50845f3d86fb30105b37d319.tar.xz
gsoc2013-evolution-d0d8d568ad9a830e50845f3d86fb30105b37d319.tar.zst
gsoc2013-evolution-d0d8d568ad9a830e50845f3d86fb30105b37d319.zip
Merge from release branch
svn path=/trunk/; revision=25522
Diffstat (limited to 'po/is.po')
-rw-r--r--po/is.po1265
1 files changed, 604 insertions, 661 deletions
diff --git a/po/is.po b/po/is.po
index 438fa9d490..47c19c91d0 100644
--- a/po/is.po
+++ b/po/is.po
@@ -6,14 +6,14 @@
msgid ""
msgstr ""
"Project-Id-Version: evolution\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-04-07 01:55+0000\n"
+"POT-Creation-Date: 2004-04-19 11:44-0400\n"
"PO-Revision-Date: 2004-03-13 14:31-0000\n"
"Last-Translator: helgi <helgi@trance.is>\n"
"Language-Team: Icelandic <gnome@techattack.nu>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Report-Msgid-Bugs-To: \n"
#: a11y/addressbook/ea-addressbook-view.c:94
#: a11y/addressbook/ea-addressbook-view.c:103
@@ -81,6 +81,7 @@ msgstr ""
#.
#. name = e_book_get_name (book);
#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
+#: addressbook/gui/component/addressbook-component.c:522
#: addressbook/tools/evolution-addressbook-export-list-folders.c:51
#: calendar/gui/migration.c:363
msgid "Contacts"
@@ -122,19 +123,19 @@ msgstr ""
msgid "Manager your S/Mime certificates here"
msgstr ""
-#: addressbook/gui/component/addressbook-component.c:225
+#: addressbook/gui/component/addressbook-component.c:227
#, c-format
msgid "Address book '%s' will be removed. Are you sure you want to continue?"
msgstr ""
-#: addressbook/gui/component/addressbook-component.c:313
+#: addressbook/gui/component/addressbook-component.c:315
#: addressbook/gui/component/ldap-config.glade.h:25
msgid "New Address Book"
msgstr ""
-#: addressbook/gui/component/addressbook-component.c:314
+#: addressbook/gui/component/addressbook-component.c:316
#: addressbook/gui/widgets/e-addressbook-view.c:1086
-#: calendar/gui/calendar-component.c:436 calendar/gui/tasks-component.c:367
+#: calendar/gui/calendar-component.c:436 calendar/gui/tasks-component.c:368
#: filter/libfilter-i18n.h:11 mail/em-account-prefs.c:235
#: ui/evolution-addressbook.xml.h:8 ui/evolution-calendar.xml.h:5
#: ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:3
@@ -143,46 +144,45 @@ msgstr ""
msgid "Delete"
msgstr "Eyða"
-#: addressbook/gui/component/addressbook-component.c:315
-#: calendar/gui/calendar-component.c:437 calendar/gui/tasks-component.c:369
+#: addressbook/gui/component/addressbook-component.c:317
+#: calendar/gui/calendar-component.c:437 calendar/gui/tasks-component.c:370
msgid "Properties..."
msgstr "Stillingar..."
-#: addressbook/gui/component/addressbook-component.c:551
+#: addressbook/gui/component/addressbook-component.c:562
msgid "New Contact"
msgstr ""
-#: addressbook/gui/component/addressbook-component.c:552
+#: addressbook/gui/component/addressbook-component.c:563
msgid "_Contact"
msgstr ""
-#: addressbook/gui/component/addressbook-component.c:553
+#: addressbook/gui/component/addressbook-component.c:564
msgid "Create a new contact"
msgstr ""
-#: addressbook/gui/component/addressbook-component.c:558
+#: addressbook/gui/component/addressbook-component.c:570
msgid "New Contact List"
msgstr ""
-#: addressbook/gui/component/addressbook-component.c:559
+#: addressbook/gui/component/addressbook-component.c:571
msgid "Contact _List"
msgstr ""
-#: addressbook/gui/component/addressbook-component.c:560
+#: addressbook/gui/component/addressbook-component.c:572
msgid "Create a new contact list"
msgstr ""
-#: addressbook/gui/component/addressbook-component.c:565
-msgid "New Addressbook Book"
+#: addressbook/gui/component/addressbook-component.c:578
+msgid "New Contacts Group"
msgstr ""
-#: addressbook/gui/component/addressbook-component.c:566
-#, fuzzy
-msgid "_Address Book"
-msgstr "_Heimilisfang:"
+#: addressbook/gui/component/addressbook-component.c:579
+msgid "_Contacts Group"
+msgstr ""
-#: addressbook/gui/component/addressbook-component.c:567
-msgid "Create a new address book"
+#: addressbook/gui/component/addressbook-component.c:580
+msgid "Create a new contacts group"
msgstr ""
#: addressbook/gui/component/addressbook-config.c:407
@@ -213,21 +213,13 @@ msgstr ""
msgid "Server did not respond with valid schema information"
msgstr ""
-#: addressbook/gui/component/addressbook-migrate.c:57
-#: calendar/gui/migration.c:128 mail/em-migrate.c:1071
+#: addressbook/gui/component/addressbook-migrate.c:58
+#: calendar/gui/migration.c:128 mail/em-migrate.c:1072
msgid "Migrating..."
msgstr ""
-#: addressbook/gui/component/addressbook-migrate.c:65
-msgid ""
-"The location and hierarchy of the Evolution contact folders has changed "
-"since Evolution 1.x.\n"
-"\n"
-"Please be patient while Evolution migrates your folders..."
-msgstr ""
-
-#: addressbook/gui/component/addressbook-migrate.c:99
-#: calendar/gui/migration.c:175 mail/em-migrate.c:1112
+#: addressbook/gui/component/addressbook-migrate.c:98
+#: calendar/gui/migration.c:175 mail/em-migrate.c:1113
#, c-format
msgid "Migrating `%s':"
msgstr ""
@@ -235,111 +227,69 @@ msgstr ""
# create the local source group
# On This Computer is always first and VFolders is always last
#. create the local source group
-#: addressbook/gui/component/addressbook-migrate.c:409
+#: addressbook/gui/component/addressbook-migrate.c:408
#: calendar/gui/migration.c:430 calendar/gui/migration.c:513
#: mail/em-folder-tree-model.c:192 mail/em-folder-tree-model.c:194
-#: mail/mail-component.c:236
+#: mail/mail-component.c:239
msgid "On This Computer"
msgstr ""
# Create the default Person addressbook
# orange
#. Create the default Person addressbook
-#: addressbook/gui/component/addressbook-migrate.c:417
+#: addressbook/gui/component/addressbook-migrate.c:416
#: calendar/gui/migration.c:438 calendar/gui/migration.c:521
-#: filter/filter-label.c:123 mail/em-migrate.c:925 mail/mail-config.c:67
+#: filter/filter-label.c:123 mail/em-migrate.c:926 mail/mail-config.c:67
#: mail/mail-config.glade.h:106
msgid "Personal"
msgstr ""
#. Create the LDAP source group
-#: addressbook/gui/component/addressbook-migrate.c:425
+#: addressbook/gui/component/addressbook-migrate.c:424
msgid "On LDAP Servers"
msgstr ""
-#: addressbook/gui/component/addressbook-migrate.c:553
+#: addressbook/gui/component/addressbook-migrate.c:552
msgid "LDAP Servers"
msgstr ""
-#: addressbook/gui/component/addressbook-migrate.c:673
+#: addressbook/gui/component/addressbook-migrate.c:672
msgid "Autocompletion Settings"
msgstr ""
-#: addressbook/gui/component/addressbook.c:275
-msgid ""
-"More cards matched this query than either the server is \n"
-"configured to return or Evolution is configured to display.\n"
-"Please make your search more specific or raise the result limit in\n"
-"the directory server preferences for this addressbook."
-msgstr ""
-
-#: addressbook/gui/component/addressbook.c:281
+#: addressbook/gui/component/addressbook-migrate.c:853
msgid ""
-"The time to execute this query exceeded the server limit or the limit\n"
-"you have configured for this addressbook. Please make your search\n"
-"more specific or raise the time limit in the directory server\n"
-"preferences for this addressbook."
-msgstr ""
-
-#: addressbook/gui/component/addressbook.c:287
-msgid "The backend for this addressbook was unable to parse this query."
-msgstr ""
-
-#: addressbook/gui/component/addressbook.c:290
-msgid "The backend for this addressbook refused to perform this query."
-msgstr ""
-
-#: addressbook/gui/component/addressbook.c:293
-msgid "This query did not complete successfully."
-msgstr ""
-
-#: addressbook/gui/component/addressbook.c:591
-msgid ""
-"We were unable to open this addressbook. Please check that the path exists "
-"and that you have permission to access it."
-msgstr ""
-
-#: addressbook/gui/component/addressbook.c:598
-msgid ""
-"We were unable to open this addressbook. This either means you have entered "
-"an incorrect URI, or the LDAP server is unreachable."
-msgstr ""
-
-#: addressbook/gui/component/addressbook.c:603
-msgid ""
-"This version of Evolution does not have LDAP support compiled in to it. If "
-"you want to use LDAP in Evolution you must compile the program from the CVS "
-"sources after retrieving OpenLDAP from the link below."
+"The location and hierarchy of the Evolution contact folders has changed "
+"since Evolution 1.x.\n"
+"\n"
+"Please be patient while Evolution migrates your folders..."
msgstr ""
-#: addressbook/gui/component/addressbook.c:612
+#: addressbook/gui/component/addressbook-migrate.c:869
msgid ""
-"We were unable to open this addressbook. This either means you have entered "
-"an incorrect URI, or the server is unreachable."
-msgstr ""
-
-#: addressbook/gui/component/addressbook.c:629
-msgid "Unable to open addressbook"
+"The format of mailing list contacts has changed.\n"
+"\n"
+"Please be patient while Evolution migrates your folders..."
msgstr ""
-#: addressbook/gui/component/addressbook.c:713
+#: addressbook/gui/component/addressbook.c:622
msgid "Accessing LDAP Server anonymously"
msgstr ""
-#: addressbook/gui/component/addressbook.c:782
+#: addressbook/gui/component/addressbook.c:693
msgid "Failed to authenticate.\n"
msgstr ""
-#: addressbook/gui/component/addressbook.c:788
+#: addressbook/gui/component/addressbook.c:699
#, c-format
msgid "%sEnter password for %s (user %s)"
msgstr "%sLykilorð fyrir %s (notandann %s)"
-#: addressbook/gui/component/addressbook.c:1113
+#: addressbook/gui/component/addressbook.c:1025
msgid "UID of the contacts source that the view will display"
msgstr ""
-#: addressbook/gui/component/addressbook.c:1118
+#: addressbook/gui/component/addressbook.c:1030
msgid "The URI that the address book will display"
msgstr ""
@@ -382,7 +332,6 @@ msgstr ""
#: calendar/gui/dialogs/url-editor-dialog.glade.h:1
#: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:2
#: mail/mail-search.glade.h:1 mail/message-tags.glade.h:1
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:1
#: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
msgid "*"
msgstr "*"
@@ -721,35 +670,35 @@ msgstr ""
msgid "Evolution Addressbook name selection interface"
msgstr ""
-#: addressbook/gui/component/select-names/e-select-names-popup.c:207
+#: addressbook/gui/component/select-names/e-select-names-popup.c:206
msgid "Remove All"
msgstr "Fjarlægja Allt"
-#: addressbook/gui/component/select-names/e-select-names-popup.c:214
-#: addressbook/gui/component/select-names/e-select-names.c:693
-#: calendar/gui/dialogs/cal-prefs-dialog.c:659
+#: addressbook/gui/component/select-names/e-select-names-popup.c:213
+#: addressbook/gui/component/select-names/e-select-names.c:696
+#: calendar/gui/dialogs/cal-prefs-dialog.c:734
msgid "Remove"
msgstr "Fjarlægja"
-#: addressbook/gui/component/select-names/e-select-names-popup.c:221
+#: addressbook/gui/component/select-names/e-select-names-popup.c:220
msgid "View Contact List"
msgstr ""
-#: addressbook/gui/component/select-names/e-select-names-popup.c:221
+#: addressbook/gui/component/select-names/e-select-names-popup.c:220
msgid "View Contact Info"
msgstr ""
-#: addressbook/gui/component/select-names/e-select-names-popup.c:228
-#: addressbook/gui/component/select-names/e-select-names-popup.c:338
+#: addressbook/gui/component/select-names/e-select-names-popup.c:227
+#: addressbook/gui/component/select-names/e-select-names-popup.c:328
msgid "Send HTML Mail?"
msgstr "Senda HTML Póst?"
-#: addressbook/gui/component/select-names/e-select-names-popup.c:330
-#: addressbook/gui/widgets/eab-popup-control.c:1001
+#: addressbook/gui/component/select-names/e-select-names-popup.c:320
+#: addressbook/gui/widgets/eab-popup-control.c:983
msgid "Add to Contacts"
msgstr ""
-#: addressbook/gui/component/select-names/e-select-names-popup.c:356
+#: addressbook/gui/component/select-names/e-select-names-popup.c:346
msgid "Unnamed Contact"
msgstr ""
@@ -765,7 +714,7 @@ msgstr "Nafn"
msgid "Source"
msgstr ""
-#: addressbook/gui/component/select-names/e-select-names.c:494
+#: addressbook/gui/component/select-names/e-select-names.c:497
#: addressbook/gui/component/select-names/select-names.glade.h:6
msgid "Select Contacts from Address Book"
msgstr ""
@@ -921,7 +870,7 @@ msgstr ""
#: calendar/gui/dialogs/meeting-page.c:651
#: calendar/gui/e-calendar-table.c:1060 calendar/gui/e-calendar-table.c:1078
#: calendar/gui/e-calendar-view.c:1281 calendar/gui/e-calendar-view.c:1312
-#: mail/em-folder-tree.c:2517 mail/em-folder-view.c:769
+#: mail/em-folder-tree.c:2570 mail/em-folder-view.c:794
#: 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
#: ui/evolution-mail-message.xml.h:112 ui/evolution-tasks.xml.h:21
@@ -980,8 +929,8 @@ msgid "_Web page address:"
msgstr ""
#: addressbook/gui/contact-editor/e-contact-editor-address.c:96
-#: addressbook/gui/widgets/eab-contact-display.c:316
-#: addressbook/gui/widgets/eab-contact-display.c:337
+#: addressbook/gui/widgets/eab-contact-display.c:314
+#: addressbook/gui/widgets/eab-contact-display.c:335
msgid "Address"
msgstr ""
@@ -989,7 +938,7 @@ msgstr ""
#: 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:252
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:170
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:173
#: 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
@@ -1977,8 +1926,8 @@ msgstr ""
#: addressbook/gui/contact-editor/e-contact-editor-im.c:64
#: addressbook/gui/contact-editor/e-contact-editor.c:2835
-#: addressbook/gui/widgets/eab-contact-display.c:310
-#: addressbook/gui/widgets/eab-contact-display.c:329
+#: addressbook/gui/widgets/eab-contact-display.c:308
+#: addressbook/gui/widgets/eab-contact-display.c:327
msgid "Jabber"
msgstr ""
@@ -1992,8 +1941,8 @@ msgstr ""
#: addressbook/gui/contact-editor/e-contact-editor-im.c:67
#: addressbook/gui/contact-editor/e-contact-editor.c:2838
-#: addressbook/gui/widgets/eab-contact-display.c:309
-#: addressbook/gui/widgets/eab-contact-display.c:328
+#: addressbook/gui/widgets/eab-contact-display.c:307
+#: addressbook/gui/widgets/eab-contact-display.c:326
msgid "ICQ"
msgstr ""
@@ -2004,7 +1953,7 @@ msgstr ""
#: addressbook/gui/contact-editor/e-contact-editor-im.c:127
#: addressbook/gui/contact-editor/e-contact-editor.c:727
-#: calendar/gui/dialogs/cal-prefs-dialog.c:426
+#: calendar/gui/dialogs/cal-prefs-dialog.c:580
#: calendar/gui/e-cal-list-view.etspec.h:2
msgid "Location"
msgstr ""
@@ -2023,7 +1972,7 @@ msgstr ""
#. red
#: addressbook/gui/contact-editor/e-contact-editor-im.c:250
#: addressbook/gui/contact-editor/e-contact-editor.c:2803
-#: filter/filter-label.c:122 mail/em-migrate.c:924 mail/mail-config.c:66
+#: filter/filter-label.c:122 mail/em-migrate.c:925 mail/mail-config.c:66
#: mail/mail-config.glade.h:155
msgid "Work"
msgstr "Vinna"
@@ -2043,7 +1992,7 @@ msgid "Target Book"
msgstr ""
#: addressbook/gui/contact-editor/e-contact-editor.c:231
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:156
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:159
#: addressbook/gui/contact-list-editor/e-contact-list-editor.etspec.h:1
#: addressbook/gui/widgets/e-minicard.c:180
msgid "Contact"
@@ -2082,20 +2031,20 @@ msgid "Business"
msgstr ""
#: addressbook/gui/contact-editor/e-contact-editor.c:2834
-#: addressbook/gui/widgets/eab-contact-display.c:307
-#: addressbook/gui/widgets/eab-contact-display.c:326
+#: addressbook/gui/widgets/eab-contact-display.c:305
+#: addressbook/gui/widgets/eab-contact-display.c:324
msgid "AIM"
msgstr "AIM"
#: addressbook/gui/contact-editor/e-contact-editor.c:2836
-#: addressbook/gui/widgets/eab-contact-display.c:312
-#: addressbook/gui/widgets/eab-contact-display.c:331
+#: addressbook/gui/widgets/eab-contact-display.c:310
+#: addressbook/gui/widgets/eab-contact-display.c:329
msgid "Yahoo"
msgstr "Yahoo"
#: addressbook/gui/contact-editor/e-contact-editor.c:2837
-#: addressbook/gui/widgets/eab-contact-display.c:311
-#: addressbook/gui/widgets/eab-contact-display.c:330
+#: addressbook/gui/widgets/eab-contact-display.c:309
+#: addressbook/gui/widgets/eab-contact-display.c:328
msgid "MSN"
msgstr "MSN"
@@ -2278,7 +2227,7 @@ msgstr ""
msgid "contact-list-editor"
msgstr ""
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:149
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:152
#: addressbook/gui/widgets/e-addressbook-model.c:295
#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:378
#: addressbook/gui/widgets/e-addressbook-view.c:215
@@ -2287,17 +2236,17 @@ msgstr ""
msgid "Book"
msgstr "Bók"
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:163
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:166
msgid "Is New List"
msgstr ""
#. Construct the app
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:211
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:753
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:214
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:756
msgid "Contact List Editor"
msgstr ""
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:431
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:434
msgid "Save List as VCard"
msgstr ""
@@ -2367,7 +2316,7 @@ msgstr ""
msgid "Model"
msgstr ""
-#: addressbook/gui/widgets/e-addressbook-table-adapter.c:114
+#: addressbook/gui/widgets/e-addressbook-table-adapter.c:103
msgid "Error modifying card"
msgstr ""
@@ -2409,7 +2358,7 @@ msgstr ""
#: addressbook/gui/widgets/e-addressbook-view.c:850
#: addressbook/gui/widgets/e-addressbook-view.c:1070
-#: addressbook/gui/widgets/e-addressbook-view.c:2031
+#: addressbook/gui/widgets/e-addressbook-view.c:2066
#: ui/evolution-addressbook.xml.h:19
msgid "Save as VCard"
msgstr ""
@@ -2477,7 +2426,7 @@ msgstr "Klippa"
# create the dialog
#: addressbook/gui/widgets/e-addressbook-view.c:1084
-#: calendar/gui/calendar-component.c:434 calendar/gui/tasks-component.c:365
+#: calendar/gui/calendar-component.c:434 calendar/gui/tasks-component.c:366
#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:9
#: ui/evolution-tasks.xml.h:2
msgid "Copy"
@@ -2493,7 +2442,7 @@ msgstr "Líma"
msgid "Current View"
msgstr ""
-#: addressbook/gui/widgets/e-addressbook-view.c:1279
+#: addressbook/gui/widgets/e-addressbook-view.c:1309
#, c-format
msgid ""
"The addressbook backend for\n"
@@ -2502,7 +2451,7 @@ msgid ""
msgstr ""
#. All, unmatched, separator
-#: addressbook/gui/widgets/e-addressbook-view.c:1622
+#: addressbook/gui/widgets/e-addressbook-view.c:1657
#: calendar/gui/cal-search-bar.c:359
msgid "Any Category"
msgstr ""
@@ -2544,17 +2493,17 @@ msgid "Company Phone"
msgstr ""
#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
-#: addressbook/gui/widgets/eab-contact-display.c:522 smime/lib/e-cert.c:774
+#: addressbook/gui/widgets/eab-contact-display.c:515 smime/lib/e-cert.c:774
msgid "Email"
msgstr "Email"
#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
-#: addressbook/gui/widgets/eab-popup-control.c:460
+#: 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:470
+#: addressbook/gui/widgets/eab-popup-control.c:452
msgid "Email 3"
msgstr "Email 3"
@@ -2595,7 +2544,7 @@ msgid "Manager"
msgstr ""
#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
-#: addressbook/gui/widgets/eab-contact-display.c:336
+#: addressbook/gui/widgets/eab-contact-display.c:334
msgid "Mobile Phone"
msgstr ""
@@ -2604,7 +2553,7 @@ msgid "Nickname"
msgstr ""
#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-#: addressbook/gui/widgets/eab-contact-display.c:347
+#: addressbook/gui/widgets/eab-contact-display.c:345
msgid "Note"
msgstr ""
@@ -2613,7 +2562,7 @@ msgid "Office"
msgstr ""
#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
-#: addressbook/gui/widgets/eab-contact-display.c:305
+#: addressbook/gui/widgets/eab-contact-display.c:303
msgid "Organization"
msgstr ""
@@ -2731,69 +2680,69 @@ msgstr ""
msgid "Has Cursor"
msgstr ""
-#: addressbook/gui/widgets/eab-contact-display.c:118
+#: addressbook/gui/widgets/eab-contact-display.c:117
#: addressbook/gui/widgets/eab-contact-display.c:180
msgid "(map)"
msgstr ""
-#: addressbook/gui/widgets/eab-contact-display.c:128
-#: addressbook/gui/widgets/eab-contact-display.c:190
+#: addressbook/gui/widgets/eab-contact-display.c:127
+#: addressbook/gui/widgets/eab-contact-display.c:193
msgid "map"
msgstr ""
-#: addressbook/gui/widgets/eab-contact-display.c:242
-#: addressbook/gui/widgets/eab-contact-display.c:498
+#: addressbook/gui/widgets/eab-contact-display.c:245
+#: addressbook/gui/widgets/eab-contact-display.c:496
msgid "List Members"
msgstr ""
-#: addressbook/gui/widgets/eab-contact-display.c:298
+#: addressbook/gui/widgets/eab-contact-display.c:296
msgid "E-mail"
msgstr "E-mail"
-#: addressbook/gui/widgets/eab-contact-display.c:306
+#: addressbook/gui/widgets/eab-contact-display.c:304
msgid "Position"
msgstr ""
-#: addressbook/gui/widgets/eab-contact-display.c:308
-#: addressbook/gui/widgets/eab-contact-display.c:327
+#: addressbook/gui/widgets/eab-contact-display.c:306
+#: addressbook/gui/widgets/eab-contact-display.c:325
msgid "Groupwise"
msgstr ""
-#: addressbook/gui/widgets/eab-contact-display.c:313
+#: addressbook/gui/widgets/eab-contact-display.c:311
msgid "Video Conferencing"
msgstr ""
-#: addressbook/gui/widgets/eab-contact-display.c:314
-#: addressbook/gui/widgets/eab-contact-display.c:335
+#: addressbook/gui/widgets/eab-contact-display.c:312
+#: addressbook/gui/widgets/eab-contact-display.c:333
msgid "Phone"
msgstr ""
-#: addressbook/gui/widgets/eab-contact-display.c:315
+#: addressbook/gui/widgets/eab-contact-display.c:313
msgid "Fax"
msgstr ""
-#: addressbook/gui/widgets/eab-contact-display.c:319
+#: addressbook/gui/widgets/eab-contact-display.c:317
msgid "work"
msgstr ""
-#: addressbook/gui/widgets/eab-contact-display.c:332
+#: addressbook/gui/widgets/eab-contact-display.c:330
msgid "WWW"
msgstr ""
-#: addressbook/gui/widgets/eab-contact-display.c:333
-#: addressbook/gui/widgets/eab-contact-display.c:557
+#: addressbook/gui/widgets/eab-contact-display.c:331
+#: addressbook/gui/widgets/eab-contact-display.c:550
msgid "Blog"
msgstr ""
-#: addressbook/gui/widgets/eab-contact-display.c:340
+#: addressbook/gui/widgets/eab-contact-display.c:338
msgid "personal"
msgstr ""
-#: addressbook/gui/widgets/eab-contact-display.c:518
+#: addressbook/gui/widgets/eab-contact-display.c:511
msgid "Job Title"
msgstr "Starfs Titill"
-#: addressbook/gui/widgets/eab-contact-display.c:549
+#: addressbook/gui/widgets/eab-contact-display.c:542
msgid "Home page"
msgstr ""
@@ -2805,7 +2754,7 @@ msgstr ""
#: camel/providers/imap/camel-imap-command.c:303
#: camel/providers/imap/camel-imap-command.c:400
#: camel/providers/pop3/camel-pop3-store.c:538
-#: camel/providers/pop3/camel-pop3-store.c:545 shell/e-shell.c:1071
+#: camel/providers/pop3/camel-pop3-store.c:545 shell/e-shell.c:1089
msgid "Unknown error"
msgstr "Óþekkt villa"
@@ -2832,7 +2781,7 @@ msgstr ""
#: addressbook/gui/widgets/eab-gui-util.c:54
#: calendar/gui/dialogs/task-details-page.glade.h:3
#: calendar/gui/e-cal-model-tasks.c:325 calendar/gui/e-cal-model-tasks.c:599
-#: calendar/gui/e-calendar-table.c:467 calendar/gui/e-tasks.c:209
+#: calendar/gui/e-calendar-table.c:467 calendar/gui/e-tasks.c:212
#: calendar/gui/print.c:2349 camel/camel-service.c:728
#: camel/camel-service.c:766 camel/camel-service.c:850
#: camel/camel-service.c:890 camel/providers/pop3/camel-pop3-store.c:451
@@ -2860,98 +2809,155 @@ msgstr ""
msgid "Other error"
msgstr ""
-#: addressbook/gui/widgets/eab-gui-util.c:86
+#: addressbook/gui/widgets/eab-gui-util.c:90
+msgid ""
+"We were unable to open this addressbook. Please check that the path exists "
+"and that you have permission to access it."
+msgstr ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:97
+msgid ""
+"We were unable to open this addressbook. This either means you have entered "
+"an incorrect URI, or the LDAP server is unreachable."
+msgstr ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:102
+msgid ""
+"This version of Evolution does not have LDAP support compiled in to it. If "
+"you want to use LDAP in Evolution you must compile the program from the CVS "
+"sources after retrieving OpenLDAP from the link below."
+msgstr ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:111
+msgid ""
+"We were unable to open this addressbook. This either means you have entered "
+"an incorrect URI, or the server is unreachable."
+msgstr ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:128
+msgid "Unable to open addressbook"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:149
+msgid ""
+"More cards matched this query than either the server is \n"
+"configured to return or Evolution is configured to display.\n"
+"Please make your search more specific or raise the result limit in\n"
+"the directory server preferences for this addressbook."
+msgstr ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:155
+msgid ""
+"The time to execute this query exceeded the server limit or the limit\n"
+"you have configured for this addressbook. Please make your search\n"
+"more specific or raise the time limit in the directory server\n"
+"preferences for this addressbook."
+msgstr ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:161
+msgid "The backend for this addressbook was unable to parse this query."
+msgstr ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:164
+msgid "The backend for this addressbook refused to perform this query."
+msgstr ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:167
+msgid "This query did not complete successfully."
+msgstr ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:193
msgid "Do you want to save changes?"
msgstr ""
-#: addressbook/gui/widgets/eab-gui-util.c:88
+#: addressbook/gui/widgets/eab-gui-util.c:195
msgid "_Discard"
msgstr ""
-#: addressbook/gui/widgets/eab-gui-util.c:107
+#: addressbook/gui/widgets/eab-gui-util.c:214
msgid "Error adding list"
msgstr ""
-#: addressbook/gui/widgets/eab-gui-util.c:107
-#: addressbook/gui/widgets/eab-gui-util.c:525
+#: addressbook/gui/widgets/eab-gui-util.c:214
+#: addressbook/gui/widgets/eab-gui-util.c:632
msgid "Error adding contact"
msgstr ""
-#: addressbook/gui/widgets/eab-gui-util.c:116
+#: addressbook/gui/widgets/eab-gui-util.c:223
msgid "Error modifying list"
msgstr ""
-#: addressbook/gui/widgets/eab-gui-util.c:116
+#: addressbook/gui/widgets/eab-gui-util.c:223
msgid "Error modifying contact"
msgstr ""
-#: addressbook/gui/widgets/eab-gui-util.c:126
+#: addressbook/gui/widgets/eab-gui-util.c:233
msgid "Error removing list"
msgstr ""
-#: addressbook/gui/widgets/eab-gui-util.c:126
-#: addressbook/gui/widgets/eab-gui-util.c:483
+#: addressbook/gui/widgets/eab-gui-util.c:233
+#: addressbook/gui/widgets/eab-gui-util.c:590
msgid "Error removing contact"
msgstr ""
-#: addressbook/gui/widgets/eab-gui-util.c:208
+#: addressbook/gui/widgets/eab-gui-util.c:315
#, c-format
msgid ""
"Opening %d contacts will open %d new windows as well.\n"
"Do you really want to display all of these contacts?"
msgstr ""
-#: addressbook/gui/widgets/eab-gui-util.c:234
+#: addressbook/gui/widgets/eab-gui-util.c:341
#, c-format
msgid ""
"%s already exists\n"
"Do you want to overwrite it?"
msgstr ""
-#: addressbook/gui/widgets/eab-gui-util.c:238
+#: addressbook/gui/widgets/eab-gui-util.c:345
msgid "Overwrite"
msgstr "Yfirskrifa"
-#: addressbook/gui/widgets/eab-gui-util.c:274
+#: addressbook/gui/widgets/eab-gui-util.c:381
#, c-format
msgid "Error saving %s: %s"
msgstr ""
# This is a filename. Translators take note.
#. This is a filename. Translators take note.
-#: addressbook/gui/widgets/eab-gui-util.c:311
+#: addressbook/gui/widgets/eab-gui-util.c:418
msgid "card.vcf"
msgstr ""
-#: addressbook/gui/widgets/eab-gui-util.c:444
+#: addressbook/gui/widgets/eab-gui-util.c:551
msgid "list"
msgstr ""
-#: addressbook/gui/widgets/eab-gui-util.c:579
+#: addressbook/gui/widgets/eab-gui-util.c:686
msgid "Move contact to"
msgstr ""
-#: addressbook/gui/widgets/eab-gui-util.c:581
+#: addressbook/gui/widgets/eab-gui-util.c:688
msgid "Copy contact to"
msgstr ""
-#: addressbook/gui/widgets/eab-gui-util.c:584
+#: addressbook/gui/widgets/eab-gui-util.c:691
msgid "Move contacts to"
msgstr ""
-#: addressbook/gui/widgets/eab-gui-util.c:586
+#: addressbook/gui/widgets/eab-gui-util.c:693
msgid "Copy contacts to"
msgstr ""
-#: addressbook/gui/widgets/eab-gui-util.c:589
+#: addressbook/gui/widgets/eab-gui-util.c:696
msgid "Select target addressbook."
msgstr ""
-#: addressbook/gui/widgets/eab-gui-util.c:768
+#: addressbook/gui/widgets/eab-gui-util.c:869
msgid "Multiple VCards"
msgstr ""
-#: addressbook/gui/widgets/eab-gui-util.c:771
+#: addressbook/gui/widgets/eab-gui-util.c:872
#, c-format
msgid "VCard for %s"
msgstr "VCard fyrir %s"
@@ -2961,37 +2967,37 @@ msgstr "VCard fyrir %s"
#. * addresses (and *only* the e-mail addresses) associated with an existing
#. * contact.
#.
-#: addressbook/gui/widgets/eab-popup-control.c:188
+#: addressbook/gui/widgets/eab-popup-control.c:199
msgid "(none)"
msgstr ""
-#: addressbook/gui/widgets/eab-popup-control.c:450
+#: addressbook/gui/widgets/eab-popup-control.c:432
msgid "Primary Email"
msgstr ""
-#: addressbook/gui/widgets/eab-popup-control.c:586
+#: addressbook/gui/widgets/eab-popup-control.c:568
msgid "Select an Action"
msgstr ""
-#: addressbook/gui/widgets/eab-popup-control.c:594
+#: addressbook/gui/widgets/eab-popup-control.c:576
#, c-format
msgid "Create a new contact \"%s\""
msgstr ""
-#: addressbook/gui/widgets/eab-popup-control.c:610
+#: addressbook/gui/widgets/eab-popup-control.c:592
#, c-format
msgid "Add address to existing contact \"%s\""
msgstr ""
-#: addressbook/gui/widgets/eab-popup-control.c:888
+#: addressbook/gui/widgets/eab-popup-control.c:870
msgid "Querying Address Book..."
msgstr ""
-#: addressbook/gui/widgets/eab-popup-control.c:971
+#: addressbook/gui/widgets/eab-popup-control.c:953
msgid "Edit Contact Info"
msgstr ""
-#: addressbook/gui/widgets/eab-popup-control.c:1026
+#: addressbook/gui/widgets/eab-popup-control.c:1008
msgid "Merge E-Mail Address"
msgstr ""
@@ -3062,12 +3068,12 @@ msgstr ""
msgid "Print envelope"
msgstr ""
-#: addressbook/printing/e-contact-print.c:1009
+#: addressbook/printing/e-contact-print.c:998
msgid "Print contacts"
msgstr ""
-#: addressbook/printing/e-contact-print.c:1075
-#: addressbook/printing/e-contact-print.c:1102
+#: addressbook/printing/e-contact-print.c:1064
+#: addressbook/printing/e-contact-print.c:1091
msgid "Print contact"
msgstr ""
@@ -3331,12 +3337,11 @@ msgstr ""
msgid "No filename provided."
msgstr ""
-#: addressbook/util/eab-destination.c:677
+#: addressbook/util/e-destination.c:576
msgid "Unnamed List"
msgstr ""
-#: calendar/common/authentication.c:37 calendar/gui/itip-utils.c:1158
-#: smime/gui/component.c:48
+#: calendar/common/authentication.c:37 smime/gui/component.c:48
msgid "Enter password"
msgstr ""
@@ -3373,6 +3378,7 @@ msgid "Calendar and Tasks"
msgstr ""
#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
+#: calendar/gui/calendar-component.c:847
msgid "Calendars"
msgstr ""
@@ -3413,8 +3419,9 @@ msgid "Evolution's Tasks component"
msgstr ""
#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: calendar/gui/e-tasks.c:1139 calendar/gui/print.c:1819
-#: calendar/gui/tasks-control.c:516 calendar/importers/icalendar-importer.c:79
+#: calendar/gui/e-tasks.c:1155 calendar/gui/print.c:1819
+#: calendar/gui/tasks-component.c:500 calendar/gui/tasks-control.c:516
+#: calendar/importers/icalendar-importer.c:79
#: calendar/importers/icalendar-importer.c:709
msgid "Tasks"
msgstr ""
@@ -3525,7 +3532,7 @@ msgstr ""
msgid "Could not create the alarm notify service factory"
msgstr ""
-#: calendar/gui/alarm-notify/util.c:37 calendar/gui/e-tasks.c:111
+#: calendar/gui/alarm-notify/util.c:37 calendar/gui/e-tasks.c:114
msgid "invalid time"
msgstr ""
@@ -3614,46 +3621,42 @@ msgid "Show where events end in week and month views"
msgstr ""
#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:22
-msgid "The view showing when the calendar starts"
-msgstr ""
-
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:23
msgid "Time last alarm ran"
msgstr ""
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:24
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:23
msgid "Units for determining when to hide tasks"
msgstr ""
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:25
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:24
msgid "Units of default reminder"
msgstr ""
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:26
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:25
msgid "Weekday the week starts on"
msgstr ""
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:27
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:26
msgid "Whether to ask for confirmation on appointment deletion"
msgstr ""
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:28
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:27
msgid "Whether to ask for confirmation when folder is expunged"
msgstr ""
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:29
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:28
msgid "Whether to hide completed tasks"
msgstr ""
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:30
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:29
msgid "Whether to set a default reminder for events"
msgstr ""
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:31
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:30
msgid "Whether to show times in 24h format instead of using am/pm"
msgstr ""
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:32
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:31
msgid "Whether to show week numbers in date navigator"
msgstr ""
@@ -3677,7 +3680,7 @@ msgstr ""
msgid "Unmatched"
msgstr ""
-#: calendar/gui/calendar-commands.c:116 calendar/gui/gnome-cal.c:1596
+#: calendar/gui/calendar-commands.c:116 calendar/gui/gnome-cal.c:1606
#: camel/providers/groupwise/camel-gw-listener.c:302
#: camel/providers/groupwise/camel-gw-listener.c:326
msgid "Calendar"
@@ -3712,7 +3715,7 @@ 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.
#: calendar/gui/calendar-commands.c:434 calendar/gui/e-day-view-top-item.c:692
-#: calendar/gui/e-day-view.c:1588 calendar/gui/e-week-view-main-item.c:329
+#: calendar/gui/e-day-view.c:1590 calendar/gui/e-week-view-main-item.c:329
msgid "%a %d %b"
msgstr "%a %d %b"
@@ -3747,63 +3750,69 @@ msgstr ""
msgid "New Calendar"
msgstr "Nýtt dagatal"
-#: calendar/gui/calendar-component.c:923
+#: calendar/gui/calendar-component.c:932
msgid "New appointment"
msgstr ""
-#: calendar/gui/calendar-component.c:924
+#: calendar/gui/calendar-component.c:933
msgid "_Appointment"
msgstr ""
-#: calendar/gui/calendar-component.c:925
+#: calendar/gui/calendar-component.c:934
msgid "Create a new appointment"
msgstr ""
-#: calendar/gui/calendar-component.c:930
+#: calendar/gui/calendar-component.c:940
msgid "New meeting"
msgstr ""
-#: calendar/gui/calendar-component.c:931
+#: calendar/gui/calendar-component.c:941
msgid "M_eeting"
msgstr ""
-#: calendar/gui/calendar-component.c:932
+#: calendar/gui/calendar-component.c:942
msgid "Create a new meeting request"
msgstr ""
-#: calendar/gui/calendar-component.c:937
+#: calendar/gui/calendar-component.c:948
msgid "New all day appointment"
msgstr ""
-#: calendar/gui/calendar-component.c:938
+#: calendar/gui/calendar-component.c:949
msgid "All _Day Appointment"
msgstr ""
-#: calendar/gui/calendar-component.c:939
+#: calendar/gui/calendar-component.c:950
msgid "Create a new all-day appointment"
msgstr ""
-#: calendar/gui/calendar-component.c:944
+#: calendar/gui/calendar-component.c:956
msgid "New calendar"
msgstr "Nýtt dagatal"
-#: calendar/gui/calendar-component.c:945
+#: calendar/gui/calendar-component.c:957
msgid "C_alendar"
msgstr "D_agatal:"
-#: calendar/gui/calendar-component.c:946
+#: calendar/gui/calendar-component.c:958
msgid "Create a new calendar"
msgstr ""
-#: calendar/gui/calendar-component.c:1013
+#: calendar/gui/calendar-component.c:1026
#, c-format
msgid "Unable to open the calendar '%s' for creating events and meetings"
msgstr ""
-#: calendar/gui/calendar-component.c:1025
+#: calendar/gui/calendar-component.c:1038
msgid "There is no calendar available for creating events and meetings"
msgstr ""
+#: calendar/gui/calendar-component.c:1072
+msgid ""
+"Selected calendar is read-only, events cannot be created. Please select a "
+"read-write calendar."
+msgstr ""
+
#: calendar/gui/calendar-offline-handler.c:192
#, c-format
msgid "backend_go_offline(): %s"
@@ -3852,11 +3861,11 @@ msgstr ""
msgid "Could not open the folder in '%s'"
msgstr ""
-#: calendar/gui/control-factory.c:192
+#: calendar/gui/control-factory.c:194
msgid "The URI that the calendar will display"
msgstr ""
-#: calendar/gui/control-factory.c:199
+#: calendar/gui/control-factory.c:201
msgid "The type of view to show"
msgstr ""
@@ -3925,6 +3934,7 @@ msgid "hours"
msgstr "klukkustundir"
#: calendar/gui/dialogs/alarm-options.glade.h:14 filter/filter.glade.h:17
+#: mail/mail-config.glade.h:182
msgid "minutes"
msgstr "mínútur"
@@ -3970,7 +3980,7 @@ msgstr ""
#: calendar/gui/dialogs/alarm-page.glade.h:9
#: calendar/gui/dialogs/recurrence-page.glade.h:8
#: calendar/gui/e-itip-control.c:921 calendar/gui/e-itip-control.glade.h:11
-#: calendar/gui/e-tasks.c:164
+#: calendar/gui/e-tasks.c:167
msgid "Summary:"
msgstr ""
@@ -4010,31 +4020,31 @@ msgstr ""
#. FIXME: This routine should just be a "toggled" event handler on the checkbox cell renderer which
#. has "activatable" set.
-#: calendar/gui/dialogs/cal-prefs-dialog.c:415 mail/em-account-prefs.c:492
+#: calendar/gui/dialogs/cal-prefs-dialog.c:569 mail/em-account-prefs.c:492
#: mail/em-composer-prefs.c:670 mail/em-composer-prefs.c:898
msgid "Enabled"
msgstr ""
-#: calendar/gui/dialogs/cal-prefs-dialog.c:656
+#: calendar/gui/dialogs/cal-prefs-dialog.c:731
msgid "Are you sure you want to remove this URL?"
msgstr ""
-#: calendar/gui/dialogs/cal-prefs-dialog.c:664
+#: calendar/gui/dialogs/cal-prefs-dialog.c:739
msgid "Don't Remove"
msgstr ""
-#: calendar/gui/dialogs/cal-prefs-dialog.c:710
-#: calendar/gui/dialogs/cal-prefs-dialog.c:742
-#: calendar/gui/dialogs/cal-prefs-dialog.c:773 mail/em-account-prefs.c:314
+#: calendar/gui/dialogs/cal-prefs-dialog.c:789
+#: calendar/gui/dialogs/cal-prefs-dialog.c:823
+#: calendar/gui/dialogs/cal-prefs-dialog.c:857 mail/em-account-prefs.c:314
#: mail/em-account-prefs.c:355 mail/em-account-prefs.c:398
#: mail/em-composer-prefs.c:589 mail/em-composer-prefs.c:647
#: mail/em-composer-prefs.c:677
msgid "Disable"
msgstr ""
-#: calendar/gui/dialogs/cal-prefs-dialog.c:710
-#: calendar/gui/dialogs/cal-prefs-dialog.c:742
-#: calendar/gui/dialogs/cal-prefs-dialog.c:775 mail/em-account-prefs.c:314
+#: calendar/gui/dialogs/cal-prefs-dialog.c:789
+#: calendar/gui/dialogs/cal-prefs-dialog.c:823
+#: calendar/gui/dialogs/cal-prefs-dialog.c:859 mail/em-account-prefs.c:314
#: mail/em-account-prefs.c:355 mail/em-account-prefs.c:400
#: mail/em-composer-prefs.c:589 mail/em-composer-prefs.c:647
#: mail/em-composer-prefs.c:677
@@ -4314,7 +4324,7 @@ msgid ""
msgstr ""
#: calendar/gui/dialogs/calendar-setup.glade.h:14
-#: calendar/gui/tasks-component.c:363
+#: calendar/gui/tasks-component.c:364
msgid "New Task List"
msgstr ""
@@ -4512,7 +4522,7 @@ msgstr ""
#: calendar/gui/dialogs/comp-editor.c:1382
#: calendar/gui/e-calendar-table.c:1193 calendar/gui/e-calendar-view.c:1006
-#: composer/e-msg-composer.c:1155
+#: composer/e-msg-composer.c:1193
msgid "Save as..."
msgstr "Vista sem..."
@@ -4774,9 +4784,9 @@ msgstr ""
#. an empty string is the same as 'None'
#: calendar/gui/dialogs/meeting-page.c:311
#: calendar/gui/dialogs/meeting-page.glade.h:3
-#: calendar/gui/e-cal-model-tasks.c:591 composer/e-msg-composer.c:2136
-#: mail/em-account-prefs.c:453 mail/em-folder-view.c:778
-#: mail/mail-account-gui.c:1366 mail/mail-account-gui.c:1860
+#: calendar/gui/e-cal-model-tasks.c:591 composer/e-msg-composer.c:2168
+#: mail/em-account-prefs.c:453 mail/em-folder-view.c:803
+#: mail/mail-account-gui.c:1390 mail/mail-account-gui.c:1884
#: mail/mail-config.glade.h:100
#: widgets/e-timezone-dialog/e-timezone-dialog.c:193
#: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:443
@@ -5053,7 +5063,7 @@ msgid ""
"Do you wish to save your changes?"
msgstr ""
-#: calendar/gui/dialogs/save-comp.c:57 composer/e-msg-composer.c:1572
+#: calendar/gui/dialogs/save-comp.c:57 composer/e-msg-composer.c:1610
msgid "_Discard Changes"
msgstr ""
@@ -5109,39 +5119,39 @@ msgstr ""
#: calendar/gui/dialogs/task-details-page.glade.h:4
#: calendar/gui/e-cal-model-tasks.c:323 calendar/gui/e-cal-model-tasks.c:597
#: calendar/gui/e-calendar-table.c:466 calendar/gui/e-meeting-store.c:187
-#: calendar/gui/e-meeting-store.c:210 calendar/gui/e-tasks.c:206
+#: calendar/gui/e-meeting-store.c:210 calendar/gui/e-tasks.c:209
#: calendar/gui/print.c:2346
msgid "Completed"
msgstr ""
#: calendar/gui/dialogs/task-details-page.glade.h:5
-#: calendar/gui/e-calendar-table.c:391 calendar/gui/e-tasks.c:227
-#: mail/message-list.c:947
+#: calendar/gui/e-calendar-table.c:391 calendar/gui/e-tasks.c:230
+#: mail/message-list.c:945
msgid "High"
msgstr ""
#: calendar/gui/dialogs/task-details-page.glade.h:6
#: calendar/gui/e-cal-model-tasks.c:321 calendar/gui/e-cal-model-tasks.c:595
#: calendar/gui/e-cal-model-tasks.c:657 calendar/gui/e-calendar-table.c:465
-#: calendar/gui/e-tasks.c:203 calendar/gui/print.c:2343
+#: calendar/gui/e-tasks.c:206 calendar/gui/print.c:2343
msgid "In Progress"
msgstr ""
#: calendar/gui/dialogs/task-details-page.glade.h:7
-#: calendar/gui/e-calendar-table.c:393 calendar/gui/e-tasks.c:231
-#: mail/message-list.c:945
+#: calendar/gui/e-calendar-table.c:393 calendar/gui/e-tasks.c:234
+#: mail/message-list.c:943
msgid "Low"
msgstr ""
#: calendar/gui/dialogs/task-details-page.glade.h:8
#: calendar/gui/e-cal-model.c:870 calendar/gui/e-calendar-table.c:392
-#: calendar/gui/e-tasks.c:229 mail/message-list.c:946
+#: calendar/gui/e-tasks.c:232 mail/message-list.c:944
msgid "Normal"
msgstr ""
#: calendar/gui/dialogs/task-details-page.glade.h:9
#: calendar/gui/e-cal-model-tasks.c:319 calendar/gui/e-cal-model-tasks.c:593
-#: calendar/gui/e-calendar-table.c:464 calendar/gui/e-tasks.c:213
+#: calendar/gui/e-calendar-table.c:464 calendar/gui/e-tasks.c:216
#: calendar/gui/print.c:2340
msgid "Not Started"
msgstr ""
@@ -5200,7 +5210,7 @@ msgid "Con_fidential"
msgstr ""
#: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-itip-control.c:976
-#: calendar/gui/e-itip-control.glade.h:6 calendar/gui/e-tasks.c:243
+#: calendar/gui/e-itip-control.glade.h:6 calendar/gui/e-tasks.c:246
#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:69
msgid "Description:"
msgstr ""
@@ -5421,10 +5431,10 @@ msgstr ""
#: calendar/gui/e-meeting-list-view.c:144
#: calendar/gui/e-meeting-list-view.c:158 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:1665 camel/camel-gpg-context.c:1716
+#: camel/camel-gpg-context.c:1674 camel/camel-gpg-context.c:1725
#: camel/camel-tcp-stream-openssl.c:631
#: camel/providers/smtp/camel-smtp-transport.c:172
-#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:2133
+#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:2134
#: shell/e-component-registry.c:168 widgets/misc/e-charset-picker.c:61
msgid "Unknown"
msgstr ""
@@ -5491,7 +5501,7 @@ msgstr ""
#: calendar/gui/e-calendar-table.c:1040 calendar/gui/e-calendar-table.c:1081
#: calendar/gui/e-calendar-view.c:1261 calendar/gui/e-calendar-view.c:1328
-#: mail/em-folder-view.c:744 ui/evolution-addressbook.xml.h:37
+#: mail/em-folder-view.c:769 ui/evolution-addressbook.xml.h:37
msgid "_Open"
msgstr ""
@@ -5501,7 +5511,7 @@ msgstr ""
#: calendar/gui/e-calendar-table.c:1042 calendar/gui/e-calendar-table.c:1087
#: calendar/gui/e-calendar-view.c:1262 calendar/gui/e-calendar-view.c:1334
-#: mail/em-folder-view.c:746 mail/em-popup.c:689 mail/em-popup.c:804
+#: mail/em-folder-view.c:771 mail/em-popup.c:689 mail/em-popup.c:804
#: ui/evolution-mail-message.xml.h:128
msgid "_Save As..."
msgstr ""
@@ -5524,7 +5534,7 @@ msgstr ""
#: calendar/gui/e-calendar-table.c:1048 calendar/gui/e-calendar-table.c:1074
#: calendar/gui/e-calendar-view.c:1269 calendar/gui/e-calendar-view.c:1308
-#: mail/em-folder-tree.c:2510 ui/evolution-addressbook.xml.h:31
+#: mail/em-folder-tree.c:2563 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 ui/evolution-tasks.xml.h:20
msgid "_Copy"
@@ -5687,26 +5697,26 @@ msgstr ""
#. strftime format %A = full weekday name, %d = day of month,
#. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:688 calendar/gui/e-day-view.c:1571
+#: calendar/gui/e-day-view-top-item.c:688 calendar/gui/e-day-view.c:1573
#: calendar/gui/e-week-view-main-item.c:320 calendar/gui/print.c:1514
msgid "%A %d %B"
msgstr ""
#. strftime format %d = day of month, %b = abbreviated month name.
#. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:696 calendar/gui/e-day-view.c:1604
+#: calendar/gui/e-day-view-top-item.c:696 calendar/gui/e-day-view.c:1606
#: calendar/gui/e-week-view-main-item.c:343
msgid "%d %b"
msgstr ""
#. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:821 calendar/gui/e-week-view.c:592
+#: calendar/gui/e-day-view.c:823 calendar/gui/e-week-view.c:596
#: calendar/gui/print.c:838
msgid "am"
msgstr ""
#. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:824 calendar/gui/e-week-view.c:595
+#: calendar/gui/e-day-view.c:826 calendar/gui/e-week-view.c:599
#: calendar/gui/print.c:840
msgid "pm"
msgstr ""
@@ -5821,7 +5831,7 @@ msgid "Location:"
msgstr ""
#. write status
-#: calendar/gui/e-itip-control.c:944 calendar/gui/e-tasks.c:199
+#: calendar/gui/e-itip-control.c:944 calendar/gui/e-tasks.c:202
msgid "Status:"
msgstr ""
@@ -5854,7 +5864,7 @@ msgstr ""
#: calendar/gui/e-itip-control.c:1018 calendar/gui/e-itip-control.c:1049
#: calendar/gui/e-itip-control.c:1072 calendar/gui/e-itip-control.c:1085
#: calendar/gui/e-itip-control.c:1098 calendar/gui/e-itip-control.c:1111
-#: shell/e-shell.c:1061 widgets/misc/e-cell-date-edit.c:265
+#: shell/e-shell.c:1079 widgets/misc/e-cell-date-edit.c:265
msgid "OK"
msgstr ""
@@ -6318,30 +6328,30 @@ msgstr ""
msgid "Meeting _end time:"
msgstr ""
-#: calendar/gui/e-tasks.c:177
+#: calendar/gui/e-tasks.c:180
msgid "Start Date:"
msgstr ""
-#: calendar/gui/e-tasks.c:193
+#: calendar/gui/e-tasks.c:196
msgid "Due Date:"
msgstr ""
#. write priority
-#: calendar/gui/e-tasks.c:221
+#: calendar/gui/e-tasks.c:224
msgid "Priority:"
msgstr ""
#. URL
-#: calendar/gui/e-tasks.c:277
+#: calendar/gui/e-tasks.c:280
msgid "Web Page:"
msgstr ""
-#: calendar/gui/e-tasks.c:310 mail/em-folder-view.c:2177
+#: calendar/gui/e-tasks.c:313 mail/em-folder-view.c:2213
#, c-format
msgid "Click to open %s"
msgstr ""
-#: calendar/gui/e-tasks.c:773 calendar/gui/gnome-cal.c:1899
+#: calendar/gui/e-tasks.c:789 calendar/gui/gnome-cal.c:1909
#, c-format
msgid ""
"Error on %s:\n"
@@ -6349,7 +6359,7 @@ msgid ""
msgstr ""
#. FIXME: this doesn't remove the task list from the list or anything
-#: calendar/gui/e-tasks.c:792
+#: calendar/gui/e-tasks.c:808
#, c-format
msgid ""
"The task backend for\n"
@@ -6357,60 +6367,60 @@ msgid ""
" has crashed."
msgstr ""
-#: calendar/gui/e-tasks.c:872
+#: calendar/gui/e-tasks.c:888
#, c-format
msgid "Opening tasks at %s"
msgstr ""
-#: calendar/gui/e-tasks.c:893
+#: calendar/gui/e-tasks.c:909
#, c-format
msgid ""
"Error opening %s:\n"
"%s"
msgstr ""
-#: calendar/gui/e-tasks.c:912
+#: calendar/gui/e-tasks.c:928
msgid "Loading tasks"
msgstr ""
-#: calendar/gui/e-tasks.c:1014
+#: calendar/gui/e-tasks.c:1030
msgid "Completing tasks..."
msgstr ""
-#: calendar/gui/e-tasks.c:1037
+#: calendar/gui/e-tasks.c:1053
msgid "Deleting selected objects..."
msgstr ""
-#: calendar/gui/e-tasks.c:1063
+#: calendar/gui/e-tasks.c:1079
msgid "Expunging"
msgstr ""
-#: calendar/gui/gnome-cal.c:1760
+#: calendar/gui/gnome-cal.c:1770
#, c-format
msgid "Loading appointments at %s"
msgstr ""
-#: calendar/gui/gnome-cal.c:1779
+#: calendar/gui/gnome-cal.c:1789
#, c-format
msgid "Loading tasks at %s"
msgstr ""
-#: calendar/gui/gnome-cal.c:1799
+#: calendar/gui/gnome-cal.c:1809
#, c-format
msgid "Opening %s"
msgstr ""
-#: calendar/gui/gnome-cal.c:1928
+#: calendar/gui/gnome-cal.c:1938
#, c-format
msgid "The calendar backend for '%s' has crashed."
msgstr ""
-#: calendar/gui/gnome-cal.c:1940
+#: calendar/gui/gnome-cal.c:1950
#, c-format
msgid "The task backend for '%s' has crashed."
msgstr ""
-#: calendar/gui/gnome-cal.c:2754
+#: calendar/gui/gnome-cal.c:2763
msgid "Purging"
msgstr ""
@@ -6526,11 +6536,6 @@ msgstr ""
msgid "You must be an attendee of the event."
msgstr ""
-#: calendar/gui/itip-utils.c:1157
-#, c-format
-msgid "Enter the password for %s"
-msgstr ""
-
#: calendar/gui/migration.c:137
msgid ""
"The location and hierarchy of the Evolution task folders has changed since "
@@ -6787,41 +6792,41 @@ msgstr ""
msgid "Print Setup"
msgstr ""
-#: calendar/gui/tasks-component.c:302
+#: calendar/gui/tasks-component.c:303
#, c-format
msgid "Task List '%s' will be removed. Are you sure you want to continue?"
msgstr ""
-#: calendar/gui/tasks-component.c:560
+#: calendar/gui/tasks-component.c:570
msgid "New task"
msgstr ""
-#: calendar/gui/tasks-component.c:561
+#: calendar/gui/tasks-component.c:571
msgid "_Task"
msgstr ""
-#: calendar/gui/tasks-component.c:562
+#: calendar/gui/tasks-component.c:572
msgid "Create a new task"
msgstr ""
-#: calendar/gui/tasks-component.c:567
-msgid "New task list"
+#: calendar/gui/tasks-component.c:578
+msgid "New tasks group"
msgstr ""
-#: calendar/gui/tasks-component.c:568
-msgid "_Task List"
+#: calendar/gui/tasks-component.c:579
+msgid "_Tasks Group"
msgstr ""
-#: calendar/gui/tasks-component.c:569
-msgid "Create a new task list"
+#: calendar/gui/tasks-component.c:580
+msgid "Create a new tasks group"
msgstr ""
-#: calendar/gui/tasks-component.c:636
+#: calendar/gui/tasks-component.c:648
#, c-format
msgid "Unable to open the task list '%s' for creating events and meetings"
msgstr ""
-#: calendar/gui/tasks-component.c:648
+#: calendar/gui/tasks-component.c:660
msgid "There is no calendar available for creating tasks"
msgstr ""
@@ -8602,38 +8607,38 @@ msgstr ""
msgid "Performing query on unknown header: %s"
msgstr ""
-#: camel/camel-folder.c:626
+#: camel/camel-folder.c:653
#, c-format
msgid "Unsupported operation: append message: for %s"
msgstr ""
-#: camel/camel-folder.c:1217
+#: camel/camel-folder.c:1259
#, c-format
msgid "Unsupported operation: search by expression: for %s"
msgstr ""
-#: camel/camel-folder.c:1257
+#: camel/camel-folder.c:1299
#, c-format
msgid "Unsupported operation: search by uids: for %s"
msgstr ""
-#: camel/camel-folder.c:1374
+#: camel/camel-folder.c:1416
msgid "Moving messages"
msgstr ""
-#: camel/camel-folder.c:1374
+#: camel/camel-folder.c:1416
msgid "Copying messages"
msgstr ""
-#: camel/camel-folder.c:1624
+#: camel/camel-folder.c:1666
msgid "Learning junk and/or non junk message(s)"
msgstr ""
-#: camel/camel-folder.c:1653
+#: camel/camel-folder.c:1695
msgid "Filtering new message(s)"
msgstr ""
-#: camel/camel-gpg-context.c:710
+#: camel/camel-gpg-context.c:712
#, c-format
msgid ""
"Unexpected GnuPG status message encountered:\n"
@@ -8641,42 +8646,42 @@ msgid ""
"%s"
msgstr ""
-#: camel/camel-gpg-context.c:724
+#: camel/camel-gpg-context.c:726
msgid "Failed to parse gpg userid hint."
msgstr ""
-#: camel/camel-gpg-context.c:748
+#: camel/camel-gpg-context.c:750
msgid "Failed to parse gpg passphrase request."
msgstr ""
-#: camel/camel-gpg-context.c:762
+#: camel/camel-gpg-context.c:764
#, c-format
msgid ""
"You need a passphrase to unlock the key for\n"
"user: \"%s\""
msgstr ""
-#: camel/camel-gpg-context.c:779 camel/camel-gpg-context.c:1263
-#: camel/camel-gpg-context.c:1422 camel/camel-gpg-context.c:1508
-#: camel/camel-gpg-context.c:1615 mail/mail-ops.c:697
+#: camel/camel-gpg-context.c:781 camel/camel-gpg-context.c:1267
+#: camel/camel-gpg-context.c:1425 camel/camel-gpg-context.c:1517
+#: camel/camel-gpg-context.c:1624 mail/mail-ops.c:697
#: mail/mail-send-recv.c:598
msgid "Cancelled."
msgstr ""
-#: camel/camel-gpg-context.c:797
+#: camel/camel-gpg-context.c:799
msgid "Failed to unlock secret key: 3 bad passphrases given."
msgstr ""
-#: camel/camel-gpg-context.c:803
+#: camel/camel-gpg-context.c:805
#, c-format
msgid "Unexpected response from GnuPG: %s"
msgstr ""
-#: camel/camel-gpg-context.c:847
+#: camel/camel-gpg-context.c:851
msgid "Failed to encrypt: No valid recipients specified."
msgstr ""
-#: camel/camel-gpg-context.c:1124
+#: camel/camel-gpg-context.c:1128
#, c-format
msgid ""
"Failed to GPG %s: %s\n"
@@ -8684,58 +8689,58 @@ msgid ""
"%s"
msgstr ""
-#: camel/camel-gpg-context.c:1129
+#: camel/camel-gpg-context.c:1133
#, c-format
msgid "Failed to GPG %s: %s\n"
msgstr ""
-#: camel/camel-gpg-context.c:1242 camel/camel-smime-context.c:419
+#: camel/camel-gpg-context.c:1246 camel/camel-smime-context.c:419
#, c-format
msgid "Could not generate signing data: %s"
msgstr ""
-#: camel/camel-gpg-context.c:1256 camel/camel-gpg-context.c:1664
-#: camel/camel-gpg-context.c:1715
+#: camel/camel-gpg-context.c:1260 camel/camel-gpg-context.c:1673
+#: camel/camel-gpg-context.c:1724
#, c-format
msgid "Failed to execute gpg: %s"
msgstr ""
-#: camel/camel-gpg-context.c:1280 camel/camel-gpg-context.c:1414
-#: camel/camel-gpg-context.c:1501 camel/camel-gpg-context.c:1524
-#: camel/camel-gpg-context.c:1608 camel/camel-gpg-context.c:1632
-#: camel/camel-gpg-context.c:1686 camel/camel-gpg-context.c:1737
+#: camel/camel-gpg-context.c:1284 camel/camel-gpg-context.c:1417
+#: camel/camel-gpg-context.c:1510 camel/camel-gpg-context.c:1533
+#: camel/camel-gpg-context.c:1617 camel/camel-gpg-context.c:1641
+#: camel/camel-gpg-context.c:1695 camel/camel-gpg-context.c:1746
msgid "Failed to execute gpg."
msgstr ""
-#: camel/camel-gpg-context.c:1299
+#: camel/camel-gpg-context.c:1303
msgid "This is a digitally signed message part"
msgstr ""
-#: camel/camel-gpg-context.c:1381 camel/camel-gpg-context.c:1390
+#: camel/camel-gpg-context.c:1384 camel/camel-gpg-context.c:1393
#: camel/camel-smime-context.c:717 camel/camel-smime-context.c:728
#: camel/camel-smime-context.c:735
msgid "Cannot verify message signature: Incorrect message format"
msgstr ""
-#: camel/camel-gpg-context.c:1397
+#: camel/camel-gpg-context.c:1400
#, c-format
msgid "Cannot verify message signature: could not create temp file: %s"
msgstr ""
-#: camel/camel-gpg-context.c:1484
+#: camel/camel-gpg-context.c:1493
#, c-format
msgid "Could not generate encrypting data: %s"
msgstr ""
-#: camel/camel-gpg-context.c:1542
+#: camel/camel-gpg-context.c:1551
msgid "This is a digitally encrypted message part"
msgstr ""
-#: camel/camel-gpg-context.c:1639 camel/camel-smime-context.c:990
+#: camel/camel-gpg-context.c:1648 camel/camel-smime-context.c:990
msgid "Encrypted content"
msgstr ""
-#: camel/camel-gpg-context.c:1643
+#: camel/camel-gpg-context.c:1652
msgid "Unable to parse message content"
msgstr ""
@@ -9011,7 +9016,7 @@ msgstr ""
#: 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-kerberos4.c:219
-#: camel/providers/imap/camel-imap-store.c:1197
+#: camel/providers/imap/camel-imap-store.c:1196
msgid "Bad authentication response from server."
msgstr ""
@@ -9415,17 +9420,17 @@ msgstr ""
msgid "Could not parse URL `%s'"
msgstr ""
-#: camel/camel-vee-folder.c:618
+#: camel/camel-vee-folder.c:614
#, c-format
msgid "Error storing `%s': %s"
msgstr ""
-#: camel/camel-vee-folder.c:658
+#: camel/camel-vee-folder.c:654
#, c-format
msgid "No such message %s in %s"
msgstr ""
-#: camel/camel-vee-folder.c:824 camel/camel-vee-folder.c:830
+#: camel/camel-vee-folder.c:820 camel/camel-vee-folder.c:826
msgid "Cannot copy or move messages into a Virtual Folder"
msgstr ""
@@ -9453,12 +9458,11 @@ msgid "Cannot copy messages to the Junk folder"
msgstr ""
#: camel/providers/groupwise/camel-groupwise-provider.c:53
-#: camel/providers/imap/camel-imap-provider.c:50
msgid "Checking for new mail"
msgstr ""
#: camel/providers/groupwise/camel-groupwise-provider.c:55
-#: camel/providers/imap/camel-imap-provider.c:52
+#: camel/providers/imap/camel-imap-provider.c:45
msgid "Check for new messages in all folders"
msgstr ""
@@ -9509,12 +9513,12 @@ msgstr ""
#: camel/providers/imap/camel-imap-command.c:218
#: camel/providers/imap/camel-imap-command.c:257
#: camel/providers/imap/camel-imap-command.c:447
-#: camel/providers/imap/camel-imap-store.c:3022
+#: camel/providers/imap/camel-imap-store.c:3118
msgid "Operation cancelled"
msgstr ""
#: camel/providers/imap/camel-imap-command.c:302
-#: camel/providers/imap/camel-imap-store.c:3025
+#: camel/providers/imap/camel-imap-store.c:3121
#, c-format
msgid "Server unexpectedly disconnected: %s"
msgstr ""
@@ -9630,14 +9634,18 @@ msgid "Failed to cache %s: %s"
msgstr ""
#: camel/providers/imap/camel-imap-provider.c:43
+msgid "Checking for New Mail"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-provider.c:48
msgid "Connection to Server"
msgstr ""
-#: camel/providers/imap/camel-imap-provider.c:45
+#: camel/providers/imap/camel-imap-provider.c:50
msgid "Use custom command to connect to server"
msgstr ""
-#: camel/providers/imap/camel-imap-provider.c:47
+#: camel/providers/imap/camel-imap-provider.c:52
msgid "Command:"
msgstr ""
@@ -9688,8 +9696,8 @@ msgstr ""
msgid "IMAP service for %s on %s"
msgstr ""
-#: camel/providers/imap/camel-imap-store.c:546
-#: camel/providers/imap/camel-imap-store.c:566
+#: camel/providers/imap/camel-imap-store.c:545
+#: camel/providers/imap/camel-imap-store.c:565
#: camel/providers/imapp/camel-imapp-store.c:231
#: camel/providers/nntp/camel-nntp-store.c:140
#: camel/providers/pop3/camel-pop3-store.c:175
@@ -9699,14 +9707,14 @@ msgstr ""
msgid "Could not connect to %s (port %d): %s"
msgstr ""
-#: camel/providers/imap/camel-imap-store.c:548
+#: camel/providers/imap/camel-imap-store.c:547
#: camel/providers/pop3/camel-pop3-store.c:177
#: camel/providers/smtp/camel-smtp-transport.c:271
msgid "SSL unavailable"
msgstr ""
-#: camel/providers/imap/camel-imap-store.c:563
-#: camel/providers/imap/camel-imap-store.c:800
+#: camel/providers/imap/camel-imap-store.c:562
+#: camel/providers/imap/camel-imap-store.c:799
#: camel/providers/imapp/camel-imapp-store.c:228
#: camel/providers/nntp/camel-nntp-store.c:137
#: camel/providers/nntp/camel-nntp-store.c:155
@@ -9714,49 +9722,49 @@ msgstr ""
msgid "Connection cancelled"
msgstr ""
-#: camel/providers/imap/camel-imap-store.c:634
-#: camel/providers/imap/camel-imap-store.c:665
+#: camel/providers/imap/camel-imap-store.c:633
+#: camel/providers/imap/camel-imap-store.c:664
#, c-format
msgid "Failed to connect to IMAP server %s in secure mode: %s"
msgstr ""
-#: camel/providers/imap/camel-imap-store.c:635
+#: camel/providers/imap/camel-imap-store.c:634
#: camel/providers/pop3/camel-pop3-store.c:228
msgid "SSL/TLS extension not supported."
msgstr ""
-#: camel/providers/imap/camel-imap-store.c:666
+#: camel/providers/imap/camel-imap-store.c:665
#: camel/providers/pop3/camel-pop3-store.c:269
msgid "SSL negotiations failed"
msgstr ""
-#: camel/providers/imap/camel-imap-store.c:803
+#: camel/providers/imap/camel-imap-store.c:802
#, c-format
msgid "Could not connect with command \"%s\": %s"
msgstr ""
-#: camel/providers/imap/camel-imap-store.c:1227
+#: camel/providers/imap/camel-imap-store.c:1226
#, c-format
msgid "IMAP server %s does not support requested authentication type %s"
msgstr ""
-#: camel/providers/imap/camel-imap-store.c:1237
+#: camel/providers/imap/camel-imap-store.c:1236
#: camel/providers/smtp/camel-smtp-transport.c:486
#, c-format
msgid "No support for authentication type %s"
msgstr ""
-#: camel/providers/imap/camel-imap-store.c:1260
+#: camel/providers/imap/camel-imap-store.c:1259
#: camel/providers/imapp/camel-imapp-store.c:344
#, c-format
msgid "%sPlease enter the IMAP password for %s@%s"
msgstr ""
-#: camel/providers/imap/camel-imap-store.c:1274
+#: camel/providers/imap/camel-imap-store.c:1273
msgid "You didn't enter a password."
msgstr ""
-#: camel/providers/imap/camel-imap-store.c:1303
+#: camel/providers/imap/camel-imap-store.c:1302
#, c-format
msgid ""
"Unable to authenticate to IMAP server.\n"
@@ -9764,20 +9772,25 @@ msgid ""
"\n"
msgstr ""
-#: camel/providers/imap/camel-imap-store.c:1790
-#: camel/providers/imap/camel-imap-store.c:1883
+#: camel/providers/imap/camel-imap-store.c:1789
+#: camel/providers/imap/camel-imap-store.c:1979
#, c-format
msgid "No such folder %s"
msgstr ""
-#: camel/providers/imap/camel-imap-store.c:1801
-#: camel/providers/imap/camel-imap-store.c:2089
+#: camel/providers/imap/camel-imap-store.c:1807
+#: camel/providers/imap/camel-imap-store.c:2185
#, c-format
msgid ""
"The folder name \"%s\" is invalid because it contains the character \"%c\""
msgstr ""
-#: camel/providers/imap/camel-imap-store.c:1824
+#: camel/providers/imap/camel-imap-store.c:1865
+#: camel/providers/imap/camel-imap-store.c:2246
+msgid "The parent folder is not allowed to contain subfolders"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-store.c:1920
#: camel/providers/local/camel-maildir-store.c:137
#: camel/providers/local/camel-mbox-store.c:212
#: camel/providers/local/camel-mh-store.c:236
@@ -9785,15 +9798,11 @@ msgstr ""
msgid "Cannot create folder `%s': folder exists."
msgstr ""
-#: camel/providers/imap/camel-imap-store.c:2100
+#: camel/providers/imap/camel-imap-store.c:2196
#, c-format
msgid "Unknown parent folder: %s"
msgstr ""
-#: camel/providers/imap/camel-imap-store.c:2150
-msgid "The parent folder is not allowed to contain subfolders"
-msgstr ""
-
#: camel/providers/imapp/camel-imapp-provider.c:39
#: camel/providers/pop3/camel-pop3-provider.c:38
msgid "Message storage"
@@ -10167,7 +10176,7 @@ msgstr ""
msgid "Could not close temp folder: %s"
msgstr ""
-#: camel/providers/local/camel-mbox-summary.c:592 mail/em-folder-tree.c:2472
+#: camel/providers/local/camel-mbox-summary.c:592 mail/em-folder-tree.c:2523
#, c-format
msgid "Could not rename folder: %s"
msgstr ""
@@ -10978,7 +10987,7 @@ msgstr ""
msgid "%.0fG"
msgstr ""
-#: composer/e-msg-composer-attachment-bar.c:302 mail/em-utils.c:1485
+#: composer/e-msg-composer-attachment-bar.c:302 mail/em-utils.c:1486
msgid "attachment"
msgstr ""
@@ -11104,82 +11113,82 @@ msgstr ""
msgid "Attach file(s)"
msgstr ""
-#: composer/e-msg-composer.c:662
+#: composer/e-msg-composer.c:694
msgid ""
"Cannot sign outgoing message: No signing certificate set for from account"
msgstr ""
-#: composer/e-msg-composer.c:668
+#: composer/e-msg-composer.c:700
msgid ""
"Cannot encrypt outgoing message: No encryption certificate set for from "
"account"
msgstr ""
-#: composer/e-msg-composer.c:799
+#: composer/e-msg-composer.c:831
#, c-format
msgid ""
"Error while reading file %s:\n"
"%s"
msgstr ""
-#: composer/e-msg-composer.c:1170
+#: composer/e-msg-composer.c:1208
msgid "File exists, overwrite?"
msgstr ""
-#: composer/e-msg-composer.c:1181 composer/e-msg-composer.c:1197
+#: composer/e-msg-composer.c:1219 composer/e-msg-composer.c:1235
#, c-format
msgid "Error saving file: %s"
msgstr ""
-#: composer/e-msg-composer.c:1221
+#: composer/e-msg-composer.c:1259
#, c-format
msgid "Error loading file: %s"
msgstr ""
-#: composer/e-msg-composer.c:1259
+#: composer/e-msg-composer.c:1297
#, c-format
msgid "Error accessing file: %s"
msgstr ""
-#: composer/e-msg-composer.c:1267
+#: composer/e-msg-composer.c:1305
msgid "Unable to retrieve message from editor"
msgstr ""
-#: composer/e-msg-composer.c:1274
+#: composer/e-msg-composer.c:1312
#, c-format
msgid ""
"Unable to seek on file: %s\n"
"%s"
msgstr ""
-#: composer/e-msg-composer.c:1281
+#: composer/e-msg-composer.c:1319
#, c-format
msgid ""
"Unable to truncate file: %s\n"
"%s"
msgstr ""
-#: composer/e-msg-composer.c:1290
+#: composer/e-msg-composer.c:1328
#, c-format
msgid ""
"Unable to copy file descriptor: %s\n"
"%s"
msgstr ""
-#: composer/e-msg-composer.c:1299
+#: composer/e-msg-composer.c:1337
#, c-format
msgid ""
"Error autosaving message: %s\n"
" %s"
msgstr ""
-#: composer/e-msg-composer.c:1403
+#: composer/e-msg-composer.c:1441
msgid ""
"Ximian Evolution has found unsaved messages from a previous session.\n"
"Would you like to try to recover them?"
msgstr ""
-#: composer/e-msg-composer.c:1567
+#: composer/e-msg-composer.c:1605
#, c-format
msgid ""
"The message \"%s\" has not been sent.\n"
@@ -11187,53 +11196,53 @@ msgid ""
"Do you wish to save your changes?"
msgstr ""
-#: composer/e-msg-composer.c:1569
+#: composer/e-msg-composer.c:1607
msgid "Untitled Message"
msgstr ""
-#: composer/e-msg-composer.c:1576
+#: composer/e-msg-composer.c:1614
msgid "Warning: Modified Message"
msgstr ""
-#: composer/e-msg-composer.c:1609
+#: composer/e-msg-composer.c:1647
msgid "Open file"
msgstr ""
-#: composer/e-msg-composer.c:2016 mail/mail-account-gui.c:1287
+#: composer/e-msg-composer.c:2054 mail/mail-account-gui.c:1311
msgid "Autogenerated"
msgstr ""
-#: composer/e-msg-composer.c:2086
+#: composer/e-msg-composer.c:2153
msgid "Signature:"
msgstr ""
-#: composer/e-msg-composer.c:2321
+#: composer/e-msg-composer.c:2353
#, c-format
msgid "<b>%d</b> File Attached"
msgid_plural "<b>%d</b> Files Attached"
msgstr[0] ""
msgstr[1] ""
-#: composer/e-msg-composer.c:2350
+#: composer/e-msg-composer.c:2382
msgid "Hide _Attachment Bar (drop attachments here)"
msgstr ""
-#: composer/e-msg-composer.c:2353 composer/e-msg-composer.c:3245
+#: composer/e-msg-composer.c:2385 composer/e-msg-composer.c:3284
msgid "Show _Attachment Bar (drop attachments here)"
msgstr ""
-#: composer/e-msg-composer.c:2370 composer/e-msg-composer.c:3127
-#: composer/e-msg-composer.c:3128
+#: composer/e-msg-composer.c:2402 composer/e-msg-composer.c:3167
+#: composer/e-msg-composer.c:3168
msgid "Compose a message"
msgstr ""
-#: composer/e-msg-composer.c:3157
+#: composer/e-msg-composer.c:3197
msgid ""
"Could not create composer window:\n"
"Unable to activate address selector control."
msgstr ""
-#: composer/e-msg-composer.c:3186
+#: composer/e-msg-composer.c:3225
msgid ""
"Could not create composer window:\n"
"Unable to activate HTML editor component.\n"
@@ -11241,13 +11250,13 @@ msgid ""
"of gtkhtml and libgtkhtml installed.\n"
msgstr ""
-#: composer/e-msg-composer.c:3290
+#: composer/e-msg-composer.c:3329
msgid ""
"Could not create composer window:\n"
"Unable to activate HTML editor component."
msgstr ""
-#: composer/e-msg-composer.c:4295
+#: composer/e-msg-composer.c:4334
msgid ""
"<b>(The composer contains a non-text message body, which cannot be edited.)"
"<b>"
@@ -11570,7 +11579,7 @@ msgid "You must specify a folder."
msgstr ""
#: filter/filter-folder.c:243 filter/vfolder-rule.c:507
-#: mail/mail-account-gui.c:1153
+#: mail/mail-account-gui.c:1177
msgid "Select Folder"
msgstr ""
@@ -11581,19 +11590,19 @@ msgid ""
"%s"
msgstr ""
-#: filter/filter-label.c:121 filter/libfilter-i18n.h:26 mail/em-migrate.c:923
+#: filter/filter-label.c:121 filter/libfilter-i18n.h:26 mail/em-migrate.c:924
#: mail/mail-config.c:65 mail/mail-config.glade.h:90
msgid "Important"
msgstr ""
#. forest green
-#: filter/filter-label.c:124 mail/em-migrate.c:926 mail/mail-config.c:68
+#: filter/filter-label.c:124 mail/em-migrate.c:927 mail/mail-config.c:68
#: mail/mail-config.glade.h:145
msgid "To Do"
msgstr ""
#. blue
-#: filter/filter-label.c:125 mail/em-migrate.c:927 mail/mail-config.c:69
+#: filter/filter-label.c:125 mail/em-migrate.c:928 mail/mail-config.c:69
#: mail/mail-config.glade.h:94
msgid "Later"
msgstr ""
@@ -11854,7 +11863,7 @@ msgstr ""
msgid "Junk Test"
msgstr ""
-#: filter/libfilter-i18n.h:37 mail/em-folder-view.c:777
+#: filter/libfilter-i18n.h:37 mail/em-folder-view.c:802
#: widgets/misc/e-expander.c:189
msgid "Label"
msgstr ""
@@ -11960,7 +11969,7 @@ msgstr ""
msgid "Stop Processing"
msgstr ""
-#: filter/libfilter-i18n.h:64 mail/em-format-html.c:1538
+#: filter/libfilter-i18n.h:64 mail/em-format-html.c:1539
#: mail/em-format-quote.c:301 mail/em-format.c:748 mail/em-mailer-prefs.c:72
#: mail/message-list.etspec.h:13 mail/message-tag-followup.c:308
#: smime/lib/e-cert.c:1079
@@ -12086,9 +12095,10 @@ msgstr ""
msgid "Evolution Mail preferences control"
msgstr ""
-#: mail/GNOME_Evolution_Mail.server.in.in.h:12 mail/em-folder-browser.c:831
+#: mail/GNOME_Evolution_Mail.server.in.in.h:12 mail/em-folder-browser.c:828
#: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1873
-#: mail/importers/pine-importer.c:473
+#: mail/importers/pine-importer.c:474 mail/mail-component.c:495
+#: mail/mail-component.c:540
msgid "Mail"
msgstr ""
@@ -12122,7 +12132,7 @@ msgid "Protocol"
msgstr ""
#: mail/em-composer-prefs.c:295 mail/em-composer-prefs.c:418
-#: mail/mail-config.c:1048
+#: mail/mail-config.c:1037
msgid "Unnamed"
msgstr ""
@@ -12177,7 +12187,7 @@ msgstr ""
msgid "You must specify recipients in order to send this message."
msgstr ""
-#: mail/em-composer-utils.c:578
+#: mail/em-composer-utils.c:574
msgid ""
"Unable to open the drafts folder for this account.\n"
"Would you like to use the default drafts folder?"
@@ -12213,18 +12223,16 @@ msgstr ""
msgid "<click here to select a folder>"
msgstr ""
-#: mail/em-folder-selector.c:166 shell/e-shell-folder-creation-dialog.c:318
+#: mail/em-folder-selector.c:166
msgid "Create New Folder"
msgstr ""
-#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2232
-#: mail/mail-component.c:638
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:4
+#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2277
+#: mail/mail-component.c:704
msgid "Specify where to create the folder:"
msgstr ""
#: mail/em-folder-selector.c:303
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:2
msgid "Folder _name:"
msgstr ""
@@ -12246,268 +12254,268 @@ msgstr ""
msgid "Loading..."
msgstr ""
-#: mail/em-folder-tree.c:877
+#: mail/em-folder-tree.c:922
#, fuzzy, c-format
msgid "Moving folder %s"
msgstr "Vista í möppu..."
-#: mail/em-folder-tree.c:879
+#: mail/em-folder-tree.c:924
#, c-format
msgid "Copying folder %s"
msgstr ""
-#: mail/em-folder-tree.c:886
+#: mail/em-folder-tree.c:931
#, c-format
msgid "Moving messages into folder %s"
msgstr ""
-#: mail/em-folder-tree.c:888
+#: mail/em-folder-tree.c:933
#, c-format
msgid "Copying messages into folder %s"
msgstr ""
-#: mail/em-folder-tree.c:904
+#: mail/em-folder-tree.c:949
msgid "Cannot drop message(s) into toplevel store"
msgstr ""
-#: mail/em-folder-tree.c:1952
+#: mail/em-folder-tree.c:1997
#, c-format
msgid "Cannot move folder `%s': illegal operation"
msgstr ""
-#: mail/em-folder-tree.c:1981 mail/em-folder-tree.c:2158
+#: mail/em-folder-tree.c:2026 mail/em-folder-tree.c:2203
#, c-format
msgid "%s"
msgstr ""
-#: mail/em-folder-tree.c:1997 mail/em-folder-tree.c:2010
-#: mail/em-folder-view.c:646 mail/em-folder-view.c:660
+#: mail/em-folder-tree.c:2042 mail/em-folder-tree.c:2055
+#: mail/em-folder-view.c:671 mail/em-folder-view.c:685
#: mail/importers/evolution-mbox-importer.c:119
msgid "Select folder"
msgstr ""
-#: mail/em-folder-tree.c:2037
+#: mail/em-folder-tree.c:2082
#, c-format
msgid "Creating folder `%s'"
msgstr ""
-#: mail/em-folder-tree.c:2232 mail/mail-component.c:638
+#: mail/em-folder-tree.c:2277 mail/mail-component.c:704
msgid "Create folder"
msgstr ""
-#: mail/em-folder-tree.c:2349
+#: mail/em-folder-tree.c:2396
#, c-format
msgid "Could not delete folder: %s"
msgstr ""
-#: mail/em-folder-tree.c:2374
+#: mail/em-folder-tree.c:2423
#, c-format
msgid "Cannot delete local %s folder."
msgstr ""
-#: mail/em-folder-tree.c:2380
+#: mail/em-folder-tree.c:2429
#, c-format
msgid "Really delete folder \"%s\" and all of its subfolders?"
msgstr ""
-#: mail/em-folder-tree.c:2390
+#: mail/em-folder-tree.c:2439
#, c-format
msgid "Delete \"%s\""
msgstr ""
-#: mail/em-folder-tree.c:2424
+#: mail/em-folder-tree.c:2475
#, c-format
msgid "Cannot rename local %s folder."
msgstr ""
-#: mail/em-folder-tree.c:2433
+#: mail/em-folder-tree.c:2484
#, c-format
msgid "Rename the \"%s\" folder to:"
msgstr ""
-#: mail/em-folder-tree.c:2435
+#: mail/em-folder-tree.c:2486
msgid "Rename Folder"
msgstr ""
-#: mail/em-folder-tree.c:2459
+#: mail/em-folder-tree.c:2510
#, c-format
msgid "A folder named \"%s\" already exists. Please use a different name."
msgstr ""
-#: mail/em-folder-tree.c:2505 ui/evolution-addressbook.xml.h:44
+#: mail/em-folder-tree.c:2558 ui/evolution-addressbook.xml.h:44
#: ui/evolution-mail-global.xml.h:18 ui/evolution-mail-messagedisplay.xml.h:8
#: ui/evolution-message-composer.xml.h:53 ui/evolution.xml.h:35
msgid "_View"
msgstr ""
-#: mail/em-folder-tree.c:2506
+#: mail/em-folder-tree.c:2559
msgid "Open in _New Window"
msgstr ""
-#: mail/em-folder-tree.c:2511
+#: mail/em-folder-tree.c:2564
msgid "_Move"
msgstr ""
#. FIXME: need to disable for nochildren folders
-#: mail/em-folder-tree.c:2515
+#: mail/em-folder-tree.c:2568
msgid "_New Folder..."
msgstr ""
-#: mail/em-folder-tree.c:2518
+#: mail/em-folder-tree.c:2571
msgid "_Rename"
msgstr ""
-#: mail/em-folder-tree.c:2521 ui/evolution-mail-list.xml.h:27
+#: mail/em-folder-tree.c:2574 ui/evolution-mail-list.xml.h:27
msgid "_Properties..."
msgstr ""
#. { EM_POPUP_ITEM, "00.select.00", N_("_Open"), G_CALLBACK(emp_popup_open), NULL, NULL, 0 },
-#: mail/em-folder-view.c:745 mail/em-popup.c:688
+#: mail/em-folder-view.c:770 mail/em-popup.c:688
msgid "_Edit as New Message..."
msgstr ""
-#: mail/em-folder-view.c:747
+#: mail/em-folder-view.c:772
msgid "_Print"
msgstr ""
-#: mail/em-folder-view.c:750 ui/evolution-mail-message.xml.h:126
+#: mail/em-folder-view.c:775 ui/evolution-mail-message.xml.h:126
msgid "_Reply to Sender"
msgstr ""
-#: mail/em-folder-view.c:751 mail/em-popup.c:808
+#: mail/em-folder-view.c:776 mail/em-popup.c:808
#: ui/evolution-mail-message.xml.h:88
msgid "Reply to _List"
msgstr ""
-#: mail/em-folder-view.c:752 mail/em-popup.c:809
+#: mail/em-folder-view.c:777 mail/em-popup.c:809
#: ui/evolution-mail-message.xml.h:87
msgid "Reply to _All"
msgstr ""
-#: mail/em-folder-view.c:753 mail/em-popup.c:811
+#: mail/em-folder-view.c:778 mail/em-popup.c:811
#: ui/evolution-mail-message.xml.h:113
msgid "_Forward"
msgstr ""
-#: mail/em-folder-view.c:756
+#: mail/em-folder-view.c:781
msgid "Follo_w Up..."
msgstr ""
-#: mail/em-folder-view.c:757
+#: mail/em-folder-view.c:782
msgid "Fla_g Completed"
msgstr ""
-#: mail/em-folder-view.c:758
+#: mail/em-folder-view.c:783
msgid "Cl_ear Flag"
msgstr ""
-#: mail/em-folder-view.c:761 ui/evolution-mail-message.xml.h:50
+#: mail/em-folder-view.c:786 ui/evolution-mail-message.xml.h:50
msgid "Mar_k as Read"
msgstr ""
-#: mail/em-folder-view.c:762
+#: mail/em-folder-view.c:787
msgid "Mark as _Unread"
msgstr ""
-#: mail/em-folder-view.c:763
+#: mail/em-folder-view.c:788
msgid "Mark as _Important"
msgstr ""
-#: mail/em-folder-view.c:764
+#: mail/em-folder-view.c:789
msgid "_Mark as Unimportant"
msgstr ""
-#: mail/em-folder-view.c:765 ui/evolution-mail-message.xml.h:54
+#: mail/em-folder-view.c:790 ui/evolution-mail-message.xml.h:54
msgid "Mark as _Junk"
msgstr ""
-#: mail/em-folder-view.c:766 ui/evolution-mail-message.xml.h:55
+#: mail/em-folder-view.c:791 ui/evolution-mail-message.xml.h:55
msgid "Mark as _Not Junk"
msgstr ""
-#: mail/em-folder-view.c:770
+#: mail/em-folder-view.c:795
msgid "U_ndelete"
msgstr ""
-#: mail/em-folder-view.c:773
+#: mail/em-folder-view.c:798
msgid "Mo_ve to Folder..."
msgstr ""
-#: mail/em-folder-view.c:774 ui/evolution-addressbook.xml.h:32
+#: mail/em-folder-view.c:799 ui/evolution-addressbook.xml.h:32
msgid "_Copy to Folder..."
msgstr ""
-#: mail/em-folder-view.c:782
+#: mail/em-folder-view.c:807
msgid "Add Sender to Address_book"
msgstr ""
-#: mail/em-folder-view.c:785
+#: mail/em-folder-view.c:810
msgid "Appl_y Filters"
msgstr ""
-#: mail/em-folder-view.c:786
+#: mail/em-folder-view.c:811
msgid "F_ilter Junk"
msgstr ""
-#: mail/em-folder-view.c:789
+#: mail/em-folder-view.c:814
msgid "Crea_te Rule From Message"
msgstr ""
-#: mail/em-folder-view.c:790
+#: mail/em-folder-view.c:815
msgid "VFolder on _Subject"
msgstr ""
-#: mail/em-folder-view.c:791
+#: mail/em-folder-view.c:816
msgid "VFolder on Se_nder"
msgstr ""
-#: mail/em-folder-view.c:792
+#: mail/em-folder-view.c:817
msgid "VFolder on _Recipients"
msgstr ""
-#: mail/em-folder-view.c:793
+#: mail/em-folder-view.c:818
msgid "VFolder on Mailing _List"
msgstr ""
-#: mail/em-folder-view.c:795
+#: mail/em-folder-view.c:820
msgid "VFolder on Thread"
msgstr ""
-#: mail/em-folder-view.c:799
+#: mail/em-folder-view.c:824
msgid "Filter on Sub_ject"
msgstr ""
-#: mail/em-folder-view.c:800
+#: mail/em-folder-view.c:825
msgid "Filter on Sen_der"
msgstr ""
-#: mail/em-folder-view.c:801
+#: mail/em-folder-view.c:826
msgid "Filter on Re_cipients"
msgstr ""
-#: mail/em-folder-view.c:802
+#: mail/em-folder-view.c:827
msgid "Filter on _Mailing List"
msgstr ""
-#: mail/em-folder-view.c:804
+#: mail/em-folder-view.c:829
msgid "Filter on Thread"
msgstr ""
#. default charset used in mail view
-#: mail/em-folder-view.c:1587 mail/em-folder-view.c:1625
+#: mail/em-folder-view.c:1612 mail/em-folder-view.c:1650
#: mail/mail-config.glade.h:66
msgid "Default"
msgstr ""
-#: mail/em-folder-view.c:1661
+#: mail/em-folder-view.c:1686
msgid "Print Message"
msgstr ""
-#: mail/em-folder-view.c:1908
+#: mail/em-folder-view.c:1949
msgid "_Copy Link Location"
msgstr ""
-#: mail/em-folder-view.c:2172
+#: mail/em-folder-view.c:2208
#, c-format
msgid "Click to mail %s"
msgstr ""
@@ -12671,54 +12679,54 @@ msgstr ""
msgid "Formatting message"
msgstr ""
-#: mail/em-format-html.c:1432 mail/em-format-quote.c:191 mail/em-format.c:743
+#: mail/em-format-html.c:1433 mail/em-format-quote.c:191 mail/em-format.c:743
#: mail/em-mailer-prefs.c:67 mail/message-list.etspec.h:7
#: mail/message-tag-followup.c:304
msgid "From"
msgstr ""
-#: mail/em-format-html.c:1432 mail/em-format-quote.c:191 mail/em-format.c:744
+#: mail/em-format-html.c:1433 mail/em-format-quote.c:191 mail/em-format.c:744
#: mail/em-mailer-prefs.c:68
msgid "Reply-To"
msgstr ""
-#: mail/em-format-html.c:1432 mail/em-format-quote.c:191 mail/em-format.c:745
+#: mail/em-format-html.c:1433 mail/em-format-quote.c:191 mail/em-format.c:745
#: mail/em-mailer-prefs.c:69 mail/message-list.etspec.h:14
msgid "To"
msgstr ""
-#: mail/em-format-html.c:1432 mail/em-format-quote.c:191 mail/em-format.c:746
+#: mail/em-format-html.c:1433 mail/em-format-quote.c:191 mail/em-format.c:746
#: mail/em-mailer-prefs.c:70
msgid "Cc"
msgstr ""
-#: mail/em-format-html.c:1432 mail/em-format-quote.c:191 mail/em-format.c:747
+#: mail/em-format-html.c:1433 mail/em-format-quote.c:191 mail/em-format.c:747
#: mail/em-mailer-prefs.c:71
msgid "Bcc"
msgstr ""
#. pseudo-header
-#: mail/em-format-html.c:1542 mail/em-format-quote.c:308
+#: mail/em-format-html.c:1543 mail/em-format-quote.c:308
#: mail/em-mailer-prefs.c:918
msgid "Mailer"
msgstr ""
#. translators: strftime format for local time equivalent in Date header display, with day
-#: mail/em-format-html.c:1569
+#: mail/em-format-html.c:1570
msgid "<I> (%a, %R %Z)</I>"
msgstr ""
#. translators: strftime format for local time equivalent in Date header display, without day
-#: mail/em-format-html.c:1572
+#: mail/em-format-html.c:1573
msgid "<I> (%R %Z)</I>"
msgstr ""
-#: mail/em-format-html.c:1582 mail/em-format-quote.c:315 mail/em-format.c:749
+#: mail/em-format-html.c:1583 mail/em-format-quote.c:315 mail/em-format.c:749
#: mail/em-mailer-prefs.c:73 mail/message-list.etspec.h:2
msgid "Date"
msgstr ""
-#: mail/em-format-html.c:1603 mail/em-format.c:750 mail/em-mailer-prefs.c:74
+#: mail/em-format-html.c:1604 mail/em-format.c:750 mail/em-mailer-prefs.c:74
msgid "Newsgroups"
msgstr ""
@@ -12782,7 +12790,7 @@ msgstr ""
msgid "Once per month"
msgstr ""
-#: mail/em-migrate.c:1079
+#: mail/em-migrate.c:1080
msgid ""
"The location and hierarchy of the Evolution mailbox folders has changed "
"since Evolution 1.x.\n"
@@ -12790,22 +12798,22 @@ msgid ""
"Please be patient while Evolution migrates your folders..."
msgstr ""
-#: mail/em-migrate.c:1899 mail/em-migrate.c:1914
+#: mail/em-migrate.c:1935 mail/em-migrate.c:1950
#, c-format
msgid "Failed to migrate pop3 uid caches: %s"
msgstr ""
-#: mail/em-migrate.c:2002 mail/em-migrate.c:2103
+#: mail/em-migrate.c:2038 mail/em-migrate.c:2139
#, c-format
msgid "Failed to migrate folder expand state: %s"
msgstr ""
-#: mail/em-migrate.c:2227 mail/em-migrate.c:2399
+#: mail/em-migrate.c:2263 mail/em-migrate.c:2435
#, c-format
msgid "Failed to create directory `%s': %s"
msgstr ""
-#: mail/em-migrate.c:2239
+#: mail/em-migrate.c:2275
#, c-format
msgid "Failed to open store for `%s': %s"
msgstr ""
@@ -12884,59 +12892,59 @@ msgstr ""
msgid "-------- Forwarded Message --------"
msgstr ""
-#: mail/em-utils.c:1142
+#: mail/em-utils.c:1143
msgid "an unknown sender"
msgstr ""
#. translators: attribution string used when quoting messages,
#. it must contain a single single %%+05d followed by a single '%%s'
-#: mail/em-utils.c:1152
+#: mail/em-utils.c:1153
msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
msgstr ""
-#: mail/em-utils.c:1435 mail/em-utils.c:1519 mail/em-utils.c:1528
+#: mail/em-utils.c:1436 mail/em-utils.c:1520 mail/em-utils.c:1529
#, c-format
msgid ""
"Cannot save to `%s'\n"
" %s"
msgstr ""
-#: mail/em-utils.c:1440
+#: mail/em-utils.c:1441
#, c-format
msgid ""
"`%s' already exists.\n"
"Overwrite it?"
msgstr ""
-#: mail/em-utils.c:1483
+#: mail/em-utils.c:1484
msgid "message"
msgstr ""
-#: mail/em-utils.c:1535
+#: mail/em-utils.c:1536
#, c-format
msgid "Error: '%s' exists and is not a regular file"
msgstr ""
-#: mail/em-utils.c:1589
+#: mail/em-utils.c:1590
msgid "Save Message..."
msgstr ""
-#: mail/em-utils.c:1638
+#: mail/em-utils.c:1639
msgid "Add address"
msgstr ""
#. Drop filename for messages from a mailbox
-#: mail/em-utils.c:2073
+#: mail/em-utils.c:2074
#, c-format
msgid "Messages from %s"
msgstr ""
-#: mail/em-utils.c:2124
+#: mail/em-utils.c:2125
#, c-format
msgid "Could not create temporary directory: %s"
msgstr ""
-#: mail/em-utils.c:2455
+#: mail/em-utils.c:2456
#, c-format
msgid ""
"This operation will permanently remove all deleted messages in the folder `%"
@@ -12945,7 +12953,7 @@ msgid ""
"Really erase these messages?"
msgstr ""
-#: mail/em-utils.c:2480
+#: mail/em-utils.c:2481
msgid ""
"This operation will permanently remove all deleted messages in all folders. "
"If you continue, you will not be able to recover these messages.\n"
@@ -13140,7 +13148,7 @@ msgid "Mark citations in the message \"Preview\"."
msgstr ""
#: mail/evolution-mail.schemas.in.in.h:45
-msgid "Message Window default hight"
+msgid "Message Window default height"
msgstr ""
#: mail/evolution-mail.schemas.in.in.h:46
@@ -13552,21 +13560,21 @@ msgstr ""
msgid "Evolution is importing your old Pine data"
msgstr ""
-#: mail/importers/pine-importer.c:313
+#: mail/importers/pine-importer.c:314
msgid "Importing Pine data"
msgstr ""
-#: mail/importers/pine-importer.c:478
+#: mail/importers/pine-importer.c:479
msgid "Addressbook"
msgstr ""
-#: mail/importers/pine-importer.c:497
+#: mail/importers/pine-importer.c:498
msgid ""
"Evolution has found Pine mail files.\n"
"Would you like to import them into Evolution?"
msgstr ""
-#: mail/importers/pine-importer.c:505
+#: mail/importers/pine-importer.c:506
msgid "Pine"
msgstr ""
@@ -13591,7 +13599,7 @@ msgstr ""
msgid "_Path:"
msgstr ""
-#: mail/mail-account-gui.c:2095
+#: mail/mail-account-gui.c:2119
msgid "You may not create two accounts with the same name."
msgstr ""
@@ -13636,35 +13644,70 @@ msgid ""
"And have been updated."
msgstr ""
-#: mail/mail-component.c:519
+#: mail/mail-component.c:472
+#, fuzzy, c-format
+msgid "%d deleted"
+msgstr "Eyða"
+
+#: mail/mail-component.c:474
+#, c-format
+msgid "%d junk"
+msgstr ""
+
+#: mail/mail-component.c:477
+#, fuzzy, c-format
+msgid "%d drafts"
+msgstr "dagar"
+
+#: mail/mail-component.c:479
+#, fuzzy, c-format
+msgid "%d sent"
+msgstr "mínútur"
+
+#: mail/mail-component.c:481
+#, c-format
+msgid "%d unsent"
+msgstr ""
+
+#: mail/mail-component.c:485
+#, c-format
+msgid "%d total"
+msgstr ""
+
+#: mail/mail-component.c:487
+#, c-format
+msgid ", %d unread"
+msgstr ""
+
+#: mail/mail-component.c:583
msgid "You have unsent messages, do you wish to quit anyway?"
msgstr ""
-#: mail/mail-component.c:587
+#: mail/mail-component.c:651
msgid "New Mail Message"
msgstr ""
-#: mail/mail-component.c:588
+#: mail/mail-component.c:652
msgid "_Mail Message"
msgstr ""
-#: mail/mail-component.c:589
+#: mail/mail-component.c:653
msgid "Compose a new mail message"
msgstr ""
-#: mail/mail-component.c:594
+#: mail/mail-component.c:659
msgid "New Mail Folder"
msgstr ""
-#: mail/mail-component.c:595
+#: mail/mail-component.c:660
msgid "Mail _Folder"
msgstr ""
-#: mail/mail-component.c:596
+#: mail/mail-component.c:661
msgid "Create a new mail folder"
msgstr ""
-#: mail/mail-component.c:760
+#: mail/mail-component.c:824
msgid "URI of the mail source that the view will display"
msgstr ""
@@ -13717,11 +13760,11 @@ msgid ""
"purposes only."
msgstr ""
-#: mail/mail-config.c:898
+#: mail/mail-config.c:887
msgid "Checking Service"
msgstr ""
-#: mail/mail-config.c:976 mail/mail-config.c:980
+#: mail/mail-config.c:965 mail/mail-config.c:969
msgid "Connecting to server..."
msgstr ""
@@ -14310,19 +14353,14 @@ msgid "_Use the same fonts as other applications"
msgstr ""
#: mail/mail-config.glade.h:180
-#, fuzzy
-msgid "_minute(s)"
-msgstr "mínútur"
-
-#: mail/mail-config.glade.h:181
msgid "color"
msgstr ""
-#: mail/mail-config.glade.h:182
+#: mail/mail-config.glade.h:181
msgid "description"
msgstr ""
-#: mail/mail-folder-cache.c:803
+#: mail/mail-folder-cache.c:786
#, c-format
msgid "Pinging %s"
msgstr ""
@@ -14685,67 +14723,67 @@ msgstr ""
msgid "New VFolder"
msgstr ""
-#: mail/message-list.c:935
+#: mail/message-list.c:933
msgid "Unseen"
msgstr ""
-#: mail/message-list.c:936
+#: mail/message-list.c:934
msgid "Seen"
msgstr ""
-#: mail/message-list.c:937
+#: mail/message-list.c:935
msgid "Answered"
msgstr ""
-#: mail/message-list.c:938
+#: mail/message-list.c:936
msgid "Multiple Unseen Messages"
msgstr ""
-#: mail/message-list.c:939
+#: mail/message-list.c:937
msgid "Multiple Messages"
msgstr ""
-#: mail/message-list.c:943
+#: mail/message-list.c:941
msgid "Lowest"
msgstr ""
-#: mail/message-list.c:944
+#: mail/message-list.c:942
msgid "Lower"
msgstr ""
-#: mail/message-list.c:948
+#: mail/message-list.c:946
msgid "Higher"
msgstr ""
-#: mail/message-list.c:949
+#: mail/message-list.c:947
msgid "Highest"
msgstr ""
-#: mail/message-list.c:1270
+#: mail/message-list.c:1268
msgid "?"
msgstr ""
-#: mail/message-list.c:1277
+#: mail/message-list.c:1275
msgid "Today %l:%M %p"
msgstr ""
-#: mail/message-list.c:1286
+#: mail/message-list.c:1284
msgid "Yesterday %l:%M %p"
msgstr ""
-#: mail/message-list.c:1298
+#: mail/message-list.c:1296
msgid "%a %l:%M %p"
msgstr ""
-#: mail/message-list.c:1306
+#: mail/message-list.c:1304
msgid "%b %d %l:%M %p"
msgstr ""
-#: mail/message-list.c:1308
+#: mail/message-list.c:1306
msgid "%b %d %Y"
msgstr ""
-#: mail/message-list.c:3124
+#: mail/message-list.c:3103
msgid "Generating message list"
msgstr ""
@@ -14972,38 +15010,6 @@ msgstr ""
msgid "Brought to you by"
msgstr ""
-#: shell/e-shell-config-autocompletion.c:110
-msgid "Extra Completion folders"
-msgstr ""
-
-#: shell/e-shell-config-default-folders.c:149
-msgid "Select Default Folder"
-msgstr ""
-
-#: shell/e-shell-config-folder-settings.c:70
-msgid "Default Folders"
-msgstr ""
-
-#: shell/e-shell-config-folder-settings.c:73
-msgid "Offline Folders"
-msgstr ""
-
-#: shell/e-shell-config-folder-settings.c:76
-msgid "Autocompletion Folders"
-msgstr ""
-
-#: shell/e-shell-folder-creation-dialog.c:137
-#, c-format
-msgid ""
-"Cannot create the specified folder:\n"
-"%s"
-msgstr ""
-
-#: shell/e-shell-folder-creation-dialog.c:180
-#, c-format
-msgid "The specified folder name is not valid: %s"
-msgstr ""
-
#: shell/e-shell-folder-title-bar.c:592 shell/e-shell-folder-title-bar.c:593
msgid "(Untitled)"
msgstr ""
@@ -15134,36 +15140,6 @@ msgstr ""
msgid "Evolution Settings"
msgstr ""
-#. It would be nice to insensitivize the OK button appropriately
-#. instead of doing this, but unfortunately we can't do this for the
-#. Bonobo control.
-#: shell/e-shell-shared-folder-picker-dialog.c:281
-msgid "Please select a user."
-msgstr ""
-
-#: shell/e-shell-shared-folder-picker-dialog.c:387
-msgid "Opening Folder"
-msgstr ""
-
-#: shell/e-shell-shared-folder-picker-dialog.c:393
-#, c-format
-msgid "Opening Folder \"%s\""
-msgstr ""
-
-#: shell/e-shell-shared-folder-picker-dialog.c:398
-#, c-format
-msgid "in \"%s\" ..."
-msgstr ""
-
-#: shell/e-shell-shared-folder-picker-dialog.c:482
-#, c-format
-msgid "Could not open shared folder: %s."
-msgstr ""
-
-#: shell/e-shell-shared-folder-picker-dialog.c:535
-msgid "Cannot find the specified shared folder."
-msgstr ""
-
#: shell/e-shell-startup-wizard.c:570
msgid "Starting import"
msgstr ""
@@ -15222,7 +15198,7 @@ msgstr ""
msgid "_Work Online"
msgstr ""
-#: shell/e-shell-window-commands.c:395 ui/evolution.xml.h:37
+#: shell/e-shell-window-commands.c:395 ui/evolution.xml.h:36
msgid "_Work Offline"
msgstr ""
@@ -15244,7 +15220,7 @@ msgid ""
"Ximian Evolution is currently offline. Click on this button to work online."
msgstr ""
-#: shell/e-shell.c:537
+#: shell/e-shell.c:536
#, c-format
msgid ""
"Warning: Evolution could not upgrade all your data from version %d.%d.%d.\n"
@@ -15252,19 +15228,19 @@ msgid ""
"Evolution.\n"
msgstr ""
-#: shell/e-shell.c:1063
+#: shell/e-shell.c:1081
msgid "Invalid arguments"
msgstr ""
-#: shell/e-shell.c:1065
+#: shell/e-shell.c:1083
msgid "Cannot register on OAF"
msgstr ""
-#: shell/e-shell.c:1067
+#: shell/e-shell.c:1085
msgid "Configuration Database not found"
msgstr ""
-#: shell/e-shell.c:1069
+#: shell/e-shell.c:1087
msgid "Generic error"
msgstr ""
@@ -15272,8 +15248,7 @@ msgstr ""
msgid "Checkbox"
msgstr ""
-#: shell/e-user-creatable-items-handler.c:601
-#: shell/e-user-creatable-items-handler.c:642
+#: shell/e-user-creatable-items-handler.c:683
msgid "New"
msgstr ""
@@ -15327,42 +15302,6 @@ msgstr ""
msgid "Click OK to close these connections and go offline"
msgstr ""
-#: shell/glade/e-shell-config-default-folders.glade.h:1
-msgid "C_alendar:"
-msgstr ""
-
-#: shell/glade/e-shell-config-default-folders.glade.h:2
-msgid "_Contacts:"
-msgstr ""
-
-#: shell/glade/e-shell-config-default-folders.glade.h:3
-msgid "_Mail:"
-msgstr ""
-
-#: shell/glade/e-shell-config-default-folders.glade.h:4
-msgid "_Tasks:"
-msgstr ""
-
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:3
-msgid "Folder _type:"
-msgstr ""
-
-#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:1
-msgid "Open Other User's Folder"
-msgstr ""
-
-#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:2
-msgid "_Account:"
-msgstr ""
-
-#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:3
-msgid "_Folder Name:"
-msgstr ""
-
-#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:4
-msgid "_User:"
-msgstr ""
-
#: shell/glade/evolution-startup-wizard.glade.h:2
msgid "Evolution Setup Assistant"
msgstr ""
@@ -15483,7 +15422,7 @@ msgid "Don't tell me again"
msgstr ""
#: shell/main.c:392
-msgid "Cannot access the Ximian Evolution shell."
+msgid "Cannot register the Ximian Evolution shell."
msgstr ""
#: shell/main.c:401
@@ -17275,7 +17214,7 @@ msgid "Change Evolution's settings"
msgstr ""
#: ui/evolution.xml.h:5
-msgid "Create a new window"
+msgid "Create a new window displaying this folder"
msgstr ""
#: ui/evolution.xml.h:6
@@ -17299,7 +17238,7 @@ msgid "Import data from other programs"
msgstr ""
#: ui/evolution.xml.h:12
-msgid "Open a new window"
+msgid "New _Window"
msgstr ""
#: ui/evolution.xml.h:13
@@ -17366,10 +17305,6 @@ msgstr ""
msgid "_Send / Receive"
msgstr "_Sækja / Senda"
-#: ui/evolution.xml.h:36
-msgid "_Window"
-msgstr ""
-
#: views/addressbook/galview.xml.h:1
msgid "By _Company"
msgstr ""
@@ -17714,5 +17649,13 @@ msgstr "%s (...)"
msgid "%s (%d%% complete)"
msgstr ""
+#, fuzzy
+#~ msgid "_Address Book"
+#~ msgstr "_Heimilisfang:"
+
+#, fuzzy
+#~ msgid "_minute(s)"
+#~ msgstr "mínútur"
+
#~ msgid "2:30"
#~ msgstr "2:30"