--- a/mail/chrome/messenger/addons.properties
+++ b/mail/chrome/messenger/addons.properties
@@ -30,16 +30,21 @@ xpinstallDisabledButton.accesskey=O
 
 # LOCALIZATION NOTE (addonInstallBlockedByPolicy)
 # This message is shown when the installation of an add-on is blocked by
 # enterprise policy. %1$S is replaced by the name of the add-on.
 # %2$S is replaced by the ID of add-on. %3$S is a custom message that
 # the administration can add to the message.
 addonInstallBlockedByPolicy=Vaš sistemski skrbnik je zavrnil %1$S (%2$S). %3$S
 
+# LOCALIZATION NOTE (addonDomainBlockedByPolicy)
+# This message is shown when the installation of add-ons from a domain
+# is blocked by enterprise policy.
+addonDomainBlockedByPolicy=Skrbnik vašega sistema je tej strani preprečil vprašati, ali lahko na vaš računalnik namesti programsko opremo.
+
 # LOCALIZATION NOTE (addonPostInstall.message2)
 # %S is replaced with the localized named of the extension that was
 # just installed.
 addonPostInstall.message2=Razširitev %S je dodana
 
 # LOCALIZATION NOTE (addonDownloadingAndVerifying):
 # Semicolon-separated list of plural forms. See:
 # http://developer.mozilla.org/en/docs/Localization_and_Plurals
@@ -180,16 +185,17 @@ webextPerms.description.experiment=popoln, neomejen dostop do %Sa in vašega računalnika
 webextPerms.description.find=branje besedila vseh odprtih zavihkov
 webextPerms.description.geolocation=dostop do vaše lokacije
 webextPerms.description.history=dostop do zgodovine brskanja
 webextPerms.description.management=spremljanje rabe razširitev in upravljanje tem
 webextPerms.description.messagesModify=branje in spreminjanje e-poštnih sporočil, ko se prikazujejo
 webextPerms.description.messagesMove2=kopiranje ali premikanje e-poštnih sporočil (vključno s premikanjem v smetnjak)
 webextPerms.description.messagesDelete=trajno brisanje e-poštnih sporočil
 webextPerms.description.messagesRead=branje e-poštnih sporočil in njihovo označevanje
+webextPerms.description.messagesTags=ustvarjanje, spreminjanje in brisanje oznak sporočil
 # LOCALIZATION NOTE (webextPerms.description.nativeMessaging)
 # %S will be replaced with the name of the application
 webextPerms.description.nativeMessaging=izmenjevanje sporočil z vsemi programi, razen %S
 webextPerms.description.notifications=prikazovanje obvestil
 webextPerms.description.pkcs11=zagotavljanje kriptografskih storitev za overjanje
 webextPerms.description.privacy=branje in spreminjanje nastavitev zasebnosti
 webextPerms.description.proxy=nadzor nad nastavitvami posrednika
 webextPerms.description.sessions=dostop do nedavno zaprtih zavihkov

--- a/mail/messenger/accountManager.ftl
+++ b/mail/messenger/accountManager.ftl
@@ -1,12 +1,14 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 open-preferences-sidebar-button2 = Nastavitve { -brand-short-name(sklon: "rodilnik") }
-
 open-addons-sidebar-button = Dodatki in teme
-
 account-action-add-newsgroup-account =
     .label = Dodaj račun za novičarsko skupino …
     .accesskey = č
-
+server-change-restart-required = Za uveljavitev spremembe imena strežnika ali uporabniškega imena je potreben ponovni zagon.
+edit-vcard-dialog-accept-button = Shrani
+    .accesskey = S
+edit-vcard-dialog-cancel-button = Prekliči
+    .accesskey = k

--- a/mail/messenger/addressbook/aboutAddressBook.ftl
+++ b/mail/messenger/addressbook/aboutAddressBook.ftl
@@ -17,32 +17,30 @@ about-addressbook-toolbar-new-contact =
 about-addressbook-toolbar-new-list =
     .label = Nov seznam
 about-addressbook-toolbar-import =
     .label = Uvozi
 
 ## Books
 
 all-address-books = Vsi imeniki
-
 about-addressbook-books-context-properties =
     .label = Lastnosti
 about-addressbook-books-context-synchronize =
     .label = Sinhroniziraj
 about-addressbook-books-context-print =
     .label = Natisni …
 about-addressbook-books-context-export =
     .label = Izvozi …
 about-addressbook-books-context-delete =
     .label = Izbriši
 about-addressbook-books-context-remove =
     .label = Odstrani
 about-addressbook-books-context-startup-default =
     .label = Privzeta zagonska mapa
-
 about-addressbook-confirm-delete-book-title = Izbriši imenik
 # Variables:
 # $name (String) - Name of the address book to be deleted.
 about-addressbook-confirm-delete-book = Ali res želite izbrisati imenik { $name } in vse stike v njem?
 about-addressbook-confirm-remove-remote-book-title = Odstrani imenik
 # Variables:
 # $name (String) - Name of the remote address book to be removed.
 about-addressbook-confirm-remove-remote-book = Ali res želite odstraniti imenik { $name }?
@@ -50,39 +48,34 @@ about-addressbook-confirm-remove-remote-book = Ali res želite odstraniti imenik { $name }?
 ## Cards
 
 # Variables:
 # $name (String) - Name of the address book that will be searched.
 about-addressbook-search =
     .placeholder = Išči v imeniku { $name }
 about-addressbook-search-all =
     .placeholder = Išči v vseh imenikih
-
 about-addressbook-sort-button =
     .title = Spremeni vrstni red seznama
-
 about-addressbook-name-format-display =
     .label = Prikazno ime
 about-addressbook-name-format-firstlast =
     .label = Ime Priimek
 about-addressbook-name-format-lastfirst =
     .label = Priimek, Ime
-
 about-addressbook-sort-name-ascending =
     .label = Razvrsti po imenu (A > Ž)
 about-addressbook-sort-name-descending =
     .label = Razvrsti po imenu (Ž > A)
 about-addressbook-sort-email-ascending =
     .label = Razvrsti po e-poštnem naslovu (A > Ž)
 about-addressbook-sort-email-descending =
     .label = Razvrsti po e-poštnem naslovu (Ž > A)
-
 about-addressbook-cards-context-write =
     .label = Sestavi
-
 about-addressbook-confirm-delete-mixed-title = Izbriši stike in sezname
 # Variables:
 # $count (Number) - The number of contacts and lists to be deleted. Always greater than 1.
 about-addressbook-confirm-delete-mixed = Ali res želite izbrisati izbranih { $count } stikov in seznamov?
 # Variables:
 # $count (Number) - The number of lists to be deleted.
 about-addressbook-confirm-delete-lists-title =
     { $count ->
@@ -138,32 +131,38 @@ about-addressbook-confirm-delete-contact
         [one] Ali res želite izbrisati stik { $name }?
         [two] Ali res želite izbrisati izbrana stika?
         [few] Ali res želite izbrisati izbrane { $count } stike?
        *[other] Ali res želite izbrisati izbranih { $count } stikov?
     }
 
 ## Details
 
+about-addressbook-write-action-button = Piši
+about-addressbook-event-action-button = Dogodek
+about-addressbook-search-action-button = Išči
 about-addressbook-begin-edit-contact-button = Uredi
 about-addressbook-delete-edit-contact-button = Izbriši
 about-addressbook-cancel-edit-contact-button = Prekliči
 about-addressbook-save-edit-contact-button = Shrani
-
 about-addressbook-details-email-addresses-header = E-poštni naslovi
 about-addressbook-details-phone-numbers-header = Telefonske številke
 about-addressbook-details-home-address-header = Domači naslov
 about-addressbook-details-work-address-header = Službeni naslov
 about-addressbook-details-other-info-header = Drugi podatki
-
+about-addressbook-entry-name-birthday = Rojstni dan
+about-addressbook-entry-name-anniversary = Obletnica
+about-addressbook-entry-name-department = Oddelek
+about-addressbook-entry-name-organization = Organizacija
+about-addressbook-entry-name-website = Spletno mesto
+about-addressbook-entry-name-time-zone = Časovni pas
 about-addressbook-unsaved-changes-prompt-title = Neshranjene spremembe
 about-addressbook-unsaved-changes-prompt = Ali želite shraniti spremembe, preden zapustite pogled za urejanje?
 
 # Photo dialog
 
 about-addressbook-photo-drop-target = Tukaj spustite ali prilepite fotografijo ali kliknite za izbiro datoteke.
 about-addressbook-photo-drop-loading = Nalaganje fotografije …
 about-addressbook-photo-drop-error = Fotografije ni bilo mogoče naložiti.
 about-addressbook-photo-filepicker-title = Izberi slikovno datoteko
-
 about-addressbook-photo-discard = Zavrzi obstoječo fotografijo
 about-addressbook-photo-cancel = Prekliči
 about-addressbook-photo-save = Shrani

new file mode 100644
--- /dev/null
+++ b/mail/messenger/addressbook/vcard.ftl
@@ -0,0 +1,20 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, you can obtain one at http://mozilla.org/MPL/2.0/.
+
+
+# Fieldsets
+
+vcard-fieldset-name = Ime
+
+# N VCard Field
+
+vcard-n-firstname = Ime
+vcard-n-add-firstname =
+    .title = Dodaj ime
+vcard-n-middlename = Drugo ime
+vcard-n-add-middlename =
+    .title = Dodaj drugo ime
+vcard-n-lastname = Priimek
+vcard-n-add-lastname =
+    .title = Dodaj priimek

new file mode 100644
--- /dev/null
+++ b/mail/messenger/appmenu.ftl
@@ -0,0 +1,17 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+
+## View / Layout
+
+appmenu-font-size-value = Velikost pisave
+appmenuitem-font-size-enlarge =
+    .tooltiptext = Povečaj velikost pisave
+appmenuitem-font-size-reduce =
+    .tooltiptext = Zmanjšajte velikost pisave
+# Variables:
+# $size (String) - The current font size.
+appmenuitem-font-size-reset =
+    .label = { $size } pik
+    .tooltiptext = Ponastavi velikost pisave

--- a/mail/messenger/menubar.ftl
+++ b/mail/messenger/menubar.ftl
@@ -6,31 +6,28 @@ toolbar-context-menu-menu-bar =
     .toolbarname = Vrstica z menijem
     .accesskey = m
 
 ## Tools Menu
 
 menu-tools-settings =
     .label = Nastavitve
     .accesskey = t
-
 menu-addons-and-themes =
     .label = Dodatki in teme
     .accesskey = D
 
 ## Help Menu
 
 menu-help-enter-troubleshoot-mode =
     .label = Način za odpravljanje težav …
     .accesskey = r
-
 menu-help-exit-troubleshoot-mode =
     .label = Izključi način za odpravljanje težav
     .accesskey = I
-
 menu-help-more-troubleshooting-info =
     .label = Več podatkov za odpravljanje težav
     .accesskey = V
 
 ## Mail Toolbar
 
 toolbar-junk-button =
     .label = Neželeno
@@ -48,32 +45,40 @@ toolbar-undelete-button =
 ## View
 
 menu-view-repair-text-encoding =
     .label = Popravi kodiranje besedila
     .accesskey = r
 
 ## View / Layout
 
+menu-font-size-label =
+    .label = Velikost pisave
+    .accesskey = o
+menuitem-font-size-enlarge =
+    .label = Povečaj velikost pisave
+    .accesskey = v
+menuitem-font-size-reduce =
+    .label = Zmanjšaj velikost pisave
+    .accesskey = m
+menuitem-font-size-reset =
+    .label = Ponastavi velikost pisave
+    .accesskey = n
 mail-uidensity-label =
     .label = Gostota
     .accesskey = G
-
 mail-uidensity-compact =
     .label = Strnjeno
     .accesskey = S
-
 mail-uidensity-normal =
     .label = Običajno
     .accesskey = O
-
 mail-uidensity-touch =
     .label = Dotik
     .accesskey = D
-
 menu-spaces-toolbar-button =
     .label = Vrstica komponent
     .accesskey = k
 
 ## File
 
 file-new-newsgroup-account =
     .label = Račun za novičarsko skupino …

--- a/mail/messenger/messenger.ftl
+++ b/mail/messenger/messenger.ftl
@@ -8,173 +8,145 @@
 messenger-window-minimize-button =
     .tooltiptext = Pomanjšaj
 messenger-window-maximize-button =
     .tooltiptext = Povečaj
 messenger-window-restore-down-button =
     .tooltiptext = Obnovi navzdol
 messenger-window-close-button =
     .tooltiptext = Zapri
-
 # Variables:
 # $count (Number) - Number of unread messages.
 unread-messages-os-tooltip =
     { $count ->
         [one] 1 neprebrano sporočilo
         [two] { $count } neprebrani sporočili
         [few] { $count } neprebrana sporočila
        *[other] { $count } neprebranih sporočil
     }
-
 about-rights-notification-text = { -brand-short-name } je brezplačen in odprtokoden program, ki ga ustvarja skupnost tisočev prostovoljcev z vsega sveta.
 
 ## Content tabs
 
 content-tab-page-loading-icon =
     .alt = Stran se nalaga
 content-tab-security-high-icon =
     .alt = Povezava je varna
 content-tab-security-broken-icon =
     .alt = Povezava ni zavarovana
 
 ## Toolbar
 
 addons-and-themes-toolbarbutton =
     .label = Dodatki in teme
     .tooltiptext = Upravljanje dodatkov
-
 quick-filter-toolbarbutton =
     .label = Hitri filter
     .tooltiptext = Filtriraj sporočila
-
 redirect-msg-button =
     .label = Preusmeri
     .tooltiptext = Preusmeri izbrano sporočilo
 
 ## Folder Pane
 
 folder-pane-toolbar =
     .toolbarname = Orodna vrstica podokna map
     .accesskey = O
-
 folder-pane-toolbar-options-button =
     .tooltiptext = Možnosti podokna map
-
 folder-pane-header-label = Mape
 
 ## Folder Toolbar Header Popup
 
 folder-toolbar-hide-toolbar-toolbarbutton =
     .label = Skrij orodno vrstico
     .accesskey = S
-
 show-all-folders-label =
     .label = Vse mape
     .accesskey = V
-
 show-unread-folders-label =
     .label = Neprebrane mape
     .accesskey = N
-
 show-favorite-folders-label =
     .label = Priljubljene mape
     .accesskey = P
-
 show-smart-folders-label =
     .label = Poenotene mape
     .accesskey = e
-
 show-recent-folders-label =
     .label = Nedavne mape
     .accesskey = d
-
 folder-toolbar-toggle-folder-compact-view =
     .label = Zgoščen pogled
     .accesskey = Z
 
 ## Menu
 
 redirect-msg-menuitem =
     .label = Preusmeri
     .accesskey = u
-
 menu-file-save-as-file =
     .label = Datoteko …
     .accesskey = D
 
 ## AppMenu
 
 appmenu-save-as-file =
     .label = Datoteko …
-
 appmenu-settings =
     .label = Nastavitve
-
 appmenu-addons-and-themes =
     .label = Dodatki in teme
-
 appmenu-help-enter-troubleshoot-mode =
     .label = Način za odpravljanje težav …
-
 appmenu-help-exit-troubleshoot-mode =
     .label = Izključi način za odpravljanje težav
-
 appmenu-help-more-troubleshooting-info =
     .label = Več podatkov za odpravljanje težav
-
 appmenu-redirect-msg =
     .label = Preusmeri
 
 ## Context menu
 
 context-menu-redirect-msg =
     .label = Preusmeri
-
 mail-context-delete-messages =
     .label =
         { $count ->
             [one] Izbriši sporočilo
             [two] Izbriši izbrani sporočili
             [few] Izbriši izbrana sporočila
            *[other] Izbriši izbrana sporočila
         }
-
 context-menu-decrypt-to-folder =
     .label = Kopiraj v nešifrirani obliki v
     .accesskey = f
 
 ## Message header pane
 
 other-action-redirect-msg =
     .label = Preusmeri
-
 message-header-msg-flagged =
     .title = Označeno z zvezdico
     .aria-label = Označeno z zvezdico
-
 message-header-msg-not-flagged =
     .title = Sporočilo, ki ni označeno z zvezdico
 
 ## Message header cutomize panel
 
 message-header-customize-panel-title = Nastavitve glav sporočil
-
 message-header-customize-button-style =
     .value = Slog gumbov
     .accesskey = g
-
 message-header-button-style-default =
     .label = Ikone in besedilo
-
 message-header-button-style-text =
     .label = Besedilo
-
 message-header-button-style-icons =
     .label = Ikone
-
 message-header-large-subject =
     .label = Velika zadeva
     .accesskey = z
 
 ## Action Button Context Menu
 
 toolbar-context-menu-manage-extension =
     .label = Upravljaj razširitev
@@ -182,32 +154,29 @@ toolbar-context-menu-manage-extension =
 toolbar-context-menu-remove-extension =
     .label = Odstrani razširitev
     .accesskey = s
 
 ## Message headers
 
 message-header-address-in-address-book-icon =
     .alt = Naslov je v imeniku
-
 message-header-address-not-in-address-book-icon =
     .alt = Naslova ni v imeniku
 
 ## Add-on removal warning
 
 # Variables:
 #  $name (String): The name of the addon that will be removed.
 addon-removal-title = Odstranim { $name }?
 addon-removal-confirmation-button = Odstrani
 addon-removal-confirmation-message = Odstranim { $name } skupaj z njegovimi nastavitvami in podatki iz { -brand-short-name(sklon: "rodilnik") }
-
 caret-browsing-prompt-title = Brskanje s kazalko
 caret-browsing-prompt-text = Tipka F7 vključi ali izključi brskanje s kazalko. Ta možnost na nekatero vsebino postavi premični kazalec, ki vam omogoča izbiro besedila s tipkovnico. Ali želite vključiti brskanje s kazalko?
 caret-browsing-prompt-check-text = Ne sprašuj več.
-
 repair-text-encoding-button =
     .label = Popravi kodiranje besedila
     .tooltiptext = Ugani pravilni nabor znakov iz vsebine sporočila
 
 ## no-reply handling
 
 no-reply-title = Odgovori niso podprti
 no-reply-message = Naslov za odgovor ({ $email }) ni videti kot spremljan naslov. Sporočil, poslanih na ta naslov, verjetno ne bo nihče prebral.
@@ -224,117 +193,93 @@ decrypt-and-copy-failures =
     }
 
 ## Spaces toolbar
 
 spaces-toolbar-element =
     .toolbarname = Vrstica komponent
     .aria-label = Vrstica komponent
     .aria-description = Navpična orodna vrstica za preklop med komponentami programa. Za premikanje med razpoložljivimi gumbi lahko uporabite tipke s puščicami.
-
 spaces-toolbar-button-mail2 =
     .title = Pošta
-
 spaces-toolbar-button-address-book2 =
     .title = Imenik
-
 spaces-toolbar-button-calendar2 =
     .title = Koledar
-
 spaces-toolbar-button-tasks2 =
     .title = Opravila
-
 spaces-toolbar-button-chat2 =
     .title = Klepet
-
 spaces-toolbar-button-overflow =
     .title = Več komponent …
-
 spaces-toolbar-button-settings2 =
     .title = Nastavitve
-
 spaces-toolbar-button-hide =
     .title = Skrij vrstico komponent
-
 spaces-toolbar-button-show =
     .title = Prikaži vrstico komponent
-
 spaces-context-new-tab-item =
     .label = Odpri v novem zavihku
-
 spaces-context-new-window-item =
     .label = Odpri v novem oknu
-
 # Variables:
 # $tabName (String) - The name of the tab this item will switch to.
 spaces-context-switch-tab-item =
     .label = Preklopi na { $tabName }
-
 settings-context-open-settings-item =
     .label = Odpri nastavitve
-
 settings-context-open-account-settings-item =
     .label = Odpri nastavitve računa
-
 settings-context-open-addons-item =
     .label = Odpri dodatke in teme
+settings-context-open-settings-item2 =
+    .label = Nastavitve
+settings-context-open-account-settings-item2 =
+    .label = Nastavitve računa
+settings-context-open-addons-item2 =
+    .label = Dodatki in teme
 
 ## Spaces toolbar pinned tab menupopup
 
 spaces-toolbar-pinned-tab-button =
     .tooltiptext = Odpri meni s komponentami
-
 spaces-pinned-button-menuitem-mail =
     .label = { spaces-toolbar-button-mail.title }
-
 spaces-pinned-button-menuitem-address-book =
     .label = { spaces-toolbar-button-address-book.title }
-
 spaces-pinned-button-menuitem-calendar =
     .label = { spaces-toolbar-button-calendar.title }
-
 spaces-pinned-button-menuitem-tasks =
     .label = { spaces-toolbar-button-tasks.title }
-
 spaces-pinned-button-menuitem-chat =
     .label = { spaces-toolbar-button-chat.title }
-
 spaces-pinned-button-menuitem-settings =
     .label = { spaces-toolbar-button-settings2.title }
-
 spaces-pinned-button-menuitem-show =
     .label = { spaces-toolbar-button-show.title }
-
 # Variables:
 # $count (Number) - Number of unread messages.
 chat-button-unread-messages = { $count }
     .title =
         { $count ->
             [one] { $count } neprebrano sporočilo
             [two] { $count } neprebrani sporočili
             [few] { $count } neprebrana sporočila
            *[other] { $count } neprebranih sporočil
         }
 
 ## Spaces toolbar customize panel
 
 menuitem-customize-label =
     .label = Prilagodi …
-
 spaces-customize-panel-title = Nastavitve vrstice komponent
-
 spaces-customize-background-color = Barva ozadja
-
 spaces-customize-icon-color = Barva gumbov
-
 # The background color used on the buttons of the spaces toolbar when they are
 # `current`, meaning the related space/tab is active and visible.
 spaces-customize-accent-background-color = Barva ozadja izbranega gumba
-
 # The icon color used on the buttons of the spaces toolbar when they are
 # `current`, meaning the related space/tab is active and visible.
 spaces-customize-accent-text-color = Barva izbranega gumba
-
 spaces-customize-button-restore = Povrni privzeto
     .accesskey = v
-
 customize-panel-button-save = Končano
     .accesskey = K

--- a/mail/messenger/messengercompose/messengercompose.ftl
+++ b/mail/messenger/messengercompose/messengercompose.ftl
@@ -3,162 +3,134 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 
 ## Send Format
 
 compose-send-format-menu =
     .label = Oblika pošiljanja
     .accesskey = O
-
 compose-send-auto-menu-item =
     .label = Samodejno
     .accesskey = a
-
 compose-send-both-menu-item =
     .label = HTML in navadno besedilo
     .accesskey = i
-
 compose-send-html-menu-item =
     .label = Samo HTML
     .accesskey = H
-
 compose-send-plain-menu-item =
     .label = Samo navadno besedilo
     .accesskey = n
 
 ## Addressing widget
 
 #   $type (String) - the type of the addressing row
 remove-address-row-button =
     .title = Odstrani polje { $type }
-
 #   $type (String) - the type of the addressing row
 #   $count (Number) - the number of address pills currently present in the addressing row
 address-input-type-aria-label =
     { $count ->
         [0] { $type }
         [one] { $type } z enim naslovom, uporabite tipko leve puščice, da ga izberete.
         [two] { $type } z { $count } naslovoma, uporabite tipko leve puščice, da ju izberete.
         [few] { $type } s { $count } naslovi, uporabite tipko leve puščice, da jih izberete.
        *[other] { $type } s { $count } naslovi, uporabite tipko leve puščice, da jih izberete.
     }
-
 #   $email (String) - the email address
 #   $count (Number) - the number of address pills currently present in the addressing row
 pill-aria-label =
     { $count ->
         [one] { $email }: pritisnite Enter za urejanje ali Delete za odstranitev
         [two] { $email }, 1 od { $count }: pritisnite Enter za urejanje ali Delete za odstranitev
         [few] { $email }, 1 od { $count }: pritisnite Enter za urejanje ali Delete za odstranitev
        *[other] { $email }, 1 od { $count }: pritisnite Enter za urejanje ali Delete za odstranitev
     }
-
 #   $email (String) - the email address
 pill-tooltip-invalid-address = { $email } ni veljaven e-poštni naslov
-
 #   $email (String) - the email address
 pill-tooltip-not-in-address-book = Naslova { $email } ni v vašem imeniku
-
 pill-action-edit =
     .label = Uredi naslov
     .accesskey = U
-
 #   $type (String) - the type of the addressing row, e.g. Cc, Bcc, etc.
 pill-action-select-all-sibling-pills =
     .label = Izberi vse naslove v { $type }
     .accesskey = v
-
 pill-action-select-all-pills =
     .label = Izberi vse naslove
     .accesskey = s
-
 pill-action-move-to =
     .label = Premakni v Za
     .accesskey = Z
-
 pill-action-move-cc =
     .label = Premakni v Kp
     .accesskey = K
-
 pill-action-move-bcc =
     .label = Premakni v Skp
     .accesskey = S
-
 pill-action-expand-list =
     .label = Razširi seznam
     .accesskey = š
 
 ## Attachment widget
 
 ctrl-cmd-shift-pretty-prefix =
     { PLATFORM() ->
         [macos] ⇧ ⌘{ " " }
        *[other] Ctrl+Shift+
     }
-
 trigger-attachment-picker-key = A
 toggle-attachment-pane-key = M
-
 menuitem-toggle-attachment-pane =
     .label = Podokno za priponke
     .accesskey = p
     .acceltext = { ctrl-cmd-shift-pretty-prefix }{ toggle-attachment-pane-key }
-
 toolbar-button-add-attachment =
     .label = Pripni
     .tooltiptext = Dodaj priponko ({ ctrl-cmd-shift-pretty-prefix }{ trigger-attachment-picker-key })
-
 add-attachment-notification-reminder2 =
     .label = Dodaj priponko …
     .accesskey = p
     .tooltiptext = { toolbar-button-add-attachment.tooltiptext }
-
 menuitem-attach-files =
     .label = Datoteke …
     .accesskey = D
     .acceltext = { ctrl-cmd-shift-pretty-prefix }{ trigger-attachment-picker-key }
-
 context-menuitem-attach-files =
     .label = Pripni datoteke …
     .accesskey = d
     .acceltext = { ctrl-cmd-shift-pretty-prefix }{ trigger-attachment-picker-key }
-
 # Note: Do not translate the term 'vCard'.
 context-menuitem-attach-vcard =
     .label = Moja vizitka vCard
     .accesskey = C
-
 context-menuitem-attach-openpgp-key =
     .label = Moj javni ključ OpenPGP
     .accesskey = k
-
 #   $count (Number) - the number of attachments in the attachment bucket
 attachment-bucket-count-value =
     { $count ->
         [one] { $count } priponka
         [two] { $count } priponki
         [few] { $count } priponke
        *[other] { $count } priponk
     }
-
 attachment-area-show =
     .title = Prikaži podokno s priponkami ({ ctrl-cmd-shift-pretty-prefix }{ toggle-attachment-pane-key })
-
 attachment-area-hide =
     .title = Skrij podokno s priponkami ({ ctrl-cmd-shift-pretty-prefix }{ toggle-attachment-pane-key })
-
 drop-file-label-attachment =
     { $count ->
         [one] Dodaj kot priponko
         [two] Dodaj kot priponki
         [few] Dodaj kot priponke
        *[other] Dodaj kot priponke
     }
-
 drop-file-label-inline =
     { $count ->
         [one] Dodaj v vrstico
         [two] Dodaj v vrstico
         [few] Dodaj v vrstico
        *[other] Dodaj v vrstico
     }
 
@@ -167,183 +139,151 @@ drop-file-label-inline =
 move-attachment-first-panel-button =
     .label = Premakni na začetek
 move-attachment-left-panel-button =
     .label = Premakni levo
 move-attachment-right-panel-button =
     .label = Premakni desno
 move-attachment-last-panel-button =
     .label = Premakni na konec
-
 button-return-receipt =
     .label = Povratnica
     .tooltiptext = Zahtevaj potrdilo o prejemu za to sporočilo
 
 ## Encryption
 
 encryption-menu =
     .label = Varnost
     .accesskey = a
-
 encryption-toggle =
     .label = Šifriraj
     .tooltiptext = Za to sporočilo uporabi šifriranje od konca do konca
-
 encryption-options-openpgp =
     .label = OpenPGP
     .tooltiptext = Preglejte ali spremenite nastavitve šifriranja OpenPGP
-
 encryption-options-smime =
     .label = S/MIME
     .tooltiptext = Preglejte ali spremenite nastavitve šifriranja S/MIME
-
+signing-toggle =
+    .label = Podpiši
+    .tooltiptext = Za to sporočilo uporabi digitalni podpis
 menu-openpgp =
     .label = OpenPGP
     .accesskey = O
-
 menu-smime =
     .label = S/MIME
     .accesskey = S
-
 menu-encrypt =
     .label = Šifriraj
     .accesskey = Š
-
 menu-encrypt-subject =
     .label = Šifriraj zadevo
     .accesskey = z
-
 menu-sign =
     .label = Digitalno podpiši
     .accesskey = i
-
 menu-manage-keys =
     .label = Pomočnik za ključe
     .accesskey = P
-
 menu-view-certificates =
     .label = Prikaži digitalna potrdila prejemnikov
     .accesskey = g
-
 menu-open-key-manager =
     .label = Upravitelj ključev
     .accesskey = U
-
 key-notification-disable-encryption =
     .label = Ne šifriraj
     .accesskey = N
     .tooltiptext = Onemogoči šifriranje od konca do konca
-
 key-notification-resolve =
     .label = Razreši …
     .accesskey = R
     .tooltiptext = Odpri pomočnika za ključe OpenPGP
 
 ## Addressing Area
 
 to-address-row-label =
     .value = Za
-
 #   $key (String) - the shortcut key for this field
 show-to-row-main-menuitem =
     .label = Polje Za
     .accesskey = Z
     .acceltext = { ctrl-cmd-shift-pretty-prefix }{ $key }
-
 # No acceltext should be shown.
 # The label should match the show-to-row-button text.
 show-to-row-extra-menuitem =
     .label = Za
     .accesskey = Z
-
 #   $key (String) - the shortcut key for this field
 show-to-row-button = Za
     .title = Prikaži polje Za ({ ctrl-cmd-shift-pretty-prefix }{ $key })
-
-
 cc-address-row-label =
     .value = Kp
-
 #   $key (String) - the shortcut key for this field
 show-cc-row-main-menuitem =
     .label = Polje Kp
     .accesskey = K
     .acceltext = { ctrl-cmd-shift-pretty-prefix }{ $key }
-
 # No acceltext should be shown.
 # The label should match the show-cc-row-button text.
 show-cc-row-extra-menuitem =
     .label = Kp
     .accesskey = K
-
 #   $key (String) - the shortcut key for this field
 show-cc-row-button = Kp
     .title = Prikaži polje Kp ({ ctrl-cmd-shift-pretty-prefix }{ $key })
-
-
 bcc-address-row-label =
     .value = Skp
-
 #   $key (String) - the shortcut key for this field
 show-bcc-row-main-menuitem =
     .label = Polje Skp
     .accesskey = S
     .acceltext = { ctrl-cmd-shift-pretty-prefix }{ $key }
-
 # No acceltext should be shown.
 # The label should match the show-bcc-row-button text.
 show-bcc-row-extra-menuitem =
     .label = Skp
     .accesskey = S
-
 #   $key (String) - the shortcut key for this field
 show-bcc-row-button = Skp
     .title = Prikaži polje Skp ({ ctrl-cmd-shift-pretty-prefix }{ $key })
-
 extra-address-rows-menu-button =
     .title = Druga polja za naslavljanje, ki naj bodo prikazana
-
 #   $count (Number) - the count of addresses in the "To" and "Cc" fields.
 many-public-recipients-notice =
     { $count ->
         [one] Sporočilo ima javnega prejemnika.  Prejemnike lahko prikrijete tako, da uporabite polje Skp.
         [two] Prejemnika v poljih Za in Kp bosta videla naslove drug drugega. Prejemnike lahko prikrijete tako, da uporabite polje Skp.
         [few] { $count } prejemniki v poljih Za in Kp bodo videli naslove drug drugega. Prejemnike lahko prikrijete tako, da uporabite polje Skp.
        *[other] { $count } prejemnikov v poljih Za in Kp bo videlo naslove drug drugega. Prejemnike lahko prikrijete tako, da uporabite polje Skp.
     }
 many-public-recipients-bcc =
     .label = Raje uporabi Skp
     .accesskey = S
-
 many-public-recipients-ignore =
     .label = Naj bodo prejemniki javni
     .accesskey = N
-
 many-public-recipients-prompt-title = Preveč javnih prejemnikov
-
 #   $count (Number) - the count of addresses in the public recipients fields.
 many-public-recipients-prompt-msg =
     { $count ->
         [one] Sporočilo ima javnega prejemnika. Če to ogroža njegovo zasebnost, se lahko temu izognete tako, da ga premaknete iz polja Za/Kp v Skp.
         [two] Sporočilo ima { $count } javna prejemnika. Če to ogroža njuno zasebnost, se lahko temu izognete tako, da ju premaknete iz polja Za/Kp v Skp.
         [few] Sporočilo ima { $count } javne prejemnike. Če to ogroža njihovo zasebnost, se lahko temu izognete tako, da jih premaknete iz polja Za/Kp v Skp.
        *[other] Sporočilo ima { $count } javnih prejemnikov. Če to ogroža njihovo zasebnost, se lahko temu izognete tako, da jih premaknete iz polja Za/Kp v Skp.
     }
-
 many-public-recipients-prompt-cancel = Prekliči pošiljanje
 many-public-recipients-prompt-send = Vseeno pošlji
 
 ## Notifications
 
 # Variables:
 # $identity (string) - The name of the used identity, most likely an email address.
 compose-missing-identity-warning = Edinstvene identitete za naslov v polju Od ni bilo mogoče najti. Sporočilo bo poslano z uporabo trenutnega polja Od in nastavitev za identiteto { $identity }.
-
 encrypted-bcc-warning = Ko pošiljate šifrirano sporočilo, prejemniki skrite kopije niso popolnoma skriti. Morda jih bodo lahko prepoznali vsi prejemniki.
-
 encrypted-bcc-ignore-button = Razumem
 
 ## Editing
 
 
 # Tools
 
 compose-tool-button-remove-text-styling =
@@ -355,17 +295,16 @@ compose-tool-button-remove-text-styling 
 # removed or is unknown.
 cloud-file-unknown-account-tooltip = Naloženo v neznan račun Filelink.
 
 # Placeholder file
 
 # Title for the html placeholder file.
 # $filename - name of the file
 cloud-file-placeholder-title = { $filename } – priponka Filelink
-
 # A text describing that the file was attached as a Filelink and can be downloaded
 # from the link shown below.
 # $filename - name of the file
 cloud-file-placeholder-intro = Datoteka { $filename } je priložena kot Filelink. Prenesete jo lahko s spodnje povezave.
 
 # Template
 
 # A line of text describing how many uploaded files have been appended to this
@@ -373,34 +312,30 @@ cloud-file-placeholder-intro = Datoteka { $filename } je priložena kot Filelink. Prenesete jo lahko s spodnje povezave.
 # used as a header to a list, hence the colon.
 cloud-file-count-header =
     { $count ->
         [one] S tem e-poštnim sporočilom sem povezal { $count } datoteko:
         [two] S tem e-poštnim sporočilom sem povezal { $count } datoteki:
         [few] S tem e-poštnim sporočilom sem povezal { $count } datoteke:
        *[other] S tem e-poštnim sporočilom sem povezal { $count } datotek:
     }
-
 # A text used in a footer, instructing the reader where to find additional
 # information about the used service provider.
 # $link (string) - html a-tag for a link pointing to the web page of the provider
 cloud-file-service-provider-footer-single = Več o ponudniku { $link }.
-
 # A text used in a footer, instructing the reader where to find additional
 # information about the used service providers. Links for the used providers are
 # split into a comma separated list of the first n-1 providers and a single entry
 # at the end.
 # $firstLinks (string) - comma separated list of html a-tags pointing to web pages
 #                        of the first n-1 used providers
 # $lastLink (string) - html a-tag pointing the web page of the n-th used provider
 cloud-file-service-provider-footer-multiple = Več o ponudnikih { $firstLinks } in { $lastLink }.
-
 # Tooltip for an icon, indicating that the link is protected by a password.
 cloud-file-tooltip-password-protected-link = Z geslom zaščitena povezava
-
 # Used in a list of stats about a specific file
 # Service - the used service provider to host the file (Filelink Service: BOX.com)
 # Size - the size of the file (Size: 4.2 MB)
 # Link - the link to the file (Link: https://some.provider.com)
 # Expiry Date - stating the date the link will expire (Expiry Date: 12.12.2022)
 # Download Limit - stating the maximum allowed downloads, before the link becomes invalid
 #                  (Download Limit: 6)
 cloud-file-template-service-name = Storitev Filelink:
@@ -410,43 +345,40 @@ cloud-file-template-password-protected-link = Z geslom zaščitena povezava:
 cloud-file-template-expiry-date = Datum poteka:
 cloud-file-template-download-limit = Omejitev prenosa:
 
 # Messages
 
 # $provider (string) - name of the online storage service that reported the error
 cloud-file-connection-error-title = Napaka v povezavi
 cloud-file-connection-error = { -brand-short-name } je brez povezave. Ni se bilo mogoče povezati s storitvijo { $provider }.
-
 # $provider (string) - name of the online storage service that reported the error
 # $filename (string) - name of the file that was uploaded and caused the error
 cloud-file-upload-error-with-custom-message-title = Nalaganje { $filename } na { $size } je spodletelo
-
 # $provider (string) - name of the online storage service that reported the error
 # $filename (string) - name of the file that was renamed and caused the error
 cloud-file-rename-error-title = Napaka pri preimenovanju
 cloud-file-rename-error = Pri preimenovanju datoteke { $filename } v storitvi { $provider } je prišlo do težave.
-
 # $provider (string) - name of the online storage service that reported the error
 # $filename (string) - name of the file that was renamed and caused the error
 cloud-file-rename-error-with-custom-message-title = Preimenovanje datoteke { $filename } v storitvi { $provider } je spodletelo
-
 # $provider (string) - name of the online storage service that reported the error
 cloud-file-rename-not-supported = { $provider } ne omogoča preimenovanja že naloženih datotek.
-
 # $filename (string) - name of the file that was renamed and caused the error
 cloud-file-attachment-error-title = Napaka priponke Filelink
 cloud-file-attachment-error = Priponke Filelink { $filename } ni bilo mogoče posodobiti, ker je bila krajevno shranjena datoteka premaknjena ali izbrisana.
-
 # $filename (string) - name of the file that was renamed and caused the error
 cloud-file-account-error-title = Napaka računa Filelink
 cloud-file-account-error = Priponke Filelink { $filename } ni bilo mogoče posodobiti, ker je bil račun za Filelink izbrisan.
 
 ## Link Preview
 
 link-preview-title = Predogled povezave
 link-preview-description = { -brand-short-name } lahko pri lepljenju povezav doda vdelan predogled.
 link-preview-autoadd = Samodejno dodajaj predoglede povezav, kadar je to mogoče
 link-preview-replace-now = Želite dodati predogled za to povezavo?
 link-preview-yes-replace = Da
 
 ## Dictionary selection popup
 
+spell-add-dictionaries =
+    .label = Dodaj slovarje …
+    .accesskey = D