[geary] Update Slovenian translation



commit 62eb1a6eff6a473cd66c5b59e0766e61bf3798aa
Author: Matej Urbančič <mateju src gnome org>
Date:   Thu May 13 07:58:58 2021 +0000

    Update Slovenian translation

 po/sl.po | 4549 +++++++++++++++++++++++++++++++++++++++-----------------------
 1 file changed, 2904 insertions(+), 1645 deletions(-)
---
diff --git a/po/sl.po b/po/sl.po
index 7bba8a7c8..48d9ade56 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -3,14 +3,14 @@
 # This file is distributed under the same license as the geary package.
 #
 # anthonmanix <anthon manix gmail com>, 2012–2013.
-# Matej Urbančič <mateju svn gnome org>, 2014–2018.
+# Matej Urbančič <mateju svn gnome org>, 2014–2021.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: geary master\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/geary/issues\n";
-"POT-Creation-Date: 2018-10-25 02:47+0000\n"
-"PO-Revision-Date: 2018-10-25 18:24+0200\n"
+"POT-Creation-Date: 2021-04-14 12:18+0000\n"
+"PO-Revision-Date: 2021-05-13 09:57+0200\n"
 "Last-Translator: Matej Urbančič <mateju svn gnome org>\n"
 "Language-Team: Slovenian GNOME Translation Team <gnome-si googlegroups com>\n"
 "Language: sl_SI\n"
@@ -20,123 +20,120 @@ msgstr ""
 "Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || n"
 "%100==4 ? 3 : 0);\n"
 "X-Poedit-SourceCharset: utf-8\n"
-"X-Generator: Poedit 2.1.1\n"
+"X-Generator: Poedit 2.4.2\n"
 
 #: desktop/geary-attach.contract.desktop.in:3
 msgid "Send by email"
 msgstr "Pošlji z elektronsko pošto"
 
-#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
-#: desktop/geary-attach.contract.desktop.in:5
-msgid "mail-send"
-msgstr "mail-send"
-
 #: desktop/geary-attach.contract.desktop.in:6
 msgid "Send files using Geary"
 msgstr "Pošlji datoteke s programom Geary"
 
 #. Translators: The application name
-#: desktop/geary-autostart.desktop.in:3
-#: desktop/org.gnome.Geary.appdata.xml.in:11
-#: desktop/org.gnome.Geary.desktop.in:3
+#: desktop/geary-autostart.desktop.in.in:3
+#: desktop/org.gnome.Geary.appdata.xml.in.in:11
+#: desktop/org.gnome.Geary.desktop.in.in:3
+#: src/client/accounts/accounts-editor-servers-pane.vala:560
+#: src/client/application/application-main-window.vala:608
 msgid "Geary"
 msgstr "Geary"
 
-#: desktop/geary-autostart.desktop.in:4 desktop/org.gnome.Geary.desktop.in:4
+#: desktop/geary-autostart.desktop.in.in:4
+#: desktop/org.gnome.Geary.desktop.in.in:4
 msgid "Email"
 msgstr "Elektronska pošta"
 
 #. Translators: The application's summary / tagline
-#: desktop/geary-autostart.desktop.in:5
-#: desktop/org.gnome.Geary.appdata.xml.in:15
-#: desktop/org.gnome.Geary.desktop.in:5
-#: src/client/application/geary-application.vala:21
+#: desktop/geary-autostart.desktop.in.in:5
+#: desktop/org.gnome.Geary.appdata.xml.in.in:15
+#: desktop/org.gnome.Geary.desktop.in.in:5
+#: src/client/application/application-client.vala:33
 msgid "Send and receive email"
 msgstr "Pošlji in prejmi sporočila"
 
 #. Translators: These are desktop search terms. Do not translate semicolons, end line with a semicolon.
-#: desktop/geary-autostart.desktop.in:7
+#: desktop/geary-autostart.desktop.in.in:7
 msgid "Email;E-mail;Mail;"
-msgstr "elektronska pošta;epošta;e-pošta;pošta;sporočila;email;mail;"
-
-#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
-#: desktop/geary-autostart.desktop.in:9 desktop/org.gnome.Geary.desktop.in:9
-msgid "org.gnome.Geary"
-msgstr "org.gnome.Geary"
+msgstr ""
+"Email;elektronska pošta;epošta;e-pošta;pošta;sporočila;email;mail;geary;"
 
 #. Translators: The development team's name
-#: desktop/org.gnome.Geary.appdata.xml.in:13
+#: desktop/org.gnome.Geary.appdata.xml.in.in:13
 msgid "Geary Development Team"
 msgstr "Razvojna skupina Geary"
 
-#: desktop/org.gnome.Geary.appdata.xml.in:17
+#: desktop/org.gnome.Geary.appdata.xml.in.in:17
 msgid ""
 "Geary is an email application built around conversations, for the GNOME 3 "
 "desktop. It allows you to read, find and send email with a straightforward, "
 "modern interface."
 msgstr ""
-"Program Geary je odjemalec elektronske pošte za GNOME, ki temelji na logiki "
-"pogovorov. Omogoča branje, iskanje in pošiljanje sporočil prek preglednega "
-"modernega vmesnika."
+"Program Geary je odjemalec elektronske pošte za GNOME, ki je zasnovan na "
+"logiki zlaganja pogovorov. Omogoča branje, iskanje in pošiljanje sporočil "
+"prek preglednega modernega vmesnika."
 
-#: desktop/org.gnome.Geary.appdata.xml.in:22
+#: desktop/org.gnome.Geary.appdata.xml.in.in:22
 msgid ""
 "Conversations allow you to read a complete discussion without having to find "
 "and click from message to message."
 msgstr ""
-"Sistem pogovorov omogoča branje nizov sporočil brez nepotrebnega klikanja "
-"med sporočilo."
+"Sistem pogovorov omogoča branje niza sporočil brez nepotrebnega klikanja med "
+"sporočili."
 
-#: desktop/org.gnome.Geary.appdata.xml.in:26
+#: desktop/org.gnome.Geary.appdata.xml.in.in:26
 msgid "Geary’s features include:"
 msgstr "Program Geary omogoča:"
 
-#: desktop/org.gnome.Geary.appdata.xml.in:28
+#: desktop/org.gnome.Geary.appdata.xml.in.in:28
 msgid "Quick email account setup"
 msgstr "Hitro nastavitev računa elektronske pošte"
 
-#: desktop/org.gnome.Geary.appdata.xml.in:29
+#: desktop/org.gnome.Geary.appdata.xml.in.in:29
 msgid "Shows related messages together in conversations"
-msgstr "Povezana sporočila so zbrana skupaj v obliki pogovora"
+msgstr "Zbiranje povezanih sporočil v obliki pogovora"
 
-#: desktop/org.gnome.Geary.appdata.xml.in:30
+#: desktop/org.gnome.Geary.appdata.xml.in.in:30
 msgid "Fast, full text and keyword search"
 msgstr "Hitro iskanje po celotnem besedilu s ključnimi besedami"
 
-#: desktop/org.gnome.Geary.appdata.xml.in:31
+#: desktop/org.gnome.Geary.appdata.xml.in.in:31
 msgid "Full-featured HTML and plain text message composer"
-msgstr ""
-"Zmogljiv sestavljalnik sporočil v besedilnem ali oblikovanem zapisu HTML"
+msgstr "Zmogljivo skladanje sporočil v besedilnem ali oblikovanem zapisu HTML"
 
-#: desktop/org.gnome.Geary.appdata.xml.in:32
+#: desktop/org.gnome.Geary.appdata.xml.in.in:32
 msgid "Desktop notification of new mail"
 msgstr "Obvestila o prispeli pošti"
 
-#: desktop/org.gnome.Geary.appdata.xml.in:33
+#: desktop/org.gnome.Geary.appdata.xml.in.in:33
 msgid "Compatible with GMail, Yahoo! Mail, Outlook.com and other IMAP servers"
 msgstr ""
 "Podprti so sistemi spletne pošte, kot so Gmail, Yahoo!, Outlook.com in drugi "
 "strežniki IMAP"
 
 #. Translators: A screenshot description.
-#: desktop/org.gnome.Geary.appdata.xml.in:47
+#: desktop/org.gnome.Geary.appdata.xml.in.in:47
 msgid "Geary displaying a conversation"
-msgstr "Prikaz sporočil zbranih v pogovor"
+msgstr "Prikaz sporočil, zbranih v pogovor"
 
 #. Translators: A screenshot description.
-#: desktop/org.gnome.Geary.appdata.xml.in:52
+#: desktop/org.gnome.Geary.appdata.xml.in.in:58
 msgid "Geary showing the rich text composer"
-msgstr "Geary z odprtim oknom sestavljalnika"
+msgstr "Program Geary z odprtim oknom skladalnika vsebine"
 
 #. Translators: These are desktop search terms. Do not translate semicolons, end line with a semicolon.
-#: desktop/org.gnome.Geary.desktop.in:7
+#: desktop/org.gnome.Geary.desktop.in.in:7
 msgid "Mail;E-mail;IMAP;GMail;Yahoo;Hotmail;Outlook;"
 msgstr "Mail;E-mail;IMAP;GMail;Yahoo;Hotmail;Outlook;Elektronska pošta;"
 
-#: desktop/org.gnome.Geary.desktop.in:21 ui/gtk/menus.ui:7
+#: desktop/org.gnome.Geary.desktop.in.in:22
 msgid "Compose Message"
 msgstr "Sestavi sporočilo"
 
+#: desktop/org.gnome.Geary.desktop.in.in:26
+msgid "New Window"
+msgstr "Novo okno"
+
 #: desktop/org.gnome.Geary.gschema.xml:8
 msgid "Maximize window"
 msgstr "Razpni okno"
@@ -151,7 +148,7 @@ msgstr "Širina okna"
 
 #: desktop/org.gnome.Geary.gschema.xml:15
 msgid "The last recorded width of the application window."
-msgstr ""
+msgstr "Zadnja zabeležena širina okna programa."
 
 #: desktop/org.gnome.Geary.gschema.xml:20
 msgid "Height of window"
@@ -159,485 +156,991 @@ msgstr "Višina okna"
 
 #: desktop/org.gnome.Geary.gschema.xml:21
 msgid "The last recorded height of the application window."
-msgstr ""
+msgstr "Zadnja zabeležena višina okna programa."
 
 #: desktop/org.gnome.Geary.gschema.xml:26
 msgid "Position of folder list pane"
-msgstr ""
+msgstr "Položaj okna seznama map poštnega predala"
 
 #: desktop/org.gnome.Geary.gschema.xml:27
+#, fuzzy
+#| msgid "Position of folder list pane"
 msgid "Position of the folder list Paned grabber."
-msgstr ""
+msgstr "Položaj okna seznama map poštnega predala"
 
 #: desktop/org.gnome.Geary.gschema.xml:32
+#, fuzzy
+#| msgid "Position of folder list pane"
 msgid "Position of folder list pane when horizontal"
-msgstr ""
+msgstr "Položaj okna seznama map poštnega predala"
 
 #: desktop/org.gnome.Geary.gschema.xml:33
 msgid ""
 "Position of the folder list Paned grabber in the horizontal orientation."
-msgstr ""
+msgstr "Položaj seznama map v vodoravni usmerjenosti."
 
 #: desktop/org.gnome.Geary.gschema.xml:38
+#, fuzzy
+#| msgid "Position of folder list pane"
 msgid "Position of folder list pane when vertical"
-msgstr ""
+msgstr "Položaj okna seznama map poštnega predala"
 
 #: desktop/org.gnome.Geary.gschema.xml:39
 msgid "Position of the folder list Paned grabber in the vertical orientation."
-msgstr ""
+msgstr "Položaj seznama map v navpični usmerjenosti."
 
 #: desktop/org.gnome.Geary.gschema.xml:44
+#, fuzzy
+#| msgid "Position of folder list pane"
 msgid "Orientation of the folder list pane"
-msgstr ""
+msgstr "Položaj okna seznama map poštnega predala"
 
 #: desktop/org.gnome.Geary.gschema.xml:45
 msgid "True if the folder list Paned is in the horizontal orientation."
 msgstr ""
 
 #: desktop/org.gnome.Geary.gschema.xml:50
-msgid "Position of message list pane"
-msgstr ""
+msgid "Show/hide formatting toolbar"
+msgstr "Pokaži/Skrij orodno vrstico oblikovanja"
 
 #: desktop/org.gnome.Geary.gschema.xml:51
-msgid "Position of the message list Paned grabber."
+msgid "True if the formatting toolbar in the composer is shown."
 msgstr ""
 
 #: desktop/org.gnome.Geary.gschema.xml:56
-msgid "Autoselect next message"
-msgstr "Samodejno izberi naslednje sporočilo"
+#, fuzzy
+#| msgid "Position of folder list pane"
+msgid "Position of message list pane"
+msgstr "Položaj okna seznama map poštnega predala"
 
 #: desktop/org.gnome.Geary.gschema.xml:57
-msgid "True if we should autoselect the next available conversation."
-msgstr ""
+#, fuzzy
+#| msgid "Position of folder list pane"
+msgid "Position of the message list Paned grabber."
+msgstr "Položaj okna seznama map poštnega predala"
 
 #: desktop/org.gnome.Geary.gschema.xml:62
-msgid "Display message previews"
-msgstr "Pokaži predogled sporočila"
+msgid "Autoselect next message"
+msgstr "Samodejno izberi naslednje sporočilo"
 
 #: desktop/org.gnome.Geary.gschema.xml:63
-msgid "True if we should display a short preview of each message."
+msgid "True if we should autoselect the next available conversation."
 msgstr ""
 
 #: desktop/org.gnome.Geary.gschema.xml:68
-msgid "Languages that shall be used in the spell checker"
-msgstr ""
+msgid "Display message previews"
+msgstr "Pokaži predogled sporočila"
 
 #: desktop/org.gnome.Geary.gschema.xml:69
-msgid "List of the languages to use in the spell checker."
+msgid "True if we should display a short preview of each message."
 msgstr ""
 
 #: desktop/org.gnome.Geary.gschema.xml:74
-msgid "Languages that are displayed in the spell checker popover"
-msgstr ""
+msgid "Use single key shortcuts"
+msgstr "Omogoči enotipkovne bližnjice"
 
 #: desktop/org.gnome.Geary.gschema.xml:75
 msgid ""
-"List of languages that are always displayed in the popover of the spell "
-"checker."
+"Enables shortcuts for email actions that do not require pressing <Ctrl> to "
+"emulate those used by Gmail."
 msgstr ""
 
-#: desktop/org.gnome.Geary.gschema.xml:80
-msgid "Enable notification sounds"
-msgstr "Omogoči zvok obvestil"
+#: desktop/org.gnome.Geary.gschema.xml:82
+msgid "Languages that shall be used in the spell checker"
+msgstr ""
 
-#: desktop/org.gnome.Geary.gschema.xml:81
-msgid "True to play sounds for notifications and sending."
+#: desktop/org.gnome.Geary.gschema.xml:83
+msgid ""
+"A list of POSIX locales, with the empty list disabling spell checking and "
+"the null list using desktop languages by default."
 msgstr ""
 
-#: desktop/org.gnome.Geary.gschema.xml:86
-msgid "Show notifications for new mail"
-msgstr "Prikaži obvestila o novo prispeli pošti"
+#: desktop/org.gnome.Geary.gschema.xml:90
+msgid "Languages that are displayed in the spell checker popover"
+msgstr ""
 
-#: desktop/org.gnome.Geary.gschema.xml:87
-msgid "True to show notification bubbles."
+#: desktop/org.gnome.Geary.gschema.xml:91
+msgid ""
+"List of languages that are always displayed in the popover of the spell "
+"checker."
 msgstr ""
 
-#: desktop/org.gnome.Geary.gschema.xml:92
+#: desktop/org.gnome.Geary.gschema.xml:96
 msgid "Notify of new mail at startup"
-msgstr ""
+msgstr "Ob zagonu obvesti o novi prispeli pošti"
 
-#: desktop/org.gnome.Geary.gschema.xml:93
-#, fuzzy
-#| msgid "Desktop notification of new mail"
+#: desktop/org.gnome.Geary.gschema.xml:97
 msgid "True to notify of new mail at startup."
-msgstr "Obvestila o prispeli pošti"
+msgstr "Izbrana možnost omogoči obvestila o prispeli pošti ob zagonu."
 
-#: desktop/org.gnome.Geary.gschema.xml:98
+#: desktop/org.gnome.Geary.gschema.xml:102
 msgid "Ask when opening an attachment"
-msgstr ""
+msgstr "Vprašaj ob odpiranju priloge"
 
-#: desktop/org.gnome.Geary.gschema.xml:99
+#: desktop/org.gnome.Geary.gschema.xml:103
 #, fuzzy
 #| msgid "To add them as attachments"
 msgid "True to ask when opening an attachment."
 msgstr "Da jih dodate kot priponke."
 
-#: desktop/org.gnome.Geary.gschema.xml:104
+#: desktop/org.gnome.Geary.gschema.xml:108
 msgid "Whether to compose emails in HTML"
-msgstr ""
+msgstr "Ali naj bodo sporočila oblikovana v zapisu HTML"
 
-#: desktop/org.gnome.Geary.gschema.xml:105
+#: desktop/org.gnome.Geary.gschema.xml:109
 msgid "True to compose emails in HTML; false for plain text."
 msgstr ""
+"Izbrana možnost omogoči oblikovanje HTML; neizbrana ohrani neoblikovano "
+"besedilo."
 
-#: desktop/org.gnome.Geary.gschema.xml:110
+#: desktop/org.gnome.Geary.gschema.xml:114
 msgid "Advisory strategy for full-text searching"
 msgstr ""
 
-#: desktop/org.gnome.Geary.gschema.xml:111
+#: desktop/org.gnome.Geary.gschema.xml:115
 msgid ""
 "Acceptable values are “exact”, “conservative”, “aggressive”, and “horizon”."
 msgstr ""
 
-#: desktop/org.gnome.Geary.gschema.xml:116
+#: desktop/org.gnome.Geary.gschema.xml:120
 #, fuzzy
 #| msgctxt "shortcut window"
 #| msgid "Move focus to conversation list"
 msgid "Zoom of conversation viewer"
 msgstr "Premakni žarišče na seznam pogovorov"
 
-#: desktop/org.gnome.Geary.gschema.xml:117
+#: desktop/org.gnome.Geary.gschema.xml:121
 msgid "The zoom to apply on the conservation view."
 msgstr ""
 
-#: desktop/org.gnome.Geary.gschema.xml:122
-#, fuzzy
-#| msgctxt "shortcut window"
-#| msgid "Detach composer window"
+#: desktop/org.gnome.Geary.gschema.xml:126
 msgid "Size of detached composer window"
-msgstr "Odpni okno skladalnika"
+msgstr "Velikost odpetega okna skladalnika"
 
-#: desktop/org.gnome.Geary.gschema.xml:123
+#: desktop/org.gnome.Geary.gschema.xml:127
 msgid "The last recorded size of the detached composer window."
-msgstr ""
+msgstr "Zadnja zabeležena velikost odpetega okna skladalnika."
 
-#: desktop/org.gnome.Geary.gschema.xml:128
-msgid "Base URL to look up contact avatars"
+#: desktop/org.gnome.Geary.gschema.xml:132
+msgid "Undo sending email delay"
+msgstr "Razveljavi zamik pošiljanja sporočila"
+
+#: desktop/org.gnome.Geary.gschema.xml:133
+msgid ""
+"The number of seconds to wait before sending an email. Set to zero or less "
+"to disable."
 msgstr ""
 
-#: desktop/org.gnome.Geary.gschema.xml:129
+#: desktop/org.gnome.Geary.gschema.xml:139
+msgid "Brief notification display time"
+msgstr "Čas prikaza hitrega obvestila"
+
+#: desktop/org.gnome.Geary.gschema.xml:140
 msgid ""
-"A Gravatar or Libravatar compatible URL, set to the empty string to disable."
+"The length of time in seconds for which brief notifications should be "
+"displayed."
 msgstr ""
 
-#: desktop/org.gnome.Geary.gschema.xml:134
+#: desktop/org.gnome.Geary.gschema.xml:146
+msgid "List of optional plugins"
+msgstr "Seznam izbirnih vstavkov"
+
+#: desktop/org.gnome.Geary.gschema.xml:147
+msgid "Plugins listed here will be loaded on startup."
+msgstr "Vstavki na tem seznamu bodo naloženi ob zagonu programa."
+
+#: desktop/org.gnome.Geary.gschema.xml:152
 msgid "Whether we migrated the old settings"
 msgstr ""
 
-#: desktop/org.gnome.Geary.gschema.xml:135
+#: desktop/org.gnome.Geary.gschema.xml:153
 msgid ""
 "False to check for the old “org.yorba.geary”-schema and copy its values."
 msgstr ""
 
-#: src/client/accounts/account-dialog-add-edit-pane.vala:54
-#: src/client/components/stock.vala:31 ui/conversation-email-menus.ui:83
-msgid "_Save"
-msgstr "_Shrani"
-
-#: src/client/accounts/account-dialog-add-edit-pane.vala:54
-#: src/client/components/stock.vala:22
-msgid "_Add"
-msgstr "_Dodaj"
-
-#. reset/clear widgets
-#: src/client/accounts/account-dialog-edit-alternate-emails-pane.vala:120
+#. Translators: In-app notification label, when
+#. the app had a problem pinning an otherwise
+#. untrusted TLS certificate
+#: src/client/accounts/accounts-editor.vala:210
+msgid "Failed to store certificate"
+msgstr "Shranjevanje potrdila je spodletelo"
+
+#. Translators: Label for adding an email account
+#. account for a generic IMAP service provider.
+#: src/client/accounts/accounts-editor-add-pane.vala:108
+msgid "All others"
+msgstr "Drugi ponudniki"
+
+#. Translators: In-app notification label
+#: src/client/accounts/accounts-editor-add-pane.vala:195
+#: src/client/accounts/accounts-editor-servers-pane.vala:321
+msgid "Check your receiving login and password"
+msgstr "Preverite uporabniško ime in geslo za prejem pošte"
+
+#. Translators: In-app notification label
+#: src/client/accounts/accounts-editor-add-pane.vala:210
+#: src/client/accounts/accounts-editor-servers-pane.vala:334
+msgid "Check your receiving server details"
+msgstr "Preverite podrobnosti dohodnega poštnega strežnika"
+
+#. Translators: In-app notification label
+#. There was an SMTP auth error, but IMAP already
+#. succeeded, so the user probably needs to
+#. specify custom creds here
+#. Translators: In-app notification label
+#: src/client/accounts/accounts-editor-add-pane.vala:232
+#: src/client/accounts/accounts-editor-servers-pane.vala:355
+msgid "Check your sending login and password"
+msgstr "Preverite uporabniško ime in geslo za pošiljanje pošte"
+
+#. Translators: In-app notification label
+#: src/client/accounts/accounts-editor-add-pane.vala:246
+#: src/client/accounts/accounts-editor-servers-pane.vala:368
+msgid "Check your sending server details"
+msgstr "Preverite podrobnosti odhodnega poštnega strežnika"
+
+#. Translators: In-app notification label
+#: src/client/accounts/accounts-editor-add-pane.vala:261
+msgid "Check your email address and password"
+msgstr "Preverite uporabniško ime in geslo"
+
+#. Translators: In-app notification label
+#: src/client/accounts/accounts-editor-add-pane.vala:272
+msgid "Could not connect, check your network"
+msgstr "Ni mogoče vzpostaviti povezave. Preverite omrežne nastavitve."
+
+#. Translators: In-app notification label for a
+#. generic error creating an account
+#: src/client/accounts/accounts-editor-add-pane.vala:285
+msgid "An unexpected problem occurred"
+msgstr "Prišlo je do nepričakovane napake"
+
+#. Translators: In-app notification label, the
+#. string substitution is a more detailed reason.
+#: src/client/accounts/accounts-editor-add-pane.vala:303
 #, c-format
-msgid "Additional addresses for %s"
-msgstr "Dodatni naslovi za %s"
+msgid "Account not created: %s"
+msgstr "Račun ni ustvarjen: %s"
+
+#. Translators: Label for the person's actual name when adding
+#. an account
+#: src/client/accounts/accounts-editor-add-pane.vala:558
+msgid "Your name"
+msgstr "Ime"
+
+#. Translators: Label used for the address part of an
+#. email address when editing a user's sender address
+#. preferences for an account.
+#: src/client/accounts/accounts-editor-add-pane.vala:575
+#: src/client/accounts/accounts-editor-edit-pane.vala:513
+msgid "Email address"
+msgstr "Elektronski naslov"
+
+#. Translators: Placeholder for the default sender address
+#. when adding an account
+#. Translators: This is used as a placeholder for the
+#. address part of an email address when editing a user's
+#. sender address preferences for an account.
+#: src/client/accounts/accounts-editor-add-pane.vala:579
+#: src/client/accounts/accounts-editor-edit-pane.vala:479
+msgid "person example com"
+msgstr "ime priimek domena si"
+
+#. Translators: Label for an IMAP/SMTP service login/user name
+#. when adding an account
+#. Translators: Label for the user's login name for an
+#. IMAP, SMTP, etc service
+#: src/client/accounts/accounts-editor-add-pane.vala:593
+#: src/client/accounts/accounts-editor-servers-pane.vala:889
+msgid "Login name"
+msgstr "Prijavno ime"
+
+#. Translators: Label for the user's password for an IMAP,
+#. SMTP, etc service
+#: src/client/accounts/accounts-editor-add-pane.vala:607
+#: src/client/accounts/accounts-editor-servers-pane.vala:1011
+#: ui/password-dialog.glade:108
+msgid "Password"
+msgstr "Geslo"
 
-#. Sets min size.
-#: src/client/accounts/account-dialog.vala:28
-msgid "Accounts"
-msgstr "Računi"
+#. Translators: Label for the IMAP server hostname when
+#. adding an account.
+#. Translators: This label describes the host name or IP
+#. address and port used by an account's IMAP service.
+#: src/client/accounts/accounts-editor-add-pane.vala:629
+#: src/client/accounts/accounts-editor-servers-pane.vala:733
+msgid "IMAP server"
+msgstr "Strežnik IMAP"
+
+#. Translators: Placeholder for the IMAP server hostname
+#. when adding an account.
+#: src/client/accounts/accounts-editor-add-pane.vala:632
+msgid "imap.example.com"
+msgstr "imap.domena.si"
+
+#. Translators: Label for the SMTP server hostname when
+#. adding an account.
+#. Translators: This label describes the host name or IP
+#. address and port used by an account's SMTP service.
+#: src/client/accounts/accounts-editor-add-pane.vala:638
+#: src/client/accounts/accounts-editor-servers-pane.vala:739
+msgid "SMTP server"
+msgstr "Strežnik SMTP"
+
+#. Translators: Placeholder for the SMTP server hostname
+#. when adding an account.
+#: src/client/accounts/accounts-editor-add-pane.vala:641
+msgid "smtp.example.com"
+msgstr "smtp.domena.si"
+
+#. Translators: Label in the account editor for the user's
+#. custom name for an account.
+#: src/client/accounts/accounts-editor-edit-pane.vala:277
+#: ui/accounts_editor_remove_pane.ui:123
+msgid "Account name"
+msgstr "Ime računa"
+
+#. Translators: Tooltip used to undo changing
+#. the name of an account. The string
+#. substitution is the old name of the
+#. account.
+#: src/client/accounts/accounts-editor-edit-pane.vala:318
+#, c-format
+msgid "Change account name back to “%s”"
+msgstr "Spremeni ime računa nazaj na »%s«"
+
+#. Translators: Tooltip for adding a new email sender/from
+#. address's address to an account
+#: src/client/accounts/accounts-editor-edit-pane.vala:342
+msgid "Add a new sender email address"
+msgstr "Dodaj elektronski naslov novega pošiljatelja"
+
+#. Translators: Label used to indicate the user has
+#. provided no display name for one of their sender
+#. email addresses in their account settings.
+#: src/client/accounts/accounts-editor-edit-pane.vala:423
+msgid "Name not set"
+msgstr "Ime ni nastavljeno"
+
+#. Translators: This is used as a placeholder for the
+#. display name for an email address when editing a user's
+#. sender address preferences for an account.
+#: src/client/accounts/accounts-editor-edit-pane.vala:464
+msgid "Sender Name"
+msgstr "Ime pošiljatelja"
+
+#: src/client/accounts/accounts-editor-edit-pane.vala:491
+msgid "Remove"
+msgstr "Odstrani"
+
+#. Translators: Label used for the display name part of an
+#. email address when editing a user's sender address
+#. preferences for an account.
+#: src/client/accounts/accounts-editor-edit-pane.vala:506
+msgid "Sender name"
+msgstr "Ime pošiljatelja"
+
+#. Translators: Label used as the undo tooltip after adding an
+#. new sender email address to an account. The string
+#. substitution is the email address added.
+#: src/client/accounts/accounts-editor-edit-pane.vala:573
+#, c-format
+msgid "Remove “%s”"
+msgstr "Odstrani »%s«"
 
-#. Copyright 2016 Software Freedom Conservancy Inc.
-#. *
-#. * This software is licensed under the GNU Lesser General Public License
-#. * (version 2.1 or later).  See the COPYING file in this distribution.
-#.
-#. Page for adding or editing an account.
-#. / Placeholder text indicating that the user should type their first name and last name
-#: src/client/accounts/add-edit-page.vala:10
-msgid "First Last"
-msgstr "Ime Priimek"
+#. Translators: Label used as the undo tooltip after editing a
+#. sender address for an account. The string substitution is
+#. the email address edited.
+#: src/client/accounts/accounts-editor-edit-pane.vala:613
+#, c-format
+msgid "Undo changes to “%s”"
+msgstr "Razveljavi spremembe v »%s«"
 
-#: src/client/accounts/add-edit-page.vala:240
-msgid "Welcome to Geary."
-msgstr "Dobrodošli v programu Geary."
+#. Translators: Label used as the undo tooltip after removing
+#. a sender address from an account. The string substitution
+#. is the email address edited.
+#: src/client/accounts/accounts-editor-edit-pane.vala:700
+#, c-format
+msgid "Add “%s” back"
+msgstr "Dodaj naslov »%s« nazaj"
+
+#. Translators: Label used as the undo tooltip after removing
+#. a sender address from an account. The string substitution
+#. is the email address edited.
+#: src/client/accounts/accounts-editor-edit-pane.vala:742
+msgid "Undo signature changes"
+msgstr "Razveljavi spremembe podpisa"
+
+#. Translators: This label describes the account
+#. preference for the length of time (weeks, months or
+#. years) that past email should be downloaded.
+#: src/client/accounts/accounts-editor-edit-pane.vala:790
+msgid "Download mail"
+msgstr "Prejmi sporočila"
+
+#. Translators: Tooltip for undoing a change
+#. to the length of time that past email
+#. should be downloaded for an account. The
+#. string substitution is the duration,
+#. e.g. "1 month back".
+#: src/client/accounts/accounts-editor-edit-pane.vala:822
+#, c-format
+msgid "Change download period back to: %s"
+msgstr "Spremeni čas prejema nazaj na: %s"
 
-#: src/client/accounts/add-edit-page.vala:240
-msgid "Enter your account information to get started."
-msgstr "Vpišite podatke o računa za začetek uporabe."
+#: src/client/accounts/accounts-editor-edit-pane.vala:843
+msgid "Everything"
+msgstr "Celoten čas"
 
-#: src/client/accounts/add-edit-page.vala:260
+#: src/client/accounts/accounts-editor-edit-pane.vala:847
 msgid "2 weeks back"
 msgstr "2 tedna nazaj"
 
-#. IDs are # of days
-#: src/client/accounts/add-edit-page.vala:261
+#: src/client/accounts/accounts-editor-edit-pane.vala:851
 msgid "1 month back"
 msgstr "1 mesec nazaj"
 
-#: src/client/accounts/add-edit-page.vala:262
+#: src/client/accounts/accounts-editor-edit-pane.vala:855
 msgid "3 months back"
 msgstr "3 mesece nazaj"
 
-#: src/client/accounts/add-edit-page.vala:263
+#: src/client/accounts/accounts-editor-edit-pane.vala:859
 msgid "6 months back"
 msgstr "6 mesecev nazaj"
 
-#: src/client/accounts/add-edit-page.vala:264
+#: src/client/accounts/accounts-editor-edit-pane.vala:863
 msgid "1 year back"
 msgstr "1 leto nazaj"
 
-#: src/client/accounts/add-edit-page.vala:265
+#: src/client/accounts/accounts-editor-edit-pane.vala:867
 msgid "2 years back"
 msgstr "2 leti nazaj"
 
-#: src/client/accounts/add-edit-page.vala:266
+#: src/client/accounts/accounts-editor-edit-pane.vala:871
 msgid "4 years back"
 msgstr "4 leta nazaj"
 
-#. Separator
-#: src/client/accounts/add-edit-page.vala:268
-msgid "Everything"
-msgstr "Vse"
-
-#: src/client/accounts/add-edit-page.vala:288
-msgid "Edit"
-msgstr "Uredi"
-
-#: src/client/accounts/add-edit-page.vala:290
-msgid "Preview"
-msgstr "Predogled"
-
-#: src/client/accounts/add-edit-page.vala:778
-msgid "Remem_ber passwords"
-msgstr "Zap_omni si gesla"
+#: src/client/accounts/accounts-editor-edit-pane.vala:877
+#, c-format
+msgid "%d day back"
+msgid_plural "%d days back"
+msgstr[0] "%d dni nazaj"
+msgstr[1] "%d dan nazaj"
+msgstr[2] "%d dneva nazaj"
+msgstr[3] "%d dneve nazaj"
+
+#: src/client/accounts/accounts-editor-list-pane.vala:255
+#: src/client/application/application-main-window.vala:2066
+msgid "Undo"
+msgstr "Razveljavi"
+
+#: src/client/accounts/accounts-editor-list-pane.vala:264
+#: src/client/application/application-main-window.vala:2049
+msgid "Redo"
+msgstr "Ponovno uveljavi"
+
+#: src/client/accounts/accounts-editor-list-pane.vala:358
+#: src/client/accounts/accounts-editor-list-pane.vala:454
+#: src/client/accounts/accounts-editor-row.vala:279
+msgid "Gmail"
+msgstr "Gmail"
 
-#: src/client/accounts/add-edit-page.vala:785 ui/login.glade:233
-msgid "Remem_ber password"
-msgstr "Zap_omni si geslo"
+#: src/client/accounts/accounts-editor-list-pane.vala:362
+#: src/client/accounts/accounts-editor-list-pane.vala:458
+#: src/client/accounts/accounts-editor-row.vala:283
+msgid "Outlook.com"
+msgstr "Outlook.com"
 
-#: src/client/accounts/add-edit-page.vala:819
-msgid "Unable to validate:\n"
-msgstr "Overitev ni mogoča:\n"
+#: src/client/accounts/accounts-editor-list-pane.vala:366
+#: src/client/accounts/accounts-editor-list-pane.vala:462
+#: src/client/accounts/accounts-editor-row.vala:287
+msgid "Yahoo"
+msgstr "Yahoo"
+
+#. Translators: Tooltip for accounts that have been
+#. loaded but disabled by the user.
+#: src/client/accounts/accounts-editor-list-pane.vala:388
+msgid "This account has been disabled"
+msgstr "Ta račun je onemogočen."
+
+#. Translators: Tooltip for accounts that have been
+#. loaded but because of some error are not able to be
+#. used.
+#: src/client/accounts/accounts-editor-list-pane.vala:397
+msgid "This account has encountered a problem and is unavailable"
+msgstr "S tem računom so povezane težave in trenutno ni na razpolago"
+
+#: src/client/accounts/accounts-editor-list-pane.vala:466
+msgid "Other email providers"
+msgstr "Drugi ponudniki elektronske pošte"
+
+#. Translators: Notification shown after removing an
+#. account. The string substitution is the name of the
+#. account.
+#: src/client/accounts/accounts-editor-list-pane.vala:572
+#, c-format
+msgid "Account “%s” removed"
+msgstr "Račun »%s« je odstranjen"
 
-#: src/client/accounts/add-edit-page.vala:821
-msgid "        • Invalid account nickname.\n"
-msgstr "        • Neveljaven naziv računa.\n"
+#. Translators: Notification shown after removing an account
+#. is undone. The string substitution is the name of the
+#. account.
+#: src/client/accounts/accounts-editor-list-pane.vala:579
+#, c-format
+msgid "Account “%s” restored"
+msgstr "Račun »%s« je obnovljen"
+
+#. Translators: Tooltip for dragging list items
+#: src/client/accounts/accounts-editor-row.vala:50
+msgid "Drag to move this item"
+msgstr "Potegnite za premikanje predmeta"
+
+#. Translators: Label describes the service provider
+#. hosting the email account, e.g. Gmail, Yahoo, or some
+#. other generic IMAP service.
+#: src/client/accounts/accounts-editor-row.vala:299
+msgid "Service provider"
+msgstr "Ponudnik storitve"
+
+#. Translators: This label describes what form of transport
+#. security (TLS, StartTLS, etc) used by an account's IMAP or SMTP
+#. service.
+#: src/client/accounts/accounts-editor-row.vala:473
+msgid "Connection security"
+msgstr "Varnost povezave"
+
+#. Translators: Label used when no auth scheme is used
+#. by an account's IMAP or SMTP service.
+#: src/client/accounts/accounts-editor-row.vala:484
+#: src/client/accounts/accounts-editor-servers-pane.vala:760
+#: src/client/accounts/accounts-editor-servers-pane.vala:975
+msgid "None"
+msgstr "Brez"
 
-#: src/client/accounts/add-edit-page.vala:824
-msgid "        • Email address already added to Geary.\n"
-msgstr "        • Elektronski naslov je že dodan v program.\n"
+#: src/client/accounts/accounts-editor-row.vala:491
+msgid "StartTLS"
+msgstr "StartTLS"
+
+#: src/client/accounts/accounts-editor-row.vala:498
+msgid "TLS"
+msgstr "TLS"
+
+#. Translators: Label for source of SMTP authentication
+#. credentials (none, use IMAP, custom) when adding a new
+#. account
+#. Translators: An info bar button label
+#: src/client/accounts/accounts-editor-row.vala:539
+#: src/client/application/application-main-window.vala:554
+msgid "Login"
+msgstr "Prijava"
+
+#. Translators: ComboBox value for source of SMTP
+#. authentication credentials (none) when adding a new
+#. account
+#: src/client/accounts/accounts-editor-row.vala:546
+msgid "No login needed"
+msgstr "Prijava ni zahtevana"
+
+#. Translators: ComboBox value for source of SMTP
+#. authentication credentials (use IMAP) when adding a new
+#. account
+#: src/client/accounts/accounts-editor-row.vala:554
+msgid "Use same login as receiving"
+msgstr "Enaka prijava prejemanju"
+
+#. Translators: ComboBox value for source of SMTP
+#. authentication credentials (custom) when adding a new
+#. account
+#: src/client/accounts/accounts-editor-row.vala:562
+msgid "Use a different login"
+msgstr "Uporabi različno prijavo"
+
+#. Translators: In-app notification label, the
+#. string substitution is a more detailed reason.
+#: src/client/accounts/accounts-editor-servers-pane.vala:382
+#, c-format
+msgid "Account not updated: %s"
+msgstr "Račun ni posodobljen: %s"
+
+#. Translators: This label describes the program that
+#. created the account, e.g. an SSO service like GOA, or
+#. locally by Geary.
+#: src/client/accounts/accounts-editor-servers-pane.vala:545
+msgid "Account source"
+msgstr "Vir računa"
+
+#: src/client/accounts/accounts-editor-servers-pane.vala:557
+msgid "GNOME Online Accounts"
+msgstr "Spletni računi GNOME"
+
+#. Translators: This label describes an account
+#. preference.
+#: src/client/accounts/accounts-editor-servers-pane.vala:616
+msgid "Save draft email on server"
+msgstr "Shrani osnutke sporočil na strežnik"
+
+#. Translators: This label describes an account
+#. preference.
+#: src/client/accounts/accounts-editor-servers-pane.vala:671
+msgid "Save sent email on server"
+msgstr "Shrani poslana sporočila na strežnik"
+
+#. Add a suffix for OAuth2 auth so people know they
+#. shouldn't expect to be prompted for a password
+#. Translators: Label used when an account's IMAP or
+#. SMTP service uses OAuth2. The string replacement is
+#. the service's login name.
+#: src/client/accounts/accounts-editor-servers-pane.vala:961
+#, c-format
+msgid "%s using OAuth2"
+msgstr "%s s podporo OAuth2"
 
-#: src/client/accounts/add-edit-page.vala:828
-msgid "        • IMAP connection error.\n"
-msgstr "        • Napaka povezave s strežnikom IMAP.\n"
+#: src/client/accounts/accounts-editor-servers-pane.vala:971
+msgid "Use receiving server login"
+msgstr "Uporabi podate dohodnega strežnika"
 
-#: src/client/accounts/add-edit-page.vala:831
-msgid "        • IMAP username or password incorrect.\n"
-msgstr ""
-"        • Uporabniško ime ali geslo za povezavo s strežnikom IMAP je "
-"napačno.\n"
+#. Translators: File name used in save chooser when saving
+#. attachments that do not otherwise have a name.
+#: src/client/application/application-attachment-manager.vala:21
+msgid "Untitled"
+msgstr "Neimenovano"
 
-#: src/client/accounts/add-edit-page.vala:834
-msgid "        • SMTP connection error.\n"
-msgstr "        • Napaka povezovanja s strežnikom SMTP.\n"
+#. / Translators: Dialog primary label when prompting to
+#. / overwrite a file. The string substitution is the file'sx
+#. / name.
+#: src/client/application/application-attachment-manager.vala:222
+#, c-format
+msgid "A file named “%s” already exists.  Do you want to replace it?"
+msgstr "Datoteka z imenom »%s« že obstaja. Ali jo želite zamenjati?"
 
-#: src/client/accounts/add-edit-page.vala:837
-msgid "        • SMTP username or password incorrect.\n"
+#. / Translators: Dialog secondary label when prompting to
+#. / overwrite a file. The string substitution is the parent
+#. / folder's name.
+#: src/client/application/application-attachment-manager.vala:229
+#, c-format
+msgid ""
+"The file already exists in “%s”.  Replacing it will overwrite its contents."
 msgstr ""
-"        • Uporabniško ime ali geslo za povezavo s strežnikom SMTP je "
-"napačno.\n"
-
-#: src/client/accounts/add-edit-page.vala:841
-msgid "        • Connection error.\n"
-msgstr "        • Napaka povezovanja.\n"
+"Datoteka že obstaja v mapi »%s«. S prepisom bo izgubljena vsebina ciljne "
+"datoteke."
 
-#: src/client/accounts/add-edit-page.vala:845
-msgid "        • Username or password incorrect.\n"
-msgstr "        • Uporabniško ime ali geslo za povezavo je napačno.\n"
+#: src/client/application/application-attachment-manager.vala:236
+msgid "_Replace"
+msgstr "_Zamenjaj"
 
-#: src/client/application/geary-application.vala:22
+#: src/client/application/application-client.vala:34
 msgid "Copyright 2016 Software Freedom Conservancy Inc."
-msgstr "Avtorske pravice 2017 Software Freedom Conservancy Inc."
+msgstr "Avtorske pravice 2016 Software Freedom Conservancy Inc."
 
-#: src/client/application/geary-application.vala:23
-#, fuzzy
-#| msgid "Copyright 2016-2017 Geary Development Team."
-msgid "Copyright 2016-2018 Geary Development Team."
-msgstr "Avtorske pravice 2016–2017 Razvojna skupina Geary"
+#: src/client/application/application-client.vala:35
+msgid "Copyright 2016-2020 Geary Development Team."
+msgstr "Avtorske pravice 2016–2021 Razvojna skupina Geary."
 
-#: src/client/application/geary-application.vala:25
+#: src/client/application/application-client.vala:37
 msgid "Visit the Geary web site"
 msgstr "Obišči spletišče Geary"
 
-#: src/client/application/geary-application.vala:416
-#, c-format
-msgid "About %s"
-msgstr "O %s"
-
-#. Translators: add your name and email address to receive
-#. credit in the About dialog For example: Yamada Taro
-#. <yamada taro example com>
-#: src/client/application/geary-application.vala:420
-msgid "translator-credits"
-msgstr "Matej Urbančič <mateju@svn gnome org>"
+#. / Command line option
+#: src/client/application/application-client.vala:97
+msgid "Print debug logging"
+msgstr "Natisni dnevnik razhroščevanja"
 
-#: src/client/application/geary-args.vala:10
-msgid "Start Geary with hidden main window"
+#. / Command line option
+#: src/client/application/application-client.vala:100
+#, fuzzy
+#| msgid "Start Geary with hidden main window"
+msgid "Start with the main window hidden (deprecated)"
 msgstr "Zaženi program s skritim glavnim oknom"
 
-#: src/client/application/geary-args.vala:11
-msgid "Output debugging information"
-msgstr "Izpiši podrobnosti o razhroščevanju"
+#. / Command line option
+#: src/client/application/application-client.vala:103
+msgid "Enable WebKitGTK Inspector in web views"
+msgstr "Omogoči nadzornika WebKitGTK v spletnih pogledih"
 
-#: src/client/application/geary-args.vala:12
+#. / Command line option
+#: src/client/application/application-client.vala:106
 msgid "Log conversation monitoring"
 msgstr "Beleži nadzorovanje pogovorov"
 
-#: src/client/application/geary-args.vala:13
-msgid "Log network deserialization"
+#. / Command line option
+#: src/client/application/application-client.vala:109
+#, fuzzy
+#| msgid "Log network deserialization"
+msgid "Log IMAP network deserialization"
 msgstr "Beleži razporejanje omrežja"
 
-#: src/client/application/geary-args.vala:14
-msgid "Log network activity"
+#. / Command line option. "Normalization" can also be called
+#. / "synchronization".
+#: src/client/application/application-client.vala:113
+msgid "Log folder normalization"
+msgstr "Beleži usklajevanje map"
+
+#. / Command line option
+#: src/client/application/application-client.vala:116
+#, fuzzy
+#| msgid "Log network activity"
+msgid "Log IMAP network activity"
 msgstr "Beleži dejavnost omrežja"
 
-#. / The IMAP replay queue is how changes on the server are replicated on the client.
-#. / It could also be called the IMAP events queue.
-#: src/client/application/geary-args.vala:17
+#. / Command line option. The IMAP replay queue is how changes
+#. / on the server are replicated on the client.  It could
+#. / also be called the IMAP events queue.
+#: src/client/application/application-client.vala:121
 msgid "Log IMAP replay queue"
 msgstr "Beleži vrsto odzivov IMAP"
 
-#. / Serialization is how commands and responses are converted into a stream of bytes for
-#. / network transmission
-#: src/client/application/geary-args.vala:20
-msgid "Log network serialization"
-msgstr "Beleži zaporejanje omrežja"
-
-#: src/client/application/geary-args.vala:21
-msgid "Log periodic activity"
-msgstr "Beleži dejavnost"
+#. / Command line option
+#: src/client/application/application-client.vala:124
+#, fuzzy
+#| msgid "Log network activity"
+msgid "Log SMTP network activity"
+msgstr "Beleži dejavnost omrežja"
 
-#: src/client/application/geary-args.vala:22
+#. / Command line option
+#: src/client/application/application-client.vala:127
 msgid "Log database queries (generates lots of messages)"
 msgstr "Beleži poizvedbe podatkovne zbirke (ustvari mnogo sporočil)"
 
-#. / "Normalization" can also be called "synchronization"
-#: src/client/application/geary-args.vala:24
-msgid "Log folder normalization"
-msgstr "Beleži usklajevanje map"
+#. / Command line option
+#: src/client/application/application-client.vala:130
+msgid "Perform a graceful quit"
+msgstr "Izvedi končanje"
 
-#: src/client/application/geary-args.vala:25
-msgid "Allow inspection of WebView"
-msgstr "Dovoli nadzor WebView"
+#: src/client/application/application-client.vala:132
+msgid "Open a new window"
+msgstr "Odpri novo okno"
 
-#: src/client/application/geary-args.vala:26
-msgid "Revoke all server certificates with TLS warnings"
+#. / Command line option
+#: src/client/application/application-client.vala:135
+#, fuzzy
+#| msgid "Revoke all server certificates with TLS warnings"
+msgid "Revoke all pinned TLS server certificates"
 msgstr "Prekliči vsa potrdila strežnika z varnostnimi opozorili TLS"
 
-#: src/client/application/geary-args.vala:27
-msgid "Perform a graceful quit"
-msgstr "Izvedi končanje"
-
-#: src/client/application/geary-args.vala:28
+#. / Command line option
+#: src/client/application/application-client.vala:138
 msgid "Display program version"
 msgstr "Pokaži različico programa"
 
-#. This gives a command-line hint on how to open new composer windows with mailto:
-#: src/client/application/geary-args.vala:53
-#, c-format
-msgid "Use %s to open a new composer window"
-msgstr "Uporabi %s za odpiranje novega okna sestavljalnika"
+#. / Application runtime information label
+#: src/client/application/application-client.vala:262
+msgid "Geary version"
+msgstr "Različica Geary"
 
-#: src/client/application/geary-args.vala:56
-msgid "Please report comments, suggestions and bugs to:"
-msgstr "Opombe, predloge in poročila o hroščih, pošljite na:"
+#. / Application runtime information label
+#: src/client/application/application-client.vala:264
+msgid "Geary revision"
+msgstr "Predelava Geary"
 
-#. i18n: Command line arguments are invalid
-#: src/client/application/geary-args.vala:63
-#, c-format
-msgid "Failed to parse command line options: %s\n"
-msgstr "Razčlenjevanje možnosti ukazne vrstice je spodletelo: %s\n"
+#. / Application runtime information label
+#: src/client/application/application-client.vala:266
+msgid "GTK version"
+msgstr "Različica GTK"
 
-#: src/client/application/geary-args.vala:74
-#, c-format
-msgid "Unrecognized command line option “%s”\n"
-msgstr "Neprepoznana možnost ukazne vrstice »%s«\n"
+#. / Applciation runtime information label
+#: src/client/application/application-client.vala:273
+msgid "GLib version"
+msgstr "Različica GLib"
 
-#. Translators: File name used in save chooser when saving
-#. attachments that do not otherwise have a name.
-#: src/client/application/geary-controller.vala:68
-msgid "Untitled"
-msgstr ""
+#. / Application runtime information label
+#: src/client/application/application-client.vala:280
+msgid "WebKitGTK version"
+msgstr "Različica WebKitGTK"
 
-#: src/client/application/geary-controller.vala:721
-msgid "Unable to store server trust exception"
-msgstr "Ni mogoče shraniti potrditve izjeme varnosti strežnika"
+#. / Application runtime information label
+#: src/client/application/application-client.vala:287
+msgid "Desktop environment"
+msgstr "Namizno okolje"
 
-#: src/client/application/geary-controller.vala:972
-msgid "Your settings are insecure"
-msgstr "Nastavitve niso varne"
+#. Translators: This is the file type displayed for
+#. attachments with unknown file types.
+#: src/client/application/application-client.vala:289
+#: src/client/application/application-client.vala:295
+#: src/client/application/application-client.vala:301
+#: src/client/components/components-attachment-pane.vala:91
+msgid "Unknown"
+msgstr "Neznano"
 
-#: src/client/application/geary-controller.vala:973
-msgid ""
-"Your IMAP and/or SMTP settings do not specify SSL or TLS.  This means your "
-"username and password could be read by another person on the network.  Are "
-"you sure you want to do this?"
-msgstr ""
-"V nastavitvah IMAP oziroma SMTP ni določenih poveril SSL ali TLS. To pomeni, "
-"da lahko tretje osebe neovirano pridobijo uporabniško ime in geslo.  Ali ste "
-"prepričani, da želite to storiti?"
+#. / Application runtime information label
+#: src/client/application/application-client.vala:293
+msgid "Distribution name"
+msgstr "Ime distribucije"
 
-#: src/client/application/geary-controller.vala:974
-msgid "Co_ntinue"
-msgstr "_Nadaljuj"
+#. / Application runtime information label
+#: src/client/application/application-client.vala:299
+msgid "Distribution release"
+msgstr "Objava distribucije"
 
-#. / Displayed in the space-limited status bar when a message fails to be sent due to error.
-#: src/client/application/geary-controller.vala:1078
-#: src/client/components/status-bar.vala:29
-msgid "Error sending email"
-msgstr "Napaka med pošiljanjem sporočila"
+#. / Application runtime information label
+#: src/client/application/application-client.vala:305
+msgid "Installation prefix"
+msgstr "Predpone namestitve"
 
-#: src/client/application/geary-controller.vala:1079
-msgid ""
-"Geary encountered an error sending an email.  If the problem persists, "
-"please manually delete the email from your Outbox folder."
+#: src/client/application/application-client.vala:561
+#, c-format
+msgid "About %s"
+msgstr "O %s"
+
+#. Translators: add your name and email address to receive
+#. credit in the About dialog For example: Yamada Taro
+#. <yamada taro example com>
+#: src/client/application/application-client.vala:565
+msgid "translator-credits"
+msgstr "Matej Urbančič <mateju src gnome org>"
+
+#. / Warning printed to the console when a deprecated
+#. / command line option is used.
+#: src/client/application/application-client.vala:1047
+msgid "The `--hidden` option is deprecated and will be removed in the future."
 msgstr ""
-"Prišlo je do napake med pošiljanjem elektronskega sporočila. Če se problem "
-"tudi v bodoče večkrat ponovi, ročno izbrišite sporočilo iz mape odhodne "
-"pošte."
+"MOžnost »--hidden« je opuščena in bo v prihodnjih različicah odstranjena."
 
-#. Displayed in the space-limited status bar when a message fails to be uploaded
-#. to Sent Mail after being sent.
-#: src/client/application/geary-controller.vala:1083
-#: src/client/components/status-bar.vala:33
-msgid "Error saving sent mail"
-msgstr "Napaka shranjevanja poslanega sporočila"
+#. / Command line warning, string substitution
+#. / is the given argument
+#: src/client/application/application-client.vala:1080
+#, c-format
+msgid "Unrecognised program argument: “%s”"
+msgstr "Neprepoznan argument programa »%s«"
 
-#: src/client/application/geary-controller.vala:1084
-msgid ""
-"Geary encountered an error saving a sent message to Sent Mail.  The message "
-"will stay in your Outbox folder until you delete it."
+#. / Notification title.
+#: src/client/application/application-controller.vala:479
+#, c-format
+msgid "A problem occurred sending email for %s"
 msgstr ""
-"Prišlo je do napake med shranjevanjem sporočila v mapo poslane pošte. "
-"Sporočilo bo ostalo v mapi, dokler ga ročno ne izbrišete."
 
-#: src/client/application/geary-controller.vala:1151
-msgid "Labels"
-msgstr "Oznake"
+#. / Notification body
+#: src/client/application/application-controller.vala:483
+msgid "Email will not be sent until re-connected"
+msgstr ""
+
+#. / Translators: Label for in-app notification
+#: src/client/application/application-controller.vala:582
+msgid "Conversation marked"
+msgid_plural "Conversations marked"
+msgstr[0] "Pogovori so označeni"
+msgstr[1] "Pogovor je označen"
+msgstr[2] "Pogovora sta označena"
+msgstr[3] "Pogovori so označeni"
+
+#. / Translators: Label for in-app notification
+#: src/client/application/application-controller.vala:588
+#, fuzzy
+#| msgid "No conversations found"
+msgid "Conversation un-marked"
+msgid_plural "Conversations un-marked"
+msgstr[0] "Ni najdenih pogovorov"
+msgstr[1] "Ni najdenih pogovorov"
+msgstr[2] "Ni najdenih pogovorov"
+msgstr[3] "Ni najdenih pogovorov"
+
+#. / Translators: Label for in-app
+#. / notification. String substitution is the name
+#. / of the destination folder.
+#: src/client/application/application-controller.vala:614
+#: src/client/application/application-controller.vala:698
+#, fuzzy, c-format
+#| msgid "Conversation Shortcuts"
+msgid "Conversation moved to %s"
+msgid_plural "Conversations moved to %s"
+msgstr[0] "Tipkovna bližnjica pogovora"
+msgstr[1] "Tipkovna bližnjica pogovora"
+msgstr[2] "Tipkovna bližnjica pogovora"
+msgstr[3] "Tipkovna bližnjica pogovora"
+
+#. / Translators: Label for in-app
+#. / notification. String substitution is the name
+#. / of the source folder.
+#. / Translators: Label for in-app notification. String
+#. / substitution is the name of the destination folder.
+#: src/client/application/application-controller.vala:622
+#: src/client/application/application-controller.vala:644
+#, fuzzy, c-format
+#| msgid "Conversation Shortcuts"
+msgid "Conversation restored to %s"
+msgid_plural "Conversations restored to %s"
+msgstr[0] "Tipkovna bližnjica pogovora"
+msgstr[1] "Tipkovna bližnjica pogovora"
+msgstr[2] "Tipkovna bližnjica pogovora"
+msgstr[3] "Tipkovna bližnjica pogovora"
+
+#. / Translators: Label for in-app notification.
+#: src/client/application/application-controller.vala:665
+#, fuzzy
+#| msgid "Conversation Shortcuts"
+msgid "Conversation archived"
+msgid_plural "Conversations archived"
+msgstr[0] "Tipkovna bližnjica pogovora"
+msgstr[1] "Tipkovna bližnjica pogovora"
+msgstr[2] "Tipkovna bližnjica pogovora"
+msgstr[3] "Tipkovna bližnjica pogovora"
+
+#. / Translators: Label for in-app notification. String
+#. / substitution is the name of the destination folder.
+#: src/client/application/application-controller.vala:721
+#, fuzzy, c-format
+#| msgid "Message not saved"
+msgid "Message restored to %s"
+msgid_plural "Messages restored to %s"
+msgstr[0] "Sporočilo ni shranjeno"
+msgstr[1] "Sporočilo ni shranjeno"
+msgstr[2] "Sporočilo ni shranjeno"
+msgstr[3] "Sporočilo ni shranjeno"
+
+#. / Translators: Label for in-app notification.
+#: src/client/application/application-controller.vala:742
+#, fuzzy
+#| msgid "Message not saved"
+msgid "Message archived"
+msgid_plural "Messages archived"
+msgstr[0] "Sporočilo ni shranjeno"
+msgstr[1] "Sporočilo ni shranjeno"
+msgstr[2] "Sporočilo ni shranjeno"
+msgstr[3] "Sporočilo ni shranjeno"
+
+#. / Translators: Label for in-app
+#. / notification. String substitution is the name
+#. / of the destination folder.
+#: src/client/application/application-controller.vala:777
+#, fuzzy, c-format
+#| msgid "Message not saved"
+msgid "Message moved to %s"
+msgid_plural "Messages moved to %s"
+msgstr[0] "Sporočilo ni shranjeno"
+msgstr[1] "Sporočilo ni shranjeno"
+msgstr[2] "Sporočilo ni shranjeno"
+msgstr[3] "Sporočilo ni shranjeno"
+
+#. / Translators: Label for in-app
+#. / notification. String substitution is the name
+#. / of the destination folder.
+#: src/client/application/application-controller.vala:805
+#, fuzzy, c-format
+#| msgid "No conversations selected"
+msgid "Conversation labelled as %s"
+msgid_plural "Conversations labelled as %s"
+msgstr[0] "Ni izbranega pogovora"
+msgstr[1] "Ni izbranega pogovora"
+msgstr[2] "Ni izbranega pogovora"
+msgstr[3] "Ni izbranega pogovora"
+
+#. / Translators: Label for in-app
+#. / notification. String substitution is the name
+#. / of the destination folder.
+#: src/client/application/application-controller.vala:813
+#, c-format
+msgid "Conversation un-labelled as %s"
+msgid_plural "Conversations un-labelled as %s"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
 
-#. give the user two options: reset the Account local store, or exit Geary.  A third
-#. could be done to leave the Account in an unopened state, but we don't currently
-#. have provisions for that.
-#: src/client/application/geary-controller.vala:1163
+#: src/client/application/application-controller.vala:1320
 #, c-format
 msgid "Unable to open the database for %s"
 msgstr "Podatkovne zbirke za %s ni mogoče odpreti"
 
-#: src/client/application/geary-controller.vala:1164
+#: src/client/application/application-controller.vala:1321
 #, c-format
 msgid ""
 "There was an error opening the local mail database for this account. This is "
@@ -661,20 +1164,20 @@ msgstr ""
 "S ponovno izgradnjo podatkovne zbirke so uničeni vsi krajevni podatki "
 "sporočil in prilog. <b>Sporočila na strežniku ostanejo nespremenjena.</b>"
 
-#: src/client/application/geary-controller.vala:1166
+#: src/client/application/application-controller.vala:1323
 msgid "_Rebuild"
 msgstr "Ponovno _izgradi"
 
-#: src/client/application/geary-controller.vala:1166
+#: src/client/application/application-controller.vala:1323
 msgid "E_xit"
 msgstr "_Končaj"
 
-#: src/client/application/geary-controller.vala:1175
+#: src/client/application/application-controller.vala:1333
 #, c-format
 msgid "Unable to rebuild database for “%s”"
 msgstr "Ponovna izgradnja mape za »%s« ni mogoča."
 
-#: src/client/application/geary-controller.vala:1176
+#: src/client/application/application-controller.vala:1334
 #, c-format
 msgid ""
 "Error during rebuild:\n"
@@ -685,517 +1188,547 @@ msgstr ""
 "\n"
 "%s"
 
-#. some other problem opening the account ... as with other flow path, can't run
-#. Geary today with an account in unopened state, so have to exit
-#: src/client/application/geary-controller.vala:1198
-#: src/client/application/geary-controller.vala:1208
-#: src/client/application/geary-controller.vala:1219
+#. / Translators: The label for an in-app notification. The
+#. / string substitution is a list of recipients of the email.
+#: src/client/application/application-controller.vala:1501
 #, c-format
-msgid "Unable to open local mailbox for %s"
-msgstr "Ni mogoče odpreti krajevnega poštnega predala za %s"
+msgid "Email sent to %s"
+msgstr ""
 
-#: src/client/application/geary-controller.vala:1199
+#. / Translators: The label for an in-app notification. The
+#. / string substitution is a list of recipients of the email.
+#: src/client/application/application-controller.vala:2491
 #, c-format
-msgid ""
-"There was an error opening the local mail database for this account. This is "
-"possibly due to a file permissions problem.\n"
-"\n"
-"Please check that you have read/write permissions for all files in this "
-"directory:\n"
-"\n"
-"%s"
+msgid "Email to %s queued for delivery"
 msgstr ""
-"Prišlo je do napake odpiranja krajevne podatkovne zbirke za ta račun. "
-"Najverjetneje je težava v dovoljenjih datotek.\n"
-"\n"
-"Preverite, ali so dodeljena ustrezna dovoljenja za vse datoteke v tej mapi:\n"
-"\n"
-"%s"
 
-#: src/client/application/geary-controller.vala:1209
-msgid ""
-"The version number of the local mail database is formatted for a newer "
-"version of Geary. Unfortunately, the database cannot be “rolled back” to "
-"work with this version of Geary.\n"
-"\n"
-"Please install the latest version of Geary and try again."
+#. / Translators: The label for an in-app notification. The
+#. / string substitution is a list of recipients of the email.
+#: src/client/application/application-controller.vala:2555
+#, c-format
+msgid "Email to %s saved"
 msgstr ""
-"Krajevna podatkovna zbirka pošte je shranjena kot novejša različica. Na "
-"žalost nadgradnje ni mogoče povrniti in uporabiti za trenutno nameščeno "
-"različico programa Geary.\n"
-"\n"
-"Namestite najnovejšo različico programa in poskusite znova."
 
-#: src/client/application/geary-controller.vala:1220
-msgid ""
-"There was an error opening the local account. This is probably due to "
-"connectivity issues.\n"
-"\n"
-"Please check your network connection and restart Geary."
+#. / Translators: A label for an in-app notification.
+#: src/client/application/application-controller.vala:2570
+#: src/client/application/application-controller.vala:2628
+msgid "Composer could not be restored"
+msgstr "Okna skladalnika ni mogoče obnoviti"
+
+#. / Translators: The label for an in-app notification. The
+#. / string substitution is a list of recipients of the email.
+#: src/client/application/application-controller.vala:2613
+#, c-format
+msgid "Email to %s discarded"
 msgstr ""
-"Prišlo je do napake med odpiranjem krajevnega računa. Najverjetneje je "
-"težava v omrežni povezavi.\n"
-"\n"
-"Preverite povezave in ponovno zaženite program."
 
-#: src/client/application/geary-controller.vala:2038
-msgid "Undo move (Ctrl+Z)"
-msgstr "Razveljavi premik (CTRL+Z)"
+#. Translators: An info bar status label
+#: src/client/application/application-main-window.vala:540
+msgid "Working offline"
+msgstr ""
 
-#: src/client/application/geary-controller.vala:2048
-msgid "Are you sure you want to open these attachments?"
-msgstr "Ali ste prepričani, da želite odpreti vse priloge?"
+#. Translators: An info bar description label
+#: src/client/application/application-main-window.vala:542
+msgid "You will not be able to send or receive email until re-connected."
+msgstr ""
 
-#: src/client/application/geary-controller.vala:2049
-msgid ""
-"Attachments may cause damage to your system if opened.  Only open files from "
-"trusted sources."
+#. Translators: An info bar status label
+#: src/client/application/application-main-window.vala:549
+msgid "Login problem"
+msgstr "Težava s prijavo"
+
+#. Translators: An info bar description label
+#: src/client/application/application-main-window.vala:551
+msgid "An account has reported an incorrect login or password."
 msgstr ""
-"Priloge lahko vsebujejo zlonamerno kodo, ki lahko škoduje sistemu. Odpirajte "
-"samo datoteke iz zaupljivih virov."
 
-#: src/client/application/geary-controller.vala:2050
-msgid "Don’t _ask me again"
-msgstr "_Ne vprašaj več"
+#. Translators: An info bar button tool-tip
+#: src/client/application/application-main-window.vala:558
+msgid "Retry login, you will be prompted for your password"
+msgstr ""
 
-#. Translators: Dialog primary label when prompting to
-#. overwrite a file. The string substitution is the file'sx
-#. name.
-#: src/client/application/geary-controller.vala:2179
-#, c-format
-msgid "A file named “%s” already exists.  Do you want to replace it?"
-msgstr "Datoteka z imenom »%s« že obstaja. Ali jo želite zamenjati?"
+#. Translators: An info bar status label
+#: src/client/application/application-main-window.vala:565
+msgid "Security problem"
+msgstr "Varnostna težava"
 
-#. Translators: Dialog secondary label when prompting to
-#. overwrite a file. The string substitution is the parent
-#. folder's name.
-#: src/client/application/geary-controller.vala:2186
-#, c-format
-msgid ""
-"The file already exists in “%s”.  Replacing it will overwrite its contents."
+#. Translators: An info bar description label
+#: src/client/application/application-main-window.vala:567
+msgid "An account has reported an untrusted server."
 msgstr ""
-"Datoteka že obstaja v mapi »%s«. S prepisom bo izgubljena vsebina ciljne "
-"datoteke."
 
-#: src/client/application/geary-controller.vala:2190
-msgid "_Replace"
-msgstr "_Zamenjaj"
+#. Translators: An info bar button label
+#: src/client/application/application-main-window.vala:570
+msgid "Check"
+msgstr "Preglej"
 
-#: src/client/application/geary-controller.vala:2460
-#, fuzzy
-#| msgid "Close open draft messages?"
-msgid "Close the draft message?"
-msgid_plural "Close all draft messages?"
-msgstr[0] "Ali želite zapreti odprt osnutek sporočila?"
-msgstr[1] "Ali želite zapreti odprt osnutek sporočila?"
-msgstr[2] "Ali želite zapreti odprt osnutek sporočila?"
-msgstr[3] "Ali želite zapreti odprt osnutek sporočila?"
+#. Translators: An info bar button tool-tip
+#: src/client/application/application-main-window.vala:574
+msgid "Check the security details for the connection"
+msgstr ""
+
+#. / Translators: Main window title, first string
+#. / substitution being the currently selected folder name,
+#. / the second being the selected account name.
+#: src/client/application/application-main-window.vala:617
+#, c-format
+msgid "%s — %s"
+msgstr "%s – %s"
+
+#. Translators: The name of the folder group containing
+#. folders created by people (as opposed to special-use
+#. folders)
+#: src/client/application/application-main-window.vala:996
+#: src/client/folder-list/folder-list-account-branch.vala:43
+msgid "Labels"
+msgstr "Oznake"
 
-#: src/client/application/geary-controller.vala:2586
+#: src/client/application/application-main-window.vala:1298
 #, c-format
 msgid "Empty all email from your %s folder?"
 msgstr "Ali želite odstraniti vsa elektronska sporočila iz mape %s?"
 
-#: src/client/application/geary-controller.vala:2587
+#: src/client/application/application-main-window.vala:1299
 msgid "This removes the email from Geary and your email server."
 msgstr "S tem bo sporočilo odstranjeno krajevno in iz poštnega strežnika."
 
-#: src/client/application/geary-controller.vala:2588
+#: src/client/application/application-main-window.vala:1300
 msgid "This cannot be undone."
 msgstr "Dejanja ni mogoče povrniti."
 
-#: src/client/application/geary-controller.vala:2589
+#: src/client/application/application-main-window.vala:1301
 #, c-format
 msgid "Empty %s"
 msgstr "Izprazni %s"
 
-#: src/client/application/geary-controller.vala:2606
-#, c-format
-msgid "Error emptying %s"
-msgstr "Napaka praznjenja %s"
-
-#: src/client/application/geary-controller.vala:2638
-msgid "Do you want to permanently delete this message?"
-msgid_plural "Do you want to permanently delete these messages?"
+#. / Translators: Primary text for a confirmation dialog
+#: src/client/application/application-main-window.vala:1358
+#, fuzzy
+#| msgid "Do you want to permanently delete this message?"
+#| msgid_plural "Do you want to permanently delete these messages?"
+msgid "Do you want to permanently delete this conversation?"
+msgid_plural "Do you want to permanently delete these conversations?"
 msgstr[0] "Ali res želite trajno izbrisati ta sporočila?"
 msgstr[1] "Ali res želite trajno izbrisati to sporočilo?"
 msgstr[2] "Ali res želite trajno izbrisati ti sporočili?"
 msgstr[3] "Ali res želite trajno izbrisati ta sporočila?"
 
-#: src/client/application/geary-controller.vala:2640
+#: src/client/application/application-main-window.vala:1363
+#: src/client/application/application-main-window.vala:1378
 msgid "Delete"
 msgstr "Izbriši"
 
-#: src/client/application/geary-controller.vala:2654
-msgid "Undo trash (Ctrl+Z)"
-msgstr "Razveljavi smeti (CTRL+Z)"
-
-#: src/client/application/geary-controller.vala:2704
-msgid "Undo archive (Ctrl+Z)"
-msgstr "Razveljavi arhiviranje (CTRL+Z)"
-
-#: src/client/application/geary-controller.vala:2749
-msgid "Undo (Ctrl+Z)"
-msgstr "Razveljavi (CTRL+Z)"
+#. / Translators: Primary text for a confirmation dialog
+#: src/client/application/application-main-window.vala:1373
+msgid "Do you want to permanently delete this message?"
+msgid_plural "Do you want to permanently delete these messages?"
+msgstr[0] "Ali res želite trajno izbrisati ta sporočila?"
+msgstr[1] "Ali res želite trajno izbrisati to sporočilo?"
+msgstr[2] "Ali res želite trajno izbrisati ti sporočili?"
+msgstr[3] "Ali res želite trajno izbrisati ta sporočila?"
 
-#. Translators: The label for an in-app notification. The
-#. string substitution is a list of recipients of the email.
-#: src/client/application/geary-controller.vala:2826
-#, c-format
-msgid "Successfully sent mail to %s."
-msgstr ""
-
-#: src/client/application/geary-controller.vala:2907
-msgid "Failed to open default text editor."
-msgstr "Odpiranje privzetega urejevalnika besedila je spodletelo."
-
-#. Tooltips
-#: src/client/components/main-toolbar.vala:69
-msgid "Delete conversation (Shift+Delete)"
-msgstr "Izbriši pogovor (SHIFT+Del)"
-
-#: src/client/components/main-toolbar.vala:70
-msgid "Delete conversations (Shift+Delete)"
-msgstr "Izbriši pogovore (SHIFT+Del)"
-
-#: src/client/components/main-toolbar.vala:71
-msgid "Move conversation to Trash (Delete, Backspace)"
-msgstr "Premakni pogovor v smeti (Del, Povratna tipka)"
-
-#: src/client/components/main-toolbar.vala:72
-msgid "Move conversations to Trash (Delete, Backspace)"
-msgstr "Premakni pogovore v smeti (Del, Povratna tipka)"
-
-#: src/client/components/main-toolbar.vala:73
-msgid "Archive conversation (A)"
-msgstr "Arhiviraj pogovor (A)"
-
-#: src/client/components/main-toolbar.vala:74
-msgid "Archive conversations (A)"
-msgstr "Arhiviraj pogovore (A)"
-
-#: src/client/components/main-toolbar.vala:75
-msgid "Mark conversation"
-msgstr "Označi pogovor"
-
-#: src/client/components/main-toolbar.vala:76
-msgid "Mark conversations"
-msgstr "Označi pogovore"
-
-#: src/client/components/main-toolbar.vala:77
-msgid "Add label to conversation"
-msgstr "Dodaj oznako pogovoru"
-
-#: src/client/components/main-toolbar.vala:78
-msgid "Add label to conversations"
-msgstr "Dodaj oznako pogovorom"
-
-#: src/client/components/main-toolbar.vala:79
-msgid "Move conversation"
-msgstr "Premakni pogovor"
-
-#: src/client/components/main-toolbar.vala:80
-msgid "Move conversations"
-msgstr "Premakni pogovore"
-
-#: src/client/components/main-window.vala:440
+#: src/client/application/application-main-window.vala:1696
 #, c-format
 msgid "%s (%d)"
 msgstr "%s (%d)"
 
-#. Translators: String substitution is the account name
-#: src/client/components/main-window-info-bar.vala:54
-#, fuzzy, c-format
-#| msgid "Error connecting to the server"
-msgid "Problem connecting to incoming server for %s"
-msgstr "Napaka med povezovanjem s strežnikom"
-
-#. Translators: String substitution is the server name
-#: src/client/components/main-window-info-bar.vala:56
-#: src/client/components/main-window-info-bar.vala:64
+#. Translators: The first argument will be a
+#. description of the document type, the second will
+#. be a human-friendly size string. For example:
+#. Document (100.9MB)
+#. / In the composer, the filename followed by its filesize, i.e. "notes.txt (1.12KB)"
+#: src/client/components/components-attachment-pane.vala:107
+#: src/client/composer/composer-widget.vala:1834
 #, c-format
-msgid ""
-"Could not connect to %s, check your Internet access and the server name and "
-"try again"
-msgstr ""
-
-#: src/client/components/main-window-info-bar.vala:57
-#: src/client/components/main-window-info-bar.vala:66
-msgid "Retry connecting now"
-msgstr ""
+msgid "%s (%s)"
+msgstr "%s (%s)"
 
-#. Translators: String substitution is the account name
-#: src/client/components/main-window-info-bar.vala:62
-#, fuzzy, c-format
-#| msgid "Error connecting to the server"
-msgid "Problem connecting to outgoing server for %s"
-msgstr "Napaka med povezovanjem s strežnikom"
+#: src/client/components/components-attachment-pane.vala:379
+msgid "Are you sure you want to open these attachments?"
+msgstr "Ali ste prepričani, da želite odpreti vse priloge?"
 
-#: src/client/components/main-window-info-bar.vala:65
-msgid "Try reconnecting now"
+#: src/client/components/components-attachment-pane.vala:380
+msgid ""
+"Attachments may cause damage to your system if opened.  Only open files from "
+"trusted sources."
 msgstr ""
+"Priloge lahko vsebujejo zlonamerno kodo, ki lahko škoduje sistemu. Odpirajte "
+"samo datoteke iz zaupljivih virov."
 
-#. Translators: String substitution is the account name
-#: src/client/components/main-window-info-bar.vala:71
-#, c-format
-msgid "Problem with connection to incoming server for %s"
-msgstr ""
+#: src/client/components/components-attachment-pane.vala:381
+msgid "Don’t _ask me again"
+msgstr "_Ne vprašaj več"
 
-#. Translators: String substitution is the server name
-#: src/client/components/main-window-info-bar.vala:73
-#: src/client/components/main-window-info-bar.vala:81
-#, c-format
-msgid "Network error talking to %s, check your Internet access and try again"
-msgstr ""
+#: src/client/components/components-inspector.vala:78
+msgid "Inspector"
+msgstr "Nadzornik"
+
+#. / Translators: Title for Inspector logs pane
+#. / Translators: Title for problem report dialog logs pane
+#: src/client/components/components-inspector.vala:93
+#: src/client/dialogs/dialogs-problem-details-dialog.vala:101
+msgid "Logs"
+msgstr "Dnevniki"
+
+#. / Translators: Title for Inspector system system information pane
+#. / Translators: Title for problem report system information
+#. / pane
+#: src/client/components/components-inspector.vala:97
+#: src/client/dialogs/dialogs-problem-details-dialog.vala:104
+msgid "System"
+msgstr "Sistem"
+
+#. Button label for saving problem report information
+#: src/client/components/components-inspector.vala:226
+#: src/client/components/components-inspector.vala:229
+#: src/client/dialogs/dialogs-problem-details-dialog.vala:220
+#: src/client/dialogs/dialogs-problem-details-dialog.vala:223
+#: ui/problem-details-dialog.ui:47
+msgid "Save As"
+msgstr "Shrani kot"
+
+#: src/client/components/components-inspector.vala:230
+#: src/client/dialogs/dialogs-problem-details-dialog.vala:224
+#: ui/accounts_editor_servers_pane.ui:17 ui/composer-headerbar.ui:61
+msgid "Cancel"
+msgstr "Prekliči"
+
+#. / Translators: Preferences label
+#: src/client/components/components-preferences-window.vala:124
+msgid "_Automatically select next message"
+msgstr "_Samodejno izberi novo sporočilo"
 
-#: src/client/components/main-window-info-bar.vala:74
-#: src/client/components/main-window-info-bar.vala:82
-#: src/client/components/main-window-info-bar.vala:90
-#: src/client/components/main-window-info-bar.vala:98
-#: src/client/components/main-window-info-bar.vala:119
-msgid "Try reconnecting"
-msgstr ""
+#. / Translators: Preferences label
+#: src/client/components/components-preferences-window.vala:134
+msgid "_Display conversation preview"
+msgstr "_Prikaži predogled pogovora"
 
-#. Translators: String substitution is the account name
-#: src/client/components/main-window-info-bar.vala:79
-#, fuzzy, c-format
-#| msgid "Error connecting to the server"
-msgid "Problem with connection to outgoing server for %s"
-msgstr "Napaka med povezovanjem s strežnikom"
+#. / Translators: Preferences label
+#: src/client/components/components-preferences-window.vala:144
+msgid "Use _three pane view"
+msgstr "Uporabi pogled _drevesne zgradbe"
 
-#. Translators: String substitution is the account name
-#: src/client/components/main-window-info-bar.vala:87
-#, c-format
-msgid "Problem communicating with incoming server for %s"
-msgstr ""
+#. / Translators: Preferences label
+#: src/client/components/components-preferences-window.vala:154
+msgid "Use _single key email shortcuts"
+msgstr "Uporabi _enotipkovne bližnjice"
 
-#. Translators: String substitution is the server name
-#: src/client/components/main-window-info-bar.vala:89
-#, c-format
+#: src/client/components/components-preferences-window.vala:156
 msgid ""
-"Geary did not understand a message from %s or vice versa, please file a bug "
-"report"
+"Enable keyboard shortcuts for email actions that do not require pressing "
+"<Ctrl>"
 msgstr ""
 
-#: src/client/components/main-window-info-bar.vala:94
-msgid "Problem communicating with outgoing mail server"
-msgstr ""
+#. / Translators: Preferences label
+#: src/client/components/components-preferences-window.vala:167
+#, fuzzy
+#| msgid "Always _watch for new mail"
+msgid "_Watch for new mail when closed"
+msgstr "Vedno preveri za _nova sporočila"
 
-#. Translators: First string substitution is the server
-#. name, second is the account name
-#: src/client/components/main-window-info-bar.vala:97
-#, c-format
-msgid ""
-"Could not communicate with %s for %s, check the server name and try again in "
-"a moment"
+#. / Translators: Preferences tooltip
+#: src/client/components/components-preferences-window.vala:171
+msgid "Geary will keep running after all windows are closed"
 msgstr ""
 
-#. Translators: String substitution is the account name
-#: src/client/components/main-window-info-bar.vala:103
-#, c-format
-msgid "Incoming mail server password required for %s"
-msgstr ""
+#. / Translators: Preferences page title
+#: src/client/components/components-preferences-window.vala:189
+msgid "Preferences"
+msgstr "Možnosti"
 
-#: src/client/components/main-window-info-bar.vala:104
-msgid "Messages cannot be received without the correct password."
-msgstr ""
+#. / Translators: Preferences page title
+#: src/client/components/components-preferences-window.vala:250
+msgid "Plugins"
+msgstr "Vstavki"
 
-#: src/client/components/main-window-info-bar.vala:105
-msgid "Retry receiving email, you will be prompted for a password"
-msgstr ""
+#. Translators: Info bar title for a generic account
+#. problem.
+#: src/client/components/components-problem-report-info-bar.vala:36
+msgid "Account problem"
+msgstr "Napaka računa"
 
-#. Translators: String substitution is the account name
-#: src/client/components/main-window-info-bar.vala:110
+#. Translators: Info bar sub-title for a generic account
+#. problem. String substitution is the account name.
+#: src/client/components/components-problem-report-info-bar.vala:40
 #, c-format
-msgid "Outgoing mail server password required for %s"
-msgstr ""
-
-#: src/client/components/main-window-info-bar.vala:111
-msgid "Messages cannot be sent without the correct password."
-msgstr ""
-
-#: src/client/components/main-window-info-bar.vala:112
-msgid "Retry sending queued messages, you will be prompted for a password"
+msgid "Geary has encountered a problem with %s."
 msgstr ""
 
-#. Translators: String substitution is the account name
-#: src/client/components/main-window-info-bar.vala:117
+#. Translators: Info bar sub-title for a generic
+#. account problem. String substitution is the
+#. account name.
+#: src/client/components/components-problem-report-info-bar.vala:53
 #, c-format
-msgid "A problem occurred checking mail for %s"
+msgid "Geary encountered a problem checking mail for %s."
 msgstr ""
 
-#: src/client/components/main-window-info-bar.vala:118
-#: src/client/components/main-window-info-bar.vala:125
-msgid "Something went wrong, please file a bug report if the problem persists"
+#. Translators: Tooltip label for Retry button
+#: src/client/components/components-problem-report-info-bar.vala:57
+msgid "Try reconnecting"
 msgstr ""
 
-#. Translators: String substitution is the account name
-#: src/client/components/main-window-info-bar.vala:124
+#. Translators: Info bar title for an outgoing
+#. account problem. String substitution is the
+#. account name
+#: src/client/components/components-problem-report-info-bar.vala:65
 #, c-format
-msgid "A problem occurred sending mail for %s"
+msgid "Geary encountered a problem sending email for %s."
 msgstr ""
 
-#: src/client/components/main-window-info-bar.vala:126
+#. Translators: Tooltip label for Retry button
+#: src/client/components/components-problem-report-info-bar.vala:69
 msgid "Retry sending queued messages"
-msgstr ""
-
-#: src/client/components/main-window-info-bar.vala:137
-msgid "A database problem has occurred"
-msgstr ""
-
-#. Translators: String substitution is the account name
-#: src/client/components/main-window-info-bar.vala:139
-#, c-format
-msgid "Messages for %s must be downloaded again."
-msgstr ""
+msgstr "Poskusi poslati sporočila v vrsti za pošiljanje"
 
-#: src/client/components/main-window-info-bar.vala:152
+#. Translators: Info bar title for a generic application
+#. problem.
+#: src/client/components/components-problem-report-info-bar.vala:76
 msgid "Geary has encountered a problem"
-msgstr ""
+msgstr "V programu je prišlo do napake"
 
-#: src/client/components/main-window-info-bar.vala:153
-msgid ""
-"Please check the technical details and report the problem if it persists."
-msgstr ""
+#. Translators: Info bar sub-title for a generic
+#. application problem.
+#: src/client/components/components-problem-report-info-bar.vala:80
+msgid "Please report the details if it persists."
+msgstr "Pošljite poročilo, če se napaka pogosto pojavlja"
 
-#: src/client/components/main-window-info-bar.vala:161
+#. Translators: Button label for viewing technical details
+#. for a problem report.
+#: src/client/components/components-problem-report-info-bar.vala:94
 msgid "_Details"
 msgstr "_Podrobnosti"
 
-#: src/client/components/main-window-info-bar.vala:162
+#. Translators: Tooltip for viewing technical details for
+#. a problem report.
+#: src/client/components/components-problem-report-info-bar.vala:97
 msgid "View technical details about the error"
-msgstr ""
+msgstr "Pokaže tehnične podatke napake"
 
-#: src/client/components/main-window-info-bar.vala:166
+#. Translators: Button label for retrying a server
+#. connection
+#: src/client/components/components-problem-report-info-bar.vala:103
 msgid "_Retry"
 msgstr "_Poskusi znova"
 
-#: src/client/components/main-window-info-bar.vala:253
-msgid "Details"
-msgstr "Podrobnosti"
-
-#: src/client/components/main-window-info-bar.vala:266
-#: src/client/components/stock.vala:23
-msgid "_Close"
-msgstr "_Zapri"
-
-#: src/client/components/main-window-info-bar.vala:270
-msgid "Copy to Clipboard"
-msgstr "Kopiraj v odložišče"
-
-#: src/client/components/main-window-info-bar.vala:273
-msgid ""
-"Copy technical details to clipboard for pasting into an email or bug report"
-msgstr ""
-
-#: src/client/components/search-bar.vala:8
-#: src/client/folder-list/folder-list-search-branch.vala:38
-#: src/engine/api/geary-special-folder-type.vala:51
+#. / Translators: Search entry placeholder text
+#: src/client/components/components-search-bar.vala:12
+#: src/client/folder-list/folder-list-search-branch.vala:53
+#: src/client/util/util-i18n.vala:298
 msgid "Search"
 msgstr "Poišči"
 
-#. Search entry.
-#: src/client/components/search-bar.vala:23
-msgid "Search all mail in account for keywords (Ctrl+S)"
+#. / Translators: Search entry tooltip
+#: src/client/components/components-search-bar.vala:32
+#, fuzzy
+#| msgid "Search all mail in account for keywords (Ctrl+S)"
+msgid "Search all mail in account for keywords"
 msgstr "Preišči vsa sporočila računa za ključne besede (CTRL+S)"
 
-#: src/client/components/search-bar.vala:100
-#, c-format
-msgid "Indexing %s account"
-msgstr "Poteka ustvarjanje kazala računa %s"
-
-#: src/client/components/search-bar.vala:111
-#: src/client/folder-list/folder-list-search-branch.vala:39
+#. / Translators: Search entry placeholder, string
+#. / replacement is the name of an account
+#: src/client/components/components-search-bar.vala:81
+#: src/client/folder-list/folder-list-search-branch.vala:54
 #, c-format
 msgid "Search %s account"
 msgstr "Preišči račun %s"
 
+#. Translators: Tooltip used when an entry requires a valid
+#. email address to be entered, but one is not provided.
+#: src/client/components/components-validator.vala:394
+msgid "An email address is required"
+msgstr "Zahtevan je vpis elektronskega naslova"
+
+#. Translators: Tooltip used when an entry requires a valid
+#. email address to be entered, but the address is invalid.
+#: src/client/components/components-validator.vala:398
+msgid "Not a valid email address"
+msgstr "Neveljaven elektronski naslov"
+
+#. Translators: Tooltip used when an entry requires a valid,
+#. resolvable server name to be entered, but one is not
+#. provided.
+#: src/client/components/components-validator.vala:444
+msgid "A server name is required"
+msgstr "Zahtevan je vpis imena strežnika"
+
+#. Translators: Tooltip used when an entry requires a valid
+#. server name to be entered, but it was unable to be
+#. looked-up in the DNS.
+#: src/client/components/components-validator.vala:449
+msgid "Could not look up server name"
+msgstr ""
+
+#: src/client/components/main-toolbar.vala:116
+msgid "Mark conversation"
+msgid_plural "Mark conversations"
+msgstr[0] "Označi pogovor"
+msgstr[1] "Označi pogovor"
+msgstr[2] "Označi pogovor"
+msgstr[3] "Označi pogovor"
+
+#: src/client/components/main-toolbar.vala:121
+msgid "Add label to conversation"
+msgid_plural "Add label to conversations"
+msgstr[0] "Dodaj oznako pogovoru"
+msgstr[1] "Dodaj oznako pogovoru"
+msgstr[2] "Dodaj oznako pogovoru"
+msgstr[3] "Dodaj oznako pogovoru"
+
+#: src/client/components/main-toolbar.vala:126
+msgid "Move conversation"
+msgid_plural "Move conversations"
+msgstr[0] "Premakne pogovor"
+msgstr[1] "Premakni pogovor"
+msgstr[2] "Premakni pogovor"
+msgstr[3] "Premakni pogovor"
+
+#: src/client/components/main-toolbar.vala:131
+msgid "Archive conversation"
+msgid_plural "Archive conversations"
+msgstr[0] "Arhivira pogovor"
+msgstr[1] "Arhiviraj pogovor (A)"
+msgstr[2] "Arhiviraj pogovor (A)"
+msgstr[3] "Arhiviraj pogovor (A)"
+
+#: src/client/components/main-toolbar.vala:142
+msgid "Move conversation to Trash"
+msgid_plural "Move conversations to Trash"
+msgstr[0] "Premakni pogovore v smeti"
+msgstr[1] "Premakni pogovor v smeti"
+msgstr[2] "Premakni pogovora v smeti"
+msgstr[3] "Premakni pogovore v smeti"
+
+#: src/client/components/main-toolbar.vala:152
+msgid "Delete conversation"
+msgid_plural "Delete conversations"
+msgstr[0] "Izbriši pogovore"
+msgstr[1] "Izbriši pogovor"
+msgstr[2] "Izbriši pogovora"
+msgstr[3] "Izbriši pogovore"
+
 #. / Displayed in the space-limited status bar while a message is in the process of being sent.
 #: src/client/components/status-bar.vala:26
 msgid "Sending…"
-msgstr "Poteka pošiljanje ..."
+msgstr "Poteka pošiljanje …"
+
+#. / Displayed in the space-limited status bar when a message fails to be sent due to error.
+#: src/client/components/status-bar.vala:29
+msgid "Error sending email"
+msgstr "Napaka med pošiljanjem sporočila"
+
+#. Displayed in the space-limited status bar when a message fails to be uploaded
+#. to Sent Mail after being sent.
+#: src/client/components/status-bar.vala:33
+msgid "Error saving sent mail"
+msgstr "Napaka shranjevanja poslanega sporočila"
 
-#: src/client/components/stock.vala:18 ui/account_cannot_remove.glade:74
+#: src/client/components/stock.vala:18
 msgid "_OK"
 msgstr "_V redu"
 
-#: src/client/components/stock.vala:19 ui/edit_alternate_emails.glade:160
-#: ui/password-dialog.glade:196 ui/remove_confirm.glade:155
+#: src/client/components/stock.vala:19
+#: src/client/plugin/mail-merge/mail-merge.vala:392
+#: ui/password-dialog.glade:196
 msgid "_Cancel"
 msgstr "_Prekliči"
 
-#: src/client/components/stock.vala:21 ui/gtk/menus.ui:34
+#: src/client/components/stock.vala:21
 msgid "_About"
 msgstr "_O programu"
 
+#: src/client/components/stock.vala:22
+msgid "_Add"
+msgstr "_Dodaj"
+
+#: src/client/components/stock.vala:23
+msgid "_Close"
+msgstr "_Zapri"
+
 #: src/client/components/stock.vala:24
 msgid "_Discard"
 msgstr "_Zavrzi"
 
-#: src/client/components/stock.vala:25 ui/gtk/menus.ui:29
+#: src/client/components/stock.vala:25 ui/main-toolbar-menus.ui:42
 msgid "_Help"
 msgstr "Pomo_č"
 
-#: src/client/components/stock.vala:26 ui/conversation-email-menus.ui:77
+#: src/client/components/stock.vala:26
+#: src/client/plugin/mail-merge/mail-merge.vala:391
+#: ui/components-attachment-pane-menus.ui:7
 msgid "_Open"
 msgstr "_Odpri"
 
-#: src/client/components/stock.vala:27 ui/gtk/menus.ui:17
+#: src/client/components/stock.vala:27 ui/main-toolbar-menus.ui:32
 msgid "_Preferences"
 msgstr "_Možnosti"
 
 #. Translators: Menu item to print a single, specific message
 #: src/client/components/stock.vala:28 ui/conversation-email-menus.ui:64
 msgid "_Print…"
-msgstr "_Natisni ..."
+msgstr "_Natisni …"
 
-#: src/client/components/stock.vala:29 ui/gtk/menus.ui:38
+#: src/client/components/stock.vala:29
 msgid "_Quit"
 msgstr "_Končaj"
 
-#: src/client/components/stock.vala:30 ui/remove_confirm.glade:170
+#: src/client/components/stock.vala:30
 msgid "_Remove"
 msgstr "_Odstrani"
 
+#: src/client/components/stock.vala:31
+#: ui/components-attachment-pane-menus.ui:11
+msgid "_Save"
+msgstr "_Shrani"
+
 #: src/client/components/stock.vala:32
 msgid "_Keep"
 msgstr "_Obdrži"
 
-#: src/client/composer/composer-link-popover.vala:149
+#: src/client/composer/composer-editor.vala:675
+msgid "Select Color"
+msgstr "Izbor barve"
+
+#: src/client/composer/composer-link-popover.vala:139
 msgid "Link URL is not correctly formatted, e.g. http://example.com";
 msgstr ""
 "Naslov URL povezave ni pravilno oblikovan; biti mora v zapisu http://primer.";
 "si"
 
-#: src/client/composer/composer-link-popover.vala:156
+#: src/client/composer/composer-link-popover.vala:146
 msgid "Invalid link URL"
 msgstr "Neveljaven naslov URL povezave"
 
-#: src/client/composer/composer-link-popover.vala:156
+#: src/client/composer/composer-link-popover.vala:146
 msgid "Invalid email address"
 msgstr "Neveljaven elektronski naslov"
 
-#: src/client/composer/composer-widget.vala:158
+#. / Translators: Title for an empty composer window
+#: src/client/composer/composer-widget.vala:32
+msgid "New Message"
+msgstr "Novo sporočilo"
+
+#: src/client/composer/composer-widget.vala:167
 msgid "Saved"
 msgstr "Shranjeno"
 
-#: src/client/composer/composer-widget.vala:159
+#: src/client/composer/composer-widget.vala:168
 msgid "Saving"
 msgstr "Poteka shranjevanje"
 
-#: src/client/composer/composer-widget.vala:160
+#: src/client/composer/composer-widget.vala:169
 msgid "Error saving"
 msgstr "Napaka med shranjevanjem"
 
-#: src/client/composer/composer-widget.vala:161
+#: src/client/composer/composer-widget.vala:170
 msgid "Press Backspace to delete quote"
 msgstr "Pritisnite povratno tipko za brisanje izvornega besedila"
 
 #. Translators: This is list of keywords, separated by pipe ("|")
 #. characters, that suggest an attachment; since this is full-word
-#. checking, include all variants of each word.  No spaces are
-#. allowed.
-#: src/client/composer/composer-widget.vala:170
+#. checking, include all variants of each word. No spaces are
+#. allowed. The words will be converted to lower case based on
+#. locale and English versions included automatically.
+#: src/client/composer/composer-widget.vala:186
 msgid ""
 "attach|attaching|attaches|attachment|attachments|attached|enclose|enclosed|"
 "enclosing|encloses|enclosure|enclosures"
@@ -1206,260 +1739,298 @@ msgstr ""
 #. Translators: This dialog text is displayed to the
 #. user when closing a composer where the options are
 #. Keep, Discard or Cancel.
-#: src/client/composer/composer-widget.vala:1102
-#, fuzzy
-#| msgid "Do you want to discard this message?"
+#: src/client/composer/composer-widget.vala:867
 msgid "Do you want to keep or discard this draft message?"
-msgstr "Ali želite zavreči to sporočilo?"
+msgstr "Ali želite ohraniti ali zavreči ta osnutek sporočila?"
 
 #. Translators: This dialog text is displayed to the
 #. user when closing a composer where the options are
 #. only Discard or Cancel.
-#: src/client/composer/composer-widget.vala:1130
-#, fuzzy
-#| msgid "Do you want to discard this message?"
+#: src/client/composer/composer-widget.vala:893
 msgid "Do you want to discard this draft message?"
-msgstr "Ali želite zavreči to sporočilo?"
+msgstr "Ali želite zavreči ta osnutek sporočila?"
 
-#: src/client/composer/composer-widget.vala:1247
+#: src/client/composer/composer-widget.vala:1468
 msgid "Send message with an empty subject and body?"
 msgstr "Ali želite poslati sporočilo brez zadeve in vsebine?"
 
-#: src/client/composer/composer-widget.vala:1249
+#: src/client/composer/composer-widget.vala:1470
 msgid "Send message with an empty subject?"
 msgstr "Ali želite poslati sporočilo brez vpisane zadeve?"
 
-#: src/client/composer/composer-widget.vala:1251
+#: src/client/composer/composer-widget.vala:1472
 msgid "Send message with an empty body?"
 msgstr "Ali želite poslati sporočilo brez vsebine?"
 
-#: src/client/composer/composer-widget.vala:1255
+#: src/client/composer/composer-widget.vala:1481
 msgid "Send message without an attachment?"
 msgstr "Ali želite poslati sporočilo brez priloge?"
 
-#: src/client/composer/composer-widget.vala:1560
+#: src/client/composer/composer-widget.vala:1822
 #, c-format
 msgid "“%s” already attached for delivery."
 msgstr "Datoteka »%s« je že priložena za pošiljanje."
 
-#. / In the composer, the filename followed by its filesize, i.e. "notes.txt (1.12KB)"
-#. Translators: The first argument will be a
-#. description of the document type, the second will
-#. be a human-friendly size string. For example:
-#. Document (100.9MB)
-#: src/client/composer/composer-widget.vala:1568
-#: src/client/conversation-viewer/conversation-email.vala:136
+#: src/client/composer/composer-widget.vala:1854
+#: src/client/composer/composer-widget.vala:1904
 #, c-format
-msgid "%s (%s)"
-msgstr "%s (%s)"
+msgid "“%s” is an empty file."
+msgstr "Datoteka »%s« je prazna datoteka."
 
-#: src/client/composer/composer-widget.vala:1605
+#: src/client/composer/composer-widget.vala:1892
 #, c-format
 msgid "“%s” could not be found."
 msgstr "Predmeta »%s« ni mogoče najti."
 
-#: src/client/composer/composer-widget.vala:1611
+#: src/client/composer/composer-widget.vala:1898
 #, c-format
 msgid "“%s” is a folder."
 msgstr "Predmet »%s« je mapa."
 
-#: src/client/composer/composer-widget.vala:1617
-#, c-format
-msgid "“%s” is an empty file."
-msgstr "Datoteka »%s« je prazna datoteka."
-
-#: src/client/composer/composer-widget.vala:1630
+#: src/client/composer/composer-widget.vala:1917
 #, c-format
 msgid "“%s” could not be opened for reading."
 msgstr "Datoteke »%s« ni mogoče odpreti za branje."
 
-#: src/client/composer/composer-widget.vala:1638
+#: src/client/composer/composer-widget.vala:1925
 msgid "Cannot add attachment"
 msgstr "Priloge ni mogoče dodati"
 
-#: src/client/composer/composer-widget.vala:1687
-msgid "To: "
-msgstr "Za: "
-
-#: src/client/composer/composer-widget.vala:1690
-msgid "Cc: "
-msgstr "Kp: "
+#. Translators: This is the name of the file chooser filter
+#. when inserting an image in the composer.
+#: src/client/composer/composer-widget.vala:1996
+msgid "Images"
+msgstr "Slike"
 
-#: src/client/composer/composer-widget.vala:1693
-msgid "Bcc: "
-msgstr "Skp: "
+#. Translators: Human-readable version of the RFC 822 To header
+#: src/client/composer/composer-widget.vala:2060
+#: src/client/conversation-viewer/conversation-email.vala:542
+#: src/client/util/util-email.vala:249 ui/conversation-message.ui:312
+msgid "To:"
+msgstr "Za:"
 
-#: src/client/composer/composer-widget.vala:1696
-msgid "Reply-To: "
-msgstr "Odgovori na:"
+#. Translators: Human-readable version of the RFC 822 CC header
+#: src/client/composer/composer-widget.vala:2066
+#: src/client/conversation-viewer/conversation-email.vala:547
+#: src/client/util/util-email.vala:254 ui/conversation-message.ui:357
+msgid "Cc:"
+msgstr "Kp:"
 
-#: src/client/composer/composer-widget.vala:1834
-msgid "Select Color"
-msgstr "Izbor barve"
+#. Translators: Human-readable version of the RFC 822 BCC header
+#: src/client/composer/composer-widget.vala:2072
+#: src/client/conversation-viewer/conversation-email.vala:552
+#: ui/conversation-message.ui:402
+msgid "Bcc:"
+msgstr "Skp:"
 
-#. Displayed in the From dropdown to indicate an "alternate email address"
-#. for an account.  The first printf argument will be the alternate email
-#. address, and the second will be the account's primary email address.
-#: src/client/composer/composer-widget.vala:2024
+#. Translators: Human-readable version of the RFC 822 Reply-To header
+#: src/client/composer/composer-widget.vala:2078
+msgid "Reply-To: "
+msgstr "Odgovori _na: "
+
+#. Displayed in the From dropdown to indicate an
+#. "alternate email address" for an account.  The first
+#. printf argument will be the alternate email address,
+#. and the second will be the account's primary email
+#. address.
+#: src/client/composer/composer-widget.vala:2196
 #, c-format
 msgid "%1$s via %2$s"
 msgstr "%1$s prek %2$s"
 
-#. Composer label (with mnemonic underscore) for the account selector
-#. when choosing what address to send a message from.
-#: src/client/composer/composer-widget.vala:2082
-msgid "_From:"
-msgstr "_Od:"
-
-#. Translators: This is the name of the file chooser filter
-#. when inserting an image in the composer.
-#: src/client/composer/composer-widget.vala:2307
-msgid "Images"
-msgstr "Slike"
-
-#: src/client/composer/composer-window.vala:14
-msgid "New Message"
-msgstr "Novo sporočilo"
-
-#: src/client/composer/spell-check-popover.vala:117
+#: src/client/composer/spell-check-popover.vala:125
 msgid "Remove this language from the preferred list"
 msgstr "Odstrani jezik s seznama prednostnih jezikov"
 
-#: src/client/composer/spell-check-popover.vala:121
+#: src/client/composer/spell-check-popover.vala:129
 msgid "Add this language to the preferred list"
 msgstr "Dodaj jezik na seznam prednostnih jezikov"
 
-#: src/client/composer/spell-check-popover.vala:217
+#: src/client/composer/spell-check-popover.vala:225
 msgid "Search for more languages"
 msgstr "Poišči dodatne jezike"
 
-#: src/client/conversation-list/conversation-list-view.vala:283
-msgid "Delete conversation"
-msgstr "Izbriši pogovor"
-
-#: src/client/conversation-list/conversation-list-view.vala:286
-#: ui/main-toolbar-menus.ui:16
+#. / Translators: Context menu item
+#: src/client/conversation-list/conversation-list-view.vala:339
+msgid "Move conversation to _Trash"
+msgid_plural "Move conversations to _Trash"
+msgstr[0] "Premakni pogovore v _smeti"
+msgstr[1] "Premakni pogovor v _smeti"
+msgstr[2] "Premakni pogovora v _smeti"
+msgstr[3] "Premakni pogovore v _smeti"
+
+#. / Translators: Context menu item
+#: src/client/conversation-list/conversation-list-view.vala:351
+msgid "_Delete conversation"
+msgid_plural "_Delete conversations"
+msgstr[0] "_Izbriši pogovore"
+msgstr[1] "_Izbriši pogovor"
+msgstr[2] "_Izbriši pogovora"
+msgstr[3] "_Izbriši pogovore"
+
+#: src/client/conversation-list/conversation-list-view.vala:364
+#: ui/main-toolbar-menus.ui:5
 msgid "Mark as _Read"
 msgstr "Označi kot _prebrano"
 
-#: src/client/conversation-list/conversation-list-view.vala:289
-#: ui/main-toolbar-menus.ui:20
+#: src/client/conversation-list/conversation-list-view.vala:372
+#: ui/main-toolbar-menus.ui:9
 msgid "Mark as _Unread"
 msgstr "Označi kot _neprebrano"
 
-#: src/client/conversation-list/conversation-list-view.vala:292
-#: ui/main-toolbar-menus.ui:28
+#: src/client/conversation-list/conversation-list-view.vala:380
+#: ui/main-toolbar-menus.ui:17
 msgid "U_nstar"
 msgstr "_Odstrani zvezdico"
 
-#: src/client/conversation-list/conversation-list-view.vala:294
-#: ui/main-toolbar-menus.ui:24
+#: src/client/conversation-list/conversation-list-view.vala:387
+#: ui/main-toolbar-menus.ui:13
 msgid "_Star"
 msgstr "Dodaj _zvezdico"
 
 #. Translators: Menu item to reply to a specific message.
-#: src/client/conversation-list/conversation-list-view.vala:297
+#: src/client/conversation-list/conversation-list-view.vala:396
 #: ui/conversation-email-menus.ui:9
 msgid "_Reply"
 msgstr "_Odgovori"
 
-#: src/client/conversation-list/conversation-list-view.vala:298
+#: src/client/conversation-list/conversation-list-view.vala:402
 msgid "R_eply All"
 msgstr "O_dgovori vsem"
 
 #. Translators: Menu item to forward a specific message.
-#: src/client/conversation-list/conversation-list-view.vala:299
+#: src/client/conversation-list/conversation-list-view.vala:408
 #: ui/conversation-email-menus.ui:21
 msgid "_Forward"
 msgstr "_Posreduj"
 
-#: src/client/conversation-list/formatted-conversation-data.vala:11
+#: src/client/conversation-list/formatted-conversation-data.vala:18
 msgid "Me"
 msgstr "Jaz"
 
-#. Translators: This is the file type displayed for
-#. attachments with unknown file types.
-#: src/client/conversation-viewer/conversation-email.vala:122
-msgid "Unknown"
-msgstr "Neznano"
-
-#: src/client/conversation-viewer/conversation-email.vala:811
+#. Translators: Human-readable version of the RFC 822 From header
+#: src/client/conversation-viewer/conversation-email.vala:537
+#: src/client/util/util-email.vala:240
 msgid "From:"
 msgstr "Od:"
 
-#: src/client/conversation-viewer/conversation-email.vala:815
-#: ui/conversation-message.ui:313
-msgid "To:"
-msgstr "Za:"
-
-#: src/client/conversation-viewer/conversation-email.vala:819
-#: ui/conversation-message.ui:358
-msgid "Cc:"
-msgstr "Kp:"
-
-#: src/client/conversation-viewer/conversation-email.vala:823
-#: ui/conversation-message.ui:403
-msgid "Bcc:"
-msgstr "Skp:"
-
-#: src/client/conversation-viewer/conversation-email.vala:827
+#. Translators: Human-readable version of the RFC 822 Date header
+#: src/client/conversation-viewer/conversation-email.vala:557
+#: src/client/util/util-email.vala:245
 msgid "Date:"
 msgstr "Datum:"
 
-#: src/client/conversation-viewer/conversation-email.vala:831
+#. Translators: Human-readable version of the RFC 822 Subject header
+#: src/client/conversation-viewer/conversation-email.vala:567
+#: src/client/util/util-email.vala:243
 msgid "Subject:"
 msgstr "Zadeva:"
 
-#: src/client/conversation-viewer/conversation-message.vala:60
+#: src/client/conversation-viewer/conversation-message.vala:128
 msgid "This email address may have been forged"
 msgstr ""
 
-#. Preview headers
+#. Translators: Label text displayed when there are too
+#. many email addresses to be shown by default in an
+#. email's header, but they are all being shown anyway.
+#: src/client/conversation-viewer/conversation-message.vala:234
+msgid "Show less"
+msgstr "Pokaži manj"
+
+#. Translators: Label text displayed when there are
+#. too many email addresses to be shown by default in
+#. an email's header. The string substitution is the
+#. number of extra email to be shown.
+#: src/client/conversation-viewer/conversation-message.vala:260
+#, c-format
+msgid "%d more…"
+msgstr ""
+
+#. Compact headers. These are partially done here and partially
+#. in load_contacts.
 #. Translators: This is displayed in place of the from address
 #. when the message has no from address.
-#: src/client/conversation-viewer/conversation-message.vala:330
+#: src/client/conversation-viewer/conversation-message.vala:529
 msgid "No sender"
 msgstr "Ni pošiljatelja"
 
 #. Translators: This separates multiple 'from'
-#. addresses in the header preview for a message.
-#: src/client/conversation-viewer/conversation-message.vala:589
+#. addresses in the compact header for a message.
+#: src/client/conversation-viewer/conversation-message.vala:920
 msgid ", "
 msgstr ", "
 
 #. Translators: This string is used as the HTML IMG ALT
 #. attribute value when displaying an inline image in an email
 #. that did not specify a file name. E.g. <IMG ALT="Image" ...
-#: src/client/conversation-viewer/conversation-message.vala:691
+#: src/client/conversation-viewer/conversation-message.vala:1040
 msgid "Image"
 msgstr "Slika"
 
-#: src/client/conversation-viewer/conversation-viewer.vala:74
+#. Translators: Info bar status message
+#: src/client/conversation-viewer/conversation-message.vala:1305
+msgid "Remote images not shown"
+msgstr "Slike na oddaljenih strežnikih niso prikazane"
+
+#. Translators: Info bar description
+#: src/client/conversation-viewer/conversation-message.vala:1307
+msgid "Only show remote images from senders you trust."
+msgstr ""
+"Slike z oddaljenih mest pokaži le, če je pošiljatelj na seznamu zaupljivih "
+"oseb."
+
+#. Translators: Info bar button label
+#: src/client/conversation-viewer/conversation-message.vala:1311
+msgid "Show"
+msgstr "Pokaži"
+
+#. Translators: Info bar button label
+#: src/client/conversation-viewer/conversation-message.vala:1315
+msgid "Always show from sender"
+msgstr "Vedno pokaži naslov pošiljatelja"
+
+#. Translators: Title label for placeholder when no
+#. conversations have been selected.
+#: src/client/conversation-viewer/conversation-viewer.vala:83
 msgid "No conversations selected"
 msgstr "Ni izbranega pogovora"
 
-#: src/client/conversation-viewer/conversation-viewer.vala:76
+#. Translators: Sub-title label for placeholder when no
+#. conversations have been selected.
+#: src/client/conversation-viewer/conversation-viewer.vala:87
 msgid "Selecting a conversation from the list will display it here"
 msgstr "Z izborom pogovora s seznama se to pokaže v tem oknu"
 
-#: src/client/conversation-viewer/conversation-viewer.vala:81
+#. Translators: Title label for placeholder when multiple
+#. conversations have been selected.
+#: src/client/conversation-viewer/conversation-viewer.vala:96
 msgid "Multiple conversations selected"
 msgstr "Izbranih je več pogovorov"
 
-#: src/client/conversation-viewer/conversation-viewer.vala:83
+#. Translators: Sub-title label for placeholder when multiple
+#. conversations have been selected.
+#: src/client/conversation-viewer/conversation-viewer.vala:100
 msgid "Choosing an action will apply to all selected conversations"
 msgstr "Z izborom dejanja bo to uveljavljeno za vsa izbrana sporočila"
 
-#: src/client/conversation-viewer/conversation-viewer.vala:88
-#: src/client/conversation-viewer/conversation-viewer.vala:95
+#. Translators: Title label for placeholder when no
+#. conversations have exist in a folder.
+#. Translators: Title label for placeholder when no
+#. conversations have been found in a search.
+#: src/client/conversation-viewer/conversation-viewer.vala:109
+#: src/client/conversation-viewer/conversation-viewer.vala:122
 msgid "No conversations found"
 msgstr "Ni najdenih pogovorov"
 
-#: src/client/conversation-viewer/conversation-viewer.vala:90
+#. Translators: Sub-title label for placeholder when no
+#. conversations have exist in a folder.
+#: src/client/conversation-viewer/conversation-viewer.vala:113
 msgid "This folder does not contain any conversations"
 msgstr "V mapi ni nobenega pogovora"
 
-#: src/client/conversation-viewer/conversation-viewer.vala:97
+#. Translators: Sub-title label for placeholder when no
+#. conversations have been found in a search.
+#: src/client/conversation-viewer/conversation-viewer.vala:126
 msgid "Your search returned no results, try refining your search terms"
 msgstr "Iskanje ni vrnilo zadetkov. Poskusite znova z drugim iskalnim nizom."
 
@@ -1471,7 +2042,7 @@ msgstr "Izbor datoteke"
 msgid "_Attach"
 msgstr "_Priloži"
 
-#: src/client/dialogs/certificate-warning-dialog.vala:35
+#: src/client/dialogs/certificate-warning-dialog.vala:36
 #, c-format
 msgid "Untrusted Connection: %s"
 msgstr "Ne-varna povezava: %s"
@@ -1510,11 +2081,7 @@ msgstr ""
 "Z izbiro možnosti »Ne zaupaj strežniku« preprečite dostop programa do tega "
 "računa."
 
-#: src/client/dialogs/certificate-warning-dialog.vala:65
-msgid "Geary will exit if you have no other open email accounts."
-msgstr "Program bo končan, če ni odprtega nobenega poštnega računa."
-
-#: src/client/dialogs/certificate-warning-dialog.vala:70
+#: src/client/dialogs/certificate-warning-dialog.vala:69
 msgid ""
 "Contact your system administrator or email service provider if you have any "
 "question about these issues."
@@ -1522,34 +2089,42 @@ msgstr ""
 "Stopite v stik s skrbnikom sistema ali pa ponudnikom storitev elektronske "
 "pošte, če imate neodgovorjena vprašanja glede teh zapletov."
 
-#: src/client/dialogs/certificate-warning-dialog.vala:77
+#: src/client/dialogs/certificate-warning-dialog.vala:76
 msgid "The server’s certificate is not signed by a known authority"
 msgstr "Potrdilo strežnika ni podpisano s strani znanega podpisnika potrdil"
 
-#: src/client/dialogs/certificate-warning-dialog.vala:80
+#: src/client/dialogs/certificate-warning-dialog.vala:79
 msgid "The server’s identity does not match the identity in the certificate"
 msgstr "Potrdilo strežnika ni skladno z istovetnostjo strani"
 
-#: src/client/dialogs/certificate-warning-dialog.vala:83
+#: src/client/dialogs/certificate-warning-dialog.vala:82
 msgid "The server’s certificate has expired"
 msgstr "Potrdilo strežnika je poteklo"
 
-#: src/client/dialogs/certificate-warning-dialog.vala:86
+#: src/client/dialogs/certificate-warning-dialog.vala:85
 msgid "The server’s certificate has not been activated"
 msgstr "Potrdilo strežnika ni omogočeno"
 
-#: src/client/dialogs/certificate-warning-dialog.vala:89
+#: src/client/dialogs/certificate-warning-dialog.vala:88
 msgid "The server’s certificate has been revoked and is now invalid"
 msgstr "Potrdilo strežnika je preklicano in ni več veljavno"
 
-#: src/client/dialogs/certificate-warning-dialog.vala:92
+#: src/client/dialogs/certificate-warning-dialog.vala:91
 msgid "The server’s certificate is considered insecure"
 msgstr "Potrdilo strežnika je obravnavan kot ne-varen"
 
-#: src/client/dialogs/certificate-warning-dialog.vala:95
+#: src/client/dialogs/certificate-warning-dialog.vala:94
 msgid "An error has occurred processing the server’s certificate"
 msgstr "Prišlo je do napake med preverjanjem potrdila strežnika"
 
+#. / Translators: Title for problem report dialog error
+#. / information pane
+#. Dialog title for displaying technical details of a problem. Same as the button that invokes it.
+#: src/client/dialogs/dialogs-problem-details-dialog.vala:99
+#: ui/problem-details-dialog.ui:17
+msgid "Details"
+msgstr "Podrobnosti"
+
 #. We can't keep these in the glade file, because Gnome doesn't want markup in translatable
 #. strings, and Glade doesn't support the "larger" size attribute. See this bug report for
 #. details: https://bugzilla.gnome.org/show_bug.cgi?id=679006
@@ -1557,8 +2132,10 @@ msgstr "Prišlo je do napake med preverjanjem potrdila strežnika"
 msgid "Geary requires your email password to continue"
 msgstr "Program zahteva nadaljevanje z geslom računa"
 
-#. Label displaying total number of email messages in a folder
-#: src/client/folder-list/folder-list-folder-entry.vala:32
+#. Translators: Label displaying total number of email
+#. messages in a folder. String substitution is the actual
+#. number.
+#: src/client/folder-list/folder-list-folder-entry.vala:42
 #, c-format
 msgid "%d message"
 msgid_plural "%d messages"
@@ -1567,8 +2144,10 @@ msgstr[1] "%d sporočilo"
 msgstr[2] "%d sporočili"
 msgstr[3] "%d sporočila"
 
-#. / Label displaying number of unread email messages in a folder
-#: src/client/folder-list/folder-list-folder-entry.vala:39
+#. Translators: Label displaying number of unread email
+#. messages in a folder. String substitution is the actual
+#. number.
+#: src/client/folder-list/folder-list-folder-entry.vala:52
 #, c-format
 msgid "%d unread"
 msgid_plural "%d unread"
@@ -1577,10 +2156,12 @@ msgstr[1] "%d neprebrano"
 msgstr[2] "%d neprebrani"
 msgstr[3] "%d neprebrana"
 
-#. / This string represents the divider between two messages: "n messages" and "n unread",
-#. / shown in the folder list as a tooltip.  Please use your languages conventions for
-#. / combining the two, i.e. a comma (",") for English; "6 messages, 3 unread"
-#: src/client/folder-list/folder-list-folder-entry.vala:45
+#. Translators: This string represents the divider between two
+#. messages: "n messages" and "n unread", shown in the folder
+#. list as a tooltip.  Please use your languages conventions
+#. for combining the two, i.e. a comma (",") for English; "6
+#. messages, 3 unread"
+#: src/client/folder-list/folder-list-folder-entry.vala:60
 #, c-format
 msgid "%s, %s"
 msgstr "%s, %s"
@@ -1589,7 +2170,7 @@ msgstr "%s, %s"
 msgid "Inboxes"
 msgstr "Prejeto"
 
-#: src/client/folder-list/folder-list-search-branch.vala:44
+#: src/client/folder-list/folder-list-search-branch.vala:59
 #, c-format
 msgid "%d result"
 msgid_plural "%d results"
@@ -1598,12 +2179,43 @@ msgstr[1] "%d zadetek"
 msgstr[2] "%d zadetka"
 msgstr[3] "%d zadetki"
 
-#: src/client/notification/libmessagingmenu.vala:75
+#. / Notification body when a message as been received
+#. / and other unread messages have not been
+#. / seen. First string substitution is the message
+#. / subject and the second is the number of unseen
+#. / messages
+#: src/client/plugin/desktop-notifications/desktop-notifications.vala:138
 #, c-format
-msgid "%s — New Messages"
-msgstr "%s – nova sporočila"
+#| msgid ""
+#| "%s\n"
+#| "(%d other new message for %s)"
+#| msgid_plural ""
+#| "%s\n"
+#| "(%d other new messages for %s)"
+msgid ""
+"%s\n"
+"(%d other new message)"
+msgid_plural ""
+"%s\n"
+"(%d other new messages)"
+msgstr[0] ""
+"%s\n"
+"(%d drugih sporočil)"
+msgstr[1] ""
+"%s\n"
+"(%d drugo sporočilo)"
+msgstr[2] ""
+"%s\n"
+"(%d drugi sporočili)"
+msgstr[3] ""
+"%s\n"
+"(%d druga sporočila)"
 
-#: src/client/notification/libnotify.vala:75
+#. / Notification body when multiple messages have been
+#. / received at the same time and other unseen messages
+#. / exist. String substitution is the number of new
+#. / messages that have arrived.
+#: src/client/plugin/desktop-notifications/desktop-notifications.vala:157
 #, c-format
 msgid "%d new message"
 msgid_plural "%d new messages"
@@ -1612,7 +2224,13 @@ msgstr[1] "%d novo sporočilo"
 msgstr[2] "%d novi sporočili"
 msgstr[3] "%d nova sporočila"
 
-#: src/client/notification/libnotify.vala:78
+#. / Notification body when multiple messages have been
+#. / received at the same time and some unseen messages
+#. / already exist. String substitution is the message
+#. / above with the number of new messages that have
+#. / arrived, number substitution is the total number
+#. / of unseen messages.
+#: src/client/plugin/desktop-notifications/desktop-notifications.vala:167
 #, c-format
 msgid "%s, %d new message total"
 msgid_plural "%s, %d new messages total"
@@ -1621,79 +2239,225 @@ msgstr[1] "%s, %d novo sporočilo"
 msgstr[2] "%s, %d novi sporočili"
 msgstr[3] "%s, %d nova sporočila"
 
-#: src/client/notification/libnotify.vala:110
-#, c-format
-msgid ""
-"%s\n"
-"(%d other new message for %s)"
-msgid_plural ""
-"%s\n"
-"(%d other new messages for %s)"
-msgstr[0] "%s (%d drugih novih sporočil za %s)"
-msgstr[1] "%s (%d drugo novo sporočilo za %s)"
-msgstr[2] "%s (%d drugi novi sporočili za %s)"
-msgstr[3] "%s (%d druga nova sporočila za %s)"
+#. / Notification title when new messages have been
+#. / received
+#: src/client/plugin/desktop-notifications/desktop-notifications.vala:282
+msgid "New message"
+msgid_plural "New messages"
+msgstr[0] "Nova sporočila"
+msgstr[1] "Novo sporočilo"
+msgstr[2] "Novi sporočili"
+msgstr[3] "Nova sporočila"
+
+#: src/client/plugin/email-templates/email-templates.plugin.desktop.in:4
+msgid "Email Templates"
+msgstr "Predloge elektronske pošte"
+
+#: src/client/plugin/email-templates/email-templates.plugin.desktop.in:5
+msgid "Create reusable templates for sending email"
+msgstr "Ustvari predlogo za elektronska sporočila."
+
+#. Translators: Templates folder name alternatives. Separate names
+#. using a vertical bar and put the most common localized name to
+#. the front for the default. English names do not need to be
+#. included.
+#: src/client/plugin/email-templates/email-templates.vala:29
+#: src/client/plugin/mail-merge/mail-merge.vala:29
+msgid "Templates | Template Mail | Template Email | Template E-Mail"
+msgstr "Predloge | Predloge sporočil | Oblikovne predloge"
+
+#. Translators: The name of the folder used to
+#. store email templates
+#: src/client/plugin/email-templates/email-templates.vala:201
+msgid "Templates"
+msgstr "Predloge"
+
+#. Translators: Info bar button label for creating a
+#. new email template
+#: src/client/plugin/email-templates/email-templates.vala:282
+msgid "New"
+msgstr "Novo"
+
+#. Translators: Infobar status label for an email template
+#: src/client/plugin/email-templates/email-templates.vala:293
+msgid "Message template"
+msgstr "Predloga sporočila"
+
+#. Translators: Info bar button label for sending an
+#. email template
+#: src/client/plugin/email-templates/email-templates.vala:297
+msgid "Send"
+msgstr "Pošlji"
 
-#: src/client/notification/libnotify.vala:149
-msgid "Open"
-msgstr "Odpri"
+#. Translators: Info bar button label for editing an
+#. existing email template
+#. Translators: Info bar button label for editing a draft
+#. email
+#: src/client/plugin/email-templates/email-templates.vala:305
+#: src/client/plugin/mail-merge/mail-merge.vala:336
+#: src/client/plugin/special-folders/special-folders.vala:187
+msgid "Edit"
+msgstr "Uredi"
 
-#. / Datetime format for 12-hour time, i.e. 8:31 am
-#. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#: src/client/util/util-date.vala:68
-msgid "%l:%M %P"
-msgstr "%l:%M %P"
+#. / Translators: Menu item label for invoking mail
+#. / merge in composer
+#. / Translators: File chooser title after invoking mail
+#. / merge in composer
+#. Translators: The name of the folder used to
+#. display merged email
+#: src/client/plugin/mail-merge/mail-merge.plugin.desktop.in:5
+#: src/client/plugin/mail-merge/mail-merge.vala:288
+#: src/client/plugin/mail-merge/mail-merge.vala:389
+#: src/client/plugin/mail-merge/mail-merge.vala:488
+msgid "Mail Merge"
+msgstr ""
 
-#. / Datetime format for 24-hour time, i.e. 16:35
+#: src/client/plugin/mail-merge/mail-merge.plugin.desktop.in:6
+msgid "Fill in and send email templates using a spreadsheet"
+msgstr ""
+
+#. Translators: Info bar label for starting sending a mail
+#. merge
+#: src/client/plugin/mail-merge/mail-merge.vala:118
+msgid "Start"
+msgstr "Začni"
+
+#. Translators: Info bar label for pausing sending a mail
+#. merge
+#: src/client/plugin/mail-merge/mail-merge.vala:130
+msgid "Pause"
+msgstr "Premor"
+
+#. Translators: Info bar description for the mail merge
+#. folder. The first string substitution the number of email
+#. already sent, the second is the total number to send.
+#: src/client/plugin/mail-merge/mail-merge.vala:240
+#, c-format
+msgid "Sent %u of %u"
+msgid_plural "Sent %u of %u"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#. Translators: Infobar status label for an email mail merge
+#. template
+#: src/client/plugin/mail-merge/mail-merge.vala:324
+msgid "Mail merge template"
+msgstr ""
+
+#. Translators: Info bar button label for performing a
+#. mail-merge on an email template
+#: src/client/plugin/mail-merge/mail-merge.vala:328
+msgid "Merge"
+msgstr "Združi"
+
+#. / Translators: Action bar menu button label for
+#. / mail-merge plugin
+#: src/client/plugin/mail-merge/mail-merge.vala:377
+msgid "Insert field"
+msgstr "Vstavi polje"
+
+#. / Translators: File chooser filer label
+#: src/client/plugin/mail-merge/mail-merge.vala:396
+msgid "Comma separated values (CSV)"
+msgstr "Z vejico ločen seznam vrednosti (CSV)"
+
+#: src/client/plugin/messaging-menu/messaging-menu.plugin.desktop.in:4
+msgid "Messaging Menu"
+msgstr ""
+
+#: src/client/plugin/messaging-menu/messaging-menu.plugin.desktop.in:5
+msgid "Displays Unity Messaging Menu notifications for new email"
+msgstr "Prikaži meni sporočanja Unity za novo prispela sporočila"
+
+#: src/client/plugin/messaging-menu/messaging-menu.vala:79
+#, c-format
+msgid "%s — New Messages"
+msgstr "%s – nova sporočila"
+
+#: src/client/plugin/sent-sound/sent-sound.plugin.desktop.in:4
+msgid "Sent Sound"
+msgstr "Pošlji zvok"
+
+#: src/client/plugin/sent-sound/sent-sound.plugin.desktop.in:5
+msgid "Plays the desktop sent-mail sound when an email is sent"
+msgstr ""
+
+#. Translators: Info bar button label for emptying
+#. trash/spam folders
+#: src/client/plugin/special-folders/special-folders.vala:167
+msgid "Empty"
+msgstr "Izprazni"
+
+#. Translators: Info bar status message for a draft email
+#: src/client/plugin/special-folders/special-folders.vala:179
+msgid "Draft message"
+msgstr "Osnutek"
+
+#. Translators: Info bar status description for a draft
+#. email
+#: src/client/plugin/special-folders/special-folders.vala:182
+msgid "This message has not yet been sent."
+msgstr "Sporočilo še ni bilo poslano."
+
+#. Translators: Info bar status message for an sent but
+#. unsaved email
+#: src/client/plugin/special-folders/special-folders.vala:198
+msgid "Message not saved"
+msgstr "Sporočilo ni shranjeno"
+
+#. Translators: Info bar status description for a sent but
+#. unsaved email
+#: src/client/plugin/special-folders/special-folders.vala:201
+msgid "This message was sent, but has not been saved to your account."
+msgstr ""
+"Sporočilo je poslano, vendar pa kopija ni shranjena v mapo poslanih sporočil."
+
+#. / Datetime format for 12-hour time, i.e. 8:31 am
+#. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
+#: src/client/util/util-date.vala:69
+msgid "%l:%M %P"
+msgstr "%l:%M %P"
+
+#. / Datetime format for 24-hour time, i.e. 16:35
 #. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#: src/client/util/util-date.vala:71
+#: src/client/util/util-date.vala:72
 msgid "%H:%M"
 msgstr "%H:%M"
 
 #. / Datetime format for the locale default, i.e. 8:31 am or 16:35,
 #. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#: src/client/util/util-date.vala:74
-msgctxt "Default clock format"
-msgid "%l:%M %P"
-msgstr "%l:%M %P"
-
 #. / Date format for dates within the current year, i.e. Nov 8
 #. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#: src/client/util/util-date.vala:78
+#: src/client/util/util-date.vala:79
 msgid "%b %-e"
 msgstr "%-e. %b"
 
-#. / Date format for dates within a different year, i.e. 02/04/10
-#. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#: src/client/util/util-date.vala:83
-#, no-c-format
-msgid "%x"
-msgstr "%x"
-
 #. / Verbose datetime format for 12-hour time, i.e. November 8, 2010 8:42 am
 #. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#: src/client/util/util-date.vala:88
+#: src/client/util/util-date.vala:84
 msgid "%B %-e, %Y %-l:%M %P"
-msgstr "%-e. %B, %Y %-l:%M %P"
+msgstr "%B %-e, %Y %-l:%M %P"
 
 #. / Verbose datetime format for 24-hour time, i.e. November 8, 2010 16:35
 #. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#: src/client/util/util-date.vala:91
+#: src/client/util/util-date.vala:87
 msgid "%B %-e, %Y %-H:%M"
-msgstr "%-e. %B, %Y %-H:%M"
+msgstr "%B %-e, %Y %-H:%M"
 
 #. / Verbose datetime format for the locale default (full month, day and time)
 #. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#: src/client/util/util-date.vala:94
+#: src/client/util/util-date.vala:90
 msgctxt "Default full date"
 msgid "%B %-e, %Y %-l:%M %P"
-msgstr "%-e. %B, %Y %-l:%M %P"
+msgstr "%e. %B %Y %k.%M"
 
-#: src/client/util/util-date.vala:164
+#: src/client/util/util-date.vala:159
 msgid "Now"
 msgstr "Zdaj"
 
-#: src/client/util/util-date.vala:167
+#: src/client/util/util-date.vala:162
 #, c-format
 msgid "%dm ago"
 msgid_plural "%dm ago"
@@ -1702,7 +2466,7 @@ msgstr[1] "%d min nazaj"
 msgstr[2] "%d min nazaj"
 msgstr[3] "%d min nazaj"
 
-#: src/client/util/util-date.vala:171
+#: src/client/util/util-date.vala:166
 #, c-format
 msgid "%dh ago"
 msgid_plural "%dh ago"
@@ -1711,41 +2475,90 @@ msgstr[1] "%dh nazaj"
 msgstr[2] "%dh nazaj"
 msgstr[3] "%dh nazaj"
 
-#: src/client/util/util-date.vala:178
+#: src/client/util/util-date.vala:173
 msgid "Yesterday"
 msgstr "Včeraj"
 
 #. / Date format that shows the weekday (Monday, Tuesday, ...)
 #. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#: src/client/util/util-date.vala:183
+#: src/client/util/util-date.vala:178
 #, c-format
 msgid "%A"
 msgstr "%A"
 
-#: src/client/util/util-email.vala:30 src/engine/rfc822/rfc822-message.vala:846
-msgid "(no subject)"
+#. / 12 hours format for datetime that a message being replied
+#. / to was received See
+#. / http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
+#: src/client/util/util-date.vala:218
+msgid "%a, %b %-e, %Y at %l:%M %P"
+msgstr "%a, %b %-e, %Y at %l:%M %P"
+
+#. / 24 hours format for the datetime that a message being
+#. / replied to was received See
+#. / http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
+#: src/client/util/util-date.vala:224
+msgid "%a, %b %-e, %Y at %H:%M"
+msgstr "%a, %b %-e, %Y at %H:%M"
+
+#. / Format for the datetime that a message being replied to
+#. / was received See
+#. / http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
+#: src/client/util/util-date.vala:230
+msgid "%a, %b %-e, %Y at %X"
+msgstr "%a, %e. %b %Y ob %X"
+
+#. Translators: Label used when an email has a missing or
+#. an empty subject
+#: src/client/util/util-email.vala:50
+msgid "(No subject)"
 msgstr "(brez zadeve)"
 
-#. Translators: This is shown for displaying a list of
-#. email recipients that happens to be empty,
-#. i.e. contains no email addresses.
-#: src/client/util/util-email.vala:49
+#. / Translators: This is shown for displaying a list of email
+#. / recipients that happens to be empty, i.e. contains no
+#. / email addresses.
+#: src/client/util/util-email.vala:148
 msgid "(No recipients)"
-msgstr ""
-
-#. Translators: This is used for displaying a short list of
-#. email recipients lists with two or more addresses. The
-#. first (string) substitution is address of the first, the
-#. second substitution is the number of n - 1 remaining
-#. recipients.
-#: src/client/util/util-email.vala:63
+msgstr "(ni navedenih prejemnikov)"
+
+#. / Translators: This is used for displaying a short
+#. / list of email recipients lists with two or more
+#. / addresses. The first (string) substitution is
+#. / address of the first, the second substitution is
+#. / the number of n - 1 remaining recipients.
+#: src/client/util/util-email.vala:160
 #, c-format
 msgid "%s and %d other"
 msgid_plural "%s and %d others"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
+msgstr[0] "%s in %d drugih"
+msgstr[1] "%s in %d drug"
+msgstr[2] "%s in %d druga"
+msgstr[3] "%s in %d drugi"
+
+#. / The quoted header for a message being replied to.
+#. / %1$s will be substituted for the date, and %2$s will be substituted for
+#. / the original sender.
+#: src/client/util/util-email.vala:193
+#, c-format
+msgid "On %1$s, %2$s wrote:"
+msgstr "%1$s %2$s:"
+
+#. / The quoted header for a message being replied to (in case the date is not known).
+#. / %s will be replaced by the original sender.
+#: src/client/util/util-email.vala:200
+#, c-format
+msgid "%s wrote:"
+msgstr "%s sporoča:"
+
+#. / The quoted header for a message being replied to (in case the sender is not known).
+#. / %s will be replaced by the original date
+#: src/client/util/util-email.vala:206
+#, c-format
+msgid "On %s:"
+msgstr "Na %s:"
+
+#: src/client/util/util-email.vala:235
+msgid "---------- Forwarded message ----------"
+msgstr "---------- Posredovano sporočilo ----------"
 
 #: src/client/util/util-files.vala:16
 msgid "bytes"
@@ -1771,75 +2584,46 @@ msgctxt "Abbreviation for kilobyte"
 msgid "KB"
 msgstr "KB"
 
-#: src/engine/api/geary-service-information.vala:26
-msgid "IMAP"
-msgstr "IMAP"
-
-#: src/engine/api/geary-service-information.vala:29
-msgid "SMTP"
-msgstr "SMTP"
-
-#: src/engine/api/geary-service-provider.vala:52
-msgid "Gmail"
-msgstr "Gmail"
-
-#: src/engine/api/geary-service-provider.vala:55
-msgid "Yahoo! Mail"
-msgstr "Yahoo! Mail"
-
-#: src/engine/api/geary-service-provider.vala:58
-msgid "Outlook.com"
-msgstr "Outlook.com"
-
-#: src/engine/api/geary-service-provider.vala:61
-msgid "Other"
-msgstr "Ostalo"
-
-#: src/engine/api/geary-special-folder-type.vala:24
+#: src/client/util/util-i18n.vala:271
 msgid "Inbox"
 msgstr "Prejeto"
 
-#: src/engine/api/geary-special-folder-type.vala:27
+#: src/client/util/util-i18n.vala:274
 msgid "Drafts"
 msgstr "Osnutki"
 
-#: src/engine/api/geary-special-folder-type.vala:30
-msgid "Sent Mail"
+#: src/client/util/util-i18n.vala:277
+msgid "Sent"
 msgstr "Poslano"
 
-#: src/engine/api/geary-special-folder-type.vala:33
+#: src/client/util/util-i18n.vala:280
 msgid "Starred"
 msgstr "Z zvezdico"
 
-#: src/engine/api/geary-special-folder-type.vala:36
+#: src/client/util/util-i18n.vala:283
 msgid "Important"
 msgstr "Pomembno"
 
-#: src/engine/api/geary-special-folder-type.vala:39
+#: src/client/util/util-i18n.vala:286
 msgid "All Mail"
 msgstr "Vsa sporočila"
 
-#: src/engine/api/geary-special-folder-type.vala:42
-msgid "Spam"
-msgstr "Neželena pošta"
+#: src/client/util/util-i18n.vala:289
+msgid "Junk"
+msgstr "Vsiljena pošta"
 
-#: src/engine/api/geary-special-folder-type.vala:45
+#: src/client/util/util-i18n.vala:292
 msgid "Trash"
 msgstr "Smeti"
 
-#: src/engine/api/geary-special-folder-type.vala:48
+#: src/client/util/util-i18n.vala:295
 msgid "Outbox"
 msgstr "Odhodna pošta"
 
-#: src/engine/api/geary-special-folder-type.vala:54
+#: src/client/util/util-i18n.vala:301
 msgid "Archive"
 msgstr "Arhiv"
 
-#: src/engine/api/geary-special-folder-type.vala:58 ui/login.glade:732
-#: ui/login.glade:750
-msgid "None"
-msgstr "Brez"
-
 #. Map of possibly translated search operator names and values
 #. to English/internal names and values. We include the
 #. English version anyway so that when translations provide a
@@ -1853,7 +2637,7 @@ msgstr "Brez"
 #. or similar to combine words into one), should be short, and
 #. also match the translation in "search.page" of the Geary User
 #. Guide.
-#: src/engine/imap-db/imap-db-account.vala:114
+#: src/engine/imap-db/imap-db-search-query.vala:130
 msgctxt "Search operator"
 msgid "attachment"
 msgstr "priloga"
@@ -1866,7 +2650,7 @@ msgstr "priloga"
 #. or similar to combine words into one), should be short, and
 #. also match the translation in "search.page" of the Geary User
 #. Guide.
-#: src/engine/imap-db/imap-db-account.vala:123
+#: src/engine/imap-db/imap-db-search-query.vala:139
 msgctxt "Search operator"
 msgid "bcc"
 msgstr "skp"
@@ -1878,7 +2662,7 @@ msgstr "skp"
 #. or similar to combine words into one), should be short, and
 #. also match the translation in "search.page" of the Geary User
 #. Guide.
-#: src/engine/imap-db/imap-db-account.vala:131
+#: src/engine/imap-db/imap-db-search-query.vala:147
 msgctxt "Search operator"
 msgid "body"
 msgstr "vsebina"
@@ -1891,7 +2675,7 @@ msgstr "vsebina"
 #. or similar to combine words into one), should be short, and
 #. also match the translation in "search.page" of the Geary User
 #. Guide.
-#: src/engine/imap-db/imap-db-account.vala:140
+#: src/engine/imap-db/imap-db-search-query.vala:156
 msgctxt "Search operator"
 msgid "cc"
 msgstr "kp"
@@ -1904,10 +2688,10 @@ msgstr "kp"
 #. or similar to combine words into one), should be short, and
 #. also match the translation in "search.page" of the Geary User
 #. Guide.
-#: src/engine/imap-db/imap-db-account.vala:149
+#: src/engine/imap-db/imap-db-search-query.vala:165
 msgctxt "Search operator"
 msgid "from"
-msgstr "pošiljatelj"
+msgstr "od"
 
 #. Can be typed in the search box like "is:unread" to find
 #. messages that are read, unread, or starred.
@@ -1916,7 +2700,7 @@ msgstr "pošiljatelj"
 #. or similar to combine words into one), should be short, and
 #. also match the translation in "search.page" of the Geary User
 #. Guide.
-#: src/engine/imap-db/imap-db-account.vala:157
+#: src/engine/imap-db/imap-db-search-query.vala:173
 msgctxt "Search operator"
 msgid "is"
 msgstr "je"
@@ -1928,7 +2712,7 @@ msgstr "je"
 #. or similar to combine words into one), should be short, and
 #. also match the translation in "search.page" of the Geary
 #. User Guide.
-#: src/engine/imap-db/imap-db-account.vala:165
+#: src/engine/imap-db/imap-db-search-query.vala:181
 msgctxt "Search operator"
 msgid "subject"
 msgstr "zadeva"
@@ -1941,7 +2725,7 @@ msgstr "zadeva"
 #. or similar to combine words into one), should be short, and
 #. also match the translation in "search.page" of the Geary User
 #. Guide.
-#: src/engine/imap-db/imap-db-account.vala:174
+#: src/engine/imap-db/imap-db-search-query.vala:190
 msgctxt "Search operator"
 msgid "to"
 msgstr "za"
@@ -1954,7 +2738,7 @@ msgstr "za"
 #. or similar to combine words into one), should be short, and
 #. also match the translation in "search.page" of the Geary User
 #. Guide.
-#: src/engine/imap-db/imap-db-account.vala:195
+#: src/engine/imap-db/imap-db-search-query.vala:211
 msgctxt "Search operator value - mail addressed to the user"
 msgid "me"
 msgstr "mene"
@@ -1966,7 +2750,7 @@ msgstr "mene"
 #. or similar to combine words into one), should be short, and
 #. also match the translation in "search.page" of the Geary User
 #. Guide.
-#: src/engine/imap-db/imap-db-account.vala:207
+#: src/engine/imap-db/imap-db-search-query.vala:223
 msgctxt "Search operator value - mail sent by the user"
 msgid "me"
 msgstr "mene"
@@ -1978,7 +2762,7 @@ msgstr "mene"
 #. or similar to combine words into one), should be short, and
 #. also match the translation in "search.page" of the Geary User
 #. Guide.
-#: src/engine/imap-db/imap-db-account.vala:219
+#: src/engine/imap-db/imap-db-search-query.vala:235
 msgctxt "'is:' search operator value"
 msgid "read"
 msgstr "prebrano"
@@ -1991,7 +2775,7 @@ msgstr "prebrano"
 #. or similar to combine words into one), should be short, and
 #. also match the translation in "search.page" of the Geary User
 #. Guide.
-#: src/engine/imap-db/imap-db-account.vala:230
+#: src/engine/imap-db/imap-db-search-query.vala:246
 msgctxt "'is:' search operator value"
 msgid "starred"
 msgstr "zvezdica"
@@ -2003,7 +2787,7 @@ msgstr "zvezdica"
 #. or similar to combine words into one), should be short, and
 #. also match the translation in "search.page" of the Geary User
 #. Guide.
-#: src/engine/imap-db/imap-db-account.vala:240
+#: src/engine/imap-db/imap-db-search-query.vala:256
 msgctxt "'is:' search operator value"
 msgid "unread"
 msgstr "neprebrano"
@@ -2012,7 +2796,7 @@ msgstr "neprebrano"
 #. Draft mailbox. Separate names using a vertical bar and
 #. put the most common localized name to the front for the
 #. default. English names do not need to be included.
-#: src/engine/imap-engine/imap-engine-generic-account.vala:898
+#: src/engine/imap-engine/imap-engine-generic-account.vala:998
 msgid "Drafts | Draft"
 msgstr "Osnutki | Osnutek"
 
@@ -2020,22 +2804,22 @@ msgstr "Osnutki | Osnutek"
 #. Sent mailbox. Separate names using a vertical bar and
 #. put the most common localized name to the front for the
 #. default. English names do not need to be included.
-#: src/engine/imap-engine/imap-engine-generic-account.vala:907
+#: src/engine/imap-engine/imap-engine-generic-account.vala:1007
 msgid "Sent | Sent Mail | Sent Email | Sent E-Mail"
 msgstr "Poslano | Poslana sporočila | Poslana pošta"
 
 #. The localised name(s) of the Sent folder name as used
 #. by MS Outlook/Exchange.
-#: src/engine/imap-engine/imap-engine-generic-account.vala:912
+#: src/engine/imap-engine/imap-engine-generic-account.vala:1012
 msgctxt "Outlook localised name"
 msgid "Sent Items"
 msgstr "Poslani predmeti"
 
 #. List of general possible folder names to match for the
-#. Spam mailbox. Separate names using a vertical bar and
-#. put the most common localized name to the front for the
-#. default. English names do not need to be included.
-#: src/engine/imap-engine/imap-engine-generic-account.vala:922
+#. Junk/Spam mailbox. Separate names using a vertical bar
+#. and put the most common localized name to the front for
+#. the default. English names do not need to be included.
+#: src/engine/imap-engine/imap-engine-generic-account.vala:1022
 msgid ""
 "Junk | Spam | Junk Mail | Junk Email | Junk E-Mail | Bulk Mail | Bulk Email "
 "| Bulk E-Mail"
@@ -2047,13 +2831,13 @@ msgstr ""
 #. Trash mailbox. Separate names using a vertical bar and
 #. put the most common localized name to the front for the
 #. default. English names do not need to be included.
-#: src/engine/imap-engine/imap-engine-generic-account.vala:932
+#: src/engine/imap-engine/imap-engine-generic-account.vala:1032
 msgid "Trash | Rubbish | Rubbish Bin"
 msgstr "Smeti | Smetnjak"
 
 #. The localised name(s) of the Trash folder name as used
 #. by MS Outlook/Exchange.
-#: src/engine/imap-engine/imap-engine-generic-account.vala:937
+#: src/engine/imap-engine/imap-engine-generic-account.vala:1037
 msgctxt "Outlook localised name"
 msgid "Deleted Items"
 msgstr "Izbrisani predmeti"
@@ -2062,95 +2846,105 @@ msgstr "Izbrisani predmeti"
 #. Archive mailbox. Separate names using a vertical bar
 #. and put the most common localized name to the front for
 #. the default. English names do not need to be included.
-#: src/engine/imap-engine/imap-engine-generic-account.vala:947
+#: src/engine/imap-engine/imap-engine-generic-account.vala:1047
 msgid "Archive | Archives"
 msgstr "Arhiv | Arhivi"
 
-#. / Format for the datetime that a message being replied to was received
-#. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#: src/engine/rfc822/rfc822-utils.vala:236
-msgid "%a, %b %-e, %Y at %-l:%M %p"
-msgstr "%a, %-e. %b, %Y ob %-l:%M %p"
-
-#. / The quoted header for a message being replied to.
-#. / %1$s will be substituted for the date, and %2$s will be substituted for
-#. / the original sender.
-#: src/engine/rfc822/rfc822-utils.vala:242
+#: src/engine/rfc822/rfc822-message.vala:528
 #, c-format
-msgid "On %1$s, %2$s wrote:"
-msgstr "%1$s %2$s:"
+msgid "Could not determine mime type for “%s”."
+msgstr ""
 
-#. / The quoted header for a message being replied to (in case the date is not known).
-#. / %s will be replaced by the original sender.
-#: src/engine/rfc822/rfc822-utils.vala:249
+#: src/engine/rfc822/rfc822-message.vala:539
 #, c-format
-msgid "%s wrote:"
-msgstr "%s sporoča:"
+msgid "Could not determine content type for mime type “%s” on “%s”."
+msgstr ""
 
-#. / The quoted header for a message being replied to (in case the sender is not known).
-#. / %s will be replaced by the original date
-#: src/engine/rfc822/rfc822-utils.vala:255
-#, c-format
-msgid "On %s:"
-msgstr "Na %s:"
+#: src/engine/rfc822/rfc822-message.vala:1013
+msgid "(no subject)"
+msgstr "(brez zadeve)"
 
-#: src/engine/rfc822/rfc822-utils.vala:282
-msgid "---------- Forwarded message ----------"
-msgstr "---------- Posredovano sporočilo ----------"
+#: ui/accounts_editor_add_pane.ui:8 ui/accounts_editor_list_pane.ui:126
+msgid "Add an account"
+msgstr "Dodaj račun"
 
-#: src/engine/rfc822/rfc822-utils.vala:286
-#, c-format
-msgid "From: %s\n"
-msgstr "Od: %s\n"
+#: ui/accounts_editor_add_pane.ui:53
+msgid "_Create"
+msgstr "_Ustvari"
 
-#: src/engine/rfc822/rfc822-utils.vala:287
-#, c-format
-msgid "Subject: %s\n"
-msgstr "Zadeva: %s\n"
+#: ui/accounts_editor_add_pane.ui:131 ui/accounts_editor_servers_pane.ui:125
+msgid "Receiving"
+msgstr "Prejemanje"
 
-#: src/engine/rfc822/rfc822-utils.vala:288
-#, c-format
-msgid "Date: %s\n"
-msgstr "Datum: %s\n"
+#: ui/accounts_editor_add_pane.ui:179 ui/accounts_editor_servers_pane.ui:165
+msgid "Sending"
+msgstr "Pošiljanje"
 
-#: src/engine/rfc822/rfc822-utils.vala:291
-#, c-format
-msgid "To: %s\n"
-msgstr "Za: %s\n"
+#: ui/accounts_editor_edit_pane.ui:8
+msgid "Edit Account"
+msgstr "Uredi račun"
 
-#: src/engine/rfc822/rfc822-utils.vala:294
-#, c-format
-msgid "Cc: %s\n"
-msgstr "Kp: %s\n"
+#: ui/accounts_editor_edit_pane.ui:9 ui/accounts_editor_servers_pane.ui:9
+msgid "Account Name"
+msgstr "Ime računa"
 
-#: ui/account_cannot_remove.glade:40
-msgid "<span weight=\"bold\" size=\"larger\">Cannot remove account</span> "
-msgstr ""
-"<span weight=\"bold\" size=\"larger\">Računa ni mogoče odstraniti</span> "
+#: ui/accounts_editor_edit_pane.ui:124
+msgid "Email addresses"
+msgstr "Elektronski naslov"
 
-#: ui/account_cannot_remove.glade:56
-msgid ""
-"A composer window associated with this account is currently open. Send or "
-"discard the message and try again."
-msgstr ""
-"Ta račun je trenutno odprto okno za sestavljalnika sporoči. Pošljite ali "
-"zavrzite sporočilo in poskusite znova."
+#: ui/accounts_editor_edit_pane.ui:164
+msgid "Signature"
+msgstr "Podpis"
 
-#: ui/account_list.glade:69
-msgid "Add account"
-msgstr "Dodaj račun"
+#: ui/accounts_editor_edit_pane.ui:201
+msgid "Settings"
+msgstr "Nastavitve"
 
-#: ui/account_list.glade:82
-msgid "Edit account"
-msgstr "Uredi račun"
+#. This is a button in the account settings to show server settings.
+#: ui/accounts_editor_edit_pane.ui:243 ui/accounts_editor_servers_pane.ui:8
+msgid "Server Settings"
+msgstr "Nastavitve strežnika"
+
+#. This is the remove account button in the account settings.
+#: ui/accounts_editor_edit_pane.ui:258 ui/accounts_editor_remove_pane.ui:23
+msgid "Remove Account"
+msgstr "Odstrani račun"
 
-#: ui/account_list.glade:95
+#: ui/accounts_editor_edit_pane.ui:262 ui/accounts_editor_remove_pane.ui:27
+msgid "Remove this account from Geary"
+msgstr "Odstrani račun iz programa Geary"
+
+#: ui/accounts_editor_list_pane.ui:8
+msgid "Accounts"
+msgstr "Računi"
+
+#: ui/accounts_editor_list_pane.ui:62
+msgid "To get started, select an email provider below."
+msgstr "Za začetek izberite ponudnika elektronske pošte."
+
+#: ui/accounts_editor_list_pane.ui:75
+msgid "Welcome to Geary"
+msgstr "Dobrodošli v programu Geary"
+
+#. This title is shown to users when confirming if they want to remove an account. The string substitution 
is replaced with the account's name.
+#: ui/accounts_editor_remove_pane.ui:73
+#, c-format
+msgid "Confirm removing: %s"
+msgstr "Potrdite odstranjevanje: %s"
+
+#: ui/accounts_editor_remove_pane.ui:91
+msgid ""
+"Removing an account will remove it from Geary and delete locally cached "
+"email data from your computer, but not from your service provider."
+msgstr ""
+
+#: ui/accounts_editor_remove_pane.ui:122
 msgid "Remove account"
 msgstr "Odstrani račun"
 
-#: ui/account_spinner.glade:41
-msgid "Please wait while Geary validates your account."
-msgstr "Prosimo počakajte, da Geary potrdi vaš račun."
+#: ui/accounts_editor_servers_pane.ui:47
+msgid "Apply"
+msgstr "Uveljavi"
 
 #: ui/certificate_warning_dialog.glade:7
 msgid "Untrusted Connection"
@@ -2168,218 +2962,354 @@ msgstr "_Zaupaj strežniku"
 msgid "_Don’t Trust This Server"
 msgstr "_Ne zaupaj strežniku"
 
-#: ui/composer-headerbar.ui:17 ui/composer-headerbar.ui:174
-msgid "Detach (Ctrl+D)"
-msgstr "Odpni (CTRL+D)"
+#: ui/composer-editor.ui:100
+msgid "Bold text"
+msgstr "Krepko besedilo"
 
-#: ui/composer-headerbar.ui:57 ui/composer-headerbar.ui:83
-msgid "Attach File (Ctrl+T)"
-msgstr "Priloži datoteko (CTRL+T)"
+#: ui/composer-editor.ui:124
+msgid "Italic text"
+msgstr "Ležeče besedilo"
 
-#: ui/composer-headerbar.ui:107
-msgid "Include Original Attachments"
-msgstr "Vključi izvorne priloge"
+#: ui/composer-editor.ui:148
+msgid "Underline text"
+msgstr "Podčrtano besedilo"
 
-#: ui/composer-headerbar.ui:202
-msgid "_Send"
-msgstr "_Pošlji"
+#: ui/composer-editor.ui:172
+msgid "Strikethrough text"
+msgstr "Prečrtano besedilo"
 
-#: ui/composer-headerbar.ui:207
-msgid "Send (Ctrl+Enter)"
-msgstr "Pošlji (CTRL+Enter)"
+#: ui/composer-editor.ui:205
+msgid "Insert bulleted list"
+msgstr "Vstavi vrstični seznam"
 
-#: ui/composer-headerbar.ui:230
-msgid "Discard and Close"
-msgstr "Zavrzi in zapri"
+#: ui/composer-editor.ui:229
+msgid "Insert numbered list"
+msgstr "Vstavi oštevilčen seznam"
 
-#: ui/composer-headerbar.ui:254
-msgid "Save and Close"
-msgstr "Shrani in zapri"
+#: ui/composer-editor.ui:262
+msgid "Indent or quote text"
+msgstr "zamakni navedeno besedilo"
 
-#. Note that this button and the Update button will never be shown at the same time to the user.
-#: ui/composer-link-popover.ui:41
-msgid "Insert the new link with this URL"
-msgstr "Ustavi novo povezavo s tem naslovom URL"
+#: ui/composer-editor.ui:286
+msgid "Un-indent or unquote text"
+msgstr "Odstrani zamik oziroma zamaknjeno besedilo"
 
-#: ui/composer-link-popover.ui:52
-msgid "Link URL"
-msgstr "Naslov URL povezave"
+#: ui/composer-editor.ui:315
+msgid "Remove text formatting"
+msgstr "Odstrani oblikovanje besedila"
 
-#. Note that this button and the Insert button will never be shown at the same time to the user.
-#: ui/composer-link-popover.ui:66
-msgid "Update this link’s URL"
-msgstr "Posodobi naslov URL povezave"
+#: ui/composer-editor.ui:334
+msgid "Change font type"
+msgstr "Spremeni vrsto pisave"
 
-#: ui/composer-link-popover.ui:86
-msgid "Delete this link"
-msgstr "Izbriši povezavo"
+#: ui/composer-editor.ui:349
+msgid "Sans Serif"
+msgstr "Brez-serifna"
+
+#: ui/composer-editor.ui:360
+msgid "Serif"
+msgstr "Serifna"
+
+#: ui/composer-editor.ui:371
+msgid "Fixed Width"
+msgstr "Nespremenljiva širina"
+
+#: ui/composer-editor.ui:397
+msgid "Change font color"
+msgstr "Spremeni barvo pisave"
+
+#: ui/composer-editor.ui:412
+msgid "Change font size"
+msgstr "Spremeni velikost pisave"
+
+#: ui/composer-editor.ui:447
+msgid "Insert or update text link"
+msgstr "Vstavi ali posodobi povezavo"
+
+#: ui/composer-editor.ui:471
+msgid "Insert an image"
+msgstr "Vstavi sliko"
+
+#: ui/composer-editor.ui:513
+msgid "Undo last edit"
+msgstr "Razveljavi zadnje urejanje"
 
-#: ui/composer-link-popover.ui:106
-msgid "Open this link"
-msgstr "Odpri povezavo"
+#: ui/composer-editor.ui:537
+msgid "Redo last edit"
+msgstr "Ponovno uveljavi urejanje"
 
-#: ui/composer-menus.ui:7
+#: ui/composer-editor.ui:566 ui/composer-editor.ui:591
+msgid "Attach a file"
+msgstr "Priloži datoteko"
+
+#: ui/composer-editor.ui:615
+msgid "Add original attachments"
+msgstr "Dodaj izvorne priloge"
+
+#: ui/composer-editor.ui:660
+msgid "More options"
+msgstr "Več možnosti"
+
+#: ui/composer-editor.ui:680
+msgid "Show formatting toolbar"
+msgstr "Pokaži orodno vrstico oblikovanja"
+
+#: ui/composer-editor.ui:698
+msgid "Select spell checking languages"
+msgstr "Izbor jezikov za preverjanje črkovanja"
+
+#: ui/composer-editor.ui:723
 msgid "S_ans Serif"
 msgstr "S_ans Serif"
 
-#: ui/composer-menus.ui:12
+#: ui/composer-editor.ui:728
 msgid "S_erif"
 msgstr "S_erif"
 
-#: ui/composer-menus.ui:17
+#: ui/composer-editor.ui:733
 msgid "_Fixed Width"
 msgstr "_Nespremenljiva širina"
 
-#: ui/composer-menus.ui:24
+#: ui/composer-editor.ui:743
 msgid "_Small"
 msgstr "_Majhna"
 
-#: ui/composer-menus.ui:29
+#: ui/composer-editor.ui:748
 msgid "_Medium"
 msgstr "_Srednja"
 
-#: ui/composer-menus.ui:34
+#: ui/composer-editor.ui:753
 msgid "Lar_ge"
 msgstr "_Velika"
 
-#: ui/composer-menus.ui:41
-msgid "C_olor"
-msgstr "_Barva"
-
-#: ui/composer-menus.ui:47 ui/composer-menus.ui:62
+#: ui/composer-editor.ui:763
 msgid "_Rich Text"
 msgstr "_Oblikovano besedilo"
 
-#: ui/composer-menus.ui:53 ui/composer-menus.ui:68
-msgid "Show Extended Fields"
-msgstr "Pokaži razširjena polja"
+#: ui/composer-editor.ui:768
+msgid "_Plain Text"
+msgstr "_Običajno besedilo"
 
-#: ui/composer-menus.ui:78
+#: ui/composer-editor-menus.ui:8
 msgid "_Undo"
 msgstr "_Razveljavi"
 
-#: ui/composer-menus.ui:82
+#: ui/composer-editor-menus.ui:12
 msgid "_Redo"
 msgstr "_Ponovi"
 
-#: ui/composer-menus.ui:88 ui/composer-menus.ui:106
+#: ui/composer-editor-menus.ui:18 ui/composer-editor-menus.ui:36
 msgid "Cu_t"
 msgstr "_Izreži"
 
-#: ui/composer-menus.ui:92 ui/composer-menus.ui:110
+#: ui/composer-editor-menus.ui:22 ui/composer-editor-menus.ui:40
 #: ui/conversation-message-menus.ui:37
 msgid "_Copy"
 msgstr "_Kopiraj"
 
-#: ui/composer-menus.ui:96 ui/composer-menus.ui:114
+#: ui/composer-editor-menus.ui:26 ui/composer-editor-menus.ui:44
 msgid "_Paste"
 msgstr "_Prilepi"
 
-#: ui/composer-menus.ui:100
-#, fuzzy
-#| msgctxt "Clipboard paste with rich text"
-#| msgid "Paste _With Formatting"
+#: ui/composer-editor-menus.ui:30
 msgctxt "Clipboard paste as plain text"
 msgid "Paste _Without Formatting"
-msgstr "Prilepi z _oblikovanjem"
+msgstr "Prilepi _brez oblikovanja"
 
-#: ui/composer-menus.ui:120
+#: ui/composer-editor-menus.ui:50
 msgid "Select _All"
 msgstr "Izberi _vse"
 
-#: ui/composer-menus.ui:127 ui/conversation-message-menus.ui:49
+#: ui/composer-editor-menus.ui:57 ui/conversation-message-menus.ui:43
 msgid "_Inspect…"
-msgstr "_Preveri ..."
+msgstr "_Preveri …"
+
+#: ui/composer-headerbar.ui:23 ui/composer-headerbar.ui:107
+msgid "Detach the composer from the window"
+msgstr "Odpni okno skladalnika z glavnega okna"
+
+#: ui/composer-headerbar.ui:135
+msgid "_Send"
+msgstr "_Pošlji"
+
+#: ui/composer-headerbar.ui:162
+msgid "Discard and Close"
+msgstr "Zavrzi in zapri"
+
+#: ui/composer-headerbar.ui:186
+msgid "Save and Close"
+msgstr "Shrani in zapri"
+
+#. Note that this button and the Update button will never be shown at the same time to the user.
+#: ui/composer-link-popover.ui:42
+msgid "Insert the new link with this URL"
+msgstr "Ustavi novo povezavo s tem naslovom URL"
+
+#: ui/composer-link-popover.ui:43
+msgid "Add"
+msgstr "Dodaj"
+
+#: ui/composer-link-popover.ui:47
+msgid "Link URL"
+msgstr "Naslov URL povezave"
+
+#. Note that this button and the Insert button will never be shown at the same time to the user.
+#: ui/composer-link-popover.ui:61
+msgid "Update this link’s URL"
+msgstr "Posodobi naslov URL povezave"
+
+#: ui/composer-link-popover.ui:62
+msgid "Update"
+msgstr "Posodobi"
+
+#: ui/composer-link-popover.ui:75
+msgid "Delete this link"
+msgstr "Izbriši povezavo"
+
+#. Geary account mail will be sent from
+#: ui/composer-widget.ui:61
+msgid "_From"
+msgstr "_Od"
 
 #. Address(es) e-mail is to be sent to
-#: ui/composer-widget.ui:56
+#: ui/composer-widget.ui:131
 msgid "_To"
 msgstr "_Za"
 
-#: ui/composer-widget.ui:75
+#: ui/composer-widget.ui:159
+msgid "Show Cc, Bcc, and Reply-To fields"
+msgstr ""
+
+#: ui/composer-widget.ui:220
 msgid "_Cc"
 msgstr "_Kp"
 
-#: ui/composer-widget.ui:130
-msgid "_Subject"
-msgstr "Z_adeva"
-
-#: ui/composer-widget.ui:149
+#: ui/composer-widget.ui:268
 msgid "_Bcc"
 msgstr "_Skp"
 
-#: ui/composer-widget.ui:179
+#: ui/composer-widget.ui:316
 msgid "_Reply-To"
-msgstr "_Odgovori na:"
+msgstr "_Odgovori"
 
-#. Geary account mail will be sent from
-#: ui/composer-widget.ui:208
-msgid "From"
-msgstr "Od"
+#: ui/composer-widget.ui:373
+msgid "_Subject"
+msgstr "Z_adeva"
 
-#: ui/composer-widget.ui:293
+#: ui/composer-widget.ui:446
 msgid "Drop files here"
 msgstr "Povlecite datoteke sem"
 
-#: ui/composer-widget.ui:309
+#: ui/composer-widget.ui:462
 msgid "To add them as attachments"
-msgstr "Da jih dodate kot priponke."
+msgstr "Da jih dodate kot priloge."
+
+#: ui/components-attachment-pane.ui:29 ui/components-attachment-pane.ui:47
+msgid "Select all attachments"
+msgstr "Izberi vse priloge"
+
+#: ui/components-attachment-pane.ui:66
+msgid "Save selected attachments"
+msgstr "Shrani izbrane priloge"
 
-#: ui/composer-widget.ui:348
-msgid "Undo last edit (Ctrl+Z)"
-msgstr "Razveljavi zadnjo spremembo [CTRL+Z]"
+#: ui/components-attachment-pane.ui:85
+msgid "Open selected attachments"
+msgstr "Odpri izbrane priloge"
 
-#: ui/composer-widget.ui:372
-msgid "Redo last edit  (Ctrl+Shift+Z)"
-msgstr "Ponovno uveljavi zadnje urejanje (CTRL+SHIFT+Z)"
+#: ui/components-attachment-pane-menus.ui:17
+msgid "Save _All"
+msgstr "Shrani _vse"
 
-#: ui/composer-widget.ui:410
-msgid "Bold (Ctrl+B)"
-msgstr "Krepko (CTRL+B)"
+#: ui/components-inspector-error-view.ui:31
+msgid ""
+"If the problem is serious or persists, please save and send these details to "
+"one of the <a href=\"https://wiki.gnome.org/Apps/Geary/Contact\";>contact "
+"channels</a> or attach to a <a href=\"https://wiki.gnome.org/Apps/Geary/";
+"ReportingABug\">new bug report</a>."
+msgstr ""
 
-#: ui/composer-widget.ui:434
-msgid "Italic (Ctrl+I)"
-msgstr "Ležeče (CTRL+I)"
+#: ui/components-inspector-error-view.ui:47
+msgid "Details:"
+msgstr "Podrobnosti:"
 
-#: ui/composer-widget.ui:458
-msgid "Underline (Ctrl+U)"
-msgstr "Podčrtano (CTRL+U)"
+#. Tooltip for inspector button
+#. Tooltip for problem report button
+#: ui/components-inspector.ui:19 ui/problem-details-dialog.ui:24
+msgid "Search for matching log entries"
+msgstr "Poišči skladne vpise v dnevniku"
 
-#: ui/composer-widget.ui:482
-msgid "Strikethrough (Ctrl+K)"
-msgstr "Prečrtano (CTRL+K)"
+#. Tooltip for inspector button
+#: ui/components-inspector.ui:35
+msgid "Toggle appending new log entries"
+msgstr ""
 
-#: ui/composer-widget.ui:520
-msgid "Insert unordered list"
+#. Tooltip for inspector button
+#: ui/components-inspector.ui:55
+msgid "Add a marker entry to the log"
 msgstr ""
 
-#: ui/composer-widget.ui:544
-msgid "Insert ordered list"
-msgstr "Vstavi oštevilčen vrstični seznam"
+#. Tooltip for inspector button
+#. Tooltip for problem report button
+#: ui/components-inspector.ui:81 ui/problem-details-dialog.ui:51
+msgid "Save logs entries and details"
+msgstr "Shrani vnose dnevnika in podrobnosti izpisa"
 
-#: ui/composer-widget.ui:582
-msgid "Quote text  (Ctrl+])"
-msgstr "Dodaj narekovaje (CTRL+])"
+#. Tooltip for inspector button
+#. Tooltip for problem report button
+#: ui/components-inspector.ui:101 ui/problem-details-dialog.ui:67
+msgid "Copy to clipboard"
+msgstr "Kopiraj v odložišče"
 
-#: ui/composer-widget.ui:606
-msgid "Unquote text  (Ctrl+[)"
-msgstr "Odstrani izvorno besedilo"
+#. Tooltip for inspector button
+#: ui/components-inspector.ui:121
+msgid "Clears all log entries"
+msgstr "Počisti vse vpise dnevnika"
 
-#: ui/composer-widget.ui:644
-msgid "Insert or update selection link (Ctrl+L)"
-msgstr "Vstavi ali posodobi povezavo izbire (CTRL+L)"
+#: ui/conversation-contact-popover.ui:146
+msgid "New Conversation…"
+msgstr "Nov pogovor …"
 
-#: ui/composer-widget.ui:668
-msgid "Insert an image (Ctrl+G)"
-msgstr "Vstavi sliko (CTRL+G)"
+#: ui/conversation-contact-popover.ui:159
+msgid "Copy Email Address"
+msgstr "Kopiraj elektronski naslov"
 
-#: ui/composer-widget.ui:702
-msgid "Remove selection formatting (Ctrl+Space)"
-msgstr "Odstrani oblikovanje izbranega besedila (CTRL+Presledek)"
+#: ui/conversation-contact-popover.ui:182
+msgid "Save in Contacts…"
+msgstr "Shrani med stike …"
 
-#: ui/composer-widget.ui:726
-msgid "Select spell checking languages"
-msgstr "Izbor jezikov za preverjanje črkovanja"
+#: ui/conversation-contact-popover.ui:195
+msgid "Show Conversations"
+msgstr "Pokažremakni pogovore"
+
+#: ui/conversation-contact-popover.ui:208
+msgid "Open in Contacts"
+msgstr "Odpri v Stikih"
+
+#: ui/conversation-contact-popover.ui:221
+msgid "Always Load Remote Images"
+msgstr ""
+
+#. Title label on contact popover
+#: ui/conversation-contact-popover.ui:264
+#, fuzzy
+#| msgid "Remove email address"
+msgid "Deceptive email address"
+msgstr "Odstrani elektronski naslov"
+
+#. Contact popover label
+#: ui/conversation-contact-popover.ui:294
+msgid "This email address is:"
+msgstr "Elektronski naslov:"
+
+#. Contact popover label
+#: ui/conversation-contact-popover.ui:319
+msgid "But was forged as:"
+msgstr ""
+
+#. Contact popover label
+#: ui/conversation-contact-popover.ui:344
+msgid "The sender may not be trustworthy"
+msgstr ""
 
 #: ui/conversation-email.ui:27
 msgid "Save all attachments"
@@ -2395,53 +3325,16 @@ msgstr "Označi sporočilo z zvezdico"
 msgid "Mark this message as not starred"
 msgstr "Odstrani oznako z zvezdico s sporočila"
 
-#: ui/conversation-email.ui:95
-msgid "Display the message menu"
-msgstr "Prikaži meni sporočila"
+#. Translators: Menu item to reply to a specific message.
+#: ui/conversation-email-menus.ui:15
+msgid "Reply to _All"
+msgstr "Odgovori _vsem"
 
-#: ui/conversation-email.ui:161
-msgid "Open selected attachments"
-msgstr "Odpri izbrane priloge"
-
-#: ui/conversation-email.ui:178
-msgid "Save selected attachments"
-msgstr "Shrani izbrane priloge"
-
-#: ui/conversation-email.ui:195
-msgid "Select all attachments"
-msgstr "Izberi vse priloge"
-
-#: ui/conversation-email.ui:240
-msgid "Edit Draft"
-msgstr "Uredi osnutek"
-
-#: ui/conversation-email.ui:267
-msgid "Draft message"
-msgstr "Osnutek"
-
-#: ui/conversation-email.ui:283
-msgid "This message has not yet been sent."
-msgstr "Sporočilo še ni bilo poslano."
-
-#: ui/conversation-email.ui:329
-msgid "Message not saved"
-msgstr "Sporočilo ni shranjeno."
-
-#: ui/conversation-email.ui:345
-msgid "This message was sent, but has not been saved to your account."
-msgstr ""
-"Sporočilo je poslano, vendar pa kopija ni shranjena v mapo poslanih sporočil."
-
-#. Translators: Menu item to reply to a specific message.
-#: ui/conversation-email-menus.ui:15
-msgid "Reply to _All"
-msgstr "Odgovori _vsem"
-
-#. Translators: Menu item to mark a specific message as
-#. read.
-#: ui/conversation-email-menus.ui:30
-msgid "_Mark Read"
-msgstr "Označi kot _prebrano"
+#. Translators: Menu item to mark a specific message as
+#. read.
+#: ui/conversation-email-menus.ui:30
+msgid "_Mark Read"
+msgstr "Označi kot _prebrano"
 
 #: ui/conversation-email-menus.ui:36
 msgid "_Mark Unread"
@@ -2454,24 +3347,42 @@ msgid "Mark Unread From _Here"
 msgstr "Označi kot neprebrano od _tukaj"
 
 #. Translators: Menu item to move a single, specific message
-#. to the trash
+#. to the trash folder
 #: ui/conversation-email-menus.ui:50
-msgid "_Trash"
-msgstr "_Smeti"
+msgid "Move message to _Trash"
+msgstr "Premakni sporočilo v _smeti"
 
 #. Translators: Menu item to delete a single, specific message
 #: ui/conversation-email-menus.ui:57
-msgid "_Delete…"
-msgstr "_Izbriši …"
+msgid "_Delete message…"
+msgstr "_Izbriši sporočilo …"
 
 #. Translators: Menu item to view the source for a message
 #: ui/conversation-email-menus.ui:69
 msgid "_View Source"
 msgstr "_Pokaži izvorno kodo"
 
-#: ui/conversation-email-menus.ui:87
-msgid "_Save All"
-msgstr "Shrani _vse"
+#: ui/conversation-message-link-popover.ui:54
+msgid "But actually goes to:"
+msgstr "Vendar bo narejena preusmeritev na:"
+
+#: ui/conversation-message-link-popover.ui:84
+msgid "The link appears to go to:"
+msgstr "Videti je, da kaže povezava na:"
+
+#: ui/conversation-message-link-popover.ui:96
+msgid "Deceptive link found"
+msgstr "Zaznan je zavajajoča povezava"
+
+#: ui/conversation-message-link-popover.ui:111
+msgid "The email sender may be leading you to the wrong web site."
+msgstr "Pošiljatelj sporočila vas morda pošilja na napačno spletno mesto."
+
+#: ui/conversation-message-link-popover.ui:124
+msgid "If unsure, contact the sender and ask before continuing."
+msgstr ""
+"V kolikor niste prepričani, stopite v stik s pošiljateljem in vprašajte pred "
+"nadaljevanjem."
 
 #: ui/conversation-message-menus.ui:7
 msgid "_Open Link"
@@ -2482,8 +3393,8 @@ msgid "Copy Link _Address"
 msgstr "Kopiraj _naslov povezave"
 
 #: ui/conversation-message-menus.ui:17
-msgid "Send New _Message…"
-msgstr "Pošlji novo _sporočilo ..."
+msgid "_New Conversation…"
+msgstr "_Nov pogovor …"
 
 #: ui/conversation-message-menus.ui:21
 msgid "Copy Email _Address"
@@ -2491,108 +3402,48 @@ msgstr "Kopiraj _elektronski naslov"
 
 #: ui/conversation-message-menus.ui:27
 msgid "Save _Image As…"
-msgstr "Shrani sliko _kot ..."
+msgstr "Shrani sliko _kot …"
 
 #: ui/conversation-message-menus.ui:33
 msgid "_Select All"
 msgstr "_Izberi vse"
 
-#: ui/conversation-message-menus.ui:43
-msgid "Search for messages from"
-msgstr "Išči sporočila iz"
-
-#: ui/conversation-message.ui:64
+#: ui/conversation-message.ui:63
 msgid "From <email>"
 msgstr "Od <email>"
 
-#: ui/conversation-message.ui:80 ui/conversation-message.ui:179
+#: ui/conversation-message.ui:79 ui/conversation-message.ui:178
 msgid "1/1/1970\t"
 msgstr "1/1/1970\t"
 
-#: ui/conversation-message.ui:103
+#: ui/conversation-message.ui:102
 msgid "Preview body text."
 msgstr "Predogled besedila vsebine."
 
-#: ui/conversation-message.ui:203
+#: ui/conversation-message.ui:202
 msgid "Sent by:"
 msgstr "Pošiljatelj:"
 
-#: ui/conversation-message.ui:248
+#: ui/conversation-message.ui:247
 msgid "Reply to:"
 msgstr "Odgovori na:"
 
-#: ui/conversation-message.ui:292
+#: ui/conversation-message.ui:291
 msgid "Subject"
 msgstr "Zadeva"
 
-#: ui/conversation-message.ui:502
-msgid "Show Images"
-msgstr "Prikaži slike"
-
-#: ui/conversation-message.ui:515
-msgid "Always Show From Sender"
-msgstr "Vedno pokaži naslov pošiljatelja"
-
-#: ui/conversation-message.ui:543
-msgid "Remote images not shown"
-msgstr "Slike na oddaljenih strežnikih niso prikazane"
-
-#: ui/conversation-message.ui:560
-msgid "Only show remote images from senders you trust."
-msgstr ""
-"Slike z oddaljenih mest pokaži le, če je pošiljatelj na seznamu zaupljivih "
-"oseb."
-
-#: ui/conversation-message.ui:692
-msgid "But actually goes to:"
-msgstr "Vendar bo narejena preusmeritev na:"
-
-#: ui/conversation-message.ui:723
-msgid "The link appears to go to:"
-msgstr "Videti je, da kaže povezava na:"
-
-#: ui/conversation-message.ui:735
-msgid "Deceptive link found"
-msgstr "Zaznan je zavajajoča povezava"
-
-#: ui/conversation-message.ui:750
-msgid "The email sender may be leading you to the wrong web site."
-msgstr "Pošiljatelj sporočila vas morda pošilja na napačno spletno mesto."
-
-#: ui/conversation-message.ui:763
-msgid "If unsure, contact the sender and ask before continuing."
-msgstr ""
-"V kolikor niste prepričani, stopite v stik s pošiljateljem in vprašajte pred "
-"nadaljevanjem."
-
 #: ui/conversation-viewer.ui:60
 msgid "Find in conversation"
 msgstr "Najdi v pogovoru"
 
-#: ui/conversation-viewer.ui:74
+#: ui/conversation-viewer.ui:75
 msgid "Find the previous occurrence of the search string."
 msgstr "Najde predhodno pojavitev iskanega niza."
 
-#: ui/conversation-viewer.ui:95
+#: ui/conversation-viewer.ui:96
 msgid "Find the next occurrence of the search string."
 msgstr "Najde naslednjo pojavitev iskanega niza."
 
-#: ui/edit_alternate_emails.glade:112
-msgid "Remove email address"
-msgstr "Odstrani elektronski naslov"
-
-#: ui/edit_alternate_emails.glade:136
-msgid ""
-"Some email services require additional addresses be configured on the "
-"server.  Contact your email provider for more information."
-msgstr ""
-"Nekateri strežniki poštnih storitev zahtevajo dodatne nastavitve naslovov. "
-"Za več podrobnosti stopite v stik s ponudnikom poštnih storitev."
-
-#: ui/edit_alternate_emails.glade:175
-msgid "_Update"
-msgstr "_Posodobi"
-
 #: ui/find_bar.glade:66
 msgid "Find:"
 msgstr "Najdi:"
@@ -2617,528 +3468,954 @@ msgstr "oznaka"
 msgid "Conversation Shortcuts"
 msgstr "Tipkovna bližnjica pogovora"
 
-#: ui/gtk/help-overlay.ui:13 ui/gtk/help-overlay.ui:254
+#: ui/gtk/help-overlay.ui:13 ui/gtk/help-overlay.ui:377
 msgctxt "shortcut window"
-msgid "General"
-msgstr "Splošno"
+msgid "Actions"
+msgstr "Dejanja"
 
 #: ui/gtk/help-overlay.ui:17
 msgctxt "shortcut window"
-msgid "Move focus to the next/previous pane"
-msgstr "Premakni žarišče na naslednje/predhodno okno"
+msgid "New conversation"
+msgstr "Ustvari nov pogovor"
 
 #: ui/gtk/help-overlay.ui:24
 msgctxt "shortcut window"
-msgid "Move focus to conversation list"
-msgstr "Premakni žarišče na seznam pogovorov"
+msgid "Reply to sender"
+msgstr "Začne odgovor pošiljatelju"
 
-#: ui/gtk/help-overlay.ui:31
+#: ui/gtk/help-overlay.ui:31 ui/gtk/help-overlay.ui:281
 msgctxt "shortcut window"
-msgid "Detach composer window"
-msgstr "Odpni okno skladalnika"
+msgid "Reply to all"
+msgstr "Začne odgovor vsem"
 
-#: ui/gtk/help-overlay.ui:38
+#: ui/gtk/help-overlay.ui:38 ui/gtk/help-overlay.ui:288
 msgctxt "shortcut window"
-msgid "Close composer window"
-msgstr "Zapri okno skladalnika"
+msgid "Forward"
+msgstr "Posreduje sporočilo"
 
-#: ui/gtk/help-overlay.ui:45
+#: ui/gtk/help-overlay.ui:45 ui/gtk/help-overlay.ui:295
 msgctxt "shortcut window"
-msgid "Show keyboard shortcuts"
-msgstr "Pokaži tipkovne bližnjice‫"
+msgid "Un-mark/mark read"
+msgstr "Označi/Odstrani oznako kot prebrano"
 
-#: ui/gtk/help-overlay.ui:52
+#: ui/gtk/help-overlay.ui:52 ui/gtk/help-overlay.ui:302
 msgctxt "shortcut window"
-msgid "Show help"
-msgstr "Pokaži pomoč"
+msgid "Mark/un-mark starred"
+msgstr "Označi/Odstrani oznako zvezdice"
 
-#: ui/gtk/help-overlay.ui:59
+#: ui/gtk/help-overlay.ui:59 ui/gtk/help-overlay.ui:309
 msgctxt "shortcut window"
-msgid "Quit the application"
-msgstr "Končaj program"
+msgid "Archive conversations"
+msgstr "Arhivira pogovor"
+
+#: ui/gtk/help-overlay.ui:66 ui/gtk/help-overlay.ui:326
+msgctxt "shortcut window"
+msgid "Move conversations"
+msgstr "Premakne pogovor"
 
-#: ui/gtk/help-overlay.ui:68
+#: ui/gtk/help-overlay.ui:73 ui/gtk/help-overlay.ui:333
+msgctxt "shortcut window"
+msgid "Label conversations"
+msgstr "Označi pogovor"
+
+#: ui/gtk/help-overlay.ui:80
+msgctxt "shortcut window"
+msgid "Trash conversations"
+msgstr "Premakne pogovor v smeti"
+
+#: ui/gtk/help-overlay.ui:87 ui/gtk/help-overlay.ui:340
+msgctxt "shortcut window"
+msgid "Junk conversations"
+msgstr "Označi kot vsiljeno pošto"
+
+#: ui/gtk/help-overlay.ui:95 ui/gtk/help-overlay.ui:347
+msgctxt "shortcut window"
+msgid "Delete conversations"
+msgstr "Izbriši pogovore"
+
+#: ui/gtk/help-overlay.ui:104
 msgctxt "shortcut window"
 msgid "Search"
 msgstr "Iskanje"
 
-#: ui/gtk/help-overlay.ui:72
+#: ui/gtk/help-overlay.ui:108
 msgctxt "shortcut window"
-msgid "Jump to search box"
-msgstr "Skoči na iskalno polje"
+msgid "Search for conversations"
+msgstr "Odpre iskalnik med pogovori"
 
-#: ui/gtk/help-overlay.ui:79
+#: ui/gtk/help-overlay.ui:115 ui/gtk/help-overlay.ui:354
 msgctxt "shortcut window"
 msgid "Find in current conversation"
-msgstr "Najdi v pogovoru"
+msgstr "Poišče iskalni niz v pogovoru"
 
-#: ui/gtk/help-overlay.ui:86
+#: ui/gtk/help-overlay.ui:141
 msgctxt "shortcut window"
-msgid "Find next/previous in current conversation"
-msgstr "Najdi naslednjo/predhodno pojavitev iskalnega niza v pogovoru"
+msgid "Undo"
+msgstr "Razveljavljanje"
 
-#: ui/gtk/help-overlay.ui:95 ui/gtk/help-overlay.ui:274
+#: ui/gtk/help-overlay.ui:145
 msgctxt "shortcut window"
-msgid "Actions"
-msgstr "Dejanja"
+msgid "Undo the last action"
+msgstr "Razveljavi zadnje dejanje"
 
-#: ui/gtk/help-overlay.ui:99
+#: ui/gtk/help-overlay.ui:152
 msgctxt "shortcut window"
-msgid "Compose a new message"
-msgstr "Sestavi novo sporočilo"
+msgid "Redo the last action"
+msgstr "Ponovi zadnje dejanje"
 
-#: ui/gtk/help-overlay.ui:106
+#: ui/gtk/help-overlay.ui:161
 msgctxt "shortcut window"
-msgid "Reply to sender "
-msgstr "Odgovori pošiljatelju"
+msgid "View"
+msgstr "Pogled"
 
-#: ui/gtk/help-overlay.ui:113
+#: ui/gtk/help-overlay.ui:165
 msgctxt "shortcut window"
-msgid "Reply to all"
-msgstr "Odgovori vsem"
+msgid "Zoom in"
+msgstr "Približa pogled"
 
-#: ui/gtk/help-overlay.ui:120
+#: ui/gtk/help-overlay.ui:172
 msgctxt "shortcut window"
-msgid "Forward"
-msgstr "Posreduj"
+msgid "Zoom out"
+msgstr "Oddalji pogled"
 
-#: ui/gtk/help-overlay.ui:127
+#: ui/gtk/help-overlay.ui:179
 msgctxt "shortcut window"
-msgid "Archive"
-msgstr "Arhiv"
+msgid "Reset zoom"
+msgstr "Ponastavi približanje"
 
-#: ui/gtk/help-overlay.ui:134
+#: ui/gtk/help-overlay.ui:188 ui/gtk/help-overlay.ui:404
 msgctxt "shortcut window"
-msgid "Move to trash"
-msgstr "Premakni v smeti"
+msgid "General"
+msgstr "Splošno"
 
-#: ui/gtk/help-overlay.ui:141
+#: ui/gtk/help-overlay.ui:192
 msgctxt "shortcut window"
-msgid "Toggle spam"
-msgstr "Preklopi sporočilo kot neželeno"
+msgid "Show help"
+msgstr "Pokaže pomoč"
 
-#: ui/gtk/help-overlay.ui:148
+#: ui/gtk/help-overlay.ui:199
 msgctxt "shortcut window"
-msgid "Move the conversation"
-msgstr "Premakni pogovor"
+msgid "Show keyboard shortcuts"
+msgstr "Pokaže tipkovne bližnjice‫"
 
-#: ui/gtk/help-overlay.ui:155
+#: ui/gtk/help-overlay.ui:206
 msgctxt "shortcut window"
-msgid "Label the conversation"
-msgstr "Označi pogovor"
+msgid "Open a new window"
+msgstr "Odpre novo okno"
 
-#: ui/gtk/help-overlay.ui:163
+#: ui/gtk/help-overlay.ui:213
 msgctxt "shortcut window"
-msgid "Mark read"
-msgstr "Označi kot prebrano"
+msgid "Close the current window"
+msgstr "Zapre trenutno okno"
 
-#: ui/gtk/help-overlay.ui:170
+#: ui/gtk/help-overlay.ui:220
 msgctxt "shortcut window"
-msgid "Mark unread"
-msgstr "Označi kot neprebrano"
+msgid "Quit the application"
+msgstr "Konča program"
 
-#: ui/gtk/help-overlay.ui:179
+#: ui/gtk/help-overlay.ui:229
 msgctxt "shortcut window"
-msgid "View"
-msgstr "Pogled"
+msgid "Keyboard navigation"
+msgstr "Krmarjenje s tipkovnico"
 
-#: ui/gtk/help-overlay.ui:183
+#: ui/gtk/help-overlay.ui:233
 msgctxt "shortcut window"
-msgid "Zoom in"
-msgstr "Približaj"
+msgid "Go to next/previous pane"
+msgstr "Premakne žarišče na naslednje/predhodno okno"
 
-#: ui/gtk/help-overlay.ui:190
+#: ui/gtk/help-overlay.ui:241
 msgctxt "shortcut window"
-msgid "Zoom out"
-msgstr "Oddalji"
+msgid "Select next/previous conversation"
+msgstr "Izbere naslednji/predhodni pogovor"
 
-#: ui/gtk/help-overlay.ui:197
+#: ui/gtk/help-overlay.ui:248
 msgctxt "shortcut window"
-msgid "Reset zoom"
-msgstr "Ponastavi približanje"
+msgid "Focus next/previous message"
+msgstr "Premakne žarišče na naslednje/predhodno spodočilo"
 
-#: ui/gtk/help-overlay.ui:206
+#: ui/gtk/help-overlay.ui:260
+msgid "Single-key Shortcuts"
+msgstr "Enotipkovne bližnjice"
+
+#: ui/gtk/help-overlay.ui:265
 msgctxt "shortcut window"
-msgid "Additional Shortcuts"
-msgstr "Dodatne tipkovne bližnjice"
+msgid "Single-key shortcuts (if enabled)"
+msgstr "Enotipkovne bližnjice (če je možnost omogočena)"
 
-#: ui/gtk/help-overlay.ui:210
+#: ui/gtk/help-overlay.ui:274
 msgctxt "shortcut window"
-msgid "Star"
-msgstr "Dodaj zvezdico"
+msgid "Reply to sender "
+msgstr "Začne odgovor pošiljatelju"
 
-#: ui/gtk/help-overlay.ui:217
+#: ui/gtk/help-overlay.ui:361
 msgctxt "shortcut window"
-msgid "Unstar"
-msgstr "Odstrani zvezdico"
+msgid "Select next/previous conversations"
+msgstr "Izbere naslednje/predhodne pogovore"
+
+#: ui/gtk/help-overlay.ui:373
+msgid "Composer Shortcuts"
+msgstr "Tipkovne bližnjice skladalnika"
 
-#: ui/gtk/help-overlay.ui:224
+#: ui/gtk/help-overlay.ui:381
 msgctxt "shortcut window"
-msgid "Delete"
-msgstr "Izbriši"
+msgid "Send"
+msgstr "Pošlje sporočilo"
 
-#: ui/gtk/help-overlay.ui:231
+#: ui/gtk/help-overlay.ui:388
 msgctxt "shortcut window"
-msgid "Jump to next (older) conversation"
-msgstr "Skoči na naslednji (starejši) pogovor"
+msgid "Add attachment"
+msgstr "Odpre okno za dodajanje priloge"
 
-#: ui/gtk/help-overlay.ui:238
+#: ui/gtk/help-overlay.ui:395
 msgctxt "shortcut window"
-msgid "Jump to previous (newer) conversation"
-msgstr "Skoči na predhodni (novejši) pogovor"
+msgid "Detach the composer"
+msgstr "Odpne okno skladalnika"
 
-#: ui/gtk/help-overlay.ui:250
-msgid "Composer Shortcuts"
-msgstr "Tipkovne bližnjice skladalnika"
+#: ui/gtk/help-overlay.ui:408
+msgctxt "shortcut window"
+msgid "Close composer window"
+msgstr "Zapre okno skladalnika"
 
-#: ui/gtk/help-overlay.ui:258
+#: ui/gtk/help-overlay.ui:415
+msgctxt "shortcut window"
+msgid "Detach composer window"
+msgstr "Odpne okno skladalnika"
+
+#: ui/gtk/help-overlay.ui:422
+msgctxt "shortcut window"
+msgid "Editing"
+msgstr "Urejanje"
+
+#: ui/gtk/help-overlay.ui:427
+msgctxt "shortcut window"
+msgid "Move selection to the clipboard"
+msgstr "Premakne izbor v odložišče"
+
+#: ui/gtk/help-overlay.ui:434
+msgctxt "shortcut window"
+msgid "Copy selection to clipboard"
+msgstr "Kopira izbor v odložišče"
+
+#: ui/gtk/help-overlay.ui:441
+msgctxt "shortcut window"
+msgid "Paste from the clipboard"
+msgstr "Prilepi vsebino odložišča"
+
+#: ui/gtk/help-overlay.ui:448
 msgctxt "shortcut window"
 msgid "Quote text"
-msgstr "Navedi izvorno besedilo"
+msgstr "Navede izvorno besedilo"
 
-#: ui/gtk/help-overlay.ui:265
+#: ui/gtk/help-overlay.ui:455
 msgctxt "shortcut window"
 msgid "Unquote text"
 msgstr "Odstrani izvorno besedilo"
 
-#: ui/gtk/help-overlay.ui:278
-msgctxt "shortcut window"
-msgid "Send"
-msgstr "Pošlji"
-
-#: ui/gtk/help-overlay.ui:285
+#: ui/gtk/help-overlay.ui:464
 msgctxt "shortcut window"
-msgid "Add attachment"
-msgstr "Dodaj prilogo"
+msgid "Rich text editing"
+msgstr "Oblikovanje besedila"
 
-#: ui/gtk/help-overlay.ui:294
+#: ui/gtk/help-overlay.ui:468
 msgctxt "shortcut window"
-msgid "Rich text mode"
-msgstr "Oblikovano sporočilo"
+msgid "Paste without formatting"
+msgstr "Prilepi brez oblikovanja"
 
-#: ui/gtk/help-overlay.ui:298
+#: ui/gtk/help-overlay.ui:475
 msgctxt "shortcut window"
 msgid "Bold text"
-msgstr "Krepko besedilo"
+msgstr "Oblikuje besedilo krepko"
 
-#: ui/gtk/help-overlay.ui:305
+#: ui/gtk/help-overlay.ui:482
 msgctxt "shortcut window"
 msgid "Italicize text"
-msgstr "Ležeče besedilo"
+msgstr "Oblikuje besedilo ležeče"
 
-#: ui/gtk/help-overlay.ui:312
+#: ui/gtk/help-overlay.ui:489
 msgctxt "shortcut window"
 msgid "Underline text"
-msgstr "Podčrtano besedilo"
+msgstr "Podčrta besedilo"
 
-#: ui/gtk/help-overlay.ui:319
+#: ui/gtk/help-overlay.ui:496
 msgctxt "shortcut window"
 msgid "Strike text"
-msgstr "Prečrtano besedilo"
+msgstr "Prečrta besedilo"
+
+#: ui/gtk/help-overlay.ui:503
+msgctxt "shortcut window"
+msgid "Remove formatting"
+msgstr "Odstrani oblikovanje"
 
-#: ui/gtk/help-overlay.ui:326
+#: ui/gtk/help-overlay.ui:510
+msgctxt "shortcut window"
+msgid "Insert an image"
+msgstr "Vstavi sliko"
+
+#: ui/gtk/help-overlay.ui:517
 msgctxt "shortcut window"
 msgid "Insert a link"
 msgstr "Vstavi povezavo"
 
-#: ui/gtk/help-overlay.ui:333
-msgctxt "shortcut window"
-msgid "Remove formatting"
-msgstr "Odstrani oblikovanje"
+#: ui/main-toolbar.ui:24
+msgctxt "tooltip"
+msgid "Compose Message"
+msgstr "Odpre okno sestavljalnika sporočil"
 
-#: ui/gtk/menus.ui:13
-msgid "A_ccounts"
+#: ui/main-toolbar.ui:62
+msgid "Toggle search bar"
+msgstr "Preklopi prikaz iskalne vrstice"
+
+#: ui/main-toolbar.ui:114
+msgid "Reply"
+msgstr "Odgovori"
+
+#: ui/main-toolbar.ui:137
+msgid "Reply All"
+msgstr "Odgovori vsem"
+
+#: ui/main-toolbar.ui:160
+msgid "Forward"
+msgstr "Posreduj"
+
+#: ui/main-toolbar.ui:265
+msgid "Toggle find bar"
+msgstr "Preklopi vrstico iskanja"
+
+#: ui/main-toolbar.ui:286
+msgid "_Archive"
+msgstr "_Arhiv"
+
+#: ui/main-toolbar-menus.ui:21
+msgid "Toggle as _Junk"
+msgstr "Preklopi sporočilo kot _neželeno"
+
+#: ui/main-toolbar-menus.ui:28
+msgid "_Accounts"
 msgstr "_Računi"
 
-#: ui/gtk/menus.ui:23
+#: ui/main-toolbar-menus.ui:36
 msgid "_Keyboard Shortcuts"
 msgstr "_Tipkovne bližnjice‫"
 
-#: ui/login.glade:88
-msgid "email example com"
-msgstr "elektronski naslov primer si"
+#: ui/main-toolbar-menus.ui:47
+msgid "_About Geary"
+msgstr "_O programu"
 
-#: ui/login.glade:107 ui/password-dialog.glade:108
-msgid "Password"
-msgstr "Geslo"
+#: ui/password-dialog.glade:74
+msgid "SMTP Credentials"
+msgstr "Poverila SMTP"
 
-#: ui/login.glade:123
-msgid "E_mail address"
-msgstr "_Elektronski naslov"
+#: ui/password-dialog.glade:91
+msgid "Username"
+msgstr "Uporabniško ime"
 
-#: ui/login.glade:144 ui/login.glade:635
-msgid "_Password"
-msgstr "_Geslo"
+#: ui/password-dialog.glade:152
+msgid "_Remember password"
+msgstr "_Zapomni si geslo"
 
-#: ui/login.glade:178
-msgid "S_ervice"
-msgstr "_Storitev"
+#: ui/password-dialog.glade:210
+msgid "_Authenticate"
+msgstr "_Overi"
 
-#: ui/login.glade:199
-msgid "N_ame"
-msgstr "_Ime"
+#: ui/upgrade_dialog.glade:60
+msgid "Geary update in progress…"
+msgstr "V teku je posodobitev programa Geary …"
 
-#: ui/login.glade:256
-msgid "N_ickname"
-msgstr "_Vzdevek"
+#, fuzzy, c-format
+#~| msgid "Remove Account"
+#~ msgid "Remove Account: %s"
+#~ msgstr "Odstrani račun"
 
-#: ui/login.glade:280
-msgid "Work, Home, etc."
-msgstr "Delovno mesto, domači naslov, itd."
+#~ msgid "Account update"
+#~ msgstr "Posodobitev računa"
 
-#: ui/login.glade:291
-msgid "_Save sent mail"
-msgstr "_Shrani poslana sporočila"
+#, fuzzy
+#~| msgid "Reply to:"
+#~ msgid "_Reply to"
+#~ msgstr "Odgovori na:"
 
-#: ui/login.glade:309
-msgid "Addi_tional email addresses…"
-msgstr "Dodatni _elektronski naslovi ..."
+#~ msgid "Application Shortcuts"
+#~ msgstr "Programske tipkovne bližnjice"
 
-#: ui/login.glade:353
-msgid "IMAP settings"
-msgstr "Nastavitve IMAP"
+#~ msgctxt "shortcut window"
+#~ msgid "Select Inbox"
+#~ msgstr "Izbor dohodnega predala"
 
-#: ui/login.glade:372
-msgid "Se_rver"
-msgstr "_Strežnik"
+#~ msgid "Enable notification sounds"
+#~ msgstr "Omogoči zvok obvestil"
 
-#: ui/login.glade:393
-msgid "imap.example.com"
-msgstr "imap primer si"
+#, fuzzy, c-format
+#~| msgid "%d message"
+#~| msgid_plural "%d messages"
+#~ msgid "Moved %d message to %s"
+#~ msgid_plural "Moved %d messages to %s"
+#~ msgstr[0] "%d sporočil"
+#~ msgstr[1] "%d sporočilo"
+#~ msgstr[2] "%d sporočili"
+#~ msgstr[3] "%d sporočila"
 
-#: ui/login.glade:409
-msgid "P_ort"
-msgstr "_Vrata"
+#, c-format
+#~ msgid "Error emptying %s"
+#~ msgstr "Napaka praznjenja %s"
 
-#: ui/login.glade:448
-msgid "smtp.example.com"
-msgstr "smtp primer si"
+#, fuzzy, c-format
+#~| msgid "%d message"
+#~| msgid_plural "%d messages"
+#~ msgid "Trashed %d message"
+#~ msgid_plural "Trashed %d messages"
+#~ msgstr[0] "%d sporočil"
+#~ msgstr[1] "%d sporočilo"
+#~ msgstr[2] "%d sporočili"
+#~ msgstr[3] "%d sporočila"
 
-#: ui/login.glade:480
-msgid "Ser_ver"
-msgstr "St_režnik"
+#, fuzzy, c-format
+#~| msgid "%d message"
+#~| msgid_plural "%d messages"
+#~ msgid "Archived %d message"
+#~ msgid_plural "Archived %d messages"
+#~ msgstr[0] "%d sporočil"
+#~ msgstr[1] "%d sporočilo"
+#~ msgstr[2] "%d sporočili"
+#~ msgstr[3] "%d sporočila"
 
-#: ui/login.glade:501
-msgid "Por_t"
-msgstr "_Vrata"
+#~ msgid "Failed to open default text editor."
+#~ msgstr "Odpiranje privzetega urejevalnika besedila je spodletelo."
 
-#: ui/login.glade:522
-msgid "SMTP settings"
-msgstr "Nastavitve SMTP"
+#~ msgid "Log periodic activity"
+#~ msgstr "Beleži dejavnost"
 
-#: ui/login.glade:541
-msgid "User_name"
-msgstr "_Uporabniško ime"
+#, fuzzy
+#~| msgid "Log network serialization"
+#~ msgid "Log IMAP network serialization"
+#~ msgstr "Beleži zaporejanje omrežja"
 
-#: ui/login.glade:562
-msgid "Pass_word"
-msgstr "_Geslo"
+#, c-format
+#~ msgid "Indexing %s account"
+#~ msgstr "Poteka ustvarjanje kazala računa %s"
 
-#: ui/login.glade:582
-msgid "SMTP username"
-msgstr "Uporabniško ime SMTP"
+#~ msgid "Sent Mail"
+#~ msgstr "Poslano"
 
-#: ui/login.glade:598
-msgid "SMTP password"
-msgstr "Geslo SMTP"
+#~ msgid "Spam"
+#~ msgstr "Neželena pošta"
 
-#: ui/login.glade:614
-msgid "_Username"
-msgstr "_Uporabniško ime"
+#~ msgid "Detach (Ctrl+D)"
+#~ msgstr "Odpni (CTRL+D)"
 
-#: ui/login.glade:655
-msgid "IMAP username"
-msgstr "Uporabniško ime IMAP"
+#~ msgid "Attach File (Ctrl+T)"
+#~ msgstr "Priloži datoteko (CTRL+T)"
 
-#: ui/login.glade:671
-msgid "IMAP password"
-msgstr "Geslo IMAP"
+#~ msgid "Send (Ctrl+Enter)"
+#~ msgstr "Pošlji (CTRL+Enter)"
 
-#: ui/login.glade:688
-msgid "Encr_yption"
-msgstr "_Šifriranje"
+#~ msgid "Open this link"
+#~ msgstr "Odpri povezavo"
 
-#: ui/login.glade:711
-msgid "Encrypt_ion"
-msgstr "Ši_friranje"
+#~ msgid "C_olor"
+#~ msgstr "_Barva"
 
-#: ui/login.glade:733 ui/login.glade:751
-msgid "SSL/TLS"
-msgstr "SSL/TLS"
+#~ msgid "Show Extended Fields"
+#~ msgstr "Pokaži razširjena polja"
 
-#: ui/login.glade:734 ui/login.glade:752
-msgid "STARTTLS"
-msgstr "STARTTLS"
+#~ msgid "From"
+#~ msgstr "Od"
 
-#: ui/login.glade:764
-msgid "No authentication re_quired"
-msgstr "_Overitev ni potrebna"
+#~ msgid "Redo last edit  (Ctrl+Shift+Z)"
+#~ msgstr "Ponovno uveljavi zadnje urejanje (CTRL+SHIFT+Z)"
 
-#: ui/login.glade:781
-msgid "Use IMAP cre_dentials"
-msgstr "Uporabi poverilnice _IMAP"
+#~ msgid "Bold (Ctrl+B)"
+#~ msgstr "Krepko (CTRL+B)"
 
-#: ui/login.glade:888
-msgid "Composer"
-msgstr "Sestavljalnik"
+#~ msgid "Italic (Ctrl+I)"
+#~ msgstr "Ležeče (CTRL+I)"
 
-#: ui/login.glade:901
-msgid "Save dra_fts on server"
-msgstr "Shrani osnutke na strežnik"
+#~ msgid "Underline (Ctrl+U)"
+#~ msgstr "Podčrtano (CTRL+U)"
 
-#: ui/login.glade:918
-msgid "Si_gn emails (HTML allowed):"
-msgstr "_Podpiši sporočila (s podporo za HTML):"
+#~ msgid "Strikethrough (Ctrl+K)"
+#~ msgstr "Prečrtano (CTRL+K)"
 
-#: ui/login.glade:976
-msgid "Storage"
-msgstr "Shramba"
+#~ msgid "Quote text  (Ctrl+])"
+#~ msgstr "Dodaj narekovaje (CTRL+])"
 
-#: ui/login.glade:998
-msgid "_Download mail"
-msgstr "_Prejmi sporočila"
+#~ msgid "Unquote text  (Ctrl+[)"
+#~ msgstr "Odstrani izvorno besedilo"
 
-#: ui/main-toolbar.ui:51
-msgid "Toggle search bar"
-msgstr "Preklopi prikaz iskalne vrstice"
+#~ msgid "Insert an image (Ctrl+G)"
+#~ msgstr "Vstavi sliko (CTRL+G)"
 
-#: ui/main-toolbar.ui:72
-msgid "Empty Spam or Trash folders"
-msgstr "Izprazni mapi smeti in neželene pošte"
+#~ msgid "Remove selection formatting (Ctrl+Space)"
+#~ msgstr "Odstrani oblikovanje izbranega besedila (CTRL+Presledek)"
 
-#: ui/main-toolbar.ui:112
-msgid "Reply"
-msgstr "Odgovori"
+#~ msgid "Display the message menu"
+#~ msgstr "Prikaži meni sporočila"
 
-#: ui/main-toolbar.ui:135
-msgid "Reply All"
-msgstr "Odgovori vsem"
+#~ msgid "Edit Draft"
+#~ msgstr "Uredi osnutek"
 
-#: ui/main-toolbar.ui:158
-msgid "Forward"
-msgstr "Posreduj"
+#~ msgctxt "shortcut window"
+#~ msgid "Archive conversation"
+#~ msgstr "Arhivira pogovor"
 
-#: ui/main-toolbar.ui:264
-msgid "Toggle find bar"
-msgstr "Preklopi vrstico iskanja"
+#~ msgctxt "shortcut window"
+#~ msgid "Move conversation"
+#~ msgstr "Premakne pogovor"
 
-#: ui/main-toolbar.ui:306
-msgid "_Archive"
-msgstr "_Arhiv"
+#~ msgctxt "shortcut window"
+#~ msgid "Move to Spam"
+#~ msgstr "Premakne pogovor med neželeno pošto"
 
-#: ui/main-toolbar-menus.ui:5
-msgid "Empty _Spam…"
-msgstr "Izprazni mapo _neželene pošte"
+#~ msgctxt "shortcut window"
+#~ msgid "Delete conversation"
+#~ msgstr "Izbriše pogovor"
 
-#: ui/main-toolbar-menus.ui:9
-msgid "Empty _Trash…"
-msgstr "Izprazni _smeti"
+#~ msgctxt "shortcut window"
+#~ msgid "Focus the next pane"
+#~ msgstr "Premakne žarišče na naslednje okno"
 
-#: ui/main-toolbar-menus.ui:32
-msgid "Mark as S_pam"
-msgstr "Označi kot _neželeno pošto"
+#~ msgctxt "shortcut window"
+#~ msgid "Focus the conversation list"
+#~ msgstr "Premakne žarišče na seznam pogovorov"
 
-#: ui/main-toolbar-menus.ui:36
-msgid "Mark as not S_pam"
-msgstr "Označi kot _želeno pošto"
+#~ msgctxt "shortcut window"
+#~ msgid "Select the conversation down"
+#~ msgstr "Izbere pogovor nižje"
 
-#: ui/main-window-info-bar.ui:97
-msgid ""
-"If the problem is serious or persists, please copy and send these details to "
-"the <a href=\"https://wiki.gnome.org/Apps/Geary/Contact\";>mailing list</a> "
-"or file a <a href=\"https://wiki.gnome.org/Apps/Geary/ReportingABug\";>new "
-"bug report</a>."
-msgstr ""
+#~ msgid "Mark as S_pam"
+#~ msgstr "Označi kot _neželeno pošto"
 
-#: ui/main-window-info-bar.ui:113
-msgid "Details:"
-msgstr "Podrobnosti:"
+#~ msgid "Mark as not S_pam"
+#~ msgstr "Označi kot _želeno pošto"
 
-#: ui/password-dialog.glade:74
-msgid "SMTP Credentials"
-msgstr "Poverila SMTP"
+#~ msgid "Empty _Spam…"
+#~ msgstr "Izbriši _neželeno pošto …"
 
-#: ui/password-dialog.glade:91
-msgid "Username"
-msgstr "Uporabniško ime"
+#~ msgid "Empty _Trash…"
+#~ msgstr "Izprazni _smeti …"
 
-#: ui/password-dialog.glade:152
-msgid "_Remember password"
-msgstr "_Zapomni si geslo"
+#~ msgid "Reading"
+#~ msgstr "Branje"
 
-#: ui/password-dialog.glade:210
-msgid "_Authenticate"
-msgstr "_Overi"
+#~ msgid "Notifications"
+#~ msgstr "Obvestila"
 
-#: ui/preferences-dialog.ui:38
-msgid "Reading"
-msgstr "Branje"
+#~ msgid "_Play notification sounds"
+#~ msgstr "_Predvajaj zvočna obvestila"
 
-#: ui/preferences-dialog.ui:51
-msgid "_Automatically select next message"
-msgstr "_Samodejno izberi novo sporočilo"
+#~ msgid "Show _notifications for new mail"
+#~ msgstr "Prikaži _obvestila o novo prispeli pošti"
 
-#: ui/preferences-dialog.ui:70
-msgid "_Display conversation preview"
-msgstr "_Prikaži predogled pogovora"
+#~ msgid "mail-send"
+#~ msgstr "mail-send"
 
-#: ui/preferences-dialog.ui:89
-msgid "Use _three pane view"
-msgstr "Uporabi pogled _drevesne zgradbe"
+#~ msgid "org.gnome.Geary"
+#~ msgstr "org.gnome.Geary"
 
-#: ui/preferences-dialog.ui:113
-msgid "Notifications"
-msgstr "Obvestila"
+#~ msgid "Additional addresses for %s"
+#~ msgstr "Dodatni naslovi za %s"
 
-#: ui/preferences-dialog.ui:126
-msgid "_Play notification sounds"
-msgstr "_Predvajaj zvočna obvestila"
+#~ msgid "First Last"
+#~ msgstr "Ime Priimek"
+
+#~ msgid "Enter your account information to get started."
+#~ msgstr "Vpišite podatke o računa za začetek uporabe."
+
+#~ msgid "Preview"
+#~ msgstr "Predogled"
+
+#~ msgid "Remem_ber passwords"
+#~ msgstr "Zap_omni si gesla"
+
+#~ msgid "Remem_ber password"
+#~ msgstr "Zap_omni si geslo"
+
+#~ msgid "Unable to validate:\n"
+#~ msgstr "Overitev ni mogoča:\n"
+
+#~ msgid "        • Invalid account nickname.\n"
+#~ msgstr "        • Neveljaven naziv računa.\n"
+
+#~ msgid "        • Email address already added to Geary.\n"
+#~ msgstr "        • Elektronski naslov je že dodan v program.\n"
+
+#~ msgid "        • IMAP connection error.\n"
+#~ msgstr "        • Napaka povezave s strežnikom IMAP.\n"
+
+#~ msgid "        • IMAP username or password incorrect.\n"
+#~ msgstr ""
+#~ "        • Uporabniško ime ali geslo za povezavo s strežnikom IMAP je "
+#~ "napačno.\n"
+
+#~ msgid "        • SMTP connection error.\n"
+#~ msgstr "        • Napaka povezovanja s strežnikom SMTP.\n"
+
+#~ msgid "        • SMTP username or password incorrect.\n"
+#~ msgstr ""
+#~ "        • Uporabniško ime ali geslo za povezavo s strežnikom SMTP je "
+#~ "napačno.\n"
 
-#: ui/preferences-dialog.ui:145
-msgid "Show _notifications for new mail"
-msgstr "Prikaži _obvestila o novo prispeli pošti"
+#~ msgid "        • Connection error.\n"
+#~ msgstr "        • Napaka povezovanja.\n"
+
+#~ msgid "        • Username or password incorrect.\n"
+#~ msgstr "        • Uporabniško ime ali geslo za povezavo je napačno.\n"
+
+#~ msgid "Output debugging information"
+#~ msgstr "Izpiši podrobnosti o razhroščevanju"
+
+#~ msgid "Allow inspection of WebView"
+#~ msgstr "Dovoli nadzor WebView"
+
+#~ msgid "Please report comments, suggestions and bugs to:"
+#~ msgstr "Opombe, predloge in poročila o hroščih, pošljite na:"
+
+#~ msgid "Failed to parse command line options: %s\n"
+#~ msgstr "Razčlenjevanje možnosti ukazne vrstice je spodletelo: %s\n"
+
+#~ msgid "Unable to store server trust exception"
+#~ msgstr "Ni mogoče shraniti potrditve izjeme varnosti strežnika"
+
+#~ msgid "Your settings are insecure"
+#~ msgstr "Nastavitve niso varne"
+
+#~ msgid ""
+#~ "Your IMAP and/or SMTP settings do not specify SSL or TLS.  This means "
+#~ "your username and password could be read by another person on the "
+#~ "network.  Are you sure you want to do this?"
+#~ msgstr ""
+#~ "V nastavitvah IMAP oziroma SMTP ni določenih poveril SSL ali TLS. To "
+#~ "pomeni, da lahko tretje osebe neovirano pridobijo uporabniško ime in "
+#~ "geslo.  Ali ste prepričani, da želite to storiti?"
+
+#~ msgid "Co_ntinue"
+#~ msgstr "_Nadaljuj"
+
+#~ msgid ""
+#~ "Geary encountered an error sending an email.  If the problem persists, "
+#~ "please manually delete the email from your Outbox folder."
+#~ msgstr ""
+#~ "Prišlo je do napake med pošiljanjem elektronskega sporočila. Če se "
+#~ "problem tudi v bodoče večkrat ponovi, ročno izbrišite sporočilo iz mape "
+#~ "odhodne pošte."
+
+#~ msgid ""
+#~ "Geary encountered an error saving a sent message to Sent Mail.  The "
+#~ "message will stay in your Outbox folder until you delete it."
+#~ msgstr ""
+#~ "Prišlo je do napake med shranjevanjem sporočila v mapo poslane pošte. "
+#~ "Sporočilo bo ostalo v mapi, dokler ga ročno ne izbrišete."
+
+#~ msgid "Unable to open local mailbox for %s"
+#~ msgstr "Ni mogoče odpreti krajevnega poštnega predala za %s"
+
+#~ msgid ""
+#~ "There was an error opening the local mail database for this account. This "
+#~ "is possibly due to a file permissions problem.\n"
+#~ "\n"
+#~ "Please check that you have read/write permissions for all files in this "
+#~ "directory:\n"
+#~ "\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Prišlo je do napake odpiranja krajevne podatkovne zbirke za ta račun. "
+#~ "Najverjetneje je težava v dovoljenjih datotek.\n"
+#~ "\n"
+#~ "Preverite, ali so dodeljena ustrezna dovoljenja za vse datoteke v tej "
+#~ "mapi:\n"
+#~ "\n"
+#~ "%s"
+
+#~ msgid ""
+#~ "The version number of the local mail database is formatted for a newer "
+#~ "version of Geary. Unfortunately, the database cannot be “rolled back” to "
+#~ "work with this version of Geary.\n"
+#~ "\n"
+#~ "Please install the latest version of Geary and try again."
+#~ msgstr ""
+#~ "Krajevna podatkovna zbirka pošte je shranjena kot novejša različica. Na "
+#~ "žalost nadgradnje ni mogoče povrniti in uporabiti za trenutno nameščeno "
+#~ "različico programa Geary.\n"
+#~ "\n"
+#~ "Namestite najnovejšo različico programa in poskusite znova."
+
+#~ msgid ""
+#~ "There was an error opening the local account. This is probably due to "
+#~ "connectivity issues.\n"
+#~ "\n"
+#~ "Please check your network connection and restart Geary."
+#~ msgstr ""
+#~ "Prišlo je do napake med odpiranjem krajevnega računa. Najverjetneje je "
+#~ "težava v omrežni povezavi.\n"
+#~ "\n"
+#~ "Preverite povezave in ponovno zaženite program."
+
+#~ msgid "Undo move (Ctrl+Z)"
+#~ msgstr "Razveljavi premik (CTRL+Z)"
 
-#: ui/preferences-dialog.ui:164
 #, fuzzy
-#| msgid "Always _watch for new mail"
-msgid "_Watch for new mail when closed"
-msgstr "Vedno preveri za _nova sporočila"
+#~| msgid "Close open draft messages?"
+#~ msgid "Close the draft message?"
+#~ msgid_plural "Close all draft messages?"
+#~ msgstr[0] "Ali želite zapreti odprt osnutek sporočila?"
+#~ msgstr[1] "Ali želite zapreti odprt osnutek sporočila?"
+#~ msgstr[2] "Ali želite zapreti odprt osnutek sporočila?"
+#~ msgstr[3] "Ali želite zapreti odprt osnutek sporočila?"
 
-#: ui/preferences-dialog.ui:168
-msgid "Geary will keep running after all windows are closed"
-msgstr ""
+#~ msgid "Undo trash (Ctrl+Z)"
+#~ msgstr "Razveljavi smeti (CTRL+Z)"
 
-#: ui/preferences-dialog.ui:195
-msgid "Preferences"
-msgstr "Možnosti"
+#~ msgid "Undo archive (Ctrl+Z)"
+#~ msgstr "Razveljavi arhiviranje (CTRL+Z)"
 
-#: ui/remove_confirm.glade:43
-msgid ""
-"<span weight=\"bold\" size=\"larger\">Are you sure you want to remove this "
-"account?</span> "
-msgstr ""
-"<span weight=\"bold\" size=\"larger\">Ali ste prepričani, da želite "
-"odstraniti ta račun?</span> "
+#~ msgid "Undo (Ctrl+Z)"
+#~ msgstr "Razveljavi (CTRL+Z)"
 
-#: ui/remove_confirm.glade:58
-msgid ""
-"All email associated with this account will be removed from your computer. "
-"This will not affect email on the server."
-msgstr ""
-"Vsa elektronska pošta, povezana s tem računom, bo odstranjena z računalnika. "
-"To ne bo vplivalo na sporočila, shranjena na strežniku."
+#~ msgid "Delete conversation (Shift+Delete)"
+#~ msgstr "Izbriši pogovor (SHIFT+Del)"
 
-#: ui/remove_confirm.glade:80
-msgid "Nickname:"
-msgstr "Vzdevek:"
+#~ msgid "Delete conversations (Shift+Delete)"
+#~ msgstr "Izbriši pogovore (SHIFT+Del)"
 
-#: ui/remove_confirm.glade:94
-msgid "Email address:"
-msgstr "Elektronski naslov:"
+#~ msgid "Move conversation to Trash (Delete, Backspace)"
+#~ msgstr "Premakni pogovor v smeti (Del, Povratna tipka)"
 
-#: ui/upgrade_dialog.glade:60
-msgid "Geary update in progress…"
-msgstr "Posodobitev programa Geary je v teku ..."
+#~ msgid "Move conversations to Trash (Delete, Backspace)"
+#~ msgstr "Premakni pogovore v smeti (Del, Povratna tipka)"
+
+#~ msgid "Archive conversations (A)"
+#~ msgstr "Arhiviraj pogovore (A)"
+
+#~ msgid "Add label to conversations"
+#~ msgstr "Dodaj oznako pogovorom"
+
+#, fuzzy
+#~| msgid "Error connecting to the server"
+#~ msgid "Problem connecting to incoming server for %s"
+#~ msgstr "Napaka med povezovanjem s strežnikom"
+
+#, fuzzy
+#~| msgid "Error connecting to the server"
+#~ msgid "Problem connecting to outgoing server for %s"
+#~ msgstr "Napaka med povezovanjem s strežnikom"
+
+#, fuzzy
+#~| msgid "Error connecting to the server"
+#~ msgid "Problem with connection to outgoing server for %s"
+#~ msgstr "Napaka med povezovanjem s strežnikom"
+
+#~ msgid "To: "
+#~ msgstr "Za: "
+
+#~ msgid "Cc: "
+#~ msgstr "Kp: "
+
+#~ msgid "Bcc: "
+#~ msgstr "Skp: "
+
+#~ msgid "Geary will exit if you have no other open email accounts."
+#~ msgstr "Program bo končan, če ni odprtega nobenega poštnega računa."
+
+#~ msgid "Open"
+#~ msgstr "Odpri"
+
+#~ msgctxt "Default clock format"
+#~ msgid "%l:%M %P"
+#~ msgstr "%l:%M %P"
+
+#~ msgid "%x"
+#~ msgstr "%x"
+
+#~ msgid "IMAP"
+#~ msgstr "IMAP"
+
+#~ msgid "SMTP"
+#~ msgstr "SMTP"
+
+#~ msgid "Other"
+#~ msgstr "Ostalo"
+
+#~ msgid "From: %s\n"
+#~ msgstr "Od: %s\n"
+
+#~ msgid "Subject: %s\n"
+#~ msgstr "Zadeva: %s\n"
+
+#~ msgid "Date: %s\n"
+#~ msgstr "Datum: %s\n"
+
+#~ msgid "To: %s\n"
+#~ msgstr "Za: %s\n"
+
+#~ msgid "Cc: %s\n"
+#~ msgstr "Kp: %s\n"
+
+#~ msgid "<span weight=\"bold\" size=\"larger\">Cannot remove account</span> "
+#~ msgstr ""
+#~ "<span weight=\"bold\" size=\"larger\">Računa ni mogoče odstraniti</span> "
+
+#~ msgid ""
+#~ "A composer window associated with this account is currently open. Send or "
+#~ "discard the message and try again."
+#~ msgstr ""
+#~ "Ta račun je trenutno odprto okno za sestavljalnika sporoči. Pošljite ali "
+#~ "zavrzite sporočilo in poskusite znova."
+
+#~ msgid "Please wait while Geary validates your account."
+#~ msgstr "Prosimo počakajte, da Geary potrdi vaš račun."
+
+#~ msgid "_Trash"
+#~ msgstr "_Smeti"
+
+#~ msgid "Send New _Message…"
+#~ msgstr "Pošlji novo _sporočilo ..."
+
+#~ msgid "Search for messages from"
+#~ msgstr "Išči sporočila iz"
+
+#~ msgid ""
+#~ "Some email services require additional addresses be configured on the "
+#~ "server.  Contact your email provider for more information."
+#~ msgstr ""
+#~ "Nekateri strežniki poštnih storitev zahtevajo dodatne nastavitve "
+#~ "naslovov. Za več podrobnosti stopite v stik s ponudnikom poštnih storitev."
+
+#~ msgctxt "shortcut window"
+#~ msgid "Jump to search box"
+#~ msgstr "Skoči na iskalno polje"
+
+#~ msgctxt "shortcut window"
+#~ msgid "Find next/previous in current conversation"
+#~ msgstr "Najdi naslednjo/predhodno pojavitev iskalnega niza v pogovoru"
+
+#~ msgctxt "shortcut window"
+#~ msgid "Compose a new message"
+#~ msgstr "Sestavi novo sporočilo"
+
+#~ msgctxt "shortcut window"
+#~ msgid "Archive"
+#~ msgstr "Arhiv"
+
+#~ msgctxt "shortcut window"
+#~ msgid "Move the conversation"
+#~ msgstr "Premakni pogovor"
+
+#~ msgctxt "shortcut window"
+#~ msgid "Mark unread"
+#~ msgstr "Označi kot neprebrano"
+
+#~ msgctxt "shortcut window"
+#~ msgid "Unstar"
+#~ msgstr "Odstrani zvezdico"
+
+#~ msgctxt "shortcut window"
+#~ msgid "Delete"
+#~ msgstr "Izbriši"
+
+#~ msgctxt "shortcut window"
+#~ msgid "Jump to next (older) conversation"
+#~ msgstr "Skoči na naslednji (starejši) pogovor"
+
+#~ msgctxt "shortcut window"
+#~ msgid "Jump to previous (newer) conversation"
+#~ msgstr "Skoči na predhodni (novejši) pogovor"
+
+#~ msgid "A_ccounts"
+#~ msgstr "_Računi"
+
+#~ msgid "E_mail address"
+#~ msgstr "_Elektronski naslov"
+
+#~ msgid "_Password"
+#~ msgstr "_Geslo"
+
+#~ msgid "S_ervice"
+#~ msgstr "_Storitev"
+
+#~ msgid "N_ame"
+#~ msgstr "_Ime"
+
+#~ msgid "N_ickname"
+#~ msgstr "_Vzdevek"
+
+#~ msgid "Work, Home, etc."
+#~ msgstr "Delovno mesto, domači naslov, itd."
+
+#~ msgid "Addi_tional email addresses…"
+#~ msgstr "Dodatni _elektronski naslovi ..."
+
+#~ msgid "IMAP settings"
+#~ msgstr "Nastavitve IMAP"
+
+#~ msgid "Se_rver"
+#~ msgstr "_Strežnik"
+
+#~ msgid "P_ort"
+#~ msgstr "_Vrata"
+
+#~ msgid "Ser_ver"
+#~ msgstr "St_režnik"
+
+#~ msgid "Por_t"
+#~ msgstr "_Vrata"
+
+#~ msgid "User_name"
+#~ msgstr "_Uporabniško ime"
+
+#~ msgid "Pass_word"
+#~ msgstr "_Geslo"
+
+#~ msgid "SMTP password"
+#~ msgstr "Geslo SMTP"
+
+#~ msgid "_Username"
+#~ msgstr "_Uporabniško ime"
+
+#~ msgid "IMAP password"
+#~ msgstr "Geslo IMAP"
+
+#~ msgid "Encr_yption"
+#~ msgstr "_Šifriranje"
+
+#~ msgid "Encrypt_ion"
+#~ msgstr "Ši_friranje"
+
+#~ msgid "STARTTLS"
+#~ msgstr "STARTTLS"
+
+#~ msgid "No authentication re_quired"
+#~ msgstr "_Overitev ni potrebna"
+
+#~ msgid "Use IMAP cre_dentials"
+#~ msgstr "Uporabi poverilnice _IMAP"
+
+#~ msgid "Composer"
+#~ msgstr "Sestavljalnik"
+
+#~ msgid "Si_gn emails (HTML allowed):"
+#~ msgstr "_Podpiši sporočila (s podporo za HTML):"
+
+#~ msgid "Storage"
+#~ msgstr "Shramba"
+
+#~ msgid "Empty Spam or Trash folders"
+#~ msgstr "Izprazni mapi smeti in neželene pošte"
+
+#~ msgid ""
+#~ "<span weight=\"bold\" size=\"larger\">Are you sure you want to remove "
+#~ "this account?</span> "
+#~ msgstr ""
+#~ "<span weight=\"bold\" size=\"larger\">Ali ste prepričani, da želite "
+#~ "odstraniti ta račun?</span> "
+
+#~ msgid ""
+#~ "All email associated with this account will be removed from your "
+#~ "computer. This will not affect email on the server."
+#~ msgstr ""
+#~ "Vsa elektronska pošta, povezana s tem računom, bo odstranjena z "
+#~ "računalnika. To ne bo vplivalo na sporočila, shranjena na strežniku."
+
+#~ msgid "Nickname:"
+#~ msgstr "Vzdevek:"
 
 #~ msgid "Geary Email"
 #~ msgstr "Pošta Geary"
@@ -3208,9 +4485,6 @@ msgstr "Posodobitev programa Geary je v teku ..."
 #~ msgstr[2] "%i zadetkov (celotno)"
 #~ msgstr[3] "%i zadetkov (celotno)"
 
-#~ msgid "not found"
-#~ msgstr "Ni zadetkov"
-
 #~ msgid "Do you want to discard the unsaved message?"
 #~ msgstr "Želite zavreči neshranjeno sporočilo?"
 
@@ -3227,9 +4501,6 @@ msgstr "Posodobitev programa Geary je v teku ..."
 #~ msgid " (Invalid?)"
 #~ msgstr "<neveljavno>"
 
-#~ msgid "_Save As..."
-#~ msgstr "_Shrani kot..."
-
 #~ msgid "Save A_ttachment..."
 #~ msgid_plural "Save All A_ttachments..."
 #~ msgstr[0] "Shrani _priponko"
@@ -3259,9 +4530,6 @@ msgstr "Posodobitev programa Geary je v teku ..."
 #~ msgid "Link (Ctrl+L)"
 #~ msgstr "Povezava (Ctrl+L)"
 
-#~ msgid "More options"
-#~ msgstr "Več možnosti"
-
 #~ msgid "Large"
 #~ msgstr "Velika"
 
@@ -3271,15 +4539,6 @@ msgstr "Posodobitev programa Geary je v teku ..."
 #~ msgid "Small"
 #~ msgstr "Majhna"
 
-#~ msgid "Sans Serif"
-#~ msgstr "Brez-serifna"
-
-#~ msgid "Serif"
-#~ msgstr "Serifna"
-
-#~ msgid "Fixed Width"
-#~ msgstr "Nespremenljiva širina"
-
 #~ msgid "C_lose"
 #~ msgstr "_Zapri"
 


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