Updated Slovenian translation

1 files changed, 2607 insertions, 7101 deletions

diff --git a/help/sl/sl.po b/help/sl/sl.po
index 52db6608c4..b45933fc1a 100644
--- a/help/sl/sl.po
+++ b/help/sl/sl.po
@@ -7,44 +7,54 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution help master\n"
-"POT-Creation-Date: 2011-08-04 15:40+0200\n"
-"PO-Revision-Date: 2010-11-06 18:00+0100\n"
-"Last-Translator: Matej Urbančič <mateju@svn.gnome.org>\n"
+"POT-Creation-Date: 2011-08-10 12:51+0000\n"
+"PO-Revision-Date: 2011-09-03 17:21+0100\n"
+"Last-Translator: Andrej Žnidaršič <andrej.znidarsic@gmail.com>\n"
 "Language-Team: Slovenian GNOME Translation Team <gnome-si@googlegroups.com>\n"
 "Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || n"
-"%100==4 ? 3 : 0);\n"
+"Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || n%100==4 ? 3 : 0);\n"
 "X-Poedit-Country: SLOVENIA\n"
 "X-Poedit-Language: Slovenian\n"
 "X-Poedit-SourceCharset: utf-8\n"
 
 #: C/using-categories.page:5(desc)
-msgid ""
-"Using and managing categories for appointments, contacts, memos and tasks."
-msgstr ""
+msgid "Using and managing categories for appointments, contacts, memos and tasks."
+msgstr "Uporaba in upravljanje kategorij za sestanke, stike, zapiske in opravila."
 
-#: C/using-categories.page:13(name) C/tasks-webdav.page:11(name)
-#: C/tasks-using-several-tasklists.page:11(name) C/tasks-usage.page:11(name)
+#: C/using-categories.page:13(name)
+#: C/tasks-webdav.page:11(name)
+#: C/tasks-using-several-tasklists.page:11(name)
+#: C/tasks-usage.page:11(name)
 #: C/tasks-usage-edit-task.page:11(name)
 #: C/tasks-usage-delete-task.page:11(name)
-#: C/tasks-usage-add-task.page:11(name) C/tasks-searching.page:16(name)
-#: C/tasks-organizing.page:12(name) C/tasks-local.page:11(name)
-#: C/tasks-display-settings.page:11(name) C/tasks-caldav.page:11(name)
-#: C/sync-with-other-devices.page:11(name) C/searching-items.page:9(name)
+#: C/tasks-usage-add-task.page:11(name)
+#: C/tasks-searching.page:16(name)
+#: C/tasks-organizing.page:12(name)
+#: C/tasks-local.page:11(name)
+#: C/tasks-display-settings.page:11(name)
+#: C/tasks-caldav.page:11(name)
+#: C/sync-with-other-devices.page:11(name)
+#: C/searching-items.page:9(name)
 #: C/problems-reporting-bugs.page:12(name)
-#: C/problems-getting-help.page:12(name) C/problems-debug-how-to.page:12(name)
-#: C/organizing.page:9(name) C/minimize-to-system-tray.page:15(name)
-#: C/memos-usage.page:11(name) C/memos-usage-edit-memo.page:11(name)
+#: C/problems-getting-help.page:12(name)
+#: C/problems-debug-how-to.page:12(name)
+#: C/organizing.page:9(name)
+#: C/minimize-to-system-tray.page:15(name)
+#: C/memos-usage.page:11(name)
+#: C/memos-usage-edit-memo.page:11(name)
 #: C/memos-usage-delete-memo.page:11(name)
-#: C/memos-usage-add-memo.page:11(name) C/memos-searching.page:16(name)
+#: C/memos-usage-add-memo.page:11(name)
+#: C/memos-searching.page:16(name)
 #: C/mail-wrong-fonts-in-3-0.page:12(name)
-#: C/mail-working-offline.page:11(name) C/mail-word-wrap.page:11(name)
+#: C/mail-working-offline.page:11(name)
+#: C/mail-word-wrap.page:11(name)
 #: C/mail-vertical-view.page:10(name)
 #: C/mail-usenet-subscriptions.page:12(name)
-#: C/mail-spam-settings.page:12(name) C/mail-spam.page:11(name)
+#: C/mail-spam-settings.page:12(name)
+#: C/mail-spam.page:11(name)
 #: C/mail-spam-marking.page:11(name)
 #: C/mail-spam-groupwise-unmark-message.page:11(name)
 #: C/mail-spam-groupwise-remove-from-list.page:11(name)
@@ -79,11 +89,16 @@ msgstr ""
 #: C/mail-received-notification.page:11(name)
 #: C/mail-read-receipts.page:24(name)
 #: C/mail-reading-keyboard-shortcuts.page:12(name)
-#: C/mail-organizing.page:12(name) C/mail-moving-emails.page:15(name)
-#: C/mail-layout-changing.page:11(name) C/mail-labels.page:12(name)
-#: C/mail-imap-subscriptions.page:13(name) C/mail-imap-headers.page:12(name)
-#: C/mail-follow-up-flag.page:11(name) C/mail-folders.page:12(name)
-#: C/mail-filters.page:11(name) C/mail-filters-conditions.page:11(name)
+#: C/mail-organizing.page:12(name)
+#: C/mail-moving-emails.page:15(name)
+#: C/mail-layout-changing.page:11(name)
+#: C/mail-labels.page:12(name)
+#: C/mail-imap-subscriptions.page:13(name)
+#: C/mail-imap-headers.page:12(name)
+#: C/mail-follow-up-flag.page:11(name)
+#: C/mail-folders.page:12(name)
+#: C/mail-filters.page:11(name)
+#: C/mail-filters-conditions.page:11(name)
 #: C/mail-filters-actions.page:11(name)
 #: C/mail-error-folder-mismatch.page:15(name)
 #: C/mail-error-failed-to-append-to-sent-folder.page:15(name)
@@ -108,7 +123,8 @@ msgstr ""
 #: C/mail-composer-write-new-message.page:11(name)
 #: C/mail-composer-spellcheck.page:11(name)
 #: C/mail-composer-several-recipients.page:14(name)
-#: C/mail-composer-search.page:12(name) C/mail-composer-reply.page:11(name)
+#: C/mail-composer-search.page:12(name)
+#: C/mail-composer-reply.page:11(name)
 #: C/mail-composer-priority.page:11(name)
 #: C/mail-composer-message-templates.page:11(name)
 #: C/mail-composer-mail-signatures-per-account.page:23(name)
@@ -116,7 +132,8 @@ msgstr ""
 #: C/mail-composer-mail-signatures-manage.page:11(name)
 #: C/mail-composer-html-text.page:10(name)
 #: C/mail-composer-html-table.page:10(name)
-#: C/mail-composer-html-rule.page:10(name) C/mail-composer-html.page:10(name)
+#: C/mail-composer-html-rule.page:10(name)
+#: C/mail-composer-html.page:10(name)
 #: C/mail-composer-html-link.page:10(name)
 #: C/mail-composer-html-image.page:10(name)
 #: C/mail-composer-forward.page:11(name)
@@ -126,7 +143,8 @@ msgstr ""
 #: C/mail-change-time-format.page:10(name)
 #: C/mail-change-columns-in-message-list.page:11(name)
 #: C/mail-attachments-sending.page:12(name)
-#: C/mail-attachments-received.page:12(name) C/mail-attachments.page:9(name)
+#: C/mail-attachments-received.page:12(name)
+#: C/mail-attachments.page:9(name)
 #: C/mail-account-manage-usenet-news.page:11(name)
 #: C/mail-account-manage-unix-mbox-spool-file.page:11(name)
 #: C/mail-account-manage-unix-mbox-spool-directory.page:11(name)
@@ -143,29 +161,44 @@ msgstr ""
 #: C/mail-account-manage-imap-plus.page:11(name)
 #: C/mail-account-manage-imap.page:11(name)
 #: C/mail-access-gmail-imap-account.page:13(name)
-#: C/intro-main-window.page:13(name) C/intro-first-run.page:11(name)
-#: C/index.page:13(name) C/import-supported-file-formats.page:11(name)
-#: C/import-single-files.page:11(name) C/import-data.page:11(name)
-#: C/import-apps-outlook.page:11(name) C/import-apps-mozilla.page:11(name)
-#: C/groupwise-placeholder.page:11(name) C/google-services.page:9(name)
-#: C/express-mode.page:11(name) C/exporting-data.page:11(name)
-#: C/exporting-data-mail.page:11(name) C/exporting-data-contacts.page:11(name)
+#: C/intro-main-window.page:13(name)
+#: C/intro-first-run.page:11(name)
+#: C/index.page:13(name)
+#: C/import-supported-file-formats.page:11(name)
+#: C/import-single-files.page:11(name)
+#: C/import-data.page:11(name)
+#: C/import-apps-outlook.page:11(name)
+#: C/import-apps-mozilla.page:11(name)
+#: C/groupwise-placeholder.page:11(name)
+#: C/google-services.page:9(name)
+#: C/express-mode.page:11(name)
+#: C/exporting-data.page:11(name)
+#: C/exporting-data-mail.page:11(name)
+#: C/exporting-data-contacts.page:11(name)
 #: C/exporting-data-calendar.page:11(name)
 #: C/exchange-placeholder.page:11(name)
 #: C/exchange-connectors-overview.page:11(name)
-#: C/deleting-to-free-disk-space.page:11(name) C/deleting-emails.page:16(name)
-#: C/deleting-appointments.page:11(name) C/default-browser.page:11(name)
-#: C/data-storage.page:11(name) C/credits.page:11(name)
+#: C/deleting-to-free-disk-space.page:11(name)
+#: C/deleting-emails.page:16(name)
+#: C/deleting-appointments.page:11(name)
+#: C/default-browser.page:11(name)
+#: C/data-storage.page:11(name)
+#: C/credits.page:11(name)
 #: C/contacts-using-several-addressbooks.page:11(name)
-#: C/contacts-using-contact-lists.page:11(name) C/contacts-usage.page:11(name)
+#: C/contacts-using-contact-lists.page:11(name)
+#: C/contacts-usage.page:11(name)
 #: C/contacts-usage-edit-contact.page:11(name)
 #: C/contacts-usage-delete-contact.page:11(name)
 #: C/contacts-usage-add-contact.page:11(name)
-#: C/contacts-searching.page:16(name) C/contacts-organizing.page:12(name)
-#: C/contacts-local.page:11(name) C/contacts-ldap.page:11(name)
-#: C/contacts-google.page:12(name) C/contacts-autocompletion.page:15(name)
+#: C/contacts-searching.page:16(name)
+#: C/contacts-organizing.page:12(name)
+#: C/contacts-local.page:11(name)
+#: C/contacts-ldap.page:11(name)
+#: C/contacts-google.page:12(name)
+#: C/contacts-autocompletion.page:15(name)
 #: C/contacts-add-automatically.page:11(name)
-#: C/change-switcher-appearance.page:10(name) C/calendar-webdav.page:11(name)
+#: C/change-switcher-appearance.page:10(name)
+#: C/calendar-webdav.page:11(name)
 #: C/calendar-weather.page:11(name)
 #: C/calendar-using-several-calendars.page:11(name)
 #: C/calendar-usage.page:12(name)
@@ -174,43 +207,61 @@ msgstr ""
 #: C/calendar-usage-add-appointment.page:11(name)
 #: C/calendar-timezones.page:11(name)
 #: C/calendar-sharing-information.page:11(name)
-#: C/calendar-searching.page:16(name) C/calendar-recurrence.page:11(name)
-#: C/calendar-publishing.page:11(name) C/calendar-organizing.page:12(name)
+#: C/calendar-searching.page:16(name)
+#: C/calendar-recurrence.page:11(name)
+#: C/calendar-publishing.page:11(name)
+#: C/calendar-organizing.page:12(name)
 #: C/calendar-meetings-sending-invitation.page:11(name)
 #: C/calendar-meetings-replying-to-invitation.page:11(name)
 #: C/calendar-meetings.page:11(name)
 #: C/calendar-meetings-delegating.page:11(name)
-#: C/calendar-marcus-bains-line.page:11(name) C/calendar-local.page:11(name)
-#: C/calendar-layout-views.page:11(name) C/calendar-layout.page:11(name)
+#: C/calendar-marcus-bains-line.page:11(name)
+#: C/calendar-local.page:11(name)
+#: C/calendar-layout-views.page:11(name)
+#: C/calendar-layout.page:11(name)
 #: C/calendar-layout-general-formatting.page:11(name)
 #: C/calendar-layout-appointment-display.page:11(name)
-#: C/calendar-google.page:12(name) C/calendar-free-busy.page:11(name)
-#: C/calendar-classifications.page:11(name) C/calendar-caldav.page:11(name)
+#: C/calendar-google.page:12(name)
+#: C/calendar-free-busy.page:11(name)
+#: C/calendar-classifications.page:11(name)
+#: C/calendar-caldav.page:11(name)
 #: C/calendar-alarms-and-reminders.page:11(name)
 #: C/backup-restore.page:12(name)
+#, fuzzy
 msgid "Andre Klapper"
-msgstr "Andre Klapper"
+msgstr "Andre Klapper (ak-47@gmx.net)"
 
-#: C/using-categories.page:14(email) C/tasks-webdav.page:12(email)
-#: C/tasks-using-several-tasklists.page:12(email) C/tasks-usage.page:12(email)
+#: C/using-categories.page:14(email)
+#: C/tasks-webdav.page:12(email)
+#: C/tasks-using-several-tasklists.page:12(email)
+#: C/tasks-usage.page:12(email)
 #: C/tasks-usage-edit-task.page:12(email)
 #: C/tasks-usage-delete-task.page:12(email)
-#: C/tasks-usage-add-task.page:12(email) C/tasks-searching.page:17(email)
-#: C/tasks-organizing.page:13(email) C/tasks-local.page:12(email)
-#: C/tasks-display-settings.page:12(email) C/tasks-caldav.page:12(email)
-#: C/sync-with-other-devices.page:12(email) C/searching-items.page:10(email)
+#: C/tasks-usage-add-task.page:12(email)
+#: C/tasks-searching.page:17(email)
+#: C/tasks-organizing.page:13(email)
+#: C/tasks-local.page:12(email)
+#: C/tasks-display-settings.page:12(email)
+#: C/tasks-caldav.page:12(email)
+#: C/sync-with-other-devices.page:12(email)
+#: C/searching-items.page:10(email)
 #: C/problems-reporting-bugs.page:13(email)
 #: C/problems-getting-help.page:13(email)
-#: C/problems-debug-how-to.page:13(email) C/organizing.page:10(email)
-#: C/minimize-to-system-tray.page:16(email) C/memos-usage.page:12(email)
+#: C/problems-debug-how-to.page:13(email)
+#: C/organizing.page:10(email)
+#: C/minimize-to-system-tray.page:16(email)
+#: C/memos-usage.page:12(email)
 #: C/memos-usage-edit-memo.page:12(email)
 #: C/memos-usage-delete-memo.page:12(email)
-#: C/memos-usage-add-memo.page:12(email) C/memos-searching.page:17(email)
+#: C/memos-usage-add-memo.page:12(email)
+#: C/memos-searching.page:17(email)
 #: C/mail-wrong-fonts-in-3-0.page:13(email)
-#: C/mail-working-offline.page:12(email) C/mail-word-wrap.page:12(email)
+#: C/mail-working-offline.page:12(email)
+#: C/mail-word-wrap.page:12(email)
 #: C/mail-vertical-view.page:11(email)
 #: C/mail-usenet-subscriptions.page:13(email)
-#: C/mail-spam-settings.page:13(email) C/mail-spam.page:12(email)
+#: C/mail-spam-settings.page:13(email)
+#: C/mail-spam.page:12(email)
 #: C/mail-spam-marking.page:12(email)
 #: C/mail-spam-groupwise-unmark-message.page:12(email)
 #: C/mail-spam-groupwise-remove-from-list.page:12(email)
@@ -245,11 +296,16 @@ msgstr "Andre Klapper"
 #: C/mail-received-notification.page:12(email)
 #: C/mail-read-receipts.page:25(email)
 #: C/mail-reading-keyboard-shortcuts.page:13(email)
-#: C/mail-organizing.page:13(email) C/mail-moving-emails.page:16(email)
-#: C/mail-layout-changing.page:12(email) C/mail-labels.page:13(email)
-#: C/mail-imap-subscriptions.page:14(email) C/mail-imap-headers.page:13(email)
-#: C/mail-follow-up-flag.page:12(email) C/mail-folders.page:13(email)
-#: C/mail-filters.page:12(email) C/mail-filters-conditions.page:12(email)
+#: C/mail-organizing.page:13(email)
+#: C/mail-moving-emails.page:16(email)
+#: C/mail-layout-changing.page:12(email)
+#: C/mail-labels.page:13(email)
+#: C/mail-imap-subscriptions.page:14(email)
+#: C/mail-imap-headers.page:13(email)
+#: C/mail-follow-up-flag.page:12(email)
+#: C/mail-folders.page:13(email)
+#: C/mail-filters.page:12(email)
+#: C/mail-filters-conditions.page:12(email)
 #: C/mail-filters-actions.page:12(email)
 #: C/mail-error-folder-mismatch.page:16(email)
 #: C/mail-error-failed-to-append-to-sent-folder.page:16(email)
@@ -274,7 +330,8 @@ msgstr "Andre Klapper"
 #: C/mail-composer-write-new-message.page:12(email)
 #: C/mail-composer-spellcheck.page:12(email)
 #: C/mail-composer-several-recipients.page:15(email)
-#: C/mail-composer-search.page:13(email) C/mail-composer-reply.page:12(email)
+#: C/mail-composer-search.page:13(email)
+#: C/mail-composer-reply.page:12(email)
 #: C/mail-composer-priority.page:12(email)
 #: C/mail-composer-message-templates.page:12(email)
 #: C/mail-composer-mail-signatures-per-account.page:24(email)
@@ -311,20 +368,28 @@ msgstr "Andre Klapper"
 #: C/mail-account-manage-imap-plus.page:12(email)
 #: C/mail-account-manage-imap.page:12(email)
 #: C/mail-access-gmail-imap-account.page:14(email)
-#: C/intro-main-window.page:14(email) C/intro-first-run.page:12(email)
-#: C/index.page:14(email) C/import-supported-file-formats.page:12(email)
-#: C/import-single-files.page:12(email) C/import-data.page:12(email)
-#: C/import-apps-outlook.page:12(email) C/import-apps-mozilla.page:12(email)
-#: C/groupwise-placeholder.page:12(email) C/google-services.page:10(email)
-#: C/express-mode.page:12(email) C/exporting-data.page:12(email)
+#: C/intro-main-window.page:14(email)
+#: C/intro-first-run.page:12(email)
+#: C/index.page:14(email)
+#: C/import-supported-file-formats.page:12(email)
+#: C/import-single-files.page:12(email)
+#: C/import-data.page:12(email)
+#: C/import-apps-outlook.page:12(email)
+#: C/import-apps-mozilla.page:12(email)
+#: C/groupwise-placeholder.page:12(email)
+#: C/google-services.page:10(email)
+#: C/express-mode.page:12(email)
+#: C/exporting-data.page:12(email)
 #: C/exporting-data-mail.page:12(email)
 #: C/exporting-data-contacts.page:12(email)
 #: C/exporting-data-calendar.page:12(email)
 #: C/exchange-placeholder.page:12(email)
 #: C/exchange-connectors-overview.page:12(email)
 #: C/deleting-to-free-disk-space.page:12(email)
-#: C/deleting-emails.page:17(email) C/deleting-appointments.page:12(email)
-#: C/default-browser.page:12(email) C/data-storage.page:12(email)
+#: C/deleting-emails.page:17(email)
+#: C/deleting-appointments.page:12(email)
+#: C/default-browser.page:12(email)
+#: C/data-storage.page:12(email)
 #: C/credits.page:12(email)
 #: C/contacts-using-several-addressbooks.page:12(email)
 #: C/contacts-using-contact-lists.page:12(email)
@@ -332,12 +397,16 @@ msgstr "Andre Klapper"
 #: C/contacts-usage-edit-contact.page:12(email)
 #: C/contacts-usage-delete-contact.page:12(email)
 #: C/contacts-usage-add-contact.page:12(email)
-#: C/contacts-searching.page:17(email) C/contacts-organizing.page:13(email)
-#: C/contacts-local.page:12(email) C/contacts-ldap.page:12(email)
-#: C/contacts-google.page:13(email) C/contacts-autocompletion.page:16(email)
+#: C/contacts-searching.page:17(email)
+#: C/contacts-organizing.page:13(email)
+#: C/contacts-local.page:12(email)
+#: C/contacts-ldap.page:12(email)
+#: C/contacts-google.page:13(email)
+#: C/contacts-autocompletion.page:16(email)
 #: C/contacts-add-automatically.page:12(email)
 #: C/change-switcher-appearance.page:11(email)
-#: C/calendar-webdav.page:12(email) C/calendar-weather.page:12(email)
+#: C/calendar-webdav.page:12(email)
+#: C/calendar-weather.page:12(email)
 #: C/calendar-using-several-calendars.page:12(email)
 #: C/calendar-usage.page:13(email)
 #: C/calendar-usage-edit-appointment.page:12(email)
@@ -345,36 +414,49 @@ msgstr "Andre Klapper"
 #: C/calendar-usage-add-appointment.page:12(email)
 #: C/calendar-timezones.page:12(email)
 #: C/calendar-sharing-information.page:12(email)
-#: C/calendar-searching.page:17(email) C/calendar-recurrence.page:12(email)
-#: C/calendar-publishing.page:12(email) C/calendar-organizing.page:13(email)
+#: C/calendar-searching.page:17(email)
+#: C/calendar-recurrence.page:12(email)
+#: C/calendar-publishing.page:12(email)
+#: C/calendar-organizing.page:13(email)
 #: C/calendar-meetings-sending-invitation.page:12(email)
 #: C/calendar-meetings-replying-to-invitation.page:12(email)
 #: C/calendar-meetings.page:12(email)
 #: C/calendar-meetings-delegating.page:12(email)
-#: C/calendar-marcus-bains-line.page:12(email) C/calendar-local.page:12(email)
-#: C/calendar-layout-views.page:12(email) C/calendar-layout.page:12(email)
+#: C/calendar-marcus-bains-line.page:12(email)
+#: C/calendar-local.page:12(email)
+#: C/calendar-layout-views.page:12(email)
+#: C/calendar-layout.page:12(email)
 #: C/calendar-layout-general-formatting.page:12(email)
 #: C/calendar-layout-appointment-display.page:12(email)
-#: C/calendar-google.page:13(email) C/calendar-free-busy.page:12(email)
-#: C/calendar-classifications.page:12(email) C/calendar-caldav.page:12(email)
+#: C/calendar-google.page:13(email)
+#: C/calendar-free-busy.page:12(email)
+#: C/calendar-classifications.page:12(email)
+#: C/calendar-caldav.page:12(email)
 #: C/calendar-alarms-and-reminders.page:12(email)
 #: C/backup-restore.page:13(email)
+#, fuzzy
 msgid "ak-47@gmx.net"
-msgstr "ak-47@gmx.net"
+msgstr "Felix Kaser (f.kaser@gmx.net)"
 
-#: C/using-categories.page:17(name) C/tasks-usage-add-task.page:15(name)
-#: C/tasks-searching.page:20(name) C/tasks-display-settings.page:15(name)
+#: C/using-categories.page:17(name)
+#: C/tasks-usage-add-task.page:15(name)
+#: C/tasks-searching.page:20(name)
+#: C/tasks-display-settings.page:15(name)
 #: C/sync-with-other-devices.page:15(name)
-#: C/memos-usage-add-memo.page:15(name) C/memos-searching.page:20(name)
-#: C/mail-working-offline.page:15(name) C/mail-vertical-view.page:14(name)
+#: C/memos-usage-add-memo.page:15(name)
+#: C/memos-searching.page:20(name)
+#: C/mail-working-offline.page:15(name)
+#: C/mail-vertical-view.page:14(name)
 #: C/mail-usenet-subscriptions.page:16(name)
-#: C/mail-spam-settings.page:20(name) C/mail-spam-marking.page:19(name)
+#: C/mail-spam-settings.page:20(name)
+#: C/mail-spam-marking.page:19(name)
 #: C/mail-spam-groupwise-unmark-message.page:15(name)
 #: C/mail-spam-groupwise-remove-from-list.page:15(name)
 #: C/mail-spam-groupwise-mark-message.page:15(name)
 #: C/mail-spam-groupwise-manage-list.page:19(name)
 #: C/mail-spam-groupwise-add-to-list.page:19(name)
-#: C/mail-sorting-message-list.page:20(name) C/mail-searching.page:20(name)
+#: C/mail-sorting-message-list.page:20(name)
+#: C/mail-searching.page:20(name)
 #: C/mail-search-folders.page:15(name)
 #: C/mail-search-folders-conditions.page:15(name)
 #: C/mail-search-folders-add.page:15(name)
@@ -385,9 +467,12 @@ msgstr "ak-47@gmx.net"
 #: C/mail-receiving-options-imap.page:15(name)
 #: C/mail-receiving-options-evolution-exchange.page:15(name)
 #: C/mail-reading-keyboard-shortcuts.page:16(name)
-#: C/mail-imap-subscriptions.page:17(name) C/mail-imap-headers.page:16(name)
-#: C/mail-follow-up-flag.page:15(name) C/mail-folders.page:20(name)
-#: C/mail-filters.page:15(name) C/mail-filters-conditions.page:15(name)
+#: C/mail-imap-subscriptions.page:17(name)
+#: C/mail-imap-headers.page:16(name)
+#: C/mail-follow-up-flag.page:15(name)
+#: C/mail-folders.page:20(name)
+#: C/mail-filters.page:15(name)
+#: C/mail-filters-conditions.page:15(name)
 #: C/mail-filters-actions.page:15(name)
 #: C/mail-encryption-s-mime-signing-encrypting.page:15(name)
 #: C/mail-encryption-s-mime-manage.page:15(name)
@@ -402,54 +487,79 @@ msgstr "ak-47@gmx.net"
 #: C/mail-delete-and-undelete.page:17(name)
 #: C/mail-composer-write-new-message.page:15(name)
 #: C/mail-composer-several-recipients.page:18(name)
-#: C/mail-composer-reply.page:15(name) C/mail-composer-priority.page:15(name)
+#: C/mail-composer-reply.page:15(name)
+#: C/mail-composer-priority.page:15(name)
 #: C/mail-composer-message-templates.page:15(name)
 #: C/mail-composer-html-text.page:14(name)
 #: C/mail-composer-html-table.page:14(name)
-#: C/mail-composer-html-rule.page:14(name) C/mail-composer-html.page:17(name)
+#: C/mail-composer-html-rule.page:14(name)
+#: C/mail-composer-html.page:17(name)
 #: C/mail-composer-html-link.page:14(name)
 #: C/mail-composer-html-image.page:14(name)
 #: C/mail-composer-forward.page:15(name)
 #: C/mail-composer-custom-header-lines.page:15(name)
 #: C/mail-calendar-sending-invitations.page:13(name)
 #: C/mail-attachments-sending.page:16(name)
-#: C/mail-attachments-received.page:16(name) C/intro-main-window.page:21(name)
+#: C/mail-attachments-received.page:16(name)
+#: C/intro-main-window.page:21(name)
 #: C/import-supported-file-formats.page:15(name)
-#: C/import-apps-outlook.page:15(name) C/exporting-data-contacts.page:15(name)
+#: C/import-apps-outlook.page:15(name)
+#: C/exporting-data-contacts.page:15(name)
 #: C/contacts-using-contact-lists.page:15(name)
-#: C/contacts-searching.page:20(name) C/contacts-ldap.page:15(name)
+#: C/contacts-searching.page:20(name)
+#: C/contacts-ldap.page:15(name)
 #: C/contacts-autocompletion.page:19(name)
 #: C/calendar-using-several-calendars.page:15(name)
-#: C/calendar-timezones.page:15(name) C/calendar-searching.page:20(name)
-#: C/calendar-recurrence.page:15(name) C/calendar-publishing.page:15(name)
+#: C/calendar-timezones.page:15(name)
+#: C/calendar-searching.page:20(name)
+#: C/calendar-recurrence.page:15(name)
+#: C/calendar-publishing.page:15(name)
 #: C/calendar-meetings-sending-invitation.page:15(name)
 #: C/calendar-meetings-replying-to-invitation.page:15(name)
 #: C/calendar-meetings-delegating.page:15(name)
 #: C/calendar-layout-views.page:15(name)
 #: C/calendar-layout-general-formatting.page:15(name)
 #: C/calendar-layout-appointment-display.page:15(name)
-#: C/calendar-google.page:16(name) C/calendar-free-busy.page:15(name)
-#: C/calendar-classifications.page:15(name) C/calendar-caldav.page:15(name)
+#: C/calendar-google.page:16(name)
+#: C/calendar-free-busy.page:15(name)
+#: C/calendar-classifications.page:15(name)
+#: C/calendar-caldav.page:15(name)
 #: C/calendar-alarms-and-reminders.page:15(name)
 msgid "Novell, Inc"
 msgstr "Novell, Inc"
 
-#: C/using-categories.page:20(p) C/tasks-webdav.page:15(p)
-#: C/tasks-using-several-tasklists.page:15(p) C/tasks-usage.page:15(p)
-#: C/tasks-usage-edit-task.page:15(p) C/tasks-usage-delete-task.page:15(p)
-#: C/tasks-usage-add-task.page:18(p) C/tasks-searching.page:23(p)
-#: C/tasks-organizing.page:16(p) C/tasks-local.page:15(p)
-#: C/tasks-display-settings.page:18(p) C/tasks-caldav.page:15(p)
-#: C/sync-with-other-devices.page:18(p) C/searching-items.page:13(p)
-#: C/problems-reporting-bugs.page:16(p) C/problems-getting-help.page:16(p)
-#: C/problems-debug-how-to.page:16(p) C/organizing.page:13(p)
-#: C/minimize-to-system-tray.page:19(p) C/memos-usage.page:15(p)
-#: C/memos-usage-edit-memo.page:15(p) C/memos-usage-delete-memo.page:15(p)
-#: C/memos-usage-add-memo.page:18(p) C/memos-searching.page:23(p)
-#: C/mail-wrong-fonts-in-3-0.page:16(p) C/mail-working-offline.page:18(p)
-#: C/mail-word-wrap.page:15(p) C/mail-vertical-view.page:17(p)
-#: C/mail-usenet-subscriptions.page:19(p) C/mail-two-trash-folders.page:15(p)
-#: C/mail-spam-settings.page:23(p) C/mail-spam.page:15(p)
+#: C/using-categories.page:20(p)
+#: C/tasks-webdav.page:15(p)
+#: C/tasks-using-several-tasklists.page:15(p)
+#: C/tasks-usage.page:15(p)
+#: C/tasks-usage-edit-task.page:15(p)
+#: C/tasks-usage-delete-task.page:15(p)
+#: C/tasks-usage-add-task.page:18(p)
+#: C/tasks-searching.page:23(p)
+#: C/tasks-organizing.page:16(p)
+#: C/tasks-local.page:15(p)
+#: C/tasks-display-settings.page:18(p)
+#: C/tasks-caldav.page:15(p)
+#: C/sync-with-other-devices.page:18(p)
+#: C/searching-items.page:13(p)
+#: C/problems-reporting-bugs.page:16(p)
+#: C/problems-getting-help.page:16(p)
+#: C/problems-debug-how-to.page:16(p)
+#: C/organizing.page:13(p)
+#: C/minimize-to-system-tray.page:19(p)
+#: C/memos-usage.page:15(p)
+#: C/memos-usage-edit-memo.page:15(p)
+#: C/memos-usage-delete-memo.page:15(p)
+#: C/memos-usage-add-memo.page:18(p)
+#: C/memos-searching.page:23(p)
+#: C/mail-wrong-fonts-in-3-0.page:16(p)
+#: C/mail-working-offline.page:18(p)
+#: C/mail-word-wrap.page:15(p)
+#: C/mail-vertical-view.page:17(p)
+#: C/mail-usenet-subscriptions.page:19(p)
+#: C/mail-two-trash-folders.page:15(p)
+#: C/mail-spam-settings.page:23(p)
+#: C/mail-spam.page:15(p)
 #: C/mail-spam-marking.page:22(p)
 #: C/mail-spam-groupwise-unmark-message.page:18(p)
 #: C/mail-spam-groupwise-remove-from-list.page:18(p)
@@ -458,18 +568,23 @@ msgstr "Novell, Inc"
 #: C/mail-spam-groupwise-add-to-list.page:22(p)
 #: C/mail-sorting-message-list.page:23(p)
 #: C/mail-several-pop-accounts.page:17(p)
-#: C/mail-sending-options-smtp.page:22(p) C/mail-send-and-receive.page:15(p)
+#: C/mail-sending-options-smtp.page:22(p)
+#: C/mail-send-and-receive.page:15(p)
 #: C/mail-send-and-receive-manual.page:15(p)
 #: C/mail-send-and-receive-automatically.page:15(p)
-#: C/mail-searching.page:23(p) C/mail-searching-attachment-type.page:16(p)
-#: C/mail-search-folders-refresh.page:19(p) C/mail-search-folders.page:18(p)
+#: C/mail-searching.page:23(p)
+#: C/mail-searching-attachment-type.page:16(p)
+#: C/mail-search-folders-refresh.page:19(p)
+#: C/mail-search-folders.page:18(p)
 #: C/mail-search-folders-conditions.page:18(p)
-#: C/mail-search-folders-add.page:18(p) C/mail-refresh-folders.page:15(p)
+#: C/mail-search-folders-add.page:18(p)
+#: C/mail-refresh-folders.page:15(p)
 #: C/mail-recognized-thread-related-headers.page:15(p)
 #: C/mail-receiving-options-usenet-news.page:18(p)
 #: C/mail-receiving-options-unix-mbox-spool-file.page:15(p)
 #: C/mail-receiving-options-unix-mbox-spool-directory.page:15(p)
-#: C/mail-receiving-options-pop.page:22(p) C/mail-receiving-options.page:13(p)
+#: C/mail-receiving-options-pop.page:22(p)
+#: C/mail-receiving-options.page:13(p)
 #: C/mail-receiving-options-novell-groupwise.page:19(p)
 #: C/mail-receiving-options-mh-format-directories.page:15(p)
 #: C/mail-receiving-options-maildir-format-directories.page:15(p)
@@ -478,26 +593,37 @@ msgstr "Novell, Inc"
 #: C/mail-receiving-options-imap.page:18(p)
 #: C/mail-receiving-options-exchange-mapi.page:15(p)
 #: C/mail-receiving-options-evolution-exchange.page:18(p)
-#: C/mail-received-notification.page:15(p) C/mail-read-receipts.page:28(p)
-#: C/mail-reading-keyboard-shortcuts.page:19(p) C/mail-organizing.page:16(p)
-#: C/mail-not-sent.page:15(p) C/mail-moving-emails.page:19(p)
-#: C/mail-layout-changing.page:15(p) C/mail-labels.page:16(p)
-#: C/mail-imap-subscriptions.page:20(p) C/mail-imap-headers.page:19(p)
-#: C/mail-follow-up-flag.page:18(p) C/mail-folders.page:23(p)
-#: C/mail-filters.page:18(p) C/mail-filters-not-working.page:16(p)
-#: C/mail-filters-conditions.page:18(p) C/mail-filters-actions.page:18(p)
+#: C/mail-received-notification.page:15(p)
+#: C/mail-read-receipts.page:28(p)
+#: C/mail-reading-keyboard-shortcuts.page:19(p)
+#: C/mail-organizing.page:16(p)
+#: C/mail-not-sent.page:15(p)
+#: C/mail-moving-emails.page:19(p)
+#: C/mail-layout-changing.page:15(p)
+#: C/mail-labels.page:16(p)
+#: C/mail-imap-subscriptions.page:20(p)
+#: C/mail-imap-headers.page:19(p)
+#: C/mail-follow-up-flag.page:18(p)
+#: C/mail-folders.page:23(p)
+#: C/mail-filters.page:18(p)
+#: C/mail-filters-not-working.page:16(p)
+#: C/mail-filters-conditions.page:18(p)
+#: C/mail-filters-actions.page:18(p)
 #: C/mail-error-no-provider-available.page:15(p)
 #: C/mail-error-folder-mismatch.page:19(p)
 #: C/mail-error-failed-to-append-to-sent-folder.page:19(p)
 #: C/mail-encryption-s-mime-signing-encrypting.page:18(p)
-#: C/mail-encryption-s-mime-manage.page:18(p) C/mail-encryption.page:28(p)
+#: C/mail-encryption-s-mime-manage.page:18(p)
+#: C/mail-encryption.page:28(p)
 #: C/mail-encryption-gpg-signing-encrypting.page:18(p)
 #: C/mail-encryption-gpg-set-up.page:18(p)
 #: C/mail-encryption-gpg-getting-keys.page:18(p)
 #: C/mail-encryption-gpg-decrypting.page:18(p)
-#: C/mail-encryption-gpg-create-key.page:18(p) C/mail-duplicates.page:19(p)
+#: C/mail-encryption-gpg-create-key.page:18(p)
+#: C/mail-duplicates.page:19(p)
 #: C/mail-displaying-sender-photograph.page:18(p)
-#: C/mail-displaying-no-css.page:16(p) C/mail-displaying-message.page:15(p)
+#: C/mail-displaying-no-css.page:16(p)
+#: C/mail-displaying-message.page:15(p)
 #: C/mail-displaying-images-in-html.page:23(p)
 #: C/mail-displaying-collapsible-headers.page:18(p)
 #: C/mail-displaying-character-encodings.page:15(p)
@@ -507,24 +633,30 @@ msgstr "Novell, Inc"
 #: C/mail-composer-write-new-message.page:18(p)
 #: C/mail-composer-spellcheck.page:15(p)
 #: C/mail-composer-several-recipients.page:21(p)
-#: C/mail-composer-search.page:16(p) C/mail-composer-reply.page:18(p)
+#: C/mail-composer-search.page:16(p)
+#: C/mail-composer-reply.page:18(p)
 #: C/mail-composer-priority.page:18(p)
 #: C/mail-composer-message-templates.page:18(p)
 #: C/mail-composer-mail-signatures-per-account.page:27(p)
 #: C/mail-composer-mail-signatures.page:15(p)
 #: C/mail-composer-mail-signatures-manage.page:15(p)
-#: C/mail-composer-html-text.page:17(p) C/mail-composer-html-table.page:17(p)
-#: C/mail-composer-html-rule.page:17(p) C/mail-composer-html.page:14(p)
-#: C/mail-composer-html-link.page:17(p) C/mail-composer-html-image.page:17(p)
+#: C/mail-composer-html-text.page:17(p)
+#: C/mail-composer-html-table.page:17(p)
+#: C/mail-composer-html-rule.page:17(p)
+#: C/mail-composer-html.page:14(p)
+#: C/mail-composer-html-link.page:17(p)
+#: C/mail-composer-html-image.page:17(p)
 #: C/mail-composer-forward.page:18(p)
 #: C/mail-composer-forward-as-attachment.page:16(p)
 #: C/mail-composer-custom-header-lines.page:18(p)
 #: C/mail-composer-change-quotation-string.page:17(p)
 #: C/mail-change-time-format.page:14(p)
 #: C/mail-change-columns-in-message-list.page:15(p)
-#: C/mail-cannot-see.page:15(p) C/mail-calendar-sending-invitations.page:16(p)
+#: C/mail-cannot-see.page:15(p)
+#: C/mail-calendar-sending-invitations.page:16(p)
 #: C/mail-attachments-sending.page:19(p)
-#: C/mail-attachments-received.page:19(p) C/mail-attachments.page:13(p)
+#: C/mail-attachments-received.page:19(p)
+#: C/mail-attachments.page:13(p)
 #: C/mail-account-manage-usenet-news.page:15(p)
 #: C/mail-account-manage-unix-mbox-spool-file.page:15(p)
 #: C/mail-account-manage-unix-mbox-spool-directory.page:15(p)
@@ -541,66 +673,90 @@ msgstr "Novell, Inc"
 #: C/mail-account-manage-imap-plus.page:15(p)
 #: C/mail-account-manage-imap.page:15(p)
 #: C/mail-access-gmail-pop-account.page:17(p)
-#: C/mail-access-gmail-imap-account.page:17(p) C/intro-main-window.page:24(p)
-#: C/intro-first-run.page:15(p) C/index.page:17(p)
-#: C/import-supported-file-formats.page:18(p) C/import-single-files.page:15(p)
-#: C/import-data.page:15(p) C/import-apps-outlook.page:18(p)
-#: C/import-apps-mozilla.page:15(p) C/groupwise-placeholder.page:15(p)
-#: C/google-services.page:13(p) C/express-mode.page:15(p)
-#: C/exporting-data.page:15(p) C/exporting-data-mail.page:15(p)
-#: C/exporting-data-contacts.page:18(p) C/exporting-data-calendar.page:15(p)
-#: C/exchange-placeholder.page:15(p) C/exchange-connectors-overview.page:15(p)
-#: C/deleting-to-free-disk-space.page:15(p) C/deleting-emails.page:20(p)
-#: C/deleting-appointments.page:15(p) C/default-browser.page:15(p)
-#: C/data-storage.page:15(p) C/credits.page:15(p)
+#: C/mail-access-gmail-imap-account.page:17(p)
+#: C/intro-main-window.page:24(p)
+#: C/intro-first-run.page:15(p)
+#: C/index.page:17(p)
+#: C/import-supported-file-formats.page:18(p)
+#: C/import-single-files.page:15(p)
+#: C/import-data.page:15(p)
+#: C/import-apps-outlook.page:18(p)
+#: C/import-apps-mozilla.page:15(p)
+#: C/groupwise-placeholder.page:15(p)
+#: C/google-services.page:13(p)
+#: C/express-mode.page:15(p)
+#: C/exporting-data.page:15(p)
+#: C/exporting-data-mail.page:15(p)
+#: C/exporting-data-contacts.page:18(p)
+#: C/exporting-data-calendar.page:15(p)
+#: C/exchange-placeholder.page:15(p)
+#: C/exchange-connectors-overview.page:15(p)
+#: C/deleting-to-free-disk-space.page:15(p)
+#: C/deleting-emails.page:20(p)
+#: C/deleting-appointments.page:15(p)
+#: C/default-browser.page:15(p)
+#: C/data-storage.page:15(p)
+#: C/credits.page:15(p)
 #: C/contacts-using-several-addressbooks.page:15(p)
-#: C/contacts-using-contact-lists.page:18(p) C/contacts-usage.page:15(p)
+#: C/contacts-using-contact-lists.page:18(p)
+#: C/contacts-usage.page:15(p)
 #: C/contacts-usage-edit-contact.page:15(p)
 #: C/contacts-usage-delete-contact.page:15(p)
-#: C/contacts-usage-add-contact.page:15(p) C/contacts-searching.page:23(p)
-#: C/contacts-organizing.page:16(p) C/contacts-local.page:15(p)
-#: C/contacts-ldap.page:18(p) C/contacts-google.page:16(p)
+#: C/contacts-usage-add-contact.page:15(p)
+#: C/contacts-searching.page:23(p)
+#: C/contacts-organizing.page:16(p)
+#: C/contacts-local.page:15(p)
+#: C/contacts-ldap.page:18(p)
+#: C/contacts-google.page:16(p)
 #: C/contacts-autocompletion.page:22(p)
 #: C/contacts-add-automatically.page:19(p)
-#: C/change-switcher-appearance.page:14(p) C/calendar-webdav.page:15(p)
-#: C/calendar-weather.page:15(p) C/calendar-using-several-calendars.page:18(p)
-#: C/calendar-usage.page:16(p) C/calendar-usage-edit-appointment.page:15(p)
+#: C/change-switcher-appearance.page:14(p)
+#: C/calendar-webdav.page:15(p)
+#: C/calendar-weather.page:15(p)
+#: C/calendar-using-several-calendars.page:18(p)
+#: C/calendar-usage.page:16(p)
+#: C/calendar-usage-edit-appointment.page:15(p)
 #: C/calendar-usage-delete-appointment.page:15(p)
-#: C/calendar-usage-add-appointment.page:15(p) C/calendar-timezones.page:18(p)
-#: C/calendar-sharing-information.page:15(p) C/calendar-searching.page:23(p)
-#: C/calendar-recurrence.page:18(p) C/calendar-publishing.page:18(p)
+#: C/calendar-usage-add-appointment.page:15(p)
+#: C/calendar-timezones.page:18(p)
+#: C/calendar-sharing-information.page:15(p)
+#: C/calendar-searching.page:23(p)
+#: C/calendar-recurrence.page:18(p)
+#: C/calendar-publishing.page:18(p)
 #: C/calendar-organizing.page:16(p)
 #: C/calendar-meetings-sending-invitation.page:18(p)
 #: C/calendar-meetings-replying-to-invitation.page:18(p)
-#: C/calendar-meetings.page:15(p) C/calendar-meetings-delegating.page:18(p)
-#: C/calendar-marcus-bains-line.page:15(p) C/calendar-local.page:15(p)
-#: C/calendar-layout-views.page:18(p) C/calendar-layout.page:15(p)
+#: C/calendar-meetings.page:15(p)
+#: C/calendar-meetings-delegating.page:18(p)
+#: C/calendar-marcus-bains-line.page:15(p)
+#: C/calendar-local.page:15(p)
+#: C/calendar-layout-views.page:18(p)
+#: C/calendar-layout.page:15(p)
 #: C/calendar-layout-general-formatting.page:18(p)
 #: C/calendar-layout-appointment-display.page:18(p)
-#: C/calendar-google.page:19(p) C/calendar-free-busy.page:18(p)
-#: C/calendar-classifications.page:18(p) C/calendar-caldav.page:18(p)
-#: C/calendar-alarms-and-reminders.page:18(p) C/backup-restore.page:16(p)
+#: C/calendar-google.page:19(p)
+#: C/calendar-free-busy.page:18(p)
+#: C/calendar-classifications.page:18(p)
+#: C/calendar-caldav.page:18(p)
+#: C/calendar-alarms-and-reminders.page:18(p)
+#: C/backup-restore.page:16(p)
+#, fuzzy
 msgid "Creative Commons Share Alike 3.0"
-msgstr ""
+msgstr "Creative Commons - deljenje pod enakimi pogoji 3.0"
 
 #: C/using-categories.page:25(title)
 #, fuzzy
 msgid "Using Categories"
-msgstr "Kategorije"
+msgstr "Uredi kategorije"
 
 #: C/using-categories.page:27(p)
-msgid ""
-"Another way to group contacts, appointments, tasks and memos (summarized by "
-"the term \"objects\" in the following text) is to mark them as belonging to "
-"different categories. You can mark an object as being in several categories "
-"or no category at all. For example in your address book, you put a friend in "
-"the \"Business\" category because he works with you and the \"Friends\" "
-"category because he is a friend."
+msgid "Another way to group contacts, appointments, tasks and memos (summarized by the term \"objects\" in the following text) is to mark them as belonging to different categories. You can mark an object as being in several categories or no category at all. For example in your address book, you put a friend in the \"Business\" category because he works with you and the \"Friends\" category because he is a friend."
 msgstr ""
 
 #: C/using-categories.page:30(title)
+#, fuzzy
 msgid "Setting categories for an object"
-msgstr ""
+msgstr "Kratek sklic predmeta"
 
 #: C/using-categories.page:32(p)
 msgid "To mark an object as belonging to a category,"
@@ -610,459 +766,172 @@ msgstr ""
 msgid "Double-click the object to bring up the corresponding editor."
 msgstr ""
 
-#: C/using-categories.page:35(gui) C/using-categories.page:47(gui)
-#, fuzzy
-msgid "Categories..."
-msgstr "Ka_tegorije ..."
-
-#: C/using-categories.page:35(gui) C/using-categories.page:47(gui)
-#: C/mail-vertical-view.page:26(gui) C/mail-vertical-view.page:30(gui)
-#: C/mail-sorting-message-list.page:31(gui)
-#: C/mail-sorting-message-list.page:32(gui)
-#: C/mail-sorting-message-list.page:36(gui)
-#: C/mail-displaying-images-in-html.page:36(gui)
-#: C/mail-displaying-character-encodings.page:24(gui)
-#: C/mail-delete-and-undelete.page:32(gui)
-#: C/mail-delete-and-undelete.page:40(gui)
-#: C/mail-composer-several-recipients.page:34(gui)
-#: C/mail-cannot-see.page:30(gui) C/intro-main-window.page:75(gui)
-#: C/intro-main-window.page:80(gui) C/intro-main-window.page:156(gui)
-#: C/change-switcher-appearance.page:21(gui)
-#: C/calendar-meetings-sending-invitation.page:35(gui)
-#: C/calendar-layout-views.page:34(gui)
-msgid "View"
-msgstr "Pogled"
-
-#: C/using-categories.page:35(gui) C/using-categories.page:47(gui)
-#: C/using-categories.page:50(gui) C/using-categories.page:54(gui)
-#: C/mail-labels.page:23(link) C/contacts-usage-add-contact.page:26(gui)
-msgid "Categories"
-msgstr "Kategorije"
-
-#: C/using-categories.page:35(p) C/using-categories.page:47(p)
-msgid ""
-"Click <placeholder-1/>. (If this button is not available, select "
-"<guiseq><placeholder-2/><placeholder-3/></guiseq>.)"
+#: C/using-categories.page:35(p)
+#: C/using-categories.page:47(p)
+msgid "Click <gui style=\"button\">Categories...</gui>. (If this button is not available, select <guiseq><gui>View</gui><gui>Categories</gui></guiseq>.)"
 msgstr ""
 
 #: C/using-categories.page:36(p)
-msgid ""
-"Select the category from the list. You can select as many or as few "
-"categories as you like."
+msgid "Select the category from the list. You can select as many or as few categories as you like."
 msgstr ""
 
 #: C/using-categories.page:42(title)
 #, fuzzy
 msgid "Adding and managing categories"
-msgstr "Potrdila za podpisovanje ni mogoče najti"
-
-#: C/using-categories.page:44(gui) C/using-categories.page:54(gui)
-#: C/tasks-usage-delete-task.page:22(gui) C/tasks-searching.page:74(gui)
-#: C/tasks-display-settings.page:29(gui)
-#: C/sync-with-other-devices.page:38(gui)
-#: C/memos-usage-delete-memo.page:22(gui) C/memos-searching.page:74(gui)
-#: C/mail-wrong-fonts-in-3-0.page:23(gui) C/mail-spam-settings.page:36(gui)
-#: C/mail-spam-settings.page:45(gui) C/mail-spam-settings.page:60(gui)
-#: C/mail-several-pop-accounts.page:25(gui)
-#: C/mail-send-and-receive-automatically.page:21(gui)
-#: C/mail-searching.page:70(gui) C/mail-search-folders-add.page:26(gui)
-#: C/mail-receiving-options-usenet-news.page:25(gui)
-#: C/mail-receiving-options-usenet-news.page:34(gui)
-#: C/mail-receiving-options-unix-mbox-spool-file.page:22(gui)
-#: C/mail-receiving-options-unix-mbox-spool-file.page:27(gui)
-#: C/mail-receiving-options-unix-mbox-spool-directory.page:22(gui)
-#: C/mail-receiving-options-unix-mbox-spool-directory.page:26(gui)
-#: C/mail-receiving-options-pop.page:29(gui)
-#: C/mail-receiving-options-pop.page:39(gui)
-#: C/mail-receiving-options-novell-groupwise.page:26(gui)
-#: C/mail-receiving-options-novell-groupwise.page:35(gui)
-#: C/mail-receiving-options-mh-format-directories.page:22(gui)
-#: C/mail-receiving-options-mh-format-directories.page:26(gui)
-#: C/mail-receiving-options-maildir-format-directories.page:22(gui)
-#: C/mail-receiving-options-maildir-format-directories.page:26(gui)
-#: C/mail-receiving-options-local-delivery.page:22(gui)
-#: C/mail-receiving-options-local-delivery.page:27(gui)
-#: C/mail-receiving-options-imap-plus.page:25(gui)
-#: C/mail-receiving-options-imap-plus.page:34(gui)
-#: C/mail-receiving-options-imap.page:25(gui)
-#: C/mail-receiving-options-imap.page:34(gui)
-#: C/mail-receiving-options-exchange-mapi.page:22(gui)
-#: C/mail-receiving-options-exchange-mapi.page:33(gui)
-#: C/mail-receiving-options-evolution-exchange.page:25(gui)
-#: C/mail-receiving-options-evolution-exchange.page:36(gui)
-#: C/mail-received-notification.page:27(gui) C/mail-read-receipts.page:39(gui)
-#: C/mail-labels.page:35(gui) C/mail-imap-headers.page:27(gui)
-#: C/mail-imap-headers.page:38(gui) C/mail-imap-headers.page:40(gui)
-#: C/mail-filters.page:27(gui) C/mail-filters.page:30(gui)
-#: C/mail-filters.page:36(gui) C/mail-filters.page:51(gui)
-#: C/mail-filters.page:53(gui) C/mail-filters.page:61(gui)
-#: C/mail-filters-not-working.page:29(gui)
-#: C/mail-error-no-provider-available.page:37(gui)
-#: C/mail-error-no-provider-available.page:38(gui)
-#: C/mail-error-failed-to-append-to-sent-folder.page:26(gui)
-#: C/mail-encryption-s-mime-signing-encrypting.page:28(gui)
-#: C/mail-encryption-s-mime-signing-encrypting.page:30(gui)
-#: C/mail-encryption-s-mime-manage.page:26(gui)
-#: C/mail-encryption-gpg-signing-encrypting.page:30(gui)
-#: C/mail-encryption-gpg-signing-encrypting.page:32(gui)
-#: C/mail-encryption-gpg-set-up.page:29(gui)
-#: C/mail-encryption-gpg-set-up.page:30(gui)
-#: C/mail-displaying-sender-photograph.page:29(gui)
-#: C/mail-displaying-images-in-html.page:38(gui)
-#: C/mail-displaying-images-in-html.page:44(gui)
-#: C/mail-displaying-images-in-html.page:46(gui)
-#: C/mail-displaying-character-encodings.page:25(gui)
-#: C/mail-delete-and-undelete.page:40(gui)
-#: C/mail-default-folder-locations.page:33(gui)
-#: C/mail-default-CC-and-BCC.page:29(gui)
-#: C/mail-composer-spellcheck.page:34(gui)
-#: C/mail-composer-spellcheck.page:36(gui)
-#: C/mail-composer-spellcheck.page:41(gui) C/mail-composer-search.page:23(gui)
-#: C/mail-composer-reply.page:54(gui)
-#: C/mail-composer-message-templates.page:25(gui)
-#: C/mail-composer-message-templates.page:77(gui)
-#: C/mail-composer-mail-signatures-per-account.page:34(gui)
-#: C/mail-composer-mail-signatures-manage.page:22(gui)
-#: C/mail-composer-html.page:28(gui) C/mail-composer-forward.page:41(gui)
-#: C/mail-composer-forward-as-attachment.page:26(gui)
-#: C/mail-composer-custom-header-lines.page:31(gui)
-#: C/mail-change-time-format.page:20(gui) C/mail-cannot-see.page:38(gui)
-#: C/mail-cannot-see.page:41(gui) C/mail-attachments-sending.page:46(gui)
-#: C/mail-account-manage-usenet-news.page:24(gui)
-#: C/mail-account-manage-usenet-news.page:25(gui)
-#: C/mail-account-manage-unix-mbox-spool-file.page:24(gui)
-#: C/mail-account-manage-unix-mbox-spool-file.page:25(gui)
-#: C/mail-account-manage-unix-mbox-spool-directory.page:24(gui)
-#: C/mail-account-manage-unix-mbox-spool-directory.page:25(gui)
-#: C/mail-account-manage-pop.page:24(gui)
-#: C/mail-account-manage-pop.page:25(gui)
-#: C/mail-account-manage-novell-groupwise.page:25(gui)
-#: C/mail-account-manage-novell-groupwise.page:26(gui)
-#: C/mail-account-manage-microsoft-exchange-evo-mapi.page:25(gui)
-#: C/mail-account-manage-microsoft-exchange-evo-mapi.page:26(gui)
-#: C/mail-account-manage-microsoft-exchange-evo-exchange.page:25(gui)
-#: C/mail-account-manage-microsoft-exchange-evo-exchange.page:26(gui)
-#: C/mail-account-manage-mh-format-directories.page:24(gui)
-#: C/mail-account-manage-mh-format-directories.page:25(gui)
-#: C/mail-account-manage-maildir-format-directories.page:24(gui)
-#: C/mail-account-manage-maildir-format-directories.page:25(gui)
-#: C/mail-account-manage-local-delivery.page:24(gui)
-#: C/mail-account-manage-local-delivery.page:25(gui)
-#: C/mail-account-manage-imap-plus.page:24(gui)
-#: C/mail-account-manage-imap-plus.page:25(gui)
-#: C/mail-account-manage-imap.page:24(gui)
-#: C/mail-account-manage-imap.page:25(gui)
-#: C/mail-access-gmail-pop-account.page:39(gui) C/intro-first-run.page:84(gui)
-#: C/exporting-data-mail.page:25(gui)
-#: C/contacts-usage-delete-contact.page:22(gui)
-#: C/contacts-searching.page:74(gui) C/contacts-autocompletion.page:30(gui)
-#: C/contacts-add-automatically.page:27(gui)
-#: C/calendar-usage-delete-appointment.page:22(gui)
-#: C/calendar-timezones.page:30(gui) C/calendar-timezones.page:32(gui)
-#: C/calendar-searching.page:74(gui) C/calendar-publishing.page:24(gui)
-#: C/calendar-meetings-replying-to-invitation.page:31(gui)
-#: C/calendar-layout-general-formatting.page:27(gui)
-#: C/calendar-layout-appointment-display.page:29(gui)
-#: C/calendar-alarms-and-reminders.page:28(gui)
-msgid "Edit"
-msgstr "Uredi"
-
-#: C/using-categories.page:44(gui)
-#, fuzzy
-msgid "Available Categories"
-msgstr "Razpoložljive _kategorije"
+msgstr "Upravljanje vsebine in trenutne izbire"
 
 #: C/using-categories.page:44(p)
-msgid ""
-"If the default list of categories does not suit your needs, you can add your "
-"own categories either directly via <guiseq><placeholder-1/><placeholder-2/></"
-"guiseq>, or indirectly when editing an object:"
+msgid "If the default list of categories does not suit your needs, you can add your own categories either directly via <guiseq><gui>Edit</gui><gui>Available Categories</gui></guiseq>, or indirectly when editing an object:"
 msgstr ""
 
 #: C/using-categories.page:46(p)
 msgid "Double-click any object to bring up th corresponding editor."
-msgstr ""
+msgstr "Dvokliknite na kateri koli predmet za priklic ustreznega urejevalnika."
 
 #: C/using-categories.page:48(p)
 msgid "Enter the new category in the entry box at the top."
-msgstr ""
+msgstr "Vnesite novo kategorijo v vnosno polje na vrhu."
 
-#: C/using-categories.page:49(gui) C/using-categories.page:51(gui)
-#: C/tasks-searching.page:54(gui) C/tasks-searching.page:67(gui)
-#: C/tasks-searching.page:76(gui) C/memos-searching.page:54(gui)
-#: C/memos-searching.page:67(gui) C/memos-searching.page:76(gui)
-#: C/mail-spam-groupwise-remove-from-list.page:28(gui)
-#: C/mail-spam-groupwise-manage-list.page:31(gui)
-#: C/mail-spam-groupwise-add-to-list.page:31(gui)
-#: C/mail-searching.page:50(gui) C/mail-searching.page:63(gui)
-#: C/mail-searching.page:72(gui) C/mail-search-folders-add.page:46(gui)
-#: C/mail-filters.page:43(gui) C/mail-filters.page:54(gui)
-#: C/mail-filters.page:64(gui)
-#: C/mail-encryption-s-mime-signing-encrypting.page:34(gui)
-#: C/mail-encryption-gpg-signing-encrypting.page:35(gui)
-#: C/mail-encryption-gpg-set-up.page:34(gui)
-#: C/mail-composer-custom-header-lines.page:45(gui)
-#: C/mail-attachments-sending.page:32(gui)
-#: C/contacts-using-contact-lists.page:37(gui)
-#: C/contacts-usage-edit-contact.page:27(gui)
-#: C/contacts-usage-add-contact.page:27(gui)
-#: C/contacts-usage-add-contact.page:37(gui) C/contacts-searching.page:54(gui)
-#: C/contacts-searching.page:67(gui) C/contacts-searching.page:76(gui)
-#: C/calendar-searching.page:54(gui) C/calendar-searching.page:67(gui)
-#: C/calendar-searching.page:76(gui)
-#: C/calendar-meetings-replying-to-invitation.page:28(gui)
-#: C/calendar-meetings-delegating.page:38(gui)
-msgid "OK"
-msgstr "V redu"
-
-#: C/using-categories.page:49(p) C/using-categories.page:51(p)
-#: C/tasks-webdav.page:34(p) C/tasks-searching.page:76(p)
-#: C/tasks-local.page:28(p) C/tasks-caldav.page:32(p)
-#: C/memos-searching.page:76(p) C/mail-working-offline.page:34(p)
-#: C/mail-spam-settings.page:38(p)
+#: C/using-categories.page:49(p)
+#: C/using-categories.page:51(p)
 #: C/mail-spam-groupwise-remove-from-list.page:28(p)
-#: C/mail-searching.page:72(p) C/mail-search-folders-add.page:27(p)
-#: C/mail-search-folders-add.page:46(p) C/mail-imap-headers.page:40(p)
-#: C/mail-filters.page:37(p) C/mail-filters.page:43(p)
-#: C/mail-filters.page:53(p) C/mail-filters.page:63(p)
+#: C/mail-search-folders-add.page:46(p)
+#: C/mail-filters.page:43(p)
 #: C/mail-filters.page:64(p)
-#: C/mail-encryption-s-mime-signing-encrypting.page:30(p)
-#: C/mail-encryption-s-mime-signing-encrypting.page:31(p)
 #: C/mail-encryption-s-mime-signing-encrypting.page:34(p)
-#: C/mail-encryption-gpg-signing-encrypting.page:32(p)
-#: C/mail-encryption-gpg-signing-encrypting.page:33(p)
 #: C/mail-encryption-gpg-signing-encrypting.page:35(p)
-#: C/mail-encryption-gpg-signing-encrypting.page:36(p)
 #: C/mail-encryption-gpg-set-up.page:34(p)
-#: C/mail-encryption-gpg-set-up.page:35(p)
-#: C/mail-composer-message-templates.page:68(p)
-#: C/mail-composer-message-templates.page:78(p)
-#: C/mail-composer-html-table.page:29(p) C/mail-composer-html-rule.page:28(p)
-#: C/mail-composer-html-link.page:29(p) C/mail-composer-html-image.page:27(p)
 #: C/mail-composer-custom-header-lines.page:45(p)
 #: C/mail-attachments-sending.page:32(p)
 #: C/contacts-using-contact-lists.page:37(p)
 #: C/contacts-usage-edit-contact.page:27(p)
-#: C/contacts-usage-add-contact.page:27(p) C/contacts-searching.page:76(p)
-#: C/contacts-local.page:27(p) C/contacts-ldap.page:36(p)
-#: C/contacts-google.page:31(p) C/calendar-webdav.page:34(p)
-#: C/calendar-weather.page:34(p) C/calendar-searching.page:76(p)
-#: C/calendar-meetings-delegating.page:32(p)
-#: C/calendar-meetings-delegating.page:38(p) C/calendar-local.page:28(p)
-#: C/calendar-google.page:35(p) C/calendar-caldav.page:35(p)
+#: C/contacts-usage-add-contact.page:27(p)
+#: C/calendar-meetings-delegating.page:38(p)
 #, fuzzy
-msgid "Click <placeholder-1/>."
-msgstr "gpg <placeholder-1/>"
+msgid "Click <gui style=\"button\">OK</gui>."
+msgstr "Kliknite <gui style=\"button\">Poveži</gui>."
 
 #: C/using-categories.page:50(p)
-msgid ""
-"You can now see the category in the <placeholder-1/> text field in the "
-"editor."
-msgstr ""
-
-#: C/using-categories.page:54(gui)
-msgid "Categories Editor"
-msgstr "Urejevalnik kategorij"
-
-#: C/using-categories.page:54(gui) C/tasks-usage-delete-task.page:22(gui)
-#: C/memos-usage-delete-memo.page:22(gui)
-#: C/mail-delete-and-undelete.page:30(key)
-#: C/mail-delete-and-undelete.page:30(gui)
-#: C/contacts-usage-delete-contact.page:22(gui)
-#: C/calendar-usage-delete-appointment.page:22(gui)
-msgid "Delete"
-msgstr "Izbriši"
+msgid "You can now see the category in the <gui>Categories</gui> text field in the editor."
+msgstr "Sedaj lahko vidite kategorijo v besedilnem polju <gui>Kategorije</gui> v urejevalniku."
 
 #: C/using-categories.page:54(p)
-msgid ""
-"In the <placeholder-1/> you can edit or set the color and icon for each "
-"category available by clicking <placeholder-2/> at the bottom of the "
-"<placeholder-3/> window. Press <placeholder-4/> to delete categories from "
-"the list."
+msgid "In the <gui>Categories Editor</gui> you can edit or set the color and icon for each category available by clicking <gui style=\"button\">Edit</gui> at the bottom of the <gui>Categories</gui> window. Press <gui style=\"button\">Delete</gui> to delete categories from the list."
 msgstr ""
 
-#: C/using-categories.page:57(link) C/mail-search-folders.page:24(link)
-#: C/mail-search-folders.page:26(link)
-#, fuzzy
-msgid "search"
-msgstr "Iskanje:"
-
 #: C/using-categories.page:57(p)
-msgid ""
-"To display only the objects in a particular category, select the "
-"corresponding category in the quick <placeholder-1/> bar."
-msgstr ""
+msgid "To display only the objects in a particular category, select the corresponding category in the quick <link xref=\"searching-items\">search</link> bar."
+msgstr "Da so prikazani samo predmeti v določeni kategoriji, izberite ustrezno kategorijo v vrstici hitrega <link xref=\"searching-items\">iskanja</link>."
 
 #: C/tasks-webdav.page:5(desc)
 msgid "Using an online WebDAV task list or memo list."
-msgstr ""
+msgstr "Uporaba spletnega seznama opravil WebDAV ali seznama zapiskov."
 
 #: C/tasks-webdav.page:20(title)
 msgid "Using a WebDAV task or memo list"
-msgstr ""
+msgstr "Uporaba seznama opravil WebDAV ali seznama zapiskov"
 
 #: C/tasks-webdav.page:22(p)
 msgid "Lists of this type are read-only."
-msgstr ""
-
-#: C/tasks-webdav.page:24(p) C/tasks-caldav.page:22(p)
-msgid ""
-"To add such a task list or memo list to Evolution, perform the following "
-"steps:"
-msgstr ""
-
-#: C/tasks-webdav.page:26(gui) C/tasks-usage-edit-task.page:27(gui)
-#: C/tasks-usage-add-task.page:26(gui) C/tasks-usage-add-task.page:29(gui)
-#: C/tasks-usage-add-task.page:42(gui) C/tasks-local.page:24(gui)
-#: C/tasks-caldav.page:24(gui) C/memos-usage-edit-memo.page:27(gui)
-#: C/memos-usage-add-memo.page:26(gui) C/memos-usage-add-memo.page:29(gui)
-#: C/memos-usage-add-memo.page:43(gui) C/memos-usage-add-memo.page:49(gui)
-#: C/mail-working-offline.page:40(gui) C/mail-working-offline.page:41(gui)
-#: C/mail-send-and-receive-manual.page:21(gui) C/mail-not-sent.page:27(gui)
-#: C/mail-composer-write-new-message.page:25(gui)
-#: C/mail-composer-message-templates.page:41(gui)
-#: C/mail-composer-message-templates.page:52(gui)
-#: C/import-single-files.page:24(gui) C/import-apps-outlook.page:52(gui)
-#: C/import-apps-outlook.page:59(gui) C/import-apps-outlook.page:62(gui)
-#: C/import-apps-mozilla.page:24(gui) C/exporting-data-mail.page:22(gui)
-#: C/exporting-data-contacts.page:26(gui)
-#: C/exporting-data-contacts.page:27(gui) C/deleting-emails.page:31(gui)
-#: C/contacts-using-contact-lists.page:32(gui)
-#: C/contacts-usage-add-contact.page:23(gui) C/contacts-local.page:24(gui)
-#: C/contacts-ldap.page:31(gui) C/contacts-google.page:25(gui)
-#: C/calendar-webdav.page:26(gui) C/calendar-weather.page:26(gui)
-#: C/calendar-usage-edit-appointment.page:27(gui)
-#: C/calendar-usage-add-appointment.page:23(gui)
-#: C/calendar-meetings-sending-invitation.page:31(gui)
-#: C/calendar-local.page:24(gui) C/calendar-google.page:28(gui)
-#: C/calendar-free-busy.page:33(gui) C/calendar-caldav.page:27(gui)
-#: C/backup-restore.page:28(gui) C/backup-restore.page:37(gui)
-#, fuzzy
-msgid "File"
-msgstr "Datoteka:"
-
-#: C/tasks-webdav.page:26(gui) C/tasks-usage-add-task.page:26(gui)
-#: C/tasks-usage-add-task.page:42(gui) C/tasks-local.page:24(gui)
-#: C/tasks-caldav.page:24(gui) C/memos-usage-add-memo.page:26(gui)
-#: C/memos-usage-add-memo.page:43(gui) C/mail-folders.page:36(gui)
-#: C/mail-composer-write-new-message.page:25(gui)
-#: C/mail-composer-message-templates.page:49(gui)
-#: C/mail-composer-custom-header-lines.page:41(gui)
-#: C/import-apps-outlook.page:52(gui)
-#: C/contacts-using-contact-lists.page:32(gui)
-#: C/contacts-usage-add-contact.page:23(gui) C/contacts-local.page:24(gui)
-#: C/contacts-ldap.page:31(gui) C/contacts-google.page:25(gui)
-#: C/calendar-webdav.page:26(gui) C/calendar-weather.page:26(gui)
-#: C/calendar-usage-add-appointment.page:23(gui)
-#: C/calendar-meetings-sending-invitation.page:31(gui)
-#: C/calendar-local.page:24(gui) C/calendar-google.page:28(gui)
-#: C/calendar-free-busy.page:33(gui) C/calendar-caldav.page:27(gui)
-msgid "New"
-msgstr "Nov"
-
-#: C/tasks-webdav.page:26(gui) C/tasks-local.page:24(gui)
-#: C/tasks-display-settings.page:29(gui) C/tasks-caldav.page:24(gui)
-msgid "Task List"
-msgstr "Seznam nalog"
+msgstr "Seznami te vrste so le za branje."
 
-#: C/tasks-webdav.page:26(gui) C/tasks-local.page:24(gui)
-#: C/tasks-caldav.page:24(gui)
-msgid "Memo List"
-msgstr "Seznam opomnikov"
+#: C/tasks-webdav.page:24(p)
+#: C/tasks-caldav.page:22(p)
+msgid "To add such a task list or memo list to Evolution, perform the following steps:"
+msgstr "Za dodajanje seznama opravil ali seznama zapiskov v Evolution izvedite naslednje korake:"
 
-#: C/tasks-webdav.page:26(p) C/tasks-local.page:24(p)
+#: C/tasks-webdav.page:26(p)
+#: C/tasks-local.page:24(p)
 #: C/tasks-caldav.page:24(p)
-msgid ""
-"Click <guiseq><placeholder-1/><placeholder-2/><placeholder-3/></guiseq> or "
-"<guiseq><placeholder-4/><placeholder-5/><placeholder-6/></guiseq>."
-msgstr ""
-
-#: C/tasks-webdav.page:27(gui) C/tasks-caldav.page:25(gui)
-#: C/calendar-webdav.page:27(gui)
-#, fuzzy
-msgid "On the Web"
-msgstr "v prihodnosti"
-
-#: C/tasks-webdav.page:27(p) C/tasks-local.page:25(p)
-#: C/tasks-caldav.page:25(p) C/contacts-local.page:25(p)
-#: C/contacts-google.page:26(p) C/calendar-webdav.page:27(p)
-#: C/calendar-weather.page:27(p) C/calendar-local.page:25(p)
-#: C/calendar-google.page:29(p) C/calendar-caldav.page:28(p)
+msgid "Click <guiseq><gui>File</gui><gui>New</gui><gui>Task List</gui></guiseq> or <guiseq><gui>File</gui><gui>New</gui><gui>Memo List</gui></guiseq>."
+msgstr "Kliknite <guiseq><gui>Datoteka</gui><gui>Nov</gui><gui>Seznam opravil</gui></guiseq> ali <guiseq><gui>Datoteka</gui><gui>Novo</gui><gui>Seznam zapiskov</gui></guiseq>."
+
+#: C/tasks-webdav.page:27(p)
+#: C/tasks-caldav.page:25(p)
+#: C/calendar-webdav.page:27(p)
+#, fuzzy
+msgid "Select the type <gui>On the Web</gui>."
+msgstr "Izbor vrste razpredelnice razdelkov:"
+
+#: C/tasks-webdav.page:28(p)
+#: C/tasks-local.page:26(p)
+#: C/tasks-caldav.page:26(p)
+#: C/contacts-using-contact-lists.page:33(p)
+#: C/contacts-local.page:26(p)
+#: C/contacts-ldap.page:33(p)
+#: C/contacts-google.page:27(p)
+#: C/calendar-webdav.page:28(p)
+#: C/calendar-weather.page:28(p)
+#: C/calendar-local.page:26(p)
+#: C/calendar-google.page:30(p)
+#: C/calendar-caldav.page:29(p)
 #, fuzzy
-msgid "Select the type <placeholder-1/>."
-msgstr "gpg <placeholder-1/>"
-
-#: C/tasks-webdav.page:28(p) C/tasks-local.page:26(p)
-#: C/tasks-caldav.page:26(p) C/contacts-using-contact-lists.page:33(p)
-#: C/contacts-local.page:26(p) C/contacts-ldap.page:33(p)
-#: C/contacts-google.page:27(p) C/calendar-webdav.page:28(p)
-#: C/calendar-weather.page:28(p) C/calendar-local.page:26(p)
-#: C/calendar-google.page:30(p) C/calendar-caldav.page:29(p)
 msgid "Enter a name that you prefer."
-msgstr ""
-
-#: C/tasks-webdav.page:29(p) C/tasks-local.page:27(p)
-#: C/tasks-caldav.page:27(p) C/calendar-webdav.page:29(p)
-#: C/calendar-weather.page:29(p) C/calendar-local.page:27(p)
-#: C/calendar-google.page:31(p) C/calendar-caldav.page:30(p)
+msgstr "Niste vnesli novega imena"
+
+#: C/tasks-webdav.page:29(p)
+#: C/tasks-local.page:27(p)
+#: C/tasks-caldav.page:27(p)
+#: C/calendar-webdav.page:29(p)
+#: C/calendar-weather.page:29(p)
+#: C/calendar-local.page:27(p)
+#: C/calendar-google.page:31(p)
+#: C/calendar-caldav.page:30(p)
 msgid "Optionally choose a color that you prefer."
-msgstr ""
-
-#: C/tasks-webdav.page:30(p) C/tasks-caldav.page:28(p)
-#: C/contacts-google.page:28(p) C/calendar-webdav.page:30(p)
-#: C/calendar-weather.page:30(p) C/calendar-google.page:32(p)
+msgstr "Po želji izberite barvo, ki jo imate raje."
+
+#: C/tasks-webdav.page:30(p)
+#: C/tasks-caldav.page:28(p)
+#: C/contacts-google.page:28(p)
+#: C/calendar-webdav.page:30(p)
+#: C/calendar-weather.page:30(p)
+#: C/calendar-google.page:32(p)
 #: C/calendar-caldav.page:31(p)
-msgid ""
-"Choose if you want to be able to view the content also when being offline."
-msgstr ""
-
-#: C/tasks-webdav.page:31(gui) C/tasks-caldav.page:29(gui)
-#: C/mail-composer-html-link.page:28(gui) C/calendar-webdav.page:31(gui)
-#: C/calendar-caldav.page:32(gui)
-msgid "URL"
-msgstr "URL"
+msgid "Choose if you want to be able to view the content also when being offline."
+msgstr "To izberite le, če želite dostopati do vsebine tudi, ko niste povezani na splet."
 
-#: C/tasks-webdav.page:31(p) C/tasks-caldav.page:29(p)
+#: C/tasks-webdav.page:31(p)
+#: C/tasks-caldav.page:29(p)
 #, fuzzy
-msgid "Enter the address of the list in the <placeholder-1/> field."
-msgstr "Vnesite vaše geslo v polje <b>Novo geslo</b>."
-
-#: C/tasks-webdav.page:32(gui) C/tasks-caldav.page:30(gui)
-#: C/mail-sending-options-smtp.page:38(gui) C/contacts-google.page:30(gui)
-#: C/calendar-webdav.page:32(gui) C/calendar-weather.page:32(gui)
-#: C/calendar-caldav.page:33(gui)
-#, fuzzy
-msgid "Use secure connection"
-msgstr "_Uporabi varno povezavo:"
+msgid "Enter the address of the list in the <gui>URL</gui> field."
+msgstr "Neveljavno polje v ukazu"
 
-#: C/tasks-webdav.page:32(p) C/tasks-caldav.page:30(p)
-#: C/mail-sending-options-smtp.page:38(p) C/contacts-google.page:30(p)
-#: C/calendar-webdav.page:32(p) C/calendar-weather.page:32(p)
+#: C/tasks-webdav.page:32(p)
+#: C/tasks-caldav.page:30(p)
+#: C/mail-sending-options-smtp.page:38(p)
+#: C/contacts-google.page:30(p)
+#: C/calendar-webdav.page:32(p)
+#: C/calendar-weather.page:32(p)
 #: C/calendar-caldav.page:33(p)
-msgid "Choose <placeholder-1/> if you want to connect securely."
-msgstr ""
+msgid "Choose <gui>Use secure connection</gui> if you want to connect securely."
+msgstr "Izberite <gui>Uporabi varno povezavo</gui>, če se želite varno povezati."
 
-#: C/tasks-webdav.page:33(p) C/mail-sending-options-smtp.page:35(p)
+#: C/tasks-webdav.page:33(p)
+#: C/mail-sending-options-smtp.page:35(p)
 #: C/calendar-webdav.page:33(p)
 #, fuzzy
 msgid "Enter your username."
-msgstr "Iskanje po imenu"
+msgstr "Vnesite vaše uporabniško ime:"
 
-#: C/tasks-webdav.page:34(gui) C/tasks-local.page:28(gui)
-#: C/tasks-caldav.page:32(gui) C/contacts-local.page:27(gui)
-#: C/contacts-ldap.page:36(gui) C/contacts-google.page:31(gui)
-#: C/calendar-webdav.page:34(gui) C/calendar-weather.page:34(gui)
-#: C/calendar-local.page:28(gui) C/calendar-google.page:35(gui)
-#: C/calendar-caldav.page:35(gui)
-msgid "Apply"
-msgstr ""
+#: C/tasks-webdav.page:34(p)
+#: C/tasks-local.page:28(p)
+#: C/tasks-caldav.page:32(p)
+#: C/contacts-local.page:27(p)
+#: C/contacts-ldap.page:36(p)
+#: C/contacts-google.page:31(p)
+#: C/calendar-webdav.page:34(p)
+#: C/calendar-weather.page:34(p)
+#: C/calendar-local.page:28(p)
+#: C/calendar-google.page:35(p)
+#: C/calendar-caldav.page:35(p)
+#, fuzzy
+msgid "Click <gui style=\"button\">Apply</gui>."
+msgstr "Kliknite <gui style=\"button\">Uveljavi</gui>."
 
-#: C/tasks-webdav.page:37(p) C/calendar-webdav.page:37(p)
-#: C/calendar-weather.page:37(p) C/calendar-local.page:31(p)
-#: C/calendar-google.page:38(p) C/calendar-caldav.page:38(p)
+#: C/tasks-webdav.page:37(p)
 #, fuzzy
-msgid "The calendar will be added to the list of calendars in Evolution."
-msgstr "Dodaj vremenski koledar v Evolution."
+msgid "The list will be added in Evolution."
+msgstr "Preklopi ali je okno vključeno v seznam oken."
 
 #: C/tasks-using-several-tasklists.page:5(desc)
 msgid "Adding and using more than one task list or memo list."
@@ -1073,12 +942,7 @@ msgid "Using several task lists or memo lists"
 msgstr ""
 
 #: C/tasks-using-several-tasklists.page:22(p)
-msgid ""
-"You can have multiple task or memo lists and overlay them one over the next. "
-"For example, you might have tasks for work, tasks for home, and tasks for "
-"the singing club that you are a member of. The side bar lists those lists, "
-"and you can select or deselect the boxes next to them to show and hide the "
-"tasks or memos in your view."
+msgid "You can have multiple task or memo lists and overlay them one over the next. For example, you might have tasks for work, tasks for home, and tasks for the singing club that you are a member of. The side bar lists those lists, and you can select or deselect the boxes next to them to show and hide the tasks or memos in your view."
 msgstr ""
 
 #: C/tasks-using-several-tasklists.page:24(p)
@@ -1086,9 +950,7 @@ msgid "Tasks and memos for each task or memo list appear as a different color."
 msgstr ""
 
 #: C/tasks-using-several-tasklists.page:26(p)
-msgid ""
-"You can also use lists that are not on your computer, such as on the "
-"internet."
+msgid "You can also use lists that are not on your computer, such as on the internet."
 msgstr ""
 
 #: C/tasks-usage.page:5(desc)
@@ -1098,204 +960,82 @@ msgstr ""
 #: C/tasks-usage.page:20(title)
 #, fuzzy
 msgid "Add, Edit, and Delete Tasks"
-msgstr "Izbriši naloge"
+msgstr "Urejanje in brisanje obstoječih označenih mest"
 
 #: C/tasks-usage-edit-task.page:5(desc)
 #, fuzzy
 msgid "Editing a task in your task list."
-msgstr "Naloge ni mogoče najti v nobenem seznamu nalog"
+msgstr "Dvokliknite na svoj tiskalnik na seznamu."
 
 #: C/tasks-usage-edit-task.page:20(title)
 #, fuzzy
 msgid "Editing a Task"
-msgstr "Evolution stik."
+msgstr "Opravilo v koledarju"
 
 #: C/tasks-usage-edit-task.page:22(p)
 msgid "If you want to change a task that already exists in your task lists,"
 msgstr ""
 
-#: C/tasks-usage-edit-task.page:25(key)
-#, fuzzy
-msgid "Open Task"
-msgstr "_Odpri nalogo"
-
 #: C/tasks-usage-edit-task.page:25(p)
-msgid ""
-"Double-click on the task that you want to edit in the list of contacts, or "
-"right-click on the task and click <placeholder-1/>."
+msgid "Double-click on the task that you want to edit in the list of tasks, or right-click on the task and click <key>Open Task</key>."
 msgstr ""
 
 #: C/tasks-usage-edit-task.page:26(p)
-#, fuzzy
 msgid "Edit the task information."
-msgstr "Dopolnite naslednje podrobnosti."
-
-#: C/tasks-usage-edit-task.page:27(gui) C/tasks-usage-add-task.page:29(gui)
-#: C/tasks-searching.page:67(gui) C/memos-usage-edit-memo.page:27(gui)
-#: C/memos-usage-add-memo.page:29(gui) C/memos-usage-add-memo.page:49(gui)
-#: C/memos-searching.page:67(gui) C/mail-searching.page:63(gui)
-#: C/mail-attachments-received.page:26(gui) C/contacts-searching.page:67(gui)
-#: C/calendar-usage-edit-appointment.page:27(gui)
-#: C/calendar-searching.page:67(gui)
-#: C/calendar-meetings-sending-invitation.page:43(gui)
-#: C/backup-restore.page:29(gui)
-msgid "Save"
-msgstr "Shrani"
-
-#: C/tasks-usage-edit-task.page:27(p) C/tasks-usage-add-task.page:29(p)
-#: C/memos-usage-edit-memo.page:27(p) C/memos-usage-add-memo.page:29(p)
+msgstr "Urejanje podatkov o nalogi."
+
+#: C/tasks-usage-edit-task.page:27(p)
+#: C/tasks-usage-add-task.page:29(p)
+#: C/memos-usage-edit-memo.page:27(p)
+#: C/memos-usage-add-memo.page:29(p)
 #: C/memos-usage-add-memo.page:49(p)
 #: C/calendar-usage-edit-appointment.page:27(p)
-msgid ""
-"Click the <placeholder-1/> button, or <guiseq><placeholder-2/><placeholder-3/"
-"></guiseq>."
+msgid "Click the <gui style=\"button\">Save</gui> button, or <guiseq><gui>File</gui><gui>Save</gui></guiseq>."
 msgstr ""
 
 #: C/tasks-usage-delete-task.page:5(desc)
 #, fuzzy
 msgid "Deleting a task from your task list."
-msgstr "Naloge ni mogoče najti v nobenem seznamu nalog"
+msgstr "Izbor ponudnika s _seznama:"
 
 #: C/tasks-usage-delete-task.page:20(title)
 #, fuzzy
 msgid "Deleting a Task"
-msgstr "Izbriši nalogo"
-
-#: C/tasks-usage-delete-task.page:22(key) C/tasks-usage-add-task.page:26(key)
-#: C/tasks-searching.page:61(key) C/memos-usage-add-memo.page:26(key)
-#: C/memos-usage-add-memo.page:43(key) C/memos-searching.page:61(key)
-#: C/mail-spam-settings.page:45(key) C/mail-spam-marking.page:30(key)
-#: C/mail-spam-groupwise-unmark-message.page:27(key)
-#: C/mail-spam-groupwise-mark-message.page:25(key)
-#: C/mail-sorting-message-list.page:32(key)
-#: C/mail-sorting-message-list.page:36(key) C/mail-searching.page:57(key)
-#: C/mail-reading-keyboard-shortcuts.page:28(key)
-#: C/mail-follow-up-flag.page:31(key) C/mail-folders.page:49(key)
-#: C/mail-filters.page:29(key) C/mail-filters.page:30(key)
-#: C/mail-displaying-images-in-html.page:36(key)
-#: C/mail-delete-and-undelete.page:30(key)
-#: C/mail-delete-and-undelete.page:34(key)
-#: C/mail-composer-write-new-message.page:25(key)
-#: C/mail-composer-write-new-message.page:29(key)
-#: C/mail-composer-reply.page:43(key) C/mail-composer-reply.page:45(key)
-#: C/mail-composer-reply.page:47(key) C/mail-composer-forward.page:31(key)
-#: C/mail-composer-forward.page:34(key)
-#: C/mail-composer-custom-header-lines.page:41(key)
-#: C/mail-attachments-sending.page:30(key) C/exporting-data-mail.page:25(key)
-#: C/deleting-emails.page:31(key) C/contacts-usage-delete-contact.page:22(key)
-#: C/contacts-usage-add-contact.page:23(key) C/contacts-searching.page:61(key)
-#: C/calendar-usage-delete-appointment.page:22(key)
-#: C/calendar-searching.page:61(key) C/calendar-layout-views.page:27(key)
-#: C/calendar-layout-views.page:28(key) C/calendar-layout-views.page:29(key)
-#: C/calendar-layout-views.page:30(key) C/calendar-layout-views.page:31(key)
-msgid "Ctrl"
-msgstr "Ctrl"
-
-#: C/tasks-usage-delete-task.page:22(key)
-#: C/mail-delete-and-undelete.page:30(key)
-#: C/contacts-usage-delete-contact.page:22(key)
-#: C/calendar-usage-delete-appointment.page:22(key)
-msgid "D"
-msgstr "D"
-
-#: C/tasks-usage-delete-task.page:22(gui)
-msgid "Delete Task"
-msgstr "Izbriši nalogo"
+msgstr "Opravilo v koledarju"
 
 #: C/tasks-usage-delete-task.page:22(p)
-msgid ""
-"If you want to delete a task in your task lists, right-click on the task and "
-"select <placeholder-1/>, or click on the task and click <placeholder-2/> in "
-"the tool bar or press <keyseq><placeholder-3/><placeholder-4/></keyseq>, or "
-"click <guiseq><placeholder-5/><placeholder-6/></guiseq>."
+msgid "If you want to delete a task in your task lists, right-click on the task and select <gui>Delete</gui>, or click on the task and click <gui>Delete</gui> in the tool bar or press <keyseq><key>Ctrl</key><key>D</key></keyseq>, or click <guiseq><gui>Edit</gui><gui>Delete Task</gui></guiseq>."
 msgstr ""
 
 #: C/tasks-usage-add-task.page:5(desc)
+#, fuzzy
 msgid "Adding a task to your task list."
-msgstr ""
+msgstr "Dodajanje oznak vašim slikam."
 
 #: C/tasks-usage-add-task.page:23(title)
 #, fuzzy
 msgid "Adding a Task"
-msgstr "Nov seznam nalog"
-
-#: C/tasks-usage-add-task.page:26(gui)
-msgid "Task"
-msgstr "Naloga"
-
-#: C/tasks-usage-add-task.page:26(key) C/tasks-searching.page:61(key)
-#: C/memos-usage-add-memo.page:26(key) C/memos-usage-add-memo.page:43(key)
-#: C/memos-searching.page:61(key) C/mail-spam-settings.page:45(key)
-#: C/mail-spam-marking.page:30(key)
-#: C/mail-spam-groupwise-unmark-message.page:27(key)
-#: C/mail-searching.page:57(key) C/mail-follow-up-flag.page:31(key)
-#: C/mail-folders.page:49(key) C/mail-composer-write-new-message.page:25(key)
-#: C/mail-composer-reply.page:47(key)
-#: C/mail-composer-custom-header-lines.page:41(key)
-#: C/contacts-usage-add-contact.page:23(key) C/contacts-searching.page:61(key)
-#: C/calendar-searching.page:61(key)
-msgid "Shift"
-msgstr ""
+msgstr "Opravilo v koledarju"
 
-#: C/tasks-usage-add-task.page:26(key)
-#: C/mail-sorting-message-list.page:36(key)
-msgid "T"
-msgstr "T"
-
-#: C/tasks-usage-add-task.page:26(p) C/memos-usage-add-memo.page:26(p)
-#: C/memos-usage-add-memo.page:43(p)
-msgid ""
-"Click <guiseq><placeholder-1/><placeholder-2/><placeholder-3/></guiseq>, or "
-"press <keyseq><placeholder-4/><placeholder-5/><placeholder-6/></keyseq>."
+#: C/tasks-usage-add-task.page:26(p)
+msgid "Click <guiseq><gui>File</gui><gui>New</gui><gui>Task</gui></guiseq>, or press <keyseq><key>Shift</key><key>Ctrl</key><key>T</key></keyseq>."
 msgstr ""
 
-#: C/tasks-usage-add-task.page:27(gui) C/memos-usage-add-memo.page:27(gui)
-#: C/memos-usage-add-memo.page:46(gui)
-#, fuzzy
-msgid "List"
-msgstr "Seznam"
-
 #: C/tasks-usage-add-task.page:27(p)
 #, fuzzy
-msgid "Select a task list in the <placeholder-1/> dropdown list."
+msgid "Select a task list in the <gui>List</gui> dropdown list."
 msgstr "Izberite možnost iskanja iz spustnega seznama."
 
 #: C/tasks-usage-add-task.page:28(p)
-#, fuzzy
 msgid "Enter the task information."
-msgstr "Dopolnite naslednje podrobnosti."
+msgstr "Vnesite podatke o nalogi."
 
 #: C/tasks-usage-add-task.page:32(p)
-msgid ""
-"If you just want to quickly add a task by entering a summary you can "
-"directly enter it in the list of tasks."
+msgid "If you just want to quickly add a task by entering a summary you can directly enter it in the list of tasks."
 msgstr ""
 
-#: C/tasks-usage-add-task.page:34(link)
-#: C/calendar-usage-add-appointment.page:34(link)
-#: C/calendar-meetings-sending-invitation.page:48(link)
-#, fuzzy
-msgid "time zone"
-msgstr "Časovni pas:"
-
-#: C/tasks-usage-add-task.page:34(link) C/memos-usage-add-memo.page:34(link)
-#: C/calendar-usage-add-appointment.page:34(link)
-#: C/calendar-meetings-sending-invitation.page:48(link)
-#, fuzzy
-msgid "category"
-msgstr "Kategorija"
-
-#: C/tasks-usage-add-task.page:34(link) C/memos-usage-add-memo.page:34(link)
-#: C/calendar-usage-add-appointment.page:34(link)
-#: C/calendar-meetings-sending-invitation.page:48(link)
-#, fuzzy
-msgid "classification"
-msgstr "Razvrstitev"
-
 #: C/tasks-usage-add-task.page:34(p)
-msgid ""
-"You can also define a <placeholder-1/>, a <placeholder-2/>, or a "
-"<placeholder-3/> for the task, or add an attachment."
+msgid "You can also define a <link xref=\"calendar-timezones\">time zone</link>, a <link xref=\"using-categories\">category</link>, or a <link xref=\"calendar-classifications\">classification</link> for the task, or add an attachment."
 msgstr ""
 
 #: C/tasks-usage-add-task.page:37(title)
@@ -1308,320 +1048,286 @@ msgid "Evolution can be used to assign a task to multiple people."
 msgstr ""
 
 #: C/tasks-usage-add-task.page:40(p)
-msgid ""
-"When you assign a task, you can specify the attendees in several categories, "
-"such as \"chair\" or \"required\". When you save the task, each attendee is "
-"sent an email with the task information, which also gives them the option to "
-"respond."
+msgid "When you assign a task, you can specify the attendees in several categories, such as \"chair\" or \"required\". When you save the task, each attendee is sent an email with the task information, which also gives them the option to respond."
 msgstr ""
 
-#: C/tasks-usage-add-task.page:41(link)
-#, fuzzy
-msgid "meetings"
-msgstr "Srečanje - %s"
-
 #: C/tasks-usage-add-task.page:41(p)
-#, fuzzy
-msgid "This is similar to <placeholder-1/>."
-msgstr "gpg <placeholder-1/>"
-
-#: C/tasks-usage-add-task.page:42(gui)
-#, fuzzy
-msgid "Assigned Task"
-msgstr "Evolution opravila"
+msgid "This is similar to <link xref=\"calendar-meetings-sending-invitation\">meetings</link>."
+msgstr ""
 
 #: C/tasks-usage-add-task.page:42(p)
-msgid ""
-"To create an Assigned Task, click <guiseq><placeholder-1/><placeholder-2/"
-"><placeholder-3/></guiseq>."
+msgid "To create an Assigned Task, click <guiseq><gui>File</gui><gui>New</gui><gui>Assigned Task</gui></guiseq>."
 msgstr ""
 
+#. When image changes, this message will be marked fuzzy or untranslated for you.
+#. It doesn't matter what you translate it to: it's not used at all.
+#: C/tasks-searching.page:34(None)
+#: C/memos-searching.page:34(None)
+#: C/mail-searching.page:33(None)
+#: C/contacts-searching.page:34(None)
+#: C/calendar-searching.page:34(None)
+#, fuzzy
+msgid "@@image: 'figures/search-icon.png'; md5=cd4b82c84c628bfbbfa39d1e0d1eae89"
+msgstr "@@image: 'figures/fantasdic-search.png'; md5=cb098a2f0d3ca44893f6372bead52a4e"
+
 #: C/tasks-searching.page:5(desc)
 #, fuzzy
 msgid "Searching tasks."
-msgstr "Iskanje"
+msgstr "Evolution opravila"
 
-#: C/tasks-searching.page:12(name) C/memos-searching.page:12(name)
-#: C/mail-searching.page:12(name) C/contacts-searching.page:12(name)
+#: C/tasks-searching.page:12(name)
+#: C/memos-searching.page:12(name)
+#: C/mail-searching.page:12(name)
+#: C/contacts-searching.page:12(name)
 #: C/calendar-searching.page:12(name)
+#, fuzzy
 msgid "Max Vorobuov"
-msgstr "Max Vorobuov"
+msgstr "Največje število vrstic"
 
-#: C/tasks-searching.page:13(email) C/memos-searching.page:13(email)
-#: C/mail-searching.page:13(email) C/contacts-searching.page:13(email)
+#: C/tasks-searching.page:13(email)
+#: C/memos-searching.page:13(email)
+#: C/mail-searching.page:13(email)
+#: C/contacts-searching.page:13(email)
 #: C/calendar-searching.page:13(email)
+#, fuzzy
 msgid "vmax0770@gmail.com"
-msgstr "vmax0770@gmail.com"
+msgstr "stabeno@gmail.com"
 
 #: C/tasks-searching.page:28(title)
 #, fuzzy
 msgid "Searching Tasks"
-msgstr "Iskanje metapodatkov CD-ja ..."
+msgstr "Evolution opravila"
 
-#: C/tasks-searching.page:30(title) C/memos-searching.page:30(title)
-#: C/mail-searching.page:30(title) C/contacts-searching.page:30(title)
+#: C/tasks-searching.page:30(title)
+#: C/memos-searching.page:30(title)
+#: C/mail-searching.page:30(title)
+#: C/contacts-searching.page:30(title)
 #: C/calendar-searching.page:30(title)
 #, fuzzy
 msgid "Quick Search"
 msgstr "_Hitro iskanje"
 
 #: C/tasks-searching.page:31(p)
-msgid ""
-"In the Tasks view, you can quickly search for tasks either by summary or by "
-"category."
+msgid "In the Tasks view, you can quickly search for tasks either by summary or by category."
 msgstr ""
 
-#: C/tasks-searching.page:32(p) C/memos-searching.page:32(p)
+#: C/tasks-searching.page:32(p)
+#: C/memos-searching.page:32(p)
 #: C/calendar-searching.page:32(p)
 #, fuzzy
 msgid "Searching by summary:"
-msgstr "Komponenta za iskanje"
+msgstr "Iskanje po imenu paketa"
 
-#: C/tasks-searching.page:34(p) C/memos-searching.page:34(p)
-#: C/contacts-searching.page:34(p) C/calendar-searching.page:34(p)
-msgid ""
-"Click the search icon <media type=\"image\" mime=\"image/png\" src=\"figures/"
-"search-icon.png\"/> to expand the drop-down list."
+#: C/tasks-searching.page:34(p)
+#: C/memos-searching.page:34(p)
+#: C/contacts-searching.page:34(p)
+#: C/calendar-searching.page:34(p)
+msgid "Click the search icon <media type=\"image\" mime=\"image/png\" src=\"figures/search-icon.png\"/> to expand the drop-down list."
 msgstr ""
 
-#: C/tasks-searching.page:35(p) C/memos-searching.page:35(p)
-#: C/mail-searching.page:34(p) C/contacts-searching.page:35(p)
+#: C/tasks-searching.page:35(p)
+#: C/memos-searching.page:35(p)
+#: C/mail-searching.page:34(p)
+#: C/contacts-searching.page:35(p)
 #: C/calendar-searching.page:35(p)
 #, fuzzy
 msgid "Select the search condition from the list."
 msgstr "Izberite možnost iskanja iz spustnega seznama."
 
-#: C/tasks-searching.page:36(key) C/memos-searching.page:36(key)
-#: C/mail-searching.page:36(key)
-#: C/mail-reading-keyboard-shortcuts.page:28(key)
-#: C/contacts-usage-edit-contact.page:25(key)
-#: C/contacts-searching.page:36(key) C/calendar-searching.page:36(key)
-msgid "Enter"
-msgstr ""
-
-#: C/tasks-searching.page:36(p) C/memos-searching.page:36(p)
-#: C/mail-searching.page:36(p) C/contacts-searching.page:36(p)
+#: C/tasks-searching.page:36(p)
+#: C/memos-searching.page:36(p)
+#: C/mail-searching.page:36(p)
+#: C/contacts-searching.page:36(p)
 #: C/calendar-searching.page:36(p)
-msgid "Enter the text you want to search for and press <placeholder-1/>."
+msgid "Enter the text you want to search for and press <key>Enter</key>."
 msgstr ""
 
-#: C/tasks-searching.page:37(p) C/tasks-searching.page:43(p)
-#: C/memos-searching.page:37(p) C/memos-searching.page:43(p)
-#: C/mail-searching.page:37(p) C/contacts-searching.page:37(p)
-#: C/contacts-searching.page:43(p) C/calendar-searching.page:37(p)
+#: C/tasks-searching.page:37(p)
+#: C/tasks-searching.page:43(p)
+#: C/memos-searching.page:37(p)
+#: C/memos-searching.page:43(p)
+#: C/mail-searching.page:37(p)
+#: C/contacts-searching.page:37(p)
+#: C/contacts-searching.page:43(p)
+#: C/calendar-searching.page:37(p)
 #: C/calendar-searching.page:43(p)
 #, fuzzy
 msgid "Evolution displays the search results."
-msgstr "Dodaj WebDAV stike v Evolution."
+msgstr "Čakanje na rezultate iskanja"
 
-#: C/tasks-searching.page:39(p) C/memos-searching.page:39(p)
-#: C/contacts-searching.page:39(p) C/calendar-searching.page:39(p)
+#: C/tasks-searching.page:39(p)
+#: C/memos-searching.page:39(p)
+#: C/contacts-searching.page:39(p)
+#: C/calendar-searching.page:39(p)
 #, fuzzy
 msgid "Searching by category:"
-msgstr "katerakoli kategorija"
-
-#: C/tasks-searching.page:41(gui) C/memos-searching.page:41(gui)
-#: C/mail-cannot-see.page:27(gui) C/contacts-searching.page:41(gui)
-#: C/calendar-searching.page:41(gui)
-msgid "Show"
-msgstr "Pokaži"
+msgstr " Seznam predvajanja (po kategorijah)"
 
-#: C/tasks-searching.page:41(p) C/memos-searching.page:41(p)
-#: C/contacts-searching.page:41(p) C/calendar-searching.page:41(p)
+#: C/tasks-searching.page:41(p)
+#: C/memos-searching.page:41(p)
+#: C/contacts-searching.page:41(p)
+#: C/calendar-searching.page:41(p)
 #, fuzzy
-msgid "Click the <placeholder-1/> drop-down list."
+msgid "Click the <gui>Show</gui> drop-down list."
 msgstr "Izberite možnost iskanja iz spustnega seznama."
 
-#: C/tasks-searching.page:42(p) C/memos-searching.page:42(p)
-#: C/contacts-searching.page:42(p) C/calendar-searching.page:42(p)
+#: C/tasks-searching.page:42(p)
+#: C/memos-searching.page:42(p)
+#: C/contacts-searching.page:42(p)
+#: C/calendar-searching.page:42(p)
 #, fuzzy
 msgid "Select the category from the list."
-msgstr "Izberite možnost iskanja iz spustnega seznama."
+msgstr "Izberi mesto iz seznama"
 
-#: C/tasks-searching.page:45(p) C/memos-searching.page:45(p)
-#: C/mail-searching.page:41(p) C/contacts-searching.page:45(p)
+#: C/tasks-searching.page:45(p)
+#: C/memos-searching.page:45(p)
+#: C/mail-searching.page:41(p)
+#: C/contacts-searching.page:45(p)
 #: C/calendar-searching.page:45(p)
-msgid ""
-"If you want to set several search conditions, you should use an Advanced "
-"search, which is described below."
+msgid "If you want to set several search conditions, you should use an Advanced search, which is described below."
 msgstr ""
 
-#: C/tasks-searching.page:49(title) C/tasks-searching.page:51(gui)
-#: C/memos-searching.page:49(title) C/memos-searching.page:51(gui)
-#: C/mail-searching.page:47(gui) C/contacts-searching.page:49(title)
-#: C/contacts-searching.page:51(gui) C/calendar-searching.page:49(title)
-#: C/calendar-searching.page:51(gui)
+#: C/tasks-searching.page:49(title)
+#: C/memos-searching.page:49(title)
+#: C/contacts-searching.page:49(title)
+#: C/calendar-searching.page:49(title)
+#, fuzzy
 msgid "Advanced Search"
 msgstr "Napredno iskanje"
 
-#: C/tasks-searching.page:51(gui) C/tasks-searching.page:61(gui)
-#: C/tasks-searching.page:67(gui) C/tasks-searching.page:73(gui)
-#: C/memos-searching.page:51(gui) C/memos-searching.page:61(gui)
-#: C/memos-searching.page:67(gui) C/memos-searching.page:73(gui)
-#: C/mail-searching.page:47(gui) C/mail-searching.page:57(gui)
-#: C/mail-searching.page:63(gui) C/mail-searching.page:69(gui)
-#: C/mail-search-folders-add.page:26(gui) C/contacts-searching.page:51(gui)
-#: C/contacts-searching.page:61(gui) C/contacts-searching.page:67(gui)
-#: C/contacts-searching.page:73(gui) C/calendar-searching.page:51(gui)
-#: C/calendar-searching.page:61(gui) C/calendar-searching.page:67(gui)
-#: C/calendar-searching.page:73(gui)
-msgid "Search"
-msgstr "Iskanje"
-
-#: C/tasks-searching.page:51(p) C/memos-searching.page:51(p)
-#: C/mail-searching.page:47(p) C/contacts-searching.page:51(p)
+#: C/tasks-searching.page:51(p)
+#: C/memos-searching.page:51(p)
+#: C/mail-searching.page:47(p)
+#: C/contacts-searching.page:51(p)
 #: C/calendar-searching.page:51(p)
-msgid ""
-"Select the <guiseq><placeholder-1/><placeholder-2/></guiseq> menu to open "
-"the dialog box."
+msgid "Select the <guiseq><gui>Search</gui><gui>Advanced Search</gui></guiseq> menu to open the dialog box."
 msgstr ""
 
-#: C/tasks-searching.page:52(gui) C/memos-searching.page:52(gui)
-#: C/mail-searching.page:48(gui) C/mail-search-folders-add.page:30(gui)
-#: C/mail-filters.page:40(gui) C/contacts-searching.page:52(gui)
-#: C/calendar-searching.page:52(gui)
-#, fuzzy
-msgid "Add Condition"
-msgstr "Dodaj _pogoj"
-
-#: C/tasks-searching.page:52(p) C/memos-searching.page:52(p)
-#: C/mail-searching.page:48(p) C/contacts-searching.page:52(p)
+#: C/tasks-searching.page:52(p)
+#: C/memos-searching.page:52(p)
+#: C/mail-searching.page:48(p)
+#: C/contacts-searching.page:52(p)
 #: C/calendar-searching.page:52(p)
-msgid "Click <placeholder-1/> to add any number of rules."
+msgid "Click <gui style=\"button\">Add Condition</gui> to add any number of rules."
 msgstr ""
 
-#: C/tasks-searching.page:53(p) C/memos-searching.page:53(p)
-#: C/mail-searching.page:49(p) C/contacts-searching.page:53(p)
+#: C/tasks-searching.page:53(p)
+#: C/memos-searching.page:53(p)
+#: C/mail-searching.page:49(p)
+#: C/contacts-searching.page:53(p)
 #: C/calendar-searching.page:53(p)
-msgid ""
-"Select the condition from the dropdown list, and then type a search entry in "
-"the field."
+msgid "Select the condition from the dropdown list, and then type a search entry in the field."
 msgstr ""
 
-#: C/tasks-searching.page:54(p) C/memos-searching.page:54(p)
-#: C/mail-searching.page:50(p) C/contacts-searching.page:54(p)
+#: C/tasks-searching.page:54(p)
+#: C/memos-searching.page:54(p)
+#: C/mail-searching.page:50(p)
+#: C/contacts-searching.page:54(p)
 #: C/calendar-searching.page:54(p)
-#, fuzzy
-msgid "Click <placeholder-1/> to get the search results displayed."
-msgstr "Kliknite tukaj za zamenjavo vrste iskanja"
+msgid "Click <gui style=\"button\">OK</gui> to get the search results displayed."
+msgstr ""
 
-#: C/tasks-searching.page:60(title) C/memos-searching.page:60(title)
-#: C/mail-searching.page:56(title) C/contacts-searching.page:60(title)
+#: C/tasks-searching.page:60(title)
+#: C/memos-searching.page:60(title)
+#: C/mail-searching.page:56(title)
+#: C/contacts-searching.page:60(title)
 #: C/calendar-searching.page:60(title)
 #, fuzzy
 msgid "Clearing the Search results"
-msgstr "Počisti iskanje"
-
-#: C/tasks-searching.page:61(gui) C/memos-searching.page:61(gui)
-#: C/mail-searching.page:57(gui) C/contacts-searching.page:61(gui)
-#: C/calendar-searching.page:61(gui)
-#, fuzzy
-msgid "Clear"
-msgstr "_Počisti"
-
-#: C/tasks-searching.page:61(key) C/memos-searching.page:61(key)
-#: C/mail-searching.page:57(key) C/contacts-searching.page:61(key)
-#: C/calendar-searching.page:61(key)
-msgid "Q"
-msgstr "Q"
+msgstr "Rezultati iskanja za: {0}"
 
-#: C/tasks-searching.page:61(p) C/memos-searching.page:61(p)
-#: C/mail-searching.page:57(p) C/contacts-searching.page:61(p)
+#: C/tasks-searching.page:61(p)
+#: C/memos-searching.page:61(p)
+#: C/mail-searching.page:57(p)
+#: C/contacts-searching.page:61(p)
 #: C/calendar-searching.page:61(p)
-msgid ""
-"To clear your search view and get back to the default view, click the "
-"<placeholder-1/> icon in the search string field, or choose "
-"<guiseq><placeholder-2/><placeholder-3/></guiseq> from the menubar. You can "
-"also press <keyseq><placeholder-4/><placeholder-5/><placeholder-6/></keyseq> "
-"to clear the search."
+msgid "To clear your search view and get back to the default view, click the <gui>Clear</gui> icon in the search string field, or choose <guiseq><gui>Search</gui><gui>Clear</gui></guiseq> from the menubar. You can also press <keyseq><key>Shift</key><key>Ctrl</key><key>Q</key></keyseq> to clear the search."
 msgstr ""
 
-#: C/tasks-searching.page:65(title) C/memos-searching.page:65(title)
-#: C/mail-searching.page:61(title) C/contacts-searching.page:65(title)
+#: C/tasks-searching.page:65(title)
+#: C/memos-searching.page:65(title)
+#: C/mail-searching.page:61(title)
+#: C/contacts-searching.page:65(title)
 #: C/calendar-searching.page:65(title)
 #, fuzzy
 msgid "Saved Searches"
-msgstr "Shrani iskanje"
+msgstr "_Uredi shranjena iskanja ..."
 
-#: C/tasks-searching.page:66(p) C/memos-searching.page:66(p)
-#: C/mail-searching.page:62(p) C/contacts-searching.page:66(p)
+#: C/tasks-searching.page:66(p)
+#: C/memos-searching.page:66(p)
+#: C/mail-searching.page:62(p)
+#: C/contacts-searching.page:66(p)
 #: C/calendar-searching.page:66(p)
-msgid ""
-"If you search for something rather often, you will prefer not to type it "
-"many times. In this case you can use saved searches."
+msgid "If you search for something rather often, you will prefer not to type it many times. In this case you can use saved searches."
 msgstr ""
 
-#: C/tasks-searching.page:67(gui) C/memos-searching.page:67(gui)
-#: C/mail-searching.page:63(gui) C/contacts-searching.page:67(gui)
-#: C/calendar-searching.page:67(gui)
-msgid "Save Search"
-msgstr "Shrani iskanje"
-
-#: C/tasks-searching.page:67(p) C/memos-searching.page:67(p)
-#: C/mail-searching.page:63(p) C/contacts-searching.page:67(p)
+#: C/tasks-searching.page:67(p)
+#: C/memos-searching.page:67(p)
+#: C/mail-searching.page:63(p)
+#: C/contacts-searching.page:67(p)
 #: C/calendar-searching.page:67(p)
-msgid ""
-"To save your search results, either click <placeholder-1/> instead of "
-"<placeholder-2/> in the Search dialog, or in case the search results are "
-"already displayed, select <guiseq><placeholder-3/><placeholder-4/></guiseq>. "
-"From now on this search will be directly available from the <placeholder-5/> "
-"menu."
+msgid "To save your search results, either click <gui>Save</gui> instead of <gui>OK</gui> in the Search dialog, or in case the search results are already displayed, select <guiseq><gui>Search</gui><gui>Save Search</gui></guiseq>. From now on this search will be directly available from the <gui>Search</gui> menu."
 msgstr ""
 
-#: C/tasks-searching.page:71(title) C/memos-searching.page:71(title)
-#: C/mail-searching.page:67(title) C/contacts-searching.page:71(title)
+#: C/tasks-searching.page:71(title)
+#: C/memos-searching.page:71(title)
+#: C/mail-searching.page:67(title)
+#: C/contacts-searching.page:71(title)
 #: C/calendar-searching.page:71(title)
 #, fuzzy
 msgid "Editing a Saved Search"
-msgstr "_Uredi shranjena iskanja ..."
+msgstr "Uredi shranjeno iskanje"
 
-#: C/tasks-searching.page:73(gui) C/memos-searching.page:73(gui)
-#: C/mail-searching.page:69(gui) C/contacts-searching.page:73(gui)
-#: C/calendar-searching.page:73(gui)
-#, fuzzy
-msgid "Edit Saved Searches"
-msgstr "_Uredi shranjena iskanja ..."
-
-#: C/tasks-searching.page:73(p) C/memos-searching.page:73(p)
-#: C/mail-searching.page:69(p) C/contacts-searching.page:73(p)
+#: C/tasks-searching.page:73(p)
+#: C/memos-searching.page:73(p)
+#: C/mail-searching.page:69(p)
+#: C/contacts-searching.page:73(p)
 #: C/calendar-searching.page:73(p)
-msgid ""
-"Select <guiseq><placeholder-1/><placeholder-2/></guiseq> from the menu bar "
-"to open the window."
+msgid "Select <guiseq><gui>Search</gui><gui>Edit Saved Searches</gui></guiseq> from the menu bar to open the window."
 msgstr ""
 
-#: C/tasks-searching.page:73(item) C/memos-searching.page:73(item)
-#: C/mail-searching.page:69(item) C/contacts-searching.page:73(item)
+#: C/tasks-searching.page:73(item)
+#: C/memos-searching.page:73(item)
+#: C/mail-searching.page:69(item)
+#: C/contacts-searching.page:73(item)
 #: C/calendar-searching.page:73(item)
 #, fuzzy
 msgid "<placeholder-1/>."
-msgstr "gpg <placeholder-1/>"
-
-#: C/tasks-searching.page:74(gui) C/memos-searching.page:74(gui)
-#: C/mail-searching.page:70(gui) C/contacts-searching.page:74(gui)
-#: C/calendar-searching.page:74(gui)
-msgid "Edit Rule"
-msgstr "Uredi pravilo"
+msgstr "Držalo"
 
-#: C/tasks-searching.page:74(p) C/memos-searching.page:74(p)
-#: C/mail-searching.page:70(p) C/contacts-searching.page:74(p)
+#: C/tasks-searching.page:74(p)
+#: C/memos-searching.page:74(p)
+#: C/mail-searching.page:70(p)
+#: C/contacts-searching.page:74(p)
 #: C/calendar-searching.page:74(p)
-msgid "Click the <placeholder-1/> button to open the <placeholder-2/> window."
+msgid "Click the <gui style=\"button\">Edit</gui> button to open the <gui>Edit Rule</gui> window."
 msgstr ""
 
-#: C/tasks-searching.page:75(p) C/memos-searching.page:75(p)
-#: C/mail-searching.page:71(p) C/contacts-searching.page:75(p)
+#: C/tasks-searching.page:75(p)
+#: C/memos-searching.page:75(p)
+#: C/mail-searching.page:71(p)
+#: C/contacts-searching.page:75(p)
 #: C/calendar-searching.page:75(p)
 msgid "Edit the title or search conditions from the dialog box."
 msgstr ""
 
+#: C/tasks-searching.page:76(p)
+#: C/memos-searching.page:76(p)
+#: C/mail-searching.page:72(p)
+#: C/contacts-searching.page:76(p)
+#: C/calendar-searching.page:76(p)
+#, fuzzy
+msgid "Click <gui>OK</gui>."
+msgstr "Kliknite <gui>V redu</gui>."
+
 #: C/tasks-organizing.page:5(desc)
 msgid "On task and memo lists, searching, and categories."
 msgstr ""
 
 #: C/tasks-organizing.page:21(title)
+#, fuzzy
 msgid "Sorting and organizing tasks and memos"
-msgstr ""
+msgstr "Imenik, zapiski in naloge Evolution."
 
 #: C/tasks-local.page:5(desc)
 msgid "Adding another local task or memo list."
@@ -1632,16 +1338,17 @@ msgid "Adding another local task or memo list"
 msgstr ""
 
 #: C/tasks-local.page:22(p)
-msgid ""
-"To add another local task list to Evolution, perform the following steps:"
+msgid "To add another local task list to Evolution, perform the following steps:"
 msgstr ""
 
-#: C/tasks-local.page:25(gui) C/mail-composer-message-templates.page:35(gui)
-#: C/contacts-local.page:25(gui) C/calendar-local.page:25(gui)
-msgid "On This Computer"
-msgstr "Na tem računalniku"
+#: C/tasks-local.page:25(p)
+#: C/contacts-local.page:25(p)
+#: C/calendar-local.page:25(p)
+msgid "Select the type <gui>On This Computer</gui>."
+msgstr ""
 
-#: C/tasks-local.page:31(p) C/tasks-caldav.page:35(p)
+#: C/tasks-local.page:31(p)
+#: C/tasks-caldav.page:35(p)
 msgid "The task list will be added to the list of task lists in Evolution."
 msgstr ""
 
@@ -1652,114 +1359,11 @@ msgstr ""
 #: C/tasks-display-settings.page:23(title)
 #, fuzzy
 msgid "Displaying of tasks"
-msgstr "Ni najdenih predmetov"
-
-#: C/tasks-display-settings.page:29(gui)
-#: C/mail-wrong-fonts-in-3-0.page:23(gui) C/mail-spam-settings.page:45(gui)
-#: C/mail-spam-settings.page:60(gui)
-#: C/mail-send-and-receive-automatically.page:21(gui)
-#: C/mail-receiving-options-usenet-news.page:25(gui)
-#: C/mail-receiving-options-usenet-news.page:34(gui)
-#: C/mail-receiving-options-unix-mbox-spool-file.page:22(gui)
-#: C/mail-receiving-options-unix-mbox-spool-file.page:27(gui)
-#: C/mail-receiving-options-unix-mbox-spool-directory.page:22(gui)
-#: C/mail-receiving-options-unix-mbox-spool-directory.page:26(gui)
-#: C/mail-receiving-options-pop.page:29(gui)
-#: C/mail-receiving-options-pop.page:39(gui)
-#: C/mail-receiving-options-novell-groupwise.page:26(gui)
-#: C/mail-receiving-options-novell-groupwise.page:35(gui)
-#: C/mail-receiving-options-mh-format-directories.page:22(gui)
-#: C/mail-receiving-options-mh-format-directories.page:26(gui)
-#: C/mail-receiving-options-maildir-format-directories.page:22(gui)
-#: C/mail-receiving-options-maildir-format-directories.page:26(gui)
-#: C/mail-receiving-options-local-delivery.page:22(gui)
-#: C/mail-receiving-options-local-delivery.page:27(gui)
-#: C/mail-receiving-options-imap-plus.page:25(gui)
-#: C/mail-receiving-options-imap-plus.page:34(gui)
-#: C/mail-receiving-options-imap.page:25(gui)
-#: C/mail-receiving-options-imap.page:34(gui)
-#: C/mail-receiving-options-exchange-mapi.page:22(gui)
-#: C/mail-receiving-options-exchange-mapi.page:33(gui)
-#: C/mail-receiving-options-evolution-exchange.page:25(gui)
-#: C/mail-receiving-options-evolution-exchange.page:36(gui)
-#: C/mail-read-receipts.page:39(gui) C/mail-labels.page:35(gui)
-#: C/mail-imap-headers.page:38(gui) C/mail-filters.page:27(gui)
-#: C/mail-error-failed-to-append-to-sent-folder.page:26(gui)
-#: C/mail-encryption-s-mime-signing-encrypting.page:28(gui)
-#: C/mail-encryption-s-mime-manage.page:26(gui)
-#: C/mail-encryption-gpg-signing-encrypting.page:30(gui)
-#: C/mail-encryption-gpg-set-up.page:29(gui)
-#: C/mail-displaying-sender-photograph.page:29(gui)
-#: C/mail-displaying-images-in-html.page:38(gui)
-#: C/mail-displaying-images-in-html.page:44(gui)
-#: C/mail-displaying-images-in-html.page:46(gui)
-#: C/mail-displaying-character-encodings.page:25(gui)
-#: C/mail-default-folder-locations.page:33(gui)
-#: C/mail-default-CC-and-BCC.page:29(gui)
-#: C/mail-composer-spellcheck.page:34(gui)
-#: C/mail-composer-spellcheck.page:36(gui) C/mail-composer-reply.page:54(gui)
-#: C/mail-composer-mail-signatures-per-account.page:34(gui)
-#: C/mail-composer-mail-signatures-manage.page:22(gui)
-#: C/mail-composer-html.page:28(gui) C/mail-composer-forward.page:41(gui)
-#: C/mail-composer-forward-as-attachment.page:26(gui)
-#: C/mail-change-time-format.page:20(gui) C/mail-cannot-see.page:41(gui)
-#: C/mail-account-manage-usenet-news.page:24(gui)
-#: C/mail-account-manage-usenet-news.page:25(gui)
-#: C/mail-account-manage-unix-mbox-spool-file.page:24(gui)
-#: C/mail-account-manage-unix-mbox-spool-file.page:25(gui)
-#: C/mail-account-manage-unix-mbox-spool-directory.page:24(gui)
-#: C/mail-account-manage-unix-mbox-spool-directory.page:25(gui)
-#: C/mail-account-manage-pop.page:24(gui)
-#: C/mail-account-manage-pop.page:25(gui)
-#: C/mail-account-manage-novell-groupwise.page:25(gui)
-#: C/mail-account-manage-novell-groupwise.page:26(gui)
-#: C/mail-account-manage-microsoft-exchange-evo-mapi.page:25(gui)
-#: C/mail-account-manage-microsoft-exchange-evo-mapi.page:26(gui)
-#: C/mail-account-manage-microsoft-exchange-evo-exchange.page:25(gui)
-#: C/mail-account-manage-microsoft-exchange-evo-exchange.page:26(gui)
-#: C/mail-account-manage-mh-format-directories.page:24(gui)
-#: C/mail-account-manage-mh-format-directories.page:25(gui)
-#: C/mail-account-manage-maildir-format-directories.page:24(gui)
-#: C/mail-account-manage-maildir-format-directories.page:25(gui)
-#: C/mail-account-manage-local-delivery.page:24(gui)
-#: C/mail-account-manage-local-delivery.page:25(gui)
-#: C/mail-account-manage-imap-plus.page:24(gui)
-#: C/mail-account-manage-imap-plus.page:25(gui)
-#: C/mail-account-manage-imap.page:24(gui)
-#: C/mail-account-manage-imap.page:25(gui)
-#: C/mail-access-gmail-pop-account.page:39(gui) C/intro-first-run.page:84(gui)
-#: C/contacts-autocompletion.page:30(gui)
-#: C/contacts-add-automatically.page:27(gui) C/calendar-timezones.page:30(gui)
-#: C/calendar-timezones.page:32(gui) C/calendar-publishing.page:24(gui)
-#: C/calendar-meetings-replying-to-invitation.page:31(gui)
-#: C/calendar-layout-general-formatting.page:27(gui)
-#: C/calendar-layout-appointment-display.page:29(gui)
-#: C/calendar-alarms-and-reminders.page:28(gui)
-#, fuzzy
-msgid "Preferences"
-msgstr "_Nastavitve"
-
-#: C/tasks-display-settings.page:29(gui) C/calendar-timezones.page:30(gui)
-#: C/calendar-timezones.page:32(gui) C/calendar-publishing.page:24(gui)
-#: C/calendar-meetings-replying-to-invitation.page:31(gui)
-#: C/calendar-layout-general-formatting.page:27(gui)
-#: C/calendar-layout-appointment-display.page:29(gui)
-#: C/calendar-alarms-and-reminders.page:28(gui)
-msgid "Calendar and Tasks"
-msgstr "Koledar in naloge"
-
-#: C/tasks-display-settings.page:29(gui)
-#: C/calendar-layout-appointment-display.page:29(gui)
-#, fuzzy
-msgid "Display"
-msgstr "Zaslon"
+msgstr "Evolution opravila"
 
 #. TODO: Update once https://bugzilla.gnome.org/show_bug.cgi?id=655666 is fixed
 #: C/tasks-display-settings.page:29(p)
-msgid ""
-"The following task-related options are available under "
-"<guiseq><placeholder-1/><placeholder-2/><placeholder-3/><placeholder-4/"
-"><placeholder-5/></guiseq>."
+msgid "The following task-related options are available under <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Calendar and Tasks</gui><gui>Display</gui><gui>Task List</gui></guiseq>."
 msgstr ""
 
 #: C/tasks-display-settings.page:32(p)
@@ -1786,10 +1390,7 @@ msgid "Hide completed tasks after:"
 msgstr "_Skrij opravljene naloge po"
 
 #: C/tasks-display-settings.page:37(p)
-msgid ""
-"Select this option to have completed tasks hidden after a period of time "
-"measured in days, hours, or minutes. If you do not select this option, "
-"completed tasks remain in your task list, marked as complete."
+msgid "Select this option to have completed tasks hidden after a period of time measured in days, hours, or minutes. If you do not select this option, completed tasks remain in your task list, marked as complete."
 msgstr ""
 
 #: C/tasks-caldav.page:5(desc)
@@ -1800,10 +1401,10 @@ msgstr ""
 msgid "Using a CalDAV task or memo list"
 msgstr ""
 
-#: C/tasks-caldav.page:31(p) C/calendar-caldav.page:34(p)
-#, fuzzy
+#: C/tasks-caldav.page:31(p)
+#: C/calendar-caldav.page:34(p)
 msgid "Enter your username and your email address."
-msgstr "Vnesite svoj naslov elektronske pošte."
+msgstr "Vnesite svoje uporabniško ime in naslov e-pošte."
 
 #: C/sync-with-other-devices.page:5(desc)
 msgid "Synchronize Evolution data with handheld devices and mobile phones."
@@ -1817,100 +1418,33 @@ msgstr ""
 msgid "There are currently no \"recommended instructions\" for users."
 msgstr ""
 
-#: C/sync-with-other-devices.page:27(link)
-#, fuzzy
-msgid "SyncEvolution"
-msgstr "Evolution"
-
-#: C/sync-with-other-devices.page:27(link)
-#, fuzzy
-msgid "SyncML"
-msgstr "HotSync"
-
 #: C/sync-with-other-devices.page:27(p)
-msgid ""
-"Many distributions provide the application <placeholder-1/> that can be used "
-"in combination with devices that support <placeholder-2/>."
-msgstr ""
-
-#: C/sync-with-other-devices.page:29(link)
-msgid "ActiveSync protocol"
-msgstr ""
-
-#: C/sync-with-other-devices.page:29(link)
-msgid "list of collaborative software"
+msgid "Many distributions provide the application <link href=\"http://syncevolution.org/\">SyncEvolution</link> that can be used in combination with devices that support <link href=\"https://secure.wikimedia.org/wikipedia/en/wiki/SyncML\">SyncML</link>."
 msgstr ""
 
 #: C/sync-with-other-devices.page:29(p)
-msgid ""
-"Another option might be to use applications and devices that both support "
-"the <placeholder-1/>. A <placeholder-2/> is available on Wikipedia."
-msgstr ""
-
-#: C/sync-with-other-devices.page:31(link)
-msgid "GNOME's bug tracking system"
+msgid "Another option might be to use applications and devices that both support the <link href=\"https://secure.wikimedia.org/wikipedia/en/wiki/ActiveSync\">ActiveSync protocol</link>. A <link href=\"https://secure.wikimedia.org/wikipedia/en/wiki/List_of_collaborative_software\">list of collaborative software</link> is available on Wikipedia."
 msgstr ""
 
 #: C/sync-with-other-devices.page:31(p)
-msgid ""
-"If you can provide good practices or more information on this topic feel "
-"free to file a bug report in <placeholder-1/>."
+msgid "If you can provide good practices or more information on this topic feel free to file a bug report in <link href=\"https://bugzilla.gnome.org/enter_bug.cgi?product=evolution&amp;component=User%20Documentation\">GNOME's bug tracking system</link>."
 msgstr ""
 
 #: C/sync-with-other-devices.page:34(title)
+#, fuzzy
 msgid "Palm"
-msgstr ""
+msgstr "<b>Zaznavanje dlani</b>"
 
 #: C/sync-with-other-devices.page:35(p)
-msgid ""
-"To synchronize with a Palm OS device like the PalmPilot(TM) and the "
-"Handspring Visor several steps are needed: First, you need to enable "
-"synchronization. Second, your computer needs to recognize and access your "
-"handheld. Third, you should decide what sort of synchronization behavior you "
-"want."
+msgid "To synchronize with a Palm OS device like the PalmPilot(TM) and the Handspring Visor several steps are needed: First, you need to enable synchronization. Second, your computer needs to recognize and access your handheld. Third, you should decide what sort of synchronization behavior you want."
 msgstr ""
 
 #: C/sync-with-other-devices.page:37(title)
-#, fuzzy
 msgid "Enabling Synchronization"
-msgstr "Datoteka usklajevanja"
-
-#: C/sync-with-other-devices.page:38(gui)
-#, fuzzy
-msgid "GNOME Pilot Synchronization..."
-msgstr "_Usklajevalnje GNOME pilot ..."
-
-#: C/sync-with-other-devices.page:38(file)
-msgid "/dev/pilot"
-msgstr "/dev/pilot"
-
-#: C/sync-with-other-devices.page:38(file)
-msgid "/dev/ttyS0"
-msgstr "/dev/ttyS0"
-
-#: C/sync-with-other-devices.page:38(file)
-msgid "/dev/ttyUSB1"
-msgstr "/dev/ttyUSB1"
-
-#: C/sync-with-other-devices.page:38(file)
-msgid "ttyUSB0"
-msgstr "ttyUSB0"
-
-#: C/sync-with-other-devices.page:38(file)
-msgid "ttyUSB1"
-msgstr "ttyUSB1"
+msgstr "Omogočitev usklajevanja"
 
 #: C/sync-with-other-devices.page:38(p)
-msgid ""
-"If you have not used a handheld device with your computer before, you need "
-"to configure it via <guiseq><placeholder-1/><placeholder-2/></guiseq>. Make "
-"sure that you have read and write permissions on the device, which is "
-"normally in <placeholder-3/>. If that does not work, check in <placeholder-4/"
-"> if you have a serial connection, or in <placeholder-5/> for a USB "
-"connection. You can do this by becoming root user and adding your username "
-"to the group that owns this device node. For a USB device on sync, two "
-"device nodes are created, <placeholder-6/> and <placeholder-7/>. The second "
-"node is the one to be used in configuring the device."
+msgid "If you have not used a handheld device with your computer before, you need to configure it via <guiseq><gui>Edit</gui><gui>GNOME Pilot Synchronization...</gui></guiseq>. Make sure that you have read and write permissions on the device, which is normally in <file>/dev/pilot</file>. If that does not work, check in <file>/dev/ttyS0</file> if you have a serial connection, or in <file>/dev/ttyUSB1</file> for a USB connection. You can do this by becoming root user and adding your username to the group that owns this device node. For a USB device on sync, two device nodes are created, <file>ttyUSB0</file> and <file>ttyUSB1</file>. The second node is the one to be used in configuring the device."
 msgstr ""
 
 #: C/sync-with-other-devices.page:41(title)
@@ -1918,96 +1452,33 @@ msgstr ""
 msgid "Selecting Conduits"
 msgstr "Odločanje %d veznikov ..."
 
-#: C/sync-with-other-devices.page:42(gui)
-#, fuzzy
-msgid "Pilot Conduits"
-msgstr "Odločanje %d veznikov ..."
-
-#: C/sync-with-other-devices.page:42(gui)
-msgid "EAddress"
-msgstr "EAddress"
-
-#: C/sync-with-other-devices.page:42(gui)
-msgid "ECalendar"
-msgstr "ECalendar"
-
-#: C/sync-with-other-devices.page:42(gui)
-msgid "ETodo"
-msgstr "ETodo"
-
 #: C/sync-with-other-devices.page:42(p)
-msgid ""
-"After your computer and your Palm OS device are communicating, select the "
-"conduits you want under the <placeholder-1/> section. You can use conduits "
-"to synchronize data with several applications; the Evolution conduits are "
-"labeled <placeholder-2/> for the contacts in your address book; "
-"<placeholder-3/> for your calendar; and <placeholder-4/> for your task list."
+msgid "After your computer and your Palm OS device are communicating, select the conduits you want under the <gui>Pilot Conduits</gui> section. You can use conduits to synchronize data with several applications; the Evolution conduits are labeled <gui>EAddress</gui> for the contacts in your address book; <gui>ECalendar</gui> for your calendar; and <gui>ETodo</gui> for your task list."
 msgstr ""
 
-#: C/sync-with-other-devices.page:43(gui)
-#, fuzzy
-msgid "Enable"
-msgstr "Omogočeno"
-
-#: C/sync-with-other-devices.page:43(gui)
-#: C/mail-access-gmail-pop-account.page:30(gui)
-msgid "Settings"
-msgstr "Nastavitve"
-
 #: C/sync-with-other-devices.page:43(p)
-msgid ""
-"Click <placeholder-1/>, then click <placeholder-2/> to change what the "
-"conduit does when activated. Your options can vary depending on the conduit, "
-"but typically they are as follows:"
+msgid "Click <gui>Enable</gui>, then click <gui>Settings</gui> to change what the conduit does when activated. Your options can vary depending on the conduit, but typically they are as follows:"
 msgstr ""
 
-#: C/sync-with-other-devices.page:45(gui)
-#, fuzzy
-msgid "Disabled"
-msgstr "Onemogočeno"
-
 #: C/sync-with-other-devices.page:45(p)
 #, fuzzy
-msgid "<placeholder-1/>: Do nothing."
-msgstr "gpg <placeholder-1/>"
-
-#: C/sync-with-other-devices.page:46(gui)
-#: C/sync-with-other-devices.page:50(gui)
-#, fuzzy
-msgid "Synchronize"
-msgstr "Uskladi"
+msgid "<gui>Disabled</gui>: Do nothing."
+msgstr "Usklajevalnik nima dela!"
 
 #: C/sync-with-other-devices.page:46(p)
-msgid ""
-"<placeholder-1/>: Copy new data from the computer to the handheld, and from "
-"the handheld to the computer. Remove items that were on both systems but "
-"have been deleted on one."
+msgid "<gui>Synchronize</gui>: Copy new data from the computer to the handheld, and from the handheld to the computer. Remove items that were on both systems but have been deleted on one."
 msgstr ""
 
-#: C/sync-with-other-devices.page:47(gui)
-#, fuzzy
-msgid "Copy From Pilot"
-msgstr "Kopiraj z dlančnika"
-
 #: C/sync-with-other-devices.page:47(p)
-msgid ""
-"<placeholder-1/>: If there is any new data on the handheld device, copy it "
-"to the computer."
+msgid "<gui>Copy From Pilot</gui>: If there is any new data on the handheld device, copy it to the computer."
 msgstr ""
 
-#: C/sync-with-other-devices.page:48(gui)
-#, fuzzy
-msgid "Copy To Pilot"
-msgstr "_Kopiraj povezavo v"
-
 #: C/sync-with-other-devices.page:48(p)
-msgid "<placeholder-1/>: Copy new data from the computer to the handheld."
+msgid "<gui>Copy To Pilot</gui>: Copy new data from the computer to the handheld."
 msgstr ""
 
 #: C/sync-with-other-devices.page:50(p)
-msgid ""
-"Select the behavior you want for each conduit you choose to use. If you're "
-"not sure, use <placeholder-1/>."
+msgid "Select the behavior you want for each conduit you choose to use. If you're not sure, use <gui>Synchronize</gui>."
 msgstr ""
 
 #: C/sync-with-other-devices.page:54(title)
@@ -2016,113 +1487,63 @@ msgid "Synchronizing Information"
 msgstr "<b>Podrobnosti preglednice</b>"
 
 #: C/sync-with-other-devices.page:55(p)
-msgid ""
-"Use the following procedure to synchronize the data on your Palm OS device "
-"with the data you store in Evolution."
+msgid "Use the following procedure to synchronize the data on your Palm OS device with the data you store in Evolution."
 msgstr ""
 
-#: C/sync-with-other-devices.page:57(file)
-msgid ".local/share/evolution"
-msgstr ".local/share/evolution"
-
 #: C/sync-with-other-devices.page:57(p)
-msgid ""
-"If you want to back up your information before synchronizing, make a copy of "
-"the <placeholder-1/> directory inside your home directory."
+msgid "If you want to back up your information before synchronizing, make a copy of the <file>.local/share/evolution</file> directory inside your home directory."
 msgstr ""
 
-#: C/sync-with-other-devices.page:58(gui)
-msgid "HotSync"
-msgstr "HotSync"
-
 #: C/sync-with-other-devices.page:58(p)
-msgid ""
-"Put your handheld device in its cradle and press the <placeholder-1/> button."
+msgid "Put your handheld device in its cradle and press the <gui style=\"button\">HotSync</gui> button."
 msgstr ""
 
 #: C/sync-with-other-devices.page:59(p)
-msgid ""
-"If you use Palm OS version 4.0 and have password protection turned on for "
-"your handheld device, you might encounter trouble synchronizing. If this "
-"happens, try turning off password protection on your handheld, synchronize "
-"it with your desktop computer, and then re-enable password protection on "
-"your handheld."
+msgid "If you use Palm OS version 4.0 and have password protection turned on for your handheld device, you might encounter trouble synchronizing. If this happens, try turning off password protection on your handheld, synchronize it with your desktop computer, and then re-enable password protection on your handheld."
 msgstr ""
 
 #: C/sync-with-other-devices.page:61(p)
 msgid "Now your Palm OS device will synchronize data with Evolution."
 msgstr ""
 
-#: C/searching-items.page:5(em) C/index.page:5(desc)
-#: C/exporting-data.page:5(em) C/exporting-data-mail.page:5(em)
-#: C/exporting-data-contacts.page:5(em) C/exporting-data-calendar.page:5(em)
-msgid "Evolution"
-msgstr "Evolution"
-
 #: C/searching-items.page:5(desc)
-msgid "Searching content and data within <placeholder-1/>."
+msgid "Searching content and data within <em>Evolution</em>."
 msgstr ""
 
 #: C/searching-items.page:18(title)
 #, fuzzy
 msgid "Searching items"
-msgstr "Iskanje"
+msgstr "Iskanje predmetov"
 
 #: C/problems-reporting-bugs.page:5(desc)
+#, fuzzy
 msgid "How to report bugs."
-msgstr ""
+msgstr "Poročanje o hroščih preko Bugzillle"
 
 #: C/problems-reporting-bugs.page:21(title)
+#, fuzzy
 msgid "How to report bugs"
-msgstr ""
-
-#: C/problems-reporting-bugs.page:23(link)
-msgid "GNOME bug tracking system"
-msgstr ""
-
-#: C/problems-reporting-bugs.page:23(link)
-msgid "bug writing guidelines"
-msgstr ""
+msgstr "Poročanje o hroščih preko Bugzillle"
 
 #: C/problems-reporting-bugs.page:23(p)
-msgid ""
-"If you do not need help for configuration but you are sure that you have "
-"found a bug in the Evolution software, or if you want to request a feature "
-"you can file a bug report in the <placeholder-1/>. Note that this requires "
-"registration first. Please try to avoid filing duplicates and check the "
-"<placeholder-2/> first."
-msgstr ""
-
-#: C/problems-reporting-bugs.page:23(link)
-msgid "the bug tracker of your GNOME distribution"
+msgid "If you do not need help for configuration but you are sure that you have found a bug in the Evolution software, or if you want to request a feature you can file a bug report in the <link href=\"http://bugzilla.gnome.org\">GNOME bug tracking system</link>. Note that this requires registration first. Please try to avoid filing duplicates and check the <link href=\"https://bugzilla.gnome.org/page.cgi?id=bug-writing.html\">bug writing guidelines</link> first."
 msgstr ""
 
 #: C/problems-reporting-bugs.page:23(p)
-msgid ""
-"Also note that GNOME distributions sometimes introduce their own changes in "
-"Evolution that are not included in GNOME Evolution. This is hard to "
-"recognize for users but if you are aware of it please file a bug report in "
-"<placeholder-1/> instead."
+msgid "Also note that GNOME distributions sometimes introduce their own changes in Evolution that are not included in GNOME Evolution. This is hard to recognize for users but if you are aware of it please file a bug report in <link xref=\"https://live.gnome.org/Bugsquad/TriageGuide/NonGnome#Bug_trackers_for_distributions\">the bug tracker of your GNOME distribution</link> instead."
 msgstr ""
 
 #: C/problems-getting-help.page:5(desc)
 msgid "How to get help for problems."
-msgstr ""
+msgstr "Kako dobiti pomoč v primeru težav."
 
 #: C/problems-getting-help.page:22(title)
-#: C/problems-debug-how-to.page:27(link)
-msgid "How to get help"
-msgstr ""
-
-#: C/problems-getting-help.page:24(link)
 #, fuzzy
-msgid "Evolution mailing list"
-msgstr "%s poštnih seznamov"
+msgid "How to get help"
+msgstr "Kako do pomoči."
 
 #: C/problems-getting-help.page:24(p)
-msgid ""
-"To receive help on problems you can send an email to the <placeholder-1/> or "
-"ask a message in the IRC chat channel #evolution on the server irc.gimp.net."
+msgid "To receive help on problems you can send an email to the <link href=\"http://mail.gnome.org/mailman/listinfo/evolution-list\">Evolution mailing list</link> or ask a message in the IRC chat channel #evolution on the server irc.gimp.net."
 msgstr ""
 
 #: C/problems-debug-how-to.page:5(desc)
@@ -2134,25 +1555,15 @@ msgid "How to track down a problem"
 msgstr ""
 
 #: C/problems-debug-how-to.page:23(p)
-msgid ""
-"As a first hint, error messages will be either displayed in the statusbar or "
-"between the tool bar and the search bar."
+msgid "As a first hint, error messages will be either displayed in the statusbar or between the tool bar and the search bar."
 msgstr ""
 
-#: C/problems-debug-how-to.page:25(link)
-#, fuzzy
-msgid "Evolution project website"
-msgstr "Evolution spletna stran"
-
 #: C/problems-debug-how-to.page:25(p)
-msgid ""
-"To further track down a problem, some debug options are listed on the "
-"<placeholder-1/>."
+msgid "To further track down a problem, some debug options are listed on the <link href=\"http://projects.gnome.org/evolution/bugs.shtml\">Evolution project website</link>."
 msgstr ""
 
 #: C/problems-debug-how-to.page:27(p)
-msgid ""
-"To contact the Evolution community for help, please see <placeholder-1/>."
+msgid "To contact the Evolution community for help, please see <link xref=\"problems-getting-help\">How to get help</link>."
 msgstr ""
 
 #: C/organizing.page:5(desc)
@@ -2160,24 +1571,28 @@ msgid "On organizing and finding your data in Evolution."
 msgstr ""
 
 #: C/organizing.page:18(title)
+#, fuzzy
 msgid "Sorting and organizing"
-msgstr ""
+msgstr "Razvrščanje in nitenje"
 
 #: C/minimize-to-system-tray.page:5(desc)
 #, fuzzy
 msgid "On minimizing Evolution to the notification area."
-msgstr "Utripaj ikono na obvestilnem pladnju."
+msgstr "Kliknite na ikono v obvestilnem področju za prikaz Gossip."
 
 #: C/minimize-to-system-tray.page:11(name)
-#: C/mail-two-trash-folders.page:11(name) C/mail-spam-settings.page:16(name)
+#: C/mail-two-trash-folders.page:11(name)
+#: C/mail-spam-settings.page:16(name)
 #: C/mail-spam-groupwise-manage-list.page:15(name)
 #: C/mail-spam-groupwise-add-to-list.page:15(name)
 #: C/mail-sorting-message-list.page:16(name)
 #: C/mail-search-folders-refresh.page:11(name)
 #: C/mail-refresh-folders.page:11(name)
 #: C/mail-recognized-thread-related-headers.page:11(name)
-#: C/mail-read-receipts.page:20(name) C/mail-not-sent.page:11(name)
-#: C/mail-moving-emails.page:11(name) C/mail-folders.page:16(name)
+#: C/mail-read-receipts.page:20(name)
+#: C/mail-not-sent.page:11(name)
+#: C/mail-moving-emails.page:11(name)
+#: C/mail-folders.page:16(name)
 #: C/mail-filters-not-working.page:12(name)
 #: C/mail-error-no-provider-available.page:11(name)
 #: C/mail-error-folder-mismatch.page:11(name)
@@ -2190,15 +1605,18 @@ msgid "April Gonzales"
 msgstr "April Gonzales"
 
 #: C/minimize-to-system-tray.page:12(email)
-#: C/mail-two-trash-folders.page:12(email) C/mail-spam-settings.page:17(email)
+#: C/mail-two-trash-folders.page:12(email)
+#: C/mail-spam-settings.page:17(email)
 #: C/mail-spam-groupwise-manage-list.page:16(email)
 #: C/mail-spam-groupwise-add-to-list.page:16(email)
 #: C/mail-sorting-message-list.page:17(email)
 #: C/mail-search-folders-refresh.page:12(email)
 #: C/mail-refresh-folders.page:12(email)
 #: C/mail-recognized-thread-related-headers.page:12(email)
-#: C/mail-read-receipts.page:21(email) C/mail-not-sent.page:12(email)
-#: C/mail-moving-emails.page:12(email) C/mail-folders.page:17(email)
+#: C/mail-read-receipts.page:21(email)
+#: C/mail-not-sent.page:12(email)
+#: C/mail-moving-emails.page:12(email)
+#: C/mail-folders.page:17(email)
 #: C/mail-filters-not-working.page:13(email)
 #: C/mail-error-no-provider-available.page:12(email)
 #: C/mail-error-folder-mismatch.page:12(email)
@@ -2211,32 +1629,16 @@ msgid "loonycookie@gmail.com"
 msgstr "loonycookie@gmail.com"
 
 #: C/minimize-to-system-tray.page:25(title)
-msgid "Minimizing Evolution to the system tray"
-msgstr ""
-
-#: C/minimize-to-system-tray.page:27(link)
 #, fuzzy
-msgid "notification area"
-msgstr "_Pokaži ikono v obvestilnem področju"
+msgid "Minimizing Evolution to the system tray"
+msgstr "Ali naj se program zažene v sistemski vrstici?"
 
 #: C/minimize-to-system-tray.page:27(p)
-msgid ""
-"GNOME, by default, has a <placeholder-1/> which includes an applet that "
-"informs users of any system updates, changes, or events. This includes the "
-"arrival of email messages on Evolution. You can refer to this built-in "
-"feature of GNOME for any email notifications."
-msgstr ""
-
-#: C/minimize-to-system-tray.page:29(link)
-msgid "Alltray"
+msgid "GNOME, by default, has a <link xref=\"mail-received-notification\">notification area</link> which includes an applet that informs users of any system updates, changes, or events. This includes the arrival of email messages on Evolution. You can refer to this built-in feature of GNOME for any email notifications."
 msgstr ""
 
 #: C/minimize-to-system-tray.page:29(p)
-msgid ""
-"In GNOME version 2 you may modify the notification area and set it up to "
-"become a system tray by using external software such as <placeholder-1/> "
-"that might be available for installation in the software management tool of "
-"your distribution. This is not possible in GNOME 3 anymore."
+msgid "In GNOME version 2 you may modify the notification area and set it up to become a system tray by using external software such as <link href=\"http://alltray.trausch.us/\"> Alltray</link> that might be available for installation in the software management tool of your distribution. This is not possible in GNOME 3 anymore."
 msgstr ""
 
 #: C/memos-usage.page:5(desc)
@@ -2246,149 +1648,109 @@ msgstr ""
 #: C/memos-usage.page:20(title)
 #, fuzzy
 msgid "Add, Edit and Delete Memos"
-msgstr "Izbriši opomnike"
+msgstr "Urejanje in brisanje obstoječih označenih mest"
 
 #: C/memos-usage.page:22(p)
-msgid ""
-"Currently there is no support for syncing memos with the Tomboy or Gnote "
-"applications."
+msgid "Currently there is no support for syncing memos with the Tomboy or Gnote applications."
 msgstr ""
 
 #: C/memos-usage-edit-memo.page:5(desc)
 #, fuzzy
 msgid "Editing a memo in your memo list."
-msgstr "Opomnika ni mogoče najti v nobenem seznamu opomnikov"
+msgstr "Dvokliknite na svoj tiskalnik na seznamu."
 
 #: C/memos-usage-edit-memo.page:20(title)
 #, fuzzy
 msgid "Editing a Memo"
-msgstr "Evolution stik."
+msgstr "Seznam opomnikov"
 
 #: C/memos-usage-edit-memo.page:22(p)
 msgid "If you want to change a memo that already exists in your memo lists,"
 msgstr ""
 
-#: C/memos-usage-edit-memo.page:25(key)
-#, fuzzy
-msgid "Open Memo"
-msgstr "_Odpri opomnik"
-
 #: C/memos-usage-edit-memo.page:25(p)
-msgid ""
-"Double-click on the memo that you want to edit in the list of contacts, or "
-"right-click on the task and click <placeholder-1/>."
+msgid "Double-click on the memo that you want to edit in the list of contacts, or right-click on the memo and click <key>Open Memo</key>."
 msgstr ""
 
 #: C/memos-usage-edit-memo.page:26(p)
 #, fuzzy
 msgid "Edit the memo information."
-msgstr "Dopolnite naslednje podrobnosti."
+msgstr "Podrobnosti opomnika uspešno poslane"
 
 #: C/memos-usage-delete-memo.page:5(desc)
 #, fuzzy
 msgid "Deleting a memo from your memo list."
-msgstr "Opomnika ni mogoče najti v nobenem seznamu opomnikov"
+msgstr "Izbor ponudnika s _seznama:"
 
 #: C/memos-usage-delete-memo.page:20(title)
 #, fuzzy
 msgid "Deleting a Memo"
-msgstr "_Nov predmet"
-
-#: C/memos-usage-delete-memo.page:22(gui)
-msgid "Delete Memo"
-msgstr "Izbriši opomnik"
+msgstr "Seznam opomnikov"
 
 #: C/memos-usage-delete-memo.page:22(p)
-msgid ""
-"If you want to delete a memo in your memo lists, right-click on the memo and "
-"select <placeholder-1/>, or click on the task and click <placeholder-2/> in "
-"the tool bar, or click <guiseq><placeholder-3/><placeholder-4/></guiseq>."
+msgid "If you want to delete a memo in your memo lists, right-click on the memo and select <gui>Delete</gui>, or click on the memo and click <gui>Delete</gui> in the tool bar, or click <guiseq><gui>Edit</gui><gui>Delete Memo</gui></guiseq>."
 msgstr ""
 
 #: C/memos-usage-add-memo.page:5(desc)
+#, fuzzy
 msgid "Adding a memo to your memo list."
-msgstr ""
+msgstr "Dodajanje oznak vašim slikam."
 
 #: C/memos-usage-add-memo.page:23(title)
 #, fuzzy
 msgid "Adding a Memo"
-msgstr "glava stolpca"
-
-#: C/memos-usage-add-memo.page:26(gui)
-msgid "Memo"
-msgstr "Opomnik"
+msgstr "Seznam opomnikov"
 
-#: C/memos-usage-add-memo.page:26(key)
-#: C/mail-reading-keyboard-shortcuts.page:28(key)
-msgid "O"
-msgstr "O"
+#: C/memos-usage-add-memo.page:26(p)
+msgid "Click <guiseq><gui>File</gui><gui>New</gui><gui>Memo</gui></guiseq>, or press <keyseq><key>Shift</key><key>Ctrl</key><key>O</key></keyseq>."
+msgstr ""
 
 #: C/memos-usage-add-memo.page:27(p)
 #, fuzzy
-msgid "Select a memo list in the <placeholder-1/> dropdown list."
+msgid "Select a memo list in the <gui>List</gui> dropdown list."
 msgstr "Izberite možnost iskanja iz spustnega seznama."
 
 #: C/memos-usage-add-memo.page:28(p)
 #, fuzzy
 msgid "Enter the memo information."
-msgstr "Dopolnite naslednje podrobnosti."
+msgstr "Podrobnosti opomnika uspešno poslane"
 
 #: C/memos-usage-add-memo.page:32(p)
-msgid ""
-"If you just want to quickly add a memo by entering a summary you can "
-"directly enter it in the list of memos."
+msgid "If you just want to quickly add a memo by entering a summary you can directly enter it in the list of memos."
 msgstr ""
 
 #: C/memos-usage-add-memo.page:34(p)
-msgid ""
-"You can also define a <placeholder-1/>, or a <placeholder-2/> for the memo, "
-"or add an attachment."
+msgid "You can also define a <link xref=\"using-categories\">category</link>, or a <link xref=\"calendar-classifications\">classification</link> for the memo, or add an attachment."
 msgstr ""
 
 #: C/memos-usage-add-memo.page:37(title)
 #, fuzzy
 msgid "Shared Memos"
-msgstr "_Souporabljen opomnik"
+msgstr "Evolution opomniki"
 
 #: C/memos-usage-add-memo.page:39(p)
-msgid ""
-"Shared Memos are like mail messages except they are scheduled for a "
-"particular day and appear on the calendar for that date. You can use shared "
-"memos to show vacations, holidays, pay days, birthdays, and so on. Posted "
-"shared memos are placed in your Calendar on the date you specify. They are "
-"not placed in your Mailbox or in any other user's Mailbox."
+msgid "Shared Memos are like mail messages except they are scheduled for a particular day and appear on the calendar for that date. You can use shared memos to show vacations, holidays, pay days, birthdays, and so on. Posted shared memos are placed in your Calendar on the date you specify. They are not placed in your Mailbox or in any other user's Mailbox."
 msgstr ""
 
 #: C/memos-usage-add-memo.page:41(p)
 #, fuzzy
 msgid "To send a Shared Memo,"
-msgstr "_Povezava do novega sporočilca"
-
-#: C/memos-usage-add-memo.page:43(gui)
-#, fuzzy
-msgid "Shared Memo"
-msgstr "_Souporabljen opomnik"
+msgstr "Ustvari nov souporabljen opomnik"
 
-#: C/memos-usage-add-memo.page:43(key)
-msgid "H"
-msgstr "H"
+#: C/memos-usage-add-memo.page:43(p)
+msgid "Click <guiseq><gui>File</gui><gui>New</gui><gui>Shared Memo</gui></guiseq>, or press <keyseq><key>Shift</key><key>Ctrl</key><key>H</key></keyseq>."
+msgstr ""
 
 #: C/memos-usage-add-memo.page:44(p)
-msgid ""
-"Select the Organizer's account name from the drop-down list given next to "
-"the Organizer field."
+msgid "Select the Organizer's account name from the drop-down list given next to the Organizer field."
 msgstr ""
 
 #: C/memos-usage-add-memo.page:45(p)
-msgid ""
-"In the To field, type a username, then press Enter. Repeat this for "
-"additional users."
+msgid "In the To field, type a username, then press Enter. Repeat this for additional users."
 msgstr ""
 
 #: C/memos-usage-add-memo.page:46(p)
-msgid ""
-"Select the task list (under <placeholder-1/>) in which you would like to "
-"create the entry."
+msgid "Select the task list (under <gui>List</gui>) in which you would like to create the entry."
 msgstr ""
 
 #: C/memos-usage-add-memo.page:47(p)
@@ -2396,25 +1758,21 @@ msgid "Enter a brief summary in the Summary field."
 msgstr ""
 
 #: C/memos-usage-add-memo.page:48(p)
-msgid ""
-"In the Start Date field, type the date this shared memo should appear in the "
-"recipients' calendars."
+msgid "In the Start Date field, type the date this shared memo should appear in the recipients' calendars."
 msgstr ""
 
 #: C/memos-searching.page:5(desc)
 #, fuzzy
 msgid "Searching memos."
-msgstr "Iskanje"
+msgstr "Evolution opomniki"
 
 #: C/memos-searching.page:28(title)
 #, fuzzy
 msgid "Searching Memos"
-msgstr "Iskanje metapodatkov CD-ja ..."
+msgstr "Evolution opomniki"
 
 #: C/memos-searching.page:31(p)
-msgid ""
-"In the Memos view, you can quickly search for memos either by summary or by "
-"category."
+msgid "In the Memos view, you can quickly search for memos either by summary or by category."
 msgstr ""
 
 #: C/mail-wrong-fonts-in-3-0.page:5(desc)
@@ -2422,51 +1780,15 @@ msgid "A known problem that is fixed in newer versions."
 msgstr ""
 
 #: C/mail-wrong-fonts-in-3-0.page:21(title)
-#, fuzzy
 msgid "Message fonts are not the same fonts as in other applications"
-msgstr "_Uporabi enake pisave kot drugi programi"
-
-#: C/mail-wrong-fonts-in-3-0.page:23(gui) C/mail-spam-settings.page:46(gui)
-#: C/mail-labels.page:35(gui) C/mail-displaying-sender-photograph.page:29(gui)
-#: C/mail-displaying-images-in-html.page:38(gui)
-#: C/mail-displaying-images-in-html.page:44(gui)
-#: C/mail-displaying-character-encodings.page:25(gui)
-#: C/mail-change-time-format.page:20(gui)
-#: C/contacts-add-automatically.page:27(gui)
-#: C/calendar-meetings-replying-to-invitation.page:31(gui)
-#, fuzzy
-msgid "Mail Preferences"
-msgstr "Možnosti pošte"
-
-#: C/mail-wrong-fonts-in-3-0.page:23(gui)
-msgid "Message Fonts"
-msgstr "Pisave sporočila"
-
-#: C/mail-wrong-fonts-in-3-0.page:23(gui)
-#, fuzzy
-msgid "Use the same fonts as other applications"
-msgstr "_Uporabi enake pisave kot drugi programi"
+msgstr ""
 
 #: C/mail-wrong-fonts-in-3-0.page:23(p)
-msgid ""
-"It can happen that <guiseq><placeholder-1/><placeholder-2/><placeholder-3/"
-"><placeholder-4/><placeholder-5/></guiseq> is enabled but Evolution still "
-"uses different fonts than other parts of the system."
+msgid "It can happen that <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Mail Preferences</gui><gui>Message Fonts</gui><gui>Use the same fonts as other applications</gui></guiseq> is enabled but Evolution still uses different fonts than other parts of the system."
 msgstr ""
 
-#: C/mail-wrong-fonts-in-3-0.page:25(link)
-#: C/mail-error-folder-mismatch.page:48(link)
-#: C/mail-error-failed-to-append-to-sent-folder.page:27(link)
-#, fuzzy
-msgid "bug report"
-msgstr "Pošlji poročilo o hrošču"
-
 #: C/mail-wrong-fonts-in-3-0.page:25(p)
-#: C/mail-error-failed-to-append-to-sent-folder.page:27(p)
-msgid ""
-"This bug is fixed in Evolution versions higher than 3.0.2 (stable series) "
-"and 3.1.3 (unstable development series). If this is not the case, please add "
-"a comment to the corresponding <placeholder-1/>."
+msgid "This bug is fixed in Evolution versions higher than 3.0.2 (stable series) and 3.1.3 (unstable development series). If this is not the case, please add a comment to the corresponding <link href=\"https://bugzilla.gnome.org/show_bug.cgi?id=655002\">bug report</link>."
 msgstr ""
 
 #: C/mail-working-offline.page:5(desc)
@@ -2479,75 +1801,44 @@ msgid "Working Offline"
 msgstr "Delo brez povezave"
 
 #: C/mail-working-offline.page:25(p)
-msgid ""
-"Offline mode helps you communicate with remote mail storage systems like "
-"GroupWise, IMAP or Exchange, in situations where you are not connected to "
-"the network at all times. Evolution keeps a local copy of one or more "
-"folders to allow you to compose messages, storing them in your Outbox to be "
-"sent the next time you connect."
+msgid "Offline mode helps you communicate with remote mail storage systems like GroupWise, IMAP or Exchange, in situations where you are not connected to the network at all times. Evolution keeps a local copy of one or more folders to allow you to compose messages, storing them in your Outbox to be sent the next time you connect."
 msgstr ""
 
 #: C/mail-working-offline.page:27(p)
-msgid ""
-"POP mail downloads all messages to your local system, but other connections "
-"usually download just the headers, and get the rest only when you want to "
-"read the message. Before you go offline, Evolution downloads the unread "
-"messages from the folders you have chosen to store."
+msgid "POP mail downloads all messages to your local system, but other connections usually download just the headers, and get the rest only when you want to read the message. Before you go offline, Evolution downloads the unread messages from the folders you have chosen to store."
 msgstr ""
 
 #: C/mail-working-offline.page:30(title)
 #, fuzzy
 msgid "Marking folders for offline usage"
-msgstr "Mapo, za delo brez povezave, označimo z"
+msgstr "Ali naj se mape uskladijo za delo brez povezave?"
 
 #: C/mail-working-offline.page:31(p)
 #, fuzzy
 msgid "To mark a mail folder for offline use,"
 msgstr "Mapo, za delo brez povezave, označimo z"
 
-#: C/mail-working-offline.page:33(gui)
-#, fuzzy
-msgid "Properties"
-msgstr "Lastnosti:"
-
 #: C/mail-working-offline.page:33(p)
 #, fuzzy
-msgid "Right-click the folder, then click <placeholder-1/>."
-msgstr "desnim klikom na mapo in nato izberemo možnost lastnosti."
+msgid "Right-click the folder, then click <gui>Properties</gui>."
+msgstr "<guiseq><gui>Desno kliknite</gui><gui>Lastnosti</gui><gui>Odpri z</gui></guiseq>."
 
-#: C/mail-working-offline.page:34(gui)
+#: C/mail-working-offline.page:34(p)
 #, fuzzy
-msgid "Copy folder content locally for offline operation"
-msgstr "Vsebino _knjige kopiraj krajevno za delo brez povezave"
+msgid "Click <gui>Copy folder content locally for offline operation</gui>."
+msgstr "Kliknite možnost kopiranja vsebine mape v krajevno mapo za opravila brez povezave."
 
 #: C/mail-working-offline.page:39(title)
 #, fuzzy
 msgid "Syncing messages for offline usage"
 msgstr "_Prejmi sporočila za pregledovanje brez povezave"
 
-#: C/mail-working-offline.page:40(gui)
-msgid "Work Offline"
-msgstr "Delaj brez mreže"
-
 #: C/mail-working-offline.page:40(p)
-msgid ""
-"Your connection status is shown by the small icon in the lower left corner "
-"of the Evolution main window. When you are online, it displays two connected "
-"cables. When you go offline via clicking the icon or via "
-"<guiseq><placeholder-1/><placeholder-2/></guiseq>, the cables separate. You "
-"will be asked whether you want to go offline immediately or synchronize "
-"folders locally before you go offline."
+msgid "Your connection status is shown by the small icon in the lower left corner of the Evolution main window. When you are online, it displays two connected cables. When you go offline via clicking the icon or via <guiseq><gui>File</gui><gui>Work Offline</gui></guiseq>, the cables separate. You will be asked whether you want to go offline immediately or synchronize folders locally before you go offline."
 msgstr ""
 
-#: C/mail-working-offline.page:41(gui)
-#, fuzzy
-msgid "Download Messages for Offline Usage"
-msgstr "_Prejmi sporočila za pregledovanje brez povezave"
-
 #: C/mail-working-offline.page:41(p)
-msgid ""
-"To download Messages for Offline Operations without immediately going "
-"offline, select <guiseq><placeholder-1/><placeholder-2/></guiseq>."
+msgid "To download Messages for Offline Operations without immediately going offline, select <guiseq><gui>File</gui><gui>Download Messages for Offline Usage</gui></guiseq>."
 msgstr ""
 
 #: C/mail-working-offline.page:45(title)
@@ -2555,11 +1846,7 @@ msgid "Automatic Network State Handling"
 msgstr ""
 
 #: C/mail-working-offline.page:46(p)
-msgid ""
-"Evolution automatically understands the network state and acts accordingly. "
-"For instance, Evolution switches to offline mode when the network goes down "
-"and automatically switches on when the network is up again. Ensure that your "
-"system has Network Manager installed on to enable this feature."
+msgid "Evolution automatically understands the network state and acts accordingly. For instance, Evolution switches to offline mode when the network goes down and automatically switches on when the network is up again. Ensure that your system has Network Manager installed on to enable this feature."
 msgstr ""
 
 #: C/mail-word-wrap.page:5(desc)
@@ -2571,32 +1858,11 @@ msgid "Words are wrapped in outgoing mails at 72 characters"
 msgstr ""
 
 #: C/mail-word-wrap.page:22(p)
-msgid ""
-"For better readability lines are wrapped after 72 characters. This value is "
-"hardcoded and cannot be changed."
+msgid "For better readability lines are wrapped after 72 characters. This value is hardcoded and cannot be changed."
 msgstr ""
 
-#: C/mail-word-wrap.page:23(gui) C/mail-composer-html-text.page:25(gui)
-#: C/mail-composer-html.page:27(gui)
-#, fuzzy
-msgid "Format"
-msgstr "Oblika:"
-
-#: C/mail-word-wrap.page:23(gui)
-#, fuzzy
-msgid "Paragraph Style"
-msgstr "Paragvaj"
-
-#: C/mail-word-wrap.page:23(gui)
-#, fuzzy
-msgid "Preformatted"
-msgstr "Poglej _neoblikovano"
-
 #: C/mail-word-wrap.page:23(p)
-msgid ""
-"To avoid line breaks within a paragraph, mark the paragraph and choose "
-"<guiseq><placeholder-1/><placeholder-2/><placeholder-3/></guiseq> in the "
-"mail composer."
+msgid "To avoid line breaks within a paragraph, mark the paragraph and choose <guiseq><gui>Format</gui><gui>Paragraph Style</gui><gui>Preformatted</gui></guiseq> in the mail composer."
 msgstr ""
 
 #: C/mail-vertical-view.page:5(desc)
@@ -2609,48 +1875,19 @@ msgid "Vertical view"
 msgstr "_Navpični pogled"
 
 #: C/mail-vertical-view.page:24(p)
-msgid ""
-"Evolution provides a vertical view in addition to the classical view. In the "
-"vertical view, the message preview pane is located at the right side of the "
-"message list when compared to the classical view where the message preview "
-"pane is placed below the message list. Vertical view enables you to use the "
-"extra width of wide screen monitors."
+msgid "Evolution provides a vertical view in addition to the classical view. In the vertical view, the message preview pane is located at the right side of the message list when compared to the classical view where the message preview pane is placed below the message list. Vertical view enables you to use the extra width of wide screen monitors."
 msgstr ""
 
-#: C/mail-vertical-view.page:26(gui) C/mail-vertical-view.page:30(gui)
-#: C/mail-cannot-see.page:30(gui) C/intro-main-window.page:80(gui)
-#: C/intro-main-window.page:156(gui)
-msgid "Preview"
-msgstr "Predogled"
-
-#: C/mail-vertical-view.page:26(gui)
-#, fuzzy
-msgid "Vertical View"
-msgstr "_Navpični pogled"
-
 #: C/mail-vertical-view.page:26(p)
-msgid ""
-"To switch to vertical view, click <guiseq><placeholder-1/><placeholder-2/"
-"><placeholder-3/></guiseq>."
+msgid "To switch to vertical view, click <guiseq><gui>View</gui><gui>Preview</gui><gui>Vertical View</gui></guiseq>."
 msgstr ""
 
 #: C/mail-vertical-view.page:28(p)
-msgid ""
-"In vertical view, the message list contains double lines of compressed "
-"headers, which enables you to consume the extra width in the preview column. "
-"The compressed columns have Sender Name and Email, Attachment Icon, Date and "
-"Subject in the second line."
+msgid "In vertical view, the message list contains double lines of compressed headers, which enables you to consume the extra width in the preview column. The compressed columns have Sender Name and Email, Attachment Icon, Date and Subject in the second line."
 msgstr ""
 
-#: C/mail-vertical-view.page:30(gui)
-#, fuzzy
-msgid "Classical View"
-msgstr "Brez pogleda"
-
 #: C/mail-vertical-view.page:30(p)
-msgid ""
-"To switch back to classical view, click <guiseq><placeholder-1/"
-"><placeholder-2/><placeholder-3/></guiseq>."
+msgid "To switch back to classical view, click <guiseq><gui>View</gui><gui>Preview</gui><gui>Classical View</gui></guiseq>."
 msgstr ""
 
 #: C/mail-usenet-subscriptions.page:5(desc)
@@ -2663,39 +1900,17 @@ msgid "Newsgroups Subscriptions"
 msgstr "Naročnine na mape"
 
 #: C/mail-usenet-subscriptions.page:27(p)
-msgid ""
-"When you create a newsgroup account, you are not subscribed to any groups. "
-"To subscribe to a newsgroup:"
+msgid "When you create a newsgroup account, you are not subscribed to any groups. To subscribe to a newsgroup:"
 msgstr ""
 
-#: C/mail-usenet-subscriptions.page:29(gui)
-#: C/mail-refresh-folders.page:22(gui) C/mail-imap-subscriptions.page:30(gui)
-#: C/mail-folders.page:36(gui) C/mail-delete-and-undelete.page:34(gui)
-#: C/deleting-emails.page:31(gui)
-msgid "Folder"
-msgstr "Mapa"
-
-#: C/mail-usenet-subscriptions.page:29(gui)
-#: C/mail-imap-subscriptions.page:30(gui)
+#: C/mail-usenet-subscriptions.page:29(p)
 #, fuzzy
-msgid "Subscriptions"
-msgstr "_Naročnine ..."
+msgid "Select <guiseq><gui>Folder</gui><gui>Subscriptions</gui></guiseq>."
+msgstr "Izberite <guiseq><gui>Fotografija</gui><gui>Izvozi v</gui><gui>Mapa ...</gui></guiseq>."
 
-#: C/mail-usenet-subscriptions.page:29(p) C/mail-imap-subscriptions.page:30(p)
-#: C/mail-composer-message-templates.page:41(p)
-#: C/mail-composer-message-templates.page:52(p)
-#: C/mail-composer-message-templates.page:77(p)
-#: C/mail-composer-custom-header-lines.page:31(p)
-#: C/mail-composer-custom-header-lines.page:42(p)
-#: C/mail-attachments-sending.page:46(p) C/backup-restore.page:28(p)
-#: C/backup-restore.page:37(p)
-msgid "Select <guiseq><placeholder-1/><placeholder-2/></guiseq>."
-msgstr ""
-
-#: C/mail-usenet-subscriptions.page:30(p) C/mail-imap-subscriptions.page:31(p)
-msgid ""
-"If you have accounts on multiple servers, select the server where you want "
-"to manage your subscriptions."
+#: C/mail-usenet-subscriptions.page:30(p)
+#: C/mail-imap-subscriptions.page:31(p)
+msgid "If you have accounts on multiple servers, select the server where you want to manage your subscriptions."
 msgstr ""
 
 #: C/mail-usenet-subscriptions.page:31(p)
@@ -2703,9 +1918,7 @@ msgid "Click a group's checkbox to add a folder to your subscriptions."
 msgstr ""
 
 #: C/mail-two-trash-folders.page:5(desc)
-msgid ""
-"An explanation for the problem that two trash folders are present in "
-"Evolution."
+msgid "An explanation for the problem that two trash folders are present in Evolution."
 msgstr ""
 
 #: C/mail-two-trash-folders.page:20(title)
@@ -2713,45 +1926,19 @@ msgid "Two Trash folders shown for the same account"
 msgstr ""
 
 #: C/mail-two-trash-folders.page:22(p)
-msgid ""
-"You may have created another Trash folder to hold all your deleted email "
-"messages. This can happen when you use another email client together with "
-"Evolution."
+msgid "You may have created another Trash folder to hold all your deleted email messages. This can happen when you use another email client together with Evolution."
 msgstr ""
 
-#: C/mail-two-trash-folders.page:24(gui) C/mail-two-trash-folders.page:26(gui)
-msgid "Trash"
-msgstr "Smeti"
-
-#: C/mail-two-trash-folders.page:24(link)
-#, fuzzy
-msgid "Search folder"
-msgstr "Iskanje v mapi"
-
 #: C/mail-two-trash-folders.page:24(p)
-msgid ""
-"Evolution's <placeholder-1/> folder is a <placeholder-2/>. It does not "
-"really exist but simply displays all the messages that are marked for "
-"deletion in any folders of that account."
+msgid "Evolution's <gui>Trash</gui> folder is a <link xref=\"mail-search-folders\">Search folder</link>. It does not really exist but simply displays all the messages that are marked for deletion in any folders of that account."
 msgstr ""
 
 #: C/mail-two-trash-folders.page:26(p)
-msgid ""
-"You can easily tell the two Trash folders apart by looking at their icons. "
-"The Evolution <placeholder-1/> folder has a special icon whereas the other "
-"physical Trash folder looks like any other folder."
+msgid "You can easily tell the two Trash folders apart by looking at their icons. The Evolution <gui>Trash</gui> folder has a special icon whereas the other physical Trash folder looks like any other folder."
 msgstr ""
 
-#: C/mail-two-trash-folders.page:29(gui) C/mail-spam-settings.page:47(gui)
-#: C/mail-spam-groupwise-mark-message.page:25(gui)
-#: C/mail-cannot-see.page:33(gui)
-msgid "Junk"
-msgstr "Neželena pošta"
-
 #: C/mail-two-trash-folders.page:29(p)
-msgid ""
-"Note that the <placeholder-1/> folder is also a search folder and may also "
-"appear twice."
+msgid "Note that the <gui>Junk</gui> folder is also a search folder and may also appear twice."
 msgstr ""
 
 #: C/mail-spam-settings.page:5(desc)
@@ -2759,106 +1946,72 @@ msgid "How to set up handling unwanted junk and spam mail."
 msgstr ""
 
 #: C/mail-spam-settings.page:28(title)
-#: C/mail-spam-groupwise-remove-from-list.page:26(gui)
-#: C/mail-spam-groupwise-manage-list.page:29(gui)
-#: C/mail-spam-groupwise-add-to-list.page:29(gui)
+#, fuzzy
 msgid "Junk Mail Settings"
 msgstr "Nastavitve neželene pošte"
 
 #: C/mail-spam-settings.page:30(p)
-msgid ""
-"Evolution lets you check for unwanted junk or spam emails by using the "
-"Bogofilter or SpamAssassin tools. To use these tools, you need to make sure "
-"that they are installed via the software management tool of your "
-"distribution and you need enable their respective plugins."
+msgid "Evolution lets you check for unwanted junk or spam emails by using the Bogofilter or SpamAssassin tools. To use these tools, you need to make sure that they are installed via the software management tool of your distribution and you need enable their respective plugins."
 msgstr ""
 
 #: C/mail-spam-settings.page:31(link)
 msgid "Install bogofilter now."
-msgstr ""
+msgstr "Namesti bogofilter zdaj."
 
 #: C/mail-spam-settings.page:32(link)
+#, fuzzy
 msgid "Install spamassassin now."
-msgstr ""
+msgstr "_Namesti zdaj"
 
 #: C/mail-spam-settings.page:34(p)
-#, fuzzy
 msgid "To enable the plugins:"
-msgstr "Omogoči ali onemogoči vstavke"
+msgstr "Za omogočitev vstavkov:"
 
-#: C/mail-spam-settings.page:36(gui) C/mail-received-notification.page:27(gui)
-#: C/mail-imap-headers.page:27(gui)
-#: C/mail-composer-message-templates.page:25(gui)
-#: C/mail-composer-message-templates.page:77(gui)
-#: C/mail-composer-custom-header-lines.page:31(gui)
-#: C/mail-attachments-sending.page:46(gui)
-#: C/contacts-add-automatically.page:27(gui)
+#: C/mail-spam-settings.page:36(p)
 #, fuzzy
-msgid "Plugins"
-msgstr "_Vstavki"
-
-#: C/mail-spam-settings.page:36(p) C/mail-filters.page:51(p)
-#: C/mail-filters.page:61(p) C/import-single-files.page:24(p)
-#: C/import-apps-outlook.page:59(p) C/import-apps-mozilla.page:24(p)
-msgid "Click <guiseq><placeholder-1/><placeholder-2/></guiseq>."
-msgstr ""
+msgid "Click <guiseq><gui>Edit</gui><gui>Plugins</gui></guiseq>."
+msgstr "Kliknite na zavihek <guiseq><gui>Uredi</gui><gui>Možnosti</gui><gui>Vstavki</gui></guiseq>."
 
 #: C/mail-spam-settings.page:37(p)
-msgid ""
-"Select the plugins you wish to enable. You can select either Bogofilter or "
-"SpamAssassin, or both."
+msgid "Select the plugins you wish to enable. You can select either Bogofilter or SpamAssassin, or both."
 msgstr ""
 
-#: C/mail-spam-settings.page:38(gui)
-#: C/mail-encryption-gpg-signing-encrypting.page:36(gui)
-#: C/mail-encryption-gpg-set-up.page:35(gui)
-#: C/mail-composer-html-table.page:29(gui)
-#: C/mail-composer-html-rule.page:28(gui)
-#: C/mail-composer-html-link.page:29(gui) C/calendar-free-busy.page:36(gui)
+#: C/mail-spam-settings.page:38(p)
+#: C/mail-composer-html-table.page:29(p)
+#: C/mail-composer-html-rule.page:28(p)
+#: C/mail-composer-html-link.page:29(p)
 #, fuzzy
-msgid "Close"
-msgstr "_Zapri"
+msgid "Click <gui>Close</gui>."
+msgstr "Ko ste končali, kliknite <gui>Zapri</gui>."
 
 #: C/mail-spam-settings.page:42(title)
 msgid "Junk Mail Preferences"
 msgstr "Nastavitve neželene pošte"
 
 #: C/mail-spam-settings.page:43(p)
-msgid ""
-"You can modify how Evolution handles junk mail by changing the Junk Mail "
-"Preferences:"
+msgid "You can modify how Evolution handles junk mail by changing the Junk Mail Preferences:"
 msgstr ""
 
-#: C/mail-spam-settings.page:45(key)
-msgid "S"
-msgstr "S"
-
 #: C/mail-spam-settings.page:45(p)
-msgid ""
-"Click <guiseq><placeholder-1/><placeholder-2/></guiseq> or press "
-"<keyseq><placeholder-3/><placeholder-4/><placeholder-5/></keyseq>."
+msgid "Click <guiseq><gui>Edit</gui><gui>Preferences</gui></guiseq> or press <keyseq><key>Shift</key><key>Ctrl</key><key>S</key></keyseq>."
 msgstr ""
 
 #: C/mail-spam-settings.page:46(p)
-#: C/mail-encryption-gpg-signing-encrypting.page:34(p)
-#: C/contacts-usage-add-contact.page:36(p)
 #, fuzzy
-msgid "Select <placeholder-1/>."
-msgstr "gpg <placeholder-1/>"
+msgid "Select <gui>Mail Preferences</gui>."
+msgstr "Izberite zavihek <gui>Iskanje</gui>."
 
 #: C/mail-spam-settings.page:47(p)
-msgid "Click on the <placeholder-1/> tab. Here, you can specify the following:"
+msgid "Click on the <gui>Junk</gui> tab. Here, you can specify the following:"
 msgstr ""
 
 #: C/mail-spam-settings.page:49(p)
 #, fuzzy
 msgid "Checking incoming mail for junk messages."
-msgstr "Preveri _dohodno pošto za neželena sporočila"
+msgstr "Preverja, ali je dohodna pošta neželena"
 
 #: C/mail-spam-settings.page:50(p)
-msgid ""
-"Deleting junk messages upon exit, and how often junk messages are to be "
-"deleted."
+msgid "Deleting junk messages upon exit, and how often junk messages are to be deleted."
 msgstr ""
 
 #: C/mail-spam-settings.page:51(p)
@@ -2867,107 +2020,19 @@ msgid "Checking custom headers for junk."
 msgstr "Preveri glave _po meri za neželeno pošto"
 
 #: C/mail-spam-settings.page:52(p)
-#, fuzzy
 msgid "Marking messages as junk if the sender is in the address book."
-msgstr "_Ne označi sporočila kot neželenega, če je pošiljatelj v mojem imeniku"
+msgstr ""
 
 #: C/mail-spam-settings.page:53(p)
-#, fuzzy
 msgid "The default junk filter."
-msgstr "Privzeti vstavek za neželeno pošto"
+msgstr "Privzeti filter neželene pošte."
 
 #: C/mail-spam-settings.page:54(p)
-msgid ""
-"Bogofilter and SpamAssassin options. These options are available only if the "
-"plugins are enabled."
-msgstr ""
-
-#: C/mail-spam-settings.page:60(gui)
-#: C/mail-send-and-receive-automatically.page:21(gui)
-#: C/mail-receiving-options-usenet-news.page:25(gui)
-#: C/mail-receiving-options-usenet-news.page:34(gui)
-#: C/mail-receiving-options-unix-mbox-spool-file.page:22(gui)
-#: C/mail-receiving-options-unix-mbox-spool-file.page:27(gui)
-#: C/mail-receiving-options-unix-mbox-spool-directory.page:22(gui)
-#: C/mail-receiving-options-unix-mbox-spool-directory.page:26(gui)
-#: C/mail-receiving-options-pop.page:29(gui)
-#: C/mail-receiving-options-pop.page:39(gui)
-#: C/mail-receiving-options-novell-groupwise.page:26(gui)
-#: C/mail-receiving-options-novell-groupwise.page:35(gui)
-#: C/mail-receiving-options-mh-format-directories.page:22(gui)
-#: C/mail-receiving-options-mh-format-directories.page:26(gui)
-#: C/mail-receiving-options-maildir-format-directories.page:22(gui)
-#: C/mail-receiving-options-maildir-format-directories.page:26(gui)
-#: C/mail-receiving-options-local-delivery.page:22(gui)
-#: C/mail-receiving-options-local-delivery.page:27(gui)
-#: C/mail-receiving-options-imap-plus.page:25(gui)
-#: C/mail-receiving-options-imap-plus.page:34(gui)
-#: C/mail-receiving-options-imap.page:25(gui)
-#: C/mail-receiving-options-imap.page:34(gui)
-#: C/mail-receiving-options-exchange-mapi.page:22(gui)
-#: C/mail-receiving-options-exchange-mapi.page:33(gui)
-#: C/mail-receiving-options-evolution-exchange.page:25(gui)
-#: C/mail-receiving-options-evolution-exchange.page:36(gui)
-#: C/mail-read-receipts.page:39(gui) C/mail-imap-headers.page:38(gui)
-#: C/mail-filters.page:27(gui)
-#: C/mail-error-failed-to-append-to-sent-folder.page:26(gui)
-#: C/mail-encryption-s-mime-signing-encrypting.page:28(gui)
-#: C/mail-encryption-gpg-signing-encrypting.page:30(gui)
-#: C/mail-encryption-gpg-set-up.page:29(gui)
-#: C/mail-default-folder-locations.page:33(gui)
-#: C/mail-default-CC-and-BCC.page:29(gui)
-#: C/mail-composer-mail-signatures-per-account.page:34(gui)
-#: C/mail-account-manage-usenet-news.page:24(gui)
-#: C/mail-account-manage-usenet-news.page:25(gui)
-#: C/mail-account-manage-unix-mbox-spool-file.page:24(gui)
-#: C/mail-account-manage-unix-mbox-spool-file.page:25(gui)
-#: C/mail-account-manage-unix-mbox-spool-directory.page:24(gui)
-#: C/mail-account-manage-unix-mbox-spool-directory.page:25(gui)
-#: C/mail-account-manage-pop.page:24(gui)
-#: C/mail-account-manage-pop.page:25(gui)
-#: C/mail-account-manage-novell-groupwise.page:25(gui)
-#: C/mail-account-manage-novell-groupwise.page:26(gui)
-#: C/mail-account-manage-microsoft-exchange-evo-mapi.page:25(gui)
-#: C/mail-account-manage-microsoft-exchange-evo-mapi.page:26(gui)
-#: C/mail-account-manage-microsoft-exchange-evo-exchange.page:25(gui)
-#: C/mail-account-manage-microsoft-exchange-evo-exchange.page:26(gui)
-#: C/mail-account-manage-mh-format-directories.page:24(gui)
-#: C/mail-account-manage-mh-format-directories.page:25(gui)
-#: C/mail-account-manage-maildir-format-directories.page:24(gui)
-#: C/mail-account-manage-maildir-format-directories.page:25(gui)
-#: C/mail-account-manage-local-delivery.page:24(gui)
-#: C/mail-account-manage-local-delivery.page:25(gui)
-#: C/mail-account-manage-imap-plus.page:24(gui)
-#: C/mail-account-manage-imap-plus.page:25(gui)
-#: C/mail-account-manage-imap.page:24(gui)
-#: C/mail-account-manage-imap.page:25(gui)
-#: C/mail-access-gmail-pop-account.page:39(gui) C/intro-first-run.page:84(gui)
-msgid "Mail Accounts"
-msgstr "Poštni računi"
-
-#: C/mail-spam-settings.page:60(gui)
-#: C/mail-receiving-options-usenet-news.page:34(gui)
-#: C/mail-receiving-options-unix-mbox-spool-file.page:27(gui)
-#: C/mail-receiving-options-unix-mbox-spool-directory.page:26(gui)
-#: C/mail-receiving-options-pop.page:39(gui)
-#: C/mail-receiving-options-novell-groupwise.page:35(gui)
-#: C/mail-receiving-options-mh-format-directories.page:26(gui)
-#: C/mail-receiving-options-maildir-format-directories.page:26(gui)
-#: C/mail-receiving-options-local-delivery.page:27(gui)
-#: C/mail-receiving-options-imap-plus.page:34(gui)
-#: C/mail-receiving-options-imap.page:34(gui)
-#: C/mail-receiving-options-exchange-mapi.page:33(gui)
-#: C/mail-receiving-options-evolution-exchange.page:36(gui)
-#: C/mail-filters.page:27(gui)
-msgid "Receiving Options"
-msgstr "Možnosti prejemanja"
+msgid "Bogofilter and SpamAssassin options. These options are available only if the plugins are enabled."
+msgstr ""
 
 #: C/mail-spam-settings.page:60(p)
-msgid ""
-"The junk mail options discussed in this page refer only to POP and Local "
-"Delivery. For handling junk mails on IMAP, see the Evolution settings under "
-"<guiseq><placeholder-1/><placeholder-2/><placeholder-3/><placeholder-4/"
-"><placeholder-5/></guiseq>."
+msgid "The junk mail options discussed in this page refer only to POP and Local Delivery. For handling junk mails on IMAP, see the Evolution settings under <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Mail Accounts</gui><gui style=\"button\">Edit</gui><gui>Receiving Options</gui></guiseq>."
 msgstr ""
 
 #: C/mail-spam.page:5(desc)
@@ -2975,9 +2040,8 @@ msgid "How to automatically handle unwanted mail."
 msgstr ""
 
 #: C/mail-spam.page:20(title)
-#, fuzzy
 msgid "Junk and Spam Mail Handling"
-msgstr "Nastavitve neželene pošte ..."
+msgstr "Upravljanje neželene pošte"
 
 #: C/mail-spam.page:23(title)
 #, fuzzy
@@ -2991,79 +2055,41 @@ msgstr ""
 #: C/mail-spam-marking.page:15(name)
 #: C/mail-receiving-options-pop.page:15(name)
 #: C/contacts-add-automatically.page:15(name)
+#, fuzzy
 msgid "Barbara Tobias"
-msgstr "Barbara Tobias"
+msgstr "Santa Barbara"
 
 #: C/mail-spam-marking.page:16(email)
 #: C/mail-receiving-options-pop.page:16(email)
 #: C/intro-main-window.page:18(email)
 #: C/contacts-add-automatically.page:16(email)
+#, fuzzy
 msgid "barbtobias09@gmail.com"
-msgstr "barbtobias09@gmail.com"
+msgstr "stabeno@gmail.com"
 
 #: C/mail-spam-marking.page:27(title)
 #, fuzzy
 msgid "Marking Junk Mail"
-msgstr "Zakasnitev, po kateri se sporočilo označi kot pregledano"
+msgstr "Nastavitve neželene pošte ..."
 
 #: C/mail-spam-marking.page:28(p)
-msgid ""
-"Evolution can check for junk mail for you. Evolution uses SpamAssassin and/"
-"or Bogofilter with trainable Bayesian filters to perform the spam check. "
-"When the software detects mail that appears to be junk mail, it will flag it "
-"and hide it from your view. Messages that are flagged as junk mail are "
-"displayed only in the Junk folder."
+msgid "Evolution can check for junk mail for you. Evolution uses SpamAssassin and/or Bogofilter with trainable Bayesian filters to perform the spam check. When the software detects mail that appears to be junk mail, it will flag it and hide it from your view. Messages that are flagged as junk mail are displayed only in the Junk folder."
 msgstr ""
 
 #: C/mail-spam-marking.page:29(p)
-msgid ""
-"The junk mail filter can learn which kinds of mail are legitimate and which "
-"are not if you train it by marking as junk incoming mail that you determine "
-"is spam. When you first start using junk mail blocking, check the Junk "
-"folder frequently to be sure that legitimate mail doesn't get flagged as "
-"junk mail."
+msgid "The junk mail filter can learn which kinds of mail are legitimate and which are not if you train it by marking as junk incoming mail that you determine is spam. When you first start using junk mail blocking, check the Junk folder frequently to be sure that legitimate mail doesn't get flagged as junk mail."
 msgstr ""
 
-#: C/mail-spam-marking.page:30(gui)
-#: C/mail-spam-groupwise-unmark-message.page:27(gui)
-#, fuzzy
-msgid "Mark as Not Junk"
-msgstr "Označi kot _zaželeno"
-
-#: C/mail-spam-marking.page:30(key)
-#: C/mail-spam-groupwise-unmark-message.page:27(key)
-#: C/mail-spam-groupwise-mark-message.page:25(key)
-#: C/calendar-layout-views.page:28(key)
-msgid "J"
-msgstr "J"
-
 #: C/mail-spam-marking.page:30(p)
-msgid ""
-"If legitimate mail is incorrectly flagged, remove it from the Junk folder by "
-"right-clicking it and selecting <placeholder-1/> or pressing "
-"<keyseq><placeholder-2/><placeholder-3/><placeholder-4/></keyseq>. If "
-"Evolution misses junk mail, right-click the message, then click Mark as Junk "
-"or press <keyseq><placeholder-5/><placeholder-6/></keyseq>. When you correct "
-"it, the filter can recognize similar messages in the future, and becomes "
-"more accurate as time goes on."
+msgid "If legitimate mail is incorrectly flagged, remove it from the Junk folder by right-clicking it and selecting <gui>Mark as Not Junk</gui> or pressing <keyseq><key>Shift</key><key>Ctrl</key><key>J</key></keyseq>. If Evolution misses junk mail, right-click the message, then click Mark as Junk or press <keyseq><key>Ctrl</key><key>J</key></keyseq>. When you correct it, the filter can recognize similar messages in the future, and becomes more accurate as time goes on."
 msgstr ""
 
-#: C/mail-spam-marking.page:31(gui)
-msgid "Not Junk"
-msgstr "Ni neželeno"
-
 #: C/mail-spam-marking.page:31(p)
-msgid ""
-"You can also flag mail as junk by selecting it and clicking the Junk icon in "
-"the menu bar; you can flag mail in the junk folder as \"Not Junk\" by "
-"selecting it and clicking the <placeholder-1/> icon."
+msgid "You can also flag mail as junk by selecting it and clicking the Junk icon in the menu bar; you can flag mail in the junk folder as \"Not Junk\" by selecting it and clicking the <gui>Not Junk</gui> icon."
 msgstr ""
 
 #: C/mail-spam-marking.page:32(p)
-msgid ""
-"Each time you flag a message as Junk, the sender is added to your Spam List; "
-"each time you flag a message as Not Junk, the sender is removed from your "
-"Spam List."
+msgid "Each time you flag a message as Junk, the sender is added to your Spam List; each time you flag a message as Not Junk, the sender is removed from your Spam List."
 msgstr ""
 
 #: C/mail-spam-groupwise-unmark-message.page:5(desc)
@@ -3079,20 +2105,15 @@ msgid "Select the message to mark as not junk in your Junk Mail folder."
 msgstr ""
 
 #: C/mail-spam-groupwise-unmark-message.page:27(p)
-msgid ""
-"Right-click the message, then click <placeholder-1/>, or select the message "
-"and press <keyseq><placeholder-2/><placeholder-3/><placeholder-4/></keyseq>."
+msgid "Right-click the message, then click <gui>Mark as Not Junk</gui>, or select the message and press <keyseq><key>Shift</key><key>Ctrl</key><key>J</key></keyseq>."
 msgstr ""
 
 #: C/mail-spam-groupwise-unmark-message.page:30(p)
-msgid ""
-"The message is moved to your Mailbox folder and the name is removed from "
-"your junk list."
+msgid "The message is moved to your Mailbox folder and the name is removed from your junk list."
 msgstr ""
 
 #: C/mail-spam-groupwise-remove-from-list.page:5(desc)
-msgid ""
-"How to remove an email address from your junk mail list in Novell Groupwise."
+msgid "How to remove an email address from your junk mail list in Novell Groupwise."
 msgstr ""
 
 #: C/mail-spam-groupwise-remove-from-list.page:23(title)
@@ -3100,20 +2121,12 @@ msgid "Removing an Email Address from Your Junk List"
 msgstr ""
 
 #: C/mail-spam-groupwise-remove-from-list.page:26(p)
-#, fuzzy
-msgid "Right-click a message, then click <placeholder-1/>."
-msgstr "Dejanje ob desnem kliku na nazivno vrstico okna"
-
-#: C/mail-spam-groupwise-remove-from-list.page:27(gui)
-#: C/mail-filters.page:63(gui)
-#, fuzzy
-msgid "Remove"
-msgstr "_Odstrani"
+msgid "Right-click a message, then click <gui>Junk Mail Settings</gui>."
+msgstr ""
 
 #: C/mail-spam-groupwise-remove-from-list.page:27(p)
-#, fuzzy
-msgid "Select the email address to remove, then click <placeholder-1/>."
-msgstr "Kopira elektronski naslov v odložišče"
+msgid "Select the email address to remove, then click <gui>Remove</gui>."
+msgstr ""
 
 #: C/mail-spam-groupwise-mark-message.page:5(desc)
 msgid "How to mark a message in Novell Groupwise as junk."
@@ -3125,15 +2138,11 @@ msgid "Marking a Message As Junk Mail"
 msgstr "Zakasnitev, po kateri se sporočilo označi kot pregledano"
 
 #: C/mail-spam-groupwise-mark-message.page:25(p)
-msgid ""
-"Select the message to mark as junk, then click the <placeholder-1/> button "
-"or press <keyseq><placeholder-2/><placeholder-3/></keyseq>."
+msgid "Select the message to mark as junk, then click the <gui>Junk</gui> button or press <keyseq><key>Ctrl</key><key>J</key></keyseq>."
 msgstr ""
 
 #: C/mail-spam-groupwise-mark-message.page:26(p)
-msgid ""
-"The message is moved to your Junk Mail folder and the user is added to your "
-"junk list."
+msgid "The message is moved to your Junk Mail folder and the user is added to your junk list."
 msgstr ""
 
 #: C/mail-spam-groupwise-manage-list.page:5(desc)
@@ -3146,16 +2155,17 @@ msgstr ""
 
 #: C/mail-spam-groupwise-manage-list.page:29(p)
 #: C/mail-spam-groupwise-add-to-list.page:29(p)
-msgid "Right-click on a message and select the <placeholder-1/> option."
+msgid "Right-click on a message and select the <gui>Junk Mail Settings</gui> option."
 msgstr ""
 
 #: C/mail-spam-groupwise-manage-list.page:30(p)
 msgid "Specify whether you wish to Enable or Disable junk mail handling."
 msgstr ""
 
-#: C/mail-spam-groupwise-manage-list.page:31(p) C/mail-folders.page:38(p)
-msgid "Click on the <placeholder-1/> button."
-msgstr ""
+#: C/mail-spam-groupwise-manage-list.page:31(p)
+#, fuzzy
+msgid "Click on the <gui style=\"button\">OK</gui> button."
+msgstr "Kliknite <gui style=\"button\">Odstrani</gui>."
 
 #: C/mail-spam-groupwise-add-to-list.page:5(desc)
 msgid "How to add an email address to your junk mail list in Novell Groupwise."
@@ -3165,56 +2175,23 @@ msgstr ""
 msgid "Adding an Email Address to Your Junk List"
 msgstr ""
 
-#: C/mail-spam-groupwise-add-to-list.page:30(gui)
-msgid "Email"
-msgstr "Elektronska pošta"
-
 #: C/mail-spam-groupwise-add-to-list.page:30(p)
 #, fuzzy
-msgid ""
-"Type in the email address you wish to block in the <placeholder-1/> field."
+msgid "Type in the email address you wish to block in the <gui>Email</gui> field."
 msgstr "Vnesite vaše geslo v polje <b>Novo geslo</b>."
 
-#: C/mail-spam-groupwise-add-to-list.page:31(gui)
-#: C/mail-several-pop-accounts.page:25(gui)
-#: C/mail-search-folders-add.page:27(gui)
-#: C/mail-search-folders-add.page:43(gui) C/mail-filters.page:37(gui)
-#: C/mail-attachments-sending.page:49(gui)
-#: C/mail-account-manage-usenet-news.page:24(gui)
-#: C/mail-account-manage-unix-mbox-spool-file.page:24(gui)
-#: C/mail-account-manage-unix-mbox-spool-directory.page:24(gui)
-#: C/mail-account-manage-pop.page:24(gui)
-#: C/mail-account-manage-novell-groupwise.page:25(gui)
-#: C/mail-account-manage-microsoft-exchange-evo-mapi.page:25(gui)
-#: C/mail-account-manage-microsoft-exchange-evo-exchange.page:25(gui)
-#: C/mail-account-manage-mh-format-directories.page:24(gui)
-#: C/mail-account-manage-maildir-format-directories.page:24(gui)
-#: C/mail-account-manage-local-delivery.page:24(gui)
-#: C/mail-account-manage-imap-plus.page:24(gui)
-#: C/mail-account-manage-imap.page:24(gui)
-#: C/mail-access-gmail-pop-account.page:39(gui) C/intro-first-run.page:84(gui)
-#: C/calendar-publishing.page:24(gui)
-#: C/calendar-meetings-sending-invitation.page:34(gui)
-#: C/calendar-free-busy.page:34(gui)
-#, fuzzy
-msgid "Add"
-msgstr "_Dodaj"
-
 #: C/mail-spam-groupwise-add-to-list.page:31(p)
-msgid "Click <placeholder-1/> and then click on the <placeholder-2/> button."
+msgid "Click <gui style=\"button\">Add</gui> and then click on the <gui style=\"button\">OK</gui> button."
 msgstr ""
 
 #: C/mail-spam-groupwise-add-to-list.page:34(p)
-msgid ""
-"Remember, when you mark an item as junk in GroupWise, that item is added to "
-"your junk list in the GroupWise system. The settings in the GroupWise system "
-"are applied from computer to computer."
+msgid "Remember, when you mark an item as junk in GroupWise, that item is added to your junk list in the GroupWise system. The settings in the GroupWise system are applied from computer to computer."
 msgstr ""
 
 #: C/mail-sorting-message-list.page:5(desc)
 #, fuzzy
 msgid "Sorting the message list of a mail folder."
-msgstr "Ustvarjam seznam sporočil"
+msgstr "Pošljem e-poštno sporočilo na dopisni seznam?"
 
 #: C/mail-sorting-message-list.page:28(title)
 #, fuzzy
@@ -3225,70 +2202,32 @@ msgstr "Ustvarjam seznam sporočil"
 msgid "Evolution lets you organize your emails by letting you sort messages."
 msgstr ""
 
-#: C/mail-sorting-message-list.page:31(gui)
-#, fuzzy
-msgid "All Message Headers"
-msgstr "Vse _glave sporočil"
-
 #: C/mail-sorting-message-list.page:31(p)
-msgid ""
-"To view the complete headers for a message, click <guiseq><placeholder-1/"
-"><placeholder-2/></guiseq>. This will display the complete header data on "
-"the viewing pane."
+msgid "To view the complete headers for a message, click <guiseq><gui>View</gui><gui>All Message Headers</gui></guiseq>. This will display the complete header data on the viewing pane."
 msgstr ""
 
-#: C/mail-sorting-message-list.page:32(gui)
-#, fuzzy
-msgid "Message Source"
-msgstr "_Vir sporočil"
-
-#: C/mail-sorting-message-list.page:32(key)
-msgid "U"
-msgstr "U"
-
 #: C/mail-sorting-message-list.page:32(p)
-msgid ""
-"To view the message data, click on <guiseq><placeholder-1/><placeholder-2/></"
-"guiseq> or press <keyseq><placeholder-3/><placeholder-4/></keyseq>. This "
-"will display the message data in a pop-up window."
+msgid "To view the message data, click on <guiseq><gui>View</gui><gui>Message Source</gui></guiseq> or press <keyseq><key>Ctrl</key><key>U</key></keyseq>. This will display the message data in a pop-up window."
 msgstr ""
 
 #: C/mail-sorting-message-list.page:35(title)
 msgid "Sorting Mail in Email Threads"
 msgstr ""
 
-#: C/mail-sorting-message-list.page:36(gui)
-#, fuzzy
-msgid "Group By Threads"
-msgstr "_Združi po nitih"
-
 #: C/mail-sorting-message-list.page:36(p)
-msgid ""
-"You can use a threaded message view to sort emails. To enable this feature, "
-"click on <guiseq><placeholder-1/><placeholder-2/></guiseq> or press "
-"<keyseq><placeholder-3/><placeholder-4/></keyseq>."
+msgid "You can use a threaded message view to sort emails. To enable this feature, click on <guiseq><gui>View</gui><gui>Group By Threads</gui></guiseq> or press <keyseq><key>Ctrl</key><key>T</key></keyseq>."
 msgstr ""
 
 #: C/mail-sorting-message-list.page:37(p)
-msgid ""
-"This feature, when enabled, groups replies with the original email and "
-"allows you to follow the flow of the conversation from one message to the "
-"next."
+msgid "This feature, when enabled, groups replies with the original email and allows you to follow the flow of the conversation from one message to the next."
 msgstr ""
 
 #: C/mail-sorting-message-list.page:38(p)
-msgid ""
-"When a new message arrives, it will be added below the parent message. "
-"Threads are sorted and displayed based on the date of the most recent "
-"message received."
+msgid "When a new message arrives, it will be added below the parent message. Threads are sorted and displayed based on the date of the most recent message received."
 msgstr ""
 
 #: C/mail-sorting-message-list.page:39(p)
-msgid ""
-"For Advanced Users: There is a GConf key that allows you to toggle between "
-"the collapsed and expanded state of the email threads. The collapsed state "
-"is enabled by default and may be modified at /apps/evolution/mail/display/"
-"thread_expand."
+msgid "For Advanced Users: There is a GConf key that allows you to toggle between the collapsed and expanded state of the email threads. The collapsed state is enabled by default and may be modified at /apps/evolution/mail/display/thread_expand."
 msgstr ""
 
 #: C/mail-sorting-message-list.page:44(title)
@@ -3296,11 +2235,7 @@ msgid "Sorting Mail with Column Headers"
 msgstr ""
 
 #: C/mail-sorting-message-list.page:45(p)
-msgid ""
-"The message list displays columns that indicate whether a message has been "
-"read, whether it has attachments, how important the message is, the sender, "
-"date, and the subject. To change the columns used in the message list, you "
-"can do one of the following:"
+msgid "The message list displays columns that indicate whether a message has been read, whether it has attachments, how important the message is, the sender, date, and the subject. To change the columns used in the message list, you can do one of the following:"
 msgstr ""
 
 #: C/mail-sorting-message-list.page:47(p)
@@ -3310,33 +2245,19 @@ msgstr ""
 #: C/mail-sorting-message-list.page:48(p)
 #, fuzzy
 msgid "Right-click on the header."
-msgstr "Desno kliknite na skupino za prikaz možnosti"
-
-#: C/mail-sorting-message-list.page:49(gui)
-#: C/mail-change-columns-in-message-list.page:22(gui)
-#, fuzzy
-msgid "Remove This Column"
-msgstr "Odstrani ta _stolpec"
-
-#: C/mail-sorting-message-list.page:49(gui)
-msgid "Add a Column"
-msgstr "Dodaj stolpec"
+msgstr "S klikom izberi pravilno barvo"
 
 #: C/mail-sorting-message-list.page:49(p)
-msgid "Select the <placeholder-1/> or <placeholder-2/> option."
+msgid "Select the <gui>Remove This Column</gui> or <gui>Add a Column</gui> option."
 msgstr ""
 
 #: C/mail-sorting-message-list.page:46(list)
-msgid ""
-"<item><placeholder-1/></item><item><placeholder-2/></item>S "
-"<item><placeholder-3/></item>"
-msgstr ""
+#, fuzzy
+msgid "<placeholder-1/><placeholder-2/>S <placeholder-3/>"
+msgstr "Držalo"
 
 #: C/mail-sorting-message-list.page:52(p)
-msgid ""
-"Evolution allows you to sort your messages using these columns. Just click "
-"on the column label to sort the emails. The direction of the arrow next to "
-"the label indicates the direction of the sort."
+msgid "Evolution allows you to sort your messages using these columns. Just click on the column label to sort the emails. The direction of the arrow next to the label indicates the direction of the sort."
 msgstr ""
 
 #: C/mail-sorting-message-list.page:56(title)
@@ -3344,20 +2265,15 @@ msgid "Using Other Sorting Options"
 msgstr ""
 
 #: C/mail-sorting-message-list.page:57(p)
-msgid ""
-"Evolution provides other ways for sorting email messages. You can use Sort "
-"By, Sort Ascending, Sort Descending, or Unsort."
+msgid "Evolution provides other ways for sorting email messages. You can use Sort By, Sort Ascending, Sort Descending, or Unsort."
 msgstr ""
 
 #: C/mail-sorting-message-list.page:59(title)
-#: C/mail-sorting-message-list.page:60(gui)
-#: C/mail-sorting-message-list.page:63(gui)
-#, fuzzy
 msgid "Sort By"
-msgstr "_Razvrsti po"
+msgstr "Razvrsti po"
 
 #: C/mail-sorting-message-list.page:60(p)
-msgid "You can also sort email messages using the <placeholder-1/> list."
+msgid "You can also sort email messages using the <gui>Sort By</gui> list."
 msgstr ""
 
 #: C/mail-sorting-message-list.page:62(p)
@@ -3369,23 +2285,21 @@ msgid "Right-click on the message list column headers."
 msgstr "Zbrisana sporočila prikaži na seznamu sporočil"
 
 #: C/mail-sorting-message-list.page:63(p)
-#: C/mail-sorting-message-list.page:93(p)
-#: C/mail-sorting-message-list.page:102(p)
-#: C/mail-sorting-message-list.page:111(p)
 #, fuzzy
-msgid "Select the <placeholder-1/> option."
-msgstr "Izberi napredne možnosti"
+msgid "Select the <gui>Sort By</gui> option."
+msgstr "Izberite možnost iskanja \"Lastnik je skupina\""
 
 #: C/mail-sorting-message-list.page:63(p)
 msgid "This brings up this list of criteria for sorting email messages:"
 msgstr ""
 
 #: C/mail-sorting-message-list.page:65(p)
-#: C/mail-change-columns-in-message-list.page:23(gui)
+#, fuzzy
 msgid "Subject - Trimmed"
 msgstr "Zadeva - Okleščeno"
 
-#: C/mail-sorting-message-list.page:66(p) C/mail-labels.page:35(gui)
+#: C/mail-sorting-message-list.page:66(p)
+#, fuzzy
 msgid "Labels"
 msgstr "Oznake"
 
@@ -3394,13 +2308,10 @@ msgid "Recipients"
 msgstr "Prejemniki"
 
 #: C/mail-sorting-message-list.page:68(p)
-#: C/mail-change-columns-in-message-list.page:23(gui)
 msgid "Sender"
 msgstr "Pošiljatelj"
 
 #: C/mail-sorting-message-list.page:69(p)
-#: C/calendar-usage-add-appointment.page:27(gui)
-#: C/calendar-meetings-sending-invitation.page:37(gui)
 msgid "Location"
 msgstr "Mesto"
 
@@ -3429,34 +2340,26 @@ msgid "Received"
 msgstr "Prejeto"
 
 #: C/mail-sorting-message-list.page:76(p)
-#: C/mail-change-time-format.page:20(gui)
-#: C/calendar-layout-appointment-display.page:50(gui)
 msgid "Date"
 msgstr "Datum"
 
 #: C/mail-sorting-message-list.page:77(p)
-#: C/mail-change-columns-in-message-list.page:23(gui)
 msgid "Subject"
 msgstr "Zadeva"
 
 #: C/mail-sorting-message-list.page:78(p)
-#: C/mail-change-columns-in-message-list.page:23(gui)
 msgid "From"
 msgstr "Od"
 
 #: C/mail-sorting-message-list.page:79(p)
-#: C/mail-composer-forward-as-attachment.page:23(gui)
-#: C/mail-composer-forward-as-attachment.page:26(gui)
-#: C/mail-attachments-sending.page:30(gui)
 msgid "Attachment"
 msgstr "Priloga"
 
 #: C/mail-sorting-message-list.page:80(p)
 msgid "Flagged"
-msgstr "Označeno"
+msgstr "Z zastavico"
 
 #: C/mail-sorting-message-list.page:81(p)
-#: C/calendar-meetings-sending-invitation.page:35(gui)
 msgid "Status"
 msgstr "Stanje"
 
@@ -3469,41 +2372,45 @@ msgid "Select the option you wish to use in sorting email messages."
 msgstr ""
 
 #: C/mail-sorting-message-list.page:90(title)
-#: C/mail-sorting-message-list.page:93(gui)
 #, fuzzy
 msgid "Sort Ascending"
-msgstr "Razvrsti naraščajoče:"
+msgstr "Razvrsti _naraščajoče"
 
-#: C/mail-sorting-message-list.page:95(p)
+#: C/mail-sorting-message-list.page:93(p)
 #, fuzzy
+msgid "Select the <gui>Sort Ascending</gui> option."
+msgstr "V možnosti <gui>Strani na stran</gui> izberite <gui>2</gui>."
+
+#: C/mail-sorting-message-list.page:95(p)
 msgid "The messages will be displayed with the most recent at the bottom."
 msgstr ""
-"Datum tega sporočila bo primerjan s trenutnim\n"
-"časom, ko se izvede filtriranje."
 
 #: C/mail-sorting-message-list.page:99(title)
-#: C/mail-sorting-message-list.page:102(gui)
 #, fuzzy
 msgid "Sort Descending"
-msgstr "Razvrsti padajoče:"
+msgstr "Razvrsti _padajoče"
 
-#: C/mail-sorting-message-list.page:104(p)
+#: C/mail-sorting-message-list.page:102(p)
 #, fuzzy
+msgid "Select the <gui>Sort Descending</gui> option."
+msgstr "V možnosti <gui>Strani na stran</gui> izberite <gui>2</gui>."
+
+#: C/mail-sorting-message-list.page:104(p)
 msgid "The messages will be displayed with the most recent at the top."
 msgstr ""
-"Datum tega sporočila bo primerjan s trenutnim\n"
-"časom, ko se izvede filtriranje."
 
 #: C/mail-sorting-message-list.page:108(title)
-#: C/mail-sorting-message-list.page:111(gui)
 #, fuzzy
 msgid "Unsort"
-msgstr "Nerazvrščeno:"
+msgstr "_Nerazvrščeno"
+
+#: C/mail-sorting-message-list.page:111(p)
+#, fuzzy
+msgid "Select the <gui>Unsort</gui> option."
+msgstr "Izberite <i>lastnosti</i> (zadnja možnost)."
 
 #: C/mail-sorting-message-list.page:113(p)
-msgid ""
-"This removes sorting from the column, reverting to the order of messages as "
-"they were added to the folder."
+msgid "This removes sorting from the column, reverting to the order of messages as they were added to the folder."
 msgstr ""
 
 #: C/mail-several-pop-accounts.page:5(desc)
@@ -3515,63 +2422,25 @@ msgid "Separating POP mail for more than one account"
 msgstr ""
 
 #: C/mail-several-pop-accounts.page:24(p)
-msgid ""
-"It is not possible to have separate accounts in the accounts and folder list "
-"pane. Evolution only has one unique inbox for incoming email."
+msgid "It is not possible to have separate accounts in the accounts and folder list pane. Evolution only has one unique inbox for incoming email."
 msgstr ""
 
-#: C/mail-several-pop-accounts.page:25(link)
-#, fuzzy
-msgid "creating folders"
-msgstr "Ustvarjanje mape '%s'"
-
-#: C/mail-several-pop-accounts.page:25(link)
-#, fuzzy
-msgid "creating filters"
-msgstr "<b>Napaka med izbrisom filtrov</b>"
-
-#: C/mail-several-pop-accounts.page:25(gui)
-#, fuzzy
-msgid "Message Filters..."
-msgstr "Filtri sporočil"
-
 #: C/mail-several-pop-accounts.page:25(p)
-msgid ""
-"You can either use IMAP instead of POP, or move incoming emails into "
-"different folders by <placeholder-1/> and <placeholder-2/>: Create a new "
-"folder and create two subfolders (for incoming and for sent mail of that "
-"account). Now set up an incoming filter via <guiseq><placeholder-3/"
-"><placeholder-4/><placeholder-5/></guiseq> to move incoming mail to the "
-"incoming folder by filtering on the recipient's address and set up an "
-"outgoing filter to move outgoing mail to the sent folder by filtering on the "
-"sender's address."
+msgid "You can either use IMAP instead of POP, or move incoming emails into different folders by <link xref=\"mail-folders\">creating folders</link> and <link xref=\"mail-filters\">creating filters</link>: Create a new folder and create two subfolders (for incoming and for sent mail of that account). Now set up an incoming filter via <guiseq><gui>Edit</gui><gui>Message Filters...</gui><gui style=\"button\">Add</gui></guiseq> to move incoming mail to the incoming folder by filtering on the recipient's address and set up an outgoing filter to move outgoing mail to the sent folder by filtering on the sender's address."
 msgstr ""
 
 #: C/mail-sending-options-smtp.page:5(desc)
 #, fuzzy
 msgid "Sending options for SMTP."
-msgstr "Povzeto iz sporočila %s"
+msgstr "Preglednica možnosti za popt"
 
 #: C/mail-sending-options-smtp.page:27(title)
 #, fuzzy
 msgid "SMTP sending options"
-msgstr "Možnosti pošiljanja"
-
-#: C/mail-sending-options-smtp.page:30(gui)
-#: C/mail-receiving-options-usenet-news.page:27(gui)
-#: C/mail-receiving-options-pop.page:31(gui)
-#: C/mail-receiving-options-novell-groupwise.page:28(gui)
-#: C/mail-receiving-options-imap-plus.page:27(gui)
-#: C/mail-receiving-options-imap.page:27(gui)
-#: C/mail-receiving-options-exchange-mapi.page:25(gui)
-msgid "Server"
-msgstr "Strežnik"
+msgstr "Naprej - Nastavitev prejemanja"
 
 #: C/mail-sending-options-smtp.page:30(p)
-msgid ""
-"Enter the address of your mail server for sending mail in the <placeholder-1/"
-"> field and select if the server requires authentication (entering a "
-"username and a password)."
+msgid "Enter the address of your mail server for sending mail in the <gui>Server</gui> field and select if the server requires authentication (entering a username and a password)."
 msgstr ""
 
 #: C/mail-sending-options-smtp.page:31(p)
@@ -3580,80 +2449,20 @@ msgstr ""
 #: C/mail-receiving-options-pop.page:35(p)
 #: C/mail-receiving-options-imap-plus.page:29(p)
 #: C/mail-receiving-options-imap.page:29(p)
-msgid ""
-"Free webmail providers often supply information about which of these options "
-"can be used. If you are in an organizational environment, you may want to "
-"contact your system administrator for more information."
+msgid "Free webmail providers often supply information about which of these options can be used. If you are in an organizational environment, you may want to contact your system administrator for more information."
 msgstr ""
 
 #: C/mail-sending-options-smtp.page:32(p)
-msgid ""
-"If the server requires authentication, you need to provide the following "
-"information:"
+msgid "If the server requires authentication, you need to provide the following information:"
 msgstr ""
 
-#: C/mail-sending-options-smtp.page:34(gui)
-#: C/mail-receiving-options-usenet-news.page:30(gui)
-#: C/mail-receiving-options-pop.page:34(gui)
-#: C/mail-receiving-options-novell-groupwise.page:31(gui)
-#: C/mail-receiving-options-imap-plus.page:30(gui)
-#: C/mail-receiving-options-imap.page:30(gui)
-#: C/mail-receiving-options-exchange-mapi.page:28(gui)
-#: C/mail-receiving-options-evolution-exchange.page:32(gui)
-#, fuzzy
-msgid "Check for Supported Types"
-msgstr "Pr_everi podprte vrste"
-
 #: C/mail-sending-options-smtp.page:34(p)
-msgid ""
-"Select the authentication type in the Authentication list, or click "
-"<placeholder-1/> to have Evolution check. Some servers do not support this, "
-"so clicking this button is not a guarantee that available mechanisms "
-"actually work."
-msgstr ""
-
-#: C/mail-sending-options-smtp.page:42(link)
-#: C/mail-receiving-options-usenet-news.page:43(link)
-#: C/mail-receiving-options-unix-mbox-spool-file.page:33(link)
-#: C/mail-receiving-options-unix-mbox-spool-directory.page:31(link)
-#: C/mail-receiving-options-pop.page:48(link)
-#: C/mail-receiving-options-novell-groupwise.page:45(link)
-#: C/mail-receiving-options-mh-format-directories.page:31(link)
-#: C/mail-receiving-options-maildir-format-directories.page:32(link)
-#: C/mail-receiving-options-local-delivery.page:32(link)
-#: C/mail-receiving-options-imap-plus.page:45(link)
-#: C/mail-receiving-options-imap.page:45(link)
-#: C/mail-receiving-options-exchange-mapi.page:40(link)
-#: C/mail-receiving-options-evolution-exchange.page:47(link)
-#: C/intro-first-run.page:32(link) C/intro-first-run.page:45(link)
-#: C/intro-first-run.page:46(link) C/intro-first-run.page:48(link)
-#: C/intro-first-run.page:49(link) C/intro-first-run.page:50(link)
-#: C/intro-first-run.page:59(link) C/intro-first-run.page:62(link)
-#: C/intro-first-run.page:65(link) C/intro-first-run.page:73(link)
-#: C/intro-first-run.page:75(link) C/intro-first-run.page:77(link)
-#: C/intro-first-run.page:79(link) C/intro-first-run.page:81(link)
-#: C/intro-first-run.page:93(link)
-#, fuzzy
-msgid "here"
-msgstr "_Kje:"
+msgid "Select the authentication type in the Authentication list, or click <gui>Check for Supported Types</gui> to have Evolution check. Some servers do not support this, so clicking this button is not a guarantee that available mechanisms actually work."
+msgstr ""
 
 #. TODO:XINCLUDE: Maybe later replace this "go back" workaround by doing some content sharing with xinclude and xpointer in intro-first-run.page itself? <include href="foo.xml" xmlns="http://www.w3.org/2001/XInclude"/> See gnome-user-docs module for example usage.
 #: C/mail-sending-options-smtp.page:42(p)
-#: C/mail-receiving-options-usenet-news.page:43(p)
-#: C/mail-receiving-options-unix-mbox-spool-file.page:33(p)
-#: C/mail-receiving-options-unix-mbox-spool-directory.page:31(p)
-#: C/mail-receiving-options-pop.page:48(p)
-#: C/mail-receiving-options-novell-groupwise.page:45(p)
-#: C/mail-receiving-options-mh-format-directories.page:31(p)
-#: C/mail-receiving-options-maildir-format-directories.page:32(p)
-#: C/mail-receiving-options-local-delivery.page:32(p)
-#: C/mail-receiving-options-imap-plus.page:45(p)
-#: C/mail-receiving-options-imap.page:45(p)
-#: C/mail-receiving-options-exchange-mapi.page:40(p)
-#: C/mail-receiving-options-evolution-exchange.page:47(p)
-msgid ""
-"If you came to this page from the first-run wizard help page, click "
-"<placeholder-1/> to continue with the next step."
+msgid "If you came to this page from the first-run wizard help page, click <link xref=\"intro-first-run#account-information\">here</link> to continue with the next step."
 msgstr ""
 
 #: C/mail-send-and-receive.page:5(desc)
@@ -3663,17 +2472,10 @@ msgstr ""
 #: C/mail-send-and-receive.page:20(title)
 #, fuzzy
 msgid "Sending and receiving mail"
-msgstr "Pošiljanje in sprejemanje elektronske pošte"
-
-#: C/mail-send-and-receive.page:22(link)
-#, fuzzy
-msgid "Composing mail"
-msgstr "Uvažanje poštnega predala"
+msgstr "Koledar in pošta Evolution"
 
 #: C/mail-send-and-receive.page:22(p)
-msgid ""
-"This section refers to receiving mail and sending written emails. For "
-"writing a new message, please refer to the <placeholder-1/> section."
+msgid "This section refers to receiving mail and sending written emails. For writing a new message, please refer to the <link type=\"guide\" xref=\"index#mail-composing\">Composing mail</link> section."
 msgstr ""
 
 #: C/mail-send-and-receive-manual.page:5(desc)
@@ -3684,30 +2486,18 @@ msgstr "Pošiljanje in sprejemanje elektronske pošte"
 #: C/mail-send-and-receive-manual.page:20(title)
 #, fuzzy
 msgid "Manually send and receive message"
-msgstr "Pridobivanje sporočil je spodletelo."
-
-#: C/mail-send-and-receive-manual.page:21(gui)
-#: C/mail-send-and-receive-manual.page:22(gui)
-msgid "Send / Receive"
-msgstr "Oddaja / sprejem"
-
-#: C/mail-send-and-receive-manual.page:21(key)
-msgid "F9"
-msgstr "F9"
+msgstr "Višina okna \"pošljanja in sprejmanja pošte\""
 
 #: C/mail-send-and-receive-manual.page:21(p)
-msgid ""
-"To receive new messages from the mail server and to send messages you have "
-"written that are in the local Outbox, click the <placeholder-1/> button in "
-"the toolbar, or press <placeholder-2/>, or choose <guiseq><placeholder-3/"
-"><placeholder-4/></guiseq> from the main menu."
+msgid "To receive new messages from the mail server and to send messages you have written that are in the local Outbox, click the <gui style=\"button\">Send / Receive</gui> button in the toolbar, or press <key>F9</key>, or choose <guiseq><gui>File</gui><gui>Send / Receive </gui></guiseq> from the main menu."
 msgstr ""
 
 #: C/mail-send-and-receive-manual.page:22(p)
-msgid ""
-"To send and receive only for one of your mail accounts, or to only send or "
-"only receive, click the small down-arrow next to the <placeholder-1/> button "
-"and choose the corresponding option."
+msgid "To send and receive only for one of your mail accounts, or to only send or only receive, click the small down-arrow next to the <gui style=\"button\">Send / Receive</gui> button and choose the corresponding option."
+msgstr ""
+
+#: C/mail-send-and-receive-manual.page:23(p)
+msgid "If you just want to send messages which are in your Outbox, you can right-click on the Outbox and click <gui>Flush Outbox</gui>."
 msgstr ""
 
 #: C/mail-send-and-receive-automatically.page:5(desc)
@@ -3717,69 +2507,28 @@ msgstr ""
 #: C/mail-send-and-receive-automatically.page:20(title)
 #, fuzzy
 msgid "Automatically check for new mail"
-msgstr "Samodejno zaženi med urejanjem nove pošte"
-
-#: C/mail-send-and-receive-automatically.page:21(gui)
-#: C/mail-receiving-options-usenet-news.page:36(gui)
-#: C/mail-receiving-options-unix-mbox-spool-file.page:29(gui)
-#: C/mail-receiving-options-pop.page:41(gui)
-#: C/mail-receiving-options-novell-groupwise.page:37(gui)
-#: C/mail-receiving-options-mh-format-directories.page:28(gui)
-#: C/mail-receiving-options-maildir-format-directories.page:28(gui)
-#: C/mail-receiving-options-local-delivery.page:29(gui)
-#: C/mail-receiving-options-imap-plus.page:36(gui)
-#: C/mail-receiving-options-imap.page:37(gui)
-#: C/mail-receiving-options-exchange-mapi.page:35(gui)
-#: C/mail-receiving-options-evolution-exchange.page:38(gui)
-#, fuzzy
-msgid "Check for new messages every ... minutes"
-msgstr "Med novimi sporočili preveri za neželeno pošto"
-
-#: C/mail-send-and-receive-automatically.page:21(gui)
-#: C/mail-receiving-options-usenet-news.page:25(gui)
-#: C/mail-receiving-options-unix-mbox-spool-file.page:22(gui)
-#: C/mail-receiving-options-unix-mbox-spool-directory.page:22(gui)
-#: C/mail-receiving-options-pop.page:29(gui)
-#: C/mail-receiving-options-novell-groupwise.page:26(gui)
-#: C/mail-receiving-options-mh-format-directories.page:22(gui)
-#: C/mail-receiving-options-maildir-format-directories.page:22(gui)
-#: C/mail-receiving-options-local-delivery.page:22(gui)
-#: C/mail-receiving-options-imap-plus.page:25(gui)
-#: C/mail-receiving-options-imap.page:25(gui)
-#: C/mail-receiving-options-exchange-mapi.page:22(gui)
-#: C/mail-receiving-options-evolution-exchange.page:25(gui)
-#: C/intro-first-run.page:36(title)
-msgid "Receiving Email"
-msgstr "Prejemanje elektronske pošte"
+msgstr "_Omogoči preverjanje za novo pošto"
 
 #: C/mail-send-and-receive-automatically.page:21(p)
-msgid ""
-"If you want Evolution to check automatically for new messages, enable the "
-"option <placeholder-1/> in the <placeholder-2/> page of the mail account "
-"settings (accessible via <guiseq><placeholder-3/><placeholder-4/"
-"><placeholder-5/><placeholder-6/><placeholder-7/></guiseq>) and select the "
-"frequency in minutes."
+msgid "If you want Evolution to check automatically for new messages, enable the option <gui>Check for new messages every ... minutes</gui> in the <gui>Receiving Email</gui> page of the mail account settings (accessible via <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Mail Accounts</gui><gui style=\"button\">Edit</gui><gui>Receiving Email</gui></guiseq>) and select the frequency in minutes."
 msgstr ""
 
 #: C/mail-searching.page:5(desc)
 #, fuzzy
 msgid "Searching messages."
-msgstr "Komponenta za iskanje"
+msgstr "Iskanje %s za delna sporočila"
 
 #: C/mail-searching.page:28(title)
 #, fuzzy
 msgid "Searching Mail"
-msgstr "Pridobivanje pošte"
+msgstr "Preveri pošto"
 
 #: C/mail-searching.page:31(p)
-msgid ""
-"In the mail view, you can quickly search for messages by defining conditions."
+msgid "In the mail view, you can quickly search for messages by defining conditions."
 msgstr ""
 
 #: C/mail-searching.page:33(p)
-msgid ""
-"Click on the search icon <media type=\"image\" mime=\"image/png\" src="
-"\"figures/search-icon.png\"/> to expand the drop-down list."
+msgid "Click on the search icon <media type=\"image\" mime=\"image/png\" src=\"figures/search-icon.png\"/> to expand the drop-down list."
 msgstr ""
 
 #: C/mail-searching.page:35(p)
@@ -3788,21 +2537,11 @@ msgid "Select the scope from the drop-down list right to the text box."
 msgstr "Izberite možnost iskanja iz spustnega seznama."
 
 #: C/mail-searching.page:39(p)
-msgid ""
-"If you start directly from the fourth step, text will be searched in mail's "
-"subjects and addresses and scope will be \"Current folder\"."
+msgid "If you start directly from the fourth step, text will be searched in mail's subjects and addresses and scope will be \"Current folder\"."
 msgstr ""
 
-#: C/mail-searching.page:40(link)
-#, fuzzy
-msgid "Using Search Folders"
-msgstr "Omogoči iskalne mape"
-
 #: C/mail-searching.page:40(p)
-msgid ""
-"If you search for messages that are not in the same folder rather often you "
-"might want to create a search folder instead; see <placeholder-1/> for more "
-"detail."
+msgid "If you search for messages that are not in the same folder rather often you might want to create a search folder instead; see <link xref=\"mail-search-folders\">Using Search Folders</link> for more detail."
 msgstr ""
 
 #: C/mail-searching.page:45(title)
@@ -3810,53 +2549,38 @@ msgid "Advanced Search:"
 msgstr "Napredno iskanje:"
 
 #: C/mail-searching-attachment-type.page:5(desc)
+#, fuzzy
 msgid "Unfortunately this is not possible."
-msgstr ""
+msgstr "Potrdila si ni mogoče pogledati"
 
 #: C/mail-searching-attachment-type.page:21(title)
 msgid "Searching for emails with a specific attachment type"
 msgstr ""
 
 #: C/mail-searching-attachment-type.page:23(p)
-msgid ""
-"There currently is no way to do search for emails with a specific type of "
-"attachment (for example searching for all emails that have a PDF attachment)."
+msgid "There currently is no way to do search for emails with a specific type of attachment (for example searching for all emails that have a PDF attachment)."
 msgstr ""
 
 #: C/mail-search-folders-refresh.page:5(desc)
 #, fuzzy
 msgid "Ways of updating Search folders."
-msgstr "Omogoči iskalne mape"
+msgstr "Posodabljanje iskalne mape za '%s:%s'"
 
 #: C/mail-search-folders-refresh.page:24(title)
 #, fuzzy
 msgid "Updating/refreshing Search folders"
-msgstr "Omogoči iskalne mape"
+msgstr "Posodabljanje iskalne mape za '%s:%s'"
 
 #: C/mail-search-folders-refresh.page:26(p)
-msgid ""
-"It might happen that one of your Search folders has not updated since some "
-"new email arrived or since an email was deleted, for example. This will mean "
-"that the list of emails in the folder is not up-to-date."
+msgid "It might happen that one of your Search folders has not updated since some new email arrived or since an email was deleted, for example. This will mean that the list of emails in the folder is not up-to-date."
 msgstr ""
 
-#: C/mail-search-folders-refresh.page:28(gui)
-#: C/mail-refresh-folders.page:22(gui)
-#, fuzzy
-msgid "Refresh"
-msgstr "Osveži"
-
 #: C/mail-search-folders-refresh.page:28(p)
-msgid ""
-"You can get an updated view of the search folder either by switching to "
-"another folder and then back again, or by right-clicking on the search "
-"folder and choosing <placeholder-1/>."
+msgid "You can get an updated view of the search folder either by switching to another folder and then back again, or by right-clicking on the search folder and choosing <gui>Refresh</gui>."
 msgstr ""
 
 #: C/mail-search-folders.page:5(desc)
-msgid ""
-"Use search folders to see messages in one folder while still keeping them in "
-"their original folders."
+msgid "Use search folders to see messages in one folder while still keeping them in their original folders."
 msgstr ""
 
 #: C/mail-search-folders.page:22(title)
@@ -3864,73 +2588,34 @@ msgstr ""
 msgid "Using Search folders"
 msgstr "Omogoči iskalne mape"
 
-#: C/mail-search-folders.page:24(link)
-#: C/mail-search-folders-conditions.page:52(link) C/mail-folders.page:55(link)
-#: C/mail-filters-conditions.page:52(link)
-#, fuzzy
-msgid "filters"
-msgstr "filter"
-
 #: C/mail-search-folders.page:24(p)
-msgid ""
-"If <placeholder-1/> are not flexible enough, or you find yourself performing "
-"the same <placeholder-2/> again and again, consider a search folder."
+msgid "If <link xref=\"mail-filters\">filters</link> are not flexible enough, or you find yourself performing the same <link xref=\"mail-searching\">search</link> again and again, consider a search folder."
 msgstr ""
 
-#: C/mail-search-folders.page:26(link)
-#, fuzzy
-msgid "folder"
-msgstr "Mapa:"
-
-#: C/mail-search-folders.page:26(link)
-msgid "filter"
-msgstr "filter"
-
 #: C/mail-search-folders.page:26(p)
-msgid ""
-"A search folder looks like a <placeholder-1/>, it acts like a <placeholder-2/"
-">, and you set it up like a <placeholder-3/>. While a conventional folder "
-"actually contains messages, a search folder is a view of messages that might "
-"be in several different folders. The messages it contains are determined on "
-"the fly using a set of criteria that you have chosen when setting up the "
-"search folder."
+msgid "A search folder looks like a <link xref=\"mail-folders\">folder</link>, it acts like a <link xref=\"mail-searching\">search</link>, and you set it up like a <link xref=\"mail-filters\">filter</link>. While a conventional folder actually contains messages, a search folder is a view of messages that might be in several different folders. The messages it contains are determined on the fly using a set of criteria that you have chosen when setting up the search folder."
 msgstr ""
 
 #: C/mail-search-folders.page:28(p)
-msgid ""
-"Evolution automatically updates the search folder contents when new messages "
-"are received or message are deleted."
+msgid "Evolution automatically updates the search folder contents when new messages are received or message are deleted."
 msgstr ""
 
-#: C/mail-search-folders.page:30(gui) C/mail-search-folders.page:32(gui)
-#, fuzzy
-msgid "Unmatched"
-msgstr "Brez zadetka"
-
 #: C/mail-search-folders.page:30(p)
-msgid ""
-"The <placeholder-1/> search folder is the opposite of other search folders: "
-"it displays all messages that do not appear in other search folders."
+msgid "The <gui>Unmatched</gui> search folder is the opposite of other search folders: it displays all messages that do not appear in other search folders."
 msgstr ""
 
 #: C/mail-search-folders.page:32(p)
-msgid ""
-"If you use remote email storage like IMAP, and have created search folders "
-"to search through them, the <placeholder-1/> search folder also searches the "
-"remote folders. If you do not create any search folders that search remote "
-"mail stores, the <placeholder-2/> search folder does not search in them "
-"either."
+msgid "If you use remote email storage like IMAP, and have created search folders to search through them, the <gui>Unmatched</gui> search folder also searches the remote folders. If you do not create any search folders that search remote mail stores, the <gui>Unmatched</gui> search folder does not search in them either."
 msgstr ""
 
 #: C/mail-search-folders-conditions.page:5(desc)
-#, fuzzy
 msgid "Available conditions for setting up search folders."
-msgstr "Nadgradnja nastavitev ali map Pošte ni uspela."
+msgstr ""
 
 #: C/mail-search-folders-conditions.page:23(title)
 #, fuzzy
 msgid "Available Search folder conditions"
-msgstr "Omogoči iskalne mape"
+msgstr "Iskala mapa iz _Zadeve ..."
 
 #: C/mail-search-folders-conditions.page:26(p)
 #: C/mail-filters-conditions.page:26(p)
@@ -3945,9 +2630,8 @@ msgstr "Ime gostitelja ali naslov strežnika."
 
 #: C/mail-search-folders-conditions.page:29(p)
 #: C/mail-filters-conditions.page:29(p)
-#, fuzzy
 msgid "Recipients:"
-msgstr "Prejemnik"
+msgstr "Prejemniki:"
 
 #: C/mail-search-folders-conditions.page:30(p)
 #: C/mail-filters-conditions.page:30(p)
@@ -3957,44 +2641,39 @@ msgstr "Vnesite prejemnike sporočila"
 
 #: C/mail-search-folders-conditions.page:32(p)
 #: C/mail-filters-conditions.page:32(p)
-#, fuzzy
 msgid "CC:"
-msgstr "KP"
+msgstr "Kp:"
 
 #: C/mail-search-folders-conditions.page:33(p)
 #: C/mail-filters-conditions.page:33(p)
 #, fuzzy
 msgid "Only the CC recipients of the message."
-msgstr "Vnesite prejemnike sporočila"
+msgstr "To sporočilo vsebuje le nepodprte zahtevke."
 
 #: C/mail-search-folders-conditions.page:35(p)
 #: C/mail-filters-conditions.page:35(p)
 msgid "BCC:"
-msgstr ""
+msgstr "Skp:"
 
 #: C/mail-search-folders-conditions.page:36(p)
 #: C/mail-filters-conditions.page:36(p)
-msgid ""
-"Only the BCC recipients of the message. Obviously this can only be applied "
-"to outgoing filters."
+msgid "Only the BCC recipients of the message. Obviously this can only be applied to outgoing filters."
 msgstr ""
 
 #: C/mail-search-folders-conditions.page:38(p)
 #: C/mail-filters-conditions.page:38(p)
 #, fuzzy
 msgid "Sender or Recipients:"
-msgstr "Pošiljatelj ali prejemniki"
+msgstr "Pošiljatelj ali prejemnik"
 
 #: C/mail-search-folders-conditions.page:39(p)
 #: C/mail-filters-conditions.page:39(p)
 #, fuzzy
-msgid ""
-"The sender's email address or the name of the sender or the recipients of "
-"the message."
+msgid "The sender's email address or the name of the sender or the recipients of the message."
 msgstr "Ime gostitelja ali naslov strežnika."
 
 #: C/mail-search-folders-conditions.page:41(p)
-#: C/mail-filters-conditions.page:41(p) C/mail-composer-reply.page:27(gui)
+#: C/mail-filters-conditions.page:41(p)
 msgid "Subject:"
 msgstr "Zadeva:"
 
@@ -4002,34 +2681,21 @@ msgstr "Zadeva:"
 #: C/mail-filters-conditions.page:42(p)
 #, fuzzy
 msgid "The subject line of the message."
-msgstr "Sporočilo zaloge (izbirno)"
+msgstr "Sporočilo od %s, zadeva: \"%s\""
 
 #: C/mail-search-folders-conditions.page:44(p)
 #: C/mail-filters-conditions.page:44(p)
 msgid "Specific Header:"
 msgstr "Določena glava:"
 
-#: C/mail-search-folders-conditions.page:45(link)
-#: C/mail-filters-conditions.page:45(link)
-#, fuzzy
-msgid "custom ones"
-msgstr "Uporabi pisave po meri"
-
 #: C/mail-search-folders-conditions.page:45(p)
 #: C/mail-filters-conditions.page:45(p)
-#, fuzzy
-msgid "Any header including <placeholder-1/>."
-msgstr "gpg <placeholder-1/>"
+msgid "Any header including <link xref=\"mail-composer-custom-header-lines\">custom ones</link>."
+msgstr ""
 
 #: C/mail-search-folders-conditions.page:46(p)
 #: C/mail-filters-conditions.page:46(p)
-msgid ""
-"If a message uses a header more than once, Evolution pays attention only to "
-"the first instance, even if the message defines the header differently the "
-"second time. For example, if a message declares the Resent-From: header as "
-"\"engineering@example.com\" and then restates it as \"marketing@example.com"
-"\", Evolution filters as though the second declaration did not occur. To "
-"filter on messages that use headers multiple times, use a regular expression."
+msgid "If a message uses a header more than once, Evolution pays attention only to the first instance, even if the message defines the header differently the second time. For example, if a message declares the Resent-From: header as \"engineering@example.com\" and then restates it as \"marketing@example.com\", Evolution filters as though the second declaration did not occur. To filter on messages that use headers multiple times, use a regular expression."
 msgstr ""
 
 #: C/mail-search-folders-conditions.page:48(p)
@@ -4050,40 +2716,27 @@ msgstr "Izraz:"
 
 #: C/mail-search-folders-conditions.page:52(p)
 #: C/mail-filters-conditions.page:52(p)
-msgid ""
-"(For programmers only) Match a message according to an expression you write "
-"in the Scheme language used to define <placeholder-1/> in Evolution."
+msgid "(For programmers only) Match a message according to an expression you write in the Scheme language used to define <link xref=\"mail-filters\">filters</link> in Evolution."
 msgstr ""
 
 #: C/mail-search-folders-conditions.page:54(p)
 #: C/mail-filters-conditions.page:54(p)
-#, fuzzy
 msgid "Date sent:"
-msgstr "Datum pošiljanja"
+msgstr "Datum pošiljanja:"
 
 #: C/mail-search-folders-conditions.page:55(p)
 #: C/mail-filters-conditions.page:55(p)
-msgid ""
-"Filters messages according to the date on which they were sent. First, "
-"choose the conditions you want a message to meet, such as before a given "
-"time or after a given time. Then choose the time. The filter compares the "
-"message's time stamp to the system clock when the filter is run, or to a "
-"specific time and date you choose from a calendar. You can also have it look "
-"for a message within a range of time relative to the filter, such as two to "
-"four days ago."
+msgid "Filters messages according to the date on which they were sent. First, choose the conditions you want a message to meet, such as before a given time or after a given time. Then choose the time. The filter compares the message's time stamp to the system clock when the filter is run, or to a specific time and date you choose from a calendar. You can also have it look for a message within a range of time relative to the filter, such as two to four days ago."
 msgstr ""
 
 #: C/mail-search-folders-conditions.page:57(p)
 #: C/mail-filters-conditions.page:57(p)
-#, fuzzy
 msgid "Date received:"
-msgstr "Datum prejema"
+msgstr "Datum prejema:"
 
 #: C/mail-search-folders-conditions.page:58(p)
 #: C/mail-filters-conditions.page:58(p)
-msgid ""
-"This works the same way as the Date Sent option, except that it compares the "
-"time you received the message with the dates you specify."
+msgid "This works the same way as the Date Sent option, except that it compares the time you received the message with the dates you specify."
 msgstr ""
 
 #: C/mail-search-folders-conditions.page:60(p)
@@ -4092,40 +2745,25 @@ msgstr ""
 msgid "Label:"
 msgstr "Naziv:"
 
-#: C/mail-search-folders-conditions.page:61(link)
-#: C/mail-filters-conditions.page:61(link)
-#, fuzzy
-msgid "labels"
-msgstr "Oznake"
-
 #: C/mail-search-folders-conditions.page:61(p)
 #: C/mail-filters-conditions.page:61(p)
-msgid ""
-"Messages can have <placeholder-1/> of Important, Work, Personal, To Do, or "
-"Later. You can set labels with other filters or manually."
+msgid "Messages can have <link xref=\"mail-labels\">labels</link> of Important, Work, Personal, To Do, or Later. You can set labels with other filters or manually."
 msgstr ""
 
 #: C/mail-search-folders-conditions.page:63(p)
 #: C/mail-filters-conditions.page:63(p)
-#, fuzzy
 msgid "Score:"
 msgstr "Rezultat:"
 
 #: C/mail-search-folders-conditions.page:64(p)
 #: C/mail-filters-conditions.page:64(p)
-msgid ""
-"Sets the message score to any whole number greater than 0. You can have one "
-"filter set or change a message score, and then set up another filter to move "
-"the messages you have scored. A message score is not based on anything in "
-"particular: it is simply a number you can assign to messages so other "
-"filters can process them."
+msgid "Sets the message score to any whole number greater than 0. You can have one filter set or change a message score, and then set up another filter to move the messages you have scored. A message score is not based on anything in particular: it is simply a number you can assign to messages so other filters can process them."
 msgstr ""
 
 #: C/mail-search-folders-conditions.page:66(p)
 #: C/mail-filters-conditions.page:66(p)
-#, fuzzy
 msgid "Size (kB):"
-msgstr "Velikost (kB)"
+msgstr "Velikost (kB):"
 
 #: C/mail-search-folders-conditions.page:67(p)
 #: C/mail-filters-conditions.page:67(p)
@@ -4134,15 +2772,12 @@ msgstr ""
 
 #: C/mail-search-folders-conditions.page:69(p)
 #: C/mail-filters-conditions.page:69(p)
-#, fuzzy
 msgid "Status:"
 msgstr "Stanje:"
 
 #: C/mail-search-folders-conditions.page:70(p)
 #: C/mail-filters-conditions.page:70(p)
-msgid ""
-"Filters according to the status of a message. The status can be Replied To, "
-"Draft, Important, Read, or Junk."
+msgid "Filters according to the status of a message. The status can be Replied To, Draft, Important, Read, or Junk."
 msgstr ""
 
 #: C/mail-search-folders-conditions.page:72(p)
@@ -4151,50 +2786,36 @@ msgstr ""
 msgid "Follow Up:"
 msgstr "Nadal_jevanje ..."
 
-#: C/mail-search-folders-conditions.page:73(link)
-#: C/mail-filters-conditions.page:73(link)
-#, fuzzy
-msgid "flagged for follow-up"
-msgstr "Z zastavico označi izbrana sporočila za navezavo"
-
 #: C/mail-search-folders-conditions.page:73(p)
 #: C/mail-filters-conditions.page:73(p)
-#, fuzzy
-msgid "Checks whether the message is <placeholder-1/>."
-msgstr "Preveri za _nova sporočila v vseh mapah"
+msgid "Checks whether the message is <link xref=\"mail-follow-up-flag\">flagged for follow-up</link>."
+msgstr ""
 
 #: C/mail-search-folders-conditions.page:75(p)
 #: C/mail-filters-conditions.page:75(p)
 #, fuzzy
 msgid "Completed On:"
-msgstr "Dokončano dne"
+msgstr "Dokončano %d. %B %Y, %H:%M"
 
 #: C/mail-search-folders-conditions.page:77(p)
 #: C/mail-filters-conditions.page:77(p)
-#, fuzzy
 msgid "Attachments:"
-msgstr "Priloge"
+msgstr "Priloge:"
 
 #: C/mail-search-folders-conditions.page:78(p)
 #: C/mail-filters-conditions.page:78(p)
-#, fuzzy
 msgid "Checks whether there is an attachment for the email."
-msgstr "Preveri, ali je Evolution privzet poštni odjemalec"
+msgstr ""
 
 #: C/mail-search-folders-conditions.page:80(p)
 #: C/mail-filters-conditions.page:80(p)
 #, fuzzy
 msgid "Mailing List"
-msgstr "Dopisni seznam:"
+msgstr "Dopisni seznam"
 
 #: C/mail-search-folders-conditions.page:81(p)
 #: C/mail-filters-conditions.page:81(p)
-msgid ""
-"Filters based on the mailing list the message came from. This filter might "
-"miss messages from some list servers, because it checks for the X-BeenThere "
-"header, which is used to identify mailing lists or other redistributors of "
-"mail. Mail from list servers that do not set X-BeenThere properly are not be "
-"caught by these filters."
+msgid "Filters based on the mailing list the message came from. This filter might miss messages from some list servers, because it checks for the X-BeenThere header, which is used to identify mailing lists or other redistributors of mail. Mail from list servers that do not set X-BeenThere properly are not be caught by these filters."
 msgstr ""
 
 #: C/mail-search-folders-conditions.page:83(p)
@@ -4203,20 +2824,9 @@ msgstr ""
 msgid "Regex Match:"
 msgstr "Ustrezen regularni izraz"
 
-#: C/mail-search-folders-conditions.page:84(link)
-#: C/mail-filters-conditions.page:84(link)
-msgid "regex"
-msgstr ""
-
 #: C/mail-search-folders-conditions.page:84(p)
 #: C/mail-filters-conditions.page:84(p)
-msgid ""
-"(For programmers only) If you know your way around a <placeholder-1/>, or "
-"regular expression, this option allows you to search for complex patterns of "
-"letters, so that you can find, for example, all words that start with a and "
-"end with m, and are between six and fifteen letters long, or all messages "
-"that declare a particular header twice. For information about how to use "
-"regular expressions, check the man page for the grep command."
+msgid "(For programmers only) If you know your way around a <link href=\"https://secure.wikimedia.org/wikipedia/en/wiki/Regular_expression\">regex</link>, or regular expression, this option allows you to search for complex patterns of letters, so that you can find, for example, all words that start with a and end with m, and are between six and fifteen letters long, or all messages that declare a particular header twice. For information about how to use regular expressions, check the man page for the grep command."
 msgstr ""
 
 #: C/mail-search-folders-conditions.page:86(p)
@@ -4228,7 +2838,7 @@ msgstr "Mesto sporočila"
 #: C/mail-filters-conditions.page:95(p)
 #, fuzzy
 msgid "Match All:"
-msgstr "Skladaj vse"
+msgstr "Ustrezaj vsem"
 
 #: C/mail-search-folders-add.page:5(desc)
 #, fuzzy
@@ -4240,82 +2850,38 @@ msgstr "Nastavljanje iskalne mape: %s"
 msgid "Creating A Search Folder"
 msgstr "Ustvari _iskalno mapo"
 
-#: C/mail-search-folders-add.page:26(gui)
-msgid "Search Folders"
-msgstr "Iskalne mape"
-
-#: C/mail-search-folders-add.page:26(gui) C/mail-follow-up-flag.page:31(gui)
-#: C/mail-follow-up-flag.page:43(gui) C/mail-folders.page:50(gui)
-#: C/mail-filters.page:29(gui) C/mail-filters.page:36(gui)
-#: C/mail-duplicates.page:28(gui) C/mail-composer-forward.page:31(gui)
-#: C/mail-composer-forward-as-attachment.page:23(gui)
-#: C/deleting-emails.page:36(gui)
-#, fuzzy
-msgid "Message"
-msgstr "Sporočila"
-
-#: C/mail-search-folders-add.page:26(gui) C/mail-filters.page:36(gui)
-#, fuzzy
-msgid "Create Rule"
-msgstr "_Ustvari pravilo"
-
-#: C/mail-search-folders-add.page:26(gui)
-#, fuzzy
-msgid "Create Search Folder From Search..."
-msgstr "Ustva_ri iskalno mapo iz iskanja ..."
-
 #: C/mail-search-folders-add.page:26(p)
-msgid ""
-"Click <guiseq><placeholder-1/><placeholder-2/></guiseq>, or click "
-"<guiseq><placeholder-3/><placeholder-4/></guiseq> and select the criterion "
-"the search folder will be based on, or if you have run a search, click "
-"<guiseq><placeholder-5/><placeholder-6/></guiseq>."
+msgid "Click <guiseq><gui>Edit</gui><gui>Search Folders</gui></guiseq>, or click <guiseq><gui>Message</gui><gui>Create Rule</gui></guiseq> and select the criterion the search folder will be based on, or if you have run a search, click <guiseq><gui>Search</gui><gui>Create Search Folder From Search...</gui></guiseq>."
 msgstr ""
 
-#: C/mail-search-folders-add.page:28(gui) C/mail-filters.page:38(gui)
-msgid "Rule name"
-msgstr "Ime pravila"
-
-#: C/mail-search-folders-add.page:28(p) C/mail-filters.page:38(p)
+#: C/mail-search-folders-add.page:27(p)
+#: C/mail-filters.page:37(p)
 #, fuzzy
-msgid "Enter a name in the <placeholder-1/> field."
-msgstr "Neveljavno polje v ukazu"
-
-#: C/mail-search-folders-add.page:29(p) C/mail-filters.page:39(p)
-msgid ""
-"Define the conditions for the rule. For each condition, you first select "
-"which part of the message will be checked and then define the comparison."
-msgstr ""
+msgid "Click <gui style=\"button\">Add</gui>."
+msgstr "Kliknite <gui style=\"button\">Dodaj</gui>."
 
-#: C/mail-search-folders-add.page:29(link)
+#: C/mail-search-folders-add.page:28(p)
+#: C/mail-filters.page:38(p)
 #, fuzzy
-msgid "Available Search Folder conditions"
-msgstr "Omogoči _iskalne mape"
+msgid "Enter a name in the <gui>Rule name</gui> field."
+msgstr "V polje <gui>Ime diska</gui> vpišite ime diska."
 
-#: C/mail-search-folders-add.page:29(p) C/mail-filters.page:39(p)
-msgid "For more information on the available conditions see <placeholder-1/>."
+#: C/mail-search-folders-add.page:29(p)
+#: C/mail-filters.page:39(p)
+msgid "Define the conditions for the rule. For each condition, you first select which part of the message will be checked and then define the comparison."
 msgstr ""
 
-#: C/mail-search-folders-add.page:30(gui) C/mail-filters.page:40(gui)
-#, fuzzy
-msgid "Find items"
-msgstr "_Poišči predmete:"
-
-#: C/mail-search-folders-add.page:30(p) C/mail-filters.page:40(p)
-msgid ""
-"If you want to define multiple conditions, define under <placeholder-1/> if "
-"any or if all conditions have to apply, and click <placeholder-2/> and "
-"repeat the previous step."
+#: C/mail-search-folders-add.page:29(p)
+msgid "For more information on the available conditions see <link xref=\"mail-search-folders-conditions\">Available Search Folder conditions</link>."
 msgstr ""
 
-#: C/mail-search-folders-add.page:31(gui)
-msgid "Search Folder Sources"
-msgstr "Viri iskalne mape"
+#: C/mail-search-folders-add.page:30(p)
+#: C/mail-filters.page:40(p)
+msgid "If you want to define multiple conditions, define under <gui>Find items</gui> if any or if all conditions have to apply, and click <gui style=\"button\">Add Condition</gui> and repeat the previous step."
+msgstr ""
 
 #: C/mail-search-folders-add.page:31(p)
-msgid ""
-"Select which folders will be used for the search folder in the section "
-"<placeholder-1/>. Options are:"
+msgid "Select which folders will be used for the search folder in the section <gui>Search Folder Sources</gui>. Options are:"
 msgstr ""
 
 #: C/mail-search-folders-add.page:33(p)
@@ -4324,9 +2890,7 @@ msgid "All local folders:"
 msgstr "Vse krajevne mape"
 
 #: C/mail-search-folders-add.page:34(p)
-msgid ""
-"Uses all local folders for the search folder source in addition to "
-"individual folders that are selected."
+msgid "Uses all local folders for the search folder source in addition to individual folders that are selected."
 msgstr ""
 
 #: C/mail-search-folders-add.page:36(p)
@@ -4335,11 +2899,7 @@ msgid "All active remote folders:"
 msgstr "Vse dejavne oddaljene mape"
 
 #: C/mail-search-folders-add.page:37(p)
-msgid ""
-"Remote folders are considered active if you are connected to the server; you "
-"must be connected to your mail server for the search folder to include any "
-"messages from that source in addition to individual folders that are "
-"selected."
+msgid "Remote folders are considered active if you are connected to the server; you must be connected to your mail server for the search folder to include any messages from that source in addition to individual folders that are selected."
 msgstr ""
 
 #: C/mail-search-folders-add.page:39(p)
@@ -4348,9 +2908,7 @@ msgid "All local and active remote folders:"
 msgstr "Vse krajeve in dejavne oddaljene mape"
 
 #: C/mail-search-folders-add.page:40(p)
-msgid ""
-"Uses all local and active remote folders for the search folder source in "
-"addition to individual folders that are selected."
+msgid "Uses all local and active remote folders for the search folder source in addition to individual folders that are selected."
 msgstr ""
 
 #: C/mail-search-folders-add.page:42(p)
@@ -4359,37 +2917,23 @@ msgid "Specific folders only:"
 msgstr "Pokaži sam_o mape"
 
 #: C/mail-search-folders-add.page:43(p)
-msgid ""
-"Uses individual folders for the search folder source. In this case, click "
-"the <placeholder-1/> to select folders."
+msgid "Uses individual folders for the search folder source. In this case, click the <gui style=\"button\">Add</gui> to select folders."
 msgstr ""
 
 #: C/mail-refresh-folders.page:5(desc)
-#, fuzzy
 msgid "Ways to update your Evolution folders."
-msgstr "Upravljanje z vstavki programa Evolution."
+msgstr ""
 
 #: C/mail-refresh-folders.page:20(title)
 msgid "Updating/refreshing the folders on the mail server"
 msgstr ""
 
 #: C/mail-refresh-folders.page:22(p)
-msgid ""
-"To make sure that your local email folders are updated, go to "
-"<guiseq><placeholder-1/><placeholder-2/></guiseq>. This will ensure that all "
-"of your emails have been downloaded from the mail server onto your computer "
-"so that you can read them all, and that the read status is synced with the "
-"mail server."
+msgid "To make sure that your local email folders are updated, go to <guiseq><gui>Folder</gui><gui>Refresh</gui></guiseq>. This will ensure that all of your emails have been downloaded from the mail server onto your computer so that you can read them all, and that the read status is synced with the mail server."
 msgstr ""
 
-#: C/mail-refresh-folders.page:24(key)
-msgid "F5"
-msgstr "F5"
-
 #: C/mail-refresh-folders.page:24(p)
-msgid ""
-"You can also double-click on the folder name to refresh it, or press "
-"<placeholder-1/>."
+msgid "You can also double-click on the folder name to refresh it, or press <key>F5</key>."
 msgstr ""
 
 #: C/mail-recognized-thread-related-headers.page:5(desc)
@@ -4401,28 +2945,22 @@ msgid "Thread related headers recognized by Evolution"
 msgstr ""
 
 #: C/mail-recognized-thread-related-headers.page:22(p)
+#, fuzzy
 msgid "Evolution supports the following headers:"
-msgstr ""
+msgstr "<app>Evince</app> podpira naslednje vrste datotek:"
 
 #: C/mail-recognized-thread-related-headers.page:24(p)
 #, fuzzy
 msgid "References"
-msgstr "_Nastavitve"
+msgstr "Navezave"
 
 #: C/mail-recognized-thread-related-headers.page:25(p)
 #, fuzzy
 msgid "In-Reply-To"
-msgstr "Odgovori-na"
-
-#: C/mail-recognized-thread-related-headers.page:29(gui)
-#, fuzzy
-msgid "Thread-*"
-msgstr "Naslednja ni_t"
+msgstr "_Odgovori avtorju v pošti"
 
 #: C/mail-recognized-thread-related-headers.page:29(p)
-msgid ""
-"<placeholder-1/> headers are Microsoft's proprietary headers and not "
-"supported."
+msgid "<gui>Thread-*</gui> headers are Microsoft's proprietary headers and not supported."
 msgstr ""
 
 #: C/mail-receiving-options-usenet-news.page:5(desc)
@@ -4432,36 +2970,21 @@ msgstr ""
 #: C/mail-receiving-options-usenet-news.page:23(title)
 #, fuzzy
 msgid "Usenet news receiving options"
-msgstr "Naprej - Možnosti prejemanja"
+msgstr "Branje novic iz Usenet"
 
-#. TODO: Fix after https://bugzilla.gnome.org/show_bug.cgi?id=655629 is fixed - Calling this file a "Path" is just plain wrong.
 #: C/mail-receiving-options-usenet-news.page:25(p)
-#: C/mail-receiving-options-usenet-news.page:34(p)
 #: C/mail-receiving-options-unix-mbox-spool-file.page:22(p)
-#: C/mail-receiving-options-unix-mbox-spool-file.page:27(p)
 #: C/mail-receiving-options-unix-mbox-spool-directory.page:22(p)
-#: C/mail-receiving-options-unix-mbox-spool-directory.page:26(p)
 #: C/mail-receiving-options-pop.page:29(p)
-#: C/mail-receiving-options-pop.page:39(p)
 #: C/mail-receiving-options-novell-groupwise.page:26(p)
-#: C/mail-receiving-options-novell-groupwise.page:35(p)
 #: C/mail-receiving-options-mh-format-directories.page:22(p)
-#: C/mail-receiving-options-mh-format-directories.page:26(p)
 #: C/mail-receiving-options-maildir-format-directories.page:22(p)
-#: C/mail-receiving-options-maildir-format-directories.page:26(p)
 #: C/mail-receiving-options-local-delivery.page:22(p)
-#: C/mail-receiving-options-local-delivery.page:27(p)
 #: C/mail-receiving-options-imap-plus.page:25(p)
-#: C/mail-receiving-options-imap-plus.page:34(p)
 #: C/mail-receiving-options-imap.page:25(p)
-#: C/mail-receiving-options-imap.page:34(p)
 #: C/mail-receiving-options-exchange-mapi.page:22(p)
-#: C/mail-receiving-options-exchange-mapi.page:33(p)
 #: C/mail-receiving-options-evolution-exchange.page:25(p)
-#: C/mail-receiving-options-evolution-exchange.page:36(p)
-msgid ""
-"On the <placeholder-1/> page (accessible via <guiseq><placeholder-2/"
-"><placeholder-3/><placeholder-4/><placeholder-5/><placeholder-6/></guiseq>):"
+msgid "On the <gui>Receiving Email</gui> page (accessible via <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Mail Accounts</gui><gui style=\"button\">Edit</gui><gui>Receiving Email</gui></guiseq>):"
 msgstr ""
 
 #: C/mail-receiving-options-usenet-news.page:27(p)
@@ -4470,9 +2993,7 @@ msgstr ""
 #: C/mail-receiving-options-imap-plus.page:27(p)
 #: C/mail-receiving-options-imap.page:27(p)
 #: C/mail-receiving-options-exchange-mapi.page:25(p)
-msgid ""
-"Enter the address of the email server in the <placeholder-1/> field and "
-"enter your username for that server."
+msgid "Enter the address of the email server in the <gui>Server</gui> field and enter your username for that server."
 msgstr ""
 
 #: C/mail-receiving-options-usenet-news.page:28(p)
@@ -4499,12 +3020,7 @@ msgstr ""
 #: C/mail-receiving-options-imap.page:30(p)
 #: C/mail-receiving-options-exchange-mapi.page:28(p)
 #: C/mail-receiving-options-evolution-exchange.page:32(p)
-msgid ""
-"Select your authentication type in the Authentication list, or click "
-"<placeholder-1/> to have Evolution check for supported authentication "
-"mechanisms. Some servers do not announce the authentication mechanisms they "
-"support, so clicking this button is not a guarantee that available "
-"mechanisms actually work."
+msgid "Select your authentication type in the Authentication list, or click <gui style=\"button\">Check for Supported Types</gui> to have Evolution check for supported authentication mechanisms. Some servers do not announce the authentication mechanisms they support, so clicking this button is not a guarantee that available mechanisms actually work."
 msgstr ""
 
 #: C/mail-receiving-options-usenet-news.page:31(p)
@@ -4515,6 +3031,22 @@ msgstr ""
 msgid "Select if you want Evolution to remember your password."
 msgstr ""
 
+#. TODO: Fix after https://bugzilla.gnome.org/show_bug.cgi?id=655629 is fixed - Calling this file a "Path" is just plain wrong.
+#: C/mail-receiving-options-usenet-news.page:34(p)
+#: C/mail-receiving-options-unix-mbox-spool-file.page:27(p)
+#: C/mail-receiving-options-unix-mbox-spool-directory.page:26(p)
+#: C/mail-receiving-options-pop.page:39(p)
+#: C/mail-receiving-options-novell-groupwise.page:35(p)
+#: C/mail-receiving-options-mh-format-directories.page:26(p)
+#: C/mail-receiving-options-maildir-format-directories.page:26(p)
+#: C/mail-receiving-options-local-delivery.page:27(p)
+#: C/mail-receiving-options-imap-plus.page:34(p)
+#: C/mail-receiving-options-imap.page:34(p)
+#: C/mail-receiving-options-exchange-mapi.page:33(p)
+#: C/mail-receiving-options-evolution-exchange.page:36(p)
+msgid "On the <gui>Receiving Options</gui> page (accessible via <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Mail Accounts</gui><gui style=\"button\">Edit</gui><gui>Receiving Options</gui></guiseq>):"
+msgstr ""
+
 #: C/mail-receiving-options-usenet-news.page:36(p)
 #: C/mail-receiving-options-unix-mbox-spool-file.page:29(p)
 #: C/mail-receiving-options-pop.page:41(p)
@@ -4526,9 +3058,7 @@ msgstr ""
 #: C/mail-receiving-options-imap.page:37(p)
 #: C/mail-receiving-options-exchange-mapi.page:35(p)
 #: C/mail-receiving-options-evolution-exchange.page:38(p)
-msgid ""
-"If you want Evolution to check automatically for new messages, click the "
-"<placeholder-1/> option and select the frequency in minutes."
+msgid "If you want Evolution to check automatically for new messages, click the <gui>Check for new messages every ... minutes</gui> option and select the frequency in minutes."
 msgstr ""
 
 #: C/mail-receiving-options-usenet-news.page:37(p)
@@ -4539,20 +3069,28 @@ msgstr ""
 msgid "For example, comp.os.linux would appear as c.o.linux."
 msgstr ""
 
-#: C/mail-receiving-options-usenet-news.page:39(link)
-#, fuzzy
-msgid "subscriptions window"
-msgstr "Širina okna \"Naročnine map\""
-
 #: C/mail-receiving-options-usenet-news.page:39(p)
-msgid ""
-"Select if you want to show relative folder names in the <placeholder-1/>."
+msgid "Select if you want to show relative folder names in the <link xref=\"mail-imap-subscriptions\">subscriptions window</link>."
 msgstr ""
 
 #: C/mail-receiving-options-usenet-news.page:40(p)
-msgid ""
-"If you select to show relative folder names, only the name of the folder is "
-"displayed. For example the folder evolution.mail would appear as evolution."
+msgid "If you select to show relative folder names, only the name of the folder is displayed. For example the folder evolution.mail would appear as evolution."
+msgstr ""
+
+#. TODO:XINCLUDE: Maybe later replace this "go back" workaround by doing some content sharing with xinclude and xpointer in intro-first-run.page itself? <include href="foo.xml" xmlns="http://www.w3.org/2001/XInclude"/> See gnome-user-docs module for example usage.
+#: C/mail-receiving-options-usenet-news.page:43(p)
+#: C/mail-receiving-options-unix-mbox-spool-file.page:33(p)
+#: C/mail-receiving-options-unix-mbox-spool-directory.page:31(p)
+#: C/mail-receiving-options-pop.page:48(p)
+#: C/mail-receiving-options-novell-groupwise.page:43(p)
+#: C/mail-receiving-options-mh-format-directories.page:31(p)
+#: C/mail-receiving-options-maildir-format-directories.page:32(p)
+#: C/mail-receiving-options-local-delivery.page:32(p)
+#: C/mail-receiving-options-imap-plus.page:45(p)
+#: C/mail-receiving-options-imap.page:45(p)
+#: C/mail-receiving-options-exchange-mapi.page:40(p)
+#: C/mail-receiving-options-evolution-exchange.page:47(p)
+msgid "If you came to this page from the first-run wizard help page, click <link xref=\"intro-first-run#sending\">here</link> to continue with the next step."
 msgstr ""
 
 #: C/mail-receiving-options-unix-mbox-spool-file.page:5(desc)
@@ -4564,55 +3102,15 @@ msgstr ""
 msgid "Standard Unix mbox spool file receiving options"
 msgstr "Običajni Unixov mbox spool ali mapa"
 
-#: C/mail-receiving-options-unix-mbox-spool-file.page:24(gui)
-#: C/mail-receiving-options-unix-mbox-spool-directory.page:24(gui)
-#: C/mail-receiving-options-mh-format-directories.page:24(gui)
-#: C/mail-receiving-options-maildir-format-directories.page:24(gui)
-#: C/mail-receiving-options-local-delivery.page:24(gui)
-#, fuzzy
-msgid "Path"
-msgstr "_Pot:"
-
-#: C/mail-receiving-options-unix-mbox-spool-file.page:24(gui)
-#: C/mail-receiving-options-unix-mbox-spool-directory.page:24(gui)
-#: C/mail-receiving-options-mh-format-directories.page:24(gui)
-#: C/mail-receiving-options-maildir-format-directories.page:24(gui)
-#: C/mail-receiving-options-local-delivery.page:24(gui)
-#: C/mail-received-notification.page:27(gui)
-#: C/mail-composer-message-templates.page:79(gui)
-#: C/mail-composer-custom-header-lines.page:33(gui)
-#: C/mail-attachments-sending.page:48(gui)
-msgid "Configuration"
-msgstr "Nastavitve"
-
 #: C/mail-receiving-options-unix-mbox-spool-file.page:24(p)
 #: C/mail-receiving-options-local-delivery.page:24(p)
-msgid ""
-"Choose the file by clicking on the button next to <placeholder-1/> in the "
-"<placeholder-2/> section. This will open a file chooser window."
-msgstr ""
-
-#: C/mail-receiving-options-unix-mbox-spool-file.page:30(link)
-#: C/mail-receiving-options-unix-mbox-spool-directory.page:28(link)
-#: C/mail-receiving-options-maildir-format-directories.page:29(link)
-#, fuzzy
-msgid "Filters"
-msgstr "filter"
-
-#: C/mail-receiving-options-unix-mbox-spool-file.page:30(gui)
-#: C/mail-receiving-options-unix-mbox-spool-directory.page:28(gui)
-#: C/mail-receiving-options-maildir-format-directories.page:29(gui)
-#, fuzzy
-msgid "Apply filters to new messages in INBOX"
+msgid "Choose the file by clicking on the button next to <gui>Path</gui> in the <gui>Configuration</gui> section. This will open a file chooser window."
 msgstr ""
-"Uvelj_avi filtre na novih sporočilih v mapi dohodne pošta na tem strežniku"
 
 #: C/mail-receiving-options-unix-mbox-spool-file.page:30(p)
 #: C/mail-receiving-options-unix-mbox-spool-directory.page:28(p)
 #: C/mail-receiving-options-maildir-format-directories.page:29(p)
-msgid ""
-"If you want <placeholder-1/> to be automatically used for new messages in "
-"your inbox, enable <placeholder-2/>."
+msgid "If you want <link xref=\"mail-filters\">Filters</link> to be automatically used for new messages in your inbox, enable <gui>Apply filters to new messages in INBOX</gui>."
 msgstr ""
 
 #: C/mail-receiving-options-unix-mbox-spool-directory.page:5(desc)
@@ -4625,61 +3123,28 @@ msgstr "Običajni Unixov mbox spool ali mapa"
 msgid "Standard Unix mbox spool directory receiving options"
 msgstr "Običajni Unixov mbox spool ali mapa"
 
-#: C/mail-receiving-options-unix-mbox-spool-directory.page:24(gui)
-#: C/mail-receiving-options-mh-format-directories.page:24(gui)
-#: C/mail-receiving-options-maildir-format-directories.page:24(gui)
-msgid "Other..."
-msgstr "Drugo ..."
-
 #: C/mail-receiving-options-unix-mbox-spool-directory.page:24(p)
 #: C/mail-receiving-options-mh-format-directories.page:24(p)
 #: C/mail-receiving-options-maildir-format-directories.page:24(p)
-msgid ""
-"Choose the directory by clicking on the button next to <placeholder-1/> in "
-"the <placeholder-2/> section. Some default folders are available in the "
-"list. If the directory is not among those folders, choose the last option "
-"<placeholder-3/>. This will open a directory chooser window."
+msgid "Choose the directory by clicking on the button next to <gui>Path</gui> in the <gui>Configuration</gui> section. Some default folders are available in the list. If the directory is not among those folders, choose the last option <gui>Other...</gui>. This will open a directory chooser window."
 msgstr ""
 
 #: C/mail-receiving-options-pop.page:5(desc)
 #, fuzzy
 msgid "Receiving options for POP accounts."
-msgstr "Prejemi nove predmete za vse račune"
+msgstr "Nastavitve prejemanja:"
 
 #: C/mail-receiving-options-pop.page:27(title)
 #, fuzzy
 msgid "POP receiving options"
 msgstr "Naprej - Nastavitev prejemanja"
 
-#: C/mail-receiving-options-pop.page:43(gui)
-#: C/mail-receiving-options-novell-groupwise.page:39(gui)
-#, fuzzy
-msgid "Leave messages on server"
-msgstr "Ali naj se izbrišejo izbrana sporočila iz iskalne mape?"
-
-#: C/mail-receiving-options-pop.page:43(gui)
-#: C/mail-receiving-options-novell-groupwise.page:39(gui)
-msgid "Delete after ... days"
-msgstr ""
-
 #: C/mail-receiving-options-pop.page:43(p)
-#: C/mail-receiving-options-novell-groupwise.page:39(p)
-msgid ""
-"If you want the messages to remain on the server for a period of time, click "
-"the <placeholder-1/> option and the <placeholder-2/> option and select the "
-"number of days to allow messages to remain on the server."
-msgstr ""
-
-#: C/mail-receiving-options-pop.page:45(gui)
-msgid "Disable support for all POP3 extensions"
+msgid "If you want the messages to remain on the server for a period of time, click the <gui>Leave messages on server</gui> option and the <gui>Delete after ... days</gui> option and select the number of days to allow messages to remain on the server."
 msgstr ""
 
 #: C/mail-receiving-options-pop.page:45(p)
-msgid ""
-"The option <placeholder-1/> is only useful when accessing old or "
-"misconfigured mail servers. Such POP3 extensions provide enhanced "
-"functionality, however only some servers support them. In case of problems "
-"with receiving mail, enabling this setting might help."
+msgid "The option <gui>Disable support for all POP3 extensions</gui> is only useful when accessing old or misconfigured mail servers. Such POP3 extensions provide enhanced functionality, however only some servers support them. In case of problems with receiving mail, enabling this setting might help."
 msgstr ""
 
 #: C/mail-receiving-options.page:5(desc)
@@ -4689,26 +3154,30 @@ msgstr ""
 #: C/mail-receiving-options.page:18(title)
 #, fuzzy
 msgid "Mail Receiving Options"
-msgstr "Možnosti prejemanja"
+msgstr "Naprej - Nastavitev prejemanja"
 
-#: C/mail-receiving-options.page:21(title) C/intro-first-run.page:42(title)
+#: C/mail-receiving-options.page:21(title)
+#: C/intro-first-run.page:42(title)
 #, fuzzy
 msgid "Common server types"
-msgstr "Vrsta strežnika:"
+msgstr "Prednostne vrste večpredstavnostnih datotek"
 
-#: C/mail-receiving-options.page:24(title) C/intro-first-run.page:55(title)
+#: C/mail-receiving-options.page:24(title)
+#: C/intro-first-run.page:55(title)
+#, fuzzy
 msgid "Corporate server types"
-msgstr ""
+msgstr "Prednostne vrste večpredstavnostnih datotek"
 
-#: C/mail-receiving-options.page:27(title) C/intro-first-run.page:70(title)
+#: C/mail-receiving-options.page:27(title)
+#: C/intro-first-run.page:70(title)
 #, fuzzy
 msgid "Local account server types"
-msgstr "Nastavite računa Google:"
+msgstr "Pot krajevnega uskladitvenega strežnika"
 
 #: C/mail-receiving-options-novell-groupwise.page:5(desc)
 #, fuzzy
 msgid "Receiving options for Novell Groupwise accounts."
-msgstr "Fina nastavitev računov Groupwise."
+msgstr "Ne, ustvariti želim nov račun"
 
 #: C/mail-receiving-options-novell-groupwise.page:24(title)
 #, fuzzy
@@ -4718,19 +3187,15 @@ msgstr "Za dostop do strežnikov Novell GroupWise"
 #: C/mail-receiving-options-novell-groupwise.page:30(p)
 #: C/mail-receiving-options-exchange-mapi.page:27(p)
 #: C/mail-receiving-options-evolution-exchange.page:31(p)
-msgid ""
-"If you are in an organizational environment, you may want to contact your "
-"system administrator for more information."
+msgid "If you are in an organizational environment, you may want to contact your system administrator for more information."
 msgstr ""
 
-#: C/mail-receiving-options-novell-groupwise.page:41(p)
+#: C/mail-receiving-options-novell-groupwise.page:39(p)
 msgid "Enter the Post Office Agent SOAP port."
 msgstr ""
 
-#: C/mail-receiving-options-novell-groupwise.page:42(p)
-msgid ""
-"If you are unsure what your Post Office Agent SOAP port is, contact your "
-"system administrator."
+#: C/mail-receiving-options-novell-groupwise.page:40(p)
+msgid "If you are unsure what your Post Office Agent SOAP port is, contact your system administrator."
 msgstr ""
 
 #: C/mail-receiving-options-mh-format-directories.page:5(desc)
@@ -4752,69 +3217,51 @@ msgid "Maildir-format mail directories receiving options"
 msgstr "Poštne mape vrste maildir"
 
 #: C/mail-receiving-options-local-delivery.page:5(desc)
-#, fuzzy
 msgid "Receiving options for Local delivery accounts."
-msgstr "Prejemi nove predmete za vse račune"
+msgstr ""
 
 #: C/mail-receiving-options-local-delivery.page:20(title)
 #, fuzzy
 msgid "Local delivery receiving options"
-msgstr "Nazaj - Možnosti prejemanja"
+msgstr "Možnosti krajevne in oddaljene shrambe"
 
 #: C/mail-receiving-options-imap-plus.page:5(desc)
-#, fuzzy
 msgid "Receiving options for IMAP+ accounts."
-msgstr "Fina nastavitev vaših računov IMAP."
+msgstr ""
 
 #: C/mail-receiving-options-imap-plus.page:23(title)
 #, fuzzy
 msgid "IMAP+ receiving options"
 msgstr "Naprej - Nastavitev prejemanja"
 
-#: C/mail-receiving-options-imap-plus.page:37(link)
-msgid "IMAP4 Extensions for Quick Mailbox Resynchronization"
-msgstr ""
-
 #: C/mail-receiving-options-imap-plus.page:37(p)
-msgid ""
-"Select \"Use Quick Resync\" if the IMAP server supports <placeholder-1/>."
+msgid "Select \"Use Quick Resync\" if the IMAP server supports <link href=\"http://tools.ietf.org/html/rfc5162\">IMAP4 Extensions for Quick Mailbox Resynchronization</link>."
 msgstr ""
 
 #: C/mail-receiving-options-imap-plus.page:38(p)
 #: C/mail-receiving-options-imap.page:38(p)
-msgid ""
-"You can also define if Evolution checks for new messages in all folders, or "
-"only in subscribed folders."
+msgid "You can also define if Evolution checks for new messages in all folders, or only in subscribed folders."
 msgstr ""
 
 #: C/mail-receiving-options-imap-plus.page:39(p)
 #: C/mail-receiving-options-imap.page:39(p)
-msgid ""
-"Select if you want Evolution to use custom commands to connect to the IMAP "
-"server."
+msgid "Select if you want Evolution to use custom commands to connect to the IMAP server."
 msgstr ""
 
-#: C/mail-receiving-options-imap-plus.page:40(link)
-#: C/mail-receiving-options-imap.page:40(link)
-#, fuzzy
-msgid "subscribed folders"
-msgstr "Prekliči naročnino na mape"
-
 #: C/mail-receiving-options-imap-plus.page:40(p)
 #: C/mail-receiving-options-imap.page:40(p)
-msgid "Select if you want Evolution to show only <placeholder-1/>."
+msgid "Select if you want Evolution to show only <link xref=\"mail-imap-subscriptions\">subscribed folders</link>."
 msgstr ""
 
 #: C/mail-receiving-options-imap-plus.page:41(p)
 #: C/mail-receiving-options-imap.page:41(p)
-msgid ""
-"Select if you want Evolution to override server-supplied folder namespaces."
+msgid "Select if you want Evolution to override server-supplied folder namespaces."
 msgstr ""
 
 #: C/mail-receiving-options-imap.page:5(desc)
 #, fuzzy
 msgid "Receiving options for IMAP accounts."
-msgstr "Fina nastavitev vaših računov IMAP."
+msgstr "Naprej - Pregled računa"
 
 #: C/mail-receiving-options-imap.page:23(title)
 #, fuzzy
@@ -4824,7 +3271,7 @@ msgstr "Naprej - Nastavitev prejemanja"
 #: C/mail-receiving-options-exchange-mapi.page:5(desc)
 #, fuzzy
 msgid "Receiving options for Exchange MAPI accounts."
-msgstr "Upravljaj nastavitve pooblaščenca za račun Exchange"
+msgstr "Exchange račun za %s na %s"
 
 #: C/mail-receiving-options-exchange-mapi.page:20(title)
 #, fuzzy
@@ -4832,26 +3279,19 @@ msgid "Exchange MAPI receiving options"
 msgstr "Exchange MAPI storitev za %s na %s"
 
 #: C/mail-receiving-options-exchange-mapi.page:26(p)
-msgid "Enter the Domain name for that server."
-msgstr ""
-
-#: C/mail-receiving-options-exchange-mapi.page:30(gui)
-#: C/mail-receiving-options-evolution-exchange.page:33(gui)
 #, fuzzy
-msgid "Authenticate"
-msgstr "Overi"
+msgid "Enter the Domain name for that server."
+msgstr "Vpisati morate ime strežnika."
 
 #: C/mail-receiving-options-exchange-mapi.page:30(p)
 #: C/mail-receiving-options-evolution-exchange.page:33(p)
-#, fuzzy
-msgid "Click <placeholder-1/> and enter your password."
-msgstr "Vnesite svoje geslo."
+msgid "Click <gui style=\"button\">Authenticate</gui> and enter your password."
+msgstr ""
 
 #: C/mail-receiving-options-exchange-mapi.page:37(p)
 #: C/mail-receiving-options-evolution-exchange.page:40(p)
 #, fuzzy
-msgid ""
-"You can also define if Evolution checks for new messages in all folders."
+msgid "You can also define if Evolution checks for new messages in all folders."
 msgstr "Preveri za _nova sporočila v vseh mapah"
 
 #: C/mail-receiving-options-evolution-exchange.page:5(desc)
@@ -4862,54 +3302,48 @@ msgstr "Nastavitev Evolution Connector za Microsoft Exchange"
 #: C/mail-receiving-options-evolution-exchange.page:23(title)
 #, fuzzy
 msgid "Evolution Exchange receiving options"
-msgstr "Nastavitev Evolution Connector za Microsoft Exchange"
+msgstr "Vključi Evolution-Exchange razširitveni paket."
 
 #: C/mail-receiving-options-evolution-exchange.page:28(p)
 #, fuzzy
 msgid "Enter your username for that server."
-msgstr "Vnesite vaše geslo v polje <b>Novo geslo</b>."
+msgstr ""
+"Vnesite svoje uporabniško ime in geslo za:\n"
+" '%s'"
 
 #: C/mail-receiving-options-evolution-exchange.page:29(p)
 msgid "Enter the OWA URL for that server."
 msgstr ""
 
 #: C/mail-receiving-options-evolution-exchange.page:30(p)
-msgid ""
-"Select if the mailbox name is different from the username. If it is, enter "
-"the mailbox name."
+msgid "Select if the mailbox name is different from the username. If it is, enter the mailbox name."
 msgstr ""
 
-#: C/mail-receiving-options-evolution-exchange.page:42(gui)
-#, fuzzy
-msgid "Global Address List/Active Directory"
-msgstr "Splošni seznam naslovov"
-
 #: C/mail-receiving-options-evolution-exchange.page:42(p)
-msgid ""
-"In the section <placeholder-1/>, specify the name of the Global Catalog "
-"server. The Global Catalog Server contains the user information for users."
+msgid "In the section <gui>Global Address List/Active Directory</gui>, specify the name of the Global Catalog server. The Global Catalog Server contains the user information for users."
 msgstr ""
 
 #: C/mail-receiving-options-evolution-exchange.page:43(p)
-msgid ""
-"Select if you want to limit the number of Global Address List (GAL) "
-"responses as this may increase speed. The GAL contains a list of all email "
-"addresses."
+msgid "Select if you want to limit the number of Global Address List (GAL) responses as this may increase speed. The GAL contains a list of all email addresses."
 msgstr ""
 
-#: C/mail-receiving-options-evolution-exchange.page:44(link)
-#: C/mail-composer-several-recipients.page:48(link)
-#, fuzzy
-msgid "contact lists"
-msgstr "Seznam stikov"
-
 #: C/mail-receiving-options-evolution-exchange.page:44(p)
-msgid ""
-"You also have to define the Authentication type, and whether you want groups "
-"of contacts in GAL to be represented in the Evolution address book by "
-"<placeholder-1/>."
+msgid "You also have to define the Authentication type, and whether you want groups of contacts in GAL to be represented in the Evolution address book by <link xref=\"contacts-using-contact-lists\">contact lists</link>."
 msgstr ""
 
+#. When image changes, this message will be marked fuzzy or untranslated for you.
+#. It doesn't matter what you translate it to: it's not used at all.
+#: C/mail-received-notification.page:23(None)
+#, fuzzy
+msgid "@@image: './figures/new-mail-switcher.png'; md5=be4dbdb5f6e3dcbd5111b87169cae268"
+msgstr "@@image: 'figures/exchng-rec-mails.png'; md5=b56dfa570c8d1c9b942c6493fd973d68"
+
+#. When image changes, this message will be marked fuzzy or untranslated for you.
+#. It doesn't matter what you translate it to: it's not used at all.
+#: C/mail-received-notification.page:28(None)
+msgid "@@image: './figures/new-mail-notification.png'; md5=25a4373da392793406910cd883f0c21c"
+msgstr "@@image: './figures/new-mail-notification.png'; md5=25a4373da392793406910cd883f0c21c"
+
 #: C/mail-received-notification.page:5(desc)
 msgid "Options on notifications of newly received mail."
 msgstr ""
@@ -4917,18 +3351,10 @@ msgstr ""
 #: C/mail-received-notification.page:20(title)
 #, fuzzy
 msgid "Getting notified of new mail"
-msgstr "Preverjanje za novo pošto"
-
-#: C/mail-received-notification.page:22(link)
-#: C/intro-main-window.page:125(gui)
-#, fuzzy
-msgid "switcher"
-msgstr "Preklopnik"
+msgstr "Zvok nove zvočne pošte"
 
 #: C/mail-received-notification.page:22(p)
-msgid ""
-"Evolution always notifies you of new messages by adding a yellow star to the "
-"mailer icon in the window <placeholder-1/>."
+msgid "Evolution always notifies you of new messages by adding a yellow star to the mailer icon in the window <link xref=\"change-switcher-appearance.page\">switcher</link>."
 msgstr ""
 
 #: C/mail-received-notification.page:24(p)
@@ -4937,96 +3363,34 @@ msgstr ""
 msgid "Switcher layout when a new message has arrived"
 msgstr "Ob prejemu novega sporočila predvajaj zvok."
 
-#: C/mail-received-notification.page:27(gui)
-msgid "Mail Notification"
-msgstr "Obvestilo o novi pošti"
-
 #: C/mail-received-notification.page:27(p)
-msgid ""
-"In order to get also notified of new messages in the GNOME Notification area "
-"at the bottom of the screen, make sure that <guiseq><placeholder-1/"
-"><placeholder-2/><placeholder-3/></guiseq> is enabled and that you have set "
-"your prefered options in the <placeholder-4/> tab."
+msgid "In order to get also notified of new messages in the GNOME Notification area at the bottom of the screen, make sure that <guiseq><gui>Edit</gui><gui>Plugins</gui><gui>Mail Notification</gui></guiseq> is enabled and that you have set your preferred options in the <gui>Configuration</gui> tab."
 msgstr ""
 
 #: C/mail-read-receipts.page:5(desc)
-#, fuzzy
 msgid "How to enable requesting read receipts."
-msgstr "Vedno zahtevaj povratnico branja"
+msgstr ""
 
 #: C/mail-read-receipts.page:33(title)
 #, fuzzy
 msgid "Read receipts for emails"
-msgstr "Zahtevana je povratnica branja."
+msgstr "Barva grafikona za branje z diska"
 
 #: C/mail-read-receipts.page:35(p)
-msgid ""
-"Read receipts are a way for people to acknowledge that they have received "
-"your email. The recipient can normally choose whether to acknowledge the "
-"receipt or not, so they are not a completely reliable way of checking if "
-"your emails have been received by someone."
-msgstr ""
-
-#: C/mail-read-receipts.page:37(gui) C/mail-filters.page:27(gui)
-#: C/mail-encryption-s-mime-signing-encrypting.page:25(gui)
-#: C/mail-encryption-gpg-signing-encrypting.page:25(gui)
-#: C/mail-composer-spellcheck.page:34(gui)
-#: C/calendar-usage-add-appointment.page:28(gui)
-#: C/calendar-usage-add-appointment.page:32(gui)
-#: C/calendar-recurrence.page:25(gui)
-#: C/calendar-meetings-sending-invitation.page:38(gui)
-#: C/calendar-meetings-sending-invitation.page:42(gui)
-#: C/calendar-free-busy.page:35(gui) C/calendar-classifications.page:26(gui)
-#: C/calendar-alarms-and-reminders.page:37(gui)
-msgid "Options"
-msgstr "Možnosti"
-
-#: C/mail-read-receipts.page:37(gui)
-#, fuzzy
-msgid "Request Read Receipt"
-msgstr "Zaht_evaj povratnico"
+msgid "Read receipts are a way for people to acknowledge that they have received your email. The recipient can normally choose whether to acknowledge the receipt or not, so they are not a completely reliable way of checking if your emails have been received by someone."
+msgstr ""
 
 #: C/mail-read-receipts.page:37(p)
-msgid ""
-"You can request read receipts by enabling this option in the email "
-"composer's menu. To do so, go to <guiseq><placeholder-1/><placeholder-2/></"
-"guiseq>."
+msgid "You can request read receipts by enabling this option in the email composer's menu. To do so, go to <guiseq><gui>Options</gui><gui>Request Read Receipt</gui></guiseq>."
 msgstr ""
 
-#: C/mail-read-receipts.page:39(gui)
-#: C/mail-error-failed-to-append-to-sent-folder.page:26(gui)
-#: C/mail-default-folder-locations.page:33(gui)
-#: C/mail-default-CC-and-BCC.page:29(gui) C/mail-cannot-see.page:41(gui)
-#: C/mail-account-manage-usenet-news.page:43(title)
-#: C/mail-account-manage-unix-mbox-spool-file.page:43(title)
-#: C/mail-account-manage-unix-mbox-spool-directory.page:43(title)
-#: C/mail-account-manage-pop.page:43(title)
-#: C/mail-account-manage-novell-groupwise.page:40(title)
-#: C/mail-account-manage-microsoft-exchange-evo-mapi.page:40(title)
-#: C/mail-account-manage-microsoft-exchange-evo-exchange.page:40(title)
-#: C/mail-account-manage-mh-format-directories.page:43(title)
-#: C/mail-account-manage-maildir-format-directories.page:43(title)
-#: C/mail-account-manage-local-delivery.page:43(title)
-#: C/mail-account-manage-imap-plus.page:43(title)
-#: C/mail-account-manage-imap.page:43(title)
-msgid "Defaults"
-msgstr "Privzeto"
-
-#: C/mail-read-receipts.page:39(gui)
-msgid "Message Receipts"
-msgstr "Prejemniki sporočila"
-
 #: C/mail-read-receipts.page:39(p)
-msgid ""
-"For read receipts that you receive you can define Evolution's behavior by "
-"going to <guiseq><placeholder-1/><placeholder-2/><placeholder-3/"
-"><placeholder-4/><placeholder-5/><placeholder-6/></guiseq>."
+msgid "For read receipts that you receive you can define Evolution's behavior by going to <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Mail Accounts</gui><gui style=\"button\">Edit</gui><gui>Defaults</gui><gui>Message Receipts</gui></guiseq>."
 msgstr ""
 
 #: C/mail-reading-keyboard-shortcuts.page:5(desc)
-#, fuzzy
 msgid "Keyboard shortcuts that can save you some time when reading mail."
-msgstr "Omogoči način kazalke, pri katerem je med branjem pošte viden kazalec."
+msgstr ""
 
 #: C/mail-reading-keyboard-shortcuts.page:24(title)
 msgid "Using shortcut keys to read mail"
@@ -5035,36 +3399,19 @@ msgstr ""
 #: C/mail-reading-keyboard-shortcuts.page:27(title)
 #, fuzzy
 msgid "Viewing an email"
-msgstr "Pošlji elektronsko pošto"
+msgstr "Nova sporočila"
 
 #: C/mail-reading-keyboard-shortcuts.page:28(p)
-msgid ""
-"In the Mail window you read a message by selecting it in the message list. "
-"If you would like to see the message in its own window, either double-click "
-"it, press <placeholder-1/>, or press <keyseq><placeholder-2/><placeholder-3/"
-"></keyseq>."
+msgid "In the Mail window you read a message by selecting it in the message list. If you would like to see the message in its own window, either double-click it, press <key>Enter</key>, or press <keyseq><key>Ctrl</key><key>O</key></keyseq>."
 msgstr ""
 
 #: C/mail-reading-keyboard-shortcuts.page:32(title)
 #, fuzzy
 msgid "Navigating in a message"
-msgstr "Oblikovanje sporočila"
-
-#: C/mail-reading-keyboard-shortcuts.page:33(key)
-#: C/mail-reading-keyboard-shortcuts.page:49(key)
-msgid "Spacebar"
-msgstr ""
-
-#: C/mail-reading-keyboard-shortcuts.page:33(key)
-#, fuzzy
-msgid "Backspace"
-msgstr "_Varnostna kopija"
+msgstr "_Najdi v sporočilu ..."
 
 #: C/mail-reading-keyboard-shortcuts.page:33(p)
-msgid ""
-"To read mail with the keyboard, you can click the <placeholder-1/> to page "
-"down and press <placeholder-2/> to page up while reading an email. Ensure "
-"that you use the keys when the message list is focused."
+msgid "To read mail with the keyboard, you can click the <key>Spacebar</key> to page down and press <key>Backspace</key> to page up while reading an email. Ensure that you use the keys when the message list is focused."
 msgstr ""
 
 #: C/mail-reading-keyboard-shortcuts.page:37(title)
@@ -5080,39 +3427,8 @@ msgstr ""
 msgid "Navigating in a folder's unread mail in the message list"
 msgstr ""
 
-#: C/mail-reading-keyboard-shortcuts.page:43(key)
-msgid "."
-msgstr "."
-
-#: C/mail-reading-keyboard-shortcuts.page:43(key)
-msgid ","
-msgstr ","
-
-#: C/mail-reading-keyboard-shortcuts.page:43(key)
-msgid "&gt;"
-msgstr "&gt;"
-
-#: C/mail-reading-keyboard-shortcuts.page:43(key)
-msgid "&lt;"
-msgstr "&lt;"
-
-#: C/mail-reading-keyboard-shortcuts.page:43(key)
-msgid "]"
-msgstr "]"
-
-#: C/mail-reading-keyboard-shortcuts.page:43(key)
-msgid "["
-msgstr "["
-
 #: C/mail-reading-keyboard-shortcuts.page:43(p)
-msgid ""
-"To go to the next or previous unread messages, press the period "
-"(<placeholder-1/>) or comma (<placeholder-2/>) keys. On some keyboards, "
-"these keys are also marked with the <placeholder-3/> and <placeholder-4/> "
-"symbols, which is a convenient way to remember that they move you forward "
-"and backward in your message list. You can also use the right square bracket "
-"(<placeholder-5/>) for the next unread message, and the left square bracket "
-"(<placeholder-6/>) for the previous unread message."
+msgid "To go to the next or previous unread messages, press the period (<key>.</key>) or comma (<key>,</key>) keys. On some keyboards, these keys are also marked with the <key>&gt;</key> and <key>&lt;</key> symbols, which is a convenient way to remember that they move you forward and backward in your message list. You can also use the right square bracket (<key>]</key>) for the next unread message, and the left square bracket (<key>[</key>) for the previous unread message."
 msgstr ""
 
 #: C/mail-reading-keyboard-shortcuts.page:47(title)
@@ -5120,50 +3436,31 @@ msgid "Navigating in unread mail across folders"
 msgstr ""
 
 #: C/mail-reading-keyboard-shortcuts.page:49(p)
-msgid ""
-"You can easily read the unread messages in all the mail folders by using the "
-"<placeholder-1/>."
+msgid "You can easily read the unread messages in all the mail folders by using the <key>Spacebar</key>."
 msgstr ""
 
 #: C/mail-reading-keyboard-shortcuts.page:51(p)
-msgid ""
-"When you are in the Mail window, the Spacebar has the following behavior:"
+msgid "When you are in the Mail window, the Spacebar has the following behavior:"
 msgstr ""
 
 #: C/mail-reading-keyboard-shortcuts.page:53(p)
-msgid ""
-"When you press the Spacebar for the first time, it takes you to the next "
-"unread message."
+msgid "When you press the Spacebar for the first time, it takes you to the next unread message."
 msgstr ""
 
-#: C/mail-reading-keyboard-shortcuts.page:54(key)
-#, fuzzy
-msgid "Page Down"
-msgstr "Stran %d"
-
 #: C/mail-reading-keyboard-shortcuts.page:54(p)
-msgid ""
-"If the message is more than one screen long, the Spacebar works as "
-"<placeholder-1/>."
+msgid "If the message is more than one screen long, the Spacebar works as <key>Page Down</key>."
 msgstr ""
 
 #: C/mail-reading-keyboard-shortcuts.page:55(p)
-msgid ""
-"If you press the Spacebar after you reach the bottom of the page, it takes "
-"you to the next unread message."
+msgid "If you press the Spacebar after you reach the bottom of the page, it takes you to the next unread message."
 msgstr ""
 
 #: C/mail-reading-keyboard-shortcuts.page:56(p)
-msgid ""
-"If there are no more unread messages in the mailbox, pressing the Spacebar "
-"takes you to the next unread message in the next folder."
+msgid "If there are no more unread messages in the mailbox, pressing the Spacebar takes you to the next unread message in the next folder."
 msgstr ""
 
 #: C/mail-reading-keyboard-shortcuts.page:57(p)
-msgid ""
-"If new messages arrive in a number of folders, the Spacebar toggles between "
-"those folders. This feature allows you to switch to the next unread message "
-"in a different folder without clicking the folder."
+msgid "If new messages arrive in a number of folders, the Spacebar toggles between those folders. This feature allows you to switch to the next unread message in a different folder without clicking the folder."
 msgstr ""
 
 #: C/mail-organizing.page:5(desc)
@@ -5173,17 +3470,15 @@ msgstr ""
 #: C/mail-organizing.page:21(title)
 #, fuzzy
 msgid "Sorting and organizing mail"
-msgstr "Pošiljanje in sprejemanje elektronske pošte"
+msgstr "Koledar in pošta Evolution"
 
 #: C/mail-organizing.page:24(title)
 #, fuzzy
 msgid "Advanced Options"
-msgstr "Napredne možnosti pošiljanja"
+msgstr "Napredne možnosti"
 
 #: C/mail-organizing.page:27(p)
-msgid ""
-"Evolution provides several options to organize your mail according to your "
-"needs."
+msgid "Evolution provides several options to organize your mail according to your needs."
 msgstr ""
 
 #: C/mail-not-sent.page:5(desc)
@@ -5193,42 +3488,22 @@ msgstr ""
 #: C/mail-not-sent.page:20(title)
 #, fuzzy
 msgid "Mail is not sent"
-msgstr "ni nastavljeno"
+msgstr "Ni mogoče izvršiti %s: pošta ni bila poslana."
 
 #: C/mail-not-sent.page:22(p)
 msgid "There can be several reasons why emails are not sent:"
 msgstr ""
 
 #: C/mail-not-sent.page:25(p)
-msgid ""
-"Invalid email address. Check if all the addresses listed as mail recipients "
-"are correct. If the message contains a wrong or invalid email address, the "
-"message will not be sent."
+msgid "Invalid email address. Check if all the addresses listed as mail recipients are correct. If the message contains a wrong or invalid email address, the message will not be sent."
 msgstr ""
 
 #: C/mail-not-sent.page:26(p)
-msgid ""
-"Incorrect SMTP settings. Verify if the settings used for outgoing messages "
-"is correct. Using the incorrect server address or authentication method may "
-"prevent emails from being sent"
+msgid "Incorrect SMTP settings. Verify if the settings used for outgoing messages is correct. Using the incorrect server address or authentication method may prevent emails from being sent"
 msgstr ""
 
-#: C/mail-not-sent.page:27(gui)
-#, fuzzy
-msgid "Send and Receive"
-msgstr "Oddaja / sprejem"
-
-#: C/mail-not-sent.page:27(gui)
-#, fuzzy
-msgid "Work online"
-msgstr "_Delo s povezavo"
-
 #: C/mail-not-sent.page:27(p)
-msgid ""
-"Offline status. Evolution may be offline. Check on the <placeholder-1/> "
-"button; if it is greyed out, then you are offline. To go online, go to "
-"<guiseq><placeholder-2/><placeholder-3/></guiseq>. You should now be able to "
-"use the <placeholder-4/> button."
+msgid "Offline status. Evolution may be offline. Check on the <gui style=\"button\">Send and Receive</gui> button; if it is greyed out, then you are offline. To go online, go to <guiseq><gui>File</gui><gui>Work online</gui></guiseq>. You should now be able to use the <gui style=\"button\">Send and Receive</gui> button."
 msgstr ""
 
 #: C/mail-moving-emails.page:5(desc)
@@ -5240,33 +3515,21 @@ msgid "Moved emails are still shown in the original folder"
 msgstr ""
 
 #: C/mail-moving-emails.page:26(p)
-msgid ""
-"IMAP has no \"move\" feature. Evolution \"moves\" messages by copying and "
-"deleting emails. Deleting means \"marking messages for deletion\" so all the "
-"original messages are retained until you Expunge the emails marked for "
-"deletion."
+msgid "IMAP has no \"move\" feature. Evolution \"moves\" messages by copying and deleting emails. Deleting means \"marking messages for deletion\" so all the original messages are retained until you Expunge the emails marked for deletion."
 msgstr ""
 
-#: C/mail-moving-emails.page:28(link)
-#, fuzzy
-msgid "deleting emails"
-msgstr "Preveri pošto"
-
 #: C/mail-moving-emails.page:28(p)
-msgid ""
-"See the topic on <placeholder-1/> for instructions on how to expunge email "
-"messages. Note that this applies to other types of accounts as well."
+msgid "See the topic on <link xref=\"mail-delete-and-undelete\">deleting emails</link> for instructions on how to expunge email messages. Note that this applies to other types of accounts as well."
 msgstr ""
 
 #: C/mail-layout-changing.page:5(desc)
-msgid ""
-"Changing the display of the mail window (message list columns and "
-"widescreen)."
+msgid "Changing the display of the mail window (message list columns and widescreen)."
 msgstr ""
 
 #: C/mail-layout-changing.page:20(title)
+#, fuzzy
 msgid "Changing the mail window layout"
-msgstr ""
+msgstr "Zaznavanje razporeda tipkovnice"
 
 #: C/mail-labels.page:5(desc)
 msgid "Use labels to categorize your mail while keeping it in their folders."
@@ -5275,89 +3538,58 @@ msgstr ""
 #: C/mail-labels.page:21(title)
 #, fuzzy
 msgid "Using Labels"
-msgstr "Oznake"
+msgstr "Pravokotne nalepke"
 
 #: C/mail-labels.page:23(p)
-msgid ""
-"You can add colored labels to emails in order to categorize them. This is "
-"similar to <placeholder-1/> in the other Evolution windows."
-msgstr ""
-
-#: C/mail-labels.page:25(link)
-msgid "quick search dropdown"
+msgid "You can add colored labels to emails in order to categorize them. This is similar to <link xref=\"using-categories\">Categories</link> in the other Evolution windows."
 msgstr ""
 
-#: C/mail-labels.page:25(link)
-#, fuzzy
-msgid "search folders"
-msgstr "Iskanje v mapi"
-
 #: C/mail-labels.page:25(p)
-msgid ""
-"You can search for messages with specific labels by using the <placeholder-1/"
-">. Also, <placeholder-2/> can be created based on labels."
+msgid "You can search for messages with specific labels by using the <link xref=\"mail-searching\">quick search dropdown</link>. Also, <link xref=\"mail-search-folders\">search folders</link> can be created based on labels."
 msgstr ""
 
 #: C/mail-labels.page:28(title)
 #, fuzzy
 msgid "Adding a label to a message"
-msgstr "Sledi stanju sporočila ..."
-
-#: C/mail-labels.page:29(gui)
-msgid "Label"
-msgstr "Oznaka"
+msgstr "Pošlji novo _sporočilo osebi ..."
 
 #: C/mail-labels.page:29(p)
-msgid ""
-"To assign a label to a message, right-click the message, click "
-"<placeholder-1/>, and choose the label to apply."
+msgid "To assign a label to a message, right-click the message, click <gui>Label</gui>, and choose the label to apply."
 msgstr ""
 
-#: C/mail-labels.page:30(gui)
-#, fuzzy
-msgid "New Label"
-msgstr "_Nova oznaka"
-
 #: C/mail-labels.page:30(p)
-msgid "You can also quickly add a new label by choosing <placeholder-1/>."
+msgid "You can also quickly add a new label by choosing <gui>New Label</gui>."
 msgstr ""
 
 #: C/mail-labels.page:34(title)
 #, fuzzy
 msgid "Managing labels"
-msgstr "Ni najdenih predmetov"
+msgstr "Pravokotne nalepke"
 
 #: C/mail-labels.page:35(p)
-msgid ""
-"You can add, edit and delete all labels under <guiseq><placeholder-1/"
-"><placeholder-2/><placeholder-3/><placeholder-4/></guiseq>. Note that you "
-"cannot remove the default labels."
+msgid "You can add, edit and delete all labels under <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Mail Preferences</gui><gui>Labels</gui></guiseq>. Note that you cannot remove the default labels."
 msgstr ""
 
 #: C/mail-imap-subscriptions.page:5(desc)
 #, fuzzy
 msgid "IMAP folder subscriptions."
-msgstr "Naročnine na mape"
+msgstr "Oddaljena mapa IMAP"
 
 #: C/mail-imap-subscriptions.page:26(title)
 #, fuzzy
 msgid "IMAP Subscriptions"
-msgstr "Upravljalnik naročanja IMAP"
-
-#: C/mail-imap-subscriptions.page:28(gui)
-msgid "IMAP Subscriptions Manager"
-msgstr "Upravljalnik naročanja IMAP"
+msgstr "Naročnine na mape"
 
 #: C/mail-imap-subscriptions.page:28(p)
-msgid ""
-"As opening many IMAP folders on the server takes time you can define which "
-"IMAP folders to check and display in Evolution, and which ones to ignore for "
-"the time being, via the <placeholder-1/>."
+msgid "As opening many IMAP folders on the server takes time you can define which IMAP folders to check and display in Evolution, and which ones to ignore for the time being, via the <gui>IMAP Subscriptions Manager</gui>."
+msgstr ""
+
+#: C/mail-imap-subscriptions.page:30(p)
+msgid "Select <guiseq><gui>Folder</gui><gui>Subscriptions</gui></guiseq>, or right-click on the top level node of an email account in the folder list and click <gui>Manage subscriptions</gui>."
 msgstr ""
 
 #: C/mail-imap-subscriptions.page:32(p)
-msgid ""
-"Evolution displays a list of files and folders available on the IMAP server."
+msgid "Evolution displays a list of files and folders available on the IMAP server."
 msgstr ""
 
 #: C/mail-imap-subscriptions.page:33(p)
@@ -5365,10 +3597,7 @@ msgid "Select a file or folder by clicking it."
 msgstr ""
 
 #: C/mail-imap-subscriptions.page:34(p)
-msgid ""
-"You should select at least the Inbox folder. Depending upon the way your "
-"IMAP server is configured, the list of available files might include non-"
-"mail folders. If it does, you can ignore them."
+msgid "You should select at least the Inbox folder. Depending upon the way your IMAP server is configured, the list of available files might include non-mail folders. If it does, you can ignore them."
 msgstr ""
 
 #: C/mail-imap-subscriptions.page:35(p)
@@ -5379,51 +3608,18 @@ msgstr ""
 msgid "Define which mail headers to download when using IMAP."
 msgstr ""
 
-#: C/mail-imap-headers.page:25(title) C/mail-imap-headers.page:27(gui)
-#: C/mail-imap-headers.page:41(gui) C/mail-account-manage-imap.page:51(title)
+#: C/mail-imap-headers.page:25(title)
+#: C/mail-account-manage-imap.page:51(title)
+#, fuzzy
 msgid "IMAP Headers"
-msgstr "Glave IMAP"
-
-#: C/mail-imap-headers.page:27(gui)
-#: C/mail-account-manage-usenet-news.page:23(title)
-#: C/mail-account-manage-usenet-news.page:54(gui)
-#: C/mail-account-manage-unix-mbox-spool-file.page:23(title)
-#: C/mail-account-manage-unix-mbox-spool-file.page:54(gui)
-#: C/mail-account-manage-unix-mbox-spool-directory.page:23(title)
-#: C/mail-account-manage-unix-mbox-spool-directory.page:54(gui)
-#: C/mail-account-manage-pop.page:23(title)
-#: C/mail-account-manage-pop.page:54(gui)
-#: C/mail-account-manage-novell-groupwise.page:24(title)
-#: C/mail-account-manage-microsoft-exchange-evo-mapi.page:23(title)
-#: C/mail-account-manage-microsoft-exchange-evo-exchange.page:23(title)
-#: C/mail-account-manage-mh-format-directories.page:23(title)
-#: C/mail-account-manage-mh-format-directories.page:54(gui)
-#: C/mail-account-manage-maildir-format-directories.page:23(title)
-#: C/mail-account-manage-maildir-format-directories.page:54(gui)
-#: C/mail-account-manage-local-delivery.page:23(title)
-#: C/mail-account-manage-local-delivery.page:54(gui)
-#: C/mail-account-manage-imap-plus.page:23(title)
-#: C/mail-account-manage-imap-plus.page:56(gui)
-#: C/mail-account-manage-imap.page:23(title)
-#: C/mail-account-manage-imap.page:58(gui)
-msgid "Account Editor"
-msgstr "Urejevalnik računov"
-
-#: C/mail-imap-headers.page:27(gui)
-msgid "IMAP Features"
-msgstr "Možnosti IMAP"
+msgstr "IMAP Glave"
 
 #: C/mail-imap-headers.page:27(p)
-msgid ""
-"The <placeholder-1/> tab is only displayed in the <placeholder-2/> if "
-"<guiseq><placeholder-3/><placeholder-4/><placeholder-5/></guiseq> is enabled."
+msgid "The <gui>IMAP Headers</gui> tab is only displayed in the <gui>Account Editor</gui> if <guiseq><gui>Edit</gui><gui>Plugins</gui><gui>IMAP Features</gui></guiseq> is enabled."
 msgstr ""
 
 #: C/mail-imap-headers.page:29(p)
-msgid ""
-"Evolution allows you for IMAP accounts to choose the headers that you want "
-"to download so that you can reduce the download time and filter or move your "
-"mail around the way you like it. The IMAP Mail header options are as follows:"
+msgid "Evolution allows you for IMAP accounts to choose the headers that you want to download so that you can reduce the download time and filter or move your mail around the way you like it. The IMAP Mail header options are as follows:"
 msgstr ""
 
 #: C/mail-imap-headers.page:31(p)
@@ -5432,50 +3628,29 @@ msgid "Fetch All Headers:"
 msgstr "_Pridobi vse glave sporočil"
 
 #: C/mail-imap-headers.page:31(p)
-msgid ""
-"All available IMAP mail headers for all the messages will be downloaded."
+msgid "All available IMAP mail headers for all the messages will be downloaded."
 msgstr ""
 
 #: C/mail-imap-headers.page:32(p)
 #, fuzzy
 msgid "Basic Headers (Fastest):"
-msgstr "Glave sporočil po meri"
+msgstr "Vse _glave sporočil"
 
 #: C/mail-imap-headers.page:32(p)
-msgid ""
-"This will include Date, From, To, CC, Subject, Preferences, In-Reply-To, "
-"Message-ID, Mime-Version, and Content-Type. If you want to just fetch and "
-"see messages without having to categorically filter messages based on your "
-"mailing lists, choose this option. This will make Evolution work faster and "
-"is generally recommended for common users."
+msgid "This will include Date, From, To, CC, Subject, Preferences, In-Reply-To, Message-ID, Mime-Version, and Content-Type. If you want to just fetch and see messages without having to categorically filter messages based on your mailing lists, choose this option. This will make Evolution work faster and is generally recommended for common users."
 msgstr ""
 
 #: C/mail-imap-headers.page:33(p)
 #, fuzzy
 msgid "Basic and Mailing List Headers (Default):"
-msgstr "Osnovne glave in glave _dopisnega seznama (Privzeto)"
+msgstr "Osnovne glave in glave seznama pošiljanja (privzeto)"
 
 #: C/mail-imap-headers.page:33(p)
-msgid ""
-"Enable this option to have filters based on mailing list headers (like list "
-"ID) so that in addition to the basic headers, the headers that correspond to "
-"mailing-lists are also fetched. Mailing list headers will have the "
-"informations such as the mailinglist-ID, owner of the mailing list, and so "
-"on with which you can create mailing list filters."
+msgid "Enable this option to have filters based on mailing list headers (like list ID) so that in addition to the basic headers, the headers that correspond to mailing-lists are also fetched. Mailing list headers will have the informations such as the mailinglist-ID, owner of the mailing list, and so on with which you can create mailing list filters."
 msgstr ""
 
-#: C/mail-imap-headers.page:33(gui)
-#, fuzzy
-msgid "Basic Headers"
-msgstr "Glave sporočil po meri"
-
 #: C/mail-imap-headers.page:33(p)
-msgid ""
-"This is the default Header preference that comes with Evolution. When this "
-"option is chosen, Evolution will download a basic set of headers (as "
-"described above) along with a set of headers that are needed for client-side "
-"filters based on mailing lists. If you do not have any filters on Evolution, "
-"it is recommended to switch to the <placeholder-1/> option."
+msgid "This is the default Header preference that comes with Evolution. When this option is chosen, Evolution will download a basic set of headers (as described above) along with a set of headers that are needed for client-side filters based on mailing lists. If you do not have any filters on Evolution, it is recommended to switch to the <gui>Basic Headers</gui> option."
 msgstr ""
 
 #: C/mail-imap-headers.page:36(p)
@@ -5487,37 +3662,31 @@ msgstr "Dodaj glavo po meri za odhajajočo pošto."
 #: C/mail-encryption-s-mime-signing-encrypting.page:28(p)
 #: C/mail-encryption-gpg-signing-encrypting.page:30(p)
 #: C/mail-encryption-gpg-set-up.page:29(p)
-msgid ""
-"Select <guiseq><placeholder-1/><placeholder-2/><placeholder-3/></guiseq>."
-msgstr ""
+#, fuzzy
+msgid "Select <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Mail Accounts</gui></guiseq>."
+msgstr "Izberite <guiseq><gui>Uredi</gui><gui>Možnosti</gui><gui>Pisave in barve</gui></guiseq>."
 
 #: C/mail-imap-headers.page:39(p)
 #, fuzzy
 msgid "Select the IMAP account."
-msgstr "Naprej - Pregled računa"
+msgstr "Izbor računa Scalix"
 
-#: C/mail-imap-headers.page:41(p) C/mail-encryption-gpg-set-up.page:31(p)
-#: C/mail-composer-message-templates.page:79(p)
-#: C/mail-composer-custom-header-lines.page:33(p)
-#: C/mail-attachments-sending.page:48(p)
+#: C/mail-imap-headers.page:40(p)
 #, fuzzy
-msgid "Click the <placeholder-1/> tab."
-msgstr "gpg <placeholder-1/>"
+msgid "Click <gui>Edit</gui>."
+msgstr "Kliknite za urejanje %s"
 
-#: C/mail-imap-headers.page:42(gui)
-msgid "Custom Headers"
-msgstr "Glave sporočil po meri"
+#: C/mail-imap-headers.page:41(p)
+#, fuzzy
+msgid "Click the <gui>IMAP Headers</gui> tab."
+msgstr "Kliknite na zavihek <guiseq><gui>Uredi</gui><gui>Možnosti</gui><gui>Vstavki</gui></guiseq>."
 
 #: C/mail-imap-headers.page:42(p)
-msgid ""
-"Optionally: If you want to define extra headers to download you can add "
-"these in the <placeholder-1/> section."
+msgid "Optionally: If you want to define extra headers to download you can add these in the <gui>Custom Headers</gui> section."
 msgstr ""
 
 #: C/mail-imap-headers.page:45(p)
-msgid ""
-"The option to define IMAP Headers is currently only available for IMAP "
-"accounts, but not for IMAP+ accounts."
+msgid "The option to define IMAP Headers is currently only available for IMAP accounts, but not for IMAP+ accounts."
 msgstr ""
 
 #: C/mail-follow-up-flag.page:5(desc)
@@ -5527,53 +3696,28 @@ msgstr ""
 #: C/mail-follow-up-flag.page:23(title)
 #, fuzzy
 msgid "Follow up flags for emails"
-msgstr "Pokaži filtre za pošto:"
+msgstr "Označi izbrana sporočila za navezavo"
 
 #: C/mail-follow-up-flag.page:25(p)
-msgid ""
-"To make sure you do not forget about a message, you can use the follow-up "
-"feature."
+msgid "To make sure you do not forget about a message, you can use the follow-up feature."
 msgstr ""
 
 #: C/mail-follow-up-flag.page:27(p)
-#, fuzzy
 msgid "Select one or more messages."
-msgstr "Izbor ene ali več datotek za odpiranje"
+msgstr "Izbor enega ali več sporočil."
 
 #: C/mail-follow-up-flag.page:28(p)
 #, fuzzy
 msgid "Right-click one of the messages."
 msgstr "Skoči desno eno celico."
 
-#: C/mail-follow-up-flag.page:29(gui)
-#, fuzzy
-msgid "Mark for Follow Up..."
-msgstr "Označi kot na_vezujoče ..."
-
 #: C/mail-follow-up-flag.page:29(p)
 #, fuzzy
-msgid "Click <placeholder-1/>"
-msgstr "gpg <placeholder-1/>"
-
-#: C/mail-follow-up-flag.page:31(gui) C/mail-follow-up-flag.page:43(gui)
-#, fuzzy
-msgid "Mark as"
-msgstr "Označi kot _neželeno"
-
-#: C/mail-follow-up-flag.page:31(gui)
-#, fuzzy
-msgid "Follow Up..."
-msgstr "Na_vezava ..."
-
-#: C/mail-follow-up-flag.page:31(key)
-msgid "G"
-msgstr "G"
+msgid "Click <gui>Mark for Follow Up...</gui>"
+msgstr "Označi izbrana sporočila za navezavo"
 
 #: C/mail-follow-up-flag.page:31(p)
-msgid ""
-"You can also do this by selecting the message(s) and clicking "
-"<guiseq><placeholder-1/><placeholder-2/><placeholder-3/></guiseq> or by "
-"pressing <keyseq><placeholder-4/><placeholder-5/><placeholder-6/></keyseq>."
+msgid "You can also do this by selecting the message(s) and clicking <guiseq><gui>Message</gui><gui>Mark as</gui><gui>Follow Up...</gui></guiseq> or by pressing <keyseq><key>Shift</key><key>Ctrl</key><key>G</key></keyseq>."
 msgstr ""
 
 #: C/mail-follow-up-flag.page:33(p)
@@ -5581,162 +3725,85 @@ msgid "A window opens to allow you to set the type of flag and the due date."
 msgstr ""
 
 #: C/mail-follow-up-flag.page:35(p)
-msgid ""
-"The flag itself is the action you want to remind yourself about, such as "
-"Call, Forward and Reply."
+msgid "The flag itself is the action you want to remind yourself about, such as Call, Forward and Reply."
 msgstr ""
 
-#: C/mail-follow-up-flag.page:37(gui)
-#, fuzzy
-msgid "Flag Completed"
-msgstr "_Zastavica je končana"
-
-#: C/mail-follow-up-flag.page:37(gui)
-#, fuzzy
-msgid "Clear Flag"
-msgstr "Po_čisti zastavico"
-
 #: C/mail-follow-up-flag.page:37(p)
-msgid ""
-"After you have added a flag, you can mark it as complete or remove it "
-"entirely by right-clicking the message and clicking either <placeholder-1/> "
-"or <placeholder-2/>."
+msgid "After you have added a flag, you can mark it as complete or remove it entirely by right-clicking the message and clicking either <gui>Flag Completed</gui> or <gui>Clear Flag</gui>."
 msgstr ""
 
 #: C/mail-follow-up-flag.page:39(p)
-msgid ""
-"When you read a flagged message, its flag status is displayed at the top, "
-"before the message headers. An overdue message might tell you \"Overdue: "
-"Call by April 07, 2012, 5:00 PM.\""
+msgid "When you read a flagged message, its flag status is displayed at the top, before the message headers. An overdue message might tell you \"Overdue: Call by April 07, 2012, 5:00 PM.\""
 msgstr ""
 
-#: C/mail-follow-up-flag.page:41(link)
-#, fuzzy
-msgid "add a Flag Status column"
-msgstr "Stanje zastavice"
-
-#: C/mail-follow-up-flag.page:41(link)
-#, fuzzy
-msgid "search folder"
-msgstr "Iskanje v mapi"
-
 #: C/mail-follow-up-flag.page:41(p)
-msgid ""
-"Flags can help you organize your work in a number of ways. For example, you "
-"might <placeholder-1/> to your message list and sort that way. Alternately, "
-"you could create a <placeholder-2/> that displays all your flagged messages, "
-"then clear the flags when you're done, so the search folder contains only "
-"messages with upcoming deadlines."
+msgid "Flags can help you organize your work in a number of ways. For example, you might <link xref=\"mail-change-columns-in-message-list\">add a Flag Status column</link> to your message list and sort that way. Alternately, you could create a <link xref=\"mail-search-folders\">search folder</link> that displays all your flagged messages, then clear the flags when you're done, so the search folder contains only messages with upcoming deadlines."
 msgstr ""
 
-#: C/mail-follow-up-flag.page:43(gui)
-#, fuzzy
-msgid "Mark as Important"
-msgstr "Označi kot p_omembno"
-
-#: C/mail-follow-up-flag.page:43(gui)
-msgid "Important"
-msgstr "Pomembno"
-
 #: C/mail-follow-up-flag.page:43(p)
-msgid ""
-"If you prefer a simpler way to remind yourself about messages, you can mark "
-"them as important by right-clicking the message, then click <placeholder-1/"
-">, or by selecting <guiseq><placeholder-2/><placeholder-3/><placeholder-4/></"
-"guiseq> from the menubar."
+msgid "If you prefer a simpler way to remind yourself about messages, you can mark them as important by right-clicking the message, then click <gui>Mark as Important</gui>, or by selecting <guiseq><gui>Message</gui><gui>Mark as</gui><gui>Important</gui></guiseq> from the menubar."
 msgstr ""
 
 #: C/mail-folders.page:5(desc)
 msgid "Use folders to organize your mail."
 msgstr ""
 
-#: C/mail-folders.page:28(title) C/intro-main-window.page:66(link)
-#, fuzzy
+#: C/mail-folders.page:28(title)
 msgid "Using Folders"
-msgstr "Omogoči iskalne mape"
+msgstr "Uporaba map"
 
 #: C/mail-folders.page:30(p)
-msgid ""
-"Evolution, like most mail systems, uses folders to store email messages. You "
-"start out with a few mail folders such as the Inbox, Outbox, and Drafts. You "
-"can, however, create more folders if required."
+msgid "Evolution, like most mail systems, uses folders to store email messages. You start out with a few mail folders such as the Inbox, Outbox, and Drafts. You can, however, create more folders if required."
 msgstr ""
 
 #: C/mail-folders.page:33(title)
-#, fuzzy
 msgid "Creating A Folder"
-msgstr "Ustvari _iskalno mapo"
+msgstr "Ustvarjanje mape"
 
 #: C/mail-folders.page:34(p)
 #, fuzzy
 msgid "To create a folder:"
-msgstr "Ni mogoče ustvariti nove mape `%s': %s"
-
-#: C/mail-folders.page:36(gui)
-#, fuzzy
-msgid "New Folder"
-msgstr "Nova mapa:"
+msgstr "Mapa za ustvarjanje popravkov:"
 
 #: C/mail-folders.page:36(p)
-msgid ""
-"Click on <placeholder-1/> and select <placeholder-2/>. You can also right-"
-"click anywhere on the folder list and select the <placeholder-3/> option."
+msgid "Click on <gui>Folder</gui> and select <gui>New</gui>. You can also right-click anywhere on the folder list and select the <gui>New Folder</gui> option."
 msgstr ""
 
 #: C/mail-folders.page:37(p)
-#, fuzzy
 msgid "Specify the name and the location of the folder."
-msgstr "Ustvari novo prazno mapo"
+msgstr "Določite ime in mesto mape."
 
-#: C/mail-folders.page:38(gui)
-#, fuzzy
-msgid "Create"
-msgstr "Ustvarjeno"
+#: C/mail-folders.page:38(p)
+msgid "Click on the <gui>Create</gui> button."
+msgstr "Kliknite na gumb <gui>Ustvari</gui>."
 
 #: C/mail-folders.page:40(p)
-msgid ""
-"The new folder will be shown in the folder view. You can then move messages "
-"into the folder."
+msgid "The new folder will be shown in the folder view. You can then move messages into the folder."
 msgstr ""
 
 #: C/mail-folders.page:44(title)
-#, fuzzy
 msgid "Moving Messages to New Folders"
-msgstr "Premikanje sporočil v mapo %s"
+msgstr "Premikanje sporočil v novo mapo"
 
 #: C/mail-folders.page:45(p)
-msgid ""
-"You can move messages into folders by using one of the following methods:"
+msgid "You can move messages into folders by using one of the following methods:"
 msgstr ""
 
 #: C/mail-folders.page:47(p)
-#, fuzzy
 msgid "Drag and drop the messages into the folder."
-msgstr "Označi vsa sporočila v mapi kot prebrana"
-
-#: C/mail-folders.page:48(gui) C/mail-folders.page:50(gui)
-msgid "Move to Folder"
-msgstr "Premakne v mapo"
+msgstr "Primi in spusti sporočila v mapo."
 
 #: C/mail-folders.page:48(p)
 #, fuzzy
-msgid "Right-click on the message and select the <placeholder-1/> option."
+msgid "Right-click on the message and select the <gui>Move to Folder</gui> option."
 msgstr "Zbrisana sporočila prikaži na seznamu sporočil"
 
-#: C/mail-folders.page:49(key)
-msgid "V"
-msgstr "V"
-
 #: C/mail-folders.page:49(p)
-msgid ""
-"Select a message and press <keyseq><placeholder-1/><placeholder-2/"
-"><placeholder-3/></keyseq>."
+msgid "Select a message and press <keyseq><key>Shift</key><key>Ctrl</key><key>V</key></keyseq>."
 msgstr ""
 
 #: C/mail-folders.page:50(p)
-msgid ""
-"Select a message and click on <guiseq><placeholder-1/><placeholder-2/></"
-"guiseq>."
+msgid "Select a message and click on <guiseq><gui>Message</gui><gui>Move to Folder</gui></guiseq>."
 msgstr ""
 
 #: C/mail-folders.page:53(p)
@@ -5744,16 +3811,11 @@ msgid "The steps for copying are similar."
 msgstr ""
 
 #: C/mail-folders.page:55(p)
-msgid "Moving files can be done automatically by setting up <placeholder-1/>."
+msgid "Moving files can be done automatically by setting up <link xref=\"mail-filters\">filters</link>."
 msgstr ""
 
 #: C/mail-folders.page:60(p)
-msgid ""
-"The Inbox folders on most IMAP servers cannot contain both messages and "
-"subfolders. When creating additional folders on your IMAP mail server, "
-"branch the folders from the root of the IMAP account and not from the Inbox. "
-"Creating subfolders in your Inbox may prevent you from reading messages that "
-"exist in the Inbox. If this happens, move the folders to the IMAP account."
+msgid "The Inbox folders on most IMAP servers cannot contain both messages and subfolders. When creating additional folders on your IMAP mail server, branch the folders from the root of the IMAP account and not from the Inbox. Creating subfolders in your Inbox may prevent you from reading messages that exist in the Inbox. If this happens, move the folders to the IMAP account."
 msgstr ""
 
 #: C/mail-filters.page:5(desc)
@@ -5761,147 +3823,87 @@ msgid "Use filter rules to sort your mail automatically into folders."
 msgstr ""
 
 #: C/mail-filters.page:23(title)
-#, fuzzy
 msgid "Using Filters"
-msgstr "Splošni filtri urejanja"
+msgstr "Uporaba filtrov"
 
 #: C/mail-filters.page:25(p)
-msgid ""
-"Message filters apply actions on messages based on conditions that you have "
-"defined. You can define filters for both incoming and outgoing emails."
-msgstr ""
-
-#: C/mail-filters.page:27(gui)
-#, fuzzy
-msgid "Apply filters to new messages in Inbox on this server"
+msgid "Message filters apply actions on messages based on conditions that you have defined. You can define filters for both incoming and outgoing emails."
 msgstr ""
-"Uvelj_avi filtre na novih sporočilih v mapi dohodne pošta na tem strežniku"
 
 #: C/mail-filters.page:27(p)
-msgid ""
-"Filters will be automatically applied to incoming messages for local "
-"accounts (such as POP). Mail serves for remote accounts (such as IMAP) often "
-"already filter mail directly on the server as this is faster. If you want to "
-"apply your Evolution filters to remote accounts, you can enable this under "
-"<guiseq><placeholder-1/><placeholder-2/><placeholder-3/><placeholder-4/"
-"><placeholder-5/><placeholder-6/><placeholder-7/></guiseq>."
+msgid "Filters will be automatically applied to incoming messages for local accounts (such as POP). Mail serves for remote accounts (such as IMAP) often already filter mail directly on the server as this is faster. If you want to apply your Evolution filters to remote accounts, you can enable this under <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Mail Accounts</gui><gui>Edit</gui><gui>Receiving Options</gui><gui>Options</gui><gui>Apply filters to new messages in Inbox on this server</gui></guiseq>."
 msgstr ""
 
-#: C/mail-filters.page:29(gui)
-#, fuzzy
-msgid "Apply Filters"
-msgstr "_Uveljavi filtre"
-
-#: C/mail-filters.page:29(key) C/calendar-layout-views.page:27(key)
-msgid "Y"
-msgstr "Y"
-
 #: C/mail-filters.page:29(p)
-msgid ""
-"To manually apply filters on messages in a folder, select the messages and "
-"click <guiseq><placeholder-1/><placeholder-2/></guiseq> or press "
-"<keyseq><placeholder-3/><placeholder-4/></keyseq>."
+msgid "To manually apply filters on messages in a folder, select the messages and click <guiseq><gui>Message</gui><gui>Apply Filters</gui></guiseq> or press <keyseq><key>Ctrl</key><key>Y</key></keyseq>."
 msgstr ""
 
-#: C/mail-filters.page:30(gui) C/exporting-data-mail.page:25(gui)
-msgid "Select All"
-msgstr "Izberi vse"
-
-#: C/mail-filters.page:30(key) C/exporting-data-mail.page:25(key)
-msgid "A"
-msgstr "A"
-
-#: C/mail-filters.page:30(p) C/exporting-data-mail.page:25(p)
-msgid ""
-"You can select all messages in a folder by clicking <guiseq><placeholder-1/"
-"><placeholder-2/></guiseq> or pressing <keyseq><placeholder-3/"
-"><placeholder-4/></keyseq>."
+#: C/mail-filters.page:30(p)
+#: C/exporting-data-mail.page:25(p)
+msgid "You can select all messages in a folder by clicking <guiseq><gui>Edit</gui><gui>Select All</gui></guiseq> or pressing <keyseq><key>Ctrl</key><key>A</key></keyseq>."
 msgstr ""
 
 #: C/mail-filters.page:33(title)
-#, fuzzy
 msgid "Creating a Filter"
-msgstr "Ustvarjanje novega albuma je spodletelo"
-
-#: C/mail-filters.page:36(gui) C/mail-filters.page:51(gui)
-#: C/mail-filters.page:61(gui) C/mail-filters-not-working.page:29(gui)
-#: C/mail-error-no-provider-available.page:37(gui)
-msgid "Message Filters"
-msgstr "Filtri sporočil"
+msgstr "Ustvarjanje filtra"
 
 #: C/mail-filters.page:36(p)
-msgid ""
-"Click <guiseq><placeholder-1/><placeholder-2/></guiseq>, or click "
-"<guiseq><placeholder-3/><placeholder-4/></guiseq> and select the criterion "
-"the filter will be based on."
+msgid "Click <guiseq><gui>Edit</gui><gui>Message Filters</gui></guiseq>, or click <guiseq><gui>Message</gui><gui>Create Rule</gui></guiseq> and select the criterion the filter will be based on."
 msgstr ""
 
-#: C/mail-filters.page:39(link) C/mail-filters-conditions.page:23(title)
-#: C/mail-filters-actions.page:23(title)
-#, fuzzy
-msgid "Available Filter conditions"
-msgstr "Razpoložljiva polja"
-
-#: C/mail-filters.page:41(gui)
-msgid "Then"
-msgstr "Nato"
+#: C/mail-filters.page:39(p)
+msgid "For more information on the available conditions see <link xref=\"mail-filters-conditions\">Available Filter conditions</link>."
+msgstr ""
 
 #: C/mail-filters.page:41(p)
-#, fuzzy
-msgid "Select the Actions for the Filter in the <placeholder-1/> section."
-msgstr "Ustvari novo prazno mapo"
-
-#: C/mail-filters.page:41(link)
-#, fuzzy
-msgid "Available Filter actions"
-msgstr "Razpoložljiva polja"
+msgid "Select the Actions for the Filter in the <gui>Then</gui> section."
+msgstr ""
 
 #: C/mail-filters.page:41(p)
-msgid "For more information on the available actions see <placeholder-1/>."
+msgid "For more information on the available actions see <link xref=\"mail-filters-actions\">Available Filter actions</link>."
 msgstr ""
 
-#: C/mail-filters.page:42(gui)
-#, fuzzy
-msgid "Add Action"
-msgstr "Dodaj _dejanje"
-
-#: C/mail-filters.page:42(gui) C/mail-filters-not-working.page:24(gui)
-#: C/mail-filters-not-working.page:26(gui)
-#: C/mail-filters-not-working.page:31(gui)
-#: C/mail-filters-not-working.page:38(gui)
-msgid "Stop Processing"
-msgstr "Zaustavi obdelavo"
-
 #: C/mail-filters.page:42(p)
-msgid ""
-"If you want to define multiple actions, click <placeholder-1/> and repeat "
-"the previous step. For example, if you want no other existing filters to be "
-"applied choose <placeholder-2/> as the second action in the list."
+msgid "If you want to define multiple actions, click <gui style=\"button\">Add Action</gui> and repeat the previous step. For example, if you want no other existing filters to be applied choose <gui>Stop Processing</gui> as the second action in the list."
 msgstr ""
 
 #: C/mail-filters.page:49(title)
-#, fuzzy
 msgid "Editing Filters"
-msgstr "Splošni filtri urejanja"
+msgstr "Urejanje filtrov"
 
-#: C/mail-filters.page:52(p) C/mail-filters.page:62(p)
+#: C/mail-filters.page:51(p)
+#: C/mail-filters.page:61(p)
 #, fuzzy
+msgid "Click <guiseq><gui>Edit</gui><gui>Message Filters</gui></guiseq>."
+msgstr "Kliknite na zavihek <guiseq><gui>Uredi</gui><gui>Možnosti</gui><gui>Vstavki</gui></guiseq>."
+
+#: C/mail-filters.page:52(p)
+#: C/mail-filters.page:62(p)
 msgid "Select the filter."
-msgstr "Izbor datoteke"
+msgstr "Izbor filtra."
+
+#: C/mail-filters.page:53(p)
+#: C/mail-encryption-s-mime-signing-encrypting.page:30(p)
+#: C/mail-encryption-gpg-signing-encrypting.page:32(p)
+#, fuzzy
+msgid "Click <gui style=\"button\">Edit</gui>."
+msgstr "Kliknite <gui style=\"button\">Poveži</gui>."
 
 #: C/mail-filters.page:54(p)
-msgid "Make the desired corrections, then click <placeholder-1/> twice."
+msgid "Make the desired corrections, then click <gui style=\"button\">OK</gui> twice."
 msgstr ""
 
 #: C/mail-filters.page:59(title)
-#, fuzzy
 msgid "Deleting Filters"
-msgstr "<b>Napaka med izbrisom filtrov</b>"
+msgstr "Brisanje filtrov"
+
+#: C/mail-filters.page:63(p)
+#, fuzzy
+msgid "Click <gui style=\"button\">Remove</gui>."
+msgstr "Kliknite <gui style=\"button\">Odstrani</gui>."
 
 #: C/mail-filters-not-working.page:5(desc)
-msgid ""
-"Fix problems with mail filters that do not sort and organize mail as "
-"expected."
+msgid "Fix problems with mail filters that do not sort and organize mail as expected."
 msgstr ""
 
 #: C/mail-filters-not-working.page:21(title)
@@ -5909,98 +3911,72 @@ msgid "Mail filters are not working"
 msgstr ""
 
 #: C/mail-filters-not-working.page:22(p)
-msgid ""
-"Your mail filters are probably working, however, they could be ordered in an "
-"inefficient way. This will make your filters run slowly, so it may seem like "
-"they are not working."
+msgid "Your mail filters are probably working, however, they could be ordered in an inefficient way. This will make your filters run slowly, so it may seem like they are not working."
 msgstr ""
 
 #: C/mail-filters-not-working.page:24(p)
-msgid ""
-"The order of email filters is very important. If your first filter has a "
-"<placeholder-1/> rule, then all the email messages that match this filter "
-"will ignore all the succeeding filters."
+msgid "The order of email filters is very important. If your first filter has a <gui>Stop Processing</gui> rule, then all the email messages that match this filter will ignore all the succeeding filters."
 msgstr ""
 
 #: C/mail-filters-not-working.page:26(p)
-msgid "To check if a filter has a <placeholder-1/> rule:"
+msgid "To check if a filter has a <gui>Stop Processing</gui> rule:"
 msgstr ""
 
 #: C/mail-filters-not-working.page:29(p)
 #: C/mail-error-no-provider-available.page:37(p)
-msgid "Go to <guiseq><placeholder-1/><placeholder-2/></guiseq>."
+msgid "Go to <guiseq><gui>Edit</gui><gui>Message Filters</gui></guiseq>."
 msgstr ""
 
 #: C/mail-filters-not-working.page:30(p)
-msgid ""
-"Select the filter and refer to the list of actions for that particular "
-"filter."
+msgid "Select the filter and refer to the list of actions for that particular filter."
 msgstr ""
 
-#: C/mail-filters-not-working.page:31(gui)
-#: C/deleting-appointments.page:22(gui) C/calendar-publishing.page:30(gui)
-#, fuzzy
-msgid "Actions"
-msgstr "_Dejanja"
-
 #: C/mail-filters-not-working.page:31(p)
-msgid ""
-"The <placeholder-1/> rule should be listed under the list of <placeholder-2/"
-"> if it is enabled."
+msgid "The <gui>Stop Processing</gui> rule should be listed under the list of <gui>Actions</gui> if it is enabled."
 msgstr ""
 
 #: C/mail-filters-not-working.page:35(p)
-msgid ""
-"Another thing you have to keep in mind is that filters depend on the \"new\" "
-"flag that is set when a particular email message is initially fetched from "
-"the server. If you use another email client aside from Evolution, your "
-"filters may not work automatically."
+msgid "Another thing you have to keep in mind is that filters depend on the \"new\" flag that is set when a particular email message is initially fetched from the server. If you use another email client aside from Evolution, your filters may not work automatically."
 msgstr ""
 
 #: C/mail-filters-not-working.page:38(p)
-msgid ""
-"Applying the <placeholder-1/> rule to an email message will cause all "
-"succeeding filters to ignore that message."
+msgid "Applying the <gui>Stop Processing</gui> rule to an email message will cause all succeeding filters to ignore that message."
 msgstr ""
 
 #: C/mail-filters-conditions.page:5(desc)
 msgid "Available conditions for setting up filtering."
 msgstr ""
 
-#: C/mail-filters-conditions.page:86(p)
+#: C/mail-filters-conditions.page:23(title)
+#: C/mail-filters-actions.page:23(title)
 #, fuzzy
+msgid "Available Filter conditions"
+msgstr "Filter mora vsebovati pogoje."
+
+#: C/mail-filters-conditions.page:86(p)
 msgid "Source Account:"
-msgstr "Izvorni račun"
+msgstr "Izvirni račun:"
 
 #: C/mail-filters-conditions.page:87(p)
-msgid ""
-"Filters messages according the server you got them from. This is most useful "
-"if you use multiple POP mail accounts."
+msgid "Filters messages according the server you got them from. This is most useful if you use multiple POP mail accounts."
 msgstr ""
 
-#: C/mail-filters-conditions.page:89(p) C/mail-filters-actions.page:65(p)
+#: C/mail-filters-conditions.page:89(p)
+#: C/mail-filters-actions.page:65(p)
 #, fuzzy
 msgid "Pipe to Program:"
 msgstr "Pipa za program"
 
 #: C/mail-filters-conditions.page:90(p)
-msgid ""
-"Evolution can use an external command to process a message, then process it "
-"based on the return value. Commands used in this way must return an integer. "
-"This is most commonly used to add an external junk mail filter."
+msgid "Evolution can use an external command to process a message, then process it based on the return value. Commands used in this way must return an integer. This is most commonly used to add an external junk mail filter."
 msgstr ""
 
 #: C/mail-filters-conditions.page:92(p)
-#, fuzzy
 msgid "Junk Test:"
-msgstr "Preverjanje neželene pošte"
-
-#: C/mail-filters-conditions.page:93(link)
-msgid "junk mail"
-msgstr ""
+msgstr "Preizkus neželene pošte:"
 
 #: C/mail-filters-conditions.page:93(p)
-msgid "Filters based on the results of the <placeholder-1/> test."
+msgid "Filters based on the results of the <link xref=\"mail-spam\">junk mail</link> test."
 msgstr ""
 
 #: C/mail-filters-actions.page:5(desc)
@@ -6008,18 +3984,16 @@ msgid "Available actions for setting up filtering."
 msgstr ""
 
 #: C/mail-filters-actions.page:26(p)
-#, fuzzy
 msgid "Move to Folder:"
-msgstr "Prestavi v mapo"
+msgstr "Premakni v mapo:"
 
 #: C/mail-filters-actions.page:27(p)
 msgid "Moves the message into a folder you specify."
 msgstr ""
 
 #: C/mail-filters-actions.page:29(p)
-#, fuzzy
 msgid "Copy to Folder:"
-msgstr "Kopiraj v mapo"
+msgstr "Kopiraj v mapo:"
 
 #: C/mail-filters-actions.page:30(p)
 msgid "Puts a copy of the message into a folder you specify."
@@ -6030,104 +4004,86 @@ msgid "Delete:"
 msgstr "Izbriši:"
 
 #: C/mail-filters-actions.page:33(p)
-msgid ""
-"Marks the message for deletion. The message can be undeleted until you "
-"expunge or empty the trash."
+msgid "Marks the message for deletion. The message can be undeleted until you expunge or empty the trash."
 msgstr ""
 
 #: C/mail-filters-actions.page:35(p)
-#, fuzzy
 msgid "Stop Processing:"
-msgstr "Prenehaj z obdelavo"
+msgstr "Zaustavi obdelavo:"
 
 #: C/mail-filters-actions.page:36(p)
-msgid ""
-"Select this if you want to all other filters ignore this message. Note that "
-"only filters listed after this particular rule will be ignored."
+msgid "Select this if you want to all other filters ignore this message. Note that only filters listed after this particular rule will be ignored."
 msgstr ""
 
 #: C/mail-filters-actions.page:38(p)
 #, fuzzy
 msgid "Set Label:"
-msgstr "Nastavi oznako"
+msgstr "Določi oznako"
 
 #: C/mail-filters-actions.page:39(p)
 #, fuzzy
 msgid "Adds a label to a message."
-msgstr "Ni mogoče pridobiti sporočila."
+msgstr "Pošlji novo _sporočilo osebi ..."
 
 #: C/mail-filters-actions.page:41(p)
-#, fuzzy
 msgid "Assign Color:"
-msgstr "Dodeli barvo"
+msgstr "Dodeli barvo:"
 
 #: C/mail-filters-actions.page:42(p)
 msgid "Marks the message with a color of your choice."
 msgstr ""
 
 #: C/mail-filters-actions.page:44(p)
-#, fuzzy
 msgid "Assign Score:"
-msgstr "Dodeli točke"
+msgstr "Dodeli rezultat:"
 
 #: C/mail-filters-actions.page:45(p)
 msgid "Assigns the message a numeric score."
 msgstr ""
 
 #: C/mail-filters-actions.page:47(p)
-#, fuzzy
 msgid "Adjust Score:"
-msgstr "Prilagodi točke"
+msgstr "Prilagodi rezultat:"
 
 #: C/mail-filters-actions.page:48(p)
 msgid "Changes the numeric score by the amount you set."
 msgstr ""
 
 #: C/mail-filters-actions.page:50(p)
-#, fuzzy
 msgid "Set Status:"
-msgstr "Določitev stanja"
+msgstr "Nastavi stanje:"
 
 #: C/mail-filters-actions.page:51(p)
-msgid ""
-"Sets the status of the message. The status can be Replied To, Draft, "
-"Important, Read, or Junk."
+msgid "Sets the status of the message. The status can be Replied To, Draft, Important, Read, or Junk."
 msgstr ""
 
 #: C/mail-filters-actions.page:53(p)
-#, fuzzy
 msgid "Unset Status:"
-msgstr "Prekliči stanje"
+msgstr "Nenastavljeno stanje:"
 
 #: C/mail-filters-actions.page:54(p)
-msgid ""
-"If the message has a status value, unsets it. If a status value is not set, "
-"it does nothing."
+msgid "If the message has a status value, unsets it. If a status value is not set, it does nothing."
 msgstr ""
 
 #: C/mail-filters-actions.page:56(p)
-#, fuzzy
 msgid "Beep:"
-msgstr "Pisk"
+msgstr "Pisk:"
 
 #: C/mail-filters-actions.page:57(p)
-#, fuzzy
 msgid "Makes the system beep."
-msgstr "Piskaj ob opozorilih"
+msgstr "Zapiskaj ob opozorilih."
 
 #: C/mail-filters-actions.page:59(p)
-#, fuzzy
 msgid "Play Sound:"
-msgstr "Predvajaj zvok"
+msgstr "Predvajaj zvok:"
 
 #: C/mail-filters-actions.page:60(p)
 msgid "Select a sound file for Evolution to play."
 msgstr ""
 
 #: C/mail-filters-actions.page:62(p)
-#, fuzzy
 msgid "Run Program:"
-msgstr "Zaženi program"
+msgstr "Zaženi program:"
 
 #: C/mail-filters-actions.page:63(p)
 #, fuzzy
@@ -6135,22 +4091,16 @@ msgid "Evolution runs an application."
 msgstr "Določi veljavnost dostopnosti programa"
 
 #: C/mail-filters-actions.page:66(p)
-msgid ""
-"Sends the message to a program of your choice. No return value is expected. "
-"This feature can be used to create automatic Web postings from email "
-"messages or to perform additional message post processing not supported by "
-"Evolution."
+msgid "Sends the message to a program of your choice. No return value is expected. This feature can be used to create automatic Web postings from email messages or to perform additional message post processing not supported by Evolution."
 msgstr ""
 
 #: C/mail-filters-actions.page:68(p)
-#, fuzzy
 msgid "Forward to:"
-msgstr "Posreduj na"
+msgstr "Posreduj na:"
 
 #: C/mail-filters-actions.page:69(p)
-#, fuzzy
 msgid "Forwards the message to another email address."
-msgstr "Pošlji odgovor na sporočilo na ta naslov"
+msgstr ""
 
 #: C/mail-error-no-provider-available.page:5(desc)
 #: C/mail-error-folder-mismatch.page:5(desc)
@@ -6170,22 +4120,12 @@ msgstr ""
 msgid "The filters used do not match the account they are associated with."
 msgstr ""
 
-#: C/mail-error-no-provider-available.page:27(file)
-#: C/mail-error-no-provider-available.page:28(file)
-msgid "filters.xml"
-msgstr "filters.xml"
-
 #: C/mail-error-no-provider-available.page:27(p)
-msgid ""
-"This happens when the <placeholder-1/> file is copied and used on a fresh "
-"install of Evolution on a new machine."
+msgid "This happens when the <file>filters.xml</file> file is copied and used on a fresh install of Evolution on a new machine."
 msgstr ""
 
 #: C/mail-error-no-provider-available.page:28(p)
-msgid ""
-"Accounts have unique ID numbers, and filters refer to these accounts "
-"directly. Simply copying the <placeholder-1/> file will cause a version "
-"mismatch with Evolution, affecting the filter rules."
+msgid "Accounts have unique ID numbers, and filters refer to these accounts directly. Simply copying the <file>filters.xml</file> file will cause a version mismatch with Evolution, affecting the filter rules."
 msgstr ""
 
 #: C/mail-error-no-provider-available.page:31(p)
@@ -6195,87 +4135,45 @@ msgstr ""
 #: C/mail-error-no-provider-available.page:32(p)
 #, fuzzy
 msgid "The account settings were modified."
-msgstr "Nastavite računa Yahoo:"
+msgstr "Nobena datoteka ni bila spremenjena"
 
 #: C/mail-error-no-provider-available.page:35(p)
-msgid ""
-"To fix this problem, edit the email filters and re-select the folder for "
-"each Copy/Move filter. To do this:"
+msgid "To fix this problem, edit the email filters and re-select the folder for each Copy/Move filter. To do this:"
 msgstr ""
 
 #: C/mail-error-no-provider-available.page:38(p)
 #, fuzzy
-msgid "Select the Copy/Move filter and click <placeholder-1/>."
+msgid "Select the Copy/Move filter and click <gui>Edit</gui>."
 msgstr "Izberite jezik in kliknite na prijavo"
 
 #: C/mail-error-no-provider-available.page:39(p)
-msgid ""
-"Refer to the list of folders associated with that particular filter. Click "
-"on the button that allows you to modify the folders assigned for that "
-"filter. Set the folders again."
-msgstr ""
-
-#: C/mail-error-no-provider-available.page:43(link)
-msgid ""
-"How to keep the Evolution filters in sync on multiple machines by Thomas "
-"Vander Stichele"
+msgid "Refer to the list of folders associated with that particular filter. Click on the button that allows you to modify the folders assigned for that filter. Set the folders again."
 msgstr ""
 
 #: C/mail-error-no-provider-available.page:43(p)
-msgid ""
-"Advanced users may also be interested in this write up: <placeholder-1/>"
+msgid "Advanced users may also be interested in this write up: <link href=\"https://thomas.apestaart.org/thomas/trac/wiki/Evolution\">How to keep the Evolution filters in sync on multiple machines by Thomas Vander Stichele </link>"
 msgstr ""
 
 #: C/mail-error-folder-mismatch.page:24(title)
-msgid ""
-"Error message \"Summary and folder mismatch\" after synchronizing folders"
-msgstr ""
-
-#: C/mail-error-folder-mismatch.page:26(gui)
-msgid ""
-"Error while Expunging folder. Error storing `~/.local/share/evolution/mail/"
-"local/Inbox (mbox)': Summary and folder mismatch, even after a sync."
+msgid "Error message \"Summary and folder mismatch\" after synchronizing folders"
 msgstr ""
 
 #: C/mail-error-folder-mismatch.page:26(p)
-msgid ""
-"If the error message: <placeholder-1/> pops up, perform the following steps:"
+msgid "If the error message: <gui>Error while Expunging folder. Error storing `~/.local/share/evolution/mail/local/Inbox (mbox)': Summary and folder mismatch, even after a sync.</gui> pops up, perform the following steps:"
 msgstr ""
 
-#: C/mail-error-folder-mismatch.page:28(file)
-msgid "~/.evolution/mail/local/"
-msgstr "~/.evolution/mail/local/"
-
-#: C/mail-error-folder-mismatch.page:28(file)
-#: C/mail-error-folder-mismatch.page:37(file)
-msgid "~/.local/share/evolution/mail/local/"
-msgstr "~/.local/share/evolution/mail/local/"
-
 #: C/mail-error-folder-mismatch.page:28(p)
-msgid ""
-"These steps apply to the versions 3.0 and 3.2. Note that Evolution's file "
-"locations in 2.30 and 2.32 are different (<placeholder-1/> instead of "
-"<placeholder-2/>)."
-msgstr ""
-
-#: C/mail-error-folder-mismatch.page:31(gui)
-msgid "System Tools"
+msgid "These steps apply to the versions 3.0 and 3.2. Note that Evolution's file locations in 2.30 and 2.32 are different (<file>~/.evolution/mail/local/</file> instead of <file>~/.local/share/evolution/mail/local/</file>)."
 msgstr ""
 
-#: C/mail-error-folder-mismatch.page:31(code)
-msgid "evolution --force-shutdown"
-msgstr "evolution --force-shutdown"
-
 #: C/mail-error-folder-mismatch.page:31(p)
-msgid ""
-"Open the Terminal application (category <placeholder-1/>) and type in the "
-"command <placeholder-2/>. This command stops Evolution and all the processes "
-"related to it."
+msgid "Open the Terminal application (category <gui>System Tools</gui>) and type in the command <code>evolution --force-shutdown</code>. This command stops Evolution and all the processes related to it."
 msgstr ""
 
 #: C/mail-error-folder-mismatch.page:32(p)
+#, fuzzy
 msgid "Remove the files ending in:"
-msgstr ""
+msgstr "V arhivu ni datotek."
 
 #: C/mail-error-folder-mismatch.page:34(file)
 msgid ".ev-summary"
@@ -6285,28 +4183,12 @@ msgstr ".ev-summary"
 msgid ".ibex.index"
 msgstr ".ibex.index"
 
-#: C/mail-error-folder-mismatch.page:37(gui)
-#, fuzzy
-msgid "Go"
-msgstr "G"
-
-#: C/mail-error-folder-mismatch.page:37(gui)
-#, fuzzy
-msgid "Location..."
-msgstr "Mesto"
-
 #: C/mail-error-folder-mismatch.page:37(p)
-msgid ""
-"To do this, navigate to the hidden directory <placeholder-1/> and locate the "
-"specified files. You can do this in the GNOME File Manager (Nautilus) by "
-"either showing hidden files, or by entering the directory via "
-"<guiseq><placeholder-2/><placeholder-3/></guiseq> from the menu bar."
+msgid "To do this, navigate to the hidden directory <file>~/.local/share/evolution/mail/local/</file> and locate the specified files. You can do this in the GNOME File Manager (Nautilus) by either showing hidden files, or by entering the directory via <guiseq><gui>Go</gui><gui>Location...</gui></guiseq> from the menu bar."
 msgstr ""
 
 #: C/mail-error-folder-mismatch.page:40(p)
-msgid ""
-"Restart Evolution. Note that restarting the application may take some time "
-"since it will need to rebuild the indexes deleted in the previous step."
+msgid "Restart Evolution. Note that restarting the application may take some time since it will need to rebuild the indexes deleted in the previous step."
 msgstr ""
 
 #: C/mail-error-folder-mismatch.page:44(p)
@@ -6314,29 +4196,19 @@ msgid "You may lose your mail labels when performing this operation."
 msgstr ""
 
 #: C/mail-error-folder-mismatch.page:48(p)
-msgid ""
-"This problem is expected to be fixed in version 3.0 according to the "
-"corresponding <placeholder-1/>. Please add a comment if this is not the case."
+msgid "This problem is expected to be fixed in version 3.0 according to the corresponding <link href=\"https://bugzilla.gnome.org/show_bug.cgi?id=550414\">bug report</link>. Please add a comment if this is not the case."
 msgstr ""
 
 #: C/mail-error-failed-to-append-to-sent-folder.page:24(title)
 msgid "Error message \"Failed to append to...\" after sending message"
 msgstr ""
 
-#: C/mail-error-failed-to-append-to-sent-folder.page:26(gui)
-#, fuzzy
-msgid "Folder for sent messages"
-msgstr "Izbor ene ali več datotek za odpiranje"
-
 #: C/mail-error-failed-to-append-to-sent-folder.page:26(p)
-msgid ""
-"If the error message \"Your message was sent, but an error occurred during "
-"post-processing. The reported error was \"Failed to append to mbox:///home/"
-"user/.local/share/evolution/mail/local#Sent: Cannot get folder 'Sent': "
-"folder does not exist. Appending to local 'Sent' folder instead.\".\" is "
-"shown, you can fix the problem by editing your default folder settings under "
-"<guiseq><placeholder-1/><placeholder-2/><placeholder-3/><placeholder-4/"
-"><placeholder-5/><placeholder-6/></guiseq>."
+msgid "If the error message \"Your message was sent, but an error occurred during post-processing. The reported error was \"Failed to append to mbox:///home/user/.local/share/evolution/mail/local#Sent: Cannot get folder 'Sent': folder does not exist. Appending to local 'Sent' folder instead.\".\" is shown, you can fix the problem by editing your default folder settings under <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Mail Accounts</gui><gui style=\"button\">Edit</gui><gui>Defaults</gui><gui>Folder for sent messages</gui></guiseq>."
+msgstr ""
+
+#: C/mail-error-failed-to-append-to-sent-folder.page:27(p)
+msgid "This bug is fixed in Evolution versions higher than 3.0.2 (stable series) and 3.1.3 (unstable development series). If this is not the case, please add a comment to the corresponding <link href=\"https://bugzilla.gnome.org/show_bug.cgi?id=638307\">bug report</link>."
 msgstr ""
 
 #: C/mail-encryption-s-mime-signing-encrypting.page:5(desc)
@@ -6345,31 +4217,11 @@ msgstr ""
 
 #: C/mail-encryption-s-mime-signing-encrypting.page:23(title)
 #: C/mail-encryption-gpg-signing-encrypting.page:23(title)
-#, fuzzy
 msgid "Signing or encrypting messages"
-msgstr "Sporočila dnevnika:"
-
-#: C/mail-encryption-s-mime-signing-encrypting.page:25(link)
-#, fuzzy
-msgid "added your certificate"
-msgstr "Uvažanje potrdila je spodletelo"
-
-#: C/mail-encryption-s-mime-signing-encrypting.page:25(gui)
-#, fuzzy
-msgid "S/MIME Sign"
-msgstr "Podpis _s S/MIME"
-
-#: C/mail-encryption-s-mime-signing-encrypting.page:25(gui)
-#, fuzzy
-msgid "S/MIME Encrypt"
-msgstr "_Šifriraj s S/MIME"
+msgstr "Šifriranje ali podpisovanje sporočil"
 
 #: C/mail-encryption-s-mime-signing-encrypting.page:25(p)
-#: C/mail-encryption-gpg-signing-encrypting.page:25(p)
-msgid ""
-"After you have <placeholder-1/>, you can sign or encrypt a message by "
-"clicking <guiseq><placeholder-2/><placeholder-3/></guiseq> or <placeholder-4/"
-"> from the message composer menu."
+msgid "After you have <link xref=\"mail-encryption-s-mime-manage\">added your certificate</link>, you can sign or encrypt a message by clicking <guiseq><gui>Options</gui><gui>S/MIME Sign</gui></guiseq> or <gui>S/MIME Encrypt</gui> from the message composer menu."
 msgstr ""
 
 #: C/mail-encryption-s-mime-signing-encrypting.page:26(p)
@@ -6383,49 +4235,14 @@ msgstr ""
 msgid "Select the mail account to encrypt the messages in."
 msgstr "Izberite vstavek za odpiranje<b>%s</b>."
 
-#: C/mail-encryption-s-mime-signing-encrypting.page:31(gui)
-#: C/mail-encryption-gpg-signing-encrypting.page:33(gui)
-#: C/mail-encryption-gpg-set-up.page:31(gui)
-#: C/mail-account-manage-usenet-news.page:47(title)
-#: C/mail-account-manage-unix-mbox-spool-file.page:47(title)
-#: C/mail-account-manage-unix-mbox-spool-directory.page:47(title)
-#: C/mail-account-manage-pop.page:47(title)
-#: C/mail-account-manage-novell-groupwise.page:45(title)
-#: C/mail-account-manage-microsoft-exchange-evo-mapi.page:49(title)
-#: C/mail-account-manage-microsoft-exchange-evo-exchange.page:49(title)
-#: C/mail-account-manage-mh-format-directories.page:47(title)
-#: C/mail-account-manage-maildir-format-directories.page:47(title)
-#: C/mail-account-manage-local-delivery.page:47(title)
-#: C/mail-account-manage-imap-plus.page:47(title)
-#: C/mail-account-manage-imap.page:47(title)
-msgid "Security"
-msgstr "Varnost"
-
-#: C/mail-encryption-s-mime-signing-encrypting.page:32(gui)
-msgid "Secure MIME (S/MIME)"
-msgstr "Varne vrste MIME (S/MIME)"
-
-#: C/mail-encryption-s-mime-signing-encrypting.page:32(gui)
-#, fuzzy
-msgid "Select"
-msgstr "Izb_eri ..."
-
-#: C/mail-encryption-s-mime-signing-encrypting.page:32(gui)
-#, fuzzy
-msgid "Signing Certificate"
-msgstr "Po_dpisovanje potrdila:"
-
-#: C/mail-encryption-s-mime-signing-encrypting.page:32(gui)
+#: C/mail-encryption-s-mime-signing-encrypting.page:31(p)
+#: C/mail-encryption-gpg-signing-encrypting.page:33(p)
 #, fuzzy
-msgid "Encryption Certificate"
-msgstr "Potrdilo za ši_friranje:"
+msgid "Click <gui>Security</gui>."
+msgstr "Kliknite <gui>Natisni</gui>."
 
 #: C/mail-encryption-s-mime-signing-encrypting.page:32(p)
-msgid ""
-"In the <placeholder-1/> section, click <placeholder-2/> next to "
-"<placeholder-3/> and specify the path to your signing certificate, or click "
-"<placeholder-4/> next to <placeholder-5/> and specify the path to your "
-"encryption certificate."
+msgid "In the <gui>Secure MIME (S/MIME)</gui> section, click <gui style=\"button\">Select</gui> next to <gui>Signing Certificate</gui> and specify the path to your signing certificate, or click <gui style=\"button\">Select</gui> next to <gui>Encryption Certificate</gui> and specify the path to your encryption certificate."
 msgstr ""
 
 #: C/mail-encryption-s-mime-signing-encrypting.page:33(p)
@@ -6435,9 +4252,7 @@ msgstr "Izberi napredne možnosti"
 
 #: C/mail-encryption-s-mime-signing-encrypting.page:36(p)
 #: C/mail-encryption-gpg-signing-encrypting.page:26(p)
-msgid ""
-"The Subject line of the message will not be encrypted and should not be used "
-"for sensitive information."
+msgid "The Subject line of the message will not be encrypted and should not be used for sensitive information."
 msgstr ""
 
 #: C/mail-encryption-s-mime-manage.page:5(desc)
@@ -6447,67 +4262,26 @@ msgstr ""
 #: C/mail-encryption-s-mime-manage.page:23(title)
 #, fuzzy
 msgid "Managing S/MIME certificates"
-msgstr "Tu lahko upravljate vaša potrdila S/MIME"
+msgstr "Uvoz potrdil ali ključev"
 
 #: C/mail-encryption-s-mime-manage.page:25(p)
-msgid ""
-"Certificates allow you to communicate with others securely over an encrypted "
-"connection, or sign a message confirming your identity to the contact. These "
-"settings only apply to S/MIME encryption."
+msgid "Certificates allow you to communicate with others securely over an encrypted connection, or sign a message confirming your identity to the contact. These settings only apply to S/MIME encryption."
 msgstr ""
 
-#: C/mail-encryption-s-mime-manage.page:26(gui)
-msgid "Certificates"
-msgstr "Potrdila"
-
 #: C/mail-encryption-s-mime-manage.page:26(p)
-msgid ""
-"You can import, view, edit (except for your own certificates), and delete "
-"your certificates under <guiseq><placeholder-1/><placeholder-2/"
-"><placeholder-3/></guiseq>."
+msgid "You can import, view, edit (except for your own certificates), and delete your certificates under <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Certificates</gui></guiseq>."
 msgstr ""
 
-#: C/mail-encryption-s-mime-manage.page:27(gui)
-msgid "Your Certificates"
-msgstr "Vaša potrdila"
-
-#: C/mail-encryption-s-mime-manage.page:27(gui)
-#: C/import-single-files.page:24(gui) C/import-apps-outlook.page:59(gui)
-#: C/import-apps-outlook.page:62(gui) C/import-apps-mozilla.page:24(gui)
-msgid "Import"
-msgstr "Uvozi"
-
-#: C/mail-encryption-s-mime-manage.page:27(gui)
-#: C/mail-composer-html-image.page:27(gui) C/backup-restore.page:38(gui)
-msgid "Open"
-msgstr "Odpri"
-
 #: C/mail-encryption-s-mime-manage.page:27(p)
-msgid ""
-"<placeholder-1/> displays a list of certificates that you own. To add a "
-"signing certificate, click <placeholder-2/>, select the file to import, then "
-"click <placeholder-3/> and enter a password."
+msgid "<gui>Your Certificates</gui> displays a list of certificates that you own. To add a signing certificate, click <gui style=\"button\">Import</gui>, select the file to import, then click <gui style=\"button\">Open</gui> and enter a password."
 msgstr ""
 
-#: C/mail-encryption-s-mime-manage.page:28(gui)
-msgid "Contact Certificates"
-msgstr "Potrdila stika"
-
 #: C/mail-encryption-s-mime-manage.page:28(p)
-msgid ""
-"<placeholder-1/> displays a list of certificates that you have for contacts. "
-"These certificates allow you to decrypt messages as well verify signed "
-"messages."
+msgid "<gui>Contact Certificates</gui> displays a list of certificates that you have for contacts. These certificates allow you to decrypt messages as well verify signed messages."
 msgstr ""
 
-#: C/mail-encryption-s-mime-manage.page:29(gui)
-msgid "Authorities"
-msgstr "Overitelji"
-
 #: C/mail-encryption-s-mime-manage.page:29(p)
-msgid ""
-"<placeholder-1/> displays a list of trusted certificate authorities who "
-"verify that your own certificate is valid."
+msgid "<gui>Authorities</gui> displays a list of trusted certificate authorities who verify that your own certificate is valid."
 msgstr ""
 
 #: C/mail-encryption.page:5(desc)
@@ -6518,52 +4292,42 @@ msgstr "Pošiljanje in sprejemanje elektronske pošte"
 #: C/mail-encryption.page:33(title)
 #, fuzzy
 msgid "Mail encryption and certificates"
-msgstr "Potrdilo za ši_friranje:"
+msgstr "Uvozi potrdila in šifrirne ključe"
 
 #: C/mail-encryption.page:35(p)
-msgid ""
-"Evolution offers GPG Encryption and S/MIME Encryption for signing and "
-"encrypting email messages. S/MIME is used most often in corporate "
-"environments."
+msgid "Evolution offers GPG Encryption and S/MIME Encryption for signing and encrypting email messages. S/MIME is used most often in corporate environments."
 msgstr ""
 
 #: C/mail-encryption.page:38(title)
 msgid "GPG"
-msgstr ""
+msgstr "GPG"
 
 #: C/mail-encryption.page:42(title)
-#, fuzzy
 msgid "S/MIME"
-msgstr "Podpis _s S/MIME"
+msgstr "S/MIME"
 
 #: C/mail-encryption-gpg-signing-encrypting.page:5(desc)
 #: C/mail-encryption-gpg-create-key.page:5(desc)
 msgid "Signing or encrypting messages via GPG that you send."
 msgstr ""
 
-#: C/mail-encryption-gpg-signing-encrypting.page:25(link)
-msgid "set up your GPG key"
+#: C/mail-encryption-gpg-signing-encrypting.page:25(p)
+msgid "After you have <link xref=\"mail-encryption-gpg-set-up\">set up your GPG key</link>, you can sign or encrypt a message by clicking <guiseq><gui>Options</gui><gui>PGP Sign</gui></guiseq> or <gui>PGP Encrypt</gui> from the message composer menu."
 msgstr ""
 
-#: C/mail-encryption-gpg-signing-encrypting.page:25(gui)
-#, fuzzy
-msgid "PGP Sign"
-msgstr "_Podpiši s PGP"
-
-#: C/mail-encryption-gpg-signing-encrypting.page:25(gui)
+#: C/mail-encryption-gpg-signing-encrypting.page:34(p)
 #, fuzzy
-msgid "PGP Encrypt"
-msgstr "Šifriraj s _PGP"
+msgid "Select <gui>Always sign outgoing messages when using this account</gui>."
+msgstr "Ob uporabi tega računa _vedno podpiši odhodno pošto"
 
-#: C/mail-encryption-gpg-signing-encrypting.page:34(gui)
+#: C/mail-encryption-gpg-signing-encrypting.page:36(p)
+#: C/mail-encryption-gpg-set-up.page:35(p)
 #, fuzzy
-msgid "Always sign outgoing messages when using this account"
-msgstr "Ob uporabi tega računa _vedno podpiši odhodno pošto"
+msgid "Click <gui style=\"button\">Close</gui>."
+msgstr "Kliknite <gui style=\"button\">Poveži</gui>."
 
 #: C/mail-encryption-gpg-set-up.page:5(desc)
-msgid ""
-"Setting up GPG for your mail account to sign and/or encrypt and decrypt "
-"messages."
+msgid "Setting up GPG for your mail account to sign and/or encrypt and decrypt messages."
 msgstr ""
 
 #: C/mail-encryption-gpg-set-up.page:23(title)
@@ -6571,50 +4335,29 @@ msgstr ""
 msgid "Setting up GPG for your mail account"
 msgstr "Nastavljanje iskalne mape: %s"
 
-#: C/mail-encryption-gpg-set-up.page:26(link)
-#: C/mail-encryption-gpg-create-key.page:23(title)
-#, fuzzy
-msgid "Creating a GPG key"
-msgstr "Nov seznam nalog"
-
 #: C/mail-encryption-gpg-set-up.page:26(p)
-msgid ""
-"You need a GPG key to do this. If you do not have one yet, please refer to "
-"<placeholder-1/>."
+msgid "You need a GPG key to do this. If you do not have one yet, please refer to <link xref=\"mail-encryption-gpg-create-key\">Creating a GPG key</link>."
 msgstr ""
 
 #: C/mail-encryption-gpg-set-up.page:30(p)
-msgid ""
-"Select the account you want to use securely, then click <placeholder-1/>."
+msgid "Select the account you want to use securely, then click <gui style=\"button\">Edit</gui>."
 msgstr ""
 
-#: C/mail-encryption-gpg-set-up.page:32(gui)
+#: C/mail-encryption-gpg-set-up.page:31(p)
 #, fuzzy
-msgid "PGP/GPG Key ID"
-msgstr "ID _ključa PGP/GPG:"
+msgid "Click the <gui>Security</gui> tab."
+msgstr "Izberite zavihek <gui>Iskanje</gui>."
 
 #: C/mail-encryption-gpg-set-up.page:32(p)
-msgid "Specify your key ID in the <placeholder-1/> field."
+msgid "Specify your key ID in the <gui>PGP/GPG Key ID</gui> field."
 msgstr ""
 
 #: C/mail-encryption-gpg-set-up.page:33(p)
-#, fuzzy
-msgid ""
-"Below the field you can choose whether to always sign outgoing messages when "
-"using this account, and other options."
-msgstr "Ob uporabi tega računa _vedno podpiši odhodno pošto"
-
-#: C/mail-encryption-gpg-set-up.page:37(code)
-#: C/mail-encryption-gpg-create-key.page:42(code)
-#: C/mail-encryption-gpg-create-key.page:46(code)
-msgid "gpg --list-keys"
-msgstr "gpg --list-keys"
+msgid "Below the field you can choose whether to always sign outgoing messages when using this account, and other options."
+msgstr ""
 
 #: C/mail-encryption-gpg-set-up.page:37(p)
-msgid ""
-"Evolution requires that you know your key ID. If you do not remember it, you "
-"can find it by typing <placeholder-1/> in a terminal window. Your key ID is "
-"an eight-character string with random numbers and letters."
+msgid "Evolution requires that you know your key ID. If you do not remember it, you can find it by typing <code>gpg --list-keys</code> in a terminal window. Your key ID is an eight-character string with random numbers and letters."
 msgstr ""
 
 #: C/mail-encryption-gpg-getting-keys.page:5(desc)
@@ -6627,36 +4370,15 @@ msgstr ""
 
 #. TODO:POST-3-2: Update and rewrite using Seahorse. Needs a complete rewrite once https://bugzilla.gnome.org/show_bug.cgi?id=508744 is fixed.
 #: C/mail-encryption-gpg-getting-keys.page:26(p)
-msgid ""
-"To send an encrypted message, you need to use the recipient's public key in "
-"combination with your private key. Evolution handles the encryption, but you "
-"need to get the public key and add it to your keyring."
+msgid "To send an encrypted message, you need to use the recipient's public key in combination with your private key. Evolution handles the encryption, but you need to get the public key and add it to your keyring."
 msgstr ""
 
-#: C/mail-encryption-gpg-getting-keys.page:28(code)
-msgid "gpg --recv-keys --keyserver wwwkeys.pgp.net keyid"
-msgstr "gpg --recv-keys --keyserver wwwkeys.pgp.net keyid"
-
-#: C/mail-encryption-gpg-getting-keys.page:28(code)
-msgid "keyid"
-msgstr "keyid"
-
 #: C/mail-encryption-gpg-getting-keys.page:28(p)
-msgid ""
-"To get public keys from a public key server, enter the command "
-"<placeholder-1/>, substituting <placeholder-2/> by your recipient's ID. You "
-"need to enter your password, and the ID is automatically added to your "
-"keyring."
-msgstr ""
-
-#: C/mail-encryption-gpg-getting-keys.page:30(code)
-msgid "gpg --import"
+msgid "To get public keys from a public key server, enter the command <code>gpg --recv-keys --keyserver wwwkeys.pgp.net keyid</code>, substituting <code>keyid</code> by your recipient's ID. You need to enter your password, and the ID is automatically added to your keyring."
 msgstr ""
 
 #: C/mail-encryption-gpg-getting-keys.page:30(p)
-msgid ""
-"If someone sends you a public key directly, save it as a plain text file and "
-"enter the command <placeholder-1/> to add it to your keyring."
+msgid "If someone sends you a public key directly, save it as a plain text file and enter the command <code>gpg --import</code> to add it to your keyring."
 msgstr ""
 
 #: C/mail-encryption-gpg-decrypting.page:5(desc)
@@ -6674,58 +4396,42 @@ msgid "Decrypting a received message"
 msgstr "Prejeto trenutno sporočilo"
 
 #: C/mail-encryption-gpg-decrypting.page:27(p)
-msgid ""
-"If you receive an encrypted message, you need to decrypt it before you can "
-"read it."
+msgid "If you receive an encrypted message, you need to decrypt it before you can read it."
 msgstr ""
 
 #: C/mail-encryption-gpg-decrypting.page:28(p)
-msgid ""
-"When you view the message, Evolution prompts you for your PGP password. "
-"Enter it, and the unencrypted message is displayed."
+msgid "When you view the message, Evolution prompts you for your PGP password. Enter it, and the unencrypted message is displayed."
 msgstr ""
 
 #: C/mail-encryption-gpg-decrypting.page:29(p)
-msgid ""
-"Senders must have your GPG public key before they can send you an encrypted "
-"message."
+msgid "Senders must have your GPG public key before they can send you an encrypted message."
 msgstr ""
 
 #: C/mail-encryption-gpg-decrypting.page:33(title)
 #, fuzzy
 msgid "Checking the signature of a received message"
-msgstr "Sledi stanju sporočila ..."
-
-#: C/mail-encryption-gpg-decrypting.page:34(gui)
-msgid "Security Information"
-msgstr "Varnostni podatki"
+msgstr "Prejeli ste %d novih sporočil."
 
 #: C/mail-encryption-gpg-decrypting.page:34(p)
-msgid ""
-"To check the sender's signature of a received message, scroll down to the "
-"bottom of the message and click the logo. Evolution will display "
-"<placeholder-1/> for the message."
+msgid "To check the sender's signature of a received message, scroll down to the bottom of the message and click the logo. Evolution will display <gui>Security Information</gui> for the message."
 msgstr ""
 
+#: C/mail-encryption-gpg-create-key.page:23(title)
+#, fuzzy
+msgid "Creating a GPG key"
+msgstr "ID _ključa PGP/GPG:"
+
 #: C/mail-encryption-gpg-create-key.page:25(note)
-msgid ""
-"These steps are very technical. For average users we nowadays recommend "
-"using the Seahorse application for managing GPG keys."
+msgid "These steps are very technical. For average users we nowadays recommend using the Seahorse application for managing GPG keys."
 msgstr ""
 
 #. TODO:POST-3-2: Update and rewrite using Seahorse. Needs a complete rewrite once https://bugzilla.gnome.org/show_bug.cgi?id=508744 is fixed.
 #: C/mail-encryption-gpg-create-key.page:28(p)
-msgid ""
-"Before you can get or send GPG encrypted mail, you need to generate your "
-"public and private keys with GPG."
+msgid "Before you can get or send GPG encrypted mail, you need to generate your public and private keys with GPG."
 msgstr ""
 
-#: C/mail-encryption-gpg-create-key.page:30(code)
-msgid "gpg --gen-key"
-msgstr "gpg --gen-key"
-
 #: C/mail-encryption-gpg-create-key.page:30(p)
-msgid "Open a terminal window and enter <placeholder-1/>."
+msgid "Open a terminal window and enter <code>gpg --gen-key</code>."
 msgstr ""
 
 #: C/mail-encryption-gpg-create-key.page:31(p)
@@ -6757,124 +4463,65 @@ msgid "Review your selected user ID. If it is correct, press O."
 msgstr ""
 
 #: C/mail-encryption-gpg-create-key.page:38(p)
+#, fuzzy
 msgid "Type a passphrase, then press Enter."
-msgstr ""
+msgstr "Pritisnite <command>rhythmbox</command>, nato pritisnite <keycap>Vnosno tipko</keycap>."
 
 #: C/mail-encryption-gpg-create-key.page:39(p)
 msgid "Move your mouse randomly to generate the keys."
 msgstr ""
 
-#: C/mail-encryption-gpg-create-key.page:42(code)
-msgid ""
-"/home/you/.gnupg/pubring.gpg ---------------------------- pub 1024D/32j38dk2 "
-"2001-06-20 you &lt;you@example.com&gt; sub 1024g/289sklj3 2011-06-20 "
-"[expires: 2012-11-14]"
-msgstr ""
-"/home/you/.gnupg/pubring.gpg ---------------------------- pub 1024D/32j38dk2 "
-"2001-06-20 you &lt;you@example.com&gt; sub 1024g/289sklj3 2011-06-20 "
-"[expires: 2012-11-14]"
-
 #: C/mail-encryption-gpg-create-key.page:42(p)
-msgid ""
-"After the keys are generated, you can view your key information by entering "
-"<placeholder-1/>. You should see something similar to this: <placeholder-2/>"
+msgid "After the keys are generated, you can view your key information by entering <code>gpg --list-keys</code>. You should see something similar to this: <code> /home/you/.gnupg/pubring.gpg ----------------------------  pub 1024D/32j38dk2 2001-06-20 you &lt;you@example.com&gt;  sub 1024g/289sklj3 2011-06-20 [expires: 2012-11-14]</code>"
 msgstr ""
 
-#: C/mail-encryption-gpg-create-key.page:43(file)
-msgid "~/.gnupg/pubring.gpg"
-msgstr "~/.gnupg/pubring.gpg"
-
 #: C/mail-encryption-gpg-create-key.page:43(p)
-msgid ""
-"GPG creates one list, or keyring, for your public keys and one for your "
-"private keys. All the public keys you know are stored in the file "
-"<placeholder-1/>. If you want to give other people your key, send them that "
-"file."
+msgid "GPG creates one list, or keyring, for your public keys and one for your private keys. All the public keys you know are stored in the file <file>~/.gnupg/pubring.gpg</file>. If you want to give other people your key, send them that file."
 msgstr ""
 
 #: C/mail-encryption-gpg-create-key.page:44(p)
 msgid "If you want, you can upload your keys to a key server:"
 msgstr ""
 
-#: C/mail-encryption-gpg-create-key.page:46(code)
-msgid "1024D"
-msgstr "1024D"
-
-#: C/mail-encryption-gpg-create-key.page:46(code)
-msgid "pub"
-msgstr "pub"
-
-#: C/mail-encryption-gpg-create-key.page:46(code)
-#: C/mail-encryption-gpg-create-key.page:47(varname)
-#: C/mail-encryption-gpg-create-key.page:47(quote)
-msgid "32j38dk2"
-msgstr "32j38dk2"
-
 #: C/mail-encryption-gpg-create-key.page:46(p)
-msgid ""
-"Check your public key ID with <placeholder-1/>. It is the string after "
-"<placeholder-2/> on the line beginning with <placeholder-3/>. In the example "
-"above, it is <placeholder-4/>."
+msgid "Check your public key ID with <code>gpg --list-keys</code>. It is the string after <code>1024D</code> on the line beginning with <code>pub</code>. In the example above, it is <code>32j38dk2</code>."
 msgstr ""
 
-#: C/mail-encryption-gpg-create-key.page:47(code)
-msgid "gpg --send-keys --keyserver wwwkeys.pgp.net <placeholder-1/>"
-msgstr "gpg --send-keys --keyserver wwwkeys.pgp.net <placeholder-1/>"
-
 #: C/mail-encryption-gpg-create-key.page:47(p)
-msgid ""
-"Enter the command <placeholder-1/>. Substitute your key ID for "
-"<placeholder-2/>. You need your password to do this."
+msgid "Enter the command <code>gpg --send-keys --keyserver wwwkeys.pgp.net <varname>32j38dk2</varname></code>. Substitute your key ID for <quote>32j38dk2</quote>. You need your password to do this."
 msgstr ""
 
 #: C/mail-encryption-gpg-create-key.page:50(p)
-msgid ""
-"Key servers store your public keys for you so that your friends can decrypt "
-"your messages. If you choose not to use a key server, you can manually send "
-"your public key, include it in your signature file, or put it on your own "
-"Web page. However, it is easier to publish a key once, and then let people "
-"download it from a central place when they want."
+msgid "Key servers store your public keys for you so that your friends can decrypt your messages. If you choose not to use a key server, you can manually send your public key, include it in your signature file, or put it on your own Web page. However, it is easier to publish a key once, and then let people download it from a central place when they want."
 msgstr ""
 
 #: C/mail-encryption-gpg-create-key.page:51(p)
-msgid ""
-"If you don't have a key to unlock or encrypt a message, you can set your "
-"encryption tool to look it up automatically. If it cannot find the key, an "
-"error message appears."
+msgid "If you don't have a key to unlock or encrypt a message, you can set your encryption tool to look it up automatically. If it cannot find the key, an error message appears."
 msgstr ""
 
 #: C/mail-duplicates.page:5(desc)
-#, fuzzy
 msgid "How to handle duplicated email messages"
-msgstr "Iskanje podvojenih sporočil je spodletelo."
+msgstr ""
 
 #: C/mail-duplicates.page:24(title)
 msgid "Duplicate emails get downloaded"
 msgstr ""
 
 #: C/mail-duplicates.page:27(title)
-#, fuzzy
 msgid "Removing duplicate emails"
-msgstr "Ali želite odstraniti podvojena sporočila?"
-
-#: C/mail-duplicates.page:28(gui)
-#, fuzzy
-msgid "Remove Duplicate Messages"
-msgstr "Odstrani po_dvojena sporočila"
+msgstr "Odstranjevanje dvojnikov e-pošte"
 
 #: C/mail-duplicates.page:28(p)
-msgid ""
-"To remove duplicate emails in a folder, click <guiseq><placeholder-1/"
-"><placeholder-2/></guiseq>."
+msgid "To remove duplicate emails in a folder, select multiple messages (or select all messages in a folder by clicking <guiseq><gui>Edit</gui><gui>Select All</gui></guiseq> or pressing <keyseq><key>Ctrl</key><key>A</key></keyseq>) and click <guiseq><gui>Message</gui><gui>Remove Duplicate Messages</gui></guiseq>."
 msgstr ""
 
 #: C/mail-duplicates.page:33(title)
+#, fuzzy
 msgid "Reasons"
-msgstr ""
+msgstr "Izpiši vzroke premorov"
 
 #: C/mail-duplicates.page:34(p)
-msgid ""
-"Downloading duplicate emails may be due to one of the following reasons:"
+msgid "Downloading duplicate emails may be due to one of the following reasons:"
 msgstr ""
 
 #: C/mail-duplicates.page:36(p)
@@ -6885,64 +4532,33 @@ msgstr ""
 msgid "Evolution is having a problem with the UIDL extension."
 msgstr ""
 
-#: C/mail-duplicates.page:38(file)
-msgid "$HOME/.local/share/evolution/mail/pop/"
-msgstr "$HOME/.local/share/evolution/mail/pop/"
-
 #: C/mail-duplicates.page:38(p)
-#, fuzzy
-msgid "The cache files located at <placeholder-1/> are not writable."
-msgstr "V izbrano mapo ni mogoče pisati."
+msgid "The cache files located at <file>$HOME/.local/share/evolution/mail/pop/</file> are not writable."
+msgstr ""
 
 #: C/mail-displaying-sender-photograph.page:5(desc)
-#, fuzzy
 msgid "Display a picture of the sender in the message header area."
-msgstr "Pokaži fotografijo pošiljatelja na pladnju branja sporočil."
+msgstr ""
 
 #: C/mail-displaying-sender-photograph.page:23(title)
-#, fuzzy
 msgid "Photograph Message Headers"
-msgstr "Vse _glave sporočil"
+msgstr "Glave sporočil s fotografijami"
 
 #. TODO: Check and describe whether this requires enabling <guiseq><gui>Edit</gui><gui>Plugins</gui><gui>Face</gui></guiseq>!
 #: C/mail-displaying-sender-photograph.page:27(p)
-msgid ""
-"The photograph of the sender of an email can be shown at the right side of "
-"the message preview if the sender is in one of your address books and has a "
-"photograph."
+msgid "The photograph of the sender of an email can be shown at the right side of the message preview if the sender is in one of your address books and has a photograph."
 msgstr ""
 
-#: C/mail-displaying-sender-photograph.page:29(gui)
-#: C/mail-change-time-format.page:20(gui)
-msgid "Headers"
-msgstr "Glave"
-
-#: C/mail-displaying-sender-photograph.page:29(gui)
-#, fuzzy
-msgid "Show the photograph of sender in the message preview"
-msgstr "Pokaži sliko pošiljatelja v _predogledu sporočila"
-
 #: C/mail-displaying-sender-photograph.page:29(p)
-msgid ""
-"To enable this functionality, select <guiseq><placeholder-1/><placeholder-2/"
-"><placeholder-3/><placeholder-4/><placeholder-5/></guiseq>."
+msgid "To enable this functionality, select <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Mail Preferences</gui><gui>Headers</gui><gui>Show the photograph of sender in the message preview</gui></guiseq>."
 msgstr ""
 
-#: C/mail-displaying-sender-photograph.page:31(gui)
-#, fuzzy
-msgid "Search for sender photograph only in local address books"
-msgstr "Fotografijo pošiljatelja _išči le v krajevnih imenikih"
-
 #: C/mail-displaying-sender-photograph.page:31(p)
-msgid ""
-"By default only local address books are used for searching the photograph as "
-"accessing remote address books can cause delays. You can disable this by "
-"deselecting the option <placeholder-1/>."
+msgid "By default only local address books are used for searching the photograph as accessing remote address books can cause delays. You can disable this by deselecting the option <gui>Search for sender photograph only in local address books</gui>."
 msgstr ""
 
 #: C/mail-displaying-sender-photograph.page:33(p)
-msgid ""
-"If there are multiple matches for a contact, the first one is always used."
+msgid "If there are multiple matches for a contact, the first one is always used."
 msgstr ""
 
 #: C/mail-displaying-no-css.page:5(desc)
@@ -6953,40 +4569,20 @@ msgstr ""
 msgid "HTML emails are not correctly displayed"
 msgstr ""
 
-#: C/mail-displaying-no-css.page:23(link)
-msgid "CSS"
-msgstr ""
-
 #: C/mail-displaying-no-css.page:23(p)
-msgid ""
-"If an HTML message is not correctly displayed in Evolution it might be that "
-"the formatting of the message is specified as <placeholder-1/>. CSS is "
-"currently not supported by gtkhtml (the part that is used to display HTML)."
+msgid "If an HTML message is not correctly displayed in Evolution it might be that the formatting of the message is specified as <link href=\"http://en.wikipedia.org/wiki/Cascading_Style_Sheets\">CSS</link>. CSS is currently not supported by gtkhtml (the part that is used to display HTML)."
 msgstr ""
 
 #: C/mail-displaying-no-css.page:24(p)
 msgid "This will likely be fixed in version 3.2 or 3.4."
 msgstr ""
 
-#: C/mail-displaying-no-css.page:25(link)
-msgid "webkit"
-msgstr ""
-
 #: C/mail-displaying-no-css.page:25(p)
-msgid ""
-"For developers only: In future versions, Evolution will use WebKit instead "
-"of gtkhtml for displaying HTML. There is a branch named \"<placeholder-1/>\" "
-"in Evolution's code repository to test."
+msgid "For developers only: In future versions, Evolution will use WebKit instead of gtkhtml for displaying HTML. There is a branch named \"<link href=\"http://git.gnome.org/browse/evolution?h=webkit\">webkit</link>\" in Evolution's code repository to test."
 msgstr ""
 
-#: C/mail-displaying-no-css.page:27(link)
-#: C/mail-displaying-character-encodings.page:20(title)
-#, fuzzy
-msgid "Character Encodings and Sets"
-msgstr "Znakovno kodiranje"
-
 #: C/mail-displaying-no-css.page:27(p)
-msgid "For missing characters in emails, see <placeholder-1/>."
+msgid "For missing characters in emails, see <link xref=\"mail-displaying-character-encodings\">Character Encodings and Sets</link>."
 msgstr ""
 
 #: C/mail-displaying-message.page:5(desc)
@@ -6994,127 +4590,69 @@ msgid "Rendering an email and handling its attachments."
 msgstr ""
 
 #: C/mail-displaying-message.page:20(title)
-#, fuzzy
 msgid "Display of a message"
-msgstr "Pokaže naslednje sporočilo"
+msgstr "Prikaži sporočilo"
 
 #: C/mail-displaying-images-in-html.page:5(desc)
 msgid "On embedded pictures in received HTML messages."
 msgstr ""
 
 #: C/mail-displaying-images-in-html.page:28(title)
-#, fuzzy
 msgid "Images in HTML messages"
-msgstr "Naloži slike sporočil HTML preko HTTP"
+msgstr "Slike v sporočilih HTML"
 
 #: C/mail-displaying-images-in-html.page:30(p)
-msgid ""
-"When someone sends you HTML mail that includes an image in the body of the "
-"message (for example, the welcome message in your Inbox), Evolution displays "
-"the image inside the message."
+msgid "When someone sends you HTML mail that includes an image in the body of the message (for example, the welcome message in your Inbox), Evolution displays the image inside the message."
 msgstr ""
 
 #: C/mail-displaying-images-in-html.page:33(title)
-#, fuzzy
 msgid "Loading images"
 msgstr "Nalaganje slik"
 
 #: C/mail-displaying-images-in-html.page:34(p)
-msgid ""
-"Some images are links in a message, rather than being part of the message. "
-"Evolution can download those images from the Internet, but does not do so "
-"unless you request it. This is because remotely hosted images can be slow to "
-"load and display, and can even be used by spammers to track who reads the "
-"email. Not automatically loading images helps protect your privacy."
+msgid "Some images are links in a message, rather than being part of the message. Evolution can download those images from the Internet, but does not do so unless you request it. This is because remotely hosted images can be slow to load and display, and can even be used by spammers to track who reads the email. Not automatically loading images helps protect your privacy."
 msgstr ""
 
-#: C/mail-displaying-images-in-html.page:36(gui)
-#, fuzzy
-msgid "Load Images"
-msgstr "Na_loži slike"
-
-#: C/mail-displaying-images-in-html.page:36(key)
-msgid "I"
-msgstr "I"
-
 #: C/mail-displaying-images-in-html.page:36(p)
-msgid ""
-"To load the images for one message, click <guiseq><placeholder-1/"
-"><placeholder-2/></guiseq> or press <keyseq><placeholder-3/><placeholder-4/"
-"></keyseq>."
+msgid "To load the images for one message, click <guiseq><gui>View</gui><gui>Load Images</gui></guiseq> or press <keyseq><key>Ctrl</key><key>I</key></keyseq>."
 msgstr ""
 
-#: C/mail-displaying-images-in-html.page:38(gui)
-#: C/mail-displaying-images-in-html.page:44(gui)
-msgid "HTML Messages"
-msgstr "Sporočila HTML "
-
-#: C/mail-displaying-images-in-html.page:38(gui)
-#: C/mail-displaying-images-in-html.page:44(gui)
-msgid "Loading Images"
-msgstr "Nalaganje slik"
-
 #: C/mail-displaying-images-in-html.page:38(p)
-msgid ""
-"To set the default action for loading images, go to <guiseq><placeholder-1/"
-"><placeholder-2/><placeholder-3/><placeholder-4/><placeholder-5/></guiseq>."
+msgid "To set the default action for loading images, go to <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Mail Preferences</gui><gui>HTML Messages</gui><gui>Loading Images</gui></guiseq>."
 msgstr ""
 
 #: C/mail-displaying-images-in-html.page:42(title)
 msgid "Automatically download images in emails from people you know"
 msgstr ""
 
-#: C/mail-displaying-images-in-html.page:44(gui)
-#, fuzzy
-msgid "Load images only in messages from contacts"
-msgstr "_Naloži slike le v sporočilih s stikov"
-
 #: C/mail-displaying-images-in-html.page:44(p)
-msgid ""
-"You can download images from emails sent by your contacts. To do this, go to "
-"<guiseq><placeholder-1/><placeholder-2/><placeholder-3/><placeholder-4/"
-"><placeholder-5/></guiseq>. Enable the <placeholder-6/> option."
+msgid "You can download images from emails sent by your contacts. To do this, go to <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Mail Preferences</gui><gui>HTML Messages</gui><gui>Loading Images</gui></guiseq>. Enable the <gui>Load images only in messages from contacts</gui> option."
 msgstr ""
 
-#: C/mail-displaying-images-in-html.page:46(gui)
-#: C/intro-main-window.page:132(title)
-#: C/import-supported-file-formats.page:60(title)
-#: C/contacts-autocompletion.page:30(gui)
-#, fuzzy
-msgid "Contacts"
-msgstr "Stiki"
-
-#: C/mail-displaying-images-in-html.page:46(gui)
-#: C/mail-composer-several-recipients.page:38(title)
-#: C/mail-composer-several-recipients.page:39(link)
-#: C/contacts-autocompletion.page:30(gui)
-#, fuzzy
-msgid "Autocompletion"
-msgstr "Samodejno dopolnjevanje"
-
-#: C/mail-displaying-images-in-html.page:46(gui)
-#: C/contacts-autocompletion.page:32(gui)
-#, fuzzy
-msgid "Always show address of the autocompleted contact"
-msgstr "Vedno _pokaži naslov samodejno dopolnjenega stika"
-
 #: C/mail-displaying-images-in-html.page:46(p)
-msgid ""
-"Next, go to <guiseq><placeholder-1/><placeholder-2/><placeholder-3/"
-"><placeholder-4/></guiseq>. Enable autocompletion by ticking the "
-"<placeholder-5/> checkbox."
+msgid "Next, go to <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Contacts</gui><gui>Autocompletion</gui></guiseq>. Enable autocompletion by ticking the <gui>Always show address of the autocompleted contact</gui> checkbox."
 msgstr ""
 
 #: C/mail-displaying-images-in-html.page:50(title)
-#, fuzzy
 msgid "Saving images"
-msgstr "Nalaganje slik"
+msgstr "Shranjevanje slik"
 
 #: C/mail-displaying-images-in-html.page:51(p)
-msgid ""
-"You currently cannot save images to disk that are embedded in HTML emails."
+msgid "To save an image that is embedded in an HTML email, right-click on the image and click <gui>Save Image...</gui>."
 msgstr ""
 
+#. When image changes, this message will be marked fuzzy or untranslated for you.
+#. It doesn't matter what you translate it to: it's not used at all.
+#: C/mail-displaying-collapsible-headers.page:27(None)
+msgid "@@image: './figures/plus-icon.png'; md5=57bf83c4ab8585c30897a6cf89c5949c"
+msgstr "@@image: './figures/plus-icon.png'; md5=57bf83c4ab8585c30897a6cf89c5949c"
+
+#. When image changes, this message will be marked fuzzy or untranslated for you.
+#. It doesn't matter what you translate it to: it's not used at all.
+#: C/mail-displaying-collapsible-headers.page:29(None)
+msgid "@@image: './figures/minus-icon.png'; md5=7cef9df0f691c8d6ce67cad29ebceac9"
+msgstr "@@image: './figures/minus-icon.png'; md5=7cef9df0f691c8d6ce67cad29ebceac9"
+
 #: C/mail-displaying-collapsible-headers.page:5(desc)
 #, fuzzy
 msgid "Display less email recipients of a specific message."
@@ -7126,91 +4664,33 @@ msgid "Collapsible Message Headers"
 msgstr "Vse _glave sporočil"
 
 #: C/mail-displaying-collapsible-headers.page:25(p)
-msgid ""
-"Evolution compresses the To, Cc and Bcc headers of received mail and shows "
-"only five addresses in the message preview."
+msgid "Evolution compresses the To, Cc and Bcc headers of received mail and shows only five addresses in the message preview."
 msgstr ""
 
-#: C/mail-displaying-collapsible-headers.page:27(gui)
-#: C/mail-composer-write-new-message.page:27(gui)
-#: C/mail-composer-several-recipients.page:32(gui)
-#: C/mail-composer-several-recipients.page:45(gui)
-#: C/mail-composer-reply.page:27(gui) C/mail-composer-reply.page:28(gui)
-#: C/contacts-autocompletion.page:34(gui)
-#, fuzzy
-msgid "To:"
-msgstr "_Za:"
-
-#: C/mail-displaying-collapsible-headers.page:27(gui)
-#: C/mail-composer-several-recipients.page:32(gui)
-#: C/mail-composer-several-recipients.page:45(gui)
-#: C/mail-composer-reply.page:28(gui) C/contacts-autocompletion.page:34(gui)
-#, fuzzy
-msgid "Cc:"
-msgstr "_Kp:"
-
 #: C/mail-displaying-collapsible-headers.page:27(p)
-msgid ""
-"To see all recipients, click the <media type=\"image\" src=\"./figures/plus-"
-"icon.png\"/> icon next to the <placeholder-1/> or <placeholder-2/> line, or "
-"click the ellipsis (...) at the end of the five displayed addresses."
+msgid "To see all recipients, click the <media type=\"image\" src=\"./figures/plus-icon.png\"/> icon next to the <gui>To:</gui> or <gui>Cc:</gui> line, or click the ellipsis (...) at the end of the five displayed addresses."
 msgstr ""
 
-#: C/mail-displaying-collapsible-headers.page:29(gui)
-msgid "From:"
-msgstr "Od:"
-
 #: C/mail-displaying-collapsible-headers.page:29(p)
-msgid ""
-"To collapse all of the message headers and just display the subject and "
-"sender in one line, click the icon <media type=\"image\" src=\"./figures/"
-"minus-icon.png\"/> next to the <placeholder-1/> line. This is helpful on "
-"small screens."
+msgid "To collapse all of the message headers and just display the subject and sender in one line, click the icon <media type=\"image\" src=\"./figures/minus-icon.png\"/> next to the <gui>From:</gui> line. This is helpful on small screens."
 msgstr ""
 
 #: C/mail-displaying-character-encodings.page:5(desc)
 msgid "When characters in an email are not shown correctly or missing."
 msgstr ""
 
-#: C/mail-displaying-character-encodings.page:24(gui)
-msgid "Character Encoding"
-msgstr "Znakovno kodiranje"
+#: C/mail-displaying-character-encodings.page:20(title)
+#, fuzzy
+msgid "Character Encodings and Sets"
+msgstr "Seznam podprtih naborov znakov"
 
 #. TODO: Recheck once https://bugzilla.gnome.org/show_bug.cgi?id=655021 is fixed
 #: C/mail-displaying-character-encodings.page:24(p)
-msgid ""
-"If the email program of the sender is broken or misconfigured, plain text "
-"emails might not include information about the character encoding used. If "
-"you receive such messages, choose <guiseq><placeholder-1/><placeholder-2/></"
-"guiseq> from the main menu and change the currently chosen character "
-"encoding to an appropriate one that might be the encoding used by the "
-"sender. You have to make this change every time you view the message."
-msgstr ""
-
-#: C/mail-displaying-character-encodings.page:25(gui)
-#: C/mail-composer-reply.page:54(gui) C/mail-composer-forward.page:41(gui)
-#: C/contacts-ldap.page:32(gui) C/calendar-timezones.page:30(gui)
-#: C/calendar-timezones.page:32(gui)
-#: C/calendar-layout-general-formatting.page:27(gui)
-#: C/calendar-layout-appointment-display.page:32(title)
-#, fuzzy
-msgid "General"
-msgstr "Splošno"
-
-#: C/mail-displaying-character-encodings.page:25(gui)
-msgid "Message Display"
-msgstr "Prikaz sporočil"
-
-#: C/mail-displaying-character-encodings.page:25(gui)
-#, fuzzy
-msgid "Default character encoding"
-msgstr "Privzet _nabor znakov: "
+msgid "If the email program of the sender is broken or misconfigured, plain text emails might not include information about the character encoding used. If you receive such messages, choose <guiseq><gui>View</gui><gui>Character Encoding</gui></guiseq> from the main menu and change the currently chosen character encoding to an appropriate one that might be the encoding used by the sender. You have to make this change every time you view the message."
+msgstr ""
 
 #: C/mail-displaying-character-encodings.page:25(p)
-msgid ""
-"To constantly change this setting, go to <guiseq><placeholder-1/"
-"><placeholder-2/><placeholder-3/><placeholder-4/><placeholder-5/"
-"><placeholder-6/></guiseq>."
+msgid "To constantly change this setting, go to <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Mail Preferences</gui><gui>General</gui><gui>Message Display</gui><gui>Default character encoding</gui></guiseq>."
 msgstr ""
 
 #: C/mail-delete-and-undelete.page:5(desc)
@@ -7220,50 +4700,22 @@ msgstr ""
 #: C/mail-delete-and-undelete.page:25(title)
 #, fuzzy
 msgid "Deleting and undeleting messages"
-msgstr "Sporočila dnevnika:"
+msgstr "Pošiljanje in sprejemanje trenutnih sporočil"
 
 #: C/mail-delete-and-undelete.page:28(title)
-#, fuzzy
 msgid "Deleting Messages"
-msgstr "Sporočila dnevnika:"
+msgstr "Brisanje sporočil"
 
 #: C/mail-delete-and-undelete.page:30(p)
-msgid ""
-"To delete a message, select it and press the <placeholder-1/> key, or click "
-"the <placeholder-2/> button in the toolbar, or press <keyseq><placeholder-3/"
-"><placeholder-4/></keyseq>, or right-click the message and click "
-"<placeholder-5/>."
+msgid "To delete a message, select it and press the <key>Delete</key> key, or click the <gui style=\"button\">Delete</gui> button in the toolbar, or press <keyseq><key>Ctrl</key><key>D</key></keyseq>, or right-click the message and click <gui>Delete</gui>."
 msgstr ""
 
-#: C/mail-delete-and-undelete.page:32(gui)
-#: C/mail-delete-and-undelete.page:40(gui)
-#, fuzzy
-msgid "Show Deleted Messages"
-msgstr "Pokaži _izbrisana sporočila"
-
 #: C/mail-delete-and-undelete.page:32(p)
-msgid ""
-"When you press Delete or click the Trash folder, your mail is not actually "
-"deleted, but is marked for deletion. You can see all message marked for "
-"deletion in the Trash folder. To show deleted messages, click "
-"<guiseq><placeholder-1/><placeholder-2/></guiseq>. You can view the messages "
-"striken off for later deletion."
+msgid "When you press Delete or click the Trash folder, your mail is not actually deleted, but is marked for deletion. You can see all message marked for deletion in the Trash folder. To show deleted messages, click <guiseq><gui>View</gui><gui>Show Deleted Messages</gui></guiseq>. You can view the messages striken off for later deletion."
 msgstr ""
 
-#: C/mail-delete-and-undelete.page:34(gui) C/deleting-emails.page:31(gui)
-#, fuzzy
-msgid "Expunge"
-msgstr "_Uniči"
-
-#: C/mail-delete-and-undelete.page:34(key) C/deleting-emails.page:31(key)
-msgid "E"
-msgstr "E"
-
 #: C/mail-delete-and-undelete.page:34(p)
-msgid ""
-"To permanently erase all the deleted messages in a folder, click "
-"<guiseq><placeholder-1/><placeholder-2/></guiseq> or press "
-"<keyseq><placeholder-3/><placeholder-4/></keyseq>."
+msgid "To permanently erase all the deleted messages in a folder, click <guiseq><gui>Folder</gui><gui>Expunge</gui></guiseq> or press <keyseq><key>Ctrl</key><key>E</key></keyseq>."
 msgstr ""
 
 #: C/mail-delete-and-undelete.page:38(title)
@@ -7271,23 +4723,12 @@ msgstr ""
 msgid "Undeleting Messages"
 msgstr "Sporočila dnevnika:"
 
-#: C/mail-delete-and-undelete.page:40(gui)
-#, fuzzy
-msgid "Undelete message"
-msgstr "_Povrni izbrisano sporočilo"
-
 #: C/mail-delete-and-undelete.page:40(p)
-msgid ""
-"You can undelete a message that has been deleted but not expunged yet. To "
-"undelete a message, select the message, click <guiseq><placeholder-1/"
-"><placeholder-2/></guiseq>. Note that <guiseq><placeholder-3/><placeholder-4/"
-"></guiseq> must be enabled for this."
+msgid "You can undelete a message that has been deleted but not expunged yet. To undelete a message, select the message, click <guiseq><gui>Edit</gui><gui>Undelete message</gui></guiseq>. Note that <guiseq><gui>View</gui><gui>Show Deleted Messages</gui></guiseq> must be enabled for this."
 msgstr ""
 
 #: C/mail-delete-and-undelete.page:42(p)
-msgid ""
-"If you have marked a message for deletion, undeleting it unmarks it, and the "
-"message is not shown anymore in the Trash folder."
+msgid "If you have marked a message for deletion, undeleting it unmarks it, and the message is not shown anymore in the Trash folder."
 msgstr ""
 
 #: C/mail-default-folder-locations.page:5(desc)
@@ -7298,21 +4739,14 @@ msgstr "Ustvari novo prazno mapo"
 #: C/mail-default-folder-locations.page:31(title)
 #, fuzzy
 msgid "Mail folder locations"
-msgstr "Mesto poštnega predala"
+msgstr "Drevesna razporeditev poštnih map"
 
 #: C/mail-default-folder-locations.page:33(p)
-msgid ""
-"You can set a different place where to store messages in your Draft folder "
-"and Sent folder in the <placeholder-1/> section of the mail account editor "
-"(<guiseq><placeholder-2/><placeholder-3/><placeholder-4/><placeholder-5/"
-"><placeholder-6/></guiseq>)."
+msgid "You can set a different place where to store messages in your Draft folder and Sent folder in the <gui>Defaults</gui> section of the mail account editor (<guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Mail Accounts</gui><gui style=\"button\">Edit</gui><gui>Defaults</gui></guiseq>)."
 msgstr ""
 
 #: C/mail-default-folder-locations.page:34(p)
-msgid ""
-"For remote account types (accounts such as IMAP) you can also set a Trash "
-"folder and Junk folder on the mail server so Evolution's local virtual "
-"folders will not be used for it, but folders on the mail server."
+msgid "For remote account types (accounts such as IMAP) you can also set a Trash folder and Junk folder on the mail server so Evolution's local virtual folders will not be used for it, but folders on the mail server."
 msgstr ""
 
 #: C/mail-default-CC-and-BCC.page:5(desc)
@@ -7320,17 +4754,11 @@ msgid "Make somebody always receive copies of your sent mail."
 msgstr ""
 
 #: C/mail-default-CC-and-BCC.page:27(title)
-#, fuzzy
 msgid "Default CC and BCC"
-msgstr "Privzet odjemalec koledarja"
+msgstr "Privzeti Kp in Skp"
 
 #: C/mail-default-CC-and-BCC.page:29(p)
-msgid ""
-"You can set email addresses that should always receive copies of your sent "
-"mail (either as CC visible for all recipients, or BCC not visible for other "
-"recipients) in the <placeholder-1/> section of the mail account editor "
-"(<guiseq><placeholder-2/><placeholder-3/><placeholder-4/><placeholder-5/"
-"><placeholder-6/></guiseq>)."
+msgid "You can set email addresses that should always receive copies of your sent mail (either as CC visible for all recipients, or BCC not visible for other recipients) in the <gui>Defaults</gui> section of the mail account editor (<guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Mail Accounts</gui><gui style=\"button\">Edit</gui><gui>Defaults</gui></guiseq>)."
 msgstr ""
 
 #: C/mail-composer-write-new-message.page:5(desc)
@@ -7340,155 +4768,66 @@ msgstr ""
 #: C/mail-composer-write-new-message.page:23(title)
 #, fuzzy
 msgid "Composing a new message"
-msgstr "Sestavi novo poštno sporočilo"
-
-#: C/mail-composer-write-new-message.page:25(gui)
-#: C/mail-composer-custom-header-lines.page:41(gui)
-#, fuzzy
-msgid "Mail Message"
-msgstr "_Poštno sporočilo"
-
-#: C/mail-composer-write-new-message.page:25(key)
-#: C/mail-composer-custom-header-lines.page:41(key)
-#: C/mail-attachments-sending.page:30(key)
-#: C/calendar-layout-views.page:30(key)
-msgid "M"
-msgstr "M"
+msgstr "Okno novega sporočila"
 
 #: C/mail-composer-write-new-message.page:25(p)
-msgid ""
-"You can start writing a new email message by clicking <guiseq><placeholder-1/"
-"><placeholder-2/><placeholder-3/></guiseq>, by pressing "
-"<keyseq><placeholder-4/><placeholder-5/><placeholder-6/></keyseq>, or by "
-"clicking <placeholder-7/> in the toolbar."
+msgid "You can start writing a new email message by clicking <guiseq><gui>File</gui><gui>New</gui><gui>Mail Message</gui></guiseq>, by pressing <keyseq><key>Shift</key><key>Ctrl</key><key>M</key></keyseq>, or by clicking <gui>New</gui> in the toolbar."
 msgstr ""
 
 #: C/mail-composer-write-new-message.page:27(p)
-msgid ""
-"Enter an email address in the <placeholder-1/> field. If you want to enter "
-"multiple addresses, separate them by commas. See <link xref=\"mail-composer-"
-"several-recipients\"/> for more information on sending messages to more than "
-"one person."
+msgid "Enter an email address in the <gui>To:</gui> field. If you want to enter multiple addresses, separate them by commas. See <link xref=\"mail-composer-several-recipients\"/> for more information on sending messages to more than one person."
 msgstr ""
 
-#: C/mail-composer-write-new-message.page:29(gui)
-#: C/mail-composer-message-templates.page:68(gui)
-#: C/mail-composer-forward.page:34(gui)
-#, fuzzy
-msgid "Send"
-msgstr "_Pošlji"
-
-#: C/mail-composer-write-new-message.page:29(key)
-#: C/mail-composer-forward.page:34(key)
-#, fuzzy
-msgid "Return"
-msgstr "vrne"
-
 #: C/mail-composer-write-new-message.page:29(p)
-msgid ""
-"After you have written your message, click <placeholder-1/> or press "
-"<keyseq><placeholder-2/><placeholder-3/></keyseq>."
+msgid "After you have written your message, click <gui>Send</gui> or press <keyseq><key>Ctrl</key><key>Return</key></keyseq>."
 msgstr ""
 
 #: C/mail-composer-spellcheck.page:5(desc)
-#, fuzzy
 msgid "On spell checking your mail in the composer."
-msgstr "Tukaj lahko nastavljate črkovanje, podpise in sestavljanik pošte"
+msgstr ""
 
 #: C/mail-composer-spellcheck.page:20(title)
-#, fuzzy
 msgid "Spell checking"
 msgstr "Preverjanje črkovanja"
 
 #: C/mail-composer-spellcheck.page:25(title)
 msgid "Prerequirements"
-msgstr ""
-
-#: C/mail-composer-spellcheck.page:26(em)
-msgid "hunspell"
-msgstr ""
-
-#: C/mail-composer-spellcheck.page:26(em)
-#, fuzzy
-msgid "enchant"
-msgstr "Francoska Gvajana"
+msgstr "Zahteve"
 
 #: C/mail-composer-spellcheck.page:26(p)
-msgid ""
-"To use spell checking for the emails that you write you first need to make "
-"sure that the <placeholder-1/> package for your specific language and the "
-"<placeholder-2/> package are installed via the software management tool of "
-"your distribution."
+msgid "To use spell checking for the emails that you write you first need to make sure that the <em>hunspell</em> package for your specific language and the <em>enchant</em> package are installed via the software management tool of your distribution."
 msgstr ""
 
 #: C/mail-composer-spellcheck.page:27(link)
+#, fuzzy
 msgid "Install hunspell now."
-msgstr ""
+msgstr "_Namesti zdaj"
 
 #: C/mail-composer-spellcheck.page:28(link)
+#, fuzzy
 msgid "Install enchant now."
-msgstr ""
+msgstr "_Namesti zdaj"
 
 #: C/mail-composer-spellcheck.page:32(title)
 #, fuzzy
 msgid "Global Preferences"
-msgstr "Možnosti pošte"
-
-#: C/mail-composer-spellcheck.page:34(gui)
-#: C/mail-composer-spellcheck.page:36(gui)
-#: C/mail-composer-spellcheck.page:41(link) C/mail-composer-reply.page:54(gui)
-#: C/mail-composer-html.page:28(gui) C/mail-composer-forward.page:41(gui)
-#: C/mail-composer-forward-as-attachment.page:26(gui)
-#, fuzzy
-msgid "Composer Preferences"
-msgstr "Možnosti sestavljalnika"
-
-#: C/mail-composer-spellcheck.page:34(gui)
-#: C/mail-composer-spellcheck.page:36(gui)
-#: C/mail-composer-spellcheck.page:41(gui)
-#, fuzzy
-msgid "Spell Checking"
-msgstr "Preverjanje črkovanja"
+msgstr "Splošne možnosti"
 
 #: C/mail-composer-spellcheck.page:34(p)
-msgid ""
-"Under <guiseq><placeholder-1/><placeholder-2/><placeholder-3/><placeholder-4/"
-"><placeholder-5/></guiseq> you can define whether your spelling is checked "
-"while you type and which color is used for underlining words that are "
-"misspelled."
+msgid "Under <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Composer Preferences</gui><gui>Spell Checking</gui><gui>Options</gui></guiseq> you can define whether your spelling is checked while you type and which color is used for underlining words that are misspelled."
 msgstr ""
 
-#: C/mail-composer-spellcheck.page:36(gui)
-#, fuzzy
-msgid "Languages"
-msgstr "_Jeziki"
-
 #: C/mail-composer-spellcheck.page:36(p)
-msgid ""
-"You can also define which installed languages are used for spell checking in "
-"the list available under <guiseq><placeholder-1/><placeholder-2/"
-"><placeholder-3/><placeholder-4/><placeholder-5/></guiseq>."
+msgid "You can also define which installed languages are used for spell checking in the list available under <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Composer Preferences</gui><gui>Spell Checking</gui><gui>Languages</gui></guiseq>."
 msgstr ""
 
 #: C/mail-composer-spellcheck.page:40(title)
 #, fuzzy
 msgid "Manual spell checking in the composer"
-msgstr "Barva preverjanja črkovanja"
-
-#: C/mail-composer-spellcheck.page:41(gui)
-#, fuzzy
-msgid "Checking spelling while I type"
-msgstr "Preverjaj črkovanje med _tipkanjem"
-
-#: C/mail-composer-spellcheck.page:41(key)
-msgid "F7"
-msgstr "F7"
+msgstr "Napaka med nastavitvami preverjanja črkovanja: %s\n"
 
 #: C/mail-composer-spellcheck.page:41(p)
-msgid ""
-"If you do not have <placeholder-1/> enabled in the <placeholder-2/> you can "
-"run a spell check in the email composer by clicking <guiseq><placeholder-3/"
-"><placeholder-4/></guiseq> or by pressing <placeholder-5/>."
+msgid "If you do not have <gui>Checking spelling while I type</gui> enabled in the <link xref=\"#global-preferences\">Composer Preferences</link> you can run a spell check in the email composer by clicking <guiseq><gui>Edit</gui><gui>Spell Checking</gui></guiseq> or by pressing <key>F7</key>."
 msgstr ""
 
 #: C/mail-composer-several-recipients.page:5(desc)
@@ -7496,153 +4835,100 @@ msgid "Sending to more than one person and using CC or BCC."
 msgstr ""
 
 #: C/mail-composer-several-recipients.page:26(title)
-#: C/contacts-using-contact-lists.page:36(link)
 #, fuzzy
 msgid "Sending a message to several recipients"
-msgstr "Pošiljanje sporočila le z določenimi prejemniki _Skp"
+msgstr "Odgovori vsem prejemnikom trenutnega sporočila"
 
 #: C/mail-composer-several-recipients.page:28(p)
-msgid ""
-"To send a message to more than one person, enter the addresses in the "
-"composer by seperating them with commas or semicolons."
+msgid "To send a message to more than one person, enter the addresses in the composer by separating them with commas or semicolons."
 msgstr ""
 
 #: C/mail-composer-several-recipients.page:31(title)
-#, fuzzy
 msgid "Recipient types"
-msgstr "Prejemniki"
+msgstr "Vrste prejemnikov"
 
 #: C/mail-composer-several-recipients.page:32(p)
-msgid ""
-"Email messages can have three different types of recipients. The simplest "
-"way is to put the email address or addresses in the <placeholder-1/> text "
-"field. The <placeholder-2/> text field is used for recipients that are meant "
-"to receive a copy of your message but are not the primary recipients."
+msgid "Email messages can have three different types of recipients. The simplest way is to put the email address or addresses in the <gui>To:</gui> text field. The <gui>Cc:</gui> text field is used for recipients that are meant to receive a copy of your message but are not the primary recipients."
 msgstr ""
 
-#: C/mail-composer-several-recipients.page:34(gui)
-#: C/mail-composer-several-recipients.page:45(gui)
-#: C/contacts-autocompletion.page:34(gui)
-#, fuzzy
-msgid "Bcc:"
-msgstr "_Skp:"
-
-#: C/mail-composer-several-recipients.page:34(gui)
-#, fuzzy
-msgid "Bcc Field"
-msgstr "Polje _Skp"
-
 #: C/mail-composer-several-recipients.page:34(p)
-msgid ""
-"Addresses in the <placeholder-1/> text field are hidden from the other "
-"recipients of the message. It can be used to send mail to large groups of "
-"people, especially if they do not know each other or if privacy is a "
-"concern. If the <placeholder-2/> text field is not shown, click "
-"<guiseq><placeholder-3/><placeholder-4/></guiseq>."
+msgid "Addresses in the <gui>Bcc:</gui> text field are hidden from the other recipients of the message. It can be used to send mail to large groups of people, especially if they do not know each other or if privacy is a concern. If the <gui>Bcc:</gui> text field is not shown, click <guiseq><gui>View</gui><gui>Bcc Field</gui></guiseq>."
 msgstr ""
 
+#: C/mail-composer-several-recipients.page:38(title)
+#, fuzzy
+msgid "Autocompletion"
+msgstr "Samodejno dopolnjevanje"
+
 #: C/mail-composer-several-recipients.page:39(p)
-msgid ""
-"It is recommended to use the <placeholder-1/> feature of the Evolution "
-"address book for entering addresses. By using this you avoid typos and save "
-"time."
+msgid "It is recommended to use the <link xref=\"contacts-autocompletion\">Autocompletion</link> feature of the Evolution address book for entering addresses. By using this you avoid typos and save time."
 msgstr ""
 
 #: C/mail-composer-several-recipients.page:43(title)
 #, fuzzy
 msgid "Using the buttons"
-msgstr "Pokaže preklopne gumbe"
+msgstr "Opozorilni gumbi"
 
 #: C/mail-composer-several-recipients.page:45(p)
-msgid ""
-"Instead of typing the recipients' names you can also click the "
-"<placeholder-1/>, <placeholder-2/>, or <placeholder-3/> buttons to get a "
-"list of the email addresses in your address books. Select the addresses and "
-"click the arrow buttons to move them into the appropriate address columns "
-"(To:, Cc:, Bcc:)."
+msgid "Instead of typing the recipients' names you can also click the <gui style=\"button\">To:</gui>, <gui style=\"button\">Cc:</gui>, or <gui style=\"button\">Bcc:</gui> buttons to get a list of the email addresses in your address books. Select the addresses and click the arrow buttons to move them into the appropriate address columns (To:, Cc:, Bcc:)."
 msgstr ""
 
 #: C/mail-composer-several-recipients.page:48(p)
-msgid ""
-"If you frequently write email to the same groups of people, you can create "
-"<placeholder-1/> to send them mail as though they have a single address."
+msgid "If you frequently write email to the same groups of people, you can create <link xref=\"contacts-using-contact-lists\">contact lists</link> to send them mail as though they have a single address."
 msgstr ""
 
 #: C/mail-composer-search.page:5(desc)
 #, fuzzy
 msgid "Searching for text in the mail composer."
-msgstr "Poišči besedilo v prikazanem opomniku"
+msgstr "Iskanje metapodatkov CD-ja ..."
 
 #: C/mail-composer-search.page:21(title)
 msgid "Searching in the mail composer"
-msgstr ""
+msgstr "Iskanje v ustvarjalniku pošte"
 
 #: C/mail-composer-search.page:23(p)
-msgid ""
-"Under the <placeholder-1/> menu in the message composer there are several "
-"text searching features available."
+msgid "Under the <gui>Edit</gui> menu in the message composer there are several text searching features available."
 msgstr ""
 
-#: C/mail-composer-search.page:26(gui)
-#, fuzzy
-msgid "Find"
-msgstr "Najdi:"
-
-#: C/mail-composer-search.page:26(p) C/mail-composer-search.page:30(p)
-#: C/mail-composer-search.page:34(p)
-#, fuzzy
-msgid "<placeholder-1/>:"
-msgstr "gpg <placeholder-1/>"
+#: C/mail-composer-search.page:26(p)
+msgid "<gui>Find</gui>:"
+msgstr "<gui>Najdi</gui>:"
 
 #: C/mail-composer-search.page:27(p)
 msgid "Enter a word or phrase, and Evolution finds it in your message."
 msgstr ""
 
-#: C/mail-composer-search.page:30(gui)
-#, fuzzy
-msgid "Find Again"
-msgstr "Poskusite ponovno"
+#: C/mail-composer-search.page:30(p)
+msgid "<gui>Find Again</gui>:"
+msgstr "<gui>Poišči znova</gui>:"
 
 #: C/mail-composer-search.page:31(p)
 msgid "Select this item to repeat the last search you performed."
 msgstr ""
 
-#: C/mail-composer-search.page:34(gui)
-#, fuzzy
-msgid "Replace"
-msgstr "Zamenjaj:"
+#: C/mail-composer-search.page:34(p)
+msgid "<gui>Replace</gui>:"
+msgstr "<gui>Zamenjaj</gui>:"
 
 #: C/mail-composer-search.page:35(p)
 msgid "Find a word or phrase, and replace it with something else."
 msgstr ""
 
 #: C/mail-composer-search.page:39(p)
-msgid ""
-"For all of these menu items you can choose whether to search backwards in "
-"the document from the point where your cursor is. You can also determine "
-"whether the search is to be case sensitive in determining a match"
+msgid "For all of these menu items you can choose whether to search backwards in the document from the point where your cursor is. You can also determine whether the search is to be case sensitive in determining a match"
 msgstr ""
 
-#: C/mail-composer-search.page:40(link)
-#, fuzzy
-msgid "Regular expressions"
-msgstr "Logični izraz"
-
 #: C/mail-composer-search.page:40(p)
-msgid ""
-"If you have a technical background you can also select the option to use "
-"<placeholder-1/> for searching."
+msgid "If you have a technical background you can also select the option to use <link href=\"https://secure.wikimedia.org/wikipedia/en/wiki/Regular_expression\">Regular expressions</link> for searching."
 msgstr ""
 
 #: C/mail-composer-reply.page:5(desc)
-#, fuzzy
 msgid "Answering a received email."
-msgstr "Prejeto trenutno sporočilo"
+msgstr "Odgovarjanje na prejeto pošto."
 
 #: C/mail-composer-reply.page:23(title)
-#, fuzzy
 msgid "Replying to a message"
-msgstr "Pojdi na sporočilo"
+msgstr "Odgovarjanje na sporočilo"
 
 #: C/mail-composer-reply.page:26(title)
 #, fuzzy
@@ -7650,116 +4936,77 @@ msgid "Replying to Email Messages"
 msgstr "Pošiljanje %d od %d sporočil ni uspelo"
 
 #: C/mail-composer-reply.page:27(p)
-msgid ""
-"To reply to a message, select the message to reply to in the message list "
-"and click the Reply button in the toolbar, or right-click within the message "
-"and select Reply to Sender. This opens the message composer. The "
-"<placeholder-1/> and <placeholder-2/> fields are already filled, although "
-"you can alter them if you prefer. In addition, the full text of the old "
-"message is inserted into the new message, either in grey with a blue line on "
-"one side (for HTML display) or with the &gt; character before each line (in "
-"plain text mode), to indicate that it is part of the previous message."
+msgid "To reply to a message, select the message to reply to in the message list and click the Reply button in the toolbar, or right-click within the message and select Reply to Sender. This opens the message composer. The <gui>To:</gui> and <gui>Subject:</gui> fields are already filled, although you can alter them if you prefer. In addition, the full text of the old message is inserted into the new message, either in grey with a blue line on one side (for HTML display) or with the &gt; character before each line (in plain text mode), to indicate that it is part of the previous message."
 msgstr ""
 
-#: C/mail-composer-reply.page:28(gui) C/mail-composer-reply.page:33(gui)
-#: C/mail-composer-reply.page:34(gui) C/mail-composer-reply.page:47(p)
-#, fuzzy
-msgid "Reply to All"
-msgstr "Odgovori vsem"
-
-#: C/mail-composer-reply.page:28(gui) C/mail-composer-reply.page:33(gui)
-#: C/mail-composer-reply.page:34(gui)
-#: C/mail-composer-message-templates.page:39(gui)
-msgid "Reply"
-msgstr "Odgovori"
-
 #: C/mail-composer-reply.page:28(p)
-msgid ""
-"If you are reading a message with several recipients, you can use "
-"<placeholder-1/> instead of <placeholder-2/>. If there are large numbers of "
-"people in the <placeholder-3/> or <placeholder-4/> fields, this can save "
-"substantial amounts of time."
+msgid "If you are reading a message with several recipients, you can use <gui>Reply to All</gui> instead of <gui>Reply</gui>. If there are large numbers of people in the <gui>Cc:</gui> or <gui>To:</gui> fields, this can save substantial amounts of time."
 msgstr ""
 
 #: C/mail-composer-reply.page:32(title)
 #, fuzzy
 msgid "Using the Reply To All Feature"
-msgstr "Sestavi odgovor vsem prejemnikom izbranega sporočila"
+msgstr "Ali naj se odgovor sporočilu pošlje vsem prejemnikom?"
 
 #: C/mail-composer-reply.page:33(p)
-msgid ""
-"Susan sends an email to a client and sends copies to Tim and to an internal "
-"company mailing list of co-workers. If Tim wants to make a comment for all "
-"of them to read, he uses <placeholder-1/>, but if he just wants to tell "
-"Susan that he agrees with her, he uses <placeholder-2/>. His reply does not "
-"reach anyone that Susan put on her Bcc list, because that list is not shared "
-"with anyone."
+msgid "Susan sends an email to a client and sends copies to Tim and to an internal company mailing list of co-workers. If Tim wants to make a comment for all of them to read, he uses <gui>Reply to All</gui>, but if he just wants to tell Susan that he agrees with her, he uses <gui>Reply</gui>. His reply does not reach anyone that Susan put on her Bcc list, because that list is not shared with anyone."
 msgstr ""
 
-#: C/mail-composer-reply.page:34(gui)
-#, fuzzy
-msgid "Reply to List"
-msgstr "Odgovori na _seznam"
-
 #: C/mail-composer-reply.page:34(p)
-msgid ""
-"If you subscribe to a mailing list, and want your reply to go just to the "
-"list rather than to the sender, select <placeholder-1/> instead of "
-"<placeholder-2/> or <placeholder-3/>."
+msgid "If you subscribe to a mailing list, and want your reply to go just to the list rather than to the sender, select <gui>Reply to List</gui> instead of <gui>Reply</gui> or <gui>Reply to All</gui>."
 msgstr ""
 
 #: C/mail-composer-reply.page:38(title)
-#, fuzzy
 msgid "Keyboard shortcuts"
-msgstr "Tipkovne bližnice"
+msgstr "Tipkovne bližnjice"
 
 #: C/mail-composer-reply.page:41(p)
 msgid "Action"
 msgstr "Dejanje"
 
 #: C/mail-composer-reply.page:41(p)
-#, fuzzy
 msgid "Shortcut keys"
-msgstr "_Bližnjice tipk:"
+msgstr "Tipkovne bližnjice"
 
 #: C/mail-composer-reply.page:43(p)
-#, fuzzy
 msgid "Reply to Sender"
-msgstr "_Odgovori pošiljatelju"
+msgstr "Odgovori pošiljatelju"
+
+#: C/mail-composer-reply.page:43(key)
+#: C/mail-composer-reply.page:45(key)
+#: C/mail-composer-reply.page:47(key)
+msgid "Ctrl"
+msgstr "Ctrl"
 
-#: C/mail-composer-reply.page:43(key) C/mail-composer-reply.page:47(key)
+#: C/mail-composer-reply.page:43(key)
+#: C/mail-composer-reply.page:47(key)
 msgid "R"
 msgstr "R"
 
 #: C/mail-composer-reply.page:45(p)
-#, fuzzy
 msgid "Reply to Mailing List"
-msgstr "Odgovori na _seznam"
+msgstr "Odgovori vsem na dopisnem seznamu"
 
-#: C/mail-composer-reply.page:45(key) C/calendar-layout-views.page:31(key)
+#: C/mail-composer-reply.page:45(key)
 msgid "L"
 msgstr "L"
 
-#: C/mail-composer-reply.page:53(title) C/mail-composer-forward.page:26(link)
+#: C/mail-composer-reply.page:47(p)
+msgid "Reply to All"
+msgstr "Odgovori vsem"
+
+#: C/mail-composer-reply.page:47(key)
+msgid "Shift"
+msgstr "Shift"
+
+#: C/mail-composer-reply.page:53(title)
 #: C/mail-composer-forward.page:40(title)
-#, fuzzy
 msgid "Default settings"
 msgstr "Privzete nastavitve"
 
-#: C/mail-composer-reply.page:54(gui) C/mail-composer-forward.page:41(gui)
-msgid "Replies and Forwards"
-msgstr "Odgovori in posredovanja"
-
-#: C/mail-composer-reply.page:54(gui) C/mail-composer-forward.page:41(gui)
-#, fuzzy
-msgid "Forward style"
-msgstr "Način _posredovanja:"
-
-#: C/mail-composer-reply.page:54(p) C/mail-composer-forward.page:41(p)
-msgid ""
-"The default settings for replying and forwarding can be changed under "
-"<guiseq><placeholder-1/><placeholder-2/><placeholder-3/><placeholder-4/"
-"><placeholder-5/><placeholder-6/></guiseq>."
+#: C/mail-composer-reply.page:54(p)
+#: C/mail-composer-forward.page:41(p)
+msgid "The default settings for replying and forwarding can be changed under <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Composer Preferences</gui><gui>General</gui><gui>Replies and Forwards</gui><gui>Forward style</gui></guiseq>."
 msgstr ""
 
 #: C/mail-composer-priority.page:5(desc)
@@ -7769,37 +5016,14 @@ msgstr ""
 #: C/mail-composer-priority.page:23(title)
 #, fuzzy
 msgid "Prioritizing outgoing messages"
-msgstr "Naredi sporočilo _prednostno"
-
-#: C/mail-composer-priority.page:25(gui)
-#: C/mail-composer-html-text.page:25(gui)
-#: C/mail-composer-html-table.page:25(gui)
-#: C/mail-composer-html-rule.page:25(gui)
-#: C/mail-composer-html-link.page:27(gui)
-#: C/mail-composer-html-image.page:25(gui)
-#: C/mail-composer-custom-header-lines.page:42(gui)
-#: C/mail-attachments-sending.page:30(gui)
-#, fuzzy
-msgid "Insert"
-msgstr "_Vstavi"
-
-#: C/mail-composer-priority.page:25(gui)
-#, fuzzy
-msgid "Prioritize Message"
-msgstr "Naredi sporočilo _prednostno"
+msgstr "Predvajaj zvok ob pošiljanju sporočila"
 
 #: C/mail-composer-priority.page:25(p)
-msgid ""
-"You can prioritize a message to be sent, so that the recipient sees its "
-"relative importance. To prioritize a message, click <guiseq><placeholder-1/"
-"><placeholder-2/></guiseq> in the composer window."
+msgid "You can prioritize a message to be sent, so that the recipient sees its relative importance. To prioritize a message, click <guiseq><gui>Insert</gui><gui>Prioritize Message</gui></guiseq> in the composer window."
 msgstr ""
 
 #: C/mail-composer-priority.page:27(p)
-msgid ""
-"Evolution will ignore the message priority of incoming messages because the "
-"recipient should decide whether the message is important or not. You can set "
-"the \"Important\" flag for any messages."
+msgid "Evolution will ignore the message priority of incoming messages because the recipient should decide whether the message is important or not. You can set the \"Important\" flag for any messages."
 msgstr ""
 
 #: C/mail-composer-message-templates.page:5(desc)
@@ -7809,26 +5033,14 @@ msgstr ""
 #: C/mail-composer-message-templates.page:23(title)
 #, fuzzy
 msgid "Message Templates"
-msgstr "Filtri sporočil"
+msgstr "Nedavne predloge"
 
 #: C/mail-composer-message-templates.page:24(p)
-msgid ""
-"A message template is a standard message that you can use at any time to "
-"send mail with the same pattern."
+msgid "A message template is a standard message that you can use at any time to send mail with the same pattern."
 msgstr ""
 
-#: C/mail-composer-message-templates.page:25(gui)
-#: C/mail-composer-message-templates.page:35(gui)
-#: C/mail-composer-message-templates.page:61(gui)
-#: C/mail-composer-message-templates.page:62(gui)
-#: C/mail-composer-message-templates.page:78(gui)
-msgid "Templates"
-msgstr "Predloge"
-
 #: C/mail-composer-message-templates.page:25(p)
-msgid ""
-"To enable the Message Template Plugin, click <guiseq><placeholder-1/"
-"><placeholder-2/></guiseq> and enable <placeholder-3/>."
+msgid "To enable the Message Template Plugin, click <guiseq><gui>Edit</gui><gui>Plugins</gui></guiseq> and enable <gui>Templates</gui>."
 msgstr ""
 
 #: C/mail-composer-message-templates.page:31(title)
@@ -7836,27 +5048,15 @@ msgid "Creating a Message Template from an existing Message"
 msgstr ""
 
 #: C/mail-composer-message-templates.page:33(p)
-#, fuzzy
 msgid "Select the message."
-msgstr "Izberi _nit sporočila"
-
-#: C/mail-composer-message-templates.page:34(gui)
-#, fuzzy
-msgid "Move to folder"
-msgstr "Premakne v mapo"
-
-#: C/mail-composer-message-templates.page:34(gui)
-#, fuzzy
-msgid "Copy to folder"
-msgstr "Kopira v mapo"
+msgstr "Izberi sporočilo."
 
 #: C/mail-composer-message-templates.page:34(p)
-msgid ""
-"Right-click the message and choose <placeholder-1/> or <placeholder-2/>."
+msgid "Right-click the message and choose <gui>Move to folder</gui> or <gui>Copy to folder</gui>."
 msgstr ""
 
 #: C/mail-composer-message-templates.page:35(p)
-msgid "Select the <placeholder-1/> folder under <placeholder-2/>."
+msgid "Select the <gui>Templates</gui> folder under <gui>On This Computer</gui>."
 msgstr ""
 
 #: C/mail-composer-message-templates.page:37(p)
@@ -7864,26 +5064,24 @@ msgid "You can also edit an existing message and save it as a template:"
 msgstr ""
 
 #: C/mail-composer-message-templates.page:39(p)
-msgid "Open the message and click <placeholder-1/>."
+msgid "Open the message and click <gui>Reply</gui>."
 msgstr ""
 
 #: C/mail-composer-message-templates.page:40(p)
 msgid "Edit the message body or the addresses according to your requirements."
 msgstr ""
 
-#: C/mail-composer-message-templates.page:41(gui)
-#: C/mail-composer-message-templates.page:52(gui)
-msgid "Save as Template"
-msgstr "Shrani kot predlogo"
+#: C/mail-composer-message-templates.page:41(p)
+#: C/mail-composer-message-templates.page:52(p)
+msgid "Select <guiseq><gui>File</gui><gui>Save as Template</gui></guiseq>."
+msgstr ""
 
 #: C/mail-composer-message-templates.page:46(title)
 msgid "Saving a New Message as a Template"
 msgstr ""
 
 #: C/mail-composer-message-templates.page:49(p)
-msgid ""
-"Click <placeholder-1/> and enter in the composer window what you need for "
-"the template."
+msgid "Click <gui>New</gui> and enter in the composer window what you need for the template."
 msgstr ""
 
 #: C/mail-composer-message-templates.page:58(title)
@@ -7892,27 +5090,24 @@ msgstr ""
 
 #: C/mail-composer-message-templates.page:61(p)
 #, fuzzy
-msgid ""
-"Right-click the message you are replying to, then click <placeholder-1/>."
-msgstr "desnim klikom na mapo in nato izberemo možnost lastnosti."
+msgid "Right-click the message you are replying to, then click <gui>Templates</gui>."
+msgstr "Zbrisana sporočila prikaži na seznamu sporočil"
 
 #: C/mail-composer-message-templates.page:62(p)
-#, fuzzy
-msgid ""
-"This option lists all the message templates in the <placeholder-1/> folder."
+msgid "This option lists all the message templates in the <gui>Templates</gui> folder."
 msgstr ""
-"To bo označilo vsa sporočila v izbrani mapi in njenih podmapah kot prebrana."
 
 #: C/mail-composer-message-templates.page:65(p)
-msgid ""
-"Select the message template of your choice. Make changes if required in the "
-"email composer window that will open."
+msgid "Select the message template of your choice. Make changes if required in the email composer window that will open."
 msgstr ""
 
+#: C/mail-composer-message-templates.page:68(p)
+#, fuzzy
+msgid "Click <gui>Send</gui>."
+msgstr "Kliknite <gui>Natisni</gui>."
+
 #: C/mail-composer-message-templates.page:69(p)
-msgid ""
-"When you select a message template for replying, the subject of the reply is "
-"preserved."
+msgid "When you select a message template for replying, the subject of the reply is preserved."
 msgstr ""
 
 #: C/mail-composer-message-templates.page:75(title)
@@ -7920,35 +5115,39 @@ msgstr ""
 msgid "Configuring Message Templates"
 msgstr "Ni prostih predlog"
 
+#: C/mail-composer-message-templates.page:77(p)
+#: C/mail-composer-custom-header-lines.page:31(p)
+#: C/mail-attachments-sending.page:46(p)
+#, fuzzy
+msgid "Select <guiseq><gui>Edit</gui><gui>Plugins</gui></guiseq>."
+msgstr "Kliknite na zavihek <guiseq><gui>Uredi</gui><gui>Možnosti</gui><gui>Vstavki</gui></guiseq>."
+
+#: C/mail-composer-message-templates.page:78(p)
+#, fuzzy
+msgid "Click <gui>Templates</gui>."
+msgstr "Kliknite <gui>Natisni</gui>."
+
+#: C/mail-composer-message-templates.page:79(p)
+#: C/mail-composer-custom-header-lines.page:33(p)
+#: C/mail-attachments-sending.page:48(p)
+#, fuzzy
+msgid "Click the <gui>Configuration</gui> tab."
+msgstr "Izberite zavihek <gui>Iskanje</gui>."
+
 #: C/mail-composer-message-templates.page:80(p)
-msgid ""
-"You can add, edit or remove the key-value pairs. You can specify any number "
-"of key-value pairs."
+msgid "You can add, edit or remove the key-value pairs. You can specify any number of key-value pairs."
 msgstr ""
 
 #: C/mail-composer-message-templates.page:82(p)
-msgid ""
-"In any template, the occurrence of every $key is replaced by the value it "
-"has in the configuration. For example, if you set the key to Manager and the "
-"value to Harry, any occurrence of $Manager is replaced by Harry in the "
-"message."
+msgid "In any template, the occurrence of every $key is replaced by the value it has in the configuration. For example, if you set the key to Manager and the value to Harry, any occurrence of $Manager is replaced by Harry in the message."
 msgstr ""
 
 #: C/mail-composer-message-templates.page:83(p)
-msgid ""
-"Assume that you have 1000 message templates with your current manager's name "
-"in them. When the current manager is replaced by a new one, it is not easy "
-"for you to manually replace the manager's name in all the 1000 messages. If "
-"the messages have a $Manager key value, you can reset the value in the "
-"Configuration tab of this plugin."
+msgid "Assume that you have 1000 message templates with your current manager's name in them. When the current manager is replaced by a new one, it is not easy for you to manually replace the manager's name in all the 1000 messages. If the messages have a $Manager key value, you can reset the value in the Configuration tab of this plugin."
 msgstr ""
 
 #: C/mail-composer-message-templates.page:84(p)
-msgid ""
-"By default, the entire environment variables are used as a key-value pair. "
-"An occurrence of $env_variable is replaced by the value it carries. For "
-"example, an occurrence of $PATH in your template is replaced by its value "
-"when the template is used."
+msgid "By default, the entire environment variables are used as a key-value pair. An occurrence of $env_variable is replaced by the value it carries. For example, an occurrence of $PATH in your template is replaced by its value when the template is used."
 msgstr ""
 
 #: C/mail-composer-message-templates.page:85(p)
@@ -7956,21 +5155,15 @@ msgid "The replacement process uses the following order of precedence:"
 msgstr ""
 
 #: C/mail-composer-message-templates.page:88(p)
-msgid ""
-"$key is replaced by the value set for it in the Configuration tab of the "
-"Templates plugin."
+msgid "$key is replaced by the value set for it in the Configuration tab of the Templates plugin."
 msgstr ""
 
 #: C/mail-composer-message-templates.page:91(p)
-msgid ""
-"If the key is not found, it is then replaced with the value of its "
-"environment variable."
+msgid "If the key is not found, it is then replaced with the value of its environment variable."
 msgstr ""
 
 #: C/mail-composer-message-templates.page:94(p)
-msgid ""
-"If key is neither a configuration option nor an environment variable, no "
-"changes are made."
+msgid "If key is neither a configuration option nor an environment variable, no changes are made."
 msgstr ""
 
 #: C/mail-composer-mail-signatures-per-account.page:5(desc)
@@ -7980,45 +5173,14 @@ msgstr ""
 #: C/mail-composer-mail-signatures-per-account.page:32(title)
 #, fuzzy
 msgid "Default account signature"
-msgstr "Privzet opomnik za sestanke"
-
-#: C/mail-composer-mail-signatures-per-account.page:34(link)
-msgid "signature"
-msgstr "podpis"
-
-#: C/mail-composer-mail-signatures-per-account.page:34(gui)
-#: C/mail-account-manage-usenet-news.page:28(title)
-#: C/mail-account-manage-unix-mbox-spool-file.page:28(title)
-#: C/mail-account-manage-unix-mbox-spool-directory.page:28(title)
-#: C/mail-account-manage-pop.page:28(title)
-#: C/mail-account-manage-novell-groupwise.page:29(title)
-#: C/mail-account-manage-microsoft-exchange-evo-mapi.page:29(title)
-#: C/mail-account-manage-microsoft-exchange-evo-exchange.page:29(title)
-#: C/mail-account-manage-mh-format-directories.page:28(title)
-#: C/mail-account-manage-maildir-format-directories.page:28(title)
-#: C/mail-account-manage-local-delivery.page:28(title)
-#: C/mail-account-manage-imap-plus.page:28(title)
-#: C/mail-account-manage-imap.page:28(title) C/intro-first-run.page:25(title)
-msgid "Identity"
-msgstr "Istovetnost"
-
-#: C/mail-composer-mail-signatures-per-account.page:34(gui)
-msgid "Optional Information"
-msgstr "Dodatne podrobnosti"
+msgstr "Niz UID privzetega računa."
 
 #: C/mail-composer-mail-signatures-per-account.page:34(p)
-msgid ""
-"You can define a default <placeholder-1/> for each of your mail accounts. "
-"This can be edited under <guiseq><placeholder-2/><placeholder-3/"
-"><placeholder-4/><placeholder-5/><placeholder-6/><placeholder-7/></guiseq>."
+msgid "You can define a default <link xref=\"mail-composer-mail-signatures\">signature</link> for each of your mail accounts. This can be edited under <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Mail Accounts</gui><gui>Edit</gui><gui>Identity</gui><gui>Optional Information</gui></guiseq>."
 msgstr ""
 
 #: C/mail-composer-mail-signatures-per-account.page:36(p)
-msgid ""
-"If you have a signature for your account defined but exceptionally do not "
-"want to use it for one message, or want to use a different signature, you "
-"can change it via the dropdown menu in the right upper corner in the email "
-"composer window."
+msgid "If you have a signature for your account defined but exceptionally do not want to use it for one message, or want to use a different signature, you can change it via the dropdown menu in the right upper corner in the email composer window."
 msgstr ""
 
 #: C/mail-composer-mail-signatures.page:5(desc)
@@ -8028,28 +5190,14 @@ msgstr ""
 #: C/mail-composer-mail-signatures.page:21(title)
 #, fuzzy
 msgid "Working with email signatures"
-msgstr "Sestavljanje nove pošte z ClawsMail"
-
-#: C/mail-composer-mail-signatures.page:23(code)
-msgid "--"
-msgstr "--"
+msgstr "Delo z <app>Giggle</app>"
 
 #: C/mail-composer-mail-signatures.page:23(p)
-msgid ""
-"A signature consists of one or more lines of text (or even a picture) that "
-"will be added at the end of an email that you send. It can contain contact "
-"information or other things. A signature always begins with two dashes and a "
-"space (<placeholder-1/>)."
+msgid "A signature consists of one or more lines of text (or even a picture) that will be added at the end of an email that you send. It can contain contact information or other things. A signature always begins with two dashes and a space (<code>-- </code>)."
 msgstr ""
 
-#: C/mail-composer-mail-signatures.page:24(link)
-#, fuzzy
-msgid "encryption"
-msgstr "Šifriranje"
-
 #: C/mail-composer-mail-signatures.page:24(p)
-msgid ""
-"The term \"signature\" is also differently used in terms of <placeholder-1/>."
+msgid "The term \"signature\" is also differently used in terms of <link xref=\"mail-encryption\">encryption</link>."
 msgstr ""
 
 #: C/mail-composer-mail-signatures-manage.page:5(desc)
@@ -8059,39 +5207,19 @@ msgstr ""
 #: C/mail-composer-mail-signatures-manage.page:20(title)
 #, fuzzy
 msgid "Managing signatures"
-msgstr "Neveljaven podpis"
-
-#: C/mail-composer-mail-signatures-manage.page:22(gui)
-#, fuzzy
-msgid "Composer preferences"
-msgstr "Možnosti sestavljalnika"
-
-#: C/mail-composer-mail-signatures-manage.page:22(gui)
-msgid "Signatures"
-msgstr "Podpisi"
+msgstr "Preverjanje podpisov"
 
 #: C/mail-composer-mail-signatures-manage.page:22(p)
-msgid ""
-"You can add, edit and delete all your signatures under "
-"<guiseq><placeholder-1/><placeholder-2/><placeholder-3/><placeholder-4/></"
-"guiseq>."
+msgid "You can add, edit and delete all your signatures under <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Composer preferences</gui><gui>Signatures</gui></guiseq>."
 msgstr ""
 
-#: C/mail-composer-mail-signatures-manage.page:23(link)
-#, fuzzy
-msgid "account settings"
-msgstr "Nastavite računa Yahoo:"
-
 #: C/mail-composer-mail-signatures-manage.page:23(p)
-msgid ""
-"Assigning a default signature to an email account has to be done in the "
-"<placeholder-1/>."
+msgid "Assigning a default signature to an email account has to be done in the <link xref=\"mail-composer-mail-signatures-per-account\">account settings</link>."
 msgstr ""
 
 #: C/mail-composer-html-text.page:5(desc)
-#, fuzzy
 msgid "Format Text in the mail composer."
-msgstr "Sestavljalnik pošte Evolution"
+msgstr ""
 
 #: C/mail-composer-html-text.page:21(title)
 #, fuzzy
@@ -8100,63 +5228,24 @@ msgstr "Sporočila oblikuj v _HTML"
 
 #. TODO: These instructions are partially WRONG in 3.0.2 as the tool bar has been split into two. Needs an update. Maybe we also need a way to describe the non-HTML-only functions for plain text mail somewhere.
 #: C/mail-composer-html-text.page:25(p)
-msgid ""
-"HTML formatting tools are located in the two tool bars just above the area "
-"where you actually write the message. They also appear in the <placeholder-1/"
-"> and <placeholder-2/> menus."
+msgid "HTML formatting tools are located in the two tool bars just above the area where you actually write the message. They also appear in the <gui>Insert</gui> and <gui>Format</gui> menus."
 msgstr ""
 
 #: C/mail-composer-html-text.page:26(p)
-msgid ""
-"The icons in the tool bar are explained in tooltips which appear when you "
-"hold your mouse pointer over the buttons. The buttons fall into five "
-"categories:"
+msgid "The icons in the tool bar are explained in tooltips which appear when you hold your mouse pointer over the buttons. The buttons fall into five categories:"
 msgstr ""
 
 #: C/mail-composer-html-text.page:29(title)
 #, fuzzy
 msgid "Headers and Lists:"
-msgstr "Seznam dejavnih razširitev."
-
-#: C/mail-composer-html-text.page:30(gui)
-msgid "Normal"
-msgstr "Običajno"
-
-#: C/mail-composer-html-text.page:30(gui)
-#, fuzzy
-msgid "Header 1"
-msgstr "Glava"
-
-#: C/mail-composer-html-text.page:30(gui)
-#, fuzzy
-msgid "Header 6"
-msgstr "Glava"
-
-#: C/mail-composer-html-text.page:30(gui)
-#, fuzzy
-msgid "Preformat"
-msgstr "Oblika izpisa časa:"
+msgstr "Seznami in predmeti seznamov"
 
 #: C/mail-composer-html-text.page:30(p)
-msgid ""
-"At the left of the upper tool bar, you can choose <placeholder-1/> for a "
-"default text style or <placeholder-2/> through <placeholder-3/> for varying "
-"sizes of header from large (1) to tiny (6). Other styles include "
-"<placeholder-4/>, to use the HTML tag for preformatted blocks of text, and "
-"three types of bullet points for lists."
+msgid "At the left of the upper tool bar, you can choose <gui>Normal</gui> for a default text style or <gui>Header 1</gui> through <gui>Header 6</gui> for varying sizes of header from large (1) to tiny (6). Other styles include <gui>Preformat</gui>, to use the HTML tag for preformatted blocks of text, and three types of bullet points for lists."
 msgstr ""
 
-#: C/mail-composer-html-text.page:31(gui)
-#, fuzzy
-msgid "Bulleted List"
-msgstr "_Izbriši seznam opomnikov"
-
 #: C/mail-composer-html-text.page:31(p)
-msgid ""
-"For instance, instead of using asterisks to mark a bulleted list, you can "
-"use the <placeholder-1/> style from the style dropdown list. Evolution uses "
-"different bullet styles, and handles word wrap and multiple levels of "
-"indentation."
+msgid "For instance, instead of using asterisks to mark a bulleted list, you can use the <gui>Bulleted List</gui> style from the style dropdown list. Evolution uses different bullet styles, and handles word wrap and multiple levels of indentation."
 msgstr ""
 
 #: C/mail-composer-html-text.page:35(title)
@@ -8165,11 +5254,7 @@ msgid "Alignment:"
 msgstr "Poravnava:"
 
 #: C/mail-composer-html-text.page:36(p)
-msgid ""
-"Located next to the Headers and Lists dropdown, the three paragraph icons "
-"should be familiar to users of most word processing software. The left-most "
-"button aligns your text to the left, the center button centers text, and the "
-"right button aligns the text to the right."
+msgid "Located next to the Headers and Lists dropdown, the three paragraph icons should be familiar to users of most word processing software. The left-most button aligns your text to the left, the center button centers text, and the right button aligns the text to the right."
 msgstr ""
 
 #: C/mail-composer-html-text.page:40(title)
@@ -8178,9 +5263,7 @@ msgid "Indentation Rules:"
 msgstr "Uredi pravila"
 
 #: C/mail-composer-html-text.page:41(p)
-msgid ""
-"The button with the arrow pointing left decreases a paragraph's indentation, "
-"and the right arrow increases its indentation."
+msgid "The button with the arrow pointing left decreases a paragraph's indentation, and the right arrow increases its indentation."
 msgstr ""
 
 #: C/mail-composer-html-text.page:45(title)
@@ -8189,10 +5272,7 @@ msgid "Text Styles:"
 msgstr "_Slog mesta:"
 
 #: C/mail-composer-html-text.page:46(p)
-msgid ""
-"Use these buttons in the lower tool bar to determine the way your email "
-"looks. If you have text selected, the style applies to the selected text. If "
-"you do not have text selected, the style applies to whatever you type next."
+msgid "Use these buttons in the lower tool bar to determine the way your email looks. If you have text selected, the style applies to the selected text. If you do not have text selected, the style applies to whatever you type next."
 msgstr ""
 
 #: C/mail-composer-html-text.page:50(p)
@@ -8200,15 +5280,13 @@ msgid "Button"
 msgstr "Gumb"
 
 #: C/mail-composer-html-text.page:51(p)
-#: C/calendar-usage-add-appointment.page:31(gui)
-#: C/calendar-meetings-sending-invitation.page:41(gui)
 msgid "Description"
 msgstr "Opis"
 
 #: C/mail-composer-html-text.page:54(p)
 #, fuzzy
 msgid "TT"
-msgstr "Strojno podčrtano"
+msgstr "{0:h tt}"
 
 #: C/mail-composer-html-text.page:55(p)
 msgid "Typewriter text, which is similar to a monospace font."
@@ -8219,9 +5297,8 @@ msgid "Bold A"
 msgstr "Krepko"
 
 #: C/mail-composer-html-text.page:59(p)
-#, fuzzy
 msgid "Bolds the text."
-msgstr "Besedilne datoteke"
+msgstr "Odebeli besedilo."
 
 #: C/mail-composer-html-text.page:62(p)
 msgid "Italic A"
@@ -8250,32 +5327,15 @@ msgstr "prečrtano"
 #: C/mail-composer-html-text.page:71(p)
 #, fuzzy
 msgid "Marks a line through the text."
-msgstr "Prečrtano besedilo (zastarelo)"
+msgstr "Označi konec izbora beesedila: konec izbire kopiranja"
 
 #: C/mail-composer-html-text.page:77(title)
 #, fuzzy
 msgid "Color Selection:"
 msgstr "Izbira barve"
 
-#: C/mail-composer-html-text.page:78(gui)
-#, fuzzy
-msgid "Style"
-msgstr "Ime sloga:"
-
-#: C/mail-composer-html-text.page:78(gui)
-#, fuzzy
-msgid "Page Style"
-msgstr "Nastavitev strani:"
-
 #: C/mail-composer-html-text.page:78(p)
-msgid ""
-"At the left in the lower tool bar is the color section tool, where a box "
-"displays the current text color. To choose a new color, click the arrow "
-"button to the right. If you have text selected, the color applies to the "
-"selected text. If you do not have text selected, the color applies to "
-"whatever you type next. You can select a background color or image by right-"
-"clicking the message background, then selecting <guiseq><placeholder-1/"
-"><placeholder-2/></guiseq>."
+msgid "At the left in the lower tool bar is the color section tool, where a box displays the current text color. To choose a new color, click the arrow button to the right. If you have text selected, the color applies to the selected text. If you do not have text selected, the color applies to whatever you type next. You can select a background color or image by right-clicking the message background, then selecting <guiseq><gui>Style</gui><gui>Page Style</gui></guiseq>."
 msgstr ""
 
 #: C/mail-composer-html-table.page:5(desc)
@@ -8285,22 +5345,14 @@ msgstr ""
 #: C/mail-composer-html-table.page:21(title)
 #, fuzzy
 msgid "Inserting a Table in HTML"
-msgstr "<b>Podrobnosti preglednice</b>"
+msgstr "Sporočila oblikuj v _HTML"
 
 #: C/mail-composer-html-table.page:23(p)
-msgid ""
-"You can insert a table into the email (at the current position of the "
-"cursor):"
+msgid "You can insert a table into the email (at the current position of the cursor):"
 msgstr ""
 
-#: C/mail-composer-html-table.page:25(gui)
-#, fuzzy
-msgid "Table..."
-msgstr "Razpredelnica"
-
-#: C/mail-composer-html-table.page:25(p) C/mail-composer-html-rule.page:25(p)
-#: C/mail-composer-html-image.page:25(p)
-msgid "Click <guiseq><placeholder-1/><placeholder-2/></guiseq> in the menubar."
+#: C/mail-composer-html-table.page:25(p)
+msgid "Click <guiseq><gui>Insert</gui><gui>Table...</gui></guiseq> in the menubar."
 msgstr ""
 
 #: C/mail-composer-html-table.page:26(p)
@@ -8311,12 +5363,12 @@ msgstr "Ravnilo med vrsticami in stolpci"
 #: C/mail-composer-html-table.page:27(p)
 #, fuzzy
 msgid "Define the type of layout for the table."
-msgstr "Izbor vrste preglednice razdelkov:"
+msgstr "Izbor vrste razpredelnice razdelkov:"
 
 #: C/mail-composer-html-table.page:28(p)
 #, fuzzy
 msgid "Optionally: Select a background color or image for the table."
-msgstr "Seznam stolpcev za preglednico '%s'"
+msgstr "Seznam stolpcev za razpredelnico '%s'"
 
 #: C/mail-composer-html-rule.page:5(desc)
 msgid "Insert a horizontal line in the mail composer."
@@ -8325,32 +5377,25 @@ msgstr ""
 #: C/mail-composer-html-rule.page:21(title)
 #, fuzzy
 msgid "Inserting a Rule in HTML"
-msgstr "Ime pravila:"
+msgstr "Sporočila oblikuj v _HTML"
 
 #: C/mail-composer-html-rule.page:23(p)
-msgid ""
-"You can insert a horizontal line into the email (at the current position of "
-"the cursor) to help divide two sections:"
+msgid "You can insert a horizontal line into the email (at the current position of the cursor) to help divide two sections:"
 msgstr ""
 
-#: C/mail-composer-html-rule.page:25(gui)
-#, fuzzy
-msgid "Rule..."
-msgstr "_Polno ime ..."
+#: C/mail-composer-html-rule.page:25(p)
+msgid "Click <guiseq><gui>Insert</gui><gui>Rule...</gui></guiseq> in the menubar."
+msgstr ""
 
 #: C/mail-composer-html-rule.page:26(p)
 #, fuzzy
 msgid "Select width, size, and alignment."
-msgstr "Izberite širino, velikost in poravnavo."
-
-#: C/mail-composer-html-rule.page:27(gui)
-msgid "Shaded"
-msgstr ""
+msgstr "Izberite želeno pisavo in velikost."
 
 #: C/mail-composer-html-rule.page:27(p)
 #, fuzzy
-msgid "Select <placeholder-1/> if wanted."
-msgstr "gpg <placeholder-1/>"
+msgid "Select <gui>Shaded</gui> if wanted."
+msgstr "Po želji izberite tudi senčenje."
 
 #: C/mail-composer-html.page:5(desc)
 msgid "Format emails by using HTML instead of plain text."
@@ -8361,49 +5406,25 @@ msgid "Using HTML format to enhance emails"
 msgstr ""
 
 #: C/mail-composer-html.page:23(p)
-msgid ""
-"Normally, you cannot set text styles or insert pictures in email. However, "
-"most newer email programs can display images and text styles in addition to "
-"basic alignment and paragraph formatting. They do this with HTML, just like "
-"web pages do."
+msgid "Normally, you cannot set text styles or insert pictures in email. However, most newer email programs can display images and text styles in addition to basic alignment and paragraph formatting. They do this with HTML, just like web pages do."
 msgstr ""
 
 #: C/mail-composer-html.page:25(p)
-msgid ""
-"Some people do not have HTML-capable mail clients, or prefer not to receive "
-"HTML-enhanced mail because it is slower to download and display. Because of "
-"this, Evolution sends plain text unless you explicitly ask for HTML."
+msgid "Some people do not have HTML-capable mail clients, or prefer not to receive HTML-enhanced mail because it is slower to download and display. Because of this, Evolution sends plain text unless you explicitly ask for HTML."
 msgstr ""
 
-#: C/mail-composer-html.page:27(gui)
-msgid "HTML"
-msgstr "HTML"
-
 #: C/mail-composer-html.page:27(p)
-msgid ""
-"You can change the format of an email message from plain text to HTML by "
-"choosing <guiseq><placeholder-1/><placeholder-2/></guiseq> from the menu bar."
+msgid "You can change the format of an email message from plain text to HTML by choosing <guiseq><gui>Format</gui><gui>HTML</gui></guiseq> from the menu bar."
 msgstr ""
 
-#: C/mail-composer-html.page:28(gui)
-msgid "Default Behavior"
-msgstr "Privzeto obnašanje"
-
-#: C/mail-composer-html.page:28(gui)
-#, fuzzy
-msgid "Format messages in HTML"
-msgstr "Sporočila oblikuj v _HTML"
-
 #: C/mail-composer-html.page:28(p)
-msgid ""
-"To send all your mail as HTML by default, enable <guiseq><placeholder-1/"
-"><placeholder-2/><placeholder-3/><placeholder-4/><placeholder-5/></guiseq>."
+msgid "To send all your mail as HTML by default, enable <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Composer Preferences</gui><gui>Default Behavior</gui><gui>Format messages in HTML</gui></guiseq>."
 msgstr ""
 
 #: C/mail-composer-html.page:31(title)
 #, fuzzy
 msgid "HTML Formatting Options"
-msgstr "Možnosti sledenja"
+msgstr "<b>HTML možnosti izvoza:</b>"
 
 #: C/mail-composer-html-link.page:5(desc)
 msgid "Insert a link to a website in the mail composer."
@@ -8412,7 +5433,7 @@ msgstr ""
 #: C/mail-composer-html-link.page:21(title)
 #, fuzzy
 msgid "Inserting a Link in HTML"
-msgstr "Izbrana povezava"
+msgstr "Sporočila oblikuj v _HTML"
 
 #: C/mail-composer-html-link.page:24(p)
 msgid "You can insert links into the email:"
@@ -8423,30 +5444,17 @@ msgstr ""
 msgid "Select the text that you want to turn into a link."
 msgstr "Izbor fotoaparata za prenos datotek"
 
-#: C/mail-composer-html-link.page:27(gui)
-msgid "Link..."
-msgstr ""
-
-#: C/mail-composer-html-link.page:27(gui)
-#, fuzzy
-msgid "Insert Link"
-msgstr "Izbrana povezava"
-
 #: C/mail-composer-html-link.page:27(p)
-msgid ""
-"Either click <guiseq><placeholder-1/><placeholder-2/></guiseq> in the "
-"menubar, or right-click on the selected text and click <placeholder-3/>."
+msgid "Either click <guiseq><gui>Insert</gui><gui>Link...</gui></guiseq> in the menubar, or right-click on the selected text and click <gui>Insert Link</gui>."
 msgstr ""
 
 #: C/mail-composer-html-link.page:28(p)
 #, fuzzy
-msgid "Enter the address in the <placeholder-1/> field."
-msgstr "Vnesite vaše geslo v polje <b>Novo geslo</b>."
+msgid "Enter the address in the <gui>URL</gui> field."
+msgstr "Neveljavno polje v ukazu"
 
 #: C/mail-composer-html-link.page:32(p)
-msgid ""
-"If you do not want a special link text you can just enter the address of the "
-"link directly. It will be automatically recognized as a link."
+msgid "If you do not want a special link text you can just enter the address of the link directly. It will be automatically recognized as a link."
 msgstr ""
 
 #: C/mail-composer-html-image.page:5(desc)
@@ -8456,34 +5464,33 @@ msgstr ""
 #: C/mail-composer-html-image.page:21(title)
 #, fuzzy
 msgid "Inserting an Image in HTML"
-msgstr "Izrisovanje slike"
+msgstr "Sporočila oblikuj v _HTML"
 
 #: C/mail-composer-html-image.page:23(p)
-msgid ""
-"You can insert an image into the email (at the current position of the "
-"cursor):"
+msgid "You can insert an image into the email (at the current position of the cursor):"
 msgstr ""
 
-#: C/mail-composer-html-image.page:25(gui)
-#, fuzzy
-msgid "Image..."
-msgstr "Slika"
+#: C/mail-composer-html-image.page:25(p)
+msgid "Click <guiseq><gui>Insert</gui><gui>Image...</gui></guiseq> in the menubar."
+msgstr ""
 
 #: C/mail-composer-html-image.page:26(p)
 #, fuzzy
 msgid "Browse to and select the file."
-msgstr "Izberite slikovno datoteko, ki naj se doda kot vzorec"
+msgstr "Izberite datoteko za nalaganje"
+
+#: C/mail-composer-html-image.page:27(p)
+#, fuzzy
+msgid "Click <gui>Open</gui>."
+msgstr "Kliknite za odpiranje %s"
 
 #: C/mail-composer-html-image.page:30(note)
-msgid ""
-"Alternately, you can also drag an image into the text area of the message "
-"composer."
+msgid "Alternately, you can also drag an image into the text area of the message composer."
 msgstr ""
 
 #: C/mail-composer-forward.page:5(desc)
-#, fuzzy
 msgid "Forwarding a received email to somebody."
-msgstr "Nekomu posreduje izbrano sporočilo"
+msgstr ""
 
 #: C/mail-composer-forward.page:23(title)
 #, fuzzy
@@ -8491,59 +5498,27 @@ msgid "Forwarding a message"
 msgstr "Neimenovano sporočilo"
 
 #: C/mail-composer-forward.page:25(p)
-msgid ""
-"When you receive an email, you can forward it to other individuals or groups "
-"that might be interested."
+msgid "When you receive an email, you can forward it to other individuals or groups that might be interested."
 msgstr ""
 
 #: C/mail-composer-forward.page:26(p)
-msgid ""
-"You can forward a message as an attachment to a new message (this is the "
-"default setting, see <placeholder-1/>), inline (in your message without the "
-"&gt; character before each line), or quoted (with &gt; character before each "
-"line)."
+msgid "You can forward a message as an attachment to a new message (this is the default setting, see <link xref=\"#default-settings\">Default settings</link>), inline (in your message without the &gt; character before each line), or quoted (with &gt; character before each line)."
 msgstr ""
 
 #: C/mail-composer-forward.page:27(p)
-msgid ""
-"Attachment forwarding is best if you want to send the full, unaltered "
-"message to someone else. Inline or Quoted forwarding is best if you want to "
-"send portions of a message, or if you have a large number of comments on "
-"different sections of the message you are forwarding."
+msgid "Attachment forwarding is best if you want to send the full, unaltered message to someone else. Inline or Quoted forwarding is best if you want to send portions of a message, or if you have a large number of comments on different sections of the message you are forwarding."
 msgstr ""
 
 #: C/mail-composer-forward.page:29(p)
-#, fuzzy
 msgid "To forward a message that you are reading:"
-msgstr "Začasno skrije vsa prebrana sporočila"
-
-#: C/mail-composer-forward.page:31(gui)
-msgid "Forward"
-msgstr "Posreduj"
-
-#: C/mail-composer-forward.page:31(key)
-msgid "F"
-msgstr "F"
-
-#: C/mail-composer-forward.page:31(gui)
-#, fuzzy
-msgid "Forward as"
-msgstr "P_osreduj kot"
+msgstr ""
 
 #: C/mail-composer-forward.page:31(p)
-msgid ""
-"Click <guiseq><placeholder-1/><placeholder-2/></guiseq>, the <placeholder-3/"
-"> button in the toolbar, or press <keyseq><placeholder-4/><placeholder-5/></"
-"keyseq> to use the default forwarding method. In case you want to use a "
-"different forward method, click <guiseq><placeholder-6/><placeholder-7/></"
-"guiseq> or the small dropdown arrow next to the <placeholder-8/> button in "
-"the toolbar to choose the method."
+msgid "Click <guiseq><gui>Message</gui><gui>Forward</gui></guiseq>, the <gui>Forward</gui> button in the toolbar, or press <keyseq><key>Ctrl</key><key>F</key></keyseq> to use the default forwarding method. In case you want to use a different forward method, click <guiseq><gui>Message</gui><gui>Forward as</gui></guiseq> or the small dropdown arrow next to the <gui>Forward</gui> button in the toolbar to choose the method."
 msgstr ""
 
 #: C/mail-composer-forward.page:32(p)
-msgid ""
-"Select a recipient for the message. The subject is already entered, although "
-"you can alter it if you want."
+msgid "Select a recipient for the message. The subject is already entered, although you can alter it if you want."
 msgstr ""
 
 #: C/mail-composer-forward.page:33(p)
@@ -8551,16 +5526,11 @@ msgid "Add your comments on the message in the text field."
 msgstr ""
 
 #: C/mail-composer-forward.page:34(p)
-msgid ""
-"Click <placeholder-1/> or press <keyseq><placeholder-2/><placeholder-3/></"
-"keyseq>."
+msgid "Click <gui style=\"button\">Send</gui> or press <keyseq><key>Ctrl</key><key>Return</key></keyseq>."
 msgstr ""
 
 #: C/mail-composer-forward.page:37(p)
-msgid ""
-"Attachments to a message you are forwarding are forwarded only when you send "
-"the original message as an attachment. Inline messages do not forward any "
-"attachments."
+msgid "Attachments to a message you are forwarding are forwarded only when you send the original message as an attachment. Inline messages do not forward any attachments."
 msgstr ""
 
 #: C/mail-composer-forward-as-attachment.page:5(desc)
@@ -8573,34 +5543,17 @@ msgstr "Sporočila s prilogami"
 msgid "Forwarding a message with its attachments"
 msgstr "Sporočila s prilogami"
 
-#: C/mail-composer-forward-as-attachment.page:23(gui)
-#, fuzzy
-msgid "Forward as..."
-msgstr "_Posreduj stik ..."
-
 #: C/mail-composer-forward-as-attachment.page:23(p)
-msgid ""
-"Click <guiseq><placeholder-1/><placeholder-2/></guiseq> and choose "
-"<placeholder-3/>, so the forwarded email and also its attachments get "
-"attached to the email you want to send."
+msgid "Click <guiseq><gui>Message</gui><gui>Forward as...</gui></guiseq> and choose <gui>Attachment</gui>, so the forwarded email and also its attachments get attached to the email you want to send."
 msgstr ""
 
-#: C/mail-composer-forward-as-attachment.page:26(gui)
-#, fuzzy
-msgid "Forward Style"
-msgstr "Način _posredovanja:"
-
 #: C/mail-composer-forward-as-attachment.page:26(p)
-msgid ""
-"If you want to have this setting by default, set <guiseq><placeholder-1/"
-"><placeholder-2/><placeholder-3/><placeholder-4/></guiseq> to <placeholder-5/"
-">."
+msgid "If you want to have this setting by default, set <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Composer Preferences</gui><gui>Forward Style</gui></guiseq> to <gui>Attachment</gui>."
 msgstr ""
 
 #: C/mail-composer-custom-header-lines.page:5(desc)
-#, fuzzy
 msgid "Using custom fields in the header of composed messages"
-msgstr "Pokaže utripajoč kazalec v telesu prikazanih sporočil"
+msgstr ""
 
 #: C/mail-composer-custom-header-lines.page:23(title)
 #, fuzzy
@@ -8608,9 +5561,8 @@ msgid "Custom Header Lines"
 msgstr "Glave sporočil po meri"
 
 #: C/mail-composer-custom-header-lines.page:25(p)
-#, fuzzy
 msgid "You can add arbitrary header lines to outgoing emails."
-msgstr "Dodaj glavo po meri za odhajajoča poštna sporočila."
+msgstr ""
 
 #: C/mail-composer-custom-header-lines.page:28(title)
 msgid "Enabling and managing custom headers"
@@ -8619,49 +5571,32 @@ msgstr ""
 #: C/mail-composer-custom-header-lines.page:29(p)
 #, fuzzy
 msgid "To set up the Custom Header plugin:"
-msgstr ""
-"Izbrana možnost omogoči vstavek za upravljanje nastavitev tipkovnih bližnjic."
-
-#: C/mail-composer-custom-header-lines.page:32(gui)
-#: C/mail-composer-custom-header-lines.page:42(gui)
-#, fuzzy
-msgid "Custom Header"
-msgstr "Glava sporočila po meri"
+msgstr "Izbrana možnost omogoči vstavek za upravljanje nastavitev tipkovnih bližnjic."
 
 #: C/mail-composer-custom-header-lines.page:32(p)
-#: C/mail-attachments-sending.page:47(p)
 #, fuzzy
-msgid "Enable <placeholder-1/>."
-msgstr "gpg <placeholder-1/>"
+msgid "Enable <gui>Custom Header</gui>."
+msgstr "Dodaj glavo neželenih sporočil po meri"
 
 #: C/mail-composer-custom-header-lines.page:34(p)
-msgid ""
-"You can add, edit, or remove the header fields. For every header field you "
-"add, you can specify the keys and values. The key is used as the title of "
-"the Custom Header. You can enter multiple values for the keys. You must use "
-"a semicolon to separate every value you enter."
+msgid "You can add, edit, or remove the header fields. For every header field you add, you can specify the keys and values. The key is used as the title of the Custom Header. You can enter multiple values for the keys. You must use a semicolon to separate every value you enter."
 msgstr ""
 
 #: C/mail-composer-custom-header-lines.page:39(title)
 #, fuzzy
 msgid "Inserting custom headers in a message"
-msgstr "Dodaj glavo po meri za odhajajoča poštna sporočila."
+msgstr "Stanje glav sporočil na seznamu pladnja"
 
 #: C/mail-composer-custom-header-lines.page:41(p)
-msgid ""
-"Click <guiseq><placeholder-1/><placeholder-2/></guiseq> or press "
-"<keyseq><placeholder-3/><placeholder-4/><placeholder-5/></keyseq> to open "
-"the message composer window."
+msgid "Click <guiseq><gui>New</gui><gui>Mail Message</gui></guiseq> or press <keyseq><key>Shift</key><key>Ctrl</key><key>M</key></keyseq> to open the message composer window."
 msgstr ""
 
-#: C/mail-composer-custom-header-lines.page:43(gui)
-msgid "Email Custom Header"
-msgstr "Glava elektronske pošte po meri"
+#: C/mail-composer-custom-header-lines.page:42(p)
+msgid "Select <guiseq><gui>Insert</gui><gui>Custom Header</gui></guiseq>."
+msgstr ""
 
 #: C/mail-composer-custom-header-lines.page:43(p)
-msgid ""
-"In the <placeholder-1/> window, you can view all the defined header fields "
-"and values."
+msgid "In the <gui>Email Custom Header</gui> window, you can view all the defined header fields and values."
 msgstr ""
 
 #: C/mail-composer-custom-header-lines.page:44(p)
@@ -8670,23 +5605,15 @@ msgid "Set the values for the header fields by using the dropdown list."
 msgstr "Izberite možnost iskanja iz spustnega seznama."
 
 #: C/mail-composer-change-quotation-string.page:5(desc)
-msgid ""
-"It is not possible to change the quotation introduction added when answering "
-"mail."
+msgid "It is not possible to change the quotation introduction added when answering mail."
 msgstr ""
 
 #: C/mail-composer-change-quotation-string.page:22(title)
 msgid "Changing the \"On <em>date, person</em> wrote:\" string when replying"
 msgstr ""
 
-#: C/mail-composer-change-quotation-string.page:24(file)
-msgid "/apps/evolution/mail/composer/message_attribution"
-msgstr "/apps/evolution/mail/composer/message_attribution"
-
 #: C/mail-composer-change-quotation-string.page:24(p)
-msgid ""
-"Advanced users can change this string by editing the gconf key "
-"<placeholder-1/> via gconf-editor."
+msgid "Advanced users can change this string by editing the gconf key <file>/apps/evolution/mail/composer/message_attribution</file> via gconf-editor."
 msgstr ""
 
 #: C/mail-change-time-format.page:5(desc)
@@ -8697,18 +5624,10 @@ msgstr "Zbrisana sporočila prikaži na seznamu sporočil"
 #: C/mail-change-time-format.page:19(title)
 #, fuzzy
 msgid "Format of dates and time"
-msgstr "Izbor datuma in časa"
-
-#: C/mail-change-time-format.page:20(gui)
-#, fuzzy
-msgid "Date/Time format"
-msgstr "Zapis datuma/časa"
+msgstr "Prikaz časa in prikaz datuma"
 
 #: C/mail-change-time-format.page:20(p)
-msgid ""
-"You can change the format of the <placeholder-1/> column by setting your "
-"prefered format under <guiseq><placeholder-2/><placeholder-3/><placeholder-4/"
-"><placeholder-5/><placeholder-6/></guiseq>."
+msgid "You can change the format of the <gui>Date</gui> column by setting your preferred format under <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Mail Preferences</gui><gui>Headers</gui><gui>Date/Time format</gui></guiseq>."
 msgstr ""
 
 #: C/mail-change-time-format.page:20(p)
@@ -8724,37 +5643,30 @@ msgstr "Zbrisana sporočila prikaži na seznamu sporočil"
 #: C/mail-change-columns-in-message-list.page:20(title)
 #, fuzzy
 msgid "Changing the message list columns"
-msgstr "Niten seznam sporočil."
-
-#: C/mail-change-columns-in-message-list.page:22(gui)
-#, fuzzy
-msgid "Add a Column..."
-msgstr "_Dodaj stolpec ..."
+msgstr "Seznam stolpcev za pogled '%s'"
 
 #: C/mail-change-columns-in-message-list.page:22(p)
-msgid ""
-"If you want to change the columns in the mail message list, right-click on "
-"the column headers and choose either <placeholder-1/> or <placeholder-2/>."
+msgid "If you want to change the columns in the mail message list, right-click on the column headers and choose either <gui>Add a Column...</gui> or <gui>Remove This Column</gui>."
 msgstr ""
 
 #: C/mail-change-columns-in-message-list.page:23(p)
-msgid ""
-"If you have a small display, you can replace the <placeholder-1/> column by "
-"the <placeholder-2/> which will remove prefixes such as \"Re:\", or you can "
-"replace the <placeholder-3/> column which displays the sender's name and "
-"email address by the <placeholder-4/> column which will only display the "
-"sender's name."
+msgid "If you have a small display, you can replace the <gui>Subject</gui> column by the <gui>Subject - Trimmed</gui> which will remove prefixes such as \"Re:\", or you can replace the <gui>From</gui> column which displays the sender's name and email address by the <gui>Sender</gui> column which will only display the sender's name."
 msgstr ""
 
 #: C/mail-cannot-see.page:5(desc)
 msgid "If you received or sent an email, but you cannot find it anywhere."
 msgstr ""
 
-#: C/mail-cannot-see.page:11(name) C/index.page:9(name) C/credits.page:34(p)
+#: C/mail-cannot-see.page:11(name)
+#: C/index.page:9(name)
+#: C/credits.page:34(p)
+#, fuzzy
 msgid "Phil Bull"
 msgstr "Phil Bull"
 
-#: C/mail-cannot-see.page:12(email) C/index.page:10(email)
+#: C/mail-cannot-see.page:12(email)
+#: C/index.page:10(email)
+#, fuzzy
 msgid "philbull@gmail.com"
 msgstr "philbull@gmail.com"
 
@@ -8763,63 +5675,27 @@ msgid "I cannot see some emails, where are they?"
 msgstr ""
 
 #: C/mail-cannot-see.page:24(p)
-msgid ""
-"Check whether you are using filters on incoming (or outgoing) messages. "
-"These could be automatically moving your messages to another destination."
+msgid "Check whether you are using filters on incoming (or outgoing) messages. These could be automatically moving your messages to another destination."
 msgstr ""
 
-#: C/mail-cannot-see.page:27(gui)
-#, fuzzy
-msgid "Read Messages"
-msgstr "Prebrana sporočila"
-
 #: C/mail-cannot-see.page:27(p)
-msgid ""
-"Check your search view in the search bar right above the message list. "
-"Perhaps the <placeholder-1/> dropdown list is set to a filter like "
-"<placeholder-2/>, or the text input filed contains some value. Click the "
-"broom icon to clear the search field."
+msgid "Check your search view in the search bar right above the message list. Perhaps the <gui>Show</gui> dropdown list is set to a filter like <gui>Read Messages</gui>, or the text input filed contains some value. Click the broom icon to clear the search field."
 msgstr ""
 
-#: C/mail-cannot-see.page:30(gui) C/intro-main-window.page:80(gui)
-#, fuzzy
-msgid "Show Message Preview"
-msgstr "Pokaži _predogled sporočila"
-
 #: C/mail-cannot-see.page:30(p)
-msgid ""
-"If you cannot see any emails at all in a folder, check that you have not "
-"maximized the message preview (so the message list pane is hidden). To do "
-"this, click <guiseq><placeholder-1/><placeholder-2/><placeholder-3/></"
-"guiseq>."
+msgid "If you cannot see any emails at all in a folder, check that you have not maximized the message preview (so the message list pane is hidden). To do this, click <guiseq><gui>View</gui><gui>Preview</gui><gui>Show Message Preview</gui></guiseq>."
 msgstr ""
 
 #: C/mail-cannot-see.page:33(p)
-msgid ""
-"Look in the <placeholder-1/> folder. Messages that are marked as Junk "
-"disappear from the original folder and are moved to the Junk folder."
+msgid "Look in the <gui>Junk</gui> folder. Messages that are marked as Junk disappear from the original folder and are moved to the Junk folder."
 msgstr ""
 
-#: C/mail-cannot-see.page:38(gui)
-#, fuzzy
-msgid "Show Hidden Messages"
-msgstr "Pokaži _skrita sporočila"
-
 #: C/mail-cannot-see.page:38(p)
-msgid ""
-"Click <guiseq><placeholder-1/><placeholder-2/></guiseq> to make sure all "
-"messages are visible."
+msgid "Click <guiseq><gui>Edit</gui><gui>Show Hidden Messages</gui></guiseq> to make sure all messages are visible."
 msgstr ""
 
-#: C/mail-cannot-see.page:41(gui)
-msgid "Email Accounts"
-msgstr "E-poštni računi"
-
 #: C/mail-cannot-see.page:41(p)
-msgid ""
-"Check your default folder under <guiseq><placeholder-1/><placeholder-2/"
-"><placeholder-3/><placeholder-4/><placeholder-5/></guiseq>. Perhaps it is "
-"set to some other folder then the folder you thought of."
+msgid "Check your default folder under <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Email Accounts</gui><gui>Edit</gui><gui>Defaults</gui></guiseq>. Perhaps it is set to some other folder then the folder you thought of."
 msgstr ""
 
 #: C/mail-calendar-sending-invitations.page:5(desc)
@@ -8829,25 +5705,14 @@ msgstr ""
 #: C/mail-calendar-sending-invitations.page:21(title)
 #, fuzzy
 msgid "Sending invitations by email"
-msgstr "Povzeto iz sporočila %s"
+msgstr "_Pošlji naslov po e-pošti"
 
 #: C/mail-calendar-sending-invitations.page:23(p)
-msgid ""
-"If you create an event in the calendar component, you can then send "
-"invitations to the attendee list through the Evolution email tool. The "
-"invitation card is sent as an attachment in iCal format."
+msgid "If you create an event in the calendar component, you can then send invitations to the attendee list through the Evolution email tool. The invitation card is sent as an attachment in iCal format."
 msgstr ""
 
-#: C/mail-calendar-sending-invitations.page:25(gui)
-#: C/calendar-meetings-sending-invitation.page:26(gui)
-#, fuzzy
-msgid "Forward as iCalendar"
-msgstr "Posreduj kot i_Koledar"
-
 #: C/mail-calendar-sending-invitations.page:25(p)
-msgid ""
-"To send an invitation, right-click on the entry in the calendar and choose "
-"<placeholder-1/>."
+msgid "To send an invitation, right-click on the entry in the calendar and choose <gui>Forward as iCalendar</gui>."
 msgstr ""
 
 #: C/mail-calendar-sending-invitations.page:27(p)
@@ -8859,9 +5724,7 @@ msgid "Accept:"
 msgstr "Sprejmi:"
 
 #: C/mail-calendar-sending-invitations.page:31(p)
-msgid ""
-"Indicates you will attend the meeting. When you click the OK button, the "
-"meeting is entered into your calendar."
+msgid "Indicates you will attend the meeting. When you click the OK button, the meeting is entered into your calendar."
 msgstr ""
 
 #: C/mail-calendar-sending-invitations.page:33(p)
@@ -8869,10 +5732,7 @@ msgid "Tentatively Accept:"
 msgstr "Poskusno sprejmi:"
 
 #: C/mail-calendar-sending-invitations.page:34(p)
-msgid ""
-"Indicates you will probably attend the meeting. When you click the OK "
-"button, the meeting is entered into your calendar, but is marked as "
-"tentative."
+msgid "Indicates you will probably attend the meeting. When you click the OK button, the meeting is entered into your calendar, but is marked as tentative."
 msgstr ""
 
 #: C/mail-calendar-sending-invitations.page:36(p)
@@ -8880,10 +5740,7 @@ msgid "Decline:"
 msgstr "Odkloni:"
 
 #: C/mail-calendar-sending-invitations.page:37(p)
-msgid ""
-"Indicates you are unable to attend the meeting. The meeting is not entered "
-"into your calendar when you click OK, although your response is sent to the "
-"meeting host if you have selected the Send reply to sender option."
+msgid "Indicates you are unable to attend the meeting. The meeting is not entered into your calendar when you click OK, although your response is sent to the meeting host if you have selected the Send reply to sender option."
 msgstr ""
 
 #: C/mail-calendar-sending-invitations.page:39(p)
@@ -8891,8 +5748,7 @@ msgid "Send reply to sender:"
 msgstr "Odgovori pošiljatelju:"
 
 #: C/mail-calendar-sending-invitations.page:40(p)
-msgid ""
-"Select this option if you want your response sent to the meeting organizers."
+msgid "Select this option if you want your response sent to the meeting organizers."
 msgstr ""
 
 #: C/mail-attachments-sending.page:5(desc)
@@ -8902,27 +5758,20 @@ msgstr ""
 #: C/mail-attachments-sending.page:24(title)
 #, fuzzy
 msgid "Adding attachments to an email"
-msgstr "Odstranjevanje prilog"
+msgstr "Pošlji e-pošto <b>%(name)s</b> (%(email)s)"
 
 #: C/mail-attachments-sending.page:27(title)
 #, fuzzy
 msgid "Attaching files"
-msgstr "Priloži datoteko(e)"
+msgstr "Besedilne datoteke"
 
 #: C/mail-attachments-sending.page:28(p)
 #, fuzzy
 msgid "To attach a file to your email in the composer:"
 msgstr "Dodaj datoteko na iPod"
 
-#: C/mail-attachments-sending.page:30(gui)
-#, fuzzy
-msgid "Add Attachment..."
-msgstr "Dodaj _prilogo ..."
-
 #: C/mail-attachments-sending.page:30(p)
-msgid ""
-"Click <placeholder-1/>, or click <guiseq><placeholder-2/><placeholder-3/></"
-"guiseq>, or press <keyseq><placeholder-4/><placeholder-5/></keyseq>."
+msgid "Click <gui>Add Attachment...</gui>, or click <guiseq><gui>Insert</gui><gui>Attachment</gui></guiseq>, or press <keyseq><key>Ctrl</key><key>M</key></keyseq>."
 msgstr ""
 
 #: C/mail-attachments-sending.page:31(p)
@@ -8935,22 +5784,16 @@ msgid "You can also drag a file to the attachment bar of the composer window."
 msgstr ""
 
 #: C/mail-attachments-sending.page:36(p)
-msgid ""
-"When you send the message, a copy of the attached file goes with it. Be "
-"aware that large attachments can take a long time to send and receive."
+msgid "When you send the message, a copy of the attached file goes with it. Be aware that large attachments can take a long time to send and receive."
 msgstr ""
 
 #: C/mail-attachments-sending.page:40(title)
-#: C/mail-attachments-sending.page:47(gui)
 #, fuzzy
 msgid "Attachment Reminder"
 msgstr "Opomnik prilog"
 
 #: C/mail-attachments-sending.page:42(p)
-msgid ""
-"Evolution has an Attachment Reminder plugin you can use to remind yourself "
-"to attach a file to an email. If it determines that you have not attached "
-"the file, it displays a reminder window before the email is sent."
+msgid "Evolution has an Attachment Reminder plugin you can use to remind yourself to attach a file to an email. If it determines that you have not attached the file, it displays a reminder window before the email is sent."
 msgstr ""
 
 #: C/mail-attachments-sending.page:44(p)
@@ -8958,17 +5801,17 @@ msgstr ""
 msgid "To enable the Attachment Reminder:"
 msgstr "Ni mogoče odpreti priloge"
 
+#: C/mail-attachments-sending.page:47(p)
+#, fuzzy
+msgid "Enable <gui>Attachment Reminder</gui>."
+msgstr "Ni mogoče odpreti priloge"
+
 #: C/mail-attachments-sending.page:49(p)
-msgid ""
-"Click <placeholder-1/>, then enter keywords in your language such as \"Attach"
-"\" or \"enclosed\"."
+msgid "Click <gui style=\"button\">Add</gui>, then enter keywords in your language such as \"Attach\" or \"enclosed\"."
 msgstr ""
 
 #: C/mail-attachments-sending.page:51(p)
-msgid ""
-"Based on the keywords you have added, Evolution searches the text of every "
-"mail you are going to send. If it finds any of the keywords in your email "
-"and there is no actual attached file, the reminder window is displayed."
+msgid "Based on the keywords you have added, Evolution searches the text of every mail you are going to send. If it finds any of the keywords in your email and there is no actual attached file, the reminder window is displayed."
 msgstr ""
 
 #: C/mail-attachments-received.page:5(desc)
@@ -8978,56 +5821,26 @@ msgstr ""
 #: C/mail-attachments-received.page:24(title)
 #, fuzzy
 msgid "Handling attachments in received mail"
-msgstr "Predvaja zvočne priloge neposredno v poštnih sporočilih."
-
-#: C/mail-attachments-received.page:26(gui)
-#, fuzzy
-msgid "Save All"
-msgstr "Shrani _vse"
+msgstr "Predvajaj zvočnie priloge neposredno v sporočilu."
 
 #: C/mail-attachments-received.page:26(p)
-msgid ""
-"If you receive an email message with one or more file attachments, Evolution "
-"displays the number of attachments and a <placeholder-1/> or <placeholder-2/"
-"> button between the email header and the content of the email."
+msgid "If you receive an email message with one or more file attachments, Evolution displays the number of attachments and a <gui style=\"button\">Save</gui> or <gui style=\"button\">Save All</gui> button between the email header and the content of the email."
 msgstr ""
 
 #: C/mail-attachments-received.page:28(p)
 msgid "A list of attachments is also available at the bottom of the email."
 msgstr ""
 
-#: C/mail-attachments-received.page:29(gui)
-#, fuzzy
-msgid "Save As"
-msgstr "Shrani kot ..."
-
 #: C/mail-attachments-received.page:29(p)
-msgid ""
-"To save an attachment to disk, click the down-arrow next to the attachment "
-"icon and click <placeholder-1/>."
+msgid "To save an attachment to disk, click the down-arrow next to the attachment icon and click <gui>Save As</gui>."
 msgstr ""
 
 #: C/mail-attachments-received.page:30(p)
-msgid ""
-"To open an attachment in another application, click the down-arrow next to "
-"the attachment icon and choose one of the available applications."
-msgstr ""
-
-#: C/mail-attachments-received.page:32(gui)
-#, fuzzy
-msgid "Image Viewer"
-msgstr "Slikovne datoteke"
-
-#: C/mail-attachments-received.page:32(gui)
-msgid "GIMP"
+msgid "To open an attachment in another application, click the down-arrow next to the attachment icon and choose one of the available applications."
 msgstr ""
 
 #: C/mail-attachments-received.page:32(p)
-msgid ""
-"The options available for an attachment vary depending on the type of "
-"attachment and the applications that are installed on your system. For "
-"example, image files can be opened in the <placeholder-1/> application or in "
-"the <placeholder-2/> graphics editor."
+msgid "The options available for an attachment vary depending on the type of attachment and the applications that are installed on your system. For example, image files can be opened in the <gui>Image Viewer</gui> application or in the <gui>GIMP</gui> graphics editor."
 msgstr ""
 
 #: C/mail-attachments.page:5(desc)
@@ -9037,7 +5850,7 @@ msgstr ""
 #: C/mail-attachments.page:18(title)
 #, fuzzy
 msgid "Managing attachments"
-msgstr "Shranjevanje priloge"
+msgstr "Shrani priloge"
 
 #: C/mail-account-manage-usenet-news.page:5(desc)
 msgid "Add and edit a Usenet news account in Evolution."
@@ -9046,23 +5859,23 @@ msgstr ""
 #: C/mail-account-manage-usenet-news.page:20(title)
 #, fuzzy
 msgid "Usenet news account settings"
-msgstr "Nastavite računa Google:"
-
-#: C/mail-account-manage-usenet-news.page:24(link)
-#: C/mail-account-manage-unix-mbox-spool-file.page:24(link)
-#: C/mail-account-manage-unix-mbox-spool-directory.page:24(link)
-#: C/mail-account-manage-pop.page:24(link)
-#: C/mail-account-manage-novell-groupwise.page:25(link)
-#: C/mail-account-manage-microsoft-exchange-evo-mapi.page:25(link)
-#: C/mail-account-manage-microsoft-exchange-evo-exchange.page:25(link)
-#: C/mail-account-manage-mh-format-directories.page:24(link)
-#: C/mail-account-manage-maildir-format-directories.page:24(link)
-#: C/mail-account-manage-local-delivery.page:24(link)
-#: C/mail-account-manage-imap-plus.page:24(link)
-#: C/mail-account-manage-imap.page:24(link)
-#, fuzzy
-msgid "First-Run Assistant"
-msgstr "začeni XMLTV pomočnika ob zagonu"
+msgstr "Branje novic iz Usenet"
+
+#: C/mail-account-manage-usenet-news.page:23(title)
+#: C/mail-account-manage-unix-mbox-spool-file.page:23(title)
+#: C/mail-account-manage-unix-mbox-spool-directory.page:23(title)
+#: C/mail-account-manage-pop.page:23(title)
+#: C/mail-account-manage-novell-groupwise.page:24(title)
+#: C/mail-account-manage-microsoft-exchange-evo-mapi.page:23(title)
+#: C/mail-account-manage-microsoft-exchange-evo-exchange.page:23(title)
+#: C/mail-account-manage-mh-format-directories.page:23(title)
+#: C/mail-account-manage-maildir-format-directories.page:23(title)
+#: C/mail-account-manage-local-delivery.page:23(title)
+#: C/mail-account-manage-imap-plus.page:23(title)
+#: C/mail-account-manage-imap.page:23(title)
+#, fuzzy
+msgid "Account Editor"
+msgstr "Urejevalnik računov"
 
 #: C/mail-account-manage-usenet-news.page:24(p)
 #: C/mail-account-manage-unix-mbox-spool-file.page:24(p)
@@ -9076,11 +5889,7 @@ msgstr "začeni XMLTV pomočnika ob zagonu"
 #: C/mail-account-manage-local-delivery.page:24(p)
 #: C/mail-account-manage-imap-plus.page:24(p)
 #: C/mail-account-manage-imap.page:24(p)
-msgid ""
-"Mail accounts can be added via <guiseq><placeholder-1/><placeholder-2/"
-"><placeholder-3/><placeholder-4/></guiseq>. The steps are mostly the same as "
-"for the <placeholder-5/>, except for not getting asked whether to import "
-"data from other applications or to restore from a backup file."
+msgid "Mail accounts can be added via <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Mail Accounts</gui><gui style=\"button\">Add</gui></guiseq>. The steps are mostly the same as for the <link xref=\"intro-first-run\">First-Run Assistant</link>, except for not getting asked whether to import data from other applications or to restore from a backup file."
 msgstr ""
 
 #: C/mail-account-manage-usenet-news.page:25(p)
@@ -9091,16 +5900,29 @@ msgstr ""
 #: C/mail-account-manage-microsoft-exchange-evo-mapi.page:26(p)
 #: C/mail-account-manage-microsoft-exchange-evo-exchange.page:26(p)
 #: C/mail-account-manage-mh-format-directories.page:25(p)
-#: C/mail-account-manage-maildir-format-directories.page:25(p)
 #: C/mail-account-manage-local-delivery.page:25(p)
 #: C/mail-account-manage-imap-plus.page:25(p)
 #: C/mail-account-manage-imap.page:25(p)
-msgid ""
-"Mail accounts can be edited via <guiseq><placeholder-1/><placeholder-2/"
-"><placeholder-3/><placeholder-4/></guiseq>. The following settings are "
-"available when editing an existing account:"
+msgid "Mail accounts can be edited via <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Mail Accounts</gui><gui style=\"button\">Edit</gui></guiseq>. The following settings are available when editing an existing account:"
 msgstr ""
 
+#: C/mail-account-manage-usenet-news.page:28(title)
+#: C/mail-account-manage-unix-mbox-spool-file.page:28(title)
+#: C/mail-account-manage-unix-mbox-spool-directory.page:28(title)
+#: C/mail-account-manage-pop.page:28(title)
+#: C/mail-account-manage-novell-groupwise.page:29(title)
+#: C/mail-account-manage-microsoft-exchange-evo-mapi.page:29(title)
+#: C/mail-account-manage-microsoft-exchange-evo-exchange.page:29(title)
+#: C/mail-account-manage-mh-format-directories.page:28(title)
+#: C/mail-account-manage-maildir-format-directories.page:28(title)
+#: C/mail-account-manage-local-delivery.page:28(title)
+#: C/mail-account-manage-imap-plus.page:28(title)
+#: C/mail-account-manage-imap.page:28(title)
+#: C/intro-first-run.page:25(title)
+#, fuzzy
+msgid "Identity"
+msgstr "Istovetnost"
+
 #. TODO:XINCLUDE: Quite ugly to copy this text into all account type's, but it's not really worth a separate topic page for it, plus it would make the intro-first-run.page even more complex. Maybe later replace this text by a single instance by doing some content sharing with xinclude and xpointer in the other mail-account-manage-*.page files and in intro-first-run.page. <include href="foo.xml" xmlns="http://www.w3.org/2001/XInclude"/> See gnome-user-docs module for example usage. Also see https://bugzilla.gnome.org/show_bug.cgi?id=638866
 #: C/mail-account-manage-usenet-news.page:30(p)
 #: C/mail-account-manage-unix-mbox-spool-file.page:30(p)
@@ -9113,10 +5935,10 @@ msgstr ""
 #: C/mail-account-manage-maildir-format-directories.page:30(p)
 #: C/mail-account-manage-local-delivery.page:30(p)
 #: C/mail-account-manage-imap-plus.page:30(p)
-#: C/mail-account-manage-imap.page:30(p) C/intro-first-run.page:26(p)
-#, fuzzy
+#: C/mail-account-manage-imap.page:30(p)
+#: C/intro-first-run.page:26(p)
 msgid "Here you define your name and your email address."
-msgstr "Vnesite svoj naslov elektronske pošte."
+msgstr ""
 
 #: C/mail-account-manage-usenet-news.page:31(p)
 #: C/mail-account-manage-unix-mbox-spool-file.page:31(p)
@@ -9129,13 +5951,9 @@ msgstr "Vnesite svoj naslov elektronske pošte."
 #: C/mail-account-manage-maildir-format-directories.page:31(p)
 #: C/mail-account-manage-local-delivery.page:31(p)
 #: C/mail-account-manage-imap-plus.page:31(p)
-#: C/mail-account-manage-imap.page:31(p) C/intro-first-run.page:27(p)
-msgid ""
-"Optionally you can make this account your default account (e.g. when writing "
-"emails), set a Reply-To email address (if you want replies to messages sent "
-"to a different address), and set an organization (the company where you "
-"work, or the organization you represent when you send email from this "
-"account)."
+#: C/mail-account-manage-imap.page:31(p)
+#: C/intro-first-run.page:27(p)
+msgid "Optionally you can make this account your default account (e.g. when writing emails), set a Reply-To email address (if you want replies to messages sent to a different address), and set an organization (the company where you work, or the organization you represent when you send email from this account)."
 msgstr ""
 
 #: C/mail-account-manage-usenet-news.page:35(title)
@@ -9152,7 +5970,7 @@ msgstr ""
 #: C/mail-account-manage-imap.page:35(title)
 #, fuzzy
 msgid "Receiving Email and Receiving options"
-msgstr "Možnosti nastavitev prejemanja"
+msgstr "Možnosti razhroščevalnika in razvoja"
 
 #: C/mail-account-manage-usenet-news.page:39(title)
 #: C/mail-account-manage-unix-mbox-spool-file.page:39(title)
@@ -9163,8 +5981,41 @@ msgstr "Možnosti nastavitev prejemanja"
 #: C/mail-account-manage-local-delivery.page:39(title)
 #: C/mail-account-manage-imap-plus.page:39(title)
 #: C/mail-account-manage-imap.page:39(title)
+#, fuzzy
 msgid "Sending Email"
-msgstr "Pošiljanje elektronske pošte"
+msgstr "Pošiljam e-pošto"
+
+#: C/mail-account-manage-usenet-news.page:43(title)
+#: C/mail-account-manage-unix-mbox-spool-file.page:43(title)
+#: C/mail-account-manage-unix-mbox-spool-directory.page:43(title)
+#: C/mail-account-manage-pop.page:43(title)
+#: C/mail-account-manage-novell-groupwise.page:40(title)
+#: C/mail-account-manage-microsoft-exchange-evo-mapi.page:40(title)
+#: C/mail-account-manage-microsoft-exchange-evo-exchange.page:40(title)
+#: C/mail-account-manage-mh-format-directories.page:43(title)
+#: C/mail-account-manage-maildir-format-directories.page:43(title)
+#: C/mail-account-manage-local-delivery.page:43(title)
+#: C/mail-account-manage-imap-plus.page:43(title)
+#: C/mail-account-manage-imap.page:43(title)
+#, fuzzy
+msgid "Defaults"
+msgstr "Privzeto"
+
+#: C/mail-account-manage-usenet-news.page:47(title)
+#: C/mail-account-manage-unix-mbox-spool-file.page:47(title)
+#: C/mail-account-manage-unix-mbox-spool-directory.page:47(title)
+#: C/mail-account-manage-pop.page:47(title)
+#: C/mail-account-manage-novell-groupwise.page:45(title)
+#: C/mail-account-manage-microsoft-exchange-evo-mapi.page:49(title)
+#: C/mail-account-manage-microsoft-exchange-evo-exchange.page:49(title)
+#: C/mail-account-manage-mh-format-directories.page:47(title)
+#: C/mail-account-manage-maildir-format-directories.page:47(title)
+#: C/mail-account-manage-local-delivery.page:47(title)
+#: C/mail-account-manage-imap-plus.page:47(title)
+#: C/mail-account-manage-imap.page:47(title)
+#, fuzzy
+msgid "Security"
+msgstr "Varnost"
 
 #: C/mail-account-manage-usenet-news.page:53(title)
 #: C/mail-account-manage-unix-mbox-spool-file.page:53(title)
@@ -9177,7 +6028,7 @@ msgstr "Pošiljanje elektronske pošte"
 #: C/mail-account-manage-imap.page:57(title)
 #, fuzzy
 msgid "Other settings"
-msgstr "Nastavitve lupine"
+msgstr "Nastavitve računa"
 
 #: C/mail-account-manage-usenet-news.page:54(p)
 #: C/mail-account-manage-unix-mbox-spool-file.page:54(p)
@@ -9188,8 +6039,7 @@ msgstr "Nastavitve lupine"
 #: C/mail-account-manage-local-delivery.page:54(p)
 #: C/mail-account-manage-imap-plus.page:56(p)
 #: C/mail-account-manage-imap.page:58(p)
-msgid ""
-"Other account related settings that are not located in the <placeholder-1/>:"
+msgid "Other account related settings that are not located in the <gui>Account Editor</gui>:"
 msgstr ""
 
 #: C/mail-account-manage-unix-mbox-spool-file.page:5(desc)
@@ -9219,21 +6069,20 @@ msgstr ""
 #: C/mail-account-manage-pop.page:20(title)
 #, fuzzy
 msgid "POP mail account settings"
-msgstr "Nastavite računa Yahoo:"
+msgstr "Nastavite sledeče nastavitve računa."
 
 #: C/mail-account-manage-novell-groupwise.page:5(desc)
-#, fuzzy
 msgid "Add and edit a Novell Groupwise account in Evolution."
-msgstr "Dodajanje Novell GroupWise podpore Evolution."
+msgstr ""
 
 #: C/mail-account-manage-novell-groupwise.page:21(title)
 #, fuzzy
 msgid "Novell Groupwise account settings"
-msgstr "Nastavite računa Google:"
+msgstr "Nastavite sledeče nastavitve računa."
 
 #: C/mail-account-manage-novell-groupwise.page:49(title)
 msgid "Proxy"
-msgstr "Posredovalni strežnik"
+msgstr "Posredniški strežnik"
 
 #: C/mail-account-manage-novell-groupwise.page:50(p)
 msgid "Settings for having somebody else handle your account."
@@ -9247,17 +6096,10 @@ msgstr ""
 #: C/mail-account-manage-microsoft-exchange-evo-exchange.page:20(title)
 #, fuzzy
 msgid "Microsoft Exchange account settings"
-msgstr "Nastavitev Evolution Connector za Microsoft Exchange"
-
-#: C/mail-account-manage-microsoft-exchange.page:23(link)
-#: C/exchange-connectors-overview.page:20(title)
-msgid "Choosing the right connector"
-msgstr ""
+msgstr "Upravljanje nastavitev pooblaščenca za račun Exchange"
 
 #: C/mail-account-manage-microsoft-exchange.page:23(p)
-msgid ""
-"Please first read <placeholder-1/> to find out about the right Exchange "
-"account type for you."
+msgid "Please first read <link xref=\"exchange-connectors-overview\">Choosing the right connector</link> to find out about the right Exchange account type for you."
 msgstr ""
 
 #: C/mail-account-manage-microsoft-exchange-evo-mapi.page:5(desc)
@@ -9267,33 +6109,31 @@ msgstr ""
 #: C/mail-account-manage-microsoft-exchange-evo-mapi.page:20(title)
 #, fuzzy
 msgid "Exchange MAPI account settings"
-msgstr "Nastavite računa Google:"
+msgstr "Upravljanje nastavitev pooblaščenca za račun Exchange"
 
 #: C/mail-account-manage-microsoft-exchange-evo-mapi.page:44(title)
 #: C/mail-account-manage-microsoft-exchange-evo-exchange.page:44(title)
 #, fuzzy
 msgid "Exchange Settings"
-msgstr "Prepiši nastavitve strežnika"
+msgstr "Nastavitve Exchange"
 
 #: C/mail-account-manage-microsoft-exchange-evo-mapi.page:45(p)
 #, fuzzy
 msgid "In this section you can view the size of all Exchange folders."
-msgstr "Ogled velikosti vseh map Exchange"
+msgstr "To iskalno mapo morate poimenovati."
 
 #: C/mail-account-manage-microsoft-exchange-evo-exchange.page:5(desc)
 msgid "Add and edit a Microsoft Exchange 2000/2003 account in Evolution."
 msgstr ""
 
 #: C/mail-account-manage-microsoft-exchange-evo-exchange.page:45(p)
-msgid ""
-"In this section you can define your \"Out of Office\" status, change the "
-"password for your Exchange account, and manage the delegation settings."
+msgid "In this section you can define your \"Out of Office\" status, change the password for your Exchange account, and manage the delegation settings."
 msgstr ""
 
 #: C/mail-account-manage-microsoft-exchange-evo-exchange.page:45(p)
 #, fuzzy
 msgid "You can also view the size of all Exchange folders."
-msgstr "Ogled velikosti vseh map Exchange"
+msgstr "To iskalno mapo morate poimenovati."
 
 #: C/mail-account-manage-microsoft-exchange-evo-ews.page:5(desc)
 msgid "Add and edit a Microsoft Exchange 2010 account in Evolution."
@@ -9302,13 +6142,11 @@ msgstr ""
 #: C/mail-account-manage-microsoft-exchange-evo-ews.page:20(title)
 #, fuzzy
 msgid "Exchange Web Services account settings"
-msgstr "Prepiši nastavitve strežnika"
+msgstr "Upravljanje nastavitev pooblaščenca za račun Exchange"
 
 #. TODO: Write once evo-ews is stable. Copy structure from other Exchange account types if applicable.
 #: C/mail-account-manage-microsoft-exchange-evo-ews.page:23(p)
-msgid ""
-"This documentation section will be added once the currently developed "
-"evolution-ews has become stable and mature."
+msgid "This documentation section will be added once the currently developed evolution-ews has become stable and mature."
 msgstr ""
 
 #: C/mail-account-manage-mh-format-directories.page:5(desc)
@@ -9329,18 +6167,19 @@ msgid "Account Management"
 msgstr "Upravljanje z računom"
 
 #: C/mail-account-management.page:23(title)
+#, fuzzy
 msgid "Common Account Types"
-msgstr ""
+msgstr "Podprte vrste računov"
 
 #: C/mail-account-management.page:27(title)
 #, fuzzy
 msgid "Local Account Types"
-msgstr "Poštni računi"
+msgstr "Podprte vrste računov"
 
 #: C/mail-account-management.page:31(title)
 #, fuzzy
 msgid "Corporate Account Types"
-msgstr "Trenutni račun"
+msgstr "Podprte vrste računov"
 
 #: C/mail-account-manage-maildir-format-directories.page:5(desc)
 #, fuzzy
@@ -9352,6 +6191,10 @@ msgstr "Poštne mape vrste maildir"
 msgid "Maildir Format Mail Directories account settings"
 msgstr "Poštne mape vrste maildir"
 
+#: C/mail-account-manage-maildir-format-directories.page:25(p)
+msgid "Mail accounts can be edited via <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Mail Accounts</gui><gui>Edit</gui></guiseq>. The following settings are available when editing an existing account:"
+msgstr ""
+
 #: C/mail-account-manage-local-delivery.page:5(desc)
 msgid "Add and edit a Local Delivery account in Evolution."
 msgstr ""
@@ -9359,7 +6202,7 @@ msgstr ""
 #: C/mail-account-manage-local-delivery.page:20(title)
 #, fuzzy
 msgid "Local Delivery account settings"
-msgstr "Nastavite računa Google:"
+msgstr "Nastavite sledeče nastavitve računa."
 
 #: C/mail-account-manage-imap-plus.page:5(desc)
 msgid "Add and edit an IMAP+ mail account in Evolution."
@@ -9368,17 +6211,16 @@ msgstr ""
 #: C/mail-account-manage-imap-plus.page:20(title)
 #, fuzzy
 msgid "IMAP+ mail account settings"
-msgstr "Nastavite računa Yahoo:"
+msgstr "Nastavite sledeče nastavitve računa."
 
 #: C/mail-account-manage-imap.page:5(desc)
 msgid "Add and edit an IMAP mail account in Evolution."
 msgstr ""
 
 #: C/mail-account-manage-imap.page:20(title)
-#: C/mail-access-gmail-imap-account.page:26(link)
 #, fuzzy
 msgid "IMAP mail account settings"
-msgstr "Nastavite računa Yahoo:"
+msgstr "Nastavite sledeče nastavitve računa."
 
 #: C/mail-access-gmail-pop-account.page:5(desc)
 msgid "How to set up a GMail POP Account."
@@ -9395,23 +6237,14 @@ msgstr ""
 #: C/mail-access-gmail-pop-account.page:29(p)
 #, fuzzy
 msgid "Log in to your gmail account."
-msgstr "Nastavitve elektronskih računov"
-
-#: C/mail-access-gmail-pop-account.page:30(gui)
-#, fuzzy
-msgid "Forwarding and POP/IMAP"
-msgstr "Neimenovano sporočilo"
+msgstr "Prijava na Gmail z računom Google"
 
 #: C/mail-access-gmail-pop-account.page:30(p)
-msgid ""
-"Go to <guiseq><placeholder-1/><placeholder-2/></guiseq>. Refer to the POP "
-"Download section."
+msgid "Go to <guiseq><gui>Settings</gui><gui>Forwarding and POP/IMAP</gui></guiseq>. Refer to the POP Download section."
 msgstr ""
 
 #: C/mail-access-gmail-pop-account.page:31(p)
-msgid ""
-"Enable the POP download feature by ticking the radio button that corresponds "
-"to either of these options:"
+msgid "Enable the POP download feature by ticking the radio button that corresponds to either of these options:"
 msgstr ""
 
 #: C/mail-access-gmail-pop-account.page:33(p)
@@ -9426,35 +6259,16 @@ msgstr ""
 msgid "Specify the other required settings for this Gmail feature."
 msgstr ""
 
-#: C/mail-access-gmail-pop-account.page:38(gui)
-#, fuzzy
-msgid "Configuration instructions"
-msgstr "Različica nastavitev"
-
-#: C/mail-access-gmail-pop-account.page:38(gui)
-msgid "Other"
-msgstr "Drugo"
-
-#: C/mail-access-gmail-pop-account.page:38(gui)
-#, fuzzy
-msgid "Standard Instructions"
-msgstr "_Običajna pisava:"
-
 #: C/mail-access-gmail-pop-account.page:38(p)
-msgid ""
-"To know the Gmail Account settings, click on <guiseq><placeholder-1/"
-"><placeholder-2/><placeholder-3/></guiseq>."
+msgid "To know the Gmail Account settings, click on <guiseq><gui>Configuration instructions</gui><gui>Other</gui><gui>Standard Instructions</gui></guiseq>."
 msgstr ""
 
 #: C/mail-access-gmail-pop-account.page:39(p)
-msgid ""
-"On your Evolution client, go to <guiseq><placeholder-1/><placeholder-2/"
-"><placeholder-3/></guiseq>. Click <placeholder-4/>."
+msgid "On your Evolution client, go to <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Mail Accounts</gui></guiseq>. Click <gui style=\"button\">Add</gui>."
 msgstr ""
 
 #: C/mail-access-gmail-pop-account.page:40(p)
-msgid ""
-"Provide the required information. For the account settings, refer to Step 5"
+msgid "Provide the required information. For the account settings, refer to Step 5"
 msgstr ""
 
 #: C/mail-access-gmail-imap-account.page:5(desc)
@@ -9467,214 +6281,234 @@ msgid "Access a GMail IMAP Account via Evolution"
 msgstr ""
 
 #: C/mail-access-gmail-imap-account.page:26(p)
-msgid "Please refer to the <placeholder-1/>."
+msgid "Please refer to the <link xref=\"mail-account-manage-imap\">IMAP mail account settings</link>."
 msgstr ""
 
-#: C/mail-access-gmail-imap-account.page:28(link)
-#, fuzzy
-msgid "GMail Help"
-msgstr "Poštna povratnica"
-
 #: C/mail-access-gmail-imap-account.page:28(p)
-msgid ""
-"To access GMail via IMAP you must turn on IMAP in your Google account. See "
-"the <placeholder-1/> for more information."
-msgstr ""
+msgid "To access GMail via IMAP you must turn on IMAP in your Google account. See the <link href=\"https://mail.google.com/support/bin/answer.py?answer=77695\">GMail Help</link> for more information."
+msgstr ""
+
+#. When image changes, this message will be marked fuzzy or untranslated for you.
+#. It doesn't matter what you translate it to: it's not used at all.
+#: C/intro-main-window.page:34(None)
+msgid "@@image: './figures/window-overview-layers.png'; md5=3156497ff1c51756838f9ddfbce9baee"
+msgstr "@@image: './figures/window-overview-layers.png'; md5=3156497ff1c51756838f9ddfbce9baee"
+
+#. When image changes, this message will be marked fuzzy or untranslated for you.
+#. It doesn't matter what you translate it to: it's not used at all.
+#: C/intro-main-window.page:41(None)
+#: C/intro-main-window.page:90(None)
+#: C/intro-main-window.page:136(None)
+msgid "@@image: './figures/color-c4a000.png'; md5=9db17d2d5e9013501aeab2e165c6a6c9"
+msgstr "@@image: './figures/color-c4a000.png'; md5=9db17d2d5e9013501aeab2e165c6a6c9"
+
+#. When image changes, this message will be marked fuzzy or untranslated for you.
+#. It doesn't matter what you translate it to: it's not used at all.
+#: C/intro-main-window.page:44(None)
+#: C/intro-main-window.page:93(None)
+#: C/intro-main-window.page:139(None)
+msgid "@@image: './figures/color-ce5c00.png'; md5=19dae9650e3936312e09198973372a24"
+msgstr "@@image: './figures/color-ce5c00.png'; md5=19dae9650e3936312e09198973372a24"
+
+#. When image changes, this message will be marked fuzzy or untranslated for you.
+#. It doesn't matter what you translate it to: it's not used at all.
+#: C/intro-main-window.page:47(None)
+#: C/intro-main-window.page:96(None)
+#: C/intro-main-window.page:142(None)
+msgid "@@image: './figures/color-8f5902.png'; md5=ff5ccb859fe04a004cd67e1c22621dc6"
+msgstr "@@image: './figures/color-8f5902.png'; md5=ff5ccb859fe04a004cd67e1c22621dc6"
+
+#. When image changes, this message will be marked fuzzy or untranslated for you.
+#. It doesn't matter what you translate it to: it's not used at all.
+#: C/intro-main-window.page:48(None)
+#: C/intro-main-window.page:97(None)
+#: C/intro-main-window.page:143(None)
+msgid "@@image: './figures/color-4e9a06.png'; md5=b2c2e7b66fb470344c804db396b48b98"
+msgstr "@@image: './figures/color-4e9a06.png'; md5=b2c2e7b66fb470344c804db396b48b98"
+
+#. When image changes, this message will be marked fuzzy or untranslated for you.
+#. It doesn't matter what you translate it to: it's not used at all.
+#: C/intro-main-window.page:51(None)
+#: C/intro-main-window.page:100(None)
+#: C/intro-main-window.page:146(None)
+msgid "@@image: './figures/color-204a87.png'; md5=511497260cc4caab69d67814b1ee3b8b"
+msgstr "@@image: './figures/color-204a87.png'; md5=511497260cc4caab69d67814b1ee3b8b"
+
+#. When image changes, this message will be marked fuzzy or untranslated for you.
+#. It doesn't matter what you translate it to: it's not used at all.
+#: C/intro-main-window.page:54(None)
+#: C/intro-main-window.page:108(None)
+#: C/intro-main-window.page:149(None)
+msgid "@@image: './figures/color-a40000.png'; md5=19195da020e059dab33aa37788763a97"
+msgstr "@@image: './figures/color-a40000.png'; md5=19195da020e059dab33aa37788763a97"
+
+#. When image changes, this message will be marked fuzzy or untranslated for you.
+#. It doesn't matter what you translate it to: it's not used at all.
+#: C/intro-main-window.page:55(None)
+#: C/intro-main-window.page:150(None)
+msgid "@@image: './figures/color-5c3566.png'; md5=7c001a57237acc2ff61ee61e05ad3168"
+msgstr "@@image: './figures/color-5c3566.png'; md5=7c001a57237acc2ff61ee61e05ad3168"
+
+#. When image changes, this message will be marked fuzzy or untranslated for you.
+#. It doesn't matter what you translate it to: it's not used at all.
+#: C/intro-main-window.page:58(None)
+#: C/intro-main-window.page:111(None)
+#: C/intro-main-window.page:153(None)
+msgid "@@image: './figures/color-2e3436.png'; md5=3c796c7aed3044e59f131bea364e8598"
+msgstr "@@image: './figures/color-2e3436.png'; md5=3c796c7aed3044e59f131bea364e8598"
 
 #: C/intro-main-window.page:5(desc)
 msgid "An explanation of the areas shown in the Evolution window."
 msgstr ""
 
-#: C/intro-main-window.page:17(name) C/credits.page:31(p)
+#: C/intro-main-window.page:17(name)
+#: C/credits.page:31(p)
 msgid "Barbara M. Tobias"
 msgstr "Barbara M. Tobias"
 
 #: C/intro-main-window.page:29(title)
+#, fuzzy
 msgid "The <em>Evolution</em> main window"
-msgstr ""
+msgstr "Pokaži v glavnem oknu"
 
 #: C/intro-main-window.page:32(title)
 #, fuzzy
 msgid "E-Mail"
-msgstr "Pošta"
+msgstr "E-pošta"
 
 #: C/intro-main-window.page:35(p)
 #, fuzzy
 msgid "The Evolution mail main window"
-msgstr "- Poštni odjemalec in PIM Evolution"
+msgstr "Pokaži v glavnem oknu"
 
 #: C/intro-main-window.page:38(p)
 msgid "Corresponding elements in the mail main window:"
 msgstr ""
 
-#: C/intro-main-window.page:41(p) C/intro-main-window.page:90(p)
+#: C/intro-main-window.page:41(p)
+#: C/intro-main-window.page:90(p)
 #: C/intro-main-window.page:136(p)
-msgid ""
-"<media type=\"image\" src=\"./figures/color-c4a000.png\" width=\"10\"/> Menu "
-"bar"
-msgstr ""
+msgid "<media type=\"image\" src=\"./figures/color-c4a000.png\" width=\"10\"/> Menu bar"
+msgstr "<media type=\"image\" src=\"./figures/color-c4a000.png\" width=\"10\"/> Menijska vrstica"
 
-#: C/intro-main-window.page:44(p) C/intro-main-window.page:93(p)
+#: C/intro-main-window.page:44(p)
+#: C/intro-main-window.page:93(p)
 #: C/intro-main-window.page:139(p)
-msgid ""
-"<media type=\"image\" src=\"./figures/color-ce5c00.png\" width=\"10\"/> Tool "
-"bar"
-msgstr ""
+msgid "<media type=\"image\" src=\"./figures/color-ce5c00.png\" width=\"10\"/> Tool bar"
+msgstr "<media type=\"image\" src=\"./figures/color-ce5c00.png\" width=\"10\"/> Orodna vrstica"
 
-#: C/intro-main-window.page:47(p) C/intro-main-window.page:96(p)
-#: C/intro-main-window.page:142(p)
-msgid ""
-"<media type=\"image\" src=\"./figures/color-8f5902.png\" width=\"10\"/> "
-"Folder list"
-msgstr ""
+#: C/intro-main-window.page:47(p)
+msgid "<media type=\"image\" src=\"./figures/color-8f5902.png\" width=\"10\"/> Folder list"
+msgstr "<media type=\"image\" src=\"./figures/color-8f5902.png\" width=\"10\"/> Seznam map"
 
-#: C/intro-main-window.page:48(p) C/intro-main-window.page:97(p)
+#: C/intro-main-window.page:48(p)
+#: C/intro-main-window.page:97(p)
 #: C/intro-main-window.page:143(p)
-msgid ""
-"<media type=\"image\" src=\"./figures/color-4e9a06.png\" width=\"10\"/> "
-"Search bar"
-msgstr ""
+msgid "<media type=\"image\" src=\"./figures/color-4e9a06.png\" width=\"10\"/> Search bar"
+msgstr "<media type=\"image\" src=\"./figures/color-4e9a06.png\" width=\"10\"/> Vrstica iskanja"
 
 #: C/intro-main-window.page:51(p)
-msgid ""
-"<media type=\"image\" src=\"./figures/color-204a87.png\" width=\"10\"/> "
-"Message list"
-msgstr ""
+msgid "<media type=\"image\" src=\"./figures/color-204a87.png\" width=\"10\"/> Message list"
+msgstr "<media type=\"image\" src=\"./figures/color-204a87.png\" width=\"10\"/> Seznam sporočil"
 
-#: C/intro-main-window.page:54(p) C/intro-main-window.page:108(p)
+#: C/intro-main-window.page:54(p)
+#: C/intro-main-window.page:108(p)
 #: C/intro-main-window.page:149(p)
-msgid ""
-"<media type=\"image\" src=\"./figures/color-a40000.png\" width=\"10\"/> "
-"Switcher"
-msgstr ""
+msgid "<media type=\"image\" src=\"./figures/color-a40000.png\" width=\"10\"/> Switcher"
+msgstr "<media type=\"image\" src=\"./figures/color-a40000.png\" width=\"10\"/> Preklopnik"
 
 #: C/intro-main-window.page:55(p)
-msgid ""
-"<media type=\"image\" src=\"./figures/color-5c3566.png\" width=\"10\"/> "
-"Preview pane"
+msgid "<media type=\"image\" src=\"./figures/color-5c3566.png\" width=\"10\"/> Preview pane"
 msgstr ""
 
-#: C/intro-main-window.page:58(p) C/intro-main-window.page:111(p)
+#: C/intro-main-window.page:58(p)
+#: C/intro-main-window.page:111(p)
 #: C/intro-main-window.page:153(p)
-msgid ""
-"<media type=\"image\" src=\"./figures/color-2e3436.png\" width=\"10\"/> "
-"Status bar"
-msgstr ""
+msgid "<media type=\"image\" src=\"./figures/color-2e3436.png\" width=\"10\"/> Status bar"
+msgstr "<media type=\"image\" src=\"./figures/color-2e3436.png\" width=\"10\"/> Vrstica stanja"
 
 #: C/intro-main-window.page:64(title)
 #, fuzzy
 msgid "Folder list"
-msgstr "Seznam map:"
+msgstr "Pridobivanje seznama map ..."
 
 #: C/intro-main-window.page:65(p)
-msgid ""
-"The folder list gives you a list of the available folders for each account. "
-"To see the contents of a folder, click the folder name and its contents are "
-"displayed in the message list."
+msgid "The folder list gives you a list of the available folders for each account. To see the contents of a folder, click the folder name and its contents are displayed in the message list."
 msgstr ""
 
-#: C/intro-main-window.page:66(p) C/intro-main-window.page:74(p)
-msgid "For more information see <placeholder-1/>."
+#: C/intro-main-window.page:66(p)
+msgid "For more information see <link xref=\"mail-folders\">Using Folders</link>."
 msgstr ""
 
 #: C/intro-main-window.page:69(title)
 #, fuzzy
 msgid "Message List"
-msgstr "Seznam sporočil:"
+msgstr "Ustvarjam seznam sporočil"
 
 #: C/intro-main-window.page:70(p)
-msgid ""
-"The message list displays all the read and unread messages that you have in "
-"the chosen folder. To view an email in the preview pane, click the message "
-"in the message list."
+msgid "The message list displays all the read and unread messages that you have in the chosen folder. To view an email in the preview pane, click the message in the message list."
 msgstr ""
 
 #: C/intro-main-window.page:73(title)
-#, fuzzy
 msgid "Switcher"
-msgstr "Preklopnik:"
+msgstr "Preklopnik"
 
 #: C/intro-main-window.page:74(p)
-msgid ""
-"The switcher at the bottom of the side bar lets you switch between the "
-"Evolution tools: Mail, Contacts, Calendars, Memos and Tasks."
+msgid "The switcher at the bottom of the side bar lets you switch between the Evolution tools: Mail, Contacts, Calendars, Memos and Tasks."
 msgstr ""
 
-#: C/intro-main-window.page:74(link)
-#: C/change-switcher-appearance.page:19(title)
-#, fuzzy
-msgid "Changing the Switcher appearance"
-msgstr "Uporabi videz dejanj"
-
-#: C/intro-main-window.page:75(gui)
-#, fuzzy
-msgid "Layout"
-msgstr "Slog razporeditve"
-
-#: C/intro-main-window.page:75(gui)
-#, fuzzy
-msgid "Show Side Bar"
-msgstr "Pokaži s_transko vrstico"
+#: C/intro-main-window.page:74(p)
+msgid "For more information see <link xref=\"change-switcher-appearance\">Changing the Switcher appearance</link>."
+msgstr ""
 
 #: C/intro-main-window.page:75(p)
-msgid ""
-"You can disable the folder list and the switcher side bar by toggling "
-"<guiseq><placeholder-1/><placeholder-2/><placeholder-3/></guiseq>."
+msgid "You can disable the folder list and the switcher side bar by toggling <guiseq><gui>View</gui><gui>Layout</gui><gui>Show Side Bar</gui></guiseq>."
 msgstr ""
 
 #: C/intro-main-window.page:78(title)
 #, fuzzy
 msgid "Preview Pane"
-msgstr "Pladenj predogleda:"
+msgstr "Pokaži pladenj predogleda"
 
 #: C/intro-main-window.page:79(p)
-msgid ""
-"The preview pane displays the message that is currently chosen in the "
-"message list."
+msgid "The preview pane displays the message that is currently chosen in the message list."
 msgstr ""
 
 #: C/intro-main-window.page:80(p)
-msgid ""
-"You can disable the preview pane by toggling <guiseq><placeholder-1/"
-"><placeholder-2/><placeholder-3/></guiseq>."
+msgid "You can disable the preview pane by toggling <guiseq><gui>View</gui><gui>Preview</gui><gui>Show Message Preview</gui></guiseq>."
 msgstr ""
 
 #: C/intro-main-window.page:86(title)
 #: C/import-supported-file-formats.page:46(title)
-#: C/calendar-webdav.page:26(gui) C/calendar-weather.page:26(gui)
-#: C/calendar-usage-add-appointment.page:25(gui)
-#: C/calendar-meetings-sending-invitation.page:33(gui)
-#: C/calendar-local.page:24(gui) C/calendar-google.page:28(gui)
-#: C/calendar-caldav.page:27(gui)
-#, fuzzy
 msgid "Calendar"
 msgstr "Koledar"
 
-#: C/intro-main-window.page:87(p) C/intro-main-window.page:133(p)
+#: C/intro-main-window.page:87(p)
 #, fuzzy
 msgid "Elements in the calendar main window:"
-msgstr "Predmet v koledarju ni veljaven"
+msgstr "Višina glavnega okna v točkah"
+
+#: C/intro-main-window.page:96(p)
+msgid "<media type=\"image\" src=\"./figures/color-8f5902.png\" width=\"10\"/> Calendar list"
+msgstr ""
 
 #: C/intro-main-window.page:100(p)
-msgid ""
-"<media type=\"image\" src=\"./figures/color-204a87.png\" width=\"10\"/> "
-"Appointment list"
+msgid "<media type=\"image\" src=\"./figures/color-204a87.png\" width=\"10\"/> Appointment list"
 msgstr ""
 
 #: C/intro-main-window.page:101(p)
-#, fuzzy
 msgid "Task list"
-msgstr "Seznam _opravil"
+msgstr "Seznam nalog"
 
 #: C/intro-main-window.page:104(p)
 #, fuzzy
 msgid "Month pane"
-msgstr "Pladenj mesecev:"
+msgstr "pladenj z mapami"
 
 #: C/intro-main-window.page:105(p)
 #, fuzzy
 msgid "Memo list"
-msgstr "_Seznam opomnikov"
+msgstr "Seznam opomnikov"
 
 #: C/intro-main-window.page:116(title)
 #, fuzzy
@@ -9682,56 +6516,51 @@ msgid "Appointment List"
 msgstr "Seznam definicij"
 
 #: C/intro-main-window.page:117(p)
-msgid ""
-"The appointment list displays all your scheduled appointments in the time "
-"frame selected."
+msgid "The appointment list displays all your scheduled appointments in the time frame selected."
 msgstr ""
 
 #: C/intro-main-window.page:120(title)
 #, fuzzy
 msgid "Month Pane"
-msgstr "Pladenj mesecev:"
+msgstr "pladenj z mapami"
 
 #: C/intro-main-window.page:121(p)
-msgid ""
-"The month pane is a small view of a calendar month. To display additional "
-"months, drag the column border to the right. You can also select a range of "
-"days in the month pane to display a custom range of days in the appointment "
-"list."
+msgid "The month pane is a small view of a calendar month. To display additional months, drag the column border to the right. You can also select a range of days in the month pane to display a custom range of days in the appointment list."
 msgstr ""
 
 #: C/intro-main-window.page:124(title)
 #, fuzzy
 msgid "Task list and Memo list"
-msgstr "Ustvari nov seznam opomnikov"
+msgstr "Napaka med nalaganjem seznama opomnikov"
 
 #: C/intro-main-window.page:125(p)
-msgid ""
-"Tasks and memos are just displayed for your convience and are not associated "
-"to any appointments. Use the <placeholder-1/> to go to their main windows."
+msgid "Tasks and memos are just displayed for your convience and are not associated to any appointments. Use the <gui>switcher</gui> to go to their main windows."
 msgstr ""
 
+#: C/intro-main-window.page:132(title)
+#: C/import-supported-file-formats.page:60(title)
+msgid "Contacts"
+msgstr "Stiki"
+
+#: C/intro-main-window.page:133(p)
+#, fuzzy
+msgid "Elements in the contacts main window:"
+msgstr "Višina glavnega okna v točkah"
+
+#: C/intro-main-window.page:142(p)
+msgid "<media type=\"image\" src=\"./figures/color-8f5902.png\" width=\"10\"/> Address book list"
+msgstr "<media type=\"image\" src=\"./figures/color-8f5902.png\" width=\"10\"/> Seznam imenika"
+
 #: C/intro-main-window.page:146(p)
-msgid ""
-"<media type=\"image\" src=\"./figures/color-204a87.png\" width=\"10\"/> "
-"Contacts list"
-msgstr ""
+msgid "<media type=\"image\" src=\"./figures/color-204a87.png\" width=\"10\"/> Contacts list"
+msgstr "<media type=\"image\" src=\"./figures/color-204a87.png\" width=\"10\"/> Seznam stikov"
 
 #: C/intro-main-window.page:150(p)
-msgid ""
-"<media type=\"image\" src=\"./figures/color-5c3566.png\" width=\"10\"/> "
-"Contact preview"
-msgstr ""
-
-#: C/intro-main-window.page:156(gui)
-#, fuzzy
-msgid "Contact Preview"
-msgstr "_Predogled stika"
+msgid "<media type=\"image\" src=\"./figures/color-5c3566.png\" width=\"10\"/> Contact preview"
+msgstr "<media type=\"image\" src=\"./figures/color-5c3566.png\" width=\"10\"/> Predogled stikov"
 
 #: C/intro-main-window.page:156(p)
-msgid ""
-"You can disable the contact preview by toggling <guiseq><placeholder-1/"
-"><placeholder-2/><placeholder-3/></guiseq>."
+msgid "You can disable the contact preview by toggling <guiseq><gui>View</gui><gui>Preview</gui><gui>Contact Preview</gui></guiseq>."
 msgstr ""
 
 #: C/intro-first-run.page:5(desc)
@@ -9743,45 +6572,32 @@ msgstr "Poišči %s z Beaglom"
 msgid "Starting <em>Evolution</em> for the first time"
 msgstr ""
 
-#: C/intro-first-run.page:22(link)
-#, fuzzy
-msgid "import data from other applications."
-msgstr "Uvozi podatke iz drugih programov"
-
 #: C/intro-first-run.page:22(p)
-msgid ""
-"The first time you run Evolution, it opens the First-Run Assistant to help "
-"you set up email accounts and <placeholder-1/>"
+msgid "The first time you run Evolution, it opens the First-Run Assistant to help you set up email accounts and <link xref=\"import-data\">import data from other applications.</link>"
 msgstr ""
 
 #: C/intro-first-run.page:31(title)
+#, fuzzy
 msgid "Restore from backup"
 msgstr "Obnovi iz varnostne kopije"
 
 #: C/intro-first-run.page:32(p)
-msgid ""
-"You will get asked whether to restore from a backup of a previous version. "
-"If you have such a backup, continue <placeholder-1/>. Otherwise, go to the "
-"next page."
+msgid "You will get asked whether to restore from a backup of a previous version. If you have such a backup, continue <link xref=\"backup-restore#restore\">here</link>. Otherwise, go to the next page."
 msgstr ""
 
-#: C/intro-first-run.page:37(gui)
+#: C/intro-first-run.page:36(title)
 #, fuzzy
-msgid "Server Type"
-msgstr "Vrs_ta strežnika:"
+msgid "Receiving Email"
+msgstr "Sprejemam e-pošto"
 
 #: C/intro-first-run.page:37(p)
-msgid "First, choose the server type from the <placeholder-1/> dropdown-list."
-msgstr ""
+#, fuzzy
+msgid "First, choose the server type from the <gui>Server Type</gui> dropdown-list."
+msgstr "Izberite vstavek s seznama"
 
 #: C/intro-first-run.page:38(p)
-#, fuzzy
-msgid ""
-"If you are unsure about the type of server to choose, ask your system "
-"administrator or Internet Service Provider."
+msgid "If you are unsure about the type of server to choose, ask your system administrator or Internet Service Provider."
 msgstr ""
-"Vnesite podatke o načinu pošiljanja pošte. Če niste prepričani, se obrnite "
-"na svojega sistemskega skrbnika ali ponudnika dostopa do medmrežja."
 
 #: C/intro-first-run.page:43(p)
 msgid "The most common available server types for normal users are:"
@@ -9791,36 +6607,40 @@ msgstr ""
 msgid "None: If you do not plan to use Evolution for receiving email."
 msgstr ""
 
-#: C/intro-first-run.page:45(p) C/intro-first-run.page:46(p)
-#: C/intro-first-run.page:48(p) C/intro-first-run.page:49(p)
-#: C/intro-first-run.page:50(p) C/intro-first-run.page:59(p)
-#: C/intro-first-run.page:62(p) C/intro-first-run.page:65(p)
-#: C/intro-first-run.page:73(p) C/intro-first-run.page:75(p)
-#: C/intro-first-run.page:77(p) C/intro-first-run.page:79(p)
-#: C/intro-first-run.page:81(p) C/intro-first-run.page:93(p)
-msgid "Continue <placeholder-1/> for configuration."
+#: C/intro-first-run.page:45(p)
+msgid "Continue <link xref=\"#sending\">here</link> for configuration."
 msgstr ""
 
 #: C/intro-first-run.page:46(p)
-msgid ""
-"IMAP: Keeps the mail on the server so you can access your mail from multiple "
-"systems."
+msgid "IMAP: Keeps the mail on the server so you can access your mail from multiple systems."
+msgstr ""
+
+#: C/intro-first-run.page:46(p)
+msgid "Continue <link xref=\"mail-receiving-options-imap\">here</link> for configuration."
 msgstr ""
 
 #: C/intro-first-run.page:48(p)
-msgid ""
-"IMAP+: Keeps the mail on the server so you can access your mail from "
-"multiple systems."
+msgid "IMAP+: Keeps the mail on the server so you can access your mail from multiple systems."
+msgstr ""
+
+#: C/intro-first-run.page:48(p)
+msgid "Continue <link xref=\"mail-receiving-options-imap-plus\">here</link> for configuration."
 msgstr ""
 
 #: C/intro-first-run.page:49(p)
 msgid "POP: Downloads your email to your hard disk."
 msgstr ""
 
+#: C/intro-first-run.page:49(p)
+msgid "Continue <link xref=\"mail-receiving-options-pop\">here</link> for configuration."
+msgstr ""
+
 #: C/intro-first-run.page:50(p)
-msgid ""
-"USENET News: Connects to a news server and downloads a list of available "
-"news digests."
+msgid "USENET News: Connects to a news server and downloads a list of available news digests."
+msgstr ""
+
+#: C/intro-first-run.page:50(p)
+msgid "Continue <link xref=\"mail-receiving-options-usenet-news\">here</link> for configuration."
 msgstr ""
 
 #: C/intro-first-run.page:56(p)
@@ -9828,82 +6648,77 @@ msgid "Available server types for corporate users are:"
 msgstr ""
 
 #: C/intro-first-run.page:59(p)
-msgid ""
-"Exchange MAPI: For connecting to a Microsoft Exchange 2007/2010 or "
-"OpenChange server."
+msgid "Exchange MAPI: For connecting to a Microsoft Exchange 2007/2010 or OpenChange server."
 msgstr ""
 
-#: C/intro-first-run.page:60(link)
-#: C/exchange-connectors-overview.page:26(link)
-msgid "Install evolution-mapi now."
+#: C/intro-first-run.page:59(p)
+msgid "Continue <link xref=\"mail-receiving-options-exchange-mapi\">here</link> for configuration."
 msgstr ""
 
 #: C/intro-first-run.page:60(p)
-msgid ""
-"This requires having the evolution-mapi package installed. <placeholder-1/>"
+msgid "This requires having the evolution-mapi package installed. <link action=\"install:evolution-mapi\" href=\"http://ftp.gnome.org/pub/gnome/sources/evolution-mapi/\">Install evolution-mapi now.</link>"
 msgstr ""
 
 #: C/intro-first-run.page:62(p)
-msgid ""
-"Microsoft Exchange: For connecting to a Microsoft Exchange 2000 or 2003 "
-"server."
+msgid "Microsoft Exchange: For connecting to a Microsoft Exchange 2000 or 2003 server."
 msgstr ""
 
-#: C/intro-first-run.page:63(link)
-#: C/exchange-connectors-overview.page:24(link)
-msgid "Install evolution-exchange now."
+#: C/intro-first-run.page:62(p)
+msgid "Continue <link xref=\"mail-receiving-options-evolution-exchange\">here</link> for configuration."
 msgstr ""
 
 #: C/intro-first-run.page:63(p)
-msgid ""
-"This requires having the evolution-exchange package installed. "
-"<placeholder-1/>"
+msgid "This requires having the evolution-exchange package installed. <link action=\"install:evolution-exchange\" href=\"http://ftp.gnome.org/pub/gnome/sources/evolution-exchange/\">Install evolution-exchange now.</link>"
 msgstr ""
 
 #: C/intro-first-run.page:65(p)
-#, fuzzy
 msgid "Novell Groupwise: For connecting to a Novell GroupWise server."
-msgstr "Povezava s strežnikom GroupWise ni uspela."
+msgstr ""
+
+#: C/intro-first-run.page:65(p)
+msgid "Continue <link xref=\"mail-receiving-options-novell-groupwise\">here</link> for configuration."
+msgstr ""
 
 #: C/intro-first-run.page:71(p)
 msgid "Available local account server types for advanced users are:"
 msgstr ""
 
-#: C/intro-first-run.page:73(gui)
-#, fuzzy
-msgid "Standard Unix Mbox Spool"
-msgstr "Običajna Unix datoteka poštnega predala"
+#: C/intro-first-run.page:73(p)
+msgid "Local delivery: If you want to move email from the spool (the location where mail waits for delivery) and store it in your home directory. You need to provide the path to the mail spool you want to use. If you want to leave email in your system's spool files, choose the <gui>Standard Unix Mbox Spool</gui> option instead."
+msgstr ""
 
 #: C/intro-first-run.page:73(p)
-msgid ""
-"Local delivery: If you want to move email from the spool (the location where "
-"mail waits for delivery) and store it in your home directory. You need to "
-"provide the path to the mail spool you want to use. If you want to leave "
-"email in your system's spool files, choose the <placeholder-1/> option "
-"instead."
+msgid "Continue <link xref=\"mail-receiving-options-local-delivery\">here</link> for configuration."
 msgstr ""
 
 #: C/intro-first-run.page:75(p)
-msgid ""
-"MH-Format Mail Directories: For downloading email using MH or another MH-"
-"style program."
+msgid "MH-Format Mail Directories: For downloading email using MH or another MH-style program."
 msgstr ""
 
-#: C/intro-first-run.page:75(p) C/intro-first-run.page:77(p)
+#: C/intro-first-run.page:75(p)
+#: C/intro-first-run.page:77(p)
 #: C/intro-first-run.page:81(p)
 msgid "You need to provide the path to the directory you want to use."
 msgstr ""
 
+#: C/intro-first-run.page:75(p)
+msgid "Continue <link xref=\"mail-receiving-options-mh-format-directories\">here</link> for configuration."
+msgstr ""
+
 #: C/intro-first-run.page:77(p)
-msgid ""
-"Maildir-Format Mail Directories: For downloading your email using Qmail or "
-"another Maildir-style program."
+msgid "Maildir-Format Mail Directories: For downloading your email using Qmail or another Maildir-style program."
+msgstr ""
+
+#: C/intro-first-run.page:77(p)
+msgid "Continue <link xref=\"mail-receiving-options-maildir-format-directories\">here</link> for configuration."
 msgstr ""
 
 #: C/intro-first-run.page:79(p)
-msgid ""
-"Standard Unix mbox spool file: For reading and storing email in the mail "
-"spool file on your local system."
+msgid "Standard Unix mbox spool file: For reading and storing email in the mail spool file on your local system."
+msgstr ""
+
+#: C/intro-first-run.page:79(p)
+msgid "Continue <link xref=\"mail-receiving-options-unix-mbox-spool-file\">here</link> for configuration."
 msgstr ""
 
 #: C/intro-first-run.page:79(p)
@@ -9911,17 +6726,15 @@ msgid "You need to provide the path to the mail spool file you want to use."
 msgstr ""
 
 #: C/intro-first-run.page:81(p)
-msgid ""
-"Standard Unix mbox spool directory: For reading and storing email in the "
-"mail spool directory on your local system."
+msgid "Standard Unix mbox spool directory: For reading and storing email in the mail spool directory on your local system."
+msgstr ""
+
+#: C/intro-first-run.page:81(p)
+msgid "Continue <link xref=\"mail-receiving-options-unix-mbox-spool-directory\">here</link> for configuration."
 msgstr ""
 
 #: C/intro-first-run.page:84(p)
-msgid ""
-"Later on, if you want to change an account, or if you want to create another "
-"one, go to <guiseq><placeholder-1/><placeholder-2/><placeholder-3/></"
-"guiseq>. Select the account you want to change, then click <placeholder-4/>. "
-"Alternately, add a new account by clicking <placeholder-5/>."
+msgid "Later on, if you want to change an account, or if you want to create another one, go to <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Mail Accounts</gui></guiseq>. Select the account you want to change, then click <gui style=\"button\">Edit</gui>. Alternately, add a new account by clicking <gui style=\"button\">Add</gui>."
 msgstr ""
 
 #. Do not rename, we link to it from the subpages
@@ -9930,23 +6743,24 @@ msgid "Sending mail"
 msgstr "Pošiljanje pošte"
 
 #: C/intro-first-run.page:91(p)
+#, fuzzy
 msgid "Available server types are:"
+msgstr "Na voljo ni novih posodobitev"
+
+#: C/intro-first-run.page:93(p)
+msgid "SMTP: Sends mail using an outbound mail server. This is the most common choice for sending mail."
 msgstr ""
 
 #: C/intro-first-run.page:93(p)
-msgid ""
-"SMTP: Sends mail using an outbound mail server. This is the most common "
-"choice for sending mail."
+msgid "Continue <link xref=\"mail-sending-options-smtp\">here</link> for configuration."
 msgstr ""
 
 #: C/intro-first-run.page:94(p)
-msgid ""
-"Sendmail: Uses the Sendmail program to send mail from your system. It is not "
-"easy to configure, so you should select this option only if you know how to "
-"set up a Sendmail service."
+msgid "Sendmail: Uses the Sendmail program to send mail from your system. It is not easy to configure, so you should select this option only if you know how to set up a Sendmail service."
 msgstr ""
 
 #: C/intro-first-run.page:99(title)
+#, fuzzy
 msgid "Account Information"
 msgstr "Podrobnosti računa"
 
@@ -9959,36 +6773,38 @@ msgstr ""
 msgid "Importing Mail (Optional)"
 msgstr "Sporočilo zaloge (izbirno)"
 
-#: C/intro-first-run.page:105(link) C/import-data.page:20(title)
-#, fuzzy
-msgid "Importing data from another application"
-msgstr "Uvozi podatke iz drugih programov"
-
 #: C/intro-first-run.page:105(p)
-#, fuzzy
-msgid "Continue with <placeholder-1/>."
-msgstr "gpg <placeholder-1/>"
+msgid "Continue with <link xref=\"import-data\">Importing data from another application</link>."
+msgstr ""
+
+#. When image changes, this message will be marked fuzzy or untranslated for you.
+#. It doesn't matter what you translate it to: it's not used at all.
+#: C/index.page:22(None)
+msgid "@@image: './figures/evolutionlogo.png'; md5=4bf469aaba7c368937309e931ba9bdcc"
+msgstr "@@image: './figures/evolutionlogo.png'; md5=4bf469aaba7c368937309e931ba9bdcc"
+
+#: C/index.page:5(desc)
+msgid "Evolution"
+msgstr "Evolution"
 
 #: C/index.page:22(title)
-msgid ""
-"<media type=\"image\" src=\"./figures/evolutionlogo.png\">Evolution logo</"
-"media> Evolution Mail and Calendar"
+msgid "<media type=\"image\" src=\"./figures/evolutionlogo.png\">Evolution logo</media> Evolution Mail and Calendar"
 msgstr ""
 
 #: C/index.page:26(title)
 #, fuzzy
 msgid "Getting Started"
-msgstr "Prejemanje je začeto"
+msgstr "Kako začeti"
 
 #: C/index.page:30(title)
 #, fuzzy
 msgid "Mail Management"
-msgstr "Upravljanje map"
+msgstr "Upravljanje omrežij"
 
 #: C/index.page:32(title)
 #, fuzzy
 msgid "Advanced Mail Management"
-msgstr "Upravljanje map"
+msgstr "Možnosti upravljanja seje:"
 
 #: C/index.page:34(title)
 msgid "IMAP"
@@ -9997,55 +6813,57 @@ msgstr "IMAP"
 #: C/index.page:40(title)
 #, fuzzy
 msgid "Mail Composing"
-msgstr "Pošta od %s"
+msgstr "Sestavljanje sporočil"
 
 #: C/index.page:42(title)
 #, fuzzy
 msgid "Advanced Mail Composing"
-msgstr "Napaka med formatiranjem nosilca"
+msgstr "Naprej - prejemanje pošte"
 
 #: C/index.page:47(title)
 #, fuzzy
 msgid "Calendar Management"
-msgstr "Upravljanje map"
+msgstr "Upravljanje omrežij"
 
 #: C/index.page:49(title)
 #, fuzzy
 msgid "Advanced Calendar Management"
-msgstr "Ime koledarja Yahoo:"
+msgstr "Možnosti upravljanja seje:"
 
 #: C/index.page:54(title)
 #, fuzzy
 msgid "Contacts Management"
-msgstr "Upravljanje s stiki"
+msgstr "Upravljanje omrežij"
 
 #: C/index.page:58(title)
 #, fuzzy
 msgid "Memos and Tasks Management"
-msgstr "Upravljanje s stiki"
+msgstr "Imenik, zapiski in naloge Evolution."
 
 #: C/index.page:62(title)
 #, fuzzy
 msgid "Data Migration and Synchronization"
-msgstr "Datoteka usklajevanja"
+msgstr "Podatkovni in zvočni %s v %s"
 
 #: C/index.page:66(title)
+#, fuzzy
 msgid "Corporate Environments"
-msgstr ""
+msgstr "Ime družbe"
 
 #: C/index.page:68(title)
 #, fuzzy
 msgid "Microsoft Exchange"
-msgstr "Microsoft Exchange:"
+msgstr "Microsoft Exchange"
 
 #: C/index.page:71(title)
+#, fuzzy
 msgid "Novell Groupwise"
-msgstr "Novell Groupwise"
+msgstr "Novell GroupWise"
 
 #: C/index.page:76(title)
 #, fuzzy
 msgid "Tracking down Problems"
-msgstr "Možnosti sledenja"
+msgstr "Pogoste težave IRC"
 
 #: C/index.page:80(title)
 msgid "Common Mail Questions and Problems"
@@ -10058,7 +6876,7 @@ msgstr ""
 #: C/index.page:88(title)
 #, fuzzy
 msgid "Further reading"
-msgstr "Nitenje po zadevi"
+msgstr "Nadaljnje branje"
 
 #: C/import-supported-file-formats.page:5(desc)
 msgid "Supported file formats for importing data."
@@ -10067,7 +6885,7 @@ msgstr ""
 #: C/import-supported-file-formats.page:23(title)
 #, fuzzy
 msgid "Supported file formats"
-msgstr "Nepodprta oblika podpisa"
+msgstr "Pretvarjanje vrste slik"
 
 #: C/import-supported-file-formats.page:25(p)
 msgid "Evolution can import the following types of files:"
@@ -10079,30 +6897,20 @@ msgid "Mail"
 msgstr "Pošta"
 
 #: C/import-supported-file-formats.page:30(p)
-#, fuzzy
 msgid "Berkeley Mailbox (.mbox or no extension):"
-msgstr "Poštni predal Berkeley (mbox)"
+msgstr ""
 
 #: C/import-supported-file-formats.page:32(p)
-msgid ""
-"The email format used by Mozilla, Netscape, Evolution (for local folders "
-"until version 2.32), Eudora, and many other email clients."
+msgid "The email format used by Mozilla, Netscape, Evolution (for local folders until version 2.32), Eudora, and many other email clients."
 msgstr ""
 
 #: C/import-supported-file-formats.page:34(p)
-msgid "Maildir (no extension):"
-msgstr ""
-
-#: C/import-supported-file-formats.page:36(link)
 #, fuzzy
-msgid "configure a Maildir account"
-msgstr "Nastavitve elektronskih računov"
+msgid "Maildir (no extension):"
+msgstr "Ni takšne pripone"
 
 #: C/import-supported-file-formats.page:36(p)
-msgid ""
-"The format used by Evolution (for local folders since version 3.0). There is "
-"no need to import Maildir files as you can <placeholder-1/> in Evolution and "
-"point to the folder where the Maildir files are stored."
+msgid "The format used by Evolution (for local folders since version 3.0). There is no need to import Maildir files as you can <link xref=\"mail-account-manage-maildir-format-directories\">configure a Maildir account</link> in Evolution and point to the folder where the Maildir files are stored."
 msgstr ""
 
 #: C/import-supported-file-formats.page:38(p)
@@ -10111,20 +6919,15 @@ msgid "Outlook Express 5/6 Personal Folders (.dbx):"
 msgstr "Osebne mape Outlook Express 5/6 (.dbx)"
 
 #: C/import-supported-file-formats.page:40(p)
-msgid ""
-"The email file format used by Microsoft Outlook Express 5/6. For newer "
-"versions PST import is recommended."
+msgid "The email file format used by Microsoft Outlook Express 5/6. For newer versions PST import is recommended."
 msgstr ""
 
 #: C/import-supported-file-formats.page:48(p)
-#, fuzzy
 msgid "vCalendar (.vcs):"
-msgstr "iCalendar (.ics)"
+msgstr "vCalendar (.vcs):"
 
 #: C/import-supported-file-formats.page:50(p)
-msgid ""
-"A format for storing calendar files, which is generally used by Evolution, "
-"Microsoft Outlook, Sunbird, and Korganizer."
+msgid "A format for storing calendar files, which is generally used by Evolution, Microsoft Outlook, Sunbird, and Korganizer."
 msgstr ""
 
 #: C/import-supported-file-formats.page:52(p)
@@ -10132,15 +6935,13 @@ msgid "iCalendar or iCal (.ics):"
 msgstr ""
 
 #: C/import-supported-file-formats.page:54(p)
-msgid ""
-"A format for storing calendar files. iCalendar is used by Evolution, "
-"Microsoft Outlook, Palm OS handhelds, and others."
+msgid "A format for storing calendar files. iCalendar is used by Evolution, Microsoft Outlook, Palm OS handhelds, and others."
 msgstr ""
 
 #: C/import-supported-file-formats.page:62(p)
 #, fuzzy
 msgid "LDAP Data Interchange Format (.ldif):"
-msgstr "Zapis za izmenjavo podatkov LDAP (.ldif)"
+msgstr "Zapis za imenjavo podatkov LDAP (.ldif)"
 
 #: C/import-supported-file-formats.page:64(p)
 msgid "A standard data format for contact cards."
@@ -10151,15 +6952,12 @@ msgid "vCard (.vcf, .gcrd):"
 msgstr "vCard (.vcf, .gcrd):"
 
 #: C/import-supported-file-formats.page:68(p)
-msgid ""
-"The address book format used by the GNOME, KDE, and many other contact "
-"management applications. You should be able to export to vCard format from "
-"any address book application."
+msgid "The address book format used by the GNOME, KDE, and many other contact management applications. You should be able to export to vCard format from any address book application."
 msgstr ""
 
 #: C/import-supported-file-formats.page:74(title)
 #, fuzzy
-msgid "Miscelleanous"
+msgid "Miscellaneous"
 msgstr "Razno"
 
 #: C/import-supported-file-formats.page:76(p)
@@ -10167,9 +6965,7 @@ msgid "Evolution/Mozilla/Outlook CSV/Tab (.csv, .tab):"
 msgstr "Evolution/Mozilla/Outlook CSV/Tab (.csv, .tab):"
 
 #: C/import-supported-file-formats.page:78(p)
-msgid ""
-"CSV (Comma-separated values) or Tabulator files saved by using Evolution, "
-"Microsoft Outlook and Mozilla."
+msgid "CSV (Comma-separated values) or Tabulator files saved by using Evolution, Microsoft Outlook and Mozilla."
 msgstr ""
 
 #: C/import-supported-file-formats.page:80(p)
@@ -10178,10 +6974,7 @@ msgid "Personal Storage Table (.pst):"
 msgstr "Outlook osebne mape (.pst)"
 
 #: C/import-supported-file-formats.page:82(p)
-msgid ""
-"A file format used to store local copies of messages, calendar events, and "
-"other items within Microsoft software such as Microsoft Exchange Client, "
-"Windows Messaging, and Microsoft Outlook."
+msgid "A file format used to store local copies of messages, calendar events, and other items within Microsoft software such as Microsoft Exchange Client, Windows Messaging, and Microsoft Outlook."
 msgstr ""
 
 #: C/import-single-files.page:5(desc)
@@ -10198,108 +6991,91 @@ msgstr "Enojni klik odstrani izbor"
 msgid "To import single files (mail, calendar data or contacts):"
 msgstr ""
 
-#: C/import-single-files.page:25(gui) C/import-apps-outlook.page:60(gui)
-#: C/import-apps-mozilla.page:25(gui)
-msgid "Importer Type"
-msgstr "Vrsta uvoznika"
-
-#: C/import-single-files.page:25(gui) C/import-apps-outlook.page:60(gui)
-#: C/import-apps-mozilla.page:25(gui)
+#: C/import-single-files.page:24(p)
+#: C/import-apps-outlook.page:59(p)
+#: C/import-apps-mozilla.page:24(p)
 #, fuzzy
-msgid "Import a single file"
-msgstr "Uvozi eno _samo datoteko"
+msgid "Click <guiseq><gui>File</gui><gui>Import</gui></guiseq>."
+msgstr "Kliknite <guiseq><gui>Datoteka</gui><gui>Natisni</gui></guiseq>."
 
-#: C/import-single-files.page:25(p) C/import-apps-outlook.page:60(p)
+#: C/import-single-files.page:25(p)
+#: C/import-apps-outlook.page:60(p)
 #: C/import-apps-mozilla.page:25(p)
-msgid "In the <placeholder-1/> tab, click <placeholder-2/>."
+msgid "In the <gui>Importer Type</gui> tab, click <gui>Import a single file</gui>."
 msgstr ""
 
 #: C/import-single-files.page:26(p)
-#, fuzzy
 msgid "Choose the file."
-msgstr "Izbor datoteke"
+msgstr "Izberite datoteko."
 
-#: C/import-single-files.page:26(p) C/import-apps-outlook.page:61(p)
+#: C/import-single-files.page:26(p)
+#: C/import-apps-outlook.page:61(p)
 #: C/import-apps-mozilla.page:26(p)
 #, fuzzy
 msgid "The file type will be automatically determined."
-msgstr "Poštni filtri se samodejno posodabljajo."
+msgstr "Dovoljenja za izbrano datoteko ni mogoče določiti."
 
-#: C/import-single-files.page:27(p) C/import-apps-outlook.page:63(p)
+#: C/import-single-files.page:27(p)
+#: C/import-apps-outlook.page:63(p)
 #: C/import-apps-mozilla.page:27(p)
-#, fuzzy
-msgid ""
-"Choose the destination (e.g. the folder in Evolution) for the imported data."
-msgstr "Izberite cilj za ta uvoz"
+msgid "Choose the destination (e.g. the folder in Evolution) for the imported data."
+msgstr ""
 
 #: C/import-single-files.page:30(p)
-msgid ""
-"You can also import contacts that you have received as a vCard attachment of "
-"an email from its attachment menu."
+msgid "You can also import contacts that you have received as a vCard attachment of an email from its attachment menu."
 msgstr ""
 
 #: C/import-data.page:5(desc)
 #, fuzzy
 msgid "Importing data from another application."
-msgstr "Uvozi podatke iz drugih programov"
+msgstr "Kopiraj podatke iz drugega razdelka"
 
-#: C/import-data.page:23(title) C/default-browser.page:24(gui)
+#: C/import-data.page:20(title)
 #, fuzzy
+msgid "Importing data from another application"
+msgstr "Kopiraj podatke iz drugega razdelka"
+
+#: C/import-data.page:23(title)
 msgid "Applications"
-msgstr "Mesta"
+msgstr "Programi"
 
 #: C/import-apps-outlook.page:5(desc)
-#, fuzzy
 msgid "Importing data from Microsoft Outlook."
-msgstr "Dekodira priloge TNEF (winmail.dat) iz Microsoft Outlooka."
+msgstr ""
 
 #: C/import-apps-outlook.page:23(title)
 msgid "Outlook"
-msgstr ""
+msgstr "Outlook"
 
 #. "Import data and settings from older programs" cannot recognize Outlook, as there obviously is no default storage location for Outlook *under Linux*
 #: C/import-apps-outlook.page:26(p)
-msgid ""
-"These steps refer to locally stored data such as POP accounts. For remote "
-"data (like IMAP) this is not necessary, since the data is still on the "
-"server and does not need to be manually transfered. You can set up the "
-"corresponding account in Evolution and the data will be downloaded."
+msgid "These steps refer to locally stored data such as POP accounts. For remote data (like IMAP) this is not necessary, since the data is still on the server and does not need to be manually transfered. You can set up the corresponding account in Evolution and the data will be downloaded."
 msgstr ""
 
 #: C/import-apps-outlook.page:29(title)
+#, fuzzy
 msgid "Prerequisites under Windows"
-msgstr ""
+msgstr "Windows zvočna datoteka"
 
 #: C/import-apps-outlook.page:30(p)
 msgid "First, while using Microsoft Windows, prepare your messages for import:"
 msgstr ""
 
-#: C/import-apps-outlook.page:32(file)
-msgid ".pst"
-msgstr ""
-
-#: C/import-apps-outlook.page:32(file)
-msgid ".ost"
-msgstr ""
-
 #: C/import-apps-outlook.page:32(p)
-msgid ""
-"Find your Outlook files (they normally have the file ending <placeholder-1/> "
-"or <placeholder-2/>):"
+msgid "Find your Outlook files (they normally have the file ending <file>.pst</file> or <file>.ost</file>):"
 msgstr ""
 
 #: C/import-apps-outlook.page:35(p)
 msgid "Windows 7, Windows Vista"
-msgstr ""
+msgstr "Windows 7, Windows Vista"
 
 #: C/import-apps-outlook.page:35(p)
-#, fuzzy
 msgid "Windows XP"
-msgstr "_Okno"
+msgstr "Windows XP"
 
 #: C/import-apps-outlook.page:38(td)
 msgid "Outlook 2010"
-msgstr ""
+msgstr "Outlook 2010"
 
 #: C/import-apps-outlook.page:38(file)
 msgid "C:\\Users\\username\\My Documents\\Outlook Files"
@@ -10310,34 +7086,27 @@ msgid "C:\\Documents and Settings\\username\\My Documents\\Outlook Files"
 msgstr ""
 
 #: C/import-apps-outlook.page:41(td)
-#, fuzzy
 msgid "Outlook 2007 and earlier"
-msgstr "Uvoznik Outlook CSV in Tab"
+msgstr "Outlook 2007 in prejšnji"
 
 #: C/import-apps-outlook.page:41(file)
 msgid "C:\\Users\\username\\AppData\\Local\\Microsoft\\Outlook"
 msgstr ""
 
 #: C/import-apps-outlook.page:41(file)
-msgid ""
-"C:\\Documents and Settings\\username\\AppData\\Local\\Microsoft\\Outlook"
+msgid "C:\\Documents and Settings\\username\\AppData\\Local\\Microsoft\\Outlook"
 msgstr ""
 
 #: C/import-apps-outlook.page:44(p)
 msgid "(Replace \"username\" by your username.)"
-msgstr ""
+msgstr "(Zamenjajte \"username\" s svojim uporabniškim imenom.)"
 
 #: C/import-apps-outlook.page:47(p)
-msgid ""
-"Copy the Outlook files to the system or partition that Evolution is "
-"installed on."
+msgid "Copy the Outlook files to the system or partition that Evolution is installed on."
 msgstr ""
 
 #: C/import-apps-outlook.page:48(p)
-msgid ""
-"As your Windows hard drive is probably in the NTFS format, some Linux "
-"systems cannot read it without additional software. You might find it "
-"simpler to copy the mail folders to a USB drive or to burn a CD."
+msgid "As your Windows hard drive is probably in the NTFS format, some Linux systems cannot read it without additional software. You might find it simpler to copy the mail folders to a USB drive or to burn a CD."
 msgstr ""
 
 #: C/import-apps-outlook.page:49(p)
@@ -10345,101 +7114,64 @@ msgid "Mount your Windows drive or the disk where you saved the mail files."
 msgstr ""
 
 #: C/import-apps-outlook.page:50(p)
-msgid ""
-"Copy all the mail files into your home directory or another convenient place."
+msgid "Copy all the mail files into your home directory or another convenient place."
 msgstr ""
 
 #: C/import-apps-outlook.page:51(p)
-#, fuzzy
 msgid "Start Evolution."
-msgstr "Evolution stik."
-
-#: C/import-apps-outlook.page:52(gui)
-#, fuzzy
-msgid "Mail Folder"
-msgstr "Poštna _mapa"
-
-#: C/import-apps-outlook.page:52(link)
-#, fuzzy
-msgid "folders"
-msgstr "Mapa:"
+msgstr "Zaženi Evolution."
 
 #: C/import-apps-outlook.page:52(p)
-msgid ""
-"Optionally select <guiseq><placeholder-1/><placeholder-2/><placeholder-3/></"
-"guiseq> to create the <placeholder-4/> you want."
+msgid "Optionally select <guiseq><gui>File</gui><gui>New</gui><gui>Mail Folder</gui></guiseq> to create the <link xref=\"mail-folders\">folders</link> you want."
 msgstr ""
 
 #: C/import-apps-outlook.page:57(title)
-#, fuzzy
 msgid "Importing into Evolution"
-msgstr "Povrnitev podatkov programa Evolution"
+msgstr "Uvažanje v Evolution"
 
 #: C/import-apps-outlook.page:61(p)
-#, fuzzy
-msgid ""
-"Choose the Outlook personal folders (.pst) file that you would like to "
-"import."
-msgstr "Izberite podatke, ki jih želite uvoziti:"
-
-#: C/import-apps-outlook.page:62(gui)
-#, fuzzy
-msgid "Import single file"
-msgstr "Uvozi eno _samo datoteko"
-
-#: C/import-apps-outlook.page:62(gui)
-#, fuzzy
-msgid "File type"
-msgstr "Vrs_ta datoteke:"
+msgid "Choose the Outlook personal folders (.pst) file that you would like to import."
+msgstr ""
 
 #: C/import-apps-outlook.page:62(p)
-msgid ""
-"If the option to import Outlook personal folders (.pst files) is not "
-"available under <guiseq><placeholder-1/><placeholder-2/><placeholder-3/"
-"><placeholder-4/></guiseq>, your distribution might have not enabled this "
-"functionality."
+msgid "If the option to import Outlook personal folders (.pst files) is not available under <guiseq><gui>File</gui><gui>Import</gui><gui>Import single file</gui><gui>File type</gui></guiseq>, your distribution might have not enabled this functionality."
 msgstr ""
 
-#: C/import-apps-outlook.page:64(p) C/import-apps-mozilla.page:28(p)
+#: C/import-apps-outlook.page:64(p)
+#: C/import-apps-mozilla.page:28(p)
 msgid "Repeat the import steps until you have imported all your data."
 msgstr ""
 
 #: C/import-apps-mozilla.page:5(desc)
-#, fuzzy
 msgid "Importing data from Mozilla Thunderbird."
-msgstr "Uvozi podatke iz drugih programov"
+msgstr "Uvažanje podatkov iz programa Mozilla Thunderbid."
 
 #: C/import-apps-mozilla.page:20(title)
 msgid "Mozilla"
-msgstr ""
+msgstr "Mozilla"
 
 #: C/import-apps-mozilla.page:26(p)
-#, fuzzy
 msgid "Choose the Thunderbird files that you would like to import."
-msgstr "Izberite podatke, ki jih želite uvoziti:"
+msgstr ""
 
-#: C/groupwise-placeholder.page:5(desc) C/groupwise-placeholder.page:20(title)
+#: C/groupwise-placeholder.page:5(desc)
+#: C/groupwise-placeholder.page:20(title)
 msgid "Connecting to GroupWise"
 msgstr "Povezovanje z GroupWise"
 
-#: C/groupwise-placeholder.page:22(link) C/exchange-placeholder.page:22(link)
-#, fuzzy
-msgid "old Evolution manual"
-msgstr "Evolution koledar"
-
-#: C/groupwise-placeholder.page:22(p) C/exchange-placeholder.page:22(p)
-msgid "For topics not covered here please refer to the <placeholder-1/>."
+#: C/groupwise-placeholder.page:22(p)
+msgid "For topics not covered here please refer to the <link href=\"http://library.gnome.org/users/evolution/2.32/usage-groupwise.html.en\">old Evolution manual</link>."
 msgstr ""
 
 #: C/google-services.page:5(desc)
 #, fuzzy
 msgid "Using Google services."
-msgstr "Google viri"
+msgstr "Prevod besed z Google prevajalnikom"
 
 #: C/google-services.page:18(title)
 #, fuzzy
 msgid "Using Google services"
-msgstr "Google viri"
+msgstr "Prevod besed z Google prevajalnikom"
 
 #: C/express-mode.page:5(desc)
 msgid "What to do when using a small screen or netbook."
@@ -10450,185 +7182,118 @@ msgid "Some windows are too large for small screens."
 msgstr ""
 
 #: C/express-mode.page:22(p)
-msgid ""
-"This is a known problem and hard to solve for a complex application with "
-"many settings such as Evolution."
+msgid "This is a known problem and hard to solve for a complex application with many settings such as Evolution."
 msgstr ""
 
-#: C/express-mode.page:23(code)
-msgid "evolution --express"
-msgstr "evolution --express"
-
 #: C/express-mode.page:23(p)
-msgid ""
-"You can use the Express version which is targeted for mobile and small-"
-"screen devices. This is available from version 2.30 on and can be enabled by "
-"starting <placeholder-1/> from the terminal window."
+msgid "You can use the Express version which is targeted for mobile and small-screen devices. This is available from version 2.30 on and can be enabled by starting <code>evolution --express</code> from the terminal window."
+msgstr ""
+
+#: C/express-mode.page:25(p)
+msgid "You can also explicitly open Evolution in a specific component. For the calendar, use <code>evolution --express --component=calendar</code>."
 msgstr ""
 
 #: C/exporting-data.page:5(desc)
-msgid "How to export data from <placeholder-1/>."
+msgid "How to export data from <em>Evolution</em>."
 msgstr ""
 
 #: C/exporting-data.page:20(title)
+#, fuzzy
 msgid "Exporting data from <em>Evolution</em>"
-msgstr ""
+msgstr "Podatki iz privzetega imenika Evolution"
 
 #: C/exporting-data-mail.page:5(desc)
-msgid "How to export mail data from <placeholder-1/>."
+msgid "How to export mail data from <em>Evolution</em>."
 msgstr ""
 
 #: C/exporting-data-mail.page:20(title)
-#, fuzzy
 msgid "Exporting mail data"
-msgstr "Uvažanje podatkov Elm"
-
-#: C/exporting-data-mail.page:22(link)
-msgid "mbox"
-msgstr ""
-
-#: C/exporting-data-mail.page:22(gui)
-#, fuzzy
-msgid "Save as mbox..."
-msgstr "_Shrani kot mbox..."
+msgstr "Izvažanje podatkov pošte"
 
 #: C/exporting-data-mail.page:22(p)
-msgid ""
-"To save an email to a file in <placeholder-1/> format, select an email and "
-"click <guiseq><placeholder-2/><placeholder-3/></guiseq> or right-click on "
-"the message and click <placeholder-4/>."
+msgid "To save an email to a file in <link href=\"https://secure.wikimedia.org/wikipedia/en/wiki/Mbox\">mbox</link> format, select an email and click <guiseq><gui>File</gui><gui>Save as mbox...</gui></guiseq> or right-click on the message and click <gui>Save as mbox...</gui>."
 msgstr ""
 
 #: C/exporting-data-mail.page:24(p)
-msgid ""
-"The same steps apply to save a complete mail folder, but you have to mark "
-"all messages in it first."
+msgid "The same steps apply to save a complete mail folder, but you have to mark all messages in it first."
 msgstr ""
 
 #: C/exporting-data-contacts.page:5(desc)
-msgid "How to export contacts data from <placeholder-1/>."
+msgid "How to export contacts data from <em>Evolution</em>."
 msgstr ""
 
 #: C/exporting-data-contacts.page:23(title)
-#, fuzzy
 msgid "Exporting contacts data"
-msgstr "Evolution stiki"
+msgstr "Izvažanje podatkov o vaših stikih"
 
 #: C/exporting-data-contacts.page:25(p)
-msgid ""
-"Contacts files are stored in a database, but can be saved as a vCard file."
+msgid "Contacts files are stored in a database, but can be saved as a vCard file."
 msgstr ""
 
-#: C/exporting-data-contacts.page:26(gui)
-#, fuzzy
-msgid "Save Address Book As vCard"
-msgstr "Shr_ani imenik kot VCard"
-
 #: C/exporting-data-contacts.page:26(p)
-msgid ""
-"To export a complete address book, click <guiseq><placeholder-1/"
-"><placeholder-2/></guiseq>."
+msgid "To export a complete address book, click <guiseq><gui>File</gui><gui>Save Address Book As vCard</gui></guiseq>."
 msgstr ""
 
-#: C/exporting-data-contacts.page:27(gui)
-#, fuzzy
-msgid "Save Contact as VCard"
-msgstr "_Shrani stik kot VCard ..."
-
-#: C/exporting-data-contacts.page:27(gui)
-msgid "Save as vCard"
-msgstr "Shrani kot VCard"
-
 #: C/exporting-data-contacts.page:27(p)
-msgid ""
-"If you want to export only one contact, click <guiseq><placeholder-1/"
-"><placeholder-2/></guiseq> or right-click on the contact and click "
-"<placeholder-3/>."
+msgid "If you want to export only one contact, click <guiseq><gui>File</gui><gui>Save as vCard</gui></guiseq> or right-click on the contact and click <gui>Save as vCard</gui>."
 msgstr ""
 
 #: C/exporting-data-calendar.page:5(desc)
-msgid "How to export calendar data from <placeholder-1/>."
+msgid "How to export calendar data from <em>Evolution</em>."
 msgstr ""
 
 #: C/exporting-data-calendar.page:20(title)
-#, fuzzy
 msgid "Exporting calendar data"
-msgstr "Odpiranje koledarja na %s"
-
-#: C/exporting-data-calendar.page:22(gui)
-#, fuzzy
-msgid "Save as"
-msgstr "Shrani nalogo"
+msgstr "Izvažanje podatkov koledarja"
 
 #: C/exporting-data-calendar.page:22(p)
-msgid ""
-"To export a complete calendar, right-click on the calendar in the list of "
-"calendars and click <placeholder-1/>. Available formats are iCalendar format "
-"(ICS, recommended), comma seperated values (CSV), and RDF format."
+msgid "To export a complete calendar, right-click on the calendar in the list of calendars and click <gui>Save as</gui>. Available formats are iCalendar format (ICS, recommended), comma separated values (CSV), and RDF format."
 msgstr ""
 
-#: C/exporting-data-calendar.page:23(gui)
-msgid "Save as iCalendar..."
-msgstr "Shrani kot iCalendar ..."
-
 #: C/exporting-data-calendar.page:23(p)
-msgid ""
-"If you want to export only one appointment, right-click on the appointment "
-"and click <placeholder-1/>."
+msgid "If you want to export only one appointment, right-click on the appointment and click <gui>Save as iCalendar...</gui>."
 msgstr ""
 
-#: C/exchange-placeholder.page:5(desc) C/exchange-placeholder.page:20(title)
+#: C/exchange-placeholder.page:5(desc)
+#: C/exchange-placeholder.page:20(title)
 msgid "Connecting to Exchange Servers"
 msgstr "Povezovanje s strežniki Exchange"
 
+#: C/exchange-placeholder.page:22(p)
+msgid "For topics not covered here please refer to the <link href=\"http://library.gnome.org/users/evolution/2.32/usage-exchange.html.en\">old Evolution manual</link>."
+msgstr ""
+
 #: C/exchange-connectors-overview.page:5(desc)
-msgid ""
-"Which additional package to install in order to connect to an Exchange "
-"server."
+msgid "Which additional package to install in order to connect to an Exchange server."
 msgstr ""
 
+#: C/exchange-connectors-overview.page:20(title)
+#, fuzzy
+msgid "Choosing the right connector"
+msgstr "Stik izven strani"
+
 #: C/exchange-connectors-overview.page:22(p)
-msgid ""
-"Depending on the version of the Microsoft Exchange server that you would "
-"like to connect to it is required to make sure that an additional package is "
-"installed that provides this functionality."
+msgid "Depending on the version of the Microsoft Exchange server that you would like to connect to it is required to make sure that an additional package is installed that provides this functionality."
 msgstr ""
 
 #: C/exchange-connectors-overview.page:24(p)
-msgid ""
-"For Microsoft Exchange 2000 and 2003 (and possibly earlier versions of "
-"Exchange that use Outlook Web Access) it is recommended to use the package "
-"evolution-exchange. <placeholder-1/>"
+msgid "For Microsoft Exchange 2000 and 2003 (and possibly earlier versions of Exchange that use Outlook Web Access) it is recommended to use the package evolution-exchange. <link action=\"install:evolution-exchange\" href=\"http://projects.gnome.org/evolution/download\">Install evolution-exchange now.</link>"
 msgstr ""
 
 #: C/exchange-connectors-overview.page:26(p)
-msgid ""
-"For Microsoft Exchange 2007 (and possibly earlier versions that support "
-"MAPI) it is recommended to use the package evolution-mapi. <placeholder-1/>"
-msgstr ""
-
-#: C/exchange-connectors-overview.page:27(link)
-msgid "Install evolution-ews now."
+msgid "For Microsoft Exchange 2007 and 2010 (and possibly earlier versions that support MAPI) it is recommended to use the package evolution-mapi. <link action=\"install:evolution-mapi\" href=\"http://projects.gnome.org/evolution/download\">Install evolution-mapi now.</link>"
 msgstr ""
 
 #: C/exchange-connectors-overview.page:27(p)
-msgid ""
-"For Microsoft Exchange 2010 it is recommended to use the package evolution-"
-"ews which is currently still under development and might not be available "
-"yet for your distribution. evolution-ews also supports Microsoft Exchange "
-"2007. <placeholder-1/>"
+msgid "For Microsoft Exchange 2007 and 2010 the package evolution-ews is currently under development and will replace evolution-mapi in the future. It might not be available yet for your distribution. <link action=\"install:evolution-ews\" href=\"http://projects.gnome.org/evolution/download\">Install evolution-ews now.</link>"
 msgstr ""
 
 #: C/exchange-connectors-overview.page:29(p)
-msgid ""
-"If you are unsure which Microsoft Exchange server version is used, you may "
-"want to contact your system administrator for more information."
+msgid "If you are unsure which Microsoft Exchange server version is used, you may want to contact your system administrator for more information."
 msgstr ""
 
 #: C/deleting-to-free-disk-space.page:5(desc)
-msgid ""
-"Deleting emails and calendar entries to reduce the size of the files used by "
-"Evolution."
+msgid "Deleting emails and calendar entries to reduce the size of the files used by Evolution."
 msgstr ""
 
 #: C/deleting-to-free-disk-space.page:20(title)
@@ -10644,51 +7309,23 @@ msgid "Deleting emails or attachments permanently"
 msgstr ""
 
 #: C/deleting-emails.page:28(title)
-#, fuzzy
 msgid "Emails"
-msgstr "Elektronska pošta"
-
-#: C/deleting-emails.page:29(em)
-msgid "marking"
-msgstr ""
-
-#: C/deleting-emails.page:29(em)
-msgid "expunge"
-msgstr "uniči"
+msgstr "Elektronska sporočila"
 
 #: C/deleting-emails.page:29(p)
-msgid ""
-"Evolution deletes emails on IMAP servers by <placeholder-1/> the messages "
-"for deletion; space is not freed until you <placeholder-2/> the marked "
-"emails."
+msgid "Evolution deletes emails on IMAP servers by <em>marking</em> the messages for deletion; space is not freed until you <em>expunge</em> the marked emails."
 msgstr ""
 
-#: C/deleting-emails.page:31(gui)
-#, fuzzy
-msgid "Empty Trash"
-msgstr "Izprazni _smeti"
-
 #: C/deleting-emails.page:31(p)
-msgid ""
-"To Expunge a specific folder, go to <guiseq><placeholder-1/><placeholder-2/"
-"></guiseq> or press <keyseq><placeholder-3/><placeholder-4/></keyseq>. To "
-"Expunge all folders, go to <guiseq><placeholder-5/><placeholder-6/></"
-"guiseq>. This applies to other types of accounts as well."
+msgid "To Expunge a specific folder, go to <guiseq><gui>Folder</gui><gui>Expunge</gui></guiseq> or press <keyseq><key>Ctrl</key><key>E</key></keyseq>. To Expunge all folders, go to <guiseq><gui>File</gui><gui>Empty Trash</gui></guiseq>. This applies to other types of accounts as well."
 msgstr ""
 
 #: C/deleting-emails.page:35(title)
 msgid "Attachments"
 msgstr "Priloge"
 
-#: C/deleting-emails.page:36(gui)
-#, fuzzy
-msgid "Remove Attachments"
-msgstr "_Odstrani priloge"
-
 #: C/deleting-emails.page:36(p)
-msgid ""
-"To delete the attachments of an email, select the message and click "
-"<guiseq><placeholder-1/><placeholder-2/></guiseq>."
+msgid "To delete the attachments of an email, select the message and click <guiseq><gui>Message</gui><gui>Remove Attachments</gui></guiseq>."
 msgstr ""
 
 #: C/deleting-appointments.page:5(desc)
@@ -10700,18 +7337,8 @@ msgstr ""
 msgid "Deleting old appointments permanently"
 msgstr "Počisti stare sestanke in srečanja"
 
-#: C/deleting-appointments.page:22(gui)
-#, fuzzy
-msgid "Purge"
-msgstr "Poč_isti"
-
 #: C/deleting-appointments.page:22(p)
-msgid ""
-"To Purge old entries in a calendar, go to <guiseq><placeholder-1/"
-"><placeholder-2/></guiseq> in the Calendar view. You will be asked how many "
-"days old the events to remove from the calendar should be. The action will "
-"be applied to the currently opened calendar (selected in the list of "
-"calendars on the left); other calendars remain unchanged."
+msgid "To Purge old entries in a calendar, go to <guiseq><gui>Actions</gui><gui>Purge</gui></guiseq> in the Calendar view. You will be asked how many days old the events to remove from the calendar should be. The action will be applied to the currently opened calendar (selected in the list of calendars on the left); other calendars remain unchanged."
 msgstr ""
 
 #: C/default-browser.page:5(desc)
@@ -10719,56 +7346,21 @@ msgid "How to define the default browser to open links with."
 msgstr ""
 
 #: C/default-browser.page:20(title)
-msgid "Setting the default browser"
-msgstr ""
-
-#: C/default-browser.page:24(gui)
-#, fuzzy
-msgid "Activities"
-msgstr "Overitelji"
-
-#: C/default-browser.page:24(gui)
-#, fuzzy
-msgid "System Settings"
-msgstr "Nastavitve lupine"
-
-#: C/default-browser.page:24(gui)
-msgid "System"
-msgstr ""
-
-#: C/default-browser.page:24(gui)
-#, fuzzy
-msgid "System Info"
-msgstr "Razvrsti podatke"
-
-#: C/default-browser.page:24(gui)
 #, fuzzy
-msgid "Default Applications"
-msgstr "Privzete nastavitve"
+msgid "Setting the default browser"
+msgstr "Napačna privzeta nastavitev!"
 
 #. For GNOME2 the steps are to define the gconf keys /desktop/gnome/url-handlers/http and /https
 #: C/default-browser.page:24(p)
-msgid ""
-"You can set the system-wide default browser in GNOME 3 under "
-"<guiseq><placeholder-1/><placeholder-2/><placeholder-3/><placeholder-4/"
-"><placeholder-5/><placeholder-6/></guiseq>."
+msgid "You can set the system-wide default browser in GNOME 3 under <guiseq><gui>Activities</gui><gui>Applications</gui><gui>System Settings</gui><gui>System</gui><gui>System Info</gui><gui>Default Applications</gui></guiseq>."
 msgstr ""
 
 #: C/default-browser.page:25(p)
-msgid ""
-"If the prefered browser is set as default application but still does not "
-"work correctly please contact your distribution via their forum or bug "
-"tracker."
+msgid "If the preferred browser is set as default application but still does not work correctly please contact your distribution via their forum or bug tracker."
 msgstr ""
 
-#: C/default-browser.page:26(file)
-msgid "$HOME/.local/share/applications/mimeapps.list"
-msgstr "$HOME/.local/share/applications/mimeapps.list"
-
 #: C/default-browser.page:26(p)
-msgid ""
-"GNOME 3 users with a technical background can tweak these settings by "
-"defining scheme-handlers in <placeholder-1/>."
+msgid "GNOME 3 users with a technical background can tweak these settings by defining scheme-handlers in <file>$HOME/.local/share/applications/mimeapps.list</file>."
 msgstr ""
 
 #: C/data-storage.page:5(desc)
@@ -10778,93 +7370,82 @@ msgstr ""
 #: C/data-storage.page:20(title)
 #, fuzzy
 msgid "Data storage locations"
-msgstr "Mesto sporočila"
+msgstr "Sistem za shranjevanje podatkov"
 
 #: C/data-storage.page:23(p)
-msgid ""
-"This is only interesting for advanced users that want to debug problems."
-msgstr ""
-
-#: C/data-storage.page:26(link)
-msgid "XDG Base Directory Specification"
+msgid "This is only interesting for advanced users that want to debug problems."
 msgstr ""
 
 #: C/data-storage.page:26(p)
-msgid ""
-"If you run Evolution 2.32.0 or later, data will be stored according to the "
-"<placeholder-1/>. By default this means:"
+msgid "If you run Evolution 2.32.0 or later, data will be stored according to the <link href=\"http://www.freedesktop.org/wiki/Specifications/basedir-spec\">XDG Base Directory Specification</link>. By default this means:"
 msgstr ""
 
 #: C/data-storage.page:30(title)
 #, fuzzy
 msgid "The user's data files"
-msgstr "Uvoz datotek v knjižnico"
+msgstr "Pokaži po meri določene datoteke"
 
 #: C/data-storage.page:31(p)
-#, fuzzy
 msgid "$HOME/.local/share/evolution"
-msgstr ".local/share/evolution"
+msgstr "$HOME/.local/share/evolution"
 
 #: C/data-storage.page:34(title)
 #, fuzzy
 msgid "Various configuration and state files"
-msgstr "Način nastavitev posredniškega strežnika"
+msgstr "_Ročna nastavitev posredovalnega strežnika"
 
 #: C/data-storage.page:35(p)
-#, fuzzy
 msgid "$HOME/.config/evolution"
-msgstr "Nastavitve programa Evolution"
+msgstr "$HOME/.config/evolution"
 
 #: C/data-storage.page:38(title)
+#, fuzzy
 msgid "Disposable data caches"
-msgstr ""
+msgstr "Pripni prenesene podatke"
 
 #: C/data-storage.page:39(p)
-#, fuzzy
 msgid "$HOME/.cache/evolution"
-msgstr "$HOME/.local/share/evolution/mail/pop/"
+msgstr "$HOME/.cache/evolution"
 
 #: C/data-storage.page:42(title)
 #, fuzzy
 msgid "Configuration settings in GConf"
-msgstr "Različica nastavitev"
+msgstr "Ali naj se nepodprte nastavitve obdržijo v nastavitveni datoteki?"
 
 #: C/data-storage.page:43(p)
-#, fuzzy
 msgid "$HOME/.gconf/apps/evolution"
-msgstr "$HOME/.local/share/evolution/mail/pop/"
+msgstr "$HOME/.gconf/apps/evolution"
 
 #: C/credits.page:5(desc)
+#, fuzzy
 msgid "Credits and Acknowledgment."
-msgstr ""
+msgstr "Izpiši seznam zahval in končaj"
 
 #: C/credits.page:20(title)
+#, fuzzy
 msgid "Credits and Acknowledgment"
-msgstr ""
+msgstr "Izpiši seznam zahval in končaj"
 
 #: C/credits.page:23(title)
-#, fuzzy
 msgid "Authors of the Evolution User Documentation"
-msgstr "Odpre uporabniško pomoč programa"
+msgstr "Avtorji uporabniške dokumentacije Evolution"
 
-#: C/credits.page:25(p) C/credits.page:49(p)
-#, fuzzy
+#: C/credits.page:25(p)
+#: C/credits.page:49(p)
 msgid "André Klapper"
-msgstr "Andre Klapper"
+msgstr "André Klapper"
 
 #: C/credits.page:28(p)
-#, fuzzy
 msgid "April Gonzalez"
-msgstr "April Gonzales"
+msgstr "April Gonzalez"
 
 #: C/credits.page:41(title)
-#, fuzzy
 msgid "Authors of the previous version"
-msgstr "Preklopi na predhodni zavihek"
+msgstr "Avtorji prejšnje različice"
 
 #: C/credits.page:43(p)
 msgid "Aaron Weber"
-msgstr ""
+msgstr "Aaron Weber"
 
 #: C/credits.page:46(p)
 msgid "Akhil Laddha"
@@ -10872,57 +7453,51 @@ msgstr "Akhil Laddha"
 
 #: C/credits.page:52(p)
 msgid "Duncan Mak"
-msgstr ""
+msgstr "Duncan Mak"
 
 #: C/credits.page:55(p)
-#, fuzzy
 msgid "Ettore Perazzoli"
-msgstr "Ettore Perazzoli (ettore@ximian.com)"
+msgstr "Ettore Perazzoli"
 
 #: C/credits.page:58(p)
-#, fuzzy
 msgid "Francisco Javier F. Serrador"
-msgstr "Francisco Serrador"
+msgstr "Francisco Javier F. Serrador"
 
 #: C/credits.page:61(p)
 msgid "Jessica Prabhakar"
-msgstr ""
+msgstr "Jessica Prabhakar"
 
 #: C/credits.page:64(p)
 msgid "Kevin Breit"
-msgstr ""
+msgstr "Kevin Breit"
 
 #: C/credits.page:67(p)
-#, fuzzy
 msgid "Mark Moulder"
-msgstr "Iskanje v mapi"
+msgstr "Mark Moulder"
 
 #: C/credits.page:70(p)
 msgid "Novell, Inc."
 msgstr "Novell, Inc."
 
 #: C/credits.page:73(p)
-#, fuzzy
 msgid "Radhika Nair"
-msgstr "Radhika PC"
+msgstr "Radhika Nair"
 
 #: C/credits.page:76(p)
-#, fuzzy
 msgid "Srinivasa Ragavan"
-msgstr "Srinivasa Ragavan (sragavan@novell.com)"
+msgstr "Srinivasa Ragavan"
 
 #: C/credits.page:83(title)
 msgid "Contact information"
 msgstr "Podatki o stiku"
 
 #: C/credits.page:84(p)
-#, fuzzy
 msgid "The GNOME Documentation Project:"
-msgstr "Man dokumentacija"
+msgstr "Dokumentacijski projekt  GNOME:"
 
 #: C/credits.page:87(link)
 msgid "Website"
-msgstr ""
+msgstr "Spletišče"
 
 #: C/credits.page:90(link)
 msgid "Mailing list"
@@ -10935,19 +7510,14 @@ msgstr ""
 #: C/contacts-using-several-addressbooks.page:20(title)
 #, fuzzy
 msgid "Using several address books"
-msgstr "Z uporabo elektronskega naslova"
+msgstr "Ni mogoče naložiti seznama imenikov"
 
 #: C/contacts-using-several-addressbooks.page:22(p)
-msgid ""
-"You can have multiple address books. For example, you might have one address "
-"book for work related contacts and one for private contacts. The side bar "
-"lists those address books, and you can select which address book is shown."
+msgid "You can have multiple address books. For example, you might have one address book for work related contacts and one for private contacts. The side bar lists those address books, and you can select which address book is shown."
 msgstr ""
 
 #: C/contacts-using-several-addressbooks.page:24(p)
-msgid ""
-"You can also use address books that are not on your computer, such as on the "
-"internet (e.g. Google) or in a local network (e.g. LDAP)."
+msgid "You can also use address books that are not on your computer, such as on the internet (e.g. Google) or in a local network (e.g. LDAP)."
 msgstr ""
 
 #: C/contacts-using-contact-lists.page:5(desc)
@@ -10957,79 +7527,39 @@ msgstr ""
 #: C/contacts-using-contact-lists.page:23(title)
 #, fuzzy
 msgid "Using Contact Lists"
-msgstr "Seznam stikov"
+msgstr "Seznam dejavnih razširitev."
 
 #: C/contacts-using-contact-lists.page:25(p)
-msgid ""
-"A contact list is a set of contacts with a single nickname that you create. "
-"When you send mail to this nickname it is actually sent to every member of "
-"the list. This differs from a \"real\" mailing list in that it exists only "
-"on your computer as a convenience to you, rather than as an actual email "
-"address managed by a mailing list application on a server."
+msgid "A contact list is a set of contacts with a single nickname that you create. When you send mail to this nickname it is actually sent to every member of the list. This differs from a \"real\" mailing list in that it exists only on your computer as a convenience to you, rather than as an actual email address managed by a mailing list application on a server."
 msgstr ""
 
 #: C/contacts-using-contact-lists.page:27(p)
-msgid ""
-"For example, you could create one contact for each family member, then add "
-"those contacts to a contact list called \"Family\". Then, instead of "
-"entering each person's email address individually, you can send emails to "
-"\"Family\" and the messages would go to all of them."
+msgid "For example, you could create one contact for each family member, then add those contacts to a contact list called \"Family\". Then, instead of entering each person's email address individually, you can send emails to \"Family\" and the messages would go to all of them."
 msgstr ""
 
 #: C/contacts-using-contact-lists.page:30(title)
-#, fuzzy
 msgid "Creating a contact list"
-msgstr "Ustvari nov seznam stikov"
-
-#: C/contacts-using-contact-lists.page:32(gui)
-msgid "Contact List"
-msgstr "Seznam stikov"
+msgstr "Ustvarjanje seznama stikov"
 
-#: C/contacts-using-contact-lists.page:32(p) C/contacts-local.page:24(p)
-#: C/contacts-ldap.page:31(p) C/contacts-google.page:25(p)
-#: C/calendar-webdav.page:26(p) C/calendar-weather.page:26(p)
-#: C/calendar-meetings-sending-invitation.page:31(p)
-#: C/calendar-local.page:24(p) C/calendar-google.page:28(p)
-#: C/calendar-free-busy.page:33(p) C/calendar-caldav.page:27(p)
-msgid ""
-"Click <guiseq><placeholder-1/><placeholder-2/><placeholder-3/></guiseq>."
+#: C/contacts-using-contact-lists.page:32(p)
+msgid "Click <guiseq><gui>File</gui><gui>New</gui><gui>Contact List</gui></guiseq>."
 msgstr ""
 
-#: C/contacts-using-contact-lists.page:34(gui)
-#: C/contacts-usage-add-contact.page:24(gui)
-#, fuzzy
-msgid "Where:"
-msgstr "_Kje:"
-
 #: C/contacts-using-contact-lists.page:34(p)
 #: C/contacts-usage-add-contact.page:24(p)
-msgid ""
-"Select the address book under <placeholder-1/> to which it will be added."
+msgid "Select the address book under <gui>Where:</gui> to which it will be added."
 msgstr ""
 
-#: C/contacts-using-contact-lists.page:35(gui)
-msgid "Select..."
-msgstr "Izb_eri ..."
-
 #: C/contacts-using-contact-lists.page:35(p)
-msgid ""
-"Specify the list members by either entering the names or email addresses of "
-"contacts (the text field supports autocompletion), or by dragging contacts "
-"from the Contacts window into the list, or by using the <placeholder-1/> "
-"button."
+msgid "Specify the list members by either entering the names or email addresses of contacts (the text field supports autocompletion), or by dragging contacts from the Contacts window into the list, or by using the <gui style=\"button\">Select...</gui> button."
 msgstr ""
 
 #: C/contacts-using-contact-lists.page:36(p)
-msgid ""
-"Choose whether you want to hide the email addresses when you send a message "
-"to the list."
+msgid "Choose whether you want to hide the email addresses when you send a message to the list."
 msgstr ""
 
 #: C/contacts-using-contact-lists.page:36(p)
-msgid ""
-"Unless it is a very small list, it is recommended that you leave the "
-"addresses hidden. This is the same thing as using the “Bcc:” feature "
-"discussed in <placeholder-1/>."
+msgid "Unless it is a very small list, it is recommended that you leave the addresses hidden. This is the same thing as using the “Bcc:” feature discussed in <link xref=\"mail-composer-several-recipients\">Sending a message to several recipients</link>."
 msgstr ""
 
 #: C/contacts-using-contact-lists.page:40(p)
@@ -11039,124 +7569,78 @@ msgstr ""
 #: C/contacts-using-contact-lists.page:44(title)
 #, fuzzy
 msgid "Sending messages to a contact list"
-msgstr "Stiku pošlji sporočilo"
-
-#: C/contacts-using-contact-lists.page:45(gui)
-#, fuzzy
-msgid "Send Message to List"
-msgstr "_Pošlji sporočilo seznamu"
+msgstr "Dodajanje nekoga na seznam stikov."
 
 #: C/contacts-using-contact-lists.page:45(p)
-msgid ""
-"To send a message to the contact list, enter the name that you chose for the "
-"contact list as the recipient in the mail composer. You can also right-click "
-"the contact list in your address book and select <placeholder-1/>."
+msgid "To send a message to the contact list, enter the name that you chose for the contact list as the recipient in the mail composer. You can also right-click the contact list in your address book and select <gui>Send Message to List</gui>."
 msgstr ""
 
 #: C/contacts-usage.page:5(desc)
-#, fuzzy
 msgid "On adding, editing, and deleting contacts in address books."
-msgstr "Nimate dovoljenja za izbris stika iz imenika."
+msgstr ""
 
 #: C/contacts-usage.page:20(title)
 #, fuzzy
 msgid "Add, Edit, and Delete Contacts"
-msgstr "Izbris stika ni uspel"
+msgstr "Urejanje in brisanje obstoječih označenih mest"
 
 #: C/contacts-usage-edit-contact.page:5(desc)
-#, fuzzy
 msgid "Editing a contact in your address book."
-msgstr "Kliknite tu za imenik"
+msgstr "Urejanje stika v imeniku."
 
 #: C/contacts-usage-edit-contact.page:20(title)
-#, fuzzy
 msgid "Editing a Contact"
-msgstr "Evolution stik."
+msgstr "Urejanje stika"
 
 #: C/contacts-usage-edit-contact.page:22(p)
-msgid ""
-"If you want to change a contact that already exists in your address books,"
+msgid "If you want to change a contact that already exists in your address books,"
 msgstr ""
 
 #: C/contacts-usage-edit-contact.page:25(p)
-msgid ""
-"Double-click on the contact that you want to edit in the list of contacts, "
-"or select the contact and press <placeholder-1/>."
+msgid "Double-click on the contact that you want to edit in the list of contacts, or select the contact and press <key>Enter</key>."
 msgstr ""
 
 #: C/contacts-usage-edit-contact.page:26(p)
-#, fuzzy
 msgid "Edit the contact information."
-msgstr "Podatki o stiku"
+msgstr "Urejanje podrobnosti stikov."
 
 #: C/contacts-usage-delete-contact.page:5(desc)
 #, fuzzy
 msgid "Deleting a contact from your address book."
-msgstr "Kopira izbrane stike v drug imenik"
+msgstr "Kliknite tu za imenik"
 
 #: C/contacts-usage-delete-contact.page:20(title)
-#, fuzzy
 msgid "Deleting a Contact"
-msgstr "Evolution stik."
-
-#: C/contacts-usage-delete-contact.page:22(gui)
-#, fuzzy
-msgid "Delete Contact"
-msgstr "_Izbriši stik"
+msgstr "Izbris stika"
 
 #: C/contacts-usage-delete-contact.page:22(p)
-msgid ""
-"If you want to delete a contact in your address books, right-click on the "
-"contact and select <placeholder-1/>, or click on the appointment and click "
-"<placeholder-2/> in the tool bar or press <keyseq><placeholder-3/"
-"><placeholder-4/></keyseq>, or click <guiseq><placeholder-5/><placeholder-6/"
-"></guiseq>."
+msgid "If you want to delete a contact in your address books, right-click on the contact and select <gui>Delete</gui>, or click on the contact and click <gui>Delete</gui> in the tool bar or press <keyseq><key>Ctrl</key><key>D</key></keyseq>, or click <guiseq><gui>Edit</gui><gui>Delete Contact</gui></guiseq>."
 msgstr ""
 
 #: C/contacts-usage-add-contact.page:5(desc)
 #, fuzzy
 msgid "Adding a contact to your address book."
-msgstr "_Dodaj pošiljatelja v imenik"
+msgstr "Ni mogoče iskati po imeniku: %s"
 
 #: C/contacts-usage-add-contact.page:20(title)
-#, fuzzy
 msgid "Adding a Contact"
-msgstr "Evolution stik."
-
-#: C/contacts-usage-add-contact.page:23(gui)
-msgid "Contact"
-msgstr "Stik"
-
-#: C/contacts-usage-add-contact.page:23(key)
-msgid "C"
-msgstr "C"
+msgstr "Dodajanje stika"
 
 #: C/contacts-usage-add-contact.page:23(p)
-msgid ""
-"Click <guiseq><placeholder-1/><placeholder-2/><placeholder-3/></guiseq>, or "
-"right-click in a blank space in the list of contacts and click \"New "
-"Contact...\", or press <keyseq><placeholder-4/><placeholder-5/"
-"><placeholder-6/></keyseq>."
+msgid "Click <guiseq><gui>File</gui><gui>New</gui><gui>Contact</gui></guiseq>, or right-click in a blank space in the list of contacts and click \"New Contact...\", or press <keyseq><key>Shift</key><key>Ctrl</key><key>C</key></keyseq>."
 msgstr ""
 
 #: C/contacts-usage-add-contact.page:25(p)
 msgid "Enter the contact information. Note that there are several tabs."
 msgstr ""
 
-#: C/contacts-usage-add-contact.page:26(gui)
-msgid "Full Name"
-msgstr "Polno ime"
-
 #: C/contacts-usage-add-contact.page:26(p)
-msgid ""
-"You can add a photograph to the contact by clicking the large field (showing "
-"a stylized person) next to <placeholder-1/> and <placeholder-2/>."
+msgid "You can add a photograph to the contact by clicking the large field (showing a stylized person) next to <gui>Full Name</gui> and <gui>Categories</gui>."
 msgstr ""
 
 #: C/contacts-usage-add-contact.page:31(title)
-#, fuzzy
 msgid "Contact Quick-Add from the Email Window"
-msgstr "Hitro dodaj stik"
+msgstr ""
 
 #: C/contacts-usage-add-contact.page:33(p)
 msgid "You can also add a contact directly from an email."
@@ -11167,98 +7651,68 @@ msgstr ""
 msgid "Right-click on the email address in the message header."
 msgstr "Zbrisana sporočila prikaži na seznamu sporočil"
 
-#: C/contacts-usage-add-contact.page:36(gui)
-#, fuzzy
-msgid "Add to Address Book..."
-msgstr "Dod_aj v imenik ..."
-
-#: C/contacts-usage-add-contact.page:37(gui)
+#: C/contacts-usage-add-contact.page:36(p)
 #, fuzzy
-msgid "Edit Full"
-msgstr "_Uredi celoto"
-
-#: C/contacts-usage-add-contact.page:37(gui)
-#: C/calendar-free-busy.page:49(link)
-msgid "Contact Editor"
-msgstr "Urejevalnik stikov"
+msgid "Select <gui>Add to Address Book...</gui>."
+msgstr "Izberi stike iz imenika"
 
 #: C/contacts-usage-add-contact.page:37(p)
-msgid ""
-"Either press <placeholder-1/> to bring up the full <placeholder-2/>, or "
-"click <placeholder-3/> to directly add the contact to the chosen address "
-"book."
+msgid "Either press <gui style=\"button\">Edit Full</gui> to bring up the full <gui>Contact Editor</gui>, or click <gui style=\"button\">OK</gui> to directly add the contact to the chosen address book."
 msgstr ""
 
 #: C/contacts-searching.page:5(desc)
-#, fuzzy
 msgid "Searching contacts."
-msgstr ""
-"\n"
-"\n"
-"Iskanje stikov ..."
+msgstr "Iskanje stikov."
 
 #: C/contacts-searching.page:28(title)
-#, fuzzy
 msgid "Searching Contacts"
-msgstr ""
-"\n"
-"\n"
-"Iskanje stikov ..."
+msgstr "Iskanje stikov"
 
 #: C/contacts-searching.page:31(p)
-msgid ""
-"In the Calendar view, you can quickly search for contacts either by category "
-"or by contact's info."
+msgid "In the Calendar view, you can quickly search for contacts either by category or by contact's info."
 msgstr ""
 
 #: C/contacts-searching.page:32(p)
 #, fuzzy
 msgid "Searching by contact's info:"
-msgstr ""
-"\n"
-"\n"
-"Iskanje stikov ..."
+msgstr "Iskanje po datumu uvoza"
 
 #: C/contacts-organizing.page:5(desc)
 msgid "On address books, searching, contact lists, and categories."
 msgstr ""
 
 #: C/contacts-organizing.page:21(title)
-#, fuzzy
 msgid "Sorting, organizing and grouping contacts"
-msgstr "Usklajevanje stikov"
+msgstr "Razvrščanje, organizacija in združevanje stikov"
 
 #: C/contacts-organizing.page:23(p)
-msgid ""
-"There are several ways how to organize your contacts. You can use several "
-"addressbooks and categories, and for conveniently sending messages to a "
-"group of people contact lists are available."
+msgid "There are several ways how to organize your contacts. You can use several addressbooks and categories, and for conveniently sending messages to a group of people contact lists are available."
 msgstr ""
 
 #: C/contacts-local.page:5(desc)
 #, fuzzy
 msgid "Adding another local address book."
-msgstr "Doda pošiljatelja v imenik"
+msgstr "Seznam map krajevnih imenikov"
 
 #: C/contacts-local.page:20(title)
 #, fuzzy
 msgid "Adding another local address book"
-msgstr "Doda pošiljatelja v imenik"
+msgstr "Seznam map krajevnih imenikov"
 
-#: C/contacts-local.page:22(p) C/calendar-local.page:22(p)
-msgid ""
-"To add another local calendar to Evolution, perform the following steps:"
+#: C/contacts-local.page:22(p)
+#: C/calendar-local.page:22(p)
+msgid "To add another local calendar to Evolution, perform the following steps:"
 msgstr ""
 
-#: C/contacts-local.page:24(gui) C/contacts-ldap.page:31(gui)
-#: C/contacts-google.page:25(gui)
-#, fuzzy
-msgid "Address Book"
-msgstr "Imenik"
+#: C/contacts-local.page:24(p)
+#: C/contacts-ldap.page:31(p)
+#: C/contacts-google.page:25(p)
+msgid "Click <guiseq><gui>File</gui><gui>New</gui><gui>Address Book</gui></guiseq>."
+msgstr ""
 
-#: C/contacts-local.page:30(p) C/contacts-google.page:34(p)
-msgid ""
-"The address book will be added to the list of address books in Evolution."
+#: C/contacts-local.page:30(p)
+#: C/contacts-google.page:34(p)
+msgid "The address book will be added to the list of address books in Evolution."
 msgstr ""
 
 #: C/contacts-ldap.page:5(desc)
@@ -11266,58 +7720,40 @@ msgid "Use shared address books on a local network."
 msgstr ""
 
 #: C/contacts-ldap.page:23(title)
+#, fuzzy
 msgid "Adding LDAP access"
-msgstr ""
+msgstr "Dodajanje stika na strežnik LDAP ..."
 
 #: C/contacts-ldap.page:25(p)
-msgid ""
-"The LDAP protocol was created to let users share contact information over a "
-"network by sharing access to a central directory. LDAP allows a company to "
-"maintain a shared set of contact information. Many companies keep a common "
-"LDAP address book for all their employees or for client contacts."
+msgid "The LDAP protocol was created to let users share contact information over a network by sharing access to a central directory. LDAP allows a company to maintain a shared set of contact information. Many companies keep a common LDAP address book for all their employees or for client contacts."
 msgstr ""
 
 #: C/contacts-ldap.page:28(title)
-#, fuzzy
 msgid "Adding an LDAP address book"
-msgstr "Doda pošiljatelja v imenik"
-
-#: C/contacts-ldap.page:32(gui)
-msgid "On LDAP Servers"
-msgstr "Na strežnikih LDAP"
+msgstr "Dodajanje imenik LDAP"
 
 #: C/contacts-ldap.page:32(p)
-msgid "In the <placeholder-1/> tab, select the type <placeholder-2/>."
+msgid "In the <gui>General</gui> tab, select the type <gui>On LDAP Servers</gui>."
 msgstr ""
 
 #: C/contacts-ldap.page:34(p)
-msgid ""
-"Enter the address of the server, the port number (the default number is 389) "
-"and whether you want to connect securely."
+msgid "Enter the address of the server, the port number (the default number is 389) and whether you want to connect securely."
 msgstr ""
 
 #: C/contacts-ldap.page:35(p)
 msgid "Define the login method and your user name."
 msgstr ""
 
-#: C/contacts-ldap.page:37(gui)
-msgid "Details"
-msgstr "Podrobnosti"
-
 #: C/contacts-ldap.page:37(p)
-msgid "In the <placeholder-1/> tab you can define the following settings:"
+msgid "In the <gui>Details</gui> tab you can define the following settings:"
 msgstr ""
 
 #: C/contacts-ldap.page:39(p)
-msgid ""
-"Search Base: The search base is the starting point for a directory search. "
-"Contact your system administrator for information about the correct settings."
+msgid "Search Base: The search base is the starting point for a directory search. Contact your system administrator for information about the correct settings."
 msgstr ""
 
 #: C/contacts-ldap.page:40(p)
-msgid ""
-"Search Scope: The search scope is the breadth of a given search. The "
-"following options are available:"
+msgid "Search Scope: The search scope is the breadth of a given search. The following options are available:"
 msgstr ""
 
 #: C/contacts-ldap.page:42(p)
@@ -11329,55 +7765,31 @@ msgid "Sub: Searches the Search Base and all entries below it."
 msgstr ""
 
 #: C/contacts-ldap.page:46(p)
-msgid ""
-"Search Filter: The search filter can be set here for all the LDAP queries. "
-"For example:"
+msgid "Search Filter: The search filter can be set here for all the LDAP queries. For example:"
 msgstr ""
 
-#: C/contacts-ldap.page:48(code)
-msgid "ObjectClass=*"
-msgstr "ObjectClass=*"
-
 #: C/contacts-ldap.page:48(p)
-msgid "<placeholder-1/>: Lists all the objects from the server."
+msgid "<code>ObjectClass=*</code>: Lists all the objects from the server."
 msgstr ""
 
-#: C/contacts-ldap.page:49(code)
-msgid "ObjectClass=User"
-msgstr "ObjectClass=User"
-
 #: C/contacts-ldap.page:49(p)
-msgid "<placeholder-1/>: Lists only the users."
+msgid "<code>ObjectClass=User</code>: Lists only the users."
 msgstr ""
 
-#: C/contacts-ldap.page:50(code)
-msgid "Filter (|(ObjectClass=User)(ObjectClass=groupOfNames))"
-msgstr "Filter (|(ObjectClass=User)(ObjectClass=groupOfNames))"
-
 #: C/contacts-ldap.page:50(p)
-msgid "<placeholder-1/>: Retrieves the User and Contact List objects."
+msgid "<code>Filter (|(ObjectClass=User)(ObjectClass=groupOfNames))</code>: Retrieves the User and Contact List objects."
 msgstr ""
 
-#: C/contacts-ldap.page:51(code)
-msgid "(&amp;(mail=*)(ObjectClass=*))"
-msgstr "(&amp;(mail=*)(ObjectClass=*))"
-
 #: C/contacts-ldap.page:51(p)
-msgid ""
-"<placeholder-1/>: Lists the objects associated with the email addresses."
+msgid "<code>(&amp;(mail=*)(ObjectClass=*))</code>: Lists the objects associated with the email addresses."
 msgstr ""
 
 #: C/contacts-ldap.page:54(p)
-msgid ""
-"Timeout (minutes): The maximum time Evolution attempts to download data from "
-"the server before giving up."
+msgid "Timeout (minutes): The maximum time Evolution attempts to download data from the server before giving up."
 msgstr ""
 
 #: C/contacts-ldap.page:55(p)
-msgid ""
-"Download Limit: The maximum number of results for a given search. Most "
-"servers refuse to send more than 500 contacts, but you can set the number "
-"lower if you want to shorten downloads for very broad searches."
+msgid "Download Limit: The maximum number of results for a given search. Most servers refuse to send more than 500 contacts, but you can set the number lower if you want to shorten downloads for very broad searches."
 msgstr ""
 
 #: C/contacts-ldap.page:60(p)
@@ -11387,41 +7799,26 @@ msgstr ""
 #: C/contacts-ldap.page:65(title)
 #, fuzzy
 msgid "Differences to local address books"
-msgstr "Naštej krajevne mape imenikov"
+msgstr "Dodaj krajevni imenik v Evolution"
 
 #: C/contacts-ldap.page:67(p)
-msgid ""
-"LDAP address books work like local address books on your computer, with the "
-"following exceptions:"
+msgid "LDAP address books work like local address books on your computer, with the following exceptions:"
 msgstr ""
 
 #: C/contacts-ldap.page:69(p)
-msgid ""
-"Network folders are only available when you are connected to the network. If "
-"you use a laptop or have a modem connection, you might want to copy or cache "
-"some of the network directory. You do this by dragging and dropping your "
-"desired contacts into the local address books."
+msgid "Network folders are only available when you are connected to the network. If you use a laptop or have a modem connection, you might want to copy or cache some of the network directory. You do this by dragging and dropping your desired contacts into the local address books."
 msgstr ""
 
 #: C/contacts-ldap.page:70(p)
-msgid ""
-"You can also mark the network folder for offline usage. To mark the folder, "
-"right-click the folder, click Properties and select Copy Folder Content "
-"Locally for Offline Operation."
+msgid "You can also mark the network folder for offline usage. To mark the folder, right-click the folder, click Properties and select Copy Folder Content Locally for Offline Operation."
 msgstr ""
 
 #: C/contacts-ldap.page:71(p)
-msgid ""
-"To prevent excess network traffic, Evolution does not normally load data "
-"from the LDAP server upon opening."
+msgid "To prevent excess network traffic, Evolution does not normally load data from the LDAP server upon opening."
 msgstr ""
 
 #: C/contacts-ldap.page:72(p)
-msgid ""
-"Depending on your server settings, you might not be able to edit all the "
-"fields in a contact stored on an LDAP server. Some servers prohibit some or "
-"all changes, and others use a smaller set of fields than Evolution allows. "
-"Check with your system administrator if you need different settings."
+msgid "Depending on your server settings, you might not be able to edit all the fields in a contact stored on an LDAP server. Some servers prohibit some or all changes, and others use a smaller set of fields than Evolution allows. Check with your system administrator if you need different settings."
 msgstr ""
 
 #: C/contacts-google.page:5(desc)
@@ -11429,144 +7826,101 @@ msgid "Use the online address book of your Google account."
 msgstr ""
 
 #: C/contacts-google.page:21(title)
-#, fuzzy
 msgid "Using a Google addressbook"
-msgstr "Ni mogoče odpreti imenika"
+msgstr "Uporabljanje imenika Google"
 
 #: C/contacts-google.page:23(p)
-msgid "To add such an adress book to Evolution, perform the following steps:"
+msgid "To add such an address book to Evolution, perform the following steps:"
 msgstr ""
 
-#: C/contacts-google.page:26(gui) C/calendar-google.page:29(gui)
-msgid "Google"
-msgstr "Google"
-
-#: C/contacts-google.page:29(p) C/calendar-google.page:33(p)
+#: C/contacts-google.page:26(p)
+#: C/calendar-google.page:29(p)
 #, fuzzy
+msgid "Select the type <gui>Google</gui>."
+msgstr "Izberite zavihek <gui>Iskanje</gui>."
+
+#: C/contacts-google.page:29(p)
+#: C/calendar-google.page:33(p)
 msgid "Enter your Google username."
-msgstr "Vnesite svoje ime in priimek."
+msgstr "Vnesite svoje uporabniško ime Google."
 
 #: C/contacts-autocompletion.page:5(desc)
-#, fuzzy
-msgid ""
-"Autocompletion of names and email addresses entered in the mail composer."
+msgid "Autocompletion of names and email addresses entered in the mail composer."
 msgstr ""
-"Samodejno zaženi urejevalnik, ko je pritisnjena tipka v sestavljalniku pošte"
 
 #: C/contacts-autocompletion.page:27(title)
-#, fuzzy
 msgid "Autocompletion of mail recipients"
-msgstr "Nastavitve samodejnega dopolnjevanja"
+msgstr "Samodejno dopolnjevanje prejemnikov pošte"
 
 #: C/contacts-autocompletion.page:29(p)
-msgid ""
-"You can enter the first three letters of names and email addresses in the "
-"recipients text field and Evolution will present you with a list of matches "
-"from your address books."
+msgid "You can enter the first three letters of names and email addresses in the recipients text field and Evolution will present you with a list of matches from your address books."
 msgstr ""
 
 #: C/contacts-autocompletion.page:30(p)
-msgid ""
-"To enable autocompletion, go to <guiseq><placeholder-1/><placeholder-2/"
-"><placeholder-3/><placeholder-4/></guiseq> and choose the address books from "
-"the list that Evolution should look in for matches."
+msgid "To enable autocompletion, go to <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Contacts</gui><gui>Autocompletion</gui></guiseq> and choose the address books from the list that Evolution should look in for matches."
 msgstr ""
 
 #: C/contacts-autocompletion.page:32(p)
-msgid ""
-"Select <placeholder-1/> to also show the email address along with the name. "
-"This can be helpful to distinguish if a contact has several email addresses."
+msgid "Select <gui>Always show address of the autocompleted contact</gui> to also show the email address along with the name. This can be helpful to distinguish if a contact has several email addresses."
 msgstr ""
 
 #: C/contacts-autocompletion.page:34(p)
-msgid ""
-"Alternately, you can click the <placeholder-1/>, <placeholder-2/>, or "
-"<placeholder-3/> buttons to get a list of the email addresses in your "
-"contacts. Select addresses and click the arrow buttons to move them into the "
-"appropriate address columns."
+msgid "Alternately, you can click the <gui>To:</gui>, <gui>Cc:</gui>, or <gui>Bcc:</gui> buttons to get a list of the email addresses in your contacts. Select addresses and click the arrow buttons to move them into the appropriate address columns."
 msgstr ""
 
 #: C/contacts-add-automatically.page:5(desc)
-msgid ""
-"Automatically add senders of mail that you have received to your contacts."
+msgid "Automatically add senders of mail that you have received to your contacts."
 msgstr ""
 
 #: C/contacts-add-automatically.page:24(title)
 msgid "Adding people automatically to my contacts"
 msgstr ""
 
-#: C/contacts-add-automatically.page:27(gui)
-msgid "Automatic Contacts"
-msgstr "Samodejni stiki"
-
-#: C/contacts-add-automatically.page:27(gui)
-#, fuzzy
-msgid "Create address book entries when sending emails"
-msgstr "_Ustvari vnose v imeniku pri odgovarjanju na sporočila"
-
 #: C/contacts-add-automatically.page:27(p)
-msgid ""
-"You can add people automatically to your contacts when you reply to received "
-"email. Enable the plugin <placeholder-1/> by going to <guiseq><placeholder-2/"
-"><placeholder-3/></guiseq>; click on \"Automatic Contacts\" so that it shows "
-"a check mark. Then go to <guiseq><placeholder-4/><placeholder-5/"
-"><placeholder-6/><placeholder-7/></guiseq> and enable the <placeholder-8/> "
-"option and select an address book in the drop-down field below that will "
-"receive the new contacts."
+msgid "You can add people automatically to your contacts when you reply to received email. Enable the plugin <gui>Automatic Contacts</gui> by going to <guiseq><gui>Edit</gui><gui>Plugins</gui></guiseq>; click on \"Automatic Contacts\" so that it shows a check mark. Then go to <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Mail Preferences</gui><gui>Automatic Contacts</gui></guiseq> and enable the <gui>Create address book entries when sending emails</gui> option and select an address book in the drop-down field below that will receive the new contacts."
 msgstr ""
 
 #. TODO: Update once https://bugzilla.gnome.org/show_bug.cgi?id=655492 is fixed
 #: C/contacts-add-automatically.page:29(p)
-msgid ""
-"From now on, contacts will be automatically created for senders of received "
-"mail when you reply to that mail."
+msgid "From now on, contacts will be automatically created for senders of received mail when you reply to that mail."
 msgstr ""
 
 #: C/change-switcher-appearance.page:5(desc)
 msgid "Changing the display of the window buttons in the lower left corner."
 msgstr ""
 
-#: C/change-switcher-appearance.page:21(gui)
+#: C/change-switcher-appearance.page:19(title)
 #, fuzzy
-msgid "Switcher Appearance"
-msgstr "Videz _preklopnika"
+msgid "Changing the Switcher appearance"
+msgstr "Uporabi videz dejanj"
 
 #: C/change-switcher-appearance.page:21(p)
-msgid ""
-"The display of the window buttons in the lower left corner (Mail, Contacts, "
-"Calendar, Tasks and Memos) can be changed via <guiseq><placeholder-1/"
-"><placeholder-2/></guiseq>. This can be helpful if you have a small display. "
-"You can also completely hide them."
+msgid "The display of the window buttons in the lower left corner (Mail, Contacts, Calendar, Tasks and Memos) can be changed via <guiseq><gui>View</gui><gui>Switcher Appearance</gui></guiseq>. This can be helpful if you have a small display. You can also completely hide them."
 msgstr ""
 
 #: C/change-switcher-appearance.page:22(p)
-#, fuzzy
 msgid "The available options are:"
-msgstr "Navedena ni nobena možnost"
+msgstr "Razpoložljive možnosti so:"
 
 #: C/change-switcher-appearance.page:24(p)
-#, fuzzy
 msgid "Icons and Text"
-msgstr "Ikone in besedilo:"
+msgstr "Ikone in besedilo"
 
 #: C/change-switcher-appearance.page:27(p)
-#, fuzzy
 msgid "Icons Only"
-msgstr "Le ikone:"
+msgstr "Le ikone"
 
 #: C/change-switcher-appearance.page:30(p)
-#, fuzzy
 msgid "Text Only"
-msgstr "_Le besedilo"
+msgstr "Le besedilo"
 
 #: C/change-switcher-appearance.page:33(p)
 msgid "Toolbar Style"
 msgstr "Slog orodne vrstice"
 
 #: C/change-switcher-appearance.page:36(p)
-#, fuzzy
 msgid "Show Buttons"
-msgstr "Pokaži _gumbe"
+msgstr "Pokaži gumbe"
 
 #: C/calendar-webdav.page:5(desc)
 msgid "Using an online Webcal/WebDAV calendar."
@@ -11575,44 +7929,63 @@ msgstr ""
 #: C/calendar-webdav.page:20(title)
 #, fuzzy
 msgid "Using a WebDAV calendar"
-msgstr "Brskanje za CalDAV koledarji"
+msgstr "Nastavite usklajevanje z uporabo WebDav"
 
-#: C/calendar-webdav.page:22(p) C/calendar-weather.page:22(p)
+#: C/calendar-webdav.page:22(p)
+#: C/calendar-weather.page:22(p)
 msgid "Calendars of this type are read-only."
 msgstr ""
 
-#: C/calendar-webdav.page:24(p) C/calendar-weather.page:24(p)
-#: C/calendar-google.page:26(p) C/calendar-caldav.page:25(p)
+#: C/calendar-webdav.page:24(p)
+#: C/calendar-weather.page:24(p)
+#: C/calendar-google.page:26(p)
+#: C/calendar-caldav.page:25(p)
 msgid "To add such a calendar to Evolution, perform the following steps:"
 msgstr ""
 
-#: C/calendar-webdav.page:31(p) C/calendar-caldav.page:32(p)
+#: C/calendar-webdav.page:26(p)
+#: C/calendar-weather.page:26(p)
+#: C/calendar-local.page:24(p)
+#: C/calendar-google.page:28(p)
+#: C/calendar-caldav.page:27(p)
 #, fuzzy
-msgid "Enter the address of the calendar in the <placeholder-1/> field."
-msgstr "Vnesite vaše geslo v polje <b>Novo geslo</b>."
+msgid "Click <guiseq><gui>File</gui><gui>New</gui><gui>Calendar</gui></guiseq>."
+msgstr "Znova kliknite <guiseq><gui>Datoteka</gui><gui>Natisni</gui></guiseq>."
+
+#: C/calendar-webdav.page:31(p)
+#: C/calendar-caldav.page:32(p)
+msgid "Enter the address of the calendar in the <gui>URL</gui> field."
+msgstr ""
+
+#: C/calendar-webdav.page:37(p)
+#: C/calendar-weather.page:37(p)
+#: C/calendar-local.page:31(p)
+#: C/calendar-google.page:38(p)
+#: C/calendar-caldav.page:38(p)
+msgid "The calendar will be added to the list of calendars in Evolution."
+msgstr ""
 
 #: C/calendar-weather.page:5(desc)
 #, fuzzy
 msgid "Display the weather in the calendar."
-msgstr "Pokaže naslednjo nit"
+msgstr "Najden sestanek v koledarju '%s'"
 
 #: C/calendar-weather.page:20(title)
-#, fuzzy
 msgid "Using a weather calendar"
-msgstr "Sestanek v koledarju"
+msgstr "Uporaba vremenskega koledarja"
 
-#: C/calendar-weather.page:27(gui)
-msgid "Weather"
-msgstr "Vreme"
+#: C/calendar-weather.page:27(p)
+#, fuzzy
+msgid "Select the type <gui>Weather</gui>."
+msgstr "Izberite zavihek <gui>Iskanje</gui>."
 
 #: C/calendar-weather.page:31(p)
 msgid "Choose a location by selecting continent, country and city."
 msgstr ""
 
 #: C/calendar-weather.page:33(p)
-#, fuzzy
 msgid "Choose the temperature unit."
-msgstr "Izberite vrsto uvoznika, ki naj se zažene:"
+msgstr "Izberite enoto za merjenje temperature."
 
 #: C/calendar-using-several-calendars.page:5(desc)
 msgid "Adding and using more than one calendar and different types."
@@ -11621,17 +7994,10 @@ msgstr ""
 #: C/calendar-using-several-calendars.page:23(title)
 #, fuzzy
 msgid "Using several calendars"
-msgstr "Uporabniški koledarji"
+msgstr "Seznam razpoložljivih koledarjev:"
 
 #: C/calendar-using-several-calendars.page:25(p)
-msgid ""
-"You can have multiple calendars and overlay them one over the next. For "
-"example, you might have a schedule of events for work, one for home, and one "
-"for your favorite sports team. The side bar lists those calendars, and you "
-"can select or deselect the boxes next to them to show and hide the "
-"appointments in your calendar view. By hiding and showing different sets of "
-"appointments, you can be sure to avoid conflicts, while keeping a minimum of "
-"clutter in your view."
+msgid "You can have multiple calendars and overlay them one over the next. For example, you might have a schedule of events for work, one for home, and one for your favorite sports team. The side bar lists those calendars, and you can select or deselect the boxes next to them to show and hide the appointments in your calendar view. By hiding and showing different sets of appointments, you can be sure to avoid conflicts, while keeping a minimum of clutter in your view."
 msgstr ""
 
 #: C/calendar-using-several-calendars.page:27(p)
@@ -11639,20 +8005,11 @@ msgid "Appointments for each calendar appear as a different color."
 msgstr ""
 
 #: C/calendar-using-several-calendars.page:29(p)
-msgid ""
-"You can also use calendars that are not on your computer, such as on the "
-"internet or in a local network."
-msgstr ""
-
-#: C/calendar-using-several-calendars.page:31(link)
-msgid "icalshare.com website"
+msgid "You can also use calendars that are not on your computer, such as on the internet or in a local network."
 msgstr ""
 
 #: C/calendar-using-several-calendars.page:31(p)
-msgid ""
-"For example, the <placeholder-1/> has an extensive list of shared online "
-"calendars, including national and religious holidays, phases of the moon, "
-"sports, and local and regional events."
+msgid "For example, the <link href=\"http://icalshare.com\">icalshare.com website</link> has an extensive list of shared online calendars, including national and religious holidays, phases of the moon, sports, and local and regional events."
 msgstr ""
 
 #: C/calendar-usage.page:5(desc)
@@ -11662,128 +8019,84 @@ msgstr ""
 #: C/calendar-usage.page:21(title)
 #, fuzzy
 msgid "Add, Edit, and Delete Appointments"
-msgstr "_Izbriši sestanek"
+msgstr "Urejanje in brisanje obstoječih označenih mest"
 
 #: C/calendar-usage-edit-appointment.page:5(desc)
 #, fuzzy
 msgid "Editing in appointment in your calendar."
-msgstr "Odpri povezavo v _novem oknu"
+msgstr "Sestanek v koledarju '%s' je v sporu s tem srečanjem"
 
 #: C/calendar-usage-edit-appointment.page:20(title)
 #, fuzzy
 msgid "Editing an Appointment"
-msgstr "Uredi sestanek"
+msgstr "Sestanek v koledarju"
 
 #: C/calendar-usage-edit-appointment.page:22(p)
-msgid ""
-"If you want to change an appointment that already exists in your calendars,"
+msgid "If you want to change an appointment that already exists in your calendars,"
 msgstr ""
 
 #: C/calendar-usage-edit-appointment.page:25(p)
 #, fuzzy
 msgid "Double-click on the appointment that you want to edit in the calendar."
-msgstr "Sestanek je bil najden v koledarju '%s'"
-
-#: C/calendar-usage-edit-appointment.page:26(link)
-#: C/calendar-usage-add-appointment.page:20(title)
-#, fuzzy
-msgid "Adding an Appointment"
-msgstr "Uredi sestanek"
+msgstr "Odpri povezavo v _novem oknu"
 
 #: C/calendar-usage-edit-appointment.page:26(p)
-msgid ""
-"Edit the appointment (see <placeholder-1/> for the list of available "
-"options)."
+msgid "Edit the appointment (see <link xref=\"calendar-usage-add-appointment\">Adding an Appointment</link> for the list of available options)."
 msgstr ""
 
 #: C/calendar-usage-delete-appointment.page:5(desc)
 #, fuzzy
 msgid "Deleting in appointment in your calendar."
-msgstr "Odpri povezavo v _novem oknu"
+msgstr "Sestanek v koledarju '%s' je v sporu s tem srečanjem"
 
 #: C/calendar-usage-delete-appointment.page:20(title)
 #, fuzzy
 msgid "Deleting an Appointment"
-msgstr "_Izbriši sestanek"
-
-#: C/calendar-usage-delete-appointment.page:22(gui)
-#, fuzzy
-msgid "Delete Appointment"
-msgstr "_Izbriši sestanek"
-
-#: C/calendar-usage-delete-appointment.page:22(link)
-msgid "list view"
-msgstr ""
+msgstr "Sestanek v koledarju"
 
 #: C/calendar-usage-delete-appointment.page:22(p)
-msgid ""
-"If you want to delete an appointment in your calendars, right-click on the "
-"appointment in the calendar and select <placeholder-1/>, or click on the "
-"appointment and click <placeholder-2/> in the tool bar or press "
-"<keyseq><placeholder-3/><placeholder-4/></keyseq>. If you are in the "
-"<placeholder-5/> you can also use <guiseq><placeholder-6/><placeholder-7/></"
-"guiseq>."
+msgid "If you want to delete an appointment in your calendars, right-click on the appointment in the calendar and select <gui>Delete Appointment</gui>, or click on the appointment and click <gui>Delete</gui> in the tool bar or press <keyseq><key>Ctrl</key><key>D</key></keyseq>. If you are in the <link xref=\"calendar-layout-views\">list view</link> you can also use <guiseq><gui>Edit</gui><gui>Delete Appointment</gui></guiseq>."
 msgstr ""
 
 #: C/calendar-usage-add-appointment.page:5(desc)
 #, fuzzy
 msgid "Adding an appointment."
-msgstr "konec sestanka"
+msgstr "Sestanek v koledarju"
 
-#: C/calendar-usage-add-appointment.page:23(gui)
+#: C/calendar-usage-add-appointment.page:20(title)
 #, fuzzy
-msgid "Appointment"
-msgstr "Sestanek"
+msgid "Adding an Appointment"
+msgstr "Sestanek v koledarju"
 
 #: C/calendar-usage-add-appointment.page:23(p)
-msgid ""
-"Click <guiseq><placeholder-1/><placeholder-2/><placeholder-3/></guiseq>, or "
-"double-click in a blank space in the calendar to open the Appointment "
-"dialog. The particular time on the calendar view against which you have "
-"double clicked on will be suggested for the new appointment. You can also "
-"directly write in the calendar and then adjust the duration by dragging it "
-"with the mouse."
+msgid "Click <guiseq><gui>File</gui><gui>New</gui><gui>Appointment</gui></guiseq>, or double-click in a blank space in the calendar to open the Appointment dialog. The particular time on the calendar view against which you have double clicked on will be suggested for the new appointment. You can also directly write in the calendar and then adjust the duration by dragging it with the mouse."
 msgstr ""
 
 #: C/calendar-usage-add-appointment.page:24(p)
 #, fuzzy
 msgid "If you use the Appointment dialog:"
-msgstr "Sestanek v koledarju"
+msgstr "V primeru uporabe Chronopic3 boste morali imeti zaporedna USB vrata."
 
 #: C/calendar-usage-add-appointment.page:25(p)
 #: C/calendar-meetings-sending-invitation.page:33(p)
 #, fuzzy
-msgid "Select a calendar in the <placeholder-1/> drop-down list."
+msgid "Select a calendar in the <gui>Calendar</gui> drop-down list."
 msgstr "Izberite možnost iskanja iz spustnega seznama."
 
-#: C/calendar-usage-add-appointment.page:26(gui)
-#: C/calendar-meetings-sending-invitation.page:36(gui)
-msgid "Summary"
-msgstr "Povzetek"
-
 #: C/calendar-usage-add-appointment.page:26(p)
 #: C/calendar-meetings-sending-invitation.page:36(p)
-msgid "Enter a brief summary in the <placeholder-1/> field."
+msgid "Enter a brief summary in the <gui>Summary</gui> field."
 msgstr ""
 
 #: C/calendar-usage-add-appointment.page:27(p)
 #: C/calendar-meetings-sending-invitation.page:37(p)
 #, fuzzy
-msgid "(Optional) Type a location in the <placeholder-1/> field."
-msgstr "Vnesite vaše geslo v polje <b>Novo geslo</b>."
-
-#: C/calendar-usage-add-appointment.page:28(gui)
-#: C/calendar-meetings-sending-invitation.page:38(gui)
-#, fuzzy
-msgid "All Day Event"
-msgstr "Celo_dnevni dogodek"
+msgid "(Optional) Type a location in the <gui>Location</gui> field."
+msgstr "V polje <gui>Ime diska</gui> vpišite ime diska."
 
 #: C/calendar-usage-add-appointment.page:28(p)
 #: C/calendar-meetings-sending-invitation.page:38(p)
-msgid ""
-"To select this appointment as an all day event, click <guiseq><placeholder-1/"
-"><placeholder-2/></guiseq>, or click the <placeholder-3/> button on the "
-"toolbar."
+msgid "To select this event as an all day event, click <guiseq><gui>Options</gui><gui>All Day Event</gui></guiseq>, or click the <gui>All Day Event</gui> button on the toolbar."
 msgstr ""
 
 #: C/calendar-usage-add-appointment.page:29(p)
@@ -11792,65 +8105,24 @@ msgstr ""
 msgid "Select the date and time."
 msgstr "Izbor datuma in časa"
 
-#: C/calendar-usage-add-appointment.page:30(gui)
-#: C/calendar-meetings-sending-invitation.page:40(gui)
-#, fuzzy
-msgid "For"
-msgstr "ali"
-
-#: C/calendar-usage-add-appointment.page:30(gui)
-#: C/calendar-meetings-sending-invitation.page:40(gui)
-#, fuzzy
-msgid "Until"
-msgstr "_Do"
-
 #: C/calendar-usage-add-appointment.page:30(p)
 #: C/calendar-meetings-sending-invitation.page:40(p)
-msgid ""
-"If the event is not an all day event, select either <placeholder-1/> to "
-"specify the duration, or select <placeholder-2/> to specify the ending time "
-"of the event."
+msgid "If the event is not an all day event, select either <gui>For</gui> to specify the duration, or select <gui>Until</gui> to specify the ending time of the event."
 msgstr ""
 
 #: C/calendar-usage-add-appointment.page:31(p)
 #: C/calendar-meetings-sending-invitation.page:41(p)
 #, fuzzy
-msgid "(Optional) Enter a description in the <placeholder-1/> field."
+msgid "(Optional) Enter a description in the <gui>Description</gui> field."
 msgstr "Vnesite vaše geslo v polje <b>Novo geslo</b>."
 
-#: C/calendar-usage-add-appointment.page:32(link)
-msgid "busy"
-msgstr ""
-
-#: C/calendar-usage-add-appointment.page:32(gui)
-#, fuzzy
-msgid "Show Time as Busy"
-msgstr "Pokaži čas kot _zaseden"
-
 #: C/calendar-usage-add-appointment.page:32(p)
-msgid ""
-"To show the time as <placeholder-1/> to others, click <guiseq><placeholder-2/"
-"><placeholder-3/></guiseq>."
+msgid "To show the time as <link xref=\"calendar-free-busy\">busy</link> to others, click <guiseq><gui>Options</gui><gui>Show Time as Busy</gui></guiseq>."
 msgstr ""
 
-#: C/calendar-usage-add-appointment.page:34(link)
-#: C/calendar-meetings-sending-invitation.page:48(link)
-#, fuzzy
-msgid "reminder"
-msgstr "Opomniki"
-
-#: C/calendar-usage-add-appointment.page:34(link)
-#: C/calendar-meetings-sending-invitation.page:48(link)
-#, fuzzy
-msgid "recurrence"
-msgstr "Ponovitev"
-
 #: C/calendar-usage-add-appointment.page:34(p)
 #: C/calendar-meetings-sending-invitation.page:48(p)
-msgid ""
-"You can also define a <placeholder-1/>, a <placeholder-2/>, a <placeholder-3/"
-">, a <placeholder-4/>, or a <placeholder-5/> for the event, or add an "
-"attachment."
+msgid "You can also define a <link xref=\"calendar-timezones\">time zone</link>, a <link xref=\"using-categories\">category</link>, a <link xref=\"calendar-alarms-and-reminders\">reminder</link>, a <link xref=\"calendar-recurrence\">recurrence</link>, or a <link xref=\"calendar-classifications\">classification</link> for the event, or add an attachment."
 msgstr ""
 
 #: C/calendar-timezones.page:5(desc)
@@ -11861,81 +8133,46 @@ msgstr "Desno kliknite na skupino za prikaz možnosti"
 #: C/calendar-timezones.page:23(title)
 #, fuzzy
 msgid "Using time zones"
-msgstr "Uporabi _sistemski časovni pas"
+msgstr "Avtor/datum-čas"
 
 #: C/calendar-timezones.page:25(p)
 msgid "Evolution supports using multiple time zones."
 msgstr ""
 
 #: C/calendar-timezones.page:28(title)
-msgid "Setting your global timezone(s)"
-msgstr ""
-
-#: C/calendar-timezones.page:30(gui) C/calendar-timezones.page:32(gui)
-#: C/calendar-layout-general-formatting.page:29(title)
-msgid "Time"
-msgstr "Čas"
-
-#: C/calendar-timezones.page:30(gui)
-#: C/calendar-layout-general-formatting.page:33(link)
 #, fuzzy
-msgid "Time zone"
-msgstr "Časovni pas:"
+msgid "Setting your global timezone(s)"
+msgstr "Nastavljanje nastavitev vaše strani"
 
 #: C/calendar-timezones.page:30(p)
-msgid ""
-"By default Evolution uses the system-wide time zone. This can be changed "
-"under <guiseq><placeholder-1/><placeholder-2/><placeholder-3/><placeholder-4/"
-"><placeholder-5/><placeholder-6/></guiseq>."
+msgid "By default Evolution uses the system-wide time zone. This can be changed under <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Calendar and Tasks</gui><gui>General</gui><gui>Time</gui><gui>Time zone</gui></guiseq>."
 msgstr ""
 
-#: C/calendar-timezones.page:32(gui)
-#, fuzzy
-msgid "Second zone"
-msgstr "_Drug pas:"
-
 #: C/calendar-timezones.page:32(p)
-msgid ""
-"If you deal a lot with people in another specific time zone you can display "
-"that second time zone in the day view of the calendar. You can set a second "
-"time zone under <guiseq><placeholder-1/><placeholder-2/><placeholder-3/"
-"><placeholder-4/><placeholder-5/><placeholder-6/></guiseq>."
+msgid "If you deal a lot with people in another specific time zone you can display that second time zone in the day view of the calendar. You can set a second time zone under <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Calendar and Tasks</gui><gui>General</gui><gui>Time</gui><gui>Second zone</gui></guiseq>."
 msgstr ""
 
 #: C/calendar-timezones.page:36(title)
 #, fuzzy
 msgid "Setting a timezone for an appointment"
-msgstr "Pretvori srečanje v sestanek"
-
-#: C/calendar-timezones.page:38(link)
-#, fuzzy
-msgid "add a new or edit an existing appointment"
-msgstr "Pretvori srečanje v sestanek"
+msgstr "Napaka ob nastavljanju vrednosti za `%s': %s"
 
 #: C/calendar-timezones.page:38(p)
-msgid ""
-"You can also configure time zone information specific to each appointment. "
-"To do that, <placeholder-1/> and click the globe button to customize the "
-"time zone that the time exists in. For example, if you live in New York but "
-"have a telephone meeting set for noon with someone in California, you need "
-"to make sure that your schedules are coordinated. Setting time zones on a "
-"per-appointment basis helps avoid that potential confusion."
+msgid "You can also configure time zone information specific to each appointment. To do that, <link xref=\"calendar-usage\">add a new or edit an existing appointment</link> and click the globe button to customize the time zone that the time exists in. For example, if you live in New York but have a telephone meeting set for noon with someone in California, you need to make sure that your schedules are coordinated. Setting time zones on a per-appointment basis helps avoid that potential confusion."
 msgstr ""
 
 #: C/calendar-sharing-information.page:5(desc)
-msgid ""
-"Make your information (appointments and free/busy times) available to others."
+msgid "Make your information (appointments and free/busy times) available to others."
 msgstr ""
 
 #: C/calendar-sharing-information.page:20(title)
 #, fuzzy
 msgid "Sharing your calendar information"
-msgstr "podatki o koledarju"
+msgstr "Nastavite svoje osebne podatke"
 
 #: C/calendar-searching.page:5(desc)
-#, fuzzy
 msgid "Searching appointments and meetings."
-msgstr "Počisti stare sestanke in srečanja"
+msgstr "Iskanje sestankov in srečanj."
 
 #: C/calendar-searching.page:28(title)
 #, fuzzy
@@ -11943,84 +8180,45 @@ msgid "Searching for Calendar Items"
 msgstr "Pogled celotnega meseca v koledarju"
 
 #: C/calendar-searching.page:31(p)
-msgid ""
-"In the Calendar view, you can quickly search for appointments and meetings "
-"either by summary or by category."
+msgid "In the Calendar view, you can quickly search for appointments and meetings either by summary or by category."
 msgstr ""
 
 #: C/calendar-recurrence.page:5(desc)
-#, fuzzy
 msgid "Repeating appointments."
-msgstr "Vaši sestanki"
+msgstr "Ponavljajoči se sestanki."
 
 #: C/calendar-recurrence.page:23(title)
 #, fuzzy
 msgid "Using Recurrence"
-msgstr "Ponovitev"
-
-#: C/calendar-recurrence.page:25(gui)
-#, fuzzy
-msgid "Recurrence"
-msgstr "Ponovitev"
-
-#: C/calendar-recurrence.page:25(gui)
-#, fuzzy
-msgid "Appointment Editor"
-msgstr "Seznam definicij"
-
-#: C/calendar-recurrence.page:25(gui)
-msgid "Exceptions"
-msgstr "Izjeme"
+msgstr "Uveljavljanje popravka %s z uporabo %s\n"
 
 #: C/calendar-recurrence.page:25(p)
-msgid ""
-"If you have an appointment that takes place regurlarly, you can define its "
-"recurrence by clicking the <placeholder-1/> button in the <placeholder-2/> "
-"or by clicking <guiseq><placeholder-3/><placeholder-4/></guiseq>. You can "
-"then choose a time and date when the appointment stops recurring, and, under "
-"<placeholder-5/>, pick individual days when the appointment does not recur. "
-"Make your selections from left to right, and you form a sentence: \"Every "
-"two weeks on Monday and Friday until January 3, 2015\" or \"Every month on "
-"the first Friday for 12 occurrences.\""
+msgid "If you have an appointment that takes place regularly, you can define its recurrence by clicking the <gui>Recurrence</gui> button in the <gui>Appointment Editor</gui> or by clicking <guiseq><gui>Options</gui><gui>Recurrence</gui></guiseq>. You can then choose a time and date when the appointment stops recurring, and, under <gui>Exceptions</gui>, pick individual days when the appointment does not recur. Make your selections from left to right, and you form a sentence: \"Every two weeks on Monday and Friday until January 3, 2015\" or \"Every month on the first Friday for 12 occurrences.\""
 msgstr ""
 
 #: C/calendar-publishing.page:5(desc)
 msgid "Post your calendar content in public."
 msgstr ""
 
-#: C/calendar-publishing.page:23(title) C/calendar-publishing.page:24(gui)
+#: C/calendar-publishing.page:23(title)
 msgid "Calendar Publishing"
 msgstr "Objavljanje koledarjev"
 
 #: C/calendar-publishing.page:24(p)
-msgid ""
-"In order to make one of your calendars available to the public, you can "
-"define calendars to be uploaded to a web server under <guiseq><placeholder-1/"
-"><placeholder-2/><placeholder-3/><placeholder-4/><placeholder-5/></guiseq>."
+msgid "In order to make one of your calendars available to the public, you can define calendars to be uploaded to a web server under <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Calendar and Tasks</gui><gui>Calendar Publishing</gui><gui style=\"button\">Add</gui></guiseq>."
 msgstr ""
 
 #: C/calendar-publishing.page:26(p)
-msgid ""
-"You can specify the online location, the frequency of publishing, which "
-"calendar(s) to publish, and authentication information for uploading."
+msgid "You can specify the online location, the frequency of publishing, which calendar(s) to publish, and authentication information for uploading."
 msgstr ""
 
-#: C/calendar-publishing.page:28(p) C/calendar-free-busy.page:44(p)
-msgid ""
-"You can publish Calendar and Free/Busy information to a WebDAV server, FTP "
-"server, a remote machine through SSH or to any other web server with HTTP "
-"PUT support."
+#: C/calendar-publishing.page:28(p)
+#: C/calendar-free-busy.page:44(p)
+msgid "You can publish Calendar and Free/Busy information to a WebDAV server, FTP server, a remote machine through SSH or to any other web server with HTTP PUT support."
 msgstr ""
 
-#: C/calendar-publishing.page:30(gui)
-#, fuzzy
-msgid "Publish Calendar Information"
-msgstr "Objavi _podatke o koledarju"
-
 #: C/calendar-publishing.page:30(p)
-msgid ""
-"To immediately publish calendar information, click <guiseq><placeholder-1/"
-"><placeholder-2/></guiseq> in the calendar."
+msgid "To immediately publish calendar information, click <guiseq><gui>Actions</gui><gui>Publish Calendar Information</gui></guiseq> in the calendar."
 msgstr ""
 
 #: C/calendar-organizing.page:5(desc)
@@ -12030,7 +8228,7 @@ msgstr ""
 #: C/calendar-organizing.page:21(title)
 #, fuzzy
 msgid "Sorting and organizing calendars"
-msgstr "Nalaganje koledarjev"
+msgstr "Prenašanje in razvrščanje TV seznamov"
 
 #: C/calendar-meetings-sending-invitation.page:5(desc)
 #, fuzzy
@@ -12043,21 +8241,11 @@ msgid "Sending a Meeting Invitation"
 msgstr "Povabilo k souporabi namizja"
 
 #: C/calendar-meetings-sending-invitation.page:25(p)
-msgid ""
-"When you create a meeting (group appointment), you can specify the attendees "
-"in several categories, such as \"chair\" or \"required\". When you save the "
-"meeting listing, each attendee is sent an email with the meeting "
-"information, which also gives them the option to respond."
+msgid "When you create a meeting (group appointment), you can specify the attendees in several categories, such as \"chair\" or \"required\". When you save the meeting listing, each attendee is sent an email with the meeting information, which also gives them the option to respond."
 msgstr ""
 
 #: C/calendar-meetings-sending-invitation.page:26(p)
-msgid ""
-"If you do not need to collect attendance information when you're scheduling "
-"an event, and would rather just announce the event, right-click the meeting "
-"and select <placeholder-1/>. This opens a new email message with the event "
-"notification attached as an announcement. Recipients can add the event to "
-"their calendars with one click, but it will not automatically send you email "
-"about whether they plan to attend."
+msgid "If you do not need to collect attendance information when you're scheduling an event, and would rather just announce the event, right-click the meeting and select <gui>Forward as iCalendar</gui>. This opens a new email message with the event notification attached as an announcement. Recipients can add the event to their calendars with one click, but it will not automatically send you email about whether they plan to attend."
 msgstr ""
 
 #: C/calendar-meetings-sending-invitation.page:28(p)
@@ -12065,83 +8253,40 @@ msgstr ""
 msgid "To schedule a meeting:"
 msgstr "Pretvori sestanek v srečanje"
 
-#: C/calendar-meetings-sending-invitation.page:31(gui)
-#: C/calendar-free-busy.page:33(gui)
+#: C/calendar-meetings-sending-invitation.page:31(p)
+#: C/calendar-free-busy.page:33(p)
 #, fuzzy
-msgid "Meeting"
-msgstr "Srečanje - %s"
-
-#: C/calendar-meetings-sending-invitation.page:32(gui)
-msgid "Organizer"
-msgstr "Organizator"
+msgid "Click <guiseq><gui>File</gui><gui>New</gui><gui>Meeting</gui></guiseq>."
+msgstr "Znova kliknite <guiseq><gui>Datoteka</gui><gui>Natisni</gui></guiseq>."
 
 #: C/calendar-meetings-sending-invitation.page:32(p)
-msgid ""
-"If you have multiple email accounts, select the one to use by selecting an "
-"item in the <placeholder-1/> field."
+msgid "If you have multiple email accounts, select the one to use by selecting an item in the <gui>Organizer</gui> field."
 msgstr ""
 
 #: C/calendar-meetings-sending-invitation.page:34(p)
 #: C/calendar-free-busy.page:34(p)
-msgid ""
-"Click <placeholder-1/> to add the email addresses of people you want to "
-"invite."
+msgid "Click <gui style=\"button\">Add</gui> to add the email addresses of people you want to invite."
 msgstr ""
 
-#: C/calendar-meetings-sending-invitation.page:35(gui)
-msgid "Type"
-msgstr "Vrsta"
-
-#: C/calendar-meetings-sending-invitation.page:35(gui)
-msgid "Role"
-msgstr "Vloga"
-
-#: C/calendar-meetings-sending-invitation.page:35(gui)
-msgid "RSVP"
-msgstr "Povratnica"
-
 #: C/calendar-meetings-sending-invitation.page:35(p)
-msgid ""
-"Click <placeholder-1/> in the menu bar to show or hide the <placeholder-2/>, "
-"<placeholder-3/>, <placeholder-4/>, and <placeholder-5/> fields."
+msgid "Click <gui>View</gui> in the menu bar to show or hide the <gui>Type</gui>, <gui>Role</gui>, <gui>Status</gui>, and <gui>RSVP</gui> fields."
 msgstr ""
 
-#: C/calendar-meetings-sending-invitation.page:42(link)
-#, fuzzy
-msgid "free/busy"
-msgstr "Zasedenost"
-
-#: C/calendar-meetings-sending-invitation.page:42(gui)
-#: C/calendar-free-busy.page:35(gui)
-msgid "Free/Busy"
-msgstr "Zasedenost"
-
 #: C/calendar-meetings-sending-invitation.page:42(p)
-msgid ""
-"To query <placeholder-1/> information for the attendees, click the "
-"<placeholder-2/> button on the toolbar, or click <guiseq><placeholder-3/"
-"><placeholder-4/></guiseq>."
+msgid "To query <link xref=\"calendar-free-busy\">free/busy</link> information for the attendees, click the <gui>Free/Busy</gui> button on the toolbar, or click <guiseq><gui>Options</gui><gui>Free/Busy</gui></guiseq>."
 msgstr ""
 
 #: C/calendar-meetings-sending-invitation.page:43(p)
 #, fuzzy
-msgid "Click <placeholder-1/> to save the meeting."
+msgid "Click <gui>Save</gui> to save the meeting."
 msgstr "Kliknite tukaj za shranjevanje trenutnega okna"
 
 #: C/calendar-meetings-sending-invitation.page:46(p)
-msgid ""
-"An email is sent out to all the recipients, inviting them to your event."
+msgid "An email is sent out to all the recipients, inviting them to your event."
 msgstr ""
 
 #: C/calendar-meetings-sending-invitation.page:50(p)
-msgid ""
-"In Evolution, a meeting can have only one organizer, and only the organizer "
-"can add participants to that meeting. Though it is possible to change the "
-"organizer of a meeting, this is not recommended as a means to invite "
-"additional participants to meetings. If you want to invite additional people "
-"to a meeting and are not that meeting's organizer, it is recommended that "
-"you forward the invitation message you received from the original meeting "
-"organiser to additional participants."
+msgid "In Evolution, a meeting can have only one organizer, and only the organizer can add participants to that meeting. Though it is possible to change the organizer of a meeting, this is not recommended as a means to invite additional participants to meetings. If you want to invite additional people to a meeting and are not that meeting's organizer, it is recommended that you forward the invitation message you received from the original meeting organiser to additional participants."
 msgstr ""
 
 #: C/calendar-meetings-replying-to-invitation.page:5(desc)
@@ -12152,118 +8297,76 @@ msgstr "Povabilo k souporabi namizja"
 #: C/calendar-meetings-replying-to-invitation.page:25(title)
 #, fuzzy
 msgid "Replying to a Meeting Request"
-msgstr "%s je odgovoril(a) na zahtevek po srečanju."
-
-#: C/calendar-meetings-replying-to-invitation.page:26(gui)
-#, fuzzy
-msgid "Accept"
-msgstr "Sprejmi"
-
-#: C/calendar-meetings-replying-to-invitation.page:26(gui)
-#, fuzzy
-msgid "Tentatively Accept"
-msgstr "Poskusno sprejmi"
-
-#: C/calendar-meetings-replying-to-invitation.page:26(gui)
-#, fuzzy
-msgid "Decline"
-msgstr "Odkloni"
+msgstr "<b>%s</b> je odgovoril(a) na zahtevek po srečanju."
 
 #: C/calendar-meetings-replying-to-invitation.page:26(p)
-msgid ""
-"Meeting requests are sent as attachments. To view or respond to one, click "
-"the attachment icon and view it in the mail window. All the details about "
-"the event are shown, including time and dates. Then you can choose how to "
-"reply to the invitation - the options are to <placeholder-1/>, "
-"<placeholder-2/>, or <placeholder-3/>."
+msgid "Meeting requests are sent as attachments. To view or respond to one, click the attachment icon and view it in the mail window. All the details about the event are shown, including time and dates. Then you can choose how to reply to the invitation - the options are to <gui>Accept</gui>, <gui>Tentatively Accept</gui>, or <gui>Decline</gui>."
 msgstr ""
 
 #: C/calendar-meetings-replying-to-invitation.page:28(p)
-msgid ""
-"Click <placeholder-1/> to send your answer per email to the organizer. The "
-"event is also added automatically to your calendar if you accept."
+msgid "Click <gui style=\"button\">OK</gui> to send your answer per email to the organizer. The event is also added automatically to your calendar if you accept."
 msgstr ""
 
 #: C/calendar-meetings-replying-to-invitation.page:29(p)
-msgid ""
-"After you have added the meeting to your calendar, you can make changes to "
-"the meeting, but if the original organizer sends out an update, your changes "
-"might be overwritten."
+msgid "After you have added the meeting to your calendar, you can make changes to the meeting, but if the original organizer sends out an update, your changes might be overwritten."
 msgstr ""
 
-#: C/calendar-meetings-replying-to-invitation.page:31(gui)
-msgid "Conflict Search"
-msgstr "Iskanje sporov"
-
 #: C/calendar-meetings-replying-to-invitation.page:31(p)
-msgid ""
-"Under <guiseq><placeholder-1/><placeholder-2/><placeholder-3/><placeholder-4/"
-"><placeholder-5/></guiseq> you can define which calendars are used for "
-"warning you of meeting conflicts."
+msgid "Under <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Mail Preferences</gui><gui>Calendar and Tasks</gui><gui>Conflict Search</gui></guiseq> you can define which calendars are used for warning you of meeting conflicts."
 msgstr ""
 
 #: C/calendar-meetings.page:5(desc)
 #, fuzzy
 msgid "Using meetings in the calendar."
-msgstr "Desno kliknite na skupino za prikaz možnosti"
+msgstr "Najden sestanek v koledarju '%s'"
 
 #: C/calendar-meetings.page:20(title)
-#, fuzzy
 msgid "Meetings"
-msgstr "Srečanje - %s"
+msgstr "Srečanja"
 
 #: C/calendar-meetings-delegating.page:5(desc)
-#, fuzzy
 msgid "Ask somebody else to run the meeting."
-msgstr "Ali želite ponovno poslati podatke o srečanju?"
+msgstr "Vprašajte nekoga drugega, da naj vodi srečanje."
 
 #: C/calendar-meetings-delegating.page:25(title)
-#, fuzzy
 msgid "Delegating Meetings"
-msgstr "Sestanki in srečanja"
+msgstr "Pooblaščevanje srečanj"
 
 #: C/calendar-meetings-delegating.page:26(p)
 msgid "Only attendees of a meeting can delegate a meeting."
 msgstr ""
 
 #: C/calendar-meetings-delegating.page:29(p)
-#, fuzzy
 msgid "Right-click on the meeting that you want to delegate."
-msgstr "Zbrisana sporočila prikaži na seznamu sporočil"
+msgstr "Desno kliknite na srečanje, ki ga želite pooblastiti."
 
-#: C/calendar-meetings-delegating.page:32(gui)
-#, fuzzy
-msgid "Delegate Meeting"
-msgstr "_Poblaščeno zastopanje srečanja..."
+#: C/calendar-meetings-delegating.page:32(p)
+msgid "Click <gui>Delegate Meeting</gui>."
+msgstr "Kliknite <gui>Pooblasti za srečanje</gui>."
 
 #: C/calendar-meetings-delegating.page:35(p)
 msgid "Select the contacts you want to delegate the meeting to."
-msgstr ""
+msgstr "Določite stike, ki jih želite pooblastiti za srečanje."
 
 #: C/calendar-meetings-delegating.page:41(p)
 msgid "Each contact receives a copy of the meeting invitation."
 msgstr ""
 
 #: C/calendar-marcus-bains-line.page:5(desc)
-#, fuzzy
 msgid "The red \"Marcus Bains\" line displays the current time."
 msgstr ""
-"Ali naj se v koledarju izrišejo črte Marcusa Baina (črta ob trenutnem času)."
 
 #: C/calendar-marcus-bains-line.page:19(title)
 msgid "Time display in the Day view"
-msgstr ""
+msgstr "Prikaz časa v pogledu dneva"
 
 #: C/calendar-marcus-bains-line.page:21(p)
-msgid ""
-"The red Marcus Bains Line in the Day view of the calendar is a marker to "
-"show the current date and time."
+msgid "The red Marcus Bains Line in the Day view of the calendar is a marker to show the current date and time."
 msgstr ""
 
 #: C/calendar-local.page:5(desc)
-#, fuzzy
 msgid "Adding another local calendar."
-msgstr "Poišči <b>Google Codesearch</b> za <i>%(name)s</i>"
+msgstr "Dodajanje novega krajevnega koledarja."
 
 #: C/calendar-local.page:20(title)
 msgid "Adding another local calendar"
@@ -12274,127 +8377,100 @@ msgid "Using date ranges (day, week, month) to look at the calendar."
 msgstr ""
 
 #: C/calendar-layout-views.page:23(title)
-#, fuzzy
 msgid "Available views"
-msgstr "Razpoložljiva polja"
+msgstr "Razpoložljivi pogledi"
 
 #: C/calendar-layout-views.page:25(p)
 msgid "Evolution offers five different views of your calendar data:"
 msgstr ""
 
 #: C/calendar-layout-views.page:27(p)
-msgid "Day (<keyseq><placeholder-1/><placeholder-2/></keyseq>)"
-msgstr ""
+msgid "Day (<keyseq><key>Ctrl</key><key>Y</key></keyseq>)"
+msgstr "Dan (<keyseq><key>Ctrl</key><key>Y</key></keyseq>)"
 
 #: C/calendar-layout-views.page:28(p)
-msgid "Work Week (<keyseq><placeholder-1/><placeholder-2/></keyseq>)"
-msgstr ""
-
-#: C/calendar-layout-views.page:29(key)
-msgid "K"
-msgstr "K"
+msgid "Work Week (<keyseq><key>Ctrl</key><key>J</key></keyseq>)"
+msgstr "Delovni teden (<keyseq><key>Ctrl</key><key>J</key></keyseq>)"
 
 #: C/calendar-layout-views.page:29(p)
-msgid "Week (<keyseq><placeholder-1/><placeholder-2/></keyseq>)"
-msgstr ""
+msgid "Week (<keyseq><key>Ctrl</key><key>K</key></keyseq>)"
+msgstr "Teden (<keyseq><key>Ctrl</key><key>K</key></keyseq>)"
 
 #: C/calendar-layout-views.page:30(p)
-msgid "Month (<keyseq><placeholder-1/><placeholder-2/></keyseq>)"
-msgstr ""
+#, fuzzy
+msgid "Month (<keyseq><key>Ctrl</key><key>M</key></keyseq>)"
+msgstr "Pritisnite <keyseq><key>Ctrl</key><key>H</key></keyseq>."
 
 #: C/calendar-layout-views.page:31(p)
-msgid "List (<keyseq><placeholder-1/><placeholder-2/></keyseq>)"
-msgstr ""
-
-#: C/calendar-layout-views.page:34(gui)
-msgid "Current View"
-msgstr "Trenutni pogled"
+msgid "List (<keyseq><key>Ctrl</key><key>L</key></keyseq>)"
+msgstr "Seznam (<keyseq><key>Ctrl</key><key>L</key></keyseq>)"
 
 #: C/calendar-layout-views.page:34(p)
-msgid ""
-"You can switch the view by either using the buttons in the toolbar, or by "
-"clicking <guiseq><placeholder-1/><placeholder-2/></guiseq>."
+msgid "You can switch the view by either using the buttons in the toolbar, or by clicking <guiseq><gui>View</gui><gui>Current View</gui></guiseq>."
 msgstr ""
 
 #: C/calendar-layout-views.page:36(p)
-msgid ""
-"You can also select an arbitrary range of days in the small calendar in the "
-"side bar. To do this, select the days that you want to view in your calendar."
+msgid "You can also select an arbitrary range of days in the small calendar in the side bar. To do this, select the days that you want to view in your calendar."
 msgstr ""
 
-#: C/calendar-layout-views.page:38(gui)
-msgid "Select today"
-msgstr "Izbere danes"
-
 #: C/calendar-layout-views.page:38(p)
-msgid ""
-"The Previous and Next buttons move you forward and back in your calendar "
-"pages. If you are using a week or month view, you can move by week or month. "
-"To return to today's listing, click the <placeholder-1/> button between the "
-"two arrow buttons in the toolbar."
+msgid "The Previous and Next buttons move you forward and back in your calendar pages. If you are using a week or month view, you can move by week or month. To return to today's listing, click the <gui>Select today</gui> button between the two arrow buttons in the toolbar."
 msgstr ""
 
-#: C/calendar-layout-views.page:40(gui)
-msgid "Select a specific date"
-msgstr "Izberi določen datum"
-
 #: C/calendar-layout-views.page:40(p)
-msgid ""
-"To visit calendar entries for a specific date, click the <placeholder-1/> "
-"button in the toolbar."
+msgid "To visit calendar entries for a specific date, click the <gui>Select a specific date</gui> button in the toolbar."
 msgstr ""
 
 #: C/calendar-layout.page:5(desc)
-#, fuzzy
 msgid "Adjusting the display and views of the calendar."
-msgstr "Gradnik omogoča prikaz malega koledarja"
+msgstr ""
 
 #: C/calendar-layout.page:20(title)
 #, fuzzy
 msgid "Changing the calendar layout"
-msgstr "Odpiranje koledarja. Počakajte ..."
+msgstr "Zaznavanje razporeda tipkovnice"
 
 #: C/calendar-layout-general-formatting.page:5(desc)
+#, fuzzy
 msgid "General formatting options for the calendar."
-msgstr ""
+msgstr "Možnosti za nadziranje Braillovega \"Podčrtovanja\" za oblikovanje"
 
 #: C/calendar-layout-general-formatting.page:25(title)
 #, fuzzy
 msgid "General formatting options"
-msgstr "Splošne _možnosti"
+msgstr "Pokaži splošne možnosti"
 
 #: C/calendar-layout-general-formatting.page:27(p)
-msgid ""
-"The following options are available under <guiseq><placeholder-1/"
-"><placeholder-2/><placeholder-3/><placeholder-4/></guiseq>."
+msgid "The following options are available under <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Calendar and Tasks</gui><gui>General</gui></guiseq>."
 msgstr ""
 
+#: C/calendar-layout-general-formatting.page:29(title)
+msgid "Time"
+msgstr "Čas"
+
 #: C/calendar-layout-general-formatting.page:31(p)
 msgid "Time format:"
-msgstr "Oblika izpisa časa:"
+msgstr "Oblika časa:"
 
 #: C/calendar-layout-general-formatting.page:32(p)
 msgid "Choose between twelve-hour (AM/PM) and twenty-four-hour time formats."
 msgstr ""
 
 #: C/calendar-layout-general-formatting.page:33(p)
-#, fuzzy
-msgid "<placeholder-1/> and Second zone:"
-msgstr "gpg <placeholder-1/>"
+msgid "<link xref=\"calendar-timezones\">Time zone</link> and Second zone:"
+msgstr ""
 
 #: C/calendar-layout-general-formatting.page:34(p)
 msgid "The city you are located in, and optionally a second city."
 msgstr ""
 
 #: C/calendar-layout-general-formatting.page:39(title)
-#, fuzzy
 msgid "Work Week"
-msgstr "Delavni teden"
+msgstr "Delovni teden"
 
 #: C/calendar-layout-general-formatting.page:41(p)
-#, fuzzy
 msgid "Week starts on:"
-msgstr "_Začetek tedna:"
+msgstr "Začetek tedna:"
 
 #: C/calendar-layout-general-formatting.page:42(p)
 msgid "Select the day to display as the first in each week."
@@ -12409,18 +8485,16 @@ msgid "Define which week days are work days."
 msgstr ""
 
 #: C/calendar-layout-general-formatting.page:45(p)
-#, fuzzy
 msgid "Day begins:"
-msgstr "Začetek _dneva:"
+msgstr "Začetek dneva:"
 
 #: C/calendar-layout-general-formatting.page:46(p)
 msgid "Define at which time your work day begins."
 msgstr ""
 
 #: C/calendar-layout-general-formatting.page:47(p)
-#, fuzzy
 msgid "Day ends:"
-msgstr "Konec dn_eva:"
+msgstr "Konec dneva:"
 
 #: C/calendar-layout-general-formatting.page:48(p)
 msgid "Define at which time your work day ends."
@@ -12431,38 +8505,35 @@ msgid "Alerts"
 msgstr "Opozorila"
 
 #: C/calendar-layout-general-formatting.page:54(p)
-msgid ""
-"If you want to be warned before you delete any appointment, select this "
-"option."
+msgid "If you want to be warned before you delete any appointment, select this option."
 msgstr ""
 
 #: C/calendar-layout-appointment-display.page:5(desc)
 #, fuzzy
 msgid "Define the displaying of appointments in the calendar."
-msgstr "Ustvari novo sporočilce v beležnici"
+msgstr "Oglejte si sestanke v svojem koledarju"
 
 #: C/calendar-layout-appointment-display.page:23(title)
 #, fuzzy
 msgid "Appearance of Appointments"
-msgstr "konec sestanka"
+msgstr "Vaši sestanki"
 
 #. TODO:ANDREKLAPPER: File bug report similar to #655666 once checked in 3.1 about General & Display tabs. This is a huge mess, e.g. time settings are split onto two tabs.
 #: C/calendar-layout-appointment-display.page:29(p)
-msgid ""
-"The following calendar-related options are available under "
-"<guiseq><placeholder-1/><placeholder-2/><placeholder-3/><placeholder-4/></"
-"guiseq>."
+msgid "The following calendar-related options are available under <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Calendar and Tasks</gui><gui>Display</gui></guiseq>."
 msgstr ""
 
+#: C/calendar-layout-appointment-display.page:32(title)
+msgid "General"
+msgstr "Splošno"
+
 #: C/calendar-layout-appointment-display.page:34(p)
 #, fuzzy
 msgid "Time Divisions:"
 msgstr "Delitve časa"
 
 #: C/calendar-layout-appointment-display.page:35(p)
-msgid ""
-"Sets the time increments shown as fine lines on the daily view in the "
-"calendar."
+msgid "Sets the time increments shown as fine lines on the daily view in the calendar."
 msgstr ""
 
 #: C/calendar-layout-appointment-display.page:36(p)
@@ -12471,9 +8542,7 @@ msgid "Show appointment end times in week and month views:"
 msgstr "Pokaži čase koncev sestankov v tedenskih in mesečnih pogledih"
 
 #: C/calendar-layout-appointment-display.page:37(p)
-msgid ""
-"If there is space, Evolution shows the end times in the week and month views "
-"for each appointment."
+msgid "If there is space, Evolution shows the end times in the week and month views for each appointment."
 msgstr ""
 
 #: C/calendar-layout-appointment-display.page:38(p)
@@ -12482,25 +8551,20 @@ msgid "Compress weekends in month view:"
 msgstr "Skrči vikende v mesečnem pogledu"
 
 #: C/calendar-layout-appointment-display.page:39(p)
-msgid ""
-"Select this option to display weekends in one box instead of two in the "
-"month view."
+msgid "Select this option to display weekends in one box instead of two in the month view."
 msgstr ""
 
 #: C/calendar-layout-appointment-display.page:40(p)
-#, fuzzy
 msgid "Show week numbers:"
-msgstr "Pokaži številke tednov"
+msgstr "Pokaži številke tednov:"
 
 #: C/calendar-layout-appointment-display.page:41(p)
 msgid "Shows the week numbers next to the respective weeks in the calendar."
 msgstr ""
 
 #: C/calendar-layout-appointment-display.page:42(p)
-#, fuzzy
 msgid "Show recurring events in italic in bottom left calendar"
-msgstr ""
-"Pokaži p_onavljajoče se dogodke v ležeči pisavi v spodnjem levem koledarju"
+msgstr "Pokaži ponavljajoče se dogodke v ležeči pisavi v spodnjem levem koledarju"
 
 #: C/calendar-layout-appointment-display.page:43(p)
 msgid "Scroll Month View by a week"
@@ -12508,12 +8572,10 @@ msgstr "Drsenje po tednih v mesečnem pogledu"
 
 #: C/calendar-layout-appointment-display.page:48(title)
 msgid "Date/Time Format"
-msgstr "Zapis datuma/časa"
+msgstr "Oblika datuma/časa"
 
 #: C/calendar-layout-appointment-display.page:50(p)
-msgid ""
-"You can change the format of the <placeholder-1/> column by setting your "
-"prefered format."
+msgid "You can change the format of the <gui>Date</gui> column by setting your preferred format."
 msgstr ""
 
 #: C/calendar-google.page:5(desc)
@@ -12524,7 +8586,7 @@ msgstr "Navesti je mogoče več podatkov nastavitev računa."
 #: C/calendar-google.page:24(title)
 #, fuzzy
 msgid "Using a Google calendar"
-msgstr "Google koledar"
+msgstr "Usklajevanje koledarja Google"
 
 #: C/calendar-google.page:34(p)
 msgid "If you have more than one Google calendar, define which of them to use."
@@ -12536,30 +8598,17 @@ msgid "Using the Free/Busy view for setting up meetings."
 msgstr "URL-ji strežnika zasedenosti"
 
 #: C/calendar-free-busy.page:23(title)
+#, fuzzy
 msgid "Free/Busy information"
 msgstr "Podatki o zasedenosti"
 
 #: C/calendar-free-busy.page:25(p)
-msgid ""
-"You can use the Free/Busy search for meetings to determine the availability "
-"of invitees."
+msgid "You can use the Free/Busy search for meetings to determine the availability of invitees."
 msgstr ""
 
-#: C/calendar-free-busy.page:29(link)
-#, fuzzy
-msgid "meeting invitations"
-msgstr "Strežnik _upravlja povabila srečanja"
-
 #. TODO: Recheck once https://bugzilla.gnome.org/show_bug.cgi?id=655494 is fixed
 #: C/calendar-free-busy.page:29(p)
-msgid ""
-"In addition to the standard meeting scheduling tools, you can use the Free/"
-"Busy view to check whether people are available in advance. The Free/Busy "
-"feature is normally a function of dedicated groupware servers such as "
-"Microsoft Exchange and Novell GroupWise. However, you can also publish Free/"
-"Busy information online, and access Free/Busy information published "
-"elsewhere. If not everyone you collaborate with publishes Free/Busy data, "
-"you can still use <placeholder-1/> to coordinate schedules with other people."
+msgid "In addition to the standard meeting scheduling tools, you can use the Free/Busy view to check whether people are available in advance. The Free/Busy feature is normally a function of dedicated groupware servers such as Microsoft Exchange and Novell GroupWise. However, you can also publish Free/Busy information online, and access Free/Busy information published elsewhere. If not everyone you collaborate with publishes Free/Busy data, you can still use <link xref=\"calendar-meetings-sending-invitation\">meeting invitations</link> to coordinate schedules with other people."
 msgstr ""
 
 #: C/calendar-free-busy.page:31(p)
@@ -12568,23 +8617,11 @@ msgid "To access the free/busy view:"
 msgstr "<b>%s</b> je odgovoril(a) na zahtevek po podatkih o zasedenosti."
 
 #: C/calendar-free-busy.page:35(p)
-msgid ""
-"Click the <placeholder-1/> button on the toolbar, or click "
-"<guiseq><placeholder-2/><placeholder-3/></guiseq>."
+msgid "Click the <gui>Free/Busy</gui> button on the toolbar, or click <guiseq><gui>Options</gui><gui>Free/Busy</gui></guiseq>."
 msgstr ""
 
-#: C/calendar-free-busy.page:36(gui)
-#, fuzzy
-msgid "Autopick"
-msgstr "_Samodejno izberi"
-
 #: C/calendar-free-busy.page:36(p)
-msgid ""
-"Adjust the meeting time, either by dragging the meeting borders or by using "
-"the <placeholder-1/> buttons to choose a time automatically, then click "
-"<placeholder-2/>. Attendees on an Exchange server have the appointment "
-"updated automatically; others receive email notification of any change in "
-"plans."
+msgid "Adjust the meeting time, either by dragging the meeting borders or by using the <gui>Autopick</gui> buttons to choose a time automatically, then click <gui style=\"button\">Close</gui>. Attendees on an Exchange server have the appointment updated automatically; others receive email notification of any change in plans."
 msgstr ""
 
 #: C/calendar-free-busy.page:40(p)
@@ -12593,8 +8630,7 @@ msgid "Attendee List:"
 msgstr "Seznam definicij"
 
 #: C/calendar-free-busy.page:40(p)
-msgid ""
-"The Attendee List shows the people who have been invited to the appointment."
+msgid "The Attendee List shows the people who have been invited to the appointment."
 msgstr ""
 
 #: C/calendar-free-busy.page:41(p)
@@ -12603,34 +8639,15 @@ msgid "Schedule Grid:"
 msgstr "Dinamična mreža"
 
 #: C/calendar-free-busy.page:41(p)
-msgid ""
-"The Schedule Grid shows the published Free/Busy information for the people "
-"you have invited. This is where you compare schedules to find free time to "
-"schedule the appointment. Individuals have visible scheduling information "
-"only if they use the same Novell GroupWise or Microsoft Exchange server you "
-"do (that is, if they are in the same organization as you), or if they "
-"publish free/busy information at a URL you can reach and you have entered "
-"that URL into their contact cards using the contact editor."
+msgid "The Schedule Grid shows the published Free/Busy information for the people you have invited. This is where you compare schedules to find free time to schedule the appointment. Individuals have visible scheduling information only if they use the same Novell GroupWise or Microsoft Exchange server you do (that is, if they are in the same organization as you), or if they publish free/busy information at a URL you can reach and you have entered that URL into their contact cards using the contact editor."
 msgstr ""
 
 #: C/calendar-free-busy.page:47(title)
 msgid "Accessing Free/Busy Data Without a Groupware Server"
 msgstr ""
 
-#: C/calendar-free-busy.page:49(gui)
-msgid "Personal Information"
-msgstr "Osebni podatki"
-
-#: C/calendar-free-busy.page:49(gui)
-msgid "Web Addresses"
-msgstr "Spletni naslovi"
-
 #: C/calendar-free-busy.page:49(p)
-msgid ""
-"If individuals give you a URL for Free/Busy data or for their web calendar, "
-"you can add the URL under <guiseq><placeholder-1/><placeholder-2/></guiseq> "
-"in the <placeholder-3/>. Then, when you schedule a meeting with them, "
-"Evolution looks up the schedule and displays it in the Free/Busy data."
+msgid "If individuals give you a URL for Free/Busy data or for their web calendar, you can add the URL under <guiseq><gui>Personal Information</gui><gui>Web Addresses</gui></guiseq> in the <link xref=\"contacts-usage-edit-contact\">Contact Editor</link>. Then, when you schedule a meeting with them, Evolution looks up the schedule and displays it in the Free/Busy data."
 msgstr ""
 
 #: C/calendar-classifications.page:5(desc)
@@ -12640,196 +8657,118 @@ msgstr ""
 #: C/calendar-classifications.page:23(title)
 #, fuzzy
 msgid "Using Classifications"
-msgstr "Razvrstitev"
+msgstr "Uveljavljanje popravka %s z uporabo %s\n"
 
 #: C/calendar-classifications.page:25(p)
-msgid ""
-"If you are using a calendar on a Novell GroupWise or Microsoft Exchange "
-"server, you can select a classification to determine who can view it."
+msgid "If you are using a calendar on a Novell GroupWise or Microsoft Exchange server, you can select a classification to determine who can view it."
 msgstr ""
 
-#: C/calendar-classifications.page:26(gui)
-msgid "Classifications"
-msgstr ""
-
-#: C/calendar-classifications.page:26(gui)
-msgid "Public"
-msgstr "Javno"
-
-#: C/calendar-classifications.page:26(gui)
-msgid "Private"
-msgstr "Zasebno"
-
-#: C/calendar-classifications.page:26(gui)
-msgid "Confidential"
-msgstr "Zaupno"
-
 #: C/calendar-classifications.page:26(p)
-msgid ""
-"To set a classification for an appointment or a task, click "
-"<guiseq><placeholder-1/><placeholder-2/></guiseq> and select a "
-"classification in the editor. <placeholder-3/> is the default category, and "
-"a public appointment can be viewed by anyone on the calendar-sharing "
-"network. <placeholder-4/> denotes one level of security, and <placeholder-5/"
-"> an even higher level."
+msgid "To set a classification for an appointment or a task, click <guiseq><gui>Options</gui><gui>Classifications</gui></guiseq> and select a classification in the editor. <gui>Public</gui> is the default category, and a public appointment can be viewed by anyone on the calendar-sharing network. <gui>Private</gui> denotes one level of security, and <gui>Confidential</gui> an even higher level."
 msgstr ""
 
 #: C/calendar-classifications.page:27(p)
-msgid ""
-"The different levels vary depending on your server settings; check with your "
-"system administrator or adjust your delegation settings."
+msgid "The different levels vary depending on your server settings; check with your system administrator or adjust your delegation settings."
 msgstr ""
 
 #: C/calendar-caldav.page:5(desc)
-#, fuzzy
 msgid "Using an online CalDAV calendar."
-msgstr "Brskanje za CalDAV koledarji"
+msgstr "Uporaba spletnih koledarjev CalDAV."
 
 #: C/calendar-caldav.page:23(title)
-#, fuzzy
 msgid "Using a CalDAV calendar"
-msgstr "Brskanje za CalDAV koledarji"
+msgstr "Uporaba koledarjev CalDAV"
 
-#: C/calendar-caldav.page:28(gui)
-msgid "CalDAV"
-msgstr "CalDAV"
+#: C/calendar-caldav.page:28(p)
+#, fuzzy
+msgid "Select the type <gui>CalDAV</gui>."
+msgstr "Izberite zavihek <gui>Iskanje</gui>."
 
 #: C/calendar-alarms-and-reminders.page:5(desc)
-#, fuzzy
 msgid "Setting up reminder notifications for appointments."
-msgstr "Ali naj se nastavi privzet opomnik za sestanke."
+msgstr ""
 
 #: C/calendar-alarms-and-reminders.page:23(title)
-#, fuzzy
 msgid "Reminders for appointments"
-msgstr "konec sestanka"
+msgstr "Opomniki sestankov"
 
 #: C/calendar-alarms-and-reminders.page:26(title)
-#, fuzzy
 msgid "General Settings"
-msgstr "Nastavitve neželene pošte ..."
-
-#: C/calendar-alarms-and-reminders.page:28(gui)
-#: C/calendar-alarms-and-reminders.page:37(gui)
-#, fuzzy
-msgid "Reminders"
-msgstr "Opomniki"
+msgstr "Splošne nastavitve"
 
 #: C/calendar-alarms-and-reminders.page:28(p)
-msgid ""
-"Under <guiseq><placeholder-1/><placeholder-2/><placeholder-3/><placeholder-4/"
-"></guiseq> you can select those calendars for which you want to receive "
-"reminder notifications. If you do not select a calendar, you will not "
-"receive reminders for any events in this calendar. You can also define "
-"whether to show a reminder for every appointment and for every birthday and "
-"anniversary."
+msgid "Under <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Calendar and Tasks</gui><gui>Reminders</gui></guiseq> you can select those calendars for which you want to receive reminder notifications. If you do not select a calendar, you will not receive reminders for any events in this calendar. You can also define whether to show a reminder for every appointment and for every birthday and anniversary."
 msgstr ""
 
 #: C/calendar-alarms-and-reminders.page:33(title)
-#, fuzzy
 msgid "Manual Reminders"
-msgstr "Opomniki"
+msgstr "Ročni opomniki:"
 
 #: C/calendar-alarms-and-reminders.page:35(p)
-msgid ""
-"Apart from the general settings you can also set up reminders in the "
-"appointment editor for certain appointments only:"
+msgid "Apart from the general settings you can also set up reminders in the appointment editor for certain appointments only:"
 msgstr ""
 
 #: C/calendar-alarms-and-reminders.page:37(p)
-msgid ""
-"Click <guiseq><placeholder-1/><placeholder-2/></guiseq> or press the "
-"Reminder button in the toolbar."
+msgid "Click <guiseq><gui>Options</gui><gui>Reminders</gui></guiseq> or press the Reminder button in the toolbar."
 msgstr ""
 
-#: C/calendar-alarms-and-reminders.page:38(gui)
-#: C/calendar-alarms-and-reminders.page:39(gui)
-msgid "Customize"
-msgstr "Prilagodi"
-
 #: C/calendar-alarms-and-reminders.page:38(p)
-msgid ""
-"From the dropdown menu, choose either one of the available default options "
-"when to show a notification reminder, or choose <placeholder-1/>."
+msgid "From the dropdown menu, choose either one of the available default options when to show a notification reminder, or choose <gui>Customize</gui>."
 msgstr ""
 
 #: C/calendar-alarms-and-reminders.page:39(p)
-msgid ""
-"In case of <placeholder-1/>, the reminder can be a popup, a sound played, or "
-"a program ran. You can also define whether the reminder should be repeated."
+msgid "In case of <gui>Customize</gui>, the reminder can be a popup, a sound played, or a program ran. You can also define whether the reminder should be repeated."
 msgstr ""
 
 #: C/backup-restore.page:5(desc)
 msgid "Back up and restore your Evolution data and settings."
-msgstr "Varnostno kopiranje in obnovitev podatkov in nastavitev Evolution."
+msgstr "Varnostno kopiranje in obnovitev podatkov ter nastavitev Evolution."
 
 #: C/backup-restore.page:21(title)
-#, fuzzy
 msgid "Back up and restore"
-msgstr "Varnostne kopije in obnavljanje"
+msgstr "Ustvarjanje varnostnih kopij in obnavljanje"
 
 #: C/backup-restore.page:23(p)
-msgid ""
-"You can back up your Evolution data. The backup saves your settings, mail, "
-"contacts, tasks, memos and calendars. It will be stored in a gzip-compressed "
-"tar archive file."
+msgid "You can back up your Evolution data. The backup saves your settings, mail, contacts, tasks, memos and calendars. It will be stored in a gzip-compressed tar archive file."
 msgstr ""
 
 #: C/backup-restore.page:26(title)
-#, fuzzy
 msgid "Backing up"
-msgstr "Možnosti sledenja"
+msgstr "Ustvarjanje varnostnih kopij"
 
-#: C/backup-restore.page:28(gui)
-#, fuzzy
-msgid "Back up Evolution Settings..."
-msgstr "_Varnostna kopija nastavitev Evolution ..."
+#: C/backup-restore.page:28(p)
+msgid "Select <guiseq><gui>File</gui><gui>Back up Evolution Data...</gui></guiseq>."
+msgstr ""
 
 #: C/backup-restore.page:29(p)
-msgid ""
-"Choose a filename and the folder where you want to save the backup file, and "
-"click <placeholder-1/>."
+msgid "Choose a filename and the folder where you want to save the backup file, and click <gui style=\"button\">Save</gui>."
 msgstr ""
 
-#: C/backup-restore.page:30(gui) C/backup-restore.page:39(gui)
-msgid "Yes"
-msgstr "Da"
-
-#: C/backup-restore.page:30(p) C/backup-restore.page:39(p)
-msgid "You will get asked to close Evolution. Answer with <placeholder-1/>."
+#: C/backup-restore.page:30(p)
+#: C/backup-restore.page:39(p)
+msgid "You will get asked to close Evolution. Answer with <gui style=\"button\">Yes</gui>."
 msgstr ""
 
 #: C/backup-restore.page:35(title)
-#, fuzzy
 msgid "Restoring"
-msgstr "Ponavljajoče"
+msgstr "Obnavljanje"
 
-#: C/backup-restore.page:37(gui)
-#, fuzzy
-msgid "Restore Evolution Settings..."
-msgstr "O_bnovi nastavitve programa Evolution ..."
+#: C/backup-restore.page:37(p)
+msgid "Select <guiseq><gui>File</gui><gui>Restore Evolution Data...</gui></guiseq>."
+msgstr ""
 
 #: C/backup-restore.page:38(p)
-msgid "Choose the file, and click <placeholder-1/>."
+msgid "Choose the file, and click <gui style=\"button\">Open</gui>."
 msgstr ""
 
-#: C/backup-restore.page:41(link)
-#, fuzzy
-msgid "first-run assistant"
-msgstr "začeni XMLTV pomočnika ob zagonu"
-
 #: C/backup-restore.page:41(p)
-#, fuzzy
-msgid ""
-"In the <placeholder-1/>, you can restore Evolution data from a backup file."
+msgid "In the <link xref=\"intro-first-run\">first-run assistant</link>, you can restore Evolution data from a backup file."
 msgstr ""
-"Ali ste prepričani, da želite obnoviti program Evolution iz izbrane datoteke "
-"varnostne kopije?"
 
 #. Put one translator per line, in the form of NAME <EMAIL>, YEAR1, YEAR2
-#: C/backup-restore.page:0(None)
+#: C/index.page:0(None)
 msgid "translator-credits"
-msgstr "Matej Urbančič <matej.urban@svn.gnome.org>, 2010."
+msgstr "Mojca Ograjšek <mojca.ograjsek@gmail.com>, 2011."
 
 #~ msgid ""
 #~ "@@image: 'figures/evo_gwreceive_a.png'; "
@@ -12837,500 +8776,335 @@ msgstr "Matej Urbančič <matej.urban@svn.gnome.org>, 2010."
 #~ msgstr ""
 #~ "@@image: 'figures/evo_gwreceive_a.png'; "
 #~ "md5=ef64e581e652d0f03e4e6dd4a3b6d5a2"
-
 #~ msgid "@@image: 'figures/evo_mereceive_a.png'; md5=THIS FILE DOESN'T EXIST"
 #~ msgstr "@@image: 'figures/evo_mereceive_a.png'; md5=THIS FILE DOESN'T EXIST"
-
 #~ msgid ""
 #~ "@@image: 'figures/evo_exchng_mapi.png'; "
 #~ "md5=e994b432c31237e2dc8b5ffaabbd2962"
 #~ msgstr ""
 #~ "@@image: 'figures/evo_exchng_mapi.png'; "
 #~ "md5=e994b432c31237e2dc8b5ffaabbd2962"
-
 #~ msgid ""
 #~ "@@image: 'figures/evo_imapreceive_a.png'; "
 #~ "md5=abaf292ea7b663824123f1f7f171b014"
 #~ msgstr ""
 #~ "@@image: 'figures/evo_imapreceive_a.png'; "
 #~ "md5=abaf292ea7b663824123f1f7f171b014"
-
-#~ msgid ""
-#~ "@@image: 'figures/evo_popreceive_a.png'; "
-#~ "md5=a635f0e8d9bb4f0bcda34221c258f273"
-#~ msgstr ""
-#~ "@@image: 'figures/evo_popreceive_a.png'; "
-#~ "md5=a635f0e8d9bb4f0bcda34221c258f273"
-
 #~ msgid ""
 #~ "@@image: 'figures/evo_usereceive_a.png'; "
 #~ "md5=3c14cafdde81fca95d480851aee9db0f"
 #~ msgstr ""
 #~ "@@image: 'figures/evo_usereceive_a.png'; "
 #~ "md5=3c14cafdde81fca95d480851aee9db0f"
-
 #~ msgid ""
 #~ "@@image: 'figures/evo_mhreceive_a.png'; "
 #~ "md5=c7b97b4a2e9b9cf1c550244cca15a189"
 #~ msgstr ""
 #~ "@@image: 'figures/evo_mhreceive_a.png'; "
 #~ "md5=c7b97b4a2e9b9cf1c550244cca15a189"
-
 #~ msgid ""
 #~ "@@image: 'figures/evo_maildirreceive_a.png'; "
 #~ "md5=bdd9dfc00800338dc906e2fd12b07f62"
 #~ msgstr ""
 #~ "@@image: 'figures/evo_maildirreceive_a.png'; "
 #~ "md5=bdd9dfc00800338dc906e2fd12b07f62"
-
 #~ msgid ""
 #~ "@@image: 'figures/evo_mboxreceive_a.png'; "
 #~ "md5=a04753f7615eab6ac349f50caa39a7a8"
 #~ msgstr ""
 #~ "@@image: 'figures/evo_mboxreceive_a.png'; "
 #~ "md5=a04753f7615eab6ac349f50caa39a7a8"
-
 #~ msgid ""
 #~ "@@image: 'figures/evo_send_setup_a.png'; "
 #~ "md5=82760a1733ccb49ffa8424d265278b42"
 #~ msgstr ""
 #~ "@@image: 'figures/evo_send_setup_a.png'; "
 #~ "md5=82760a1733ccb49ffa8424d265278b42"
-
 #~ msgid ""
 #~ "@@image: 'figures/evo_mail_callout_a.png'; "
 #~ "md5=4fa6dda9663d554197736dd2feb79575"
 #~ msgstr ""
 #~ "@@image: 'figures/evo_mail_callout_a.png'; "
 #~ "md5=4fa6dda9663d554197736dd2feb79575"
-
 #~ msgid ""
 #~ "@@image: 'figures/evo_mail_a.png'; md5=cf315e85737412c6ee3c3202b8807701"
 #~ msgstr ""
 #~ "@@image: 'figures/evo_mail_a.png'; md5=cf315e85737412c6ee3c3202b8807701"
-
 #~ msgid ""
 #~ "@@image: 'figures/evo_cal_callout_a.png'; "
 #~ "md5=6de000ad9c7b3fe42ed1996cad46432f"
 #~ msgstr ""
 #~ "@@image: 'figures/evo_cal_callout_a.png'; "
 #~ "md5=6de000ad9c7b3fe42ed1996cad46432f"
-
 #~ msgid ""
 #~ "@@image: 'figures/contacts_mainwindow_a.png'; "
 #~ "md5=41335f17f056cb0b06e3df4900d08865"
 #~ msgstr ""
 #~ "@@image: 'figures/contacts_mainwindow_a.png'; "
 #~ "md5=41335f17f056cb0b06e3df4900d08865"
-
 #~ msgid ""
 #~ "@@image: 'figures/evo_backup_warning.png'; "
 #~ "md5=c05e6d67bae4ae0b9e7fcb9701cbdfe6"
 #~ msgstr ""
 #~ "@@image: 'figures/evo_backup_warning.png'; "
 #~ "md5=c05e6d67bae4ae0b9e7fcb9701cbdfe6"
-
 #~ msgid ""
 #~ "@@image: 'figures/evo_backup_prgsbar.png'; "
 #~ "md5=9df6295eb38525fbbfc64cb8928d7fb0"
 #~ msgstr ""
 #~ "@@image: 'figures/evo_backup_prgsbar.png'; "
 #~ "md5=9df6295eb38525fbbfc64cb8928d7fb0"
-
 #~ msgid "@@image: 'figures/evo_restore.png'; md5=THIS FILE DOESN'T EXIST"
 #~ msgstr "@@image: 'figures/evo_restore.png'; md5=THIS FILE DOESN'T EXIST"
-
-#~ msgid ""
-#~ "@@image: 'figures/evo_newmail.png'; md5=426590d03b7b0bc88b16cc61b2ec1000"
-#~ msgstr ""
-#~ "@@image: 'figures/evo_newmail.png'; md5=426590d03b7b0bc88b16cc61b2ec1000"
-
 #~ msgid ""
 #~ "@@image: 'figures/evo_mailnotification.png'; md5=THIS FILE DOESN'T EXIST"
 #~ msgstr ""
 #~ "@@image: 'figures/evo_mailnotification.png'; md5=THIS FILE DOESN'T EXIST"
-
-#~ msgid ""
-#~ "@@image: 'figures/folder_plus.png'; md5=61548b886beadeec26ef258f2cb1c2aa"
-#~ msgstr ""
-#~ "@@image: 'figures/folder_plus.png'; md5=61548b886beadeec26ef258f2cb1c2aa"
-
 #~ msgid ""
 #~ "@@image: 'figures/ver_view_a.png'; md5=f3075b70b9eebf8f2b8f3b587143ef8b"
 #~ msgstr ""
 #~ "@@image: 'figures/ver_view_a.png'; md5=f3075b70b9eebf8f2b8f3b587143ef8b"
-
 #~ msgid ""
 #~ "@@image: 'figures/evo_newmess_a.png'; md5=8d34b2fa682b559f7150e769e0079d17"
 #~ msgstr ""
 #~ "@@image: 'figures/evo_newmess_a.png'; md5=8d34b2fa682b559f7150e769e0079d17"
-
 #~ msgid "@@image: 'figures/evo_customheader.png'; md5=THIS FILE DOESN'T EXIST"
 #~ msgstr ""
 #~ "@@image: 'figures/evo_customheader.png'; md5=THIS FILE DOESN'T EXIST"
-
 #~ msgid ""
 #~ "@@image: 'figures/evo_offline.png'; md5=1efa5688aaa2aa59a37e614e32c4f7eb"
 #~ msgstr ""
 #~ "@@image: 'figures/evo_offline.png'; md5=1efa5688aaa2aa59a37e614e32c4f7eb"
-
 #~ msgid ""
 #~ "@@image: 'figures/attach_reminder_a.png'; "
 #~ "md5=e0c90f77e6df9ad52589af09fdbbfdd7"
 #~ msgstr ""
 #~ "@@image: 'figures/attach_reminder_a.png'; "
 #~ "md5=e0c90f77e6df9ad52589af09fdbbfdd7"
-
 #~ msgid ""
 #~ "@@image: 'figures/evo_attachreminder_plugin.png'; "
 #~ "md5=25f7db7cd7d310110847354c62702ecf"
 #~ msgstr ""
 #~ "@@image: 'figures/evo_attachreminder_plugin.png'; "
 #~ "md5=25f7db7cd7d310110847354c62702ecf"
-
 #~ msgid ""
 #~ "@@image: 'figures/evo_flag_follow_up_a.png'; "
 #~ "md5=6a4790a789cf4b3b8b73cb43aa8d065b"
 #~ msgstr ""
 #~ "@@image: 'figures/evo_flag_follow_up_a.png'; "
 #~ "md5=6a4790a789cf4b3b8b73cb43aa8d065b"
-
 #~ msgid ""
 #~ "@@image: 'figures/evo_adv_search_a.png'; "
 #~ "md5=676d35d686745650c9bcfa832763362c"
 #~ msgstr ""
 #~ "@@image: 'figures/evo_adv_search_a.png'; "
 #~ "md5=676d35d686745650c9bcfa832763362c"
-
 #~ msgid ""
 #~ "@@image: 'figures/evo_edit_search.png'; "
 #~ "md5=2ce150b3eb63cc4ec0f0292e13167be8"
 #~ msgstr ""
 #~ "@@image: 'figures/evo_edit_search.png'; "
 #~ "md5=2ce150b3eb63cc4ec0f0292e13167be8"
-
-#~ msgid ""
-#~ "@@image: 'figures/filter-new-fig.png'; "
-#~ "md5=75a2b8ccfe0f7a4982859827c867d578"
-#~ msgstr ""
-#~ "@@image: 'figures/filter-new-fig.png'; "
-#~ "md5=75a2b8ccfe0f7a4982859827c867d578"
-
 #~ msgid ""
 #~ "@@image: 'figures/evo_rule_a.png'; md5=5f8fb34b77c0d3abe7aff767edd53aaa"
 #~ msgstr ""
 #~ "@@image: 'figures/evo_rule_a.png'; md5=5f8fb34b77c0d3abe7aff767edd53aaa"
-
 #~ msgid ""
 #~ "@@image: 'figures/evo_contacteditor_a.png'; "
 #~ "md5=fba5d6ebd22fceb554dabb0fc8c02cd3"
 #~ msgstr ""
 #~ "@@image: 'figures/evo_contacteditor_a.png'; "
 #~ "md5=fba5d6ebd22fceb554dabb0fc8c02cd3"
-
 #~ msgid ""
 #~ "@@image: 'figures/quick_add_a.png'; md5=2a3d3007ec4cd18bb7e3a208bcbfb252"
 #~ msgstr ""
 #~ "@@image: 'figures/quick_add_a.png'; md5=2a3d3007ec4cd18bb7e3a208bcbfb252"
-
 #~ msgid ""
 #~ "@@image: 'figures/categories_a.png'; md5=362ebe93a74beec4fd820776c7f2db77"
 #~ msgstr ""
 #~ "@@image: 'figures/categories_a.png'; md5=362ebe93a74beec4fd820776c7f2db77"
-
-#~ msgid ""
-#~ "@@image: 'figures/evo_Wcal_prop_a.png'; "
-#~ "md5=dcd10f32a1ac7cbcb44d67e1a4b71a78"
-#~ msgstr ""
-#~ "@@image: 'figures/evo_Wcal_prop_a.png'; "
-#~ "md5=dcd10f32a1ac7cbcb44d67e1a4b71a78"
-
 #~ msgid ""
 #~ "@@image: 'figures/google_cal_view.png'; "
 #~ "md5=e9ad85fb604b18447bcf9be09a540989"
 #~ msgstr ""
 #~ "@@image: 'figures/google_cal_view.png'; "
 #~ "md5=e9ad85fb604b18447bcf9be09a540989"
-
 #~ msgid ""
 #~ "@@image: 'figures/evo_calender_appointmnt.png'; "
 #~ "md5=743dd472bfd9dcda1e7f8021dda97114"
 #~ msgstr ""
 #~ "@@image: 'figures/evo_calender_appointmnt.png'; "
 #~ "md5=743dd472bfd9dcda1e7f8021dda97114"
-
 #~ msgid ""
 #~ "@@image: 'figures/local_ics_calendar.png'; "
 #~ "md5=2ff81d975384c97ad1b73e8c66bc407d"
 #~ msgstr ""
 #~ "@@image: 'figures/local_ics_calendar.png'; "
 #~ "md5=2ff81d975384c97ad1b73e8c66bc407d"
-
 #~ msgid ""
 #~ "@@image: 'figures/evo_memo_a.png'; md5=29e23aefd253747b3a42f182825b75bd"
 #~ msgstr ""
 #~ "@@image: 'figures/evo_memo_a.png'; md5=29e23aefd253747b3a42f182825b75bd"
-
-#~ msgid ""
-#~ "@@image: 'figures/exchng-rec-mails.png'; "
-#~ "md5=b56dfa570c8d1c9b942c6493fd973d68"
-#~ msgstr ""
-#~ "@@image: 'figures/exchng-rec-mails.png'; "
-#~ "md5=b56dfa570c8d1c9b942c6493fd973d68"
-
-#~ msgid ""
-#~ "@@image: 'figures/exchng-rec-options.png'; "
-#~ "md5=31a2bbe7ef9de1dc79da40949e0dc7ae"
-#~ msgstr ""
-#~ "@@image: 'figures/exchng-rec-options.png'; "
-#~ "md5=31a2bbe7ef9de1dc79da40949e0dc7ae"
-
 #~ msgid ""
 #~ "@@image: 'figures/evo_send_option_a.png'; "
 #~ "md5=c1cca904625d1a7de13c851cd15235f6"
 #~ msgstr ""
 #~ "@@image: 'figures/evo_send_option_a.png'; "
 #~ "md5=c1cca904625d1a7de13c851cd15235f6"
-
 #~ msgid ""
 #~ "@@image: 'figures/delgt-add.png'; md5=9bf1f22c67551ad910cd3749f216c2b7"
 #~ msgstr ""
 #~ "@@image: 'figures/delgt-add.png'; md5=9bf1f22c67551ad910cd3749f216c2b7"
-
 #~ msgid ""
 #~ "@@image: 'figures/evo_delegate_permission_a.png'; "
 #~ "md5=05df38ad69b20f9bd7c1e14044ca10fd"
 #~ msgstr ""
 #~ "@@image: 'figures/evo_delegate_permission_a.png'; "
 #~ "md5=05df38ad69b20f9bd7c1e14044ca10fd"
-
 #~ msgid ""
 #~ "@@image: 'figures/folder_size_preference.png'; "
 #~ "md5=8d9067996afa74c865417b5b9171d4c0"
 #~ msgstr ""
 #~ "@@image: 'figures/folder_size_preference.png'; "
 #~ "md5=8d9067996afa74c865417b5b9171d4c0"
-
-#~ msgid ""
-#~ "@@image: 'figures/folder_size_mapi.png'; "
-#~ "md5=4b20ea9d82999051360f14da27e7c15d"
-#~ msgstr ""
-#~ "@@image: 'figures/folder_size_mapi.png'; "
-#~ "md5=4b20ea9d82999051360f14da27e7c15d"
-
 #~ msgid ""
 #~ "@@image: 'figures/evo_shd_memo_a.png'; "
 #~ "md5=9a72b7725da27ce1970592cff67f4bbd"
 #~ msgstr ""
 #~ "@@image: 'figures/evo_shd_memo_a.png'; "
 #~ "md5=9a72b7725da27ce1970592cff67f4bbd"
-
-#~ msgid ""
-#~ "@@image: 'figures/groupwise_resend.png'; "
-#~ "md5=697ce252ac6f3f2f4f361039818d1262"
-#~ msgstr ""
-#~ "@@image: 'figures/groupwise_resend.png'; "
-#~ "md5=697ce252ac6f3f2f4f361039818d1262"
-
 #~ msgid ""
 #~ "@@image: 'figures/groupwise_resend_retract.png'; "
 #~ "md5=4eac3186389940b8305cf676f9fc3ef4"
 #~ msgstr ""
 #~ "@@image: 'figures/groupwise_resend_retract.png'; "
 #~ "md5=4eac3186389940b8305cf676f9fc3ef4"
-
 #~ msgid ""
 #~ "@@image: 'figures/evo_gwstatustrack.png'; "
 #~ "md5=d4eb84e2d55870af1408c430ce8c0e66"
 #~ msgstr ""
 #~ "@@image: 'figures/evo_gwstatustrack.png'; "
 #~ "md5=d4eb84e2d55870af1408c430ce8c0e66"
-
 #~ msgid ""
 #~ "@@image: 'figures/evo_sendstatus_a.png'; "
 #~ "md5=36ca2211056c859eb776124bfc364705"
 #~ msgstr ""
 #~ "@@image: 'figures/evo_sendstatus_a.png'; "
 #~ "md5=36ca2211056c859eb776124bfc364705"
-
 #~ msgid ""
 #~ "@@image: 'figures/evo_calstatus_a.png'; "
 #~ "md5=99fb98faa3e644f6433c078ba71a0353"
 #~ msgstr ""
 #~ "@@image: 'figures/evo_calstatus_a.png'; "
 #~ "md5=99fb98faa3e644f6433c078ba71a0353"
-
 #~ msgid ""
 #~ "@@image: 'figures/evo_proxyadd_a.png'; "
 #~ "md5=51357617967f0610eb95dab5814540ad"
 #~ msgstr ""
 #~ "@@image: 'figures/evo_proxyadd_a.png'; "
 #~ "md5=51357617967f0610eb95dab5814540ad"
-
 #~ msgid ""
 #~ "@@image: 'figures/mailer_preferences.png'; "
 #~ "md5=d5b47aa5da56ec9b94188e0f71fc43b1"
 #~ msgstr ""
 #~ "@@image: 'figures/mailer_preferences.png'; "
 #~ "md5=d5b47aa5da56ec9b94188e0f71fc43b1"
-
 #~ msgid ""
 #~ "@@image: 'figures/evolution_contact_preference.png'; "
 #~ "md5=cfa45a42e19ea3b09587f08990cf178f"
 #~ msgstr ""
 #~ "@@image: 'figures/evolution_contact_preference.png'; "
 #~ "md5=cfa45a42e19ea3b09587f08990cf178f"
-
 #~ msgid "@@image: 'figures/evo_imapheader_a.png'; md5=THIS FILE DOESN'T EXIST"
 #~ msgstr ""
 #~ "@@image: 'figures/evo_imapheader_a.png'; md5=THIS FILE DOESN'T EXIST"
-
-#~ msgid ""
-#~ "@@image: 'figures/evo_labels_a.png'; md5=e136d81754f7c859713674c09af56ca3"
-#~ msgstr ""
-#~ "@@image: 'figures/evo_labels_a.png'; md5=e136d81754f7c859713674c09af56ca3"
-
-#~ msgid ""
-#~ "@@image: 'figures/evo_label_a.png'; md5=bc5d8fe2485b9678a4911ac6e1469dfa"
-#~ msgstr ""
-#~ "@@image: 'figures/evo_label_a.png'; md5=bc5d8fe2485b9678a4911ac6e1469dfa"
-
 #~ msgid ""
 #~ "@@image: 'figures/evolution_mail_preference.png'; "
 #~ "md5=191c1e890aa1cded550c9579d1af06e9"
 #~ msgstr ""
 #~ "@@image: 'figures/evolution_mail_preference.png'; "
 #~ "md5=191c1e890aa1cded550c9579d1af06e9"
-
-#~ msgid ""
-#~ "@@image: 'figures/evo_junk_a.png'; md5=635a83cb310a374a041da9e5dad017c9"
-#~ msgstr ""
-#~ "@@image: 'figures/evo_junk_a.png'; md5=635a83cb310a374a041da9e5dad017c9"
-
 #~ msgid ""
 #~ "@@image: 'figures/evo_caltasks_a.png'; "
 #~ "md5=88a894d8414c9205da0a6bab34de018c"
 #~ msgstr ""
 #~ "@@image: 'figures/evo_caltasks_a.png'; "
 #~ "md5=88a894d8414c9205da0a6bab34de018c"
-
 #~ msgid "@@image: 'figures/network_pref.png'; md5=THIS FILE DOESN'T EXIST"
 #~ msgstr "@@image: 'figures/network_pref.png'; md5=THIS FILE DOESN'T EXIST"
-
 #~ msgid ""
 #~ "@@image: 'figures/quick_reference.png'; "
 #~ "md5=86fe7457150de2e7efe735c10cd324f5"
 #~ msgstr ""
 #~ "@@image: 'figures/quick_reference.png'; "
 #~ "md5=86fe7457150de2e7efe735c10cd324f5"
-
 #~ msgid "2002-2009"
 #~ msgstr "2002-2009"
-
 #~ msgid "2.30"
 #~ msgstr "2.30"
-
 #~ msgid "September 2009"
 #~ msgstr "september 2009"
-
 #~ msgid "2.28"
 #~ msgstr "2.28"
-
 #~ msgid "2.26"
 #~ msgstr "2.26"
-
 #~ msgid "March 2009"
 #~ msgstr "marec 2009"
-
 #~ msgid "2.12"
 #~ msgstr "2.12"
-
 #~ msgid "September 2007"
 #~ msgstr "september 2009"
-
 #~ msgid "2.10"
 #~ msgstr "2.10"
-
 #~ msgid "November 20, 2006"
 #~ msgstr "20. november 2006"
-
 #~ msgid "2.8"
 #~ msgstr "2.8"
-
 #~ msgid "October 5, 2006"
 #~ msgstr "5. oktober 2006"
-
 #~ msgid "February 2008"
 #~ msgstr "februar 2008"
-
 #~ msgid "Evolution 2.30 User Guide"
 #~ msgstr "Uporabniški priročnik za Evolution 2.30"
-
 #~ msgid "About This Guide"
 #~ msgstr "O priročniku"
 
 #, fuzzy
 #~ msgid "Organizing Your Email"
 #~ msgstr "<b>Vaš _elektronski naslov:</b>"
-
 #~ msgid "Evolution Contacts: the Address Book"
 #~ msgstr "Stiki programa Evolution: imenik"
-
 #~ msgid "Advanced Configuration"
 #~ msgstr "Napredne nastavitve"
-
 #~ msgid "Synchronizing Your Handheld Device"
 #~ msgstr "Usklajevanje ročnih naprav"
-
-#~ msgid "Quick Reference"
-#~ msgstr "Hitri priročnik"
-
 #~ msgid "Known Bugs and Limitations"
 #~ msgstr "Obstoječi hrošči in omejitve programa"
-
 #~ msgid "Authors"
 #~ msgstr "Avtorji"
-
 #~ msgid "Glossary"
 #~ msgstr "Slovar"
-
 #~ msgid "Additional Documentation:"
 #~ msgstr "Dodatna dokumentacija:"
-
 #~ msgid "Using Evolution: An Overview"
 #~ msgstr "Uporaba programa Evolution: splošni pregled"
-
-#~ msgid "Start the Evolution client."
-#~ msgstr "Zagon odjemalca Evolution."
-
 #~ msgid "GNOME:"
 #~ msgstr "GNOME:"
-
 #~ msgid "KDE:"
 #~ msgstr "KDE:"
-
 #~ msgid "Command Line:"
 #~ msgstr "Ukazna vrstica:"
-
 #~ msgid "Enter <command>evolution</command>."
 #~ msgstr "Vnos ukaza <command>evolution</command>."
 
+#, fuzzy
+#~ msgid "Using the First-Run Assistant"
+#~ msgstr "začeni XMLTV pomočnika ob zagonu"
 #~ msgid "Defining Your Identity"
 #~ msgstr "Določevanje istovetnosti"
-
 #~ msgid "Receiving Mail"
 #~ msgstr "Prejemanje pošte"
 
-#~ msgid "Sending Mail"
-#~ msgstr "Pošiljanje pošte"
-
-#~ msgid "Time Zone"
-#~ msgstr "Časovni pas"
-
-#, fuzzy
-#~ msgid "Type your full name in the Full Name field."
-#~ msgstr "Vnesite vaše geslo v polje <b>Novo geslo</b>."
-
 #, fuzzy
 #~ msgid "Click Forward."
 #~ msgstr "Posreduj _URI:"
@@ -13338,25 +9112,14 @@ msgstr "Matej Urbančič <matej.urban@svn.gnome.org>, 2010."
 #, fuzzy
 #~ msgid "Select a server type in the Server Type list."
 #~ msgstr "Nepravilna vrsta elementa seznama v %s"
-
-#~ msgid "Novell GroupWise:"
-#~ msgstr "Novell GroupWise:"
-
 #~ msgid "MAPI Exchange:"
 #~ msgstr "Exchange MAPI:"
-
 #~ msgid "IMAP:"
 #~ msgstr "IMAP:"
-
 #~ msgid "POP:"
 #~ msgstr "POP:"
-
 #~ msgid "USENET News:"
 #~ msgstr "USENET novičke:"
-
-#~ msgid "Local Delivery:"
-#~ msgstr "Krajevna dostava:"
-
 #~ msgid "None:"
 #~ msgstr "Brez:"
 
@@ -13365,10 +9128,18 @@ msgstr "Matej Urbančič <matej.urban@svn.gnome.org>, 2010."
 #~ msgstr "Nastavljanje daljinskega upravljalnika je spodletelo"
 
 #, fuzzy
+#~ msgid "or"
+#~ msgstr "ali"
+
+#, fuzzy
 #~ msgid "Local Configuration Options"
 #~ msgstr "Naprej - Nastavitev prejemanja"
 
 #, fuzzy
+#~ msgid "Check for new messages every x minutes"
+#~ msgstr "Med novimi sporočili preveri za neželeno pošto"
+
+#, fuzzy
 #~ msgid "Global Catalog server name"
 #~ msgstr "Ime strežnika s _Splošnim katalogom"
 
@@ -13377,64 +9148,53 @@ msgstr "Matej Urbančič <matej.urban@svn.gnome.org>, 2010."
 #~ msgstr "Omejitev števi_la odgovorov GAL: %s"
 
 #, fuzzy
-#~ msgid "Automatically synchronize account locally"
-#~ msgstr "Samodejno _uskladi krajevni račun"
+#~ msgid "Apply filters to new messages in Inbox on this server"
+#~ msgstr ""
+#~ "Uvelj_avi filtre na novih sporočilih v mapi dohodne pošta na tem strežniku"
 
 #, fuzzy
 #~ msgid "Check new messages for Junk contents"
 #~ msgstr "Med novimi sporočili preveri za neželeno pošto"
-
-#, fuzzy
-#~ msgid "Select a server type from the Server Type list."
-#~ msgstr "Izberite vstavek s seznama"
-
 #~ msgid "Sendmail:"
 #~ msgstr "Program sendmail:"
-
 #~ msgid "SMTP:"
 #~ msgstr "SMTP:"
-
 #~ msgid "SMTP Configuration"
 #~ msgstr "Nastavitev SMTP"
 
 #, fuzzy
 #~ msgid "Click OK, then click Apply."
 #~ msgstr "Klikni \"V redu\" za zaključek."
-
 #~ msgid "Menu Bar:"
 #~ msgstr "Menijska vrstica:"
-
 #~ msgid "Toolbar:"
 #~ msgstr "Orodna vrstica:"
-
 #~ msgid "Search Tool:"
 #~ msgstr "Orodje za iskanje:"
 
 #, fuzzy
 #~ msgid "Side Bar:"
 #~ msgstr "Stranska v_rstica"
-
 #~ msgid "Status Bar:"
 #~ msgstr "Vrstica stanja:"
-
 #~ msgid "The Menu Bar"
 #~ msgstr "Menijska vrstica"
-
+#~ msgid "File:"
+#~ msgstr "Datoteka:"
 #~ msgid "Edit:"
 #~ msgstr "Uredi:"
-
 #~ msgid "View:"
 #~ msgstr "Pogled: "
-
+#~ msgid "Folder:"
+#~ msgstr "Mapa:"
 #~ msgid "Message:"
 #~ msgstr "Sporočilo:"
-
+#~ msgid "Search:"
+#~ msgstr "Iskanje:"
 #~ msgid "Help:"
 #~ msgstr "Pomoč:"
-
 #~ msgid "Opens the Evolution help files."
 #~ msgstr "Odpre datoteke pomoči programa Evolution."
-
 #~ msgid "The Sidebar"
 #~ msgstr "Bočno okno"
 
@@ -13443,99 +9203,68 @@ msgstr "Matej Urbančič <matej.urban@svn.gnome.org>, 2010."
 #~ msgstr "Ustvari novo prazno mapo"
 
 #, fuzzy
-#~ msgid "Click OK."
-#~ msgstr "Klikni \"V redu\" za zaključek."
-
+#~ msgid "Type the name of the folder in the Folder Name field."
+#~ msgstr "Vnesite vaše geslo v polje <b>Novo geslo</b>."
 #~ msgid "Shows only the icons."
 #~ msgstr "Pokaže le ikone"
 
-#~ msgid "Texts Only:"
-#~ msgstr "Le besedilo:"
-
-#~ msgid "Toolbar Style:"
-#~ msgstr "Slog orodne vrstice:"
-
 #, fuzzy
 #~ msgid "Shows buttons using the desktop toolbar settings."
 #~ msgstr "Pokaži gumbe okna z uporabo nastavitev orodnih vrstic namizja"
-
-#~ msgid "Hide Buttons:"
-#~ msgstr "Gumbi za skrivanje:"
-
 #~ msgid "Copy:"
 #~ msgstr "Kopiraj:"
-
 #~ msgid "Move:"
 #~ msgstr "Premakni:"
 
 #, fuzzy
 #~ msgid "Mark Messages As Read:"
 #~ msgstr "_Označi sporočila kot prebrana po"
+#~ msgid "New Folder:"
+#~ msgstr "Nova mapa:"
 
 #, fuzzy
 #~ msgid "Deletes the folder and all its contents."
 #~ msgstr "Ali želite izbrisati mapo \"{0}\" in vse njene podmape?"
-
 #~ msgid "Rename:"
 #~ msgstr "Preimenuj:"
-
-#, fuzzy
-#~ msgid "Lets you change the name of the folder."
-#~ msgstr "To iskalno mapo morate poimenovati."
-
 #~ msgid "Disable:"
 #~ msgstr "Onemogoči:"
-
 #~ msgid "Disables the account."
 #~ msgstr "Onemogoči račun"
-
+#~ msgid "Properties:"
+#~ msgstr "Lastnosti:"
 #~ msgid "The Calendar"
 #~ msgstr "Koledar"
-
-#~ msgid "Task List:"
-#~ msgstr "Seznam nalog:"
-
 #~ msgid "The Contacts"
 #~ msgstr "Stiki"
-
-#, fuzzy
-#~ msgid "Backing Up and Restoring Evolution"
-#~ msgstr "Varnostno kopiranje računov in nastavitev"
-
 #~ msgid "Command Line Options"
 #~ msgstr "Možnosti ukazne vrstice"
-
 #~ msgid "Command"
 #~ msgstr "Ukaz"
-
 #~ msgid "evolution --offline"
 #~ msgstr "evolution --offline"
 
 #, fuzzy
 #~ msgid "Starts Evolution in offline mode."
 #~ msgstr "Ni na voljo v načinu brez povezave"
-
 #~ msgid "evolution --disable-preview"
 #~ msgstr "evolution --disable-preview"
-
 #~ msgid "evolution -c mail"
 #~ msgstr "evolution -c mail"
-
 #~ msgid "evolution -c calendar"
 #~ msgstr "evolution -c calendar"
-
 #~ msgid "evolution -c contacts"
 #~ msgstr "evolution -c contacts"
-
+#~ msgid "evolution --force-shutdown"
+#~ msgstr "evolution --force-shutdown"
 #~ msgid "evolution <quote>%s</quote>"
 #~ msgstr "evolution <quote>%s</quote>"
-
 #~ msgid "Reading Mail"
 #~ msgstr "Branje elektronske poštne"
-
-#, fuzzy
-#~ msgid "Composing New Email Messages"
-#~ msgstr "Preverjanje novih sporočil"
+#~ msgid "Templates"
+#~ msgstr "Predloge"
+#~ msgid "Encryption"
+#~ msgstr "Šifriranje"
 
 #, fuzzy
 #~ msgid "To enable Magic Spacebar:"
@@ -13582,12 +9311,12 @@ msgstr "Matej Urbančič <matej.urban@svn.gnome.org>, 2010."
 #~ msgstr "Položaj navpičnega pladnja v mesečnem pogledu"
 
 #, fuzzy
-#~ msgid "Select Edit &gt; Preferences."
-#~ msgstr "Urejanje nastavitev predvajalnika glasbe"
+#~ msgid "Classical View:"
+#~ msgstr "Brez pogleda"
 
 #, fuzzy
-#~ msgid "Select Mail Preferences."
-#~ msgstr "<b>Splošne možnosti Valgrind</b>"
+#~ msgid "Select Edit &gt; Preferences."
+#~ msgstr "Urejanje nastavitev predvajalnika glasbe"
 
 #, fuzzy
 #~ msgid "In Evolution:"
@@ -13610,22 +9339,10 @@ msgstr "Matej Urbančič <matej.urban@svn.gnome.org>, 2010."
 #~ msgstr "Želi prejemati pošto _HTML"
 
 #, fuzzy
-#~ msgid "Click Close."
-#~ msgstr "Zapri zavihek"
-
-#, fuzzy
-#~ msgid "Click Folder &gt; Subscriptions."
-#~ msgstr "<kliknite tukaj za izbiro mape>"
-
-#, fuzzy
 #~ msgid "Choosing Recipients Quickly"
 #~ msgstr "Hitro odpiranje dokumentov"
 
 #, fuzzy
-#~ msgid "Mail Send Options"
-#~ msgstr "Vstavi možnosti pošiljanja"
-
-#, fuzzy
 #~ msgid "Forwarding Mail"
 #~ msgstr "Preveri pošto"
 
@@ -13637,11 +9354,6 @@ msgstr "Matej Urbančič <matej.urban@svn.gnome.org>, 2010."
 #~ msgid "Select Edit &gt; Plugins."
 #~ msgstr "Izberite program za urejanje videov"
 
-#~ msgid "Click Copy Folder Content Locally for Offline Operation."
-#~ msgstr ""
-#~ "Kliknite možnost kopiranja vsebine mape v krajevno mapo za opravila brez "
-#~ "povezave."
-
 #, fuzzy
 #~ msgid "Or"
 #~ msgstr "Ali"
@@ -13657,34 +9369,28 @@ msgstr "Matej Urbančič <matej.urban@svn.gnome.org>, 2010."
 #, fuzzy
 #~ msgid "Complete the rest of your message."
 #~ msgstr "Vnesite svoje kratko sporočilo"
-
-#, fuzzy
-#~ msgid "Click Send."
-#~ msgstr "_Vseeno pošlji"
-
 #~ msgid "Tools"
 #~ msgstr "Orodja"
 
 #, fuzzy
 #~ msgid "Shortcuts"
 #~ msgstr "Tipkovne bližnjice"
-
-#~ msgid "Ctrl+R"
-#~ msgstr "Ctrl+R"
-
 #~ msgid "Clrl+L"
 #~ msgstr "Clrl+L"
 
 #, fuzzy
 #~ msgid "Shift+Ctrl+R"
 #~ msgstr "Preobrni [Ctrl+I]"
-
 #~ msgid "Ctrl+F"
 #~ msgstr "Ctrl+F"
+#~ msgid "Find:"
+#~ msgstr "Najdi:"
 
 #, fuzzy
 #~ msgid "Find Regex:"
 #~ msgstr "Poišči besedilo primerljivo z logičnim izrazom"
+#~ msgid "Replace:"
+#~ msgstr "Zamenjaj:"
 
 #, fuzzy
 #~ msgid "Basic HTML Formatting"
@@ -13694,13 +9400,6 @@ msgstr "Matej Urbančič <matej.urban@svn.gnome.org>, 2010."
 #~ msgid "Type the URL in the URL field."
 #~ msgstr "Neveljavno polje v ukazu"
 
-#~ msgid "Select Shade if necessary."
-#~ msgstr "Po želji izberite tudi senčenje."
-
-#, fuzzy
-#~ msgid "Read Receipts:"
-#~ msgstr "Prejemniki sporočila"
-
 #, fuzzy
 #~ msgid "To change your default settings,"
 #~ msgstr "Kliknite <b>Spremeni geslo</b> za spremembo gesla."
@@ -13734,7 +9433,6 @@ msgstr "Matej Urbančič <matej.urban@svn.gnome.org>, 2010."
 #, fuzzy
 #~ msgid "Select Folder &gt; Subscriptions."
 #~ msgstr "Izbor mape za dodajanje"
-
 #~ msgid "GPG Encryption"
 #~ msgstr "Šifriranje GPG"
 
@@ -13747,10 +9445,6 @@ msgstr "Matej Urbančič <matej.urban@svn.gnome.org>, 2010."
 #~ msgstr "ID šifrirnega ključa podatkovne zbirke"
 
 #, fuzzy
-#~ msgid "Click the Security tab."
-#~ msgstr "Premakni na zavihek"
-
-#, fuzzy
 #~ msgid "To encrypt a single message:"
 #~ msgstr "Pošlji novo _sporočilo osebi ..."
 
@@ -13763,10 +9457,6 @@ msgstr "Matej Urbančič <matej.urban@svn.gnome.org>, 2010."
 #~ msgstr "Sestavi _elektronsko sporočilo\t"
 
 #, fuzzy
-#~ msgid "Select Always Sign Outgoing Messages When Using This Account."
-#~ msgstr "Ob uporabi tega računa _vedno podpiši odhodno pošto"
-
-#, fuzzy
 #~ msgid "Click Certificates."
 #~ msgstr "Upravljanje s potrdili"
 
@@ -13790,13 +9480,6 @@ msgstr "Matej Urbančič <matej.urban@svn.gnome.org>, 2010."
 #~ msgid "Stopping Junk Mail (Spam)"
 #~ msgstr "V dohodni pošti preveri neželeno"
 
-#~ msgid "vCalendar:"
-#~ msgstr "vCalendar:"
-
-#, fuzzy
-#~ msgid "LDAP Data Interchange Format (.LDIF):"
-#~ msgstr "Zapis za imenjavo podatkov LDAP (.ldif)"
-
 #, fuzzy
 #~ msgid "Click File &gt; Import."
 #~ msgstr "Uvozi zaznamke iz datoteke"
@@ -13805,9 +9488,9 @@ msgstr "Matej Urbančič <matej.urban@svn.gnome.org>, 2010."
 #~ msgid "Importing Multiple Files"
 #~ msgstr "Šifriranje več datotek"
 
-#~ msgid "Sort by:"
-#~ msgstr "Razvrsti po:"
-
+#, fuzzy
+#~ msgid "Right-click message header bar."
+#~ msgstr "Dejanje ob desnem kliku na nazivno vrstico okna"
 #~ msgid "Score"
 #~ msgstr "Rezultat"
 
@@ -13828,10 +9511,6 @@ msgstr "Matej Urbančič <matej.urban@svn.gnome.org>, 2010."
 #~ msgstr "Zastavica za navezavo"
 
 #, fuzzy
-#~ msgid "Click Mark for Follow Up."
-#~ msgstr "Označi izbrana sporočila za navezavo"
-
-#, fuzzy
 #~ msgid "Selecting the messages."
 #~ msgstr "Sporočila dnevnika:"
 
@@ -13854,29 +9533,26 @@ msgstr "Matej Urbančič <matej.urban@svn.gnome.org>, 2010."
 #, fuzzy
 #~ msgid "Select the search criteria from the list:"
 #~ msgstr "Izberite možnost iskanja iz spustnega seznama."
-
 #~ msgid "All Messages"
 #~ msgstr "Vsa sporočila"
-
 #~ msgid "Unread Messages"
 #~ msgstr "Neprebrana sporočila"
-
-#~ msgid "No Label"
-#~ msgstr "Brez oznake"
-
+#~ msgid "Important"
+#~ msgstr "Pomembno"
 #~ msgid "Work"
 #~ msgstr "Služba"
-
 #~ msgid "Personal"
 #~ msgstr "Osebno"
-
 #~ msgid "To do"
 #~ msgstr "Opravila"
-
 #~ msgid "Later"
 #~ msgstr "Kasneje"
 
 #, fuzzy
+#~ msgid "Read Messages"
+#~ msgstr "Prebrana sporočila"
+
+#, fuzzy
 #~ msgid "Recent Messages"
 #~ msgstr "Nedavna sporočila"
 
@@ -13885,10 +9561,6 @@ msgstr "Matej Urbančič <matej.urban@svn.gnome.org>, 2010."
 #~ msgstr "Sporočila zadnjih 5 dni"
 
 #, fuzzy
-#~ msgid "Important Messages"
-#~ msgstr "Pomembna sporočila"
-
-#, fuzzy
 #~ msgid "Messages Not Junk"
 #~ msgstr "Sporočila, ki niso neželena"
 
@@ -13905,37 +9577,22 @@ msgstr "Matej Urbančič <matej.urban@svn.gnome.org>, 2010."
 #~ msgstr "Prejemniki vsebujejo"
 
 #, fuzzy
-#~ msgid "Message Contains:"
-#~ msgstr "Sporočilo vsebuje"
-
-#, fuzzy
 #~ msgid "Subject Contain:"
 #~ msgstr "Zadeva ali pošiljatelj vsebuje niz"
 
 #, fuzzy
 #~ msgid "Sender Contain:"
 #~ msgstr "ne vsebuje"
-
 #~ msgid "Body Contains:"
 #~ msgstr "Telo vsebuje:"
-
 #~ msgid "Current Folder"
 #~ msgstr "Trenutna mapa"
-
 #~ msgid "All Accounts"
 #~ msgstr "Vsi računi"
-
 #~ msgid "Current Message"
 #~ msgstr "Trenutno sporočilo"
 
 #, fuzzy
-#~ msgid "Select the Search menu."
-#~ msgstr "Izberi možnost iskanja \"%s\""
-
-#~ msgid "Save Search:"
-#~ msgstr "Shrani iskanje:"
-
-#, fuzzy
 #~ msgid "Select Search from the menu bar."
 #~ msgstr "Izberite paket in dejanje z menija 'Paket'"
 
@@ -13948,18 +9605,6 @@ msgstr "Matej Urbančič <matej.urban@svn.gnome.org>, 2010."
 #~ msgstr "Prejemnik:"
 
 #, fuzzy
-#~ msgid "Date Sent:"
-#~ msgstr "Datum pošiljanja"
-
-#, fuzzy
-#~ msgid "Date Received:"
-#~ msgstr "Sprejeto dne"
-
-#, fuzzy
-#~ msgid "Size:"
-#~ msgstr "Velikost:"
-
-#, fuzzy
 #~ msgid "Flagged:"
 #~ msgstr "Označeno"
 
@@ -13988,30 +9633,14 @@ msgstr "Matej Urbančič <matej.urban@svn.gnome.org>, 2010."
 #~ msgstr "Dopisni seznam:"
 
 #, fuzzy
-#~ msgid "Match all:"
-#~ msgstr "Ustrezaj vsem"
-
-#, fuzzy
 #~ msgid "Contacts and Cards"
 #~ msgstr "Stiki in dejanja Claws Mail"
 
 #, fuzzy
-#~ msgid "The Contact Editor"
-#~ msgstr "Urejevalnik stikov"
-
-#, fuzzy
 #~ msgid "Contact:"
 #~ msgstr "Stik"
 
 #, fuzzy
-#~ msgid "Contains basic contact information."
-#~ msgstr "<span weight=\"bold\">Podrobnosti stika</span>"
-
-#, fuzzy
-#~ msgid "Personal Information:"
-#~ msgstr "Osebni podatki"
-
-#, fuzzy
 #~ msgid "Mailing Address:"
 #~ msgstr "Poštni naslov"
 
@@ -14020,8 +9649,8 @@ msgstr "Matej Urbančič <matej.urban@svn.gnome.org>, 2010."
 #~ msgstr "Polno Ime"
 
 #, fuzzy
-#~ msgid "Categories:"
-#~ msgstr "Kategorije:"
+#~ msgid "Where:"
+#~ msgstr "_Kje:"
 
 #, fuzzy
 #~ msgid "Free/Busy and Calendar URLs:"
@@ -14036,10 +9665,6 @@ msgstr "Matej Urbančič <matej.urban@svn.gnome.org>, 2010."
 #~ msgstr "Google stiki"
 
 #, fuzzy
-#~ msgid "Mark as default address book:"
-#~ msgstr "Označi kot _privzeti imenik"
-
-#, fuzzy
 #~ msgid "Copy book content locally for offline operations:"
 #~ msgstr "Vsebino _knjige kopiraj lokalno za delo brez povezave"
 
@@ -14224,10 +9849,6 @@ msgstr "Matej Urbančič <matej.urban@svn.gnome.org>, 2010."
 #~ msgstr "Opomniki"
 
 #, fuzzy
-#~ msgid "Configuring Time Zones"
-#~ msgstr "Avtor/datum-čas"
-
-#, fuzzy
 #~ msgid "Calendar View"
 #~ msgstr "pogled koledarja"
 
@@ -14260,6 +9881,10 @@ msgstr "Matej Urbančič <matej.urban@svn.gnome.org>, 2010."
 #~ msgstr "Nadzor"
 
 #, fuzzy
+#~ msgid "List"
+#~ msgstr "Seznam"
+
+#, fuzzy
 #~ msgid "control+l"
 #~ msgstr "Nadzor"
 
@@ -14268,6 +9893,10 @@ msgstr "Matej Urbančič <matej.urban@svn.gnome.org>, 2010."
 #~ msgstr "Lastnosti koledarja"
 
 #, fuzzy
+#~ msgid "Select the color and click OK."
+#~ msgstr "Izberite jezik in kliknite na prijavo"
+
+#, fuzzy
 #~ msgid "To integrate the Google calendar to Evolution:"
 #~ msgstr "Dodajanje Google koledarjev Evolution."
 
@@ -14292,6 +9921,10 @@ msgstr "Matej Urbančič <matej.urban@svn.gnome.org>, 2010."
 #~ msgstr "Za povpraševanje po velikosti mora biti naveden vzorec ključa\n"
 
 #, fuzzy
+#~ msgid "All Day Event"
+#~ msgstr "Celo_dnevni dogodek"
+
+#, fuzzy
 #~ msgid "Display:"
 #~ msgstr "Zaslon:"
 
@@ -14312,8 +9945,16 @@ msgstr "Matej Urbančič <matej.urban@svn.gnome.org>, 2010."
 #~ msgstr "Izbor dokumenta za pregledovanje in urejanje opomb"
 
 #, fuzzy
-#~ msgid "Type your username and password."
-#~ msgstr "Prijavite se z uporabniškim imenom in geslom:"
+#~ msgid "Accept"
+#~ msgstr "Sprejmi"
+
+#, fuzzy
+#~ msgid "Tentatively Accept"
+#~ msgstr "Poskusno sprejmi"
+
+#, fuzzy
+#~ msgid "Decline"
+#~ msgstr "Odkloni"
 
 #, fuzzy
 #~ msgid "Summary contains"
@@ -14336,18 +9977,14 @@ msgstr "Matej Urbančič <matej.urban@svn.gnome.org>, 2010."
 #~ msgstr "katerakoli kategorija"
 
 #, fuzzy
-#~ msgid "Active Appointments"
-#~ msgstr "Dejavni sestanki"
+#~ msgid "Unmatched"
+#~ msgstr "Brez zadetka"
 
 #, fuzzy
 #~ msgid "Next 7 Days' Appointments"
 #~ msgstr "Sestanki naslednjih 7 dni"
 
 #, fuzzy
-#~ msgid "Click Delegate Meeting."
-#~ msgstr "Zahtevek za posodobitev srečanja"
-
-#, fuzzy
 #~ msgid "Select customize options."
 #~ msgstr "Izberi napredne možnosti"
 
@@ -14380,10 +10017,6 @@ msgstr "Matej Urbančič <matej.urban@svn.gnome.org>, 2010."
 #~ msgstr "Barva današnjih nalog"
 
 #, fuzzy
-#~ msgid "Completed Tasks:"
-#~ msgstr "Končane naloge"
-
-#, fuzzy
 #~ msgid "Tasks With Attachment:"
 #~ msgstr "Naloge s prilogami"
 
@@ -14428,14 +10061,6 @@ msgstr "Matej Urbančič <matej.urban@svn.gnome.org>, 2010."
 #~ msgstr "Ni mogoče ustvariti nove mape `%s': %s"
 
 #, fuzzy
-#~ msgid "The Memo List"
-#~ msgstr "Seznam opomnikov"
-
-#, fuzzy
-#~ msgid "To create a new memo list:"
-#~ msgstr "Ni mogoče ustvariti nove mape `%s': %s"
-
-#, fuzzy
 #~ msgid "Select a city, then click OK."
 #~ msgstr "Skript: izberite objekte in kliknite na ozadje"
 
@@ -14496,18 +10121,6 @@ msgstr "Matej Urbančič <matej.urban@svn.gnome.org>, 2010."
 #~ msgstr "Nastavitev Evolution Connector za Microsoft Exchange"
 
 #, fuzzy
-#~ msgid "Creating a New Exchange Account"
-#~ msgstr "Exchange račun za %s na %s"
-
-#, fuzzy
-#~ msgid "Click the Identity tab."
-#~ msgstr "Premakni na zavihek"
-
-#, fuzzy
-#~ msgid "Click the Receiving Options tab."
-#~ msgstr "Desno kliknite na skupino za prikaz možnosti"
-
-#, fuzzy
 #~ msgid "Access Delegation"
 #~ msgstr "Pomočnik pooblaščanja"
 
@@ -14584,13 +10197,16 @@ msgstr "Matej Urbančič <matej.urban@svn.gnome.org>, 2010."
 #~ msgstr "Trenutno je vaše stanje \"Izven pisarne\""
 
 #, fuzzy
+#~ msgid "Global Address List"
+#~ msgstr "Splošni seznam naslovov"
+
+#, fuzzy
 #~ msgid "Chair Persons"
 #~ msgstr "Predsedujoči"
 
 #, fuzzy
 #~ msgid "Required Participants"
 #~ msgstr "Obvezno udeleženi"
-
 #~ msgid "Optional Participants"
 #~ msgstr "Neobvezno udeleženi"
 
@@ -14617,10 +10233,8 @@ msgstr "Matej Urbančič <matej.urban@svn.gnome.org>, 2010."
 #, fuzzy
 #~ msgid "Reminder Note"
 #~ msgstr "Beležnica"
-
 #~ msgid "Archive"
 #~ msgstr "Arhiv"
-
 #~ msgid "GroupWise"
 #~ msgstr "GroupWise"
 
@@ -14641,30 +10255,14 @@ msgstr "Matej Urbančič <matej.urban@svn.gnome.org>, 2010."
 #~ msgstr "Neimenovano sporočilo"
 
 #, fuzzy
-#~ msgid "None; use a message"
-#~ msgstr "Uporabi prejšnje sporočilo"
-
-#, fuzzy
 #~ msgid "Checklist"
 #~ msgstr "Nadzorni seznam"
 
 #, fuzzy
-#~ msgid "Creating a New GroupWise Account"
-#~ msgstr "Ne, ustvariti želim nov račun"
-
-#, fuzzy
-#~ msgid "Reminder Notes"
-#~ msgstr "Opombe opomnika"
-
-#, fuzzy
 #~ msgid "Click Save."
 #~ msgstr "Shrani _kot ..."
 
 #, fuzzy
-#~ msgid "Resending a GroupWise Meeting Request"
-#~ msgstr "Ustvari nov zahtevek za srečanje"
-
-#, fuzzy
 #~ msgid "Track an Item You Sent:"
 #~ msgstr "Ustvari poslani predm_et za sledenje podatkov"
 
@@ -14689,14 +10287,6 @@ msgstr "Matej Urbančič <matej.urban@svn.gnome.org>, 2010."
 #~ msgstr "_Ko ustreza"
 
 #, fuzzy
-#~ msgid "Within days:"
-#~ msgstr "Delovni dnevi"
-
-#, fuzzy
-#~ msgid "Setting Message Delivery Options"
-#~ msgstr "Zahtevaj povratnico ob _prejemu sporočila"
-
-#, fuzzy
 #~ msgid "Click Delay message delivery."
 #~ msgstr "Zahtevaj povratnico ob _prejemu sporočila"
 
@@ -14707,17 +10297,14 @@ msgstr "Matej Urbančič <matej.urban@svn.gnome.org>, 2010."
 #, fuzzy
 #~ msgid "Marking an Item Private"
 #~ msgstr "Skrij osebne atribute"
-
 #~ msgid "Permission:"
 #~ msgstr "Dovoljenje:"
 
 #, fuzzy
 #~ msgid "Allows your proxy to do:"
 #~ msgstr "Ali želite shraniti spremembe?"
-
 #~ msgid "Read"
 #~ msgstr "Branje"
-
 #~ msgid "Write"
 #~ msgstr "Pisanje"
 
@@ -14752,66 +10339,36 @@ msgstr "Matej Urbančič <matej.urban@svn.gnome.org>, 2010."
 #~ msgstr "Klikni \"V redu\" za zaključek."
 
 #, fuzzy
+#~ msgid "Composer Preferences"
+#~ msgstr "Možnosti sestavljalnika"
+
+#, fuzzy
 #~ msgid "Calendar and Tasks Settings"
 #~ msgstr "Upravljanje z nastavitvami"
-
+#~ msgid "Certificates"
+#~ msgstr "Potrdila"
 #~ msgid "Debug Logs"
 #~ msgstr "Dnevniki razhroščevanja"
 
 #, fuzzy
-#~ msgid "Mail Accounts:"
-#~ msgstr "Poštni računi"
-
-#, fuzzy
 #~ msgid "Autocompletion:"
 #~ msgstr "Samodejno dopolnjevanje"
-
 #~ msgid "Mail Preferences:"
 #~ msgstr "Možnosti pošte:"
-
 #~ msgid "Composer Preferences:"
 #~ msgstr "Možnosti sestavljalnika:"
-
 #~ msgid "Calendar and Tasks:"
 #~ msgstr "Koledar in naloge:"
-
 #~ msgid "Certificates:"
 #~ msgstr "Potrdila:"
-
-#~ msgid "Identity:"
-#~ msgstr "Istovetnost:"
-
-#~ msgid "Receiving Email:"
-#~ msgstr "Sprejemanje pošte:"
-
-#~ msgid "Receiving Options:"
-#~ msgstr "Nastavitve prejemanja:"
-
 #~ msgid "Sending Mail:"
 #~ msgstr "Pošiljanje pošte:"
 
-#~ msgid "Defaults:"
-#~ msgstr "Privzeto:"
-
-#~ msgid "Security:"
-#~ msgstr "Varnost:"
-
 #, fuzzy
 #~ msgid "Proxy:"
 #~ msgstr "Posredovalni strežnik"
 
 #, fuzzy
-#~ msgid "IMAP Mail Headers"
-#~ msgstr "Preglednica glav pošte"
-
-#~ msgid "All Headers:"
-#~ msgstr "Vse glave sporočil:"
-
-#, fuzzy
-#~ msgid "Mailing List Headers:"
-#~ msgstr "Seznam glav sporočil po meri"
-
-#, fuzzy
 #~ msgid "Click Basic Headers to download basic headers."
 #~ msgstr "Glave stolpcev se odzivajo na dogodke klikov"
 
@@ -14838,10 +10395,8 @@ msgstr "Matej Urbančič <matej.urban@svn.gnome.org>, 2010."
 #, fuzzy
 #~ msgid "Calendar and Tasks Preferences"
 #~ msgstr "Upravljanje z nastavitvami"
-
 #~ msgid "Message Fonts:"
 #~ msgstr "Pisava sporočila:"
-
 #~ msgid "Message Display:"
 #~ msgstr "Prikaz sporočil:"
 
@@ -14858,21 +10413,12 @@ msgstr "Matej Urbančič <matej.urban@svn.gnome.org>, 2010."
 #~ msgstr "Pokaži animacije slik"
 
 #, fuzzy
-#~ msgid "Loading Images:"
-#~ msgstr "Nalaganje slik"
-
-#, fuzzy
 #~ msgid "To create a label:"
 #~ msgstr "Ustvari novo oznako"
 
 #, fuzzy
 #~ msgid "To edit label properties:"
 #~ msgstr "Uredi lastnosti seznama stikov"
-
-#, fuzzy
-#~ msgid "Select the label and click Edit."
-#~ msgstr "Izberite jezik in kliknite na prijavo"
-
 #~ msgid "Edit name and color, then click OK."
 #~ msgstr "Uredite ime in barvo, nato kliknite gumb za potrditev."
 
@@ -14883,7 +10429,6 @@ msgstr "Matej Urbančič <matej.urban@svn.gnome.org>, 2010."
 #, fuzzy
 #~ msgid "Configurable Date and Time Format"
 #~ msgstr "Pokaži stolpca z datumom in časom"
-
 #~ msgid "General:"
 #~ msgstr "Splošno:"
 
@@ -14902,7 +10447,6 @@ msgstr "Matej Urbančič <matej.urban@svn.gnome.org>, 2010."
 #, fuzzy
 #~ msgid "Bogofilter Options:"
 #~ msgstr "Bogofilter možnosti"
-
 #~ msgid "Signature"
 #~ msgstr "Podpis"
 
@@ -14914,9 +10458,6 @@ msgstr "Matej Urbančič <matej.urban@svn.gnome.org>, 2010."
 #~ msgid "Top Posting Options:"
 #~ msgstr "<b>Možnost največjega pošiljanja</b> (Ni priporočljivo)"
 
-#~ msgid "Alerts:"
-#~ msgstr "Opozorila:"
-
 #, fuzzy
 #~ msgid "Prompt When Sending Messages With an Empty Subject Line:"
 #~ msgstr "O_pozori ob pošiljanju sporočil s praznim poljem Zadeva"
@@ -14926,34 +10467,23 @@ msgstr "Matej Urbančič <matej.urban@svn.gnome.org>, 2010."
 #~ msgstr ""
 #~ "_Opozori ob pošiljanju sporočil, ki imajo izpolnjene le prejemnike Skp"
 
+#, fuzzy
+#~ msgid "Display"
+#~ msgstr "Zaslon"
 #~ msgid "Alarms"
 #~ msgstr "Alarmi"
-
 #~ msgid "Time Zone:"
 #~ msgstr "Časovni pas:"
-
-#~ msgid "Time Format:"
-#~ msgstr "Oblika izpisa časa:"
-
 #~ msgid "Second Zone:"
 #~ msgstr "Drugi časovni pas:"
 
-#~ msgid "Week Starts:"
-#~ msgstr "Teden se začne v:"
-
-#~ msgid "Day Begins:"
-#~ msgstr "Začetek _dneva:"
-
-#~ msgid "Day Ends:"
-#~ msgstr "Konec dn_eva:"
-
 #, fuzzy
 #~ msgid "Select the Calendars for Alarm Notification:"
 #~ msgstr "Izberite koledarje za obvestila alarma"
-
+#~ msgid "Free/Busy"
+#~ msgstr "Zasedenost"
 #~ msgid "Publishing:"
 #~ msgstr "Založništvo:"
-
 #~ msgid "Network Preferences"
 #~ msgstr "Možnosti omrežja"
 
@@ -14968,18 +10498,12 @@ msgstr "Matej Urbančič <matej.urban@svn.gnome.org>, 2010."
 #, fuzzy
 #~ msgid "Manual proxy configuration:"
 #~ msgstr "_Ročna nastavitev posredovalnega strežnika"
-
-#, fuzzy
-#~ msgid "Proxy Configuration Settings"
-#~ msgstr "_Ročna nastavitev posredovalnega strežnika"
-
 #~ msgid "HTTP Proxy"
 #~ msgstr "HTTP posrednik"
 
 #, fuzzy
 #~ msgid "The machine name to proxy HTTP through."
 #~ msgstr "Ime računalnika posredovalnega strežnika HTTP."
-
 #~ msgid "Port"
 #~ msgstr "Vrata"
 
@@ -14990,7 +10514,6 @@ msgstr "Matej Urbančič <matej.urban@svn.gnome.org>, 2010."
 #~ msgstr ""
 #~ "Vrata računalnika, ki jih določa \"/system/http_proxy/host\" "
 #~ "posredovalnega strežnika."
-
 #~ msgid "Secure HTTP Proxy"
 #~ msgstr "Varni posredovalni strežnik HTTP"
 
@@ -15049,14 +10572,6 @@ msgstr "Matej Urbančič <matej.urban@svn.gnome.org>, 2010."
 #~ msgstr "Overitelji"
 
 #, fuzzy
-#~ msgid "Creating a Contact"
-#~ msgstr "Evolution stik."
-
-#, fuzzy
-#~ msgid "Creating an Address Book"
-#~ msgstr "Iskanje po imeniku"
-
-#, fuzzy
 #~ msgid "Click Contacts in the Switcher."
 #~ msgstr "Vrstice v preklopniku delovnih površin"
 
@@ -15065,10 +10580,6 @@ msgstr "Matej Urbančič <matej.urban@svn.gnome.org>, 2010."
 #~ msgstr "_Osveži seznam stikov"
 
 #, fuzzy
-#~ msgid "Select the type of Address Book."
-#~ msgstr "Izberi stike iz imenika"
-
-#, fuzzy
 #~ msgid "On This Computer:"
 #~ msgstr "Na tem računalniku"
 
@@ -15121,21 +10632,32 @@ msgstr "Matej Urbančič <matej.urban@svn.gnome.org>, 2010."
 #~ msgstr "_Omejitev prejemanja:"
 
 #, fuzzy
-#~ msgid "Display Name:"
-#~ msgstr "prikaži ime: %s\n"
-
-#, fuzzy
 #~ msgid "Search Filter:"
 #~ msgstr "_Filter iskanja:"
 
 #, fuzzy
+#~ msgid "Disabled:"
+#~ msgstr "Onemogočeno"
+
+#, fuzzy
 #~ msgid "Do nothing."
 #~ msgstr "Ne naredi ničesar"
 
 #, fuzzy
+#~ msgid "Synchronize:"
+#~ msgstr "Uskladi"
+
+#, fuzzy
+#~ msgid "Copy From Pilot:"
+#~ msgstr "Kopiraj z dlančnika"
+
+#, fuzzy
+#~ msgid "Copy To Pilot:"
+#~ msgstr "_Kopiraj povezavo v"
+
+#, fuzzy
 #~ msgid "Migrating Local Outlook Mail Folders"
 #~ msgstr "Ni mogoče ustvariti lokalnih map pošte v `%s': %s"
-
 #~ msgid "Opening or Creating Items"
 #~ msgstr "Odpiranje ali ustvarjanje predmetov"
 
@@ -15144,6 +10666,10 @@ msgstr "Matej Urbančič <matej.urban@svn.gnome.org>, 2010."
 #~ msgstr "Evolution opravila"
 
 #, fuzzy
+#~ msgid "Address Book"
+#~ msgstr "Imenik"
+
+#, fuzzy
 #~ msgid "New Item:"
 #~ msgstr "Nov predmet"
 
@@ -15152,10 +10678,6 @@ msgstr "Matej Urbančič <matej.urban@svn.gnome.org>, 2010."
 #~ msgstr "Zvok novega neposrednega sporočila"
 
 #, fuzzy
-#~ msgid "Creating a New Appointment:"
-#~ msgstr "Ustvari nov sestanek"
-
-#, fuzzy
 #~ msgid "Entering a New Contact:"
 #~ msgstr "_Dodaj nov stik"
 
@@ -15176,41 +10698,26 @@ msgstr "Matej Urbančič <matej.urban@svn.gnome.org>, 2010."
 #~ msgstr "Iskanje dokumentov in map po imenu"
 
 #, fuzzy
-#~ msgid "Sending Emails to a Contact:"
-#~ msgstr "Dodaj stik v osebni seznam"
-
-#, fuzzy
 #~ msgid "Creating a New Contact:"
 #~ msgstr "_Dodaj nov stik"
 
 #, fuzzy
 #~ msgid "This manual was written by:"
 #~ msgstr "Datoteko je ustvaril"
-
 #~ msgid "Radhika PC (pradhika@novell.com)"
 #~ msgstr "Radhika PC (pradhika@novell.com)"
-
-#~ msgid "Andre Klapper (ak-47@gmx.net)"
-#~ msgstr "Andre Klapper (ak-47@gmx.net)"
-
 #~ msgid "Francisco Javier F. Serrador (serrador@tecknolabs.com)"
 #~ msgstr "Francisco Javier F. Serrador (serrador@tecknolabs.com)"
-
 #~ msgid "Mark Moulder (mmoulder@novell.com)"
 #~ msgstr "Mark Moulder (mmoulder@novell.com)"
-
 #~ msgid "Jessica Prabhakar (jprabhakar@novell.com)"
 #~ msgstr "Jessica Prabhakar (jprabhakar@novell.com)"
-
 #~ msgid "Aaron Weber (aaron@ximian.com)"
 #~ msgstr "Aaron Weber (aaron@ximian.com)"
-
 #~ msgid "Kevin Breit (mrproper@ximian.com)"
 #~ msgstr "Kevin Breit (mrproper@ximian.com)"
-
 #~ msgid "Duncan Mak (duncan@ximian.com)"
 #~ msgstr "Duncan Mak (duncan@ximian.com)"
-
 #~ msgid "Akhil Laddha (lakhil@novell.com)"
 #~ msgstr "Akhil Laddha (lakhil@novell.com)"
 
@@ -15241,36 +10748,34 @@ msgstr "Matej Urbančič <matej.urban@svn.gnome.org>, 2010."
 #, fuzzy
 #~ msgid "The GNOME groupware application."
 #~ msgstr "DTP program za GNOME"
-
 #~ msgid "execute"
 #~ msgstr "izvedi"
+#~ msgid "expunge"
+#~ msgstr "uniči"
 
 #, fuzzy
 #~ msgid "file tree"
 #~ msgstr "_Uvozi različico"
-
+#~ msgid "filter"
+#~ msgstr "filter"
 #~ msgid "forward"
 #~ msgstr "posredovanje"
 
 #, fuzzy
 #~ msgid "groupware"
 #~ msgstr "Zbirka za skupinsko delo"
-
+#~ msgid "HTML"
+#~ msgstr "HTML"
 #~ msgid "iCal"
 #~ msgstr "iCal"
-
 #~ msgid "inline"
 #~ msgstr "kot del sporoč_ila"
-
 #~ msgid "LDAP"
 #~ msgstr "LDAP"
-
 #~ msgid "mail client"
 #~ msgstr "poštni odjemalec"
-
 #~ msgid "POP"
 #~ msgstr "POP"
-
 #~ msgid "protocol"
 #~ msgstr "protokol"
 
@@ -15278,6 +10783,9 @@ msgstr "Matej Urbančič <matej.urban@svn.gnome.org>, 2010."
 #~ msgid "public key encryption"
 #~ msgstr "Upravljalnik s šifrirnimi ključi"
 
+#, fuzzy
+#~ msgid "regular expression"
+#~ msgstr "Logični izraz"
 #~ msgid "script"
 #~ msgstr "skript"
 
@@ -15293,33 +10801,31 @@ msgstr "Matej Urbančič <matej.urban@svn.gnome.org>, 2010."
 #~ msgid "Sendmail"
 #~ msgstr "Program sendmail"
 
+#, fuzzy
+#~ msgid "switcher"
+#~ msgstr "Preklopnik"
+#~ msgid "signature"
+#~ msgstr "podpis"
 #~ msgid "SMTP"
 #~ msgstr "SMTP"
-
 #~ msgid "tooltip"
 #~ msgstr "orodni namig"
-
 #~ msgid "virus"
 #~ msgstr "virus"
-
 #~ msgid "vCard"
 #~ msgstr "vCard"
 
 #, fuzzy
 #~ msgid "Legal Notices"
 #~ msgstr "_Prikaz obvestil"
-
 #~ msgid "404 Wyman Street, Suite 500"
 #~ msgstr "404 Wyman Street, Suite 500"
-
 #~ msgid "Waltham, MA 02451"
 #~ msgstr "Waltham, MA 02451"
-
 #~ msgid "U.S.A."
 #~ msgstr "U.S.A."
-
 #~ msgid "www.novell.com"
 #~ msgstr "www.novell.com"
-
 #~ msgid "July 2007"
 #~ msgstr "julij 2007"
+