[evolution/wip/gsettings] Updated Gujarati Translations



commit 0d27f00de3d811c8bea261a39dd5f9cf3b1b3895
Author: Sweta Kothari <swkothar redhat com>
Date:   Tue Feb 15 15:25:35 2011 +0530

    Updated Gujarati Translations

 po/gu.po | 2032 ++++++++++++++++----------------------------------------------
 1 files changed, 530 insertions(+), 1502 deletions(-)
---
diff --git a/po/gu.po b/po/gu.po
index fcbb266..2dbd3cb 100644
--- a/po/gu.po
+++ b/po/gu.po
@@ -1,13 +1,14 @@
 # translation of gu.po to Gujarati
-#: ../shell/main.c:615
 # Ankit Patel <ankit644 yahoo com>, 2005, 2006.
 # Ankit Patel <ankit redhat com>, 2007, 2008, 2009.
 # Sweta Kothari <swkothar redhat com>, 2008, 2009, 2011.
+#: ../shell/main.c:615
 msgid ""
 msgstr ""
 "Project-Id-Version: gu\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=evolution\n";
-"POT-Creation-Date: 2011-02-07 04:37+0000\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
+"product=evolution\n"
+"POT-Creation-Date: 2011-02-14 11:29+0000\n"
 "PO-Revision-Date: 2011-02-15 15:18+0530\n"
 "Last-Translator: Sweta Kothari <swkothar redhat com>\n"
 "Language-Team: Gujarati\n"
@@ -158,7 +159,6 @@ msgstr "àààààà àààààààà '{à}' àààà àà
 
 #: ../addressbook/addressbook.error.xml.h:13
 #: ../calendar/calendar.error.xml.h:34 ../mail/mail.error.xml.h:46
-#| msgid "Do not delete"
 msgid "Do _Not Delete"
 msgstr "àààà àààà (_N)"
 
@@ -193,8 +193,10 @@ msgid "The Evolution address book has quit unexpectedly."
 msgstr "ààààààààà àààààààààà ààààààààà àààà ààà àà àà."
 
 #: ../addressbook/addressbook.error.xml.h:21
-msgid "The image you have selected is large. Do you want to resize and store it?"
-msgstr "ààà àààà àààà ààààà ààààà àà. ààà ààà ààààà ààà ààààà ààààà àà ààà àààà àààààà àààà ààààà àà?"
+msgid ""
+"The image you have selected is large. Do you want to resize and store it?"
+msgstr ""
+"ààà àààà àààà ààààà ààààà àà. ààà ààà ààààà ààà ààààà ààààà àà ààà àààà àààààà àààà ààààà àà?"
 
 #: ../addressbook/addressbook.error.xml.h:22
 msgid ""
@@ -274,8 +276,10 @@ msgstr "ààà à àààààà àààà ààààààà à
 
 #. Translators: {0} is replaced with an address book name which will not be available
 #: ../addressbook/addressbook.error.xml.h:37
-msgid "Your contacts for {0} will not be available until Evolution is restarted."
-msgstr "ààààà {0} àààààà ààààààà ààààà àààà ààààààààà ààààà àààà à ààà ààààà àààà àààààà ààà ààà."
+msgid ""
+"Your contacts for {0} will not be available until Evolution is restarted."
+msgstr ""
+"ààààà {0} àààààà ààààààà ààààà àààà ààààààààà ààààà àààà à ààà ààààà àààà àààààà ààà ààà."
 
 #: ../addressbook/addressbook.error.xml.h:38 ../mail/em-vfolder-rule.c:613
 #: ../plugins/groupwise-features/junk-settings.ui.h:4
@@ -302,7 +306,7 @@ msgstr "ààà àà ààà ààààà (_U)"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:1
 #: ../addressbook/gui/widgets/eab-contact-display.c:583
-#: ../calendar/gui/e-calendar-view.c:2081
+#: ../calendar/gui/e-calendar-view.c:2080
 msgid "Anniversary"
 msgstr "àààààààà"
 
@@ -313,14 +317,13 @@ msgstr "àààààààà"
 #. * the directory components.
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:2
 #: ../addressbook/gui/widgets/eab-contact-display.c:582
-#: ../calendar/gui/e-calendar-view.c:2080 ../capplet/anjal-settings-main.c:124
+#: ../calendar/gui/e-calendar-view.c:2079 ../capplet/anjal-settings-main.c:116
 #: ../shell/main.c:133
 msgid "Birthday"
 msgstr "àààààààà"
 
 #. Translators: an accessibility name
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:4
-#| msgid "Blog"
 msgid "Blog:"
 msgstr "ààààà:"
 
@@ -331,7 +334,6 @@ msgid "Ca_tegories..."
 msgstr "ààààà (_t)..."
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:6
-#| msgid "_Calendar:"
 msgid "Calendar:"
 msgstr "àààààààà:"
 
@@ -358,7 +360,6 @@ msgid "Email"
 msgstr "à-àààà"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:10
-#| msgid "_Free/Busy:"
 msgid "Free/Busy:"
 msgstr "ààààà/àààààà:"
 
@@ -373,7 +374,6 @@ msgid "Home"
 msgstr "àà"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:13
-#| msgid "_Home Page:"
 msgid "Home Page:"
 msgstr "àà àààà:"
 
@@ -382,7 +382,6 @@ msgid "Image"
 msgstr "àààà"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:15
-#| msgid "<b>Instant Messaging</b>"
 msgid "Instant Messaging"
 msgstr "ààààà ààààààààààààà"
 
@@ -397,7 +396,6 @@ msgstr "àààà ààààààà"
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:18
 #: ../calendar/gui/dialogs/task-details-page.ui.h:11
 #, fuzzy
-#| msgid "Miscelleneous"
 msgid "Miscellaneous"
 msgstr "ààààààà"
 
@@ -417,7 +415,7 @@ msgstr "ààààà"
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:188
 #: ../addressbook/gui/widgets/eab-contact-display.c:71
 #: ../addressbook/gui/widgets/eab-contact-display.c:460
-#: ../calendar/gui/e-calendar-view.c:1786
+#: ../calendar/gui/e-calendar-view.c:1785
 msgid "Other"
 msgstr "àààà"
 
@@ -430,17 +428,14 @@ msgid "Telephone"
 msgstr "ààààààà"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:24
-#| msgid "_Video Chat:"
 msgid "Video Chat:"
 msgstr "àààààà ààààà:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:25
-#| msgid "<b>Web Addresses</b>"
 msgid "Web Addresses"
 msgstr "ààà ààààààà"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:26
-#| msgid "addresses"
 msgid "Web addresses"
 msgstr "ààà ààààààà"
 
@@ -468,7 +463,6 @@ msgid "_Birthday:"
 msgstr "àààà àààà (_B):"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:32
-#| msgid "Blog"
 msgid "_Blog:"
 msgstr "ààààà (_B):"
 
@@ -698,7 +692,6 @@ msgid "Jr."
 msgstr "Jr."
 
 #: ../addressbook/gui/contact-editor/fullname.ui.h:8
-#| msgid "is"
 msgid "Miss"
 msgstr "Miss"
 
@@ -740,7 +733,6 @@ msgid "Contact List Editor"
 msgstr "àààààà àààà àààààà"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:2
-#| msgid "_Members"
 msgid "Members"
 msgstr "ààààà"
 
@@ -872,7 +864,6 @@ msgstr "àààààà ààààà ààààààààà ààà
 
 #: ../addressbook/gui/widgets/e-addressbook-model.c:740
 #, fuzzy
-#| msgid "Search Filter"
 msgid "Search Interrupted"
 msgstr "ààà àààà"
 
@@ -882,19 +873,16 @@ msgstr "ààààà ààààààà àààà ààà"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:628
 #, fuzzy
-#| msgid "Cut selected text to the clipboard"
 msgid "Cut selected contacts to the clipboard"
 msgstr "àààà àààà àààààà ààààààààààààà àààà"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:634
 #, fuzzy
-#| msgid "Copy selected text to the clipboard"
 msgid "Copy selected contacts to the clipboard"
 msgstr "àààà àààà àààààà ààààààààààààà ààà ààà"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:640
 #, fuzzy
-#| msgid "Paste tasks from the clipboard"
 msgid "Paste contacts from the clipboard"
 msgstr "ààààààààààààààà ààààà ààààààà"
 
@@ -904,15 +892,11 @@ msgid "Delete selected contacts"
 msgstr "àààà àààà ààààààà àààà ààààà"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:652
-#| msgid "Select all contacts"
 msgid "Select all visible contacts"
 msgstr "ààà àààààà ààààààààà àààà ààà"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:1298
 #, fuzzy
-#| msgid ""
-#| "Are you sure you want\n"
-#| "to delete these contact lists?"
 msgid "Are you sure you want to delete these contact lists?"
 msgstr ""
 "ààà ààà ààààà à àààààà ààààà\n"
@@ -920,9 +904,6 @@ msgstr ""
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:1302
 #, fuzzy
-#| msgid ""
-#| "Are you sure you want\n"
-#| "to delete these contact lists?"
 msgid "Are you sure you want to delete this contact list?"
 msgstr ""
 "ààà ààà ààààà à àààààà ààààà\n"
@@ -930,9 +911,6 @@ msgstr ""
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:1306
 #, fuzzy, c-format
-#| msgid ""
-#| "Are you sure you want\n"
-#| "to delete contact list (%s)?"
 msgid "Are you sure you want to delete this contact list (%s)?"
 msgstr ""
 "ààà ààà ààààà àààààà àààà (%s)\n"
@@ -940,9 +918,6 @@ msgstr ""
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:1312
 #, fuzzy
-#| msgid ""
-#| "Are you sure you want\n"
-#| "to delete these contacts?"
 msgid "Are you sure you want to delete these contacts?"
 msgstr ""
 "ààà ààà ààààà à ààààààà\n"
@@ -950,9 +925,6 @@ msgstr ""
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:1316
 #, fuzzy
-#| msgid ""
-#| "Are you sure you want\n"
-#| "to delete these contacts?"
 msgid "Are you sure you want to delete this contact?"
 msgstr ""
 "ààà ààà ààààà à ààààààà\n"
@@ -960,9 +932,6 @@ msgstr ""
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:1320
 #, fuzzy, c-format
-#| msgid ""
-#| "Are you sure you want\n"
-#| "to delete contact (%s)?"
 msgid "Are you sure you want to delete this contact (%s)?"
 msgstr ""
 "ààà ààà ààààà àààààà (%s)\n"
@@ -971,12 +940,6 @@ msgstr ""
 #. Translators: This is shown for > 5 contacts.
 #: ../addressbook/gui/widgets/e-addressbook-view.c:1477
 #, fuzzy, c-format
-#| msgid ""
-#| "Opening %d contact will open %d new window as well.\n"
-#| "Do you really want to display this contact?"
-#| msgid_plural ""
-#| "Opening %d contacts will open %d new windows as well.\n"
-#| "Do you really want to display all of these contacts?"
 msgid ""
 "Opening %d contacts will open %d new windows as well.\n"
 "Do you really want to display all of these contacts?"
@@ -1279,7 +1242,6 @@ msgstr "ààààà àààààààà ààà ààà (_E)"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:176
 #: ../widgets/misc/e-web-view.c:395
-#| msgid "Copy things to the clipboard."
 msgid "Copy the email address to the clipboard"
 msgstr "ààààààààààààà àààà àààààààà ààà ààà"
 
@@ -1290,7 +1252,6 @@ msgstr "àà ààààà ààà àààààà ààààà (_S)
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:183
 #: ../widgets/misc/e-web-view.c:402
-#| msgid "Convert a mail message to a task."
 msgid "Send a mail message to this address"
 msgstr "à àààààà ààà àààà àààààà ààààà"
 
@@ -1373,7 +1334,7 @@ msgstr "ààà ààà"
 #. Create the default Person memo list
 #. Create the default Person task list
 #: ../addressbook/gui/widgets/eab-contact-display.c:586
-#: ../capplet/settings/mail-capplet-shell.c:365
+#: ../capplet/settings/mail-capplet-shell.c:361
 #: ../modules/addressbook/e-book-shell-backend.c:116
 #: ../modules/addressbook/e-book-shell-migrate.c:143
 #: ../modules/calendar/e-cal-shell-backend.c:132
@@ -1469,21 +1430,18 @@ msgstr ""
 #. Translators: %s is replaced with a detailed error message, or an empty string, if not provided
 #: ../addressbook/gui/widgets/eab-gui-util.c:179
 #, c-format
-#| msgid "The backend for this address book was unable to parse this query."
 msgid "The backend for this address book was unable to parse this query. %s"
 msgstr "à àààààà àààààààààà àààààààà àààà à ààààààààà àààààààà ààààààà àààààà ààà. %s"
 
 #. Translators: %s is replaced with a detailed error message, or an empty string, if not provided
 #: ../addressbook/gui/widgets/eab-gui-util.c:184
 #, fuzzy, c-format
-#| msgid "The backend for this address book refused to perform this query."
 msgid "The backend for this address book refused to perform this query. %s"
 msgstr "à àààààà àààààààààà àààààààà àààà à ààààààààà àààààààà ààààààà àààààààà."
 
 #. Translators: %s is replaced with a detailed error message, or an empty string, if not provided
 #: ../addressbook/gui/widgets/eab-gui-util.c:189
 #, c-format
-#| msgid "This query did not complete successfully."
 msgid "This query did not complete successfully. %s"
 msgstr "à àààààà ààààààààààà ààààà ààà àààà. %s"
 
@@ -1570,9 +1528,8 @@ msgstr "ààààààààà vCard àààà ààààà"
 
 #. Uncomment next if it is successful to get total number if pages in list view
 #. * g_object_get (operation, "n-pages", &n_pages, NULL)
-#: ../addressbook/printing/e-contact-print.c:746
+#: ../addressbook/printing/e-contact-print.c:741
 #, c-format
-#| msgid "Page %d of %d"
 msgid "Page %d"
 msgstr "ààààà %d"
 
@@ -1625,7 +1582,8 @@ msgid "NUMBER"
 msgstr "NUMBER"
 
 #: ../addressbook/tools/evolution-addressbook-export.c:137
-msgid "Command line arguments error, please use --help option to see the usage."
+msgid ""
+"Command line arguments error, please use --help option to see the usage."
 msgstr "àààà ààààà àààà ààà, àààààààà ààààà ààààà àààà àààà --help àààààà ààààà."
 
 #: ../addressbook/tools/evolution-addressbook-export.c:151
@@ -1664,9 +1622,6 @@ msgstr ""
 
 #: ../calendar/calendar.error.xml.h:5
 #, fuzzy
-#| msgid ""
-#| "Adding a meaningful summary to your appointment will give your recipients "
-#| "an idea of what your appointment is about."
 msgid ""
 "Adding a meaningful summary to your appointment will give you an idea of "
 "what your appointment is about."
@@ -1676,9 +1631,6 @@ msgstr ""
 
 #: ../calendar/calendar.error.xml.h:6
 #, fuzzy
-#| msgid ""
-#| "Adding a meaningful summary to your task will give your recipients an "
-#| "idea of what your task is about."
 msgid ""
 "Adding a meaningful summary to your task will give you an idea of what your "
 "task is about."
@@ -1705,11 +1657,13 @@ msgid "All information on these tasks will be deleted and can not be restored."
 msgstr "à ààààààà ààà ààààààà àààà àààààà ààà ààààà ààààààà ààààà àààà."
 
 #: ../calendar/calendar.error.xml.h:11
-msgid "All information on this appointment will be deleted and can not be restored."
+msgid ""
+"All information on this appointment will be deleted and can not be restored."
 msgstr "à ààààààààà ààà ààààààà àààà ààààààààà ààà àà ààà ààààà ààààààà ààààà àààà."
 
 #: ../calendar/calendar.error.xml.h:12
-msgid "All information on this meeting will be deleted and can not be restored."
+msgid ""
+"All information on this meeting will be deleted and can not be restored."
 msgstr "à ààààààààà ààà ààààààà àààà ààààààààà àààà àà ààà ààààà ààààààà ààààà ààà."
 
 #: ../calendar/calendar.error.xml.h:13
@@ -1730,7 +1684,6 @@ msgstr "ààà ààà ààààà '{0}' àààààààààà
 
 #: ../calendar/calendar.error.xml.h:17
 #, fuzzy
-#| msgid "Are you sure you want to delete the appointment titled '{0}'?"
 msgid "Are you sure you want to delete the meeting titled '{0}'?"
 msgstr "ààà ààà ààààà '{0}' àààààààààà ààààààà àààà àààààà ààààà àà?"
 
@@ -1774,7 +1727,6 @@ msgstr "ààà ààà ààààà à àààà àààà àà
 
 #: ../calendar/calendar.error.xml.h:26
 #, fuzzy
-#| msgid "Are you sure you want to send the appointment without a summary?"
 msgid "Are you sure you want to save the appointment without a summary?"
 msgstr "ààà ààà ààààà ààààààà ààà àààà àààààà ààààà àà?"
 
@@ -1784,7 +1736,6 @@ msgstr "ààà ààà ààààà ààà àààà àààà
 
 #: ../calendar/calendar.error.xml.h:28
 #, fuzzy
-#| msgid "Are you sure you want to send the task without a summary?"
 msgid "Are you sure you want to save the task without a summary?"
 msgstr "ààà ààà ààààà àààà ààà àààà àààààà ààààà àà?"
 
@@ -1828,11 +1779,14 @@ msgstr "àààààà ààà ààà àààààà àààà."
 msgid ""
 "Email invitations will be sent to all participants and allow them to accept "
 "this task."
-msgstr "à-ààààààà ààààààà ààà àààààààààà ààààààààà ààà àà ààà ààààà à àààà ààààààààààà ààààààà ààà àà."
+msgstr ""
+"à-ààààààà ààààààà ààà àààààààààà ààààààààà ààà àà ààà ààààà à àààà ààààààààààà ààààààà ààà àà."
 
 #: ../calendar/calendar.error.xml.h:40
-msgid "Email invitations will be sent to all participants and allow them to reply."
-msgstr "à-àààà àààààààà ààà àààààààààà ààààààààà àààà ààà ààààà ààààààààààà àààààà ààààààà àààà."
+msgid ""
+"Email invitations will be sent to all participants and allow them to reply."
+msgstr ""
+"à-àààà àààààààà ààà àààààààààà ààààààààà àààà ààà ààààà ààààààààààà àààààà ààààààà àààà."
 
 #: ../calendar/calendar.error.xml.h:41
 msgid "Error loading calendar"
@@ -1849,7 +1803,6 @@ msgstr "àààà àààà àààààààà ààà"
 #. Translators: {0} is replaced with a group name, like CalDAV, Google, or such;
 #. {1} is replaced with a calendar/task/memo list name, where the error happened
 #: ../calendar/calendar.error.xml.h:46
-#| msgid "Error on '{0}'"
 msgid "Error on {0}: {1}"
 msgstr "{0} àà ààà: {1}"
 
@@ -1857,19 +1810,22 @@ msgstr "{0} àà ààà: {1}"
 msgid ""
 "If you do not send a cancelation notice, the other participants may not know "
 "the meeting is canceled."
-msgstr "àà ààà ààààààààà àààà ààààà àààà, àà àààà àààààààààà ààà àààà ààà àà ààààààà àà àà àà àà."
+msgstr ""
+"àà ààà ààààààààà àààà ààààà àààà, àà àààà àààààààààà ààà àààà ààà àà ààààààà àà àà àà àà."
 
 #: ../calendar/calendar.error.xml.h:48
 msgid ""
 "If you do not send a cancelation notice, the other participants may not know "
 "the memo has been deleted."
-msgstr "àà ààà ààààààààà àààà ààààà àààà, àà àààà àààààààààà ààà àààà ààà àà àààà àààà ààààààà àà."
+msgstr ""
+"àà ààà ààààààààà àààà ààààà àààà, àà àààà àààààààààà ààà àààà ààà àà àààà àààà ààààààà àà."
 
 #: ../calendar/calendar.error.xml.h:49
 msgid ""
 "If you do not send a cancelation notice, the other participants may not know "
 "the task has been deleted."
-msgstr "àà ààà ààààààààà àààà ààààà àààà, àà àààà àààààààààà ààà àààà ààà àà àààà àààà ààààààà àà."
+msgstr ""
+"àà ààà ààààààààà àààà ààààà àààà, àà àààà àààààààààà ààà àààà ààà àà àààà àààà ààààààà àà."
 
 #: ../calendar/calendar.error.xml.h:50
 msgid ""
@@ -1945,7 +1901,6 @@ msgstr "ààà ààà à ààààààààà àààààà 
 
 #: ../calendar/calendar.error.xml.h:66
 #, fuzzy
-#| msgid "Would you like to save your changes to this memo?"
 msgid "Would you like to save your changes to this meeting?"
 msgstr "ààà ààà ààààà ààààààà à ààààààà àààààààà ààààà àà?"
 
@@ -1996,7 +1951,6 @@ msgstr "ààà à ààààààà àààà ààààà àà,
 
 #: ../calendar/calendar.error.xml.h:77
 #, fuzzy
-#| msgid "You have changed this task, but not yet saved it."
 msgid "You have changed this meeting, but not yet saved it."
 msgstr "ààà à ààààààà ààààààà ààààà àà, ààààà ààà ààààààààà ààà."
 
@@ -2059,8 +2013,6 @@ msgstr[0] "ààààà"
 msgstr[1] "àààààà"
 
 #: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:116
-#| msgid "hours"
-#| msgid_plural "hours"
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "àààà"
@@ -2105,8 +2057,6 @@ msgstr "àààààààààà (_S)"
 #: ../calendar/gui/dialogs/event-page.ui.h:26 ../e-util/e-plugin-util.c:424
 #: ../filter/filter.ui.h:15
 #: ../plugins/google-account-setup/google-contacts-source.c:376
-#| msgid "hours"
-#| msgid_plural "hours"
 msgid "hours"
 msgstr "ààààà"
 
@@ -2139,7 +2089,6 @@ msgstr "ààà ààààà ààààààà àààààà à
 
 #: ../calendar/gui/alarm-notify/alarm-queue.c:1548
 #, fuzzy, c-format
-#| msgid "You have %d alarms"
 msgid "You have %d alarm"
 msgid_plural "You have %d alarms"
 msgstr[0] "ààààà àààà %d ààààààà àà"
@@ -2188,7 +2137,7 @@ msgid "invalid time"
 msgstr "àààààà ààà"
 
 #. 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:406
+#: ../calendar/gui/alarm-notify/util.c:69 ../calendar/gui/e-alarm-list.c:393
 #: ../calendar/gui/misc.c:116
 #, c-format
 msgid "%d hour"
@@ -2197,7 +2146,7 @@ msgstr[0] "%d àààà"
 msgstr[1] "%d ààààà"
 
 #. 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:412
+#: ../calendar/gui/alarm-notify/util.c:75 ../calendar/gui/e-alarm-list.c:399
 #: ../calendar/gui/misc.c:122
 #, c-format
 msgid "%d minute"
@@ -2208,7 +2157,7 @@ msgstr[1] "%d àààààà"
 #. 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:418
+#: ../calendar/gui/alarm-notify/util.c:79 ../calendar/gui/e-alarm-list.c:405
 #: ../calendar/gui/misc.c:126
 #, c-format
 msgid "%d second"
@@ -2262,7 +2211,7 @@ msgid "Classification"
 msgstr "àààààààà"
 
 #: ../calendar/gui/caltypes.xml.h:7 ../calendar/gui/e-cal-list-view.c:240
-#: ../calendar/gui/e-cal-model.c:780 ../calendar/gui/e-task-table.c:495
+#: ../calendar/gui/e-cal-model.c:779 ../calendar/gui/e-task-table.c:495
 #: ../calendar/gui/memotypes.xml.h:6 ../widgets/misc/e-send-options.ui.h:2
 msgid "Confidential"
 msgstr "àààààààààà"
@@ -2304,13 +2253,13 @@ msgid "Organizer"
 msgstr "ààààà"
 
 #: ../calendar/gui/caltypes.xml.h:14 ../calendar/gui/e-cal-list-view.c:239
-#: ../calendar/gui/e-cal-model.c:778 ../calendar/gui/e-task-table.c:494
+#: ../calendar/gui/e-cal-model.c:777 ../calendar/gui/e-task-table.c:494
 #: ../calendar/gui/memotypes.xml.h:12
 msgid "Private"
 msgstr "ààààà"
 
 #: ../calendar/gui/caltypes.xml.h:15 ../calendar/gui/e-cal-list-view.c:238
-#: ../calendar/gui/e-cal-model.c:769 ../calendar/gui/e-cal-model.c:776
+#: ../calendar/gui/e-cal-model.c:768 ../calendar/gui/e-cal-model.c:775
 #: ../calendar/gui/e-task-table.c:493 ../calendar/gui/memotypes.xml.h:13
 msgid "Public"
 msgstr "ààààà"
@@ -2361,22 +2310,22 @@ msgid "Edit Alarm"
 msgstr "ààààààààà àààààà ààà"
 
 #: ../calendar/gui/dialogs/alarm-dialog.c:817
-#: ../calendar/gui/e-alarm-list.c:448
+#: ../calendar/gui/e-alarm-list.c:435
 msgid "Pop up an alert"
 msgstr "àààààà ààààààà"
 
 #: ../calendar/gui/dialogs/alarm-dialog.c:818
-#: ../calendar/gui/e-alarm-list.c:444
+#: ../calendar/gui/e-alarm-list.c:431
 msgid "Play a sound"
 msgstr "ààààà ààààà"
 
 #: ../calendar/gui/dialogs/alarm-dialog.c:819
-#: ../calendar/gui/e-alarm-list.c:456
+#: ../calendar/gui/e-alarm-list.c:443
 msgid "Run a program"
 msgstr "ààààààààà ààààà"
 
 #: ../calendar/gui/dialogs/alarm-dialog.c:820
-#: ../calendar/gui/e-alarm-list.c:452
+#: ../calendar/gui/e-alarm-list.c:439
 msgid "Send an email"
 msgstr "à-àààà ààààà"
 
@@ -2386,7 +2335,6 @@ msgstr "àààààà ààààà"
 
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:2
 #: ../calendar/gui/dialogs/event-editor.c:364
-#| msgid "Alarms"
 msgid "Alarm"
 msgstr "àààààà"
 
@@ -2403,12 +2351,10 @@ msgid "Mes_sage:"
 msgstr "àààààà (_s):"
 
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:6 ../mail/mail-config.ui.h:72
-#| msgid "_Options"
 msgid "Options"
 msgstr "ààààààà"
 
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:7
-#| msgid "<b>Repeat</b>"
 msgid "Repeat"
 msgstr "àààààààààà"
 
@@ -2437,17 +2383,14 @@ msgid "_Sound:"
 msgstr "ààààà (_S):"
 
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:14
-#| msgid "Later"
 msgid "after"
 msgstr "ààà"
 
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:15
-#| msgid "is before"
 msgid "before"
 msgstr "àààààà"
 
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:16
-#| msgid "days"
 msgid "day(s)"
 msgstr "àààà (àà)"
 
@@ -2462,7 +2405,6 @@ msgstr "ààààà"
 
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:18
 #, fuzzy
-#| msgid "New appointment"
 msgid "end of appointment"
 msgstr "ààà ààààààà"
 
@@ -2472,19 +2414,15 @@ msgid "extra times every"
 msgstr "àààà àààà ààààààà ààà"
 
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:21
-#| msgid "hours"
-#| msgid_plural "hours"
 msgid "hour(s)"
 msgstr "àààà (à)"
 
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:23
-#| msgid "minutes"
 msgid "minute(s)"
 msgstr "ààààà (à)"
 
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:25
 #, fuzzy
-#| msgid "location of appointment"
 msgid "start of appointment"
 msgstr "àààààààààà ààààà"
 
@@ -2695,7 +2633,6 @@ msgstr "àààààà àààà"
 #: ../calendar/gui/dialogs/comp-editor.c:1031
 #: ../shell/e-shell-window-actions.c:1447
 #: ../widgets/misc/e-focus-tracker.c:132 ../widgets/misc/e-focus-tracker.c:565
-#| msgid "Cut the selection"
 msgid "Delete the selection"
 msgstr "àààààà àààà ààààà"
 
@@ -2844,23 +2781,23 @@ msgstr "ààà ààààà àààààà àààààààà 
 msgid "Recent _Documents"
 msgstr "ààààààààà ààààààààà (_D)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1941
+#: ../calendar/gui/dialogs/comp-editor.c:1940
 #: ../composer/e-composer-actions.c:504
 msgid "Attach"
 msgstr "àààà"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2270
-#: ../calendar/gui/dialogs/comp-editor.c:2433
-#: ../calendar/gui/dialogs/comp-editor.c:3403
+#: ../calendar/gui/dialogs/comp-editor.c:2269
+#: ../calendar/gui/dialogs/comp-editor.c:2432
+#: ../calendar/gui/dialogs/comp-editor.c:3402
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr "à àààààààà ààààà ààààààà àà ààààà àà àààààà ààà àà"
 
-#: ../calendar/gui/dialogs/comp-editor.c:3367
+#: ../calendar/gui/dialogs/comp-editor.c:3366
 #: ../plugins/prefer-plain/prefer-plain.c:64
 msgid "attachment"
 msgstr "ààààà"
 
-#: ../calendar/gui/dialogs/comp-editor.c:3435
+#: ../calendar/gui/dialogs/comp-editor.c:3434
 msgid "Unable to use current version!"
 msgstr "ààààààà ààààààà àààààà àààà àààààà!"
 
@@ -2882,35 +2819,30 @@ msgstr "ààà àààààà ààà ààààààààààà
 
 #: ../calendar/gui/dialogs/delete-comp.c:213
 #, fuzzy
-#| msgid "P_ercent complete:"
 msgid "_Retract comment"
 msgstr "ààà ààààà àààà (_e):"
 
 #. Translators: The '%s' is replaced with a detailed error message
 #: ../calendar/gui/dialogs/delete-error.c:56
 #, fuzzy, c-format
-#| msgid "The event could not be deleted due to an error"
 msgid "The event could not be deleted due to a dbus error: %s"
 msgstr "àààà ààààà ààààà àààà àààà àààà"
 
 #. Translators: The '%s' is replaced with a detailed error message
 #: ../calendar/gui/dialogs/delete-error.c:60
 #, fuzzy, c-format
-#| msgid "The task could not be deleted due to an error"
 msgid "The task could not be deleted due to a dbus error: %s"
 msgstr "ààààà ààààà àààà àààà àààà àààà"
 
 #. Translators: The '%s' is replaced with a detailed error message
 #: ../calendar/gui/dialogs/delete-error.c:64
 #, fuzzy, c-format
-#| msgid "The memo could not be deleted due to an error"
 msgid "The memo could not be deleted due to a dbus error: %s"
 msgstr "ààààà ààààà àààà àààà ààààà àààà"
 
 #. Translators: The '%s' is replaced with a detailed error message
 #: ../calendar/gui/dialogs/delete-error.c:68
 #, fuzzy, c-format
-#| msgid "The item could not be deleted due to an error"
 msgid "The item could not be deleted due to a dbus error: %s"
 msgstr "ààààà ààààà ààààà àààà àààà àààà"
 
@@ -2933,28 +2865,24 @@ msgstr "ààààà àààà àààà àààà ààààà
 #. Translators: The '%s' is replaced with a detailed error message
 #: ../calendar/gui/dialogs/delete-error.c:92
 #, fuzzy, c-format
-#| msgid "The event could not be deleted due to an error"
 msgid "The event could not be deleted due to an error: %s"
 msgstr "àààà ààààà ààààà àààà àààà àààà"
 
 #. Translators: The '%s' is replaced with a detailed error message
 #: ../calendar/gui/dialogs/delete-error.c:96
 #, fuzzy, c-format
-#| msgid "The task could not be deleted due to an error"
 msgid "The task could not be deleted due to an error: %s"
 msgstr "ààààà ààààà àààà àààà àààà àààà"
 
 #. Translators: The '%s' is replaced with a detailed error message
 #: ../calendar/gui/dialogs/delete-error.c:100
 #, fuzzy, c-format
-#| msgid "The memo could not be deleted due to an error"
 msgid "The memo could not be deleted due to an error: %s"
 msgstr "ààààà ààààà àààà àààà ààààà àààà"
 
 #. Translators: The '%s' is replaced with a detailed error message
 #: ../calendar/gui/dialogs/delete-error.c:104
 #, fuzzy, c-format
-#| msgid "The item could not be deleted due to an error"
 msgid "The item could not be deleted due to an error: %s"
 msgstr "ààààà ààààà ààààà àààà àààà àààà"
 
@@ -3033,7 +2961,6 @@ msgid "Attendees"
 msgstr "àààààà"
 
 #: ../calendar/gui/dialogs/event-editor.c:585
-#| msgid "Print this message"
 msgid "Print this event"
 msgstr "à àààààà àààà"
 
@@ -3077,7 +3004,7 @@ msgid "Event with no end date"
 msgstr "ààààà ààààà ààààà àààà"
 
 #: ../calendar/gui/dialogs/event-page.c:1332
-#: ../calendar/gui/dialogs/memo-page.c:688
+#: ../calendar/gui/dialogs/memo-page.c:674
 #: ../calendar/gui/dialogs/task-page.c:908
 msgid "Start date is wrong"
 msgstr "ààààààà ààààà àààà àà"
@@ -3095,13 +3022,13 @@ msgid "End time is wrong"
 msgstr "ààààà ààà àààà àà"
 
 #: ../calendar/gui/dialogs/event-page.c:1536
-#: ../calendar/gui/dialogs/memo-page.c:729
+#: ../calendar/gui/dialogs/memo-page.c:715
 #: ../calendar/gui/dialogs/task-page.c:970
 msgid "The organizer selected no longer has an account."
 msgstr "àààà àààà ààààààà ààààà ààà àààà àààà àààà àààà."
 
 #: ../calendar/gui/dialogs/event-page.c:1542
-#: ../calendar/gui/dialogs/memo-page.c:735
+#: ../calendar/gui/dialogs/memo-page.c:721
 #: ../calendar/gui/dialogs/task-page.c:976
 msgid "An organizer is required."
 msgstr "ààààà ààààà àà."
@@ -3123,7 +3050,7 @@ msgstr "àààààààà '%s' àààà àààà àà ààà
 #. Translators: This string is used when we are creating a Task
 #. on behalf of some other user
 #: ../calendar/gui/dialogs/event-page.c:2701
-#: ../calendar/gui/dialogs/memo-page.c:948
+#: ../calendar/gui/dialogs/memo-page.c:934
 #: ../calendar/gui/dialogs/task-page.c:1790
 #, c-format
 msgid "You are acting on behalf of %s"
@@ -3156,7 +3083,6 @@ msgstr "àààààààààààà ààààà"
 
 #. Translators: "None" for "No alarm set"
 #: ../calendar/gui/dialogs/event-page.c:3049
-#| msgid "None"
 msgctxt "cal-alarms"
 msgid "None"
 msgstr "ààà àààà"
@@ -3197,7 +3123,6 @@ msgid "_Location:"
 msgstr "ààààà (_L):"
 
 #: ../calendar/gui/dialogs/event-page.ui.h:14
-#| msgid "Summary:"
 msgid "_Summary:"
 msgstr "ààà (_S):"
 
@@ -3208,8 +3133,6 @@ msgstr "ààà (_T):"
 #. TRANSLATORS: Predefined alarm's description
 #: ../calendar/gui/dialogs/event-page.ui.h:17
 #, fuzzy
-#| msgid "%d day before appointment"
-#| msgid_plural "%d days before appointment"
 msgctxt "eventpage"
 msgid "1 day before appointment"
 msgstr "ààààààà ààààààà %d àààà"
@@ -3217,8 +3140,6 @@ msgstr "ààààààà ààààààà %d àààà"
 #. TRANSLATORS: Predefined alarm's description
 #: ../calendar/gui/dialogs/event-page.ui.h:19
 #, fuzzy
-#| msgid "%d hour before appointment"
-#| msgid_plural "%d hours before appointment"
 msgctxt "eventpage"
 msgid "1 hour before appointment"
 msgstr "ààààààà ààààààà %d àààà"
@@ -3226,24 +3147,18 @@ msgstr "ààààààà ààààààà %d àààà"
 #. TRANSLATORS: Predefined alarm's description
 #: ../calendar/gui/dialogs/event-page.ui.h:21
 #, fuzzy
-#| msgid "%d minute before appointment"
-#| msgid_plural "%d minutes before appointment"
 msgctxt "eventpage"
 msgid "15 minutes before appointment"
 msgstr "ààààààà àààààà %d ààààà"
 
 #. TRANSLATORS: 'for' in a sense of 'duration'; example string: Time: [date] [time] for [ H ] hours [ M ] minutes
 #: ../calendar/gui/dialogs/event-page.ui.h:23
-#| msgid "fourth"
 msgctxt "eventpage"
 msgid "for"
 msgstr "àààà"
 
 #. TRANSLATORS: 'until' in a sense of 'duration'; example string: Time: [date] [time] until [ date ] [ time ]
 #: ../calendar/gui/dialogs/event-page.ui.h:25
-#| msgid ""
-#| "for\n"
-#| "until"
 msgctxt "eventpage"
 msgid "until"
 msgstr "ààààà àààà"
@@ -3253,7 +3168,6 @@ msgid "Memo"
 msgstr "àààà"
 
 #: ../calendar/gui/dialogs/memo-editor.c:159
-#| msgid "Print the list of memos"
 msgid "Print this memo"
 msgstr "à àààààà àààà"
 
@@ -3269,14 +3183,14 @@ msgstr "àààà àà àààààà ààà ààààà àà
 msgid "Memo cannot be fully edited, because you are not the organizer"
 msgstr "àààààà àààààààààà àààààà ààà ààààà ààà, àààà àà ààà àààààà ààà"
 
-#: ../calendar/gui/dialogs/memo-page.c:909
+#: ../calendar/gui/dialogs/memo-page.c:895
 #, c-format
 msgid "Unable to open memos in '%s'."
 msgstr "'%s' ààà àààà àààààààà àààààà."
 
-#: ../calendar/gui/dialogs/memo-page.c:1080 ../em-format/em-format-quote.c:283
-#: ../em-format/em-format.c:1052 ../mail/em-format-html.c:2401
-#: ../mail/em-format-html.c:2466 ../mail/em-format-html.c:2490
+#: ../calendar/gui/dialogs/memo-page.c:1066 ../em-format/em-format-quote.c:283
+#: ../em-format/em-format.c:1052 ../mail/em-format-html.c:2399
+#: ../mail/em-format-html.c:2464 ../mail/em-format-html.c:2488
 #: ../mail/message-list.etspec.h:20 ../modules/mail/em-mailer-prefs.c:72
 msgid "To"
 msgstr "ààààà"
@@ -3309,7 +3223,8 @@ msgstr "ààà ààààààà àààà àààààà àà
 #: ../calendar/gui/dialogs/recur-comp.c:56
 #, c-format
 msgid "You are delegating a recurring event. What would you like to delegate?"
-msgstr "ààà ààààààà ààààààà àààààààààààà ààà ààààà àà. ààà ààààà àààààààààààà àààà ààààà àà?"
+msgstr ""
+"ààà ààààààà ààààààà àààààààààààà ààà ààààà àà. ààà ààààà àààààààààààà àààà ààààà àà?"
 
 #: ../calendar/gui/dialogs/recur-comp.c:60
 #, c-format
@@ -3487,23 +3402,23 @@ msgstr "àà àà"
 msgid "occurrences"
 msgstr "ààààà"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2129
+#: ../calendar/gui/dialogs/recurrence-page.c:2126
 msgid "Add exception"
 msgstr "ààààà ààààà"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2170
+#: ../calendar/gui/dialogs/recurrence-page.c:2167
 msgid "Could not get a selection to modify."
 msgstr "ààààààà àààà àààààà ààààà ààààà àààà."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2176
+#: ../calendar/gui/dialogs/recurrence-page.c:2173
 msgid "Modify exception"
 msgstr "ààààà àààààà"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2220
+#: ../calendar/gui/dialogs/recurrence-page.c:2217
 msgid "Could not get a selection to delete."
 msgstr "àààà àààààà àààà àààààà ààààà ààààà àààà."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2354
+#: ../calendar/gui/dialogs/recurrence-page.c:2351
 msgid "Date/Time"
 msgstr "ààààà/ààà"
 
@@ -3512,12 +3427,10 @@ msgid "Every"
 msgstr "àààà"
 
 #: ../calendar/gui/dialogs/recurrence-page.ui.h:2
-#| msgid "<b>Exceptions</b>"
 msgid "Exceptions"
 msgstr "àààààà"
 
 #: ../calendar/gui/dialogs/recurrence-page.ui.h:3 ../mail/mail-config.ui.h:79
-#| msgid "_Preview"
 msgid "Preview"
 msgstr "àààààààààà"
 
@@ -3527,44 +3440,36 @@ msgstr "à ààààààà ààà ààà (_u)"
 
 #. TRANSLATORS: Entire string is for example:     'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
 #: ../calendar/gui/dialogs/recurrence-page.ui.h:8
-#| msgid "days"
 msgctxt "recurrpage"
 msgid "day(s)"
 msgstr "àààà (àà)"
 
 #. TRANSLATORS: Entire string is for example:     'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
 #: ../calendar/gui/dialogs/recurrence-page.ui.h:10
-#| msgid "fourth"
 msgctxt "recurrpage"
 msgid "for"
 msgstr "àààà"
 
 #. TRANSLATORS: Entire string is for example:     'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
 #: ../calendar/gui/dialogs/recurrence-page.ui.h:12
-#| msgid "Never"
 msgctxt "recurrpage"
 msgid "forever"
 msgstr "àààààà"
 
 #. TRANSLATORS: Entire string is for example:     'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
 #: ../calendar/gui/dialogs/recurrence-page.ui.h:14
-#| msgid "Month"
 msgctxt "recurrpage"
 msgid "month(s)"
 msgstr "ààààà (à)"
 
 #. TRANSLATORS: Entire string is for example:     'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
 #: ../calendar/gui/dialogs/recurrence-page.ui.h:16
-#| msgid ""
-#| "for\n"
-#| "until"
 msgctxt "recurrpage"
 msgid "until"
 msgstr "ààààà àààà"
 
 #. TRANSLATORS: Entire string is for example:     'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
 #: ../calendar/gui/dialogs/recurrence-page.ui.h:18
-#| msgid "weeks"
 msgctxt "recurrpage"
 msgid "week(s)"
 msgstr "àààààààà (à)"
@@ -3646,7 +3551,7 @@ msgstr "ààààà"
 #. To Translators: This is task priority
 #: ../calendar/gui/dialogs/task-details-page.ui.h:13
 #: ../calendar/gui/e-cal-component-preview.c:319
-#: ../calendar/gui/e-cal-model.c:1526 ../calendar/gui/e-task-table.c:517
+#: ../calendar/gui/e-cal-model.c:1525 ../calendar/gui/e-task-table.c:517
 #: ../calendar/gui/tasktypes.xml.h:17 ../mail/message-list.c:1222
 #: ../widgets/misc/e-send-options.ui.h:16
 msgid "Normal"
@@ -3674,7 +3579,7 @@ msgstr "ààààààààà (_u):"
 #. Status: Accepted: X   Declined: Y   ...
 #: ../calendar/gui/dialogs/task-details-page.ui.h:18
 #: ../calendar/gui/e-calendar-table.etspec.h:12
-#: ../calendar/gui/e-calendar-view.c:1834
+#: ../calendar/gui/e-calendar-view.c:1833
 #: ../calendar/gui/e-meeting-list-view.c:596
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:10
 #: ../calendar/gui/tasktypes.xml.h:21 ../mail/em-filter-i18n.h:72
@@ -3725,7 +3630,6 @@ msgid "Task Details"
 msgstr "àààààà ààààà"
 
 #: ../calendar/gui/dialogs/task-editor.c:376
-#| msgid "Print the list of tasks"
 msgid "Print this task"
 msgstr "à ààààààà àààà"
 
@@ -3772,7 +3676,7 @@ msgid "Time zone:"
 msgstr "àààà ààà:"
 
 #. Translator: Entire string is like "Pop up an alert %d days before start of appointment"
-#: ../calendar/gui/e-alarm-list.c:394
+#: ../calendar/gui/e-alarm-list.c:381
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
@@ -3780,69 +3684,69 @@ msgstr[0] "%d àààà"
 msgstr[1] "%d ààààà"
 
 #. Translator: Entire string is like "Pop up an alert %d weeks before start of appointment"
-#: ../calendar/gui/e-alarm-list.c:400
+#: ../calendar/gui/e-alarm-list.c:387
 #, c-format
 msgid "%d week"
 msgid_plural "%d weeks"
 msgstr[0] "%d àààààààà"
 msgstr[1] "%d ààààààààà"
 
-#: ../calendar/gui/e-alarm-list.c:462
+#: ../calendar/gui/e-alarm-list.c:449
 msgid "Unknown action to be performed"
 msgstr "àààààà àààààà àà àà àà"
 
 #. 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:476
+#: ../calendar/gui/e-alarm-list.c:463
 #, c-format
 msgid "%s %s before the start of the appointment"
 msgstr "%s %s ààààààà ààà ààà ààààà"
 
 #. 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:481
+#: ../calendar/gui/e-alarm-list.c:468
 #, c-format
 msgid "%s %s after the start of the appointment"
 msgstr "%s %s ààààààà ààà ààà ààà"
 
 #. Translator: The %s refers to the base, which would be actions like
 #. * "Play a sound"
-#: ../calendar/gui/e-alarm-list.c:488
+#: ../calendar/gui/e-alarm-list.c:475
 #, c-format
 msgid "%s at the start of the appointment"
 msgstr "%s ààààààà ààà ààà àààà"
 
 #. 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:499
+#: ../calendar/gui/e-alarm-list.c:486
 #, c-format
 msgid "%s %s before the end of the appointment"
 msgstr "%s %s ààààààà ààà ààà ààààà"
 
 #. 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:504
+#: ../calendar/gui/e-alarm-list.c:491
 #, c-format
 msgid "%s %s after the end of the appointment"
 msgstr "%s %s ààààààà àààà ààà ààà"
 
 #. Translator: The %s refers to the base, which would be actions like
 #. * "Play a sound"
-#: ../calendar/gui/e-alarm-list.c:511
+#: ../calendar/gui/e-alarm-list.c:498
 #, c-format
 msgid "%s at the end of the appointment"
 msgstr "%s ààààààà àààà ààà àààà"
 
 #. 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:535
+#: ../calendar/gui/e-alarm-list.c:522
 #, c-format
 msgid "%s at %s"
 msgstr "%s ààà %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:543
+#: ../calendar/gui/e-alarm-list.c:530
 #, c-format
 msgid "%s for an unknown trigger type"
 msgstr "%s àààààà àààààààà ààààààà àààà"
@@ -3852,7 +3756,6 @@ msgid "Untitled"
 msgstr "àààààà àààààà"
 
 #: ../calendar/gui/e-cal-component-preview.c:198
-#| msgid "Categories"
 msgid "Categories:"
 msgstr "ààààà:"
 
@@ -3931,25 +3834,24 @@ msgstr ""
 
 #. Translators: "None" for task's status
 #: ../calendar/gui/e-cal-model-tasks.c:708
-#| msgid "None"
 msgctxt "cal-task-status"
 msgid "None"
 msgstr "ààà àààà"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1064 ../calendar/gui/e-cal-model.c:1532
+#: ../calendar/gui/e-cal-model-tasks.c:1064 ../calendar/gui/e-cal-model.c:1531
 #: ../calendar/gui/e-meeting-list-view.c:187
 #: ../calendar/gui/e-meeting-store.c:181 ../calendar/gui/e-meeting-store.c:191
 #: ../calendar/gui/e-meeting-store.c:1030
 msgid "Yes"
 msgstr "àà"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1064 ../calendar/gui/e-cal-model.c:1532
+#: ../calendar/gui/e-cal-model-tasks.c:1064 ../calendar/gui/e-cal-model.c:1531
 #: ../calendar/gui/e-meeting-list-view.c:188
 #: ../calendar/gui/e-meeting-store.c:193
 msgid "No"
 msgstr "àà"
 
-#: ../calendar/gui/e-cal-model.c:782 ../calendar/gui/e-meeting-list-view.c:163
+#: ../calendar/gui/e-cal-model.c:781 ../calendar/gui/e-meeting-list-view.c:163
 #: ../calendar/gui/e-meeting-list-view.c:177
 #: ../calendar/gui/e-meeting-store.c:139 ../calendar/gui/e-meeting-store.c:174
 #: ../calendar/gui/e-meeting-store.c:237 ../calendar/gui/print.c:1092
@@ -3960,15 +3862,15 @@ msgstr "àà"
 msgid "Unknown"
 msgstr "àààààà"
 
-#: ../calendar/gui/e-cal-model.c:1528
+#: ../calendar/gui/e-cal-model.c:1527
 msgid "Recurring"
 msgstr "àààà"
 
-#: ../calendar/gui/e-cal-model.c:1530
+#: ../calendar/gui/e-cal-model.c:1529
 msgid "Assigned"
 msgstr "àààààà"
 
-#: ../calendar/gui/e-cal-model.c:2610
+#: ../calendar/gui/e-cal-model.c:2609
 #, c-format
 msgid "Opening %s"
 msgstr "%s àààà ààààà ààà"
@@ -4012,74 +3914,70 @@ msgstr "ààààààà ààààà"
 msgid "Type"
 msgstr "àààààà"
 
-#: ../calendar/gui/e-calendar-view.c:427
+#: ../calendar/gui/e-calendar-view.c:426
 #, fuzzy
-#| msgid "Cut selected text to the clipboard"
 msgid "Cut selected events to the clipboard"
 msgstr "àààà àààà àààààà ààààààààààààà àààà"
 
-#: ../calendar/gui/e-calendar-view.c:433
+#: ../calendar/gui/e-calendar-view.c:432
 #, fuzzy
-#| msgid "Copy selected text to the clipboard"
 msgid "Copy selected events to the clipboard"
 msgstr "àààà àààà àààààà ààààààààààààà ààà ààà"
 
-#: ../calendar/gui/e-calendar-view.c:439
+#: ../calendar/gui/e-calendar-view.c:438
 #, fuzzy
-#| msgid "Paste text from the clipboard"
 msgid "Paste events from the clipboard"
 msgstr "ààààààààààààààà àààà ààààààà"
 
-#: ../calendar/gui/e-calendar-view.c:445
-#| msgid "Delete selected memos"
+#: ../calendar/gui/e-calendar-view.c:444
 msgid "Delete selected events"
 msgstr "àààà àààà ààààààà àààà ààààà"
 
-#: ../calendar/gui/e-calendar-view.c:464 ../calendar/gui/e-memo-table.c:187
+#: ../calendar/gui/e-calendar-view.c:463 ../calendar/gui/e-memo-table.c:187
 #: ../calendar/gui/e-task-table.c:265
 msgid "Deleting selected objects"
 msgstr "àààà ààààà ààààààààà àààà ààààà ààà"
 
-#: ../calendar/gui/e-calendar-view.c:658 ../calendar/gui/e-memo-table.c:855
+#: ../calendar/gui/e-calendar-view.c:657 ../calendar/gui/e-memo-table.c:855
 #: ../calendar/gui/e-task-table.c:1078
 msgid "Updating objects"
 msgstr "ààààààààà àààààà ààààà ààà"
 
-#: ../calendar/gui/e-calendar-view.c:1781
+#: ../calendar/gui/e-calendar-view.c:1780
 #: ../calendar/gui/e-meeting-list-view.c:199
 #: ../calendar/gui/e-meeting-store.c:201 ../calendar/gui/e-meeting-store.c:224
 #: ../plugins/itip-formatter/itip-formatter.c:2473
 msgid "Accepted"
 msgstr "ààààààààààà"
 
-#: ../calendar/gui/e-calendar-view.c:1782
+#: ../calendar/gui/e-calendar-view.c:1781
 #: ../calendar/gui/e-meeting-list-view.c:200
 #: ../calendar/gui/e-meeting-store.c:203 ../calendar/gui/e-meeting-store.c:226
 #: ../plugins/itip-formatter/itip-formatter.c:2479
 msgid "Declined"
 msgstr "àààààààà àà"
 
-#: ../calendar/gui/e-calendar-view.c:1783
+#: ../calendar/gui/e-calendar-view.c:1782
 #: ../calendar/gui/e-meeting-list-view.c:201
 #: ../calendar/gui/e-meeting-store.c:205 ../calendar/gui/e-meeting-store.c:228
 #: ../calendar/gui/e-meeting-time-sel.c:547
 msgid "Tentative"
 msgstr "ààààà"
 
-#: ../calendar/gui/e-calendar-view.c:1784
+#: ../calendar/gui/e-calendar-view.c:1783
 #: ../calendar/gui/e-meeting-list-view.c:202
 #: ../calendar/gui/e-meeting-store.c:207 ../calendar/gui/e-meeting-store.c:230
 #: ../plugins/itip-formatter/itip-formatter.c:2482
 msgid "Delegated"
 msgstr "ààààààà àààà"
 
-#: ../calendar/gui/e-calendar-view.c:1785
+#: ../calendar/gui/e-calendar-view.c:1784
 msgid "Needs action"
 msgstr "àààààà ààààà àà"
 
 #. To Translators: It will display "Organiser: NameOfTheUser <email ofuser com>"
 #. To Translators: It will display "Organizer: NameOfTheUser <email ofuser com>"
-#: ../calendar/gui/e-calendar-view.c:1929 ../calendar/gui/e-memo-table.c:538
+#: ../calendar/gui/e-calendar-view.c:1928 ../calendar/gui/e-memo-table.c:538
 #: ../calendar/gui/e-task-table.c:753
 #, c-format
 msgid "Organizer: %s <%s>"
@@ -4087,20 +3985,20 @@ msgstr "ààààà: %s <%s>"
 
 #. With SunOne accouts, there may be no ':' in organiser.value
 #. With SunOne accounts, there may be no ':' in organiser.value
-#: ../calendar/gui/e-calendar-view.c:1933 ../calendar/gui/e-memo-table.c:543
+#: ../calendar/gui/e-calendar-view.c:1932 ../calendar/gui/e-memo-table.c:543
 #: ../calendar/gui/e-task-table.c:756
 #, c-format
 msgid "Organizer: %s"
 msgstr "ààààà: %s"
 
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:1949 ../calendar/gui/print.c:3208
+#: ../calendar/gui/e-calendar-view.c:1948 ../calendar/gui/print.c:3208
 #, c-format
 msgid "Location: %s"
 msgstr "àààà: %s"
 
 #. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
-#: ../calendar/gui/e-calendar-view.c:1980
+#: ../calendar/gui/e-calendar-view.c:1979
 #, c-format
 msgid "Time: %s %s"
 msgstr "ààà: %s %s"
@@ -4142,7 +4040,6 @@ msgstr "àààà àààà ààààà ààààà"
 #: ../modules/calendar/e-calendar-preferences.ui.h:76
 #: ../modules/calendar/e-calendar-preferences.c:175
 #: ../modules/calendar/e-calendar-preferences.c:224
-#| msgid "None"
 msgctxt "cal-second-zone"
 msgid "None"
 msgstr "ààà àààà"
@@ -4159,7 +4056,7 @@ msgstr "àààà ààà..."
 #. 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:844 ../calendar/gui/e-day-view.c:1795
+#: ../calendar/gui/e-day-view-top-item.c:844 ../calendar/gui/e-day-view.c:1793
 #: ../calendar/gui/e-week-view-main-item.c:212 ../calendar/gui/print.c:1866
 msgid "%A %d %B"
 msgstr "%A %d %B"
@@ -4170,7 +4067,7 @@ msgstr "%A %d %B"
 #. %d = day of month, %b = abbreviated month name.
 #. You can change the order but don't change the
 #. specifiers or add anything.
-#: ../calendar/gui/e-day-view-top-item.c:848 ../calendar/gui/e-day-view.c:1812
+#: ../calendar/gui/e-day-view-top-item.c:848 ../calendar/gui/e-day-view.c:1810
 #: ../calendar/gui/e-week-view-main-item.c:221
 #: ../calendar/gui/ea-gnome-calendar.c:200
 #: ../modules/calendar/e-cal-shell-view-private.c:1005
@@ -4182,7 +4079,7 @@ msgstr "%a %d %b"
 #. strftime format %d = day of month, %b = abbreviated
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: ../calendar/gui/e-day-view-top-item.c:852 ../calendar/gui/e-day-view.c:1828
+#: ../calendar/gui/e-day-view-top-item.c:852 ../calendar/gui/e-day-view.c:1826
 #: ../calendar/gui/e-week-view-main-item.c:235
 #: ../calendar/gui/ea-gnome-calendar.c:230
 #: ../modules/calendar/e-cal-shell-view-private.c:1041
@@ -4204,7 +4101,7 @@ msgid "pm"
 msgstr "àààà"
 
 #. To Translators: the %d stands for a week number, it's value between 1 and 52/53
-#: ../calendar/gui/e-day-view.c:2602
+#: ../calendar/gui/e-day-view.c:2600
 #, c-format
 msgid "Week %d"
 msgstr "àààààààà %d"
@@ -4301,14 +4198,13 @@ msgstr ""
 
 #: ../calendar/gui/e-meeting-store.c:1775
 #, fuzzy, c-format
-#| msgid "Failed to create pipe: %s"
 msgid "Failure reason: %s"
 msgstr "àààà àààààà àààà àààààààà: %s"
 
 #. 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:431
-#: ../calendar/gui/e-meeting-time-sel.c:2384
+#: ../calendar/gui/e-meeting-time-sel.c:2382
 msgid "%A, %B %d, %Y"
 msgstr "%A, %B %d, %Y"
 
@@ -4317,7 +4213,7 @@ msgstr "%A, %B %d, %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:435
-#: ../calendar/gui/e-meeting-time-sel.c:2415
+#: ../calendar/gui/e-meeting-time-sel.c:2413
 msgid "%a %m/%d/%Y"
 msgstr "%a %m/%d/%Y"
 
@@ -4436,18 +4332,15 @@ msgstr "ààààà: "
 
 #: ../calendar/gui/e-memo-table.c:720
 #, fuzzy
-#| msgid "Cut selected messages to the clipboard"
 msgid "Cut selected memos to the clipboard"
 msgstr "àààà àààà ààààààààà ààààààààààààà àààà"
 
 #: ../calendar/gui/e-memo-table.c:726
 #, fuzzy
-#| msgid "Copy selected messages to the clipboard"
 msgid "Copy selected memos to the clipboard"
 msgstr "àààà àààà ààààààààà ààààààààààààà ààà ààà"
 
 #: ../calendar/gui/e-memo-table.c:732
-#| msgid "Paste memo from the clipboard"
 msgid "Paste memos from the clipboard"
 msgstr "ààààààààààààààà àààà ààààààà"
 
@@ -4457,7 +4350,6 @@ msgid "Delete selected memos"
 msgstr "àààà àààà àààà àààà ààààà"
 
 #: ../calendar/gui/e-memo-table.c:744
-#| msgid "Select all visible messages"
 msgid "Select all visible memos"
 msgstr "ààà àààààààà ààààààààà àààà ààà"
 
@@ -4471,7 +4363,6 @@ msgstr "àààà àààààà àààà ààààà ààà"
 #.
 #: ../calendar/gui/e-task-table.c:544
 #, c-format
-#| msgid "%d %b %Y"
 msgid "%d%%"
 msgstr "%d%%"
 
@@ -4490,12 +4381,10 @@ msgid "Tasks"
 msgstr "ààààà"
 
 #: ../calendar/gui/e-task-table.c:943
-#| msgid "Cut selected text to the clipboard"
 msgid "Cut selected tasks to the clipboard"
 msgstr "àààà àààà àààààààà ààààààààààààà àààà"
 
 #: ../calendar/gui/e-task-table.c:949
-#| msgid "Copy selected text to the clipboard"
 msgid "Copy selected tasks to the clipboard"
 msgstr "àààà àààà àààààààà ààààààààààààà ààà ààà"
 
@@ -4509,7 +4398,6 @@ msgid "Delete selected tasks"
 msgstr "àààà àààà ààààà àààà ààààà"
 
 #: ../calendar/gui/e-task-table.c:967
-#| msgid "Select all visible messages"
 msgid "Select all visible tasks"
 msgstr "ààà àààààààà àààààà àààà ààà"
 
@@ -4685,7 +4573,6 @@ msgid "August"
 msgstr "ààààà"
 
 #: ../calendar/gui/goto-dialog.ui.h:3
-#| msgid "Member"
 msgid "December"
 msgstr "àààààààà"
 
@@ -4702,27 +4589,22 @@ msgid "July"
 msgstr "ààààà"
 
 #: ../calendar/gui/goto-dialog.ui.h:7
-#| msgid "Junk"
 msgid "June"
 msgstr "ààà"
 
 #: ../calendar/gui/goto-dialog.ui.h:8
-#| msgid "Search"
 msgid "March"
 msgstr "ààààà"
 
 #: ../calendar/gui/goto-dialog.ui.h:9
-#| msgid "Monday"
 msgid "May"
 msgstr "àà"
 
 #: ../calendar/gui/goto-dialog.ui.h:10
-#| msgid "Member"
 msgid "November"
 msgstr "ààààààà"
 
 #: ../calendar/gui/goto-dialog.ui.h:11
-#| msgid "Other"
 msgid "October"
 msgstr "ààààààà"
 
@@ -4736,7 +4618,6 @@ msgid "Select _Today"
 msgstr "àààà àààà àààà ààà (_T)"
 
 #: ../calendar/gui/goto-dialog.ui.h:14
-#| msgid "Member"
 msgid "September"
 msgstr "ààààààààà"
 
@@ -5111,7 +4992,6 @@ msgid "Reminder!"
 msgstr "ààà ààààààà!"
 
 #: ../calendar/importers/icalendar-importer.c:662
-#| msgid "vCalendar files (.vcf)"
 msgid "vCalendar files (.vcs)"
 msgstr "vCalendar ààààà (.vcs)"
 
@@ -5129,83 +5009,70 @@ msgstr "ààààààààà àààààààà àààààà
 
 #: ../calendar/importers/icalendar-importer.c:926
 #: ../calendar/importers/icalendar-importer.c:1243
-#| msgctxt "New"
-#| msgid "M_eeting"
 msgctxt "iCalImp"
 msgid "Meeting"
 msgstr "ààààààà"
 
 #: ../calendar/importers/icalendar-importer.c:926
 #: ../calendar/importers/icalendar-importer.c:1243
-#| msgid "Sent"
 msgctxt "iCalImp"
 msgid "Event"
 msgstr "àààà"
 
 #: ../calendar/importers/icalendar-importer.c:929
 #: ../calendar/importers/icalendar-importer.c:1244
-#| msgid "Task"
 msgctxt "iCalImp"
 msgid "Task"
 msgstr "ààààà"
 
 #: ../calendar/importers/icalendar-importer.c:932
 #: ../calendar/importers/icalendar-importer.c:1245
-#| msgid "Memo"
 msgctxt "iCalImp"
 msgid "Memo"
 msgstr "àààà"
 
 #: ../calendar/importers/icalendar-importer.c:941
 #, fuzzy
-#| msgid "It has recurrences."
 msgctxt "iCalImp"
 msgid "has recurrences"
 msgstr "àààà ààà ààààà àà."
 
 #: ../calendar/importers/icalendar-importer.c:946
 #, fuzzy
-#| msgid "This and Prior Instances"
 msgctxt "iCalImp"
 msgid "is an instance"
 msgstr "à ààà ààààààà ààà"
 
 #: ../calendar/importers/icalendar-importer.c:951
-#| msgid "It has alarms."
 msgctxt "iCalImp"
 msgid "has alarms"
 msgstr "àààà àààà ààààààà àà"
 
 #: ../calendar/importers/icalendar-importer.c:956
-#| msgid "%s attachment"
 msgctxt "iCalImp"
 msgid "has attachments"
 msgstr "àààà àààà àààààà àà"
 
 #. Translators: Appointment's classification
 #: ../calendar/importers/icalendar-importer.c:969
-#| msgid "Public"
 msgctxt "iCalImp"
 msgid "Public"
 msgstr "ààààà"
 
 #. Translators: Appointment's classification
 #: ../calendar/importers/icalendar-importer.c:972
-#| msgid "Private"
 msgctxt "iCalImp"
 msgid "Private"
 msgstr "ààààà"
 
 #. Translators: Appointment's classification
 #: ../calendar/importers/icalendar-importer.c:975
-#| msgid "Confidential"
 msgctxt "iCalImp"
 msgid "Confidential"
 msgstr "àààààààààà"
 
 #. Translators: Appointment's classification section name
 #: ../calendar/importers/icalendar-importer.c:979
-#| msgid "Classification"
 msgctxt "iCalImp"
 msgid "Classification"
 msgstr "àààààààà"
@@ -5214,14 +5081,12 @@ msgstr "àààààààà"
 #. Translators: Column header for a component summary
 #: ../calendar/importers/icalendar-importer.c:984
 #: ../calendar/importers/icalendar-importer.c:1284
-#| msgid "Summary"
 msgctxt "iCalImp"
 msgid "Summary"
 msgstr "ààà"
 
 #. Translators: Appointment's location
 #: ../calendar/importers/icalendar-importer.c:990
-#| msgid "Location"
 msgctxt "iCalImp"
 msgid "Location"
 msgstr "ààààà"
@@ -5230,7 +5095,6 @@ msgstr "ààààà"
 #. Translators: Column header for a component start date/time
 #: ../calendar/importers/icalendar-importer.c:998
 #: ../calendar/importers/icalendar-importer.c:1280
-#| msgid "Start"
 msgctxt "iCalImp"
 msgid "Start"
 msgstr "ààà ààà"
@@ -5238,35 +5102,30 @@ msgstr "ààà ààà"
 #. Translators: 'Due' like the time due a task should be finished
 #: ../calendar/importers/icalendar-importer.c:1009
 #, fuzzy
-#| msgid "Due"
 msgctxt "iCalImp"
 msgid "Due"
 msgstr "ààààà"
 
 #. Translators: Appointment's end time
 #: ../calendar/importers/icalendar-importer.c:1021
-#| msgid "End"
 msgctxt "iCalImp"
 msgid "End"
 msgstr "ààà ààà"
 
 #. Translators: Appointment's categories
 #: ../calendar/importers/icalendar-importer.c:1031
-#| msgid "Categories"
 msgctxt "iCalImp"
 msgid "Categories"
 msgstr "ààààà"
 
 #. Translators: Appointment's complete value (either percentage, or a date/time of a completion)
 #: ../calendar/importers/icalendar-importer.c:1055
-#| msgid "Completed"
 msgctxt "iCalImp"
 msgid "Completed"
 msgstr "àààààà"
 
 #. Translators: Appointment's URL
 #: ../calendar/importers/icalendar-importer.c:1063
-#| msgid "URL"
 msgctxt "iCalImp"
 msgid "URL"
 msgstr "URL"
@@ -5274,7 +5133,6 @@ msgstr "URL"
 #. Translators: Appointment's organizer
 #: ../calendar/importers/icalendar-importer.c:1074
 #: ../calendar/importers/icalendar-importer.c:1077
-#| msgid "Organizer"
 msgctxt "iCalImp"
 msgid "Organizer"
 msgstr "ààààà"
@@ -5282,20 +5140,17 @@ msgstr "ààààà"
 #. Translators: Appointment's attendees
 #: ../calendar/importers/icalendar-importer.c:1097
 #: ../calendar/importers/icalendar-importer.c:1100
-#| msgid "Attendees"
 msgctxt "iCalImp"
 msgid "Attendees"
 msgstr "àààààà"
 
 #: ../calendar/importers/icalendar-importer.c:1114
-#| msgid "Description"
 msgctxt "iCalImp"
 msgid "Description"
 msgstr "ààààà"
 
 #. Translators: Column header for a component type; it can be Event, Task or Memo
 #: ../calendar/importers/icalendar-importer.c:1276
-#| msgid "Type"
 msgctxt "iCalImp"
 msgid "Type"
 msgstr "àààààà"
@@ -6876,7 +6731,6 @@ msgid "Open New Message window"
 msgstr "ààà àààààà àààààà àààà"
 
 #: ../composer/e-composer-actions.c:308 ../shell/e-shell-window-actions.c:1489
-#| msgid "Configuration"
 msgid "Configure Evolution"
 msgstr "Evolution ààààààààààà ààà"
 
@@ -7060,27 +6914,20 @@ msgstr "àààà ààààà àààà àààà ààààà
 
 #: ../composer/e-composer-private.c:245
 #, fuzzy
-#| msgid "Copy the selection"
 msgid "Undo the last action"
 msgstr "àààààààà ààà ààà"
 
 #: ../composer/e-composer-private.c:249
 #, fuzzy
-#| msgid "Send Latest Information"
 msgid "Redo the last undone action"
 msgstr "àààà ààààààà ààààà"
 
 #: ../composer/e-composer-private.c:253
-#| msgid ""
-#| "\n"
-#| "\n"
-#| "Search for the Contact."
 msgid "Search for text"
 msgstr "àààà àààà àààà"
 
 #: ../composer/e-composer-private.c:257
 #, fuzzy
-#| msgid "Search for an iPod failed"
 msgid "Search for and replace text"
 msgstr "iPod àààààà àààà àààà"
 
@@ -7090,7 +6937,8 @@ msgstr "ààààààà ààààààà"
 
 #: ../composer/e-msg-composer.c:784
 #, c-format
-msgid "Cannot sign outgoing message: No signing certificate set for this account"
+msgid ""
+"Cannot sign outgoing message: No signing certificate set for this account"
 msgstr "ààà ààààààààà ààà ààà àààà ààà: à àààà àààà ààà ààààààà ààà àààààààààà ààà"
 
 #: ../composer/e-msg-composer.c:793
@@ -7104,15 +6952,13 @@ msgstr "ààà ààààààààà ààààààààà àà
 msgid "Compose Message"
 msgstr "àààààà ààààà"
 
-#: ../composer/e-msg-composer.c:4135
+#: ../composer/e-msg-composer.c:4134
 #, fuzzy
-#| msgid ""
-#| "<b>(The composer contains a non-text message body, which cannot be "
-#| "edited.)</b>"
 msgid "The composer contains a non-text message body, which cannot be edited."
-msgstr "<b>(ààààààà àààà-ààààà àààààààà ààà à ààààà àà, àà ààààà àààààà ààà ààààà ààà.)</b>"
+msgstr ""
+"<b>(ààààààà àààà-ààààà àààààààà ààà à ààààà àà, àà ààààà àààààà ààà ààààà ààà.)</b>"
 
-#: ../composer/e-msg-composer.c:4840
+#: ../composer/e-msg-composer.c:4839
 msgid "Untitled Message"
 msgstr "àààààà ààààà àààààà"
 
@@ -7130,19 +6976,16 @@ msgstr "ààà ààààà àààà ààààààà àà."
 
 #: ../composer/mail-composer.error.xml.h:3
 #, fuzzy
-#| msgid "Error occurred while spawning %s: %s."
 msgid "An error occurred while saving to your Drafts folder."
 msgstr "%s àààà àààà àààà ààà àààààà: %s."
 
 #: ../composer/mail-composer.error.xml.h:4
 #, fuzzy
-#| msgid "An error occurred while printing"
 msgid "An error occurred while saving to your Outbox folder."
 msgstr "ààààà àààà ààà àààààà"
 
 #: ../composer/mail-composer.error.xml.h:5
 #, fuzzy
-#| msgid "An error occurred while printing"
 msgid "An error occurred while sending. How do you want to proceed?"
 msgstr "ààààà àààà ààà àààààà"
 
@@ -7214,20 +7057,16 @@ msgstr ""
 
 #: ../composer/mail-composer.error.xml.h:19
 #, fuzzy
-#| msgid "Saving message to folder"
 msgid "Saving message to Outbox."
 msgstr "àààààààà ààààààààà ààààààà ààààà ààà"
 
 #: ../composer/mail-composer.error.xml.h:20
 #, fuzzy
-#| msgid ""
-#| "The file `{0}' is not a regular file and cannot be sent in a message."
 msgid "The file '{0}' is not a regular file and cannot be sent in a message."
 msgstr "àààà `{0}' àààààà àààà ààà ààà ààààààààà ààààà ààààà ààà."
 
 #: ../composer/mail-composer.error.xml.h:21 ../mail/mail.error.xml.h:117
 #, fuzzy
-#| msgid "Bad regular expression &quot;{0}&quot;."
 msgid "The reported error was &quot;{0}&quot;."
 msgstr "àààà àààààà àààààà &quot;{0}&quot;."
 
@@ -7243,7 +7082,6 @@ msgstr ""
 
 #: ../composer/mail-composer.error.xml.h:24
 #, fuzzy
-#| msgid "You cannot attach the file `{0}' to this message."
 msgid "You cannot attach the file &quot;{0}&quot; to this message."
 msgstr "ààà à ààààààààààààà àààà `{0}' àààà àààà ààà."
 
@@ -7253,7 +7091,6 @@ msgstr "ààà àààà àààààà ààà àà àààà
 
 #: ../composer/mail-composer.error.xml.h:26
 #, fuzzy
-#| msgid "An error occurred during processing: %s"
 msgid "Your message was sent, but an error occurred during post-processing."
 msgstr "ààààààààà àààà ààààààà ààà àààààà: %s"
 
@@ -7275,7 +7112,6 @@ msgid "_Save Draft"
 msgstr "ààààààà ààààààà (_S)"
 
 #: ../composer/mail-composer.error.xml.h:33
-#| msgid "_Save to Disk"
 msgid "_Save to Outbox"
 msgstr "ààààààààààà ààààààà (_S)"
 
@@ -7283,307 +7119,266 @@ msgstr "ààààààààààà ààààààà (_S)"
 msgid "_Try Again"
 msgstr "ààà:ààààààà ààà (_T)"
 
-#: ../capplet/anjal-settings-main.c:224
+#: ../capplet/anjal-settings-main.c:216
 msgid "Run Anjal in a window"
 msgstr "ààààààààà Anjal ààààà"
 
-#: ../capplet/anjal-settings-main.c:225
+#: ../capplet/anjal-settings-main.c:217
 #, fuzzy
-#| msgid "Mark as _default memo list"
 msgid "Make Anjal the default email client"
 msgstr "àààààà àààà àààà ààààà ààààààà ààà (_d)"
 
 #. TRANSLATORS: don't translate the terms in brackets
-#: ../capplet/anjal-settings-main.c:232
+#: ../capplet/anjal-settings-main.c:224
 msgid "ID of the socket to embed in"
 msgstr ""
 
-#: ../capplet/anjal-settings-main.c:233
-#| msgid "sort"
+#: ../capplet/anjal-settings-main.c:225
 msgid "socket"
 msgstr "ààààà"
 
-#: ../capplet/anjal-settings-main.c:246
-#| msgid "Default Mail Client"
+#: ../capplet/anjal-settings-main.c:238
 msgid "Anjal email client"
 msgstr "Anjal àààà àààààààà"
 
-#: ../capplet/settings/mail-account-view.c:73
-#| msgid "Please choose another name."
+#: ../capplet/settings/mail-account-view.c:77
 msgid "Please enter your full name."
 msgstr "àààààààà ààààà àààààà ààààààà ààà àààà ààà."
 
-#: ../capplet/settings/mail-account-view.c:74
+#: ../capplet/settings/mail-account-view.c:78
 msgid "Please enter your email address."
 msgstr "àààààààà ààààà ààààà àààà ààààààààà àààà ààà."
 
-#: ../capplet/settings/mail-account-view.c:75
+#: ../capplet/settings/mail-account-view.c:79
 msgid "The email address you have entered is invalid."
 msgstr "àààà ààààààà àà ààà àààà àààà àà àààààà àà."
 
-#: ../capplet/settings/mail-account-view.c:76
-#| msgid "Enter password."
+#: ../capplet/settings/mail-account-view.c:80
 msgid "Please enter your password."
 msgstr "àààààààà ààààà ààààà ààààààààà àààà ààà."
 
-#: ../capplet/settings/mail-account-view.c:255
+#: ../capplet/settings/mail-account-view.c:259
 #: ../plugins/caldav/caldav-source.c:66
 msgid "CalDAV"
 msgstr "CalDAV"
 
-#: ../capplet/settings/mail-account-view.c:357
-#: ../capplet/settings/mail-account-view.c:409
+#: ../capplet/settings/mail-account-view.c:361
+#: ../capplet/settings/mail-account-view.c:413
 #: ../plugins/google-account-setup/google-contacts-source.c:53
 #: ../plugins/google-account-setup/google-source.c:81
 msgid "Google"
 msgstr "Google"
 
-#: ../capplet/settings/mail-account-view.c:459
-#| msgid "Personal"
+#: ../capplet/settings/mail-account-view.c:463
 msgid "Personal details:"
 msgstr "ààààààààà ààààà:"
 
-#: ../capplet/settings/mail-account-view.c:466
-#| msgid "_Name:"
+#: ../capplet/settings/mail-account-view.c:470
 msgid "Name:"
 msgstr "ààà:"
 
-#: ../capplet/settings/mail-account-view.c:475
-#| msgid "Email _Address:"
+#: ../capplet/settings/mail-account-view.c:479
 msgid "Email address:"
 msgstr "àààà ààààààà:"
 
-#: ../capplet/settings/mail-account-view.c:485
-#| msgid "Details"
+#: ../capplet/settings/mail-account-view.c:489
 msgid "Details:"
 msgstr "ààààà:"
 
-#: ../capplet/settings/mail-account-view.c:493
-#| msgid "Receiving Email"
+#: ../capplet/settings/mail-account-view.c:497
 msgid "Receiving"
 msgstr "ààààà ààààà ààà"
 
-#: ../capplet/settings/mail-account-view.c:500
-#| msgid "Server _Type:"
+#: ../capplet/settings/mail-account-view.c:504
 msgid "Server type:"
 msgstr "ààààààà àààààà:"
 
-#: ../capplet/settings/mail-account-view.c:509
-#| msgid "Server Message:"
+#: ../capplet/settings/mail-account-view.c:513
 msgid "Server address:"
 msgstr "ààààà ààààààà:"
 
-#: ../capplet/settings/mail-account-view.c:518
-#| msgid "Us_ername:"
+#: ../capplet/settings/mail-account-view.c:522
 msgid "Username:"
 msgstr "ààààààààààààà:"
 
-#: ../capplet/settings/mail-account-view.c:527
-#| msgid "No encryption"
+#: ../capplet/settings/mail-account-view.c:531
 msgid "Use encryption:"
 msgstr "àààààààààà ààààà:"
 
-#: ../capplet/settings/mail-account-view.c:532
-#: ../capplet/settings/mail-account-view.c:567
-#| msgid "Never"
+#: ../capplet/settings/mail-account-view.c:536
+#: ../capplet/settings/mail-account-view.c:571
 msgid "never"
 msgstr "ààààààà ààà"
 
-#: ../capplet/settings/mail-account-view.c:544
-#| msgid "Ascending"
+#: ../capplet/settings/mail-account-view.c:548
 msgid "Sending"
 msgstr "ààààà ààààà ààà"
 
-#: ../capplet/settings/mail-account-view.c:586
+#: ../capplet/settings/mail-account-view.c:590
 msgid ""
 "To use the email application you'll need to setup an account. Put your email "
 "address and password in below and we'll try and work out all the settings. "
 "If we can't do it automatically you'll need your server details as well."
 msgstr ""
 
-#: ../capplet/settings/mail-account-view.c:588
+#: ../capplet/settings/mail-account-view.c:592
 msgid ""
 "Sorry, we can't work out the settings to get your mail automatically. Please "
 "enter them below. We've tried to make a start with the details you just "
 "entered but you may need to change them."
 msgstr ""
 
-#: ../capplet/settings/mail-account-view.c:590
-#| msgid "You may only configure a single Exchange account."
+#: ../capplet/settings/mail-account-view.c:594
 msgid "You can specify more options to configure the account."
 msgstr "ààà àààààà ààààààààààà àààà àààà ààààà ààààààààà àààààà ààà ààà àà."
 
-#: ../capplet/settings/mail-account-view.c:592
+#: ../capplet/settings/mail-account-view.c:596
 msgid ""
 "Now we need your settings for sending mail. We've tried to make some guesses "
 "but you should check them over to make sure."
 msgstr ""
 
-#: ../capplet/settings/mail-account-view.c:593
+#: ../capplet/settings/mail-account-view.c:597
 msgid "You can specify your default settings for your account."
 msgstr "ààà ààààà àààà àààà ààààà ààà ààààààààà àààààà ààà ààà àà."
 
-#: ../capplet/settings/mail-account-view.c:594
+#: ../capplet/settings/mail-account-view.c:598
 msgid ""
 "Time to check things over before we try and connect to the server and fetch "
 "your mail."
 msgstr ""
 
-#: ../capplet/settings/mail-account-view.c:609
-#: ../mail/em-account-editor.c:2095 ../mail/em-account-editor.c:2216
+#: ../capplet/settings/mail-account-view.c:613
+#: ../mail/em-account-editor.c:2090 ../mail/em-account-editor.c:2211
 msgid "Identity"
 msgstr "ààà"
 
-#: ../capplet/settings/mail-account-view.c:609
-#| msgid "Receiving Email"
+#: ../capplet/settings/mail-account-view.c:613
 msgid "Next - Receiving mail"
 msgstr "ààà - àààà ààààà ààààà àà"
 
-#: ../capplet/settings/mail-account-view.c:610
-#| msgid "Receiving Email"
+#: ../capplet/settings/mail-account-view.c:614
 msgid "Receiving mail"
 msgstr "à-ààà ààààà ààààà ààà"
 
-#: ../capplet/settings/mail-account-view.c:610
-#: ../capplet/settings/mail-account-view.c:611
-#| msgid "Sending Email"
+#: ../capplet/settings/mail-account-view.c:614
+#: ../capplet/settings/mail-account-view.c:615
 msgid "Next - Sending mail"
 msgstr "ààà - àààà ààààà ààààà ààà"
 
-#: ../capplet/settings/mail-account-view.c:610
-#| msgid "Identity"
+#: ../capplet/settings/mail-account-view.c:614
 msgid "Back - Identity"
 msgstr "àààà - ààà"
 
-#: ../capplet/settings/mail-account-view.c:610
-#| msgid "Receiving Options"
+#: ../capplet/settings/mail-account-view.c:614
 msgid "Next - Receiving options"
 msgstr "ààà - ààààààààà ààààà ààààà àà"
 
-#: ../capplet/settings/mail-account-view.c:611
-#| msgid "Receiving Options"
+#: ../capplet/settings/mail-account-view.c:615
 msgid "Receiving options"
 msgstr "ààààààà ààààà ààààà ààà"
 
-#: ../capplet/settings/mail-account-view.c:611
-#: ../capplet/settings/mail-account-view.c:613
-#| msgid "Receiving Email"
+#: ../capplet/settings/mail-account-view.c:615
+#: ../capplet/settings/mail-account-view.c:617
 msgid "Back - Receiving mail"
 msgstr "àààà - àààààà ààààà ààààà àà"
 
-#: ../capplet/settings/mail-account-view.c:613
-#| msgid "Sending Email"
+#: ../capplet/settings/mail-account-view.c:617
 msgid "Sending mail"
 msgstr "àààà ààààà ààààà ààà"
 
-#: ../capplet/settings/mail-account-view.c:613
-#: ../capplet/settings/mail-account-view.c:614
+#: ../capplet/settings/mail-account-view.c:617
+#: ../capplet/settings/mail-account-view.c:618
 #, fuzzy
-#| msgid "Delete account?"
 msgid "Next - Review account"
 msgstr "ààààà àààà ààààààà àà?"
 
-#: ../capplet/settings/mail-account-view.c:613
-#| msgid "Defaults"
+#: ../capplet/settings/mail-account-view.c:617
 msgid "Next - Defaults"
 msgstr "ààà - ààààààà"
 
-#: ../capplet/settings/mail-account-view.c:613
-#| msgid "Receiving Options"
+#: ../capplet/settings/mail-account-view.c:617
 msgid "Back - Receiving options"
 msgstr "àààà - ààààààààà ààààà ààààà àà"
 
-#: ../capplet/settings/mail-account-view.c:614
-#: ../mail/em-account-editor.c:3047
+#: ../capplet/settings/mail-account-view.c:618
+#: ../mail/em-account-editor.c:3042
 msgid "Defaults"
 msgstr "ààààààà"
 
-#: ../capplet/settings/mail-account-view.c:614
-#| msgid "Sending Email"
+#: ../capplet/settings/mail-account-view.c:618
 msgid "Back - Sending mail"
 msgstr "àààà - àààààà ààààà ààààà àà"
 
-#: ../capplet/settings/mail-account-view.c:616
+#: ../capplet/settings/mail-account-view.c:620
 #, fuzzy
-#| msgid "Delete account?"
 msgid "Review account"
 msgstr "ààààà àààà ààààààà àà?"
 
-#: ../capplet/settings/mail-account-view.c:616
+#: ../capplet/settings/mail-account-view.c:620
 msgid "Finish"
 msgstr "àààààà"
 
-#: ../capplet/settings/mail-account-view.c:616
-#| msgid "Ascending"
+#: ../capplet/settings/mail-account-view.c:620
 msgid "Back - Sending"
 msgstr "àààà - ààààà ààààà àà"
 
-#: ../capplet/settings/mail-account-view.c:721
+#: ../capplet/settings/mail-account-view.c:740
 #, fuzzy
-#| msgid "Add WebDAV contacts to Evolution."
 msgid "Setup Google contacts with Evolution"
 msgstr "Evolution ààà WebDAV ààààààààà ààààà."
 
-#: ../capplet/settings/mail-account-view.c:722
-#| msgid "Add Google Calendars to Evolution."
+#: ../capplet/settings/mail-account-view.c:741
 msgid "Setup Google calendar with Evolution"
 msgstr "Evolution àààà Google àààààààààà ààààààà ààà"
 
-#: ../capplet/settings/mail-account-view.c:727
+#: ../capplet/settings/mail-account-view.c:746
 msgid "You may need to enable IMAP access."
 msgstr "ààààà IMAP àààààààà àààààà àààààà àààà ààà ààà àà."
 
-#: ../capplet/settings/mail-account-view.c:735
-#| msgid "Backing Evolution accounts and settings"
+#: ../capplet/settings/mail-account-view.c:754
 msgid "Google account settings:"
 msgstr "Google àààà ààààààà:"
 
-#: ../capplet/settings/mail-account-view.c:762
-#| msgid "Add weather calendars to Evolution."
+#: ../capplet/settings/mail-account-view.c:780
 msgid "Setup Yahoo calendar with Evolution"
 msgstr "Evolution àààà Yahoo àààààààààà ààààààà ààà"
 
-#: ../capplet/settings/mail-account-view.c:766
+#: ../capplet/settings/mail-account-view.c:784
 msgid ""
 "Yahoo calendars are named as firstname_lastname. We have tried to form the "
 "calendar name. So please confirm and re-enter the calendar name if it is not "
 "correct."
 msgstr ""
 
-#: ../capplet/settings/mail-account-view.c:773
-#| msgid "Backing Evolution accounts and settings"
+#: ../capplet/settings/mail-account-view.c:793
 msgid "Yahoo account settings:"
 msgstr "Yahoo àààà ààààààà:"
 
-#: ../capplet/settings/mail-account-view.c:787
-#| msgid "Choose calendar file"
+#: ../capplet/settings/mail-account-view.c:807
 msgid "Yahoo Calendar name:"
 msgstr "Yahoo àààààààà ààà:"
 
-#: ../capplet/settings/mail-account-view.c:1059
-#| msgid "Pass_word:"
+#: ../capplet/settings/mail-account-view.c:1079
 msgid "Password:"
 msgstr "ààààààà:"
 
-#: ../capplet/settings/mail-account-view.c:1110
+#: ../capplet/settings/mail-account-view.c:1130
 #: ../capplet/settings/mail-settings-view.c:248
-#| msgid "Close"
 msgid "Close Tab"
 msgstr "ààà ààà ààà"
 
-#: ../capplet/settings/mail-account-view.c:1120
-#| msgid "Account Editor"
+#: ../capplet/settings/mail-account-view.c:1140
 msgid "Account Wizard"
 msgstr "àààà ààààààà"
 
-#: ../capplet/settings/mail-capplet-shell.c:211
+#: ../capplet/settings/mail-capplet-shell.c:209
 #, fuzzy
-#| msgid "Evolution Account Assistant"
 msgid "Evolution account assistant"
 msgstr "ààààààààà àààà àààààà"
 
 #. create the local source group
-#: ../capplet/settings/mail-capplet-shell.c:357 ../mail/e-mail-migrate.c:680
+#: ../capplet/settings/mail-capplet-shell.c:353 ../mail/e-mail-migrate.c:680
 #: ../mail/e-mail-store.c:228 ../mail/em-folder-tree-model.c:150
 #: ../mail/em-folder-tree-model.c:153 ../mail/em-folder-tree-model.c:156
 #: ../mail/em-folder-tree-model.c:158 ../mail/em-folder-tree-model.c:165
@@ -7602,38 +7397,32 @@ msgstr "à àààààààààààà"
 
 #: ../capplet/settings/mail-settings-view.c:145
 #, c-format
-#| msgid "Modify"
 msgid "Modify %s..."
 msgstr "%s àààààà..."
 
 #: ../capplet/settings/mail-settings-view.c:147
-#| msgid "Add a column..."
 msgid "Add a new account"
 msgstr "ààà àààààà ààààà"
 
 #: ../capplet/settings/mail-settings-view.c:183
-#| msgid "Account Management"
 msgid "Account management"
 msgstr "àààà àààààà"
 
 #: ../capplet/settings/mail-settings-view.c:258
-#| msgid "Junk Settings"
 msgid "Settings"
 msgstr "ààààààà"
 
 #: ../data/evolution-alarm-notify.desktop.in.in.h:1
 #, fuzzy
-#| msgid "Calendar information"
 msgid "Calendar event notifications"
 msgstr "àààààààà ààààààà"
 
 #: ../data/evolution-alarm-notify.desktop.in.in.h:2
 #, fuzzy
-#| msgid "Evolution Elm importer"
 msgid "Evolution Alarm Notify"
 msgstr "Evolution Elm àààà ààààà"
 
-#: ../data/evolution.desktop.in.in.h:1 ../mail/e-mail-browser.c:956
+#: ../data/evolution.desktop.in.in.h:1 ../mail/e-mail-browser.c:955
 #: ../modules/mailto-handler/evolution-mailto-handler.c:212
 #: ../shell/e-shell-window-private.c:253
 msgid "Evolution"
@@ -7652,26 +7441,22 @@ msgid "Manage your email, contacts and schedule"
 msgstr "àààààà ààààà, ààààààà ààà ààààààààà àààààààà ààà"
 
 #: ../data/evolution-settings.desktop.in.in.h:1
-#| msgid "Configure your email accounts here"
 msgid "Configure email accounts"
 msgstr "àààà ààààààà ààààààààààà ààà"
 
 #: ../data/evolution-settings.desktop.in.in.h:2
-#| msgid "Junk Mail Settings"
 msgid "Email Settings"
 msgstr "àààà ààààààà"
 
 #. Translators: This is a cancelled activity.
 #: ../e-util/e-activity.c:226
 #, c-format
-#| msgid "Cancelled"
 msgid "%s (cancelled)"
 msgstr "%s (àà àààà)"
 
 #. Translators: This is a completed activity.
 #: ../e-util/e-activity.c:229
 #, c-format
-#| msgid "%s (%d%% complete)"
 msgid "%s (completed)"
 msgstr "%s (àààààà)"
 
@@ -7797,7 +7582,6 @@ msgstr "àààààà"
 #. necessary. Index is between 1 and 7 inclusive, meaning 1 .. Monday, 2 .. Tuesday, ..., 7 .. Sunday
 #: ../e-util/e-datetime-format.c:215
 #, fuzzy, c-format
-#| msgid "Next"
 msgid "Next %a"
 msgid_plural "Next %a"
 msgstr[0] "ààà ààà"
@@ -7813,14 +7597,12 @@ msgid "Format:"
 msgstr "àààààà:"
 
 #: ../e-util/e-file-utils.c:152
-#| msgid "Unknown type"
 msgid "(Unknown Filename)"
 msgstr "(àààààà ààààààà)"
 
 #. Translators: The string value is the basename of a file.
 #: ../e-util/e-file-utils.c:156
 #, c-format
-#| msgid "Pinging %s"
 msgid "Writing \"%s\""
 msgstr "\"%s\" àà ààà ààààà ààà"
 
@@ -7828,7 +7610,6 @@ msgstr "\"%s\" àà ààà ààààà ààà"
 #. * remote file, the second string value is the hostname.
 #: ../e-util/e-file-utils.c:161
 #, fuzzy, c-format
-#| msgid "Copying `%s' to `%s'"
 msgid "Writing \"%s\" to %s"
 msgstr "`%s' àà `%s' ààà ààà ààà ààààà ààà"
 
@@ -7847,7 +7628,8 @@ msgid "The printing system reported the following details about the error:"
 msgstr "àààà ààààààà ààà àààà àààààà ààààààà àààààà ààààà:"
 
 #: ../e-util/e-print.c:170
-msgid "The printing system did not report any additional details about the error."
+msgid ""
+"The printing system did not report any additional details about the error."
 msgstr "àààà àààààà ààà àààà ààààà ààààààà ààààààà àààààà ààààà ààà."
 
 #: ../e-util/e-signature.c:707
@@ -7907,14 +7689,14 @@ msgid "Reply-To"
 msgstr "àà àààà ààà"
 
 #: ../em-format/em-format-quote.c:283 ../em-format/em-format.c:1053
-#: ../mail/em-format-html.c:2402 ../mail/em-format-html.c:2470
-#: ../mail/em-format-html.c:2493 ../modules/mail/em-mailer-prefs.c:73
+#: ../mail/em-format-html.c:2400 ../mail/em-format-html.c:2468
+#: ../mail/em-format-html.c:2491 ../modules/mail/em-mailer-prefs.c:73
 msgid "Cc"
 msgstr "àà àà"
 
 #: ../em-format/em-format-quote.c:283 ../em-format/em-format.c:1054
-#: ../mail/em-format-html.c:2403 ../mail/em-format-html.c:2474
-#: ../mail/em-format-html.c:2496 ../modules/mail/em-mailer-prefs.c:74
+#: ../mail/em-format-html.c:2401 ../mail/em-format-html.c:2472
+#: ../mail/em-format-html.c:2494 ../modules/mail/em-mailer-prefs.c:74
 msgid "Bcc"
 msgstr "ààà àà ààà àààà"
 
@@ -7927,7 +7709,7 @@ msgid "Subject"
 msgstr "àààà"
 
 #. pseudo-header
-#: ../em-format/em-format-quote.c:438 ../mail/em-format-html.c:2590
+#: ../em-format/em-format-quote.c:438 ../mail/em-format-html.c:2588
 #: ../modules/mail/em-mailer-prefs.c:1119
 msgid "Mailer"
 msgstr "àààà ààààààà"
@@ -7960,7 +7742,7 @@ msgstr "%s ààààà"
 msgid "Could not parse S/MIME message: Unknown error"
 msgstr "S/MIME ààààààààà ààààààà ààà ààààà àààà: àààààà ààà"
 
-#: ../em-format/em-format.c:1741 ../em-format/em-format.c:1938
+#: ../em-format/em-format.c:1741 ../em-format/em-format.c:1935
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "MIME ààààààààà ààààààà ààà ààààà àààà. ààààà ààààà ààààà ààààà ààà."
 
@@ -7976,25 +7758,24 @@ msgstr "PGP/MIME ààààààààà àààààààà ààà
 msgid "Could not parse PGP/MIME message: Unknown error"
 msgstr "PGP/MIME ààààààààà àààààààà ààà ààààà àààà: àààààà ààà"
 
-#: ../em-format/em-format.c:1963
+#: ../em-format/em-format.c:1960
 msgid "Unsupported signature format"
 msgstr "àààààà àààààà ààààààà ààà"
 
-#: ../em-format/em-format.c:1976 ../em-format/em-format.c:2148
+#: ../em-format/em-format.c:1973 ../em-format/em-format.c:2145
 msgid "Error verifying signature"
 msgstr "ààà ààààààààà ààà"
 
-#: ../em-format/em-format.c:1977 ../em-format/em-format.c:2135
-#: ../em-format/em-format.c:2149
+#: ../em-format/em-format.c:1974 ../em-format/em-format.c:2132
+#: ../em-format/em-format.c:2146
 msgid "Unknown error verifying signature"
 msgstr "ààà àààààà àààà àààà àààààà ààà"
 
-#: ../em-format/em-format.c:2240
-#| msgid "Could not parse PGP message"
+#: ../em-format/em-format.c:2237
 msgid "Could not parse PGP message: "
 msgstr "PGP ààààààààà àààààààà ààà ààààà àààà: "
 
-#: ../em-format/em-format.c:2246 ../mail/em-folder-tree.c:659
+#: ../em-format/em-format.c:2243 ../mail/em-folder-tree.c:659
 #: ../mail/mail-ops.c:624 ../plugins/caldav/caldav-browse-server.c:210
 #: ../plugins/caldav/caldav-browse-server.c:1407 ../plugins/face/face.c:169
 #: ../smime/gui/certificate-manager.c:100
@@ -8120,7 +7901,6 @@ msgid "Select a time to compare against"
 msgstr "àà àààà ààààààà àààà ààà àààà ààà"
 
 #: ../filter/e-filter-file.c:188
-#| msgid "Choose a file"
 msgid "Choose a File"
 msgstr "àààà àààà ààà"
 
@@ -8272,28 +8052,19 @@ msgid "_Filter Rules"
 msgstr "àààà ààààà (_F)"
 
 #: ../filter/filter.ui.h:12
-#| msgid ""
-#| "the current time\n"
-#| "the time you specify\n"
-#| "a time relative to the current time"
 msgid "a time relative to the current time"
 msgstr "àààààà ààà àà ààààààà ààà"
 
 #: ../filter/filter.ui.h:13
-#| msgid "Tag"
 msgid "ago"
 msgstr "àààà"
 
 #: ../filter/filter.ui.h:16
-#| msgid ""
-#| "ago\n"
-#| "in the future"
 msgid "in the future"
 msgstr "ààààààààà"
 
 #: ../filter/filter.ui.h:18
 #: ../plugins/publish-calendar/publish-calendar.ui.h:32
-#| msgid "Month"
 msgid "months"
 msgstr "àààààà"
 
@@ -8302,7 +8073,6 @@ msgid "seconds"
 msgstr "ààààààà"
 
 #: ../filter/filter.ui.h:20
-#| msgid "Save the current file"
 msgid "the current time"
 msgstr "ààààààà ààà"
 
@@ -8311,7 +8081,6 @@ msgid "the time you specify"
 msgstr ""
 
 #: ../filter/filter.ui.h:23
-#| msgid "Headers"
 msgid "years"
 msgstr "ààààà"
 
@@ -8341,38 +8110,31 @@ msgid "Close this window"
 msgstr "à àààààà ààà ààà"
 
 #: ../mail/e-mail-browser.c:286
-#| msgid "Subject"
 msgid "(No Subject)"
 msgstr "(àààà ààà)"
 
 #: ../mail/e-mail-display.c:66
-#| msgid "_Add to Address Book"
 msgid "_Add to Address Book..."
 msgstr "àààààà ààààààààààà ààààà (_A)..."
 
 #: ../mail/e-mail-display.c:73
-#| msgid "_To this Address"
 msgid "_To This Address"
 msgstr "à àààààà ààààà (_T)"
 
 #: ../mail/e-mail-display.c:80
-#| msgid "_From this Address"
 msgid "_From This Address"
 msgstr "à àààààà ààààà (_F)"
 
 #: ../mail/e-mail-display.c:89
-#| msgid "Create _Search Folder"
 msgid "Create Search _Folder"
 msgstr "ààà àààààà ààààà (_F)"
 
 #: ../mail/e-mail-folder-utils.c:88
 #, c-format
-#| msgid "Saving message to folder"
 msgid "Saving message to folder '%s'"
 msgstr "àààààà '%s' ààà àààààààà ààààààà ààààà àà"
 
 #: ../mail/e-mail-label-dialog.c:222
-#| msgid "Label _Name:"
 msgid "_Label name:"
 msgstr "àààà ààà (_L):"
 
@@ -8411,8 +8173,6 @@ msgstr "ààààààà àààààà ààà"
 
 #: ../mail/e-mail-label-manager.c:349
 #, fuzzy
-#| msgid ""
-#| "Note: Underscore in the label name is used as mnemonic identifier in menu."
 msgid ""
 "Note: Underscore in the label name is used\n"
 "as mnemonic identifier in menu."
@@ -8438,7 +8198,7 @@ msgstr "ààà"
 msgid "Inbox"
 msgstr "ààààààà"
 
-#: ../mail/e-mail-local.c:36 ../mail/e-mail-migrate.c:999
+#: ../mail/e-mail-local.c:36 ../mail/e-mail-migrate.c:995
 #: ../mail/em-folder-tree-model.c:733
 #: ../modules/mail/e-mail-shell-view-private.c:1116
 msgid "Drafts"
@@ -8449,7 +8209,7 @@ msgstr "àààààààà"
 msgid "Outbox"
 msgstr "àààààààà"
 
-#: ../mail/e-mail-local.c:38 ../mail/e-mail-migrate.c:993
+#: ../mail/e-mail-local.c:38 ../mail/e-mail-migrate.c:989
 #: ../mail/em-folder-tree-model.c:747
 #: ../modules/mail/e-mail-shell-view-private.c:1122
 msgid "Sent"
@@ -8491,14 +8251,12 @@ msgstr ""
 "\n"
 "àààààààà ààààà ààààà ààààà àààààà ààààààààà ààààà ààààààà àààààà ààà àààààà ààà..."
 
-#: ../mail/e-mail-migrate.c:1130
+#: ../mail/e-mail-migrate.c:1126
 #, fuzzy, c-format
-#| msgid "Unable to create local mail folders at `%s': %s"
 msgid "Unable to create local mail folders at '%s': %s"
 msgstr "`%s' àààààà ààààààà àààà ààààààà àààààà ààààà ààà: %s"
 
 #: ../mail/e-mail-notebook-view.c:565
-#| msgid "Please select a user."
 msgid "Please select a folder"
 msgstr "àààààààà ààààà àààààà àààà ààà"
 
@@ -8507,7 +8265,6 @@ msgstr "àààààààà ààààà àààààà àààà
 #. *     icon.  But for now, screw it.
 #: ../mail/e-mail-reader-utils.c:111
 #: ../modules/calendar/e-task-shell-view-actions.c:576
-#| msgid "Do not ask me again."
 msgid "Do not ask me again"
 msgstr "ààà ààà ààà ààààà àààà"
 
@@ -8532,27 +8289,25 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../mail/e-mail-reader.c:988 ../mail/em-filter-i18n.h:51
+#: ../mail/e-mail-reader.c:986 ../mail/em-filter-i18n.h:51
 msgid "Move to Folder"
 msgstr "ààààààààà ààà"
 
-#: ../mail/e-mail-reader.c:988 ../mail/em-folder-utils.c:421
+#: ../mail/e-mail-reader.c:986 ../mail/em-folder-utils.c:421
 msgid "_Move"
 msgstr "ààààà (_M)"
 
 #. Check buttons
-#: ../mail/e-mail-reader.c:1267 ../mail/e-mail-reader.c:1423
-#: ../mail/e-mail-reader.c:1465
-#| msgid "Do not ask me again."
+#: ../mail/e-mail-reader.c:1265 ../mail/e-mail-reader.c:1421
+#: ../mail/e-mail-reader.c:1463
 msgid "_Do not ask me again."
 msgstr "ààà ààà ààà ààààà àààà (_D)."
 
-#: ../mail/e-mail-reader.c:1470
+#: ../mail/e-mail-reader.c:1468
 msgid "_Always ignore Reply-To: for mailing lists."
 msgstr ""
 
-#: ../mail/e-mail-reader.c:1577
-#| msgid "Save Message..."
+#: ../mail/e-mail-reader.c:1575
 msgid "Save Message"
 msgid_plural "Save Messages"
 msgstr[0] "àààààà ààààààà"
@@ -8564,613 +8319,579 @@ msgstr[1] "ààààààà ààààààà"
 #. * Subject. The extension ".mbox" is appended to this
 #. * string, thus it will be something like "Message.mbox"
 #. * at the end.
-#: ../mail/e-mail-reader.c:1598
+#: ../mail/e-mail-reader.c:1596
 #: ../plugins/groupwise-features/notification.ui.h:1
 #: ../plugins/groupwise-features/properties.ui.h:3
-#| msgid "Message"
 msgid "Message"
 msgid_plural "Messages"
 msgstr[0] "àààààà"
 msgstr[1] "ààààààà"
 
-#: ../mail/e-mail-reader.c:1872
+#: ../mail/e-mail-reader.c:1870
 msgid "A_dd Sender to Address Book"
 msgstr "ààààààààààààà ààààààà ààààà (_d)"
 
-#: ../mail/e-mail-reader.c:1874
-#| msgid "Add Sender to Address Book"
+#: ../mail/e-mail-reader.c:1872
 msgid "Add sender to address book"
 msgstr "ààààààààààààà ààààààà ààààà"
 
-#: ../mail/e-mail-reader.c:1879
+#: ../mail/e-mail-reader.c:1877
 msgid "Check for _Junk"
 msgstr "ààà àààà ààààà (_J)"
 
-#: ../mail/e-mail-reader.c:1881
+#: ../mail/e-mail-reader.c:1879
 msgid "Filter the selected messages for junk status"
 msgstr "àààà àààààà àààà àààà àààà ààààààà àààà"
 
-#: ../mail/e-mail-reader.c:1886
+#: ../mail/e-mail-reader.c:1884
 msgid "_Copy to Folder..."
 msgstr "à ààààààààà ààà ààà (_C)..."
 
-#: ../mail/e-mail-reader.c:1888
+#: ../mail/e-mail-reader.c:1886
 msgid "Copy selected messages to another folder"
 msgstr "àààà àààà ààààààààà àààà ààààààààà ààà ààà"
 
-#: ../mail/e-mail-reader.c:1893
+#: ../mail/e-mail-reader.c:1891
 msgid "_Delete Message"
 msgstr "àààààà àààà ààààà (_D)"
 
-#: ../mail/e-mail-reader.c:1895
+#: ../mail/e-mail-reader.c:1893
 msgid "Mark the selected messages for deletion"
 msgstr "àààà ààààà ààààààààà àààà àààààà àààà ààààààà ààà"
 
-#: ../mail/e-mail-reader.c:1900
+#: ../mail/e-mail-reader.c:1898
 msgid "Filter on Mailing _List..."
 msgstr "ààààààà àààà àà àààà (_L)..."
 
-#: ../mail/e-mail-reader.c:1902
+#: ../mail/e-mail-reader.c:1900
 msgid "Create a rule to filter messages to this mailing list"
 msgstr "à ààààààà ààààààààà ààààààà ààààà àààà àààà ààààà"
 
-#: ../mail/e-mail-reader.c:1907
+#: ../mail/e-mail-reader.c:1905
 msgid "Filter on _Recipients..."
 msgstr "ààààààààà àà àààà (_R)..."
 
-#: ../mail/e-mail-reader.c:1909
+#: ../mail/e-mail-reader.c:1907
 msgid "Create a rule to filter messages to these recipients"
 msgstr "à ààààààààà àààà ààààààààà àààà àààà àààà ààààà"
 
-#: ../mail/e-mail-reader.c:1914
+#: ../mail/e-mail-reader.c:1912
 msgid "Filter on Se_nder..."
 msgstr "ààààààà àà àààà (_n)..."
 
-#: ../mail/e-mail-reader.c:1916
+#: ../mail/e-mail-reader.c:1914
 msgid "Create a rule to filter messages from this sender"
 msgstr "à àààààààààààà àààààà àààà àààà àààà ààààà"
 
-#: ../mail/e-mail-reader.c:1921
+#: ../mail/e-mail-reader.c:1919
 msgid "Filter on _Subject..."
 msgstr "àààà àà àààà (_S)..."
 
-#: ../mail/e-mail-reader.c:1923
+#: ../mail/e-mail-reader.c:1921
 msgid "Create a rule to filter messages with this subject"
 msgstr "à àààà àààà ààààààà ààààà àààà àààà ààààà"
 
-#: ../mail/e-mail-reader.c:1928
+#: ../mail/e-mail-reader.c:1926
 msgid "A_pply Filters"
 msgstr "ààààà àààààà àààà (_p)"
 
-#: ../mail/e-mail-reader.c:1930
+#: ../mail/e-mail-reader.c:1928
 msgid "Apply filter rules to the selected messages"
 msgstr "àààà àààà ààààààà àààà àààà ààààà àààà ààà"
 
-#: ../mail/e-mail-reader.c:1935
+#: ../mail/e-mail-reader.c:1933
 msgid "_Find in Message..."
 msgstr "ààààààààà àààà (_F)..."
 
-#: ../mail/e-mail-reader.c:1937
+#: ../mail/e-mail-reader.c:1935
 msgid "Search for text in the body of the displayed message"
 msgstr "ààààààààà àààààààà àààààà àààà àààà ààà ààà"
 
-#: ../mail/e-mail-reader.c:1942
+#: ../mail/e-mail-reader.c:1940
 msgid "_Clear Flag"
 msgstr "àààààà ààà ààà (_C)"
 
-#: ../mail/e-mail-reader.c:1944
+#: ../mail/e-mail-reader.c:1942
 #, fuzzy
-#| msgid "Create a new task from the selected message"
 msgid "Remove the follow-up flag from the selected messages"
 msgstr "àààà àààà àààààà ààààà ààà ààààààà ààààà"
 
-#: ../mail/e-mail-reader.c:1949
+#: ../mail/e-mail-reader.c:1947
 msgid "_Flag Completed"
 msgstr "àààààà ààààà àààà àà (_F)"
 
-#: ../mail/e-mail-reader.c:1951
+#: ../mail/e-mail-reader.c:1949
 #, fuzzy
-#| msgid "Select all messages in the same thread as the selected message"
 msgid "Set the follow-up flag to completed on the selected messages"
 msgstr "à à àààààààà ààà ààààààààà àààà àààà ààààààààà àààààà ààààà àààà ààà"
 
-#: ../mail/e-mail-reader.c:1956
+#: ../mail/e-mail-reader.c:1954
 msgid "Follow _Up..."
 msgstr "àà àààààà (_U)..."
 
-#: ../mail/e-mail-reader.c:1958
+#: ../mail/e-mail-reader.c:1956
 #, fuzzy
-#| msgid "Flag selected messages for follow-up"
 msgid "Flag the selected messages for follow-up"
 msgstr "àààààà ààààààààà ààààààà àààà ààààààà ààà"
 
-#: ../mail/e-mail-reader.c:1963
+#: ../mail/e-mail-reader.c:1961
 msgid "_Attached"
 msgstr "ààààààà (_A)"
 
-#: ../mail/e-mail-reader.c:1965 ../mail/e-mail-reader.c:1972
+#: ../mail/e-mail-reader.c:1963 ../mail/e-mail-reader.c:1970
 msgid "Forward the selected message to someone as an attachment"
 msgstr "àààà àààà àààààààà àààààà ààààà ààààà ààà ààààà"
 
-#: ../mail/e-mail-reader.c:1970
+#: ../mail/e-mail-reader.c:1968
 #, fuzzy
-#| msgid "_Forward as iCalendar"
 msgid "Forward As _Attached"
 msgstr "iCalendar ààààà ààà ààààà (_F)"
 
-#: ../mail/e-mail-reader.c:1977
+#: ../mail/e-mail-reader.c:1975
 msgid "_Inline"
 msgstr "àààààà àààà (_I)"
 
-#: ../mail/e-mail-reader.c:1979 ../mail/e-mail-reader.c:1986
+#: ../mail/e-mail-reader.c:1977 ../mail/e-mail-reader.c:1984
 msgid "Forward the selected message in the body of a new message"
 msgstr "àààà àààà àààààààà ààà àààààààà ààà ààààà ààà ààààà"
 
-#: ../mail/e-mail-reader.c:1984
+#: ../mail/e-mail-reader.c:1982
 #, fuzzy
-#| msgid "_Forward style:"
 msgid "Forward As _Inline"
 msgstr "ààà àààààààà àààà (_F):"
 
-#: ../mail/e-mail-reader.c:1991
+#: ../mail/e-mail-reader.c:1989
 msgid "_Quoted"
 msgstr "àààààà (_Q)"
 
-#: ../mail/e-mail-reader.c:1993 ../mail/e-mail-reader.c:2000
+#: ../mail/e-mail-reader.c:1991 ../mail/e-mail-reader.c:1998
 msgid "Forward the selected message quoted like a reply"
 msgstr "àààà àààà àààààààà àààà àààà ààààà àààààà ààààà ààà ààààà"
 
-#: ../mail/e-mail-reader.c:1998
+#: ../mail/e-mail-reader.c:1996
 #, fuzzy
-#| msgid "_Forward style:"
 msgid "Forward As _Quoted"
 msgstr "ààà àààààààà àààà (_F):"
 
-#: ../mail/e-mail-reader.c:2005
+#: ../mail/e-mail-reader.c:2003
 msgid "_Load Images"
 msgstr "àààààà àààà (_L)"
 
-#: ../mail/e-mail-reader.c:2007
+#: ../mail/e-mail-reader.c:2005
 msgid "Force images in HTML mail to be loaded"
 msgstr "àààààààà HTML àààà ààààà ààààà àààà àààà ààà"
 
-#: ../mail/e-mail-reader.c:2012
+#: ../mail/e-mail-reader.c:2010
 msgid "_Important"
 msgstr "àààààààà (_I)"
 
-#: ../mail/e-mail-reader.c:2014
+#: ../mail/e-mail-reader.c:2012
 msgid "Mark the selected messages as important"
 msgstr "àààààà ààààààààà ààààààà ààààà ààààààà ààà"
 
-#: ../mail/e-mail-reader.c:2019
+#: ../mail/e-mail-reader.c:2017
 msgid "_Junk"
 msgstr "ààà (_J)"
 
-#: ../mail/e-mail-reader.c:2021
+#: ../mail/e-mail-reader.c:2019
 msgid "Mark the selected messages as junk"
 msgstr "àààààà ààààààààà àààààà ààààà ààààààà ààà"
 
-#: ../mail/e-mail-reader.c:2026
+#: ../mail/e-mail-reader.c:2024
 msgid "_Not Junk"
 msgstr "ààààà ààà (_J)"
 
-#: ../mail/e-mail-reader.c:2028
+#: ../mail/e-mail-reader.c:2026
 msgid "Mark the selected messages as not being junk"
 msgstr "àààààà ààààààààà ààààà ààà àà ààààààà ààà"
 
-#: ../mail/e-mail-reader.c:2033
+#: ../mail/e-mail-reader.c:2031
 msgid "_Read"
 msgstr "ààààà (_R)"
 
-#: ../mail/e-mail-reader.c:2035
+#: ../mail/e-mail-reader.c:2033
 msgid "Mark the selected messages as having been read"
 msgstr "àààààà ààààààààà ààààà àààà àà ààààààà ààà"
 
-#: ../mail/e-mail-reader.c:2040
+#: ../mail/e-mail-reader.c:2038
 msgid "Uni_mportant"
 msgstr "àààààààà ààà (_m)"
 
-#: ../mail/e-mail-reader.c:2042
+#: ../mail/e-mail-reader.c:2040
 msgid "Mark the selected messages as unimportant"
 msgstr "àààààà ààààààààà ààààààà ààà àà ààààààà ààà"
 
-#: ../mail/e-mail-reader.c:2047
+#: ../mail/e-mail-reader.c:2045
 msgid "_Unread"
 msgstr "àààà ààààààà (_U)"
 
-#: ../mail/e-mail-reader.c:2049
+#: ../mail/e-mail-reader.c:2047
 msgid "Mark the selected messages as not having been read"
 msgstr "àààààà ààààààààà ààààà àààà ààà àà ààààààà ààà"
 
-#: ../mail/e-mail-reader.c:2054
+#: ../mail/e-mail-reader.c:2052
 msgid "_Edit as New Message..."
 msgstr "ààà àààààààààà àààààà ààà (_E)..."
 
-#: ../mail/e-mail-reader.c:2056
+#: ../mail/e-mail-reader.c:2054
 msgid "Open the selected messages in the composer for editing"
 msgstr "àààà àààà ààààààààà ààààààà ààààààààà àààààà àààà àààà àààà"
 
-#: ../mail/e-mail-reader.c:2061
+#: ../mail/e-mail-reader.c:2059
 msgid "Compose _New Message"
 msgstr "ààà àààààà àààààà ààà (_N)"
 
-#: ../mail/e-mail-reader.c:2063
+#: ../mail/e-mail-reader.c:2061
 msgid "Open a window for composing a mail message"
 msgstr "àààà àààààà àààààà àààà àààà àààààà àààà"
 
-#: ../mail/e-mail-reader.c:2068
+#: ../mail/e-mail-reader.c:2066
 msgid "_Open in New Window"
 msgstr "ààà ààààààààà àààà (_O)"
 
-#: ../mail/e-mail-reader.c:2070
+#: ../mail/e-mail-reader.c:2068
 msgid "Open the selected messages in a new window"
 msgstr "àààà àààà ààààààààà ààà ààààààààà àààà"
 
-#: ../mail/e-mail-reader.c:2075
+#: ../mail/e-mail-reader.c:2073
 msgid "_Move to Folder..."
 msgstr "ààààààààà ààààà (_M)..."
 
-#: ../mail/e-mail-reader.c:2077
+#: ../mail/e-mail-reader.c:2075
 msgid "Move selected messages to another folder"
 msgstr "àààà ààààààààà àààà àààà ààààààààà ààààà"
 
-#: ../mail/e-mail-reader.c:2082
+#: ../mail/e-mail-reader.c:2080
 #, fuzzy
-#| msgid "Switch to %s"
 msgid "_Switch to Folder"
 msgstr "%s ààà àààà"
 
-#: ../mail/e-mail-reader.c:2084
-#| msgid "Install the shared folder"
+#: ../mail/e-mail-reader.c:2082
 msgid "Display the parent folder"
 msgstr "ààààà àààààààà ààààààà"
 
-#: ../mail/e-mail-reader.c:2089
+#: ../mail/e-mail-reader.c:2087
 #, fuzzy
-#| msgid "Switch to %s"
 msgid "Switch to _next tab"
 msgstr "%s ààà àààà"
 
-#: ../mail/e-mail-reader.c:2091
+#: ../mail/e-mail-reader.c:2089
 msgid "Switch to the next tab"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2096
+#: ../mail/e-mail-reader.c:2094
 #, fuzzy
-#| msgid "Switch to %s"
 msgid "Switch to _previous tab"
 msgstr "%s ààà àààà"
 
-#: ../mail/e-mail-reader.c:2098
+#: ../mail/e-mail-reader.c:2096
 msgid "Switch to the previous tab"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2103
-#| msgid "Close the current file"
+#: ../mail/e-mail-reader.c:2101
 msgid "Cl_ose current tab"
 msgstr "ààààààà ààààà ààà ààà (_o)"
 
-#: ../mail/e-mail-reader.c:2105
-#| msgid "Close the current file"
+#: ../mail/e-mail-reader.c:2103
 msgid "Close current tab"
 msgstr "ààààààà ààààà ààà ààà"
 
-#: ../mail/e-mail-reader.c:2110
+#: ../mail/e-mail-reader.c:2108
 msgid "_Next Message"
 msgstr "ààààà àààààà (_N)"
 
-#: ../mail/e-mail-reader.c:2112
+#: ../mail/e-mail-reader.c:2110
 msgid "Display the next message"
 msgstr "ààààà àààààà ààààààààà ààà"
 
-#: ../mail/e-mail-reader.c:2117
+#: ../mail/e-mail-reader.c:2115
 msgid "Next _Important Message"
 msgstr "ààààà ààààààà àààààà (_I)"
 
-#: ../mail/e-mail-reader.c:2119
+#: ../mail/e-mail-reader.c:2117
 msgid "Display the next important message"
 msgstr "ààààà ààààààà àààààà ààààààààà ààà"
 
-#: ../mail/e-mail-reader.c:2124
+#: ../mail/e-mail-reader.c:2122
 msgid "Next _Thread"
 msgstr "ààààà ààààà (_T)"
 
-#: ../mail/e-mail-reader.c:2126
+#: ../mail/e-mail-reader.c:2124
 msgid "Display the next thread"
 msgstr "ààààà ààààà ààààààà"
 
-#: ../mail/e-mail-reader.c:2131
+#: ../mail/e-mail-reader.c:2129
 msgid "Next _Unread Message"
 msgstr "ààààà àààà ààààààà àààààà (_U)"
 
-#: ../mail/e-mail-reader.c:2133
+#: ../mail/e-mail-reader.c:2131
 msgid "Display the next unread message"
 msgstr "ààààà àààà ààààààà àààààà ààààààààà ààà"
 
-#: ../mail/e-mail-reader.c:2138
+#: ../mail/e-mail-reader.c:2136
 msgid "_Previous Message"
 msgstr "ààààààà àààààà (_P)"
 
-#: ../mail/e-mail-reader.c:2140
+#: ../mail/e-mail-reader.c:2138
 msgid "Display the previous message"
 msgstr "ààààààà àààààà ààààààààà ààà"
 
-#: ../mail/e-mail-reader.c:2145
+#: ../mail/e-mail-reader.c:2143
 msgid "Pr_evious Important Message"
 msgstr "ààààààà ààààààà àààààà (_e)"
 
-#: ../mail/e-mail-reader.c:2147
+#: ../mail/e-mail-reader.c:2145
 msgid "Display the previous important message"
 msgstr "ààààààà ààààààà àààààà ààààààààà ààà"
 
-#: ../mail/e-mail-reader.c:2152
-#| msgid "Previous"
+#: ../mail/e-mail-reader.c:2150
 msgid "Previous T_hread"
 msgstr "àààààààà ààààà (_h)"
 
-#: ../mail/e-mail-reader.c:2154
-#| msgid "Display the previous message"
+#: ../mail/e-mail-reader.c:2152
 msgid "Display the previous thread"
 msgstr "àààààààà ààààààà ààààààà"
 
-#: ../mail/e-mail-reader.c:2159
+#: ../mail/e-mail-reader.c:2157
 msgid "P_revious Unread Message"
 msgstr "ààààààà àààà àààààà àààààà (_r)"
 
-#: ../mail/e-mail-reader.c:2161
+#: ../mail/e-mail-reader.c:2159
 msgid "Display the previous unread message"
 msgstr "ààààààà àààà ààààààà àààààà ààààààààà ààà"
 
-#: ../mail/e-mail-reader.c:2168
+#: ../mail/e-mail-reader.c:2166
 msgid "Print this message"
 msgstr "à àààààààà àààà"
 
-#: ../mail/e-mail-reader.c:2175
+#: ../mail/e-mail-reader.c:2173
 msgid "Preview the message to be printed"
 msgstr "ààààà àààà ààààààààà àààààààààà ààà"
 
-#: ../mail/e-mail-reader.c:2180
+#: ../mail/e-mail-reader.c:2178
 msgid "Re_direct"
 msgstr "ààààààààààà ààà (_d)"
 
-#: ../mail/e-mail-reader.c:2182
+#: ../mail/e-mail-reader.c:2180
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "àààà àààà ààààààààà ààà àààà ààà àààà àààà"
 
-#: ../mail/e-mail-reader.c:2187
-#| msgid "Save Attachment"
-#| msgid_plural "Save Attachments"
+#: ../mail/e-mail-reader.c:2185
 msgid "Remo_ve Attachments"
 msgstr "àààààà ààà ààà (_v)"
 
-#: ../mail/e-mail-reader.c:2189
-#| msgid "Save Attachment"
-#| msgid_plural "Save Attachments"
+#: ../mail/e-mail-reader.c:2187
 msgid "Remove attachments"
 msgstr "àààààà ààà ààà"
 
-#: ../mail/e-mail-reader.c:2194
-#| msgid "Hide S_elected Messages"
+#: ../mail/e-mail-reader.c:2192
 msgid "Remove Du_plicate Messages"
 msgstr "àààà ààààààààà ààà ààà (_p)"
 
-#: ../mail/e-mail-reader.c:2196
+#: ../mail/e-mail-reader.c:2194
 #, fuzzy
-#| msgid "Mark the selected messages for deletion"
 msgid "Checks selected messages for duplicates"
 msgstr "àààà ààààà ààààààààà àààà àààààà àààà ààààààà ààà"
 
-#: ../mail/e-mail-reader.c:2201 ../mail/mail.error.xml.h:102
+#: ../mail/e-mail-reader.c:2199 ../mail/mail.error.xml.h:102
 #: ../modules/calendar/e-cal-shell-view-actions.c:1465
 #: ../modules/mail/e-mail-attachment-handler.c:177
 msgid "Reply to _All"
 msgstr "ààààà àààà àààà ààà (_A)"
 
-#: ../mail/e-mail-reader.c:2203
+#: ../mail/e-mail-reader.c:2201
 #, fuzzy
-#| msgid "Compose a reply to all of the recipients of the selected message"
 msgid "Compose a reply to all the recipients of the selected message"
 msgstr "àààà àààà àààààà àààà ààà ààààààààààà àààà àààà àààààà ààà"
 
-#: ../mail/e-mail-reader.c:2208 ../mail/mail.error.xml.h:103
+#: ../mail/e-mail-reader.c:2206 ../mail/mail.error.xml.h:103
 msgid "Reply to _List"
 msgstr "àààààà àààà ààà (_L)"
 
-#: ../mail/e-mail-reader.c:2210
+#: ../mail/e-mail-reader.c:2208
 msgid "Compose a reply to the mailing list of the selected message"
 msgstr "àààà àààà àààààà àààà ààààààà àààààà àààà àààà àààààà ààà"
 
-#: ../mail/e-mail-reader.c:2215
+#: ../mail/e-mail-reader.c:2213
 #: ../modules/mail/e-mail-attachment-handler.c:184
 msgid "_Reply to Sender"
 msgstr "ààààààààà àààà àààà ààà (_R)"
 
-#: ../mail/e-mail-reader.c:2217
+#: ../mail/e-mail-reader.c:2215
 msgid "Compose a reply to the sender of the selected message"
 msgstr "àààà àààà àààààààà ààààààààà àààà àààà àààààà ààà"
 
-#: ../mail/e-mail-reader.c:2222
-#| msgid "Save as..."
+#: ../mail/e-mail-reader.c:2220
 msgid "_Save as mbox..."
 msgstr "mbox ààààà ààààààà (_S)..."
 
-#: ../mail/e-mail-reader.c:2224
-#| msgid "Save the selected messages as a text file"
+#: ../mail/e-mail-reader.c:2222
 msgid "Save selected messages as an mbox file"
 msgstr "mbox àààà ààààà àààà àààà ààààààààà ààààààà"
 
-#: ../mail/e-mail-reader.c:2229
+#: ../mail/e-mail-reader.c:2227
 msgid "Search Folder from Mailing _List..."
 msgstr "ààààààà ààààààààà ààà àààààà (_L)..."
 
-#: ../mail/e-mail-reader.c:2231
-#| msgid "Create a Search Folder for this mailing list"
+#: ../mail/e-mail-reader.c:2229
 msgid "Create a search folder for this mailing list"
 msgstr "à ààààààà àààà àààà ààà àààààà ààààà"
 
-#: ../mail/e-mail-reader.c:2236
+#: ../mail/e-mail-reader.c:2234
 msgid "Search Folder from Recipien_ts..."
 msgstr "àààààààààààààà àààààà àààà (_t)..."
 
-#: ../mail/e-mail-reader.c:2238
-#| msgid "Create a Search Folder for these recipients"
+#: ../mail/e-mail-reader.c:2236
 msgid "Create a search folder for these recipients"
 msgstr "à ààààààààà àààà ààà àààààà ààààà"
 
-#: ../mail/e-mail-reader.c:2243
+#: ../mail/e-mail-reader.c:2241
 msgid "Search Folder from Sen_der..."
 msgstr "àààààààààààà ààà àààààà (_d)..."
 
-#: ../mail/e-mail-reader.c:2245
-#| msgid "Create a Search Folder for this sender"
+#: ../mail/e-mail-reader.c:2243
 msgid "Create a search folder for this sender"
 msgstr "à ààààààà àààà ààà àààààà ààààà"
 
-#: ../mail/e-mail-reader.c:2250
+#: ../mail/e-mail-reader.c:2248
 msgid "Search Folder from S_ubject..."
 msgstr "ààààààààà ààà àààààà (_u)..."
 
-#: ../mail/e-mail-reader.c:2252
+#: ../mail/e-mail-reader.c:2250
 #, fuzzy
-#| msgid "Create a Search Folder for this subject"
 msgid "Create a search folder for this subject"
 msgstr "à àààà àààà ààà àààààà ààààà"
 
-#: ../mail/e-mail-reader.c:2257
+#: ../mail/e-mail-reader.c:2255
 msgid "_Message Source"
 msgstr "àààààà ààààà (_M)"
 
-#: ../mail/e-mail-reader.c:2259
+#: ../mail/e-mail-reader.c:2257
 msgid "Show the raw email source of the message"
 msgstr "àààààààà àààà à-àààà ààààààà ààààà"
 
-#: ../mail/e-mail-reader.c:2271
+#: ../mail/e-mail-reader.c:2269
 msgid "_Undelete Message"
 msgstr "àààààà ààààà àààà (_U)"
 
-#: ../mail/e-mail-reader.c:2273
+#: ../mail/e-mail-reader.c:2271
 msgid "Undelete the selected messages"
 msgstr "àààààà ààààààà ààààà àààà"
 
-#: ../mail/e-mail-reader.c:2278
+#: ../mail/e-mail-reader.c:2276
 msgid "_Normal Size"
 msgstr "ààààààà ààà (_N)"
 
-#: ../mail/e-mail-reader.c:2280
+#: ../mail/e-mail-reader.c:2278
 msgid "Reset the text to its original size"
 msgstr "àààààà àààà ààà àààààà ààààà ààààààà ààà"
 
-#: ../mail/e-mail-reader.c:2285
+#: ../mail/e-mail-reader.c:2283
 msgid "_Zoom In"
 msgstr "ààààà ààà (_Z)"
 
-#: ../mail/e-mail-reader.c:2287
+#: ../mail/e-mail-reader.c:2285
 msgid "Increase the text size"
 msgstr "ààààààà ààà ààààà"
 
-#: ../mail/e-mail-reader.c:2292
+#: ../mail/e-mail-reader.c:2290
 msgid "Zoom _Out"
 msgstr "ààààà ààà (_O)"
 
-#: ../mail/e-mail-reader.c:2294
+#: ../mail/e-mail-reader.c:2292
 msgid "Decrease the text size"
 msgstr "àààà ààà ààààà"
 
-#: ../mail/e-mail-reader.c:2301
+#: ../mail/e-mail-reader.c:2299
 msgid "Create R_ule"
 msgstr "àààà ààààà (_u)"
 
-#: ../mail/e-mail-reader.c:2308
+#: ../mail/e-mail-reader.c:2306
 msgid "Ch_aracter Encoding"
 msgstr "àààààààà àààààààààààà (_a)"
 
-#: ../mail/e-mail-reader.c:2315
-#| msgid "F_orward As..."
+#: ../mail/e-mail-reader.c:2313
 msgid "F_orward As"
 msgstr "à àààà ààà ààààà (_o)"
 
-#: ../mail/e-mail-reader.c:2322
+#: ../mail/e-mail-reader.c:2320
 #, fuzzy
-#| msgid "_Reply"
 msgid "_Group Reply"
 msgstr "ààààààààààà (_R)"
 
-#: ../mail/e-mail-reader.c:2329
+#: ../mail/e-mail-reader.c:2327
 msgid "_Go To"
 msgstr "àà ààà (_G)"
 
-#: ../mail/e-mail-reader.c:2336
-#| msgid "Mar_k as"
+#: ../mail/e-mail-reader.c:2334
 msgid "Mar_k As"
 msgstr "à àààà ààààààà ààà (_k)"
 
-#: ../mail/e-mail-reader.c:2343
+#: ../mail/e-mail-reader.c:2341
 msgid "_Message"
 msgstr "àààààà (_M)"
 
-#: ../mail/e-mail-reader.c:2350
+#: ../mail/e-mail-reader.c:2348
 msgid "_Zoom"
 msgstr "ààààà ààààà (_Z)"
 
-#: ../mail/e-mail-reader.c:2375
+#: ../mail/e-mail-reader.c:2373
 msgid "Mark for Follo_w Up..."
 msgstr "àààààà ààààààà ààààà (_w)..."
 
-#: ../mail/e-mail-reader.c:2383
+#: ../mail/e-mail-reader.c:2381
 msgid "Mark as _Important"
 msgstr "àààààààà àà ààààààà ààà (_I)"
 
-#: ../mail/e-mail-reader.c:2387
+#: ../mail/e-mail-reader.c:2385
 msgid "Mark as _Junk"
 msgstr "ààààà àà àà ààààààà ààà (_J)"
 
-#: ../mail/e-mail-reader.c:2391
+#: ../mail/e-mail-reader.c:2389
 msgid "Mark as _Not Junk"
 msgstr "ààààà ààà àà ààààààà ààà (_N)"
 
-#: ../mail/e-mail-reader.c:2395
+#: ../mail/e-mail-reader.c:2393
 msgid "Mar_k as Read"
 msgstr "ààààààà ààà àà ààààààà ààà (_k)"
 
-#: ../mail/e-mail-reader.c:2399
+#: ../mail/e-mail-reader.c:2397
 #, fuzzy
-#| msgid "Mark as Un_important"
 msgid "Mark as Uni_mportant"
 msgstr "àààààààà ààà àà ààààààà ààà (_i)"
 
-#: ../mail/e-mail-reader.c:2403
+#: ../mail/e-mail-reader.c:2401
 msgid "Mark as _Unread"
 msgstr "àààà àààààà àà àà ààààààà ààà (_U)"
 
-#: ../mail/e-mail-reader.c:2447
+#: ../mail/e-mail-reader.c:2445
 msgid "_Caret Mode"
 msgstr "ààààà àààààà (_C)"
 
-#: ../mail/e-mail-reader.c:2449
+#: ../mail/e-mail-reader.c:2447
 msgid "Show a blinking cursor in the body of displayed messages"
 msgstr "ààààààààà ààààààààà àààààà ààààààà ààààà ààààà"
 
-#: ../mail/e-mail-reader.c:2455
+#: ../mail/e-mail-reader.c:2453
 msgid "All Message _Headers"
 msgstr "ààà àààààà ààààà (_H)"
 
-#: ../mail/e-mail-reader.c:2457
+#: ../mail/e-mail-reader.c:2455
 msgid "Show messages with all email headers"
 msgstr "ààààààà ààà ààààà ààààà àààà ààààà"
 
-#: ../mail/e-mail-reader.c:2695
+#: ../mail/e-mail-reader.c:2693
 msgid "Unable to retrieve message"
 msgstr "àààààà àààà àààààà ààààà ààà"
 
-#: ../mail/e-mail-reader.c:2756 ../mail/mail-ops.c:2044
+#: ../mail/e-mail-reader.c:2752 ../mail/mail-ops.c:2068
 #, c-format
-#| msgid "Retrieving message %s"
 msgid "Retrieving message '%s'"
 msgstr "àààààà '%s' ààààà ààààà ààà"
 
 #. we changed user, thus reset the chosen calendar combo too, because
 #. other user means other calendars subscribed
-#: ../mail/e-mail-reader.c:3375 ../mail/mail-config.ui.h:31
+#: ../mail/e-mail-reader.c:3368 ../mail/mail-config.ui.h:31
 #: ../plugins/google-account-setup/google-source.c:304
 #: ../plugins/google-account-setup/google-source.c:538
 #: ../plugins/google-account-setup/google-source.c:674
@@ -9178,96 +8899,93 @@ msgstr "àààààà '%s' ààààà ààààà ààà"
 msgid "Default"
 msgstr "àààààà"
 
-#: ../mail/e-mail-reader.c:3555
+#: ../mail/e-mail-reader.c:3539
 #: ../modules/mail/e-mail-attachment-handler.c:170
 msgid "_Forward"
 msgstr "ààà ààààà (_F)"
 
-#: ../mail/e-mail-reader.c:3556
+#: ../mail/e-mail-reader.c:3540
 msgid "Forward the selected message to someone"
 msgstr "àààà àààà àààààààà àààààà ààà ààààà"
 
-#: ../mail/e-mail-reader.c:3575
+#: ../mail/e-mail-reader.c:3559
 #, fuzzy
-#| msgid "Group Items By"
 msgid "Group Reply"
 msgstr "ààà ààààààà ààààààààà ààà ààààà"
 
-#: ../mail/e-mail-reader.c:3576
+#: ../mail/e-mail-reader.c:3560
 #, fuzzy
-#| msgid "Compose a reply to the mailing list of the selected message"
 msgid "Reply to the mailing list, or to all recipients"
 msgstr "àààà àààà àààààà àààà ààààààà àààààà àààà àààà àààààà ààà"
 
-#: ../mail/e-mail-reader.c:3621 ../mail/em-filter-i18n.h:14
-#: ../plugins/groupwise-features/share-folder.c:744
+#: ../mail/e-mail-reader.c:3605 ../mail/em-filter-i18n.h:14
+#: ../plugins/groupwise-features/share-folder.c:746
 msgid "Delete"
 msgstr "àààà àààà"
 
-#: ../mail/e-mail-reader.c:3654
+#: ../mail/e-mail-reader.c:3638
 #: ../modules/calendar/e-cal-shell-view-actions.c:1311
 #: ../widgets/misc/e-calendar.c:201
 msgid "Next"
 msgstr "ààà ààà"
 
-#: ../mail/e-mail-reader.c:3658
+#: ../mail/e-mail-reader.c:3642
 #: ../modules/calendar/e-cal-shell-view-actions.c:1304
 #: ../widgets/misc/e-calendar.c:177
 msgid "Previous"
 msgstr "àààààààà"
 
-#: ../mail/e-mail-reader.c:3668 ../mail/mail-dialogs.ui.h:16
+#: ../mail/e-mail-reader.c:3652 ../mail/mail-dialogs.ui.h:16
 msgid "Reply"
 msgstr "àààà àààà"
 
-#: ../mail/e-mail-reader.c:4305
+#: ../mail/e-mail-reader.c:4287
 #, c-format
-#| msgid "Folder"
 msgid "Folder '%s'"
 msgstr "àààààà '%s'"
 
-#: ../mail/e-mail-session.c:650
+#: ../mail/e-mail-session.c:647
 #, c-format
 msgid "Enter Passphrase for %s"
 msgstr "%s àààà àààààààà àààà ààà"
 
-#: ../mail/e-mail-session.c:652
+#: ../mail/e-mail-session.c:649
 msgid "Enter Passphrase"
 msgstr "àààààààà àààà ààà"
 
-#: ../mail/e-mail-session.c:655
+#: ../mail/e-mail-session.c:652
 #, c-format
 msgid "Enter Password for %s"
 msgstr "%s àààà ààààààà àààà ààà"
 
-#: ../mail/e-mail-session.c:657
+#: ../mail/e-mail-session.c:654
 msgid "Enter Password"
 msgstr "ààààààà àààà ààà"
 
-#: ../mail/e-mail-session.c:708
+#: ../mail/e-mail-session.c:705
 #, c-format
 msgid "User canceled operation."
 msgstr "ààààààààààà ààààààààà ààààà àààà."
 
-#: ../mail/e-mail-session.c:878
+#: ../mail/e-mail-session.c:875
 #, c-format
-msgid "No destination address provided, forward of the message has been cancelled."
-msgstr "ààà ààààà ààààà ààààààà ààààà àààààààà àààà ààà, àààààààà ààà ààààààààà àà ààààààà àààà àà."
+msgid ""
+"No destination address provided, forward of the message has been cancelled."
+msgstr ""
+"ààà ààààà ààààà ààààààà ààààà àààààààà àààà ààà, àààààààà ààà ààààààààà àà ààààààà àààà àà."
 
-#: ../mail/e-mail-session.c:887
+#: ../mail/e-mail-session.c:884
 #, c-format
 msgid "No account found to use, forward of the message has been cancelled."
 msgstr "àààààà àààà ààà ààààà àààààà àààà, àààààààà ààà ààààààààà àà ààààààà àààà àà."
 
-#: ../mail/e-mail-session.c:1290 ../mail/mail-ops.c:1220
+#: ../mail/e-mail-session.c:1287 ../mail/mail-ops.c:1220
 #, c-format
-#| msgid "Opening folder %s"
 msgid "Opening folder '%s'"
 msgstr "àààààà '%s' àà àààà ààààà àà"
 
-#: ../mail/e-mail-session.c:1306
+#: ../mail/e-mail-session.c:1303
 #, c-format
-#| msgid "Invalid folder: `%s'"
 msgid "Invalid folder: %s"
 msgstr "àààààà àààààà: %s"
 
@@ -9279,9 +8997,6 @@ msgstr "ààà ààààà àààààà àààààààà 
 #: ../mail/e-mail-session-utils.c:514 ../mail/e-mail-session-utils.c:548
 #: ../mail/mail-ops.c:622 ../mail/mail-ops.c:653
 #, fuzzy, c-format
-#| msgid ""
-#| "Failed to append to %s: %s\n"
-#| "Appending to local `Sent' folder instead."
 msgid ""
 "Failed to append to %s: %s\n"
 "Appending to local 'Sent' folder instead."
@@ -9291,7 +9006,6 @@ msgstr ""
 
 #: ../mail/e-mail-session-utils.c:568 ../mail/mail-ops.c:673
 #, fuzzy, c-format
-#| msgid "Failed to append to local `Sent' folder: %s"
 msgid "Failed to append to local 'Sent' folder: %s"
 msgstr "ààààààà `ààààà' ààààààààà ààààààààà àààààà: %s"
 
@@ -9302,19 +9016,16 @@ msgstr "àààààà ààààà ààààà ààà"
 
 #: ../mail/e-mail-session-utils.c:850
 #, c-format
-#| msgid "Unsubscribing from folder \"%s\""
 msgid "Unsubscribing from folder '%s'"
 msgstr "àààààà '%s' ààààà àààààààà ààà ààà ààààà ààà"
 
 #: ../mail/e-mail-store-utils.c:39
 #, c-format
-#| msgid "Disconnecting from %s"
 msgid "Disconnecting from '%s'"
 msgstr "'%s' ààààà àààààà àààà ààààà ààà"
 
 #: ../mail/e-mail-store-utils.c:130
 #, c-format
-#| msgid "Reconnecting to %s"
 msgid "Reconnecting to '%s'"
 msgstr "'%s' àààà ààààà ààààà ààààà ààà"
 
@@ -9346,36 +9057,34 @@ msgid "SSL encryption"
 msgstr "SSL àààààààààà"
 
 #. Translators: "None" as an option for a default signature of an account, part of "Signature: None"
-#: ../mail/em-account-editor.c:843 ../widgets/misc/e-signature-combo-box.c:79
-#| msgid "None"
+#: ../mail/em-account-editor.c:838 ../widgets/misc/e-signature-combo-box.c:79
 msgctxt "mail-signature"
 msgid "None"
 msgstr "ààà àààà"
 
-#: ../mail/em-account-editor.c:924
+#: ../mail/em-account-editor.c:919
 msgid "Never"
 msgstr "ààààààà ààà"
 
-#: ../mail/em-account-editor.c:925
+#: ../mail/em-account-editor.c:920
 msgid "Always"
 msgstr "àààààà"
 
-#: ../mail/em-account-editor.c:926
+#: ../mail/em-account-editor.c:921
 msgid "Ask for each message"
 msgstr "àààà àààààà àààà àààà"
 
 #. Translators: "None" for receiving account type, beside of IMAP, POP3, ...
-#: ../mail/em-account-editor.c:1708 ../widgets/misc/e-account-tree-view.c:131
-#| msgid "None"
+#: ../mail/em-account-editor.c:1703 ../widgets/misc/e-account-tree-view.c:131
 msgctxt "mail-receiving"
 msgid "None"
 msgstr "ààà àààà"
 
-#: ../mail/em-account-editor.c:2092
+#: ../mail/em-account-editor.c:2087
 msgid "Mail Configuration"
 msgstr "àààà àààààààààà"
 
-#: ../mail/em-account-editor.c:2093
+#: ../mail/em-account-editor.c:2088
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -9385,7 +9094,7 @@ msgstr ""
 "\n"
 "ààààà àààà àààà \"ààà ààààà\" àà ààààà ààà."
 
-#: ../mail/em-account-editor.c:2096
+#: ../mail/em-account-editor.c:2091
 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 "
@@ -9394,19 +9103,19 @@ msgstr ""
 "àààààààà ààààà àààà àààààà ààà ààà à-àààà ààààààà àààà ààà. àààààà \"àààààààà\" àààààààà "
 "àààààà àààà ààà, ààààà àààà ààà à ààààààà ààà ààààààà à-ààààààà àààààà ààààà àààà."
 
-#: ../mail/em-account-editor.c:2098 ../mail/em-account-editor.c:2261
+#: ../mail/em-account-editor.c:2093 ../mail/em-account-editor.c:2256
 msgid "Receiving Email"
 msgstr "à-àààà ààààà ààààà ààà"
 
-#: ../mail/em-account-editor.c:2099
+#: ../mail/em-account-editor.c:2094
 msgid "Please configure the following account settings."
 msgstr "àààààààà ààààà àààààà àààà ààààààààà ààààààààààà ààà."
 
-#: ../mail/em-account-editor.c:2101 ../mail/em-account-editor.c:2761
+#: ../mail/em-account-editor.c:2096 ../mail/em-account-editor.c:2756
 msgid "Sending Email"
 msgstr "à-àààà ààààà ààààà ààà"
 
-#: ../mail/em-account-editor.c:2102
+#: ../mail/em-account-editor.c:2097
 msgid ""
 "Please enter information about the way you will send mail. If you are not "
 "sure, ask your system administrator or Internet Service Provider."
@@ -9414,16 +9123,12 @@ msgstr ""
 "àààààààà ààààà ààà àà àààà àààà ààààà àà àààà ààààààà àààà ààà. àà ààà àààààà àààà "
 "ààà, àà ààààà àààààà àààààà àààà àààààààà àààà àààà àààààààà àààà."
 
-#: ../mail/em-account-editor.c:2104 ../mail/mail-config.ui.h:1
-#| msgid "No Information"
+#: ../mail/em-account-editor.c:2099 ../mail/mail-config.ui.h:1
 msgid "Account Information"
 msgstr "àààà ààààààà"
 
-#: ../mail/em-account-editor.c:2105
+#: ../mail/em-account-editor.c:2100
 #, fuzzy
-#| msgid ""
-#| "Please enter a descriptive name for this account in the space below. This "
-#| "name will be used for display purposes only."
 msgid ""
 "Please enter a descriptive name for this account below.\n"
 "This name will be used for display purposes only."
@@ -9431,19 +9136,12 @@ msgstr ""
 "àààààààà ààààà à àààà àààà àààààà àààààààà àààààààààà ààà àààà ààà. à ààà ààààà "
 "àààààààààà àààà àààà à àààààà."
 
-#: ../mail/em-account-editor.c:2109
+#: ../mail/em-account-editor.c:2104
 msgid "Done"
 msgstr "àà àààà"
 
-#: ../mail/em-account-editor.c:2110
+#: ../mail/em-account-editor.c:2105
 #, fuzzy
-#| msgid ""
-#| "Congratulations, your mail configuration is complete.\n"
-#| "\n"
-#| "You are now ready to send and receive email \n"
-#| "using Evolution. \n"
-#| "\n"
-#| "Click \"Apply\" to save your settings."
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -9458,30 +9156,29 @@ msgstr ""
 "\n"
 "ààààà ààààààà àààààààà àààà \"àààààà àààà\" àà ààààà ààà."
 
-#: ../mail/em-account-editor.c:2575
+#: ../mail/em-account-editor.c:2570
 msgid "Check for _new messages every"
 msgstr "à ààà ààà ààààààà àààà ààààà (_n)"
 
-#: ../mail/em-account-editor.c:2583
+#: ../mail/em-account-editor.c:2578
 msgid "minu_tes"
 msgstr "àààààà (_t)"
 
-#: ../mail/em-account-editor.c:2866
-#| msgid "Please select an image for this contact"
+#: ../mail/em-account-editor.c:2861
 msgid "Please select a folder from the current account."
 msgstr "àààààààà ààààà àààààà ààààààààà àààààààà àààà ààà."
 
-#: ../mail/em-account-editor.c:3176 ../mail/mail-config.ui.h:98
+#: ../mail/em-account-editor.c:3171 ../mail/mail-config.ui.h:98
 msgid "Security"
 msgstr "ààààààà"
 
 #. Most sections for this is auto-generated from the camel config
 #. Most sections for this is auto-generated fromt the camel config
-#: ../mail/em-account-editor.c:3222 ../mail/em-account-editor.c:3290
+#: ../mail/em-account-editor.c:3217 ../mail/em-account-editor.c:3285
 msgid "Receiving Options"
 msgstr "ààààààà ààààà ààààà ààà"
 
-#: ../mail/em-account-editor.c:3223 ../mail/em-account-editor.c:3291
+#: ../mail/em-account-editor.c:3218 ../mail/em-account-editor.c:3286
 msgid "Checking for New Messages"
 msgstr "ààà ààààààà àààà ààààà ààààà ààà"
 
@@ -9509,7 +9206,6 @@ msgstr ""
 #. Translators: %s is the subject of the email message
 #: ../mail/em-composer-utils.c:1871
 #, fuzzy, c-format
-#| msgid "Mail Notification Properties"
 msgid "Delivery Notification for: \"%s\""
 msgstr "àààà àààà àààààààà"
 
@@ -9813,11 +9509,11 @@ msgstr "àààààààà àààààààà"
 msgid "<click here to select a folder>"
 msgstr "&lt;àààààà àààà àààà àààà àààà ààààà ààà&gt;"
 
-#: ../mail/em-folder-selector.c:262
+#: ../mail/em-folder-selector.c:261
 msgid "C_reate"
 msgstr "ààààà (_r)"
 
-#: ../mail/em-folder-selector.c:266
+#: ../mail/em-folder-selector.c:265
 msgid "Folder _name:"
 msgstr "àààààà ààà (_n):"
 
@@ -9825,7 +9521,7 @@ msgstr "àààààà ààà (_n):"
 #: ../mail/em-folder-tree-model.c:151 ../mail/em-folder-tree-model.c:154
 #: ../mail/em-folder-tree-model.c:160 ../mail/em-folder-tree-model.c:162
 #: ../mail/em-folder-tree-model.c:169 ../mail/em-folder-tree-model.c:171
-#: ../mail/mail-vfolder.c:1164 ../mail/mail-vfolder.c:1241
+#: ../mail/mail-vfolder.c:1164 ../mail/mail-vfolder.c:1239
 msgid "Search Folders"
 msgstr "ààà ààààààà"
 
@@ -9883,24 +9579,20 @@ msgid "Cannot drop message(s) into toplevel store"
 msgstr "àààà àààààà àààààààààààààà ààààààà àààà àààà ààà"
 
 #: ../mail/em-folder-utils.c:422
-#| msgid "_Move Folder To..."
 msgid "Move Folder To"
 msgstr "àààààààà àààà ààààà"
 
 #: ../mail/em-folder-utils.c:422
-#| msgid "_Copy Folder To..."
 msgid "Copy Folder To"
 msgstr "àààààààà àààà ààà ààà"
 
 #: ../mail/em-folder-utils.c:571
 #: ../plugins/groupwise-features/share-folder-common.c:138
 #, c-format
-#| msgid "Creating folder `%s'"
 msgid "Creating folder '%s'"
 msgstr "àààààà '%s' ààààà ààààà ààà"
 
 #: ../mail/em-folder-utils.c:745
-#| msgid "Create folder"
 msgid "Create Folder"
 msgstr "àààààà ààààà"
 
@@ -9991,7 +9683,8 @@ msgstr "ààààààààà àààà"
 msgid ""
 "This message is encrypted.  It would be difficult for an outsider to view "
 "the content of this message."
-msgstr "àààààà ààààààààà àààà àà. àààààà ààààààà àààà à àààààààà ààààààààààà ààààààà ààààààà àà ààà."
+msgstr ""
+"àààààà ààààààààà àààà àà. àààààà ààààààà àààà à àààààààà ààààààààààà ààààààà ààààààà àà ààà."
 
 #: ../mail/em-format-html-display.c:102 ../mail/em-format-html.c:1617
 msgid "Encrypted, strong"
@@ -10062,7 +9755,6 @@ msgstr "ààààààààà àààààà ààà ààààà
 
 #: ../mail/em-format-html.c:1448 ../mail/em-format-html.c:1458
 #, c-format
-#| msgid "Retrieving `%s'"
 msgid "Retrieving '%s'"
 msgstr "'%s' ààààà ààààà ààà"
 
@@ -10101,16 +9793,14 @@ msgstr "àààààà ààààà àààààà (\"%s\" ààà
 
 #. 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:2768
+#: ../mail/em-format-html.c:2766
 #, fuzzy, c-format
-#| msgid "This message was sent by <b>%s</b> on behalf of <b>%s</b>"
 msgid "This message was sent by %s on behalf of %s"
 msgstr "à àààààà <b>%s</b> àààààà <b>%s</b> ààà àààààààà ààà"
 
 #: ../mail/em-html-stream.c:82 ../mail/em-html-stream.c:104
 #: ../mail/em-html-stream.c:122
 #, c-format
-#| msgid "No summary available."
 msgid "No HTML stream available"
 msgstr "HTML ààààààà àààààà ààà"
 
@@ -10123,29 +9813,24 @@ msgid "_Account:"
 msgstr "ààààà (_A):"
 
 #: ../mail/em-subscription-editor.c:1159
-#| msgid "Clear the search"
 msgid "Clear Search"
 msgstr "ààààà ààà ààà"
 
 #: ../mail/em-subscription-editor.c:1177
 #, fuzzy
-#| msgid "does not contain"
 msgid "Sho_w items that contain:"
 msgstr "ààààààà ààà"
 
 #: ../mail/em-subscription-editor.c:1216
-#| msgid "Subscribe to Other User's Folder"
 msgid "Subscribe to the selected folder"
 msgstr "àààà àààà ààààààààà àààààààà ààà"
 
 #: ../mail/em-subscription-editor.c:1217
-#| msgid "Subscribed"
 msgid "Su_bscribe"
 msgstr "àààààààà ààà (_b)"
 
 #: ../mail/em-subscription-editor.c:1228
 #: ../modules/mail/e-mail-shell-view-actions.c:1174
-#| msgid "Rename the selected folder"
 msgid "Unsubscribe from the selected folder"
 msgstr "àààà àààà ààààààààààà àààààààà ààà ààà ààààà àà"
 
@@ -10156,33 +9841,27 @@ msgstr "àààààààà ààà ààà (_U)"
 
 #: ../mail/em-subscription-editor.c:1240
 #, fuzzy
-#| msgid "All local folders"
 msgid "Collapse all folders"
 msgstr "ààà ààààààà ààààààà"
 
 #: ../mail/em-subscription-editor.c:1241
 #, fuzzy
-#| msgid "Collapse All _Threads"
 msgid "C_ollapse All"
 msgstr "ààà àààààà àààà ààà (_T)"
 
 #: ../mail/em-subscription-editor.c:1251
-#| msgid "E_xpand All Threads"
 msgid "Expand all folders"
 msgstr "ààà ààààààààà ààààààà ààààà"
 
 #: ../mail/em-subscription-editor.c:1252
-#| msgid "E_xpand All Threads"
 msgid "E_xpand All"
 msgstr "ààà ààààààà ààààà (_x)"
 
 #: ../mail/em-subscription-editor.c:1262
-#| msgid "Refresh the folder"
 msgid "Refresh the folder list"
 msgstr "àààààà àààààà àààààààà ààà"
 
 #: ../mail/em-subscription-editor.c:1274
-#| msgid "Cancel the current mail operation"
 msgid "Stop the current operation"
 msgstr "ààààààà àààààààà ààà ààà"
 
@@ -10192,7 +9871,6 @@ msgstr "ààààààà àààààààà ààà ààà"
 #. * write it doubled, like '%%'.
 #: ../mail/em-utils.c:101
 #, fuzzy, c-format
-#| msgid "Are you sure you want to open {0} messages at once?"
 msgid "Are you sure you want to open %d message at once?"
 msgid_plural "Are you sure you want to open %d messages at once?"
 msgstr[0] "ààà ààà ààààà {0} ààààààà àààààà ààààà ààààà àà?"
@@ -10200,7 +9878,6 @@ msgstr[1] "ààà ààà ààààà {0} ààààààà àà
 
 #: ../mail/em-utils.c:153
 #: ../modules/mailto-handler/evolution-mailto-handler.c:151
-#| msgid "_Do not show this message again."
 msgid "_Do not show this message again"
 msgstr "à àààààà ààààà àààààà àààà (_D)"
 
@@ -10218,61 +9895,51 @@ msgid "Search _Folders"
 msgstr "ààà ààààààà (_F)"
 
 #: ../mail/em-vfolder-rule.c:613
-#| msgid "Folder"
 msgid "Add Folder"
 msgstr "àààààà ààààà"
 
 #: ../mail/evolution-mail.schemas.in.h:1
 #, fuzzy
-#| msgid "Default window height"
 msgid "\"Filter Editor\" window height"
 msgstr "àààààà àààààà ààààà"
 
 #: ../mail/evolution-mail.schemas.in.h:2
 #, fuzzy
-#| msgid "\"Send and Receive Mail\" window maximize state"
 msgid "\"Filter Editor\" window maximize state"
 msgstr "\"àààà ààààà ààà ààààà\" àààààà àààààà ààààà"
 
 #: ../mail/evolution-mail.schemas.in.h:3
 #, fuzzy
-#| msgid "Default window width"
 msgid "\"Filter Editor\" window width"
 msgstr "àààààà àààààà àààààà"
 
 #: ../mail/evolution-mail.schemas.in.h:4
 #, fuzzy
-#| msgid "Folder Subscriptions"
 msgid "\"Folder Subscriptions\" window height"
 msgstr "àààààààà àààààààà"
 
 #: ../mail/evolution-mail.schemas.in.h:5
 #, fuzzy
-#| msgid "\"Send and Receive Mail\" window maximize state"
 msgid "\"Folder Subscriptions\" window maximize state"
 msgstr "\"àààà ààààà ààà ààààà\" àààààà àààààà ààààà"
 
 #: ../mail/evolution-mail.schemas.in.h:6
 #, fuzzy
-#| msgid "Folder Subscriptions"
 msgid "\"Folder Subscriptions\" window width"
 msgstr "àààààààà àààààààà"
 
 #: ../mail/evolution-mail.schemas.in.h:7
 #, fuzzy
-#| msgid "Default window height"
 msgid "\"Search Folder Editor\" window height"
 msgstr "àààààà àààààà ààààà"
 
 #: ../mail/evolution-mail.schemas.in.h:8
 #, fuzzy
-#| msgid "\"Send and Receive Mail\" window maximize state"
 msgid "\"Search Folder Editor\" window maximize state"
 msgstr "\"àààà ààààà ààà ààààà\" àààààà àààààà ààààà"
 
 #: ../mail/evolution-mail.schemas.in.h:9
 #, fuzzy
-#| msgid "Search Folder based on Mailing _List"
 msgid "\"Search Folder Editor\" window width"
 msgstr "ààààààà ààààà àà àààà àààààà ààààààààà àààà (_L)"
 
@@ -10305,7 +9972,6 @@ msgstr ""
 
 #: ../mail/evolution-mail.schemas.in.h:16
 #, fuzzy
-#| msgid "Attached message"
 msgid "Attribute message."
 msgstr "ààààààà ààààà"
 
@@ -10319,13 +9985,11 @@ msgstr "ààààà ààà àààà"
 
 #: ../mail/evolution-mail.schemas.in.h:19
 #, fuzzy
-#| msgid "Check for _new messages every"
 msgid "Check for new messages in all active accounts"
 msgstr "à ààà ààà ààààààà àààà ààààà (_n)"
 
 #: ../mail/evolution-mail.schemas.in.h:20
 #, fuzzy
-#| msgid "Check for _new messages every"
 msgid "Check for new messages on start"
 msgstr "à ààà ààà ààààààà àààà ààààà (_n)"
 
@@ -10361,7 +10025,8 @@ msgstr "àààààààààà ààààà TO/CC/BCC ààà à
 msgid ""
 "Compress display of addresses in TO/CC/BCC to the number specified in "
 "address_count."
-msgstr "àààààààààà ààààà TO/CC/BCC ààà address_count ààà àààààà àààà àààà ààààààà ààààààà ààà àà."
+msgstr ""
+"àààààààààà ààààà TO/CC/BCC ààà address_count ààà àààààà àààà àààà ààààààà ààààààà ààà àà."
 
 #: ../mail/evolution-mail.schemas.in.h:29
 msgid ""
@@ -10409,13 +10074,11 @@ msgstr "ààààààà àààààààà àààààà àà
 
 #: ../mail/evolution-mail.schemas.in.h:38
 #, fuzzy
-#| msgid "Default height of the Composer Window."
 msgid "Default height of the mail browser window."
 msgstr "ààààààà àààààààà àààààà ààààà."
 
 #: ../mail/evolution-mail.schemas.in.h:39
 #, fuzzy
-#| msgid "Default width of the Composer Window."
 msgid "Default maximized state of the mail browser window."
 msgstr "ààààààà àààààààà àààààà àààààà."
 
@@ -10433,7 +10096,6 @@ msgstr "ààààààà àààààààà àààààà àà
 
 #: ../mail/evolution-mail.schemas.in.h:43
 #, fuzzy
-#| msgid "Default width of the Composer Window."
 msgid "Default width of the mail browser window."
 msgstr "ààààààà àààààààà àààààà àààààà."
 
@@ -10499,7 +10161,6 @@ msgstr ""
 
 #: ../mail/evolution-mail.schemas.in.h:54
 #, fuzzy
-#| msgid "Could not save signature file."
 msgid "Do not add signature delimiter"
 msgstr "ààààà àààà ààààààà ààààà àààà."
 
@@ -10583,9 +10244,6 @@ msgstr ""
 
 #: ../mail/evolution-mail.schemas.in.h:71
 #, fuzzy
-#| msgid ""
-#| "Enable this to use Space bar key to scroll in message preview, message "
-#| "list and folders."
 msgid "Enable to use a similar message list view settings for all folders."
 msgstr ""
 "àààààà àààààààààà, àààààà àààà ààà àààààààààà ààààààà àààà ààààà ààààà àà àààààà àààà ààà "
@@ -10616,7 +10274,6 @@ msgstr ""
 
 #: ../mail/evolution-mail.schemas.in.h:76
 #, fuzzy
-#| msgid "Forwarded message"
 msgid "Forward message."
 msgstr "ààà àààààààà àààààà"
 
@@ -10660,9 +10317,6 @@ msgstr ""
 
 #: ../mail/evolution-mail.schemas.in.h:84
 #, fuzzy
-#| msgid ""
-#| "Initial height of the \"Send and Receive Mail\" window. The value updates "
-#| "as the user resizes the window vertically."
 msgid ""
 "Initial height of the \"Filter Editor\" window. The value updates as the "
 "user resizes the window vertically."
@@ -10672,9 +10326,6 @@ msgstr ""
 
 #: ../mail/evolution-mail.schemas.in.h:85
 #, fuzzy
-#| msgid ""
-#| "Initial height of the \"Send and Receive Mail\" window. The value updates "
-#| "as the user resizes the window vertically."
 msgid ""
 "Initial height of the \"Folder Subscriptions\" window. The value updates as "
 "the user resizes the window vertically."
@@ -10684,9 +10335,6 @@ msgstr ""
 
 #: ../mail/evolution-mail.schemas.in.h:86
 #, fuzzy
-#| msgid ""
-#| "Initial height of the \"Send and Receive Mail\" window. The value updates "
-#| "as the user resizes the window vertically."
 msgid ""
 "Initial height of the \"Search Folder Editor\" window. The value updates as "
 "the user resizes the window vertically."
@@ -10704,12 +10352,6 @@ msgstr ""
 
 #: ../mail/evolution-mail.schemas.in.h:88
 #, fuzzy
-#| msgid ""
-#| "Initial maximize state of the \"Send and Receive Mail\" window. The value "
-#| "updates when the user maximizes or unmaximizes the window. Note, this "
-#| "particular value is not used by Evolution since the \"Send and Receive "
-#| "Mail\" window cannot be maximized. This key exists only as an "
-#| "implementation detail."
 msgid ""
 "Initial maximize state of the \"Filter Editor\" window. The value updates "
 "when the user maximizes or unmaximizes the window. Note, this particular "
@@ -10723,12 +10365,6 @@ msgstr ""
 
 #: ../mail/evolution-mail.schemas.in.h:89
 #, fuzzy
-#| msgid ""
-#| "Initial maximize state of the \"Send and Receive Mail\" window. The value "
-#| "updates when the user maximizes or unmaximizes the window. Note, this "
-#| "particular value is not used by Evolution since the \"Send and Receive "
-#| "Mail\" window cannot be maximized. This key exists only as an "
-#| "implementation detail."
 msgid ""
 "Initial maximize state of the \"Folder Subscriptions\" window. The value "
 "updates when the user maximizes or unmaximizes the window. Note, this "
@@ -10742,12 +10378,6 @@ msgstr ""
 
 #: ../mail/evolution-mail.schemas.in.h:90
 #, fuzzy
-#| msgid ""
-#| "Initial maximize state of the \"Send and Receive Mail\" window. The value "
-#| "updates when the user maximizes or unmaximizes the window. Note, this "
-#| "particular value is not used by Evolution since the \"Send and Receive "
-#| "Mail\" window cannot be maximized. This key exists only as an "
-#| "implementation detail."
 msgid ""
 "Initial maximize state of the \"Search Folder Editor\" window. The value "
 "updates when the user maximizes or unmaximizes the window. Note, this "
@@ -10774,9 +10404,6 @@ msgstr ""
 
 #: ../mail/evolution-mail.schemas.in.h:92
 #, fuzzy
-#| msgid ""
-#| "Initial width of the \"Send and Receive Mail\" window. The value updates "
-#| "as the user resizes the window horizontally."
 msgid ""
 "Initial width of the \"Filter Editor\" window. The value updates as the user "
 "resizes the window horizontally."
@@ -10786,9 +10413,6 @@ msgstr ""
 
 #: ../mail/evolution-mail.schemas.in.h:93
 #, fuzzy
-#| msgid ""
-#| "Initial width of the \"Send and Receive Mail\" window. The value updates "
-#| "as the user resizes the window horizontally."
 msgid ""
 "Initial width of the \"Folder Subscriptions\" window. The value updates as "
 "the user resizes the window horizontally."
@@ -10798,9 +10422,6 @@ msgstr ""
 
 #: ../mail/evolution-mail.schemas.in.h:94
 #, fuzzy
-#| msgid ""
-#| "Initial width of the \"Send and Receive Mail\" window. The value updates "
-#| "as the user resizes the window horizontally."
 msgid ""
 "Initial width of the \"Search Folder Editor\" window. The value updates as "
 "the user resizes the window horizontally."
@@ -10836,10 +10457,6 @@ msgstr ""
 
 #: ../mail/evolution-mail.schemas.in.h:98
 #, fuzzy
-#| 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 the search results."
 msgid ""
 "It disables/enables the repeated prompts to warn that you are sending a "
 "private reply to a message which arrived via a mailing list."
@@ -10850,9 +10467,6 @@ msgstr ""
 
 #: ../mail/evolution-mail.schemas.in.h:99
 #, fuzzy
-#| msgid ""
-#| "It disables/enables the repeated prompts to ask if offline sync is "
-#| "required before going into offline mode."
 msgid ""
 "It disables/enables the repeated prompts to warn that you are sending a "
 "reply to many people."
@@ -10869,10 +10483,6 @@ msgstr ""
 
 #: ../mail/evolution-mail.schemas.in.h:101
 #, fuzzy
-#| 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 the search results."
 msgid ""
 "It disables/enables the repeated prompts to warn that you are trying to send "
 "a message to recipients not entered as mail addresses"
@@ -10883,18 +10493,15 @@ msgstr ""
 
 #: ../mail/evolution-mail.schemas.in.h:102
 #, fuzzy
-#| msgid "Last time empty junk was run"
 msgid "Last time Empty Junk was run"
 msgstr "àààààà àààà ààààà àààà ààà ààààààà àààà"
 
 #: ../mail/evolution-mail.schemas.in.h:103
 #, fuzzy
-#| msgid "Last time empty trash was run"
 msgid "Last time Empty Trash was run"
 msgstr "àààààà àààà àààà àààààààà àààà ààà"
 
 #: ../mail/evolution-mail.schemas.in.h:104
-#| msgid "Lay_out"
 msgid "Layout style"
 msgstr "ààààà àààà"
 
@@ -10978,7 +10585,6 @@ msgid "Logfile to log filter actions."
 msgstr "àààààà ààààààààà ààà àààààà ààà àààà."
 
 #: ../mail/evolution-mail.schemas.in.h:121
-#| msgid "Uniform row height"
 msgid "Mail browser height"
 msgstr "àààà ààààààà ààààà"
 
@@ -10987,7 +10593,6 @@ msgid "Mail browser maximized"
 msgstr ""
 
 #: ../mail/evolution-mail.schemas.in.h:123
-#| msgid "Email begins with"
 msgid "Mail browser width"
 msgstr "àààà ààààààà àààààà"
 
@@ -11036,7 +10641,6 @@ msgid "Number of addresses to display in TO/CC/BCC"
 msgstr "TO/CC/BCC ààà àààààààà àààààà ààààààààà àààààà"
 
 #: ../mail/evolution-mail.schemas.in.h:135
-#| msgid "-----Original Message-----"
 msgid "Original message."
 msgstr "ààà àààààà."
 
@@ -11063,8 +10667,10 @@ msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr "àààààà àà àààà àààà àààààààà ààààààà àààà ààà àààà ààààà àààààà àààààààààààà àààà àà."
 
 #: ../mail/evolution-mail.schemas.in.h:141
-msgid "Prompt the user when he or she tries to send a message without a Subject."
-msgstr "àààààà àà àààà àààà àààà ààà àààààà àààààààà ààààààà ààà àà àààààà àààààààààààà àààà àà."
+msgid ""
+"Prompt the user when he or she tries to send a message without a Subject."
+msgstr ""
+"àààààà àà àààà àààà àààà ààà àààààà àààààààà ààààààà ààà àà àààààà àààààààààààà àààà àà."
 
 #: ../mail/evolution-mail.schemas.in.h:142
 msgid "Prompt when deleting messages in search folder"
@@ -11072,19 +10678,16 @@ msgstr "àààààà ààà ààààààààààà ààà
 
 #: ../mail/evolution-mail.schemas.in.h:143
 #, fuzzy
-#| msgid "Prompt while marking multiple messages"
 msgid "Prompt when mailing list hijacks private replies"
 msgstr "ààààà ààààààààà ààààààà àààà àààà ààààààààà ààà"
 
 #: ../mail/evolution-mail.schemas.in.h:144
 #, fuzzy
-#| msgid "Prompt while marking multiple messages"
 msgid "Prompt when replying privately to list messages"
 msgstr "ààààà ààààààààà ààààààà àààà àààà ààààààààà ààà"
 
 #: ../mail/evolution-mail.schemas.in.h:145
 #, fuzzy
-#| msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgid "Prompt when replying to many recipients"
 msgstr "àààààà ààààààà ààà àà ààà àààà àààààà ààààà àààààà àààà"
 
@@ -11197,13 +10800,11 @@ msgid "Show Animations"
 msgstr "ààààààà ààààà"
 
 #: ../mail/evolution-mail.schemas.in.h:171
-#| msgid "Collapse all message threads"
 msgid "Show all message headers"
 msgstr "ààà àààààà ààààààà ààààà"
 
 #: ../mail/evolution-mail.schemas.in.h:172
 #, fuzzy
-#| msgid "Show \"Reply To\" field when sending a mail message"
 msgid "Show all the headers when viewing a messages."
 msgstr "àààààà ààààààà ààààà ààààà ààà àààààà \"Reply To\" ààààààààà ààààà"
 
@@ -11321,14 +10922,14 @@ msgstr "ààààà ààà àààà àààààà àààà
 
 #: ../mail/evolution-mail.schemas.in.h:193
 #, fuzzy
-#| msgid "The last time empty junk was run, in days since the epoch."
-msgid "The last time Empty Junk was run, in days since January 1st, 1970 (Epoch)."
+msgid ""
+"The last time Empty Junk was run, in days since January 1st, 1970 (Epoch)."
 msgstr "àààààà àààà ààààà àààà ààà ààààààà àààà, àààààà àààààààà."
 
 #: ../mail/evolution-mail.schemas.in.h:194
 #, fuzzy
-#| msgid "The last time empty trash was run, in days since the epoch."
-msgid "The last time Empty Trash was run, in days since January 1st, 1970 (Epoch)."
+msgid ""
+"The last time Empty Trash was run, in days since January 1st, 1970 (Epoch)."
 msgstr "àààààà àààà àààà àààààààà àààà ààà, àààààààà àààààà."
 
 #: ../mail/evolution-mail.schemas.in.h:195
@@ -11375,9 +10976,6 @@ msgstr ""
 
 #: ../mail/evolution-mail.schemas.in.h:202
 #, fuzzy
-#| 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 in terms of KB."
 msgid ""
 "This decides the max size of the message text that will be displayed under "
 "Evolution, specified in terms of KB. The default is 4096 (4MB). This value "
@@ -11438,9 +11036,6 @@ msgstr ""
 
 #: ../mail/evolution-mail.schemas.in.h:209
 #, fuzzy
-#| msgid ""
-#| "This setting specifies whether the threads should be in expanded or "
-#| "collapsed state by default. Evolution requires a restart."
 msgid ""
 "This setting specifies whether the threads should be in expanded or "
 "collapsed state by default. Requires a restart to apply."
@@ -11585,7 +11180,7 @@ msgid "Importing Elm data"
 msgstr "Elm àààààà àààà ààà ààààà ààà"
 
 #: ../mail/importers/elm-importer.c:339 ../mail/importers/pine-importer.c:415
-#: ../modules/mail/e-mail-shell-view.c:1046
+#: ../modules/mail/e-mail-shell-view.c:1044
 #: ../plugins/groupwise-features/proxy-add-dialog.ui.h:5
 #: ../widgets/misc/e-send-options.c:500
 msgid "Mail"
@@ -11602,7 +11197,6 @@ msgstr "Elm ààààà àààà àààà ààà."
 #: ../mail/importers/evolution-mbox-importer.c:127
 #: ../plugins/dbx-import/dbx-importer.c:227
 #, fuzzy
-#| msgid "Destination folder:"
 msgid "_Destination folder:"
 msgstr "ààààà àààààààà àààààà:"
 
@@ -11619,13 +11213,11 @@ msgid "Select folder to import into"
 msgstr "ààà àààà àààà ààààààà àààààà àààà ààà"
 
 #: ../mail/importers/evolution-mbox-importer.c:403
-#| msgid "Subject"
 msgctxt "mboxImp"
 msgid "Subject"
 msgstr "àààà"
 
 #: ../mail/importers/evolution-mbox-importer.c:408
-#| msgid "From"
 msgctxt "mboxImp"
 msgid "From"
 msgstr "ààààà"
@@ -11649,7 +11241,6 @@ msgstr "ààààààààà àààà ààà ààààà à
 #: ../plugins/pst-import/pst-importer.c:482
 #: ../plugins/pst-import/pst-importer.c:591
 #, c-format
-#| msgid "Importing `%s'"
 msgid "Importing '%s'"
 msgstr "'%s' àààà ààà ààààà ààà"
 
@@ -11780,13 +11371,11 @@ msgstr "àààà àààà àààààààààààà ààà
 
 #: ../mail/mail-config.ui.h:19
 #, fuzzy
-#| msgid "Check for _new messages every"
 msgid "Check for new _messages on start"
 msgstr "à ààà ààà ààààààà àààà ààààà (_n)"
 
 #: ../mail/mail-config.ui.h:20
 #, fuzzy
-#| msgid "Check for _new messages every"
 msgid "Check for new messa_ges in all active accounts"
 msgstr "à ààà ààà ààààààà àààà ààààà (_n)"
 
@@ -11812,7 +11401,6 @@ msgstr "àààà ààààààààà ààààà ààààà
 
 #: ../mail/mail-config.ui.h:26
 #, fuzzy
-#| msgid "Compose Message"
 msgid "Composing Messages"
 msgstr "àààààà ààààà"
 
@@ -11827,7 +11415,6 @@ msgstr "àààààààà àààààààààà ààà àà
 
 #: ../mail/mail-config.ui.h:29
 #, fuzzy
-#| msgid "Configuration"
 msgid "Confirmations"
 msgstr "àààààààààà"
 
@@ -11838,7 +11425,6 @@ msgid "Date/Time Format"
 msgstr "ààààà/ààà àààààà"
 
 #: ../mail/mail-config.ui.h:32
-#| msgid "Default Priority:"
 msgid "Default Behavior"
 msgstr "ààà ààààà"
 
@@ -11847,7 +11433,6 @@ msgid "Default character e_ncoding:"
 msgstr "àààààààà àààààà àààààààààààà (_n):"
 
 #: ../mail/mail-config.ui.h:34
-#| msgid "Delete"
 msgid "Delete Mail"
 msgstr "àààà àààà àààà"
 
@@ -11860,17 +11445,16 @@ msgid "Digitally sign o_utgoing messages (by default)"
 msgstr "àààà ààà ààààààààà àààààà àààà ààà ààà (àààààà àààà) (_u)"
 
 #: ../mail/mail-config.ui.h:38
-#| msgid "All Message _Headers"
 msgid "Displayed Message Headers"
 msgstr "àààààààà àààààà ààààà"
 
 #: ../mail/mail-config.ui.h:39
 msgid "Do not mar_k messages as junk if sender is in my address book"
-msgstr "àà ààààààà àààà àààààà ààààààààààà ààà àà ààààààààà ààààà ààààà ààààààà àààà àààà (_k)"
+msgstr ""
+"àà ààààààà àààà àààààà ààààààààààà ààà àà ààààààààà ààààà ààààà ààààààà àààà àààà (_k)"
 
 #: ../mail/mail-config.ui.h:40
 #, fuzzy
-#| msgid "Do not delete"
 msgid "Do not quote"
 msgstr "àààà àààà"
 
@@ -11900,7 +11484,6 @@ msgstr "àààà ààààààà àààààààààà àà
 
 #: ../mail/mail-config.ui.h:48
 #, fuzzy
-#| msgid "Fix_ed width Font:"
 msgid "Fix_ed Width Font:"
 msgstr "àààààà àààààà ààààà (_e):"
 
@@ -11938,7 +11521,6 @@ msgstr ""
 
 #: ../mail/mail-config.ui.h:58
 #, fuzzy
-#| msgid "_Inline"
 msgid "Inline"
 msgstr "àààààà àààà (_I)"
 
@@ -11955,7 +11537,6 @@ msgid "Languages Table"
 msgstr "àààààààà àààààà"
 
 #: ../mail/mail-config.ui.h:63
-#| msgid "_Load Images"
 msgid "Loading Images"
 msgstr "ààààààà àààà ààààà àà"
 
@@ -11969,13 +11550,11 @@ msgstr "ààààààààà ààààà"
 
 #: ../mail/mail-config.ui.h:66
 #, fuzzy
-#| msgid "Messages"
 msgid "Message Display"
 msgstr "ààààààà"
 
 #: ../mail/mail-config.ui.h:67
 #, fuzzy
-#| msgid "Message Retract"
 msgid "Message Receipts"
 msgstr "àààààà àààà àààààà"
 
@@ -11989,7 +11568,6 @@ msgstr "àààààà ààààààààà ààà àà àà
 
 #: ../mail/mail-config.ui.h:71
 #: ../plugins/publish-calendar/publish-calendar.ui.h:10
-#| msgid "Personal Information"
 msgid "Optional Information"
 msgstr "àààààààà ààààààà"
 
@@ -12015,18 +11593,15 @@ msgid "Port:"
 msgstr "ààààà:"
 
 #: ../mail/mail-config.ui.h:78
-#| msgid "<span weight=\"bold\">Pretty Good Privacy (PGP/GPG)</span>"
 msgid "Pretty Good Privacy (PGP/GPG)"
 msgstr "Pretty Good Privacy (PGP/GPG)"
 
 #: ../mail/mail-config.ui.h:80
-#| msgid "Junk Settings"
 msgid "Proxy Settings"
 msgstr "àààààààà ààààààà"
 
 #: ../mail/mail-config.ui.h:81
 #, fuzzy
-#| msgid "_Quoted"
 msgid "Quoted"
 msgstr "àààààà (_Q)"
 
@@ -12044,12 +11619,10 @@ msgstr "ààààààà ààà àààà (_p)"
 
 #: ../mail/mail-config.ui.h:85
 #, fuzzy
-#| msgid "Replies and parents"
 msgid "Replies and Forwards"
 msgstr "àààà ààààà ààà ààààà"
 
 #: ../mail/mail-config.ui.h:86
-#| msgid "Server Information"
 msgid "Required Information"
 msgstr "ààààà ààààààà"
 
@@ -12071,7 +11644,6 @@ msgstr "SHA512"
 
 #: ../mail/mail-config.ui.h:92
 #, fuzzy
-#| msgid "<b>SSL is not supported in this build of Evolution</b>"
 msgid "SSL is not supported in this build of Evolution"
 msgstr "<b>SSL à Evolution àà à àààààààààà ààààààà ààà</b>"
 
@@ -12105,14 +11677,12 @@ msgstr "HTML àààà àààààà ààààà àààà àà
 
 #: ../mail/mail-config.ui.h:101
 #, fuzzy
-#| msgid "<b>Sender Photograph</b>"
 msgid "Sender Photograph"
 msgstr "<b>ààààààà ààààààààà</b>"
 
 #. This is in the context of: Ask for confirmation before...
 #: ../mail/mail-config.ui.h:103
 #, fuzzy
-#| msgid "Compose a reply to the mailing list of the selected message"
 msgid "Sending a _private reply to a mailing list message"
 msgstr "àààà àààà àààààà àààà ààààààà àààààà àààà àààà àààààà ààà"
 
@@ -12124,14 +11694,12 @@ msgstr ""
 #. This is in the context of: Ask for confirmation before...
 #: ../mail/mail-config.ui.h:107
 #, fuzzy
-#| msgid "_Prompt when sending messages with an empty subject line"
 msgid "Sending a message with an _empty subject line"
 msgstr "àààààà àààààà àààà ààààà àààà ààààà ààààà ààà àààààà àààà (_P)"
 
 #. This is in the context of: Ask for confirmation before...
 #: ../mail/mail-config.ui.h:109
 #, fuzzy
-#| msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgid "Sending a message with only _Bcc recipients defined"
 msgstr "àààààà ààààààà ààà àà ààà àààà àààààà ààààà àààààà àààà"
 
@@ -12149,7 +11717,6 @@ msgid "Ser_ver requires authentication"
 msgstr "ààààààà àààààààààà ààààà àà (_v)"
 
 #: ../mail/mail-config.ui.h:114
-#| msgid "Server Information"
 msgid "Server Configuration"
 msgstr "ààààà àààààààààà"
 
@@ -12159,12 +11726,10 @@ msgstr "ààààààà àààààà (_T):"
 
 #: ../mail/mail-config.ui.h:116
 #, fuzzy
-#| msgid "Sig_ning certificate:"
 msgid "Si_gning algorithm:"
 msgstr "ààà ààààààà àààààààààà (_n):"
 
 #: ../mail/mail-config.ui.h:117
-#| msgid "Signatures"
 msgid "Sig_natures"
 msgstr "àààà (_n)"
 
@@ -12182,12 +11747,10 @@ msgstr "àààà"
 
 #: ../mail/mail-config.ui.h:121
 #, fuzzy
-#| msgid "Sig_ning certificate:"
 msgid "Signing _algorithm:"
 msgstr "ààà ààààààà àààààààààà (_n):"
 
 #: ../mail/mail-config.ui.h:122
-#| msgid "Local Folders"
 msgid "Special Folders"
 msgstr "ààààààà ààààààà"
 
@@ -12200,7 +11763,6 @@ msgid "Start _typing at the bottom on replying"
 msgstr "ààààààààààà àààà àààà ààààà ààààààà ààà ààà (_t)"
 
 #: ../mail/mail-config.ui.h:125
-#| msgid "Start: "
 msgid "Start up"
 msgstr "ààààà"
 
@@ -12218,9 +11780,6 @@ msgstr ""
 
 #: ../mail/mail-config.ui.h:129
 #, fuzzy
-#| msgid ""
-#| "The output of this script will be used as your\n"
-#| "signature. The name you specify will be used for display purposes only."
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
@@ -12252,7 +11811,6 @@ msgid "Use Authe_ntication"
 msgstr "àààààààààà ààààà (_n)"
 
 #: ../mail/mail-config.ui.h:137
-#| msgid "User_name:"
 msgid "User _Name:"
 msgstr "àààààààààà ààà (_N):"
 
@@ -12286,24 +11844,20 @@ msgstr "ààà àààààààà àààà (_F):"
 
 #: ../mail/mail-config.ui.h:145
 #, fuzzy
-#| msgid "Current Folder"
 msgid "_Junk Folder:"
 msgstr "ààààààà àààààà"
 
 #: ../mail/mail-config.ui.h:146
 #, fuzzy
-#| msgid "_Keep Signature above the original message on replying"
 msgid "_Keep signature above the original message on replying"
 msgstr "ààààààààààà àààà àà ààà àààààà ààà ààà àààà (_K)"
 
 #: ../mail/mail-config.ui.h:147
-#| msgid "Language"
 msgid "_Languages"
 msgstr "ààààà (_L)"
 
 #: ../mail/mail-config.ui.h:148
 #, fuzzy
-#| msgid "_Load images in messages from contacts"
 msgid "_Load images only in messages from contacts"
 msgstr "àààààààààààà àààààààààà àààààà àààà (_L)"
 
@@ -12350,7 +11904,6 @@ msgstr "ààààà (_S):"
 
 #. If enabled, show animation; if disabled, only display a static image without any animation
 #: ../mail/mail-config.ui.h:162
-#| msgid "Show animated images as animations."
 msgid "_Show animated images"
 msgstr "ààààààà àààà ààààààà ààààà (_S)"
 
@@ -12359,7 +11912,6 @@ msgid "_Show the photograph of sender in the message preview"
 msgstr "àààààà ààààààààààààà ààààààààà ààààààààà ààààà (_S)"
 
 #: ../mail/mail-config.ui.h:164
-#| msgid "Drafts _Folder:"
 msgid "_Trash Folder:"
 msgstr "àààààààà àààààà (_T)"
 
@@ -12376,12 +11928,10 @@ msgid "_Use the same fonts as other applications"
 msgstr "àààà ààààààààààààà ààà àààà ààààà ààààà (_U)"
 
 #: ../mail/mail-config.ui.h:168 ../smime/gui/smime-ui.ui.h:48
-#| msgid "am"
 msgid "a"
 msgstr "a"
 
 #: ../mail/mail-config.ui.h:169 ../smime/gui/smime-ui.ui.h:49
-#| msgid "by"
 msgid "b"
 msgstr "b"
 
@@ -12415,7 +11965,6 @@ msgstr "àààààà (_m)"
 
 #: ../mail/mail-dialogs.ui.h:6
 #, fuzzy
-#| msgid "Edit Signature"
 msgid "Digital Signature"
 msgstr "àààààà àààààà ààà"
 
@@ -12424,7 +11973,6 @@ msgid "Do Not Forward"
 msgstr "ààà ààààà àààà"
 
 #: ../mail/mail-dialogs.ui.h:8
-#| msgid "Encrypt"
 msgid "Encryption"
 msgstr "àààààààààà"
 
@@ -12457,7 +12005,6 @@ msgid "Review"
 msgstr "àààààààà ààà"
 
 #: ../mail/mail-dialogs.ui.h:19
-#| msgid "Search Folder source"
 msgid "Search Folder Sources"
 msgstr "ààà àààààà àààààààà"
 
@@ -12526,19 +12073,16 @@ msgstr "ààààà."
 
 #: ../mail/mail-ops.c:941
 #, c-format
-#| msgid "Moving messages to %s"
 msgid "Moving messages to '%s'"
 msgstr "'%s' ààà ààààààààà ààààà ààààà àà"
 
 #: ../mail/mail-ops.c:941
 #, c-format
-#| msgid "Copying messages to %s"
 msgid "Copying messages to '%s'"
 msgstr "'%s' ààà ààààààààà ààà ààà ààààà àà"
 
 #: ../mail/mail-ops.c:1062
 #, c-format
-#| msgid "Scanning folders in \"%s\""
 msgid "Scanning folders in '%s'"
 msgstr "'%s' ààà àààààààààà ààààà ààà ààààà àà"
 
@@ -12548,106 +12092,95 @@ msgstr "ààà àààààààà ààààààà"
 
 #: ../mail/mail-ops.c:1295
 #, fuzzy, c-format
-#| msgid "Retrieving quota information for folder %s"
 msgid "Retrieving quota information for folder '%s'"
 msgstr "àààààà %s àààà àààààà ààààààà àà ààààà ààààà àà"
 
 #: ../mail/mail-ops.c:1370
 #, c-format
-#| msgid "Opening store %s"
 msgid "Opening store '%s'"
 msgstr "ààààà '%s' àààà ààààà ààà"
 
 #: ../mail/mail-ops.c:1446
 #, c-format
-#| msgid "Removing folder %s"
 msgid "Removing folder '%s'"
 msgstr "àààààà '%s' àà ààà ààà ààààà àà"
 
-#: ../mail/mail-ops.c:1585
+#: ../mail/mail-ops.c:1609
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "àààààà '%s' ààààààà ààààà ààà"
 
-#: ../mail/mail-ops.c:1654
+#: ../mail/mail-ops.c:1678
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr "ààààà '%s' àààààààààà ààà ààà ààààà ààà ààà ààààààà ààààà ààà"
 
-#: ../mail/mail-ops.c:1655
+#: ../mail/mail-ops.c:1679
 #, c-format
 msgid "Storing account '%s'"
 msgstr "àààà '%s' ààààààà ààààà ààà"
 
-#: ../mail/mail-ops.c:1713
+#: ../mail/mail-ops.c:1737
 #, c-format
-#| msgid "Refreshing folder"
 msgid "Refreshing folder '%s'"
 msgstr "àààààà '%s' àà ààà:àààà ààà ààààà àà"
 
-#: ../mail/mail-ops.c:1877
+#: ../mail/mail-ops.c:1901
 #, fuzzy, c-format
-#| msgid "Expunging folder"
 msgid "Expunging folder '%s'"
 msgstr "àààààà àààààààààà ààà ààà ààààà ààà"
 
-#: ../mail/mail-ops.c:1949
+#: ../mail/mail-ops.c:1973
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "àààààààààà '%s' ààà àààà ààà ààààà ààà"
 
-#: ../mail/mail-ops.c:1950
+#: ../mail/mail-ops.c:1974
 msgid "Local Folders"
 msgstr "ààààààà ààààààà"
 
-#: ../mail/mail-ops.c:2123
+#: ../mail/mail-ops.c:2147
 #, c-format
 msgid "Retrieving %d message"
 msgid_plural "Retrieving %d messages"
 msgstr[0] "%d àààààà ààààà ààààà ààà"
 msgstr[1] "%d ààààààà ààààà ààààà ààà"
 
-#: ../mail/mail-ops.c:2216
+#: ../mail/mail-ops.c:2240
 #, c-format
 msgid "Saving %d message"
 msgid_plural "Saving %d messages"
 msgstr[0] "%d àààààààà àààààà ààà ààààà ààà"
 msgstr[1] "%d ààààààà ààààààà ààààà ààà"
 
-#: ../mail/mail-ops.c:2312
+#: ../mail/mail-ops.c:2336
 #, fuzzy, c-format
-#| msgid ""
-#| "Error saving messages to: %s:\n"
-#| " %s"
 msgid "Error saving messages to: %s:\n"
 msgstr ""
 "ààà ààààààà àààààààà àààà ààà: %s:\n"
 " %s"
 
-#: ../mail/mail-ops.c:2387
+#: ../mail/mail-ops.c:2411
 #, c-format
 msgid "Preparing account '%s' for offline"
 msgstr "àààààà àààà ààààà '%s' ààààà ààà ààààà ààà"
 
-#: ../mail/mail-ops.c:2478
+#: ../mail/mail-ops.c:2502
 msgid "Checking Service"
 msgstr "àààà ààààà ààààà ààà"
 
-#: ../mail/mail-ops.c:2558
+#: ../mail/mail-ops.c:2582
 #, c-format
-#| msgid "Disconnecting from %s"
 msgid "Disconnecting %s"
 msgstr "%s ààààà àààààà àààà ààààà ààà"
 
-#: ../mail/mail-ops.c:2615
+#: ../mail/mail-ops.c:2639
 #, c-format
-#| msgid "Saving attachment"
 msgid "Removing attachments"
 msgstr "àààààààà ààà ààà ààààà àà"
 
-#: ../mail/mail-ops.c:2662
+#: ../mail/mail-ops.c:2686
 #, fuzzy, c-format
-#| msgid "All accounts have been removed."
 msgid "File \"%s\" has been removed."
 msgstr "ààà ààààà àààà ààààààà àà."
 
@@ -12678,13 +12211,11 @@ msgstr "ààà àààà àààà ààààà ààààà à
 
 #: ../mail/mail-tools.c:69
 #, fuzzy, c-format
-#| msgid "Could not create spool directory `%s': %s"
 msgid "Could not create spool directory '%s': %s"
 msgstr "ààààà ààààààààà `%s' ààààà ààààà àààà: %s"
 
 #: ../mail/mail-tools.c:102
 #, fuzzy, c-format
-#| msgid "Trying to movemail a non-mbox source `%s'"
 msgid "Trying to movemail a non-mbox source '%s'"
 msgstr "ààààààààà ààààà àà ààà àààà `%s' ààà àààààà àààààààà ààààààà ààà ààààà ààà"
 
@@ -12730,29 +12261,26 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../mail/mail-vfolder.c:1299
+#: ../mail/mail-vfolder.c:1297
 msgid "Edit Search Folder"
 msgstr "ààà ààààààààà àààààà"
 
-#: ../mail/mail-vfolder.c:1413
+#: ../mail/mail-vfolder.c:1408
 msgid "New Search Folder"
 msgstr "àààà ààà àààààà"
 
 #: ../mail/mail.error.xml.h:1
 #, fuzzy
-#| msgid "Check Junk Failed"
 msgid "\"Check Junk\" Failed"
 msgstr "ààà àààààààà àààà ààààà"
 
 #: ../mail/mail.error.xml.h:2
 #, fuzzy
-#| msgid "Report Junk Failed"
 msgid "\"Report Junk\" Failed"
 msgstr "ààà àààààààààà ààààààà ààà"
 
 #: ../mail/mail.error.xml.h:3
 #, fuzzy
-#| msgid "Report Not Junk Failed"
 msgid "\"Report Not Junk\" Failed"
 msgstr "ààààà àààà àààààà àààààà"
 
@@ -12805,8 +12333,10 @@ msgid "Are you sure you want to delete this account?"
 msgstr "ààà ààà ààààà à ààààà àààà àààààà ààààà àà?"
 
 #: ../mail/mail.error.xml.h:14
-msgid "Are you sure you want to disable this account and delete all its proxies?"
-msgstr "ààà ààà ààààà à ààààà ààààààààà àààà ààààà àà ààà àààà ààà ààààààààà àààà àààààà ààààà àà?"
+msgid ""
+"Are you sure you want to disable this account and delete all its proxies?"
+msgstr ""
+"ààà ààà ààààà à ààààà ààààààààà àààà ààààà àà ààà àààà ààà ààààààààà àààà àààààà ààààà àà?"
 
 #: ../mail/mail.error.xml.h:15
 msgid ""
@@ -12818,7 +12348,8 @@ msgstr "ààà ààà ààà àààà àààààààà à
 msgid ""
 "Are you sure you want to permanently remove all the deleted messages in "
 "folder \"{0}\"?"
-msgstr "ààà ààà ààà àààà àààààààà ààààààààà ààà àààààà \"{0}\" ààààà ààààà àààà ààà àààà ààààà àà?"
+msgstr ""
+"ààà ààà ààà àààà àààààààà ààààààààà ààà àààààà \"{0}\" ààààà ààààà àààà ààà àààà ààààà àà?"
 
 #: ../mail/mail.error.xml.h:17
 msgid "Are you sure you want to send a message in HTML format?"
@@ -12826,19 +12357,20 @@ msgstr "ààà ààà ààààà àààààààà HTML àà
 
 #: ../mail/mail.error.xml.h:18
 #, fuzzy
-#| msgid "Are you sure you want to send a message with only BCC recipients?"
 msgid "Are you sure you want to send a message with invalid address?"
-msgstr "ààà ààà àààààà àà àà ààà ààààà ààà àààà ààà àà àààààààà àààà à àààààà àààààà ààààà àà?"
+msgstr ""
+"ààà ààà àààààà àà àà ààà ààààà ààà àààà ààà àà àààààààà àààà à àààààà àààààà ààààà àà?"
 
 #: ../mail/mail.error.xml.h:19
 #, fuzzy
-#| msgid "Are you sure you want to send a message with only BCC recipients?"
 msgid "Are you sure you want to send a message with invalid addresses?"
-msgstr "ààà ààà àààààà àà àà ààà ààààà ààà àààà ààà àà àààààààà àààà à àààààà àààààà ààààà àà?"
+msgstr ""
+"ààà ààà àààààà àà àà ààà ààààà ààà àààà ààà àà àààààààà àààà à àààààà àààààà ààààà àà?"
 
 #: ../mail/mail.error.xml.h:20
 msgid "Are you sure you want to send a message with only BCC recipients?"
-msgstr "ààà ààà àààààà àà àà ààà ààààà ààà àààà ààà àà àààààààà àààà à àààààà àààààà ààààà àà?"
+msgstr ""
+"ààà ààà àààààà àà àà ààà ààààà ààà àààà ààà àà àààààààà àààà à àààààà àààààà ààààà àà?"
 
 #: ../mail/mail.error.xml.h:21
 msgid "Are you sure you want to send a message without a subject?"
@@ -12885,7 +12417,6 @@ msgid "Cannot move folder \"{0}\" to \"{1}\"."
 msgstr "àààààà \"{0}\" àà \"{1}\" ààà ààààà àààà ààà."
 
 #: ../mail/mail.error.xml.h:32
-#| msgid "Cannot open source \"{1}\""
 msgid "Cannot open source \"{1}\"."
 msgstr "\"{1}\" àà ààà ààààà ààà àààà ààà."
 
@@ -12938,7 +12469,6 @@ msgstr ""
 "àààààààà ààà ààààààà ààààààààà ààà àà; ààààà ààààà ààà àà àààà àààà ààà."
 
 #: ../mail/mail.error.xml.h:43
-#| msgid "Close this window"
 msgid "Close message window."
 msgstr "àààààà àààààààà ààà ààà."
 
@@ -12951,17 +12481,14 @@ msgid "Delete messages in Search Folder \"{0}\"?"
 msgstr "ààà ààà àààààà \"{0}\" ààààà ààààààà àààà àààààà àà?"
 
 #: ../mail/mail.error.xml.h:47
-#| msgid "Do not disable"
 msgid "Do _Not Disable"
 msgstr "ààààààààà ààà àààà (_N)"
 
 #: ../mail/mail.error.xml.h:48
-#| msgid "Do _not Send"
 msgid "Do _Not Send"
 msgstr "ààààà àààà (_N)"
 
 #: ../mail/mail.error.xml.h:49
-#| msgid "_Do not Synchronize"
 msgid "Do _Not Synchronize"
 msgstr "ààààà àààà àààà (_N)"
 
@@ -13015,7 +12542,6 @@ msgstr ""
 
 #: ../mail/mail.error.xml.h:64
 #, fuzzy
-#| msgid "Really unsubscribe from folder \"%s\"?"
 msgid "Failed to unsubscribe from folder."
 msgstr "ààà ààààà àààààà \"%s\" ààààà àààààààà ààà àààà àà?"
 
@@ -13030,7 +12556,6 @@ msgstr "àààà àààà àà, ààààà àà ààààà
 #. Translators: {0} is replaced with a folder name
 #: ../mail/mail.error.xml.h:68
 #, fuzzy
-#| msgid "The attachment does not contain a valid calendar message"
 msgid "Folder '{0}' doesn't contain any duplicate message."
 msgstr "ààààà à ààààà àààààààà àààààà ààààààà ààà"
 
@@ -13040,9 +12565,6 @@ msgstr "àà ààà àààà àààà, àà ààà à àà
 
 #: ../mail/mail.error.xml.h:70
 #, fuzzy
-#| msgid ""
-#| "If you delete the folder, all of its contents and its subfolders contents "
-#| "will be deleted permanently."
 msgid ""
 "If you delete the folder, all of its contents and its subfolders' contents "
 "will be deleted permanently."
@@ -13052,10 +12574,8 @@ msgstr ""
 
 #: ../mail/mail.error.xml.h:71
 #, fuzzy
-#| msgid ""
-#| "If you delete the folder, all of its contents and its subfolders contents "
-#| "will be deleted permanently."
-msgid "If you delete the folder, all of its contents will be deleted permanently."
+msgid ""
+"If you delete the folder, all of its contents will be deleted permanently."
 msgstr ""
 "àà ààà àààààà àààà ààààà, àà àààà ààà ààààààààà ààà àààà àààààààààà ààààààààà ààààà "
 "àààà àààà àààààà."
@@ -13080,7 +12600,8 @@ msgstr "àà ààà ààààààààà ààà, àà ààà
 msgid ""
 "If you quit, these messages will not be sent until Evolution is started "
 "again."
-msgstr "àà ààà àààà ààààà, à ààààààà ààààà àààà Evolution ààà ààà àààà ààààà àààà ààààààà àààà."
+msgstr ""
+"àà ààà àààà ààààà, à ààààààà ààààà àààà Evolution ààà ààà àààà ààààà àààà ààààààà àààà."
 
 #: ../mail/mail.error.xml.h:77
 msgid "Ignore"
@@ -13114,13 +12635,11 @@ msgid "Missing folder."
 msgstr "ààààààà àààààà."
 
 #: ../mail/mail.error.xml.h:84
-#| msgid "Never"
 msgid "N_ever"
 msgstr "ààààààà ààà (_e)"
 
 #: ../mail/mail.error.xml.h:85
 #, fuzzy
-#| msgid "Unfinished messages found"
 msgid "No duplicate messages found."
 msgstr "àààààà àààààà ààààà ààà"
 
@@ -13183,19 +12702,16 @@ msgstr "ààà ààààà àààààà \"{0}\" ààà ààà
 
 #: ../mail/mail.error.xml.h:99
 #, fuzzy
-#| msgid "Cannot delete folder \"{0}\"."
 msgid "Really delete folder \"{0}\"?"
 msgstr "àààààà \"{0}\" àààà àààà ààà."
 
 #: ../mail/mail.error.xml.h:100
 #, fuzzy
-#| msgid "Remove the delegate %s?"
 msgid "Remove duplicate messages?"
 msgstr "ààà ààààààààà %s ààà àààà àà?"
 
 #: ../mail/mail.error.xml.h:101
 #, fuzzy
-#| msgid "_Private"
 msgid "Reply _Privately"
 msgstr "ààààà (_P)"
 
@@ -13209,7 +12725,6 @@ msgstr ""
 
 #: ../mail/mail.error.xml.h:106
 #, fuzzy
-#| msgid "Sender or Recipients"
 msgid "Send reply to all recipients?"
 msgstr "ààààààà àààà ààààà"
 
@@ -13272,10 +12787,12 @@ msgstr ""
 msgid ""
 "This message cannot be sent because the account you chose to send with is "
 "not enabled"
-msgstr "àààààà ààààà ààààà ààà àààà àà àààà àààààà ààààààà ààààà àààà ààà àà àààààà àààà ààà"
+msgstr ""
+"àààààà ààààà ààààà ààà àààà àà àààà àààààà ààààààà ààààà àààà ààà àà àààààà àààà ààà"
 
 #: ../mail/mail.error.xml.h:122
-msgid "This message cannot be sent because you have not specified any recipients"
+msgid ""
+"This message cannot be sent because you have not specified any recipients"
 msgstr "à àààààà ààààà ààààà ààà àààà àà ààà ààà àààààààà àààààà ààààà ààà"
 
 #: ../mail/mail.error.xml.h:123
@@ -13298,9 +12815,6 @@ msgstr "à ààà ààààààààà àààààà ààà
 
 #: ../mail/mail.error.xml.h:126
 #, fuzzy
-#| msgid ""
-#| "This will mark all messages as read in the selected folder and its "
-#| "subfolders."
 msgid "This will mark all messages as read in the selected folder."
 msgstr "à ààà ààààààààà àààààà àààààà ààà àààà àààààààààààà ààààààà àà ààààààà àààà."
 
@@ -13339,7 +12853,6 @@ msgstr ""
 "ààà ààà ààààà àààà àààà ààààà àà?"
 
 #: ../mail/mail.error.xml.h:134
-#| msgid "Would you like to accept it?"
 msgid "Would you like to close the message window?"
 msgstr "ààà ààà àààààà àààààààà ààà àààà ààààà àà?"
 
@@ -13359,9 +12872,6 @@ msgstr ""
 
 #: ../mail/mail.error.xml.h:137
 #, fuzzy
-#| msgid ""
-#| "Retracting a message may remove it from the recipient's mailbox. Are you "
-#| "sure you want to do this ?"
 msgid ""
 "You are replying to a message which was sent to many recipients. Are you "
 "sure you want to reply to ALL of them?"
@@ -13408,7 +12918,6 @@ msgid "Your login to your server \"{0}\" as \"{0}\" failed."
 msgstr "ààààà ààààà àààà ààààà àààààà \"{0}\" àà \"{0}\" ààààà àààààà."
 
 #: ../mail/mail.error.xml.h:147
-#| msgid "Always"
 msgid "_Always"
 msgstr "àààààà (_A)"
 
@@ -13432,7 +12941,6 @@ msgid "_Empty Trash"
 msgstr "àààààààà àààà ààà (_E)"
 
 #: ../mail/mail.error.xml.h:152
-#| msgid "Evolution"
 msgid "_Exit Evolution"
 msgstr "Evolution ààààà àààà ààààà (_E)"
 
@@ -13442,12 +12950,10 @@ msgstr "àààààààààà àààà ààààà (_E)"
 
 #: ../mail/mail.error.xml.h:154
 #, fuzzy
-#| msgid "Migration"
 msgid "_Migrate Now"
 msgstr "ààààààààà"
 
 #: ../mail/mail.error.xml.h:155
-#| msgid "No"
 msgid "_No"
 msgstr "àà (_N)"
 
@@ -13456,17 +12962,14 @@ msgid "_Open Messages"
 msgstr "ààààààà àààà (_O)"
 
 #: ../mail/mail.error.xml.h:159
-#| msgid "Send Receipt"
 msgid "_Send Receipt"
 msgstr "àààà ààààà (_S)"
 
 #: ../mail/mail.error.xml.h:160
-#| msgid "Synchronize"
 msgid "_Synchronize"
 msgstr "ààààà ààà (_S)"
 
 #: ../mail/mail.error.xml.h:161
-#| msgid "Yes"
 msgid "_Yes"
 msgstr "ààà (_Y)"
 
@@ -13651,7 +13154,6 @@ msgstr ""
 
 #: ../modules/addressbook/addressbook-config.c:608
 #, fuzzy
-#| msgid "Birthdays & Anniversaries"
 msgid "U_se in Birthday & Anniversaries calendar"
 msgstr "ààààààààà ààà àààààààà"
 
@@ -13721,7 +13223,6 @@ msgstr "ààààà ààààà ààààààà ààà"
 
 #: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:2
 #, fuzzy
-#| msgid "Contact List"
 msgid "Contact layout style"
 msgstr "àààààà àààà"
 
@@ -13731,7 +13232,6 @@ msgstr ""
 
 #: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:4
 #, fuzzy
-#| msgid "Month view vertical pane position"
 msgid "Contact preview pane position (vertical)"
 msgstr "ààà àààààà ààààààààà ààààààà ààààà"
 
@@ -13752,7 +13252,6 @@ msgid "Position of the contact preview pane when oriented vertically."
 msgstr ""
 
 #: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:9
-#| msgid "evolution address book"
 msgid "Primary address book"
 msgstr "àààààààà ààààààà àààààààà"
 
@@ -13805,7 +13304,6 @@ msgstr "ààà àààààààààà àààà àààààà
 #. To Translators: 'Table column' is a label for configurable date/time format for table columns showing a date in message list
 #: ../modules/addressbook/autocompletion-config.c:161
 #: ../modules/mail/em-mailer-prefs.c:1140
-#| msgid "Table column:"
 msgid "_Table column:"
 msgstr "àààààà ààààà (_T):"
 
@@ -13868,7 +13366,6 @@ msgstr "ààààààààààà"
 #. Translators: This is a save dialog title
 #: ../modules/addressbook/e-book-shell-view-actions.c:263
 #: ../modules/addressbook/e-book-shell-view-actions.c:549
-#| msgid "Save as vCard..."
 msgid "Save as vCard"
 msgstr "vCard ààààà ààààààà"
 
@@ -13878,17 +13375,14 @@ msgstr "ààà ààààààààà ààà àààà ààà (
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:682
 #, fuzzy
-#| msgid "Copy the contacts of the selected folder into another folder"
 msgid "Copy the contacts of the selected address book to another"
 msgstr "àààààà àààààààà ààààààààà àààà ààààààààà ààà ààà"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:687
-#| msgid "Del_ete Address Book"
 msgid "D_elete Address Book"
 msgstr "àààààà àààààààà àààà ààààà (_e)"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:689
-#| msgid "Delete the selected folder"
 msgid "Delete the selected address book"
 msgstr "àààà àààà ààààààà àààààààà àààà ààààà"
 
@@ -13898,7 +13392,6 @@ msgstr "ààà ààààààààà àààà ààààà (_v).
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:696
 #, fuzzy
-#| msgid "Move the contacts of the selected folder into another folder"
 msgid "Move the contacts of the selected address book to another"
 msgstr "àààààà àààààààà ààààààààà àààà ààààààààà ààààà"
 
@@ -13912,7 +13405,6 @@ msgstr "àààààà àààààààààà ààààààà
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:710
 #, fuzzy
-#| msgid "Change the properties of the selected folder"
 msgid "Show properties of the selected address book"
 msgstr "àààà àààà àààààààà àààààààà àààà"
 
@@ -13925,35 +13417,29 @@ msgid "_Rename..."
 msgstr "ààà àààà (_R)..."
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:717
-#| msgid "Rename the selected folder"
 msgid "Rename the selected address book"
 msgstr "àààà àààà ààààààà àààààààààà ààà àààà"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:722
-#| msgid "S_ave Address Book As VCard"
 msgid "S_ave Address Book as vCard"
 msgstr "vCard ààààà ààààààà àààààààààà ààààààà (_a)"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:724
 #, fuzzy
-#| msgid "Save the contacts of the selected folder as VCard"
 msgid "Save the contacts of the selected address book as a vCard"
 msgstr "àààà àààà àààààààà ààààààààà VCard ààààà ààààààà"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:731
-#| msgid "Stop Loading"
 msgid "Stop loading"
 msgstr "àààààààà àààààà"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:736
 #, fuzzy
-#| msgid "_Copy Contact to..."
 msgid "_Copy Contact To..."
 msgstr "àààààààà ààà àààà ààà (_C)..."
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:738
 #, fuzzy
-#| msgid "Copy selected contacts to another folder"
 msgid "Copy selected contacts to another address book"
 msgstr "àààà ààààààààà àààà àààà ààààààà àà ààà ààà"
 
@@ -13962,12 +13448,10 @@ msgid "_Delete Contact"
 msgstr "àààààà àààà ààààà (_D)"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:750
-#| msgid "_Forward Contact..."
 msgid "_Find in Contact..."
 msgstr "ààààààààà àààà (_F)..."
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:752
-#| msgid "Search for text in the body of the displayed message"
 msgid "Search for text in the displayed contact"
 msgstr "àààààààà ààààààààà àààà àààà àààà"
 
@@ -13981,12 +13465,10 @@ msgstr "àààà àààààààààà àààà àààà 
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:764
 #, fuzzy
-#| msgid "_Move Contact to..."
 msgid "_Move Contact To..."
 msgstr "ààààààààà àààà ààààà (_M)..."
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:766
-#| msgid "Move selected contacts to another folder"
 msgid "Move selected contacts to another address book"
 msgstr "àààà ààààààà ààààààààààà àààà àààà ààààààààà ààààà"
 
@@ -13999,8 +13481,6 @@ msgid "New Contact _List..."
 msgstr "ààà àààààà àààà (_L)..."
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:785
-#| msgctxt "New"
-#| msgid "_Contact"
 msgid "_Open Contact"
 msgstr "àààààààà àààà (_O)"
 
@@ -14062,7 +13542,6 @@ msgid "_Classic View"
 msgstr "ààààààààà ààààà (_C)"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:881
-#| msgid "Show message preview below the message list"
 msgid "Show contact preview below the contact list"
 msgstr ""
 
@@ -14075,7 +13554,6 @@ msgstr "ààà ààààà (_V)"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:888
 #, fuzzy
-#| msgid "Show contact preview window"
 msgid "Show contact preview alongside the contact list"
 msgstr "àààààà àààààààààà àààààà ààààà"
 
@@ -14103,13 +13581,11 @@ msgid "Advanced Search"
 msgstr "ààààà ààà"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:946
-#| msgid "Print selected contacts"
 msgid "Print all shown contacts"
 msgstr "ààà àààààà ààààààààà àààà"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:953
 #, fuzzy
-#| msgid "Previews the contacts to be printed"
 msgid "Preview the contacts to be printed"
 msgstr "ààààààààà ààààà àààà àààààààààà ààààà àà"
 
@@ -14118,7 +13594,6 @@ msgid "Print selected contacts"
 msgstr "àààà àààà ààààààààà àààà"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:978
-#| msgid "Save selected contacts as a VCard"
 msgid "Save selected contacts as a vCard"
 msgstr "àààà àààà ààààààààà VCard ààààà ààààààà"
 
@@ -14131,17 +13606,14 @@ msgid "_Forward Contact"
 msgstr "àààààà ààà ààààà (_F)"
 
 #: ../modules/addressbook/e-book-shell-view.c:378
-#| msgid "Send _Message to Contacts"
 msgid "_Send Message to Contacts"
 msgstr "ààààààààà àààààà ààààà (_S)"
 
 #: ../modules/addressbook/e-book-shell-view.c:380
-#| msgid "Send _Message to List"
 msgid "_Send Message to List"
 msgstr "àààààà àààààà ààààà (_S)"
 
 #: ../modules/addressbook/e-book-shell-view.c:382
-#| msgid "Send _Message to Contact"
 msgid "_Send Message to Contact"
 msgstr "àààààààà àààààà ààààà (_S)"
 
@@ -14190,7 +13662,6 @@ msgstr "àààààà (_g):"
 
 #. To Translators: This string is part of the search scope configuration, search for text with 'sub' in this file for more detailed explanation.
 #: ../modules/addressbook/ldap-config.ui.h:11
-#| msgid "Online"
 msgid "One"
 msgstr "àà"
 
@@ -14217,7 +13688,6 @@ msgstr ""
 #. To Translators: This string is part of the search scope configuration, search for text with 'sub' in this file for more detailed explanation.
 #: ../modules/addressbook/ldap-config.ui.h:18
 #, fuzzy
-#| msgid "Su"
 msgid "Sub"
 msgstr "ààà"
 
@@ -14226,15 +13696,10 @@ msgid "Supported Search Bases"
 msgstr "ààààààà ààààà ààààà"
 
 #: ../modules/addressbook/ldap-config.ui.h:21
-#| msgid ""
-#| "Anonymously\n"
-#| "Using email address\n"
-#| "Using distinguished name (DN)"
 msgid "Using distinguished name (DN)"
 msgstr "ààà àààààà ààà (DN) ààààà ààààà ààà"
 
 #: ../modules/addressbook/ldap-config.ui.h:22
-#| msgid "Email _Address:"
 msgid "Using email address"
 msgstr "àààà ààààààààà ààààà ààààà àà"
 
@@ -14272,9 +13737,6 @@ msgstr "ààààà"
 
 #: ../modules/calendar/e-calendar-preferences.ui.h:2
 #, fuzzy, no-c-format
-#| msgid ""
-#| "<i>%u and %d will be replaced by user and domain from the email address.</"
-#| "i>"
 msgid "%u and %d will be replaced by user and domain from the email address."
 msgstr "<i>%u ààà %d ààààà ààààààààààà àààààààààà ààà àààààà àààà ààààà ààà.</i>"
 
@@ -14283,32 +13745,26 @@ msgid "(Shown in a Day View)"
 msgstr "(àààà àààààààà àààààà àà)"
 
 #: ../modules/calendar/e-calendar-preferences.ui.h:4
-#| msgid "minutes"
 msgid "05 minutes"
 msgstr "05 àààààà"
 
 #: ../modules/calendar/e-calendar-preferences.ui.h:5
-#| msgid "minutes"
 msgid "10 minutes"
 msgstr "10 àààààà"
 
 #: ../modules/calendar/e-calendar-preferences.ui.h:6
-#| msgid "minutes"
 msgid "15 minutes"
 msgstr "15 àààààà"
 
 #: ../modules/calendar/e-calendar-preferences.ui.h:7
-#| msgid "minutes"
 msgid "30 minutes"
 msgstr "30 àààààà"
 
 #: ../modules/calendar/e-calendar-preferences.ui.h:8
-#| msgid "minutes"
 msgid "60 minutes"
 msgstr "60 àààààà"
 
 #: ../modules/calendar/e-calendar-preferences.ui.h:10
-#| msgid "Alarms"
 msgid "Alerts"
 msgstr "àààààà"
 
@@ -14317,12 +13773,10 @@ msgid "Day _ends:"
 msgstr "àààà ààà ààà àà (_e):"
 
 #: ../modules/calendar/e-calendar-preferences.ui.h:13
-#| msgid "Day"
 msgid "Days"
 msgstr "ààààà"
 
 #: ../modules/calendar/e-calendar-preferences.ui.h:14
-#| msgid "<span weight=\"bold\">Default Free/Busy Server</span>"
 msgid "Default Free/Busy Server"
 msgstr "àààààà ààààà/àààààà ààààà"
 
@@ -14335,13 +13789,10 @@ msgid "Display alarms in _notification area only"
 msgstr "àààà àààà àààààààààà ààààààààà ààààààà (_n)"
 
 #: ../modules/calendar/e-calendar-preferences.ui.h:20
-#| msgid "hours"
-#| msgid_plural "hours"
 msgid "Hours"
 msgstr "ààààà"
 
 #: ../modules/calendar/e-calendar-preferences.ui.h:21
-#| msgid "minutes"
 msgid "Minutes"
 msgstr "àààààà"
 
@@ -14377,7 +13828,6 @@ msgid "Show r_ecurring events in italic in bottom left calendar"
 msgstr ""
 
 #: ../modules/calendar/e-calendar-preferences.ui.h:35
-#| msgid "Show week _numbers in date navigator"
 msgid "Show week _numbers"
 msgstr "àààààààààà ààààààà ààààà (_n)"
 
@@ -14512,19 +13962,16 @@ msgstr ""
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:6
 #, fuzzy
-#| msgid "Birthdays & Anniversaries"
 msgid "Birthday and anniversary reminder"
 msgstr "ààààààààà ààà àààààààà"
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:7
 #, fuzzy
-#| msgid "Birthdays & Anniversaries"
 msgid "Birthday and anniversary reminder units"
 msgstr "ààààààààà ààà àààààààà"
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:8
 #, fuzzy
-#| msgid "Birthdays & Anniversaries"
 msgid "Birthday and anniversary reminder value"
 msgstr "ààààààààà ààà àààààààà"
 
@@ -14533,7 +13980,8 @@ msgid "Calendars to run alarms for"
 msgstr "àà àààà àààààà àààààààà àààààààà"
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:10
-msgid "Color to draw the Marcus Bains Line in the Time bar (empty for default)."
+msgid ""
+"Color to draw the Marcus Bains Line in the Time bar (empty for default)."
 msgstr "àààààà àààààà àààà àààà àààààà ààààà àààààà ààà (àààààà àààà àààà)."
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:11
@@ -14640,14 +14088,14 @@ msgstr "àààààà àààààà àààà ààà - ààà
 msgid ""
 "Maximum number of recently used timezones to remember in a "
 "'day_second_zones' list."
-msgstr "'day_second_zones' ààààààà ààà ààààà àààà ààààààààà ààààààà àààààààà ààà àààààà àààà."
+msgstr ""
+"'day_second_zones' ààààààà ààà ààààà àààà ààààààààà ààààààà àààààààà ààà àààààà àààà."
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:38
 msgid "Maximum number of recently used timezones to remember."
 msgstr "ààà ààààà àààà ààààààààà ààààààà àààààààà ààà àààààà àààà."
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:39
-#| msgid "_Reply style:"
 msgid "Memo layout style"
 msgstr "àààà ààààà àààà"
 
@@ -14657,7 +14105,6 @@ msgstr ""
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:41
 #, fuzzy
-#| msgid "Month view vertical pane position"
 msgid "Memo preview pane position (vertical)"
 msgstr "ààà àààààà ààààààààà ààààààà ààààà"
 
@@ -14679,7 +14126,6 @@ msgstr "ààà àààààà ààààààààà ààààà
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:46
 #, fuzzy
-#| msgid "Number of units for determining a default reminder."
 msgid "Number of units for determining a birthday or anniversary reminder."
 msgstr "àààààà ààà ààààààà àààà ààààà àààààà àààààà àààààà."
 
@@ -14767,7 +14213,6 @@ msgstr "àààà àààààààà ààààààààà àà
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:63
 #, fuzzy
-#| msgid "Recurrence date is invalid"
 msgid "Recurrent Events in Italic"
 msgstr "ààààààà ààààà àààààà àà"
 
@@ -14809,13 +14254,11 @@ msgstr "àààà/àààààà/ààààààà àààààà
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:73
 #, fuzzy
-#| msgid "Show the \"Preview\" pane"
 msgid "Show the memo preview pane"
 msgstr "\"Preview\" àààà ààààà"
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:74
 #, fuzzy
-#| msgid "Show the \"Preview\" pane"
 msgid "Show the task preview pane"
 msgstr "\"Preview\" àààà ààààà"
 
@@ -14829,7 +14272,6 @@ msgstr "àààà/àààààà/ààààààà àààààà
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:77
 #, fuzzy
-#| msgid "Show week number in Day and Work Week View"
 msgid "Show week numbers in Day View, Work Week View, and Date Navigator"
 msgstr "ààààààà ààà ààà ààààààà àààààààà ààààà ààà àààààààà àààà àà ààààà"
 
@@ -14847,13 +14289,11 @@ msgstr ""
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:80
 #, fuzzy
-#| msgid "Tasks vertical pane position"
 msgid "Task preview pane position (horizontal)"
 msgstr "ààààà ààà àààààà àààààà"
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:81
 #, fuzzy
-#| msgid "Tasks vertical pane position"
 msgid "Task preview pane position (vertical)"
 msgstr "ààààà ààà àààààà àààààà"
 
@@ -14938,7 +14378,6 @@ msgstr "ààààà àààà ààà àààààà"
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:97
 #, fuzzy
-#| msgid "Units for a default reminder, \"minutes\", \"hours\" or \"days\"."
 msgid ""
 "Units for a birthday or anniversary reminder, \"minutes\", \"hours\" or "
 "\"days\"."
@@ -14949,8 +14388,10 @@ msgid "Units for a default reminder, \"minutes\", \"hours\" or \"days\"."
 msgstr "àààààà ààà ààààààà àààààà àààà, \"minutes\", \"hours\" àààà \"days\"."
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:99
-msgid "Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days\"."
-msgstr "àààààà ààààà ààààààà àà ààààà àààààà ààà, \"minutes\", \"hours\" àààà \"days\"."
+msgid ""
+"Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days\"."
+msgstr ""
+"àààààà ààààà ààààààà àà ààààà àààààà ààà, \"minutes\", \"hours\" àààà \"days\"."
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:100
 msgid "Use system timezone"
@@ -14997,7 +14438,8 @@ msgid "Whether to display the end time of events in the week and month views."
 msgstr "ààà àààààààà ààà ààààà ààààààààà ààààààà ààà ààààààààà àààà."
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:110
-msgid "Whether to draw the Marcus Bains Line (line at current time) in the calendar."
+msgid ""
+"Whether to draw the Marcus Bains Line (line at current time) in the calendar."
 msgstr "ààà àààààà àààààà àààà (ààààààà àààààà àààà) ààààààààààà ààààà."
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:111
@@ -15014,7 +14456,6 @@ msgstr "ààà àààààààà àààà àààààà à
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:114
 #, fuzzy
-#| msgid "Whether to set a default reminder for appointments."
 msgid "Whether to set a reminder for birthdays and anniversaries."
 msgstr "ààà àààààààà àààà àààààà ààà ààààààà ààààààà ààààà."
 
@@ -15035,7 +14476,8 @@ msgid "Whether to show status field in the event/task/meeting editor"
 msgstr "ààà àààà/àààààà/ààààààà ààààààààà ààààààààà ààààààà ààààààà àà àààà"
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:119
-msgid "Whether to show times in twenty four hour format instead of using am/pm."
+msgid ""
+"Whether to show times in twenty four hour format instead of using am/pm."
 msgstr "ààà ààààà am/pm àà àààààà ààààà àààààà ààààààààà àààààà."
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:120
@@ -15048,7 +14490,6 @@ msgstr "ààà àààà/àààààà/ààààààà àà
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:122
 #, fuzzy
-#| msgid "Whether to show week numbers in the date navigator."
 msgid "Whether to show week numbers in various places in the Calendar."
 msgstr "ààà ààààà ààààààà àààààààà ààààà àààààà."
 
@@ -15157,24 +14598,20 @@ msgid "Calendar and Tasks"
 msgstr "àààààààà ààà ààààà"
 
 #: ../modules/calendar/e-cal-shell-sidebar.c:225
-#| msgid "Loading Calendar"
 msgid "Loading calendars"
 msgstr "àààààààà àààà ààààà ààà"
 
-#: ../modules/calendar/e-cal-shell-sidebar.c:642
-#| msgid "_New Calendar"
+#: ../modules/calendar/e-cal-shell-sidebar.c:640
 msgid "_New Calendar..."
 msgstr "àààà àààààààà (_N)..."
 
-#: ../modules/calendar/e-cal-shell-sidebar.c:659
-#| msgid "Calendar Source Selector"
+#: ../modules/calendar/e-cal-shell-sidebar.c:657
 msgid "Calendar Selector"
 msgstr "àààààààà àààà ààààà"
 
 #. Translators: The string field is a URI.
-#: ../modules/calendar/e-cal-shell-sidebar.c:1002
+#: ../modules/calendar/e-cal-shell-sidebar.c:1000
 #, fuzzy, c-format
-#| msgid "Opening calendar"
 msgid "Opening calendar at %s"
 msgstr "àààààààà àààà ààààà ààà"
 
@@ -15199,19 +14636,16 @@ msgid "Purge events older than"
 msgstr "àà ààààà àààà ààààà àààà"
 
 #: ../modules/calendar/e-cal-shell-view-actions.c:534
-#| msgid "Copying items"
 msgid "Copying Items"
 msgstr "àààààààà ààà ààà ààààà ààà"
 
 #: ../modules/calendar/e-cal-shell-view-actions.c:804
-#| msgid "Moving items"
 msgid "Moving Items"
 msgstr "àààààà ààààà ààààà ààà"
 
 #. Translators: Default filename part saving an event to a file when
 #. * no summary is filed, the '.ics' extension is concatenated to it.
 #: ../modules/calendar/e-cal-shell-view-actions.c:1131
-#| msgid "Sent"
 msgid "event"
 msgstr "àààà"
 
@@ -15220,7 +14654,6 @@ msgstr "àààà"
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:283
 #: ../modules/calendar/e-memo-shell-view-actions.c:510
 #: ../modules/calendar/e-task-shell-view-actions.c:627
-#| msgid "Select a Calendar"
 msgid "Save as iCalendar"
 msgstr "iCalendar ààààà ààààààà"
 
@@ -15230,22 +14663,18 @@ msgid "_Copy..."
 msgstr "ààà ààà (_C)..."
 
 #: ../modules/calendar/e-cal-shell-view-actions.c:1297
-#| msgid "Select a Calendar"
 msgid "D_elete Calendar"
 msgstr "àààààààààà àààà ààààà (_e)"
 
 #: ../modules/calendar/e-cal-shell-view-actions.c:1299
-#| msgid "Delete the selected folder"
 msgid "Delete the selected calendar"
 msgstr "àààà àààà àààààààààà àààà ààààà"
 
 #: ../modules/calendar/e-cal-shell-view-actions.c:1306
-#| msgid "Go back"
 msgid "Go Back"
 msgstr "àààà ààà"
 
 #: ../modules/calendar/e-cal-shell-view-actions.c:1313
-#| msgid "Go forward"
 msgid "Go Forward"
 msgstr "ààà ààà"
 
@@ -15281,17 +14710,14 @@ msgid "Re_fresh"
 msgstr "ààààààààà ààà (_f)"
 
 #: ../modules/calendar/e-cal-shell-view-actions.c:1355
-#| msgid "Rename the selected folder"
 msgid "Refresh the selected calendar"
 msgstr "àààà àààà àààààààààà ààà:àààà ààà"
 
 #: ../modules/calendar/e-cal-shell-view-actions.c:1362
-#| msgid "Rename the selected folder"
 msgid "Rename the selected calendar"
 msgstr "àààà àààà àààààààààà ààà:ààà àààà"
 
 #: ../modules/calendar/e-cal-shell-view-actions.c:1367
-#| msgid "Show _only this Calendar"
 msgid "Show _Only This Calendar"
 msgstr "àààà à àààààààààà ààààà (_O)"
 
@@ -15304,17 +14730,14 @@ msgid "_Delegate Meeting..."
 msgstr "ààààààààà ààààààà (_D)..."
 
 #: ../modules/calendar/e-cal-shell-view-actions.c:1388
-#| msgid "Delete the appointment"
 msgid "_Delete Appointment"
 msgstr "ààààààà àààà ààààà (_D)"
 
 #: ../modules/calendar/e-cal-shell-view-actions.c:1390
-#| msgid "Delete the appointment"
 msgid "Delete selected appointments"
 msgstr "àààà àààà àààààààààà àààà ààààà"
 
 #: ../modules/calendar/e-cal-shell-view-actions.c:1395
-#| msgid "Delete this _Occurrence"
 msgid "Delete This _Occurrence"
 msgstr "à àààà àààà ààààà (_O)"
 
@@ -15323,7 +14746,6 @@ msgid "Delete this occurrence"
 msgstr "à àààààà àààà ààààà"
 
 #: ../modules/calendar/e-cal-shell-view-actions.c:1402
-#| msgid "Delete _All Occurrences"
 msgid "Delete All Occ_urrences"
 msgstr "ààà ààààà àààà ààààà (_u)"
 
@@ -15332,12 +14754,10 @@ msgid "Delete all occurrences"
 msgstr "ààà ààààà àààà ààààà"
 
 #: ../modules/calendar/e-cal-shell-view-actions.c:1409
-#| msgid "New All Day _Event"
 msgid "New All Day _Event..."
 msgstr "ààà ààà àààààà àààà (_E)..."
 
 #: ../modules/calendar/e-cal-shell-view-actions.c:1411
-#| msgid "Create a new all-day appointment"
 msgid "Create a new all day event"
 msgstr "ààà ààà àààààà àààà ààààà"
 
@@ -15350,12 +14770,10 @@ msgid "_Forward as iCalendar..."
 msgstr "iCalendar ààààà ààà ààààà (_F)..."
 
 #: ../modules/calendar/e-cal-shell-view-actions.c:1423
-#| msgid "New _Meeting"
 msgid "New _Meeting..."
 msgstr "ààà ààààààà (_M)..."
 
 #: ../modules/calendar/e-cal-shell-view-actions.c:1425
-#| msgid "Create a new meeting request"
 msgid "Create a new meeting"
 msgstr "ààà ààààààà ààààà"
 
@@ -15385,7 +14803,6 @@ msgstr "ààààààààààà (_R)"
 
 #: ../modules/calendar/e-cal-shell-view-actions.c:1472
 #: ../modules/calendar/e-cal-shell-view-memopad.c:278
-#| msgid "Save as vCard..."
 msgid "Save as iCalendar..."
 msgstr "iCalendar ààààà ààààààà..."
 
@@ -15395,24 +14812,20 @@ msgstr "ààààààà ààààààà (_S)..."
 
 #: ../modules/calendar/e-cal-shell-view-actions.c:1481
 #, fuzzy
-#| msgid "Purge old appointments and meetings"
 msgid "Converts an appointment to a meeting"
 msgstr "àààà àààààààà ààà àààààààààà ààà ààààà ààààà"
 
 #: ../modules/calendar/e-cal-shell-view-actions.c:1486
 #, fuzzy
-#| msgid "New _Appointment..."
 msgid "Conv_ert to Appointment..."
 msgstr "ààà ààààààà (_A)..."
 
 #: ../modules/calendar/e-cal-shell-view-actions.c:1488
 #, fuzzy
-#| msgid "%s at the end of the appointment"
 msgid "Converts a meeting to an appointment"
 msgstr "%s ààààààà àààà ààà àààà"
 
 #: ../modules/calendar/e-cal-shell-view-actions.c:1493
-#| msgid "_Quit"
 msgid "Quit"
 msgstr "àààà ààààà"
 
@@ -15449,7 +14862,6 @@ msgid "Show one week"
 msgstr "àà ààààààààà ààààà"
 
 #: ../modules/calendar/e-cal-shell-view-actions.c:1647
-#| msgid "Show one week"
 msgid "Show one work week"
 msgstr "àà ààà ààààààà ààààààààà ààààà"
 
@@ -15479,7 +14891,6 @@ msgstr "à àààààààààà àààà"
 
 #: ../modules/calendar/e-cal-shell-view-actions.c:1726
 #, fuzzy
-#| msgid "Previews the calendar to be printed"
 msgid "Preview the calendar to be printed"
 msgstr "ààààààààààà àààà àààà àààààààààà ààà àà"
 
@@ -15491,13 +14902,11 @@ msgstr "àà ààà"
 #. * no summary is filed, the '.ics' extension is concatenated to it.
 #: ../modules/calendar/e-cal-shell-view-memopad.c:214
 #: ../modules/calendar/e-memo-shell-view-actions.c:508
-#| msgid "Memo"
 msgid "memo"
 msgstr "àààà"
 
 #: ../modules/calendar/e-cal-shell-view-memopad.c:257
 #: ../modules/calendar/e-memo-shell-view-actions.c:640
-#| msgid "New memo"
 msgid "New _Memo"
 msgstr "ààà àààà (_M)"
 
@@ -15526,7 +14935,6 @@ msgstr "ààà ààààà àààà (_W)"
 
 #: ../modules/calendar/e-cal-shell-view-memopad.c:290
 #: ../modules/calendar/e-memo-shell-view-actions.c:814
-#| msgid "View the selected memo"
 msgid "Print the selected memo"
 msgstr "àààà àààà àààààà àààà"
 
@@ -15536,7 +14944,6 @@ msgstr "àààà àààà àààààà àààà"
 #. * no summary is filed, the '.ics' extension is concatenated to it
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:281
 #: ../modules/calendar/e-task-shell-view-actions.c:625
-#| msgid "Task"
 msgid "task"
 msgstr "ààààà"
 
@@ -15562,7 +14969,6 @@ msgstr "àààààà ààààà ààààààà ààà (_M)"
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:339
 #: ../modules/calendar/e-task-shell-view-actions.c:773
 #, fuzzy
-#| msgid "Mark selected tasks as complete"
 msgid "Mark selected tasks as incomplete"
 msgstr "àààà àààà ààààààà ààààà àààà àà ààààààà ààà"
 
@@ -15590,13 +14996,11 @@ msgstr "àààà àààà àààà ààà"
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:365
 #: ../modules/calendar/e-memo-shell-view-actions.c:829
 #: ../modules/calendar/e-task-shell-view-actions.c:1028
-#| msgid "_Forward as iCalendar..."
 msgid "_Save as iCalendar..."
 msgstr "iCalendar ààààà ààààààà (_S)..."
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:377
 #: ../modules/calendar/e-task-shell-view-actions.c:1013
-#| msgid "View the selected task"
 msgid "Print the selected task"
 msgstr "àààà àààà ààààààà àààà"
 
@@ -15605,12 +15009,10 @@ msgid "Selected Calendars for Alarms"
 msgstr "àààààà àààà àààà àààà ààààààààà"
 
 #: ../modules/calendar/e-calendar-preferences.c:836
-#| msgid "Time and date:"
 msgid "Ti_me and date:"
 msgstr "ààà ààà ààààà (_m):"
 
 #: ../modules/calendar/e-calendar-preferences.c:837
-#| msgid "Date only:"
 msgid "_Date only:"
 msgstr "ààààà àààà (_D):"
 
@@ -15620,19 +15022,15 @@ msgid "Mem_o"
 msgstr "àààà (_o)"
 
 #: ../modules/calendar/e-memo-shell-backend.c:292
-#| msgctxt "New"
-#| msgid "_Shared memo"
 msgctxt "New"
 msgid "_Shared Memo"
 msgstr "ààààààààà àààà (_S)"
 
 #: ../modules/calendar/e-memo-shell-backend.c:294
-#| msgid "Create a shared new memo"
 msgid "Create a new shared memo"
 msgstr "ààààààààà ààà àààà ààààà"
 
 #: ../modules/calendar/e-memo-shell-backend.c:302
-#| msgid "Memo List"
 msgctxt "New"
 msgid "Memo Li_st"
 msgstr "àààà àààà (_s)"
@@ -15647,7 +15045,6 @@ msgid "Loading memos"
 msgstr "àààà àààà ààààà ààà"
 
 #: ../modules/calendar/e-memo-shell-sidebar.c:582
-#| msgid "Memo Source Selector"
 msgid "Memo List Selector"
 msgstr "àààà àààà àààà ààààà"
 
@@ -15663,28 +15060,23 @@ msgid "Print Memos"
 msgstr "àààà àààà"
 
 #: ../modules/calendar/e-memo-shell-view-actions.c:570
-#| msgid "_Delete Message"
 msgid "_Delete Memo"
 msgstr "àààà àààà ààààà (_D)"
 
 #: ../modules/calendar/e-memo-shell-view-actions.c:577
-#| msgid "_Find in Message..."
 msgid "_Find in Memo..."
 msgstr "ààààààà àààà (_F)..."
 
 #: ../modules/calendar/e-memo-shell-view-actions.c:579
 #, fuzzy
-#| msgid "Search for text in the body of the displayed message"
 msgid "Search for text in the displayed memo"
 msgstr "ààààààààà àààààààà àààààà àààà àààà ààà ààà"
 
 #: ../modules/calendar/e-memo-shell-view-actions.c:598
-#| msgid "_New Memo List"
 msgid "D_elete Memo List"
 msgstr "àààà àààà àààà ààààà (_e)"
 
 #: ../modules/calendar/e-memo-shell-view-actions.c:600
-#| msgid "Delete selected memos"
 msgid "Delete the selected memo list"
 msgstr "àààà àààà àààà àààààà àààà ààààà"
 
@@ -15693,39 +15085,32 @@ msgid "_New Memo List"
 msgstr "ààà àààà àààà (_N)"
 
 #: ../modules/calendar/e-memo-shell-view-actions.c:621
-#| msgid "Delete selected memos"
 msgid "Refresh the selected memo list"
 msgstr "àààà àààà àààà àààààà ààà:àààà ààà"
 
 #: ../modules/calendar/e-memo-shell-view-actions.c:628
-#| msgid "Rename the selected folder"
 msgid "Rename the selected memo list"
 msgstr "àààà àààà àààà àààààà ààà àààà"
 
 #: ../modules/calendar/e-memo-shell-view-actions.c:633
-#| msgid "Show _only this Memo List"
 msgid "Show _Only This Memo List"
 msgstr "ààààà à àààà àààà ààààà (_O)"
 
 #: ../modules/calendar/e-memo-shell-view-actions.c:712
-#| msgid "_Preview"
 msgid "Memo _Preview"
 msgstr "àààà àààààààààà (_P)"
 
 #: ../modules/calendar/e-memo-shell-view-actions.c:714
-#| msgid "Show preview pane"
 msgid "Show memo preview pane"
 msgstr "àààà àààààààààà àààà ààààà"
 
 #: ../modules/calendar/e-memo-shell-view-actions.c:735
 #, fuzzy
-#| msgid "Show message preview below the message list"
 msgid "Show memo preview below the memo list"
 msgstr "àààààà àààà àààà àààààà àààààààààà ààààà"
 
 #: ../modules/calendar/e-memo-shell-view-actions.c:742
 #, fuzzy
-#| msgid "Show message preview below the message list"
 msgid "Show memo preview alongside the memo list"
 msgstr "àààààà àààà àààà àààààà àààààààààà ààààà"
 
@@ -15734,7 +15119,6 @@ msgid "Print the list of memos"
 msgstr "àààààà àààà àààà"
 
 #: ../modules/calendar/e-memo-shell-view-actions.c:807
-#| msgid "Previews the list of memos to be printed"
 msgid "Preview the list of memos to be printed"
 msgstr "ààààà àààààà àààààà ààààààà àààààààààà ààà àà"
 
@@ -15748,18 +15132,14 @@ msgstr[1] "%d àààà"
 #: ../modules/calendar/e-memo-shell-view-private.c:424
 #: ../modules/calendar/e-task-shell-view-private.c:575
 #, c-format
-#| msgid ", %d selected"
-#| msgid_plural ", %d selected"
 msgid "%d selected"
 msgstr "%d àààà àààà"
 
 #: ../modules/calendar/e-memo-shell-view.c:223
-#| msgid "_Delete Message"
 msgid "Delete Memos"
 msgstr "àààà àààà ààààà"
 
 #: ../modules/calendar/e-memo-shell-view.c:225
-#| msgid "Delegate To"
 msgid "Delete Memo"
 msgstr "àààà àààà ààààà"
 
@@ -15778,7 +15158,6 @@ msgid "Create a new assigned task"
 msgstr "ààà àààààààà àààà ààààà"
 
 #: ../modules/calendar/e-task-shell-backend.c:301
-#| msgid "Task List"
 msgctxt "New"
 msgid "Tas_k List"
 msgstr "ààààà àààà (_k)"
@@ -15793,7 +15172,6 @@ msgid "Loading tasks"
 msgstr "ààààà àààà ààààà ààà"
 
 #: ../modules/calendar/e-task-shell-sidebar.c:582
-#| msgid "Task Source Selector"
 msgid "Task List Selector"
 msgstr "ààààà àààà àààà ààààà"
 
@@ -15821,32 +15199,26 @@ msgstr ""
 "ààà ààààà à ààààà àààà àààààà ààààà àà?"
 
 #: ../modules/calendar/e-task-shell-view-actions.c:694
-#| msgid "_Delete"
 msgid "_Delete Task"
 msgstr "ààààà àààà ààààà (_D)"
 
 #: ../modules/calendar/e-task-shell-view-actions.c:701
-#| msgid "_Find in Message..."
 msgid "_Find in Task..."
 msgstr "àààààààà àààà (_F)..."
 
 #: ../modules/calendar/e-task-shell-view-actions.c:703
-#| msgid "Search for text in the body of the displayed message"
 msgid "Search for text in the displayed task"
 msgstr "àààààààà àààààààà àààà àààà àààà"
 
 #: ../modules/calendar/e-task-shell-view-actions.c:715
-#| msgid "_Copy..."
 msgid "Copy..."
 msgstr "ààà ààà..."
 
 #: ../modules/calendar/e-task-shell-view-actions.c:722
-#| msgid "Select a Task List"
 msgid "D_elete Task List"
 msgstr "ààààà àààààà àààà ààààà (_e)"
 
 #: ../modules/calendar/e-task-shell-view-actions.c:724
-#| msgid "Delete selected tasks"
 msgid "Delete the selected task list"
 msgstr "àààà àààà ààààà àààààà àààà ààààà"
 
@@ -15855,22 +15227,18 @@ msgid "_New Task List"
 msgstr "ààà àààà àààà (_N)"
 
 #: ../modules/calendar/e-task-shell-view-actions.c:745
-#| msgid "Delete selected tasks"
 msgid "Refresh the selected task list"
 msgstr "àààà àààà ààààà àààààà ààà:àààà ààà"
 
 #: ../modules/calendar/e-task-shell-view-actions.c:752
-#| msgid "Rename the selected folder"
 msgid "Rename the selected task list"
 msgstr "àààà àààà ààààà àààààà ààà àààà"
 
 #: ../modules/calendar/e-task-shell-view-actions.c:757
-#| msgid "Show _only this Task List"
 msgid "Show _Only This Task List"
 msgstr "ààààà à ààààà àààààà à ààààà (_O)"
 
 #: ../modules/calendar/e-task-shell-view-actions.c:771
-#| msgid "_Mark as Incomplete"
 msgid "Mar_k as Incomplete"
 msgstr "àààààà ààààà ààààààà ààà (_k)"
 
@@ -15884,19 +15252,16 @@ msgstr "àààààà àààààààààà (_P)"
 
 #: ../modules/calendar/e-task-shell-view-actions.c:878
 #, fuzzy
-#| msgid "Show preview pane"
 msgid "Show task preview pane"
 msgstr "àààààààààà àààà ààààà"
 
 #: ../modules/calendar/e-task-shell-view-actions.c:899
 #, fuzzy
-#| msgid "Show message preview below the message list"
 msgid "Show task preview below the task list"
 msgstr "àààààà àààà àààà àààààà àààààààààà ààààà"
 
 #: ../modules/calendar/e-task-shell-view-actions.c:906
 #, fuzzy
-#| msgid "Show message preview below the message list"
 msgid "Show task preview alongside the task list"
 msgstr "àààààà àààà àààà àààààà àààààààààà ààààà"
 
@@ -15926,7 +15291,6 @@ msgstr "ààààààà àààà àààà"
 
 #: ../modules/calendar/e-task-shell-view-actions.c:1006
 #, fuzzy
-#| msgid "Previews the list of tasks to be printed"
 msgid "Preview the list of tasks to be printed"
 msgstr "ààààà àààààà ààààààà ààààààà àààààààààà ààà"
 
@@ -15942,12 +15306,10 @@ msgstr[0] "%d àààà"
 msgstr[1] "%d ààààà"
 
 #: ../modules/calendar/e-task-shell-view.c:358
-#| msgid "Completed Tasks"
 msgid "Delete Tasks"
 msgstr "àààààààà àààà ààààà"
 
 #: ../modules/calendar/e-task-shell-view.c:360
-#| msgid "Delegate To"
 msgid "Delete Task"
 msgstr "ààààààà àààà ààààà"
 
@@ -15960,7 +15322,6 @@ msgstr "%d ààààààà àààààà"
 #. Translators: "None" for a junk hook name,
 #. * when the junk plugin is not enabled.
 #: ../modules/mail/e-mail-junk-hook.c:94
-#| msgid "None"
 msgctxt "mail-junk-hook"
 msgid "None"
 msgstr "ààà àààà"
@@ -16000,19 +15361,16 @@ msgid "Network Preferences"
 msgstr "ààààààà ààààààà"
 
 #: ../modules/mail/e-mail-shell-view-actions.c:1060
-#: ../modules/mail/e-mail-shell-view.c:955
-#| msgid "Disable Account"
+#: ../modules/mail/e-mail-shell-view.c:953
 msgid "_Disable Account"
 msgstr "ààààà ààààààààà ààà (_D)"
 
 #: ../modules/mail/e-mail-shell-view-actions.c:1062
-#| msgid "Disable Account"
 msgid "Disable this account"
 msgstr "à àààààà ààààààààà ààà"
 
 #: ../modules/mail/e-mail-shell-view-actions.c:1069
 #, fuzzy
-#| msgid "Permanently remove all deleted messages from all folders"
 msgid "Permanently remove all the deleted messages from all folders"
 msgstr "ààà àààààààààààà ààà àààà àààààààà ààààààà ààààà àààà àààà ààààà"
 
@@ -16026,7 +15384,6 @@ msgstr "àààààà ààààà àààà ààààààà 
 
 #: ../modules/mail/e-mail-shell-view-actions.c:1083
 #, fuzzy
-#| msgid "Download messages of accounts/folders marked for offline"
 msgid "Download messages of accounts and folders marked for offline usage"
 msgstr "àààààà ààààà ààààààà àààà ààààà/ààààààààà ààààààà ààààààà ààà"
 
@@ -16112,7 +15469,6 @@ msgstr "àààààààà àààà ààà (_T)"
 
 #: ../modules/mail/e-mail-shell-view-actions.c:1181
 #, fuzzy
-#| msgid "Permanently remove all deleted messages from all folders"
 msgid "Permanently remove all the deleted messages from all accounts"
 msgstr "ààà àààààààààààà ààà àààà àààààààà ààààààà ààààà àààà àààà ààààà"
 
@@ -16121,12 +15477,10 @@ msgid "_New Label"
 msgstr "àààà àààà (_N)"
 
 #: ../modules/mail/e-mail-shell-view-actions.c:1195
-#| msgid "None"
 msgid "N_one"
 msgstr "ààà àààà (_o)"
 
 #: ../modules/mail/e-mail-shell-view-actions.c:1209
-#| msgid "_Subscriptions..."
 msgid "_Manage Subscriptions"
 msgstr "ààààààààààà ààààààà ààà (_M)"
 
@@ -16145,7 +15499,6 @@ msgid "Send queued items and retrieve new items"
 msgstr "ààààààà ààààà àààààà ààààà ààà ààà àààààà ààààà"
 
 #: ../modules/mail/e-mail-shell-view-actions.c:1223
-#| msgid "Received"
 msgid "R_eceive All"
 msgstr "ààà ààààà (_e)"
 
@@ -16154,13 +15507,11 @@ msgid "Receive new items from all accounts"
 msgstr "ààà àààààààààà ààà àààààààà ààààààà ààà"
 
 #: ../modules/mail/e-mail-shell-view-actions.c:1230
-#| msgid "_Send"
 msgid "_Send All"
 msgstr "ààà ààààà (_S)"
 
 #: ../modules/mail/e-mail-shell-view-actions.c:1232
 #, fuzzy
-#| msgid "Send queued items and retrieve new items"
 msgid "Send queued items in all accounts"
 msgstr "ààààààà ààààà àààààà ààààà ààà ààà àààààà ààààà"
 
@@ -16203,7 +15554,6 @@ msgstr "ààààààà àààà (_o)"
 
 #: ../modules/mail/e-mail-shell-view-actions.c:1288
 #, fuzzy
-#| msgid "Create or edit Search Folder definitions"
 msgid "Create or edit search folder definitions"
 msgstr "ààà àààààà ààààààààà ààààà àààà àààààà ààà"
 
@@ -16229,18 +15579,15 @@ msgstr "àààààà àààààààààà ààààà (_P)"
 
 #: ../modules/mail/e-mail-shell-view-actions.c:1379
 #, fuzzy
-#| msgid "Show message preview window"
 msgid "Show message preview pane"
 msgstr "àààààà àààààààààà àààààà ààààà"
 
 #: ../modules/mail/e-mail-shell-view-actions.c:1385
-#| msgid "Hide _Deleted Messages"
 msgid "Show _Deleted Messages"
 msgstr "àààà àààààà àààààààà ààààà (_D)"
 
 #: ../modules/mail/e-mail-shell-view-actions.c:1387
 #, fuzzy
-#| msgid "Show deleted messages (with a strike-through) in the message-list."
 msgid "Show deleted messages with a line through them"
 msgstr "àààà ààààààà ààààààà àààààà ààààààà ààààà (àààà ààààààà àààà)."
 
@@ -16249,7 +15596,6 @@ msgid "_Group By Threads"
 msgstr "àààààà àààààà ààà àààà (_G)"
 
 #: ../modules/mail/e-mail-shell-view-actions.c:1395
-#| msgid "Threaded Message list"
 msgid "Threaded message list"
 msgstr "ààààààà àààààà àààà"
 
@@ -16259,7 +15605,6 @@ msgstr "àààààà àààà àààà àààààà àà
 
 #: ../modules/mail/e-mail-shell-view-actions.c:1423
 #, fuzzy
-#| msgid "Show message preview below the message list"
 msgid "Show message preview alongside the message list"
 msgstr "àààààà àààà àààà àààààà àààààààààà ààààà"
 
@@ -16301,7 +15646,6 @@ msgstr "àààà àààààà ààààààà"
 
 #: ../modules/mail/e-mail-shell-view-actions.c:1539
 #, fuzzy
-#| msgid "Subject or Addresses contains"
 msgid "Subject or Addresses contain"
 msgstr "àààà àààà àààààààà ààààà àà"
 
@@ -16375,7 +15719,6 @@ msgstr[0] "%d ààà"
 msgstr[1] "%d ààà"
 
 #: ../modules/mail/e-mail-shell-view-private.c:1126
-#| msgid "Task"
 msgid "Trash"
 msgstr "àààààààà"
 
@@ -16383,15 +15726,15 @@ msgstr "àààààààà"
 msgid "Send / Receive"
 msgstr "ààààà / ààààà"
 
-#: ../modules/mail/e-mail-shell-view.c:565
+#: ../modules/mail/e-mail-shell-view.c:563
 msgid "All Account Search"
 msgstr "ààà àààà ààà"
 
-#: ../modules/mail/e-mail-shell-view.c:748
+#: ../modules/mail/e-mail-shell-view.c:746
 msgid "Account Search"
 msgstr "àààà ààà"
 
-#: ../modules/mail/e-mail-shell-view.c:953
+#: ../modules/mail/e-mail-shell-view.c:951
 msgid "Proxy _Logout"
 msgstr "àààààààà àààààà ààààà (_L)"
 
@@ -16459,23 +15802,21 @@ msgstr "%s àààààà àààààà àà ààà àààà
 #. May be a better text
 #: ../modules/mail/em-mailer-prefs.c:701 ../modules/mail/em-mailer-prefs.c:775
 #, c-format
-msgid "%s plugin is not available. Please check whether the package is installed."
+msgid ""
+"%s plugin is not available. Please check whether the package is installed."
 msgstr "%s àààààà àààààà ààà. àààààààà ààààà ààààà àà ààà ààààà ààààààà àààà àà."
 
 #: ../modules/mail/em-mailer-prefs.c:739
 #, fuzzy
-#| msgid "No Junk plugin available"
 msgid "No junk plugin available"
 msgstr "ààà ààààà àààààà àààààà ààà"
 
 #. To Translators: 'Date header' is a label for configurable date/time format for 'Date' header in mail message window/preview
 #: ../modules/mail/em-mailer-prefs.c:1142
-#| msgid "Date header:"
 msgid "_Date header:"
 msgstr "ààààà àààà (_D):"
 
 #: ../modules/mail/em-mailer-prefs.c:1143
-#| msgid "Show _Original Size"
 msgid "Show _original header value"
 msgstr "àààààà àààà ààààààà ààààà (_o)"
 
@@ -16484,12 +15825,12 @@ msgid "Check whether Evolution is the default mailer"
 msgstr "ààà Evolution àààààà àààà ààààà àà àà ààààà"
 
 #: ../modules/mailto-handler/apps-evolution-mail-prompts-checkdefault.schemas.in.h:2
-msgid "Every time Evolution starts, check whether or not it is the default mailer."
+msgid ""
+"Every time Evolution starts, check whether or not it is the default mailer."
 msgstr "àà àààà Evolution ààà ààà, àààààà ààààà àà ààà àà àààààà àààà ààààà àà àà àààà."
 
 #: ../modules/mailto-handler/evolution-mailto-handler.c:143
 #, fuzzy
-#| msgid "Do you want to make Evolution your default e-mail client?"
 msgid "Do you want to make Evolution your default email client?"
 msgstr "ààà ààà Evolution àà àààààà àààààà à-àààà àààààààà àààààà ààààà àà?"
 
@@ -16499,9 +15840,6 @@ msgstr ""
 
 #: ../modules/offline-alert/evolution-offline-alert.error.xml.h:2
 #, fuzzy
-#| msgid ""
-#| "Evolution is currently offline.\n"
-#| "Click on this button to work online."
 msgid "Evolution is currently offline due to a network outage."
 msgstr ""
 "Evolution àààààààààà àààààà àà.\n"
@@ -16509,7 +15847,6 @@ msgstr ""
 
 #: ../modules/offline-alert/evolution-offline-alert.error.xml.h:3
 #, fuzzy
-#| msgid "Evolution is in the process of going offline."
 msgid "Evolution is currently offline."
 msgstr "Evolution ààààààààààà àààààà ààà àààààà àààààààààààà àà."
 
@@ -16564,40 +15901,39 @@ msgstr "àààààà àààààà àààààà"
 msgid "Test Plugin for Python EPlugin loader."
 msgstr "àààààà EPlugin àààà àààà àààààà àààààà."
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:276
+#: ../modules/startup-wizard/evolution-startup-wizard.c:277
 #: ../widgets/misc/e-import-assistant.c:396
 msgid "Please select the information that you would like to import:"
 msgstr "àààààààà ààààà ààà àààà àààà àààà ààààà àà ààààààà àààà ààà:"
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:308
+#: ../modules/startup-wizard/evolution-startup-wizard.c:309
 #: ../widgets/misc/e-import-assistant.c:552
 #, c-format
 msgid "From %s:"
 msgstr "%s ààààà:"
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:319
-#: ../modules/startup-wizard/evolution-startup-wizard.c:416
-#| msgid "Importing files"
+#: ../modules/startup-wizard/evolution-startup-wizard.c:320
+#: ../modules/startup-wizard/evolution-startup-wizard.c:417
 msgid "Importing Files"
 msgstr "ààààà àààà ààà ààààà ààà"
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:394
+#: ../modules/startup-wizard/evolution-startup-wizard.c:395
 msgid "Import cancelled. Click \"Forward\" to continue."
 msgstr "àààà àà àààà àà. àààà ààààà àààà \"ààà ààààà\" àà ààààà ààà"
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:412
+#: ../modules/startup-wizard/evolution-startup-wizard.c:413
 msgid "Import complete. Click \"Forward\" to continue."
 msgstr "àààà àààààà. àààà ààààà àààà \"ààà ààààà\" àà ààààà ààà."
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:482
+#: ../modules/startup-wizard/evolution-startup-wizard.c:487
 msgid "Evolution Setup Assistant"
 msgstr "Evolution ààààà àààààà"
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:488
+#: ../modules/startup-wizard/evolution-startup-wizard.c:493
 msgid "Welcome"
 msgstr "àààààà"
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:493
+#: ../modules/startup-wizard/evolution-startup-wizard.c:498
 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"
@@ -16663,13 +15999,11 @@ msgstr "àààà ààà ààààà àà àààààà àà
 
 #: ../plugins/audio-inline/org-gnome-audio-inline.eplug.xml.h:1
 #, fuzzy
-#| msgid "Inline vCards"
 msgid "Inline Audio"
 msgstr "àààààà vCards"
 
 #: ../plugins/audio-inline/org-gnome-audio-inline.eplug.xml.h:2
 #, fuzzy
-#| msgid "Play audio attachments directly from Evolution."
 msgid "Play audio attachments directly in mail messages."
 msgstr "Evolution ààààà àààà à ààààà àààààààà ààààà."
 
@@ -16716,29 +16050,24 @@ msgid "Restore from backup"
 msgstr "àààààààààà ààààààààààà"
 
 #: ../plugins/backup-restore/backup-restore.c:386
-#| msgid "Backing up Evolution Data"
 msgid "_Back up Evolution Data..."
 msgstr "Evolution àààààà ààààà àà (_B)..."
 
 #: ../plugins/backup-restore/backup-restore.c:388
 #, fuzzy
-#| msgid "Backup and restore Evolution data and settings"
 msgid "Back up Evolution data and settings to an archive file"
 msgstr "Evolution àààààà ààà ààààààààà ààààà àà ààà àààà ààààààà"
 
 #: ../plugins/backup-restore/backup-restore.c:393
-#| msgid "Restoring Evolution Data"
 msgid "R_estore Evolution Data..."
 msgstr "Evolution àààààà àààààààààà ààà ààààà ààà (_e)..."
 
 #: ../plugins/backup-restore/backup-restore.c:395
 #, fuzzy
-#| msgid "Backup and restore Evolution data and settings"
 msgid "Restore Evolution data and settings from an archive file"
 msgstr "Evolution àààààà ààà ààààààààà ààààà àà ààà àààà ààààààà"
 
 #: ../plugins/backup-restore/backup.c:79
-#| msgid "Backup Evolution directory"
 msgid "Back up Evolution directory"
 msgstr "ààààà Evolution ààààààààà"
 
@@ -16747,7 +16076,6 @@ msgid "Restore Evolution directory"
 msgstr "Evolution ààààààààà àààà àààààààà ààà"
 
 #: ../plugins/backup-restore/backup.c:83
-#| msgid "Check Evolution Backup"
 msgid "Check Evolution Back up"
 msgstr "Evolution ààààà ààààà"
 
@@ -16773,7 +16101,6 @@ msgid "Backing Evolution data (Mails, Contacts, Calendar, Tasks, Memos)"
 msgstr "Evolution àààààà ààà ààà ààààà ààà (ààààà, ààààààà, àààààààà, ààààà, àààà)"
 
 #: ../plugins/backup-restore/backup.c:317
-#| msgid "Backup complete"
 msgid "Back up complete"
 msgstr "ààààà àààààà"
 
@@ -16783,12 +16110,10 @@ msgid "Restarting Evolution"
 msgstr "Evolution ààààààà ààà ààààà ààà"
 
 #: ../plugins/backup-restore/backup.c:403
-#| msgid "Backup current Evolution data"
 msgid "Back up current Evolution data"
 msgstr "ààààààà Evolution àààààà ààààà àà"
 
 #: ../plugins/backup-restore/backup.c:409
-#| msgid "Extracting files from backup"
 msgid "Extracting files from back up"
 msgstr "àààààààààà ààààààà àààà àààà ààààà ààà"
 
@@ -16797,7 +16122,6 @@ msgid "Loading Evolution settings"
 msgstr "Evolution ààààààà àààà ààààà ààà"
 
 #: ../plugins/backup-restore/backup.c:481
-#| msgid "Removing temporary backup files"
 msgid "Removing temporary back up files"
 msgstr "ààààààà ààààà ààààà ààà ààà ààààà ààà"
 
@@ -16817,7 +16141,6 @@ msgstr "%s ààààààààààà ààààààààààà 
 
 #. Backup / Restore only can have GUI. We should restrict the rest
 #: ../plugins/backup-restore/backup.c:705
-#| msgid "Evolution Backup"
 msgid "Evolution Back up"
 msgstr "Evolution ààààà"
 
@@ -16847,13 +16170,11 @@ msgstr "ààààà ààààààà àààààààà ààà
 
 #. the path to the shared library
 #: ../plugins/backup-restore/org-gnome-backup-restore.eplug.xml.h:2
-#| msgid "Backup and Restore"
 msgid "Back up and Restore"
 msgstr "ààààà ààà àààààààààà"
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.eplug.xml.h:3
 #, fuzzy
-#| msgid "Backup and restore your Evolution data and settings."
 msgid "Back up and restore your Evolution data and settings."
 msgstr "Evolution àààààà ààà ààààààààà ààààà àà ààà àààà ààààààà."
 
@@ -16863,19 +16184,16 @@ msgstr "ààà ààà ààààà Evolution ààà àààà à
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:2
 #, fuzzy
-#| msgid ""
-#| "Are you sure you want to restore Evolution from the selected backup file?"
-msgid "Are you sure you want to restore Evolution from the selected back up file?"
+msgid ""
+"Are you sure you want to restore Evolution from the selected back up file?"
 msgstr "ààà ààà ààààà Evolution àà àààààà ààààà ààààààààà àààààààààààà ààààà àà?"
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:3
 #, fuzzy
-#| msgid "Backing up Evolution Data"
 msgid "Close and Back up Evolution"
 msgstr "Evolution àààààà ààààà ààà"
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:4
-#| msgid "Cannot start Evolution"
 msgid "Close and Restore Evolution"
 msgstr "Evolution àà ààà ààà ààà ààà:ààààààà"
 
@@ -16884,12 +16202,10 @@ msgid "Insufficient Permissions"
 msgstr "àààààà àààààààà"
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:6
-#| msgid "Invalid Evolution backup file"
 msgid "Invalid Evolution back up file"
 msgstr "àààààà Evolution ààààà àààà"
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:7
-#| msgid "Please select a valid backup file to restore."
 msgid "Please select a valid back up file to restore."
 msgstr "àààààààààà àààà àààà àààààààà ààààà ààààà ààààà àààà àààà ààà."
 
@@ -16932,7 +16248,6 @@ msgstr "ààààà àààààà ààààààà"
 #. Enable Gaim Checkbox
 #: ../plugins/bbdb/bbdb.c:745
 #, fuzzy
-#| msgid "Synchronize contact info and images from Pidgin buddy list"
 msgid "_Synchronize contact info and images from Pidgin buddy list"
 msgstr "Pidgin ààààààà ààààààààà ààààààààà àààààà ààààààà ààà àààààààà ààààà ààà àà"
 
@@ -17034,39 +16349,30 @@ msgstr ""
 #: ../plugins/caldav/caldav-browse-server.c:340
 #: ../plugins/caldav/caldav-browse-server.c:664
 #, fuzzy
-#| msgid "Failed to update delegates:"
 msgid "Failed to parse server response."
 msgstr "àààààààààà àààààààààà àààààà:"
 
 #: ../plugins/caldav/caldav-browse-server.c:434
-#| msgid "Ends"
 msgid "Events"
 msgstr "ààààà"
 
 #: ../plugins/caldav/caldav-browse-server.c:456
-#| msgid "New calendar"
 msgid "User's calendars"
 msgstr "ààààààààààààà àààààààà"
 
 #: ../plugins/caldav/caldav-browse-server.c:565
 #: ../plugins/caldav/caldav-browse-server.c:733
 #, fuzzy
-#| msgid "Failed to authenticate with LDAP server."
 msgid "Failed to get server URL."
 msgstr "LDAP ààààà àààà àààààààààà ààààààà àààààà."
 
 #: ../plugins/caldav/caldav-browse-server.c:731
 #: ../plugins/caldav/caldav-browse-server.c:772
 #: ../plugins/caldav/caldav-browse-server.c:1431
-#| msgid ""
-#| "\n"
-#| "\n"
-#| "Searching for the Contacts..."
 msgid "Searching for user's calendars..."
 msgstr "ààààààààààààà ààààààààà àààà àààà ààààà àà..."
 
 #: ../plugins/caldav/caldav-browse-server.c:770
-#| msgid "Unable to find any calendars"
 msgid "Could not find any user calendar."
 msgstr "ààààà àààààààààà àààààààà ààà ààààà àààà."
 
@@ -17082,15 +16388,11 @@ msgstr "àààààààà ààààààà ààà %d àààà
 
 #: ../plugins/caldav/caldav-browse-server.c:909
 #, fuzzy, c-format
-#| msgid "Enter password for %s (user %s)"
 msgid "Enter password for user %s on server %s"
 msgstr "%s (àààààààààà %s) àààà ààààààà àààà ààà"
 
 #: ../plugins/caldav/caldav-browse-server.c:968
 #, fuzzy, c-format
-#| msgid ""
-#| "Cannot create output file: %s:\n"
-#| " %s"
 msgid "Cannot create soup message for URL '%s'"
 msgstr ""
 "àààààà àààà ààààà àààà ààà: %s:\n"
@@ -17099,10 +16401,6 @@ msgstr ""
 #. fetch content
 #: ../plugins/caldav/caldav-browse-server.c:1214
 #, fuzzy
-#| msgid ""
-#| "\n"
-#| "\n"
-#| "Searching for the Contacts..."
 msgid "Searching folder content..."
 msgstr ""
 "\n"
@@ -17115,24 +16413,20 @@ msgid "Server _handles meeting invitations"
 msgstr ""
 
 #: ../plugins/caldav/caldav-browse-server.c:1270
-#| msgid "Local Calendars"
 msgid "List of available calendars:"
 msgstr "àààààà ààààààààààà àààà:"
 
 #: ../plugins/caldav/caldav-browse-server.c:1308
-#| msgid "Hula Support"
 msgid "Supports"
 msgstr "ààààà"
 
 #: ../plugins/caldav/caldav-browse-server.c:1335
 #: ../plugins/caldav/caldav-source.c:254
-#| msgid "New email"
 msgid "User e-_mail:"
 msgstr "àààààààààà àààà:"
 
 #: ../plugins/caldav/caldav-browse-server.c:1407
 #, c-format
-#| msgid "Failed to create pipe: %s"
 msgid "Failed to create thread: %s"
 msgstr "ààààà àààààà àààà àààààààà: %s"
 
@@ -17278,7 +16572,6 @@ msgstr "ààààà àààà ààà"
 #. Translators: "None" location for a weather calendar
 #: ../plugins/calendar-weather/calendar-weather.c:328
 #: ../plugins/calendar-weather/calendar-weather.c:373
-#| msgid "None"
 msgctxt "weather-cal-location"
 msgid "None"
 msgstr "ààà àààà"
@@ -17305,13 +16598,11 @@ msgstr "àààààà ààààààààà"
 
 #: ../plugins/contacts-map/contacts-map.c:55
 #: ../plugins/contacts-map/contacts-map.c:201
-#| msgid "Contacts: "
 msgid "Contacts map"
 msgstr "ààààààà ààààà"
 
 #: ../plugins/contacts-map/contacts-map.c:56
 #, fuzzy
-#| msgid "Send a message to the selected contacts"
 msgid "Show a map of all the contacts"
 msgstr "àààà àààà ààààààààà ààààà ààààà"
 
@@ -17320,30 +16611,25 @@ msgid "Add a map showing the location of contacts when possible."
 msgstr ""
 
 #: ../plugins/contacts-map/org-gnome-contacts-map.eplug.xml.h:2
-#| msgid "No contacts"
 msgid "Map for contacts"
 msgstr "ààààààà àààà ààààà"
 
 #: ../plugins/dbx-import/dbx-importer.c:258
 #, fuzzy
-#| msgid "Importing Outlook data"
 msgid "Importing Outlook Express data"
 msgstr "àààààà àààààà àà àààà ààà ààààà àà"
 
 #: ../plugins/dbx-import/org-gnome-dbx-import.eplug.xml.h:1
 #, fuzzy
-#| msgid "Import Outlook messages from PST file"
 msgid "Import Outlook Express messages from DBX file"
 msgstr "PST àààà ààààà àààààà ààààààà àà àààà ààà"
 
 #: ../plugins/dbx-import/org-gnome-dbx-import.eplug.xml.h:2
-#| msgid "Outlook PST import"
 msgid "Outlook DBX import"
 msgstr "àààààà DBX àààà"
 
 #: ../plugins/dbx-import/org-gnome-dbx-import.eplug.xml.h:3
 #, fuzzy
-#| msgid "Outlook personal folders (.pst)"
 msgid "Outlook Express 5/6 personal folders (.dbx)"
 msgstr "àààààà ààààààààà ààààààà (.pst)"
 
@@ -17353,7 +16639,6 @@ msgstr "àààààà ààààààà àààà ààààà 
 
 #: ../plugins/default-source/default-source.c:96
 #, fuzzy
-#| msgid "Show autocompleted name with an address"
 msgid "A_utocomplete with this address book"
 msgstr "ààààààà àààà àààààà àààààà àààà ààà àà ààààà"
 
@@ -17392,49 +16677,41 @@ msgstr ""
 "àààààà \";\" àààààà ààà ààààààà ààà àà"
 
 #: ../plugins/email-custom-header/email-custom-header.c:316
-#| msgid "Security:"
 msgctxt "email-custom-header-Security"
 msgid "Security:"
 msgstr "ààààààà:"
 
 #: ../plugins/email-custom-header/email-custom-header.c:320
-#| msgid "Personal"
 msgctxt "email-custom-header-Security"
 msgid "Personal"
 msgstr "ààààààààà"
 
 #: ../plugins/email-custom-header/email-custom-header.c:321
-#| msgid "Unclassified"
 msgctxt "email-custom-header-Security"
 msgid "Unclassified"
 msgstr "ààààààààà"
 
 #: ../plugins/email-custom-header/email-custom-header.c:322
-#| msgid "Protected"
 msgctxt "email-custom-header-Security"
 msgid "Protected"
 msgstr "àààààààà àààà"
 
 #: ../plugins/email-custom-header/email-custom-header.c:323
-#| msgid "Confidential"
 msgctxt "email-custom-header-Security"
 msgid "Confidential"
 msgstr "àààààààààà"
 
 #: ../plugins/email-custom-header/email-custom-header.c:324
-#| msgid "Secret"
 msgctxt "email-custom-header-Security"
 msgid "Secret"
 msgstr "ààààà"
 
 #: ../plugins/email-custom-header/email-custom-header.c:325
-#| msgid "Top secret"
 msgctxt "email-custom-header-Security"
 msgid "Top secret"
 msgstr "ààà ààààà"
 
 #: ../plugins/email-custom-header/email-custom-header.c:382
-#| msgid "None"
 msgctxt "email-custom-header"
 msgid "None"
 msgstr "ààà àààà"
@@ -17564,12 +16841,10 @@ msgstr ""
 
 #: ../plugins/face/face.c:286
 #, fuzzy
-#| msgid "Select a File"
 msgid "Select a Face Picture"
 msgstr "àààà àààà ààà"
 
 #: ../plugins/face/face.c:296
-#| msgid "Importing files"
 msgid "Image files"
 msgstr "àààà ààààà"
 
@@ -17583,7 +16858,6 @@ msgstr ""
 
 #: ../plugins/face/face.c:420
 #, fuzzy
-#| msgid "I_nclude threads"
 msgid "Include _Face"
 msgstr "àààààà ààààà àà (_n)"
 
@@ -17593,28 +16867,23 @@ msgstr ""
 
 #: ../plugins/face/org-gnome-face.error.xml.h:1
 #, fuzzy
-#| msgid "Table header"
 msgid "Failed Read"
 msgstr "àààààà àààà"
 
 #: ../plugins/face/org-gnome-face.error.xml.h:2
-#| msgid "Invalid Date Value"
 msgid "Invalid Image Size"
 msgstr "àààààà àààà ààà"
 
 #: ../plugins/face/org-gnome-face.error.xml.h:3
-#| msgid "_No image"
 msgid "Not an image"
 msgstr "ààà àààà ààà"
 
 #: ../plugins/face/org-gnome-face.error.xml.h:4
 #, fuzzy
-#| msgid "Please select an image for this contact"
 msgid "Please select an image of size 48 * 48"
 msgstr "àààààààà ààààà à àààààà àààà ààààà àààà ààà"
 
 #: ../plugins/face/org-gnome-face.error.xml.h:5
-#| msgid "The item could not be sent!\n"
 msgid "The file cannot be read"
 msgstr "àààààà ààààà ààààà ààà"
 
@@ -17624,14 +16893,14 @@ msgstr ""
 
 #: ../plugins/google-account-setup/google-contacts-source.c:315
 #: ../plugins/webdav-account-setup/webdav-contacts-source.c:244
-#| msgid "_Server:"
 msgid "Server"
 msgstr "ààààà"
 
 #: ../plugins/google-account-setup/google-source.c:438
 #, c-format
 msgid "Enter password for user %s to access list of subscribed calendars."
-msgstr "àààààààà àààà ààààààààààà àààà àà àààà àààà àààà àààààààààà %s àààà ààààààà àà àààà ààà."
+msgstr ""
+"àààààààà àààà ààààààààààà àààà àà àààà àààà àààà àààààààààà %s àààà ààààààà àà àààà ààà."
 
 #: ../plugins/google-account-setup/google-source.c:549
 #, c-format
@@ -17653,7 +16922,6 @@ msgid "Cal_endar:"
 msgstr "àààààààà (_e):"
 
 #: ../plugins/google-account-setup/google-source.c:684
-#| msgid "Retrieve _list"
 msgid "Retrieve _List"
 msgstr "àààà àà ààààà ààààà àà (_L)"
 
@@ -17722,17 +16990,6 @@ msgstr "àààààà ààààà"
 
 #: ../plugins/groupwise-features/install-shared.c:230
 #, fuzzy, c-format
-#| msgid ""
-#| "The user '%s' has shared a folder with you\n"
-#| "\n"
-#| "Message from '%s'\n"
-#| "\n"
-#| "\n"
-#| "%s\n"
-#| "\n"
-#| "\n"
-#| "Click 'Forward' to install the shared folder\n"
-#| "\n"
 msgid ""
 "The user '%s' has shared a folder with you\n"
 "\n"
@@ -17779,7 +17036,6 @@ msgstr "à-àààà:"
 
 #: ../plugins/groupwise-features/junk-settings.ui.h:2
 #, fuzzy
-#| msgid "_Junk List"
 msgid "Junk List:"
 msgstr "ààà àààà (_J)"
 
@@ -17803,9 +17059,6 @@ msgstr "àààààà àààà àààààà"
 
 #: ../plugins/groupwise-features/mail-retract.c:90
 #, fuzzy
-#| msgid ""
-#| "Retracting a message may remove it from the recipient's mailbox. Are you "
-#| "sure you want to do this ?"
 msgid ""
 "Retracting a message may remove it from the recipient's mailbox. Are you "
 "sure you want to do this?"
@@ -17898,19 +17151,16 @@ msgstr "ààààà àààààààààà ààà àà àà
 
 #: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:1
 #, fuzzy
-#| msgid "Do you want to resend the meeting ?"
 msgid "Do you want to resend the meeting?"
 msgstr "ààà ààà ààààààààà ààà:àààààà ààààà àà?"
 
 #: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:2
 #, fuzzy
-#| msgid "Do you want to resend the recurring meeting ?"
 msgid "Do you want to resend the recurring meeting?"
 msgstr "ààà ààà à àààààà ààààààààà ààà:àààààà àààà ààààà àà?"
 
 #: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:3
 #, fuzzy
-#| msgid "Do you want to retract the original item ?"
 msgid "Do you want to retract the original item?"
 msgstr "ààà àààà àààààà ààààà àààà àààààààà àààà àà?"
 
@@ -17930,7 +17180,8 @@ msgstr "ààààà ààààà ààààààà ààààà 
 msgid ""
 "This will create a new meeting with the existing meeting details. The "
 "recurrence rule needs to be re-entered."
-msgstr "à ààààà àààà ààààà àààà ààà àààà àààààà. àààààà àààà àà ààà:àààà àààààà àààà àà."
+msgstr ""
+"à ààààà àààà ààààà àààà ààà àààà àààààà. àààààà àààà àà ààà:àààà àààààà àààà àà."
 
 #. Translators: "it" is a "recurring meeting" (string refers to "This is a recurring meeting")
 #: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:9
@@ -17955,7 +17206,6 @@ msgid "Shared Folder Notification"
 msgstr "ààààààààà ààààààààà àààà"
 
 #: ../plugins/groupwise-features/properties.ui.h:8
-#| msgid "Users"
 msgid "Users:"
 msgstr "ààààààààààà:"
 
@@ -18013,7 +17263,6 @@ msgstr "àààààààà"
 
 #: ../plugins/groupwise-features/proxy-login-dialog.ui.h:1
 #: ../widgets/misc/e-account-tree-view.c:243
-#| msgid "Account name"
 msgid "Account Name"
 msgstr "àààà ààà"
 
@@ -18041,13 +17290,12 @@ msgstr "àààààààà ààà ààààà àààààà 
 
 #. 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:709
-#| msgid "Proxy"
 msgctxt "GW"
 msgid "Proxy"
 msgstr "àààààààà"
 
 #: ../plugins/groupwise-features/proxy.c:935
-#: ../plugins/groupwise-features/share-folder.c:692
+#: ../plugins/groupwise-features/share-folder.c:694
 msgid "Add User"
 msgstr "àààààààààà ààààà"
 
@@ -18056,7 +17304,7 @@ msgid "Advanced send options"
 msgstr "àààààà ààààààà àà ààààà"
 
 #: ../plugins/groupwise-features/share-folder-common.c:316
-#: ../plugins/groupwise-features/share-folder.c:727
+#: ../plugins/groupwise-features/share-folder.c:729
 msgid "Users"
 msgstr "ààààààààààà"
 
@@ -18068,15 +17316,15 @@ msgstr "ààààààààààà àààà ààà ààà à
 msgid "Sharing"
 msgstr "àààààà ààààà ààà"
 
-#: ../plugins/groupwise-features/share-folder.c:530
+#: ../plugins/groupwise-features/share-folder.c:532
 msgid "Custom Notification"
 msgstr "àààààààààààà àààà"
 
-#: ../plugins/groupwise-features/share-folder.c:732
+#: ../plugins/groupwise-features/share-folder.c:734
 msgid "Add   "
 msgstr "ààààà   "
 
-#: ../plugins/groupwise-features/share-folder.c:738
+#: ../plugins/groupwise-features/share-folder.c:740
 msgid "Modify"
 msgstr "àààààà"
 
@@ -18131,13 +17379,11 @@ msgstr "àààà ààààààà: "
 
 #: ../plugins/image-inline/org-gnome-image-inline.eplug.xml.h:1
 #, fuzzy
-#| msgid "Inline vCards"
 msgid "Inline Image"
 msgstr "àààààà vCards"
 
 #: ../plugins/image-inline/org-gnome-image-inline.eplug.xml.h:2
 #, fuzzy
-#| msgid "Show vCards directly in mail messages."
 msgid "View image attachments directly in mail messages."
 msgstr "àààà àààààààààà àààà à vCards ààààà."
 
@@ -18196,7 +17442,6 @@ msgstr "IMAP àààààà"
 #. the second '%s' with an error message
 #: ../plugins/itip-formatter/itip-formatter.c:485
 #, fuzzy, c-format
-#| msgid "Failed to load the calendar '%s'"
 msgid "Failed to load the calendar '%s' (%s)"
 msgstr "àààààààà '%s' àààààààà àààààà"
 
@@ -18291,7 +17536,8 @@ msgstr "ààààà àààààà ààààààà àà"
 
 #: ../plugins/itip-formatter/itip-formatter.c:1532
 msgid "Attendee status can not be updated because the item no longer exists"
-msgstr "ààààààà àààààà àààààà ààààà àààà àààààà ààààà ààààà ààà àààà ààààààààààà ààààààà ààà"
+msgstr ""
+"ààààààà àààààà àààààà ààààà àààà àààààà ààààà ààààà ààà àààà ààààààààààà ààààààà ààà"
 
 #: ../plugins/itip-formatter/itip-formatter.c:1554
 msgid "Meeting information sent"
@@ -18319,12 +17565,10 @@ msgstr "àààà ààààààà ààààààààà ààà
 
 #. Translators: This is a default filename for a calendar.
 #: ../plugins/itip-formatter/itip-formatter.c:1640
-#| msgid "Calendars"
 msgid "calendar.ics"
 msgstr "calendar.ics"
 
 #: ../plugins/itip-formatter/itip-formatter.c:1645
-#| msgid "New Calendar"
 msgid "Save Calendar"
 msgstr "àààààààà ààààààà"
 
@@ -18364,10 +17608,10 @@ msgstr "ààààààà àààààààà ààà ààààà
 msgid ""
 "To process all of these items, the file should be saved and the calendar "
 "imported"
-msgstr "à ààà àààààà àà ààààààààà àààà àààà, àààà ààààààààà àààà ààà àààààààà àààà àààà àààà"
+msgstr ""
+"à ààà àààààà àà ààààààààà àààà àààà, àààà ààààààààà àààà ààà àààààààà àààà àààà àààà"
 
 #: ../plugins/itip-formatter/itip-formatter.c:2460
-#| msgid "None"
 msgctxt "cal-itip"
 msgid "None"
 msgstr "ààà àààà"
@@ -18548,7 +17792,6 @@ msgstr "àààààà ààààààà"
 #: ../plugins/itip-formatter/itip-view.c:455
 #: ../plugins/itip-formatter/itip-view.c:542
 #, fuzzy, c-format
-#| msgid "Please respond on behalf of <b>%s</b>"
 msgid "Please respond on behalf of %s"
 msgstr "àààààààà ààààà <b>%s</b> àà ààà ààààààààààà ààà"
 
@@ -18556,167 +17799,134 @@ msgstr "àààààààà ààààà <b>%s</b> àà ààà à
 #: ../plugins/itip-formatter/itip-view.c:457
 #: ../plugins/itip-formatter/itip-view.c:544
 #, fuzzy, c-format
-#| msgid "Received on behalf of <b>%s</b>"
 msgid "Received on behalf of %s"
 msgstr "<b>%s</b> àà ààà ààààààààà ààààà"
 
 #: ../plugins/itip-formatter/itip-view.c:374
 #, fuzzy, c-format
-#| msgid ""
-#| "<b>%s</b> through %s has published the following meeting information:"
 msgid "%s through %s has published the following meeting information:"
 msgstr "<b>%s</b> àààààà %s à àààààà ààààààà ààààààà àààààààà ààà:"
 
 #: ../plugins/itip-formatter/itip-view.c:376
 #, fuzzy, c-format
-#| msgid "<b>%s</b> has published the following meeting information:"
 msgid "%s has published the following meeting information:"
 msgstr "<b>%s</b> à àààààà ààààààà ààààààà àààààààà ààà:"
 
 #: ../plugins/itip-formatter/itip-view.c:381
 #, fuzzy, c-format
-#| msgid "<b>%s</b> has delegated the following meeting to you:"
 msgid "%s has delegated the following meeting to you:"
 msgstr "<b>%s</b> à àààààà àààààààààà ààààà àààà ààààà àààààà àà:"
 
 #: ../plugins/itip-formatter/itip-view.c:384
 #, fuzzy, c-format
-#| msgid ""
-#| "<b>%s</b> through %s requests your presence at the following meeting:"
 msgid "%s through %s requests your presence at the following meeting:"
 msgstr "<b>%s</b> àààààà %s à ààààà àààààà àààààààààà ààààààà àààààà ààà àà:"
 
 #: ../plugins/itip-formatter/itip-view.c:386
 #, fuzzy, c-format
-#| msgid "<b>%s</b> requests your presence at the following meeting:"
 msgid "%s requests your presence at the following meeting:"
 msgstr "<b>%s</b> à ààààà àààààà àààààààààà ààààààà àààààà ààà àà:"
 
 #: ../plugins/itip-formatter/itip-view.c:392
 #, fuzzy, c-format
-#| msgid "<b>%s</b> through %s wishes to add to an existing meeting:"
 msgid "%s through %s wishes to add to an existing meeting:"
 msgstr "<b>%s</b> àààààà %s ààààà ààààààà àààààà ààààà àà:"
 
 #: ../plugins/itip-formatter/itip-view.c:394
 #, fuzzy, c-format
-#| msgid "<b>%s</b> wishes to add to an existing meeting:"
 msgid "%s wishes to add to an existing meeting:"
 msgstr "<b>%s</b> ààààà ààààààà àààààà ààààà àà:"
 
 #: ../plugins/itip-formatter/itip-view.c:398
 #, fuzzy, c-format
-#| msgid ""
-#| "<b>%s</b> through %s wishes to receive the latest information for the "
-#| "following meeting:"
 msgid ""
 "%s through %s wishes to receive the latest information for the following "
 "meeting:"
-msgstr "<b>%s</b> à %s àààààà àààààà ààààààà àààààà àààààààà ààààààà ààààààà àààà ààààà àà:"
+msgstr ""
+"<b>%s</b> à %s àààààà àààààà ààààààà àààààà àààààààà ààààààà ààààààà àààà ààààà àà:"
 
 #: ../plugins/itip-formatter/itip-view.c:400
 #, fuzzy, c-format
-#| msgid ""
-#| "<b>%s</b> wishes to receive the latest information for the following "
-#| "meeting:"
 msgid "%s wishes to receive the latest information for the following meeting:"
 msgstr "<b>%s</b> àààààà ààààààà àààà àààààààà ààààààà àààààà ààààà àà:"
 
 #: ../plugins/itip-formatter/itip-view.c:404
 #, fuzzy, c-format
-#| msgid "<b>%s</b> through %s has sent back the following meeting response:"
 msgid "%s through %s has sent back the following meeting response:"
 msgstr "<b>%s</b> à %s àààààà àààààà ààààààà ààààààààààà ààààààà àà:"
 
 #: ../plugins/itip-formatter/itip-view.c:406
 #, fuzzy, c-format
-#| msgid "<b>%s</b> has sent back the following meeting response:"
 msgid "%s has sent back the following meeting response:"
 msgstr "<b>%s</b> à àààààà ààààààà ààààààààààà àààà ààààààà:"
 
 #: ../plugins/itip-formatter/itip-view.c:410
 #, fuzzy, c-format
-#| msgid "<b>%s</b> through %s has canceled the following meeting:"
 msgid "%s through %s has canceled the following meeting:"
 msgstr "<b>%s</b> àààààà %s à àààààà ààààààà àà ààà:"
 
 #: ../plugins/itip-formatter/itip-view.c:412
 #, fuzzy, c-format
-#| msgid "<b>%s</b> has canceled the following meeting."
 msgid "%s has canceled the following meeting."
 msgstr "<b>%s</b> à àààààà ààààààà àà ààà."
 
 #: ../plugins/itip-formatter/itip-view.c:416
 #, fuzzy, c-format
-#| msgid "<b>%s</b> through %s has proposed the following meeting changes."
 msgid "%s through %s has proposed the following meeting changes."
 msgstr "<b>%s</b> à %s àààààà àààààà ààààààà ààààààà àààààà àà."
 
 #: ../plugins/itip-formatter/itip-view.c:418
 #, fuzzy, c-format
-#| msgid "<b>%s</b> has proposed the following meeting changes."
 msgid "%s has proposed the following meeting changes."
 msgstr "<b>%s</b> à àààààà ààààààà ààààààààà àààààààà àààààà àà."
 
 #: ../plugins/itip-formatter/itip-view.c:422
 #, fuzzy, c-format
-#| msgid "<b>%s</b> through %s has declined the following meeting changes:"
 msgid "%s through %s has declined the following meeting changes:"
 msgstr "<b>%s</b> àààààà %s à àààààà ààààààà ààààààà ààààààà àà:"
 
 #: ../plugins/itip-formatter/itip-view.c:424
 #, fuzzy, c-format
-#| msgid "<b>%s</b> has declined the following meeting changes."
 msgid "%s has declined the following meeting changes."
 msgstr "<b>%s</b> à àààààà ààààààà ààààààà ààààààà àà."
 
 #: ../plugins/itip-formatter/itip-view.c:462
 #, fuzzy, c-format
-#| msgid "<b>%s</b> through %s has published the following task:"
 msgid "%s through %s has published the following task:"
 msgstr "<b>%s</b> àààààà %s à àààààà àààà àààààààà ààà:"
 
 #: ../plugins/itip-formatter/itip-view.c:464
 #, fuzzy, c-format
-#| msgid "<b>%s</b> has published the following task:"
 msgid "%s has published the following task:"
 msgstr "<b>%s</b> à àààààà àààà àààààààà ààà:"
 
 #: ../plugins/itip-formatter/itip-view.c:469
 #, fuzzy, c-format
-#| msgid "<b>%s</b> requests the assignment of %s to the following task:"
 msgid "%s requests the assignment of %s to the following task:"
 msgstr "<b>%s</b> à %s àààààà àààààà ààààààà àààààààà àààààà ààà àà:"
 
 #: ../plugins/itip-formatter/itip-view.c:472
 #, fuzzy, c-format
-#| msgid "<b>%s</b> through %s has assigned you a task:"
 msgid "%s through %s has assigned you a task:"
 msgstr "<b>%s</b> àààààà %s à àààà àààà ààààà àà:"
 
 #: ../plugins/itip-formatter/itip-view.c:474
 #, fuzzy, c-format
-#| msgid "<b>%s</b> has assigned you a task:"
 msgid "%s has assigned you a task:"
 msgstr "<b>%s</b> à àààà àààà ààààà àà:"
 
 #: ../plugins/itip-formatter/itip-view.c:480
 #, fuzzy, c-format
-#| msgid "<b>%s</b> through %s wishes to add to an existing task:"
 msgid "%s through %s wishes to add to an existing task:"
 msgstr "<b>%s</b> àààààà %s ààààà àààà àààààà ààààà àà:"
 
 #: ../plugins/itip-formatter/itip-view.c:482
 #, fuzzy, c-format
-#| msgid "<b>%s</b> wishes to add to an existing task:"
 msgid "%s wishes to add to an existing task:"
 msgstr "<b>%s</b> ààààà àààà àààààà ààààà àà:"
 
 #: ../plugins/itip-formatter/itip-view.c:486
 #, fuzzy, c-format
-#| msgid ""
-#| "<b>%s</b> through %s wishes to receive the latest information for the "
-#| "following assigned task:"
 msgid ""
 "%s through %s wishes to receive the latest information for the following "
 "assigned task:"
@@ -18726,95 +17936,77 @@ msgstr ""
 
 #: ../plugins/itip-formatter/itip-view.c:488
 #, fuzzy, c-format
-#| msgid ""
-#| "<b>%s</b> wishes to receive the latest information for the following "
-#| "assigned task:"
-msgid "%s wishes to receive the latest information for the following assigned task:"
+msgid ""
+"%s wishes to receive the latest information for the following assigned task:"
 msgstr "<b>%s</b> àààààà àààààààà ààààà àààà àààààààà ààààààà àààààà ààààà àà:"
 
 #: ../plugins/itip-formatter/itip-view.c:492
 #, fuzzy, c-format
-#| msgid ""
-#| "<b>%s</b> through %s has sent back the following assigned task response:"
 msgid "%s through %s has sent back the following assigned task response:"
 msgstr "%2$s àààààà <b>%1$s</b> à àààààà àààààààà àààààà ààààààààààà ààààààà ààà:"
 
 #: ../plugins/itip-formatter/itip-view.c:494
 #, fuzzy, c-format
-#| msgid "<b>%s</b> has sent back the following assigned task response:"
 msgid "%s has sent back the following assigned task response:"
 msgstr "<b>%s</b> à àààààà ààààààààà ààààààà ààààààààààà àààà ààààààà:"
 
 #: ../plugins/itip-formatter/itip-view.c:498
 #, fuzzy, c-format
-#| msgid "<b>%s</b> through %s has canceled the following assigned task:"
 msgid "%s through %s has canceled the following assigned task:"
 msgstr "<b>%s</b> àààààà %s à àààààà àààààààà ààààà àà ààà:"
 
 #: ../plugins/itip-formatter/itip-view.c:500
 #, fuzzy, c-format
-#| msgid "<b>%s</b> has canceled the following assigned task:"
 msgid "%s has canceled the following assigned task:"
 msgstr "<b>%s</b> à àààààà àààààààà ààààà àà ààà:"
 
 #: ../plugins/itip-formatter/itip-view.c:504
 #, fuzzy, c-format
-#| msgid ""
-#| "<b>%s</b> through %s has proposed the following task assignment changes:"
 msgid "%s through %s has proposed the following task assignment changes:"
 msgstr "<b>%s</b> à %s àààààà àààààà àààà àààààà ààààààààà àààà àààà àà:"
 
 #: ../plugins/itip-formatter/itip-view.c:506
 #, fuzzy, c-format
-#| msgid "<b>%s</b> has proposed the following task assignment changes:"
 msgid "%s has proposed the following task assignment changes:"
 msgstr "<b>%s</b> à àààààà àààà àààààà ààààààààà àààààààà àààààà:"
 
 #: ../plugins/itip-formatter/itip-view.c:510
 #, fuzzy, c-format
-#| msgid "<b>%s</b> through %s has declined the following assigned task:"
 msgid "%s through %s has declined the following assigned task:"
 msgstr "<b>%s</b> àààààà %s à àààààà àààààààà ààààà ààààà:"
 
 #: ../plugins/itip-formatter/itip-view.c:512
 #, fuzzy, c-format
-#| msgid "<b>%s</b> has declined the following assigned task:"
 msgid "%s has declined the following assigned task:"
 msgstr "<b>%s</b> àààààà àààààà àààààà ààààà:"
 
 #: ../plugins/itip-formatter/itip-view.c:549
 #, fuzzy, c-format
-#| msgid "<b>%s</b> through %s has published the following memo:"
 msgid "%s through %s has published the following memo:"
 msgstr "<b>%s</b> àààààà %s à àààààà àààà àààààààà ààààà:"
 
 #: ../plugins/itip-formatter/itip-view.c:551
 #, fuzzy, c-format
-#| msgid "<b>%s</b> has published the following memo:"
 msgid "%s has published the following memo:"
 msgstr "<b>%s</b> à àààààà àààà àààààààà ààààà:"
 
 #: ../plugins/itip-formatter/itip-view.c:556
 #, fuzzy, c-format
-#| msgid "<b>%s</b> through %s wishes to add to an existing memo:"
 msgid "%s through %s wishes to add to an existing memo:"
 msgstr "<b>%s</b> àààààà %s ààààà àààà àààààààà ààààà àààà àà:"
 
 #: ../plugins/itip-formatter/itip-view.c:558
 #, fuzzy, c-format
-#| msgid "<b>%s</b> wishes to add to an existing memo:"
 msgid "%s wishes to add to an existing memo:"
 msgstr "<b>%s</b> ààààààà àààà àààààààà ààààà àààà àà:"
 
 #: ../plugins/itip-formatter/itip-view.c:562
 #, fuzzy, c-format
-#| msgid "<b>%s</b> through %s has canceled the following shared memo:"
 msgid "%s through %s has canceled the following shared memo:"
 msgstr "<b>%s</b> àààààà %s à àààààà ààààààààà àààà àà ààààà:"
 
 #: ../plugins/itip-formatter/itip-view.c:564
 #, fuzzy, c-format
-#| msgid "<b>%s</b> has canceled the following shared memo:"
 msgid "%s has canceled the following shared memo:"
 msgstr "<b>%s</b> à àààààà ààààààààà àààà àà ààààà:"
 
@@ -18823,7 +18015,6 @@ msgid "All day:"
 msgstr "ààà àààà:"
 
 #: ../plugins/itip-formatter/itip-view.c:698
-#| msgid "Sta_rt date:"
 msgid "Start day:"
 msgstr "ààààààà àààà:"
 
@@ -18834,8 +18025,6 @@ msgid "Start time:"
 msgstr "ààààààà ààà:"
 
 #: ../plugins/itip-formatter/itip-view.c:710
-#| msgid "%d day"
-#| msgid_plural "%d days"
 msgid "End day:"
 msgstr "ààààà àààà:"
 
@@ -18863,7 +18052,6 @@ msgstr "ààààà (_D)"
 #: ../plugins/itip-formatter/itip-view.c:862
 #: ../plugins/itip-formatter/itip-view.c:878
 #: ../plugins/itip-formatter/itip-view.c:883
-#| msgid "Accept"
 msgid "A_ccept"
 msgstr "àààààààà (_c)"
 
@@ -18883,7 +18071,6 @@ msgid "_Tentative"
 msgstr "àààààà (_T)"
 
 #: ../plugins/itip-formatter/itip-view.c:855
-#| msgid "_Accept all"
 msgid "A_ccept all"
 msgstr "àààà àààààààà (_c)"
 
@@ -18950,9 +18137,6 @@ msgstr "Itip àààààààà"
 
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:1
 #, fuzzy
-#| msgid ""
-#| "&quot;{0}&quot; has delegated the meeting. Do you want to add the "
-#| "delegate &quot;{1}&quot;?"
 msgid "'{0}' has delegated the meeting. Do you want to add the delegate '{1}'?"
 msgstr ""
 "&quot;{0}&quot; à ààààààà àààààà ààà ààà. ààà ààà &quot;{1}&quot; ààààààààà àààààà "
@@ -18963,7 +18147,8 @@ msgid "This meeting has been delegated"
 msgstr "ààààààà àààààà àà àà àà"
 
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:3
-msgid "This response is not from a current attendee. Add the sender as an attendee?"
+msgid ""
+"This response is not from a current attendee. Add the sender as an attendee?"
 msgstr "à ààààààààààà à ààààààà àààààààààà ààà. ààà ààààààààà ààààà ààààà àààààà àà?"
 
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:1
@@ -19000,8 +18185,6 @@ msgstr "àààààà ààà ààààààà ààà ààà
 
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:8
 #, fuzzy
-#| msgid ""
-#| "Sound file to be played when new messages arrive, if not in beep mode."
 msgid "Play themed sound when new messages arrive, if not in beep mode."
 msgstr "àààààà ààà ààààààà ààà àààààà àààààààà ààààà àààà, àà ààà ààààààààà àààà ààà."
 
@@ -19056,7 +18239,6 @@ msgstr[1] ""
 #. * sender address, like "From: user example com"
 #: ../plugins/mail-notification/mail-notification.c:402
 #, c-format
-#| msgid "From %s:"
 msgid "From: %s"
 msgstr "ààààà: %s"
 
@@ -19064,7 +18246,6 @@ msgstr "ààààà: %s"
 #. * subject, like "Subject: It happened again"
 #: ../plugins/mail-notification/mail-notification.c:415
 #, c-format
-#| msgid "Subject:"
 msgid "Subject: %s"
 msgstr "àààà: %s"
 
@@ -19102,7 +18283,6 @@ msgid "Use sound _theme"
 msgstr "àààààà ààààà ààààà (_t)"
 
 #: ../plugins/mail-notification/mail-notification.c:777
-#| msgid "Play _sound file"
 msgid "Play _file:"
 msgstr "àààà ààààà (_f)"
 
@@ -19137,7 +18317,8 @@ msgstr ""
 msgid ""
 "Selected calendar contains event '%s' already. Would you like to edit the "
 "old event?"
-msgstr "àààà àààà àààààààà ààààààà àààà '%s' àà ààààà àà. ààà ààà àààà ààààààà àààààà àààà ààààà àà?"
+msgstr ""
+"àààà àààà àààààààà ààààààà àààà '%s' àà ààààà àà. ààà ààà àààà ààààààà àààààà àààà ààààà àà?"
 
 #: ../plugins/mail-to-task/mail-to-task.c:492
 #, c-format
@@ -19153,7 +18334,8 @@ msgstr ""
 msgid ""
 "Selected memo list contains memo '%s' already. Would you like to edit the "
 "old memo?"
-msgstr "àààà àààà àààà àààà àààà '%s' àà ààààààà ààààà àà. ààà ààà ààààà àààààà àààààà àààà ààààà àà?"
+msgstr ""
+"àààà àààà àààà àààà àààà '%s' àà ààààààà ààààà àà. ààà ààà ààààà àààààà àààààà àààà ààààà àà?"
 
 #. Translators: Codewise it is impossible to provide separate strings for all
 #. combinations of singular and plural. Please translate it in the way that you
@@ -19368,7 +18550,6 @@ msgstr "ààààààààà àààààààà ààà ààà
 
 #: ../plugins/mailing-list-actions/mailing-list-actions.c:331
 #, fuzzy
-#| msgid "Unsubscribe to the mailing list this message belongs to"
 msgid "Unsubscribe from the mailing list this message belongs to"
 msgstr "à àààààà àà ààààààà àààààà àààààà àà ààààààà àààààààà ààà ààà"
 
@@ -19517,7 +18698,6 @@ msgid "Let Evolution choose the best part to show."
 msgstr ""
 
 #: ../plugins/prefer-plain/prefer-plain.c:226
-#| msgid "Show HTML if present"
 msgid "Show plain text if present"
 msgstr "àààà àààààà ààààà àà àààà ààà àà"
 
@@ -19529,7 +18709,6 @@ msgstr ""
 
 #: ../plugins/prefer-plain/prefer-plain.c:227
 #, fuzzy
-#| msgid "Only ever show PLAIN"
 msgid "Only ever show plain text"
 msgstr "àààààà àààà à ààààà"
 
@@ -19661,12 +18840,10 @@ msgid "_Publish Calendar Information"
 msgstr "àààààààà ààààààà àààààààà ààà (_P)"
 
 #: ../plugins/publish-calendar/publish-calendar.ui.h:2
-#| msgid "Custom Notification"
 msgid "Custom Location"
 msgstr "ààààààà ààààà"
 
 #: ../plugins/publish-calendar/publish-calendar.ui.h:3
-#| msgid "Day"
 msgid "Daily"
 msgstr "ààààà"
 
@@ -19676,10 +18853,6 @@ msgstr "FTP (àààààà àààà)"
 
 #: ../plugins/publish-calendar/publish-calendar.ui.h:9
 #, fuzzy
-#| msgid ""
-#| "Daily\n"
-#| "Weekly\n"
-#| "Manual (via Actions menu)"
 msgid "Manual (via Actions menu)"
 msgstr ""
 "ààààà\n"
@@ -19692,7 +18865,6 @@ msgstr "ààààà (_o):"
 
 #: ../plugins/publish-calendar/publish-calendar.ui.h:12
 #, fuzzy
-#| msgid "Public"
 msgid "Public FTP"
 msgstr "ààààà"
 
@@ -19718,7 +18890,6 @@ msgstr "àààà àààààà (_t):"
 
 #: ../plugins/publish-calendar/publish-calendar.ui.h:18
 #, fuzzy
-#| msgid "Source"
 msgid "Sources"
 msgstr "ààààà"
 
@@ -19728,19 +18899,16 @@ msgstr "ààà àààà (_d):"
 
 #: ../plugins/publish-calendar/publish-calendar.ui.h:20
 #, fuzzy
-#| msgid "WebDAV"
 msgid "WebDAV (HTTP)"
 msgstr "WebDAV"
 
 #: ../plugins/publish-calendar/publish-calendar.ui.h:21
 #, fuzzy
-#| msgid "Week"
 msgid "Weekly"
 msgstr "àààààààà"
 
 #: ../plugins/publish-calendar/publish-calendar.ui.h:22
 #, fuzzy
-#| msgid "_Window"
 msgid "Windows share"
 msgstr "àààààà (_W)"
 
@@ -19766,7 +18934,6 @@ msgstr "àààààààààà ààà (_U):"
 
 #: ../plugins/publish-calendar/publish-calendar.ui.h:31
 #, fuzzy
-#| msgid "Call"
 msgid "iCal"
 msgstr "àààààà"
 
@@ -19817,15 +18984,14 @@ msgstr "SpamAssassin àààààà àààà àààà àààà,
 
 #: ../plugins/sa-junk-plugin/em-junk-filter.c:519
 #, fuzzy, c-format
-#| msgid "SpamAssassin is not available."
 msgid "SpamAssassin is not available. Please install it first."
 msgstr "SpamAssassin àààààà ààà."
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:939
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:936
 msgid "This will make SpamAssassin more reliable, but slower"
 msgstr "à Spamassasin àà ààà àààààààààààààà ààààà àà, ààààà ààààà ààààà"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:947
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:944
 msgid "I_nclude remote tests"
 msgstr "àààààà ààààààà ààààà (_n)"
 
@@ -19956,19 +19122,16 @@ msgstr "ààààà ààààà àààà àààà ààà"
 
 #: ../plugins/save-calendar/save-calendar.c:334
 #, fuzzy
-#| msgid "Save the selected messages as a text file"
 msgid "Save the selected calendar to disk"
 msgstr "àààààà ààààààààà àààà àààà ààààà ààààààà"
 
 #: ../plugins/save-calendar/save-calendar.c:365
 #, fuzzy
-#| msgid "Save the selected messages as a text file"
 msgid "Save the selected memo list to disk"
 msgstr "àààààà ààààààààà àààà àààà ààààà ààààààà"
 
 #: ../plugins/save-calendar/save-calendar.c:396
 #, fuzzy
-#| msgid "Save a calendar or task list to disk."
 msgid "Save the selected task list to disk"
 msgstr "àààààààà àààààààà àààà ààààà àààààà ààààààà."
 
@@ -19984,7 +19147,6 @@ msgstr "àààààààà àààààà ààààààààà
 
 #: ../plugins/templates/templates.c:637
 #, fuzzy
-#| msgid "No title"
 msgid "No Title"
 msgstr "àààààà ààà"
 
@@ -20074,13 +19236,11 @@ msgstr "àààààààààà àààààà àààààà"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:5
 #, fuzzy
-#| msgid "Default window state"
 msgid "Default window X coordinate"
 msgstr "àààààà àààààà àààààà"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:6
 #, fuzzy
-#| msgid "Default window state"
 msgid "Default window Y coordinate"
 msgstr "àààààà àààààà àààààà"
 
@@ -20098,12 +19258,12 @@ msgstr "àààààà àààààà àààààà"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:10
 #, fuzzy
-#| msgid "Enable search folders"
 msgid "Enable express mode"
 msgstr "ààà ààààààà àààààà ààà"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:11
-msgid "Enables the proxy settings when accessing HTTP/Secure HTTP over the Internet."
+msgid ""
+"Enables the proxy settings when accessing HTTP/Secure HTTP over the Internet."
 msgstr ""
 "àààààà àààààààà àà HTTP/Secure HTTP àà àààà ààà ààààà ààà àààààà àààààààà ààààààà àà "
 "àààààà ààà."
@@ -20160,14 +19320,16 @@ msgstr "GtkFileChooser àààààà àààà àààààààà
 msgid ""
 "Initial view for attachment bar widgets. \"0\" is Icon View, \"1\" is List "
 "View."
-msgstr "ààààà ààààà àààààà àààà àààààààààà ààààà. \"0\" à ààààà ààààà àà, \"1\" à àààà ààààà àà."
+msgstr ""
+"ààààà ààààà àààààà àààà àààààààààà ààààà. \"0\" à ààààà ààààà àà, \"1\" à àààà ààààà àà."
 
 #: ../shell/apps_evolution_shell.schemas.in.h:23
 msgid "Last upgraded configuration version"
 msgstr "àààààà ààààààààà àààààààààà ààààààà"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:24
-msgid "List of paths for the folders to be synchronized to disk for offline usage"
+msgid ""
+"List of paths for the folders to be synchronized to disk for offline usage"
 msgstr "ààààààà àààà àààààà ààà àà àà àààààà ààààà àààà ààààà àààà ààààà àààààà àà"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:25
@@ -20229,17 +19391,16 @@ msgstr "àààààààààààààà ààààà àààà
 msgid ""
 "The configuration version of Evolution, with major/minor/configuration level "
 "(for example \"2.6.0\")."
-msgstr "Evolution àà ààààààààààà ààààààà, ààààà/ààà/àààààààààà àààà àààà (àààààà ààààà \"2.6.0\")."
+msgstr ""
+"Evolution àà ààààààààààà ààààààà, ààààà/ààà/àààààààààà àààà àààà (àààààà ààààà \"2.6.0\")."
 
 #: ../shell/apps_evolution_shell.schemas.in.h:38
 #, fuzzy
-#| msgid "The default width for the main window, in pixels."
 msgid "The default X coordinate for the main window."
 msgstr "ààààà àààààà àààà àààààà àààààà, ààààààààààà."
 
 #: ../shell/apps_evolution_shell.schemas.in.h:39
 #, fuzzy
-#| msgid "The default width for the main window, in pixels."
 msgid "The default Y coordinate for the main window."
 msgstr "ààààà àààààà àààà àààààà àààààà, ààààààààààà."
 
@@ -20358,7 +19519,8 @@ msgid "Whether the toolbar should be visible."
 msgstr "ààà ààààààààà àààààààà ààà."
 
 #: ../shell/apps_evolution_shell.schemas.in.h:61
-msgid "Whether the warning dialog in development versions of Evolution is skipped."
+msgid ""
+"Whether the warning dialog in development versions of Evolution is skipped."
 msgstr "ààà Evolution àà ààààà ààààààààààààà àààààà ààààà àààààààà àà."
 
 #: ../shell/apps_evolution_shell.schemas.in.h:62
@@ -20387,7 +19549,6 @@ msgstr "ààà ààààààà"
 #. * "Important Messages", or "Active Appointments".
 #: ../shell/e-shell-searchbar.c:938
 #, fuzzy
-#| msgid "Sho_w: "
 msgid "Sho_w:"
 msgstr "ààààà (_w): "
 
@@ -20395,7 +19556,6 @@ msgstr "ààààà (_w): "
 #. * example: Search: [_______________] in [ Current Folder ]
 #: ../shell/e-shell-searchbar.c:971
 #, fuzzy
-#| msgid "Sear_ch: "
 msgid "Sear_ch:"
 msgstr "àààà (_c): "
 
@@ -20403,25 +19563,21 @@ msgstr "àààà (_c): "
 #. * example: Search: [_______________] in [ Current Folder ]
 #: ../shell/e-shell-searchbar.c:1034
 #, fuzzy
-#| msgid " i_n "
 msgid "i_n"
 msgstr " àààà (_n) "
 
 #: ../shell/e-shell-utils.c:255
 #, fuzzy
-#| msgid "vCard (.vcf, .gcrd)"
 msgid "vCard (.vcf)"
 msgstr "vCard (.vcf, .gcrd)"
 
 #: ../shell/e-shell-utils.c:257
 #, fuzzy
-#| msgid "iCalendar files (.ics)"
 msgid "iCalendar (.ics)"
 msgstr "iCalendar ààààà (.ics)"
 
 #: ../shell/e-shell-utils.c:278
 #, fuzzy
-#| msgid "All files"
 msgid "All Files (*)"
 msgstr "ààà ààààà"
 
@@ -20442,13 +19598,11 @@ msgstr "Evolution ààààààà"
 
 #: ../shell/e-shell-window-actions.c:1215
 #, fuzzy
-#| msgid "Bug buddy is not installed."
 msgid "Bug Buddy is not installed."
 msgstr "àà ààà ààààààà ààà."
 
 #: ../shell/e-shell-window-actions.c:1217
 #, fuzzy
-#| msgid "Bug buddy could not be run."
 msgid "Bug Buddy could not be run."
 msgstr "àà ààààà ààààà àààààà àààà."
 
@@ -20463,13 +19617,11 @@ msgstr "àààààà ààà ààà (_C)"
 
 #: ../shell/e-shell-window-actions.c:1424
 #, fuzzy
-#| msgid "A_ppointments"
 msgid "_Contents"
 msgstr "àààààààà (_p)"
 
 #: ../shell/e-shell-window-actions.c:1426
 #, fuzzy
-#| msgid "Open Other User's Folder"
 msgid "Open the Evolution User Guide"
 msgstr "àààà ààààààààààààà àààààà àààà"
 
@@ -20487,7 +19639,6 @@ msgstr "àààààààà àààà ààà (_F)"
 
 #: ../shell/e-shell-window-actions.c:1461
 #, fuzzy
-#| msgid "Are you sure you want to forget all remembered passwords?"
 msgid "Forget all remembered passwords"
 msgstr "ààà ààà ààààà ààà àààààà ààà àààààààà àààà ààà ààààà àà?"
 
@@ -20505,7 +19656,6 @@ msgstr "ààà àààààà (_W)"
 
 #: ../shell/e-shell-window-actions.c:1475
 #, fuzzy
-#| msgid "Create a new window displaying this folder"
 msgid "Create a new window displaying this view"
 msgstr "à àààààààà àààààà ààà àààààà ààààà"
 
@@ -20514,7 +19664,6 @@ msgid "_Quick Reference"
 msgstr "àààà àààààà (_Q)"
 
 #: ../shell/e-shell-window-actions.c:1496
-#| msgid "Change Evolution's settings"
 msgid "Show Evolution's shortcut keys"
 msgstr "Evolution àààààà ààààà ààààà"
 
@@ -20532,7 +19681,6 @@ msgstr "ààààà ààààà ààààà ààààààà 
 
 #: ../shell/e-shell-window-actions.c:1517
 #, fuzzy
-#| msgid "Clear the search"
 msgid "Clear the current search parameters"
 msgstr "ààààà ààà ààà"
 
@@ -20541,7 +19689,6 @@ msgid "_Edit Saved Searches..."
 msgstr "àààààààààà ààààààà àààààà ààà (_E)..."
 
 #: ../shell/e-shell-window-actions.c:1524
-#| msgid "Manage your email, contacts and schedule"
 msgid "Manage your saved searches"
 msgstr "ààààà àààààààà àààààà ààààààà ààà"
 
@@ -20555,7 +19702,6 @@ msgstr "ààààà àààà (_F)"
 
 #. Block the default Ctrl+F.
 #: ../shell/e-shell-window-actions.c:1538
-#| msgid "Cancel the current mail operation"
 msgid "Execute the current search parameters"
 msgstr "ààààààà ààà ààààààààà ààààà"
 
@@ -20564,13 +19710,11 @@ msgid "_Save Search..."
 msgstr "ààà ààààààà (_S)..."
 
 #: ../shell/e-shell-window-actions.c:1545
-#| msgid "Save the current file"
 msgid "Save the current search parameters"
 msgstr "ààààààà ààà ààààààààà ààààààà"
 
 #: ../shell/e-shell-window-actions.c:1557
 #, fuzzy
-#| msgid "Submit _Bug Report"
 msgid "Submit _Bug Report..."
 msgstr "ààààà àààààà ààà ààà (_B)"
 
@@ -20583,7 +19727,6 @@ msgid "_Work Offline"
 msgstr "àààààà ààà ààà (_W)"
 
 #: ../shell/e-shell-window-actions.c:1566
-#| msgid "Start in offline mode"
 msgid "Put Evolution into offline mode"
 msgstr "àààààà ààààààààà Evolution àà àààà"
 
@@ -20592,7 +19735,6 @@ msgid "_Work Online"
 msgstr "àààààà ààà ààà (_W)"
 
 #: ../shell/e-shell-window-actions.c:1573
-#| msgid "Start in online mode"
 msgid "Put Evolution into online mode"
 msgstr "àààààà ààààààààà Evolution àà àààà"
 
@@ -20621,18 +19763,15 @@ msgid "Show Side _Bar"
 msgstr "àààà ààààà ààààà (_B)"
 
 #: ../shell/e-shell-window-actions.c:1667
-#| msgid "Show Side _Bar"
 msgid "Show the side bar"
 msgstr "àààà ààààà ààààà"
 
 #: ../shell/e-shell-window-actions.c:1673
-#| msgid "Show Animations"
 msgid "Show _Buttons"
 msgstr "àààà ààààà (_B)"
 
 #: ../shell/e-shell-window-actions.c:1675
 #, fuzzy
-#| msgid "Show the second time zone"
 msgid "Show the switcher buttons"
 msgstr "àààà àààà ààààà ààààà"
 
@@ -20641,17 +19780,14 @@ msgid "Show _Status Bar"
 msgstr "àààààààààààààà ààààà ààààà (_S)"
 
 #: ../shell/e-shell-window-actions.c:1683
-#| msgid "Show _Status Bar"
 msgid "Show the status bar"
 msgstr "àààààààààààààà ààààà ààààà"
 
 #: ../shell/e-shell-window-actions.c:1689
-#| msgid "Show _Toolbar"
 msgid "Show _Tool Bar"
 msgstr "ààààààààà ààààà (_T)"
 
 #: ../shell/e-shell-window-actions.c:1691
-#| msgid "Show _Toolbar"
 msgid "Show the tool bar"
 msgstr "ààààààààà ààààà"
 
@@ -20717,7 +19853,6 @@ msgstr "ààààààà ààààà ààààààààààà
 
 #: ../shell/e-shell-window-actions.c:1782
 #, fuzzy
-#| msgid "Set up the page settings for your current printer"
 msgid "Change the page settings for your current printer"
 msgstr "ààààà ààààààà àààààààà àààà àààààà ààààààà ààààààà ààà"
 
@@ -20731,7 +19866,7 @@ msgid "Execute these search parameters"
 msgstr "à ààà ààààààààà ààààà"
 
 #. Translators: This is used for the main window title.
-#: ../shell/e-shell-window-private.c:580
+#: ../shell/e-shell-window-private.c:578
 #, c-format
 msgid "%s - Evolution"
 msgstr "%s - Evolution"
@@ -20741,12 +19876,10 @@ msgid "New"
 msgstr "àààà"
 
 #: ../shell/e-shell.c:261
-#| msgid "Preparing account '%s' for offline"
 msgid "Preparing to go offline..."
 msgstr "àààààà ààà àààà àààààà ààà ààààà àà..."
 
 #: ../shell/e-shell.c:314
-#| msgid "Preparing account '%s' for offline"
 msgid "Preparing to go online..."
 msgstr "àààààà ààà àààà àààààà ààà ààààà ààà..."
 
@@ -20824,13 +19957,11 @@ msgstr "ààààààà àààààààààà ààààà"
 
 #: ../shell/main.c:377
 #, fuzzy
-#| msgid "Start in online mode"
 msgid "Start in \"express\" mode"
 msgstr "àààààà ààààààààà ààà ààà"
 
 #: ../shell/main.c:380
 #, fuzzy
-#| msgid "Forcibly shut down all Evolution components"
 msgid "Forcibly shut down Evolution"
 msgstr "Evolution àà ààà àààààààààà àààààààààà ààà ààà àà"
 
@@ -20852,7 +19983,6 @@ msgstr ""
 
 #: ../shell/main.c:393
 #, fuzzy
-#| msgid "Restarting Evolution"
 msgid "Request a running Evolution process to quit"
 msgstr "Evolution ààààààà ààà ààààà ààà"
 
@@ -20862,9 +19992,6 @@ msgstr "- Evolution PIM ààà ààààà àààààààà"
 
 #: ../shell/main.c:627
 #, fuzzy, c-format
-#| msgid ""
-#| "%s: --online and --offline cannot be used together.\n"
-#| "  Use %s --help for more information.\n"
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
 "  Run '%s --help' for more information.\n"
@@ -20874,9 +20001,6 @@ msgstr ""
 
 #: ../shell/main.c:633
 #, fuzzy, c-format
-#| msgid ""
-#| "%s: --online and --offline cannot be used together.\n"
-#| "  Use %s --help for more information.\n"
 msgid ""
 "%s: --force-online and --offline cannot be used together.\n"
 "  Run '%s --help' for more information.\n"
@@ -20890,13 +20014,11 @@ msgstr "ààà ààà ààààà ààà àààààà àà
 
 #: ../shell/shell.error.xml.h:2
 #, fuzzy
-#| msgid "Delete old data from version {0}?"
 msgid "Cannot upgrade directly from version {0}"
 msgstr "ààà ààààààà {0} ààààà àààà àààààà ààààà ààààà àà?"
 
 #: ../shell/shell.error.xml.h:3
 #, fuzzy
-#| msgid "Continue"
 msgid "Continue Anyway"
 msgstr "àààà àààà"
 
@@ -20917,12 +20039,10 @@ msgstr ""
 
 #: ../shell/shell.error.xml.h:7
 #, fuzzy
-#| msgid "_Quit"
 msgid "Quit Now"
 msgstr "àààà ààààà (_Q)"
 
 #: ../shell/shell.error.xml.h:8
-#| msgid "Upgrade from previous version failed: {0}"
 msgid "Upgrade from previous version failed:"
 msgstr "àààààà àààà àààààààà àààààààààààà àààààà:"
 
@@ -20932,11 +20052,6 @@ msgstr "àààà ààà (_F)"
 
 #: ../shell/shell.error.xml.h:10
 #, fuzzy
-#| msgid ""
-#| "{1}\n"
-#| "\n"
-#| "If you choose to continue, you may not have access to some of your old "
-#| "data.\n"
 msgid ""
 "{0}\n"
 "\n"
@@ -20949,8 +20064,6 @@ msgstr ""
 "ààààààà ààà.\n"
 
 #: ../shell/test/e-test-shell-backend.c:60
-#| msgctxt "New"
-#| msgid "_Test"
 msgctxt "New"
 msgid "_Test Item"
 msgstr "àààààà ààààà (_T)"
@@ -20960,13 +20073,11 @@ msgid "Create a new test item"
 msgstr "ààà àààààà ààààà ààààà"
 
 #: ../shell/test/e-test-shell-backend.c:70
-#| msgid "Resource"
 msgctxt "New"
 msgid "Test _Source"
 msgstr "àààààà ààààààà (_S)"
 
 #: ../shell/test/e-test-shell-backend.c:72
-#| msgid "Create a new test item"
 msgid "Create a new test source"
 msgstr "ààà àààààà ààààààà ààààà"
 
@@ -20982,7 +20093,6 @@ msgstr "àààààààààà àààààààà àààà à
 
 #: ../smclient/eggdesktopfile.c:957
 #, c-format
-#| msgid "Scanning %s"
 msgid "Starting %s"
 msgstr "%s ààà ààà ààààà ààà"
 
@@ -21003,19 +20113,16 @@ msgstr ""
 
 #: ../smclient/eggdesktopfile.c:1386
 #, c-format
-#| msgid "Editor not launchable"
 msgid "Not a launchable item"
 msgstr "ààà ààà àààà àààà ààààà ààà"
 
 #: ../smclient/eggsmclient.c:227
 #, fuzzy
-#| msgid "_Direct connection to the Internet"
 msgid "Disable connection to session manager"
 msgstr "àààààààà àààà àààà à ààààà (_D)"
 
 #: ../smclient/eggsmclient.c:230
 #, fuzzy
-#| msgid "Set up Pilot configuration"
 msgid "Specify file containing saved configuration"
 msgstr "àààààà àààààààààà ààààààà ààà"
 
@@ -21028,7 +20135,6 @@ msgid "Specify session management ID"
 msgstr "àààà àààààà ID àà àààààà ààà"
 
 #: ../smclient/eggsmclient.c:233
-#| msgid "UID"
 msgid "ID"
 msgstr "ID"
 
@@ -21037,7 +20143,6 @@ msgid "Session management options:"
 msgstr "àààà àààààà ààààààà:"
 
 #: ../smclient/eggsmclient.c:255
-#| msgid "Show image animations"
 msgid "Show session management options"
 msgstr "àààà àààààà ààààààààà ààààà"
 
@@ -21087,7 +20192,6 @@ msgid "All files"
 msgstr "ààà ààààà"
 
 #: ../smime/gui/certificate-manager.c:182
-#| msgid "Imported Certificate"
 msgid "Failed to import user's certificate"
 msgstr "ààààààààààààà àààààààààààà àààà ààààààà àààààà"
 
@@ -21116,7 +20220,6 @@ msgid "All email certificate files"
 msgstr "ààà ààààà àààààààààà ààààà"
 
 #: ../smime/gui/certificate-manager.c:502
-#| msgid "Failed to delete contact"
 msgid "Failed to import contact's certificate"
 msgstr "àààààààà àààààààààààà àààà ààààààà àààààà"
 
@@ -21139,7 +20242,6 @@ msgstr "àààààààààà ààààà: %s"
 
 #: ../smime/gui/component.c:46
 #, c-format
-#| msgid "Enter the password for `%s'"
 msgid "Enter the password for '%s'"
 msgstr "'%s' àààà ààààààà àààà ààà"
 
@@ -21184,7 +20286,6 @@ msgid "Authorities"
 msgstr "ààààààààààà"
 
 #: ../smime/gui/smime-ui.ui.h:3
-#| msgid "Backup All"
 msgid "Backup _All"
 msgstr "àààà ààààà àà (_A)"
 
@@ -21205,12 +20306,10 @@ msgid "Certificate Authority Trust"
 msgstr "àààààààààà àààààààààà ààààààà"
 
 #: ../smime/gui/smime-ui.ui.h:7
-#| msgid "<b>Certificate Fields</b>"
 msgid "Certificate Fields"
 msgstr "àààààààààààà àààààààà"
 
 #: ../smime/gui/smime-ui.ui.h:8
-#| msgid "<b>Certificate Hierarchy</b>"
 msgid "Certificate Hierarchy"
 msgstr "àààààààààà ààààààà"
 
@@ -21251,18 +20350,15 @@ msgid "Expires On"
 msgstr "à àààà àààà àààà ààà àà"
 
 #: ../smime/gui/smime-ui.ui.h:19
-#| msgid "Field Name"
 msgid "Field Value"
 msgstr "ààààààà ààààà"
 
 #: ../smime/gui/smime-ui.ui.h:20
-#| msgid "MD5 Fingerprint"
 msgid "Fingerprints"
 msgstr "ààààààà ààà"
 
 #: ../smime/gui/smime-ui.ui.h:23
 #, fuzzy
-#| msgid "Issued On"
 msgid "Issued By"
 msgstr "à àààà ààà ààà àà"
 
@@ -21272,7 +20368,6 @@ msgstr "à àààà ààà ààà àà"
 
 #: ../smime/gui/smime-ui.ui.h:25
 #, fuzzy
-#| msgid "Issued On"
 msgid "Issued To"
 msgstr "à àààà ààà ààà àà"
 
@@ -21302,7 +20397,6 @@ msgstr "SSL ààààà àààààààààà"
 
 #: ../smime/gui/smime-ui.ui.h:33
 #, fuzzy
-#| msgid "<b>This certificate has been verified for the following uses:</b>"
 msgid "This certificate has been verified for the following uses:"
 msgstr "<b>à àààààààààà àààààà àààààààà àààà àààààààà àà:</b>"
 
@@ -21320,12 +20414,10 @@ msgstr "àààààààààà ààààà àààààààà
 
 #: ../smime/gui/smime-ui.ui.h:37
 #, fuzzy
-#| msgid "Trust this CA to identify web sites."
 msgid "Trust this CA to identify websites."
 msgstr "ààà ààààààà ààààà àààà à CA àà ààààààà ààà."
 
 #: ../smime/gui/smime-ui.ui.h:38
-#| msgid "<b>Validity</b>"
 msgid "Validity"
 msgstr "ààààààà"
 
@@ -21334,7 +20426,8 @@ msgid "You have certificates from these organizations that identify you:"
 msgstr "ààààà àààà à àààààààà ààààààààààà àà àà ààààà ààà ààà:"
 
 #: ../smime/gui/smime-ui.ui.h:40
-msgid "You have certificates on file that identify these certificate authorities:"
+msgid ""
+"You have certificates on file that identify these certificate authorities:"
 msgstr "ààààà àààà ààààààààààààà àààà àà àà à ààààààààààààà àààààààààààà ààà ààà:"
 
 #: ../smime/gui/smime-ui.ui.h:41
@@ -21347,7 +20440,6 @@ msgstr "ààààà ààààààààààà"
 
 #. This is a verb, as in "make a backup".
 #: ../smime/gui/smime-ui.ui.h:44
-#| msgid "Backup"
 msgid "_Backup"
 msgstr "ààààà (_B)"
 
@@ -21402,19 +20494,16 @@ msgstr "PKCS #1 SHA-1 à RSA àààààààààà àààà"
 
 #: ../smime/lib/e-cert.c:639
 #, fuzzy
-#| msgid "PKCS #1 SHA-1 With RSA Encryption"
 msgid "PKCS #1 SHA-256 With RSA Encryption"
 msgstr "PKCS #1 SHA-1 à RSA àààààààààà àààà"
 
 #: ../smime/lib/e-cert.c:642
 #, fuzzy
-#| msgid "PKCS #1 SHA-1 With RSA Encryption"
 msgid "PKCS #1 SHA-384 With RSA Encryption"
 msgstr "PKCS #1 SHA-1 à RSA àààààààààà àààà"
 
 #: ../smime/lib/e-cert.c:645
 #, fuzzy
-#| msgid "PKCS #1 SHA-1 With RSA Encryption"
 msgid "PKCS #1 SHA-512 With RSA Encryption"
 msgstr "PKCS #1 SHA-1 à RSA àààààààààà àààà"
 
@@ -21644,7 +20733,6 @@ msgid "Select a Time Zone"
 msgstr "àààà ààà àààà ààà"
 
 #: ../widgets/e-timezone-dialog/e-timezone-dialog.ui.h:3
-#| msgid "Time _Zone"
 msgid "Time Zones"
 msgstr "àààà ààà"
 
@@ -21663,7 +20751,6 @@ msgstr ""
 "àààà ààààà àààà àààà ààààà àààà ààà ààààà."
 
 #: ../widgets/e-timezone-dialog/e-timezone-dialog.ui.h:7
-#| msgid "Selection Mode"
 msgid "_Selection"
 msgstr "àààààà (_S)"
 
@@ -21773,13 +20860,11 @@ msgid "Saving"
 msgstr "àààààà ààà ààààà ààà"
 
 #: ../widgets/misc/e-attachment-paned.c:97
-#| msgid "Hide _Attachment Bar"
 msgid "Hide Attachment _Bar"
 msgstr "àààààààààà àààààà (_B)"
 
 #: ../widgets/misc/e-attachment-paned.c:99
 #: ../widgets/misc/e-attachment-paned.c:637
-#| msgid "Show _Attachment Bar"
 msgid "Show Attachment _Bar"
 msgstr "ààààà ààààà ààààà (_B)"
 
@@ -21816,7 +20901,6 @@ msgid "_Hide"
 msgstr "àààààà (_H)"
 
 #: ../widgets/misc/e-attachment-view.c:406
-#| msgid "S_ave All"
 msgid "Hid_e All"
 msgstr "ààà àààààà (_e)"
 
@@ -21826,7 +20910,6 @@ msgstr "ààààààà ààà (_V)"
 
 #: ../widgets/misc/e-attachment-view.c:420
 #, fuzzy
-#| msgid "_View Inline"
 msgid "Vie_w All Inline"
 msgstr "ààààààà ààà (_V)"
 
@@ -21892,7 +20975,6 @@ msgstr "ààààààà àààààà ààà ààààà à
 
 #. To Translators: The text is concatenated to a form: "Ctrl-click to open a link http://www.example.com";
 #: ../widgets/misc/e-buffer-tagger.c:359
-#| msgid "Click to open %s"
 msgid "Ctrl-click to open a link"
 msgstr "Ctrl-ààà ààààà àààà ààààà ààà"
 
@@ -21950,7 +21032,6 @@ msgstr "ààà àààà (_N)"
 #. Translators: "None" for date field of a date edit, shown when
 #. * there is no date set.
 #: ../widgets/misc/e-dateedit.c:1689 ../widgets/misc/e-dateedit.c:1921
-#| msgid "None"
 msgctxt "date"
 msgid "None"
 msgstr "ààà àààà"
@@ -22006,11 +21087,6 @@ msgstr "àà àààà à àààà ààà (_s)"
 
 #: ../widgets/misc/e-import-assistant.c:526
 #, fuzzy
-#| msgid ""
-#| "Evolution checked for settings to import from the following\n"
-#| "applications: Pine, Netscape, Elm, iCalendar. No importable\n"
-#| "settings found. If you would like to\n"
-#| "try again, please click the \"Back\" button.\n"
 msgid ""
 "Evolution checked for settings to import from the following applications: "
 "Pine, Netscape, Elm, iCalendar. No importable settings found. If you would "
@@ -22023,13 +21099,11 @@ msgstr ""
 
 #. Install a custom "Cancel Import" button.
 #: ../widgets/misc/e-import-assistant.c:766
-#| msgid "_Import"
 msgid "_Cancel Import"
 msgstr "àààà àà ààà (_C)"
 
 #: ../widgets/misc/e-import-assistant.c:908
 #, fuzzy
-#| msgid "Preview the message to be printed"
 msgid "Preview data to be imported"
 msgstr "ààààà àààà ààààààààà àààààààààà ààà"
 
@@ -22038,7 +21112,6 @@ msgstr "ààààà àààà ààààààààà ààààà
 #: ../widgets/misc/e-import-assistant.c:1277
 #: ../widgets/misc/e-import-assistant.c:1343
 #: ../widgets/misc/e-import-assistant.c:1352
-#| msgid "Important"
 msgid "Import Data"
 msgstr "àààààà àààà ààà"
 
@@ -22058,10 +21131,6 @@ msgstr "ààààà àààà ààà"
 
 #: ../widgets/misc/e-import-assistant.c:1295
 #, fuzzy
-#| msgid ""
-#| "Welcome to the Evolution Import Assistant.\n"
-#| "With this assistant you will be guided through the process of\n"
-#| "importing external files into Evolution."
 msgid ""
 "Welcome to the Evolution Import Assistant.\n"
 "With this assistant you will be guided through the process of importing "
@@ -22085,7 +21154,6 @@ msgstr "àààà àààà ààà"
 
 #: ../widgets/misc/e-import-assistant.c:1338
 #, fuzzy
-#| msgid "Click \"Import\" to begin importing the file into Evolution. "
 msgid "Click \"Apply\" to begin importing the file into Evolution."
 msgstr "Evolution ààà àààà àààà àààà àààà \"àààà ààà\" ààà àà ààààà ààà. "
 
@@ -22103,9 +21171,6 @@ msgstr ""
 
 #: ../widgets/misc/e-online-button.c:27
 #, fuzzy
-#| msgid ""
-#| "Evolution is currently online.\n"
-#| "Click on this button to work offline."
 msgid "Evolution is currently online.  Click this button to work offline."
 msgstr ""
 "Evolution àààààààààà àààààà àà.\n"
@@ -22113,9 +21178,6 @@ msgstr ""
 
 #: ../widgets/misc/e-online-button.c:30
 #, fuzzy
-#| msgid ""
-#| "Evolution is currently offline.\n"
-#| "Click on this button to work online."
 msgid "Evolution is currently offline.  Click this button to work online."
 msgstr ""
 "Evolution àààààààààà àààààà àà.\n"
@@ -22123,9 +21185,6 @@ msgstr ""
 
 #: ../widgets/misc/e-online-button.c:33
 #, fuzzy
-#| msgid ""
-#| "Evolution is currently offline.\n"
-#| "Click on this button to work online."
 msgid "Evolution is currently offline because the network is unavailable."
 msgstr ""
 "Evolution àààààààààà àààààà àà.\n"
@@ -22197,36 +21256,30 @@ msgid "Deli_vered and opened"
 msgstr "àààààà àààà ààà àààààà (_v)"
 
 #: ../widgets/misc/e-send-options.ui.h:5
-#| msgid "<b>Delivery Options</b>"
 msgid "Delivery Options"
 msgstr "àààààààààà ààààààà"
 
 #: ../widgets/misc/e-send-options.ui.h:6
-#| msgid "_Until:"
 msgctxt "ESendOptions"
 msgid "_Until"
 msgstr "ààààà àààà (_U)"
 
 #: ../widgets/misc/e-send-options.ui.h:7
-#| msgid "_After:"
 msgctxt "ESendOptionsAfter"
 msgid "_After"
 msgstr "ààà (_A)"
 
 #: ../widgets/misc/e-send-options.ui.h:8
-#| msgid "days"
 msgctxt "ESendOptionsAfter"
 msgid "days"
 msgstr "ààààà"
 
 #: ../widgets/misc/e-send-options.ui.h:9
-#| msgid "Wi_thin"
 msgctxt "ESendOptionsWithin"
 msgid "Wi_thin"
 msgstr "àà àààà (_t)"
 
 #: ../widgets/misc/e-send-options.ui.h:10
-#| msgid "days"
 msgctxt "ESendOptionsWithin"
 msgid "days"
 msgstr "ààààà"
@@ -22240,15 +21293,11 @@ msgid "Gene_ral Options"
 msgstr "ààààààà ààààààà (_r)"
 
 #: ../widgets/misc/e-send-options.ui.h:15
-#| msgid ""
-#| "None\n"
-#| "Mail Receipt"
 msgid "Mail Receipt"
 msgstr "àààà àààà"
 
 #: ../widgets/misc/e-send-options.ui.h:17
 #, fuzzy
-#| msgid "Priority"
 msgid "Proprietary"
 msgstr "ààààààààà"
 
@@ -22258,7 +21307,6 @@ msgstr "àààààà àààààà àààà àà (_e)"
 
 #: ../widgets/misc/e-send-options.ui.h:20
 #, fuzzy
-#| msgid "<b>Return Notification</b>"
 msgid "Return Notification"
 msgstr "<b>àààà àààà</b>"
 
@@ -22271,18 +21319,15 @@ msgid "Sta_tus Tracking"
 msgstr "ààààààààà àààààààà (_t)"
 
 #: ../widgets/misc/e-send-options.ui.h:24
-#| msgid "S_tandard Font:"
 msgid "Standard"
 msgstr "ààààààààà"
 
 #: ../widgets/misc/e-send-options.ui.h:25
 #, fuzzy
-#| msgid "Sta_tus Tracking"
 msgid "Status Tracking"
 msgstr "ààààààààà àààààààà (_t)"
 
 #: ../widgets/misc/e-send-options.ui.h:26
-#| msgid "Top secret"
 msgid "Top Secret"
 msgstr "ààà ààààà"
 
@@ -22328,7 +21373,6 @@ msgstr "àààààà àààà (_W):"
 
 #. Translators: Used in send options dialog
 #: ../widgets/misc/e-send-options.ui.h:40
-#| msgid "None"
 msgctxt "send-options"
 msgid "None"
 msgstr "ààà àààà"
@@ -22353,12 +21397,10 @@ msgid "_Signature Name:"
 msgstr "àààààà ààà (_S):"
 
 #: ../widgets/misc/e-signature-manager.c:297
-#| msgid "Add signature script"
 msgid "Add Signature Script"
 msgstr "ààà ààààààààà ààààà"
 
 #: ../widgets/misc/e-signature-manager.c:362
-#| msgid "Edit Signature"
 msgid "Edit Signature Script"
 msgstr "ààà àààààààààààà àààààà ààà"
 
@@ -22368,9 +21410,6 @@ msgstr "àààà ààààà (_S)"
 
 #: ../widgets/misc/e-signature-script-dialog.c:266
 #, fuzzy
-#| msgid ""
-#| "The output of this script will be used as your\n"
-#| "signature. The name you specify will be used for display purposes only."
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
@@ -22381,13 +21420,11 @@ msgstr ""
 
 #: ../widgets/misc/e-signature-script-dialog.c:311
 #, fuzzy
-#| msgid "_Script:"
 msgid "S_cript:"
 msgstr "àààà (_S):"
 
 #: ../widgets/misc/e-signature-script-dialog.c:342
 #, fuzzy
-#| msgid "The script file must exist and be executable."
 msgid "Script file must be executable."
 msgstr "ààààààààà àààà àààà àààà à àààà ààà àà ààààà àààà àààà àààà àààà."
 
@@ -22401,7 +21438,6 @@ msgstr "ààààà ààààààà ààà ààà (_C)"
 
 #: ../widgets/misc/e-web-view.c:375
 #, fuzzy
-#| msgid "Copy things to the clipboard."
 msgid "Copy the link to the clipboard"
 msgstr "ààààààààààààà àààààààà ààà ààà."
 
@@ -22411,19 +21447,16 @@ msgstr "ààààà àààààààààà àààà (_O)"
 
 #: ../widgets/misc/e-web-view.c:385
 #, fuzzy
-#| msgid "_Open Link in Browser"
 msgid "Open the link in a web browser"
 msgstr "ààààà àààààààààà àààà (_O)"
 
 #: ../widgets/misc/e-web-view.c:393
 #, fuzzy
-#| msgid "Copy _Email Address"
 msgid "_Copy Email Address"
 msgstr "ààààà àààààààà ààà ààà (_E)"
 
 #: ../widgets/misc/e-web-view.c:422 ../widgets/misc/e-web-view.c:1077
 #, fuzzy
-#| msgid "Select all the text in a message"
 msgid "Select all text and images"
 msgstr "ààààààààààà àààà àààà àààà ààà"
 
@@ -22467,7 +21500,6 @@ msgstr "ààààà"
 #. Translators: "None" as a label of a button to unset date in a date table cell
 #: ../widgets/table/e-cell-date-edit.c:317
 #, fuzzy
-#| msgid "None"
 msgctxt "table-date"
 msgid "None"
 msgstr "ààà àààà"
@@ -22521,7 +21553,7 @@ msgid "A_vailable Fields:"
 msgstr "àààààà àààààààà (_v):"
 
 #: ../widgets/table/e-table-config.ui.h:2
-#: ../widgets/table/e-table-header-item.c:1664
+#: ../widgets/table/e-table-header-item.c:1660
 msgid "Ascending"
 msgstr "àààà àààà"
 
@@ -22534,7 +21566,7 @@ msgid "Clear _All"
 msgstr "àààà ààà ààà (_A)"
 
 #: ../widgets/table/e-table-config.ui.h:5
-#: ../widgets/table/e-table-header-item.c:1664
+#: ../widgets/table/e-table-header-item.c:1660
 msgid "Descending"
 msgstr "ààààà àààà"
 
@@ -22596,7 +21628,6 @@ msgstr "ààààààà ààààà (_S)..."
 
 #: ../widgets/table/e-table-field-chooser-dialog.c:117
 #, fuzzy
-#| msgid "Add a C_olumn..."
 msgid "Add a Column"
 msgstr "ààààà ààààà (_o)..."
 
@@ -22617,8 +21648,6 @@ msgstr ""
 #.
 #: ../widgets/table/e-table-group-container.c:351
 #, fuzzy, c-format
-#| msgid "%s : %s (%d item)"
-#| msgid_plural "%s : %s (%d items)"
 msgid "%s: %s (%d item)"
 msgid_plural "%s: %s (%d items)"
 msgstr[0] "%s : %s (%d ààààà)"
@@ -22637,60 +21666,60 @@ msgid_plural "%s (%d items)"
 msgstr[0] "%s (%d ààààà)"
 msgstr[1] "%s (%d àààààà)"
 
-#: ../widgets/table/e-table-header-item.c:1508
+#: ../widgets/table/e-table-header-item.c:1504
 msgid "Customize Current View"
 msgstr "ààààààà ààààà àààà"
 
-#: ../widgets/table/e-table-header-item.c:1529
+#: ../widgets/table/e-table-header-item.c:1525
 msgid "Sort _Ascending"
 msgstr "àààà ààààààà ààààà (_A)"
 
-#: ../widgets/table/e-table-header-item.c:1532
+#: ../widgets/table/e-table-header-item.c:1528
 msgid "Sort _Descending"
 msgstr "ààààà ààààààà ààààà (_D)"
 
-#: ../widgets/table/e-table-header-item.c:1535
+#: ../widgets/table/e-table-header-item.c:1531
 msgid "_Unsort"
 msgstr "ààààààà ààààà àààà (_U)"
 
-#: ../widgets/table/e-table-header-item.c:1538
+#: ../widgets/table/e-table-header-item.c:1534
 msgid "Group By This _Field"
 msgstr "à ààààààà àààààà ààà àààà (_F)"
 
-#: ../widgets/table/e-table-header-item.c:1541
+#: ../widgets/table/e-table-header-item.c:1537
 msgid "Group By _Box"
 msgstr "ààààà àààààà ààà (_B)"
 
-#: ../widgets/table/e-table-header-item.c:1545
+#: ../widgets/table/e-table-header-item.c:1541
 msgid "Remove This _Column"
 msgstr "à ààààà àààà àààà (_C)"
 
-#: ../widgets/table/e-table-header-item.c:1548
+#: ../widgets/table/e-table-header-item.c:1544
 msgid "Add a C_olumn..."
 msgstr "ààààà ààààà (_o)..."
 
-#: ../widgets/table/e-table-header-item.c:1552
+#: ../widgets/table/e-table-header-item.c:1548
 msgid "A_lignment"
 msgstr "àààààà (_l)"
 
-#: ../widgets/table/e-table-header-item.c:1555
+#: ../widgets/table/e-table-header-item.c:1551
 msgid "B_est Fit"
 msgstr "ààààààà àààà ààààààààà (_e)"
 
-#: ../widgets/table/e-table-header-item.c:1558
+#: ../widgets/table/e-table-header-item.c:1554
 msgid "Format Column_s..."
 msgstr "ààààààààà àààààà ààà (_s)..."
 
-#: ../widgets/table/e-table-header-item.c:1562
+#: ../widgets/table/e-table-header-item.c:1558
 msgid "Custo_mize Current View..."
 msgstr "ààààààà ààààà àààà (_m)..."
 
-#: ../widgets/table/e-table-header-item.c:1621
+#: ../widgets/table/e-table-header-item.c:1617
 msgid "_Sort By"
 msgstr "ààà ààààààà ààààààà ààààà (_S)"
 
 #. Custom
-#: ../widgets/table/e-table-header-item.c:1639
+#: ../widgets/table/e-table-header-item.c:1635
 msgid "_Custom"
 msgstr "àààààààààààà (_C)"
 
@@ -22726,11 +21755,10 @@ msgstr "ààààà"
 msgid "sort"
 msgstr "ààààààà ààààà"
 
-#: ../widgets/text/e-text.c:2285
+#: ../widgets/text/e-text.c:2283
 msgid "Select All"
 msgstr "àààà àààà ààà"
 
-#: ../widgets/text/e-text.c:2297
+#: ../widgets/text/e-text.c:2295
 msgid "Input Methods"
 msgstr "ààààà ààààààà"
-



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]