aboutsummaryrefslogtreecommitdiffstats
path: root/po
diff options
context:
space:
mode:
authorPhilip Withnall <philip@tecnocode.co.uk>2009-02-24 04:40:14 +0800
committerPhilip Withnall <pwithnall@src.gnome.org>2009-02-24 04:40:14 +0800
commit7a234a0f50c2f26e8caef99e1449fee7c2e2e86f (patch)
treeed552787ef76219344146bf7bac7512ad0947ba5 /po
parent24274985023bdb9e5f5a5e553d5f7b8f8ae742d8 (diff)
downloadgsoc2013-evolution-7a234a0f50c2f26e8caef99e1449fee7c2e2e86f.tar.gz
gsoc2013-evolution-7a234a0f50c2f26e8caef99e1449fee7c2e2e86f.tar.zst
gsoc2013-evolution-7a234a0f50c2f26e8caef99e1449fee7c2e2e86f.zip
Updated British English translation.
2009-02-23 Philip Withnall <philip@tecnocode.co.uk> * en_GB.po: Updated British English translation. svn path=/trunk/; revision=37315
Diffstat (limited to 'po')
-rw-r--r--po/ChangeLog4
-rw-r--r--po/en_GB.po7673
2 files changed, 4038 insertions, 3639 deletions
diff --git a/po/ChangeLog b/po/ChangeLog
index e7aa8684fd..6fb3ce830b 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,7 @@
+2009-02-23 Philip Withnall <philip@tecnocode.co.uk>
+
+ * en_GB.po: Updated British English translation.
+
2009-02-23 Gil Forcada <gforcada@gnome.org>
* ca.po: Updated Catalan translation by David Planella.
diff --git a/po/en_GB.po b/po/en_GB.po
index 50af1071a4..0e4c962194 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -2,15 +2,15 @@
# Robert Brady <rwb197@zepler.org>, 2000.
# Gareth Owen <gowen72@yahoo.com>, David Lodge <dave@cirt.net>, 2004.
#
-#: ../shell/main.c:589
+#: ../shell/main.c:603
msgid ""
msgstr ""
"Project-Id-Version: evolution gnome-2.8\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-09-07 02:00+0000\n"
-"PO-Revision-Date: 2008-02-17 10:08-0000\n"
+"POT-Creation-Date: 2009-02-23 20:24+0000\n"
+"PO-Revision-Date: 2009-02-23 20:34+0000\n"
"Last-Translator: David Lodge <dave@cirt.net>\n"
-"Language-Team: \n"
+"Language-Team: <>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -18,21 +18,21 @@ msgstr ""
#: ../a11y/addressbook/ea-addressbook-view.c:94
#: ../a11y/addressbook/ea-addressbook-view.c:103
-#: ../a11y/addressbook/ea-minicard-view.c:178
+#: ../a11y/addressbook/ea-minicard-view.c:179
msgid "evolution address book"
msgstr "evolution address book"
-#: ../a11y/addressbook/ea-minicard-view.c:32
-#: ../addressbook/gui/component/addressbook-component.c:229
+#: ../a11y/addressbook/ea-minicard-view.c:33
+#: ../addressbook/gui/component/addressbook-component.c:237
msgid "New Contact"
msgstr "New Contact"
-#: ../a11y/addressbook/ea-minicard-view.c:33
-#: ../addressbook/gui/component/addressbook-component.c:237
+#: ../a11y/addressbook/ea-minicard-view.c:34
+#: ../addressbook/gui/component/addressbook-component.c:245
msgid "New Contact List"
msgstr "New Contact List"
-#: ../a11y/addressbook/ea-minicard-view.c:161
+#: ../a11y/addressbook/ea-minicard-view.c:162
#, c-format
msgid "current address book folder %s has %d card"
msgid_plural "current address book folder %s has %d cards"
@@ -149,7 +149,7 @@ msgid "calendar view for one or more days"
msgstr "calendar view for one or more days"
#: ../a11y/calendar/ea-gnome-calendar.c:186
-#: ../calendar/gui/calendar-component.c:757
+#: ../calendar/gui/calendar-component.c:821
msgid "%A %d %b %Y"
msgstr "%A %d %b %Y"
@@ -160,8 +160,8 @@ msgstr "%A %d %b %Y"
#. You can change the order but don't change the
#. specifiers or add anything.
#: ../a11y/calendar/ea-gnome-calendar.c:189
-#: ../calendar/gui/calendar-component.c:760
-#: ../calendar/gui/e-day-view-top-item.c:856 ../calendar/gui/e-day-view.c:1568
+#: ../calendar/gui/calendar-component.c:824
+#: ../calendar/gui/e-day-view-top-item.c:855 ../calendar/gui/e-day-view.c:1599
#: ../calendar/gui/e-week-view-main-item.c:335
msgid "%a %d %b"
msgstr "%a %d %b"
@@ -169,9 +169,9 @@ msgstr "%a %d %b"
#: ../a11y/calendar/ea-gnome-calendar.c:191
#: ../a11y/calendar/ea-gnome-calendar.c:196
#: ../a11y/calendar/ea-gnome-calendar.c:198
-#: ../calendar/gui/calendar-component.c:762
-#: ../calendar/gui/calendar-component.c:767
-#: ../calendar/gui/calendar-component.c:769
+#: ../calendar/gui/calendar-component.c:826
+#: ../calendar/gui/calendar-component.c:831
+#: ../calendar/gui/calendar-component.c:833
msgid "%a %d %b %Y"
msgstr "%a %d %b %Y"
@@ -179,10 +179,10 @@ msgstr "%a %d %b %Y"
#: ../a11y/calendar/ea-gnome-calendar.c:221
#: ../a11y/calendar/ea-gnome-calendar.c:227
#: ../a11y/calendar/ea-gnome-calendar.c:229
-#: ../calendar/gui/calendar-component.c:781
-#: ../calendar/gui/calendar-component.c:788
-#: ../calendar/gui/calendar-component.c:794
-#: ../calendar/gui/calendar-component.c:796
+#: ../calendar/gui/calendar-component.c:845
+#: ../calendar/gui/calendar-component.c:852
+#: ../calendar/gui/calendar-component.c:858
+#: ../calendar/gui/calendar-component.c:860
msgid "%d %b %Y"
msgstr "%d %b %Y"
@@ -192,15 +192,15 @@ msgstr "%d %b %Y"
#. month name. You can change the order but don't
#. change the specifiers or add anything.
#: ../a11y/calendar/ea-gnome-calendar.c:219
-#: ../calendar/gui/calendar-component.c:786
-#: ../calendar/gui/e-day-view-top-item.c:860 ../calendar/gui/e-day-view.c:1584
+#: ../calendar/gui/calendar-component.c:850
+#: ../calendar/gui/e-day-view-top-item.c:859 ../calendar/gui/e-day-view.c:1615
#: ../calendar/gui/e-week-view-main-item.c:349
msgid "%d %b"
msgstr "%d %b"
#: ../a11y/calendar/ea-gnome-calendar.c:245
#: ../a11y/calendar/ea-gnome-calendar.c:253
-#: ../calendar/importers/icalendar-importer.c:766
+#: ../calendar/importers/icalendar-importer.c:780
msgid "Gnome Calendar"
msgstr "Gnome Calendar"
@@ -247,11 +247,11 @@ msgstr "popup"
msgid "popup a child"
msgstr "pop up a child"
-#: ../a11y/e-table/gal-a11y-e-cell-text.c:614
+#: ../a11y/e-table/gal-a11y-e-cell-text.c:628
msgid "edit"
msgstr "edit"
-#: ../a11y/e-table/gal-a11y-e-cell-text.c:615
+#: ../a11y/e-table/gal-a11y-e-cell-text.c:629
msgid "begin editing this cell"
msgstr "begin editing this cell"
@@ -264,19 +264,19 @@ msgstr "toggle"
msgid "toggle the cell"
msgstr "toggle the cell"
-#: ../a11y/e-table/gal-a11y-e-cell-tree.c:194
+#: ../a11y/e-table/gal-a11y-e-cell-tree.c:208
msgid "expand"
msgstr "expand"
-#: ../a11y/e-table/gal-a11y-e-cell-tree.c:195
+#: ../a11y/e-table/gal-a11y-e-cell-tree.c:209
msgid "expands the row in the ETree containing this cell"
msgstr "expands the row in the ETree containing this cell"
-#: ../a11y/e-table/gal-a11y-e-cell-tree.c:200
+#: ../a11y/e-table/gal-a11y-e-cell-tree.c:214
msgid "collapse"
msgstr "collapse"
-#: ../a11y/e-table/gal-a11y-e-cell-tree.c:201
+#: ../a11y/e-table/gal-a11y-e-cell-tree.c:215
msgid "collapses the row in the ETree containing this cell"
msgstr "collapses the row in the ETree containing this cell"
@@ -411,7 +411,7 @@ msgstr "Failed to authenticate with LDAP server."
#. Unknown error
#: ../addressbook/addressbook.error.xml.h:16
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1734
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1746
msgid "Failed to delete contact"
msgstr "Failed to delete contact"
@@ -424,6 +424,7 @@ msgid "LDAP server did not respond with valid schema information."
msgstr "LDAP server did not respond with valid schema information."
#: ../addressbook/addressbook.error.xml.h:19
+#: ../calendar/calendar.error.xml.h:54
msgid "Server Version"
msgstr "Server Version"
@@ -553,7 +554,7 @@ msgstr "_Use as it is"
#. For Translators: {0} is the string describing why the search could not be performed (eg: "The backend for this address book was unable to parse this query."
#: ../addressbook/addressbook.error.xml.h:44 ../mail/mail.error.xml.h:143
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:82
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:83
msgid "{0}"
msgstr "{0}"
@@ -562,21 +563,22 @@ msgstr "{0}"
msgid "{1}"
msgstr "{1}"
-#: ../addressbook/conduit/address-conduit.c:299
+#: ../addressbook/conduit/address-conduit.c:491
msgid "Default Sync Address:"
msgstr "Default Sync Address:"
-#: ../addressbook/conduit/address-conduit.c:1320
-#: ../addressbook/conduit/address-conduit.c:1321
+#: ../addressbook/conduit/address-conduit.c:1521
+#: ../addressbook/conduit/address-conduit.c:1522
msgid "Could not load address book"
msgstr "Could not load address book"
-#: ../addressbook/conduit/address-conduit.c:1398
-#: ../addressbook/conduit/address-conduit.c:1401
+#: ../addressbook/conduit/address-conduit.c:1599
+#: ../addressbook/conduit/address-conduit.c:1602
msgid "Could not read pilot's Address application block"
msgstr "Could not read pilot's Address application block"
#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
+#: ../addressbook/gui/component/autocompletion-config.c:173
msgid "Autocompletion"
msgstr "Autocompletion"
@@ -592,11 +594,13 @@ msgstr "Certificates"
msgid "Configure autocomplete here"
msgstr "Configure autocomplete here"
+#. ensure the group name is in current locale, not read from configuration
#. Create the contacts group
#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-#: ../addressbook/gui/component/addressbook-view.c:1326
-#: ../calendar/gui/calendar-component.c:299 ../calendar/gui/migration.c:396
-#: ../plugins/exchange-operations/exchange-delegates-user.c:76
+#: ../addressbook/gui/component/addressbook-view.c:1213
+#: ../calendar/gui/calendar-component.c:316
+#: ../calendar/gui/calendar-component.c:319 ../calendar/gui/migration.c:396
+#: ../plugins/exchange-operations/exchange-delegates-user.c:78
#: ../plugins/exchange-operations/exchange-folder.c:582
msgid "Contacts"
msgstr "Contacts"
@@ -633,158 +637,179 @@ msgstr "Evolution folder settings configuration control"
msgid "Manage your S/MIME certificates here"
msgstr "Manage your S/MIME certificates here"
+#. ensure the group name is in current locale, not read from configuration
+#. create the local source group
+#. ensure the group name is in current locale, not read from configuration
+#. create the local source group
+#. ensure the group name is in current locale, not read from configuration
+#. create the local source group
+#. ensure the group name is in current locale, not read from configuration
#. create the local source group
#. On This Computer is always first and Search Folders is always last
-#: ../addressbook/gui/component/addressbook-component.c:144
-#: ../addressbook/gui/component/addressbook-migrate.c:499
-#: ../calendar/gui/calendar-component.c:236
-#: ../calendar/gui/memos-component.c:199 ../calendar/gui/migration.c:475
-#: ../calendar/gui/migration.c:577 ../calendar/gui/migration.c:1091
-#: ../calendar/gui/tasks-component.c:195 ../mail/em-folder-tree-model.c:200
-#: ../mail/em-folder-tree-model.c:202 ../mail/em-migrate.c:2906
-#: ../mail/mail-component.c:312 ../mail/mail-vfolder.c:216
-#: ../mail/message-list.c:1457
+#: ../addressbook/gui/component/addressbook-component.c:142
+#: ../addressbook/gui/component/addressbook-component.c:146
+#: ../addressbook/gui/component/addressbook-migrate.c:500
+#: ../calendar/gui/calendar-component.c:243
+#: ../calendar/gui/calendar-component.c:247
+#: ../calendar/gui/memos-component.c:197 ../calendar/gui/memos-component.c:201
+#: ../calendar/gui/migration.c:475 ../calendar/gui/migration.c:577
+#: ../calendar/gui/migration.c:1091 ../calendar/gui/tasks-component.c:194
+#: ../calendar/gui/tasks-component.c:198 ../mail/em-folder-tree-model.c:200
+#: ../mail/em-folder-tree-model.c:202 ../mail/em-migrate.c:2990
+#: ../mail/mail-component.c:316 ../mail/mail-vfolder.c:223
+#: ../mail/message-list.c:1517
msgid "On This Computer"
msgstr "On This Computer"
+#. ensure the source name is in current locale, not read from configuration
+#. Create the default Person addressbook
+#. ensure the source name is in current locale, not read from configuration
+#. Create the default Person addressbook
+#. ensure the source name is in current locale, not read from configuration
#. Create the default Person addressbook
#. Create the default Person calendar
#. Create the default Person task list
+#. ensure the source name is in current locale, not read from configuration
#. Create the default Person addressbook
#. orange
-#: ../addressbook/gui/component/addressbook-component.c:152
-#: ../addressbook/gui/component/addressbook-migrate.c:507
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:20
-#: ../addressbook/gui/widgets/eab-contact-display.c:660
-#: ../calendar/gui/calendar-component.c:247 ../calendar/gui/caltypes.xml.h:29
-#: ../calendar/gui/memos-component.c:208 ../calendar/gui/memotypes.xml.h:27
+#: ../addressbook/gui/component/addressbook-component.c:154
+#: ../addressbook/gui/component/addressbook-component.c:157
+#: ../addressbook/gui/component/addressbook-migrate.c:508
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:21
+#: ../addressbook/gui/widgets/eab-contact-display.c:652
+#: ../calendar/gui/calendar-component.c:255
+#: ../calendar/gui/calendar-component.c:261
+#: ../calendar/gui/memos-component.c:209 ../calendar/gui/memos-component.c:213
#: ../calendar/gui/migration.c:485 ../calendar/gui/migration.c:585
-#: ../calendar/gui/migration.c:1099 ../calendar/gui/tasks-component.c:204
-#: ../calendar/gui/tasktypes.xml.h:35 ../mail/em-migrate.c:1058
+#: ../calendar/gui/migration.c:1099 ../calendar/gui/tasks-component.c:206
+#: ../calendar/gui/tasks-component.c:210 ../mail/em-migrate.c:1058
+#: ../plugins/email-custom-header/email-custom-header.c:338
msgid "Personal"
msgstr "Personal"
+#. ensure the group name is in current locale, not read from configuration
#. Create the LDAP source group
-#: ../addressbook/gui/component/addressbook-component.c:163
-#: ../addressbook/gui/component/addressbook-migrate.c:517
+#: ../addressbook/gui/component/addressbook-component.c:168
+#: ../addressbook/gui/component/addressbook-component.c:171
+#: ../addressbook/gui/component/addressbook-migrate.c:518
msgid "On LDAP Servers"
msgstr "On LDAP Servers"
-#: ../addressbook/gui/component/addressbook-component.c:230
+#: ../addressbook/gui/component/addressbook-component.c:238
msgctxt "New"
msgid "_Contact"
msgstr "_Contact"
-#: ../addressbook/gui/component/addressbook-component.c:231
+#: ../addressbook/gui/component/addressbook-component.c:239
msgid "Create a new contact"
msgstr "Create a new contact"
-#: ../addressbook/gui/component/addressbook-component.c:238
+#: ../addressbook/gui/component/addressbook-component.c:246
msgctxt "New"
msgid "Contact _List"
msgstr "Contact _List"
-#: ../addressbook/gui/component/addressbook-component.c:239
+#: ../addressbook/gui/component/addressbook-component.c:247
msgid "Create a new contact list"
msgstr "Create a new contact list"
-#: ../addressbook/gui/component/addressbook-component.c:245
-#: ../addressbook/gui/component/addressbook-config.c:1207
+#: ../addressbook/gui/component/addressbook-component.c:253
+#: ../addressbook/gui/component/addressbook-config.c:1223
msgid "New Address Book"
msgstr "New Address Book"
-#: ../addressbook/gui/component/addressbook-component.c:246
+#: ../addressbook/gui/component/addressbook-component.c:254
msgctxt "New"
msgid "Address _Book"
msgstr "Address _Book"
-#: ../addressbook/gui/component/addressbook-component.c:247
+#: ../addressbook/gui/component/addressbook-component.c:255
msgid "Create a new address book"
msgstr "Create a new address book"
-#: ../addressbook/gui/component/addressbook-component.c:410
+#: ../addressbook/gui/component/addressbook-component.c:418
msgid "Failed upgrading Address Book settings or folders."
msgstr "Failed upgrading Address Book settings or folders."
-#: ../addressbook/gui/component/addressbook-config.c:316
+#: ../addressbook/gui/component/addressbook-config.c:332
msgid "Base"
msgstr "Base"
-#: ../addressbook/gui/component/addressbook-config.c:517
+#: ../addressbook/gui/component/addressbook-config.c:533
#: ../calendar/gui/dialogs/calendar-setup.c:170
msgid "_Type:"
msgstr "_Type:"
-#: ../addressbook/gui/component/addressbook-config.c:619
+#: ../addressbook/gui/component/addressbook-config.c:635
msgid "Copy _book content locally for offline operation"
msgstr "Copy _book content locally for offline operation"
-#: ../addressbook/gui/component/addressbook-config.c:982
+#: ../addressbook/gui/component/addressbook-config.c:998
#: ../addressbook/gui/component/ldap-config.glade.h:22
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
-#: ../calendar/gui/dialogs/calendar-setup.c:367
-#: ../calendar/gui/dialogs/calendar-setup.c:378
-#: ../calendar/gui/dialogs/calendar-setup.c:389
-#: ../mail/em-folder-properties.c:283 ../mail/mail-config.glade.h:89
-#: ../plugins/itip-formatter/itip-formatter.c:2367
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
+#: ../calendar/gui/dialogs/calendar-setup.c:368
+#: ../calendar/gui/dialogs/calendar-setup.c:379
+#: ../calendar/gui/dialogs/calendar-setup.c:390
+#: ../mail/em-folder-properties.c:283 ../mail/mail-config.glade.h:90
+#: ../plugins/itip-formatter/itip-formatter.c:2532
#: ../smime/gui/smime-ui.glade.h:28
msgid "General"
msgstr "General"
-#: ../addressbook/gui/component/addressbook-config.c:983
-#: ../addressbook/gui/widgets/e-addressbook-view.c:555
-#: ../mail/importers/pine-importer.c:385
+#: ../addressbook/gui/component/addressbook-config.c:999
+#: ../addressbook/gui/widgets/e-addressbook-view.c:554
+#: ../mail/importers/pine-importer.c:383
msgid "Address Book"
msgstr "Address Book"
-#: ../addressbook/gui/component/addressbook-config.c:987
+#: ../addressbook/gui/component/addressbook-config.c:1003
msgid "Server Information"
msgstr "Server Information"
-#: ../addressbook/gui/component/addressbook-config.c:989
+#: ../addressbook/gui/component/addressbook-config.c:1005
msgid "Authentication"
msgstr "Authentication"
-#: ../addressbook/gui/component/addressbook-config.c:992
+#: ../addressbook/gui/component/addressbook-config.c:1008
#: ../addressbook/gui/component/ldap-config.glade.h:17
#: ../smime/gui/smime-ui.glade.h:20
msgid "Details"
msgstr "Details"
-#: ../addressbook/gui/component/addressbook-config.c:993
-#: ../mail/em-folder-browser.c:983
+#: ../addressbook/gui/component/addressbook-config.c:1009
+#: ../mail/em-folder-browser.c:1000
msgid "Searching"
msgstr "Searching"
-#: ../addressbook/gui/component/addressbook-config.c:995
+#: ../addressbook/gui/component/addressbook-config.c:1011
msgid "Downloading"
msgstr "Downloading"
-#: ../addressbook/gui/component/addressbook-config.c:1205
+#: ../addressbook/gui/component/addressbook-config.c:1221
#: ../addressbook/gui/component/ldap-config.glade.h:11
msgid "Address Book Properties"
msgstr "Address Book Properties"
-#: ../addressbook/gui/component/addressbook-migrate.c:73
-#: ../calendar/gui/migration.c:148 ../mail/em-migrate.c:1207
+#: ../addressbook/gui/component/addressbook-migrate.c:74
+#: ../calendar/gui/migration.c:148 ../mail/em-migrate.c:1209
msgid "Migrating..."
msgstr "Migrating..."
-#: ../addressbook/gui/component/addressbook-migrate.c:125
-#: ../calendar/gui/migration.c:195 ../mail/em-migrate.c:1247
+#: ../addressbook/gui/component/addressbook-migrate.c:126
+#: ../calendar/gui/migration.c:195 ../mail/em-migrate.c:1268
#, c-format
msgid "Migrating '%s':"
msgstr "Migrating '%s':"
-#: ../addressbook/gui/component/addressbook-migrate.c:645
+#: ../addressbook/gui/component/addressbook-migrate.c:646
msgid "LDAP Servers"
msgstr "LDAP Servers"
-#: ../addressbook/gui/component/addressbook-migrate.c:760
+#: ../addressbook/gui/component/addressbook-migrate.c:761
msgid "Autocompletion Settings"
msgstr "Autocompletion Settings"
-#: ../addressbook/gui/component/addressbook-migrate.c:1136
+#: ../addressbook/gui/component/addressbook-migrate.c:1137
msgid ""
"The location and hierarchy of the Evolution contact folders has changed "
"since Evolution 1.x.\n"
@@ -796,7 +821,7 @@ msgstr ""
"\n"
"Please be patient while Evolution migrates your folders..."
-#: ../addressbook/gui/component/addressbook-migrate.c:1150
+#: ../addressbook/gui/component/addressbook-migrate.c:1151
msgid ""
"The format of mailing list contacts has changed.\n"
"\n"
@@ -806,7 +831,7 @@ msgstr ""
"\n"
"Please be patient while Evolution migrates your folders..."
-#: ../addressbook/gui/component/addressbook-migrate.c:1159
+#: ../addressbook/gui/component/addressbook-migrate.c:1160
msgid ""
"The way Evolution stores some phone numbers has changed.\n"
"\n"
@@ -816,7 +841,7 @@ msgstr ""
"\n"
"Please be patient while Evolution migrates your folders..."
-#: ../addressbook/gui/component/addressbook-migrate.c:1169
+#: ../addressbook/gui/component/addressbook-migrate.c:1170
msgid ""
"Evolution's Palm Sync changelog and map files have changed.\n"
"\n"
@@ -826,53 +851,60 @@ msgstr ""
"\n"
"Please be patient while Evolution migrates your Pilot Sync data..."
-#: ../addressbook/gui/component/addressbook-view.c:425
-#: ../mail/em-folder-utils.c:501
+#: ../addressbook/gui/component/addressbook-view.c:422
+#: ../mail/em-folder-utils.c:448
#, c-format
msgid "Rename the \"%s\" folder to:"
msgstr "Rename the \"%s\" folder to:"
-#: ../addressbook/gui/component/addressbook-view.c:428
-#: ../mail/em-folder-utils.c:503
+#: ../addressbook/gui/component/addressbook-view.c:425
+#: ../mail/em-folder-utils.c:450
msgid "Rename Folder"
msgstr "Rename Folder"
-#: ../addressbook/gui/component/addressbook-view.c:433
-#: ../mail/em-folder-utils.c:509
+#: ../addressbook/gui/component/addressbook-view.c:430
+#: ../mail/em-folder-utils.c:456
msgid "Folder names cannot contain '/'"
msgstr "Folder names cannot contain '/'"
-#: ../addressbook/gui/component/addressbook-view.c:942
+#: ../addressbook/gui/component/addressbook-view.c:949
msgid "_New Address Book"
msgstr "_New Address Book"
-#: ../addressbook/gui/component/addressbook-view.c:943
+#: ../addressbook/gui/component/addressbook-view.c:950
msgid "Save As vCard..."
msgstr "Save As vCard..."
-#: ../addressbook/gui/component/addressbook-view.c:946
+#: ../addressbook/gui/component/addressbook-view.c:951
+#: ../calendar/gui/calendar-component.c:678
+#: ../calendar/gui/memos-component.c:509 ../calendar/gui/tasks-component.c:501
+#: ../mail/em-folder-tree.c:2132 ../ui/evolution-mail-list.xml.h:39
+msgid "_Rename..."
+msgstr "_Rename..."
+
+#: ../addressbook/gui/component/addressbook-view.c:954
#: ../addressbook/gui/widgets/e-addressbook-view.c:955
-#: ../calendar/gui/calendar-component.c:619
-#: ../calendar/gui/e-calendar-table.c:1596
-#: ../calendar/gui/e-calendar-view.c:1693 ../calendar/gui/e-memo-table.c:941
-#: ../calendar/gui/memos-component.c:468 ../calendar/gui/tasks-component.c:459
-#: ../mail/em-folder-tree.c:2111 ../mail/em-folder-view.c:1340
-#: ../ui/evolution-addressbook.xml.h:49 ../ui/evolution-calendar.xml.h:40
+#: ../calendar/gui/calendar-component.c:681
+#: ../calendar/gui/e-calendar-table.c:1620
+#: ../calendar/gui/e-calendar-view.c:1797 ../calendar/gui/e-memo-table.c:954
+#: ../calendar/gui/memos-component.c:512 ../calendar/gui/tasks-component.c:504
+#: ../mail/em-folder-tree.c:2129 ../mail/em-folder-view.c:1342
+#: ../ui/evolution-addressbook.xml.h:49 ../ui/evolution-calendar.xml.h:42
#: ../ui/evolution-mail-list.xml.h:35 ../ui/evolution-memos.xml.h:16
#: ../ui/evolution-tasks.xml.h:24
msgid "_Delete"
msgstr "_Delete"
-#: ../addressbook/gui/component/addressbook-view.c:949
-#: ../calendar/gui/calendar-component.c:622
-#: ../calendar/gui/dialogs/comp-editor.c:2035
-#: ../calendar/gui/memos-component.c:471 ../calendar/gui/tasks-component.c:462
-#: ../composer/e-msg-composer.c:1046 ../mail/em-folder-tree.c:2120
+#: ../addressbook/gui/component/addressbook-view.c:957
+#: ../calendar/gui/calendar-component.c:686
+#: ../calendar/gui/dialogs/comp-editor.c:2092
+#: ../calendar/gui/memos-component.c:517 ../calendar/gui/tasks-component.c:509
+#: ../composer/e-msg-composer.c:1040 ../mail/em-folder-tree.c:2138
#: ../ui/evolution-addressbook.xml.h:59 ../ui/evolution-mail-list.xml.h:38
msgid "_Properties"
msgstr "_Properties"
-#: ../addressbook/gui/component/addressbook-view.c:1337
+#: ../addressbook/gui/component/addressbook-view.c:1223
msgid "Contact Source Selector"
msgstr "Contact Source Selector"
@@ -893,8 +925,8 @@ msgstr "Enter password for %s (user %s)"
#: ../addressbook/gui/component/addressbook.c:222
#: ../calendar/common/authentication.c:51
-#: ../plugins/google-account-setup/google-source.c:444
-#: ../plugins/publish-calendar/publish-calendar.c:190
+#: ../plugins/google-account-setup/google-source.c:422
+#: ../plugins/publish-calendar/publish-calendar.c:191
#: ../smime/gui/component.c:49
msgid "Enter password"
msgstr "Enter password"
@@ -920,10 +952,14 @@ msgstr ""
"preview pane, in pixels."
#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:5
+msgid "Show autocompleted name with an address"
+msgstr "Show autocompleted name with an address"
+
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:6
msgid "Show preview pane"
msgstr "Show preview pane"
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:6
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:7
msgid ""
"The number of characters that must be typed before Evolution will attempt to "
"autocomplete."
@@ -931,23 +967,39 @@ msgstr ""
"The number of characters that must be typed before Evolution will attempt to "
"autocomplete."
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:7
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:8
msgid "URI for the folder last used in the select names dialog"
msgstr "URI for the folder last used in the select names dialogue"
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:8
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:9
msgid "URI for the folder last used in the select names dialog."
msgstr "URI for the folder last used in the select names dialogue."
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:9
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:70
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:10
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:80
msgid "Vertical pane position"
msgstr "Vertical pane position"
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:10
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:11
+msgid ""
+"Whether force showing the mail address with the name of the autocompleted "
+"contact in the entry."
+msgstr ""
+"Whether to force showing the mail address with the name of the autocompleted "
+"contact in the entry."
+
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:12
msgid "Whether to show the preview pane."
msgstr "Whether to show the preview pane."
+#: ../addressbook/gui/component/autocompletion-config.c:175
+msgid "Always _show address of the autocompleted contact"
+msgstr "Always _show address of the autocompleted contact"
+
+#: ../addressbook/gui/component/autocompletion-config.c:180
+msgid "Look up in address books"
+msgstr "Look up in address books"
+
#: ../addressbook/gui/component/ldap-config.glade.h:1
msgid "1"
msgstr "1"
@@ -989,7 +1041,7 @@ msgid "Add Address Book"
msgstr "Add Address Book"
#: ../addressbook/gui/component/ldap-config.glade.h:12
-#: ../mail/em-account-editor.c:761
+#: ../mail/em-account-editor.c:760
msgid "Always"
msgstr "Always"
@@ -1029,14 +1081,14 @@ msgid "Lo_gin:"
msgstr "Lo_gin:"
#: ../addressbook/gui/component/ldap-config.glade.h:24
-#: ../mail/em-account-editor.c:760
+#: ../mail/em-account-editor.c:759
msgid "Never"
msgstr "Never"
#. Translators: This string is a "Use secure connection" option for
#. the Mailer. It will not use an encrypted connection.
#: ../addressbook/gui/component/ldap-config.glade.h:25
-#: ../mail/em-account-editor.c:288
+#: ../mail/em-account-editor.c:287
msgid "No encryption"
msgstr "No encryption"
@@ -1048,7 +1100,7 @@ msgstr "One"
#. the Mailer. SSL (Secure Sockets Layer) is commonly known by this
#. abbreviation.
#: ../addressbook/gui/component/ldap-config.glade.h:27
-#: ../mail/em-account-editor.c:296
+#: ../mail/em-account-editor.c:295
msgid "SSL encryption"
msgstr "SSL encryption"
@@ -1115,7 +1167,7 @@ msgstr "Supported Search Bases"
#. the Mailer. TLS (Transport Layer Security) is commonly known by
#. this abbreviation.
#: ../addressbook/gui/component/ldap-config.glade.h:38
-#: ../mail/em-account-editor.c:292
+#: ../mail/em-account-editor.c:291
msgid "TLS encryption"
msgstr "TLS encryption"
@@ -1143,7 +1195,7 @@ msgstr ""
#: ../addressbook/gui/component/ldap-config.glade.h:41
msgid ""
-"This is the full name of your ldap server. For example, \"ldap.mycompany.com"
+"This is the full name of your LDAP server. For example, \"ldap.mycompany.com"
"\"."
msgstr ""
"This is the full name of your LDAP server. For example, \"ldap.mycompany.com"
@@ -1160,11 +1212,11 @@ msgstr ""
#: ../addressbook/gui/component/ldap-config.glade.h:43
msgid ""
"This is the method Evolution will use to authenticate you. Note that "
-"setting this to \"Email Address\" requires anonymous access to your ldap "
+"setting this to \"Email Address\" requires anonymous access to your LDAP "
"server."
msgstr ""
"This is the method Evolution will use to authenticate you. Note that "
-"setting this to \"E-mail Address\" requires anonymous access to your LDAP "
+"setting this to \"Email Address\" requires anonymous access to your LDAP "
"server."
#: ../addressbook/gui/component/ldap-config.glade.h:44
@@ -1215,7 +1267,7 @@ msgstr "_Login method:"
#: ../addressbook/gui/component/ldap-config.glade.h:53
#: ../calendar/gui/dialogs/calendar-setup.c:227
-#: ../mail/mail-config.glade.h:175
+#: ../mail/mail-config.glade.h:178
#: ../plugins/groupwise-features/properties.glade.h:11
#: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:2
msgid "_Name:"
@@ -1230,7 +1282,7 @@ msgid "_Search scope:"
msgstr "_Search scope:"
#: ../addressbook/gui/component/ldap-config.glade.h:56
-#: ../mail/mail-config.glade.h:184
+#: ../mail/mail-config.glade.h:187
#: ../plugins/publish-calendar/publish-calendar.glade.h:26
msgid "_Server:"
msgstr "_Server:"
@@ -1248,13 +1300,14 @@ msgid "cards"
msgstr "cards"
#: ../addressbook/gui/component/ldap-config.glade.h:60
-#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:8
+#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:10
#: ../calendar/gui/dialogs/alarm-dialog.glade.h:27
#: ../calendar/gui/dialogs/event-page.glade.h:20 ../filter/filter.glade.h:17
+#: ../plugins/caldav/caldav-source.c:430
#: ../plugins/calendar-http/calendar-http.c:279
-#: ../plugins/calendar-weather/calendar-weather.c:561
-#: ../plugins/google-account-setup/google-source.c:662
-#: ../plugins/google-account-setup/google-contacts-source.c:328
+#: ../plugins/calendar-weather/calendar-weather.c:524
+#: ../plugins/google-account-setup/google-source.c:652
+#: ../plugins/google-account-setup/google-contacts-source.c:366
msgid "minutes"
msgstr "minutes"
@@ -1295,8 +1348,8 @@ msgid "<b>Work</b>"
msgstr "<b>Work</b>"
#: ../addressbook/gui/contact-editor/contact-editor.glade.h:10
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:174
-#: ../addressbook/gui/widgets/eab-contact-display.c:614
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:176
+#: ../addressbook/gui/widgets/eab-contact-display.c:605
msgid "AIM"
msgstr "AIM"
@@ -1307,16 +1360,16 @@ msgid "Ca_tegories..."
msgstr "Ca_tegories..."
#: ../addressbook/gui/contact-editor/contact-editor.glade.h:12
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:263
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:266
#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1158
-#: ../addressbook/gui/widgets/e-minicard.c:198
+#: ../addressbook/gui/widgets/e-minicard.c:199
msgid "Contact"
msgstr "Contact"
#: ../addressbook/gui/contact-editor/contact-editor.glade.h:13
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:540
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:555
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2420
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:543
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:558
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2423
msgid "Contact Editor"
msgstr "Contact Editor"
@@ -1325,11 +1378,12 @@ msgid "Full _Name..."
msgstr "Full _Name..."
#: ../addressbook/gui/contact-editor/contact-editor.glade.h:15
+#: ../composer/e-msg-composer.c:2478
msgid "Image"
msgstr "Image"
#: ../addressbook/gui/contact-editor/contact-editor.glade.h:16
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:59
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:58
msgid "MSN Messenger"
msgstr "MSN Messenger"
@@ -1342,1251 +1396,1262 @@ msgid "Nic_kname:"
msgstr "Nic_kname:"
#: ../addressbook/gui/contact-editor/contact-editor.glade.h:19
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:55
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:54
+msgid "Novell GroupWise"
+msgstr "Novell GroupWise"
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:20
msgid "Novell Groupwise"
msgstr "Novell Groupwise"
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:21
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:22
msgid "Personal Information"
msgstr "Personal Information"
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:22
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:23
msgid "Telephone"
msgstr "Telephone"
#. red
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:23
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:230
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:192
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:24
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:268
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:195
#: ../addressbook/gui/widgets/eab-contact-display.c:57
-#: ../addressbook/gui/widgets/eab-contact-display.c:643
+#: ../addressbook/gui/widgets/eab-contact-display.c:635
#: ../mail/em-migrate.c:1057
msgid "Work"
msgstr "Work"
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:24
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:25
#: ../addressbook/gui/contact-editor/fulladdr.glade.h:5
msgid "_Address:"
msgstr "_Address:"
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:25
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:26
msgid "_Anniversary:"
msgstr "_Anniversary:"
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:26
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:27
msgid "_Assistant:"
msgstr "_Assistant:"
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:27
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:28
msgid "_Birthday:"
msgstr "_Birthday:"
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:28
-#: ../calendar/gui/dialogs/event-page.c:787
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:29
+#: ../calendar/gui/dialogs/event-page.c:792
#: ../calendar/gui/dialogs/event-page.glade.h:14
-#: ../plugins/itip-formatter/itip-view.c:1850
+#: ../plugins/itip-formatter/itip-view.c:1910
msgid "_Calendar:"
msgstr "_Calendar:"
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:29
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:30
msgid "_City:"
msgstr "_City:"
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:30
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:31
msgid "_Company:"
msgstr "_Company:"
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:31
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:32
msgid "_Country:"
msgstr "_Country:"
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:32
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:33
msgid "_Department:"
msgstr "_Department:"
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:33
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:34
msgid "_File under:"
msgstr "_File under:"
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:34
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:35
msgid "_Free/Busy:"
msgstr "_Free/Busy:"
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:35
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:36
msgid "_Home Page:"
msgstr "_Home Page:"
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:36
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:37
msgid "_Manager:"
msgstr "_Manager:"
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:37
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:38
msgid "_Notes:"
msgstr "_Notes:"
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:38
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:39
msgid "_Office:"
msgstr "_Office:"
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:39
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:40
#: ../addressbook/gui/contact-editor/fulladdr.glade.h:6
msgid "_PO Box:"
msgstr "_PO Box:"
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:40
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:41
msgid "_Profession:"
msgstr "_Profession:"
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:41
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:42
msgid "_Spouse:"
msgstr "_Spouse:"
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:42
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:43
#: ../addressbook/gui/contact-editor/fulladdr.glade.h:7
msgid "_State/Province:"
msgstr "_State/Province/County:"
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:43
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:44
#: ../addressbook/gui/contact-editor/fullname.glade.h:17
msgid "_Title:"
msgstr "_Title:"
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:44
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:45
msgid "_Video Chat:"
msgstr "_Video Chat:"
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:45
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:46
msgid "_Wants to receive HTML mail"
msgstr "_Wants to receive HTML mail"
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:46
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:47
msgid "_Web Log:"
msgstr "_Web Log:"
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:47
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:48
#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
msgid "_Where:"
msgstr "_Where:"
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:48
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:49
msgid "_Zip/Postal Code:"
msgstr "_Zip/Postal Code:"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:92
-#: ../addressbook/gui/widgets/eab-contact-display.c:640
-#: ../addressbook/gui/widgets/eab-contact-display.c:655
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:91
+#: ../addressbook/gui/widgets/eab-contact-display.c:632
+#: ../addressbook/gui/widgets/eab-contact-display.c:647
msgid "Address"
msgstr "Address"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:99
-#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:92
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:135
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:291
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:98
+#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:91
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:173
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:294
#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1178
-#: ../addressbook/gui/widgets/e-addressbook-model.c:312
+#: ../addressbook/gui/widgets/e-addressbook-model.c:325
#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:419
-#: ../addressbook/gui/widgets/e-minicard-label.c:164
+#: ../addressbook/gui/widgets/e-minicard-label.c:165
#: ../addressbook/gui/widgets/e-minicard-view-widget.c:131
#: ../addressbook/gui/widgets/e-minicard-view.c:545
-#: ../addressbook/gui/widgets/e-minicard.c:191
+#: ../addressbook/gui/widgets/e-minicard.c:192
#: ../widgets/menus/gal-define-views-model.c:178
-#: ../widgets/table/e-cell-text.c:1836 ../widgets/text/e-text.c:3687
-#: ../widgets/text/e-text.c:3688
+#: ../widgets/table/e-cell-text.c:1822 ../widgets/text/e-text.c:3685
+#: ../widgets/text/e-text.c:3686
msgid "Editable"
msgstr "Editable"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:132
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:131
msgid "United States"
msgstr "United States"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:133
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:132
msgid "Afghanistan"
msgstr "Afghanistan"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:134
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:133
msgid "Albania"
msgstr "Albania"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:135
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:134
msgid "Algeria"
msgstr "Algeria"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:136
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:135
msgid "American Samoa"
msgstr "American Samoa"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:137
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:136
msgid "Andorra"
msgstr "Andorra"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:138
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:137
msgid "Angola"
msgstr "Angola"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:139
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:138
msgid "Anguilla"
msgstr "Anguilla"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:140
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:139
msgid "Antarctica"
msgstr "Antarctica"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:141
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:140
msgid "Antigua And Barbuda"
msgstr "Antigua And Barbuda"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:142
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:141
msgid "Argentina"
msgstr "Argentina"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:143
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:142
msgid "Armenia"
msgstr "Armenia"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:144
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:143
msgid "Aruba"
msgstr "Aruba"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:145
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:144
msgid "Australia"
msgstr "Australia"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:146
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:145
msgid "Austria"
msgstr "Austria"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:147
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:146
msgid "Azerbaijan"
msgstr "Azerbaijan"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:148
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:147
msgid "Bahamas"
msgstr "Bahamas"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:149
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:148
msgid "Bahrain"
msgstr "Bahrain"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:150
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:149
msgid "Bangladesh"
msgstr "Bangladesh"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:151
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:150
msgid "Barbados"
msgstr "Barbados"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:152
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:151
msgid "Belarus"
msgstr "Belarus"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:153
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:152
msgid "Belgium"
msgstr "Belgium"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:154
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:153
msgid "Belize"
msgstr "Belize"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:155
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:154
msgid "Benin"
msgstr "Benin"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:156
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:155
msgid "Bermuda"
msgstr "Bermuda"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:157
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:156
msgid "Bhutan"
msgstr "Bhutan"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:158
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:157
msgid "Bolivia"
msgstr "Bolivia"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:159
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:158
msgid "Bosnia And Herzegowina"
msgstr "Bosnia And Herzegowina"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:160
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:159
msgid "Botswana"
msgstr "Botswana"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:161
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:160
msgid "Bouvet Island"
msgstr "Bouvet Island"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:162
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:161
msgid "Brazil"
msgstr "Brazil"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:163
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:162
msgid "British Indian Ocean Territory"
msgstr "British Indian Ocean Territory"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:164
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:163
msgid "Brunei Darussalam"
msgstr "Brunei Darussalam"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:165
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:164
msgid "Bulgaria"
msgstr "Bulgaria"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:166
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:165
msgid "Burkina Faso"
msgstr "Burkina Faso"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:167
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:166
msgid "Burundi"
msgstr "Burundi"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:168
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:167
msgid "Cambodia"
msgstr "Cambodia"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:169
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:168
msgid "Cameroon"
msgstr "Cameroon"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:170
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:169
msgid "Canada"
msgstr "Canada"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:171
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:170
msgid "Cape Verde"
msgstr "Cape Verde"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:172
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:171
msgid "Cayman Islands"
msgstr "Cayman Islands"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:173
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:172
msgid "Central African Republic"
msgstr "Central African Republic"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:174
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:173
msgid "Chad"
msgstr "Chad"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:175
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:174
msgid "Chile"
msgstr "Chile"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:176
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:175
msgid "China"
msgstr "China"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:177
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:176
msgid "Christmas Island"
msgstr "Christmas Island"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:178
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:177
msgid "Cocos (Keeling) Islands"
msgstr "Cocos (Keeling) Islands"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:179
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:178
msgid "Colombia"
msgstr "Colombia"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:180
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:179
msgid "Comoros"
msgstr "Comoros"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:181
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:180
msgid "Congo"
msgstr "Congo"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:182
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:181
msgid "Congo, The Democratic Republic Of The"
msgstr "Congo, The Democratic Republic Of The"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:183
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:182
msgid "Cook Islands"
msgstr "Cook Islands"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:184
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:183
msgid "Costa Rica"
msgstr "Costa Rica"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:185
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:184
msgid "Cote d'Ivoire"
msgstr "Cote d'Ivoire"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:186
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:185
msgid "Croatia"
msgstr "Croatia"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:187
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:186
msgid "Cuba"
msgstr "Cuba"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:188
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:187
msgid "Cyprus"
msgstr "Cyprus"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:189
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:188
msgid "Czech Republic"
msgstr "Czech Republic"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:190
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:189
msgid "Denmark"
msgstr "Denmark"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:191
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:190
msgid "Djibouti"
msgstr "Djibouti"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:192
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:191
msgid "Dominica"
msgstr "Dominica"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:193
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:192
msgid "Dominican Republic"
msgstr "Dominican Republic"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:194
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:193
msgid "Ecuador"
msgstr "Ecuador"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:195
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:194
msgid "Egypt"
msgstr "Egypt"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:196
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:195
msgid "El Salvador"
msgstr "El Salvador"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:197
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:196
msgid "Equatorial Guinea"
msgstr "Equatorial Guinea"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:198
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:197
msgid "Eritrea"
msgstr "Eritrea"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:199
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:198
msgid "Estonia"
msgstr "Estonia"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:200
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:199
msgid "Ethiopia"
msgstr "Ethiopia"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:201
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:200
msgid "Falkland Islands"
msgstr "Falkland Islands"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:202
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:201
msgid "Faroe Islands"
msgstr "Faroe Islands"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:203
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:202
msgid "Fiji"
msgstr "Fiji"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:204
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:203
msgid "Finland"
msgstr "Finland"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:205
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:204
msgid "France"
msgstr "France"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:206
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:205
msgid "French Guiana"
msgstr "French Guiana"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:207
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:206
msgid "French Polynesia"
msgstr "French Polynesia"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:208
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:207
msgid "French Southern Territories"
msgstr "French Southern Territories"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:209
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:208
msgid "Gabon"
msgstr "Gabon"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:210
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:209
msgid "Gambia"
msgstr "Gambia"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:211
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:210
msgid "Georgia"
msgstr "Georgia"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:212
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:211
msgid "Germany"
msgstr "Germany"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:213
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:212
msgid "Ghana"
msgstr "Ghana"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:214
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:213
msgid "Gibraltar"
msgstr "Gibraltar"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:215
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:214
msgid "Greece"
msgstr "Greece"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:216
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:215
msgid "Greenland"
msgstr "Greenland"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:217
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:216
msgid "Grenada"
msgstr "Grenada"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:218
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:217
msgid "Guadeloupe"
msgstr "Guadeloupe"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:219
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:218
msgid "Guam"
msgstr "Guam"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:220
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:219
msgid "Guatemala"
msgstr "Guatemala"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:221
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:220
msgid "Guernsey"
msgstr "Guernsey"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:222
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:221
msgid "Guinea"
msgstr "Guinea"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:223
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:222
msgid "Guinea-Bissau"
msgstr "Guinea-Bissau"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:224
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:223
msgid "Guyana"
msgstr "Guyana"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:225
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:224
msgid "Haiti"
msgstr "Haiti"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:226
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:225
msgid "Heard And McDonald Islands"
msgstr "Heard And McDonald Islands"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:227
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:226
msgid "Holy See"
msgstr "Holy See"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:228
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:227
msgid "Honduras"
msgstr "Honduras"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:229
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:228
msgid "Hong Kong"
msgstr "Hong Kong"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:230
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:229
msgid "Hungary"
msgstr "Hungary"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:231
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:230
msgid "Iceland"
msgstr "Iceland"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:232
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:231
msgid "India"
msgstr "India"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:233
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:232
msgid "Indonesia"
msgstr "Indonesia"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:234
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:233
msgid "Iran"
msgstr "Iran"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:235
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:234
msgid "Iraq"
msgstr "Iraq"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:236
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:235
msgid "Ireland"
msgstr "Ireland"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:237
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:236
msgid "Isle of Man"
msgstr "Isle of Man"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:238
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:237
msgid "Israel"
msgstr "Israel"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:239
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:238
msgid "Italy"
msgstr "Italy"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:240
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:239
msgid "Jamaica"
msgstr "Jamaica"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:241
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:240
msgid "Japan"
msgstr "Japan"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:242
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:241
msgid "Jersey"
msgstr "Jersey"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:243
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:242
msgid "Jordan"
msgstr "Jordan"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:244
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:243
msgid "Kazakhstan"
msgstr "Kazakhstan"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:245
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:244
msgid "Kenya"
msgstr "Kenya"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:246
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:245
msgid "Kiribati"
msgstr "Kiribati"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:247
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:246
msgid "Korea, Democratic People's Republic Of"
msgstr "Korea, Democratic People's Republic Of"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:248
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:247
msgid "Korea, Republic Of"
msgstr "Korea, Republic Of"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:249
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:248
msgid "Kuwait"
msgstr "Kuwait"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:250
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:249
msgid "Kyrgyzstan"
msgstr "Kyrgyzstan"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:251
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:250
msgid "Laos"
msgstr "Laos"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:252
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:251
msgid "Latvia"
msgstr "Latvia"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:253
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:252
msgid "Lebanon"
msgstr "Lebanon"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:254
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:253
msgid "Lesotho"
msgstr "Lesotho"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:255
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:254
msgid "Liberia"
msgstr "Liberia"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:256
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:255
msgid "Libya"
msgstr "Libya"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:257
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:256
msgid "Liechtenstein"
msgstr "Liechtenstein"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:258
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:257
msgid "Lithuania"
msgstr "Lithuania"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:259
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:258
msgid "Luxembourg"
msgstr "Luxembourg"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:260
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:259
msgid "Macao"
msgstr "Macao"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:261
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:260
msgid "Macedonia"
msgstr "Macedonia"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:262
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:261
msgid "Madagascar"
msgstr "Madagascar"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:263
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:262
msgid "Malawi"
msgstr "Malawi"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:264
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:263
msgid "Malaysia"
msgstr "Malaysia"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:265
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:264
msgid "Maldives"
msgstr "Maldives"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:266
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:265
msgid "Mali"
msgstr "Mali"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:267
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:266
msgid "Malta"
msgstr "Malta"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:268
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:267
msgid "Marshall Islands"
msgstr "Marshall Islands"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:269
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:268
msgid "Martinique"
msgstr "Martinique"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:270
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:269
msgid "Mauritania"
msgstr "Mauritania"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:271
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:270
msgid "Mauritius"
msgstr "Mauritius"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:272
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:271
msgid "Mayotte"
msgstr "Mayotte"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:273
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:272
msgid "Mexico"
msgstr "Mexico"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:274
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:273
msgid "Micronesia"
msgstr "Micronesia"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:275
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:274
msgid "Moldova, Republic Of"
msgstr "Moldova, Republic Of"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:276
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:275
msgid "Monaco"
msgstr "Monaco"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:277
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:276
msgid "Mongolia"
msgstr "Mongolia"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:278
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:277
msgid "Montserrat"
msgstr "Montserrat"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:279
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:278
msgid "Morocco"
msgstr "Morocco"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:280
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:279
msgid "Mozambique"
msgstr "Mozambique"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:281
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:280
msgid "Myanmar"
msgstr "Myanmar"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:282
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:281
msgid "Namibia"
msgstr "Namibia"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:283
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:282
msgid "Nauru"
msgstr "Nauru"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:284
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:283
msgid "Nepal"
msgstr "Nepal"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:285
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:284
msgid "Netherlands"
msgstr "Netherlands"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:286
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:285
msgid "Netherlands Antilles"
msgstr "Netherlands Antilles"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:287
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:286
msgid "New Caledonia"
msgstr "New Caledonia"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:288
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:287
msgid "New Zealand"
msgstr "New Zealand"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:289
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:288
msgid "Nicaragua"
msgstr "Nicaragua"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:290
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:289
msgid "Niger"
msgstr "Niger"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:291
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:290
msgid "Nigeria"
msgstr "Nigeria"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:292
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:291
msgid "Niue"
msgstr "Niue"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:293
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:292
msgid "Norfolk Island"
msgstr "Norfolk Island"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:294
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:293
msgid "Northern Mariana Islands"
msgstr "Northern Mariana Islands"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:295
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:294
msgid "Norway"
msgstr "Norway"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:296
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:295
msgid "Oman"
msgstr "Oman"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:297
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:296
msgid "Pakistan"
msgstr "Pakistan"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:298
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:297
msgid "Palau"
msgstr "Palau"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:299
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:298
msgid "Palestinian Territory"
msgstr "Palestinian Territory"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:300
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:299
msgid "Panama"
msgstr "Panama"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:301
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:300
msgid "Papua New Guinea"
msgstr "Papua New Guinea"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:302
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:301
msgid "Paraguay"
msgstr "Paraguay"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:303
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:302
msgid "Peru"
msgstr "Peru"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:304
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:303
msgid "Philippines"
msgstr "Philippines"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:305
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:304
msgid "Pitcairn"
msgstr "Pitcairn"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:306
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:305
msgid "Poland"
msgstr "Poland"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:307
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:306
msgid "Portugal"
msgstr "Portugal"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:308
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:307
msgid "Puerto Rico"
msgstr "Puerto Rico"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:309
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:308
msgid "Qatar"
msgstr "Qatar"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:310
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:309
msgid "Reunion"
msgstr "Reunion"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:311
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:310
msgid "Romania"
msgstr "Romania"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:312
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:311
msgid "Russian Federation"
msgstr "Russian Federation"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:313
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:312
msgid "Rwanda"
msgstr "Rwanda"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:314
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:313
msgid "Saint Kitts And Nevis"
msgstr "Saint Kitts And Nevis"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:315
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:314
msgid "Saint Lucia"
msgstr "Saint Lucia"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:316
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:315
msgid "Saint Vincent And The Grenadines"
msgstr "Saint Vincent And The Grenadines"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:317
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:316
msgid "Samoa"
msgstr "Samoa"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:318
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:317
msgid "San Marino"
msgstr "San Marino"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:319
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:318
msgid "Sao Tome And Principe"
msgstr "Sao Tome And Principe"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:320
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:319
msgid "Saudi Arabia"
msgstr "Saudi Arabia"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:321
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:320
msgid "Senegal"
msgstr "Senegal"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:322
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:321
msgid "Serbia And Montenegro"
msgstr "Serbia And Montenegro"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:323
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:322
msgid "Seychelles"
msgstr "Seychelles"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:324
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:323
msgid "Sierra Leone"
msgstr "Sierra Leone"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:325
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:324
msgid "Singapore"
msgstr "Singapore"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:326
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:325
msgid "Slovakia"
msgstr "Slovakia"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:327
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:326
msgid "Slovenia"
msgstr "Slovenia"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:328
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:327
msgid "Solomon Islands"
msgstr "Solomon Islands"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:329
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:328
msgid "Somalia"
msgstr "Somalia"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:330
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:329
msgid "South Africa"
msgstr "South Africa"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:331
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:330
msgid "South Georgia And The South Sandwich Islands"
msgstr "South Georgia And The South Sandwich Islands"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:332
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:331
msgid "Spain"
msgstr "Spain"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:333
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:332
msgid "Sri Lanka"
msgstr "Sri Lanka"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:334
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:333
msgid "St. Helena"
msgstr "St. Helena"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:335
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:334
msgid "St. Pierre And Miquelon"
msgstr "St. Pierre And Miquelon"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:336
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:335
msgid "Sudan"
msgstr "Sudan"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:337
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:336
msgid "Suriname"
msgstr "Suriname"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:338
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:337
msgid "Svalbard And Jan Mayen Islands"
msgstr "Svalbard And Jan Mayen Islands"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:339
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:338
msgid "Swaziland"
msgstr "Swaziland"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:340
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:339
msgid "Sweden"
msgstr "Sweden"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:341
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:340
msgid "Switzerland"
msgstr "Switzerland"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:342
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:341
msgid "Syria"
msgstr "Syria"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:343
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:342
msgid "Taiwan"
msgstr "Taiwan"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:344
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:343
msgid "Tajikistan"
msgstr "Tajikistan"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:345
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:344
msgid "Tanzania, United Republic Of"
msgstr "Tanzania, United Republic Of"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:346
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:345
msgid "Thailand"
msgstr "Thailand"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:347
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:346
msgid "Timor-Leste"
msgstr "Timor-Leste"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:348
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:347
msgid "Togo"
msgstr "Togo"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:349
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:348
msgid "Tokelau"
msgstr "Tokelau"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:350
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:349
msgid "Tonga"
msgstr "Tonga"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:351
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:350
msgid "Trinidad And Tobago"
msgstr "Trinidad And Tobago"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:352
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:351
msgid "Tunisia"
msgstr "Tunisia"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:353
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:352
msgid "Turkey"
msgstr "Turkey"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:354
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:353
msgid "Turkmenistan"
msgstr "Turkmenistan"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:355
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:354
msgid "Turks And Caicos Islands"
msgstr "Turks And Caicos Islands"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:356
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:355
msgid "Tuvalu"
msgstr "Tuvalu"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:357
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:356
msgid "Uganda"
msgstr "Uganda"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:358
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:357
msgid "Ukraine"
msgstr "Ukraine"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:359
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:358
msgid "United Arab Emirates"
msgstr "United Arab Emirates"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:360
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:359
msgid "United Kingdom"
msgstr "United Kingdom"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:361
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:360
msgid "United States Minor Outlying Islands"
msgstr "United States Minor Outlying Islands"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:362
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:361
msgid "Uruguay"
msgstr "Uruguay"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:363
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:362
msgid "Uzbekistan"
msgstr "Uzbekistan"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:364
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:363
msgid "Vanuatu"
msgstr "Vanuatu"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:365
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:364
msgid "Venezuela"
msgstr "Venezuela"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:366
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:365
msgid "Viet Nam"
msgstr "Viet Nam"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:367
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:366
msgid "Virgin Islands, British"
msgstr "Virgin Islands, British"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:368
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:367
msgid "Virgin Islands, U.S."
msgstr "Virgin Islands, U.S."
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:369
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:368
msgid "Wallis And Futuna Islands"
msgstr "Wallis And Futuna Islands"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:370
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:369
msgid "Western Sahara"
msgstr "Western Sahara"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:371
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:370
msgid "Yemen"
msgstr "Yemen"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:372
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:371
msgid "Zambia"
msgstr "Zambia"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:373
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:372
msgid "Zimbabwe"
msgstr "Zimbabwe"
-#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:86
-#: ../mail/em-mailer-prefs.c:466
+#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:85
+#: ../mail/em-mailer-prefs.c:467
#: ../plugins/exchange-operations/exchange-delegates.c:954
#: ../plugins/exchange-operations/exchange-permissions-dialog.c:711
#: ../plugins/plugin-manager/plugin-manager.c:57
-#: ../plugins/save-attachments/save-attachments.c:350
+#: ../plugins/save-attachments/save-attachments.c:351
#: ../widgets/menus/gal-define-views-dialog.c:346
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:91
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:90
#: ../widgets/menus/gal-view-new-dialog.c:63
msgid "Name"
msgstr "Name"
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:54
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:53
msgid "AOL Instant Messenger"
msgstr "AOL Instant Messenger"
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:56
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:175
-#: ../addressbook/gui/widgets/eab-contact-display.c:617
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:55
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:177
+#: ../addressbook/gui/widgets/eab-contact-display.c:608
msgid "Jabber"
msgstr "Jabber"
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:57
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:56
msgid "Yahoo Messenger"
msgstr "Yahoo Messenger"
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:58
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:57
msgid "Gadu-Gadu Messenger"
msgstr "Gadu-Gadu Messenger"
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:60
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:179
-#: ../addressbook/gui/widgets/eab-contact-display.c:616
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:59
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:181
+#: ../addressbook/gui/widgets/eab-contact-display.c:607
msgid "ICQ"
msgstr "ICQ"
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:112
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:60
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:183
+#: ../addressbook/gui/widgets/eab-contact-display.c:612
+msgid "Skype"
+msgstr "Skype"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:150
msgid "Service"
msgstr "Service"
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:121
-#: ../calendar/gui/caltypes.xml.h:25
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:159
+#: ../calendar/gui/caltypes.xml.h:12
#: ../calendar/gui/e-cal-list-view.etspec.h:3 ../mail/message-list.etspec.h:9
-#: ../plugins/publish-calendar/publish-calendar.c:693
-#: ../plugins/save-calendar/csv-format.c:375
+#: ../plugins/publish-calendar/publish-calendar.c:694
+#: ../plugins/save-calendar/csv-format.c:376
msgid "Location"
msgstr "Location"
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:128
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:166
msgid "Username"
msgstr "Username"
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:226
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:193
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:264
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:196
#: ../addressbook/gui/widgets/eab-contact-display.c:58
msgid "Home"
msgstr "Home"
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:234
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:194
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:272
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:197
#: ../addressbook/gui/widgets/eab-contact-display.c:59
-#: ../addressbook/gui/widgets/eab-contact-display.c:528
+#: ../addressbook/gui/widgets/eab-contact-display.c:519
+#: ../calendar/gui/e-calendar-view.c:2259
msgid "Other"
msgstr "Other"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:176
-#: ../addressbook/gui/widgets/eab-contact-display.c:619
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:178
+#: ../addressbook/gui/widgets/eab-contact-display.c:610
msgid "Yahoo"
msgstr "Yahoo"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:177
-#: ../addressbook/gui/widgets/eab-contact-display.c:620
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:179
+#: ../addressbook/gui/widgets/eab-contact-display.c:611
msgid "Gadu-Gadu"
msgstr "Gadu-Gadu"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:178
-#: ../addressbook/gui/widgets/eab-contact-display.c:618
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:180
+#: ../addressbook/gui/widgets/eab-contact-display.c:609
msgid "MSN"
msgstr "MSN"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:180
-#: ../addressbook/gui/widgets/eab-contact-display.c:615
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:182
+#: ../addressbook/gui/widgets/eab-contact-display.c:606
msgid "GroupWise"
msgstr "GroupWise"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:249
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:252
msgid "Source Book"
msgstr "Source Book"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:256
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:259
msgid "Target Book"
msgstr "Target Book"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:270
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:273
msgid "Is New Contact"
msgstr "Is New Contact"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:277
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:280
msgid "Writable Fields"
msgstr "Writable Fields"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:284
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:287
msgid "Required Fields"
msgstr "Required Fields"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:298
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:301
msgid "Changed"
msgstr "Changed"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:550
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2415
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:553
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2418
#, c-format
msgid "Contact Editor - %s"
msgstr "Contact Editor - %s"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2811
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2814
msgid "Please select an image for this contact"
msgstr "Please select an image for this contact"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2812
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2815
msgid "_No image"
msgstr "_No image"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3085
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3089
msgid ""
"The contact data is invalid:\n"
"\n"
@@ -2594,47 +2659,47 @@ msgstr ""
"The contact data is invalid:\n"
"\n"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3089
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3093
#, c-format
msgid "'%s' has an invalid format"
msgstr "'%s' has an invalid format"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3096
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3100
#, c-format
msgid "%s'%s' has an invalid format"
msgstr "%s'%s' has an invalid format"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3111
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3122
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3115
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3126
#, c-format
msgid "%s'%s' is empty"
msgstr "%s'%s' is empty"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3137
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3141
msgid "Invalid contact."
msgstr "Invalid contact."
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:329
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:324
msgid "Contact Quick-Add"
msgstr "Contact Quick-Add"
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:332
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:327
msgid "_Edit Full"
msgstr "_Edit Full"
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:406
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:401
msgid "_Full name"
msgstr "_Full name"
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:417
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:412
msgid "E_mail"
msgstr "E_mail"
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:428
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:423
msgid "_Select Address Book"
msgstr "_Select Address Book"
-#: ../addressbook/gui/contact-editor/eab-editor.c:321
+#: ../addressbook/gui/contact-editor/eab-editor.c:323
#, c-format
msgid ""
"Are you sure you want\n"
@@ -2643,7 +2708,7 @@ msgstr ""
"Are you sure you want\n"
"to delete contact list (%s)?"
-#: ../addressbook/gui/contact-editor/eab-editor.c:324
+#: ../addressbook/gui/contact-editor/eab-editor.c:326
msgid ""
"Are you sure you want\n"
"to delete these contact lists?"
@@ -2651,7 +2716,7 @@ msgstr ""
"Are you sure you want\n"
"to delete these contact lists?"
-#: ../addressbook/gui/contact-editor/eab-editor.c:329
+#: ../addressbook/gui/contact-editor/eab-editor.c:331
#, c-format
msgid ""
"Are you sure you want\n"
@@ -2660,7 +2725,7 @@ msgstr ""
"Are you sure you want\n"
"to delete contact (%s)?"
-#: ../addressbook/gui/contact-editor/eab-editor.c:332
+#: ../addressbook/gui/contact-editor/eab-editor.c:334
msgid ""
"Are you sure you want\n"
"to delete these contacts?"
@@ -2767,9 +2832,9 @@ msgstr "_IM Service:"
#: ../addressbook/gui/contact-editor/im.glade.h:4
#: ../calendar/gui/dialogs/event-page.glade.h:16
-#: ../plugins/calendar-weather/calendar-weather.c:409
-#: ../plugins/exchange-operations/exchange-calendar.c:243
-#: ../plugins/exchange-operations/exchange-contacts.c:234
+#: ../plugins/calendar-weather/calendar-weather.c:372
+#: ../plugins/exchange-operations/exchange-calendar.c:247
+#: ../plugins/exchange-operations/exchange-contacts.c:239
msgid "_Location:"
msgstr "_Location:"
@@ -2783,6 +2848,9 @@ msgid "Contact List Editor"
msgstr "Contact List Editor"
#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:220
+#: ../calendar/gui/e-day-view-time-item.c:815
+#: ../calendar/gui/e-timezone-entry.c:121
msgid "Select..."
msgstr "Select..."
@@ -2808,9 +2876,9 @@ msgid "_Members"
msgstr "_Members"
#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1148
-#: ../addressbook/gui/widgets/e-addressbook-model.c:298
+#: ../addressbook/gui/widgets/e-addressbook-model.c:311
#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:405
-#: ../addressbook/gui/widgets/e-addressbook-view.c:212
+#: ../addressbook/gui/widgets/e-addressbook-view.c:211
#: ../addressbook/gui/widgets/e-minicard-view-widget.c:117
#: ../addressbook/gui/widgets/e-minicard-view.c:531
msgid "Book"
@@ -2868,23 +2936,23 @@ msgstr "Merge Contact"
#: ../addressbook/gui/merging/eab-contact-merging.c:267
#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:11
-#: ../addressbook/gui/widgets/eab-contact-display.c:592
-#: ../addressbook/gui/widgets/eab-contact-display.c:597
-#: ../addressbook/gui/widgets/eab-contact-display.c:600
-#: ../addressbook/gui/widgets/eab-contact-display.c:879
-#: ../plugins/groupwise-features/junk-settings.c:415 ../smime/lib/e-cert.c:827
+#: ../addressbook/gui/widgets/eab-contact-display.c:583
+#: ../addressbook/gui/widgets/eab-contact-display.c:588
+#: ../addressbook/gui/widgets/eab-contact-display.c:591
+#: ../addressbook/gui/widgets/eab-contact-display.c:871
+#: ../plugins/groupwise-features/junk-settings.c:416 ../smime/lib/e-cert.c:810
msgid "Email"
msgstr "E-mail"
#: ../addressbook/gui/widgets/addresstypes.xml.h:1
-#: ../addressbook/gui/widgets/e-addressbook-view.c:161
-#: ../calendar/gui/cal-search-bar.c:76 ../calendar/gui/caltypes.xml.h:3
-#: ../calendar/gui/memotypes.xml.h:3 ../calendar/gui/tasktypes.xml.h:5
+#: ../addressbook/gui/widgets/e-addressbook-view.c:160
+#: ../calendar/gui/cal-search-bar.c:80 ../calendar/gui/caltypes.xml.h:2
+#: ../calendar/gui/memotypes.xml.h:2 ../calendar/gui/tasktypes.xml.h:4
msgid "Any field contains"
msgstr "Any field contains"
#: ../addressbook/gui/widgets/addresstypes.xml.h:2
-#: ../addressbook/gui/widgets/e-addressbook-view.c:160
+#: ../addressbook/gui/widgets/e-addressbook-view.c:159
msgid "Email begins with"
msgstr "E-mail begins with"
@@ -2892,35 +2960,35 @@ msgstr "E-mail begins with"
msgid "Name contains"
msgstr "Name contains"
-#: ../addressbook/gui/widgets/e-addressbook-model.c:150
+#: ../addressbook/gui/widgets/e-addressbook-model.c:163
msgid "No contacts"
msgstr "No contacts"
-#: ../addressbook/gui/widgets/e-addressbook-model.c:153
+#: ../addressbook/gui/widgets/e-addressbook-model.c:166
#, c-format
msgid "%d contact"
msgid_plural "%d contacts"
msgstr[0] "%d contact"
msgstr[1] "%d contacts"
-#: ../addressbook/gui/widgets/e-addressbook-model.c:305
+#: ../addressbook/gui/widgets/e-addressbook-model.c:318
#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:412
-#: ../addressbook/gui/widgets/e-addressbook-view.c:226
+#: ../addressbook/gui/widgets/e-addressbook-view.c:225
#: ../addressbook/gui/widgets/e-minicard-view-widget.c:124
#: ../addressbook/gui/widgets/e-minicard-view.c:538
msgid "Query"
msgstr "Query"
-#: ../addressbook/gui/widgets/e-addressbook-model.c:448
+#: ../addressbook/gui/widgets/e-addressbook-model.c:461
msgid "Error getting book view"
msgstr "Error getting book view"
#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:426
#: ../widgets/table/e-table-click-to-add.c:509
#: ../widgets/table/e-table-selection-model.c:302
-#: ../widgets/table/e-table.c:3353
-#: ../widgets/table/e-tree-selection-model.c:821 ../widgets/text/e-text.c:3551
-#: ../widgets/text/e-text.c:3552
+#: ../widgets/table/e-table.c:3352
+#: ../widgets/table/e-tree-selection-model.c:820 ../widgets/text/e-text.c:3549
+#: ../widgets/text/e-text.c:3550
msgid "Model"
msgstr "Model"
@@ -2928,31 +2996,31 @@ msgstr "Model"
msgid "Error modifying card"
msgstr "Error modifying card"
-#: ../addressbook/gui/widgets/e-addressbook-view.c:159
+#: ../addressbook/gui/widgets/e-addressbook-view.c:158
msgid "Name begins with"
msgstr "Name begins with"
-#: ../addressbook/gui/widgets/e-addressbook-view.c:219
+#: ../addressbook/gui/widgets/e-addressbook-view.c:218
msgid "Source"
msgstr "Source"
-#: ../addressbook/gui/widgets/e-addressbook-view.c:233
+#: ../addressbook/gui/widgets/e-addressbook-view.c:232
#: ../calendar/gui/e-calendar-table.etspec.h:12
-#: ../calendar/gui/e-meeting-list-view.c:508
+#: ../calendar/gui/e-meeting-list-view.c:565
#: ../calendar/gui/e-meeting-time-sel.etspec.h:11
#: ../calendar/gui/e-memo-table.etspec.h:5
msgid "Type"
msgstr "Type"
#: ../addressbook/gui/widgets/e-addressbook-view.c:812
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1953
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1965
msgid "Save as vCard..."
msgstr "Save as vCard..."
#: ../addressbook/gui/widgets/e-addressbook-view.c:933
-#: ../calendar/gui/dialogs/comp-editor.c:2033
-#: ../calendar/gui/e-calendar-table.c:1574
-#: ../calendar/gui/e-calendar-view.c:1671 ../calendar/gui/e-memo-table.c:924
+#: ../calendar/gui/dialogs/comp-editor.c:2090
+#: ../calendar/gui/e-calendar-table.c:1598
+#: ../calendar/gui/e-calendar-view.c:1775 ../calendar/gui/e-memo-table.c:937
#: ../ui/evolution-addressbook.xml.h:56
msgid "_Open"
msgstr "_Open"
@@ -3006,12 +3074,12 @@ msgid "Cu_t"
msgstr "Cu_t"
#: ../addressbook/gui/widgets/e-addressbook-view.c:953
-#: ../calendar/gui/dialogs/comp-editor.c:480
-#: ../calendar/gui/e-calendar-table.c:1582
-#: ../calendar/gui/e-calendar-view.c:1678 ../calendar/gui/e-memo-table.c:932
-#: ../composer/e-msg-composer.c:2057 ../mail/em-folder-tree.c:1005
-#: ../mail/em-folder-view.c:1325 ../mail/message-list.c:2044
-#: ../ui/evolution-addressbook.xml.h:46 ../ui/evolution-calendar.xml.h:39
+#: ../calendar/gui/dialogs/comp-editor.c:487
+#: ../calendar/gui/e-calendar-table.c:1606
+#: ../calendar/gui/e-calendar-view.c:1782 ../calendar/gui/e-memo-table.c:945
+#: ../composer/e-msg-composer.c:2056 ../mail/em-folder-tree.c:1005
+#: ../mail/em-folder-view.c:1327 ../mail/message-list.c:2105
+#: ../ui/evolution-addressbook.xml.h:46 ../ui/evolution-calendar.xml.h:40
#: ../ui/evolution-mail-message.xml.h:103 ../ui/evolution-memos.xml.h:15
#: ../ui/evolution-tasks.xml.h:23
msgid "_Copy"
@@ -3022,14 +3090,20 @@ msgid "P_aste"
msgstr "P_aste"
#. All, unmatched, separator
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1524
-#: ../calendar/gui/cal-search-bar.c:625 ../calendar/gui/cal-search-bar.c:668
-#: ../calendar/gui/cal-search-bar.c:687
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1528
+#: ../calendar/gui/cal-search-bar.c:628 ../calendar/gui/cal-search-bar.c:671
+#: ../calendar/gui/cal-search-bar.c:690
msgid "Any Category"
msgstr "Any Category"
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1531
+#: ../calendar/gui/cal-search-bar.c:632 ../calendar/gui/cal-search-bar.c:675
+#: ../calendar/gui/cal-search-bar.c:694
+msgid "Unmatched"
+msgstr "Unmatched"
+
#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:1
-#: ../addressbook/gui/widgets/eab-contact-display.c:634
+#: ../addressbook/gui/widgets/eab-contact-display.c:626
msgid "Assistant"
msgstr "Assistant"
@@ -3059,7 +3133,7 @@ msgstr "Car Phone"
#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:8
#: ../calendar/gui/dialogs/event-page.glade.h:7
-#: ../calendar/gui/e-cal-component-memo-preview.c:144
+#: ../calendar/gui/e-cal-component-memo-preview.c:138
#: ../calendar/gui/e-cal-list-view.etspec.h:1
#: ../calendar/gui/e-calendar-table.etspec.h:3
#: ../calendar/gui/e-memo-table.etspec.h:1
@@ -3067,7 +3141,7 @@ msgid "Categories"
msgstr "Categories"
#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:9
-#: ../addressbook/gui/widgets/eab-contact-display.c:629
+#: ../addressbook/gui/widgets/eab-contact-display.c:621
msgid "Company"
msgstr "Company"
@@ -3116,22 +3190,22 @@ msgid "Journal"
msgstr "Journal"
#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:23
-#: ../addressbook/gui/widgets/eab-contact-display.c:633
+#: ../addressbook/gui/widgets/eab-contact-display.c:625
msgid "Manager"
msgstr "Manager"
#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:24
-#: ../addressbook/gui/widgets/eab-contact-display.c:654
+#: ../addressbook/gui/widgets/eab-contact-display.c:646
msgid "Mobile Phone"
msgstr "Mobile Phone"
#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-#: ../addressbook/gui/widgets/eab-contact-display.c:608
+#: ../addressbook/gui/widgets/eab-contact-display.c:599
msgid "Nickname"
msgstr "Nickname"
#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:26
-#: ../addressbook/gui/widgets/eab-contact-display.c:667
+#: ../addressbook/gui/widgets/eab-contact-display.c:659
msgid "Note"
msgstr "Note"
@@ -3160,14 +3234,14 @@ msgid "Radio"
msgstr "Radio"
#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:33
-#: ../calendar/gui/e-meeting-list-view.c:520
+#: ../calendar/gui/e-meeting-list-view.c:577
#: ../calendar/gui/e-meeting-time-sel.etspec.h:9
#: ../plugins/exchange-operations/exchange-permissions-dialog.c:715
msgid "Role"
msgstr "Role"
#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:34
-#: ../addressbook/gui/widgets/eab-contact-display.c:658
+#: ../addressbook/gui/widgets/eab-contact-display.c:650
msgid "Spouse"
msgstr "Spouse"
@@ -3197,55 +3271,55 @@ msgstr "Unit"
msgid "Web Site"
msgstr "Website"
-#: ../addressbook/gui/widgets/e-minicard-label.c:115
-#: ../addressbook/gui/widgets/e-minicard.c:154
+#: ../addressbook/gui/widgets/e-minicard-label.c:116
+#: ../addressbook/gui/widgets/e-minicard.c:155
#: ../widgets/misc/e-canvas-vbox.c:85 ../widgets/misc/e-canvas-vbox.c:86
-#: ../widgets/misc/e-reflow.c:1433 ../widgets/misc/e-reflow.c:1434
+#: ../widgets/misc/e-reflow.c:1424 ../widgets/misc/e-reflow.c:1425
#: ../widgets/table/e-table-click-to-add.c:523
-#: ../widgets/table/e-table-col.c:99
-#: ../widgets/table/e-table-field-chooser-item.c:655
-#: ../widgets/table/e-table-group-container.c:992
-#: ../widgets/table/e-table-group-container.c:993
-#: ../widgets/table/e-table-group-leaf.c:637
-#: ../widgets/table/e-table-group-leaf.c:638
-#: ../widgets/table/e-table-item.c:3081 ../widgets/table/e-table-item.c:3082
-#: ../widgets/text/e-text.c:3729 ../widgets/text/e-text.c:3730
+#: ../widgets/table/e-table-col.c:98
+#: ../widgets/table/e-table-field-chooser-item.c:654
+#: ../widgets/table/e-table-group-container.c:997
+#: ../widgets/table/e-table-group-container.c:998
+#: ../widgets/table/e-table-group-leaf.c:642
+#: ../widgets/table/e-table-group-leaf.c:643
+#: ../widgets/table/e-table-item.c:3077 ../widgets/table/e-table-item.c:3078
+#: ../widgets/text/e-text.c:3727 ../widgets/text/e-text.c:3728
msgid "Width"
msgstr "Width"
-#: ../addressbook/gui/widgets/e-minicard-label.c:122
-#: ../addressbook/gui/widgets/e-minicard.c:161
+#: ../addressbook/gui/widgets/e-minicard-label.c:123
+#: ../addressbook/gui/widgets/e-minicard.c:162
#: ../widgets/misc/e-canvas-vbox.c:97 ../widgets/misc/e-canvas-vbox.c:98
-#: ../widgets/misc/e-reflow.c:1441 ../widgets/misc/e-reflow.c:1442
+#: ../widgets/misc/e-reflow.c:1432 ../widgets/misc/e-reflow.c:1433
#: ../widgets/table/e-table-click-to-add.c:530
-#: ../widgets/table/e-table-field-chooser-item.c:662
-#: ../widgets/table/e-table-group-container.c:985
-#: ../widgets/table/e-table-group-container.c:986
-#: ../widgets/table/e-table-group-leaf.c:630
-#: ../widgets/table/e-table-group-leaf.c:631
-#: ../widgets/table/e-table-item.c:3087 ../widgets/table/e-table-item.c:3088
-#: ../widgets/text/e-text.c:3737 ../widgets/text/e-text.c:3738
+#: ../widgets/table/e-table-field-chooser-item.c:661
+#: ../widgets/table/e-table-group-container.c:990
+#: ../widgets/table/e-table-group-container.c:991
+#: ../widgets/table/e-table-group-leaf.c:635
+#: ../widgets/table/e-table-group-leaf.c:636
+#: ../widgets/table/e-table-item.c:3083 ../widgets/table/e-table-item.c:3084
+#: ../widgets/text/e-text.c:3735 ../widgets/text/e-text.c:3736
msgid "Height"
msgstr "Height"
-#: ../addressbook/gui/widgets/e-minicard-label.c:129
-#: ../addressbook/gui/widgets/e-minicard.c:169
+#: ../addressbook/gui/widgets/e-minicard-label.c:130
+#: ../addressbook/gui/widgets/e-minicard.c:170
msgid "Has Focus"
msgstr "Has Focus"
-#: ../addressbook/gui/widgets/e-minicard-label.c:136
+#: ../addressbook/gui/widgets/e-minicard-label.c:137
msgid "Field"
msgstr "Field"
-#: ../addressbook/gui/widgets/e-minicard-label.c:143
+#: ../addressbook/gui/widgets/e-minicard-label.c:144
msgid "Field Name"
msgstr "Field Name"
-#: ../addressbook/gui/widgets/e-minicard-label.c:150
+#: ../addressbook/gui/widgets/e-minicard-label.c:151
msgid "Text Model"
msgstr "Text Model"
-#: ../addressbook/gui/widgets/e-minicard-label.c:157
+#: ../addressbook/gui/widgets/e-minicard-label.c:158
msgid "Max field name length"
msgstr "Max field name length"
@@ -3315,83 +3389,83 @@ msgstr ""
msgid "Adapter"
msgstr "Adapter"
-#: ../addressbook/gui/widgets/e-minicard.c:99
+#: ../addressbook/gui/widgets/e-minicard.c:100
msgid "Work Email"
msgstr "Work E-mail"
-#: ../addressbook/gui/widgets/e-minicard.c:100
+#: ../addressbook/gui/widgets/e-minicard.c:101
msgid "Home Email"
msgstr "Home E-mail"
-#: ../addressbook/gui/widgets/e-minicard.c:101
-#: ../addressbook/gui/widgets/e-minicard.c:830
+#: ../addressbook/gui/widgets/e-minicard.c:102
+#: ../addressbook/gui/widgets/e-minicard.c:831
msgid "Other Email"
msgstr "Other E-mail"
-#: ../addressbook/gui/widgets/e-minicard.c:177
+#: ../addressbook/gui/widgets/e-minicard.c:178
msgid "Selected"
msgstr "Selected"
-#: ../addressbook/gui/widgets/e-minicard.c:184
+#: ../addressbook/gui/widgets/e-minicard.c:185
msgid "Has Cursor"
msgstr "Has Cursor"
-#: ../addressbook/gui/widgets/eab-contact-display.c:172 ../mail/em-popup.c:627
+#: ../addressbook/gui/widgets/eab-contact-display.c:169 ../mail/em-popup.c:623
msgid "_Open Link in Browser"
msgstr "_Open Link in Browser"
-#: ../addressbook/gui/widgets/eab-contact-display.c:173
-#: ../mail/em-folder-view.c:2795
+#: ../addressbook/gui/widgets/eab-contact-display.c:170
+#: ../mail/em-folder-view.c:2757
msgid "_Copy Link Location"
msgstr "_Copy Link Location"
-#: ../addressbook/gui/widgets/eab-contact-display.c:174 ../mail/em-popup.c:628
+#: ../addressbook/gui/widgets/eab-contact-display.c:171 ../mail/em-popup.c:624
msgid "_Send New Message To..."
msgstr "_Send New Message To..."
-#: ../addressbook/gui/widgets/eab-contact-display.c:175
+#: ../addressbook/gui/widgets/eab-contact-display.c:172
#: ../plugins/copy-tool/org-gnome-copy-tool.eplug.xml.h:2
msgid "Copy _Email Address"
msgstr "Copy _E-mail Address"
-#: ../addressbook/gui/widgets/eab-contact-display.c:296
-#: ../addressbook/gui/widgets/eab-contact-display.c:370
-#: ../addressbook/gui/widgets/eab-contact-display.c:372
+#: ../addressbook/gui/widgets/eab-contact-display.c:287
+#: ../addressbook/gui/widgets/eab-contact-display.c:361
+#: ../addressbook/gui/widgets/eab-contact-display.c:363
msgid "(map)"
msgstr "(map)"
-#: ../addressbook/gui/widgets/eab-contact-display.c:306
-#: ../addressbook/gui/widgets/eab-contact-display.c:390
-#: ../addressbook/gui/widgets/eab-contact-display.c:402
+#: ../addressbook/gui/widgets/eab-contact-display.c:297
+#: ../addressbook/gui/widgets/eab-contact-display.c:381
+#: ../addressbook/gui/widgets/eab-contact-display.c:393
msgid "map"
msgstr "map"
-#: ../addressbook/gui/widgets/eab-contact-display.c:487
-#: ../addressbook/gui/widgets/eab-contact-display.c:846
+#: ../addressbook/gui/widgets/eab-contact-display.c:478
+#: ../addressbook/gui/widgets/eab-contact-display.c:838
msgid "List Members"
msgstr "List Members"
-#: ../addressbook/gui/widgets/eab-contact-display.c:630
+#: ../addressbook/gui/widgets/eab-contact-display.c:622
msgid "Department"
msgstr "Department"
-#: ../addressbook/gui/widgets/eab-contact-display.c:631
+#: ../addressbook/gui/widgets/eab-contact-display.c:623
msgid "Profession"
msgstr "Profession"
-#: ../addressbook/gui/widgets/eab-contact-display.c:632
+#: ../addressbook/gui/widgets/eab-contact-display.c:624
msgid "Position"
msgstr "Position"
-#: ../addressbook/gui/widgets/eab-contact-display.c:635
+#: ../addressbook/gui/widgets/eab-contact-display.c:627
msgid "Video Chat"
msgstr "Video Chat"
-#: ../addressbook/gui/widgets/eab-contact-display.c:636
-#: ../calendar/gui/calendar-commands.c:92
-#: ../calendar/gui/dialogs/calendar-setup.c:368
-#: ../calendar/gui/gnome-cal.c:2451
-#: ../plugins/exchange-operations/exchange-delegates-user.c:76
+#: ../addressbook/gui/widgets/eab-contact-display.c:628
+#: ../calendar/gui/calendar-commands.c:90
+#: ../calendar/gui/dialogs/calendar-setup.c:369
+#: ../calendar/gui/gnome-cal.c:2512
+#: ../plugins/exchange-operations/exchange-delegates-user.c:78
#: ../plugins/exchange-operations/exchange-folder.c:576
#: ../plugins/groupwise-account-setup/camel-gw-listener.c:424
#: ../plugins/groupwise-account-setup/camel-gw-listener.c:455
@@ -3402,210 +3476,199 @@ msgstr "Video Chat"
msgid "Calendar"
msgstr "Calendar"
-#: ../addressbook/gui/widgets/eab-contact-display.c:637
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-#: ../calendar/gui/dialogs/event-editor.c:115
+#: ../addressbook/gui/widgets/eab-contact-display.c:629
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
+#: ../calendar/gui/dialogs/event-editor.c:116
msgid "Free/Busy"
msgstr "Free/Busy"
-#: ../addressbook/gui/widgets/eab-contact-display.c:638
-#: ../addressbook/gui/widgets/eab-contact-display.c:653
+#: ../addressbook/gui/widgets/eab-contact-display.c:630
+#: ../addressbook/gui/widgets/eab-contact-display.c:645
msgid "Phone"
msgstr "Phone"
-#: ../addressbook/gui/widgets/eab-contact-display.c:639
+#: ../addressbook/gui/widgets/eab-contact-display.c:631
msgid "Fax"
msgstr "Fax"
-#: ../addressbook/gui/widgets/eab-contact-display.c:650
+#: ../addressbook/gui/widgets/eab-contact-display.c:642
msgid "Home Page"
msgstr "Home Page"
-#: ../addressbook/gui/widgets/eab-contact-display.c:651
+#: ../addressbook/gui/widgets/eab-contact-display.c:643
msgid "Web Log"
msgstr "Web Log"
-#: ../addressbook/gui/widgets/eab-contact-display.c:656
-#: ../calendar/gui/caltypes.xml.h:6 ../calendar/gui/e-calendar-view.c:2343
-#: ../calendar/gui/memotypes.xml.h:5 ../calendar/gui/tasktypes.xml.h:8
+#: ../addressbook/gui/widgets/eab-contact-display.c:648
+#: ../calendar/gui/e-calendar-view.c:2538
msgid "Birthday"
msgstr "Birthday"
-#: ../addressbook/gui/widgets/eab-contact-display.c:657
-#: ../calendar/gui/caltypes.xml.h:1 ../calendar/gui/e-calendar-view.c:2344
-#: ../calendar/gui/memotypes.xml.h:1 ../calendar/gui/tasktypes.xml.h:3
+#: ../addressbook/gui/widgets/eab-contact-display.c:649
+#: ../calendar/gui/e-calendar-view.c:2539
msgid "Anniversary"
msgstr "Anniversary"
-#: ../addressbook/gui/widgets/eab-contact-display.c:864
+#: ../addressbook/gui/widgets/eab-contact-display.c:856
msgid "Job Title"
msgstr "Job Title"
-#: ../addressbook/gui/widgets/eab-contact-display.c:900
+#: ../addressbook/gui/widgets/eab-contact-display.c:892
msgid "Home page"
msgstr "Home page"
-#: ../addressbook/gui/widgets/eab-contact-display.c:908
+#: ../addressbook/gui/widgets/eab-contact-display.c:900
msgid "Blog"
msgstr "Blog"
#. E_BOOK_ERROR_OK
-#: ../addressbook/gui/widgets/eab-gui-util.c:57
+#: ../addressbook/gui/widgets/eab-gui-util.c:58
msgid "Success"
msgstr "Success"
#. E_BOOK_ERROR_INVALID_ARG
#. E_BOOK_ERROR_BUSY
-#: ../addressbook/gui/widgets/eab-gui-util.c:59
+#: ../addressbook/gui/widgets/eab-gui-util.c:60
msgid "Backend busy"
msgstr "Backend busy"
#. E_BOOK_ERROR_REPOSITORY_OFFLINE
-#: ../addressbook/gui/widgets/eab-gui-util.c:60
+#: ../addressbook/gui/widgets/eab-gui-util.c:61
msgid "Repository offline"
msgstr "Repository offline"
#. E_BOOK_ERROR_NO_SUCH_BOOK
-#: ../addressbook/gui/widgets/eab-gui-util.c:61
+#: ../addressbook/gui/widgets/eab-gui-util.c:62
msgid "Address Book does not exist"
msgstr "Address Book does not exist"
#. E_BOOK_ERROR_NO_SELF_CONTACT
-#: ../addressbook/gui/widgets/eab-gui-util.c:62
+#: ../addressbook/gui/widgets/eab-gui-util.c:63
msgid "No Self Contact defined"
msgstr "No Self Contact defined"
#. E_BOOK_ERROR_URI_NOT_LOADED
#. E_BOOK_ERROR_URI_ALREADY_LOADED
#. E_BOOK_ERROR_PERMISSION_DENIED
-#: ../addressbook/gui/widgets/eab-gui-util.c:65
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:50
+#: ../addressbook/gui/widgets/eab-gui-util.c:66
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:51
msgid "Permission denied"
msgstr "Permission denied"
#. E_BOOK_ERROR_CONTACT_NOT_FOUND
-#: ../addressbook/gui/widgets/eab-gui-util.c:66
+#: ../addressbook/gui/widgets/eab-gui-util.c:67
msgid "Contact not found"
msgstr "Contact not found"
#. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
-#: ../addressbook/gui/widgets/eab-gui-util.c:67
+#: ../addressbook/gui/widgets/eab-gui-util.c:68
msgid "Contact ID already exists"
msgstr "Contact ID already exists"
#. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
-#: ../addressbook/gui/widgets/eab-gui-util.c:68
+#: ../addressbook/gui/widgets/eab-gui-util.c:69
msgid "Protocol not supported"
msgstr "Protocol not supported"
#. E_BOOK_ERROR_CANCELLED
-#: ../addressbook/gui/widgets/eab-gui-util.c:69
+#: ../addressbook/gui/widgets/eab-gui-util.c:70
#: ../calendar/gui/dialogs/task-details-page.glade.h:3
-#: ../calendar/gui/e-cal-component-preview.c:256
-#: ../calendar/gui/e-cal-model-tasks.c:360
-#: ../calendar/gui/e-cal-model-tasks.c:677
-#: ../calendar/gui/e-calendar-table.c:240
-#: ../calendar/gui/e-calendar-table.c:643 ../calendar/gui/print.c:2555
+#: ../calendar/gui/e-cal-component-preview.c:250
+#: ../calendar/gui/e-cal-model-tasks.c:364
+#: ../calendar/gui/e-cal-model-tasks.c:681
+#: ../calendar/gui/e-calendar-table.c:239
+#: ../calendar/gui/e-calendar-table.c:664 ../calendar/gui/print.c:2564
msgid "Canceled"
msgstr "Cancelled"
#. E_BOOK_ERROR_COULD_NOT_CANCEL
-#: ../addressbook/gui/widgets/eab-gui-util.c:70
+#: ../addressbook/gui/widgets/eab-gui-util.c:71
msgid "Could not cancel"
msgstr "Could not cancel"
#. E_BOOK_ERROR_AUTHENTICATION_FAILED
-#: ../addressbook/gui/widgets/eab-gui-util.c:71
-#: ../calendar/gui/comp-editor-factory.c:423
+#: ../addressbook/gui/widgets/eab-gui-util.c:72
+#: ../calendar/gui/comp-editor-factory.c:433
msgid "Authentication Failed"
msgstr "Authentication Failed"
#. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
-#: ../addressbook/gui/widgets/eab-gui-util.c:72
+#: ../addressbook/gui/widgets/eab-gui-util.c:73
+#: ../calendar/gui/comp-editor-factory.c:427
msgid "Authentication Required"
msgstr "Authentication Required"
#. E_BOOK_ERROR_TLS_NOT_AVAILABLE
-#: ../addressbook/gui/widgets/eab-gui-util.c:73
+#: ../addressbook/gui/widgets/eab-gui-util.c:74
msgid "TLS not Available"
msgstr "TLS not Available"
#. E_BOOK_ERROR_CORBA_EXCEPTION
#. E_BOOK_ERROR_NO_SUCH_SOURCE
-#: ../addressbook/gui/widgets/eab-gui-util.c:75
+#: ../addressbook/gui/widgets/eab-gui-util.c:76
msgid "No such source"
msgstr "No such source"
#. E_BOOK_ERROR_OFFLINE_UNAVAILABLE
-#: ../addressbook/gui/widgets/eab-gui-util.c:76
+#: ../addressbook/gui/widgets/eab-gui-util.c:77
msgid "Not available in offline mode"
msgstr "Not available in offline mode"
#. E_BOOK_ERROR_OTHER_ERROR
-#: ../addressbook/gui/widgets/eab-gui-util.c:77
+#: ../addressbook/gui/widgets/eab-gui-util.c:78
msgid "Other error"
msgstr "Other error"
#. E_BOOK_ERROR_INVALID_SERVER_VERSION
-#: ../addressbook/gui/widgets/eab-gui-util.c:78
+#: ../addressbook/gui/widgets/eab-gui-util.c:79
msgid "Invalid server version"
msgstr "Invalid server version"
#. E_BOOK_ERROR_UNSUPPORTED_AUTHENTICATION_METHOD
-#: ../addressbook/gui/widgets/eab-gui-util.c:79
+#: ../addressbook/gui/widgets/eab-gui-util.c:80
msgid "Unsupported authentication method"
msgstr "Unsupported authentication method"
-#: ../addressbook/gui/widgets/eab-gui-util.c:107
+#: ../addressbook/gui/widgets/eab-gui-util.c:110
msgid ""
-"We were unable to open this address book. This either means this book is not "
+"This address book cannot be opened. This either means this book is not "
"marked for offline usage or not yet downloaded for offline usage. Please "
-"load the address book once in online mode to download its contents"
+"load the address book once in online mode to download its contents."
msgstr ""
-"We were unable to open this address book. This either means this book is not "
+"This address book cannot be opened. This either means this book is not "
"marked for offline usage or not yet downloaded for offline usage. Please "
-"load the address book once in online mode to download its contents"
+"load the address book once in online mode to download its contents."
-#: ../addressbook/gui/widgets/eab-gui-util.c:116
+#: ../addressbook/gui/widgets/eab-gui-util.c:119
#, c-format
msgid ""
-"We were unable to open this address book. Please check that the path %s "
-"exists and that you have permission to access it."
+"This address book cannot be opened. Please check that the path %s exists "
+"and that permissions are set to access it."
msgstr ""
-"We were unable to open this address book. Please check that the path %s "
-"exists and that you have permission to access it."
+"This address book cannot be opened. Please check that the path %s exists "
+"and that permissions are set to access it."
-#: ../addressbook/gui/widgets/eab-gui-util.c:125
+#: ../addressbook/gui/widgets/eab-gui-util.c:131
msgid ""
-"We were unable to open this address book. This either means you have "
-"entered an incorrect URI, or the LDAP server is unreachable."
+"This version of Evolution does not have LDAP support compiled in to it. To "
+"use LDAP in Evolution an LDAP-enabled Evolution package must be installed."
msgstr ""
-"We were unable to open this address book. This either means you have "
-"entered an incorrect URI, or the LDAP server is unreachable."
+"This version of Evolution does not have LDAP support compiled into it. To "
+"use LDAP in Evolution an LDAP-enabled Evolution package must be installed."
-#: ../addressbook/gui/widgets/eab-gui-util.c:130
+#: ../addressbook/gui/widgets/eab-gui-util.c:140
msgid ""
-"This version of Evolution does not have LDAP support compiled in to it. If "
-"you want to use LDAP in Evolution, you must install an LDAP-enabled "
-"Evolution package."
+"This address book cannot be opened. This either means that an incorrect URI "
+"was entered, or the server is unreachable."
msgstr ""
-"This version of Evolution does not have LDAP support compiled in to it. If "
-"you want to use LDAP in Evolution, you must install an LDAP-enabled "
-"Evolution package."
+"This address book cannot be opened. This either means that an incorrect URI "
+"was entered, or the server is unreachable."
-#: ../addressbook/gui/widgets/eab-gui-util.c:137
-msgid ""
-"We were unable to open this address book. This either means you have "
-"entered an incorrect URI, or the server is unreachable."
-msgstr ""
-"We were unable to open this address book. This either means you have "
-"entered an incorrect URI, or the server is unreachable."
+#: ../addressbook/gui/widgets/eab-gui-util.c:148
+msgid "Detailed error message:"
+msgstr "Detailed error message:"
-#: ../addressbook/gui/widgets/eab-gui-util.c:143
-msgid "Detailed error:"
-msgstr "Detailed error:"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:166
+#: ../addressbook/gui/widgets/eab-gui-util.c:171
msgid ""
"More cards matched this query than either the server is \n"
"configured to return or Evolution is configured to display.\n"
@@ -3617,57 +3680,57 @@ msgstr ""
"Please make your search more specific or raise the result limit in\n"
"the directory server preferences for this address book."
-#: ../addressbook/gui/widgets/eab-gui-util.c:172
+#: ../addressbook/gui/widgets/eab-gui-util.c:177
msgid ""
"The time to execute this query exceeded the server limit or the limit\n"
-"you have configured for this address book. Please make your search\n"
+"configured for this address book. Please make your search\n"
"more specific or raise the time limit in the directory server\n"
"preferences for this address book."
msgstr ""
"The time to execute this query exceeded the server limit or the limit\n"
-"you have configured for this address book. Please make your search\n"
+"configured for this address book. Please make your search\n"
"more specific or raise the time limit in the directory server\n"
"preferences for this address book."
-#: ../addressbook/gui/widgets/eab-gui-util.c:178
+#: ../addressbook/gui/widgets/eab-gui-util.c:183
msgid "The backend for this address book was unable to parse this query."
msgstr "The backend for this address book was unable to parse this query."
-#: ../addressbook/gui/widgets/eab-gui-util.c:181
+#: ../addressbook/gui/widgets/eab-gui-util.c:186
msgid "The backend for this address book refused to perform this query."
msgstr "The backend for this address book refused to perform this query."
-#: ../addressbook/gui/widgets/eab-gui-util.c:184
+#: ../addressbook/gui/widgets/eab-gui-util.c:189
msgid "This query did not complete successfully."
msgstr "This query did not complete successfully."
-#: ../addressbook/gui/widgets/eab-gui-util.c:206
+#: ../addressbook/gui/widgets/eab-gui-util.c:211
msgid "Error adding list"
msgstr "Error adding list"
-#: ../addressbook/gui/widgets/eab-gui-util.c:206
-#: ../addressbook/gui/widgets/eab-gui-util.c:682
+#: ../addressbook/gui/widgets/eab-gui-util.c:211
+#: ../addressbook/gui/widgets/eab-gui-util.c:687
msgid "Error adding contact"
msgstr "Error adding contact"
-#: ../addressbook/gui/widgets/eab-gui-util.c:217
+#: ../addressbook/gui/widgets/eab-gui-util.c:222
msgid "Error modifying list"
msgstr "Error modifying list"
-#: ../addressbook/gui/widgets/eab-gui-util.c:217
+#: ../addressbook/gui/widgets/eab-gui-util.c:222
msgid "Error modifying contact"
msgstr "Error modifying contact"
-#: ../addressbook/gui/widgets/eab-gui-util.c:229
+#: ../addressbook/gui/widgets/eab-gui-util.c:234
msgid "Error removing list"
msgstr "Error removing list"
-#: ../addressbook/gui/widgets/eab-gui-util.c:229
-#: ../addressbook/gui/widgets/eab-gui-util.c:632
+#: ../addressbook/gui/widgets/eab-gui-util.c:234
+#: ../addressbook/gui/widgets/eab-gui-util.c:637
msgid "Error removing contact"
msgstr "Error removing contact"
-#: ../addressbook/gui/widgets/eab-gui-util.c:311
+#: ../addressbook/gui/widgets/eab-gui-util.c:316
#, c-format
msgid ""
"Opening %d contact will open %d new window as well.\n"
@@ -3682,16 +3745,16 @@ msgstr[1] ""
"Opening %d contacts will open %d new windows as well.\n"
"Do you really want to display all of these contacts?"
-#: ../addressbook/gui/widgets/eab-gui-util.c:319
+#: ../addressbook/gui/widgets/eab-gui-util.c:324
msgid "_Don't Display"
msgstr "_Don't Display"
-#: ../addressbook/gui/widgets/eab-gui-util.c:320
+#: ../addressbook/gui/widgets/eab-gui-util.c:325
msgid "Display _All Contacts"
msgstr "Display _All Contacts"
#. For Translators only: "it" refers to the filename %s.
-#: ../addressbook/gui/widgets/eab-gui-util.c:346
+#: ../addressbook/gui/widgets/eab-gui-util.c:351
#, c-format
msgid ""
"%s already exists\n"
@@ -3700,65 +3763,65 @@ msgstr ""
"%s already exists\n"
"Do you want to overwrite it?"
-#: ../addressbook/gui/widgets/eab-gui-util.c:350
+#: ../addressbook/gui/widgets/eab-gui-util.c:355
msgid "Overwrite"
msgstr "Overwrite"
#. more than one, finding the total number of contacts might
#. * hit performance while saving large number of contacts
#.
-#: ../addressbook/gui/widgets/eab-gui-util.c:391
-#: ../addressbook/gui/widgets/eab-gui-util.c:394
+#: ../addressbook/gui/widgets/eab-gui-util.c:396
+#: ../addressbook/gui/widgets/eab-gui-util.c:399
msgid "contact"
msgid_plural "contacts"
msgstr[0] "contact"
msgstr[1] "contacts"
#. This is a filename. Translators take note.
-#: ../addressbook/gui/widgets/eab-gui-util.c:440
+#: ../addressbook/gui/widgets/eab-gui-util.c:445
msgid "card.vcf"
msgstr "card.vcf"
-#: ../addressbook/gui/widgets/eab-gui-util.c:477
+#: ../addressbook/gui/widgets/eab-gui-util.c:482
msgid "Select Address Book"
msgstr "Select Address Book"
-#: ../addressbook/gui/widgets/eab-gui-util.c:591
+#: ../addressbook/gui/widgets/eab-gui-util.c:596
msgid "list"
msgstr "list"
-#: ../addressbook/gui/widgets/eab-gui-util.c:743
+#: ../addressbook/gui/widgets/eab-gui-util.c:748
msgid "Move contact to"
msgstr "Move contact to"
-#: ../addressbook/gui/widgets/eab-gui-util.c:745
+#: ../addressbook/gui/widgets/eab-gui-util.c:750
msgid "Copy contact to"
msgstr "Copy contact to"
-#: ../addressbook/gui/widgets/eab-gui-util.c:748
+#: ../addressbook/gui/widgets/eab-gui-util.c:753
msgid "Move contacts to"
msgstr "Move contacts to"
-#: ../addressbook/gui/widgets/eab-gui-util.c:750
+#: ../addressbook/gui/widgets/eab-gui-util.c:755
msgid "Copy contacts to"
msgstr "Copy contacts to"
-#: ../addressbook/gui/widgets/eab-gui-util.c:895
+#: ../addressbook/gui/widgets/eab-gui-util.c:901
msgid "Multiple vCards"
msgstr "Multiple vCards"
-#: ../addressbook/gui/widgets/eab-gui-util.c:902
+#: ../addressbook/gui/widgets/eab-gui-util.c:908
#, c-format
msgid "vCard for %s"
msgstr "vCard for %s"
-#: ../addressbook/gui/widgets/eab-gui-util.c:914
-#: ../addressbook/gui/widgets/eab-gui-util.c:940
+#: ../addressbook/gui/widgets/eab-gui-util.c:920
+#: ../addressbook/gui/widgets/eab-gui-util.c:946
#, c-format
msgid "Contact information"
msgstr "Contact information"
-#: ../addressbook/gui/widgets/eab-gui-util.c:942
+#: ../addressbook/gui/widgets/eab-gui-util.c:948
#, c-format
msgid "Contact information for %s"
msgstr "Contact information for %s"
@@ -3767,23 +3830,23 @@ msgstr "Contact information for %s"
msgid "Querying Address Book..."
msgstr "Querying Address Book..."
-#: ../addressbook/gui/widgets/eab-vcard-control.c:143
+#: ../addressbook/gui/widgets/eab-vcard-control.c:141
#, c-format
msgid "There is one other contact."
msgid_plural "There are %d other contacts."
msgstr[0] "There is one other contact."
msgstr[1] "There are %d other contacts."
-#: ../addressbook/gui/widgets/eab-vcard-control.c:228
-#: ../addressbook/gui/widgets/eab-vcard-control.c:279
+#: ../addressbook/gui/widgets/eab-vcard-control.c:226
+#: ../addressbook/gui/widgets/eab-vcard-control.c:277
msgid "Show Full vCard"
msgstr "Show Full vCard"
-#: ../addressbook/gui/widgets/eab-vcard-control.c:232
+#: ../addressbook/gui/widgets/eab-vcard-control.c:230
msgid "Show Compact vCard"
msgstr "Show Compact vCard"
-#: ../addressbook/gui/widgets/eab-vcard-control.c:284
+#: ../addressbook/gui/widgets/eab-vcard-control.c:282
msgid "Save in address book"
msgstr "Save in address book"
@@ -3792,10 +3855,10 @@ msgid "Card View"
msgstr "Card View"
#: ../addressbook/importers/evolution-csv-importer.c:661
-#: ../addressbook/importers/evolution-ldif-importer.c:498
-#: ../addressbook/importers/evolution-vcard-importer.c:250
-#: ../calendar/importers/icalendar-importer.c:306
-#: ../calendar/importers/icalendar-importer.c:671 ../shell/shell.error.xml.h:6
+#: ../addressbook/importers/evolution-ldif-importer.c:513
+#: ../addressbook/importers/evolution-vcard-importer.c:252
+#: ../calendar/importers/icalendar-importer.c:308
+#: ../calendar/importers/icalendar-importer.c:685 ../shell/shell.error.xml.h:7
msgid "Importing..."
msgstr "Importing..."
@@ -3823,19 +3886,19 @@ msgstr "Evolution CSV or Tab (.csv, .tab)"
msgid "Evolution CSV and Tab Importer"
msgstr "Evolution CSV and Tab Importer"
-#: ../addressbook/importers/evolution-ldif-importer.c:665
+#: ../addressbook/importers/evolution-ldif-importer.c:680
msgid "LDAP Data Interchange Format (.ldif)"
msgstr "LDAP Data Interchange Format (.ldif)"
-#: ../addressbook/importers/evolution-ldif-importer.c:666
+#: ../addressbook/importers/evolution-ldif-importer.c:681
msgid "Evolution LDIF importer"
msgstr "Evolution LDIF importer"
-#: ../addressbook/importers/evolution-vcard-importer.c:547
+#: ../addressbook/importers/evolution-vcard-importer.c:549
msgid "vCard (.vcf, .gcrd)"
msgstr "vCard (.vcf, .gcrd)"
-#: ../addressbook/importers/evolution-vcard-importer.c:548
+#: ../addressbook/importers/evolution-vcard-importer.c:550
msgid "Evolution vCard Importer"
msgstr "Evolution vCard Importer"
@@ -3880,11 +3943,11 @@ msgid "Format"
msgstr "Format"
#: ../addressbook/printing/e-contact-print.glade.h:11
-#: ../mail/em-mailer-prefs.c:432 ../widgets/table/e-table-click-to-add.c:502
+#: ../mail/em-mailer-prefs.c:433 ../widgets/table/e-table-click-to-add.c:502
#: ../widgets/table/e-table-field-chooser-dialog.c:81
-#: ../widgets/table/e-table-field-chooser-item.c:648
-#: ../widgets/table/e-table-field-chooser.c:81
-#: ../widgets/table/e-table-header-item.c:1908
+#: ../widgets/table/e-table-field-chooser-item.c:647
+#: ../widgets/table/e-table-field-chooser.c:80
+#: ../widgets/table/e-table-header-item.c:1907
#: ../widgets/table/e-table-selection-model.c:309
msgid "Header"
msgstr "Header"
@@ -3987,9 +4050,9 @@ msgstr "Shading"
#. FIXME: Take care of i18n
#: ../addressbook/printing/e-contact-print.glade.h:36
-#: ../plugins/exchange-operations/exchange-account-setup.c:1069
-#: ../plugins/exchange-operations/exchange-calendar.c:232
-#: ../plugins/exchange-operations/exchange-contacts.c:217
+#: ../plugins/exchange-operations/exchange-account-setup.c:1141
+#: ../plugins/exchange-operations/exchange-calendar.c:236
+#: ../plugins/exchange-operations/exchange-contacts.c:222
msgid "Size:"
msgstr "Size:"
@@ -4018,29 +4081,8 @@ msgstr "Width:"
msgid "_Font..."
msgstr "_Font..."
-#: ../addressbook/printing/test-contact-print-style-editor.c:54
-msgid "Contact Print Style Editor Test"
-msgstr "Contact Print Style Editor Test"
-
-#: ../addressbook/printing/test-contact-print-style-editor.c:55
-#: ../addressbook/printing/test-print.c:45
-msgid "Copyright (C) 2000, Ximian, Inc."
-msgstr "Copyright (C) 2000, Ximian, Inc."
-
-#: ../addressbook/printing/test-contact-print-style-editor.c:57
-msgid "This should test the contact print style editor widget"
-msgstr "This should test the contact print style editor widget"
-
-#: ../addressbook/printing/test-print.c:44
-msgid "Contact Print Test"
-msgstr "Contact Print Test"
-
-#: ../addressbook/printing/test-print.c:47
-msgid "This should test the contact print code"
-msgstr "This should test the contact print code"
-
-#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:667
-#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:703
+#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:656
+#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:692
#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:50
msgid "Can not open file"
msgstr "Can not open file"
@@ -4053,31 +4095,31 @@ msgstr "Couldn't get list of address books"
msgid "failed to open book"
msgstr "failed to open book"
-#: ../addressbook/tools/evolution-addressbook-export.c:49
+#: ../addressbook/tools/evolution-addressbook-export.c:48
msgid "Specify the output file instead of standard output"
msgstr "Specify the output file instead of standard output"
-#: ../addressbook/tools/evolution-addressbook-export.c:50
+#: ../addressbook/tools/evolution-addressbook-export.c:49
msgid "OUTPUTFILE"
msgstr "OUTPUTFILE"
-#: ../addressbook/tools/evolution-addressbook-export.c:53
+#: ../addressbook/tools/evolution-addressbook-export.c:52
msgid "List local address book folders"
msgstr "List local address book folders"
-#: ../addressbook/tools/evolution-addressbook-export.c:56
+#: ../addressbook/tools/evolution-addressbook-export.c:55
msgid "Show cards as vcard or csv file"
msgstr "Show cards as vcard or csv file"
-#: ../addressbook/tools/evolution-addressbook-export.c:57
+#: ../addressbook/tools/evolution-addressbook-export.c:56
msgid "[vcard|csv]"
msgstr "[vcard|csv]"
-#: ../addressbook/tools/evolution-addressbook-export.c:60
+#: ../addressbook/tools/evolution-addressbook-export.c:59
msgid "Export in asynchronous mode"
msgstr "Export in asynchronous mode"
-#: ../addressbook/tools/evolution-addressbook-export.c:63
+#: ../addressbook/tools/evolution-addressbook-export.c:62
msgid ""
"The number of cards in one output file in asynchronous mode, default size "
"100."
@@ -4085,29 +4127,29 @@ msgstr ""
"The number of cards in one output file in asynchronous mode, default size "
"100."
-#: ../addressbook/tools/evolution-addressbook-export.c:65
+#: ../addressbook/tools/evolution-addressbook-export.c:64
msgid "NUMBER"
msgstr "NUMBER"
-#: ../addressbook/tools/evolution-addressbook-export.c:102
+#: ../addressbook/tools/evolution-addressbook-export.c:101
msgid ""
"Command line arguments error, please use --help option to see the usage."
msgstr ""
"Command line arguments error, please use --help option to see the usage."
-#: ../addressbook/tools/evolution-addressbook-export.c:116
+#: ../addressbook/tools/evolution-addressbook-export.c:115
msgid "Only support csv or vcard format."
msgstr "Only support csv or vcard format."
-#: ../addressbook/tools/evolution-addressbook-export.c:125
+#: ../addressbook/tools/evolution-addressbook-export.c:124
msgid "In async mode, output must be file."
msgstr "In async mode, output must be file."
-#: ../addressbook/tools/evolution-addressbook-export.c:133
+#: ../addressbook/tools/evolution-addressbook-export.c:132
msgid "In normal mode, there is no need for the size option."
msgstr "In normal mode, there is no need for the size option."
-#: ../addressbook/tools/evolution-addressbook-export.c:164
+#: ../addressbook/tools/evolution-addressbook-export.c:163
msgid "Unhandled error"
msgstr "Unhandled error"
@@ -4216,19 +4258,19 @@ msgid "Are you sure you want to delete this appointment?"
msgstr "Are you sure you want to delete this appointment?"
#: ../calendar/calendar.error.xml.h:22
-#: ../calendar/gui/dialogs/delete-comp.c:178
+#: ../calendar/gui/dialogs/delete-comp.c:182
#, c-format
msgid "Are you sure you want to delete this meeting?"
msgstr "Are you sure you want to delete this meeting?"
#: ../calendar/calendar.error.xml.h:23
-#: ../calendar/gui/dialogs/delete-comp.c:184
+#: ../calendar/gui/dialogs/delete-comp.c:188
#, c-format
msgid "Are you sure you want to delete this memo?"
msgstr "Are you sure you want to delete this memo?"
#: ../calendar/calendar.error.xml.h:24
-#: ../calendar/gui/dialogs/delete-comp.c:181
+#: ../calendar/gui/dialogs/delete-comp.c:185
#, c-format
msgid "Are you sure you want to delete this task?"
msgstr "Are you sure you want to delete this task?"
@@ -4246,42 +4288,46 @@ msgid "Are you sure you want to send the task without a summary?"
msgstr "Are you sure you want to send the task without a summary?"
#: ../calendar/calendar.error.xml.h:28
+msgid "Calendar repository is offline."
+msgstr "Calendar repository is offline."
+
+#: ../calendar/calendar.error.xml.h:29
msgid "Cannot create a new event"
msgstr "Cannot create a new event"
-#: ../calendar/calendar.error.xml.h:29
+#: ../calendar/calendar.error.xml.h:30
msgid "Cannot save event"
msgstr "Cannot save event"
-#: ../calendar/calendar.error.xml.h:30
+#: ../calendar/calendar.error.xml.h:31
msgid "Delete calendar '{0}'?"
msgstr "Delete calendar '{0}'?"
-#: ../calendar/calendar.error.xml.h:31
+#: ../calendar/calendar.error.xml.h:32
msgid "Delete memo list '{0}'?"
msgstr "Delete memo list '{0}'?"
-#: ../calendar/calendar.error.xml.h:32
+#: ../calendar/calendar.error.xml.h:33
msgid "Delete task list '{0}'?"
msgstr "Delete task list '{0}'?"
-#: ../calendar/calendar.error.xml.h:33
+#: ../calendar/calendar.error.xml.h:34
msgid "Do _not Send"
msgstr "Do _not Send"
-#: ../calendar/calendar.error.xml.h:34
+#: ../calendar/calendar.error.xml.h:35
msgid "Download in progress. Do you want to save the appointment?"
msgstr "Download in progress. Do you want to save the appointment?"
-#: ../calendar/calendar.error.xml.h:35
+#: ../calendar/calendar.error.xml.h:36
msgid "Download in progress. Do you want to save the task?"
msgstr "Download in progress. Do you want to save the task?"
-#: ../calendar/calendar.error.xml.h:36
+#: ../calendar/calendar.error.xml.h:37
msgid "Editor could not be loaded."
msgstr "Editor could not be loaded."
-#: ../calendar/calendar.error.xml.h:37
+#: ../calendar/calendar.error.xml.h:38
msgid ""
"Email invitations will be sent to all participants and allow them to accept "
"this task."
@@ -4289,25 +4335,30 @@ msgstr ""
"E-mail invitations will be sent to all participants and allow them to accept "
"this task."
-#: ../calendar/calendar.error.xml.h:38
+#: ../calendar/calendar.error.xml.h:39
msgid ""
"Email invitations will be sent to all participants and allow them to reply."
msgstr ""
"E-mail invitations will be sent to all participants and allow them to reply."
-#: ../calendar/calendar.error.xml.h:39
+#: ../calendar/calendar.error.xml.h:40
msgid "Error loading calendar"
msgstr "Error loading calendar"
-#: ../calendar/calendar.error.xml.h:40
+#: ../calendar/calendar.error.xml.h:41
msgid "Error loading memo list"
msgstr "Error loading memo list"
-#: ../calendar/calendar.error.xml.h:41
+#: ../calendar/calendar.error.xml.h:42
msgid "Error loading task list"
msgstr "Error loading task list"
-#: ../calendar/calendar.error.xml.h:42
+#. For Translators: {0} is specify the backend server
+#: ../calendar/calendar.error.xml.h:44
+msgid "Error on '{0}'"
+msgstr "Error on '{0}'"
+
+#: ../calendar/calendar.error.xml.h:45
msgid ""
"If you do not send a cancelation notice, the other participants may not know "
"the meeting is canceled."
@@ -4315,7 +4366,7 @@ msgstr ""
"If you do not send a cancellation notice, the other participants may not "
"know the meeting is cancelled."
-#: ../calendar/calendar.error.xml.h:43
+#: ../calendar/calendar.error.xml.h:46
msgid ""
"If you do not send a cancelation notice, the other participants may not know "
"the memo has been deleted."
@@ -4323,7 +4374,7 @@ msgstr ""
"If you do not send a cancellation notice, the other participants may not "
"know the memo has been deleted."
-#: ../calendar/calendar.error.xml.h:44
+#: ../calendar/calendar.error.xml.h:47
msgid ""
"If you do not send a cancelation notice, the other participants may not know "
"the task has been deleted."
@@ -4331,7 +4382,23 @@ msgstr ""
"If you do not send a cancellation notice, the other participants may not "
"know the task has been deleted."
-#: ../calendar/calendar.error.xml.h:45
+#: ../calendar/calendar.error.xml.h:48
+msgid "No response from the server."
+msgstr "No response from the server."
+
+#: ../calendar/calendar.error.xml.h:49
+msgid "Save Appointment"
+msgstr "Save Appointment"
+
+#: ../calendar/calendar.error.xml.h:50
+msgid "Save Memo"
+msgstr "Save Memo"
+
+#: ../calendar/calendar.error.xml.h:51
+msgid "Save Task"
+msgstr "Save Task"
+
+#: ../calendar/calendar.error.xml.h:52
msgid ""
"Sending updated information allows other participants to keep their "
"calendars up to date."
@@ -4339,7 +4406,7 @@ msgstr ""
"Sending updated information allows other participants to keep their "
"calendars up to date."
-#: ../calendar/calendar.error.xml.h:46
+#: ../calendar/calendar.error.xml.h:53
msgid ""
"Sending updated information allows other participants to keep their task "
"lists up to date."
@@ -4347,7 +4414,7 @@ msgstr ""
"Sending updated information allows other participants to keep their task "
"lists up to date."
-#: ../calendar/calendar.error.xml.h:47
+#: ../calendar/calendar.error.xml.h:55
msgid ""
"Some attachments are being downloaded. Saving the appointment would result "
"in the loss of these attachments."
@@ -4355,7 +4422,7 @@ msgstr ""
"Some attachments are being downloaded. Saving the appointment would result "
"in the loss of these attachments."
-#: ../calendar/calendar.error.xml.h:48
+#: ../calendar/calendar.error.xml.h:56
msgid ""
"Some attachments are being downloaded. Saving the task would result in the "
"loss of these attachments."
@@ -4363,85 +4430,93 @@ msgstr ""
"Some attachments are being downloaded. Saving the task would result in the "
"loss of these attachments."
-#: ../calendar/calendar.error.xml.h:49
+#: ../calendar/calendar.error.xml.h:57
msgid "Some features may not work properly with your current server."
msgstr "Some features may not work properly with your current server."
-#: ../calendar/calendar.error.xml.h:50
+#: ../calendar/calendar.error.xml.h:58
msgid "The Evolution calendar has quit unexpectedly."
msgstr "The Evolution calendar has quit unexpectedly."
-#: ../calendar/calendar.error.xml.h:51
+#: ../calendar/calendar.error.xml.h:59
+msgid "The Evolution calendars have quit unexpectedly."
+msgstr "The Evolution calendars have quit unexpectedly."
+
+#: ../calendar/calendar.error.xml.h:60
msgid "The Evolution memo has quit unexpectedly."
msgstr "The Evolution memo has quit unexpectedly."
-#: ../calendar/calendar.error.xml.h:52
+#: ../calendar/calendar.error.xml.h:61
msgid "The Evolution tasks have quit unexpectedly."
msgstr "The Evolution tasks have quit unexpectedly."
-#: ../calendar/calendar.error.xml.h:53
+#: ../calendar/calendar.error.xml.h:62
msgid "The calendar is not marked for offline usage."
msgstr "The calendar is not marked for offline usage."
-#: ../calendar/calendar.error.xml.h:54
+#: ../calendar/calendar.error.xml.h:63
msgid "The memo list is not marked for offline usage."
msgstr "The memo list is not marked for offline usage"
-#: ../calendar/calendar.error.xml.h:55
+#: ../calendar/calendar.error.xml.h:64
msgid "The task list is not marked for offline usage."
msgstr "The task list is not marked for offline usage."
-#: ../calendar/calendar.error.xml.h:56
+#: ../calendar/calendar.error.xml.h:65
msgid "This calendar will be removed permanently."
msgstr "This calendar will be removed permanently."
-#: ../calendar/calendar.error.xml.h:57
+#: ../calendar/calendar.error.xml.h:66
msgid "This memo list will be removed permanently."
msgstr "This memo list will be removed permanently."
-#: ../calendar/calendar.error.xml.h:58
+#: ../calendar/calendar.error.xml.h:67
msgid "This task list will be removed permanently."
msgstr "This task list will be removed permanently."
-#: ../calendar/calendar.error.xml.h:59
+#: ../calendar/calendar.error.xml.h:68
+msgid "Unable to load the calendar"
+msgstr "Unable to load the calendar"
+
+#: ../calendar/calendar.error.xml.h:69
msgid "Would you like to save your changes to this appointment?"
msgstr "Would you like to save your changes to this appointment?"
# calendar:prompt-save-task primary
-#: ../calendar/calendar.error.xml.h:60
+#: ../calendar/calendar.error.xml.h:70
msgid "Would you like to save your changes to this memo?"
msgstr "Would you like to save your changes to this memo?"
# calendar:prompt-save-task primary
-#: ../calendar/calendar.error.xml.h:61
+#: ../calendar/calendar.error.xml.h:71
msgid "Would you like to save your changes to this task?"
msgstr "Would you like to save your changes to this task?"
-#: ../calendar/calendar.error.xml.h:62
+#: ../calendar/calendar.error.xml.h:72
msgid "Would you like to send a cancelation notice for this memo?"
msgstr "Would you like to send a cancellation notice for this memo?"
-#: ../calendar/calendar.error.xml.h:63
+#: ../calendar/calendar.error.xml.h:73
msgid "Would you like to send all the participants a cancelation notice?"
msgstr "Would you like to send all the participants a cancellation notice?"
-#: ../calendar/calendar.error.xml.h:64
+#: ../calendar/calendar.error.xml.h:74
msgid "Would you like to send meeting invitations to participants?"
msgstr "Would you like to send meeting invitations to participants?"
-#: ../calendar/calendar.error.xml.h:65
+#: ../calendar/calendar.error.xml.h:75
msgid "Would you like to send this task to participants?"
msgstr "Would you like to send this task to participants?"
-#: ../calendar/calendar.error.xml.h:66
+#: ../calendar/calendar.error.xml.h:76
msgid "Would you like to send updated meeting information to participants?"
msgstr "Would you like to send updated meeting information to participants?"
-#: ../calendar/calendar.error.xml.h:67
+#: ../calendar/calendar.error.xml.h:77
msgid "Would you like to send updated task information to participants?"
msgstr "Would you like to send updated task information to participants?"
-#: ../calendar/calendar.error.xml.h:68
+#: ../calendar/calendar.error.xml.h:78
msgid ""
"You are connecting to an unsupported GroupWise server and may encounter "
"problems using Evolution. For best results, the server should be upgraded to "
@@ -4451,109 +4526,109 @@ msgstr ""
"problems using Evolution. For best results, the server should be upgraded to "
"a supported version."
-#: ../calendar/calendar.error.xml.h:69
+#: ../calendar/calendar.error.xml.h:79
msgid "You have changed this appointment, but not yet saved it."
msgstr "You have changed this appointment, but not yet saved it."
# calendar:prompt-save-task secondary
-#: ../calendar/calendar.error.xml.h:70
+#: ../calendar/calendar.error.xml.h:80
msgid "You have changed this task, but not yet saved it."
msgstr "You have changed this task, but not yet saved it."
# calendar:prompt-save-task secondary
-#: ../calendar/calendar.error.xml.h:71
+#: ../calendar/calendar.error.xml.h:81
msgid "You have made changes to this memo, but not yet saved them."
msgstr "You have made changes to this memo, but not yet saved them."
-#: ../calendar/calendar.error.xml.h:72
+#: ../calendar/calendar.error.xml.h:82
msgid "Your calendars will not be available until Evolution is restarted."
msgstr "Your calendars will not be available until Evolution is restarted."
-#: ../calendar/calendar.error.xml.h:73
+#: ../calendar/calendar.error.xml.h:83
msgid "Your memos will not be available until Evolution is restarted."
msgstr "Your memos will not be available until Evolution is restarted."
-#: ../calendar/calendar.error.xml.h:74
+#: ../calendar/calendar.error.xml.h:84
msgid "Your tasks will not be available until Evolution is restarted."
msgstr "Your tasks will not be available until Evolution is restarted."
-#: ../calendar/calendar.error.xml.h:75
+#: ../calendar/calendar.error.xml.h:85
#: ../composer/mail-composer.error.xml.h:30
msgid "_Discard Changes"
msgstr "_Discard Changes"
-#: ../calendar/calendar.error.xml.h:76 ../composer/e-composer-actions.c:499
+#: ../calendar/calendar.error.xml.h:86 ../composer/e-composer-actions.c:497
msgid "_Save"
msgstr "_Save"
-#: ../calendar/calendar.error.xml.h:77
+#: ../calendar/calendar.error.xml.h:87
msgid "_Save Changes"
msgstr "_Save Changes"
-#: ../calendar/calendar.error.xml.h:78
+#: ../calendar/calendar.error.xml.h:88
#: ../composer/mail-composer.error.xml.h:34 ../mail/mail.error.xml.h:142
#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:6
msgid "_Send"
msgstr "_Send"
-#: ../calendar/calendar.error.xml.h:79
+#: ../calendar/calendar.error.xml.h:89
msgid "_Send Notice"
msgstr "_Send Notice"
-#: ../calendar/calendar.error.xml.h:80
+#: ../calendar/calendar.error.xml.h:90
msgid "{0}."
msgstr "{0}."
-#: ../calendar/conduits/calendar/calendar-conduit.c:256
+#: ../calendar/conduits/calendar/calendar-conduit.c:258
msgid "Split Multi-Day Events:"
msgstr "Split Multi-Day Events:"
-#: ../calendar/conduits/calendar/calendar-conduit.c:1521
-#: ../calendar/conduits/calendar/calendar-conduit.c:1522
-#: ../calendar/conduits/memo/memo-conduit.c:820
+#: ../calendar/conduits/calendar/calendar-conduit.c:1523
+#: ../calendar/conduits/calendar/calendar-conduit.c:1524
#: ../calendar/conduits/memo/memo-conduit.c:821
-#: ../calendar/conduits/todo/todo-conduit.c:1018
+#: ../calendar/conduits/memo/memo-conduit.c:822
#: ../calendar/conduits/todo/todo-conduit.c:1019
+#: ../calendar/conduits/todo/todo-conduit.c:1020
msgid "Could not start evolution-data-server"
msgstr "Could not start evolution-data-server"
-#: ../calendar/conduits/calendar/calendar-conduit.c:1629
-#: ../calendar/conduits/calendar/calendar-conduit.c:1632
+#: ../calendar/conduits/calendar/calendar-conduit.c:1631
+#: ../calendar/conduits/calendar/calendar-conduit.c:1634
msgid "Could not read pilot's Calendar application block"
msgstr "Could not read pilot's Calendar application block"
-#: ../calendar/conduits/memo/memo-conduit.c:914
-#: ../calendar/conduits/memo/memo-conduit.c:917
+#: ../calendar/conduits/memo/memo-conduit.c:915
+#: ../calendar/conduits/memo/memo-conduit.c:918
msgid "Could not read pilot's Memo application block"
msgstr "Could not read pilot's Memo application block"
-#: ../calendar/conduits/memo/memo-conduit.c:961
-#: ../calendar/conduits/memo/memo-conduit.c:964
+#: ../calendar/conduits/memo/memo-conduit.c:962
+#: ../calendar/conduits/memo/memo-conduit.c:965
msgid "Could not write pilot's Memo application block"
msgstr "Could not write pilot's Memo application block"
-#: ../calendar/conduits/todo/todo-conduit.c:240
+#: ../calendar/conduits/todo/todo-conduit.c:241
msgid "Default Priority:"
msgstr "Default Priority:"
-#: ../calendar/conduits/todo/todo-conduit.c:1102
-#: ../calendar/conduits/todo/todo-conduit.c:1105
+#: ../calendar/conduits/todo/todo-conduit.c:1103
+#: ../calendar/conduits/todo/todo-conduit.c:1106
msgid "Could not read pilot's ToDo application block"
msgstr "Could not read pilot's ToDo application block"
-#: ../calendar/conduits/todo/todo-conduit.c:1147
-#: ../calendar/conduits/todo/todo-conduit.c:1150
+#: ../calendar/conduits/todo/todo-conduit.c:1148
+#: ../calendar/conduits/todo/todo-conduit.c:1151
msgid "Could not write pilot's ToDo application block"
msgstr "Could not write pilot's ToDo application block"
#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-#: ../plugins/itip-formatter/itip-formatter.c:2358
+#: ../plugins/itip-formatter/itip-formatter.c:2523
msgid "Calendar and Tasks"
msgstr "Calendar and Tasks"
#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-#: ../calendar/gui/calendar-component.c:805
-#: ../calendar/gui/calendar-component.c:1402
+#: ../calendar/gui/calendar-component.c:869
+#: ../calendar/gui/calendar-component.c:1291
msgid "Calendars"
msgstr "Calendars"
@@ -4594,22 +4669,21 @@ msgid "Memo_s"
msgstr "Memo_s"
#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: ../calendar/gui/e-memo-table.c:280 ../calendar/gui/e-memos.c:1120
-#: ../calendar/gui/gnome-cal.c:1774 ../calendar/gui/memos-component.c:548
-#: ../calendar/gui/memos-component.c:1101 ../calendar/gui/memos-control.c:354
-#: ../calendar/gui/memos-control.c:370
+#: ../calendar/gui/e-memo-table.c:293 ../calendar/gui/e-memos.c:1133
+#: ../calendar/gui/gnome-cal.c:1821 ../calendar/gui/memos-component.c:594
+#: ../calendar/gui/memos-component.c:912 ../calendar/gui/memos-control.c:350
+#: ../calendar/gui/memos-control.c:366
msgid "Memos"
msgstr "Memos"
#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
-#: ../calendar/gui/e-calendar-table.c:704 ../calendar/gui/e-tasks.c:1429
-#: ../calendar/gui/gnome-cal.c:1642 ../calendar/gui/print.c:1982
-#: ../calendar/gui/tasks-component.c:539
-#: ../calendar/gui/tasks-component.c:1090 ../calendar/gui/tasks-control.c:492
-#: ../calendar/gui/tasks-control.c:508
-#: ../calendar/importers/icalendar-importer.c:74
-#: ../calendar/importers/icalendar-importer.c:735
-#: ../plugins/exchange-operations/exchange-delegates-user.c:76
+#: ../calendar/gui/e-calendar-table.c:725 ../calendar/gui/e-tasks.c:1437
+#: ../calendar/gui/gnome-cal.c:1689 ../calendar/gui/print.c:1988
+#: ../calendar/gui/tasks-component.c:586 ../calendar/gui/tasks-component.c:908
+#: ../calendar/gui/tasks-control.c:482 ../calendar/gui/tasks-control.c:498
+#: ../calendar/importers/icalendar-importer.c:76
+#: ../calendar/importers/icalendar-importer.c:749
+#: ../plugins/exchange-operations/exchange-delegates-user.c:78
#: ../plugins/exchange-operations/exchange-folder.c:588
#: ../plugins/groupwise-account-setup/camel-gw-listener.c:425
#: ../plugins/groupwise-account-setup/camel-gw-listener.c:569
@@ -4621,8 +4695,9 @@ msgstr "Tasks"
msgid "_Calendars"
msgstr "_Calendars"
+#. Tasks
#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:15
-#: ../views/tasks/galview.xml.h:3
+#: ../plugins/pst-import/pst-importer.c:331 ../views/tasks/galview.xml.h:3
msgid "_Tasks"
msgstr "_Tasks"
@@ -4630,26 +4705,27 @@ msgstr "_Tasks"
msgid "Evolution Calendar alarm notification service"
msgstr "Evolution Calendar alarm notification service"
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:104
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:105
msgid "minute"
msgid_plural "minutes"
msgstr[0] "minute"
msgstr[1] "minutes"
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:119
-#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:6
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:120
+#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:8
#: ../calendar/gui/dialogs/alarm-dialog.glade.h:25
#: ../calendar/gui/dialogs/event-page.glade.h:19 ../filter/filter.glade.h:15
+#: ../plugins/caldav/caldav-source.c:431
#: ../plugins/calendar-http/calendar-http.c:280
-#: ../plugins/calendar-weather/calendar-weather.c:562
-#: ../plugins/google-account-setup/google-source.c:663
-#: ../plugins/google-account-setup/google-contacts-source.c:329
+#: ../plugins/calendar-weather/calendar-weather.c:525
+#: ../plugins/google-account-setup/google-source.c:653
+#: ../plugins/google-account-setup/google-contacts-source.c:367
msgid "hours"
msgid_plural "hours"
msgstr[0] "hours"
msgstr[1] "hours"
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:273
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:298
msgid "Start time"
msgstr "Start time"
@@ -4658,66 +4734,74 @@ msgstr "Start time"
msgid "Appointments"
msgstr "Appointments"
-#. Location
#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:2
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1599
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1605
-#: ../calendar/gui/e-itip-control.c:1172
-#: ../plugins/itip-formatter/itip-view.c:1004
+msgid "Dismiss _All"
+msgstr "Dismiss _All"
+
+#. Location
+#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:3
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1610
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1616
+#: ../calendar/gui/e-itip-control.c:1167
+#: ../plugins/itip-formatter/itip-view.c:1021
msgid "Location:"
msgstr "Location:"
-#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:3
+#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:4
msgid "Snooze _time:"
msgstr "Snooze _time:"
-#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:4
-#: ../calendar/gui/dialogs/comp-editor.c:1332
+#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:5
+msgid "_Dismiss"
+msgstr "_Dismiss"
+
+#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:6
+#: ../calendar/gui/dialogs/comp-editor.c:1382
#: ../calendar/gui/dialogs/recurrence-page.glade.h:10
-#: ../filter/filter.glade.h:11 ../mail/mail-config.glade.h:167
+#: ../filter/filter.glade.h:11 ../mail/mail-config.glade.h:170
#: ../plugins/exchange-operations/exchange-delegates.glade.h:15
#: ../plugins/publish-calendar/publish-calendar.glade.h:21
-#: ../ui/evolution-addressbook.xml.h:51 ../ui/evolution-calendar.xml.h:41
+#: ../ui/evolution-addressbook.xml.h:51 ../ui/evolution-calendar.xml.h:43
#: ../ui/evolution-mail-messagedisplay.xml.h:5 ../ui/evolution-memos.xml.h:17
#: ../ui/evolution-tasks.xml.h:25 ../ui/evolution.xml.h:42
#: ../widgets/menus/gal-define-views.glade.h:5
msgid "_Edit"
msgstr "_Edit"
-#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:5
+#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:7
msgid "_Snooze"
msgstr "_Snooze"
-#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:7
+#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:9
msgid "location of appointment"
msgstr "location of appointment"
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1457
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1582
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1468
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1593
msgid "No summary available."
msgstr "No summary available."
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1466
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1468
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1477
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1479
msgid "No description available."
msgstr "No description available."
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1476
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1487
msgid "No location information available."
msgstr "No location information available."
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1521
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1532
#, c-format
msgid "You have %d alarms"
msgstr "You have %d alarms"
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1683
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1711
-#: ../mail/mail-component.c:1597
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1694
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1722
+#: ../e-util/e-non-intrusive-error-dialog.h:41
msgid "Warning"
msgstr "Warning"
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1687
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1698
msgid ""
"Evolution does not support calendar reminders with\n"
"email notifications yet, but this reminder was\n"
@@ -4729,7 +4813,7 @@ msgstr ""
"configured to send an e-mail. Evolution will display\n"
"a normal reminder dialogue box instead."
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1717
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1728
#, c-format
msgid ""
"An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -4746,15 +4830,15 @@ msgstr ""
"\n"
"Are you sure you want to run this program?"
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1731
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1742
msgid "Do not ask me about this program again."
msgstr "Do not ask me about this program again."
-#: ../calendar/gui/alarm-notify/notify-main.c:138
+#: ../calendar/gui/alarm-notify/notify-main.c:141
msgid "Could not initialize Bonobo"
msgstr "Could not initialise Bonobo"
-#: ../calendar/gui/alarm-notify/notify-main.c:151
+#: ../calendar/gui/alarm-notify/notify-main.c:154
msgid ""
"Could not create the alarm notify service factory, maybe it's already "
"running..."
@@ -4767,7 +4851,7 @@ msgid "invalid time"
msgstr "invalid time"
#. Translator: Entire string is like "Pop up an alert %d hours before start of appointment"
-#: ../calendar/gui/alarm-notify/util.c:69 ../calendar/gui/e-alarm-list.c:404
+#: ../calendar/gui/alarm-notify/util.c:69 ../calendar/gui/e-alarm-list.c:406
#: ../calendar/gui/misc.c:116
#, c-format
msgid "%d hour"
@@ -4776,7 +4860,7 @@ msgstr[0] "%d hour"
msgstr[1] "%d hours"
#. Translator: Entire string is like "Pop up an alert %d minutes before start of appointment"
-#: ../calendar/gui/alarm-notify/util.c:75 ../calendar/gui/e-alarm-list.c:410
+#: ../calendar/gui/alarm-notify/util.c:75 ../calendar/gui/e-alarm-list.c:412
#: ../calendar/gui/misc.c:122
#, c-format
msgid "%d minute"
@@ -4787,7 +4871,7 @@ msgstr[1] "%d minutes"
#. TRANSLATORS: here, "second" is the time division (like "minute"), not the ordinal number (like "third")
#. Translator: Entire string is like "Pop up an alert %d seconds before start of appointment"
#. TRANSLATORS: here, "second" is the time division (like "minute"), not the ordinal number (like "third")
-#: ../calendar/gui/alarm-notify/util.c:79 ../calendar/gui/e-alarm-list.c:416
+#: ../calendar/gui/alarm-notify/util.c:79 ../calendar/gui/e-alarm-list.c:418
#: ../calendar/gui/misc.c:126
#, c-format
msgid "%d second"
@@ -4800,156 +4884,182 @@ msgid "Alarm programs"
msgstr "Alarm programs"
#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:2
+#: ../mail/evolution-mail.schemas.in.h:6
+msgid "Amount of time in seconds the error should be shown on the status bar."
+msgstr "Amount of time in seconds the error should be shown on the status bar."
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:3
msgid "Ask for confirmation when deleting items"
msgstr "Ask for confirmation when deleting items"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:3
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:4
msgid "Background color of tasks that are due today, in \"#rrggbb\" format."
msgstr "Background colour of tasks that are due today, in \"#rrggbb\" format."
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:4
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:5
msgid "Background color of tasks that are overdue, in \"#rrggbb\" format."
msgstr "Background colour of tasks that are overdue, in \"#rrggbb\" format."
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:5
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:6
msgid "Calendars to run alarms for"
msgstr "Calendars to run alarms for"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:6
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:7
msgid ""
"Color to draw the Marcus Bains Line in the Time bar (empty for default)."
msgstr ""
"Colour to draw the Marcus Bains Line in the Time bar (empty for default)."
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:7
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:8
msgid "Color to draw the Marcus Bains line in the Day View."
msgstr "Colour to draw the Marcus Bains line in the Day View."
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:8
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:9
msgid "Compress weekends in month view"
msgstr "Compress weekends in month view"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:9
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:10
msgid "Confirm expunge"
msgstr "Confirm expunge"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:10
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:11
msgid "Days on which the start and end of work hours should be indicated."
msgstr "Days on which the start and end of work hours should be indicated."
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:11
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:12
msgid "Default appointment reminder"
msgstr "Default appointment reminder"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:12
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:13
msgid "Default reminder units"
msgstr "Default reminder units"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:13
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:14
msgid "Default reminder value"
msgstr "Default reminder value"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:14
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:15
msgid "Directory for saving alarm audio files"
msgstr "Directory for saving alarm audio files"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:15
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:16
msgid "Event Gradient"
msgstr "Event Gradient"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:16
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:17
msgid "Event Transparency"
msgstr "Event Transparency"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:17
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:18
msgid "Free/busy server URLs"
msgstr "Free/busy server URLs"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:18
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:19
msgid "Free/busy template URL"
msgstr "Free/busy template URL"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:19
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:20
msgid "Gradient of the events in calendar views."
msgstr "Gradient of the events in calendar views."
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:20
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:21
msgid "Hide completed tasks"
msgstr "Hide completed tasks"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:21
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:22
msgid "Hide task units"
msgstr "Hide task units"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:22
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:23
msgid "Hide task value"
msgstr "Hide task value"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:23
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:24
msgid "Horizontal pane position"
msgstr "Horizontal pane position"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:24
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:25
msgid "Hour the workday ends on, in twenty four hour format, 0 to 23."
msgstr "Hour the workday ends on, in twenty four hour format, 0 to 23."
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:25
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:26
msgid "Hour the workday starts on, in twenty four hour format, 0 to 23."
msgstr "Hour the workday starts on, in twenty four hour format, 0 to 23."
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:26
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:27
msgid "Intervals shown in Day and Work Week views, in minutes."
msgstr "Intervals shown in Day and Work Week views, in minutes."
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:27
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:28
msgid "Last alarm time"
msgstr "Last alarm time"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:28
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:29
+#: ../mail/evolution-mail.schemas.in.h:72
+msgid "Level beyond which the message should be logged."
+msgstr "Level beyond which the message should be logged."
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:30
+msgid "List of recently used second time zones in a Day View."
+msgstr "List of recently used second time zones in a Day View."
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:31
msgid "List of server URLs for free/busy publishing."
msgstr "List of server URLs for free/busy publishing."
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:29
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:32
msgid "Marcus Bains Line"
msgstr "Marcus Bains Line"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:30
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:33
msgid "Marcus Bains Line Color - Day View"
msgstr "Marcus Bains Line Colour - Day View"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:31
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:34
msgid "Marcus Bains Line Color - Time bar"
msgstr "Marcus Bains Line Colour - Time bar"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:32
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:35
+msgid ""
+"Maximum number of recently used timezones to remember in a "
+"'day_second_zones' list."
+msgstr ""
+"Maximum number of recently used timezones to remember in a "
+"'day_second_zones' list."
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:36
+msgid "Maximum number of recently used timezones to remember."
+msgstr "Maximum number of recently used timezones to remember."
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:37
msgid "Minute the workday ends on, 0 to 59."
msgstr "Minute the workday ends on, 0 to 59."
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:33
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:38
msgid "Minute the workday starts on, 0 to 59."
msgstr "Minute the workday starts on, 0 to 59."
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:34
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:39
msgid "Month view horizontal pane position"
msgstr "Month view horizontal pane position"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:35
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:40
msgid "Month view vertical pane position"
msgstr "Month view vertical pane position"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:36
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:41
msgid "Number of units for determining a default reminder."
msgstr "Number of units for determining a default reminder."
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:37
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:42
msgid "Number of units for determining when to hide tasks."
msgstr "Number of units for determining when to hide tasks."
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:38
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:43
msgid "Overdue tasks color"
msgstr "Overdue tasks colour"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:39
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:44
msgid ""
"Position of the horizontal pane, between the date navigator calendar and the "
"task list when not in the month view, in pixels."
@@ -4957,7 +5067,7 @@ msgstr ""
"Position of the horizontal pane, between the date navigator calendar and the "
"task list when not in the month view, in pixels."
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:40
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:45
msgid ""
"Position of the horizontal pane, between the view and the date navigator "
"calendar and task list in the month view, in pixels."
@@ -4965,7 +5075,7 @@ msgstr ""
"Position of the horizontal pane, between the view and the date navigator "
"calendar and task list in the month view, in pixels."
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:41
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:46
msgid ""
"Position of the vertical pane, between the calendar lists and the date "
"navigator calendar."
@@ -4973,7 +5083,7 @@ msgstr ""
"Position of the vertical pane, between the calendar lists and the date "
"navigator calendar."
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:42
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:47
msgid ""
"Position of the vertical pane, between the task list and the task preview "
"pane, in pixels."
@@ -4981,7 +5091,7 @@ msgstr ""
"Position of the vertical pane, between the task list and the task preview "
"pane, in pixels."
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:43
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:48
msgid ""
"Position of the vertical pane, between the view and the date navigator "
"calendar and task list in the month view, in pixels."
@@ -4989,7 +5099,7 @@ msgstr ""
"Position of the vertical pane, between the view and the date navigator "
"calendar and task list in the month view, in pixels."
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:44
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:49
msgid ""
"Position of the vertical pane, between the view and the date navigator "
"calendar and task list when not in the month view, in pixels."
@@ -4997,69 +5107,85 @@ msgstr ""
"Position of the vertical pane, between the view and the date navigator "
"calendar and task list when not in the month view, in pixels."
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:45
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:50
msgid "Programs that are allowed to be run by alarms."
msgstr "Programs that are allowed to be run by alarms."
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:46
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:51
+msgid "Recently used second time zones in a Day View"
+msgstr "Recently used second time zones in a Day View"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:52
msgid "Save directory for alarm audio"
msgstr "Save directory for alarm audio"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:47
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:53
msgid "Show RSVP field in the event/task/meeting editor"
msgstr "Show RSVP field in the event/task/meeting editor"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:48
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:54
msgid "Show Role field in the event/task/meeting editor"
msgstr "Show Role field in the event/task/meeting editor"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:49
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:55
msgid "Show appointment end times in week and month views"
msgstr "Show appointment end times in week and month views"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:50
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:56
msgid "Show categories field in the event/meeting/task editor"
msgstr "Show categories field in the event/meeting/task editor"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:51
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:57
msgid "Show display alarms in notification tray"
msgstr "Show display alarms in notification tray"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:52
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:58
msgid "Show status field in the event/task/meeting editor"
msgstr "Show status field in the event/task/meeting editor"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:53
-#: ../mail/evolution-mail.schemas.in.h:124
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:59
+#: ../mail/evolution-mail.schemas.in.h:126
msgid "Show the \"Preview\" pane"
msgstr "Show the \"Preview\" pane"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:54
-#: ../mail/evolution-mail.schemas.in.h:125
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:60
+#: ../mail/evolution-mail.schemas.in.h:127
msgid "Show the \"Preview\" pane."
msgstr "Show the \"Preview\" pane."
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:55
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:61
msgid "Show timezone field in the event/meeting editor"
msgstr "Show timezone field in the event/meeting editor"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:56
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:62
msgid "Show type field in the event/task/meeting editor"
msgstr "Show type field in the event/task/meeting editor"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:57
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:63
+msgid "Show week number in Day and Work Week View"
+msgstr "Show week number in Day and Work Week View"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:64
msgid "Show week numbers in date navigator"
msgstr "Show week numbers in date navigator"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:58
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:65
+msgid ""
+"Shows the second time zone in a Day View, if set. Value is similar to one "
+"used in a 'timezone' key."
+msgstr ""
+"Shows the second time zone in a Day View, if set. Value is similar to one "
+"used in a 'timezone' key."
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:66
msgid "Tasks due today color"
msgstr "Tasks due today colour"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:59
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:67
msgid "Tasks vertical pane position"
msgstr "Tasks vertical pane position"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:61
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:69
#, no-c-format
msgid ""
"The URL template to use as a free/busy data fallback, %u is replaced by the "
@@ -5068,7 +5194,7 @@ msgstr ""
"The URL template to use as a free/busy data fallback, %u is replaced by the "
"user part of the mail address and %d is replaced by the domain."
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:62
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:70
msgid ""
"The default timezone to use for dates and times in the calendar, as an "
"untranslated Olsen timezone database location like \"America/New York\"."
@@ -5076,20 +5202,32 @@ msgstr ""
"The default timezone to use for dates and times in the calendar, as an "
"untranslated Olsen timezone database location like \"America/New York\"."
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:63
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:71
+msgid "The second timezone for a Day View"
+msgstr "The second timezone for a Day View"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:72
+msgid ""
+"This can have three possible values. 0 for errors. 1 for warnings. 2 for "
+"debug messages."
+msgstr ""
+"This can have three possible values: 0 for errors, 1 for warnings, 2 for "
+"debug messages."
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:73
msgid "Time divisions"
msgstr "Time divisions"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:64
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:74
msgid "Time the last alarm ran, in time_t."
msgstr "Time the last alarm ran, in time_t."
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:65
-#: ../plugins/startup-wizard/startup-wizard.c:107
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:75
+#: ../plugins/startup-wizard/startup-wizard.c:109
msgid "Timezone"
msgstr "Timezone"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:66
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:76
msgid ""
"Transparency of the events in calendar views, a value between 0 "
"(transparent) and 1 (opaque)."
@@ -5097,41 +5235,41 @@ msgstr ""
"Transparency of the events in calendar views, a value between 0 "
"(transparent) and 1 (opaque)."
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:67
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:77
msgid "Twenty four hour time format"
msgstr "Twenty four hour time format"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:68
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:78
msgid "Units for a default reminder, \"minutes\", \"hours\" or \"days\"."
msgstr "Units for a default reminder, \"minutes\", \"hours\" or \"days\"."
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:69
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:79
msgid ""
"Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days\"."
msgstr ""
"Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days\"."
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:71
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:81
msgid "Week start"
msgstr "Week start"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:72
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:82
msgid "Weekday the week starts on, from Sunday (0) to Saturday (6)."
msgstr "Weekday the week starts on, from Sunday (0) to Saturday (6)."
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:73
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:83
msgid "Whether or not to use the notification tray for display alarms."
msgstr "Whether or not to use the notification tray for display alarms."
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:74
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:84
msgid "Whether to ask for confirmation when deleting an appointment or task."
msgstr "Whether to ask for confirmation when deleting an appointment or task."
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:75
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:85
msgid "Whether to ask for confirmation when expunging appointments and tasks."
msgstr "Whether to ask for confirmation when expunging appointments and tasks."
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:76
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:86
msgid ""
"Whether to compress weekends in the month view, which puts Saturday and "
"Sunday in the space of one weekday."
@@ -5139,146 +5277,145 @@ msgstr ""
"Whether to compress weekends in the month view, which puts Saturday and "
"Sunday in the space of one weekday."
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:77
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:87
msgid "Whether to display the end time of events in the week and month views."
msgstr "Whether to display the end time of events in the week and month views."
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:78
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:88
msgid ""
"Whether to draw the Marcus Bains Line (line at current time) in the calendar."
msgstr ""
"Whether to draw the Marcus Bains Line (line at current time) in the calendar."
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:79
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:89
msgid "Whether to hide completed tasks in the tasks view."
msgstr "Whether to hide completed tasks in the tasks view."
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:80
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:90
msgid "Whether to set a default reminder for appointments."
msgstr "Whether to set a default reminder for appointments."
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:81
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:91
msgid "Whether to show RSVP field in the event/task/meeting editor"
msgstr "Whether to show RSVP field in the event/task/meeting editor"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:82
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:92
msgid "Whether to show categories field in the event/meeting editor"
msgstr "Whether to show categories field in the event/meeting editor"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:83
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:93
msgid "Whether to show role field in the event/task/meeting editor"
msgstr "Whether to show role field in the event/task/meeting editor"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:84
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:94
msgid "Whether to show status field in the event/task/meeting editor"
msgstr "Whether to show status field in the event/task/meeting editor"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:85
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:95
msgid ""
"Whether to show times in twenty four hour format instead of using am/pm."
msgstr ""
"Whether to show times in twenty four hour format instead of using am/pm."
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:86
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:96
msgid "Whether to show timezone field in the event/meeting editor"
msgstr "Whether to show timezone field in the event/meeting editor"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:87
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:97
msgid "Whether to show type field in the event/task/meeting editor"
msgstr "Whether to show type field in the event/task/meeting editor"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:88
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:98
+msgid "Whether to show week number in the Day and Work Week View."
+msgstr "Whether to show week number in the Day and Work Week View."
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:99
msgid "Whether to show week numbers in the date navigator."
msgstr "Whether to show week numbers in the date navigator."
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:89
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:100
msgid "Whether to use daylight savings time while displaying events."
msgstr "Whether to use daylight savings time while displaying events."
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:90
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:101
msgid "Work days"
msgstr "Work days"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:91
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:102
msgid "Workday end hour"
msgstr "Workday end hour"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:92
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:103
msgid "Workday end minute"
msgstr "Workday end minute"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:93
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:104
msgid "Workday start hour"
msgstr "Workday start hour"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:94
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:105
msgid "Workday start minute"
msgstr "Workday start minute"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:95
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:106
msgid "daylight savings time"
msgstr "daylight savings time"
-#: ../calendar/gui/cal-search-bar.c:71
+#: ../calendar/gui/cal-search-bar.c:75
msgid "Summary contains"
msgstr "Summary contains"
-#: ../calendar/gui/cal-search-bar.c:72
+#: ../calendar/gui/cal-search-bar.c:76
msgid "Description contains"
msgstr "Description contains"
-#: ../calendar/gui/cal-search-bar.c:73
+#: ../calendar/gui/cal-search-bar.c:77
msgid "Category is"
msgstr "Category is"
-#: ../calendar/gui/cal-search-bar.c:74
+#: ../calendar/gui/cal-search-bar.c:78
msgid "Comment contains"
msgstr "Comment contains"
-#: ../calendar/gui/cal-search-bar.c:75
+#: ../calendar/gui/cal-search-bar.c:79
msgid "Location contains"
msgstr "Location contains"
-#: ../calendar/gui/cal-search-bar.c:629 ../calendar/gui/cal-search-bar.c:672
-#: ../calendar/gui/cal-search-bar.c:691
-msgid "Unmatched"
-msgstr "Unmatched"
-
-#: ../calendar/gui/cal-search-bar.c:637
+#: ../calendar/gui/cal-search-bar.c:640
msgid "Next 7 Days' Tasks"
msgstr "Next 7 Days' Tasks"
-#: ../calendar/gui/cal-search-bar.c:641
+#: ../calendar/gui/cal-search-bar.c:644
msgid "Active Tasks"
msgstr "Active Tasks"
-#: ../calendar/gui/cal-search-bar.c:645
+#: ../calendar/gui/cal-search-bar.c:648
msgid "Overdue Tasks"
msgstr "Overdue Tasks"
-#: ../calendar/gui/cal-search-bar.c:649
+#: ../calendar/gui/cal-search-bar.c:652
msgid "Completed Tasks"
msgstr "Completed Tasks"
-#: ../calendar/gui/cal-search-bar.c:653
+#: ../calendar/gui/cal-search-bar.c:656
msgid "Tasks with Attachments"
msgstr "Tasks with Attachments"
-#: ../calendar/gui/cal-search-bar.c:699
+#: ../calendar/gui/cal-search-bar.c:702
msgid "Active Appointments"
msgstr "Active Appointments"
-#: ../calendar/gui/cal-search-bar.c:703
+#: ../calendar/gui/cal-search-bar.c:706
msgid "Next 7 Days' Appointments"
msgstr "Next 7 Days' Appointments"
-#: ../calendar/gui/calendar-commands.c:92 ../ui/evolution-addressbook.xml.h:26
+#: ../calendar/gui/calendar-commands.c:90 ../ui/evolution-addressbook.xml.h:26
#: ../ui/evolution-calendar.xml.h:20 ../ui/evolution-mail-message.xml.h:75
#: ../ui/evolution-memos.xml.h:11 ../ui/evolution-tasks.xml.h:14
msgid "Print"
msgstr "Print"
-#: ../calendar/gui/calendar-commands.c:317
+#: ../calendar/gui/calendar-commands.c:315
msgid ""
"This operation will permanently erase all events older than the selected "
"amount of time. If you continue, you will not be able to recover these "
@@ -5288,117 +5425,137 @@ msgstr ""
"amount of time. If you continue, you will not be able to recover these "
"events."
-#: ../calendar/gui/calendar-commands.c:323
+#: ../calendar/gui/calendar-commands.c:321
msgid "Purge events older than"
msgstr "Purge events older than"
-#: ../calendar/gui/calendar-commands.c:328
+#: ../calendar/gui/calendar-commands.c:326
#: ../calendar/gui/dialogs/alarm-dialog.glade.h:21 ../filter/filter.glade.h:14
+#: ../plugins/caldav/caldav-source.c:432
#: ../plugins/calendar-http/calendar-http.c:281
-#: ../plugins/calendar-weather/calendar-weather.c:563
-#: ../plugins/google-account-setup/google-source.c:664
-#: ../plugins/google-account-setup/google-contacts-source.c:330
+#: ../plugins/calendar-weather/calendar-weather.c:526
+#: ../plugins/google-account-setup/google-source.c:654
+#: ../plugins/google-account-setup/google-contacts-source.c:368
#: ../widgets/misc/e-send-options.glade.h:39
msgid "days"
msgstr "days"
+#. ensure the group name is in current locale, not read from configuration
#. Create the On the web source group
-#. Create the LDAP source group
+#. ensure the group name is in current locale, not read from configuration
+#. Create the source group
#. Create the Webcal source group
#. Create the LDAP source group
-#: ../calendar/gui/calendar-component.c:273
-#: ../calendar/gui/memos-component.c:235 ../calendar/gui/migration.c:505
-#: ../calendar/gui/migration.c:604 ../calendar/gui/migration.c:1118
-#: ../calendar/gui/tasks-component.c:231
+#. ensure the group name is in current locale, not read from configuration
+#: ../calendar/gui/calendar-component.c:287
+#: ../calendar/gui/calendar-component.c:290
+#: ../calendar/gui/memos-component.c:240 ../calendar/gui/memos-component.c:243
+#: ../calendar/gui/migration.c:505 ../calendar/gui/migration.c:604
+#: ../calendar/gui/migration.c:1118 ../calendar/gui/tasks-component.c:237
+#: ../calendar/gui/tasks-component.c:243
msgid "On The Web"
msgstr "On The Web"
-#: ../calendar/gui/calendar-component.c:310 ../calendar/gui/migration.c:399
+#. ensure the source name is in current locale, not read from configuration
+#: ../calendar/gui/calendar-component.c:331
+#: ../calendar/gui/calendar-component.c:333 ../calendar/gui/migration.c:399
msgid "Birthdays & Anniversaries"
msgstr "Birthdays & Anniversaries"
+#. ensure the group name is in current locale, not read from configuration
#. Create the weather group
-#: ../calendar/gui/calendar-component.c:323
-#: ../plugins/calendar-weather/calendar-weather.c:100
+#: ../calendar/gui/calendar-component.c:346
+#: ../calendar/gui/calendar-component.c:349
+#: ../plugins/calendar-weather/calendar-weather.c:126
msgid "Weather"
msgstr "Weather"
-#: ../calendar/gui/calendar-component.c:615
+#: ../calendar/gui/calendar-component.c:676
msgid "_New Calendar"
msgstr "_New Calendar"
-#: ../calendar/gui/calendar-component.c:616
-#: ../calendar/gui/memos-component.c:465 ../calendar/gui/tasks-component.c:456
-#: ../mail/em-folder-tree.c:2106
+#: ../calendar/gui/calendar-component.c:677
+#: ../calendar/gui/memos-component.c:508 ../calendar/gui/tasks-component.c:500
+#: ../mail/em-folder-tree.c:2124
msgid "_Copy..."
msgstr "_Copy..."
-#: ../calendar/gui/calendar-component.c:949
+#: ../calendar/gui/calendar-component.c:682
+#: ../calendar/gui/memos-component.c:513 ../calendar/gui/tasks-component.c:505
+msgid "_Make available for offline use"
+msgstr "_Make available for offline use"
+
+#: ../calendar/gui/calendar-component.c:683
+#: ../calendar/gui/memos-component.c:514 ../calendar/gui/tasks-component.c:506
+msgid "_Do not make available for offline use"
+msgstr "_Do not make available for offline use"
+
+#: ../calendar/gui/calendar-component.c:1013
msgid "Failed upgrading calendars."
msgstr "Failed upgrading calendars."
-#: ../calendar/gui/calendar-component.c:1248
+#: ../calendar/gui/calendar-component.c:1142
#, c-format
msgid "Unable to open the calendar '%s' for creating events and meetings"
msgstr "Unable to open the calendar '%s' for creating events and meetings"
-#: ../calendar/gui/calendar-component.c:1264
+#: ../calendar/gui/calendar-component.c:1158
msgid "There is no calendar available for creating events and meetings"
msgstr "There is no calendar available for creating events and meetings"
-#: ../calendar/gui/calendar-component.c:1377
+#: ../calendar/gui/calendar-component.c:1271
msgid "Calendar Source Selector"
msgstr "Calendar Source Selector"
-#: ../calendar/gui/calendar-component.c:1596
+#: ../calendar/gui/calendar-component.c:1487
msgid "New appointment"
msgstr "New appointment"
-#: ../calendar/gui/calendar-component.c:1597
+#: ../calendar/gui/calendar-component.c:1488
msgctxt "New"
msgid "_Appointment"
msgstr "_Appointment"
-#: ../calendar/gui/calendar-component.c:1598
+#: ../calendar/gui/calendar-component.c:1489
msgid "Create a new appointment"
msgstr "Create a new appointment"
-#: ../calendar/gui/calendar-component.c:1604
+#: ../calendar/gui/calendar-component.c:1495
msgid "New meeting"
msgstr "New meeting"
-#: ../calendar/gui/calendar-component.c:1605
+#: ../calendar/gui/calendar-component.c:1496
msgctxt "New"
msgid "M_eeting"
msgstr "M_eeting"
-#: ../calendar/gui/calendar-component.c:1606
+#: ../calendar/gui/calendar-component.c:1497
msgid "Create a new meeting request"
msgstr "Create a new meeting request"
-#: ../calendar/gui/calendar-component.c:1612
+#: ../calendar/gui/calendar-component.c:1503
msgid "New all day appointment"
msgstr "New all day appointment"
-#: ../calendar/gui/calendar-component.c:1613
+#: ../calendar/gui/calendar-component.c:1504
msgctxt "New"
msgid "All Day A_ppointment"
msgstr "All Day A_ppointment"
-#: ../calendar/gui/calendar-component.c:1614
+#: ../calendar/gui/calendar-component.c:1505
msgid "Create a new all-day appointment"
msgstr "Create a new all-day appointment"
-#: ../calendar/gui/calendar-component.c:1620
+#: ../calendar/gui/calendar-component.c:1511
msgid "New calendar"
msgstr "New calendar"
-#: ../calendar/gui/calendar-component.c:1621
+#: ../calendar/gui/calendar-component.c:1512
msgctxt "New"
msgid "Cale_ndar"
msgstr "Cale_ndar"
-#: ../calendar/gui/calendar-component.c:1622
+#: ../calendar/gui/calendar-component.c:1513
msgid "Create a new calendar"
msgstr "Create a new calendar"
@@ -5418,233 +5575,131 @@ msgstr "Week View"
msgid "Month View"
msgstr "Month View"
-#: ../calendar/gui/caltypes.xml.h:2 ../calendar/gui/memotypes.xml.h:2
-#: ../calendar/gui/tasktypes.xml.h:4
+#: ../calendar/gui/caltypes.xml.h:1 ../calendar/gui/memotypes.xml.h:1
+#: ../calendar/gui/tasktypes.xml.h:3
msgid "Any Field"
msgstr "Any Field"
-#: ../calendar/gui/caltypes.xml.h:4 ../calendar/gui/memotypes.xml.h:4
-#: ../calendar/gui/tasktypes.xml.h:6 ../mail/em-filter-i18n.h:5
+#: ../calendar/gui/caltypes.xml.h:3 ../calendar/gui/memotypes.xml.h:3
+#: ../calendar/gui/tasktypes.xml.h:5 ../mail/em-filter-i18n.h:5
msgid "Attachments"
msgstr "Attachments"
-#: ../calendar/gui/caltypes.xml.h:5
+#: ../calendar/gui/caltypes.xml.h:4
#: ../calendar/gui/e-meeting-time-sel.etspec.h:1
-#: ../calendar/gui/tasktypes.xml.h:7
+#: ../calendar/gui/tasktypes.xml.h:6
msgid "Attendee"
msgstr "Attendee"
-#: ../calendar/gui/caltypes.xml.h:7 ../calendar/gui/memotypes.xml.h:6
-#: ../calendar/gui/tasktypes.xml.h:9
-msgid "Business"
-msgstr "Business"
-
-#: ../calendar/gui/caltypes.xml.h:8 ../calendar/gui/memotypes.xml.h:7
-#: ../calendar/gui/tasktypes.xml.h:11
+#: ../calendar/gui/caltypes.xml.h:5 ../calendar/gui/memotypes.xml.h:4
+#: ../calendar/gui/tasktypes.xml.h:8
msgid "Category"
msgstr "Category"
-#: ../calendar/gui/caltypes.xml.h:9 ../calendar/gui/memotypes.xml.h:8
+#: ../calendar/gui/caltypes.xml.h:6 ../calendar/gui/memotypes.xml.h:5
#: ../widgets/misc/e-send-options.glade.h:6
msgid "Classification"
msgstr "Classification"
-#: ../calendar/gui/caltypes.xml.h:10 ../calendar/gui/memotypes.xml.h:9
-#: ../calendar/gui/tasktypes.xml.h:12
-msgid "Competition"
-msgstr "Competition"
-
-#: ../calendar/gui/caltypes.xml.h:11 ../calendar/gui/e-cal-list-view.c:250
-#: ../calendar/gui/e-cal-model.c:337 ../calendar/gui/e-calendar-table.c:547
-#: ../calendar/gui/memotypes.xml.h:10
+#: ../calendar/gui/caltypes.xml.h:7 ../calendar/gui/e-cal-list-view.c:249
+#: ../calendar/gui/e-cal-model.c:352 ../calendar/gui/e-calendar-table.c:568
+#: ../calendar/gui/memotypes.xml.h:6
+#: ../plugins/email-custom-header/email-custom-header.c:341
msgid "Confidential"
msgstr "Confidential"
-#: ../calendar/gui/caltypes.xml.h:12 ../calendar/gui/memotypes.xml.h:11
-#: ../calendar/gui/tasktypes.xml.h:14
+#: ../calendar/gui/caltypes.xml.h:8 ../calendar/gui/memotypes.xml.h:7
+#: ../calendar/gui/tasktypes.xml.h:10
#: ../plugins/plugin-manager/plugin-manager.c:59
#: ../widgets/table/e-table-config.glade.h:6
msgid "Description"
msgstr "Description"
-#: ../calendar/gui/caltypes.xml.h:13 ../calendar/gui/memotypes.xml.h:12
-#: ../calendar/gui/tasktypes.xml.h:15
+#: ../calendar/gui/caltypes.xml.h:9 ../calendar/gui/memotypes.xml.h:8
+#: ../calendar/gui/tasktypes.xml.h:11
msgid "Description Contains"
msgstr "Description Contains"
-#: ../calendar/gui/caltypes.xml.h:14 ../calendar/gui/memotypes.xml.h:13
-#: ../calendar/gui/tasktypes.xml.h:16 ../mail/em-filter-i18n.h:22
+#: ../calendar/gui/caltypes.xml.h:10 ../calendar/gui/memotypes.xml.h:9
+#: ../calendar/gui/tasktypes.xml.h:12 ../mail/em-filter-i18n.h:22
msgid "Do Not Exist"
msgstr "Do Not Exist"
-#: ../calendar/gui/caltypes.xml.h:15 ../calendar/gui/memotypes.xml.h:14
-#: ../calendar/gui/tasktypes.xml.h:17 ../mail/em-filter-i18n.h:25
+#: ../calendar/gui/caltypes.xml.h:11 ../calendar/gui/memotypes.xml.h:10
+#: ../calendar/gui/tasktypes.xml.h:13 ../mail/em-filter-i18n.h:25
msgid "Exist"
msgstr "Exist"
-#: ../calendar/gui/caltypes.xml.h:16 ../calendar/gui/memotypes.xml.h:15
-#: ../calendar/gui/tasktypes.xml.h:18
-msgid "Favourites"
-msgstr "Favourites"
-
-#: ../calendar/gui/caltypes.xml.h:17 ../calendar/gui/memotypes.xml.h:16
-#: ../calendar/gui/tasktypes.xml.h:19
-msgid "Gifts"
-msgstr "Gifts"
-
-#: ../calendar/gui/caltypes.xml.h:18 ../calendar/gui/memotypes.xml.h:17
-#: ../calendar/gui/tasktypes.xml.h:20
-msgid "Goals/Objectives"
-msgstr "Goals/Objectives"
-
-#: ../calendar/gui/caltypes.xml.h:19 ../calendar/gui/memotypes.xml.h:18
-#: ../calendar/gui/tasktypes.xml.h:22
-msgid "Holiday"
-msgstr "Holiday"
-
-#: ../calendar/gui/caltypes.xml.h:20 ../calendar/gui/memotypes.xml.h:19
-#: ../calendar/gui/tasktypes.xml.h:23
-msgid "Holiday Cards"
-msgstr "Holiday Cards"
-
-#: ../calendar/gui/caltypes.xml.h:21 ../calendar/gui/memotypes.xml.h:20
-#: ../calendar/gui/tasktypes.xml.h:24
-msgid "Hot Contacts"
-msgstr "Hot Contacts"
-
-#: ../calendar/gui/caltypes.xml.h:22 ../calendar/gui/memotypes.xml.h:21
-#: ../calendar/gui/tasktypes.xml.h:25
-msgid "Ideas"
-msgstr "Ideas"
-
-#: ../calendar/gui/caltypes.xml.h:23 ../calendar/gui/memotypes.xml.h:22
-#: ../calendar/gui/tasktypes.xml.h:27
-msgid "International"
-msgstr "International"
-
-#: ../calendar/gui/caltypes.xml.h:24 ../calendar/gui/memotypes.xml.h:23
-#: ../calendar/gui/tasktypes.xml.h:28
-msgid "Key Customer"
-msgstr "Key Customer"
-
-#: ../calendar/gui/caltypes.xml.h:26 ../calendar/gui/memotypes.xml.h:24
-#: ../calendar/gui/tasktypes.xml.h:30
-msgid "Miscellaneous"
-msgstr "Miscellaneous"
-
-#: ../calendar/gui/caltypes.xml.h:27 ../calendar/gui/tasktypes.xml.h:31
-msgid "Next 7 days"
-msgstr "Next 7 days"
-
-#: ../calendar/gui/caltypes.xml.h:28
+#: ../calendar/gui/caltypes.xml.h:13
#: ../calendar/gui/dialogs/meeting-page.glade.h:6
-#: ../calendar/gui/memotypes.xml.h:26 ../calendar/gui/tasktypes.xml.h:34
+#: ../calendar/gui/memotypes.xml.h:11 ../calendar/gui/tasktypes.xml.h:19
msgid "Organizer"
msgstr "Organiser"
-#: ../calendar/gui/caltypes.xml.h:30 ../calendar/gui/memotypes.xml.h:28
-#: ../calendar/gui/tasktypes.xml.h:36
-msgid "Phone Calls"
-msgstr "Phone Calls"
-
-#: ../calendar/gui/caltypes.xml.h:31 ../calendar/gui/e-cal-list-view.c:249
-#: ../calendar/gui/e-cal-model.c:335 ../calendar/gui/e-calendar-table.c:546
-#: ../calendar/gui/memotypes.xml.h:29
+#: ../calendar/gui/caltypes.xml.h:14 ../calendar/gui/e-cal-list-view.c:248
+#: ../calendar/gui/e-cal-model.c:350 ../calendar/gui/e-calendar-table.c:567
+#: ../calendar/gui/memotypes.xml.h:12
msgid "Private"
msgstr "Private"
-#: ../calendar/gui/caltypes.xml.h:32 ../calendar/gui/e-cal-list-view.c:248
-#: ../calendar/gui/e-cal-model.c:326 ../calendar/gui/e-cal-model.c:333
-#: ../calendar/gui/e-calendar-table.c:545 ../calendar/gui/memotypes.xml.h:30
+#: ../calendar/gui/caltypes.xml.h:15 ../calendar/gui/e-cal-list-view.c:247
+#: ../calendar/gui/e-cal-model.c:341 ../calendar/gui/e-cal-model.c:348
+#: ../calendar/gui/e-calendar-table.c:566 ../calendar/gui/memotypes.xml.h:13
msgid "Public"
msgstr "Public"
-#: ../calendar/gui/caltypes.xml.h:33
-#: ../calendar/gui/dialogs/event-editor.c:299
+#: ../calendar/gui/caltypes.xml.h:16
+#: ../calendar/gui/dialogs/event-editor.c:304
msgid "Recurrence"
msgstr "Recurrence"
-#: ../calendar/gui/caltypes.xml.h:34
-#: ../calendar/gui/e-calendar-table.etspec.h:10
-#: ../calendar/gui/e-meeting-list-view.c:545
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:10
-#: ../calendar/gui/memotypes.xml.h:31 ../calendar/gui/tasktypes.xml.h:38
-#: ../mail/em-filter-i18n.h:70 ../mail/message-list.etspec.h:17
-msgid "Status"
-msgstr "Status"
-
-#: ../calendar/gui/caltypes.xml.h:35 ../calendar/gui/memotypes.xml.h:32
-#: ../calendar/gui/tasktypes.xml.h:39
-msgid "Strategies"
-msgstr "Strategies"
-
-#: ../calendar/gui/caltypes.xml.h:36
+#: ../calendar/gui/caltypes.xml.h:17
#: ../calendar/gui/e-cal-list-view.etspec.h:5
#: ../calendar/gui/e-calendar-table.etspec.h:11
-#: ../calendar/gui/e-memo-table.etspec.h:4 ../calendar/gui/memotypes.xml.h:33
-#: ../calendar/gui/tasktypes.xml.h:40
-#: ../plugins/save-calendar/csv-format.c:361
+#: ../calendar/gui/e-memo-table.etspec.h:4 ../calendar/gui/memotypes.xml.h:14
+#: ../calendar/gui/tasktypes.xml.h:22
+#: ../plugins/save-calendar/csv-format.c:362
msgid "Summary"
msgstr "Summary"
-#: ../calendar/gui/caltypes.xml.h:37 ../calendar/gui/memotypes.xml.h:34
-#: ../calendar/gui/tasktypes.xml.h:41
+#: ../calendar/gui/caltypes.xml.h:18 ../calendar/gui/memotypes.xml.h:15
+#: ../calendar/gui/tasktypes.xml.h:23
msgid "Summary Contains"
msgstr "Summary Contains"
-#: ../calendar/gui/caltypes.xml.h:38 ../calendar/gui/memotypes.xml.h:35
-#: ../calendar/gui/tasktypes.xml.h:42
-msgid "Suppliers"
-msgstr "Suppliers"
-
-#: ../calendar/gui/caltypes.xml.h:39 ../calendar/gui/memotypes.xml.h:36
-#: ../calendar/gui/tasktypes.xml.h:43
-msgid "Time &amp; Expenses"
-msgstr "Time &amp; Expenses"
-
-#: ../calendar/gui/caltypes.xml.h:40 ../calendar/gui/memotypes.xml.h:37
-#: ../calendar/gui/tasktypes.xml.h:45
-msgid "VIP"
-msgstr "VIP"
-
-#: ../calendar/gui/caltypes.xml.h:41 ../calendar/gui/memotypes.xml.h:38
-#: ../calendar/gui/tasktypes.xml.h:46
-msgid "Waiting"
-msgstr "Waiting"
-
-#: ../calendar/gui/caltypes.xml.h:42 ../calendar/gui/memotypes.xml.h:39
-#: ../calendar/gui/tasktypes.xml.h:47 ../mail/em-filter-i18n.h:10
+#: ../calendar/gui/caltypes.xml.h:19 ../calendar/gui/memotypes.xml.h:16
+#: ../calendar/gui/tasktypes.xml.h:25 ../mail/em-filter-i18n.h:10
msgid "contains"
msgstr "contains"
-#: ../calendar/gui/caltypes.xml.h:43 ../calendar/gui/memotypes.xml.h:40
-#: ../calendar/gui/tasktypes.xml.h:48 ../mail/em-filter-i18n.h:16
+#: ../calendar/gui/caltypes.xml.h:20 ../calendar/gui/memotypes.xml.h:17
+#: ../calendar/gui/tasktypes.xml.h:26 ../mail/em-filter-i18n.h:16
msgid "does not contain"
msgstr "does not contain"
-#: ../calendar/gui/caltypes.xml.h:44 ../calendar/gui/memotypes.xml.h:41
-#: ../calendar/gui/tasktypes.xml.h:49 ../mail/em-filter-i18n.h:30
+#: ../calendar/gui/caltypes.xml.h:21 ../calendar/gui/memotypes.xml.h:18
+#: ../calendar/gui/tasktypes.xml.h:27 ../mail/em-filter-i18n.h:30
msgid "is"
msgstr "is"
-#: ../calendar/gui/caltypes.xml.h:45 ../calendar/gui/memotypes.xml.h:42
-#: ../calendar/gui/tasktypes.xml.h:52 ../mail/em-filter-i18n.h:36
+#: ../calendar/gui/caltypes.xml.h:22 ../calendar/gui/memotypes.xml.h:19
+#: ../calendar/gui/tasktypes.xml.h:30 ../mail/em-filter-i18n.h:36
msgid "is not"
msgstr "is not"
-#: ../calendar/gui/comp-editor-factory.c:405
+#: ../calendar/gui/comp-editor-factory.c:409
msgid "Error while opening the calendar"
msgstr "Error while opening the calendar"
-#: ../calendar/gui/comp-editor-factory.c:411
+#: ../calendar/gui/comp-editor-factory.c:415
msgid "Method not supported when opening the calendar"
msgstr "Method not supported when opening the calendar"
-#: ../calendar/gui/comp-editor-factory.c:417
+#: ../calendar/gui/comp-editor-factory.c:421
msgid "Permission denied to open the calendar"
msgstr "Permission denied to open the calendar"
-#: ../calendar/gui/comp-editor-factory.c:429 ../shell/e-shell.c:1308
+#: ../calendar/gui/comp-editor-factory.c:439 ../shell/e-shell.c:1271
msgid "Unknown error"
msgstr "Unknown error"
@@ -5681,17 +5736,17 @@ msgid "Mes_sage:"
msgstr "Mes_sage:"
#: ../calendar/gui/dialogs/alarm-dialog.glade.h:8
-#: ../calendar/gui/e-alarm-list.c:442
+#: ../calendar/gui/e-alarm-list.c:444
msgid "Play a sound"
msgstr "Play a sound"
#: ../calendar/gui/dialogs/alarm-dialog.glade.h:9
-#: ../calendar/gui/e-alarm-list.c:446
+#: ../calendar/gui/e-alarm-list.c:448
msgid "Pop up an alert"
msgstr "Pop up an alert"
#: ../calendar/gui/dialogs/alarm-dialog.glade.h:10
-#: ../calendar/gui/e-alarm-list.c:454
+#: ../calendar/gui/e-alarm-list.c:456
msgid "Run a program"
msgstr "Run a program"
@@ -5704,7 +5759,7 @@ msgid "Send To:"
msgstr "Send To:"
#: ../calendar/gui/dialogs/alarm-dialog.glade.h:13
-#: ../calendar/gui/e-alarm-list.c:450
+#: ../calendar/gui/e-alarm-list.c:452
msgid "Send an email"
msgstr "Send an e-mail"
@@ -5768,25 +5823,52 @@ msgid "A_dd"
msgstr "A_dd"
#: ../calendar/gui/dialogs/alarm-list-dialog.glade.h:2
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
#: ../calendar/gui/dialogs/event-page.glade.h:4
msgid "Alarms"
msgstr "Alarms"
-#: ../calendar/gui/dialogs/cal-attachment-select-file.c:82
-#: ../composer/e-composer-actions.c:64
+#: ../calendar/gui/dialogs/cal-attachment-select-file.c:81
+#: ../composer/e-composer-actions.c:62
msgid "_Suggest automatic display of attachment"
msgstr "_Suggest automatic display of attachment"
-#: ../calendar/gui/dialogs/cal-attachment-select-file.c:143
+#: ../calendar/gui/dialogs/cal-attachment-select-file.c:142
msgid "Attach file(s)"
msgstr "Attach file(s)"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:485
+#. an empty string is the same as 'None'
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:144
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:193
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
+#: ../calendar/gui/dialogs/event-page.c:2955
+#: ../calendar/gui/dialogs/meeting-page.glade.h:4
+#: ../calendar/gui/e-cal-model-tasks.c:673
+#: ../calendar/gui/e-day-view-time-item.c:788
+#: ../calendar/gui/e-itip-control.c:1153 ../filter/filter-rule.c:945
+#: ../mail/em-account-editor.c:684 ../mail/em-account-editor.c:1408
+#: ../mail/em-account-prefs.c:438 ../mail/em-junk-hook.c:93
+#: ../plugins/calendar-weather/calendar-weather.c:333
+#: ../plugins/calendar-weather/calendar-weather.c:387
+#: ../plugins/email-custom-header/email-custom-header.c:395
+#: ../plugins/exchange-operations/exchange-delegates-user.c:195
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:9
+#: ../plugins/itip-formatter/itip-formatter.c:2179
+#: ../widgets/misc/e-cell-date-edit.c:305 ../widgets/misc/e-dateedit.c:1511
+#: ../widgets/misc/e-dateedit.c:1725
+#: ../widgets/misc/e-signature-combo-box.c:74
+msgid "None"
+msgstr "None"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:621
msgid "Selected Calendars for Alarms"
msgstr "Selected Calendars for Alarms"
#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
+msgid "(Shown in a Day View)"
+msgstr "(Shown in a Day View)"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:2
msgid ""
"60 minutes\n"
"30 minutes\n"
@@ -5800,59 +5882,59 @@ msgstr ""
"10 minutes\n"
"05 minutes"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
#, no-c-format
msgid ""
"<i>%u and %d will be replaced by user and domain from the email address.</i>"
msgstr ""
"<i>%u and %d will be replaced by user and domain from the e-mail address.</i>"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
#: ../mail/mail-config.glade.h:10
msgid "<span weight=\"bold\">Alerts</span>"
msgstr "<span weight=\"bold\">Alerts</span>"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
msgid "<span weight=\"bold\">Default Free/Busy Server</span>"
msgstr "<span weight=\"bold\">Default Free/Busy Server</span>"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
#: ../mail/mail-config.glade.h:17
#: ../plugins/publish-calendar/publish-calendar.glade.h:1
msgid "<span weight=\"bold\">General</span>"
msgstr "<span weight=\"bold\">General</span>"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
msgid "<span weight=\"bold\">Task List</span>"
msgstr "<span weight=\"bold\">Task List</span>"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
msgid "<span weight=\"bold\">Time</span>"
msgstr "<span weight=\"bold\">Time</span>"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
msgid "<span weight=\"bold\">Work Week</span>"
msgstr "<span weight=\"bold\">Work Week</span>"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
msgid "Adjust for daylight sa_ving time"
msgstr "Adjust for daylight sa_ving time"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
msgid "Day _ends:"
msgstr "Day _ends:"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
msgid "Display"
msgstr "Display"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
-#: ../calendar/gui/dialogs/recurrence-page.c:1087
-#: ../calendar/gui/e-itip-control.c:738
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
+#: ../calendar/gui/dialogs/recurrence-page.c:1120
+#: ../calendar/gui/e-itip-control.c:733
msgid "Friday"
msgstr "Friday"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
msgid ""
"Minutes\n"
"Hours\n"
@@ -5862,13 +5944,13 @@ msgstr ""
"Hours\n"
"Days"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-#: ../calendar/gui/dialogs/recurrence-page.c:1083
-#: ../calendar/gui/e-itip-control.c:734
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
+#: ../calendar/gui/dialogs/recurrence-page.c:1116
+#: ../calendar/gui/e-itip-control.c:729
msgid "Monday"
msgstr "Monday"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
msgid ""
"Monday\n"
"Tuesday\n"
@@ -5886,242 +5968,258 @@ msgstr ""
"Saturday\n"
"Sunday"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-#: ../mail/mail-config.glade.h:113
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
+#: ../mail/mail-config.glade.h:114
msgid "Pick a color"
msgstr "Pick a colour"
#. Sunday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
msgid "S_un"
msgstr "S_un"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
-#: ../calendar/gui/dialogs/recurrence-page.c:1088
-#: ../calendar/gui/e-itip-control.c:739
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#: ../calendar/gui/dialogs/recurrence-page.c:1121
+#: ../calendar/gui/e-itip-control.c:734
msgid "Saturday"
msgstr "Saturday"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
+msgid "Se_cond zone:"
+msgstr "Se_cond zone:"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
msgid "Select the calendars for alarm notification"
msgstr "Select the calendars for alarm notification"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
msgid "Sh_ow a reminder"
msgstr "Sh_ow a reminder"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
+msgid "Show a _reminder"
+msgstr "Show a _reminder"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
msgid "Show week _numbers in date navigator"
msgstr "Show week _numbers in date navigator"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
-#: ../calendar/gui/dialogs/recurrence-page.c:1089
-#: ../calendar/gui/e-itip-control.c:733
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+msgid "Show week n_umber in Day and Work Week View"
+msgstr "Show week n_umber in Day and Work Week View"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
+#: ../calendar/gui/dialogs/recurrence-page.c:1122
+#: ../calendar/gui/e-itip-control.c:728
msgid "Sunday"
msgstr "Sunday"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
msgid "T_asks due today:"
msgstr "T_asks due today:"
#. Thursday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
msgid "T_hu"
msgstr "T_hu"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
msgid "Template:"
msgstr "Template:"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-#: ../calendar/gui/dialogs/recurrence-page.c:1086
-#: ../calendar/gui/e-itip-control.c:737
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
+#: ../calendar/gui/dialogs/recurrence-page.c:1119
+#: ../calendar/gui/e-itip-control.c:732
msgid "Thursday"
msgstr "Thursday"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
#: ../calendar/gui/dialogs/event-page.glade.h:12
msgid "Time _zone:"
msgstr "Time _zone:"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
msgid "Time format:"
msgstr "Time format:"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
-#: ../calendar/gui/dialogs/recurrence-page.c:1084
-#: ../calendar/gui/e-itip-control.c:735
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
+#: ../calendar/gui/dialogs/recurrence-page.c:1117
+#: ../calendar/gui/e-itip-control.c:730
msgid "Tuesday"
msgstr "Tuesday"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
-#: ../calendar/gui/dialogs/recurrence-page.c:1085
-#: ../calendar/gui/e-itip-control.c:736
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
+#: ../calendar/gui/dialogs/recurrence-page.c:1118
+#: ../calendar/gui/e-itip-control.c:731
msgid "Wednesday"
msgstr "Wednesday"
#. A weekday like "Monday" follows
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
msgid "Wee_k starts on:"
msgstr "Wee_k starts on:"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
msgid "Work days:"
msgstr "Work days:"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:57
msgid "_12 hour (AM/PM)"
msgstr "_12 hour (AM/PM)"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
msgid "_24 hour"
msgstr "_24 hour"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:59
msgid "_Ask for confirmation when deleting items"
msgstr "_Ask for confirmation when deleting items"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:60
msgid "_Compress weekends in month view"
msgstr "_Compress weekends in month view"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:61
msgid "_Day begins:"
msgstr "_Day begins:"
#. Friday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:63
msgid "_Fri"
msgstr "_Fri"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:59
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:64
msgid "_Hide completed tasks after"
msgstr "_Hide completed tasks after"
#. Monday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:61
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:66
msgid "_Mon"
msgstr "_Mon"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:62
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:67
msgid "_Overdue tasks:"
msgstr "_Overdue tasks:"
#. Saturday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:64
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:69
msgid "_Sat"
msgstr "_Sat"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:65
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:70
msgid "_Show appointment end times in week and month view"
msgstr "_Show appointment end times in week and month view"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:66
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:71
msgid "_Time divisions:"
msgstr "_Time divisions:"
#. Tuesday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:68
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:73
msgid "_Tue"
msgstr "_Tue"
#. Wednesday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:70
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:75
msgid "_Wed"
msgstr "_Wed"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:71
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:76
+msgid "before every anniversary/birthday"
+msgstr "before every anniversary/birthday"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:77
msgid "before every appointment"
msgstr "before every appointment"
-#: ../calendar/gui/dialogs/calendar-setup.c:270
+#: ../calendar/gui/dialogs/calendar-setup.c:271
msgid "Cop_y calendar contents locally for offline operation"
msgstr "Cop_y calendar contents locally for offline operation"
-#: ../calendar/gui/dialogs/calendar-setup.c:272
+#: ../calendar/gui/dialogs/calendar-setup.c:273
msgid "Cop_y task list contents locally for offline operation"
msgstr "Cop_y task list contents locally for offline operation"
-#: ../calendar/gui/dialogs/calendar-setup.c:274
+#: ../calendar/gui/dialogs/calendar-setup.c:275
msgid "Cop_y memo list contents locally for offline operation"
msgstr "Cop_y memo list contents locally for offline operation"
-#: ../calendar/gui/dialogs/calendar-setup.c:344
+#: ../calendar/gui/dialogs/calendar-setup.c:345
msgid "Colo_r:"
msgstr "Colou_r:"
-#: ../calendar/gui/dialogs/calendar-setup.c:379
+#: ../calendar/gui/dialogs/calendar-setup.c:380
msgid "Task List"
msgstr "Task List"
-#: ../calendar/gui/dialogs/calendar-setup.c:390
+#: ../calendar/gui/dialogs/calendar-setup.c:391
msgid "Memo List"
msgstr "Memo List"
-#: ../calendar/gui/dialogs/calendar-setup.c:475
+#: ../calendar/gui/dialogs/calendar-setup.c:476
msgid "Calendar Properties"
msgstr "Calendar Properties"
-#: ../calendar/gui/dialogs/calendar-setup.c:475
+#: ../calendar/gui/dialogs/calendar-setup.c:476
msgid "New Calendar"
msgstr "New Calendar"
-#: ../calendar/gui/dialogs/calendar-setup.c:531
+#: ../calendar/gui/dialogs/calendar-setup.c:532
msgid "Task List Properties"
msgstr "Task List Properties"
-#: ../calendar/gui/dialogs/calendar-setup.c:531
+#: ../calendar/gui/dialogs/calendar-setup.c:532
msgid "New Task List"
msgstr "New Task List"
-#: ../calendar/gui/dialogs/calendar-setup.c:587
+#: ../calendar/gui/dialogs/calendar-setup.c:588
msgid "Memo List Properties"
msgstr "Memo List Properties"
-#: ../calendar/gui/dialogs/calendar-setup.c:587
+#: ../calendar/gui/dialogs/calendar-setup.c:588
msgid "New Memo List"
msgstr "New Memo List"
-#: ../calendar/gui/dialogs/changed-comp.c:56
+#: ../calendar/gui/dialogs/changed-comp.c:59
msgid "This event has been deleted."
msgstr "This event has been deleted."
-#: ../calendar/gui/dialogs/changed-comp.c:60
+#: ../calendar/gui/dialogs/changed-comp.c:63
msgid "This task has been deleted."
msgstr "This task has been deleted."
-#: ../calendar/gui/dialogs/changed-comp.c:64
+#: ../calendar/gui/dialogs/changed-comp.c:67
msgid "This memo has been deleted."
msgstr "This memo has been deleted."
-#: ../calendar/gui/dialogs/changed-comp.c:73
+#: ../calendar/gui/dialogs/changed-comp.c:76
#, c-format
msgid "%s You have made changes. Forget those changes and close the editor?"
msgstr "%s You have made changes. Forget those changes and close the editor?"
-#: ../calendar/gui/dialogs/changed-comp.c:75
+#: ../calendar/gui/dialogs/changed-comp.c:78
#, c-format
msgid "%s You have made no changes, close the editor?"
msgstr "%s You have made no changes, close the editor?"
-#: ../calendar/gui/dialogs/changed-comp.c:80
+#: ../calendar/gui/dialogs/changed-comp.c:83
msgid "This event has been changed."
msgstr "This event has been changed."
-#: ../calendar/gui/dialogs/changed-comp.c:84
+#: ../calendar/gui/dialogs/changed-comp.c:87
msgid "This task has been changed."
msgstr "This task has been changed."
-#: ../calendar/gui/dialogs/changed-comp.c:88
+#: ../calendar/gui/dialogs/changed-comp.c:91
msgid "This memo has been changed."
msgstr "This memo has been changed."
-#: ../calendar/gui/dialogs/changed-comp.c:97
+#: ../calendar/gui/dialogs/changed-comp.c:100
#, c-format
msgid "%s You have made changes. Forget those changes and update the editor?"
msgstr "%s You have made changes. Forget those changes and update the editor?"
-#: ../calendar/gui/dialogs/changed-comp.c:99
+#: ../calendar/gui/dialogs/changed-comp.c:102
#, c-format
msgid "%s You have made no changes, update the editor?"
msgstr "%s You have made no changes, update the editor?"
@@ -6131,356 +6229,361 @@ msgstr "%s You have made no changes, update the editor?"
msgid "Validation error: %s"
msgstr "Validation error: %s"
-#: ../calendar/gui/dialogs/comp-editor-util.c:186 ../calendar/gui/print.c:2356
+#: ../calendar/gui/dialogs/comp-editor-util.c:186 ../calendar/gui/print.c:2365
msgid " to "
msgstr " to "
-#: ../calendar/gui/dialogs/comp-editor-util.c:190 ../calendar/gui/print.c:2360
+#: ../calendar/gui/dialogs/comp-editor-util.c:190 ../calendar/gui/print.c:2369
msgid " (Completed "
msgstr " (Completed "
-#: ../calendar/gui/dialogs/comp-editor-util.c:192 ../calendar/gui/print.c:2362
+#: ../calendar/gui/dialogs/comp-editor-util.c:192 ../calendar/gui/print.c:2371
msgid "Completed "
msgstr "Completed "
-#: ../calendar/gui/dialogs/comp-editor-util.c:197 ../calendar/gui/print.c:2367
+#: ../calendar/gui/dialogs/comp-editor-util.c:197 ../calendar/gui/print.c:2376
msgid " (Due "
msgstr " (Due "
-#: ../calendar/gui/dialogs/comp-editor-util.c:199 ../calendar/gui/print.c:2369
+#: ../calendar/gui/dialogs/comp-editor-util.c:199 ../calendar/gui/print.c:2378
msgid "Due "
msgstr "Due "
-#: ../calendar/gui/dialogs/comp-editor.c:232
+#: ../calendar/gui/dialogs/comp-editor.c:239
#, c-format
msgid "Attached message - %s"
msgstr "Attached message - %s"
#. translators, this count will always be >1
-#: ../calendar/gui/dialogs/comp-editor.c:237
-#: ../calendar/gui/dialogs/comp-editor.c:410 ../composer/e-msg-composer.c:1771
-#: ../composer/e-msg-composer.c:1990
+#: ../calendar/gui/dialogs/comp-editor.c:244
+#: ../calendar/gui/dialogs/comp-editor.c:417 ../composer/e-msg-composer.c:1770
+#: ../composer/e-msg-composer.c:1989
#, c-format
msgid "Attached message"
msgid_plural "%d attached messages"
msgstr[0] "Attached message"
msgstr[1] "%d attached messages"
-#: ../calendar/gui/dialogs/comp-editor.c:481 ../composer/e-msg-composer.c:2058
+#: ../calendar/gui/dialogs/comp-editor.c:488 ../composer/e-msg-composer.c:2057
#: ../mail/em-folder-tree.c:1006 ../mail/em-folder-utils.c:364
-#: ../mail/em-folder-view.c:1186 ../mail/message-list.c:2045
+#: ../mail/em-folder-view.c:1188 ../mail/message-list.c:2106
msgid "_Move"
msgstr "_Move"
-#: ../calendar/gui/dialogs/comp-editor.c:483 ../composer/e-msg-composer.c:2060
-#: ../mail/em-folder-tree.c:1008 ../mail/message-list.c:2047
+#: ../calendar/gui/dialogs/comp-editor.c:490 ../composer/e-msg-composer.c:2059
+#: ../mail/em-folder-tree.c:1008 ../mail/message-list.c:2108
msgid "Cancel _Drag"
msgstr "Cancel _Drag"
-#: ../calendar/gui/dialogs/comp-editor.c:616
-#: ../calendar/gui/dialogs/comp-editor.c:3249 ../mail/em-utils.c:371
+#: ../calendar/gui/dialogs/comp-editor.c:623
+#: ../calendar/gui/dialogs/comp-editor.c:3315 ../mail/em-utils.c:373
#: ../plugins/prefer-plain/prefer-plain.c:91
#: ../widgets/misc/e-attachment-bar.c:453
msgid "attachment"
msgstr "attachment"
-#: ../calendar/gui/dialogs/comp-editor.c:842
+#: ../calendar/gui/dialogs/comp-editor.c:849
msgid "Could not update object"
msgstr "Could not update object"
-#: ../calendar/gui/dialogs/comp-editor.c:930
+#: ../calendar/gui/dialogs/comp-editor.c:938
msgid "Edit Appointment"
msgstr "Edit Appointment"
-#: ../calendar/gui/dialogs/comp-editor.c:937
+#: ../calendar/gui/dialogs/comp-editor.c:945
#, c-format
msgid "Meeting - %s"
msgstr "Meeting - %s"
-#: ../calendar/gui/dialogs/comp-editor.c:939
+#: ../calendar/gui/dialogs/comp-editor.c:947
#, c-format
msgid "Appointment - %s"
msgstr "Appointment - %s"
-#: ../calendar/gui/dialogs/comp-editor.c:945
+#: ../calendar/gui/dialogs/comp-editor.c:953
#, c-format
msgid "Assigned Task - %s"
msgstr "Assigned Task - %s"
-#: ../calendar/gui/dialogs/comp-editor.c:947
+#: ../calendar/gui/dialogs/comp-editor.c:955
#, c-format
msgid "Task - %s"
msgstr "Task - %s"
-#: ../calendar/gui/dialogs/comp-editor.c:952
+#: ../calendar/gui/dialogs/comp-editor.c:960
#, c-format
msgid "Memo - %s"
msgstr "Memo - %s"
-#: ../calendar/gui/dialogs/comp-editor.c:968
+#: ../calendar/gui/dialogs/comp-editor.c:976
msgid "No Summary"
msgstr "No Summary"
-#: ../calendar/gui/dialogs/comp-editor.c:1262
+#: ../calendar/gui/dialogs/comp-editor.c:1117
+msgid "Keep original item?"
+msgstr "Keep original item?"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1312
msgid "Click here to close the current window"
msgstr "Click here to close the current window"
-#: ../calendar/gui/dialogs/comp-editor.c:1269
+#: ../calendar/gui/dialogs/comp-editor.c:1319
msgid "Copy selected text to the clipboard"
msgstr "Copy selected text to the clipboard"
-#: ../calendar/gui/dialogs/comp-editor.c:1276
+#: ../calendar/gui/dialogs/comp-editor.c:1326
msgid "Cut selected text to the clipboard"
msgstr "Cut selected text to the clipboard"
-#: ../calendar/gui/dialogs/comp-editor.c:1283
+#: ../calendar/gui/dialogs/comp-editor.c:1333
msgid "Click here to view help available"
msgstr "Click here to view help available"
-#: ../calendar/gui/dialogs/comp-editor.c:1290
+#: ../calendar/gui/dialogs/comp-editor.c:1340
msgid "Paste text from the clipboard"
msgstr "Paste text from the clipboard"
-#: ../calendar/gui/dialogs/comp-editor.c:1311
+#: ../calendar/gui/dialogs/comp-editor.c:1361
msgid "Click here to save the current window"
msgstr "Click here to save the current window"
-#: ../calendar/gui/dialogs/comp-editor.c:1318
+#: ../calendar/gui/dialogs/comp-editor.c:1368
msgid "Select all text"
msgstr "Select all text"
-#: ../calendar/gui/dialogs/comp-editor.c:1325
+#: ../calendar/gui/dialogs/comp-editor.c:1375
msgid "_Classification"
msgstr "_Classification"
-#: ../calendar/gui/dialogs/comp-editor.c:1339
+#: ../calendar/gui/dialogs/comp-editor.c:1389
#: ../mail/mail-signature-editor.c:208
#: ../ui/evolution-mail-messagedisplay.xml.h:6 ../ui/evolution.xml.h:43
msgid "_File"
msgstr "_File"
-#: ../calendar/gui/dialogs/comp-editor.c:1346
-#: ../ui/evolution-mail-global.xml.h:24 ../ui/evolution.xml.h:46
+#: ../calendar/gui/dialogs/comp-editor.c:1396
+#: ../ui/evolution-calendar.xml.h:44 ../ui/evolution-mail-global.xml.h:24
+#: ../ui/evolution.xml.h:46
msgid "_Help"
msgstr "_Help"
-#: ../calendar/gui/dialogs/comp-editor.c:1353
+#: ../calendar/gui/dialogs/comp-editor.c:1403
msgid "_Insert"
msgstr "_Insert"
-#: ../calendar/gui/dialogs/comp-editor.c:1360
+#: ../calendar/gui/dialogs/comp-editor.c:1410
msgid "_Options"
msgstr "_Options"
-#: ../calendar/gui/dialogs/comp-editor.c:1367 ../mail/em-folder-tree.c:2098
+#: ../calendar/gui/dialogs/comp-editor.c:1417 ../mail/em-folder-tree.c:2116
#: ../ui/evolution-addressbook.xml.h:64 ../ui/evolution-mail-global.xml.h:34
#: ../ui/evolution-mail-messagedisplay.xml.h:8 ../ui/evolution-tasks.xml.h:30
#: ../ui/evolution.xml.h:55
msgid "_View"
msgstr "_View"
-#: ../calendar/gui/dialogs/comp-editor.c:1377
-#: ../composer/e-composer-actions.c:471
+#: ../calendar/gui/dialogs/comp-editor.c:1427
+#: ../composer/e-composer-actions.c:469
msgid "_Attachment..."
msgstr "_Attachment..."
-#: ../calendar/gui/dialogs/comp-editor.c:1379
+#: ../calendar/gui/dialogs/comp-editor.c:1429
msgid "Click here to attach a file"
msgstr "Click here to attach a file"
-#: ../calendar/gui/dialogs/comp-editor.c:1387
+#: ../calendar/gui/dialogs/comp-editor.c:1437
msgid "_Categories"
msgstr "_Categories"
-#: ../calendar/gui/dialogs/comp-editor.c:1389
+#: ../calendar/gui/dialogs/comp-editor.c:1439
msgid "Toggles whether to display categories"
msgstr "Toggles whether to display categories"
-#: ../calendar/gui/dialogs/comp-editor.c:1395
+#: ../calendar/gui/dialogs/comp-editor.c:1445
msgid "Time _Zone"
msgstr "Time _Zone"
-#: ../calendar/gui/dialogs/comp-editor.c:1397
+#: ../calendar/gui/dialogs/comp-editor.c:1447
msgid "Toggles whether the time zone is displayed"
msgstr "Toggles whether the time zone is displayed"
-#: ../calendar/gui/dialogs/comp-editor.c:1406
+#: ../calendar/gui/dialogs/comp-editor.c:1456
msgid "Pu_blic"
msgstr "Pu_blic"
-#: ../calendar/gui/dialogs/comp-editor.c:1408
+#: ../calendar/gui/dialogs/comp-editor.c:1458
msgid "Classify as public"
msgstr "Classify as public"
-#: ../calendar/gui/dialogs/comp-editor.c:1413
+#: ../calendar/gui/dialogs/comp-editor.c:1463
msgid "_Private"
msgstr "_Private"
-#: ../calendar/gui/dialogs/comp-editor.c:1415
+#: ../calendar/gui/dialogs/comp-editor.c:1465
msgid "Classify as private"
msgstr "Classify as private"
-#: ../calendar/gui/dialogs/comp-editor.c:1420
+#: ../calendar/gui/dialogs/comp-editor.c:1470
msgid "_Confidential"
msgstr "_Confidential"
-#: ../calendar/gui/dialogs/comp-editor.c:1422
+#: ../calendar/gui/dialogs/comp-editor.c:1472
msgid "Classify as confidential"
msgstr "Classify as confidential"
-#: ../calendar/gui/dialogs/comp-editor.c:1430
+#: ../calendar/gui/dialogs/comp-editor.c:1480
msgid "R_ole Field"
msgstr "R_ole Field"
-#: ../calendar/gui/dialogs/comp-editor.c:1432
+#: ../calendar/gui/dialogs/comp-editor.c:1482
msgid "Toggles whether the Role field is displayed"
msgstr "Toggles whether the Role field is displayed"
-#: ../calendar/gui/dialogs/comp-editor.c:1438
+#: ../calendar/gui/dialogs/comp-editor.c:1488
msgid "_RSVP"
msgstr "_RSVP"
-#: ../calendar/gui/dialogs/comp-editor.c:1440
+#: ../calendar/gui/dialogs/comp-editor.c:1490
msgid "Toggles whether the RSVP field is displayed"
msgstr "Toggles whether the RSVP field is displayed"
-#: ../calendar/gui/dialogs/comp-editor.c:1446
+#: ../calendar/gui/dialogs/comp-editor.c:1496
msgid "_Status Field"
msgstr "_Status Field"
-#: ../calendar/gui/dialogs/comp-editor.c:1448
+#: ../calendar/gui/dialogs/comp-editor.c:1498
msgid "Toggles whether the Status field is displayed"
msgstr "Toggles whether the Status field is displayed"
-#: ../calendar/gui/dialogs/comp-editor.c:1454
+#: ../calendar/gui/dialogs/comp-editor.c:1504
msgid "_Type Field"
msgstr "_Type Field"
-#: ../calendar/gui/dialogs/comp-editor.c:1456
+#: ../calendar/gui/dialogs/comp-editor.c:1506
msgid "Toggles whether the Attendee Type is displayed"
msgstr "Toggles whether the Attendee Type is displayed"
-#: ../calendar/gui/dialogs/comp-editor.c:1766
-#: ../composer/e-composer-private.c:65 ../widgets/misc/e-attachment-bar.c:1381
+#: ../calendar/gui/dialogs/comp-editor.c:1828
+#: ../composer/e-composer-private.c:64 ../widgets/misc/e-attachment-bar.c:1376
msgid "Recent _Documents"
msgstr "Recent _Documents"
-#: ../calendar/gui/dialogs/comp-editor.c:1785
-#: ../composer/e-composer-actions.c:699
+#: ../calendar/gui/dialogs/comp-editor.c:1847
+#: ../composer/e-composer-actions.c:696
msgid "Attach"
msgstr "Attach"
-#: ../calendar/gui/dialogs/comp-editor.c:1880
+#: ../calendar/gui/dialogs/comp-editor.c:1942
#, c-format
msgid "<b>%d</b> Attachment"
msgid_plural "<b>%d</b> Attachments"
msgstr[0] "<b>%d</b> Attachment"
msgstr[1] "<b>%d</b> Attachments"
-#: ../calendar/gui/dialogs/comp-editor.c:1912
+#: ../calendar/gui/dialogs/comp-editor.c:1974
msgid "Hide Attachment _Bar"
msgstr "Hide Attachment _Bar"
-#: ../calendar/gui/dialogs/comp-editor.c:1915
-#: ../calendar/gui/dialogs/comp-editor.c:2223
+#: ../calendar/gui/dialogs/comp-editor.c:1977
+#: ../calendar/gui/dialogs/comp-editor.c:2280
msgid "Show Attachment _Bar"
msgstr "Show Attachment _Bar"
-#: ../calendar/gui/dialogs/comp-editor.c:2034
-#: ../calendar/gui/dialogs/event-page.c:1871
-#: ../calendar/gui/dialogs/task-page.c:1193 ../composer/e-msg-composer.c:1045
+#: ../calendar/gui/dialogs/comp-editor.c:2091
+#: ../calendar/gui/dialogs/event-page.c:1877
+#: ../calendar/gui/dialogs/task-page.c:1201 ../composer/e-msg-composer.c:1039
#: ../plugins/groupwise-features/junk-settings.glade.h:8
#: ../plugins/groupwise-features/properties.glade.h:13
#: ../widgets/table/e-table-config.glade.h:21
msgid "_Remove"
msgstr "_Remove"
-#: ../calendar/gui/dialogs/comp-editor.c:2037
-#: ../composer/e-msg-composer.c:1048
+#: ../calendar/gui/dialogs/comp-editor.c:2094
+#: ../composer/e-msg-composer.c:1042
#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:4
msgid "_Add attachment..."
msgstr "_Add attachment..."
-#: ../calendar/gui/dialogs/comp-editor.c:2245
-#: ../mail/em-format-html-display.c:2195
+#: ../calendar/gui/dialogs/comp-editor.c:2302
+#: ../mail/em-format-html-display.c:2384
msgid "Show Attachments"
msgstr "Show Attachments"
-#: ../calendar/gui/dialogs/comp-editor.c:2246
+#: ../calendar/gui/dialogs/comp-editor.c:2303
msgid "Press space key to toggle attachment bar"
msgstr "Press space key to toggle attachment bar"
-#: ../calendar/gui/dialogs/comp-editor.c:2390
-#: ../calendar/gui/dialogs/comp-editor.c:2437
-#: ../calendar/gui/dialogs/comp-editor.c:3282
+#: ../calendar/gui/dialogs/comp-editor.c:2448
+#: ../calendar/gui/dialogs/comp-editor.c:2496
+#: ../calendar/gui/dialogs/comp-editor.c:3348
msgid "Changes made to this item may be discarded if an update arrives"
msgstr "Changes made to this item may be discarded if an update arrives"
-#: ../calendar/gui/dialogs/comp-editor.c:3311
+#: ../calendar/gui/dialogs/comp-editor.c:3377
msgid "Unable to use current version!"
msgstr "Unable to use current version!"
-#: ../calendar/gui/dialogs/copy-source-dialog.c:60
+#: ../calendar/gui/dialogs/copy-source-dialog.c:64
msgid "Could not open source"
msgstr "Could not open source"
-#: ../calendar/gui/dialogs/copy-source-dialog.c:68
+#: ../calendar/gui/dialogs/copy-source-dialog.c:72
msgid "Could not open destination"
msgstr "Could not open destination"
-#: ../calendar/gui/dialogs/copy-source-dialog.c:77
+#: ../calendar/gui/dialogs/copy-source-dialog.c:81
msgid "Destination is read only"
msgstr "Destination is read only"
-#: ../calendar/gui/dialogs/delete-comp.c:201
+#: ../calendar/gui/dialogs/delete-comp.c:205
msgid "_Delete this item from all other recipient's mailboxes?"
msgstr "_Delete this item from all other recipient's mailboxes?"
-#: ../calendar/gui/dialogs/delete-error.c:52
+#: ../calendar/gui/dialogs/delete-error.c:55
msgid "The event could not be deleted due to a corba error"
msgstr "The event could not be deleted due to a corba error"
-#: ../calendar/gui/dialogs/delete-error.c:55
+#: ../calendar/gui/dialogs/delete-error.c:58
msgid "The task could not be deleted due to a corba error"
msgstr "The task could not be deleted due to a corba error"
-#: ../calendar/gui/dialogs/delete-error.c:58
+#: ../calendar/gui/dialogs/delete-error.c:61
msgid "The memo could not be deleted due to a corba error"
msgstr "The memo could not be deleted due to a corba error"
-#: ../calendar/gui/dialogs/delete-error.c:61
+#: ../calendar/gui/dialogs/delete-error.c:64
msgid "The item could not be deleted due to a corba error"
msgstr "The item could not be deleted due to a corba error"
-#: ../calendar/gui/dialogs/delete-error.c:68
+#: ../calendar/gui/dialogs/delete-error.c:71
msgid "The event could not be deleted because permission was denied"
msgstr "The event could not be deleted because permission was denied"
-#: ../calendar/gui/dialogs/delete-error.c:71
+#: ../calendar/gui/dialogs/delete-error.c:74
msgid "The task could not be deleted because permission was denied"
msgstr "The task could not be deleted because permission was denied"
-#: ../calendar/gui/dialogs/delete-error.c:74
+#: ../calendar/gui/dialogs/delete-error.c:77
msgid "The memo could not be deleted because permission was denied"
msgstr "The memo could not be deleted because permission was denied"
-#: ../calendar/gui/dialogs/delete-error.c:77
+#: ../calendar/gui/dialogs/delete-error.c:80
msgid "The item could not be deleted because permission was denied"
msgstr "The item could not be deleted because permission was denied"
-#: ../calendar/gui/dialogs/delete-error.c:84
+#: ../calendar/gui/dialogs/delete-error.c:87
msgid "The event could not be deleted due to an error"
msgstr "The event could not be deleted due to an error"
-#: ../calendar/gui/dialogs/delete-error.c:87
+#: ../calendar/gui/dialogs/delete-error.c:90
msgid "The task could not be deleted due to an error"
msgstr "The task could not be deleted due to an error"
-#: ../calendar/gui/dialogs/delete-error.c:90
+#: ../calendar/gui/dialogs/delete-error.c:93
msgid "The memo could not be deleted due to an error"
msgstr "The memo could not be deleted due to an error"
-#: ../calendar/gui/dialogs/delete-error.c:93
+#: ../calendar/gui/dialogs/delete-error.c:96
msgid "The item could not be deleted due to an error"
msgstr "The item could not be deleted due to an error"
@@ -6497,184 +6600,167 @@ msgstr "Delegate To:"
msgid "Enter Delegate"
msgstr "Enter Delegate"
-#: ../calendar/gui/dialogs/event-editor.c:196
+#: ../calendar/gui/dialogs/event-editor.c:202
msgid "_Alarms"
msgstr "_Alarms"
-#: ../calendar/gui/dialogs/event-editor.c:198
+#: ../calendar/gui/dialogs/event-editor.c:204
msgid "Click here to set or unset alarms for this event"
msgstr "Click here to set or unset alarms for this event"
-#: ../calendar/gui/dialogs/event-editor.c:203
+#: ../calendar/gui/dialogs/event-editor.c:209
msgid "_Recurrence"
msgstr "_Recurrence"
-#: ../calendar/gui/dialogs/event-editor.c:205
+#: ../calendar/gui/dialogs/event-editor.c:211
msgid "Make this a recurring event"
msgstr "Make this a recurring event"
-#: ../calendar/gui/dialogs/event-editor.c:210
+#: ../calendar/gui/dialogs/event-editor.c:216
#: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:2
+#: ../plugins/groupwise-features/send-options.c:212
#: ../widgets/misc/e-send-options.glade.h:19
msgid "Send Options"
msgstr "Send Options"
-#: ../calendar/gui/dialogs/event-editor.c:212
+#: ../calendar/gui/dialogs/event-editor.c:218
#: ../calendar/gui/dialogs/task-editor.c:125
msgid "Insert advanced send options"
msgstr "Insert advanced send options"
-#: ../calendar/gui/dialogs/event-editor.c:220
+#: ../calendar/gui/dialogs/event-editor.c:226
msgid "All _Day Event"
msgstr "All _Day Event"
-#: ../calendar/gui/dialogs/event-editor.c:222
+#: ../calendar/gui/dialogs/event-editor.c:228
msgid "Toggles whether to have All Day Event"
msgstr "Toggles whether to have All Day Event"
-#: ../calendar/gui/dialogs/event-editor.c:228
+#: ../calendar/gui/dialogs/event-editor.c:234
msgid "Show Time as _Busy"
msgstr "Show Time as _Busy"
-#: ../calendar/gui/dialogs/event-editor.c:230
+#: ../calendar/gui/dialogs/event-editor.c:236
msgid "Toggles whether to show time as busy"
msgstr "Toggles whether to show time as busy"
-#: ../calendar/gui/dialogs/event-editor.c:239
+#: ../calendar/gui/dialogs/event-editor.c:245
msgid "_Free/Busy"
msgstr "_Free/Busy"
-#: ../calendar/gui/dialogs/event-editor.c:241
+#: ../calendar/gui/dialogs/event-editor.c:247
msgid "Query free / busy information for the attendees"
msgstr "Query free / busy information for the attendees"
-#: ../calendar/gui/dialogs/event-editor.c:296
+#: ../calendar/gui/dialogs/event-editor.c:301
msgid "Appoint_ment"
msgstr "Appoint_ment"
-#: ../calendar/gui/dialogs/event-page.c:731
-#: ../calendar/gui/dialogs/event-page.c:2714
+#: ../calendar/gui/dialogs/event-page.c:736
+#: ../calendar/gui/dialogs/event-page.c:2725
msgid "This event has alarms"
msgstr "This event has alarms"
-#: ../calendar/gui/dialogs/event-page.c:794
+#: ../calendar/gui/dialogs/event-page.c:799
#: ../calendar/gui/dialogs/event-page.glade.h:10
#: ../calendar/gui/dialogs/meeting-page.glade.h:5
#: ../calendar/gui/dialogs/memo-page.glade.h:2
msgid "Or_ganizer:"
msgstr "Or_ganiser:"
-#: ../calendar/gui/dialogs/event-page.c:840
+#: ../calendar/gui/dialogs/event-page.c:845
msgid "_Delegatees"
msgstr "_Delegatees"
-#: ../calendar/gui/dialogs/event-page.c:842
+#: ../calendar/gui/dialogs/event-page.c:847
msgid "Atte_ndees"
msgstr "Atte_ndees"
-#: ../calendar/gui/dialogs/event-page.c:1026
+#: ../calendar/gui/dialogs/event-page.c:1031
msgid "Event with no start date"
msgstr "Event with no start date"
-#: ../calendar/gui/dialogs/event-page.c:1029
+#: ../calendar/gui/dialogs/event-page.c:1034
msgid "Event with no end date"
msgstr "Event with no end date"
-#: ../calendar/gui/dialogs/event-page.c:1198
-#: ../calendar/gui/dialogs/memo-page.c:636
-#: ../calendar/gui/dialogs/task-page.c:808
+#: ../calendar/gui/dialogs/event-page.c:1203
+#: ../calendar/gui/dialogs/memo-page.c:641
+#: ../calendar/gui/dialogs/task-page.c:813
msgid "Start date is wrong"
msgstr "Start date is wrong"
-#: ../calendar/gui/dialogs/event-page.c:1208
+#: ../calendar/gui/dialogs/event-page.c:1213
msgid "End date is wrong"
msgstr "End date is wrong"
-#: ../calendar/gui/dialogs/event-page.c:1231
+#: ../calendar/gui/dialogs/event-page.c:1236
msgid "Start time is wrong"
msgstr "Start time is wrong"
-#: ../calendar/gui/dialogs/event-page.c:1238
+#: ../calendar/gui/dialogs/event-page.c:1243
msgid "End time is wrong"
msgstr "End time is wrong"
-#: ../calendar/gui/dialogs/event-page.c:1401
-#: ../calendar/gui/dialogs/memo-page.c:677
-#: ../calendar/gui/dialogs/task-page.c:868
+#: ../calendar/gui/dialogs/event-page.c:1406
+#: ../calendar/gui/dialogs/memo-page.c:682
+#: ../calendar/gui/dialogs/task-page.c:873
msgid "The organizer selected no longer has an account."
msgstr "The organiser selected no longer has an account."
-#: ../calendar/gui/dialogs/event-page.c:1407
-#: ../calendar/gui/dialogs/memo-page.c:683
-#: ../calendar/gui/dialogs/task-page.c:874
+#: ../calendar/gui/dialogs/event-page.c:1412
+#: ../calendar/gui/dialogs/memo-page.c:688
+#: ../calendar/gui/dialogs/task-page.c:879
msgid "An organizer is required."
msgstr "An organiser is required."
-#: ../calendar/gui/dialogs/event-page.c:1432
-#: ../calendar/gui/dialogs/task-page.c:898
+#: ../calendar/gui/dialogs/event-page.c:1437
+#: ../calendar/gui/dialogs/task-page.c:903
msgid "At least one attendee is required."
msgstr "At least one attendee is required."
-#: ../calendar/gui/dialogs/event-page.c:1872
-#: ../calendar/gui/dialogs/task-page.c:1194
+#: ../calendar/gui/dialogs/event-page.c:1878
+#: ../calendar/gui/dialogs/task-page.c:1202
msgid "_Add "
msgstr "_Add "
-#: ../calendar/gui/dialogs/event-page.c:2590
+#: ../calendar/gui/dialogs/event-page.c:2601
#, c-format
msgid "Unable to open the calendar '%s'."
msgstr "Unable to open the calendar '%s'."
-#: ../calendar/gui/dialogs/event-page.c:2634
-#: ../calendar/gui/dialogs/memo-page.c:886
-#: ../calendar/gui/dialogs/task-page.c:1793
+#: ../calendar/gui/dialogs/event-page.c:2645
+#: ../calendar/gui/dialogs/memo-page.c:896
+#: ../calendar/gui/dialogs/task-page.c:1806
#, c-format
msgid "You are acting on behalf of %s"
msgstr "You are acting on behalf of %s"
-#: ../calendar/gui/dialogs/event-page.c:2914
+#: ../calendar/gui/dialogs/event-page.c:2925
#, c-format
msgid "%d day before appointment"
msgid_plural "%d days before appointment"
msgstr[0] "%d day before appointment"
msgstr[1] "%d days before appointment"
-#: ../calendar/gui/dialogs/event-page.c:2920
+#: ../calendar/gui/dialogs/event-page.c:2931
#, c-format
msgid "%d hour before appointment"
msgid_plural "%d hours before appointment"
msgstr[0] "%d hour before appointment"
msgstr[1] "%d hours before appointment"
-#: ../calendar/gui/dialogs/event-page.c:2926
+#: ../calendar/gui/dialogs/event-page.c:2937
#, c-format
msgid "%d minute before appointment"
msgid_plural "%d minutes before appointment"
msgstr[0] "%d minute before appointment"
msgstr[1] "%d minutes before appointment"
-#: ../calendar/gui/dialogs/event-page.c:2939
+#: ../calendar/gui/dialogs/event-page.c:2950
msgid "Customize"
msgstr "Customise"
-#. an empty string is the same as 'None'
-#: ../calendar/gui/dialogs/event-page.c:2944
-#: ../calendar/gui/dialogs/meeting-page.glade.h:4
-#: ../calendar/gui/e-cal-model-tasks.c:669
-#: ../calendar/gui/e-itip-control.c:1158 ../filter/filter-rule.c:944
-#: ../mail/em-account-editor.c:685 ../mail/em-account-editor.c:1409
-#: ../mail/em-account-prefs.c:438 ../mail/em-junk-hook.c:93
-#: ../plugins/calendar-weather/calendar-weather.c:370
-#: ../plugins/calendar-weather/calendar-weather.c:424
-#: ../plugins/exchange-operations/exchange-delegates-user.c:193
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:9
-#: ../plugins/itip-formatter/itip-formatter.c:2021
-#: ../widgets/misc/e-cell-date-edit.c:306 ../widgets/misc/e-dateedit.c:1517
-#: ../widgets/misc/e-dateedit.c:1731
-#: ../widgets/misc/e-signature-combo-box.c:70
-msgid "None"
-msgstr "None"
-
#: ../calendar/gui/dialogs/event-page.glade.h:1
msgid "1 day before appointment"
msgstr "1 day before appointment"
@@ -6750,19 +6836,19 @@ msgstr "Co_ntacts..."
msgid "Organizer:"
msgstr "Organiser:"
-#: ../calendar/gui/dialogs/memo-editor.c:141 ../calendar/gui/print.c:2476
+#: ../calendar/gui/dialogs/memo-editor.c:111 ../calendar/gui/print.c:2485
msgid "Memo"
msgstr "Memo"
-#: ../calendar/gui/dialogs/memo-page.c:847
+#: ../calendar/gui/dialogs/memo-page.c:857
#, c-format
msgid "Unable to open memos in '%s'."
msgstr "Unable to open memos in '%s'."
-#: ../calendar/gui/dialogs/memo-page.c:1002 ../mail/em-format-html.c:1562
-#: ../mail/em-format-html.c:1620 ../mail/em-format-html.c:1646
-#: ../mail/em-format-quote.c:210 ../mail/em-format.c:886
-#: ../mail/em-mailer-prefs.c:77 ../mail/message-list.etspec.h:19
+#: ../calendar/gui/dialogs/memo-page.c:1012 ../mail/em-format-html.c:1567
+#: ../mail/em-format-html.c:1625 ../mail/em-format-html.c:1651
+#: ../mail/em-format-quote.c:210 ../mail/em-format.c:887
+#: ../mail/em-mailer-prefs.c:77 ../mail/message-list.etspec.h:20
msgid "To"
msgstr "To"
@@ -6776,58 +6862,62 @@ msgid "T_o:"
msgstr "T_o:"
#: ../calendar/gui/dialogs/memo-page.glade.h:7
-#: ../calendar/gui/dialogs/task-page.c:360
+#: ../calendar/gui/dialogs/task-page.c:365
#: ../calendar/gui/dialogs/task-page.glade.h:9
msgid "_Group:"
msgstr "_Group:"
-#: ../calendar/gui/dialogs/recur-comp.c:50
+#: ../calendar/gui/dialogs/recur-comp.c:53
#, c-format
msgid "You are modifying a recurring event. What would you like to modify?"
msgstr "You are modifying a recurring event. What would you like to modify?"
-#: ../calendar/gui/dialogs/recur-comp.c:52
+#: ../calendar/gui/dialogs/recur-comp.c:55
#, c-format
msgid "You are delegating a recurring event. What would you like to delegate?"
msgstr "You are delegating a recurring event. What would you like to delegate?"
-#: ../calendar/gui/dialogs/recur-comp.c:56
+#: ../calendar/gui/dialogs/recur-comp.c:59
#, c-format
msgid "You are modifying a recurring task. What would you like to modify?"
msgstr "You are modifying a recurring task. What would you like to modify?"
-#: ../calendar/gui/dialogs/recur-comp.c:60
+#: ../calendar/gui/dialogs/recur-comp.c:63
#, c-format
msgid "You are modifying a recurring memo. What would you like to modify?"
msgstr "You are modifying a recurring memo. What would you like to modify?"
-#: ../calendar/gui/dialogs/recur-comp.c:85
+#: ../calendar/gui/dialogs/recur-comp.c:88
msgid "This Instance Only"
msgstr "This Instance Only"
-#: ../calendar/gui/dialogs/recur-comp.c:89
+#: ../calendar/gui/dialogs/recur-comp.c:92
msgid "This and Prior Instances"
msgstr "This and Prior Instances"
-#: ../calendar/gui/dialogs/recur-comp.c:95
+#: ../calendar/gui/dialogs/recur-comp.c:98
msgid "This and Future Instances"
msgstr "This and Future Instances"
-#: ../calendar/gui/dialogs/recur-comp.c:100
+#: ../calendar/gui/dialogs/recur-comp.c:103
msgid "All Instances"
msgstr "All Instances"
-#: ../calendar/gui/dialogs/recurrence-page.c:560
+#: ../calendar/gui/dialogs/recurrence-page.c:562
msgid "This appointment contains recurrences that Evolution cannot edit."
msgstr "This appointment contains recurrences that Evolution cannot edit."
-#: ../calendar/gui/dialogs/recurrence-page.c:890
+#: ../calendar/gui/dialogs/recurrence-page.c:892
msgid "Recurrence date is invalid"
msgstr "Recurrence date is invalid"
+#: ../calendar/gui/dialogs/recurrence-page.c:932
+msgid "End time of the recurrence was before event's start"
+msgstr "End time of the recurrence was before event's start"
+
#. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] week(s) on [Wednesday] [forever]'
#. * (dropdown menu options are in [square brackets]). This means that after the 'on', name of a week day always follows.
-#: ../calendar/gui/dialogs/recurrence-page.c:928
+#: ../calendar/gui/dialogs/recurrence-page.c:961
msgid "on"
msgstr "on"
@@ -6835,7 +6925,7 @@ msgstr "on"
#. * (dropdown menu options are in [square brackets]). This means that after 'first', either the string 'day' or
#. * the name of a week day (like 'Monday' or 'Friday') always follow.
#.
-#: ../calendar/gui/dialogs/recurrence-page.c:992
+#: ../calendar/gui/dialogs/recurrence-page.c:1025
msgid "first"
msgstr "first"
@@ -6844,7 +6934,7 @@ msgstr "first"
#. * (dropdown menu options are in [square brackets]). This means that after 'second', either the string 'day' or
#. * the name of a week day (like 'Monday' or 'Friday') always follow.
#.
-#: ../calendar/gui/dialogs/recurrence-page.c:998
+#: ../calendar/gui/dialogs/recurrence-page.c:1031
msgid "second"
msgstr "second"
@@ -6852,7 +6942,7 @@ msgstr "second"
#. * (dropdown menu options are in [square brackets]). This means that after 'third', either the string 'day' or
#. * the name of a week day (like 'Monday' or 'Friday') always follow.
#.
-#: ../calendar/gui/dialogs/recurrence-page.c:1003
+#: ../calendar/gui/dialogs/recurrence-page.c:1036
msgid "third"
msgstr "third"
@@ -6860,7 +6950,7 @@ msgstr "third"
#. * (dropdown menu options are in [square brackets]). This means that after 'fourth', either the string 'day' or
#. * the name of a week day (like 'Monday' or 'Friday') always follow.
#.
-#: ../calendar/gui/dialogs/recurrence-page.c:1008
+#: ../calendar/gui/dialogs/recurrence-page.c:1041
msgid "fourth"
msgstr "fourth"
@@ -6868,13 +6958,13 @@ msgstr "fourth"
#. * (dropdown menu options are in [square brackets]). This means that after 'last', either the string 'day' or
#. * the name of a week day (like 'Monday' or 'Friday') always follow.
#.
-#: ../calendar/gui/dialogs/recurrence-page.c:1013
+#: ../calendar/gui/dialogs/recurrence-page.c:1046
msgid "last"
msgstr "last"
#. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [Other date] [11th to 20th] [17th] [forever]'
#. * (dropdown menu options are in [square brackets]).
-#: ../calendar/gui/dialogs/recurrence-page.c:1039
+#: ../calendar/gui/dialogs/recurrence-page.c:1072
msgid "Other Date"
msgstr "Other Date"
@@ -6882,7 +6972,7 @@ msgstr "Other Date"
#. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
#. * on the [Other date] [1st to 10th] [7th] [forever]' (dropdown menu options are in [square brackets]).
#.
-#: ../calendar/gui/dialogs/recurrence-page.c:1047
+#: ../calendar/gui/dialogs/recurrence-page.c:1080
msgid "1st to 10th"
msgstr "1st to 10th"
@@ -6890,7 +6980,7 @@ msgstr "1st to 10th"
#. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
#. * on the [Other date] [11th to 20th] [17th] [forever]' (dropdown menu options are in [square brackets]).
#.
-#: ../calendar/gui/dialogs/recurrence-page.c:1053
+#: ../calendar/gui/dialogs/recurrence-page.c:1086
msgid "11th to 20th"
msgstr "11th to 20th"
@@ -6898,45 +6988,45 @@ msgstr "11th to 20th"
#. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
#. * on the [Other date] [21th to 31th] [27th] [forever]' (dropdown menu options are in [square brackets]).
#.
-#: ../calendar/gui/dialogs/recurrence-page.c:1059
+#: ../calendar/gui/dialogs/recurrence-page.c:1092
msgid "21st to 31st"
msgstr "21st to 31st"
#. For Translator : 'day' is part of the sentence of the form 'appointment recurs/Every [x] month(s) on the [first] [day] [forever]'
#. (dropdown menu options are in [square brackets]). This means that after 'first', either the string 'day' or
#. the name of a week day (like 'Monday' or 'Friday') always follow.
-#: ../calendar/gui/dialogs/recurrence-page.c:1082
+#: ../calendar/gui/dialogs/recurrence-page.c:1115
msgid "day"
msgstr "day"
#. TRANSLATORS: Entire string is for example: 'This appointment recurs/Every [x] month(s) on the [second] [Tuesday] [forever]'
#. * (dropdown menu options are in [square brackets])."
#.
-#: ../calendar/gui/dialogs/recurrence-page.c:1208
+#: ../calendar/gui/dialogs/recurrence-page.c:1241
msgid "on the"
msgstr "on the"
-#: ../calendar/gui/dialogs/recurrence-page.c:1384
+#: ../calendar/gui/dialogs/recurrence-page.c:1417
msgid "occurrences"
msgstr "occurrences"
-#: ../calendar/gui/dialogs/recurrence-page.c:2087
+#: ../calendar/gui/dialogs/recurrence-page.c:2120
msgid "Add exception"
msgstr "Add exception"
-#: ../calendar/gui/dialogs/recurrence-page.c:2128
+#: ../calendar/gui/dialogs/recurrence-page.c:2161
msgid "Could not get a selection to modify."
msgstr "Could not get a selection to modify."
-#: ../calendar/gui/dialogs/recurrence-page.c:2134
+#: ../calendar/gui/dialogs/recurrence-page.c:2167
msgid "Modify exception"
msgstr "Modify exception"
-#: ../calendar/gui/dialogs/recurrence-page.c:2178
+#: ../calendar/gui/dialogs/recurrence-page.c:2211
msgid "Could not get a selection to delete."
msgstr "Could not get a selection to delete."
-#: ../calendar/gui/dialogs/recurrence-page.c:2302
+#: ../calendar/gui/dialogs/recurrence-page.c:2335
msgid "Date/Time"
msgstr "Date/Time"
@@ -6987,6 +7077,10 @@ msgstr "week(s)"
msgid "year(s)"
msgstr "year(s)"
+#: ../calendar/gui/dialogs/send-comp.c:116
+msgid "Send my alarms with this event"
+msgstr "Send my alarms with this event"
+
#: ../calendar/gui/dialogs/task-details-page.c:377
#: ../calendar/gui/dialogs/task-details-page.c:397
msgid "Completed date is wrong"
@@ -7007,55 +7101,55 @@ msgstr "<span weight=\"bold\">Status</span>"
#. Pass TRUE as is_utc, so it gets converted to the current
#. timezone.
#: ../calendar/gui/dialogs/task-details-page.glade.h:4
-#: ../calendar/gui/e-cal-component-preview.c:253
-#: ../calendar/gui/e-cal-model-tasks.c:358
-#: ../calendar/gui/e-cal-model-tasks.c:675
-#: ../calendar/gui/e-calendar-table.c:238
-#: ../calendar/gui/e-calendar-table.c:642 ../calendar/gui/e-itip-control.c:946
-#: ../calendar/gui/e-meeting-store.c:181 ../calendar/gui/e-meeting-store.c:204
-#: ../calendar/gui/print.c:2552 ../calendar/gui/tasktypes.xml.h:13
-#: ../plugins/save-calendar/csv-format.c:365
+#: ../calendar/gui/e-cal-component-preview.c:247
+#: ../calendar/gui/e-cal-model-tasks.c:362
+#: ../calendar/gui/e-cal-model-tasks.c:679
+#: ../calendar/gui/e-calendar-table.c:237
+#: ../calendar/gui/e-calendar-table.c:663 ../calendar/gui/e-itip-control.c:941
+#: ../calendar/gui/e-meeting-store.c:180 ../calendar/gui/e-meeting-store.c:203
+#: ../calendar/gui/print.c:2561 ../calendar/gui/tasktypes.xml.h:9
+#: ../plugins/save-calendar/csv-format.c:366
msgid "Completed"
msgstr "Completed"
#: ../calendar/gui/dialogs/task-details-page.glade.h:5
-#: ../calendar/gui/e-cal-component-preview.c:272
-#: ../calendar/gui/e-calendar-table.c:567 ../calendar/gui/tasktypes.xml.h:21
+#: ../calendar/gui/e-cal-component-preview.c:266
+#: ../calendar/gui/e-calendar-table.c:588 ../calendar/gui/tasktypes.xml.h:14
#: ../mail/message-list.c:1065
msgid "High"
msgstr "High"
#: ../calendar/gui/dialogs/task-details-page.glade.h:6
-#: ../calendar/gui/e-cal-component-preview.c:250
-#: ../calendar/gui/e-cal-model-tasks.c:356
-#: ../calendar/gui/e-cal-model-tasks.c:673
-#: ../calendar/gui/e-cal-model-tasks.c:750
-#: ../calendar/gui/e-calendar-table.c:236
-#: ../calendar/gui/e-calendar-table.c:641 ../calendar/gui/print.c:2549
+#: ../calendar/gui/e-cal-component-preview.c:244
+#: ../calendar/gui/e-cal-model-tasks.c:360
+#: ../calendar/gui/e-cal-model-tasks.c:677
+#: ../calendar/gui/e-cal-model-tasks.c:754
+#: ../calendar/gui/e-calendar-table.c:235
+#: ../calendar/gui/e-calendar-table.c:662 ../calendar/gui/print.c:2558
msgid "In Progress"
msgstr "In Progress"
#: ../calendar/gui/dialogs/task-details-page.glade.h:7
-#: ../calendar/gui/e-cal-component-preview.c:276
-#: ../calendar/gui/e-calendar-table.c:569 ../calendar/gui/tasktypes.xml.h:29
+#: ../calendar/gui/e-cal-component-preview.c:270
+#: ../calendar/gui/e-calendar-table.c:590 ../calendar/gui/tasktypes.xml.h:16
#: ../mail/message-list.c:1063
msgid "Low"
msgstr "Low"
#: ../calendar/gui/dialogs/task-details-page.glade.h:8
-#: ../calendar/gui/e-cal-component-preview.c:274
-#: ../calendar/gui/e-cal-model.c:974 ../calendar/gui/e-calendar-table.c:568
-#: ../calendar/gui/tasktypes.xml.h:32 ../mail/message-list.c:1064
+#: ../calendar/gui/e-cal-component-preview.c:268
+#: ../calendar/gui/e-cal-model.c:1006 ../calendar/gui/e-calendar-table.c:589
+#: ../calendar/gui/tasktypes.xml.h:17 ../mail/message-list.c:1064
msgid "Normal"
msgstr "Normal"
#: ../calendar/gui/dialogs/task-details-page.glade.h:9
-#: ../calendar/gui/e-cal-component-preview.c:260
-#: ../calendar/gui/e-cal-model-tasks.c:354
-#: ../calendar/gui/e-cal-model-tasks.c:671
-#: ../calendar/gui/e-calendar-table.c:234
-#: ../calendar/gui/e-calendar-table.c:640 ../calendar/gui/print.c:2546
-#: ../calendar/gui/tasktypes.xml.h:33
+#: ../calendar/gui/e-cal-component-preview.c:254
+#: ../calendar/gui/e-cal-model-tasks.c:358
+#: ../calendar/gui/e-cal-model-tasks.c:675
+#: ../calendar/gui/e-calendar-table.c:233
+#: ../calendar/gui/e-calendar-table.c:661 ../calendar/gui/print.c:2555
+#: ../calendar/gui/tasktypes.xml.h:18
msgid "Not Started"
msgstr "Not Started"
@@ -7068,7 +7162,7 @@ msgid "Stat_us:"
msgstr "Stat_us:"
#: ../calendar/gui/dialogs/task-details-page.glade.h:12
-#: ../calendar/gui/e-calendar-table.c:570 ../calendar/gui/tasktypes.xml.h:44
+#: ../calendar/gui/e-calendar-table.c:591 ../calendar/gui/tasktypes.xml.h:24
msgid "Undefined"
msgstr "Undefined"
@@ -7094,28 +7188,28 @@ msgid "Click to change or view the status details of the task"
msgstr "Click to change or view the status details of the task"
#: ../calendar/gui/dialogs/task-editor.c:123
-#: ../composer/e-composer-actions.c:527
+#: ../composer/e-composer-actions.c:525
msgid "_Send Options"
msgstr "_Send Options"
-#: ../calendar/gui/dialogs/task-editor.c:318
+#: ../calendar/gui/dialogs/task-editor.c:317
msgid "_Task"
msgstr "_Task"
-#: ../calendar/gui/dialogs/task-editor.c:321
+#: ../calendar/gui/dialogs/task-editor.c:320
msgid "Task Details"
msgstr "Task Details"
-#: ../calendar/gui/dialogs/task-page.c:368
+#: ../calendar/gui/dialogs/task-page.c:373
#: ../calendar/gui/dialogs/task-page.glade.h:4
msgid "Organi_zer:"
msgstr "Organi_ser:"
-#: ../calendar/gui/dialogs/task-page.c:781
+#: ../calendar/gui/dialogs/task-page.c:786
msgid "Due date is wrong"
msgstr "Due date is wrong"
-#: ../calendar/gui/dialogs/task-page.c:1750
+#: ../calendar/gui/dialogs/task-page.c:1763
#, c-format
msgid "Unable to open tasks in '%s'."
msgstr "Unable to open tasks in '%s'."
@@ -7137,7 +7231,7 @@ msgid "Time zone:"
msgstr "Time zone:"
#. Translator: Entire string is like "Pop up an alert %d days before start of appointment"
-#: ../calendar/gui/e-alarm-list.c:392
+#: ../calendar/gui/e-alarm-list.c:394
#, c-format
msgid "%d day"
msgid_plural "%d days"
@@ -7145,123 +7239,123 @@ msgstr[0] "%d day"
msgstr[1] "%d days"
#. Translator: Entire string is like "Pop up an alert %d weeks before start of appointment"
-#: ../calendar/gui/e-alarm-list.c:398
+#: ../calendar/gui/e-alarm-list.c:400
#, c-format
msgid "%d week"
msgid_plural "%d weeks"
msgstr[0] "%d week"
msgstr[1] "%d weeks"
-#: ../calendar/gui/e-alarm-list.c:460
+#: ../calendar/gui/e-alarm-list.c:462
msgid "Unknown action to be performed"
msgstr "Unknown action to be performed"
#. Translator: The first %s refers to the base, which would be actions like
#. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
-#: ../calendar/gui/e-alarm-list.c:474
+#: ../calendar/gui/e-alarm-list.c:476
#, c-format
msgid "%s %s before the start of the appointment"
msgstr "%s %s before the start of the appointment"
#. Translator: The first %s refers to the base, which would be actions like
#. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
-#: ../calendar/gui/e-alarm-list.c:479
+#: ../calendar/gui/e-alarm-list.c:481
#, c-format
msgid "%s %s after the start of the appointment"
msgstr "%s %s after the start of the appointment"
#. Translator: The %s refers to the base, which would be actions like
#. * "Play a sound"
-#: ../calendar/gui/e-alarm-list.c:486
+#: ../calendar/gui/e-alarm-list.c:488
#, c-format
msgid "%s at the start of the appointment"
msgstr "%s at the start of the appointment"
#. Translator: The first %s refers to the base, which would be actions like
#. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
-#: ../calendar/gui/e-alarm-list.c:497
+#: ../calendar/gui/e-alarm-list.c:499
#, c-format
msgid "%s %s before the end of the appointment"
msgstr "%s %s before the end of the appointment"
#. Translator: The first %s refers to the base, which would be actions like
#. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
-#: ../calendar/gui/e-alarm-list.c:502
+#: ../calendar/gui/e-alarm-list.c:504
#, c-format
msgid "%s %s after the end of the appointment"
msgstr "%s %s after the end of the appointment"
#. Translator: The %s refers to the base, which would be actions like
#. * "Play a sound"
-#: ../calendar/gui/e-alarm-list.c:509
+#: ../calendar/gui/e-alarm-list.c:511
#, c-format
msgid "%s at the end of the appointment"
msgstr "%s at the end of the appointment"
#. Translator: The first %s refers to the base, which would be actions like
#. * "Play a Sound". Second %s is an absolute time, e.g. "10:00AM"
-#: ../calendar/gui/e-alarm-list.c:533
+#: ../calendar/gui/e-alarm-list.c:535
#, c-format
msgid "%s at %s"
msgstr "%s at %s"
#. Translator: The %s refers to the base, which would be actions like
#. * "Play a sound". "Trigger types" are absolute or relative dates
-#: ../calendar/gui/e-alarm-list.c:541
+#: ../calendar/gui/e-alarm-list.c:543
#, c-format
msgid "%s for an unknown trigger type"
msgstr "%s for an unknown trigger type"
-#: ../calendar/gui/e-cal-component-memo-preview.c:75
-#: ../calendar/gui/e-cal-component-preview.c:73 ../mail/em-folder-view.c:3315
+#: ../calendar/gui/e-cal-component-memo-preview.c:69
+#: ../calendar/gui/e-cal-component-preview.c:67 ../mail/em-folder-view.c:3273
#, c-format
msgid "Click to open %s"
msgstr "Click to open %s"
-#: ../calendar/gui/e-cal-component-memo-preview.c:135
-#: ../calendar/gui/e-cal-component-preview.c:177 ../filter/filter-rule.c:857
+#: ../calendar/gui/e-cal-component-memo-preview.c:129
+#: ../calendar/gui/e-cal-component-preview.c:171 ../filter/filter-rule.c:858
msgid "Untitled"
msgstr "Untitled"
-#: ../calendar/gui/e-cal-component-memo-preview.c:187
-#: ../calendar/gui/e-cal-component-preview.c:217
-#: ../calendar/gui/e-cal-component-preview.c:228
+#: ../calendar/gui/e-cal-component-memo-preview.c:181
+#: ../calendar/gui/e-cal-component-preview.c:211
+#: ../calendar/gui/e-cal-component-preview.c:222
msgid "Start Date:"
msgstr "Start Date:"
-#: ../calendar/gui/e-cal-component-memo-preview.c:200
-#: ../calendar/gui/e-cal-component-preview.c:291
-#: ../calendar/gui/e-itip-control.c:1218
+#: ../calendar/gui/e-cal-component-memo-preview.c:194
+#: ../calendar/gui/e-cal-component-preview.c:285
+#: ../calendar/gui/e-itip-control.c:1213
#: ../calendar/gui/e-itip-control.glade.h:4 ../mail/mail-config.glade.h:69
#: ../widgets/misc/e-attachment.glade.h:2
msgid "Description:"
msgstr "Description:"
-#: ../calendar/gui/e-cal-component-memo-preview.c:224
-#: ../calendar/gui/e-cal-component-preview.c:315
+#: ../calendar/gui/e-cal-component-memo-preview.c:218
+#: ../calendar/gui/e-cal-component-preview.c:309
msgid "Web Page:"
msgstr "Web Page:"
-#: ../calendar/gui/e-cal-component-preview.c:210
-#: ../calendar/gui/e-itip-control.c:1162
+#: ../calendar/gui/e-cal-component-preview.c:204
+#: ../calendar/gui/e-itip-control.c:1157
#: ../calendar/gui/e-itip-control.glade.h:9
msgid "Summary:"
msgstr "Summary:"
-#: ../calendar/gui/e-cal-component-preview.c:239
+#: ../calendar/gui/e-cal-component-preview.c:233
msgid "Due Date:"
msgstr "Due Date:"
#. write status
#. Status
-#: ../calendar/gui/e-cal-component-preview.c:246
-#: ../calendar/gui/e-itip-control.c:1186
-#: ../plugins/exchange-operations/exchange-account-setup.c:267
-#: ../plugins/itip-formatter/itip-view.c:1029
+#: ../calendar/gui/e-cal-component-preview.c:240
+#: ../calendar/gui/e-itip-control.c:1181
+#: ../plugins/exchange-operations/exchange-account-setup.c:284
+#: ../plugins/itip-formatter/itip-view.c:1052
msgid "Status:"
msgstr "Status:"
-#: ../calendar/gui/e-cal-component-preview.c:270
+#: ../calendar/gui/e-cal-component-preview.c:264
msgid "Priority:"
msgstr "Priority:"
@@ -7275,17 +7369,17 @@ msgid "Start Date"
msgstr "Start Date"
#: ../calendar/gui/e-cal-model-calendar.c:187
-#: ../calendar/gui/e-calendar-table.c:619
+#: ../calendar/gui/e-calendar-table.c:640
msgid "Free"
msgstr "Free"
#: ../calendar/gui/e-cal-model-calendar.c:190
-#: ../calendar/gui/e-calendar-table.c:620
-#: ../calendar/gui/e-meeting-time-sel.c:398
+#: ../calendar/gui/e-calendar-table.c:641
+#: ../calendar/gui/e-meeting-time-sel.c:399
msgid "Busy"
msgstr "Busy"
-#: ../calendar/gui/e-cal-model-tasks.c:623
+#: ../calendar/gui/e-cal-model-tasks.c:627
msgid ""
"The geographical position must be entered in the format: \n"
"\n"
@@ -7295,225 +7389,225 @@ msgstr ""
"\n"
"45.436845,125.862501"
-#: ../calendar/gui/e-cal-model-tasks.c:1025 ../calendar/gui/e-cal-model.c:980
-#: ../calendar/gui/e-meeting-list-view.c:191
-#: ../calendar/gui/e-meeting-store.c:153 ../calendar/gui/e-meeting-store.c:163
-#: ../calendar/gui/e-meeting-store.c:746
+#: ../calendar/gui/e-cal-model-tasks.c:1029 ../calendar/gui/e-cal-model.c:1012
+#: ../calendar/gui/e-meeting-list-view.c:190
+#: ../calendar/gui/e-meeting-store.c:152 ../calendar/gui/e-meeting-store.c:162
+#: ../calendar/gui/e-meeting-store.c:745
#: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:5
msgid "Yes"
msgstr "Yes"
-#: ../calendar/gui/e-cal-model-tasks.c:1025 ../calendar/gui/e-cal-model.c:980
-#: ../calendar/gui/e-meeting-list-view.c:192
-#: ../calendar/gui/e-meeting-store.c:165
+#: ../calendar/gui/e-cal-model-tasks.c:1029 ../calendar/gui/e-cal-model.c:1012
+#: ../calendar/gui/e-meeting-list-view.c:191
+#: ../calendar/gui/e-meeting-store.c:164
#: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:2
msgid "No"
msgstr "No"
#. This is the default filename used for temporary file creation
-#: ../calendar/gui/e-cal-model.c:339 ../calendar/gui/e-cal-popup.c:105
-#: ../calendar/gui/e-cal-popup.c:122 ../calendar/gui/e-cal-popup.c:177
-#: ../calendar/gui/e-itip-control.c:1203 ../calendar/gui/e-itip-control.c:1343
-#: ../calendar/gui/e-meeting-list-view.c:167
-#: ../calendar/gui/e-meeting-list-view.c:181
-#: ../calendar/gui/e-meeting-store.c:111 ../calendar/gui/e-meeting-store.c:146
-#: ../calendar/gui/e-meeting-store.c:209 ../calendar/gui/print.c:985
-#: ../calendar/gui/print.c:1002 ../mail/em-utils.c:1340
-#: ../plugins/itip-formatter/itip-formatter.c:409
-#: ../plugins/itip-formatter/itip-formatter.c:2046
+#: ../calendar/gui/e-cal-model.c:354 ../calendar/gui/e-cal-popup.c:106
+#: ../calendar/gui/e-cal-popup.c:123 ../calendar/gui/e-cal-popup.c:178
+#: ../calendar/gui/e-itip-control.c:1198 ../calendar/gui/e-itip-control.c:1338
+#: ../calendar/gui/e-meeting-list-view.c:166
+#: ../calendar/gui/e-meeting-list-view.c:180
+#: ../calendar/gui/e-meeting-store.c:110 ../calendar/gui/e-meeting-store.c:145
+#: ../calendar/gui/e-meeting-store.c:208 ../calendar/gui/print.c:984
+#: ../calendar/gui/print.c:1001 ../mail/em-utils.c:1342
+#: ../plugins/itip-formatter/itip-formatter.c:447
+#: ../plugins/itip-formatter/itip-formatter.c:2204
#: ../plugins/plugin-manager/plugin-manager.c:89
#: ../widgets/misc/e-attachment-bar.c:821
#: ../widgets/misc/e-charset-picker.c:56
msgid "Unknown"
msgstr "Unknown"
-#: ../calendar/gui/e-cal-model.c:976
+#: ../calendar/gui/e-cal-model.c:1008
msgid "Recurring"
msgstr "Recurring"
-#: ../calendar/gui/e-cal-model.c:978
+#: ../calendar/gui/e-cal-model.c:1010
msgid "Assigned"
msgstr "Assigned"
-#: ../calendar/gui/e-cal-popup.c:183 ../mail/em-popup.c:416
+#: ../calendar/gui/e-cal-popup.c:184 ../mail/em-popup.c:414
msgid "Save As..."
msgstr "Save As..."
-#: ../calendar/gui/e-cal-popup.c:199 ../mail/em-format-html-display.c:2029
+#: ../calendar/gui/e-cal-popup.c:200 ../mail/em-format-html-display.c:2217
msgid "Select folder to save selected attachments..."
msgstr "Select folder to save selected attachments..."
-#: ../calendar/gui/e-cal-popup.c:231 ../mail/em-popup.c:444
+#: ../calendar/gui/e-cal-popup.c:232 ../mail/em-popup.c:442
#, c-format
msgid "untitled_image.%s"
msgstr "untitled_image.%s"
-#: ../calendar/gui/e-cal-popup.c:285 ../calendar/gui/e-calendar-table.c:1576
-#: ../calendar/gui/e-calendar-view.c:1672 ../calendar/gui/e-memo-table.c:926
-#: ../mail/em-folder-view.c:1336 ../mail/em-popup.c:561 ../mail/em-popup.c:572
+#: ../calendar/gui/e-cal-popup.c:286 ../calendar/gui/e-calendar-table.c:1600
+#: ../calendar/gui/e-calendar-view.c:1776 ../calendar/gui/e-memo-table.c:939
+#: ../mail/em-folder-view.c:1338 ../mail/em-popup.c:559 ../mail/em-popup.c:570
msgid "_Save As..."
msgstr "_Save As..."
-#: ../calendar/gui/e-cal-popup.c:286 ../mail/em-popup.c:562
-#: ../mail/em-popup.c:573
+#: ../calendar/gui/e-cal-popup.c:287 ../mail/em-popup.c:560
+#: ../mail/em-popup.c:571
msgid "Set as _Background"
msgstr "Set as _Background"
-#: ../calendar/gui/e-cal-popup.c:287
+#: ../calendar/gui/e-cal-popup.c:288
msgid "_Save Selected"
msgstr "_Save Selected"
-#: ../calendar/gui/e-cal-popup.c:428 ../mail/em-popup.c:831
+#: ../calendar/gui/e-cal-popup.c:431 ../mail/em-popup.c:829
#, c-format
msgid "Open in %s..."
msgstr "Open in %s..."
-#: ../calendar/gui/e-calendar-table.c:338
+#: ../calendar/gui/e-calendar-table.c:336
msgid "* No Summary *"
msgstr "* No Summary *"
#. To Translators: It will display "Organiser: NameOfTheUser <email@ofuser.com>"
-#: ../calendar/gui/e-calendar-table.c:374
-#: ../calendar/gui/e-calendar-view.c:2215
+#: ../calendar/gui/e-calendar-table.c:372
+#: ../calendar/gui/e-calendar-view.c:2399
#, c-format
msgid "Organizer: %s <%s>"
msgstr "Organiser: %s <%s>"
#. With SunOne accounts, there may be no ':' in organiser.value
#. With SunOne accouts, there may be no ':' in organiser.value
-#: ../calendar/gui/e-calendar-table.c:377
-#: ../calendar/gui/e-calendar-view.c:2219
+#: ../calendar/gui/e-calendar-table.c:375
+#: ../calendar/gui/e-calendar-view.c:2403
#, c-format
msgid "Organizer: %s"
msgstr "Organiser: %s"
-#: ../calendar/gui/e-calendar-table.c:408
+#: ../calendar/gui/e-calendar-table.c:406
msgid "Start: "
msgstr "Start: "
-#: ../calendar/gui/e-calendar-table.c:420
+#: ../calendar/gui/e-calendar-table.c:418
msgid "Due: "
msgstr "Due: "
-#: ../calendar/gui/e-calendar-table.c:589
+#: ../calendar/gui/e-calendar-table.c:610
msgid "0%"
msgstr "0%"
-#: ../calendar/gui/e-calendar-table.c:590
+#: ../calendar/gui/e-calendar-table.c:611
msgid "10%"
msgstr "10%"
-#: ../calendar/gui/e-calendar-table.c:591
+#: ../calendar/gui/e-calendar-table.c:612
msgid "20%"
msgstr "20%"
-#: ../calendar/gui/e-calendar-table.c:592
+#: ../calendar/gui/e-calendar-table.c:613
msgid "30%"
msgstr "30%"
-#: ../calendar/gui/e-calendar-table.c:593
+#: ../calendar/gui/e-calendar-table.c:614
msgid "40%"
msgstr "40%"
-#: ../calendar/gui/e-calendar-table.c:594
+#: ../calendar/gui/e-calendar-table.c:615
msgid "50%"
msgstr "50%"
-#: ../calendar/gui/e-calendar-table.c:595
+#: ../calendar/gui/e-calendar-table.c:616
msgid "60%"
msgstr "60%"
-#: ../calendar/gui/e-calendar-table.c:596
+#: ../calendar/gui/e-calendar-table.c:617
msgid "70%"
msgstr "70%"
-#: ../calendar/gui/e-calendar-table.c:597
+#: ../calendar/gui/e-calendar-table.c:618
msgid "80%"
msgstr "80%"
-#: ../calendar/gui/e-calendar-table.c:598
+#: ../calendar/gui/e-calendar-table.c:619
msgid "90%"
msgstr "90%"
-#: ../calendar/gui/e-calendar-table.c:599
+#: ../calendar/gui/e-calendar-table.c:620
msgid "100%"
msgstr "100%"
-#: ../calendar/gui/e-calendar-table.c:879
-#: ../calendar/gui/e-calendar-view.c:665 ../calendar/gui/e-memo-table.c:439
+#: ../calendar/gui/e-calendar-table.c:900
+#: ../calendar/gui/e-calendar-view.c:672 ../calendar/gui/e-memo-table.c:452
msgid "Deleting selected objects"
msgstr "Deleting selected objects"
-#: ../calendar/gui/e-calendar-table.c:1163
-#: ../calendar/gui/e-calendar-view.c:795 ../calendar/gui/e-memo-table.c:645
+#: ../calendar/gui/e-calendar-table.c:1183
+#: ../calendar/gui/e-calendar-view.c:837 ../calendar/gui/e-memo-table.c:657
msgid "Updating objects"
msgstr "Updating objects"
-#: ../calendar/gui/e-calendar-table.c:1348
-#: ../calendar/gui/e-calendar-view.c:1221 ../calendar/gui/e-memo-table.c:821
-#: ../composer/e-composer-actions.c:277
+#: ../calendar/gui/e-calendar-table.c:1371
+#: ../calendar/gui/e-calendar-view.c:1298 ../calendar/gui/e-memo-table.c:833
+#: ../composer/e-composer-actions.c:275
msgid "Save as..."
msgstr "Save as..."
-#: ../calendar/gui/e-calendar-table.c:1571
-#: ../calendar/gui/e-calendar-view.c:1654
+#: ../calendar/gui/e-calendar-table.c:1595
+#: ../calendar/gui/e-calendar-view.c:1758
msgid "New _Task"
msgstr "New _Task"
-#: ../calendar/gui/e-calendar-table.c:1575 ../calendar/gui/e-memo-table.c:925
+#: ../calendar/gui/e-calendar-table.c:1599 ../calendar/gui/e-memo-table.c:938
msgid "Open _Web Page"
msgstr "Open _Web Page"
-#: ../calendar/gui/e-calendar-table.c:1577
-#: ../calendar/gui/e-calendar-view.c:1657 ../calendar/gui/e-memo-table.c:927
+#: ../calendar/gui/e-calendar-table.c:1601
+#: ../calendar/gui/e-calendar-view.c:1761 ../calendar/gui/e-memo-table.c:940
msgid "P_rint..."
msgstr "P_rint..."
-#: ../calendar/gui/e-calendar-table.c:1581
-#: ../calendar/gui/e-calendar-view.c:1677 ../calendar/gui/e-memo-table.c:931
+#: ../calendar/gui/e-calendar-table.c:1605
+#: ../calendar/gui/e-calendar-view.c:1781 ../calendar/gui/e-memo-table.c:944
#: ../ui/evolution-addressbook.xml.h:2 ../ui/evolution-calendar.xml.h:1
#: ../ui/evolution-memos.xml.h:1 ../ui/evolution-tasks.xml.h:1
msgid "C_ut"
msgstr "C_ut"
-#: ../calendar/gui/e-calendar-table.c:1583
-#: ../calendar/gui/e-calendar-view.c:1660
-#: ../calendar/gui/e-calendar-view.c:1679 ../calendar/gui/e-memo-table.c:933
-#: ../ui/evolution-addressbook.xml.h:57 ../ui/evolution-calendar.xml.h:43
+#: ../calendar/gui/e-calendar-table.c:1607
+#: ../calendar/gui/e-calendar-view.c:1764
+#: ../calendar/gui/e-calendar-view.c:1783 ../calendar/gui/e-memo-table.c:946
+#: ../ui/evolution-addressbook.xml.h:57 ../ui/evolution-calendar.xml.h:46
#: ../ui/evolution-memos.xml.h:19 ../ui/evolution-tasks.xml.h:28
msgid "_Paste"
msgstr "_Paste"
-#: ../calendar/gui/e-calendar-table.c:1587 ../ui/evolution-tasks.xml.h:22
+#: ../calendar/gui/e-calendar-table.c:1611 ../ui/evolution-tasks.xml.h:22
msgid "_Assign Task"
msgstr "_Assign Task"
-#: ../calendar/gui/e-calendar-table.c:1588 ../calendar/gui/e-memo-table.c:937
+#: ../calendar/gui/e-calendar-table.c:1612 ../calendar/gui/e-memo-table.c:950
#: ../ui/evolution-tasks.xml.h:26
msgid "_Forward as iCalendar"
msgstr "_Forward as iCalendar"
-#: ../calendar/gui/e-calendar-table.c:1589
+#: ../calendar/gui/e-calendar-table.c:1613
msgid "_Mark as Complete"
msgstr "_Mark as Complete"
-#: ../calendar/gui/e-calendar-table.c:1590
+#: ../calendar/gui/e-calendar-table.c:1614
msgid "_Mark Selected Tasks as Complete"
msgstr "_Mark Selected Tasks as Complete"
-#: ../calendar/gui/e-calendar-table.c:1591
+#: ../calendar/gui/e-calendar-table.c:1615
msgid "_Mark as Incomplete"
msgstr "_Mark as Incomplete"
-#: ../calendar/gui/e-calendar-table.c:1592
+#: ../calendar/gui/e-calendar-table.c:1616
msgid "_Mark Selected Tasks as Incomplete"
msgstr "_Mark Selected Tasks as Incomplete"
-#: ../calendar/gui/e-calendar-table.c:1597
+#: ../calendar/gui/e-calendar-table.c:1621
msgid "_Delete Selected Tasks"
msgstr "_Delete Selected Tasks"
-#: ../calendar/gui/e-calendar-table.c:1834
+#: ../calendar/gui/e-calendar-table.c:1858
#: ../calendar/gui/e-calendar-table.etspec.h:4
msgid "Click to add a task"
msgstr "Click to add a task"
@@ -7536,8 +7630,8 @@ msgid "Due date"
msgstr "Due date"
#: ../calendar/gui/e-calendar-table.etspec.h:8
-#: ../calendar/gui/tasktypes.xml.h:37
-#: ../plugins/save-calendar/csv-format.c:372
+#: ../calendar/gui/tasktypes.xml.h:20
+#: ../plugins/save-calendar/csv-format.c:373
msgid "Priority"
msgstr "Priority"
@@ -7545,108 +7639,153 @@ msgstr "Priority"
msgid "Start date"
msgstr "Start date"
-#: ../calendar/gui/e-calendar-view.c:1340
+#. To Translators: 'Status' here means the state of the attendees, the resulting string will be in a form:
+#. Status: Accepted: X Declined: Y ...
+#: ../calendar/gui/e-calendar-table.etspec.h:10
+#: ../calendar/gui/e-calendar-view.c:2307
+#: ../calendar/gui/e-meeting-list-view.c:602
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:10
+#: ../calendar/gui/tasktypes.xml.h:21 ../mail/em-filter-i18n.h:70
+#: ../mail/message-list.etspec.h:17
+msgid "Status"
+msgstr "Status"
+
+#: ../calendar/gui/e-calendar-view.c:1444
msgid "Moving items"
msgstr "Moving items"
-#: ../calendar/gui/e-calendar-view.c:1342
+#: ../calendar/gui/e-calendar-view.c:1446
msgid "Copying items"
msgstr "Copying items"
-#: ../calendar/gui/e-calendar-view.c:1651
+#: ../calendar/gui/e-calendar-view.c:1755
msgid "New _Appointment..."
msgstr "New _Appointment..."
-#: ../calendar/gui/e-calendar-view.c:1652
+#: ../calendar/gui/e-calendar-view.c:1756
msgid "New All Day _Event"
msgstr "New All Day _Event"
-#: ../calendar/gui/e-calendar-view.c:1653
+#: ../calendar/gui/e-calendar-view.c:1757
msgid "New _Meeting"
msgstr "New _Meeting"
#. FIXME: hook in this somehow
-#: ../calendar/gui/e-calendar-view.c:1664
+#: ../calendar/gui/e-calendar-view.c:1768
msgid "_Current View"
msgstr "_Current View"
-#: ../calendar/gui/e-calendar-view.c:1666
+#: ../calendar/gui/e-calendar-view.c:1770
msgid "Select T_oday"
msgstr "Select T_oday"
-#: ../calendar/gui/e-calendar-view.c:1667
+#: ../calendar/gui/e-calendar-view.c:1771
msgid "_Select Date..."
msgstr "_Select Date..."
-#: ../calendar/gui/e-calendar-view.c:1673
+#: ../calendar/gui/e-calendar-view.c:1777
msgid "Pri_nt..."
msgstr "Pri_nt..."
-#: ../calendar/gui/e-calendar-view.c:1683
+#: ../calendar/gui/e-calendar-view.c:1787
msgid "Cop_y to Calendar..."
msgstr "Cop_y to Calendar..."
-#: ../calendar/gui/e-calendar-view.c:1684
+#: ../calendar/gui/e-calendar-view.c:1788
msgid "Mo_ve to Calendar..."
msgstr "Mo_ve to Calendar..."
-#: ../calendar/gui/e-calendar-view.c:1685
+#: ../calendar/gui/e-calendar-view.c:1789
msgid "_Delegate Meeting..."
msgstr "_Delegate Meeting..."
-#: ../calendar/gui/e-calendar-view.c:1686
+#: ../calendar/gui/e-calendar-view.c:1790
msgid "_Schedule Meeting..."
msgstr "_Schedule Meeting..."
-#: ../calendar/gui/e-calendar-view.c:1687
+#: ../calendar/gui/e-calendar-view.c:1791
msgid "_Forward as iCalendar..."
msgstr "_Forward as iCalendar..."
-#: ../calendar/gui/e-calendar-view.c:1688
+#: ../calendar/gui/e-calendar-view.c:1792
msgid "_Reply"
msgstr "_Reply"
-#: ../calendar/gui/e-calendar-view.c:1689 ../mail/em-folder-view.c:1330
-#: ../mail/em-popup.c:566 ../mail/em-popup.c:577
+#: ../calendar/gui/e-calendar-view.c:1793 ../mail/em-folder-view.c:1332
+#: ../mail/em-popup.c:564 ../mail/em-popup.c:575
#: ../ui/evolution-mail-message.xml.h:82
msgid "Reply to _All"
msgstr "Reply to _All"
-#: ../calendar/gui/e-calendar-view.c:1694
+#: ../calendar/gui/e-calendar-view.c:1798
msgid "Make this Occurrence _Movable"
msgstr "Make this Occurrence _Movable"
-#: ../calendar/gui/e-calendar-view.c:1695 ../ui/evolution-calendar.xml.h:9
+#: ../calendar/gui/e-calendar-view.c:1799 ../ui/evolution-calendar.xml.h:9
msgid "Delete this _Occurrence"
msgstr "Delete this _Occurrence"
-#: ../calendar/gui/e-calendar-view.c:1696
+#: ../calendar/gui/e-calendar-view.c:1800
msgid "Delete _All Occurrences"
msgstr "Delete _All Occurrences"
+#: ../calendar/gui/e-calendar-view.c:2254
+#: ../calendar/gui/e-itip-control.c:1186
+#: ../calendar/gui/e-meeting-list-view.c:202
+#: ../calendar/gui/e-meeting-store.c:172 ../calendar/gui/e-meeting-store.c:195
+#: ../plugins/itip-formatter/itip-formatter.c:2192
+msgid "Accepted"
+msgstr "Accepted"
+
+#: ../calendar/gui/e-calendar-view.c:2255
+#: ../calendar/gui/e-itip-control.c:1194
+#: ../calendar/gui/e-meeting-list-view.c:203
+#: ../calendar/gui/e-meeting-store.c:174 ../calendar/gui/e-meeting-store.c:197
+#: ../plugins/itip-formatter/itip-formatter.c:2198
+msgid "Declined"
+msgstr "Declined"
+
+#: ../calendar/gui/e-calendar-view.c:2256
+#: ../calendar/gui/e-meeting-list-view.c:204
+#: ../calendar/gui/e-meeting-store.c:176 ../calendar/gui/e-meeting-store.c:199
+#: ../calendar/gui/e-meeting-time-sel.c:398
+msgid "Tentative"
+msgstr "Tentative"
+
+#: ../calendar/gui/e-calendar-view.c:2257
+#: ../calendar/gui/e-meeting-list-view.c:205
+#: ../calendar/gui/e-meeting-store.c:178 ../calendar/gui/e-meeting-store.c:201
+#: ../plugins/itip-formatter/itip-formatter.c:2201
+msgid "Delegated"
+msgstr "Delegated"
+
+#: ../calendar/gui/e-calendar-view.c:2258
+msgid "Needs action"
+msgstr "Needs action"
+
#. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:2235 ../calendar/gui/print.c:2508
+#: ../calendar/gui/e-calendar-view.c:2419 ../calendar/gui/print.c:2517
#, c-format
msgid "Location: %s"
msgstr "Location: %s"
#. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
-#: ../calendar/gui/e-calendar-view.c:2269
+#: ../calendar/gui/e-calendar-view.c:2453
#, c-format
msgid "Time: %s %s"
msgstr "Time: %s %s"
#. strftime format of a weekday, a date and a time, 24-hour.
-#: ../calendar/gui/e-cell-date-edit-text.c:111
+#: ../calendar/gui/e-cell-date-edit-text.c:109
msgid "%a %m/%d/%Y %H:%M:%S"
msgstr "%a %d/%m/%Y %H:%M:%S"
#. strftime format of a weekday, a date and a time, 12-hour.
-#: ../calendar/gui/e-cell-date-edit-text.c:114
+#: ../calendar/gui/e-cell-date-edit-text.c:112
msgid "%a %m/%d/%Y %I:%M:%S %p"
msgstr "%a %d/%m/%Y %I:%M:%S %p"
-#: ../calendar/gui/e-cell-date-edit-text.c:122
+#: ../calendar/gui/e-cell-date-edit-text.c:120
#, c-format
msgid ""
"The date must be entered in the format: \n"
@@ -7659,53 +7798,63 @@ msgstr ""
#. * to change the length of the time division in the calendar day view, e.g.
#. * a day is displayed in 24 "60 minute divisions" or 48 "30 minute divisions"
#.
-#: ../calendar/gui/e-day-view-time-item.c:583
+#: ../calendar/gui/e-day-view-time-item.c:750
#, c-format
msgid "%02i minute divisions"
msgstr "%02i minute divisions"
+#: ../calendar/gui/e-day-view-time-item.c:771
+msgid "Show the second time zone"
+msgstr "Show the second time zone"
+
#. strftime format %A = full weekday name, %d = day of month,
#. %B = full month name. Don't use any other specifiers.
#. strftime format %A = full weekday name, %d = day of
#. month, %B = full month name. You can change the
#. order but don't change the specifiers or add
#. anything.
-#: ../calendar/gui/e-day-view-top-item.c:852 ../calendar/gui/e-day-view.c:1551
-#: ../calendar/gui/e-week-view-main-item.c:326 ../calendar/gui/print.c:1672
+#: ../calendar/gui/e-day-view-top-item.c:851 ../calendar/gui/e-day-view.c:1582
+#: ../calendar/gui/e-week-view-main-item.c:326 ../calendar/gui/print.c:1678
msgid "%A %d %B"
msgstr "%A %d %B"
#. String to use in 12-hour time format for times in the morning.
-#: ../calendar/gui/e-day-view.c:791 ../calendar/gui/e-week-view.c:528
-#: ../calendar/gui/print.c:829
+#: ../calendar/gui/e-day-view.c:805 ../calendar/gui/e-week-view.c:541
+#: ../calendar/gui/print.c:828
msgid "am"
msgstr "am"
#. String to use in 12-hour time format for times in the afternoon.
-#: ../calendar/gui/e-day-view.c:794 ../calendar/gui/e-week-view.c:531
-#: ../calendar/gui/print.c:831
+#: ../calendar/gui/e-day-view.c:808 ../calendar/gui/e-week-view.c:544
+#: ../calendar/gui/print.c:830
msgid "pm"
msgstr "pm"
-#: ../calendar/gui/e-itip-control.c:765
+#. To Translators: the %d stands for a week number, it's value between 1 and 52/53
+#: ../calendar/gui/e-day-view.c:2321
+#, c-format
+msgid "Week %d"
+msgstr "Week %d"
+
+#: ../calendar/gui/e-itip-control.c:760
msgid "Yes. (Complex Recurrence)"
msgstr "Yes. (Complex Recurrence)"
-#: ../calendar/gui/e-itip-control.c:782
+#: ../calendar/gui/e-itip-control.c:777
#, c-format
msgid "Every day"
msgid_plural "Every %d days"
msgstr[0] "Every day"
msgstr[1] "Every %d days"
-#: ../calendar/gui/e-itip-control.c:795
+#: ../calendar/gui/e-itip-control.c:790
#, c-format
msgid "Every week"
msgid_plural "Every %d weeks"
msgstr[0] "Every week"
msgstr[1] "Every %d weeks"
-#: ../calendar/gui/e-itip-control.c:802
+#: ../calendar/gui/e-itip-control.c:797
#, c-format
msgid "Every week on "
msgid_plural "Every %d weeks on "
@@ -7713,83 +7862,83 @@ msgstr[0] "Every week on "
msgstr[1] "Every %d weeks on "
#. For Translators : 'and' is part of the sentence 'event recurring every week on (dayname) and (dayname)'
-#: ../calendar/gui/e-itip-control.c:813
+#: ../calendar/gui/e-itip-control.c:808
msgid " and "
msgstr " and "
-#: ../calendar/gui/e-itip-control.c:822
+#: ../calendar/gui/e-itip-control.c:817
#, c-format
msgid "The %s day of "
msgstr "The %s day of "
-#: ../calendar/gui/e-itip-control.c:838
+#: ../calendar/gui/e-itip-control.c:833
#, c-format
msgid "The %s %s of "
msgstr "The %s %s of "
-#: ../calendar/gui/e-itip-control.c:849
+#: ../calendar/gui/e-itip-control.c:844
#, c-format
msgid "every month"
msgid_plural "every %d months"
msgstr[0] "every month"
msgstr[1] "every %d months"
-#: ../calendar/gui/e-itip-control.c:861
+#: ../calendar/gui/e-itip-control.c:856
#, c-format
msgid "Every year"
msgid_plural "Every %d years"
msgstr[0] "Every year"
msgstr[1] "Every %d years"
-#: ../calendar/gui/e-itip-control.c:874
+#: ../calendar/gui/e-itip-control.c:869
#, c-format
msgid "a total of %d time"
-msgid_plural " a total of %d times"
+msgid_plural "a total of %d times"
msgstr[0] "a total of %d time"
-msgstr[1] " a total of %d times"
+msgstr[1] "a total of %d times"
#. For Translators : ', ending on' is part of the sentence of the form 'event recurring every day, ending on (date).'
-#: ../calendar/gui/e-itip-control.c:885
+#: ../calendar/gui/e-itip-control.c:880
msgid ", ending on "
msgstr ", ending on "
#. For Translators : 'starts' is starts:date implying a task starts on what date
-#: ../calendar/gui/e-itip-control.c:907
+#: ../calendar/gui/e-itip-control.c:902
msgid "Starts"
msgstr "Starts"
#. For Translators : 'ends' is ends:date implying a task ends on what date
-#: ../calendar/gui/e-itip-control.c:921
+#: ../calendar/gui/e-itip-control.c:916
msgid "Ends"
msgstr "Ends"
-#: ../calendar/gui/e-itip-control.c:961
-#: ../plugins/save-calendar/csv-format.c:370
+#: ../calendar/gui/e-itip-control.c:956
+#: ../plugins/save-calendar/csv-format.c:371
msgid "Due"
msgstr "Due"
-#: ../calendar/gui/e-itip-control.c:1003 ../calendar/gui/e-itip-control.c:1060
+#: ../calendar/gui/e-itip-control.c:998 ../calendar/gui/e-itip-control.c:1055
msgid "iCalendar Information"
msgstr "iCalendar Information"
#. Title
-#: ../calendar/gui/e-itip-control.c:1020
+#: ../calendar/gui/e-itip-control.c:1015
msgid "iCalendar Error"
msgstr "iCalendar Error"
-#: ../calendar/gui/e-itip-control.c:1092 ../calendar/gui/e-itip-control.c:1108
-#: ../calendar/gui/e-itip-control.c:1119 ../calendar/gui/e-itip-control.c:1136
-#: ../plugins/itip-formatter/itip-view.c:344
-#: ../plugins/itip-formatter/itip-view.c:345
-#: ../plugins/itip-formatter/itip-view.c:432
-#: ../plugins/itip-formatter/itip-view.c:433
-#: ../plugins/itip-formatter/itip-view.c:520
-#: ../plugins/itip-formatter/itip-view.c:521
+#: ../calendar/gui/e-itip-control.c:1087 ../calendar/gui/e-itip-control.c:1103
+#: ../calendar/gui/e-itip-control.c:1114 ../calendar/gui/e-itip-control.c:1131
+#: ../plugins/itip-formatter/itip-view.c:346
+#: ../plugins/itip-formatter/itip-view.c:347
+#: ../plugins/itip-formatter/itip-view.c:434
+#: ../plugins/itip-formatter/itip-view.c:435
+#: ../plugins/itip-formatter/itip-view.c:522
+#: ../plugins/itip-formatter/itip-view.c:523
msgid "An unknown person"
msgstr "An unknown person"
#. Describe what the user can do
-#: ../calendar/gui/e-itip-control.c:1143
+#: ../calendar/gui/e-itip-control.c:1138
msgid ""
"<br> Please review the following information, and then select an action from "
"the menu below."
@@ -7797,28 +7946,12 @@ msgstr ""
"<br> Please review the following information, and then select an action from "
"the menu below."
-#: ../calendar/gui/e-itip-control.c:1191
-#: ../calendar/gui/e-meeting-list-view.c:203
-#: ../calendar/gui/e-meeting-store.c:173 ../calendar/gui/e-meeting-store.c:196
-#: ../calendar/gui/itip-utils.c:664
-#: ../plugins/itip-formatter/itip-formatter.c:2034
-msgid "Accepted"
-msgstr "Accepted"
-
-#: ../calendar/gui/e-itip-control.c:1195 ../calendar/gui/itip-utils.c:667
-#: ../plugins/itip-formatter/itip-formatter.c:2037
+#: ../calendar/gui/e-itip-control.c:1190
+#: ../plugins/itip-formatter/itip-formatter.c:2195
msgid "Tentatively Accepted"
msgstr "Tentatively Accepted"
-#: ../calendar/gui/e-itip-control.c:1199
-#: ../calendar/gui/e-meeting-list-view.c:204
-#: ../calendar/gui/e-meeting-store.c:175 ../calendar/gui/e-meeting-store.c:198
-#: ../calendar/gui/itip-utils.c:670 ../calendar/gui/itip-utils.c:699
-#: ../plugins/itip-formatter/itip-formatter.c:2040
-msgid "Declined"
-msgstr "Declined"
-
-#: ../calendar/gui/e-itip-control.c:1283
+#: ../calendar/gui/e-itip-control.c:1278
msgid ""
"The meeting has been canceled, however it could not be found in your "
"calendars"
@@ -7826,262 +7959,268 @@ msgstr ""
"The meeting has been cancelled, however it could not be found in your "
"calendars"
-#: ../calendar/gui/e-itip-control.c:1285
+#: ../calendar/gui/e-itip-control.c:1280
msgid ""
"The task has been canceled, however it could not be found in your task lists"
msgstr ""
"The task has been cancelled, however it could not be found in your task lists"
-#: ../calendar/gui/e-itip-control.c:1363
+#: ../calendar/gui/e-itip-control.c:1358
#, c-format
msgid "<b>%s</b> has published meeting information."
msgstr "<b>%s</b> has published meeting information."
-#: ../calendar/gui/e-itip-control.c:1364
+#: ../calendar/gui/e-itip-control.c:1359
msgid "Meeting Information"
msgstr "Meeting Information"
-#: ../calendar/gui/e-itip-control.c:1370
+#: ../calendar/gui/e-itip-control.c:1365
#, c-format
msgid "<b>%s</b> requests the presence of %s at a meeting."
msgstr "<b>%s</b> requests the presence of %s at a meeting."
-#: ../calendar/gui/e-itip-control.c:1372
+#: ../calendar/gui/e-itip-control.c:1367
#, c-format
msgid "<b>%s</b> requests your presence at a meeting."
msgstr "<b>%s</b> requests your presence at a meeting."
-#: ../calendar/gui/e-itip-control.c:1373
+#: ../calendar/gui/e-itip-control.c:1368
msgid "Meeting Proposal"
msgstr "Meeting Proposal"
#. FIXME Whats going on here?
-#: ../calendar/gui/e-itip-control.c:1379
+#: ../calendar/gui/e-itip-control.c:1374
#, c-format
msgid "<b>%s</b> wishes to be added to an existing meeting."
msgstr "<b>%s</b> wishes to be added to an existing meeting."
-#: ../calendar/gui/e-itip-control.c:1380
+#: ../calendar/gui/e-itip-control.c:1375
msgid "Meeting Update"
msgstr "Meeting Update"
-#: ../calendar/gui/e-itip-control.c:1384
+#: ../calendar/gui/e-itip-control.c:1379
#, c-format
msgid "<b>%s</b> wishes to receive the latest meeting information."
msgstr "<b>%s</b> wishes to receive the latest meeting information."
-#: ../calendar/gui/e-itip-control.c:1385
+#: ../calendar/gui/e-itip-control.c:1380
msgid "Meeting Update Request"
msgstr "Meeting Update Request"
-#: ../calendar/gui/e-itip-control.c:1392
+#: ../calendar/gui/e-itip-control.c:1387
#, c-format
msgid "<b>%s</b> has replied to a meeting request."
msgstr "<b>%s</b> has replied to a meeting request."
-#: ../calendar/gui/e-itip-control.c:1393
+#: ../calendar/gui/e-itip-control.c:1388
msgid "Meeting Reply"
msgstr "Meeting Reply"
-#: ../calendar/gui/e-itip-control.c:1400
+#: ../calendar/gui/e-itip-control.c:1395
#, c-format
msgid "<b>%s</b> has canceled a meeting."
msgstr "<b>%s</b> has cancelled a meeting."
-#: ../calendar/gui/e-itip-control.c:1401
+#: ../calendar/gui/e-itip-control.c:1396
msgid "Meeting Cancelation"
msgstr "Meeting Cancellation"
-#: ../calendar/gui/e-itip-control.c:1411 ../calendar/gui/e-itip-control.c:1488
-#: ../calendar/gui/e-itip-control.c:1528
+#: ../calendar/gui/e-itip-control.c:1406 ../calendar/gui/e-itip-control.c:1483
+#: ../calendar/gui/e-itip-control.c:1523
#, c-format
msgid "<b>%s</b> has sent an unintelligible message."
msgstr "<b>%s</b> has sent an unintelligible message."
-#: ../calendar/gui/e-itip-control.c:1412
+#: ../calendar/gui/e-itip-control.c:1407
msgid "Bad Meeting Message"
msgstr "Bad Meeting Message"
-#: ../calendar/gui/e-itip-control.c:1439
+#: ../calendar/gui/e-itip-control.c:1434
#, c-format
msgid "<b>%s</b> has published task information."
msgstr "<b>%s</b> has published task information."
-#: ../calendar/gui/e-itip-control.c:1440
+#: ../calendar/gui/e-itip-control.c:1435
msgid "Task Information"
msgstr "Task Information"
-#: ../calendar/gui/e-itip-control.c:1447
+#: ../calendar/gui/e-itip-control.c:1442
#, c-format
msgid "<b>%s</b> requests %s to perform a task."
msgstr "<b>%s</b> requests %s to perform a task."
-#: ../calendar/gui/e-itip-control.c:1449
+#: ../calendar/gui/e-itip-control.c:1444
#, c-format
msgid "<b>%s</b> requests you perform a task."
msgstr "<b>%s</b> requests you perform a task."
-#: ../calendar/gui/e-itip-control.c:1450
+#: ../calendar/gui/e-itip-control.c:1445
msgid "Task Proposal"
msgstr "Task Proposal"
#. FIXME Whats going on here?
-#: ../calendar/gui/e-itip-control.c:1456
+#: ../calendar/gui/e-itip-control.c:1451
#, c-format
msgid "<b>%s</b> wishes to be added to an existing task."
msgstr "<b>%s</b> wishes to be added to an existing task."
-#: ../calendar/gui/e-itip-control.c:1457
+#: ../calendar/gui/e-itip-control.c:1452
msgid "Task Update"
msgstr "Task Update"
-#: ../calendar/gui/e-itip-control.c:1461
+#: ../calendar/gui/e-itip-control.c:1456
#, c-format
msgid "<b>%s</b> wishes to receive the latest task information."
msgstr "<b>%s</b> wishes to receive the latest task information."
-#: ../calendar/gui/e-itip-control.c:1462
+#: ../calendar/gui/e-itip-control.c:1457
msgid "Task Update Request"
msgstr "Task Update Request"
-#: ../calendar/gui/e-itip-control.c:1469
+#: ../calendar/gui/e-itip-control.c:1464
#, c-format
msgid "<b>%s</b> has replied to a task assignment."
msgstr "<b>%s</b> has replied to a task assignment."
-#: ../calendar/gui/e-itip-control.c:1470
+#: ../calendar/gui/e-itip-control.c:1465
msgid "Task Reply"
msgstr "Task Reply"
-#: ../calendar/gui/e-itip-control.c:1477
+#: ../calendar/gui/e-itip-control.c:1472
#, c-format
msgid "<b>%s</b> has canceled a task."
msgstr "<b>%s</b> has cancelled a task."
-#: ../calendar/gui/e-itip-control.c:1478
+#: ../calendar/gui/e-itip-control.c:1473
msgid "Task Cancelation"
msgstr "Task Cancellation"
-#: ../calendar/gui/e-itip-control.c:1489
+#: ../calendar/gui/e-itip-control.c:1484
msgid "Bad Task Message"
msgstr "Bad Task Message"
-#: ../calendar/gui/e-itip-control.c:1513
+#: ../calendar/gui/e-itip-control.c:1508
#, c-format
msgid "<b>%s</b> has published free/busy information."
msgstr "<b>%s</b> has published free/busy information."
-#: ../calendar/gui/e-itip-control.c:1514
+#: ../calendar/gui/e-itip-control.c:1509
msgid "Free/Busy Information"
msgstr "Free/Busy Information"
-#: ../calendar/gui/e-itip-control.c:1518
+#: ../calendar/gui/e-itip-control.c:1513
#, c-format
msgid "<b>%s</b> requests your free/busy information."
msgstr "<b>%s</b> requests your free/busy information."
-#: ../calendar/gui/e-itip-control.c:1519
+#: ../calendar/gui/e-itip-control.c:1514
msgid "Free/Busy Request"
msgstr "Free/Busy Request"
-#: ../calendar/gui/e-itip-control.c:1523
+#: ../calendar/gui/e-itip-control.c:1518
#, c-format
msgid "<b>%s</b> has replied to a free/busy request."
msgstr "<b>%s</b> has replied to a free/busy request."
-#: ../calendar/gui/e-itip-control.c:1524
+#: ../calendar/gui/e-itip-control.c:1519
msgid "Free/Busy Reply"
msgstr "Free/Busy Reply"
-#: ../calendar/gui/e-itip-control.c:1529
+#: ../calendar/gui/e-itip-control.c:1524
msgid "Bad Free/Busy Message"
msgstr "Bad Free/Busy Message"
-#: ../calendar/gui/e-itip-control.c:1605
+#: ../calendar/gui/e-itip-control.c:1600
msgid "The message does not appear to be properly formed"
msgstr "The message does not appear to be properly formed"
-#: ../calendar/gui/e-itip-control.c:1664
+#: ../calendar/gui/e-itip-control.c:1659
msgid "The message contains only unsupported requests."
msgstr "The message contains only unsupported requests."
-#: ../calendar/gui/e-itip-control.c:1697
+#: ../calendar/gui/e-itip-control.c:1692
msgid "The attachment does not contain a valid calendar message"
msgstr "The attachment does not contain a valid calendar message"
-#: ../calendar/gui/e-itip-control.c:1735
+#: ../calendar/gui/e-itip-control.c:1730
msgid "The attachment has no viewable calendar items"
msgstr "The attachment has no viewable calendar items"
-#: ../calendar/gui/e-itip-control.c:1980
+#: ../calendar/gui/e-itip-control.c:1975
msgid "Update complete\n"
msgstr "Update complete\n"
-#: ../calendar/gui/e-itip-control.c:2014
+#: ../calendar/gui/e-itip-control.c:2009
msgid "Object is invalid and cannot be updated\n"
msgstr "Object is invalid and cannot be updated\n"
-#: ../calendar/gui/e-itip-control.c:2031
+#: ../calendar/gui/e-itip-control.c:2026
msgid "This response is not from a current attendee. Add as an attendee?"
msgstr "This response is not from a current attendee. Add as an attendee?"
-#: ../calendar/gui/e-itip-control.c:2049
+#: ../calendar/gui/e-itip-control.c:2044
msgid "Attendee status could not be updated because of an invalid status!\n"
msgstr "Attendee status could not be updated because of an invalid status!\n"
-#: ../calendar/gui/e-itip-control.c:2073
+#: ../calendar/gui/e-itip-control.c:2068
msgid "Attendee status updated\n"
msgstr "Attendee status updated\n"
-#: ../calendar/gui/e-itip-control.c:2080
-#: ../plugins/itip-formatter/itip-formatter.c:1253
+#: ../calendar/gui/e-itip-control.c:2075
+#: ../plugins/itip-formatter/itip-formatter.c:1379
msgid "Attendee status can not be updated because the item no longer exists"
msgstr "Attendee status can not be updated because the item no longer exists"
-#: ../calendar/gui/e-itip-control.c:2111 ../calendar/gui/e-itip-control.c:2168
+#: ../calendar/gui/e-itip-control.c:2106 ../calendar/gui/e-itip-control.c:2163
msgid "Item sent!\n"
msgstr "Item sent!\n"
-#: ../calendar/gui/e-itip-control.c:2117 ../calendar/gui/e-itip-control.c:2176
+#: ../calendar/gui/e-itip-control.c:2112 ../calendar/gui/e-itip-control.c:2171
msgid "The item could not be sent!\n"
msgstr "The item could not be sent!\n"
-#: ../calendar/gui/e-itip-control.c:2256
+#: ../calendar/gui/e-itip-control.c:2251
msgid "Choose an action:"
msgstr "Choose an action:"
-#: ../calendar/gui/e-itip-control.c:2327
+#. To translators: RSVP means "please reply"
+#: ../calendar/gui/e-itip-control.c:2280
+#: ../calendar/gui/e-meeting-list-view.c:590
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:8
+msgid "RSVP"
+msgstr "RSVP"
+
+#: ../calendar/gui/e-itip-control.c:2322
msgid "Update"
msgstr "Update"
-#: ../calendar/gui/e-itip-control.c:2355
+#: ../calendar/gui/e-itip-control.c:2350
#: ../plugins/groupwise-features/process-meeting.c:51
msgid "Accept"
msgstr "Accept"
-#: ../calendar/gui/e-itip-control.c:2356
+#: ../calendar/gui/e-itip-control.c:2351
msgid "Tentatively accept"
msgstr "Tentatively accept"
-#: ../calendar/gui/e-itip-control.c:2357
+#: ../calendar/gui/e-itip-control.c:2352
#: ../plugins/groupwise-features/process-meeting.c:53
msgid "Decline"
msgstr "Decline"
-#: ../calendar/gui/e-itip-control.c:2386
+#: ../calendar/gui/e-itip-control.c:2381
msgid "Send Free/Busy Information"
msgstr "Send Free/Busy Information"
-#: ../calendar/gui/e-itip-control.c:2414
+#: ../calendar/gui/e-itip-control.c:2409
msgid "Update respondent status"
msgstr "Update respondent status"
-#: ../calendar/gui/e-itip-control.c:2442
+#: ../calendar/gui/e-itip-control.c:2437
msgid "Send Latest Information"
msgstr "Send Latest Information"
-#: ../calendar/gui/e-itip-control.c:2470 ../calendar/gui/itip-utils.c:687
-#: ../ui/evolution-mail-global.xml.h:1
+#: ../calendar/gui/e-itip-control.c:2465 ../ui/evolution-mail-global.xml.h:1
msgid "Cancel"
msgstr "Cancel"
@@ -8109,112 +8248,93 @@ msgstr "Loading calendar..."
msgid "Server Message:"
msgstr "Server Message:"
-#: ../calendar/gui/e-meeting-list-view.c:68
+#: ../calendar/gui/e-meeting-list-view.c:67
msgid "Chair Persons"
msgstr "Chair Persons"
-#: ../calendar/gui/e-meeting-list-view.c:69
+#: ../calendar/gui/e-meeting-list-view.c:68
msgid "Required Participants"
msgstr "Required Participants"
-#: ../calendar/gui/e-meeting-list-view.c:70
+#: ../calendar/gui/e-meeting-list-view.c:69
msgid "Optional Participants"
msgstr "Optional Participants"
-#: ../calendar/gui/e-meeting-list-view.c:71
+#: ../calendar/gui/e-meeting-list-view.c:70
msgid "Resources"
msgstr "Resources"
-#: ../calendar/gui/e-meeting-list-view.c:152
+#: ../calendar/gui/e-meeting-list-view.c:151
msgid "Attendees"
msgstr "Attendees"
-#: ../calendar/gui/e-meeting-list-view.c:163
-#: ../calendar/gui/e-meeting-store.c:86 ../calendar/gui/e-meeting-store.c:103
-#: ../calendar/gui/e-meeting-store.c:740 ../calendar/gui/print.c:981
+#: ../calendar/gui/e-meeting-list-view.c:162
+#: ../calendar/gui/e-meeting-store.c:85 ../calendar/gui/e-meeting-store.c:102
+#: ../calendar/gui/e-meeting-store.c:739 ../calendar/gui/print.c:980
msgid "Individual"
msgstr "Individual"
-#: ../calendar/gui/e-meeting-list-view.c:164
-#: ../calendar/gui/e-meeting-store.c:88 ../calendar/gui/e-meeting-store.c:105
-#: ../calendar/gui/print.c:982 ../widgets/table/e-table-config.glade.h:7
+#: ../calendar/gui/e-meeting-list-view.c:163
+#: ../calendar/gui/e-meeting-store.c:87 ../calendar/gui/e-meeting-store.c:104
+#: ../calendar/gui/print.c:981 ../widgets/table/e-table-config.glade.h:7
msgid "Group"
msgstr "Group"
-#: ../calendar/gui/e-meeting-list-view.c:165
-#: ../calendar/gui/e-meeting-store.c:90 ../calendar/gui/e-meeting-store.c:107
-#: ../calendar/gui/print.c:983
+#: ../calendar/gui/e-meeting-list-view.c:164
+#: ../calendar/gui/e-meeting-store.c:89 ../calendar/gui/e-meeting-store.c:106
+#: ../calendar/gui/print.c:982
msgid "Resource"
msgstr "Resource"
-#: ../calendar/gui/e-meeting-list-view.c:166
-#: ../calendar/gui/e-meeting-store.c:92 ../calendar/gui/e-meeting-store.c:109
-#: ../calendar/gui/print.c:984
+#: ../calendar/gui/e-meeting-list-view.c:165
+#: ../calendar/gui/e-meeting-store.c:91 ../calendar/gui/e-meeting-store.c:108
+#: ../calendar/gui/print.c:983
msgid "Room"
msgstr "Room"
-#: ../calendar/gui/e-meeting-list-view.c:177
-#: ../calendar/gui/e-meeting-store.c:121 ../calendar/gui/e-meeting-store.c:138
-#: ../calendar/gui/print.c:998
+#: ../calendar/gui/e-meeting-list-view.c:176
+#: ../calendar/gui/e-meeting-store.c:120 ../calendar/gui/e-meeting-store.c:137
+#: ../calendar/gui/print.c:997
msgid "Chair"
msgstr "Chair"
-#: ../calendar/gui/e-meeting-list-view.c:178
-#: ../calendar/gui/e-meeting-store.c:123 ../calendar/gui/e-meeting-store.c:140
-#: ../calendar/gui/e-meeting-store.c:743 ../calendar/gui/print.c:999
+#: ../calendar/gui/e-meeting-list-view.c:177
+#: ../calendar/gui/e-meeting-store.c:122 ../calendar/gui/e-meeting-store.c:139
+#: ../calendar/gui/e-meeting-store.c:742 ../calendar/gui/print.c:998
msgid "Required Participant"
msgstr "Required Participant"
-#: ../calendar/gui/e-meeting-list-view.c:179
-#: ../calendar/gui/e-meeting-store.c:125 ../calendar/gui/e-meeting-store.c:142
-#: ../calendar/gui/print.c:1000
+#: ../calendar/gui/e-meeting-list-view.c:178
+#: ../calendar/gui/e-meeting-store.c:124 ../calendar/gui/e-meeting-store.c:141
+#: ../calendar/gui/print.c:999
msgid "Optional Participant"
msgstr "Optional Participant"
-#: ../calendar/gui/e-meeting-list-view.c:180
-#: ../calendar/gui/e-meeting-store.c:127 ../calendar/gui/e-meeting-store.c:144
-#: ../calendar/gui/print.c:1001
+#: ../calendar/gui/e-meeting-list-view.c:179
+#: ../calendar/gui/e-meeting-store.c:126 ../calendar/gui/e-meeting-store.c:143
+#: ../calendar/gui/print.c:1000
msgid "Non-Participant"
msgstr "Non-Participant"
-#: ../calendar/gui/e-meeting-list-view.c:202
-#: ../calendar/gui/e-meeting-store.c:171 ../calendar/gui/e-meeting-store.c:194
-#: ../calendar/gui/e-meeting-store.c:753
+#: ../calendar/gui/e-meeting-list-view.c:201
+#: ../calendar/gui/e-meeting-store.c:170 ../calendar/gui/e-meeting-store.c:193
+#: ../calendar/gui/e-meeting-store.c:752
msgid "Needs Action"
msgstr "Needs Action"
-#: ../calendar/gui/e-meeting-list-view.c:205
-#: ../calendar/gui/e-meeting-store.c:177 ../calendar/gui/e-meeting-store.c:200
-#: ../calendar/gui/e-meeting-time-sel.c:397
-msgid "Tentative"
-msgstr "Tentative"
-
-#: ../calendar/gui/e-meeting-list-view.c:206
-#: ../calendar/gui/e-meeting-store.c:179 ../calendar/gui/e-meeting-store.c:202
-#: ../calendar/gui/itip-utils.c:673
-#: ../plugins/itip-formatter/itip-formatter.c:2043
-msgid "Delegated"
-msgstr "Delegated"
-
#. The extra space is just a hack to occupy more space for Attendee
-#: ../calendar/gui/e-meeting-list-view.c:491
+#: ../calendar/gui/e-meeting-list-view.c:546
msgid "Attendee "
msgstr "Attendee "
-#. To translators: RSVP means "please reply"
-#: ../calendar/gui/e-meeting-list-view.c:533
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:8
-msgid "RSVP"
-msgstr "RSVP"
-
-#: ../calendar/gui/e-meeting-store.c:183 ../calendar/gui/e-meeting-store.c:206
+#: ../calendar/gui/e-meeting-store.c:182 ../calendar/gui/e-meeting-store.c:205
msgid "In Process"
msgstr "In Process"
#. This is a strftime() format string %A = full weekday name,
#. %B = full month name, %d = month day, %Y = full year.
#: ../calendar/gui/e-meeting-time-sel-item.c:467
-#: ../calendar/gui/e-meeting-time-sel.c:2122
+#: ../calendar/gui/e-meeting-time-sel.c:2124
msgid "%A, %B %d, %Y"
msgstr "%A, %d %B, %Y"
@@ -8223,7 +8343,7 @@ msgstr "%A, %d %B, %Y"
#. This is a strftime() format string %a = abbreviated weekday name,
#. %m = month number, %d = month day, %Y = full year.
#: ../calendar/gui/e-meeting-time-sel-item.c:471
-#: ../calendar/gui/e-meeting-time-sel.c:2153
+#: ../calendar/gui/e-meeting-time-sel.c:2155
msgid "%a %m/%d/%Y"
msgstr "%a %d/%m/%Y"
@@ -8233,67 +8353,67 @@ msgstr "%a %d/%m/%Y"
msgid "%m/%d/%Y"
msgstr "%d/%m/%Y"
-#: ../calendar/gui/e-meeting-time-sel.c:399
+#: ../calendar/gui/e-meeting-time-sel.c:400
msgid "Out of Office"
msgstr "Out of Office"
-#: ../calendar/gui/e-meeting-time-sel.c:400
+#: ../calendar/gui/e-meeting-time-sel.c:401
msgid "No Information"
msgstr "No Information"
-#: ../calendar/gui/e-meeting-time-sel.c:415
+#: ../calendar/gui/e-meeting-time-sel.c:416
msgid "A_ttendees..."
msgstr "A_ttendees..."
-#: ../calendar/gui/e-meeting-time-sel.c:436
+#: ../calendar/gui/e-meeting-time-sel.c:437
msgid "O_ptions"
msgstr "O_ptions"
-#: ../calendar/gui/e-meeting-time-sel.c:453
+#: ../calendar/gui/e-meeting-time-sel.c:454
msgid "Show _only working hours"
msgstr "Show _only working hours"
-#: ../calendar/gui/e-meeting-time-sel.c:463
+#: ../calendar/gui/e-meeting-time-sel.c:464
msgid "Show _zoomed out"
msgstr "Show _zoomed out"
-#: ../calendar/gui/e-meeting-time-sel.c:478
+#: ../calendar/gui/e-meeting-time-sel.c:479
msgid "_Update free/busy"
msgstr "_Update free/busy"
-#: ../calendar/gui/e-meeting-time-sel.c:493
+#: ../calendar/gui/e-meeting-time-sel.c:494
msgid "_<<"
msgstr "_<<"
-#: ../calendar/gui/e-meeting-time-sel.c:511
+#: ../calendar/gui/e-meeting-time-sel.c:512
msgid "_Autopick"
msgstr "_Autopick"
-#: ../calendar/gui/e-meeting-time-sel.c:526
+#: ../calendar/gui/e-meeting-time-sel.c:527
msgid ">_>"
msgstr ">_>"
-#: ../calendar/gui/e-meeting-time-sel.c:543
+#: ../calendar/gui/e-meeting-time-sel.c:544
msgid "_All people and resources"
msgstr "_All people and resources"
-#: ../calendar/gui/e-meeting-time-sel.c:552
+#: ../calendar/gui/e-meeting-time-sel.c:553
msgid "All _people and one resource"
msgstr "All _people and one resource"
-#: ../calendar/gui/e-meeting-time-sel.c:561
+#: ../calendar/gui/e-meeting-time-sel.c:562
msgid "_Required people"
msgstr "_Required people"
-#: ../calendar/gui/e-meeting-time-sel.c:570
+#: ../calendar/gui/e-meeting-time-sel.c:571
msgid "Required people and _one resource"
msgstr "Required people and _one resource"
-#: ../calendar/gui/e-meeting-time-sel.c:606
+#: ../calendar/gui/e-meeting-time-sel.c:607
msgid "_Start time:"
msgstr "_Start time:"
-#: ../calendar/gui/e-meeting-time-sel.c:633
+#: ../calendar/gui/e-meeting-time-sel.c:634
msgid "_End time:"
msgstr "_End time:"
@@ -8321,16 +8441,15 @@ msgstr "Language"
msgid "Member"
msgstr "Member"
-#: ../calendar/gui/e-memo-table.c:942
+#: ../calendar/gui/e-memo-table.c:955
msgid "_Delete Selected Memos"
msgstr "_Delete Selected Memos"
-#: ../calendar/gui/e-memo-table.c:1093 ../calendar/gui/e-memo-table.etspec.h:2
+#: ../calendar/gui/e-memo-table.c:1106 ../calendar/gui/e-memo-table.etspec.h:2
msgid "Click to add a memo"
msgstr "Click to add a memo"
#: ../calendar/gui/e-memos.c:760 ../calendar/gui/e-tasks.c:910
-#: ../calendar/gui/gnome-cal.c:2961
#, c-format
msgid ""
"Error on %s:\n"
@@ -8339,16 +8458,16 @@ msgstr ""
"Error on %s:\n"
" %s"
-#: ../calendar/gui/e-memos.c:809
+#: ../calendar/gui/e-memos.c:812
msgid "Loading memos"
msgstr "Loading memos"
-#: ../calendar/gui/e-memos.c:890
+#: ../calendar/gui/e-memos.c:903
#, c-format
msgid "Opening memos at %s"
msgstr "Opening memos at %s"
-#: ../calendar/gui/e-memos.c:1062 ../calendar/gui/e-tasks.c:1321
+#: ../calendar/gui/e-memos.c:1075 ../calendar/gui/e-tasks.c:1329
msgid "Deleting selected objects..."
msgstr "Deleting selected objects..."
@@ -8356,63 +8475,63 @@ msgstr "Deleting selected objects..."
msgid "Loading tasks"
msgstr "Loading tasks"
-#: ../calendar/gui/e-tasks.c:1053
+#: ../calendar/gui/e-tasks.c:1061
#, c-format
msgid "Opening tasks at %s"
msgstr "Opening tasks at %s"
-#: ../calendar/gui/e-tasks.c:1298
+#: ../calendar/gui/e-tasks.c:1306
msgid "Completing tasks..."
msgstr "Completing tasks..."
-#: ../calendar/gui/e-tasks.c:1348
+#: ../calendar/gui/e-tasks.c:1356
msgid "Expunging"
msgstr "Expunging"
-#: ../calendar/gui/e-timezone-entry.c:129
+#: ../calendar/gui/e-timezone-entry.c:127
msgid "Select Timezone"
msgstr "Select Timezone"
#. strftime format %d = day of month, %B = full
#. month name. You can change the order but don't
#. change the specifiers or add anything.
-#: ../calendar/gui/e-week-view-main-item.c:343 ../calendar/gui/print.c:1653
+#: ../calendar/gui/e-week-view-main-item.c:343 ../calendar/gui/print.c:1659
msgid "%d %B"
msgstr "%d %B"
-#: ../calendar/gui/gnome-cal.c:2576
+#: ../calendar/gui/gnome-cal.c:2637
msgid "_Custom View"
msgstr "_Custom View"
-#: ../calendar/gui/gnome-cal.c:2577
+#: ../calendar/gui/gnome-cal.c:2638
msgid "_Save Custom View"
msgstr "_Save Custom View"
-#: ../calendar/gui/gnome-cal.c:2582
+#: ../calendar/gui/gnome-cal.c:2643
msgid "_Define Views..."
msgstr "_Define Views..."
-#: ../calendar/gui/gnome-cal.c:2791
+#: ../calendar/gui/gnome-cal.c:2880
#, c-format
msgid "Loading appointments at %s"
msgstr "Loading appointments at %s"
-#: ../calendar/gui/gnome-cal.c:2806
+#: ../calendar/gui/gnome-cal.c:2895
#, c-format
msgid "Loading tasks at %s"
msgstr "Loading tasks at %s"
-#: ../calendar/gui/gnome-cal.c:2815
+#: ../calendar/gui/gnome-cal.c:2904
#, c-format
msgid "Loading memos at %s"
msgstr "Loading memos at %s"
-#: ../calendar/gui/gnome-cal.c:2920
+#: ../calendar/gui/gnome-cal.c:3016
#, c-format
msgid "Opening %s"
msgstr "Opening %s"
-#: ../calendar/gui/gnome-cal.c:3874
+#: ../calendar/gui/gnome-cal.c:3984
msgid "Purging"
msgstr "Purging"
@@ -8472,142 +8591,197 @@ msgstr "September"
msgid "_Select Today"
msgstr "_Select Today"
-#: ../calendar/gui/itip-utils.c:404 ../calendar/gui/itip-utils.c:456
-#: ../calendar/gui/itip-utils.c:544
+#: ../calendar/gui/itip-utils.c:410 ../calendar/gui/itip-utils.c:462
+#: ../calendar/gui/itip-utils.c:550
msgid "An organizer must be set."
msgstr "An organiser must be set."
-#: ../calendar/gui/itip-utils.c:448
+#: ../calendar/gui/itip-utils.c:454
msgid "At least one attendee is necessary"
msgstr "At least one attendee is necessary"
-#: ../calendar/gui/itip-utils.c:626 ../calendar/gui/itip-utils.c:741
+#: ../calendar/gui/itip-utils.c:632 ../calendar/gui/itip-utils.c:778
msgid "Event information"
msgstr "Event information"
-#: ../calendar/gui/itip-utils.c:628 ../calendar/gui/itip-utils.c:744
+#: ../calendar/gui/itip-utils.c:634 ../calendar/gui/itip-utils.c:781
msgid "Task information"
msgstr "Task information"
-#: ../calendar/gui/itip-utils.c:630 ../calendar/gui/itip-utils.c:747
+#: ../calendar/gui/itip-utils.c:636 ../calendar/gui/itip-utils.c:784
msgid "Memo information"
msgstr "Memo information"
-#: ../calendar/gui/itip-utils.c:632 ../calendar/gui/itip-utils.c:765
+#: ../calendar/gui/itip-utils.c:638 ../calendar/gui/itip-utils.c:802
msgid "Free/Busy information"
msgstr "Free/Busy information"
-#: ../calendar/gui/itip-utils.c:634
+#: ../calendar/gui/itip-utils.c:640
msgid "Calendar information"
msgstr "Calendar information"
-#: ../calendar/gui/itip-utils.c:683
+#. Translators: This is part of the subject
+#. * line of a meeting request or update email.
+#. * The full subject line would be:
+#. * "Accepted: Meeting Name".
+#: ../calendar/gui/itip-utils.c:674
+msgctxt "Meeting"
+msgid "Accepted"
+msgstr "Accepted"
+
+#. Translators: This is part of the subject
+#. * line of a meeting request or update email.
+#. * The full subject line would be:
+#. * "Tentatively Accepted: Meeting Name".
+#: ../calendar/gui/itip-utils.c:681
+msgctxt "Meeting"
+msgid "Tentatively Accepted"
+msgstr "Tentatively Accepted"
+
+#. Translators: This is part of the subject
+#. * line of a meeting request or update email.
+#. * The full subject line would be:
+#. * "Declined: Meeting Name".
+#. Translators: This is part of the subject line of a
+#. * meeting request or update email. The full subject
+#. * line would be: "Declined: Meeting Name".
+#: ../calendar/gui/itip-utils.c:688 ../calendar/gui/itip-utils.c:736
+msgctxt "Meeting"
+msgid "Declined"
+msgstr "Declined"
+
+#. Translators: This is part of the subject
+#. * line of a meeting request or update email.
+#. * The full subject line would be:
+#. * "Delegated: Meeting Name".
+#: ../calendar/gui/itip-utils.c:695
+msgctxt "Meeting"
+msgid "Delegated"
+msgstr "Delegated"
+
+#. Translators: This is part of the subject line of a
+#. * meeting request or update email. The full subject
+#. * line would be: "Updated: Meeting Name".
+#: ../calendar/gui/itip-utils.c:708
+msgctxt "Meeting"
msgid "Updated"
msgstr "Updated"
-#: ../calendar/gui/itip-utils.c:691
+#. Translators: This is part of the subject line of a
+#. * meeting request or update email. The full subject
+#. * line would be: "Cancel: Meeting Name".
+#: ../calendar/gui/itip-utils.c:715
+msgctxt "Meeting"
+msgid "Cancel"
+msgstr "Cancel"
+
+#. Translators: This is part of the subject line of a
+#. * meeting request or update email. The full subject
+#. * line would be: "Refresh: Meeting Name".
+#: ../calendar/gui/itip-utils.c:722
+msgctxt "Meeting"
msgid "Refresh"
msgstr "Refresh"
-#: ../calendar/gui/itip-utils.c:695
+#. Translators: This is part of the subject line of a
+#. * meeting request or update email. The full subject
+#. * line would be: "Counter-proposal: Meeting Name".
+#: ../calendar/gui/itip-utils.c:729
+msgctxt "Meeting"
msgid "Counter-proposal"
msgstr "Counter-proposal"
-#: ../calendar/gui/itip-utils.c:762
+#: ../calendar/gui/itip-utils.c:799
#, c-format
msgid "Free/Busy information (%s to %s)"
msgstr "Free/Busy information (%s to %s)"
-#: ../calendar/gui/itip-utils.c:770
+#: ../calendar/gui/itip-utils.c:807
msgid "iCalendar information"
msgstr "iCalendar information"
-#: ../calendar/gui/itip-utils.c:941
+#: ../calendar/gui/itip-utils.c:978
msgid "You must be an attendee of the event."
msgstr "You must be an attendee of the event."
-#: ../calendar/gui/memos-component.c:464
+#: ../calendar/gui/memos-component.c:507
msgid "_New Memo List"
msgstr "_New Memo List"
-#: ../calendar/gui/memos-component.c:544
+#: ../calendar/gui/memos-component.c:590
#, c-format
msgid "%d memo"
msgid_plural "%d memos"
msgstr[0] "%d memo"
msgstr[1] "%d memos"
-#: ../calendar/gui/memos-component.c:546 ../calendar/gui/tasks-component.c:537
+#: ../calendar/gui/memos-component.c:592 ../calendar/gui/tasks-component.c:584
#, c-format
msgid ", %d selected"
msgid_plural ", %d selected"
msgstr[0] ", %d selected"
msgstr[1] ", %d selected"
-#: ../calendar/gui/memos-component.c:593
+#: ../calendar/gui/memos-component.c:639
msgid "Failed upgrading memos."
msgstr "Failed upgrading memos."
-#: ../calendar/gui/memos-component.c:953
+#: ../calendar/gui/memos-component.c:769
#, c-format
msgid "Unable to open the memo list '%s' for creating events and meetings"
msgstr "Unable to open the memo list '%s' for creating events and meetings"
-#: ../calendar/gui/memos-component.c:966
+#: ../calendar/gui/memos-component.c:782
msgid "There is no calendar available for creating memos"
msgstr "There is no calendar available for creating memos"
-#: ../calendar/gui/memos-component.c:1076
+#: ../calendar/gui/memos-component.c:892
msgid "Memo Source Selector"
msgstr "Memo Source Selector"
-#: ../calendar/gui/memos-component.c:1260
+#: ../calendar/gui/memos-component.c:1071
msgid "New memo"
msgstr "New memo"
-#: ../calendar/gui/memos-component.c:1261
+#: ../calendar/gui/memos-component.c:1072
msgctxt "New"
msgid "Mem_o"
msgstr "Mem_o"
-#: ../calendar/gui/memos-component.c:1262
+#: ../calendar/gui/memos-component.c:1073
msgid "Create a new memo"
msgstr "Create a new memo"
-#: ../calendar/gui/memos-component.c:1268
+#: ../calendar/gui/memos-component.c:1079
msgid "New shared memo"
msgstr "New shared memo"
-#: ../calendar/gui/memos-component.c:1269
+#: ../calendar/gui/memos-component.c:1080
msgctxt "New"
msgid "_Shared memo"
msgstr "_Shared memo"
-#: ../calendar/gui/memos-component.c:1270
+#: ../calendar/gui/memos-component.c:1081
msgid "Create a shared new memo"
msgstr "Create a shared new memo"
-#: ../calendar/gui/memos-component.c:1276
+#: ../calendar/gui/memos-component.c:1087
msgid "New memo list"
msgstr "New memo list"
-#: ../calendar/gui/memos-component.c:1277
+#: ../calendar/gui/memos-component.c:1088
msgctxt "New"
msgid "Memo li_st"
msgstr "Memo li_st"
-#: ../calendar/gui/memos-component.c:1278
+#: ../calendar/gui/memos-component.c:1089
msgid "Create a new memo list"
msgstr "Create a new memo list"
-#: ../calendar/gui/memos-control.c:354 ../calendar/gui/memos-control.c:370
+#: ../calendar/gui/memos-control.c:350 ../calendar/gui/memos-control.c:366
msgid "Print Memos"
msgstr "Print Memos"
-#: ../calendar/gui/memotypes.xml.h:25
-msgid "Next 7 Days"
-msgstr "Next 7 Days"
-
#: ../calendar/gui/migration.c:157
msgid ""
"The location and hierarchy of the Evolution task folders has changed since "
@@ -8657,273 +8831,273 @@ msgstr "Unable to migrate tasks `%s'"
msgid "Notes"
msgstr "Notes"
-#: ../calendar/gui/print.c:515
+#: ../calendar/gui/print.c:514
msgid "1st"
msgstr "1st"
-#: ../calendar/gui/print.c:515
+#: ../calendar/gui/print.c:514
msgid "2nd"
msgstr "2nd"
-#: ../calendar/gui/print.c:515
+#: ../calendar/gui/print.c:514
msgid "3rd"
msgstr "3rd"
-#: ../calendar/gui/print.c:515
+#: ../calendar/gui/print.c:514
msgid "4th"
msgstr "4th"
-#: ../calendar/gui/print.c:515
+#: ../calendar/gui/print.c:514
msgid "5th"
msgstr "5th"
-#: ../calendar/gui/print.c:516
+#: ../calendar/gui/print.c:515
msgid "6th"
msgstr "6th"
-#: ../calendar/gui/print.c:516
+#: ../calendar/gui/print.c:515
msgid "7th"
msgstr "7th"
-#: ../calendar/gui/print.c:516
+#: ../calendar/gui/print.c:515
msgid "8th"
msgstr "8th"
-#: ../calendar/gui/print.c:516
+#: ../calendar/gui/print.c:515
msgid "9th"
msgstr "9th"
-#: ../calendar/gui/print.c:516
+#: ../calendar/gui/print.c:515
msgid "10th"
msgstr "10th"
-#: ../calendar/gui/print.c:517
+#: ../calendar/gui/print.c:516
msgid "11th"
msgstr "11th"
-#: ../calendar/gui/print.c:517
+#: ../calendar/gui/print.c:516
msgid "12th"
msgstr "12th"
-#: ../calendar/gui/print.c:517
+#: ../calendar/gui/print.c:516
msgid "13th"
msgstr "13th"
-#: ../calendar/gui/print.c:517
+#: ../calendar/gui/print.c:516
msgid "14th"
msgstr "14th"
-#: ../calendar/gui/print.c:517
+#: ../calendar/gui/print.c:516
msgid "15th"
msgstr "15th"
-#: ../calendar/gui/print.c:518
+#: ../calendar/gui/print.c:517
msgid "16th"
msgstr "16th"
-#: ../calendar/gui/print.c:518
+#: ../calendar/gui/print.c:517
msgid "17th"
msgstr "17th"
-#: ../calendar/gui/print.c:518
+#: ../calendar/gui/print.c:517
msgid "18th"
msgstr "18th"
-#: ../calendar/gui/print.c:518
+#: ../calendar/gui/print.c:517
msgid "19th"
msgstr "19th"
-#: ../calendar/gui/print.c:518
+#: ../calendar/gui/print.c:517
msgid "20th"
msgstr "20th"
-#: ../calendar/gui/print.c:519
+#: ../calendar/gui/print.c:518
msgid "21st"
msgstr "21st"
-#: ../calendar/gui/print.c:519
+#: ../calendar/gui/print.c:518
msgid "22nd"
msgstr "22nd"
-#: ../calendar/gui/print.c:519
+#: ../calendar/gui/print.c:518
msgid "23rd"
msgstr "23rd"
-#: ../calendar/gui/print.c:519
+#: ../calendar/gui/print.c:518
msgid "24th"
msgstr "24th"
-#: ../calendar/gui/print.c:519
+#: ../calendar/gui/print.c:518
msgid "25th"
msgstr "25th"
-#: ../calendar/gui/print.c:520
+#: ../calendar/gui/print.c:519
msgid "26th"
msgstr "26th"
-#: ../calendar/gui/print.c:520
+#: ../calendar/gui/print.c:519
msgid "27th"
msgstr "27th"
-#: ../calendar/gui/print.c:520
+#: ../calendar/gui/print.c:519
msgid "28th"
msgstr "28th"
-#: ../calendar/gui/print.c:520
+#: ../calendar/gui/print.c:519
msgid "29th"
msgstr "29th"
-#: ../calendar/gui/print.c:520
+#: ../calendar/gui/print.c:519
msgid "30th"
msgstr "30th"
-#: ../calendar/gui/print.c:521
+#: ../calendar/gui/print.c:520
msgid "31st"
msgstr "31st"
#. Translators: These are workday abbreviations, e.g. Su=Sunday and Th=thursday
-#: ../calendar/gui/print.c:596
+#: ../calendar/gui/print.c:595
msgid "Su"
msgstr "Su"
-#: ../calendar/gui/print.c:596
+#: ../calendar/gui/print.c:595
msgid "Mo"
msgstr "Mo"
-#: ../calendar/gui/print.c:596
+#: ../calendar/gui/print.c:595
msgid "Tu"
msgstr "Tu"
-#: ../calendar/gui/print.c:596
+#: ../calendar/gui/print.c:595
msgid "We"
msgstr "We"
-#: ../calendar/gui/print.c:597
+#: ../calendar/gui/print.c:596
msgid "Th"
msgstr "Th"
-#: ../calendar/gui/print.c:597
+#: ../calendar/gui/print.c:596
msgid "Fr"
msgstr "Fr"
-#: ../calendar/gui/print.c:597
+#: ../calendar/gui/print.c:596
msgid "Sa"
msgstr "Sa"
-#: ../calendar/gui/print.c:2472
+#: ../calendar/gui/print.c:2481
msgid "Appointment"
msgstr "Appointment"
-#: ../calendar/gui/print.c:2474
+#: ../calendar/gui/print.c:2483
msgid "Task"
msgstr "Task"
-#: ../calendar/gui/print.c:2499
+#: ../calendar/gui/print.c:2508
#, c-format
msgid "Summary: %s"
msgstr "Summary: %s"
-#: ../calendar/gui/print.c:2522
+#: ../calendar/gui/print.c:2531
msgid "Attendees: "
msgstr "Attendees: "
-#: ../calendar/gui/print.c:2562
+#: ../calendar/gui/print.c:2571
#, c-format
msgid "Status: %s"
msgstr "Status: %s"
-#: ../calendar/gui/print.c:2579
+#: ../calendar/gui/print.c:2588
#, c-format
msgid "Priority: %s"
msgstr "Priority: %s"
-#: ../calendar/gui/print.c:2591
+#: ../calendar/gui/print.c:2600
#, c-format
msgid "Percent Complete: %i"
msgstr "Percent Complete: %i"
-#: ../calendar/gui/print.c:2603
+#: ../calendar/gui/print.c:2612
#, c-format
msgid "URL: %s"
msgstr "URL: %s"
-#: ../calendar/gui/print.c:2616
+#: ../calendar/gui/print.c:2625
#, c-format
msgid "Categories: %s"
msgstr "Categories: %s"
-#: ../calendar/gui/print.c:2627
+#: ../calendar/gui/print.c:2636
msgid "Contacts: "
msgstr "Contacts: "
-#: ../calendar/gui/tasks-component.c:455
+#: ../calendar/gui/tasks-component.c:499
msgid "_New Task List"
msgstr "_New Task List"
-#: ../calendar/gui/tasks-component.c:535
+#: ../calendar/gui/tasks-component.c:582
#, c-format
msgid "%d task"
msgid_plural "%d tasks"
msgstr[0] "%d task"
msgstr[1] "%d tasks"
-#: ../calendar/gui/tasks-component.c:584
+#: ../calendar/gui/tasks-component.c:631
msgid "Failed upgrading tasks."
msgstr "Failed upgrading tasks."
-#: ../calendar/gui/tasks-component.c:941
+#: ../calendar/gui/tasks-component.c:764
#, c-format
msgid "Unable to open the task list '%s' for creating events and meetings"
msgstr "Unable to open the task list '%s' for creating events and meetings"
-#: ../calendar/gui/tasks-component.c:954
+#: ../calendar/gui/tasks-component.c:777
msgid "There is no calendar available for creating tasks"
msgstr "There is no calendar available for creating tasks"
-#: ../calendar/gui/tasks-component.c:1065
+#: ../calendar/gui/tasks-component.c:888
msgid "Task Source Selector"
msgstr "Task Source Selector"
-#: ../calendar/gui/tasks-component.c:1325
+#: ../calendar/gui/tasks-component.c:1142
msgid "New task"
msgstr "New task"
-#: ../calendar/gui/tasks-component.c:1326
+#: ../calendar/gui/tasks-component.c:1143
msgctxt "New"
msgid "_Task"
msgstr "_Task"
-#: ../calendar/gui/tasks-component.c:1327
+#: ../calendar/gui/tasks-component.c:1144
msgid "Create a new task"
msgstr "Create a new task"
-#: ../calendar/gui/tasks-component.c:1333
+#: ../calendar/gui/tasks-component.c:1150
msgid "New assigned task"
msgstr "New assigned task"
-#: ../calendar/gui/tasks-component.c:1334
+#: ../calendar/gui/tasks-component.c:1151
msgctxt "New"
msgid "Assigne_d Task"
msgstr "Assigne_d Task"
-#: ../calendar/gui/tasks-component.c:1335
+#: ../calendar/gui/tasks-component.c:1152
msgid "Create a new assigned task"
msgstr "Create a new assigned task"
-#: ../calendar/gui/tasks-component.c:1341
+#: ../calendar/gui/tasks-component.c:1158
msgid "New task list"
msgstr "New task list"
-#: ../calendar/gui/tasks-component.c:1342
+#: ../calendar/gui/tasks-component.c:1159
msgctxt "New"
msgid "Tas_k list"
msgstr "Tas_k list"
-#: ../calendar/gui/tasks-component.c:1343
+#: ../calendar/gui/tasks-component.c:1160
msgid "Create a new task list"
msgstr "Create a new task list"
-#: ../calendar/gui/tasks-control.c:452
+#: ../calendar/gui/tasks-control.c:442
msgid ""
"This operation will permanently erase all tasks marked as completed. If you "
"continue, you will not be able to recover these tasks.\n"
@@ -8935,11 +9109,11 @@ msgstr ""
"\n"
"Really erase these tasks?"
-#: ../calendar/gui/tasks-control.c:455 ../mail/em-folder-view.c:1126
+#: ../calendar/gui/tasks-control.c:445 ../mail/em-folder-view.c:1128
msgid "Do not ask me again."
msgstr "Do not ask me again."
-#: ../calendar/gui/tasks-control.c:492 ../calendar/gui/tasks-control.c:508
+#: ../calendar/gui/tasks-control.c:482 ../calendar/gui/tasks-control.c:498
msgid "Print Tasks"
msgstr "Print Tasks"
@@ -8948,57 +9122,57 @@ msgstr "Print Tasks"
msgid "% Completed"
msgstr "% Completed"
-#: ../calendar/gui/tasktypes.xml.h:10
+#: ../calendar/gui/tasktypes.xml.h:7
msgid "Cancelled"
msgstr "Cancelled"
-#: ../calendar/gui/tasktypes.xml.h:26
+#: ../calendar/gui/tasktypes.xml.h:15
msgid "In progress"
msgstr "In progress"
-#: ../calendar/gui/tasktypes.xml.h:50 ../mail/em-filter-i18n.h:34
+#: ../calendar/gui/tasktypes.xml.h:28 ../mail/em-filter-i18n.h:34
msgid "is greater than"
msgstr "is greater than"
-#: ../calendar/gui/tasktypes.xml.h:51 ../mail/em-filter-i18n.h:35
+#: ../calendar/gui/tasktypes.xml.h:29 ../mail/em-filter-i18n.h:35
msgid "is less than"
msgstr "is less than"
-#: ../calendar/importers/icalendar-importer.c:73
+#: ../calendar/importers/icalendar-importer.c:75
msgid "Appointments and Meetings"
msgstr "Appointments and Meetings"
-#: ../calendar/importers/icalendar-importer.c:331
-#: ../calendar/importers/icalendar-importer.c:614
-#: ../plugins/itip-formatter/itip-formatter.c:1577
+#: ../calendar/importers/icalendar-importer.c:333
+#: ../calendar/importers/icalendar-importer.c:628
+#: ../plugins/itip-formatter/itip-formatter.c:1723
msgid "Opening calendar"
msgstr "Opening calendar"
-#: ../calendar/importers/icalendar-importer.c:438
+#: ../calendar/importers/icalendar-importer.c:440
msgid "iCalendar files (.ics)"
msgstr "iCalendar files (.ics)"
-#: ../calendar/importers/icalendar-importer.c:439
+#: ../calendar/importers/icalendar-importer.c:441
msgid "Evolution iCalendar importer"
msgstr "Evolution iCalendar importer"
-#: ../calendar/importers/icalendar-importer.c:515
+#: ../calendar/importers/icalendar-importer.c:529
msgid "Reminder!"
msgstr "Reminder!"
-#: ../calendar/importers/icalendar-importer.c:567
+#: ../calendar/importers/icalendar-importer.c:581
msgid "vCalendar files (.vcf)"
msgstr "vCalendar files (.vcf)"
-#: ../calendar/importers/icalendar-importer.c:568
+#: ../calendar/importers/icalendar-importer.c:582
msgid "Evolution vCalendar importer"
msgstr "Evolution vCalendar importer"
-#: ../calendar/importers/icalendar-importer.c:730
+#: ../calendar/importers/icalendar-importer.c:744
msgid "Calendar Events"
msgstr "Calendar Events"
-#: ../calendar/importers/icalendar-importer.c:767
+#: ../calendar/importers/icalendar-importer.c:781
msgid "Evolution Calendar intelligent importer"
msgstr "Evolution Calendar intelligent importer"
@@ -10551,213 +10725,217 @@ msgstr "Pacific/Wallis"
msgid "Pacific/Yap"
msgstr "Pacific/Yap"
-#: ../composer/e-composer-autosave.c:275
+#: ../composer/e-composer-autosave.c:273
msgid "Could not open autosave file"
msgstr "Could not open autosave file"
-#: ../composer/e-composer-autosave.c:282
+#: ../composer/e-composer-autosave.c:280
msgid "Unable to retrieve message from editor"
msgstr "Unable to retrieve message from editor"
-#: ../composer/e-composer-actions.c:47
+#: ../composer/e-composer-actions.c:45
msgid "Insert Attachment"
msgstr "Insert Attachment"
-#: ../composer/e-composer-actions.c:51
+#: ../composer/e-composer-actions.c:49
msgid "A_ttach"
msgstr "A_ttach"
-#: ../composer/e-composer-actions.c:142
+#: ../composer/e-composer-actions.c:140
msgid "Untitled Message"
msgstr "Untitled Message"
-#: ../composer/e-composer-actions.c:473
+#: ../composer/e-composer-actions.c:471
msgid "Attach a file"
msgstr "Attach a file"
-#: ../composer/e-composer-actions.c:478 ../mail/mail-signature-editor.c:194
+#: ../composer/e-composer-actions.c:476 ../mail/mail-signature-editor.c:194
#: ../ui/evolution-mail-messagedisplay.xml.h:4
msgid "_Close"
msgstr "_Close"
-#: ../composer/e-composer-actions.c:480
+#: ../composer/e-composer-actions.c:478
msgid "Close the current file"
msgstr "Close the current file"
-#: ../composer/e-composer-actions.c:485 ../mail/em-folder-view.c:1337
-#: ../ui/evolution-addressbook.xml.h:58 ../ui/evolution-calendar.xml.h:44
+#: ../composer/e-composer-actions.c:483 ../mail/em-folder-view.c:1339
+#: ../ui/evolution-addressbook.xml.h:58 ../ui/evolution-calendar.xml.h:47
#: ../ui/evolution-mail-message.xml.h:123 ../ui/evolution-memos.xml.h:20
#: ../ui/evolution-tasks.xml.h:29
msgid "_Print..."
msgstr "_Print..."
-#: ../composer/e-composer-actions.c:492 ../ui/evolution-addressbook.xml.h:27
+#: ../composer/e-composer-actions.c:490 ../ui/evolution-addressbook.xml.h:27
#: ../ui/evolution-calendar.xml.h:21 ../ui/evolution-mail-message.xml.h:76
#: ../ui/evolution-memos.xml.h:12 ../ui/evolution-tasks.xml.h:15
msgid "Print Pre_view"
msgstr "Print Pre_view"
-#: ../composer/e-composer-actions.c:501
+#: ../composer/e-composer-actions.c:499
msgid "Save the current file"
msgstr "Save the current file"
-#: ../composer/e-composer-actions.c:506
+#: ../composer/e-composer-actions.c:504
msgid "Save _As..."
msgstr "Save _As..."
-#: ../composer/e-composer-actions.c:508
+#: ../composer/e-composer-actions.c:506
msgid "Save the current file with a different name"
msgstr "Save the current file with a different name"
-#: ../composer/e-composer-actions.c:513
-msgid "Save _Draft"
-msgstr "Save _Draft"
+#: ../composer/e-composer-actions.c:511
+msgid "Save as _Draft"
+msgstr "Save as _Draft"
-#: ../composer/e-composer-actions.c:515
+#: ../composer/e-composer-actions.c:513
msgid "Save as draft"
msgstr "Save as draft"
-#: ../composer/e-composer-actions.c:520
+#: ../composer/e-composer-actions.c:518
msgid "S_end"
msgstr "S_end"
-#: ../composer/e-composer-actions.c:522
+#: ../composer/e-composer-actions.c:520
msgid "Send this message"
msgstr "Send this message"
-#: ../composer/e-composer-actions.c:529
+#: ../composer/e-composer-actions.c:527
msgid "Insert Send options"
msgstr "Insert Send options"
-#: ../composer/e-composer-actions.c:534
+#: ../composer/e-composer-actions.c:532
msgid "New _Message"
msgstr "New _Message"
-#: ../composer/e-composer-actions.c:536
+#: ../composer/e-composer-actions.c:534
msgid "Open New Message window"
msgstr "Open New Message window"
-#: ../composer/e-composer-actions.c:543
+#: ../composer/e-composer-actions.c:541
msgid "Character _Encoding"
msgstr "Character _Encoding"
-#: ../composer/e-composer-actions.c:550
+#: ../composer/e-composer-actions.c:548
msgid "_Security"
msgstr "_Security"
-#: ../composer/e-composer-actions.c:560
+#: ../composer/e-composer-actions.c:558
msgid "PGP _Encrypt"
msgstr "PGP _Encrypt"
-#: ../composer/e-composer-actions.c:562
+#: ../composer/e-composer-actions.c:560
msgid "Encrypt this message with PGP"
msgstr "Encrypt this message with PGP"
-#: ../composer/e-composer-actions.c:568
+#: ../composer/e-composer-actions.c:566
msgid "PGP _Sign"
msgstr "PGP _Sign"
-#: ../composer/e-composer-actions.c:570
+#: ../composer/e-composer-actions.c:568
msgid "Sign this message with your PGP key"
msgstr "Sign this message with your PGP key"
-#: ../composer/e-composer-actions.c:576
+#: ../composer/e-composer-actions.c:574
msgid "_Prioritize Message"
msgstr "_Prioritise Message"
-#: ../composer/e-composer-actions.c:578
+#: ../composer/e-composer-actions.c:576
msgid "Set the message priority to high"
msgstr "Set the message priority to high"
-#: ../composer/e-composer-actions.c:584
+#: ../composer/e-composer-actions.c:582
msgid "Re_quest Read Receipt"
msgstr "Re_quest Read Receipt"
-#: ../composer/e-composer-actions.c:586
+#: ../composer/e-composer-actions.c:584
msgid "Get delivery notification when your message is read"
msgstr "Get delivery notification when your message is read"
-#: ../composer/e-composer-actions.c:592
+#: ../composer/e-composer-actions.c:590
msgid "S/MIME En_crypt"
msgstr "S/MIME En_crypt"
-#: ../composer/e-composer-actions.c:594
+#: ../composer/e-composer-actions.c:592
msgid "Encrypt this message with your S/MIME Encryption Certificate"
msgstr "Encrypt this message with your S/MIME Encryption Certificate"
-#: ../composer/e-composer-actions.c:600
+#: ../composer/e-composer-actions.c:598
msgid "S/MIME Sig_n"
msgstr "S/MIME Sig_n"
-#: ../composer/e-composer-actions.c:602
+#: ../composer/e-composer-actions.c:600
msgid "Sign this message with your S/MIME Signature Certificate"
msgstr "Sign this message with your S/MIME Signature Certificate"
-#: ../composer/e-composer-actions.c:608
+#: ../composer/e-composer-actions.c:606
msgid "_Bcc Field"
msgstr "_Bcc Field"
-#: ../composer/e-composer-actions.c:610
+#: ../composer/e-composer-actions.c:608
msgid "Toggles whether the BCC field is displayed"
msgstr "Toggles whether the BCC field is displayed"
-#: ../composer/e-composer-actions.c:616
+#: ../composer/e-composer-actions.c:614
msgid "_Cc Field"
msgstr "_Cc Field"
-#: ../composer/e-composer-actions.c:618
+#: ../composer/e-composer-actions.c:616
msgid "Toggles whether the CC field is displayed"
msgstr "Toggles whether the CC field is displayed"
-#: ../composer/e-composer-actions.c:624
+#: ../composer/e-composer-actions.c:622
msgid "_From Field"
msgstr "_From Field"
-#: ../composer/e-composer-actions.c:626
+#: ../composer/e-composer-actions.c:624
msgid "Toggles whether the From chooser is displayed"
msgstr "Toggles whether the From chooser is displayed"
-#: ../composer/e-composer-actions.c:632
+#: ../composer/e-composer-actions.c:630
msgid "_Post-To Field"
msgstr "_Post-To Field"
-#: ../composer/e-composer-actions.c:634
+#: ../composer/e-composer-actions.c:632
msgid "Toggles whether the Post-To field is displayed"
msgstr "Toggles whether the Post-To field is displayed"
-#: ../composer/e-composer-actions.c:640
+#: ../composer/e-composer-actions.c:638
msgid "_Reply-To Field"
msgstr "_Reply-To Field"
-#: ../composer/e-composer-actions.c:642
+#: ../composer/e-composer-actions.c:640
msgid "Toggles whether the Reply-To field is displayed"
msgstr "Toggles whether the Reply-To field is displayed"
-#: ../composer/e-composer-actions.c:648
+#: ../composer/e-composer-actions.c:646
msgid "_Subject Field"
msgstr "_Subject Field"
-#: ../composer/e-composer-actions.c:650
+#: ../composer/e-composer-actions.c:648
msgid "Toggles whether the Subject field is displayed"
msgstr "Toggles whether the Subject field is displayed"
-#: ../composer/e-composer-actions.c:656
+#: ../composer/e-composer-actions.c:654
msgid "_To Field"
msgstr "_To Field"
-#: ../composer/e-composer-actions.c:658
+#: ../composer/e-composer-actions.c:656
msgid "Toggles whether the To field is displayed"
msgstr "Toggles whether the To field is displayed"
-#: ../composer/e-composer-header-table.c:66
+#: ../composer/e-composer-actions.c:699
+msgid "Save Draft"
+msgstr "Save Draft"
+
+#: ../composer/e-composer-header-table.c:64
msgid "Enter the recipients of the message"
msgstr "Enter the recipients of the message"
-#: ../composer/e-composer-header-table.c:68
+#: ../composer/e-composer-header-table.c:66
msgid "Enter the addresses that will receive a carbon copy of the message"
msgstr "Enter the addresses that will receive a carbon copy of the message"
-#: ../composer/e-composer-header-table.c:71
+#: ../composer/e-composer-header-table.c:69
msgid ""
"Enter the addresses that will receive a carbon copy of the message without "
"appearing in the recipient list of the message"
@@ -10765,35 +10943,35 @@ msgstr ""
"Enter the addresses that will receive a carbon copy of the message without "
"appearing in the recipient list of the message"
-#: ../composer/e-composer-header-table.c:645
+#: ../composer/e-composer-header-table.c:643
msgid "Fr_om:"
msgstr "Fr_om:"
-#: ../composer/e-composer-header-table.c:654
+#: ../composer/e-composer-header-table.c:652
msgid "_Reply-To:"
msgstr "_Reply-To:"
-#: ../composer/e-composer-header-table.c:658
+#: ../composer/e-composer-header-table.c:656
msgid "_To:"
msgstr "_To:"
-#: ../composer/e-composer-header-table.c:663
+#: ../composer/e-composer-header-table.c:661
msgid "_Cc:"
msgstr "_Cc:"
-#: ../composer/e-composer-header-table.c:668
+#: ../composer/e-composer-header-table.c:666
msgid "_Bcc:"
msgstr "_Bcc:"
-#: ../composer/e-composer-header-table.c:673
+#: ../composer/e-composer-header-table.c:671
msgid "_Post To:"
msgstr "_Post To:"
-#: ../composer/e-composer-header-table.c:677
+#: ../composer/e-composer-header-table.c:675
msgid "S_ubject:"
msgstr "S_ubject:"
-#: ../composer/e-composer-header-table.c:686
+#: ../composer/e-composer-header-table.c:684
msgid "Si_gnature:"
msgstr "Si_gnature:"
@@ -10813,17 +10991,17 @@ msgstr "Choose folders to post the message to."
msgid "Click here to select folders to post to"
msgstr "Click here to select folders to post to"
-#: ../composer/e-composer-private.c:180 ../composer/e-msg-composer.c:1558
+#: ../composer/e-composer-private.c:179 ../composer/e-msg-composer.c:1557
msgid "Show _Attachment Bar"
msgstr "Show _Attachment Bar"
-#: ../composer/e-msg-composer.c:872
+#: ../composer/e-msg-composer.c:866
msgid ""
"Cannot sign outgoing message: No signing certificate set for this account"
msgstr ""
"Cannot sign outgoing message: No signing certificate set for this account"
-#: ../composer/e-msg-composer.c:879
+#: ../composer/e-msg-composer.c:873
msgid ""
"Cannot encrypt outgoing message: No encryption certificate set for this "
"account"
@@ -10831,23 +11009,23 @@ msgstr ""
"Cannot encrypt outgoing message: No encryption certificate set for this "
"account"
-#: ../composer/e-msg-composer.c:1500 ../mail/em-format-html-display.c:1913
-#: ../mail/em-format-html-display.c:2405 ../mail/mail-config.glade.h:45
+#: ../composer/e-msg-composer.c:1499 ../mail/em-format-html-display.c:1952
+#: ../mail/em-format-html-display.c:2600 ../mail/mail-config.glade.h:45
#: ../mail/message-list.etspec.h:1
msgid "Attachment"
msgid_plural "Attachments"
msgstr[0] "Attachment"
msgstr[1] "Attachments"
-#: ../composer/e-msg-composer.c:1556
+#: ../composer/e-msg-composer.c:1555
msgid "Hide _Attachment Bar"
msgstr "Hide _Attachment Bar"
-#: ../composer/e-msg-composer.c:1573 ../composer/e-msg-composer.c:2780
+#: ../composer/e-msg-composer.c:1572 ../composer/e-msg-composer.c:2797
msgid "Compose Message"
msgstr "Compose Message"
-#: ../composer/e-msg-composer.c:4055
+#: ../composer/e-msg-composer.c:4098
msgid ""
"<b>(The composer contains a non-text message body, which cannot be edited.)</"
"b>"
@@ -10940,10 +11118,10 @@ msgstr ""
#: ../composer/mail-composer.error.xml.h:17
msgid ""
-"Send options available only for Novell Groupwise and Microsoft Exchange "
+"Send options available only for Novell GroupWise and Microsoft Exchange "
"accounts."
msgstr ""
-"Send options available only for Novell Groupwise and Microsoft Exchange "
+"Send options available only for Novell GroupWise and Microsoft Exchange "
"accounts."
#: ../composer/mail-composer.error.xml.h:18
@@ -11014,7 +11192,7 @@ msgstr "_Save Draft"
msgid "Evolution Mail and Calendar"
msgstr "Evolution Mail and Calendar"
-#: ../data/evolution.desktop.in.in.h:2 ../shell/e-shell-window-commands.c:738
+#: ../data/evolution.desktop.in.in.h:2 ../shell/e-shell-window-commands.c:951
msgid "Groupware Suite"
msgstr "Groupware Suite"
@@ -11030,40 +11208,97 @@ msgstr "address card"
msgid "calendar information"
msgstr "calendar information"
-#: ../e-util/e-error.c:77 ../e-util/e-error.c:78 ../e-util/e-error.c:120
+#: ../e-util/e-error.c:78 ../e-util/e-error.c:79 ../e-util/e-error.c:121
msgid "Evolution Error"
msgstr "Evolution Error"
-#: ../e-util/e-error.c:79 ../e-util/e-error.c:80 ../e-util/e-error.c:118
+#: ../e-util/e-error.c:80 ../e-util/e-error.c:81 ../e-util/e-error.c:119
msgid "Evolution Warning"
msgstr "Evolution Warning"
-#: ../e-util/e-error.c:117
+#: ../e-util/e-error.c:118
msgid "Evolution Information"
msgstr "Evolution Information"
-#: ../e-util/e-error.c:119
+#: ../e-util/e-error.c:120
msgid "Evolution Query"
msgstr "Evolution Query"
#. setup a dummy error
-#: ../e-util/e-error.c:449
+#: ../e-util/e-error.c:444
#, c-format
msgid "Internal error, unknown error '%s' requested"
msgstr "Internal error, unknown error '%s' requested"
-#: ../e-util/e-logger.c:156
+#: ../e-util/e-logger.c:161
msgid "Component"
msgstr "Component"
-#: ../e-util/e-logger.c:157
+#: ../e-util/e-logger.c:162
msgid "Name of the component being logged"
msgstr "Name of the component being logged"
-#: ../e-util/e-plugin.c:308 ../filter/rule-editor.c:776
-#: ../mail/em-account-prefs.c:482 ../mail/em-composer-prefs.c:988
+#: ../e-util/e-non-intrusive-error-dialog.c:190
+msgid "Debug Logs"
+msgstr "Debug Logs"
+
+#: ../e-util/e-non-intrusive-error-dialog.c:204
+msgid "Show _errors in the status bar for"
+msgstr "Show _errors in the status bar for"
+
+#. Translators: This is the second part of the sentence
+#. * "Show _errors in the status bar for" - XXX - "second(s)."
+#: ../e-util/e-non-intrusive-error-dialog.c:222
+msgid "second(s)."
+msgstr "second(s)."
+
+#: ../e-util/e-non-intrusive-error-dialog.c:228
+msgid "Log Messages:"
+msgstr "Log Messages:"
+
+#: ../e-util/e-non-intrusive-error-dialog.c:273
+msgid "Log Level"
+msgstr "Log Level"
+
+#: ../e-util/e-non-intrusive-error-dialog.c:281
+#: ../widgets/misc/e-dateedit.c:389
+msgid "Time"
+msgstr "Time"
+
+#: ../e-util/e-non-intrusive-error-dialog.c:291 ../mail/message-list.c:2523
+#: ../mail/message-list.etspec.h:10
+msgid "Messages"
+msgstr "Messages"
+
+#: ../e-util/e-non-intrusive-error-dialog.c:300
+#: ../ui/evolution-mail-messagedisplay.xml.h:2 ../ui/evolution.xml.h:4
+msgid "Close this window"
+msgstr "Close this window"
+
+#: ../e-util/e-non-intrusive-error-dialog.h:40
+msgid "Error"
+msgstr "Error"
+
+#: ../e-util/e-non-intrusive-error-dialog.h:40
+msgid "Errors"
+msgstr "Errors"
+
+#: ../e-util/e-non-intrusive-error-dialog.h:41
+msgid "Warnings and Errors"
+msgstr "Warnings and Errors"
+
+#: ../e-util/e-non-intrusive-error-dialog.h:42
+msgid "Debug"
+msgstr "Debug"
+
+#: ../e-util/e-non-intrusive-error-dialog.h:42
+msgid "Error, Warnings and Debug messages"
+msgstr "Error, Warnings and Debug messages"
+
+#: ../e-util/e-plugin.c:308 ../filter/rule-editor.c:799
+#: ../mail/em-account-prefs.c:482 ../mail/em-composer-prefs.c:966
#: ../plugins/plugin-manager/plugin-manager.c:355
-#: ../plugins/publish-calendar/publish-calendar.c:689
+#: ../plugins/publish-calendar/publish-calendar.c:690
msgid "Enabled"
msgstr "Enabled"
@@ -11113,51 +11348,55 @@ msgstr "Overwrite file?"
msgid "_Overwrite"
msgstr "_Overwrite"
-#: ../e-util/e-util.c:97
+#: ../e-util/e-util.c:127
+msgid "Could not open the link."
+msgstr "Could not open the link."
+
+#: ../e-util/e-util.c:174
msgid "Could not display help for Evolution."
msgstr "Could not display help for Evolution."
-#: ../e-util/e-util-labels.c:37
+#: ../e-util/e-util-labels.c:39
msgid "I_mportant"
msgstr "I_mportant"
#. red
-#: ../e-util/e-util-labels.c:38
+#: ../e-util/e-util-labels.c:40
msgid "_Work"
msgstr "_Work"
#. orange
-#: ../e-util/e-util-labels.c:39
+#: ../e-util/e-util-labels.c:41
msgid "_Personal"
msgstr "_Personal"
#. green
-#: ../e-util/e-util-labels.c:40
+#: ../e-util/e-util-labels.c:42
msgid "_To Do"
msgstr "_To Do"
#. blue
-#: ../e-util/e-util-labels.c:41
+#: ../e-util/e-util-labels.c:43
msgid "_Later"
msgstr "_Later"
-#: ../e-util/e-util-labels.c:309
+#: ../e-util/e-util-labels.c:315
msgid "Label _Name:"
msgstr "Label _Name:"
-#: ../e-util/e-util-labels.c:332
+#: ../e-util/e-util-labels.c:338
msgid "Edit Label"
msgstr "Edit Label"
-#: ../e-util/e-util-labels.c:332
+#: ../e-util/e-util-labels.c:338
msgid "Add Label"
msgstr "Add Label"
-#: ../e-util/e-util-labels.c:351
+#: ../e-util/e-util-labels.c:357
msgid "Label name cannot be empty."
msgstr "Label name cannot be empty."
-#: ../e-util/e-util-labels.c:356
+#: ../e-util/e-util-labels.c:362
msgid ""
"A label having the same tag already exists on the server. Please rename your "
"label."
@@ -11165,128 +11404,128 @@ msgstr ""
"A label having the same tag already exists on the server. Please rename your "
"label."
-#: ../e-util/gconf-bridge.c:1218
+#: ../e-util/gconf-bridge.c:1221
#, c-format
msgid "GConf error: %s"
msgstr "GConf error: %s"
-#: ../e-util/gconf-bridge.c:1228
+#: ../e-util/gconf-bridge.c:1231
msgid "All further errors shown only on terminal."
msgstr "All further errors shown only on terminal."
-#: ../filter/filter-datespec.c:80
+#: ../filter/filter-datespec.c:81
#, c-format
msgid "1 second ago"
msgid_plural "%d seconds ago"
msgstr[0] "1 second ago"
msgstr[1] "%d seconds ago"
-#: ../filter/filter-datespec.c:80
+#: ../filter/filter-datespec.c:81
#, c-format
msgid "1 second in the future"
msgid_plural "%d seconds in the future"
msgstr[0] "1 second in the future"
msgstr[1] "%d seconds in the future"
-#: ../filter/filter-datespec.c:81
+#: ../filter/filter-datespec.c:82
#, c-format
msgid "1 minute ago"
msgid_plural "%d minutes ago"
msgstr[0] "1 minute ago"
msgstr[1] "%d minutes ago"
-#: ../filter/filter-datespec.c:81
+#: ../filter/filter-datespec.c:82
#, c-format
msgid "1 minute in the future"
msgid_plural "%d minutes in the future"
msgstr[0] "1 minute in the future"
msgstr[1] "%d minutes in the future"
-#: ../filter/filter-datespec.c:82
+#: ../filter/filter-datespec.c:83
#, c-format
msgid "1 hour ago"
msgid_plural "%d hours ago"
msgstr[0] "1 hour ago"
msgstr[1] "%d hours ago"
-#: ../filter/filter-datespec.c:82
+#: ../filter/filter-datespec.c:83
#, c-format
msgid "1 hour in the future"
msgid_plural "%d hours in the future"
msgstr[0] "1 hour in the future"
msgstr[1] "%d hours in the future"
-#: ../filter/filter-datespec.c:83
+#: ../filter/filter-datespec.c:84
#, c-format
msgid "1 day ago"
msgid_plural "%d days ago"
msgstr[0] "1 day ago"
msgstr[1] "%d days ago"
-#: ../filter/filter-datespec.c:83
+#: ../filter/filter-datespec.c:84
#, c-format
msgid "1 day in the future"
msgid_plural "%d days in the future"
msgstr[0] "1 day in the future"
msgstr[1] "%d days in the future"
-#: ../filter/filter-datespec.c:84
+#: ../filter/filter-datespec.c:85
#, c-format
msgid "1 week ago"
msgid_plural "%d weeks ago"
msgstr[0] "1 week ago"
msgstr[1] "%d weeks ago"
-#: ../filter/filter-datespec.c:84
+#: ../filter/filter-datespec.c:85
#, c-format
msgid "1 week in the future"
msgid_plural "%d weeks in the future"
msgstr[0] "1 week in the future"
msgstr[1] "%d weeks in the future"
-#: ../filter/filter-datespec.c:85
+#: ../filter/filter-datespec.c:86
#, c-format
msgid "1 month ago"
msgid_plural "%d months ago"
msgstr[0] "1 month ago"
msgstr[1] "%d months ago"
-#: ../filter/filter-datespec.c:85
+#: ../filter/filter-datespec.c:86
#, c-format
msgid "1 month in the future"
msgid_plural "%d months in the future"
msgstr[0] "1 month in the future"
msgstr[1] "%d months in the future"
-#: ../filter/filter-datespec.c:86
+#: ../filter/filter-datespec.c:87
#, c-format
msgid "1 year ago"
msgid_plural "%d years ago"
msgstr[0] "1 year ago"
msgstr[1] "%d years ago"
-#: ../filter/filter-datespec.c:86
+#: ../filter/filter-datespec.c:87
#, c-format
msgid "1 year in the future"
msgid_plural "%d years in the future"
msgstr[0] "1 year in the future"
msgstr[1] "%d years in the future"
-#: ../filter/filter-datespec.c:287
+#: ../filter/filter-datespec.c:288
msgid "<click here to select a date>"
msgstr "<click here to select a date>"
-#: ../filter/filter-datespec.c:290 ../filter/filter-datespec.c:301
-#: ../filter/filter-datespec.c:312
+#: ../filter/filter-datespec.c:291 ../filter/filter-datespec.c:302
+#: ../filter/filter-datespec.c:313
msgid "now"
msgstr "now"
#. strftime for date filter display, only needs to show a day date (i.e. no time)
-#: ../filter/filter-datespec.c:297
+#: ../filter/filter-datespec.c:298
msgid "%d-%b-%Y"
msgstr "%d-%b-%Y"
-#: ../filter/filter-datespec.c:451
+#: ../filter/filter-datespec.c:452
msgid "Select a time to compare against"
msgstr "Select a time to compare against"
@@ -11299,56 +11538,56 @@ msgstr "Choose a file"
msgid "Test"
msgstr "Test"
-#: ../filter/filter-rule.c:852
+#: ../filter/filter-rule.c:853
msgid "R_ule name:"
msgstr "R_ule name:"
-#: ../filter/filter-rule.c:880
-msgid "Find items that meet the following criteria"
-msgstr "Find items that meet the following criteria"
+#: ../filter/filter-rule.c:881
+msgid "Find items that meet the following conditions"
+msgstr "Find items that meet the following conditions"
-#: ../filter/filter-rule.c:914
-msgid "A_dd Filter Criteria"
-msgstr "A_dd Filter Criteria"
+#: ../filter/filter-rule.c:915
+msgid "A_dd Condition"
+msgstr "A_dd Condition"
-#: ../filter/filter-rule.c:920
-msgid "If all criteria are met"
-msgstr "If all criteria are met"
+#: ../filter/filter-rule.c:921
+msgid "If all conditions are met"
+msgstr "If all conditions are met"
-#: ../filter/filter-rule.c:920
-msgid "If any criteria are met"
-msgstr "If any criteria are met"
+#: ../filter/filter-rule.c:921
+msgid "If any conditions are met"
+msgstr "If any conditions are met"
-#: ../filter/filter-rule.c:922
+#: ../filter/filter-rule.c:923
msgid "_Find items:"
msgstr "_Find items:"
-#: ../filter/filter-rule.c:944
+#: ../filter/filter-rule.c:945
msgid "All related"
msgstr "All related"
-#: ../filter/filter-rule.c:944
+#: ../filter/filter-rule.c:945
msgid "Replies"
msgstr "Replies"
-#: ../filter/filter-rule.c:944
+#: ../filter/filter-rule.c:945
msgid "Replies and parents"
msgstr "Replies and parents"
-#: ../filter/filter-rule.c:944
+#: ../filter/filter-rule.c:945
msgid "No reply or parent"
msgstr "No reply or parent"
-#: ../filter/filter-rule.c:946
+#: ../filter/filter-rule.c:947
msgid "I_nclude threads"
msgstr "I_nclude threads"
-#: ../filter/filter-rule.c:1044 ../filter/filter.glade.h:3
-#: ../mail/em-utils.c:308
+#: ../filter/filter-rule.c:1045 ../filter/filter.glade.h:3
+#: ../mail/em-utils.c:310
msgid "Incoming"
msgstr "Incoming"
-#: ../filter/filter-rule.c:1044 ../mail/em-utils.c:309
+#: ../filter/filter-rule.c:1045 ../mail/em-utils.c:311
msgid "Outgoing"
msgstr "Outgoing"
@@ -11448,7 +11687,7 @@ msgstr "in the future"
msgid "months"
msgstr "months"
-#: ../filter/filter.glade.h:19 ../mail/mail-config.glade.h:195
+#: ../filter/filter.glade.h:19 ../mail/mail-config.glade.h:198
msgid "seconds"
msgstr "seconds"
@@ -11460,10 +11699,11 @@ msgstr "the current time"
msgid "the time you specify"
msgstr "the time you specify"
-#: ../filter/filter.glade.h:22 ../plugins/calendar-http/calendar-http.c:282
-#: ../plugins/calendar-weather/calendar-weather.c:564
-#: ../plugins/google-account-setup/google-source.c:665
-#: ../plugins/google-account-setup/google-contacts-source.c:331
+#: ../filter/filter.glade.h:22 ../plugins/caldav/caldav-source.c:433
+#: ../plugins/calendar-http/calendar-http.c:282
+#: ../plugins/calendar-weather/calendar-weather.c:527
+#: ../plugins/google-account-setup/google-source.c:655
+#: ../plugins/google-account-setup/google-contacts-source.c:369
msgid "weeks"
msgstr "weeks"
@@ -11471,15 +11711,15 @@ msgstr "weeks"
msgid "years"
msgstr "years"
-#: ../filter/rule-editor.c:380
+#: ../filter/rule-editor.c:382
msgid "Add Rule"
msgstr "Add Rule"
-#: ../filter/rule-editor.c:459
+#: ../filter/rule-editor.c:463
msgid "Edit Rule"
msgstr "Edit Rule"
-#: ../filter/rule-editor.c:786
+#: ../filter/rule-editor.c:809
msgid "Rule name"
msgstr "Rule name"
@@ -11533,8 +11773,8 @@ msgstr "Evolution Mail preferences control"
msgid "Evolution Network configuration control"
msgstr "Evolution Network configuration control"
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:13 ../mail/em-folder-view.c:605
-#: ../mail/importers/elm-importer.c:327 ../mail/importers/pine-importer.c:380
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:13 ../mail/em-folder-view.c:604
+#: ../mail/importers/elm-importer.c:327 ../mail/importers/pine-importer.c:378
#: ../mail/mail-component.c:597 ../mail/mail-component.c:598
#: ../mail/mail-component.c:767
#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:6
@@ -11547,7 +11787,7 @@ msgid "Mail Accounts"
msgstr "Mail Accounts"
#: ../mail/GNOME_Evolution_Mail.server.in.in.h:15
-#: ../mail/mail-config.glade.h:103
+#: ../mail/mail-config.glade.h:104
msgid "Mail Preferences"
msgstr "Mail Preferences"
@@ -11556,15 +11796,16 @@ msgid "Network Preferences"
msgstr "Network Preferences"
#: ../mail/GNOME_Evolution_Mail.server.in.in.h:17
+#: ../plugins/pst-import/pst-importer.c:300
msgid "_Mail"
msgstr "_Mail"
-#: ../mail/em-account-editor.c:387
+#: ../mail/em-account-editor.c:386
#, c-format
msgid "%s License Agreement"
msgstr "%s Licence Agreement"
-#: ../mail/em-account-editor.c:394
+#: ../mail/em-account-editor.c:393
#, c-format
msgid ""
"\n"
@@ -11577,64 +11818,64 @@ msgstr ""
"for %s displayed below\n"
"and tick the check box for accepting it\n"
-#: ../mail/em-account-editor.c:466 ../mail/em-filter-folder-element.c:239
+#: ../mail/em-account-editor.c:465 ../mail/em-filter-folder-element.c:258
#: ../mail/em-vfolder-rule.c:513
msgid "Select Folder"
msgstr "Select Folder"
-#: ../mail/em-account-editor.c:590 ../mail/em-account-editor.c:635
-#: ../mail/em-account-editor.c:702 ../widgets/misc/e-signature-combo-box.c:98
+#: ../mail/em-account-editor.c:589 ../mail/em-account-editor.c:634
+#: ../mail/em-account-editor.c:701 ../widgets/misc/e-signature-combo-box.c:102
msgid "Autogenerated"
msgstr "Autogenerated"
-#: ../mail/em-account-editor.c:762
+#: ../mail/em-account-editor.c:761
msgid "Ask for each message"
msgstr "Ask for each message"
-#: ../mail/em-account-editor.c:1810 ../mail/mail-config.glade.h:94
+#: ../mail/em-account-editor.c:1809 ../mail/mail-config.glade.h:95
msgid "Identity"
msgstr "Identity"
-#: ../mail/em-account-editor.c:1859 ../mail/mail-config.glade.h:124
+#: ../mail/em-account-editor.c:1858 ../mail/mail-config.glade.h:125
msgid "Receiving Email"
msgstr "Receiving E-mail"
-#: ../mail/em-account-editor.c:2131
+#: ../mail/em-account-editor.c:2130
msgid "Check for _new messages every"
msgstr "Check for _new messages every"
-#: ../mail/em-account-editor.c:2139
+#: ../mail/em-account-editor.c:2138
msgid "minu_tes"
msgstr "minu_tes"
-#: ../mail/em-account-editor.c:2327 ../mail/mail-config.glade.h:136
+#: ../mail/em-account-editor.c:2326 ../mail/mail-config.glade.h:139
msgid "Sending Email"
msgstr "Sending E-mail"
-#: ../mail/em-account-editor.c:2386 ../mail/mail-config.glade.h:67
+#: ../mail/em-account-editor.c:2385 ../mail/mail-config.glade.h:67
msgid "Defaults"
msgstr "Defaults"
#. Security settings
-#: ../mail/em-account-editor.c:2452 ../mail/mail-config.glade.h:131
-#: ../plugins/exchange-operations/exchange-account-setup.c:315
+#: ../mail/em-account-editor.c:2451 ../mail/mail-config.glade.h:132
+#: ../plugins/exchange-operations/exchange-account-setup.c:332
msgid "Security"
msgstr "Security"
#. Most sections for this is auto-generated fromt the camel config
-#: ../mail/em-account-editor.c:2489 ../mail/em-account-editor.c:2580
+#: ../mail/em-account-editor.c:2488 ../mail/em-account-editor.c:2579
msgid "Receiving Options"
msgstr "Receiving Options"
-#: ../mail/em-account-editor.c:2490 ../mail/em-account-editor.c:2581
+#: ../mail/em-account-editor.c:2489 ../mail/em-account-editor.c:2580
msgid "Checking for New Messages"
msgstr "Checking for New Messages"
-#: ../mail/em-account-editor.c:2932 ../mail/mail-config.glade.h:34
+#: ../mail/em-account-editor.c:2931 ../mail/mail-config.glade.h:34
msgid "Account Editor"
msgstr "Account Editor"
-#: ../mail/em-account-editor.c:2932 ../mail/mail-config.glade.h:83
+#: ../mail/em-account-editor.c:2931 ../mail/mail-config.glade.h:84
msgid "Evolution Account Assistant"
msgstr "Evolution Account Assistant"
@@ -11652,19 +11893,19 @@ msgid "Protocol"
msgstr "Protocol"
#: ../mail/em-composer-prefs.c:303 ../mail/em-composer-prefs.c:438
-#: ../mail/mail-config.c:1158 ../mail/mail-signature-editor.c:478
+#: ../mail/mail-config.c:1190 ../mail/mail-signature-editor.c:478
msgid "Unnamed"
msgstr "Unnamed"
-#: ../mail/em-composer-prefs.c:992
+#: ../mail/em-composer-prefs.c:970
msgid "Language(s)"
msgstr "Language(s)"
-#: ../mail/em-composer-prefs.c:1041
+#: ../mail/em-composer-prefs.c:1019
msgid "Add signature script"
msgstr "Add signature script"
-#: ../mail/em-composer-prefs.c:1083
+#: ../mail/em-composer-prefs.c:1061
msgid "Signature(s)"
msgstr "Signature(s)"
@@ -11672,14 +11913,24 @@ msgstr "Signature(s)"
msgid "-------- Forwarded Message --------"
msgstr "-------- Forwarded Message --------"
-#: ../mail/em-composer-utils.c:1962
+#: ../mail/em-composer-utils.c:1602
+msgid ""
+"No destination address provided, forward of the message has been cancelled."
+msgstr ""
+"No destination address provided; forward of the message has been cancelled."
+
+#: ../mail/em-composer-utils.c:1608
+msgid "No account found to use, forward of the message has been cancelled."
+msgstr "No account found to use; forward of the message has been cancelled."
+
+#: ../mail/em-composer-utils.c:2058
msgid "an unknown sender"
msgstr "an unknown sender"
#. Note to translators: this is the attribution string used when quoting messages.
#. * each ${Variable} gets replaced with a value. To see a full list of available
#. * variables, see em-composer-utils.c:1514
-#: ../mail/em-composer-utils.c:2009
+#: ../mail/em-composer-utils.c:2105
msgid ""
"On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
"${TimeZone}, ${Sender} wrote:"
@@ -11687,7 +11938,7 @@ msgstr ""
"On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
"${TimeZone}, ${Sender} wrote:"
-#: ../mail/em-composer-utils.c:2152
+#: ../mail/em-composer-utils.c:2248
msgid "-----Original Message-----"
msgstr "-----Original Message-----"
@@ -11737,7 +11988,7 @@ msgid "Date sent"
msgstr "Date sent"
#: ../mail/em-filter-i18n.h:14
-#: ../plugins/groupwise-features/share-folder.c:767
+#: ../plugins/groupwise-features/share-folder.c:768
#: ../ui/evolution-addressbook.xml.h:15 ../ui/evolution-calendar.xml.h:5
#: ../ui/evolution-mail-message.xml.h:25 ../ui/evolution-memos.xml.h:6
#: ../ui/evolution-tasks.xml.h:6
@@ -11816,7 +12067,7 @@ msgstr "is not set"
msgid "is set"
msgstr "is set"
-#: ../mail/em-filter-i18n.h:40 ../mail/mail-config.glade.h:97
+#: ../mail/em-filter-i18n.h:40 ../mail/mail-config.glade.h:98
#: ../ui/evolution-mail-message.xml.h:48
msgid "Junk"
msgstr "Junk"
@@ -11825,7 +12076,7 @@ msgstr "Junk"
msgid "Junk Test"
msgstr "Junk Test"
-#: ../mail/em-filter-i18n.h:42 ../widgets/misc/e-expander.c:188
+#: ../mail/em-filter-i18n.h:42 ../widgets/misc/e-expander.c:190
msgid "Label"
msgstr "Label"
@@ -11865,48 +12116,51 @@ msgstr "Pipe to Program"
msgid "Play Sound"
msgstr "Play Sound"
-#. Translators: "Read" as in "has been read" (em-filter-i18n.h)
#. Translators: "Read" as in "has been read" (message-tag-followup.c)
-#: ../mail/em-filter-i18n.h:53 ../mail/message-tag-followup.c:63
+#: ../mail/em-filter-i18n.h:52 ../mail/message-tag-followup.c:62
msgid "Read"
msgstr "Read"
-#: ../mail/em-filter-i18n.h:54 ../mail/message-list.etspec.h:12
+#: ../mail/em-filter-i18n.h:53 ../mail/message-list.etspec.h:12
msgid "Recipients"
msgstr "Recipients"
-#: ../mail/em-filter-i18n.h:55
+#: ../mail/em-filter-i18n.h:54
msgid "Regex Match"
msgstr "Regex Match"
-#: ../mail/em-filter-i18n.h:56
+#: ../mail/em-filter-i18n.h:55
msgid "Replied to"
msgstr "Replied to"
-#: ../mail/em-filter-i18n.h:57
+#: ../mail/em-filter-i18n.h:56
msgid "returns"
msgstr "returns"
-#: ../mail/em-filter-i18n.h:58
+#: ../mail/em-filter-i18n.h:57
msgid "returns greater than"
msgstr "returns greater than"
-#: ../mail/em-filter-i18n.h:59
+#: ../mail/em-filter-i18n.h:58
msgid "returns less than"
msgstr "returns less than"
-#: ../mail/em-filter-i18n.h:60
+#: ../mail/em-filter-i18n.h:59
msgid "Run Program"
msgstr "Run Program"
-#: ../mail/em-filter-i18n.h:61 ../mail/message-list.etspec.h:13
+#: ../mail/em-filter-i18n.h:60 ../mail/message-list.etspec.h:13
msgid "Score"
msgstr "Score"
-#: ../mail/em-filter-i18n.h:62 ../mail/message-list.etspec.h:14
+#: ../mail/em-filter-i18n.h:61 ../mail/message-list.etspec.h:14
msgid "Sender"
msgstr "Sender"
+#: ../mail/em-filter-i18n.h:62
+msgid "Sender or Recipients"
+msgstr "Sender or Recipients"
+
#: ../mail/em-filter-i18n.h:63
msgid "Set Label"
msgstr "Set Label"
@@ -11940,10 +12194,10 @@ msgid "Stop Processing"
msgstr "Stop Processing"
#: ../mail/em-filter-i18n.h:72 ../mail/em-format-quote.c:342
-#: ../mail/em-format.c:889 ../mail/em-mailer-prefs.c:80
-#: ../mail/message-list.etspec.h:18 ../mail/message-tag-followup.c:312
+#: ../mail/em-format.c:890 ../mail/em-mailer-prefs.c:80
+#: ../mail/message-list.etspec.h:18 ../mail/message-tag-followup.c:311
#: ../plugins/groupwise-features/properties.glade.h:7
-#: ../smime/lib/e-cert.c:1132
+#: ../smime/lib/e-cert.c:1115
msgid "Subject"
msgstr "Subject"
@@ -11960,51 +12214,51 @@ msgstr "Then"
msgid "Add Ac_tion"
msgstr "Add Ac_tion"
-#: ../mail/em-folder-browser.c:190
+#: ../mail/em-folder-browser.c:193
msgid "C_reate Search Folder From Search..."
msgstr "C_reate Search Folder From Search..."
-#: ../mail/em-folder-browser.c:215
+#: ../mail/em-folder-browser.c:218
msgid "All Messages"
msgstr "All Messages"
-#: ../mail/em-folder-browser.c:216
+#: ../mail/em-folder-browser.c:219
msgid "Unread Messages"
msgstr "Unread Messages"
-#: ../mail/em-folder-browser.c:218
+#: ../mail/em-folder-browser.c:221
msgid "No Label"
msgstr "No Label"
-#: ../mail/em-folder-browser.c:225
+#: ../mail/em-folder-browser.c:228
msgid "Read Messages"
msgstr "Read Messages"
-#: ../mail/em-folder-browser.c:226
+#: ../mail/em-folder-browser.c:229
msgid "Recent Messages"
msgstr "Recent Messages"
-#: ../mail/em-folder-browser.c:227
+#: ../mail/em-folder-browser.c:230
msgid "Last 5 Days' Messages"
msgstr "Last 5 Days' Messages"
-#: ../mail/em-folder-browser.c:228
+#: ../mail/em-folder-browser.c:231
msgid "Messages with Attachments"
msgstr "Messages with Attachments"
-#: ../mail/em-folder-browser.c:229
+#: ../mail/em-folder-browser.c:232
msgid "Important Messages"
msgstr "Important Messages"
-#: ../mail/em-folder-browser.c:230
+#: ../mail/em-folder-browser.c:233
msgid "Messages Not Junk"
msgstr "Messages Not Junk"
-#: ../mail/em-folder-browser.c:1171
+#: ../mail/em-folder-browser.c:1188
msgid "Account Search"
msgstr "Account Search"
-#: ../mail/em-folder-browser.c:1224
+#: ../mail/em-folder-browser.c:1241
msgid "All Account Search"
msgstr "All Account Search"
@@ -12034,15 +12288,15 @@ msgid "Quota usage"
msgstr "Quota usage"
#. translators: standard local mailbox names
-#: ../mail/em-folder-properties.c:358 ../mail/em-folder-tree-model.c:507
-#: ../mail/em-folder-tree.c:2556 ../mail/mail-component.c:160
+#: ../mail/em-folder-properties.c:359 ../mail/em-folder-tree-model.c:509
+#: ../mail/em-folder-tree.c:2597 ../mail/mail-component.c:164
#: ../mail/mail-component.c:585
-#: ../plugins/exchange-operations/exchange-delegates-user.c:76
+#: ../plugins/exchange-operations/exchange-delegates-user.c:78
#: ../plugins/exchange-operations/exchange-folder.c:594
msgid "Inbox"
msgstr "Inbox"
-#: ../mail/em-folder-properties.c:389
+#: ../mail/em-folder-properties.c:390
#: ../plugins/groupwise-features/properties.glade.h:4
msgid "Folder Properties"
msgstr "Folder Properties"
@@ -12059,9 +12313,9 @@ msgstr "C_reate"
msgid "Folder _name:"
msgstr "Folder _name:"
-#. load store to mail component at the end, when everything is loaded
+#. load store to mail component
#: ../mail/em-folder-tree-model.c:204 ../mail/em-folder-tree-model.c:206
-#: ../mail/mail-vfolder.c:970 ../mail/mail-vfolder.c:1027
+#: ../mail/mail-vfolder.c:980 ../mail/mail-vfolder.c:1047
msgid "Search Folders"
msgstr "Search Folders"
@@ -12070,19 +12324,24 @@ msgstr "Search Folders"
msgid "UNMATCHED"
msgstr "UNMATCHED"
-#: ../mail/em-folder-tree-model.c:504 ../mail/mail-component.c:161
+#: ../mail/em-folder-tree-model.c:504 ../mail/mail-component.c:165
msgid "Drafts"
msgstr "Drafts"
-#: ../mail/em-folder-tree-model.c:510 ../mail/mail-component.c:162
+#: ../mail/em-folder-tree-model.c:506 ../mail/mail-component.c:168
+#: ../plugins/templates/org-gnome-templates.eplug.xml.h:2
+msgid "Templates"
+msgstr "Templates"
+
+#: ../mail/em-folder-tree-model.c:512 ../mail/mail-component.c:166
msgid "Outbox"
msgstr "Outbox"
-#: ../mail/em-folder-tree-model.c:512 ../mail/mail-component.c:163
+#: ../mail/em-folder-tree-model.c:514 ../mail/mail-component.c:167
msgid "Sent"
msgstr "Sent"
-#: ../mail/em-folder-tree-model.c:534 ../mail/em-folder-tree-model.c:841
+#: ../mail/em-folder-tree-model.c:536 ../mail/em-folder-tree-model.c:843
msgid "Loading..."
msgstr "Loading..."
@@ -12121,12 +12380,12 @@ msgstr "Moving folder %s"
msgid "Copying folder %s"
msgstr "Copying folder %s"
-#: ../mail/em-folder-tree.c:909 ../mail/message-list.c:1953
+#: ../mail/em-folder-tree.c:909 ../mail/message-list.c:2014
#, c-format
msgid "Moving messages into folder %s"
msgstr "Moving messages into folder %s"
-#: ../mail/em-folder-tree.c:911 ../mail/message-list.c:1955
+#: ../mail/em-folder-tree.c:911 ../mail/message-list.c:2016
#, c-format
msgid "Copying messages into folder %s"
msgstr "Copying messages into folder %s"
@@ -12143,271 +12402,272 @@ msgstr "_Copy to Folder"
msgid "_Move to Folder"
msgstr "_Move to Folder"
-#: ../mail/em-folder-tree.c:1718 ../mail/mail-ops.c:1058
+#: ../mail/em-folder-tree.c:1718 ../mail/mail-ops.c:1059
#, c-format
msgid "Scanning folders in \"%s\""
msgstr "Scanning folders in \"%s\""
-#: ../mail/em-folder-tree.c:2099
+#: ../mail/em-folder-tree.c:2117
msgid "Open in _New Window"
msgstr "Open in _New Window"
#. FIXME: need to disable for nochildren folders
-#: ../mail/em-folder-tree.c:2104
+#: ../mail/em-folder-tree.c:2122
msgid "_New Folder..."
msgstr "_New Folder..."
-#: ../mail/em-folder-tree.c:2107
+#: ../mail/em-folder-tree.c:2125
msgid "_Move..."
msgstr "_Move..."
-#: ../mail/em-folder-tree.c:2114 ../ui/evolution-mail-list.xml.h:39
-msgid "_Rename..."
-msgstr "_Rename..."
-
-#: ../mail/em-folder-tree.c:2115
+#: ../mail/em-folder-tree.c:2133 ../ui/evolution-mail-list.xml.h:21
msgid "Re_fresh"
msgstr "Re_fresh"
-#: ../mail/em-folder-tree.c:2116
+#: ../mail/em-folder-tree.c:2134
msgid "Fl_ush Outbox"
msgstr "Fl_ush Outbox"
-#: ../mail/em-folder-tree.c:2122 ../mail/mail.error.xml.h:138
+#: ../mail/em-folder-tree.c:2140 ../mail/mail.error.xml.h:138
msgid "_Empty Trash"
msgstr "_Empty Wastebasket"
+#: ../mail/em-folder-tree.c:2243
+msgid "_Unread Search Folder"
+msgstr "_Unread Search Folder"
+
#: ../mail/em-folder-utils.c:101
#, c-format
msgid "Copying `%s' to `%s'"
msgstr "Copying `%s' to `%s'"
-#: ../mail/em-folder-utils.c:364 ../mail/em-folder-view.c:1186
-#: ../mail/em-folder-view.c:1201
-#: ../mail/importers/evolution-mbox-importer.c:83
+#: ../mail/em-folder-utils.c:364 ../mail/em-folder-view.c:1188
+#: ../mail/em-folder-view.c:1203
+#: ../mail/importers/evolution-mbox-importer.c:82
+#: ../plugins/pst-import/pst-importer.c:305
msgid "Select folder"
msgstr "Select folder"
-#: ../mail/em-folder-utils.c:364 ../mail/em-folder-view.c:1201
+#: ../mail/em-folder-utils.c:364 ../mail/em-folder-view.c:1203
msgid "C_opy"
msgstr "C_opy"
-#: ../mail/em-folder-utils.c:585
+#: ../mail/em-folder-utils.c:532
#: ../plugins/groupwise-features/share-folder-common.c:145
#, c-format
msgid "Creating folder `%s'"
msgstr "Creating folder `%s'"
-#: ../mail/em-folder-utils.c:743
-#: ../plugins/groupwise-features/install-shared.c:168
+#: ../mail/em-folder-utils.c:690
+#: ../plugins/groupwise-features/install-shared.c:169
#: ../plugins/groupwise-features/share-folder-common.c:387
msgid "Create folder"
msgstr "Create folder"
-#: ../mail/em-folder-utils.c:743
-#: ../plugins/groupwise-features/install-shared.c:168
+#: ../mail/em-folder-utils.c:690
+#: ../plugins/groupwise-features/install-shared.c:169
#: ../plugins/groupwise-features/share-folder-common.c:387
msgid "Specify where to create the folder:"
msgstr "Specify where to create the folder:"
-#: ../mail/em-folder-view.c:1090 ../mail/mail.error.xml.h:70
+#: ../mail/em-folder-view.c:1091 ../mail/mail.error.xml.h:70
msgid "Mail Deletion Failed"
msgstr "Mail Deletion Failed"
-#: ../mail/em-folder-view.c:1091 ../mail/mail.error.xml.h:126
+#: ../mail/em-folder-view.c:1092 ../mail/mail.error.xml.h:126
msgid "You do not have sufficient permissions to delete this mail."
msgstr "You do not have sufficient permissions to delete this mail."
-#: ../mail/em-folder-view.c:1329 ../ui/evolution-mail-message.xml.h:127
+#: ../mail/em-folder-view.c:1331 ../ui/evolution-mail-message.xml.h:127
msgid "_Reply to Sender"
msgstr "_Reply to Sender"
-#: ../mail/em-folder-view.c:1331 ../mail/em-popup.c:568 ../mail/em-popup.c:579
+#: ../mail/em-folder-view.c:1333 ../mail/em-popup.c:566 ../mail/em-popup.c:577
#: ../ui/evolution-mail-message.xml.h:109
msgid "_Forward"
msgstr "_Forward"
#. EM_POPUP_EDIT was used here. This is changed to EM_POPUP_SELECT_ONE as Edit-as-new-messaeg need not be restricted to Sent-Items folder alone
-#: ../mail/em-folder-view.c:1335 ../ui/evolution-mail-message.xml.h:106
+#: ../mail/em-folder-view.c:1337 ../ui/evolution-mail-message.xml.h:106
msgid "_Edit as New Message..."
msgstr "_Edit as New Message..."
-#: ../mail/em-folder-view.c:1341
+#: ../mail/em-folder-view.c:1343
msgid "U_ndelete"
msgstr "U_ndelete"
-#: ../mail/em-folder-view.c:1342
+#: ../mail/em-folder-view.c:1344
msgid "_Move to Folder..."
msgstr "_Move to Folder..."
-#: ../mail/em-folder-view.c:1343
+#: ../mail/em-folder-view.c:1345
msgid "_Copy to Folder..."
msgstr "_Copy to Folder..."
-#: ../mail/em-folder-view.c:1346
+#: ../mail/em-folder-view.c:1348
msgid "Mar_k as Read"
msgstr "Mar_k as Read"
-#: ../mail/em-folder-view.c:1347
+#: ../mail/em-folder-view.c:1349
msgid "Mark as _Unread"
msgstr "Mark as _Unread"
-#: ../mail/em-folder-view.c:1348
+#: ../mail/em-folder-view.c:1350
msgid "Mark as _Important"
msgstr "Mark as _Important"
-#: ../mail/em-folder-view.c:1349
+#: ../mail/em-folder-view.c:1351
msgid "Mark as Un_important"
msgstr "Mark as Un_important"
-#: ../mail/em-folder-view.c:1350
+#: ../mail/em-folder-view.c:1352
msgid "Mark as _Junk"
msgstr "Mark as _Junk"
-#: ../mail/em-folder-view.c:1351
+#: ../mail/em-folder-view.c:1353
msgid "Mark as _Not Junk"
msgstr "Mark as _Not Junk"
-#: ../mail/em-folder-view.c:1352
+#: ../mail/em-folder-view.c:1354
msgid "Mark for Follo_w Up..."
msgstr "Mark for Follo_w Up..."
-#: ../mail/em-folder-view.c:1354
+#: ../mail/em-folder-view.c:1356
msgid "_Label"
msgstr "_Label"
#. Note that we don't show this here, since by default a 'None' date
#. is not permitted.
-#: ../mail/em-folder-view.c:1355 ../widgets/misc/e-dateedit.c:484
+#: ../mail/em-folder-view.c:1357 ../widgets/misc/e-dateedit.c:478
msgid "_None"
msgstr "_None"
-#: ../mail/em-folder-view.c:1358
+#: ../mail/em-folder-view.c:1360
msgid "_New Label"
msgstr "_New Label"
-#: ../mail/em-folder-view.c:1362
+#: ../mail/em-folder-view.c:1364
msgid "Fla_g Completed"
msgstr "Fla_g Completed"
-#: ../mail/em-folder-view.c:1363
+#: ../mail/em-folder-view.c:1365
msgid "Cl_ear Flag"
msgstr "Cl_ear Flag"
-#: ../mail/em-folder-view.c:1366
+#: ../mail/em-folder-view.c:1368
msgid "Crea_te Rule From Message"
msgstr "Crea_te Rule From Message"
#. Translators: The following strings are used while creating a new search folder, to specify what parameter the search folder would be based on.
-#: ../mail/em-folder-view.c:1368
+#: ../mail/em-folder-view.c:1370
msgid "Search Folder based on _Subject"
msgstr "Search Folder based on _Subject"
-#: ../mail/em-folder-view.c:1369
+#: ../mail/em-folder-view.c:1371
msgid "Search Folder based on Se_nder"
msgstr "Search Folder based on Se_nder"
-#: ../mail/em-folder-view.c:1370
+#: ../mail/em-folder-view.c:1372
msgid "Search Folder based on _Recipients"
msgstr "Search Folder based on _Recipients"
-#: ../mail/em-folder-view.c:1371
+#: ../mail/em-folder-view.c:1373
msgid "Search Folder based on Mailing _List"
msgstr "Search Folder based on Mailing _List"
#. Translators: The following strings are used while creating a new message filter, to specify what parameter the filter would be based on.
-#: ../mail/em-folder-view.c:1376
+#: ../mail/em-folder-view.c:1378
msgid "Filter based on Sub_ject"
msgstr "Filter based on Sub_ject"
-#: ../mail/em-folder-view.c:1377
+#: ../mail/em-folder-view.c:1379
msgid "Filter based on Sen_der"
msgstr "Filter based on Sen_der"
-#: ../mail/em-folder-view.c:1378
+#: ../mail/em-folder-view.c:1380
msgid "Filter based on Re_cipients"
msgstr "Filter based on Re_cipients"
-#: ../mail/em-folder-view.c:1379
+#: ../mail/em-folder-view.c:1381
msgid "Filter based on _Mailing List"
msgstr "Filter based on _Mailing List"
#. default charset used in mail view
#. we changed user, thus reset the chosen calendar combo too, because
#. other user means other calendars subscribed
-#: ../mail/em-folder-view.c:2255 ../mail/em-folder-view.c:2298
-#: ../plugins/google-account-setup/google-source.c:251
-#: ../plugins/google-account-setup/google-source.c:532
-#: ../plugins/google-account-setup/google-source.c:718
+#: ../mail/em-folder-view.c:2257 ../mail/em-folder-view.c:2300
+#: ../plugins/google-account-setup/google-source.c:232
+#: ../plugins/google-account-setup/google-source.c:510
+#: ../plugins/google-account-setup/google-source.c:708
msgid "Default"
msgstr "Default"
-#: ../mail/em-folder-view.c:2516
+#: ../mail/em-folder-view.c:2518
msgid "Unable to retrieve message"
msgstr "Unable to retrieve message"
-#: ../mail/em-folder-view.c:2535
+#: ../mail/em-folder-view.c:2537
msgid "Retrieving Message..."
msgstr "Retrieving Message..."
-#: ../mail/em-folder-view.c:2794
+#: ../mail/em-folder-view.c:2756
msgid "C_all To..."
msgstr "C_all To..."
-#: ../mail/em-folder-view.c:2797
+#: ../mail/em-folder-view.c:2759
msgid "Create _Search Folder"
msgstr "Create _Search Folder"
-#: ../mail/em-folder-view.c:2798
+#: ../mail/em-folder-view.c:2760
msgid "_From this Address"
msgstr "_From this Address"
-#: ../mail/em-folder-view.c:2799
+#: ../mail/em-folder-view.c:2761
msgid "_To this Address"
msgstr "_To this Address"
-#: ../mail/em-folder-view.c:3296
+#: ../mail/em-folder-view.c:3254
#, c-format
msgid "Click to mail %s"
msgstr "Click to mail %s"
-#: ../mail/em-folder-view.c:3308
+#: ../mail/em-folder-view.c:3266
#, c-format
msgid "Click to call %s"
msgstr "Click to call %s"
-#: ../mail/em-folder-view.c:3313
+#: ../mail/em-folder-view.c:3271
msgid "Click to hide/unhide addresses"
msgstr "Click to hide/unhide addresses"
#. message-search popup match count string
-#: ../mail/em-format-html-display.c:470
+#: ../mail/em-format-html-display.c:474
#, c-format
msgid "Matches: %d"
msgstr "Matches: %d"
-#: ../mail/em-format-html-display.c:614
+#: ../mail/em-format-html-display.c:618
msgid "Fin_d:"
msgstr "Fin_d:"
#. gtk_box_pack_start ((GtkBox *)(hbox2), p->search_entry_box, TRUE, TRUE, 5);
-#: ../mail/em-format-html-display.c:638
+#: ../mail/em-format-html-display.c:642
msgid "_Previous"
msgstr "_Previous"
-#: ../mail/em-format-html-display.c:643
+#: ../mail/em-format-html-display.c:647
msgid "_Next"
msgstr "_Next"
-#: ../mail/em-format-html-display.c:648
+#: ../mail/em-format-html-display.c:652
msgid "M_atch case"
msgstr "M_atch case"
-#: ../mail/em-format-html-display.c:947 ../mail/em-format-html.c:650
+#: ../mail/em-format-html-display.c:951 ../mail/em-format-html.c:655
msgid "Unsigned"
msgstr "Unsigned"
-#: ../mail/em-format-html-display.c:947
+#: ../mail/em-format-html-display.c:951
msgid ""
"This message is not signed. There is no guarantee that this message is "
"authentic."
@@ -12415,11 +12675,11 @@ msgstr ""
"This message is not signed. There is no guarantee that this message is "
"authentic."
-#: ../mail/em-format-html-display.c:948 ../mail/em-format-html.c:651
+#: ../mail/em-format-html-display.c:952 ../mail/em-format-html.c:656
msgid "Valid signature"
msgstr "Valid signature"
-#: ../mail/em-format-html-display.c:948
+#: ../mail/em-format-html-display.c:952
msgid ""
"This message is signed and is valid meaning that it is very likely that this "
"message is authentic."
@@ -12427,11 +12687,11 @@ msgstr ""
"This message is signed and is valid meaning that it is very likely that this "
"message is authentic."
-#: ../mail/em-format-html-display.c:949 ../mail/em-format-html.c:652
+#: ../mail/em-format-html-display.c:953 ../mail/em-format-html.c:657
msgid "Invalid signature"
msgstr "Invalid signature"
-#: ../mail/em-format-html-display.c:949
+#: ../mail/em-format-html-display.c:953
msgid ""
"The signature of this message cannot be verified, it may have been altered "
"in transit."
@@ -12439,11 +12699,11 @@ msgstr ""
"The signature of this message cannot be verified, it may have been altered "
"in transit."
-#: ../mail/em-format-html-display.c:950 ../mail/em-format-html.c:653
+#: ../mail/em-format-html-display.c:954 ../mail/em-format-html.c:658
msgid "Valid signature, but cannot verify sender"
msgstr "Valid signature, but cannot verify sender"
-#: ../mail/em-format-html-display.c:950
+#: ../mail/em-format-html-display.c:954
msgid ""
"This message is signed with a valid signature, but the sender of the message "
"cannot be verified."
@@ -12451,11 +12711,11 @@ msgstr ""
"This message is signed with a valid signature, but the sender of the message "
"cannot be verified."
-#: ../mail/em-format-html-display.c:951 ../mail/em-format-html.c:654
+#: ../mail/em-format-html-display.c:955 ../mail/em-format-html.c:659
msgid "Signature exists, but need public key"
msgstr "Signature exists, but need public key"
-#: ../mail/em-format-html-display.c:951
+#: ../mail/em-format-html-display.c:955
msgid ""
"This message is signed with a signature, but there is no corresponding "
"public key."
@@ -12463,11 +12723,11 @@ msgstr ""
"This message is signed with a signature, but there is no corresponding "
"public key."
-#: ../mail/em-format-html-display.c:958 ../mail/em-format-html.c:660
+#: ../mail/em-format-html-display.c:962 ../mail/em-format-html.c:665
msgid "Unencrypted"
msgstr "Unencrypted"
-#: ../mail/em-format-html-display.c:958
+#: ../mail/em-format-html-display.c:962
msgid ""
"This message is not encrypted. Its content may be viewed in transit across "
"the Internet."
@@ -12475,11 +12735,11 @@ msgstr ""
"This message is not encrypted. Its content may be viewed in transit across "
"the Internet."
-#: ../mail/em-format-html-display.c:959 ../mail/em-format-html.c:661
+#: ../mail/em-format-html-display.c:963 ../mail/em-format-html.c:666
msgid "Encrypted, weak"
msgstr "Encrypted, weak"
-#: ../mail/em-format-html-display.c:959
+#: ../mail/em-format-html-display.c:963
msgid ""
"This message is encrypted, but with a weak encryption algorithm. It would be "
"difficult, but not impossible for an outsider to view the content of this "
@@ -12489,11 +12749,11 @@ msgstr ""
"difficult, but not impossible for an outsider to view the content of this "
"message in a practical amount of time."
-#: ../mail/em-format-html-display.c:960 ../mail/em-format-html.c:662
+#: ../mail/em-format-html-display.c:964 ../mail/em-format-html.c:667
msgid "Encrypted"
msgstr "Encrypted"
-#: ../mail/em-format-html-display.c:960
+#: ../mail/em-format-html-display.c:964
msgid ""
"This message is encrypted. It would be difficult for an outsider to view "
"the content of this message."
@@ -12501,11 +12761,11 @@ msgstr ""
"This message is encrypted. It would be difficult for an outsider to view "
"the content of this message."
-#: ../mail/em-format-html-display.c:961 ../mail/em-format-html.c:663
+#: ../mail/em-format-html-display.c:965 ../mail/em-format-html.c:668
msgid "Encrypted, strong"
msgstr "Encrypted, strong"
-#: ../mail/em-format-html-display.c:961
+#: ../mail/em-format-html-display.c:965
msgid ""
"This message is encrypted, with a strong encryption algorithm. It would be "
"very difficult for an outsider to view the content of this message in a "
@@ -12515,87 +12775,87 @@ msgstr ""
"very difficult for an outsider to view the content of this message in a "
"practical amount of time."
-#: ../mail/em-format-html-display.c:1062 ../smime/gui/smime-ui.glade.h:48
+#: ../mail/em-format-html-display.c:1066 ../smime/gui/smime-ui.glade.h:48
msgid "_View Certificate"
msgstr "_View Certificate"
-#: ../mail/em-format-html-display.c:1077
+#: ../mail/em-format-html-display.c:1081
msgid "This certificate is not viewable"
msgstr "This certificate is not viewable"
-#: ../mail/em-format-html-display.c:1371
+#: ../mail/em-format-html-display.c:1410
msgid "Completed on %B %d, %Y, %l:%M %p"
msgstr "Completed on %d %B, %Y, %l:%M %p"
-#: ../mail/em-format-html-display.c:1379
+#: ../mail/em-format-html-display.c:1418
msgid "Overdue:"
msgstr "Overdue:"
-#: ../mail/em-format-html-display.c:1382
+#: ../mail/em-format-html-display.c:1421
msgid "by %B %d, %Y, %l:%M %p"
msgstr "by %d %B, %Y, %l:%M %p"
-#: ../mail/em-format-html-display.c:1460
+#: ../mail/em-format-html-display.c:1499
msgid "_View Inline"
msgstr "_View Inline"
-#: ../mail/em-format-html-display.c:1461
+#: ../mail/em-format-html-display.c:1500
msgid "_Hide"
msgstr "_Hide"
-#: ../mail/em-format-html-display.c:1462
+#: ../mail/em-format-html-display.c:1501
msgid "_Fit to Width"
msgstr "_Fit to Width"
-#: ../mail/em-format-html-display.c:1463
+#: ../mail/em-format-html-display.c:1502
msgid "Show _Original Size"
msgstr "Show _Original Size"
-#: ../mail/em-format-html-display.c:1983
+#: ../mail/em-format-html-display.c:2171
msgid "Save attachment as"
msgstr "Save attachment as"
-#: ../mail/em-format-html-display.c:1987
+#: ../mail/em-format-html-display.c:2175
msgid "Select folder to save all attachments"
msgstr "Select folder to save all attachments"
-#: ../mail/em-format-html-display.c:2038
+#: ../mail/em-format-html-display.c:2226
msgid "_Save Selected..."
msgstr "_Save Selected..."
#. Cant i put in the number of attachments here ?
-#: ../mail/em-format-html-display.c:2105
+#: ../mail/em-format-html-display.c:2293
#, c-format
msgid "%d at_tachment"
msgid_plural "%d at_tachments"
msgstr[0] "%d at_tachment"
msgstr[1] "%d at_tachments"
-#: ../mail/em-format-html-display.c:2112 ../mail/em-format-html-display.c:2201
+#: ../mail/em-format-html-display.c:2300 ../mail/em-format-html-display.c:2390
msgid "S_ave"
msgstr "S_ave"
-#: ../mail/em-format-html-display.c:2123
+#: ../mail/em-format-html-display.c:2311
msgid "S_ave All"
msgstr "S_ave All"
-#: ../mail/em-format-html-display.c:2197
+#: ../mail/em-format-html-display.c:2386
msgid "No Attachment"
msgstr "No Attachment"
-#: ../mail/em-format-html-display.c:2338 ../mail/em-format-html-display.c:2377
+#: ../mail/em-format-html-display.c:2533 ../mail/em-format-html-display.c:2572
msgid "View _Unformatted"
msgstr "View _Unformatted"
-#: ../mail/em-format-html-display.c:2340
+#: ../mail/em-format-html-display.c:2535
msgid "Hide _Unformatted"
msgstr "Hide _Unformatted"
-#: ../mail/em-format-html-display.c:2397
+#: ../mail/em-format-html-display.c:2592
msgid "O_pen With"
msgstr "O_pen With"
-#: ../mail/em-format-html-display.c:2473
+#: ../mail/em-format-html-display.c:2668
msgid ""
"Evolution cannot render this email as it is too large to process. You can "
"view it unformatted or with an external text editor."
@@ -12603,115 +12863,120 @@ msgstr ""
"Evolution cannot render this e-mail as it is too large to process. You can "
"view it unformatted or with an external text editor."
-#: ../mail/em-format-html-print.c:156
+#: ../mail/em-format-html-print.c:157
#, c-format
msgid "Page %d of %d"
msgstr "Page %d of %d"
-#: ../mail/em-format-html.c:504 ../mail/em-format-html.c:513
+#: ../mail/em-format-html.c:506 ../mail/em-format-html.c:515
#, c-format
msgid "Retrieving `%s'"
msgstr "Retrieving `%s'"
-#: ../mail/em-format-html.c:925
+#: ../mail/em-format-html.c:930
msgid "Unknown external-body part."
msgstr "Unknown external-body part."
-#: ../mail/em-format-html.c:933
+#: ../mail/em-format-html.c:938
msgid "Malformed external-body part."
msgstr "Malformed external-body part."
-#: ../mail/em-format-html.c:963
+#: ../mail/em-format-html.c:968
#, c-format
msgid "Pointer to FTP site (%s)"
msgstr "Pointer to FTP site (%s)"
-#: ../mail/em-format-html.c:974
+#: ../mail/em-format-html.c:979
#, c-format
msgid "Pointer to local file (%s) valid at site \"%s\""
msgstr "Pointer to local file (%s) valid at site \"%s\""
-#: ../mail/em-format-html.c:976
+#: ../mail/em-format-html.c:981
#, c-format
msgid "Pointer to local file (%s)"
msgstr "Pointer to local file (%s)"
-#: ../mail/em-format-html.c:997
+#: ../mail/em-format-html.c:1002
#, c-format
msgid "Pointer to remote data (%s)"
msgstr "Pointer to remote data (%s)"
-#: ../mail/em-format-html.c:1008
+#: ../mail/em-format-html.c:1013
#, c-format
msgid "Pointer to unknown external data (\"%s\" type)"
msgstr "Pointer to unknown external data (\"%s\" type)"
-#: ../mail/em-format-html.c:1236
+#: ../mail/em-format-html.c:1241
msgid "Formatting message"
msgstr "Formatting message"
-#: ../mail/em-format-html.c:1410
+#: ../mail/em-format-html.c:1415
msgid "Formatting Message..."
msgstr "Formatting Message..."
-#: ../mail/em-format-html.c:1563 ../mail/em-format-html.c:1627
-#: ../mail/em-format-html.c:1649 ../mail/em-format-quote.c:210
-#: ../mail/em-format.c:887 ../mail/em-mailer-prefs.c:78
+#: ../mail/em-format-html.c:1568 ../mail/em-format-html.c:1632
+#: ../mail/em-format-html.c:1654 ../mail/em-format-quote.c:210
+#: ../mail/em-format.c:888 ../mail/em-mailer-prefs.c:78
msgid "Cc"
msgstr "Cc"
-#: ../mail/em-format-html.c:1564 ../mail/em-format-html.c:1633
-#: ../mail/em-format-html.c:1652 ../mail/em-format-quote.c:210
-#: ../mail/em-format.c:888 ../mail/em-mailer-prefs.c:79
+#: ../mail/em-format-html.c:1569 ../mail/em-format-html.c:1638
+#: ../mail/em-format-html.c:1657 ../mail/em-format-quote.c:210
+#: ../mail/em-format.c:889 ../mail/em-mailer-prefs.c:79
msgid "Bcc"
msgstr "Bcc"
#. pseudo-header
-#: ../mail/em-format-html.c:1744 ../mail/em-format-quote.c:353
-#: ../mail/em-mailer-prefs.c:1450
+#: ../mail/em-format-html.c:1749 ../mail/em-format-quote.c:353
+#: ../mail/em-mailer-prefs.c:1451
msgid "Mailer"
msgstr "Mailer"
#. translators: strftime format for local time equivalent in Date header display, with day
-#: ../mail/em-format-html.c:1771
+#: ../mail/em-format-html.c:1776
msgid " (%a, %R %Z)"
msgstr " (%a, %R %Z)"
#. translators: strftime format for local time equivalent in Date header display, without day
-#: ../mail/em-format-html.c:1776
+#: ../mail/em-format-html.c:1781
msgid " (%R %Z)"
msgstr " (%R %Z)"
#. To translators: This message suggests to the receipients that the sender of the mail is
#. different from the one listed in From field.
#.
-#: ../mail/em-format-html.c:1907
+#: ../mail/em-format-html.c:1917
#, c-format
msgid "This message was sent by <b>%s</b> on behalf of <b>%s</b>"
msgstr "This message was sent by <b>%s</b> on behalf of <b>%s</b>"
-#: ../mail/em-format-quote.c:210 ../mail/em-format.c:884
+#: ../mail/em-format-quote.c:210 ../mail/em-format.c:885
#: ../mail/em-mailer-prefs.c:75 ../mail/message-list.etspec.h:7
-#: ../mail/message-tag-followup.c:308
+#: ../mail/message-tag-followup.c:307
msgid "From"
msgstr "From"
-#: ../mail/em-format-quote.c:210 ../mail/em-format.c:885
+#: ../mail/em-format-quote.c:210 ../mail/em-format.c:886
#: ../mail/em-mailer-prefs.c:76
msgid "Reply-To"
msgstr "Reply-To"
-#: ../mail/em-format.c:890 ../mail/em-mailer-prefs.c:81
-#: ../mail/message-list.etspec.h:2 ../widgets/misc/e-dateedit.c:331
-#: ../widgets/misc/e-dateedit.c:353
+#: ../mail/em-format.c:891 ../mail/em-mailer-prefs.c:81
+#: ../mail/message-list.etspec.h:2 ../widgets/misc/e-dateedit.c:325
+#: ../widgets/misc/e-dateedit.c:347
msgid "Date"
msgstr "Date"
-#: ../mail/em-format.c:891 ../mail/em-mailer-prefs.c:82
+#: ../mail/em-format.c:892 ../mail/em-mailer-prefs.c:82
msgid "Newsgroups"
msgstr "Newsgroups"
-#: ../mail/em-format.c:1157
+#: ../mail/em-format.c:893 ../mail/em-mailer-prefs.c:83
+#: ../plugins/face/org-gnome-face.eplug.xml.h:2
+msgid "Face"
+msgstr "Face"
+
+#: ../mail/em-format.c:1160
#, c-format
msgid "%s attachment"
msgstr "%s attachment"
@@ -12748,69 +13013,69 @@ msgstr "Error verifying signature"
msgid "Unknown error verifying signature"
msgstr "Unknown error verifying signature"
-#: ../mail/em-format.c:1662
+#: ../mail/em-format.c:1664
msgid "Could not parse PGP message"
msgstr "Could not parse PGP message"
-#: ../mail/em-format.c:1662
+#: ../mail/em-format.c:1664
msgid "Could not parse PGP message: Unknown error"
msgstr "Could not parse PGP message: Unknown error"
-#: ../mail/em-mailer-prefs.c:93
+#: ../mail/em-mailer-prefs.c:94
msgid "Every time"
msgstr "Every time"
-#: ../mail/em-mailer-prefs.c:94
+#: ../mail/em-mailer-prefs.c:95
msgid "Once per day"
msgstr "Once per day"
-#: ../mail/em-mailer-prefs.c:95
+#: ../mail/em-mailer-prefs.c:96
msgid "Once per week"
msgstr "Once per week"
-#: ../mail/em-mailer-prefs.c:96
+#: ../mail/em-mailer-prefs.c:97
msgid "Once per month"
msgstr "Once per month"
-#: ../mail/em-mailer-prefs.c:326
+#: ../mail/em-mailer-prefs.c:327
msgid "Add Custom Junk Header"
msgstr "Add Custom Junk Header"
-#: ../mail/em-mailer-prefs.c:330
+#: ../mail/em-mailer-prefs.c:331
msgid "Header Name:"
msgstr "Header Name:"
-#: ../mail/em-mailer-prefs.c:331
+#: ../mail/em-mailer-prefs.c:332
msgid "Header Value Contains:"
msgstr "Header Value Contains:"
-#: ../mail/em-mailer-prefs.c:436
+#: ../mail/em-mailer-prefs.c:437
msgid "Contains Value"
msgstr "Contains Value"
-#: ../mail/em-mailer-prefs.c:458
+#: ../mail/em-mailer-prefs.c:459
msgid "Color"
msgstr "Colour"
-#: ../mail/em-mailer-prefs.c:461
+#: ../mail/em-mailer-prefs.c:462
msgid "Tag"
msgstr "Tag"
#. May be a better text
-#: ../mail/em-mailer-prefs.c:1078 ../mail/em-mailer-prefs.c:1132
+#: ../mail/em-mailer-prefs.c:1079 ../mail/em-mailer-prefs.c:1133
#, c-format
msgid "%s plugin is available and the binary is installed."
msgstr "%s plugin is available and the binary is installed."
#. May be a better text
-#: ../mail/em-mailer-prefs.c:1086 ../mail/em-mailer-prefs.c:1141
+#: ../mail/em-mailer-prefs.c:1087 ../mail/em-mailer-prefs.c:1142
#, c-format
msgid ""
"%s plugin is not available. Please check whether the package is installed."
msgstr ""
"%s plugin is not available. Please check whether the package is installed."
-#: ../mail/em-mailer-prefs.c:1107
+#: ../mail/em-mailer-prefs.c:1108
msgid "No Junk plugin available"
msgstr "No Junk plugin available"
@@ -12824,22 +13089,26 @@ msgstr "To Do"
msgid "Later"
msgstr "Later"
-#: ../mail/em-migrate.c:1652
+#: ../mail/em-migrate.c:1228
+msgid "Migration"
+msgstr "Migration"
+
+#: ../mail/em-migrate.c:1673
#, c-format
msgid "Unable to create new folder `%s': %s"
msgstr "Unable to create new folder `%s': %s"
-#: ../mail/em-migrate.c:1678
+#: ../mail/em-migrate.c:1699
#, c-format
msgid "Unable to copy folder `%s' to `%s': %s"
msgstr "Unable to copy folder `%s' to `%s': %s"
-#: ../mail/em-migrate.c:1863
+#: ../mail/em-migrate.c:1884
#, c-format
msgid "Unable to scan for existing mailboxes at `%s': %s"
msgstr "Unable to scan for existing mailboxes at `%s': %s"
-#: ../mail/em-migrate.c:1868
+#: ../mail/em-migrate.c:1889
msgid ""
"The location and hierarchy of the Evolution mailbox folders has changed "
"since Evolution 1.x.\n"
@@ -12851,29 +13120,33 @@ msgstr ""
"\n"
"Please be patient while Evolution migrates your folders..."
-#: ../mail/em-migrate.c:2069
+#: ../mail/em-migrate.c:2090
#, c-format
msgid "Unable to open old POP keep-on-server data `%s': %s"
msgstr "Unable to open old POP keep-on-server data `%s': %s"
-#: ../mail/em-migrate.c:2083
+#: ../mail/em-migrate.c:2104
#, c-format
msgid "Unable to create POP3 keep-on-server data directory `%s': %s"
msgstr "Unable to create POP3 keep-on-server data directory `%s': %s"
-#: ../mail/em-migrate.c:2112
+#: ../mail/em-migrate.c:2133
#, c-format
msgid "Unable to copy POP3 keep-on-server data `%s': %s"
msgstr "Unable to copy POP3 keep-on-server data `%s': %s"
-#: ../mail/em-migrate.c:2583 ../mail/em-migrate.c:2595
+#: ../mail/em-migrate.c:2604 ../mail/em-migrate.c:2616
#, c-format
msgid "Failed to create local mail storage `%s': %s"
msgstr "Failed to create local mail storage `%s': %s"
-#: ../mail/em-migrate.c:2898
+#: ../mail/em-migrate.c:2974
+msgid "Migrating Folders"
+msgstr "Migrating Folders"
+
+#: ../mail/em-migrate.c:2974
msgid ""
-"The summary format of the Evolution mailbox folders has been moved to sqlite "
+"The summary format of the Evolution mailbox folders has been moved to SQLite "
"since Evolution 2.24.\n"
"\n"
"Please be patient while Evolution migrates your folders..."
@@ -12883,12 +13156,12 @@ msgstr ""
"\n"
"Please be patient while Evolution migrates your folders..."
-#: ../mail/em-migrate.c:2963
+#: ../mail/em-migrate.c:3056
#, c-format
msgid "Unable to create local mail folders at `%s': %s"
msgstr "Unable to create local mail folders at `%s': %s"
-#: ../mail/em-migrate.c:2982
+#: ../mail/em-migrate.c:3075
msgid ""
"Unable to read settings from previous Evolution install, `evolution/config."
"xmldb' does not exist or is corrupt."
@@ -12896,65 +13169,65 @@ msgstr ""
"Unable to read settings from previous Evolution install, `evolution/config."
"xmldb' does not exist or is corrupt."
-#: ../mail/em-popup.c:564 ../mail/em-popup.c:575
+#: ../mail/em-popup.c:562 ../mail/em-popup.c:573
msgid "_Reply to sender"
msgstr "_Reply to sender"
-#: ../mail/em-popup.c:565 ../mail/em-popup.c:576
+#: ../mail/em-popup.c:563 ../mail/em-popup.c:574
#: ../ui/evolution-mail-message.xml.h:83
msgid "Reply to _List"
msgstr "Reply to _List"
#. make it first item
-#: ../mail/em-popup.c:629 ../mail/em-popup.c:852
+#: ../mail/em-popup.c:625 ../mail/em-popup.c:850
msgid "_Add to Address Book"
msgstr "_Add to Address Book"
-#: ../mail/em-subscribe-editor.c:583
+#: ../mail/em-subscribe-editor.c:600
msgid "This store does not support subscriptions, or they are not enabled."
msgstr "This store does not support subscriptions, or they are not enabled."
-#: ../mail/em-subscribe-editor.c:616
+#: ../mail/em-subscribe-editor.c:633
msgid "Subscribed"
msgstr "Subscribed"
-#: ../mail/em-subscribe-editor.c:620
+#: ../mail/em-subscribe-editor.c:637
msgid "Folder"
msgstr "Folder"
#. FIXME: This is just to get the shadow, is there a better way?
-#: ../mail/em-subscribe-editor.c:822
+#: ../mail/em-subscribe-editor.c:839
msgid "Please select a server."
msgstr "Please select a server."
-#: ../mail/em-subscribe-editor.c:843
+#: ../mail/em-subscribe-editor.c:860
msgid "No server has been selected"
msgstr "No server has been selected"
#. Check buttons
-#: ../mail/em-utils.c:120
-#: ../plugins/attachment-reminder/attachment-reminder.c:127
+#: ../mail/em-utils.c:122
+#: ../plugins/attachment-reminder/attachment-reminder.c:128
msgid "_Do not show this message again."
msgstr "_Do not show this message again."
-#: ../mail/em-utils.c:316
+#: ../mail/em-utils.c:318
msgid "Message Filters"
msgstr "Message Filters"
-#: ../mail/em-utils.c:369
+#: ../mail/em-utils.c:371
msgid "message"
msgstr "message"
-#: ../mail/em-utils.c:653
+#: ../mail/em-utils.c:655
msgid "Save Message..."
msgstr "Save Message..."
-#: ../mail/em-utils.c:703
+#: ../mail/em-utils.c:705
msgid "Add address"
msgstr "Add address"
#. Drop filename for messages from a mailbox
-#: ../mail/em-utils.c:1224
+#: ../mail/em-utils.c:1226
#, c-format
msgid "Messages from %s"
msgstr "Messages from %s"
@@ -12980,17 +13253,13 @@ msgid "\"Send and Receive Mail\" window width"
msgstr "\"Send and Receive Mail\" window width"
#: ../mail/evolution-mail.schemas.in.h:4
-msgid "Allows evolution to display text part of limited size"
-msgstr "Allows evolution to display text part of limited size"
+msgid "Allows Evolution to display text part of limited size"
+msgstr "Allows Evolution to display text part of limited size"
#: ../mail/evolution-mail.schemas.in.h:5
msgid "Always request read receipt"
msgstr "Always request read receipt"
-#: ../mail/evolution-mail.schemas.in.h:6
-msgid "Amount of time in seconds the error should be shown on the status bar."
-msgstr "Amount of time in seconds the error should be shown on the status bar."
-
#: ../mail/evolution-mail.schemas.in.h:7
msgid "Automatic emoticon recognition"
msgstr "Automatic emoticon recognition"
@@ -13162,8 +13431,8 @@ msgid "Directory for saving mail component files."
msgstr "Directory for saving mail component files."
#: ../mail/evolution-mail.schemas.in.h:41
-msgid "Disable or enable ellipsizing of folder names in folder tree"
-msgstr "Disable or enable ellipsizing of folder names in folder tree"
+msgid "Disable or enable ellipsizing of folder names in side bar"
+msgstr "Disable or enable ellipsizing of folder names in side bar"
#: ../mail/evolution-mail.schemas.in.h:42
msgid "Draw spelling error indicators on words as you type."
@@ -13233,19 +13502,33 @@ msgstr "Enable to render message text part of limited size."
msgid "Enable/disable caret mode"
msgstr "Enable/disable caret mode"
-#: ../mail/evolution-mail.schemas.in.h:56
+#: ../mail/evolution-mail.schemas.in.h:56 ../mail/mail-config.glade.h:81
+msgid "Encode file names in an Outlook/GMail way"
+msgstr "Encode file names in an Outlook/GMail way"
+
+#: ../mail/evolution-mail.schemas.in.h:57
+msgid ""
+"Encode file names in the mail headers same as Outlook or GMail does, to let "
+"them understand localized file names sent by Evolution, because they do not "
+"follow the RFC 2231, but uses incorrect RFC 2047 standard."
+msgstr ""
+"Encode file names in the mail headers the same as Outlook or GMail does, to "
+"let them understand localised file names sent by Evolution, because they do "
+"not follow the RFC 2231, but use the incorrect RFC 2047 standard."
+
+#: ../mail/evolution-mail.schemas.in.h:58
msgid "Height of the message-list pane"
msgstr "Height of the message-list pane"
-#: ../mail/evolution-mail.schemas.in.h:57
+#: ../mail/evolution-mail.schemas.in.h:59
msgid "Height of the message-list pane."
msgstr "Height of the message-list pane."
-#: ../mail/evolution-mail.schemas.in.h:58
+#: ../mail/evolution-mail.schemas.in.h:60
msgid "Hides the per-folder preview and removes the selection"
msgstr "Hides the per-folder preview and removes the selection"
-#: ../mail/evolution-mail.schemas.in.h:59
+#: ../mail/evolution-mail.schemas.in.h:61
msgid ""
"If a user tries to open 10 or more messages at one time, ask the user if "
"they really want to do it."
@@ -13253,7 +13536,7 @@ msgstr ""
"If a user tries to open 10 or more messages at one time, ask the user if "
"they really want to do it."
-#: ../mail/evolution-mail.schemas.in.h:60
+#: ../mail/evolution-mail.schemas.in.h:62
msgid ""
"If the \"Preview\" pane is on, then show it side-by-side rather than "
"vertically."
@@ -13261,17 +13544,18 @@ msgstr ""
"If the \"Preview\" pane is on, then show it side-by-side rather than "
"vertically."
-#: ../mail/evolution-mail.schemas.in.h:61
+#: ../mail/evolution-mail.schemas.in.h:63
msgid ""
-"If there isn't a builtin viewer for a particular mime-type inside Evolution, "
-"any mime-types appearing in this list which map to a bonobo-component viewer "
-"in GNOME's mime-type database may be used for displaying content."
+"If there isn't a builtin viewer for a particular MIME type inside Evolution, "
+"any MIME types appearing in this list which map to a Bonobo component viewer "
+"in GNOME's MIME type database may be used for displaying content."
msgstr ""
-"If there isn't a builtin viewer for a particular mime-type inside Evolution, "
-"any mime-types appearing in this list which map to a bonobo-component viewer "
-"in GNOME's mime-type database may be used for displaying content."
+"If there isn't a built-in viewer for a particular MIME type inside "
+"Evolution, any MIME types appearing in this list which map to a Bonobo "
+"component viewer in GNOME's MIME type database may be used for displaying "
+"content."
-#: ../mail/evolution-mail.schemas.in.h:62
+#: ../mail/evolution-mail.schemas.in.h:64
msgid ""
"Initial height of the \"Send and Receive Mail\" window. The value updates as "
"the user resizes the window vertically."
@@ -13279,7 +13563,7 @@ msgstr ""
"Initial height of the \"Send and Receive Mail\" window. The value updates as "
"the user resizes the window vertically."
-#: ../mail/evolution-mail.schemas.in.h:63
+#: ../mail/evolution-mail.schemas.in.h:65
msgid ""
"Initial maximize state of the \"Send and Receive Mail\" window. The value "
"updates when the user maximizes or unmaximizes the window. Note, this "
@@ -13293,7 +13577,7 @@ msgstr ""
"\" window cannot be maximised. This key exists only as an implementation "
"detail."
-#: ../mail/evolution-mail.schemas.in.h:64
+#: ../mail/evolution-mail.schemas.in.h:66
msgid ""
"Initial width of the \"Send and Receive Mail\" window. The value updates as "
"the user resizes the window horizontally."
@@ -13301,11 +13585,11 @@ msgstr ""
"Initial width of the \"Send and Receive Mail\" window. The value updates as "
"the user resizes the window horizontally."
-#: ../mail/evolution-mail.schemas.in.h:65
+#: ../mail/evolution-mail.schemas.in.h:67
msgid "It disables/enables the prompt while marking multiple messages."
msgstr "Enable or disable the prompt while marking multiple messages."
-#: ../mail/evolution-mail.schemas.in.h:66
+#: ../mail/evolution-mail.schemas.in.h:68
msgid ""
"It disables/enables the repeated prompts to ask if offline sync is required "
"before going into offline mode."
@@ -13313,7 +13597,7 @@ msgstr ""
"It disables/enables the repeated prompts to ask if offline synchronisation "
"is required before going into offline mode."
-#: ../mail/evolution-mail.schemas.in.h:67
+#: ../mail/evolution-mail.schemas.in.h:69
msgid ""
"It disables/enables the repeated prompts to warn that deleting messages from "
"a search folder permanently deletes the message, not simply removing it from "
@@ -13323,31 +13607,31 @@ msgstr ""
"a search folder permanently deletes the message, not simply removing it from "
"the search results."
-#: ../mail/evolution-mail.schemas.in.h:68
+#: ../mail/evolution-mail.schemas.in.h:70
msgid "Last time empty junk was run"
msgstr "Last time empty junk was run"
-#: ../mail/evolution-mail.schemas.in.h:69
+#: ../mail/evolution-mail.schemas.in.h:71
msgid "Last time empty trash was run"
msgstr "Last time empty wastebasket was run"
-#: ../mail/evolution-mail.schemas.in.h:70
-msgid "Level beyond which the message should be logged."
-msgstr "Level beyond which the message should be logged."
-
-#: ../mail/evolution-mail.schemas.in.h:71
+#: ../mail/evolution-mail.schemas.in.h:73
msgid "List of Labels and their associated colors"
msgstr "List of Labels and their associated colours"
-#: ../mail/evolution-mail.schemas.in.h:72
+#: ../mail/evolution-mail.schemas.in.h:74
+msgid "List of MIME types to check for Bonobo component viewers"
+msgstr "List of MIME types to check for Bonobo component viewers"
+
+#: ../mail/evolution-mail.schemas.in.h:75
msgid "List of accepted licenses"
msgstr "List of accepted licences"
-#: ../mail/evolution-mail.schemas.in.h:73
+#: ../mail/evolution-mail.schemas.in.h:76
msgid "List of accounts"
msgstr "List of accounts"
-#: ../mail/evolution-mail.schemas.in.h:74
+#: ../mail/evolution-mail.schemas.in.h:77
msgid ""
"List of accounts known to the mail component of Evolution. The list contains "
"strings naming subdirectories relative to /apps/evolution/mail/accounts."
@@ -13355,15 +13639,15 @@ msgstr ""
"List of accounts known to the mail component of Evolution. The list contains "
"strings naming subdirectories relative to /apps/evolution/mail/accounts."
-#: ../mail/evolution-mail.schemas.in.h:75
+#: ../mail/evolution-mail.schemas.in.h:78
msgid "List of custom headers and whether they are enabled."
msgstr "List of custom headers and whether they are enabled."
-#: ../mail/evolution-mail.schemas.in.h:76
+#: ../mail/evolution-mail.schemas.in.h:79
msgid "List of dictionary language codes used for spell checking."
msgstr "List of dictionary language codes used for spell checking."
-#: ../mail/evolution-mail.schemas.in.h:77
+#: ../mail/evolution-mail.schemas.in.h:80
msgid ""
"List of labels known to the mail component of Evolution. The list contains "
"strings containing name:color where color uses the HTML hex encoding."
@@ -13371,21 +13655,17 @@ msgstr ""
"List of labels known to the mail component of Evolution. The list contains "
"strings containing name:colour where colour uses the HTML hex encoding."
-#: ../mail/evolution-mail.schemas.in.h:78
-msgid "List of mime types to check for bonobo component viewers"
-msgstr "List of mime types to check for bonobo component viewers"
-
-#: ../mail/evolution-mail.schemas.in.h:79
+#: ../mail/evolution-mail.schemas.in.h:81
msgid "List of protocol names whose license has been accepted."
msgstr "List of protocol names whose licence has been accepted."
-#: ../mail/evolution-mail.schemas.in.h:80
-msgid "Load images for HTML messages over http"
+#: ../mail/evolution-mail.schemas.in.h:82
+msgid "Load images for HTML messages over HTTP"
msgstr "Load images for HTML messages over HTTP"
-#: ../mail/evolution-mail.schemas.in.h:81
+#: ../mail/evolution-mail.schemas.in.h:83
msgid ""
-"Load images for HTML messages over http(s). Possible values are: \"0\" - "
+"Load images for HTML messages over HTTP(S). Possible values are: \"0\" - "
"Never load images off the net. \"1\" - Load images in messages from "
"contacts. \"2\" - Always load images off the net."
msgstr ""
@@ -13393,105 +13673,105 @@ msgstr ""
"Never load images off the net. \"1\" - Load images in messages from "
"contacts. \"2\" - Always load images off the net."
-#: ../mail/evolution-mail.schemas.in.h:82
+#: ../mail/evolution-mail.schemas.in.h:84
msgid "Log filter actions"
msgstr "Log filter actions"
-#: ../mail/evolution-mail.schemas.in.h:83
+#: ../mail/evolution-mail.schemas.in.h:85
msgid "Log filter actions to the specified log file."
msgstr "Log filter actions to the specified log file."
-#: ../mail/evolution-mail.schemas.in.h:84
+#: ../mail/evolution-mail.schemas.in.h:86
msgid "Logfile to log filter actions"
msgstr "Logfile to log filter actions"
-#: ../mail/evolution-mail.schemas.in.h:85
+#: ../mail/evolution-mail.schemas.in.h:87
msgid "Logfile to log filter actions."
msgstr "Logfile to log filter actions."
-#: ../mail/evolution-mail.schemas.in.h:86
+#: ../mail/evolution-mail.schemas.in.h:88
msgid "Mark as Seen after specified timeout"
msgstr "Mark as Seen after specified timeout"
-#: ../mail/evolution-mail.schemas.in.h:87
+#: ../mail/evolution-mail.schemas.in.h:89
msgid "Mark as Seen after specified timeout."
msgstr "Mark as Seen after specified timeout."
-#: ../mail/evolution-mail.schemas.in.h:88
+#: ../mail/evolution-mail.schemas.in.h:90
msgid "Mark citations in the message \"Preview\""
msgstr "Mark citations in the message \"Preview\""
-#: ../mail/evolution-mail.schemas.in.h:89
+#: ../mail/evolution-mail.schemas.in.h:91
msgid "Mark citations in the message \"Preview\"."
msgstr "Mark citations in the message \"Preview\"."
-#: ../mail/evolution-mail.schemas.in.h:90
+#: ../mail/evolution-mail.schemas.in.h:92
msgid "Message Window default height"
msgstr "Message Window default height"
-#: ../mail/evolution-mail.schemas.in.h:91
+#: ../mail/evolution-mail.schemas.in.h:93
msgid "Message Window default width"
msgstr "Message Window default width"
-#: ../mail/evolution-mail.schemas.in.h:92
+#: ../mail/evolution-mail.schemas.in.h:94
msgid "Message-display style (\"normal\", \"full headers\", \"source\")"
msgstr "Message-display style (\"normal\", \"full headers\", \"source\")"
-#: ../mail/evolution-mail.schemas.in.h:93
+#: ../mail/evolution-mail.schemas.in.h:95
msgid "Minimum days between emptying the junk on exit"
msgstr "Minimum days between emptying the junk on exit"
-#: ../mail/evolution-mail.schemas.in.h:94
+#: ../mail/evolution-mail.schemas.in.h:96
msgid "Minimum days between emptying the trash on exit"
msgstr "Minimum number of days between emptying the wastebasket on exit"
-#: ../mail/evolution-mail.schemas.in.h:95
+#: ../mail/evolution-mail.schemas.in.h:97
msgid "Minimum time between emptying the junk on exit, in days."
msgstr "Minimum time between emptying the junk on exit, in days."
-#: ../mail/evolution-mail.schemas.in.h:96
+#: ../mail/evolution-mail.schemas.in.h:98
msgid "Minimum time between emptying the trash on exit, in days."
msgstr "Minimum time between emptying the wastebasket on exit, in days."
-#: ../mail/evolution-mail.schemas.in.h:97
+#: ../mail/evolution-mail.schemas.in.h:99
msgid "Number of addresses to display in TO/CC/BCC"
msgstr "Number of addresses to display in TO/CC/BCC"
-#: ../mail/evolution-mail.schemas.in.h:98
+#: ../mail/evolution-mail.schemas.in.h:100
msgid "Prompt on empty subject"
msgstr "Prompt on empty subject"
-#: ../mail/evolution-mail.schemas.in.h:99
+#: ../mail/evolution-mail.schemas.in.h:101
msgid "Prompt the user when he or she tries to expunge a folder."
msgstr "Prompt the user when he or she tries to expunge a folder."
-#: ../mail/evolution-mail.schemas.in.h:100
+#: ../mail/evolution-mail.schemas.in.h:102
msgid ""
"Prompt the user when he or she tries to send a message without a Subject."
msgstr ""
"Prompt the user when he or she tries to send a message without a Subject."
-#: ../mail/evolution-mail.schemas.in.h:101
+#: ../mail/evolution-mail.schemas.in.h:103
msgid "Prompt to check if the user wants to go offline immediately"
msgstr "Prompt to check if the user wants to go offline immediately"
-#: ../mail/evolution-mail.schemas.in.h:102
+#: ../mail/evolution-mail.schemas.in.h:104
msgid "Prompt when deleting messages in search folder"
msgstr "Prompt when deleting messages in search folder"
-#: ../mail/evolution-mail.schemas.in.h:103
+#: ../mail/evolution-mail.schemas.in.h:105
msgid "Prompt when user expunges"
msgstr "Prompt when user expunges"
-#: ../mail/evolution-mail.schemas.in.h:104
+#: ../mail/evolution-mail.schemas.in.h:106
msgid "Prompt when user only fills Bcc"
msgstr "Prompt when user only fills Bcc"
-#: ../mail/evolution-mail.schemas.in.h:105
+#: ../mail/evolution-mail.schemas.in.h:107
msgid "Prompt when user tries to open 10 or more messages at once"
msgstr "Prompt when user tries to open 10 or more messages at once"
-#: ../mail/evolution-mail.schemas.in.h:106
+#: ../mail/evolution-mail.schemas.in.h:108
msgid ""
"Prompt when user tries to send HTML mail to recipients that may not want to "
"receive HTML mail."
@@ -13499,75 +13779,75 @@ msgstr ""
"Prompt when user tries to send HTML mail to recipients that may not want to "
"receive HTML mail."
-#: ../mail/evolution-mail.schemas.in.h:107
+#: ../mail/evolution-mail.schemas.in.h:109
msgid "Prompt when user tries to send a message with no To or Cc recipients."
msgstr "Prompt when user tries to send a message with no To or Cc recipients."
-#: ../mail/evolution-mail.schemas.in.h:108
+#: ../mail/evolution-mail.schemas.in.h:110
msgid "Prompt when user tries to send unwanted HTML"
msgstr "Prompt when user tries to send unwanted HTML"
-#: ../mail/evolution-mail.schemas.in.h:109
+#: ../mail/evolution-mail.schemas.in.h:111
msgid "Prompt while marking multiple messages"
msgstr "Prompt while marking multiple messages"
-#: ../mail/evolution-mail.schemas.in.h:110
+#: ../mail/evolution-mail.schemas.in.h:112
msgid "Recognize emoticons in text and replace them with images."
msgstr "Recognise emoticons in text and replace them with images."
-#: ../mail/evolution-mail.schemas.in.h:111
+#: ../mail/evolution-mail.schemas.in.h:113
msgid "Recognize links in text and replace them."
msgstr "Recognise links in text and replace them."
-#: ../mail/evolution-mail.schemas.in.h:112
+#: ../mail/evolution-mail.schemas.in.h:114
msgid "Run junk test on incoming mail."
msgstr "Run junk test on incoming mail."
-#: ../mail/evolution-mail.schemas.in.h:113
+#: ../mail/evolution-mail.schemas.in.h:115
msgid "Save directory"
msgstr "Save directory"
-#: ../mail/evolution-mail.schemas.in.h:114
+#: ../mail/evolution-mail.schemas.in.h:116
msgid "Search for the sender photo in local address books"
msgstr "Search for the sender photo in local address books"
-#: ../mail/evolution-mail.schemas.in.h:115
+#: ../mail/evolution-mail.schemas.in.h:117
msgid "Send HTML mail by default"
msgstr "Send HTML mail by default"
-#: ../mail/evolution-mail.schemas.in.h:116
+#: ../mail/evolution-mail.schemas.in.h:118
msgid "Send HTML mail by default."
msgstr "Send HTML mail by default."
-#: ../mail/evolution-mail.schemas.in.h:117
+#: ../mail/evolution-mail.schemas.in.h:119
msgid "Sender email-address column in the message list"
msgstr "Sender e-mail address column in the message list"
-#: ../mail/evolution-mail.schemas.in.h:118
+#: ../mail/evolution-mail.schemas.in.h:120
msgid "Server synchronization interval"
msgstr "Server synchronisation interval"
-#: ../mail/evolution-mail.schemas.in.h:119
+#: ../mail/evolution-mail.schemas.in.h:121
msgid "Show Animations"
msgstr "Show Animations"
-#: ../mail/evolution-mail.schemas.in.h:120
+#: ../mail/evolution-mail.schemas.in.h:122
msgid "Show animated images as animations."
msgstr "Show animated images as animations."
-#: ../mail/evolution-mail.schemas.in.h:121
+#: ../mail/evolution-mail.schemas.in.h:123
msgid "Show deleted messages (with a strike-through) in the message-list."
msgstr "Show deleted messages (with a strike-through) in the message-list."
-#: ../mail/evolution-mail.schemas.in.h:122
+#: ../mail/evolution-mail.schemas.in.h:124
msgid "Show deleted messages in the message-list"
msgstr "Show deleted messages in the message-list"
-#: ../mail/evolution-mail.schemas.in.h:123
+#: ../mail/evolution-mail.schemas.in.h:125
msgid "Show photo of the sender"
msgstr "Show photo of the sender"
-#: ../mail/evolution-mail.schemas.in.h:126
+#: ../mail/evolution-mail.schemas.in.h:128
msgid ""
"Show the email-address of the sender in a separate column in the message "
"list."
@@ -13575,59 +13855,59 @@ msgstr ""
"Show the e-mail address of the sender in a separate column in the message "
"list."
-#: ../mail/evolution-mail.schemas.in.h:127
+#: ../mail/evolution-mail.schemas.in.h:129
msgid "Show the photo of the sender in the message reading pane."
msgstr "Show the photo of the sender in the message reading pane."
-#: ../mail/evolution-mail.schemas.in.h:128
+#: ../mail/evolution-mail.schemas.in.h:130
msgid "Spell check inline"
msgstr "Spell check inline"
-#: ../mail/evolution-mail.schemas.in.h:129
+#: ../mail/evolution-mail.schemas.in.h:131
msgid "Spell checking color"
msgstr "Spell checking colour"
-#: ../mail/evolution-mail.schemas.in.h:130
+#: ../mail/evolution-mail.schemas.in.h:132
msgid "Spell checking languages"
msgstr "Spell checking languages"
-#: ../mail/evolution-mail.schemas.in.h:131
+#: ../mail/evolution-mail.schemas.in.h:133
msgid "Subscribe dialog default height"
msgstr "Subscribe dialogue default height"
-#: ../mail/evolution-mail.schemas.in.h:132
+#: ../mail/evolution-mail.schemas.in.h:134
msgid "Subscribe dialog default width"
msgstr "Subscribe dialogue default width"
-#: ../mail/evolution-mail.schemas.in.h:133
+#: ../mail/evolution-mail.schemas.in.h:135
msgid "Terminal font"
msgstr "Terminal font"
-#: ../mail/evolution-mail.schemas.in.h:134
+#: ../mail/evolution-mail.schemas.in.h:136
msgid "Text message part limit"
msgstr "Text message part limit"
-#: ../mail/evolution-mail.schemas.in.h:135
+#: ../mail/evolution-mail.schemas.in.h:137
msgid "The default plugin for Junk hook"
msgstr "The default plugin for Junk hook"
-#: ../mail/evolution-mail.schemas.in.h:136
+#: ../mail/evolution-mail.schemas.in.h:138
msgid "The last time empty junk was run, in days since the epoch."
msgstr "The last time empty junk was run, in days since the epoch."
-#: ../mail/evolution-mail.schemas.in.h:137
+#: ../mail/evolution-mail.schemas.in.h:139
msgid "The last time empty trash was run, in days since the epoch."
msgstr "The last time empty wastebasket was run, in days since the epoch."
-#: ../mail/evolution-mail.schemas.in.h:138
+#: ../mail/evolution-mail.schemas.in.h:140
msgid "The terminal font for mail display."
msgstr "The terminal font for mail display."
-#: ../mail/evolution-mail.schemas.in.h:139
+#: ../mail/evolution-mail.schemas.in.h:141
msgid "The variable width font for mail display."
msgstr "The variable width font for mail display."
-#: ../mail/evolution-mail.schemas.in.h:140
+#: ../mail/evolution-mail.schemas.in.h:142
msgid ""
"This can have three possible values. \"0\" for errors. \"1\" for warnings. "
"\"2\" for debug messages."
@@ -13635,15 +13915,15 @@ msgstr ""
"This can have three possible values. \"0\" for errors. \"1\" for warnings. "
"\"2\" for debug messages."
-#: ../mail/evolution-mail.schemas.in.h:141
+#: ../mail/evolution-mail.schemas.in.h:143
msgid ""
"This decides the max size of the text part that can be formatted under "
-"evolution. The default is 4MB / 4096 KB and is specified interms of KB."
+"Evolution. The default is 4MB / 4096 KB and is specified in terms of KB."
msgstr ""
-"This decides the maximum size of the text part that can be formatted under "
+"This decides the max size of the text part that can be formatted under "
"Evolution. The default is 4MB / 4096 KB and is specified in terms of KB."
-#: ../mail/evolution-mail.schemas.in.h:142
+#: ../mail/evolution-mail.schemas.in.h:144
msgid ""
"This is the default junk plugin, even though there are multiple plugins "
"enabled. If the default listed plugin is disabled, then it won't fall back "
@@ -13653,7 +13933,7 @@ msgstr ""
"enabled. If the default listed plugin is disabled, then it won't fall back "
"to the other available plugins."
-#: ../mail/evolution-mail.schemas.in.h:143
+#: ../mail/evolution-mail.schemas.in.h:145
msgid ""
"This key is read only once and reset to \"false\" after read. This unselects "
"the mail in the list and removes the preview for that folder."
@@ -13661,7 +13941,7 @@ msgstr ""
"This key is read only once and reset to \"false\" after read. This unselects "
"the mail in the list and removes the preview for that folder."
-#: ../mail/evolution-mail.schemas.in.h:144
+#: ../mail/evolution-mail.schemas.in.h:146
msgid ""
"This key should contain a list of XML structures specifying custom headers, "
"and whether they are to be displayed. The format of the XML structure is &lt;"
@@ -13673,7 +13953,7 @@ msgstr ""
"header enabled&gt; - set enabled if the header is to be displayed in the "
"mail view."
-#: ../mail/evolution-mail.schemas.in.h:145
+#: ../mail/evolution-mail.schemas.in.h:147
msgid ""
"This option is related to the key lookup_addressbook and is used to "
"determine whether to look up addresses in local address book only to exclude "
@@ -13683,11 +13963,11 @@ msgstr ""
"determine whether to look up addresses in local address book only to exclude "
"mail sent by known contacts from junk filtering."
-#: ../mail/evolution-mail.schemas.in.h:146
+#: ../mail/evolution-mail.schemas.in.h:148
msgid "This option would help in improving the speed of fetching."
msgstr "This option would help in improving the speed of fetching."
-#: ../mail/evolution-mail.schemas.in.h:147
+#: ../mail/evolution-mail.schemas.in.h:149
msgid ""
"This sets the number of addresses to show in default message list view, "
"beyond which a '...' is shown."
@@ -13695,7 +13975,7 @@ msgstr ""
"This sets the number of addresses to show in default message list view, "
"beyond which a '...' is shown."
-#: ../mail/evolution-mail.schemas.in.h:148
+#: ../mail/evolution-mail.schemas.in.h:150
msgid ""
"This setting specifies whether the threads should be in expanded or "
"collapsed state by default. Evolution requires a restart."
@@ -13703,7 +13983,7 @@ msgstr ""
"This setting specifies whether the threads should be in expanded or "
"collapsed state by default. Evolution requires a restart."
-#: ../mail/evolution-mail.schemas.in.h:149
+#: ../mail/evolution-mail.schemas.in.h:151
msgid ""
"This setting specifies whether the threads should be sorted based on latest "
"message in each thread, rather than by message's date. Evolution requires a "
@@ -13713,115 +13993,116 @@ msgstr ""
"message in each thread, rather than by message's date. Evolution requires a "
"restart."
-#: ../mail/evolution-mail.schemas.in.h:150
+#: ../mail/evolution-mail.schemas.in.h:152
msgid "Thread the message list."
msgstr "Thread the message list."
-#: ../mail/evolution-mail.schemas.in.h:151
+#: ../mail/evolution-mail.schemas.in.h:153
msgid "Thread the message-list"
msgstr "Thread the message-list"
-#: ../mail/evolution-mail.schemas.in.h:152
+#: ../mail/evolution-mail.schemas.in.h:154
msgid "Thread the message-list based on Subject"
msgstr "Thread the message-list based on Subject"
-#: ../mail/evolution-mail.schemas.in.h:153
+#: ../mail/evolution-mail.schemas.in.h:155
msgid "Timeout for marking message as seen"
msgstr "Timeout for marking message as seen"
-#: ../mail/evolution-mail.schemas.in.h:154
+#: ../mail/evolution-mail.schemas.in.h:156
msgid "Timeout for marking message as seen."
msgstr "Timeout for marking message as seen."
-#: ../mail/evolution-mail.schemas.in.h:155
+#: ../mail/evolution-mail.schemas.in.h:157
msgid "UID string of the default account."
msgstr "UID string of the default account."
-#: ../mail/evolution-mail.schemas.in.h:156
+#: ../mail/evolution-mail.schemas.in.h:158
msgid "Underline color for misspelled words when using inline spelling."
msgstr "Underline colour for misspelt words when using inline spelling."
-#: ../mail/evolution-mail.schemas.in.h:157
+#: ../mail/evolution-mail.schemas.in.h:159
msgid "Use SpamAssassin daemon and client"
msgstr "Use SpamAssassin daemon and client"
-#: ../mail/evolution-mail.schemas.in.h:158
+#: ../mail/evolution-mail.schemas.in.h:160
msgid "Use SpamAssassin daemon and client (spamc/spamd)."
msgstr "Use SpamAssassin daemon and client (spamc/spamd)."
-#: ../mail/evolution-mail.schemas.in.h:159
+#: ../mail/evolution-mail.schemas.in.h:161
msgid "Use custom fonts"
msgstr "Use custom fonts"
-#: ../mail/evolution-mail.schemas.in.h:160
+#: ../mail/evolution-mail.schemas.in.h:162
msgid "Use custom fonts for displaying mail."
msgstr "Use custom fonts for displaying mail."
-#: ../mail/evolution-mail.schemas.in.h:161
+#: ../mail/evolution-mail.schemas.in.h:163
msgid "Use only local spam tests."
msgstr "Use only local spam tests."
-#: ../mail/evolution-mail.schemas.in.h:162
+#: ../mail/evolution-mail.schemas.in.h:164
msgid "Use only the local spam tests (no DNS)."
msgstr "Use only the local spam tests (no DNS)."
-#: ../mail/evolution-mail.schemas.in.h:163
+#: ../mail/evolution-mail.schemas.in.h:165
msgid "Use side-by-side or wide layout"
msgstr "Use side-by-side or wide layout"
-#: ../mail/evolution-mail.schemas.in.h:164
+#: ../mail/evolution-mail.schemas.in.h:166
msgid "Variable width font"
msgstr "Variable width font"
-#: ../mail/evolution-mail.schemas.in.h:165
+#: ../mail/evolution-mail.schemas.in.h:167
msgid "View/Bcc menu item is checked"
msgstr "View/Bcc menu item is checked"
-#: ../mail/evolution-mail.schemas.in.h:166
+#: ../mail/evolution-mail.schemas.in.h:168
msgid "View/Bcc menu item is checked."
msgstr "View/Bcc menu item is checked."
-#: ../mail/evolution-mail.schemas.in.h:167
+#: ../mail/evolution-mail.schemas.in.h:169
msgid "View/Cc menu item is checked"
msgstr "View/Cc menu item is checked"
-#: ../mail/evolution-mail.schemas.in.h:168
+#: ../mail/evolution-mail.schemas.in.h:170
msgid "View/Cc menu item is checked."
msgstr "View/Cc menu item is checked."
-#: ../mail/evolution-mail.schemas.in.h:169
+#: ../mail/evolution-mail.schemas.in.h:171
msgid "View/From menu item is checked"
msgstr "View/From menu item is checked"
-#: ../mail/evolution-mail.schemas.in.h:170
+#: ../mail/evolution-mail.schemas.in.h:172
msgid "View/From menu item is checked."
msgstr "View/From menu item is checked."
-#: ../mail/evolution-mail.schemas.in.h:171
+#: ../mail/evolution-mail.schemas.in.h:173
msgid "View/PostTo menu item is checked"
msgstr "View/PostTo menu item is checked"
-#: ../mail/evolution-mail.schemas.in.h:172
+#: ../mail/evolution-mail.schemas.in.h:174
msgid "View/PostTo menu item is checked."
msgstr "View/PostTo menu item is checked."
-#: ../mail/evolution-mail.schemas.in.h:173
+#: ../mail/evolution-mail.schemas.in.h:175
msgid "View/ReplyTo menu item is checked"
msgstr "View/ReplyTo menu item is checked"
-#: ../mail/evolution-mail.schemas.in.h:174
+#: ../mail/evolution-mail.schemas.in.h:176
msgid "View/ReplyTo menu item is checked."
msgstr "View/ReplyTo menu item is checked."
-#: ../mail/evolution-mail.schemas.in.h:175
+#: ../mail/evolution-mail.schemas.in.h:177
msgid "Whether a read receipt request gets added to every message by default."
msgstr "Whether a read receipt request gets added to every message by default."
-#: ../mail/evolution-mail.schemas.in.h:176
-msgid "Whether disable ellipsizing feature of folder names in folder tree."
-msgstr "Whether disable ellipsizing feature of folder names in folder tree."
+#: ../mail/evolution-mail.schemas.in.h:178
+msgid "Whether disable ellipsizing feature of folder names in side bar."
+msgstr ""
+"Whether to disable ellipsizing feature of folder names in the side bar."
-#: ../mail/evolution-mail.schemas.in.h:177
+#: ../mail/evolution-mail.schemas.in.h:179
msgid ""
"Whether or not to fall back on threading by subjects when the messages do "
"not contain In-Reply-To or References headers."
@@ -13829,15 +14110,15 @@ msgstr ""
"Whether or not to fall back on threading by subjects when the messages do "
"not contain In-Reply-To or References headers."
-#: ../mail/evolution-mail.schemas.in.h:178
+#: ../mail/evolution-mail.schemas.in.h:180
msgid "Whether sort threads based on latest message in that thread"
msgstr "Whether sort threads based on latest message in that thread"
-#: ../mail/evolution-mail.schemas.in.h:179
+#: ../mail/evolution-mail.schemas.in.h:181
msgid "Width of the message-list pane"
msgstr "Width of the message-list pane"
-#: ../mail/evolution-mail.schemas.in.h:180
+#: ../mail/evolution-mail.schemas.in.h:182
msgid "Width of the message-list pane."
msgstr "Width of the message-list pane."
@@ -13853,78 +14134,77 @@ msgstr "Evolution Elm importer"
msgid "Import mail from Elm."
msgstr "Import mail from Elm."
-#: ../mail/importers/evolution-mbox-importer.c:80
+#: ../mail/importers/evolution-mbox-importer.c:79
+#: ../plugins/pst-import/pst-importer.c:312
msgid "Destination folder:"
msgstr "Destination folder:"
-#: ../mail/importers/evolution-mbox-importer.c:83
+#: ../mail/importers/evolution-mbox-importer.c:82
+#: ../plugins/pst-import/pst-importer.c:305
msgid "Select folder to import into"
msgstr "Select folder to import into"
-#: ../mail/importers/evolution-mbox-importer.c:220
+#: ../mail/importers/evolution-mbox-importer.c:219
msgid "Berkeley Mailbox (mbox)"
msgstr "Berkeley Mailbox (mbox)"
-#: ../mail/importers/evolution-mbox-importer.c:221
+#: ../mail/importers/evolution-mbox-importer.c:220
msgid "Importer Berkeley Mailbox format folders"
msgstr "Importer Berkeley Mailbox format folders"
-#: ../mail/importers/mail-importer.c:148
+#: ../mail/importers/mail-importer.c:147
msgid "Importing mailbox"
msgstr "Importing mailbox"
-#: ../mail/importers/mail-importer.c:232 ../shell/e-shell-importer.c:512
+#. Destination folder, was set in our widget
+#: ../mail/importers/mail-importer.c:231
+#: ../plugins/pst-import/pst-importer.c:457
+#: ../plugins/pst-import/pst-importer.c:563 ../shell/e-shell-importer.c:512
#, c-format
msgid "Importing `%s'"
msgstr "Importing `%s'"
-#: ../mail/importers/mail-importer.c:372
+#: ../mail/importers/mail-importer.c:371
#, c-format
msgid "Scanning %s"
msgstr "Scanning %s"
-#: ../mail/importers/pine-importer.c:227
+#: ../mail/importers/pine-importer.c:225
msgid "Importing Pine data"
msgstr "Importing Pine data"
-#: ../mail/importers/pine-importer.c:426
+#: ../mail/importers/pine-importer.c:424
msgid "Evolution Pine importer"
msgstr "Evolution Pine importer"
-#: ../mail/importers/pine-importer.c:427
+#: ../mail/importers/pine-importer.c:425
msgid "Import mail from Pine."
msgstr "Import mail from Pine."
-#: ../mail/mail-autofilter.c:75
+#: ../mail/mail-autofilter.c:72
#, c-format
msgid "Mail to %s"
msgstr "Mail to %s"
-#: ../mail/mail-autofilter.c:239 ../mail/mail-autofilter.c:278
+#: ../mail/mail-autofilter.c:236 ../mail/mail-autofilter.c:275
#, c-format
msgid "Mail from %s"
msgstr "Mail from %s"
-#: ../mail/mail-autofilter.c:262
+#: ../mail/mail-autofilter.c:259
#, c-format
msgid "Subject is %s"
msgstr "Subject is %s"
-#: ../mail/mail-autofilter.c:297
+#: ../mail/mail-autofilter.c:294
#, c-format
msgid "%s mailing list"
msgstr "%s mailing list"
-#: ../mail/mail-autofilter.c:368
+#: ../mail/mail-autofilter.c:365
msgid "Add Filter Rule"
msgstr "Add Filter Rule"
-#: ../mail/mail-component.c:164 ../plugins/templates/templates.c:521
-#: ../plugins/templates/templates.c:691 ../plugins/templates/templates.c:726
-#: ../plugins/templates/org-gnome-templates.eplug.xml.h:2
-msgid "Templates"
-msgstr "Templates"
-
#: ../mail/mail-component.c:550
#, c-format
msgid "%d selected, "
@@ -13981,92 +14261,36 @@ msgid_plural "%d total"
msgstr[0] "%d total"
msgstr[1] "%d total"
-#: ../mail/mail-component.c:923
+#: ../mail/mail-component.c:927
msgid "New Mail Message"
msgstr "New Mail Message"
-#: ../mail/mail-component.c:924
+#: ../mail/mail-component.c:928
msgctxt "New"
msgid "_Mail Message"
msgstr "_Mail Message"
-#: ../mail/mail-component.c:925
+#: ../mail/mail-component.c:929
msgid "Compose a new mail message"
msgstr "Compose a new mail message"
-#: ../mail/mail-component.c:931
+#: ../mail/mail-component.c:935
msgid "New Mail Folder"
msgstr "New Mail Folder"
-#: ../mail/mail-component.c:932
+#: ../mail/mail-component.c:936
msgctxt "New"
msgid "Mail _Folder"
msgstr "Mail _Folder"
-#: ../mail/mail-component.c:933
+#: ../mail/mail-component.c:937
msgid "Create a new mail folder"
msgstr "Create a new mail folder"
-#: ../mail/mail-component.c:1080
+#: ../mail/mail-component.c:1084
msgid "Failed upgrading Mail settings or folders."
msgstr "Failed upgrading Mail settings or folders."
-#: ../mail/mail-component.c:1596
-msgid "Error"
-msgstr "Error"
-
-#: ../mail/mail-component.c:1596
-msgid "Errors"
-msgstr "Errors"
-
-#: ../mail/mail-component.c:1597
-msgid "Warnings and Errors"
-msgstr "Warnings and Errors"
-
-#: ../mail/mail-component.c:1598
-msgid "Debug"
-msgstr "Debug"
-
-#: ../mail/mail-component.c:1598
-msgid "Error, Warnings and Debug messages"
-msgstr "Error, Warnings and Debug messages"
-
-#: ../mail/mail-component.c:1725
-msgid "Debug Logs"
-msgstr "Debug Logs"
-
-#: ../mail/mail-component.c:1739
-msgid "Show _errors in the status bar for"
-msgstr "Show _errors in the status bar for"
-
-#. Translators: This is the second part of the sentence
-#. * "Show _errors in the status bar for" - XXX - "second(s)."
-#: ../mail/mail-component.c:1755
-msgid "second(s)."
-msgstr "second(s)."
-
-#: ../mail/mail-component.c:1761
-msgid "Log Messages:"
-msgstr "Log Messages:"
-
-#: ../mail/mail-component.c:1802
-msgid "Log Level"
-msgstr "Log Level"
-
-#: ../mail/mail-component.c:1811 ../widgets/misc/e-dateedit.c:395
-msgid "Time"
-msgstr "Time"
-
-#: ../mail/mail-component.c:1821 ../mail/message-list.c:2454
-#: ../mail/message-list.etspec.h:10
-msgid "Messages"
-msgstr "Messages"
-
-#: ../mail/mail-component.c:1830 ../ui/evolution-mail-messagedisplay.xml.h:2
-#: ../ui/evolution.xml.h:4
-msgid "Close this window"
-msgstr "Close this window"
-
#: ../mail/mail-config.glade.h:1
msgid " Ch_eck for Supported Types "
msgstr " Ch_eck for Supported Types "
@@ -14345,104 +14569,104 @@ msgid "Empty trash folders on e_xit"
msgstr "Empty wastebasket folders on e_xit"
#: ../mail/mail-config.glade.h:79
-msgid "Enable Magic S_pacebar "
-msgstr "Enable Magic S_pacebar "
+msgid "Enable Magic S_pacebar"
+msgstr "Enable Magic S_pacebar"
#: ../mail/mail-config.glade.h:80
msgid "Enable Sea_rch Folders"
msgstr "Enable Sea_rch Folders"
-#: ../mail/mail-config.glade.h:81
+#: ../mail/mail-config.glade.h:82
msgid "Encry_ption certificate:"
msgstr "Encry_ption certificate:"
-#: ../mail/mail-config.glade.h:82
+#: ../mail/mail-config.glade.h:83
msgid "Encrypt out_going messages (by default)"
msgstr "Encrypt out_going messages (by default)"
-#: ../mail/mail-config.glade.h:84
+#: ../mail/mail-config.glade.h:85
msgid "Fi_xed-width:"
msgstr "Fi_xed-width:"
-#: ../mail/mail-config.glade.h:85
+#: ../mail/mail-config.glade.h:86
msgid "Fix_ed width Font:"
msgstr "Fix_ed width Font:"
-#: ../mail/mail-config.glade.h:86
+#: ../mail/mail-config.glade.h:87
msgid "Font Properties"
msgstr "Font Properties"
-#: ../mail/mail-config.glade.h:87
+#: ../mail/mail-config.glade.h:88
msgid "Format messages in _HTML"
msgstr "Format messages in _HTML"
-#: ../mail/mail-config.glade.h:88
+#: ../mail/mail-config.glade.h:89
msgid "Full Nam_e:"
msgstr "Full Nam_e:"
-#: ../mail/mail-config.glade.h:90
+#: ../mail/mail-config.glade.h:91
msgid "HTML Messages"
msgstr "HTML Messages"
-#: ../mail/mail-config.glade.h:91
+#: ../mail/mail-config.glade.h:92
msgid "H_TTP Proxy:"
msgstr "H_TTP Proxy:"
-#: ../mail/mail-config.glade.h:92
+#: ../mail/mail-config.glade.h:93
msgid "Headers"
msgstr "Headers"
-#: ../mail/mail-config.glade.h:93
+#: ../mail/mail-config.glade.h:94
msgid "Highlight _quotations with"
msgstr "Highlight _quotations with"
-#: ../mail/mail-config.glade.h:95
+#: ../mail/mail-config.glade.h:96
msgid "Inline"
msgstr "Inline"
-#: ../mail/mail-config.glade.h:96
+#: ../mail/mail-config.glade.h:97
msgid "Inline (Outlook style)"
msgstr "Inline (Outlook style)"
-#: ../mail/mail-config.glade.h:98
+#: ../mail/mail-config.glade.h:99
msgid "KB"
msgstr "KB"
-#: ../mail/mail-config.glade.h:99 ../mail/message-list.etspec.h:8
+#: ../mail/mail-config.glade.h:100 ../mail/message-list.etspec.h:8
msgid "Labels"
msgstr "Labels"
-#: ../mail/mail-config.glade.h:100
+#: ../mail/mail-config.glade.h:101
msgid "Languages Table"
msgstr "Languages Table"
-#: ../mail/mail-config.glade.h:101
+#: ../mail/mail-config.glade.h:102
msgid "Mail Configuration"
msgstr "Mail Configuration"
-#: ../mail/mail-config.glade.h:102
+#: ../mail/mail-config.glade.h:103
msgid "Mail Headers Table"
msgstr "Mail Headers Table"
-#: ../mail/mail-config.glade.h:104
+#: ../mail/mail-config.glade.h:105
msgid "Mailbox location"
msgstr "Mailbox location"
-#: ../mail/mail-config.glade.h:105
+#: ../mail/mail-config.glade.h:106
msgid "Message Composer"
msgstr "Message Composer"
-#: ../mail/mail-config.glade.h:106
+#: ../mail/mail-config.glade.h:107
msgid "No _Proxy for:"
msgstr "No _Proxy for:"
-#: ../mail/mail-config.glade.h:107
+#: ../mail/mail-config.glade.h:108
msgid ""
"Note: Underscore in the label name is used as mnemonic identifier in menu."
msgstr ""
"Note: Underscore in the label name is used as mnemonic identifier in menu."
-#: ../mail/mail-config.glade.h:108
+#: ../mail/mail-config.glade.h:109
msgid ""
"Note: you will not be prompted for a password until you connect for the "
"first time"
@@ -14450,23 +14674,23 @@ msgstr ""
"Note: you will not be prompted for a password until you connect for the "
"first time"
-#: ../mail/mail-config.glade.h:109
+#: ../mail/mail-config.glade.h:110
msgid "Option is ignored if a match for custom junk headers is found."
msgstr "Option is ignored if a match for custom junk headers is found."
-#: ../mail/mail-config.glade.h:110
+#: ../mail/mail-config.glade.h:111
msgid "Or_ganization:"
msgstr "Or_ganisation:"
-#: ../mail/mail-config.glade.h:111
+#: ../mail/mail-config.glade.h:112
msgid "PGP/GPG _Key ID:"
msgstr "PGP/GPG _Key ID:"
-#: ../mail/mail-config.glade.h:112
+#: ../mail/mail-config.glade.h:113
msgid "Pass_word:"
msgstr "Pass_word:"
-#: ../mail/mail-config.glade.h:114
+#: ../mail/mail-config.glade.h:115
msgid ""
"Please enter a descriptive name for this account in the space below.\n"
"This name will be used for display purposes only."
@@ -14474,7 +14698,7 @@ msgstr ""
"Please enter a descriptive name for this account in the space below.\n"
"This name will be used for display purposes only."
-#: ../mail/mail-config.glade.h:116
+#: ../mail/mail-config.glade.h:117
msgid ""
"Please enter information about the way you will send mail. If you are not "
"sure, ask your system administrator or Internet Service Provider."
@@ -14482,7 +14706,7 @@ msgstr ""
"Please enter information about the way you will send mail. If you are not "
"sure, ask your system administrator or Internet Service Provider."
-#: ../mail/mail-config.glade.h:117
+#: ../mail/mail-config.glade.h:118
msgid ""
"Please enter your name and email address below. The \"optional\" fields "
"below do not need to be filled in, unless you wish to include this "
@@ -14492,115 +14716,123 @@ msgstr ""
"below do not need to be filled in, unless you wish to include this "
"information in e-mail you send."
-#: ../mail/mail-config.glade.h:118
+#: ../mail/mail-config.glade.h:119
msgid "Please select among the following options"
msgstr "Please select among the following options"
-#: ../mail/mail-config.glade.h:119
+#: ../mail/mail-config.glade.h:120
msgid "Port:"
msgstr "Port:"
-#: ../mail/mail-config.glade.h:120
+#: ../mail/mail-config.glade.h:121
msgid "Pr_ompt when sending messages with only Bcc recipients defined"
msgstr "Pr_ompt when sending messages with only Bcc recipients defined"
-#: ../mail/mail-config.glade.h:121
+#: ../mail/mail-config.glade.h:122
msgid "Quoted"
msgstr "Quoted"
-#: ../mail/mail-config.glade.h:122
+#: ../mail/mail-config.glade.h:123
msgid "Re_member password"
msgstr "Re_member password"
-#: ../mail/mail-config.glade.h:123
+#: ../mail/mail-config.glade.h:124
msgid "Re_ply-To:"
msgstr "Re_ply-To:"
-#: ../mail/mail-config.glade.h:125
+#: ../mail/mail-config.glade.h:126
msgid "Remember _password"
msgstr "Remember _password"
-#: ../mail/mail-config.glade.h:126
+#: ../mail/mail-config.glade.h:127
msgid "S_OCKS Host:"
msgstr "S_OCKS Host:"
-#: ../mail/mail-config.glade.h:127
+#: ../mail/mail-config.glade.h:128
msgid "S_earch for sender photograph only in local address books"
msgstr "S_earch for sender photograph only in local address books"
-#: ../mail/mail-config.glade.h:128
+#: ../mail/mail-config.glade.h:129
msgid "S_elect..."
msgstr "S_elect..."
-#: ../mail/mail-config.glade.h:129
+#: ../mail/mail-config.glade.h:130
msgid "S_end message receipts:"
msgstr "S_end message receipts:"
-#: ../mail/mail-config.glade.h:130
+#: ../mail/mail-config.glade.h:131
msgid "S_tandard Font:"
msgstr "S_tandard Font:"
-#: ../mail/mail-config.glade.h:132
+#: ../mail/mail-config.glade.h:133
+msgid "Select Drafts Folder"
+msgstr "Select Drafts Folder"
+
+#: ../mail/mail-config.glade.h:134
msgid "Select HTML fixed width font"
msgstr "Select HTML fixed width font"
-#: ../mail/mail-config.glade.h:133
+#: ../mail/mail-config.glade.h:135
msgid "Select HTML fixed width font for printing"
msgstr "Select HTML fixed width font for printing"
-#: ../mail/mail-config.glade.h:134
+#: ../mail/mail-config.glade.h:136
msgid "Select HTML variable width font"
msgstr "Select HTML variable width font"
-#: ../mail/mail-config.glade.h:135
+#: ../mail/mail-config.glade.h:137
msgid "Select HTML variable width font for printing"
msgstr "Select HTML variable width font for printing"
-#: ../mail/mail-config.glade.h:137
+#: ../mail/mail-config.glade.h:138
+msgid "Select Sent Folder"
+msgstr "Select Sent Folder"
+
+#: ../mail/mail-config.glade.h:140
msgid "Sending Mail"
msgstr "Sending Mail"
-#: ../mail/mail-config.glade.h:138
+#: ../mail/mail-config.glade.h:141
msgid "Sent _Messages Folder:"
msgstr "Sent _Messages Folder:"
-#: ../mail/mail-config.glade.h:139
+#: ../mail/mail-config.glade.h:142
msgid "Ser_ver requires authentication"
msgstr "Ser_ver requires authentication"
-#: ../mail/mail-config.glade.h:140
+#: ../mail/mail-config.glade.h:143
msgid "Server _Type: "
msgstr "Server _Type: "
-#: ../mail/mail-config.glade.h:141
+#: ../mail/mail-config.glade.h:144
msgid "Sig_ning certificate:"
msgstr "Sig_ning certificate:"
-#: ../mail/mail-config.glade.h:142
+#: ../mail/mail-config.glade.h:145
msgid "Signat_ure:"
msgstr "Signat_ure:"
-#: ../mail/mail-config.glade.h:143
+#: ../mail/mail-config.glade.h:146
msgid "Signatures"
msgstr "Signatures"
-#: ../mail/mail-config.glade.h:144
+#: ../mail/mail-config.glade.h:147
msgid "Signatures Table"
msgstr "Signatures Table"
-#: ../mail/mail-config.glade.h:145
+#: ../mail/mail-config.glade.h:148
msgid "Spell Checking"
msgstr "Spell Checking"
-#: ../mail/mail-config.glade.h:146
+#: ../mail/mail-config.glade.h:149
msgid "Start _typing at the bottom on replying"
msgstr "Start _typing at the bottom on replying"
-#: ../mail/mail-config.glade.h:147
+#: ../mail/mail-config.glade.h:150
msgid "T_ype: "
msgstr "T_ype: "
-#: ../mail/mail-config.glade.h:148
+#: ../mail/mail-config.glade.h:151
msgid ""
"The list of languages here reflects only the languages for which you have a "
"dictionary installed."
@@ -14608,7 +14840,7 @@ msgstr ""
"The list of languages here reflects only the languages for which you have a "
"dictionary installed."
-#: ../mail/mail-config.glade.h:149
+#: ../mail/mail-config.glade.h:152
msgid ""
"The output of this script will be used as your\n"
"signature. The name you specify will be used\n"
@@ -14618,7 +14850,7 @@ msgstr ""
"signature. The name you specify will be used\n"
"for display purposes only. "
-#: ../mail/mail-config.glade.h:152
+#: ../mail/mail-config.glade.h:155
msgid ""
"Type the name by which you would like to refer to this account.\n"
"For example: \"Work\" or \"Personal\""
@@ -14626,26 +14858,26 @@ msgstr ""
"Type the name by which you would like to refer to this account.\n"
"For example: \"Work\" or \"Personal\""
-#: ../mail/mail-config.glade.h:154
+#: ../mail/mail-config.glade.h:157
msgid "Us_ername:"
msgstr "Us_ername:"
-#: ../mail/mail-config.glade.h:155
+#: ../mail/mail-config.glade.h:158
msgid "Use Authe_ntication"
msgstr "Use Authe_ntication"
-#: ../mail/mail-config.glade.h:156 ../plugins/caldav/caldav-source.c:284
-#: ../plugins/google-account-setup/google-source.c:625
-#: ../plugins/google-account-setup/google-contacts-source.c:278
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:323
+#: ../mail/mail-config.glade.h:159 ../plugins/caldav/caldav-source.c:387
+#: ../plugins/google-account-setup/google-source.c:615
+#: ../plugins/google-account-setup/google-contacts-source.c:316
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:348
msgid "User_name:"
msgstr "User_name:"
-#: ../mail/mail-config.glade.h:157
+#: ../mail/mail-config.glade.h:160
msgid "V_ariable-width:"
msgstr "V_ariable-width:"
-#: ../mail/mail-config.glade.h:158
+#: ../mail/mail-config.glade.h:161
msgid ""
"Welcome to the Evolution Mail Configuration Assistant.\n"
"\n"
@@ -14655,124 +14887,124 @@ msgstr ""
"\n"
"Click \"Forward\" to begin. "
-#: ../mail/mail-config.glade.h:161
+#: ../mail/mail-config.glade.h:164
msgid "_Add Signature"
msgstr "_Add Signature"
-#: ../mail/mail-config.glade.h:162
+#: ../mail/mail-config.glade.h:165
msgid "_Always load images from the Internet"
msgstr "_Always load images from the Internet"
-#: ../mail/mail-config.glade.h:163
+#: ../mail/mail-config.glade.h:166
msgid "_Automatic proxy configuration URL:"
msgstr "_Automatic proxy configuration URL:"
-#: ../mail/mail-config.glade.h:164
+#: ../mail/mail-config.glade.h:167
msgid "_Default junk plugin:"
msgstr "_Default junk plugin:"
-#: ../mail/mail-config.glade.h:165
+#: ../mail/mail-config.glade.h:168
msgid "_Direct connection to the Internet"
msgstr "_Direct connection to the Internet"
-#: ../mail/mail-config.glade.h:166
+#: ../mail/mail-config.glade.h:169
msgid "_Do not sign meeting requests (for Outlook compatibility)"
msgstr "_Do not sign meeting requests (for Outlook compatibility)"
-#: ../mail/mail-config.glade.h:168
+#: ../mail/mail-config.glade.h:171
msgid "_Forward style:"
msgstr "_Forward style:"
-#: ../mail/mail-config.glade.h:169
+#: ../mail/mail-config.glade.h:172
msgid "_Keep Signature above the original message on replying"
msgstr "_Keep Signature above the original message on replying"
-#: ../mail/mail-config.glade.h:170
+#: ../mail/mail-config.glade.h:173
msgid "_Load images in messages from contacts"
msgstr "_Load images in messages from contacts"
-#: ../mail/mail-config.glade.h:171
+#: ../mail/mail-config.glade.h:174
msgid "_Lookup in local address book only"
msgstr "_Look up in local address book only"
-#: ../mail/mail-config.glade.h:172
+#: ../mail/mail-config.glade.h:175
msgid "_Make this my default account"
msgstr "_Make this my default account"
-#: ../mail/mail-config.glade.h:173
+#: ../mail/mail-config.glade.h:176
msgid "_Manual proxy configuration:"
msgstr "_Manual proxy configuration:"
-#: ../mail/mail-config.glade.h:174
+#: ../mail/mail-config.glade.h:177
msgid "_Mark messages as read after"
msgstr "_Mark messages as read after"
-#: ../mail/mail-config.glade.h:176
+#: ../mail/mail-config.glade.h:179
msgid "_Never load images from the Internet"
msgstr "_Never load images from the Internet"
-#: ../mail/mail-config.glade.h:177
+#: ../mail/mail-config.glade.h:180
msgid "_Path:"
msgstr "_Path:"
-#: ../mail/mail-config.glade.h:178
+#: ../mail/mail-config.glade.h:181
msgid "_Prompt on sending HTML mail to contacts that do not want them"
msgstr "_Prompt on sending HTML mail to contacts that do not want them"
-#: ../mail/mail-config.glade.h:179
+#: ../mail/mail-config.glade.h:182
msgid "_Prompt when sending messages with an empty subject line"
msgstr "_Prompt when sending messages with an empty subject line"
-#: ../mail/mail-config.glade.h:180
+#: ../mail/mail-config.glade.h:183
msgid "_Reply style:"
msgstr "_Reply style:"
-#: ../mail/mail-config.glade.h:181
+#: ../mail/mail-config.glade.h:184
msgid "_Script:"
msgstr "_Script:"
-#: ../mail/mail-config.glade.h:182
+#: ../mail/mail-config.glade.h:185
msgid "_Secure HTTP Proxy:"
msgstr "_Secure HTTP Proxy:"
-#: ../mail/mail-config.glade.h:183
+#: ../mail/mail-config.glade.h:186
msgid "_Select..."
msgstr "_Select..."
#. If enabled, show animation; if disabled, only display a static image without any animation
-#: ../mail/mail-config.glade.h:186
+#: ../mail/mail-config.glade.h:189
msgid "_Show image animations"
msgstr "_Show image animations"
-#: ../mail/mail-config.glade.h:187
+#: ../mail/mail-config.glade.h:190
msgid "_Show the photograph of sender in the message preview"
msgstr "_Show the photograph of sender in the message preview"
-#: ../mail/mail-config.glade.h:188
+#: ../mail/mail-config.glade.h:191
msgid "_Shrink To / Cc / Bcc headers to "
msgstr "_Shrink To / Cc / Bcc headers to "
-#: ../mail/mail-config.glade.h:189
+#: ../mail/mail-config.glade.h:192
msgid "_Use Secure Connection:"
msgstr "_Use Secure Connection:"
-#: ../mail/mail-config.glade.h:190
+#: ../mail/mail-config.glade.h:193
msgid "_Use system defaults"
msgstr "_Use system defaults"
-#: ../mail/mail-config.glade.h:191
+#: ../mail/mail-config.glade.h:194
msgid "_Use the same fonts as other applications"
msgstr "_Use the same fonts as other applications"
-#: ../mail/mail-config.glade.h:192
+#: ../mail/mail-config.glade.h:195
msgid "addresses"
msgstr "addresses"
-#: ../mail/mail-config.glade.h:193
+#: ../mail/mail-config.glade.h:196
msgid "color"
msgstr "colour"
-#: ../mail/mail-config.glade.h:194
+#: ../mail/mail-config.glade.h:197
msgid "description"
msgstr "description"
@@ -14820,7 +15052,7 @@ msgstr "F_ind:"
msgid "Find in Message"
msgstr "Find in Message"
-#: ../mail/mail-dialogs.glade.h:12 ../mail/message-tag-followup.c:277
+#: ../mail/mail-dialogs.glade.h:12 ../mail/message-tag-followup.c:276
msgid "Flag to Follow Up"
msgstr "Flag to Follow Up"
@@ -14872,26 +15104,26 @@ msgstr "_Flag:"
msgid "_Tick this to accept the license agreement"
msgstr "_Tick this to accept the licence agreement"
-#: ../mail/mail-folder-cache.c:845
+#: ../mail/mail-folder-cache.c:834
#, c-format
msgid "Pinging %s"
msgstr "Pinging %s"
-#: ../mail/mail-ops.c:105
+#: ../mail/mail-ops.c:106
msgid "Filtering Selected Messages"
msgstr "Filtering Selected Messages"
-#: ../mail/mail-ops.c:264
+#: ../mail/mail-ops.c:265
msgid "Fetching Mail"
msgstr "Fetching Mail"
#. sending mail, filtering failed
-#: ../mail/mail-ops.c:560
+#: ../mail/mail-ops.c:561
#, c-format
msgid "Failed to apply outgoing filters: %s"
msgstr "Failed to apply outgoing filters: %s"
-#: ../mail/mail-ops.c:572 ../mail/mail-ops.c:601
+#: ../mail/mail-ops.c:573 ../mail/mail-ops.c:602
#, c-format
msgid ""
"Failed to append to %s: %s\n"
@@ -14900,123 +15132,123 @@ msgstr ""
"Failed to append to %s: %s\n"
"Appending to local `Sent' folder instead."
-#: ../mail/mail-ops.c:618
+#: ../mail/mail-ops.c:619
#, c-format
msgid "Failed to append to local `Sent' folder: %s"
msgstr "Failed to append to local `Sent' folder: %s"
-#: ../mail/mail-ops.c:724
+#: ../mail/mail-ops.c:725
msgid "Sending message"
msgstr "Sending message"
-#: ../mail/mail-ops.c:734
+#: ../mail/mail-ops.c:735
#, c-format
msgid "Sending message %d of %d"
msgstr "Sending message %d of %d"
-#: ../mail/mail-ops.c:761
+#: ../mail/mail-ops.c:762
#, c-format
msgid "Failed to send %d of %d messages"
msgstr "Failed to send %d of %d messages"
-#: ../mail/mail-ops.c:763 ../mail/mail-send-recv.c:693
+#: ../mail/mail-ops.c:764 ../mail/mail-send-recv.c:700
msgid "Canceled."
msgstr "Cancelled."
-#: ../mail/mail-ops.c:765 ../mail/mail-send-recv.c:695
+#: ../mail/mail-ops.c:766 ../mail/mail-send-recv.c:702
msgid "Complete."
msgstr "Complete."
-#: ../mail/mail-ops.c:871
+#: ../mail/mail-ops.c:872
msgid "Saving message to folder"
msgstr "Saving message to folder"
-#: ../mail/mail-ops.c:949
+#: ../mail/mail-ops.c:950
#, c-format
msgid "Moving messages to %s"
msgstr "Moving messages to %s"
-#: ../mail/mail-ops.c:949
+#: ../mail/mail-ops.c:950
#, c-format
msgid "Copying messages to %s"
msgstr "Copying messages to %s"
-#: ../mail/mail-ops.c:1166
+#: ../mail/mail-ops.c:1167
msgid "Forwarded messages"
msgstr "Forwarded messages"
-#: ../mail/mail-ops.c:1207
+#: ../mail/mail-ops.c:1208
#, c-format
msgid "Opening folder %s"
msgstr "Opening folder %s"
-#: ../mail/mail-ops.c:1272
+#: ../mail/mail-ops.c:1273
#, c-format
msgid "Retrieving quota information for folder %s"
msgstr "Retrieving quota information for folder %s"
-#: ../mail/mail-ops.c:1341
+#: ../mail/mail-ops.c:1342
#, c-format
msgid "Opening store %s"
msgstr "Opening store %s"
-#: ../mail/mail-ops.c:1412
+#: ../mail/mail-ops.c:1413
#, c-format
msgid "Removing folder %s"
msgstr "Removing folder %s"
-#: ../mail/mail-ops.c:1501
+#: ../mail/mail-ops.c:1531
#, c-format
msgid "Storing folder '%s'"
msgstr "Storing folder '%s'"
-#: ../mail/mail-ops.c:1564
+#: ../mail/mail-ops.c:1594
#, c-format
msgid "Expunging and storing account '%s'"
msgstr "Expunging and storing account '%s'"
-#: ../mail/mail-ops.c:1565
+#: ../mail/mail-ops.c:1595
#, c-format
msgid "Storing account '%s'"
msgstr "Storing account '%s'"
-#: ../mail/mail-ops.c:1619
+#: ../mail/mail-ops.c:1649
msgid "Refreshing folder"
msgstr "Refreshing folder"
-#: ../mail/mail-ops.c:1659 ../mail/mail-ops.c:1709
+#: ../mail/mail-ops.c:1689 ../mail/mail-ops.c:1739
msgid "Expunging folder"
msgstr "Expunging folder"
-#: ../mail/mail-ops.c:1706
+#: ../mail/mail-ops.c:1736
#, c-format
msgid "Emptying trash in '%s'"
msgstr "Emptying wastebasket in '%s'"
-#: ../mail/mail-ops.c:1707
+#: ../mail/mail-ops.c:1737
msgid "Local Folders"
msgstr "Local Folders"
-#: ../mail/mail-ops.c:1788
+#: ../mail/mail-ops.c:1818
#, c-format
msgid "Retrieving message %s"
msgstr "Retrieving message %s"
-#: ../mail/mail-ops.c:1895
+#: ../mail/mail-ops.c:1925
#, c-format
msgid "Retrieving %d message"
msgid_plural "Retrieving %d messages"
msgstr[0] "Retrieving %d message"
msgstr[1] "Retrieving %d messages"
-#: ../mail/mail-ops.c:1980
+#: ../mail/mail-ops.c:2010
#, c-format
msgid "Saving %d message"
msgid_plural "Saving %d messages"
msgstr[0] "Saving %d message"
msgstr[1] "Saving %d messages"
-#: ../mail/mail-ops.c:2058
+#: ../mail/mail-ops.c:2088
#, c-format
msgid ""
"Error saving messages to: %s:\n"
@@ -15025,11 +15257,11 @@ msgstr ""
"Error saving messages to: %s:\n"
" %s"
-#: ../mail/mail-ops.c:2130
+#: ../mail/mail-ops.c:2160
msgid "Saving attachment"
msgstr "Saving attachment"
-#: ../mail/mail-ops.c:2148 ../mail/mail-ops.c:2156
+#: ../mail/mail-ops.c:2178 ../mail/mail-ops.c:2186
#, c-format
msgid ""
"Cannot create output file: %s:\n"
@@ -15038,27 +15270,27 @@ msgstr ""
"Cannot create output file: %s:\n"
" %s"
-#: ../mail/mail-ops.c:2171
+#: ../mail/mail-ops.c:2201
#, c-format
msgid "Could not write data: %s"
msgstr "Could not write data: %s"
-#: ../mail/mail-ops.c:2317
+#: ../mail/mail-ops.c:2347
#, c-format
msgid "Disconnecting from %s"
msgstr "Disconnecting from %s"
-#: ../mail/mail-ops.c:2317
+#: ../mail/mail-ops.c:2347
#, c-format
msgid "Reconnecting to %s"
msgstr "Reconnecting to %s"
-#: ../mail/mail-ops.c:2413
+#: ../mail/mail-ops.c:2443
#, c-format
msgid "Preparing account '%s' for offline"
msgstr "Preparing account '%s' for offline"
-#: ../mail/mail-ops.c:2499
+#: ../mail/mail-ops.c:2529
msgid "Checking Service"
msgstr "Checking Service"
@@ -15074,39 +15306,39 @@ msgstr "Send & Receive Mail"
msgid "Cancel _All"
msgstr "Cancel _All"
-#: ../mail/mail-send-recv.c:498
+#: ../mail/mail-send-recv.c:503
msgid "Updating..."
msgstr "Updating..."
-#: ../mail/mail-send-recv.c:498 ../mail/mail-send-recv.c:573
+#: ../mail/mail-send-recv.c:503 ../mail/mail-send-recv.c:580
msgid "Waiting..."
msgstr "Waiting..."
-#: ../mail/mail-send-recv.c:799
+#: ../mail/mail-send-recv.c:806
#, c-format
msgid "Checking for new mail"
msgstr "Checking for new mail"
-#: ../mail/mail-session.c:207
+#: ../mail/mail-session.c:212
#, c-format
msgid "Enter Passphrase for %s"
msgstr "Enter Passphrase for %s"
-#: ../mail/mail-session.c:209
+#: ../mail/mail-session.c:214
msgid "Enter Passphrase"
msgstr "Enter Passphrase"
-#: ../mail/mail-session.c:212
+#: ../mail/mail-session.c:217
#: ../plugins/exchange-operations/exchange-config-listener.c:708
#, c-format
msgid "Enter Password for %s"
msgstr "Enter Password for %s"
-#: ../mail/mail-session.c:214
+#: ../mail/mail-session.c:219
msgid "Enter Password"
msgstr "Enter Password"
-#: ../mail/mail-session.c:256
+#: ../mail/mail-session.c:261
msgid "User canceled operation."
msgstr "User cancelled operation."
@@ -15151,21 +15383,21 @@ msgstr "Invalid folder: `%s'"
msgid "Setting up Search Folder: %s"
msgstr "Setting up Search Folder: %s"
-#: ../mail/mail-vfolder.c:233
+#: ../mail/mail-vfolder.c:240
#, c-format
msgid "Updating Search Folders for '%s:%s'"
msgstr "Updating Search Folders for '%s:%s'"
-#: ../mail/mail-vfolder.c:240
+#: ../mail/mail-vfolder.c:247
#, c-format
msgid "Updating Search Folders for '%s'"
msgstr "Updating Search Folders for '%s'"
-#: ../mail/mail-vfolder.c:1066
+#: ../mail/mail-vfolder.c:1086
msgid "Edit Search Folder"
msgstr "Edit Search Folder"
-#: ../mail/mail-vfolder.c:1155
+#: ../mail/mail-vfolder.c:1175
msgid "New Search Folder"
msgstr "New Search Folder"
@@ -15826,39 +16058,39 @@ msgstr "Higher"
msgid "Highest"
msgstr "Highest"
-#: ../mail/message-list.c:1596 ../widgets/table/e-cell-date.c:55
+#: ../mail/message-list.c:1656 ../widgets/table/e-cell-date.c:55
msgid "?"
msgstr "?"
#. strftime format of a time,
#. in 12-hour format, without seconds.
-#: ../mail/message-list.c:1603 ../plugins/itip-formatter/itip-view.c:203
+#: ../mail/message-list.c:1663 ../plugins/itip-formatter/itip-view.c:205
#: ../widgets/table/e-cell-date.c:70
msgid "Today %l:%M %p"
msgstr "Today %l:%M %p"
-#: ../mail/message-list.c:1612 ../widgets/table/e-cell-date.c:80
+#: ../mail/message-list.c:1672 ../widgets/table/e-cell-date.c:80
msgid "Yesterday %l:%M %p"
msgstr "Yesterday %l:%M %p"
-#: ../mail/message-list.c:1624 ../widgets/table/e-cell-date.c:92
+#: ../mail/message-list.c:1684 ../widgets/table/e-cell-date.c:92
msgid "%a %l:%M %p"
msgstr "%a %l:%M %p"
-#: ../mail/message-list.c:1632 ../widgets/table/e-cell-date.c:100
+#: ../mail/message-list.c:1692 ../widgets/table/e-cell-date.c:100
msgid "%b %d %l:%M %p"
msgstr "%d %b %l:%M %p"
-#: ../mail/message-list.c:1634 ../widgets/table/e-cell-date.c:102
+#: ../mail/message-list.c:1694 ../widgets/table/e-cell-date.c:102
msgid "%b %d %Y"
msgstr "%d %b %Y"
#. there is some info why the message list is empty, let it be something useful
-#: ../mail/message-list.c:3916 ../mail/message-list.c:4376
+#: ../mail/message-list.c:3985 ../mail/message-list.c:4450
msgid "Generating message list"
msgstr "Generating message list"
-#: ../mail/message-list.c:4224
+#: ../mail/message-list.c:4289
msgid ""
"No message satisfies your search criteria. Either clear search with Search-"
">Clear menu item or change it."
@@ -15866,7 +16098,7 @@ msgstr ""
"No message satisfies your search criteria. Either clear search with Search-"
">Clear menu item or change it."
-#: ../mail/message-list.c:4226
+#: ../mail/message-list.c:4291
msgid "There are no messages in this folder."
msgstr "There are no messages in this folder."
@@ -15899,39 +16131,43 @@ msgstr "Sent Messages"
msgid "Size"
msgstr "Size"
-#: ../mail/message-tag-followup.c:56
+#: ../mail/message-list.etspec.h:19
+msgid "Subject - Trimmed"
+msgstr "Subject - Trimmed"
+
+#: ../mail/message-tag-followup.c:55
msgid "Call"
msgstr "Call"
-#: ../mail/message-tag-followup.c:57
+#: ../mail/message-tag-followup.c:56
msgid "Do Not Forward"
msgstr "Do Not Forward"
-#: ../mail/message-tag-followup.c:58
+#: ../mail/message-tag-followup.c:57
msgid "Follow-Up"
msgstr "Follow-Up"
-#: ../mail/message-tag-followup.c:59
+#: ../mail/message-tag-followup.c:58
msgid "For Your Information"
msgstr "For Your Information"
-#: ../mail/message-tag-followup.c:60 ../ui/evolution-mail-message.xml.h:42
+#: ../mail/message-tag-followup.c:59 ../ui/evolution-mail-message.xml.h:42
msgid "Forward"
msgstr "Forward"
-#: ../mail/message-tag-followup.c:61
+#: ../mail/message-tag-followup.c:60
msgid "No Response Necessary"
msgstr "No Response Necessary"
-#: ../mail/message-tag-followup.c:64 ../ui/evolution-mail-message.xml.h:80
+#: ../mail/message-tag-followup.c:63 ../ui/evolution-mail-message.xml.h:80
msgid "Reply"
msgstr "Reply"
-#: ../mail/message-tag-followup.c:65 ../ui/evolution-mail-message.xml.h:81
+#: ../mail/message-tag-followup.c:64 ../ui/evolution-mail-message.xml.h:81
msgid "Reply to All"
msgstr "Reply to All"
-#: ../mail/message-tag-followup.c:66
+#: ../mail/message-tag-followup.c:65
msgid "Review"
msgstr "Review"
@@ -15987,8 +16223,8 @@ msgstr ""
"List of clues for the attachment reminder plugin to look for in a message "
"body."
-#: ../plugins/attachment-reminder/attachment-reminder.c:474
-#: ../plugins/templates/templates.c:394
+#: ../plugins/attachment-reminder/attachment-reminder.c:475
+#: ../plugins/templates/templates.c:390
msgid "Keywords"
msgstr "Keywords"
@@ -16024,36 +16260,36 @@ msgstr "_Edit Message"
#: ../plugins/audio-inline/org-gnome-audio-inline.eplug.xml.h:1
msgid ""
"A formatter plugin which displays audio attachments inline and allows you to "
-"play them directly from evolution."
+"play them directly from Evolution."
msgstr ""
"A formatter plugin which displays audio attachments inline and allows you to "
-"play them directly from evolution."
+"play them directly from Evolution."
#: ../plugins/audio-inline/org-gnome-audio-inline.eplug.xml.h:2
msgid "Audio inline plugin"
msgstr "Audio inline plugin"
-#: ../plugins/backup-restore/backup-restore.c:127
+#: ../plugins/backup-restore/backup-restore.c:138
msgid "Select name of the Evolution backup file"
msgstr "Select name of the Evolution backup file"
-#: ../plugins/backup-restore/backup-restore.c:156
+#: ../plugins/backup-restore/backup-restore.c:167
msgid "_Restart Evolution after backup"
msgstr "_Restart Evolution after backup"
-#: ../plugins/backup-restore/backup-restore.c:179
+#: ../plugins/backup-restore/backup-restore.c:190
msgid "Select name of the Evolution backup file to restore"
msgstr "Select name of the Evolution backup file to restore"
-#: ../plugins/backup-restore/backup-restore.c:203
+#: ../plugins/backup-restore/backup-restore.c:214
msgid "_Restart Evolution after restore"
msgstr "_Restart Evolution after restore"
-#: ../plugins/backup-restore/backup-restore.c:276
+#: ../plugins/backup-restore/backup-restore.c:287
msgid "Restore from backup"
msgstr "Restore from backup"
-#: ../plugins/backup-restore/backup-restore.c:278
+#: ../plugins/backup-restore/backup-restore.c:289
msgid ""
"You can restore Evolution from your backup. It can restore all the Mails, "
"Calendars, Tasks, Memos, Contacts. \n"
@@ -16063,116 +16299,116 @@ msgstr ""
"Calendars, Tasks, Memos, Contacts. \n"
"It also restores all your personal settings, mail filters etc."
-#: ../plugins/backup-restore/backup-restore.c:284
+#: ../plugins/backup-restore/backup-restore.c:295
msgid "_Restore Evolution from the backup file"
msgstr "_Restore Evolution from the backup file"
-#: ../plugins/backup-restore/backup-restore.c:291
+#: ../plugins/backup-restore/backup-restore.c:302
msgid "Please select an Evolution Archive to restore:"
msgstr "Please select an Evolution Archive to restore:"
-#: ../plugins/backup-restore/backup-restore.c:294
+#: ../plugins/backup-restore/backup-restore.c:305
msgid "Choose a file to restore"
msgstr "Choose a file to restore"
-#: ../plugins/backup-restore/backup.c:66
+#: ../plugins/backup-restore/backup.c:65
msgid "Backup Evolution directory"
msgstr "Backup Evolution directory"
-#: ../plugins/backup-restore/backup.c:68
+#: ../plugins/backup-restore/backup.c:67
msgid "Restore Evolution directory"
msgstr "Restore Evolution directory"
-#: ../plugins/backup-restore/backup.c:70
+#: ../plugins/backup-restore/backup.c:69
msgid "Check Evolution Backup"
msgstr "Check Evolution Backup"
-#: ../plugins/backup-restore/backup.c:72
+#: ../plugins/backup-restore/backup.c:71
msgid "Restart Evolution"
msgstr "Restart Evolution"
-#: ../plugins/backup-restore/backup.c:74
+#: ../plugins/backup-restore/backup.c:73
msgid "With Graphical User Interface"
msgstr "With Graphical User Interface"
-#: ../plugins/backup-restore/backup.c:125
-#: ../plugins/backup-restore/backup.c:258
+#: ../plugins/backup-restore/backup.c:124
+#: ../plugins/backup-restore/backup.c:257
msgid "Shutting down Evolution"
msgstr "Shutting down Evolution"
-#: ../plugins/backup-restore/backup.c:132
+#: ../plugins/backup-restore/backup.c:131
msgid "Backing Evolution accounts and settings"
msgstr "Backing Evolution accounts and settings"
-#: ../plugins/backup-restore/backup.c:136
+#: ../plugins/backup-restore/backup.c:135
msgid "Backing Evolution data (Mails, Contacts, Calendar, Tasks, Memos)"
msgstr "Backing Evolution data (Mails, Contacts, Calendar, Tasks, Memos)"
-#: ../plugins/backup-restore/backup.c:147
+#: ../plugins/backup-restore/backup.c:146
msgid "Backup complete"
msgstr "Backup complete"
-#: ../plugins/backup-restore/backup.c:152
-#: ../plugins/backup-restore/backup.c:339
+#: ../plugins/backup-restore/backup.c:151
+#: ../plugins/backup-restore/backup.c:338
msgid "Restarting Evolution"
msgstr "Restarting Evolution"
-#: ../plugins/backup-restore/backup.c:262
+#: ../plugins/backup-restore/backup.c:261
msgid "Backup current Evolution data"
msgstr "Backup current Evolution data"
-#: ../plugins/backup-restore/backup.c:267
+#: ../plugins/backup-restore/backup.c:266
msgid "Extracting files from backup"
msgstr "Extracting files from backup"
-#: ../plugins/backup-restore/backup.c:274
+#: ../plugins/backup-restore/backup.c:273
msgid "Loading Evolution settings"
msgstr "Loading Evolution settings"
-#: ../plugins/backup-restore/backup.c:278
+#: ../plugins/backup-restore/backup.c:277
msgid "Removing temporary backup files"
msgstr "Removing temporary backup files"
-#: ../plugins/backup-restore/backup.c:285
+#: ../plugins/backup-restore/backup.c:284
msgid "Ensuring local sources"
msgstr "Ensuring local sources"
-#: ../plugins/backup-restore/backup.c:455
+#: ../plugins/backup-restore/backup.c:454
#, c-format
msgid "Backing up to the folder %s"
msgstr "Backing up to the folder %s"
-#: ../plugins/backup-restore/backup.c:460
+#: ../plugins/backup-restore/backup.c:459
#, c-format
msgid "Restoring from the folder %s"
msgstr "Restoring from the folder %s"
#. Backup / Restore only can have GUI. We should restrict the rest
-#: ../plugins/backup-restore/backup.c:479
+#: ../plugins/backup-restore/backup.c:478
msgid "Evolution Backup"
msgstr "Evolution Backup"
-#: ../plugins/backup-restore/backup.c:479
+#: ../plugins/backup-restore/backup.c:478
msgid "Evolution Restore"
msgstr "Evolution Restore"
-#: ../plugins/backup-restore/backup.c:514
+#: ../plugins/backup-restore/backup.c:513
msgid "Backing up Evolution Data"
msgstr "Backing up Evolution Data"
-#: ../plugins/backup-restore/backup.c:515
+#: ../plugins/backup-restore/backup.c:514
msgid "Please wait while Evolution is backing up your data."
msgstr "Please wait while Evolution backs up your data."
-#: ../plugins/backup-restore/backup.c:517
+#: ../plugins/backup-restore/backup.c:516
msgid "Restoring Evolution Data"
msgstr "Restoring Evolution Data"
-#: ../plugins/backup-restore/backup.c:518
+#: ../plugins/backup-restore/backup.c:517
msgid "Please wait while Evolution is restoring your data."
msgstr "Please wait while Evolution restores your data."
-#: ../plugins/backup-restore/backup.c:536
+#: ../plugins/backup-restore/backup.c:535
msgid "This may take a while depending on the amount of data in your account."
msgstr "This may take a while depending on the amount of data in your account."
@@ -16249,35 +16485,35 @@ msgstr "R_estore Settings..."
msgid "_Backup Settings..."
msgstr "_Backup Settings..."
-#: ../plugins/bbdb/bbdb.c:543 ../plugins/bbdb/bbdb.c:552
+#: ../plugins/bbdb/bbdb.c:615 ../plugins/bbdb/bbdb.c:624
#: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:1
msgid "Automatic Contacts"
msgstr "Automatic Contacts"
#. Enable BBDB checkbox
-#: ../plugins/bbdb/bbdb.c:567
+#: ../plugins/bbdb/bbdb.c:639
msgid "_Auto-create address book entries when replying to messages"
msgstr "_Auto-create address book entries when replying to messages"
-#: ../plugins/bbdb/bbdb.c:573
+#: ../plugins/bbdb/bbdb.c:645
msgid "Select Address book for Automatic Contacts"
msgstr "Select Address book for Automatic Contacts"
-#: ../plugins/bbdb/bbdb.c:588
+#: ../plugins/bbdb/bbdb.c:660
msgid "Instant Messaging Contacts"
msgstr "Instant Messaging Contacts"
#. Enable Gaim Checkbox
-#: ../plugins/bbdb/bbdb.c:603
+#: ../plugins/bbdb/bbdb.c:675
msgid "Synchronize contact info and images from Pidgin buddy list"
msgstr "Synchronise contact info and images from Pidgin buddy list"
-#: ../plugins/bbdb/bbdb.c:609
+#: ../plugins/bbdb/bbdb.c:681
msgid "Select Address book for Pidgin buddy list"
msgstr "Select Address book for Pidgin buddy list"
#. Synchronize now button.
-#: ../plugins/bbdb/bbdb.c:620
+#: ../plugins/bbdb/bbdb.c:692
msgid "Synchronize with _buddy list now"
msgstr "Synchronise with _buddy list now"
@@ -16296,27 +16532,27 @@ msgid "BBDB"
msgstr "BBDB"
#. For Translators: The first %s stands for the executable full path with a file name, the second is the error message itself.
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:114
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:161
#, c-format
msgid "Error occurred while spawning %s: %s."
msgstr "Error occurred while spawning %s: %s."
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:138
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:186
#, c-format
msgid "Bogofilter child process does not respond, killing..."
msgstr "Bogofilter child process does not respond, killing..."
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:140
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:188
#, c-format
msgid "Wait for Bogofilter child process interrupted, terminating..."
msgstr "Wait for Bogofilter child process interrupted, terminating..."
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:152
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:211
#, c-format
msgid "Pipe to Bogofilter failed, error code: %d."
msgstr "Pipe to Bogofilter failed, error code: %d."
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:313
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:374
msgid "Convert message text to _Unicode"
msgstr "Convert message text to _Unicode"
@@ -16344,21 +16580,31 @@ msgstr "Bogofilter junk plugin"
msgid "Filters junk messages using Bogofilter."
msgstr "Filters junk messages using Bogofilter."
-#: ../plugins/caldav/caldav-source.c:66 ../plugins/caldav/caldav-source.c:70
+#. we found the group, change the name based on the actual language
+#: ../plugins/caldav/caldav-source.c:80 ../plugins/caldav/caldav-source.c:92
msgid "CalDAV"
msgstr "CalDAV"
-#: ../plugins/caldav/caldav-source.c:249
+#: ../plugins/caldav/caldav-source.c:348
#: ../plugins/calendar-http/calendar-http.c:126
msgid "_URL:"
msgstr "_URL:"
-#: ../plugins/caldav/caldav-source.c:271
-#: ../plugins/google-account-setup/google-source.c:618
-#: ../plugins/google-account-setup/google-contacts-source.c:301
+#: ../plugins/caldav/caldav-source.c:372
+#: ../plugins/google-account-setup/google-source.c:608
+#: ../plugins/google-account-setup/google-contacts-source.c:339
msgid "Use _SSL"
msgstr "Use _SSL"
+#. add refresh option
+#: ../plugins/caldav/caldav-source.c:415
+#: ../plugins/calendar-http/calendar-http.c:264
+#: ../plugins/calendar-weather/calendar-weather.c:509
+#: ../plugins/google-account-setup/google-source.c:632
+#: ../plugins/google-account-setup/google-contacts-source.c:358
+msgid "Re_fresh:"
+msgstr "Re_fresh:"
+
#: ../plugins/caldav/org-gnome-evolution-caldav.eplug.xml.h:1
msgid "CalDAV Calendar sources"
msgstr "CalDAV Calendar sources"
@@ -16375,13 +16621,6 @@ msgstr "Local Calendars"
msgid "Provides core functionality for local calendars."
msgstr "Provides core functionality for local calendars."
-#: ../plugins/calendar-http/calendar-http.c:264
-#: ../plugins/calendar-weather/calendar-weather.c:546
-#: ../plugins/google-account-setup/google-source.c:642
-#: ../plugins/google-account-setup/google-contacts-source.c:320
-msgid "Re_fresh:"
-msgstr "Re_fresh:"
-
#: ../plugins/calendar-http/calendar-http.c:332
msgid "_Secure connection"
msgstr "_Secure connection"
@@ -16398,48 +16637,55 @@ msgstr "HTTP Calendars"
msgid "Provides core functionality for webcal and http calendars."
msgstr "Provides core functionality for webcal and http calendars."
-#: ../plugins/calendar-weather/calendar-weather.c:54
-#: ../plugins/calendar-weather/calendar-weather.c:60
-msgid "Weather: Cloudy"
-msgstr "Weather: Cloudy"
-
#: ../plugins/calendar-weather/calendar-weather.c:61
msgid "Weather: Fog"
msgstr "Weather: Fog"
#: ../plugins/calendar-weather/calendar-weather.c:62
-msgid "Weather: Partly Cloudy"
-msgstr "Weather: Partly Cloudy"
+msgid "Weather: Cloudy"
+msgstr "Weather: Cloudy"
#: ../plugins/calendar-weather/calendar-weather.c:63
-msgid "Weather: Rain"
-msgstr "Weather: Rain"
+msgid "Weather: Cloudy Night"
+msgstr "Weather: Cloudy Night"
#: ../plugins/calendar-weather/calendar-weather.c:64
+msgid "Weather: Overcast"
+msgstr "Weather: Overcast"
+
+#: ../plugins/calendar-weather/calendar-weather.c:65
+msgid "Weather: Showers"
+msgstr "Weather: Showers"
+
+#: ../plugins/calendar-weather/calendar-weather.c:66
msgid "Weather: Snow"
msgstr "Weather: Snow"
-#: ../plugins/calendar-weather/calendar-weather.c:65
+#: ../plugins/calendar-weather/calendar-weather.c:67
msgid "Weather: Sunny"
msgstr "Weather: Sunny"
-#: ../plugins/calendar-weather/calendar-weather.c:66
+#: ../plugins/calendar-weather/calendar-weather.c:68
+msgid "Weather: Clear Night"
+msgstr "Weather: Clear Night"
+
+#: ../plugins/calendar-weather/calendar-weather.c:69
msgid "Weather: Thunderstorms"
msgstr "Weather: Thunderstorms"
-#: ../plugins/calendar-weather/calendar-weather.c:267
+#: ../plugins/calendar-weather/calendar-weather.c:230
msgid "Select a location"
msgstr "Select a location"
-#: ../plugins/calendar-weather/calendar-weather.c:652
+#: ../plugins/calendar-weather/calendar-weather.c:615
msgid "_Units:"
msgstr "_Units:"
-#: ../plugins/calendar-weather/calendar-weather.c:659
+#: ../plugins/calendar-weather/calendar-weather.c:622
msgid "Metric (Celsius, cm, etc)"
msgstr "Metric (Celsius, cm, etc)"
-#: ../plugins/calendar-weather/calendar-weather.c:660
+#: ../plugins/calendar-weather/calendar-weather.c:623
msgid "Imperial (Fahrenheit, inches, etc)"
msgstr "Imperial (Fahrenheit, inches, etc)"
@@ -16486,7 +16732,7 @@ msgid "Do you want to make Evolution your default e-mail client?"
msgstr "Do you want to make Evolution your default e-mail client?"
#: ../plugins/default-mailer/org-gnome-default-mailer.error.xml.h:2
-#: ../shell/main.c:585
+#: ../shell/main.c:599
msgid "Evolution"
msgstr "Evolution"
@@ -16518,16 +16764,36 @@ msgstr ""
"Provides functionality for marking a calendar or an address book as the "
"default one."
-#: ../plugins/email-custom-header/email-custom-header.c:558
+#: ../plugins/email-custom-header/email-custom-header.c:334
+msgid "Security:"
+msgstr "Security:"
+
+#: ../plugins/email-custom-header/email-custom-header.c:339
+msgid "Unclassified"
+msgstr "Unclassified"
+
+#: ../plugins/email-custom-header/email-custom-header.c:340
+msgid "Protected"
+msgstr "Protected"
+
+#: ../plugins/email-custom-header/email-custom-header.c:342
+msgid "Secret"
+msgstr "Secret"
+
+#: ../plugins/email-custom-header/email-custom-header.c:343
+msgid "Top secret"
+msgstr "Top secret"
+
+#: ../plugins/email-custom-header/email-custom-header.c:585
msgid "_Custom Header"
msgstr "_Custom Header"
-#: ../plugins/email-custom-header/email-custom-header.c:879
+#: ../plugins/email-custom-header/email-custom-header.c:906
msgid "Key"
msgstr "Key"
-#: ../plugins/email-custom-header/email-custom-header.c:890
-#: ../plugins/templates/templates.c:400
+#: ../plugins/email-custom-header/email-custom-header.c:917
+#: ../plugins/templates/templates.c:396
msgid "Values"
msgstr "Values"
@@ -16584,12 +16850,12 @@ msgid "_User:"
msgstr "_User:"
#. i18n: "Secure Password Authentication" is an Outlookism
-#: ../plugins/exchange-operations/exchange-account-setup.c:61
+#: ../plugins/exchange-operations/exchange-account-setup.c:63
msgid "Secure Password"
msgstr "Secure Password"
#. i18n: "NTLM" probably doesn't translate
-#: ../plugins/exchange-operations/exchange-account-setup.c:64
+#: ../plugins/exchange-operations/exchange-account-setup.c:66
msgid ""
"This option will connect to the Exchange server using secure password (NTLM) "
"authentication."
@@ -16597,11 +16863,11 @@ msgstr ""
"This option will connect to the Exchange server using secure password (NTLM) "
"authentication."
-#: ../plugins/exchange-operations/exchange-account-setup.c:72
+#: ../plugins/exchange-operations/exchange-account-setup.c:74
msgid "Plaintext Password"
msgstr "Plaintext Password"
-#: ../plugins/exchange-operations/exchange-account-setup.c:74
+#: ../plugins/exchange-operations/exchange-account-setup.c:76
msgid ""
"This option will connect to the Exchange server using standard plaintext "
"password authentication."
@@ -16609,11 +16875,11 @@ msgstr ""
"This option will connect to the Exchange server using standard plaintext "
"password authentication."
-#: ../plugins/exchange-operations/exchange-account-setup.c:255
+#: ../plugins/exchange-operations/exchange-account-setup.c:272
msgid "Out Of Office"
msgstr "Out Of Office"
-#: ../plugins/exchange-operations/exchange-account-setup.c:262
+#: ../plugins/exchange-operations/exchange-account-setup.c:279
msgid ""
"The message specified below will be automatically sent to \n"
"each person who sends mail to you while you are out of the office."
@@ -16621,88 +16887,92 @@ msgstr ""
"The message specified below will be automatically sent to \n"
"each person who sends mail to you while you are out of the office."
-#: ../plugins/exchange-operations/exchange-account-setup.c:274
-#: ../plugins/exchange-operations/exchange-account-setup.c:279
+#: ../plugins/exchange-operations/exchange-account-setup.c:291
+#: ../plugins/exchange-operations/exchange-account-setup.c:296
msgid "I am out of the office"
msgstr "I am out of the office"
-#: ../plugins/exchange-operations/exchange-account-setup.c:275
-#: ../plugins/exchange-operations/exchange-account-setup.c:278
+#: ../plugins/exchange-operations/exchange-account-setup.c:292
+#: ../plugins/exchange-operations/exchange-account-setup.c:295
msgid "I am in the office"
msgstr "I am in the office"
#. Change Password
-#: ../plugins/exchange-operations/exchange-account-setup.c:326
+#: ../plugins/exchange-operations/exchange-account-setup.c:343
msgid "Change the password for Exchange account"
msgstr "Change the password for Exchange account"
-#: ../plugins/exchange-operations/exchange-account-setup.c:328
+#: ../plugins/exchange-operations/exchange-account-setup.c:345
#: ../plugins/exchange-operations/exchange-change-password.glade.h:1
msgid "Change Password"
msgstr "Change Password"
#. Delegation Assistant
-#: ../plugins/exchange-operations/exchange-account-setup.c:333
+#: ../plugins/exchange-operations/exchange-account-setup.c:350
msgid "Manage the delegate settings for Exchange account"
msgstr "Manage the delegate settings for Exchange account"
-#: ../plugins/exchange-operations/exchange-account-setup.c:335
+#: ../plugins/exchange-operations/exchange-account-setup.c:352
msgid "Delegation Assistant"
msgstr "Delegation Assistant"
#. Miscelleneous settings
-#: ../plugins/exchange-operations/exchange-account-setup.c:347
+#: ../plugins/exchange-operations/exchange-account-setup.c:364
msgid "Miscelleneous"
msgstr "Miscelleneous"
#. Folder Size
-#: ../plugins/exchange-operations/exchange-account-setup.c:357
+#: ../plugins/exchange-operations/exchange-account-setup.c:374
msgid "View the size of all Exchange folders"
msgstr "View the size of all Exchange folders"
-#: ../plugins/exchange-operations/exchange-account-setup.c:359
+#: ../plugins/exchange-operations/exchange-account-setup.c:376
msgid "Folders Size"
msgstr "Folders Size"
-#: ../plugins/exchange-operations/exchange-account-setup.c:366
+#: ../plugins/exchange-operations/exchange-account-setup.c:383
#: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:3
msgid "Exchange Settings"
msgstr "Exchange Settings"
-#: ../plugins/exchange-operations/exchange-account-setup.c:688
+#: ../plugins/exchange-operations/exchange-account-setup.c:730
msgid "_OWA URL:"
msgstr "_OWA URL:"
-#: ../plugins/exchange-operations/exchange-account-setup.c:714
+#: ../plugins/exchange-operations/exchange-account-setup.c:756
msgid "A_uthenticate"
msgstr "A_uthenticate"
-#: ../plugins/exchange-operations/exchange-account-setup.c:735
+#: ../plugins/exchange-operations/exchange-account-setup.c:777
+msgid "S_pecify the mailbox name"
+msgstr "S_pecify the mailbox name"
+
+#: ../plugins/exchange-operations/exchange-account-setup.c:790
msgid "_Mailbox:"
msgstr "_Mailbox:"
-#: ../plugins/exchange-operations/exchange-account-setup.c:936
+#: ../plugins/exchange-operations/exchange-account-setup.c:1005
msgid "_Authentication Type"
msgstr "_Authentication Type"
-#: ../plugins/exchange-operations/exchange-account-setup.c:950
+#: ../plugins/exchange-operations/exchange-account-setup.c:1019
msgid "Ch_eck for Supported Types"
msgstr "Ch_eck for Supported Types"
-#: ../plugins/exchange-operations/exchange-account-setup.c:1062
-#: ../plugins/exchange-operations/exchange-contacts.c:212
+#: ../plugins/exchange-operations/exchange-account-setup.c:1134
+#: ../plugins/exchange-operations/exchange-contacts.c:217
#, c-format
msgid "%s KB"
msgstr "%s KB"
-#: ../plugins/exchange-operations/exchange-account-setup.c:1064
-#: ../plugins/exchange-operations/exchange-contacts.c:214
+#: ../plugins/exchange-operations/exchange-account-setup.c:1136
+#: ../plugins/exchange-operations/exchange-contacts.c:219
#, c-format
msgid "0 KB"
msgstr "0 KB"
-#: ../plugins/exchange-operations/exchange-calendar.c:192
-#: ../plugins/exchange-operations/exchange-contacts.c:165
+#: ../plugins/exchange-operations/exchange-calendar.c:196
+#: ../plugins/exchange-operations/exchange-contacts.c:170
msgid ""
"Evolution is in offline mode. You cannot create or modify folders now.\n"
"Please switch to online mode for such operations."
@@ -16746,32 +17016,32 @@ msgstr "Your current password has expired. Please change your password now."
msgid "Your password will expire in the next %d days"
msgstr "Your password will expire in the next %d days"
-#: ../plugins/exchange-operations/exchange-delegates-user.c:152
+#: ../plugins/exchange-operations/exchange-delegates-user.c:154
#: ../plugins/exchange-operations/exchange-permissions-dialog.c:570
msgid "Custom"
msgstr "Custom"
-#: ../plugins/exchange-operations/exchange-delegates-user.c:182
+#: ../plugins/exchange-operations/exchange-delegates-user.c:184
#: ../plugins/exchange-operations/exchange-delegates.glade.h:8
msgid "Editor (read, create, edit)"
msgstr "Editor (read, create, edit)"
-#: ../plugins/exchange-operations/exchange-delegates-user.c:186
+#: ../plugins/exchange-operations/exchange-delegates-user.c:188
#: ../plugins/exchange-operations/exchange-delegates.glade.h:1
msgid "Author (read, create)"
msgstr "Author (read, create)"
-#: ../plugins/exchange-operations/exchange-delegates-user.c:190
+#: ../plugins/exchange-operations/exchange-delegates-user.c:192
#: ../plugins/exchange-operations/exchange-delegates.glade.h:11
msgid "Reviewer (read-only)"
msgstr "Reviewer (read-only)"
-#: ../plugins/exchange-operations/exchange-delegates-user.c:240
+#: ../plugins/exchange-operations/exchange-delegates-user.c:242
#: ../plugins/exchange-operations/exchange-delegates.glade.h:6
msgid "Delegate Permissions"
msgstr "Delegate Permissions"
-#: ../plugins/exchange-operations/exchange-delegates-user.c:251
+#: ../plugins/exchange-operations/exchange-delegates-user.c:253
#: ../plugins/exchange-operations/exchange-permissions-dialog.c:178
#, c-format
msgid "Permissions for %s"
@@ -16780,7 +17050,7 @@ msgstr "Permissions for %s"
#. To translators: This is a part of the message to be sent to the delegatee
#. summarizing the permissions assigned to him.
#.
-#: ../plugins/exchange-operations/exchange-delegates-user.c:341
+#: ../plugins/exchange-operations/exchange-delegates-user.c:343
msgid ""
"This message was sent automatically by Evolution to inform you that you have "
"been designated as a delegate. You can now send messages on my behalf."
@@ -16790,25 +17060,25 @@ msgstr ""
#. To translators: Another chunk of the same message.
#.
-#: ../plugins/exchange-operations/exchange-delegates-user.c:346
+#: ../plugins/exchange-operations/exchange-delegates-user.c:348
msgid "You have been given the following permissions on my folders:"
msgstr "You have been given the following permissions on my folders:"
#. To translators: This message is included if the delegatee has been given access
#. to the private items.
#.
-#: ../plugins/exchange-operations/exchange-delegates-user.c:364
+#: ../plugins/exchange-operations/exchange-delegates-user.c:366
msgid "You are also permitted to see my private items."
msgstr "You are also permitted to see my private items."
#. To translators: This message is included if the delegatee has not been given access
#. to the private items.
#.
-#: ../plugins/exchange-operations/exchange-delegates-user.c:371
+#: ../plugins/exchange-operations/exchange-delegates-user.c:373
msgid "However you are not permitted to see my private items."
msgstr "However you are not permitted to see my private items."
-#: ../plugins/exchange-operations/exchange-delegates-user.c:403
+#: ../plugins/exchange-operations/exchange-delegates-user.c:405
#, c-format
msgid "You have been designated as a delegate for %s"
msgstr "You have been designated as a delegate for %s"
@@ -17012,8 +17282,8 @@ msgstr "Add User:"
#: ../plugins/exchange-operations/exchange-permissions-dialog.c:403
#: ../plugins/exchange-operations/exchange-send-options.c:410
-#: ../plugins/groupwise-features/proxy.c:934
-#: ../plugins/groupwise-features/share-folder.c:715
+#: ../plugins/groupwise-features/proxy.c:937
+#: ../plugins/groupwise-features/share-folder.c:716
msgid "Add User"
msgstr "Add User"
@@ -17131,11 +17401,11 @@ msgstr "_Sensitivity: "
msgid "_User"
msgstr "_User"
-#: ../plugins/exchange-operations/exchange-user-dialog.c:138
+#: ../plugins/exchange-operations/exchange-user-dialog.c:136
msgid "Select User"
msgstr "Select User"
-#: ../plugins/exchange-operations/exchange-user-dialog.c:176
+#: ../plugins/exchange-operations/exchange-user-dialog.c:174
msgid "Address Book..."
msgstr "Address Book..."
@@ -17160,18 +17430,22 @@ msgid "Exchange Operations"
msgstr "Exchange Operations"
#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:1
+msgid "Cannot access the \"Exchange settings\" tab in offline mode."
+msgstr "Cannot access the \"Exchange settings\" tab in offline mode."
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:2
msgid "Cannot change password due to configuration problems."
msgstr "Cannot change password due to configuration problems."
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:2
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:3
msgid "Cannot display folders."
msgstr "Cannot display folders."
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:3
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:4
msgid "Cannot perform the operation."
msgstr "Cannot perform the operation."
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:4
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:5
msgid ""
"Changes to options for Exchange account \"{0}\" will only take effect after "
"restarting Evolution."
@@ -17179,15 +17453,15 @@ msgstr ""
"Changes to options for Exchange account \"{0}\" will only take effect after "
"restarting Evolution."
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:5
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:6
msgid "Could not authenticate to server."
msgstr "Could not authenticate to server."
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:6
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:7
msgid "Could not change password."
msgstr "Could not change password."
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:7
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:8
msgid ""
"Could not configure Exchange account because \n"
"an unknown error occurred. Check the URL, \n"
@@ -17197,59 +17471,59 @@ msgstr ""
"an unknown error occurred. Check the URL, \n"
"username, and password, and try again."
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:10
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:11
msgid "Could not connect to Exchange server."
msgstr "Could not connect to Exchange server."
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:11
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:12
msgid "Could not connect to server {0}."
msgstr "Could not connect to server {0}."
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:12
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:13
msgid "Could not determine folder permissions for delegates."
msgstr "Could not determine folder permissions for delegates."
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:13
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:14
msgid "Could not find Exchange Web Storage System."
msgstr "Could not find Exchange Web Storage System."
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:14
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:15
msgid "Could not locate server {0}."
msgstr "Could not locate server {0}."
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:15
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:16
msgid "Could not make {0} a delegate"
msgstr "Could not make {0} a delegate"
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:16
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:17
msgid "Could not read folder permissions"
msgstr "Could not read folder permissions"
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:17
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:18
msgid "Could not read folder permissions."
msgstr "Could not read folder permissions."
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:18
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:19
msgid "Could not read out-of-office state"
msgstr "Could not read out-of-office state"
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:19
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:20
msgid "Could not update folder permissions."
msgstr "Could not update folder permissions."
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:20
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:21
msgid "Could not update out-of-office state"
msgstr "Could not update out-of-office state"
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:21
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:22
msgid "Evolution requires a restart to load the subscribed user's mailbox"
msgstr "Evolution requires a restart to load the subscribed user's mailbox"
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:22
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:23
msgid "Exchange Account is offline."
msgstr "Exchange Account is offline."
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:23
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:24
msgid ""
"Exchange Connector requires access to certain\n"
"functionality on the Exchange Server that appears\n"
@@ -17277,32 +17551,32 @@ msgstr ""
"{0}\n"
" "
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:35
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:36
msgid "Failed to update delegates:"
msgstr "Failed to update delegates:"
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:36
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:37
msgid "Folder already exists"
msgstr "Folder already exists"
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:37
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:38
msgid "Folder does not exist"
msgstr "Folder does not exist"
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:38
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:39
msgid "Folder offline"
msgstr "Folder offline"
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:39
-#: ../shell/e-shell.c:1306
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:40
+#: ../shell/e-shell.c:1269
msgid "Generic error"
msgstr "Generic error"
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:40
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:41
msgid "Global Catalog Server is not reachable"
msgstr "Global Catalogue Server is not reachable"
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:41
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:42
msgid ""
"If OWA is running on a different path, you must specify that in the account "
"configuration dialog."
@@ -17310,72 +17584,72 @@ msgstr ""
"If OWA is running on a different path, you must specify that in the account "
"configuration dialogue."
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:42
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:43
msgid "Mailbox for {0} is not on this server."
msgstr "Mailbox for {0} is not on this server."
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:43
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:44
msgid "Make sure the URL is correct and try again."
msgstr "Make sure the URL is correct and try again."
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:44
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:45
msgid "Make sure the server name is spelled correctly and try again."
msgstr "Make sure the server name is spelt correctly and try again."
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:45
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:46
msgid "Make sure the username and password are correct and try again."
msgstr "Make sure the username and password are correct and try again."
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:46
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:47
msgid "No Global Catalog server configured for this account."
msgstr "No Global Catalogue server configured for this account."
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:47
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:48
msgid "No mailbox for user {0} on {1}."
msgstr "No mailbox for user {0} on {1}."
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:48
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:49
msgid "No such user {0}"
msgstr "No such user {0}"
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:49
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:50
msgid "Password successfully changed."
msgstr "Password successfully changed."
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:51
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:52
msgid "Please enter a Delegate's ID or deselect the Send as a Delegate option."
msgstr ""
"Please enter a Delegate's ID or deselect the Send as a Delegate option."
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:52
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:53
msgid "Please make sure the Global Catalog Server name is correct."
msgstr "Please make sure the name of the Global Catalogue Server is correct."
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:53
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:54
msgid "Please restart Evolution for changes to take effect"
msgstr "Please restart Evolution for changes to take effect"
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:54
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:55
msgid "Please select a user."
msgstr "Please select a user."
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:55
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:56
msgid "Server rejected password because it is too weak."
msgstr "Server rejected password because it is too weak."
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:56
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:57
msgid "The Exchange account will be disabled when you quit Evolution"
msgstr "The Exchange account will be disabled when you quit Evolution"
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:57
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:58
msgid "The Exchange account will be removed when you quit Evolution"
msgstr "The Exchange account will be removed when you quit Evolution"
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:58
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:59
msgid "The Exchange server is not compatible with Exchange Connector."
msgstr "The Exchange server is not compatible with Exchange Connector."
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:59
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:60
msgid ""
"The server is running Exchange 5.5. Exchange Connector \n"
"supports Microsoft Exchange 2000 and 2003 only."
@@ -17383,7 +17657,7 @@ msgstr ""
"The server is running Exchange 5.5. Exchange Connector \n"
"supports Microsoft Exchange 2000 and 2003 only."
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:61
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:62
msgid ""
"This probably means that your server requires \n"
"you to specify the Windows domain name \n"
@@ -17397,40 +17671,40 @@ msgstr ""
"\n"
"Or you might have just typed your password wrong."
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:66
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:67
msgid "Try again with a different password."
msgstr "Try again with a different password."
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:67
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:68
msgid "Unable to add user to access control list:"
msgstr "Unable to add user to access control list:"
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:68
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:69
msgid "Unable to edit delegates."
msgstr "Unable to edit delegates."
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:69
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:70
msgid "Unknown error looking up {0}"
msgstr "Unknown error looking up {0}"
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:70
-#: ../plugins/google-account-setup/google-source.c:543
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:71
+#: ../plugins/google-account-setup/google-source.c:521
msgid "Unknown error."
msgstr "Unknown error."
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:71
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:72
msgid "Unknown type"
msgstr "Unknown type"
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:72
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:73
msgid "Unsupported operation"
msgstr "Unsupported operation"
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:73
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:74
msgid "You are nearing your quota available for storing mail on this server."
msgstr "You are nearing your quota available for storing mail on this server."
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:74
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:75
msgid ""
"You are permitted to send a message on behalf of only one delegator at a "
"time."
@@ -17438,19 +17712,19 @@ msgstr ""
"You are permitted to send a message on behalf of only one delegator at a "
"time."
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:75
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:76
msgid "You cannot make yourself your own delegate"
msgstr "You cannot make yourself your own delegate"
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:76
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:77
msgid "You have exceeded your quota for storing mail on this server."
msgstr "You have exceeded your quota for storing mail on this server."
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:77
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:78
msgid "You may only configure a single Exchange account."
msgstr "You may only configure a single Exchange account."
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:78
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:79
msgid ""
"Your current usage is: {0} KB. Try to clear up some space by deleting some "
"mail."
@@ -17458,7 +17732,7 @@ msgstr ""
"Your current usage is: {0} KB. Try to clear up some space by deleting some "
"mail."
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:79
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:80
msgid ""
"Your current usage is: {0} KB. You will not be able to either send or "
"receive mail now."
@@ -17466,7 +17740,7 @@ msgstr ""
"Your current usage is: {0} KB. You will not be able to either send or "
"receive mail now."
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:80
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:81
msgid ""
"Your current usage is: {0} KB. You will not be able to send mail until you "
"clear up some space by deleting some mail."
@@ -17474,19 +17748,19 @@ msgstr ""
"Your current usage is: {0} KB. You will not be able to send mail until you "
"clear up some space by deleting some mail."
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:81
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:82
msgid "Your password has expired."
msgstr "Your password has expired."
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:83
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:84
msgid "{0} cannot be added to an access control list"
msgstr "{0} cannot be added to an access control list"
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:84
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:85
msgid "{0} is already a delegate"
msgstr "{0} is already a delegate"
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:85
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:86
msgid "{0} is already in the list"
msgstr "{0} is already in the list"
@@ -17551,11 +17825,11 @@ msgstr "Compose in _External Editor"
msgid "Compose messages using an external editor"
msgstr "Compose messages using an external editor"
-#: ../plugins/external-editor/external-editor.c:112
+#: ../plugins/external-editor/external-editor.c:114
msgid "Command to be executed to launch the editor: "
msgstr "Command to be executed to launch the editor: "
-#: ../plugins/external-editor/external-editor.c:113
+#: ../plugins/external-editor/external-editor.c:115
msgid ""
"For Emacs use \"xemacs\"\n"
"For VI use \"gvim\""
@@ -17585,18 +17859,14 @@ msgstr ""
"configure a 48*48 png image. It is base64 encoded and stored in ~/.evolution/"
"faces This will be used in messages that are sent further."
-#: ../plugins/face/org-gnome-face.eplug.xml.h:2
-msgid "Face"
-msgstr "Face"
-
#: ../plugins/folder-unsubscribe/folder-unsubscribe.c:56
#, c-format
msgid "Unsubscribing from folder \"%s\""
msgstr "Unsubscribing from folder \"%s\""
#: ../plugins/folder-unsubscribe/org-gnome-mail-folder-unsubscribe.eplug.xml.h:1
-msgid "Allows unsubscribing of mail folders in the folder tree context menu."
-msgstr "Allows unsubscribing of mail folders in the folder tree context menu."
+msgid "Allows unsubscribing of mail folders in the side bar context menu."
+msgstr "Allows unsubscribing of mail folders in the side bar context menu."
#: ../plugins/folder-unsubscribe/org-gnome-mail-folder-unsubscribe.eplug.xml.h:2
msgid "Unsubscribe Folders"
@@ -17606,24 +17876,12 @@ msgstr "Unsubscribe Folders"
msgid "_Unsubscribe"
msgstr "_Unsubscribe"
-#: ../plugins/google-account-setup/google-source.c:83
-#: ../plugins/google-account-setup/google-source.c:90
-#: ../plugins/google-account-setup/google-contacts-source.c:52
-#: ../plugins/google-account-setup/google-contacts-source.c:57
-#: ../plugins/google-account-setup/google-contacts-source.c:83
-msgid "Google"
-msgstr "Google"
-
-#: ../plugins/google-account-setup/google-source.c:439
-msgid "Please enter user name first."
-msgstr "Please enter user name first."
-
-#: ../plugins/google-account-setup/google-source.c:443
+#: ../plugins/google-account-setup/google-source.c:421
#, c-format
msgid "Enter password for user %s to access list of subscribed calendars."
msgstr "Enter password for user %s to access list of subscribed calendars."
-#: ../plugins/google-account-setup/google-source.c:543
+#: ../plugins/google-account-setup/google-source.c:521
#, c-format
msgid ""
"Cannot read data from Google server.\n"
@@ -17632,22 +17890,27 @@ msgstr ""
"Cannot read data from Google server.\n"
"%s"
-#: ../plugins/google-account-setup/google-source.c:693
+#: ../plugins/google-account-setup/google-source.c:683
msgid "Cal_endar:"
msgstr "Cal_endar:"
-#: ../plugins/google-account-setup/google-source.c:728
+#: ../plugins/google-account-setup/google-source.c:718
msgid "Retrieve _list"
msgstr "Retrieve _list"
-#: ../plugins/google-account-setup/google-contacts-source.c:268
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:300
+#: ../plugins/google-account-setup/google-contacts-source.c:69
+#: ../plugins/google-account-setup/google-contacts-source.c:71
+msgid "Google"
+msgstr "Google"
+
+#: ../plugins/google-account-setup/google-contacts-source.c:306
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:325
msgid "<b>Server</b>"
msgstr "<b>Server</b>"
#: ../plugins/google-account-setup/org-gnome-evolution-google.eplug.xml.h:1
-msgid "A plugin to setup google calendar and contacts."
-msgstr "A plugin to set up Google Calendar and Contacts."
+msgid "A plugin to setup Google Calendar and Contacts."
+msgstr "A plugin to setup Google Calendar and Contacts."
#: ../plugins/google-account-setup/org-gnome-evolution-google.eplug.xml.h:2
msgid "Google sources"
@@ -17658,14 +17921,14 @@ msgid "Checklist"
msgstr "Checklist"
#: ../plugins/groupwise-account-setup/org-gnome-gw-account-setup.eplug.xml.h:1
-msgid "A plugin to setup groupwise calendar and contacts sources."
-msgstr "A plugin to setup Groupwise calendar and contacts sources."
+msgid "A plugin to setup GroupWise calendar and contacts sources."
+msgstr "A plugin to setup GroupWise calendar and contacts sources."
#: ../plugins/groupwise-account-setup/org-gnome-gw-account-setup.eplug.xml.h:2
-msgid "Groupwise Account Setup"
-msgstr "Groupwise Account Setup"
+msgid "GroupWise Account Setup"
+msgstr "GroupWise Account Setup"
-#: ../plugins/groupwise-features/install-shared.c:219
+#: ../plugins/groupwise-features/install-shared.c:220
#, c-format
msgid ""
"The user '%s' has shared a folder with you\n"
@@ -17690,11 +17953,11 @@ msgstr ""
"Click 'Forward' to install the shared folder\n"
"\n"
-#: ../plugins/groupwise-features/install-shared.c:224
+#: ../plugins/groupwise-features/install-shared.c:225
msgid "Install the shared folder"
msgstr "Install the shared folder"
-#: ../plugins/groupwise-features/install-shared.c:226
+#: ../plugins/groupwise-features/install-shared.c:227
msgid "Shared Folder Installation"
msgstr "Shared Folder Installation"
@@ -17720,7 +17983,7 @@ msgid "Email:"
msgstr "E-mail:"
#: ../plugins/groupwise-features/junk-settings.glade.h:5
-#: ../plugins/mail-account-disable/mail-account-disable.c:46
+#: ../plugins/mail-account-disable/mail-account-disable.c:45
msgid "_Disable"
msgstr "_Disable"
@@ -17753,16 +18016,16 @@ msgid "Retract Mail"
msgstr "Retract Mail"
#: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:1
-msgid "Add Send Options to groupwise messages"
-msgstr "Add Send Options to groupwise messages"
+msgid "Add Send Options to GroupWise messages"
+msgstr "Add Send Options to GroupWise messages"
#: ../plugins/groupwise-features/org-gnome-groupwise-features.eplug.xml.h:1
-msgid "A plugin for the features in Groupwise accounts."
-msgstr "A plugin for the features in Groupwise accounts."
+msgid "A plugin for the features in GroupWise accounts."
+msgstr "A plugin for the features in GroupWise accounts."
#: ../plugins/groupwise-features/org-gnome-groupwise-features.eplug.xml.h:2
-msgid "Groupwise Features"
-msgstr "Groupwise Features"
+msgid "GroupWise Features"
+msgstr "GroupWise Features"
#: ../plugins/groupwise-features/org-gnome-mail-retract-errors.xml.h:1
msgid "Message retract failed"
@@ -17778,20 +18041,23 @@ msgstr "The server did not allow the selected message to be retracted."
msgid "Invalid user"
msgstr "Invalid user"
-#: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:2
+#. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
+#: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:3
msgid "Proxy access cannot be given to user &quot;{0}&quot;"
msgstr "Proxy access cannot be given to user &quot;{0}&quot;"
-#: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:3
+#: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:4
#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:2
msgid "Specify User"
msgstr "Specify User"
-#: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:4
+#. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
+#: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:6
msgid "You have already given proxy permissions to this user."
msgstr "You have already given proxy permissions to this user."
-#: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:5
+#. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
+#: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:8
msgid "You have to specify a valid user name to give proxy rights."
msgstr "You have to specify a valid user name to give proxy rights."
@@ -17815,21 +18081,23 @@ msgstr ""
msgid "This is a recurring meeting"
msgstr "This is a recurring meeting"
-#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:4
+#. Translators: "it" is a "recurring meeting" (string refers to "This is a recurring meeting")
+#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:5
msgid "Would you like to accept it?"
msgstr "Would you like to accept it?"
-#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:5
+#. Translators: "it" is a "recurring meeting" (string refers to "This is a recurring meeting")
+#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:7
msgid "Would you like to decline it?"
msgstr "Would you like to decline it?"
-#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:6
-msgid "You cannot share folder with specified user &quot;{0}&quot;"
-msgstr "You cannot share folder with specified user &quot;{0}&quot;"
+#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:8
+msgid "You cannot share this folder with the specified user &quot;{0}&quot;"
+msgstr "You cannot share folder with the specified user &quot;{0}&quot;"
-#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:7
-msgid "You have to specify a user name whom you want to add to the list"
-msgstr "You have to specify a user name whom you want to add to the list"
+#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:9
+msgid "You have to specify a user name which you want to add to the list"
+msgstr "You have to specify a user name which you want to add to the list"
#: ../plugins/groupwise-features/process-meeting.c:52
msgid "Accept Tentatively"
@@ -17917,7 +18185,8 @@ msgstr "_Write"
msgid "permission to read|_Read"
msgstr "_Read"
-#: ../plugins/groupwise-features/proxy-listing.glade.h:1
+#. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
+#: ../plugins/groupwise-features/proxy-listing.glade.h:2
msgid "Proxy"
msgstr "Proxy"
@@ -17925,14 +18194,15 @@ msgstr "Proxy"
msgid "<b>Account Name</b>"
msgstr "<b>Account Name</b>"
-#: ../plugins/groupwise-features/proxy-login-dialog.glade.h:2
+#. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
+#: ../plugins/groupwise-features/proxy-login-dialog.glade.h:3
msgid "Proxy Login"
msgstr "Proxy Login"
-#: ../plugins/groupwise-features/proxy-login.c:208
-#: ../plugins/groupwise-features/proxy-login.c:250
+#: ../plugins/groupwise-features/proxy-login.c:206
+#: ../plugins/groupwise-features/proxy-login.c:248
#: ../plugins/groupwise-features/proxy.c:491
-#: ../plugins/groupwise-features/send-options.c:83
+#: ../plugins/groupwise-features/send-options.c:85
#, c-format
msgid "%sEnter password for %s (user %s)"
msgstr "%sEnter password for %s (user %s)"
@@ -17940,20 +18210,26 @@ msgstr "%sEnter password for %s (user %s)"
#. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a groupwise
#. * feature by which one person can send/read mails/appointments using another person's identity
#. * without knowing his password, for example if that other person is on vacation
-#: ../plugins/groupwise-features/proxy-login.c:509
+#: ../plugins/groupwise-features/proxy-login.c:510
msgid "_Proxy Login..."
msgstr "_Proxy Login..."
-#: ../plugins/groupwise-features/proxy.c:691
+#. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
+#: ../plugins/groupwise-features/proxy.c:692
msgid "The Proxy tab will be available only when the account is online."
msgstr "The Proxy tab will be available only when the account is online."
-#: ../plugins/groupwise-features/proxy.c:696
+#. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
+#: ../plugins/groupwise-features/proxy.c:698
msgid "The Proxy tab will be available only when the account is enabled."
msgstr "The Proxy tab will be available only when the account is enabled."
+#: ../plugins/groupwise-features/send-options.c:214
+msgid "Advanced send options"
+msgstr "Advanced send options"
+
#: ../plugins/groupwise-features/share-folder-common.c:321
-#: ../plugins/groupwise-features/share-folder.c:750
+#: ../plugins/groupwise-features/share-folder.c:751
msgid "Users"
msgstr "Users"
@@ -17969,68 +18245,68 @@ msgstr "New _Shared Folder..."
msgid "Sharing"
msgstr "Sharing"
-#: ../plugins/groupwise-features/share-folder.c:533
+#: ../plugins/groupwise-features/share-folder.c:534
msgid "Custom Notification"
msgstr "Custom Notification"
-#: ../plugins/groupwise-features/share-folder.c:755
+#: ../plugins/groupwise-features/share-folder.c:756
msgid "Add "
msgstr "Add "
-#: ../plugins/groupwise-features/share-folder.c:761
+#: ../plugins/groupwise-features/share-folder.c:762
msgid "Modify"
msgstr "Modify"
-#: ../plugins/groupwise-features/status-track.c:105
+#: ../plugins/groupwise-features/status-track.c:97
msgid "Message Status"
msgstr "Message Status"
#. Subject
-#: ../plugins/groupwise-features/status-track.c:119
+#: ../plugins/groupwise-features/status-track.c:111
msgid "Subject:"
msgstr "Subject:"
-#: ../plugins/groupwise-features/status-track.c:133
+#: ../plugins/groupwise-features/status-track.c:125
msgid "From:"
msgstr "From:"
-#: ../plugins/groupwise-features/status-track.c:148
+#: ../plugins/groupwise-features/status-track.c:140
msgid "Creation date:"
msgstr "Creation date:"
-#: ../plugins/groupwise-features/status-track.c:187
+#: ../plugins/groupwise-features/status-track.c:179
msgid "Recipient: "
msgstr "Recipient: "
-#: ../plugins/groupwise-features/status-track.c:194
+#: ../plugins/groupwise-features/status-track.c:186
msgid "Delivered: "
msgstr "Delivered: "
-#: ../plugins/groupwise-features/status-track.c:200
+#: ../plugins/groupwise-features/status-track.c:192
msgid "Opened: "
msgstr "Opened: "
-#: ../plugins/groupwise-features/status-track.c:205
+#: ../plugins/groupwise-features/status-track.c:197
msgid "Accepted: "
msgstr "Accepted: "
-#: ../plugins/groupwise-features/status-track.c:210
+#: ../plugins/groupwise-features/status-track.c:202
msgid "Deleted: "
msgstr "Deleted: "
-#: ../plugins/groupwise-features/status-track.c:215
+#: ../plugins/groupwise-features/status-track.c:207
msgid "Declined: "
msgstr "Declined: "
-#: ../plugins/groupwise-features/status-track.c:220
+#: ../plugins/groupwise-features/status-track.c:212
msgid "Completed: "
msgstr "Completed: "
-#: ../plugins/groupwise-features/status-track.c:225
+#: ../plugins/groupwise-features/status-track.c:217
msgid "Undelivered: "
msgstr "Undelivered: "
-#: ../plugins/groupwise-features/status-track.c:249
+#: ../plugins/groupwise-features/status-track.c:241
msgid "Track Message Status..."
msgstr "Track Message Status..."
@@ -18134,11 +18410,11 @@ msgstr "Import to Calendar"
msgid "Imports ICS attachments to calendar."
msgstr "Imports ICS attachments to calendar."
-#: ../plugins/ipod-sync/evolution-ipod-sync.c:34
+#: ../plugins/ipod-sync/evolution-ipod-sync.c:49
msgid "Hardware Abstraction Layer not loaded"
msgstr "Hardware Abstraction Layer not loaded"
-#: ../plugins/ipod-sync/evolution-ipod-sync.c:35
+#: ../plugins/ipod-sync/evolution-ipod-sync.c:50
msgid ""
"The \"hald\" service is required but not currently running. Please enable "
"the service and rerun this program, or contact your system administrator."
@@ -18146,11 +18422,11 @@ msgstr ""
"The \"hald\" service is required but not currently running. Please enable "
"the service and rerun this program, or contact your system administrator."
-#: ../plugins/ipod-sync/evolution-ipod-sync.c:68
+#: ../plugins/ipod-sync/evolution-ipod-sync.c:83
msgid "Search for an iPod failed"
msgstr "Search for an iPod failed"
-#: ../plugins/ipod-sync/evolution-ipod-sync.c:69
+#: ../plugins/ipod-sync/evolution-ipod-sync.c:84
msgid ""
"Evolution could not find an iPod to synchronize with. Either the iPod is not "
"connected to the system or it is not powered on."
@@ -18158,8 +18434,8 @@ msgstr ""
"Evolution could not find an iPod to synchronise with. Either the iPod is not "
"connected to the system or it is not powered on."
-#: ../plugins/ipod-sync/ical-format.c:118
-#: ../plugins/save-calendar/ical-format.c:163
+#: ../plugins/ipod-sync/ical-format.c:119
+#: ../plugins/save-calendar/ical-format.c:164
msgid "iCalendar format (.ics)"
msgstr "iCalendar format (.ics)"
@@ -18177,128 +18453,128 @@ msgstr "Synchronise to iPod"
msgid "iPod Synchronization"
msgstr "iPod Synchronisation"
-#: ../plugins/itip-formatter/itip-formatter.c:443
-#: ../plugins/itip-formatter/itip-formatter.c:568
+#: ../plugins/itip-formatter/itip-formatter.c:481
+#: ../plugins/itip-formatter/itip-formatter.c:606
#, c-format
msgid "Failed to load the calendar '%s'"
msgstr "Failed to load the calendar '%s'"
-#: ../plugins/itip-formatter/itip-formatter.c:588
+#: ../plugins/itip-formatter/itip-formatter.c:626
#, c-format
msgid "An appointment in the calendar '%s' conflicts with this meeting"
msgstr "An appointment in the calendar '%s' conflicts with this meeting"
-#: ../plugins/itip-formatter/itip-formatter.c:614
+#: ../plugins/itip-formatter/itip-formatter.c:662
#, c-format
msgid "Found the appointment in the calendar '%s'"
msgstr "Found the appointment in the calendar '%s'"
-#: ../plugins/itip-formatter/itip-formatter.c:690
+#: ../plugins/itip-formatter/itip-formatter.c:752
msgid "Unable to find any calendars"
msgstr "Unable to find any calendars"
-#: ../plugins/itip-formatter/itip-formatter.c:697
+#: ../plugins/itip-formatter/itip-formatter.c:759
msgid "Unable to find this meeting in any calendar"
msgstr "Unable to find this meeting in any calendar"
-#: ../plugins/itip-formatter/itip-formatter.c:701
+#: ../plugins/itip-formatter/itip-formatter.c:763
msgid "Unable to find this task in any task list"
msgstr "Unable to find this task in any task list"
-#: ../plugins/itip-formatter/itip-formatter.c:705
+#: ../plugins/itip-formatter/itip-formatter.c:767
msgid "Unable to find this memo in any memo list"
msgstr "Unable to find this memo in any memo list"
-#: ../plugins/itip-formatter/itip-formatter.c:776
+#: ../plugins/itip-formatter/itip-formatter.c:838
msgid "Searching for an existing version of this appointment"
msgstr "Searching for an existing version of this appointment"
-#: ../plugins/itip-formatter/itip-formatter.c:945
+#: ../plugins/itip-formatter/itip-formatter.c:1020
msgid "Unable to parse item"
msgstr "Unable to parse item"
-#: ../plugins/itip-formatter/itip-formatter.c:1003
+#: ../plugins/itip-formatter/itip-formatter.c:1107
#, c-format
msgid "Unable to send item to calendar '%s'. %s"
msgstr "Unable to send item to calendar '%s'. %s"
-#: ../plugins/itip-formatter/itip-formatter.c:1015
+#: ../plugins/itip-formatter/itip-formatter.c:1119
#, c-format
msgid "Sent to calendar '%s' as accepted"
msgstr "Sent to calendar '%s' as accepted"
-#: ../plugins/itip-formatter/itip-formatter.c:1019
+#: ../plugins/itip-formatter/itip-formatter.c:1123
#, c-format
msgid "Sent to calendar '%s' as tentative"
msgstr "Sent to calendar '%s' as tentative"
-#: ../plugins/itip-formatter/itip-formatter.c:1024
+#: ../plugins/itip-formatter/itip-formatter.c:1128
#, c-format
msgid "Sent to calendar '%s' as declined"
msgstr "Sent to calendar '%s' as declined"
-#: ../plugins/itip-formatter/itip-formatter.c:1029
+#: ../plugins/itip-formatter/itip-formatter.c:1133
#, c-format
msgid "Sent to calendar '%s' as canceled"
msgstr "Sent to calendar '%s' as cancelled"
-#: ../plugins/itip-formatter/itip-formatter.c:1123
+#: ../plugins/itip-formatter/itip-formatter.c:1227
#, c-format
msgid "Organizer has removed the delegate %s "
msgstr "Organiser has removed the delegate %s "
-#: ../plugins/itip-formatter/itip-formatter.c:1130
+#: ../plugins/itip-formatter/itip-formatter.c:1234
msgid "Sent a cancelation notice to the delegate"
msgstr "Sent a cancellation notice to the delegate"
-#: ../plugins/itip-formatter/itip-formatter.c:1132
+#: ../plugins/itip-formatter/itip-formatter.c:1236
msgid "Could not send the cancelation notice to the delegate"
msgstr "Could not send the cancellation notice to the delegate"
-#: ../plugins/itip-formatter/itip-formatter.c:1218
+#: ../plugins/itip-formatter/itip-formatter.c:1342
msgid "Attendee status could not be updated because the status is invalid"
msgstr "Attendee status could not be updated because the status is invalid"
-#: ../plugins/itip-formatter/itip-formatter.c:1245
+#: ../plugins/itip-formatter/itip-formatter.c:1371
#, c-format
msgid "Unable to update attendee. %s"
msgstr "Unable to update attendee. %s"
-#: ../plugins/itip-formatter/itip-formatter.c:1249
+#: ../plugins/itip-formatter/itip-formatter.c:1375
msgid "Attendee status updated"
msgstr "Attendee status updated"
-#: ../plugins/itip-formatter/itip-formatter.c:1275
+#: ../plugins/itip-formatter/itip-formatter.c:1401
msgid "Meeting information sent"
msgstr "Meeting information sent"
-#: ../plugins/itip-formatter/itip-formatter.c:1278
+#: ../plugins/itip-formatter/itip-formatter.c:1404
msgid "Task information sent"
msgstr "Task information sent"
-#: ../plugins/itip-formatter/itip-formatter.c:1281
+#: ../plugins/itip-formatter/itip-formatter.c:1407
msgid "Memo information sent"
msgstr "Memo information sent"
-#: ../plugins/itip-formatter/itip-formatter.c:1290
+#: ../plugins/itip-formatter/itip-formatter.c:1416
msgid "Unable to send meeting information, the meeting does not exist"
msgstr "Unable to send meeting information, the meeting does not exist"
-#: ../plugins/itip-formatter/itip-formatter.c:1293
+#: ../plugins/itip-formatter/itip-formatter.c:1419
msgid "Unable to send task information, the task does not exist"
msgstr "Unable to send task information, the task does not exist"
-#: ../plugins/itip-formatter/itip-formatter.c:1296
+#: ../plugins/itip-formatter/itip-formatter.c:1422
msgid "Unable to send memo information, the memo does not exist"
msgstr "Unable to send memo information, the memo does not exist"
-#: ../plugins/itip-formatter/itip-formatter.c:1365
-#: ../plugins/itip-formatter/itip-formatter.c:1376
+#: ../plugins/itip-formatter/itip-formatter.c:1491
+#: ../plugins/itip-formatter/itip-formatter.c:1502
msgid "The calendar attached is not valid"
msgstr "The calendar attached is not valid"
-#: ../plugins/itip-formatter/itip-formatter.c:1366
-#: ../plugins/itip-formatter/itip-formatter.c:1377
+#: ../plugins/itip-formatter/itip-formatter.c:1492
+#: ../plugins/itip-formatter/itip-formatter.c:1503
msgid ""
"The message claims to contain a calendar, but the calendar is not a valid "
"iCalendar."
@@ -18306,15 +18582,15 @@ msgstr ""
"The message claims to contain a calendar, but the calendar is not a valid "
"iCalendar."
-#: ../plugins/itip-formatter/itip-formatter.c:1417
-#: ../plugins/itip-formatter/itip-formatter.c:1435
-#: ../plugins/itip-formatter/itip-formatter.c:1517
+#: ../plugins/itip-formatter/itip-formatter.c:1543
+#: ../plugins/itip-formatter/itip-formatter.c:1571
+#: ../plugins/itip-formatter/itip-formatter.c:1663
msgid "The item in the calendar is not valid"
msgstr "The item in the calendar is not valid"
-#: ../plugins/itip-formatter/itip-formatter.c:1418
-#: ../plugins/itip-formatter/itip-formatter.c:1436
-#: ../plugins/itip-formatter/itip-formatter.c:1518
+#: ../plugins/itip-formatter/itip-formatter.c:1544
+#: ../plugins/itip-formatter/itip-formatter.c:1572
+#: ../plugins/itip-formatter/itip-formatter.c:1664
msgid ""
"The message does contain a calendar, but the calendar contains no events, "
"tasks or free/busy information"
@@ -18322,11 +18598,11 @@ msgstr ""
"The message does contain a calendar, but the calendar contains no events, "
"tasks or free/busy information"
-#: ../plugins/itip-formatter/itip-formatter.c:1447
+#: ../plugins/itip-formatter/itip-formatter.c:1583
msgid "The calendar attached contains multiple items"
msgstr "The calendar attached contains multiple items"
-#: ../plugins/itip-formatter/itip-formatter.c:1448
+#: ../plugins/itip-formatter/itip-formatter.c:1584
msgid ""
"To process all of these items, the file should be saved and the calendar "
"imported"
@@ -18334,227 +18610,227 @@ msgstr ""
"To process all of these items, the file should be saved and the calendar "
"imported"
-#: ../plugins/itip-formatter/itip-formatter.c:2148
+#: ../plugins/itip-formatter/itip-formatter.c:2306
msgid "This meeting recurs"
msgstr "This meeting recurs"
-#: ../plugins/itip-formatter/itip-formatter.c:2151
+#: ../plugins/itip-formatter/itip-formatter.c:2309
msgid "This task recurs"
msgstr "This task recurs"
-#: ../plugins/itip-formatter/itip-formatter.c:2154
+#: ../plugins/itip-formatter/itip-formatter.c:2312
msgid "This memo recurs"
msgstr "This memo recurs"
#. Delete message after acting
#. FIXME Need a schema for this
-#: ../plugins/itip-formatter/itip-formatter.c:2383
+#: ../plugins/itip-formatter/itip-formatter.c:2548
msgid "_Delete message after acting"
msgstr "_Delete message after acting"
-#: ../plugins/itip-formatter/itip-formatter.c:2393
-#: ../plugins/itip-formatter/itip-formatter.c:2425
+#: ../plugins/itip-formatter/itip-formatter.c:2558
+#: ../plugins/itip-formatter/itip-formatter.c:2590
msgid "Conflict Search"
msgstr "Conflict Search"
#. Source selector
-#: ../plugins/itip-formatter/itip-formatter.c:2408
+#: ../plugins/itip-formatter/itip-formatter.c:2573
msgid "Select the calendars to search for meeting conflicts"
msgstr "Select the calendars to search for meeting conflicts"
#. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:189 ../ui/evolution-calendar.xml.h:34
-#: ../widgets/misc/e-cell-date-edit.c:298
+#: ../plugins/itip-formatter/itip-view.c:191 ../ui/evolution-calendar.xml.h:34
+#: ../widgets/misc/e-cell-date-edit.c:297
msgid "Today"
msgstr "Today"
#. strftime format of a time,
#. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:194
+#: ../plugins/itip-formatter/itip-view.c:196
msgid "Today %H:%M"
msgstr "Today %H:%M"
#. strftime format of a time,
#. in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:198
+#: ../plugins/itip-formatter/itip-view.c:200
msgid "Today %H:%M:%S"
msgstr "Today %H:%M:%S"
#. strftime format of a time,
#. in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:207
+#: ../plugins/itip-formatter/itip-view.c:209
msgid "Today %l:%M:%S %p"
msgstr "Today %l:%M:%S %p"
#. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:217
+#: ../plugins/itip-formatter/itip-view.c:219
msgid "Tomorrow"
msgstr "Tomorrow"
#. strftime format of a time,
#. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:222
+#: ../plugins/itip-formatter/itip-view.c:224
msgid "Tomorrow %H:%M"
msgstr "Tomorrow %H:%M"
#. strftime format of a time,
#. in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:226
+#: ../plugins/itip-formatter/itip-view.c:228
msgid "Tomorrow %H:%M:%S"
msgstr "Tomorrow %H:%M:%S"
#. strftime format of a time,
#. in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:231
+#: ../plugins/itip-formatter/itip-view.c:233
msgid "Tomorrow %l:%M %p"
msgstr "Tomorrow %l:%M %p"
#. strftime format of a time,
#. in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:235
+#: ../plugins/itip-formatter/itip-view.c:237
msgid "Tomorrow %l:%M:%S %p"
msgstr "Tomorrow %l:%M:%S %p"
#. strftime format of a weekday.
-#: ../plugins/itip-formatter/itip-view.c:254
+#: ../plugins/itip-formatter/itip-view.c:256
#, c-format
msgid "%A"
msgstr "%A"
#. strftime format of a weekday and a
#. time, in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:259
+#: ../plugins/itip-formatter/itip-view.c:261
msgid "%A %H:%M"
msgstr "%A %H:%M"
#. strftime format of a weekday and a
#. time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:263
+#: ../plugins/itip-formatter/itip-view.c:265
msgid "%A %H:%M:%S"
msgstr "%A %H:%M:%S"
#. strftime format of a weekday and a
#. time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:268
+#: ../plugins/itip-formatter/itip-view.c:270
msgid "%A %l:%M %p"
msgstr "%A %l:%M %p"
#. strftime format of a weekday and a
#. time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:272
+#: ../plugins/itip-formatter/itip-view.c:274
msgid "%A %l:%M:%S %p"
msgstr "%A %l:%M:%S %p"
#. strftime format of a weekday and a date
#. without a year.
-#: ../plugins/itip-formatter/itip-view.c:281
+#: ../plugins/itip-formatter/itip-view.c:283
msgid "%A, %B %e"
msgstr "%A, %B %e"
#. strftime format of a weekday, a date
#. without a year and a time,
#. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:287
+#: ../plugins/itip-formatter/itip-view.c:289
msgid "%A, %B %e %H:%M"
msgstr "%A, %B %e %H:%M"
#. strftime format of a weekday, a date without a year
#. and a time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:291
+#: ../plugins/itip-formatter/itip-view.c:293
msgid "%A, %B %e %H:%M:%S"
msgstr "%A, %B %e %H:%M:%S"
#. strftime format of a weekday, a date without a year
#. and a time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:296
+#: ../plugins/itip-formatter/itip-view.c:298
msgid "%A, %B %e %l:%M %p"
msgstr "%A, %B %e %l:%M %p"
#. strftime format of a weekday, a date without a year
#. and a time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:300
+#: ../plugins/itip-formatter/itip-view.c:302
msgid "%A, %B %e %l:%M:%S %p"
msgstr "%A, %B %e %l:%M:%S %p"
#. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:306
+#: ../plugins/itip-formatter/itip-view.c:308
msgid "%A, %B %e, %Y"
msgstr "%A, %B %e, %Y"
#. strftime format of a weekday, a date and a
#. time, in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:311
+#: ../plugins/itip-formatter/itip-view.c:313
msgid "%A, %B %e, %Y %H:%M"
msgstr "%A, %B %e, %Y %H:%M"
#. strftime format of a weekday, a date and a
#. time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:315
+#: ../plugins/itip-formatter/itip-view.c:317
msgid "%A, %B %e, %Y %H:%M:%S"
msgstr "%A, %B %e, %Y %H:%M:%S"
#. strftime format of a weekday, a date and a
#. time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:320
+#: ../plugins/itip-formatter/itip-view.c:322
msgid "%A, %B %e, %Y %l:%M %p"
msgstr "%A, %B %e, %Y %l:%M %p"
#. strftime format of a weekday, a date and a
#. time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:324
+#: ../plugins/itip-formatter/itip-view.c:326
msgid "%A, %B %e, %Y %l:%M:%S %p"
msgstr "%A, %B %e, %Y %l:%M:%S %p"
-#: ../plugins/itip-formatter/itip-view.c:349
-#: ../plugins/itip-formatter/itip-view.c:437
-#: ../plugins/itip-formatter/itip-view.c:525
+#: ../plugins/itip-formatter/itip-view.c:351
+#: ../plugins/itip-formatter/itip-view.c:439
+#: ../plugins/itip-formatter/itip-view.c:527
#, c-format
msgid "Please respond on behalf of <b>%s</b>"
msgstr "Please respond on behalf of <b>%s</b>"
-#: ../plugins/itip-formatter/itip-view.c:351
-#: ../plugins/itip-formatter/itip-view.c:439
-#: ../plugins/itip-formatter/itip-view.c:527
+#: ../plugins/itip-formatter/itip-view.c:353
+#: ../plugins/itip-formatter/itip-view.c:441
+#: ../plugins/itip-formatter/itip-view.c:529
#, c-format
msgid "Received on behalf of <b>%s</b>"
msgstr "Received on behalf of <b>%s</b>"
-#: ../plugins/itip-formatter/itip-view.c:356
+#: ../plugins/itip-formatter/itip-view.c:358
#, c-format
msgid "<b>%s</b> through %s has published the following meeting information:"
msgstr "<b>%s</b> through %s has published the following meeting information:"
-#: ../plugins/itip-formatter/itip-view.c:358
+#: ../plugins/itip-formatter/itip-view.c:360
#, c-format
msgid "<b>%s</b> has published the following meeting information:"
msgstr "<b>%s</b> has published the following meeting information:"
-#: ../plugins/itip-formatter/itip-view.c:363
+#: ../plugins/itip-formatter/itip-view.c:365
#, c-format
msgid "<b>%s</b> has delegated the following meeting to you:"
msgstr "<b>%s</b> has delegated the following meeting to you:"
-#: ../plugins/itip-formatter/itip-view.c:366
+#: ../plugins/itip-formatter/itip-view.c:368
#, c-format
msgid "<b>%s</b> through %s requests your presence at the following meeting:"
msgstr "<b>%s</b> through %s requests your presence at the following meeting:"
-#: ../plugins/itip-formatter/itip-view.c:368
+#: ../plugins/itip-formatter/itip-view.c:370
#, c-format
msgid "<b>%s</b> requests your presence at the following meeting:"
msgstr "<b>%s</b> requests your presence at the following meeting:"
-#: ../plugins/itip-formatter/itip-view.c:374
+#: ../plugins/itip-formatter/itip-view.c:376
#, c-format
msgid "<b>%s</b> through %s wishes to add to an existing meeting:"
msgstr "<b>%s</b> through %s wishes to add to an existing meeting:"
-#: ../plugins/itip-formatter/itip-view.c:376
+#: ../plugins/itip-formatter/itip-view.c:378
#, c-format
msgid "<b>%s</b> wishes to add to an existing meeting:"
msgstr "<b>%s</b> wishes to add to an existing meeting:"
-#: ../plugins/itip-formatter/itip-view.c:380
+#: ../plugins/itip-formatter/itip-view.c:382
#, c-format
msgid ""
"<b>%s</b> through %s wishes to receive the latest information for the "
@@ -18563,89 +18839,89 @@ msgstr ""
"<b>%s</b> through %s wishes to receive the latest information for the "
"following meeting:"
-#: ../plugins/itip-formatter/itip-view.c:382
+#: ../plugins/itip-formatter/itip-view.c:384
#, c-format
msgid ""
"<b>%s</b> wishes to receive the latest information for the following meeting:"
msgstr ""
"<b>%s</b> wishes to receive the latest information for the following meeting:"
-#: ../plugins/itip-formatter/itip-view.c:386
+#: ../plugins/itip-formatter/itip-view.c:388
#, c-format
msgid "<b>%s</b> through %s has sent back the following meeting response:"
msgstr "<b>%s</b> through %s has sent back the following meeting response:"
-#: ../plugins/itip-formatter/itip-view.c:388
+#: ../plugins/itip-formatter/itip-view.c:390
#, c-format
msgid "<b>%s</b> has sent back the following meeting response:"
msgstr "<b>%s</b> has sent back the following meeting response:"
-#: ../plugins/itip-formatter/itip-view.c:392
+#: ../plugins/itip-formatter/itip-view.c:394
#, c-format
msgid "<b>%s</b> through %s has canceled the following meeting:"
msgstr "<b>%s</b> through %s has cancelled the following meeting:"
-#: ../plugins/itip-formatter/itip-view.c:394
+#: ../plugins/itip-formatter/itip-view.c:396
#, c-format
msgid "<b>%s</b> has canceled the following meeting."
msgstr "<b>%s</b> has cancelled the following meeting."
-#: ../plugins/itip-formatter/itip-view.c:398
+#: ../plugins/itip-formatter/itip-view.c:400
#, c-format
msgid "<b>%s</b> through %s has proposed the following meeting changes."
msgstr "<b>%s</b> through %s has proposed the following meeting changes."
-#: ../plugins/itip-formatter/itip-view.c:400
+#: ../plugins/itip-formatter/itip-view.c:402
#, c-format
msgid "<b>%s</b> has proposed the following meeting changes."
msgstr "<b>%s</b> has proposed the following meeting changes."
-#: ../plugins/itip-formatter/itip-view.c:404
+#: ../plugins/itip-formatter/itip-view.c:406
#, c-format
msgid "<b>%s</b> through %s has declined the following meeting changes:"
msgstr "<b>%s</b> through %s has declined the following meeting changes:"
-#: ../plugins/itip-formatter/itip-view.c:406
+#: ../plugins/itip-formatter/itip-view.c:408
#, c-format
msgid "<b>%s</b> has declined the following meeting changes."
msgstr "<b>%s</b> has declined the following meeting changes."
-#: ../plugins/itip-formatter/itip-view.c:444
+#: ../plugins/itip-formatter/itip-view.c:446
#, c-format
msgid "<b>%s</b> through %s has published the following task:"
msgstr "<b>%s</b> through %s has published the following task:"
-#: ../plugins/itip-formatter/itip-view.c:446
+#: ../plugins/itip-formatter/itip-view.c:448
#, c-format
msgid "<b>%s</b> has published the following task:"
msgstr "<b>%s</b> has published the following task:"
-#: ../plugins/itip-formatter/itip-view.c:451
+#: ../plugins/itip-formatter/itip-view.c:453
#, c-format
msgid "<b>%s</b> requests the assignment of %s to the following task:"
msgstr "<b>%s</b> requests the assignment of %s to the following task:"
-#: ../plugins/itip-formatter/itip-view.c:454
+#: ../plugins/itip-formatter/itip-view.c:456
#, c-format
msgid "<b>%s</b> through %s has assigned you a task:"
msgstr "<b>%s</b> through %s has assigned you a task:"
-#: ../plugins/itip-formatter/itip-view.c:456
+#: ../plugins/itip-formatter/itip-view.c:458
#, c-format
msgid "<b>%s</b> has assigned you a task:"
msgstr "<b>%s</b> has assigned you a task:"
-#: ../plugins/itip-formatter/itip-view.c:462
+#: ../plugins/itip-formatter/itip-view.c:464
#, c-format
msgid "<b>%s</b> through %s wishes to add to an existing task:"
msgstr "<b>%s</b> through %s wishes to add to an existing task:"
-#: ../plugins/itip-formatter/itip-view.c:464
+#: ../plugins/itip-formatter/itip-view.c:466
#, c-format
msgid "<b>%s</b> wishes to add to an existing task:"
msgstr "<b>%s</b> wishes to add to an existing task:"
-#: ../plugins/itip-formatter/itip-view.c:468
+#: ../plugins/itip-formatter/itip-view.c:470
#, c-format
msgid ""
"<b>%s</b> through %s wishes to receive the latest information for the "
@@ -18654,7 +18930,7 @@ msgstr ""
"<b>%s</b> through %s wishes to receive the latest information for the "
"following assigned task:"
-#: ../plugins/itip-formatter/itip-view.c:470
+#: ../plugins/itip-formatter/itip-view.c:472
#, c-format
msgid ""
"<b>%s</b> wishes to receive the latest information for the following "
@@ -18663,171 +18939,180 @@ msgstr ""
"<b>%s</b> wishes to receive the latest information for the following "
"assigned task:"
-#: ../plugins/itip-formatter/itip-view.c:474
+#: ../plugins/itip-formatter/itip-view.c:476
#, c-format
msgid ""
"<b>%s</b> through %s has sent back the following assigned task response:"
msgstr ""
"<b>%s</b> through %s has sent back the following assigned task response:"
-#: ../plugins/itip-formatter/itip-view.c:476
+#: ../plugins/itip-formatter/itip-view.c:478
#, c-format
msgid "<b>%s</b> has sent back the following assigned task response:"
msgstr "<b>%s</b> has sent back the following assigned task response:"
-#: ../plugins/itip-formatter/itip-view.c:480
+#: ../plugins/itip-formatter/itip-view.c:482
#, c-format
msgid "<b>%s</b> through %s has canceled the following assigned task:"
msgstr "<b>%s</b> through %s has cancelled the following assigned task:"
-#: ../plugins/itip-formatter/itip-view.c:482
+#: ../plugins/itip-formatter/itip-view.c:484
#, c-format
msgid "<b>%s</b> has canceled the following assigned task:"
msgstr "<b>%s</b> has cancelled the following assigned task:"
-#: ../plugins/itip-formatter/itip-view.c:486
+#: ../plugins/itip-formatter/itip-view.c:488
#, c-format
msgid ""
"<b>%s</b> through %s has proposed the following task assignment changes:"
msgstr ""
"<b>%s</b> through %s has proposed the following task assignment changes:"
-#: ../plugins/itip-formatter/itip-view.c:488
+#: ../plugins/itip-formatter/itip-view.c:490
#, c-format
msgid "<b>%s</b> has proposed the following task assignment changes:"
msgstr "<b>%s</b> has proposed the following task assignment changes:"
-#: ../plugins/itip-formatter/itip-view.c:492
+#: ../plugins/itip-formatter/itip-view.c:494
#, c-format
msgid "<b>%s</b> through %s has declined the following assigned task:"
msgstr "<b>%s</b> through %s has declined the following assigned task:"
-#: ../plugins/itip-formatter/itip-view.c:494
+#: ../plugins/itip-formatter/itip-view.c:496
#, c-format
msgid "<b>%s</b> has declined the following assigned task:"
msgstr "<b>%s</b> has declined the following assigned task:"
-#: ../plugins/itip-formatter/itip-view.c:532
+#: ../plugins/itip-formatter/itip-view.c:534
#, c-format
msgid "<b>%s</b> through %s has published the following memo:"
msgstr "<b>%s</b> through %s has published the following memo:"
-#: ../plugins/itip-formatter/itip-view.c:534
+#: ../plugins/itip-formatter/itip-view.c:536
#, c-format
msgid "<b>%s</b> has published the following memo:"
msgstr "<b>%s</b> has published the following memo:"
-#: ../plugins/itip-formatter/itip-view.c:539
+#: ../plugins/itip-formatter/itip-view.c:541
#, c-format
msgid "<b>%s</b> through %s wishes to add to an existing memo:"
msgstr "<b>%s</b> through %s wishes to add to an existing memo:"
-#: ../plugins/itip-formatter/itip-view.c:541
+#: ../plugins/itip-formatter/itip-view.c:543
#, c-format
msgid "<b>%s</b> wishes to add to an existing memo:"
msgstr "<b>%s</b> wishes to add to an existing memo:"
-#: ../plugins/itip-formatter/itip-view.c:545
+#: ../plugins/itip-formatter/itip-view.c:547
#, c-format
msgid "<b>%s</b> through %s has canceled the following shared memo:"
msgstr "<b>%s</b> through %s has cancelled the following shared memo:"
-#: ../plugins/itip-formatter/itip-view.c:547
+#: ../plugins/itip-formatter/itip-view.c:549
#, c-format
msgid "<b>%s</b> has canceled the following shared memo:"
msgstr "<b>%s</b> has cancelled the following shared memo:"
#. Everything gets the open button
-#: ../plugins/itip-formatter/itip-view.c:818
+#: ../plugins/itip-formatter/itip-view.c:821
msgid "_Open Calendar"
msgstr "_Open Calendar"
-#: ../plugins/itip-formatter/itip-view.c:824
-#: ../plugins/itip-formatter/itip-view.c:828
-#: ../plugins/itip-formatter/itip-view.c:834
-#: ../plugins/itip-formatter/itip-view.c:851
-#: ../plugins/itip-formatter/itip-view.c:856
+#: ../plugins/itip-formatter/itip-view.c:827
+#: ../plugins/itip-formatter/itip-view.c:831
+#: ../plugins/itip-formatter/itip-view.c:837
+#: ../plugins/itip-formatter/itip-view.c:854
+#: ../plugins/itip-formatter/itip-view.c:859
msgid "_Decline"
msgstr "_Decline"
-#: ../plugins/itip-formatter/itip-view.c:825
-#: ../plugins/itip-formatter/itip-view.c:830
-#: ../plugins/itip-formatter/itip-view.c:837
-#: ../plugins/itip-formatter/itip-view.c:853
-#: ../plugins/itip-formatter/itip-view.c:858
+#: ../plugins/itip-formatter/itip-view.c:828
+#: ../plugins/itip-formatter/itip-view.c:833
+#: ../plugins/itip-formatter/itip-view.c:840
+#: ../plugins/itip-formatter/itip-view.c:856
+#: ../plugins/itip-formatter/itip-view.c:861
msgid "_Accept"
msgstr "_Accept"
-#: ../plugins/itip-formatter/itip-view.c:828
+#: ../plugins/itip-formatter/itip-view.c:831
msgid "_Decline all"
msgstr "_Decline all"
-#: ../plugins/itip-formatter/itip-view.c:829
+#: ../plugins/itip-formatter/itip-view.c:832
msgid "_Tentative all"
msgstr "_Tentative all"
-#: ../plugins/itip-formatter/itip-view.c:829
-#: ../plugins/itip-formatter/itip-view.c:835
-#: ../plugins/itip-formatter/itip-view.c:852
-#: ../plugins/itip-formatter/itip-view.c:857
+#: ../plugins/itip-formatter/itip-view.c:832
+#: ../plugins/itip-formatter/itip-view.c:838
+#: ../plugins/itip-formatter/itip-view.c:855
+#: ../plugins/itip-formatter/itip-view.c:860
msgid "_Tentative"
msgstr "_Tentative"
-#: ../plugins/itip-formatter/itip-view.c:830
+#: ../plugins/itip-formatter/itip-view.c:833
msgid "_Accept all"
msgstr "_Accept all"
#. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:841
+#: ../plugins/itip-formatter/itip-view.c:844
msgid "_Send Information"
msgstr "_Send Information"
#. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:845
+#: ../plugins/itip-formatter/itip-view.c:848
msgid "_Update Attendee Status"
msgstr "_Update Attendee Status"
-#: ../plugins/itip-formatter/itip-view.c:848
+#: ../plugins/itip-formatter/itip-view.c:851
msgid "_Update"
msgstr "_Update"
#. Start time
-#: ../plugins/itip-formatter/itip-view.c:1012
+#: ../plugins/itip-formatter/itip-view.c:1031
msgid "Start time:"
msgstr "Start time:"
#. End time
-#: ../plugins/itip-formatter/itip-view.c:1021
+#: ../plugins/itip-formatter/itip-view.c:1042
msgid "End time:"
msgstr "End time:"
#. Comment
-#: ../plugins/itip-formatter/itip-view.c:1037
-#: ../plugins/itip-formatter/itip-view.c:1087
+#: ../plugins/itip-formatter/itip-view.c:1062
+#: ../plugins/itip-formatter/itip-view.c:1116
msgid "Comment:"
msgstr "Comment:"
-#: ../plugins/itip-formatter/itip-view.c:1073
+#: ../plugins/itip-formatter/itip-view.c:1101
msgid "Send _reply to sender"
msgstr "Send _reply to sender"
-#: ../plugins/itip-formatter/itip-view.c:1101
+#: ../plugins/itip-formatter/itip-view.c:1131
msgid "Send _updates to attendees"
msgstr "Send _updates to attendees"
-#: ../plugins/itip-formatter/itip-view.c:1110
+#: ../plugins/itip-formatter/itip-view.c:1140
msgid "_Apply to all instances"
msgstr "_Apply to all instances"
-#: ../plugins/itip-formatter/itip-view.c:1119
+#: ../plugins/itip-formatter/itip-view.c:1149
msgid "Show time as _free"
msgstr "Show time as _free"
-#: ../plugins/itip-formatter/itip-view.c:1852
+#: ../plugins/itip-formatter/itip-view.c:1152
+msgid "_Preserve my reminder"
+msgstr "_Preserve my reminder"
+
+#. To Translators: This is a check box to inherit a reminder.
+#: ../plugins/itip-formatter/itip-view.c:1158
+msgid "_Inherit reminder"
+msgstr "_Inherit reminder"
+
+#: ../plugins/itip-formatter/itip-view.c:1912
msgid "_Tasks :"
msgstr "_Tasks :"
-#: ../plugins/itip-formatter/itip-view.c:1854
+#: ../plugins/itip-formatter/itip-view.c:1914
msgid "Memos :"
msgstr "Memos :"
@@ -18857,7 +19142,7 @@ msgid ""
msgstr ""
"This response is not from a current attendee. Add the sender as an attendee?"
-#: ../plugins/mail-account-disable/mail-account-disable.c:47
+#: ../plugins/mail-account-disable/mail-account-disable.c:46
msgid "Proxy _Logout"
msgstr "Proxy _Logout"
@@ -18937,20 +19222,20 @@ msgstr "Whether the icon should blink or not."
msgid "Whether to notify new messages in Inbox folder only."
msgstr "Whether to notify new messages in Inbox folder only."
-#: ../plugins/mail-notification/mail-notification.c:254
+#: ../plugins/mail-notification/mail-notification.c:260
msgid "Generate a _D-Bus message"
msgstr "Generate a _D-Bus message"
-#: ../plugins/mail-notification/mail-notification.c:377
+#: ../plugins/mail-notification/mail-notification.c:383
msgid "Evolution's Mail Notification"
msgstr "Evolution's Mail Notification"
-#: ../plugins/mail-notification/mail-notification.c:398
+#: ../plugins/mail-notification/mail-notification.c:404
msgid "Mail Notification Properties"
msgstr "Mail Notification Properties"
#. To translators: '%d' is the number of mails recieved and '%s' is the name of the folder
-#: ../plugins/mail-notification/mail-notification.c:457
+#: ../plugins/mail-notification/mail-notification.c:483
#, c-format
msgid ""
"You have received %d new message\n"
@@ -18965,55 +19250,55 @@ msgstr[1] ""
"You have received %d new messages\n"
"in %s."
-#: ../plugins/mail-notification/mail-notification.c:462
+#: ../plugins/mail-notification/mail-notification.c:488
#, c-format
msgid "You have received %d new message."
msgid_plural "You have received %d new messages."
msgstr[0] "You have received %d new message."
msgstr[1] "You have received %d new messages."
-#: ../plugins/mail-notification/mail-notification.c:479
-#: ../plugins/mail-notification/mail-notification.c:484
+#: ../plugins/mail-notification/mail-notification.c:505
+#: ../plugins/mail-notification/mail-notification.c:510
msgid "New email"
msgstr "New e-mail"
-#: ../plugins/mail-notification/mail-notification.c:541
+#: ../plugins/mail-notification/mail-notification.c:570
msgid "Show icon in _notification area"
msgstr "Show icon in _notification area"
-#: ../plugins/mail-notification/mail-notification.c:544
+#: ../plugins/mail-notification/mail-notification.c:573
msgid "B_link icon in notification area"
msgstr "B_link icon in notification area"
-#: ../plugins/mail-notification/mail-notification.c:546
+#: ../plugins/mail-notification/mail-notification.c:575
msgid "Popup _message together with the icon"
msgstr "Popup _message together with the icon"
-#: ../plugins/mail-notification/mail-notification.c:727
+#: ../plugins/mail-notification/mail-notification.c:756
msgid "_Play sound when new messages arrive"
msgstr "_Play sound when new messages arrive"
-#: ../plugins/mail-notification/mail-notification.c:733
+#: ../plugins/mail-notification/mail-notification.c:762
msgid "_Beep"
msgstr "_Beep"
-#: ../plugins/mail-notification/mail-notification.c:734
+#: ../plugins/mail-notification/mail-notification.c:763
msgid "Play _sound file"
msgstr "Play _sound file"
-#: ../plugins/mail-notification/mail-notification.c:745
+#: ../plugins/mail-notification/mail-notification.c:774
msgid "Specify _filename:"
msgstr "Specify _filename:"
-#: ../plugins/mail-notification/mail-notification.c:746
+#: ../plugins/mail-notification/mail-notification.c:775
msgid "Select sound file"
msgstr "Select sound file"
-#: ../plugins/mail-notification/mail-notification.c:747
+#: ../plugins/mail-notification/mail-notification.c:776
msgid "Pl_ay"
msgstr "Pl_ay"
-#: ../plugins/mail-notification/mail-notification.c:804
+#: ../plugins/mail-notification/mail-notification.c:833
msgid "Notify new messages for _Inbox only"
msgstr "Notify new messages for _Inbox only"
@@ -19162,13 +19447,13 @@ msgstr "Send e-mail message to mailing list?"
#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:10
msgid ""
-"The action could not be performed. This means the header for this action did "
-"not contain any action we could process.\n"
+"The action could not be performed. The header for this action did not "
+"contain any action that could be processed.\n"
"\n"
"Header: {0}"
msgstr ""
-"The action could not be performed. This means the header for this action did "
-"not contain any action we could process.\n"
+"The action could not be performed. The header for this action did not "
+"contain any action that could be processed.\n"
"\n"
"Header: {0}"
@@ -19278,22 +19563,6 @@ msgstr "Mark Me_ssages as Read"
msgid "Used for marking all the messages under a folder as read"
msgstr "Used for marking all the messages under a folder as read"
-#: ../plugins/mark-calendar-offline/org-gnome-mark-calendar-offline.eplug.xml.h:1
-msgid "Mark calendar offline"
-msgstr "Mark calendar offline"
-
-#: ../plugins/mark-calendar-offline/org-gnome-mark-calendar-offline.eplug.xml.h:2
-msgid "Marks the selected calendar for offline viewing."
-msgstr "Marks the selected calendar for offline viewing."
-
-#: ../plugins/mark-calendar-offline/org-gnome-mark-calendar-offline.eplug.xml.h:3
-msgid "_Do not make available for offline use"
-msgstr "_Do not make available for offline use"
-
-#: ../plugins/mark-calendar-offline/org-gnome-mark-calendar-offline.eplug.xml.h:4
-msgid "_Make available for offline use"
-msgstr "_Make available for offline use"
-
#: ../plugins/mono/org-gnome-evolution-mono.eplug.xml.h:1
msgid "A plugin which implements mono plugins."
msgstr "A plugin which implements mono plugins."
@@ -19362,19 +19631,19 @@ msgstr "Plain Text Mode"
msgid "Prefer plain-text"
msgstr "Prefer plain-text"
-#: ../plugins/prefer-plain/prefer-plain.c:191
+#: ../plugins/prefer-plain/prefer-plain.c:189
msgid "Show HTML if present"
msgstr "Show HTML if present"
-#: ../plugins/prefer-plain/prefer-plain.c:192
+#: ../plugins/prefer-plain/prefer-plain.c:190
msgid "Prefer PLAIN"
msgstr "Prefer PLAIN"
-#: ../plugins/prefer-plain/prefer-plain.c:193
+#: ../plugins/prefer-plain/prefer-plain.c:191
msgid "Only ever show PLAIN"
msgstr "Only ever show PLAIN"
-#: ../plugins/prefer-plain/prefer-plain.c:236
+#: ../plugins/prefer-plain/prefer-plain.c:234
msgid "HTML _Mode"
msgstr "HTML _Mode"
@@ -19386,6 +19655,37 @@ msgstr "Evolution Profiler"
msgid "Writes a log of profiling data events."
msgstr "Writes a log of profiling data events."
+#: ../plugins/pst-import/org-gnome-pst-import.eplug.xml.h:1
+msgid "Import Outlook messages from PST file"
+msgstr "Import Outlook messages from PST file"
+
+#: ../plugins/pst-import/org-gnome-pst-import.eplug.xml.h:2
+msgid "Outlook PST import"
+msgstr "Outlook PST import"
+
+#: ../plugins/pst-import/org-gnome-pst-import.eplug.xml.h:3
+msgid "Outlook personal folders (.pst)"
+msgstr "Outlook personal folders (.pst)"
+
+#. Address book
+#: ../plugins/pst-import/pst-importer.c:318
+msgid "_Address Book"
+msgstr "_Address Book"
+
+#. Appointments
+#: ../plugins/pst-import/pst-importer.c:325
+msgid "A_ppointments"
+msgstr "A_ppointments"
+
+#. Journal
+#: ../plugins/pst-import/pst-importer.c:337
+msgid "_Journal entries"
+msgstr "_Journal entries"
+
+#: ../plugins/pst-import/pst-importer.c:352
+msgid "Importing Outlook data"
+msgstr "Importing Outlook data"
+
#: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:1
msgid "Allows calendars to be published to the web"
msgstr "Allows calendars to be published to the web"
@@ -19402,9 +19702,9 @@ msgstr "Locations"
msgid "_Publish Calendar Information"
msgstr "_Publish Calendar Information"
-#: ../plugins/publish-calendar/publish-calendar.c:595
-msgid "Are you sure you want to remove this URL?"
-msgstr "Are you sure you want to remove this URL?"
+#: ../plugins/publish-calendar/publish-calendar.c:596
+msgid "Are you sure you want to remove this location?"
+msgstr "Are you sure you want to remove this location?"
#: ../plugins/publish-calendar/publish-calendar.glade.h:2
msgid "<span weight=\"bold\">Location</span>"
@@ -19442,7 +19742,7 @@ msgstr "Publishing _Frequency:"
#: ../plugins/publish-calendar/publish-calendar.glade.h:13
msgid ""
-"SSH\n"
+"Secure FTP (SSH)\n"
"Public FTP\n"
"FTP (with login)\n"
"Windows share\n"
@@ -19450,7 +19750,7 @@ msgid ""
"Secure WebDAV (HTTPS)\n"
"Custom Location"
msgstr ""
-"SSH\n"
+"Secure FTP (SSH)\n"
"Public FTP\n"
"FTP (with login)\n"
"Windows share\n"
@@ -19490,6 +19790,14 @@ msgstr ""
"iCal\n"
"Free/Busy"
+#: ../plugins/publish-calendar/url-editor-dialog.c:461
+msgid "New Location"
+msgstr "New Location"
+
+#: ../plugins/publish-calendar/url-editor-dialog.c:463
+msgid "Edit Location"
+msgstr "Edit Location"
+
#: ../plugins/python/example/org-gnome-hello-python-ui.xml.h:1
msgid "Hello Python"
msgstr "Hello Python"
@@ -19507,58 +19815,58 @@ msgid "Test Plugin for Python EPlugin loader."
msgstr "Test Plugin for Python EPlugin loader."
#: ../plugins/python/org-gnome-evolution-python.eplug.xml.h:1
-msgid "A plugin which loads other plugins written using python."
+msgid "A plugin which loads other plugins written using Python."
msgstr "A plugin which loads other plugins written using Python."
#: ../plugins/python/org-gnome-evolution-python.eplug.xml.h:2
msgid "Python Loader"
msgstr "Python Loader"
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:108
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:107
msgid "SpamAssassin (built-in)"
msgstr "SpamAssassin (built-in)"
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:134
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:133
#, c-format
msgid "SpamAssassin not found, code: %d"
msgstr "SpamAssassin not found, code: %d"
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:142
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:150
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:141
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:149
#, c-format
msgid "Failed to create pipe: %s"
msgstr "Failed to create pipe: %s"
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:189
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:188
#, c-format
msgid "Error after fork: %s"
msgstr "Error after fork: %s"
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:244
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:243
#, c-format
msgid "SpamAssassin child process does not respond, killing..."
msgstr "SpamAssassin child process does not respond, killing..."
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:246
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:245
#, c-format
-msgid "Wait for Spamassassin child process interrupted, terminating..."
-msgstr "Wait for Spamassassin child process interrupted, terminating..."
+msgid "Wait for SpamAssassin child process interrupted, terminating..."
+msgstr "Wait for SpamAssassin child process interrupted, terminating..."
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:255
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:254
#, c-format
msgid "Pipe to SpamAssassin failed, error code: %d"
msgstr "Pipe to SpamAssassin failed, error code: %d"
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:498
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:497
#, c-format
msgid "SpamAssassin is not available."
msgstr "SpamAssassin is not available."
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:865
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:864
msgid "This will make SpamAssassin more reliable, but slower"
msgstr "This will make SpamAssassin more reliable, but slower"
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:871
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:870
msgid "I_nclude remote tests"
msgstr "I_nclude remote tests"
@@ -19571,12 +19879,12 @@ msgstr ""
"to be installed."
#: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:2
-msgid "SpamAssassin junk plugin"
-msgstr "SpamAssassin junk plugin"
+msgid "SpamAssassin Options"
+msgstr "SpamAssassin Options"
#: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:3
-msgid "Spamassassin Options"
-msgstr "Spamassassin Options"
+msgid "SpamAssassin junk plugin"
+msgstr "SpamAssassin junk plugin"
#: ../plugins/save-attachments/org-gnome-save-attachments.eplug.xml.h:1
msgid "A plugin for saving all attachments or parts of a message at once."
@@ -19584,7 +19892,7 @@ msgstr "A plugin for saving all attachments or parts of a message at once."
#. the path to the shared library
#: ../plugins/save-attachments/org-gnome-save-attachments.eplug.xml.h:3
-#: ../plugins/save-attachments/save-attachments.c:314
+#: ../plugins/save-attachments/save-attachments.c:315
msgid "Save attachments"
msgstr "Save attachments"
@@ -19596,15 +19904,15 @@ msgstr "Save Attachments..."
msgid "Save all attachments"
msgstr "Save all attachments"
-#: ../plugins/save-attachments/save-attachments.c:320
+#: ../plugins/save-attachments/save-attachments.c:321
msgid "Select save base name"
msgstr "Select save base name"
-#: ../plugins/save-attachments/save-attachments.c:339
+#: ../plugins/save-attachments/save-attachments.c:340
msgid "MIME Type"
msgstr "MIME Type"
-#: ../plugins/save-attachments/save-attachments.c:347
+#: ../plugins/save-attachments/save-attachments.c:348
msgid "Save"
msgstr "Save"
@@ -19612,79 +19920,79 @@ msgstr "Save"
#. * Translator: the %F %T is the thirth argument for a strftime function.
#. * It lets you define the formatting of the date in the csv-file.
#. *
-#: ../plugins/save-calendar/csv-format.c:162
+#: ../plugins/save-calendar/csv-format.c:163
msgid "%F %T"
msgstr "%F %T"
-#: ../plugins/save-calendar/csv-format.c:360
+#: ../plugins/save-calendar/csv-format.c:361
msgid "UID"
msgstr "UID"
-#: ../plugins/save-calendar/csv-format.c:362
+#: ../plugins/save-calendar/csv-format.c:363
msgid "Description List"
msgstr "Description List"
-#: ../plugins/save-calendar/csv-format.c:363
+#: ../plugins/save-calendar/csv-format.c:364
msgid "Categories List"
msgstr "Categories List"
-#: ../plugins/save-calendar/csv-format.c:364
+#: ../plugins/save-calendar/csv-format.c:365
msgid "Comment List"
msgstr "Comment List"
-#: ../plugins/save-calendar/csv-format.c:366
+#: ../plugins/save-calendar/csv-format.c:367
msgid "Created"
msgstr "Created"
-#: ../plugins/save-calendar/csv-format.c:367
+#: ../plugins/save-calendar/csv-format.c:368
msgid "Contact List"
msgstr "Contact List"
-#: ../plugins/save-calendar/csv-format.c:368
+#: ../plugins/save-calendar/csv-format.c:369
msgid "Start"
msgstr "Start"
-#: ../plugins/save-calendar/csv-format.c:369
+#: ../plugins/save-calendar/csv-format.c:370
msgid "End"
msgstr "End"
-#: ../plugins/save-calendar/csv-format.c:371
+#: ../plugins/save-calendar/csv-format.c:372
msgid "percent Done"
msgstr "percent Done"
-#: ../plugins/save-calendar/csv-format.c:373
+#: ../plugins/save-calendar/csv-format.c:374
msgid "URL"
msgstr "URL"
-#: ../plugins/save-calendar/csv-format.c:374
+#: ../plugins/save-calendar/csv-format.c:375
msgid "Attendees List"
msgstr "Attendees List"
-#: ../plugins/save-calendar/csv-format.c:376
+#: ../plugins/save-calendar/csv-format.c:377
msgid "Modified"
msgstr "Modified"
-#: ../plugins/save-calendar/csv-format.c:531
+#: ../plugins/save-calendar/csv-format.c:532
msgid "Advanced options for the CSV format"
msgstr "Advanced options for the CSV format"
-#: ../plugins/save-calendar/csv-format.c:538
+#: ../plugins/save-calendar/csv-format.c:539
msgid "Prepend a header"
msgstr "Prepend a header"
-#: ../plugins/save-calendar/csv-format.c:547
+#: ../plugins/save-calendar/csv-format.c:548
msgid "Value delimiter:"
msgstr "Value delimiter:"
-#: ../plugins/save-calendar/csv-format.c:553
+#: ../plugins/save-calendar/csv-format.c:554
msgid "Record delimiter:"
msgstr "Record delimiter:"
-#: ../plugins/save-calendar/csv-format.c:559
+#: ../plugins/save-calendar/csv-format.c:560
msgid "Encapsulate values with:"
msgstr "Encapsulate values with:"
-#: ../plugins/save-calendar/csv-format.c:581
+#: ../plugins/save-calendar/csv-format.c:582
msgid "Comma separated value format (.csv)"
msgstr "Comma separated value format (.csv)"
@@ -19706,15 +20014,15 @@ msgstr "_Save to Disk"
#. * It lets you define the formatting of the date in the rdf-file.
#. * Also check out http://www.w3.org/2002/12/cal/tzd
#. *
-#: ../plugins/save-calendar/rdf-format.c:149
+#: ../plugins/save-calendar/rdf-format.c:150
msgid "%FT%T"
msgstr "%FT%T"
-#: ../plugins/save-calendar/rdf-format.c:376
+#: ../plugins/save-calendar/rdf-format.c:377
msgid "RDF format (.rdf)"
msgstr "RDF format (.rdf)"
-#: ../plugins/save-calendar/save-calendar.c:160
+#: ../plugins/save-calendar/save-calendar.c:161
msgid "Select destination file"
msgstr "Select destination file"
@@ -19746,15 +20054,15 @@ msgstr "Guides you through your initial account setup."
msgid "Setup Assistant"
msgstr "Setup Assistant"
-#: ../plugins/startup-wizard/startup-wizard.c:83
+#: ../plugins/startup-wizard/startup-wizard.c:85
msgid "Evolution Setup Assistant"
msgstr "Evolution Setup Assistant"
-#: ../plugins/startup-wizard/startup-wizard.c:86
+#: ../plugins/startup-wizard/startup-wizard.c:88
msgid "Welcome"
msgstr "Welcome"
-#: ../plugins/startup-wizard/startup-wizard.c:87
+#: ../plugins/startup-wizard/startup-wizard.c:89
msgid ""
"Welcome to Evolution. The next few screens will allow Evolution to connect "
"to your email accounts, and to import files from other applications. \n"
@@ -19766,28 +20074,28 @@ msgstr ""
"\n"
"Please click the \"Forward\" button to continue. "
-#: ../plugins/startup-wizard/startup-wizard.c:133
+#: ../plugins/startup-wizard/startup-wizard.c:135
msgid "Importing files"
msgstr "Importing files"
-#: ../plugins/startup-wizard/startup-wizard.c:135
+#: ../plugins/startup-wizard/startup-wizard.c:137
#: ../shell/e-shell-importer.c:141
msgid "Please select the information that you would like to import:"
msgstr "Please select the information that you would like to import:"
-#: ../plugins/startup-wizard/startup-wizard.c:150
+#: ../plugins/startup-wizard/startup-wizard.c:152
#: ../shell/e-shell-importer.c:394
#, c-format
msgid "From %s:"
msgstr "From %s:"
-#: ../plugins/startup-wizard/startup-wizard.c:230
+#: ../plugins/startup-wizard/startup-wizard.c:232
#: ../shell/e-shell-importer.c:505
#, c-format
msgid "Importing data."
msgstr "Importing data."
-#: ../plugins/startup-wizard/startup-wizard.c:232
+#: ../plugins/startup-wizard/startup-wizard.c:234
#: ../shell/e-shell-importer.c:519
msgid "Please wait"
msgstr "Please wait"
@@ -19817,15 +20125,15 @@ msgstr ""
"List of keyword/value pairs for the Templates plugin to substitute in a "
"message body."
-#: ../plugins/templates/templates.c:615
+#: ../plugins/templates/templates.c:603
msgid "No title"
msgstr "No title"
-#: ../plugins/templates/templates.c:743
+#: ../plugins/templates/templates.c:711
msgid "Save as _Template"
msgstr "Save as _Template"
-#: ../plugins/templates/templates.c:745
+#: ../plugins/templates/templates.c:713
msgid "Save as Template"
msgstr "Save as Template"
@@ -19834,8 +20142,8 @@ msgid "Drafts based template plugin"
msgstr "Drafts-based template plugin"
#: ../plugins/tnef-attachments/org-gnome-tnef-attachments.eplug.xml.h:1
-msgid "A simple plugin which uses ytnef to decode tnef attachments."
-msgstr "A simple plugin which uses ytnef to decode TNEF attachments."
+msgid "A simple plugin which uses yTNEF to decode TNEF attachments."
+msgstr "A simple plugin which uses yTNEF to decode TNEF attachments."
#: ../plugins/tnef-attachments/org-gnome-tnef-attachments.eplug.xml.h:2
msgid "TNEF Attachment decoder"
@@ -19849,18 +20157,17 @@ msgstr "A plugin to set up WebDAV contacts."
msgid "WebDAV contacts"
msgstr "WebDAV contacts"
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:69
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:74
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:100
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:96
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:107
msgid "WebDAV"
msgstr "WebDAV"
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:311
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:336
msgid "URL:"
msgstr "URL:"
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:338
-msgid "_Avoid IfMatch (needed on apache < 2.2.8)"
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:363
+msgid "_Avoid IfMatch (needed on Apache < 2.2.8)"
msgstr "_Avoid IfMatch (needed on Apache < 2.2.8)"
#: ../shell/GNOME_Evolution_Shell.server.in.in.h:1
@@ -20003,7 +20310,7 @@ msgstr "Sidebar is visible"
msgid "Skip development warning dialog"
msgstr "Skip development warning dialogue"
-#: ../shell/apps_evolution_shell.schemas.in.h:27 ../shell/main.c:471
+#: ../shell/apps_evolution_shell.schemas.in.h:27 ../shell/main.c:483
msgid "Start in offline mode"
msgstr "Start in offline mode"
@@ -20218,7 +20525,7 @@ msgstr "Evolution Preferences"
#. To translators: This is the window title and %s is the
#. component name. Most translators will want to keep it as is.
-#: ../shell/e-shell-view.c:47 ../shell/e-shell-window.c:332
+#: ../shell/e-shell-view.c:47 ../shell/e-shell-window.c:328
#, c-format
msgid "%s - Evolution"
msgstr "%s - Evolution"
@@ -20243,33 +20550,29 @@ msgstr "Bug buddy could not be run."
#. The translator-credits string is for translators to list
#. * per-language credits for translation, displayed in the
#. * about dialog.
-#: ../shell/e-shell-window-commands.c:729
+#: ../shell/e-shell-window-commands.c:942
msgid "translator-credits"
msgstr ""
"Gareth Owen <gowen72@yahoo.com>\n"
"David Lodge <dave@cirt.net>"
-#: ../shell/e-shell-window-commands.c:740
+#: ../shell/e-shell-window-commands.c:953
msgid "Evolution Website"
msgstr "Evolution Website"
-#: ../shell/e-shell-window-commands.c:758
-msgid "Error opening the FAQ webpage."
-msgstr "Error opening the FAQ webpage."
-
-#: ../shell/e-shell-window-commands.c:955
+#: ../shell/e-shell-window-commands.c:1170
msgid "_Work Online"
msgstr "_Work Online"
-#: ../shell/e-shell-window-commands.c:968 ../ui/evolution.xml.h:57
+#: ../shell/e-shell-window-commands.c:1183 ../ui/evolution.xml.h:57
msgid "_Work Offline"
msgstr "_Work Offline"
-#: ../shell/e-shell-window-commands.c:981
+#: ../shell/e-shell-window-commands.c:1196
msgid "Work Offline"
msgstr "Work Offline"
-#: ../shell/e-shell-window.c:381
+#: ../shell/e-shell-window.c:377
msgid ""
"Evolution is currently online.\n"
"Click on this button to work offline."
@@ -20277,11 +20580,11 @@ msgstr ""
"Evolution is currently online.\n"
"Click on this button to work offline."
-#: ../shell/e-shell-window.c:388
+#: ../shell/e-shell-window.c:384
msgid "Evolution is in the process of going offline."
msgstr "Evolution is in the process of going offline."
-#: ../shell/e-shell-window.c:395
+#: ../shell/e-shell-window.c:391
msgid ""
"Evolution is currently offline.\n"
"Click on this button to work online."
@@ -20289,33 +20592,33 @@ msgstr ""
"Evolution is currently offline.\n"
"Click on this button to work online."
-#: ../shell/e-shell-window.c:786
+#: ../shell/e-shell-window.c:787
#, c-format
msgid "Switch to %s"
msgstr "Switch to %s"
-#: ../shell/e-shell.c:641
+#: ../shell/e-shell.c:640
msgid "Unknown system error."
msgstr "Unknown system error."
-#: ../shell/e-shell.c:839 ../shell/e-shell.c:840
+#: ../shell/e-shell.c:838 ../shell/e-shell.c:839
#, c-format
msgid "%ld KB"
msgstr "%ld KB"
-#: ../shell/e-shell.c:1298 ../widgets/misc/e-cell-date-edit.c:314
+#: ../shell/e-shell.c:1261 ../widgets/misc/e-cell-date-edit.c:313
msgid "OK"
msgstr "OK"
-#: ../shell/e-shell.c:1300
+#: ../shell/e-shell.c:1263
msgid "Invalid arguments"
msgstr "Invalid arguments"
-#: ../shell/e-shell.c:1302
+#: ../shell/e-shell.c:1265
msgid "Cannot register on OAF"
msgstr "Cannot register on OAF"
-#: ../shell/e-shell.c:1304
+#: ../shell/e-shell.c:1267
msgid "Configuration Database not found"
msgstr "Configuration Database not found"
@@ -20359,8 +20662,8 @@ msgid "Importer Type"
msgstr "Importer Type"
#: ../shell/import.glade.h:6
-msgid "Select Importers"
-msgstr "Select Importers"
+msgid "Select Information to Import"
+msgstr "Select Information to Import"
#: ../shell/import.glade.h:7
msgid "Select a File"
@@ -20377,7 +20680,7 @@ msgstr ""
"importing external files into Evolution."
#. Preview/Alpha/Beta version warning message
-#: ../shell/main.c:217
+#: ../shell/main.c:221
#, no-c-format
msgid ""
"Hi. Thanks for taking the time to download this preview release\n"
@@ -20412,7 +20715,7 @@ msgstr ""
"We hope that you enjoy the results of our hard work, and we\n"
"eagerly await your contributions!\n"
-#: ../shell/main.c:241
+#: ../shell/main.c:245
msgid ""
"Thanks\n"
"The Evolution Team\n"
@@ -20420,43 +20723,43 @@ msgstr ""
"Thanks\n"
"The Evolution Team\n"
-#: ../shell/main.c:248
+#: ../shell/main.c:252
msgid "Do not tell me again"
msgstr "Do not tell me again"
-#: ../shell/main.c:469
+#: ../shell/main.c:481
msgid "Start Evolution activating the specified component"
msgstr "Start Evolution activating the specified component"
-#: ../shell/main.c:473
+#: ../shell/main.c:485
msgid "Start in online mode"
msgstr "Start in online mode"
-#: ../shell/main.c:476
+#: ../shell/main.c:488
msgid "Forcibly shut down all Evolution components"
msgstr "Forcibly shut down all Evolution components"
-#: ../shell/main.c:480
+#: ../shell/main.c:492
msgid "Forcibly re-migrate from Evolution 1.4"
msgstr "Forcibly re-migrate from Evolution 1.4"
-#: ../shell/main.c:483
+#: ../shell/main.c:495
msgid "Send the debugging output of all components to a file."
msgstr "Send the debugging output of all components to a file."
-#: ../shell/main.c:485
+#: ../shell/main.c:497
msgid "Disable loading of any plugins."
msgstr "Disable loading of any plugins."
-#: ../shell/main.c:487
+#: ../shell/main.c:499
msgid "Disable preview pane of Mail, Contacts and Tasks."
msgstr "Disable preview pane of Mail, Contacts and Tasks."
-#: ../shell/main.c:572
+#: ../shell/main.c:586
msgid "- The Evolution PIM and Email Client"
msgstr "- The Evolution PIM and E-mail Client"
-#: ../shell/main.c:600
+#: ../shell/main.c:614
#, c-format
msgid ""
"%s: --online and --offline cannot be used together.\n"
@@ -20470,20 +20773,24 @@ msgid "Are you sure you want to forget all remembered passwords?"
msgstr "Are you sure you want to forget all remembered passwords?"
#: ../shell/shell.error.xml.h:2
+msgid "Cannot start Evolution"
+msgstr "Cannot start Evolution"
+
+#: ../shell/shell.error.xml.h:3
msgid "Continue"
msgstr "Continue"
# shell:upgrade-remove-1-4 title
# shell:upgrade-remove-1-4 primary
-#: ../shell/shell.error.xml.h:3
+#: ../shell/shell.error.xml.h:4
msgid "Delete old data from version {0}?"
msgstr "Delete old data from version {0}?"
-#: ../shell/shell.error.xml.h:4
+#: ../shell/shell.error.xml.h:5
msgid "Evolution can not start."
msgstr "Evolution can not start."
-#: ../shell/shell.error.xml.h:5
+#: ../shell/shell.error.xml.h:6
msgid ""
"Forgetting your passwords will clear all remembered passwords. You will be "
"reprompted next time they are needed."
@@ -20491,18 +20798,18 @@ msgstr ""
"Forgetting your passwords will clear all remembered passwords. You will be "
"reprompted next time they are needed."
-#: ../shell/shell.error.xml.h:7
+#: ../shell/shell.error.xml.h:8
msgid "Insufficient disk space for upgrade."
msgstr "Insufficient disk space for upgrade."
# shell:upgrade-remove-1-4-confirm title
# shell:upgrade-remove-1-4-confirm primary
-#: ../shell/shell.error.xml.h:8
+#: ../shell/shell.error.xml.h:9
msgid "Really delete old data?"
msgstr "Really delete old data?"
# shell:upgrade-remove-1-4-confirm secondary
-#: ../shell/shell.error.xml.h:9
+#: ../shell/shell.error.xml.h:10
msgid ""
"The entire contents of the &quot;evolution&quot; directory are about to be "
"permanently removed.\n"
@@ -20525,27 +20832,27 @@ msgstr ""
"without manual intervention.\n"
# shell:upgrade-remove-1-4 secondary
-#: ../shell/shell.error.xml.h:15
+#: ../shell/shell.error.xml.h:16
msgid ""
-"The previous version of evolution stored its data in a different location.\n"
+"The previous version of Evolution stored its data in a different location.\n"
"\n"
"If you choose to remove this data, the entire contents of the &quot;"
"evolution&quot; directory will be removed permanently. If you choose to keep "
"this data, then you may manually remove the contents of &quot;"
"evolution&quot; at your convenience.\n"
msgstr ""
-"The previous version of evolution stored its data in a different location.\n"
+"The previous version of Evolution stored its data in a different location.\n"
"\n"
"If you choose to remove this data, the entire contents of the &quot;"
"evolution&quot; directory will be removed permanently. If you choose to keep "
"this data, then you may manually remove the contents of &quot;"
"evolution&quot; at your convenience.\n"
-#: ../shell/shell.error.xml.h:19
+#: ../shell/shell.error.xml.h:20
msgid "Upgrade from previous version failed: {0}"
msgstr "Upgrade from previous version failed: {0}"
-#: ../shell/shell.error.xml.h:20
+#: ../shell/shell.error.xml.h:21
msgid ""
"Upgrading your data and settings will require up to {0} of disk space, but "
"you only have {1} available.\n"
@@ -20559,7 +20866,7 @@ msgstr ""
"You will need to make more space available in your home directory before you "
"can continue."
-#: ../shell/shell.error.xml.h:23
+#: ../shell/shell.error.xml.h:24
msgid ""
"Your system configuration does not match your Evolution configuration.\n"
"\n"
@@ -20569,7 +20876,7 @@ msgstr ""
"\n"
"Click help for details"
-#: ../shell/shell.error.xml.h:26
+#: ../shell/shell.error.xml.h:27
msgid ""
"Your system configuration does not match your Evolution configuration:\n"
"\n"
@@ -20583,19 +20890,19 @@ msgstr ""
"\n"
"Click help for details."
-#: ../shell/shell.error.xml.h:31
+#: ../shell/shell.error.xml.h:32
msgid "_Forget"
msgstr "_Forget"
-#: ../shell/shell.error.xml.h:32
+#: ../shell/shell.error.xml.h:33
msgid "_Keep Data"
msgstr "_Keep Data"
-#: ../shell/shell.error.xml.h:33
+#: ../shell/shell.error.xml.h:34
msgid "_Remind Me Later"
msgstr "_Remind Me Later"
-#: ../shell/shell.error.xml.h:34
+#: ../shell/shell.error.xml.h:35
msgid ""
"{1}\n"
"\n"
@@ -20666,7 +20973,7 @@ msgid "Purposes"
msgstr "Purposes"
#: ../smime/gui/certificate-manager.c:289 ../smime/gui/smime-ui.glade.h:37
-#: ../smime/lib/e-cert.c:570
+#: ../smime/lib/e-cert.c:553
msgid "Serial Number"
msgstr "Serial Number"
@@ -20784,7 +21091,7 @@ msgstr ""
"Before trusting this CA for any purpose, you should examine its certificate "
"and its policy and procedures (if available)."
-#: ../smime/gui/smime-ui.glade.h:14 ../smime/lib/e-cert.c:1077
+#: ../smime/gui/smime-ui.glade.h:14 ../smime/lib/e-cert.c:1060
msgid "Certificate"
msgstr "Certificate"
@@ -20860,11 +21167,11 @@ msgstr "Organisational Unit (OU)"
msgid "SHA1 Fingerprint"
msgstr "SHA1 Fingerprint"
-#: ../smime/gui/smime-ui.glade.h:35 ../smime/lib/e-cert.c:819
+#: ../smime/gui/smime-ui.glade.h:35 ../smime/lib/e-cert.c:802
msgid "SSL Client Certificate"
msgstr "SSL Client Certificate"
-#: ../smime/gui/smime-ui.glade.h:36 ../smime/lib/e-cert.c:823
+#: ../smime/gui/smime-ui.glade.h:36 ../smime/lib/e-cert.c:806
msgid "SSL Server Certificate"
msgstr "SSL Server Certificate"
@@ -20911,182 +21218,182 @@ msgid "_Edit CA Trust"
msgstr "_Edit CA Trust"
#. XXX we shouldn't be popping up dialogs in this code.
-#: ../smime/lib/e-cert-db.c:672
+#: ../smime/lib/e-cert-db.c:656
msgid "Certificate already exists"
msgstr "Certificate already exists"
-#: ../smime/lib/e-cert.c:239 ../smime/lib/e-cert.c:249
+#: ../smime/lib/e-cert.c:222 ../smime/lib/e-cert.c:232
msgid "%d/%m/%Y"
msgstr "%d/%m/%Y"
#. x509 certificate usage types
-#: ../smime/lib/e-cert.c:425
+#: ../smime/lib/e-cert.c:408
msgid "Sign"
msgstr "Sign"
-#: ../smime/lib/e-cert.c:426
+#: ../smime/lib/e-cert.c:409
msgid "Encrypt"
msgstr "Encrypt"
-#: ../smime/lib/e-cert.c:531
+#: ../smime/lib/e-cert.c:514
msgid "Version"
msgstr "Version"
-#: ../smime/lib/e-cert.c:546
+#: ../smime/lib/e-cert.c:529
msgid "Version 1"
msgstr "Version 1"
-#: ../smime/lib/e-cert.c:549
+#: ../smime/lib/e-cert.c:532
msgid "Version 2"
msgstr "Version 2"
-#: ../smime/lib/e-cert.c:552
+#: ../smime/lib/e-cert.c:535
msgid "Version 3"
msgstr "Version 3"
-#: ../smime/lib/e-cert.c:634
+#: ../smime/lib/e-cert.c:617
msgid "PKCS #1 MD2 With RSA Encryption"
msgstr "PKCS #1 MD2 With RSA Encryption"
-#: ../smime/lib/e-cert.c:637
+#: ../smime/lib/e-cert.c:620
msgid "PKCS #1 MD5 With RSA Encryption"
msgstr "PKCS #1 MD5 With RSA Encryption"
-#: ../smime/lib/e-cert.c:640
+#: ../smime/lib/e-cert.c:623
msgid "PKCS #1 SHA-1 With RSA Encryption"
msgstr "PKCS #1 SHA-1 With RSA Encryption"
-#: ../smime/lib/e-cert.c:667
+#: ../smime/lib/e-cert.c:650
msgid "PKCS #1 RSA Encryption"
msgstr "PKCS #1 RSA Encryption"
-#: ../smime/lib/e-cert.c:670
+#: ../smime/lib/e-cert.c:653
msgid "Certificate Key Usage"
msgstr "Certificate Key Usage"
-#: ../smime/lib/e-cert.c:673
+#: ../smime/lib/e-cert.c:656
msgid "Netscape Certificate Type"
msgstr "Netscape Certificate Type"
-#: ../smime/lib/e-cert.c:676
+#: ../smime/lib/e-cert.c:659
msgid "Certificate Authority Key Identifier"
msgstr "Certificate Authority Key Identifier"
-#: ../smime/lib/e-cert.c:688
+#: ../smime/lib/e-cert.c:671
#, c-format
msgid "Object Identifier (%s)"
msgstr "Object Identifier (%s)"
-#: ../smime/lib/e-cert.c:739
+#: ../smime/lib/e-cert.c:722
msgid "Algorithm Identifier"
msgstr "Algorithm Identifier"
-#: ../smime/lib/e-cert.c:747
+#: ../smime/lib/e-cert.c:730
msgid "Algorithm Parameters"
msgstr "Algorithm Parameters"
-#: ../smime/lib/e-cert.c:769
+#: ../smime/lib/e-cert.c:752
msgid "Subject Public Key Info"
msgstr "Subject Public Key Info"
-#: ../smime/lib/e-cert.c:774
+#: ../smime/lib/e-cert.c:757
msgid "Subject Public Key Algorithm"
msgstr "Subject Public Key Algorithm"
-#: ../smime/lib/e-cert.c:789
+#: ../smime/lib/e-cert.c:772
msgid "Subject's Public Key"
msgstr "Subject's Public Key"
-#: ../smime/lib/e-cert.c:810 ../smime/lib/e-cert.c:859
+#: ../smime/lib/e-cert.c:793 ../smime/lib/e-cert.c:842
msgid "Error: Unable to process extension"
msgstr "Error: Unable to process extension"
-#: ../smime/lib/e-cert.c:831 ../smime/lib/e-cert.c:843
+#: ../smime/lib/e-cert.c:814 ../smime/lib/e-cert.c:826
msgid "Object Signer"
msgstr "Object Signer"
-#: ../smime/lib/e-cert.c:835
+#: ../smime/lib/e-cert.c:818
msgid "SSL Certificate Authority"
msgstr "SSL Certificate Authority"
-#: ../smime/lib/e-cert.c:839
+#: ../smime/lib/e-cert.c:822
msgid "Email Certificate Authority"
msgstr "E-mail Certificate Authority"
-#: ../smime/lib/e-cert.c:867
+#: ../smime/lib/e-cert.c:850
msgid "Signing"
msgstr "Signing"
-#: ../smime/lib/e-cert.c:871
+#: ../smime/lib/e-cert.c:854
msgid "Non-repudiation"
msgstr "Non-repudiation"
-#: ../smime/lib/e-cert.c:875
+#: ../smime/lib/e-cert.c:858
msgid "Key Encipherment"
msgstr "Key Encipherment"
-#: ../smime/lib/e-cert.c:879
+#: ../smime/lib/e-cert.c:862
msgid "Data Encipherment"
msgstr "Data Encipherment"
-#: ../smime/lib/e-cert.c:883
+#: ../smime/lib/e-cert.c:866
msgid "Key Agreement"
msgstr "Key Agreement"
-#: ../smime/lib/e-cert.c:887
+#: ../smime/lib/e-cert.c:870
msgid "Certificate Signer"
msgstr "Certificate Signer"
-#: ../smime/lib/e-cert.c:891
+#: ../smime/lib/e-cert.c:874
msgid "CRL Signer"
msgstr "CRL Signer"
-#: ../smime/lib/e-cert.c:939
+#: ../smime/lib/e-cert.c:922
msgid "Critical"
msgstr "Critical"
-#: ../smime/lib/e-cert.c:941 ../smime/lib/e-cert.c:944
+#: ../smime/lib/e-cert.c:924 ../smime/lib/e-cert.c:927
msgid "Not Critical"
msgstr "Not Critical"
-#: ../smime/lib/e-cert.c:965
+#: ../smime/lib/e-cert.c:948
msgid "Extensions"
msgstr "Extensions"
-#: ../smime/lib/e-cert.c:1036
+#: ../smime/lib/e-cert.c:1019
#, c-format
msgid "%s = %s"
msgstr "%s = %s"
-#: ../smime/lib/e-cert.c:1092 ../smime/lib/e-cert.c:1212
+#: ../smime/lib/e-cert.c:1075 ../smime/lib/e-cert.c:1195
msgid "Certificate Signature Algorithm"
msgstr "Certificate Signature Algorithm"
-#: ../smime/lib/e-cert.c:1101
+#: ../smime/lib/e-cert.c:1084
msgid "Issuer"
msgstr "Issuer"
-#: ../smime/lib/e-cert.c:1155
+#: ../smime/lib/e-cert.c:1138
msgid "Issuer Unique ID"
msgstr "Issuer Unique ID"
-#: ../smime/lib/e-cert.c:1174
+#: ../smime/lib/e-cert.c:1157
msgid "Subject Unique ID"
msgstr "Subject Unique ID"
-#: ../smime/lib/e-cert.c:1217
+#: ../smime/lib/e-cert.c:1200
msgid "Certificate Signature Value"
msgstr "Certificate Signature Value"
-#: ../smime/lib/e-pkcs12.c:244
+#: ../smime/lib/e-pkcs12.c:249
msgid "PKCS12 File Password"
msgstr "PKCS12 File Password"
-#: ../smime/lib/e-pkcs12.c:244
+#: ../smime/lib/e-pkcs12.c:249
msgid "Enter password for PKCS12 file:"
msgstr "Enter password for PKCS12 file:"
-#: ../smime/lib/e-pkcs12.c:343
+#: ../smime/lib/e-pkcs12.c:348
msgid "Imported Certificate"
msgstr "Imported Certificate"
@@ -21125,8 +21432,8 @@ msgid "Copy"
msgstr "Copy"
#: ../ui/evolution-addressbook.xml.h:7
-msgid "Copy Selected Contacts to Another Folder..."
-msgstr "Copy Selected Contacts to Another Folder..."
+msgid "Copy selected contacts to another folder"
+msgstr "Copy selected contacts to another folder"
#: ../ui/evolution-addressbook.xml.h:8
msgid "Copy the contacts of the selected folder into another folder"
@@ -21174,8 +21481,8 @@ msgid "Mo_ve All Contacts To..."
msgstr "Mo_ve All Contacts To..."
#: ../ui/evolution-addressbook.xml.h:20
-msgid "Move Selected Contacts to Another Folder..."
-msgstr "Move Selected Contacts to Another Folder..."
+msgid "Move selected contacts to another folder"
+msgstr "Move selected contacts to another folder"
#: ../ui/evolution-addressbook.xml.h:21
msgid "Move the contacts of the selected folder into another folder"
@@ -21215,14 +21522,14 @@ msgid "Save as VCard..."
msgstr "Save as VCard..."
#: ../ui/evolution-addressbook.xml.h:32
-msgid "Save selected contacts as a VCard."
-msgstr "Save selected contacts as a VCard."
+msgid "Save selected contacts as a VCard"
+msgstr "Save selected contacts as a VCard"
#: ../ui/evolution-addressbook.xml.h:33
msgid "Save the contacts of the selected folder as VCard"
msgstr "Save the contacts of the selected folder as VCard"
-#: ../ui/evolution-addressbook.xml.h:34 ../widgets/text/e-text.c:2723
+#: ../ui/evolution-addressbook.xml.h:34 ../widgets/text/e-text.c:2721
msgid "Select All"
msgstr "Select All"
@@ -21235,16 +21542,16 @@ msgid "Select all contacts"
msgstr "Select all contacts"
#: ../ui/evolution-addressbook.xml.h:37
-msgid "Send a message to the selected contacts."
-msgstr "Send a message to the selected contacts."
+msgid "Send a message to the selected contacts"
+msgstr "Send a message to the selected contacts"
#: ../ui/evolution-addressbook.xml.h:38
msgid "Send message to contact"
msgstr "Send message to contact"
#: ../ui/evolution-addressbook.xml.h:39
-msgid "Send selected contacts to another person."
-msgstr "Send selected contacts to another person."
+msgid "Send selected contacts to another person"
+msgstr "Send selected contacts to another person"
#: ../ui/evolution-addressbook.xml.h:40
msgid "Show contact preview window"
@@ -21266,7 +21573,7 @@ msgstr "Stop Loading"
msgid "View the current contact"
msgstr "View the current contact"
-#: ../ui/evolution-addressbook.xml.h:45 ../ui/evolution-calendar.xml.h:38
+#: ../ui/evolution-addressbook.xml.h:45 ../ui/evolution-calendar.xml.h:39
#: ../ui/evolution-tasks.xml.h:21
msgid "_Actions"
msgstr "_Actions"
@@ -21356,7 +21663,7 @@ msgid "Month"
msgstr "Month"
#: ../ui/evolution-calendar.xml.h:16 ../ui/evolution-mail-message.xml.h:58
-#: ../widgets/misc/e-calendar.c:196
+#: ../widgets/misc/e-calendar.c:195
msgid "Next"
msgstr "Next"
@@ -21365,7 +21672,7 @@ msgid "Previews the calendar to be printed"
msgstr "Previews the calendar to be printed"
#: ../ui/evolution-calendar.xml.h:19 ../ui/evolution-mail-message.xml.h:74
-#: ../widgets/misc/e-calendar.c:172
+#: ../widgets/misc/e-calendar.c:171
msgid "Previous"
msgstr "Previous"
@@ -21421,15 +21728,23 @@ msgstr "Show the working week"
msgid "View the current appointment"
msgstr "View the current appointment"
-#: ../ui/evolution-calendar.xml.h:36
+#: ../ui/evolution-calendar.xml.h:36 ../ui/evolution-mail-global.xml.h:19
+msgid "View the debug console for log messages"
+msgstr "View the debug console for log messages"
+
+#: ../ui/evolution-calendar.xml.h:37
msgid "Week"
msgstr "Week"
-#: ../ui/evolution-calendar.xml.h:37
+#: ../ui/evolution-calendar.xml.h:38
msgid "Work Week"
msgstr "Work Week"
-#: ../ui/evolution-calendar.xml.h:42
+#: ../ui/evolution-calendar.xml.h:41 ../ui/evolution-mail-global.xml.h:22
+msgid "_Debug Logs"
+msgstr "_Debug Logs"
+
+#: ../ui/evolution-calendar.xml.h:45
msgid "_Open Appointment"
msgstr "_Open Appointment"
@@ -21498,10 +21813,6 @@ msgstr "Show message preview window"
msgid "Subscribe or unsubscribe to folders on remote servers"
msgstr "Subscribe or unsubscribe to folders on remote servers"
-#: ../ui/evolution-mail-global.xml.h:19
-msgid "View the debug console for log messages"
-msgstr "View the debug console for log messages"
-
#: ../ui/evolution-mail-global.xml.h:20
msgid "_Classic View"
msgstr "_Classic View"
@@ -21510,10 +21821,6 @@ msgstr "_Classic View"
msgid "_Copy Folder To..."
msgstr "_Copy Folder To..."
-#: ../ui/evolution-mail-global.xml.h:22
-msgid "_Debug Logs"
-msgstr "_Debug Logs"
-
#: ../ui/evolution-mail-global.xml.h:23
msgid "_Download Messages for Offline Usage"
msgstr "_Download Messages for Offline Usage"
@@ -21538,8 +21845,8 @@ msgstr "_Preview"
#. <menuitem name="CreateVFolder" verb="CreateVFolder" _label="_New Search _Folder (FIXME)"/>
#.
#: ../ui/evolution-mail-global.xml.h:32
-msgid "_Subscriptions"
-msgstr "_Subscriptions"
+msgid "_Subscriptions..."
+msgstr "_Subscriptions..."
#: ../ui/evolution-mail-global.xml.h:33
msgid "_Vertical View"
@@ -21620,10 +21927,6 @@ msgstr "Permanently remove all deleted messages from this folder"
msgid "Permanently remove this folder"
msgstr "Permanently remove this folder"
-#: ../ui/evolution-mail-list.xml.h:21
-msgid "Re_fresh..."
-msgstr "Re_fresh..."
-
#: ../ui/evolution-mail-list.xml.h:22
msgid "Refresh the folder"
msgstr "Refresh the folder"
@@ -22544,17 +22847,17 @@ msgid "Define Views for \"%s\""
msgstr "Define Views for \"%s\""
#: ../widgets/menus/gal-view-factory-etable.c:37
-#: ../widgets/table/e-table-header-item.c:1922
+#: ../widgets/table/e-table-header-item.c:1921
+#: ../widgets/table/e-table-scrolled.c:215
#: ../widgets/table/e-table-scrolled.c:216
-#: ../widgets/table/e-table-scrolled.c:217
msgid "Table"
msgstr "Table"
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:226
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:225
msgid "Instance"
msgstr "Instance"
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:284
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:283
msgid "Save Current View"
msgstr "Save Current View"
@@ -22567,42 +22870,42 @@ msgid "_Replace existing view"
msgstr "_Replace existing view"
#. bonobo displays this string so it must be in locale
-#: ../widgets/menus/gal-view-instance.c:582
-#: ../widgets/menus/gal-view-menus.c:368
+#: ../widgets/menus/gal-view-instance.c:581
+#: ../widgets/menus/gal-view-menus.c:367
msgid "Custom View"
msgstr "Custom View"
-#: ../widgets/menus/gal-view-instance.c:583
+#: ../widgets/menus/gal-view-instance.c:582
msgid "Save Custom View"
msgstr "Save Custom View"
-#: ../widgets/menus/gal-view-instance.c:587
-#: ../widgets/menus/gal-view-menus.c:392
+#: ../widgets/menus/gal-view-instance.c:586
+#: ../widgets/menus/gal-view-menus.c:391
msgid "Define Views..."
msgstr "Define Views..."
-#: ../widgets/menus/gal-view-menus.c:305
+#: ../widgets/menus/gal-view-menus.c:304
msgid "C_urrent View"
msgstr "C_urrent View"
-#: ../widgets/menus/gal-view-menus.c:329
+#: ../widgets/menus/gal-view-menus.c:328
#, c-format
msgid "Select View: %s"
msgstr "Select View: %s"
-#: ../widgets/menus/gal-view-menus.c:373
+#: ../widgets/menus/gal-view-menus.c:372
msgid "Current view is a customized view"
msgstr "Current view is a customised view"
-#: ../widgets/menus/gal-view-menus.c:378
+#: ../widgets/menus/gal-view-menus.c:377
msgid "Save Custom View..."
msgstr "Save Custom View..."
-#: ../widgets/menus/gal-view-menus.c:383
+#: ../widgets/menus/gal-view-menus.c:382
msgid "Save current custom view"
msgstr "Save current custom view"
-#: ../widgets/menus/gal-view-menus.c:397
+#: ../widgets/menus/gal-view-menus.c:396
msgid "Create or edit views"
msgstr "Create or edit views"
@@ -22626,17 +22929,17 @@ msgstr "Type of View"
msgid "Type of view:"
msgstr "Type of view:"
-#: ../widgets/misc/e-attachment-bar.c:1137
+#: ../widgets/misc/e-attachment-bar.c:1132
msgid "Attachment Bar"
msgstr "Attachment Bar"
-#: ../widgets/misc/e-attachment.c:291 ../widgets/misc/e-attachment.c:306
-#: ../widgets/misc/e-attachment.c:591 ../widgets/misc/e-attachment.c:608
+#: ../widgets/misc/e-attachment.c:290 ../widgets/misc/e-attachment.c:305
+#: ../widgets/misc/e-attachment.c:590 ../widgets/misc/e-attachment.c:607
#, c-format
msgid "Cannot attach file %s: %s"
msgstr "Cannot attach file %s: %s"
-#: ../widgets/misc/e-attachment.c:299 ../widgets/misc/e-attachment.c:600
+#: ../widgets/misc/e-attachment.c:298 ../widgets/misc/e-attachment.c:599
#, c-format
msgid "Cannot attach file %s: not a regular file"
msgstr "Cannot attach file %s: not a regular file"
@@ -22662,80 +22965,80 @@ msgstr "Suggest automatic display of attachment"
msgid "%B %Y"
msgstr "%B %Y"
-#: ../widgets/misc/e-calendar.c:221
+#: ../widgets/misc/e-calendar.c:220
msgid "Month Calendar"
msgstr "Month Calendar"
-#: ../widgets/misc/e-canvas-background.c:453
-#: ../widgets/misc/e-canvas-background.c:454 ../widgets/text/e-text.c:3643
-#: ../widgets/text/e-text.c:3644
+#: ../widgets/misc/e-canvas-background.c:454
+#: ../widgets/misc/e-canvas-background.c:455 ../widgets/text/e-text.c:3641
+#: ../widgets/text/e-text.c:3642
msgid "Fill color"
msgstr "Fill colour"
-#: ../widgets/misc/e-canvas-background.c:460
#: ../widgets/misc/e-canvas-background.c:461
-#: ../widgets/misc/e-canvas-background.c:467
-#: ../widgets/misc/e-canvas-background.c:468 ../widgets/text/e-text.c:3650
-#: ../widgets/text/e-text.c:3651 ../widgets/text/e-text.c:3658
-#: ../widgets/text/e-text.c:3659
+#: ../widgets/misc/e-canvas-background.c:462
+#: ../widgets/misc/e-canvas-background.c:468
+#: ../widgets/misc/e-canvas-background.c:469 ../widgets/text/e-text.c:3648
+#: ../widgets/text/e-text.c:3649 ../widgets/text/e-text.c:3656
+#: ../widgets/text/e-text.c:3657
msgid "GDK fill color"
msgstr "GDK fill colour"
-#: ../widgets/misc/e-canvas-background.c:474
-#: ../widgets/misc/e-canvas-background.c:475 ../widgets/text/e-text.c:3665
-#: ../widgets/text/e-text.c:3666
+#: ../widgets/misc/e-canvas-background.c:475
+#: ../widgets/misc/e-canvas-background.c:476 ../widgets/text/e-text.c:3663
+#: ../widgets/text/e-text.c:3664
msgid "Fill stipple"
msgstr "Fill stipple"
-#: ../widgets/misc/e-canvas-background.c:481
#: ../widgets/misc/e-canvas-background.c:482
+#: ../widgets/misc/e-canvas-background.c:483
msgid "X1"
msgstr "X1"
-#: ../widgets/misc/e-canvas-background.c:488
#: ../widgets/misc/e-canvas-background.c:489
+#: ../widgets/misc/e-canvas-background.c:490
msgid "X2"
msgstr "X2"
-#: ../widgets/misc/e-canvas-background.c:495
#: ../widgets/misc/e-canvas-background.c:496
+#: ../widgets/misc/e-canvas-background.c:497
msgid "Y1"
msgstr "Y1"
-#: ../widgets/misc/e-canvas-background.c:502
#: ../widgets/misc/e-canvas-background.c:503
+#: ../widgets/misc/e-canvas-background.c:504
msgid "Y2"
msgstr "Y2"
-#: ../widgets/misc/e-canvas-vbox.c:91 ../widgets/misc/e-reflow.c:1426
-#: ../widgets/table/e-table-group-container.c:999
-#: ../widgets/table/e-table-group-leaf.c:644
-#: ../widgets/table/e-table-item.c:3074
+#: ../widgets/misc/e-canvas-vbox.c:91 ../widgets/misc/e-reflow.c:1417
+#: ../widgets/table/e-table-group-container.c:1004
+#: ../widgets/table/e-table-group-leaf.c:649
+#: ../widgets/table/e-table-item.c:3070
msgid "Minimum width"
msgstr "Minimum width"
-#: ../widgets/misc/e-canvas-vbox.c:92 ../widgets/misc/e-reflow.c:1427
-#: ../widgets/table/e-table-group-container.c:1000
-#: ../widgets/table/e-table-group-leaf.c:645
-#: ../widgets/table/e-table-item.c:3075
+#: ../widgets/misc/e-canvas-vbox.c:92 ../widgets/misc/e-reflow.c:1418
+#: ../widgets/table/e-table-group-container.c:1005
+#: ../widgets/table/e-table-group-leaf.c:650
+#: ../widgets/table/e-table-item.c:3071
msgid "Minimum Width"
msgstr "Minimum Width"
#: ../widgets/misc/e-canvas-vbox.c:103 ../widgets/misc/e-canvas-vbox.c:104
-#: ../widgets/misc/e-expander.c:204
+#: ../widgets/misc/e-expander.c:206
msgid "Spacing"
msgstr "Spacing"
-#: ../widgets/misc/e-cell-date-edit.c:290
+#: ../widgets/misc/e-cell-date-edit.c:289
msgid "Now"
msgstr "Now"
-#: ../widgets/misc/e-cell-date-edit.c:847
+#: ../widgets/misc/e-cell-date-edit.c:846
#, c-format
msgid "The time must be in the format: %s"
msgstr "The time must be in the format: %s"
-#: ../widgets/misc/e-cell-percent.c:79
+#: ../widgets/misc/e-cell-percent.c:77
msgid "The percent value must be between 0 and 100, inclusive"
msgstr "The percent value must be between 0 and 100, inclusive"
@@ -22834,55 +23137,55 @@ msgstr "Other..."
msgid "Ch_aracter Encoding"
msgstr "Ch_aracter Encoding"
-#: ../widgets/misc/e-dateedit.c:309
+#: ../widgets/misc/e-dateedit.c:303
msgid "Date and Time"
msgstr "Date and Time"
-#: ../widgets/misc/e-dateedit.c:330
+#: ../widgets/misc/e-dateedit.c:324
msgid "Text entry to input date"
msgstr "Text entry to input date"
-#: ../widgets/misc/e-dateedit.c:352
+#: ../widgets/misc/e-dateedit.c:346
msgid "Click this button to show a calendar"
msgstr "Click this button to show a calendar"
-#: ../widgets/misc/e-dateedit.c:394
+#: ../widgets/misc/e-dateedit.c:388
msgid "Drop-down combination box to select time"
msgstr "Drop-down combination box to select time"
-#: ../widgets/misc/e-dateedit.c:470
+#: ../widgets/misc/e-dateedit.c:464
msgid "No_w"
msgstr "No_w"
-#: ../widgets/misc/e-dateedit.c:476
+#: ../widgets/misc/e-dateedit.c:470
msgid "_Today"
msgstr "_Today"
-#: ../widgets/misc/e-dateedit.c:1641
+#: ../widgets/misc/e-dateedit.c:1635
msgid "Invalid Date Value"
msgstr "Invalid Date Value"
-#: ../widgets/misc/e-dateedit.c:1670
+#: ../widgets/misc/e-dateedit.c:1664
msgid "Invalid Time Value"
msgstr "Invalid Time Value"
-#: ../widgets/misc/e-expander.c:180
+#: ../widgets/misc/e-expander.c:182
msgid "Expanded"
msgstr "Expanded"
-#: ../widgets/misc/e-expander.c:181
+#: ../widgets/misc/e-expander.c:183
msgid "Whether or not the expander is expanded"
msgstr "Whether or not the expander is expanded"
-#: ../widgets/misc/e-expander.c:189
+#: ../widgets/misc/e-expander.c:191
msgid "Text of the expander's label"
msgstr "Text of the expander's label"
-#: ../widgets/misc/e-expander.c:196
+#: ../widgets/misc/e-expander.c:198
msgid "Use underline"
msgstr "Use underline"
-#: ../widgets/misc/e-expander.c:197
+#: ../widgets/misc/e-expander.c:199
msgid ""
"If set, an underline in the text indicates the next character should be used "
"for the mnemonic accelerator key"
@@ -22890,50 +23193,50 @@ msgstr ""
"If set, an underline in the text indicates the next character should be used "
"for the mnemonic accelerator key"
-#: ../widgets/misc/e-expander.c:205
+#: ../widgets/misc/e-expander.c:207
msgid "Space to put between the label and the child"
msgstr "Space to put between the label and the child"
-#: ../widgets/misc/e-expander.c:214
+#: ../widgets/misc/e-expander.c:216
msgid "Label widget"
msgstr "Label widget"
-#: ../widgets/misc/e-expander.c:215
+#: ../widgets/misc/e-expander.c:217
msgid "A widget to display in place of the usual expander label"
msgstr "A widget to display in place of the usual expander label"
-#: ../widgets/misc/e-expander.c:221 ../widgets/table/e-tree.c:3391
+#: ../widgets/misc/e-expander.c:223 ../widgets/table/e-tree.c:3390
msgid "Expander Size"
msgstr "Expander Size"
-#: ../widgets/misc/e-expander.c:222 ../widgets/table/e-tree.c:3392
+#: ../widgets/misc/e-expander.c:224 ../widgets/table/e-tree.c:3391
msgid "Size of the expander arrow"
msgstr "Size of the expander arrow"
-#: ../widgets/misc/e-expander.c:230
+#: ../widgets/misc/e-expander.c:232
msgid "Indicator Spacing"
msgstr "Indicator Spacing"
-#: ../widgets/misc/e-expander.c:231
+#: ../widgets/misc/e-expander.c:233
msgid "Spacing around expander arrow"
msgstr "Spacing around expander arrow"
#. FIXME: get the toplevel window...
-#: ../widgets/misc/e-filter-bar.c:126 ../widgets/misc/e-filter-bar.c:179
-#: ../widgets/misc/e-filter-bar.c:307 ../widgets/misc/e-filter-bar.c:749
+#: ../widgets/misc/e-filter-bar.c:125 ../widgets/misc/e-filter-bar.c:180
+#: ../widgets/misc/e-filter-bar.c:308 ../widgets/misc/e-filter-bar.c:750
msgid "Advanced Search"
msgstr "Advanced Search"
#. FIXME: get the toplevel window...
-#: ../widgets/misc/e-filter-bar.c:230
+#: ../widgets/misc/e-filter-bar.c:231
msgid "Save Search"
msgstr "Save Search"
-#: ../widgets/misc/e-filter-bar.c:267
+#: ../widgets/misc/e-filter-bar.c:268
msgid "_Searches"
msgstr "_Searches"
-#: ../widgets/misc/e-filter-bar.c:269
+#: ../widgets/misc/e-filter-bar.c:270
msgid "Searches"
msgstr "Searches"
@@ -22981,11 +23284,11 @@ msgstr ""
"Mouse-based interactive map widget for selecting timezone. Keyboard users "
"should instead select the timezone from the drop-down combination box below."
-#: ../widgets/misc/e-online-button.c:109
+#: ../widgets/misc/e-online-button.c:106
msgid "Online"
msgstr "Online"
-#: ../widgets/misc/e-online-button.c:110
+#: ../widgets/misc/e-online-button.c:107
msgid "The button state is online"
msgstr "The button state is online"
@@ -23001,74 +23304,74 @@ msgstr "Sync Private Records:"
msgid "Sync Categories:"
msgstr "Sync Categories:"
-#: ../widgets/misc/e-reflow.c:1448 ../widgets/misc/e-reflow.c:1449
+#: ../widgets/misc/e-reflow.c:1439 ../widgets/misc/e-reflow.c:1440
msgid "Empty message"
msgstr "Empty message"
-#: ../widgets/misc/e-reflow.c:1455 ../widgets/misc/e-reflow.c:1456
+#: ../widgets/misc/e-reflow.c:1446 ../widgets/misc/e-reflow.c:1447
msgid "Reflow model"
msgstr "Reflow model"
-#: ../widgets/misc/e-reflow.c:1462 ../widgets/misc/e-reflow.c:1463
+#: ../widgets/misc/e-reflow.c:1453 ../widgets/misc/e-reflow.c:1454
msgid "Column width"
msgstr "Column width"
-#: ../widgets/misc/e-search-bar.c:340 ../widgets/misc/e-search-bar.c:473
-#: ../widgets/misc/e-search-bar.c:475
+#: ../widgets/misc/e-search-bar.c:337 ../widgets/misc/e-search-bar.c:470
+#: ../widgets/misc/e-search-bar.c:472
msgid "Search"
msgstr "Search"
-#: ../widgets/misc/e-search-bar.c:340 ../widgets/misc/e-search-bar.c:473
-#: ../widgets/misc/e-search-bar.c:475
+#: ../widgets/misc/e-search-bar.c:337 ../widgets/misc/e-search-bar.c:470
+#: ../widgets/misc/e-search-bar.c:472
msgid "Click here to change the search type"
msgstr "Click here to change the search type"
-#: ../widgets/misc/e-search-bar.c:606
+#: ../widgets/misc/e-search-bar.c:603
msgid "_Search"
msgstr "_Search"
-#: ../widgets/misc/e-search-bar.c:612
+#: ../widgets/misc/e-search-bar.c:609
msgid "_Find Now"
msgstr "_Find Now"
-#: ../widgets/misc/e-search-bar.c:613
+#: ../widgets/misc/e-search-bar.c:610
msgid "_Clear"
msgstr "_Clear"
-#: ../widgets/misc/e-search-bar.c:868
+#: ../widgets/misc/e-search-bar.c:865
msgid "Item ID"
msgstr "Item ID"
-#: ../widgets/misc/e-search-bar.c:875 ../widgets/text/e-text.c:3565
-#: ../widgets/text/e-text.c:3566
+#: ../widgets/misc/e-search-bar.c:872 ../widgets/text/e-text.c:3563
+#: ../widgets/text/e-text.c:3564
msgid "Text"
msgstr "Text"
#. To Translators: The "Show: " label is followed by the Quick Search Dropdown Menu where you can choose
#. to display "All Messages", "Unread Messages", "Message with 'Important' Label" and so on...
-#: ../widgets/misc/e-search-bar.c:1006
+#: ../widgets/misc/e-search-bar.c:1003
msgid "Sho_w: "
msgstr "Sho_w: "
#. To Translators: The "Show: " label is followed by the Quick Search Text input field where one enters
#. the term to search for
-#: ../widgets/misc/e-search-bar.c:1023
+#: ../widgets/misc/e-search-bar.c:1020
msgid "Sear_ch: "
msgstr "Sear_ch: "
#. To Translators: The " in " label is part of the Quick Search Bar, example:
#. Search: | <user's_search_term> | in | Current Folder/All Accounts/Current Account
-#: ../widgets/misc/e-search-bar.c:1035
+#: ../widgets/misc/e-search-bar.c:1032
msgid " i_n "
msgstr " i_n "
#: ../widgets/misc/e-selection-model-array.c:594
-#: ../widgets/table/e-tree-selection-model.c:807
+#: ../widgets/table/e-tree-selection-model.c:806
msgid "Cursor Row"
msgstr "Cursor Row"
#: ../widgets/misc/e-selection-model-array.c:601
-#: ../widgets/table/e-tree-selection-model.c:814
+#: ../widgets/table/e-tree-selection-model.c:813
msgid "Cursor Column"
msgstr "Cursor Column"
@@ -23214,19 +23517,19 @@ msgid "_When opened:"
msgstr "_When opened:"
#. For Translator only: %s is status message that is displayed (eg "moving items", "updating objects")
-#: ../widgets/misc/e-task-widget.c:255
+#: ../widgets/misc/e-task-widget.c:252
#, c-format
msgid "%s (...)"
msgstr "%s (...)"
#. For Translator only: %s is status message that is displayed (eg "moving items", "updating objects");
#. %d is a number between 0 and 100, describing the percentage of operation complete
-#: ../widgets/misc/e-task-widget.c:261
+#: ../widgets/misc/e-task-widget.c:258
#, c-format
msgid "%s (%d%% complete)"
msgstr "%s (%d%% complete)"
-#: ../widgets/misc/e-url-entry.c:106
+#: ../widgets/misc/e-url-entry.c:105
msgid "Click here to go to URL"
msgstr "Click here to go to URL"
@@ -23266,23 +23569,23 @@ msgstr "Focused Column"
msgid "Unselected Column"
msgstr "Unselected Column"
-#: ../widgets/table/e-cell-text.c:1808
+#: ../widgets/table/e-cell-text.c:1794
msgid "Strikeout Column"
msgstr "Strikeout Column"
-#: ../widgets/table/e-cell-text.c:1815
+#: ../widgets/table/e-cell-text.c:1801
msgid "Underline Column"
msgstr "Underline Column"
-#: ../widgets/table/e-cell-text.c:1822
+#: ../widgets/table/e-cell-text.c:1808
msgid "Bold Column"
msgstr "Bold Column"
-#: ../widgets/table/e-cell-text.c:1829
+#: ../widgets/table/e-cell-text.c:1815
msgid "Color Column"
msgstr "Colour Column"
-#: ../widgets/table/e-cell-text.c:1843
+#: ../widgets/table/e-cell-text.c:1829
msgid "BG Color Column"
msgstr "BG Colour Column"
@@ -23320,7 +23623,7 @@ msgid "A_vailable Fields:"
msgstr "A_vailable Fields:"
#: ../widgets/table/e-table-config.glade.h:2
-#: ../widgets/table/e-table-header-item.c:1583
+#: ../widgets/table/e-table-header-item.c:1582
msgid "Ascending"
msgstr "Ascending"
@@ -23333,7 +23636,7 @@ msgid "Clear _All"
msgstr "Clear _All"
#: ../widgets/table/e-table-config.glade.h:5
-#: ../widgets/table/e-table-header-item.c:1583
+#: ../widgets/table/e-table-header-item.c:1582
msgid "Descending"
msgstr "Descending"
@@ -23394,16 +23697,16 @@ msgid "_Sort..."
msgstr "_Sort..."
#: ../widgets/table/e-table-field-chooser-dialog.c:67
-#: ../widgets/table/e-table-field-chooser-item.c:634
-#: ../widgets/table/e-table-field-chooser.c:67
-#: ../widgets/table/e-table-header-item.c:1887
+#: ../widgets/table/e-table-field-chooser-item.c:633
+#: ../widgets/table/e-table-field-chooser.c:66
+#: ../widgets/table/e-table-header-item.c:1886
msgid "DnD code"
msgstr "DnD code"
#: ../widgets/table/e-table-field-chooser-dialog.c:74
-#: ../widgets/table/e-table-field-chooser-item.c:641
-#: ../widgets/table/e-table-field-chooser.c:74
-#: ../widgets/table/e-table-header-item.c:1901
+#: ../widgets/table/e-table-field-chooser-item.c:640
+#: ../widgets/table/e-table-field-chooser.c:73
+#: ../widgets/table/e-table-header-item.c:1900
msgid "Full Header"
msgstr "Full Header"
@@ -23437,286 +23740,287 @@ msgid_plural "%s (%d items)"
msgstr[0] "%s (%d item)"
msgstr[1] "%s (%d items)"
-#: ../widgets/table/e-table-group-container.c:922
-#: ../widgets/table/e-table-group-container.c:923
-#: ../widgets/table/e-table-group-leaf.c:581
-#: ../widgets/table/e-table-group-leaf.c:582
-#: ../widgets/table/e-table-item.c:3032 ../widgets/table/e-table-item.c:3033
+#: ../widgets/table/e-table-group-container.c:927
+#: ../widgets/table/e-table-group-container.c:928
+#: ../widgets/table/e-table-group-leaf.c:586
+#: ../widgets/table/e-table-group-leaf.c:587
+#: ../widgets/table/e-table-item.c:3028 ../widgets/table/e-table-item.c:3029
msgid "Alternating Row Colors"
msgstr "Alternating Row Colours"
-#: ../widgets/table/e-table-group-container.c:929
-#: ../widgets/table/e-table-group-container.c:930
-#: ../widgets/table/e-table-group-leaf.c:588
-#: ../widgets/table/e-table-group-leaf.c:589
-#: ../widgets/table/e-table-item.c:3039 ../widgets/table/e-table-item.c:3040
-#: ../widgets/table/e-tree.c:3344 ../widgets/table/e-tree.c:3345
+#: ../widgets/table/e-table-group-container.c:934
+#: ../widgets/table/e-table-group-container.c:935
+#: ../widgets/table/e-table-group-leaf.c:593
+#: ../widgets/table/e-table-group-leaf.c:594
+#: ../widgets/table/e-table-item.c:3035 ../widgets/table/e-table-item.c:3036
+#: ../widgets/table/e-tree.c:3343 ../widgets/table/e-tree.c:3344
msgid "Horizontal Draw Grid"
msgstr "Horizontal Draw Grid"
-#: ../widgets/table/e-table-group-container.c:936
-#: ../widgets/table/e-table-group-container.c:937
-#: ../widgets/table/e-table-group-leaf.c:595
-#: ../widgets/table/e-table-group-leaf.c:596
-#: ../widgets/table/e-table-item.c:3046 ../widgets/table/e-table-item.c:3047
-#: ../widgets/table/e-tree.c:3350 ../widgets/table/e-tree.c:3351
+#: ../widgets/table/e-table-group-container.c:941
+#: ../widgets/table/e-table-group-container.c:942
+#: ../widgets/table/e-table-group-leaf.c:600
+#: ../widgets/table/e-table-group-leaf.c:601
+#: ../widgets/table/e-table-item.c:3042 ../widgets/table/e-table-item.c:3043
+#: ../widgets/table/e-tree.c:3349 ../widgets/table/e-tree.c:3350
msgid "Vertical Draw Grid"
msgstr "Vertical Draw Grid"
-#: ../widgets/table/e-table-group-container.c:943
-#: ../widgets/table/e-table-group-container.c:944
-#: ../widgets/table/e-table-group-leaf.c:602
-#: ../widgets/table/e-table-group-leaf.c:603
-#: ../widgets/table/e-table-item.c:3053 ../widgets/table/e-table-item.c:3054
-#: ../widgets/table/e-tree.c:3356 ../widgets/table/e-tree.c:3357
+#: ../widgets/table/e-table-group-container.c:948
+#: ../widgets/table/e-table-group-container.c:949
+#: ../widgets/table/e-table-group-leaf.c:607
+#: ../widgets/table/e-table-group-leaf.c:608
+#: ../widgets/table/e-table-item.c:3049 ../widgets/table/e-table-item.c:3050
+#: ../widgets/table/e-tree.c:3355 ../widgets/table/e-tree.c:3356
msgid "Draw focus"
msgstr "Draw focus"
-#: ../widgets/table/e-table-group-container.c:950
-#: ../widgets/table/e-table-group-container.c:951
-#: ../widgets/table/e-table-group-leaf.c:609
-#: ../widgets/table/e-table-group-leaf.c:610
-#: ../widgets/table/e-table-item.c:3060 ../widgets/table/e-table-item.c:3061
+#: ../widgets/table/e-table-group-container.c:955
+#: ../widgets/table/e-table-group-container.c:956
+#: ../widgets/table/e-table-group-leaf.c:614
+#: ../widgets/table/e-table-group-leaf.c:615
+#: ../widgets/table/e-table-item.c:3056 ../widgets/table/e-table-item.c:3057
msgid "Cursor mode"
msgstr "Cursor mode"
-#: ../widgets/table/e-table-group-container.c:957
-#: ../widgets/table/e-table-group-container.c:958
-#: ../widgets/table/e-table-group-leaf.c:623
-#: ../widgets/table/e-table-group-leaf.c:624
-#: ../widgets/table/e-table-item.c:3025 ../widgets/table/e-table-item.c:3026
+#: ../widgets/table/e-table-group-container.c:962
+#: ../widgets/table/e-table-group-container.c:963
+#: ../widgets/table/e-table-group-leaf.c:628
+#: ../widgets/table/e-table-group-leaf.c:629
+#: ../widgets/table/e-table-item.c:3021 ../widgets/table/e-table-item.c:3022
msgid "Selection model"
msgstr "Selection model"
-#: ../widgets/table/e-table-group-container.c:964
-#: ../widgets/table/e-table-group-container.c:965
-#: ../widgets/table/e-table-group-leaf.c:616
-#: ../widgets/table/e-table-group-leaf.c:617
-#: ../widgets/table/e-table-item.c:3067 ../widgets/table/e-table-item.c:3068
-#: ../widgets/table/e-table.c:3325 ../widgets/table/e-tree.c:3338
-#: ../widgets/table/e-tree.c:3339
+#: ../widgets/table/e-table-group-container.c:969
+#: ../widgets/table/e-table-group-container.c:970
+#: ../widgets/table/e-table-group-leaf.c:621
+#: ../widgets/table/e-table-group-leaf.c:622
+#: ../widgets/table/e-table-item.c:3063 ../widgets/table/e-table-item.c:3064
+#: ../widgets/table/e-table.c:3324 ../widgets/table/e-tree.c:3337
+#: ../widgets/table/e-tree.c:3338
msgid "Length Threshold"
msgstr "Length Threshold"
-#: ../widgets/table/e-table-group-container.c:971
-#: ../widgets/table/e-table-group-container.c:972
-#: ../widgets/table/e-table-group-leaf.c:658
-#: ../widgets/table/e-table-group-leaf.c:659
-#: ../widgets/table/e-table-item.c:3101 ../widgets/table/e-table-item.c:3102
-#: ../widgets/table/e-table.c:3332 ../widgets/table/e-tree.c:3370
-#: ../widgets/table/e-tree.c:3371
+#: ../widgets/table/e-table-group-container.c:976
+#: ../widgets/table/e-table-group-container.c:977
+#: ../widgets/table/e-table-group-leaf.c:663
+#: ../widgets/table/e-table-group-leaf.c:664
+#: ../widgets/table/e-table-item.c:3097 ../widgets/table/e-table-item.c:3098
+#: ../widgets/table/e-table.c:3331 ../widgets/table/e-tree.c:3369
+#: ../widgets/table/e-tree.c:3370
msgid "Uniform row height"
msgstr "Uniform row height"
-#: ../widgets/table/e-table-group-container.c:978
-#: ../widgets/table/e-table-group-container.c:979
-#: ../widgets/table/e-table-group-leaf.c:651
-#: ../widgets/table/e-table-group-leaf.c:652
+#: ../widgets/table/e-table-group-container.c:983
+#: ../widgets/table/e-table-group-container.c:984
+#: ../widgets/table/e-table-group-leaf.c:656
+#: ../widgets/table/e-table-group-leaf.c:657
msgid "Frozen"
msgstr "Frozen"
-#: ../widgets/table/e-table-header-item.c:1453
+#: ../widgets/table/e-table-header-item.c:1452
msgid "Customize Current View"
msgstr "Customise Current View"
-#: ../widgets/table/e-table-header-item.c:1473
+#: ../widgets/table/e-table-header-item.c:1472
msgid "Sort _Ascending"
msgstr "Sort _Ascending"
-#: ../widgets/table/e-table-header-item.c:1474
+#: ../widgets/table/e-table-header-item.c:1473
msgid "Sort _Descending"
msgstr "Sort _Descending"
-#: ../widgets/table/e-table-header-item.c:1475
+#: ../widgets/table/e-table-header-item.c:1474
msgid "_Unsort"
msgstr "_Unsort"
-#: ../widgets/table/e-table-header-item.c:1477
+#: ../widgets/table/e-table-header-item.c:1476
msgid "Group By This _Field"
msgstr "Group By This _Field"
-#: ../widgets/table/e-table-header-item.c:1478
+#: ../widgets/table/e-table-header-item.c:1477
msgid "Group By _Box"
msgstr "Group By _Box"
-#: ../widgets/table/e-table-header-item.c:1480
+#: ../widgets/table/e-table-header-item.c:1479
msgid "Remove This _Column"
msgstr "Remove This _Column"
-#: ../widgets/table/e-table-header-item.c:1481
+#: ../widgets/table/e-table-header-item.c:1480
msgid "Add a C_olumn..."
msgstr "Add a C_olumn..."
-#: ../widgets/table/e-table-header-item.c:1483
+#: ../widgets/table/e-table-header-item.c:1482
msgid "A_lignment"
msgstr "A_lignment"
-#: ../widgets/table/e-table-header-item.c:1484
+#: ../widgets/table/e-table-header-item.c:1483
msgid "B_est Fit"
msgstr "B_est Fit"
-#: ../widgets/table/e-table-header-item.c:1485
+#: ../widgets/table/e-table-header-item.c:1484
msgid "Format Column_s..."
msgstr "Format Column_s..."
-#: ../widgets/table/e-table-header-item.c:1487
+#: ../widgets/table/e-table-header-item.c:1486
msgid "Custo_mize Current View..."
msgstr "Custo_mise Current View..."
-#: ../widgets/table/e-table-header-item.c:1543
+#: ../widgets/table/e-table-header-item.c:1542
msgid "_Sort By"
msgstr "_Sort By"
#. Custom
-#: ../widgets/table/e-table-header-item.c:1561
+#: ../widgets/table/e-table-header-item.c:1560
msgid "_Custom"
msgstr "_Custom"
-#: ../widgets/table/e-table-header-item.c:1894
+#: ../widgets/table/e-table-header-item.c:1893
msgid "Font Description"
msgstr "Font Description"
-#: ../widgets/table/e-table-header-item.c:1915
+#: ../widgets/table/e-table-header-item.c:1914
#: ../widgets/table/e-table-sorter.c:172
msgid "Sort Info"
msgstr "Sort Info"
-#: ../widgets/table/e-table-header-item.c:1929
+#: ../widgets/table/e-table-header-item.c:1928
#: ../widgets/table/e-tree-scrolled.c:225
#: ../widgets/table/e-tree-scrolled.c:226
msgid "Tree"
msgstr "Tree"
-#: ../widgets/table/e-table-item.c:3011 ../widgets/table/e-table-item.c:3012
+#: ../widgets/table/e-table-item.c:3007 ../widgets/table/e-table-item.c:3008
msgid "Table header"
msgstr "Table header"
-#: ../widgets/table/e-table-item.c:3018 ../widgets/table/e-table-item.c:3019
+#: ../widgets/table/e-table-item.c:3014 ../widgets/table/e-table-item.c:3015
msgid "Table model"
msgstr "Table model"
-#: ../widgets/table/e-table-item.c:3094 ../widgets/table/e-table-item.c:3095
+#: ../widgets/table/e-table-item.c:3090 ../widgets/table/e-table-item.c:3091
msgid "Cursor row"
msgstr "Cursor row"
-#: ../widgets/table/e-table.c:3339 ../widgets/table/e-tree.c:3377
-#: ../widgets/table/e-tree.c:3378
+#: ../widgets/table/e-table.c:3338 ../widgets/table/e-tree.c:3376
+#: ../widgets/table/e-tree.c:3377
msgid "Always search"
msgstr "Always search"
-#: ../widgets/table/e-table.c:3346
+#: ../widgets/table/e-table.c:3345
msgid "Use click to add"
msgstr "Use click to add"
-#: ../widgets/table/e-tree.c:3363 ../widgets/table/e-tree.c:3364
+#: ../widgets/table/e-tree.c:3362 ../widgets/table/e-tree.c:3363
msgid "ETree table adapter"
msgstr "ETree table adapter"
-#: ../widgets/table/e-tree.c:3384
+#: ../widgets/table/e-tree.c:3383
msgid "Retro Look"
msgstr "Retro Look"
-#: ../widgets/table/e-tree.c:3385
+#: ../widgets/table/e-tree.c:3384
msgid "Draw lines and +/- expanders."
msgstr "Draw lines and +/- expanders."
-#: ../widgets/text/e-text.c:2735
+#: ../widgets/text/e-text.c:2733
msgid "Input Methods"
msgstr "Input Methods"
-#: ../widgets/text/e-text.c:3558 ../widgets/text/e-text.c:3559
+#: ../widgets/text/e-text.c:3556 ../widgets/text/e-text.c:3557
msgid "Event Processor"
msgstr "Event Processor"
-#: ../widgets/text/e-text.c:3572 ../widgets/text/e-text.c:3573
+#: ../widgets/text/e-text.c:3570 ../widgets/text/e-text.c:3571
msgid "Bold"
msgstr "Bold"
-#: ../widgets/text/e-text.c:3579 ../widgets/text/e-text.c:3580
+#: ../widgets/text/e-text.c:3577 ../widgets/text/e-text.c:3578
msgid "Strikeout"
msgstr "Strikeout"
-#: ../widgets/text/e-text.c:3586 ../widgets/text/e-text.c:3587
+#: ../widgets/text/e-text.c:3584 ../widgets/text/e-text.c:3585
msgid "Anchor"
msgstr "Anchor"
-#: ../widgets/text/e-text.c:3594 ../widgets/text/e-text.c:3595
+#: ../widgets/text/e-text.c:3592 ../widgets/text/e-text.c:3593
msgid "Justification"
msgstr "Justification"
-#: ../widgets/text/e-text.c:3601 ../widgets/text/e-text.c:3602
+#: ../widgets/text/e-text.c:3599 ../widgets/text/e-text.c:3600
msgid "Clip Width"
msgstr "Clip Width"
-#: ../widgets/text/e-text.c:3608 ../widgets/text/e-text.c:3609
+#: ../widgets/text/e-text.c:3606 ../widgets/text/e-text.c:3607
msgid "Clip Height"
msgstr "Clip Height"
-#: ../widgets/text/e-text.c:3615 ../widgets/text/e-text.c:3616
+#: ../widgets/text/e-text.c:3613 ../widgets/text/e-text.c:3614
msgid "Clip"
msgstr "Clip"
-#: ../widgets/text/e-text.c:3622 ../widgets/text/e-text.c:3623
+#: ../widgets/text/e-text.c:3620 ../widgets/text/e-text.c:3621
msgid "Fill clip rectangle"
msgstr "Fill clip rectangle"
-#: ../widgets/text/e-text.c:3629 ../widgets/text/e-text.c:3630
+#: ../widgets/text/e-text.c:3627 ../widgets/text/e-text.c:3628
msgid "X Offset"
msgstr "X Offset"
-#: ../widgets/text/e-text.c:3636 ../widgets/text/e-text.c:3637
+#: ../widgets/text/e-text.c:3634 ../widgets/text/e-text.c:3635
msgid "Y Offset"
msgstr "Y Offset"
-#: ../widgets/text/e-text.c:3672 ../widgets/text/e-text.c:3673
+#: ../widgets/text/e-text.c:3670 ../widgets/text/e-text.c:3671
msgid "Text width"
msgstr "Text width"
-#: ../widgets/text/e-text.c:3679 ../widgets/text/e-text.c:3680
+#: ../widgets/text/e-text.c:3677 ../widgets/text/e-text.c:3678
msgid "Text height"
msgstr "Text height"
-#: ../widgets/text/e-text.c:3694 ../widgets/text/e-text.c:3695
+#: ../widgets/text/e-text.c:3692 ../widgets/text/e-text.c:3693
msgid "Use ellipsis"
msgstr "Use ellipsis"
-#: ../widgets/text/e-text.c:3701 ../widgets/text/e-text.c:3702
+#: ../widgets/text/e-text.c:3699 ../widgets/text/e-text.c:3700
msgid "Ellipsis"
msgstr "Ellipsis"
-#: ../widgets/text/e-text.c:3708 ../widgets/text/e-text.c:3709
+#: ../widgets/text/e-text.c:3706 ../widgets/text/e-text.c:3707
msgid "Line wrap"
msgstr "Line wrap"
-#: ../widgets/text/e-text.c:3715 ../widgets/text/e-text.c:3716
+#: ../widgets/text/e-text.c:3713 ../widgets/text/e-text.c:3714
msgid "Break characters"
msgstr "Break characters"
-#: ../widgets/text/e-text.c:3722 ../widgets/text/e-text.c:3723
+#: ../widgets/text/e-text.c:3720 ../widgets/text/e-text.c:3721
msgid "Max lines"
msgstr "Max lines"
-#: ../widgets/text/e-text.c:3744 ../widgets/text/e-text.c:3745
+#: ../widgets/text/e-text.c:3742 ../widgets/text/e-text.c:3743
msgid "Draw borders"
msgstr "Draw borders"
-#: ../widgets/text/e-text.c:3751 ../widgets/text/e-text.c:3752
+#: ../widgets/text/e-text.c:3749 ../widgets/text/e-text.c:3750
msgid "Allow newlines"
msgstr "Allow newlines"
-#: ../widgets/text/e-text.c:3758 ../widgets/text/e-text.c:3759
+#: ../widgets/text/e-text.c:3756 ../widgets/text/e-text.c:3757
msgid "Draw background"
msgstr "Draw background"
-#: ../widgets/text/e-text.c:3765 ../widgets/text/e-text.c:3766
+#: ../widgets/text/e-text.c:3763 ../widgets/text/e-text.c:3764
msgid "Draw button"
msgstr "Draw button"
-#: ../widgets/text/e-text.c:3772 ../widgets/text/e-text.c:3773
+#: ../widgets/text/e-text.c:3770 ../widgets/text/e-text.c:3771
msgid "Cursor position"
msgstr "Cursor position"
-#: ../widgets/text/e-text.c:3779 ../widgets/text/e-text.c:3780
+#. Translators: Input Method Context
+#: ../widgets/text/e-text.c:3778 ../widgets/text/e-text.c:3780
msgid "IM Context"
msgstr "IM Context"
@@ -23724,6 +24028,112 @@ msgstr "IM Context"
msgid "Handle Popup"
msgstr "Handle Popup"
+#~ msgid ""
+#~ "We were unable to open this address book. This either means you have "
+#~ "entered an incorrect URI, or the LDAP server is unreachable."
+#~ msgstr ""
+#~ "We were unable to open this address book. This either means you have "
+#~ "entered an incorrect URI, or the LDAP server is unreachable."
+
+#~ msgid "Contact Print Style Editor Test"
+#~ msgstr "Contact Print Style Editor Test"
+
+#~ msgid "Copyright (C) 2000, Ximian, Inc."
+#~ msgstr "Copyright (C) 2000, Ximian, Inc."
+
+#~ msgid "This should test the contact print style editor widget"
+#~ msgstr "This should test the contact print style editor widget"
+
+#~ msgid "Contact Print Test"
+#~ msgstr "Contact Print Test"
+
+#~ msgid "This should test the contact print code"
+#~ msgstr "This should test the contact print code"
+
+#~ msgid "Business"
+#~ msgstr "Business"
+
+#~ msgid "Competition"
+#~ msgstr "Competition"
+
+#~ msgid "Favourites"
+#~ msgstr "Favourites"
+
+#~ msgid "Gifts"
+#~ msgstr "Gifts"
+
+#~ msgid "Goals/Objectives"
+#~ msgstr "Goals/Objectives"
+
+#~ msgid "Holiday"
+#~ msgstr "Holiday"
+
+#~ msgid "Holiday Cards"
+#~ msgstr "Holiday Cards"
+
+#~ msgid "Hot Contacts"
+#~ msgstr "Hot Contacts"
+
+#~ msgid "Ideas"
+#~ msgstr "Ideas"
+
+#~ msgid "International"
+#~ msgstr "International"
+
+#~ msgid "Key Customer"
+#~ msgstr "Key Customer"
+
+#~ msgid "Miscellaneous"
+#~ msgstr "Miscellaneous"
+
+#~ msgid "Next 7 days"
+#~ msgstr "Next 7 days"
+
+#~ msgid "Phone Calls"
+#~ msgstr "Phone Calls"
+
+#~ msgid "Strategies"
+#~ msgstr "Strategies"
+
+#~ msgid "Suppliers"
+#~ msgstr "Suppliers"
+
+#~ msgid "Time &amp; Expenses"
+#~ msgstr "Time &amp; Expenses"
+
+#~ msgid "VIP"
+#~ msgstr "VIP"
+
+#~ msgid "Waiting"
+#~ msgstr "Waiting"
+
+#~ msgid "Next 7 Days"
+#~ msgstr "Next 7 Days"
+
+#~ msgid "A_dd Filter Criteria"
+#~ msgstr "A_dd Filter Criteria"
+
+#~ msgid "Weather: Partly Cloudy"
+#~ msgstr "Weather: Partly Cloudy"
+
+#~ msgid "Please enter user name first."
+#~ msgstr "Please enter user name first."
+
+#~ msgid "Mark calendar offline"
+#~ msgstr "Mark calendar offline"
+
+#~ msgid "Marks the selected calendar for offline viewing."
+#~ msgstr "Marks the selected calendar for offline viewing."
+
+#~ msgid "Error opening the FAQ webpage."
+#~ msgstr "Error opening the FAQ webpage."
+
+#~ msgid "Select Importers"
+#~ msgstr "Select Importers"
+
+#~ msgid "Re_fresh..."
+#~ msgstr "Re_fresh..."
+
#~ msgid "Recent Docu_ments"
#~ msgstr "Recent Docu_ments"
@@ -23964,9 +24374,6 @@ msgstr "Handle Popup"
#~ msgid "S/MIME Sign"
#~ msgstr "S/MIME Sign"
-#~ msgid "Save As"
-#~ msgstr "Save As"
-
#~ msgid "Save in folder..."
#~ msgstr "Save in folder..."
@@ -24109,9 +24516,6 @@ msgstr "Handle Popup"
#~ msgid "This journal entry has been changed."
#~ msgstr "This journal entry has been changed."
-#~ msgid "Journal entry - %s"
-#~ msgstr "Journal entry - %s"
-
#~ msgid "The journal entry could not be deleted due to a corba error"
#~ msgstr "The journal entry could not be deleted due to a corba error"
@@ -24598,9 +25002,6 @@ msgstr "Handle Popup"
#~ "A file by that name already exists.\n"
#~ "Overwrite it?"
-#~ msgid "Filtering Folder"
-#~ msgstr "Filtering Folder"
-
#~ msgid "Message _List As"
#~ msgstr "Message _List As"
@@ -24676,12 +25077,6 @@ msgstr "Handle Popup"
#~ msgid "description of appointment"
#~ msgstr "description of appointment"
-#~ msgid "Dismiss"
-#~ msgstr "Dismiss"
-
-#~ msgid "Dismiss All"
-#~ msgstr "Dismiss All"
-
#~ msgid ""
#~ "Alarm on %s\n"
#~ "%s\n"