[geary] Updated Slovenian translation



commit 455e8583dff839e0b27a31fad60042c11d3b5b85
Author: Matej Urbančič <mateju svn gnome org>
Date:   Wed Sep 27 10:47:27 2017 +0200

    Updated Slovenian translation

 po/sl.po | 2747 +++++++++++++++++++++++++++++++++++++++++--------------------
 1 files changed, 1846 insertions(+), 901 deletions(-)
---
diff --git a/po/sl.po b/po/sl.po
index d56374e..e3e3e22 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -2,69 +2,166 @@
 # Copyright (C) 2009 geary COPYRIGHT HOLDER
 # 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.
+# anthonmanix <anthon manix gmail com>, 2012–2013.
+# Matej Urbančič <mateju svn gnome org>, 2014–2017.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: geary-0.4.1\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
-"product=geary&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2014-02-27 20:29+0000\n"
-"PO-Revision-Date: 2014-03-22 08:45+0100\n"
+"Project-Id-Version: geary master\n"
+"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?";
+"product=geary&keywords=I18N+L10N&component=internationalization\n"
+"POT-Creation-Date: 2017-09-26 17:00+0200\n"
+"PO-Revision-Date: 2017-09-27 10:28+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\n"
+"Language: sl_SI\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || n"
 "%100==4 ? 3 : 0);\n"
 "X-Poedit-SourceCharset: utf-8\n"
-"X-Generator: Poedit 1.5.4\n"
+"X-Generator: Poedit 2.0.1\n"
 
-#: ../desktop/geary.desktop.in.h:1
-#| msgid "Geary Mail"
+#. Translators: The application name
+#: ../desktop/org.gnome.Geary.appdata.xml.in.h:2
+#: ../desktop/org.gnome.Geary.desktop.in.h:1
+#: ../desktop/geary-autostart.desktop.in.h:1
 msgid "Geary"
 msgstr "Geary"
 
-#: ../desktop/geary.desktop.in.h:2
-#: ../src/client/application/geary-application.vala:18
-msgid "Mail Client"
-msgstr "Poštni klient"
-
-#: ../desktop/geary.desktop.in.h:3
-msgid "Geary Mail"
-msgstr "Geary Mail"
+#. Translators: The development team's name
+#: ../desktop/org.gnome.Geary.appdata.xml.in.h:4
+msgid "Geary Development Team"
+msgstr "Razvojna skupina Geary"
 
-#: ../desktop/geary.desktop.in.h:4
+#. Translators: The application's summary / tagline
+#: ../desktop/org.gnome.Geary.appdata.xml.in.h:6
+#: ../desktop/org.gnome.Geary.desktop.in.h:4
+#: ../desktop/geary-autostart.desktop.in.h:4
 msgid "Send and receive email"
-msgstr "Pošlji in prejmi epošto"
+msgstr "Pošlji in prejmi sporočila"
 
-#: ../desktop/geary.desktop.in.h:5
-msgid "Email;E-mail;Mail;"
-msgstr "Epošta;E-pošta;Pošta;"
+#: ../desktop/org.gnome.Geary.appdata.xml.in.h:7
+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."
+
+#: ../desktop/org.gnome.Geary.appdata.xml.in.h:8
+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."
+
+#: ../desktop/org.gnome.Geary.appdata.xml.in.h:9
+msgid "Geary’s features include:"
+msgstr "Program Geary omogoča:"
+
+#: ../desktop/org.gnome.Geary.appdata.xml.in.h:10
+msgid "Quick email account setup"
+msgstr "Hitro nastavitev računa elektronske pošte"
+
+#: ../desktop/org.gnome.Geary.appdata.xml.in.h:11
+msgid "Shows related messages together in conversations"
+msgstr "Povezana sporočila so zbrana skupaj v obliki pogovora"
+
+#: ../desktop/org.gnome.Geary.appdata.xml.in.h:12
+msgid "Fast, full text and keyword search"
+msgstr "Hitro iskanje po celotnem besedilu s ključnimi besedami"
+
+#: ../desktop/org.gnome.Geary.appdata.xml.in.h:13
+msgid "Full-featured HTML and plain text message composer"
+msgstr ""
+"Zmogljiv sestavljalnik sporočil v besedilnem ali oblikovanem zapisu HTML"
+
+#: ../desktop/org.gnome.Geary.appdata.xml.in.h:14
+msgid "Desktop notification of new mail"
+msgstr "Obvestila o prispeli pošti"
+
+#: ../desktop/org.gnome.Geary.appdata.xml.in.h:15
+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"
 
-#: ../desktop/geary.desktop.in.h:6
+#. Translators: A screenshot description.
+#: ../desktop/org.gnome.Geary.appdata.xml.in.h:17
+msgid "Geary displaying a conversation"
+msgstr "Prikaz sporočil zbranih v pogovor"
+
+#. Translators: A screenshot description.
+#: ../desktop/org.gnome.Geary.appdata.xml.in.h:19
+msgid "Geary showing the rich text composer"
+msgstr "Geary z odprtim oknom sestavljalnika"
+
+#: ../desktop/org.gnome.Geary.desktop.in.h:2
+msgid "Email"
+msgstr "Elektronska pošta"
+
+#: ../desktop/org.gnome.Geary.desktop.in.h:3
+msgid "Geary Email"
+msgstr "Pošta Geary"
+
+#. Translators: These are desktop search terms. Do not translate semicolons, end line with a semicolon.
+#: ../desktop/org.gnome.Geary.desktop.in.h:6
+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.h:7 ../ui/gtk/menus.ui.h:1
 msgid "Compose Message"
 msgstr "Sestavi sporočilo"
 
-#: ../src/client/accounts/account-dialog-add-edit-pane.vala:48
+#: ../desktop/geary-autostart.desktop.in.h:2
+#: ../src/client/application/geary-application.vala:21
+msgid "Mail Client"
+msgstr "Poštni odjemalec"
+
+#: ../desktop/geary-autostart.desktop.in.h:3
+msgid "Geary Mail"
+msgstr "Pošta Geary"
+
+#: ../desktop/geary-autostart.desktop.in.h:5
+msgid "Email;E-mail;Mail;"
+msgstr "elektronska pošta;epošta;e-pošta;pošta;sporočila;email;mail;"
+
+#: ../desktop/geary-attach.contract.in.h:1
+msgid "Send by email"
+msgstr "Pošlji z elektronsko pošto"
+
+#: ../desktop/geary-attach.contract.in.h:2
+msgid "Send files using Geary"
+msgstr "Pošlji datoteke s programom Geary"
+
+#: ../src/client/accounts/account-dialog-add-edit-pane.vala:51
 #: ../src/client/components/stock.vala:31
+#: ../ui/conversation-email-menus.ui.h:10
 msgid "_Save"
 msgstr "_Shrani"
 
-#: ../src/client/accounts/account-dialog-add-edit-pane.vala:48
+#: ../src/client/accounts/account-dialog-add-edit-pane.vala:51
 #: ../src/client/components/stock.vala:22
 msgid "_Add"
 msgstr "_Dodaj"
 
+#. reset/clear widgets
+#: ../src/client/accounts/account-dialog-edit-alternate-emails-pane.vala:120
+#, c-format
+msgid "Additional addresses for %s"
+msgstr "Dodatni naslovi za %s"
+
 #. Sets min size.
-#: ../src/client/accounts/account-dialog.vala:19
+#: ../src/client/accounts/account-dialog.vala:21
 msgid "Accounts"
 msgstr "Računi"
 
-#. Copyright 2011-2014 Yorba Foundation
+#. 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.
@@ -75,406 +172,437 @@ msgstr "Računi"
 msgid "First Last"
 msgstr "Ime Priimek"
 
-#: ../src/client/accounts/add-edit-page.vala:202
+#: ../src/client/accounts/add-edit-page.vala:235
 msgid "Welcome to Geary."
-msgstr "Dobrodošli v Geary."
+msgstr "Dobrodošli v programu Geary."
 
-#: ../src/client/accounts/add-edit-page.vala:202
+#: ../src/client/accounts/add-edit-page.vala:235
 msgid "Enter your account information to get started."
-msgstr "Vpišite podatke o svojem računu, da lahko začnete."
+msgstr "Vpišite podatke o računa za začetek uporabe."
 
-#: ../src/client/accounts/add-edit-page.vala:223
+#: ../src/client/accounts/add-edit-page.vala:255
 msgid "2 weeks back"
 msgstr "2 tedna nazaj"
 
 #. IDs are # of days
-#: ../src/client/accounts/add-edit-page.vala:224
+#: ../src/client/accounts/add-edit-page.vala:256
 msgid "1 month back"
 msgstr "1 mesec nazaj"
 
-#: ../src/client/accounts/add-edit-page.vala:225
+#: ../src/client/accounts/add-edit-page.vala:257
 msgid "3 months back"
 msgstr "3 mesece nazaj"
 
-#: ../src/client/accounts/add-edit-page.vala:226
+#: ../src/client/accounts/add-edit-page.vala:258
 msgid "6 months back"
 msgstr "6 mesecev nazaj"
 
-#: ../src/client/accounts/add-edit-page.vala:227
+#: ../src/client/accounts/add-edit-page.vala:259
 msgid "1 year back"
 msgstr "1 leto nazaj"
 
-#: ../src/client/accounts/add-edit-page.vala:228
-#| msgid "1 year back"
+#: ../src/client/accounts/add-edit-page.vala:260
 msgid "2 years back"
 msgstr "2 leti nazaj"
 
-#: ../src/client/accounts/add-edit-page.vala:229
-#| msgid "1 year back"
+#: ../src/client/accounts/add-edit-page.vala:261
 msgid "4 years back"
 msgstr "4 leta nazaj"
 
 #. Separator
-#: ../src/client/accounts/add-edit-page.vala:231
+#: ../src/client/accounts/add-edit-page.vala:263
 msgid "Everything"
 msgstr "Vse"
 
-#: ../src/client/accounts/add-edit-page.vala:630
+#: ../src/client/accounts/add-edit-page.vala:283
+msgid "Edit"
+msgstr "Uredi"
+
+#: ../src/client/accounts/add-edit-page.vala:285
+msgid "Preview"
+msgstr "Predogled"
+
+#: ../src/client/accounts/add-edit-page.vala:751
 msgid "Remem_ber passwords"
 msgstr "Zap_omni si gesla"
 
-#: ../src/client/accounts/add-edit-page.vala:637 ../ui/login.glade.h:6
+#: ../src/client/accounts/add-edit-page.vala:758 ../ui/login.glade.h:7
 msgid "Remem_ber password"
 msgstr "Zap_omni si geslo"
 
-#: ../src/client/accounts/add-edit-page.vala:671
+#: ../src/client/accounts/add-edit-page.vala:792
 msgid "Unable to validate:\n"
-msgstr "Potrditev ni možna:\n"
-
-#: ../src/client/accounts/add-edit-page.vala:673
-msgid "        &#8226; Invalid account nickname.\n"
-msgstr "&#8226; Napačen vzdevek računa.\n"
-
-#: ../src/client/accounts/add-edit-page.vala:676
-msgid "        &#8226; Email address already added to Geary.\n"
-msgstr "&#8226; Epoštni naslov je že dodan v Geary.\n"
+msgstr "Overitev ni mogoča:\n"
+
+#: ../src/client/accounts/add-edit-page.vala:794
+#| msgid "        &#8226; Invalid account nickname.\n"
+msgid "        • Invalid account nickname.\n"
+msgstr "        • Neveljaven naziv računa.\n"
+
+#: ../src/client/accounts/add-edit-page.vala:797
+#| msgid "        &#8226; Email address already added to Geary.\n"
+msgid "        • Email address already added to Geary.\n"
+msgstr "        • Elektronski naslov je že dodan v program.\n"
+
+#: ../src/client/accounts/add-edit-page.vala:801
+#| msgid "        &#8226; IMAP connection error.\n"
+msgid "        • IMAP connection error.\n"
+msgstr "        • Napaka povezave s strežnikom IMAP.\n"
+
+#: ../src/client/accounts/add-edit-page.vala:804
+#| msgid "        &#8226; IMAP username or password incorrect.\n"
+msgid "        • IMAP username or password incorrect.\n"
+msgstr ""
+"        • Uporabniško ime ali geslo za povezavo s strežnikom IMAP je "
+"napačno.\n"
 
-#: ../src/client/accounts/add-edit-page.vala:680
-msgid "        &#8226; IMAP connection error.\n"
-msgstr "&#8226; Napaka pri IMAP povezavi.\n"
+#: ../src/client/accounts/add-edit-page.vala:807
+#| msgid "        &#8226; SMTP connection error.\n"
+msgid "        • SMTP connection error.\n"
+msgstr "        • Napaka povezovanja s strežnikom SMTP.\n"
 
-#: ../src/client/accounts/add-edit-page.vala:683
-msgid "        &#8226; IMAP username or password incorrect.\n"
-msgstr "&#8226; IMAP uporabniško ime ali geslo je napačno.\n"
+#: ../src/client/accounts/add-edit-page.vala:810
+msgid "        • SMTP username or password incorrect.\n"
+msgstr ""
+"        • Uporabniško ime ali geslo za povezavo s strežnikom SMTP je "
+"napačno.\n"
 
-#: ../src/client/accounts/add-edit-page.vala:686
-msgid "        &#8226; SMTP connection error.\n"
-msgstr "&#8226; Napaka pri SMTP povezavi.\n"
+#: ../src/client/accounts/add-edit-page.vala:814
+#| msgid "        &#8226; Connection error.\n"
+msgid "        • Connection error.\n"
+msgstr "        • Napaka povezovanja.\n"
 
-#: ../src/client/accounts/add-edit-page.vala:689
-msgid "        &#8226; SMTP username or password incorrect.\n"
-msgstr "&#8226; SMTP uporabniško ime ali geslo je napačno.\n"
+#: ../src/client/accounts/add-edit-page.vala:818
+msgid "        • Username or password incorrect.\n"
+msgstr "        • Uporabniško ime ali geslo za povezavo je napačno.\n"
 
-#: ../src/client/accounts/add-edit-page.vala:693
-msgid "        &#8226; Connection error.\n"
-msgstr "&#8226; Napaka pri povezavi.\n"
+#: ../src/client/application/geary-application.vala:22
+msgid "Copyright 2016 Software Freedom Conservancy Inc."
+msgstr "Avtorske pravice 2017 Software Freedom Conservancy Inc."
 
-#: ../src/client/accounts/add-edit-page.vala:697
-msgid "        &#8226; Username or password incorrect.\n"
-msgstr "&#8226; Uporabniško ime ali geslo je napačno.\n"
+#: ../src/client/application/geary-application.vala:24
+msgid "Visit the Geary web site"
+msgstr "Obišči spletišče Geary"
 
-#: ../src/client/application/geary-application.vala:19
-#| msgid "Copyright 2011-2013 Yorba Foundation"
-msgid "Copyright 2011-2014 Yorba Foundation"
-msgstr "Avtorske pravice © 2004-2014 Yorba Foundation"
+#: ../src/client/application/geary-application.vala:464
+#, c-format
+msgid "About %s"
+msgstr "O %s"
 
-#: ../src/client/application/geary-application.vala:21
-msgid "Visit the Yorba web site"
-msgstr "Obiščite spletno stran Yorba"
+#. 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:468
+msgid "translator-credits"
+msgstr "Matej Urbančič <mateju@svn gnome org>"
 
 #: ../src/client/application/geary-args.vala:10
-msgid "Output debugging information"
-msgstr "Izpis informacij o razhroščevanju"
+msgid "Start Geary with hidden main window"
+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"
+
+#: ../src/client/application/geary-args.vala:12
 msgid "Log conversation monitoring"
 msgstr "Beleži nadzorovanje pogovorov"
 
-#: ../src/client/application/geary-args.vala:12
+#: ../src/client/application/geary-args.vala:13
 msgid "Log network deserialization"
-msgstr "Beleži serializacijo mreže"
+msgstr "Beleži razporejanje omrežja"
 
-#: ../src/client/application/geary-args.vala:13
+#: ../src/client/application/geary-args.vala:14
 msgid "Log network activity"
-msgstr "Beleži aktivnost mreže"
+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:16
+#: ../src/client/application/geary-args.vala:17
 msgid "Log IMAP replay queue"
-msgstr "Beleži IMAP vrsto ponovitev"
+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:19
+#: ../src/client/application/geary-args.vala:20
 msgid "Log network serialization"
-msgstr "Beleži serializacijo mreže"
+msgstr "Beleži zaporejanje omrežja"
 
-#: ../src/client/application/geary-args.vala:20
+#: ../src/client/application/geary-args.vala:21
 msgid "Log periodic activity"
-msgstr "Beleži periodično aktivnost"
+msgstr "Beleži dejavnost"
 
-#: ../src/client/application/geary-args.vala:21
+#: ../src/client/application/geary-args.vala:22
 msgid "Log database queries (generates lots of messages)"
-msgstr "Beleži poizvedbe podatkovne baze (ustvari veli sporočil)"
+msgstr "Beleži poizvedbe podatkovne zbirke (ustvari mnogo sporočil)"
 
 #. / "Normalization" can also be called "synchronization"
-#: ../src/client/application/geary-args.vala:23
+#: ../src/client/application/geary-args.vala:24
 msgid "Log folder normalization"
-msgstr "Beleži normalizacijo map"
+msgstr ""
 
-#: ../src/client/application/geary-args.vala:24
+#: ../src/client/application/geary-args.vala:25
 msgid "Allow inspection of WebView"
-msgstr "Allow inspection of WebView"
+msgstr "Dovoli nadzor WebView"
 
-#: ../src/client/application/geary-args.vala:25
+#: ../src/client/application/geary-args.vala:26
+msgid "Revoke all server certificates with TLS warnings"
+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
 msgid "Display program version"
-msgstr "Prikaži različico programa"
+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:47
+#: ../src/client/application/geary-args.vala:53
 #, c-format
 msgid "Use %s to open a new composer window"
-msgstr ""
+msgstr "Uporabi %s za odpiranje novega okna sestavljalnika"
 
-#: ../src/client/application/geary-args.vala:48
+#: ../src/client/application/geary-args.vala:54
 msgid "Please report comments, suggestions and bugs to:"
-msgstr "Prosimo prijavite komentarje, predloge in hrošče na:"
+msgstr "Opombe, predloge in poročila o hroščih, pošljite na:"
 
 #. i18n: Command line arguments are invalid
-#: ../src/client/application/geary-args.vala:55
+#: ../src/client/application/geary-args.vala:61
 #, c-format
 msgid "Failed to parse command line options: %s\n"
-msgstr "Razčlenjevanje možnosti ukazne vrstice ni uspelo: %s\n"
+msgstr "Razčlenjevanje možnosti ukazne vrstice je spodletelo: %s\n"
 
-#: ../src/client/application/geary-args.vala:66
+#: ../src/client/application/geary-args.vala:72
 #, c-format
-msgid "Unrecognized command line option \"%s\"\n"
-msgstr "Neznana možnost ukazne vrstice \"%s\"\n"
+msgid "Unrecognized command line option “%s”\n"
+msgstr "Neprepoznana možnost ukazne vrstice »%s«\n"
 
-#: ../src/client/application/geary-controller.vala:46
-msgid "_Delete"
-msgstr "_Briši"
+#: ../src/client/application/geary-controller.vala:57
+msgid "Delete conversation"
+msgstr "Izbriši pogovor"
 
-#: ../src/client/application/geary-controller.vala:47
-#, fuzzy
-#| msgid "Delete conversation (Delete, Backspace, A)"
+#: ../src/client/application/geary-controller.vala:58
 msgid "Delete conversation (Shift+Delete)"
-msgstr "Japonsko (_Shift-JIS)"
+msgstr "Izbriši pogovor (SHIFT+Del)"
 
-#: ../src/client/application/geary-controller.vala:48
-#, fuzzy
-#| msgid "Delete conversations (Delete, Backspace, A)"
+#: ../src/client/application/geary-controller.vala:59
 msgid "Delete conversations (Shift+Delete)"
-msgstr "Japonsko (_Shift-JIS)"
-
-#: ../src/client/application/geary-controller.vala:51
-#| msgid "Trash"
-msgid "_Trash"
-msgstr "_Smeti"
+msgstr "Izbriši pogovore (SHIFT+Del)"
 
-#: ../src/client/application/geary-controller.vala:52
-#, fuzzy
-#| msgid "Archive conversations (Delete, Backspace, A)"
-msgid "Move conversation to trash (Delete, Backspace)"
-msgstr "Arhiviraj pogovore (Delete, Backspace, A)"
+#. This refers to the action ("move email to the trash"), not the Trash folder itself
+#: ../src/client/application/geary-controller.vala:63
+msgid "Move conversation to Trash (Delete, Backspace)"
+msgstr "Premakni pogovor v smeti (Del, Povratna tipka)"
 
-#: ../src/client/application/geary-controller.vala:53
-#, fuzzy
-#| msgid "Archive conversations (Delete, Backspace, A)"
-msgid "Move conversations to trash (Delete, Backspace)"
-msgstr "Arhiviraj pogovore (Delete, Backspace, A)"
+#: ../src/client/application/geary-controller.vala:64
+msgid "Move conversations to Trash (Delete, Backspace)"
+msgstr "Premakni pogovore v smeti (Del, Povratna tipka)"
 
-#: ../src/client/application/geary-controller.vala:56
+#. This refers to the action ("archive an email"), not the Archive folder itself
+#: ../src/client/application/geary-controller.vala:68
 msgid "_Archive"
 msgstr "_Arhiv"
 
-#: ../src/client/application/geary-controller.vala:57
-#, fuzzy
-#| msgid "Move conversation"
+#: ../src/client/application/geary-controller.vala:69
 msgid "Archive conversation (A)"
-msgstr "Pogovor hipnega sporočanja"
+msgstr "Arhiviraj pogovor (A)"
 
-#: ../src/client/application/geary-controller.vala:58
-#, fuzzy
-#| msgid "Move conversations"
+#: ../src/client/application/geary-controller.vala:70
 msgid "Archive conversations (A)"
-msgstr "<b>Zgodovina pogovorov</b>"
+msgstr "Arhiviraj pogovore (A)"
 
-#: ../src/client/application/geary-controller.vala:61
+#: ../src/client/application/geary-controller.vala:73
 msgid "Mark as S_pam"
 msgstr "Označi kot _neželeno pošto"
 
-#: ../src/client/application/geary-controller.vala:62
+#: ../src/client/application/geary-controller.vala:74
 msgid "Mark as not S_pam"
 msgstr "Označi kot _želeno pošto"
 
-#: ../src/client/application/geary-controller.vala:64
-#: ../src/client/application/geary-controller.vala:275
+#: ../src/client/application/geary-controller.vala:76
+#: ../src/client/application/geary-controller.vala:448
 msgid "Mark conversation"
 msgstr "Označi pogovor"
 
-#: ../src/client/application/geary-controller.vala:65
+#: ../src/client/application/geary-controller.vala:77
 msgid "Mark conversations"
 msgstr "Označi pogovore"
 
-#: ../src/client/application/geary-controller.vala:66
+#: ../src/client/application/geary-controller.vala:78
 msgid "Add label to conversation"
 msgstr "Dodaj oznako pogovoru"
 
-#: ../src/client/application/geary-controller.vala:67
+#: ../src/client/application/geary-controller.vala:79
 msgid "Add label to conversations"
 msgstr "Dodaj oznako pogovorom"
 
-#: ../src/client/application/geary-controller.vala:68
-#: ../src/client/application/geary-controller.vala:314
+#: ../src/client/application/geary-controller.vala:80
+#: ../src/client/application/geary-controller.vala:487
 msgid "Move conversation"
 msgstr "Premakni pogovor"
 
-#: ../src/client/application/geary-controller.vala:69
+#: ../src/client/application/geary-controller.vala:81
 msgid "Move conversations"
 msgstr "Premakni pogovore"
 
-#: ../src/client/application/geary-controller.vala:251
-msgid "A_ccounts"
-msgstr "_Računi"
-
-#: ../src/client/application/geary-controller.vala:256
-#: ../src/client/components/stock.vala:27
-msgid "_Preferences"
-msgstr "_Nastavitve"
-
-#: ../src/client/application/geary-controller.vala:260
-#: ../src/client/components/stock.vala:25
-msgid "_Help"
-msgstr "_Pomoč"
-
-#: ../src/client/application/geary-controller.vala:264
-#: ../src/client/components/stock.vala:21
-msgid "_About"
-msgstr "_O programu"
+#: ../src/client/application/geary-controller.vala:450
+msgid "_Mark as…"
+msgstr "_Označi kot ..."
 
-#: ../src/client/application/geary-controller.vala:268
-msgid "_Donate"
-msgstr "_Prispevaj"
-
-#: ../src/client/application/geary-controller.vala:272
-#: ../src/client/components/stock.vala:29
-msgid "_Quit"
-msgstr "_Zapusti"
-
-#: ../src/client/application/geary-controller.vala:277
-msgid "_Mark as..."
-msgstr "_Označi kot..."
-
-#: ../src/client/application/geary-controller.vala:283
+#: ../src/client/application/geary-controller.vala:456
 msgid "Mark as _Read"
 msgstr "Označi kot _prebrano"
 
-#: ../src/client/application/geary-controller.vala:289
+#: ../src/client/application/geary-controller.vala:462
 msgid "Mark as _Unread"
 msgstr "Označi kot _neprebrano"
 
-#: ../src/client/application/geary-controller.vala:295
+#: ../src/client/application/geary-controller.vala:468
 msgid "_Star"
 msgstr "Dodaj _zvezdico"
 
-#: ../src/client/application/geary-controller.vala:300
+#: ../src/client/application/geary-controller.vala:473
 msgid "U_nstar"
 msgstr "_Odstrani zvezdico"
 
-#: ../src/client/application/geary-controller.vala:310
+#: ../src/client/application/geary-controller.vala:483
 msgid "Add label"
 msgstr "Dodaj oznako"
 
-#: ../src/client/application/geary-controller.vala:311
+#: ../src/client/application/geary-controller.vala:484
 msgid "_Label"
 msgstr "_Oznaka"
 
-#: ../src/client/application/geary-controller.vala:315
+#: ../src/client/application/geary-controller.vala:488
 msgid "_Move"
 msgstr "_Premakni"
 
-#: ../src/client/application/geary-controller.vala:319
+#: ../src/client/application/geary-controller.vala:492
 msgid "Compose new message (Ctrl+N, N)"
 msgstr "Sestavi novo sporočilo (Ctrl+N, N)"
 
-#. Reply to a message.
-#: ../src/client/application/geary-controller.vala:323
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1567
+#: ../src/client/application/geary-controller.vala:496
+#: ../ui/conversation-email-menus.ui.h:1
 msgid "_Reply"
 msgstr "_Odgovori"
 
-#: ../src/client/application/geary-controller.vala:324
+#: ../src/client/application/geary-controller.vala:497
 msgid "Reply (Ctrl+R, R)"
 msgstr "Odgovori (Ctrl+R, R)"
 
-#: ../src/client/application/geary-controller.vala:328
+#: ../src/client/application/geary-controller.vala:501
 msgid "R_eply All"
-msgstr "O_dgovori na vse"
+msgstr "O_dgovori vsem"
 
-#: ../src/client/application/geary-controller.vala:329
+#: ../src/client/application/geary-controller.vala:502
 msgid "Reply all (Ctrl+Shift+R, Shift+R)"
-msgstr "Odgovori na vse (Ctrl+Shift+R, Shift+R)"
+msgstr "Odgovori vsem (CTRL+SHIFT+R, SHIFT+R)"
 
-#. Forward a message.
-#: ../src/client/application/geary-controller.vala:334
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1577
+#: ../src/client/application/geary-controller.vala:507
+#: ../ui/conversation-email-menus.ui.h:3
 msgid "_Forward"
 msgstr "_Posreduj"
 
-#: ../src/client/application/geary-controller.vala:335
+#: ../src/client/application/geary-controller.vala:508
 msgid "Forward (Ctrl+L, F)"
 msgstr "Posreduj (Ctrl+L, F)"
 
-#: ../src/client/application/geary-controller.vala:618
+#: ../src/client/application/geary-controller.vala:538
+msgid "Empty _Spam…"
+msgstr "Izprazni mapo _neželene pošte"
+
+#: ../src/client/application/geary-controller.vala:542
+msgid "Empty _Trash…"
+msgstr "Izprazni _smeti"
+
+#. No callback is connected, since we bind the toggle button to the search bar visibility
+#: ../src/client/application/geary-controller.vala:574
+msgid "Toggle search bar"
+msgstr "Preklopi prikaz iskalne vrstice"
+
+#. No callback is connected, since we bind the toggle button to the find bar visibility
+#: ../src/client/application/geary-controller.vala:579
+msgid "Toggle find bar"
+msgstr "Preklopi vrstico iskanja"
+
+#: ../src/client/application/geary-controller.vala:757
+msgid "Unable to store server trust exception"
+msgstr "Ni mogoče shraniti potrditve izjeme varnosti strežnika"
+
+#: ../src/client/application/geary-controller.vala:992
 msgid "Your settings are insecure"
-msgstr "Vaše nastavitve niso varne"
+msgstr "Nastavitve niso varne"
 
-#: ../src/client/application/geary-controller.vala:619
+#: ../src/client/application/geary-controller.vala:993
 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 ""
-"Vaše IMAP in/ali SMTP nastavitve ne določajo SSL ali TLS.  To pomeni, da "
-"lahko druga oseba na omrežju prebere vaše uporabniško ime in geslo.  Ali ste "
+"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?"
 
-#: ../src/client/application/geary-controller.vala:620
+#: ../src/client/application/geary-controller.vala:994
 msgid "Co_ntinue"
 msgstr "_Nadaljuj"
 
+#: ../src/client/application/geary-controller.vala:1041
+msgid "Error connecting to the server"
+msgstr "Napaka med povezovanjem s strežnikom"
+
+#: ../src/client/application/geary-controller.vala:1042
+msgid ""
+"Geary encountered an error while connecting to the server.  Please try again "
+"in a few moments."
+msgstr ""
+"Med povezovanjem s strežnikom je prišlo do napake. Poskusite znova čez nekaj "
+"trenutkov."
+
 #. / Displayed in the space-limited status bar when a message fails to be sent due to error.
-#: ../src/client/application/geary-controller.vala:698
+#: ../src/client/application/geary-controller.vala:1079
 #: ../src/client/components/status-bar.vala:29
 msgid "Error sending email"
-msgstr "Napaka pri pošiljanju epošte"
+msgstr "Napaka med pošiljanjem sporočila"
 
-#: ../src/client/application/geary-controller.vala:699
+#: ../src/client/application/geary-controller.vala:1080
 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."
 
 #. 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:703
+#: ../src/client/application/geary-controller.vala:1084
 #: ../src/client/components/status-bar.vala:33
-#, fuzzy
-#| msgid "Error sending email"
 msgid "Error saving sent mail"
-msgstr "Napaka med branjem poštne datoteke: %s"
+msgstr "Napaka shranjevanja poslanega sporočila"
 
-#: ../src/client/application/geary-controller.vala:704
+#: ../src/client/application/geary-controller.vala:1085
 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."
 
-#: ../src/client/application/geary-controller.vala:773
+#: ../src/client/application/geary-controller.vala:1154
 msgid "Labels"
 msgstr "Oznake"
 
 #. 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:785
+#: ../src/client/application/geary-controller.vala:1166
 #, c-format
 msgid "Unable to open the database for %s"
-msgstr "Podatkovne baze za %s ni mogoče odpreti"
+msgstr "Podatkovne zbirke za %s ni mogoče odpreti"
 
-#: ../src/client/application/geary-controller.vala:786
+#: ../src/client/application/geary-controller.vala:1167
 #, c-format
 msgid ""
 "There was an error opening the local mail database for this account. This is "
@@ -488,37 +616,40 @@ msgid ""
 "<b>The mail on the your server will not be affected.</b>"
 msgstr ""
 
-#: ../src/client/application/geary-controller.vala:788
+#: ../src/client/application/geary-controller.vala:1169
 msgid "_Rebuild"
 msgstr "Ponovno _izgradi"
 
-#: ../src/client/application/geary-controller.vala:788
+#: ../src/client/application/geary-controller.vala:1169
 msgid "E_xit"
-msgstr "I_zhod"
+msgstr "_Končaj"
 
-#: ../src/client/application/geary-controller.vala:797
+#: ../src/client/application/geary-controller.vala:1178
 #, c-format
-msgid "Unable to rebuild database for \"%s\""
-msgstr "Podatkovne baze za \"%s\" ni mogoče ponovno zgraditi"
+msgid "Unable to rebuild database for “%s”"
+msgstr "Ponovna izgradnja mape za »%s« ni mogoča."
 
-#: ../src/client/application/geary-controller.vala:798
-#, fuzzy, c-format
+#: ../src/client/application/geary-controller.vala:1179
+#, c-format
 msgid ""
 "Error during rebuild:\n"
 "\n"
 "%s"
-msgstr "Napaka med snemanjem: %s\n"
+msgstr ""
+"Napaka med ponovno izgradnjo:\n"
+"\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:820
-#: ../src/client/application/geary-controller.vala:830
-#: ../src/client/application/geary-controller.vala:841
-#, fuzzy, c-format
+#: ../src/client/application/geary-controller.vala:1201
+#: ../src/client/application/geary-controller.vala:1211
+#: ../src/client/application/geary-controller.vala:1222
+#, c-format
 msgid "Unable to open local mailbox for %s"
-msgstr "Ni mogoče odpreti datoteke namizja %s za zaganjalnik%s%s pulta\n"
+msgstr "Ni mogoče odpreti krajevnega poštnega predala za %s"
 
-#: ../src/client/application/geary-controller.vala:821
+#: ../src/client/application/geary-controller.vala:1202
 #, c-format
 msgid ""
 "There was an error opening the local mail database for this account. This is "
@@ -530,16 +661,16 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../src/client/application/geary-controller.vala:831
+#: ../src/client/application/geary-controller.vala:1212
 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 "
+"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 ""
 
-#: ../src/client/application/geary-controller.vala:842
+#: ../src/client/application/geary-controller.vala:1223
 msgid ""
 "There was an error opening the local account. This is probably due to "
 "connectivity issues.\n"
@@ -547,480 +678,511 @@ msgid ""
 "Please check your network connection and restart Geary."
 msgstr ""
 
-#: ../src/client/application/geary-controller.vala:1335
-#, 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-controller.vala:1338
-msgid "translator-credits"
-msgstr "zasluge-za-prevajanje"
+#: ../src/client/application/geary-controller.vala:1999
+msgid "Undo move (Ctrl+Z)"
+msgstr "Razveljavi premik (CTRL+Z)"
 
-#: ../src/client/application/geary-controller.vala:1595
-#, c-format
-msgid "Are you sure you want to open \"%s\"?"
-msgstr "Ste prepričani, da želite odpreti \"%s\"?"
+#: ../src/client/application/geary-controller.vala:2009
+msgid "Are you sure you want to open these attachments?"
+msgstr "Ali ste prepričani, da želite odpreti vse priloge?"
 
-#: ../src/client/application/geary-controller.vala:1596
+#: ../src/client/application/geary-controller.vala:2010
 msgid ""
 "Attachments may cause damage to your system if opened.  Only open files from "
 "trusted sources."
 msgstr ""
-"Priponke so lahko škodljive vašemu sistemu, če jih odprete.  Odpirajte samo "
-"datoteke iz zaupljivih virov."
+"Priloge lahko vsebujejo zlonamerno kodo, ki lahko škoduje sistemu. Odpirajte "
+"samo datoteke iz zaupljivih virov."
 
-#: ../src/client/application/geary-controller.vala:1597
-msgid "Don't _ask me again"
-msgstr "Ne _sprašuj me več"
+#: ../src/client/application/geary-controller.vala:2011
+msgid "Don’t _ask me again"
+msgstr "_Ne vprašaj več"
 
-#: ../src/client/application/geary-controller.vala:1615
+#: ../src/client/application/geary-controller.vala:2121
 #, 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?"
+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/application/geary-controller.vala:1617
+#: ../src/client/application/geary-controller.vala:2123
 #, c-format
 msgid ""
-"The file already exists in \"%s\".  Replacing it will overwrite its contents."
+"The file already exists in “%s”.  Replacing it will overwrite its contents."
 msgstr ""
-"Datoteka že obstaja v \"%s\".  Če jo zamenjate, boste prepisali njeno "
-"vsebino."
+"Datoteka že obstaja v mapi »%s«. S prepisom bo izgubljena vsebina ciljne "
+"datoteke."
 
-#: ../src/client/application/geary-controller.vala:1620
+#: ../src/client/application/geary-controller.vala:2126
 msgid "_Replace"
 msgstr "_Zamenjaj"
 
-#: ../src/client/application/geary-controller.vala:1922
-#, fuzzy
-#| msgid "Do you want to discard this message?"
+#. Find out what to do with the inline composers.
+#. TODO: Remove this in favor of automatically saving drafts
+#: ../src/client/application/geary-controller.vala:2374
+msgid "Close open draft messages?"
+msgstr "Ali želite zapreti odprt osnutek sporočila?"
+
+#: ../src/client/application/geary-controller.vala:2496
+#, 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:2497
+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:2498
+msgid "This cannot be undone."
+msgstr "Dejanja ni mogoče povrniti."
+
+#: ../src/client/application/geary-controller.vala:2499
+#, c-format
+msgid "Empty %s"
+msgstr "Izprazni %s"
+
+#: ../src/client/application/geary-controller.vala:2516
+#, c-format
+msgid "Error emptying %s"
+msgstr "Napaka praznjenja %s"
+
+#: ../src/client/application/geary-controller.vala:2546
 msgid "Do you want to permanently delete this message?"
 msgid_plural "Do you want to permanently delete these messages?"
-msgstr[0] "Ali res želite izbrisati to kategorijo?\n"
-msgstr[1] "Želite zavreči to sporočilo?"
-msgstr[2] "Želite zavreči to sporočilo?"
-msgstr[3] "Želite zavreči to sporočilo?"
+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:1924
-#| msgid "_Delete"
+#: ../src/client/application/geary-controller.vala:2548
 msgid "Delete"
 msgstr "Izbriši"
 
-#: ../src/client/components/conversation-find-bar.vala:214
-#, fuzzy, c-format
-#| msgid "%i matches"
-msgid "%i match"
-msgid_plural "%i matches"
-msgstr[0] "%i zadetkov"
-msgstr[1] "%i zadetkov"
-msgstr[2] "%i zadetkov"
-msgstr[3] "%i zadetkov"
-
-#: ../src/client/components/conversation-find-bar.vala:216
-#, fuzzy, c-format
-#| msgid "%i matches (wrapped)"
-msgid "%i match (wrapped)"
-msgid_plural "%i matches (wrapped)"
-msgstr[0] "Primerjaj skladnosti polj"
-msgstr[1] "%i zadetkov (celotno)"
-msgstr[2] "%i zadetkov (celotno)"
-msgstr[3] "%i zadetkov (celotno)"
-
-#: ../src/client/components/conversation-find-bar.vala:218
-msgid "not found"
-msgstr "Ni zadetkov"
-
-#: ../src/client/components/main-toolbar.vala:11
+#: ../src/client/application/geary-controller.vala:2580
+msgid "Undo archive (Ctrl+Z)"
+msgstr "Razveljavi arhiviranje (CTRL+Z)"
+
+#: ../src/client/application/geary-controller.vala:2595
+msgid "Undo trash (Ctrl+Z)"
+msgstr "Razveljavi smeti (CTRL+Z)"
+
+#: ../src/client/application/geary-controller.vala:2649
+msgid "Undo (Ctrl+Z)"
+msgstr "Razveljavi (CTRL+Z)"
+
+#: ../src/client/application/geary-controller.vala:2780
+msgid "Failed to open default text editor."
+msgstr "Odpiranje privzetega urejevalnika besedila je spodletelo."
+
+#: ../src/client/components/main-window.vala:389
+#, c-format
+#| msgid "%s (%s)"
+msgid "%s (%d)"
+msgstr "%s (%d)"
+
+#: ../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
 msgid "Search"
-msgstr "Iskanje"
+msgstr "Poišči"
 
-#. Spacer.
-#. Search bar.
-#: ../src/client/components/main-toolbar.vala:84
+#. Search entry.
+#: ../src/client/components/search-bar.vala:23
 msgid "Search all mail in account for keywords (Ctrl+S)"
-msgstr "Preišči vso pošto v računu za ključne besede (Ctrl+S)"
+msgstr "Preišči vsa sporočila računa za ključne besede (CTRL+S)"
 
-#: ../src/client/components/main-toolbar.vala:205
+#: ../src/client/components/search-bar.vala:100
 #, c-format
 msgid "Indexing %s account"
-msgstr "Indeksiranje računa %s"
+msgstr "Poteka ustvarjanje kazala računa %s"
 
-#: ../src/client/components/main-toolbar.vala:212
+#: ../src/client/components/search-bar.vala:111
 #: ../src/client/folder-list/folder-list-search-branch.vala:39
-#, fuzzy, c-format
+#, c-format
 msgid "Search %s account"
-msgstr "Iskanje računa"
+msgstr "Preišči račun %s"
 
 #. / 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 "Pošiljanje..."
+msgid "Sending…"
+msgstr "Poteka pošiljanje ..."
 
-#: ../src/client/components/stock.vala:18
-#: ../ui/account_cannot_remove.glade.h:3
+#: ../src/client/components/stock.vala:18 ../ui/account_cannot_remove.glade.h:3
 msgid "_OK"
 msgstr "_V redu"
 
-#: ../src/client/components/stock.vala:19 ../ui/remove_confirm.glade.h:5
+#: ../src/client/components/stock.vala:19 ../ui/edit_alternate_emails.glade.h:3
+#: ../ui/password-dialog.glade.h:5 ../ui/remove_confirm.glade.h:5
 msgid "_Cancel"
 msgstr "_Prekliči"
 
-#: ../src/client/components/stock.vala:23 ../ui/account_list.glade.h:4
-#: ../ui/preferences.glade.h:1
+#: ../src/client/components/stock.vala:21 ../ui/gtk/menus.ui.h:6
+msgid "_About"
+msgstr "_O programu"
+
+#: ../src/client/components/stock.vala:23
 msgid "_Close"
 msgstr "_Zapri"
 
 #: ../src/client/components/stock.vala:24
 msgid "_Discard"
-msgstr "_Zavrži"
+msgstr "_Zavrzi"
 
-#: ../src/client/components/stock.vala:26
+#: ../src/client/components/stock.vala:25 ../ui/gtk/menus.ui.h:5
+msgid "_Help"
+msgstr "Pomo_č"
+
+#: ../src/client/components/stock.vala:26 ../ui/conversation-email-menus.ui.h:9
 msgid "_Open"
 msgstr "_Odpri"
 
-#: ../src/client/components/stock.vala:28
-msgid "_Print..."
-msgstr "_Tiskaj..."
+#: ../src/client/components/stock.vala:27 ../ui/gtk/menus.ui.h:3
+msgid "_Preferences"
+msgstr "_Možnosti"
+
+#: ../src/client/components/stock.vala:28 ../ui/conversation-email-menus.ui.h:7
+msgid "_Print…"
+msgstr "_Natisni ..."
+
+#: ../src/client/components/stock.vala:29 ../ui/gtk/menus.ui.h:7
+msgid "_Quit"
+msgstr "_Končaj"
 
 #: ../src/client/components/stock.vala:30 ../ui/remove_confirm.glade.h:6
 msgid "_Remove"
 msgstr "_Odstrani"
 
-#. Select all.
 #: ../src/client/components/stock.vala:32
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1035
-msgid "Select _All"
-msgstr "Izberi _vse"
-
-#: ../src/client/components/stock.vala:33
 msgid "_Keep"
 msgstr "_Obdrži"
 
-#: ../src/client/composer/composer-window.vala:40
-msgid "New Message"
-msgstr "Novo sporočilo"
+#: ../src/client/composer/composer-link-popover.vala:150
+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-window.vala:41
+#: ../src/client/composer/composer-link-popover.vala:157
+msgid "Invalid link URL"
+msgstr "Neveljaven naslov URL povezave"
+
+#: ../src/client/composer/composer-link-popover.vala:157
+msgid "Invalid email address"
+msgstr "Neveljaven elektronski naslov"
+
+#: ../src/client/composer/composer-widget.vala:154
 msgid "Saved"
 msgstr "Shranjeno"
 
-#: ../src/client/composer/composer-window.vala:42
+#: ../src/client/composer/composer-widget.vala:155
 msgid "Saving"
-msgstr "Shranjevanje"
+msgstr "Poteka shranjevanje"
 
-#: ../src/client/composer/composer-window.vala:43
+#: ../src/client/composer/composer-widget.vala:156
 msgid "Error saving"
-msgstr "Napaka pri shranjevanju"
+msgstr "Napaka med shranjevanjem"
 
-#. / A list of keywords, separated by pipe ("|") characters, that suggest an attachment
-#: ../src/client/composer/composer-window.vala:90
-msgid "attach|enclosed|enclosing|cover letter"
-msgstr ""
+#: ../src/client/composer/composer-widget.vala:157
+msgid "Press Backspace to delete quote"
+msgstr "Pritisnite povratno tipko za brisanje izvornega besedila"
+
+#: ../src/client/composer/composer-widget.vala:158
+msgid "New Message"
+msgstr "Novo sporočilo"
 
-#: ../src/client/composer/composer-window.vala:679
-msgid "Do you want to discard the unsaved message?"
-msgstr "Želite zavreči neshranjeno sporočilo?"
+#. 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:167
+msgid ""
+"attach|attaching|attaches|attachment|attachments|attached|enclose|enclosed|"
+"enclosing|encloses|enclosure|enclosures"
+msgstr ""
+"pripni|pripenjanje|priloži|priloga|priloge|priloženo|pripeto|vključeno|"
+"vstavljeno|dodano|priponka|vstavek"
 
-#: ../src/client/composer/composer-window.vala:682
+#: ../src/client/composer/composer-widget.vala:1122
+#: ../src/client/composer/composer-widget.vala:1141
 msgid "Do you want to discard this message?"
-msgstr "Želite zavreči to sporočilo?"
+msgstr "Ali želite zavreči to sporočilo?"
 
-#: ../src/client/composer/composer-window.vala:759
+#: ../src/client/composer/composer-widget.vala:1245
 msgid "Send message with an empty subject and body?"
-msgstr "Želite poslati sporočilo brez zadeve in vsebine?"
+msgstr "Ali želite poslati sporočilo brez zadeve in vsebine?"
 
-#: ../src/client/composer/composer-window.vala:761
+#: ../src/client/composer/composer-widget.vala:1247
 msgid "Send message with an empty subject?"
-msgstr "Želite poslati sporočilo brez zadeve?"
+msgstr "Ali želite poslati sporočilo brez vpisane zadeve?"
 
-#: ../src/client/composer/composer-window.vala:763
+#: ../src/client/composer/composer-widget.vala:1249
 msgid "Send message with an empty body?"
-msgstr "Želite poslati sporočilo brez vsebine?"
+msgstr "Ali želite poslati sporočilo brez vsebine?"
 
-#: ../src/client/composer/composer-window.vala:765
+#: ../src/client/composer/composer-widget.vala:1253
 msgid "Send message without an attachment?"
-msgstr "Želite poslati sporočilo brez priponke?"
+msgstr "Ali želite poslati sporočilo brez priloge?"
 
-#: ../src/client/composer/composer-window.vala:948
-msgid "Cannot add attachment"
-msgstr "Priponke ni možno dodati"
-
-#: ../src/client/composer/composer-window.vala:959
+#: ../src/client/composer/composer-widget.vala:1515
 #, c-format
-msgid "\"%s\" could not be found."
-msgstr "\"%s\" ni bilo mogoče najti."
+msgid "“%s” already attached for delivery."
+msgstr "Datoteka »%s« je že priložena za pošiljanje."
 
-#: ../src/client/composer/composer-window.vala:966
+#. / 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:1523
+#: ../src/client/conversation-viewer/conversation-email.vala:138
 #, c-format
-msgid "\"%s\" is a folder."
-msgstr "\"%s\" je mapa."
+msgid "%s (%s)"
+msgstr "%s (%s)"
 
-#: ../src/client/composer/composer-window.vala:973
+#: ../src/client/composer/composer-widget.vala:1560
 #, c-format
-msgid "\"%s\" is an empty file."
-msgstr "\"%s\" je prazna datoteka."
+msgid "“%s” could not be found."
+msgstr "Predmeta »%s« ni mogoče najti."
 
-#: ../src/client/composer/composer-window.vala:987
+#: ../src/client/composer/composer-widget.vala:1566
 #, c-format
-msgid "\"%s\" could not be opened for reading."
-msgstr "\"%s\" ni bilo mogoče odpreti za branje."
+msgid "“%s” is a folder."
+msgstr "Predmet »%s« je mapa."
 
-#: ../src/client/composer/composer-window.vala:994
+#: ../src/client/composer/composer-widget.vala:1572
 #, c-format
-msgid "\"%s\" already attached for delivery."
-msgstr "\"%s\" že pripeto za dostavo."
+msgid "“%s” is an empty file."
+msgstr "Datoteka »%s« je prazna datoteka."
 
-#. / In the composer, the filename followed by its filesize, i.e. "notes.txt (1.12KB)"
-#: ../src/client/composer/composer-window.vala:1003
+#: ../src/client/composer/composer-widget.vala:1585
 #, c-format
-msgid "%s (%s)"
-msgstr "%s (%s)"
+msgid "“%s” could not be opened for reading."
+msgstr "Datoteke »%s« ni mogoče odpreti za branje."
+
+#: ../src/client/composer/composer-widget.vala:1593
+msgid "Cannot add attachment"
+msgstr "Priloge ni mogoče dodati"
+
+#: ../src/client/composer/composer-widget.vala:1645
+msgid "To: "
+msgstr "Za: "
+
+#: ../src/client/composer/composer-widget.vala:1648
+msgid "Cc: "
+msgstr "Kp: "
+
+#: ../src/client/composer/composer-widget.vala:1651
+msgid "Bcc: "
+msgstr "Skp: "
+
+#: ../src/client/composer/composer-widget.vala:1654
+msgid "Reply-To: "
+msgstr "Odgovori na:"
 
-#: ../src/client/composer/composer-window.vala:1265
+#: ../src/client/composer/composer-widget.vala:1786
 msgid "Select Color"
-msgstr "Izberi barvo"
+msgstr "Izbor barve"
+
+#. 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:1986
+#, 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-window.vala:1655
-#| msgid "From:"
+#: ../src/client/composer/composer-widget.vala:2028
 msgid "_From:"
 msgstr "_Od:"
 
-#. For other types of messages, just show the from account.
-#. Composer label (without mnemonic underscore) for the account selector
-#. when choosing what address to send a message from.
-#. Geary account mail will be sent from
-#: ../src/client/composer/composer-window.vala:1671
-#: ../src/client/conversation-viewer/conversation-viewer.vala:628
-#: ../ui/composer.glade.h:41
-msgid "From:"
-msgstr "Od:"
-
-#: ../src/client/conversation-list/formatted-conversation-data.vala:11
-msgid "Me"
-msgstr "Jaz"
-
-#: ../src/client/conversation-viewer/conversation-viewer.vala:255
-msgid "No conversations selected."
-msgstr "Ni izbranih pogovorov."
+#. Translators: This is the name of the file chooser filter
+#. when inserting an image in the composer.
+#: ../src/client/composer/composer-widget.vala:2252
+msgid "Images"
+msgstr "Slike"
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:257
-#, fuzzy, c-format
-#| msgid "%u conversations selected."
-msgid "%u conversation selected."
-msgid_plural "%u conversations selected."
-msgstr[0] "Izbrano dostopno"
-msgstr[1] "%u pogovorov izbranih."
-msgstr[2] "%u pogovorov izbranih."
-msgstr[3] "%u pogovorov izbranih."
-
-#: ../src/client/conversation-viewer/conversation-viewer.vala:286
-msgid "No search results found."
-msgstr "Ni najdenih rezultatov iskanja."
-
-#: ../src/client/conversation-viewer/conversation-viewer.vala:288
-msgid "No conversations in folder."
-msgstr "V mapi ni pogovorov."
-
-#: ../src/client/conversation-viewer/conversation-viewer.vala:527
-msgid "This message contains remote images."
-msgstr "To sporočilo vsebuje oddaljene slike."
-
-#: ../src/client/conversation-viewer/conversation-viewer.vala:527
-msgid "Show Images"
-msgstr "Prikaži slike"
+#: ../src/client/composer/spell-check-popover.vala:117
+msgid "Remove this language from the preferred list"
+msgstr "Odstrani jezik s seznama prednostnih jezikov"
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:528
-#, fuzzy
-msgid "Always Show From Sender"
-msgstr "Najdi sporočila pošiljatelja"
+#: ../src/client/composer/spell-check-popover.vala:121
+msgid "Add this language to the preferred list"
+msgstr "Dodaj jezik na seznam prednostnih jezikov"
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:552
-msgid "Edit Draft"
-msgstr "Uredi osnutek"
+#: ../src/client/composer/spell-check-popover.vala:217
+msgid "Search for more languages"
+msgstr "Poišči dodatne jezike"
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:631
-msgid "To:"
-msgstr "Za:"
+#: ../src/client/conversation-list/formatted-conversation-data.vala:11
+msgid "Me"
+msgstr "Jaz"
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:634
-msgid "Cc:"
-msgstr "Kp:"
+#. Translators: This is the file type displayed for
+#. attachments with unknown file types.
+#: ../src/client/conversation-viewer/conversation-email.vala:124
+msgid "Unknown"
+msgstr "Neznano"
+
+#. Preview headers
+#. Translators: This is displayed in place of the from address
+#. when the message has no from address.
+#: ../src/client/conversation-viewer/conversation-message.vala:331
+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:586
+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:707
+msgid "Image"
+msgstr "Slika"
+
+#: ../src/client/conversation-viewer/conversation-viewer.vala:72
+msgid "No conversations selected"
+msgstr "Ni izbranega pogovora"
+
+#: ../src/client/conversation-viewer/conversation-viewer.vala:74
+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:79
+msgid "Multiple conversations selected"
+msgstr "Izbranih je več pogovorov"
+
+#: ../src/client/conversation-viewer/conversation-viewer.vala:81
+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:86
+#: ../src/client/conversation-viewer/conversation-viewer.vala:93
+msgid "No conversations found"
+msgstr "Ni najdenih pogovorov"
+
+#: ../src/client/conversation-viewer/conversation-viewer.vala:88
+msgid "This folder does not contain any conversations"
+msgstr "V mapi ni nobenega pogovora"
+
+#: ../src/client/conversation-viewer/conversation-viewer.vala:95
+msgid "Your search returned no results, try refining your search terms"
+msgstr ""
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:637
-msgid "Bcc:"
-msgstr "Skp:"
+#: ../src/client/dialogs/attachment-dialog.vala:28
+#: ../src/client/dialogs/attachment-dialog.vala:30
+msgid "Choose a file"
+msgstr "Izbor datoteke"
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:640
-msgid "Subject:"
-msgstr "Zadeva:"
+#: ../src/client/dialogs/attachment-dialog.vala:28
+#: ../src/client/dialogs/attachment-dialog.vala:30
+msgid "_Attach"
+msgstr "_Priloži"
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:643
-msgid "Date:"
-msgstr "Datum:"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:33
+#, c-format
+msgid "Untrusted Connection: %s"
+msgstr "Ne-varna povezava: %s"
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:850
-#, fuzzy, c-format
-#| msgid "%u read messages"
-msgid "%u read message"
-msgid_plural "%u read messages"
-msgstr[0] "preberi sporočilo"
-msgstr[1] "%u prebranih sporočil"
-msgstr[2] "%u prebranih sporočil"
-msgstr[3] "%u prebranih sporočil"
-
-#: ../src/client/conversation-viewer/conversation-viewer.vala:982
+#: ../src/client/dialogs/certificate-warning-dialog.vala:36
 #, c-format
-msgid "This message was sent successfully, but could not be saved to %s."
+msgid "The identity of the %s mail server at %s:%u could not be verified."
 msgstr ""
 
-#. Add a menu item for copying the current selection.
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1008
-#: ../ui/composer.glade.h:4
-msgid "_Copy"
-msgstr "_Kopiraj"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:44
+msgid ""
+"Selecting “Trust This Server” or “Always Trust This Server” may cause your "
+"username and password to be transmitted insecurely."
+msgstr ""
 
-#. Add a menu item for copying the address.
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1016
-msgid "Copy _Email Address"
-msgstr "Kopiraj _epoštni naslov"
-
-#. Add a menu item for copying the link.
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1021
-#: ../ui/composer.glade.h:17
-msgid "Copy _Link"
-msgstr "Kopiraj _povezavo"
-
-#. Select message.
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1029
-msgid "Select _Message"
-msgstr "Izberi _sporočilo"
-
-#. Inspect.
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1041
-msgid "_Inspect"
-msgstr "_Preveri"
-
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1267
-msgid "This link appears to go to"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:52
+msgid ""
+"Selecting “Don’t Trust This Server” will cause Geary not to access this "
+"server."
 msgstr ""
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1268
-#, fuzzy
-msgid "but actually goes to"
-msgstr "Skoči na naslednji znak."
+#: ../src/client/dialogs/certificate-warning-dialog.vala:54
+msgid "Geary will not add or update this email account."
+msgstr "Ta poštni račun ne bo dodan in posodabljan."
 
-#. If href doesn't look like a URL, something is fishy, so warn the user
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1323
-#, fuzzy
-msgid " (Invalid?)"
-msgstr "<neveljavno>"
-
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1515
-msgid "_Save As..."
-msgstr "_Shrani kot..."
-
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1520
-msgid "Save All A_ttachments..."
-msgstr "Shrani vse _priponke"
-
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1534
-msgid "_Save Image As..."
-msgstr "_Shrani sliko kot..."
-
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1557
-msgid "Save A_ttachment..."
-msgid_plural "Save All A_ttachments..."
-msgstr[0] "Shrani _priponko"
-msgstr[1] "Shrani obe _priponki"
-msgstr[2] "Shrani vse _priponke"
-msgstr[3] "Shrani vse _priponke"
-
-#. Reply to all on a message.
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1572
-msgid "Reply to _All"
-msgstr "Odgovori _vsem"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:59
+msgid ""
+"Selecting “Don’t Trust This Server” will cause Geary to stop accessing this "
+"account."
+msgstr ""
 
-#. Mark as read/unread.
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1589
-msgid "_Mark as Read"
-msgstr "_Označi kot prebrano"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:61
+msgid "Geary will exit if you have no other open email accounts."
+msgstr ""
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1593
-msgid "_Mark as Unread"
-msgstr "_Označi kot neprebrano"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:66
+msgid ""
+"Contact your system administrator or email service provider if you have any "
+"question about these issues."
+msgstr ""
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1599
-msgid "Mark Unread From _Here"
-msgstr "Označi kot neprebrano od _tukaj"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:73
+msgid "The server’s certificate is not signed by a known authority"
+msgstr ""
 
-#. Separator.
-#. View original message source.
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1614
-msgid "_View Source"
-msgstr "_Pokaži izvorno kodo"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:76
+msgid "The server’s identity does not match the identity in the certificate"
+msgstr "Potrdilo strežnika ni skladno z istovetnostjo strani"
 
-#. Generate the attachment table.
-#. / Placeholder filename for attachments with no filename.
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1908
-#: ../src/engine/rfc822/rfc822-utils.vala:327
-msgid "none"
-msgstr "nobeno"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:79
+msgid "The server’s certificate has expired"
+msgstr "Potrdilo strežnika je poteklo"
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:2038
-msgid "Failed to open default text editor."
-msgstr "Odpiranje privzetega urejevalnika besedila ni uspelo."
+#: ../src/client/dialogs/certificate-warning-dialog.vala:82
+msgid "The server’s certificate has not been activated"
+msgstr "Potrdilo strežnika ni omogočeno"
 
-#: ../src/client/conversation-viewer/conversation-web-view.vala:296
-#, c-format
-msgid "%s - Conversation Inspector"
-msgstr "%s - Preverjanje pogovorov"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:85
+msgid "The server’s certificate has been revoked and is now invalid"
+msgstr ""
 
-#: ../src/client/dialogs/attachment-dialog.vala:18
-msgid "Choose a file"
-msgstr "Izberite datoteko"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:88
+msgid "The server’s certificate is considered insecure"
+msgstr "Potrdilo strežnika je obravnavan kot ne-varen"
 
-#: ../src/client/dialogs/attachment-dialog.vala:23
-msgid "_Attach"
-msgstr "_Pripni"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:91
+msgid "An error has occurred processing the server’s certificate"
+msgstr ""
 
 #. 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
 #: ../src/client/dialogs/password-dialog.vala:16
-#, fuzzy
-#| msgid "Please enter your email password"
-msgid "Please enter your password"
-msgstr "Vnesite svoje geslo Kerberos:"
+msgid "Geary requires your email password to continue"
+msgstr ""
 
 #. Label displaying total number of email messages in a folder
-#: ../src/client/folder-list/folder-list-folder-entry.vala:30
+#: ../src/client/folder-list/folder-list-folder-entry.vala:32
 #, c-format
 msgid "%d message"
 msgid_plural "%d messages"
-msgstr[0] "%d sporočilo"
-msgstr[1] "%d sporočili"
-msgstr[2] "%d sporočila"
-msgstr[3] "%d sporočil"
+msgstr[0] "%d sporočil"
+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:37
+#: ../src/client/folder-list/folder-list-folder-entry.vala:39
 #, c-format
 msgid "%d unread"
 msgid_plural "%d unread"
-msgstr[0] "%d neprebrano"
-msgstr[1] "%d neprebrani"
-msgstr[2] "%d neprebrana"
-msgstr[3] "%d neprebranih"
+msgstr[0] "%d neprebranih"
+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:43
+#: ../src/client/folder-list/folder-list-folder-entry.vala:45
 #, c-format
 msgid "%s, %s"
 msgstr "%s, %s"
@@ -1030,39 +1192,39 @@ msgid "Inboxes"
 msgstr "Prejeto"
 
 #: ../src/client/folder-list/folder-list-search-branch.vala:44
-#, fuzzy, c-format
-#| msgid "%d results"
+#, c-format
 msgid "%d result"
 msgid_plural "%d results"
-msgstr[0] "Seznam rezultatov"
-msgstr[1] "%d rezultatov"
-msgstr[2] "%d rezultatov"
-msgstr[3] "%d rezultatov"
+msgstr[0] "%d zadetkov"
+msgstr[1] "%d zadetek"
+msgstr[2] "%d zadetka"
+msgstr[3] "%d zadetki"
 
 #: ../src/client/notification/libmessagingmenu.vala:75
 #, c-format
-msgid "%s - New Messages"
-msgstr "%s - Nova sporočila"
+#| msgid "%s - New Messages"
+msgid "%s — New Messages"
+msgstr "%s – nova sporočila"
 
-#: ../src/client/notification/libnotify.vala:72
+#: ../src/client/notification/libnotify.vala:74
 #, c-format
 msgid "%d new message"
 msgid_plural "%d new messages"
-msgstr[0] "%d novo sporočilo"
-msgstr[1] "%d nova sporočila"
-msgstr[2] "%d nova sporočila"
-msgstr[3] "%d novih sporočil"
+msgstr[0] "%d novih sporočil"
+msgstr[1] "%d novo sporočilo"
+msgstr[2] "%d novi sporočili"
+msgstr[3] "%d nova sporočila"
 
-#: ../src/client/notification/libnotify.vala:75
-#, fuzzy, c-format
+#: ../src/client/notification/libnotify.vala:77
+#, c-format
 msgid "%s, %d new message total"
 msgid_plural "%s, %d new messages total"
-msgstr[0] "Okno novega sporočila"
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
+msgstr[0] "%s, %d novih sporočil"
+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:107
+#: ../src/client/notification/libnotify.vala:109
 #, fuzzy, c-format
 msgid ""
 "%s\n"
@@ -1075,7 +1237,7 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#: ../src/client/notification/libnotify.vala:160
+#: ../src/client/notification/libnotify.vala:165
 msgid "Open"
 msgstr "Odpri"
 
@@ -1135,22 +1297,22 @@ msgid "Now"
 msgstr "Zdaj"
 
 #: ../src/client/util/util-date.vala:167
-#, fuzzy, c-format
+#, c-format
 msgid "%dm ago"
 msgid_plural "%dm ago"
-msgstr[0] "pred {0} dnevi, {1}"
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
+msgstr[0] "%d min nazaj"
+msgstr[1] "%d min nazaj"
+msgstr[2] "%d min nazaj"
+msgstr[3] "%d min nazaj"
 
 #: ../src/client/util/util-date.vala:171
-#, fuzzy, c-format
+#, c-format
 msgid "%dh ago"
 msgid_plural "%dh ago"
-msgstr[0] "pred {0} dnevi, {1}"
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
+msgstr[0] "%dh nazaj"
+msgstr[1] "%dh nazaj"
+msgstr[2] "%dh nazaj"
+msgstr[3] "%dh nazaj"
 
 #: ../src/client/util/util-date.vala:178
 msgid "Yesterday"
@@ -1164,13 +1326,13 @@ msgid "%A"
 msgstr "%A"
 
 #: ../src/client/util/util-email.vala:30
-#: ../src/engine/rfc822/rfc822-message.vala:742
+#: ../src/engine/rfc822/rfc822-message.vala:908
 msgid "(no subject)"
 msgstr "(brez zadeve)"
 
 #: ../src/client/util/util-files.vala:16
 msgid "bytes"
-msgstr "bytov"
+msgstr "bajti"
 
 #: ../src/client/util/util-files.vala:19
 msgctxt "Abbreviation for terabyte"
@@ -1208,6 +1370,14 @@ msgstr "Outlook.com"
 msgid "Other"
 msgstr "Ostalo"
 
+#: ../src/engine/api/geary-service.vala:20
+msgid "IMAP"
+msgstr "IMAP"
+
+#: ../src/engine/api/geary-service.vala:23
+msgid "SMTP"
+msgstr "SMTP"
+
 #: ../src/engine/api/geary-special-folder-type.vala:24
 msgid "Inbox"
 msgstr "Prejeto"
@@ -1230,7 +1400,7 @@ msgstr "Pomembno"
 
 #: ../src/engine/api/geary-special-folder-type.vala:39
 msgid "All Mail"
-msgstr "Vsa pošta"
+msgstr "Vsa sporočila"
 
 #: ../src/engine/api/geary-special-folder-type.vala:42
 msgid "Spam"
@@ -1242,169 +1412,293 @@ msgstr "Smeti"
 
 #: ../src/engine/api/geary-special-folder-type.vala:48
 msgid "Outbox"
-msgstr "Odhodno"
+msgstr "Odhodna pošta"
 
 #: ../src/engine/api/geary-special-folder-type.vala:54
 msgid "Archive"
 msgstr "Arhiv"
 
-#: ../src/engine/api/geary-special-folder-type.vala:58 ../ui/login.glade.h:25
+#: ../src/engine/api/geary-special-folder-type.vala:58 ../ui/login.glade.h:29
 msgid "None"
-msgstr "Nobena"
-
-#. Map of user-supplied search field names to column names.
-#. / Can be typed in the search box like attachment:file.txt to find
-#. / messages with attachments with a particular name.
-#: ../src/engine/imap-db/imap-db-account.vala:662
-#, fuzzy
-#| msgid "Save A_ttachment..."
-#| msgid_plural "Save All A_ttachments..."
+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
+#. localised version of the operator names but have not also
+#. translated the user manual, the English version in the
+#. manual still works.
+#. Can be typed in the search box like "attachment:file.txt"
+#. to find messages with attachments with a particular name.
+#.
+#. The translated string must be a single word (use '-', '_'
+#. 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:99
+msgctxt "Search operator"
 msgid "attachment"
 msgstr "priloga"
 
-#. / Can be typed in the search box like bcc:johndoe example com to find
-#. / messages bcc'd to a particular person.
-#. Fields we allow the token to be "me" as in from:me.
-#: ../src/engine/imap-db/imap-db-account.vala:665
-#: ../src/engine/imap-db/imap-db-account.vala:684
-#, fuzzy
+#. Can be typed in the search box like
+#. "bcc:johndoe example com" to find messages bcc'd to a
+#. particular person.
+#.
+#. The translated string must be a single word (use '-', '_'
+#. 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:108
+msgctxt "Search operator"
 msgid "bcc"
-msgstr "Skp:"
+msgstr "skp"
 
-#. / Can be typed in the search box like body:word to find the word only
-#. / if it occurs in the body of a message.
-#: ../src/engine/imap-db/imap-db-account.vala:668
-#, fuzzy
+#. Can be typed in the search box like "body:word" to find
+#. "word" only if it occurs in the body of a message.
+#.
+#. The translated string must be a single word (use '-', '_'
+#. 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:116
+msgctxt "Search operator"
 msgid "body"
-msgstr "Telo"
+msgstr "vsebina"
 
-#. / Can be typed in the search box like cc:johndoe example com to find
-#. / messages cc'd to a particular person.
-#: ../src/engine/imap-db/imap-db-account.vala:671
-#: ../src/engine/imap-db/imap-db-account.vala:684
-#, fuzzy
-#| msgid "Bcc:"
+#. Can be typed in the search box like
+#. "cc:johndoe example com" to find messages cc'd to a
+#. particular person.
+#.
+#. The translated string must be a single word (use '-', '_'
+#. 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:125
+msgctxt "Search operator"
 msgid "cc"
-msgstr "Kp:"
+msgstr "kp"
 
-#. / Can be typed in the search box like from:johndoe example com to
-#. / find messages from a particular sender.
-#: ../src/engine/imap-db/imap-db-account.vala:674
-#: ../src/engine/imap-db/imap-db-account.vala:684
-#, fuzzy
+#. Can be typed in the search box like
+#. "from:johndoe example com" to find messages from a
+#. particular sender.
+#.
+#. The translated string must be a single word (use '-', '_'
+#. 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:134
+msgctxt "Search operator"
 msgid "from"
-msgstr "izvajalec"
+msgstr "pošiljatelj"
 
-#. / Can be typed in the search box like subject:word to find the word
-#. / only if it occurs in the subject of a message.
-#: ../src/engine/imap-db/imap-db-account.vala:677
-#, fuzzy
-#| msgid "Subject:"
+#. Can be typed in the search box like "is:unread" to find
+#. messages that are read, unread, or starred.
+#.
+#. The translated string must be a single word (use '-', '_'
+#. 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:142
+msgctxt "Search operator"
+msgid "is"
+msgstr "je"
+
+#. Can be typed in the search box like "subject:word" to find
+#. "word" only if it occurs in the subject of a message.
+#.
+#. The translated string must be a single word (use '-', '_'
+#. 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:150
+msgctxt "Search operator"
 msgid "subject"
-msgstr "Zadeva"
+msgstr "zadeva"
 
-#. / Can be typed in the search box like to:johndoe example com to find
-#. / messages received by a particular person.
-#: ../src/engine/imap-db/imap-db-account.vala:680
-#: ../src/engine/imap-db/imap-db-account.vala:684
-#, fuzzy
+#. Can be typed in the search box like
+#. "to:johndoe example com" to find messages received by a
+#. particular person.
+#.
+#. The translated string must be a single word (use '-', '_'
+#. 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:159
+msgctxt "Search operator"
 msgid "to"
-msgstr "do"
+msgstr "za"
 
-#. "me" can be typed like from:me or cc:me, etc. as a shorthand
-#. to find mail to or from yourself in search.
-#: ../src/engine/imap-db/imap-db-account.vala:699
-#, fuzzy
+#. Can be typed in the search box after "to:", "cc:" and
+#. "bcc:" e.g.: "to:me". Matches conversations that are
+#. addressed to the user.
+#.
+#. The translated string must be a single word (use '-', '_'
+#. 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:180
+msgctxt "Search operator value - mail addressed to the user"
 msgid "me"
-msgstr "moj"
+msgstr "mene"
 
-#. List of folder names to match for Drafts, separated by |.  Please add localized common
-#. names for the Drafts folder, leaving in the English names as well.  The first in the list
-#. will be the default, so please add the most common localized name to the front.
-#: ../src/engine/imap-engine/imap-engine-generic-account.vala:439
-#, fuzzy
-#| msgid "Drafts"
+#. Can be typed in the search box after "from:" i.e.:
+#. "from:me". Matches conversations were sent by the user.
+#.
+#. The translated string must be a single word (use '-', '_'
+#. 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:192
+msgctxt "Search operator value - mail sent by the user"
+msgid "me"
+msgstr "mene"
+
+#. Can be typed in the search box after "is:" i.e.:
+#. "is:read". Matches conversations that are flagged as read.
+#.
+#. The translated string must be a single word (use '-', '_'
+#. 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:204
+msgctxt "'is:' search operator value"
+msgid "read"
+msgstr "prebrano"
+
+#. Can be typed in the search box after "is:" i.e.:
+#. "is:starred". Matches conversations that are flagged as
+#. starred.
+#.
+#. The translated string must be a single word (use '-', '_'
+#. 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:215
+msgctxt "'is:' search operator value"
+msgid "starred"
+msgstr "zvezdica"
+
+#. Can be typed in the search box after "is:" i.e.:
+#. "is:unread". Matches conversations that are flagged unread.
+#.
+#. The translated string must be a single word (use '-', '_'
+#. 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:225
+msgctxt "'is:' search operator value"
+msgid "unread"
+msgstr "neprebrano"
+
+#. List of general possible folder names to match for the
+#. 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:626
 msgid "Drafts | Draft"
-msgstr "Shrani osnutek"
+msgstr "Osnutki | Osnutek"
 
-#. List of folder names to match for Sent Mail, separated by |.  Please add localized common
-#. names for the Sent Mail folder, leaving in the English names as well.  The first in the list
-#. will be the default, so please add the most common localized name to the front.
-#: ../src/engine/imap-engine/imap-engine-generic-account.vala:444
-#, fuzzy
+#. List of general possible folder names to match for the
+#. 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:635
 msgid "Sent | Sent Mail | Sent Email | Sent E-Mail"
-msgstr "Ni mogoče izvršiti %s: pošta ni poslana."
-
-#. List of folder names to match for Spam, separated by |.  Please add localized common
-#. names for the Spam folder, leaving in the English names as well.  The first in the list
-#. will be the default, so please add the most common localized name to the front.
-#: ../src/engine/imap-engine/imap-engine-generic-account.vala:449
+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:640
+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:650
 msgid ""
 "Junk | Spam | Junk Mail | Junk Email | Junk E-Mail | Bulk Mail | Bulk Email "
 "| Bulk E-Mail"
 msgstr ""
 
-#. List of folder names to match for Trash, separated by |.  Please add localized common
-#. names for the Trash folder, leaving in the English names as well.  The first in the list
-#. will be the default, so please add the most common localized name to the front.
-#: ../src/engine/imap-engine/imap-engine-generic-account.vala:454
-#, fuzzy
+#. List of general possible folder names to match for the
+#. 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:660
 msgid "Trash | Rubbish | Rubbish Bin"
-msgstr "Pokaži &dvojiško"
+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:665
+msgctxt "Outlook localised name"
+msgid "Deleted Items"
+msgstr "Izbrisani predmeti"
+
+#. List of general possible folder names to match for the
+#. 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:675
+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:165
+#: ../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:171
+#: ../src/engine/rfc822/rfc822-utils.vala:242
 #, c-format
 msgid "On %1$s, %2$s wrote:"
-msgstr "%1$s, je %2$s napisal:"
+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/engine/rfc822/rfc822-utils.vala:178
+#: ../src/engine/rfc822/rfc822-utils.vala:249
 #, c-format
 msgid "%s wrote:"
-msgstr "%s je napisal:"
+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/engine/rfc822/rfc822-utils.vala:184
+#: ../src/engine/rfc822/rfc822-utils.vala:255
 #, c-format
 msgid "On %s:"
 msgstr "Na %s:"
 
-#: ../src/engine/rfc822/rfc822-utils.vala:211
+#: ../src/engine/rfc822/rfc822-utils.vala:278
 msgid "---------- Forwarded message ----------"
 msgstr "---------- Posredovano sporočilo ----------"
 
-#: ../src/engine/rfc822/rfc822-utils.vala:215
+#: ../src/engine/rfc822/rfc822-utils.vala:282
 #, c-format
 msgid "From: %s\n"
 msgstr "Od: %s\n"
 
-#: ../src/engine/rfc822/rfc822-utils.vala:216
+#: ../src/engine/rfc822/rfc822-utils.vala:283
 #, c-format
 msgid "Subject: %s\n"
 msgstr "Zadeva: %s\n"
 
-#: ../src/engine/rfc822/rfc822-utils.vala:217
+#: ../src/engine/rfc822/rfc822-utils.vala:284
 #, c-format
 msgid "Date: %s\n"
 msgstr "Datum: %s\n"
 
-#: ../src/engine/rfc822/rfc822-utils.vala:220
+#: ../src/engine/rfc822/rfc822-utils.vala:287
 #, c-format
 msgid "To: %s\n"
 msgstr "Za: %s\n"
 
-#: ../src/engine/rfc822/rfc822-utils.vala:223
+#: ../src/engine/rfc822/rfc822-utils.vala:290
 #, c-format
 msgid "Cc: %s\n"
 msgstr "Kp: %s\n"
@@ -1419,8 +1713,8 @@ msgid ""
 "A composer window associated with this account is currently open. Send or "
 "discard the message and try again."
 msgstr ""
-"Ta račun ima trenutno odprto okno za sestavljanje sporoči. Pošljite ali "
-"zavržite sporočilo in poskusite ponovno."
+"Ta račun je trenutno odprto okno za sestavljalnika sporoči. Pošljite ali "
+"zavrzite sporočilo in poskusite znova."
 
 #: ../ui/account_list.glade.h:1
 msgid "Add account"
@@ -1438,181 +1732,438 @@ msgstr "Odstrani račun"
 msgid "Please wait while Geary validates your account."
 msgstr "Prosimo počakajte, da Geary potrdi vaš račun."
 
-#: ../ui/composer.glade.h:1
+#: ../ui/certificate_warning_dialog.glade.h:1
+msgid "Untrusted Connection"
+msgstr "Ne-varna povezava"
+
+#: ../ui/certificate_warning_dialog.glade.h:2
+msgid "_Always Trust This Server"
+msgstr "_Vedno zaupaj strežniku"
+
+#: ../ui/certificate_warning_dialog.glade.h:3
+msgid "_Trust This Server"
+msgstr "_Zaupaj strežniku"
+
+#: ../ui/certificate_warning_dialog.glade.h:4
+msgid "_Don’t Trust This Server"
+msgstr "_Ne zaupaj strežniku"
+
+#: ../ui/composer-headerbar.ui.h:1
+msgid "Detach (Ctrl+D)"
+msgstr "Odpni (CTRL+D)"
+
+#: ../ui/composer-headerbar.ui.h:2
+msgid "Attach File (Ctrl+T)"
+msgstr "Priloži datoteko (CTRL+T)"
+
+#: ../ui/composer-headerbar.ui.h:3
+msgid "Include Original Attachments"
+msgstr "Vključi izvorne priloge"
+
+#: ../ui/composer-headerbar.ui.h:4
+#| msgid "Bold (Ctrl+B)"
+msgid "Send (Ctrl+Enter)"
+msgstr "Pošlji (CTRL+Enter)"
+
+#: ../ui/composer-headerbar.ui.h:5
+msgid "_Send"
+msgstr "_Pošlji"
+
+#: ../ui/composer-headerbar.ui.h:6
+msgid "Discard and Close"
+msgstr "Zavrzi in zapri"
+
+#: ../ui/composer-headerbar.ui.h:7
+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.h:2
+msgid "Insert the new link with this URL"
+msgstr "Ustavi novo povezavo s tem naslovom URL"
+
+#: ../ui/composer-link-popover.ui.h:3
+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.h:5
+msgid "Update this link’s URL"
+msgstr "Posodobi naslov URL povezave"
+
+#: ../ui/composer-link-popover.ui.h:6
+msgid "Delete this link"
+msgstr "Izbriši povezavo"
+
+#: ../ui/composer-link-popover.ui.h:7
+msgid "Open this link"
+msgstr "Odpri povezavo"
+
+#: ../ui/composer-menus.ui.h:1
+msgid "S_ans Serif"
+msgstr "S_ans Serif"
+
+#: ../ui/composer-menus.ui.h:2
+msgid "S_erif"
+msgstr "S_erif"
+
+#: ../ui/composer-menus.ui.h:3
+msgid "_Fixed Width"
+msgstr "_Nespremenljiva širina"
+
+#: ../ui/composer-menus.ui.h:4
+msgid "_Small"
+msgstr "_Majhna"
+
+#: ../ui/composer-menus.ui.h:5
+msgid "_Medium"
+msgstr "_Srednja"
+
+#: ../ui/composer-menus.ui.h:6
+msgid "Lar_ge"
+msgstr "_Velika"
+
+#: ../ui/composer-menus.ui.h:7
+msgid "C_olor"
+msgstr "_Barva"
+
+#: ../ui/composer-menus.ui.h:8
+msgid "_Rich Text"
+msgstr "_Oblikovano besedilo"
+
+#: ../ui/composer-menus.ui.h:9
+msgid "Show Extended Fields"
+msgstr "Pokaži razširjena polja"
+
+#: ../ui/composer-menus.ui.h:10
 msgid "_Undo"
 msgstr "_Razveljavi"
 
-#: ../ui/composer.glade.h:2
+#: ../ui/composer-menus.ui.h:11
 msgid "_Redo"
 msgstr "_Ponovi"
 
-#: ../ui/composer.glade.h:3
+#: ../ui/composer-menus.ui.h:12
 msgid "Cu_t"
 msgstr "_Izreži"
 
-#: ../ui/composer.glade.h:5
+#: ../ui/composer-menus.ui.h:13 ../ui/conversation-message-menus.ui.h:7
+msgid "_Copy"
+msgstr "_Kopiraj"
+
+#: ../ui/composer-menus.ui.h:14
 msgid "_Paste"
 msgstr "_Prilepi"
 
-#: ../ui/composer.glade.h:6
-msgid "_Left"
-msgstr "_Levo"
+#: ../ui/composer-menus.ui.h:15
+msgctxt "Clipboard paste with rich text"
+msgid "Paste _With Formatting"
+msgstr "Prilepi z _oblikovanjem"
 
-#: ../ui/composer.glade.h:7
-msgid "_Right"
-msgstr "_Desno"
+#: ../ui/composer-menus.ui.h:16
+msgid "Select _All"
+msgstr "Izberi _vse"
 
-#: ../ui/composer.glade.h:8
-msgid "_Center"
-msgstr "_Sredinsko"
+#: ../ui/composer-menus.ui.h:17 ../ui/conversation-message-menus.ui.h:9
+msgid "_Inspect…"
+msgstr "_Preveri ..."
 
-#: ../ui/composer.glade.h:9
-msgid "_Justify"
-msgstr "_Obojestransko"
+#. Address(es) e-mail is to be sent to
+#: ../ui/composer-widget.ui.h:2
+msgid "_To"
+msgstr "_Za"
 
-#: ../ui/composer.glade.h:10
-msgid "Link (Ctrl+L)"
-msgstr "Povezava (Ctrl+L)"
+#: ../ui/composer-widget.ui.h:3
+msgid "_Cc"
+msgstr "_Kp"
 
-#: ../ui/composer.glade.h:11
-msgid "C_olor"
-msgstr "_Barva"
+#: ../ui/composer-widget.ui.h:4
+msgid "_Subject"
+msgstr "Z_adeva"
 
-#: ../ui/composer.glade.h:12
-msgid "More options"
-msgstr "Več možnosti"
+#: ../ui/composer-widget.ui.h:5
+msgid "_Bcc"
+msgstr "_Skp"
 
-#: ../ui/composer.glade.h:13
-msgid "Quote text  (Ctrl+])"
-msgstr "Dodaj narekovaje  (Ctrl+])"
+#: ../ui/composer-widget.ui.h:6
+msgid "_Reply-To"
+msgstr "_Odgovori na:"
 
-#: ../ui/composer.glade.h:14
-msgid "Unquote text (Ctrl+[)"
-msgstr "Odstrani narekovaje (Ctrl+[)"
+#. Geary account mail will be sent from
+#: ../ui/composer-widget.ui.h:8
+msgid "From"
+msgstr "Od"
 
-#: ../ui/composer.glade.h:15
-msgid "Remove formatting (Ctrl+Space)"
-msgstr "Odstrani oblikovanje (Ctrl+Presledek)"
+#: ../ui/composer-widget.ui.h:9
+msgid "Drop files here"
+msgstr "Povlecite datoteke sem"
 
-#: ../ui/composer.glade.h:16
-#, fuzzy
-#| msgid "Paste _With Formatting"
-msgctxt "Clipboard paste with rich text"
-msgid "Paste _With Formatting"
-msgstr "Moderni slog s finančnim oblikovanjem"
+#: ../ui/composer-widget.ui.h:10
+msgid "To add them as attachments"
+msgstr "Da jih dodate kot priponke."
+
+#: ../ui/composer-widget.ui.h:11
+msgid "Undo last edit (Ctrl+Z)"
+msgstr "Razveljavi zadnjo spremembo [Ctrl+Z]"
 
-#: ../ui/composer.glade.h:18
+#: ../ui/composer-widget.ui.h:12
+msgid "Redo last edit  (Ctrl+Shift+Z)"
+msgstr "Ponovno uveljavi zadnje urejanje (CTRL+SHIFT+Z)"
+
+#: ../ui/composer-widget.ui.h:13
 msgid "Bold (Ctrl+B)"
 msgstr "Krepko (Ctrl+B)"
 
-#: ../ui/composer.glade.h:19
+#: ../ui/composer-widget.ui.h:14
 msgid "Italic (Ctrl+I)"
 msgstr "Ležeče (Ctrl+I)"
 
-#: ../ui/composer.glade.h:20
+#: ../ui/composer-widget.ui.h:15
 msgid "Underline (Ctrl+U)"
 msgstr "Podčrtano (Ctrl+U)"
 
-#: ../ui/composer.glade.h:21
+#: ../ui/composer-widget.ui.h:16
 msgid "Strikethrough (Ctrl+K)"
 msgstr "Prečrtano (Ctrl+K)"
 
-#: ../ui/composer.glade.h:22
-msgid "_Rich Text"
-msgstr "_Oblikovano besedilo"
+#: ../ui/composer-widget.ui.h:17
+msgid "Quote text  (Ctrl+])"
+msgstr "Dodaj narekovaje (Ctrl+])"
 
-#: ../ui/composer.glade.h:23
-msgid "Lar_ge"
-msgstr "_Velika"
+#: ../ui/composer-widget.ui.h:18
+#, fuzzy
+#| msgid "Unquote text (Ctrl+[)"
+msgid "Unquote text  (Ctrl+[)"
+msgstr "Ctrl"
 
-#: ../ui/composer.glade.h:24
-msgid "Large"
-msgstr "Velika"
+#: ../ui/composer-widget.ui.h:19
+msgid "Insert or update selection link (Ctrl+L)"
+msgstr ""
 
-#: ../ui/composer.glade.h:25
-msgid "_Medium"
-msgstr "_Srednja"
+#: ../ui/composer-widget.ui.h:20
+msgid "Insert an image (Ctrl+G)"
+msgstr "Vstavi sliko (CTRL+G)"
 
-#: ../ui/composer.glade.h:26
-msgid "Medium"
-msgstr "Srednja"
+#: ../ui/composer-widget.ui.h:21
+msgid "Remove selection formatting (Ctrl+Space)"
+msgstr "Odstrani oblikovanje izbranega besedila (CTRL+Presledek)"
 
-#: ../ui/composer.glade.h:27
-msgid "_Small"
-msgstr "_Majhna"
+#: ../ui/composer-widget.ui.h:22
+msgid "Select spell checking languages"
+msgstr "Izbor jezikov za preverjanje črkovanja"
 
-#: ../ui/composer.glade.h:28
-msgid "Small"
-msgstr "Majhna"
+#: ../ui/conversation-email.ui.h:1
+msgid "Save all attachments"
+msgstr "Shrani vse priloge"
 
-#: ../ui/composer.glade.h:29
-#, fuzzy
-msgid "S_ans Serif"
-msgstr "Pisava Serif:"
+#. Note: The application will never show this button at the same time as unstar_button, one will always be 
hidden.
+#: ../ui/conversation-email.ui.h:3
+msgid "Mark this message as starred"
+msgstr "Označi sporočilo z zvezdico"
 
-#: ../ui/composer.glade.h:30
-msgid "Sans Serif"
-msgstr "Brez-serifna"
+#. Note: The application will never show this button at the same time as star_button, one will always be 
hidden.
+#: ../ui/conversation-email.ui.h:5
+msgid "Mark this message as not starred"
+msgstr "Odstrani oznako z zvezdico s sporočila"
 
-#: ../ui/composer.glade.h:31
-msgid "S_erif"
+#: ../ui/conversation-email.ui.h:6
+msgid "Display the message menu"
+msgstr "Prikaži meni sporočila"
+
+#: ../ui/conversation-email.ui.h:7
+msgid "Open selected attachments"
+msgstr "Odpri izbrane priloge"
+
+#: ../ui/conversation-email.ui.h:8
+msgid "Save selected attachments"
+msgstr "Shrani izbrane priloge"
+
+#: ../ui/conversation-email.ui.h:9
+msgid "Select all attachments"
+msgstr "Izberi vse priloge"
+
+#: ../ui/conversation-email.ui.h:10
+msgid "Edit Draft"
+msgstr "Uredi osnutek"
+
+#: ../ui/conversation-email.ui.h:11
+msgid "Draft message"
+msgstr "Osnutek"
+
+#: ../ui/conversation-email.ui.h:12
+msgid "This message has not yet been sent."
+msgstr "Sporočilo še ni bilo poslano."
+
+#: ../ui/conversation-email.ui.h:13
+msgid "Try Again"
+msgstr "Poskusite ponovno"
+
+#: ../ui/conversation-email.ui.h:14
+msgid "Message not saved"
+msgstr "Sporočilo ni shranjeno."
+
+#: ../ui/conversation-email.ui.h:15
+msgid "This message was sent, but has not been saved to your account."
 msgstr ""
 
-#: ../ui/composer.glade.h:32
-msgid "Serif"
-msgstr "Serifna"
+#: ../ui/conversation-email-menus.ui.h:2
+msgid "Reply to _All"
+msgstr "Odgovori _vsem"
 
-#: ../ui/composer.glade.h:33
-msgid "_Fixed Width"
-msgstr "_Nespremenljiva širina"
+#: ../ui/conversation-email-menus.ui.h:4
+msgid "_Mark Read"
+msgstr "Označi kot _prebrano"
 
-#: ../ui/composer.glade.h:34
-msgid "Fixed Width"
-msgstr "Nespremenljiva širina"
+#: ../ui/conversation-email-menus.ui.h:5
+msgid "_Mark Unread"
+msgstr "Označi kot _neprebrano"
 
-#. Address(es) e-mail is to be sent to
-#: ../ui/composer.glade.h:36
-msgid "_To:"
-msgstr "_Za:"
+#: ../ui/conversation-email-menus.ui.h:6
+msgid "Mark Unread From _Here"
+msgstr "Označi kot neprebrano od _tukaj"
 
-#: ../ui/composer.glade.h:37
-msgid "_Cc:"
-msgstr "_Kp:"
+#: ../ui/conversation-email-menus.ui.h:8
+msgid "_View Source"
+msgstr "_Pokaži izvorno kodo"
 
-#: ../ui/composer.glade.h:38
-#| msgid "Subject:"
-msgid "_Subject:"
-msgstr "_Zadeva:"
+#: ../ui/conversation-email-menus.ui.h:11
+msgid "_Save All"
+msgstr "Shrani _vse"
 
-#: ../ui/composer.glade.h:39
-#| msgid "Bcc:"
-msgid "_Bcc:"
-msgstr "_Skp:"
+#: ../ui/conversation-message-menus.ui.h:1
+msgid "_Open Link"
+msgstr "_Odpri povezavo"
 
-#: ../ui/composer.glade.h:42
-msgid "Drop files here"
-msgstr "Povlecite datoteke sem"
+#: ../ui/conversation-message-menus.ui.h:2
+msgid "Copy Link _Address"
+msgstr "Kopiraj _naslov povezave"
 
-#: ../ui/composer.glade.h:43
-msgid "To add them as attachments"
-msgstr "Da jih dodate kot priponke."
+#: ../ui/conversation-message-menus.ui.h:3
+msgid "Send New _Message…"
+msgstr "Pošlji novo _sporočilo ..."
 
-#: ../ui/composer.glade.h:44
-msgid "_Attach File"
-msgstr "_Pripni datoteko"
+#: ../ui/conversation-message-menus.ui.h:4
+msgid "Copy Email _Address"
+msgstr "Kopiraj _elektronski naslov"
 
-#: ../ui/composer.glade.h:45
-msgid "_Include Original Attachments"
-msgstr "_Vključi originalne priponke"
+#: ../ui/conversation-message-menus.ui.h:5
+msgid "Save _Image As…"
+msgstr "Shrani sliko _kot ..."
 
-#: ../ui/composer.glade.h:46
-#| msgid "_Close"
-msgid "C_lose"
-msgstr "_Zapri"
+#: ../ui/conversation-message-menus.ui.h:6
+msgid "_Select All"
+msgstr "_Izberi vse"
 
-#: ../ui/composer.glade.h:47
-msgid "_Send"
-msgstr "_Pošlji"
+#: ../ui/conversation-message-menus.ui.h:8
+#, fuzzy
+msgid "Search for messages from"
+msgstr "Sporočila od %s"
+
+#: ../ui/conversation-message.ui.h:1
+msgid "From <email>"
+msgstr "Od <email>"
+
+#: ../ui/conversation-message.ui.h:2
+msgid "1/1/1970\t"
+msgstr "1/1/1970\t"
+
+#: ../ui/conversation-message.ui.h:3
+#, fuzzy
+msgid "Preview body text."
+msgstr "Besedilo za predogled"
+
+#: ../ui/conversation-message.ui.h:4
+msgid "Sent by:"
+msgstr "Pošiljatelj:"
+
+#: ../ui/conversation-message.ui.h:5
+msgid "Reply to:"
+msgstr "Odgovori na:"
+
+#: ../ui/conversation-message.ui.h:6
+msgid "Subject"
+msgstr "Zadeva"
+
+#: ../ui/conversation-message.ui.h:7
+msgid "To:"
+msgstr "Za:"
+
+#: ../ui/conversation-message.ui.h:8
+msgid "Cc:"
+msgstr "Kp:"
+
+#: ../ui/conversation-message.ui.h:9
+msgid "Bcc:"
+msgstr "Skp:"
+
+#: ../ui/conversation-message.ui.h:10
+msgid "Show Images"
+msgstr "Prikaži slike"
+
+#: ../ui/conversation-message.ui.h:11
+msgid "Always Show From Sender"
+msgstr "Vednopokaži naslov pošiljatelja"
+
+#: ../ui/conversation-message.ui.h:12
+msgid "Remote images not shown"
+msgstr "Slike na oddaljenih strežnikih niso prikazane"
+
+#: ../ui/conversation-message.ui.h:13
+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.h:14
+#, fuzzy
+msgid "But actually goes to:"
+msgstr "približno enak, vendar ne tudi enak z"
+
+#: ../ui/conversation-message.ui.h:15
+#, fuzzy
+msgid "The link appears to go to:"
+msgstr "Vedno se _pojavi"
+
+#: ../ui/conversation-message.ui.h:16
+#, fuzzy
+msgid "Deceptive link found"
+msgstr "Povezava z:"
+
+#: ../ui/conversation-message.ui.h:17
+msgid "The email sender may be leading you to the wrong web site."
+msgstr ""
+
+#: ../ui/conversation-message.ui.h:18
+msgid "If unsure, contact the sender and ask before continuing."
+msgstr ""
+
+#: ../ui/conversation-viewer.ui.h:1
+msgid "Find in conversation"
+msgstr "Najdi v pogovoru"
+
+#: ../ui/conversation-viewer.ui.h:2
+#, fuzzy
+msgid "Find the previous occurrence of the search string."
+msgstr "Najde predhodno ponovitev iskanega niza"
+
+#: ../ui/conversation-viewer.ui.h:3
+#, fuzzy
+msgid "Find the next occurrence of the search string."
+msgstr "Najde naslednjo ponovitev iskanega niza"
+
+#: ../ui/edit_alternate_emails.glade.h:1
+msgid "Remove email address"
+msgstr "Odstrani elektronski naslov"
+
+#: ../ui/edit_alternate_emails.glade.h:2
+msgid ""
+"Some email services require additional addresses be configured on the "
+"server.  Contact your email provider for more information."
+msgstr ""
+
+#: ../ui/edit_alternate_emails.glade.h:4
+msgid "_Update"
+msgstr "_Posodobi"
 
 #: ../ui/find_bar.glade.h:1
 msgid "Find:"
@@ -1631,193 +2182,482 @@ msgid "_Case sensitive"
 msgstr "_Razlikuj velikosti črk"
 
 #: ../ui/find_bar.glade.h:5
-#| msgid "Labels"
 msgid "label"
 msgstr "oznaka"
 
+#: ../ui/gtk/help-overlay.ui.h:1
+msgid "Conversation Shortcuts"
+msgstr "Tipkovna bližnjica pogovora"
+
+#: ../ui/gtk/help-overlay.ui.h:2
+msgctxt "shortcut window"
+msgid "General"
+msgstr "Splošno"
+
+#: ../ui/gtk/help-overlay.ui.h:3
+#, fuzzy
+msgctxt "shortcut window"
+msgid "Move focus to the next/previous pane"
+msgstr "Premakni dejavnost tipkovnice na naslednji dokument primerjave"
+
+#: ../ui/gtk/help-overlay.ui.h:4
+#, fuzzy
+#| msgid "Move conversations"
+msgctxt "shortcut window"
+msgid "Move focus to conversation list"
+msgstr "Premikanje naloge na seznam nalog »{0}« je spodletelo"
+
+#: ../ui/gtk/help-overlay.ui.h:5
+msgctxt "shortcut window"
+msgid "Detach composer window"
+msgstr "Odpni okno skladalnika"
+
+#: ../ui/gtk/help-overlay.ui.h:6
+msgctxt "shortcut window"
+msgid "Close composer window"
+msgstr "Zapri okno skladalnika"
+
+#: ../ui/gtk/help-overlay.ui.h:7
+msgctxt "shortcut window"
+msgid "Show keyboard shortcuts"
+msgstr "Pokaži tipkovne bližnjice‫"
+
+#: ../ui/gtk/help-overlay.ui.h:8
+msgctxt "shortcut window"
+msgid "Show help"
+msgstr "Pokaži pomoč"
+
+#: ../ui/gtk/help-overlay.ui.h:9
+msgctxt "shortcut window"
+msgid "Quit the application"
+msgstr "Končaj program"
+
+#: ../ui/gtk/help-overlay.ui.h:10
+msgctxt "shortcut window"
+msgid "Search"
+msgstr "Iskanje"
+
+#: ../ui/gtk/help-overlay.ui.h:11
+msgctxt "shortcut window"
+msgid "Jump to search box"
+msgstr "Skoči na iskalno polje"
+
+#: ../ui/gtk/help-overlay.ui.h:12
+#, fuzzy
+#| msgid "Add label to conversation"
+msgctxt "shortcut window"
+msgid "Find in current conversation"
+msgstr "Začni pogovor"
+
+#: ../ui/gtk/help-overlay.ui.h:13
+#, fuzzy
+msgctxt "shortcut window"
+msgid "Find next/previous in current conversation"
+msgstr "Najde naslednjo pojavitev trenutnega iskalnega niza"
+
+#: ../ui/gtk/help-overlay.ui.h:14
+msgctxt "shortcut window"
+msgid "Actions"
+msgstr "Dejanja"
+
+#: ../ui/gtk/help-overlay.ui.h:15
+#, fuzzy
+#| msgid "Compose Message"
+msgctxt "shortcut window"
+msgid "Compose a new message"
+msgstr "Sestavi _novo sporočilo"
+
+#: ../ui/gtk/help-overlay.ui.h:16
+#, fuzzy
+#| msgid "Reply to _All"
+msgctxt "shortcut window"
+msgid "Reply to sender "
+msgstr "_Odgovori pošiljatelju"
+
+#: ../ui/gtk/help-overlay.ui.h:17
+msgctxt "shortcut window"
+msgid "Reply to all"
+msgstr "Odgovori vsem"
+
+#: ../ui/gtk/help-overlay.ui.h:18
+msgctxt "shortcut window"
+msgid "Forward"
+msgstr "Posreduj"
+
+#: ../ui/gtk/help-overlay.ui.h:19
+msgctxt "shortcut window"
+msgid "Archive"
+msgstr "Arhiv"
+
+#: ../ui/gtk/help-overlay.ui.h:20
+msgctxt "shortcut window"
+msgid "Move to trash"
+msgstr "Premakni v smeti"
+
+#: ../ui/gtk/help-overlay.ui.h:21
+msgctxt "shortcut window"
+msgid "Toggle spam"
+msgstr "Preklopi sporočilo kot neželeno"
+
+#: ../ui/gtk/help-overlay.ui.h:22
+msgctxt "shortcut window"
+msgid "Move the conversation"
+msgstr "Premakni pogovor"
+
+#: ../ui/gtk/help-overlay.ui.h:23
+msgctxt "shortcut window"
+msgid "Label the conversation"
+msgstr "Označi pogovor"
+
+#: ../ui/gtk/help-overlay.ui.h:24
+msgctxt "shortcut window"
+msgid "Mark read"
+msgstr "Označi kot prebrano"
+
+#: ../ui/gtk/help-overlay.ui.h:25
+msgctxt "shortcut window"
+msgid "Mark unread"
+msgstr "Označi kot neprebrano"
+
+#: ../ui/gtk/help-overlay.ui.h:26
+msgctxt "shortcut window"
+msgid "View"
+msgstr "Pogled"
+
+#: ../ui/gtk/help-overlay.ui.h:27
+msgctxt "shortcut window"
+msgid "Zoom in"
+msgstr "Približaj"
+
+#: ../ui/gtk/help-overlay.ui.h:28
+msgctxt "shortcut window"
+msgid "Zoom out"
+msgstr "Oddalji"
+
+#: ../ui/gtk/help-overlay.ui.h:29
+msgctxt "shortcut window"
+msgid "Reset zoom"
+msgstr "Ponastavi približanje"
+
+#: ../ui/gtk/help-overlay.ui.h:30
+msgctxt "shortcut window"
+msgid "Additional Shortcuts"
+msgstr "Dodatne tipkovne bližnjice"
+
+#: ../ui/gtk/help-overlay.ui.h:31
+msgctxt "shortcut window"
+msgid "Star"
+msgstr "Dodaj zvezdico"
+
+#: ../ui/gtk/help-overlay.ui.h:32
+msgctxt "shortcut window"
+msgid "Unstar"
+msgstr "Odstrani zvezdico"
+
+#: ../ui/gtk/help-overlay.ui.h:33
+msgctxt "shortcut window"
+msgid "Delete"
+msgstr "Izbriši"
+
+#: ../ui/gtk/help-overlay.ui.h:34
+#, fuzzy
+#| msgid "Move conversation"
+msgctxt "shortcut window"
+msgid "Jump to next (older) conversation"
+msgstr "Skoči na naslednje mesto"
+
+#: ../ui/gtk/help-overlay.ui.h:35
+#, fuzzy
+msgctxt "shortcut window"
+msgid "Jump to previous (newer) conversation"
+msgstr "Skoči na predhodno mesto"
+
+#: ../ui/gtk/help-overlay.ui.h:36
+msgid "Composer Shortcuts"
+msgstr "Tipkovne bližnjice skladalnika"
+
+#: ../ui/gtk/help-overlay.ui.h:37
+msgctxt "shortcut window"
+msgid "Quote text"
+msgstr "Navedi izvorno besedilo"
+
+#: ../ui/gtk/help-overlay.ui.h:38
+msgctxt "shortcut window"
+msgid "Unquote text"
+msgstr "Odstrani izvorno besedilo"
+
+#: ../ui/gtk/help-overlay.ui.h:39
+msgctxt "shortcut window"
+msgid "Send"
+msgstr "Pošlji"
+
+#: ../ui/gtk/help-overlay.ui.h:40
+msgctxt "shortcut window"
+msgid "Add attachment"
+msgstr "Dodaj prilogo"
+
+#: ../ui/gtk/help-overlay.ui.h:41
+msgctxt "shortcut window"
+msgid "Rich text mode"
+msgstr "Oblikovano sporočilo"
+
+#: ../ui/gtk/help-overlay.ui.h:42
+msgctxt "shortcut window"
+msgid "Bold text"
+msgstr "Krepko besedilo"
+
+#: ../ui/gtk/help-overlay.ui.h:43
+msgctxt "shortcut window"
+msgid "Italicize text"
+msgstr "Ležeče besedilo"
+
+#: ../ui/gtk/help-overlay.ui.h:44
+msgctxt "shortcut window"
+msgid "Underline text"
+msgstr "Podčrtano besedilo"
+
+#: ../ui/gtk/help-overlay.ui.h:45
+msgctxt "shortcut window"
+msgid "Strike text"
+msgstr "Prečrtano besedilo"
+
+#: ../ui/gtk/help-overlay.ui.h:46
+msgctxt "shortcut window"
+msgid "Insert a link"
+msgstr "Vstavi povezavo"
+
+#: ../ui/gtk/help-overlay.ui.h:47
+msgctxt "shortcut window"
+msgid "Remove formatting"
+msgstr "Odstrani oblikovanje"
+
+#: ../ui/gtk/menus.ui.h:2
+msgid "A_ccounts"
+msgstr "_Računi"
+
+#: ../ui/gtk/menus.ui.h:4
+msgid "_Keyboard Shortcuts"
+msgstr "_Tipkovne bližnjice‫"
+
 #: ../ui/login.glade.h:1
+msgid "email example com"
+msgstr "elektronski naslov primer si"
+
+#: ../ui/login.glade.h:2 ../ui/password-dialog.glade.h:3
 msgid "Password"
 msgstr "Geslo"
 
-#: ../ui/login.glade.h:2
-msgid "E_mail address:"
-msgstr "E_poštni naslov:"
-
 #: ../ui/login.glade.h:3
-msgid "_Password:"
-msgstr "_Geslo:"
+msgid "E_mail address"
+msgstr "_Elektronski naslov"
 
 #: ../ui/login.glade.h:4
-msgid "S_ervice:"
-msgstr "_Storitev:"
+msgid "_Password"
+msgstr "_Geslo"
 
 #: ../ui/login.glade.h:5
-msgid "N_ame:"
-msgstr "_Ime:"
+msgid "S_ervice"
+msgstr "_Storitev"
 
-#: ../ui/login.glade.h:7
-msgid "N_ickname:"
-msgstr "_Vzdevek:"
+#: ../ui/login.glade.h:6
+msgid "N_ame"
+msgstr "_Ime"
 
 #: ../ui/login.glade.h:8
+msgid "N_ickname"
+msgstr "_Vzdevek"
+
+#: ../ui/login.glade.h:9
 msgid "Work, Home, etc."
 msgstr "Delo, dom, itd."
 
-#: ../ui/login.glade.h:9
-#| msgid "Sent Mail"
+#: ../ui/login.glade.h:10
 msgid "_Save sent mail"
 msgstr "_Shrani poslana sporočila"
 
-#: ../ui/login.glade.h:10
-msgid "IMAP settings"
-msgstr "IMAP nastavitve"
-
 #: ../ui/login.glade.h:11
-msgid "Se_rver:"
-msgstr "_Strežnik:"
+msgid "Addi_tional email addresses…"
+msgstr "Dodatni _elektronski naslovi ..."
 
 #: ../ui/login.glade.h:12
-msgid "P_ort:"
-msgstr "_Vrata:"
+msgid "IMAP settings"
+msgstr "IMAP nastavitve"
 
 #: ../ui/login.glade.h:13
-msgid "Ser_ver:"
-msgstr "_Strežnik:"
+msgid "Se_rver"
+msgstr "_Strežnik"
 
 #: ../ui/login.glade.h:14
-msgid "Por_t:"
-msgstr "_Vrata:"
+msgid "imap.example.com"
+msgstr "imap primer si"
 
 #: ../ui/login.glade.h:15
-msgid "SMTP settings"
-msgstr "SMTP nastavitve"
+msgid "P_ort"
+msgstr "_Vrata"
 
 #: ../ui/login.glade.h:16
-msgid "User_name:"
-msgstr "_Uporabniško ime:"
+msgid "smtp.example.com"
+msgstr "smtp primer si"
 
 #: ../ui/login.glade.h:17
-msgid "Pass_word:"
-msgstr "_Geslo:"
+msgid "Ser_ver"
+msgstr "St_režnik"
 
 #: ../ui/login.glade.h:18
+msgid "Por_t"
+msgstr "_Vrata"
+
+#: ../ui/login.glade.h:19
+msgid "SMTP settings"
+msgstr "SMTP nastavitve"
+
+#: ../ui/login.glade.h:20
+msgid "User_name"
+msgstr "_Uporabniško ime"
+
+#: ../ui/login.glade.h:21
+msgid "Pass_word"
+msgstr "_Geslo"
+
+#: ../ui/login.glade.h:22
 msgid "SMTP username"
 msgstr "SMTP uporabniško ime"
 
-#: ../ui/login.glade.h:19
+#: ../ui/login.glade.h:23
 msgid "SMTP password"
 msgstr "SMTP geslo"
 
-#: ../ui/login.glade.h:20
-msgid "_Username:"
-msgstr "_Uporabniško ime:"
+#: ../ui/login.glade.h:24
+msgid "_Username"
+msgstr "_Uporabniško ime"
 
-#: ../ui/login.glade.h:21
+#: ../ui/login.glade.h:25
 msgid "IMAP username"
 msgstr "IMAP uporabniško ime"
 
-#: ../ui/login.glade.h:22
+#: ../ui/login.glade.h:26
 msgid "IMAP password"
 msgstr "IMAP geslo"
 
-#: ../ui/login.glade.h:23
-msgid "Encr_yption:"
-msgstr "Ši_friranje:"
+#: ../ui/login.glade.h:27
+msgid "Encr_yption"
+msgstr "_Šifriranje"
 
-#: ../ui/login.glade.h:24
-msgid "Encrypt_ion:"
-msgstr "Ši_friranje:"
+#: ../ui/login.glade.h:28
+msgid "Encrypt_ion"
+msgstr "Ši_friranje"
 
-#: ../ui/login.glade.h:26
+#: ../ui/login.glade.h:30
 msgid "SSL/TLS"
 msgstr "SSL/TLS"
 
-#: ../ui/login.glade.h:27
+#: ../ui/login.glade.h:31
 msgid "STARTTLS"
 msgstr "STARTTLS"
 
-#: ../ui/login.glade.h:28
+#: ../ui/login.glade.h:32
 msgid "No authentication re_quired"
 msgstr "_Overitev ni potrebna"
 
-#: ../ui/login.glade.h:29
-#, fuzzy
-#| msgid "IMAP Credentials"
+#: ../ui/login.glade.h:33
 msgid "Use IMAP cre_dentials"
-msgstr "IMAP poverilnice"
+msgstr "Uporabi poverilnice _IMAP"
 
-#: ../ui/login.glade.h:30
+#: ../ui/login.glade.h:34
+msgid "Composer"
+msgstr "Sestavljalnik"
+
+#: ../ui/login.glade.h:35
+msgid "Save dra_fts on server"
+msgstr "Shrani osnutke na strežnik"
+
+#: ../ui/login.glade.h:36
+msgid "Si_gn emails (HTML allowed):"
+msgstr "_Podpiši sporočila (s podporo za HTML):"
+
+#: ../ui/login.glade.h:37
 msgid "Storage"
-msgstr "Shranjevanje"
+msgstr "Shramba"
 
-#: ../ui/login.glade.h:31
-msgid "_Download mail:"
-msgstr "_Prenesi pošto:"
+#: ../ui/login.glade.h:38
+msgid "_Download mail"
+msgstr "_Prejmi sporočila"
+
+#: ../ui/main-toolbar.ui.h:1
+msgid "Empty Spam or Trash folders"
+msgstr "Izprazni mapi smeti in neželene pošte"
 
 #: ../ui/password-dialog.glade.h:1
 msgid "SMTP Credentials"
-msgstr "SMTP poverilnice"
+msgstr "Poverila SMTP"
 
 #: ../ui/password-dialog.glade.h:2
-msgid "Username:"
+msgid "Username"
 msgstr "Uporabniško ime"
 
-#: ../ui/password-dialog.glade.h:3
-msgid "Password:"
-msgstr "Geslo:"
-
 #: ../ui/password-dialog.glade.h:4
-#| msgid "_Remember passwords"
 msgid "_Remember password"
 msgstr "_Zapomni si geslo"
 
-#: ../ui/preferences.glade.h:2
+#: ../ui/password-dialog.glade.h:6
+msgid "_Authenticate"
+msgstr "_Overi"
+
+#: ../ui/preferences-dialog.ui.h:1
 msgid "Reading"
 msgstr "Branje"
 
-#: ../ui/preferences.glade.h:3
+#: ../ui/preferences-dialog.ui.h:2
 msgid "_Automatically select next message"
 msgstr "_Samodejno izberi novo sporočilo"
 
-#: ../ui/preferences.glade.h:4
+#: ../ui/preferences-dialog.ui.h:3
 msgid "_Display conversation preview"
 msgstr "_Prikaži predogled pogovora"
 
-#: ../ui/preferences.glade.h:5
-msgid "Composer"
-msgstr "Skladatelj"
-
-#: ../ui/preferences.glade.h:6
-msgid "Enable _spell checking"
-msgstr "Omogoči _preverjanje pravopisa"
+#: ../ui/preferences-dialog.ui.h:4
+msgid "Use _three pane view"
+msgstr "Uporabi pogled _drevesne zgradbe"
 
-#: ../ui/preferences.glade.h:7
+#: ../ui/preferences-dialog.ui.h:5
 msgid "Notifications"
 msgstr "Obvestila"
 
-#: ../ui/preferences.glade.h:8
+#: ../ui/preferences-dialog.ui.h:6
 msgid "_Play notification sounds"
 msgstr "_Predvajaj zvočna obvestila"
 
-#: ../ui/preferences.glade.h:9
+#: ../ui/preferences-dialog.ui.h:7
 msgid "Show _notifications for new mail"
-msgstr "Prikaži _obvestila za novo pošto"
+msgstr "Prikaži _obvestila o novo prispeli pošti"
+
+#: ../ui/preferences-dialog.ui.h:8
+msgid "Always _watch for new mail"
+msgstr "Vedno preveri za _nova sporočila"
+
+#: ../ui/preferences-dialog.ui.h:9
+msgid "Geary will run in the background and notify of new mail"
+msgstr ""
+
+#: ../ui/preferences-dialog.ui.h:10
+msgid "Preferences"
+msgstr "Možnosti"
 
 #: ../ui/remove_confirm.glade.h:1
 msgid ""
 "<span weight=\"bold\" size=\"larger\">Are you sure you want to remove this "
 "account?</span> "
 msgstr ""
-"<span weight=\"bold\" size=\"larger\">Ste prepričani, da želite odstraniti "
-"ta račun?</span> "
+"<span weight=\"bold\" size=\"larger\">Ali ste prepričani, da želite "
+"odstraniti ta račun?</span> "
 
 #: ../ui/remove_confirm.glade.h:2
 msgid ""
 "All email associated with this account will be removed from your computer. "
 "This will not affect email on the server."
 msgstr ""
-"Vsa epošta povezana s tem računom bo odstranjena z vašega računalnika. To ne "
-"bo vplivalo na epošto na strežniku."
+"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."
 
 #: ../ui/remove_confirm.glade.h:3
 msgid "Nickname:"
@@ -1825,19 +2665,124 @@ msgstr "Vzdevek:"
 
 #: ../ui/remove_confirm.glade.h:4
 msgid "Email address:"
-msgstr "Epoštni naslov:"
+msgstr "Elektronski naslov:"
 
 #: ../ui/upgrade_dialog.glade.h:1
+msgid "Geary update in progress…"
+msgstr "Posodobitev programa Greary je v teku ..."
+
+#~ msgid "Copyright 2011-2014 Yorba Foundation"
+#~ msgstr "Avtorske pravice © 2004-2014 Yorba Foundation"
+
+#~ msgid "_Delete"
+#~ msgstr "_Briši"
+
+#~ msgid "_Trash"
+#~ msgstr "_Smeti"
+
+#~ msgid "_Donate"
+#~ msgstr "_Prispevaj"
+
+#, fuzzy
+#~ msgid "%i match"
+#~ msgid_plural "%i matches"
+#~ msgstr[0] "%i zadetkov"
+#~ msgstr[1] "%i zadetkov"
+#~ msgstr[2] "%i zadetkov"
+#~ msgstr[3] "%i zadetkov"
+
+#, fuzzy
+#~ msgid "%i match (wrapped)"
+#~ msgid_plural "%i matches (wrapped)"
+#~ msgstr[0] "Primerjaj skladnosti polj"
+#~ msgstr[1] "%i zadetkov (celotno)"
+#~ 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?"
+
+#~ msgid "No search results found."
+#~ msgstr "Ni najdenih rezultatov iskanja."
+
+#~ msgid "Date:"
+#~ msgstr "Datum:"
+
+#~ msgid "Copy _Link"
+#~ msgstr "Kopiraj _povezavo"
+
+#~ msgid "Select _Message"
+#~ msgstr "Izberi _sporočilo"
+
 #, fuzzy
-msgid "Geary upgrade in progress."
-msgstr "Obravnavanje zahteve 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"
+#~ msgstr[1] "Shrani obe _priponki"
+#~ msgstr[2] "Shrani vse _priponke"
+#~ msgstr[3] "Shrani vse _priponke"
+
+#~ msgid "none"
+#~ msgstr "nobeno"
+
+#, fuzzy
+#~ msgid "Please enter your password"
+#~ msgstr "Vnesite svoje geslo Kerberos:"
+
+#~ msgid "_Left"
+#~ msgstr "_Levo"
+
+#~ msgid "_Right"
+#~ msgstr "_Desno"
+
+#~ msgid "_Center"
+#~ msgstr "_Sredinsko"
+
+#~ msgid "_Justify"
+#~ msgstr "_Obojestransko"
+
+#~ msgid "Link (Ctrl+L)"
+#~ msgstr "Povezava (Ctrl+L)"
+
+#~ msgid "More options"
+#~ msgstr "Več možnosti"
+
+#~ msgid "Large"
+#~ msgstr "Velika"
+
+#~ msgid "Medium"
+#~ msgstr "Srednja"
+
+#~ 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"
+
+#~ msgid "Password:"
+#~ msgstr "Geslo:"
 
 #~ msgid "Archive conversation (Delete, Backspace, A)"
 #~ msgstr "Arhiviraj pogovor (Delete, Backspace, A)"
 
-#~ msgid "General"
-#~ msgstr "Splošno"
-
 #~ msgid "Port:"
 #~ msgstr "Vrata:"
 


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