[geary/gnome-3-38] Update Serbian translation

[Translations User D-L <translations src gnome org>]

commit 940968424e304b0691ffb4bd51c6497c0249d4e6
Author: Мирослав Николић <miroslavnikolic rocketmail com>
Date:   Sun Jan 17 10:29:20 2021 +0000

    Update Serbian translation

 po/sr.po | 4823 ++++++++++++++++++++++++++++++++++++++++++--------------------
 1 file changed, 3304 insertions(+), 1519 deletions(-)
---
diff --git a/po/sr.po b/po/sr.po
index 4d4bf1119..291e0bcaf 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -1,19 +1,18 @@
 # Serbian translation of Geary email client
-# Courtesy of Prevod.org team (http://prevod.org/) -- 2012—2017.
-# Copyright 2016 Software Freedom Conservancy Inc.
+# Courtesy of Prevod.org team (http://prevod.org/) -- 2012—2021.
+# Copyright 2021 Software Freedom Conservancy Inc.
 # This file is distributed under the GNU LGPL, version 2.1.
 # igorpan <mazezamte gmail com>, 2012
-# Мирослав Николић <miroslavnikolic rocketmail com>, 2014—2017.
 # Милош Поповић <gpopac gmail com>, 2015.
+# Мирослав Николић <miroslavnikolic rocketmail com>, 2014—2021.
 msgid ""
 msgstr ""
 "Project-Id-Version: geary\n"
-"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?";
-"product=geary&keywords=I18N+L10N&component=internationalization\n"
-"POT-Creation-Date: 2017-02-26 06:52+0000\n"
-"PO-Revision-Date: 2017-02-26 09:25+0200\n"
+"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/geary/issues\n";
+"POT-Creation-Date: 2020-09-19 08:49+0000\n"
+"PO-Revision-Date: 2021-01-17 10:27+0200\n"
 "Last-Translator: Мирослав Николић <miroslavnikolic rocketmail com>\n"
-"Language-Team: Serbian <(nothing)>\n"
+"Language-Team: српски <gnome-sr googlegroups org>\n"
 "Language: sr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -22,561 +21,1143 @@ msgstr ""
 "%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 "X-Project-Style: gnome\n"
 
-#: ../desktop/org.gnome.Geary.appdata.xml.in.h:1
-#: ../desktop/org.gnome.Geary.desktop.in.h:1
-#: ../desktop/geary-autostart.desktop.in.h:1
+#: desktop/geary-attach.contract.desktop.in:3
+msgid "Send by email"
+msgstr "Пошаљи е-поштом"
+
+#: desktop/geary-attach.contract.desktop.in:6
+msgid "Send files using Geary"
+msgstr "Пошаљите датотеке помоћу Герија"
+
+#. Translators: The application name
+#: desktop/geary-autostart.desktop.in.in:3
+#: desktop/org.gnome.Geary.appdata.xml.in.in:11
+#: desktop/org.gnome.Geary.desktop.in.in:3
+#: src/client/accounts/accounts-editor-servers-pane.vala:560
+#: src/client/application/application-main-window.vala:608
 msgid "Geary"
 msgstr "Гери"
 
-#: ../desktop/org.gnome.Geary.appdata.xml.in.h:2
-#: ../desktop/org.gnome.Geary.desktop.in.h:4
-#: ../desktop/geary-autostart.desktop.in.h:4
+#: desktop/geary-autostart.desktop.in.in:4
+#: desktop/org.gnome.Geary.desktop.in.in:4
+msgid "Email"
+msgstr "Е-пошта"
+
+#. Translators: The application's summary / tagline
+#: desktop/geary-autostart.desktop.in.in:5
+#: desktop/org.gnome.Geary.appdata.xml.in.in:15
+#: desktop/org.gnome.Geary.desktop.in.in:5
+#: src/client/application/application-client.vala:33
 msgid "Send and receive email"
 msgstr "Шаље и прима е-пошту"
 
-#: ../desktop/org.gnome.Geary.appdata.xml.in.h:3
+#. Translators: These are desktop search terms. Do not translate semicolons, end line with a semicolon.
+#: desktop/geary-autostart.desktop.in.in:7
+msgid "Email;E-mail;Mail;"
+msgstr "пошта;е-пошта;ел. пошта;електронска пошта;"
+
+#. Translators: The development team's name
+#: desktop/org.gnome.Geary.appdata.xml.in.in:13
+msgid "Geary Development Team"
+msgstr "Развојни тим Герија"
+
+#: desktop/org.gnome.Geary.appdata.xml.in.in:17
 msgid ""
 "Geary is an email application built around conversations, for the GNOME 3 "
 "desktop. It allows you to read, find and send email with a straightforward, "
 "modern interface."
 msgstr ""
-"Гери је програм за е-пошту изграђен око разговора, за радну површ Гнома 3. "
+"Гери је програм за е-пошту изграђен око преписке, за радну површ Гнома 3. "
 "Омогућује вам да читате, нађете и шаљете е-пошту са јасним, савременим "
 "сучељем."
 
-#: ../desktop/org.gnome.Geary.appdata.xml.in.h:4
+#: desktop/org.gnome.Geary.appdata.xml.in.in:22
 msgid ""
 "Conversations allow you to read a complete discussion without having to find "
 "and click from message to message."
 msgstr ""
-"Разговори вам омогућавају да прочитате читав разговор а да не морате да "
+"Преписке вам омогућавају да прочитате читав разговор а да не морате да "
 "тражите и кликате од поруке до поруке."
 
-#: ../desktop/org.gnome.Geary.appdata.xml.in.h:5
+#: desktop/org.gnome.Geary.appdata.xml.in.in:26
 msgid "Geary’s features include:"
 msgstr "У Геријеве функције спадају:"
 
-#: ../desktop/org.gnome.Geary.appdata.xml.in.h:6
+#: desktop/org.gnome.Geary.appdata.xml.in.in:28
 msgid "Quick email account setup"
 msgstr "Брзо подешавање налога е-поште"
 
-#: ../desktop/org.gnome.Geary.appdata.xml.in.h:7
+#: desktop/org.gnome.Geary.appdata.xml.in.in:29
 msgid "Shows related messages together in conversations"
-msgstr "Заједнички приказ повезаних порука у разговору"
+msgstr "Заједнички приказ повезаних порука у преписци"
 
-#: ../desktop/org.gnome.Geary.appdata.xml.in.h:8
+#: desktop/org.gnome.Geary.appdata.xml.in.in:30
 msgid "Fast, full text and keyword search"
 msgstr "Брза претрага по читавом тексту и кључној речи"
 
-#: ../desktop/org.gnome.Geary.appdata.xml.in.h:9
+#: desktop/org.gnome.Geary.appdata.xml.in.in:31
 msgid "Full-featured HTML and plain text message composer"
 msgstr "Потпуно функционалан састављач поруке у ХТМЛ-у и обичном тексту"
 
-#: ../desktop/org.gnome.Geary.appdata.xml.in.h:10
+#: desktop/org.gnome.Geary.appdata.xml.in.in:32
 msgid "Desktop notification of new mail"
 msgstr "Обавештење о новој пошти на радној површи"
 
-#: ../desktop/org.gnome.Geary.appdata.xml.in.h:11
+#: desktop/org.gnome.Geary.appdata.xml.in.in:33
 msgid "Compatible with GMail, Yahoo! Mail, Outlook.com and other IMAP servers"
 msgstr ""
 "Сагласан је са Г-поштом, Јаху! поштом, Аутлуком и другим ИМАП серверима"
 
-#: ../desktop/org.gnome.Geary.desktop.in.h:2
-msgid "Email"
-msgstr "Е-пошта"
+#. Translators: A screenshot description.
+#: desktop/org.gnome.Geary.appdata.xml.in.in:47
+#| msgid "_Display conversation preview"
+msgid "Geary displaying a conversation"
+msgstr "Гери приказује преписку"
 
-#: ../desktop/org.gnome.Geary.desktop.in.h:3
-msgid "Geary Email"
-msgstr "Геријева е-пошта"
+#. Translators: A screenshot description.
+#: desktop/org.gnome.Geary.appdata.xml.in.in:58
+msgid "Geary showing the rich text composer"
+msgstr "Гери приказује састављача богатог текста"
 
 #. Translators: These are desktop search terms. Do not translate semicolons, end line with a semicolon.
-#: ../desktop/org.gnome.Geary.desktop.in.h:6
+#: desktop/org.gnome.Geary.desktop.in.in:7
 msgid "Mail;E-mail;IMAP;GMail;Yahoo;Hotmail;Outlook;"
 msgstr "пошта;е-пошта;имап;гпошта;г-пошта;јаху;хотмејл;аутлук;"
 
-#: ../desktop/org.gnome.Geary.desktop.in.h:7 ../ui/gtk/menus.ui.h:1
+#: desktop/org.gnome.Geary.desktop.in.in:22
 msgid "Compose Message"
 msgstr "Нова порука"
 
-#: ../desktop/geary-autostart.desktop.in.h:2
-#: ../src/client/application/geary-application.vala:21
-msgid "Mail Client"
-msgstr "Програм за е-пошту"
-
-#: ../desktop/geary-autostart.desktop.in.h:3
-msgid "Geary Mail"
-msgstr "Геријева пошта"
-
-#: ../desktop/geary-autostart.desktop.in.h:5
-msgid "Email;E-mail;Mail;"
-msgstr "пошта;е-пошта;ел. пошта;електронска пошта;"
-
-#: ../desktop/geary-attach.contract.in.h:1
-msgid "Send by email"
-msgstr "Пошаљи е-поштом"
-
-#: ../desktop/geary-attach.contract.in.h:2
-msgid "Send files using Geary"
-msgstr "Пошаљите датотеке помоћу Герија"
-
-#: ../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 "_Сачувај"
-
-#: ../src/client/accounts/account-dialog-add-edit-pane.vala:51
-#: ../src/client/components/stock.vala:22
-msgid "_Add"
-msgstr "_Додај"
-
-#. reset/clear widgets
-#: ../src/client/accounts/account-dialog-edit-alternate-emails-pane.vala:120
-#, c-format
-msgid "Additional addresses for %s"
-msgstr "Додатне адресе за %s"
+#: desktop/org.gnome.Geary.desktop.in.in:26
+msgid "New Window"
+msgstr "Нови прозор"
 
-#. Sets min size.
-#: ../src/client/accounts/account-dialog.vala:21
-msgid "Accounts"
-msgstr "Налози"
-
-#. Copyright 2016 Software Freedom Conservancy Inc.
-#. *
-#. * This software is licensed under the GNU Lesser General Public License
-#. * (version 2.1 or later).  See the COPYING file in this distribution.
-#.
-#. Page for adding or editing an account.
-#. / Placeholder text indicating that the user should type their first name and last name
-#: ../src/client/accounts/add-edit-page.vala:10
-msgid "First Last"
-msgstr "Име и презиме"
-
-#: ../src/client/accounts/add-edit-page.vala:235
-msgid "Welcome to Geary."
-msgstr "Добро дошли у Гери."
-
-#: ../src/client/accounts/add-edit-page.vala:235
-msgid "Enter your account information to get started."
-msgstr "Унесите податке вашег налога за почетак."
-
-#: ../src/client/accounts/add-edit-page.vala:255
-msgid "2 weeks back"
-msgstr "од пре 2 недеље"
-
-#. IDs are # of days
-#: ../src/client/accounts/add-edit-page.vala:256
-msgid "1 month back"
-msgstr "од пре 1 месеца"
+#: desktop/org.gnome.Geary.gschema.xml:8
+msgid "Maximize window"
+msgstr "Увећање прозора"
 
-#: ../src/client/accounts/add-edit-page.vala:257
-msgid "3 months back"
-msgstr "од пре 3 месеци"
+#: desktop/org.gnome.Geary.gschema.xml:9
+msgid "True if the application window is maximized, false otherwise."
+msgstr "Изабрано ако је прозор програма увећан, у супротном поништено."
 
-#: ../src/client/accounts/add-edit-page.vala:258
-msgid "6 months back"
-msgstr "од пре 6 месеци"
+#: desktop/org.gnome.Geary.gschema.xml:14
+msgid "Width of window"
+msgstr "Ширина прозора"
 
-#: ../src/client/accounts/add-edit-page.vala:259
-msgid "1 year back"
-msgstr "од пре 1 године"
+#: desktop/org.gnome.Geary.gschema.xml:15
+msgid "The last recorded width of the application window."
+msgstr "Последња забележена ширина прозора програма."
 
-#: ../src/client/accounts/add-edit-page.vala:260
-msgid "2 years back"
-msgstr "од пре 2 године"
+#: desktop/org.gnome.Geary.gschema.xml:20
+msgid "Height of window"
+msgstr "Висина прозора"
 
-#: ../src/client/accounts/add-edit-page.vala:261
-msgid "4 years back"
-msgstr "од пре 4 година"
+#: desktop/org.gnome.Geary.gschema.xml:21
+msgid "The last recorded height of the application window."
+msgstr "Последња забележена висина прозора програма."
 
-#. Separator
-#: ../src/client/accounts/add-edit-page.vala:263
-msgid "Everything"
-msgstr "Све"
+#: desktop/org.gnome.Geary.gschema.xml:26
+msgid "Position of folder list pane"
+msgstr "Положај окна списка фасцикли"
 
-#: ../src/client/accounts/add-edit-page.vala:283
-msgid "Edit"
-msgstr "Уређивање"
+#: desktop/org.gnome.Geary.gschema.xml:27
+msgid "Position of the folder list Paned grabber."
+msgstr "Положај хватача окна списка фасцикли."
 
-#: ../src/client/accounts/add-edit-page.vala:285
-msgid "Preview"
-msgstr "Преглед"
+#: desktop/org.gnome.Geary.gschema.xml:32
+msgid "Position of folder list pane when horizontal"
+msgstr "Положај окна списка фасцикли када је водоравно"
 
-#: ../src/client/accounts/add-edit-page.vala:751
-msgid "Remem_ber passwords"
-msgstr "_Запамти лозинке"
+#: desktop/org.gnome.Geary.gschema.xml:33
+msgid ""
+"Position of the folder list Paned grabber in the horizontal orientation."
+msgstr "Положај хватача окна списка фасцикли у водоравном усмерењу."
 
-#: ../src/client/accounts/add-edit-page.vala:758 ../ui/login.glade.h:7
-msgid "Remem_ber password"
-msgstr "_Запамти лозинку"
+#: desktop/org.gnome.Geary.gschema.xml:38
+msgid "Position of folder list pane when vertical"
+msgstr "Положај окна списка фасцикли када је усправно"
 
-#: ../src/client/accounts/add-edit-page.vala:792
-msgid "Unable to validate:\n"
-msgstr "Не могу да потврдим:\n"
+#: desktop/org.gnome.Geary.gschema.xml:39
+msgid "Position of the folder list Paned grabber in the vertical orientation."
+msgstr "Положај хватача окна списка фасцикли у усправном усмерењу."
 
-#: ../src/client/accounts/add-edit-page.vala:794
-msgid "        • Invalid account nickname.\n"
-msgstr "        • Неисправан надимак налога.\n"
+#: desktop/org.gnome.Geary.gschema.xml:44
+msgid "Orientation of the folder list pane"
+msgstr "Усмерење окна списка фасцикли"
 
-#: ../src/client/accounts/add-edit-page.vala:797
-msgid "        • Email address already added to Geary.\n"
-msgstr "        • Адреса е-поште је већ додата у Гери.\n"
+#: desktop/org.gnome.Geary.gschema.xml:45
+msgid "True if the folder list Paned is in the horizontal orientation."
+msgstr "Изабрано ако је окно списка фасцикли у водоравном усмерењу."
 
-#: ../src/client/accounts/add-edit-page.vala:801
-msgid "        • IMAP connection error.\n"
-msgstr "        • Грешка ИМАП везе.\n"
+#: desktop/org.gnome.Geary.gschema.xml:50
+msgid "Show/hide formatting toolbar"
+msgstr "Приказује/скрива траку алата форматирања"
 
-#: ../src/client/accounts/add-edit-page.vala:804
-msgid "        • IMAP username or password incorrect.\n"
-msgstr "        • Нетачно корисничко име или лозинка ИМАП-а.\n"
+#: desktop/org.gnome.Geary.gschema.xml:51
+msgid "True if the formatting toolbar in the composer is shown."
+msgstr "Изабрано ако је трака алата форматирања у састављачу приказана."
 
-#: ../src/client/accounts/add-edit-page.vala:807
-msgid "        • SMTP connection error.\n"
-msgstr "        • Грешка СМТП везе.\n"
+#: desktop/org.gnome.Geary.gschema.xml:56
+msgid "Position of message list pane"
+msgstr "Положај окна списка порука"
 
-#: ../src/client/accounts/add-edit-page.vala:810
-msgid "        • SMTP username or password incorrect.\n"
-msgstr "        • Нетачно корисничко име или лозинка СМТП-а.\n"
+#: desktop/org.gnome.Geary.gschema.xml:57
+msgid "Position of the message list Paned grabber."
+msgstr "Положај хватача окна списка порука."
 
-#: ../src/client/accounts/add-edit-page.vala:814
-msgid "        • Connection error.\n"
-msgstr "        • Грешка везе.\n"
+#: desktop/org.gnome.Geary.gschema.xml:62
+#| msgid "_Automatically select next message"
+msgid "Autoselect next message"
+msgstr "Сам бира следећу поруку"
 
-#: ../src/client/accounts/add-edit-page.vala:818
-msgid "        • Username or password incorrect.\n"
-msgstr "        • Нетачно корисничко име или лозинка.\n"
+#: desktop/org.gnome.Geary.gschema.xml:63
+msgid "True if we should autoselect the next available conversation."
+msgstr "Изабрано ако треба сами да изаберемо следећу доступну преписку."
 
-#: ../src/client/application/geary-application.vala:22
-msgid "Copyright 2016 Software Freedom Conservancy Inc."
-msgstr "Ауторска права 2016 Software Freedom Conservancy Inc."
+#: desktop/org.gnome.Geary.gschema.xml:68
+#| msgid "_Display conversation preview"
+msgid "Display message previews"
+msgstr "Приказ претпрегледа поруке"
 
-#: ../src/client/application/geary-application.vala:24
-msgid "Visit the Geary web site"
-msgstr "Посетите веб страницу Герија"
+#: desktop/org.gnome.Geary.gschema.xml:69
+msgid "True if we should display a short preview of each message."
+msgstr "Изабрано ако треба да прикаже кратак претпреглед сваке поруке."
 
-#: ../src/client/application/geary-application.vala:445
-#, c-format
-msgid "About %s"
-msgstr "О програму „%s“"
+#: desktop/org.gnome.Geary.gschema.xml:74
+msgid "Use single key shortcuts"
+msgstr "Користи пречице једног тастера"
 
-#. 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:449
-msgid "translator-credits"
+#: desktop/org.gnome.Geary.gschema.xml:75
+msgid ""
+"Enables shortcuts for email actions that do not require pressing <Ctrl> to "
+"emulate those used by Gmail."
 msgstr ""
-"Мирослав Николић <miroslavnikolic rocketmail com>\n"
-"Милош Поповић <gpopac gmail com>\n"
-"Марко М. Костић <marko m kostic gmail com>\n"
-"\n"
-"http://prevod.org — превод на српски језик"
+"Укључује пречице за радње е-поште које не захтевају притискање <Ctrl> за "
+"опонашање оних коришћених у Г-пошти."
 
-#: ../src/client/application/geary-args.vala:10
-msgid "Start Geary with hidden main window"
-msgstr "Покреће Герија са скривеним главним прозором"
+#: desktop/org.gnome.Geary.gschema.xml:82
+msgid "Languages that shall be used in the spell checker"
+msgstr "Језици који ће се користити у правописару"
 
-#: ../src/client/application/geary-args.vala:11
-msgid "Output debugging information"
-msgstr "Испиши податке за уклањање грешака"
+#: desktop/org.gnome.Geary.gschema.xml:83
+msgid ""
+"A list of POSIX locales, with the empty list disabling spell checking and "
+"the null list using desktop languages by default."
+msgstr ""
+"Списак ПОСИКС језика, са празним списком који искључује проверу писања и "
+"ништавним списком који користи језике радне површи по основи."
 
-#: ../src/client/application/geary-args.vala:12
-msgid "Log conversation monitoring"
-msgstr "Бележи надгледање разговора"
+#: desktop/org.gnome.Geary.gschema.xml:90
+msgid "Languages that are displayed in the spell checker popover"
+msgstr "Језици приказани у облачићу правописара"
 
-#: ../src/client/application/geary-args.vala:13
-msgid "Log network deserialization"
-msgstr "Бележи десеријализацију мреже"
+#: desktop/org.gnome.Geary.gschema.xml:91
+msgid ""
+"List of languages that are always displayed in the popover of the spell "
+"checker."
+msgstr "Списак језика који су увек приказани у облачићу провере писања."
+
+#: desktop/org.gnome.Geary.gschema.xml:96
+#| msgid "Notify of new mail at start_up"
+msgid "Notify of new mail at startup"
+msgstr "Обавес о новој пошти при покретању"
+
+#: desktop/org.gnome.Geary.gschema.xml:97
+#| msgid "Notify of new mail at start_up"
+msgid "True to notify of new mail at startup."
+msgstr "Ако је изабрано обавестиће о новој пошти након покретања."
+
+#: desktop/org.gnome.Geary.gschema.xml:102
+msgid "Ask when opening an attachment"
+msgstr "Пита када отвара прилог"
+
+#: desktop/org.gnome.Geary.gschema.xml:103
+#| msgid "To add them as attachments"
+msgid "True to ask when opening an attachment."
+msgstr "Ако је изабрано питаће приликом отварања прилога."
+
+#: desktop/org.gnome.Geary.gschema.xml:108
+msgid "Whether to compose emails in HTML"
+msgstr "Састављање поруке у „HTML“-у"
+
+#: desktop/org.gnome.Geary.gschema.xml:109
+msgid "True to compose emails in HTML; false for plain text."
+msgstr ""
+"Ако је изабрано састављаће поруке у „HTML“, у супротном у обичном тексту."
 
-#: ../src/client/application/geary-args.vala:14
-msgid "Log network activity"
-msgstr "Бележи мрежну активност"
+#: desktop/org.gnome.Geary.gschema.xml:114
+msgid "Advisory strategy for full-text searching"
+msgstr "Саветодавна стратегија за претрагу пуног текста"
 
-#. / The IMAP replay queue is how changes on the server are replicated on the client.
-#. / It could also be called the IMAP events queue.
-#: ../src/client/application/geary-args.vala:17
-msgid "Log IMAP replay queue"
-msgstr "Бележи ред понављања ИМАП-а"
+#: desktop/org.gnome.Geary.gschema.xml:115
+msgid ""
+"Acceptable values are “exact”, “conservative”, “aggressive”, and “horizon”."
+msgstr ""
+"Прихватљиве вредности су „exact“, „conservative“, „aggressive“ и „horizon“."
+
+#: desktop/org.gnome.Geary.gschema.xml:120
+#| msgctxt "shortcut window"
+#| msgid "Move focus to conversation list"
+msgid "Zoom of conversation viewer"
+msgstr "Увеличање прегледача преписке"
+
+#: desktop/org.gnome.Geary.gschema.xml:121
+msgid "The zoom to apply on the conservation view."
+msgstr "Увеличање за примену на прегледу преписке."
+
+#: desktop/org.gnome.Geary.gschema.xml:126
+#| msgctxt "shortcut window"
+#| msgid "Detach composer window"
+msgid "Size of detached composer window"
+msgstr "Величина откаченог прозора састављача"
+
+#: desktop/org.gnome.Geary.gschema.xml:127
+msgid "The last recorded size of the detached composer window."
+msgstr "Последња забележена величина откаченог прозора састављача."
+
+#: desktop/org.gnome.Geary.gschema.xml:132
+#| msgid "Error sending email"
+msgid "Undo sending email delay"
+msgstr "Застој опозива слања поште"
+
+#: desktop/org.gnome.Geary.gschema.xml:133
+msgid ""
+"The number of seconds to wait before sending an email. Set to zero or less "
+"to disable."
+msgstr ""
+"Колико секунди ће чекати пре слања поште. Поставите на нулу или мање да "
+"искључите."
 
-#. / Serialization is how commands and responses are converted into a stream of bytes for
-#. / network transmission
-#: ../src/client/application/geary-args.vala:20
-msgid "Log network serialization"
-msgstr "Бележи серијализацију мреже"
+#: desktop/org.gnome.Geary.gschema.xml:139
+msgid "Brief notification display time"
+msgstr "Време приказа кратког обавештења"
 
-#: ../src/client/application/geary-args.vala:21
-msgid "Log periodic activity"
-msgstr "Бележи повремену активност"
+#: desktop/org.gnome.Geary.gschema.xml:140
+msgid ""
+"The length of time in seconds for which brief notifications should be "
+"displayed."
+msgstr "Време у секундама за које ће кратка обавештења бити приказана."
 
-#: ../src/client/application/geary-args.vala:22
-msgid "Log database queries (generates lots of messages)"
-msgstr "Бележи упите базе података (прави много порука)"
+#: desktop/org.gnome.Geary.gschema.xml:146
+msgid "List of optional plugins"
+msgstr "Списак изборних прикључака"
 
-#. / "Normalization" can also be called "synchronization"
-#: ../src/client/application/geary-args.vala:24
-msgid "Log folder normalization"
-msgstr "Бележи нормализацију фасцикле"
+#: desktop/org.gnome.Geary.gschema.xml:147
+msgid "Plugins listed here will be loaded on startup."
+msgstr "Прикључци на овом списку биће учитани приликом покретања."
 
-#: ../src/client/application/geary-args.vala:25
-msgid "Allow inspection of WebView"
-msgstr "Допушта прегледање Веб прегледа"
+#: desktop/org.gnome.Geary.gschema.xml:152
+msgid "Whether we migrated the old settings"
+msgstr "Да ли преносимо стара подешавања"
 
-#: ../src/client/application/geary-args.vala:26
-msgid "Revoke all server certificates with TLS warnings"
-msgstr "Опозива сва уверења сервера са ТЛС упозорењима"
+#: desktop/org.gnome.Geary.gschema.xml:153
+msgid ""
+"False to check for the old “org.yorba.geary”-schema and copy its values."
+msgstr ""
+"Неизабрано за проверавање старе „org.yorba.geary“-шеме умножавање њених "
+"вредности."
+
+#. Translators: In-app notification label, when
+#. the app had a problem pinning an otherwise
+#. untrusted TLS certificate
+#: src/client/accounts/accounts-editor.vala:210
+msgid "Failed to store certificate"
+msgstr "Нисам успео да сачувам уверење"
+
+#. Translators: Label for adding an email account
+#. account for a generic IMAP service provider.
+#: src/client/accounts/accounts-editor-add-pane.vala:108
+msgid "All others"
+msgstr "Сви други"
+
+#. Translators: In-app notification label
+#: src/client/accounts/accounts-editor-add-pane.vala:195
+#: src/client/accounts/accounts-editor-servers-pane.vala:321
+msgid "Check your receiving login and password"
+msgstr "Проверите пријаву и лозинку пријема"
+
+#. Translators: In-app notification label
+#: src/client/accounts/accounts-editor-add-pane.vala:210
+#: src/client/accounts/accounts-editor-servers-pane.vala:334
+msgid "Check your receiving server details"
+msgstr "Проверите детаље сервера пријема"
+
+#. Translators: In-app notification label
+#. There was an SMTP auth error, but IMAP already
+#. succeeded, so the user probably needs to
+#. specify custom creds here
+#. Translators: In-app notification label
+#: src/client/accounts/accounts-editor-add-pane.vala:232
+#: src/client/accounts/accounts-editor-servers-pane.vala:355
+msgid "Check your sending login and password"
+msgstr "Проверите пријаву и лозинку слања"
+
+#. Translators: In-app notification label
+#: src/client/accounts/accounts-editor-add-pane.vala:246
+#: src/client/accounts/accounts-editor-servers-pane.vala:368
+msgid "Check your sending server details"
+msgstr "Проверите детаље сервера слања"
+
+#. Translators: In-app notification label
+#: src/client/accounts/accounts-editor-add-pane.vala:261
+msgid "Check your email address and password"
+msgstr "Проверите адресу и лозинку е-поште"
+
+#. Translators: In-app notification label
+#: src/client/accounts/accounts-editor-add-pane.vala:272
+msgid "Could not connect, check your network"
+msgstr "Не могу да се повежем, проверите вашу мрежу"
+
+#. Translators: In-app notification label for a
+#. generic error creating an account
+#: src/client/accounts/accounts-editor-add-pane.vala:285
+msgid "An unexpected problem occurred"
+msgstr "Догодила се неочекивана грешка"
+
+#. Translators: In-app notification label, the
+#. string substitution is a more detailed reason.
+#: src/client/accounts/accounts-editor-add-pane.vala:303
+#, c-format
+msgid "Account not created: %s"
+msgstr "Налог није направљен: %s"
+
+#. Translators: Label for the person's actual name when adding
+#. an account
+#: src/client/accounts/accounts-editor-add-pane.vala:558
+msgid "Your name"
+msgstr "Ваше име"
+
+#. Translators: Label used for the address part of an
+#. email address when editing a user's sender address
+#. preferences for an account.
+#: src/client/accounts/accounts-editor-add-pane.vala:575
+#: src/client/accounts/accounts-editor-edit-pane.vala:513
+#| msgid "Email address:"
+msgid "Email address"
+msgstr "Адресе е-поште"
+
+#. Translators: Placeholder for the default sender address
+#. when adding an account
+#. Translators: This is used as a placeholder for the
+#. address part of an email address when editing a user's
+#. sender address preferences for an account.
+#: src/client/accounts/accounts-editor-add-pane.vala:579
+#: src/client/accounts/accounts-editor-edit-pane.vala:479
+#| msgid "email example com"
+msgid "person example com"
+msgstr "neko primer com"
+
+#. Translators: Label for an IMAP/SMTP service login/user name
+#. when adding an account
+#. Translators: Label for the user's login name for an
+#. IMAP, SMTP, etc service
+#: src/client/accounts/accounts-editor-add-pane.vala:593
+#: src/client/accounts/accounts-editor-servers-pane.vala:889
+msgid "Login name"
+msgstr "Име пријављивања"
+
+#. Translators: Label for the user's password for an IMAP,
+#. SMTP, etc service
+#: src/client/accounts/accounts-editor-add-pane.vala:607
+#: src/client/accounts/accounts-editor-servers-pane.vala:1011
+#: ui/password-dialog.glade:108
+msgid "Password"
+msgstr "Лозинка"
 
-#: ../src/client/application/geary-args.vala:27
-msgid "Perform a graceful quit"
-msgstr "Обавља грациозан излаз"
+#. Translators: Label for the IMAP server hostname when
+#. adding an account.
+#. Translators: This label describes the host name or IP
+#. address and port used by an account's IMAP service.
+#: src/client/accounts/accounts-editor-add-pane.vala:629
+#: src/client/accounts/accounts-editor-servers-pane.vala:733
+#| msgid "IMAP username"
+msgid "IMAP server"
+msgstr "ИМАП сервер"
+
+#. Translators: Placeholder for the IMAP server hostname
+#. when adding an account.
+#: src/client/accounts/accounts-editor-add-pane.vala:632
+msgid "imap.example.com"
+msgstr "imap.primer.com"
 
-#: ../src/client/application/geary-args.vala:28
-msgid "Display program version"
-msgstr "Приказује издање програма"
+#. Translators: Label for the SMTP server hostname when
+#. adding an account.
+#. Translators: This label describes the host name or IP
+#. address and port used by an account's SMTP service.
+#: src/client/accounts/accounts-editor-add-pane.vala:638
+#: src/client/accounts/accounts-editor-servers-pane.vala:739
+#| msgid "SMTP username"
+msgid "SMTP server"
+msgstr "СМТП сервер"
+
+#. Translators: Placeholder for the SMTP server hostname
+#. when adding an account.
+#: src/client/accounts/accounts-editor-add-pane.vala:641
+msgid "smtp.example.com"
+msgstr "smtp.primer.com"
 
-#. This gives a command-line hint on how to open new composer windows with mailto:
-#: ../src/client/application/geary-args.vala:53
+#. Translators: Label in the account editor for the user's
+#. custom name for an account.
+#: src/client/accounts/accounts-editor-edit-pane.vala:277
+#: ui/accounts_editor_remove_pane.ui:123
+#| msgid "Accounts"
+msgid "Account name"
+msgstr "Име налога"
+
+#. Translators: Tooltip used to undo changing
+#. the name of an account. The string
+#. substitution is the old name of the
+#. account.
+#: src/client/accounts/accounts-editor-edit-pane.vala:318
 #, c-format
-msgid "Use %s to open a new composer window"
-msgstr "Користите „%s“ за отварање новог прозора састављача"
-
-#: ../src/client/application/geary-args.vala:54
-msgid "Please report comments, suggestions and bugs to:"
-msgstr "Напомене, предлоге и грешке шаљите на:"
-
-#. i18n: Command line arguments are invalid
-#: ../src/client/application/geary-args.vala:61
+msgid "Change account name back to “%s”"
+msgstr "Промени име налога назад на „%s“"
+
+#. Translators: Tooltip for adding a new email sender/from
+#. address's address to an account
+#: src/client/accounts/accounts-editor-edit-pane.vala:342
+#| msgid "Remove email address"
+msgid "Add a new sender email address"
+msgstr "Додајте нову адресу е-поште пошиљаоца"
+
+#. Translators: Label used to indicate the user has
+#. provided no display name for one of their sender
+#. email addresses in their account settings.
+#: src/client/accounts/accounts-editor-edit-pane.vala:423
+#| msgid "Message not saved"
+msgid "Name not set"
+msgstr "Име није постављено"
+
+#. Translators: This is used as a placeholder for the
+#. display name for an email address when editing a user's
+#. sender address preferences for an account.
+#: src/client/accounts/accounts-editor-edit-pane.vala:464
+msgid "Sender Name"
+msgstr "Име пошиљаоца"
+
+#: src/client/accounts/accounts-editor-edit-pane.vala:491
+#| msgid "_Remove"
+msgid "Remove"
+msgstr "Уклони"
+
+#. Translators: Label used for the display name part of an
+#. email address when editing a user's sender address
+#. preferences for an account.
+#: src/client/accounts/accounts-editor-edit-pane.vala:506
+#| msgid "Username"
+msgid "Sender name"
+msgstr "Име пошиљаоца"
+
+#. Translators: Label used as the undo tooltip after adding an
+#. new sender email address to an account. The string
+#. substitution is the email address added.
+#: src/client/accounts/accounts-editor-edit-pane.vala:573
 #, c-format
-msgid "Failed to parse command line options: %s\n"
-msgstr "Не могу да обрадим опцију линије наредби: %s\n"
+msgid "Remove “%s”"
+msgstr "Уклони „%s“"
 
-#: ../src/client/application/geary-args.vala:72
+#. Translators: Label used as the undo tooltip after editing a
+#. sender address for an account. The string substitution is
+#. the email address edited.
+#: src/client/accounts/accounts-editor-edit-pane.vala:613
 #, c-format
-msgid "Unrecognized command line option “%s”\n"
-msgstr "Непозната опција линије наредби „%s“\n"
-
-#: ../src/client/application/geary-controller.vala:57
-msgid "Delete conversation"
-msgstr "Обриши разговор"
-
-#: ../src/client/application/geary-controller.vala:58
-msgid "Delete conversation (Shift+Delete)"
-msgstr "Обриши разговор (Помак+Обриши)"
-
-#: ../src/client/application/geary-controller.vala:59
-msgid "Delete conversations (Shift+Delete)"
-msgstr "Обриши разговоре (Помак+Обриши)"
-
-#. 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 "Премести разговор у смеће (Обриши, Повратница)"
+#| msgid "Unrecognized command line option “%s”\n"
+msgid "Undo changes to “%s”"
+msgstr "Опозови измене у „%s“"
+
+#. Translators: Label used as the undo tooltip after removing
+#. a sender address from an account. The string substitution
+#. is the email address edited.
+#: src/client/accounts/accounts-editor-edit-pane.vala:700
+#, c-format
+msgid "Add “%s” back"
+msgstr "Додај „%s“ назад"
+
+#. Translators: Label used as the undo tooltip after removing
+#. a sender address from an account. The string substitution
+#. is the email address edited.
+#: src/client/accounts/accounts-editor-edit-pane.vala:742
+msgid "Undo signature changes"
+msgstr "Опозови измене потписа"
+
+#. Translators: This label describes the account
+#. preference for the length of time (weeks, months or
+#. years) that past email should be downloaded.
+#: src/client/accounts/accounts-editor-edit-pane.vala:790
+#| msgid "_Download mail"
+msgid "Download mail"
+msgstr "Преузми пошту"
+
+#. Translators: Tooltip for undoing a change
+#. to the length of time that past email
+#. should be downloaded for an account. The
+#. string substitution is the duration,
+#. e.g. "1 month back".
+#: src/client/accounts/accounts-editor-edit-pane.vala:822
+#, c-format
+msgid "Change download period back to: %s"
+msgstr "Врати период преузимања на: %s"
 
-#: ../src/client/application/geary-controller.vala:64
-msgid "Move conversations to Trash (Delete, Backspace)"
-msgstr "Премести разговоре у смеће (Обриши, Повратница)"
+#: src/client/accounts/accounts-editor-edit-pane.vala:843
+msgid "Everything"
+msgstr "Све"
 
-#. This refers to the action ("archive an email"), not the Archive folder itself
-#: ../src/client/application/geary-controller.vala:68
-msgid "_Archive"
-msgstr "_Архивирај"
+#: src/client/accounts/accounts-editor-edit-pane.vala:847
+msgid "2 weeks back"
+msgstr "од пре 2 недеље"
 
-#: ../src/client/application/geary-controller.vala:69
-msgid "Archive conversation (A)"
-msgstr "Архивирај разговор (А)"
+#: src/client/accounts/accounts-editor-edit-pane.vala:851
+msgid "1 month back"
+msgstr "од пре 1 месеца"
 
-#: ../src/client/application/geary-controller.vala:70
-msgid "Archive conversations (A)"
-msgstr "Архивирај разговоре (А)"
+#: src/client/accounts/accounts-editor-edit-pane.vala:855
+msgid "3 months back"
+msgstr "од пре 3 месеци"
 
-#: ../src/client/application/geary-controller.vala:73
-msgid "Mark as S_pam"
-msgstr "Означи као _непожељно"
+#: src/client/accounts/accounts-editor-edit-pane.vala:859
+msgid "6 months back"
+msgstr "од пре 6 месеци"
 
-#: ../src/client/application/geary-controller.vala:74
-msgid "Mark as not S_pam"
-msgstr "Означи да није _непожељно"
+#: src/client/accounts/accounts-editor-edit-pane.vala:863
+msgid "1 year back"
+msgstr "од пре 1 године"
 
-#: ../src/client/application/geary-controller.vala:76
-#: ../src/client/application/geary-controller.vala:448
-msgid "Mark conversation"
-msgstr "Означи разговор"
+#: src/client/accounts/accounts-editor-edit-pane.vala:867
+msgid "2 years back"
+msgstr "од пре 2 године"
 
-#: ../src/client/application/geary-controller.vala:77
-msgid "Mark conversations"
-msgstr "Означи разговоре"
+#: src/client/accounts/accounts-editor-edit-pane.vala:871
+msgid "4 years back"
+msgstr "од пре 4 година"
 
-#: ../src/client/application/geary-controller.vala:78
-msgid "Add label to conversation"
-msgstr "Додај натпис разговору"
+#: src/client/accounts/accounts-editor-edit-pane.vala:877
+#, c-format
+#| msgid "1 year back"
+msgid "%d day back"
+msgid_plural "%d days back"
+msgstr[0] "од пре %d дана"
+msgstr[1] "од пре %d дана"
+msgstr[2] "од пре %d дана"
+msgstr[3] "од пре једног дана"
+
+#: src/client/accounts/accounts-editor-list-pane.vala:255
+#: src/client/application/application-main-window.vala:2061
+#| msgid "_Undo"
+msgid "Undo"
+msgstr "Опозови"
+
+#: src/client/accounts/accounts-editor-list-pane.vala:264
+#: src/client/application/application-main-window.vala:2044
+#| msgid "_Redo"
+msgid "Redo"
+msgstr "Понови"
+
+#: src/client/accounts/accounts-editor-list-pane.vala:358
+#: src/client/accounts/accounts-editor-list-pane.vala:454
+#: src/client/accounts/accounts-editor-row.vala:279
+msgid "Gmail"
+msgstr "Гуглова пошта"
 
-#: ../src/client/application/geary-controller.vala:79
-msgid "Add label to conversations"
-msgstr "Додај натпис разговорима"
+#: src/client/accounts/accounts-editor-list-pane.vala:362
+#: src/client/accounts/accounts-editor-list-pane.vala:458
+#: src/client/accounts/accounts-editor-row.vala:283
+msgid "Outlook.com"
+msgstr "Outlook.com"
 
-#: ../src/client/application/geary-controller.vala:80
-#: ../src/client/application/geary-controller.vala:487
-msgid "Move conversation"
-msgstr "Премести разговор"
+#: src/client/accounts/accounts-editor-list-pane.vala:366
+#: src/client/accounts/accounts-editor-list-pane.vala:462
+#: src/client/accounts/accounts-editor-row.vala:287
+#| msgid "Yahoo! Mail"
+msgid "Yahoo"
+msgstr "Јаху"
+
+#. Translators: Tooltip for accounts that have been
+#. loaded but disabled by the user.
+#: src/client/accounts/accounts-editor-list-pane.vala:388
+msgid "This account has been disabled"
+msgstr "Овај налог је онемогућен"
+
+#. Translators: Tooltip for accounts that have been
+#. loaded but because of some error are not able to be
+#. used.
+#: src/client/accounts/accounts-editor-list-pane.vala:397
+msgid "This account has encountered a problem and is unavailable"
+msgstr "Овај налог је наишао на проблем и недоступан је"
+
+#: src/client/accounts/accounts-editor-list-pane.vala:466
+msgid "Other email providers"
+msgstr "Остали достављачи е-поште"
+
+#. Translators: Notification shown after removing an
+#. account. The string substitution is the name of the
+#. account.
+#: src/client/accounts/accounts-editor-list-pane.vala:572
+#, c-format
+msgid "Account “%s” removed"
+msgstr "Налог „%s“ је уклоњен"
 
-#: ../src/client/application/geary-controller.vala:81
-msgid "Move conversations"
-msgstr "Премести разговоре"
+#. Translators: Notification shown after removing an account
+#. is undone. The string substitution is the name of the
+#. account.
+#: src/client/accounts/accounts-editor-list-pane.vala:579
+#, c-format
+msgid "Account “%s” restored"
+msgstr "Налог „%s“ је враћен"
+
+#. Translators: Tooltip for dragging list items
+#: src/client/accounts/accounts-editor-row.vala:50
+msgid "Drag to move this item"
+msgstr "Зграбите да преместите ову ставку"
+
+#. Translators: Label describes the service provider
+#. hosting the email account, e.g. Gmail, Yahoo, or some
+#. other generic IMAP service.
+#: src/client/accounts/accounts-editor-row.vala:299
+msgid "Service provider"
+msgstr "Достављач услуге"
+
+#. Translators: This label describes what form of transport
+#. security (TLS, StartTLS, etc) used by an account's IMAP or SMTP
+#. service.
+#: src/client/accounts/accounts-editor-row.vala:473
+msgid "Connection security"
+msgstr "Безбедност везе"
+
+#. Translators: Label used when no auth scheme is used
+#. by an account's IMAP or SMTP service.
+#: src/client/accounts/accounts-editor-row.vala:484
+#: src/client/accounts/accounts-editor-servers-pane.vala:760
+#: src/client/accounts/accounts-editor-servers-pane.vala:975
+msgid "None"
+msgstr "Ништа"
 
-#: ../src/client/application/geary-controller.vala:450
-msgid "_Mark as…"
-msgstr "_Означи као…"
+#: src/client/accounts/accounts-editor-row.vala:491
+#| msgctxt "shortcut window"
+#| msgid "Star"
+msgid "StartTLS"
+msgstr "СтартТЛС"
+
+#: src/client/accounts/accounts-editor-row.vala:498
+#| msgid "SSL/TLS"
+msgid "TLS"
+msgstr "ТЛС"
+
+#. Translators: Label for source of SMTP authentication
+#. credentials (none, use IMAP, custom) when adding a new
+#. account
+#. Translators: An info bar button label
+#: src/client/accounts/accounts-editor-row.vala:539
+#: src/client/application/application-main-window.vala:554
+msgid "Login"
+msgstr "Пријава"
+
+#. Translators: ComboBox value for source of SMTP
+#. authentication credentials (none) when adding a new
+#. account
+#: src/client/accounts/accounts-editor-row.vala:546
+msgid "No login needed"
+msgstr "Пријава није потребна"
+
+#. Translators: ComboBox value for source of SMTP
+#. authentication credentials (use IMAP) when adding a new
+#. account
+#: src/client/accounts/accounts-editor-row.vala:554
+msgid "Use same login as receiving"
+msgstr "Користи исту пријаву као примање"
+
+#. Translators: ComboBox value for source of SMTP
+#. authentication credentials (custom) when adding a new
+#. account
+#: src/client/accounts/accounts-editor-row.vala:562
+msgid "Use a different login"
+msgstr "Користи другачију пријаву"
+
+#. Translators: In-app notification label, the
+#. string substitution is a more detailed reason.
+#: src/client/accounts/accounts-editor-servers-pane.vala:382
+#, c-format
+msgid "Account not updated: %s"
+msgstr "Налог није освежен: %s"
+
+#. Translators: This label describes the program that
+#. created the account, e.g. an SSO service like GOA, or
+#. locally by Geary.
+#: src/client/accounts/accounts-editor-servers-pane.vala:545
+#| msgid "Accounts"
+msgid "Account source"
+msgstr "Извор налога"
+
+#: src/client/accounts/accounts-editor-servers-pane.vala:557
+msgid "GNOME Online Accounts"
+msgstr "Гномови налози на мрежи"
+
+#. Translators: This label describes an account
+#. preference.
+#: src/client/accounts/accounts-editor-servers-pane.vala:616
+#| msgid "Save dra_fts on server"
+msgid "Save draft email on server"
+msgstr "Сачувај нацрт поште на серверу"
+
+#. Translators: This label describes an account
+#. preference.
+#: src/client/accounts/accounts-editor-servers-pane.vala:671
+#| msgid "_Save sent mail"
+msgid "Save sent email on server"
+msgstr "Сачувај послату пошту на серверу"
+
+#. Add a suffix for OAuth2 auth so people know they
+#. shouldn't expect to be prompted for a password
+#. Translators: Label used when an account's IMAP or
+#. SMTP service uses OAuth2. The string replacement is
+#. the service's login name.
+#: src/client/accounts/accounts-editor-servers-pane.vala:961
+#, c-format
+msgid "%s using OAuth2"
+msgstr "%s користећи OAuth2"
+
+#: src/client/accounts/accounts-editor-servers-pane.vala:971
+msgid "Use receiving server login"
+msgstr "Користи пријаву сервера пријема"
+
+#. Translators: File name used in save chooser when saving
+#. attachments that do not otherwise have a name.
+#: src/client/application/application-attachment-manager.vala:21
+msgid "Untitled"
+msgstr "Неименовано"
+
+#. / Translators: Dialog primary label when prompting to
+#. / overwrite a file. The string substitution is the file'sx
+#. / name.
+#: src/client/application/application-attachment-manager.vala:222
+#, c-format
+msgid "A file named “%s” already exists.  Do you want to replace it?"
+msgstr "Датотека под називом „%s“ већ постоји.  Да ли желите да је замените?"
 
-#: ../src/client/application/geary-controller.vala:456
-msgid "Mark as _Read"
-msgstr "Означи као _прочитано"
+#. / Translators: Dialog secondary label when prompting to
+#. / overwrite a file. The string substitution is the parent
+#. / folder's name.
+#: src/client/application/application-attachment-manager.vala:229
+#, c-format
+msgid ""
+"The file already exists in “%s”.  Replacing it will overwrite its contents."
+msgstr ""
+"Датотека већ постоји у „%s“.  Уколико је замените преписаћете њен садржај."
 
-#: ../src/client/application/geary-controller.vala:462
-msgid "Mark as _Unread"
-msgstr "Означи као _непрочитано"
+#: src/client/application/application-attachment-manager.vala:236
+msgid "_Replace"
+msgstr "_Замени"
 
-#: ../src/client/application/geary-controller.vala:468
-msgid "_Star"
-msgstr "_Додај звездицу"
+#: src/client/application/application-client.vala:34
+msgid "Copyright 2016 Software Freedom Conservancy Inc."
+msgstr "Ауторска права 2016 Software Freedom Conservancy Inc."
 
-#: ../src/client/application/geary-controller.vala:473
-msgid "U_nstar"
-msgstr "_Уклони звездицу"
+#: src/client/application/application-client.vala:35
+msgid "Copyright 2016-2020 Geary Development Team."
+msgstr "Ауторска права 2016-2020 Развојни тим Герија."
 
-#: ../src/client/application/geary-controller.vala:483
-msgid "Add label"
-msgstr "Додај натпис"
+#: src/client/application/application-client.vala:37
+msgid "Visit the Geary web site"
+msgstr "Посетите веб страницу Герија"
 
-#: ../src/client/application/geary-controller.vala:484
-msgid "_Label"
-msgstr "_Натпис"
+#. / Command line option
+#: src/client/application/application-client.vala:97
+msgid "Print debug logging"
+msgstr "Исписује записник прочишћавања"
 
-#: ../src/client/application/geary-controller.vala:488
-msgid "_Move"
-msgstr "_Премести"
+#. / Command line option
+#: src/client/application/application-client.vala:100
+#| msgid "Start Geary with hidden main window"
+msgid "Start with the main window hidden (deprecated)"
+msgstr "Покреће се са главним прозором скривеним (застарело)"
 
-#: ../src/client/application/geary-controller.vala:492
-msgid "Compose new message (Ctrl+N, N)"
-msgstr "Саставите нову поруку (Ктрл+N, N)"
+#. / Command line option
+#: src/client/application/application-client.vala:103
+msgid "Enable WebKitGTK Inspector in web views"
+msgstr "Укључује ВебКитГтк Инспектора у веб прегледима"
 
-#: ../src/client/application/geary-controller.vala:496
-#: ../ui/conversation-email-menus.ui.h:1
-msgid "_Reply"
-msgstr "_Одговори"
+#. / Command line option
+#: src/client/application/application-client.vala:106
+msgid "Log conversation monitoring"
+msgstr "Бележи надгледање преписке"
 
-#: ../src/client/application/geary-controller.vala:497
-msgid "Reply (Ctrl+R, R)"
-msgstr "Одговорите (Ктрл+R, R)"
+#. / Command line option
+#: src/client/application/application-client.vala:109
+#| msgid "Log network deserialization"
+msgid "Log IMAP network deserialization"
+msgstr "Бележи десеријализацију ИМАП мреже"
 
-#: ../src/client/application/geary-controller.vala:501
-msgid "R_eply All"
-msgstr "Одговори _свима"
+#. / Command line option. "Normalization" can also be called
+#. / "synchronization".
+#: src/client/application/application-client.vala:113
+msgid "Log folder normalization"
+msgstr "Бележи нормализацију фасцикле"
 
-#: ../src/client/application/geary-controller.vala:502
-msgid "Reply all (Ctrl+Shift+R, Shift+R)"
-msgstr "Одговорите свима (Ктрл+Shift+R, Shift+R)"
+#. / Command line option
+#: src/client/application/application-client.vala:116
+#| msgid "Log network activity"
+msgid "Log IMAP network activity"
+msgstr "Бележи активност ИМАП мреже"
 
-#: ../src/client/application/geary-controller.vala:507
-#: ../ui/conversation-email-menus.ui.h:3
-msgid "_Forward"
-msgstr "_Проследи"
+#. / Command line option. The IMAP replay queue is how changes
+#. / on the server are replicated on the client.  It could
+#. / also be called the IMAP events queue.
+#: src/client/application/application-client.vala:121
+msgid "Log IMAP replay queue"
+msgstr "Бележи ред понављања ИМАП-а"
 
-#: ../src/client/application/geary-controller.vala:508
-msgid "Forward (Ctrl+L, F)"
-msgstr "Проследите (Ктрл+L, F)"
+#. / Command line option
+#: src/client/application/application-client.vala:124
+#| msgid "Log network activity"
+msgid "Log SMTP network activity"
+msgstr "Бележи активност СМТП мреже"
 
-#: ../src/client/application/geary-controller.vala:538
-msgid "Empty _Spam…"
-msgstr "Испразни _непожељно…"
+#. / Command line option
+#: src/client/application/application-client.vala:127
+msgid "Log database queries (generates lots of messages)"
+msgstr "Бележи упите базе података (прави много порука)"
 
-#: ../src/client/application/geary-controller.vala:542
-msgid "Empty _Trash…"
-msgstr "Испразни _отпад…"
+#. / Command line option
+#: src/client/application/application-client.vala:130
+msgid "Perform a graceful quit"
+msgstr "Обавља грациозан излаз"
 
-#. 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 "Приказ траке за претрагу"
+#: src/client/application/application-client.vala:132
+#| msgid "Use %s to open a new composer window"
+msgid "Open a new window"
+msgstr "Отвара нови прозор"
 
-#. 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 "Приказ траке за претрагу"
+#. / Command line option
+#: src/client/application/application-client.vala:135
+#| msgid "Revoke all server certificates with TLS warnings"
+msgid "Revoke all pinned TLS server certificates"
+msgstr "Опозива сва прикачена уверења ТЛС сервера"
 
-#: ../src/client/application/geary-controller.vala:757
-msgid "Unable to store server trust exception"
-msgstr "Не могу да сачувам изузетак поверења сервера"
+#. / Command line option
+#: src/client/application/application-client.vala:138
+msgid "Display program version"
+msgstr "Приказује издање програма"
 
-#: ../src/client/application/geary-controller.vala:992
-msgid "Your settings are insecure"
-msgstr "Ваша подешавања нису безбедна"
+#. / Application runtime information label
+#: src/client/application/application-client.vala:262
+#| msgid "Mark conversation"
+msgid "Geary version"
+msgstr "Издање Герија"
+
+#. / Application runtime information label
+#: src/client/application/application-client.vala:264
+msgid "Geary revision"
+msgstr "Ревизија Герија"
+
+#. / Application runtime information label
+#: src/client/application/application-client.vala:266
+msgid "GTK version"
+msgstr "Гтк издање"
+
+#. / Applciation runtime information label
+#: src/client/application/application-client.vala:273
+msgid "GLib version"
+msgstr "ГЛиб издање"
+
+#. / Application runtime information label
+#: src/client/application/application-client.vala:280
+msgid "WebKitGTK version"
+msgstr "ВебКитГтк издање"
+
+#. / Application runtime information label
+#: src/client/application/application-client.vala:287
+msgid "Desktop environment"
+msgstr "Окружење радне површи"
 
-#: ../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 ""
-"Подешавања ИМАП и/или СМТП налога не користе ССЛ или ТЛС.  То значи да ваше "
-"корисничко име и лозинку може да прочита неко други на мрежи.  Да ли сигурно "
-"желите да наставите?"
+#. Translators: This is the file type displayed for
+#. attachments with unknown file types.
+#: src/client/application/application-client.vala:289
+#: src/client/components/components-attachment-pane.vala:91
+msgid "Unknown"
+msgstr "Непознато"
 
-#: ../src/client/application/geary-controller.vala:994
-msgid "Co_ntinue"
-msgstr "_Настави"
+#. / Application runtime information label
+#: src/client/application/application-client.vala:293
+msgid "Distribution name"
+msgstr "Назив дистрибуције"
 
-#: ../src/client/application/geary-controller.vala:1041
-msgid "Error connecting to the server"
-msgstr "Грешка повезивања на сервер"
+#. / Application runtime information label
+#: src/client/application/application-client.vala:298
+msgid "Distribution release"
+msgstr "Издање дистрибуције"
 
-#: ../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 ""
-"Гери је наишао на грешку приликом повезивања на сервер. Покушајте опет за "
-"неколико тренутака."
+#. / Application runtime information label
+#: src/client/application/application-client.vala:303
+msgid "Installation prefix"
+msgstr "Префикс инсталације"
 
-#. / Displayed in the space-limited status bar when a message fails to be sent due to error.
-#: ../src/client/application/geary-controller.vala:1079
-#: ../src/client/components/status-bar.vala:29
-msgid "Error sending email"
-msgstr "Грешка слања е-поште"
+#: src/client/application/application-client.vala:559
+#, c-format
+msgid "About %s"
+msgstr "О програму „%s“"
 
-#: ../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."
+#. Translators: add your name and email address to receive
+#. credit in the About dialog For example: Yamada Taro
+#. <yamada taro example com>
+#: src/client/application/application-client.vala:563
+msgid "translator-credits"
 msgstr ""
-"Гери је наишао на грешку приликом слања е-поште.  Ако се проблем понови, "
-"ручно избришите е-пошту из фасцикле „За слање“."
-
-#. 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:1084
-#: ../src/client/components/status-bar.vala:33
-msgid "Error saving sent mail"
-msgstr "Грешка приликом чувања послате поште"
+"Милош Поповић <gpopac gmail com>\n"
+"Марко М. Костић <marko m kostic gmail com>\n"
+"Мирослав Николић <miroslavnikolic rocketmail com>\n"
+"\n"
+"http://prevod.org — превод на српски језик"
 
-#: ../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 ""
-"Гери је наишао на грешку приликом чувања поруке у „Послато“.  Порука ће "
-"остати у вашој фасцикли „За слање“ све док је не избришете."
+#. / Warning printed to the console when a deprecated
+#. / command line option is used.
+#: src/client/application/application-client.vala:1045
+msgid "The `--hidden` option is deprecated and will be removed in the future."
+msgstr "Опција „--hidden“ је застарела и биће уклоњена у скорије време."
 
-#: ../src/client/application/geary-controller.vala:1154
-msgid "Labels"
-msgstr "Натписи"
+#. / Command line warning, string substitution
+#. / is the given argument
+#: src/client/application/application-client.vala:1078
+#, c-format
+#| msgid "Unrecognized command line option “%s”\n"
+msgid "Unrecognised program argument: “%s”"
+msgstr "Непознат аргумент програма: %s"
 
-#. 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:1166
+#. / Notification title.
+#: src/client/application/application-controller.vala:479
+#, c-format
+msgid "A problem occurred sending email for %s"
+msgstr "Дошло је до грешке слања поруке за „%s“"
+
+#. / Notification body
+#: src/client/application/application-controller.vala:483
+msgid "Email will not be sent until re-connected"
+msgstr "Пошта неће бити послата до поновног повезивања"
+
+#. / Translators: Label for in-app notification
+#: src/client/application/application-controller.vala:582
+#| msgid "Conversation Shortcuts"
+msgid "Conversation marked"
+msgid_plural "Conversations marked"
+msgstr[0] "Означена преписка"
+msgstr[1] "Означене преписке"
+msgstr[2] "Означене преписке"
+msgstr[3] "Означена преписка"
+
+#. / Translators: Label for in-app notification
+#: src/client/application/application-controller.vala:588
+#| msgid "No conversations found"
+msgid "Conversation un-marked"
+msgid_plural "Conversations un-marked"
+msgstr[0] "Одзначена преписка"
+msgstr[1] "Одзначене преписке"
+msgstr[2] "Одзначена преписке"
+msgstr[3] "Одзначена преписка"
+
+#. / Translators: Label for in-app
+#. / notification. String substitution is the name
+#. / of the destination folder.
+#: src/client/application/application-controller.vala:614
+#: src/client/application/application-controller.vala:698
+#, c-format
+#| msgid "Conversation Shortcuts"
+msgid "Conversation moved to %s"
+msgid_plural "Conversations moved to %s"
+msgstr[0] "Преписка је премештена у „%s“"
+msgstr[1] "Преписке су премештене у „%s“"
+msgstr[2] "Преписке су премештене у „%s“"
+msgstr[3] "Преписка је премештена у „%s“"
+
+#. / Translators: Label for in-app
+#. / notification. String substitution is the name
+#. / of the source folder.
+#. / Translators: Label for in-app notification. String
+#. / substitution is the name of the destination folder.
+#: src/client/application/application-controller.vala:622
+#: src/client/application/application-controller.vala:644
+#, c-format
+#| msgid "Conversation Shortcuts"
+msgid "Conversation restored to %s"
+msgid_plural "Conversations restored to %s"
+msgstr[0] "Преписка је враћена у „%s“"
+msgstr[1] "Преписке су враћене у „%s“"
+msgstr[2] "Преписке су враћене у „%s“"
+msgstr[3] "Преписка је враћена у „%s“"
+
+#. / Translators: Label for in-app notification.
+#: src/client/application/application-controller.vala:665
+#| msgid "Conversation Shortcuts"
+msgid "Conversation archived"
+msgid_plural "Conversations archived"
+msgstr[0] "Преписка је архивирана"
+msgstr[1] "Преписке су архивиране"
+msgstr[2] "Преписке су архивиране"
+msgstr[3] "Преписка је архивирана"
+
+#. / Translators: Label for in-app notification. String
+#. / substitution is the name of the destination folder.
+#: src/client/application/application-controller.vala:721
+#, c-format
+#| msgid "Message not saved"
+msgid "Message restored to %s"
+msgid_plural "Messages restored to %s"
+msgstr[0] "Порука је враћена на „%s“"
+msgstr[1] "Поруке су враћене на „%s“"
+msgstr[2] "Поруке су враћене на „%s“"
+msgstr[3] "Порука је враћена на „%s“"
+
+#. / Translators: Label for in-app notification.
+#: src/client/application/application-controller.vala:742
+#| msgid "Message not saved"
+msgid "Message archived"
+msgid_plural "Messages archived"
+msgstr[0] "Порука је архиврана"
+msgstr[1] "Поруке су архивране"
+msgstr[2] "Поруке су архивране"
+msgstr[3] "Порука је архиврана"
+
+#. / Translators: Label for in-app
+#. / notification. String substitution is the name
+#. / of the destination folder.
+#: src/client/application/application-controller.vala:777
+#, c-format
+#| msgid "Message not saved"
+msgid "Message moved to %s"
+msgid_plural "Messages moved to %s"
+msgstr[0] "Порука је премештена у „%s“"
+msgstr[1] "Поруке су премештене у „%s“"
+msgstr[2] "Поруке су премештене у „%s“"
+msgstr[3] "Порука је премештена у „%s“"
+
+#. / Translators: Label for in-app
+#. / notification. String substitution is the name
+#. / of the destination folder.
+#: src/client/application/application-controller.vala:805
+#, c-format
+#| msgid "No conversations selected"
+msgid "Conversation labelled as %s"
+msgid_plural "Conversations labelled as %s"
+msgstr[0] "Преписка је означена као „%s“"
+msgstr[1] "Преписке су означене као „%s“"
+msgstr[2] "Преписке су означене као „%s“"
+msgstr[3] "Преписка је означена као „%s“"
+
+#. / Translators: Label for in-app
+#. / notification. String substitution is the name
+#. / of the destination folder.
+#: src/client/application/application-controller.vala:813
+#, c-format
+msgid "Conversation un-labelled as %s"
+msgid_plural "Conversations un-labelled as %s"
+msgstr[0] "Преписка је одзначена као „%s“"
+msgstr[1] "Преписке су одзначене као „%s“"
+msgstr[2] "Преписке су одзначене као „%s“"
+msgstr[3] "Преписка је одзначена као „%s“"
+
+#: src/client/application/application-controller.vala:1320
 #, c-format
 msgid "Unable to open the database for %s"
 msgstr "Не могу да отворим базу података за „%s“"
 
-#: ../src/client/application/geary-controller.vala:1167
+#: src/client/application/application-controller.vala:1321
 #, c-format
 msgid ""
 "There was an error opening the local mail database for this account. This is "
@@ -600,20 +1181,20 @@ msgstr ""
 "Поновна изградња базе података ће уништити е-пошту коју чувате на вашем "
 "рачунару и њене прилоге. <b>Пошта на вашем серверу ће остати нетакнута.</b>"
 
-#: ../src/client/application/geary-controller.vala:1169
+#: src/client/application/application-controller.vala:1323
 msgid "_Rebuild"
 msgstr "Поново _изгради"
 
-#: ../src/client/application/geary-controller.vala:1169
+#: src/client/application/application-controller.vala:1323
 msgid "E_xit"
 msgstr "_Изађи"
 
-#: ../src/client/application/geary-controller.vala:1178
+#: src/client/application/application-controller.vala:1333
 #, c-format
 msgid "Unable to rebuild database for “%s”"
 msgstr "Не могу да поново изградим базу података за „%s“"
 
-#: ../src/client/application/geary-controller.vala:1179
+#: src/client/application/application-controller.vala:1334
 #, c-format
 msgid ""
 "Error during rebuild:\n"
@@ -624,126 +1205,137 @@ msgstr ""
 "\n"
 "%s"
 
-#. some other problem opening the account ... as with other flow path, can't run
-#. Geary today with an account in unopened state, so have to exit
-#: ../src/client/application/geary-controller.vala:1201
-#: ../src/client/application/geary-controller.vala:1211
-#: ../src/client/application/geary-controller.vala:1222
+#. / Translators: The label for an in-app notification. The
+#. / string substitution is a list of recipients of the email.
+#: src/client/application/application-controller.vala:1501
 #, c-format
-msgid "Unable to open local mailbox for %s"
-msgstr "Не могу да отворим локално сандуче за „%s“"
+msgid "Email sent to %s"
+msgstr "Пошта је послата ка „%s“"
 
-#: ../src/client/application/geary-controller.vala:1202
+#. / Translators: The label for an in-app notification. The
+#. / string substitution is a list of recipients of the email.
+#: src/client/application/application-controller.vala:2491
 #, c-format
-msgid ""
-"There was an error opening the local mail database for this account. This is "
-"possibly due to a file permissions problem.\n"
-"\n"
-"Please check that you have read/write permissions for all files in this "
-"directory:\n"
-"\n"
-"%s"
-msgstr ""
-"Дошло је до грешке приликом отварања локалне базе поште за овај налог. "
-"Вероватно постоји проблем са овлашћењима за приступ датотеци.\n"
-"\n"
-"Проверите да ли имате дозволе читања/писања за све датотеке у овом "
-"директоријуму:\n"
-"\n"
-"%s"
-
-#: ../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 "
-"work with this version of Geary.\n"
-"\n"
-"Please install the latest version of Geary and try again."
-msgstr ""
-"Број издања локане базе поште је обликован за новије издање Герија. "
-"Нажалост, база података не може бити „враћена назад“ да би радила са овим "
-"издањем.\n"
-"\n"
-"Инсталирајте најновије издање Герија и покушајте поново."
-
-#: ../src/client/application/geary-controller.vala:1223
-msgid ""
-"There was an error opening the local account. This is probably due to "
-"connectivity issues.\n"
-"\n"
-"Please check your network connection and restart Geary."
-msgstr ""
-"Дошло је до грешке приликом отварања локалног налога. Вероватно постоји "
-"проблем са мрежном везом.\n"
-"\n"
-"Проверите вашу мрежу и поново покрените Герија."
-
-#: ../src/client/application/geary-controller.vala:1998
-msgid "Undo move (Ctrl+Z)"
-msgstr "Опозови (Ктрл+Z)"
+msgid "Email to %s queued for delivery"
+msgstr "Пошта ка „%s“ је стављена у ред за испоруку"
 
-#: ../src/client/application/geary-controller.vala:2008
-msgid "Are you sure you want to open these attachments?"
-msgstr "Да ли сигурнo желите да отворите ове прилоге?"
-
-#: ../src/client/application/geary-controller.vala:2009
-msgid ""
-"Attachments may cause damage to your system if opened.  Only open files from "
-"trusted sources."
-msgstr ""
-"Приложене датотеке могу да оштете систем ако се отворе. Отворите датотеке "
-"само са поверљивих извора."
-
-#: ../src/client/application/geary-controller.vala:2010
-msgid "Don’t _ask me again"
-msgstr "Не питај ме _поново"
-
-#: ../src/client/application/geary-controller.vala:2145
+#. / Translators: The label for an in-app notification. The
+#. / string substitution is a list of recipients of the email.
+#: src/client/application/application-controller.vala:2555
 #, c-format
-msgid "A file named “%s” already exists.  Do you want to replace it?"
-msgstr "Датотека под називом „%s“ већ постоји.  Да ли желите да је замените?"
-
-#: ../src/client/application/geary-controller.vala:2147
+msgid "Email to %s saved"
+msgstr "Пошта ка „%s“ је сачувана"
+
+#. / Translators: A label for an in-app notification.
+#: src/client/application/application-controller.vala:2570
+#: src/client/application/application-controller.vala:2628
+msgid "Composer could not be restored"
+msgstr "Састављач се не може повратити"
+
+#. / Translators: The label for an in-app notification. The
+#. / string substitution is a list of recipients of the email.
+#: src/client/application/application-controller.vala:2613
 #, c-format
-msgid ""
-"The file already exists in “%s”.  Replacing it will overwrite its contents."
-msgstr ""
-"Датотека већ постоји у „%s“.  Уколико је замените преписаћете њен садржај."
-
-#: ../src/client/application/geary-controller.vala:2150
-msgid "_Replace"
-msgstr "_Замени"
-
-#. Find out what to do with the inline composers.
-#. TODO: Remove this in favor of automatically saving drafts
-#: ../src/client/application/geary-controller.vala:2398
-msgid "Close open draft messages?"
-msgstr "Да затворим отворене поруке с нацртима?"
+msgid "Email to %s discarded"
+msgstr "Пошта ка „%s“ је одбачена"
+
+#. Translators: An info bar status label
+#: src/client/application/application-main-window.vala:540
+msgid "Working offline"
+msgstr "Рад без мреже"
+
+#. Translators: An info bar description label
+#: src/client/application/application-main-window.vala:542
+msgid "You will not be able to send or receive email until re-connected."
+msgstr "Нећете моћи да шаљете или примате пошту све до поновног повезивања."
+
+#. Translators: An info bar status label
+#: src/client/application/application-main-window.vala:549
+msgid "Login problem"
+msgstr "Проблем пријаве"
+
+#. Translators: An info bar description label
+#: src/client/application/application-main-window.vala:551
+msgid "An account has reported an incorrect login or password."
+msgstr "Налог је пријавио неисправну пријаву или лозинку."
+
+#. Translators: An info bar button tool-tip
+#: src/client/application/application-main-window.vala:558
+msgid "Retry login, you will be prompted for your password"
+msgstr "Покушајте поново са пријавом, биће вам затражена лозинка"
+
+#. Translators: An info bar status label
+#: src/client/application/application-main-window.vala:565
+msgid "Security problem"
+msgstr "Безбедносни проблем"
+
+#. Translators: An info bar description label
+#: src/client/application/application-main-window.vala:567
+msgid "An account has reported an untrusted server."
+msgstr "Налог је пријавио неповерљив сервер."
+
+#. Translators: An info bar button label
+#: src/client/application/application-main-window.vala:570
+msgid "Check"
+msgstr "Провери"
+
+#. Translators: An info bar button tool-tip
+#: src/client/application/application-main-window.vala:574
+msgid "Check the security details for the connection"
+msgstr "Проверите безбедносне детаље за везу"
+
+#. / Translators: Main window title, first string
+#. / substitution being the currently selected folder name,
+#. / the second being the selected account name.
+#: src/client/application/application-main-window.vala:617
+#, c-format
+msgid "%s — %s"
+msgstr "%s — %s"
+
+#. Translators: The name of the folder group containing
+#. folders created by people (as opposed to special-use
+#. folders)
+#: src/client/application/application-main-window.vala:996
+#: src/client/folder-list/folder-list-account-branch.vala:43
+msgid "Labels"
+msgstr "Натписи"
 
-#: ../src/client/application/geary-controller.vala:2520
+#: src/client/application/application-main-window.vala:1293
 #, c-format
 msgid "Empty all email from your %s folder?"
 msgstr "Да испразним е-пошту из фасцикле „%s“?"
 
-#: ../src/client/application/geary-controller.vala:2521
+#: src/client/application/application-main-window.vala:1294
 msgid "This removes the email from Geary and your email server."
 msgstr "Ово ће уклонити пошту из Герија и на серверима ваше е-поште."
 
-#: ../src/client/application/geary-controller.vala:2522
+#: src/client/application/application-main-window.vala:1295
 msgid "This cannot be undone."
 msgstr "Не можете да опозовете ову радњу."
 
-#: ../src/client/application/geary-controller.vala:2523
+#: src/client/application/application-main-window.vala:1296
 #, c-format
 msgid "Empty %s"
 msgstr "Испразни „%s“"
 
-#: ../src/client/application/geary-controller.vala:2540
-#, c-format
-msgid "Error emptying %s"
-msgstr "Грешка приликом пражњења „%s“"
+#. / Translators: Primary text for a confirmation dialog
+#: src/client/application/application-main-window.vala:1353
+#| msgid "Do you want to permanently delete this message?"
+#| msgid_plural "Do you want to permanently delete these messages?"
+msgid "Do you want to permanently delete this conversation?"
+msgid_plural "Do you want to permanently delete these conversations?"
+msgstr[0] "Да ли желите трајно да обришете ову преписку?"
+msgstr[1] "Да ли желите трајно да обришете ове преписке?"
+msgstr[2] "Да ли желите трајно да обришете ове преписке?"
+msgstr[3] "Да ли желите трајно да обришете ову преписку?"
+
+#: src/client/application/application-main-window.vala:1358
+#: src/client/application/application-main-window.vala:1373
+msgid "Delete"
+msgstr "Обриши"
 
-#: ../src/client/application/geary-controller.vala:2570
+#. / Translators: Primary text for a confirmation dialog
+#: src/client/application/application-main-window.vala:1368
 msgid "Do you want to permanently delete this message?"
 msgid_plural "Do you want to permanently delete these messages?"
 msgstr[0] "Да ли желите трајно да обришете ову поруку?"
@@ -751,344 +1343,748 @@ msgstr[1] "Да ли желите трајно да обришете ове по
 msgstr[2] "Да ли желите трајно да обришете ове поруке?"
 msgstr[3] "Да ли желите трајно да обришете ову поруку?"
 
-#: ../src/client/application/geary-controller.vala:2572
-msgid "Delete"
-msgstr "Обриши"
+#: src/client/application/application-main-window.vala:1691
+#, c-format
+msgid "%s (%d)"
+msgstr "%s (%d)"
 
-#: ../src/client/application/geary-controller.vala:2604
-msgid "Undo archive (Ctrl+Z)"
-msgstr "Опозови архивирање (Ктрл+Z)"
+#. Translators: The first argument will be a
+#. description of the document type, the second will
+#. be a human-friendly size string. For example:
+#. Document (100.9MB)
+#. / In the composer, the filename followed by its filesize, i.e. "notes.txt (1.12KB)"
+#: src/client/components/components-attachment-pane.vala:107
+#: src/client/composer/composer-widget.vala:1784
+#, c-format
+msgid "%s (%s)"
+msgstr "%s (%s)"
 
-#: ../src/client/application/geary-controller.vala:2619
-msgid "Undo trash (Ctrl+Z)"
-msgstr "Опозови брисање (Ктрл+Z)"
+#: src/client/components/components-attachment-pane.vala:379
+msgid "Are you sure you want to open these attachments?"
+msgstr "Да ли сигурнo желите да отворите ове прилоге?"
 
-#: ../src/client/application/geary-controller.vala:2673
-msgid "Undo (Ctrl+Z)"
-msgstr "Опозови (Ктрл+Z)"
+#: src/client/components/components-attachment-pane.vala:380
+msgid ""
+"Attachments may cause damage to your system if opened.  Only open files from "
+"trusted sources."
+msgstr ""
+"Приложене датотеке могу да оштете систем ако се отворе.  Отворите датотеке "
+"само са поверљивих извора."
+
+#: src/client/components/components-attachment-pane.vala:381
+msgid "Don’t _ask me again"
+msgstr "Не питај ме _поново"
+
+#: src/client/components/components-inspector.vala:78
+#| msgid "_Inspect…"
+msgid "Inspector"
+msgstr "Инспектор"
+
+#. / Translators: Title for Inspector logs pane
+#. / Translators: Title for problem report dialog logs pane
+#: src/client/components/components-inspector.vala:93
+#: src/client/dialogs/dialogs-problem-details-dialog.vala:101
+msgid "Logs"
+msgstr "Дневници"
+
+#. / Translators: Title for Inspector system system information pane
+#. / Translators: Title for problem report system information
+#. / pane
+#: src/client/components/components-inspector.vala:97
+#: src/client/dialogs/dialogs-problem-details-dialog.vala:104
+msgid "System"
+msgstr "Систем"
+
+#. Button label for saving problem report information
+#: src/client/components/components-inspector.vala:226
+#: src/client/components/components-inspector.vala:229
+#: src/client/dialogs/dialogs-problem-details-dialog.vala:220
+#: src/client/dialogs/dialogs-problem-details-dialog.vala:223
+#: ui/problem-details-dialog.ui:47
+#| msgid "_Save As..."
+msgid "Save As"
+msgstr "Сачувај као"
+
+#: src/client/components/components-inspector.vala:230
+#: src/client/dialogs/dialogs-problem-details-dialog.vala:224
+#: ui/accounts_editor_servers_pane.ui:17 ui/composer-headerbar.ui:61
+#| msgid "_Cancel"
+msgid "Cancel"
+msgstr "Откажи"
+
+#. / Translators: Preferences label
+#: src/client/components/components-preferences-window.vala:124
+msgid "_Automatically select next message"
+msgstr "_Сам изабери следећу поруку"
+
+#. / Translators: Preferences label
+#: src/client/components/components-preferences-window.vala:134
+msgid "_Display conversation preview"
+msgstr "_Прикажи преглед преписке"
+
+#. / Translators: Preferences label
+#: src/client/components/components-preferences-window.vala:144
+msgid "Use _three pane view"
+msgstr "Приказ у _три површи"
 
-#: ../src/client/application/geary-controller.vala:2804
-msgid "Failed to open default text editor."
-msgstr "Не могу да отворим подразумевани уредник текста."
+#. / Translators: Preferences label
+#: src/client/components/components-preferences-window.vala:154
+msgid "Use _single key email shortcuts"
+msgstr "Користи _пречице једног тастера"
 
-#: ../src/client/components/main-window.vala:389
+#: src/client/components/components-preferences-window.vala:156
+msgid ""
+"Enable keyboard shortcuts for email actions that do not require pressing "
+"<Ctrl>"
+msgstr ""
+"Укључите пречице тастатуре за радње е-поште које не захтевају притисак "
+"тастера „<Ctrl>“"
+
+#. / Translators: Preferences label
+#: src/client/components/components-preferences-window.vala:167
+#| msgid "Always _watch for new mail"
+msgid "_Watch for new mail when closed"
+msgstr "_Прати има ли нових порука након затварања"
+
+#. / Translators: Preferences tooltip
+#: src/client/components/components-preferences-window.vala:171
+msgid "Geary will keep running after all windows are closed"
+msgstr "Гери ће наставити да ради и накоон затварања свих прозора"
+
+#. / Translators: Preferences page title
+#: src/client/components/components-preferences-window.vala:189
+msgid "Preferences"
+msgstr "Поставке"
+
+#. / Translators: Preferences page title
+#: src/client/components/components-preferences-window.vala:250
+msgid "Plugins"
+msgstr "Прикључци"
+
+#. Translators: Info bar title for a generic account
+#. problem.
+#: src/client/components/components-problem-report-info-bar.vala:36
+#| msgid "Accounts"
+msgid "Account problem"
+msgstr "Проблем налога"
+
+#. Translators: Info bar sub-title for a generic account
+#. problem. String substitution is the account name.
+#: src/client/components/components-problem-report-info-bar.vala:40
 #, c-format
-msgid "%s (%d)"
-msgstr "%s (%d)"
+msgid "Geary has encountered a problem with %s."
+msgstr "Гери је наишао на проблем са „%s“."
 
-#: ../src/client/components/search-bar.vala:8
-#: ../src/client/folder-list/folder-list-search-branch.vala:38
-#: ../src/engine/api/geary-special-folder-type.vala:51
+#. Translators: Info bar sub-title for a generic
+#. account problem. String substitution is the
+#. account name.
+#: src/client/components/components-problem-report-info-bar.vala:53
+#, c-format
+msgid "Geary encountered a problem checking mail for %s."
+msgstr "Гери је наишао на проблем проверавајући пошту за „%s“."
+
+#. Translators: Tooltip label for Retry button
+#: src/client/components/components-problem-report-info-bar.vala:57
+msgid "Try reconnecting"
+msgstr "Покушај поновно повезивање"
+
+#. Translators: Info bar title for an outgoing
+#. account problem. String substitution is the
+#. account name
+#: src/client/components/components-problem-report-info-bar.vala:65
+#, c-format
+msgid "Geary encountered a problem sending email for %s."
+msgstr "Гери је наишао на проблем шаљући пошту за „%s“."
+
+#. Translators: Tooltip label for Retry button
+#: src/client/components/components-problem-report-info-bar.vala:69
+msgid "Retry sending queued messages"
+msgstr "Покушајте да пошаљете поруке на чекању"
+
+#. Translators: Info bar title for a generic application
+#. problem.
+#: src/client/components/components-problem-report-info-bar.vala:76
+msgid "Geary has encountered a problem"
+msgstr "Гери је наишао на проблем"
+
+#. Translators: Info bar sub-title for a generic
+#. application problem.
+#: src/client/components/components-problem-report-info-bar.vala:80
+msgid "Please report the details if it persists."
+msgstr "Пријавите појединости ако се понови."
+
+#. Translators: Button label for viewing technical details
+#. for a problem report.
+#: src/client/components/components-problem-report-info-bar.vala:94
+msgid "_Details"
+msgstr "_Појединости"
+
+#. Translators: Tooltip for viewing technical details for
+#. a problem report.
+#: src/client/components/components-problem-report-info-bar.vala:97
+msgid "View technical details about the error"
+msgstr "Прикажите техничке појединости о грешци"
+
+#. Translators: Button label for retrying a server
+#. connection
+#: src/client/components/components-problem-report-info-bar.vala:103
+msgid "_Retry"
+msgstr "_Понови"
+
+#. / Translators: Search entry placeholder text
+#: src/client/components/components-search-bar.vala:12
+#: src/client/folder-list/folder-list-search-branch.vala:53
+#: src/client/util/util-i18n.vala:298
 msgid "Search"
 msgstr "Потражи"
 
-#. Search entry.
-#: ../src/client/components/search-bar.vala:23
-msgid "Search all mail in account for keywords (Ctrl+S)"
-msgstr "Потражите кључне речи у свим порукама у налогу (Ктрл+S)"
+#. / Translators: Search entry tooltip
+#: src/client/components/components-search-bar.vala:32
+#| msgid "Search all mail in account for keywords (Ctrl+S)"
+msgid "Search all mail in account for keywords"
+msgstr "Потражите кључне речи у свим порукама у налогу"
 
-#: ../src/client/components/search-bar.vala:100
-#, c-format
-msgid "Indexing %s account"
-msgstr "Пописујем налог „%s“"
-
-#: ../src/client/components/search-bar.vala:111
-#: ../src/client/folder-list/folder-list-search-branch.vala:39
+#. / Translators: Search entry placeholder, string
+#. / replacement is the name of an account
+#: src/client/components/components-search-bar.vala:81
+#: src/client/folder-list/folder-list-search-branch.vala:54
 #, c-format
 msgid "Search %s account"
 msgstr "Тражим налог „%s“"
 
+#. Translators: Tooltip used when an entry requires a valid
+#. email address to be entered, but one is not provided.
+#: src/client/components/components-validator.vala:394
+#| msgid "Invalid email address"
+msgid "An email address is required"
+msgstr "Потребна је адреса е-поште"
+
+#. Translators: Tooltip used when an entry requires a valid
+#. email address to be entered, but the address is invalid.
+#: src/client/components/components-validator.vala:398
+#| msgid "Invalid email address"
+msgid "Not a valid email address"
+msgstr "Није исправна адреса е-поште"
+
+#. Translators: Tooltip used when an entry requires a valid,
+#. resolvable server name to be entered, but one is not
+#. provided.
+#: src/client/components/components-validator.vala:444
+msgid "A server name is required"
+msgstr "Потребан је назив сервера"
+
+#. Translators: Tooltip used when an entry requires a valid
+#. server name to be entered, but it was unable to be
+#. looked-up in the DNS.
+#: src/client/components/components-validator.vala:449
+msgid "Could not look up server name"
+msgstr "Не могу потражим назив сервера"
+
+#: src/client/components/main-toolbar.vala:116
+#| msgid "Mark conversation"
+msgid "Mark conversation"
+msgid_plural "Mark conversations"
+msgstr[0] "Означи преписку"
+msgstr[1] "Означи преписке"
+msgstr[2] "Означи преписке"
+msgstr[3] "Означи преписку"
+
+#: src/client/components/main-toolbar.vala:121
+#| msgid "Add label to conversation"
+msgid "Add label to conversation"
+msgid_plural "Add label to conversations"
+msgstr[0] "Додај натпис преписци"
+msgstr[1] "Додај натпис препискама"
+msgstr[2] "Додај натпис препискама"
+msgstr[3] "Додај натпис преписци"
+
+#: src/client/components/main-toolbar.vala:126
+#| msgid "Move conversation"
+msgid "Move conversation"
+msgid_plural "Move conversations"
+msgstr[0] "Премести преписку"
+msgstr[1] "Премести преписке"
+msgstr[2] "Премести преписке"
+msgstr[3] "Премести преписку"
+
+#: src/client/components/main-toolbar.vala:131
+#| msgid "Archive conversation (A)"
+msgid "Archive conversation"
+msgid_plural "Archive conversations"
+msgstr[0] "Архивирај преписку"
+msgstr[1] "Архивирај преписке"
+msgstr[2] "Архивирај преписке"
+msgstr[3] "Архивирај преписку"
+
+#: src/client/components/main-toolbar.vala:142
+#| msgid "Move conversations"
+msgid "Move conversation to Trash"
+msgid_plural "Move conversations to Trash"
+msgstr[0] "Премести преписку у смеће"
+msgstr[1] "Премести преписке у смеће"
+msgstr[2] "Премести преписке у смеће"
+msgstr[3] "Премести преписку у смеће"
+
+#: src/client/components/main-toolbar.vala:152
+#| msgid "Delete conversation"
+msgid "Delete conversation"
+msgid_plural "Delete conversations"
+msgstr[0] "Обриши преписку"
+msgstr[1] "Обриши преписке"
+msgstr[2] "Обриши препиксе"
+msgstr[3] "Обриши преписку"
+
 #. / Displayed in the space-limited status bar while a message is in the process of being sent.
-#: ../src/client/components/status-bar.vala:26
+#: src/client/components/status-bar.vala:26
 msgid "Sending…"
 msgstr "Шаљем…"
 
-#: ../src/client/components/stock.vala:18 ../ui/account_cannot_remove.glade.h:3
+#. / Displayed in the space-limited status bar when a message fails to be sent due to error.
+#: src/client/components/status-bar.vala:29
+msgid "Error sending email"
+msgstr "Грешка слања е-поште"
+
+#. Displayed in the space-limited status bar when a message fails to be uploaded
+#. to Sent Mail after being sent.
+#: src/client/components/status-bar.vala:33
+msgid "Error saving sent mail"
+msgstr "Грешка приликом чувања послате поште"
+
+#: src/client/components/stock.vala:18
 msgid "_OK"
 msgstr "У _реду"
 
-#: ../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
+#: src/client/components/stock.vala:19
+#: src/client/plugin/mail-merge/mail-merge.vala:392
+#: ui/password-dialog.glade:196
 msgid "_Cancel"
 msgstr "От_кажи"
 
-#: ../src/client/components/stock.vala:21 ../ui/gtk/menus.ui.h:6
+#: src/client/components/stock.vala:21
 msgid "_About"
 msgstr "_О програму"
 
-#: ../src/client/components/stock.vala:23
+#: src/client/components/stock.vala:22
+msgid "_Add"
+msgstr "_Додај"
+
+#: src/client/components/stock.vala:23
 msgid "_Close"
 msgstr "_Затвори"
 
-#: ../src/client/components/stock.vala:24
+#: src/client/components/stock.vala:24
 msgid "_Discard"
 msgstr "Од_баци"
 
-#: ../src/client/components/stock.vala:25 ../ui/gtk/menus.ui.h:5
+#: src/client/components/stock.vala:25 ui/main-toolbar-menus.ui:42
 msgid "_Help"
 msgstr "По_моћ"
 
-#: ../src/client/components/stock.vala:26 ../ui/conversation-email-menus.ui.h:9
+#: src/client/components/stock.vala:26
+#: src/client/plugin/mail-merge/mail-merge.vala:391
+#: ui/components-attachment-pane-menus.ui:7
 msgid "_Open"
 msgstr "От_вори"
 
-#: ../src/client/components/stock.vala:27 ../ui/gtk/menus.ui.h:3
+#: src/client/components/stock.vala:27 ui/main-toolbar-menus.ui:32
 msgid "_Preferences"
 msgstr "_Поставке"
 
-#: ../src/client/components/stock.vala:28 ../ui/conversation-email-menus.ui.h:7
+#. Translators: Menu item to print a single, specific message
+#: src/client/components/stock.vala:28 ui/conversation-email-menus.ui:64
 msgid "_Print…"
 msgstr "_Штампај…"
 
-#: ../src/client/components/stock.vala:29 ../ui/gtk/menus.ui.h:7
+#: src/client/components/stock.vala:29
 msgid "_Quit"
 msgstr "_Изађи"
 
-#: ../src/client/components/stock.vala:30 ../ui/remove_confirm.glade.h:6
+#: src/client/components/stock.vala:30
 msgid "_Remove"
 msgstr "_Уклони"
 
-#: ../src/client/components/stock.vala:32
+#: src/client/components/stock.vala:31
+#: ui/components-attachment-pane-menus.ui:11
+msgid "_Save"
+msgstr "_Сачувај"
+
+#: src/client/components/stock.vala:32
 msgid "_Keep"
 msgstr "_Задржи"
 
-#: ../src/client/composer/composer-link-popover.vala:150
+#: src/client/composer/composer-editor.vala:675
+msgid "Select Color"
+msgstr "Изаберите боју"
+
+#: src/client/composer/composer-link-popover.vala:139
 msgid "Link URL is not correctly formatted, e.g. http://example.com";
 msgstr "Адреса везе није исправно обликована, тј. „http://primer.com“";
 
-#: ../src/client/composer/composer-link-popover.vala:157
+#: src/client/composer/composer-link-popover.vala:146
 msgid "Invalid link URL"
 msgstr "Неисправна адреса везе"
 
-#: ../src/client/composer/composer-link-popover.vala:157
+#: src/client/composer/composer-link-popover.vala:146
 msgid "Invalid email address"
 msgstr "Неисправна адреса е-поште"
 
-#: ../src/client/composer/composer-widget.vala:154
+#. / Translators: Title for an empty composer window
+#: src/client/composer/composer-widget.vala:32
+msgid "New Message"
+msgstr "Нова порука"
+
+#: src/client/composer/composer-widget.vala:167
 msgid "Saved"
 msgstr "Сачувана"
 
-#: ../src/client/composer/composer-widget.vala:155
+#: src/client/composer/composer-widget.vala:168
 msgid "Saving"
 msgstr "Чувам"
 
-#: ../src/client/composer/composer-widget.vala:156
+#: src/client/composer/composer-widget.vala:169
 msgid "Error saving"
 msgstr "Грешка приликом чувања"
 
-#: ../src/client/composer/composer-widget.vala:157
+#: src/client/composer/composer-widget.vala:170
 msgid "Press Backspace to delete quote"
 msgstr "Притисните Backspace за брисање наводника"
 
-#: ../src/client/composer/composer-widget.vala:158
-msgid "New Message"
-msgstr "Нова порука"
-
 #. 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
+#. checking, include all variants of each word. No spaces are
+#. allowed. The words will be converted to lower case based on
+#. locale and English versions included automatically.
+#: src/client/composer/composer-widget.vala:186
 msgid ""
 "attach|attaching|attaches|attachment|attachments|attached|enclose|enclosed|"
 "enclosing|encloses|enclosure|enclosures"
 msgstr "прилог|приложи|прилогу|прилажем|прилагања|прилози|приложено"
 
-#: ../src/client/composer/composer-widget.vala:1121
-#: ../src/client/composer/composer-widget.vala:1140
-msgid "Do you want to discard this message?"
-msgstr "Да ли желите да одбаците ову поруку?"
-
-#: ../src/client/composer/composer-widget.vala:1237
+#. Translators: This dialog text is displayed to the
+#. user when closing a composer where the options are
+#. Keep, Discard or Cancel.
+#: src/client/composer/composer-widget.vala:862
+#| msgid "Do you want to discard this message?"
+msgid "Do you want to keep or discard this draft message?"
+msgstr "Да ли желите да одбаците ову поруку нацрта?"
+
+#. Translators: This dialog text is displayed to the
+#. user when closing a composer where the options are
+#. only Discard or Cancel.
+#: src/client/composer/composer-widget.vala:888
+#| msgid "Do you want to discard this message?"
+msgid "Do you want to discard this draft message?"
+msgstr "Да ли желите да одбаците ову поруку нацрта?"
+
+#: src/client/composer/composer-widget.vala:1440
 msgid "Send message with an empty subject and body?"
 msgstr "Да пошаљем поруку са празним насловом и текстом?"
 
-#: ../src/client/composer/composer-widget.vala:1239
+#: src/client/composer/composer-widget.vala:1442
 msgid "Send message with an empty subject?"
 msgstr "Да пошаљем поруку са празним насловом?"
 
-#: ../src/client/composer/composer-widget.vala:1241
+#: src/client/composer/composer-widget.vala:1444
 msgid "Send message with an empty body?"
 msgstr "Да пошаљем поруку без икаквог текста?"
 
-#: ../src/client/composer/composer-widget.vala:1245
+#: src/client/composer/composer-widget.vala:1453
 msgid "Send message without an attachment?"
 msgstr "Да пошаљем поруку без прилога?"
 
-#: ../src/client/composer/composer-widget.vala:1498
+#: src/client/composer/composer-widget.vala:1772
 #, c-format
 msgid "“%s” already attached for delivery."
 msgstr "„%s“ је већ приложено за испоруку."
 
-#. / 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:1506
-#: ../src/client/conversation-viewer/conversation-email.vala:138
+#: src/client/composer/composer-widget.vala:1804
+#: src/client/composer/composer-widget.vala:1854
 #, c-format
-msgid "%s (%s)"
-msgstr "%s (%s)"
+msgid "“%s” is an empty file."
+msgstr "„%s“ је празна датотека."
 
-#: ../src/client/composer/composer-widget.vala:1543
+#: src/client/composer/composer-widget.vala:1842
 #, c-format
 msgid "“%s” could not be found."
 msgstr "Не могу да пронађем „%s“."
 
-#: ../src/client/composer/composer-widget.vala:1549
+#: src/client/composer/composer-widget.vala:1848
 #, c-format
 msgid "“%s” is a folder."
 msgstr "„%s“ је фасцикла."
 
-#: ../src/client/composer/composer-widget.vala:1555
-#, c-format
-msgid "“%s” is an empty file."
-msgstr "„%s“ је празна датотека."
-
-#: ../src/client/composer/composer-widget.vala:1568
+#: src/client/composer/composer-widget.vala:1867
 #, c-format
 msgid "“%s” could not be opened for reading."
 msgstr "Не могу да отворим „%s“ за читање."
 
-#: ../src/client/composer/composer-widget.vala:1576
+#: src/client/composer/composer-widget.vala:1875
 msgid "Cannot add attachment"
 msgstr "Не могу да додам прилог"
 
-#: ../src/client/composer/composer-widget.vala:1638
-msgid "To: "
-msgstr "Прима: "
+#. Translators: This is the name of the file chooser filter
+#. when inserting an image in the composer.
+#: src/client/composer/composer-widget.vala:1946
+msgid "Images"
+msgstr "Слике"
+
+#. Translators: Human-readable version of the RFC 822 To header
+#: src/client/composer/composer-widget.vala:2010
+#: src/client/conversation-viewer/conversation-email.vala:542
+#: src/client/util/util-email.vala:249 ui/conversation-message.ui:312
+msgid "To:"
+msgstr "Прима:"
 
-#: ../src/client/composer/composer-widget.vala:1641
-msgid "Cc: "
-msgstr "Цц: "
+#. Translators: Human-readable version of the RFC 822 CC header
+#: src/client/composer/composer-widget.vala:2016
+#: src/client/conversation-viewer/conversation-email.vala:547
+#: src/client/util/util-email.vala:254 ui/conversation-message.ui:357
+msgid "Cc:"
+msgstr "Цц:"
 
-#: ../src/client/composer/composer-widget.vala:1644
-msgid "Bcc: "
-msgstr "Бцц: "
+#. Translators: Human-readable version of the RFC 822 BCC header
+#: src/client/composer/composer-widget.vala:2022
+#: src/client/conversation-viewer/conversation-email.vala:552
+#: ui/conversation-message.ui:402
+msgid "Bcc:"
+msgstr "Бцц:"
 
-#: ../src/client/composer/composer-widget.vala:1647
+#. Translators: Human-readable version of the RFC 822 Reply-To header
+#: src/client/composer/composer-widget.vala:2028
 msgid "Reply-To: "
 msgstr "Одговор за: "
 
-#: ../src/client/composer/composer-widget.vala:1778
-msgid "Select Color"
-msgstr "Изаберите боју"
-
-#. 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:1978
+#. 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:2146
 #, c-format
 msgid "%1$s via %2$s"
 msgstr "%1$s преко %2$s"
 
-#. Composer label (with mnemonic underscore) for the account selector
-#. when choosing what address to send a message from.
-#: ../src/client/composer/composer-widget.vala:2020
-msgid "_From:"
-msgstr "_Шаље:"
-
-#. Translators: This is the name of the file chooser filter
-#. when inserting an image in the composer.
-#: ../src/client/composer/composer-widget.vala:2244
-msgid "Images"
-msgstr "Слике"
-
-#: ../src/client/composer/spell-check-popover.vala:117
+#: src/client/composer/spell-check-popover.vala:125
 msgid "Remove this language from the preferred list"
 msgstr "Уклоните овај језик са списка пожељних"
 
-#: ../src/client/composer/spell-check-popover.vala:121
+#: src/client/composer/spell-check-popover.vala:129
 msgid "Add this language to the preferred list"
 msgstr "Додајте овај језик на списак пожељних"
 
-#: ../src/client/composer/spell-check-popover.vala:217
+#: src/client/composer/spell-check-popover.vala:225
 msgid "Search for more languages"
 msgstr "Потражи још језика"
 
-#: ../src/client/conversation-list/formatted-conversation-data.vala:11
+#. / Translators: Context menu item
+#: src/client/conversation-list/conversation-list-view.vala:339
+#| msgid "Move conversations"
+msgid "Move conversation to _Trash"
+msgid_plural "Move conversations to _Trash"
+msgstr[0] "Премести преписку у _смеће"
+msgstr[1] "Премести преписке у _смеће"
+msgstr[2] "Премести преписке у _смеће"
+msgstr[3] "Премести преписку у _смеће"
+
+#. / Translators: Context menu item
+#: src/client/conversation-list/conversation-list-view.vala:351
+#| msgid "Delete conversation"
+msgid "_Delete conversation"
+msgid_plural "_Delete conversations"
+msgstr[0] "_Обриши преписку"
+msgstr[1] "_Обриши преписке"
+msgstr[2] "_Обриши преписке"
+msgstr[3] "_Обриши преписку"
+
+#: src/client/conversation-list/conversation-list-view.vala:364
+#: ui/main-toolbar-menus.ui:5
+msgid "Mark as _Read"
+msgstr "Означи као _прочитано"
+
+#: src/client/conversation-list/conversation-list-view.vala:372
+#: ui/main-toolbar-menus.ui:9
+msgid "Mark as _Unread"
+msgstr "Означи као _непрочитано"
+
+#: src/client/conversation-list/conversation-list-view.vala:380
+#: ui/main-toolbar-menus.ui:17
+msgid "U_nstar"
+msgstr "_Уклони звездицу"
+
+#: src/client/conversation-list/conversation-list-view.vala:387
+#: ui/main-toolbar-menus.ui:13
+msgid "_Star"
+msgstr "_Додај звездицу"
+
+#. Translators: Menu item to reply to a specific message.
+#: src/client/conversation-list/conversation-list-view.vala:396
+#: ui/conversation-email-menus.ui:9
+msgid "_Reply"
+msgstr "_Одговори"
+
+#: src/client/conversation-list/conversation-list-view.vala:402
+msgid "R_eply All"
+msgstr "Одговори _свима"
+
+#. Translators: Menu item to forward a specific message.
+#: src/client/conversation-list/conversation-list-view.vala:408
+#: ui/conversation-email-menus.ui:21
+msgid "_Forward"
+msgstr "_Проследи"
+
+#: src/client/conversation-list/formatted-conversation-data.vala:18
 msgid "Me"
 msgstr "Ја"
 
-#. Translators: This is the file type displayed for
-#. attachments with unknown file types.
-#: ../src/client/conversation-viewer/conversation-email.vala:124
-msgid "Unknown"
-msgstr "Непознато"
+#. Translators: Human-readable version of the RFC 822 From header
+#: src/client/conversation-viewer/conversation-email.vala:537
+#: src/client/util/util-email.vala:240
+msgid "From:"
+msgstr "Шаље:"
+
+#. Translators: Human-readable version of the RFC 822 Date header
+#: src/client/conversation-viewer/conversation-email.vala:557
+#: src/client/util/util-email.vala:245
+msgid "Date:"
+msgstr "Датум:"
+
+#. Translators: Human-readable version of the RFC 822 Subject header
+#: src/client/conversation-viewer/conversation-email.vala:567
+#: src/client/util/util-email.vala:243
+#| msgid "Subject"
+msgid "Subject:"
+msgstr "Тема:"
+
+#: src/client/conversation-viewer/conversation-message.vala:128
+msgid "This email address may have been forged"
+msgstr "Ова адресса е-поште мора бити саздана"
+
+#. Translators: Label text displayed when there are too
+#. many email addresses to be shown by default in an
+#. email's header, but they are all being shown anyway.
+#: src/client/conversation-viewer/conversation-message.vala:234
+#| msgid "Show Images"
+msgid "Show less"
+msgstr "Прикажи мање"
+
+#. Translators: Label text displayed when there are
+#. too many email addresses to be shown by default in
+#. an email's header. The string substitution is the
+#. number of extra email to be shown.
+#: src/client/conversation-viewer/conversation-message.vala:260
+#, c-format
+msgid "%d more…"
+msgstr "још %d…"
 
-#. Preview headers
+#. Compact headers. These are partially done here and partially
+#. in load_contacts.
 #. Translators: This is displayed in place of the from address
 #. when the message has no from address.
-#: ../src/client/conversation-viewer/conversation-message.vala:331
+#: src/client/conversation-viewer/conversation-message.vala:529
 msgid "No sender"
 msgstr "Нема пошиљаоца"
 
 #. Translators: This separates multiple 'from'
-#. addresses in the header preview for a message.
-#: ../src/client/conversation-viewer/conversation-message.vala:586
+#. addresses in the compact header for a message.
+#: src/client/conversation-viewer/conversation-message.vala:920
 msgid ", "
 msgstr ", "
 
 #. Translators: This string is used as the HTML IMG ALT
 #. attribute value when displaying an inline image in an email
 #. that did not specify a file name. E.g. <IMG ALT="Image" ...
-#: ../src/client/conversation-viewer/conversation-message.vala:707
-#| msgid "Images"
+#: src/client/conversation-viewer/conversation-message.vala:1040
 msgid "Image"
 msgstr "Слика"
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:73
+#. Translators: Info bar status message
+#: src/client/conversation-viewer/conversation-message.vala:1305
+msgid "Remote images not shown"
+msgstr "Удаљене слике нису приказане"
+
+#. Translators: Info bar description
+#: src/client/conversation-viewer/conversation-message.vala:1307
+msgid "Only show remote images from senders you trust."
+msgstr "Прикажите само слике пошиљалаца којима верујете."
+
+#. Translators: Info bar button label
+#: src/client/conversation-viewer/conversation-message.vala:1311
+#| msgctxt "shortcut window"
+#| msgid "Show help"
+msgid "Show"
+msgstr "Прикажи"
+
+#. Translators: Info bar button label
+#: src/client/conversation-viewer/conversation-message.vala:1315
+#| msgid "Always Show From Sender"
+msgid "Always show from sender"
+msgstr "Увек прикажи од овог пошиљаоца"
+
+#. Translators: Title label for placeholder when no
+#. conversations have been selected.
+#: src/client/conversation-viewer/conversation-viewer.vala:83
 msgid "No conversations selected"
-msgstr "Није изабран разговор"
+msgstr "Није изабрана преписка"
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:75
+#. Translators: Sub-title label for placeholder when no
+#. conversations have been selected.
+#: src/client/conversation-viewer/conversation-viewer.vala:87
 msgid "Selecting a conversation from the list will display it here"
-msgstr "Бирање разговора са списка ће приказати овде"
+msgstr "Бирање преписке са списка ће је приказати овде"
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:80
+#. Translators: Title label for placeholder when multiple
+#. conversations have been selected.
+#: src/client/conversation-viewer/conversation-viewer.vala:96
 msgid "Multiple conversations selected"
-msgstr "Изабрано је неколико разговора"
+msgstr "Изабрано је неколико преписки"
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:82
+#. Translators: Sub-title label for placeholder when multiple
+#. conversations have been selected.
+#: src/client/conversation-viewer/conversation-viewer.vala:100
 msgid "Choosing an action will apply to all selected conversations"
-msgstr "Бирање радње ће се применити на све изабране разговоре"
-
-#: ../src/client/conversation-viewer/conversation-viewer.vala:87
-#: ../src/client/conversation-viewer/conversation-viewer.vala:94
+msgstr "Бирање радње ће се применити на све изабране преписке"
+
+#. Translators: Title label for placeholder when no
+#. conversations have exist in a folder.
+#. Translators: Title label for placeholder when no
+#. conversations have been found in a search.
+#: src/client/conversation-viewer/conversation-viewer.vala:109
+#: src/client/conversation-viewer/conversation-viewer.vala:122
 msgid "No conversations found"
-msgstr "Нисам нашао разговор"
+msgstr "Нисам нашао преписку"
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:89
+#. Translators: Sub-title label for placeholder when no
+#. conversations have exist in a folder.
+#: src/client/conversation-viewer/conversation-viewer.vala:113
 msgid "This folder does not contain any conversations"
-msgstr "Ова фасцикла не садржи никакав разговор"
+msgstr "Ова фасцикла не садржи никакву преписку"
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:96
+#. Translators: Sub-title label for placeholder when no
+#. conversations have been found in a search.
+#: src/client/conversation-viewer/conversation-viewer.vala:126
 msgid "Your search returned no results, try refining your search terms"
 msgstr ""
 "Ваша претрага није дала резултата, покушајте да сузите термине претраге"
 
-#: ../src/client/dialogs/attachment-dialog.vala:28
-#: ../src/client/dialogs/attachment-dialog.vala:30
+#: src/client/dialogs/attachment-dialog.vala:25
 msgid "Choose a file"
 msgstr "Изаберите датотеку"
 
-#: ../src/client/dialogs/attachment-dialog.vala:28
-#: ../src/client/dialogs/attachment-dialog.vala:30
+#: src/client/dialogs/attachment-dialog.vala:25
 msgid "_Attach"
 msgstr "_Приложи"
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:33
+#: src/client/dialogs/certificate-warning-dialog.vala:36
 #, c-format
 msgid "Untrusted Connection: %s"
 msgstr "Неповерљива веза: %s"
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:36
+#: src/client/dialogs/certificate-warning-dialog.vala:38
 #, c-format
 msgid "The identity of the %s mail server at %s:%u could not be verified."
 msgstr "Идентитет „%s“ сервера поште на „%s:%u“ не може бити проверен."
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:44
+#: src/client/dialogs/certificate-warning-dialog.vala:48
 msgid ""
 "Selecting “Trust This Server” or “Always Trust This Server” may cause your "
 "username and password to be transmitted insecurely."
@@ -1096,18 +2092,18 @@ msgstr ""
 "Ако изаберете „Веруј овом серверу“ или „Увек веруј овом серверу“ тада ваше "
 "корисничко име и лозинка могу да буду пренети несигурно."
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:52
+#: src/client/dialogs/certificate-warning-dialog.vala:56
 msgid ""
 "Selecting “Don’t Trust This Server” will cause Geary not to access this "
 "server."
 msgstr ""
 "Ако изаберете „Не веруј овом серверу“ тада Гери неће приступити овом серверу."
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:54
+#: src/client/dialogs/certificate-warning-dialog.vala:58
 msgid "Geary will not add or update this email account."
 msgstr "Гери неће додати или освежити овај налог е-поште."
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:59
+#: src/client/dialogs/certificate-warning-dialog.vala:63
 msgid ""
 "Selecting “Don’t Trust This Server” will cause Geary to stop accessing this "
 "account."
@@ -1115,11 +2111,7 @@ msgstr ""
 "Ако изаберете „Не веруј овом серверу“ тада ће Гери зауставити приступање "
 "овом серверу."
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:61
-msgid "Geary will exit if you have no other open email accounts."
-msgstr "Гери ће изаћи ако немате других отворених налога е-поште."
-
-#: ../src/client/dialogs/certificate-warning-dialog.vala:66
+#: src/client/dialogs/certificate-warning-dialog.vala:69
 msgid ""
 "Contact your system administrator or email service provider if you have any "
 "question about these issues."
@@ -1127,43 +2119,54 @@ msgstr ""
 "Обратите се вашем администратору система или достављачу услуге е-поште ако "
 "имате неко питање о овим проблемима."
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:73
+#: src/client/dialogs/certificate-warning-dialog.vala:76
 msgid "The server’s certificate is not signed by a known authority"
 msgstr "Уверење сервера није потписано од стране познатог издавача"
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:76
+#: src/client/dialogs/certificate-warning-dialog.vala:79
 msgid "The server’s identity does not match the identity in the certificate"
 msgstr "Идентитет сервера не одговара идентитету у уверењу"
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:79
+#: src/client/dialogs/certificate-warning-dialog.vala:82
 msgid "The server’s certificate has expired"
 msgstr "Уверење сервера је истекло"
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:82
+#: src/client/dialogs/certificate-warning-dialog.vala:85
 msgid "The server’s certificate has not been activated"
 msgstr "Уверење сервера није активирано"
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:85
+#: src/client/dialogs/certificate-warning-dialog.vala:88
 msgid "The server’s certificate has been revoked and is now invalid"
 msgstr "Уверење сервера је опозвано и сада је неисправно"
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:88
+#: src/client/dialogs/certificate-warning-dialog.vala:91
 msgid "The server’s certificate is considered insecure"
 msgstr "Уверење сервера се сматра несигурним"
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:91
+#: src/client/dialogs/certificate-warning-dialog.vala:94
 msgid "An error has occurred processing the server’s certificate"
 msgstr "Дошло је до грешке приликом обраде уверења сервера"
 
+#. / Translators: Title for problem report dialog error
+#. / information pane
+#. Dialog title for displaying technical details of a problem. Same as the button that invokes it.
+#: src/client/dialogs/dialogs-problem-details-dialog.vala:99
+#: ui/problem-details-dialog.ui:17
+#| msgid "Detach"
+msgid "Details"
+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
+#: src/client/dialogs/password-dialog.vala:16
 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:32
+#. Translators: Label displaying total number of email
+#. messages in a folder. String substitution is the actual
+#. number.
+#: src/client/folder-list/folder-list-folder-entry.vala:42
 #, c-format
 msgid "%d message"
 msgid_plural "%d messages"
@@ -1172,8 +2175,10 @@ msgstr[1] "%d поруке"
 msgstr[2] "%d порука"
 msgstr[3] "%d порука"
 
-#. / Label displaying number of unread email messages in a folder
-#: ../src/client/folder-list/folder-list-folder-entry.vala:39
+#. Translators: Label displaying number of unread email
+#. messages in a folder. String substitution is the actual
+#. number.
+#: src/client/folder-list/folder-list-folder-entry.vala:52
 #, c-format
 msgid "%d unread"
 msgid_plural "%d unread"
@@ -1182,19 +2187,21 @@ msgstr[1] "%d непрочитане"
 msgstr[2] "%d непрочитаних"
 msgstr[3] "%d непрочитана"
 
-#. / This string represents the divider between two messages: "n messages" and "n unread",
-#. / shown in the folder list as a tooltip.  Please use your languages conventions for
-#. / combining the two, i.e. a comma (",") for English; "6 messages, 3 unread"
-#: ../src/client/folder-list/folder-list-folder-entry.vala:45
+#. Translators: This string represents the divider between two
+#. messages: "n messages" and "n unread", shown in the folder
+#. list as a tooltip.  Please use your languages conventions
+#. for combining the two, i.e. a comma (",") for English; "6
+#. messages, 3 unread"
+#: src/client/folder-list/folder-list-folder-entry.vala:60
 #, c-format
 msgid "%s, %s"
 msgstr "%s, %s"
 
-#: ../src/client/folder-list/folder-list-inboxes-branch.vala:14
+#: src/client/folder-list/folder-list-inboxes-branch.vala:14
 msgid "Inboxes"
 msgstr "Пријемни сандучићи"
 
-#: ../src/client/folder-list/folder-list-search-branch.vala:44
+#: src/client/folder-list/folder-list-search-branch.vala:59
 #, c-format
 msgid "%d result"
 msgid_plural "%d results"
@@ -1203,12 +2210,43 @@ msgstr[1] "%d резултата"
 msgstr[2] "%d резултата"
 msgstr[3] "%d резултат"
 
-#: ../src/client/notification/libmessagingmenu.vala:75
+#. / Notification body when a message as been received
+#. / and other unread messages have not been
+#. / seen. First string substitution is the message
+#. / subject and the second is the number of unseen
+#. / messages
+#: src/client/plugin/desktop-notifications/desktop-notifications.vala:138
 #, c-format
-msgid "%s — New Messages"
-msgstr "%s — Нове поруке"
+#| msgid ""
+#| "%s\n"
+#| "(%d other new message for %s)"
+#| msgid_plural ""
+#| "%s\n"
+#| "(%d other new messages for %s)"
+msgid ""
+"%s\n"
+"(%d other new message)"
+msgid_plural ""
+"%s\n"
+"(%d other new messages)"
+msgstr[0] ""
+"%s\n"
+"(%d друга нова порука)"
+msgstr[1] ""
+"%s\n"
+"(%d друге нове поруке)"
+msgstr[2] ""
+"%s\n"
+"(%d других нових порука)"
+msgstr[3] ""
+"%s\n"
+"(%d друга нова порука)"
 
-#: ../src/client/notification/libnotify.vala:74
+#. / Notification body when multiple messages have been
+#. / received at the same time and other unseen messages
+#. / exist. String substitution is the number of new
+#. / messages that have arrived.
+#: src/client/plugin/desktop-notifications/desktop-notifications.vala:157
 #, c-format
 msgid "%d new message"
 msgid_plural "%d new messages"
@@ -1217,7 +2255,13 @@ msgstr[1] "%d нове поруке"
 msgstr[2] "%d нових порука"
 msgstr[3] "%d нова порука"
 
-#: ../src/client/notification/libnotify.vala:77
+#. / Notification body when multiple messages have been
+#. / received at the same time and some unseen messages
+#. / already exist. String substitution is the message
+#. / above with the number of new messages that have
+#. / arrived, number substitution is the total number
+#. / of unseen messages.
+#: src/client/plugin/desktop-notifications/desktop-notifications.vala:167
 #, c-format
 msgid "%s, %d new message total"
 msgid_plural "%s, %d new messages total"
@@ -1226,87 +2270,237 @@ msgstr[1] "%s, укупно %d нове поруке"
 msgstr[2] "%s, укупно %d нових порука"
 msgstr[3] "%s, укупно %d нова порука"
 
-#: ../src/client/notification/libnotify.vala:109
+#. / Notification title when new messages have been
+#. / received
+#: src/client/plugin/desktop-notifications/desktop-notifications.vala:282
+#| msgid "New Message"
+msgid "New message"
+msgid_plural "New messages"
+msgstr[0] "Нова порука"
+msgstr[1] "Нове поруке"
+msgstr[2] "Нове поруке"
+msgstr[3] "Нова порука"
+
+#: src/client/plugin/email-templates/email-templates.plugin.desktop.in:4
+#| msgid "Email address:"
+msgid "Email Templates"
+msgstr "Шаблон поруке"
+
+#: src/client/plugin/email-templates/email-templates.plugin.desktop.in:5
+msgid "Create reusable templates for sending email"
+msgstr "Направите поново употребљиве шаблоне за слање е-поште"
+
+#. Translators: Templates folder name alternatives. Separate names
+#. using a vertical bar and put the most common localized name to
+#. the front for the default. English names do not need to be
+#. included.
+#: src/client/plugin/email-templates/email-templates.vala:29
+#: src/client/plugin/mail-merge/mail-merge.vala:29
+#| msgid "Sent | Sent Mail | Sent Email | Sent E-Mail"
+msgid "Templates | Template Mail | Template Email | Template E-Mail"
+msgstr "Шаблони | Шаблон поште | Шаблон е-поште | Шаблон ел. поште"
+
+#. Translators: The name of the folder used to
+#. store email templates
+#: src/client/plugin/email-templates/email-templates.vala:201
+msgid "Templates"
+msgstr "Шаблони"
+
+#. Translators: Info bar button label for creating a
+#. new email template
+#: src/client/plugin/email-templates/email-templates.vala:282
+#| msgid "Now"
+msgid "New"
+msgstr "Нови"
+
+#. Translators: Infobar status label for an email template
+#: src/client/plugin/email-templates/email-templates.vala:293
+#| msgid "Message not saved"
+msgid "Message template"
+msgstr "Шаблон поруке"
+
+#. Translators: Info bar button label for sending an
+#. email template
+#: src/client/plugin/email-templates/email-templates.vala:297
+#| msgctxt "shortcut window"
+#| msgid "Send"
+msgid "Send"
+msgstr "Слање"
+
+#. Translators: Info bar button label for editing an
+#. existing email template
+#. Translators: Info bar button label for editing a draft
+#. email
+#: src/client/plugin/email-templates/email-templates.vala:305
+#: src/client/plugin/mail-merge/mail-merge.vala:336
+#: src/client/plugin/special-folders/special-folders.vala:187
+msgid "Edit"
+msgstr "Уређивање"
+
+#. / Translators: Menu item label for invoking mail
+#. / merge in composer
+#. / Translators: File chooser title after invoking mail
+#. / merge in composer
+#. Translators: The name of the folder used to
+#. display merged email
+#: src/client/plugin/mail-merge/mail-merge.plugin.desktop.in:5
+#: src/client/plugin/mail-merge/mail-merge.vala:288
+#: src/client/plugin/mail-merge/mail-merge.vala:389
+#: src/client/plugin/mail-merge/mail-merge.vala:488
+msgid "Mail Merge"
+msgstr "Стопљене поруке"
+
+#: src/client/plugin/mail-merge/mail-merge.plugin.desktop.in:6
+msgid "Fill in and send email templates using a spreadsheet"
+msgstr "Попуните и пошаљите шаблоне е-поште користећи табличне листове"
+
+#. Translators: Info bar label for starting sending a mail
+#. merge
+#: src/client/plugin/mail-merge/mail-merge.vala:118
+#| msgctxt "shortcut window"
+#| msgid "Star"
+msgid "Start"
+msgstr "Почетак"
+
+#. Translators: Info bar label for pausing sending a mail
+#. merge
+#: src/client/plugin/mail-merge/mail-merge.vala:130
+msgid "Pause"
+msgstr "Пауза"
+
+#. Translators: Info bar description for the mail merge
+#. folder. The first string substitution the number of email
+#. already sent, the second is the total number to send.
+#: src/client/plugin/mail-merge/mail-merge.vala:240
 #, c-format
-msgid ""
-"%s\n"
-"(%d other new message for %s)"
-msgid_plural ""
-"%s\n"
-"(%d other new messages for %s)"
-msgstr[0] ""
-"%s\n"
-"(%d друга нова порука за %s)"
-msgstr[1] ""
-"%s\n"
-"(%d друге нове поруке за %s)"
-msgstr[2] ""
-"%s\n"
-"(%d других нових порука за %s)"
-msgstr[3] ""
-"%s\n"
-"(%d друга нова порука за %s)"
+msgid "Sent %u of %u"
+msgid_plural "Sent %u of %u"
+msgstr[0] "Послата је %u од %u"
+msgstr[1] "Послате су %u од %u"
+msgstr[2] "Послато је %u од %u"
+msgstr[3] "Послата је %u од %u"
+
+#. Translators: Infobar status label for an email mail merge
+#. template
+#: src/client/plugin/mail-merge/mail-merge.vala:324
+msgid "Mail merge template"
+msgstr "Шаблон спајања поруке"
+
+#. Translators: Info bar button label for performing a
+#. mail-merge on an email template
+#: src/client/plugin/mail-merge/mail-merge.vala:328
+msgid "Merge"
+msgstr "Споји"
+
+#. / Translators: Action bar menu button label for
+#. / mail-merge plugin
+#: src/client/plugin/mail-merge/mail-merge.vala:377
+#| msgctxt "shortcut window"
+#| msgid "Insert a link"
+msgid "Insert field"
+msgstr "Убаци поље"
+
+#. / Translators: File chooser filer label
+#: src/client/plugin/mail-merge/mail-merge.vala:396
+msgid "Comma separated values (CSV)"
+msgstr "Вредности раздвојене зарезом (CSV)"
+
+#: src/client/plugin/messaging-menu/messaging-menu.plugin.desktop.in:4
+msgid "Messaging Menu"
+msgstr "Изборник слања порука"
+
+#: src/client/plugin/messaging-menu/messaging-menu.plugin.desktop.in:5
+#| msgid "Show _notifications for new mail"
+msgid "Displays Unity Messaging Menu notifications for new email"
+msgstr "Приказује обавештења Јунити изборника дописивања о новим порукама"
+
+#: src/client/plugin/messaging-menu/messaging-menu.vala:79
+#, c-format
+msgid "%s — New Messages"
+msgstr "%s — Нове поруке"
 
-#: ../src/client/notification/libnotify.vala:165
-msgid "Open"
-msgstr "Отвори"
+#: src/client/plugin/sent-sound/sent-sound.plugin.desktop.in:4
+#| msgid "not found"
+msgid "Sent Sound"
+msgstr "Звук послате"
+
+#: src/client/plugin/sent-sound/sent-sound.plugin.desktop.in:5
+msgid "Plays the desktop sent-mail sound when an email is sent"
+msgstr "Пуштаће звук слања поруке када је послата порука"
+
+#. Translators: Info bar button label for emptying
+#. trash/spam folders
+#: src/client/plugin/special-folders/special-folders.vala:167
+msgid "Empty"
+msgstr "Испразни"
+
+#. Translators: Info bar status message for a draft email
+#: src/client/plugin/special-folders/special-folders.vala:179
+msgid "Draft message"
+msgstr "Порука нацрта"
+
+#. Translators: Info bar status description for a draft
+#. email
+#: src/client/plugin/special-folders/special-folders.vala:182
+msgid "This message has not yet been sent."
+msgstr "Ова порука још није послата."
+
+#. Translators: Info bar status message for an sent but
+#. unsaved email
+#: src/client/plugin/special-folders/special-folders.vala:198
+msgid "Message not saved"
+msgstr "Порука није сачувана"
+
+#. Translators: Info bar status description for a sent but
+#. unsaved email
+#: src/client/plugin/special-folders/special-folders.vala:201
+msgid "This message was sent, but has not been saved to your account."
+msgstr "Ова порука је послата, али није сачувана у вашем налогу."
 
 #. / Datetime format for 12-hour time, i.e. 8:31 am
 #. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#: ../src/client/util/util-date.vala:68
+#: src/client/util/util-date.vala:69
 msgid "%l:%M %P"
 msgstr "%l:%M %P"
 
 #. / Datetime format for 24-hour time, i.e. 16:35
 #. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#: ../src/client/util/util-date.vala:71
+#: src/client/util/util-date.vala:72
 msgid "%H:%M"
 msgstr "%H:%M"
 
 #. / Datetime format for the locale default, i.e. 8:31 am or 16:35,
 #. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#: ../src/client/util/util-date.vala:74
-msgctxt "Default clock format"
-msgid "%l:%M %P"
-msgstr "%l:%M %P"
-
 #. / Date format for dates within the current year, i.e. Nov 8
 #. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#: ../src/client/util/util-date.vala:78
+#: src/client/util/util-date.vala:79
 msgid "%b %-e"
-msgstr "%-e. %b."
-
-#. / Date format for dates within a different year, i.e. 02/04/10
-#. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#: ../src/client/util/util-date.vala:83
-#, no-c-format
-msgid "%x"
-msgstr "%x"
+msgstr "%-e. %B"
 
 #. / Verbose datetime format for 12-hour time, i.e. November 8, 2010 8:42 am
 #. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#: ../src/client/util/util-date.vala:88
+#: src/client/util/util-date.vala:84
 msgid "%B %-e, %Y %-l:%M %P"
 msgstr "%-e. %B %Y. %-l:%M %P"
 
 #. / Verbose datetime format for 24-hour time, i.e. November 8, 2010 16:35
 #. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#: ../src/client/util/util-date.vala:91
+#: src/client/util/util-date.vala:87
 msgid "%B %-e, %Y %-H:%M"
 msgstr "%-e. %B %Y. %-H:%M"
 
 #. / Verbose datetime format for the locale default (full month, day and time)
 #. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#: ../src/client/util/util-date.vala:94
+#: src/client/util/util-date.vala:90
 msgctxt "Default full date"
 msgid "%B %-e, %Y %-l:%M %P"
 msgstr "%-e. %B %Y. %-l:%M %P"
 
-#: ../src/client/util/util-date.vala:164
+#: src/client/util/util-date.vala:159
 msgid "Now"
 msgstr "Сада"
 
-#: ../src/client/util/util-date.vala:167
+#: src/client/util/util-date.vala:162
 #, c-format
 msgid "%dm ago"
 msgid_plural "%dm ago"
@@ -1315,7 +2509,7 @@ msgstr[1] "Пре %dm"
 msgstr[2] "Пре %dm"
 msgstr[3] "Пре %dm"
 
-#: ../src/client/util/util-date.vala:171
+#: src/client/util/util-date.vala:166
 #, c-format
 msgid "%dh ago"
 msgid_plural "%dh ago"
@@ -1324,114 +2518,160 @@ msgstr[1] "Пре %dh"
 msgstr[2] "Пре %dh"
 msgstr[3] "Пре %dh"
 
-#: ../src/client/util/util-date.vala:178
+#: src/client/util/util-date.vala:173
 msgid "Yesterday"
 msgstr "Јуче"
 
 #. / Date format that shows the weekday (Monday, Tuesday, ...)
 #. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#: ../src/client/util/util-date.vala:183
+#: src/client/util/util-date.vala:178
 #, c-format
 msgid "%A"
 msgstr "%A"
 
-#: ../src/client/util/util-email.vala:30
-#: ../src/engine/rfc822/rfc822-message.vala:908
-msgid "(no subject)"
+#. / 12 hours format for datetime that a message being replied
+#. / to was received See
+#. / http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
+#: src/client/util/util-date.vala:218
+#| msgid "%a, %b %-e, %Y at %-l:%M %p"
+msgid "%a, %b %-e, %Y at %l:%M %P"
+msgstr "%a, %-e. %B %Y. у %l:%M %p"
+
+#. / 24 hours format for the datetime that a message being
+#. / replied to was received See
+#. / http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
+#: src/client/util/util-date.vala:224
+#| msgid "%a, %b %-e, %Y at %-l:%M %p"
+msgid "%a, %b %-e, %Y at %H:%M"
+msgstr "%a, %-e. %B %Y. у %l:%M"
+
+#. / Format for the datetime that a message being replied to
+#. / was received See
+#. / http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
+#: src/client/util/util-date.vala:230
+#| msgid "%a, %b %-e, %Y at %-l:%M %p"
+msgid "%a, %b %-e, %Y at %X"
+msgstr "%a, %-e. %B %Y. у %X"
+
+#. Translators: Label used when an email has a missing or
+#. an empty subject
+#: src/client/util/util-email.vala:50
+#| msgid "(no subject)"
+msgid "(No subject)"
 msgstr "(без наслова)"
 
-#: ../src/client/util/util-files.vala:16
+#. / Translators: This is shown for displaying a list of email
+#. / recipients that happens to be empty, i.e. contains no
+#. / email addresses.
+#: src/client/util/util-email.vala:148
+msgid "(No recipients)"
+msgstr "(нема прималаца)"
+
+#. / Translators: This is used for displaying a short
+#. / list of email recipients lists with two or more
+#. / addresses. The first (string) substitution is
+#. / address of the first, the second substitution is
+#. / the number of n - 1 remaining recipients.
+#: src/client/util/util-email.vala:160
+#, c-format
+msgid "%s and %d other"
+msgid_plural "%s and %d others"
+msgstr[0] "%s и још %d"
+msgstr[1] "%s и још %d"
+msgstr[2] "%s и још %d"
+msgstr[3] "%s и још %d"
+
+#. / The quoted header for a message being replied to.
+#. / %1$s will be substituted for the date, and %2$s will be substituted for
+#. / the original sender.
+#: src/client/util/util-email.vala:193
+#, c-format
+msgid "On %1$s, %2$s wrote:"
+msgstr "%1$s, %2$s пише:"
+
+#. / The quoted header for a message being replied to (in case the date is not known).
+#. / %s will be replaced by the original sender.
+#: src/client/util/util-email.vala:200
+#, c-format
+msgid "%s wrote:"
+msgstr "%s пише:"
+
+#. / The quoted header for a message being replied to (in case the sender is not known).
+#. / %s will be replaced by the original date
+#: src/client/util/util-email.vala:206
+#, c-format
+msgid "On %s:"
+msgstr "%s:"
+
+#: src/client/util/util-email.vala:235
+msgid "---------- Forwarded message ----------"
+msgstr "---------- Прослеђена порука ----------"
+
+#: src/client/util/util-files.vala:16
 msgid "bytes"
 msgstr "бајта"
 
-#: ../src/client/util/util-files.vala:19
+#: src/client/util/util-files.vala:19
 msgctxt "Abbreviation for terabyte"
 msgid "TB"
 msgstr "TB"
 
-#: ../src/client/util/util-files.vala:22
+#: src/client/util/util-files.vala:22
 msgctxt "Abbreviation for gigabyte"
 msgid "GB"
 msgstr "GB"
 
-#: ../src/client/util/util-files.vala:25
+#: src/client/util/util-files.vala:25
 msgctxt "Abbreviation for megabyte"
 msgid "MB"
 msgstr "MB"
 
-#: ../src/client/util/util-files.vala:28
+#: src/client/util/util-files.vala:28
 msgctxt "Abbreviation for kilobyte"
 msgid "KB"
 msgstr "KB"
 
-#: ../src/engine/api/geary-service-provider.vala:52
-msgid "Gmail"
-msgstr "Гуглова пошта"
-
-#: ../src/engine/api/geary-service-provider.vala:55
-msgid "Yahoo! Mail"
-msgstr "Јаху! пошта"
-
-#: ../src/engine/api/geary-service-provider.vala:58
-msgid "Outlook.com"
-msgstr "Outlook.com"
-
-#: ../src/engine/api/geary-service-provider.vala:61
-msgid "Other"
-msgstr "Друга"
-
-#: ../src/engine/api/geary-service.vala:20
-msgid "IMAP"
-msgstr "ИМАП"
-
-#: ../src/engine/api/geary-service.vala:23
-msgid "SMTP"
-msgstr "СМТП"
-
-#: ../src/engine/api/geary-special-folder-type.vala:24
+#: src/client/util/util-i18n.vala:271
 msgid "Inbox"
 msgstr "Сандуче"
 
-#: ../src/engine/api/geary-special-folder-type.vala:27
+#: src/client/util/util-i18n.vala:274
 msgid "Drafts"
 msgstr "Нацрти"
 
-#: ../src/engine/api/geary-special-folder-type.vala:30
-msgid "Sent Mail"
-msgstr "Послата пошта"
+#: src/client/util/util-i18n.vala:277
+#| msgid "Sent by:"
+msgid "Sent"
+msgstr "Послате"
 
-#: ../src/engine/api/geary-special-folder-type.vala:33
+#: src/client/util/util-i18n.vala:280
 msgid "Starred"
 msgstr "Омиљена"
 
-#: ../src/engine/api/geary-special-folder-type.vala:36
+#: src/client/util/util-i18n.vala:283
 msgid "Important"
 msgstr "Важна"
 
-#: ../src/engine/api/geary-special-folder-type.vala:39
+#: src/client/util/util-i18n.vala:286
 msgid "All Mail"
 msgstr "Сва пошта"
 
-#: ../src/engine/api/geary-special-folder-type.vala:42
-msgid "Spam"
-msgstr "Непожељна"
+#: src/client/util/util-i18n.vala:289
+msgid "Junk"
+msgstr "Ђубре"
 
-#: ../src/engine/api/geary-special-folder-type.vala:45
+#: src/client/util/util-i18n.vala:292
 msgid "Trash"
 msgstr "Смеће"
 
-#: ../src/engine/api/geary-special-folder-type.vala:48
+#: src/client/util/util-i18n.vala:295
 msgid "Outbox"
 msgstr "Одлазна"
 
-#: ../src/engine/api/geary-special-folder-type.vala:54
+#: src/client/util/util-i18n.vala:301
 msgid "Archive"
 msgstr "Архива"
 
-#: ../src/engine/api/geary-special-folder-type.vala:58 ../ui/login.glade.h:29
-msgid "None"
-msgstr "Ништа"
-
 #. 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
@@ -1445,7 +2685,7 @@ msgstr "Ништа"
 #. 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
+#: src/engine/imap-db/imap-db-search-query.vala:130
 msgctxt "Search operator"
 msgid "attachment"
 msgstr "прилог"
@@ -1458,7 +2698,7 @@ msgstr "прилог"
 #. 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
+#: src/engine/imap-db/imap-db-search-query.vala:139
 msgctxt "Search operator"
 msgid "bcc"
 msgstr "бцц"
@@ -1470,7 +2710,7 @@ msgstr "бцц"
 #. 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
+#: src/engine/imap-db/imap-db-search-query.vala:147
 msgctxt "Search operator"
 msgid "body"
 msgstr "текст поруке"
@@ -1483,7 +2723,7 @@ msgstr "текст поруке"
 #. 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
+#: src/engine/imap-db/imap-db-search-query.vala:156
 msgctxt "Search operator"
 msgid "cc"
 msgstr "цц"
@@ -1496,7 +2736,7 @@ msgstr "цц"
 #. 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
+#: src/engine/imap-db/imap-db-search-query.vala:165
 msgctxt "Search operator"
 msgid "from"
 msgstr "шаље"
@@ -1508,7 +2748,7 @@ msgstr "шаље"
 #. 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
+#: src/engine/imap-db/imap-db-search-query.vala:173
 msgctxt "Search operator"
 msgid "is"
 msgstr "је"
@@ -1520,7 +2760,7 @@ msgstr "је"
 #. 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
+#: src/engine/imap-db/imap-db-search-query.vala:181
 msgctxt "Search operator"
 msgid "subject"
 msgstr "наслов"
@@ -1533,7 +2773,7 @@ msgstr "наслов"
 #. 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
+#: src/engine/imap-db/imap-db-search-query.vala:190
 msgctxt "Search operator"
 msgid "to"
 msgstr "прима"
@@ -1546,7 +2786,7 @@ msgstr "прима"
 #. 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
+#: src/engine/imap-db/imap-db-search-query.vala:211
 msgctxt "Search operator value - mail addressed to the user"
 msgid "me"
 msgstr "моја"
@@ -1558,7 +2798,7 @@ msgstr "моја"
 #. 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
+#: src/engine/imap-db/imap-db-search-query.vala:223
 msgctxt "Search operator value - mail sent by the user"
 msgid "me"
 msgstr "моја"
@@ -1570,7 +2810,7 @@ msgstr "моја"
 #. 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
+#: src/engine/imap-db/imap-db-search-query.vala:235
 msgctxt "'is:' search operator value"
 msgid "read"
 msgstr "прочитана"
@@ -1583,7 +2823,7 @@ msgstr "прочитана"
 #. 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
+#: src/engine/imap-db/imap-db-search-query.vala:246
 msgctxt "'is:' search operator value"
 msgid "starred"
 msgstr "омиљена"
@@ -1595,7 +2835,7 @@ msgstr "омиљена"
 #. 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
+#: src/engine/imap-db/imap-db-search-query.vala:256
 msgctxt "'is:' search operator value"
 msgid "unread"
 msgstr "непрочитана"
@@ -1604,7 +2844,7 @@ msgstr "непрочитана"
 #. 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
+#: src/engine/imap-engine/imap-engine-generic-account.vala:996
 msgid "Drafts | Draft"
 msgstr "Нацрти | Нацрт"
 
@@ -1612,22 +2852,22 @@ msgstr "Нацрти | Нацрт"
 #. 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
+#: src/engine/imap-engine/imap-engine-generic-account.vala:1005
 msgid "Sent | Sent Mail | Sent Email | Sent E-Mail"
 msgstr "Послато | Послата пошта | Послата е-пошта"
 
 #. 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
+#: src/engine/imap-engine/imap-engine-generic-account.vala:1010
 msgctxt "Outlook localised name"
 msgid "Sent Items"
 msgstr "Послате ставке"
 
 #. 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
+#. Junk/Spam mailbox. Separate names using a vertical bar
+#. and put the most common localized name to the front for
+#. the default. English names do not need to be included.
+#: src/engine/imap-engine/imap-engine-generic-account.vala:1020
 msgid ""
 "Junk | Spam | Junk Mail | Junk Email | Junk E-Mail | Bulk Mail | Bulk Email "
 "| Bulk E-Mail"
@@ -1637,13 +2877,13 @@ msgstr "Ђубре | Спам | Непожељна | Непожељна пошт
 #. Trash mailbox. Separate names using a vertical bar and
 #. put the most common localized name to the front for the
 #. default. English names do not need to be included.
-#: ../src/engine/imap-engine/imap-engine-generic-account.vala:660
+#: src/engine/imap-engine/imap-engine-generic-account.vala:1030
 msgid "Trash | Rubbish | Rubbish Bin"
 msgstr "Смеће | Корпа"
 
 #. 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
+#: src/engine/imap-engine/imap-engine-generic-account.vala:1035
 msgctxt "Outlook localised name"
 msgid "Deleted Items"
 msgstr "Обрисане ставке"
@@ -1652,1018 +2892,1599 @@ msgstr "Обрисане ставке"
 #. 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
+#: src/engine/imap-engine/imap-engine-generic-account.vala:1045
 msgid "Archive | Archives"
 msgstr "Архива | Архиве"
 
-#. / Format for the datetime that a message being replied to was received
-#. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#: ../src/engine/rfc822/rfc822-utils.vala:236
-msgid "%a, %b %-e, %Y at %-l:%M %p"
-msgstr "%a, %-e. %b %Y. у %-l:%M %p"
-
-#. / The quoted header for a message being replied to.
-#. / %1$s will be substituted for the date, and %2$s will be substituted for
-#. / the original sender.
-#: ../src/engine/rfc822/rfc822-utils.vala:242
+#: src/engine/rfc822/rfc822-message.vala:528
 #, c-format
-msgid "On %1$s, %2$s wrote:"
-msgstr "%1$s, %2$s пише:"
+msgid "Could not determine mime type for “%s”."
+msgstr "Не могу да одредим миме врсту за „%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:249
+#: src/engine/rfc822/rfc822-message.vala:539
 #, c-format
-msgid "%s wrote:"
-msgstr "%s пише:"
+msgid "Could not determine content type for mime type “%s” on “%s”."
+msgstr "Не могу да одредим врсту садржаја за миме врсту „%s“ на „%s“."
 
-#. / The quoted header for a message being replied to (in case the sender is not known).
-#. / %s will be replaced by the original date
-#: ../src/engine/rfc822/rfc822-utils.vala:255
-#, c-format
-msgid "On %s:"
-msgstr "%s:"
+#: src/engine/rfc822/rfc822-message.vala:1013
+msgid "(no subject)"
+msgstr "(без наслова)"
 
-#: ../src/engine/rfc822/rfc822-utils.vala:278
-msgid "---------- Forwarded message ----------"
-msgstr "---------- Прослеђена порука ----------"
+#: ui/accounts_editor_add_pane.ui:8 ui/accounts_editor_list_pane.ui:126
+#| msgid "Add account"
+msgid "Add an account"
+msgstr "Додајте налог"
+
+#: ui/accounts_editor_add_pane.ui:53
+msgid "_Create"
+msgstr "_Направи"
+
+#: ui/accounts_editor_add_pane.ui:131 ui/accounts_editor_servers_pane.ui:125
+msgid "Receiving"
+msgstr "Примање"
+
+#: ui/accounts_editor_add_pane.ui:179 ui/accounts_editor_servers_pane.ui:165
+#| msgid "Sending…"
+msgid "Sending"
+msgstr "Слање"
+
+#: ui/accounts_editor_edit_pane.ui:8
+#| msgid "Edit account"
+msgid "Edit Account"
+msgstr "Уредите налог"
+
+#: ui/accounts_editor_edit_pane.ui:9 ui/accounts_editor_servers_pane.ui:9
+#| msgid "Accounts"
+msgid "Account Name"
+msgstr "Име налога"
+
+#: ui/accounts_editor_edit_pane.ui:124
+#| msgid "Email address:"
+msgid "Email addresses"
+msgstr "Адресе е‑поште"
+
+#: ui/accounts_editor_edit_pane.ui:164
+msgid "Signature"
+msgstr "Потпис"
+
+#: ui/accounts_editor_edit_pane.ui:201
+#| msgid "SMTP settings"
+msgid "Settings"
+msgstr "Поставке"
 
-#: ../src/engine/rfc822/rfc822-utils.vala:282
-#, c-format
-msgid "From: %s\n"
-msgstr "Шаље: %s\n"
+#. This is a button in the account settings to show server settings.
+#: ui/accounts_editor_edit_pane.ui:243 ui/accounts_editor_servers_pane.ui:8
+#| msgid "SMTP settings"
+msgid "Server Settings"
+msgstr "Поставке сервера"
 
-#: ../src/engine/rfc822/rfc822-utils.vala:283
-#, c-format
-msgid "Subject: %s\n"
-msgstr "Наслов: %s\n"
+#. This is the remove account button in the account settings.
+#: ui/accounts_editor_edit_pane.ui:258 ui/accounts_editor_remove_pane.ui:23
+#| msgid "Remove account"
+msgid "Remove Account"
+msgstr "Уклони налог"
 
-#: ../src/engine/rfc822/rfc822-utils.vala:284
-#, c-format
-msgid "Date: %s\n"
-msgstr "Датум: %s\n"
+#: ui/accounts_editor_edit_pane.ui:262 ui/accounts_editor_remove_pane.ui:27
+#| msgid "Remove account"
+msgid "Remove this account from Geary"
+msgstr "Укллоните овај налог из Герија"
 
-#: ../src/engine/rfc822/rfc822-utils.vala:287
-#, c-format
-msgid "To: %s\n"
-msgstr "Прима: %s\n"
+#: ui/accounts_editor_list_pane.ui:8
+msgid "Accounts"
+msgstr "Налози"
 
-#: ../src/engine/rfc822/rfc822-utils.vala:290
-#, c-format
-msgid "Cc: %s\n"
-msgstr "Цц: %s\n"
+#: ui/accounts_editor_list_pane.ui:62
+msgid "To get started, select an email provider below."
+msgstr "Да започнете, испод изаберите достављача е-поште."
+
+#: ui/accounts_editor_list_pane.ui:75
+#| msgid "Welcome to Geary."
+msgid "Welcome to Geary"
+msgstr "Добро дошли у Гери"
 
-#: ../ui/account_cannot_remove.glade.h:1
-msgid "<span weight=\"bold\" size=\"larger\">Cannot remove account</span> "
-msgstr "<span weight=\"bold\" size=\"larger\">Не могу да уклоним налог</span> "
+#. This title is shown to users when confirming if they want to remove an account. The string substitution 
is replaced with the account's name.
+#: ui/accounts_editor_remove_pane.ui:73
+#, c-format
+msgid "Confirm removing: %s"
+msgstr "Потврдите уклањање: %s"
 
-#: ../ui/account_cannot_remove.glade.h:2
+#: ui/accounts_editor_remove_pane.ui:91
 msgid ""
-"A composer window associated with this account is currently open. Send or "
-"discard the message and try again."
+"Removing an account will remove it from Geary and delete locally cached "
+"email data from your computer, but not from your service provider."
 msgstr ""
-"Прозор састављача придружен овом налогу је тренутно отворен. Пошаљите или "
-"одбаците поруку и покушајте поново."
-
-#: ../ui/account_list.glade.h:1
-msgid "Add account"
-msgstr "Додај налог"
+"Уклањање налога ће га уклонити из Герија и обрисати локално сачуване податке "
+"е-поште са вашег рачунара, али не и са достављача услуге."
 
-#: ../ui/account_list.glade.h:2
-msgid "Edit account"
-msgstr "Уреди налог"
-
-#: ../ui/account_list.glade.h:3
+#: ui/accounts_editor_remove_pane.ui:122
 msgid "Remove account"
 msgstr "Уклони налог"
 
-#: ../ui/account_spinner.glade.h:1
-msgid "Please wait while Geary validates your account."
-msgstr "Сачекајте док Гери не потврди ваш налог."
+#: ui/accounts_editor_servers_pane.ui:47
+msgid "Apply"
+msgstr "Примени"
 
-#: ../ui/certificate_warning_dialog.glade.h:1
+#: ui/certificate_warning_dialog.glade:7
 msgid "Untrusted Connection"
 msgstr "Неповерљива веза"
 
-#: ../ui/certificate_warning_dialog.glade.h:2
+#: ui/certificate_warning_dialog.glade:29
 msgid "_Always Trust This Server"
 msgstr "_Увек веруј овом серверу"
 
-#: ../ui/certificate_warning_dialog.glade.h:3
+#: ui/certificate_warning_dialog.glade:43
 msgid "_Trust This Server"
 msgstr "_Веруј овом серверу"
 
-#: ../ui/certificate_warning_dialog.glade.h:4
+#: ui/certificate_warning_dialog.glade:57
 msgid "_Don’t Trust This Server"
 msgstr "_Не веруј овом серверу"
 
-#: ../ui/composer-headerbar.ui.h:1
-msgid "Detach (Ctrl+D)"
-msgstr "Откачи (Ктрл+D)"
-
-#: ../ui/composer-headerbar.ui.h:2
-msgid "Attach File (Ctrl+T)"
-msgstr "Приложи датотеку (Ктрл+T)"
-
-#: ../ui/composer-headerbar.ui.h:3
-msgid "Include Original Attachments"
-msgstr "Укључује изворне прилоге"
-
-#: ../ui/composer-headerbar.ui.h:4
-msgid "Send (Ctrl+Enter)"
-msgstr "Пошаљи (Ктрл+Унеси)"
-
-#: ../ui/composer-headerbar.ui.h:5
-msgid "_Send"
-msgstr "_Пошаљи"
-
-#: ../ui/composer-headerbar.ui.h:6
-msgid "Discard and Close"
-msgstr "Одбаци и затвори"
-
-#: ../ui/composer-headerbar.ui.h:7
-msgid "Save and Close"
-msgstr "Сачувај и затвори"
-
-#. 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 "Уметните нову везу са овом адресом"
+#: ui/composer-editor.ui:100
+#| msgctxt "shortcut window"
+#| msgid "Bold text"
+msgid "Bold text"
+msgstr "Подебљајте текст"
 
-#: ../ui/composer-link-popover.ui.h:3
-msgid "Link URL"
-msgstr "Адреса везе"
+#: ui/composer-editor.ui:124
+#| msgctxt "shortcut window"
+#| msgid "Italicize text"
+msgid "Italic text"
+msgstr "Искосите текст"
 
-#. 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 "Освежите ову адресу везе"
+#: ui/composer-editor.ui:148
+#| msgctxt "shortcut window"
+#| msgid "Underline text"
+msgid "Underline text"
+msgstr "Подвуците текст"
 
-#: ../ui/composer-link-popover.ui.h:6
-msgid "Delete this link"
-msgstr "Обришите ову везу"
+#: ui/composer-editor.ui:172
+#| msgctxt "shortcut window"
+#| msgid "Strike text"
+msgid "Strikethrough text"
+msgstr "Прецртајте текст"
 
-#: ../ui/composer-link-popover.ui.h:7
-msgid "Open this link"
-msgstr "Отворите ову везу"
+#: ui/composer-editor.ui:205
+#| msgctxt "shortcut window"
+#| msgid "Insert a link"
+msgid "Insert bulleted list"
+msgstr "Уметните тачкасти списак"
+
+#: ui/composer-editor.ui:229
+#| msgctxt "shortcut window"
+#| msgid "Insert a link"
+msgid "Insert numbered list"
+msgstr "Уметните бројевни списак"
+
+#: ui/composer-editor.ui:262
+#| msgctxt "shortcut window"
+#| msgid "Unquote text"
+msgid "Indent or quote text"
+msgstr "Увуците или цитирајте текст"
+
+#: ui/composer-editor.ui:286
+#| msgctxt "shortcut window"
+#| msgid "Unquote text"
+msgid "Un-indent or unquote text"
+msgstr "Поништите увулачење или цитирање текста"
+
+#: ui/composer-editor.ui:315
+#| msgctxt "shortcut window"
+#| msgid "Remove formatting"
+msgid "Remove text formatting"
+msgstr "Уклоните форматирање текста"
+
+#: ui/composer-editor.ui:334
+msgid "Change font type"
+msgstr "Измените врсту слова"
+
+#: ui/composer-editor.ui:349
+msgid "Sans Serif"
+msgstr "Безсерифни"
+
+#: ui/composer-editor.ui:360
+msgid "Serif"
+msgstr "Серифни"
+
+#: ui/composer-editor.ui:371
+msgid "Fixed Width"
+msgstr "Стална ширина"
+
+#: ui/composer-editor.ui:397
+msgid "Change font color"
+msgstr "Измените боју слова"
+
+#: ui/composer-editor.ui:412
+msgid "Change font size"
+msgstr "Измените величину слова"
+
+#: ui/composer-editor.ui:447
+#| msgid "Insert or update selection link (Ctrl+L)"
+msgid "Insert or update text link"
+msgstr "Уметните или освежите везу текста"
+
+#: ui/composer-editor.ui:471
+#| msgid "Insert an image (Ctrl+G)"
+msgid "Insert an image"
+msgstr "Уметните слику"
+
+#: ui/composer-editor.ui:513
+#| msgid "Undo last edit (Ctrl+Z)"
+msgid "Undo last edit"
+msgstr "Опозовите последње уређивање"
+
+#: ui/composer-editor.ui:537
+#| msgid "Undo last edit (Ctrl+Z)"
+msgid "Redo last edit"
+msgstr "Опозовите последње уређивање"
+
+#: ui/composer-editor.ui:566 ui/composer-editor.ui:591
+#| msgid "Attach File"
+msgid "Attach a file"
+msgstr "Приложите датотеку"
+
+#: ui/composer-editor.ui:615
+#| msgid "Include Original Attachments"
+msgid "Add original attachments"
+msgstr "Додајте изворне прилоге"
+
+#: ui/composer-editor.ui:660
+msgid "More options"
+msgstr "Још могућности"
+
+#: ui/composer-editor.ui:680
+msgid "Show formatting toolbar"
+msgstr "Прикажите траку алата форматирања"
+
+#: ui/composer-editor.ui:698
+msgid "Select spell checking languages"
+msgstr "Изаберите језике за проверу писања"
 
-#: ../ui/composer-menus.ui.h:1
+#: ui/composer-editor.ui:723
 msgid "S_ans Serif"
 msgstr "_Безсерифни"
 
-#: ../ui/composer-menus.ui.h:2
+#: ui/composer-editor.ui:728
 msgid "S_erif"
 msgstr "_Серифни"
 
-#: ../ui/composer-menus.ui.h:3
+#: ui/composer-editor.ui:733
 msgid "_Fixed Width"
 msgstr "_Стална ширина"
 
-#: ../ui/composer-menus.ui.h:4
+#: ui/composer-editor.ui:743
 msgid "_Small"
 msgstr "_Мали"
 
-#: ../ui/composer-menus.ui.h:5
+#: ui/composer-editor.ui:748
 msgid "_Medium"
 msgstr "_Средњи"
 
-#: ../ui/composer-menus.ui.h:6
+#: ui/composer-editor.ui:753
 msgid "Lar_ge"
 msgstr "_Велики"
 
-#: ../ui/composer-menus.ui.h:7
-msgid "C_olor"
-msgstr "_Боја"
-
-#: ../ui/composer-menus.ui.h:8
+#: ui/composer-editor.ui:763
 msgid "_Rich Text"
 msgstr "_Богат текст"
 
-#: ../ui/composer-menus.ui.h:9
-msgid "Show Extended Fields"
-msgstr "Прикажи проширена поља"
+#: ui/composer-editor.ui:768
+#| msgid "_Rich Text"
+msgid "_Plain Text"
+msgstr "_Обичан текст"
 
-#: ../ui/composer-menus.ui.h:10
+#: ui/composer-editor-menus.ui:8
 msgid "_Undo"
 msgstr "_Опозови"
 
-#: ../ui/composer-menus.ui.h:11
+#: ui/composer-editor-menus.ui:12
 msgid "_Redo"
 msgstr "_Понови"
 
-#: ../ui/composer-menus.ui.h:12
+#: ui/composer-editor-menus.ui:18 ui/composer-editor-menus.ui:36
 msgid "Cu_t"
 msgstr "_Исеци"
 
-#: ../ui/composer-menus.ui.h:13 ../ui/conversation-message-menus.ui.h:7
+#: ui/composer-editor-menus.ui:22 ui/composer-editor-menus.ui:40
+#: ui/conversation-message-menus.ui:37
 msgid "_Copy"
 msgstr "_Умножи"
 
-#: ../ui/composer-menus.ui.h:14
+#: ui/composer-editor-menus.ui:26 ui/composer-editor-menus.ui:44
 msgid "_Paste"
 msgstr "_Убаци"
 
-#: ../ui/composer-menus.ui.h:15
-msgctxt "Clipboard paste with rich text"
-msgid "Paste _With Formatting"
-msgstr "Убаци _форматиран текст"
+#: ui/composer-editor-menus.ui:30
+#| msgctxt "Clipboard paste with rich text"
+#| msgid "Paste _With Formatting"
+msgctxt "Clipboard paste as plain text"
+msgid "Paste _Without Formatting"
+msgstr "Убаци _без форматирања"
 
-#: ../ui/composer-menus.ui.h:16
+#: ui/composer-editor-menus.ui:50
 msgid "Select _All"
 msgstr "Изабери _све"
 
-#: ../ui/composer-menus.ui.h:17 ../ui/conversation-message-menus.ui.h:9
+#: ui/composer-editor-menus.ui:57 ui/conversation-message-menus.ui:43
 msgid "_Inspect…"
 msgstr "_Провери…"
 
+#: ui/composer-headerbar.ui:23 ui/composer-headerbar.ui:107
+#| msgctxt "shortcut window"
+#| msgid "Detach composer window"
+msgid "Detach the composer from the window"
+msgstr "Откачите састављача од прозора"
+
+#: ui/composer-headerbar.ui:135
+msgid "_Send"
+msgstr "_Пошаљи"
+
+#: ui/composer-headerbar.ui:162
+msgid "Discard and Close"
+msgstr "Одбаци и затвори"
+
+#: ui/composer-headerbar.ui:186
+msgid "Save and Close"
+msgstr "Сачувај и затвори"
+
+#. Note that this button and the Update button will never be shown at the same time to the user.
+#: ui/composer-link-popover.ui:42
+msgid "Insert the new link with this URL"
+msgstr "Уметните нову везу са овом адресом"
+
+#: ui/composer-link-popover.ui:43
+#| msgid "_Add"
+msgid "Add"
+msgstr "Додај"
+
+#: ui/composer-link-popover.ui:47
+msgid "Link URL"
+msgstr "Адреса везе"
+
+#. Note that this button and the Insert button will never be shown at the same time to the user.
+#: ui/composer-link-popover.ui:61
+msgid "Update this link’s URL"
+msgstr "Освежите ову адресу везе"
+
+#: ui/composer-link-popover.ui:62
+#| msgid "_Update"
+msgid "Update"
+msgstr "Освежи"
+
+#: ui/composer-link-popover.ui:75
+msgid "Delete this link"
+msgstr "Обришите ову везу"
+
+#. Geary account mail will be sent from
+#: ui/composer-widget.ui:61
+#| msgid "_From:"
+msgid "_From"
+msgstr "_Шаље"
+
 #. Address(es) e-mail is to be sent to
-#: ../ui/composer-widget.ui.h:2
+#: ui/composer-widget.ui:131
 msgid "_To"
 msgstr "_Прима"
 
-#: ../ui/composer-widget.ui.h:3
+#: ui/composer-widget.ui:159
+msgid "Show Cc, Bcc, and Reply-To fields"
+msgstr "Прикажите поља Цц, Бцц и Одговори"
+
+#: ui/composer-widget.ui:220
 msgid "_Cc"
 msgstr "_Цц"
 
-#: ../ui/composer-widget.ui.h:4
-msgid "_Subject"
-msgstr "_Наслов"
-
-#: ../ui/composer-widget.ui.h:5
+#: ui/composer-widget.ui:268
 msgid "_Bcc"
 msgstr "_Бцц"
 
-#: ../ui/composer-widget.ui.h:6
+#: ui/composer-widget.ui:316
 msgid "_Reply-To"
 msgstr "_Одговори"
 
-#. Geary account mail will be sent from
-#: ../ui/composer-widget.ui.h:8
-msgid "From"
-msgstr "Шаље"
+#: ui/composer-widget.ui:373
+msgid "_Subject"
+msgstr "_Наслов"
 
-#: ../ui/composer-widget.ui.h:9
+#: ui/composer-widget.ui:446
 msgid "Drop files here"
 msgstr "Овде превуците датотеке"
 
-#: ../ui/composer-widget.ui.h:10
+#: ui/composer-widget.ui:462
 msgid "To add them as attachments"
 msgstr "Да их додате као прилиге"
 
-#: ../ui/composer-widget.ui.h:11
-msgid "Undo last edit (Ctrl+Z)"
-msgstr "Опозови последње уређивање (Ктрл+Z)"
-
-#: ../ui/composer-widget.ui.h:12
-msgid "Redo last edit  (Ctrl+Shift+Z)"
-msgstr "Понови последње уређивање (Ктрл+Помак+Z)"
-
-#: ../ui/composer-widget.ui.h:13
-msgid "Bold (Ctrl+B)"
-msgstr "Подебљано (Ктрл+B)"
-
-#: ../ui/composer-widget.ui.h:14
-msgid "Italic (Ctrl+I)"
-msgstr "Искошено (Ктрл+I)"
-
-#: ../ui/composer-widget.ui.h:15
-msgid "Underline (Ctrl+U)"
-msgstr "Подвучено (Ктрл+U)"
-
-#: ../ui/composer-widget.ui.h:16
-msgid "Strikethrough (Ctrl+K)"
-msgstr "Прецртано (Ктрл+K)"
-
-#: ../ui/composer-widget.ui.h:17
-msgid "Quote text  (Ctrl+])"
-msgstr "Цитирај текст (Ктрл+])"
-
-#: ../ui/composer-widget.ui.h:18
-msgid "Unquote text  (Ctrl+[)"
-msgstr "Не цитирај текст (Ктрл+[)"
-
-#: ../ui/composer-widget.ui.h:19
-msgid "Insert or update selection link (Ctrl+L)"
-msgstr "Уметни или освежи везу избора (Ктрл+L)"
+#: ui/components-attachment-pane.ui:29 ui/components-attachment-pane.ui:47
+msgid "Select all attachments"
+msgstr "Изаберите све прилоге"
 
-#: ../ui/composer-widget.ui.h:20
-msgid "Insert an image (Ctrl+G)"
-msgstr "Уметните слику (Ктрл+G)"
+#: ui/components-attachment-pane.ui:66
+msgid "Save selected attachments"
+msgstr "Сачувајте изабране прилоге"
 
-#: ../ui/composer-widget.ui.h:21
-msgid "Remove selection formatting (Ctrl+Space)"
-msgstr "Уклоните форматирање избора (Ктрл+Размак)"
+#: ui/components-attachment-pane.ui:85
+msgid "Open selected attachments"
+msgstr "Отворите изабране прилоге"
 
-#: ../ui/composer-widget.ui.h:22
-msgid "Select spell checking languages"
-msgstr "Изаберите језике за проверу писања"
+#: ui/components-attachment-pane-menus.ui:17
+#| msgid "_Save All"
+msgid "Save _All"
+msgstr "_Сачувај све"
 
-#: ../ui/conversation-email.ui.h:1
+#: ui/components-inspector-error-view.ui:31
+msgid ""
+"If the problem is serious or persists, please save and send these details to "
+"one of the <a href=\"https://wiki.gnome.org/Apps/Geary/Contact\";>contact "
+"channels</a> or attach to a <a href=\"https://wiki.gnome.org/Apps/Geary/";
+"ReportingABug\">new bug report</a>."
+msgstr ""
+"Ако је ово озбиљан проблем или се понавља, сачувајте и пошаљите ове "
+"појединости на један од <a href=\"https://wiki.gnome.org/Apps/Geary/Contact\"";
+">канала за контакте</a> или га приложите уз <a href=\"https://wiki.gnome.org/";
+"Apps/Geary/ReportingABug\">нови извештај о грешци</a>."
+
+#: ui/components-inspector-error-view.ui:47
+msgid "Details:"
+msgstr "Детаљи:"
+
+#. Tooltip for inspector button
+#. Tooltip for problem report button
+#: ui/components-inspector.ui:19 ui/problem-details-dialog.ui:24
+#| msgid "Search for more languages"
+msgid "Search for matching log entries"
+msgstr "Потражи поклапајуће уносе дневника"
+
+#. Tooltip for inspector button
+#: ui/components-inspector.ui:35
+msgid "Toggle appending new log entries"
+msgstr "Окини прикачињање нових уноса дневника"
+
+#. Tooltip for inspector button
+#: ui/components-inspector.ui:55
+msgid "Add a marker entry to the log"
+msgstr "Додај унос ознаке у дневник"
+
+#. Tooltip for inspector button
+#. Tooltip for problem report button
+#: ui/components-inspector.ui:81 ui/problem-details-dialog.ui:51
+msgid "Save logs entries and details"
+msgstr "Сачувај уносе дневника и појединости"
+
+#. Tooltip for inspector button
+#. Tooltip for problem report button
+#: ui/components-inspector.ui:101 ui/problem-details-dialog.ui:67
+msgid "Copy to clipboard"
+msgstr "Умножи у оставу"
+
+#. Tooltip for inspector button
+#: ui/components-inspector.ui:121
+msgid "Clears all log entries"
+msgstr "Очисти све уносе дневника"
+
+#: ui/conversation-contact-popover.ui:146
+#| msgid "Move conversation"
+msgid "New Conversation…"
+msgstr "Нова преписка…"
+
+#: ui/conversation-contact-popover.ui:159
+#| msgid "Copy Email _Address"
+msgid "Copy Email Address"
+msgstr "Умножи адресу е-поште"
+
+#: ui/conversation-contact-popover.ui:182
+#| msgid "Save and Close"
+msgid "Save in Contacts…"
+msgstr "Сачувај у контактима…"
+
+#: ui/conversation-contact-popover.ui:195
+#| msgid "Move conversations"
+msgid "Show Conversations"
+msgstr "Прикажи преписке"
+
+#: ui/conversation-contact-popover.ui:208
+msgid "Open in Contacts"
+msgstr "Отвори у контактима"
+
+#: ui/conversation-contact-popover.ui:221
+msgid "Always Load Remote Images"
+msgstr "Увек учитај удаљене слике"
+
+#. Title label on contact popover
+#: ui/conversation-contact-popover.ui:264
+#| msgid "Remove email address"
+msgid "Deceptive email address"
+msgstr "Лажна адреса е-поште"
+
+#. Contact popover label
+#: ui/conversation-contact-popover.ui:294
+#| msgid "Email address:"
+msgid "This email address is:"
+msgstr "Ова адреса е-поште је:"
+
+#. Contact popover label
+#: ui/conversation-contact-popover.ui:319
+msgid "But was forged as:"
+msgstr "Али је саздана као:"
+
+#. Contact popover label
+#: ui/conversation-contact-popover.ui:344
+msgid "The sender may not be trustworthy"
+msgstr "Пошиљалац можда није од поверења"
+
+#: ui/conversation-email.ui:27
 msgid "Save all attachments"
 msgstr "Сачувај све прилоге"
 
 #. 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
+#: ui/conversation-email.ui:50
 msgid "Mark this message as starred"
 msgstr "Означите ову поруку започетом"
 
 #. 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
+#: ui/conversation-email.ui:72
 msgid "Mark this message as not starred"
 msgstr "Означите ову поруку не започетом"
 
-#: ../ui/conversation-email.ui.h:6
-msgid "Display the message menu"
-msgstr "Прикажите изборник поруке"
-
-#: ../ui/conversation-email.ui.h:7
-msgid "Open selected attachments"
-msgstr "Отворите изабране прилоге"
-
-#: ../ui/conversation-email.ui.h:8
-msgid "Save selected attachments"
-msgstr "Сачувајте изабране прилоге"
-
-#: ../ui/conversation-email.ui.h:9
-msgid "Select all attachments"
-msgstr "Изаберите све прилоге"
-
-#: ../ui/conversation-email.ui.h:10
-msgid "Edit Draft"
-msgstr "Уреди нацрт"
-
-#: ../ui/conversation-email.ui.h:11
-msgid "Draft message"
-msgstr "Порука нацрта"
-
-#: ../ui/conversation-email.ui.h:12
-msgid "This message has not yet been sent."
-msgstr "Ова порука још није послата."
-
-#: ../ui/conversation-email.ui.h:13
-msgid "Try Again"
-msgstr "Покушај опет"
-
-#: ../ui/conversation-email.ui.h:14
-msgid "Message not saved"
-msgstr "Порука није сачувана"
-
-#: ../ui/conversation-email.ui.h:15
-msgid "This message was sent, but has not been saved to your account."
-msgstr "Ова порука је послата, али није сачувана у вашем налогу."
-
-#: ../ui/conversation-email-menus.ui.h:2
+#. Translators: Menu item to reply to a specific message.
+#: ui/conversation-email-menus.ui:15
 msgid "Reply to _All"
 msgstr "Одговори _свима"
 
-#: ../ui/conversation-email-menus.ui.h:4
+#. Translators: Menu item to mark a specific message as
+#. read.
+#: ui/conversation-email-menus.ui:30
 msgid "_Mark Read"
 msgstr "_Означи као прочитано"
 
-#: ../ui/conversation-email-menus.ui.h:5
+#: ui/conversation-email-menus.ui:36
 msgid "_Mark Unread"
 msgstr "_Означи као непрочитано"
 
-#: ../ui/conversation-email-menus.ui.h:6
+#. Translators: Menu item to mark all messages in a
+#. conversation from this one as unread.
+#: ui/conversation-email-menus.ui:42
 msgid "Mark Unread From _Here"
 msgstr "Означи као непрочитано _одавде"
 
-#: ../ui/conversation-email-menus.ui.h:8
+#. Translators: Menu item to move a single, specific message
+#. to the trash folder
+#: ui/conversation-email-menus.ui:50
+#| msgctxt "shortcut window"
+#| msgid "Move to trash"
+msgid "Move message to _Trash"
+msgstr "Премести поруку у _смеће"
+
+#. Translators: Menu item to delete a single, specific message
+#: ui/conversation-email-menus.ui:57
+#| msgid "Select _Message"
+msgid "_Delete message…"
+msgstr "_Обриши поруку…"
+
+#. Translators: Menu item to view the source for a message
+#: ui/conversation-email-menus.ui:69
 msgid "_View Source"
 msgstr "_Погледај извор"
 
-#: ../ui/conversation-email-menus.ui.h:11
-msgid "_Save All"
-msgstr "_Сачувај све"
+#: ui/conversation-message-link-popover.ui:54
+msgid "But actually goes to:"
+msgstr "Али заправо води до:"
+
+#: ui/conversation-message-link-popover.ui:84
+msgid "The link appears to go to:"
+msgstr "Веза изгледа као да води до:"
+
+#: ui/conversation-message-link-popover.ui:96
+msgid "Deceptive link found"
+msgstr "Нађох обманљиву везу"
+
+#: ui/conversation-message-link-popover.ui:111
+msgid "The email sender may be leading you to the wrong web site."
+msgstr "Пошиљалац е-поште можда вас води на погрешан веб сајт."
+
+#: ui/conversation-message-link-popover.ui:124
+msgid "If unsure, contact the sender and ask before continuing."
+msgstr ""
+"Ако нисте сигурни, обратите се пошиљаоцу и питајте га пре него што наставите."
 
-#: ../ui/conversation-message-menus.ui.h:1
+#: ui/conversation-message-menus.ui:7
 msgid "_Open Link"
 msgstr "_Отвори везу"
 
-#: ../ui/conversation-message-menus.ui.h:2
+#: ui/conversation-message-menus.ui:11
 msgid "Copy Link _Address"
 msgstr "Умножи адресу _везе"
 
-#: ../ui/conversation-message-menus.ui.h:3
-msgid "Send New _Message…"
-msgstr "Пошаљи нову _поруку…"
+#: ui/conversation-message-menus.ui:17
+#| msgid "Move conversation"
+msgid "_New Conversation…"
+msgstr "_Нова преписка…"
 
-#: ../ui/conversation-message-menus.ui.h:4
+#: ui/conversation-message-menus.ui:21
 msgid "Copy Email _Address"
 msgstr "Умножи адресу _е-поште"
 
-#: ../ui/conversation-message-menus.ui.h:5
+#: ui/conversation-message-menus.ui:27
 msgid "Save _Image As…"
 msgstr "_Сачувај слику као…"
 
-#: ../ui/conversation-message-menus.ui.h:6
+#: ui/conversation-message-menus.ui:33
 msgid "_Select All"
 msgstr "Изабери _све"
 
-#: ../ui/conversation-message-menus.ui.h:8
-msgid "Search for messages from"
-msgstr "Потражи поруке из"
-
-#: ../ui/conversation-message.ui.h:1
+#: ui/conversation-message.ui:63
 msgid "From <email>"
 msgstr "Шаље <е-пошта>"
 
-#: ../ui/conversation-message.ui.h:2
+#: ui/conversation-message.ui:79 ui/conversation-message.ui:178
 msgid "1/1/1970\t"
 msgstr "1/1/1970\t"
 
-#: ../ui/conversation-message.ui.h:3
+#: ui/conversation-message.ui:102
 msgid "Preview body text."
 msgstr "Прикажи текст поруке."
 
-#: ../ui/conversation-message.ui.h:4
+#: ui/conversation-message.ui:202
 msgid "Sent by:"
 msgstr "Послао је:"
 
-#: ../ui/conversation-message.ui.h:5
+#: ui/conversation-message.ui:247
 msgid "Reply to:"
 msgstr "Одговор за:"
 
-#: ../ui/conversation-message.ui.h:6
+#: ui/conversation-message.ui:291
 msgid "Subject"
 msgstr "Наслов"
 
-#: ../ui/conversation-message.ui.h:7
-msgid "To:"
-msgstr "Прима:"
-
-#: ../ui/conversation-message.ui.h:8
-msgid "Cc:"
-msgstr "Цц:"
-
-#: ../ui/conversation-message.ui.h:9
-msgid "Bcc:"
-msgstr "Бцц:"
-
-#: ../ui/conversation-message.ui.h:10
-msgid "Show Images"
-msgstr "Прикажи слике"
-
-#: ../ui/conversation-message.ui.h:11
-msgid "Always Show From Sender"
-msgstr "Увек прикажи од овог пошиљаоца"
-
-#: ../ui/conversation-message.ui.h:12
-msgid "Remote images not shown"
-msgstr "Удаљене слике нису приказане"
-
-#: ../ui/conversation-message.ui.h:13
-msgid "Only show remote images from senders you trust."
-msgstr "Прикажите само слике пошиљалаца којима верујете."
-
-#: ../ui/conversation-message.ui.h:14
-msgid "But actually goes to:"
-msgstr "Али заправо води до:"
-
-#: ../ui/conversation-message.ui.h:15
-msgid "The link appears to go to:"
-msgstr "Веза изгледа као да води до:"
-
-#: ../ui/conversation-message.ui.h:16
-msgid "Deceptive link found"
-msgstr "Нађох обманљиву везу"
-
-#: ../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
+#: ui/conversation-viewer.ui:60
 msgid "Find in conversation"
-msgstr "Нађи у разговору"
+msgstr "Нађи у преписци"
 
-#: ../ui/conversation-viewer.ui.h:2
+#: ui/conversation-viewer.ui:75
 msgid "Find the previous occurrence of the search string."
 msgstr "Нађите претходно појављивање ниске претраге."
 
-#: ../ui/conversation-viewer.ui.h:3
+#: ui/conversation-viewer.ui:96
 msgid "Find the next occurrence of the search string."
 msgstr "Нађите следеће појављивање ниске претраге."
 
-#: ../ui/edit_alternate_emails.glade.h:1
-msgid "Remove email address"
-msgstr "Уклони адресе е-поште"
-
-#: ../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 "_Ажурирај"
-
-#: ../ui/find_bar.glade.h:1
+#: ui/find_bar.glade:66
 msgid "Find:"
 msgstr "Нађи:"
 
-#: ../ui/find_bar.glade.h:2
+#: ui/find_bar.glade:89
 msgid "_Previous"
 msgstr "_Претходна"
 
-#: ../ui/find_bar.glade.h:3
+#: ui/find_bar.glade:107
 msgid "_Next"
 msgstr "_Наредна"
 
-#: ../ui/find_bar.glade.h:4
-msgid "_Case sensitive"
-msgstr "Разликуј _велика слова"
+#: ui/find_bar.glade:125
+msgid "_Case sensitive"
+msgstr "Разликуј _велика слова"
+
+#: ui/find_bar.glade:145
+msgid "label"
+msgstr "натпис"
+
+#: ui/gtk/help-overlay.ui:9
+msgid "Conversation Shortcuts"
+msgstr "Пречице преписке"
+
+#: ui/gtk/help-overlay.ui:13 ui/gtk/help-overlay.ui:377
+msgctxt "shortcut window"
+msgid "Actions"
+msgstr "Радње"
+
+#: ui/gtk/help-overlay.ui:17
+#| msgid "Move conversation"
+msgctxt "shortcut window"
+msgid "New conversation"
+msgstr "Нова преписка"
+
+#: ui/gtk/help-overlay.ui:24
+#| msgctxt "shortcut window"
+#| msgid "Reply to sender "
+msgctxt "shortcut window"
+msgid "Reply to sender"
+msgstr "Одговори пошиљаоцу"
 
-#: ../ui/find_bar.glade.h:5
-msgid "label"
-msgstr "натпис"
+#: ui/gtk/help-overlay.ui:31 ui/gtk/help-overlay.ui:281
+msgctxt "shortcut window"
+msgid "Reply to all"
+msgstr "Одговори свима"
 
-#: ../ui/gtk/help-overlay.ui.h:1
-msgid "Conversation Shortcuts"
-msgstr "Пречице разговора"
+#: ui/gtk/help-overlay.ui:38 ui/gtk/help-overlay.ui:288
+msgctxt "shortcut window"
+msgid "Forward"
+msgstr "Проследи"
 
-#: ../ui/gtk/help-overlay.ui.h:2
+#: ui/gtk/help-overlay.ui:45 ui/gtk/help-overlay.ui:295
+#| msgctxt "shortcut window"
+#| msgid "Mark read"
 msgctxt "shortcut window"
-msgid "General"
-msgstr "Опште"
+msgid "Un-mark/mark read"
+msgstr "Одзначава/означава као прочитано"
 
-#: ../ui/gtk/help-overlay.ui.h:3
+#: ui/gtk/help-overlay.ui:52 ui/gtk/help-overlay.ui:302
 msgctxt "shortcut window"
-msgid "Move focus to the next/previous pane"
-msgstr "Пребаците фокус на следеће/претходно окно"
+msgid "Mark/un-mark starred"
+msgstr "Постави/уклони звездицу"
 
-#: ../ui/gtk/help-overlay.ui.h:4
+#: ui/gtk/help-overlay.ui:59 ui/gtk/help-overlay.ui:309
+#| msgid "Archive conversations (A)"
 msgctxt "shortcut window"
-msgid "Move focus to conversation list"
-msgstr "Пребаците фокус на списак разговора"
+msgid "Archive conversations"
+msgstr "Архивира преписке"
 
-#: ../ui/gtk/help-overlay.ui.h:5
+#: ui/gtk/help-overlay.ui:66 ui/gtk/help-overlay.ui:326
+#| msgid "Move conversations"
 msgctxt "shortcut window"
-msgid "Detach composer window"
-msgstr "Откачите прозор састављача"
+msgid "Move conversations"
+msgstr "Премешта преписке"
 
-#: ../ui/gtk/help-overlay.ui.h:6
+#: ui/gtk/help-overlay.ui:73 ui/gtk/help-overlay.ui:333
+#| msgctxt "shortcut window"
+#| msgid "Label the conversation"
 msgctxt "shortcut window"
-msgid "Close composer window"
-msgstr "Затворите прозор састављача"
+msgid "Label conversations"
+msgstr "Означава преписке"
 
-#: ../ui/gtk/help-overlay.ui.h:7
+#: ui/gtk/help-overlay.ui:80
+#| msgid "Mark conversations"
 msgctxt "shortcut window"
-msgid "Show keyboard shortcuts"
-msgstr "Прикажите пречице тастатуре"
+msgid "Trash conversations"
+msgstr "Избацује преписке"
 
-#: ../ui/gtk/help-overlay.ui.h:8
+#: ui/gtk/help-overlay.ui:87 ui/gtk/help-overlay.ui:340
+#| msgid "Mark conversations"
 msgctxt "shortcut window"
-msgid "Show help"
-msgstr "Прикажите помоћ"
+msgid "Junk conversations"
+msgstr "Преписке ђубре"
 
-#: ../ui/gtk/help-overlay.ui.h:9
+#: ui/gtk/help-overlay.ui:95 ui/gtk/help-overlay.ui:347
+#| msgid "Delete conversation"
 msgctxt "shortcut window"
-msgid "Quit the application"
-msgstr "Изађите из програма"
+msgid "Delete conversations"
+msgstr "Брише преписке"
 
-#: ../ui/gtk/help-overlay.ui.h:10
+#: ui/gtk/help-overlay.ui:104
 msgctxt "shortcut window"
 msgid "Search"
 msgstr "Тражите"
 
-#: ../ui/gtk/help-overlay.ui.h:11
+#: ui/gtk/help-overlay.ui:108
+#| msgid "Mark conversations"
 msgctxt "shortcut window"
-msgid "Jump to search box"
-msgstr "Скочите у поље претраге"
+msgid "Search for conversations"
+msgstr "Тражи преписке"
 
-#: ../ui/gtk/help-overlay.ui.h:12
+#: ui/gtk/help-overlay.ui:115 ui/gtk/help-overlay.ui:354
 msgctxt "shortcut window"
 msgid "Find in current conversation"
-msgstr "Нађите у текућем разговору"
+msgstr "Налази у текућој преписци"
 
-#: ../ui/gtk/help-overlay.ui.h:13
+#: ui/gtk/help-overlay.ui:141
+#| msgid "_Undo"
 msgctxt "shortcut window"
-msgid "Find next/previous in current conversation"
-msgstr "Нађите следеће/претходно у текућем разговору"
+msgid "Undo"
+msgstr "Опозива"
 
-#: ../ui/gtk/help-overlay.ui.h:14
+#: ui/gtk/help-overlay.ui:145
 msgctxt "shortcut window"
-msgid "Actions"
-msgstr "Радње"
+msgid "Undo the last action"
+msgstr "Опозива последњу радњу"
 
-#: ../ui/gtk/help-overlay.ui.h:15
+#: ui/gtk/help-overlay.ui:152
 msgctxt "shortcut window"
-msgid "Compose a new message"
-msgstr "Саставите нову поруку"
+msgid "Redo the last action"
+msgstr "Враћа последњу радњу"
 
-#: ../ui/gtk/help-overlay.ui.h:16
+#: ui/gtk/help-overlay.ui:161
 msgctxt "shortcut window"
-msgid "Reply to sender "
-msgstr "Одговорите пошиљаоцу "
+msgid "View"
+msgstr "Прегледајте"
 
-#: ../ui/gtk/help-overlay.ui.h:17
+#: ui/gtk/help-overlay.ui:165
 msgctxt "shortcut window"
-msgid "Reply to all"
-msgstr "Одговори свима"
+msgid "Zoom in"
+msgstr "Увећајте"
 
-#: ../ui/gtk/help-overlay.ui.h:18
+#: ui/gtk/help-overlay.ui:172
 msgctxt "shortcut window"
-msgid "Forward"
-msgstr "Проследи"
+msgid "Zoom out"
+msgstr "Умањите"
 
-#: ../ui/gtk/help-overlay.ui.h:19
+#: ui/gtk/help-overlay.ui:179
 msgctxt "shortcut window"
-msgid "Archive"
-msgstr "Архива"
+msgid "Reset zoom"
+msgstr "Повратите увеличање"
+
+#: ui/gtk/help-overlay.ui:188 ui/gtk/help-overlay.ui:404
+msgctxt "shortcut window"
+msgid "General"
+msgstr "Опште"
 
-#: ../ui/gtk/help-overlay.ui.h:20
+#: ui/gtk/help-overlay.ui:192
 msgctxt "shortcut window"
-msgid "Move to trash"
-msgstr "Преместите у смеће"
+msgid "Show help"
+msgstr "Прикажите помоћ"
 
-#: ../ui/gtk/help-overlay.ui.h:21
+#: ui/gtk/help-overlay.ui:199
 msgctxt "shortcut window"
-msgid "Toggle spam"
-msgstr "Окините ђубре"
+msgid "Show keyboard shortcuts"
+msgstr "Прикажите пречице тастатуре"
 
-#: ../ui/gtk/help-overlay.ui.h:22
+#: ui/gtk/help-overlay.ui:206
+#| msgid "Use %s to open a new composer window"
 msgctxt "shortcut window"
-msgid "Move the conversation"
-msgstr "Преместите разговор"
+msgid "Open a new window"
+msgstr "Отвара нови прозор"
 
-#: ../ui/gtk/help-overlay.ui.h:23
+#: ui/gtk/help-overlay.ui:213
+#| msgctxt "shortcut window"
+#| msgid "Close composer window"
 msgctxt "shortcut window"
-msgid "Label the conversation"
-msgstr "Означите разговор"
+msgid "Close the current window"
+msgstr "Затвара текући прозор"
 
-#: ../ui/gtk/help-overlay.ui.h:24
+#: ui/gtk/help-overlay.ui:220
 msgctxt "shortcut window"
-msgid "Mark read"
-msgstr "Означи као прочитано"
+msgid "Quit the application"
+msgstr "Изађите из програма"
 
-#: ../ui/gtk/help-overlay.ui.h:25
+#: ui/gtk/help-overlay.ui:229
 msgctxt "shortcut window"
-msgid "Mark unread"
-msgstr "Означи као непрочитано"
+msgid "Keyboard navigation"
+msgstr "Навигација тастатуром"
 
-#: ../ui/gtk/help-overlay.ui.h:26
+#: ui/gtk/help-overlay.ui:233
+#| msgctxt "shortcut window"
+#| msgid "Move focus to the next/previous pane"
 msgctxt "shortcut window"
-msgid "View"
-msgstr "Прегледајте"
+msgid "Go to next/previous pane"
+msgstr "Иде на следеће/претходно окно"
 
-#: ../ui/gtk/help-overlay.ui.h:27
+#: ui/gtk/help-overlay.ui:241
+#| msgctxt "shortcut window"
+#| msgid "Find next/previous in current conversation"
 msgctxt "shortcut window"
-msgid "Zoom in"
-msgstr "Увећајте"
+msgid "Select next/previous conversation"
+msgstr "Бира следећу/претходну преписку"
 
-#: ../ui/gtk/help-overlay.ui.h:28
+#: ui/gtk/help-overlay.ui:248
+#| msgctxt "shortcut window"
+#| msgid "Move focus to the next/previous pane"
 msgctxt "shortcut window"
-msgid "Zoom out"
-msgstr "Умањите"
+msgid "Focus next/previous message"
+msgstr "Фокусира следећу/претходну поруку"
 
-#: ../ui/gtk/help-overlay.ui.h:29
+#: ui/gtk/help-overlay.ui:260
+#| msgctxt "shortcut window"
+#| msgid "Additional Shortcuts"
+msgid "Single-key Shortcuts"
+msgstr "Пречице једног тастера"
+
+#: ui/gtk/help-overlay.ui:265
 msgctxt "shortcut window"
-msgid "Reset zoom"
-msgstr "Повратите увеличање"
+msgid "Single-key shortcuts (if enabled)"
+msgstr "Пречице једног тастера (ако су укључене)"
+
+#: ui/gtk/help-overlay.ui:274
+msgctxt "shortcut window"
+msgid "Reply to sender "
+msgstr "Одговорите пошиљаоцу "
 
-#: ../ui/gtk/help-overlay.ui.h:30
+#: ui/gtk/help-overlay.ui:361
+#| msgctxt "shortcut window"
+#| msgid "Find next/previous in current conversation"
 msgctxt "shortcut window"
-msgid "Additional Shortcuts"
-msgstr "Додатне пречице"
+msgid "Select next/previous conversations"
+msgstr "Бира следеће/претходне преписке"
+
+#: ui/gtk/help-overlay.ui:373
+msgid "Composer Shortcuts"
+msgstr "Пречице састављача"
 
-#: ../ui/gtk/help-overlay.ui.h:31
+#: ui/gtk/help-overlay.ui:381
 msgctxt "shortcut window"
-msgid "Star"
-msgstr "Додајте звездицу"
+msgid "Send"
+msgstr "Пошаљите"
 
-#: ../ui/gtk/help-overlay.ui.h:32
+#: ui/gtk/help-overlay.ui:388
 msgctxt "shortcut window"
-msgid "Unstar"
-msgstr "Уклоните звездицу"
+msgid "Add attachment"
+msgstr "Додајте прилог"
 
-#: ../ui/gtk/help-overlay.ui.h:33
+#: ui/gtk/help-overlay.ui:395
+#| msgctxt "shortcut window"
+#| msgid "Detach composer window"
 msgctxt "shortcut window"
-msgid "Delete"
-msgstr "Обришите"
+msgid "Detach the composer"
+msgstr "Откачиње састављача"
 
-#: ../ui/gtk/help-overlay.ui.h:34
+#: ui/gtk/help-overlay.ui:408
 msgctxt "shortcut window"
-msgid "Jump to next (older) conversation"
-msgstr "Скочите на следећи (старији) разговор"
+msgid "Close composer window"
+msgstr "Затворите прозор састављача"
 
-#: ../ui/gtk/help-overlay.ui.h:35
+#: ui/gtk/help-overlay.ui:415
 msgctxt "shortcut window"
-msgid "Jump to previous (newer) conversation"
-msgstr "Скочите на претходни (новији) разговор"
+msgid "Detach composer window"
+msgstr "Откачите прозор састављача"
 
-#: ../ui/gtk/help-overlay.ui.h:36
-msgid "Composer Shortcuts"
-msgstr "Пречице састављача"
+#: ui/gtk/help-overlay.ui:422
+#| msgid "Edit"
+msgctxt "shortcut window"
+msgid "Editing"
+msgstr "Уређивање"
+
+#: ui/gtk/help-overlay.ui:427
+msgctxt "shortcut window"
+msgid "Move selection to the clipboard"
+msgstr "Премешта избор у оставу"
+
+#: ui/gtk/help-overlay.ui:434
+msgctxt "shortcut window"
+msgid "Copy selection to clipboard"
+msgstr "Умножава избор у оставу"
+
+#: ui/gtk/help-overlay.ui:441
+msgctxt "shortcut window"
+msgid "Paste from the clipboard"
+msgstr "Убацује из оставе"
 
-#: ../ui/gtk/help-overlay.ui.h:37
+#: ui/gtk/help-overlay.ui:448
 msgctxt "shortcut window"
 msgid "Quote text"
 msgstr "Цитирајте текст"
 
-#: ../ui/gtk/help-overlay.ui.h:38
+#: ui/gtk/help-overlay.ui:455
 msgctxt "shortcut window"
 msgid "Unquote text"
 msgstr "Поништите цитат текста"
 
-#: ../ui/gtk/help-overlay.ui.h:39
-msgctxt "shortcut window"
-msgid "Send"
-msgstr "Пошаљите"
-
-#: ../ui/gtk/help-overlay.ui.h:40
+#: ui/gtk/help-overlay.ui:464
+#| msgctxt "shortcut window"
+#| msgid "Rich text mode"
 msgctxt "shortcut window"
-msgid "Add attachment"
-msgstr "Додајте прилог"
+msgid "Rich text editing"
+msgstr "Уређивање богатог текста"
 
-#: ../ui/gtk/help-overlay.ui.h:41
+#: ui/gtk/help-overlay.ui:468
+#| msgctxt "Clipboard paste with rich text"
+#| msgid "Paste _With Formatting"
 msgctxt "shortcut window"
-msgid "Rich text mode"
-msgstr "Обогатите текст"
+msgid "Paste without formatting"
+msgstr "Убацује без форматирања"
 
-#: ../ui/gtk/help-overlay.ui.h:42
+#: ui/gtk/help-overlay.ui:475
 msgctxt "shortcut window"
 msgid "Bold text"
 msgstr "Подебљајте текст"
 
-#: ../ui/gtk/help-overlay.ui.h:43
+#: ui/gtk/help-overlay.ui:482
 msgctxt "shortcut window"
 msgid "Italicize text"
 msgstr "Искосите текст"
 
-#: ../ui/gtk/help-overlay.ui.h:44
+#: ui/gtk/help-overlay.ui:489
 msgctxt "shortcut window"
 msgid "Underline text"
 msgstr "Подвуците текст"
 
-#: ../ui/gtk/help-overlay.ui.h:45
+#: ui/gtk/help-overlay.ui:496
 msgctxt "shortcut window"
 msgid "Strike text"
 msgstr "Прецртајте текст"
 
-#: ../ui/gtk/help-overlay.ui.h:46
+#: ui/gtk/help-overlay.ui:503
+msgctxt "shortcut window"
+msgid "Remove formatting"
+msgstr "Уклоните форматирање"
+
+#: ui/gtk/help-overlay.ui:510
+#| msgid "Insert an image (Ctrl+G)"
+msgctxt "shortcut window"
+msgid "Insert an image"
+msgstr "Умеће слику"
+
+#: ui/gtk/help-overlay.ui:517
 msgctxt "shortcut window"
 msgid "Insert a link"
 msgstr "Уметните везу"
 
-#: ../ui/gtk/help-overlay.ui.h:47
-msgctxt "shortcut window"
-msgid "Remove formatting"
-msgstr "Уклоните форматирање"
+#: ui/main-toolbar.ui:24
+#| msgid "Compose Message"
+msgctxt "tooltip"
+msgid "Compose Message"
+msgstr "Састављање поруке"
+
+#: ui/main-toolbar.ui:62
+msgid "Toggle search bar"
+msgstr "Приказ траке за претрагу"
+
+#: ui/main-toolbar.ui:114
+#| msgid "_Reply"
+msgid "Reply"
+msgstr "Одговори"
+
+#: ui/main-toolbar.ui:137
+#| msgid "R_eply All"
+msgid "Reply All"
+msgstr "Одговори свима"
+
+#: ui/main-toolbar.ui:160
+#| msgctxt "shortcut window"
+#| msgid "Forward"
+msgid "Forward"
+msgstr "Проследи"
+
+#: ui/main-toolbar.ui:265
+msgid "Toggle find bar"
+msgstr "Приказ траке за претрагу"
+
+#: ui/main-toolbar.ui:286
+msgid "_Archive"
+msgstr "_Архивирај"
 
-#: ../ui/gtk/menus.ui.h:2
-msgid "A_ccounts"
+#: ui/main-toolbar-menus.ui:21
+#| msgctxt "shortcut window"
+#| msgid "Toggle spam"
+msgid "Toggle as _Junk"
+msgstr "Означи као _ђубре"
+
+#: ui/main-toolbar-menus.ui:28
+#| msgid "Accounts"
+msgid "_Accounts"
 msgstr "_Налози"
 
-#: ../ui/gtk/menus.ui.h:4
+#: ui/main-toolbar-menus.ui:36
 msgid "_Keyboard Shortcuts"
 msgstr "_Пречице тастатуре"
 
-#: ../ui/login.glade.h:1
-msgid "email example com"
-msgstr "e-pošta primer com"
+#: ui/main-toolbar-menus.ui:47
+#| msgid "_About"
+msgid "_About Geary"
+msgstr "_О Герију"
 
-#: ../ui/login.glade.h:2 ../ui/password-dialog.glade.h:3
-msgid "Password"
-msgstr "Лозинка"
+#: ui/password-dialog.glade:74
+msgid "SMTP Credentials"
+msgstr "СМТП уверења"
+
+#: ui/password-dialog.glade:91
+msgid "Username"
+msgstr "Корисник"
 
-#: ../ui/login.glade.h:3
-msgid "E_mail address"
-msgstr "Адресе _е-поште"
+#: ui/password-dialog.glade:152
+msgid "_Remember password"
+msgstr "_Запамти лозинку"
 
-#: ../ui/login.glade.h:4
-msgid "_Password"
-msgstr "_Лозинка"
+#: ui/password-dialog.glade:210
+msgid "_Authenticate"
+msgstr "_Потврди идентитет"
 
-#: ../ui/login.glade.h:5
-msgid "S_ervice"
-msgstr "_Услуга"
+#: ui/upgrade_dialog.glade:60
+msgid "Geary update in progress…"
+msgstr "Ажурирање Герија је у току…"
 
-#: ../ui/login.glade.h:6
-msgid "N_ame"
-msgstr "_Име и презиме"
+#~ msgid "Geary Email"
+#~ msgstr "Геријева е-пошта"
 
-#: ../ui/login.glade.h:8
-msgid "N_ickname"
-msgstr "_Назив налога"
+#~ msgid "Mail Client"
+#~ msgstr "Програм за е-пошту"
 
-#: ../ui/login.glade.h:9
-msgid "Work, Home, etc."
-msgstr "Посао, кућа, итд."
+#~ msgid "Geary Mail"
+#~ msgstr "Геријева пошта"
 
-#: ../ui/login.glade.h:10
-msgid "_Save sent mail"
-msgstr "_Сачувај послату пошту"
+#~ msgid "Additional addresses for %s"
+#~ msgstr "Додатне адресе за %s"
 
-#: ../ui/login.glade.h:11
-msgid "Addi_tional email addresses…"
-msgstr "_Додатне адресе за е-пошту…"
+#~ msgid "First Last"
+#~ msgstr "Име и презиме"
 
-#: ../ui/login.glade.h:12
-msgid "IMAP settings"
-msgstr "Подешавања за ИМАП"
+#~ msgid "Enter your account information to get started."
+#~ msgstr "Унесите податке вашег налога за почетак."
 
-#: ../ui/login.glade.h:13
-msgid "Se_rver"
-msgstr "Се_рвер"
+#~ msgid "Preview"
+#~ msgstr "Преглед"
 
-#: ../ui/login.glade.h:14
-msgid "imap.example.com"
-msgstr "imap.primer.com"
+#~ msgid "Remem_ber passwords"
+#~ msgstr "_Запамти лозинке"
 
-#: ../ui/login.glade.h:15
-msgid "P_ort"
-msgstr "_Порт"
+#~ msgid "Remem_ber password"
+#~ msgstr "_Запамти лозинку"
 
-#: ../ui/login.glade.h:16
-msgid "smtp.example.com"
-msgstr "smtp.primer.com"
+#~ msgid "Unable to validate:\n"
+#~ msgstr "Не могу да потврдим:\n"
 
-#: ../ui/login.glade.h:17
-msgid "Ser_ver"
-msgstr "Сер_вер"
+#~ msgid "        • Invalid account nickname.\n"
+#~ msgstr "        • Неисправан надимак налога.\n"
 
-#: ../ui/login.glade.h:18
-msgid "Por_t"
-msgstr "При_кључник"
+#~ msgid "        • Email address already added to Geary.\n"
+#~ msgstr "        • Адреса е-поште је већ додата у Гери.\n"
 
-#: ../ui/login.glade.h:19
-msgid "SMTP settings"
-msgstr "Подешавања за СМТП"
+#~ msgid "        • IMAP connection error.\n"
+#~ msgstr "        • Грешка ИМАП везе.\n"
 
-#: ../ui/login.glade.h:20
-msgid "User_name"
-msgstr "_Корисник"
+#~ msgid "        • IMAP username or password incorrect.\n"
+#~ msgstr "        • Нетачно корисничко име или лозинка ИМАП-а.\n"
 
-#: ../ui/login.glade.h:21
-msgid "Pass_word"
-msgstr "_Лозинка"
+#~ msgid "        • SMTP connection error.\n"
+#~ msgstr "        • Грешка СМТП везе.\n"
 
-#: ../ui/login.glade.h:22
-msgid "SMTP username"
-msgstr "СМТП корисничко име"
+#~ msgid "        • SMTP username or password incorrect.\n"
+#~ msgstr "        • Нетачно корисничко име или лозинка СМТП-а.\n"
 
-#: ../ui/login.glade.h:23
-msgid "SMTP password"
-msgstr "СМТП лозинка"
+#~ msgid "        • Connection error.\n"
+#~ msgstr "        • Грешка везе.\n"
 
-#: ../ui/login.glade.h:24
-msgid "_Username"
-msgstr "_Корисник"
+#~ msgid "        • Username or password incorrect.\n"
+#~ msgstr "        • Нетачно корисничко име или лозинка.\n"
 
-#: ../ui/login.glade.h:25
-msgid "IMAP username"
-msgstr "ИМАП корисничко име"
+#~ msgid "Output debugging information"
+#~ msgstr "Испиши податке за уклањање грешака"
 
-#: ../ui/login.glade.h:26
-msgid "IMAP password"
-msgstr "ИМАП лозинка"
+#~ msgid "Log network serialization"
+#~ msgstr "Бележи серијализацију мреже"
 
-#: ../ui/login.glade.h:27
-msgid "Encr_yption"
-msgstr "Ши_фровање"
+#~ msgid "Log periodic activity"
+#~ msgstr "Бележи повремену активност"
 
-#: ../ui/login.glade.h:28
-msgid "Encrypt_ion"
-msgstr "Шифро_вање"
+#~ msgid "Allow inspection of WebView"
+#~ msgstr "Допушта прегледање Веб прегледа"
 
-#: ../ui/login.glade.h:30
-msgid "SSL/TLS"
-msgstr "ССЛ/ТЛС"
+#~ msgid "Please report comments, suggestions and bugs to:"
+#~ msgstr "Напомене, предлоге и грешке шаљите на:"
 
-#: ../ui/login.glade.h:31
-msgid "STARTTLS"
-msgstr "СТАРТТЛС"
+#~ msgid "Failed to parse command line options: %s\n"
+#~ msgstr "Не могу да обрадим опцију линије наредби: %s\n"
 
-#: ../ui/login.glade.h:32
-msgid "No authentication re_quired"
-msgstr "Није _потребно потврђивање идентитета"
+#~ msgid "Delete conversation (Shift+Delete)"
+#~ msgstr "Обриши разговор (Помак+Обриши)"
 
-#: ../ui/login.glade.h:33
-msgid "Use IMAP cre_dentials"
-msgstr "Користи ИМАП _уверења"
+#~ msgid "Delete conversations (Shift+Delete)"
+#~ msgstr "Обриши разговоре (Помак+Обриши)"
 
-#: ../ui/login.glade.h:34
-msgid "Composer"
-msgstr "Састављач"
+#~ msgid "Move conversation to Trash (Delete, Backspace)"
+#~ msgstr "Премести разговор у смеће (Обриши, Повратница)"
 
-#: ../ui/login.glade.h:35
-msgid "Save dra_fts on server"
-msgstr "Сачувај _нацрте на серверу"
+#~ msgid "Move conversations to Trash (Delete, Backspace)"
+#~ msgstr "Премести разговоре у смеће (Обриши, Повратница)"
 
-#: ../ui/login.glade.h:36
-msgid "Si_gn emails (HTML allowed):"
-msgstr "По_тпиши е-поруке (дозвољен је ХТМЛ):"
+#~ msgid "Mark as S_pam"
+#~ msgstr "Означи као _непожељно"
 
-#: ../ui/login.glade.h:37
-msgid "Storage"
-msgstr "Складиште"
+#~ msgid "Mark as not S_pam"
+#~ msgstr "Означи да није _непожељно"
 
-#: ../ui/login.glade.h:38
-msgid "_Download mail"
-msgstr "_Преузми пошту"
+#~ msgid "Add label to conversations"
+#~ msgstr "Додај натпис разговорима"
 
-#: ../ui/main-toolbar.ui.h:1
-msgid "Empty Spam or Trash folders"
-msgstr "Испразни фасцикле с непожељном поштом или отпад"
+#~ msgid "_Mark as…"
+#~ msgstr "_Означи као…"
 
-#: ../ui/password-dialog.glade.h:1
-msgid "SMTP Credentials"
-msgstr "СМТП уверења"
+#~ msgid "Add label"
+#~ msgstr "Додај натпис"
 
-#: ../ui/password-dialog.glade.h:2
-msgid "Username"
-msgstr "Корисник"
+#~ msgid "_Label"
+#~ msgstr "_Натпис"
 
-#: ../ui/password-dialog.glade.h:4
-msgid "_Remember password"
-msgstr "_Запамти лозинку"
+#~ msgid "_Move"
+#~ msgstr "_Премести"
 
-#: ../ui/password-dialog.glade.h:6
-msgid "_Authenticate"
-msgstr "_Потврди идентитет"
+#~ msgid "Compose new message (Ctrl+N, N)"
+#~ msgstr "Саставите нову поруку (Ктрл+N, N)"
 
-#: ../ui/preferences-dialog.ui.h:1
-msgid "Reading"
-msgstr "Читање"
+#~ msgid "Reply (Ctrl+R, R)"
+#~ msgstr "Одговорите (Ктрл+R, R)"
 
-#: ../ui/preferences-dialog.ui.h:2
-msgid "_Automatically select next message"
-msgstr "_Сам изабери следећу поруку"
+#~ msgid "Reply all (Ctrl+Shift+R, Shift+R)"
+#~ msgstr "Одговорите свима (Ктрл+Shift+R, Shift+R)"
 
-#: ../ui/preferences-dialog.ui.h:3
-msgid "_Display conversation preview"
-msgstr "_Прикажи преглед разговора"
+#~ msgid "Forward (Ctrl+L, F)"
+#~ msgstr "Проследите (Ктрл+L, F)"
 
-#: ../ui/preferences-dialog.ui.h:4
-msgid "Use _three pane view"
-msgstr "Приказ у _три површи"
+#~ msgid "Empty _Spam…"
+#~ msgstr "Испразни _непожељно…"
 
-#: ../ui/preferences-dialog.ui.h:5
-msgid "Notifications"
-msgstr "Обавештења"
+#~ msgid "Empty _Trash…"
+#~ msgstr "Испразни _отпад…"
 
-#: ../ui/preferences-dialog.ui.h:6
-msgid "_Play notification sounds"
-msgstr "_Пусти звуке обавештења"
+#~ msgid "Unable to store server trust exception"
+#~ msgstr "Не могу да сачувам изузетак поверења сервера"
 
-#: ../ui/preferences-dialog.ui.h:7
-msgid "Show _notifications for new mail"
-msgstr "Прикажи _обавештења за нову пошту"
+#~ msgid "Your settings are insecure"
+#~ msgstr "Ваша подешавања нису безбедна"
 
-#: ../ui/preferences-dialog.ui.h:8
-msgid "Always _watch for new mail"
-msgstr "Увек _ослушкуј за нове поруке"
+#~ 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 ""
+#~ "Подешавања ИМАП и/или СМТП налога не користе ССЛ или ТЛС.  То значи да "
+#~ "ваше корисничко име и лозинку може да прочита неко други на мрежи.  Да ли "
+#~ "сигурно желите да наставите?"
 
-#: ../ui/preferences-dialog.ui.h:9
-msgid "Geary will run in the background and notify of new mail"
-msgstr "Гери ће радити у позадини и слати обавештења када дође нова е-порука"
+#~ msgid "Co_ntinue"
+#~ msgstr "_Настави"
 
-#: ../ui/preferences-dialog.ui.h:10
-msgid "Preferences"
-msgstr "Поставке"
+#~ msgid "Error connecting to the server"
+#~ msgstr "Грешка повезивања на сервер"
 
-#: ../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\">Да ли сигурно желите да уклоните овај "
-"налог?</span> "
+#~ msgid ""
+#~ "Geary encountered an error while connecting to the server.  Please try "
+#~ "again in a few moments."
+#~ msgstr ""
+#~ "Гери је наишао на грешку приликом повезивања на сервер. Покушајте опет за "
+#~ "неколико тренутака."
 
-#: ../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 ""
-"Сва е-пошта придружена овом налогу ће бити уклоњена с вашег рачунара. Ово "
-"неће утицати на пошту која се налази на серверу."
+#~ msgid ""
+#~ "Geary encountered an error sending an email.  If the problem persists, "
+#~ "please manually delete the email from your Outbox folder."
+#~ msgstr ""
+#~ "Гери је наишао на грешку приликом слања е-поште.  Ако се проблем понови, "
+#~ "ручно избришите е-пошту из фасцикле „За слање“."
 
-#: ../ui/remove_confirm.glade.h:3
-msgid "Nickname:"
-msgstr "Надимак:"
+#~ 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 ""
+#~ "Гери је наишао на грешку приликом чувања поруке у „Послато“.  Порука ће "
+#~ "остати у вашој фасцикли „За слање“ све док је не избришете."
 
-#: ../ui/remove_confirm.glade.h:4
-msgid "Email address:"
-msgstr "Адресе е-поште:"
+#~ msgid "Unable to open local mailbox for %s"
+#~ msgstr "Не могу да отворим локално сандуче за „%s“"
 
-#: ../ui/upgrade_dialog.glade.h:1
-msgid "Geary update in progress…"
-msgstr "Ажурирање Герија је у току…"
+#~ msgid ""
+#~ "There was an error opening the local mail database for this account. This "
+#~ "is possibly due to a file permissions problem.\n"
+#~ "\n"
+#~ "Please check that you have read/write permissions for all files in this "
+#~ "directory:\n"
+#~ "\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Дошло је до грешке приликом отварања локалне базе поште за овај налог. "
+#~ "Вероватно постоји проблем са овлашћењима за приступ датотеци.\n"
+#~ "\n"
+#~ "Проверите да ли имате дозволе читања/писања за све датотеке у овом "
+#~ "директоријуму:\n"
+#~ "\n"
+#~ "%s"
+
+#~ msgid ""
+#~ "The version number of the local mail database is formatted for a newer "
+#~ "version of Geary. Unfortunately, the database cannot be “rolled back” to "
+#~ "work with this version of Geary.\n"
+#~ "\n"
+#~ "Please install the latest version of Geary and try again."
+#~ msgstr ""
+#~ "Број издања локане базе поште је обликован за новије издање Герија. "
+#~ "Нажалост, база података не може бити „враћена назад“ да би радила са овим "
+#~ "издањем.\n"
+#~ "\n"
+#~ "Инсталирајте најновије издање Герија и покушајте поново."
+
+#~ msgid ""
+#~ "There was an error opening the local account. This is probably due to "
+#~ "connectivity issues.\n"
+#~ "\n"
+#~ "Please check your network connection and restart Geary."
+#~ msgstr ""
+#~ "Дошло је до грешке приликом отварања локалног налога. Вероватно постоји "
+#~ "проблем са мрежном везом.\n"
+#~ "\n"
+#~ "Проверите вашу мрежу и поново покрените Герија."
+
+#~ msgid "Undo move (Ctrl+Z)"
+#~ msgstr "Опозови (Ктрл+Z)"
+
+#~ msgid "Close open draft messages?"
+#~ msgstr "Да затворим отворене поруке с нацртима?"
+
+#~ msgid "Error emptying %s"
+#~ msgstr "Грешка приликом пражњења „%s“"
+
+#~ msgid "Undo archive (Ctrl+Z)"
+#~ msgstr "Опозови архивирање (Ктрл+Z)"
+
+#~ msgid "Undo trash (Ctrl+Z)"
+#~ msgstr "Опозови брисање (Ктрл+Z)"
+
+#~ msgid "Undo (Ctrl+Z)"
+#~ msgstr "Опозови (Ктрл+Z)"
+
+#~ msgid "Failed to open default text editor."
+#~ msgstr "Не могу да отворим подразумевани уредник текста."
+
+#~ msgid "Indexing %s account"
+#~ msgstr "Пописујем налог „%s“"
+
+#~ msgid "To: "
+#~ msgstr "Прима: "
+
+#~ msgid "Cc: "
+#~ msgstr "Цц: "
+
+#~ msgid "Bcc: "
+#~ msgstr "Бцц: "
+
+#~ msgid "Geary will exit if you have no other open email accounts."
+#~ msgstr "Гери ће изаћи ако немате других отворених налога е-поште."
+
+#~ msgid "Open"
+#~ msgstr "Отвори"
+
+#~ msgctxt "Default clock format"
+#~ msgid "%l:%M %P"
+#~ msgstr "%l:%M %P"
+
+#~ msgid "%x"
+#~ msgstr "%x"
+
+#~ msgid "Other"
+#~ msgstr "Друга"
+
+#~ msgid "IMAP"
+#~ msgstr "ИМАП"
+
+#~ msgid "SMTP"
+#~ msgstr "СМТП"
+
+#~ msgid "Sent Mail"
+#~ msgstr "Послата пошта"
+
+#~ msgid "Spam"
+#~ msgstr "Непожељна"
+
+#~ msgid "From: %s\n"
+#~ msgstr "Шаље: %s\n"
+
+#~ msgid "Subject: %s\n"
+#~ msgstr "Наслов: %s\n"
+
+#~ msgid "Date: %s\n"
+#~ msgstr "Датум: %s\n"
+
+#~ msgid "To: %s\n"
+#~ msgstr "Прима: %s\n"
+
+#~ msgid "Cc: %s\n"
+#~ msgstr "Цц: %s\n"
+
+#~ msgid "<span weight=\"bold\" size=\"larger\">Cannot remove account</span> "
+#~ msgstr ""
+#~ "<span weight=\"bold\" size=\"larger\">Не могу да уклоним налог</span> "
+
+#~ msgid ""
+#~ "A composer window associated with this account is currently open. Send or "
+#~ "discard the message and try again."
+#~ msgstr ""
+#~ "Прозор састављача придружен овом налогу је тренутно отворен. Пошаљите или "
+#~ "одбаците поруку и покушајте поново."
+
+#~ msgid "Please wait while Geary validates your account."
+#~ msgstr "Сачекајте док Гери не потврди ваш налог."
+
+#~ msgid "Detach (Ctrl+D)"
+#~ msgstr "Откачи (Ктрл+D)"
+
+#~ msgid "Attach File (Ctrl+T)"
+#~ msgstr "Приложи датотеку (Ктрл+T)"
+
+#~ msgid "Send (Ctrl+Enter)"
+#~ msgstr "Пошаљи (Ктрл+Унеси)"
+
+#~ msgid "Open this link"
+#~ msgstr "Отворите ову везу"
+
+#~ msgid "C_olor"
+#~ msgstr "_Боја"
+
+#~ msgid "Show Extended Fields"
+#~ msgstr "Прикажи проширена поља"
+
+#~ msgid "From"
+#~ msgstr "Шаље"
+
+#~ msgid "Redo last edit  (Ctrl+Shift+Z)"
+#~ msgstr "Понови последње уређивање (Ктрл+Помак+Z)"
+
+#~ msgid "Bold (Ctrl+B)"
+#~ msgstr "Подебљано (Ктрл+B)"
+
+#~ msgid "Italic (Ctrl+I)"
+#~ msgstr "Искошено (Ктрл+I)"
+
+#~ msgid "Underline (Ctrl+U)"
+#~ msgstr "Подвучено (Ктрл+U)"
+
+#~ msgid "Strikethrough (Ctrl+K)"
+#~ msgstr "Прецртано (Ктрл+K)"
+
+#~ msgid "Quote text  (Ctrl+])"
+#~ msgstr "Цитирај текст (Ктрл+])"
+
+#~ msgid "Unquote text  (Ctrl+[)"
+#~ msgstr "Не цитирај текст (Ктрл+[)"
+
+#~ msgid "Remove selection formatting (Ctrl+Space)"
+#~ msgstr "Уклоните форматирање избора (Ктрл+Размак)"
+
+#~ msgid "Display the message menu"
+#~ msgstr "Прикажите изборник поруке"
+
+#~ msgid "Edit Draft"
+#~ msgstr "Уреди нацрт"
+
+#~ msgid "Try Again"
+#~ msgstr "Покушај опет"
+
+#~ msgid "Send New _Message…"
+#~ msgstr "Пошаљи нову _поруку…"
+
+#~ msgid "Search for messages from"
+#~ msgstr "Потражи поруке из"
+
+#~ msgid ""
+#~ "Some email services require additional addresses be configured on the "
+#~ "server.  Contact your email provider for more information."
+#~ msgstr ""
+#~ "Неки сервиси за е-пошту захтевају подешавање додатне адресе на серверу.  "
+#~ "Контактирајте издавача услуге за вашу е-пошту како би добили више "
+#~ "података."
+
+#~ msgctxt "shortcut window"
+#~ msgid "Jump to search box"
+#~ msgstr "Скочите у поље претраге"
+
+#~ msgctxt "shortcut window"
+#~ msgid "Compose a new message"
+#~ msgstr "Саставите нову поруку"
+
+#~ msgctxt "shortcut window"
+#~ msgid "Archive"
+#~ msgstr "Архива"
+
+#~ msgctxt "shortcut window"
+#~ msgid "Move the conversation"
+#~ msgstr "Преместите разговор"
+
+#~ msgctxt "shortcut window"
+#~ msgid "Mark unread"
+#~ msgstr "Означи као непрочитано"
+
+#~ msgctxt "shortcut window"
+#~ msgid "Unstar"
+#~ msgstr "Уклоните звездицу"
+
+#~ msgctxt "shortcut window"
+#~ msgid "Delete"
+#~ msgstr "Обришите"
+
+#~ msgctxt "shortcut window"
+#~ msgid "Jump to next (older) conversation"
+#~ msgstr "Скочите на следећи (старији) разговор"
+
+#~ msgctxt "shortcut window"
+#~ msgid "Jump to previous (newer) conversation"
+#~ msgstr "Скочите на претходни (новији) разговор"
+
+#~ msgid "A_ccounts"
+#~ msgstr "_Налози"
+
+#~ msgid "E_mail address"
+#~ msgstr "Адресе _е-поште"
+
+#~ msgid "_Password"
+#~ msgstr "_Лозинка"
+
+#~ msgid "S_ervice"
+#~ msgstr "_Услуга"
+
+#~ msgid "N_ame"
+#~ msgstr "_Име и презиме"
+
+#~ msgid "N_ickname"
+#~ msgstr "_Назив налога"
+
+#~ msgid "Work, Home, etc."
+#~ msgstr "Посао, кућа, итд."
+
+#~ msgid "Addi_tional email addresses…"
+#~ msgstr "_Додатне адресе за е-пошту…"
+
+#~ msgid "IMAP settings"
+#~ msgstr "Подешавања за ИМАП"
+
+#~ msgid "Se_rver"
+#~ msgstr "Се_рвер"
+
+#~ msgid "P_ort"
+#~ msgstr "_Порт"
+
+#~ msgid "Ser_ver"
+#~ msgstr "Сер_вер"
+
+#~ msgid "Por_t"
+#~ msgstr "При_кључник"
+
+#~ msgid "User_name"
+#~ msgstr "_Корисник"
+
+#~ msgid "Pass_word"
+#~ msgstr "_Лозинка"
+
+#~ msgid "SMTP password"
+#~ msgstr "СМТП лозинка"
+
+#~ msgid "_Username"
+#~ msgstr "_Корисник"
+
+#~ msgid "IMAP password"
+#~ msgstr "ИМАП лозинка"
+
+#~ msgid "Encr_yption"
+#~ msgstr "Ши_фровање"
+
+#~ msgid "Encrypt_ion"
+#~ msgstr "Шифро_вање"
+
+#~ msgid "STARTTLS"
+#~ msgstr "СТАРТТЛС"
+
+#~ msgid "No authentication re_quired"
+#~ msgstr "Није _потребно потврђивање идентитета"
+
+#~ msgid "Use IMAP cre_dentials"
+#~ msgstr "Користи ИМАП _уверења"
+
+#~ msgid "Composer"
+#~ msgstr "Састављач"
+
+#~ msgid "Si_gn emails (HTML allowed):"
+#~ msgstr "По_тпиши е-поруке (дозвољен је ХТМЛ):"
+
+#~ msgid "Storage"
+#~ msgstr "Складиште"
+
+#~ msgid "Empty Spam or Trash folders"
+#~ msgstr "Испразни фасцикле с непожељном поштом или отпад"
+
+#~ msgid "Reading"
+#~ msgstr "Читање"
+
+#~ msgid "Notifications"
+#~ msgstr "Обавештења"
+
+#~ msgid "_Play notification sounds"
+#~ msgstr "_Пусти звуке обавештења"
+
+#~ msgid "Geary will run in the background and notify of new mail"
+#~ msgstr ""
+#~ "Гери ће радити у позадини и слати обавештења када дође нова е-порука"
+
+#~ msgid ""
+#~ "<span weight=\"bold\" size=\"larger\">Are you sure you want to remove "
+#~ "this account?</span> "
+#~ msgstr ""
+#~ "<span weight=\"bold\" size=\"larger\">Да ли сигурно желите да уклоните "
+#~ "овај налог?</span> "
+
+#~ msgid ""
+#~ "All email associated with this account will be removed from your "
+#~ "computer. This will not affect email on the server."
+#~ msgstr ""
+#~ "Сва е-пошта придружена овом налогу ће бити уклоњена с вашег рачунара. Ово "
+#~ "неће утицати на пошту која се налази на серверу."
+
+#~ msgid "Nickname:"
+#~ msgstr "Надимак:"
 
 #~ msgid "none"
 #~ msgstr "ништа"
 
-#~ msgid "Empty"
-#~ msgstr "Испразни"
-
 #~ msgid "%i match"
 #~ msgid_plural "%i matches"
 #~ msgstr[0] "%i резултат"
@@ -2678,30 +4499,15 @@ msgstr "Ажурирање Герија је у току…"
 #~ msgstr[2] "%i резултата (умотано)"
 #~ msgstr[3] "%i резултат (умотано)"
 
-#~ msgid "not found"
-#~ msgstr "није нађено"
-
 #~ msgid "No search results found."
 #~ msgstr "Нема резултата претраге."
 
-#~ msgid "From:"
-#~ msgstr "Шаље:"
-
-#~ msgid "Date:"
-#~ msgstr "Датум:"
-
 #~ msgid "Copy _Link"
 #~ msgstr "Умножи _везу"
 
-#~ msgid "Select _Message"
-#~ msgstr "Изабери _поруку"
-
 #~ msgid " (Invalid?)"
 #~ msgstr " (Неисправно?)"
 
-#~ msgid "_Save As..."
-#~ msgstr "_Сачувај као..."
-
 #~ msgid "Save A_ttachment..."
 #~ msgid_plural "Save All A_ttachments..."
 #~ msgstr[0] "Сачувај _прилог..."
@@ -2724,9 +4530,6 @@ msgstr "Ажурирање Герија је у току…"
 #~ msgid "Link (Ctrl+L)"
 #~ msgstr "Веза (Ctrl+L)"
 
-#~ msgid "More options"
-#~ msgstr "Још могућности"
-
 #~ msgctxt "Label"
 #~ msgid "Close and Save"
 #~ msgstr "Затвори и сачувај"
@@ -2760,24 +4563,9 @@ msgstr "Ажурирање Герија је у току…"
 #~ msgid "Small"
 #~ msgstr "Мали"
 
-#~ msgid "Sans Serif"
-#~ msgstr "Безсерифни"
-
-#~ msgid "Serif"
-#~ msgstr "Серифни"
-
-#~ msgid "Fixed Width"
-#~ msgstr "Стална ширина"
-
-#~ msgid "Detach"
-#~ msgstr "Откачи"
-
 #~ msgid "_Attach File"
 #~ msgstr "_Приложи датотеку"
 
-#~ msgid "Attach File"
-#~ msgstr "Прилаже датотеку"
-
 #~ msgid "_Include Original Attachments"
 #~ msgstr "_Укључи изворне прилоге"
 
@@ -2805,9 +4593,6 @@ msgstr "Ажурирање Герија је у току…"
 #~ msgid "Do you want to discard the unsaved message?"
 #~ msgstr "Да ли желите да одбаците несачувану поруку?"
 
-#~ msgid "Notify of new mail at start_up"
-#~ msgstr "Обавести о _новој пошти при покретању"
-
 #~ msgid "Please enter your password"
 #~ msgstr "Молим унесите вашу лизинку"