--- a/browser/chrome/browser/aboutTabCrashed.dtd
+++ b/browser/chrome/browser/aboutTabCrashed.dtd
@@ -1,30 +1,25 @@
 <!-- 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/. -->
 
-<!ENTITY tabCrashed.closeTab "Zatvori ovu karticu">
+
 <!ENTITY tabCrashed.restoreTab "Vrati ovu karticu">
 <!ENTITY tabCrashed.restoreAll "Vrati sve prisilno zatvorene kartice">
+
 <!-- LOCALIZATION NOTE (tabCrashed.header2): "Gah" is an English slang word
      used to express surprise or frustration (or both at the same time).  We
      are using it to communicate in an informal way that it is both
      frustrating that your tab crashed and a surprise that we didn't want to
      happen. If you have a similar word or short phrase that is not profane or
      vulgar, use it. If not, feel free to skip the word in your
      translation. -->
-
 <!ENTITY tabCrashed.header2 "Ups. Vaša kartica se upravo srušila.">
-<!ENTITY tabCrashed.offerHelp "Možemo vam pomoći!">
-<!ENTITY tabCrashed.single.offerHelpMessage "Odaberite &tabCrashed.restoreTab; kako biste ponovno učitali sadržaj stranice.">
-<!ENTITY tabCrashed.multiple.offerHelpMessage "Odaberite &tabCrashed.restoreTab; ili &tabCrashed.restoreAll; kako biste ponovno učitali sadržaj stranice.">
+<!ENTITY tabCrashed.offerHelp2 "Možemo pomoći!">
 <!ENTITY tabCrashed.requestHelp "Želite li nam pomoći?">
 <!ENTITY tabCrashed.requestHelpMessage "Izvještaji rušenja nam pomažu da pronađemo probleme i napravimo &brandShortName; boljim.">
 <!ENTITY tabCrashed.requestReport "Prijavi ovu karticu">
-<!ENTITY tabCrashed.sendReport2 "Pošalji izvještaj rušenja za karticu koju gledate">
 <!ENTITY tabCrashed.commentPlaceholder2 "Neobavezni komentari (komentari su javno vidljivi)">
-<!ENTITY tabCrashed.includeURL2 "Uključi URL stranice s ovim izvještajem rušenja">
 <!ENTITY tabCrashed.emailPlaceholder "Ovdje upišite vašu adresu e-pošte">
 <!ENTITY tabCrashed.emailMe "Pošalji mi e-poštu kada je dostupno više informacija">
 <!ENTITY tabCrashed.reportSent "Izvještaj rušenja je već poslan. Hvala vam što ste pomogli unaprijediti &brandShortName;!">
 <!ENTITY tabCrashed.requestAutoSubmit2 "Prijavi pozadinske kartice">
-<!ENTITY tabCrashed.autoSubmit2 "Ažurirajte postavke radi automatskoga slanja informacija o rušenjima programa, uključujući i izvještaje o pogreškama pozadinskih kartica za ovu i buduće sesije.">

--- a/browser/chrome/browser/browser.properties
+++ b/browser/chrome/browser/browser.properties
@@ -140,16 +140,23 @@ webextPerms.hostDescription.oneSite=Pristup vašim podacima za %S
 
 # LOCALIZATION NOTE (webextPerms.hostDescription.tooManySites)
 # Semi-colon list of plural forms.
 # See: http://developer.mozilla.org/en/docs/Localization_and_Plurals
 # #1 will be replaced by an integer indicating the number of additional
 # hosts for which this webextension is requesting permission.
 webextPerms.hostDescription.tooManySites=Pristup vašim podacima s još #1 stranice;Pristup vašim podacima s još druge #1 stranice;Pristup vašim podacima s još #1 drugih stranica
 
+# LOCALIZATION NOTE (webext.defaultSearch.description)
+# %1$S is replaced with the localized named of the extension that is asking to change the default search engine.
+# %2$S is replaced with the name of the current search engine
+# %3$S is replaced with the name of the new search engine
+webext.defaultSearchYes.label=Da
+webext.defaultSearchNo.label=Ne
+
 # LOCALIZATION NOTE (addonPostInstall.message)
 # %1$S is replaced with the localized named of the extension that was
 # just installed.
 # %2$S is replaced with the localized name of the application.
 addonPostInstall.message1=Dodatak %1$S je dodan u %2$S.
 
 # LOCALIZATION NOTE (addonPostInstall.messageDetail)
 # %1$S is replaced with the icon for the add-ons menu.
@@ -251,16 +258,20 @@ popupWarningButton.accesskey=o
 popupWarningButtonUnix=Postavke
 popupWarningButtonUnix.accesskey=P
 popupAllow=Dopusti skočne prozore za %S
 popupBlock=Blokiraj skočne prozore za %S
 popupWarningDontShowFromMessage=Ne prikazuj ovu poruku kod blokiranja skočnih prozora
 popupWarningDontShowFromLocationbar=Ne prikazuj informacijsku traku pri blokiranju skočnih prozora
 popupShowPopupPrefix=Prikaži '%S'
 
+# LOCALIZATION NOTE (popupShowBlockedPopupsIndicatorText): Semicolon seperated list of plural forms.
+# See: http://developer.mozilla.org/en/docs/Localization_and_Plurals
+# #1 is the number of pop-ups blocked.
+
 # Bad Content Blocker Doorhanger Notification
 # %S is brandShortName
 badContentBlocked.blocked.message=%S blokira sadržaj na ovoj stranici.
 badContentBlocked.notblocked.message=%S ne blokira nikakav sadržaj na ovoj stranici.
 
 crashedpluginsMessage.title=Dodatak %S se srušio.
 crashedpluginsMessage.reloadButton.label=Ponovno učitaj stranicu
 crashedpluginsMessage.reloadButton.accesskey=r
@@ -325,16 +336,18 @@ pluginActivateNow.accesskey=D
 # plugin.
 pluginActivateAlways.label=Dopusti i zapamti
 pluginActivateAlways.accesskey=z
 pluginBlockNow.label=Blokiraj priključak
 pluginBlockNow.accesskey=B
 pluginContinue.label=Nastavi dopuštati
 pluginContinue.accesskey=v
 
+# Flash activation doorhanger UI
+
 # in-page UI
 PluginClickToActivate=Aktiviraj %S.
 PluginVulnerableUpdatable=Ovaj priključak je ranjiv i trebalo bi ga ažurirati.
 PluginVulnerableNoUpdate=Ovaj priključak ima sigurnosni propust.
 
 # infobar UI
 pluginContinueBlocking.label=Nastavi blokirati
 pluginContinueBlocking.accesskey=b
@@ -451,16 +464,21 @@ offlineApps.allowStoring.label=Dopusti s
 offlineApps.allowStoring.accesskey=a
 offlineApps.dontAllow.label=Nemoj dopustiti
 offlineApps.dontAllow.accesskey=N
 
 offlineApps.usage=Ova web stranica (%S) sada sprema više od %SMB podataka na vašem računalu za uporabu u izvanmrežnom načinu rada.
 offlineApps.manageUsage=Prikaži postavke
 offlineApps.manageUsageAccessKey=S
 
+# Canvas permission prompt
+# LOCALIZATION NOTE (canvas.siteprompt): %S is hostname
+canvas.notAllow=Nemoj dopustiti
+canvas.remember=Uvijek zapamti moju odluku
+
 identity.identified.verifier=Potvrdio: %S
 identity.identified.verified_by_you=Dodali ste sigurnosnu iznimku za ovu stranicu
 identity.identified.state_and_country=%S, %S
 
 identity.icon.tooltip=Prikaži informacije o stranici
 identity.extension.label=Dodaci (%S)
 identity.extension.tooltip=Učitano od strane dodatka: %S
 identity.showDetails.tooltip=Prikaži detalje veze

--- a/browser/chrome/browser/sitePermissions.properties
+++ b/browser/chrome/browser/sitePermissions.properties
@@ -10,16 +10,18 @@
 # This label is used to display active permission states in the site
 # identity popup (which does not have a lot of screen space).
 state.current.allowed = Dozvoljeno
 state.current.allowedForSession = Dozvoljeno za ovu sesiju
 state.current.allowedTemporarily = Privremeno dozvoljeno
 state.current.blockedTemporarily = Privremeno blokirano
 state.current.blocked = Blokirano
 
+state.current.prompt = Uvijek pitaj
+
 # LOCALIZATION NOTE (state.multichoice.alwaysAsk,
 #                    state.multichoice.allow,
 #                    state.multichoice.allowForSession,
 #                    state.multichoice.block):
 # Used to label permission state checkboxes in the page info dialog.
 state.multichoice.alwaysAsk = Uvijek pitaj
 state.multichoice.allow = Dopusti
 state.multichoice.allowForSession = Dopusti za ovu sesiju

--- a/browser/chrome/overrides/netError.dtd
+++ b/browser/chrome/overrides/netError.dtd
@@ -31,17 +31,19 @@
 <!ENTITY generic.title "Ups.">
 <!ENTITY generic.longDesc "<p>&brandShortName; iz nekog razloga ovu stranicu nije moguće učitati.</p>">
 
 <!ENTITY captivePortal.title "Prijava na mrežu">
 <!ENTITY captivePortal.longDesc2 "<p>Morate se prijaviti na ovu mreži želite li koristiti internet.</p>">
 
 <!ENTITY openPortalLoginPage.label2 "Otvaranje stranice prijave na mrežu">
 
+<!ENTITY malformedURI.pageTitle "Neispravan URL">
 <!-- Localization note (malformedURI.title1) - "Hmm" is a sound made when considering or puzzling over something. You don't have to include it in your translation if your language does not have a written word like this. -->
+<!ENTITY malformedURI.title1 "Hmm. Ta adresa ne izgleda dobro.">
 
 <!ENTITY netInterrupt.title "Podatkovni prijenos je prekinut">
 <!ENTITY netInterrupt.longDesc "&sharedLongDesc;">
 
 <!ENTITY notCached.title "Dokument je istekao">
 <!ENTITY notCached.longDesc "<p>Traženi dokument nije dostupan u &brandShortName;ovoj priručnoj memoriji.</p><ul><li>. Radi mjere sigurnosti, &brandShortName; neće automatski ponovno zatražiti osjetljive dokumente.</li><li>Kliknite na Pokušaj ponovno da biste zatražili dokument od web stranice.</li></ul>">
 
 <!ENTITY netOffline.title "Izvanmrežni rad">

new file mode 100644
--- /dev/null
+++ b/browser/extensions/formautofill/formautofill.properties
@@ -0,0 +1,71 @@
+# 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/.
+
+# LOCALIZATION NOTE (saveAddressesMessage): %S is brandShortName. This string is used on the doorhanger to
+# notify users that addresses are saved.
+# LOCALIZATION NOTE (autofillOptionsLink, autofillOptionsLinkOSX): These strings are used in the doorhanger for
+# updating addresses. The link leads users to Form Autofill browser preferences.
+# LOCALIZATION NOTE (autofillSecurityOptionsLink, autofillSecurityOptionsLinkOSX): These strings are used
+# in the doorhanger for saving credit card info. The link leads users to Form Autofill browser preferences.
+# LOCALIZATION NOTE (changeAutofillOptions, changeAutofillOptionsOSX): These strings are used on the doorhanger
+# that notifies users that addresses are saved. The button leads users to Form Autofill browser preferences.
+# LOCALIZATION NOTE (addressesSyncCheckbox): If Sync is enabled, this checkbox is displayed on the doorhanger
+# shown when saving addresses.
+# LOCALIZATION NOTE (creditCardsSyncCheckbox): If Sync is enabled and credit card sync is available,
+# this checkbox is displayed on the doorhanger shown when saving credit card.
+# LOCALIZATION NOTE (updateAddressMessage, createAddressLabel, updateAddressLabel): Used on the doorhanger
+# when an address change is detected.
+# LOCALIZATION NOTE (saveCreditCardMessage, saveCreditCardLabel, cancelCreditCardLabel, neverSaveCreditCardLabel):
+# Used on the doorhanger when users submit payment with credit card.
+# LOCALIZATION NOTE (saveCreditCardMessage): %S is brandShortName.
+cancelCreditCardLabel = Nemoj spremiti
+# LOCALIZATION NOTE (openAutofillMessagePanel): Tooltip label for Form Autofill doorhanger icon on address bar.
+
+# LOCALIZATION NOTE (autocompleteFooterOption, autocompleteFooterOptionOSX): Used as a label for the button,
+# displayed at the bottom of the drop down suggestion, to open Form Autofill browser preferences.
+# LOCALIZATION NOTE (autocompleteFooterOptionShort, autocompleteFooterOptionOSXShort): Used as a label for the button,
+# displayed at the bottom of the drop down suggestion, to open Form Autofill browser preferences. This version is used
+# instead of autocompleteFooterOption* when the menu width is below 185px.
+autocompleteFooterOptionShort = Više opcija
+autocompleteFooterOptionOSXShort = Postavke
+# LOCALIZATION NOTE (category.address, category.name, category.organization2, category.tel, category.email):
+# Used in autofill drop down suggestion to indicate what other categories Form Autofill will attempt to fill.
+category.address = adresa
+category.name = ime
+# LOCALIZATION NOTE (fieldNameSeparator): This is used as a separator between categories.
+# LOCALIZATION NOTE (phishingWarningMessage, phishingWarningMessage2): The warning
+# text that is displayed for informing users what categories are about to be filled.
+# "%S" will be replaced with a list generated from the pre-defined categories.
+# The text would be e.g. Also autofills organization, phone, email.
+# LOCALIZATION NOTE (insecureFieldWarningDescription): %S is brandShortName. This string is used in drop down
+# suggestion when users try to autofill credit card on an insecure website (without https).
+
+# LOCALIZATION NOTE (autofillAddressesCheckbox): Label for the checkbox that enables autofilling addresses.
+# LOCALIZATION NOTE (learnMoreLabel): Label for the link that leads users to the Form Autofill SUMO page.
+learnMoreLabel = Saznajte više
+# LOCALIZATION NOTE (savedAddressesBtnLabel): Label for the button that opens a dialog that shows the
+# list of saved addresses.
+# LOCALIZATION NOTE (autofillCreditCardsCheckbox): Label for the checkbox that enables autofilling credit cards.
+# LOCALIZATION NOTE (savedCreditCardsBtnLabel): Label for the button that opens a dialog that shows the list
+# of saved credit cards.
+
+# LOCALIZATION NOTE (manageAddressesTitle, manageCreditCardsTitle): The dialog title for the list of addresses or
+# credit cards in browser preferences.
+# LOCALIZATION NOTE (addressesListHeader, creditCardsListHeader): The header for the list of addresses or credit cards
+# in browser preferences.
+addressesListHeader = Adrese
+removeBtnLabel = Ukloni
+addBtnLabel = Dodaj…
+editBtnLabel = Uredi…
+
+# LOCALIZATION NOTE (addNewAddressTitle, editAddressTitle): The dialog title for creating or editing addresses
+# in browser preferences.
+givenName = Ime
+familyName = Prezime
+city = Grad
+saveBtnLabel = Spremi
+
+# LOCALIZATION NOTE (addNewCreditCardTitle, editCreditCardTitle): The dialog title for creating or editing
+# credit cards in browser preferences.
+cardExpires = Ističe